From 9a375f14192c9bc9bec54777ec74d1444e11e593 Mon Sep 17 00:00:00 2001
From: ponychicken <ponychicken@users.noreply.github.com>
Date: Wed, 13 Aug 2025 19:36:18 +0200
Subject: [PATCH 001/823] Add some documentation for Helix mode (#35641)

Because there is literally no mention of it in the docs

Release Notes:

- N/A

---------

Co-authored-by: ponychicken <183302+ponychicken@users.noreply.github.com>
Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 docs/src/SUMMARY.md         |  1 +
 docs/src/configuring-zed.md |  8 +++++++-
 docs/src/helix.md           | 11 +++++++++++
 docs/src/key-bindings.md    |  4 ++--
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 docs/src/helix.md

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index fc936d6bd0..c7af36f431 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -21,6 +21,7 @@
 - [Icon Themes](./icon-themes.md)
 - [Visual Customization](./visual-customization.md)
 - [Vim Mode](./vim.md)
+- [Helix Mode](./helix.md)
 
 <!-- - [Globs](./globs.md) -->
 <!-- - [Fonts](./fonts.md) -->
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 1996e1c4ee..5d11dfe833 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -3195,10 +3195,16 @@ Run the `theme selector: toggle` action in the command palette to see a current
 
 ## Vim
 
-- Description: Whether or not to enable vim mode (work in progress).
+- Description: Whether or not to enable vim mode. See the [Vim documentation](./vim.md) for more details on configuration.
 - Setting: `vim_mode`
 - Default: `false`
 
+## Helix Mode
+
+- Description: Whether or not to enable Helix mode. Enabling `helix_mode` also enables `vim_mode`. See the [Helix documentation](./helix.md) for more details.
+- Setting: `helix_mode`
+- Default: `false`
+
 ## Project Panel
 
 - Description: Customize project panel
diff --git a/docs/src/helix.md b/docs/src/helix.md
new file mode 100644
index 0000000000..ddf997d3f0
--- /dev/null
+++ b/docs/src/helix.md
@@ -0,0 +1,11 @@
+# Helix Mode
+
+_Work in progress! Not all Helix keybindings are implemented yet._
+
+Zed's Helix mode is an emulation layer that brings Helix-style keybindings and modal editing to Zed. It builds upon Zed's [Vim mode](./vim.md), so much of the core functionality is shared. Enabling `helix_mode` will also enable `vim_mode`.
+
+For a guide on Vim-related features that are also available in Helix mode, please refer to our [Vim mode documentation](./vim.md).
+
+To check the current status of Helix mode, or to request a missing Helix feature, checkout out the ["Are we Helix yet?" discussion](https://github.com/zed-industries/zed/discussions/33580).
+
+For a detailed list of Helix's default keybindings, please visit the [official Helix documentation](https://docs.helix-editor.com/keymap.html).
diff --git a/docs/src/key-bindings.md b/docs/src/key-bindings.md
index feed912787..9fc94840b7 100644
--- a/docs/src/key-bindings.md
+++ b/docs/src/key-bindings.md
@@ -14,7 +14,7 @@ If you're used to a specific editor's defaults you can set a `base_keymap` in yo
 - TextMate
 - None (disables _all_ key bindings)
 
-You can also enable `vim_mode`, which adds vim bindings too.
+You can also enable `vim_mode` or `helix_mode`, which add modal bindings. For more information, see the documentation for [Vim mode](./vim.md) and [Helix mode](./helix.md).
 
 ## User keymaps
 
@@ -119,7 +119,7 @@ It's worth noting that attributes are only available on the node they are define
 
 Note: Before Zed v0.197.x, the ! operator only looked at one node at a time, and `>` meant "parent" not "ancestor". This meant that `!Editor` would match the context `Workspace > Pane > Editor`, because (confusingly) the Pane matches `!Editor`, and that `os=macos > Editor` did not match the context `Workspace > Pane > Editor` because of the intermediate `Pane` node.
 
-If you're using Vim mode, we have information on how [vim modes influence the context](./vim.md#contexts)
+If you're using Vim mode, we have information on how [vim modes influence the context](./vim.md#contexts). Helix mode is built on top of Vim mode and uses the same contexts.
 
 ### Actions
 

From cb0bc463f103bd5a00d01e0229b9059ea6036d8b Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:45:37 -0300
Subject: [PATCH 002/823] agent2: Add new "new thread" selector in the toolbar
 (#36133)

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json           |   1 +
 assets/keymaps/default-macos.json           |   1 +
 crates/agent_ui/src/agent_panel.rs          | 838 ++++++++++++--------
 crates/agent_ui/src/agent_ui.rs             |   2 +
 crates/agent_ui/src/ui.rs                   |   4 +-
 crates/agent_ui/src/ui/new_thread_button.rs |   6 +-
 crates/zed/src/zed/component_preview.rs     |   2 +-
 7 files changed, 526 insertions(+), 328 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 708432393c..dda26f406b 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -239,6 +239,7 @@
       "ctrl-shift-a": "agent::ToggleContextPicker",
       "ctrl-shift-j": "agent::ToggleNavigationMenu",
       "ctrl-shift-i": "agent::ToggleOptionsMenu",
+      "ctrl-alt-shift-n": "agent::ToggleNewThreadMenu",
       "shift-alt-escape": "agent::ExpandMessageEditor",
       "ctrl->": "assistant::QuoteSelection",
       "ctrl-alt-e": "agent::RemoveAllContext",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index abb741af29..3966efd8df 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -279,6 +279,7 @@
       "cmd-shift-a": "agent::ToggleContextPicker",
       "cmd-shift-j": "agent::ToggleNavigationMenu",
       "cmd-shift-i": "agent::ToggleOptionsMenu",
+      "cmd-alt-shift-n": "agent::ToggleNewThreadMenu",
       "shift-alt-escape": "agent::ExpandMessageEditor",
       "cmd->": "assistant::QuoteSelection",
       "cmd-alt-e": "agent::RemoveAllContext",
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index d07581da93..a641d62296 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -12,12 +12,12 @@ use serde::{Deserialize, Serialize};
 use crate::NewExternalAgentThread;
 use crate::agent_diff::AgentDiffThread;
 use crate::message_editor::{MAX_EDITOR_LINES, MIN_EDITOR_LINES};
-use crate::ui::NewThreadButton;
 use crate::{
     AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
     DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
     NewThread, OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ResetTrialEndUpsell,
-    ResetTrialUpsell, ToggleBurnMode, ToggleContextPicker, ToggleNavigationMenu, ToggleOptionsMenu,
+    ResetTrialUpsell, ToggleBurnMode, ToggleContextPicker, ToggleNavigationMenu,
+    ToggleNewThreadMenu, ToggleOptionsMenu,
     acp::AcpThreadView,
     active_thread::{self, ActiveThread, ActiveThreadEvent},
     agent_configuration::{AgentConfiguration, AssistantConfigurationEvent},
@@ -67,8 +67,8 @@ use theme::ThemeSettings;
 use time::UtcOffset;
 use ui::utils::WithRemSize;
 use ui::{
-    Banner, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding, PopoverMenu,
-    PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
+    Banner, ButtonLike, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding,
+    PopoverMenu, PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -86,6 +86,7 @@ const AGENT_PANEL_KEY: &str = "agent_panel";
 #[derive(Serialize, Deserialize)]
 struct SerializedAgentPanel {
     width: Option<Pixels>,
+    selected_agent: Option<AgentType>,
 }
 
 pub fn init(cx: &mut App) {
@@ -179,6 +180,14 @@ pub fn init(cx: &mut App) {
                         });
                     }
                 })
+                .register_action(|workspace, _: &ToggleNewThreadMenu, window, cx| {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
+                        panel.update(cx, |panel, cx| {
+                            panel.toggle_new_thread_menu(&ToggleNewThreadMenu, window, cx);
+                        });
+                    }
+                })
                 .register_action(|workspace, _: &OpenOnboardingModal, window, cx| {
                     AgentOnboardingModal::toggle(workspace, window, cx)
                 })
@@ -223,6 +232,36 @@ enum WhichFontSize {
     None,
 }
 
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AgentType {
+    #[default]
+    Zed,
+    TextThread,
+    Gemini,
+    ClaudeCode,
+    NativeAgent,
+}
+
+impl AgentType {
+    fn label(self) -> impl Into<SharedString> {
+        match self {
+            Self::Zed | Self::TextThread => "Zed",
+            Self::NativeAgent => "Agent 2",
+            Self::Gemini => "Gemini",
+            Self::ClaudeCode => "Claude Code",
+        }
+    }
+
+    fn icon(self) -> IconName {
+        match self {
+            Self::Zed | Self::TextThread => IconName::AiZed,
+            Self::NativeAgent => IconName::ZedAssistant,
+            Self::Gemini => IconName::AiGemini,
+            Self::ClaudeCode => IconName::AiClaude,
+        }
+    }
+}
+
 impl ActiveView {
     pub fn which_font_size_used(&self) -> WhichFontSize {
         match self {
@@ -453,16 +492,21 @@ pub struct AgentPanel {
     zoomed: bool,
     pending_serialization: Option<Task<Result<()>>>,
     onboarding: Entity<AgentPanelOnboarding>,
+    selected_agent: AgentType,
 }
 
 impl AgentPanel {
     fn serialize(&mut self, cx: &mut Context<Self>) {
         let width = self.width;
+        let selected_agent = self.selected_agent;
         self.pending_serialization = Some(cx.background_spawn(async move {
             KEY_VALUE_STORE
                 .write_kvp(
                     AGENT_PANEL_KEY.into(),
-                    serde_json::to_string(&SerializedAgentPanel { width })?,
+                    serde_json::to_string(&SerializedAgentPanel {
+                        width,
+                        selected_agent: Some(selected_agent),
+                    })?,
                 )
                 .await?;
             anyhow::Ok(())
@@ -531,6 +575,9 @@ impl AgentPanel {
                 if let Some(serialized_panel) = serialized_panel {
                     panel.update(cx, |panel, cx| {
                         panel.width = serialized_panel.width.map(|w| w.round());
+                        if let Some(selected_agent) = serialized_panel.selected_agent {
+                            panel.selected_agent = selected_agent;
+                        }
                         cx.notify();
                     });
                 }
@@ -732,6 +779,7 @@ impl AgentPanel {
             zoomed: false,
             pending_serialization: None,
             onboarding,
+            selected_agent: AgentType::default(),
         }
     }
 
@@ -1174,6 +1222,15 @@ impl AgentPanel {
         self.agent_panel_menu_handle.toggle(window, cx);
     }
 
+    pub fn toggle_new_thread_menu(
+        &mut self,
+        _: &ToggleNewThreadMenu,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.new_thread_menu_handle.toggle(window, cx);
+    }
+
     pub fn increase_font_size(
         &mut self,
         action: &IncreaseBufferFontSize,
@@ -1581,6 +1638,17 @@ impl AgentPanel {
 
         menu
     }
+
+    pub fn set_selected_agent(&mut self, agent: AgentType, cx: &mut Context<Self>) {
+        if self.selected_agent != agent {
+            self.selected_agent = agent;
+            self.serialize(cx);
+        }
+    }
+
+    pub fn selected_agent(&self) -> AgentType {
+        self.selected_agent
+    }
 }
 
 impl Focusable for AgentPanel {
@@ -1811,200 +1879,24 @@ impl AgentPanel {
             .into_any()
     }
 
-    fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_panel_options_menu(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
         let user_store = self.user_store.read(cx);
         let usage = user_store.model_request_usage();
-
         let account_url = zed_urls::account_url(cx);
 
         let focus_handle = self.focus_handle(cx);
 
-        let go_back_button = div().child(
-            IconButton::new("go-back", IconName::ArrowLeft)
-                .icon_size(IconSize::Small)
-                .on_click(cx.listener(|this, _, window, cx| {
-                    this.go_back(&workspace::GoBack, window, cx);
-                }))
-                .tooltip({
-                    let focus_handle = focus_handle.clone();
-                    move |window, cx| {
-                        Tooltip::for_action_in(
-                            "Go Back",
-                            &workspace::GoBack,
-                            &focus_handle,
-                            window,
-                            cx,
-                        )
-                    }
-                }),
-        );
-
-        let recent_entries_menu = div().child(
-            PopoverMenu::new("agent-nav-menu")
-                .trigger_with_tooltip(
-                    IconButton::new("agent-nav-menu", IconName::MenuAlt)
-                        .icon_size(IconSize::Small)
-                        .style(ui::ButtonStyle::Subtle),
-                    {
-                        let focus_handle = focus_handle.clone();
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Toggle Panel Menu",
-                                &ToggleNavigationMenu,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    },
-                )
-                .anchor(Corner::TopLeft)
-                .with_handle(self.assistant_navigation_menu_handle.clone())
-                .menu({
-                    let menu = self.assistant_navigation_menu.clone();
-                    move |window, cx| {
-                        if let Some(menu) = menu.as_ref() {
-                            menu.update(cx, |_, cx| {
-                                cx.defer_in(window, |menu, window, cx| {
-                                    menu.rebuild(window, cx);
-                                });
-                            })
-                        }
-                        menu.clone()
-                    }
-                }),
-        );
-
         let full_screen_label = if self.is_zoomed(window, cx) {
             "Disable Full Screen"
         } else {
             "Enable Full Screen"
         };
 
-        let active_thread = match &self.active_view {
-            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
-        };
-
-        let new_thread_menu = PopoverMenu::new("new_thread_menu")
-            .trigger_with_tooltip(
-                IconButton::new("new_thread_menu_btn", IconName::Plus).icon_size(IconSize::Small),
-                Tooltip::text("New Thread…"),
-            )
-            .anchor(Corner::TopRight)
-            .with_handle(self.new_thread_menu_handle.clone())
-            .menu({
-                let focus_handle = focus_handle.clone();
-                move |window, cx| {
-                    let active_thread = active_thread.clone();
-                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
-                        menu = menu
-                            .context(focus_handle.clone())
-                            .when(cx.has_flag::<feature_flags::AcpFeatureFlag>(), |this| {
-                                this.header("Zed Agent")
-                            })
-                            .when_some(active_thread, |this, active_thread| {
-                                let thread = active_thread.read(cx);
-
-                                if !thread.is_empty() {
-                                    let thread_id = thread.id().clone();
-                                    this.item(
-                                        ContextMenuEntry::new("New From Summary")
-                                            .icon(IconName::ThreadFromSummary)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    Box::new(NewThread {
-                                                        from_thread_id: Some(thread_id.clone()),
-                                                    }),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                                } else {
-                                    this
-                                }
-                            })
-                            .item(
-                                ContextMenuEntry::new("New Thread")
-                                    .icon(IconName::Thread)
-                                    .icon_color(Color::Muted)
-                                    .action(NewThread::default().boxed_clone())
-                                    .handler(move |window, cx| {
-                                        window.dispatch_action(
-                                            NewThread::default().boxed_clone(),
-                                            cx,
-                                        );
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("New Text Thread")
-                                    .icon(IconName::TextThread)
-                                    .icon_color(Color::Muted)
-                                    .action(NewTextThread.boxed_clone())
-                                    .handler(move |window, cx| {
-                                        window.dispatch_action(NewTextThread.boxed_clone(), cx);
-                                    }),
-                            )
-                            .when(cx.has_flag::<feature_flags::AcpFeatureFlag>(), |this| {
-                                this.separator()
-                                    .header("External Agents")
-                                    .item(
-                                        ContextMenuEntry::new("New Gemini Thread")
-                                            .icon(IconName::AiGemini)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    NewExternalAgentThread {
-                                                        agent: Some(crate::ExternalAgent::Gemini),
-                                                    }
-                                                    .boxed_clone(),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                                    .item(
-                                        ContextMenuEntry::new("New Claude Code Thread")
-                                            .icon(IconName::AiClaude)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    NewExternalAgentThread {
-                                                        agent: Some(
-                                                            crate::ExternalAgent::ClaudeCode,
-                                                        ),
-                                                    }
-                                                    .boxed_clone(),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                                    .item(
-                                        ContextMenuEntry::new("New Native Agent Thread")
-                                            .icon(IconName::ZedAssistant)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    NewExternalAgentThread {
-                                                        agent: Some(
-                                                            crate::ExternalAgent::NativeAgent,
-                                                        ),
-                                                    }
-                                                    .boxed_clone(),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                            });
-                        menu
-                    }))
-                }
-            });
-
-        let agent_panel_menu = PopoverMenu::new("agent-options-menu")
+        PopoverMenu::new("agent-options-menu")
             .trigger_with_tooltip(
                 IconButton::new("agent-options-menu", IconName::Ellipsis)
                     .icon_size(IconSize::Small),
@@ -2087,6 +1979,139 @@ impl AgentPanel {
                         menu
                     }))
                 }
+            })
+    }
+
+    fn render_recent_entries_menu(
+        &self,
+        icon: IconName,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let focus_handle = self.focus_handle(cx);
+
+        PopoverMenu::new("agent-nav-menu")
+            .trigger_with_tooltip(
+                IconButton::new("agent-nav-menu", icon)
+                    .icon_size(IconSize::Small)
+                    .style(ui::ButtonStyle::Subtle),
+                {
+                    let focus_handle = focus_handle.clone();
+                    move |window, cx| {
+                        Tooltip::for_action_in(
+                            "Toggle Panel Menu",
+                            &ToggleNavigationMenu,
+                            &focus_handle,
+                            window,
+                            cx,
+                        )
+                    }
+                },
+            )
+            .anchor(Corner::TopLeft)
+            .with_handle(self.assistant_navigation_menu_handle.clone())
+            .menu({
+                let menu = self.assistant_navigation_menu.clone();
+                move |window, cx| {
+                    if let Some(menu) = menu.as_ref() {
+                        menu.update(cx, |_, cx| {
+                            cx.defer_in(window, |menu, window, cx| {
+                                menu.rebuild(window, cx);
+                            });
+                        })
+                    }
+                    menu.clone()
+                }
+            })
+    }
+
+    fn render_toolbar_back_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let focus_handle = self.focus_handle(cx);
+
+        IconButton::new("go-back", IconName::ArrowLeft)
+            .icon_size(IconSize::Small)
+            .on_click(cx.listener(|this, _, window, cx| {
+                this.go_back(&workspace::GoBack, window, cx);
+            }))
+            .tooltip({
+                let focus_handle = focus_handle.clone();
+
+                move |window, cx| {
+                    Tooltip::for_action_in("Go Back", &workspace::GoBack, &focus_handle, window, cx)
+                }
+            })
+    }
+
+    fn render_toolbar_old(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let focus_handle = self.focus_handle(cx);
+
+        let active_thread = match &self.active_view {
+            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
+            ActiveView::ExternalAgentThread { .. }
+            | ActiveView::TextThread { .. }
+            | ActiveView::History
+            | ActiveView::Configuration => None,
+        };
+
+        let new_thread_menu = PopoverMenu::new("new_thread_menu")
+            .trigger_with_tooltip(
+                IconButton::new("new_thread_menu_btn", IconName::Plus).icon_size(IconSize::Small),
+                Tooltip::text("New Thread…"),
+            )
+            .anchor(Corner::TopRight)
+            .with_handle(self.new_thread_menu_handle.clone())
+            .menu({
+                let focus_handle = focus_handle.clone();
+                move |window, cx| {
+                    let active_thread = active_thread.clone();
+                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
+                        menu = menu
+                            .context(focus_handle.clone())
+                            .when_some(active_thread, |this, active_thread| {
+                                let thread = active_thread.read(cx);
+
+                                if !thread.is_empty() {
+                                    let thread_id = thread.id().clone();
+                                    this.item(
+                                        ContextMenuEntry::new("New From Summary")
+                                            .icon(IconName::ThreadFromSummary)
+                                            .icon_color(Color::Muted)
+                                            .handler(move |window, cx| {
+                                                window.dispatch_action(
+                                                    Box::new(NewThread {
+                                                        from_thread_id: Some(thread_id.clone()),
+                                                    }),
+                                                    cx,
+                                                );
+                                            }),
+                                    )
+                                } else {
+                                    this
+                                }
+                            })
+                            .item(
+                                ContextMenuEntry::new("New Thread")
+                                    .icon(IconName::Thread)
+                                    .icon_color(Color::Muted)
+                                    .action(NewThread::default().boxed_clone())
+                                    .handler(move |window, cx| {
+                                        window.dispatch_action(
+                                            NewThread::default().boxed_clone(),
+                                            cx,
+                                        );
+                                    }),
+                            )
+                            .item(
+                                ContextMenuEntry::new("New Text Thread")
+                                    .icon(IconName::TextThread)
+                                    .icon_color(Color::Muted)
+                                    .action(NewTextThread.boxed_clone())
+                                    .handler(move |window, cx| {
+                                        window.dispatch_action(NewTextThread.boxed_clone(), cx);
+                                    }),
+                            );
+                        menu
+                    }))
+                }
             });
 
         h_flex()
@@ -2105,8 +2130,12 @@ impl AgentPanel {
                     .pl_1()
                     .gap_1()
                     .child(match &self.active_view {
-                        ActiveView::History | ActiveView::Configuration => go_back_button,
-                        _ => recent_entries_menu,
+                        ActiveView::History | ActiveView::Configuration => {
+                            self.render_toolbar_back_button(cx).into_any_element()
+                        }
+                        _ => self
+                            .render_recent_entries_menu(IconName::MenuAlt, cx)
+                            .into_any_element(),
                     })
                     .child(self.render_title_view(window, cx)),
             )
@@ -2123,11 +2152,308 @@ impl AgentPanel {
                             .border_l_1()
                             .border_color(cx.theme().colors().border)
                             .child(new_thread_menu)
-                            .child(agent_panel_menu),
+                            .child(self.render_panel_options_menu(window, cx)),
                     ),
             )
     }
 
+    fn render_toolbar_new(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let focus_handle = self.focus_handle(cx);
+
+        let active_thread = match &self.active_view {
+            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
+            ActiveView::ExternalAgentThread { .. }
+            | ActiveView::TextThread { .. }
+            | ActiveView::History
+            | ActiveView::Configuration => None,
+        };
+
+        let new_thread_menu = PopoverMenu::new("new_thread_menu")
+            .trigger_with_tooltip(
+                ButtonLike::new("new_thread_menu_btn").child(
+                    h_flex()
+                        .group("agent-selector")
+                        .gap_1p5()
+                        .child(
+                            h_flex()
+                                .relative()
+                                .size_4()
+                                .justify_center()
+                                .child(
+                                    h_flex()
+                                        .group_hover("agent-selector", |s| s.invisible())
+                                        .child(
+                                            Icon::new(self.selected_agent.icon())
+                                                .color(Color::Muted),
+                                        ),
+                                )
+                                .child(
+                                    h_flex()
+                                        .absolute()
+                                        .invisible()
+                                        .group_hover("agent-selector", |s| s.visible())
+                                        .child(Icon::new(IconName::Plus)),
+                                ),
+                        )
+                        .child(Label::new(self.selected_agent.label())),
+                ),
+                {
+                    let focus_handle = focus_handle.clone();
+                    move |window, cx| {
+                        Tooltip::for_action_in(
+                            "New…",
+                            &ToggleNewThreadMenu,
+                            &focus_handle,
+                            window,
+                            cx,
+                        )
+                    }
+                },
+            )
+            .anchor(Corner::TopLeft)
+            .with_handle(self.new_thread_menu_handle.clone())
+            .menu({
+                let focus_handle = focus_handle.clone();
+                let workspace = self.workspace.clone();
+
+                move |window, cx| {
+                    let active_thread = active_thread.clone();
+                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
+                        menu = menu
+                            .context(focus_handle.clone())
+                            .header("Zed Agent")
+                            .when_some(active_thread, |this, active_thread| {
+                                let thread = active_thread.read(cx);
+
+                                if !thread.is_empty() {
+                                    let thread_id = thread.id().clone();
+                                    this.item(
+                                        ContextMenuEntry::new("New From Summary")
+                                            .icon(IconName::ThreadFromSummary)
+                                            .icon_color(Color::Muted)
+                                            .handler(move |window, cx| {
+                                                window.dispatch_action(
+                                                    Box::new(NewThread {
+                                                        from_thread_id: Some(thread_id.clone()),
+                                                    }),
+                                                    cx,
+                                                );
+                                            }),
+                                    )
+                                } else {
+                                    this
+                                }
+                            })
+                            .item(
+                                ContextMenuEntry::new("New Thread")
+                                    .icon(IconName::Thread)
+                                    .icon_color(Color::Muted)
+                                    .action(NewThread::default().boxed_clone())
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.set_selected_agent(
+                                                                AgentType::Zed,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                            window.dispatch_action(
+                                                NewThread::default().boxed_clone(),
+                                                cx,
+                                            );
+                                        }
+                                    }),
+                            )
+                            .item(
+                                ContextMenuEntry::new("New Text Thread")
+                                    .icon(IconName::TextThread)
+                                    .icon_color(Color::Muted)
+                                    .action(NewTextThread.boxed_clone())
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.set_selected_agent(
+                                                                AgentType::TextThread,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                            window.dispatch_action(NewTextThread.boxed_clone(), cx);
+                                        }
+                                    }),
+                            )
+                            .item(
+                                ContextMenuEntry::new("New Native Agent Thread")
+                                    .icon(IconName::ZedAssistant)
+                                    .icon_color(Color::Muted)
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.set_selected_agent(
+                                                                AgentType::NativeAgent,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                            window.dispatch_action(
+                                                NewExternalAgentThread {
+                                                    agent: Some(crate::ExternalAgent::NativeAgent),
+                                                }
+                                                .boxed_clone(),
+                                                cx,
+                                            );
+                                        }
+                                    }),
+                            )
+                            .separator()
+                            .header("External Agents")
+                            .item(
+                                ContextMenuEntry::new("New Gemini Thread")
+                                    .icon(IconName::AiGemini)
+                                    .icon_color(Color::Muted)
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.set_selected_agent(
+                                                                AgentType::Gemini,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                            window.dispatch_action(
+                                                NewExternalAgentThread {
+                                                    agent: Some(crate::ExternalAgent::Gemini),
+                                                }
+                                                .boxed_clone(),
+                                                cx,
+                                            );
+                                        }
+                                    }),
+                            )
+                            .item(
+                                ContextMenuEntry::new("New Claude Code Thread")
+                                    .icon(IconName::AiClaude)
+                                    .icon_color(Color::Muted)
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.set_selected_agent(
+                                                                AgentType::ClaudeCode,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                            window.dispatch_action(
+                                                NewExternalAgentThread {
+                                                    agent: Some(crate::ExternalAgent::ClaudeCode),
+                                                }
+                                                .boxed_clone(),
+                                                cx,
+                                            );
+                                        }
+                                    }),
+                            );
+                        menu
+                    }))
+                }
+            });
+
+        h_flex()
+            .id("agent-panel-toolbar")
+            .h(Tab::container_height(cx))
+            .max_w_full()
+            .flex_none()
+            .justify_between()
+            .gap_2()
+            .bg(cx.theme().colors().tab_bar_background)
+            .border_b_1()
+            .border_color(cx.theme().colors().border)
+            .child(
+                h_flex()
+                    .size_full()
+                    .gap(DynamicSpacing::Base08.rems(cx))
+                    .child(match &self.active_view {
+                        ActiveView::History | ActiveView::Configuration => {
+                            self.render_toolbar_back_button(cx).into_any_element()
+                        }
+                        _ => h_flex()
+                            .h_full()
+                            .px(DynamicSpacing::Base04.rems(cx))
+                            .border_r_1()
+                            .border_color(cx.theme().colors().border)
+                            .child(new_thread_menu)
+                            .into_any_element(),
+                    })
+                    .child(self.render_title_view(window, cx)),
+            )
+            .child(
+                h_flex()
+                    .h_full()
+                    .gap_2()
+                    .children(self.render_token_count(cx))
+                    .child(
+                        h_flex()
+                            .h_full()
+                            .gap(DynamicSpacing::Base02.rems(cx))
+                            .pl(DynamicSpacing::Base04.rems(cx))
+                            .pr(DynamicSpacing::Base06.rems(cx))
+                            .border_l_1()
+                            .border_color(cx.theme().colors().border)
+                            .child(self.render_recent_entries_menu(IconName::HistoryRerun, cx))
+                            .child(self.render_panel_options_menu(window, cx)),
+                    ),
+            )
+    }
+
+    fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        if cx.has_flag::<feature_flags::AcpFeatureFlag>() {
+            self.render_toolbar_new(window, cx).into_any_element()
+        } else {
+            self.render_toolbar_old(window, cx).into_any_element()
+        }
+    }
+
     fn render_token_count(&self, cx: &App) -> Option<AnyElement> {
         match &self.active_view {
             ActiveView::Thread {
@@ -2576,138 +2902,6 @@ impl AgentPanel {
                                 },
                             )),
                     )
-                    .child(self.render_empty_state_section_header("Start", None, cx))
-                    .child(
-                        v_flex()
-                            .p_1()
-                            .gap_2()
-                            .child(
-                                h_flex()
-                                    .w_full()
-                                    .gap_2()
-                                    .child(
-                                        NewThreadButton::new(
-                                            "new-thread-btn",
-                                            "New Thread",
-                                            IconName::Thread,
-                                        )
-                                        .keybinding(KeyBinding::for_action_in(
-                                            &NewThread::default(),
-                                            &self.focus_handle(cx),
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(
-                                            |window, cx| {
-                                                window.dispatch_action(
-                                                    NewThread::default().boxed_clone(),
-                                                    cx,
-                                                )
-                                            },
-                                        ),
-                                    )
-                                    .child(
-                                        NewThreadButton::new(
-                                            "new-text-thread-btn",
-                                            "New Text Thread",
-                                            IconName::TextThread,
-                                        )
-                                        .keybinding(KeyBinding::for_action_in(
-                                            &NewTextThread,
-                                            &self.focus_handle(cx),
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(
-                                            |window, cx| {
-                                                window.dispatch_action(Box::new(NewTextThread), cx)
-                                            },
-                                        ),
-                                    ),
-                            )
-                            .when(cx.has_flag::<feature_flags::AcpFeatureFlag>(), |this| {
-                                this.child(
-                                    h_flex()
-                                        .w_full()
-                                        .gap_2()
-                                        .child(
-                                            NewThreadButton::new(
-                                                "new-gemini-thread-btn",
-                                                "New Gemini Thread",
-                                                IconName::AiGemini,
-                                            )
-                                            // .keybinding(KeyBinding::for_action_in(
-                                            //     &OpenHistory,
-                                            //     &self.focus_handle(cx),
-                                            //     window,
-                                            //     cx,
-                                            // ))
-                                            .on_click(
-                                                |window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(NewExternalAgentThread {
-                                                            agent: Some(
-                                                                crate::ExternalAgent::Gemini,
-                                                            ),
-                                                        }),
-                                                        cx,
-                                                    )
-                                                },
-                                            ),
-                                        )
-                                        .child(
-                                            NewThreadButton::new(
-                                                "new-claude-thread-btn",
-                                                "New Claude Code Thread",
-                                                IconName::AiClaude,
-                                            )
-                                            // .keybinding(KeyBinding::for_action_in(
-                                            //     &OpenHistory,
-                                            //     &self.focus_handle(cx),
-                                            //     window,
-                                            //     cx,
-                                            // ))
-                                            .on_click(
-                                                |window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(NewExternalAgentThread {
-                                                            agent: Some(
-                                                                crate::ExternalAgent::ClaudeCode,
-                                                            ),
-                                                        }),
-                                                        cx,
-                                                    )
-                                                },
-                                            ),
-                                        )
-                                        .child(
-                                            NewThreadButton::new(
-                                                "new-native-agent-thread-btn",
-                                                "New Native Agent Thread",
-                                                IconName::ZedAssistant,
-                                            )
-                                            // .keybinding(KeyBinding::for_action_in(
-                                            //     &OpenHistory,
-                                            //     &self.focus_handle(cx),
-                                            //     window,
-                                            //     cx,
-                                            // ))
-                                            .on_click(
-                                                |window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(NewExternalAgentThread {
-                                                            agent: Some(
-                                                                crate::ExternalAgent::NativeAgent,
-                                                            ),
-                                                        }),
-                                                        cx,
-                                                    )
-                                                },
-                                            ),
-                                        ),
-                                )
-                            }),
-                    )
                     .when_some(configuration_error.as_ref(), |this, err| {
                         this.child(self.render_configuration_error(err, &focus_handle, window, cx))
                     })
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index b776c0830b..231b9cfb38 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -64,6 +64,8 @@ actions!(
         NewTextThread,
         /// Toggles the context picker interface for adding files, symbols, or other context.
         ToggleContextPicker,
+        /// Toggles the menu to create new agent threads.
+        ToggleNewThreadMenu,
         /// Toggles the navigation menu for switching between threads and views.
         ToggleNavigationMenu,
         /// Toggles the options menu for agent settings and preferences.
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index b477a8c385..beeaf0c43b 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -2,7 +2,7 @@ mod agent_notification;
 mod burn_mode_tooltip;
 mod context_pill;
 mod end_trial_upsell;
-mod new_thread_button;
+// mod new_thread_button;
 mod onboarding_modal;
 pub mod preview;
 
@@ -10,5 +10,5 @@ pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
 pub use end_trial_upsell::*;
-pub use new_thread_button::*;
+// pub use new_thread_button::*;
 pub use onboarding_modal::*;
diff --git a/crates/agent_ui/src/ui/new_thread_button.rs b/crates/agent_ui/src/ui/new_thread_button.rs
index 7764144150..347d6adcaf 100644
--- a/crates/agent_ui/src/ui/new_thread_button.rs
+++ b/crates/agent_ui/src/ui/new_thread_button.rs
@@ -11,7 +11,7 @@ pub struct NewThreadButton {
 }
 
 impl NewThreadButton {
-    pub fn new(id: impl Into<ElementId>, label: impl Into<SharedString>, icon: IconName) -> Self {
+    fn new(id: impl Into<ElementId>, label: impl Into<SharedString>, icon: IconName) -> Self {
         Self {
             id: id.into(),
             label: label.into(),
@@ -21,12 +21,12 @@ impl NewThreadButton {
         }
     }
 
-    pub fn keybinding(mut self, keybinding: Option<ui::KeyBinding>) -> Self {
+    fn keybinding(mut self, keybinding: Option<ui::KeyBinding>) -> Self {
         self.keybinding = keybinding;
         self
     }
 
-    pub fn on_click<F>(mut self, handler: F) -> Self
+    fn on_click<F>(mut self, handler: F) -> Self
     where
         F: Fn(&mut Window, &mut App) + 'static,
     {
diff --git a/crates/zed/src/zed/component_preview.rs b/crates/zed/src/zed/component_preview.rs
index ac889a7ad9..4609ecce9b 100644
--- a/crates/zed/src/zed/component_preview.rs
+++ b/crates/zed/src/zed/component_preview.rs
@@ -761,7 +761,7 @@ impl Render for ComponentPreview {
                         )
                         .track_scroll(self.nav_scroll_handle.clone())
                         .p_2p5()
-                        .w(px(229.))
+                        .w(px(231.)) // Matches perfectly with the size of the "Component Preview" tab, if that's the first one in the pane
                         .h_full()
                         .flex_1(),
                     )

From e52f1483049aa6c0b155c04fb4808aeb9a4bcd1a Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 13 Aug 2025 13:56:51 -0400
Subject: [PATCH 003/823] Bump Zed to v0.201 (#36132)

Release Notes:

-N/A
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ac1a56d53f..3b1337eece 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20500,7 +20500,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.200.0"
+version = "0.201.0"
 dependencies = [
  "activity_indicator",
  "agent",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index bdbb39698c..4335f2d5a1 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "0.200.0"
+version = "0.201.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 4a3549882905e07b2d4ef259bff7da30d70aa922 Mon Sep 17 00:00:00 2001
From: smit <heysmitbarmase@gmail.com>
Date: Thu, 14 Aug 2025 00:19:37 +0530
Subject: [PATCH 004/823] copilot: Fix Copilot fails to sign in (#36138)

Closes #36093

Pin copilot version to 1.354 for now until further investigation.

Release Notes:

- Fixes issue where Copilot failed to sign in.

Co-authored-by: MrSubidubi <dev@bahn.sh>
---
 crates/copilot/src/copilot.rs           | 12 ++++++------
 crates/languages/src/css.rs             |  8 +++++++-
 crates/languages/src/json.rs            |  8 +++++++-
 crates/languages/src/python.rs          |  1 +
 crates/languages/src/tailwind.rs        |  8 +++++++-
 crates/languages/src/typescript.rs      |  1 +
 crates/languages/src/vtsls.rs           |  2 ++
 crates/languages/src/yaml.rs            |  8 +++++++-
 crates/node_runtime/src/node_runtime.rs | 15 ++++++++++++++-
 9 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 49ae2b9d9c..166a582c70 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -21,7 +21,7 @@ use language::{
     point_from_lsp, point_to_lsp,
 };
 use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionCheck};
 use parking_lot::Mutex;
 use project::DisableAiSettings;
 use request::StatusNotification;
@@ -1169,9 +1169,8 @@ async fn get_copilot_lsp(fs: Arc<dyn Fs>, node_runtime: NodeRuntime) -> anyhow::
     const SERVER_PATH: &str =
         "node_modules/@github/copilot-language-server/dist/language-server.js";
 
-    let latest_version = node_runtime
-        .npm_package_latest_version(PACKAGE_NAME)
-        .await?;
+    // pinning it: https://github.com/zed-industries/zed/issues/36093
+    const PINNED_VERSION: &str = "1.354";
     let server_path = paths::copilot_dir().join(SERVER_PATH);
 
     fs.create_dir(paths::copilot_dir()).await?;
@@ -1181,12 +1180,13 @@ async fn get_copilot_lsp(fs: Arc<dyn Fs>, node_runtime: NodeRuntime) -> anyhow::
             PACKAGE_NAME,
             &server_path,
             paths::copilot_dir(),
-            &latest_version,
+            &PINNED_VERSION,
+            VersionCheck::VersionMismatch,
         )
         .await;
     if should_install {
         node_runtime
-            .npm_install_packages(paths::copilot_dir(), &[(PACKAGE_NAME, &latest_version)])
+            .npm_install_packages(paths::copilot_dir(), &[(PACKAGE_NAME, &PINNED_VERSION)])
             .await?;
     }
 
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index 7725e079be..19329fcc6e 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -103,7 +103,13 @@ impl LspAdapter for CssLspAdapter {
 
         let should_install_language_server = self
             .node
-            .should_install_npm_package(Self::PACKAGE_NAME, &server_path, &container_dir, &version)
+            .should_install_npm_package(
+                Self::PACKAGE_NAME,
+                &server_path,
+                &container_dir,
+                &version,
+                Default::default(),
+            )
             .await;
 
         if should_install_language_server {
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index ca82bb2431..019b45d396 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -340,7 +340,13 @@ impl LspAdapter for JsonLspAdapter {
 
         let should_install_language_server = self
             .node
-            .should_install_npm_package(Self::PACKAGE_NAME, &server_path, &container_dir, &version)
+            .should_install_npm_package(
+                Self::PACKAGE_NAME,
+                &server_path,
+                &container_dir,
+                &version,
+                Default::default(),
+            )
             .await;
 
         if should_install_language_server {
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 0524c02fd5..5513324487 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -206,6 +206,7 @@ impl LspAdapter for PythonLspAdapter {
                 &server_path,
                 &container_dir,
                 &version,
+                Default::default(),
             )
             .await;
 
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index a7edbb148c..6f03eeda8d 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -108,7 +108,13 @@ impl LspAdapter for TailwindLspAdapter {
 
         let should_install_language_server = self
             .node
-            .should_install_npm_package(Self::PACKAGE_NAME, &server_path, &container_dir, &version)
+            .should_install_npm_package(
+                Self::PACKAGE_NAME,
+                &server_path,
+                &container_dir,
+                &version,
+                Default::default(),
+            )
             .await;
 
         if should_install_language_server {
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index f976b62614..a8ba880889 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -589,6 +589,7 @@ impl LspAdapter for TypeScriptLspAdapter {
                 &server_path,
                 &container_dir,
                 version.typescript_version.as_str(),
+                Default::default(),
             )
             .await;
 
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 33751f733e..73498fc579 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -116,6 +116,7 @@ impl LspAdapter for VtslsLspAdapter {
                 &server_path,
                 &container_dir,
                 &latest_version.server_version,
+                Default::default(),
             )
             .await
         {
@@ -129,6 +130,7 @@ impl LspAdapter for VtslsLspAdapter {
                 &container_dir.join(Self::TYPESCRIPT_TSDK_PATH),
                 &container_dir,
                 &latest_version.typescript_version,
+                Default::default(),
             )
             .await
         {
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index 815605d524..28be2cc1a4 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -104,7 +104,13 @@ impl LspAdapter for YamlLspAdapter {
 
         let should_install_language_server = self
             .node
-            .should_install_npm_package(Self::PACKAGE_NAME, &server_path, &container_dir, &version)
+            .should_install_npm_package(
+                Self::PACKAGE_NAME,
+                &server_path,
+                &container_dir,
+                &version,
+                Default::default(),
+            )
             .await;
 
         if should_install_language_server {
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index 08698a1d6c..6fcc3a728a 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -29,6 +29,15 @@ pub struct NodeBinaryOptions {
     pub use_paths: Option<(PathBuf, PathBuf)>,
 }
 
+#[derive(Default)]
+pub enum VersionCheck {
+    /// Check whether the installed and requested version have a mismatch
+    VersionMismatch,
+    /// Only check whether the currently installed version is older than the newest one
+    #[default]
+    OlderVersion,
+}
+
 #[derive(Clone)]
 pub struct NodeRuntime(Arc<Mutex<NodeRuntimeState>>);
 
@@ -287,6 +296,7 @@ impl NodeRuntime {
         local_executable_path: &Path,
         local_package_directory: &Path,
         latest_version: &str,
+        version_check: VersionCheck,
     ) -> bool {
         // In the case of the local system not having the package installed,
         // or in the instances where we fail to parse package.json data,
@@ -311,7 +321,10 @@ impl NodeRuntime {
             return true;
         };
 
-        installed_version < latest_version
+        match version_check {
+            VersionCheck::VersionMismatch => installed_version != latest_version,
+            VersionCheck::OlderVersion => installed_version < latest_version,
+        }
     }
 }
 

From bd61eb08898e379ae1f093895738d805af726430 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 13 Aug 2025 13:25:52 -0600
Subject: [PATCH 005/823] Use IBM Plex Sans / Lilex (#36084)

The Zed Plex fonts were found to violate the OFL by using the word Plex
in the name.

Lilex has better ligatures and box-drawing characters than Zed Plex
Mono, but Zed Plex Sans should be identical
to IBM Plex Sans.

Closes #15542
Closes zed-industries/zed-fonts#31

Release Notes:

- The "Zed Plex Sans" and "Zed Plex Mono" fonts have been replaced with
"IBM Plex Sans" and "Lilex". The old names still work for backward
compatibility. Other than fixing line-drawing characters, and improving
the ligatures, there should be little visual change as the fonts are all
of the same family.
- Introduced ".ZedSans" and ".ZedMono" as aliases to allow us to easily
change the default fonts in the future. These currently default to "IBM
Plex Sans" and "Lilex" respectively.
---
 .../fonts/ibm-plex-sans/IBMPlexSans-Bold.ttf  | Bin 0 -> 200872 bytes
 .../ibm-plex-sans/IBMPlexSans-BoldItalic.ttf  | Bin 0 -> 208588 bytes
 .../ibm-plex-sans/IBMPlexSans-Italic.ttf      | Bin 0 -> 207920 bytes
 .../ibm-plex-sans/IBMPlexSans-Regular.ttf     | Bin 0 -> 200500 bytes
 .../{plex-mono => ibm-plex-sans}/license.txt  |   0
 assets/fonts/lilex/Lilex-Bold.ttf             | Bin 0 -> 192992 bytes
 assets/fonts/lilex/Lilex-BoldItalic.ttf       | Bin 0 -> 197532 bytes
 assets/fonts/lilex/Lilex-Italic.ttf           | Bin 0 -> 198216 bytes
 assets/fonts/lilex/Lilex-Regular.ttf          | Bin 0 -> 194308 bytes
 .../{plex-sans/license.txt => lilex/OFL.txt}  |   7 ++-
 assets/fonts/plex-mono/ZedPlexMono-Bold.ttf   | Bin 163568 -> 0 bytes
 .../plex-mono/ZedPlexMono-BoldItalic.ttf      | Bin 170088 -> 0 bytes
 assets/fonts/plex-mono/ZedPlexMono-Italic.ttf | Bin 169868 -> 0 bytes
 .../fonts/plex-mono/ZedPlexMono-Regular.ttf   | Bin 161844 -> 0 bytes
 assets/fonts/plex-sans/ZedPlexSans-Bold.ttf   | Bin 206164 -> 0 bytes
 .../plex-sans/ZedPlexSans-BoldItalic.ttf      | Bin 213704 -> 0 bytes
 assets/fonts/plex-sans/ZedPlexSans-Italic.ttf | Bin 213092 -> 0 bytes
 .../fonts/plex-sans/ZedPlexSans-Regular.ttf   | Bin 205848 -> 0 bytes
 assets/settings/default.json                  |  10 +++-
 crates/assets/src/assets.rs                   |   4 +-
 crates/editor/src/display_map/block_map.rs    |   2 -
 crates/editor/src/display_map/wrap_map.rs     |   2 +-
 crates/editor/src/test.rs                     |   2 +-
 crates/gpui/src/platform/linux/text_system.rs |   6 +-
 crates/gpui/src/platform/mac/text_system.rs   |   6 +-
 .../gpui/src/platform/windows/direct_write.rs |   4 +-
 crates/gpui/src/text_system.rs                |  17 +++++-
 crates/gpui/src/text_system/line_wrapper.rs   |   2 +-
 crates/markdown/examples/markdown.rs          |   6 +-
 crates/storybook/src/storybook.rs             |   2 +-
 crates/vim/src/vim.rs                         |   8 +--
 crates/zed/src/zed.rs                         |   4 +-
 docs/src/configuring-zed.md                   |  10 ++--
 docs/src/fonts.md                             |  56 ------------------
 docs/src/visual-customization.md              |  12 ++--
 nix/build.nix                                 |   4 +-
 nix/shell.nix                                 |   4 +-
 37 files changed, 58 insertions(+), 110 deletions(-)
 create mode 100644 assets/fonts/ibm-plex-sans/IBMPlexSans-Bold.ttf
 create mode 100644 assets/fonts/ibm-plex-sans/IBMPlexSans-BoldItalic.ttf
 create mode 100644 assets/fonts/ibm-plex-sans/IBMPlexSans-Italic.ttf
 create mode 100644 assets/fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf
 rename assets/fonts/{plex-mono => ibm-plex-sans}/license.txt (100%)
 create mode 100644 assets/fonts/lilex/Lilex-Bold.ttf
 create mode 100644 assets/fonts/lilex/Lilex-BoldItalic.ttf
 create mode 100644 assets/fonts/lilex/Lilex-Italic.ttf
 create mode 100644 assets/fonts/lilex/Lilex-Regular.ttf
 rename assets/fonts/{plex-sans/license.txt => lilex/OFL.txt} (96%)
 delete mode 100644 assets/fonts/plex-mono/ZedPlexMono-Bold.ttf
 delete mode 100644 assets/fonts/plex-mono/ZedPlexMono-BoldItalic.ttf
 delete mode 100644 assets/fonts/plex-mono/ZedPlexMono-Italic.ttf
 delete mode 100644 assets/fonts/plex-mono/ZedPlexMono-Regular.ttf
 delete mode 100644 assets/fonts/plex-sans/ZedPlexSans-Bold.ttf
 delete mode 100644 assets/fonts/plex-sans/ZedPlexSans-BoldItalic.ttf
 delete mode 100644 assets/fonts/plex-sans/ZedPlexSans-Italic.ttf
 delete mode 100644 assets/fonts/plex-sans/ZedPlexSans-Regular.ttf
 delete mode 100644 docs/src/fonts.md

diff --git a/assets/fonts/ibm-plex-sans/IBMPlexSans-Bold.ttf b/assets/fonts/ibm-plex-sans/IBMPlexSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..1d66b1a2e96d5e33d6f5fa8e81e76b4e5621d240
GIT binary patch
literal 200872
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%0Au0SR58I@USL7
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
R9CI9FBR&6<M%FC(zW`Jmaz+3E

literal 0
HcmV?d00001

diff --git a/assets/fonts/ibm-plex-sans/IBMPlexSans-BoldItalic.ttf b/assets/fonts/ibm-plex-sans/IBMPlexSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e07bc1f527dd77ba8fd967ef00a54371da7bfaf0
GIT binary patch
literal 208588
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%0AUjNG^0m?G#PwapwT3gC5I@FYzT-Ni<mu(
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
Ik7+FT->U>kxc~qF

literal 0
HcmV?d00001

diff --git a/assets/fonts/ibm-plex-sans/IBMPlexSans-Italic.ttf b/assets/fonts/ibm-plex-sans/IBMPlexSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..efe8a1fb9de848891cd6e7d70280e1f47019c0ca
GIT binary patch
literal 207920
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
H#&Z7)NtEp!

literal 0
HcmV?d00001

diff --git a/assets/fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf b/assets/fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..bd6817d5202895da5ac4fad88de3da71e652881a
GIT binary patch
literal 200500
zcmcG%31F1P`9D50@8%%)wYiTya%XdHvN_0oY(f%3$N@<p;l7beL<B`tL_~_z0~Ie6
zik4c%3o%;6qo}AzQK?!>skN3;YpF%+0h|BlnfKiz30m9#?@O4S*?Hf0-shU<dFGj8
z8E1@z<3q>t>O03Z;u~j5um!nqV||1DvEau{OavKF{bpnPgwCY9R#Y+({260^|GKfW
zyY@lTf+v}{@CjofjtQN)1zYMa@4&qW@ci^ym&{o9Z1B&YU@T0>n7^2{YNa74QAuaa
z(1YvsbC=D##Jl&NV#X4D@yw<3W?Z_AMKd$r7lP{{^A=w*_u0yf8phIZLzC~%pEF~2
zN_Wp0+*^+8w)v>=`M`S!-&f*$^88Cyu73KRgTG)*L^Brr+2W<MX54>$U?1Lh4`V)G
zUovC$GVe%n4)@=Q`wf@OSve!;t#uhp2?G4AX~~RB=A69M`*X(sxR|jq?aP*4x^mwO
zU0*VO=6S}<6PK-+vyA<|=`qF<uS6Rkfl`bqyz$RLA73&pxco~tMmdcd_Q$+Co>B9)
z_c+cE`RhK=O~dywOi(TU5xKeJ?~HlHI?g-J>pqYzsn_JE@*UOSvy1t#naoSO?gz}6
zC<m`N(}@Xu8?G?1Sr9c_)SM5na$e-ig};~LB@`x<olN|rof*bDn;%y@-oUFF8@iwb
z3?*}mj`MH><M-2bp%a713{3F%@k#%{X-XoJSwuZ6K<eiIX1TJQ!g6^%OAsL}OMVYW
zUc$QBx2zS3i(uRv!n&0OtefgZo_wyG?&V8y?Jq2uPs8&itet<x!W71m_;*at|HVT2
zF=iCkuqg2p)-Nt$W#WG1jYzpj&*1yZtRMK7a|eqTYf%1@^(z)!L%nzf*9WwGJ@N*Y
z393bkJ*-E}U=hk%79r-aXfcrm0+wXZuiPV9QEouWL`p>(k5q?5b!A$4EOKX}XS<O~
zkPJw4f3=oZ$nt*Hgm>2Pn^}W1iB`N9NeMuL)QBRM2wJr$X4b-!CEe1H=Tl-|;QKD5
zP}YcK;lD%vA@VS0M%m2sK*u~*C^*{WtdPgEi88&zQuyy#6raF4`GleGcm?QG0h&!_
zkx1qIYBmNbo!vTAL`k`y)p*4M&N8-^l4xeFVhbx&e3=c>o-S@-2Ed=rx8mLJvRc4Z
z0=P=}OL%WOWP{S{l9mO)n{X$(Inz{+vh!LW>RgH2*<6_j|1GSQ=z#0F+H(nfFWUcv
zg@_Zt_cSx<6!3Nes}i$Wm=L&cIV<CT9=aep0mCHFqo0|?2Hdj}e51MpEEw?hD+gGL
zB2Zt?8pQ(UC#D0pl`K*0#(gVUj=Z1h`dJa=C{QfLwd>eaQ4Cq_LZZI#|1=GK?P^c$
zW7N<7U!`zoTgr51p+x<6WD-;GzDA@h&=LLme@x-So+EwWnMUGN!t|nK=nv2pq%$V6
zZ-+ib`n{IUqOKV!5Gez7Um#bIpWtU98)w-BeCKK!`aS6yP2WsJzmR%|&qW>y*&yBH
zk(4a(&#8|{C;g{X!pyke{2%XA+lg@Ar|bfqNzW~1W0A_Gz9XIInIa)i>ydJB-yHNW
z=tE}$-w5vZ|Eom$)-y@HOS<=B3Hq3HvP&<MZvH<=%1um1N$Pyk`<{txz=JGQCb9+p
zTe7&GBRfI1#529l;>d<b+p-P%cN_Gbn##1g@{8m~aXoCy_241wk%vv1LUzfO&JTS<
zZI4O>$NyncK0y0q2c3!R;mGtnuG@h-*-2+28%j3w|0t0i_Ds?qlTE%@B0KF&73de&
zp%1^r^7z;2-){oH4bWZVkea}Qub|VZFM6ZTJ%YS~C5ZyqsWeSTTwva!7WWM?KmHoa
zmiI1!KadXl@h9Bhh<^Kf_z2YZ-hi)imIc7(w2M=)DVk4$KGH8?AQ>dMG{1vngZvS3
z8H;lHBTeuJh`&#xo@iPM+d?!3o=O+9kuRb|vif0o0Cs|#VCHE<|3*43;q=r8PIzYE
z+V6)>^EZ&T;XSY6`_GVwj&CA&`fi2HN_s}bgBDMs-M_<U>1MvtK0xQgCZ>xISS;i<
zo}YkE(yHknXP%1hen>^k7c`E5J?)nF5Uq(Pq*I}@q-}X0yoKLKx<q`A_r4FB!ncDh
z?-sqFWh^UD5~Xk0u9PCb5p`{7vkts_7x(z$*{_)$Jc?HW@%<a5D3%5tZ<0K?5_E)b
zDEV*#&kW*O@IpDxGL>h+kBKbB)z7x$-c3l4;66{jc=Ckw4DqBBaJK?BB<Ul5i07_n
zWeWO-@<){a%p#RV$X6j<4nN`$^7SkOW!p#_E^RH**_nO~Js%4^JnSp*lXNHAD?XtA
z?=<=o558ovux~1jojjnN_+UXI`>+^zr!u{g0zS?I9jj6IC6cF21I-l=zKB;@#3&sP
z|C@Yp*lRuU20Sj1Iq@O|HVHP1cno;p+Yga#=HNH%w@fNd*RvSVDn{G~d5A$<ntdRB
zPJD7E;lqN&TF}i?e_sw76YnT}h;%3LA|7f<_A5`_Nj$v|=_&BV3w(Q##VOS9PqThq
zAnI<zHBX%iJ}PHXr}0^tr}CQk?MhC)vjMsQJQsVBi1)<r2cR2CXQB^l`oE0yyb=a^
zh(}x3tM7wMN654o&;Am0UITw?9_)G_Ga*GIMewQc0p`K3OhEr$Ew88i*!z_E%plVg
zW>O}gTmszzzd`B2_coMCey8GlBgPf|$ge?Ki2B9&-U55S4Bxl0bx5m~LRO6QhL)(j
z7wJlm{92SL(KXNXBED1dtfO`Uk%BzxyHF+{ego1iNIQ|fLAnp=Nu(j9=a6pF(rw6Z
zMmnISZ$%Hcp!^=v9+abyZ^qcQ7wIyjqezz`Z9;k%X&cgXEiFL)6QoCw-ez*tJ@h2X
zdy(Ek`V|t!<wJ8l61BS+iP~`HGZ}N7_o(Xy44(L$!}oiUegr-|3hfX)^F0#1a}g4~
z)0um|lj?eD3{K-jN}M7Xl*R+AZ;>8?u0{+1<449;X~{L-$9LDip?{+-Invifvh}*V
zST)*1Q~`dqn&Q<+!x%r*aMZ;!o$u$!KVj>cH=B)8Aj@N=teW+)d29_^$FJr$^IP}>
zd>{Xa4~aNYEPBQB;#Ki`MW+NPVTxXfQ_M=bvQF8oY*Dr;4=6uZ9#>vhj_Trc$+}$K
zG~F!SBHd-Wmk=fStL_`Gl%T4_>l5!w{KgPy&>Lb6i3XD))sSJxGgu8}hI+#?!xe@b
z4G$Q08}=9;H9TQ>+AwJNmEi?rxG~abGNu}Hj1!Fm#=DGrjZYe%F+OK}#dz2xOx~to
zQ<zC_iZvygvP?EplWDqXPRfzA@U+&f(9cf&<IS($|4ulDhAs>Z0Y}2p!17rct6@{v
ze72VDlvwWMkMXzow<20%`J6Z`-dC97?ZPq@SZ)B8Ta}+GyOh1k6Uq@C)5Ysjba}d&
zx`nzGx^23*bsy<I_eutq>w)D?12cpeq7Cr|1F%dt<QfVLr4q}PhV>ej4;vmgJY_gA
z0?T$|r*WI{=f-`;{l-BLEJJ~1j0cvpH7tW9mcRXuYgqE3FD0IA=oDmP4<XGmhvH=}
zKOA2;o?)M|_q3V^*!^q=yN$8)h?P11g!HuIDSTc@*By5|?$Pe^$i6_&{L=tcoU*Ic
zr%L|x2EI)`RdA~KWBT{esjyQar-D)Ef6DKa?<wz7UVpg#54Zkd)*rq8aE1EJA3sGz
z?YH<l{KuD1K77h_DweU6^N=>3Tyt{K$q6S*P8NUo{ztPvvM?4E6M;{!S9JeUE~t{s
zPN5YC`i3u3B2T6^#Yu5Wd<@Q!<ja4GFL;P{wQq^&3<ji3`c9vUO{tXSWy(?Im~vcs
zUstYc2S?W<l1FKiR~g>h;Wf#tkKv#CNhS9`uV#1IUGl2+s;9fX7P{-G<OK~tY2-gI
zL|1X8%T=$iW$2e%**<m^>twUorEDd;iT#vKhpp~sSFo{c8k@oHV%x#J6|9S0hF-gh
z-OQ#cJD3iA+K2ffGU><s+2!nNwwi5IK4DAQBkVEu3-&mA{WZ!R>^ioQUBY%L|7IJM
z+u0^|tJ0-(D|d-Bb}hRPlHSQ~U`vz*%3N5Q<@_i72ELi!%5UO7<@fOi(Ptj!zu=GX
zSNS3SGJl0X#6RGF<iF!5`Cs@S*lqmJ!dD34CA>v~;Cu>ui@nN@uy@!S>^JO7_6_%D
zLtJo$n|M4=;s)m6HeSU`c{y)DH0yR=$LI5zd=8(>ui`UEAF;RjCiWVv^fA7Z{hRM%
z-}2q;JN^Lsn*WTQ=X=-%{y6vLKj)19lI!>rd<@^qIe(6a@j)KSf5jvC^E{ltz+?GA
z9>d?@sr+@G%wOaQ{0L9szvglLO`gWz=2`q0xA1KK8=k}8;d%Tx&*ks(eEuFU;3v41
zzt4;KZ+Rgv<{$DB{t2&zj>HIq*YJPwiToVz;9v1B{w43^|K{ENTi(OJ;gk8-e3D>%
zI(P5^eu4LkAihNS^F>18vqT`jMELQAB7iRzv3!k4<m-e%B=Zd-m2VU&{CeKUPjkBn
z=1cjF>~;PUWd8SjtkCh<LeDP~k$jbi=Bq^%zntH~jw9;(75|ji^Y3^sAL7%LdzJ0V
z{mO3TR^?9Rm&zl`qsl|d!^%GBY|>_rE5A@4Qw}Kmm1mWoDSO01cE4C87K=;7GO<F;
z7E8o(F(9Uk8DgfGFDzn~m?!3lxnhA5qr@uBN`w-xG$@TqlQK@pR&tdV*o9Q3T(OIX
z#KYp}Vz2mx_@#JM>=TcRC&ZKDX>qBzOso>C#Ts#?xJq0tt`XOX>%|S?Mnt=B5?jPp
zakJPaZV|VN+r@Tqr?^YpE$$Wfi=E;@u}l0+{1zH|j5sbngf;S3d=y{tnfP4s6Mqq(
zi0>3HrCw1KgE*-ah<_>*l@LWQ-ch2&drGu8p(MeEnZzk2L!4GJ#a|VR_?wa?&L}zJ
z?@FHdhf*ZYDeX$IViR8~#o{ZaLY!AB#Ra8GIFu6cZ>0trrdHuftKzS;DS^raB}hqD
z62(W*Jz?Ug5-Q$O!o_ctIPrlp9=0+;{7x~7KPYDLM<q>ss-%cNDf!~8VijK~rQ&O)
zOnjq^72hh=Vn~S;?<#eQPzuGrL_EJz#PBOb9AAs5>6?ho9_4qj5BS~ecl;jq5x<xH
zp6_5E^4r+Ed^<bA?_j^h{KxzJcJ>~BlzYK)`|u~ZAAgGb^Zh)KKf{Cg0Upes<^lXQ
zZsv!%k)Ps~{9|6tKj(<N@izWXK7oJ1+xb8Ec>Y)3$p6O2@y~cO|2uEtXLytF;q$~8
zzCeWVWg?8P5aIk%5y4lAP`+Fk`86VmuNNkMtuXWJl)or{R!%FQDt}eZD1TEvQ~s`e
zuAEi=seB24eh!<<7QoY(&la*R>?dre@(;F-?Pt%h1MFG$OE$=!Q<f{MlzGa0Ws$O2
zxkOo_ELD~%E0jx>mC9wx70MdrN@cBb6Rh%8u+Hn1tCee%8<cC6O(K)s!tQ0em5s33
z*DKd42QilO#+Z|4YW^)fB2u#C8U5#f|5*!HvMP8@HHezmv3l0P>?8EDk(n^_mCRCD
zDoaC5K7(a4#3@-e%VD|jx$;>7v$8@~#B8jXmB0rp`vF}Z#DZA}3uR#}oJBA_i)2wO
zn#Eu|83&&(fhDpecsQEIhh-#P{UG%82mB9+n!E}fd<6RU9cbWhpnbii{*8wQhW>^2
zErtFq=M~VuGogE-dBK}a(q>%4cCu@s!#BWYT(8^(+i@psz@OP3b}PG^-NPP-&Dbk4
zMFz&&KZ8}d0WtP3c^z90o3o4UW{<Kv5QVvfEnx%7C$J>9!bU(>vR>(L&X@9VJA05{
zEe!C=e#sWG#q8JYFeKwX$jL(ZqnlxCZh*CUOtUtxlBEHLf0Q=Hm&Yl0L%ZFsX}Vp|
zbGsGzE(aL1v>d>sU(e&5Z|yz6hps=s>Jy%YEGW|kvJWtBF&G*a)bHcd@kLlrk!eIp
zu^8<8loWeMkGa>d*|2%s?9B$dVg8KS`*bNX$AvkYdvgu@SZB`ye0KF1_f_}Cxr%do
zd&|&{j@rQ^xP5akT3D#HfLvDPUcgOWmKMW4CAGb0V$Z(y^>O>E>wDvjMnl8CL+w5L
z4%NpQdwX%0w+m80eAR+z4Q3y}?4610zG^F-J^QNT_Oag0o2kvt9<y=Z`pui;HUkgs
z`vG=nL<MIfE2^~$Py%g$5)B9V`gSyi%xsLK3bWB{1f0F~c=s4fOJ`35AT{=86V0>G
zgE<RgB8v|~WHDcv#a}>SB6>+7`U1vF%s1-=$Z`WD-U68o*J?u1n~Km&5+UPs4|@R(
zb)st(q5C)=6X+y)=uC;O#}qb+HKGHhyYA6J#dM)#=AvV$FY{t;=&S`E?Rc}PtOc%=
zyJa7A#!O~JrwY=Z^2KCDIa)EH!>R3zfjc#mjmO)JT8$qZv8zyL$Fu4^{(!`QRzl@4
zj8F}Lo7RUr3IMfwPaxhs9G)PMCeh<5P%#XCoKF@=s`7jg<cY+*_#oUvHLue0omw73
z`DNOD$fu({e(4}cjU3M{)$(A<alJ~*Wj(&%uYG?T@Y8eu(DEwESAx8CXtEmGsu5&a
z3>0#p-L?R&W_Bmo)DA{47BE!80{A%S-Q|eM>JVogMEV3N8iZiDTm3uAoA^s2LTrJ}
z>(Yhj9`u^&b-?SqcdPfE-mmzy`8??JmG3g&(_<`SwvYM5ugq_S-*JC~|6>0={$B;G
z33x3qI&fLwzM#~gEkTEaeS_PAR|g*tNesC%<de`zp~u3?!<K|S74~^}SNQJm(-EeK
zRS{q57wR90^o!gd<sG#$>P&Qc^r@JhnEkOOvHN2`k86#4Ej}cEb%HLTGU2tvsY#gz
zfsv}okcrV-vtg!TrD2O<zu~aqxKU>eF~%E9jP=G<7?JKbzGOUWJa39L<(bMc2Hjvf
zY&MxUn)jPOO%6!TOJ0+FIQi2Q@09eEyp*G<dr}Xkew?-~?P&VOjOvWtnT46_GT+QR
zllfIva@OLkBbEWn2Ftsa^Vt#EUD@lhk7j?BBXVkU=H_h4Ih1oQ=X`ErZhCHWZcpxx
z-2J&<=jG)c$T#HgENCxy)7ol1QrKE}xTwIk(srWwKxtm-k+PX%1IE5vUR!>$qP}8N
z<?O11)mPTMR_j~4z4lDqKz&*L^YyRQzgvH*{<He88*~jJ4e<@>4Tbg~d#pXxUSO}Z
zx7qvbbL}ha>+D<YJM4SxPuLIIkJwMxKem5v|F+S)F|0AM@uSAmjpv$JQ$SOEQ+iWj
zQ*~2o)6}N<O)Hz$k6SWs&A5%@ZfTBfPHiq|u53Qpa&61jmK`m7TApY**m9)hM9ar5
zpSOJ5dZ_iy*7sXax1Jl%#s`ewJbwH52gg4;esKKZ@yExX9Dk;5Zrh5s?QIXXJ=!+d
zcDU_$+sU>wZC_0g6Shv+F=5Yy!3n1)oNH(80qs5Qv)h-oU)jE?{loT8+rMacO!S)=
zIdSF0^%J*DymR92iTfr#Kk>DR?@l~5@w1Ng9a}o??DXr5>@;=ebe476J3BgOb}s2$
z)48#$wX3IVcGt45E4wyzXLj4VYrC(VWSVr}<gm$!lQSm|_7wJ1_q6u(^vv#A)^lag
zrk>k+cJ@5dYwzvo9q2vWd%X8#@0s4O`b1w)Uu<7$UqN4GUvuB2zL|YX`quPq?7OA!
zzP`PE`}<z%JKFbQ-=}?F^f{*ZO^KXhnvyf6Y>Iu#hf_YC^2HR#RKKaQQ&XoFOs$;S
zJhgA?+^H+3uIp$00sYba$^Co#_xHcle{^8#!0dr#16K}g8n|s>=fEQa2L@glI5zOn
zwAIr#OxreX=d?$r9hmmY^pffI)7z&{oj!m1w==wFgw05tkvYRQqjpByjJ_FjXRMg9
zZiZu~-^`gaSIk^DbMwsYGasD!=*+>Hhi663GR?}FRW{2$YtO7FW*wY$WY&pUAJ6)H
z*0;00XNS#Boc;Xl*Ji&vr+v=UIrHbNoU?w;mN|FMd3erKa}LdUbMET78|H4Cd(Yg5
z=RP&BZ{FN_E9SjF-#))%{=ocq7ql+uSulISvISQz*tFob1v?i!vf#jiR~GgxoV{?_
z!ov%XFFd*M%)+l0iA6z+Vi%<@Dp*vxsCm((MKc#IS+r)+#znU*x^L0mMf(@MwCL!f
z4;R-iUcdOzB_Wq=USe4C;L^gSTb6k*Te<AS^1|hZm!DhFykhsI5tsH{`q`!DR#vXu
zv-139eV5&K*}JQzuX^S3oXcOk{MhC1Uw-QH)0dyU{Oi?h^`_O^R^Pe$#Ojl)KfR*x
zit;P!uV}qu(-qsUxO2_2HLKU0T=VIgFV;BL`mK#zYg(JLwrs6^ZO7VywF}p-T6^u<
zt!sCz-Lv+IwFlQ8S$ksb$7|25{o=~SSAKX^&s7_)I<>BFUHQ8Db?2|%aP`^si`O4m
ze`x)i>)*eo^_o4`oVzyX+6~vfdF{K`1zZ<#UHo;)*L7Vt^}5*`;y3Ks@aTrmukX43
ziR-`Kc<sh_Z&-H2kxe<9?%DMDjjcC6ve~rx&YOI1T71*Wn~vOc{3geit}V}RdF3a!
zZB5>~ed{M%&)&T1=HuHEx20~&*=E~Txoy?9b=x*>+q&(epDz6A7eD>>ma<#6+;aTZ
z<XhL=`tfZ!w{5x2ar=tf-@pBn+t1#9e!K7XknQo?+qQ4oe)NulJ1XyJzGKoI2kv;~
zj$?Ojy({3Z=(}#Y>)ej$9mzZLc9idE+R?S+=-pj+AH8Sbo)7QMyLZpMU)?9}+j`$u
z_m|zjdnemjxpT|TJ9qBhxo_w559l74`oR7NUV1S7!R-$|xGQ8=^sc^LGj}c7wQAQ_
zyBxc{cL(j>@H5|^J@~UvfA+=C9DBU?gzc%{vu@9u57j@^{?OEi=09}!q2mvoeE6xK
zm;Ai`=Lh%3?ltYr*;}^PzPDrV$zQB_#P^Xqe;M}6^^f{Jy7JNWk3~MV>9IHW74F-*
z@95*PkEcFf@Ob6p&5w6HzWWLGM8FdZpE&-+$tUekwmrG+$vdCi{p2H0MLf0gsiRMw
zczV*)C-<-4fB2b@XPTb5?||XJ!UJzUTk`C}XU`1w4elQN@VT7l9)0fX=lh;N{QTFy
zTJ@_>fA!Tt?}L#CQxDn>+7C`TIQQVHgBuTSKe*@M{)2}Po;djF!LMF0z0mQ(l`lN;
z!s$a{hsqDlJ+$r6;GwTyw7od<#jP(6zWC`&$uG@(Y1vEbUK)Ivy<Ge9hL;b&;`_>q
zS3dl8{jc}@`uMLMhbs@SJbd5b!-vnm+WP8)ubz3${@U}eoq65w^|`MfeErms$|Frj
zI*v>|GWW=`BWsRqII{J~okt!#^2m`dj+}qP`;GKB3f^dcW8E8@-qgLh{w=?^29E|D
zU3hfx?bx@sy?yrB++%~kY5&bj$4$rW$2T2+_xSmDqTeZeXVp6|y=!@Q@w-RgD|v6y
zdmG<-|3v1AJAZ5V?aJT2`+n;COWuF&gRl=)eDK<bwLjvo>%%o4uK8Wl@6LX-m<hNL
zSn!9nQ3~QyWrGM*AxIS(Rti5k1TM}oavd9b@R1w$EWCuU%3k>6AK^Q$>X38fJ|E@f
zTSJYZDaKHvf#2!a%?*xIO2GMZ<pNPmyu&hdj(>x-Ye^VmJw1q!F9urj9f5c{&Gn8L
zdIv^M^bYw_AFA+CUpfj3pO9w(yw^E`*}!6CdoidBlXZc}4eC2`YrNp+2IB33Of1Kj
zTokJ4OFse!|3HB+AH>Klj0MUE7#c}HBL`R@N@*zN<r__@Y33kqHl-F7+Q#yt!c?=#
z+b6A(TMHufp;moLL8Yj`W$y$Y5y{`oPV@2#ZL@VuS+sm^d1Y>uK2JZ@J}`f*<L`+D
z$q@@1s*3ZH^YXfy#<f|C%QDT`nPaDRI6kqL1jU*ny3<qjspPZ@Rsg#F19Z~^ifabp
zMPjfjL5u|56c^nBiA;eWbPJ=3Fpmm_DijYw>Zt-K6R8zo87Yazk*hQy%#E@x1i6Bj
z=H;iDz0IZ^QB+tdfOV9$$Qo)+lXw^A2q)_I>vHGkwG}5M6u0Hs#z*Md+pmwyPuA;`
z^W*B<+PbEv+Gkf*&bFuK=678<Umg^f7IR3S5*ysz(9_T@aqb>EC&J*DUKHmL7tWeI
zCc0$Bn=tbBz}XW;DLf%`M~I5Ex5nc^P$hwdNTP<g=n#g6A|=k@)=(=kIZ@~%f`DY2
zS#K^buvKspfFJ>GCyMTNUBq~s6X^vxy7u>gYQ2WG_{8yMey$Vk>0RX#)!^6^{h^q&
zI2zJ$mJ2@rPWF$wK~xx+5ifW4JU;^4&jT^fuILAtL#3>e)W%9#_3~hnPY#4q!Wn5T
zD2@u^TyL8+HYsWBB-{A@sJfu)ykuK)*to_SS!FS^0-R9R*-Yt{sEkrmPyOV+w31r4
zEUJ9D>icC;6FoOyMhWLAzPN?+f0M(||9^7G3opcv5=5+V1W&#KPZH4SRuESZCX!;3
z=#s(z$eBbJXQE_Z3dK+|N;VQoO6e3>cNR(X4}x`}@)8zQj9_9Sq|B&?oLLKO#6d;!
z(+CyBql&sKjK+%YqQZ`{B*#zmX{E{e<04997LGI8(js|6OF(Mltjdbnjj5@1Q;Soh
zjis5<IawJ+HT;99%u<t&e?zB~zXS+j9<BFeODQ&hV3vpc36ekIA%Ff<;qOtQscARQ
zJ$ssfTyjYVQrLd7<d0I2L^Ir6WR)6KZ`ND&=1}wUuC9{Owxvs#w)2Db`L<e&a2$|7
zg=Gy{FniIAphGQdXAcZwOgxcwNMc4q8&(}Vz$mYCaVMI<jP?Lile37*-sivvFX%NL
zM)A>rr5UgcBI?mBHQfPLnhV3Q9u>U*SwtTKanTQXseD`JN4S`WumWHHEJoh+WC(Iq
zI7pXPNzA+=pe@N-6c?$VIj|a}IisBTCUQ-u1fdW)mKQ|&6sBfzZ}p2!ajF?<Q-tqT
zS6#8tlA2SHmSc^#Hd>0a;tk_x#wW#Fn=COgv6&Y0lIfFMa?2mdvsN_MH9u)BFSjC<
zwzt$)Waj$&M;4@I_~{}$Y-zQ*u@Peu)9l9Rx=i}w<r5bj6*A7AloFX|%FE>4`FKIT
z{E#-tB5jZfQKFv?GBbrmB^}J5wx5gI@kH%-4{95!!st<<X$EO>q&{}@LzRm`GWE<)
zHXa5#nk8+6(W+V2#iK4q)+He)5rs{XR8A{SgpP(*mL__biBd)ysDG@!q-siHZft$F
zeY`HJ8G756m}t|C)jM%{W_?6*UR-^9d+4GyX@=ssgtpeEyga97gxPYGz-q<5Kvru~
zeNX))mu!YWDk>3ud4goKm5rA`lT7Aovf1RK)+pJGC2GZbP|HmmRYXf9;<X4zlQBNP
zYE==fl_Hv>iD(Y1l^0V~5lxXInlGOWL0CIQUW^49RriL3wFy`A^1okL(J4pEY1%N+
z4EL1UQF5APexN-xVwjXVG}-*rC9M~i(tzrS0)vNy{@E><j`uWamHG>w13xW&hB<>!
zEC|5^Q>Xp>A3Oz3!%0ykPl0q5c?v<y9}VZ_JG}z9e&*0ZGO#GX4G3>2YwvHrEIK<`
z-%fVlQaEqG@iecvDIhu}#<2si3J3;cj{?>}sM%JsE0{Qtd<k_)M-T}^kcTjgQm~<P
z2h=oqKR%E!1`j;klnS@R2G<N;iMJ1o;#ILxQL#w1?d{^Kn25lL82NF<h4X-eBOXX_
z_<~%M1`&M6w1tFY4B8VeSTyRneR55=yOq7>ctNd_uTE}r2wE6J5LrVbyt8<bbvS6<
z?Y6SQu5=AJp}X)1)VvsS1L)$ZL(*v$dH9%S@!+W!;qT=^p;1iM+zz+48AFeZA(9OO
zdoRt;6#&)$n99*AZuJQ_D?WN+<%C;iyl{NRFUAuevwH4*)A1VjnSkLA=K2}?r=(la
zAlyVu=zGAWqnGHIn>cP?jhs{JYE~Epcq~@^-ps7_*4$+A(+e~0YP(7d{EbX@Hv+RX
zA?497r*^pqz8W^8*y65mzgZhh8K@0|Dl=05dOBibAm!wE5UG>3ffM<|F|sZYxgOxq
zFwd&DRw~l}*9Jf60n!(ieL*XMfMcSJmPG3$y$Bj#JE6DTHa0rT6wz)gjkcKdLe~{x
zjt$N)$*fX4NP}JNA-uv_a>>AH&_vJBuY*VQ>rph(ddUxvAb>~^;OsWfqDd9wU>4wk
zojRs-b?o8&8laEt)zViK9B_ui;7Jc26O3r^0E=+-qaW}UpT#r=bsO^K<4}S+c6spX
zxMR4!<<W(cDomz|Nri>ol_pbVcVSIOM-7tO+iRR%Q8}wIwXwaUxuacvfS!VN50zkS
z^*!TB_t<LGP)d^}H)TB?JWpAI62R0K@E`;8ePgRg<}IlmPNFnyY!zw_cUqPoH@4Ds
zc?_)_pK#sC!4-|6OI%~<|2%GSqxgN}7Kx&#{{oHT9=8O_aibbJ_%Y+>QSQlqGkz}Q
zx{(8Dsh{`&=68Zv7j<S#PJ`G^TlnAg8P#DY?^g%^mw9%Pv0RT4zdp3P-7Bc6Dk-;S
zoX|~6DQnM9aXbi7gRV-(_~|joS{Cahe+bj-9&n8Ef85&2X++2`Pm)p;gq&VJh^e?}
z<|Dy~LOe!w`Y;a4<vEHoDj^5F<U%K5J&r!Y`)tz;b7^98zO^*Xnvq<d9TT5lpH|gv
zC<?7DD6m@d(kC^|4JgjZNzJgNCuaG2d+E)E$*HBO;g+<#=(MbqRFkiF;JC3Zm_p-_
zYR0YNR`m0kgD}6C?pJa0&((D7sGc)Qirk2*9mPv_eG0dP$Px|XX+W<T3Ji~^N1&%*
zaAeiLnwiy|7aQKReEEXhRKCEjkDY$A-LZ-6M?2{KC-6Or%^)8LOAtKhJxcpTkS2`q
zFep(}5#?bWG*qN?tNsto9+R=7NKlYMgB#ef2rC?HDwz4LI^QT$o}qo9eN}X}S>N8?
z6=seLnK!^&950gx6wBwp^B_869+`g#SjVt>Rkp~j`rl+!2jgv3tl?4C;&7|->eKCg
zC0->{$L|-qA+~QHXLutg`4NA_`}AxT@$I7ip}XggVxnd?+;;>Mv4TB_<!MTlW7zyi
z9uRVG<YCgiNa9xb7wV^C&gJG{Zcb_|E*4cajdj(csHEk_Sxwo((lkTp{_yd~f1q^X
z{MYy1`!(R#gI=Ek{y?&WBYmM!<MUDQYutDHLT(|X=7iR}XckyV{#wHoD+o&NP@36C
z|H3l^*D0HN_YV$iRDOzOeC*JnZyjG9IU;!(3jO*qU<+kEG!Rz3Stl<?QErqa@g-9F
zGU+{zk=@-NVnOB@jv1&I4C-+!)^m{`S*$Xe-#XzhW5Qz7;xi_uz1V(bv{yWw$PH0R
zVZQbyBHHmlR~Kkz1kE0kGS)~AAC_Hu$e8A*xjE{lh*SS?uuq51sK{>VO=4EWjYUR1
zf-y#(0%LQP<2`Pz<7@5Zj&-!^R-pedu@Lj>J_wJ@9|T$fnw#khOuSsafabl%yJD9b
zI2UISIjcHJ4*@mfg_cOND6Ha#VIM-%X+|G&xHX)cv3@Pg?)cQ+eQwb?$8Wt>{qyKi
zF?hi)7CRmRc)+9|@U;OxJ$gh2+cpRyVd;}>+lY1vWy+&mkZNRcL+UB$q^dFi!U3j7
z36WzM3Tl@krw15pf`XMINf@9a)U^|ZeMn*jYEMxuf+q&~$Qa~Fcmz(k5y5nXS$*`0
ziVTeyi>3CX@ujK<snpMtCeMmArH6*+W+uet)uuUK?t0r+S!sLw#e$NOf)~Z$%#Jjh
zIaKlHVQCdvS<SYj=Hen#QE^j2t|_;G^iLUL%uV7jA`8-6!y+xb-zl?N_i^LwmJL;9
z2TGg?d%~H#H45;MOFS&vDuZ>r^ZMIvyT0dgW4(S-O?G2`?CdFZefm1%l>txh+xM&X
zaT&H6Q`KbK{Kab;N;8|gAw$HYIp9$M!T~LV5F{)klLV#S5cvI^@$_v8wipRz07|hE
z%5Y~8JBt@PV<K5RwEs-a!j|;(mW4HE&SW(eCL|O#Wo;LOmdV#m#(zt5LdnF!6@?Q^
z5-xm5GQ=f(K7h}kZJ<%3D&bDrY5v8<X~zKzbQt7?;2VPybrDzriJq@2FTNx%3i|`D
z@a0m1w8G6)LziR$(t{x!S;<gzNA0hl?{)0uwT^>W);rjIrumCz6<&S;@QzVOxx@9q
zkAhc)k~|Qs=prajN#I675ZcdoI-cUWj^D_)J6@6WB3WAsS<9j*vTlSQq>c35^ctlJ
zvPeH>siub1k=kcC@*oLN5bE@jlxfISJ&~6CEP~cV9T;lF|J?yGw}4VOSx#BeERHZL
zfpglc7qw<(wk@d}SZ8X8o>rUFTAY|z++L7elOMn1v$nbUHMvu6=$U-Ol)SEn%#vzj
zc~{}`!tQcocxq`{L$l*9O*ZCA*}xc9jF1ftH8-xB>UURohFwN@*tB*{r-i<_Dk)e~
zP6Bc>uDA=T>}WN#PECr;DR~c#z=<f_h^P(CR}$u7j{Cd1_za|S$17sc@g}ANpv*Z|
zQZe2oaX~K}iOVPr?$!}BPA3`na!I={)GAGrj*&J5FNF~yXRdtaOddURrd{ON?H7)d
z4;K#~ZV%oW&Z=mZ)a74FVuX_<gflm}JUuj3Cxzpkn8hR<L*;ap%Spyd`JRNLX3NA`
zL9KozHe2~wn1=5xO$Bk2o5He7YwP$U&944E8!!a2iPXu5$6ZG8P>Vyjff^NeanJ4m
zD#TVmb@GJ9V7YU|tgbF)_B-<&=XvCOK6%MsLI0mz@vY-M$8wjhfuA^tu8vrX0``&f
z|08q_S#4E0kb3Cv;u%18n;XBk(Pjw4q^|<E#dEIX`_OUYH)`aoNwKuuG@VUGl+3+?
z$#Dv$dE>i+oT5zJ?BmbVFv}5Yg~2BAyUJ_qLl2Gh>R9%g*XxTrMC)aaV?6J&3r~R(
zoA_#yM5oTBeicZ*JsZK3QL?DHdv2IV@x)WhkV7E=Bf;)VFlz8cflqMiy}Oi-8AJ5J
z_uhTsIlwjPZqXnC!;(+vw$0FO;jsGBk~+PKQE?A9FrGanLiQAjdth!JQad{CK`Khl
zE^F}sKC}Lk@tK+9FR8CvLiv)qY^kPNv$Z^clvK~gskymRH}>@0FeSIe07bR3u&dnQ
zDu9Hlowb3ce&}XfNyTI7wyNSmhya(J{f`!ca3Je~rKs}pF*LK6hl*+>x!hnn3d@{d
zwxO_7{h~ky$EdpN6csSn<gbaXbc7H(jZvpHRJSK`V9uO@mtHC;E-rXU3@+;LU*tH!
zR~F{s5BQV~O_jWe!SV(<pP0w;B|x#jC)kCLHgs|GLlYk<ztJDLwHLX8sum;vfrd2C
zV*D++grQ%BYsgIzDsLaX)ng@qlUL{GWoDMotWR;WYvZMhc8p-x?p$-Dcj1(4I-D$f
z;OUU=dtIDz6{sJmJZqNyAc{RiE|NOR1;2n}kPAm`MC8U%W1`!?_OvwQNvqB)f;WtV
zW>=v%<VJ&yZ==Wk0ZA?tq2(jem%Sf_$DFlStF;Q7APY2xR^<UXnu3F34pq5Hv1RAl
zfh?|nyo*Opo!8i~bJ`udoIIU7ef+Etm>^4&<SGWs96JTiiBRc3AdZqS!heV)n-J+?
z6FhsDkK|h<&`Xdo1yTG0FwrDlq!vek?>a1wqRmliuB<zb5+t~>dv#`IN?%3Ggz|>c
z>2pjK-PQ@q)2b3WD(c49)RxYhYOL%Hs3|SXw>Fg**g^s$dne{J<;9eh<fP}6mKIop
z1EU7oXts@bNh?j5NChu_SOwWvb=8qmw~x|k8cQVy-IkS+zJfL-i^`k2PKpq*?7}v&
zteI3j-q8cvspB0x`Ch}v{n}8*EhVG;5%(}(bzCt*35~!y3Y!dk&~gxXR-unH_xCq<
z#g)&n+ozSqKtZ<8o;Pnc-{+X!x~w@lxp`SD_6Bj%4`Mv<{h^qL8x}2=?XGY$7Q<3<
zBou2Lr~k_N(|wnY_nNSB^55|8osMs@hh)0c&+?thJiJrJJ+OU#*u2;%%{J<tn%!^%
zG0ON2hf1CK@q^l+IjL|@C^cBk{v7`g?(J<U6E!{4yK9v436q}epHeMq`vLtv$9LEz
z)sFl;!VK*f?0hO`L(H)o^o!Q$Cu1OEM%chnplco64Z5eAlkSvTCy*Q9CHn($2UA$G
z-x|?d6*B@MWT_P~e$F%EndzULob#A?a{4KZ|9{74@yU)eJW>v>;qw8$ddc5DlC|OE
zj8Pit2L_q$kPJAD5x*LUP>r)SRD&n<!rAGA%HZ^WVF%?N$3D=k-|<%|^T~k2AmKpV
zLm2_bsD9<90!3j+&yz3U?qNP)Vg~kBs(}w-aOn80j%)b`j>Y`JR*~G?df_8<-g5M_
zc<3nqk@FvJJNg3%)07OondS{hdwPthVOlO?S1eaudg)b^GRl%eLzBxgv^?P8FMe^5
z(l}FPmvx1;i)Kf(0%)TQgEN<{Az#XAB?Evqt!Xs5tjK=>@gV#kZ>d|aJiszwIuzE9
zDmg6KM+F*|gvbKkfSFNO$l#&~77v@r<==;HMnY_C0@4qm{g;F&|ER=7d?XCRKN_=q
z*h#`*(o-Ss<ngHZC;hkh!z{x8p@@=dTOwVhIM9Rwd4q_vsHKY{o|=Y8eOg2mcJ|7d
z^x^ml;W!;yJxAfup;cDm^9XE1lY$+uW*7X$n8-`At;BBV3M=}68GXQ?$;sZ~F^W;T
z!mY%d-VdoS-7%Wp#rcntJl+^mQ@~-wNX{p%m}W$KUiR6S|Lk>7HH(7XMZctx2FETc
zCiLhNMmCxHp*kbzv~Qzqk7qxmAwKm(dQ7j)#ZrWg!hIBB^OG>iepy_Jy@BfVD;A?-
zT2`Ge4CY3mci2A3udS{z<e8&<TKvpKEmmv0Eg>qs)c8DKI_Y@!9BV*XQ<xzuCLw8T
zPJE)RIXlB%Ri5~Bzz&}S>va!f0n~FeP%2|%K?Eo4nh|iT))aC=Qq&Ly%^8#5F^H{L
zKH7qlVj8a>LIwJR7euZYO%_umFqmyaVJFf)B)a1m(kY~~NIq()P<zaIr{+-?!=pwU
z2m>+swpeOcaw-K7<e?6pfpadA7V5fa;|eaqc*FHUy<E+S2qX7uY-}j8)kjtarWDj>
zTG~pDShgA;Uz8DJs_ZGsw%am7ssfWz^9;?ct<4?$mKv*1adB>Xo<7465tUt=X|koq
z`{=ymvMSQDTZ$4ROqo%6dQ)^@U8Qej-8ksURLFz{a_I;2HIMYXIy*;!W>5ch)F|66
zq0U>$Wy0D~iLroe(!c@ZOmt!j6VjNIRyI(?0h+srlaQMASf6d?mpdNg$yd#p<9L({
zuN#~BUmSY-jc?<?NAP_-^mrKHOQ&%r=_^{)=Hz=Cu{q7d*YxxT(m-`J?m-d|CwXE*
zO`L?#l&f|Dnu>HsVU%IBzr(m87gvWH`4^6(5k4_h#o4VTNrsBa#g@9lH1Ht7oMUKe
zZf?pej%<v<KKo^kugsZ<Ravdw6($$iTO0fuTFudZd_Bm{>VTUbxFsN(cF7<X0ID;R
z2UsEq<zDALYVho){j+$8Bs&HCqku8awp62mSZAdwcq$O#QY2?+g3WVOTWk$de4^Yl
z-Xmu9vu%?r3_0U^G8dQh)aC?v#Z0KqZnY&DD<%~+j33{C6p+#|yRz-Z<&)zw+PY^{
zh^*4YlJ<PUd0cCwZ)2<cAU-w#;b7qEOEDaI=!6F!NBID53{}f7B$m#3Aq<9exzVaT
zkvCw){D<_nALIUx6D|CR<6E)f+9S;ua3B!bSc(ZGLU$0IOW9jwV^sYCN<%Ek##&r9
zX4GiZ6BZhA(&9^c$W42zoAxx$PQf@k1&W}?3olBMwAVCC3fqZ_eMpCpjv<{wI*X)f
z7Fr%B?Xp&&%QOhLNc_hjrv-Cl+tiXXK7kdTw3d@1{&MK6u8$ke&2X3QksAUm<$V=N
zZB@lJD;F$SSyNoqmQ>MKKCZoe9HrX&`dXxbBwKS<Q&*^Ocz1dGv}x_--Qm8WT}?E9
zF|MXuUtS|Wcz1~{*j6GxfHCA6A7p2U-iT-om+Kf8rM0~kZmsQ(9v)z{ZGy)3^tiXC
zwG&CU|A7iA+exxO7Bx{$EYtL-)Uh;OW3E(+(>w#siNa?X{z88-x$Z6^iT|r6+<b6^
zWKSp{$%e@P+(Wnp8w>eL5XnCx=45cqueqhlbFB@nE^zXc7UnwF+Kh@hS&Dk9las4^
ziVAxv?=3WxWX8l~mKd}=Ahl_JZSDM~RA=58o;EgPZpPTOa92V04JYh@%na*=x!hzr
zUO=jnWT}M?Fv{JLj2zOrIn0eoGF2q2wl)V`Q`cuP<jJxbh5>^QB9F<qrmnC~aXFJo
zJks08IrXFM3P==DuIT|4e{PAza^l!1ENF_08-b`{1R;JK7vUcfACHf?dt8{h3XM*3
zIP+mN2!|(=rTU;wO&p==2ZKv$HErz1|Kglfw*kdtQbhGZ5$BM86Irqdxn_YpbVT|<
zqwnQ7xuN0eUJ3F=`9-<z>-a`rZYHw$BA8wNJ)AehIX;hy<PS<x7~*(X6rvr_%a~Ju
zUmA^G)G&HZLGw#5jw>dCp$Ew?B^&Rw?Q#o_=7V+~@!6kzY{q^&-@LT!Do2jCrV#c#
zS@l5^F7AW6-)AJ*GLmeOwx#zm_@K1<K(%(N4@&F05<pAZqLP<i#VeKJ9;lqbg#)TL
z_B@nOm>yM85|?R;9#auu&aX<FH7~(hpSBbOXZysZ;c1zc=zzka&^U8=dQ47o<h0Jz
z>XL%!dOOjoWT+1(uqVTYU_71T_Cd>>Yi%^QQ^H>caYtPI963S+pdL@qd_Sh9;T+M9
zFc@px6ECmkqDEcLNCD^JPN3!vN(W@L)5yc&fux6&2PLNDCN)hM-!frb<2XC{jOFkd
zYcedYrN+pVg82C2%ve+9<UQnzWWxmvYOM4vuWllTu{1wDM>>p_8mGe;lUbIQ-7EuR
z*pD|fSL8uP$VcqHxR2<hfaWK<Ip{fx2#`pVC#cRnIXy?n{|Jw8wc}x)xo-Y^WWKr`
zJDT}XNY9Q_{HIc8$Ab^SfG3ssFa{1_I_L_YFwF^tHkOf4kQ=D-L0!v{08Xe*Y6AE`
zE1YO@3t?}SH@G_*b!wN?;*hE|!DSDJ2zk1QJSD3Z-d}lKLuF%2TT^aPWJ3&J<~SbV
z6J2A?AqTM>1UF_zW@i*kXz*=lGr{#+ZFhWYN>9KvrnS4=ME0^8_9I&J1Me7VFMpID
zi1Sau9TlyJ+!}w3Vj|#cM8MaGfUgmOMzElhT#NN6$dK`L6qX^uPf_G;<Y%Nv4ynEk
z5hfHh)YIG=>OXmm#XS|q+;M$bi%Wa!bAr8MI%<dxri#h7rna^wq#x-qs=ohR?5~N2
zyNFfk9zNq3C!aOHQSzCV3lpE64kLlD!vI+&3Pr6*MUlH01vZkqsO%qd{HcXM_w5d`
zc*BvV3){(8tN<_KT)v`=NBmE|qN=Y3;im;_y2=7^Bl?oarpTq#Za+?)%dolxPwvtA
z?>)NS^2E04lA0Cs=dY+KscuUw?=5edNFLq9rrLUYb+!G6Ji3Ou^2qW!`N4ZCih^uq
zWwxNA3Mrp+A)m?8pL_VC@@a8$L^FnxBNlK3v$a5&&O}jlAB58fOK>7Ej}d`+j0mRm
z*M#D<kq8_=7lDcM2%IbufvJp$VK@1zv+A1UhTy6JiH6$l?QAM(X*(Oa$TZYeorjUG
z;0QN3iv%{iaZ<+OVyuP<@`{~UlQX_J$yn(USdmO)oYotbcE_c+c1|BF$2h7d=(y3t
z4^&taWal2pPByE+zOC12EmI3?m3oENFy%n;QC{itCA1ZeZVy-!X!op8HW|Qd)wzlS
zJ=M)djB?p7g+(i+P!%CiS&6zqY(`VB()x64O_Oy-SIOkMFCEsGOy&WW?h?%`)Ts_j
zjaI^n4O&^LF4!n`?ikZ(i=ksNhVen%C(5j-JB_1M>x->oaKIHg)cC8vDZehWu-z6P
zonehj&Wg>g%Sfrj7BNei@!sGNv8mA~I&{<g@3M+h60uA(vb4<F9Q#~EN_=QbN1!o2
zBC*Jxo>rcl9Gp5K*Ibz$8<|#OG#BTjh5bBrQg*#%yz!^vI$L@`VudL%!IYv8$go^^
zCe3)nKiZg;5L{dh;S;Q8=mwmj_6o+Ko$Ot5A-Y(%#GOo$ojAgsGVBi2Lo?owTX{cO
ztY=w0^M-nf|EPwh;o>2_@#-|(V<^ZWNuDgg!h_SaHOwv_psj_avXn}jpzep=(grXn
zsGGl2u|qGF8uNm-PKCCnFN1KQ?J^enEY1<~MnB3xuCBaF1=Lx13pqe}xCRC7<dJjK
zfGJURf4F<C4LN6WwrKba_E<iAq$nObJ?SU2i%aHi>$Pv3R~4RFo12&CrHd%bF<0fq
z$LCd<b8JDnhPe3Lyxfju)lI7=<>qv*Z2Zd?v?9({P;f=rqC5KgcPy>UntJQJ!l?}z
zd8z3+akkEql1^J(wxQl}EG=$&S5EEX*35$5%NxcvqJftSa@M34Ru;Aw(pj5`7hu+<
z8E1(h-bmwhXmW5%o)-lzorP&HC~&&RYZ8`0<J?y5e&J2KVJ`ALnfr-!EW+}}X=2pA
z_8sj<d9?o=u3**#yD-%^B;)Kvzt&dm{?nXx)(yWOu|8aN-~WnsKjVIidcQxQrZ*DQ
zp=5SW%Ue*BI5b5>4LzW?NsEajj?dw4FRjfe+@Hw5`I%k%pDjb@aNgNvc%zA$9KH_5
zJq)4Y7Ob3WkVSj1HW?BU3`hZn*uYqW{6Gt!6WYY-?3Y2{u*wgvR6ies+z01b<E$-Q
z$KH4LHrCAJIvfnt<JA1S0bSbAS_w-iOC?x_ud(%<%Vrq*`2wC|Z4;OoDkFzN#5TZ`
zmsOXT;u{g3aG5bSC}UQNq15aZ9}yI5l<&^RJJfeicfT7jU9=uBb@MlI7V{^dXQBsB
zF=n9CA~Z)7`=Dsf)Ee5|gmXNj9j6ILl-lrIDo#)(9B1L|Q{q@7Kg0fv`itVIjg8cO
zRlw1oc9*F%hmXX45^-Q?g!cvy9Qm11NOGM2eU2T$8Tp|sb2J?_p2~Ol;vE#JlJ6Ns
z%b$3>M|?i=J-`vTVC^yCI7i|*2WR{dfAM~PE8d@qgU|@~x$Jd`yLo5}dy#DfTnWSB
zf|m3IWi(qoQQkNb68TQF%{Qa%RGivJ?_8k0GZ|A<=keP<-Yk?BSmAJ5>hl<1=0beZ
zii)FrqCPovDEh`5+xN8Yv2BOHhTl8FuSW$qpW(xwsp4tHQF@=k8*hw0bZF!D?KV6{
zIO9Dy$@w(ikJGjB$ReC{NcGg#?`8dBS-+U-VLK)cHM2L+2fQ#)D4;1Abrl><57OY5
zqR~#<q0LXrRovd-n4q3mg!x*%GORz&z@cJUTA$qi2DdqmydfHf^-cNSb9gV2Lax3W
z{$BUE;QMBBr56!MVnf|eDYEJnpJ70(iSCJx(13WB+unG?apcz{VMrOO<cEQKEaDc`
zBni$l2jYg|Z6ZI#q;B4b!z;%ik(l_yM$vFWT>=Q5M4MuY0ZI^c4_df@^8=LOwE4V$
zv9Yk$IKHF5+E&&O&^*Rm)D)$G`O@6Ud5r~$-ivqZnyP}V6}8rQ!`SRtF>xf^QJ60}
z0AGyYM#MSP1$QWTrov8ILEE+J_Q2u@kvP@iG68{Dq!=Wc@(u+ezS2i8E^^LtX%jix
zBJtt$ebN(yTotQS4UuER5pbgQ(QrI)sNvA%So8Tc7D~Vl2Ecct9kGx&FGyS%`b9X=
z6H$Cn6M-{xj?x*QUz^&RS(h6dn^%|7no^sez)PAoUOHe*oxXTk;iRHvi>D_i4XnHY
zyu^;%?}jdC=bi2QyW0;%``*;P7EP5NLz*>FIiHYUo6?$5mlq2+F0(bYHb0)1jJsjw
zKvFW=FPc<{_EU`mmu{5pv;Lt~oTGgomO+B-T2mvvExbcrflYoDiHVnVWuj<m2&sSf
zv}v1_Ypc$muOe76SH6m!l5M5X*v{3K589y_CoIQAJG4biZ6_S7aA<AoDYPTLKEJL?
z(V-!%^8rk8XeWWy41(7<4ppUTFxp|57m5P46`aEm1yP~MB^_-;!c5VBoWr8Qin(OC
zU8<Q)HRCuvvT3vlO^d)MV2jkN>FLFpnZ@bpUDJv(GmEBe&NZLS%5KZfI&03Y`Zjl*
zZ;0=>+;6K?+<1)>rZ6{534kdCFkzw0MPZ`3txyS50!o<G22A17JVaXc(j&*3J$ax7
zO%dQYf}(9BU=m+{4^WckV}=&MYa*KppTp&&5S@@l+SMo=dp(AGH95Y!Ls@(NdZKkY
zp1;)jym0zB-}Af|p66MP3r$>68{qhDI)=T2G*_3xhQHC>XWgz(UcMPkyum-MbHvg<
z6QD3O<ZJ`J-&$07VJvV?8Gvq3FhGhyySeOfTFB~LcR|ZeDWpkxn3gAKd5&xBruh?Y
zD1Km?P6J#!Q2~0H#Mc?G(aA6rNfoU+)q{hB7~aM*b(Y@%I@9q8sglPAl(Hm`t-up%
z(>3RlRsiuco1g~xMQfkopNx0Jr?hr-v{IThX_6@R`~qU}vN<zm%%N1cvV0}}J2sA}
zKraUEbRP_(-B^sNJ|o$%vqtnI>e93;M9qnQ^gUL~X$(x?ty*61qUR{`jUup{d>TF7
zeAg=SNO|Xx^8U{R#@2NS?ZpXv0Kd#|fY|_L9!Op;iJyg<8adtg-;sX!${Ht|{sTk!
zZ~klU6prK;^}n^ynJ+-E3?D~<2~yWVf58=ATMsRJejWOT@VMWHJU^$FRYSGX=b$Hb
zWEt?JBA>3W=iB*A$9)%0(I=WgJFP==xC3%hiXkgjHRa+|-3gN3xu9YNah)uf)F7Jg
zAbS$UGt@A#38f4f*$AT?&r&NUZTU`(t1cF`HS%f;>eR(O#Zc2Ns6*^x_?`o~F_$Jv
z)%jAIVjH!t6f1|Z_(#1HQ;6EWT|_$g?-B~fS+XaabE3;rODc==t0p#;78*0+skX<Q
z>#7}BT9lk-DJ`#rdQUW$sClw3Wo$-dY+^}7RBlG9B{)2~&6?M&_lc~|PA<zFeZf1b
z=Kai~&`{y6=!?x-DbhwfEgV`T%Aga&Svej3>)MkM?xd)@FS(B5g83rPhx%nWa@xZf
z?wn?$y&v-Ls|<TlBBCuByuNPS(sA5kur+0*kFy!-&wr`-pZ^k4WE=VtC+hzi@6JFx
z<T3IHah$p2taGj`^ZWa>XOE2lNPYk%33&u^9AboMEq4FWffL%AnoNYK@dfdhB;1il
zcLbw@Cn3o@mZESqeL?KHSa#A(h)pF*gYf2ywSZWSR&qzNoiUQpEBUa{P1ULD&N+F|
zk?N&#zQMkxuduLhjoq1-&1_6dYn)j&b_V4$>e?nxZnM^emii|rShBM%hSXqNXoG)2
z|HjVFjr|4AygZ|6R#|!3tfmZCVc~+_-UWGShS<bnOO2)27-vewu0RTVr1MPv6#5a-
zyBJZTmx<yyN`4r{Nl($(u;e0?r;QALAV(JDg#4T<5jc{|0f$f}R~zI~0XxAWkXNhi
z(nNbMDmX28N}>WqV419;FgrD9p$qbMifmWPx+>)A=FKY970Ws+pjOvGkpeC96uj@9
z-%g`V=5i@R6t?>olWoKL^v^SzY)MHZl1(-PL^It~nh`~3!f82A?@KgAhURBm%z05!
zc|0?zq{U)sDM@nX>9JWQiIIsVS+TA{*>BA8(TP6Y?FN0Mz8a`OcNzFDQH}oPgQ+0s
zE?+nas;wBlXI9%r<n{o5aH|fTY=k|(<UB&)X)b~$!ia0M87l;d{Ecwrv_&V9$W#O>
z&>>`@a_2J~*<!O#nmJ0prti<aKdEX^>dSMuuA@^Y_^vbA*=Kmv_18Q8x~}u?yE|1~
zo{rxXnJ*5(napClX$QV@Ryzo9aIdO#uftGrwMeG=LYdH@#}{y?umCXJ3%Tc+mQ)u6
z{gWc^52DDv0Tp>j)kw;6R2)L#7}6=KKtz*{v{ZKqlH;F%cCoeqr6e{6jw@DMrWOr5
z(^8%Eq~lNEPNzwKR^24X=bI9YI)7VEQOWqG#uihKe`auPaaB{wFEg^r!?DSq55&er
zCEF~vg7~(CC{wJZw&E89(NTVRV?v{XGbEoapwCRu#~%!CpnioPNRYT(Y>hB&bR&%M
zgXx+yFzO`+RM5uZ09+)M>gkcmReZpJM!K(#>*yFq$&!_2LE=5ry1S=QDzs%)X4&Ki
z1f-TP;kU^Co<!Q6;RR}p{$l%=Xd^ADI)dCFA!q1z5vcRf?ygQ|Q;!IRK|7ONksTYG
zU6Jg}vx|zdk@%9>oT`+Rs+?G7UR{-)T}6rPP6=Pb2Bj~K_?qJ3%X^Fi&>QmdX%9e2
zNi*)})s90lwnF7acs7;Y2ylJysm9on`38QU_#4CnZOR|603J?HUt18Q#_ZCH5zR@%
zbTz_2K4~|XOxYT_+1u{DIdbcik`BHhV`W;M_10Uhb!jUz$jt}5bk53G7<>5Bx)vNa
zFSoxq+t#L9)c74Cpmk^W27E2T=dRGKmppDo?at2erk^Bv6pc60Woh*K&lg^>zwp9q
zVoUX@Q`Hw%4udD0T}S@1%Wf-9yR9h@H%y~I&?2ip1}1O7ga8aWSCA~xj=x}ZXi`0N
z07Mk27Y~R@)c|S<Hy}S%%@-5wj@znFK`v>X$PM6M9J=bOlsV-x4$Z~8?2fkO+pQBv
zEzNarzJ&H8y1OGTq+)RDuM}kR4oUrxLr9p=3RUMdKk9hFsF2er6J&vQZ>wV{TCAiF
z+(?nq0zaCLp-^2C@<=2afW&|TDP|vYF^C|O)rU@(01;#|heOx$?K_gIlh<#Kzk0K|
z+Pnj4{Y~-fHz!x;#P5iI>#euSA1=qI%=nmxA69wH)3rTBrXSuzBme-%evULcC*iNp
z>7J{2d(zuHoi{lS82AduRtQK1`wYM9vkKa29Q8L<JF(}WfXGpzlOoA{cz;AQ%HDF?
z4l5(a(8@^Kw-6|uXKW*rhq=M*N9INYXUq!Gs&<N7ky?#Pr2TyI7}i}WrRI2BQj9su
z7*U+<`Q@{S(4dImP)kgrt3ds$j#XlvUo!evnn(Y74$|U9>H+YP%=v)gBy)a5agsT;
zhv>QY%P+US{Bq@Q>VJd(vOOM*->K@vvm@tNobw?x>r;nc+6u0($6M5Oh70ljVAf0!
z;74yp=x_HC1fF2g5d=gY5D>Qbhk(Sw6epmLfAZsZzFPk({@;n$1OKU*Ejcf|@P0Yp
za8dn&o(eu=K@^mi)Lh(hfByZ>|D5g0-{t%d1Qg&@2%6@g6pEgPJ=b)Sv}yrpMK%L5
zDGxgaIdIMssdC^CRGi0OhoKxp6A}P_cuaD5s1>yQt2r*t?2(AJzl)EEq(yZ2;2Yd!
z@{Q`)Bj6E;rbhHejSrtAvw%NcmK#154k9Jq=g0y7R@UPOCF&{WUcoj)#y=FPSh8{-
zq<9;f4ZKLUnm~tm$U0(l!A@QI9PXfr0czbXWwZv30?pLNsqc@}bXACYQ76aQ9a;xB
z`rKq&x2xea4=ieu1;@XNnr7E;sGluA@cur;j~&8>ccCA9#4YK-6REZ|)r?pJg6l;o
zdN2I-@!gJxc<<lazv+72_w_EqV^}-f9kZkbDWls-DM~3qLw&p#?d*0;ZK7trY5xW!
z0ls}`&><#(_WrDp<{?yxQxTVAbJwX)?tvC9f+tC*IXEj=5K4gJJp}8+yvH$>@5cCj
z=nkJdCce;naM*k3%ox0fyWT^J)1P#`3wrlVpBfscfGOyq;i1QRsXn~pVZw#d5xl1T
zVDAe>lJ|45^!XHi6U-Z&Ct7LW(KY3quQtC)9ot9Fo?>i9F;?jeMtJYiBI#${A#=!6
zH~j)2<|~{tmDFx48^o`d?fH@I9<D1cu0t9ux5Qh@<p;Hk-%Wg5)YA+p?9H`W`}E7Q
zIBO3dnXrwd2^wiZvXd|Vpw|z~)3}+WYDhXnhcr6v%Qq^p3os6_5aHbG#EA(fP9*Qy
z<FjWE4x8zB>~idC!4DROIX-vL53~ZuI@Tt2r<bZbwQ~vFy@Yfx_FaVXV~$Jt@wON1
z9pB04ur3w9XG%bKxFyQzBaL#2MvZVhQBYkXsa1i5H;}L@=y*}#a!=@mt7h%YZt-fH
z(e^rjrFxI!&-fw5sT84A{j}Ba({KbnnX=*Y+N1n5ZHi4E&jbw!(Iy{3otME00cs3h
zp7L3+wz#a1(zW7jQH}jVNKp-NrfqMRig)=xuskORKkEeFFcI!eg|r;B^CAUopuCiH
zY&y8==h9{-lqgi3t}QF0_(dpgC$7a|Woi-vRO)HLCe-BON;+~INKxzzw$L&4?hO|h
z@X#U+tiQmdxHeQUx)!Qq68WW!+MJk}oZ5^DebHXQ9i=0_<~M|fHso6h3;7m&Smf7B
z<E{3L47)YHp|QEvvs_<NTU%0ODX<jD5Bdgr2s#%Jzqm+e52dhaG|Pk^p;PTBfH%5)
zyHPv4-NqF<7Z!)+NsRDD;z3yo#KAGd%!N0;t3F){sRpON;aXE9V==}Q%ubM3qJPRT
zrMz!da!y1^Q*Tk@<vscNJ(oAySNG&Q1Yd${<x>ooB&K)N#iUl}###ri@9fw(V6_fx
z?8tjLF+Dx;W#D6i?tVj@WoGafEBHduLGvUy6ah<i;iJv{xxH;qVWzphWa&ZC>7(i*
zLYkqX(=e&Ggvy~J%@wIvX<fHkM^Pr|DJ%hihgBS^{xpG{6Y`kv#5slP3?dI{ZVieH
zGU~G<^eKgj4UG$CW~F79>PrL7Ic1iFl&V@&z_eCB|FAK(po9=!VH=knKB;5YFZ(RD
zwy`<p1Z!%fcs9S@alZEYx=?Et_^G3n9LjIy7}5yTt?WfwNmR&+Bn@If1FvJW!QueR
z*77_TO-Ahk)PnAAhu$4qgxHh+uASQ_XPae30!85y)F?c<153bruf!(P+-M3Nk&~W)
zcSqyhdgKP=H1UD$s^pKMCZASG8E`l>jjPqgP2AOcv>gFBtwcQyM8Vl0?p<{>()NLo
zQ;JPxSurtLWhO1ZpqqMXhSE0hS*IelWai~%B29w^T^wbp$;ha&L^*TEZP@g^=y74k
ze8{f5FTBJbu%(uy+T_QhwY9RpRH484LubYT=yl|oJI@#)$HP4q8r5IiLm%g|Z#v#V
zUC<RsW13S?Epkk=UM)~Sh32IK5l{(4{KR<xc?d*XJ<0(~Ox)|fBBP3P6q=(QaZbDc
z+WEzk$_+_n6ALWmkxGDV+~n+arrrs*PirSks72y|H*Zd^pEh>vwEE<PSdm;`RT8bQ
zoqMz6jn+1MTdVv)zY2rD-yyD)cwbFs*@?HrIS757L3z^#Junjf4Fz`86VnB*sK?LJ
zNPxtT`jWczJpj+BG@v6h#z2dPxN7Lw=5W-+x}K+_L!xLTVM>Ejjc5xw)^G{PxkkW{
zLIc>J?HPID1zonec?%7Og?V#rU7qE##>O(F%d_X^E-YzlD_NL3H`}vZS5sSETO&X4
zemYZkEB{EWLR8Q|=gyOwGf8CQ0Tg%jp;3c&t;@Iv?e0bKS|9Q}>XMu+8kUe(OS8_@
zIn;wVX#uGE%Ni6sBkIvz>dCe=o|g-TX>mm&kMc=P3zfq<AH5P085N3&jK58pF|*HJ
z)vm9OYi>&}i=0&TNTJnQxMD%z)@93o61ZTVS52O|(ciIh%!D*+wbwk}RNCp!H~M#!
z!A8>_x(4VJ6Wc*-#*dW(bElv11N+jQV^P}46%JdVYSM5zk!C3>u11n8&>usAR-lLA
z$L(pXAE^BT3Y{N?rM~CTJ7^R@w?yF<Re<Oi7~1*~B_ncD@eT{#`@sLCKbOtn9UE@D
zZ9~sx#u|N3^@N!LoYV0Rj-kLA6KeY+YeFnzTLT6kdu(uGQ@X8Ypsj9tUE6@YG|N<$
z8I83P7lzjGx6tqPY%f_A*Vz?%r!VhzkDh~82!tx8K`^b+Bu51(koO@w_#tOuo3k+8
zS;%u2u+^J(aUMcLvarorAT2Lzrpp4wjGgmlG&-bN9@0hsA93#jA6HfG4bR>)$>g3)
zlF2=jNoF#+CzDJvx!;;(a%<9Qo1~>}dZ!m|Em}nsp~nlNa0Ep_C`jc4&Otp=edW9e
zA|i?kN(-WLyipaAg9nR>9(@m;y#N1NYtP=3DR?g5_xr@%z4K&e@4cS&tmpnbD-R2$
zI8@;44s{P{{hAZL4X4kZgRQF_AFI7S?W69L;l9h$ZY{gdd7n3BsQ>VYcJcJn(3E1+
zvBx{f>tub97xUi84nC!DB-1-=%)8n@!4wXr1bvtq8I(C9fIBD1-hcGS&<jIHdJWFx
z0<tY!2pKi-Ptx&k<QQ8bbH(t>h;RUAb3>y?*SAb&7K$BX_SX!TO?QvZ=4U+rguTV1
zU9>lUt}(kbGg33w*gD@+H4sLxm#OK%s5eqr*t4ZDWfsE%hC5e2ua{$wDL;nPq5XoM
zZ)~tDRx>}YL49N!S2ZJ^*d3)B6v)P{*c=B3lQ!1j*n#5^j;nB7kK;}p_v3gJ$4MM7
z;5dV01xFsED7m=M-X^_Jwx5os+jioE4&ykAgB7ce<x%FK0y#LmID$Ava71yWUOLJe
zb(`%tjuSY(hT{~D(>Pwk;gpdY%$<0L)Qm@~@f#N&=)wbCcpx`Wb>V?7yxoPjyYO}w
zp6kMMU3jhw&voIsE<9K62qV7Th9CG`YDYn#38mw#3A9nU%Ks@o9bIUFrF>v1A6Uu<
zmhyomB+gul!5+fJRXDE4aVHK8HdkESj~^bzaT3Q1IL_c$!6C+ziwpT)HZYf3n8ctD
zKglq01=s_(qM{~NE~E_u#x9XW2-X1Z$a0=ymn1KPO#<qM4@~H1*fpZgjW{p(Wf!(3
z%2|7`w%<D!+P?!GD4U1I_xJ}(Bf<0oI}YtU+8-I1h<&$zAdDX8DWmOOO(CbI6`wa>
zKipdG*swmex1-h9;(SFfK5yO9!SoH9I}~>PIc-$CA{5H|nX?nK0V=40Q0WIhDQ1)@
z8)C)UAKA=8S27~0Fj?jOLGj{Z)6`;Pye0(<ll_4NpH!60=q#NhT!J)N*ksL3LF)Di
zryLfZYUDykaLBD~-gx4~iEAF-et*hmmLI<6#EFl6>|@}E+F0zHT7T>jTw)9<$nW~R
zK7n;q31Qd-eD`Yphd>fW%}fw)VeSmibj9+_h0n97xuz$<PTl7<!S*nz4Dvz>fKWBr
zoAo$HLaJU7%nlcK8W$&xiyg*Ao4gPXQalDF<NV9Rgz{oUTu2{UD&JHEnbd|u2UU}G
zG8iYDT2i{wq-_&)j*3^cL0l`p_EDG?ltr?kx(nx4u?Wa@Io@iVIZiLmO*k{_A&7G;
z&b`2T3Xtv+p3ubpvQ3)3%jd?%JE{Xj;!oPvp|5>ysAOqRfw!@wB-Bt=fnKv+gO_}!
zyrZ?XqkQ0!&s2qnhr?AH_Ukw7-@k3Hy1k~*k?L^ObT>3igetWo&pzAI;%RA#Iez_X
zq)N31Nr$YD|GYkhIjqB=!n%k$VUuw&9)3G@^3W+8e9O7?EhFqjPG|$_aE$}8A*^v5
z*0>GJ+lJ+B!}7LamTcgJHsH#JRc*tnwqaEx8iYe}Ldm6=Y{i$Pkb97*m}=|A0TzQ9
zO97ukLLa%uPFx(uaTLc5I0X0L#c>=baC{BNDIBM9yoN(@L->y|znq-ZQ<(I_`2M3f
zL=M4eT)ZZKu;cAu&kTCE@q)tlq;at#FH$fzaxDBcf4$v+9>>KALS@}QcVJgPjNl?F
zeqair>}$hw_D@IoAlbR?QJjt5Zf9`4f<v)B*aU1$g6ejlJR4sow+dW`^9~$`aNtg|
z)@<ND8{d~L9_v8b1mDA$GGoi+0L=X;0?U-U?GWj;_(@h#kt5XM9;P|M?V-q@%$3u_
z#4}z|A!`;_3^H_xEBez_@f!Fkf+|82MN3U5BMk7mQX$1}>@bM2T^Ra|7ubu63j#i>
zrUg(<wSk<n%#87@@##zUrjMuFA;8neGa3ioV_DV3;oy*KtaAHY`gmbaiKn-y;IS%i
zM|Yp5+3lMz@g2Y7*3TC%MRk2)pKH9ep|UOa>|ZlSTbl<LGB)aupM5b?(|swiFZFJ%
z(9XConj_z3EQ>l#&~_iS_;y<dXx-3hk}P1WvQAa5LMWYCI8*LnRb+{DiYoX`1i_p!
zF4l<)HlI=It5dLyRKb>I2!afnY=V|gEzZ>W>v5(hn@f*+ew*lOfR0yCkc4(b9SMfd
zs^lfANI*0Gh3COtt!Kw38a>;WQgWUBP4)y;Nz?xDqBAGu$;b8PN}(?`jTJW)jpe&7
z`chhM+E`Ij@mP4FkgSwii%q{z*t}IXpY2ID?DMP0zYibFxCGCp_4_}J1hS2@^ctai
zC0{SQQG!uJvSB#`aSRVq??oICKT)<Z+mQ0jhx56EeiGG`M2uT{DgUs2q9Fj`tTdui
z6oPCG=SpGA(F?weJxij|9oK$UocDa@lXh*R{rIb|z5+S;iaH@vCp-4XFKQ*U6_;Tz
zeHQo%gMoeOA*_y3wGmbb@9h)Zv|Mo0#Mn77Nr0Kir~sy7Es25~x;=!NzF}x&G`G7D
z_a70kG@PZUhnb5qm#!RFQc}5brZ4OvF#B@hq=T2%g;h!g2zn4=fn8{BitQ^@I}sR?
zaLdUgICMaVw*h-w_*?~sfO0SY)0XqPx_1>c*81xmS#DQBW7Tk9S*X}s;V&sG_T(0O
z@||<*d!uFhHZ8JG=%W76t}PSixxQN$sP<;MT*df{!J3XWS+3q9Z2IQMU(|T23J0dz
z`d>ub>}!Ipt*yaVK!XljEeP>O;Is-?O<1;nq=MIB3keKR!cwo{xmukY;x_r;rbgw)
zGHn^tTchTnihivs>DT&ilV=e=jU>ud-+-eO2UmMD&PI|f6$r{IKhDg1BPYniIVi~0
ziHxYOkT^tMkk}Og<SOIVTDK1l_gaLniwkN)bqF8m-H#4$?fJV)i?+`8Z0!1{p`8O?
z=w29DyIk^)s|UBnexCl(v_4(?_(1x{(??@3e=2)KU-P@){dQ~z$(n?{W9+xu1%UwU
zWX*xo8{b4UGsb|F?0tF<=7Z|bI~eUY_86j*$L#Zx)Fs+9lNDyIdxr`7w{FZwf#Vfo
zhF%d`9<uWU<D2Xvr8fIOqGyvXC>gnoAYn9;*HWT47Y01}(Teto`j`Ik<@NicuF8P>
z7QG_Ym|5CXtvg~_9Wxy$z2ChTUE23mH<f0dy$(YIznjDWOAwP_{YbOzAv*h7l#WNv
z;lPyeZ1xROqcpwA4J4NalFOH2JyUc#Xze`;LZ;gK0**5{9MB@AQ`rR<h;*L0u$m1=
z2y|E}W-{7J7>g?x0R|S^kOQC;Q2d^VkvxxtLf@(b=Q2SsIdH72v?Q=M(2fkibEjOZ
zpNxJ}?HY$W(y@NWj`bZ8x8tUp){c*_eMe}`no!T!*eA5lJ`<=vbl||DhQNmh2L=XX
zh^IClX$*~YjdzVaK1O>$12eXX{-y=CYZ*z1=eUSzP4W{ZIg_ozR{V)c8g#Tmc8bL=
zEQZqn2&G<J0F8(|1IyIlvv6<)QT1V}D>~j{+(=et<4mj-_PzbWhQ-AV(bLN>{qWRl
zdw;V*o1D;EW6$!Kh<#a`#8?pJ(R)DO#j+o4qJ5UsiPSX5sBV$<vQHFUFf_58UEShf
z;{l($+wH`mZCUsr{)Zm1Kfn6wtN-O+PK->9Y{l`DnVBz+PK<6Hoggh@?>2nLZhVIa
zBDdbws-Xt05}Z%QH0VpGyyKaw1J5SkdrJh<v&a|+{fwZ@<FF!6;P@JjQ#hbp)8<lp
z91sF*Q^l6Q*55|eMiYi66r6O(Xb0G%17GHVTq0%T?xVP%+lm>wm@auAb4saV+i@Qf
zMWCnB=R(I2r8t!!>Y?Q3q+*V$7zZbm5eu?OUboVII|G|#1qYOIj-VAIXvHVCVg#*X
zZBe&12tX1)BXDvHNo+|-bqTBjPNyb~84AUS#QEHhZKSyW&D5rXt?M-WZ{61XP1B$F
zYi4KQ6L1->d?FCe{10s{WdAi&BV$>mSy?5SW24jB#h%)i_U(ILt(Oxg?W%3Ct2_|4
zK^-|FWlGn?81VgM?>vKtK#O!z8z_^uRT=QZy!JBSrwq1L85I38==WvN@5`XymqEWT
zgKbp?Zc+wrQU-2P22_**6=jBPRVHknH}fz-pTqz1aCmXh5FEh~#jz6y?1}$^mx+U*
z%+jQ7<;0{z=OwM2#>H#$2ijI37in8j69#deBt%k~xS(z2#MtoHgl?0+rgi7UysBr8
z;38`Lz-KbpuU{(ZCLNza`pJ;CRR)lh0VHMMRT)5129T5iBxP`f)GDDnz72$P2p3o3
zxE{xyID}ov-&Wyh!!e9w9gZD14&iX(eH7zar;J`cEYhJ}L^roncuB#2;M|}JPhQRM
zGL{=fnzXQ3v_%UGep+cXF_IB-3fE^HIF%}2a0)|-idZphDJW@!+6%5tJ8rt#k&`o;
zcO*2P*WK9i`_Ab0rnH=l-0Q-f+f$d%f6||so3?T5hV7pF{{Hiy*Vb>TI^59ElM{>W
znLoe3MAJ5Cm(A=e)r*cCc+WGMwq+i{L(SF-y)^>csLS?C%Dk{h-8O6^m8xgzNTym!
zQB<y!Q4!0s0f4!sIi3wVQ2X2)u`J=0Il)^v4|&GL4ZHxS$S_PM=J+wSj~YIiYL2*~
zJ}aBt7vpT~IwF-STDrBM0*2-TICGY$XwibDDfJLE#&qGzVZ4C75wPHq9)#owl^`oK
z;}~cZDiz`fq6)-FlN$)mg*|C0Gw;1O_A~9W^wGY$h^MP@Uw89#S7rMAmG^4?*fnWs
zlLL*j4War=vY>l37Ws0)D~c+^T^?UoYkf(}XnjoyAUWQ`fdOArcd#9cgZ=WQAI5KM
z(;dvmH!9LZd4$O&ypl^`k0Lsya17&EhhqnhLpZL&aXpSZaomsNQ5+|6yny2jjujlr
z1LOT0T;c|N*>M~vaC{BNDIBM9yoN)pA)L8}{uV!xt}qHJ!6ht<nB9l4`bh_Eydcda
zuz?i`wPSdST`0amM~;Qrn7rWJoag^P4uOPC(63KWEw8+|;`Zy3J4jAIOIG??$S0^U
zuHp%X52dI>QX&#40(Aysz;?ecxHfOU@dIgO2)%1d#&bIAwx?yJOkiuLyq1Bv_O#s0
z-0Ql!wr93P+DpL`KKG%|eo0%u)fMS#@OS5)eNn@1PY9MvzA$~DOfT{FZjf|o=t0ao
zTW4koNy7ycp|tp<f<0?LN3ub%1PnPHJ37d|-fS8#G89$6{CX%t3+$MGBoa9uYu28N
zL`YoVMbb}RWqZWThcw=r<Q6x1l5}O|2t=ndso-nmBqTKMe<4JXxFE&xSEq1LPeJ4g
z-)ZMx?1UH>5{e3o_|p^ef`4JhU)aT8NQ)!~tj2IbPz9$_Q;svuArHn{&2%Uj*kCnO
zH-skWu}hbYuR#0APu~6W(3;pkX&d#C(9iYMds7SDF8iK6>H9XnpfyH<!ANT`5^-p$
z1-{D2{N~sXi5oaf^>*lnm7JLZs2Zx4St!p*+XtAb8L}jw21T0KZiW@c@(Q|$$Q152
zRMwDESFxi8K0ZW4OS@zj{<rWv{&&&F?Hjx!JBGjcm$r$vtvG)6z=4SaTXFp8y%&xg
z+So=0p$i>$65m+_*7IRjtr@ZNd?2SJPD4pi535!U`-$7!tI+3haRJ%`hUu}VQ;2g%
z2T{71LE@kDLB}SYpA-e07v{v%qC_?lG;<n6G!BdnPTbY*S_~AKhJhyS>kCu_HM!4;
zRuFqt?u+q(4}2i9E22$bv~AmkyCSc42D`E03H}G21w4ElI-d{bVz*YqSh>+plTwKu
zR}oW8g=&x@;~w~MXu$Ml@k2p&bbvDh2DC+W={U_EQtb|2NWDp2FmfRvE5^m0@*)NA
zO~qs2FXLYxCX^Q=;zF)mDE*9oq=D@MYw(ZL55cVxh&NhL6rohe>F8|{7-gm%noB{5
zcE`<O(M$UU0K^L(<psZyJ+qm>Ba^6#aF#`2OmConh8nz&#*y&9$ykU;T}aq&&y5`f
zjk$nvuVzJCI}o|#lE^@0YP}H&DG!bYB6oa~agc9*he43<xc7@F$o>OqTOz9hA^WwT
zwX{?)4$=|y22p9JWBu5)-@@L{2i`x;EJTAoNi;=q`c%0crj@Vg)6DHis?bmwROX*p
zof~4Asx8+<1{Jq{kqNsL0~rGAq}M!gMNPW^evbkYt?D+wt;6si%Dyehv6n6^^z_aj
z(yF7+M73$PuetWs$N}tYe%skMw6Dh2SodECwIIipxu9LZK>+WiFwNJ-1-zNP*X^0e
z(RPrm?6)FYpZ5#6{+l@b4lCTA5{KVzh3jYI@M8(^XX5Z%;_yxA`JSiXPW%71{mFc<
z<$G?6-_IWL#`B%_FWRtOP5e6_i$DJ+-j6wNUTN2J^gPIyG236*`F7kkA>0dopgA0$
zbLEURr`SW!j)$HdCHd3@iozf<qoxcRMH?k(txRe1;xLNiqPX6P<1mh+IMTrZm@WmY
z8=@xzjxKTvTD=}X2gQ;r$64C^^z2es;5Rp@%vC>`$r%8!3{$YA{m=^i5Kb)AY%p5!
z;_o^IA+Z^67*`NVIdJQu5eow|!cT;LBB&6Nt;6Ux>StaCQ!{13h})&=@bEWmORW9X
z8*n>aIh6(V>CL{np1g`$Hy-3jam|M}Y`yT(eFH;n!|tGaTV(rz{y$9&cei;u{DqbE
z<!B|HT~e1<?5{7Vsq*C7Q(C>j;KJ1Oe5kvx(bv-0zimV8#e3=l?m%NsSxq6@dd26`
z9*EE7oz}Uxe<cn-ZiVa5$Kf|x;r90^xYPbnoK{G422BU-q-jNYmiL=~_i+60xJC}g
zpZApn_>nmL5fiT4Ebo6T4(Iy~8V=aGMlA1N`HNVK=KCLy|6StyzmWhp-~WVyci=f^
z#2ON!!hY+&N&E`97{7$yVTFq|E#bFY;o^HG{8$2<Yg)o@iNiN(XT+K&93#`PLoL?m
z>hHNNem}l5{(P)y>-{>{w0!<eydP`218drWHQkI#<Yyj&kQ!Ds%`I3@W^^jRB^<D9
zHr+%(lLb&gK!s(Is|~`>z3NNwbla)__F`wVKuTD;h+5S4Cjr2E1grsPW=OutVucEm
zkOT_<Zqgp^XA&2wtHNKX<vZFA1n0XeE4$}|;kiOb^athbemC})C?B7nU%fypbL|T|
z1ChN$Lwh5Ew)TZs&#Hai<8#QhDd*%)>l});DdEShaIrQe{6;HWtPR4kHsf<n+Tq$H
z9BUKzD+;pE5Z8wMyNBa{M_T9Fl<==4z_~Ug{1Fq5+%WSwkHz79Ki8&wKWW|i{sOV4
z%)fg){&%lyZ&=>{4Ga8?-F*KOghT6tT(!4@hM5wyk&<a$yj$fu&>2-To=vTJfV4Vb
zA>K&>CM|$Q0vavUYzDI)v<-mLx`bG0#1(d%0v!ec;ntRnMGC=!G%pI4T>K{9egQsc
ztS{Mq!6qIsi3iBu*39ssvRws8srVfw+B}kZ%h3yjnNIAX?X(Sus~)^g#wAB_#V80g
zL!(C+#Z0XbLfpo$ScxjM$yR&5ua;40gcXvFvMbT_8-1}f2jot$64b3-JUdh!t}D8A
zPg8H{{;`I!c8?>~UKt#3nqR);l6?dH9YaOI!sW^4{@Q$G&Uk{Ob?xhVJh8ub*Y*BR
zZ!m<>=7G$Kjm3?<HO|*I*M~=neGM*Gy{}~B<m~!jcVE4~xnZExSDy=5abRp)cc7%Y
zx3R>KANF>^ccIHrmwFpcSUYW?ou3G}Q^Nn%3a2h5;kOeG4Y6&dUHb`Wq{nu_L+~p1
z+WLSq!zNbhhpDl&bNbuW^s6~WqCKvpUfGVRVPukLc06mt(LihKBy<OQ;1FekuAsqn
zZtmBsl!jc5`PT>_bN9J`YMG7MYGa>ArYUIdx#i-qoROeE?9ZQ`+||@qym>UkUQk$B
zmtR$1)X<h0NcR*Kl$JGCWbZnNR0Tb6tjky5%+3y*$2V=M3yr39*i&n~Zf{{mc}_#7
zD>pC4o$6SVal_lmjZFNBwJGs*%!)t#WE_7tD>&qhexuNJ(|}K>{VrP!XUdP)^)|p6
zVEHOTE`|@z1Jo46bwZWfZz}cH#(zQuObQ>Hwl|F*nRGMCk43684lfRNNI+XqwL?4o
zol?u=zBe)%g5J#nPRwbMFO7@i;zCya%N55QpK@VYtr80~8f0}kLVxisB}97y?ao!g
z;O3j7BO}odS|oy%{ht_$M25~DA6O*=fIrglU-jQ3;?ZS8ujowWL8j5oNRC0FH6+Ly
zn~A?V0_rRPWk-qdDLrINyRH$P-r=BdGZtEj``w^=1Rqd(fSM&yX~K*i<4OZmmKHE^
zM<()>;LKjsOe2uLWqq#N-927r!cq!kGS%_l5Ik?)i6s@<UGr4~trazc3msjH{a$bX
zVpsc`Tu0_aa9vfzyQca*xizlEi$~|@M{(%i?x~vJ`L;EY3nu-6@g2RrJH`VDQ1>2e
z>1pUFYc5PL$sIg9wJ^12YC-%Hr{_Nlevl3l0iRH^k@)?ykbx3z=w|{h^fL)J^fP%s
zWtM~+`k91NKa+4nKa+5-7YV;P{@zV^FKscxDfQs(SA5I*ord0)_+C?QlW^*7^7)3|
zMt+9p+q%)d`dLPf$86(bZkZZ25T_fp?o7^RtwFPzUa-Z4HU>Ki-|NK@#4&;+ieo2^
z!#IxOpy|bIELo|Nj<c*?<1VEGg77MFmenhjl!d23dE8VffHT1lL9iNs#3)0Du;Dtv
zLK)pzgGZ>!1X@-!vW$kz9!N7GpWxV_`Q@~jVg+$|r|qrl&iDB99oco2U5kU&)q{&&
zog4b9giP|cPZ##mwcA)%P8+N)y}49MxRd^dqJXz7E5(@+nA|foxOXyOilWx023K)*
zL1Rl>kt>HrnD$pgpc!*2^fEa|hF*rbQ+ko40YfipTOn;2GzObR=|!LrK_k?Q{w(w<
z`FDn1L|Tw~k%Sw1k)RQw7fHC(izII$jZ`9dh7KCV;EFO|q8Kz%9jB2bR&1@VAyZ8i
z>Ikc8WKtA!ms1rZfr|4eUT_kJh+v+<1wA7)q}gSG#cVQo2e!dfskmh<E7Lf;gIX~y
zYI4|W?Jj5zVwOrTnC@KS^euIA`j+H0#eSs~3GDz=(lr{G+&eh5N6plvQZWP$n^u~!
z7Xo!(rpTt+?_f49=1RhedkH^gh1*l(@K0OeLLSQdZ&vV*m1d<|XUXUPRz6?C`FsgK
zW`&FAOZca)aPfQzznO3dH8=iwS;*D9ICF`9YURT>S9Ma+ujx=xE*G=vaFjAsrrUaP
zwqrTxf*y1!C3WeIJPy%BJw~+%J!Q0{kRbxbVkoN+O~mvvBQ7o~-J)2x$jzi8u@|Ik
z5pwb7n;iucebMFUJ4#yoZha@k;fdzX{o7*?XoJ^gmDHBTZWH)h0eZEU?Z<#W?2QM$
zd2D3?)$Zt3ji2t(9rz$oHiy&|yxEYBDw1O2!yLXy*K;jKb;sE^IRESM9AU?kALIGA
zu52J(th|Kx7Li^Q{0;^G8Q@iv6AFI270xxR;KvmFHQb-2Lry68EfQ{<S=nSep}&Z6
zG4hvc|KIP$3ExAi`Yh#^y8kwHe*@q@jXyut{zZBJ${+Cj4BGMP{+oC|Cd<Ckj$T7D
z|LV9bwUld}Sy!gzlcYx^slG{FBUMKl;jE)SRhMRa9t1@m1VtVMMIHo29t1@m1VtVM
zMIHnNc8CFG<$-A+JpewsEb#Xl{CPRuu_2d*b;rGEKGhFgH7r1nu>?<<tD?40&#za`
zSx)FGquW!N>qzj@VqO{a36M7{eBG$<yB58U?iTti=YvTRe-`tx4)D|VOq;yFPHQ0C
zRtGwv9E4smh7;&fTj>$>m}cu@j4fScnHlt$<m6U?rFacK%gm5nRft}*+Cntk*ZDsE
z>a(8<ufd~16MVL$QBr|Pqd&v9RSBAqa7A<IIiHC>7o;thxc@=TFTN3L25<*xY!B<T
z68i+Gorladqp}Q5K$1qT1O-$~1~t=_ip?m9#>k`-ZJeMkGmX8#_lLP?)DgXL_t&4@
zr8(C<s5}0+`Ph@OC&c);27hn=KE5|UKE7{b-2C1dF(-tl+V6S*C&E`UZNC@ellMPp
zyIaC>|DO2$PW#O^N9<<I4eml`oEI^t7qS<MO9bqUxlzM3HEA=2jved}=M<8SNil3l
zo^nct!I>qOiG$7rhMgGaVc8(#w7EiM34x9WH3R`MvB+0*g<hX*Y>Gsp`}ePH^Z%iE
zyja^B`&!L-P3$ExCVb<|LSHQuW4-lHYODfI`&GhkH{h7#mxVq_xYPciRu#v=%R={%
z_ur`QZw6EN3HsF6;W>Zg8*KaVFZd{E2+x7v47hQ?w?KX0z>QK4O%hO{7ZYGw8A`4w
zb`hs+L=b@yW)`wNnM0TkQ0LHRLP`TcB17z?<d)<=z93`*s6|MKaBtW9v`3Xl&>agx
zNbCuZ5NFh<G=VcWM`XYCRh$gCko6LNhZQb#d<nnZ3K#m9gda<QQ^%L^TjKCd*h-JO
zJmJ*krEg;O_uLl0AKw{&K6QEP{TcD+e=^~I>iF`#HxUj==UaImJ$;(t4)Vc2dnbdz
zMoukTM=-CCXES?Iu^Dr^l=?4>!ZI-@0WboiIiq1Nmq0Nr0vXVl4v2>76z=jqZpvf)
zHV4pZabHdRzB&bC@<qJJ0=4CGM@=89&bwt4vd&(F9imagf}||pSf~bSUE^fsP|H|J
zdCkyb=f?h_?~ZOrbG}r&l>1U$|LBI)g~^MlgqIc1)hyO*4O7hvuH6&eFjG?RioIBU
zSFlE_td4HL{0lq@8A|31y7)a#ak^kEL*n&Dfmfjy>rVX$h`+&h5fibDx_o*IOrN(>
zgH3Fz#*ZezWQfS$#^0uZVerh3{#2Z0$vG8g8cR@sQ4r9CJqo4o$1rP<WSnR%>(0_z
zcXKt-0u8u^sA}+S`$v>cj^fad>@N4W92gLKud-CK4xjxNFoR+X{$q^YDR2^zIEmBR
zCXOBQknluWw%%{0Wv7ri@_s8VJN4((b5iY}h(90u$P3#=u9e5)w9hp}y_j&=Jh)%I
zUCdRXSljdk%fEX({&!sS^hHbfHxl6V1xxr7gi||&FZc-f8-2kM?kQCTzwVS^=`0Pf
zpOPg4rbg6EM@qBB^&27}WC19h35!VaJVgfrz_!cMmD`Lf`hrpXhb!sS<*uwFV%_xt
zG9o^skG1@#QStd24yMnPh#SDp)h1`m>SCXShhWq9i9dpGS1uwf9=7Z-oxAKwoV05Z
z+3RXsSt~KfXHptcw*>}+{>+r(y`u(=t=V0YTC{T_w4q<w${kbgp3?LCO~N{37`?G4
z^SzD59k9QorQF}sHB>vctQ@z(G{gE^guvM@_%-JS>+%FnfcFFbUcr|o{B{K&fQ;LY
zXcTymxc|Yc<o)Qkquno_Q!1bHxD`%WDdD#h4j$%*Z{&W^K!kO|b!z?%8K)d)<|0<c
zl$gz7E?gW=>C0vM9H*E1E35p9#PrtTN+xww;+!jHsuS-a3zfE1Khz;?bg;^|YyGj+
zo>Y)lB^X1h#XbB+f~$96sjAmA(;n)r3pMx$T1qS0$Lod{y<M&~9UY-iuzqQ3%Y58R
zeA4RoP3dZE4Ky^@dz#WxQ{28zf1o!|&|DWRscWhY)TE_mPxnU_O_#BlBY|_VUL|gi
z#c`fV+$x+y4-uJ-8Z3UB7KF}~Wm}*(DqCck8aV&kSs+%oRB}p3LIQ`&r;;_IDnH}w
zZp?Wl_{aJBYoIOk+o*s8iv6jK_p4x~sq?8lcugWu!AcWQO)emIQdNuI)P{|8sS?lu
z>p9tgr9&yhO@K+R&x`@-BI^M;bGJ;aVo?uP*9~U}b7xUC1~Nczb&)SXlUbyx$c>CE
z;rLQ@WSV~d&P7arxO1*8RMA*f)m2x#bHmu=<Y;tZ0UKj>hSqmiwhd1-1Uxe%H_a|J
z*9S*1+l}c?r@N-ZKQXJPMCazBXMYcbrF1S0R96oybq>}x1!~fru5r0$pcm?8n7<m^
zP1G|I`;{nL!NgyZqG1}`3SG+IAgo4an@P^dVteUB%7A`BT>_bAfVmY5tX2-{Dr9?6
z+h#CK6(p!eWym&Dx&^oCC{hVd==AJb4EMhOZf)W7yAS!+EcXo!Ek&1h=H0!bU)+Th
zp3&c??OG0R2v<b3vDx&=fyvV`8e1AYomyDG5xT(b3?^3yhZX214__esqe|m7DI-ZI
zHVp{&7bZQh5ujAEoMiTv>|E}I=R{sHGxlYpR+(NW6PKtu6BW|rV1S9n6<e=X3*&<1
zfrGL@#3j&n0IdhK*1e5QBO{B!vVy5gFWtKJU~Ay+p=%=UvYppQt{M6wh6$d_^?9j&
z2J5yA0N7SP&6IHP+z=u=63+Gf1A&)H@X#pm(rUYdiaa8hay^w9cu{q~CSH78F+LeH
zt26m%dVIuZFly!|qga5&FHVSNCm!rXNEAS%zDY*Qv|nZ$(sc7GKQhA+*pL;7VGFDZ
zAciU4Rp(^0U0g+R6me@DXFTBc3oA#>^#>Hr4i07+;WaDcoO87Lw1X0nv1=lOMof+V
z7Ot0ktQR*J|KD-N)Qe^sQX|ic`&QMuFjtPs@ioz=@F*6FAUNf35%P$cge*O0Emx)L
z@I#jh1rd`%i-aFmI8+jv<e|xzufR|l7z9R8cQNWHoC_NX3<q10zks}jaTT%BUyOaX
zz0F8i*cp3Kb1Y75o><H+t95^^w5~h{G!%s#{*{o!^qoPTpTWt13;RpL@36v!oR{$1
zt#Bb*B>Y$coc5Q5-x7y!(taiM0>Y^^7Mbt0e9vw1`|+Le=hOZI%^Tlor~M_L|H*{=
zX@5!hO@xCtM6m|`0{=;~?E%K#rR`<N6eS?ciBv+y1enH`VkOpyrkHAL9vm&X|3O9!
zLnm@e*Akq`S<jLEf-Odo{KD-?16_1KsajC&SBZ|c{zl}wq!rf$z0vK_cVdT8cQnD%
z78tCwFXW?V{Qm9QZ0vCw>t)*c7FrPbW)hcoCg7O1n1tUL$MNfW7`B*)6|rux1h3>X
z0zayl(L|{#s4)T7lzH(dR+CH=o+?vJN|-dfLbg2S?<!dlON$H~BN;1QAw66gD2ygz
zV%wyiQ&t;mPagkagU0kQX;M1`gjm<eCXQ3V6KFW$ehUrbe)^aBoCF#MoOYLd{wIjX
zIBmBp{5tL5OrUw%Rm8i~{?#{ue=PxidHnuI6&&V?{tL0zAW1l`1^He97i&$zk0rpl
zmL>caE8Oy&+Z5adztk@UoQ4pde^NeQz{T?={8$2<&zJC965zBU2q&Je5%^jC{M!=l
zr(G)V|Dx^xnD-06ntc9^>i%jl25F0U<##?Jzf;0#i%9tGR=9}oNchbPj?5+f0{a8F
zAAgDQeh(~-^C;mTi^HEufZrd7pGtuLLmYlG0e)p1{*(b<*`!~fKcwKq5A>k;d(H28
z+PGhQr}2EJ{f7znUl@P>cX&VKVlnawuR`5|2b$!Aw7#V#DXng^_C?7>vobCzNBIA{
zI0Wqjo7!Z&g6a%df%g>D3b4>>l-z(RgbL0XpQx*L`ZQ$NYnd0mp2#wh#apPAMPe^S
z7PZEdcmAH6sU`5tf*M9Ao_<=tDE2uM->2gE`@R+5jvaCMb5^+heR24=tZ+xIf;;U$
zGUkW#Y&YmAU?&}^**53f@^{Z0f5-WDl*OO-F9~o@9RA}3xcUB{8*uS{gKh$L(&byd
z|FrRUtKR>M1i1PBUl9&^bHM2{3wp~%TF;lw&gaq&N7r{HdX)uZ(wk|{sXI(J0NtPn
zGz#NHY~BUBfJ2E|IjDqw0G6uLMe0<k51CAJcoYCp$?*a&SUe&iytv-@mAHVWE9<!!
zJ8%ht<IW05ZHWH|o!q5;`WO3_wDYxJ#_mHCu}8E`v8C)UeD!;1s5tY=%pYd-!)%={
z=2GB*yhLMPaHsuynoq#lgK|pn82n5g6Tk^;UBbyrB>WWN7<3=j?i6ZSyO|@`WRrC`
z1_o71oQXlD?+87WnQ^jOjRtVKKvol$RUQz=Gxx4)z~PgA6`$~{RLC5;8lj)kB$mC7
z;>tR-6sya`sP`2qb=t<3$@a3nTgOnYS9R&SxZfi&JMLW{{KN-0UsgTtUee!FGrTE$
z;G%b<YHwn}^mSO>B<WxJhZB!PryIhfaU79;C5}!e;O+x)_>&603}QUrPMrFIiB$V3
zM%h81h{)*&K%aTwhyP6aH25K7?yfhdPpcI``?*q(9Q`bLiZEeVBF7Z&MYMfmrs)m1
zI4*x+cQ}M7NqVQ`MT%`FE)E;N&NF^}nisG{WkDYM{228{G&5=hak6*@wL~&sqe<&F
zQsJ<}6pSm^&UNcv8NFb(zJB(C(N|t+n(C}X`@g1}Km1{B{fO4kyy^X$@c-tS%AWO|
zZ|hv&Q~AP(XomtEE8OU*+P#7<i9@HL*II$Y?}4yMuM$pPCgIN{z=?ASKa~LI+)4P!
z1UO})gg=!4=bTFTlLj0-%qe6g;pARH%lA-L%KM)-?ib&0yqB`ldOu~Qy#G7AABbPZ
zdaD3!cx}%yVlOMGjP;fzA-%M(y_S?@<+GBOBW4R7RKcTID@*o5FN9q*a|GX#{7F><
zKZ@T7+PFU9f<<UA2ngeM@=>gB6KP>3Am9?by#zE@0-7s9w7&#2RRWqSu^q+1Xg@t-
zXi<r;C}fmB&d%Jcr6~-N>SgUSXd<%)J&TqSWhu-Lc9j-fE<uI{1}aiadY~+n`23ay
z|D8gn$@%)Zfq%}U-Iy21BHXWLQ_Lr0rB2J=oi_dsaJP_!@_E0oz?}}tA_@N$;aEcC
zs~-XXtVBTR0KG}F`>X6);fb$xwX{u6YE^Z(?3@DoY><G|R!k(mR;epu3#~IG9<13~
z{E}EUv#L=0XJl0cx-^+k#eD8Q?cXcAW?IKDD2wEFMi$#67tI73<}R7|$Q@c;)7oBd
zY^S$(R(rdrd((h-X1FFW8Z5`=dkc$KFSkGNrPwd4hnBihQo5FgsH!U7cu43LbpWK=
zpXs*3iDwBv8HZ=;hx8{DoU!X|mgjKY$@`z={lFtE75(#A7X{FUpJ$&W*-1v`AQi{)
zsC>pI9+S#<lZ3o#Is};|D|rne57KA<Ss}i~1sUoKfSkc0DnhU4uca(k_i+Vt8j8gn
zam$lp!I?#s>S>fbu$oh*&ap_82?I<VpjXcY$CW1P5JiS@wUK4)>Z*3@?%16R6B7&C
zF8&+4QyYkVLr)z!g8z-2{Xg2(M~}vN&^|%as5ZwOoDAcHxk0Z!Z9(u*=7>P%-yz}c
zfbSA>CgIO0IR09@K*%i#Ka~LITuS&!1@FWCo9*PG68@Be%lC3FCHzSPj$FqD!9xkh
zs<VCjoZtDhaliO}<GtXamirg&<e~EU-{Jk3fdTkv4hkNM`1oobnxyr;B@ZR%lu8T*
zuH>fF_-G$6{lkm%|9~BKGfR$Jhhj7LRV9S<%M9$^t(ENFoyZEig4&NGdTS(d_Sr;p
zBGBVa5qQLs)GifvfyB$V1YUI8X7HjG;KhyD*f#1NWooZJ>K!8bS-Q%TYpx^ZxH16>
zk61QLcA;pH4q0I<A&rAcoKV$RdQ9)D4<prE-g~%XzQ^xen_7%rtRm4*{_6thAXazi
z%F>nre|~X&r7JS4-8maOAjYxC@3lXGOsns$EMXdOwq1*Js`g#+`wI9T?-g|2NT~gL
zKg9|3PWXLd9Z2{|1z%pt)b|RyYr>7>IZ<){R^aQ$;yK{@fPZggn}9D9E^>?rhkyJz
z`FuPFaN5iA{s%R@N9rUA@SAOmu}6@(^;bOSXTW<l^K00upYcIMrYmoiiC8mqz+@cM
zoC^-ZCQjTRL<iCFnmI@$z;qn!jljqVSqkk3nj*pW2F(>uJaSiSKa0J8|Neys9?%-J
z+?p|;wm<g3;AH;`>bv!QV*IUQoZstG;{?y$C-{JbpEBUU<32Hd!imRS#`tkRWw5;e
zTf86ZaT$Jb+z)U46>N0p7E#f^HGUHzO6w6uMUppM02J33T2CI3;Q%6Jb5PPHwbuf0
zS9UIor`R!S!hJ86cdabgH}v#{mvV6dVq7|=PrUITJrgrmYM(iF_F>{j$Z&z5HjD>!
zrueFaQwNpsXA<DlK_&cD0-StI!VUf`pF{pB;ZMcy-$dO(!Kt0>7I<F$Jx|B)hpr*$
zp3kAKX}$kT@#lXx;ePT@`QGmk4kp*P@_oGbH{cSrD0l)7wIP-%J4DhaLf&Wg>{HIw
zb59o&UQm<+eFZzhs?J7C?{5|`*e@!*AqD!84mu}OGGGnrFBsFvRb9zF@vBDl7c2{q
zH6}86&OIz-G7VdhYXOmAR*k0Qn#d;a(su8g9OxbQ2O8%t9*<vM5<BC{)ml5(wyZ^e
z^V?myv1jFVR@YMPuGYU>+<f)6HskU`Tidj@z?yRHM3Z-5p%YiJsJN1}0^E^Sv|j^l
zt7(O6L*n{d0@qSMyuscGG1V^fjtoqnGw;a6vbo``@>N)!+~>|a;#y$dQJr89Z;^Kt
zFKbd!BK?NaK-WM=<J=`<;}_305_7@EzyA$!<>_AAqR#flz2*L{n|Evme%iKvXfsiU
z93(e!bfj}(z#G3X*3=CGPcN^+(<UAG0R9M1q<QQ8R+_(oG_UTr()<n7Nd!FA{%tGG
z3%y>hk)Oxc2-aGB?Z6(u{p#)JnzQ`f>G<Da%?W!zKJOO^a8G>g{)%vE57=*oJy3=<
zfEpc7JbRC|ai%XcX;mc|2uXUZl}*xOD8Mvxu`-#6E3g=l5+O^9rRj$~K%{+#3+b9t
z7uVxn@hfowjg@`EWWimzxMHO?{Q|6#W5+=*bLkgAn=i9Ar>NMp_K>X9jco(C97W_&
zJ5w=PIra8vV`KE~Q<akyF#MED>+I=@q4M&fivFdZii)146sI625S24Un193R>3T_e
zx=BrO*)t<}bcduT`dXw+)@OtalW^gKAsjMnM#wP2DZ|Fa{f*E$T;e$)`J6w==SVnt
zx`dx19I~wu_PPu68R0HQwpDpWBQ(!PZ04%9mJp8sX;QUh#c;crqg348F6O8asLcgx
zc`kt5ug6g%J!Lh*#3+YN{Sf?d*g*(?0NWv+8Ny6LOU6*L%gpLQljWsIy=76VRx>s?
zx~6ykHc!un(3|+rrY{T()ovM_T{ke%yYu{-!Nt(JOY4R!v8PdQZ$~IMyLkJ2>uk8n
ze$Hysl#$NP_R!QoM>sFL=)Co<Q^C@{9&9dxQD9Cajwv4{j!(vMpGh1mIOmG-7wQ$S
z>(@Z9sI(oXUXfT2qcSy3+$Sv<Yb=(<q-=OZVN)zJbC9%*4zhBqAaYH)2H0sy)P-8I
zc4U{Mu5KD{$V9=;LHae9oj<nA*B9P2JT^AG{mZe>ENCka9DLU|_FUW&Y@b}y<LMcl
z`_b7O^oKTl-=SZ?vCzJ4!dP-`_fS~oiIAkBBPBKaRmB9tW@VuPW#@aL_lPd)*F$Z@
z^5y104z#fo+c&VAiR>sUx<Wo`+_D1~yiGt)6N;vcHqaf-9qd7hWzVK+(l>47xo6W<
zRhdb$7b~{9m|M8#9(G~9TiX!(ytZNF=QA@uACdD~gs}z08teoBeo!W#W4?>91_NRZ
z63%%=msa4S2x|&(n~zx(*>Ik6cXR_6Nu7|bUeOAy5|yj>U(PXML&<!>-e`_fjV!@9
zQ&u^gnU6(-&5}T(H6~<`xQGSUxsylq!!t8yZ!nWaWdG+d#+rq^jn8t^reejUGw=a9
zaleK#3QTIYa(gPcqSM+LC~sipoNU<^R!r+v1{8%|2)>~s7Uvj$lgZ{)ClQBWbVA%3
z4^v!aL?=#*3vTsmhyd({4C?~QG+LRl<vCowGPj1kzLpohzWx03w|`x>_|hM`0o}bW
zy6xAU!45X}!kp6vofrI-#sTyry368l>e3SaOah#ISHe#vz{x8l{A2>0y0nBp6^CzP
zPh|zCWM6N2Fa5Ui{-@*j^E-{_Q<t{hPhDEx|J{W9sY^@vcL)b9Zw4*ny_gZ?k~!ch
zC3`n$xsCFn%_1L?yj5lcY)l!u+N*pKVd^x1V(FC?-dF?yzzDrKf;dKSL~-oIaTv!@
z9Q4LAC8St*V@rR^>RX3Utl=?qiH#LS21t%>Euw|^pk^Jfx^;bSW_fvLA)~CNrnI^+
z&1hN_=*_QcDsdEt$|F1aN?}Ju_wL`nS342g+Yyb7)Rfee6lADgMFBT@6}eI}oc@`^
zYqi_0^Uv6)#NYQ5@JhW|!oL;A>+AaM(3>l4OT=rXaE2OqRefj7)slo)llL2rZ8mIU
z&nTYr=&6ol1fDpN5F(m0AVFVZVC!UQAh&#AS0r(~hxZ{9<kq!^XZ&h(inebj&Fi@s
ztd-_BaSRHcNR!t4tu%Q%X;M5VktT1auB)E^?F8KYMB&b9|D~0Ng)U2+I_*Ds6Zp>(
z;J)~CeyZSwFc$ZVwM-{1{3f=Ki!~+TTssneG6BxDDdA5gz_|t`{AmTxhTIqz&+nCZ
zV|xkUQ^NUt2|sDT;nN=%Yn*W66aKIG{d}*y|0(1CRnLDq0d72>c(y)=v?!nREp@*i
z&+&@ygeR2qn*b;8lJHXraQa0h{7J&WD`XuO3$WlP;g+u~ls0HuNdPm=NjW`CfD#F2
z)}R@_R?Ndn_4GnhYmyEo?n{>{{4&T=XBwEamT{%hpz3_Z?#1XpFKcyCmxWBQ)~e|W
zyYt)ncVmxFM6ybe?zQ*q8zKd&bMY9)gWhoXXA^iI_pqDhh%!X!m&{<*-dwh+%4Om3
zp=_hWRqjtr$<vKZo#D^&*{hpRUwHcL5456`uW0X`)eoKh*sOlh*`G^X2H|u1INmMx
zWHxq_HgKs_L6biup-wRjflKO!x)6VKu%$vNC^nP;SGDVCRNoz4h`sb}d(X_w8~FDP
zII~f2h}@;;@P1KeY5!09{O~${aRzqkHa&UL=f~C`EL5RdK=&52KxIrlg<48=mxljf
zZWXxg)!K8hA?(QbAKKSrx4!<mw*T9++7X9#WOgQYcQ|&p#1AMB_;~`FHsbmLwX>~(
zpQI>?s(&$EaMth?OIxHN!|)VCA5y(&2RCKwR(j%4TF<Eqbs0qtGA4y~sOTO#WQPjP
zE&$3lEOz_)?yTx*D)mhro|`*7<tuIKsk-x}l3-nFMc3N)_O)FVC3Wp3FU@4Q!ZXV~
zgYR1I>sx-;V9)YQ*p)GJD7|H9wr-1my5H~bpZ0I5n;mLNKSX+DUz(k$0jb1rZ=`zJ
zWea14v8ym0smAD)hG{OWq#7@!kDKT)eYR3xW_~&e-XoecVYc8`r+&$n#7qosR9@X8
z!0EANd4NplZqv|A-)cg$b{73@QxLfu*6Lc3r)hX)cD6J$rMVo1+t#<O4SPJ{wQbSu
zZbxPL=8K2Ju}>G(ddjk@s<O&FwM8XOHHC#WO@Ws4ckQW*>>V838>!p5_t5l;?W>s?
zWz98<i#5$<8SeU_`l*J&dbfeAM&OFuRep$Z%Vt}Pz!l5AopD?#j$+~}DLvDQ8ll0c
z!Ve%%rp9yI4I@uA1uvqqPhWAZN|z^oSPmue)0Nbx%_VT7C`gn->5bvWrd7RoqW!Vg
zERA^DY7-i<t;ty3g@-th`P{Ez7JF>hFeEQKM9HX+J&ps#P0W05mA7UxVr$zwa+5ki
z20b`ShfEJF%_;%o_GH{Oj`?UMD&L6tXpEu<1riE6!$w3GrY3?$vSk#LyG4e(svALs
zSN+(eEnaw_WxBJXBoHj|47PhJd)9Sy%oaJKpKcrI?j0Bza{Gg25u|;0>gfls<UZ+v
z{)SSA!%^H4>1f+9P~-Q<-q5cc3Y7$Vr`E^bonKj)F+EW-F-<;~0Y3L4@}cu=N7&pW
zv94Ohh)n88l3B`lGf`!=YXrGi8@tjdm5p6#zNCZkg+x2(qAEQEv0!)mp8sUHrMfY5
zO<PLWj=8U}8mP49iF@wRw6kQ(m{U=oiyZw5pmRUjv)s9iJ}hn$WbgpR-^@9+x>w2O
zWPKkUU)<7-x%dd}iv_|@D@BX88Zt#dU@LQbOf^%`AGzyTR~?wO9Zat-#}0p(@=e<#
z*M}yW@{J--U;lj5$B+q;QQlGKA8aYxFzQ9yHT_d5j<+>TO-<Ji@13j-Ozi9*-8)v3
za^-R)wy}1gr`MlS)j1OkZ(Lv4Fv$29<Dsu>uV5`VbN^ZYs+{$t1#9{i41QIOX_bv5
zszIo-88Iq#R6|s*Ub#MN5%goX({8bgvSn{I!Lf?^HMg%u4z^o+W%$zv&mS2M4^?!{
z24^oS?<<_^@itdvcecL!-4_oHzq5JIp$%i<;Y>$rPtY5#FAlf0`s=d_%d)e)jbqWQ
zx+a)o99!GUF6}tx({EekB-Dz=kH#!2Vlrn@6;?>bjqjFY(Q%erfH8!bjro){C8A3(
zJUViUWG!AUc0dIe<|GblT~6PKw)2Fyp(LY!V#?=D@vN<x>YWd|Gs=U3n}#0KUmW;Z
z{b)~HQBHUyzaYJ?EW7Y<!BzP=wW0C0vd+Po;KM0M39waR4ZSLO?I9*O$f&F_2E|>>
zHI!6*l(b~5i%Kdl91%Mpvxz>FfC|KTX~nZHrYN~V%a(q!P)mOntfaPD7T%wIRZod`
zXR+IQKwJL@HFgDHk1ebV%0Te1O)LbeDwO{`SI1XY(wwO6b%Z>Sbzt?FSy=~GPfztB
z)X@kB^;Nu}%lc6Ra;LnY7o#3tjCz~!V%$$CvM^+I5Ix}B9180&o(UsYp<SiP<mm1K
zGciUh?ON#bc={H))OkrOD)4nyS9kgfuH`?mSMa0$T42k^FS_XCTLQ*8cF%DChEQ=a
zYGq^R^WS0dGv;>@gqi~$Df)u2okRxkW6ZBocFp-U1*WW!Q*sZgcu31ZRaf+2TR^*C
zl&Yy`v!6%4?P4Yr7KrXU#<Tx6|4nj=nvJ!ozZm-mvgC}-)v3zK&KBMA&K}$q8}(EL
zzL&>f7<Am4>v6aDU;DFNf1dh0`myxi<I0NM9DAN?H5LE-32U{G-<rEB4y@RYxmH!R
zpothWQAe3GCgm^&Zioi%$RsNZSr5j&qnNA+2X_H<P3*j<`<!-P!CeP-1On;b8tKNr
zqirdD=dXKO|5T)+^6WAE^PMk#F-D{kzpx{GxU8^!goaF_pCQR6d$YA^$~V&lQ-iR&
zFWD|lI$asSAtRz91Qr2$p$;aml!c}Wby&;>u1mEDJAczilhrw50sFTEM{*o4VWeFv
zZM4`LEaaV`mYY5#_-6(N`6|YjW7|OajUG@I+Dzg-N%GsudrVeyZt47kn}lp0=}PI_
zG54?(&G+9=(F{DdfRBF;w9&?$9(@qbRzFz_{bVhc#)ek&qXnpvo2k-oP1#H@E*Vj?
zXz~IEB;#G&2M5gKe*8u_Nw31i^*BT>msdiWB`f#Kkt9TIw*;OtKcH;oD&j1ZVM3S*
zZF7}eP|^=4I*PTr@MuqX)24M}gA;3|fLPnRE?BgFYM{5R<-^)l`lr?m<#hE#)(qry
z4CWUaGNK^I-?657&2qXUcWR(*O|CN%!F0iwA@!F$Jr&D`^jQL>W*+mG$BdrTRr;4w
zTFfPswA`&ri1TNvHFDQWrkIHB*CdtE=`U?x?KdO+jZLSbJM{4WNTkiDT@+h`DaBVZ
zrrjg@5OPmLSeK<xg=FhL5toijf+WtTR1tHrsO1FFKz@-a`g<WP27Q>qOtw>?V}QMJ
zvCOGh375233YKa|&J!{oD|$EfTzu&8-Vhr#KQ}Wqy=KjHkw2)_2N#BGuf6L1*Vop>
z&T5X0^E2}sH_m@5zp?=Ju)r~OjITpJdu+2z5lpN{Q?{UqW9yP&>_m2lr4*9e)o^jJ
z$}9yP;$_Z)Y6#1(j1!Z#>GI8+s(ROVjBhI$%Nc4Kj2zu2=qJ0n`0e|K_e|7|^w!ij
zFHMZU%~z_Z#?WtDK@V<_EOs*~QW}x0K{b1?CfT@Fla`jMY-_+3#WAqn6r_*PRzjN+
z_#0&N31w>3X?J%t8QQCNXj{LQ5&QGZB3qPrtF^B>i?>eq@16(*CU*Dp99h3%i0w&+
zx@Vv)YhZOY?Gb!?mTi*DH?dzpQjx3`&-8|<XcfMgxMuM*Bqxg+jSM@@)!6ip+I?Sm
zJLKoVNCefpcqi*uU&cFKwg`hT`L+TJ|5Lo#oLgnPngGQRh4Nw-uk1D*=|UZLg^u^F
zS<@HYhyO)i*}AZ>RV$1A;p!`{xLV7>TIqm%xkb=co9*MY`ix$=6(EzU_*zM_vz3F&
z{1PiVgyEFbeBEl6Qqo9gL^|CO7_&s1TvM!iqCLv+7gZ%ug(21ucg#?03_Cy?S^px*
zMho?9AFo?G(Gu<`Zyok+UD&+*@%KfeO_7fB>{4G*k*_p6t9D{n|Ail^?kV4~zOH4Y
zvG7M%zw2FBU-$8^X!e5o(YA?}f!e&h+JP3#OBQ&@?=UaLtN~@7IlEmOdQDOno+RQ>
z^lh>dHBkT<fnGkFEf{1{jI0G^avD3Af|+y_RiWf7WLH`P{EgUf+t)Sa_vb9zuipH>
zj!q2tYqR&-uiO0P%O`Y4srM&ZVeB7c&qhkUe~A4+JERqZ7m~hu^sC`#E2bBP?Akhx
zBo3$;p6QrOvd+{rn*%e|MWs+!H4OSrWE%laI28&^X%`oTaPi__W@q9$)#uj6-ud2W
zbR+(YzW1Hq{>n#>YI^LYrStS_&%WclCD3f_=tsW-c8EcA!jJYj&}^7}HOk<$r^mvW
zn_9|h_-^8zag+gX0+LFe%`Y}qF~d}{)iCp==n=w3bZw)Vw)eo3crA`&I6jNxVH_!l
zYh}aW?!s&7G3QRs?5jZ!h)88(zC+wkVtCgqG%fB5X`eL6^gv5wwxngaZfGLQku@<?
zH{4Pp$lCaQ^j{1@?fhh@$NS-TjO`q%jP&+KDu;HCU3#4$?@r^E4*+G5+r?nctg%dm
zOytkVEfw*|RQd_z&)UE6_xfkV&&qd>pJ5HD`&oCAib3*cSgg8N{0vX7`aN?pQ(^na
z96nihP=MU%7VaZ!i`!+~#)(3xG0t6-7GRQ{$xMvI2Wr(-La%BBMX|*v9zeZn2c4NR
z30_<{VVyO?9&3a>)`(7`xaE4@0(-1UIDsWgp{SNVU`rcq<=LcfMB8nonvGq;l(S35
zR;8O=ptWWhX=ZKPuHMYFv)Oo3Q2gTT%#6U#00@^k=c&vUSNLKsa4NovG|l<h4u5^R
zZHn<k8L2R6S_wxJKZ^TGKLW$DrqhH1^FgHNLR=Pb^K<;aKs)@q&2QhFvgz%Mzhe=o
zwo}WBy&gM`*Tui(r1+MW_|I}KnHXb7FxQ5@wRCT=i3q$_s4-Oi&DoNWVF8{q<MXMe
z&-`9fk&<kliR`i%h;6)C3}l2ssaP@F0~`?2oe5k{93$GdV?FiSyJFYW^GX%s5RW1k
z6}dU7Sf>VFH*+i;oWe8m8}NJ9!-)NWwX^tLCS|;?#$n(&DL3CrhcenhE0k_PSr22U
z3$UxeE+QZHYIpr#Uemr8yXCbvw0Er43bmZIGqFF!UY@~sh#VC09WoC=#1O^LjOE#F
z;gw(6J^Bxz=``7TH8*P=`)vIJIV@J>)~r1D62~k6MR{i?BI}y%D2^L&9LI42M+zx^
z1mhEn;!a)=(q>%jkQdz3Gt<WG3b-s%@Cliaa`=HO=`b#shm*}6g-?QQzkuTm4u(F}
zwyJa#XXB~a=#-LeTZdx@jzc)Ottz8Mtg~eFEWRT;pY}Bj@Dz^II9|hnr`hrHO7T9<
zJ)R0*5#>gsxN62z*d(nRn65SA64=g&*&jyrANPVbq7wbOp%ifQ@T2)_kF0BGSa)P?
z{(|LFFASl3b5-AlP~qPARaN_@cTP;ab5naTXj~2GSJVuwZyRb`KTs3Dh^3OQO0Xv8
z#QgOLx*EsN&w{S1Y?tyMuW%q4bd{82uVj+BK$HkF0p{KwT%<W-OF*n0tP`0DL+lDo
zo_K+h#O^zkI25TAI&#}tw@=$Od~mjLp{jejaiMX#yK13v_TccsQ{K_N<1f9`J=0pK
z-51+b*gDhw(o5reN4-ypHHEPtHitC?-h{D=xRpH%@qJl`aL*6$NebR5;NTmGJKyty
zgbRPKfTO~P@SjMy@G}ay%&)uWH3=8~DFN>Sz-hl{Wsc8Z`FAYX0`@J|CH$6^^91~5
zz?&`i-@CG1e2?sXiSHD)Dc<`F`Fx>ci~C0b0Q}b$xOl#V-|~A4+;acDf0l5ecL?}|
zd=94`co4FcaLQJE{}0d`mfw%>)T`}TP!Vd&1U&Xk9DY>5>sQ0I>jk`_-*P{r^yjK?
zT6r0I&_~7nZ4S%*;=P{~@ZJRr9F)U+hNL_MasS70f1UjY{6d>C?{aTA+WL6BoNtZ$
zJ|T3EyL4L!?@!VH4dmX&+;Lmnb}+ktD#mYm)shSelf_D_TH5_o7rAc+iQH(tL{);F
zSPZLx9&kFxot8F3N|*;!Q$npGjMie6BYP(A`dsrsojb)*JU!69p^tqmgH@e@q74&M
zlN+-9YcF3q^r?NJ)a>;+j<W78V_lv8u|326J0pR~!ur0t;e`#8z1tQxfKQWF{{Xvy
z-D>^xBbGxU3J5;U_AL|-JeyV2YJ8^pX*%4D)?9u(OZxx)Sl@Ie(3Rp>v0EZQw(2Yp
z+gmchQ)rXbs*5QS;LNK<%`rT6{y=|$zq2}a=CA(7M*n?xR@c^6->Ew$2X<vSQbvPS
zJ&mPn0={Bj;J#O?tBR_sZ^qnVZ1km{L4RIZcY(2)br)pfWH*7hj8{5|IkVP@q|Gk(
z!m7quj*YP!D9acdHx893<Jj1qj8h7uKsZpy)l-c@*2#uZ7-C^jfzdn)jtVVj{~=F!
zwxwmRr)sQsYTnzov2)Gz$mB=HdwSQb>FpiMdiSN;x~52|q9PP&=-r&}NLgOrxzOjG
z92w{y>iP88gm!4K(;w{V3EqTZN+0<#%xj7bo=%oM(c5P5@1!|YhLhC4Fa~LQLt}w=
zYEg^)8LizT^pI-;r{9FFQf=Ev>sorEjOQlV_a+WyOr9>^JhlA^U9xaN0e?j}6Q`n~
zV^`;}CO5ry)=ASiS2OpzPW_K92k)s{4h0wby5`@rxb=8LS5seS%Vc%;T-L_O<sS6f
z^Vg3BH%*Vfrz$PeU(?uH+t9oZYddY_h~5u;<bap%l5M?YDJe6M9dRm1vLLMv3F*vZ
z_6+^@=+ukl%oG;7%w%FSNy-fg){P~MjTY!jhAQQ&b@@mGY5i3JZFy-rwqsiR`^S7G
zk&c^p-4t8%>~+^YtG#RE{*Sc?p2R&5$dj@JkAe&kdz`QrIPni_ME^0y(QW%aH^fTp
zACcrvPI5~nHFxT!dD(5Lcn=Z~v;gV}sF#3ljFed5hUHmm^VANk1CCz0OFIPXAbvQv
z%tatZ$V3bZVDwYoRSy_L_Yc}Sa969qTlbL0a3|6>7-N9TfSM72A|`_ENWd%r6oCg#
z?9%GY!M4Tq1AUp^!a`4G*Fc-6C3j+5blXI3i>Ga%E7Mb0=*{dK=q+z{jRQRHYA)}M
zTw7LVccfO7UKa6G-}?OXw^n;1mz7qeI_za-*G4KE?t1y<yBaD5zQM`#N8v}WvHb%R
z;}d%}CP{-Nf0jxaGr46ov1#pjnPk12oo}glIaTDY3Rsp2^~^bzewJ+DmAYg(jP(LA
zZW$dH7)0O8kf_ZIb%&gS`&4PZI*Bk}_Xjimg^gwV7T*DcyklWsX?<Z$)`god!%vrO
zy6}g^m3Bu?%Y)z7{#R`7`wzBeJM0xDKYSJc`yuF$wV+?d`fp<FJ4a=)80%jtdFE)X
z>z@Gtx}MOJP|!#oM#R_`$6z$*t;O$I%qcj5DyvZC0A@0VvFWG5Ra1YnZo6loaI$lF
zuq$}U-e70fP-snISIP3+`8z|w?(R#o!X3dtQ>#C#u3;?T%c`zx@U^t`&Wr|oG978d
z?X#OOF5610_IZq}o8$7WT30?!n$O~cQR5QcFB#bI#pydAY*9)G7CcBlSPNtXw}rBd
zOBIE&!)9C#$dMVTTr$PsnUO;^qlL5W)u9>}cXt~d9iABtwT!sN$}bpgn(nMD_P3Q(
zh3iY8&_CPT8*FJUtZ6B!DQ~WFO%8`EI>N0jHN&Ho?PGzOo~H6thoiiCs4h4c_JF)G
zZp#0E2S3T>xXGN^y3Lr+Bsr1f7qq&$g_qQtBS}M=k<KivY-~s2WKId<9o-BVF3zVp
zMxLIL|LTs|FR!>nYsMzPo+~biJqJE0`XHhoVJhgFx|;mX-#~Z%JA8Ml{Znt?6u%E}
z-beTuoYc4&a;)aAJZzN3h{>CdOAW&$+@xh{M##7-jd(g&rEKd$4S}j2MT@Q|T&C|)
z8-UXjOw2Bsn0+-9Ta51Cn^{;`l+!k}J}oONC&OLkTG!uK)>OD-KP2z-pUN-JN{JlJ
z&dYS#9d@_px=6YIJ}BeHI9~&QDzG8fArCHplG&<pnmSEV06QrLY|bB(SwR<g9Jsg|
zr%Xv=b&Qx%G8cm<3+}QQ-Tl$?-k*o<Lp*tZw|w31C|X|5egCl{x6@%SDgV){uZnL@
z!-t>7+!Wasm@y<PG>mUfVxgut6Dk{hL)I7@^=g^H#I3100Ydm90aCPnpk65iMA~?E
zVNRO19DOXape(nb)ms(G?}+Riy^;G)ubVv_4doUfnOw$9eu-}reyfyKeygPQkVO6o
z0YQ*H{Z`1YWoa~s{>eQLY~0e5(z8u$l>`6Ai4`@6`X0P9kNS5e(4KFZ!=x!o`Uq12
zR|qmQ0^zm5M`R*#)Tnc3eLJ-j)*Ru(@E;?P&P<K%OcxK{;kf<4d`jglw^XJe3L1M|
z%L0P#?!kU3ww~BFwXVo7GHvHGrX>Al#@zkwZ%uHVaWc(sC2dJP5H3GOZ(`-3b%%^O
zEk-px8jZz(y&wJP>>I!N4c7na_$~Pa<4;c83>A_zAu5gUOG2Ibc7?jc`IGK*e1sq-
zs=_x$|0w4Uo0Z4;688*AWweca3h{}2@iRPR^82_aCVtNXN=aYe5Z^aQhhgIPDX*u=
zhOFObW@HGWl2JI{H%@3LPB1Tz`Z?bZ!>3fd4>?KrS@w1$A0^ka!^Z8=A4dFyc1$mI
zNPpZf=LcCZK*@7YTq9Nt!Sv*)<!63mQkP=IJk6Mjq6^c#tJF{dp!cyxa83<phu}B#
zj#D!vd&scW2^e$9x&(|-r7i)ZRw>)WdvGoXj9xW{B$zh`1rqx{fc46~P-KZAbRc^N
zOfzLsR~y0?Tcv30?1i0yO$!T~0-c5SXu=QMmX~`vI<%4QP^f!3?D4<<+H2qM_x$BA
z##KzSM>IV$xv+U*Qv4H%#Uj9W8}NM}_;V%3({B5Fs}0JEUoOS=IIh*|Fj1=#4on7~
z6rHlxFRk`c(*NiM#-#sIYTEU9sTVJ8!}?EoQ~zTrFes8S`Zb9kIv>Z&!&}F&Vc*tp
zdDMD2d)|4oSM#6ptcIyQeSLeT8lHR3xI!pW`{?%h@cef1PwZ`=NjDb4OG36&31Lpq
z5q(JT6v%^=RXin0<w#m2CQj&d=Wv;2L6>VLOf=EBgKk9p2lwHhVmq;fm!`qokY54g
z3-6EO{lj>_$96dt>BM}5Bn>_(dp(J#nI9xwKr%}(1&@}}l%FOW*z?LGKC&7l%Ut!<
zeS^hE|1q_$F3p~j*e-b6+CWuqQiouUh&V+Rw)RbosepOJS*!GdBs)DR`fch3{OdFk
z#fKutPV2b<RN)Y*f$MO=P!#dbcx;wf!0|;W{I){B1q;{Skx~-rUAH-UsCPCReYM=T
zF8a^+Z?Ez`jf5ph2e7riBj{i&gENV;CFv9YE5gRm(pYQ)iD&#*y%_yE{yTe}K@Hkh
zjc<YeX)naLG}?}Fe+$`V%#b5VuTCNor7oH)S&1H#1^Q`I_$_vJf*}aHptVP4Eb}g@
z#1;zr;pe0)G-Cq{6?%q~Jn_nCx6GYO{<7}8Xt<wM3(;_INplS=j?#;(n?0c=x1KYX
zC3{Sx>Ij<zYWqa}k+?$rQK7Fax4oxvSglig6>ySEJtb|Gt&k)Z{<{m8-FULp0!ETj
z!UC3ySpVVKtHi{a%UCXDxt8sR@Qv-Z`)S9??jOdyB{^%Aq%x<enX_Wusm9FTR2stH
zT<y{)m;&FR%(>-;1I(9Y%2m1Az=Z3b@p#Fm+LJhd+-~Mg=N632?h`!0I*n_RW_c@F
zgfW9}Hp%1|I<*(Q9(ZHjG<@GhN-LLnPNsh>iTRrTF*9eB9kIY4q|_$MumO;VgZnW^
z4owFUQ=+gO;pjo^OIALce&1ss`q7Q^+qSHG@%fgHj+Sen;5@u}?fj-lO?_j1^&{jL
zI%*|e*GZ3s&>NtQ+LU*O4ku&AlZeo|4vj1)D&48dX3vD?N#0BXH|%(Nb!o>7ukIi{
zQ|=Iy3nSbv_Qx<B^ov^$e&|Pz`W=DMV1*|<)7(AS-`hPnly&K@zeIky?CFd&G|z-R
zlYO1O&hE~()=&=^9dtJIb7qjd5OKKc=vOIK#X31y3{=^9HuqCX(zucoTdR#Ej3%>W
zh9VAGs$zBu<m?n+b_&GoNMn}j7n8k(`kg#CXq@X?jDDEY^W&#EJy&WUi9#)Yc=O!+
zlA0mONm26y#zA|EW7|zc%WhRNq-xguyu|?i=ij>+wUScecan}G@M%4VZ_J0b1jz&A
zUhECUE>{K}C2@R{j%c?ao+R)|yM_LLnjY{R3K*$}8i0xkyanxKY&{q~C+TQI=O!KS
zJNn~J!EaS#+r(9y=$}mT2b;FEvF8P2)pBoX8=~-BmNM^;Urnu?Bp~<Bu{x)i5Q-!q
zA=!Pmot~cUin#kq_ssWf8mOuo*wnLrxp*vRq;q!qv=&I4SZZmh>se#$dodOkd6o#?
z5%=s#hXxP$bU(XO)WoAt+{ZK{j{l_0TV)xUoZFlb#i-TNhr~4lAaM0#hNNWW2xSH-
ztB&LjIP6XV0|81`LJTfpg}<@;a_2ju(aSO}+YwseKI;pik+o|_aAX}l0@L&Pi!ZC4
z*gG<^ccON3?b6KBTJeuD)+b>LoO7&ZuOc-xQ|V6{yg4*AR&($iD^M#a?>{+K*PD;^
zWsG%KG`i<a#`<Dx>fD3Xp`+N4<4Yfpmpg<pb-6}-6axa@_`JRag{q;M4k^kaBmCgS
zgC*H|F`;Jo!7JWDGG^G3z91D)fH~NY9xGiw;SSQe6u%DD^;RQtFcE>IiC!JfZz}KB
zX0IVni>xgxM~q;8&FtdYH=ekvu~N(UQcZnzeYK?98jSBDjL!v`ewd<NR+r13=;iV8
zC22(}0nyY0)#M5?EeD&V|5b)d=p5&CmMgQt<jP57@|gp=EU&z1e3HX?_mM5ylo-p$
z%Ng#NUo*3Wp*&#@1h!a09v#*r^XO3XFZ6&N<kv?36dIS=@o_1FGra;<J%B4qw)T`_
zp1Dz^1d}S=@r)=X`hC@E_dOVz%i3pS_nl(flh{u+e@AzB$0;O8J$>=sy%*1fyF0tX
zu|HrA@a+jXf8d4qnK^&pU~eAtG`~1G=4oVUxqQpo6|v`$-iGEfLeIEB|7Scm2V($E
z*wIMVnVvItXuiS337wS81Cp^rh;w-4%*dh45PFlyVYP@JXH2&QwYzuEo&DXM_U9E_
zL(R;{w~u}A><y=HzWKBs`0$;NhpA=ZTMJh%(C@{!(v653+Z=o?Gq9xwp~vS>>2c<_
zCV4WgDS32m%K>n6G1<79SE*23WkNeGZ6=aQ)twDA*^8IyQtZRqEgX%Eg*tt;B8RVV
z;Q5PwI4~DW*XFdpF0W77xE;;*<#4njEi?9~*em87$MZDt5sh$S{UgTLt=Zl*{%MX%
z`I$_BvTIF1QvA~z?i8AnH6VKK_~$4q=sILxnz)eZn}EbGm=^W|??LxBlUx129xSDO
z^k%_Q;pb(rv~l<%S9Nh=b<XzTPH%g`CGS~y&*6eLZ|CsNoT|cNpX-9*k;-QG6#!pZ
z)KEDx^Gr=eYD#LQ=cyTQ{i|A6?5S7ly)#dFDgmshd1j`n@%7l_+TiPra4=$DNX*Yo
zm>-{vmnQa_Qj*QYzA~mvK$5qyh6Y)U#Y}#SO-y9GREil!W>E3~&SS?}MjV;cTnOI<
z%LQfRw1WNsMw|n6cDlmxA5zq1NTV2Dd-%j%OjQ47eob*h<tMh>3#8n8-pzU5f)Zc;
zT{|DZj}I(=S}XT@Qd6?JG<WPN;s?iXD*<tOs$##^28kUUj8AE{TIf6Z@V~an_-SHY
zmWrR6=rHBF%+O4ZpOSaT_$kL~#!t;YTW=jd6=l>~>EgTU2ECg`W*4UB5AK;+Gd3|i
zUoslFVCij#Cx=9Eab!7bthc=_G&qtS9-SE&$O-i{`y0dkdpAx+vr`;J_5F3NYr~ad
zjO5G6w}nuA^O&MJMy1S{04wMDPs9{yjWDLD`Ia}N!3o>AmZ#Vc*P?0C%=K4l-$H`$
zKVN@k40)+aX6$2+Zv6}R)>QkmOx?r0@S88fH&@zDFb6-e_g#{-OCsb1=MCc;rl!r5
zDrnhKtTV&=dH@7xc)_@MG~t50LfivuS@ua`Y)cX|OI+yYmbwsIQc^*Gt3|)OaLska
z&ED4GEAor;i)#wsH#k(%TzuO#Y!v;}nSgiZIZt6~N=k|E2Q%e?H)4+~TyXy0DyC>o
zmokk^fayC-QsJlw+LS<&F-1}>+Z>oN#nlUNdEx3uw|yb6!i|sr@}BQrEj}De?3ZQ5
z&XkmLZ|oObUYtW%wfZ`Icabgnrg25{Gm}hYbIPb?3ULj*!wV_&NH$er7zpxM#S}B9
ziff88w7VBpY}qCLVs|H6R22>HzTv=QXCwOI_g-}Cg=59;LZxFN7asYivOhLy?cDk4
z$nL@Y2|3_uK9B?cmN6}JT#7bL4Kq2WB^4bGhN{kgEX4i^NaaUE-BD{Ko@1`Q2Yc2a
zhU6392Tcy^hdJoT{l@pvcQlOebJ;f2@J+1wQg1iEPiYz^z*LDP-kHa4S9&lt2|8_|
z$D?|vSahYxu{UWqoL?P_ZM~&4rTNOG*E5Se4Hexp8}-WA*DrsMHgNXNa$f<0%#3$+
zAP>FF$V0asr5n}ALuZFr=ArW}^3bzj0gK%qY?yVCWgavxc8Uuc$V?-bXSNe%{Dw98
zJXZov)t4JeNK;xSfA`?`@*QuL^4;w+bG|ie&i55nlZWQ&8|Ds8dKNs9!*dM{bB80I
z1>M^=*Mok+b8R0J7d>-r-ofUz2ZshPSlhg1OY_<b28Ryf>bUmBijHx#q8aa~h+o9!
zC2pPsZhi-zha7#|+g9U-vA{TPDv291HZvqeK8cpof*WzmQVrsjn}SPL$IV^YM4f4V
z-2x+C{KS-qX7N)KX7$Yz;NJop6Nly-8s`s902{b$l$W|UIM1FvbHR_vi}|3}-?aY7
z)YOsnO<T6aua0Xkdb;O>L)fAdxKkG~IQmHUC7@$#4*W87>4!kqqUY7>xKxq`og~N1
zFi>1)1_r1TXQEsc?c_sPf8gD2pMLS#*A}#m3%l`lbTOqO%yrd=@2SW83vJuU&l3B*
zD=C?@j7)$k_!pLCHr$!A$S50%5jA*5YjDQwp|VDXOhvS&2u_`De3nmpE~Px$_P)y(
z78g6BWeW>hL1xzFS3U8>whdXC+VWXc<0-jm-yv{xj+jl7+)R=cNuw~`>xS@CF&m;v
z9Lo!uo&SF$W*`d)!`HBX?FIJ7@GZIA7hrXK;&0EF5(p*&&pm;Lk;941wN9j(O#6{H
z{#AXVIiG4yby~stBlt%8*<nlm4L`g2Ev7AL_}L96!~UVtzLp+$dVQ3A4TB4tO3}4$
zwXeVX&sxThg?as~)=KmG$7rJ(dwG?84c-YkWzWI4O271bD5wp;G;6ZBx_LJJ(n<5J
z9M$G9OgFS*C#DpZm2qVLkSBtv=opEq;v|iOir@0WDn~)O*a0J9Fp@m*T*_Vc4&`{(
zb2Nr8T8_r>^(KwtfAEdV3#%~wP!gi0O)v<Xz)K%4lgVkq7+<3%-bA4pk)o4}b8o|W
zwGWrnL1E;@9Z(U`nT0h3X6j_zgUdX`>PNJ|-klSh+~d`kZ~e$8KJk&|E2_ubTc(23
z?PakaYggx9^zPAc!*uk46DJ;7oN4Txs2ScI&cS<uQ^ZMGk4xV<{I{OCpO2Cw$){<K
zLWvO*@Hc##PO%HK;lDLTCwsEfe_JNTDg3w4Yrs{FoDY?8ul#-bfe(Hx?bd~bW2rYE
z{m?D9d}!;zgV@abVAel;8an_z6#MQS|IY(o`qBflmtB11;>*N893v_m(X)i&&QD*a
zJMN?AM%n(jPen!5%^{gNgNoR#nz3wp#p&}yYRa9=SuVk)OYVh+17Z<SesW_v>C3bu
zIhy;~hp39K_GLB<ET!e-7G$+eG`sgLYefsUzSCV-Ii%hD^-wq*n)!#kqPz@yidNY^
zUcc*nSVhe*HB@Rx-slYCKaMkuf66dUX0RTnESKF`WD;3Le4I%}yGfC1oMw+P)(B*(
zwjmW59rt)7voeYRn4%(?mGEi$*up^#&TesPelf4I*s*EL`P(t5Paa#=ZV)5-eN`na
zfbE;NAK+kO&&9_ASuSgRP-}&k(ayVtg+OsQ^F<~6QwolnFy!6yemc@{|G&xmC7kz5
z_@@*c&$qXWJgYy6=Q7T9jC<?q?-GB1>(e+vCJDHH19bOM>c)xrUW(J0L5u|59mJ(8
zm69<T5s87afY{sFX;x%h_pE4IB=To8)_SDd=IH!PthG&gM}nsh=x42mbmGa-ES-I*
zixpf$ghJpnXAQ{G^fIeJu6g!4j;j*?{1e`pO&fpp9z03WGSkUTC!y>oL{5+D$~dQ&
zX`EE}W%>>U42T}lR+dn>F><$W|I7@&<nFuwFLQ4KSXFWTkKdWedoLT=_mJde4-k^~
zl9!DoWQPEO$SMdzAOQj)!7QM-l)Ch*))rf<wbm+HmsV}{`&Fxzwyw3cZdjLMtChMG
zYq3>JsT+C!&zYI~?tSkC)PDQ_{eFRW@7%ff&OPVMnKNh3oH^6|=f*=F*EIfF(-^T0
z$mcKD7$jjB?7tJXT;2|g)M%|Z4r+FRY^A1^E)9bkrQxQ5dn2VqJ{i4sB*4am9;6JJ
zSEO*Ep&`JOatE;;5XYMpu82#lo&|3g08PFxOO|)F`OZ&lp1H2ACeM8n$oX7$;qt!W
z&Fdu($+aGGe`Z?i;S|?sUQ=s8h&NTf$(t&lcvIy|-bCF{{u`K6E2jR$fFlAq(3$;-
z?#wKn(+ncVi!{Yxu4FNnsii}*D~nk=NI<ijG?S_0?x}qa)X0TuNCpX@Jw{n(!^)X?
zc{5iwbf1p7z~<_b`l6&mhmwlwOZukG$n1>`nhs2#(ohiDI;o&xO8RO{6{4MDB#d<~
zz?q*bY4L3|Bx=7ZA2{p$>nI;Mm%)eYD0ra3c$EgqYK&*%tV4HLI2VRG^iQRXsWuOP
z`?Qnfk}#{3r5%z+G1;7?!LY}9fTn@WNHs)L6^AVi&nce}3J5|zAqeCKelN!JQ<0-q
zn0W(Fk(WrVe2PkIuzQKXmae3KjXA;fnJZ@a?a}r%FrT$zW<}@Zsk9De>g1EImLcDf
zEY#J*pnV#sfZdIf0{sTfk68VN?%}OkunaD`-}sD<L<Lkvk>EpePoR!uvL4ouF9-1^
zxm>HwAR{pxjly%2rGznKm&tCX68iwVQn9)yup|a1;QZ9|i(-pXE@FJi`BO8ut&+=O
zPG$FP8sEO<DOwZr)3&ysMmW7sy@5YgdWF+@1^7{|hao=wlH$|-iXSKYN98)13i8X3
zgSppZYlEL-olGK_SXr&fP8KIIv#*m$G~y&)WO$%8<)rIPmmHE_fsl%NZl1Of2wPu5
z;{mlE5vRgO=Pb%P$>N!{-JQ`+U-`+_&$KR&JYTlKEXd)Xf)5I4WRnbI5os`H8$6NE
zN?;8Q1-44nntx^hX9{seYs1O=m%JztT?V}Z{N93btV8I?n*4Z{s=abvUvPTf?3B5l
zIW2SBmhA7ipRHu~Rdv&tzx&s9HI-AQbu{GFx3s?LaCFT5V?<8Pf(p;#2Dj?3jhit?
z56@kiIzX3b!$FHmYi8autw}R1ykfB8;rL|m1@-&?lJe`ziZAqf6`3#f1eJe{&X?<5
zr0iGgSgxUUEP-+!27jsNue6mjF3Y({mj4~<D+qqb!A#UaA^93Rpj%R~7qbp@*Kf5z
z-QcW@lS(;SgGe18#a}kp_mOv-TH};W(}D6X$t~q~Op}C#!E%dyD<)V9!w$r%^)3^w
zg;~)_3tlE#2?J+WsbgV}-w5<~kUqH~{au*;qt#anXB}b3GMHL=JI!MmI$lm8a8~Y7
z5zxw%VG=qDFr?N=Vy{qIv6Ycad6rNhY}(L?&iS+n0+1)~u@lYFkyuX!7h!Gp>eSNg
z%EtNesfp>66Xw!tpyU;$v&y0O9o)I|y5iK1Jz2?)2$7O^Sw~j!568ydR`pM|*fz8N
z-68d_Z6FrvVYJX4qeTmQ)GKoZ!UO2fxDG)_tDu$MXi*{s_mv+%^>fM*L%I1)Q1R03
zIkgb}ekWN31^2%bu7YADHP|@XY$?s%6hTFpV&nNR*IccfT8-FEeZPIv=Tgcjr8!6H
zK_c|}gDCQqYeGghejG89$UaKSveOU{O9I_ZF-%X&1Em;bQGueU>!v7R55T-wtQ9FY
z@>B>oA`3ADX^sJ=2wx!9)YN^|RhxU$O285mED@X5c=p+i{_Bd;CR!whwa?%QKX`)H
zARua1qNb2qoLd?g*XhBB#T{XjT9&0A)^6aSmI9ZcM5V?fq!f*kN-(@Dk?w@b(~73A
z)JUCT8`C-j8qCTGm4N3bt&rC9DgjTBRK04eQ@I-c$XvR`Tcp#WUcn{34y{F80S{3n
z3%h`KJo)uA0A*j>7^aPcDaJt#B4qluYkUILPF({k9#u^P12XNZC1@(8e3$dpI-TlN
zTE&EF<`HYLfQc3|t>`>_m=-cA|6BA6u*H)P;$-7$(iqIKH+g<qI#if63ma;kREJ7H
z`O3CNt8Yn~(d=ZLZmrp>`m#Z(Y*~Fk5opn9NCnh4#h3QhC0S)v*7EKTv`^><-8@0o
z5TPfl=kVb`wP<<$DsV-79co~~`?r2JhG7FZYeY-7dei%jJbAUe1_HE7SIb`+)j-MF
z4=A<)zy+LGKXv#pm=}F6#!s9{TL2^r*#c<UB54FNpIl{2jhW;FZ(u9v*^&uTAPYzp
zv(`<8v6Ds&QpMC>r$I!h+L(q>gZC906F5QeX@EChrfBR?FCn)^TsF63xzGt=FUhip
zfD)y0?3pfgzdB{`OJy0p6|)NpX0P!1mNynqEXn32QKd;)r5T7al$4vWB=`!EC1XqG
zZfu<0JGZ1{Ztv{IjdM%pb}xyJiklQ06B82`wWRwmW|~v1$zZxnhKPgiXO20sN4=&?
zK|soU4!Y!kE^4wO2X%;zR6rA=M8SzEfmzwKQf=g%5a;pVFImD$D01e6_(d=2en;b@
z<c3<0w3^0}!Rt`M_|uxP01E^!X*3y-1fT<I5b=m|KLsnoG*8_<+3~Qh5Y`o1SqNcp
z8Ledi2?>sRk%V^QrkIVBz!G-5aG2_57tZ#XI;$^ttBy`;++=N`E(x)HB?D&!q!?**
z<a!up-XKr`w9UZ5yI|n(Hq_1QezTih=*VcTTf8*L!a=A2slS+34zf**(t1eXg!uBN
zr?sh{YVFhNfvh$|8%de*0*HtifKW9#wTzB>aI#rp^b-^WR)xy1t|FTRMmry@-IO<T
zMQxY#Pxchm7A1Ag?U^<st$RjiRLtHp8hblRq<=CQBu;Hxxw_OdC-MTSixj|3>o#L(
z<{)(cn-l3(lJulCQAepprlch)u}UedcqOT1_7PwQxt<fuAXjv1TN}R3$<`KcY$6+C
za6cB-0faR$tJ_k>HzgEZXqnVusje$*!Hot<&rkM_uegO>d&_ZjS_&|=-UhN#tuMv+
z1ZFpql~+ECQy`ygRx1D7_Iwc?$iLd2&&ighp1+RrL3i5shvJ>Yke!j1rx3fE{Gu_l
z_$5q*(T&quifZSm2rZn{#uui0L2BVMKkHsw<ET9y8(x5U{nmCDHh2<^5t0qTz7C&V
z7uJAL3k%(9C4g4IXo0STDu~WhHPp4l)3_JvA{^C}9|S3lh0mOGP5|0-&gpK1+%h3<
zycF=Jf_Gv-zeJKDJOthok;@|JXXrqPtB2~KP8|I!Ql_PX7%Nea`>^sIkzNsv1i=E*
z0W*7K##h8QRy}y%=@*ELSN-IY6`jBN4U1sLLl1rY7>0A;ohnrPFXh<zYROaIKA?D^
z3b<qgmvrUX8XWsIjP1h&q}2{czlxTiL%SiRCmtDj_~|u`adJ%~HB+(yIJK#TkWyP9
zP%2%cS7Vzy*DD<f$=|NEEp}YdX<O|``ku8uGt;=7#_7R(RD=!7w580d7kiKxisVgE
zaKR$vUbYz6z<Gs`iU(5hQj;U~hvaR%*3^mhDaNG}L)mzo6ZAPrdSysaiLkcPAs`*&
z6Ebs?OTd^TetOod<tw|_%$icw-Tl|3T<4k<w2X6w>+;J*eioK;qW+-EVm%Yt#I9HM
z*GTopq0$=6FXsv;8<&uU$kcIZ-(xG<rfx;nJeqDa7WQ@>H@MM|>6IEw6h>oEuIvHp
z|4vm7mpWy4rCv@ewYDKx*fO-?<;%PG?Xxc*g8X~rk&ZFjQYXo?MX<TwDd&SS@mZ-u
z$T^7^@`)mUBD>rQ>o39vBNnfk!)tOkpp{_6dum;CwVdZ9SB=!dk8j4R=9~4Z=Hs7Y
ziU#$t5Fh?Ae-nOM@pSD+ctRFS^&)*yUE<q*sBd_V`Rny_2@>{HIiEr?kM@zw4YuRy
zSx#&C9JbUoOd%>Dy`#X8dI$A{%@hhD3;kFYI_)gPv{fb(G9ysSG-pHOppr~7V$pHZ
z7$^z2)1E@9s9Ef|DNRkJqR>iyY&b${lr@x=Ito_w(<DsWvN5^Io*YA~Em&$BYR+d5
z>Rng(`o@lq#=B@Qmhp|XO`r$a6W%7eG1R5vXLSwW=vvLYAf^K&dT}EY;{w_Ttq?H?
zHd1XXYwrYe!xjr${gAm5Ybp>|u2WNic)HYj9YA_2kfumaG!a|`5~<mjQcU1e^OWjX
zF3*8QTh6`6Fw8<m4<&V&eYtwstOC(eoH=)9%<di^!i0{0Ew!|v$lICHkh!%p9~&UC
zoCUE(Eo<tFvbXQpdQM5}n!1vV{D!F+71O5FG_#i}=#VR>eJSvgxQ<F(OR&NgqiO_P
zH>#!VA%mD@O9&IbCBy?IWK*G~1f&X=-~|r6N`RNztc#)~DVsO#L80`1>IJ9cNpiNM
zHmj@$jzUa>pOgeH8x3yhEbpk!;S&=fZTYNXO@+(OcTQ<qQ9S`2DjFl%?`(vieXm~N
z7opC}G1at}w6dATEJ+6^fSn!~?S#!f>Xt4wLk6L1&ReLChTH(oA(KLe8g?s-H?e;q
zHqG#$u}~PJ2jGz)<b;9}2ee}r*%-;uPVz@#L8*>`L1CfOU21|7f%IpvIyJ*C1)U4K
zZWO1ar3WT4Q~5>S4f9f}(l5C(r@p&7J;@oHK70O_zR1|f(uy_9m#>*Q%U$CgKQw(x
zRekN$skP<Povte`nQ?k+v1k!X+ZQhH;l<nMZQZ<i>%!fIlMdD_&rM%dKdWKJj0W%y
zbU7T3qyLU0|6J;y?0chx>2hHmy1mILlOqiZRS<Ti70qEPP@MSHz1@hj<DDH{T+%#$
zFOTpe)XwAXEFB|7#W$t6q4|KzDV~H=7PV`Y|BXQYZ)y0Ce0U0o1?2C_u9MgBBVsSp
z{-hLJ9Pd9Z?E`xKk?4jlbmF;wt5?&?m*fQMvO?ziVJ}LR?zxp+aw*bPhv1wmeca?4
zr<2X~Ti>uOBh)RLtFp*wNiKlOeCaacXbgg=)M`K~*FJ6N>ZjFDzdv*pz6q&^J#A<R
zirq&}FxPK=(=yLkE{5P!QnQ{#VXxsw>%f&~yA^tx<cEFYpDd%8QO_saXky_R8#mID
ztj8Z;hON+98MZ<n|1oG!^jO220h^oVJ7^O%Jw|rJq9RAZVWEjF_$U$zjm?M>YRaFS
zQ{YdhosZK<oytRo^wy831o`IwT_qd{Q=Mk)!;jFR7~eDpFoA1;i^k1_h&ghO<LH)_
zEprzyJEd|_)-poOk-ez=yfYEob85xv)a7j*<YYMxAMyGBB&W-cS!?IG0VsG8yvJQ~
zZ`@*JIK?yM#uCUUo>uu!2IUh^tNh;zJP*2&kNFbQ=PYy_u7#9Ur&iNb5=+HwCXOP%
zD^lgMw0~AI`YyGjIYmHKF?d{Lp`w8}Q9*9!Aw2|6m7Zq1^4n5ZbdaYRD;fWN@A`SG
zQ(N=Ti6vLF?#?N-%>{E-*1G1W5A1Glm^vStC2*aJ_V@$2KQr-wOFU`(+?Eeqxyt{o
z@iU3*RQQEH2_9)+ktg&GuyCD9Jry>>4s5uf=R~ZGFy8=6ThmNuO``?-27r5Lha|~Q
z51NVB%!JHQt3OCp1*s2^cCNgplnE?fk~<B2u3R#dBLOjRKH5()o>z_pR4LxTQ=~K2
zN;W55zX20bI@}CtO>#l(1a1U0^bbr)Sb;aid1?05VV|{@Y(tl|KI}7Ak{u%b0`phm
zLey0{1_#oYK&`}~&Y!&X&5?f?hw3d%lr$wPoZZ(>3IeOvXqAuCP~l(6!l+#C1ac{O
zp5kys(*#jT|Dy26<Vz5Z=aha%Zhy3_F_~75i5hG?>B?oc<zmX2;9jg5yI(}!&#_eO
zhIMMG7@vLJ@%{T)Hmw(9vGeDT9}QU~cHv=%<1q2KTqh=Z{4Ve?`lx^6gmzmDpLAM3
z<{|rY9O{_X5Smo^T<gaWQ&eK9;%^d`;p@lLAgTh`Q_ti9!+c(^0<0$^uYzOk{e>r8
zP_}(TSG2Ra`s6FhmT!x>OyW#y=19iFpDELl@v>UOT#PMQWv-c<$ge>86A<>~PY||R
zPWcnSNksY+U?31!Ah)`6^RX@OvYTG?tZFU0KrM=Eos-?v)cK^-Ilu4Dh;(mP?e?8i
zhqF*&SXhJc7d%L{jNT;cRINRG5?+^9KIs!G|CyltZGrqJZ21FH|F~Q7#?z#y$i8qZ
z{|4xkXWUPwU3XB-eys{vQY_3})e>4-idkZf6kKcWUrI6Tb55&UU&9?O&g=;##gK!p
z5mPcCGYwy85|Em<-BDn&yc-EN%L|fA6H6c7mZny(g|2Gb&?Q%|g)M43M09~*xfFCM
zHl8}6e}F|7J$$t?KDU1W$nl_2sK~L`OuS|$<Sj)PJY#7<7zB{+L$Y2?p({ngoM2Z$
zM2UihL?b*!XXQ+g_?gZG<RRbCRCj*bbgTdzi^mE;ck<b@8?(z(_trHv$fb1GT=TcG
zy!kIprd5EM`7h1SEB@%3YvejWTC4B}$xjcEA8#-}X&Z(`rZ5K6(#R6YcISWPOF*dR
zK<cYeUyfQGnPYO6PCST5G>ajjC`bvr5)1nZiXx9?<#<5*JKGmQOwf@@$AiQ|S`Bfc
z6_QvMG2s$P@D#jsu+JF9;<_u`=OE02rTZR>Sf!+7NEZX$*4&gKoe+pmO`ikhMnI^M
zE0XH+1yLy;8AJg!u^_+^#6Kjg$ws7n4(PQ|p98rVz-A~3&?Us@AhGb`?c0}Kd#y<s
z%=yJdr4^)Ft4F6cb$2)2EEkZ%<=iE}JO$<wQq(AnZ{iuyhkOps`%Iq$i!h(V=Ya4c
zgR_d15d}rxaxkEwO^K8!%GE&m&8xMW=1Q1}Tn!TSV$RF;a*`wFicY~~01CaZQ!U=G
z7I)g>QE2)5Yv3Gj+;l>J0}E3<zO^zw!`AN58n&$ey;T27{_4boW{ym#R-$->h9=5T
zK&^yQ;1DTmY5gbEJPiD#Yr@(6<JV)IR}a>qu~}+81oO$YXmah0cni3Ze*$`!&+t#M
zkP2%GcH6CefCe!^4cIi<CJ>iDhz#BGkszF2GjsL^B?8h^`6>{H&?X<s^^=^{NS%Yi
zrg7Cvi3t6G|3V_xm35h`iN^0<#(znRCJ=dK{3+&B^-e^wYFzd!VmD|q$+$M$k0A_k
zt(RD&u@6KgC9KhUupa~P-iuyTQ$i<R3(8UTjavaqm?LYAH4X38dS9R^qni+p5;+7p
zA<RH}=qPgSvD{Oo5*g4tu_y#h*<6#1E_|BNs(c^XjCQF=nsfY(0qs1Dwe31t3aa7(
zm`Kez{z^398u&iYA{WFZMFTFBDKhRf%4!SueV|24!Ojo4T*%>d!26+sOS|yI`<^9w
zGK*^qCs(`E%hGb|7Tyq7m1V!4PJ5$Gyc^o&xWt6SxP*k{Oy9CuZq^o?tS%Gjl6FZ8
zq807oE&U<PJ-kg?m3<LfVX&wDA;{ZKjZBC-WhbGIGzZ%@<er!g<GqAEyB5cj;GC&&
zoonGJ?NEAc?1_COELIPj60nS4rX?uUM?$t&(?>!Y!ajjfO085!*c)0<sdU~o;vuxb
z0%Hp`#NfFKEo&?|PU<63045}3P`FzJF{W~hAgFAsKBQ?!wyPlH4u2lTovuaG=4CA#
ze|Q-??8u&1wtG0tx&su@0w1<nc*riZm1C_vba?EqVua{iVWVEFU8zy4WtSlvj8X__
zi90C<q+UBr>u-9%CKIs7VARGcM)!Q{qEn?wrg{2YZ&vSVtuV*rY?;>;9edCBZ5Ej=
z(jL=tO4QfT@1+4|!~=jpf^P(ETw<T=3R4U17I5mW)y{L|Oi8wI6=sN1nBoDkndv2i
zVK$ow4nVLt)IAK7ShPByWRv{9n2Ybn)6Om@@Q<)~z#7$<?hr&Nnr9$0iRvtAjW5M#
zqG8DiTqDd*^W)?1y}&+wL9N~fNXN07mikP{QrI&196{r^UjR<0c!K7=0{O7j>HH^y
z^6v@cKNXZub}d!TZxO7L%7LdF#p=TNQrXw_HRyl{o}WnvJ>0VhV>ghHx~YN{lY3*Z
zmPy(s5r>$H!pPGSEsCClz#Y;h;rPurzqfwB`04t8+;r2j7n;~D<9D)C##cAJKy{S?
zUilL0O8QSkL!Gei53Hqv1ya~p>@#$viTn|$c1h()lq!#q`_3w8X)9V@HUB<--}*QI
z*moztd;OuGK=mme{{!2|R*t{J(#G!?fAf&)7eVVXId*>(<UqgZzzO(Jd!?~uhKd50
zDOYlu_L#7KFf9C(#f-$hrcXjVXzrAfh~sPpjiwQeLMB7$Z#LfpbKO4SG`l}&={|4@
zUb|1>1qgP+Ny3gjG9qAEq3Nd+!X9R5v4(RBb`=v%`XC$vGNg(qBv=3mb4L(|b~muQ
z9k4<&9AWPt6^4M^4g!G)JY7vYwk&IDX<Fi;Km<vS%f1$Q*3QQtKV@m;&9_D*Q#b;&
z2aNMYoUEf?0Y9<}UxG6N=HPG^@Fd+8bC!`%HFBlqLd`oY#;3)7ma0nDKltX#m!h#S
zB#N%(6%9WuM{t^lBOIxBR{gZ{GmxE`ZP=w1P)qrw(bnUShpZLPn1AZ2^LK`<%LkrQ
zVY^S1@mMH$k?M;nK1__U;)K2i7FJ=Mh{c2Eh?<&<@-=`>LUEeXoZ)G}e7~bm6~8k>
zRdie>+efIa3%oVa9)EJZ)GbnG!HN&q(=dN?5U{%`{z$52+Y8L!gqf-AYBSB>P>(_F
z4@-+>jbzZsp$QqpfJ&T`?I~Wion#ntDadZv`c3M|rO%r+O+(HD$CqVft63WKJAYKO
zG^>_XtWKFb=R7$_b31iI&ruhC-kAf04|wf$*{0xc<qBz2VKx)134x2qYHi72vI?2q
zp+lOVxsEy*tq@e+EXt(j1V54>g|Z)vM4?{ypICTQAz+K>5rF&`zfh=1UIP4>>jaT@
zP^%7(ITAL6u|kY!_$@_`dLYAGoTnfrb0F&GA>5(5p&B6%0wv+(IK|YWEU?!u3le3}
zm)^C)kc@v{$!4^NOQ}6D>Z&LP;!*w~bf{uDC&0tJ#HcoWk~PTX!16@aZYfsF(5xm$
zq6Rcdnw|z;XyL>_T2Da{w4WKxeNC4vMfz0%uE^{FeZ}U7fmr?(-11ToWPo6%Yeog<
zAC5=48@ejmwq|w2`#P3;+Xfa*6U$37=Pq_mU$~{|((jGGT)v>e&Gxw)7P7gybt`AN
z=g%oXWa;dRQ_t-#%HFwSKBC*)dk@RaZ(LF1aMY}5%vbntmG~E7dH^vQu-%&W(V*C?
z#etDWKAD{IZ4+JgW&1QGs8<*Qe;QUR{3(Tvbs^`-D<M%*!gTXCDKZ(k`FO54j3VTM
z3km=EXp(*A@~&N%IzE#i?dxMMyKK^(SDt_%9DVc)Vix$J3VZv)SECxzp;=aKHBfK`
z=n-b5vj!>XbkSqc5JgSE(f%^Dk{7-j5#*~u1~;W~(*)ZT_-fSPNm_<PBi#tSTM6lx
zUdc04keX%sYLwWWHPURFIc>Ne>aW34Z0;IjR$a@s@|>o^dw*Wkv8643a!h1wX3W%f
zPj<<?EiIF?>pORDAKJOJ%d?<v{G5y0mUcBaca=|0kBWY1|KdHTdN^7-&#hZ9{hYeh
z&4r@)+QGe-T(WoY25h2Rd`)-GIj5Z3y>w|eniS+3>9SvgT#&vSSg|pY?}pWq!W18C
zpknqh)J4*81shI_>THJp+IQpAw^xsJIXc%wm6ojQ`3)NUzVVNlla)-)op=1}vVE7c
zR<?*gg#IqmXr&%cc~6q6ZfY-Koty?Bjr@;drBfM=F_Mvj;4x>aF?SUlF68G6Iyx56
zZ(3pDH2hfW#?#hpq+j(6Z?kuXJV^SuStn};ePYP>BXl3`6X~@Q8f>D3)<m9A<d7Lb
z^NO_Lk*l<hta5eRovVvBt=+&nt61!+;?3g^!#fuBQGoB&fd<($PE3YkLsOF`_9s#^
z<@d7iJ+dcb&R#ZxWYB?Nps6*bfRYrefn`{SHbBrADY{ae@vNHFjlXw(PJX_-urRXL
znVMgb+t^YwwdZNp+0c*P%$b!}kdcz)&WxY!DQ|W!kg#T;zA6FhROPoDyq89pe}<0P
z3Rq3KL-e7YehMU%WoUck<Z-`IMm{B#FoVp&Pww=6ITCER*@eI}WyT@=-osA}Q@20}
zf{BeXyb2PV+y2->;^;Nefyg)%^&88lzgtpVn441;H!X2?RYPZmyP&G8rLHl#GOnz!
zq_k@~FF<IL%<PQRg3O|-=|xjr!dYJComrMukT%(!<E)eMCDA8o{)k2kf<=g&`BnF#
z!bzDmcOt7Hs6lKMVT+8UTqDWsPt!-FuBoDke+p~r)S^OB=&FA1=Qk~{ub&lh{#RJ%
zJl{V*^2}rP4-pR)p<e31vu+wUCqrP_*O!FNCF?*$vR-J$7@NJIUMRvdwIb^7^P~=f
zaXf}ECYK=&z9cvUAj&IKZNp@(P?uqe>Z)1c-7yhyMFqZ&1#LC6lcvX)6qevGD=)?u
z_a?viqO|PUwe=m6tVM2zyC^Bf^$aLd1{_*|LppjJSb(gRM^;p-uz{{!7Gy}+lb|T-
zkj|Chp35;**oWU;_z7q#*zN`hl8ZPk*U|!`k=IpYvu226HL(yZIqq$ppEb2Qb6H_+
zS+*-;(zKH5wyvhaDN_pZW364SWgRms<I|^>d$IYkdv;BIyQiQK`!UG_)lDAwr4o2W
z8nfwu0SCTpa)}-VTk_Vz2tEs_5eOjEO$1c;Y`IG+Tol%P>$|lq;c^r^r){SX^LxS|
zIl2(-G81MqFRf<?-ygXsAW^m2J<&JGFO>)cUmzW{C<`1gP3F0fI}M;KA0bMS8?Pd%
zCS)yb_^MomtjGkVRcL*M1qh^)9%!n#Nc&mG{ON_c#cgxuv=!$TmCx^J$6rZlX$gL;
zb#_J3^r(pFY3^x09}dwGQPYbmX20T#^5Op-x!JMVx$*!^L8D?2qY?NM??Bs4g$hTJ
zQYhGfJ*rvQz*l!JvL%oofntw%Y60?f41rz7^=RRD;`bna#6ybFVsTa*fiha|TG%M+
z%-)~2D{}?m${Mq#fQ1Sq3&l<=@wF~&Zkhiz%|+Z}<DoQnBY3E5q@d7AOoRjQEBAlQ
z7O`EQqo2$OI6K)p>d=0Yb{mo&U7y)cIw$TX!PjmucRM@dr2V7?jWwK5eN=EiiP`V4
ze$whC(MRH2b-@2*eWdj*`!Lv)UMK4#r?4;DN1})HWQFyRWE1-s8y@dEY5!=!Y2Q0f
z>E)lde<Z<H2EkSa!A9L8#$wbzvI+V}y%CR;&8C3+_xi_|KdXC`K3|e2K40HxQNrTY
z&)+vzpQvxN^^CG_M4i-uPi5a28k0{)jItoH_>@AXDs@A-b0kSA=s;KsWj%60G9p?Z
zq$O5h%4Iu{f}hbfrtUa#&&cLX*fT;&MBfM;T7bi6_l*`N7EMi&^#%JzDJ1^=zR~$v
zT_g34sGv&Vb+W#3B8)=&M(oRq;i#=|oYOi+JtNI`lI&cFHkk?kg%k9R)*PPh8z=gv
zsR?1OPV3uc;DCJHH<rm!B=wCdrTWI{xGQ7aK-x~+H`+I(sSEU!VSS_S7faAZIw$TL
zJyxH1hw3G%Uj%&{f&1s{7cH#qGdurwzgYag?H3Q9yjz6*6n&7Ov090sMJ=Vq*=#4y
zE^#`KllCOH|6?(Gg8S?A{Q}(gKyN4!%k=yG^8Iz3srOO-j0xUf&)~#~?`PnCp?n|y
z%<}u|<ooN{9|PZSn&AB&jyP|4pT1u`!S{O@f&)?cxIblr@_X0^@_q{LSIF{L=<oN+
z@At5O1-?(?f>8Qw(C`=G{Q`M^rGCFhzQ2JTQtt!5iRib{M&IQVl;5lIBlt-#D-pr;
z>DBPl_Z5ADzu(J_%J1jlex59Um4>fL!q>~555PzBg`xQM(f1)=&I9~O{7ER?Q%NTd
z#8VWoghk>fEwz@qKyJe1Q7!7^!rXNBizR<+`*L^0;<x6qm-ELzyyX`5@?<LaOk<MB
z;6H-ylSAS^Fi+|<%f*>jA}n?kD~)1xQ7k=*@wdj`7=NRh<;VlesUClW<xC2`MBext
zD6r1>IzP_KF;GdTbsE}6vmbI2@gt3hX&Be1$FuZ0_=1$W@|dfXIlU{ZSPy%5Jh_Ke
zt@J+2%RMWm3TK;BOkLr@3T$RPiH@Wnwljn<qY+TB-6w49ZduImEmtLTrNgXVR~nCq
zWW3*AH2atQ@^~_PSAAK23wB#9JDK=fVHO?BTIuo5VR@{s6mCqe^f@fu^`!k%kA~og
z8V#itGx6FF9o_-^0@13tbPg+Z<=5n=*HyB*bY2kx@z?Dik!9XyoXYR#n-u+RWn#fS
z@+AFJ3rk(;%!Pu}v8;tXyStgqV{1L*-){od`6dv)Y5e;hwsszC-pz^u=Q$|zQnO53
zonotV^eD1S4E9S=A_zb+(D<bxg`gySM3zb)L7BH1eSmXB!8yso9dWF{n^Y!dMqTN3
z43MV7kdS{H6)C|axG+6>X%O5*&vQ`brDmD5&RDMPqF{Iq+?DjKsZOs0lwiP8DDJE;
z2&}%4Pf(fXgZD<jdkM6kQylErq(YfvV6CWF<5A0fc|V$L2*=axj^_DOJS(c$dY0Mt
z;(AsEF6WQSiadUpy=byMeH*+u0$!Z(+hO)RYuYCK+pyv#n(a+}`^C2L!|L1YoATT2
z#p8!<->x$*Ksz4Ax6zK7iT8fUBlrNSI+tw=t7-Ce>tZj46vS?pXujCSGS#P0P*Ax6
zdhQ3mJ0K$@FR3;QrUy^SR(m{zIJ(^N!zTG;xqX0lg@V^st_5#$oot`9{ztXYI$12w
z9G|A}X1<VGQEk*#u8j^hcxAbOHea`VwoVp2K8<Gv6>O0l@IDN_`X7_80_AGC9ySYL
z=PQy9hzLfKR7wYM6}D26@`1e(LU2|V0*aIo4}-7%$K<QfZ-?=frHw1eq`vJ?l8L-F
zgT8H5N^A&u@oDG<b^d>%o*w6=;v8IWhQ@OiZd?;`4|(z)o}qiPepSDcN&J|ut?kBs
zXsscwOhMyP;01RvDN4*gtAyy0pzcQ1)Uy)iKr_I1pOpQ<<Ius;_rN<r?tEjm|FF2|
zR!D?Ef1r3cT`{%2YY6|M?j_toU>>sirb$MnDB<6NO(C1Y-v#{45-ay(=EszqsvlAT
zXb`8V(5Ji*b09~lUz#LQEL}9()it`Pv~BXt)0&!2n>krQGcHNv>p1uHy1LWP?WpTp
zR8g_0ug+(|fIe81nlPBV-GUwjLkwU@Q*u_d3H@onKx=?$g}8!&T_S-nzujg+69k0$
zaT6F52$CUP;Gsd#0leTg>98LY5Fxxk8&VStH98_^p(z8k&XJepDN0K#@?=e&-;kf*
zFn{X!pA@F-uM)tx$<y=lrcaJ*ORwyxsBEuHH#s8&24=xPtutHEK(U}1r8pInu5x*N
zNMHUZ^V=pYEKkAEB|%8XXDd1?)7wl~Oc21E%fOqjp&eJz3{*Vk6lsRp<jpFYS*^0o
ztXloU{YI6v&yuGI%^IqhR!r&zxpFfunlvU3qBW9gO~0ZfX;aV{_+7&t%$wU>Q&_cf
zthN2j)zw**%_T+c3#QClS6j2Ttu%c~eSuFn;275C5M>$lb63xrGq|*}a>;O;XT^fX
z^y>2A<qfAb6&5$Gtgh&oQ9XGYYaM2!YtUY-ha^sO$e}VACokdTwc(_v&oNtW#%1yX
zACH{X#2(4eM&f`E&0!M!6t6W1JyNcquCN~hN?$?!l=RZJwKcWt=1p19UR2UtnN_{|
z%=Xr?l~si`&ADFI0SMWZ!>w%E<mwq671b-7iVK@gYgj&9UY*{!V1=h`cu8gD(!n{i
zR?n@^C<FE+w=U$p*w^<UL<gew3!D5PcLX<yHu9jS2~O#k0Dn@I*dY^`$9M(vOWo*l
z*W<^}Ah#d*G@zc(#e54*`_dHRBpLmY+yRo2Qp<<Q6$4YlX_Xo1C=jYvMQ95O&qg7#
z$FfQiGV&)SX2s{nRTSDUcyChVq?ou#WhwcA1b_lg-{f1^<NO8Sg!O;_7Eb?hG`6MZ
z$0cXPC1l6t$4z(JFZh;tS9G*QBai?N`}n!+e*Q4PpQ#qMQ0O4E9l5e00ok%%Jd{xW
zB0A?TnM2k!L9@2dCibz6@wfTIsBNOnN1)9*{w%7bl*VmVTtTXD8e+?G_fi6jYh9Qf
zLFHhYfh_M7v7MD?WoBmK$G2pr#-wJ-1MDH!@vYeF^*NNAZA_;rUURQk+7mTV&X8c_
z=7NU+xkSccCXQxuQ)wnQsQl`nt7o&))3fl~r_X$=^-(KDcD%d!eD<!02KF+tfS~yx
zPz(gaXB_JLzz{)R6v4=IKbWKM(m2c6<x+GIrFH3Vc$T-<;>YKw-Ijkne)Npt=bh|(
zA_m{8AsQmif~p(2FIM;$RKfVTYCNPD)upp)-||l0nQ>boN<f+WQRXVMOj}H4+e#*s
zP-)h;s%BXxaR8`Tm+so%x!lL!F1!tHUB*}WV)isYj>b5b_{Sx^xxhaWRL}8%St9?e
znYhbLTrLx84uR%M1suL9cq^bzca>toot-{ZJ~mc9#E<XI8ym~pE5EgpJuOJ@J}2l~
zk{$_!-WgIz7!VSuE4tW+1kpv#NC!x!2m}E4;Fe}^{Wd-P5PmZH)DF6h`640Z3I&DG
zm6i@Fe5~PH8G!Fwd>P`>9meDp_J}f|0?@K%>W7FH2~-xzxBwKYbmY)CZ9GELD-^{R
zB9Cf9FXh}z2{e@iurecGraHO2qLD+Hi4&~6tR_F%H9d7wVM%g!a-1u5x(gf4@MRfA
z<*8};X*rRTl4J7IQp<}n@G;PGFJOHFuqGM{30BMZ_lv?BC1E8eQu04WBc=g*E^S9n
zS{5X0d2Lg2N=ISr<XHSK>_|y&;>)HLmgFrF_*;@!QaFv;)&0DQ?Gq&s-1){5f~Y_T
zHBJe%sl^01386|e5g_FOGe?n<VuMA1g3(|qC?UjDruv~Zpx_B&R-Q2}FDWT+T84Sf
z&dbZjk2fXeP0h@lnwMyvy*XKFSvm56ZwkO&3%GxV6j^9@kvD-kb4hGX?x=Le3^+O}
z_$LAUy{ZjRNU#Xl&m(|O1l%Sf5G^bMqA|i4!p}vB-id^*{m?7`p+!3u8~D+T6W%BE
zzzyQ$DAr9`Fst80&pc~1MMc(V@%Z&7j^;TSS7v<7m$Dtg37&!89pIUB01S1&F@VS>
z$1x$#uoPd)^68mbMHw?vGO*Y^i!aSgiz%Fwo?4I|k)9ZxmWh%Ka0%jYTq$F{7tuId
z%Q}?JsBCHF(;l0Mb_IkB;ib@16T6mAqdtfkFZ#XgR#bbov7XkRXdfKVJf7Z9d8Ii9
zv%e{bdXj>5Ybl5ul48)J0LR+qDAWV(M4N(oNI^Y-b<R*Uc9G8UAY|IJ_)%aH$Y2oL
zTA&V93fzuRdem!C%w$$Sr81@@DmN`TGi&PP<f;UboRU+Tlvnm_cHESh#Q21`RA)rb
zDZ*LcPIafi!^gM<aIb}^NTYa?$zURKeK2)bJ>;|^CR(e~nv;ocQmVLd_TblqUpId1
z@!Nsl9{i#pF-RXul#G*%ZdQc?sVl99)Q|x{Wc&|DY5j~!M{T6LB-ND|my=u;RsL*I
zS=sD@q_mu}?BvMANg1UH>8Pi4^dA?BSnxagb#j8S_emiQ6Vjdfb?Sw>8*;jNr|V}i
z)MhS48PA{$#C8GQ;Y<?;4Nz^yL5_^Hml>T?spTUiAc;(h0w`NPB_IUh)kjK&<rQl7
z_!OFqdi>0=9zUJ>+Mr(lzVx)Tbo@4YbLP#`X?xF~4|u<A@BR_DZ58h|eh59*C9W8M
z5inpZ?;pedCtrgO<q}s0@}A*a3?K9#m$)jBH^R3<?mmaSZwK-&=JSn5pij8O)q%Vh
zc&9OpKH4R|6Ue(9c@;A6nn2!qzSy`CeXmP=*Os@^xDkD%OI#bs>*vdi??BeO#P<Su
zU*k>2804)>T(9yFdF~G0Y^+0hF~(`2d}L+wB=A=x>LwEW6$$=|1b;<>zakB%>d7L_
zYSD>3xFtKe_b5R%c0eXbI+(g*z<;f@u5j7*5_eX5M#YSs{J1+k&6ks#zD3dWS-#Y0
zhpcgl8%&rD#-|xuAtPMk#sJKBvu8019>rJOW~<R2IWoQ*Z4cl8JCI;XrVw-#m#!<b
z<g}%8d0bX;%?_%++x%YGOjA(q_XFiV?O$nB`+or*jX}9C=#&PENDbm2t)c$V&LWUS
z{-66}<hzLqCh|a`zXbf;_)&~K5|)uvpwf2Xd_vK{NdL8o%9c<`30T(wR+1Jjanm?a
z6n&?E6L{kqaW?dhOt`v0=0P5V^du8xW$aN27upf+$b{SY396mFbcYg)&BTyO&{#`J
z5~(>6=(=9%g&++j5Ov~9QbR#ubEM8fstOIk;13Ux21zc5V2NR>3+W4GHHA`nDTeZr
z5-*jP!kQxQ@(yUO#ZrMOh)PJ23QTdv8R@sdo8<p-yb&?a#5<FQp5b^4=#UfQeHGl#
zC&HU06x^0>;k^U(op1c`3)Q!-U0Z!?4)_A~9jN9&#oOyU*TOrOdft4r`!uQ7Pe1|X
ztVg!(!U-wy<<q5jD4(@$LVA>Hk+BWDunKM9Rxt{iRAQb?w}B9>_9!l%pdFl$F65P?
zn@FGycw{j_ZQx`y0pp{wPezZG2el*(Z2{2b5p5`7RH0O#(~v?OL6|Jckwd=fXfNdx
z^G)3ejTjTs&>gU4<k<}yxR{8h`<02K$h37J0c;K7AK=T4Z$ZXjGicz^3YjQJc!BX;
zys4_HfgPm44w<7w9eM1N8ce-24b)}tEOl1<m_K+-9*gGxvL27$VUEimK-(Yx)DpN>
z3NWq*jQhk{;J_3NA5M{S8-Uye?M(`~cr!s;0Lq*lGNH6R1Dt9f=qWvd)|ZenG8y`W
z0K|2ewGHY7f`P6YoU&`zl))=Q;ePQexjS~`er1mZua%mBzH`1HeKP^29G(JF3L6aB
za#ApNLd2{Lfl;i2c<HmivQi{-*7J52A?rWd_$sxpNc1t(zLY+IULpqFOC)$B5-l(i
zeLy5S70h<4ZboYZL&%YY4=4&A${}SUK_;lDmc_cDW+<hb2E(N7MN88H+Jzi#&~ib!
z8!_s{r7Q;5fMI^C=+B8yb|{(?|8oBZKF_#L>;Z2~HZCRj)mY3!OiG{MqY@+=tU;OX
zBlRF`v1DjGJERhXeFVUaP}YS6%B7;-lefc78-yEa;xx9Weak7>Rk8$qPWXVnVn_bD
z=jQLIn6ORr=QbCtTv@O=JG^rQuH&EbcC-U(tN(ZEioQ#W`cPLgda7Ah=;&SePu89B
zPr-ptsmhX!R~e`*$!o@2Vh1#@B;!`9s|2mj$Ot6FX9?i51n^k`_$&c@mSFOk4oxzI
z9Pk;{Py%Ww!K@)!097_6Fg7F$%ORAfpN+?}Dn>Va%~4AUV6r$UF_8d-7GMD(VtWcZ
zNqlVAYLjh!S*pUZN-4MHvvzAdcbNTEmx-(?SG`)Uc7DNjPgXNXXMh?iT?H(%aR0Me
zRD%W8Wn`_L5-I|`ZC6{(-b%^-wO#hFnNVSWMs<ST9fa_}nNl+SUP@3~A5sabC4>va
zuM)pG_$|f{(tzqD7j(`w>qHl@2RT$HIja5V;1NWlq7n}wK{}^9&~lOkXp{RonGMO1
zj-}wLjxZlUiYJz1;u@er@g!GJEyS@+rZi8{xR=(K1SSN?3kR$@?}Q!Z_jEmuhIf)*
zHER^gf^ngUV=svFp^aY_J}>Yr;FN@tn%6MsL5b_}lgI{4<H%5yZITIX4x||n_J4Br
zL&OCpJpu{B@tY!vJuc1zj#%jtJogcT(FBNCwT0UGPt4w&c-liG1!g+}34(v0C}sDH
zZ2%p!2*Gx62L`RgbwbsMn)@(EuYs8kv8|2DIVxgVuecE7M8w+&o#)VX?J~ZETV^%W
z@DH6_6wJ)DHp+!BxzK08(TN&I6B6C{aoE~}6%AINlbxM|pNP%Lh|9>42b9Z=?}-$)
zA9X=<BA5Z4a84wY&xY_OH8<04^7&^<GBUEVGBWnzM`w|el^UCx6>>n~fa`946muo_
zfRHYugs436TuCK?0-{VfA#yY@Awu&Z|G<36y(lP)Xg!hbNt>JGq{lzhqzBD;`~!0y
z`n}+~Hm5qQi4E~hn%E$aFt_m$<{NHBlf!-|p>rE#u$7XpQg-*C?*SwZ;V0WMsRcw|
zen81)L0!$WC`GpYZc3bSf*B8StDaGiFbD=1?gR{26J&z{a|#ZKNM-4hV|2QZg)4gE
z_95iZ@CCOCIzwhi==R~lKCvNT<0foK0P^su4#7;onDH$>&K?urz<3M0M+DDx1bvvS
z0r(c_MH((4CuJn0JJc;ZaJFHU1Kq3>R$7|x#q04%U_GG&1v=50=-j=O3+DM^(<0*&
zOpDN*$T)ifI3*f02&dpVk#IB)5%lPn{+$_+@z5C%YA^TmcQBW5K+b{4NLAr;AowH^
z(}A8<nQ^R6gSyJ=B}hm#spn`EMlby5CPdybCkM=P&?EuPha6)2BG!RbX+8vN8BaJL
z0uCeFE=_oV83-da6CyFXUgc7gq1*qfnU5KjogIVbjE8wPXFmRrd`9N@H6}9V*^ZRm
z=AC;YoA<<~ZfR5ftFaC;BnGOIw5d`h=|Rvsl_1pBpow;}{47JMxYcGT<^C=FsBv{f
zv79=f5wDaBRQuid$#xSE2grclt8)(^L3A~z8kM4(g4U$1btxg%2b#`{6Uta8XBuOR
zN=k}i)jXp#)g6_Msw6EZC#^)zH13dwy8kqc6tY&sm_8wl%CHs&qcp39!N}stsAj^L
zg?h>}#z4nd;>`o_+}0vhCLADIENB?3L~0Wf-SR@&xG?sHm4^lkWaZI=1qU?ZNGJf2
z=ohGVQS6=g3ejF^?i5Tri^lA>5k$IWB~^4^6|jV@(i6RQ@<(KuBa0)Ub%5%IZS1IV
zYeX(|wdux}fg7BZNYTgw@L490WD%l-pV|vXa?Sx<5S&F)@pfa#O0$km;P}OzZz#S$
zR*BP)*RFE|XG<G*g<^eTReak7R1iN7*UKLWr-$%w<9_2xv>9c~nhT0R5{2~Nx>u*p
zO3EjJ&Xy8Xg(?C?=!h%%bJ??$)^vxdJ@ra^R*3c_FQq-pZ|sXG1izC#YdPR_DL9qR
zC<SFDbSufC`^?08nfU+1rWFGFm(-YN&xFu}w?pWxZH8Zn&i|fWD;UlQL3XW)fh1eQ
z-&us@g=ph+P#Cjb)Hc*imzJMWTvOYKMB7I@CT-*Z62uMA<Y}xxm7s(vX$}GN$LBCr
z31R`$R7G~G4~**~rl8KVjFl#5Hi7lX)}-Ol9j1XCGCFB^6n9$srqV76Lc7sPdP0R6
zos^KVY))aqQ=DyDoXDTVCgUMrU~l?6_>|hye~gA-(1axG*fJqO=AmAVw<1WMCmFjz
zN5rtD8cdM?G#$0E=m7Gh@M}VX3`QK<ugx?>dq$Imfdo5EIBUU9-ioFbC`_m;%MpZ~
zO{ky1EMy7qfLX|FJK_&oMs=B-5H!X(xs3W>+lGRhk@!Q~)e|-%>R<k@`xm$I6+oJ+
z`c7>SBKwc-TXI2MY4@QfmJ9mPg*5s6zh~u%$PMpJ0#+X8|ChhWh?0H~G(SvnsRUMw
z2`qw-N=g#3pTalJe?6Y*5ilKM>;id=XB_yssIP~eNlqq^=^C#rj9tE5|6iEIZ=4r%
z$|?H)yid;u+j3)%|6k%I{wQYrx{doNj?^i}67V8?9?`89OCKqUSyn`z!9_OD;0ns9
zuw~4rjQO<r7r>@h?Ay%GhdHg;h&)PhdFY6>D6lP7Ah%9lV@Dn2=HN)p0o$en1d27G
zQusWcER}c50EG(dL~Cr(Qpiim+7-=otfu~7hd*Vm#C#XFUY7xGkco(0+EW}(%gR_s
z5xjVHN<n2-L4D$!oRz+53+mnO`UTT`D|6-~))!<|7Nm?{IgeG&zU^Yy?Dc1Nth%ad
zPLgM4Yf)|AqRPreeYHicGd)Rjs;*kqarXMzu8Y~)$)3U#ch>YNl~fEBS2<;RmOG`;
zGyZcQzklIh;r8t9Zm-BJ&rh1NV9T62TNX@7%Ab~1(cbM{ISLC9)lHNCXhZ|nuoM_A
z#+4NQuGMIhb(4X*nHH#<dZK*2ttxbUb!*v_t}Lr=>>H=3P2OFo4~h~r$#9_#9H6|4
zv`1^%Bax?S3vqdns>gGUNRcH80WJ`YG8al_T`Ji<m0vrNKefam>m@v&Dj*_d`jVE4
zsOO%Gs%Tj<Jvqsl8Z-a=4Gj$&&YvHX>P-6dg0l9tzOd|M-`e&vz9zS}bK2mv&e~kD
zjj@Ie7c5wC!G;FLwh4dDnvSy2%(4yyjfCD{MEfhm9|cFs4c5gzS2Wc1NQ#n~iX40M
ziK-l}NwTozCq=$QTnFZ%2A2+HH9wG(kDM~7Z+Xb2txG9H2<<|FXfjB_H!6xd8iiac
zK?GCbWXOZfm0BGV4&>-~8heMmGv1i(DNfCtKBu&F=CsMKg^}LUlIb&>mrarGgOex!
zRz8%L7m-=kP*gZ$N_tvRMP_bc<&@$WNP#c?G&emiJtqf;Tp&3GYib#h0Dsf*Q)$Fh
z#Fa{OC>k?#TEN8JtkblAyZH>QMO>-#vAKuQtJ5xsj3J$lME*lM9fidOPwF&9@fz3Z
zSR;wS<4Zy_$+(<N(djrN3$guVJ`PD($E(r|>9=&68_8I|tn!7C#L3f*5Q;Fe_+*`S
z7#X}4b<85jbibM}(rJcgexTFbh~tmwG~xhoGR)HRRF3%!Hf-ge>U^h>Cg5!#pK-wt
zs$8cdk^hWNM;V*Mn>rn1R7K3!=~$yE;vAix#M}}4bUM!PIUdsKWMkBERHcDXk#mbq
zBYu<fGM(l|iSsU<7RY}|ry~rX^JATM7#>$e>(Gv~hWj^f8Fg2Ay!GzRmM(Ye(D055
zck{r2TizIP5BH7q4e#vht)RQz1AS+@m-Y;fEa}@kHqbL%UE%T6%%nSXpu2Q)Mc?p9
z|InaY-nHeMCH%nMKjQ9jj}G_r_HFMO-sT?K6!>;IKDfDmWVCO%uh-o_=-%Elc$RzX
z*l_<yZ~w+olse+xH8ecXyQ{yqucBpWpx50sG}zm7R#*SFK6mqm4gG`L%H7>PV*~D;
zJ%jGvzG3&mo}NKu_4lDnnYm<WWP8s*-{6+f(H%1?D|hYMRj~mDZI|U#Y#iEdyV1X4
zJLN3f0*E_?21ngXhc=Dw>KX1M6bAY?_6?2z&apxI(CC&v_tMUV?!`O$2Gzq0)dS^j
zlOo;<Z-rYHrr(v6*xA!R(6eEn&%LXEbPEX6(R_-#XLN>J!!fdPxPQm!NX1D1K*iAT
z=E}t#3r~D!q<{Mklr%83t8aK?&q$xUCoE_4$Ux7?7JxlCwtWNO-rYAm)H^gf8l2NJ
z0D2AfjM~fU8`<4AI@&Teu(@ZrALMNX_Y43N_okuY?IY-PhG6YG%NRELjm^duW7KeC
z-IE9FgzAy%MBmhfGd(qo=PHnHHU{ty(Ov^@jL54#W5nn~?oJ$g@uc}~H=gdp%6Yf3
z)aWq=@zfGrZ-%{O0N2BiBNh0b2k{nX2Hr7K=DX&bE94hO@Z}+t<hH%5z83m?C=5Tw
zJN<wFF=6l<#n*cPYoD=QLb45cL&hc?&G$^a%aJ!Mp{BP-B@~1ul}2#T`-7mO+t>=c
zh%zI%+iz^dvkF%F<}OLa0o>VzT>5SW=sN^DP)S`9r(TqF7SjF3Hryv_Z@@qL$~JiU
zxS<pENXofEXZogFmNSg=LR?dhda569D>$tum*5K{5>~2_L0Q|QsMQ(hC@TRI{j0#&
z6hzx?@L*S5Tx~zW8~u1^JKj{!EW=ZZ#vQT*;;5xaZ2~;I03p%Qtc3wQxlzJGyhBtN
z16)KI!e|sF(X&fY9}96_3|I+nw_%mMFsKB=J(NehfQ)`_!-6dMyCyU}lBWHVFE>c8
zr8?`Ea43%HKz*Eol6sIg17~V476nIu3)TG&<c;8q#HRx|Q`^}L3NHrS3;(Tm=An#T
z_#W}=Zdu+2q&9*lrb~|7j&Bl=Y{oO2@YE1e#Bm$(6w!<7o7&|7(gYQ?Mtb86&|A@c
zGq`R$p6$VXf<9k9N9EGHR02Uj^+IJ*Z4niytdl=Oa8NrRk#$KmJcw^@2gj&7-Yw5V
zsPiF7O9jou&-9=q#nS{Qr6z`pBoUQMb<-kS%Vs=JHKVA}s^uNYG2%a>8P(BtyazRq
z{`@!4-f!W5;uGXCMp|YY6Gl5~bgnTE{5hXRFo&@K_1k4ELQQwmPz#*93>LT*(5y~1
zRvD||A-x7M&Wns<TJC{}K~oSh48b%}i`ZU7N?io{HGGhTwHQ0qV^@F~v@NkQ8=8@m
zxnR*lIA?PAhsK4))W&2M$)Z>^i(#>B682MxX9+BkC9!1KS__Q?mcmk5n(;rz-O$Ne
zF#Nk6nm;@&SO#n^4&x`rea1b;y~bn4FO6Sd$-)m2SK|B7l5WJ9BnD%-MvS*lhXpeU
zlV?A}PTG;i<Cu7P8>97$;mviaahdTw<2vI4mWAEOCn46uBd|X;gT`@~g1Z89h_K$m
z6K5}M<N3z7j4Rn><58Al{1?kLernug+-zKHd=pVW+$`U?8vB1<$O?>GjEkVFUd0Mo
z5mt+qAS6Z^o5H5DX{?-0XBCJU<zZe{g&?LrRs&u1VWXebvO2Vb0akBpWescwn`sQP
zS;ls_MK`iJtcf)vf>tYQLwvFhHW#rvI@x@-0Fj}(5Ls_A>t?60C2T2M#+I`cY$ZFD
ztzxU$X>1MFSL|b_8{^C{hS)lUo9JQ8c*oemHZW@CBdnM88E3FfY%|-!`q@^tjSaBv
zY>*8ZAF&<m3^vS0*eDxgJJ~LFrtv#tl%2(PqZRIAXB%Ve9Cj`{k9~>lVP9tFvkTaT
z>>~CR_FwE`b_u)Gc!PbFUB<p<oXNh<_8Mog%h@-KvyF4uH;vuw3id5_rEvqh$~c#O
zn_bPm!>(c9W!JLrvFq6NY#+P9_-}S2`#!sg-E6#Ne9CTNx3V7?m#`nQ+t}^w4)!DC
zZ^n7-$LvlxG<})fWqgVKH~SxUH@k=3%YMS{WB0S4vIp3H_A~Z#_6znPdx$;E9$}BN
z$BZNFm&OC^arP_rYxV^Djd7SgX*|K6Vow{tGB&Vhj32RQ*#Y*Pv621O_%VB)y}({%
zFR|aTgY0GYd-ezR3dRGk8pkm?+sppQUSo&YpNzj4ee8AihVg6TH|$OJmhmL}Gds-Q
zW`DsD=&$Sudzbx<{oVMGy~o~XAFzKQKG0L_pX`|NwDFAbF-8l|vJcru>|^!``;;AL
z<IK+u&N$}+yHvl<9o)%X#wH$V9N<wHPdsOA<}t?eJeE&FB%^O|1bD<|B#GFYGMT6F
zRG!Auc?QqqS;k#Fn@{FBJlA;B_=M+iH_zt<ypR|1V&h%o1?=QeYP@J{;bq24d<vh+
zr}1(=omcQm?%`fu#jClG*YH|i$Lo0mpTTGHS;k-aY~BdJf;qeiJ07<ff99>mw~Zel
zM#FcE>#+|=JMZ9gv3E=-pO3iC3wak`#252!ehT*aU21%nFXPMk3ciw`%2)B#{4~CX
zujQxnb$mVV;T!ly-pl*=Ccc?(K@6U)d>bF&+xZ|L;yd^md>FA%M)?@u$#?NHv6sSb
zel|acpUcm~ULJe+m-+ep0)8R(L;ni@FMct<1d(9A$}dB_=&$p={BrC``AvQW{}#WJ
zUxhvMuIAt2*YNN1Yx(#1b^Ln1kKe#=<lpBv@tgTA{8s)0{zHBnzn$N~f5d;x@8oy!
z|3<`&yZJr*Uj7q)A0pTM6#ED4=Re~==fB_&@`w1t{1N^re~kYUu`PbZf6brZzu`~v
zr})$S8U8Fkz@Ov4<<IjM_>24{{yXe8@G}2B_BDKkzsmoJHT;M8pAfPC4gMy7i~pG)
z=5O=A@OSuM`4Rpu{~P~1e~-V<Kj8o1NBKYbG5#<9A^(Vf%s=6uA`Zeh_rrac365oj
z5yByy!X+X_l!z8FB34YoZWQq%K_rSKkt|X~sz?**B12?~ERiiHiyV<F@`PLDivny*
zQY4B+i6|9iVv3k5ripSfT~vrl;SpX@C8~u_)QDP9C+bCmm?370Sz@+m6mvwAXvXgA
zt)fk|iw-eY%oCkrzE~g@iY~E8EEe736tP4s70bkOu|ljAr;1f#wKz?z5o^WiVx3qo
zdc+2?QS^#Fu}N$eTSUL{zVU(a53yBj69Zzq7!*Tdhd4tFixDv@#>7ssOPndrf*;au
zczpiTI3~^!=Zf>hm&6|NWpTc^KwKy;5?>MjB`y}1h)cy+#bx4a;_G6sxLkZgd{bN@
zz9p^{SBY<ntHpQ3HR8MCTJb$`ow#1?6E}z(#rKVu#ZAWVjaQ7XW8vJ_Fn%~_{K@!(
zxY>AB+#+rjKQR7i91=eiw~5=u9pXpg$Kp<Lm-uh-KjLn2kGNO-MBFFt7e5sbi2dSc
z;^*QQ;z99{cvw6l9u<#?Uy8@Yuf(s#6XG}GN%53;T0A436$iv~;<w^?@q&0!yd-`n
z4vLq>@5LX)E8<nyg<cbf#Gl0L;tlbpcuV|Q92Rejzle9lU&RseuK1hyyLeB$FFp|e
z5J$y7#WC?O@uB!gd@Mc@pNivR+%-1X@9}urTs;*SWO=-<%|Yj?Xc~~IEGt<RC38oI
zMmEI<QtF|Q>#E41!M+N5FmiO)kW566ZW-=Vc~P5&#)f5P)TaKO`ni$*Gu3k=eLMRG
zRkDxl0_wrReqA6z4oiVYpS}8ArO!2V_Eguk%j+tyysq+8>-*K!I=>;RXK-k=Z=kQg
zN99!4%Comhz3KI;C%xX<i1xAJA-d^lukMf!d7AZSn|=CPz3geO*VhgD+^o+n`rM|^
z>LZ>OT~3PzuSJ*FqQP#_<+bSYT6B3Wx}25{XU~RV5R8iTcw1$$-gX5Z&eg7-?L8ZZ
zhX!3eLz_`0+oCaO9^Blsacoq+f=47q-u9L{DgtK-5zZ2QoFyc9&OFO6<61x8EFr^n
zOKguUR`Elu0!v*?(!i;!#GZ})!yCu8Z-S*pGfz)%KWr@{{Ug@%DAB8~VtY0Z_kc?z
zpHfk{RjscycIK7BQC-DIOjSC;!dhj-_Kfxqz<6UXv%`MXQWtckK~Z0CF~6<|R%3s%
zIryqA=w48n%?&~KTGW-Rr%zHbW}`)<=#8+9^lXHkXVlrdu?My3?30!5?2}i~eS!PB
z4t1Thw76i~lGWd*NTcuTI&9H(->U1fRo8v1uKQM5=boyXhM3J3II){yjM|RMCV-+h
z2fiJ<Spuc-NVL76a+2(?sjLL+Wt9=JWkb(!%ogig&VCzrx5+l|ZEuy03Fih^zecZL
zq37(E)yn&~y85>UnA}rUUFTGnF<Y&&W4GDxh~2gs(rIv@XAmYn=YV|IIUva!J79Y*
zVgUF$2i5&Sb$`%yKW4CJ$I!^=@X(GeeWGu0vvbIffNbReT+_d`W75!;F*L{FvF!sr
zW23Gig-*<nw2sM-IEJ<i4G*e%Ytx9g>-uTa<+SN~Y}fVIW}Y=4w3*NAHr!U{999^>
zJO_4)9kyZM9FezTMr@QCvE3(7u)|tM!sfnV7)E<H4Cq!HF^bA_j>;0{Lsec0ug6<k
z?Hsd{K?*r<d%Fgwy>8N25E;gFt&XW$b-?lpN{-38b&Of`XxI34XnfmE`e?eeOS*Wx
zZBjbpETt*VtqO^@X6G)2>@Ex0s9mNoa_*9XC*~~crmBaI8s}N^mcG=@r=!8STNW3+
zJJ2Yc%{Ii%dT-W@++5{q)~GfsRHK_i#j}>^EfNKYWBsb?FmSDDsX8J^Mu{5E`gzqM
z;kwz?+^%qKwa|%fwE%6C73XY&xab*mwo9;`?J_gEJ@A;qSanPIdb6utBhVfsU^Emh
z8v0fZO{>|0&4wVMhuOa)X08QQ>|7hWMb8a<J7OM5hk4e6&Q3dVO<^XxNHnr~SEq)p
zQ%i?VB^^5FyE^AfS~%4yX1-Ns>;l`zoeR}t3so~&XuB1$5O6scsr!r6{YAF>q8%)|
z*an~3C|fmcTH7Zr4&wU73fh>(w#L8MV)izTSG%U2Vq$N5o2GHQrmZO@6|>{M`Ml<o
zwp!;B1@#gI^%5J@&ZY8J%u*XcmfG&C>ThU|SVnDqnJj?vJXKx^9@=`9bGaRBEqdC`
zHeWkwc@Wmibsa6&ZGE|H>&sPJUv8n_F59lRy+fnfZjwWjvt5z_ZCmwO-Zt4Najj)g
zTZ40@!fmC6Thz)xTVJW#`YP+DZrncSDtlYkoZM0GTrG=>ULD|1N6)~HEj=;vsQa@G
zeWN{&%{}NY9ld=6qdl&^9hgBG8jQdkMvtJIn6Me`iRecM@7UI}V@D7Ap6wfYdn8e-
zTUz<x7(cTg9Ya5L<6?NrkaMJe^Y$LEL!QKF&zNgWl__>?=@%RE!=+<rd*9|BM>7Ew
z(L&#uOF*bn8+@*I4aRB$qaC-GNiaGIj0F;mg%S+jHO3c>@l*R<ixmXCyI(BXGUQlF
zK!|1d`f~mCZhW~FzwVKK^_k{|Xi19Ep~0b%1S_dX6RRm9??wU)nTR4n$W$z)%-Tt`
zU#Q!fBI-g@KwiY_3-jHSkZbu+w4{$pN+PLpG+E?DB*-EYQA8DWpHgPIv6>?4j;4aV
zh}Re9lhKQ*GUP2u8DF(WYQ#7zTIgKai+Oz2Rq@oKaIP2_+BncMcZt4Vt@Eox@_jnr
z7m}}9g0H$(->(h1U#IiyLh|c%etk%OgU)XV$#2&A%^~?MI=>|(U$$7_Cwpm}Rm=5N
zcj)Ikf}i)v7Vq)-G<|%UKE4q8_@t=8bDAE$5PJADJ$#xTz7Tr&l*I7)H2%I2{CygK
zUkLs_jlVAhf1i>(K3}WC%hwu$m&V`MuJ5;p+}HH*h0sF{eLX&}riWJwcwB4zy&8XS
z2>xm)jOR4|-Vpq~8h@|Sl6+pNUEz6+pEm?QudZKjNd0<s{dzTiUR}RlrH%QjbbVH7
z_^UMhRT};(4S!V#{8hUCs-y_^_^LF#RT|zZ4R4j|iF{R>{#6>DDh-bs;NyKw->MM$
zDs9>0YxAmB+GZQ>QLeqs>fXjzqhW8*ICW^)8q9nRdyU4uMn9)}DPN6JgnUY)_xM^h
zO&WALwHg<t>3e()8ds(9<9SV6rBZu*HEoKgYTAN%N{t+FU(=*Pm)oFeqYMWqUzb;-
zzXL;plu0$3w#pjd@wIFC5dBHsR~ose#;hx4CGhx~^>>=}ca&8D@9Xa<4c_DHFu$XD
zMp-93K4q1_S>Nx_^i)<0<ZC!P^tsk7$E3T7kLH~k4R?*^of=K=8Vx5#&Jv$CU7oVH
z;5)h;W%cm*>U8-^$pUxi`fbzo>CtdB===`-{RXps&FA!e7~<4-^>ZGRFLZsW5jyHe
z->=p6p_D-6YkZV42)@weD)r0bgTYVLlm5QP<O5w!gT7WH6qKjy!DI4)`JTxK8oqW7
zPo2K6v^DU7zORNO-~;nL{T(%Y0Uzk^DD4h>V1CEs1ASJ*AJl`s-=WJ_!z1Kt{5$ly
z)+|TYlSkK|$E2_31CM^*V?J;4fk|I|zr}>xgiGhwNjR!Jb&}pVo7eKYxR&3;S$+>^
z`5w-au2r6T{a(GSe_TsAaF+aovo5b*mshXLtJme#>+<SVd0r)tVEt6@d27^r-Wv6u
zSMfjYtM|OBo#R^Ki?f2qtJ(vuCEhqo{=r$|kF$ceP8&<>eEK=X?^RwU4{=s_copB{
zTEn5_8?H6nihp4^(BIc~(H7O$Rkf)4t7_5a-xiOCL)%fkN<LJ1)qoRcjXzXg@IAhx
z>7e)p-%<4Qs`iXQjK*KvS-mYSF>)lLWPY?9*i>vhYj_|kXq@h;(gLHZrPU!7y-B9>
zXQ_SFS{PL8MqTYu%vY_MuiB%Su38I$YL6s>r&=>*wQj7{nt7`|iaD!w<E++-K(+4Z
ztF`$BzOJ&-SL+TIF)8(Ry+TNhV<c{Jq!T5RTZV?Vsr!-w0fgk!fh#!z3|z_A<E<f-
zeAad?3$|U$=i{vB>6>vT<<!8?_Oyf}TGa=+l_l7!rh+nJ)GIO_7Z{ew%K(V-D$za!
zl{wK8RF#xa$)xS$>Xt-TB{eVLv++6!wpd4CNZybS#Ra%Ty(5`HCSyqqqvqs=D!_t3
zU0Yzp1uDe$xJ8E~lVVm0fh-H)K$cZ*ibZ+rRa>ToqAk;UJ=uDlDo(<dY{Fuz3fs#T
z(2@l`s-LOyD3-@r%R9yTxYlw|H5puM`KOuyuC@GAO$gUoo>oaYk89PQJ*sJSw0G!y
zr88D}l+K9fl-!~TF{&7k(o@<yl(DA0RrRMG9Uaowoxxis5*{ZBh6{TbAZ`kLXkxW*
z4acg22$_fV)420X_?U3xR}715SSEAhSip*KEMX-$P9c9{c!GFwtY!;wT*Ox4xR$NM
zaRdAj7<-1jfa6Q-Z#cfkKEd%g^CJo%=O}?@>2dUOlz=(<Y8-2L4URMUOdOjze4{ZB
zKM%+G9OcstJdT)w$8i~7hT{sp0!Pfj<9HfB4aapHU&q{gAC6o388~9D9mg~InK+(}
zIFAgo>|et1%lsl7zsmRGh&go}ujE(acs0Ko$Lsm^INr){#St^;IAZ=BN6eq&csIWr
z$NM<Es4;i`3mhNj599bK)^{+>n*R#Nrx7QTVTSx=9N*x7#_>I@3}cw_1|2ZJjn!T>
z!;K?mw{c7q$v9?;Y#fUO=!}_a&;;|+vvF(}?KsXAoj7)hE*x*AxD1$`eH_P^#2e(7
zjCzbVE@S5y5p5j{ml;_k?Ts?b4s0_z26{#Z;Q<vvb&Z-Q-zpcLW*DQp;mf4*7<faa
zIJ}muXK67PR#kN^Ug$QmmMrda!*5DG7Xj}im2wat$&#J$K#JQ2?^k1mJg%3=t@1c3
zkLStb#q#(~a$z>EmB$~*<2~~DkUTymj|b)PO~5ShV-ouRO)3KAAov7)q-Y7=e<JOY
z3!}=>Zd%ZamPiOAjQJT)WiFh4wYpjo-Mg>%v7uw?YR?Oo-}24q>k1^5+5PXS^UtqQ
z=LgSJ=SNR9*rQj=^!e~9YlA1#EAY{I8=g2v*~jp&al%KY1zskD@F@8sye&S4XG9jf
zAWGozFazESgYYrf4Nrlq#9a{u5eFOvj(v_>9CtVuIbU&(yUJZvu6kFa>pj=8$U~7I
zL~V&0j!ucrivD#>R*XBQB&IxOMod#oN6f;QB{8SQoF3B~>x|tu$vG)@(s`5aiQ{qg
zaXaHKk9#EU*KzN}$Hu=D|4RJp@oy(oCDbQ0CbT82NLZ7wAz@3xV8Up^?u2U-ZcMl*
z;qion3GXESAZbIgJNeS&%agB4K9I5^WqrzRDKDhPrPilzO}#et8HC5|NE=AICG9}k
zvGlU^)#;a~Kal=*MoGp(V-g=TqWNwko?l_O_>K78Y&iJsxPB1%PxwFKFB&QQQ=E_c
zKM}M22Sua*EhC2S_J720_rH%Pj^T;uz!S;-V|eNrJatgCBi-pgg4GCP{@3|g{v-I#
z9DcU{F}}wr<6p;HSNPxN*ZF_LZ}h*5Z_eU(7zO-6|BWd157^<%!C&-`qvZYg_AwFR
ze^o>pRcO`mq7c{R{@3xP$MB`c@TG(J(m}Lh7d*VJW0_22wH@-U^lbm@Mg+=AL0Jxz
z@gUxP9nkE-?_xlCoskRNj`1e|!KX$l;=iVfWd9M!jY!dm799mV3i0$Tz?=q{tN5Q#
zj?2iE@XbcKjgSEJP4h?;cpnsa9dvsL-#Ey>j`FVnmN(*ev;Qf4?*)Db?mvj{KLOf4
z>Hh%OALM_+^{3eR;<*1PC~%PQ5Rrf-2DOpwe;zQ&uYm&Z1B<^JT+$XW84)P+6VxK%
z5Dgp>3@5(+9&+D9P6FkigvU^V1F$Ch@0AeSsaFL_=rWw3&{0tNC`#G`s4w<^2uP3d
zI|12K{$r4OYy7Xm>ol65M|bhmE%@%8NYh=0<NGK%)<2Fr=Yg*zmGSg-c>fMbA-d-@
zhQTRkfiKSTe~Npr^BYjgL&%$q@*l$;VO;3{#JC7_979RF!5Q*<faW^TM{z3g;fJ8r
zha$n^R>*jVI0f9Y1aw=0^eUWB^B)##jA*eQ*FE@cz^@m-K1k+i#!~RZ8vlPAqxj-k
z{+Emkkb5C~QZK@n$FKrtxBt(my`!i-KWgto(DWc`>l4%#Jg>kX$FUMJ+5ZkG_a-R!
zCi)r&YUd?DaZD^R3dB-;d6^L_mK(`{s6ebV;>4*~k+TZ<tBnkC8uHipUleQouZYwA
zzZdIpUXNDQ0}j}L{EhxUiC&!h{Aitk^leR>*8yE5S~8byQbH3%4{Dch0g5A_!7<R_
zFQ5Sj?p$n?_;cXT;nTVlbYF(rTZ7US?kT`M8eBXM-bX9JPvL(I_<xFa5Dm`#)T9A8
z^;5L1NZ@}2Up#^@9tPggz%>Q9Mg!Mq;OYRb(c*Oc)*-zS5cLtqp!Y_+9eFGRZU?{_
z@1Yhx03;6Jc^Eu!Sl0i=;IZrce+TuCgWq14Jn$rH02~MW9jJ}N;D`6X5B~r^ypJ0B
z2$JIyNDj1R(19T9#Pun-x5WQ9u@n#hYq1=^72x@m$UhbNtMLA6oKM4#cxEj@i?-1V
zo-9<{2_C-?zl*@rX8|hWPHHPR8$z~1)m|V`By=P(BLUqpK=(1A`&e=-NlpbFNzm5;
z-Rpqv7@+$Y(7hi5-7!FS4A32u+`Jm+)A0RB{<Qy({2BZX`hUe=_CLX2gM@w0{~O^%
zUAs`TF{sl5+15rOBhE5r8M^`Vd8ofVkZBjAeO?D%z6I2~1IqwOh9SN<j*0qMF58CW
z4gY!Y6;43SJcG88D*0nKzIL(yc`e;OmTlt}DRZ8M%y>Y`4Bbw^Bgar9_ltB;RLXNu
z6*64%iE1CwXdlEg(P2Du8uHelJ*>s=bo|!gz4iWU(LNqS`?wvvbOi0=3GmZ15^kq4
z18^S(Pai~m-37QE@Sjfs><<9$6!7&YsJDZtw@3Kd{s$phj-dVy0+%O%%k$v%2SJzD
zAd{X)n|~a5Jq9WF80z+A;Pn`I|M!sC<KX|NP_GZ5USCDMz6u;45KbsrB()Q8oebCr
zSIAuS5e`W0f7)=4hfL5oqrI#|TUmuZh1$qzNJ9z&-^Vn*j{)BYfbTQF_c7r64Dfvn
z_&x@?|1|jiHPp8gUvj}8KL@yf0=#bozDHy$B0k*>`E|ShAF_v_UYuGEBnDvogRYbJ
z(Nf+AFFvPv@o(Tol3x*k(}B8iNNIX1&a2R}RwI8s&KvyWXdMU|3F;l88b{B&6uh~N
zWGZMrOtO?DxuiSV3i_fe&|<Fx*WLg)ZUh`R<99pq(LaE;)Uv5ZB>D1@Za04ieW^$M
z1av(j`|)z5+wr3|vjk`2AqgYek(4=jPRdu@Cz+#ogk;X^;F0!#++U_?HHzL8JYkdl
zE=bo1(Cznt*M##Qpdrcr_XBdDU`mEgF&p1$#IF<dRCLR*$^A6YE(36p+|LM+`_H4E
zUqwA1)O`IL)bsP8>+>4s=K=GpQtrPC2*)MGNZx%4Ie6TE98@`uuam5&9_I+C;F2}9
z5;b)yWc@1C&>Eyk>Z<+^avy!L>ZPsYamcq}U`nmy3jas8`^Rl*+j};-O|5N>e?Q>+
zi>6>MYMdxYefQr`-iNxTsrP&f6#Q7$W-@APw*PIw{<iKlU)9u00rec<ycFP*34A7l
zdYQl{Q&TS!tt1nz<OryD7}Prg>Ky?`9t8D{fO@ZkddJX8-T|&huttUYxHbPDd2a$|
zM^)y3*V21;y0bLd>4YSN1_Fc-k^o5vA?$lVgd`9Mi--saae+~E5Rn;C8OA}zK~x6O
z0dz8o48|ph5kZ*@5Wuhmun7cW0||sC(1H8^{(h(G-rHLib>@BF|6BFBr|O<M%X6On
zEOiQda~bshJbLUZ^qnBQoECS5?zJ-LUi}N9dmZRD09^;rZ2-DgfvyASUIwz)fvkhK
zUl#Dz%wpbzxeV(ff9LXOJeH&miP#ZoKvKb>JY#vCHE_@%Jh>T#7r@yI_&Rmqs}1^A
zW2c(n^kLAs1v-z$&l!fTABf%JEoR%-k(p+Y=Ox=J|LUpCm#T%II^ZXH-m*|{!quCp
zM?C;}+p?STsXDMs?U~)|#42@Sl{z!4)QMFREP>DPvG~StH4x-}!Ca_$B2WgZHbYhE
z`evvq-8T%K(hOCb*vsn@{J_P$8*~--Ux<!`kLu8@11Sv;o>X|;Xr^r|tskvaUnck_
z@=H!6XHoYWhRjEyb@RaReCW~ye%>MH<KX2T@bV5NJPj^h0uNX%N(}zP`{3Z63<qn|
zdBo2zth0X$uR%rmPya|A@=(EG)Bwk=g5x%1^3Z`iEQbcx$lzXn%WCRcOI`A$<W0*e
zZ{5~!J;fyGzcRCmdZVlkX}Br+d{H~U25k3Y0UrduWx)4)H1mVN_h0bg8e5FV`M(*<
z_+H^TVEsKd=QW@kMIYrgeE!EWt9K_fs)a^PXy|v~ohLF{3F}SBGn5C@f$~@r{?8+R
zKJ;CH6+eyN>HHR=)6OW|g~U9F#QX$#ekQYe4`w(i`74dQ*%iE$=cOazn@V7QGw?Qi
zT#bALe(nUXoxqd8eF-om$V%{u&*mERV#)sr+OY!7vBJ7heJngV*B^R&@|4u0DfgPf
z{nqKBbbLd%hXw!hV)lZ%tH8nvpk0mxHDx}}awz<&FoGntpxxyQ+z*w-g)5-)BT)I*
zQ2Ajn_6Qhz8%n>0#(4xvzYL{chSIB`bUV;CXT8x5D7_YpE`h@9pztcoRG=zW2Mmj<
z^O08kFDSYMirxlAmq1bZZA+l&5-7SHiY@``OL%K=+n`?$^s6)IUj+J>fqpH}t1m6j
zA&35j4Ek65fF3UbkE$#5nJz0rz7EJ=1@c#c{8b=-63Ac8Y|9&&ZF!xy9Yfz~8XVFY
zaL(J1pQi_X74nYm0q5#R?ZS9VWv1E38QS0D^90SVp6sjEG8J%P4Z6_yjfQ8vm&~_7
z^Up23f#&HfYT%R6xS?<GGFrGZoyT+Z7g~5Q7NG@;(1JzS11@jDB8<Z#?1aBohgH}q
zJ%`@>aJXd^GSeY@0B+w0mw2{7TGD%=c8~8sQ9P#f1N=m7^+@J(e;Os`J-aiwKNHQr
zh->I))=`s29ZDl4jpotNcf$9>H>IBdMP7oJ-pTA`2N>@J+nt#u@3g(#2`s-9e2l{L
zV0Q(W?e89G7!wfO!H&%++=r|`>G6QM^#AZm%V1vz);0qFi(u^$u(pnNJO$PUW_Gj*
ztPKQf&9tS7wlrmJ8Aw~|pppA9U~OO~QP;qeOOU7~@Z=JBatW<cPeDAn0f}m-g-eo+
z{5Avgd+4?bIKMw$-k`!Y=@3e)!^$;5ffvd7C;apZ;RHXkneheW4r~r0*Ad8fBPr!q
zt;4cZnyc<8JmC>MkKSQp-ea_ZZx4`T6}CjZOX=a|t^=FIXp<!d|Hq?w(J*oh%j!@+
zbQNV_b4mF;Z4pnb?v|3#G@!|QHhGQ!|1IQ{m!~mBdoNr!qkG<i2SYpLQLHZ3(MBEO
zf|Y^qqLHK=S!{8sj+M@#mOoEwwOF2!a8wRIP(kV7i?56Zkosw8(++K(gEniZ>p60-
zfHtBD<846q9@wn_Pxh~%OYUQYG0oMC@dS)BZs~d}%Id@;E7C=}Nw)pF@SsxyT{(oZ
z?*RiIiF2>;2yC)wpJcv*#$%hoL=&9S4yU}1$Jb1ome8hk9*tzYlHU6=@s;JYja2vz
z@aPP*>&(LMay)?-a|k^J<p^WDDwDo=vCJ3bc{_(7s4nLCu5%45gG6=IWstn=v1H|F
zDRH6eXedfxg*ebTmIBqQ@>Yv2ZFa6ZfY2OBTLe{T<?HI%Y1En2<_zjsX00SWxt5fn
z4>$u29!8!!!PdvY+U4L|E&eV)jaM(DUD6Bc?LJOjn~4{#!$@))^@K5Njqx^vBSE9_
z?{(DidIrrpK_e}ajh?G~jetD}egc&Q`v&+&8cd$1DD_4tn_S7AEm1`j-TnOC9b6lu
zsL)w>z0gs3y6`-9x%Wd`^;Lp{UJrUQJ&#Ff^6~V&*)o}jgBZc7CT!+R?zmm`|L4ei
ze#txjJM**>I`9Jqot@mRD6HmMiQNAg2f8cr@0G&F!m2_WRxc_%Q)qYT?Rc=;Z~(z_
z#{8nfe-t(pen$)Y7nT&3Ma_ltxOUQtCJL#e?A3)Y5VO2++cp%MCFvDk+mv0c(vg?Y
ztyWRVEhnVS+i>i_$k`6g!xovO?++!SXotLf?%8o}8_I!)z(%J|a3gv~T)P~m$f~lE
zyF3MkRbcw*!oAR}!@no!5vvTgC@efwc(SmP{!gIm)1(xQd*i$EQUyhJ09SqxTlO!H
z-SSo2H1~2q_lzRFJlsl@TaZCTi+{3}<lFGLZ+!Iqq-(Lzz!HZ|@8c+}-L@7>?nEtY
z{9kxLck^=JFi}ri&lVQmDr^c>=MrCdP_09<wSisn0LGV!f9jy9^+hozyD7ZSxe@-}
zh#wslmYQ2T;mbGuzr8z0p>5h3gF-`CQ{<%-NZ+Y==HsRBo-RB`iO*8v8YQ9Br%CZ9
zx7GYJZ_yVS7VT7cCK}SMjS0QHD1!+;DlDUY=r&+_%P^t6x*pbmY~f$v3p*uv)q=v?
zWhpDc&^lx|*CCew!h8IuzT#1bE?kX<?#BOx&EV-zv}`@UO|+(+(l?+bJAmq)P%HP8
zMtPFqw+b(+?S<!5WBCD|)IOzolM>bzUZX6PjX$kZX}Ma06y{VeFC(Ps8Uvo%fPF>A
zPlNNPl%DI%Vb=b+cFD8|FtiumV?5ED{8IBHE`5VBwV9_Y3!4MHS&7m!H}O<DOuwQY
z1%hRT`wPE@_N(~4S9qEcG1bx!xSpWyW#oKET*`fW;WkpOgbVm8E-*LqudS<H6t#5}
z))ihYJXQFk+CiH4!PL6Kv*xCdK-xSi{2o}Ptv8l)W}cw@8t_pbmOmAA{-5C|e@5vl
zKceOi{oFDh3OgK?f`NY>wCo8|u5erM!({EDIam+0b(&X+VQxH=mQ`@UJ8*A=1gVTC
zXzPYtS`<UvcknlMV#aP@UW#LbWfE2yIWu(k7asO?1(1lx^fNEH7?q@dF;8F1W5N}P
z)VhrGx<1SQIfYVXJVaYNfYdx&O!GGK@owRD+Qw&r;qDial0Wf3lRIel5;T-9C`umM
zbR@0AyCkwGFYJA*lHTZ6lJr#2ob4{j+Ax=4bWU$2Z8Vj3Qk_2f;}foiS2lxn(Wqz#
z3vYnOATPrir>{cN-!UH!&$EUr*m^C)*fQw#3ismfc1dxT!n#2BJToQwlH`!yDZ5~@
z6yN1e^4F`chdy~X!z(^7sn*H@Wc=wOaxCc&@Jp+%@`F+!KDNhGit6(&lMrzMC3S;c
z(vp`>3d#CfVK$@PTDT(PobEZh)`#~08M1v};c;{deLSR-FEh}p+GrSMt}6TnoWE80
z6(#>y;7f8`0~ZXpR(TQ+t9u(=f#ra^P`h>VJ4MU-c8+0U`oOp3D@aQz%p?dID&{Yf
zJ*Cg<%iD-mTTytV@IYY=*jWSjJzC`dO4{2_TV$coNYanW#g*{|e8-?OGtY+j7vR-r
zY3&+%J+B};&lgJ?;F4ArOIm{+EHCL*wC~&GeL=C5^d_xly#g}QDL$gEx3Q%Cv3T!_
zJA5i(M2#;JN?(rQ={nl-g7wOnV%_i`(*Bldv<WRm*_67OtMz7Xp>xc;SOwxOS(mbd
zTp2dGTdxN>mbrVkEMaz=YpI@3h^a&`Z31HT#_j=Yo$%u?R6|K#Xm!x-B!|=PCHz^b
zUENDHZRH(V+QZW=b9Q+Ng=-2o@l)>%-@Dwq<o}Y;AF}0KlF@ESdG69ZwM#$0NdJ^?
zIZ)D{gh}E;4@f;wryz%PZC{75A8eO=I`s%U(Q?=fcrf#g;KQ{UhKJ>J>7%${88^~b
zZssQqpt2+UKZTWnubp>TA0;T7w4ol-52d7`z=RGrMM6pPD{^@&^8|a8=~{`c#@-I4
zH#U@(y{MANt&*exWwYT8Qf&z)d9$t&IT=AoBgnPV`Bjo~gK^RX-MAH)T%)ivn34tq
zlQ1qnVVI>uv|FEHd`q;WQoN)U=mF_HV+|P8=d1&!7Rv0v>q5_~tQ=px%E}<}`@nkV
z7=OYgYCct16ik%oMEbvlBcuaQ8e?dtT~BZq@M}4T&%wCi$wp*)m7YMmQ1|0-pvF@g
zB{j5VZQ(%!KzVt)wg3>1vQ)#QTj8ZB8cRtlXw_=Q_H-2S3^u#jH$N{0i~^%yn<%Lr
zpC7IPGb-t|!ejiSSK-j<w*p(@lEi`Zw6fNThhD=Lh}X7)XIGI2;^h%&x((9P(0(P{
zDId?afRfCiJkcuUEgiwfAHZnS1~4IvyPrWxYMl>aRob>44YY18KcobV%XYt#={(AC
zE9FZuF4D&l;C5PTT>0kqxur{JUGTW_-g9VYA4L%j#t8@DU96>_k?|94V})196d=<5
zR=L2`0fKgOW+cw!USn<a0sQOLcMJ6t!{qC)X)N)!_it}x)x!D2%Nx*$L6v);XkMfn
zEy|S>-&x+4dKnG;UqOGV)axr2`d7M9t&iiWJO?*)xUY;>qSx0(AF_$MAAqh;iw;{m
z(7y7j)dqPG`fgMmo*o({a1!y$@#igr!Xs(W4EPY+Q1;g9?)n_M2kB0*wUUruVr!`v
zx{sw@OA7Y`8U0q*e-|-Zf<U~KACh_>B@Xi6z$L44k1I>`zjDEr02MT9GxfHq&fq}@
z92pO}=OqbzAFdl2jWi9Vox~p*e!8`Ko9fz9A~?c5Pi)69S|Kc=XLZGQ(^`_@+~+!b
zSVq%c3#3;EJ;B0L*rHboKlVSyYlwpr;BJj?H8IYi|BUX#cZye!=}$Qny%xOPkw~@l
z)tUn9j=-G8T`J*rdYv9+(3kS;2^*)zY`{U!ityKOS8U-w`TeT!!@~7kAK|xNKDl+0
zw8huCZ&#aq4SfsYVq5f5&q{lZ!J}S^PrV!%f@an@f$aMlWNAZ2In^&d=?^DLoArKF
zhMqy-q#nHl<;g}~C~cKS9RFtz+8`TTlyTY@#$Cc}Os*F!-+e+dH0!Nc!(`(yLE9)x
zYk5A}R6d4T{^+l9-vE!Vp#{u<f<I>2eSHpn2$iT?<D7j_rhEMjWf5Cwe;+y_NOM^c
zf34fxi|D;x@m`-bReJm~lN0H+?kVBw&M^KN{2^9Hbw4zojP9VXDSaz{UOG%3iTz+{
znV#i#FQoXt4$H0{>s!od2A>R=kTt#%7xXg!vQdB1p-r~Xx?-Vy-9Ue6-#gy&JX?O6
zr`rB2+Ddg}i+eqiF0qxeLFk5rQ3a$EEL#pGtMIh?uJ7jK1JLQ|E_wOmJo2zTY9l?b
zgA&#Em39edCiQNy<)0dhdLZO+zV((T&4+BHls8=x`j_icM#nc0N`o-Nk>w6PTw56X
zMIN*Il_nhUPBD(QWg{QNZpxlNSa{4W4Ytdr>xnEfy#~fOkmpe6EBI*nk-=UpyO*})
zNvTz%HX8}$!^)bxBtMkvgPdz!6E);zk^WU`&b_LNY}~QYJ);cD?s^5xbTFn@t8rA7
z<kFwuPUV8da1?GK-w0uj=XJcxseS2L7tYw<1Ds2-GRr~<JQ>U=NF%-bHl9ct{!lFC
zO|1x^C1DKS@0iltmX#9MJqHC}B*b>*If#7*%Q+Sa_b75MSF{ZMAPFW$Uqs^Yd~S&f
z(h=4ih2P@0bU*4C5#e0|sPq)|EeFT%aIOQ#b@Tve8!eFL;k^!eUFK+@ROyU8lpkU4
ziI^()&@^ij{29|F@O|OQkOPbuK45O<{xQas@{tU+M%a}+6^|fK`b!Q*G0No0eq=GB
zZ&WrMAzyt19Fy6^9`cm)pCHM3FTa)*7-%5LF3QvT4Em+;-UhJhwiHY0CQrqpJjP#m
z3)r&shSQuyd-5_!4&~K@*IoI{V8~Z#D1yz<I7K#AQ7Y9L)eiZgmB9BBKYNdUBHt1T
zE?M<Jw~&IAPlz_sQR4q%__*(LJ~CZHX@n)5^{`LHG(B!Y={=&iHzKPM54vwFDqiBL
z_#jAisH9Kb?v|I+qYNn8O8@V@%;r8{c%G4qQv0)n)(jq{q+Wf`J@{6#v-z3l(X(M8
zg)^6p6u`OfW?16Q4@*M@RyN39RCrXf%xHaYhsMZt<h4Ye{gMv0F9DUiU@NpW<MXxH
z0mh~&o3ZDz@n@~hX?1?-q-J`{l}MsIXPsCN{amX&`xcG&`HAcwoRrm(&1=Acx%Q|A
z8m%W1g;t??HkwXlbL_PEL6>O1G?e3dLeSL`6Xz8D$n`SsPx?S-i+_vQ2(hFTmp?#X
zVJ&)3BO0se!Dv*2w-5M<7SKzr;>k-u7sluUZoBY$hP&U=l2<u@OAhM@B<Tl*AJL|J
zGDv=x)eS6+So}aeC62PPx>2S`r>^l?DcvsHk|t!?_LRU`W`nZaOKhdG8Gu~B>Y3v+
zeVe6y9}D8cBY^#}iLwlBC9T6hbULx`qfJ+m)Ece4RGw=6$WNfqA4~;SnlKs@{8#zy
zmKt*zv)-JH4N6XW@JaxrkrcdBNm;91FCH{JxXdF-Vf<EoRnuCKQPwi~7o`Kw;vP7H
zSrJP55te@`kilWDvz^qu3C{UF#o$piF^}^E@c)RG{gl#{^X!$vV)c$`mqvZn68Yl;
z3wKcJ5?cCo?!Ln)xp+gpe~ke&0o5Jw>v~cw&1YnowOIiSKVjBgGn~KX`U84X$P6|l
z%u^1-TfZHA)fUch?Mpp7>HaqmE+J)TUGN<`8IfS#9QlP#{A`yL;*oe<47`FlLffVy
zcZd#SfKjvU>T{z<EK~AfbvEKF`3_&I4jW{B;S_HHt!)kUaun&7;E}w`|0fNRa9IJb
zJmpnAV9hW+&sCa(T4+6Q$hrjSw{n?c1~Wedb>5~@t-0?~Y>jO|o`<W(MM904E(>Lp
zr7+xvNxiM^YZ8hr40adI?p}2Xg03Z%|Lb}Wr0(N+4P`dsZH(AkqUJU<m3v^|5lh7>
z+R1x1z4Fp%Pd>*a3D32$w50VU>GPIq4!;Bc2OCSfvfdqWuUIq619{qakA<EMY2PoV
zLOZ*DjlQV=`D^O0L(2!Q!ow9jB`ipP<Olw47fq7Khim=}n2I{GYl`jrr?vq}*~qHf
zl$C8B%b+n{<f)ryxyoYna&*NvWtYRrs1jIuKX~eJwR&nrNy`gkWdWQkc_{aVqd0%=
zD;Vze=n@YXP@B?awWudWpNjt*&<^jaem^bpNH!`IqKjc@d-w~+GHjU_12)tq$>Ro|
zNqg9i2M)+`Eumhm)Z<Xg2uqlh<b)nZH(d0@4f)=rF4vlsEKm1!*V^tGr`JQS@RU&A
z3UvjZL!b6>kP4qX&zoPBIKW%Vme+2|%A$*#yLuUU-@R+B%OZUl^r6&po(VLU<dV|k
z3W6Z79qf~vaFe;O3kQOQdwFsjW6~Sw@jv91K~E9Wi6z=VZ>vqdkt|4nKt2~T{1E@K
z1s-#2XZ7`c)HTj+lisfK?8r~BJUVaV_a9zcTWJqhc1r6Te}WZynHs&4j{1H>%v1D`
z?qk$?BmF|zhNaMLBWYJ>T8DL7*i590IIUEEq;MnS=xJCJ#TfJxwvl<mxn{nDdrpd`
z6?ofPBNE2iu!7I$n9B8p(>)5WuSOGXqMhQj*U&MqVC&RAQHnWKN)rFRX88zf)Pip8
z!Y|}zZjiMmtRvz2DjMyLOrzfee%p&<VR=s}<@w{_;rD`r+Oi`+*OL#z<G$ka+`5AA
zOt0kE@~5Tyt(BE&Vpdm_^7OpRv8pGuQkqW~E8}B0xYWA$Ga8mXH`dmLG<ZY5qoAHO
z@*XTyzYi?SpVOM6-xU5^HTev*s&t>`F+YFI;|l8UXBN@$Np1?jQwip^x^-=F{6(|k
zcf+Ocu(B&?n&*{+^pdGZ@#y3O$s>K=9!O{KVXZH<k|j^+cBxL;+0YJP&Bi#Cs(3I8
z<Z)Q^q2*ApiEip==&j$z&^F3y2zdk-p5A&SBD0o?&-(5fOJY?M|GkQdc1r?YgSVe2
z4oTACSY213`80MGTB@fS8QAIp_A|Ocg`(B(maT@8HO8{anA3g6ja}1O+N9YHL)T}e
zf3!vxDO;Nv;*r#K#66My%OKJ}>O!A~`249oX2v=Fe0eF%o@YH4<qa`CLuohXlV852
zqsZmGC&DjZ;-5wYmkKWa%lhC41x``E%!@x6{8_K|EUR3ec<NfMdsxfHe`E(dWSWpU
z{%7g2_mn5q^a!WCa_lm9E08DkIW$|TaS1}v*t$zABZP02BZ>1NKQizfoc1K#v<Y5(
zPBG{`Y2T&v3OWkEpbYV){W$VSORhxLeill}%Ic(N!eO2%U{`eiboigevbsH!GmS0;
z&xQBKl+wol#v+D^*MJpG&UGD7yr1<k1|hE+n{D7p7=1vV#hXBcXI?4?k3nVdrWh0u
ztn{K(J}GKx-J8}i*@zuFL?Zy5g<n#76|E1wA+5_9L=N;!0L`KAbGq<U5M~}&S*q^0
z8BgW#aV5qw6Ur;fkINI}_GiS+CAp&>YU8L3^+Rv-2eH*aPb*37P<P?Tbw>Wb*K4tT
zdHJFKtc3e|)qCbxtg%-8F{elPBHZ^BeHiiGK)kSix|;W1<SCx8<X!FNSFEuF5BcRe
zzs<Tr4j`$72bY?A;62BcNiMwiv%+s2-Ah>^Jz<$X%yI9siwU~kbR7-o`mF3<M$NLA
zzHY+|91ucJ(NbJ1U%15YjJ1_R*;hgT?~X^8BV9q~Z3WVJ@nWq%VwcFT@U7pM_=fKO
z?CN+d-?}}Wuh^c?w_|UKzt8tp*R#9hf@DQ{248f1rsB$q^_3@AF0X2=`c!pQ_2Qa=
zHIr+uuANo;ySfE+@7I5-VSK~HhAaEk^t-U%_xrupZxcH+9^QCG<M$h%XsT(N)b#15
z75!`2jq%$4zZ+07V9J2S18y1c@W85p+D&mH?}1KbZ;lyUXY!lHd%v@}9$eUzus2F_
z3hx=u=emISkMch1#aNM=WGZ(@@nZ)OQf(mBDpIwPs+|-Yc&B_K`6luH_++m8^P5hJ
z8SFkdllxhPo08dF=kPm<H&##Ko$`77*fok0uArXw<Ra2v%y>?coJH)}jN0g~jyv85
z?In&~V9^u`Z&N5ONxSN(x1IXhiD{<%x-4gFaz6h*%8rN^@w=GcCDC;9sq_%`rv)2m
z!3NsePAMJ94DM(0GlsYx41{xtKZSRD=kfoeTrc8xF~3WIHwHtUz<LU4z#x8-_TUKn
z6lmwQj_6ywYrQ8ss!amFlle_$$EfMxeHL%GAIxtK_eYWY#3C)$Q&T6UwS%WOyq687
zr(rj>4%P~h(zRSgeeA?T4Q*Men~jBoDGjJHx~&JcCn#-$=;j?^PUd~*^4$hc<NxXW
zN;@x=?>tz^F0f(eJ$5ESiWl?k?90I5=b^+GqOsJz3M{Uoeecq~jpj39awdC6iYBwU
ziqGZ%<veh47QApaJCB7OcC^n*6Z@Mqd5;F|uEWkc?8ec-{sw|dyYSVqyFy1=+8L`I
zfAd5<TVeWJ)Fg}^MeW4Fr|;6<4YYSH?cGEz+S5>bZfVc9O02Tlauu8dZGgK2xYxtG
zn}8RY;CBk|*K7BklYm38h1~&xk2rQcW6z8e8C^IDykE?}#ZdS%e1OmM|0=lh3vlzd
z3fE_RwGoW010xO8uo0@ioblE})Fj?|7ObqL#${ke)LsgGma+rHDt3TqWA}<ScCT2)
z4iKxr&T?q>AY8DN9Uzvn1B7<`YtHt~Xi3iiqi3>j!6M?$hDswcnsq?0ChhP8gxWi!
z1DZ7hVLLpj_P5dg4xsEX4rUk+ZP0BK5Vir`%RsgXda<V!+;b|mF5n&VMf}3PRU6WC
zX!$T|+W<YZZxyv57heF^-{Ng|as5<iGM%^4XYo52Tm%faWcwSnfaMmj+yWQ0fMxA1
z*HYvH?W=J%)K@KPQ*WH#3B0d^&CYIIzw|HS`hi)S*3l+33%fqd2aXaiiEFiUSrc^8
zeoU3#VMN$Dga5+N+5FA{AHyk$T`L*GzKm9U9{gX0+&~8~16QDFXMvT2*$Gv8;1oCp
zJ`?Qlp|I3Kt*v0G6)d%O!xEHtZO8{S9-G0eol;h3bf|;MZ$O8)sBIHe?ldjfJr!Pj
z!!()A{lP$SO5u5G)NWO(u{XMCuN>|9*T#-B?PdF)w6o)k+T5OTMH}sI+akR>dZE{{
zzldJD(01)B1RvsEpAkjT#bA9gIJqpEWIZtvS)0V39OCvV;9@HBw?DKMZ_eb|EO0Oz
z?9V|X9A%of0TDVAt`GV{G}j(nP0|G5Lej7rT(p6Uwd}sL7HX^p7i+;qzO&nE<Dy2|
z%93y}wFP@Cjl99!1FhkToI~<GJ7s^x)hF^h1^9wR*o2PQwtY9XSCRJ7dVrGieYCDe
z53Gmx>cGefbif+8<3X^}4pw9ZrKKLj3f=@pZbGge1|v5C#baP)ndR%0Xb3vtaiH0Z
zE^k3M?2&QJw(OgAN4Cq-60r3Xu=RDYbqCn`4xF<DiP0`gcQ6wpi8%>P9W0LaxkY1J
zb8P_PP9T=nlC`O{-In&2MV-yFgQ1^nHu7n`dKOF6(TTPNmRWR)H5oD+bZ9eHra3)>
z-<kX}9SS6!k!)Ysp>r`1Tm@GLyuASw;wIs(EpQR{CH=V)NY(<$Y9I+76#5fro{<#>
zZvmpYa0%t3?b#2JU(ojL=-RfRRk-4D!DZTAXe|(heJk6*jWkNny-xR}wu#g*3Cad<
zV>Qri0J3%{ikHNGJ+rya0Z&Jnr=(@H*Ic=s{LA(>Z2@O%fN(9mw#qgq;7pJ`1!PYF
z8CDSr?GKdGfg*TaPeH*ppnD3u$@Z+qnr{MU@?PYdb|z=>I~zzP0oqYYHVLl`+yqUl
zJ(By}PZi3og5%c##S=iW9w@}|n}DDV2$q4LWkB#e5G>0eSb^UsZf`5&bm8i+vnQ%N
zT+5GTe@U>N_UYCF=O$p3Z_^Hz<RQL>9@w1uH_}UMz{sXddu)P3I*=yqC@H(s!73|R
zWV{F@sLSrAU_t(<Y=7{4Cxd_05PUZI(W}9LG|yV|?mTKL@$2^OU@E^r^w6G`SI|D~
z@g|SB0|?e<e7X)gNEdG`@@U}C4d7kvT9w(FHZ(>XZCr-NXrrClTQ=C4M(<{J6&n8w
z?9@#k0RCYAN3JLF`vAX_c||Ae;};?M@-QN_H}9;FvlZQ<oQKj&X+~!>s|0!x`Ob~4
zW!6`vw4(pD59D-8k+&N9EP;+CiVmQ4(o*fTtPKm(LhCx=Fnks6t)<w7NSd8p(Wp`O
zzLVZXE4_<WdKaz9B|sK>Zj*UB6{<|<TI|7buO6K2)Cc*6{zqGKKDe$+LXHjOXr{hq
zth-uO*Q5M;^H?c$i=jIh2zyK2P~^zzz&DHE!L-3X3uOoRyY`L*w^~1z)MH7law~gn
zsrr&Zt4~Erd&gI+TN`?#@{`o#YU|M>YtFb^J=5UX%8rV=*?krYsAnoqe+3-A0S<46
z?pS1CqlX3Eg{4VQVG>lB1QjN+k6Gv;iUK)?hPmBc=||rgoRrgV5U_O8GW9ZYPG|-W
z^^UMt^n}#o5Osn+RxeQ8&<rf%hOTe~ZkU8uy+2S+2l^S@hyFZzlemNNQjg+FZvpL~
zzBTXRWOzWvD0hF#5548(qz-*s_0G-r<jQe?FXG&dj2%=ur!h#`Gx<M@x@U7e*x1XY
z28;@Oc!$mjw@|n1BxRmkJ;JWJ$|2P_#U!9KM+#bgGr)P*Hm;?OEkF!6(cT5<DYX+`
zc6|Xm?2Kk8MPp$kv~NWbI;Dm?NhNGZs%C)=+3TYy1urkd;Yyb+%vU<cWYqx<gB*6p
zMDE!I44?y?OIWDuMl<CU&4feItW>8dKn*z_kqmN|u#%S~sGBp)tjeh0=C)cwvK9oN
zF~E~7I#;7opB(ea-J&FnPNI#&(TaDYvF2pakxsM!r@j*Hr?GAH$#x#aGPfrmBZh{+
z<Ja4hk+Io)PJAobNXdSBoXhDEYnL63&97iyW2-IPrt#%s?P@=B)|JJG;+$3~rk6Xu
zpHUWDQ+D6iZF9E=)4TmI{`IVZR%177g&J+9CS$Fon53^8-lgj6QD5=fzGqdo7Js#7
zt3zqrZQ@RAkTu`Y!P<^@%j@w|%?XA%3D$UKN7<_7;<{5FF(dQ_zsEu<#^?1`s@HvZ
zo=juhO{yJ?bQ|xc_HK0p)eDr!2)Am7U$evX)=WlN6(acaC)r$PkFqx~7o(XR&*)LV
z<~P0CANn*Eu4e__H7dezg{x+6vh^y&uj98VtPd5IlrsDE;GuwH3MulVYQ`t*GH<}Y
z;*n#w7!l~<RkDgxU0si!IRZ9HI4VnTt_6mGrvR04kCe6G^R$w-^cJGl;M71v=2fyb
zmf9hFNN1JJf0Wfz<dU+uUb)1uHh}+i;PPc4Yl|wWalP^}CmrTv0)%C>4W&X8*1nh4
z89UD^KO;w1-Yw=3t-6#Hcq%;4L!|U3IQJ&rp{!+1<XhaWVx7q{t*vLqNISG>W#w{K
zoUrOM<0Q|M=UCSj*utF5Dsb!dz#)#%oI<NLU#j=jICNEdaWbW97Uxa=cYqCP40AJg
zXe$4gE)ges2GjY&zE;h|Y|h@V3Z=HOismVmL~32N@4z$MFI6rb(6=){#J$?trnW+d
zWvm}qMtbRO!GOMo-fH<uXaz)J#xs<{KfMLwHAi_2@}ynHy4eW*r;hN33LHfZP9r=}
zqHLkpVr2S8HA_c;wEzWoYaF-1D=ace_VY5zQbr5y5*;*y==JM{OFZ8Dp|w1!ofSyN
zN8r1nuIV*XW(NX&iqg<`9eP(>2P>X{Oe0SmK)0nF*)yOLEV<ptuPUJXG1d`URVCbS
zwGPTPuAqr29db}cpLMuo?W52PPpBSQ3}}SMUOc*TN2xUB<zI%mzFSTz-h(F8JH=Y3
zBAE~+%j-~`r9&(3MZqP&wPm^$^8_1<q!%@r>nuL+aidjUtZh&o)Ri4uuFW~5CyMFw
ze0^Nem2SsU=h&uP#;J8t36|1bZ}nt4Whrful-RO#pWW}0PugEC$15?d!^5IY=#n;j
zMjZiHWe-D5WfA4KdCQkTY3s%Ehdu6-4}L`+^M%)6^oB<Id2ac2D1MQxUk#UPZxi{P
z)`C4s`3oaND=;YCp>?8xySG>-aNx}d=U&;f964*^ZnZhrxCK^OhhWXNSk^W_<n2ta
zUGy8KNR+X$y)`I(35)ri%Gzc)wj*H)y1sD{I1vc+zJ;Vl{HQlkgVe}c3AS9i`M(_i
z^pO-A>+M78blG}OdMmt&#gujDJqz%+5^j+{KnYm|W7(_2tH{g#+oSCRfNhF~#w+0{
z?a>hQEjt9|8H+XN5x(NvtOgFPCsP>w^5)=MlK}sa=cToC`u`VlDD|+$4V<V>;jo!9
zZxgNrkfc`E?gzSo)sWd?I%oD*QCg2?yPrM(>#cq%YC2ji4lDl8YTD|>(v#DCtEvC&
z1mbnLeEVo4?DxR7v}w84l#cuBAKOqSo}MMxo-5uTu(G#3wg@lE|FpjwZ#{;8Sqyt}
z(xUMG7kgvDP4eu*J6=oq-|aoHZq}0evR<VylfT_ntO4oh_I{UoBd(b=_Dp3}U*=bO
z+db@5Tq>h@SAu(c?_5*XTlU*Ls&xzH%G)=T8%f8{_m<+E`lQgaP2riJ%RkQ~5xdll
zgUva?{)s=rDNCFk%IOj}hBDm4QCwC7tMKUO<uae=;u<8|&?+|2I)|eyUH998q-FJU
z*XRt&&<_)gL3;a?;heKdrQjRs9a{HIL#$fBn+bXwra!+1#b$lhEE~AY;<E_Lm^B_g
zw_7MLQdY_Dy^>0jtNy<H75X9m@voTQ?``BfWn9ur&!3W)9nvUcY@dF$Tb%QADPMUR
zlp-!F)=4VSLTe4#=gLoVkH;Qiv6QaZtjgoNb4<6g^JK1-XYg0Xqn5f{x6?A6Wqeu8
zNP7537FK*E*ws_en$d2&TFQ~%l~Rb}D!pqBlv0L$=W0|Kdf&d|jS&84HK}H&Dh4G^
z%=Az2yh3Z_L&$fr-IDDxmWz3PBaFM%uBU8`YDfkTXbm#&Q<rDUF!(xog^Ts(xjxp|
zE1z3#ZAxmjId4Va7s^&WNKMyMIm`LPAW%Z4m;E;cvLs;~OP*+^q4Fz9LOr5E7#S$b
z+V!@Vva<xnPdB;mmbXkZ0;R?<O5>PLnpw@Dd&*Li5}$)S!X^8B0A&|^m)G;Zh)c;k
zQ05rr`gVyP<!#f*Op&Gl%YREt2Df<3&$G~Sr1V|#bi*wr6xSLH8(k$QE4iyq(3nT@
zU~J103NCYg=wie366qVMp0aoUa;Qvk^Iryw=;O3`C0*(Z6wf(3Bq_byhvwBme(e=3
z486p?;bkPOOz%jmtG<xlc{I*qp7B54mkZB~75N~>Cvkzx1taB_b5MYqFwe;~zvnI=
z%?`y9st<zCqdjcaxIYs5=1&z91b*fHygbG|O3%RH`BXCEvx+BfGtg-aK=+JmaNfpG
zZ=r+}KZ&|tMaSqJKh4{$$V+vP(luBEsdQO0%I17FulaxTx_w^n|0ZPRb^RGo#)r+;
zSV!~^@r3yPq%}D=S&}SGC#T1zr=*M0XVRA{YAOa+EUEZiWpm|}%Hu2NRi0OQW#zS%
zw^!a(`Do>;%C^dvE8nOZTGdiDu4=cciB(gordQ3bI=t%qsvE28suxsWQGHeQSE_HU
zzNPxk>iesouYR|txn|Fr!)q4Re7fd_nk6+WYF@5+qh@n$Rc-&;;kDyx_pF^(JG=Ji
z+LLR~s6D@SaqShg*VJBLdsFRgwM%N3)-JCbTsN(5UfrkbZmw&u>!^?F>*|~9Tk2cu
zC)H1{KeYb%`g!$d*I!uwsroDHudTnK{@eAp*WXqD%lZfEAFXe1sA?G9uz$mXhASGr
z-Ed#SntoONTKmoJx1irA`d!!W?tb_7d$ixi#^H_A8!v3UuJMPB_cp%NxT&eGX<XCn
zrZbwp(sU<ZIT{HcPQfFahF`;+ENftvMi;}GS~tEJFGk-z4r^sw;~k@xcoe_U{KiCe
z@i?x0Cn?^&xDG|@v$UE;Yh_ETK*MU5d|jr#GOKl&`C1vRMa;i4t8Y(hEu!{po&q#E
zM3*6T0SeYtQA1b>mam)1SLN#4ms<I$8noI`Uy5x{&tP><s9{wa)&sXu1HF>0hSK-i
zucF<oI;4iK-&@x@%CO42(j{oU?7(OwVGF-0lr@cCx0R9GyaF<bZ!WBhzlEQq9iiE0
zlV1zo@rme;d{xpVK<hQq$O8~|p+ulU3sh*Kq<bmpUhosX9JzpR;sspjo4#$}B43&G
zAT1HLSAh$5oTbEOXxj{Jo1tqnbZr)0BSH5PWxnLQcJ6>qJ68ka2HL$LgEOr3y9}R0
z@ZDUvhm`jilYh-sdx9pwPy@uRK->z%tw7wGabhbe?x5~F4DT!4y%OyLyc<gNLZ=7Z
zvhECS54hDA&Gj{Qt>6@=m&y*Do|iw2@|RKSvWyQ)>$h0F!HO&KV7}_M{449r!M(mZ
zuJ5m|0QalF{Zeqh+_(?51zA!HR#U_3jK{jKkz<8vkT}*`3b$Hg=oP=vQ!7SUn_+GZ
z^wp~Lwn*42$!<w*$5Pi4>RPfT4lw4XAd_jv?`_Z>o?)MvI-V_sADWSZrRb36_)OwN
zrJE@Arl`7?dc~z*=jqqCIbCcSOQ@@jyXEZ8Fh#WxHdCj*u%f%m3fE+G8*83mcl?Ym
zCWEimESK`~W)0Fb)-fTzx3Gqk!=SQOv}>)Y*3`9t;X|RY*8aCf^)c&nNHG>V<g3w@
zdJ?I_TLPwsQ-dks?*x8H%8KY?z<mk#VI6f_bT#*1gmQDCV)!a_zS@?r`x2*Bq<SBQ
zcQ9CO+s?Zc&FN{>emYmZeR2l1l-30|r{~bhX4j}M=1l=}3#`%kPBA&qtE}hkU_Eb#
zTc@`J=JN}s>f6`ltBv)|&bm}@Y}6nv&ET#TDH)5N*IGlZR%`_)TCEr`+iJ=NomSFr
zUGIVv_pNvS|MR38d^W?mz3bn;@gRH#{nquaq^(PL0ozLV|BX9wZm=-H1K=CX{P%l1
z=pntab~SeBi^xHc7jg53z|F+5S~Zgwy^&^lu?8&Z^xo{n)-B3kBgG(lT+AXPldqsh
zpN&pJ6NHt=*!DsPG+Kpr<h$s|9M3ZOMDqRi&Ias=-far+(sZSKZ`|;IL!4xwcMJK~
zeX?~c`F~T2zBS9A^~7s^G*WA;jBoM*y}^Q{)|%t-7&4DoZ;(hn^>i)r*@@*@i#69;
zA?2;e@3IoK`|?P7BBAUiWCp*7-^tjhV7EG5hen1~dtH`7c2jk1$m(D}I+v_ef<`t_
z_AgI`Riz&!58Pfokl<Sw=95$#uqvhPaFkN!23gFqGDFR*>9;1zYwlq0k&)_aP?n)~
z8G0u|-xuGk)>7jXe8Ppq&_7XI@bZH{72af&2fxTq*WxvH;?b?m^0~!$6Y_$(m(+=e
zmY01Rxy}Gz>i_7CAz*T?%jq3-;FYRoy_2D`wNqK}wB*044^>K`ep5Y9^PbNtV=}x?
zxYp(P{W|cIzgL)-g?C6fr%_92XLtidZ56(Sf#sx7&kacVE#kcj-lU<N%~3LKe_9uv
z@X*|eybYldxZXz;vvH}Y%K>(}9$Kq2tlOx+;##9Ux+Dy7U83Nyo`+T)g%yFtXT8A(
z&UzeBqURCnP^mqR-pc5aXv+~r9OWY`!VkDlrid4#6Q<9d&DTg+7sWmvd@0L?)iKVe
zH3MUjiN+|wmketlJ=3`5>KOmqRGd9C)jWr#wR^?c7j`#Ex7@NY(^g&+BWuk21nB6`
zWvyb?ee+gIa*N2TaYn823nQK7W33rYN+XQr^^!{~5g8Fw{j7a_y);8aFDi`rYd)S*
z1fNGMwML~I^~uX#sG(%9b<h~2#!}bPYf^h?QOJ|!tn6Nb@-qA2UBHx<y<u3NTZABt
zFKTT(qmGp76&R!nE0*2<P&-eH^9a;Y$-fe;9_=<<<WQ^JCbg?Wa@gh2T%nIVziFg)
zl^rFH&r_8>>~c$eqEVRFW8GYrhu!{UX^UxCE1@}SR@sqHD~49_)0ivx$PX|lF4T-_
zpr=+930ke5>#j4hOm2N~oH#FO%hv!KX}pTX6uXU9F*8y+ifM>)9YyT&q(^;9;UmoS
zf0=vDiEis5D$#Gvl8e)dI$_(2(427&mDcN!OCtbXO6iTdebW%igoFK(N*uCn(3Dbb
z`<nhzp6++lF3g109Ky5YFw8p=?^c27t-x4p1ANE+YAVk^V~Eucrk`d;h^5=?u$Q1G
z4k<0Hq*7{?DOgI<T3$wJHIG&b20nk!dro(iNO=(A9hDZ2vUw<K(>#md*7tk0vOqK2
z99<+N&#M^?9ig3>9_4>gGmuX@WH~VNML<d~m$SSStvo0m8LyWtjcRYUPSXnLP*ZQE
zWN?<3g%{?7+QaH>t#{s9DWOGW5J?+mhn{(M2rXh*pij=p(&izr@DZdlKpXH<DlwEI
zSoBrFAk*b7DwPuMLMegj#aS}frSFAm)m+fxy<<0*(@;v#B(ghNkGVR-r*=|X4a}12
zO2+lFL)@U0{8WQ1Sg<1jicI_V;1^n&NkLvv-lCjF<t-wON`>yCbQ8QHyclX?i`b<W
zo?D}Ud7cEh%_I}}%D4_aA8OF9(B0M+J7uUd;KFoKJG&pWTdSn>wYOE+XiGt!CgW0R
zilD9Y7FwH=N`8S4QhLR;unjC_E2Gu!EKTm&gi=bJLMZ_<N(peXa?z!PjG=~7DdA2l
zP`Vyj4A@gCTKTBmGy{)@l%9tb%wRUqwft#TT7Xy2RRb;JD{5Wjt-M767FHaF)FpsI
z`SM(}rrOx`ciGBPWGg(2*fsnvDU>R_7)rNPoVfy<&fINA4HxBS+|i;UhWIDl81TcI
zjc{kbKpY<UrKEeDJHSO90jeT)i>2h)4RhNnMU*a4QKe+H0!!dJV=BjFsG+Zr^1^rW
z`bw}(@!MQVvOBvmMA6~LAJr1=9UThno4~4CBdODgPiTIWzLQ?<ZDmd`FwwuzuJEic
zWT!u*SDtAv$+i;JJx@;Ctz_%<F>+9D8@o`f*9=`Eg_oe80xycn@JL=t=o#>35!xv)
zx{H-7FNmj-k)@e0DlLnrs`vc#gtEKvV|mW<d-m`XmxtQz3s9=orR8U)k4U4hV@L*+
zO8ZrIKWf;m^?Ak;!chh{c`6OpW^(oI#RxC9XWj6UVT8Ptnc+q2y?a97noD@0-qIQ=
zo^{8|mUw_?lW4E(i7=sS(6ZuNm*vXD%d#utNTos_Qfq$HBN6&C$D5QU4EN(-UQU)q
zc%i2(O45(+y;Ye8QI24rikc}aWIHa{q>^ncUtyE!x-A!FnRb%U`xBpam#k0%Pjc-k
zZY<#><n}J=TK$rx?y@GZ_Yy<OK0^Cx(5o+=&+TW4jy($6TCLsNP+kC7&^Ma014*Pe
zmX(*wQU1_e%k#`D(lvjSU7OgW^WmtUdiy?TQ@|zfO{!o1x_C@Gi*nthXE~-ra{tfp
zp!;wFUEpH*YQk2;2u(3>mL?RCg{Gk7XDw@S&A)0FdAiZEOD6u5Kew*inoQ@qZd+s;
z@3$n=TH_|(+D2UmeXy_c1@-Nm7UUalFdak-^}tLE=%G=%Nmyg8V3@>x*F#!JZ&<cN
zk9JB_nyE-S){jHfk_OgSkgC02u*essV$cXVe@OcW+o(6Y!l5fap1eY6IdVID%F)}b
zSli6Xee97-u@^?#cglG}Ps-{BYdwwtqv{oxWObTnh$@yPyC957Z-l$Da$RN>@3F$q
z`uULU_t!NH-{x+kZb74FNyCNo!M3V~VVt2JVO#w`U4uU*K5l^y`g$o}3ogP~EKMaD
zmd*Gf;`t&Sg$?8LbtNvs_kJ;Jc0&o`m#kk)Eq#4u$@~Ol0T%l^UCTmhc{ABK$iJUd
zW(N&RoBQ0^TR7&ME=AD3KqG~wk*~T7KjBMHWV2d<T<L9V%4zQ+wYE9XDA@TT6^xf|
z+Qd1!1hn%HLC^XN1L_a<@&zEW$fMOeBGOZSN5oh!+8JUs=C(}ZqQFyp_k*_6k}?d4
zE5R12v!k?^vm(?MA4*p`N?t>V%bu37(UW5+OPrzdgw23&<?dQC5nUlr5*_#^;+HU5
ztdcTZaup7wsiZ&g>zvwLnBVDIIw<Ky_+9wXdkcBrDkRA0RrbbKDP!@j*t*aM%Jg=r
z^~Hpl1{Hk3W~fWg^1C9Ad*H&*dF^eUw&yjcoZBKy^vYw#QN|sDrZ-rD(BB*~hjb|?
ze21cE-Mz$==qk-7UK2e`<MLX$*S;Nw2zbihCd>*A@Aj7W9ZR*9msE=FekWh7NU7pO
zW60DnJu<#8r7PX#S!4;rQAVjeDt|(+xvzs7Rf{nrooY&z-dM=8sa~G=ZGNW;Jr3KR
zkVKG^#<)VR;XUuUAk8Q|%PZ2X2(|G<Z<kn?=P-wMp)>A7*XnED`m%}6<*d?^HnTP0
zE|X677V%q-l%u}xQm*YquSt-uiUtvTH#M)KG?yhPw41%Y%v4(0&$lVc#?QmIGP4%_
z^<-KzDs4#ZpD)t^TjqP<6$UL$w8pxH^3APoquMV_>q*hq$lAmk8rW&=Sy9xf;R!MF
zDD~!#^O%}hnZ$3*Q|TIf4&Md6CMoK1lr&23@~jN*A7$LvrGONgXGh+${D0}n2&DH8
zU}Q>GUObF%V2)rW2dXQ?5;=!FH@+`uZmN@YqV~+s#zwJMM>NEqS7~PsFhsg{pjz0m
zL~}%Mxm4NErMdLyr6@JO+$NR4+`c=sQOU;iRT|VSy|vq0`FfjEBXnVeR^#{jjyJo&
zI1KM@in{*pC9xg$7_?u9=GrrQnu422BbX#5p|3?Yr%<f;CHT&^B1)Ho6Yjt`-hikg
z7@SjK_ctSiwNMLK4keg!;9mb!2lRU|)77PSBcw^3mv-r03ih^V{~L`nY79Di>z};%
z_@UH{Puwe{72=uDGY|d4tdH+_$(C{fmmpA>A326p2kp{`hqYXIuC!$-G8<Whz=?o6
zc(Zwty<SDHULO=A<yX@_wY^(POS0e(u;rQ{>mL>i;D%AH(#U{H68^%NzVM@8IMhaY
zc50tw%lk8w=G4fgeV>+?*5t^vxaN-4HxfnM<8fh(q~;Q&_^bwvbCl{UM)tVbVj6$j
zKs`KmtDrRT)oo=ZD6ilNd>cmN%lNh|W#}!JMf7&tQ<LVYj3;UqpGgKd1xvuJ@Jc_N
zL-L@V1=J4>YYm`UsnmcQ{uec3UVhJODOdMrdcvH9<e2YE8y58ja#%?2dNj@_Yq`v@
z%LBC*%uCC8tSc|)Pyf6tT+@wngT&>fZLO}YJy$uBk-WSuU2~1mYZ{M{7N7J+4N<Z^
zI-WF#GBUs}oBXC1bCmNeqYS2dhf{=AMM|ljYUtNx+2GREq#ee}8gXM*27J=hOAb9;
z!Ib~FElRa=6@4eLYmG)+e$AvLOU1>d=-TzrJaN#IrTAX-N$FvBSDvO7tZ0;_*e5Th
z4$$OJN@?T~25fhwK*ZR~RB)rV<t-@|wuKw{3}y1geek#?eUiKoN^@@I2+~G>6~C^p
zq+7Am^nK~GYuqX5SttyzhSOHKXh)!-?@h;^Jde*XNLr0l^0><}m0`bUp1xr267SwL
zWd{Aw<x%!$dvM=d{{N}Ca(Vl6>xc&o9x$4>KpOll#3-G^fP{bXH`3|p?DTNn89XVS
zm!6THn_iG!l71?^g1f8IzfZ4AZ%A)SZ%MzO{xH2OU7FsT-k(0i?@^wvN}o;Fr0df4
zX-B%bB1xa+eZ$7|+=}Lk;pw9lqtp8<##fA|{B1dB1I1R)iU}1HfHa&Z0r9cG+~-*_
zi8iP`Jx{ezr=Fi%F^#r#J1b^Z%<LYg{}pq<iLk<1aino`6ZqNs`F${`^RBXUDfkpd
zx8bZfzT$ZB9?ttKPOdl^3iNqGi&Z)+7MMb7pi<X!9aQVkS&`@@)i$0Liz*sLW8>{S
zQF<HC(G}r@Bf6eY{VH?SqwtFOX?>BGnu)nTJg>O0VsXXg>6(hqRa|YJnw`$8xHi2>
zKd5p&@Ei-z-UXM6Lmy2yt3?$x=|dIG{1*qpU2u=NrQ+HwZ=iZklk3bW=fXEo1bhel
zt_irI)^m-;brlJcq$7^_np+gd`u<!TPj)B`AIAe6j!+nV!}p_n{~6zp^Zl*9zuVzZ
z$9&e|dWVlYez5PQ!{hjKzSkIU9AD%6mwi9m;XV%MI-KZmfx|@#qX!)R(J{w6+|A()
z4$pKr#vxjP@@1>y_ymW)bhxX-n;pvEi<5!AAL;OUg^~Q9IDW$66o=<1WVd9+k9ByY
z!%sWZ2yz^s>o8zu7vGOo*toIrUCM0W-9WG%UmM*QUmIT^-x%K<-x}W@FNyDte@@J{
zpVyOnThAM*XG`bJK+*lY6}Yx^-VW5;dM=@TTRQKi^*zs@gOM$r_hop~^?`T=B?OEL
zYGG8k6ox{}Z*>a=ae&12i58+xtg*N_e%;}R6h`0m{R;~D(wD+&$DHKwF2|VblARp$
zRfUZ+8&5Koe<<G}8UMfZn?OC=|NB*ZU3>#yi@U+!i@PQMVSHD-G`=^!KYl2FG+q@y
z8?W(K<T~QbNs`ngjY%`V;mPP^d@>=KluS!zCUcS_ljHe!GQUQ?Hn%7_j}#Yjzc^V;
z`Ksaj$>px)hU9a})tuK-&t37o$@Qu$xsm$rPi}U7sxh3Ksjnuvl^Sp79L{+>wJxF7
zNv?Gc|5a}|?{?h_lApW&^MK(z>c5YgA4patkExdADYxKxN?J@Vm6Aigh?qv6zLc~l
zZzP+N_XTxY!8i17NbA!6$qHb)0Vwa~e2A7TjW@>~>ELu^USc{XS&+86M8R`1P%omy
z#&pkgGHs`Q;PQvG{#NQ$ip5|`_&Z+wmyC3{lyI}|;~@^49o9J<tT6g)qBNgL){y3I
z$B%Y6)Zt`@0~AJ2JABPC!+qc3`_K9QeTVNleA)4{RdT$K!?_M8I^4tISq>K|j2`fP
zwZnrP^F`m^;P6a`V;qil*y8X6hre{VtHYaJZ@ppojPJ)OOa}RWq{HVObDYypad?hG
zFehloI&5&tfev?37+vN2iyaPinj;;4+F|POT!)`g7`@|^f9t$2IqY=I`3_%k$}=49
z?eHfG>))u~MBYrB(|4-pH!j*Onn<WqcREF1=#}iIFnZp!t4?0$zTlWE+0*l+XhC#V
zbar%3bZ+#a=)CA6-Z8!;x-|ND^hw_Ny_|1)UBz3we;56I^rhtE$tRP`lD|nl12=sk
zxhDBaa$WL|$v-9EOun6bKlwLg<<8^>$q$nsCqF|Pev$k#S(e<J{3=<QJdOlBojjAQ
zPX3szO<qo3N!BHQg5zIHHYe{T@26>6kyfSEX-!(2Hl_X3L1}ZkLpmfKmJUxxq$ATE
z)0T8pIyN1bwx+wLyQRCQ6Vi$4lytvz|MUR-ks0aC^uY9x^f0{dBhn+&<I@w;x#@{`
zwI4`NPCv*V9;f21%ug4jr=_Q-3-Qg*WLJ-~(zDZZz(xfvTdDfFKQzNhj)%(v2C|la
zuB_E+@tw5v7g;OS#y@85sVKH&2+)r$!neJ!CDHED2cr3C_tT;adBf`CoWr2ZC+U0q
zUG$}BL~?2J3BDHbspM19nB?;0a=u0K>EyG~xa4n>FY?8Xze~Ox?Uj5r`D!#d`G@5C
zXy4>($=9N($qmW(qG{0Uj_61zwj??ln%xy0pWL0?9nDRCn*2065eoi1Itd#7GWtMr
zUvgh`a`Kzx{^)~fwckajCjXT@7A;7gNS=(&hO(=p^OEP1=cA7#FC?AON0UODMpvhm
zVDw99vBu~t>40=_^pEM#bVT&eP;*rD&2*=9O!RFiIxe~es!osoH9aUjD7q(|lg^2L
zDoRF6)1%VkqMt*R*%?)O=TbN{*)y4lY)($5BvX_9lj+F}G~$8DtYmg_Fm~dw<nZLE
z<T$kB2a{8hQ<Hhge6-+M$=S)p$;Y;XQ}_x_ayIbn$D4W6dT`42!eJ=3x%LE_Pv(rM
zeLr9jUnJ&>TJyyS^TkN>#g6fNNfeDvc1*^?3$00Ow0p99vPU!_*(=!#j@UcdJDQm6
zlk5}io$Q<J%hy<@CHqDDBnKo1z#|7G2SrnoLy|+`lp~TOqy3U&l4GL-Wc8vM$%)BH
z(M)i7YBVc3E%``vQ1a2_5=OWZzRcutW!_wrF4R0j!uQU`FkdgNRKdP6<D*KxGPxV;
z0{3EFXbr8|AMGVAG!Q++J_6{W^P(NlLKng3A43lfM+;pR?Px935<Sd0I^K~tdv}UQ
z#iOG!@wk|><MHwMXy<r$c5E0QPhx+CUE=vM-^$~gw5LbA$rFfnkG~s#FPaelH2!I{
z7q;}jqlxj;@!Dus{961*bPQg`_-HP)I4AlHun%BX@ZsovYN8hE7$5Hvx5m3s!(Nns
zIwd|zstL4rB&{4nyC(L^5ub^!5afb}8shDs^^V|6K3^?o1vnZ3=62*99E}3cLm2zp
z8Qko`xg!{z02I&_NcN8Q<(WpoTH%uYc_u#D9X>goaj`QvC!_B#B$af@LFSp+(ceU$
zjt(~G91{H|+8iBD+b2e!qphb#KaNj}e-S+m&Q`|L<HtFV2XmeA3F5K%61=nV@h6~k
zoZg+@1H?)65g@MPu8}dPYH+y&Z5RrM8i8PcApULid;a}b^xr`7Nc0$z^hER|qn=Mk
zZPBb~P4p7=za0H3Ix2cKS|1%3y%BAKN8XJqqIq#uToauW*TwbGd2zqEe{_C43_iFp
zh7+Psm=7+C_lWn3E|2$)_l`aj??Yemig-#qmDcPR&xo#!4~!3sz8D`7A01uCcZ*Mq
zz7~HVJ~{dZUobu;x{0=)9(^-jL{I8l@p<t_qFdvS#urE5k1vTo8{HZIZTzKZY5e8*
ztI==be~7;pJ%Dfa&(TBizr^2(9*+Mt{z3GI_}}CIh}z;G$9F|9(ku8`v^M@l{F~_2
z__y(cQAhmy`1jE}^cVh{_B;X?ZH^y{9|PM@#D9ni@spe}*nKWe;y=c(#MSYi;LrYi
zP5G_3Iet6d6c3Nz<s2Em7sH+4zA7GtCs-ekOZp}K<JM$g(h^UQmmKex?2+sd&yq~X
z2PKClhsCq;I**R$B*!Ml#fK#)By-~<l9Q5?;-k=uC&x!iGsefD8Ry5xB@2^<@$tzy
z$vN=}$@$60;<;Fw#qm6>%ctW7SeL8f(~>VGUyjd|b&1cGb&1cx7x<_6L&^7&@5Sd~
z9se!<FxKS<@%hPrCO?foB3l_>h(GYF_+!|QN8p`5Bu~bl#Adt{U!JT_-iWWj1MZCf
z7H^;;{(>xWe05r%HpJIpKL*8rk3TRX{<3UFd|kSCx=;KMSk@Ww*RcGD#Q%iNI0CQv
znDiKE62p%_g%|gR7b`P4N<0RdB1<EP-HEdjDcTurv@2&d+_*0~>9_D@EqwVBI_c$T
zBXU%L=k|r?nxX^a5pdff=C-5EZO6hZABm2GOD>E~jXxfLDw-dE5&l>Re|!@j{XX3A
zak$~0=(9-BgXjWrz*nJMeRLf(YmB~;?2rtNZW6VkZ$qa;qwhecBcofO)3MRNiW1SS
z(BLD{chR&LM&A=9qJI-5qC1i+lPjY;ldF=eq8|wF(GP|3=-<Kb!_gAqH@Yi%F?lii
zPy09bfX9K@Rqz=7+_ra_E$zKvDowwa{+O}MrRn`qzx0Xp1@ucC{mS^O1|#)&oc)mD
zfs86QBh!P?LPOEgBhZ2D6NFwG4MxYHea3;)@yK~ASltcXGl6%c_e48Qgc_5geb7Mr
zqAjN)_tH=gp=n=;)-wL{PFxw+!tEpCT_wYOTYTSmYCJ8T86O-U8Xu0vIVt{Nd}{om
z_=5PN_+#<s=wn|;&-#}5w)lJWAb*5*|9SjNdOW|2AEp<%l78J&@$>PE@yqlj-;6ur
zchFn!#f79gX-Jxq0m&%(LwjHi_rVGtfZfC9*;hCcZ{cXkiKGM>IoV#rd{H5}04iLB
z-vAZxyZ#0`d?xuU5^*Iy@t2ZolP}{Je^v5;G~Aec3#!O7mS4Oi`49Z8|4i<|!^%D6
zUnRdzew#d!Y)IaK>)~~L-*M@rbRRfd{_GLyG3MpF2<zd_fly^ayeGKXJ6?zeS&8<5
zcKFyU;rObwDoXI9tFgHWl#yp2V^h!J-?^M=^dZg!8+#u2pWv*CKE+vM-5&$v52IS(
z<joWO+F#%q%m1sC%tqBf`fI*Lc0XQV72f-wq6WNmzEf_0uGaosoq4Js{`u}vRXR1D
z7FFP*PiGI31JeVe>U35*JE}Lw^}|a)3f@YhL$LlDw~+l$Z240x|HpWC31=lfz@<p2
zynt$a@y`S6Rh+f-O1=P;pG-apOqV5>@txtnN&bfK3Vts69N)FOCb@<$k9{TiO4OfT
z%5~8IdMf|OciquY(I9#&-{%WsXsBoheE2(~!O-Jpd=FD?9*RG|jPJ(Xo7@`>cgsi6
ze|bC_iGTl8v?D(LAMv<1C!3>D^j+S=%X&X~KiWw;D;k5}U&9_pwP|fMj-E_Yv@^Y#
z{?T~)GDD(W=nITw*Q2rN*l1U2u4p&<Ei<FtjhzY7VtjG-i1dhPPq1@jv={xD<D-f6
zWlo6p#&?(-O`=b8Vzdwanv<f*^ld&6?MwgW<Y)?goDW7*>F1mhO{1@KYP6q5XQTb;
z^URM9px?8AuR5N_-cK{=|C}Dpqz|+(I*@+Q8PP2ILT5$?(H~kA&8AOuR&+4^qO+qp
z={e~+P$!8lun*B<A7VtbkaLVZi4oD6(IW1}Wh2dHqs(PHn#)F+%XW-D9Gwp*euQ&0
zC0&4y_$Vhfn{y}g;8^qESo7dW<mysrvlty0C!a_@0S(l<8E$=-AZwq2uAilklOl6}
zOT0AT4$0?}&vP$5xC3(d1@6B{52%73(BE_arQ}O|$sXC{UcI5jJW+|1{sS@B(=)1a
z&nPi}^rwGx1My!^zD{X3CO5(#|D60YG2ckOLCn7-|HA!E$xYmUGx;Wx@vY?B#QbaW
zuY}UV11w1cElD-WPm-S?Rq9&}aNlZ(`&NP5>MUXP=CcM%SU*cxBO09Vza;;S9*@xv
zk8uAeeXim3xt<{W1H72H=hft%SBe!~L%ekT4vZ$f!u`5r9k5AK$I;hr2OF=_`yVb#
zOWrq=H@SZ+d5imw<ZYxJ+Y27V&Hd@Y#nIq2N$GXCA2-~xJ`VlVfQIQupKhr6JF!I>
zV9p+5O)$`!pvIbDkTpSLx<|T4R4a=e4WZXQg;2Vo&bp!A+}~i`(9gPIkaa_yEIBEU
zO^;(oHA%t{c=1YeVQel;%!RSJFfkXV=E4edVWqjS!dzHsE{x5ERp!EKb77UaF!ZZy
z><b4?n3@Y~&4qQ04tyLPBVKGUFZOd!yU`rkWRC2gT#;M>b;Xwr@{Z6<;==wKb0l88
zSZ7|WGcVS|i`NqKWjJzobL2qt;_l|fLFUDJxbW*}vK!&KI(Y6T?!|4*$<4{l(D+-)
zw}}5XoY$OuC;1LBw<Na$=XaCah!+<Q#_rsXR=b0K{!se`!_1e%lYdYCov{Py`H@(p
zAHxTC(f=P|9vy5R-O)VSV(uK}{{K+=|G%Le>HpD;0z5$YAY%bLnp11dsdeVmCOCB^
zn)osJbtm)d7<(d38Uq3+s~ImCYp!jO?+3JN6W%LfT<B%uUx8oyn_rvZ*H>xvYsqW0
z@pX8&pLw_5yxW*;Og1v=Ar2l02lHj%<Zbx4(R@58DI^6r3^NxsrZIe6$0!qP2+hrP
zj7rp_p~cPh=H@2z@nEd)Ah?auCpd3#IvD*uG#!fmmd7+q<50-MD8?^#F_(`tm$x#0
z(MtTT>8`}@mQLVa96y>d*gcVxz0$q7pO{XhOv%8G>?=E&_<hrTDOvK+f;>#6u4zcc
zP)o%qkA@8OXvk<wMJuBrM`Jf66+2og^sUSPpl5VqG{ZLZK<nu<Y)QvjPR_KPeAsew
zrsd?rmXk%6ld~)*XIoCrvYec4IXTmE@*&H~d6tt8Sx(NgMV`XWbBpob<UO2Y&3%ro
z^Eg}QS+>qQ+d7Z8MqgxEnrB%$)Up)x`a;|8IhLq}w&0^ISBdTT!IrMWEM13Nx>8Hm
z5w`C;S@$or?w@bnztFmWzNK!V<?TrO0Koz*wA3AD3$V~$!Dvg}VYUNDS@srM_Kvon
zP-zJ~%+}x-TZ4tR2J>wVj<q#dXlpRv)?lHn!F<c-ahA_2+k}Od%n?ZDEofrdhlR-J
zckv%?LrP~`N{_dE*4PiJwS1mn`K+^i&b9S8(UN(*CG(_gWKO=y2P~f_+heJ>$I@U+
z@<CgY1(wxQkkSW{oZlzEM>ZZx9>RXgw#>7{9%_l5XWO#SeolW&>_S_Z!)##=x2zsv
z&u4(`%tG6l`L;6)ZD)?NojKQXd!+5mLd)u5meqxp(!*?Lj<S3nZ4YXoJ*YvpImg)M
z9BZ4i(B9NY%j!b=RAX#^&c#Enj}Eci9%i{c%~t3zds(|!hL5)lH{0Xd!FK5++ocmM
zv2*Qx4Yu5#YU^|gW62YcC`s&zmd}$clPB3meZbOqvc0t-_SS~lUVYH^YJq*WVV2KR
z?YRxN?fQVFRBI}Zi%z%gI>}yKtG&2s_TqN67q^?exc%(K?Qbvc0DEz}+l%uYJD!`o
zxIOH}?P)J=FMDwl?ZxeFFK&{(xP9!!O|}<zkiEEl?ZwT+hfq%-Mq|`i1B6~du#`!e
zrA)G(fX4UI<YURlP@oAtHJ!0_O=4Y>TFX?}U$3;kUS;i2ZGXMS8ll#@KzrkU0lTzk
zvM082BH#S&$4ITdJv}*@3@=Verl9YqCR4GK`|~Z~fsEcx$48$Lz5<-g#IhZj9EdfW
zmCVAL%}!=xg$_;*#z&u%%)xdYmK=udIy^ZXYj#v}6c*{Y<TzxEQ4M_b4<;YPQk}xL
zr*}%`CG)TtjBsFQ79<O>0P?DLHa*6h9=n(x?8k~%y{qZ5TMv5dVS4OodhBI-Of)_A
zHa#Yp9{ZRclTD9(O^+$2$5hi}8aUm@+PcYly1(^wY(3rIdO9|h23SuIw4NShDh;%r
z9%Mb;-+Fqe_4Hut>7mxsgRPr~ST_$bJqIMaB)eckH4<FSNbv69l%6l1pT>hzj|bO!
zJh;x|!S$v}Go!-n&YSF)>_-}n4Of^F70E%#LD2G$<Pf|@jaXDOPJ9I6G08DdSK}5n
ziAIa76ULW_5jRyaT6`Myp3ZnilAMv8flqv9!p^_RB6zc2V@;HQZgL(ae>nLtCDYf2
zOD<&0qsE*_-<I)$$(%zOIoOY}2aRg}kNbie=Y-=lmOjiFtThJfz~BVn*0@cB@z~FJ
zY&0I5jK}`QV1qH(&lntF+zmAD1{rs?#$9cqF`s5*a0g>>urXN6c>9UO3y(V(k3)>d
zI`DWpwQF>!!PsmxHk*vi{>J72V{@RfIf$`~^TGH>7)NUMIMQH7F)pG^W<ZdtOOi_%
zvrXV1;rFm;3g=);{Sf2&aLfJ(%l=4n?orkNJDLVZn}7E={~m4r-QWCsjQRIi^Y3xy
z-($_c$C-bRHvb-P{yo9`d%XGg1ZxuQBriWhJ^xYmE%viM8Et*Clll6X=v$m)OrgU}
zp~KDTN0?3rm`-!e>C>%$hMP_^tc7AzYmRl%K-26HYox@KJJJ$xg!NKtDjs1f&ajRe
zWLnO&rs6y9XsQb4n`XkZ(o{38sj5urL#?l>t*>gVuXZr)4>au$FzpYp)~Yq_XPNc~
znf3>m_R~!JS=M8GyB$4NZ$6l9ZPs9I*3a6k(VQ{Y5;omDF~>Y{h<V~j^TbT^#G&Si
z1I-gnma~K5iI1X(C2a?pGls$$7o(G917@2)*w-3u$-dQ$L5#Du+}YZ4ytU;n)|Tvd
zot}c`)ELBW9)sB3+H!)m<sR0Sds<uWWo<dp+H!Ae%SqOj`;=+RV7(^8mzs~ECmg-c
znRo^$Wo~9vRKfhr=%~{3Kvf=*t!A!f7k2J#ja#Ey=4^IjXL-#G)ia{FSJdG7p?;nj
zYV^!d6C;I>QhvhNT7O?90V$lP_qe5J!dzRWIlam}US+<nHD6bouWQZM)#mFe>)&i-
zjj_z#fmk{uO@<{S;S_0-nEG~S)TH}NndZnU7%82|$d_cW$}(7O>8r8y)mrZAY<cT#
zc^fP*{cL#~EiX;XVtt0O*DE-8x775v)C^!IYJN13*{B84AXbuWMi(&E5ba>f4mM?n
zn6g7n*<q&aa8q`KDLc}X-O-d~KXd$&QKsx@Q+6j)c8n=I)|4G*%I<8+jyGj@u^nu+
z9o!Wx%%{B-j45kXam*NBHE}hZF=KqS+}CjqW$d#anly06j6(P0UhA1FOtDHRH;@q}
zjY|(_WO@g34dIN*H<XxRoP)Uz=efrIM=)N!BXOfRtH?JRDrh#Knz8G#)T~*x8pf`7
z<@s)$wTxZwMa<ruHP~%>aMqG_jAQRhK5<IDIi&&nv_H^k&TR+tOQZRv(b}-dT+`oN
zGr(Na-&`}mT+?W6IK<kp#oBO)wPB07X`rq7z(_N7W32m{n5ny;_Wd?mP0OEUrb25d
zJGg&4>I4IukrY;X#Bg>zAa0J*c!zi>Ygb0ZBckEVAhjYp;>}9N+V>!4&v;Tan)$LR
z+)s<A5$+eCK;F6WN!))RJ~bK~&x3o0ntMhwQ+5Wsk1vWp6^)25i$5I=i$4>8KB|hZ
zim#4FG6(W4_VNFAd@GXpQ|1qAnEm*DG>SD${}t`z`L9~$x!xrH?YJ`v^VN0CiVVd|
zla$n3N*a=J$$0RYFg6qTqY8>8=91L>p}Em|o{2N6NU2>_8ab=YA2sHWD&`;ukXl?)
zXD+EWm(;@*gEL;KGOsk4SNfS(8qF!Od8Ns`(%-x?z`QchyfTQnj&X36W|4L<-wZb2
z3^CsfMfP^5#0i|k%|j#1LnER|oFmIPsl}W$%A7RXoV1fUX^c53^ySBylg62ob~Y!C
zHz)04P8x4c+QpnS&YaY0PTJL+)M`%J)pNcRJ<c`JoV1rYX=ga;H*og-oONZKRAEj^
z;iS#9N1C@DenRS)qv?-66<1Z7tE!lV9S*(4TUGGZc<8zdyj8{5bQt-AxAsH}OaJc1
z%*90RHA`Oyw@oA0e(@occ4&MQv-C&D$8&!IoL6DaYcS{aGq*LyXY!?p1fIJPKE5bk
z%uI-8++y=zlliZ|`ELOH_f7QN&2Zrk=E6aq|8HhK?jB;a3Sb0l>3#uEi!X<mFGra#
zhcb8cFx<@C3VhFeH=$Mvj9?b&)o2f|7Z|~8(wmgCG46oZOB~z+2RG8^XiA!+Jw2~C
z%G?}QV(esY9s|c+X`Od~d0INYig9*nzNt__UyzXIn`+HB(fmEl{5{3|J<a@mi23_q
z^Y=LO_aWx*gUsJ^%->VZ-&!p&gfgWI=a|0_G=J}H{+^!MAZf&%nZ?r^nbM2n&FhoQ
z>${lOXPCcdn7{WifA43Wo?)JzVQvoId8@g3w(VD9o}O$gwu3o)S9A7mwrIm`(MFle
zceh<jtu-f@*C&|Q_b{*TX<pyUyuPP-eJ}I+1oQg7=Ji?T^?l9jv-lp-#b`>+B#pIw
z9BqHH!rFAEwdqXT%1YbE!M2Z8mWMs8StnYv9$<NxV$FJh<zcEd>lAC&sg{9hmVqgj
zfkP|<bF5zvwtgLl3`}6oSXy?Dwd_IGvU99u=UB^5HLuSxuODbFJJDM9AoKm+*0R&h
z<vW|p$D7M1S<CKX{+?kiJHy<(kGXlaxp_Zp*%{{1{q2RcTFcHhUrx4`-PL@#n|**G
z_5rHx1Ju|D7-1h^sC|Hu_5o_`1Mtn5bROd-@&W4Y12otN=w~0G(LO+veSrS<0S4Fy
z7-%1$#Xi6w`vAkRQoQLDf2HQ?sAA5cM`LZyy6ln*qN6`_$vGd1?z-U2#TPOcUqPCv
zP=Grl<fIY)9tmCdzz!e4>aZhNfAm56g6F^om$GW{Z=-9Fo_O|Qb4SB@AzzGSH6al@
zqOtdcL#MOi<;duS=oI=c=fXLQ(TG<<f2EcOQHyL1K^}I7*Y|>#XCOUCMRTK5;Z2Q)
zejH2udDcaiAWNxp08%FDnF!y{M5>R5&*#x2(#pzD;FDd&sy!_7F~=P}I+{86xMMUA
z7T}X58;E?4M$YyI>H}GecntC}pE<S<!^@w<m-|9=Z3dq#-XP?7CuZ4q$C~WN%9+EW
zW054S=R6;-|5WtZ=<0}le%&6~MtMJDklzW&>i(?#Ih?gMCnIlXBSV)U3!jU=7=0!B
z>X~O=usB`d@N9<{I9%-T(+;n4c<otdee~k=YYuO6c&o!Z9p2^e=MI;jec?qPO&@aj
zsKZqbpLMv#;W~%w&%NZ#v(gTS?<=gRa@go_u)`LI<1hH|ht90n)8S-?`#YTF@KA?G
zJDhvLg&+TD#VHO?cX+nL^BrF7@DmO{eZfU%T~KkQ!)qLVg{+rUe9hrE9Ddv3Z4U2r
z_#=n+T*Rf~mkyUZ{GG#x9X{dk8Ha5bU2^t?6)!t{&EZCe?<%Z}99B7OxD;Ac4s<xw
zVT;3Y4tH}n(czR!KYZc2mD3&0c6hkMV;!F4aGt|6F1>W(-j(M%yujfl4nO7a3WrxY
z{CmPlmDf4E!Qo8~Z*lm2hd*?97vVmYOC8?p@P3C6IegUNDu>S!POe<zaGk^T4m%uf
zR#=rdtRdXDs?lMy!{H7`I~?zDg2PFKQ>vypoau0m!y_FY@9<=Y3oiZmqD!k5IXutd
zg$@@xyxigE9A16t$1lFL>RN}_JG{~1%?@vMc)P<Tm!EUVMOAk@{JF#X96sQ1g~P`j
zK85b08)$vE{a3BEQU2|_su!giw;m>VAzE>`z1J8msT#H=^xIBoZ>8UID6OhKvclA1
z%{GVqoN`-2tqhCt!nPg`cA9Mo>z#5dVSG9D_Q!)&h&M}kp2I~B7dSlGq1MI>h>vx6
zxWm~Fr#qbDP;31M#CsABjP+Hrf$<oJ8eJF|4|dq!Ay$zX^{xlStl7kdY<Ae;aJ|EI
z4%awrBW#YIarlJ8haLXT;c|z+bog_^9iqD(E^&Cf!&@ER?C?g1!ghnPv@M}llEzrp
zt%rK6ImX6sC6v1n6VU!BhPPsPEw03$*dI^gNG$w3EbjSO#7|?buZ_MI-4xv#-5K4*
zO7!KdR(lL=tclv`Z*Pt(SdS@8tDsGRPb)-C{zuPe*O#(udv+Ce^}HQ<L)w^>@mqO-
zr1f?@!CMU1nc4OD?7AqsiffealI(hMcFk&zZ_EDwFuUHFT}2P&`+j!4&Av;VjLEJO
z3{eg9mrI!Oe~j6^P0W*vhsc#?rKGn<NxFjG*{Q5Q>x>KhySMCLoQfNgbUm_rHU31B
zzJ_<$%exqOTPdZ!%<nao&u_S6z*qWAF^2bPnYr&Rf0FXG3jEHVZ*(NU*jJwG`pol*
zKAyy^ooWE4bJ_7IPA{fiNqPxhWF<X==b-W*S+)EE9PuJv>RMKez7nmA{seVjjb4jh
zXZ`X9)-S&qZDgKcA#>nb&y(Oc<G;~s7#t7Lm`pmHQscB4EX3*23KM#@q&pNZP@dj&
ze6{VWEiaq3x}o0i=FSz&o?ppK`PIygf0<eDuQ99r4d$+IW}f<1=A`dr=J_t>n(t+v
z7)V)56sL25MEatFUXfPN#_2TZ)PN6t3UPIKvxB3NDbIK#`<H}w!VgLMgLE0;zZ?32
z*eu>qVqIy%8q;4n&99y2KEfr?F-d<^R@N{0|Gji6;hpKv2!D|N+$rD}R-MGGDhd2D
zLj2;G6=g9zW2IHh8!O@|rBTei{G^piF?SIotrTKnRs_Z=?@X3rcr!&bDUU(JvXUf^
zNz!jXneF6*zanLBgdW0w0yQ*7Hl03--jQY=C%p>I-cKuOd5`;v^vCHRc!&MT^r`e|
zzGb|cx3Hf}pHKgowxutSqk>hnXT<MF9WtBx307oWo~>#9JnJdG$f^mw=XC?C9{wfK
zyI%jw8iqSqsqkagCM;uJ!5Z=<&`-Ull>XQOU}z@2m)QO5I<7I&E)JhdUr`<gGL@d=
zyQE8cWQ$(RVLXu@Rz5vHjIfIG<r8SMGxp5eP|tu3^Xih}UePdu^pzf$8W;~^Y>NEx
ze8L0CS?_Xw%iG%zM!)0zgNJzkU<E6^A7-WZqtQyV`s2KX@CV+zelmKBHxZtRR@1k4
zIq`hzJDqyAA2Y18Fm`0W@MF^3d8b}nSb;=&C9hyaO4QPN-`_)9#r;2Fx<D(jkvGl|
z_UCQ}J-#vYe79?j^%mDjuVjp?uXWOxr_x$!L-r#iH9%&XGmCW^1U;X*qoG<A%?!L|
z5?cf*t6Rcbfp?Uxe*Q_e{&{I}1@tmjtlY<XmF0TBjJ41YXjNJAdscA_VeQpOR$Gl>
zwMKaBZx2>f?Zrwet&g6<nhd@5cM!V~9FiW&8VtQ%#~LZtN5#lO1-$bA47C$;n|M}Z
z)7n`I%BBAfozqnKt4QzRO_@s5S3W?{C%W?9c9hUL{ZMw_|I%>J7)I3pU`9nIj6Rz2
VkO`yz&)k7yBj|jf8c=D*002BjV;}$k

literal 0
HcmV?d00001

diff --git a/assets/fonts/plex-mono/license.txt b/assets/fonts/ibm-plex-sans/license.txt
similarity index 100%
rename from assets/fonts/plex-mono/license.txt
rename to assets/fonts/ibm-plex-sans/license.txt
diff --git a/assets/fonts/lilex/Lilex-Bold.ttf b/assets/fonts/lilex/Lilex-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..45930ee30b81a78e964c3ff494e05ea45147ed9b
GIT binary patch
literal 192992
zcmcG131C#!)&IF~nVIbCB!Nl7OeT9KA$tNzV6w3#!2kggMMzi#H7o)uDr!`$h^VL(
zQBl#_mMU!rL_|bIMMX<nY-y#RSP`kEEmmx4>jIPi@7y<UGC{Ckzwi48e|h(vd+xpG
zo_p@O>x(3aC;`7TDjwU^Jm$%(pWH#peX&GJ>Dcy*rgVJo%M+wL&_txikDW5Lq3+Ws
zZy{x4C(&5%MN@{CX4s>yClb4mOZS|GJxeOT`*1i>@>Zho*XCTa+?g<;XaiA6H{ySB
z*^>DSXAjr=h%%NCMMuu>S%xRYqC6X(w)wr+UH0Me@OGkc9i*tI7tHIK>)d?ngUG)Y
z@s$fepv_^|;C(sXGZ!pez9Q|~9VZ}b3Xy$%@8UT<dh{QU6O|SdC1oz`S+T@6JMIDS
zZv?+{QP0A8XNQEHA*FR3k#*IQ#mkm&9}-qZ%9H~{bu~+t&ReqP{g)bvidTaFqiaxJ
z_`l)~k@6v@&%6fZUG(HHe0bkO6rVw?JLRGGU#OejG%Kd|9~7fP7NVoxKV|Uq_@giW
z?8{dFLbYAH3A`3kWD1A_bqoKeNZk2lYrj=(H_~w$<412`9(}d=g7RqvMIz-Ekw|wV
z>4NA;<RnN_I+Z=7Bac1G8l+llJjDkzSD^L^QJ9g}6QuOVid|ph&B>IB7fo!Y&E)Jq
zYsjG8B%X1Sc>KfnkV;c_OFmucBqzYn{{a18{)hZ$l+J#D+JL+ZzzaGfJb-pQF94a>
z1>(Mu#u3QJjpw<j1I+@Y0vv7u$^%ah|96oMUK33SGiICzF3@rSF6(??SuX&o^9#gX
zD9s>x0`g{X9<1Zm0QlVuo6ljOoexEzr<?~>p#A?u81j!e515V~@~tRFd?>hm{{!@Y
z{-5y&WvM~B+6#bffc4JLT%h#A=>O`%apz6Pb~XGws0WSpm4?3fHl8#82jDtgd=5BY
z6Q=E(&kDqGI6Z_1-Z02-rpp8E0+4opfw&8$8AMM;-VDwo65u*8SoagoK?&Z^hmoMO
zUh~g`^Y!EZOB&mW^*rD@nSJ^~&j#>>g6sSrp#Ri=#(&<t*%rCYxi8!ZTnq46!@i!!
zgDcMg`%%^(_xDgAui%~IszPAuncJ1?#qX>yezGs)HfMho8vuvHfGmK08T)+(^Ru0D
z7_!Ong~RLv%`w9q3s?r0pW~f@a5SDQAD4~%`@g`G`PlxMkLw};)&;*axO}FYGHM7j
zRKNxd0nECX?awlBIb6OeC+mp$O#LJwZ0d;V472|H%mTQ4mYM6#d9hyX0Q<#afb+cm
z98}|-`wNd9q5g{VDFax4CdMMnU|E=#>0D2K)&RA@2*9*kt}EL!m%*~LzZeQI|Fpn+
z44!O99LIf>^WePT$NFdE$$p93mg5TpVYUmFkIQB~aC(-N>&<*zKG)wY(|od?Oc^;H
zgXQCP;rej-?7I>JU^%%Qb6n97Hg#m`hvS%!!SXQ7`ty_P&N8tbn_wM{3%r~4VA)Nu
z3@jTzIW6natQ+fZG{Ab}xD0^nYWBHIgt?u$y*Ul%!}i7UF(1po^pOC^ahUs*2S@?5
zz>{^(`UX$`XTT=lPT(=%S)dE}DdIVAPQ&$JxmZ4~Ukxx1VBJ;%>|>h&?mt{FZVQfQ
zeX+iopXDe3SZDmsd2)SN4z^Fu!vx2h;5;~<`I*LLn!0u%%zd59<@&KMIS+m>12}*7
z2h3;kavm%*zq4%I-&sFQ=d_&0^dHa*eHVBV*bF=Yd=GdE*cu2!XY}9Y6VPkF0ro8%
z4t+|0a}M3)85Fk`=^g+!0BeA|f%|~<!1n{sb$I@F`M8h$kHD)I{t2Xi9nYr$egghZ
z;0gfx^+QI#8+cXeJo7McxdDFngZIor0QTme1MCEL;C-6XdG>_T`Sm?`ei?!f5q=x=
z`|<oe@FuVgI39TZ66s+#XWsz!B0L5_-}W~l&*4Z1S^EEJfOTYs&8Hj>%y=*IKpQjs
zHx2NzuQ~gPAzRR=gaztu>VThVz&inOe;f~>z69B2ALleoW26J7E-&<iK51=0=a512
zn@?_UhWXBU`~*P#gKL}T5xx{SH-DBD?L;nM6u>tB3c&q>edmt>v<qDa{26-q1)g5$
z;3eqgZ3F$o@QyzC6}R!rpds$;pYTMzzWy1)uy<}t*1y@Vezc`O7c|6u*@|!+!bkAT
zLLPS^uZ!>u!@Cvq7Y5?{Ey&|6-qBw<tv?k{*#6fyA&hbH41B+T5)g$j+TE{#A9WA5
z@uzry%zz(#DHuk759Kk#{A9hD?}T;;hNljsKl`tcFzO!U=?Dp<o@RMx{}vK{3vxmq
z{iyHRzaVVZ`2fQ3`9XW*whITcfoOpJSUte>s{z!RmH_Vn7XzrPL>-<^fS>Hkp=-I8
zhA!ok`Ph$gJ|@}_&I8z{_*n#?J*7<*;)y;jeQ5%oY$xoSp?m3zxh%A!Ov7Utr)3-C
zGT4uE8JsWkahUss0H9|Hwp%mIPw06Nn1=S3JOy~NPmcg#3o^`coc~B524MMFPYPg`
z*N8CeL*~Q$OurCVZ>%%UpP&4m4{%-h$?2G8rssNA0_HOvVFub&LdTQakM*wsoDYNb
z$1wBxUpxi$twb4lark_BhSK{_!2XT^Y&)zkwlUThKe=uB$v~V;7kC%21%`}+e)@lJ
zfZiMkGmYOvX%`AhUdTc$ParSzDZ;-=m$Vjx9-1aJEc0YLMV^x1b$))14^0;uHf1>9
zlk;S{%saHrAQ#ijc#|hI51v<=JnVym;gI^9G&5ajekScg&rm&^Jm=OklpdOQXgD;V
zP`!lma9E%pGw52P{s!QOz!ktQU@9;w1ic6|&wOAtuuV=XsQ)&Ee+p~{?g#RLI{+{A
z+(5sk4RoAtp)2ISUfM{D=mC0}reR-p(K)e3TrVxBJLv<ujJ}7h*TY6BRNh}1_~-3!
z_W!)!+uzV%kKgtE^>i`K#J>r&KFHJ1KL$Jv{Z0L&!2>Q@?_ZCcu&qlfkci*B`<zHx
z_)qZsEA?Slco7Y!5p<KdS==k`7f%SEI3oTc`W1&#rF3C`_$}oFRZ}C?c-5{tRJWR|
z-lVQk*Q)E(C)6LQKJ{(&7urzGt&P+gwOQI6?Mm%x?KSOp+Ml#9^{nX8>3Qk5r$3hd
zrBii=JMGS)&U9ynGuxTxEOwSTM>?CFvz$wu*E#QWKH+@I`2*)qoZFqxId?l>a=zk9
za3#4iT-mN7*Cf|W*F&zSUC+9ncfIJ^=Xx_k$*^R^WW;CKGlpiQXB1>qW{k_|&Y0)+
zXRXhAJnLs!hqB(w`Y`LWoP?a#g1CatVmkWd(P#V5_V=USPAaC6v{}}7v-qj_x%jjA
zN=cFReNlN+IjoXu3D!3o^<9Pf-lN{9eouW`-KM^yk>=1cwHmESo2^};E!Ea(ztoOs
zf7LTl-`w;*)OWL!oSHM%nc_@!I#J(T=Wu7Kb3~xN%bk6J`fhP<bMA2NI;Xzvt|_i{
zt{=I4uAQ#kA@z+zeTRh9cdq;EEXw+B);n3h%=&HCkwAT;Wqmgv^%?b5V4p<(A1N{X
zG=KcR^*;>L=ri7xY$a0}1|1~z{|Htb0scSx|AgOv;rO#SjX8V7;0*o!k2(DI5zZut
zK2GA_{PS`1F`OHGeE8$J$DTg+`mu-cukYg<Kfd+jTa9?cE&O=Ku`~Gh$;a+v9~;zT
zuN>QbY!9&g*tTP>$C{4e^yXLwkasNYSn5Y#fAoRD_xpeG^Y=gd{r=zo_{gV6p8H+*
z;g^1$mHA5McFh6n{wq#9!iB7{+Nw^(Daj&riHg%EbOD^ts4La)sQ2)j`NMDOMt<Yp
z>XYiz_>H=17OhqrrFpe6+SA(0+F=bjYk$>F;rAChc=Vs>yYxN!UQTKJ=1}MlICg{M
z<xm=Ucj!BHoE)9|!?aMkzE6LX-z|T$oIaP=d{-0IUiEQxnda2mHC5fL-UT~ds#U8C
z)IN2-x?H_ny+Rw!^-vdSe2(OxRLY=i^!Jf8ni^>mb-*Xhpi5~E-2`uN3*C+x{C)Hz
zdYXPpKH8<;t6r_H)5fT)^+wu5zoqx!qdub3^bh)q{324siUcu43>7X>D@KXYqEWPn
zcCkQQE*6Q!;#&1?EmFNlYliPwsHJH|+AytDi_&zxUbBct)JL=?^%l*lw`yTp1AI)B
z-lScmY3dTaO^pzn)J@9Yl+TpEtBWZfUM!qaaPF5xLueS4Q4UVIim8>FX&jBGEb5`f
zG?(VnN?NFmr0Z!D-A~_zAKpeci}CbxdWqhE=lvPIONZ#cU?<1u5A+vd5hPTh(NQr>
z6p9RyB}R$@twvOfOT;A6A*PBYqE0M@&-^94=gVZLgOo;x;X~dh7agH=`W?CH_moK=
zQU#r&T>6+w=p<Fr=ah#rpqBncHS|v!MPE`KeL)R$mb~;ewTp0?C~P!F2)amw!H@S-
zlZc=xB8H}lI1x|Nady`wlBiSI>0*&gmxvUaDIC--(rK1R6R9*?IBA8bq<O+k*NO_d
zQPj|_!b__}1KlR-={ur{?i6EbwHQNph-SK1Or(268{I8haWXiczAxs|17b4$P+Ue&
zi8=HGF^{&2D`~s9ik_tx#0q**Tu-~jbz%ZtC5F>u;!>Os?xV3nq02-jtrt`1VbMho
zifOb_Os9tg)?lKFlId48lzu}uh!M0#jH7kpB7LTQsXk6`&?o2<^%lKZFVctWC3=Nk
zsh8=6x<{|l%k^TtRL|23ln2yoWxeuUWrMO&c}RI)d02Twc}aO$c}00n*{$qUUQk|C
zb}4(r7V#r-5F^%p@s@Z;{7f7WZ-_VH&3)o0Vz+ozJSrX&kBiOX2jYj~Y4MEMDt-)a
z|DxC<UKTHjSHxbiPrNQ(6K{)Oh+itIqA9v!Q6e!XjaA~5cqKuxD=sAip3$vj!9(UN
zc}lJ_Tq##7lxQVJsZ^{=ky5A>D<w*)QlNO0G9^h#RGdnVcvq<szf!8juayzvkTOy{
zso2C*O1SvG5+Q!0)QI0Iwc<UcP8?Q7iQg%s#eXSY@xD?ojwlV{1EooPs5FbC${6vH
zGFBW@#)*%W@#45LLHt2!5uYfn;*Uz3IH61we^M?Ie^%NtVxLqdE0e^h$`tWer9*tC
zOcke;Y2tHby1+V4{9Wl1r<IGvKa@+vKb0BcU&^K83uUJGQkjLZuUmYr^oTRcZ1FuM
zOq^Bbh~F!XR8ME<Ct@KzBd(wyi(ZPO1C&6&pa^=CqG&%w)7un7@8G2QE!+fn1#^j4
z$x5%0jb6tY^Ij^YPpO<fqbm9v70@SCNGGU>{)G9)pUFdiq&8ut7NOH3;h`m>h!%)!
zx<cgAl_HONMLu0Fa%d^erI(9Rx>}UcHKLrBi4uB5TuhIO8T7cANl%DwdQ$Yz_rz?B
z=(FfKobvAw%V?*#nw}Tes440YHAzi|*S`a!_^s+~>h0=7>ci@H)d$s$>IN-Zi&d{u
zUD_nAKr7J-HJ6s5WogA)9%eL|TB<f&^JqEBS4zKfO8Hzlt^7mzr}8i53*}4YYvqh`
zR`F|dwV7Hs<^h*!^R;=H0rg-G)T)ipDz!GP9^*%XmZ&9Z$=ctv16n`kMPF#Y(!SJw
zt^EUYhJR`Ywa>M^+HUP<+9`}OyR>&Szdl4yz<6_3PuAnK-|C8<rN?V8>KWRrdWv>L
z7kZ{1tG%GRv{&>b?S1Vt?f1H-y`(*_TeXk0x3x3chq|uY^%&iz9n*fJlXg_M=x#k)
z+oL<R<9fLEfv#$=>4|!n_ObR~+DYwA?NjY7ZL8+f-q3bx&uII!=d`EwR6R=jsqWAt
zwV&v@`Y`QTJx5R1wrj6zJG39^L-h#l$9lG&rft(c(f*+QQ9GgiMf)>meSg=!(*A{!
z^5@zi?OkoZc3S&d`-S$NcB^*1c7wK3yHUGIyIJegZqe3gcWSG(JGAd;w`;4kyR-+j
zjoL%nZQ2&?5$$2^QSCA9ac#5qJ;Ffbar$U#XLFa+*|LkGC$;!2Q!eiGl{<X7UEP;C
z*G%p7DOo))*kF2d=D24&TrMAV`KZy|v>l^fV|PQLPk4OJ?#l{&ipTA8y9#}($2s>|
zHPKEDjlP6NXLonQHYKsKVOy5k=u;XyRyci;ZUh>8=K8eu726d>K{h_uyi^xcw@2GW
zL#h)&cf<Ask$^b2kJ>xub!|@)%vtEuJU+F+XK(D}@_b2+jR6LSbFS03x80{@U%Wk6
zL^U?gY4%x~J6%3Ct84NlonUsX>2&(q+d=YnIh?*~4pnz`Iky?ykSG_Vz?;)o%<;v{
zxwpO332m(Dar(mBJG((~a$GovDmhfy?db06>T*C^zR1QoKAPO=qZVd%;oZ^VOXpB}
zOV6%Yn!_Bsbei4OHMghBCknc{0yXGz&P9FP4PAvk-Q#R_`n0Sb)XCb|-s!Wt8+<l*
z16lw{x(j_4scvY(Id_|Nc7u~6xw;NReE#jTbT`lO>G>{1Hagch*PyIz#d;PrG^w+@
z-O)3-tJB@(>T>$LQ#ujnV7&xHDfC%AzOcrE?U)`&t=sVGZg9g~+zmZGW%gx0F$aS9
ztoen$Fpra^jYhRJnhh4n>+SAhmhL7gZMbK9STr>@H{`p5h7;i#Y)FwtE}{S;G@|O=
z&gM1l9&S{rY;tge_?!+1X-bKvb@wzGMMPa7xi1r`kT_Vi&_vN}|L%roqasOdMiV*Q
zuC9C-ag1l1qBQ&F_B0jxVm+vW)9H(8oWM0h04?N;<+sUri<Rvahm2ySQk>Ai90=}<
zYwUKe>2~_!pteF^yr-q3bDK7|sVmbLHP5}G(3jw8nbg@b#UMIdpeIOrqGub$H%{%`
z79Zc}6Fm*SxB~8SFs+7dG5jkQzkDJIZJ}nhcW&c;2z52AK?|eU*nF28$;>e9f#W#|
zdNRj$p(bM?|5#85H`WE35KHp}H<aAyqfy(15Yis(9!vn0=8jHZyt~2K?2Cr^MY&;e
z4bJZ8Q&I#5wFGKtXkZN_B2M&dOSBdE?kaF(z`T=CM|(k`FWIwA@G}Ma=I0R4HkF@4
zJ=-*XIy~ESex`c1S@@ae*=FTux@Vh>pTj)c!uVO>fi?{NLj-8r?JV+%OS!ic`aB_#
zNx{ggjL5=}$n0R`QX|soAzw_v1?!1QJ!e#v>ls=<7wYGPTp6ezKi#MwKQmE3erBP5
z{LDuE_?d(H@iQ0o<7Xb~$IpD!kDo;zXRYi=!#&P!UrM(VPET~RP4wXDD`J~1_V|Vu
z_=clDmY^$)g~gt?L%Msa-R#)El>_Ej=qojwcw4lknJvy&lD|zC_U2AFMQ+8i5cOP$
zr`+SLkdjv*HzS|sZ@LM1pYuw~bV}Mm{L?hbUA?Vb*txEi&<84T-Zb6lEIrkQzA8^q
za&4in`rom_u;+k%1e%DFvYbWEvFs9{+VN}FjCGHN3+lwc2d|3}sagnoA~ZY_zAMR>
z3^on!G)uB=i=+l$L}S6cHAQZxvvv*gtQpMaEHd)*S=<dKx6{|nKE*q!^I6TQI~~tz
z+4|6~2KKb!aM~yz61c~7`z&bf!QB--OB5KRlGfNg*X`3WsKVK4jXe&8ySv~Y&P~$;
z(cu5xV|uC`Zj>+v^~6J#g8a@?2n1o5Y=IL&W9TqAj3DPof*gBzv|=Gt{0?~1fwEvM
zwWcnxZR69k1G;e6LQQqSC|@|7iPJg8J(dgQRvcx<$;ud-_EAS?k+T*9I!mt@L}VIl
z3ZEqlZ{raaoVyr}_)W{}b_ZGup1;sH+AK|KKhRv=Ji$4)%4QRL;XjI4i(`Drjh*cd
zjH%AruA*(lA`$(zeo*XWNBf}IhC#7r+R*&YP0{G_jVuUdFcX;tHhFwC1#4h_Y-4NC
z(=Q|&8nnn)3=x}UmD!B54bAspg4SSEoz2;eo>qjOXH;m6XInVN8n%9E`Tv<ok3FA(
z{ZFiz_04{))?Mvzh1iR$D<J1sIN*^5rdGz`t){@mZN_>D)F!Bc@lb)?==PYMpob?E
z`6|)NCtQHug6u?Mg0BiZtsdV9Jla@`%}}><3<hCSTN6EO(7raP`6ADDqA>`xBOo|1
z$+KNZ%47s2WeW3*MN|j#a9}F)a9|qqaA3OUS@^<6ggOzz*p5(_=UHq&bLe7(4B92k
zCzv*a`DEx)=98hB%qK&$xXfm-b#s{<=;1OsFq_Ndz#QfohrnFs;lMoR;lO3g!-4ry
zt|o*QNVzz4xs;1TS4g=ybfuJwL%mWi4lR^&acGg0i$jZ{<Jw>YE|G6OFCwlog7pY4
zWu-HluK{n%FxDc-Jj;zB^IR=?ID&buLE^e#uGh*pnPP<z<P_H#L1w=m`P3O%-e3fo
zVWkmdh8w{<Dwy9*@=fM<vk_$WJ|oENw;<&xBfndXAT!)%1eswKct;2GyIsD?{JvuZ
znf(qU$n2|;a<q}(okoxu))+x%xXZIWLe6Y`7RPo?QJb-7!dTYTP~fx8^QoEbE6f4C
zkgx#UKN-_WaSz5iW68H<8(ABkCu*%L&$LiJzj>o)S*BR(Z6mZio5N}e4-n_!NMpRE
zPARcu=#m)K@Jb3c^<w*?`@;LI*lwi=uqHITg8hrV<PH2|>I<Y|aNm|GR!_pRVRa|J
z&u!Y4%kR5vWDuyS%dstoNxN-*BsA~pIUSM{5&Ywgo})}x8Z9+SfhA41MCb1k{kQwH
zyD_FWJ*&^PP*W4nA^!89hv*@k<SgQw_=<)d{A%UR{?kfq|LOi}#0<n84~ab$h`*Aq
zq&D2-dQ-GAF3A6x<o96jcqA>sj_U~g>!4KZ7LvHO|EqK9%5E`U*((}@mFYmp2kZxq
z0$(6q3V<&UuuDjy8(0CX1GWI*6X3)545Y*Yxquhw1eO4+u~Y8>pfYs^upE2y$V(ds
zoWgE8^3vA<Tkze64R8Y0z$O55HCr!$GXdLS0Q_O#2?I|Uc*5F&CBSN6Gq4Ld2%Nw-
zDg>ke#lSe=6j6i?*aDm(iUeOI_@clU1->ZoMfKs^733S;4lDrn5XF=Ot-xFWa>T3$
zwgUTrBfx2V<`M~H0-(i$7B>#)237zlCl2MrBR;+s=m2_wb-+n1hVY)S1=tH522SDV
z&jvu2#54HzB@yrdO~4FbIj|ns3ZOhY%Cn!wH!+d?T?~LSl947EX_Ap98EKM{CV4IJ
z6tD+4M3k}#*Z~|M8qx_Muc4^>P{`|O2NnR3!LgAjbsT{Dq^=-J&jq{y(hLLtFz^gJ
z4xAx!r2^%^W?&b9yj&*;hZ#T$Pz)fijBa2BunyP)>?Lx8?grfrx*K#i=x(MT22SA<
zovi?5%sfJrg}P;J26h1lffIz|5}+5@3m{E4(&X3xCr}Nv0}FsX0P3G}k|<Xr%8LbZ
z0WZ)AtN_*lTL9#hhrIHTS3dH}2VXw;^1+wC1XvAh26h1lffGa?<mrJPJkW!um8ftF
zfP9KJ5)F3()j&JGLxS#$4*<vU4He=`QMa=FMCAxq%mr2g>w&ER;wn(@iZl3BDiQDi
zO~4FbIj|OZ3fKc2BC0~ZRmX{{`vAy3axT7sswEnYxX~wxyc*C8d_hzn3zP#$+W>k)
zDuDNfRsiW5Rs!pRt-wCu2qp*MZA4y8>oD4<0Nua}fZw5mF$8n~n}EH*VE}TBO$7Qd
z`qu)e>$syt<JSUD0mySa@|=KtCY&Z}i3BnM@U|eYmR<n7E#PedZwq)^PGU6CfK;HI
zs4Wrj08PLQU^##^ZAjCGG;K&TaTBluI6%~nwC#9K>Lr>yj%bPpK-wutI|XSwGJ#s4
zgJ|k;;0)2UM55^g%moe+b#?+PiMoyer-?3J4QvK>0S5u-;}Y;+k^&S1DCd%HU<Cku
zU9yE}##-PhU=M&iXPhLuR0C3hasaxUX#<=9WSt3~nc$fPo>}0T1)f=(h>$IHqnvJ(
z(~WYvLFh&~-6*FU<@6xF2k||K??L=*q@9hlvs(ewXZ9)p`OMw{8~~03XNcw`0^pki
zzB%BVvl3VjYz6iKM}X5r^JW0cfwjO>MDro@d?!#1v;zx>E<Z(dC1_V7-9qp$MB0TX
zi54Ml5oBHD1NIXwjs!Y^T|`Teb_r-p4g*Mkl?_1IOHtNRq+g1%mw|uTS^(uPF9y5-
z(k<@>HUmCjFL03PY7fu^AkV9j=QZPijlc<_YZ1N{;S~h*0m%D0q`AHuSVD9|EZ_r>
z*9}N}1JbNqKy+g#aFXbzRYW&~=jI(meURlA4cJ3;>q?^AAmeRYiB_SERR@V~F9y~U
zea8c!tUFM~>Qh8_BK}U~cjrE$HC_Pu+?5LK$H#!xz!yY!qx`#($K5B0_^AAz6d)G>
z|2^%%0-%rR-b|nt=m2^F$Z_v_U@L(9?>z#bj_bg`?l94P;J?pDbbmR}MDzg4eP9m&
zp7oIc@?O6YI7#%~6~HON@hyPzHxvU0h#p)AfWFZNIDt*T4x)#u0i=ECIDq^fMi~#I
zjE6gb^}tgA%6jAs(I%9&X$i2G=+RgJ;YSgEtQgou^f=OP_5ufiqeM^i5k2Vy5dY*j
zpc6oyzE?|xZ0RY;@ckLU7eqfm`9DOtKRiveWe3rZyucBnr&kd@gL0oix@YzhZH)!C
z5dHWN(NE_B;Pu&n<-iG|ZR3DFMBA$Ygr7w|J5c_PmB4ynE3gkh`W+{MGeplN0v-V2
zoe1wlcqe4p*#YzdkYVR0U<YsjI0Bp|dOi|3OtfnS(F>sMUQP7ka-uypqL(xP{4eJM
zO915k$}Xb42)_z>UPJv~`-158^+fxsiQY&7HUmCjFK`ez3Y;Pw8UnGv765s?xu57Q
zl<^kQyoLPVf^2VX1@-`tZ$D`Jk>~z#0MfsW^lz^KRuc{#0i=7U7(o0x-2md=SqDJg
zcMcQ%>?F|vAJNZa@fk6Ae}TIFat3gS=pb})5M{hu4S?s}y+prC1r7p7iGE!RfbUQT
zfcM{k?>9*E+e`p5z6bhyr-=?n0-zlR|6$M$_X6NMyb0I=pp3)EfipzEJ4y6k8UXtH
zkm>#PL`UWVDD#7rxYObRo+A1X^*dS)pbke*;C>C_kF^6x|1o4azJllvc>ja|l=H_v
zq7&Uje@X%N68(7zfahNz^IyIoI@t-J{7?7c%2zSbXOX}bqEn!sLV2I30!N7c<^_%u
z{e2a1n&|XFqJJQte}ey?9-tNI1=a#vfdjxvqJKpK9-tNI1=a#vfdjxvO!FfF4}dbh
zMEPH$?5~yphlsvjL3Ab-K%LLd1yHUZ@%;p>#J)iju!XR82ac0ax=E<Dz`_4RoFbtm
z0$!jO*aI9Tq2p<B0!M(;B&;bwH82BM4){peY$U>PGdLV_hW7y*fn6jb%7H_`NfMD7
z@CAveQ~>m-ZeSI#i9|Hg#Oxsvi}zTh!(3h@9LKKB5@0pJ;WH%cki)(X*iX0;0#uVo
zUW?_^0un<~0MLi70FIDw%mDV1Nc93oNu<pMHUb9-S4RNkGYt7VQI_*C2^aEl;h7N$
z6ayW=7bM)hBr-K%7m2Lpz&;Y$i2%yXNdb^=j*kT9y8j-v;6WY|Tk$+jA}<v{S$QZw
z4|(S!pCG`S51s<l$8(58A<`FaIS&wDc$!2}EZ_lV0LZWCDPRw9g2Zsd4bKG-HynAD
zK>o5m66JW7qulbNBq~rg=ER}`^{KQ0PGB90Dm<&INmL_l#B$&OiIHBQ57-DmHzSXd
zs6qOgVgP)#kpR-xB?6GCt`(RItOE9t7=`#z9RSjfMn0prlJFiRQ4ikwEhHM2kZ5ct
z(S&Ey3Btu4U>vXsIF3!ZCSV7Nv5<2t_{TxMaR*3@N1E{`NlaJ(AkP*JK%HB_+nNHb
z1P+mC17F(-5)&cA#KR;m>IIN*J7k%Jye91<G1&>M29V#BRsiuGbAh8Irmi4d_yG_<
zy%sn^qO%-W51`ymr0)cO7xL-??cx;R0EtT?0pv9U`CPh##LQR{v%0bDM?HIbfiom#
zuLJf2C<k*xF=s7+@Z2pVF#i*mrIMHr`ux2l7C?^65x%?$*g@ioRRg#Z`SgO`dxFFw
z@GLq-V(}glSLFhbcPaA2d`>Kn1;BGP^124N7I~~d8P`G1>yYMpABh_l00&8|97p2D
z)xZ}dZrVuV=FR}N;JJ%LUnGDs`}#=Sk_oINaceiQ4nWzrL5|y&1E|lclO!-l6Swap
z@g2~=gFNp*nRh_8)gE98aEQd6<p5}FP~KW1arX@1IEj0Z<{mH54)FW8;9lf$?<NxK
zkbYe+u!jWZV&Xp3<vx^qe;;s^!~=+X;0%fNc&<N8;=8EtcXyE3fU-8M06=@N7TAYB
zjnPWtA<!Q>LgL{_0Q84Xl6Yhzupc;0Vv`d9-zKEp^b~LqK>m;B0y6-V|0wc*6lFh#
zJRYkC<^t=0y#VriJOzLpk1q$d0;fo9M*7X&0Qfc^Ch<fpi64OHnUy4bJ`&pqSW99%
z>bM<go-GFO+<|mE766dtImr9mYTzJ=olXGsohb8p4*>e}$4Tr$c-JQ23lcAM0P9HX
z&ILewF%p0bFCyO;5x>U^^Z|!Ryp#x_9xoxkmu<i}U?TuoUqSj;Rslyz>@5dY0|!XF
z8Vf+CR}uH>J`%5KKsC?{>>%+v@_Zfny?&a+z9!%hi8ly9-ftj}H<0E{q<Ir{eRC~<
zvfgq6h<ob@w$eb~5Bc{WC-FA&eS0HthQvD^z*7M7{aGup12{?IKqjyN*a{%8pChlI
zcLSRNl>G}E&<^-WU`{1|iM)S#l*GX$z$O4`-bI>sk>*{bdG`Q`U*!VJfxRStjqtBm
z0tZPPDh5^oNP~Hn_zlwk<`jwF)&i>m$o!rM0RMY?NMOz-4z~hZ0Py{;2|)VaL9YKw
z1eO5%NW7l{tOZVxIN}A6?-7JQKzSd4{sGGSeI@|;J|v(UKt3O?$F^fC-~o{CXa}$W
zK>0`40Z#$DfCIo$;53Pk#sM<`l>N~W635DcUZ4*^e#gLf416CWkB<)lUywMS3bX?o
z0mT2I1K3OA6VN_6N#c*WBu=CNi2sul*bJN^@#jRK8bJPk-U@*CFP#ALIJq3yLgG{K
zd<y<gA<JKp$6xo7_^g%0DJRekfalav5})J!b1$%m#NWz+10?>AxWAtvae5taoWwtn
z_dk)}KlhRN7ieEJ0f_$+X}^RVU)g|-B)-lBHj_Am^3M23oLvhXCE<rm{{1BSYk@CF
z!3|?YlmiDy!F*0pP7?lZ59m%JrCP-m7qVj0EE`imMI~jvh6}nvosNf!3x0UP4Pniy
zS>xkkb<2=~1Xr9ZE6x??R8r2K5Ig)nHS)~qxk}U7JxEVFeoeuyxD~e+v%PN82$MTn
zfKnUVbX5_e3729iA{-3XxVSh=_>cluj@#-^C`%A-wM;zgd8J_EONU<a|IXI5Zp#*B
z_t`N@p8pFXd`TelR^L^!F-OJ8fj$Ml2k5(k^y#5=ZGM1m)vpsCgTKE*nWCEf**f!E
z^%{;H$S)+_^=3M*o7NS~?}kD2<{*7#C|!LcC>I9tf&A4yK{~#H3DSE)%DvIdN6KsR
zXY0%#B5(hfQm%n|-fX5jN8Y|c^oxS>-V#bz*9GNjH|65;aTD0kd!Xd=w8vzVpUYKW
z5Au&5l>drg{ueVp+f2VlSq7U)g+-3=Rw_c(B4L410-;v2kfvI+1>l4Q!6uv9uryJ6
zU{Mp5i3xFW*_k=9*6_3fSWvWLPfRK+t*lD6xHGb|E6OXYa@=fPY+A1!da0x&HaRBV
z5nkb#<r<OUtx`s_wTT><8XH=A*3ig==-9}zve+zVe)SLy_BYt}J`Kv=$)cM&&~6IS
zzY|JV?+wzsm`+On8T_h6U1M+!>Y5gxtG&~ki%x>OqxyWZ!K!UEKRirPRb`g!Gi0%d
zSymj%qTe{YMd5<u!j_(!gpi>78wt9+@v*V739$+B=xY2E8xcONAd9=3%kH+9Nw`$C
zEKVdZaNYm7c;b=!?t8@lep2mZ?s|*2FMe^cGTHwI?zy9`hU~Kc4MAPd|GZo$6=zw5
zyVzW(A>^hy??|iA713(JwRIhLyyrtWng!0rHmlGy_9?P9L*rsIoI~9XcS=(1khmcQ
zPFr{iTCp_Ao@lY!llb9wC6rcHRFr4C-S&Y{+dnQ_R8v(ycF7$7>7P{;7gvmEttcz2
zXjOL4omMk0))L!3wsV2F-(8eml<|uHz0BgY;aP9MXXN38u1t9ocjZgGMJdVQVHzA#
zE3_thAkz3Yma|8LZ<&Bk1<0Nd9ck5Rs2Hk;Cl%-!Y)%j^*_xg0&al{nmSz#PYwx&Y
zZSOVqwGl-Xb!BCB6-5zi?bk%Uv~}xC3uk1Mdb_7wKc&0AB;%4rPy%d5$|3cb3Ig;P
z8A@k=VbG^BUCPZj-QUFb4zGFR%St1{A!Ba3Vo}qCZc$rXe9>%0@YjmPqAs<e0@fa~
zT2Y}uN14zDGty_1j*kH*;?`*q`12&cqFVa?Z36Fbe3FXm`f4Ak7Nof8-=)C0YqFr?
zq70{FNMd|kOmvjZLKUJS42l$kbZ50DSF%>o*4$-ts*<?>qQP@=s$>TaXk3gi6`Qzd
zZkQIC5}96*U7Jx}6IB%MN=_J(I@}(;Y_Zu2N}H+j&MS3~rfSZtjNG`inCi&5$f$@R
zn$i&a!lppu1lxoCtD*O)gWBVvAbpZ-4~4w2_e$8i4PVLd7#B2eO~94{<{cgu7ZVmA
z9-ryd2h7^-t}^X8&im2YJMUck(R+=fMm07nyPw;#<+*F7O}=^3G=C{%l4Z!TBLg;I
z(Wm_x5BSRPK-rP7;`v5PIxRw2@wes#KE~1YfZwp8r>V0bT9XRDkqs|uC5v@FkDM1~
z?D8f=M-53yPO>LN4UHa}>57XD3m;mL;I1f(Ga4zR0@8gn*VG*0Y8?3$S7X$oMWSk{
zh#RQO<^^v;Y}6+pw_>485Cmat!8aYdF-sWk^`KrVEDX|#fTJKy(`Q+Pt~cqJE`TdS
z`Y&s^qo6F#WjFt|i<kX}MY{i($W?aVu=$1`-N0qZyk-C5ISu-kYRF*FdE7VX(+APH
z-x>62gXnA*27PJ>eXbm*nQql@#J4)KT#S>^a$ILR#%b{LXo=XM|BMbvce9xex)?3z
z6-Iu2A@pdC$7zFpODJ8A(@eMM?IChSt8A|ZeUeFMx#ak5<Rc|IkDex*{M<Hj{5JSU
z4=R_(ZzKPUnV;Jd<989-(n*b8Z@92(i9)y9g+<5ceZH2p&VqNsFs|#C9yq3nmWdd{
z<?v(+PsjW+*u3W(&s`yHe(rcK{7(kV;2T5vfL-vIY{=gw<yXjoaiI?W)sC;ryxzK~
zNCh(wOx`hi35;HfqV}L8jhCYr_23IO9w3sF@Oj^mr1a$UxR`L8u902XZGnNJ!o@>Y
zhQ*p=I=39|_HK+B!n5{vac5=Ih^nYtQ~KuLyXy9}P35P`BVT@|G@^a(n5vSQm%aSV
zGcRA$GgVcm_5}2c_812JhRIp_H#DlFt2b%fO~NRQ)o4MV4fc|_cJWL9TO!4OLaN4p
z#K_Z)I=fKk47zG(bQH!CfpH`e;{sHpVa6`{;4*a0B1dmI+rn^y!Mlg&A`^Hnk`G3!
zM%ME&%I0Nm^k^`5dC`3nva&NXV!4I0+|t>b<7tsHFrGq5@HKAnNLbv2`uV-LuI^oC
zUu#XtbB`EaR$p3n?b+|lDQJ4>2isp-d~rs4xpP*>(y5o#6_s7#zYF#(>m=v(BT-3<
zJ{>K^?QYPy9~<<kCf)yc)<J-7)oTUn6y)cAWbjX7ewafY+QA`xmdl%tc@Ne`gw>K<
z+88r5>7-&U;i(0}9p{dN*Tg@!Smk^0LHs8&{YRAD{yzxE*)hlp3MPC*wi`3SWLjj*
z1v9L=qK4ZPB|=r^M~VoP5kd1UXyL}TFmo1|i<MBgqKD773e_gQg|*9@l$e;9oX8H{
zoC3zhMqv&p#e=FV%Ip$$78eG}qE=NwSpLQGim$JlICbj8tNglne9jz0pQ-5Y&;#@{
z8U(A})<09~P3lMbKc-vcI)(Mtf_g?ty<wG!wWSD*Q5cBmf?l4@paQehxH5aoh7IDi
z4I37VBa0XNGZ!Oo1z+l)mU;3#y4YK2vnoPEpVc&Fma6l|Lp=GR+2BQAB|`OMDTZQT
zdKisG9Hy27vyC_x%2J|M_AXo=d%vxqFuTCNf5Qf}RM^a`7Irv2H6>-@g#QLvM_Cs+
zwlvB*nrl#l&SQ%~H`kyBoyQh~Zmt0hI@_c{H`jm$o!4Ln-CTnibhb%@J_)6>t+v3o
zL$?9?z}n2<=e4rIZ?4S@I<L)`Zq?1TnL%gYZtxpxGqfGrx)5#W<as@OI}P~ub6WD-
zy?WI^bDr0$2io{tkFNM1H=F&NE?w52ZA-4R47rVUmZ0qZ)A*YTyYab+$D7C2Va)W^
zS(x^!hH>;j0n#|Y1n=b5u@`Z!Ww<Lu|4mn3xjgP3TOsV?6T>L3oSx<x0i#%G*n})g
z+61=><{NgSZ9vCjjoa9uPh~p#Llb1a1hPfZFmGyv1ztqpCLsDnW1EUD(L@vD6XW7F
zcyVFn4iHyXRaK@YxJAmS4I6B&H*9(L{T~VU^aBv)$a0_mcm9P&c}?(V$QR{xfWZE&
zS(Y~g<?;BTb9tc1>MPwUJXe##<AzRpT%3lE!S2dspYb66oXhUBuigOrl4)h#*mAA<
zlzyYmMxMt}mO;Oio|pDG12UkjAiY+=E13D1bYaEcPQK6oV+zBy(p~-^`zi`pFRp-`
zQ9P@T2oJ-kswy@p24gXFgMpa3Aq4bex5uiybL6V9R#ZXeD!bM0Qil1*j~)Bqu3f@;
zI{B((G1Y&#?y9;UAO-TyLEa_MK`h%tq>3?Jw6ZDS({8A|vCYCx!_Y=7#m2|SCBzw%
z&9dY&w%xcYx2n36<8ro5vrYT{t+udRZw<34yZ`c+vtvZn>;8wt{MY?&qnv>;!tHgU
zWCaE%y%9Fkx^=^Y4~!BCa+FArqs0D*z8#MP;voLO({6vUILM;}>(212+?Ou}0rrL8
z19bK+2Ho^6b!Y>_KQo=}z!SpH^B;rX>??J+y$XJ;W~#jvID6GG@$SRKjAkiPH|Rc?
zi1YBTc4HzmPGy^kCmvDUKo~Y(Py<;D_*EWN+^RdSj%(A_{_1ZE9*+prC!xM$(ZyUp
zq=yeT=UoxlHz>q>0xB{V;yP3oT!}|T3QCNR91=AItMLdCVF_K0W8EmHR&u(<YjU1n
z-M*ILEh+H=m{~pZGUK{gQ?KioHLK(Lj#<#DEL+<39LO@DQ-jWa+@PC&+@Q0r4Z5jo
zgU)^2pqqZ2>Be3j(|L_xw1ETux=#88rk`go59#XU8o@|s?&ZmH<Ql=Cn|pZ%o!1Bk
z-Q3GF<l=FJ=~yG+H`|OXU(R_9e!1&;9(|bOg^>@B7Y4r^F9K~hNiD>j+0Ano%p9Ln
z1?;=k!B05bE@L{GN~%zA$5dbRu!kGp#&a2STy~&~$Y|L^m<JtwFiV#=COIiRHOZX}
zQ_IY=vQxzNklWZE3T(<GV-6z%3u|M0L79|Ms%EDdmQb40zS94Gz#f!0i%PY;+ou~w
z5xMNF_ZxOGN!rC#Qg3EoW4)oi&;!#4##z=+D1WHlCdoCF!EcVU20!;fBY*hOK)ayb
z)t?93i#@o}UQFk4*=R>OF3a}v@R}t^pU8a@bJB$Vmz8Ga3}!`X@Ok6B%`uVKlgLiN
z{tY}Fx>ze_`(gqdEB=T_aOaEnRf8RFSh}F}oMAbRArWEtzYZiA9WKX;9T_=gPp(R~
z@`jC?n3S9#_ri>=x$+zp-S48RikS@~Z(kdDo)u!}kRor%Ro)V1=g`PuQ!B5$<a^J&
zY(9l2JRw}vrp)T_{~BF0B0k)|FNNzZ>ml3WderOO{>l0?^by!smHP`5q<<euBfVA7
zgodx~F>?;=$nf5yuG1{uy21b=Xef53urU?M;|v^2tiV=BQi02`sDa(ltT=OVBJ6jp
zT6Kr0Ft$i7Sn4+NK8M^S#T@10u4_6k;WkjH6~ExZAyXn1V0#ziJBFM2@SlO*4fbzx
ztVxWIiU3=9ri-Vg7<=VT7&bex-4fXMY!%V-7cZWF?WBslyoyQ6?(62wyUs7J&Bf+s
zZlJ6Jlog4;)51F`=Au<21zRffArHnjv@W)RaHBjiCJLO9*x0dR_=MB8o7+0}ih&Xz
zT)JS<q6JIaxWqP;c-_3Y*Wd0pN;Ld-y<9IRV8pKUmc_xaFq*=KH0%*7eR7#7JF+=q
zkHd(am^w5OEBmBeC!hJ~n0{AOm^*whCab+{up?KZ@0rwe#bw-s=Uw^4u|V&A<)ZpL
z`>qY#c{l8`PkeQt?*?=+3c84<6e{%&4}(Cw3$3v+U~>unh4<zf+jvxi4aCMI+hbB<
zQ{s|cI6%OX*&Wb7w#PAm1$XM~N7r*3ct?smpSrqv8f#@5x5M}=<NSXT>T;==cVM&J
z?xUp5-eTA+4!_uz4LXk<27Q`I$2bjn19TpzYmh+DF!&S?*5)}><t<Ofwr+}slMqY|
z`8Wg{{e1QzH+O?wR#56tdjd9Db3{&Hw>oqy)zq`Gca2dpIa&Hoi*QZ9Eq8kMjG~GW
z1!d!BcHDkV`*m4UQ`?5mD=Zt|acSK(ku@dV`MJe~S=qM8*xuH8i%Sb;4RcS)%nXZ)
znLVX`eht@8$}8)AyHRf()D6(N-UfXd(`EfUvVQgSxv_(pnk_UnCqYrPc#It}n1Mv2
z#@Lg<WTe&MJvZ7K8jW#AZhu>mN(c*1Ml{vfu7Q^H9<(}kzXg_p-18?=aQj>GW2VFA
z`t1p@{cXix^srhmC&Grixar@eFt)#IM~<kftSHFK%t*GQW$HyeI~bfJgtiPexkFzs
z)KH<@<f1fm*E?#$(##7t;I+$wd*z2hw!cSPstdoRS!dj23vQYZv?I@PjCP#L?a1v8
z`-Pnb=xo24vVDtSzn$oZ!{}CH5)kW9u@KT?;Ra){`d87WgGku(Fy{-{R|$F%b1#^O
zDV{pZZKsU$Fv!_yU@(*0O<{5IS(*8ABL>@vR(m=Q2F(M8pr5O#!tA?9_*Z64tSIbh
z%WlsYomZ5XmX$Z{=Jy{^cHi=-Mak(HS39@Pp1L5j+@0ynzxsP;cf)>D(9gZ7pOvr=
z1dkWo&_M0sSMb|7+%^`JC<OZ$;@S;w<Bu7QKKrUN`UWhaxF4AL#IWbaNX5%k9MjL|
z(O8=WE5n+{%n^GRa@k-^w*@BNa-PjQB-n^Y?)Tn{{NKJ;4E28^hAw^fh8vz;%55ae
zkmm?%kr&PpxM(gL>w2z(n|633xVKrkw<&?cq%50&EW)}pL=+xM<=HFE4ja^!vL&-(
z6@A~%jnT=5zu;uE_K{V9{ibhaM<*JBc}S{5o<}6|22KpR5sq@h&(n<zCF6I<d6F0z
z+EHS1Sw964=Gjqbf0)2+a`x3K^Q4IN2HS>yVB4&>z#0mAtAcI2pf`K4?PVh=v*B$f
z$i=js?3sy~-1Z4^iSjtBvI0v~!~U`>;(i{H>+$49Y{<U+vUyizV`VhP)0mmr=n=d9
z7tgxI>%C=`;592`kY!1~dLIY_b0CAxYZQZSu2Bp+`&)x<u2Bp+_g{l<u2Bp+uMrHo
zxkiw5xdvgnRlhZ`b}{Ie2l%b}ZG-51|G?m1HHbbmNWVQuuV5Vp>E;^5kcZc~hCJq6
z+Mx3q#K_-RgBWemi8Y9W&vTQp!^0bZLc5(erqC*w?#|X>sq!?J?I$waqLV{70xL+g
z1)3$;Lf8t$G=$qpc+fB#jAoj&GTE7Zd8BNWftFe}Kc_g%{}VKq*-o9ZogO=<ohlT_
z2f3L(ux8-;gz|^hvs11a41ROXVDR&t*T~;oGcY|%t{Dt{nQI0^U%X~8=;mHt75Y5e
zu7}t8?x7fN9hh7wt=RjJ3d4r}Y<L}vmzdDa#!O?PT<LqrlbczPn92Jg=bE&2@MfO8
zaUmUTh@nRoR}~k>rbHVTFG?qj8ll+YV`eYN8f^QcyD!Sg$g&4+U}P8NmJGo>xuI{S
z_(8BQ@cj#;PMy%Gse6~)|1;?3o<<ma^hKy^nCzzle~hselK@PH2X?)1T4FbLz0|S<
z?D8a(sjt28!^wHJ{3(yW0NEaW`)x5t?!lnnM<74Ug|Ss=oL9mdTCn$T<S2yRZETXr
z(@Jb7#>HWGB;ME>k-6h`iYx&WOSQ7#mPAWf?H#pYmc*3>FPDXvp|qK+#6A9{ec}h$
zP`br`GuKU)Deda%L3U-(xj!3pvp*Yj?#~9@?9b=sBkc`!GIbP3x!$a}NE?>oyw#>+
zO-_BrK51a8Y>$tRkJZusE_V*@(_n(EmL)@F*p^f-dS+ZnSm}gE_dWm2h%#Gw?W51%
zwP?{@_=A*_7B5+{7@K_f!Ra*g*8%-SklX7Fhvz?Ei{O~oj(tz8gerph+dul?hZ8Do
zl@p%$;9uhPC-1!TNq^nHjJB6~O8xi->Bpe6ehj*)AA`>NG3cg#G_36*TYx^$PtVQY
z?575u{SoIgu!nBYxt|*Oo3>bty5~q+#J;AL7fW(S)4bt>r8nP>!OS5(E<TpGeX*}8
zTs&!TDLMWy(Tp27ANyYv7u_cI+;E$}iETsXDeJy#P~8nWj{yeV90LqGpC1_XNk|2;
z<T*;M5=%}hzz1j1SZ!$dgKDad*)-oQ;S)hVp2x8iE)QT@(gO$4%15`<BWwz!#<3K3
z3Ii{gUVHP-&u*-|CAZw>k@GZ1h6`J>S+0VNf??@=S0pAX%t}t-<S`y=aTr_hsIYAC
znJQ*IS@KXdLvH*1v7|6U(W9o;v|MuSRZ|MeifZhWhAx?Q#kC{+zs;$<=#u=xTuW)i
z<niqjhZYUbOdIDJ(KGv_-l;j6b+w6(G^heP<uj#PH3vG{1A;|w`XZDb9i)#NM1Ltj
zx9anG{wwpTKt3jaw$A))Rfr8KXCU2zU^*`Ur@{O#A4Gp7NWWqb-4T>)>>#<~gY+>W
z^y%tAxmO1BVR=pdY@PW-<n8}l>SZ9^!eF|=@-7-g|9(*3#i4ZNlOVlb3>nZD{syR_
z_dv<#X^+N`deo{zg8Ws3^8ZDEZqZwrU)s1wnE@Lw!(WB%^<JJ18&89cN8lJD2h&_@
z3H~Z=DgM`wmR8)uv)Xh_P!+Q2iY>(Aar9+1?3V9R1*gCj<$^|5myfC#HM}r8i|;!n
zCB{ZmnJ9}eW~s&{M6B|@&5%O|QMrxjHf;KsaY-?+R6DO>51f_x59YFo9|~MsREOu4
zR!kZ{Da6!|T{&=kCi1c~N7W@dQU`3lF{rZ%gLHf-NM8|3SN;&Bw@4jhg9SD+4mvKv
zUmtCx$GvfOUhGBV+^rxhQ#G7P4qq?8DRu;}qV>z8aLkRX6+F<iwnc~I@*4G6BjHmp
zVRLv(F2Kmz53sdGi|}ysg>cItXGC@Ja6zMLs~bl&mX{5$Dz3`Q$#ABn4oOakiwws$
zUy&$^LBk{)+kAsvN^+UJiG~H0d5KgW5~JY~cvG2~1Fa)(|J_;LHnTG~EzRKwn-SMO
zvS?JCmOruelFzc-scF`pn3gf+)8e(T`eQEVtxo@6okP;Ha#JGPTH8BDWaMT#UG<}~
z-Q#b(qB&;d*n%|2$SKuzb=BgvvTTnhyUf3_yrd-4osjC3{X^<j`lUm#XZR(*Vb?X#
zd5LlyM=?%XVfgBB1)K0O0)JW;YwW-a7S!hIIu!|<*?UV<Zk3zyN)Jzouy*0y_`%U|
z_)P&GV|jz!_{0RqkOXI<Gchw$?wawjk9o_5&(z)a;Le$`6<@R7nmBgUwBFunqsAs$
z*Pkw}tSrqLF+w@+e{Fcpt!vlbT3a-8eqCjIWnFgO#@rmt6>3qhVX&q1-_ykC6S7(T
zpWM@|zy7YfuA4gFu`~)Dq`JDipfq+#YH#FyH{N*PnCemKxiw`SWi@%jyw!noHz|kI
z`+HCf^d5}|{E|UuziZIPGF{5;k#bkio8F}OIIJcWQH+_+@GQluWeST`Gw*8R%8qKa
zYD;-zs)skGP$}*Us2OJ8R;y(;%pCWk%)6SBU)A84{#^oWR$<>;)ivyES&;(&Pup)V
z!q}|hZi1CIw)JB|?`od!x@+iORLCWYfh(KBdybAB^Ct(lp$1>s?CHHri5;Z-s%E9Y
zT!x42ST)ApwdltCg1YCi%Fz9o&^E!}E;s27vP~4qfi0z-(?_DvM|esq`-t%}sE;Vh
zxqXDtM*@DyiG~V|4)zi1ff2xUh4hiQ#7sBuEaTP*yOO|#CwbaCc(YsFX-yb6YU;v;
zQ%8+Uu&!U<jSiAiQdKpxsFr(3&2Ta5Z0h`++>LqJvZt`Usqzf-Mp?Hc%B1@P9v}>t
zL1QqQ$=Vq&xV39~05>|naVCvQ1ctQMz#LBH37vGlIp^h)RW+u2Y_qbijuhPV9hR1y
znUV?P!S&I|2)NmJ5zjNYfSZLC$vRg+4Wi8I9(+{y!i0{F3FVbBw!81P#Z-!zTPoZ9
zUk%I28Rp8$ioETvyKWmfT-2RSy|k!CIrVFQdtUyg{Ji3-<yDx`VwmRk?SKx3QZB6z
zXdp^pgGyktiG85)V#Q0~L=xBSwPtuV^tV~O1BIP}u&{tX4CfDwam6j52G6&!$}5Zp
zzuE2ysrWmwj@;B-xl@O>kNC!AHyn){m#+B2)wkKe+O_Mes=jFlk1Z-KU37L&s3|Cv
zE60J)$wk9yo;ShCJ7$>DC<(X{rL?+)GNHvc3}dguFx|ktyfN}?3e##G-XYv2RH0oV
zxmYu19R7-yJ0m|gW4L>GYE}*(-w3O5eqb22ycW+p*?dHpol};Slw73_I*t_|x72sm
zFK=6USLr2n)om$ZQ8oE9$|h${_8f~E5;gU<(&~{VWg}{p=RA!&ub+2I?L9ZNEUqi}
zXhog5m9@ob<;k{$@Y1tajT%usVq{%)<%m(T?MqSbY>X30*lEUbTmoEeq99elG!Ca<
zx`O+0fw~69jKI}RHrdpn$-`2H#l=W-O%h4w)lGTFKgn))4NL;m;OIZ{*6-Z0ylqLX
z|MAf^MGYzK>AkaxM;xq*T(|P(`@C0A@`RO)%1oV}RVlXDl-g{iHSkwbMmdIj1er00
zz_xe{G3dNTFzDk3(Rpk!=wk=b+3y+jF(LGBIj3j3Rliac2J){^vgMqf>6p`lpJ&#k
zctiR9U$O2&(k%?8JFV2nHHeYlq7Ztv%5!>yzBrUF=kx}>UK9+}Px@n~Tl5AY%SF8*
zmz?Vx{8FNzK6veA@HYneSx%no8~jy+%H_Gf!QaaK@CT*X<6@gA#QzbZ%R4O%18uqx
zS^-?XhtEb^;Sq6yV8wZ$#iH;@8f?S7scNii0|!M#MS_Ydiz>=W@^BQMWRHu9uu`EY
z3~WCe6Z-+TKG<eL_r+9W;cB;wE1e_UqpOrS*Rr*P>?pn<-<=m1_%x{kyJaIVl^>Q@
zo~-M4-Fj1qX(hOw4p&OF@sX0E!^B`{A^PTdxuK7ipgsorNR77|b;Iz0ul#T>szMzq
z?)PHq(t}xo)PvNB+{Yf4<`{yWm6VCkg}BELUVY2^lQ_XmmQ!Wi+7%C&U1Cb0libJk
zI4H8iO6%Nd=oGS(T+{Bkq_n2C1VS5kr9AN6iM)S{Mv&htuxsW66+R;$gF|~F+bpu#
znrsuLSH&$59MlghkoO5OC9f<qzGC8gqOP$UpM0`y(obJ_;e{vtrOQP6vX=UeWeb=2
zk1azbRT>W47>hIUa%!N9=n-$iP@#$poO~3-DVhbo9OlvDOM#~>h9#+1e31|?@cEf;
z(JmhtD={=067jepT_m3>q5|JYqLVF5$09N~%!VZB@(!)6nAkG5xvr+7p|YW@I4{TL
z9F{gDIU^!Gxj+x-7ay=0hvb1rS!uFaW%B||j>W>R3g`H8J0y4!DghyPAgWRsd)EWA
z7Zy|$xpK<#i^^`8SCXHfb;-*7;VUmoDoBWkDI9jq;+g&rJ^A^bg1o%F&cbbpc_q_J
zhnG*Dm|p4j6h>OYvof+X!!1eeBQBm9k(!>{8<x~o)in!O_~WC8gm--I$w<lY$Y1`~
z6O-eHqzvP=hGytojmCWx{=eVM6z_WDt1=Xe%^@PJN^4BC1$XQ*Jn<1OuAbqlmn!J;
zXko+0DmKgIVYstlt`MQdh*=a7(bN`$WuMZ6&ja}jKunQika+Yr6GPj<wEvxKV*fWX
z@J8AHfedVXbr+}#reElzx-O3f$MEd!y!!CgoF_d##|^he%$F)TC!ayuH2!F2LC56g
zCOgK`i#sRJ?3md)p=na{q|vn%WkrRag8baXMth@iH7FL7JdshP<W%880S;EHs*<Bs
zHSp=>xt5EL`c0$ddqjh#3itq!zyC69S7aB~7p8|zu_tGzrDZ4Er-Y>!*5`*>^8B*g
z*QP{<huZO78v=H0g9S@dRz^C@YaIE`%)C6D;yP-|ooD_w*shb?M|91MoE@8$JUwXB
z^^+%xUxnE9-MGObEqlPO<8g<-5<9n(#CC5yn=<~dPx*F5w_;}^_+?%Rk4v{lV%*U!
zR{e7RGRs(Vqcts-@L3cd-qeO^Dkh;3aD5Z;afM;ixD67T5MD5t?!S`-+w=dZY_{e9
zW!Y@UBhDkfIo?WF4;#Kf{c(Y7aMdjo9%c#07qU>nIe84yoMFG2W1Fk1Y}U4x=1F5G
zjjpR|s%|PBo|_E^o1W&d;xHjT8csGLr>ZR3nv?K<XRgnTUA1ym%XRvHZlEJZKK}T~
zWoP>SS60dMN;$@<eCGNO_+N`Y^D8_|x}1+0^aiG546cWw9T<ZXD94+LTSj~|Avb{n
zmvLL$`2I33t0iP4WXdC;fejyALMZ3kadGbY^_IBtqbAH;KRsi_dfwUbjG8;szg>)+
zo0ZKcK*m`Um*XION5DI;D2Er)e1s-up;$h#wOZwc9jr%f*bQv5OoS*7a-d{6_J?CR
z#h(!bzF4sb_ML)a)K^!pU%Pfd5~Yb(OOFkf1-eMXJb-1%!IvvIdBHb{PzL72_=9JP
zL){PE;T<B5LF`Vl;f}g*r@W#Lo16)rBIPrR!Z$nkR-NZ3a`x21yHWwq%u^T3EZ8<`
zAP67d7`GRqaeX05MDa>P@a;Fb)WG2d*2H{8geNefwInyUq%<eTfAp!RMD<481Rs-^
zmX@BIo1T`I=P$&R#=jVo84-{}GtM_Ldy|JrW90V(QVM(!#yXQNW_)|W`OggG%5x)R
z1YOAb$n{A-l#TU?6OSOB*Cz&j+#ouyPYn9lL3Cc981ylrbh$oYx>c`d`{Mku4uBrP
z&zqUNG6~RGzajE8hUO#J0Y*Mmq5KN31B`N8nV;JUZ9Gx7lZP($PIqF@KVR6?0^G7u
zu?84uHOyeRsd%axn1SMw3%i+cV}216jgPIf;W$zqL$R>7M|)yCMnm!r|KNr+T}h71
z_<9K{58c`~8+V%A*BAbEvNZ;_@k87C%qM}({6JF;Y~Q1LX8Xu}c%$Aevfdii;4Xif
zthWQJ;#_L-)`u%$D%Y1gS&OVD9Iw1GWwF@0QP**{iAF8m8PY|jCM8BYVjKgtM7=`H
zwQSIv4&#;EJACzjy)@t4Tz_e9ZYi5_$NKf_H?5!8et&4)1}wVa?3t-b*V(u0adknV
zi~Fm^8&dWZzE{et^>6eoI1POkq#viFYo#Q~Ye9jIW&K8b1UeQ=CVE*k!2imd`^Aj5
z_Lo8>Iy+B%vdj<zeT(JTsc5*E%iqfc`xX>0hb?^nz^f2Gs71xO=W+ov0@+Rt<b*at
zKE`>Xh(cQQt?P}pW4gj?^8kHJBIp5M+zP)GMVVd~=4;r+54vOgp8(9O3kmUwvT%09
zIDxk&xO4ECQ2lyqbMMppKk#iRVGlfG(y{~o{l`n5g&g&`%Y=MUUM$MtyG-RF<!LDI
zobQkfKf(vnf$xyA<abE+KykuSvfeBWB`Dg#OSv$aXA>GS5p|IFE==7u|2x0b^w?vf
z^f7<&GT~o#_Fnc&G9UE=$eaMxSarM)_Qe67PFXMTpk9{-?icZQP>{h$E9>i#eWn7k
zfuE4)=bR`0zrp^80^cA#6!-?ols}G&yajwaTz-SZ%i{}F#vW%6I9d5E5}N~mjRa@g
z^w=%8pj!Bairt;RFkfiP{5$d7&C5}=cRJ)5iM@&pnzl0xe_sK2RE!<WB>9m9KA6CM
z?3gxOPgmsyZija$(v6WPGREf=tpkx=UT)kB%E0C2_{>c6s~lsH#L*Tu=`c{o8SBG=
zK>D@T$ilpqI7?JXaqqQ5aJsW1IWaL+(ONUhJKYtJ`|lOAGt-6)^{+FZhV1o_-2vGX
zs1+Z4;D&oZ^aKop)FaS!vA?Jp-&8rg$x?1a1$G+Dm@Y5(j0EDzMc}h#TuC>MlLm(M
zkjaIj%^W<OvoDmg@R%W3Kj>#r8^n{pve4ctZb4r19F83ES&E@x?$z?rh1|(EX4QsX
zF>dlX*g!PzLcrgsd^Teon1Q9s8=m0iSxMk8&sgCCL*>pkrbU)p8k!fcwZt~nG)`Wd
zojt5<t#bU=QK-R;nf|B6$g-;3Jb6DRSO<)&fjW$3@tF==hMog-?z=?>UFskEJpuj}
zSzXNM<hNY0sB!0W{6}=m8sq=fD~#1Jsv|FQ^0&8!BXxL(p>m*OqbzX0;~b7IZ&+4l
zTtbGtQ46ORnD$|OGaHLt;BU6`^e@m_ZSDV$z4s1m>pbs;&wDUQfFwXHk{~v*2yhbw
zH^CuFqDYDoNm*OevP8+6lr=2bk`-HCvg5>x<s^<XZieeRjg!W9>?AjKd*dW+GwS-g
zX`1P*Hf?&Fv}u}QLHGB(?>QJ0B|EwO^OH@GcyVyfJD>S`p65?y+1t7Nr!LxABJ)@m
z%74;?y|XCpYa9mY|A)A*Q}^G0ihkhPYi;T3;%+^1?H%mzTHDpnUofBi*?g}A&=>3#
z+9kPm$U985uPAD#brJ2$i`t2Xi*|Aus`uGOc2(X^_E<rC;*fWmIL)W)VUNWtNj><K
zzIXMvG$#e$JCOU{ujFpB$13-u+MViin#dljv>z&LCwWV0AI!Dm`FtPI^OYy(#!Y8O
zjAK~zN0}$sU6uQ!=|0NZEtgNgW*1a^&d*lBwn}kd_??gY@)XB?jdQs}+Ce;>dzb=h
z;1@q#3Rxf#EO!lZ$T%HL^0*yACyZh|O2^LZg@$^H`y$XLH!CdirX*=Ew8Tcw_!_F+
z#k<11u&1F_hY+Nq&B51!k9#@aAC$GDaDSv=J3N8;p!VYVE4;pN{+5%xs$9?KPnqxK
zB)9Q)y>9id^3QG3gp~Q#>z1K8x6UNrD(f?zYfl!er(UPVf4Q!HQ67{BfKT?J9`drx
zkl6&*Lg|9YIYMD1<E2a*b0E%+6gzIeq=ToBW}vbHewWi955%25moFZsxTLfa_yxC)
zi2Q=vCu-oJ2!xWPBf@~w9yK^!%i8Wg6&Z48*3uv0VRz;)Te=wgNOfInr~Hv>Ha)WM
z_IFsyCwixc_wzs4cl*1>^yRv*ShFvwfAMkiaqxBM#E1*mfoKQKpV+UfXg)yU%{V`V
zKM4Wd+AUqmR9Kl_4)|rTZ<zfF%0}puI%uA-=Nhzo$c?F5Q_M!hw}NSvf`;<V*_gWw
znt^&1Y-j49i@vZS6KZUzt7B5Ct)aWIyDnLmj7Pn-)m07~_of50UIy7zN9YIz94k^u
zT?;tL`3ek0MltrW=#Wcm>x#Fmh;LYx?6zqW<Eu9OV<=GLHf%3nY4O0a@s!)=bK}SC
z5BfqKC$_)yOr&n?%>Ep}1i5h|ZNQg&w>k0AWK&b}qY1KdlfKY`c_R$TZjKm{1bjqg
zlze7zY6W}b))zn&coeVzj1(SVl3R){DR7480V68Y0MDQ)v4(6#gS{SLM7veRi)8<S
zH5DL6h%Sk72rNu*rYjGF!R{z@*I(1aH^sBO)$SGGS(fNu6!Yv+=2^w+EXE-K5=)?j
zT;!}8G%LgoepCymUXe@`+9^avj8?s*VCt`fLm(x!*!cRUIE1ZN+F4UE4gu5z3(yMj
z)ggU=*S3YI1swi3te9qm1>+5852A4cMu+mZnIIa)al-ylt(oMK#$i`XC*u2=DlPO@
z_0pox-^xt@Zz;9fkg!sSYQhxaXzQ2BZ^RwDj=<Q76YxfqMuys24yHTr%pN11`<;>D
z_`QQo?<QFtbeoTn)1v`2fF1$5m~SWfK(sGc+ab4MPLy_%+knEx`nG^hIk6976x&w?
zk2SK95%DdI?Sowy^5=Fkje#5y3v}9{jK^4PiP*kIS%H=CymUOak4HPP$m}`)w0BK=
zvNh<PZd{c-b9j8ef6O`7x-RHl+q5cqyScq#A`o`hIxDqhhG1XIn$7XZOm(o`S*a^C
z1o~U1C{CXDmyeq`8^*1~eu;J(w`gBZ?R<PmKE7e;tC^}O(`jQixZ*1T2FwK+=|GIh
z-xF7Zj39-oawkPM5;Oyw7*nt)(5OBaX!PdafD5lU*yv5aA_9*3dwaS%)5-d9$mQSx
zN5gD*semKk913#PU2hQzu~Mw9FdV6D#s1nGt<J&SImlFDq*6xL8oS}5t=eoTiro|I
zL~^QFr%`qNus^X6m3G>nVZMIdSAQ$l%fA4Qb8n`+4hIiw${Hz#7OO_tD!m}K6s0x~
z9-yP}N?1PO5W%YPEL3hB%4;vcM|72*(tVBTNqtI&Y~esSNQpbc+;t?fJm#X1xmnq&
zpfM;sIOjTIr6u;#rc|m44%0*|8E(3C?AY2p&3#?VCvV<S-B5W@*0eSRV~q>RkT>4i
z(R$@y+4nA7Y`-ZryslDLGP`ou8NC^O!65oTx028gffhjaiJbqLC=(^$ET%><rjpf%
zI?RcP>U$=$s_J(x@H%H@A{<Pr$1`le{@bKfrWI30IZWyPBz%GL0n9o_He}dZ7!qn&
zctpApo+JvqCsCII(g`y}91_|V&xgcjrY0|L3e?{Fm9KndX7G&#cktA6!pWU~o|~-G
zNDc)QEnuJ&{7ez>WTK{p!jplVokI`tV6tmsbja&#wfQMQXaH=PKeXt<^l(R;Z2Q90
z<ofl><1b%E2L|S6L>Fe}w{x0EV{X!zv9}<d!OpS;_JNqNqsN3D9sPuTmgc2V`nHHa
zEF~JK#veADsMoCY=(YVO(`*SQPYFeY$G9M>w}pRCE@kK5@)zN1GRdW~sq~x#i*G5S
zd#{<Qr5_1;;X_W*XrxXxo4RXUF!gh)0i3Za@)eK?N@-a%r`SA25sN1ZNkqlU<?1Tm
zzjWB5cDg^m`nl*uu?9Hbm|w95+y*u;_B{BH3%uGUt>qHlv-~hadz0Y1%w_GUBwH~y
z35C!pY{;E)DvkUw(<itgVE~_pVZes$N$woZk>cuT$KrR0y-jt<ggP%>+L{>HwUtd~
zU)dE2v*{~u@V@p@pE!@1!Y#pL$Rz;YBiczP7ws#G+KKmw_T@$GMC(NRXkk0oiK(4@
z5ZIx)`;)FN+7B1Ce<9a?q^LcA{n4WK!@27ha_uRa>s)(JuDy7?!-f6iI-}@Mnyx20
zh51<rox56kR7mBeHfVClKM3#=5RT#vk}#0uNU~Kmq%WpDT(E{Zy`tKP?^or*B$YMJ
zeGYrK8bOJVl(_1=N{$4f09@ONN|hKuq^empS=|ZenO}3Elfy6$W#=d46AX3UbfzXu
zb|G`Y;xFupw-~c)u_M&ASjYE($W4^r11TCi=8)P+@6NAX;q`@cxQ@@ExSr3UvexUk
z-YD+Bx?s)`lc%f^^zMRo7uUPRUK*!%z7|P2jq?+ehBKMk(h>v07a}l#M7fr!P<6<2
zJHSOC#E|v`!IwxBlj?#*A#4b8B3X_m4l1F*k@3kQvYVeqYoY7t^TK7+UT~K3ej_#R
zWAWiy>@yPQ39%l^`4}r2E9ul?tgDo<x<SYLFjj8M$Iz4*%A6wt6H*vMsRRVR_QK=C
zEykANM_-V&-+lV&@6sV>h=`ZuHMmy=`I(9BZG&-`v`X5gI`Ba3HJyNXfy?qdpoo|h
z{~=@&{~1n)OZ(3EmPT&vdj=ts&&b;BR`wzKx$*|vm3<t&!8-Hj@O?z|4zvWX`F5fW
zqFuGuiGGp2jM|Ad2>aUN`;hcR<A5a__7yGSKoQGVjzC5rK168g=mb&$a924lL<nf5
zqmqKa+iX!KRFWJu6g=sA`O|-rt~Vw+-}~v8pBij1CWn|lJ3Tx+{p;+%Z(p_yJQUBd
zL0??P=L@l!28xzsJVhK%CCnXj6f`69a8*d<j!G*%$(3qL=fWmoXIOs5|Bd&rYBDxV
zT>cN|#L$-)*30Z$k3RaXD}U12$LEAUgU=P^RK#3q@C$P&+G(yt`)FZ1r=!$PbJe6=
zpQ64h*V7sOVZnXKwkYm1TzDUTM#X*7x%<$VX&;K~SJCyDiy_RplkY?1ZX@jgGfp2+
zHWyC7L{>kZ;)Zr4!YKL7r<5Q{#}M;n|AoDjeVxTmGv~tT>_0EiIQf0~_)p+=`Mo0A
ziNA>U<<t%Jdh%H-?YIvA)EEO{Lpi2U=p}Uff*6A;5C-AFspH-p5nm7@9HAdn-A9Cj
z>-BYHYVj)9;9<CAv0iVuCcc35`bE~zH;XUWdgYA*OgYBN<0kmrP_hcl&41xnuAO+Y
zXkSs(PP~!YDHbxMT%VFX6bs4Q5etdyX@}s`g8Svaw>S4a#BFf9x47SYQTuyy&)HYh
zPHQImwY;cbw3kKuXhHirZf_U&-=Dh=^;f+fcKYJ}Ui}4lv8UjB2Xfy-ELK5(4;Hk0
zxSd`+=TKogKTD#0FxQUfbG=No^O?%cJDnwJ*XxE0#^K>-NnD@K-G|~{$ZjmIAE)d2
zUZuQY7AY#Fq;H75>TtnS>gKFW7iL-(f%QfU!GhW~*R(6vsbJ1BS~p<?@#ecVM5Y{R
z2PrfG?B!L@#37ADu!FIo6}0vBug-)Jv4lrUH(&P)$Rv!cAn_RGmXD?4DcC=&$;K)n
z?NNzgDR!#ZS#cr?xalIB*Iz2UwI~E9&s~43#Ny<*tQwPpGn41Atf#;#mRm34wPOCq
ziq`A3T>Htwc24`m^{Wcji|mFT#ApALSg*<&tP9YuIs+6*2p5bNiyF1Xjmk;|F!jRo
zR|gGHr{nfnuduIRONfOEVWGlUJibsG@^#+eVp`P@ZUrlVPM%-%Ezo4H8PI(*{`^(g
z6AVjR^axl2u%H&7H&W+K_>f{EQWrEDphpPHaGD^cP?(B>r&4Xj%O`u@c7Eb!-|DvU
z-man*{FSn9zJ+rM|JGDrYENU|+4JYm_B3tH-X4wJL7`Nsj()yYNrgr|!p~Norcpc5
z0@0qQ9n=ntozlKFw}xov{6Snl#Me;8om&u{(<hCw7c!<$Iq>EN;LTNiH(^q7=A@&m
zoB>RLBh9f`gfxfWMp-QaJg0JB;rMcB%ZxLNH~lifLjS<$5g_!BejY(V+lo7jJ;M9S
z%`BYREj>=!Xi(`@2>v2GebFrnCny8|&EoHrVD?I+-F&W!AFrWJNc+&&(#)ilqeGd_
zj^@6WzC<kGBgB`}E;X?xa{+nzBZ18-s2N!O4i<l_7|}c!|Fu6H99jUy$LW*6yVk?D
z*C{<LC`ow}00KT7WG_RuL{O1}27pdfPXs79*{7v*;2#jb^xTp_!WUmUE#l?0+7RI;
zkizx47a9!M#)_dA7b7LSttp%UP{m?2An8A$I@>w$1A#PTn9n7tBOg(L4MiwSN=S`0
z)ZE<Mb6|Ycq2A6=Yi+G>Ahm02$DC){-dOF5xdOgS``B=EPgmo^>>Uf5(fRJKy`x(z
ze2!|9xq4Y@?Y3Ze(&=yo?KNfQ>XDX#v9glRfxhl51d+vj^+E>khkej5t;~!f5=8bO
z#RNhr3CE3maOdbE$f7)whzy24a6&#zm=cME1~dd<^-KQBZ~*lULL~-Dlna(bmNcX#
z6DCc?xJSE#GLrR9ta;*THub=o%@3U%>Kf?jAF4Y2lDv9w=FpLSU#!?ZyYJwkh9*}_
z^3W%;`>`IkL;3g_as?uP2Lr<`!-*+}15Z;9-cSpcfK?S>@`6@``O#VzUq+4@`ZlGI
zgi>pm$AI`KdN@<xuA|`4UL{ggyx}aKXi?zW@093ehyu#D_=TQ7_~u9@vQ%GmWOY`1
zLcv<S5Q=er3zCV{;Mgh=|9&JBDM646bZeUV;xHz%X<~a3i{S#ZNWAdN_RRF^Zf__M
zujs6t>>Hbo_4;BOZE25O8%}3DY`m+jGhOKqRNGs9v1KDqtO|HpC_Lh>P9(~0HY_>T
z<pkE{b*#%Gj7v`e#s%HJCbuzqN{~`6wgB0%NQzI+&dtrz4=IwtSd5MDUcY`f{Y)fc
z-LV9J!Q;WxVCLsFyY!es>Q4qQDcD=f5z~cy`Dg(K3&CID*4uD_hpQMI-ssgJGbW@e
zr^OjT0T=`H3to}~5k{2tRUZn3TVbq6lF|(OWcH``4{mF3-!_>2KGRK4A4H9bccr!s
z^l$GxK2|^WKSf`lvck^(B5>AjG%#sD-doTYom8E1=6iq*=apdsuxJcaWzG?>hW4|M
zWdHp#ZhGZqjER4ba^A2H;6BKQX2mb{ewr!h{v59<vAc0AWmq_d7!V<$wR|9u1o?ek
z5Ahp6n*FycFY|j`-N*Y>A_X%(%#KFZ>@4V-R_j#()sRnk=Lq^KIymtV@`0Yt_GbU>
zQQn^j#^=ZQ%E+%^&;zjw^l?FX8xNf*+z%I*NoD98{uvFmNUlYtPp~E7X$YlG)7by)
z&o0lhi>wjZ{CHkJe*eC!gQy2Z`4wT~uY~!;1alyfC6FT>>==qC1CPOsa=#0CR0C9I
z1t$IomeiBb0l39oE<xlxL*i3<uu6Uj%f&25&E<_9-WJDY>W9wNSGRgs)2?;%BNbis
zdscLm7_(Un`YR=6EeAL6IdcF*mQ0w#<>*%h_89WsV$_mm8c*hmx@W?GMUgl-9b>oi
zQ9C&CPs1IXA^<#rX&pdI5T>Wi)at53V#DG4vwwd-+q*O1`QYj5t?xekg)1*(o*$LJ
zwe`}UG+;WgFJQIe^=<SLW?p^Ib0gtB_DOMFn}>lF7wx=m4)zba1sfyfLPQ*5wE>II
zv)NLtBno`!3B~A{C_$ze=4F$iptYL%UTw9M8hl_}$Q0Yb!}Ow2kpmsC20iy!xm@_v
z8v2*|&U>0l;$dH`Bzd-@{(ODM*<?x7ABmMT-P2irp2f4@{B0|~Q_|G<v+NI;pMHMU
z*i?c^X#FjHiat^;0Uzi|LK@2~cY|Fcb`d!xkmMJHp17_KsbL|IYY^Xv+DSwrgTjpr
z4FMyA`O)X8a#mV6A|=5R1|iU>td)mcDc(1*-+bj7#q*|T&gtXPo4jk|srE$k+*~}e
zEjjF&Z8*I8*tyk1BO3-!n7a~l!B|t&R3ACj6f2nx``0&j?4IkJGU>HrD~7grU@efd
z4|7d9=qyq^6G2Z!j(KcV#x!$!Bm$-5iYt+XAGQ6EgdfL^k_Q+JG`UE_pAH!`=?4wE
z(pQl$KwHZG7P-@|99_x&C-SCgP7TROk41ZcKZk0;u%~f1y>2C5^X)`KM7x>`4Hhw(
z@?lodnMK$k2mAs!gaSY^CJ-Hj?`)2IXG92W0qg;OjtGQZu-<~75T>Q?^7_N?LO_|@
z9kldzjy3k$$Jc|BWq-_Se_J2X>-GNldrv3YU&(%(_lrND)3#6W{!U|4(tMe({tofX
zF9L73OhA~NXy$a9A8!Vf0N<7Z8?1hSUee*`N;&o{Tr>`A)S|;&^1}u31xGxk9J>&E
z`@!n^8sGAiXPLuiWe;DL2Tq>;z_uD+&7H29i~GK()**;uj!;7ZbbNEJ&s1kXF9G|2
zIp?|Jkq=fc?c{x@F;QIsgXGRs<w-JGe9<YKA%!Lrxx<99@1gDtFZhWpsdPUW`6!Pz
z?so^jzf!*s?`!${Dtt~kI`z^;{yYobQ;xn033*wu?G=+LCW=g^f)j)sNU;V^kS?~B
zh7KIJ{q+4ehc*87kNrc<SpTlm&2q(WPM-YDm6u0T)E9nlzMo#e-LRh!!Hl~ikLvf(
zhkt;<*99FtoC$iWT$L3idWon91_1tg6D}kYh^pUJF4+J)og%}w38yx&^)|{V1dui;
za`cDW=l9KB+OZcerBhSqrlwlV?|ks$Bj)L8{C?n)d0Nht9KUe9gun24D8aaq>k#um
zdxuHz<nwuV&>6FWH=qsPA)<4zR_~+v$DAlTIb;vfz6h(xH1gi?P);Jp>@J<Np9ueD
z!3r+_n$!F5|7b-=sew)Lje#h6h3@m*ev(es&4@>kH$<94m%Ng&>|6BUaseXr;=d4k
zA$#lPCoWGsMCC>(Id1mf&{wQ3uaRjYe$L$l9>q-ns^(R^1pHof`jr0ywdXKd=dSz!
zw|ZV)$$v)iY`P!%N4X${@4+A&W^|Oa7cvi#_M#qQPm(%P&_}v|h`pZeIk^)5bwR?(
z-TwLPZ~6WEaDUq8%J?PS1!aoq=Hxyt8b8vEE2DRWe)1%?{FCbFM@f9ZDuIFlJ4E^8
zE2a7jWkjO99DDGYha)xRIb!Vcq}ha=1eNB>x&S5vA`|cdB7b}!tw?Aim*2MI=+Pb7
zpJu10_sB24aboYyr;d;HkG+a}X>#*i%B4a?+~7$_qOG3?KOu?-ThW{msS^0ZOu#QW
z?Ra3h3En^Stt4PA!Dhx-)W_1W!foQwwdax>=jS*6>RfitIXmmbvrpZ;=Omr(BV#MZ
z#5hStoy0iJpl*dSsW>jQJ|MTMOj=%MvzFP*?NpSI%cLYLEFSNvW6ZRVkNE0Orl%*7
z*0*TLRDTupbQ;g3>InM;MfJnxh*%qFJeU+Jndq4?LTCf^B&Y@`l{=HT&Ltc{?^Q3y
zVJBjnv2ueJDk#(ioYt771e>17Zn><IT@9oiwePuXSt!0Gca+$@4p(oeG=iZTSiO7d
z=9{P9`#^0ZQfrb|&Yb$d?mmahexkg2{X_dc`^NG4`Qt~z;T4g(@1W~4Ur!oaCH_K&
zSIC1#B(wui2PSu=QW@kJN@NE{#{0^_kG1w%Oe&G%QV52kBn@rRC3^Uu8_u2EaL#+v
z{QON%JQRw@L**o%fUEt0`4@EuG*iiA54v<W`p0-3whqWJJ_%L!sK~ACsRck6lnMFc
zs9J-{vLLyrj#DnV)KmdiVXY`bW+5N*DUyo{d*kKfDBz|bZyW1=`@Q$R{m2RXMMHH%
zWT2fr|9pF<tEJ?k{RA(|x_>5E+vM3Y#ZGId=lbh|Gf*uS_0Q#mY(>eviE_S)WQB}q
zRvd~_fb{bH%Sl#b+Tb-~3#2OMJABf9v81Id)BgPPEY%-rs5V@*pFE6io6))Y{<&%G
zX*RXR(^QMjQ6*W-=PE368K?8ZobL1YybdJZ<K&X}mUxv?`wH_;Sw7*I#`jQR6!-zi
zw+MsLxFA3BQBeYrd6I7w5nYjQY#}?3ZQ<L2MDo0D5K<IqYv{ha*!%C&Iof@hsmSGE
zovp3{a>MD<?=C5;-#PQ`@At%^B76<c$G(K@n!&nP0S&bvEKdO(C|D<8J24nEIA?U|
zL}n=zeB$ydB@$Jyp-<J|VC)UjYVv8QxJwKeCahloVobfIoCgaKhN_BHl`3{S63J*&
z1NhlW_{ee@x;58;C{~9j^mDTNdM9Jr^tp3sO=NX{^RfnqvvH)!>N1;MR{m;E-*ZB2
z_oHu1`&U1BVE=<tfg`q#w%@d+?DiCXb=WXoKL+i<e7msIG2<AW9-@FAyGXCem7(BL
ziNJw@l!pQUmnFDF3CTq06WksKWfe)yNnB&xIMLST?`^LLRIQzb(#<TF+qPAwlT&Q#
zmg(s&r+0a3kZSSf^@H0xAPt+IZwbjGV=bVz*aOfRX%BcMWP!1wPy(=Fq%*=k03X6U
ztpHce&@Dx2<n`PF2Cg((Z6VGV5$wqW$Vg@6x>{~y@EAzuzbH0B!Pc0Vx-h~*VmIXX
zNA~whEKoV-ig+E-ENHV}oM4zh`C^_V1im4A3MpS$eEl3PxtC(Xsn!L)07ahum4dvI
z=9r5L7d$Y^eFtP!TR%2-`LV|i5nDJk9j~vCPqQn>moGm)v9NpRt;hX!eRV!;Q>>e+
z2a+T=lo@~t%OI6PM1aW;qKqB}Kz0s2Q7sFk*cuU<$0;fGs=5kGj;&&Kxk^ZF;p-U1
z`5_%j(FK9HMj~jm$xS6u-%+{uus0&q!1~T3^Bc3TXGs(M`=dwyp0vL#Ys|jNf8O;8
zP(<t?MaG7#;gi~=b(v{r1@d?|*U5UMQz0&;2O|SM4&;Cgwd70yTMAB;!t*0i4dT26
z{A74)OvWPqwm=)@-8K8le4wr<uVoSkCTD_zw}q0=kV)3T4Ft&a!96hCD--3P7$7p{
z3U4j5RF|>Nk&&(vUnMHOSbb^rPm9lrG~iviid^j7CKKDTe&ZHqFqf7ZP1)DBY%_^J
zO{S7<TWH^sY)d??Tmo(cs0U!wup>m(HV?7~sQO~LRBnx0br6HvL^f|sKG|6{pZUbc
z#_Np17W2x~<lqIcDx~%PRd3s=D__8xv#Y;>>~<LUk4lId@S!vkj;fJLk05~us8cEO
zrkHj@_t)w0G(4DOxo9L@=dQszb3=f|3^PE0EBaX68yN$zOJ#YmGj={!Xb-^KoIRkX
z?;tVM8(IYJh15y*fPLH^&>;0^dXUClTLUuy;dOC*SOSI@)bt~XACf<Y!Atz@#BR`T
zhuk03OnSm~fpCPxaaSJ6{AM-)C@No1&v>tI1lYUrA-$<3cmp%Q%puFeH1ARh{h!6W
zR|^{!nOq=}05A$+MF(L;f_D>z=ys6~f%C7NF<f5FC*48zG9C6M455Os7b@Xa_NCf{
z1^RZO4nF(nqozb0`t~9v94ZI;LpsMz=nt=RX=RED2#EqpsWXTLH)u<FH7QPv7^=ze
zE>T7ivIWpTi;3HVM0cP@EoB$L494%jKfcem_x_FLQI987*529I*k3u~+sC5WZ=q{H
zeCQ$O{Y^Ax)a%2Mcb~3LefdG^AEa-t+xjHr&#<r(<j*Lgm4M@w<ojowqs)X}<0R!R
z2oSnA-@iPeM8bQ;OqDlVY+twT^2UvmyDn{VwY$S*tsTo-`YJP%mu2VC*4CpZS#9>}
zKn1!MfAn;7>LoH>kaj8Nu3Bo#G?Sl%&Zq?CN>4jaWcR?d!7RmbUZla<c&Aj?4>ZE1
z`f@9z`H@9E86hEqj3`U=qX~OT*dIx2QiTUpKGz#|3K4@u9aR}qRXy52s!B$x-V5vA
zclq-BppzDq>&@$>RAUTy17O&|rg(X14br#MeTBNBn2B+7va)jh6!H^)M5y-uJ6PoL
z`|r4)mYI2vU3rnkvVV^$!o6z2p9gSnA8{TV_%p!BoIfMDnu-*Wkx#w@Czz`oMEO)U
zJqMNqHjVgPR2+yXY+5z$az>4(V}^-%Q??NjC06e$F;zM3)lit(l+GEeyrX8Qcm0Sd
z+VDc1+X~Ar>CZ1_KUY@r{%?<NX+;0>IzDm};5|CGlbi3*d!dyIGdl)OR0Uvi;>mpA
zjqGn=A%B8QJ7l^gHJ`>z_TtxMk_+qMk%UHoC<8+jLLn?#$ejfKZ$PBpJR}tSzZ)Z$
zw}bLS{KEyr(?V>rJ`#?!wuk(rvg^o^Ljh%~ULaT&ukWG8FOppusnVkGEvgfwcgUGw
z?54Vg!Q&Ti*<&zkjk?l0UtJn?S;uF$Z=FuGx`V;*mRHx5mseL;Bt7n`Pe1$T&oOo<
zTigFk+h|B${i*xjb?M%@dmGH(Z(HH_uV_CwlI|GdYZ?c}y$$2*kp54mG8(C_f<BQe
zY(?=D#f7U1N5~DhfYZQy#0yvD;WTlgi<Ch7T+x&){e?#O+#>leFfvMUd`*5X#TRu@
za+3gN6_vTV(dFcDLmJJNrp9DFN?a)+N*%02!QrUdPd+U$bahdGj0@Y4&eASe$&29c
zeTDG%@`Xe9T)gGD<D#iC)z{Y6mufU!v>)8bmW+!Tvb^y4)1N=EIoO(+o4##&Zm=b|
ze!ngs3B%W;3iN?&ye4i{;goA9H#rwbzA_n~QHO$4Ofo(*bt6M&V<#pan&oAjxU+}E
zS<<((*vwQvLeJ|yz*-~Ti&`OI6rhLL(-3N5liW+mw&4p=Wm!UsT49|P9w43`HizLP
zmG<@X=X3Qh&Y!>gs9FN!=-uci7E^;UZNiuwq-hk?@F2@If*>FU>UWZq<l$BCi1q=O
zieer_ovtnBfzbXC`)bqTf*yCyK2%)O<LBH?XUx%Cs&Z)18o1q0q;3?{P?|$07ZY5l
zG^A6KHb!#`8{kLQv7y-$mq#9=8O`=8hCn{PYULSD2^IY;kpEz~qYSUeIDsMV%Z-pr
z3Cgo7kpe>*AUwN75)`8*l?oOlUe`3VZ{OuaOG7;f{jZ%17r*_Z6=^G5!!3|BukcjL
zC{P1|V{4|=X|sUTi)0FfNfAk56wyR68u?(Y;?_yB#H&IK)}BZD&}{GzkxCcCf)wL$
z*sKoPUjcLxf)!y(crStCg`7=2We@2bwfpwXU-o+URn(d;|JtZOcT#uk{P%y9>MVWi
zy~rufEwCbviTr`w-U}BHLqq`05q1aOky%UO7s%oT&7S)K$XKZQ`|>({-(|(or`UVt
z7xM;RsPoU@R-oGk=<`FMYaaN~CNg6vD2hcPsTsQ*YSKQcl^`KVN0PW92PhE*N)XaO
zAc3A9^hSIU3OjPzD=nrHRAuro4=Emue9Vr5+`B~7LqQ(;)Y0MM@tTlQ+5VZW;p}&!
zaeuJ%jC04-{(Z)-HG6}`z58R4$Gq|@(;vLGwQZ_5la6lP_vi<A-ge}X$B$3-CldW+
zA))^7<NfzbacOmi3Zlx)ZpD<z1%tqK8u)-0k3}~b3_$u02jamv<%B|Ifl59CKl3j+
z0<pGlHVDf=(?cuA^w$~1=$!qrM;w>#E*!}c_8@2{@;dILcnagp`@Eny%G1=29dT_t
z`9np!Vn4e22Cnbr^bEnQcn;d-a{hhcH(iPCP3?Jq4`TH3UOXT7W8(SB{e<t5>{RSe
z`SYj#1HbT0C--TR%rlx9cH%q(kph`Y_%pR60T95D7vZ34cw7w-;S|Cu$fK>w%}ZO|
z08mJ!QwAb6Fb;B?0DPF^ced@}KFqx*Key#M_QIdB&4=K+Y-``bU6)h0{;A${?#}mV
zcW+;|i~D_q9}%^*6o27H>N>_M+G$L}kEo87&k485?Zkz7n_O<L*x&K*TQH{+8oICW
zCv7Bu67DP7>As?Us;C|HftB_dr9F)MxcS_EUOZ39C&7Ivy!|ip{lE&9WABp;YXai|
z$0&zDz@6QaW(I$OG3jNju67Rd4N=x?He1b{6_Q`17G5)o$Po0KLG>~i%6m`#@8iAP
zN597(HPi=A3+nyoqs;p9zy9mXw9e!QBwdf^7%YK-2l|2H(-49)3FlmVB(EwLA3>+{
z3LW{_$)P%N-+NEl>fG*-?f#FveFE|%cc#W-aHfVL*?(qXQb%xSzTfe@5($1s*ziTT
z0C7OBvpE!mNgM8qz!FX9FJAln2UheO2Ub2t{s~sg%Ci5F{V{F@I$m}4>vBf^8GJ`%
z&4Yi>SLL#l8DX3fx5eEH{ChAOEB-x88gv}Q%!2c86ZS<)!bFgZ=nrq+^;ehZr!*do
z#?R49u<X6>Wd54zY5dOqpk`X$svRA<FtSXiTZUhwkSMTr4!n?E(Fz8FwSx!_Ef9=F
zIVR*x$92M221f+ge06125X%=QMw8}toV-y{6JjZ0QoPUIFu7Kk6T2VyFq?-h@%!!i
z0z+c<KiSzY!jOpl$!jD5DWm5#l4PkFXE-kZGiE0&?R~bKm@))gf)o3&5~Q?{#Z$8#
z!m3Z?fZ_2_IKb|VCwGNNMLo~+zo?%>zO1fdlHXeut`6I*rV^ZU7jqeN_9<kWbs*2S
zLGUri_KVO`4Y%Ig_rR_1y*RSUt1(!Yb!<F*&#es|?M;oTl=;yIpZL-ao#BE`PHtS$
zn!5c2rGjajY-^_!^Zi(NoM+fqC|=1Wahm{;%#h;%e^h`|r1oL9#h|$P98-=!S_@zn
z{%SwU0J*HL1XPnMC_|k5s4>g|o8p~w(Qg<i9aAj2V!W-pe|Y_5_M2Dg>kphwR@u+W
z+Lb+t9+OVn+d8_IH6|U&17EC1i4I_Gn1obvFj#7_*9$OIoYNLzsBms>V;BDYl8n@2
zhlsxL?@?R_R*>k^h=QRK_j`B=3>9vA4Tg#|+S{1KZ+!78?u>uv)74|VPfKB_a2Mfl
z#&#3}2p0h%`0x%+UD!%p{NdG$xDU7qkN4qvc2068J|GL2B``%W1S@ojB-u2Xf4QFm
zB6H~B_3JU_%a<>GcK!zo2j)LZeH#Oo6Isn5vmg!|_HW8Rx(F{NW{<!EJOc&rQlwKu
zr7p%x0iFuDl<E>8jT#EI1qyXt!-h+EuC8jdW#iP;#vQXzr$^hOT}LpoPy54j^Xup5
zaC2EI#XK!XU&@8l4(eBclLCm;z)3K%JdoguiV8;sBE0a=4p$;YpA#8@evP?9KTx2Y
z)Y{VC8ZSFFbs_up3vBCdr+p!M+uA3xhpt|{c$ImZCU1*k?Ui~7SozmEuUTB1V3@>!
z+;xbFqw9E_R|9@C^j8A!&;m^a>a#RX%6C1S6kt0Arcs`_sSUXcp#cipIMogMWlP)H
z`qEHcZKx!1TYJOthSaG<NzhXlDy=`)+H(BWSD%U{N(?2@;79%%|2`5#%tuKg_SCDd
zqHk@WLsf{AsDJDDDB#CIy;X7}@KM$ZE>G06`fKn}1enR?sksIp#R6;21ZKS}(v8iX
zr*84P8yb^Cp0)9V)3==HX>J=jYfdFr2mF4wzHx`!rFZ!~-tlD1RBv-niOw+CHoA`H
zcLeim$NW}MY@yji^@G5=&__@i9$Sc`jfJ36zz$*R#wIXOSxInY!bOcdY}R|<_W)iY
zt!Y2{SQ|54dE=vx>9Swq>&ov>u~>2?Zll+2g1|=WE!v4Di1uM>M}L;1KS}iGI+!R<
z7_>W<!bBlcWPWW`<Dw(9{L=W|_wBMqQ40&nmzUM|I7Y@nnqGP3Q$DXwulI!~7DBP}
zU!^|rXLC9Qu19o=x`aMC;lHOjs?6h|;Nwuh=;$x-P%w;9F)L_cxepXu8Ml7pOl^2R
zLZ^vvFY0LmL8D_t)-mU(%f;@$bR_Jl9cqp*xOZ)N77?cJ7`@}XrxuVSCbi-@5%j@A
z>jby&b=C<GHUQYTOTyZQVwqx<AaA%Ft&i?8?z#7*&Up4Lf<Uz2`qq^<{%aGstZCDK
z73>2O;h6BAqd!Pe@^Sb_v7rrm9L4*kaDGNEJ$VWL%i1q~@yZ*2^EZ5Lm0WvJ%L07<
z)IC;&$?|b{4fq!kXMvLy7RwR#4Squ!zu+HAz9`(Um)~Eh)diaJO@99_%nk8Pet+t-
zx;Di;L|6bqKYEJ&^r?3On@`+{-%p8q#r@HMeIQ~{DSnVHz@8=D1N^xf^n3t1Xjp2K
z2BrHlW?KbHN>lC;c<V&q8DM-cvoM4HoXJ?KfuoafWMn6R;T-WN1k8bjO{WWx@oTAz
zi>_1h&f;Q(paG^8>FsVGObs?7saCYj9;vfOLS~YXRUDNFW`IEj|0#+#*<MMXU7U3(
zPgcN9oWC$sB)!p;+ntJflNE-Oi{8eZcDu8>rsj40pxB^&u)*JceAlky?fwR)$zI97
z%l;Ru_eP(?O*&7e8yeClJ8@gQ74z)EIw6i3^L!8ug6EcE-E1V|;=Qop=kQ`V_D!~x
z0=$@NS;22ua*pe&mbI>5dnuCGaOu)FeUU9&pMNGA>Ux<%z;VyC!uN`CVxVm}veFzb
zQ7uJW2gqZv0119Md;HR4m!>Wt==%_D#jA8b3`OojpYu2|v5|FiSk>#|#Jndq;lC?C
z!L9bP$LNQ55BIA<|7LN&ML027cHSCJ4E_9<Y}4@x{5P;KfBWp--(YOG{|N3+v`dU1
z<o$v;)L=uJxttC}XHeCF$XZ1r5}oXiT=<9>{gpQ^65dgkz%=9#zn^0fPD~IAc@Enh
zw6M$!2d|^d5iZ1u5tcs$pcq$4AcL;EbXVKj=J~1Y&wt|yg*>}t?IZPTdpB;orOxB>
z)V-U|Tz<YQpn)vHi(!Wp;l<2m*tuMl7ITFe=^`-Z(jvSVe>@!y0LGLqc+Yh69{lT>
z?Dmw$@AstCKFHcDZ|n|24G8jaS76-T7&ql$UjjEqmbg4_tfCy*tX&nZ@FLt8??3_g
z>ihyT9OBQv`Xicv)u2j?W`O2g0{@x8vk5=;9#JgDk7k1;!&L##gy2NLk72^LD{G1f
z97;Y|f9-V`j&c=3hxGdVH(*b__NH_N;nO&#pWE%R$zg}j;mu;!aKORwW(u~K3?E{k
z#NHGDnp!6&<Y+Fl7+JlakNT0J5=*tUvNKxAK17)WL$}z{J7+G7DPWH^%^q2vuvXgl
z)<vo#bsy*JK>LB_!iL!(yqN|?Q#HVwK?8@j#BtM*2Vo4%0jC{y)X?xaJXUlR+nnRg
zI0MUflo(mQhu#x=Pb7H%p4fYW-9;U1l(k>}vgp<~zOf_M9q<Yzw;E{LF#0FzNK)*q
zm%K|HZ&vGG5^n}cun2Ef?Lx+WOSu_{2ru(4!ka0G2Qtp*>Vz`2wB&)ZmSn0&{?Lbd
z(~a#F`)l_r)g`+F@t!uegQ32pzb{SQL;rdpv(~Epb2_e%H(M;J)>P&2X8Hap9+z|~
zhd0X$smwLI&$GXxy|JU0edt51x3i(8;(&Y4`ZEtaU>;8Q`PI(FLOq?Mlr)#~-mO?)
z%F(Z<9R0{qyMw<cy#VAFym-)$Uzm3#Z#(84XCChfvw`{w_}=evfh>73&K``Da!g(q
z|3y26O1mzN{{nSUibG&7NSa%W|FR=7jVMf7Zl+wZfPZOt8A4$$AoYR}jhqvM@+~qI
z+&4RI$ecNoDOoqQWp@3B8mF@cKjwYMUX`_fedOjd?|jGY^U2{`MiPmUTZWS~CTK*m
z345RNtnLz?yfAWI!RdSy!~pUS(2NLqSM*gJbCtlm5%z%VVCn#t=tdVJLNZLKut+8M
z=@KlAaD?REBo9gs6eiqhZ4JHE)rec$InMl-GW}JZ4XfGMK{v|N9$ZM)>-Ebrlbf%+
z@xsA`pS?F|ciH^de<hHis1Al-g3sB`;O-mGrwHTLR^xV*2jHiJkAxGRl5L1a4wOv#
zz2tF5j7E?L!a&kdvqBeOvBZ3HaG1yrT~MN<Fhg`fr4GsxElb!*;B8;zv;{cb2GGwi
z6!ttMjKntqEf6$DKPRjLZd?b;*xl;I*Sl^*rc$LwM2l2vRM2;YbQbc+u`v`FDdv;x
z(&3k1KHL)>@0wkI3-bHaxbLL>q3X(nB?Drk5K9JR1YCl87{(MV8C3p11V%=C8OtwV
zWaafHpL?rZy~XVpT5?O<+#SQ&H$D_=(itAxv*$5`t||7RzrsHjJB0H^d_13j+bgvY
zh746IWNl;c#u&1?VhowzM;Nk(L^SMc@wX5~GJDIs*Tax05Hdp!LS`UXnUIHxpb7+;
zlES;w<C6P2(!Fwt+h+CKthH^Oy{x3hj=wFQa*wMom)o1QSXmGL0WN_vU-Gs7e*Txy
zXl4EV7_0E(b>f_InGTLnF4xM^c15es;m1g+j;Z)Dp2<k02-Q$JqXuKtTjptwjHGXu
zwcmZ}sgv=fg=;L>gOKSUD?u7~GyE9j+#BJ?lvTZvkpwJ<{jMLDkn7q>Du(yHihoPm
zN%|p$lAYujx0C!axUo9IjfDes*W$)*Y#V_I{CnLu)m+~?vU&XlLrHV+1_qLzwWhoH
zdiJ6Jl#}YM;Ksl-ZiE{X9HGci!Je<Jx4<S*Xs4LDc(EkpJO9-pJ4H_a7)D>N!Hf~w
z9;CgLDVQ<Ny{?ZLODoI?9)qRrCSOn9eRp!MZpTBLEit#ht|HRjRo`#xuABSX*JSON
zPMrACr+gm0Uh5C8I~Yvdxu4b<VaTxE5N%(c8L<}N#ehK|Y%Rx&fs-1MRsu*d%Fn`k
zY22Y8$Cg00<&k4WlSVo%?cO#0{g+Oj99nGQ8M-99cFoW4`qpAA4_{C6)hxpt))00K
zX&Z#zS&SV+$ABF}S{b3$@!-2$+5iMnEZLirkmq~n-nZQnt?`8`BI#xEK4*9DB}nzJ
zyz;EqO#yiRH4CA}GhgNXP<7J^MUw&o6zDa?C1|ueg_fp1o_Gbg1<zU_j4xz~#ea@a
zn(L@rALAw%GQN@#M(C-uPnO1w33X*LZVXl(GLZAzdhcFf4Nu;^a5onFONX-izxFkB
z8TVEDY?7|UWG!VX5;kMp)EY{&mtb<Ij#4+daR>c`JV1JtpK=pJ9uTN?jt_^{!GUK&
zS?6+qiVx?&Gei}05Ei#hbBH*Z$>~2ll!O2kc{T<^ITaXz3eHwi>5+YeJR?*2IVv;q
z7-{6_)OYII-~ZU?hI))smMp-Dt(L2$Bs>EbS3Oe+SpfBlbaFEQV=+*4p3a~$*Fsqj
z(0MJTub^vD@>+qC;Y`kABr*ZXMB**B9V7xsGB*Hy>Q!Kp1%NY1KY73zWHKcDOx4xp
zFlSND!#L&)=%yftNei_=h-$*~gABKM)ES&^^6IAb)3z?(;rnmdQ)VvHmg?$!eVw{;
zP1rxPVe?F+)$F$?e&MXHb~H96+l;1n+<)?&@_yEzIGG+{EV5yA_rZg^SKRE^X#XVG
z?sByUCq`i~r9IIL%$X0ec1rs9j8nm!p)i9shdayFpy#kKrazjW5ISYsp$WZ3+!>#l
zrN3}v+*!dF-wN)m=yC;j*4)^TD8QYiSn3bNof&`tR8avvMX)o}q(60o0``U3m_=3k
z>(;NQ_2>e>B73Mfqj`Fwnnf2IsuXAxQ50?*ow~4@n@7nrM)z~$j1vFjHYB7Uq|AVd
zi-3@20q!9He$7#-h3C<g%7MuoKm3xCm+?zq{xVF&Pd*7F@t2G4X_cBX$))gW<mA-r
z;Sj^+MR+wA=pOL)O6EsWiGO(heC|2t&wqK_y!xnl@|GfhBIaWN{TH#RW+P&(h~&eO
zsnzYI5%?xZG*f_T4q*ulai~EkpGgtbc7PiT^5lt+=hG=3nz}#<6q%Av@x7#`;+aM~
zll*NJl$Br+PEAnXBI~0<++lxI7K2Q<+y?o?O>F3<+b)e>5KAHqk?;p7_jgIC8AbRs
z4Cq>X8n~EZ;iLjhd3+jd!m1S&hA`z(TXoLS<cBXs!qEh*p5OFFKTDQWulr?g`ox%8
zKp0WA7;+Gv33wXPwu;9J^t=i@!$ZXmv)k=f2bmQq(3dbtlzEf@XB=-P%(u7e3=Y%W
z%9+rm<XrO7rLUGcja$az(*w_cwxR6)`^%!-jtl*M5YHC+{qHa&S+YaF9|6s&g*E=(
zOldV3M-9M^WQV78v@m5EKy;59nFe4CFjfu_<GvUiZPNJ(D#j53ak>=l&vS2j?S_oU
z>tRyR?+JUuF8D`<+K<qIT2`yXu;f8kbkZFKurf^!Np|Pn1BT3+qyEx;n|ANZ{#&Hc
zA9GH5*RBqG@2WN5c6jIZBL|M&gLDlo{XuU*Wp`!V$N0FZ&fbZP*^P1gYT>)hjlAxf
zkqb2QPHq(24tiT>0PBImx_Hz}TnB|U;17rVu|O<j3tF*-$b6<F<lyxOYRHfDr3<5D
zx@(5&OvlD(tQYUK9otkqT6cqqJtYd+W4PFJ!gusz&>r$j0oy@tf<2^Qi#XWA$ZYQI
zA_;~ULVJRJ;|Zm_+X6D9V-IotnEN7ucp|?JJp%0<UqbC1UxIeBovZDXFOj!X?$J8l
zuEpL%-51!JUgPhDPn*8~y0|ZTN8iu;z5zZ{pHKJ0z7;<1BySgfWNIg11U)B#-wgdq
zLT@73=wPPO1(=Ja2&*PMPF~0mMUXWdKTOhg$lMaohv&{+fW3md60DtrkA28OM!A)1
zfbT$%bs4ZOe&)Z%2OWW;l>@a2`-GlFCvHn_b56xtn>*Xj{@s>Ou=jkjcWX!YEw8nu
zr-F4IiEu;1j%RhIh4YVVn>G)R%=ggv#aezX=kpzh!8+eg<0oG*jlYq%3!4GjSwLwQ
z^Of^2%JBT*zQTWp`zrpragDgIXs7R!ACK<al)qj>`Im)%Z<%s^CkRU^U!Rb2J)VpE
zlg+t{x5tb6!Sj{UKA?PyxK89R#XeB-FT$~!Z>R6`cIpS+Ujsh<E9gtVK<1hta?-;d
zCaPIsjW~wZpyGb0dUFmlP#3BK20jrFHP$uyJT8<#FEL0?=2T>n6mor$kU<uBf;kxA
z04z*iXj45O6h4<Ydair_@@4yaCk7@qvB8D8WP3v_)-czcN;S_lna>_!!R7Pat?Roo
zYmsep*P4;}ZuU|#9F8|N#gAwItgWdv-f(!JhxY0UjKzz69V9uv0<6Gaj>8(jP&5GE
zF<FSecqeL%a4@CMQ)wwPNkJCW<p5S`#LywpQxJA!Au1sXlUI~)1$3Xq4=!xD+20hO
z-qbNR^~nB1TMqeSp{D5i$yKxF)vNl)oCcGps;y^sYI1yJs>V=KRq3o*Hi>6rZ75IT
z|DV%R4OM{yzi?aFo&T>nEwKkUeTDuXBD>TzSRGPnwuy{JaF&tKb)ED^i(xw?3Kgi^
zA=3N*0N4)u)9h>!a0h1(H59NP%-9bJ=}^X2Qw={z9WcOPFTiC}c2kwOE{ej3@UV!u
zsu!rlRnceaDBU24tG5<4UCPUlj|j=~lmtldn&cdi*W!EBlZykaXXOuU+|aeUrL(>1
z=9{ApjnQDM>4fXV)X?7E@quNtgA1=6SU20z=twjkZK`)fo8onC11no^O82ib>I~af
z^v|VftUL!h_{dwRzX0X|gCVcKz=b1Te*ukvg^5ovdH6uBzW^|clEkGjiTs<^U%+`(
z>MTIC4@>7oe0~`!_Mn7Qd6^D7Wz3zydswa2_ey42)RZ)Us4$6#kMo|%J7_zF2!8|o
zXYr>1?NR6D9T*m_*pNYWzc7kt_&k&rztkvM8PcHf1bESC8ezs*m^3QR>Gd`Nswf^;
z{m_iVvEbL&l$F)!{R<AqjH@6!{w2A)C!J30ryLIZQNgY!TX#+A36fpK*rVV8E@@7T
z-3*BaItkHz8am#RiXz@BBj@!o{-E`V5@^DP(JVEVOQ(0PpD*hCKllAbVu>CzE_)B+
zT-ykPSB#}5KDLd!oN0R$7=Q{<)r$}B;H5dmU{`0~^TGXdR6BU1VyW{+Ui#`+v1i?w
zC{YKX5Krw}0#7aUwAY?_;qgqnu|4xBIqtvm<da`P*KnUf+~>wMW6^1XT5$Xp5GnvX
zflD#6(bVNWDXtldR8FKaDULnZn}idpupqr!el%Z>9(^G>;!SJs5*Cwc?*efp@@olg
zk!>d=IWk$RA6`>?7lL`NR|Nb1@2tJ6VxN8tTwV}1vF=QooS|$x2qrpJin3RTz9Fd`
zcAPwFsV-C>51}%lBUtGOR5}r?;!U_<x+NxrNO`h7iy#SLK|(gGYRJkFN9!-y(DwHB
z?L+K1+qEEm%ZcXZ#7Qb9D4T~)O;4X1dhNA$+>T$LV_`P7Y+z_$8Gp$>$Jd{1_oRnc
zNyncBW#>q7GSF2aFNS`GP(WhSN;^Q;$pir41f?FXhSV(L*ysw9TXGj<JjI{kYkbS>
zz?Oko58#MWcqmb-w@BX>Wi~kBS9SZX`ik-9VL+Gs{v<T+tu0;qXW3NtmBx-_5WfL9
zBKs(6v7-M$=@#Cx=X}+`JEPDY{Xv#%g*rHSdMO3hw8Nk`LZ;;uyhizeJe30Vw8NmJ
zJK@ok-df}>MS?P_t^)TpgfWsNT|rLx)b4WYBDKIoM8?M`Uhh{*H&@wUS<P2;Hou=8
z$v#1LRd!hYedP^N*%{+e@lH|cp65!yYCzz{guA5@ZOM#*vhm>v@Jy~d;8RuC#ECWW
z6<&hX<w=mhD{vj3c`9UJluC>xJC)n;YY3Q=y9A3<9*xlIget?N%~Bc#F(zoVG_<A1
zO}3bS88w)qF<;WCH#aryIqtGlRG)BGSgVhB@5AsK5~y5#?a&1fOO^((j@4L4!Xp5;
z0#`iN4!i&uTP@HlNNcQzUl7S_=?qDed1!&T6rpOBtWwd-XdC6C=pZ310u?l@*xy4%
zZ`xB+4c+@DqRq|GaC5UcwPT2-zu3~=zNL5M=B|S+(O{&xITDP*qJutEpl?KLZBjrQ
z$n+w$K1ItY@e$~of+#48lyKM)KVE}e8-X$t0Uso)9i~X}WT3l2A2-gQx%qc`%TP<}
zM6&DV6`_WPP#~E!-@5C6EnKII=%c`Mh+3O>h#ixJ1&<^I0_jT%hNA$oaeZh<9@PO8
z5uqjiNN9%wviyUf9Y4;_E{W|3Vj&3IVFl*{mxb*UN?<|i9?&3M!2>(NsSsx4uB@Rj
zn@A;(kpej_!fEh08-da|V~$n#O>vCI==?|7EC*=3-wE|_MBp=CVD57Qo&g<JiDQCo
z0~-<V@z{JGUA%{*k8;*R=luZx92OC|o!)E5_<M?BDd%x~5&pgz@1y+vXZU+1KO^ox
zfB_ZemZ=760eM9vE%u+RMVerR3%9@!3_`&T8m-b~4f1A#jCg7g2nmQ`by>CW|Cbnf
zEe7rtArZRxU_`MabJ=1pW?EV@_|e{<OAB*q+w7^CZQEvUo7wjCg$o$xD)hTB?-kiD
z5c7<F&!FG=crT7QCc6qw3}Xo%@tma8gBFbud0|3`T|*?<`yTr|;=S%MQmmI8=e7de
zZ|S_2NI`>n>Bi?C#9e6s*f9~B1NJ(R(U;Pw@i3qScTsMmN*GDqq|pc?fn+opk%>wR
ztPiLLLOiS`MpwcHw;oe|y4jDi6YOpH`4JC%{sDrYUq?te^(hxGDD5m>EA}jZKaM`-
za${l+V2zQ3=%b13!A1?7Vj#pc4Qlrgf{Pui(Ik0#Rd@(0t#%zvODat%iUKY}z>)m>
zud$zJ|N5`L$5!0)&HwM73xE6F3)Gh?+&h<N6Ynv$f_V4B9GKOhTD_Svl;z0hz+ClA
z3;2ae?MeeV+hB7;&u*gC17H$~F*kg=$|W0@PL0WrPCj_9AU$R@9*>@*7q|Jz2QPly
zjH>TXKls2?=016&c0=!l-Wi>42ER6-!!!=Ur4{DMY{2^j=FCl)XNVuzI!OLI&zUq9
z)L=*&CatiW<HrIYc_OXa%%Pfq|ML7{RDWC#iRtI<H?^O0c}vfgdR^z**QL&VX8E~w
zKlw?|sE^&9J?$Iq`N>b#om(!>osg%ICsn(W_Se;aLqDc9R_qZId=#KKNP-29gm`3m
zj3%3DrM;kxi3#4bB%9P~E6TMdEs_*C^jJc~Qn(m`F=>Odkfv>No9hCLCcluNou2)c
zapYk+R`P?gH{N*iNwMj(zoGfK`Z%6ju4#s?6!ZZ$xp?-yy!}43yLmg&1!}*Sw?BdQ
zGTuI{w7-wH|2gq2-j2P>um2Qp-+=39c>6O-`+DB~3AFR;`S|Jne@5-%oNFFOe{g@)
zjT~f2={c$!DL?ZZuN$fEJ<UV72KQ91c~V^Sq^K=PF|NNtoDzcUVV8d_Q{r`1LW_kn
zTa_l&n%?abkWFw>xikqv0dbQmoW?-y8gm6}au;C;N$~|n(q${{<M5(Oq2BW1C%6!l
zfGaMz4uX!wU4vpZF?X!eQ5W$Wjfndfu!+3;*ohF4beqQ2rX#giB-WyM0C}vds}n`s
zUDM0A95}FL`39HP>U#U(?vCtxTycxTVTrqZ!C+%|a`l=A@4oQh#Psrs?3K%gL~~}K
zIg##N-3z+|$vmB?oBj)&<z~vbge*N8)PNUR0QEWzQiYLS6Ju;6kCEs(sSnNaWH=lS
z*c*ZdBl6ks#Po$$5hb9(rs@fBtXPGF%0n9ma<y3-HVk!4nsk@Gp;T?{Xy7$mi)*tE
z@9F7EWPc!^R%*9qKN_j$#az)bl2^NsPlfn$DC4gv#oWX9NuO|i3`?fbG;1a+s{&T7
z5o)0Zq7RI(KAF#}BlOe9+S}_}{pHc5F}dR6i;uvG=V*!@`QQgpqV7vHM`QyIL${`V
zb1{Po3L4po7Zk@}l&yt)SqR6`P&m#x(zCg|(m<4-FFF{aqOiCNKV=L(E4bv%?m=R)
zBt`1bjcTVeMhBcl9WaN0(&Y3ta{3V2*0kdf5nfCyz}9b>-@oqsv5A8{?K3U*xV@F#
zv%fqPXl-vvB%9?UCT(W$(T!&>jT|4Jyrolb@mZo57qa)&XF5HGRh?T~(&-k=GvSi`
zu*dOOI`}!56*B?RT@$5x&fvE^*LYFJ&h|Wl8q)x~PRQq>G=1e}iDKz;@&Mrgg;-FS
z3kDK>khVG*e2^4|wVpgX)YjZ{;+E+{v9-0s$;O6S-z}#)n;X+Byt9Eb=5?cOgUEN)
z)7(4Nk{tJX{D`P??`YJ!{r<q}M2hyx?yGCqFR_+h2{sE9)`c}|WdRHFx-BwsV<ZRQ
zv*+UTYcNFV;E_h0CO6AzcKoTBe|#*SFn6469^1a!*3ofx?W6LKkNqe$9w;BN+fALJ
zYVX?`Z?)I#T9%yHl)0=c#fHT5jaR$*9J<J-PKt!k&oNK3tlviN^d#+yW?lsVSp$Q%
zU}eB+G%C3akt=7hNn^A>H8fsovaal>nwr5b_P&Mg=4Ah_tyg|7OS{66?8iw~>A>0r
zan37%s0!0b$G(P5B`?CY6+~fUscPL!3i#dOS~yXy2py0rScOq6m#_>dUM3Ay&WOM&
zpm*3f<0JGtlKzb!?Cm``&R?JWj3e&##vPmSgFns7Klbp$A6qV7*=O4Ohihtv`?L4e
zjP#{aeIqquo`CQ{omyb!Bwo8g=r{Z*bHRm+Z#F-jXCjzXJr{r?+4j=-)PpSW<;hjQ
zQE-^caGwsj3_2ZZ1X?X+IHg>vgRlxoLux1Ukt+ODN|lw?h*eKSf;2etb5O28D$r<f
zEW4y1UR~1?Ywz3o!p9E|$z`vv-{7$=Y|Z|!Zx10125Sp$iJX-`7Fmn!;Le~zTFkRn
zK1ZKZ2neVG<vbxe0D%j65N(LP!QxV#8>}s|uV6GyG7>0+Y%j0d(A8b}bYBLq^|dC?
z#Kq6aM-~$4E5F3c`7>vJjA3#9I0za}^<?$h)w~~&qPVWeb0e0pMbt1a>>)RzD`4fq
zo}h^eNqp_$_V%GnWl&V>1UYQ!IU)*niu3b(j4>&-XIcWF0c;%kS~M~a5lkNPPK^%c
z0PebMpz{tePLxOJCs|UD?Ze2yjss2O6!P1m0|r8XV@AOWkcUq;v~)DKZ1W|9u~Bi>
zM(0+p9z9)Ox4<5ik0cu`;pT-zuqG5W+0+wftJ%GJV0)>~vAeFvY+N9pa?TgY0(^e#
zm><HLSV+D@eOzU2`0mm|htX=2JeNPg`8apWfp7RuvxcU6<wS39>(t}}gd3z1+bFk9
zk%}^CWG8fnD)1sdWhNqKLAyZkQ0z7=d=V41Rn}Bh`fYwYZ1g0u<voKc2UVPbV!E6?
z{Rda9JhtqXb^XijhD*O{?dWQ1YN<&wdG~GUzSCPTp6_kU{sU_o?ilOn>+RU$Zt`Hr
zSex;yYjB>bC7)E2arwMuuwHYzw;i9hv&nFbq-<T37p#X_vM?oAjs~*L17ln2yAMuG
z?RT9tB;o5wbq?@#F<b3}`)5`i8(cBi?yc`>?QR&TuqrD;&zGeH=+8=QSc<xVCZg9s
zW|jGo5L}S@0kTsG?|PNf>aFzRN=seTfL<}mmqF6B$l(T^L}dy*YX<v4G}e1;=Jefn
zpJv|d5BH{!F2Bmb-eas<(KCMQ&?C2<eQ;sd?v}p3mfh7oq+swo0))LX6Yhtsqnu%j
ze!x%;d5*SjE?cmfnQ7}P71srJft{F|{2=?sPwk^R>uQa4;*Tbbv5a^N-50mS*vYTa
z3VQ$uInk>$N?>yX7Pn)4eP-s;KmF6CSLf$hPxgnu|2=~Nn&zt<`)H*c;M5ujSTF{V
zE%;EzU?Y^tQA>LX6b#l~Oq{|p!ca*<wS3P~>1CWFa7}*R1aBot0Y=>Xj{4U<C))-`
zeeQH@?fMNHP8>LSvLRiKf97}GwfP;1?X?rhvA({q?LBkq;rkx>9Bb<9n{SK9+h`8!
z_&%pdJHmuopx9E<5r_bws}$tM8JY%8DlU5=J{$Fo%P^$|o~(lyzYUv=qMwoXmWUo)
z1R5Z@LaD=DU6tM1?T<gTZ)jOpx3y2Z=kZVO1-Xs4JpSwK`?FUU>YG2F{VhB4%LVF3
z1NxCbyl<7XG3O4{KqKO_Po`s0q`H-t;A$pRjrZEmARro`qZ<skK-lc7q$*?<x7ut_
z&OLz3VK$-JfpBsCj{i;S-Oo4gJeRPabJm|t-PHEw&z--AS+ajS&?#@b^1;pl)|CCl
z##_5ThxJ6dQ0$FKoWHn)9F*`m!lvq}HI-^%k^x5RZdyfQ0EJ#)ONNp`9dv<kPGY7Y
zE-vT604mNwZfR*X+t_|rb&bp8TiuynKenqzTeEBBhR*bA<Q%E4ao+JoTD6;#tGpY6
z_uYEeo%h{$=Uqo03~s>k-b|l74I0V$E$L+PhtXfXF8){erM7ci1+|mzg`TSI1=lCY
zmxFeG26#K^cDRp{cSxL#pW^=1PWP!@^7_R0#C<r;ru(pfxX*uzc0P~%{+|}@P+94@
zT({%x&|c}eUlZ+IX65Z45bggi+PNIY+dm}Q{||oQ+z~zmxFO&@>ZA)oF)W3Z5~<T*
z>qB)kdL!F-o^-{kUxO2w^Zbx$9IjcI3xs7qf|ClfAYB3O56?7kJv+b-U>1iWD4|3i
zzYwA0gct!<q^_zCxhBfYCRofA#E3Y`M3X6^UmO;g!PO95!5Drvd*Hxq{|cMoQX()q
zY1G?R$x59|^ZAPx&r@;BLkkTpjlB!k)+1fP=iwzW4>Zq^7u}eLKAbD6Qx@emKOG=0
zh?30Zj$T<{^BaST!)<;+e@)aKEwcHEa^^V#RBZEu=>$Za7!JskK5zXSPNjzFCs<n>
z47uGo8{qM6)90tR@t4ok+MV`V{(|!r!s3mnb}l4u#B6g+3z?3G5!p{d35s%SN4Q{3
zi5zjf^`(&XC_)|bJ<aUa&y_qh_pzT|I>lalan*OOeBl($g^=rr#?(s4?~1H&VBzBC
zM2A;$$I~`kI3i6}MPe2$ZW;)r2qQzPZcuNCQgV60!;q3yPGn2J)79FZZ0#_;%`!AU
zHnG2}bvAW3o4W7$mKCwmWJ5O~TWea<Tl=~<uZisueW=2EP#+p8Zo>qYg}Rl@!E{nE
z07I-6tN~~{pk>KV!TAIF1sC^rY`8HExLHF2wNz_4fUJ=<QjK|*V*^S&=pyw!S6z`S
z>?vmLPPH{9R@H2aAK5g1xPPiMGdptI^ytnZ*CE%k?o`iE&mj9~(r<_~Bx38^2OFn5
zho?&Qrr8z!TiPOhp>;^9kuW3@x6^oJ>?)E`sg_AOW!?e87ls%ePw|HACKMydg@a+P
zmGDKQLxIcTx2v=oX^vBY6yxW?5yld->Fg`a`RR=tv!8gm<ia`j>1^iMh2Jp*UrP0u
zyEL8^q8#@DzpWDZ4_ZJOnVWRy&>2#M=Fu&l-)FdR;_Tr_BnT<6)RSNVC8Lxoj1)}}
zEwe2kmt{Y1DRHjMbkFq++;-E*jzQ-E*KoSCtEaU-U4FWTeNs+;x1}$&b9D4@h9)J}
z-PdMp=?qw`>;XP6RL`pmeXW750Y0dTLLbyVtnF}t4+^J_)U;5*9jlGmD@#kH8dgI~
ztK;t5emUKS&~8_L_Z6Q#);x1!pkZuN!`IiHov0`&i}p42Y)KEESliLrm1^tmG>_aq
zGj{&adT;N6BO@Ajv$tdW@bZHLw|2Fcx2My1>B8JX7(kw{7va-e`>X-Hfvjm{5UIjv
zP&|&(pu`y@Q2?db-I;3fk>=brpKZvP(Pos4ki2=Nb{oVMvSxhv7e749e*KSf=In3J
zUjaB>1Nq}u@M*jP8*Lmp_m*Xb?8wCq5lIE)6_BYsG!GM&sQ1(YncZBUPNeICwQ)}z
zWuo28U6PwNH60q!B!SPvuOfV&-B}<)L7QR8ndAMFeeFYc+<NOBL+yQ&{l{lo+fywq
zsZ>jQ8c?}(+ML?lGcsc_+9vy^_U@hPo3t4%Gb25lQ|x1n(TZq816~@lf724P$D5nu
z_86RgGGukqCtu-v0r?DY>Y+<OgP{52<^0rx&S_7rTWo|#%%LxZZHU79L)Zh+av2gs
zPHBe~QK3sD7|N}D1Kf1`>hcnEw6C#yYkKhH6!t~-zpw*R9i83mlPlkbJ<xZ{(P2$Z
zi??IP5ca^x?eF0mfNupXSs}lm$Y-20PYuxLq-*0)%bfcKm95Jm2-2j>NlqfC&*h^W
z6v9DN6jG0A*Kp?MLSZZcgo~m!YMx1qcCw$Awa4gJd0UP}$lJHCyG^hCy)TfpsDGi0
zkP#G~2LBM*qcyzlOiHeUO@yjw?@_ZhEM|06@mh6mad$oC-T`D?Gmk1df+rSTfQq9&
zuhjy+!K+tSIV~QmM_5o40BCM8XlE54%Eb(E;^fH4$qDh=($mvIKOXVVy!?*o={uH-
z*V}s9=GuDr%kEldxwDqPV3_D@5BAXzbW)Qvok8^iN)HI)hl5Hbm|es$L^yh$OCstF
zb>6WBNvYpc)GlB)Dgz~$O#uVl`%KB@zQ6j|qYJEV)1F(in;@d&79Dtg5c6CkEqmSs
z^DJ(wJlsK_E0Pg8qQI><rpAVE;mHy&HmkI5c+QHN1iVHY&QuX=rD+6bbp$dm?Melc
zY0Iw4{>^=RPIj+L4zfVjd*WbsXIV7d;vWq5Mz(D3TGQ$DQ`hhm_tlNE1$|3OM>Dos
z$aPdRAq+kQo&czu(oZ*b3t(R|xGVV)fzQrE2;G?gJhCX5L!yy-6>hx&6U#lKOj^TX
zhJG(aLtDzR6<`ffu>xvBY{6w==@diD=V(yU1L~P&a7)HD?;31x?&wSR^re~`>({n#
zi0zp@aBiZbe{E*rqoLl=+C+PE!d&09(C90VBv((j4(ys9M5#sdx{>}(tu$te%eYzY
z#C{;&yY*SYdc|h&06!pUFR0v?U^m$L+h_w2>?Y$@KBp)S#6cE)ihLuIRK%pQIdpj@
z4PG5$YqEdIYCpAZUG@_%mA>aa$JvLn>khsL2?k)vqS_A|<rw-Ely1qCxv)(utq8M3
z4|1y@VDyEn!1s)gwrc>hFKo}btCm`Y+8U5`8yAFtqfu6&a1jJ2cNB4Z7TS8)Kkw>m
zZ|&%8iZ+#>u4RvBU$q)5`+Iw~b@kr*(ed`Ru~dIcNmHK>to&^!znko8+devaFhld5
z<h<(oJe{&YLv2uTB}?#h0onlBcypdUeXK9BVtvCG*50}tBt6ob?B0~h9GhzG>}<sk
z@pM7Y4;&dLo(|N>3h?xFTV)%(OnAXM^k9DkuntDxv7n%Uh6|n!Qh_;UM~Rc)MLUU;
z4es3_N}{lQ&ADqn2O5iiQ~e0qk$e+mXENo=(rS1%3iv)swYXHi|Dk_=^(_18>+g~K
z&irx#<pDHYmTP<~d_M>ci_C5$7=vnGm+$AM_K)HFYmW6z4zw-1ZDHZIk+y+}zJ;|-
zsrKgP_Eb}AI^BvNbI0bcky(q;x+*iZZ{JjAmDOmO9qHQK!9Ls^wGhC^5^c_YwKZ<9
zZ*8r&$8kbs$Tl|v&q4GuChdBb%5kgovIcaUUBGTp=nM^z3|4h?0Q~$zdJBx0b{<!O
zq;8<CMRI~h1{HEFy|;LJ?Iq-eMPg12d#iqQCjN!VBg@LLw|W|AZ{50D*;{hmvNJQw
z?>xB9)3g83AQu+4)8@*4q+oXy^Ia!6@A^zhtsCj(NLEl;k|Hqx+{q7yA~6t4!gd6~
z;=p1B%m}1&#zxw+%TwjCR|-apdJc*dOdw04dqvZvjX7LIVhs=@3RvsQU-Y%629Bi$
zzUVWL-Z3+K`{?NHvom*${_M|vne^8)=}mv`!@7iUj#YVKLhY(z&!w)CkWkcB3`v8o
z7PO<QBpDRS1WR^RWdq!LSJc&smhSEr{9KRw<BU9h^>^%ZY*x|Tf%B)+cO7|!$olm(
zcLgf8bkXs}g38L}%U6z#j*fX;E)V@!%E~NOvsu4+?b=P7)~?;0iH1h&qS3n1P;^as
zX-R20e*qO?(!22TDYhE@4Q2e~j{)a|dM2^EAp%I6IUyAQ)Sy&oMUoStuZLco)u;O=
z?q2nqWq&cA+?)M1ygm3HEIRCy7=Ja{_n|a$fdlP0G({4H)ftW|@<d*s;QIvv1qus0
z0)M(M<f^thYmF;S{r&yRdKx=Eoc-OZshWUOwp!fw+CXP_GT!SCi|2j-^Zp#38<$pQ
zMr$BTR6~{s;rLSSaxK;6K^>!OL<J!v5Pzje1Q@?Xs?j(@c4oeb1#{wJ0eOk8Cm^u;
zu8eiS6mmBQYur8{M(vIM_NwmYffe<hQ2m5HUR`f<1&ub_fW6#UW{tPHy{&P741!D~
z&`2Vh^g+zqXRr<=7r;hu2F`>pgv{=SMFr;$o-80vc=}nBi3)x~Pot6%6k(7`!()a(
z-w=Fp2G)7`ZF`f+8Qsjl*eie6H*n^TJ23zM1M~A)+}}?K#v=ZHE$c3vl>(OSXG;aY
z5zEHoL-~}?ES?^)44A@IHC5GiTdi)q?4O=S1(!&)ad4GB?yk32)!KFTD){<dUN&DH
zNVT=o5@HTMj6S}IKH4FLY<t$k)o;Q55Y>SBIE-sRs<iv^ESpP4oHF0N<cA=;PJ}dg
z+>W3#Xel=uBs;S!YYW>~N4gEtYcA}(SRG)ELo32Pfio-Cm*|brXrgCTe~rU|1dmSr
zSa0L%etYBU2H6tnYHA<uud$cfYxoQ1`e}X!R)dF+J`0hbOWcI1CJM^+a`0dvcL~AA
zC2pr^hf-ej!G`CMVVEB~R4V1Fc!;gvxsvH_*~ZF-?_Qbx9qvZ!`Yb<hQREjG&SY$Q
zu8Y$xi2~+y@;pbzoW)~qL<2WB#!~T=FdG6CP|d2<AUW~^s-OTmkHQO7JUyJ2D`_Q2
z56`Tu_tk`l`uYdMHNN_l83%CFPFIz~g@4YfDt)>>5H)CxVPCYpJ?aaih;1}bpZ;s7
z#b_Zcm&N%Y{psW{Vm|=e#6FF&(SCr(6K8<@c{m9g##t=(jE3S|cyNLf`ixj+TyL+7
z7^n^|78pnj#d#&5^oHV5JWs1@h+%cdGkm$t${IIKs*5|;+c4E{|75`u6P;(f+2`b!
z6gm%`yHFp6+#~ZiQnnrB)C0rI4ahtbt~K7f;=a8_GS7Cu6*|xMvroZRWRm<Dk4on`
ziI+6HsFRdvRuFj`D&AZ}<k>SSl?RQ-y*`PtS5uCY9E}&XIk0kK(7<>qB;HnNj(u|y
z&z`$3jmMlnhv&wn6`5t%qw%VEwn$m@XqP1MnEd}963=$O1sace`wZ4#5sfFUuaL&`
z#aKk++4X2Vdn!ldY3il_fjRmtp5Z6IK{1`rsb)Dfnk#U8X09dkxtYnc=eJJgF&j6c
z^XTJ?=p&tL*q;TVFCgC#qcu1_d>)pj-r~&sk<^>*z7hGx96rtWH`!HJ6wz;mPE&T4
zoC@Y4)m%}|K){PXxd8>2PYMc7GC8f;v-~^}4M&`_Lc<GbH`YvBL{e@<!o~Fbx07(T
z`;VaEn9EONY_!&Q!QLSvjL1su0pSJ(KLVLXPz-X|YoIe~G<96B<yD>NBKg8~uF2Gh
zkMSMB3v$;Xx)kF6Qak~0u|Jw8u>CjW3g`oNkEpvyxO7lQyhj@_NZ?em<_?SyE)EUZ
z;tAkF?kWaMqyazd7kfUw=Uw<g36<A&WM2ao_^NWRsQi<w`|x)}CP%43{*Lr0*;MiG
zcf3C4;?KV;K1U^0`urs+D*v?T`^x9nz5n;r@AK!=_y4iz`^x9neg5~=?_cNn*M44n
z|KiV42Uh;4qUS50U-$VxD0)79|7S(tS3bY)_+J;_zwZ5iSaknu=coAdYoCAZ=l@dF
zKjri5_U}jZe9(=Hkp2FKols;DiVab1;@D#ROl>GIpKrW@wrRRiY{+6UWX<Z;Yv{*g
zvw3QfHcZtvcWv6ZYuCn2yJmu+@lYUum*8Z9w#lSNz@Wa)j-bEsOauUDMb~6E@u(0H
z3b9@dg`jc@CJKefOCz7#qVF4?eRR$0SErj7vfl&Xj?ql8zrY;8Q+};~ctg%Vyk44g
zhT$JJUE?1v5J=cxWWRqP;_;xWq;5m`#K6edXtL*%>!&?_Cp<dt%0PW*rnPNZHJ$4F
zG57S`1l6`seZqG5gniIGz0f^%*Sdw#9mOrYk=(-du~4A4hFe1^^c`!U=2#}3D%UR|
zdlO0rI22U{4W$^$Ub>u)gr&b`xPAHR245t3(`aV7ecTlBy4*px?<bXI+A@&99-qIn
zA(#N#J{fB3N&327KD$M>Th?L^$<l+EzrVzqkW2zptcj3eMb2P`<sn$!dUD<)X}IDA
zHqcB0DX3_kM8jCyN8h#3*to+mb<^nV|Nj2?DAOFlGnn)a%+;6h46b{^ktTU+D>SkO
z_`Lti-kZnAQJne1UEOofXf&hIXmo21&5Z8*zC5;M*^*@)mSkJTmwd^xg~0|3ut7Kk
z2pD1rYe+~q!hK}z7y=Hk36K*O5|R+|ChW3-1VTs_!tO#KU`^}&KGi*!4jcGn_qTtn
zVGi|FcRlsgQ%^nhoTAi2lnl`kDl@H?`!22_H%(5x>lnJkU2xFz=jZFq2-c3BGG`%#
zA45IP5A|BJub{eXRd4IElx|CYb|#VrJM*-I$vB2(?#K%)YG~>O4$|D&X&Q&it~0+x
z5ig=}6fiyy7*k<EgY7p_CV?nINQmf(v64tE$;xo%rR7BrmC-dcM=XK*K=HU_6)Ogc
z7W=O2S#Q!A{K1MPL(3~GTv@tR?bX8_X*H|L#Z-S=ZBx&RGE)hn@2SS?JwV`(0av_@
z*AY|rMs2)n5W6Z#SUvODc%#21=z3{!MRdJ?xOm5E=Go6Y?f<Y^{sZwA!p9Glbp@FO
zHs0AXNsPtBPL@E-f?`P&J)d4ISvFAQ%l0qt=veO0_7x2*!)Y>&zg%hf&!uZE_mmnn
zrUG|yV`H(qz@#yjddgdWk3%Iz3gLM9l~kLF4w-nPxxOAaeFkHrxrS{Q+12K=?P9eG
z0`UzeoaQmn`GHg&aONj_mv5F3q34<*?l8}up&4FzmPu#Krx{+hV&E26R%O-it5&zW
zY6i>1)Ig}FdBv&?G{Kl>;^VBH{RI2;!u~$n<M{ZF)9`T%&(!b<{e2eT<E;G*j2vhI
zFK1osXZ$>w$ji6J@$zl)yxal@+j)37>xyx6dhShl?)Md0crHKR9_8oTRDN!O0F~(P
z6Xly=Nb~Y@)-@kTr@jwk9;ok6!_xth%F}nu!_#R#B1*%*2TvEv&dk)o(}BYusOQWD
zc=}e()3?py>4eP%c{=Ngadq%?;OZHE&O|%|A{$w5jt%~GWH13wS9LU?6rP1_E6tk-
zLx{LT?B&edrn6)hvpA*UyzHDE|MqG4xwv&+evVFwp98+<`5AM5eohF8@N=xFdH8vB
zEq!W!&e|7b=zQ(mgZcR}U^^2}-^zJ9R?$2>J^EV$Pp3sTo2Pe0xjN_Tz{?Mn^>uo_
zzCF%{2Lvt1*Q03qyYqF{{;3!{_&V_V490ePzK#_u2*f|)_&V^$J|kZjix*<--0$TF
zY#F;zv`Knt3@m0)Fg`?j{y`-y5)%G{Gvn+IctHfDo%lW0ibYzX%?|`0p0NmR#)NXU
z&1HfePdZVK2R%e>FQX^&w!LV(i?>~;wmqh_T^DJ4jQ1|eYlXkE`;p^~&Z_W?79k=b
z02m*Lm(fy49fE*i<rLz=rJ*b@uBXssyh_=@=@V@7uLtmt#wzccnS|~7Z$ePICJfJO
zgfs5@ql4l=*$D^lQV`{mnMqcUHnl<{MM4!q2ILhEVBU~Wo&kqtc#=^vY(cw*JlZ!w
z@u3y^8XL%$%U<LuLiNV1VwXqpT_w#T6_tfoKWcbFV@+Ehpo4c6k8O!)u6aP2M~lpd
zx$<;JQy|5jG_h{oL=q|qHgzzK{MU?Rdu~%pOH-~rIfI#5#@4NeTgywU8l0&)wz_R~
zwwzRFLse;c>(&Z?VXCvjU0AI*=&K9!DxHqPK*d(+GVmPvi|W`YA{}u9WR8UP0;2&>
z<TiI{6RNr6yVPeeL}Jl_dp&dk2AJNpsA1^AiyYnMFCvran=JF>*2B_eTf-gbVtPuD
zWFK%`3H&9)`z}uy4D~}TBq6!-n2~9%%w*P@b|y13oV!Fb3=D{g7uTSQO%hez(&KL)
z_93#qJgSq7;31qKP*w%~^M5uQ@_p1JKQy@&A*joP2mv3fhBXeH8ZVy&0N4D7{GFfv
zly$J6cmKittaZP4;!yJVCEop)$nP-CQTg{<#qVsDU;I8I`Jedyo^^Y^&knD{iUWOo
zZ{~frSokjJV=OG=64E#PBd$+>71yoG^;5sbb^Ja<?!Q<K;rsDPZN||C87t|xQ}-%u
z!bAAfX<9Ci{C<(Re$MZD&7zq}<r%#HpTd73Ankclc{-o~TtC3GTi|z&XA@Y;C)O&~
z+kJdZ&fJH;QusQfmHUvSE>6I8HtwZ5DrgI^2=aT;7M~n){;B+Z>Op0FpL!5~XU%=q
zL)yrSr%_F>5SrLMqKV>JFwdp%BU>bVdBq7z;#`C&7c^_^%&gO!*Pw=u-eyRaP$zG@
zRhuMQuyoic**o(n8X8GJkc1n~Ib-nN#T_OyC?$FWnnQD@HYa0#bxTWmna7=-jbz?J
z%c7P=ZLM`RWzFTy1p#-d2O*!?pd1u$%1X{cI?N=Nlma^`sT*UC<m%E?-OBx76leNf
zHdmFDR8^Oh$h*}qa8JH=ddGZM*>FjoJGZ1H*PT}q`=*_olwXVe8T-~W$tPbUZxx!5
zcZ2Y02R?nmK?Rq{28)%u#*FGOTKyWFK~Wz-tJ!XpC_fNCgmNq*lz?LSL@;0-wWYPB
zHbu>0wISip=Z1^36}WTz+&-@d@nw0AJgePmw<Rn1vdqC3vC~8h(G~f7>gaD1FP{EZ
z?0fw9XN_7JE9m(o_LNpmlRFWRK{R;_r@@^vTz!}xRBplF^U|~Y2<UkwWRsvY5&kn#
zqBQXot*_O%KB8PdbuC{b6P&`ahJT2MhTocbTFgX+7YCi5;nc0Y0#^mN%b=<bOt#Wa
z0~kGLM#O`R#P<8*7!M^HLNQWoEBsYW4u$mk+|(BN3ijk8SrY5FUb2N<B8L{Snea2A
zM<&mmeDqPg3GCF7nF{1E`z=-qbmxLzr@sO$5ByN0)9%E4nmGVt7A7WPf1}++5GeEO
zT=r)L6k1<B9OvdjLeR(=SMCVkC?0PMJEfAg=^Lf{w_UtN+z}pGB>r*w<wer=>CvB`
zWRrUV*2$B2+Y92GnF)Wyara~3bPw%|#P@y}xqb@#D0Y3%+gRDu9=QB5bXqw8v|QL4
z+H67Y8<x&sCPF}?nQ3*jpi#_1G73bK7N$24O#-bXWqVhm9FSo&2~{L~hF+gHH#ZZZ
zy+sAya$k9_C)eZ7Q}V;0hm3&VZpGf?ubn?;!dYMMaRMPu__fC^a{1a7Yb)~$YE1_$
z^&6Ki+tpmTs$wR{UI~9rymb1BnzFK*+Oo1g-7J+gS_}Q<f$D;;@|yLn4MR1C<$EV5
z-<+I0ROWWOOH1)q#&Ps2_RgEQ?642MW)8>>*8&#?l5rH-0eJjpp#ZT2`M}q{@HaRf
z_l1GSQ#asxn)o2Uevfb^c=5hhh|c$&Iv=h0Gp^+F2cGd;LB~GEJ`vEgeaPE{pN4$F
zWfX0s&5r@g_W(;kI{#tXC-!klm%<NW?@hsV7x+hsFdSM1p+&1%1I_?U>m|cZOas~0
z^um~liOFV4I}B=rm&YdXV2!pfJst6l#s2(sUpklrRr8=t7|(MdAja;nL9)>zcYueo
zhUh)eF(8J3JjK&oeyXO-Ux?ZBaMOIfhfTF^&y;VVZP?4|Gq<-MZQB(J?P@#qr^uFk
z@NaB6b^<0pbGYm)o4=0@dGlAwiVog5v}5q51I63;_KfQ46=s(i|KofRegk8l#u)37
z?_(K!LC1@j(FChIvb{-K-5B&@$qWf}OgpX2NNMSf3=2!LCy7XxEsjB$5%g=2rA62T
zPb<C9*U*5HwVg{l8rmD$mn;rpJ85ZdYOJfp*t3xVfTFETLOrXeZA7K8ItX?3DhhxM
zM8(qHLhdc|33b)Z1k?aWth=KrCCiK;SNTE(H3Rr=&Pr+Oc=+*nIq&i5su-Rgw?0M^
zpSRR&)#x;YDSRY*$~+4TeKGWrd;{EpKG-SXPLa(vh1O%E=Bb*%fe34oiZy{51!70Q
z8ikf({UV9)8aV#yfi<wNJ{v-1i8yRo$Wam%((v45RZvSoGDDYLMG{rMMgUa;9>7Sy
zE#ImPzl3%C^rzE8Y^<zLe)=#A&>&fWWXt%GV2%6?tos7a>(2}S7$bvh^ZT=~p2lW=
z&yM3PA+i%^MZ}=ve9>rR#0;`GagP@JD|z()?olMnL8Olo##adpV8GD&Vr9^J0C(2r
zt+atOg-yILBTAbkC+j!atx1wzpNm*gC889H*fZV;;Z~0fgUQL(Q9H9*eO8D))#v~{
z!7+Si><J0o&Akg2!=k)g43~!vB*@2{P?ex$j8L1Bf@6>$ZcoUR7F(AIk}`;yr!c5W
zqXf;YG%5ei{O#ceRa8!po7wBNexy>YtyMnWn|}WJ=}HouqY|_wo>@xa9|702Zv+sv
z9b(3iDG$yLpd1Z3Yg2N@COQ-ta43MRg3>{Dy#eA1&Qd5T1}B-77D`RI37a9Z>Irtc
zaZ{?zk({D68gq>iyf2yi1PC>_7tc|*nE0pQb_uuB(`=)u%x3f1FbN@afmRx(gX7w4
zfM!2#zDLlE)Kmw9g3#Pp9jXZhtAbUP73F26CCF`1fbpYbw9{`-M@2p-Whw;Mtd0fo
z^O6eDT@Buxdia&&6yu5GrL%UmUx1T-v0;b0q47N~t0c=Me@q7)`JbapNIax&aacmF
z8)_n3o4Vhn`yE4>m_L=hCd?kB&G6GRzd@|}4LBvbC=)bgaltkMIf-N>N!$tP2oZ+x
zf*2#ii*^(Cdu$%Fj%pSR7@mKTO@W9{m6`NDxg>$k#J%Bz$>P!QTJQd^CeRgR#ZK&L
zP2gEU>HKgQz~Rh}70=`<@UmY>7QpBWxlKy#M);#+CxBQ7-%!R#u%=KH32Q-%-WkLM
zf307VtJv}@%0(uxVukX$cMnT9eO`X&@SBHkHM|<$!p~bBc=nIbC-&Eqw7;GoK1J83
z%W?f81s1Z0a+v7+hZd*a#3#Bwg)=tagApSf@&FVDITKXPjX0a(oh*p`XqP6WWq7FA
z3M3a-G<{5TH$C-5t@g{Jt*W_kQ-iu^9^P!!n!CR_y5-naMbQls7W5CGBl!u}k>rN5
z06-)|8ZZFu2)d#qa)biP{9|JOAG9F^C*3D*`Na2$6Y71!wV(7pIwV{h=}(9L(!?!d
z6+hoNx#U<Z{Bp$!8@NF+*FuaSm;>iS3FkxP2pF>&lO?@Lr(a_>h&r7KoYQ2=HPP~?
zOrj+M7A{;hgmLvQNr$t~LidEK=4~#R^(ONOMDfUdV}jYtdor5_u(Yf5AeN@3rSS8T
z!gLj}G%X_yn_h|&#ULH=XQ#PmO)8WEWrb6(ekLwwR?<*e*?`v<_lA$|-Mg0^-YY++
zUSi{wUZ1y;za>xNA7s+W$&Im#0&ogBd<);xj4EDz!tT&cii*KPh+qa9@3HtnTKJ|0
zA^@{g$7}ML5OPNYHJPa1V{Ueu&*h6Bpef0O5L=y5hmwhLI}8o2{`6x^ZM?JbSlsw(
zOG|6<;=9OLbYKbMHdYMih3DPlJP5T?$=Al0$aiv}0H(Mw@FirN1rMU~-3awrh)?B2
z+Mp=PJiIE7=_YKH`!D^6<U3E!QYERJ6Wo>fRRms|3*wpoi{Mp(p93$?Yxutd-h{1S
z0eHc$X8wRYMw@_Nc-q3lR&xcEA%gZw@Hg6%aI^$hTSNR0aYIZX&PU9j{*e#5i%%~d
z->X@u_bb0?k>6%Ry_d@OXI+PL@O9xUIZs3%ThNC?pnRRwhY6Cf@k)e8AiE0fd=$lu
zZty{JAvi4W$RW`2Ncm^Rwinl#vY|s)5Z7t%%`dkwr~HjxrEd-Z@nj*S_OFZ)7if$c
zj1gJ^Y#loVN=&~7rYiD7ka$9;gfXg`P}*igZ0)77e#8T6Ct~=vnLn`0IUbYA15@4G
z<FOdq*Nu7uHhyg%m1U2XWLI!%qN89;3Bll8!Q`o4`9-#;MPAMROsG8p7-9$(4*<!$
ze~x2XC-6);qim66w!~m?S=5C~@@{l~t#e_CiW>95)XPfbqb=-yIbEHB@Rbn+iSm>>
z2NF&*(AL1%fL#VS=i!4p>6i)S#+YJ*ApFoS%WV+J$gc?&snn6?yRJzQJP0>&@NlFM
zYU05l<V0W~S`UfYGmqmT8KE?yj7=oZc(}JoWINZ>b}j~<zDUVK!SC7fiSC(*+=IG*
zA@NN2xX@2av>z$_rm9DytfLO0BeWPqDMfW@CJMCIXcLubW+S3y84isWi_Kw!QjKUy
z(dpYPI4CN5HPR?JksHIK2VFTYgI?`&_S7p-sZGg?!e3<nxP)03u}h#=V_$nz*$#mj
zEp%&7LKpRUz~bVXXubpTwVT4%uEhjDuGA!l8LBB-!8WTNbA~m{zhD)o*`3J-Ev;lX
z)XM4Usc^wil%t9=IXx>KXWUd*Do78##8$eClyT~=0k)zVA+Y@bV;BZkO3`QdrL7xo
zZT%OPIeN+H`deCGmfzaSe#PGV=zR8`c(3xggp_gL`WC6>*e%gL5#vKV?*IHgh^pZ}
zyk?nJ_K!NYByVwSJ;P2IfmzA7@;|m0Cc><TIS4P`{!#n3<n6Zc2+Z{74m<vwe?R;m
zhB@JEMDQvwC+vsO0nCP&_6xEL-3Yr>66I~9t#6e05)xS;l_WQQNNRqanDHYja$4df
zNqQEy^9skobJ7t96gx-YC)S5lm?q>|21UI7<kfqQ%l`z@BwH@^&uzod^^*Pt?_@!a
zw+)}sevBS-W<C;|;eAQAq(bs|;yH_jQH0=#NP|ryf=3<><VsSGc=HaW=5QrweydOO
z*ABSp;s5+Q=@YLz@SQH`-DzcM?gih7rk}%Dk8oMrq1aA=YLc-PfkW|{77=fY^vhx|
z5}65Bi_W2Ua9LSrB5e%G%K8N07|F)z@dEKooFaw#>_(q9;Kd;folHqaoGvM>vLOq*
zxbb!r^VGw$M)Ddi%gGZXRS+Ssh|<<r3myeaMjxxgiV#zUHgv#TqFG0Rv!n}I)>VM6
zY^-Qx!)1BUfCH+$vhZJ@pPqi6a6$ENlDYmrC@c=OLH92}_YXk~hi`bTAaQwA(~nF;
zTCE1DtdPtMamdi}E8$$KX5WBhB=rkv_7joy^SKKBj??P#|C)fyu9-GoM+WtjY1c}F
zP9xt3?Kogo_I5aUf_znsk`f7~X=MBACA#zEk(SenJS+<C40Ca(W>KNTP&Bn}y~`@H
z5DX1;;0eJ9Q8iG(bvA`HrUT}NjS1NO6KXp&4#NJRDrqYGWR#%YAO00TVK-u>CkZ^?
zDK07bBZvfrf%wJlPo%HN`SK_6i=7EKAUf>F?1!J>dBaPW4&!ypiUx1P3jRj$<-)$v
z1iOco_>d|DX(?vgB2cpO$ux!qP>(dZ^>iLaJtLPs_|(pQ-w57!=)T}L_U$~oVChXw
z=e0icQ0sY3H!VfPFKEn&H{@ME&3URl?)=xu&vqTBJ^!^w+RStQGm%?CB0r9}6zosn
z$Lb%mxiJ&Ep!Z3JZb%Z!l<02@*TCRhAuNS0FJvM_DS9c?m%&vo$N?`d$cJ5Q@fGq@
zaHN0>1)6>4XF<)y*kSppE7)S?VKg@{V{U$Rnz@0Ldb+uJdG_2e0e&>>9X?hU*iCd?
zkwK|qFY2~EwIl)veq*FN`UJWvq7{fu*RoJV=hPy+FJ`l|fwI%-xYYYv*lX`|p%}{<
z_pSXT_tm05ajkM2;QXKN?^@x{z{`c7Y<$4WpN||-@%h>ABe`EWUj!b~ZR<FV-Viu_
zNGEjgLjZeCIXE!kxT@n!5lR(Wj}~fJx<H|Zj8qaJD1mLvWaujskH_?zM;kUZvibz=
zX3<s0F-*({binLE&|6%8xJ)UN`O>nXNy6EG<PoJm#bvII40JHmRp*NA!N!e^szUWB
zzOwq!<5v|GAGm37$Iy)ji;Au~#`{~3{>a8yiwqkD<O!hWp2z}UQr*9}*Vk5Zt)&b^
zOQShvPU|GbGyT+5!*G^KB?SdkAXhW8kqL2LU$KSFieyGi^b?z9J^WM-V)Kj}{3|+c
zC?KFtgsGTLdt14!hPKP4oZ-?pC=Fonk2ZsfVvUL%jnucmxRF_e5<8ObTPoR4y{Z8f
z*T`i~^_Yu>dJ}%&{L8E~Zkv_-<E%FFkDE1a@ox)w#svx;&dNO1GtOP%OfB?RY$f{o
zHs+h`qI#iIp=SpTmt-iCgP~6nI9($x;T(TC-V6hTh6J~hqa5X?gXxo-JikqrP1QdR
z{cJ!#cO>>hlq+n7g+PfeT1rI_Gw{&)m0Gj=VX7w_yMtWb#J^2Xk#8HH%g-Xum&}Z#
zM#gd2J#M^=tQt28IM_qZ_psZjb~o%DH_u#31C?$T(18EehTj_aZ(mh^`>OIA#&st=
z;%>%olHdqokw#Ie949ESkd>U>_#~<aKEYvr3hhrW*xrHme|z%q*=lpZ)hq<WAp02b
z-U^1Omu^+zt;F>lTn|dO%^bv&b<%Ax8ZqIR5MX!Wx=zr23$a~QB$Sgh!uCJ=Z0Ti}
z1@6E6{>_Ie)gs!SMB8tuZBc%_3gsXnzBu(KFT1St*=Mh~=I~~;1`HPg=2ro8K>GT1
z)YI1~qzL!_8Q1slu|S7I>YE51;n&F4?|>iWpD#zlPC@{ic>(!~$074Lh0;(FjuMoc
zL2=OFTn3Su8098-FD%#h!la18g%IXVxy5?K$>0Et$O82gDIuqTFYmFAyBv3?n)?PG
zcRZf{k15APrh)#)hS^unyJ&Iud0#qDKD4--VAVqJc%9fF6~ii(DR^PEEQ8I~mYpT)
z^hwO9D+r1PBh|7n;@nXVfS7o$3A$H7yBA)3aA#uroj|G4pfiraWn3_<5#T*a$!-k7
z0PHmsON)vEbQ^SO(9Y`*skZ}7XT00|Svn1sqCXMZThb7p8ORYBd!T0vps*;(`DC5T
z^Z>tR9Tdm4@Lhn^T1|O^)I1ZYc8JmjK9^H5-o}4_|B*-bv2|O|3oScm3;TLQ!%f-Q
z*$?9*5D4tuD?YJzpJqoN>W?O`>Rh{XuPA;`^SD0W<MHIn9th-`{DS;KAI*sr{w~f~
z!#HDY5_Spug%=gOc}`^o5|m2fIonYCUD~sCWO<ugXVI@;Aqo}^5)d!^y8*weIf)B!
zL^CnHMbh&eZ45KTn0KWuDOrM|cN7`<t?=LE$qY;8Z)%3$R&MkLqg7P%6c<nI9^K4@
z-TNo@Z{9V!>#TLFQOLQwYiUROlG^H0_!YUFNT|7qZL%xgG&~DA_Z8xKnBuB?PyrSo
zS8*g-;79Bj@JMl?oG{Ozfrr({E+A0_MNyM;k|*|6o@!fD($eJiRIhEQ>a8{HFqP-#
z`jh>6jTJhbmQ`hB%=^Q`o!V5}Ww-U~^}TI)K*oj9KQml~NuSF=aft)!7fZwXx<wnk
zCCdU;{bjyJcfH%6pQCknD+-o(d)IsXt=@UB@5$@%-8PD>n(OQ8%hm6DQ_}9vsLm0~
ztD;}v!~M_LLtf&tNh4+Zwcs4fbH5ANui&YJvn;k~C}QAFK{jW2vXByA(Dv2U2|`_C
z9URpm*VGgh1pQf{bvr4kp-Y~3vxWBZG+Q)kYS?p`Io@MQ{wveW-krm*Z#}%VV&1)X
z-hG-Mf|PNd$M;IJ5D598(!i2VwDW+&Kx@m*E;gM$yI2c&u_1aGRxCq_50(iB^)H1V
zhp#+si_=r&1&{q~CU54b@H_D4pvEFs;gVisiTGfLGw|DW%5T#p_zi8icOA9K$KUXO
z{P=q_N5Rc#Un5U?hX6YPwAv8qEZhSD)o5w6TSK1^Q&GuT0&zi&wor*TIxqp5k^kz+
zO`(=KKmOj-AMxK`s2G@NnvnXZPefje55Hje*<tyu!!(}hCjs-j1he$u49;UTo>RZz
zu!{0`0qehVSk2^-K=uh#d(;C!ih@cIo3Sm!BS8=BIaCOKG&OZotoQ$nb_yS?Kh0dn
zKEj?6)VRY?3c=644JKPA=L&7?_s|76D02oWq6BG;4wyi8f9TyoqPQk;+nF@4?JS5)
zLL~etc5@PceYKAqI)3~R+ez;qJoeb+WB7+R8X!CMJo@`B`s2Q})Dbg^YpBL9vzXu`
zZ6qfZTosL*AaP4Z(MXoTEFtQ)#>t1?lF45su4^*eE8Rnu!})OfA_C%ThuAFyhrI2O
zyuD3<MFj}}0WUMqfc=^L{51{m6XkgMBi>IP5mI5NsDRGJj{TiHXN!fGR-B-;OP|vJ
zfzm0K&g;++Z{?4g_Q`4D|D^*&qA?^<S1Z4ydOMsH*M4+9&g!oypMQxsL5#%|S4mO3
z$mZBZq5&OzZr+D{O1^#nZ~Y(=hnnc?A%6$D-v1QaKH4X?!9j?BGGn~%cOhp8G5nTr
zzL<&F65=<Amjnv}`$>%3;VR$xf}t2lm)xVnZ)vJdy`ZUL>$ock@Fu}__9kc&rRz8!
z3x!&N%*c}=ry=4ACqAfe=_seAI+d^mpN5A;x}xq*9noF;(fP`YJ<Pj=0}J-AS7&w$
zABvCg9u1G0QL|Wt98L^R>(n~^PObbZJ1S3z>EXBN^)KHrJTUd<;WrMxao`PFUvdFJ
zd`0n(ewjF3TlklB{S>Xc2bAmg64!21xpo`Hwam<X)HCxMVwfpz;GMrwSqQ`roFY%G
zptOow!mn(AKi>}TBQIaSiy|>%Z_V<*KJ^Ov`iau!)EDp!_-g;Nz!X1hY775U#aA2S
z^@IPmtNa%+Y>=*~+HS;CZ9#7>7j^?b!zKW%{AfykJN$uYk`J;g_%5)Rxel}R!#^{;
zfX)SJ`Wo>6@2L9`uLYT`8lti3AhRIfjJVNr6AD4mMg+uB$zM8$XlegPXCB%#)ee6(
z#T-*p;g=IS#n$tm3H@q5?o;>5$Uca?fG{tR8JzDgWW}K!MzQ8>qU|tYzjjfVk(b)_
zbyHLF*VNb1+5OY@mk5J2Z3KRASMkg1+p9aVifAbBxl7=Jh^CD<f@tm^2%O6|PRYNQ
zQ&HCRW;Vv2WMlYzn`3@}=?~-oCk;;?=5O*xhe4BioS&S0FI*IcLq7IG_rDQMK8`)|
zU3HHnKf$18(W!0x_qMl*mWkFfW3+}ET@9R;WAxR)shI8~I>R1|N-E-vZe};jjax%d
z&0q~Vv4}t}44*8QR*yWvj$#EJc;oP!Qx6#A%?I8f*FX4RgyG*QiC2SPngzq7CKR-!
z`)e6$Mlda&q78@fyA%$~m$50>-!GFdd;2hRz)KQdGsDk6Z+PxGdXAirb?_U&j{<Ob
zj>X8~2&!;kF>`pz;AeSU{<T!Dd|nSvOY*h6RsAGB6j{6U9G77FcB-A8CB?=Rc~;~z
zd`x|4F!6Kt!=s%rIeX@J?3;-HDH4z?A`{HbfvgIt#73na7Y;xxGSWp&cbZcay1+}}
z^)UiT8e!s0O(zRdmV^PHugvH3k+8{7J;~=S6MbGvp<gDV+9JGyT>4y;^Pr*%^jXJx
zw&wIy7PS=nQc`@yEky;*W%>3~{qk|Ps{gKxK%R|XEov^#Pf5;XJG%3lyd_@z?<oyv
zY#;ZtRn*Q_kgZ%zCz`qkG$X0J2mDI}@4*_=OV7(;fXjIg<1X)zjixZ>Z5VSG#e(>e
zpA)gZI$?Q0)a#@k2A}K|66B@sE~f9I#i`Q^BeYgc@VG=c<~Usw^f(ZT&}<E~FK%mT
ztoQi>K!DE|B==qvOG+GYWZ?9Ppb$M3|5MO2`xEGz{`qV?MDY~ESmB}~<JP21yNbTj
zd<BuQ1`0~^W}!+!7~cKG#%^n7^iSoBf?iq+Om@z!My|KNU?uoMZW4`wfCzU^@FUJ3
zCt7_y<3z1>RI}9LuuPQA?tA|V`P&a(#8MO|V(}Z(JNdJxT{ENXM))W@1aSTo#YbQ5
zBEpwqUBI=3ccG1S5p`J(|0UYjshI2XhquT2d@|<4Oj;r)4`A-!h|s$oTreHk+lyS#
zPfI;0Kgd=%QZV(Pcc}}cjik^pDdGc(D~W0IDujZh&^uDsfZi#$Ph@^6yGT7_!TMUO
z6k7y=p!|q6GdU%{xVeZ=kS#BeaTlmqKHh)Io?q5n5SzBjo*cHrmafc4c7g3KEDALH
z*ro}TdX%e8c{GkB;TU_AJ%V^2oOT0{PJ(9m!omF<X&k_Bu;wsfv_=8+2tQkl>I^t^
zkX^L8vb5Oe$;m>M%4F1#Ko}3@4-I<D05ntw!8Qr&6tBo9hUMY|!tYk;GH-REJ1fbO
zonhLnbrrT0DSunD+y&KM<$F?AhH+G%S<qAv`5S@P$FhrxvNOF&o!WwOFMW@^GJQ$Q
z;;+#>O?S-vPArP7(M~@tO~&;3v{y<!UBsA{FB5g$I8S!bLWIU_gw`kDTXk%luIZs{
zLwmh2-x_tznxq)V0uGewL&T~gGaLC-X81RA=1rNw{8Du;?U_kijYXljiH%Kh0tw_L
zOl@>MW?H+A#s27@3FJU)NR%}s`-*RI$)2*9Vwy4cFf~AMgrfs&5?ZKkC=_1@2^C=~
zeI^qE54pQCZZgu*&WK_I40Wy{pG!W8#8X-G^sQHl)!_>+wp@$@<K=7}J0ia|$#n9^
zB&OmV_idahx+sQ4)BhgHnf>8MX};iRcMsbwJ_T%pUtq})IAhqXl)}D9rHWRnA%K$A
zBTSu+_3wQ6;nZ2I{{ZWseiIFp=fDs0DexWS1;dm>nV~pd!u5bs=jUkYNeS+q>a%bt
z<<I-@L*<F`i39QpdZzHs%su>>5!lFSl*7h#&vRh|Wb~{lJW0xoJcj#d-owu3W8{_L
zBctTG0WeN1I}s0?H${M+6fhVt{bvl{Cyq=Vhz?xJ<bx+4&<LE#<jsq11STZHBk8IL
zlkq(y8&tna6|E+qHNF>2s{MEJrR;N4Kb~TrlP`^+IXWUy{)cFPX2BE6g%uCVBng-S
z(%?9QJf27fOaHhUiNsP$bRgl=I5j1Xgzx*?)KmmR5?okFhPrL$CeXnN%uuqha|JI~
zpGS|4=%{Eix#|r`!zfAy^NG^mpUB-7%IF0=Zb?z6{HI{p9DYDtLoZ-?*KgrI_}cWF
z9Lq5rlb<d8UEn$oZ+W5z9P9uE(r1iu*IGnfftd;bkN3H-hb>MdPGCj(FAk2DOWA$$
z2)*R1<#p^{dR+=^y#{c8tHOkJeB;bbpiKo|P()WkiIGDSp&T+HiXvc`42cZ>{Cq;P
zLP!-(@)?RjBsQZ4Jnsfh6C)wTADJv6`rKlgy9kV=$TDO8ID*0tU=DYwP$_drYdJE9
zDn!|{XAsW5O42tzeI9I(bQ+#D&HQxCJ+%Rjb@r;|DkZMbqE!n%5Sb{VBMt+{i$mD1
zV8xA1Oz}3yRAJJ%3JZSdMxJ~w2N7@~Kj1KG*38!suoy9+MvW1$q@ag*k5%rQ9)pLg
zw@AgMz(v3*u<@zm{3J4Gs}$JC0G=>oGz7B4^DMJ&ZXKO7U3C0ZeDX&^oE<C6jFO#1
zAYi+vz=Y7fGC>Mn;G2wdou02)$S?4n0khpqtkyG&%Objl7>?8Q;nasuUnCVz|B9TV
zDTd^;>rJFuMQ>sf^TV%*`7yPL`rIv_Q6Cd~?nL;gI1&F`p$+hU*5^7@c-!W{OEmVH
zm?T~fA0Wy>30$(CB)BJWp@NuueB6Ymnv}qh8tQ|3P%VPfAnE;6|LrBL|J`@{S;_5?
z=iL3b2Q-=k8cpDKh;2YMr{h;KU!O;1UTEv#5vV*JRzG^YV*dn(r}MwlUQLA+co)P+
zcn=`M@ATguWb%(#3oAe;sW)8j>A&5pVFx5HdU^W*?%joPY{5AAo=J~JB1oKSFb)Pk
zGyF{!528nMS#_!7s0I8kJYN4q|IAE3v+J+FUhnRg4RXKy7wG`RM#9gFqD7p9uQjSN
zr*d!g9*D=1f}pt7o`5K)y-FPis=i|w^|iqul*TUV@QMD_eFs^Kp}gE6|L|bnY9Otw
ze^8^Hl&THo(xgVST0xxB_ZIY>EkL?SpVc>r9U=~GDP#%;BJqL6MCTJAGR2<i0T7(;
zLCTvAgbR9W7rfFvbAY**iPzROT`zw;8>V|F>zXEMK1E@8=I6lm`CLbUTtP6W3f<T`
zfakf&M<mFUpi?5-0@`aGq*KD-007_}I|g$<-+wpDklXv8XG`QivUSh(-#sZ$_CKfe
zg}wAO(aP!5DWDR&({AONS5qBSiMrc{uDdYcdB_x5;6bLKA%#pOU;)U#gi~wyKgDE~
zUNiX2&mvo#HaHP*`lbC+p)L3@k_WOKMolb}co62J<s1*EW$nChVEi7v{0k0^d>7lG
zLX)M^AyDxoC^3F1MPTBDDTY6c(mStEpJK%Z4w|>yw1_zAP6A~tK=!~3Cwl^bPH8~O
z<&j=rkgN1zWi0?B(RCpIC4vsZ#fzvjN$Vj?Kn3S4S1PG?sF*uhpS#oegq&en5C}9g
z>ay_gWuZ<`A6AE4CtgF#BfOtI$Ja-;GD)*Zk{=7B6D0vQqDz7;Q*aBNp>}n>y3#mo
z*#sMwjR88X1=fwzNr^3-na<2~T0TZZ56ufKj<`_@4im(0uz%wV+Q+gv#G8n!uL%Dd
zRDE1NI2Z7`7@143ml53i;V5B&9~<J!bTCSR!i)w!nN|pA3$HD`o^ny>EqY5Ptu2rn
zO=&!Ua-)L2&45Yl4O{!47cU4uT&~V(eGC$X-@V5E65*q;kO2&X9vs_@L+0#-W=|nL
zs%1fJ24JLmr;FVtze`M%+0mt&rGSaD6zXX1K0q-ySib^P41E3K1MExP2lDN9;-6ZS
z4yeY1^|V}^dY22;)Bb$@4J@_)cKF`4U_%Jr?qO*M=z>=|z%<_5F$Q5Mx?ZuT(PN?M
z#v!;HNqgrk3Qw&v2Hp!52?$a*_j2_UZESD8NlVksbx6_WNc%kIOj3Cus=;HgAsmSu
zM|4~P-xGN}9-Y`EvCp2WmO~-BcS+a{JTBHCKglxg?(e@FjBm;F*zfP|5C7xclh3L9
zj>7v9WuJnlV~rtQmedX38&1UwGk;KSH8ub)^dbzeItce=^r?4Zcpg1w3E1?JPI6lQ
z`1+>0Ynga2ZAtPEiGo=RZAs@(Hq}kyszx&@l^d$1Nv&p(EFw(k!TML$81_R9nCO%v
zH<fPyT+EA48pruRAgWR3lc;1C7@!%_c_u<o#u1*-Ki_*eFUFx9`#k4+wj?9p50X(H
z2m3(^!VMN6Qx_wgD`X0#E>Y{{AXY^Dzo3xoA2=9^WUHuI75bgC52RyGKw7Re<cJcw
zGvUwQMdS-n10Rqzh_E4Sq<LziW7oUtLCHj7ST#{_Q1G2FK;*_Y$k2+F+%8{4usz9^
zM3xe%d!zK%AHTB1@P9?=o$rwj8!4$-Pl}xb<|M!XPl5=fkUhskJWL!dmqeivlf(bX
zp}8Q6n^|zsp9*^5mqh&673E{F@ndJe?DSZWnVTjDZ0&UG!xcpn7)ksxc}DF$EQhZa
zduhFd9~LiozMRttdS{K%g##j)y$>LgRi)F+42}?YD)=eR;Ht2KSPtkF5Vwm3i{m)S
zD_E>h2-$16_{3?2rcGTs9xR=B@WLFr)qN~m_VE?;Z}J;`tHU!eKU~4r_Ca?1`FZG>
zHN>D6!_P$572j7g(s&kc)|2kyFlQ0Wv;ZM`EV#TBvYrJhSHwGAeGw?13-2c=#cSlc
zzSZ&p6}9ugmq7cl%|0Eq&3Z$5WFrKT=@EZ5i?ZzL#89JFTi|Vet8IV`PU4Jl=4s|p
z?NvM*Gbz~xJ?l=`7SM?R^RmHgFmpwC%%Fu@-ky03T95Kn7SPrGyXuPqTL^qm^qLy-
zNKx%_rUbiO%`Cf|VvoapZ!7nal}?m@0-NH`arPvC0^q?&h(Lts={#m&sD%adB-9O8
zh7X7=JOgu~e8b@vSh9in>6sOHW{vvHf{-6pU}WE-6&#0Kg_!^Z5~9i6;KDPj?Lj+p
zp2SnHgiUs4f~`Hw_Dr8REVju1YCv1$V|z31oJ;yBNJYRe<p_k%pW*DljrgR6Lar9Q
zNsXsgEcr@YHz6Hav-BDa73vMiZXppKN6KpTSV^DZH`#l=?7dSz;U9EzRkKo%55|#M
zFi<@1hR`}vOe<MEV0mI=+_Z#TQuK*zQg$;^Z)ho_6q27KJXirqiM5S|3R{!rfJga_
z=)?;S!e6A*jeHLR#HaE4o)TXh`L4jLLQGi~!M`yvYsG)TET@E$N%0OAk86|2W9KTi
z*SlQR^$r*FeWA6+(0t41<oE7oZ~C7&@esSJB)p35H_iM>>=l23eM<K&Bli(@Nc9ef
zOLFKX$@Joj=RET8IsCnhRkD&!d75dK%0H7|>O@A@X`HbFup1Xb$4phq4~5J*S)xIM
z(~drpCMkeSm{8g2^x`<=M*L5n_iPlDh_E`~Y82X@P6HG|aCe16s3;x64FWQ4N~diP
z#ZYmPQstanUQ+{Z6H3@?k>NU4dm6fCAMBfSp}NXNzW8J^A$Q8^>ck>o?8)(Su4rzZ
z99nZu-EMu_@}?zAnwF>OSGHAl2G)*^H)iJ`Q&mpR-t|vh`;~`!mYmZmU)$QX^PF>b
zc4ZB>m!7lzbLU@n(w%iJtSSvl>I-Q~1S@p!Yk-#uczEBbc)miqhlEwDN2bP_A~zDs
zmZHosxxCKv1CkF$d|lljW{r*~?iE$U!APJ(VN^YAn}{pT3gypj0xWkRxQyE2s7=jA
zLK#(+OsH(GYAz`b0&CopwSrZs@uz3>WQEWPf>)eX<9t(pb~=C5IJeV?pXnLgOCxTi
zG1pPxlcA>bZq!bG0-V7Ya%1zvhAkc<9sA|5qH+CQJFoW>uxU+M#VDtu(18aI=J@Zg
zZ97_9ceJtU3zlB+LDSgcB|Dm?9}@pH47P^3T0GM)=3=hug%!fNA*T;}YuBRMn*5A(
zgMmq;sUX*J@&Qkw6~}muC~*`PjxI#2DwFF37|NxUw9$;>!OLlC=D7o&+Qx!_C(rNG
zAfSk99mFMOM~dYjhh0teO^(A6r()#hi)CC6DlN%DSh?=1t79__+m_Ufmvm(=@t4#T
zm-VjhsB0(;(8XQFU73pm#kJ9k>pfK~jW$C{s<(2b(XLNPmFfmc+y!ehbNqQ(C|U0s
zEGb^*vSltWs_&oo`p+_plbrB5aum5Timmi5l}I0?C<rOwN%v!}JVL9miN|LRH8+)(
zfHm_CNG;Y1YrR%CE+BoHM$~J@jSw0HaReVC;-=wf310;-Rg-O~t1K@n@V5F|Gt+Hw
zk5x+Gni0TCfnA6fjjeeg6Qs$@sYO?N8mIw0ARd#%1K?5({|8nwcy)jO)q_J<_4i*j
zv~+iC>+Yo;6RoWiD+jli57xDHrwp6&GIPD&ylk&&*uElV;OLGWH}?16xMRoBf%+xq
zENxkO&Jy*bfA`v!k&4FBVponorz<Crn^s)V1{aL|FwMOV`bvh!WRXxMjB|`^3?QK>
z`8^{-9EQL{psNU8aG*AhTbKcIfI*K0a~v-u915c_bO0|U#e|p2^5UwJDr9L3dZ7-8
zueqC~;s(Ldk)gx&pW}uC$-oDR4N|x$l|<xgy1oj(AS!^BR1a2G4puAgO)FP6;g#R8
zKH&8RTXWOWGc(iKx{6gbHLEI=_rm4Psm;szTjk^VS%tR6b%m+=)N-N)5$TI>=Ihob
zqzmoHR%bzqMx@t((g1cc4SczfnFbX{H3Ccl7$!F~2^x4r3xYk}uIA2$M%HF`*iAa5
zkhfQ3OQY1;^(df-_yz823j+WX&uY*$3@<lm`ua46zb$=jDZ80@cJG#79o=xl4I4(^
zXl;E1@SMwf*;{-rvV=xH4^#mLvK%jDO!NmhfM*!ifM>$8%W2E9XQ^eEPlHzltyHD6
zcDSl)xK?=&mX`<dV!f5CYwLz9D~Ic9S66PT3!?TAUW6kiJV&Nm@HU<+1p*YeH3;po
zTqy`)bRcx-xwb3Y&~&r>b=-!yoptzQ2KNOtrt8VG%B05ayaPFHH}@x7IBtiW^WK@_
z4q<qh2)pYf?xEOUz0j*fki|vet03_ZG8hl%s!w6Z!FdF`^6Xsp1UkBscz07%>`UZ{
z7XAah^Rc%gUWnqdc)coc)TOA$0GvR<!dNHjM`*Rn6RpVL?%X1+xHjA0IdNj@#EECc
z%@eP^HW4Poh=Ln?Z?X6vf>$UdEmhE+mu@i{GzO8EHYHFo+h~W$MvsxX&i66FSDIg%
zla*o<ybPj(T4K8vyB?;iUgaUQj`T4GBGFn>I1cNr8>!Ld>O<KLw#vbpwHvFp^|-Th
zOL8vEnb?w&8>~*Z6t1j=+m>c5IbeQ&#k#`nBW)Ao&4utDXm0J<C|;BoJmwp$Gr4mT
zaN`iZq-;Olm^BScW+~7^XF&`|>Rd_YwdFjwBxR?}pYyw7aRgfxI-+eupWuPmt>)O^
z5NeK?BA&pW#})BFLD=9<;2&lK^YPjQOQji+-=27l&q*fcqz&sX9eV<*BfB$^w*V<7
zAg3dH0T=*y0+px21+9e84-ni4;Q)f7zy>lhGCUccd`BSQ)gzv%p4aH2%mfMYo`<$f
z@(6K0p0dc>y*{rdy<_8|!Gj$g2M6&kAAHl%>hrcahVAJqn{!H5lx)0vZ0B7YH{P|g
z=4HFnX@41n4bOG~F-zYEJ)+tf{M(U>E-hIUz^DO<QOAtq5IO|7=jg_)%zy-bCWA08
zm{1QuLfUt5a4pxSX*VSyjgX}6D?k-s3z`)a7a*Uek~qSWVL{jmFA9Kw3wZUInb`(v
z1Gna~DzR$tIV^ds8lMCseyqR^@omb)$6j4hQ?mrG@PB+W({5QyZ)`H%VoAqq^((A%
z<L1p9=_R8IsQi%pk+>R3i2Im6{2;r*?_KTn^S2W#$<+!IpqrT%hr~U=zfWii)n~(L
z2n&%P?Sw0^-X$b~Bvs)Emvg`)C2>HD7%Qhk<J0<R9_>1uIQUwJD<Q@~yDNaDjTQwY
zcx5$bs#Sb%Uqfhje~I5cn4Vg{x~zPtE;W779W3eJ%?jC4`Jd!pmJRG~tsf0^X1BOo
z21`l?@sZsb7_D#JJx~T%CDK2OtHiai3;Qrfh+H8K4u$!+pn-!oayP;1%vU$*N`z6E
z<iX1G^PQ>4z7oub=$n(3ikJ+uQE)Ja5s3G5h!wvff{}|5h_~kF1q^}mp0JYE-Th@{
z{g4oL4V0A)>}stUs;U~Q;qT&vCH@y`IT87dTJ*j265%)w?#j^V_8kH>9!TOvX9DuH
z0G=K^;O`yaVz;;&*qt{Y0;aZ}vv7yl9{w)cr=#LygE)ZCoKR*uk}P-QVkD^tz6b;5
zK2ZnpR`H!A-Wf*_^<sl#V63)%_ljWgP^%a$Xxp>AVzlswHJ!eSRXge$b`PgY<!9G+
zoU_=CWWijfoVgq_<<o#KQz#JnLo1V!Xcv<WIuyx29Cl6(X%B@fkf%kfiR7CDPvJ`v
zACh(yyhS^Zou$$EJXr<V1)5Avrqf?!fLLLa9F)R^@8OYJ<yeJKzD7$+(aICo$}h<;
zv68&Pw&ks@A#;m1n3I!VUgc4Xr7`ZX%<d0=+^kzvU)SCiNXznjvQdXl+<GM4ZnmeT
z;Vm7bSc!9U3G_PIh*hl+t_mTw4Panq18RnwBFBwV2!{wmKNq|kL!$z9W|IM2#%NTy
ze)~!Ro?=kof~nJCqnO%jfB~%BE6>mxY`vnaFc`@9<Z{0uyUhZ&?x9#Ecs0=OidS5~
zsNU&=o1s#u7!4xdSYzwZS!WHk4z+jgTfA&&#n8IO+KP(W#-6&Ws=6K?FS>W{0o#U-
zeIA{ye_78K>wZ!4m*te_%eG*7ZaJzx2!+5!HOEChS&(y)#xvP!#_5(EBe6YTG^ji;
zN?X8tx>stU1LEhaE~=~r1ZF!kQqpuN^XjTsPEL>y^@{6mP*TXw2U*dfoc*7$uj>EY
z=b809Tk{gzeuFEuy{gJ|xpQ)YS(h!Ytat3a$b0;X2cFPvKi|2!E|^iAB>TnA3inxi
zwxf8Vet6@78mPNO<efVr=D~(X(Z+~p$;-`1bEY7(wn<M}UFTPcWeS<;5(FZxQum$m
z?5JSc6)^Qq31>MlQb@BKcaCq^*VdP|+vIj-`Yq$Gq0oaKkK4O%!hX%f#5MMbU8cq5
zP0oCi{8M8ft+{-$X&37bHd<LlQe%O#W(cp1z^jj+I=&Ffz@CHyPjP`iGsBgZ>M-eb
z-W*Y*CvvkuXz+uOKsx8b@JLx2_aa+5ZNSjfKqsT;sv1gw6!K9!;R@bNx^n(jZ~)8C
z7lizx{Gwn05cuqQ4tu(Zq&IbzFiAMtMy3igMf^dJM0(z!zTOe=N#MKcoIPpm@7+GG
zU#3sWu;`Z=OO~YVwb*k5&b?V@wc%=(OTWaMmg_aRHs|DJSoR+D9lz|xZ>LRc7sc^|
zj?UUTk4s*Y(Nx#oW1ZM8?feycTPLS5sgB*}TGM!-U@6UKnP7tt>w^N-f$0nNI8&@<
zD2{Wpu$_SPB1ZI_Y^*PCxmoDM;BjNG=XG4{$*5DBM=7fO7*S9iH4L&ih`M0rqO}Ee
ziatmu*0@s{E2%7M+rA_{D=U4;_O_zR#J`FwDvI&iZ5?kuH*ZyC)j;04&Er=7*FaU}
zD*o5*hHCuB-#G8g1szaqycb%!asl3o<(Lx>(SXB7wp)f%&ioYX6}+&{U<fXdEY(JZ
z30&1qsI&_sgEA0Kx)7Bee6tUC@AIv3cNe%euirVkuWeoK>Y|Wq(}ta+$31?(=k8@*
z|K2fOL&+v@K=+u&KG8F@J868Up~APh%zB?DWvpk_q<uo1$n%=MtP99%Y|Fh~qe9c2
zn5;&e7ibqK5#CWwDkjAE6G<9GXw%d`^!NiVaTIA-Lq}=BFhYtj?tvCBIfI89jhxJp
zh0J6!BWJtW++ilYP9E;9<@b`17ZbJ<Zo$GpCQ}IG2{(tT0S<~cD93m%BqrQH?_ChJ
zvkD8dvkFTJk$hd*qd0F)&G%W6Bf+mki7PT96q=C0iBCiN_9c=KIcTwiI$K+F*M<#U
z&22W_)YP?ARo4y{6c-m178V|3KM4n$Hg4O#p(%Lvcy;x-ym4bedQEyknJ>j#E>G{?
z4P-N+6f%1&WOlF66Y4UXu+`?}!nqq9SxGkrzh$n%;We)mMnPpMNOwaDM<!%vMv7l0
zlbDM`73mr&sE|~$3hyI<9YdgDM8$g6fAv?tdUeN0Q`*^S&4u+Hmfybd#&0bh^@Yv2
z&@^Is@*CfH(pR6?6AZT2uUo#ZzBL%^$!$Q^0Z6Z)bq{Dg2a;hqRX@vf*pid9Sl|#@
zDN`Eg1e*!G4@J#RIyos@iG;1Bv;=qMq^AURl>S6ruXR;?Hz5^V5O89}dUdp!0BXLU
zK<kE#F8aDhu&wMrs5NV?=i4^q@71T;v!B{KrZH))%a_0=QBi!KFL$LYZSSP##8r1a
zVPe}a3|v&;3R-_~%{VIQZ2K#F0SW2Xtva|bl+^66ya(bdir=dEuM;+g&PqqlRu@E@
zYLrf^VS-uH13?GsNobQ%ZAvsT28T5&L7*E2M}~6UY!*hb6)7`;C0|%TnsP4+tvcY1
z%#*wdb*zq5MVJwq5}rPc+}R?65Kg@`O*CpukKPFb1()d~y0e<)TdOphj{P^vAFu&k
zalqG@zQVJ8QTxV9jizVsjc`SOP@}0V@wWSWeETdlYipA-O{<1<tE?%(Ku+dJptPd5
zEGgGamrPD`L76)^Qd~>xoI$q7=^VNZ9(O{~&qjE6z%`lA8Kq6*B2RpEBS<gRSP6<B
zCA1}g*x{3W|9VqZ)lCKW-0{sXec{pjj~B3l3wcaE;_5Gyf5Wg-LXU>N%0cI4!m3bT
z8bU-}5E_etQ$d1y4hmrIhJ#8hU^39Z5t8|42qY83uqX@zV3!Ffn@|vR*i-!h=&Kw_
z1XC@?E64|+MYVB6PoR8fs*BS-y^~hK<6K(pT)#tOG4z&5nzp^&J$nLMT@8h0^_oX-
zK)Q>IuQKP`S=Uu*MI&~veZ-n=Yg=DaU$r4OSX<#p9<g~-MqGJD;~@oyL5yn&aF|Ue
zIwf=mTfSBU=L4AB$yuMID~MUZE8POV28nAkq^u69*OyY5u7OZhudjs{6kf=B=Y&%P
zUL^cgLkr^bo!yCl*W7`BWy?E{)bHQ$lV{vJ-AnNL-PgN!b}zx}NZ-!k!!R{rZMp!@
zV!%Vy)_lS(D^7U8U@I&p(SRx~dI74=lw=(#07QmVJ7a>?YD8TIqY-e~Y~p6p_IFTn
zp%xU#w(CvyG4N)T7~wavWO&~vOE45-Sf{&vB;?J`_IXi%jn`R=2GPd~^f@qV3=;z9
z6D|#d%W_T&j?1~N7MF?pim9cg-&wM4PbvN>pYq!srazl{+0u=F{L5edxUoX{sQ=)D
z$6(XdK%*dt?HGRsAAh0nRi!>!r5W;;6;20O%wrJIm<_={$wX(#g3*+Wj5HPt-(%WW
zQU!qy3Wje6>p~FG8o|tOG>c=<kuuvFx*codw0Dn$+=2jZ0A}EE=j9-wB}!DKr(vf_
zp^P#16rx&MNXoDwq!BVWg+f1U2NB}~KN20(`+BPJ@4x!Cr?ys9v^uu;Z@XJxSh(VW
z2UZjp=<i{z8!I<n-@X#>y&c~W{W+OGYW#5)In4tEu@<;U!#C*Yj7)=-M!XEG4doJu
zBvDPz#7o;^{`qPb1b1!*Pi<q*=aAYh*cI#P#G(Ler(7SDc?;0S4lD0{xds22W^B)%
zv9n)zVOecqVePVg`}Un(b2e)_Z*+7YKCK01d1VEF%MYHr7I0MvO~RESvzMXzOfr=a
zf{aXxwIJ<zV8t+72vm0s>4FRr<xc~UbS@E%VBOp(SA3e5AY`REI106fZH@^|4b_!_
ze0OeYic$+ifNjpCaOYr<%vfAm50R1fNz$k&q8P4%n<$yb6j_YLPG@&4-{fjay5OcY
z8w-n@ECFwsEhX9Q?O&8pn-<7O5AeSR<vYB2Sy_2r%c7Ovlb;fw*u1)Cea55y;sSdX
zTDKJ}?oP6<u?JH4UxjVG?3;Q1B0oagz&W6i5o>@iH$`aVVRME17o&vph-t!MRI9;+
zsx?;-@Ps=O^V_=xH=J0&%e)?>D#H1bxFpDmW|Zg*f{c$2NkoBkI&iSfj~%$Eyj}la
z|E1}uyhzl&=nR^!{k*oOB<aNu&dx3p*9Y8ZpRLv8<*sKn%UwG8UCgN$Fg5{3%FVk=
z;W~ay4snV@*ejJ-9ZqDO3I~KIA?JZvm~H{_Sc3Kt+9CnURD5&dm64VsA)D1|&9Y|s
z9A2NpV>7}UP3k*vN~ldzb;Tl|Jxn503_kl~n}&;8$94_==%!}|cW!DaS}i){WmV1W
zJ=wAi6%Dp*lfT7!nya`zTfs5yPXz*WUGQHM5#ucRVN}Qd1l1f|Fu?VodyE<&fhh!%
z>Gd6YIw2Pb1x}Rk3D^S!74{=+?=|!9Mo~o5PE=6Jb}zFy;&-7G(>JeW)tT6V>}^Go
zPTG^*njhPNvMbZ~SSlN>%KjrlJ{QCi;9Y_?wJubxIDP}5_LT_NRw@8!fN{>%x!u65
z;bMvEzhNNT0SG`(7F>LmGWn649!2$;f${N&<jw5s<KuW3rZFA;gwT(Ryq=NboT{xV
zIqVS=N=e(GAVL@pg``DTiQS%Ir`^pD<`LQ86k=00Id<NW&*9%s#e$#W<Kc(TZ`jr_
zgx90{_g|oV#i($o5c|=uvY-7zp{z2c!UsYW$Z16bo}FwlKz^aRv>0?J3UXPk=1nO{
zV&s_N2V1F|dzWajaPHTckRx{1-JzP;@;cok5^uvn18ah_e<X4Q{Lx*IA2;ZYHbEq-
zgI6ZKxHgE(fLMqU{TD>OHW0XPrLm<^tgq2cy?0PoQ!h5Q7$3<?&l}FjsQPn86|<hz
zv;Kh-CmvYebC&#H>^pMD2DVAQ1Lk@@Z+PRp)*&G40?Bx!xJnT5jGJ*d>oE4tlJn~M
z)+ALU9+Jy>VE3MeW5;%W{gyA9j(qv{v17;N^t}^%*@S$QUiixUi|B0Jq-8RZJei$k
zO@hyA9;ve>=ykZ?8cai2N@N=12@QE%0Qj5RA57OGaBq(GhU7Tt28nHv1|v>)voEQ<
zu&SY<rnt&>F7!7Es++dlg68U>>gK|{5b17+j@>xBl;Z4CLhxm!J0S;U<K!Y1L$?hD
zJDpu1tih26OP!lXID7)dE#RJ#U`~+WiyYO7_e3{|n64>)qtH9UU3-0N0_)3a8;h&E
zHV$oHzprI|?r`?X^6jP7T|*l-Z``{>*I2T-sGy?MA23*K6FqBjQXkis`!?nI2J`cc
zNy%FVS6!GgLGXXV9M4>r9bf1&n$SHy$207k*e>8h^Mt5FY&$)_O=v?LZ9cdOA}l~C
zS`i+sk*HHlmlkf3T2V{rhz6aKGYA(Cxaj758+nh8ALmJrCLdFt`2q6MOkg#iE-x>s
zzrlgp*ef59+ZABx6jmSwjtd>>z6F63c^;tRfpQ0m9VAgG`O@&0BLBY<`GPCB6+N{H
zIT*)Mo<}K9K=yHgf=5A)pgb&Run8P7;OI8O4;lv2XAdY9Z|By!r2{qDjg%8L=uk&~
zWQl3VSxI?eVL4v%>+F@ksNdOLh1uyj1qC_j*@ed@Ctt=F{#Onu4@Dlw^_lYZs7#xn
z0J`LS_DWoQ7|o#*V=u?K?(P*QlEC>;X_-{qBs2)dy%1}mC&3msUzr-HWURQOFm}fo
z>e^(53effwmB5+L%n5m<UQMYTUmWACnt`K>e#w$*ruY~6y&C5x1d49rZ$ulzYJLkn
zXanBf$h(O&B9t3w7}eT-jX;Z4*Q?1xh#qFO7pc9HpusuJb2Ajat!5jcc>xK5R}Dh?
zGz(|)Z-x2Aq4w;=(S4Y?<=3cp{<3Y>Z#i)5)wgD!&*wY-x$y0r*Kbzw?Tom$VoflN
ziBhC6OtvV&f7YWu{5bpd7X9WaJU)Evd~`tcBw*eT0P17`)r;fTEo^o=5t(;MY9U24
zq?Y+&hi9#1A~0n&qhQY~kKH?YFaCe*f(y`BzOWH8DZD9!YGGGs45xXhM+EpU>UH_F
zn0g>}S3sm+fheGEAK8tRGw?X-CqkBzunzUGPLIG~NA->I7nI*Pq3AUOSuoF(m5}#V
zW_4C|YKqkYy;cUxFe&C+NaUo?QuHQVPFMB>Z(xC6*v)xOxfwx6dX8n6t-smbn41}h
z{ITFKY-w6@lHKDCbPTCq+K2x*_Y$YAHlYrKpMbcVAM(HvQxM5CHd_pbvo0c8$QzB+
zKX&#d87jiMrzhp-h(3#jV`3@tS7Zo_xW`P53)x_i4G)2|iv9o_6>taEM%H2OPr-9n
z#L%M!mr{JSc-{&HL6o+FqlaBrQ0LD|x23rZ<H@~?l|NiAJ^tW{DC+XlhsG%b1^=R~
znJi=rY=!Kl7u5XUda#kXF%=FwCGF;2lh6WzfjxV(<>qsKaO?NqW$p5J>)4Gll$|7@
zPKhho8yI5%RI@VFU73?+1P^9Cpn5%YLQFeu(ix%s7c?XM3l4h{4(b|Vpdd(OQC=FX
zE~o}!1hN9Lk()snivJm%(~uBUImD62A2dEt+d|K%3J^&0shR;`8@OXx-{6Ys?lg^I
zX%YY0<-*q-cY!I%?@rCiVm7>`@;|3G4i9f^S=!O6e73jkD9G^D<$JB(eEt^9^wx7)
z$cC?t7rOH#;vAS)5+>kl0lZPrDV<^=OF-7PX>>5ARoj)4z&O45eA$n$9Qfwrz5U-D
z7Vlm>bY6J<;-Sbq2wX>uYR#cSkHZRc37ord6lSClu3U*-4NoRTYl+nB3fj{GHk~0G
zbyyS|n0llo?E;-k6ay?tQ*i9cx^8jTRhM6WRoCL{-YfJ~HPl!83f~(yxes4>{T+8)
zf8k-bY5bV$tg>y(`umq{D?7_|jQ9*}PW(Jde(&y34!lG$N|Nk~>7c<j1E>;4@}y)y
z*$&VHLOWsD%)jlW+rs|=^XtyvTq-t)e{`u>B14X#Jo<u|&FPGuhEoI#tMp957@a6k
z;Q`Vz$CyKPHbwUSqmLaGpFnBZMaZ9sgFWz`j%Oqhj?5_L1kVtJNzn{YHUqwLs3aPN
zm?NX4!|vqILoQH9EvfQ74yWWnE-dfsue0CE&ph)CYkc-H)~aExmmQSf-X_0|CnW=%
zA@pIUGZ0iMG-xbRxNcxl=UeiSketZ$4cj*t^SPsVwe+jW{%<zc7#hyL_yu;=#XtP@
zui1exnOtC_eIGhf(%0nESuPo3m)Zk5howxDn7@VwGLY`d%W>tW=cke30<L?cGUU2{
zS_GtE=lSfTRL>3U<%`c-dElDLb*&9O>Bj8aFZq|Yz02h=gy^cu#zvO1<<i#cE?#kN
zTTO|k|C)CH{yXJ2+8P@g+xQ#J*J9w>1tN3_dliL^IW-AbhE^B6Dk~KI3#I@ymvB0f
zsB-X!*B{RP5wEkXP`3ILT?FAM7SPDgN}dGN70<UjyiiAyUmA}3>XDy(&uO&eqPY0z
zu($r`QJtl!!r`~;a-J1`BL93(z|RK5(;Ewx*fXve1vTjqW%9nb8s~i4BXfj8p%lL3
z-&RJ^3<no*IQ=2A>I(+*p(Lh(a^Ik#y$W6ddh<AhMK(&_gIz082-~FFf~3YeUAGR}
z!uC&aH$NNGBQQ`XwsGuIA7h0RIi4~SDlRX}%O#J<x|*`)@@6U!?Dyps<`pWQr#xq#
z;>!eX?}!+AAd%vbHp@Vj;OT^4{Ru>HPxs(pH(np?{qo)ia$K$)yjY2PQT`gPvWFv=
zS8ZFpdK<miPWh#*B43HGh`-4zqCYgqFRh6E06Ys^$47Xk9H#XsZZasG7dkf!r@(Bi
z$zYCX)YibbqUk|=GO&y@82P3_6-|D*Sg0zJY^G$1LKyVmdQ=){S!ZKIUTzZZ=<Vqo
zTs9bLYgpR2w5p<n@Km2ypPFLHNXk(Bz3j7alxV=y`&~%5teVN@+cn}iB@tYVZysIV
z)3cmj<fx0+V)jC+Ty?CYx3Aq@X*1ZW@;Z8ZJMyaNYmVCHx9TUmez<el(9p8Z;lBKI
zcX~d5yXr{$5&1RxA>EmpG2GcXOrLQLVoixpsP(kCt__?BI#T#%(aC1E^BC16im!r2
zE>4LD87bjd6FnqSu~~YtWw9Kp^0C-=WnXHC44x`dUcXr~cspAxKgE6_mnX{L9cb@V
z+k>^m^7e^Nxg5=(isa?Pxm4X_kn4~_ZQxV}`KSi+5s!#VcYPw+2u3(EiDt1ZE%JH!
zV*(<1p`}GcM}$OPRnVH1n(oNRFzzx2m(~}y#Qk+F=+E(Ww4`?IYz_pn^ObMP_>l({
zeziYFzKqlm+)^xv?a@Kg%qtm@<gO1Qx)X{u<Q~AmRm|#dQPW|x^uNn~-QR*3Pk9Tw
z4N;Z2fHB&I0kKTngXbao4HF9P4@)ovF8qd?nAjMRG)1I943tT<H`pX%_;At=B6uHB
z-g+q4#In5_sZM@%HS;u!O~Z(a%pPtMoB4%0Nu%g!vV}d+sr7u)JRjs?mXNr>#YPq2
z-)9yD_&xDM<MS083p{sl7Es2*J=kCyj_vMTTqbRTRj{JeHTr@Y1!)=>qI2uv6KH=W
z0sa9R9`mf0U!~#kq#}&h8Kb<u3G)D~QAH`zD%891DC`@EZiVWgH6GU2`9KhMyhWV_
z!gUemVOeY*06d=u%q%=|fP9fF*hw;BkW7?$aG+|N3otXhLsM2X3r=<y4TA%&P6M80
zz&y0X=7IWwa;}?luF#w(2I*Flr=Nr3-y>ne`rwBO^cMMj1$wb3er$XmVq*cPfc8=u
z3!aZ}R}%7}{=tVxa*@b0ZAT}9@c?)T=AdHuKd_4vh9K^lMQP{`4;6%Kp>He$*M}UI
zfsvp?vk3xHHwvRAY32^Bt35U_C5;T+b?S+lDKuIi{6&8*)`<ZF%<cb0!XIK;e=Zgj
z(#t5nM86XpRC|urW(IguhK0`ioC;{M;PH4a4Jw`>@EEMZcR2!;?+R^Prl1x-01WjH
zKF(&0^HSJ-;blr_&BhoZ{bY(#?5I0S?60$@wv*Ve%%Y+@^wlcHf5`vJc$JQp`x_ek
zZM#CDU2V(Nxy|691xreT`$|XJm#iyQpiF=Ten;408S<8*5EgnTdZMW&8CW?z#>v1n
z_B0NTvbZ5f(Oy_r?Ie>q!uPOdfG9T32fkc^g`iU5Y3AURu3OSRQo4_zQo%uQWGnDt
zJ=z4+Cqba106$WY7$<JxU2~*+WP;<oj8iuh-te{IbI<g=^VbiIt2lUqcN+d1I}+)Q
z<{BX$BH6sv{)kgz$UWq}N*=T5kCQnu9fiu({?vh^zsO)$@&3jSysq^33hz$dhj>d)
z9ka(q^G@Sa`r>OUp0}Y}v2WJcFuH`XMf+mE<(;u3;lC|7HtvrL;ZVUP`V+aI4VLhn
zv3Zm=1g@7jwkR%nZ=ylo7wL_m23(goAZ`R6k^K(73})KTXjBQR40{@1u*!0RCPQ6C
z=P9`Qh<#3ZAZs984(vPd_CRER%N2Iw`IjU-U-fB@vsfz6S2j-y)>W6RIG}WJDKa|p
z$zVr#2X7zPr*^>kj~-)anl*;GOeb*+&d3-*ZeSwF4){^R7-C&el>1IRKXDAS=YtgJ
zxEjeS#c>oF14f~+9rg#M1HF7{!Wd#m;$zSXepCm&74w0dCAm47u%76MV@FmFMQw<q
zL|p^ERG0{H$i_;g?NW)rL%A$pL|Wx6?tO)=m5wZFIjiPCaUj2lckk!CW?*vBmWH~`
zZ8<rmbqx)BI5N=zrrioS24iq!XMi5morA9^C9;S1je&ee0m0!=!BEsK077+cQfXvA
zAAV7Op!h(|SuIOOR2GJmEkr7N8XD?Kb8^}?*EMWeG#Q;#XbXAV#4WJDK#%W*#XG}j
zfFA?t#WV<Ogn=2pa_~G;jNeF5i`Y<#nWx;Y@V<cg4Su2}tc1j0Ee}Jei}RBw3l8l3
ze2=4KD0)|}NC670G$Dp!xIWjPl%vs|%a-*wiOHEwg~fdnnptraL(Nr7i_Mwhq9L~I
zT(c%At$W*|=H08x6?|$ij#VO!12$$jlZpO(N=C#m5FGB2Yx)pS3DymV2d)C+&JGv|
z)L&Sf*-FavSp%u#TP5^~Tn@AX@;T8Uta$N6UvXhmX0q7S54d!i97`aV;zEY&DK5m1
zxDZYGs@=_twsof^Y0T%!j}I*pGtI?ItD1-A#D+jNH_Y53_Di{9P_r2Wdl3tA8_s)W
zg8d<Zop=#hrKz&-Oqr5iI-xz<@%FfHq4t<I7xr%A=K=Dmf*h>zq&lFvAv6I&l6VMD
z(LmpYY?)l)G>RGb@kqXa5XdMlvg;_3Yji5PjsSZb=3K=NW?Y?caWPG%zro#k@v6b8
zr56sZDqdF9vD#mpjF}dnpgDARZ(X+SNcW1v8}2-(v-gtL)n#MbS~nFZi>;VsKoSox
z@|<`uk4m-`Qru!<p(X->O5D2$@M7Arbg@77+B1s_ZCa$2Qe^mu*B|H+UcflglWK!+
z$?6odjhMRRV*l!n;?Ck#Ll-W+WN6@$PIqIzGOz4BM0q3^Z))8(R<^qJlHSg9?%Z&A
zMfZ_y%eHpAX<9j~f_$gAcBTWEoWFiEgiNqQkGM8`|99@h*p&8vM0<P4N`r*}%qCF+
zhBvhHh8Z#ydRE&Chv#hz3gvAN%a9HtZCS~@ZS87XRuYCGP<<}@+3DN<Y#Id~)VAW@
z)3z1&PQx8hZ7Zdowyl(kloipoCr{t@<i~IGwyZ>4E1jvWIyNa)ZM)!nP?A}i59#Ec
zK%D}MuwtR-L%>*p9|@93+nY|)_9pxo-}ZN>Y5P0;7}u7SEYueB$4cavl-3;2?1Iy^
zy+FP?zU}u<*Y^8zTU=W)=`?M{r0{!cTYv+)U!X1H@Wvnp-o&KSwFi#HqzIOk@nL&e
zkT&SaDlIE;EYLOvhtgW5rB8t8xOIXtYNPRGs)Q&`LVZsAGp#I|8$2K66rQB}AR9-=
zsuvJxM%~gemt;!`DaR!Vw=3#*++8RtlS>bwDdrD}tfe#etweW4`kr&2h@Np)P?$_S
z%#r&(ep@^Y0IBy+G@mrWPd7%)f-*)LA5C0zlzcu^Tq!t)kU;`J0X;8{0pwv?F-0?P
z$$t{lrGJ4w)Ft@fHQy{OgGO|duv@r5_`GnP@HOE+;akE}!t=tfh1Z35g;O|pJK!`^
z3`IygVoJ|qW9&S3DZ7S!ncc;{$^MBw!+yzLW&h4T1X$eFpS&`m<BI$4kNd8V`ySsW
z{<}7=P5iy}an~1mPJDY;T>JRz@z43RZQ|jKf2KCBulVPG+BWg<EcBfCHu2Aohb<mI
z3q9wPz#QM#LeF6aXL7QWUe89pu<Ik=)>=&_E4`kb^M$<?X(XQ;`4)Y`-22$|kteK;
zw4Ud_b0dx9=(lLk(fgvk#Nd=)i`*D(9(w|FM|zCj8S8p(Kd~F5J;pkUK4I<%WA}aL
z4yBXIOhn*~e)cM}5E*3jbMWufzWcxV`TyPUFZ6uk+eI_4$S;dU(%b(%d=rJnW3B>m
z-{aSI{CbXG=ked;*K_>6@#}V>=ft;<U-R+T<Dc_s+r+~e|4eP%c;lb{Y1_oZv(R(m
z+r&RV9=3S=EcBdD0&{#{3q9upcbY3N&z0tWHu8mCANjT_vT&p9BKn2>KGH}&H}Wm|
zgt_;{IM1p`>v`^*jPw`dYtas)_eFb&!70BPxiQ*2_5_w0=`ng|tm|lx^V}HiG1gJ^
z33EsIcj!<$smw$K-stDDh1lc&wI|ATFN7cP%;)51#HFa+`rjgJ{vXd&<m`ob%ioJf
z#q+WM4LtK-%e~%mdOaKY!mf{e>x!(}D6fcqVJ}A-$>&DCMV~PDz8Kr-inN~RzDpzh
z#h6;O!{~j{USe>{??!HnHjh1l*&{th?~HXF?QxzPqdmqtiaufP2>%WpN+*?>h`<~D
zY+i^r{$G2JqlNGTg-4;V9=;c&@CqY69G&aQFKrSD22gDhL9Z|!z=1@ukg672xJ&Kt
zST@<Y;{5jZ^VfIm@8(}t;36~v0bxX}61U@d+(L{eLa%?i{CC;*Y&HMgJYA9J63?4M
z8f^4?!O~?HF2noM$rY`=y{*AT{@#(L7j&<fT#9#GKiJ#a+MB<qpcS!cFcS&2@Oir$
zb~iU!t4{+<ik%^Uirt;!Mm7c;vysI_88&yB;aX|H!c8XdsO9=}Rx<pB-m<}oR($k+
zVYs@lw6w3fvah_fuNHrX&h9V82Yx$<%lNUZuL|#6ClkX_)*0X;kGM3-5tw;K998Ii
z_NuukLJhdN7-I6j6Mll2t7<-1SpxF+NAQDR60_F<H!eqt0)aM)nP~j}|4-eUz*kvZ
zf8(<}&)t*Uo9*6&#Sm5@#G9MkEQpvLWCu}^st_QMU`S#T7Lii4E)=ar^v6rBwba^{
zTC3DrOVwIR)l#e0TB_Eq)>2EYwbWXR3(5OEGxOXffJ@u=|NHz2cb;d?%$zxM=FFM%
z%!<P~^UI^L@=)>EVjKZ8V{K#Oy6IEbPitOxaMl^f-*v_;B0*OhTmWX{DpgbwavH-H
zLSB|bUWTwSwId-d7<^-!5q2ep;smEzEt)vsVqX2|F(YXifm!RBkV&^b9Wk1lHzF!x
z%_I&)!Sr>_m(4ljj9JL)BIKGTIKtL>FGAicRNh#@jwvXNYGJb$o#Ehcfa0ArXIt&e
zibu!9P0rKTH8!rDft>rhW}R`y9PpVhPT|M&GiDJ-Xgm$=4ufPZSPO$Qu`qG32Gkf0
z+Ig5KBxxB{$h14t-bBl>_jO}a<A7+lr>XQbKj9<~<<R_uVo(UJRh)(dQ`b!8i_tiR
z-9Xzh6wi}w6uZIb$|@XLu^Cv@Vq0vIq2kk-B5FR-Ijb^1FDIC2t?m=Z0ku|a>C^3F
zuqg7aCu*&Ht7)yolQDcTp8$FEGQFRGV?P0^KlQXe&`*~Z=FoyESY&F|hAVH()OAzG
zoH?3!-E<icBGE+LJwUSUWqR+GSx81xx3t1i@OhyevyhAqW24n5qWrQkX9CqUzIfc3
zqb_TrIT$_>@>$L=OrZ&5v<T3%twi;_RGJj)<D@A>`7|PG48ITpaM?%@g?}g`TZpku
z!e{8B5$7~9H+1Ec(~M>wWMIr?qlv7k{K9c(j=ZdqWJEx_GOVGZJKfctec08FT?7yV
zOub<gn^uBQJnX&5CRr+%SdEU`WyX$lhu?Yr`HttGFW<V=wRJ1MkS<&3|Jr4*;veG6
zftNAPyMb@Vn7$Y70&Cc?Y0SbRZ=l5-?MfW$U|E9BQx)nsRYAw8s((R`Yxo3-DI453
zh=nYpF{K<DSuAcjww#wV9_HP=<ZvV3-q?6-rx*qIMXX3hUVJ<9qB7tHShd}la)JV&
zmFtP)4(Vt$oedQ8P-KD(Og6>*-p2lIDu?aIg5pkvp7`^qDTl#LbdxlpjnnB5bOaTx
z2%^bJX^Nn5(;b*0Y_cZeALaM<Z)@CQ2tT$!v=P}vH+$6Z$jxZCgW(P6#vKX}Fxu@v
zHz=6N1I?7Y5sDd#Az%Y$A~ha0Z$YcFu}>9y0H6o3sukp7$u_nvxp5f0+Ps7t$=&I!
zrUM*D;P`v2y0bxb@!>`c+IKe|#^C)noeQoy+bP<Py-2wky7_jKpXRqxc;LUp7AX)u
zXy*awH~dCU>g<yd#mJ$5rpn4E?mQNJobpioCY~g5)9f{72P~8XM<yx}r=>2=+Ch>S
z&2M1F9t2g2M;m!}|I95^0?d;vXcR|4y24Fz0^D?dY+fzy<s}gZuP`5LSWLTx>Gx=3
z<Cexon)|YIY5u{|@@(h|VGaT}VQ4P<aYC~D>Ljnd+~x7O&cnmy!3}{PmuHUI?oGtv
zUoe0@doqpdDT1EL{ZxTZ)<Ht>Q5UM6nKDs3!#y(K80J&3kKL`-ZPB5n*s1AutGip>
zi?M4gz5Y@2BdPYCmcVB>q9rIY(B6mz;s|AKS_JacZ9?(U<OxnnI@A!$Tdu~NMYmq!
zYz3FOFP4rcNRv6kW=I_VsD%)_QC-wTG}D!^Q7b{4FuG(mS~v7LPFQjDxn3|t`&8&|
z7{yyHXM|J#p{*Q-*d9iylng_T6F8wWW<xun<sG+YhR#n_n`Uqa7!Gq)nnGbDJ)zK1
zGbW6n&*%t)>p1$9m?-iTF0B)YI_L$WEkRmZS=|hKdB|MRU6(Fu0+rf(L;3)CNFVgS
zvjxW+=`tqEhjXOSCaHf&EPWz8)Ob|sRKKOQU@_mWFi^1^I(Rqg*vqhn3S}gV2KpPU
z#wiH6XpmNrpjm32=P-%HhzNq<7AthbBZCq+4l7;i&@`xQln1z^XwusAFyD@HsZyyj
z>GbI|LF*Dtv^|VyGW)}nC{V?bLePSJxVRBBk%W$Df-pF81$_EkXH~}I@L^XNHk_pj
zmxEE4Qz0eZ8?-6%1>N2aP4kKB@t{(^TaMi?nv?Z78+bl;JwmTSeIJV{1gh<rdL*k@
z*Q20*IH9GFmvyQ{RgJza#R{8fJ{D6X;ruUEhYmd-QiohgCvFh$?mq~Hj3SX-rPLwO
z1AwxWvH1(ei`ML_0j0E;gl0Ot1-Tz=EQV6Q-*Cw2hX1GzeHtxs4drw&gFz`ajIt}J
zi&tGg889iGG(<%A(xxwR`f1ZPk1a?0RP{>THC=LQbQ(^1-;VZ$oy@9fp;1D01G8#j
zVAk;sOl^GC4NUdXaC|@+B$VhCb=^2PPeQF@QfSRawWLigT~jn$ugoiDqJX3s?6Amy
z{868YwGC)wuq{+uQ|F&+#jCd#Vt?dl{ATRf!AtP#-m+y2$*^FDac@w!__>2a*ZK+9
zM^MK=I^;0YZV^B4|117zA&!z8*nYEt<M?${lnN>M>|?ay)9EihaobZmlms=k?R9^W
zwx@JxqU{-d_c7W^n!Ynlg~|cmlMeZiwPqx1+BoheW~(%itB+2DX1NVj<fJjWN?D=M
zcxZ_baJBO`MW-fu9g-MWa3m~*rMR&ecr2C!dYg=_kR^(q11F}yP=>^)7cB2}+t`}s
zbk}GwWbI?`$4G4YNc?iTyLUMMl^BsUKm#7`-w$23L&*{0&tXezu^^pRf~pqj$0r7z
zOMzX7xSNJ{>*M4#kIRkoue@H*c{l~jyEqdY<h*l|mmq!U^+#Fw<jINSoUTDX2%GsQ
ze)Y&B{U6}>zWEJ2@(A&i`#!qvsO_m%rz=9T5lB;&;2-J&$IU3_(G$Eo&eBO`+=#2M
zKA`>^j-fsd_df%EZBFoOUM<E-a73Wyme=8y&*4_$BLOxoz7hiFo~V;uU3CKH9Cq09
z^%q{~f8fOzogY|2ZJ0_6UHu_#m<)D`t7RW?-HdLMr+({%-MkS=-6t1w(&hM2)Qa4}
zqw+NUry3qfbbW*DAoMhZqQ6rih-sSf%|JA}8Sbf|LeK|;TG~YmmdvJV-C;rpp(RiW
zlwpYSk_;fN&YRMvbaPPkWMOK1NA+>4f9q7e8?q*TnY=%gUur?2(Rs-0-?wE{Kd5zJ
zT0f|88y=|9E#e^-wxKH|vkR0at*&Hs82f>&K-304BD6iDb)w=Y;Zi(7@0r^F8^$D9
zi&jGF9lhH-TTIvQ=y>4CFe9I!$#&Vw7Ic9qa~&1ggs#QR#hmYtpxZT!%z4;_y4y3>
zs=}^mJ$8RFeJf~sjSbM9+D~J@s8*1$RM1<q<NN6(YNaEU4V6Helx^MjE1L`}@qrVI
zvy}on5l$`Qq<2fml2wWq^|Vvz-qiZX_dnPQeyAhn8HNcJVs&B<MsgNI90!epI2Kj{
zw`26Fk3M3A!4KVJ>=jjIs41#`Tn$cJ2U0)E%?CkT)tzcp%9bZPxtKaw^NnHJhv9?X
zj6*{oz=;Z^BYTrWAc-$AMQt3kDuL}Zw)g#8s1G`h4}?=0LbUFk5ZgGra}eUx(FyZK
zrE%+zDj4?4C^R&a{j20o?HndP<I+O3h2ts^C##vyBee2_*nuPJ>(rtDorHyrn$$Kn
z$sGFd*^q6t5%j{&c_`^)g&8bk#3&lS<T$Sn2lmlDN%?s=eY0-;yyD{JI~D-TMf29z
zH7?k(y#F@v#@L61m%a%TwtLDYCb=U<(lXZ(G$M))nMPnSI^Y9_;^KMh>KlQz5$FjW
z@f!Mkw&I1scifPs!KX$ui9n2JhRXSDjSr-Wg@mzw-8_B~(Z_v;w@$gSI26W13W3Ns
zrQ9^KNn~PPDa2<3jViaium3h87P$Z|+5#JJVXf<YSPbY(vT)4~#yIKZe%ernu@Z1t
ztj*5N&Q_BG9JeInWL3^_#~L;kaJ&Egu^17x$M(Ok9P*a%-%afwp`88^Q~B@Uq~>GO
z92jl2pyMZW^JZ(aLo}pr18cloEF636mt(&-)v}LIhwCDcL=V3L!P;!KRe&fO85d=g
zPR^hD{`*sbeg^oJp={z$YMWz>hlcVX13uX1vp<$?P6I_`o6{#pV`I`dS8}D~^+f%Y
z8eT#QZJaxLWH$QKPySszczlD}$S3<Q#utLtJ&CrU(<j;jsR(Ben(mv^zhj96ibApv
zo0+~xPP*?PX`9a`W}Ei%G14g8+(~2XNIgPKABaREX18GHrm9@i^OD9T-B?06@OcPz
zOL`HuIq1dJSP5J3zhaw{7|}nB&iY`R&;I|~Hb+xB&NkQLsmMC9ac=a?hu1@jZB7*d
z+Z_C>O7QRBw#_xiaQu)Dw)t#%d7?i4`?mRD<|G&+zMeG9$v`LBB;BiY`G>V(ZJa0V
zQf(8Hf+O3UMskun9n{DheV4-|HiK@k>`l8-_TMM5>&fJSU9Sh(l5GiiKDJ$7Li0O>
zKz&~%`kIfl&7r{1rocQHUE9EcovJO9{`eUDBIDfXJka{@+veKjBeU!T<BW<9H`xlh
zv-x<oc?pL36*}1FWZIAn7~4kU0<z=A=E!KEp*f{(G-p(YpoWbUbCh~aDYLfEkxbi3
z_;`ZwlL~WL%(W6;PUbUrrvHqgq$i0I#+VtqRpz7fZK7!&Y@dHpyOi{#8k_qs+NG+p
zl=4-k<A2pIO&5g0c4^W+S5vK@;5%hIDqny5{rA38^arK+n*J|;r=)+Z4*pJ2HmS1D
zkF)=Aa-vJy|0%<^>GnCy9GnDWzArG|ocO{Z^Sn4khxr-Cut}mZ*NQO(8(&&#q~`c<
zESiQ;fB1e=^HGj6Q?mw+Z9sFAUN*9}NaKW3J?UJFgHWUEpQ-hN(r%cKBHP5lMb@Mm
zw7|xEI*K;6z3B<51ZkLt!z|oPYR5^sj86FXb(g9t-NqDFJ!@vltmyo=#&}Zu0y9qH
zrTWl1P>m^kk~t35Gw5*}^<6__J|DYpQDa7lz9linq3Jo19{o6T97?F6<<z*D;?qa=
zRp@llS0%=gR9BUvi~s#PRBGqMV?*W}{*%=q;Ttqgm#D-4V7^g}`<baPDmO+P>HG9!
z*Q2r#2uWh>&$OciO~=g-!tT-2gUPmpDo}P0Iz`Mk>aj@7exZN;xZ{C?ZI1i5pu;rl
zMNl4EnT~ZAO48B1F=#|z0~T(4IS(3xw2yV75gr<q(xXQ-B?b0x$GpB?)Iq#@RPib?
zzC(-GKGu8`WDZziODOK)Qx8~!+MY0LIW$hy4xDL)6D*uj4AdnjO0~sB+egXjGHXwg
zwp0!)uZ?Owi5ui?*VThGFs|aEajw)u*_~w<S`n-1d{XsVA)8eKq@fa8N^2^!zR2($
zvvpWs1dWfSH76beg>|G>Ay76zj}oaYuyl#Of<+tITjEYNYzr2v^+mu<r@I2THl%S_
zw?!){PP)1XILW|HuANA%n^05R|CKhM>|(X5P0`z?t$t#g)3?Q}3P{+T30?UyZBDJ>
zQpbZ;fs=CaAL=+g|L)kB$uZ#n#Kuk?|Nbx7*ktsfd8O2G4xLs_^SW2znjsI?B4M$t
zYPvYF-R;KQ8+3#^wwk$*YY=om5DkZ;#nB%mHqn}Oqt@oJZr0Qa)daTUx8jMP)|=_P
z)p&D4X^=GpDv!5?oE%efqAwAZ1LR_qDqDh28o$yVYMk{$6o_tjNez<tGNFQCT~X?q
zA`G20@NdZ|+MVlrpgA^y(_vjp7LUA2G-UoR7h{G4P8{K~PX$qutrHDmm`am@6=0Lq
zIn!l0Gm_(CS9TUDBdq5n6AQ~-u@V+U&&$fREgZBQ&I<cHR)(G7^5{dRDK~d9&crN_
z;Yiu?#2cS~=E&AVwY9ac;U^mWuZH$dikzPK4>AS@2I|Ee_K<iD%c|;>|C^YsIA8n?
zOS|g(4-)$jXO)=5rpd8@H6&nr0o$QqV7Q5Q4q)%fk%-rnfK3rKY`@F~tT_c%57-dE
zrl!Cq0hS5av;?d}jAl2<2Ee8#VD(}y==~#LGZL_sm^%5QcoMLg8U}gZBBJb4SpZEq
zTJg5fi%XV{JIOCn<Q$icv$<(Sy&DJ8ja>hQ>hVPdLuZ`2K^Bw@8`dzqc;p4dhwq98
zwnP>ppNpKl(UoSfui=bow|(KjI^qNJ{w)7C`?OexRnyIsx4z3fpV6U_-Ka=&g4Ytf
zu(?C9!$Ez~4uYTmecTcxaWNmA<()%EQsc^}@=uSOykpZw5sa0e->dVwdmzr{4LpvK
z?6InxLsbTPbYGe4IIhU!Vi`PxuC*j&SiTEcQJZa1;F8g!OYr-}sKUY_qecxWEYxjg
zU|0V?*qnjKAgM(PZyu;kKUOQ~u+ClX9y$BV=Pj&!7ChQMP{Ow3v@Ewh%i+<$c)*Hq
zlCs;Lov5E{#Pe*u{3+@OD?v_HH|_`)Hzw=l(qz5-G__u8A$R+f?0m}L7YVthJCMp%
z3C5kIQ4Knl)o@9saj87b*I6=ZRLR6qqwdCUBHqQE(S=|fSXekZ`KIcJ{aQ3*Nb7H(
zpnlR1g~jct<HnW6#*P)urw$u7eB8L<!-k!TI^H2B@jkRa(m5ztjE?(q@3?H)Lh<?;
z`zPqU4<XKe6DO&cCNErenV2+TKTb@A&2TwRP#cXlOKWmG-^a=dCV-2MFvIWZdCU5y
z;wL7J-Cwf@KaF>lsNrv-O}p3##o2rtOZB<U&LXWvOS~~hDhwYvj(0?x;;XKlap|Q~
zuawzenbg}m=_`oD*(y;FJVTDdLn?4E9wG@Pd{d(l^$9cz&m`c<#2SuLMbF5rOx*gH
zc0;$*6!abFPE+8;r2=@>DP1^|GE?%BiFFf)d(X}bj~O;>OgQgs@9>FrVp37X=|jdB
zjXL$zQAOj2oL*6cJUhf8{)XI(b7JwGn3;j=OHP;{w(f*@NaDy_R4bj~=;VdlG<iw=
zg1o%mB3EHXMxm>yH!p92ICOed)r5=5Si2afWS&m^7Hp>&&G$hM(tea0Rl*P3H$?k$
z!n8kUh}oax)Wo1IQ~CsEeHK42Ikj=@*v3=GH;f(IFutI$yr58w9$k0psdb}A*N%rf
zV`#XzoPJbqII)($4jo*;>J>Fr`B=3U_F+#I9WE>B1U0%EL3iJDel%;LQ<3T9wB$tr
z&J_v77j-3oz9b=W6fpR+K7UkB{;1qgVXz{*dR%y9PX6c|?GbYW9&bh<qjAXS#0&9?
zvm3=q{s{VlkD<3{rPPf)*8ik<lBV7{duX79KLp)1gzZq}@@L{eJGI1!Zo{LiSg?u~
zr|?+Vl*6S~<x0~oRVUod$9*lOh%_`22}TsD^|Uy(MVQ{j2qwP%FeJ)P5CvDWVCxs|
ztHvR7P~A8(nJ!f()op`URZ4=?scE=N8rQLE1?l3GDo)QR^^FMU6bwBrFTWw%3Pb|K
zCybeVa9CD#AQZ^(7g(b09AsNGx_DfO%6l%#I}>_2-_ekHs6IY3*N4NCQ?Ivo8c%kR
z<@0=}@r1QJ(Q$|Bs5{Ka;#9Y%N7NM8R@sYuWo5x|R`w8Ie8|Dz=%Vq}1wmi_@X>{V
zoXlXL9Abq0*F%mDK#sz!s<uMi^X3J=aU}`K5IV~i47xPUg6J^W0x4>sD|T~28Gbho
z{NZ5|AV+voWrvOv<V$l-3E_W1q&!qMD)*FNPEio=!I&1DyeUJ+klfG{V%jO*<*&<a
z(9vqo*~jZA(4^_a@?=k%-bXw%xQ}=@*)t^Hw9Nim9N|~VFCza_AUp|)X>s^&`fsg7
zQgTf84Mzs`4TsP-{Ob6=LEe<oHylFWpyLec8xAG=hC}EZp7@Bq;n1MI;SbQo4??G7
zjnj$x1uDg$KH<THGN(S_4Wxf0Eqz*lKzvW{3*Ja12k%xvFTV-BoI`r~Bl`ix(vQ^#
z96GKKAiexc=;gmEz5L;OIgiuHx-Jvj1!0JpThULhkAL|g`uIJ_?-!ttaYp06rHeH=
z|AroZFQI-DFIuK=lp+3zTo2hf@tihHyM+Fg>$U#vfW7ht`tkpApE~LIK9#dR@g9E|
zJPQ-g2J4=a_g^XMCxvInsh^8ZrhXK^($o)R_H$TyQG#!XWS>PkAoUpDgsq)}g{`l*
zxV|hhp4EJQ3E!UA;hQ9x_M~<?hn>zV7G{507E)rtR`kCo=gNafi?cdwN9JbJsiuCR
z?v|galn?qZ+Ot<Y0&yhmyUq!@LpfDbL|mVui=9DZ>9kgeuN${QV1W-V(W!jsoG<-p
zXuj>1@s7#pDy_*Kap}&ktolh&&B$|#o8`e{o6E#^kJ*<8CrlbueW^He^%O4qk4;&9
zrnq$Wr0LZ~o!LdP)B4}zS(BQ|LFd;7Ch!O3IE=l9SaWSdmKXQQm{l$4iUn4q*_%DM
zQp?ucbM?}Hy2V<|ak*fPhFo+bfZyW=2HgAPrG1(-g_6fZxKNRX*5t_0*P4Fa|F@Qv
zt}~ZmL*WJd@&4|~$9{<i7S#4v&<Y6RHx}Xy?7<=J^{kMMWHE+2U}Iy1%MEHUXM?el
zcCv)AFOIw0p~9HjD93O&DLiv<!Tf~Lqeh%EbO>2NQ0j%ezzd$DBaN%OhmuG1QlC!u
z5b<)o)jTgpUt_Ay^2KFAQwm0oESMCXS00~NdOE%Lf9F8e#EDf^=Vy<h=jiOYBMbPZ
zf{|~P&l+DcGxio@Tv0HR|LgCFGx6BUUG8zk<I2k5xbeOET>lZV5Z$ar-(uAJ8Rj}W
zHnH|h?f#WmZ^g&O#O!1D^dGT9$JQUCFJ8#1N>4jGv3855BL*V?+trrO5LQEBNaNN1
zQQdHcBiUMU^Rc#LG$d{CY*uur{l{dB0Lrm&3rn8#(xs8WAU4O2-6Lklko<FEOIrTW
zHCXd>vV>eLT-!gKzuMhD3TfAioyS(t_y((>`%&bt#27~N@nh|?2e8x&U#n-c9e9d?
zN>R=plRrZ3=h1Bt*&#ae7<=N5w~=fsGhpG4I5PODm%>*hEVhKvpDA+YEbIB=8FQl<
zGxCO&o>DY%Sl*0`=v;9SeQ5vPrA@`B4IMia|4%D!Dn-`+cHR=7N@Sm<<^9E;Wpi?l
z%UfPqvw!SY2W9P)`EL3?XE@2eupkuldR!0=tR{0dtYS$eU4SNF-NP)Nml4R%4GhZ|
z7Adj^eYnF=N+;!tE!E>k7YwPNu;Gg13A%g2u;KNmj3`>x|K~wuCHV0r^mP-My1hQ-
z%VXTwQ-)hMvz$BL@#%r#O03evT|tTKCEc8^m!u2KMim!M7&0OGMdG1KJL%U5u9!?O
z!;Hk&Ni6m21fJgG%jDDDW3BVOf|q9p6;2G)iZWiV<jhBwAVve(bSyB$J<K@zU40Yd
zf(4)D6GpmhZAX0vGS&aV4b2-j*59BcY4eS>ZEdwTD*0&=73=}|J!sAd^>pS-RqZ0R
z#aXDh^aY_3?TyXL&gLvTk{!`suXJHcXmIIq>nDBJSI;O3H02hS3>{WdklPd}neM%I
z^5#vGua$iKl;I_XBMJ&e6qXF1GCsVf?(DPc)+m|oe?pXDyoTD7Dkn;&izx+8j2~1^
z4oSv;%B%kg2=I%#oJwk=Ddi;IWlECQY#K#Y=W~O10z;|j2d;+9rj1?&0)gy6cBIH6
zJ0xX@DXg;^b9MFjF(jYsye2;q%7)=1id&kUOlgd%j6Ed34p}T>vukJ2jUM<4rpvdm
z>v|@gbw0$l&cfPVVPR1^RL1%EPE_md+Ch%M=M7GfD1;;y78MpH<<Jd&%jBIn`dY2T
zC$gb%M&fgrq%Tzzzjl4Y#*KB?%da0Va(7)_yLfRem>~!1L_Pbls)G<ah0XjvsKZC!
zj6H?;fXz}P&WyL9x$|O%3$^m_1{Mw)kUqaQCnwvs^d+qUpB1uk+IK?nrF^KQe;WBn
zUd_<i9`l)`HQ+<g2{ev2q+oRNjbuimZPY_%evE!Jmld-mKQNybhT=Rh7OQXFxT2dF
z3$Yf(9CQ!SaO#t|IG@10MMc6{3%G+mKMytm8#W}bIKLRz6Xkkxf!{@X0Ou0Wa8vrd
zvgyS*?S`g}8yjx;^5BxZp#|iQWC@aQx-99upI?i+9jMEKH2jxpfYkqok-iNLY55?!
zRg2o5BsKY__^)ZEy<j9S=V?I+BZy;eVx`-1(S27q>0ioX0mct=LTF_Sx(NypEh-v%
zit}sp1`7^$Z&9a#AsI4<PWDy(MH;S|Fqrc0l|M^Tn|xD!`=b8U{5}l0jNuue)oq{7
z`9L-Es#Ec+=~R65{}&C!MJd+Yk3}fDHym>?K;#2nB4z_Vob}XZW<!F8VpIAsx-k{Q
zL8qdjz%15h$)7R{#-F+kiVvTKvk_Q}8|`HTHJ#x&FoDd!))U3$xMmK6E;!}~mN!gP
zABOCP^Wh|c80(?W!>X|(uz(F~h+wX!472cqYMh1lZ@c|=UcK|U!4|8R5AW^o>P;DO
zvDkFn6}U)^2fK0pP%fKXTZ7I8E#Jkbqup2>Tm50{!QMj8a~@bAaIil*2&~fcctW`$
z+%xY9da^<VZnB`!LTHQ_OG9Bn!&V)Q$L$zfz5~DhD{r}J_T2vGZ&CxzdoZBz!R%gf
z{;{9eEjS>oV;=xFB<UtG0pDQs{gDM7iZLLqgur=v!3B!~BtUdP4Vp9>_&jXfu<~<*
z1)&1J*UGZ9Xkd({zi71HIYV=74B~@Zzw>hW==kN+zfikyVJ-cts;cCenl<zKcb{2P
zT}!{_iN1;WPX&dI_Y!*y+eH4K*?4l(huC=kPTrru#<NOKV&hT1=l?I*c-HwJZsQSM
zP5*zh@$Nmo!#&={s~0cuxRSF^WaHhPV&f@EO11Ht#mnqL>%#xk#yieRH#QzWfsuE{
zXFhZKwes61Gx7v%ycgKMWI16zd}13<No}f)N4yIvdHrwLc;g1!cuFV-+jxzt9CQ9x
zY`n8R#KvpfxUu$nYtHc^mty0cDc)c|QguLmHbyA5em$WrH@H9kIEI|(1csbeb0;(8
z$c}phazTS5WXGLZJJ~VhKEzV{e_^J{9Uo?<X*wTD@D4Wsr`Tv8n}Hu?huv@jJ4{La
zhuL9oupe7A-bZzcJ8sZ>DHH63hSuO({ST}xtMDXN7WL!5;SXDz{*!(j2G1wy$DcY`
zKi+>6@8O@8lQ8~2i7l^fnSkZXB@yAmWsuB6Gm~CSxOuV7-|K6~=K$6=x#*Y-4|99Y
zXD&Yt-7$DQ?v?<@Sxoa_M6hV-sbhy0=1$6+qy|W7BoWig*ael7fzdlmLB->0KVlp^
zh_H+fzd`eK%8<iHX4p+%aX2+Hj1eJ>nQ|;{IDb-J_IaB(Z$5T!)%@HzR__cMk)IPU
znKE~3v?=$r%+rdh@^dOCo-vnitUUFr(?j{Q`lkQjEMM_ZU<+mARydD)!f6$g3L}-l
z{1I8&TTV0k!}wCv2e-U<zZpOM&hf>4vw0UN_3h?evhnOr^KPMKK4ac(wt&5E-qB+D
z6!Y$3MSQ+__p+_L$GrPty?$Wc11awryjYOT5<Qu$Qcl+Iu#qQ8lNLQhu{1Qm@S7%S
z4j1tu+z~6^yn{BY)V$j)VAY#<7aMNTel&{jX0=v_dH1kV%faboL#^ix+{Y@dcg#E1
zzuG0{J-`a>bIp4O=3D7|hj3=HG4{RYJ&R4VpJxrMi*>V0Sq}!6R<btM$BHl>9A#y!
z25$=hX~lCULObxb9`ADzw~MWUZ<&f+$JXH423Qa4Mff;{r4LwpA-kvHZzWPwj5Ta2
zD@Cd<wi?jYfc65~f;Y;)53poDr>4BuBSi;W4!TNlFC)=*I-8AqMQ5`nyd~32WKPT^
ztSA9H7ZekP?ZDOvI#aO~A@@GE0<=(Bx<FMs;t(&!VF5=O@~y_N0>3KU?i~j$ag-&M
z#$?{JkoIC#u2xW8gwtZ$knbAg+^0fxIB~TOIF_oME@rf{Xs*hi(yYZB(YRdEO#E+A
z5FM)>&^{C5#GDVRd%?*TRZpD?-$zkGwVhf|PCe*4qPnLVDq_uwW5kWK@wNhK)*+uB
zP*7xIbl|xR{!YYi1=U3;Z)bvfs(XriHZFdgiRT>12E|RqOf{CoK;;}<UsMb9(^9D^
zOV8J#rbY3OB(??oCAlpE#aaf70Hb{CaJD49_d!OBKwmm1s7(-sD@@7L^C<<i$F!DI
z{(ZbuWsqUw$V5}#KJcmsEuaXLc7aZk(q*8GI9Y^WFWUf@=$orbM3PyA-x}2RQWd*M
z#h_L>U&SX0*0n<zsr3;)k}FMNk1Drr2UNe57r8z7BMN#^L!H1>gf|Bl(bt07qi_vx
zMgB#=o~+H4XpfX*C!oYxEeRy`)OuS@jgnu})1gXDT7}|jc_G<Zrm!qSD@v!TUeR~4
zic6fi1U#T}5%p9<I#=Q*aZSrF@oFhz5w>2$qO!I@>*+Vr1`cmls&ty}9_S*Hn_m2p
zZXo&XMCn#TF8UPJ%Tdk_g{4PPNz@bN6t9m>Q`EGn5aJ=#DM{?bO5b)Oj@F)<Lqs28
zNy=z4Z>mY+GL^}pEu9bPl0YR|3H-fE@^!fh8_5q*F%ejn<45Jtxqp<@Veo?f4fL_e
zcyQ%Oacr9O8pVE&K|f59;#2_48FCN%8D?L7+|L6TuUg78*>`vr5AqOO#<SU7Y#YyE
zqcK~13?o#_c`namV=>wsW`BmhZRHVOzz*<2J_Hva597nxW4N=bi2Z_(;Kh6-AH_#Q
z^Nwdn`50VLK8{V`r}FW90^MQB9>>|VrR)jzBzupa#(v48yo|?qIh)8Uc$}5;N_HCV
zzN+Rmd=h(=dJ=v*pUlr-D_{}C*i-yWUdw*P>v%nH;ElYAt>n$@*L*6U#?Qin<{3C0
zVHS4v&*5{~4SXKEo9$uc?62q-;<yz3Y`%b1@^jcB+_QBqKaVeDRs4Lu2)ArqfZpRE
zj)T33{f4#S9Ns0og)imH*fV@NZ{;g+3s)O&=d1X|yo0aioxBTu?<5>0bqQ?1Ui5I2
z*<W}cdw{RuYxz39o}IxjWv}rKnB{Bdm+_7K(|i+d@!HHUXBYD;_-FZ*{3`5}=-}6|
zReTHo9N)@1`L&SUUHm%8a5L*iC3f-8^Xu7E{sq`8uR~tD`8Iw7>%sYtH}aeK|L`5G
z7q^1#WS8(S@|*dW_$~a)(B9M8yZl!E6}}7SEPR#U#=i!Q@GR@&xAU(<=dR=5U~Bj{
z`ELF#eh1bL&*FFT@9?{@-05z<2lK|?<@fOK@q2L>*<7rl`#!&q|A6mh>-i6%w=U)P
z^9R^v{6YRB{t*8$-^VucpRf&lKmRFzm_NcF#oc5F_|N%c{1@!2{Biba_FeQRZ=#i-
z!=K<!;wHy)`BUtV>;wKQ{xtg>|1~?0ALPH`&+up2Lbi!N$A8N<v&;GO{006Ze~G`$
zK7*UiUg5vzukt_eL;R2YHU1}lnE#o-j<You;SRJn_+R;(>{ILl_6GkOyPqH7f9G%U
zf3OSr+w4#LpZp#EFMgE2%irVg^AGqj-p>ax#)v^a%pqEs%y$X5@CdK)3BL%443R0a
zL{Nl8w#X5=B9DEU-74}$SVTmDD8#+uL&Y#LT%00`#0XK0yF5pU(PE4kE5?aa#dtA6
zl!%EK-91f2MHx=kE*BLdE-FQps1`L?`+7P~EIva_5od~8fiZ5Z%5M}+q8WG2PZMY1
z=HD4&rkI6M;5lM0?n|DJJ9rm}b8v$DdAM=>e6dJ;N?af=6c>rbVu@%GOT{v=T(pW6
zVkI`_w2M{ZV$mU1i%!ucy2T};NA!w5u?ExL>oEU(sn{Sc6C1^+#U}9?u~}R$t`MIU
zSBk5|)#4hl1+&{*#kJx(@p*B*_=4CbZV=nWjp8QpKVpaYKVql&qPSUnN!%j7EN&HF
z5xc}!#ckqi;&$<M@eT1!v0Hpg+#$X#?iAk<cZs{j9`RjqkNBRrSA1XGCw?IIiXV#m
z#RK9&@gwn&__5e0ej@gZpNfaYBjQo<GjTxtTs$UzAs!b`h$qD_#Z%%};%V_~aZvn5
zJR_bJ&xzlP=fw-+Me&k&S^Q4CB7QGk6@L(i#2>|L;!onR__KIj{6)MW{wm%Sf5XYI
ze;03we~7omKgB!ZU*f2ESG*_Q7axdYqF)SPfeFX96AY+J8`C&$>A|;}Px@s*X2?vL
zC4({~vt^FVm3cB>hGj$+$U-?p4wb{?aCwR>k|SiX9Lc^UN6FE0j2tV+$y4QcIYE}l
ziLz9lCZn=U#$>syka1Zlt7NsT!FOUVX7%&24k&^#o<ghu94aTt)8%A&hMXeLl(n)>
z*2@OjD4S%noGPcuv*dI+L(Y`5<ZL+y>u2W4`SNVJK%OJdmFLNY@_e~Seu_QF-j)~0
z3)w%}JMtpAST2z*a;aP<m&;bULavl;vR$r{7t0R0T6W4V*)1=TJ+fE!$u)AVTqoDd
zOXUW6ncOHpjfsOz@-uR?yj)%(KP#`4SIMj8HFAsmoZKp}mDkD7%j@MA<TiPO+%9jF
zH_88zJLLb7JLMPU&GJj~7Wrj)tNe=GCBG_flV6j!%dg9C$ZyKs@>}u_`E7Zp{Eoa!
z-YxgY@5+1R_vF3u`|>{d1G!iJP~I;ekPpfq$%o{R<v#fnxnKTNJ}e)RkIJ9P1M=tc
zG5HJmxO_rBDSwIah%7b?b0y!#I+CwpZ09!iQ+5s3G`cV&d!~F!{z^VAe=QHn-^gd=
zv+_ClTNcC}jQ6nb$rt2{@+J8)tCzo%uV6Gfz%F7-*c4VPe=lE^e~^dR!|V}uFZ({b
zkNtpsi`~H<!tIPUzGc55|0rLRf0BpgpXKZFFY*ofSNW#=n>-@_F5i;>kZ;R>%6H_y
z<Wc#qd{4eFKaj^{zZ}3M2dDGpF`aH(F3W9sEH5V3{Z_!rurjSID`<tRY%9mgweqZd
zD{Muq0;|v(Vhy#1S;MVUtRicKRcwv4Mp>h+G1gdXoOP---kM;QSQD*M>ohBBm02;X
z+^VqRR;5*CRa-UIB<pl*vUP?v#X8ffwd$;TtHEl-Dk3l2f`j0%#a+GEvCmpfRx@s*
zJj|}Jrn3FkH0vyDx;4X^Y0a``TXU?r);w#zbvC=wTEKq9+}1hPxz>5sLhF2Mk@YF-
z0_#HSB5Sd=#A;zzSxc>DxC?rR)oQJ<R$6TsbIZhCmPgoL*hODpBQSdOKkO!UBksDq
z9d=C}c5U2Zt+Fo0_`nz0*V#^dLwnex)@rNM>ax16OROHN*Xpy@SZl3y)_UtwYlC%}
zwbA;twaNO7wb{Ddy2ARbb)|Kcb+vVkwZ;0Jwbi=Ty3YE%b-nckYnye0wcWbWy2<(<
zYlroJtew^ut(&bcS+`hUwr;h)V(qfNYTagi&AQ$Cy7dj~o7QgYTh<-cx2-#^?^t(P
zcUya`?^^d*-?Q$uzHi-U{lMC5{m{DKdcb<n`jPdJ^<!(F^%HA9`=Rwy>tX8=>rv}x
z)&cA1)??N$tjDb<tS7BsT2EQOvYxhnZ5_0JV?AR%YdvTE)_UH0!Fthp$$HuPo%M?K
zd+Sx}57r^;kJf9}pRB{ypRL!ezgTZrf3@DU{$?Gq{%*Zx{lj|O`lt1d^)KtF^{(}v
z^}h9ib<FCw2C%}3+X838Tegj}<J`8#_S!z%ZwKrQJJZgxgLcTywsY)UJI~Iy!*;|j
zunX-W_E3A6J={LUF0x11#r8;hls(!WV~@4R*{9m$?Fn{?J<%?;PqU+TnH{ss?Fu_?
zSK3u}wOwORvQM`s+h^EQ>@)3JyUwn+8|+5A$!@l%+SBZ_?CJIld!{|ho^8*u=i2k^
z`S#iN0{a~MT>CtGp?$u+h+WTKgk}AC_B-|*`#pQX{uFzO{gyq?US_Y@7uXlt7uk#L
zC3cIw)Lv#Uw_EKM_DZ|WZnsz27uy~7YP-|!vb*g|>>j(<?z7j}YwdORdizp)gMFF3
z(f+i($^MMJ*}mMq!v3s%rG1rswSA4f#r~YV)xOrg&i=f8z5NAyn|*`5-M-Pj$yK+s
zr*&<sdrfD1SyNq;e%4o-XVg4n=2=0{Xjwy}_SY#t(lr>rNmo~G{B`DO@YKcJb*o#J
z^>lT*>$+BUb+%sYtLtg+T-ma0O<$|Ku1P)p4a?elmaSR6qN8=auVHytU(2#(t(|?Y
z#$_!?h(}LXOP{Mrk?m?yK%Gmyp}xUT(O`0IFw{3x_?i;vOcFzAeVx0>5Z0s#GvTUW
z(X#4h|I{Q^6c#Ou#e7o}=&Wf=TY7YwShaszGOjply6db2i@~~P9jn2xrlHz>mdW`n
zowMt#zV?pgt$xZRT2U7*kCyqTClTt*%PU<o6}Mb76C8+^mDgJ{L6U2>4w{`3R1ud=
zohw~)Qb=hm)1)*SJ~bL<G#Y+2n%Zr2_-Sgnp~;@p*45K#Qk#M_IjKynMpGM2(Tq85
zYf#5MYgTu(tm$*lF~wC(Y^w9m>FsFgZPOIbH;)v;<CU(n71V$BAST4h48b)`)&j8K
zwIC%~r6MO9E30#zlUn9-&A-Mf^Q<w?dh?9av#hDfl)b6aJ||h$CX->a;aHPXc2nl2
zri^pa%6g6|>p8k=?Q=-lUFWC@cAck-bzZVq-t(5XxAwI5w)eWuTiMgHw$*=rGEfuN
zT;V!j1sSiYo91fQB8ASkC?S)smPEnPM2+0ltAdv`)tkz%R}6t)6&&(us;$m2qRwgR
zCS9Fk81N~E;c4*HmAhL^VOvboZb>%nmR4QXWy#|BmL&;Yt}4#es_1pKCaMu+InBjn
z-(a$9Fl0BxeXR*RnkDsy!uoo5tD&ehtxc;EMPu<A|H>pelooBe+_y4;&T31x=^B4q
zGOnvV!Psb-(|Q^VLmFz_?IzoH)1cc`eT(*0Dw9}wm2TUWx^1sYBGyEdR|PI!+0)wE
z+0oLuynUIgL-EelkzflNdV|#gI$fQbt(`61UA=uhUEOW1uFjNb6_v6T^466~uG37N
z#&5XQXc*dP>RmUGvL;8>H#FN_$%fEq3fttQGE&lLs;j9iqbsc;bQzZDMqlsmN@?^x
zx_mt;gvYB~y}D?<gSZnbtFb$}I#<Fhq9)&$lBiM<gC<|^T9aC0(`jk-h6+=S7Ehzw
z9rf1aH2o@jO|qm-hCj`QUrkQQO^KVDGuEV)bd6I|)8yBvCcj2E`E|Nb>ym}?u1hre
zb-Kx4nhewe-5hsan%d+|Q)sSnZBXcZ8xkVxZYgc)=!=#GT2zSRQQXj;45i-cnp1uC
zRcXGmG+%j|FP`*~uF$?vOOoVdICMiwZ1@_}!qW1rt4Ry1*S@S4hc{`VhQ2_HVoF+&
zL#$CnCd?=#?ei<Oq~C){6{P`z7FAE$<6dciD^vIvO3@iQm^ezBL;HeB{gH+xmbJ3A
zXEhr1(vIHJWox7Hbbp!dt}4n@&l0UDQ{slF1J|-$5jD>m6R%n6|7b;xiC3eAy`s!{
zYPDVwHSwbkUX!j&2@~>BJsX}%+@lpytt2bTbYrQA>c&!0ro<od9KRD!bsK;y1rV)>
znfziVznGyf=9I(4j~O~+hR&FwCuZo28M<N)T@HSef6UMmbLe#9Iew@7PCka-sKFmK
z`9)1WQ3szxpUE$3=r?9XMWw-CW#Cl?e~nWg249VdS7Yd{F?j0?e_#=l_*7_18c&@*
z?(juh(tsO0+R}#K;Hfuw>J6THLx;BDqZRdr4j8y9pL#=www0q5+D69H)RXSbq7~W(
z#M9u@N)mp9&nV9dZRJHPnhYJ<3WVRJYcl-MmJ{HHZf!wDE1C`6%_e?xb(W&DtfI7|
zYgtGA)cM9=H^^U~?vD+MA8U5Pb-Bw8edVT{<tE>9Bad;XU77G^BNsIe+{jV6p|jlh
z;|6cs!E4G}Zqk<<ew7=!j2rnYH}w%W^-*r*uH5lE@eIGpjT}~({3=X-6{Z{&PB~2c
z3PWdwp|ir!Q(@?<FmzQobUFA<{uPFv3WrW7p5u4Q@8o0XjT`)NlV9BA6L;`A^qKtP
zhJMp`S5%sK*k!HcpvvS^<J5<tqsGLmG5OXQeA*mE`!MOX85@l|`lZg`(Pk{-89ds|
zh2P-O<}uoj!DGzh3T-|EZs>rKsoRyIL))upPX>?v_C&ie^`*@$_)WRYcSuE}!PjW;
zXhRC^#iY}Q7W^h%lPQNbPXIUhX)^`w%Fx|x;y2f*ZmOa@n$l^3sx+VJ!gPx(k2x*K
z_{#_R2er8J%0b~(gZ$Nl{59$Rcw@T1d{B!oAJpQ@6D?fRS22j*ib3>M45F`M5Iq%x
z=&5K(r>9~NJrzxZ!V~n^bsgPpEmnPNUyD7pW%cS7B_ieMnwz?N+hM#~ix4E65WJub
zZ`N5D<FIG6ba%Jlqki?$<t<{?8Zmo~SlEt_<#rk_5p&z+{I)Lp?DmzbTjYY4HSTjX
zDmk~UT{hr1x3^tqQ&;0t`S*2ocJ&5Kj>_Xfj_Sor8R~F@UwaHr<?+o~-MZ35qUeq#
zmSrM2e!E2#b}7nXucX4-%Ue78THLLss2dO<DX>o!wVjH3u_|hZDyk;BzCm=Z5$oIC
zUAnxor>#qeG{o#)Rp>qxdW|V`HwwHAKX~mfqSH%wbs^}@Aug2a(ZL3V@?;s06Fqm3
zU#Bo6DUVO(re9UTbre%r<?*1f>cy`j7^^TDSp$3<T6?+%zs9@@+Sk>)!h^xFQuWfe
zu1mf6`r7bKs9wD*y4LiVxAwIrUT^z)9j_O|d7b*TwS8q<pN`nsZV+ZA^3d52@*5hK
zcXq8-G^iJ%fnE#^^r~slZ$yKNM>ME-ng;c%X;2Xr4eCwN(79%HkIF;6P#*MR@}O6p
zhkm0xR6NQ<#nXAHSDlB7sPdpU5}#O^?$_~D{S=-`AL6O{DLj=P#Z&cDcq%=Nr|ReM
zjCxTM3V&Nb)qsBQ^{)U$<~^WDF&>kz(%Z3Uwd$|&bo{EngJ0=qJT+a>YE4(PTGJJ+
z)^tUyHC@qaO;@x^_y1AT|3r=57uEe#EUN8LJPp1ogRjcqt1|eibbk}oc4#cB?OQwz
zUHW?genWTE&>1y&wf&56gIC+n@Eba#nt#!l>X%~CxOr-OJ{HyXe0ek)^|o|&^|f}i
zwi`8B)s(fY3rezdZA(Y{%Fe~Dmju)NsN3weOEJ>XxmZ6+5v?WM-O_^rlhze|i(7j8
zT6@}iFIMpEr5IfRcEB-Qpg_3<y12D34LH;Qd#J@MMjlIBd!TnZHIi;1>{`B9KNP4S
z4U`%ZNe^kgWKBzlN)k>F=xFWj)$|znC2LxH``S@(DvvJnVqJ0q<f~T=I2kyZmr0%k
zM0#7HS&6TU6K^V`?AG<mpotgjhXNI(fl|vBazc`YN`;`VoWkZhrAbYmp8z^9D!&}Z
zmy$l>)Z$`Qv8q~B<orZ{^P<3~IKD*nCtg%|ULqVLYb_8EopS=JhNBd$AX)i3Z<3Sa
zLK0%7LWZQINs%rUmX{KiQk^N#6xK&lzz$cA!;<83jv_m~q}dvlTFjsZCCiwf0$7{`
zk6P2Y9Adw$tEY8w%4?!&DM~U;<7@3)UfSDwNyvCtw=ZAb(Mph@f%NvZ^z;$Hh^``g
zaWY;wO>~m*>=YiDOj3E6jF_7eF_D>JiO$R<H^m)HK%VA;1}6{{r1B;W&CugRlEe%-
zJ}`kYJB67}iBdpGB)KWjMC$xhKB+1w?d^@mhNgm3T8;_~r?5ul*c+{&swhl>JK36`
zRJk{Kn~)5rm0;YeESjO!RcUWG6l+gFi?sFxld44nGK^?zUsgh*jX!}``$I|M9PEmz
z#*?`eYTE#M%{W-JuF<!medU^-*5#N(QeAJf%ydzDC@mH(E6Xq)g~=w#WP>@FlyDs-
zm~7q}pt=#$XP87esXc~)DU-FSygAac8eHndXy4+*o2t1SbV7?2@}x$~b6~)qga#DU
zbXh^;N%Ucn6u{!trk?8rqykm)R6x%1u8s~+k_yZ0?pV{im>f-M!kdJJ6f8ASzHT78
zV^QxaaoDsQ)3qdeg`j~a04DulaJI=KMXYljP-^x=2LaOxG@N=^)2|s*A=P5YR>27o
zq&~JV4U~o~Lj{4ks(c~Gm#C1uRLBXSsZ<A5TwMhUT_gpNmTRU8NYqJw!kZQ=OM#Qz
z*VLuvsPRxVUAHPh!cnkX<!!-qi=M4gz@dYHY1y7KIB-y6O_px3%0yG~wVF&NE}Tr4
zhQBZco_tkw6({}Z{2Y?gQo~LFT+d6SiV@l+ttKF|gq{jrHZ_{`ZcR1H<GME0x{mAK
zoF<o!p<oc$QMav^BpUBvOj;9w7SkSd51WXtp-DVpCkGvn=rBSAPeY;T9-Lh1qCrU&
z(MkQ7(pzVwAv6s+NlVrsMEOq39K@7C;3R^`ppZmq@|=J)0us?RG>Ipi9zB6(xC3{d
z>4c4Nz|PYIClMDpA<lDf?G1ARoM#%r$0Z+3_$f{@=cywk3Xr3kPde3FAsk1lRz`#A
z(+V$*C>?PyC0Z2>%3kZJ6VNb3!BPW~Jkts_H7rq_a57mMNhwJN(^W7yNfKEa&s3YH
zIkxJQk|cqV6LfwQyGC;(MK3GpFqP{`(@<M8xjR{um1$NZC<)3lrA%~v%1#@S0!`6U
zDoj~3Rb~2vysDzXwYt3%%cNYrt;@PPm+N7MvT`qdG_J-MjRVmi{N>GRU^-UbtOoRB
z^=5#hyjcw}1Fi<*o12>(gGm!b8#_KCT)%3IN)KwsqV@3%)zh!WkO++XOReRYh_{;7
z^r*2qgqy()JqZ<qab|V2_o(lB1ey^6J;MdR8Cj^;1V!~s7vN?DLC<)>Z$>Qij2DpB
zc$MO&8uOdVqW28*o<ca*3aA2L7)P^9&nm`ZX7&#S(&6QmnNA%N?$#bZReGs;r-39S
zDaBw&PO`Tt?Siq^-r3UOSN*fjHlXU$FfV~qhiRPpJ(Pk+L$Xu)D<{3vN9h>umY$xj
zb!)nHQEIAu%C9U&1FH5a(DJTzYHb#ZU!x)P32Wk1YRJ;AzBc`~rhB=Gt>;9rVoKLk
znVwt3atd8jWu|(|%ve)>REbcmKB~ud>W#r&ujj6j&Wy3?ITQFDyjnEN8qAnnLnX~k
zP`DnEG(NKkK+zpH<7e?|En;zupDpiPiYda2O}MVfxEVi-S6A64v^yo1o*j?Ht2M>(
zYF&bOb)&muMM}JCO<}xRQyj<WTTfp~c#X+T&-P*^ksbw$*JxRd*J!zm>)Bs~8+>{e
z7=A7DaXlLhf3v%z4{P9-x7x~eFTYqni7)YnW*6Bp9j&^kda5TD*Hg84>gtK>DO>op
z#)#`FTlfuedMX!wtr6mSstJC>1U=;xi&yGu!(o#;KQnY1*HfJcH-*zvnK<{wFiB5=
zBHZBDQ+n|0A<%fGVVW6w#l~%oUr)`(;(Dn=EUuRT#NtN0;(AFzEUu?K5pF8ah*?|@
zB_h6Is$Oz{_=f&UEoN~u^c&YxjtDpLD-6CWQ%QPC81xwWjCjY*P-xr?p~kBW-^`F_
zTrVAn#j6ZI%us3E43Wn5kZUZir+R_k<X7dC$IxqrVB>lU7UebZ^wJ5?ZTJ{7^y{f;
z;C1|_iRdY2#5eTlDPq)zp}W$=uXM_9>Pb(%q8tWKm65LsQ?C^!y%|!D#|+#w|F~W%
zg8Fdq8U9z9cxI?LZia~CW{5g&hM41KXgO|%u;W!uxeOk?R0aGqelv6(*Hh=<mlMyS
z*T{3s&|Pl)<&NK!PfyW<Uq-(56gv228nvFPhrB!CrhIyeANd-*ddUpvGx*C4Tu-^9
zo=iRKB`b($@aZKo@SFOrblRV(f764<^%ObiGWBDI*5i690O&CE>LobH&(yD;0tbGl
z-i=&Tn)1h+Y(251+|p$&y{#F}%$NdEbH!?8g&xl;uUdb#tZVgBuUc(JZzhf+8F3Ve
zc&e(vQ?UZiI<H!1m6D<&qphp!;+CadYhm6vc+Bdja?O%xd0Bk`OWl^Xc66;vMlwr<
z%FWWD@>q3t8Y)$ifTq2&blIgn9a(xk7ric~V)|1SeI<&ll4T}V)+w(~uQ;PLKE1$>
zUPGzt|5UuJl=W~bvRb96QJB1u&Pyu;HBb|vXwl0D)8c~8U<!#UOffoUmh;5)GK3~G
zor9;UQ#@4#G(~k+j;Dd^t{nby_gT~RB0@!1%Bw1>S3!xLKJ})kNGY9)pW;`MQv3=@
zW|A9(DJ58;OK@BvOZXJa5<ZQ{5l79VAS#FKv{jBw1ltY70c1J=v;MbzmC8dgUXz|I
zwc@IljASimCd!`@oUE+eWXTjd6)6R%QV#|uvF9X{6JrKPOy-mA6g-(r0+bZ31Slm3
zCt-?IWhRzos|?+}eK2L0chYWYj&u34)UN4(*)%P%rxX`R;FphGW*obiM#3F~lO;Iz
z{hkT84trTRcIwWCJC`kjdjWPfaqKSN2zL|yIQFt$1NU>-ZN;(Q>N>dB<Bzj#*z?4(
z7wVUAe}z3ToV|d(FdVyLj=+5jf1JII-F%!KW$(fL0DHA@3m@*`<JhYmf}4YV*qj&e
zA#jKBQ{axkZfTBv(v#s%!LDddJEGyv;4|RP;<Mn+;mhH!z@B1`oy0rgei=K4Ira*F
z74A2&|CeL;@4ayE<8<%egZxKuf69Lf_h<ZPa3902UXI<kufqKc2eoRqEyqsVf8qUI
zevEPKti?Gdw6hj&hRBCoi1S!*prIHB7kg*nV(%>6Qw469!H(I9aHApyceVgOvGes@
zxY+Xw_fz6RxQoRKxR;4f!~Kk)qqnaX;4OBoeh%)n;##<$7bq8Yu5N>Sqd@6s$12=g
z#jS96iCu7S6Su+LEq24bL)-!PPH`vPyT#pb9}o|~eMtNS?i1n(oOSfBd>=PxU~e7c
z*d0~NB<(!H`!zPzEXfXIL$Nn7oAK2xJr`r&Hl5%&1}9)tGTGQXa{;R*b<1iyTKYO!
zEkY?x)I2N9v)Vjq@4k*9aQ;h$iaVDhZ=3{h0B#9(?{Vyb?}2+0w)}Ik9{a{gI&0yM
zL7sHNq^678Q|L{Q{BXNQy&r}v^*%0UVejng*eClAU=~h&cnLB!1GzGBAo25I-|fpz
zJnWtQ09ETje8?ekYhX8E=jrcRKO5k4`DHjV(E^XEaWwat_L(dLySI8-CiZ7tg?+Br
z11lcJf#y$Pm+!0C4~sv%KO<h$@9@2fJ-Oo@pYz1NUflhIUA*rhG#fj0UD%;Zsk4<E
z!Cu@^Nadu90t)%Zxi6gd)?#1i7}}+e_S%4xL>8cw7qAP_LN7t<yd0NAUxyOhs`hx&
zDFJ&?nrE<6{w0*@ZL~WoR}fq&z$phK_-QzIpaHFEF3t#`lK^l60QUJ`#wKCEavSzs
z_hEnaW=Q3A@IQ&Y)7!CUn%<Isw_>++(x>0<z;5I{*dhHEc1G{VF6bxWKZqawJ&#?^
zuVF{?Tlmuua*yJ#ALW~bU%^L|as$e_`6MMhh?4#uI_5o;G9#sw)zBeRR9Od=6lV_X
z#K{i~E&7xHhW;CAC?87q$$ljBhrk>9$8i!A-m(84F26&$pA|;|nM9$&qg>VE(2fW)
zMy0w&y%($Zca;0Ca_NdB&dZdGJIe50uiUBRvMbg55arUTSezFsH?CaOnz=gAoHr=Q
zY09M@hjX2;I^mwvoqZg7mfRBMo}%2(iTeQ=tK4bI%~Nifax0Y^Q*I5p>^AjYq1^Gx
z9fI>^Ij>PJok7dlRt2A_AX}7Mq9CWK_cN4RsN5Fij#uuf$~{H7CFFwV+NBE~iT6He
z!8f!9lpfN6GC&$o=Ck4!?9`A?FC+I&vi#)mWy@A~%jYqeRVGKljmhzF%ViX9g{*`d
zmy_XE%6hm}avI!fIU8<`TtHK^auM7zxdd)ZuAqfhvSS4nyT~3|OD)$ccaw6jRPI*g
zZo|B5kKECPhrESM0eM?*d*=$d8`I2X@>QB_mUqD|m-oW0koWhlS=uZ2^<uT0e3Vvl
z$;Wv%_Ljeb9pOjhQS9^fU@!M(?B6cJ9_=XJs<HQa8un2y#4hR0{&TS}dYiuu`<r+9
z4`NsI=0Fg8m$wDRV2AQ9>_Xn-UWmQM`>>n%Dc3^(Ve2{9VeAw>jNQOT-I2h#HgiX?
z(>Dk=Vi&<3hkd%$cC9Ol{kL<m$94&J%XVW&>}KqG-DdB!ciFq`J@#IEpQqbCU_a&A
zZ9iwf;*Hve?IZS4I(pg_bVXc6u5qrYtJ+oTn&z78TIgEhYIAkF*1I;lwz#&rcDi=C
zcDwet_PX}D4!E9jJ?G!xdc}3vb;NbljbrQrlii@lUF06;j=HPewf^he)BLx(=eifV
zm$=*9-R|}7&F(G!J??Gpo$g)k-R?c^z3zSP1Ma8X&$(Z5A9f#cANAk_Je>3!@f3N+
zd7_?bPpxN~XRc?VXNjlH)9qRB+3eZk+2+~l+2z^o+2h&k+2=XndCK#g=M~Rk&k@g2
zFY|i5L2txc<Q?aY`akeiduzSZ0?&BodKY?^c-y?)-u2$if$P0nyxY7xy}P`-y?eZS
z{k7hG{^{NW-lx3J`S*KY@gDXb@gDU-aD5(M&=>I)`NsL8zG`2sZ=r9RZ!X*=zBXUC
zZ@q7`Z;Nl6Z>MjUZ?|ucZ?A8k?||<q-*diKe20BUd`EGlK#$+!5BekiBL6sl)L-qN
z!k8cW8msz?{Mml={ta~tiu}P@b7mI#BeQ2V7Ws?j&zXhTs`b3%zX+|A`(g2L>F<Oq
z{A<ywj`}yj{g?l0KrBDmaJGL3+<^a9xEcO$z|HjE1vkroA6#6!h4}we?rX~Zt8)LW
z+{4QKi*o;@+&7i`H{~8t?%#b61CPtMAFkWC4{lJw-&XEh%KZmim?Emx(`_z3-z~5w
z-evErbAuQxW7q{am%)p(7BX=XbT&@Fh@jsZj#B|fv9UNMs08OYmBHGnLZ5a9`s#Yt
z2s>&T&as&Z>v}FukU1Bpy?jcY(?Dl8wc%X54xFCU4Lhh0C)%uMm*J$D&#)_?fv<tJ
zeI0D<Z8%}zCfum86DJJZf<As1PKdajeS_`Bc@Ez}Uw;oyc=!SPA$tI)JNyJ^M?3=i
z>M`~>JBU5%FXPl9(qX)K5!pkG4|xpq;~D%w!@*eP4=mUIzzXAUGyYY^-(mcn#@}uH
zJ;vW>{A-PWz433*e*cx)?=|^)-!p#nU__6XY&UwoZJzYqKz`We>iMR5zM=627ifQQ
zp~-Kk_6KlmIK}rHzZdnb((g0z$mT<Mz-Rmc<IgnlZvDu3nqNVaj&5@#e7VM-ul-s0
zwjg-cQ^tSL_@6WW7mfcF<3D8lhmHRY<3FPP{sY?YH}&T?`2A1na9@QE_Z%|*661f~
z_(vJPp~t_=;JeL)2TV9x8`15#SHu0+nRwT0zxNFjezSS*H1SM*`%Qg&A2;FD&I#W}
z6VJ#QG=i=tBWHdiXZ{WyAG$(^8#(hEIrI0Ka3g2_LHYVOn($2~{bu98LO<O`?%YRB
z_{s4py4}y1bO%lRLG*bHKiv15czaEL3ymK-jLPr6)1;qn!e<))Y~!D6{PT@}fq9;5
z;0B+6k?~((!Y?xZCC0zh`2Y9#tm@5e<lANV;@Yd}avQmD8NRq2zI;S^-M8rSxlBE}
zHk)!bnsPTA|1{&DZt^qr<vQ1-Utr*de=buWu4yLyP?O%#BSpqvY|@n&Jj2b?#19y}
z8KxXA`mRL1XP9~m7`e+38Xhoo1?c-1@dE43)3lesmBzo-Jh$nm|EPI>VBkor(p&mz
z?=;UH=6REOZr4wrkqdi^fnTk^(gRLDmAafh`uYcMpW%zo@X0q*r^|iHq&I%s39mHp
zTJxM@o|DaUl78kIeP%}uywv1t%HtEpZ_4F^k*DbK==eUPzkLDYH~KsGPVKi2ndhtK
z`HFeIte^f1G(Ow#!+PA5*U*)-Psj6`C)%Cjvvr4o-(&o{%v1Lp!oShKO<|V)hx|AD
zwRF1zj|QF#yq<Y(=BiAsmt29@10Q5$W^T^BDRZ}q@ABW~zsJAd|8z!XMv;L$<$uM0
zB)~F?GGYeOAIJ<050qxaG8#1`P!gCNm>IYrqcKBk3RmXRpq05c<J`=x8Eq<#JEJXQ
zea4oIotf8V-kP~b!!qy6+?V-u=Ao>&gP!0}6K`|Iwv1hwuV%iT<;sdEm?tYgYfM&U
zR&&<5h*uaaG0?eLOR~DNHfL=Mjtfo-YF*|FP75v!wguM*cL%owcLwhdJ|28o#rFrF
z2_6o<7Yc-)4h;`QL$8J2%g)T!Ey^Dn6RHkP&n^sIkX;(;3~df=&#n*MuF{RjS)bFE
zvo*IQ=a#&Vyesl{=G~R|aNhH|wYdv&+j2MNZp*zrcW>_Fxv%8hm9sDB>D;&TJb6R&
zqIr#Z3v&+Tyn}0L3KgDc-hsT`dC%uxpZ7*&N94}P{>XEYHw&zS!h&f2ZTa`*KbHS;
z{##*JxG-EAt`DCZUKQRH-X8u&UVnZtzc{}le1G`K@T=i>BEHD*NG#G^(44n7vMAD-
z-<-cNaz*~C{EcR;D%(7B%rn<K@qMkvvM>sOr@G<=mZXHl*`Uvj^P;>k*6IAN4A_-f
zuq;EV=c=jG!A@aCurkq+;)k=Tal$1&@$n<8F7Xd{NvHh7og^v$ILU9~Uz&$;YFmka
zI0-uCA4Y0Z{&9bb2Wl(Lhnr%O|9DpNo$-Rg0gPW36ydISUNC0hD!873o8bzSnBLc_
zcZ>n!{YvLOvTXo*Ch|1yY3GsGDNbbTz|WP7k;};A124c`GO!EoB8+as9l#ewWPy5L
zFn}@X$ZT+y1J5tuZl#g&$ZZ3Z_7;q(@yMnDjEqLs6Ah6S18CckC8!G?89o3#9EqSl
z;0{11M6yvUaB(Urj|6ZA7+gggu87CGYv4(^OyRE_cpmRjm2YHVALHS-1?UgIJpi2)
zeskata1RgsQMu2;eRTk%<^`KE!p93XKn8dLo#zUigrT4f=ehBMrTEU^;ck3E00Sh2
zhws5zaXfMe-vd0n9P+}$FGHSq_zFrDUP$ker>I=vNf<BWVelG*Pdp54!_Y^B>+vms
zJ|tXg;G6NJ^x4P_eN-5wEg(NI4803a^lOoRJOL{pJcy&>;ho~;BdoxMCvX-(M~9<G
zcP0F9;T=>LWMlB_itubE5Gt%fxf`%dCL*sz-UQ6T)z1%D(6N!%5pP9!JVIVk@xBGv
zYw%?c>4W<s;@z*}?T7FFunX>96_4ufAq?id6S)ttdlB!4D&Bj5y*8vCup@vyZhZ>*
zPGMq5b^bHRw*s*B5`9(ya?F2pNGV`N3WhQC0{HUp8!`$o{BWw^9>5BLX=(U6z=8^f
zel2n?;%y&7wBQCkoPxLk@qF-253fQzd{bJBBxW2U$hYutekVdG-*vJKuoz%3=U)Wa
zI0cIVHU_YR`Lh9|E3vmq@Gnw~Jf=h__XuE5SQh{`9I(<zK47_kJw|0yF|zX!5+V9F
z$_BtFMrM8{+<=0i&I@|L17BW0=xbB3M%2?gOys>;xPpoB8-U$z6$17;U@sS502t~+
zeqF&{27UAMo&@Y5VB2L0;yn%6w7iD^I{?^?aw1@ek#|@4QNSJstW?4l38UT$$LHM&
z80rnYuL6ux-IsSg+<U>RxcoL?_aI&%Zxdj<5pRP$9dF;j+xKvf2@l^1-|czJ;ohdW
z`v_o&m$x9i3ou}pKcLzV-ws$~_!hu!2JA<G36eMY6D1pvro8cC<QoC?a=%Kk6|h3I
zA`#vU*pC(LYQTJ9qGcms2NaBAY{-2N?s~vJEt`=W#aNpQj)nUaY${+In8<xT3~r<K
z3Y>z8S)cG)_&ReRgWI9v%>WEBa_=X32~&NXrQ&tMw<7lrxF{*|z)Tp$$h|qd6tE?L
zO;_<yW4T+y7XgNP!nvI{Al_E^7Ud#$RgQJC9I$iYo1IH}%mmlYlhm%~!#6z_d<joO
z+RG&71F4nfP7gN&)(F@c@-o2c0h>fEF<cGUOt}fLDezV1j)z+T*d{p(Z!x?rk<iP~
z03tV-n~S$Gc+1R%W(kkNTOb#b87@Q*I3K;32t%IfykCSuPIKPLc@MAvu)Ho`1k4B6
z>p5=%#sGVVV9+%p=jEJNA^mRy_N;=v1=!O$&j5B9u;&3oyT=>Ou*BOTyx|N>w1w-L
z%y};7MUuJ56-+`CJ*Z?M8}I}9kA?37+=Y`vH^}=G+yeaG@U1y}LBUbLAEgr`K^Ja8
z$hkddcMeG+ZhAmV+pFZ_FyK3LZpk4zd=dEL@*xGs4GKBe<!sBj32@xd0PgQo@W%n)
zoO7k(_CDa*B!3RL0DV%9v(CnOl_HF^I0N*L^6xsW{3Xu&{0rXq1AY*vc>V+L_u>6l
zIQR3fpzS&)!#lzctF~~MSvXJiHyGCiuYk$IIjhg%bWq|bY+jtP`Ybs84tx*6_bG7h
zkURq4gYeDAxudU1a28y#<UE|@iSshy+Xdg*IGOYn`38KQ=xes(gzag34tyO5TPl~)
zX`%4lf?Gs4fyXbJl-I$(Nd8v7jMGW~hVZTMs}n}`yd+w#E3z>>KfEoRAHE<w6gCpi
zZo_ERGx`aO;ulEu6mzR{V=u&ss4w9J(|=ODFtku`8)_K64&uF}(h_VV(&FjBAdNhT
zsd5E*1+nlJyg>i({(FTBy<2d){sHzof(2(Me$1qT{0FB5F(PXGrSO;LZc~1qyBYC^
zs~?5)AmvLxng`LjLf(TzVSVfH0K#1Okxiw-vrsEpAB15=Qu?d|iJub=natXowO5Dd
z-G^}Ws`xqKI}yG!?;9rlJqV-Uor&<<5PnP6EhhXrgl)&~x<vRD2;Z20lL=peuoZx;
zfa~P2fXS={^rz$Gk3t-1imZCLn(E1bOa^2!Tqo6dq#93u2}lHxNLD0|#%)p7JZPrO
zSMg4@cB$q@=2L*-2gn8$X9xT*nmAiboQDB>OvNDx&szdN(NC$inmAVgh94l;syNe9
z;@oKBY)Ql+2+ung{#t|Qkcm?Y7=D2Mk>X@dO8iVYGocwX$HP@+%6$vr=uz==!lBzT
zeHlj`e+JrQ_T1d3b^MH%F?xVscC8bh4UL-dWX6-qFLHO}f&&@Pz(+LX6Aig2SH^z*
z11zj5&45nJxC<`DBbdPV6YRMRk_>_ssI;|!p#JFxSfNR~328TFK-(J_&#gwB`S?{R
z*dJ8dO8ATP5Ag^F%o)()8ROwnTH+DGKxamN#<*M<%ak(b5MXMg0e))lh!X&(=!f@V
z6en;{{Y2m(-VE;o(0zgZ^p}9_0c1~LPbgbKXv%;GZe=2HD_ot|oq&*Z6Xu_*+!vy~
zIWj~Lgasi#fwn{(!h+fl?oB{=0NTR*9BO7FpP7M~CLgr=0OTG&m2dV@yqBn-6Mrb;
z5B2x!@IVA%`saju5bg=!TTj!3Q6J$ynyqV|XQP$-538RO{v5)e!+Z((b@+Bb_V{&O
zQhkW*McJ^3FxR5XKT*YO24sW&0ZumrArxb?!oLD8@yUU$V$#3L-<`b#Fv<h;`WI4c
z{7y0H2pfKY6d6b@Qq}q=Wt%n-dJ!>7O{!uOXDDF!0XmW}`>n)}azYM1^jyBT;i{ZN
zM*xA;;OB%NMEJqbYdSm#Zqr;3eopwk2){Q-vqa!S=yl)i2-QC)#&#xs+e6R!wrd<A
zaM-sQ??lyRLq#WG_yKY`(doND{e<rVyg7KL1J88&QxG0%M4W2mUJciYGX`<S_%Q0B
z;{>N6PA=l)!gb;Z#KA%S!AgT?F5{u$ct`H|0!QxNdjTOycOZBRLA!+d(jb|DEKP+3
zUj+o%3?4kFZw*aJgFx$qAg?A4&$%CdUrJsg_zmw8&;Sb*vyw{?qUy;zlUd%G-kHJe
zcq5nyE(uaRDk-pGEej~eXc700(m%i|O<LH5nE4E<cm{?ZSYSK}HDxHlBZ$5vxPbck
z6d3ipwbaimm<T<MdAR{PRT+1I4B))yGcmV((zBJ(GOAfY%54fC^9BM)(oQx6xKDUO
zG){p&X^!^QNQ?1@^t&{0lg5>Fj|RU+-=V>;<=4@j8MrZH8^3{X7t00RkFbwcbmh3%
z$gD?$cLrU-AV%dz1xtg~!TR9L;JI0kW9;pztf#^GRl!$+H-(xp4%e6UPS$f-FJ~Rf
zdOf=@t3S9Y^h)-_p$CJzvW`%VxHp?$r>ZsX?uNgc3Cww4q#;3Q4!jHZMGho%H6W7^
zO7;4Ts#o*@?)e7tTLnQayDQQl*?{DyK#<;zw(ru~{sk=yu6{sXQJ5VFe6A<cAP**b
zn`c#C?;r-o05Tx)!2cV9WkGUW`|#VLU@Be~B*(Q2KlGG{r(uvB*Z-~UT)^Zisyu#Q
zJtVQGXQsR9i9p<-2>B5C28b|{7$9IC$Rj|2$VQBQ;Sm^vgptk07_))hk2gtpMTl#J
z5D~KoMBS(%VhkY!R$hw8iXyUr5qT^R5d+!Z|5VlO+e0Aie&6=}&aFD9PF0;c^|*Db
z>h_rrxZW*V(!OuU=}^x1vOa3*O@@MQ1khFLq`kA_U?`JX_~<)rqa6gk@)lN9<F;K|
z_%bMi9C*ICOkZm&bIOf=3XPe+Vw4#FORtxl229)KB~Tv);4kp4hi`ppMJ`{geS{Kv
zD7hy=NN*v03rq8IzN9?1G8?WdfisM18musOz?JZS<dogZ$dju=A1+M=Y}|0#u2BD_
zaqx~SjVSPDmEq8L1E_maaOn;KufSW$w&c8V_IhMc(pY2V&KUW#H*8Up`phUVknkV$
zn~fvxSO#SSlnvY!C+_Su3OWPlJ&RUA?PlRD&x1yxgxONU#p5Vbpv-Hb@Epr#6)13n
z$624ndf3Z{R(K;)I)OsHXN>3t3VP{qt@3`$oz|G4kN4G$>pw)RsALVG(`d$5S<m9`
zYk<>`qumPr2=HuyZz=dj;1>nj1>n~McNX&K2fq?nnbVRXM^vUk`Bz`g2TT^~HoeFJ
zbm=e|vS$Uorf0P9QHJyc2RUD(LJ3$;bGo(k+L1r~po75I{$x8PNcFsvrW_ygQ|Sht
zFCL7n38R6|xj}mfS>Q-EM+xUWpE8=&@nGalHUST`@cjV3A0%rEeCNV*HE>f4AMZI>
zkU=*g-}bTaps!?p3m?xrtkt*{pnN6E6lf>6EjK>Zk!XiO>us;M&^`dIXYg>NsjVb~
z9w<|S1kG?NP&r#mDAUIi=FM2}X)~(nf6&e4)tp$_47^z2rG{hXKG+?4tiZdNIWA|P
zf%OGmN**tTcWHb}lec_Qc^Y)_FDdXI4t_4Y=f(?iUdk1pim92tcvcBnkoRHcsIPE(
z<yd?BpWCzwwY?`<yd<t5#{?`r9i1Imc=Aq9-s7`3JPB>3;j7r1S<WiPU$y4Ide3IF
zSn_)M8fywuWpU&G_>AVPaXgWd#u+`7JF9QBPR0QIlgxjb`FqVj)9z>3o&5#kI?6dl
zp+9oHYX13lpJ8{kr8p~_pZ11dBWj$DwmWNaw1jmDZGtfl8zN}@j52&x>ZOBLqut~3
zT>P}Fj=cb6={O8PzK*HD=>Ytk>WRx=1m*ze1D65Rc$pSdUJ3jFxD%ic+1u7{ap|G<
zCbosADs8d76W9sZ4cHqXFZGl5BY+ctX#nMKCqKO}wo_(%pInN&f-#PCItDTBf$Nl4
z`!e8W;CsMYU?cDl@EhQ1;6;G7K+66qXRspN)L9B*_H-pXgh|&eU2C~-?0S^>>65_o
ztPKvueGLr}uUY|+xVk&AFE9o;96;LY=Yg338mTfLqt~rV?j@J3(qEZhy`XwEz6Bk#
zs@L+il~vB~98q0a{Sm%@sVuIpt+H}fxw7+;>H}4FT`E_1EUrFTeG%W1&I#35YMc_Q
zTw7UDYpd0xbZF1evFu2tJ1*RD+0c`t6rR2sdZ0$j)OJcbr!${(_(7}&X0_^$=#CZ3
z)6zch&e{h8ZtVhkW-S9tMyy~|rge_2sRboi$r%SewX<9sV)z)^Y+9MpvBl+=&a(U_
zSEjlAu$y#=<#U;}z$9Jh-AlcDIc{1RU71jQ%J|Mn7n(Z*IiPneuRdn^47XOBq<v04
z<WRXrR7O^*Q{+0x<miEagT<eP{Ap#cN^f<&k1u>=$K)z+^_AYrVLo23@g3YT&ByCE
zT=G~vtUg@||6!F$#FM_xNiPRKqB5mQTLzzzo&!F)qh6(bDct0qRGC^`V|bs1PpM3&
zW?g*KXXX6rYQtw*_|(dCRr&|<XPLgmk4@Xk>6PU!9%o}!-szQ<A)e(kt<vY?otDzl
zEPg+HqSNQV`@P;SaQeogTupRr)meQ;YvNsv?|V+K>Ce2o!nw4c(H6cc{i(S(r$1z^
zdr*TmkJho5WbSC(QtjB<x<;e1dt-n6lWU)E9N0L#aT5ONwONgm8#5d8@b}jiG!`@#
zH?EJe+WED`wPlSJ_?Fi<HC8rQ4`#J{ePdnYA$%)qKWaS6N_$pYTf49EJS*~9?Sa~F
zyE9fRv)Yrj7uieS6W=TKq`QYb#;o2}uXm4Q2O{hGQP+m9hgko~x_;61MAvimUGP2M
zKE3OW`fz+(+E1zus_zzM)gkRus~@b7z*lZRwmP)FSCrN-tIzKq&g%Av?%tt8z=zlO
zCiS#FvObpmi?;ge_Jixo>MOe^u^ZA>pVPj3{lNOT?vq)SE_FZK{rb>pLuau*T<V@y
z?}fgF{jgGfLVLt|*fjQ3O7&^@`|7j1r=z(P8)NfLhpE|~()gdM4|y7`-utM3=TnV(
z-;ChnJCc1$`|)Nxdhpo669ylJ?{LoZo-lZ-($g3~j2*f!>R!^lqWgQuIEWp-Qh7o7
zg7RhME6dk1!tKV}c+$0Z*Z#!Fq6?zS<8kp(@|(RitdE($-=`(|eDBX1%NjQ|Zf&fN
zGR`@yZER@#9A3sc?j@w91$jA3STw_48Fspc6PCy#ThzuWh-<sA@4mVF_HOl%wt|(r
zdz4Okq1|WeZu8(+yK~S-a8Hmz?K9S%A=tF^bGXvr@T}K-P_$FTYW@s#U6dy5eJHKV
z;fQVIY0LSXmg8)S!b*(o+$}H8M&RchgmNTRVSN3<J?YWidRFrrA;x{aAsWND-`RMC
zQy@>%mS1bU#aWOFI}jh}-klR6`*)9_<sL=9Ot2qy0N(`ZYar4G->bwsu;H96(5ZvM
zS1g4uaCo--Y@mHW+x6m0BiRE)*533Vxi4lPQM;$(x!=faJxOoK-p~E#*=Nw)By8y|
zqRn6(Exm)Up8gBVfA35F6W`N(%~Vc)gYOwE0k$WP<9im1fR%*jQ}RbF19l|8!?&5Q
zjyjVk@cju(fnCY(@jZvdz-sa&zCU9*u$KIR_A@8_ID3%C<2xL?e_u|=;Jb(#{A~KU
zC}Z#H->_@9k`{CzyVyNg2>b;8z1g8Wktg(&sDyR3zsJ(uz3E-FnWs`MX2}{NXHl_`
zcOl<69gFq9<D^5`0Hppu#!m1^c1LA-a5DJ0*bbbF1;Kx3H}eSicEpBgi4)o7qz7wW
z2VlMH9qnmRFKxb_4k=Bbeh)7l5e>$Y*U?egYO0;@3TCsu{XX{Ej>bOWM(h!OhFz(t
z?2Mg^1wx%XTf;f(h?CS0M}zDez;4;EjD}(}a%r>^b|3Gcp7~}eUV)|2+u|R`_nZCA
za?#!<mNs|BzUHppuI31AYGOe%>f$WGdaMENn@z^X-V0dTd!Aj*7qPnc9JcrVgzddQ
zM^)_l?Vo-(n}S`zTd}CP50(NCz{=n#tPK7X8;S>+)xS8ZNPA`>Q1$_zVE6B7b^~S0
z4;y~S_hHkV`?Biq><hB}qu%^0vZDulM>dC(=dIsZttfm?wqyDj`*=Ubvf&T0fw;nK
zLq5Vz-Y?lr{1y9z53oadKT<qsJv!F@Ftsb|gmU|BBq*szx-lmjj(tRDN%8yHr?H)Q
zAGQ%!V=wVevyONuqtQC7D;}90$Nt_Q*u8v`dHqwA?+Nxne@7{QPr4t9^rhL`dRFpt
zW=^sa*@uNlXB%?9=1SOm#M&d)3(FdT+{lOBz)7T3xBW!yPtp=jHam;IW+xQsWku0!
zB+51-HWA_NLvM`1*b!VC{Uo}RGxzK4)cuC&Zcg6c6K!IT@;<W(d_Qlt5AxRfaP%tQ
zy6(!TJrQfZGYhRIeXs4t?58eG?ywR6OW3Zwj5_#EZh2CcCV$HOU|2Rz?+LX3fmZFD
zO}nGtx!=$y*xOCN$k({s8F9Z#S=~=Az}Yi5mK&zCPJZn};haFynH0x~CB|60<R0T`
zn$FEJ-h2w!nJw5CT5>q61v?wg#d#`>!08n^#v7N`Hhg}ZF-!GKa&nS$_OTqJUFv*}
z4?B;rlXC3R7L4akA&fH>1?;L8?3xzrYvjNw51+$zE!fvvuy3?r-)zBdXu)o5!M+8C
zJU)kSgHd9S-G(eD=GZF2zMNyLTQHvJ)=Qn1m=P2(&961zabeH#+;l!so-?X@M~$L4
zh_^ZCe4{073t{RpF7B3=FrLZjukx_BiebtN3#UFF6BX8?vE+C*_kByVxbMyLH^G|Y
zX-4O~43rt%4`A&wDSeE&?@l)7aQU*!ijB`^YaBuQo?U1k%nRH+!p5kGZ<1Sa_HTF|
z&I$5x9#3btni}WSOAF2^2%eP}<@_g6HtSK*2}au-aGUK%5!&-B3|c*s%n4(Ztt7cM
z2kz2{&1Jabck2(_^%MUj^T(;JNN^XA=2*HbuHHX%m;Vg&Yc0>>GEU0xS0Q*Kk^dlz
zTQ>hV^N%*a+Jx39l+LVye%>ba(|CW0`Q5B7<}E7F&oO^&b4;I(&r4;rxQxhFUPmXF
zraZ&NqVyTR<qvWeWmb6|Pp>PxPp4m0a+e-14Lm#%<PY@AbNc1XI-B$vIekVdzvrjD
z<bJCcFv{NN>d5DHaUS<#-X5F$t}ZS%d8~}S?nHO#%yjkT>(S}l>e1)x>Qr^@_)l~7
zp0fVp>&WQL?-kei%e-j@|7c6c#qB4Sr}M-_p3<4tx4vL~Yo_(Bv(&drecbnB4oVLz
z^sy3kvQuGvEF-~5CI>zeZYO+7p%0Bhhw4#b6k%77KB^d!CyEZv<GWGlkQ^Ul;jEvw
z<R`os|Ih*a1MyE%Pjd_TS&M_F6%yr7u3mnJGattyaZ|qWCa2nA2yf+|2>*!%{)wJn
zD+Nk_;(+u&Mc(rY{G146-XF9v)ndC*BI2w6;<NR0KFsOq^Ioq`i~sDxY~+Zrl^pXH
z5z_pQkEhvB6s;s)b40tv$J1yMMc*Y}^NI3(A5Wu8gk9<4^JR^Xr<NHpKZ<#$kx%dw
zAEwbKV%8+8TkX`TX@|MC(nY*JLbaZy9;UEVe%J1;KPP^aaAAxXHfFd~Mq3V_^=UeN
zPjA7j50lF!#(Aa-v;G=I_T73e**qW5Y1hUI;%VfIm;t){h8woXV=lj|Jm$1?jl-;G
zM$y+i#%u%Mbsl53f$!@cV~&LH8xEt~!oKOlq??G--<CULim)3!<~08;k2yKN-4b@2
z!+bkj<uRATYR~EF-R+r$I$}m(t5k7%8C=RcVGb(4##8Fj`906VoM$0#?&4AT^gPJ<
z3nNk4r(--VbjL4kXrxeFmEQYJFXm7F!rO6wa<|;%dEB=Q-y|1&6EW0xS&>NR<3@Tj
zvUa3*f##T)IjkUo+MM|9-x6q%YG=X^CVp8d`q=Kts}<WY9;foV5!puYgg1`xY)a*K
zPbX^=ydUM`FXix<lQ85!*=@C`DXo*;J^Lh;q;pRR>5J75r!gx*z$_Jow1jEhRzI!I
z;CErJ5Arl?mI%Kq5qITqS|J{OA1{O*l&8shHQFZq^a6{gb!+{UpWe#?rZyz)o@HTf
z_7L$8C*pMajv~z^n%I{-=4xqf3#Pff<}pDpmY;OwwB*9HVn-||i&pQPK9yda*NJ<7
z^<30=;Bu*J6`%NSK4fteb3lAIkMVRp@0Fugl-<0<=2FJvo~+F$%?`-#o~%IwdJD7G
zY;8~a(mAna>kwrJG<#t>r|?AiFu6HA_I+S?OL-?^Ds~jrNLN_Mr*3rD{uIs`rIvZ_
zF_c-)4A=G}_5od))JDXAEa{(Ecydf8Wj#mS%ruIQ_vx!Ai2r!fpI3MXf!8pn%_y4U
z(^p>+zsGYe&>wA<A4aSZK7I8H@sA+A*_OX+Ej>Ox^%I5nkpFCZ6L9+2cR=`lrok!3
zD}ME6)uDQi@Q;)J9DG3^)+!Y4^??*lU!MO+A78yl@sG^I)vluG=sY~&wl5Et8}s#E
zq5RdG#P4ynPs3C6p_sOgO`YqfwP9AZZ5(vC>m7=JsD+1Ji6~+YQg}~4)k4Fwj~Xu2
z)CM2s>g8_o4P#^ITcHlW(2~l!<Rzr*PwtY-IDJ?0s^NFbwQ>BfhHp%8!8ayv8oo)c
zjq55=D4)upab0;g$3`o&+DP7OT^n~g8e;OOjR)M7P(3sBQdX=z=1TGQF!kZ^&KX)?
z2}zVwGwqV)6(p0i%$ix{oC}wvjG{fg#)FnWVsw|E!atI{Y~|k|m-27mAFteV57+dy
z#p?%G`bl0ee7#)o^$F*_Oy9WRcP0OA_y)P)8<JNHzgsT&-HE<<=tu9k;2Ze|F5&mc
z1-~cxo8g<}f^SN;8h)=_@OwFr6UDE*RZgER)wiDaw~uhX$dwew{n86d_2|`7JsywS
z15AYT+NQhpCh#@jqk&KQFz;H}?a<FI#2*7rnwDN&xq{DXhKnALf~LGk)BL0to$h%=
z6OV@=)AsVu<15{w49c7Q@_Z?u%3=BXJoCIne}{Zk#&^wwcqVHh4W%VoJgk{+NI!&`
z4#ekml<P)vZcpbyk1FpkTwb{=8fiu&0o8|eQ1Uz>FJIQ6pS(^)4`~<bDDZ_c1le=k
zx1S)lbf&hnb%}SMaeA<P-iyrA3vDRZjd10Gj;%hVTgf_rp5tBzIWB#w&R@cP40sth
ztl%Dt|5V^<-~~Wo!ByB);_h6C|1AFfJieCjkK*5@8E*9+@*+*km-ON)pf(Yp(}x9_
zwwJ%+hja@vguE?X^<kAy@;?LrfIOp*d)k|X56IWb2*1%o`iifz$rXfnDo-c}H2I_5
z3bYW0yg_E;@%qSR4&{-|+be(Im24L|IfEOChMduFaedvy>pYLI8_8iZ%SC1@r{t0R
zA#E?8^k@8CxGGC%Z+^@)Jfu;OT{^V(GuFF{h#UCci`?R+O__f1=W!*E(x%Q#-jJrJ
z=X_odIj-`k-a`2#>;G5VSK7#vw>$ETgZ>y-296_n|GbSbuiv6;eg148rugdb8XtZC
z4{jdE^B7+6D^9$}w)4p24$MEu8}bcuh_8@#9=}K{`Uj>PaPj;v`K;_Jzn8_zMH)6H
z1{!02jw>wSdLF=|x4L+I0fx$tEH44wK%vdWO4H-H3!k;Yoqd?%sV%DRecKFfF^>7g
z>-j?*)4{+z-VG0F$W^<R9CC*NA#M3b14<{*2KvP#+CWhMDaIKXE_|5h5g&dlJLNZ7
zpb57$BwNtae%>!!@jPzhRp1M8`Ts}zjOry^0smZK?wicrUIrfXG;pH_9^nIFm}uk|
z+TFI?QSTD|PGNf#;=mKV2t4=>a0>Ku;FoT@fT9kAE(84)!bKBLkx%|V0!l+X!sR~U
zUCBw9WUz74%Tn|Yluz|w{Gp6;gTJV!KsOhCJ`ViRyTLD9{YoyYR>q^S$4m8OC2+fU
zgI{<6(SZ06K>5lI{-PY)q6faB8~nw%A>9Hk;Tf7N1mp(4@Bp5k%d)NfL%M`z@p}P|
zdK#bHZTTrX^<u#DJH7^a7UK?Xg_LKQAlV1{jezPV#QO_=f$&h?x%fW>6zfuHQa|yD
zfYKO{M;=#k&T`@Q&Q#!&Yysl?;R*Q#_j+jCfNTP~@(@e5d987+e8)laWlCrIaN)kJ
zNgsKC0$gQKenGCiwqFn8mE5X}<Vpdr(g7~Sf1%{d;w<L$Pkss4#p##h_|I^=k{#S-
z*!bv?c$D$`P{yuD;>Wpej3120C;P;|=6}R*<Qi{x&&4-Aj~ISrJlov4+~=}S`)WKl
zITGLdNp)=DItKqS{u-9-qsz|0e}%8NF6Qg4uh=F3C7yn%g*f^p=GXt3lP@_Vg{81Z
z+(SO2kZn}_Y445)8%BwS#a+NC{?+)3_}g6HiEoV$kuEHSi%I1~OKB8$mx5w8FVWlu
zZx$zgV2>wP#hc?b$o`O(`j+?>zCwE|xr#E6Po$e>tnu-iV58!fjB|W)WT*@05^_cS
zePFzIABM7kE980uU%3gUbDa{O!neYIP*`>cr;Gj}`DL<iyfFGRYfsy}2><2VLiUJu
z-1<hmj4uji155cI`0K!gbMZgb%PGTI?rM#jtO{53sbrPHl10fP-OcafEQ)*Kg5JEM
zGmY<`T2phFk83F?RhKS%Xk5uEODoTnR92Cec;;_Et!;6<XWD}iSG;pv<(d5${|fp-
z^mO!cv^L%)-Y<GKdWIUli2cn2IPLT&&NsaLHqMETSK<7P(AoTNX%E*(_DM&xm&qG4
z|5f^OG>cyLO!QH#0Q`j6fm_w;;U7>BV=eep?njw#DtG-a>LOYa7xH{`>$O}rZC%5C
Sx%qDAz65w?>v^22iv9;k$*v~=

literal 0
HcmV?d00001

diff --git a/assets/fonts/lilex/Lilex-BoldItalic.ttf b/assets/fonts/lilex/Lilex-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..10c6ab5f74ab2192f0258ba637c05de7d54b632f
GIT binary patch
literal 197532
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
SepGbuquy1;za={OxBee?Jyjh5

literal 0
HcmV?d00001

diff --git a/assets/fonts/lilex/Lilex-Italic.ttf b/assets/fonts/lilex/Lilex-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e7aef10f7e7c6803199551463d0ab456d9c9e03a
GIT binary patch
literal 198216
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%0D~>-YMacb-baB
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
N_4*ZmQFQPZ|1Y*DN5TLA

literal 0
HcmV?d00001

diff --git a/assets/fonts/lilex/Lilex-Regular.ttf b/assets/fonts/lilex/Lilex-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cb98a69b0ffb1976805bf5af3047307fe2422b1d
GIT binary patch
literal 194308
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

literal 0
HcmV?d00001

diff --git a/assets/fonts/plex-sans/license.txt b/assets/fonts/lilex/OFL.txt
similarity index 96%
rename from assets/fonts/plex-sans/license.txt
rename to assets/fonts/lilex/OFL.txt
index f72f76504c..156240bc90 100644
--- a/assets/fonts/plex-sans/license.txt
+++ b/assets/fonts/lilex/OFL.txt
@@ -1,8 +1,9 @@
-Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+Copyright 2019 The Lilex Project Authors (https://github.com/mishamyrt/Lilex)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://scripts.sil.org/OFL
+
 
 -----------------------------------------------------------
 SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
@@ -89,4 +90,4 @@ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/fonts/plex-mono/ZedPlexMono-Bold.ttf b/assets/fonts/plex-mono/ZedPlexMono-Bold.ttf
deleted file mode 100644
index d5f4b5e2855fe9e581155d864835570d2e5a06bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 163568
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

diff --git a/assets/fonts/plex-mono/ZedPlexMono-BoldItalic.ttf b/assets/fonts/plex-mono/ZedPlexMono-BoldItalic.ttf
deleted file mode 100644
index 05eaf7cccde1c6f79558395d4cc06ed685342a60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 170088
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

diff --git a/assets/fonts/plex-mono/ZedPlexMono-Italic.ttf b/assets/fonts/plex-mono/ZedPlexMono-Italic.ttf
deleted file mode 100644
index 3b078217578da8d88ddfd158133a11ed7f1780ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169868
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
RO8KQVKYxz${kOVz{vRC|U$y`M

diff --git a/assets/fonts/plex-mono/ZedPlexMono-Regular.ttf b/assets/fonts/plex-mono/ZedPlexMono-Regular.ttf
deleted file mode 100644
index 61dbb583619e200262c29589ef037538b2360d78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161844
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

diff --git a/assets/fonts/plex-sans/ZedPlexSans-Bold.ttf b/assets/fonts/plex-sans/ZedPlexSans-Bold.ttf
deleted file mode 100644
index f1e66392f7c5a329fbaa14ae9f6d3ee0d48960cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206164
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

diff --git a/assets/fonts/plex-sans/ZedPlexSans-BoldItalic.ttf b/assets/fonts/plex-sans/ZedPlexSans-BoldItalic.ttf
deleted file mode 100644
index 7612dc516742f8255ce432cfee67f8225ed6ae62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213704
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
GHvJ!>A2x9S

diff --git a/assets/fonts/plex-sans/ZedPlexSans-Italic.ttf b/assets/fonts/plex-sans/ZedPlexSans-Italic.ttf
deleted file mode 100644
index 8769c232ee69236158ed03a1306ff7f2be4ebdd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213092
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
U)lJXcs_Tw({^J+%`pEbG7s{^RdH?_b

diff --git a/assets/fonts/plex-sans/ZedPlexSans-Regular.ttf b/assets/fonts/plex-sans/ZedPlexSans-Regular.ttf
deleted file mode 100644
index 3ea293d59a31d2d80f0a1b35ef2c4507e7e4eec2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205848
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

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 0f1818ac7f..2c3bf6930d 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -28,7 +28,9 @@
     "edit_prediction_provider": "zed"
   },
   // The name of a font to use for rendering text in the editor
-  "buffer_font_family": "Zed Plex Mono",
+  // ".ZedMono" currently aliases to Lilex
+  // but this may change in the future.
+  "buffer_font_family": ".ZedMono",
   // Set the buffer text's font fallbacks, this will be merged with
   // the platform's default fallbacks.
   "buffer_font_fallbacks": null,
@@ -54,7 +56,9 @@
   "buffer_line_height": "comfortable",
   // The name of a font to use for rendering text in the UI
   // You can set this to ".SystemUIFont" to use the system font
-  "ui_font_family": "Zed Plex Sans",
+  // ".ZedSans" currently aliases to "IBM Plex Sans", but this may
+  // change in the future
+  "ui_font_family": ".ZedSans",
   // Set the UI's font fallbacks, this will be merged with the platform's
   // default font fallbacks.
   "ui_font_fallbacks": null,
@@ -1402,7 +1406,7 @@
     // "font_size": 15,
     // Set the terminal's font family. If this option is not included,
     // the terminal will default to matching the buffer's font family.
-    // "font_family": "Zed Plex Mono",
+    // "font_family": ".ZedMono",
     // Set the terminal's font fallbacks. If this option is not included,
     // the terminal will default to matching the buffer's font fallbacks.
     // This will be merged with the platform's default font fallbacks
diff --git a/crates/assets/src/assets.rs b/crates/assets/src/assets.rs
index fad0c58b73..5c7e671159 100644
--- a/crates/assets/src/assets.rs
+++ b/crates/assets/src/assets.rs
@@ -58,9 +58,7 @@ impl Assets {
     pub fn load_test_fonts(&self, cx: &App) {
         cx.text_system()
             .add_fonts(vec![
-                self.load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
-                    .unwrap()
-                    .unwrap(),
+                self.load("fonts/lilex/Lilex-Regular.ttf").unwrap().unwrap(),
             ])
             .unwrap()
     }
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index e25c02432d..c4c9f2004a 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -2290,8 +2290,6 @@ mod tests {
     fn test_blocks_on_wrapped_lines(cx: &mut gpui::TestAppContext) {
         cx.update(init_test);
 
-        let _font_id = cx.text_system().font_id(&font("Helvetica")).unwrap();
-
         let text = "one two three\nfour five six\nseven eight";
 
         let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
index 269f8f0c40..caa4882a6e 100644
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -1223,7 +1223,7 @@ mod tests {
         let tab_size = NonZeroU32::new(rng.gen_range(1..=4)).unwrap();
 
         let font = test_font();
-        let _font_id = text_system.font_id(&font);
+        let _font_id = text_system.resolve_font(&font);
         let font_size = px(14.0);
 
         log::info!("Tab size: {}", tab_size);
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index 0a9d5e9535..f328945dbe 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -53,7 +53,7 @@ pub fn marked_display_snapshot(
     let (unmarked_text, markers) = marked_text_offsets(text);
 
     let font = Font {
-        family: "Zed Plex Mono".into(),
+        family: ".ZedMono".into(),
         features: FontFeatures::default(),
         fallbacks: None,
         weight: FontWeight::default(),
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index e6f6e9a680..f66a2e71d4 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -213,11 +213,7 @@ impl CosmicTextSystemState {
         features: &FontFeatures,
     ) -> Result<SmallVec<[FontId; 4]>> {
         // TODO: Determine the proper system UI font.
-        let name = if name == ".SystemUIFont" {
-            "Zed Plex Sans"
-        } else {
-            name
-        };
+        let name = crate::text_system::font_name_with_fallbacks(name, "IBM Plex Sans");
 
         let families = self
             .font_system
diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index c45888bce7..849925c727 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -211,11 +211,7 @@ impl MacTextSystemState {
         features: &FontFeatures,
         fallbacks: Option<&FontFallbacks>,
     ) -> Result<SmallVec<[FontId; 4]>> {
-        let name = if name == ".SystemUIFont" {
-            ".AppleSystemUIFont"
-        } else {
-            name
-        };
+        let name = crate::text_system::font_name_with_fallbacks(name, ".AppleSystemUIFont");
 
         let mut font_ids = SmallVec::new();
         let family = self
diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index 587cb7b4a6..75cb50243b 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -498,8 +498,9 @@ impl DirectWriteState {
                 )
                 .unwrap()
             } else {
+                let family = self.system_ui_font_name.clone();
                 self.find_font_id(
-                    target_font.family.as_ref(),
+                    font_name_with_fallbacks(target_font.family.as_ref(), family.as_ref()),
                     target_font.weight,
                     target_font.style,
                     &target_font.features,
@@ -512,7 +513,6 @@ impl DirectWriteState {
                     }
                     #[cfg(not(any(test, feature = "test-support")))]
                     {
-                        let family = self.system_ui_font_name.clone();
                         log::error!("{} not found, use {} instead.", target_font.family, family);
                         self.get_font_id_from_font_collection(
                             family.as_ref(),
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index ed1307c6cd..b48c3a2935 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -65,7 +65,7 @@ impl TextSystem {
             font_runs_pool: Mutex::default(),
             fallback_font_stack: smallvec![
                 // TODO: Remove this when Linux have implemented setting fallbacks.
-                font("Zed Plex Mono"),
+                font(".ZedMono"),
                 font("Helvetica"),
                 font("Segoe UI"),  // Windows
                 font("Cantarell"), // Gnome
@@ -96,7 +96,7 @@ impl TextSystem {
     }
 
     /// Get the FontId for the configure font family and style.
-    pub fn font_id(&self, font: &Font) -> Result<FontId> {
+    fn font_id(&self, font: &Font) -> Result<FontId> {
         fn clone_font_id_result(font_id: &Result<FontId>) -> Result<FontId> {
             match font_id {
                 Ok(font_id) => Ok(*font_id),
@@ -844,3 +844,16 @@ impl FontMetrics {
         (self.bounding_box / self.units_per_em as f32 * font_size.0).map(px)
     }
 }
+
+#[allow(unused)]
+pub(crate) fn font_name_with_fallbacks<'a>(name: &'a str, system: &'a str) -> &'a str {
+    // Note: the "Zed Plex" fonts were deprecated as we are not allowed to use "Plex"
+    // in a derived font name. They are essentially indistinguishable from IBM Plex/Lilex,
+    // and so retained here for backward compatibility.
+    match name {
+        ".SystemUIFont" => system,
+        ".ZedSans" | "Zed Plex Sans" => "IBM Plex Sans",
+        ".ZedMono" | "Zed Plex Mono" => "Lilex",
+        _ => name,
+    }
+}
diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index 5de26511d3..648d714c89 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -327,7 +327,7 @@ mod tests {
     fn build_wrapper() -> LineWrapper {
         let dispatcher = TestDispatcher::new(StdRng::seed_from_u64(0));
         let cx = TestAppContext::build(dispatcher, None);
-        let id = cx.text_system().font_id(&font("Zed Plex Mono")).unwrap();
+        let id = cx.text_system().resolve_font(&font(".ZedMono"));
         LineWrapper::new(id, px(16.), cx.text_system().platform_text_system.clone())
     }
 
diff --git a/crates/markdown/examples/markdown.rs b/crates/markdown/examples/markdown.rs
index bf685bd9ac..c651c7921d 100644
--- a/crates/markdown/examples/markdown.rs
+++ b/crates/markdown/examples/markdown.rs
@@ -77,16 +77,16 @@ impl Render for MarkdownExample {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let markdown_style = MarkdownStyle {
             base_text_style: gpui::TextStyle {
-                font_family: "Zed Plex Sans".into(),
+                font_family: ".ZedSans".into(),
                 color: cx.theme().colors().terminal_ansi_black,
                 ..Default::default()
             },
             code_block: StyleRefinement::default()
-                .font_family("Zed Plex Mono")
+                .font_family(".ZedMono")
                 .m(rems(1.))
                 .bg(rgb(0xAAAAAAA)),
             inline_code: gpui::TextStyleRefinement {
-                font_family: Some("Zed Mono".into()),
+                font_family: Some(".ZedMono".into()),
                 color: Some(cx.theme().colors().editor_foreground),
                 background_color: Some(cx.theme().colors().editor_background),
                 ..Default::default()
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 4c5b6272ef..ac01e6c5c8 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -128,7 +128,7 @@ impl Render for StoryWrapper {
             .flex()
             .flex_col()
             .size_full()
-            .font_family("Zed Plex Mono")
+            .font_family(".ZedMono")
             .child(self.story.clone())
     }
 }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 661bb71c91..51bf2dd131 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -284,9 +284,7 @@ pub fn init(cx: &mut App) {
             let count = Vim::take_count(cx).unwrap_or(1) as f32;
             Vim::take_forced_motion(cx);
             let theme = ThemeSettings::get_global(cx);
-            let Ok(font_id) = window.text_system().font_id(&theme.buffer_font) else {
-                return;
-            };
+            let font_id = window.text_system().resolve_font(&theme.buffer_font);
             let Ok(width) = window
                 .text_system()
                 .advance(font_id, theme.buffer_font_size(cx), 'm')
@@ -300,9 +298,7 @@ pub fn init(cx: &mut App) {
             let count = Vim::take_count(cx).unwrap_or(1) as f32;
             Vim::take_forced_motion(cx);
             let theme = ThemeSettings::get_global(cx);
-            let Ok(font_id) = window.text_system().font_id(&theme.buffer_font) else {
-                return;
-            };
+            let font_id = window.text_system().resolve_font(&theme.buffer_font);
             let Ok(width) = window
                 .text_system()
                 .advance(font_id, theme.buffer_font_size(cx), 'm')
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 23020d3a9b..ceda403fdd 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4401,11 +4401,11 @@ mod tests {
         cx.text_system()
             .add_fonts(vec![
                 Assets
-                    .load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
+                    .load("fonts/lilex/Lilex-Regular.ttf")
                     .unwrap()
                     .unwrap(),
                 Assets
-                    .load("fonts/plex-sans/ZedPlexSans-Regular.ttf")
+                    .load("fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf")
                     .unwrap()
                     .unwrap(),
             ])
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 5d11dfe833..b4cb1fcb9b 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -294,11 +294,11 @@ Define extensions which should be installed (`true`) or never installed (`false`
 
 - Description: The name of a font to use for rendering text in the editor.
 - Setting: `buffer_font_family`
-- Default: `Zed Plex Mono`
+- Default: `.ZedMono`. This currently aliases to [Lilex](https://lilex.myrt.co).
 
 **Options**
 
-The name of any font family installed on the user's system
+The name of any font family installed on the user's system, or `".ZedMono"`.
 
 ## Buffer Font Features
 
@@ -3511,11 +3511,11 @@ Float values between `0.0` and `0.9`, where:
 
 - Description: The name of the font to use for text in the UI.
 - Setting: `ui_font_family`
-- Default: `Zed Plex Sans`
+- Default: `.ZedSans`. This currently aliases to [IBM Plex](https://www.ibm.com/plex/).
 
 **Options**
 
-The name of any font family installed on the system.
+The name of any font family installed on the system, `".ZedSans"` to use the Zed-provided default, or `".SystemUIFont"` to use the system's default UI font (on macOS and Windows).
 
 ## UI Font Features
 
@@ -3603,7 +3603,7 @@ For example, to use `Nerd Font` as a fallback, add the following to your setting
   "soft_wrap": "none",
 
   "buffer_font_size": 18,
-  "buffer_font_family": "Zed Plex Mono",
+  "buffer_font_family": ".ZedMono",
 
   "autosave": "on_focus_change",
   "format_on_save": "off",
diff --git a/docs/src/fonts.md b/docs/src/fonts.md
deleted file mode 100644
index 93c687b134..0000000000
--- a/docs/src/fonts.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Fonts
-
-<!--
-TBD: WIP. Zed Fonts documentation. This is currently not linked from SUMMARY.md are so unpublished.
--->
-
-Zed ships two fonts: Zed Plex Mono and Zed Plex Sans. These are based on IBM Plex Mono and IBM Plex Sans, respectively.
-
-<!--
-TBD: Document how Zed Plex font files were created. Repo links, etc.
--->
-
-## Settings
-
-<!--
-TBD: Explain various font settings in Zed.
--->
-
-- Buffer fonts
-  - `buffer-font-family`
-  - `buffer-font-features`
-  - `buffer-font-size`
-  - `buffer-line-height`
-- UI fonts
-  - `ui_font_family`
-  - `ui_font_fallbacks`
-  - `ui_font_features`
-  - `ui_font_weight`
-  - `ui_font_size`
-- Terminal fonts
-  - `terminal.font-size`
-  - `terminal.font-family`
-  - `terminal.font-features`
-
-## Old Zed Fonts
-
-Previously, Zed shipped with `Zed Mono` and `Zed Sans`, customized versions of the [Iosevka](https://typeof.net/Iosevka/) typeface. You can find more about them in the [zed-fonts](https://github.com/zed-industries/zed-fonts/) repository.
-
-Here's how you can use the old Zed fonts instead of `Zed Plex Mono` and `Zed Plex Sans`:
-
-1. Download [zed-app-fonts-1.2.0.zip](https://github.com/zed-industries/zed-fonts/releases/download/1.2.0/zed-app-fonts-1.2.0.zip) from the [zed-fonts releases](https://github.com/zed-industries/zed-fonts/releases) page.
-2. Open macOS `Font Book.app`
-3. Unzip the file and drag the `ttf` files into the Font Book app.
-4. Update your settings `ui_font_family` and `buffer_font_family` to use `Zed Mono` or `Zed Sans` in your `settings.json` file.
-
-```json
-{
-  "ui_font_family": "Zed Sans Extended",
-  "buffer_font_family": "Zed Mono Extend",
-  "terminal": {
-    "font-family": "Zed Mono Extended"
-  }
-}
-```
-
-5. Note there will be red squiggles under the font name. (this is a bug, but harmless.)
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 46de078d89..7e75f6287d 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -39,13 +39,15 @@ If you would like to use distinct themes for light mode/dark mode that can be se
 ## Fonts
 
 ```json
-  // UI Font. Use ".SystemUIFont" to use the default system font (SF Pro on macOS)
-  "ui_font_family": "Zed Plex Sans",
+  // UI Font. Use ".SystemUIFont" to use the default system font (SF Pro on macOS),
+  // or ".ZedSans" for the bundled default (currently IBM Plex)
+  "ui_font_family": ".SystemUIFont",
   "ui_font_weight": 400, // Font weight in standard CSS units from 100 to 900.
   "ui_font_size": 16,
 
   // Buffer Font - Used by editor buffers
-  "buffer_font_family": "Zed Plex Mono",  // Font name for editor buffers
+  // use ".ZedMono" for the bundled default monospace (currently Lilex)
+  "buffer_font_family": "Berkeley Mono", // Font name for editor buffers
   "buffer_font_size": 15,                 // Font size for editor buffers
   "buffer_font_weight": 400,              // Font weight in CSS units [100-900]
   // Line height "comfortable" (1.618), "standard" (1.3) or custom: `{ "custom": 2 }`
@@ -53,7 +55,7 @@ If you would like to use distinct themes for light mode/dark mode that can be se
 
   // Terminal Font Settings
   "terminal": {
-    "font_family": "Zed Plex Mono",
+    "font_family": "",
     "font_size": 15,
     // Terminal line height: comfortable (1.618), standard(1.3) or `{ "custom": 2 }`
     "line_height": "comfortable",
@@ -473,7 +475,7 @@ See [Zed AI Documentation](./ai/overview.md) for additional non-visual AI settin
       "show": null                       // Show/hide: (auto, system, always, never)
     },
     // Terminal Font Settings
-    "font_family": "Zed Plex Mono",
+    "font_family": "Fira Code",
     "font_size": 15,
     "font_weight": 400,
     // Terminal line height: comfortable (1.618), standard(1.3) or `{ "custom": 2 }`
diff --git a/nix/build.nix b/nix/build.nix
index 70b4f76932..03403cc1c9 100644
--- a/nix/build.nix
+++ b/nix/build.nix
@@ -171,8 +171,8 @@ let
         ZSTD_SYS_USE_PKG_CONFIG = true;
         FONTCONFIG_FILE = makeFontsConf {
           fontDirectories = [
-            ../assets/fonts/plex-mono
-            ../assets/fonts/plex-sans
+            ../assets/fonts/lilex
+            ../assets/fonts/ibm-plex-sans
           ];
         };
         ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
diff --git a/nix/shell.nix b/nix/shell.nix
index b78eb5c001..b6f1efd366 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -46,8 +46,8 @@
       # outside the nix store instead of to `$src`
       FONTCONFIG_FILE = makeFontsConf {
         fontDirectories = [
-          "./assets/fonts/plex-mono"
-          "./assets/fonts/plex-sans"
+          "./assets/fonts/lilex"
+          "./assets/fonts/ibm-plex-sans"
         ];
       };
       PROTOC = "${protobuf}/bin/protoc";

From 389d382f426f507d7567c7a8b89e951a3f6723d0 Mon Sep 17 00:00:00 2001
From: smit <heysmitbarmase@gmail.com>
Date: Thu, 14 Aug 2025 00:59:12 +0530
Subject: [PATCH 006/823] ci: Disable FreeBSD builds (#36140)

Revert accidental change introduced in
[#35880](https://github.com/zed-industries/zed/pull/35880/files#diff-b803fcb7f17ed9235f1e5cb1fcd2f5d3b2838429d4368ae4c57ce4436577f03fL706)

Release Notes:

- N/A
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3b70271e57..f4ba227168 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -718,7 +718,7 @@ jobs:
     timeout-minutes: 60
     runs-on: github-8vcpu-ubuntu-2404
     if: |
-      ( startsWith(github.ref, 'refs/tags/v')
+      false && ( startsWith(github.ref, 'refs/tags/v')
       || contains(github.event.pull_request.labels.*.name, 'run-bundling') )
     needs: [linux_tests]
     name: Build Zed on FreeBSD

From 389d24d7e5b54d01bf4dede2e572c1a64c6c7e96 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 13 Aug 2025 17:11:32 -0300
Subject: [PATCH 007/823] Fully support all mention kinds (#36134)

Feature parity with the agent1 @mention kinds:
- File
- Symbols
- Selections
- Threads
- Rules
- Fetch


Release Notes:

- N/A

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock                                    |    3 +
 crates/acp_thread/Cargo.toml                  |    2 +
 crates/acp_thread/src/acp_thread.rs           |   26 +-
 crates/acp_thread/src/mention.rs              |  340 ++++-
 crates/agent/src/thread_store.rs              |   16 +
 crates/agent2/src/thread.rs                   |   79 +-
 crates/agent_ui/Cargo.toml                    |    3 +
 .../agent_ui/src/acp/completion_provider.rs   | 1297 +++++++++++++++--
 crates/agent_ui/src/acp/message_history.rs    |    6 +-
 crates/agent_ui/src/acp/thread_view.rs        |  222 ++-
 crates/agent_ui/src/agent_panel.rs            |    5 +
 crates/agent_ui/src/context_picker.rs         |   68 +-
 .../src/context_picker/completion_provider.rs |    4 +-
 crates/assistant_context/Cargo.toml           |    3 +
 crates/assistant_context/src/context_store.rs |   21 +
 crates/editor/src/editor.rs                   |    7 +
 crates/prompt_store/src/prompt_store.rs       |    9 +
 17 files changed, 1787 insertions(+), 324 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b1337eece..f0fd3049c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,6 +7,7 @@ name = "acp_thread"
 version = "0.1.0"
 dependencies = [
  "action_log",
+ "agent",
  "agent-client-protocol",
  "anyhow",
  "buffer_diff",
@@ -21,6 +22,7 @@ dependencies = [
  "markdown",
  "parking_lot",
  "project",
+ "prompt_store",
  "rand 0.8.5",
  "serde",
  "serde_json",
@@ -392,6 +394,7 @@ dependencies = [
  "ui",
  "ui_input",
  "unindent",
+ "url",
  "urlencoding",
  "util",
  "uuid",
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index b3ec217bad..2ac15de08f 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -18,6 +18,7 @@ test-support = ["gpui/test-support", "project/test-support"]
 [dependencies]
 action_log.workspace = true
 agent-client-protocol.workspace = true
+agent.workspace = true
 anyhow.workspace = true
 buffer_diff.workspace = true
 collections.workspace = true
@@ -28,6 +29,7 @@ itertools.workspace = true
 language.workspace = true
 markdown.workspace = true
 project.workspace = true
+prompt_store.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index f8a5bf8032..a5b512f31a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -399,7 +399,7 @@ impl ContentBlock {
             }
         }
 
-        let new_content = self.extract_content_from_block(block);
+        let new_content = self.block_string_contents(block);
 
         match self {
             ContentBlock::Empty => {
@@ -409,7 +409,7 @@ impl ContentBlock {
                 markdown.update(cx, |markdown, cx| markdown.append(&new_content, cx));
             }
             ContentBlock::ResourceLink { resource_link } => {
-                let existing_content = Self::resource_link_to_content(&resource_link.uri);
+                let existing_content = Self::resource_link_md(&resource_link.uri);
                 let combined = format!("{}\n{}", existing_content, new_content);
 
                 *self = Self::create_markdown_block(combined, language_registry, cx);
@@ -417,14 +417,6 @@ impl ContentBlock {
         }
     }
 
-    fn resource_link_to_content(uri: &str) -> String {
-        if let Some(uri) = MentionUri::parse(&uri).log_err() {
-            uri.to_link()
-        } else {
-            uri.to_string().clone()
-        }
-    }
-
     fn create_markdown_block(
         content: String,
         language_registry: &Arc<LanguageRegistry>,
@@ -436,11 +428,11 @@ impl ContentBlock {
         }
     }
 
-    fn extract_content_from_block(&self, block: acp::ContentBlock) -> String {
+    fn block_string_contents(&self, block: acp::ContentBlock) -> String {
         match block {
             acp::ContentBlock::Text(text_content) => text_content.text.clone(),
             acp::ContentBlock::ResourceLink(resource_link) => {
-                Self::resource_link_to_content(&resource_link.uri)
+                Self::resource_link_md(&resource_link.uri)
             }
             acp::ContentBlock::Resource(acp::EmbeddedResource {
                 resource:
@@ -449,13 +441,21 @@ impl ContentBlock {
                         ..
                     }),
                 ..
-            }) => Self::resource_link_to_content(&uri),
+            }) => Self::resource_link_md(&uri),
             acp::ContentBlock::Image(_)
             | acp::ContentBlock::Audio(_)
             | acp::ContentBlock::Resource(_) => String::new(),
         }
     }
 
+    fn resource_link_md(uri: &str) -> String {
+        if let Some(uri) = MentionUri::parse(&uri).log_err() {
+            uri.as_link().to_string()
+        } else {
+            uri.to_string()
+        }
+    }
+
     fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
         match self {
             ContentBlock::Empty => "",
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 59c479d87b..03174608fb 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -1,13 +1,40 @@
-use agent_client_protocol as acp;
-use anyhow::{Result, bail};
-use std::path::PathBuf;
+use agent::ThreadId;
+use anyhow::{Context as _, Result, bail};
+use prompt_store::{PromptId, UserPromptId};
+use std::{
+    fmt,
+    ops::Range,
+    path::{Path, PathBuf},
+};
+use url::Url;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum MentionUri {
     File(PathBuf),
-    Symbol(PathBuf, String),
-    Thread(acp::SessionId),
-    Rule(String),
+    Symbol {
+        path: PathBuf,
+        name: String,
+        line_range: Range<u32>,
+    },
+    Thread {
+        id: ThreadId,
+        name: String,
+    },
+    TextThread {
+        path: PathBuf,
+        name: String,
+    },
+    Rule {
+        id: PromptId,
+        name: String,
+    },
+    Selection {
+        path: PathBuf,
+        line_range: Range<u32>,
+    },
+    Fetch {
+        url: Url,
+    },
 }
 
 impl MentionUri {
@@ -17,7 +44,34 @@ impl MentionUri {
         match url.scheme() {
             "file" => {
                 if let Some(fragment) = url.fragment() {
-                    Ok(Self::Symbol(path.into(), fragment.into()))
+                    let range = fragment
+                        .strip_prefix("L")
+                        .context("Line range must start with \"L\"")?;
+                    let (start, end) = range
+                        .split_once(":")
+                        .context("Line range must use colon as separator")?;
+                    let line_range = start
+                        .parse::<u32>()
+                        .context("Parsing line range start")?
+                        .checked_sub(1)
+                        .context("Line numbers should be 1-based")?
+                        ..end
+                            .parse::<u32>()
+                            .context("Parsing line range end")?
+                            .checked_sub(1)
+                            .context("Line numbers should be 1-based")?;
+                    if let Some(name) = single_query_param(&url, "symbol")? {
+                        Ok(Self::Symbol {
+                            name,
+                            path: path.into(),
+                            line_range,
+                        })
+                    } else {
+                        Ok(Self::Selection {
+                            path: path.into(),
+                            line_range,
+                        })
+                    }
                 } else {
                     let file_path =
                         PathBuf::from(format!("{}{}", url.host_str().unwrap_or(""), path));
@@ -26,100 +80,292 @@ impl MentionUri {
                 }
             }
             "zed" => {
-                if let Some(thread) = path.strip_prefix("/agent/thread/") {
-                    Ok(Self::Thread(acp::SessionId(thread.into())))
-                } else if let Some(rule) = path.strip_prefix("/agent/rule/") {
-                    Ok(Self::Rule(rule.into()))
+                if let Some(thread_id) = path.strip_prefix("/agent/thread/") {
+                    let name = single_query_param(&url, "name")?.context("Missing thread name")?;
+                    Ok(Self::Thread {
+                        id: thread_id.into(),
+                        name,
+                    })
+                } else if let Some(path) = path.strip_prefix("/agent/text-thread/") {
+                    let name = single_query_param(&url, "name")?.context("Missing thread name")?;
+                    Ok(Self::TextThread {
+                        path: path.into(),
+                        name,
+                    })
+                } else if let Some(rule_id) = path.strip_prefix("/agent/rule/") {
+                    let name = single_query_param(&url, "name")?.context("Missing rule name")?;
+                    let rule_id = UserPromptId(rule_id.parse()?);
+                    Ok(Self::Rule {
+                        id: rule_id.into(),
+                        name,
+                    })
                 } else {
                     bail!("invalid zed url: {:?}", input);
                 }
             }
+            "http" | "https" => Ok(MentionUri::Fetch { url }),
             other => bail!("unrecognized scheme {:?}", other),
         }
     }
 
-    pub fn name(&self) -> String {
+    fn name(&self) -> String {
         match self {
-            MentionUri::File(path) => path.file_name().unwrap().to_string_lossy().into_owned(),
-            MentionUri::Symbol(_path, name) => name.clone(),
-            MentionUri::Thread(thread) => thread.to_string(),
-            MentionUri::Rule(rule) => rule.clone(),
+            MentionUri::File(path) => path
+                .file_name()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .into_owned(),
+            MentionUri::Symbol { name, .. } => name.clone(),
+            MentionUri::Thread { name, .. } => name.clone(),
+            MentionUri::TextThread { name, .. } => name.clone(),
+            MentionUri::Rule { name, .. } => name.clone(),
+            MentionUri::Selection {
+                path, line_range, ..
+            } => selection_name(path, line_range),
+            MentionUri::Fetch { url } => url.to_string(),
         }
     }
 
-    pub fn to_link(&self) -> String {
-        let name = self.name();
-        let uri = self.to_uri();
-        format!("[{name}]({uri})")
+    pub fn as_link<'a>(&'a self) -> MentionLink<'a> {
+        MentionLink(self)
     }
 
-    pub fn to_uri(&self) -> String {
+    pub fn to_uri(&self) -> Url {
         match self {
             MentionUri::File(path) => {
-                format!("file://{}", path.display())
+                let mut url = Url::parse("file:///").unwrap();
+                url.set_path(&path.to_string_lossy());
+                url
             }
-            MentionUri::Symbol(path, name) => {
-                format!("file://{}#{}", path.display(), name)
+            MentionUri::Symbol {
+                path,
+                name,
+                line_range,
+            } => {
+                let mut url = Url::parse("file:///").unwrap();
+                url.set_path(&path.to_string_lossy());
+                url.query_pairs_mut().append_pair("symbol", name);
+                url.set_fragment(Some(&format!(
+                    "L{}:{}",
+                    line_range.start + 1,
+                    line_range.end + 1
+                )));
+                url
             }
-            MentionUri::Thread(thread) => {
-                format!("zed:///agent/thread/{}", thread.0)
+            MentionUri::Selection { path, line_range } => {
+                let mut url = Url::parse("file:///").unwrap();
+                url.set_path(&path.to_string_lossy());
+                url.set_fragment(Some(&format!(
+                    "L{}:{}",
+                    line_range.start + 1,
+                    line_range.end + 1
+                )));
+                url
             }
-            MentionUri::Rule(rule) => {
-                format!("zed:///agent/rule/{}", rule)
+            MentionUri::Thread { name, id } => {
+                let mut url = Url::parse("zed:///").unwrap();
+                url.set_path(&format!("/agent/thread/{id}"));
+                url.query_pairs_mut().append_pair("name", name);
+                url
             }
+            MentionUri::TextThread { path, name } => {
+                let mut url = Url::parse("zed:///").unwrap();
+                url.set_path(&format!("/agent/text-thread/{}", path.to_string_lossy()));
+                url.query_pairs_mut().append_pair("name", name);
+                url
+            }
+            MentionUri::Rule { name, id } => {
+                let mut url = Url::parse("zed:///").unwrap();
+                url.set_path(&format!("/agent/rule/{id}"));
+                url.query_pairs_mut().append_pair("name", name);
+                url
+            }
+            MentionUri::Fetch { url } => url.clone(),
         }
     }
 }
 
+pub struct MentionLink<'a>(&'a MentionUri);
+
+impl fmt::Display for MentionLink<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "[@{}]({})", self.0.name(), self.0.to_uri())
+    }
+}
+
+fn single_query_param(url: &Url, name: &'static str) -> Result<Option<String>> {
+    let pairs = url.query_pairs().collect::<Vec<_>>();
+    match pairs.as_slice() {
+        [] => Ok(None),
+        [(k, v)] => {
+            if k != name {
+                bail!("invalid query parameter")
+            }
+
+            Ok(Some(v.to_string()))
+        }
+        _ => bail!("too many query pairs"),
+    }
+}
+
+pub fn selection_name(path: &Path, line_range: &Range<u32>) -> String {
+    format!(
+        "{} ({}:{})",
+        path.file_name().unwrap_or_default().display(),
+        line_range.start + 1,
+        line_range.end + 1
+    )
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[test]
-    fn test_mention_uri_parse_and_display() {
-        // Test file URI
+    fn test_parse_file_uri() {
         let file_uri = "file:///path/to/file.rs";
         let parsed = MentionUri::parse(file_uri).unwrap();
         match &parsed {
             MentionUri::File(path) => assert_eq!(path.to_str().unwrap(), "/path/to/file.rs"),
             _ => panic!("Expected File variant"),
         }
-        assert_eq!(parsed.to_uri(), file_uri);
+        assert_eq!(parsed.to_uri().to_string(), file_uri);
+    }
 
-        // Test symbol URI
-        let symbol_uri = "file:///path/to/file.rs#MySymbol";
+    #[test]
+    fn test_parse_symbol_uri() {
+        let symbol_uri = "file:///path/to/file.rs?symbol=MySymbol#L10:20";
         let parsed = MentionUri::parse(symbol_uri).unwrap();
         match &parsed {
-            MentionUri::Symbol(path, symbol) => {
+            MentionUri::Symbol {
+                path,
+                name,
+                line_range,
+            } => {
                 assert_eq!(path.to_str().unwrap(), "/path/to/file.rs");
-                assert_eq!(symbol, "MySymbol");
+                assert_eq!(name, "MySymbol");
+                assert_eq!(line_range.start, 9);
+                assert_eq!(line_range.end, 19);
             }
             _ => panic!("Expected Symbol variant"),
         }
-        assert_eq!(parsed.to_uri(), symbol_uri);
+        assert_eq!(parsed.to_uri().to_string(), symbol_uri);
+    }
 
-        // Test thread URI
-        let thread_uri = "zed:///agent/thread/session123";
+    #[test]
+    fn test_parse_selection_uri() {
+        let selection_uri = "file:///path/to/file.rs#L5:15";
+        let parsed = MentionUri::parse(selection_uri).unwrap();
+        match &parsed {
+            MentionUri::Selection { path, line_range } => {
+                assert_eq!(path.to_str().unwrap(), "/path/to/file.rs");
+                assert_eq!(line_range.start, 4);
+                assert_eq!(line_range.end, 14);
+            }
+            _ => panic!("Expected Selection variant"),
+        }
+        assert_eq!(parsed.to_uri().to_string(), selection_uri);
+    }
+
+    #[test]
+    fn test_parse_thread_uri() {
+        let thread_uri = "zed:///agent/thread/session123?name=Thread+name";
         let parsed = MentionUri::parse(thread_uri).unwrap();
         match &parsed {
-            MentionUri::Thread(session_id) => assert_eq!(session_id.0.as_ref(), "session123"),
+            MentionUri::Thread {
+                id: thread_id,
+                name,
+            } => {
+                assert_eq!(thread_id.to_string(), "session123");
+                assert_eq!(name, "Thread name");
+            }
             _ => panic!("Expected Thread variant"),
         }
-        assert_eq!(parsed.to_uri(), thread_uri);
+        assert_eq!(parsed.to_uri().to_string(), thread_uri);
+    }
 
-        // Test rule URI
-        let rule_uri = "zed:///agent/rule/my_rule";
+    #[test]
+    fn test_parse_rule_uri() {
+        let rule_uri = "zed:///agent/rule/d8694ff2-90d5-4b6f-be33-33c1763acd52?name=Some+rule";
         let parsed = MentionUri::parse(rule_uri).unwrap();
         match &parsed {
-            MentionUri::Rule(rule) => assert_eq!(rule, "my_rule"),
+            MentionUri::Rule { id, name } => {
+                assert_eq!(id.to_string(), "d8694ff2-90d5-4b6f-be33-33c1763acd52");
+                assert_eq!(name, "Some rule");
+            }
             _ => panic!("Expected Rule variant"),
         }
-        assert_eq!(parsed.to_uri(), rule_uri);
+        assert_eq!(parsed.to_uri().to_string(), rule_uri);
+    }
 
-        // Test invalid scheme
-        assert!(MentionUri::parse("http://example.com").is_err());
+    #[test]
+    fn test_parse_fetch_http_uri() {
+        let http_uri = "http://example.com/path?query=value#fragment";
+        let parsed = MentionUri::parse(http_uri).unwrap();
+        match &parsed {
+            MentionUri::Fetch { url } => {
+                assert_eq!(url.to_string(), http_uri);
+            }
+            _ => panic!("Expected Fetch variant"),
+        }
+        assert_eq!(parsed.to_uri().to_string(), http_uri);
+    }
 
-        // Test invalid zed path
+    #[test]
+    fn test_parse_fetch_https_uri() {
+        let https_uri = "https://example.com/api/endpoint";
+        let parsed = MentionUri::parse(https_uri).unwrap();
+        match &parsed {
+            MentionUri::Fetch { url } => {
+                assert_eq!(url.to_string(), https_uri);
+            }
+            _ => panic!("Expected Fetch variant"),
+        }
+        assert_eq!(parsed.to_uri().to_string(), https_uri);
+    }
+
+    #[test]
+    fn test_invalid_scheme() {
+        assert!(MentionUri::parse("ftp://example.com").is_err());
+        assert!(MentionUri::parse("ssh://example.com").is_err());
+        assert!(MentionUri::parse("unknown://example.com").is_err());
+    }
+
+    #[test]
+    fn test_invalid_zed_path() {
         assert!(MentionUri::parse("zed:///invalid/path").is_err());
+        assert!(MentionUri::parse("zed:///agent/unknown/test").is_err());
+    }
+
+    #[test]
+    fn test_invalid_line_range_format() {
+        // Missing L prefix
+        assert!(MentionUri::parse("file:///path/to/file.rs#10:20").is_err());
+
+        // Missing colon separator
+        assert!(MentionUri::parse("file:///path/to/file.rs#L1020").is_err());
+
+        // Invalid numbers
+        assert!(MentionUri::parse("file:///path/to/file.rs#L10:abc").is_err());
+        assert!(MentionUri::parse("file:///path/to/file.rs#Labc:20").is_err());
+    }
+
+    #[test]
+    fn test_invalid_query_parameters() {
+        // Invalid query parameter name
+        assert!(MentionUri::parse("file:///path/to/file.rs#L10:20?invalid=test").is_err());
+
+        // Too many query parameters
+        assert!(
+            MentionUri::parse("file:///path/to/file.rs#L10:20?symbol=test&another=param").is_err()
+        );
+    }
+
+    #[test]
+    fn test_zero_based_line_numbers() {
+        // Test that 0-based line numbers are rejected (should be 1-based)
+        assert!(MentionUri::parse("file:///path/to/file.rs#L0:10").is_err());
+        assert!(MentionUri::parse("file:///path/to/file.rs#L1:0").is_err());
+        assert!(MentionUri::parse("file:///path/to/file.rs#L0:0").is_err());
     }
 }
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index cc7cb50c91..12c94a522d 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -205,6 +205,22 @@ impl ThreadStore {
         (this, ready_rx)
     }
 
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn fake(project: Entity<Project>, cx: &mut App) -> Self {
+        Self {
+            project,
+            tools: cx.new(|_| ToolWorkingSet::default()),
+            prompt_builder: Arc::new(PromptBuilder::new(None).unwrap()),
+            prompt_store: None,
+            context_server_tool_ids: HashMap::default(),
+            threads: Vec::new(),
+            project_context: SharedProjectContext::default(),
+            reload_system_prompt_tx: mpsc::channel(0).0,
+            _reload_system_prompt_task: Task::ready(()),
+            _subscriptions: vec![],
+        }
+    }
+
     fn handle_project_event(
         &mut self,
         _project: Entity<Project>,
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 204b489124..b48f9001ac 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -25,8 +25,8 @@ use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;
-use std::fmt::Write;
 use std::{cell::RefCell, collections::BTreeMap, path::Path, rc::Rc, sync::Arc};
+use std::{fmt::Write, ops::Range};
 use util::{ResultExt, markdown::MarkdownCodeBlock};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -79,9 +79,9 @@ impl UserMessage {
                 }
                 UserMessageContent::Mention { uri, content } => {
                     if !content.is_empty() {
-                        markdown.push_str(&format!("{}\n\n{}\n", uri.to_link(), content));
+                        let _ = write!(&mut markdown, "{}\n\n{}\n", uri.as_link(), content);
                     } else {
-                        markdown.push_str(&format!("{}\n", uri.to_link()));
+                        let _ = write!(&mut markdown, "{}\n", uri.as_link());
                     }
                 }
             }
@@ -104,12 +104,14 @@ impl UserMessage {
         const OPEN_FILES_TAG: &str = "<files>";
         const OPEN_SYMBOLS_TAG: &str = "<symbols>";
         const OPEN_THREADS_TAG: &str = "<threads>";
+        const OPEN_FETCH_TAG: &str = "<fetched_urls>";
         const OPEN_RULES_TAG: &str =
             "<rules>\nThe user has specified the following rules that should be applied:\n";
 
         let mut file_context = OPEN_FILES_TAG.to_string();
         let mut symbol_context = OPEN_SYMBOLS_TAG.to_string();
         let mut thread_context = OPEN_THREADS_TAG.to_string();
+        let mut fetch_context = OPEN_FETCH_TAG.to_string();
         let mut rules_context = OPEN_RULES_TAG.to_string();
 
         for chunk in &self.content {
@@ -122,21 +124,40 @@ impl UserMessage {
                 }
                 UserMessageContent::Mention { uri, content } => {
                     match uri {
-                        MentionUri::File(path) | MentionUri::Symbol(path, _) => {
+                        MentionUri::File(path) => {
                             write!(
                                 &mut symbol_context,
                                 "\n{}",
                                 MarkdownCodeBlock {
-                                    tag: &codeblock_tag(&path),
+                                    tag: &codeblock_tag(&path, None),
                                     text: &content.to_string(),
                                 }
                             )
                             .ok();
                         }
-                        MentionUri::Thread(_session_id) => {
+                        MentionUri::Symbol {
+                            path, line_range, ..
+                        }
+                        | MentionUri::Selection {
+                            path, line_range, ..
+                        } => {
+                            write!(
+                                &mut rules_context,
+                                "\n{}",
+                                MarkdownCodeBlock {
+                                    tag: &codeblock_tag(&path, Some(line_range)),
+                                    text: &content
+                                }
+                            )
+                            .ok();
+                        }
+                        MentionUri::Thread { .. } => {
                             write!(&mut thread_context, "\n{}\n", content).ok();
                         }
-                        MentionUri::Rule(_user_prompt_id) => {
+                        MentionUri::TextThread { .. } => {
+                            write!(&mut thread_context, "\n{}\n", content).ok();
+                        }
+                        MentionUri::Rule { .. } => {
                             write!(
                                 &mut rules_context,
                                 "\n{}",
@@ -147,9 +168,12 @@ impl UserMessage {
                             )
                             .ok();
                         }
+                        MentionUri::Fetch { url } => {
+                            write!(&mut fetch_context, "\nFetch: {}\n\n{}", url, content).ok();
+                        }
                     }
 
-                    language_model::MessageContent::Text(uri.to_link())
+                    language_model::MessageContent::Text(uri.as_link().to_string())
                 }
             };
 
@@ -179,6 +203,13 @@ impl UserMessage {
                 .push(language_model::MessageContent::Text(thread_context));
         }
 
+        if fetch_context.len() > OPEN_FETCH_TAG.len() {
+            fetch_context.push_str("</fetched_urls>\n");
+            message
+                .content
+                .push(language_model::MessageContent::Text(fetch_context));
+        }
+
         if rules_context.len() > OPEN_RULES_TAG.len() {
             rules_context.push_str("</user_rules>\n");
             message
@@ -200,6 +231,26 @@ impl UserMessage {
     }
 }
 
+fn codeblock_tag(full_path: &Path, line_range: Option<&Range<u32>>) -> String {
+    let mut result = String::new();
+
+    if let Some(extension) = full_path.extension().and_then(|ext| ext.to_str()) {
+        let _ = write!(result, "{} ", extension);
+    }
+
+    let _ = write!(result, "{}", full_path.display());
+
+    if let Some(range) = line_range {
+        if range.start == range.end {
+            let _ = write!(result, ":{}", range.start + 1);
+        } else {
+            let _ = write!(result, ":{}-{}", range.start + 1, range.end + 1);
+        }
+    }
+
+    result
+}
+
 impl AgentMessage {
     pub fn to_markdown(&self) -> String {
         let mut markdown = String::from("## Assistant\n\n");
@@ -1367,18 +1418,6 @@ impl std::ops::DerefMut for ToolCallEventStreamReceiver {
     }
 }
 
-fn codeblock_tag(full_path: &Path) -> String {
-    let mut result = String::new();
-
-    if let Some(extension) = full_path.extension().and_then(|ext| ext.to_str()) {
-        let _ = write!(result, "{} ", extension);
-    }
-
-    let _ = write!(result, "{}", full_path.display());
-
-    result
-}
-
 impl From<&str> for UserMessageContent {
     fn from(text: &str) -> Self {
         Self::Text(text.into())
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index de0a27c2cb..b6a5710aa4 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -93,6 +93,7 @@ time.workspace = true
 time_format.workspace = true
 ui.workspace = true
 ui_input.workspace = true
+url.workspace = true
 urlencoding.workspace = true
 util.workspace = true
 uuid.workspace = true
@@ -102,6 +103,8 @@ workspace.workspace = true
 zed_actions.workspace = true
 
 [dev-dependencies]
+agent = { workspace = true, features = ["test-support"] }
+assistant_context = { workspace = true, features = ["test-support"] }
 assistant_tools.workspace = true
 buffer_diff = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 3c2bea53a7..46c8aa92f1 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -3,71 +3,184 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
-use acp_thread::MentionUri;
-use anyhow::{Context as _, Result};
-use collections::HashMap;
+use acp_thread::{MentionUri, selection_name};
+use anyhow::{Context as _, Result, anyhow};
+use collections::{HashMap, HashSet};
 use editor::display_map::CreaseId;
-use editor::{CompletionProvider, Editor, ExcerptId};
+use editor::{CompletionProvider, Editor, ExcerptId, ToOffset as _};
 use file_icons::FileIcons;
 use futures::future::try_join_all;
+use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{App, Entity, Task, WeakEntity};
+use http_client::HttpClientWithUrl;
+use itertools::Itertools as _;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
 use parking_lot::Mutex;
-use project::{Completion, CompletionIntent, CompletionResponse, Project, ProjectPath, WorktreeId};
+use project::{
+    Completion, CompletionIntent, CompletionResponse, Project, ProjectPath, Symbol, WorktreeId,
+};
+use prompt_store::PromptStore;
 use rope::Point;
-use text::{Anchor, ToPoint};
+use text::{Anchor, OffsetRangeExt as _, ToPoint as _};
 use ui::prelude::*;
+use url::Url;
 use workspace::Workspace;
+use workspace::notifications::NotifyResultExt;
 
-use crate::context_picker::MentionLink;
-use crate::context_picker::file_context_picker::{extract_file_name_and_directory, search_files};
+use agent::{
+    context::RULES_ICON,
+    thread_store::{TextThreadStore, ThreadStore},
+};
+
+use crate::context_picker::fetch_context_picker::fetch_url_content;
+use crate::context_picker::file_context_picker::{FileMatch, search_files};
+use crate::context_picker::rules_context_picker::{RulesContextEntry, search_rules};
+use crate::context_picker::symbol_context_picker::SymbolMatch;
+use crate::context_picker::symbol_context_picker::search_symbols;
+use crate::context_picker::thread_context_picker::{
+    ThreadContextEntry, ThreadMatch, search_threads,
+};
+use crate::context_picker::{
+    ContextPickerAction, ContextPickerEntry, ContextPickerMode, RecentEntry,
+    available_context_picker_entries, recent_context_picker_entries, selection_ranges,
+};
 
 #[derive(Default)]
 pub struct MentionSet {
-    paths_by_crease_id: HashMap<CreaseId, MentionUri>,
+    uri_by_crease_id: HashMap<CreaseId, MentionUri>,
+    fetch_results: HashMap<Url, String>,
 }
 
 impl MentionSet {
-    pub fn insert(&mut self, crease_id: CreaseId, path: PathBuf) {
-        self.paths_by_crease_id
-            .insert(crease_id, MentionUri::File(path));
+    pub fn insert(&mut self, crease_id: CreaseId, uri: MentionUri) {
+        self.uri_by_crease_id.insert(crease_id, uri);
+    }
+
+    pub fn add_fetch_result(&mut self, url: Url, content: String) {
+        self.fetch_results.insert(url, content);
     }
 
     pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
-        self.paths_by_crease_id.drain().map(|(id, _)| id)
+        self.fetch_results.clear();
+        self.uri_by_crease_id.drain().map(|(id, _)| id)
     }
 
     pub fn contents(
         &self,
         project: Entity<Project>,
+        thread_store: Entity<ThreadStore>,
+        text_thread_store: Entity<TextThreadStore>,
+        window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, Mention>>> {
         let contents = self
-            .paths_by_crease_id
+            .uri_by_crease_id
             .iter()
-            .map(|(crease_id, uri)| match uri {
-                MentionUri::File(path) => {
-                    let crease_id = *crease_id;
-                    let uri = uri.clone();
-                    let path = path.to_path_buf();
-                    let buffer_task = project.update(cx, |project, cx| {
-                        let path = project
-                            .find_project_path(path, cx)
-                            .context("Failed to find project path")?;
-                        anyhow::Ok(project.open_buffer(path, cx))
-                    });
+            .map(|(&crease_id, uri)| {
+                match uri {
+                    MentionUri::File(path) => {
+                        let uri = uri.clone();
+                        let path = path.to_path_buf();
+                        let buffer_task = project.update(cx, |project, cx| {
+                            let path = project
+                                .find_project_path(path, cx)
+                                .context("Failed to find project path")?;
+                            anyhow::Ok(project.open_buffer(path, cx))
+                        });
 
-                    cx.spawn(async move |cx| {
-                        let buffer = buffer_task?.await?;
-                        let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+                        cx.spawn(async move |cx| {
+                            let buffer = buffer_task?.await?;
+                            let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
 
-                        anyhow::Ok((crease_id, Mention { uri, content }))
-                    })
-                }
-                _ => {
-                    // TODO
-                    unimplemented!()
+                            anyhow::Ok((crease_id, Mention { uri, content }))
+                        })
+                    }
+                    MentionUri::Symbol {
+                        path, line_range, ..
+                    }
+                    | MentionUri::Selection {
+                        path, line_range, ..
+                    } => {
+                        let uri = uri.clone();
+                        let path_buf = path.clone();
+                        let line_range = line_range.clone();
+
+                        let buffer_task = project.update(cx, |project, cx| {
+                            let path = project
+                                .find_project_path(&path_buf, cx)
+                                .context("Failed to find project path")?;
+                            anyhow::Ok(project.open_buffer(path, cx))
+                        });
+
+                        cx.spawn(async move |cx| {
+                            let buffer = buffer_task?.await?;
+                            let content = buffer.read_with(cx, |buffer, _cx| {
+                                buffer
+                                    .text_for_range(
+                                        Point::new(line_range.start, 0)
+                                            ..Point::new(
+                                                line_range.end,
+                                                buffer.line_len(line_range.end),
+                                            ),
+                                    )
+                                    .collect()
+                            })?;
+
+                            anyhow::Ok((crease_id, Mention { uri, content }))
+                        })
+                    }
+                    MentionUri::Thread { id: thread_id, .. } => {
+                        let open_task = thread_store.update(cx, |thread_store, cx| {
+                            thread_store.open_thread(&thread_id, window, cx)
+                        });
+
+                        let uri = uri.clone();
+                        cx.spawn(async move |cx| {
+                            let thread = open_task.await?;
+                            let content = thread.read_with(cx, |thread, _cx| {
+                                thread.latest_detailed_summary_or_text().to_string()
+                            })?;
+
+                            anyhow::Ok((crease_id, Mention { uri, content }))
+                        })
+                    }
+                    MentionUri::TextThread { path, .. } => {
+                        let context = text_thread_store.update(cx, |text_thread_store, cx| {
+                            text_thread_store.open_local_context(path.as_path().into(), cx)
+                        });
+                        let uri = uri.clone();
+                        cx.spawn(async move |cx| {
+                            let context = context.await?;
+                            let xml = context.update(cx, |context, cx| context.to_xml(cx))?;
+                            anyhow::Ok((crease_id, Mention { uri, content: xml }))
+                        })
+                    }
+                    MentionUri::Rule { id: prompt_id, .. } => {
+                        let Some(prompt_store) = thread_store.read(cx).prompt_store().clone()
+                        else {
+                            return Task::ready(Err(anyhow!("missing prompt store")));
+                        };
+                        let text_task = prompt_store.read(cx).load(*prompt_id, cx);
+                        let uri = uri.clone();
+                        cx.spawn(async move |_| {
+                            // TODO: report load errors instead of just logging
+                            let text = text_task.await?;
+                            anyhow::Ok((crease_id, Mention { uri, content: text }))
+                        })
+                    }
+                    MentionUri::Fetch { url } => {
+                        let Some(content) = self.fetch_results.get(&url) else {
+                            return Task::ready(Err(anyhow!("missing fetch result")));
+                        };
+                        Task::ready(Ok((
+                            crease_id,
+                            Mention {
+                                uri: uri.clone(),
+                                content: content.clone(),
+                            },
+                        )))
+                    }
                 }
             })
             .collect::<Vec<_>>();
@@ -79,30 +192,458 @@ impl MentionSet {
     }
 }
 
+#[derive(Debug)]
 pub struct Mention {
     pub uri: MentionUri,
     pub content: String,
 }
 
+pub(crate) enum Match {
+    File(FileMatch),
+    Symbol(SymbolMatch),
+    Thread(ThreadMatch),
+    Fetch(SharedString),
+    Rules(RulesContextEntry),
+    Entry(EntryMatch),
+}
+
+pub struct EntryMatch {
+    mat: Option<StringMatch>,
+    entry: ContextPickerEntry,
+}
+
+impl Match {
+    pub fn score(&self) -> f64 {
+        match self {
+            Match::File(file) => file.mat.score,
+            Match::Entry(mode) => mode.mat.as_ref().map(|mat| mat.score).unwrap_or(1.),
+            Match::Thread(_) => 1.,
+            Match::Symbol(_) => 1.,
+            Match::Rules(_) => 1.,
+            Match::Fetch(_) => 1.,
+        }
+    }
+}
+
+fn search(
+    mode: Option<ContextPickerMode>,
+    query: String,
+    cancellation_flag: Arc<AtomicBool>,
+    recent_entries: Vec<RecentEntry>,
+    prompt_store: Option<Entity<PromptStore>>,
+    thread_store: WeakEntity<ThreadStore>,
+    text_thread_context_store: WeakEntity<assistant_context::ContextStore>,
+    workspace: Entity<Workspace>,
+    cx: &mut App,
+) -> Task<Vec<Match>> {
+    match mode {
+        Some(ContextPickerMode::File) => {
+            let search_files_task =
+                search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+            cx.background_spawn(async move {
+                search_files_task
+                    .await
+                    .into_iter()
+                    .map(Match::File)
+                    .collect()
+            })
+        }
+
+        Some(ContextPickerMode::Symbol) => {
+            let search_symbols_task =
+                search_symbols(query.clone(), cancellation_flag.clone(), &workspace, cx);
+            cx.background_spawn(async move {
+                search_symbols_task
+                    .await
+                    .into_iter()
+                    .map(Match::Symbol)
+                    .collect()
+            })
+        }
+
+        Some(ContextPickerMode::Thread) => {
+            if let Some((thread_store, context_store)) = thread_store
+                .upgrade()
+                .zip(text_thread_context_store.upgrade())
+            {
+                let search_threads_task = search_threads(
+                    query.clone(),
+                    cancellation_flag.clone(),
+                    thread_store,
+                    context_store,
+                    cx,
+                );
+                cx.background_spawn(async move {
+                    search_threads_task
+                        .await
+                        .into_iter()
+                        .map(Match::Thread)
+                        .collect()
+                })
+            } else {
+                Task::ready(Vec::new())
+            }
+        }
+
+        Some(ContextPickerMode::Fetch) => {
+            if !query.is_empty() {
+                Task::ready(vec![Match::Fetch(query.into())])
+            } else {
+                Task::ready(Vec::new())
+            }
+        }
+
+        Some(ContextPickerMode::Rules) => {
+            if let Some(prompt_store) = prompt_store.as_ref() {
+                let search_rules_task =
+                    search_rules(query.clone(), cancellation_flag.clone(), prompt_store, cx);
+                cx.background_spawn(async move {
+                    search_rules_task
+                        .await
+                        .into_iter()
+                        .map(Match::Rules)
+                        .collect::<Vec<_>>()
+                })
+            } else {
+                Task::ready(Vec::new())
+            }
+        }
+
+        None => {
+            if query.is_empty() {
+                let mut matches = recent_entries
+                    .into_iter()
+                    .map(|entry| match entry {
+                        RecentEntry::File {
+                            project_path,
+                            path_prefix,
+                        } => Match::File(FileMatch {
+                            mat: fuzzy::PathMatch {
+                                score: 1.,
+                                positions: Vec::new(),
+                                worktree_id: project_path.worktree_id.to_usize(),
+                                path: project_path.path,
+                                path_prefix,
+                                is_dir: false,
+                                distance_to_relative_ancestor: 0,
+                            },
+                            is_recent: true,
+                        }),
+                        RecentEntry::Thread(thread_context_entry) => Match::Thread(ThreadMatch {
+                            thread: thread_context_entry,
+                            is_recent: true,
+                        }),
+                    })
+                    .collect::<Vec<_>>();
+
+                matches.extend(
+                    available_context_picker_entries(
+                        &prompt_store,
+                        &Some(thread_store.clone()),
+                        &workspace,
+                        cx,
+                    )
+                    .into_iter()
+                    .map(|mode| {
+                        Match::Entry(EntryMatch {
+                            entry: mode,
+                            mat: None,
+                        })
+                    }),
+                );
+
+                Task::ready(matches)
+            } else {
+                let executor = cx.background_executor().clone();
+
+                let search_files_task =
+                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+
+                let entries = available_context_picker_entries(
+                    &prompt_store,
+                    &Some(thread_store.clone()),
+                    &workspace,
+                    cx,
+                );
+                let entry_candidates = entries
+                    .iter()
+                    .enumerate()
+                    .map(|(ix, entry)| StringMatchCandidate::new(ix, entry.keyword()))
+                    .collect::<Vec<_>>();
+
+                cx.background_spawn(async move {
+                    let mut matches = search_files_task
+                        .await
+                        .into_iter()
+                        .map(Match::File)
+                        .collect::<Vec<_>>();
+
+                    let entry_matches = fuzzy::match_strings(
+                        &entry_candidates,
+                        &query,
+                        false,
+                        true,
+                        100,
+                        &Arc::new(AtomicBool::default()),
+                        executor,
+                    )
+                    .await;
+
+                    matches.extend(entry_matches.into_iter().map(|mat| {
+                        Match::Entry(EntryMatch {
+                            entry: entries[mat.candidate_id],
+                            mat: Some(mat),
+                        })
+                    }));
+
+                    matches.sort_by(|a, b| {
+                        b.score()
+                            .partial_cmp(&a.score())
+                            .unwrap_or(std::cmp::Ordering::Equal)
+                    });
+
+                    matches
+                })
+            }
+        }
+    }
+}
+
 pub struct ContextPickerCompletionProvider {
-    workspace: WeakEntity<Workspace>,
-    editor: WeakEntity<Editor>,
     mention_set: Arc<Mutex<MentionSet>>,
+    workspace: WeakEntity<Workspace>,
+    thread_store: WeakEntity<ThreadStore>,
+    text_thread_store: WeakEntity<TextThreadStore>,
+    editor: WeakEntity<Editor>,
 }
 
 impl ContextPickerCompletionProvider {
     pub fn new(
         mention_set: Arc<Mutex<MentionSet>>,
         workspace: WeakEntity<Workspace>,
+        thread_store: WeakEntity<ThreadStore>,
+        text_thread_store: WeakEntity<TextThreadStore>,
         editor: WeakEntity<Editor>,
     ) -> Self {
         Self {
             mention_set,
             workspace,
+            thread_store,
+            text_thread_store,
             editor,
         }
     }
 
+    fn completion_for_entry(
+        entry: ContextPickerEntry,
+        excerpt_id: ExcerptId,
+        source_range: Range<Anchor>,
+        editor: Entity<Editor>,
+        mention_set: Arc<Mutex<MentionSet>>,
+        workspace: &Entity<Workspace>,
+        cx: &mut App,
+    ) -> Option<Completion> {
+        match entry {
+            ContextPickerEntry::Mode(mode) => Some(Completion {
+                replace_range: source_range.clone(),
+                new_text: format!("@{} ", mode.keyword()),
+                label: CodeLabel::plain(mode.label().to_string(), None),
+                icon_path: Some(mode.icon().path().into()),
+                documentation: None,
+                source: project::CompletionSource::Custom,
+                insert_text_mode: None,
+                // This ensures that when a user accepts this completion, the
+                // completion menu will still be shown after "@category " is
+                // inserted
+                confirm: Some(Arc::new(|_, _, _| true)),
+            }),
+            ContextPickerEntry::Action(action) => {
+                let (new_text, on_action) = match action {
+                    ContextPickerAction::AddSelections => {
+                        let selections = selection_ranges(workspace, cx);
+
+                        const PLACEHOLDER: &str = "selection ";
+
+                        let new_text = std::iter::repeat(PLACEHOLDER)
+                            .take(selections.len())
+                            .chain(std::iter::once(""))
+                            .join(" ");
+
+                        let callback = Arc::new({
+                            let mention_set = mention_set.clone();
+                            let selections = selections.clone();
+                            move |_, window: &mut Window, cx: &mut App| {
+                                let editor = editor.clone();
+                                let mention_set = mention_set.clone();
+                                let selections = selections.clone();
+                                window.defer(cx, move |window, cx| {
+                                    let mut current_offset = 0;
+
+                                    for (buffer, selection_range) in selections {
+                                        let snapshot =
+                                            editor.read(cx).buffer().read(cx).snapshot(cx);
+                                        let Some(start) = snapshot
+                                            .anchor_in_excerpt(excerpt_id, source_range.start)
+                                        else {
+                                            return;
+                                        };
+
+                                        let offset = start.to_offset(&snapshot) + current_offset;
+                                        let text_len = PLACEHOLDER.len() - 1;
+
+                                        let range = snapshot.anchor_after(offset)
+                                            ..snapshot.anchor_after(offset + text_len);
+
+                                        let path = buffer
+                                            .read(cx)
+                                            .file()
+                                            .map_or(PathBuf::from("untitled"), |file| {
+                                                file.path().to_path_buf()
+                                            });
+
+                                        let point_range = snapshot
+                                            .as_singleton()
+                                            .map(|(_, _, snapshot)| {
+                                                selection_range.to_point(&snapshot)
+                                            })
+                                            .unwrap_or_default();
+                                        let line_range = point_range.start.row..point_range.end.row;
+                                        let crease = crate::context_picker::crease_for_mention(
+                                            selection_name(&path, &line_range).into(),
+                                            IconName::Reader.path().into(),
+                                            range,
+                                            editor.downgrade(),
+                                        );
+
+                                        let [crease_id]: [_; 1] =
+                                            editor.update(cx, |editor, cx| {
+                                                let crease_ids =
+                                                    editor.insert_creases(vec![crease.clone()], cx);
+                                                editor.fold_creases(
+                                                    vec![crease],
+                                                    false,
+                                                    window,
+                                                    cx,
+                                                );
+                                                crease_ids.try_into().unwrap()
+                                            });
+
+                                        mention_set.lock().insert(
+                                            crease_id,
+                                            MentionUri::Selection { path, line_range },
+                                        );
+
+                                        current_offset += text_len + 1;
+                                    }
+                                });
+
+                                false
+                            }
+                        });
+
+                        (new_text, callback)
+                    }
+                };
+
+                Some(Completion {
+                    replace_range: source_range.clone(),
+                    new_text,
+                    label: CodeLabel::plain(action.label().to_string(), None),
+                    icon_path: Some(action.icon().path().into()),
+                    documentation: None,
+                    source: project::CompletionSource::Custom,
+                    insert_text_mode: None,
+                    // This ensures that when a user accepts this completion, the
+                    // completion menu will still be shown after "@category " is
+                    // inserted
+                    confirm: Some(on_action),
+                })
+            }
+        }
+    }
+
+    fn completion_for_thread(
+        thread_entry: ThreadContextEntry,
+        excerpt_id: ExcerptId,
+        source_range: Range<Anchor>,
+        recent: bool,
+        editor: Entity<Editor>,
+        mention_set: Arc<Mutex<MentionSet>>,
+    ) -> Completion {
+        let icon_for_completion = if recent {
+            IconName::HistoryRerun
+        } else {
+            IconName::Thread
+        };
+
+        let uri = match &thread_entry {
+            ThreadContextEntry::Thread { id, title } => MentionUri::Thread {
+                id: id.clone(),
+                name: title.to_string(),
+            },
+            ThreadContextEntry::Context { path, title } => MentionUri::TextThread {
+                path: path.to_path_buf(),
+                name: title.to_string(),
+            },
+        };
+        let new_text = format!("{} ", uri.as_link());
+
+        let new_text_len = new_text.len();
+        Completion {
+            replace_range: source_range.clone(),
+            new_text,
+            label: CodeLabel::plain(thread_entry.title().to_string(), None),
+            documentation: None,
+            insert_text_mode: None,
+            source: project::CompletionSource::Custom,
+            icon_path: Some(icon_for_completion.path().into()),
+            confirm: Some(confirm_completion_callback(
+                IconName::Thread.path().into(),
+                thread_entry.title().clone(),
+                excerpt_id,
+                source_range.start,
+                new_text_len - 1,
+                editor.clone(),
+                mention_set,
+                uri,
+            )),
+        }
+    }
+
+    fn completion_for_rules(
+        rule: RulesContextEntry,
+        excerpt_id: ExcerptId,
+        source_range: Range<Anchor>,
+        editor: Entity<Editor>,
+        mention_set: Arc<Mutex<MentionSet>>,
+    ) -> Completion {
+        let uri = MentionUri::Rule {
+            id: rule.prompt_id.into(),
+            name: rule.title.to_string(),
+        };
+        let new_text = format!("{} ", uri.as_link());
+        let new_text_len = new_text.len();
+        Completion {
+            replace_range: source_range.clone(),
+            new_text,
+            label: CodeLabel::plain(rule.title.to_string(), None),
+            documentation: None,
+            insert_text_mode: None,
+            source: project::CompletionSource::Custom,
+            icon_path: Some(RULES_ICON.path().into()),
+            confirm: Some(confirm_completion_callback(
+                RULES_ICON.path().into(),
+                rule.title.clone(),
+                excerpt_id,
+                source_range.start,
+                new_text_len - 1,
+                editor.clone(),
+                mention_set,
+                uri,
+            )),
+        }
+    }
+
     pub(crate) fn completion_for_path(
         project_path: ProjectPath,
         path_prefix: &str,
@@ -114,9 +655,12 @@ impl ContextPickerCompletionProvider {
         mention_set: Arc<Mutex<MentionSet>>,
         project: Entity<Project>,
         cx: &App,
-    ) -> Completion {
+    ) -> Option<Completion> {
         let (file_name, directory) =
-            extract_file_name_and_directory(&project_path.path, path_prefix);
+            crate::context_picker::file_context_picker::extract_file_name_and_directory(
+                &project_path.path,
+                path_prefix,
+            );
 
         let label =
             build_code_label_for_full_path(&file_name, directory.as_ref().map(|s| s.as_ref()), cx);
@@ -138,9 +682,12 @@ impl ContextPickerCompletionProvider {
             crease_icon_path.clone()
         };
 
-        let new_text = format!("{} ", MentionLink::for_file(&file_name, &full_path));
+        let abs_path = project.read(cx).absolute_path(&project_path, cx)?;
+
+        let file_uri = MentionUri::File(abs_path);
+        let new_text = format!("{} ", file_uri.as_link());
         let new_text_len = new_text.len();
-        Completion {
+        Some(Completion {
             replace_range: source_range.clone(),
             new_text,
             label,
@@ -151,15 +698,153 @@ impl ContextPickerCompletionProvider {
             confirm: Some(confirm_completion_callback(
                 crease_icon_path,
                 file_name,
-                project_path,
                 excerpt_id,
                 source_range.start,
                 new_text_len - 1,
                 editor,
-                mention_set,
-                project,
+                mention_set.clone(),
+                file_uri,
             )),
-        }
+        })
+    }
+
+    fn completion_for_symbol(
+        symbol: Symbol,
+        excerpt_id: ExcerptId,
+        source_range: Range<Anchor>,
+        editor: Entity<Editor>,
+        mention_set: Arc<Mutex<MentionSet>>,
+        workspace: Entity<Workspace>,
+        cx: &mut App,
+    ) -> Option<Completion> {
+        let project = workspace.read(cx).project().clone();
+
+        let label = CodeLabel::plain(symbol.name.clone(), None);
+
+        let abs_path = project.read(cx).absolute_path(&symbol.path, cx)?;
+        let uri = MentionUri::Symbol {
+            path: abs_path,
+            name: symbol.name.clone(),
+            line_range: symbol.range.start.0.row..symbol.range.end.0.row,
+        };
+        let new_text = format!("{} ", uri.as_link());
+        let new_text_len = new_text.len();
+        Some(Completion {
+            replace_range: source_range.clone(),
+            new_text,
+            label,
+            documentation: None,
+            source: project::CompletionSource::Custom,
+            icon_path: Some(IconName::Code.path().into()),
+            insert_text_mode: None,
+            confirm: Some(confirm_completion_callback(
+                IconName::Code.path().into(),
+                symbol.name.clone().into(),
+                excerpt_id,
+                source_range.start,
+                new_text_len - 1,
+                editor.clone(),
+                mention_set.clone(),
+                uri,
+            )),
+        })
+    }
+
+    fn completion_for_fetch(
+        source_range: Range<Anchor>,
+        url_to_fetch: SharedString,
+        excerpt_id: ExcerptId,
+        editor: Entity<Editor>,
+        mention_set: Arc<Mutex<MentionSet>>,
+        http_client: Arc<HttpClientWithUrl>,
+    ) -> Option<Completion> {
+        let new_text = format!("@fetch {} ", url_to_fetch.clone());
+        let new_text_len = new_text.len();
+        Some(Completion {
+            replace_range: source_range.clone(),
+            new_text,
+            label: CodeLabel::plain(url_to_fetch.to_string(), None),
+            documentation: None,
+            source: project::CompletionSource::Custom,
+            icon_path: Some(IconName::ToolWeb.path().into()),
+            insert_text_mode: None,
+            confirm: Some({
+                let start = source_range.start;
+                let content_len = new_text_len - 1;
+                let editor = editor.clone();
+                let url_to_fetch = url_to_fetch.clone();
+                let source_range = source_range.clone();
+                Arc::new(move |_, window, cx| {
+                    let Some(url) = url::Url::parse(url_to_fetch.as_ref())
+                        .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
+                        .notify_app_err(cx)
+                    else {
+                        return false;
+                    };
+                    let mention_uri = MentionUri::Fetch { url: url.clone() };
+
+                    let editor = editor.clone();
+                    let mention_set = mention_set.clone();
+                    let http_client = http_client.clone();
+                    let source_range = source_range.clone();
+                    window.defer(cx, move |window, cx| {
+                        let url = url.clone();
+
+                        let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
+                            excerpt_id,
+                            start,
+                            content_len,
+                            url.to_string().into(),
+                            IconName::ToolWeb.path().into(),
+                            editor.clone(),
+                            window,
+                            cx,
+                        ) else {
+                            return;
+                        };
+
+                        let editor = editor.clone();
+                        let mention_set = mention_set.clone();
+                        let http_client = http_client.clone();
+                        let source_range = source_range.clone();
+                        window
+                            .spawn(cx, async move |cx| {
+                                if let Some(content) =
+                                    fetch_url_content(http_client, url.to_string())
+                                        .await
+                                        .notify_async_err(cx)
+                                {
+                                    mention_set.lock().add_fetch_result(url, content);
+                                    mention_set.lock().insert(crease_id, mention_uri.clone());
+                                } else {
+                                    // Remove crease if we failed to fetch
+                                    editor
+                                        .update(cx, |editor, cx| {
+                                            let snapshot = editor.buffer().read(cx).snapshot(cx);
+                                            let Some(anchor) = snapshot
+                                                .anchor_in_excerpt(excerpt_id, source_range.start)
+                                            else {
+                                                return;
+                                            };
+                                            editor.display_map.update(cx, |display_map, cx| {
+                                                display_map.unfold_intersecting(
+                                                    vec![anchor..anchor],
+                                                    true,
+                                                    cx,
+                                                );
+                                            });
+                                            editor.remove_creases([crease_id], cx);
+                                        })
+                                        .ok();
+                                }
+                                Some(())
+                            })
+                            .detach();
+                    });
+                    false
+                })
+            }),
+        })
     }
 }
 
@@ -206,16 +891,66 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         };
 
         let project = workspace.read(cx).project().clone();
+        let http_client = workspace.read(cx).client().http_client();
         let snapshot = buffer.read(cx).snapshot();
         let source_range = snapshot.anchor_before(state.source_range.start)
             ..snapshot.anchor_after(state.source_range.end);
 
+        let thread_store = self.thread_store.clone();
+        let text_thread_store = self.text_thread_store.clone();
         let editor = self.editor.clone();
-        let mention_set = self.mention_set.clone();
-        let MentionCompletion { argument, .. } = state;
+
+        let MentionCompletion { mode, argument, .. } = state;
         let query = argument.unwrap_or_else(|| "".to_string());
 
-        let search_task = search_files(query.clone(), Arc::<AtomicBool>::default(), &workspace, cx);
+        let (exclude_paths, exclude_threads) = {
+            let mention_set = self.mention_set.lock();
+
+            let mut excluded_paths = HashSet::default();
+            let mut excluded_threads = HashSet::default();
+
+            for uri in mention_set.uri_by_crease_id.values() {
+                match uri {
+                    MentionUri::File(path) => {
+                        excluded_paths.insert(path.clone());
+                    }
+                    MentionUri::Thread { id, .. } => {
+                        excluded_threads.insert(id.clone());
+                    }
+                    _ => {}
+                }
+            }
+
+            (excluded_paths, excluded_threads)
+        };
+
+        let recent_entries = recent_context_picker_entries(
+            Some(thread_store.clone()),
+            Some(text_thread_store.clone()),
+            workspace.clone(),
+            &exclude_paths,
+            &exclude_threads,
+            cx,
+        );
+
+        let prompt_store = thread_store
+            .read_with(cx, |thread_store, _cx| thread_store.prompt_store().clone())
+            .ok()
+            .flatten();
+
+        let search_task = search(
+            mode,
+            query,
+            Arc::<AtomicBool>::default(),
+            recent_entries,
+            prompt_store,
+            thread_store.clone(),
+            text_thread_store.clone(),
+            workspace.clone(),
+            cx,
+        );
+
+        let mention_set = self.mention_set.clone();
 
         cx.spawn(async move |_, cx| {
             let matches = search_task.await;
@@ -226,25 +961,74 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             let completions = cx.update(|cx| {
                 matches
                     .into_iter()
-                    .map(|mat| {
-                        let path_match = &mat.mat;
-                        let project_path = ProjectPath {
-                            worktree_id: WorktreeId::from_usize(path_match.worktree_id),
-                            path: path_match.path.clone(),
-                        };
+                    .filter_map(|mat| match mat {
+                        Match::File(FileMatch { mat, is_recent }) => {
+                            let project_path = ProjectPath {
+                                worktree_id: WorktreeId::from_usize(mat.worktree_id),
+                                path: mat.path.clone(),
+                            };
 
-                        Self::completion_for_path(
-                            project_path,
-                            &path_match.path_prefix,
-                            mat.is_recent,
-                            path_match.is_dir,
+                            Self::completion_for_path(
+                                project_path,
+                                &mat.path_prefix,
+                                is_recent,
+                                mat.is_dir,
+                                excerpt_id,
+                                source_range.clone(),
+                                editor.clone(),
+                                mention_set.clone(),
+                                project.clone(),
+                                cx,
+                            )
+                        }
+
+                        Match::Symbol(SymbolMatch { symbol, .. }) => Self::completion_for_symbol(
+                            symbol,
                             excerpt_id,
                             source_range.clone(),
                             editor.clone(),
                             mention_set.clone(),
-                            project.clone(),
+                            workspace.clone(),
                             cx,
-                        )
+                        ),
+
+                        Match::Thread(ThreadMatch {
+                            thread, is_recent, ..
+                        }) => Some(Self::completion_for_thread(
+                            thread,
+                            excerpt_id,
+                            source_range.clone(),
+                            is_recent,
+                            editor.clone(),
+                            mention_set.clone(),
+                        )),
+
+                        Match::Rules(user_rules) => Some(Self::completion_for_rules(
+                            user_rules,
+                            excerpt_id,
+                            source_range.clone(),
+                            editor.clone(),
+                            mention_set.clone(),
+                        )),
+
+                        Match::Fetch(url) => Self::completion_for_fetch(
+                            source_range.clone(),
+                            url,
+                            excerpt_id,
+                            editor.clone(),
+                            mention_set.clone(),
+                            http_client.clone(),
+                        ),
+
+                        Match::Entry(EntryMatch { entry, .. }) => Self::completion_for_entry(
+                            entry,
+                            excerpt_id,
+                            source_range.clone(),
+                            editor.clone(),
+                            mention_set.clone(),
+                            &workspace,
+                            cx,
+                        ),
                     })
                     .collect()
             })?;
@@ -296,23 +1080,21 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 fn confirm_completion_callback(
     crease_icon_path: SharedString,
     crease_text: SharedString,
-    project_path: ProjectPath,
     excerpt_id: ExcerptId,
     start: Anchor,
     content_len: usize,
     editor: Entity<Editor>,
     mention_set: Arc<Mutex<MentionSet>>,
-    project: Entity<Project>,
+    mention_uri: MentionUri,
 ) -> Arc<dyn Fn(CompletionIntent, &mut Window, &mut App) -> bool + Send + Sync> {
     Arc::new(move |_, window, cx| {
         let crease_text = crease_text.clone();
         let crease_icon_path = crease_icon_path.clone();
         let editor = editor.clone();
-        let project_path = project_path.clone();
         let mention_set = mention_set.clone();
-        let project = project.clone();
+        let mention_uri = mention_uri.clone();
         window.defer(cx, move |window, cx| {
-            let crease_id = crate::context_picker::insert_crease_for_mention(
+            if let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
                 excerpt_id,
                 start,
                 content_len,
@@ -321,14 +1103,8 @@ fn confirm_completion_callback(
                 editor.clone(),
                 window,
                 cx,
-            );
-
-            let Some(path) = project.read(cx).absolute_path(&project_path, cx) else {
-                return;
-            };
-
-            if let Some(crease_id) = crease_id {
-                mention_set.lock().insert(crease_id, path);
+            ) {
+                mention_set.lock().insert(crease_id, mention_uri.clone());
             }
         });
         false
@@ -338,6 +1114,7 @@ fn confirm_completion_callback(
 #[derive(Debug, Default, PartialEq)]
 struct MentionCompletion {
     source_range: Range<usize>,
+    mode: Option<ContextPickerMode>,
     argument: Option<String>,
 }
 
@@ -357,17 +1134,37 @@ impl MentionCompletion {
         }
 
         let rest_of_line = &line[last_mention_start + 1..];
+
+        let mut mode = None;
         let mut argument = None;
 
         let mut parts = rest_of_line.split_whitespace();
         let mut end = last_mention_start + 1;
-        if let Some(argument_text) = parts.next() {
-            end += argument_text.len();
-            argument = Some(argument_text.to_string());
+        if let Some(mode_text) = parts.next() {
+            end += mode_text.len();
+
+            if let Some(parsed_mode) = ContextPickerMode::try_from(mode_text).ok() {
+                mode = Some(parsed_mode);
+            } else {
+                argument = Some(mode_text.to_string());
+            }
+            match rest_of_line[mode_text.len()..].find(|c: char| !c.is_whitespace()) {
+                Some(whitespace_count) => {
+                    if let Some(argument_text) = parts.next() {
+                        argument = Some(argument_text.to_string());
+                        end += whitespace_count + argument_text.len();
+                    }
+                }
+                None => {
+                    // Rest of line is entirely whitespace
+                    end += rest_of_line.len() - mode_text.len();
+                }
+            }
         }
 
         Some(Self {
             source_range: last_mention_start + offset_to_line..end + offset_to_line,
+            mode,
             argument,
         })
     }
@@ -376,10 +1173,12 @@ impl MentionCompletion {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use editor::AnchorRangeExt;
     use gpui::{EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext};
     use project::{Project, ProjectPath};
     use serde_json::json;
     use settings::SettingsStore;
+    use smol::stream::StreamExt as _;
     use std::{ops::Deref, rc::Rc};
     use util::path;
     use workspace::{AppState, Item};
@@ -392,14 +1191,61 @@ mod tests {
             MentionCompletion::try_parse("Lorem @", 0),
             Some(MentionCompletion {
                 source_range: 6..7,
+                mode: None,
                 argument: None,
             })
         );
 
+        assert_eq!(
+            MentionCompletion::try_parse("Lorem @file", 0),
+            Some(MentionCompletion {
+                source_range: 6..11,
+                mode: Some(ContextPickerMode::File),
+                argument: None,
+            })
+        );
+
+        assert_eq!(
+            MentionCompletion::try_parse("Lorem @file ", 0),
+            Some(MentionCompletion {
+                source_range: 6..12,
+                mode: Some(ContextPickerMode::File),
+                argument: None,
+            })
+        );
+
+        assert_eq!(
+            MentionCompletion::try_parse("Lorem @file main.rs", 0),
+            Some(MentionCompletion {
+                source_range: 6..19,
+                mode: Some(ContextPickerMode::File),
+                argument: Some("main.rs".to_string()),
+            })
+        );
+
+        assert_eq!(
+            MentionCompletion::try_parse("Lorem @file main.rs ", 0),
+            Some(MentionCompletion {
+                source_range: 6..19,
+                mode: Some(ContextPickerMode::File),
+                argument: Some("main.rs".to_string()),
+            })
+        );
+
+        assert_eq!(
+            MentionCompletion::try_parse("Lorem @file main.rs Ipsum", 0),
+            Some(MentionCompletion {
+                source_range: 6..19,
+                mode: Some(ContextPickerMode::File),
+                argument: Some("main.rs".to_string()),
+            })
+        );
+
         assert_eq!(
             MentionCompletion::try_parse("Lorem @main", 0),
             Some(MentionCompletion {
                 source_range: 6..11,
+                mode: None,
                 argument: Some("main".to_string()),
             })
         );
@@ -456,16 +1302,16 @@ mod tests {
                 json!({
                     "editor": "",
                     "a": {
-                        "one.txt": "",
-                        "two.txt": "",
-                        "three.txt": "",
-                        "four.txt": ""
+                        "one.txt": "1",
+                        "two.txt": "2",
+                        "three.txt": "3",
+                        "four.txt": "4"
                     },
                     "b": {
-                        "five.txt": "",
-                        "six.txt": "",
-                        "seven.txt": "",
-                        "eight.txt": "",
+                        "five.txt": "5",
+                        "six.txt": "6",
+                        "seven.txt": "7",
+                        "eight.txt": "8",
                     }
                 }),
             )
@@ -540,12 +1386,17 @@ mod tests {
 
         let mention_set = Arc::new(Mutex::new(MentionSet::default()));
 
+        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
+        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+
         let editor_entity = editor.downgrade();
         editor.update_in(&mut cx, |editor, window, cx| {
             window.focus(&editor.focus_handle(cx));
             editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
                 mention_set.clone(),
                 workspace.downgrade(),
+                thread_store.downgrade(),
+                text_thread_store.downgrade(),
                 editor_entity,
             ))));
         });
@@ -569,22 +1420,10 @@ mod tests {
                     "seven.txt dir/b/",
                     "six.txt dir/b/",
                     "five.txt dir/b/",
-                    "four.txt dir/a/",
-                    "three.txt dir/a/",
-                    "two.txt dir/a/",
-                    "one.txt dir/a/",
-                    "dir ",
-                    "a dir/",
-                    "four.txt dir/a/",
-                    "one.txt dir/a/",
-                    "three.txt dir/a/",
-                    "two.txt dir/a/",
-                    "b dir/",
-                    "eight.txt dir/b/",
-                    "five.txt dir/b/",
-                    "seven.txt dir/b/",
-                    "six.txt dir/b/",
-                    "editor dir/"
+                    "Files & Directories",
+                    "Symbols",
+                    "Threads",
+                    "Fetch"
                 ]
             );
         });
@@ -602,8 +1441,264 @@ mod tests {
         cx.run_until_parked();
 
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@four.txt](@file:dir/a/four.txt) ");
+            assert_eq!(editor.text(cx), "Lorem @file ");
+            assert!(editor.has_visible_completions_menu());
         });
+
+        cx.simulate_input("one");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem @file one");
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(current_completion_labels(editor), vec!["one.txt dir/a/"]);
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert!(editor.has_visible_completions_menu());
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt) ");
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        let contents = cx
+            .update(|window, cx| {
+                mention_set.lock().contents(
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        assert_eq!(contents.len(), 1);
+        assert_eq!(contents[0].content, "1");
+        assert_eq!(
+            contents[0].uri.to_uri().to_string(),
+            "file:///dir/a/one.txt"
+        );
+
+        cx.simulate_input(" ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt)  ");
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        cx.simulate_input("Ipsum ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum ",
+            );
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        cx.simulate_input("@file ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum @file ",
+            );
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        let contents = cx
+            .update(|window, cx| {
+                mention_set.lock().contents(
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        assert_eq!(contents.len(), 2);
+        let new_mention = contents
+            .iter()
+            .find(|mention| mention.uri.to_uri().to_string() == "file:///dir/b/eight.txt")
+            .unwrap();
+        assert_eq!(new_mention.content, "8");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) "
+            );
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![
+                    Point::new(0, 6)..Point::new(0, 39),
+                    Point::new(0, 47)..Point::new(0, 84)
+                ]
+            );
+        });
+
+        let plain_text_language = Arc::new(language::Language::new(
+            language::LanguageConfig {
+                name: "Plain Text".into(),
+                matcher: language::LanguageMatcher {
+                    path_suffixes: vec!["txt".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            None,
+        ));
+
+        // Register the language and fake LSP
+        let language_registry = project.read_with(&cx, |project, _| project.languages().clone());
+        language_registry.add(plain_text_language);
+
+        let mut fake_language_servers = language_registry.register_fake_lsp(
+            "Plain Text",
+            language::FakeLspAdapter {
+                capabilities: lsp::ServerCapabilities {
+                    workspace_symbol_provider: Some(lsp::OneOf::Left(true)),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        );
+
+        // Open the buffer to trigger LSP initialization
+        let buffer = project
+            .update(&mut cx, |project, cx| {
+                project.open_local_buffer(path!("/dir/a/one.txt"), cx)
+            })
+            .await
+            .unwrap();
+
+        // Register the buffer with language servers
+        let _handle = project.update(&mut cx, |project, cx| {
+            project.register_buffer_with_language_servers(&buffer, cx)
+        });
+
+        cx.run_until_parked();
+
+        let fake_language_server = fake_language_servers.next().await.unwrap();
+        fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
+            |_, _| async move {
+                Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
+                    #[allow(deprecated)]
+                    lsp::SymbolInformation {
+                        name: "MySymbol".into(),
+                        location: lsp::Location {
+                            uri: lsp::Url::from_file_path(path!("/dir/a/one.txt")).unwrap(),
+                            range: lsp::Range::new(
+                                lsp::Position::new(0, 0),
+                                lsp::Position::new(0, 1),
+                            ),
+                        },
+                        kind: lsp::SymbolKind::CONSTANT,
+                        tags: None,
+                        container_name: None,
+                        deprecated: None,
+                    },
+                ])))
+            },
+        );
+
+        cx.simulate_input("@symbol ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) @symbol "
+            );
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(
+                current_completion_labels(editor),
+                &[
+                    "MySymbol",
+                ]
+            );
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        let contents = cx
+            .update(|window, cx| {
+                mention_set.lock().contents(
+                    project.clone(),
+                    thread_store,
+                    text_thread_store,
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        assert_eq!(contents.len(), 3);
+        let new_mention = contents
+            .iter()
+            .find(|mention| {
+                mention.uri.to_uri().to_string() == "file:///dir/a/one.txt?symbol=MySymbol#L1:1"
+            })
+            .unwrap();
+        assert_eq!(new_mention.content, "1");
+
+        cx.run_until_parked();
+
+        editor.read_with(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) [@MySymbol](file:///dir/a/one.txt?symbol=MySymbol#L1:1) "
+            );
+        });
+    }
+
+    fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
+        let snapshot = editor.buffer().read(cx).snapshot(cx);
+        editor.display_map.update(cx, |display_map, cx| {
+            display_map
+                .snapshot(cx)
+                .folds_in_range(0..snapshot.len())
+                .map(|fold| fold.range.to_point(&snapshot))
+                .collect()
+        })
     }
 
     fn current_completion_labels(editor: &Editor) -> Vec<String> {
diff --git a/crates/agent_ui/src/acp/message_history.rs b/crates/agent_ui/src/acp/message_history.rs
index c6106c7578..c8280573a0 100644
--- a/crates/agent_ui/src/acp/message_history.rs
+++ b/crates/agent_ui/src/acp/message_history.rs
@@ -45,12 +45,8 @@ impl<T> MessageHistory<T> {
             None
         })
     }
-
-    #[cfg(test)]
-    pub fn items(&self) -> &[T] {
-        &self.items
-    }
 }
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 0b3ace1baf..3aefae7265 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4,15 +4,17 @@ use acp_thread::{
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
+use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol as acp;
 use agent_servers::AgentServer;
 use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use collections::{HashMap, HashSet};
+use editor::scroll::Autoscroll;
 use editor::{
     AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorMode,
-    EditorStyle, MinimapVisibility, MultiBuffer, PathKey,
+    EditorStyle, MinimapVisibility, MultiBuffer, PathKey, SelectionEffects,
 };
 use file_icons::FileIcons;
 use gpui::{
@@ -27,8 +29,10 @@ use language::{Buffer, Language};
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use parking_lot::Mutex;
 use project::{CompletionIntent, Project};
+use prompt_store::PromptId;
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
+use std::fmt::Write as _;
 use std::path::PathBuf;
 use std::{
     cell::RefCell, collections::BTreeMap, path::Path, process::ExitStatus, rc::Rc, sync::Arc,
@@ -44,6 +48,7 @@ use ui::{
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
 use zed_actions::agent::{Chat, NextHistoryMessage, PreviousHistoryMessage, ToggleModelSelector};
+use zed_actions::assistant::OpenRulesLibrary;
 
 use crate::acp::AcpModelSelectorPopover;
 use crate::acp::completion_provider::{ContextPickerCompletionProvider, MentionSet};
@@ -61,6 +66,8 @@ pub struct AcpThreadView {
     agent: Rc<dyn AgentServer>,
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
+    thread_store: Entity<ThreadStore>,
+    text_thread_store: Entity<TextThreadStore>,
     thread_state: ThreadState,
     diff_editors: HashMap<EntityId, Entity<Editor>>,
     terminal_views: HashMap<EntityId, Entity<TerminalView>>,
@@ -108,6 +115,8 @@ impl AcpThreadView {
         agent: Rc<dyn AgentServer>,
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
+        thread_store: Entity<ThreadStore>,
+        text_thread_store: Entity<TextThreadStore>,
         message_history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
         min_lines: usize,
         max_lines: Option<usize>,
@@ -145,6 +154,8 @@ impl AcpThreadView {
             editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
                 mention_set.clone(),
                 workspace.clone(),
+                thread_store.downgrade(),
+                text_thread_store.downgrade(),
                 cx.weak_entity(),
             ))));
             editor.set_context_menu_options(ContextMenuOptions {
@@ -188,6 +199,8 @@ impl AcpThreadView {
             agent: agent.clone(),
             workspace: workspace.clone(),
             project: project.clone(),
+            thread_store,
+            text_thread_store,
             thread_state: Self::initial_state(agent, workspace, project, window, cx),
             message_editor,
             model_selector: None,
@@ -401,7 +414,13 @@ impl AcpThreadView {
         let mut chunks: Vec<acp::ContentBlock> = Vec::new();
         let project = self.project.clone();
 
-        let contents = self.mention_set.lock().contents(project, cx);
+        let thread_store = self.thread_store.clone();
+        let text_thread_store = self.text_thread_store.clone();
+
+        let contents =
+            self.mention_set
+                .lock()
+                .contents(project, thread_store, text_thread_store, window, cx);
 
         cx.spawn_in(window, async move |this, cx| {
             let contents = match contents.await {
@@ -439,7 +458,7 @@ impl AcpThreadView {
                                         acp::TextResourceContents {
                                             mime_type: None,
                                             text: mention.content.clone(),
-                                            uri: mention.uri.to_uri(),
+                                            uri: mention.uri.to_uri().to_string(),
                                         },
                                     ),
                                 }));
@@ -614,8 +633,7 @@ impl AcpThreadView {
                     let path = PathBuf::from(&resource.uri);
                     let project_path = project.read(cx).project_path_for_absolute_path(&path, cx);
                     let start = text.len();
-                    let content = MentionUri::File(path).to_uri();
-                    text.push_str(&content);
+                    let _ = write!(&mut text, "{}", MentionUri::File(path).to_uri());
                     let end = text.len();
                     if let Some(project_path) = project_path {
                         let filename: SharedString = project_path
@@ -663,7 +681,9 @@ impl AcpThreadView {
                 );
 
                 if let Some(crease_id) = crease_id {
-                    mention_set.lock().insert(crease_id, project_path);
+                    mention_set
+                        .lock()
+                        .insert(crease_id, MentionUri::File(project_path));
                 }
             }
         }
@@ -2698,9 +2718,72 @@ impl AcpThreadView {
                             .detach_and_log_err(cx);
                     }
                 }
-                _ => {
-                    // TODO
-                    unimplemented!()
+                MentionUri::Symbol {
+                    path, line_range, ..
+                }
+                | MentionUri::Selection { path, line_range } => {
+                    let project = workspace.project();
+                    let Some((path, _)) = project.update(cx, |project, cx| {
+                        let path = project.find_project_path(path, cx)?;
+                        let entry = project.entry_for_path(&path, cx)?;
+                        Some((path, entry))
+                    }) else {
+                        return;
+                    };
+
+                    let item = workspace.open_path(path, None, true, window, cx);
+                    window
+                        .spawn(cx, async move |cx| {
+                            let Some(editor) = item.await?.downcast::<Editor>() else {
+                                return Ok(());
+                            };
+                            let range =
+                                Point::new(line_range.start, 0)..Point::new(line_range.start, 0);
+                            editor
+                                .update_in(cx, |editor, window, cx| {
+                                    editor.change_selections(
+                                        SelectionEffects::scroll(Autoscroll::center()),
+                                        window,
+                                        cx,
+                                        |s| s.select_ranges(vec![range]),
+                                    );
+                                })
+                                .ok();
+                            anyhow::Ok(())
+                        })
+                        .detach_and_log_err(cx);
+                }
+                MentionUri::Thread { id, .. } => {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        panel.update(cx, |panel, cx| {
+                            panel
+                                .open_thread_by_id(&id, window, cx)
+                                .detach_and_log_err(cx)
+                        });
+                    }
+                }
+                MentionUri::TextThread { path, .. } => {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        panel.update(cx, |panel, cx| {
+                            panel
+                                .open_saved_prompt_editor(path.as_path().into(), window, cx)
+                                .detach_and_log_err(cx);
+                        });
+                    }
+                }
+                MentionUri::Rule { id, .. } => {
+                    let PromptId::User { uuid } = id else {
+                        return;
+                    };
+                    window.dispatch_action(
+                        Box::new(OpenRulesLibrary {
+                            prompt_to_select: Some(uuid.0),
+                        }),
+                        cx,
+                    )
+                }
+                MentionUri::Fetch { url } => {
+                    cx.open_url(url.as_str());
                 }
             })
         } else {
@@ -3090,7 +3173,7 @@ impl AcpThreadView {
                 .unwrap_or(path.path.as_os_str())
                 .display()
                 .to_string();
-            let completion = ContextPickerCompletionProvider::completion_for_path(
+            let Some(completion) = ContextPickerCompletionProvider::completion_for_path(
                 path,
                 &path_prefix,
                 false,
@@ -3101,7 +3184,9 @@ impl AcpThreadView {
                 self.mention_set.clone(),
                 self.project.clone(),
                 cx,
-            );
+            ) else {
+                continue;
+            };
 
             self.message_editor.update(cx, |message_editor, cx| {
                 message_editor.edit(
@@ -3431,17 +3516,14 @@ fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 
 #[cfg(test)]
 mod tests {
+    use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol::SessionId;
     use editor::EditorSettings;
     use fs::FakeFs;
     use futures::future::try_join_all;
     use gpui::{SemanticVersion, TestAppContext, VisualTestContext};
-    use lsp::{CompletionContext, CompletionTriggerKind};
-    use project::CompletionIntent;
     use rand::Rng;
-    use serde_json::json;
     use settings::SettingsStore;
-    use util::path;
 
     use super::*;
 
@@ -3554,109 +3636,6 @@ mod tests {
         );
     }
 
-    #[gpui::test]
-    async fn test_crease_removal(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-        let agent = StubAgentServer::default();
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpThreadView::new(
-                    Rc::new(agent),
-                    workspace.downgrade(),
-                    project,
-                    Rc::new(RefCell::new(MessageHistory::default())),
-                    1,
-                    None,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        let excerpt_id = message_editor.update(cx, |editor, cx| {
-            editor
-                .buffer()
-                .read(cx)
-                .excerpt_ids()
-                .into_iter()
-                .next()
-                .unwrap()
-        });
-        let completions = message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello @", window, cx);
-            let buffer = editor.buffer().read(cx).as_singleton().unwrap();
-            let completion_provider = editor.completion_provider().unwrap();
-            completion_provider.completions(
-                excerpt_id,
-                &buffer,
-                Anchor::MAX,
-                CompletionContext {
-                    trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
-                    trigger_character: Some("@".into()),
-                },
-                window,
-                cx,
-            )
-        });
-        let [_, completion]: [_; 2] = completions
-            .await
-            .unwrap()
-            .into_iter()
-            .flat_map(|response| response.completions)
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-
-        message_editor.update_in(cx, |editor, window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let start = snapshot
-                .anchor_in_excerpt(excerpt_id, completion.replace_range.start)
-                .unwrap();
-            let end = snapshot
-                .anchor_in_excerpt(excerpt_id, completion.replace_range.end)
-                .unwrap();
-            editor.edit([(start..end, completion.new_text)], cx);
-            (completion.confirm.unwrap())(CompletionIntent::Complete, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Backspace over the inserted crease (and the following space).
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.backspace(&Default::default(), window, cx);
-            editor.backspace(&Default::default(), window, cx);
-        });
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let content = thread_view.update_in(cx, |thread_view, _window, _cx| {
-            thread_view
-                .message_history
-                .borrow()
-                .items()
-                .iter()
-                .flatten()
-                .cloned()
-                .collect::<Vec<_>>()
-        });
-
-        // We don't send a resource link for the deleted crease.
-        pretty_assertions::assert_matches!(content.as_slice(), [acp::ContentBlock::Text { .. }]);
-    }
-
     async fn setup_thread_view(
         agent: impl AgentServer + 'static,
         cx: &mut TestAppContext,
@@ -3666,12 +3645,19 @@ mod tests {
         let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
+        let thread_store =
+            cx.update(|_window, cx| cx.new(|cx| ThreadStore::fake(project.clone(), cx)));
+        let text_thread_store =
+            cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
+
         let thread_view = cx.update(|window, cx| {
             cx.new(|cx| {
                 AcpThreadView::new(
                     Rc::new(agent),
                     workspace.downgrade(),
                     project,
+                    thread_store.clone(),
+                    text_thread_store.clone(),
                     Rc::new(RefCell::new(MessageHistory::default())),
                     1,
                     None,
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index a641d62296..9aeb7867ac 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -973,6 +973,9 @@ impl AgentPanel {
             agent: crate::ExternalAgent,
         }
 
+        let thread_store = self.thread_store.clone();
+        let text_thread_store = self.context_store.clone();
+
         cx.spawn_in(window, async move |this, cx| {
             let server: Rc<dyn AgentServer> = match agent_choice {
                 Some(agent) => {
@@ -1011,6 +1014,8 @@ impl AgentPanel {
                         server,
                         workspace.clone(),
                         project,
+                        thread_store.clone(),
+                        text_thread_store.clone(),
                         message_history,
                         MIN_EDITOR_LINES,
                         Some(MAX_EDITOR_LINES),
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 58f11313e6..7dc00bfae2 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -1,15 +1,16 @@
 mod completion_provider;
-mod fetch_context_picker;
+pub(crate) mod fetch_context_picker;
 pub(crate) mod file_context_picker;
-mod rules_context_picker;
-mod symbol_context_picker;
-mod thread_context_picker;
+pub(crate) mod rules_context_picker;
+pub(crate) mod symbol_context_picker;
+pub(crate) mod thread_context_picker;
 
 use std::ops::Range;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use anyhow::{Result, anyhow};
+use collections::HashSet;
 pub use completion_provider::ContextPickerCompletionProvider;
 use editor::display_map::{Crease, CreaseId, CreaseMetadata, FoldId};
 use editor::{Anchor, AnchorRangeExt as _, Editor, ExcerptId, FoldPlaceholder, ToOffset};
@@ -45,7 +46,7 @@ use agent::{
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum ContextPickerEntry {
+pub(crate) enum ContextPickerEntry {
     Mode(ContextPickerMode),
     Action(ContextPickerAction),
 }
@@ -74,7 +75,7 @@ impl ContextPickerEntry {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum ContextPickerMode {
+pub(crate) enum ContextPickerMode {
     File,
     Symbol,
     Fetch,
@@ -83,7 +84,7 @@ enum ContextPickerMode {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum ContextPickerAction {
+pub(crate) enum ContextPickerAction {
     AddSelections,
 }
 
@@ -531,7 +532,7 @@ impl ContextPicker {
             return vec![];
         };
 
-        recent_context_picker_entries(
+        recent_context_picker_entries_with_store(
             context_store,
             self.thread_store.clone(),
             self.text_thread_store.clone(),
@@ -585,7 +586,8 @@ impl Render for ContextPicker {
             })
     }
 }
-enum RecentEntry {
+
+pub(crate) enum RecentEntry {
     File {
         project_path: ProjectPath,
         path_prefix: Arc<str>,
@@ -593,7 +595,7 @@ enum RecentEntry {
     Thread(ThreadContextEntry),
 }
 
-fn available_context_picker_entries(
+pub(crate) fn available_context_picker_entries(
     prompt_store: &Option<Entity<PromptStore>>,
     thread_store: &Option<WeakEntity<ThreadStore>>,
     workspace: &Entity<Workspace>,
@@ -630,24 +632,56 @@ fn available_context_picker_entries(
     entries
 }
 
-fn recent_context_picker_entries(
+fn recent_context_picker_entries_with_store(
     context_store: Entity<ContextStore>,
     thread_store: Option<WeakEntity<ThreadStore>>,
     text_thread_store: Option<WeakEntity<TextThreadStore>>,
     workspace: Entity<Workspace>,
     exclude_path: Option<ProjectPath>,
     cx: &App,
+) -> Vec<RecentEntry> {
+    let project = workspace.read(cx).project();
+
+    let mut exclude_paths = context_store.read(cx).file_paths(cx);
+    exclude_paths.extend(exclude_path);
+
+    let exclude_paths = exclude_paths
+        .into_iter()
+        .filter_map(|project_path| project.read(cx).absolute_path(&project_path, cx))
+        .collect();
+
+    let exclude_threads = context_store.read(cx).thread_ids();
+
+    recent_context_picker_entries(
+        thread_store,
+        text_thread_store,
+        workspace,
+        &exclude_paths,
+        exclude_threads,
+        cx,
+    )
+}
+
+pub(crate) fn recent_context_picker_entries(
+    thread_store: Option<WeakEntity<ThreadStore>>,
+    text_thread_store: Option<WeakEntity<TextThreadStore>>,
+    workspace: Entity<Workspace>,
+    exclude_paths: &HashSet<PathBuf>,
+    exclude_threads: &HashSet<ThreadId>,
+    cx: &App,
 ) -> Vec<RecentEntry> {
     let mut recent = Vec::with_capacity(6);
-    let mut current_files = context_store.read(cx).file_paths(cx);
-    current_files.extend(exclude_path);
     let workspace = workspace.read(cx);
     let project = workspace.project().read(cx);
 
     recent.extend(
         workspace
             .recent_navigation_history_iter(cx)
-            .filter(|(path, _)| !current_files.contains(path))
+            .filter(|(_, abs_path)| {
+                abs_path
+                    .as_ref()
+                    .map_or(true, |path| !exclude_paths.contains(path.as_path()))
+            })
             .take(4)
             .filter_map(|(project_path, _)| {
                 project
@@ -659,8 +693,6 @@ fn recent_context_picker_entries(
             }),
     );
 
-    let current_threads = context_store.read(cx).thread_ids();
-
     let active_thread_id = workspace
         .panel::<AgentPanel>(cx)
         .and_then(|panel| Some(panel.read(cx).active_thread(cx)?.read(cx).id()));
@@ -672,7 +704,7 @@ fn recent_context_picker_entries(
         let mut threads = unordered_thread_entries(thread_store, text_thread_store, cx)
             .filter(|(_, thread)| match thread {
                 ThreadContextEntry::Thread { id, .. } => {
-                    Some(id) != active_thread_id && !current_threads.contains(id)
+                    Some(id) != active_thread_id && !exclude_threads.contains(id)
                 }
                 ThreadContextEntry::Context { .. } => true,
             })
@@ -710,7 +742,7 @@ fn add_selections_as_context(
     })
 }
 
-fn selection_ranges(
+pub(crate) fn selection_ranges(
     workspace: &Entity<Workspace>,
     cx: &mut App,
 ) -> Vec<(Entity<Buffer>, Range<text::Anchor>)> {
diff --git a/crates/agent_ui/src/context_picker/completion_provider.rs b/crates/agent_ui/src/context_picker/completion_provider.rs
index 8123b3437d..962c0df03d 100644
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -35,7 +35,7 @@ use super::symbol_context_picker::search_symbols;
 use super::thread_context_picker::{ThreadContextEntry, ThreadMatch, search_threads};
 use super::{
     ContextPickerAction, ContextPickerEntry, ContextPickerMode, MentionLink, RecentEntry,
-    available_context_picker_entries, recent_context_picker_entries, selection_ranges,
+    available_context_picker_entries, recent_context_picker_entries_with_store, selection_ranges,
 };
 use crate::message_editor::ContextCreasesAddon;
 
@@ -787,7 +787,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             .and_then(|b| b.read(cx).file())
             .map(|file| ProjectPath::from_file(file.as_ref(), cx));
 
-        let recent_entries = recent_context_picker_entries(
+        let recent_entries = recent_context_picker_entries_with_store(
             context_store.clone(),
             thread_store.clone(),
             text_thread_store.clone(),
diff --git a/crates/assistant_context/Cargo.toml b/crates/assistant_context/Cargo.toml
index 8f5ff98790..45c0072418 100644
--- a/crates/assistant_context/Cargo.toml
+++ b/crates/assistant_context/Cargo.toml
@@ -11,6 +11,9 @@ workspace = true
 [lib]
 path = "src/assistant_context.rs"
 
+[features]
+test-support = []
+
 [dependencies]
 agent_settings.workspace = true
 anyhow.workspace = true
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index 3090a7b234..622d8867a7 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -138,6 +138,27 @@ impl ContextStore {
         })
     }
 
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn fake(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
+        Self {
+            contexts: Default::default(),
+            contexts_metadata: Default::default(),
+            context_server_slash_command_ids: Default::default(),
+            host_contexts: Default::default(),
+            fs: project.read(cx).fs().clone(),
+            languages: project.read(cx).languages().clone(),
+            slash_commands: Arc::default(),
+            telemetry: project.read(cx).client().telemetry().clone(),
+            _watch_updates: Task::ready(None),
+            client: project.read(cx).client(),
+            project,
+            project_is_shared: false,
+            client_subscription: None,
+            _project_subscriptions: Default::default(),
+            prompt_builder: Arc::new(PromptBuilder::new(None).unwrap()),
+        }
+    }
+
     async fn handle_advertise_contexts(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::AdvertiseContexts>,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 8a9398e71f..c77262143d 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -12176,6 +12176,8 @@ impl Editor {
         let clipboard_text = Cow::Borrowed(text);
 
         self.transact(window, cx, |this, window, cx| {
+            let had_active_edit_prediction = this.has_active_edit_prediction();
+
             if let Some(mut clipboard_selections) = clipboard_selections {
                 let old_selections = this.selections.all::<usize>(cx);
                 let all_selections_were_entire_line =
@@ -12248,6 +12250,11 @@ impl Editor {
             } else {
                 this.insert(&clipboard_text, window, cx);
             }
+
+            let trigger_in_words =
+                this.show_edit_predictions_in_menu() || !had_active_edit_prediction;
+
+            this.trigger_completion_on_input(&text, trigger_in_words, window, cx);
         });
     }
 
diff --git a/crates/prompt_store/src/prompt_store.rs b/crates/prompt_store/src/prompt_store.rs
index f9cb26ed9a..06a65b97cd 100644
--- a/crates/prompt_store/src/prompt_store.rs
+++ b/crates/prompt_store/src/prompt_store.rs
@@ -90,6 +90,15 @@ impl From<Uuid> for UserPromptId {
     }
 }
 
+impl std::fmt::Display for PromptId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            PromptId::User { uuid } => write!(f, "{}", uuid.0),
+            PromptId::EditWorkflow => write!(f, "Edit workflow"),
+        }
+    }
+}
+
 pub struct PromptStore {
     env: heed::Env,
     metadata_cache: RwLock<MetadataCache>,

From 9be44517cb5db0a63f7d9727d93c034fb8fdcdc6 Mon Sep 17 00:00:00 2001
From: Alvaro Parker <64918109+AlvaroParker@users.noreply.github.com>
Date: Wed, 13 Aug 2025 16:24:13 -0400
Subject: [PATCH 008/823] Remove Services menu on non-macOS systems (#36142)

Closes #ISSUE

<img width="420" height="379" alt="image"
src="https://github.com/user-attachments/assets/7125c504-508f-4eb1-b0c3-31830598c4a7"
/>


Release Notes:

- Remove Services menu on non-macOS systems which was causing an empty
menu item being rendered
---
 crates/zed/src/zed/app_menus.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 9df55a2fb1..6c7ab0b374 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -35,6 +35,7 @@ pub fn app_menus() -> Vec<Menu> {
                     ],
                 }),
                 MenuItem::separator(),
+                #[cfg(target_os = "macos")]
                 MenuItem::os_submenu("Services", gpui::SystemMenuType::Services),
                 MenuItem::separator(),
                 MenuItem::action("Extensions", zed_actions::Extensions::default()),

From a6e2e0d24a60ea852b9b5262cd16e7efd41ba524 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 13 Aug 2025 22:31:28 +0200
Subject: [PATCH 009/823] onboarding: Fix minimap typo on editing page (#36143)

This PR fixes a small typo on the onboarding editing page where it
should be "Minimap" instead of "Mini Map"

Release Notes:

- N/A
---
 crates/onboarding/src/editing_page.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/onboarding/src/editing_page.rs b/crates/onboarding/src/editing_page.rs
index aa7f4eee74..d941a0315a 100644
--- a/crates/onboarding/src/editing_page.rs
+++ b/crates/onboarding/src/editing_page.rs
@@ -721,7 +721,7 @@ fn render_popular_settings_section(
                 .items_start()
                 .justify_between()
                 .child(
-                    v_flex().child(Label::new("Mini Map")).child(
+                    v_flex().child(Label::new("Minimap")).child(
                         Label::new("See a high-level overview of your source code.")
                             .color(Color::Muted),
                     ),

From 1d2eaf210a15bc6c67de60696caaf08f4be9c1c6 Mon Sep 17 00:00:00 2001
From: smit <heysmitbarmase@gmail.com>
Date: Thu, 14 Aug 2025 02:48:20 +0530
Subject: [PATCH 010/823] editor: Fix first `cmd-left` target for cursor in
 leading whitespace (#36145)

Closes #35805

If the cursor is between column 0 and the indent size, pressing
`cmd-left` jumps to the indent. Pressing it again moves to the true
column 0. Further presses toggle between indent and column 0.

This PR changes the first `cmd-left` to go to column 0 instead of
indent. Toggling between is unaffected.

Release Notes:

- Fixed issue where pressing `cmd-left` with the cursor in the leading
spaces moved to the start of the text first. It now goes to the
beginning of the line first, then the start of the text.
---
 crates/editor/src/editor_tests.rs | 45 +++++++++++++++++++++++++++++++
 crates/editor/src/movement.rs     |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 0d2ecec8f2..4421869703 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -1901,6 +1901,51 @@ fn test_beginning_of_line_stop_at_indent(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+fn test_beginning_of_line_with_cursor_between_line_start_and_indent(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let move_to_beg = MoveToBeginningOfLine {
+        stop_at_soft_wraps: true,
+        stop_at_indent: true,
+    };
+
+    let editor = cx.add_window(|window, cx| {
+        let buffer = MultiBuffer::build_simple("    hello\nworld", cx);
+        build_editor(buffer, window, cx)
+    });
+
+    _ = editor.update(cx, |editor, window, cx| {
+        // test cursor between line_start and indent_start
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(0), 3)..DisplayPoint::new(DisplayRow(0), 3)
+            ]);
+        });
+
+        // cursor should move to line_start
+        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
+        assert_eq!(
+            editor.selections.display_ranges(cx),
+            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
+        );
+
+        // cursor should move to indent_start
+        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
+        assert_eq!(
+            editor.selections.display_ranges(cx),
+            &[DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 4)]
+        );
+
+        // cursor should move to back to line_start
+        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
+        assert_eq!(
+            editor.selections.display_ranges(cx),
+            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
+        );
+    });
+}
+
 #[gpui::test]
 fn test_prev_next_word_boundary(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index a8850984a1..fdda0e82bc 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -230,7 +230,7 @@ pub fn indented_line_beginning(
     if stop_at_soft_boundaries && soft_line_start > indent_start && display_point != soft_line_start
     {
         soft_line_start
-    } else if stop_at_indent && display_point != indent_start {
+    } else if stop_at_indent && (display_point > indent_start || display_point == line_start) {
         indent_start
     } else {
         line_start

From 8452532c8f0f0dc93afc8c75ebd1683c93e6118f Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 13 Aug 2025 18:34:53 -0300
Subject: [PATCH 011/823] agent2: Iterate on "new thread" selector in the
 toolbar (#36144)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 61 +++++++++++-------------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 9aeb7867ac..e47cbe3714 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -67,8 +67,8 @@ use theme::ThemeSettings;
 use time::UtcOffset;
 use ui::utils::WithRemSize;
 use ui::{
-    Banner, ButtonLike, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding,
-    PopoverMenu, PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
+    Banner, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding, PopoverMenu,
+    PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -1996,9 +1996,7 @@ impl AgentPanel {
 
         PopoverMenu::new("agent-nav-menu")
             .trigger_with_tooltip(
-                IconButton::new("agent-nav-menu", icon)
-                    .icon_size(IconSize::Small)
-                    .style(ui::ButtonStyle::Subtle),
+                IconButton::new("agent-nav-menu", icon).icon_size(IconSize::Small),
                 {
                     let focus_handle = focus_handle.clone();
                     move |window, cx| {
@@ -2135,9 +2133,10 @@ impl AgentPanel {
                     .pl_1()
                     .gap_1()
                     .child(match &self.active_view {
-                        ActiveView::History | ActiveView::Configuration => {
-                            self.render_toolbar_back_button(cx).into_any_element()
-                        }
+                        ActiveView::History | ActiveView::Configuration => div()
+                            .pl(DynamicSpacing::Base04.rems(cx))
+                            .child(self.render_toolbar_back_button(cx))
+                            .into_any_element(),
                         _ => self
                             .render_recent_entries_menu(IconName::MenuAlt, cx)
                             .into_any_element(),
@@ -2175,33 +2174,7 @@ impl AgentPanel {
 
         let new_thread_menu = PopoverMenu::new("new_thread_menu")
             .trigger_with_tooltip(
-                ButtonLike::new("new_thread_menu_btn").child(
-                    h_flex()
-                        .group("agent-selector")
-                        .gap_1p5()
-                        .child(
-                            h_flex()
-                                .relative()
-                                .size_4()
-                                .justify_center()
-                                .child(
-                                    h_flex()
-                                        .group_hover("agent-selector", |s| s.invisible())
-                                        .child(
-                                            Icon::new(self.selected_agent.icon())
-                                                .color(Color::Muted),
-                                        ),
-                                )
-                                .child(
-                                    h_flex()
-                                        .absolute()
-                                        .invisible()
-                                        .group_hover("agent-selector", |s| s.visible())
-                                        .child(Icon::new(IconName::Plus)),
-                                ),
-                        )
-                        .child(Label::new(self.selected_agent.label())),
-                ),
+                IconButton::new("new_thread_menu_btn", IconName::Plus).icon_size(IconSize::Small),
                 {
                     let focus_handle = focus_handle.clone();
                     move |window, cx| {
@@ -2419,15 +2392,24 @@ impl AgentPanel {
                     .size_full()
                     .gap(DynamicSpacing::Base08.rems(cx))
                     .child(match &self.active_view {
-                        ActiveView::History | ActiveView::Configuration => {
-                            self.render_toolbar_back_button(cx).into_any_element()
-                        }
+                        ActiveView::History | ActiveView::Configuration => div()
+                            .pl(DynamicSpacing::Base04.rems(cx))
+                            .child(self.render_toolbar_back_button(cx))
+                            .into_any_element(),
                         _ => h_flex()
                             .h_full()
                             .px(DynamicSpacing::Base04.rems(cx))
                             .border_r_1()
                             .border_color(cx.theme().colors().border)
-                            .child(new_thread_menu)
+                            .child(
+                                h_flex()
+                                    .px_0p5()
+                                    .gap_1p5()
+                                    .child(
+                                        Icon::new(self.selected_agent.icon()).color(Color::Muted),
+                                    )
+                                    .child(Label::new(self.selected_agent.label())),
+                            )
                             .into_any_element(),
                     })
                     .child(self.render_title_view(window, cx)),
@@ -2445,6 +2427,7 @@ impl AgentPanel {
                             .pr(DynamicSpacing::Base06.rems(cx))
                             .border_l_1()
                             .border_color(cx.theme().colors().border)
+                            .child(new_thread_menu)
                             .child(self.render_recent_entries_menu(IconName::HistoryRerun, cx))
                             .child(self.render_panel_options_menu(window, cx)),
                     ),

From 09e90fb023cc136ad2a2fdefc692f6270345544a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 13 Aug 2025 14:45:34 -0700
Subject: [PATCH 012/823] Use trace log level for potentially high-volume vsync
 duration log (#36147)

This is an attempt to fix
https://github.com/zed-industries/zed/issues/36125

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/vsync.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/windows/vsync.rs b/crates/gpui/src/platform/windows/vsync.rs
index 09dbfd0231..6d09b0960f 100644
--- a/crates/gpui/src/platform/windows/vsync.rs
+++ b/crates/gpui/src/platform/windows/vsync.rs
@@ -99,7 +99,7 @@ impl VSyncProvider {
         // operation for the first call after the vsync thread becomes non-idle,
         // but it shouldn't happen often.
         if !wait_succeeded || elapsed < VSYNC_INTERVAL_THRESHOLD {
-            log::warn!("VSyncProvider::wait_for_vsync() took shorter than expected");
+            log::trace!("VSyncProvider::wait_for_vsync() took less time than expected");
             std::thread::sleep(self.interval);
         }
     }

From 665006c4144c35f8673bd342c56e8d39df8b9e17 Mon Sep 17 00:00:00 2001
From: Aleksei Gusev <aleksei.gusev@gmail.com>
Date: Thu, 14 Aug 2025 00:45:50 +0300
Subject: [PATCH 013/823] Move the cursor on search in Terminal if ViMode is
 active (#33305)

Currently, the terminal search function doesn't work well with ViMode.
It matches the search terms, scrolls the active match in the view, but
it doesn't move the cursor to the match, which makes it useless for
navigating the scrollback in vimode.

With this improvement, if a user activates ViMode before the search Zed
moves the cursor to the active search terms. So, when the search dialog
is dismissed the cursor is places on the latest active search term and
it's possible to navigate the scrollback via ViMode using this place as
the starting point.


https://github.com/user-attachments/assets/63325405-ed93-4bf8-a00f-28ded5511f31

Release Notes:

- Improved the search function in the terminal when ViMode is activated
---
 crates/terminal/src/terminal.rs           | 20 +++++++++++++++++---
 crates/terminal_view/src/terminal_view.rs |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index c3c6de9e53..86728cc11c 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -167,6 +167,7 @@ enum InternalEvent {
     // Vi mode events
     ToggleViMode,
     ViMotion(ViMotion),
+    MoveViCursorToAlacPoint(AlacPoint),
 }
 
 ///A translation struct for Alacritty to communicate with us from their event loop
@@ -972,6 +973,10 @@ impl Terminal {
                 term.scroll_to_point(*point);
                 self.refresh_hovered_word(window);
             }
+            InternalEvent::MoveViCursorToAlacPoint(point) => {
+                term.vi_goto_point(*point);
+                self.refresh_hovered_word(window);
+            }
             InternalEvent::ToggleViMode => {
                 self.vi_mode_enabled = !self.vi_mode_enabled;
                 term.toggle_vi_mode();
@@ -1100,12 +1105,21 @@ impl Terminal {
     pub fn activate_match(&mut self, index: usize) {
         if let Some(search_match) = self.matches.get(index).cloned() {
             self.set_selection(Some((make_selection(&search_match), *search_match.end())));
-
-            self.events
-                .push_back(InternalEvent::ScrollToAlacPoint(*search_match.start()));
+            if self.vi_mode_enabled {
+                self.events
+                    .push_back(InternalEvent::MoveViCursorToAlacPoint(*search_match.end()));
+            } else {
+                self.events
+                    .push_back(InternalEvent::ScrollToAlacPoint(*search_match.start()));
+            }
         }
     }
 
+    pub fn clear_matches(&mut self) {
+        self.matches.clear();
+        self.set_selection(None);
+    }
+
     pub fn select_matches(&mut self, matches: &[RangeInclusive<AlacPoint>]) {
         let matches_to_select = self
             .matches
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 0ec5f816d5..219238496c 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1869,7 +1869,7 @@ impl SearchableItem for TerminalView {
 
     /// Clear stored matches
     fn clear_matches(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.terminal().update(cx, |term, _| term.matches.clear())
+        self.terminal().update(cx, |term, _| term.clear_matches())
     }
 
     /// Store matches returned from find_matches somewhere for rendering

From 293992f5b1f4456a6493dec9e315943aad3f7054 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 13 Aug 2025 15:01:00 -0700
Subject: [PATCH 014/823] In auto-update-helper, fix parsing of `--launch
 false` (#36148)

This fixes an issue introduced in
https://github.com/zed-industries/zed/pull/34303 where, after an
auto-update was downloaded, quitting Zed would always restart Zed.

Release Notes:

- N/A
---
 .../src/auto_update_helper.rs                 | 110 +++++++-----------
 1 file changed, 41 insertions(+), 69 deletions(-)

diff --git a/crates/auto_update_helper/src/auto_update_helper.rs b/crates/auto_update_helper/src/auto_update_helper.rs
index 2781176028..3aa57094d3 100644
--- a/crates/auto_update_helper/src/auto_update_helper.rs
+++ b/crates/auto_update_helper/src/auto_update_helper.rs
@@ -18,7 +18,7 @@ fn main() {}
 
 #[cfg(target_os = "windows")]
 mod windows_impl {
-    use std::path::Path;
+    use std::{borrow::Cow, path::Path};
 
     use super::dialog::create_dialog_window;
     use super::updater::perform_update;
@@ -37,9 +37,9 @@ mod windows_impl {
     pub(crate) const WM_JOB_UPDATED: u32 = WM_USER + 1;
     pub(crate) const WM_TERMINATE: u32 = WM_USER + 2;
 
-    #[derive(Debug)]
+    #[derive(Debug, Default)]
     struct Args {
-        launch: Option<bool>,
+        launch: bool,
     }
 
     pub(crate) fn run() -> Result<()> {
@@ -56,9 +56,9 @@ mod windows_impl {
         log::info!("======= Starting Zed update =======");
         let (tx, rx) = std::sync::mpsc::channel();
         let hwnd = create_dialog_window(rx)?.0 as isize;
-        let args = parse_args();
+        let args = parse_args(std::env::args().skip(1));
         std::thread::spawn(move || {
-            let result = perform_update(app_dir.as_path(), Some(hwnd), args.launch.unwrap_or(true));
+            let result = perform_update(app_dir.as_path(), Some(hwnd), args.launch);
             tx.send(result).ok();
             unsafe { PostMessageW(Some(HWND(hwnd as _)), WM_TERMINATE, WPARAM(0), LPARAM(0)) }.ok();
         });
@@ -83,39 +83,27 @@ mod windows_impl {
         Ok(())
     }
 
-    fn parse_args() -> Args {
-        let mut result = Args { launch: None };
-        if let Some(candidate) = std::env::args().nth(1) {
-            parse_single_arg(&candidate, &mut result);
+    fn parse_args(input: impl IntoIterator<Item = String>) -> Args {
+        let mut args: Args = Args { launch: true };
+
+        let mut input = input.into_iter();
+        if let Some(arg) = input.next() {
+            let launch_arg;
+
+            if arg == "--launch" {
+                launch_arg = input.next().map(Cow::Owned);
+            } else if let Some(rest) = arg.strip_prefix("--launch=") {
+                launch_arg = Some(Cow::Borrowed(rest));
+            } else {
+                launch_arg = None;
+            }
+
+            if launch_arg.as_deref() == Some("false") {
+                args.launch = false;
+            }
         }
 
-        result
-    }
-
-    fn parse_single_arg(arg: &str, result: &mut Args) {
-        let Some((key, value)) = arg.strip_prefix("--").and_then(|arg| arg.split_once('=')) else {
-            log::error!(
-                "Invalid argument format: '{}'. Expected format: --key=value",
-                arg
-            );
-            return;
-        };
-
-        match key {
-            "launch" => parse_launch_arg(value, &mut result.launch),
-            _ => log::error!("Unknown argument: --{}", key),
-        }
-    }
-
-    fn parse_launch_arg(value: &str, arg: &mut Option<bool>) {
-        match value {
-            "true" => *arg = Some(true),
-            "false" => *arg = Some(false),
-            _ => log::error!(
-                "Invalid value for --launch: '{}'. Expected 'true' or 'false'",
-                value
-            ),
-        }
+        args
     }
 
     pub(crate) fn show_error(mut content: String) {
@@ -135,44 +123,28 @@ mod windows_impl {
 
     #[cfg(test)]
     mod tests {
-        use crate::windows_impl::{Args, parse_launch_arg, parse_single_arg};
+        use crate::windows_impl::parse_args;
 
         #[test]
-        fn test_parse_launch_arg() {
-            let mut arg = None;
-            parse_launch_arg("true", &mut arg);
-            assert_eq!(arg, Some(true));
+        fn test_parse_args() {
+            // launch can be specified via two separate arguments
+            assert_eq!(parse_args(["--launch".into(), "true".into()]).launch, true);
+            assert_eq!(
+                parse_args(["--launch".into(), "false".into()]).launch,
+                false
+            );
 
-            let mut arg = None;
-            parse_launch_arg("false", &mut arg);
-            assert_eq!(arg, Some(false));
+            // launch can be specified via one single argument
+            assert_eq!(parse_args(["--launch=true".into()]).launch, true);
+            assert_eq!(parse_args(["--launch=false".into()]).launch, false);
 
-            let mut arg = None;
-            parse_launch_arg("invalid", &mut arg);
-            assert_eq!(arg, None);
-        }
+            // launch defaults to true on no arguments
+            assert_eq!(parse_args([]).launch, true);
 
-        #[test]
-        fn test_parse_single_arg() {
-            let mut args = Args { launch: None };
-            parse_single_arg("--launch=true", &mut args);
-            assert_eq!(args.launch, Some(true));
-
-            let mut args = Args { launch: None };
-            parse_single_arg("--launch=false", &mut args);
-            assert_eq!(args.launch, Some(false));
-
-            let mut args = Args { launch: None };
-            parse_single_arg("--launch=invalid", &mut args);
-            assert_eq!(args.launch, None);
-
-            let mut args = Args { launch: None };
-            parse_single_arg("--launch", &mut args);
-            assert_eq!(args.launch, None);
-
-            let mut args = Args { launch: None };
-            parse_single_arg("--unknown", &mut args);
-            assert_eq!(args.launch, None);
+            // launch defaults to true on invalid arguments
+            assert_eq!(parse_args(["--launch".into()]).launch, true);
+            assert_eq!(parse_args(["--launch=".into()]).launch, true);
+            assert_eq!(parse_args(["--launch=invalid".into()]).launch, true);
         }
     }
 }

From e67b2da20c387fb2a82fbf91c767279a2c6bad79 Mon Sep 17 00:00:00 2001
From: Tom Planche <tomplanche@proton.me>
Date: Thu, 14 Aug 2025 00:07:49 +0200
Subject: [PATCH 015/823] Make alphabetical sorting the default (#32315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow up of this pr: #25148

Release Notes:

- Improved file sorting.
As described in #20126, I was fed up with lexicographical file sorting
in the project panel. The current sorting behavior doesn't handle
numeric segments properly, leading to unintuitive ordering like
`file_1.rs`, `file_10.rs`, `file_2.rs`.


## Example Sorting Results
Using `lexicographical` (default):
```
.
├── file_01.rs
├── file_1.rs
├── file_10.rs
├── file_1025.rs
├── file_2.rs
```

Using alphabetical (natural) sorting:
```
.
├── file_1.rs
├── file_01.rs
├── file_2.rs
├── file_10.rs
├── file_1025.rs
```
---
 .../project_panel/src/project_panel_tests.rs  |  32 +-
 crates/util/src/paths.rs                      | 523 +++++++++++++++++-
 2 files changed, 520 insertions(+), 35 deletions(-)

diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index 6c62c8db93..de3316e357 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -740,9 +740,9 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
+            "        > [EDITOR: '']  <== selected",
             "        > 3",
             "        > 4",
-            "        > [EDITOR: '']  <== selected",
             "          a-different-filename.tar.gz",
             "    > C",
             "      .dockerignore",
@@ -765,10 +765,10 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
-            "        > 3",
-            "        > 4",
             "        > [PROCESSING: 'new-dir']",
-            "          a-different-filename.tar.gz  <== selected",
+            "        > 3  <== selected",
+            "        > 4",
+            "          a-different-filename.tar.gz",
             "    > C",
             "      .dockerignore",
         ]
@@ -782,10 +782,10 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
-            "        > 3",
+            "        > 3  <== selected",
             "        > 4",
             "        > new-dir",
-            "          a-different-filename.tar.gz  <== selected",
+            "          a-different-filename.tar.gz",
             "    > C",
             "      .dockerignore",
         ]
@@ -801,10 +801,10 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
-            "        > 3",
+            "        > [EDITOR: '3']  <== selected",
             "        > 4",
             "        > new-dir",
-            "          [EDITOR: 'a-different-filename.tar.gz']  <== selected",
+            "          a-different-filename.tar.gz",
             "    > C",
             "      .dockerignore",
         ]
@@ -819,10 +819,10 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
-            "        > 3",
+            "        > 3  <== selected",
             "        > 4",
             "        > new-dir",
-            "          a-different-filename.tar.gz  <== selected",
+            "          a-different-filename.tar.gz",
             "    > C",
             "      .dockerignore",
         ]
@@ -837,12 +837,12 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
-            "        > 3",
+            "        v 3",
+            "              [EDITOR: '']  <== selected",
+            "              Q",
             "        > 4",
             "        > new-dir",
-            "          [EDITOR: '']  <== selected",
             "          a-different-filename.tar.gz",
-            "    > C",
         ]
     );
     panel.update_in(cx, |panel, window, cx| {
@@ -863,12 +863,12 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
             "    > .git",
             "    > a",
             "    v b",
-            "        > 3",
+            "        v 3  <== selected",
+            "              Q",
             "        > 4",
             "        > new-dir",
-            "          a-different-filename.tar.gz  <== selected",
+            "          a-different-filename.tar.gz",
             "    > C",
-            "      .dockerignore",
         ]
     );
 }
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 585f2b08aa..211831125d 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -1,4 +1,7 @@
-use std::cmp;
+use globset::{Glob, GlobSet, GlobSetBuilder};
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
 use std::path::StripPrefixError;
 use std::sync::{Arc, OnceLock};
 use std::{
@@ -7,12 +10,6 @@ use std::{
     sync::LazyLock,
 };
 
-use globset::{Glob, GlobSet, GlobSetBuilder};
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-
-use crate::NumericPrefixWithSuffix;
-
 /// Returns the path to the user's home directory.
 pub fn home_dir() -> &'static PathBuf {
     static HOME_DIR: OnceLock<PathBuf> = OnceLock::new();
@@ -545,17 +542,172 @@ impl PathMatcher {
     }
 }
 
+/// Custom character comparison that prioritizes lowercase for same letters
+fn compare_chars(a: char, b: char) -> Ordering {
+    // First compare case-insensitive
+    match a.to_ascii_lowercase().cmp(&b.to_ascii_lowercase()) {
+        Ordering::Equal => {
+            // If same letter, prioritize lowercase (lowercase < uppercase)
+            match (a.is_ascii_lowercase(), b.is_ascii_lowercase()) {
+                (true, false) => Ordering::Less,    // lowercase comes first
+                (false, true) => Ordering::Greater, // uppercase comes after
+                _ => Ordering::Equal,               // both same case or both non-ascii
+            }
+        }
+        other => other,
+    }
+}
+
+/// Compares two sequences of consecutive digits for natural sorting.
+///
+/// This function is a core component of natural sorting that handles numeric comparison
+/// in a way that feels natural to humans. It extracts and compares consecutive digit
+/// sequences from two iterators, handling various cases like leading zeros and very large numbers.
+///
+/// # Behavior
+///
+/// The function implements the following comparison rules:
+/// 1. Different numeric values: Compares by actual numeric value (e.g., "2" < "10")
+/// 2. Leading zeros: When values are equal, longer sequence wins (e.g., "002" > "2")
+/// 3. Large numbers: Falls back to string comparison for numbers that would overflow u128
+///
+/// # Examples
+///
+/// ```text
+/// "1" vs "2"      -> Less       (different values)
+/// "2" vs "10"     -> Less       (numeric comparison)
+/// "002" vs "2"    -> Greater    (leading zeros)
+/// "10" vs "010"   -> Less       (leading zeros)
+/// "999..." vs "1000..." -> Less (large number comparison)
+/// ```
+///
+/// # Implementation Details
+///
+/// 1. Extracts consecutive digits into strings
+/// 2. Compares sequence lengths for leading zero handling
+/// 3. For equal lengths, compares digit by digit
+/// 4. For different lengths:
+///    - Attempts numeric comparison first (for numbers up to 2^128 - 1)
+///    - Falls back to string comparison if numbers would overflow
+///
+/// The function advances both iterators past their respective numeric sequences,
+/// regardless of the comparison result.
+fn compare_numeric_segments<I>(
+    a_iter: &mut std::iter::Peekable<I>,
+    b_iter: &mut std::iter::Peekable<I>,
+) -> Ordering
+where
+    I: Iterator<Item = char>,
+{
+    // Collect all consecutive digits into strings
+    let mut a_num_str = String::new();
+    let mut b_num_str = String::new();
+
+    while let Some(&c) = a_iter.peek() {
+        if !c.is_ascii_digit() {
+            break;
+        }
+
+        a_num_str.push(c);
+        a_iter.next();
+    }
+
+    while let Some(&c) = b_iter.peek() {
+        if !c.is_ascii_digit() {
+            break;
+        }
+
+        b_num_str.push(c);
+        b_iter.next();
+    }
+
+    // First compare lengths (handle leading zeros)
+    match a_num_str.len().cmp(&b_num_str.len()) {
+        Ordering::Equal => {
+            // Same length, compare digit by digit
+            match a_num_str.cmp(&b_num_str) {
+                Ordering::Equal => Ordering::Equal,
+                ordering => ordering,
+            }
+        }
+
+        // Different lengths but same value means leading zeros
+        ordering => {
+            // Try parsing as numbers first
+            if let (Ok(a_val), Ok(b_val)) = (a_num_str.parse::<u128>(), b_num_str.parse::<u128>()) {
+                match a_val.cmp(&b_val) {
+                    Ordering::Equal => ordering, // Same value, longer one is greater (leading zeros)
+                    ord => ord,
+                }
+            } else {
+                // If parsing fails (overflow), compare as strings
+                a_num_str.cmp(&b_num_str)
+            }
+        }
+    }
+}
+
+/// Performs natural sorting comparison between two strings.
+///
+/// Natural sorting is an ordering that handles numeric sequences in a way that matches human expectations.
+/// For example, "file2" comes before "file10" (unlike standard lexicographic sorting).
+///
+/// # Characteristics
+///
+/// * Case-sensitive with lowercase priority: When comparing same letters, lowercase comes before uppercase
+/// * Numbers are compared by numeric value, not character by character
+/// * Leading zeros affect ordering when numeric values are equal
+/// * Can handle numbers larger than u128::MAX (falls back to string comparison)
+///
+/// # Algorithm
+///
+/// The function works by:
+/// 1. Processing strings character by character
+/// 2. When encountering digits, treating consecutive digits as a single number
+/// 3. Comparing numbers by their numeric value rather than lexicographically
+/// 4. For non-numeric characters, using case-sensitive comparison with lowercase priority
+fn natural_sort(a: &str, b: &str) -> Ordering {
+    let mut a_iter = a.chars().peekable();
+    let mut b_iter = b.chars().peekable();
+
+    loop {
+        match (a_iter.peek(), b_iter.peek()) {
+            (None, None) => return Ordering::Equal,
+            (None, _) => return Ordering::Less,
+            (_, None) => return Ordering::Greater,
+            (Some(&a_char), Some(&b_char)) => {
+                if a_char.is_ascii_digit() && b_char.is_ascii_digit() {
+                    match compare_numeric_segments(&mut a_iter, &mut b_iter) {
+                        Ordering::Equal => continue,
+                        ordering => return ordering,
+                    }
+                } else {
+                    match compare_chars(a_char, b_char) {
+                        Ordering::Equal => {
+                            a_iter.next();
+                            b_iter.next();
+                        }
+                        ordering => return ordering,
+                    }
+                }
+            }
+        }
+    }
+}
+
 pub fn compare_paths(
     (path_a, a_is_file): (&Path, bool),
     (path_b, b_is_file): (&Path, bool),
-) -> cmp::Ordering {
+) -> Ordering {
     let mut components_a = path_a.components().peekable();
     let mut components_b = path_b.components().peekable();
+
     loop {
         match (components_a.next(), components_b.next()) {
             (Some(component_a), Some(component_b)) => {
                 let a_is_file = components_a.peek().is_none() && a_is_file;
                 let b_is_file = components_b.peek().is_none() && b_is_file;
+
                 let ordering = a_is_file.cmp(&b_is_file).then_with(|| {
                     let path_a = Path::new(component_a.as_os_str());
                     let path_string_a = if a_is_file {
@@ -564,9 +716,6 @@ pub fn compare_paths(
                         path_a.file_name()
                     }
                     .map(|s| s.to_string_lossy());
-                    let num_and_remainder_a = path_string_a
-                        .as_deref()
-                        .map(NumericPrefixWithSuffix::from_numeric_prefixed_str);
 
                     let path_b = Path::new(component_b.as_os_str());
                     let path_string_b = if b_is_file {
@@ -575,27 +724,32 @@ pub fn compare_paths(
                         path_b.file_name()
                     }
                     .map(|s| s.to_string_lossy());
-                    let num_and_remainder_b = path_string_b
-                        .as_deref()
-                        .map(NumericPrefixWithSuffix::from_numeric_prefixed_str);
 
-                    num_and_remainder_a.cmp(&num_and_remainder_b).then_with(|| {
+                    let compare_components = match (path_string_a, path_string_b) {
+                        (Some(a), Some(b)) => natural_sort(&a, &b),
+                        (Some(_), None) => Ordering::Greater,
+                        (None, Some(_)) => Ordering::Less,
+                        (None, None) => Ordering::Equal,
+                    };
+
+                    compare_components.then_with(|| {
                         if a_is_file && b_is_file {
                             let ext_a = path_a.extension().unwrap_or_default();
                             let ext_b = path_b.extension().unwrap_or_default();
                             ext_a.cmp(ext_b)
                         } else {
-                            cmp::Ordering::Equal
+                            Ordering::Equal
                         }
                     })
                 });
+
                 if !ordering.is_eq() {
                     return ordering;
                 }
             }
-            (Some(_), None) => break cmp::Ordering::Greater,
-            (None, Some(_)) => break cmp::Ordering::Less,
-            (None, None) => break cmp::Ordering::Equal,
+            (Some(_), None) => break Ordering::Greater,
+            (None, Some(_)) => break Ordering::Less,
+            (None, None) => break Ordering::Equal,
         }
     }
 }
@@ -1049,4 +1203,335 @@ mod tests {
             "C:\\Users\\someone\\test_file.rs"
         );
     }
+
+    #[test]
+    fn test_compare_numeric_segments() {
+        // Helper function to create peekable iterators and test
+        fn compare(a: &str, b: &str) -> Ordering {
+            let mut a_iter = a.chars().peekable();
+            let mut b_iter = b.chars().peekable();
+
+            let result = compare_numeric_segments(&mut a_iter, &mut b_iter);
+
+            // Verify iterators advanced correctly
+            assert!(
+                !a_iter.next().map_or(false, |c| c.is_ascii_digit()),
+                "Iterator a should have consumed all digits"
+            );
+            assert!(
+                !b_iter.next().map_or(false, |c| c.is_ascii_digit()),
+                "Iterator b should have consumed all digits"
+            );
+
+            result
+        }
+
+        // Basic numeric comparisons
+        assert_eq!(compare("0", "0"), Ordering::Equal);
+        assert_eq!(compare("1", "2"), Ordering::Less);
+        assert_eq!(compare("9", "10"), Ordering::Less);
+        assert_eq!(compare("10", "9"), Ordering::Greater);
+        assert_eq!(compare("99", "100"), Ordering::Less);
+
+        // Leading zeros
+        assert_eq!(compare("0", "00"), Ordering::Less);
+        assert_eq!(compare("00", "0"), Ordering::Greater);
+        assert_eq!(compare("01", "1"), Ordering::Greater);
+        assert_eq!(compare("001", "1"), Ordering::Greater);
+        assert_eq!(compare("001", "01"), Ordering::Greater);
+
+        // Same value different representation
+        assert_eq!(compare("000100", "100"), Ordering::Greater);
+        assert_eq!(compare("100", "0100"), Ordering::Less);
+        assert_eq!(compare("0100", "00100"), Ordering::Less);
+
+        // Large numbers
+        assert_eq!(compare("9999999999", "10000000000"), Ordering::Less);
+        assert_eq!(
+            compare(
+                "340282366920938463463374607431768211455", // u128::MAX
+                "340282366920938463463374607431768211456"
+            ),
+            Ordering::Less
+        );
+        assert_eq!(
+            compare(
+                "340282366920938463463374607431768211456", // > u128::MAX
+                "340282366920938463463374607431768211455"
+            ),
+            Ordering::Greater
+        );
+
+        // Iterator advancement verification
+        let mut a_iter = "123abc".chars().peekable();
+        let mut b_iter = "456def".chars().peekable();
+
+        compare_numeric_segments(&mut a_iter, &mut b_iter);
+
+        assert_eq!(a_iter.collect::<String>(), "abc");
+        assert_eq!(b_iter.collect::<String>(), "def");
+    }
+
+    #[test]
+    fn test_natural_sort() {
+        // Basic alphanumeric
+        assert_eq!(natural_sort("a", "b"), Ordering::Less);
+        assert_eq!(natural_sort("b", "a"), Ordering::Greater);
+        assert_eq!(natural_sort("a", "a"), Ordering::Equal);
+
+        // Case sensitivity
+        assert_eq!(natural_sort("a", "A"), Ordering::Less);
+        assert_eq!(natural_sort("A", "a"), Ordering::Greater);
+        assert_eq!(natural_sort("aA", "aa"), Ordering::Greater);
+        assert_eq!(natural_sort("aa", "aA"), Ordering::Less);
+
+        // Numbers
+        assert_eq!(natural_sort("1", "2"), Ordering::Less);
+        assert_eq!(natural_sort("2", "10"), Ordering::Less);
+        assert_eq!(natural_sort("02", "10"), Ordering::Less);
+        assert_eq!(natural_sort("02", "2"), Ordering::Greater);
+
+        // Mixed alphanumeric
+        assert_eq!(natural_sort("a1", "a2"), Ordering::Less);
+        assert_eq!(natural_sort("a2", "a10"), Ordering::Less);
+        assert_eq!(natural_sort("a02", "a2"), Ordering::Greater);
+        assert_eq!(natural_sort("a1b", "a1c"), Ordering::Less);
+
+        // Multiple numeric segments
+        assert_eq!(natural_sort("1a2", "1a10"), Ordering::Less);
+        assert_eq!(natural_sort("1a10", "1a2"), Ordering::Greater);
+        assert_eq!(natural_sort("2a1", "10a1"), Ordering::Less);
+
+        // Special characters
+        assert_eq!(natural_sort("a-1", "a-2"), Ordering::Less);
+        assert_eq!(natural_sort("a_1", "a_2"), Ordering::Less);
+        assert_eq!(natural_sort("a.1", "a.2"), Ordering::Less);
+
+        // Unicode
+        assert_eq!(natural_sort("文1", "文2"), Ordering::Less);
+        assert_eq!(natural_sort("文2", "文10"), Ordering::Less);
+        assert_eq!(natural_sort("🔤1", "🔤2"), Ordering::Less);
+
+        // Empty and special cases
+        assert_eq!(natural_sort("", ""), Ordering::Equal);
+        assert_eq!(natural_sort("", "a"), Ordering::Less);
+        assert_eq!(natural_sort("a", ""), Ordering::Greater);
+        assert_eq!(natural_sort(" ", "  "), Ordering::Less);
+
+        // Mixed everything
+        assert_eq!(natural_sort("File-1.txt", "File-2.txt"), Ordering::Less);
+        assert_eq!(natural_sort("File-02.txt", "File-2.txt"), Ordering::Greater);
+        assert_eq!(natural_sort("File-2.txt", "File-10.txt"), Ordering::Less);
+        assert_eq!(natural_sort("File_A1", "File_A2"), Ordering::Less);
+        assert_eq!(natural_sort("File_a1", "File_A1"), Ordering::Less);
+    }
+
+    #[test]
+    fn test_compare_paths() {
+        // Helper function for cleaner tests
+        fn compare(a: &str, is_a_file: bool, b: &str, is_b_file: bool) -> Ordering {
+            compare_paths((Path::new(a), is_a_file), (Path::new(b), is_b_file))
+        }
+
+        // Basic path comparison
+        assert_eq!(compare("a", true, "b", true), Ordering::Less);
+        assert_eq!(compare("b", true, "a", true), Ordering::Greater);
+        assert_eq!(compare("a", true, "a", true), Ordering::Equal);
+
+        // Files vs Directories
+        assert_eq!(compare("a", true, "a", false), Ordering::Greater);
+        assert_eq!(compare("a", false, "a", true), Ordering::Less);
+        assert_eq!(compare("b", false, "a", true), Ordering::Less);
+
+        // Extensions
+        assert_eq!(compare("a.txt", true, "a.md", true), Ordering::Greater);
+        assert_eq!(compare("a.md", true, "a.txt", true), Ordering::Less);
+        assert_eq!(compare("a", true, "a.txt", true), Ordering::Less);
+
+        // Nested paths
+        assert_eq!(compare("dir/a", true, "dir/b", true), Ordering::Less);
+        assert_eq!(compare("dir1/a", true, "dir2/a", true), Ordering::Less);
+        assert_eq!(compare("dir/sub/a", true, "dir/a", true), Ordering::Less);
+
+        // Case sensitivity in paths
+        assert_eq!(
+            compare("Dir/file", true, "dir/file", true),
+            Ordering::Greater
+        );
+        assert_eq!(
+            compare("dir/File", true, "dir/file", true),
+            Ordering::Greater
+        );
+        assert_eq!(compare("dir/file", true, "Dir/File", true), Ordering::Less);
+
+        // Hidden files and special names
+        assert_eq!(compare(".hidden", true, "visible", true), Ordering::Less);
+        assert_eq!(compare("_special", true, "normal", true), Ordering::Less);
+        assert_eq!(compare(".config", false, ".data", false), Ordering::Less);
+
+        // Mixed numeric paths
+        assert_eq!(
+            compare("dir1/file", true, "dir2/file", true),
+            Ordering::Less
+        );
+        assert_eq!(
+            compare("dir2/file", true, "dir10/file", true),
+            Ordering::Less
+        );
+        assert_eq!(
+            compare("dir02/file", true, "dir2/file", true),
+            Ordering::Greater
+        );
+
+        // Root paths
+        assert_eq!(compare("/a", true, "/b", true), Ordering::Less);
+        assert_eq!(compare("/", false, "/a", true), Ordering::Less);
+
+        // Complex real-world examples
+        assert_eq!(
+            compare("project/src/main.rs", true, "project/src/lib.rs", true),
+            Ordering::Greater
+        );
+        assert_eq!(
+            compare(
+                "project/tests/test_1.rs",
+                true,
+                "project/tests/test_2.rs",
+                true
+            ),
+            Ordering::Less
+        );
+        assert_eq!(
+            compare(
+                "project/v1.0.0/README.md",
+                true,
+                "project/v1.10.0/README.md",
+                true
+            ),
+            Ordering::Less
+        );
+    }
+
+    #[test]
+    fn test_natural_sort_case_sensitivity() {
+        // Same letter different case - lowercase should come first
+        assert_eq!(natural_sort("a", "A"), Ordering::Less);
+        assert_eq!(natural_sort("A", "a"), Ordering::Greater);
+        assert_eq!(natural_sort("a", "a"), Ordering::Equal);
+        assert_eq!(natural_sort("A", "A"), Ordering::Equal);
+
+        // Mixed case strings
+        assert_eq!(natural_sort("aaa", "AAA"), Ordering::Less);
+        assert_eq!(natural_sort("AAA", "aaa"), Ordering::Greater);
+        assert_eq!(natural_sort("aAa", "AaA"), Ordering::Less);
+
+        // Different letters
+        assert_eq!(natural_sort("a", "b"), Ordering::Less);
+        assert_eq!(natural_sort("A", "b"), Ordering::Less);
+        assert_eq!(natural_sort("a", "B"), Ordering::Less);
+    }
+
+    #[test]
+    fn test_natural_sort_with_numbers() {
+        // Basic number ordering
+        assert_eq!(natural_sort("file1", "file2"), Ordering::Less);
+        assert_eq!(natural_sort("file2", "file10"), Ordering::Less);
+        assert_eq!(natural_sort("file10", "file2"), Ordering::Greater);
+
+        // Numbers in different positions
+        assert_eq!(natural_sort("1file", "2file"), Ordering::Less);
+        assert_eq!(natural_sort("file1text", "file2text"), Ordering::Less);
+        assert_eq!(natural_sort("text1file", "text2file"), Ordering::Less);
+
+        // Multiple numbers in string
+        assert_eq!(natural_sort("file1-2", "file1-10"), Ordering::Less);
+        assert_eq!(natural_sort("2-1file", "10-1file"), Ordering::Less);
+
+        // Leading zeros
+        assert_eq!(natural_sort("file002", "file2"), Ordering::Greater);
+        assert_eq!(natural_sort("file002", "file10"), Ordering::Less);
+
+        // Very large numbers
+        assert_eq!(
+            natural_sort("file999999999999999999999", "file999999999999999999998"),
+            Ordering::Greater
+        );
+
+        // u128 edge cases
+
+        // Numbers near u128::MAX (340,282,366,920,938,463,463,374,607,431,768,211,455)
+        assert_eq!(
+            natural_sort(
+                "file340282366920938463463374607431768211454",
+                "file340282366920938463463374607431768211455"
+            ),
+            Ordering::Less
+        );
+
+        // Equal length numbers that overflow u128
+        assert_eq!(
+            natural_sort(
+                "file340282366920938463463374607431768211456",
+                "file340282366920938463463374607431768211455"
+            ),
+            Ordering::Greater
+        );
+
+        // Different length numbers that overflow u128
+        assert_eq!(
+            natural_sort(
+                "file3402823669209384634633746074317682114560",
+                "file340282366920938463463374607431768211455"
+            ),
+            Ordering::Greater
+        );
+
+        // Leading zeros with numbers near u128::MAX
+        assert_eq!(
+            natural_sort(
+                "file0340282366920938463463374607431768211455",
+                "file340282366920938463463374607431768211455"
+            ),
+            Ordering::Greater
+        );
+
+        // Very large numbers with different lengths (both overflow u128)
+        assert_eq!(
+            natural_sort(
+                "file999999999999999999999999999999999999999999999999",
+                "file9999999999999999999999999999999999999999999999999"
+            ),
+            Ordering::Less
+        );
+
+        // Mixed case with numbers
+        assert_eq!(natural_sort("File1", "file2"), Ordering::Greater);
+        assert_eq!(natural_sort("file1", "File2"), Ordering::Less);
+    }
+
+    #[test]
+    fn test_natural_sort_edge_cases() {
+        // Empty strings
+        assert_eq!(natural_sort("", ""), Ordering::Equal);
+        assert_eq!(natural_sort("", "a"), Ordering::Less);
+        assert_eq!(natural_sort("a", ""), Ordering::Greater);
+
+        // Special characters
+        assert_eq!(natural_sort("file-1", "file_1"), Ordering::Less);
+        assert_eq!(natural_sort("file.1", "file_1"), Ordering::Less);
+        assert_eq!(natural_sort("file 1", "file_1"), Ordering::Less);
+
+        // Unicode characters
+        // 9312 vs 9313
+        assert_eq!(natural_sort("file①", "file②"), Ordering::Less);
+        // 9321 vs 9313
+        assert_eq!(natural_sort("file⑩", "file②"), Ordering::Greater);
+        // 28450 vs 23383
+        assert_eq!(natural_sort("file漢", "file字"), Ordering::Greater);
+
+        // Mixed alphanumeric with special chars
+        assert_eq!(natural_sort("file-1a", "file-1b"), Ordering::Less);
+        assert_eq!(natural_sort("file-1.2", "file-1.10"), Ordering::Less);
+        assert_eq!(natural_sort("file-1.10", "file-1.2"), Ordering::Greater);
+    }
 }

From 32f9de612449d4aee68e28ffe1373e26a84516ca Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 13 Aug 2025 17:01:17 -0700
Subject: [PATCH 016/823] Add grid support to GPUI (#36153)

Release Notes:

- N/A

---------

Co-authored-by: Anthony <anthony@zed.dev>
---
 crates/gpui/Cargo.toml              |   4 +
 crates/gpui/examples/grid_layout.rs |  80 ++++++++++++++++++++
 crates/gpui/src/geometry.rs         |  33 +++++++++
 crates/gpui/src/style.rs            |  23 +++++-
 crates/gpui/src/styled.rs           | 109 +++++++++++++++++++++++++++-
 crates/gpui/src/taffy.rs            |  35 ++++++++-
 6 files changed, 278 insertions(+), 6 deletions(-)
 create mode 100644 crates/gpui/examples/grid_layout.rs

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 6e5a76d441..d720dfb2a1 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -305,3 +305,7 @@ path = "examples/uniform_list.rs"
 [[example]]
 name = "window_shadow"
 path = "examples/window_shadow.rs"
+
+[[example]]
+name = "grid_layout"
+path = "examples/grid_layout.rs"
diff --git a/crates/gpui/examples/grid_layout.rs b/crates/gpui/examples/grid_layout.rs
new file mode 100644
index 0000000000..f285497578
--- /dev/null
+++ b/crates/gpui/examples/grid_layout.rs
@@ -0,0 +1,80 @@
+use gpui::{
+    App, Application, Bounds, Context, Hsla, Window, WindowBounds, WindowOptions, div, prelude::*,
+    px, rgb, size,
+};
+
+// https://en.wikipedia.org/wiki/Holy_grail_(web_design)
+struct HolyGrailExample {}
+
+impl Render for HolyGrailExample {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        let block = |color: Hsla| {
+            div()
+                .size_full()
+                .bg(color)
+                .border_1()
+                .border_dashed()
+                .rounded_md()
+                .border_color(gpui::white())
+                .items_center()
+        };
+
+        div()
+            .gap_1()
+            .grid()
+            .bg(rgb(0x505050))
+            .size(px(500.0))
+            .shadow_lg()
+            .border_1()
+            .size_full()
+            .grid_cols(5)
+            .grid_rows(5)
+            .child(
+                block(gpui::white())
+                    .row_span(1)
+                    .col_span_full()
+                    .child("Header"),
+            )
+            .child(
+                block(gpui::red())
+                    .col_span(1)
+                    .h_56()
+                    .child("Table of contents"),
+            )
+            .child(
+                block(gpui::green())
+                    .col_span(3)
+                    .row_span(3)
+                    .child("Content"),
+            )
+            .child(
+                block(gpui::blue())
+                    .col_span(1)
+                    .row_span(3)
+                    .child("AD :(")
+                    .text_color(gpui::white()),
+            )
+            .child(
+                block(gpui::black())
+                    .row_span(1)
+                    .col_span_full()
+                    .text_color(gpui::white())
+                    .child("Footer"),
+            )
+    }
+}
+
+fn main() {
+    Application::new().run(|cx: &mut App| {
+        let bounds = Bounds::centered(None, size(px(500.), px(500.0)), cx);
+        cx.open_window(
+            WindowOptions {
+                window_bounds: Some(WindowBounds::Windowed(bounds)),
+                ..Default::default()
+            },
+            |_, cx| cx.new(|_| HolyGrailExample {}),
+        )
+        .unwrap();
+        cx.activate(true);
+    });
+}
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index 3d2d9cd9db..2de3e23ff7 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -9,12 +9,14 @@ use refineable::Refineable;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 use std::borrow::Cow;
+use std::ops::Range;
 use std::{
     cmp::{self, PartialOrd},
     fmt::{self, Display},
     hash::Hash,
     ops::{Add, Div, Mul, MulAssign, Neg, Sub},
 };
+use taffy::prelude::{TaffyGridLine, TaffyGridSpan};
 
 use crate::{App, DisplayId};
 
@@ -3608,6 +3610,37 @@ impl From<()> for Length {
     }
 }
 
+/// A location in a grid layout.
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize, JsonSchema, Default)]
+pub struct GridLocation {
+    /// The rows this item uses within the grid.
+    pub row: Range<GridPlacement>,
+    /// The columns this item uses within the grid.
+    pub column: Range<GridPlacement>,
+}
+
+/// The placement of an item within a grid layout's column or row.
+#[derive(Clone, Copy, PartialEq, Debug, Serialize, Deserialize, JsonSchema, Default)]
+pub enum GridPlacement {
+    /// The grid line index to place this item.
+    Line(i16),
+    /// The number of grid lines to span.
+    Span(u16),
+    /// Automatically determine the placement, equivalent to Span(1)
+    #[default]
+    Auto,
+}
+
+impl From<GridPlacement> for taffy::GridPlacement {
+    fn from(placement: GridPlacement) -> Self {
+        match placement {
+            GridPlacement::Line(index) => taffy::GridPlacement::from_line_index(index),
+            GridPlacement::Span(span) => taffy::GridPlacement::from_span(span),
+            GridPlacement::Auto => taffy::GridPlacement::Auto,
+        }
+    }
+}
+
 /// Provides a trait for types that can calculate half of their value.
 ///
 /// The `Half` trait is used for types that can be evenly divided, returning a new instance of the same type
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 560de7b924..09985722ef 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -7,7 +7,7 @@ use std::{
 use crate::{
     AbsoluteLength, App, Background, BackgroundTag, BorderStyle, Bounds, ContentMask, Corners,
     CornersRefinement, CursorStyle, DefiniteLength, DevicePixels, Edges, EdgesRefinement, Font,
-    FontFallbacks, FontFeatures, FontStyle, FontWeight, Hsla, Length, Pixels, Point,
+    FontFallbacks, FontFeatures, FontStyle, FontWeight, GridLocation, Hsla, Length, Pixels, Point,
     PointRefinement, Rgba, SharedString, Size, SizeRefinement, Styled, TextRun, Window, black, phi,
     point, quad, rems, size,
 };
@@ -260,6 +260,17 @@ pub struct Style {
     /// The opacity of this element
     pub opacity: Option<f32>,
 
+    /// The grid columns of this element
+    /// Equivalent to the Tailwind `grid-cols-<number>`
+    pub grid_cols: Option<u16>,
+
+    /// The row span of this element
+    /// Equivalent to the Tailwind `grid-rows-<number>`
+    pub grid_rows: Option<u16>,
+
+    /// The grid location of this element
+    pub grid_location: Option<GridLocation>,
+
     /// Whether to draw a red debugging outline around this element
     #[cfg(debug_assertions)]
     pub debug: bool,
@@ -275,6 +286,13 @@ impl Styled for StyleRefinement {
     }
 }
 
+impl StyleRefinement {
+    /// The grid location of this element
+    pub fn grid_location_mut(&mut self) -> &mut GridLocation {
+        self.grid_location.get_or_insert_default()
+    }
+}
+
 /// The value of the visibility property, similar to the CSS property `visibility`
 #[derive(Default, Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
 pub enum Visibility {
@@ -757,6 +775,9 @@ impl Default for Style {
             text: TextStyleRefinement::default(),
             mouse_cursor: None,
             opacity: None,
+            grid_rows: None,
+            grid_cols: None,
+            grid_location: None,
 
             #[cfg(debug_assertions)]
             debug: false,
diff --git a/crates/gpui/src/styled.rs b/crates/gpui/src/styled.rs
index b689f32687..c714cac14f 100644
--- a/crates/gpui/src/styled.rs
+++ b/crates/gpui/src/styled.rs
@@ -1,8 +1,8 @@
 use crate::{
     self as gpui, AbsoluteLength, AlignContent, AlignItems, BorderStyle, CursorStyle,
-    DefiniteLength, Display, Fill, FlexDirection, FlexWrap, Font, FontStyle, FontWeight, Hsla,
-    JustifyContent, Length, SharedString, StrikethroughStyle, StyleRefinement, TextAlign,
-    TextOverflow, TextStyleRefinement, UnderlineStyle, WhiteSpace, px, relative, rems,
+    DefiniteLength, Display, Fill, FlexDirection, FlexWrap, Font, FontStyle, FontWeight,
+    GridPlacement, Hsla, JustifyContent, Length, SharedString, StrikethroughStyle, StyleRefinement,
+    TextAlign, TextOverflow, TextStyleRefinement, UnderlineStyle, WhiteSpace, px, relative, rems,
 };
 pub use gpui_macros::{
     border_style_methods, box_shadow_style_methods, cursor_style_methods, margin_style_methods,
@@ -46,6 +46,13 @@ pub trait Styled: Sized {
         self
     }
 
+    /// Sets the display type of the element to `grid`.
+    /// [Docs](https://tailwindcss.com/docs/display)
+    fn grid(mut self) -> Self {
+        self.style().display = Some(Display::Grid);
+        self
+    }
+
     /// Sets the whitespace of the element to `normal`.
     /// [Docs](https://tailwindcss.com/docs/whitespace#normal)
     fn whitespace_normal(mut self) -> Self {
@@ -640,6 +647,102 @@ pub trait Styled: Sized {
         self
     }
 
+    /// Sets the grid columns of this element.
+    fn grid_cols(mut self, cols: u16) -> Self {
+        self.style().grid_cols = Some(cols);
+        self
+    }
+
+    /// Sets the grid rows of this element.
+    fn grid_rows(mut self, rows: u16) -> Self {
+        self.style().grid_rows = Some(rows);
+        self
+    }
+
+    /// Sets the column start of this element.
+    fn col_start(mut self, start: i16) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.column.start = GridPlacement::Line(start);
+        self
+    }
+
+    /// Sets the column start of this element to auto.
+    fn col_start_auto(mut self) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.column.start = GridPlacement::Auto;
+        self
+    }
+
+    /// Sets the column end of this element.
+    fn col_end(mut self, end: i16) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.column.end = GridPlacement::Line(end);
+        self
+    }
+
+    /// Sets the column end of this element to auto.
+    fn col_end_auto(mut self) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.column.end = GridPlacement::Auto;
+        self
+    }
+
+    /// Sets the column span of this element.
+    fn col_span(mut self, span: u16) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.column = GridPlacement::Span(span)..GridPlacement::Span(span);
+        self
+    }
+
+    /// Sets the row span of this element.
+    fn col_span_full(mut self) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.column = GridPlacement::Line(1)..GridPlacement::Line(-1);
+        self
+    }
+
+    /// Sets the row start of this element.
+    fn row_start(mut self, start: i16) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.row.start = GridPlacement::Line(start);
+        self
+    }
+
+    /// Sets the row start of this element to "auto"
+    fn row_start_auto(mut self) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.row.start = GridPlacement::Auto;
+        self
+    }
+
+    /// Sets the row end of this element.
+    fn row_end(mut self, end: i16) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.row.end = GridPlacement::Line(end);
+        self
+    }
+
+    /// Sets the row end of this element to "auto"
+    fn row_end_auto(mut self) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.row.end = GridPlacement::Auto;
+        self
+    }
+
+    /// Sets the row span of this element.
+    fn row_span(mut self, span: u16) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.row = GridPlacement::Span(span)..GridPlacement::Span(span);
+        self
+    }
+
+    /// Sets the row span of this element.
+    fn row_span_full(mut self) -> Self {
+        let grid_location = self.style().grid_location_mut();
+        grid_location.row = GridPlacement::Line(1)..GridPlacement::Line(-1);
+        self
+    }
+
     /// Draws a debug border around this element.
     #[cfg(debug_assertions)]
     fn debug(mut self) -> Self {
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index f7fa54256d..ee21ecd8c4 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -3,7 +3,7 @@ use crate::{
 };
 use collections::{FxHashMap, FxHashSet};
 use smallvec::SmallVec;
-use std::fmt::Debug;
+use std::{fmt::Debug, ops::Range};
 use taffy::{
     TaffyTree, TraversePartialTree as _,
     geometry::{Point as TaffyPoint, Rect as TaffyRect, Size as TaffySize},
@@ -251,6 +251,25 @@ trait ToTaffy<Output> {
 
 impl ToTaffy<taffy::style::Style> for Style {
     fn to_taffy(&self, rem_size: Pixels) -> taffy::style::Style {
+        use taffy::style_helpers::{fr, length, minmax, repeat};
+
+        fn to_grid_line(
+            placement: &Range<crate::GridPlacement>,
+        ) -> taffy::Line<taffy::GridPlacement> {
+            taffy::Line {
+                start: placement.start.into(),
+                end: placement.end.into(),
+            }
+        }
+
+        fn to_grid_repeat<T: taffy::style::CheapCloneStr>(
+            unit: &Option<u16>,
+        ) -> Vec<taffy::GridTemplateComponent<T>> {
+            // grid-template-columns: repeat(<number>, minmax(0, 1fr));
+            unit.map(|count| vec![repeat(count, vec![minmax(length(0.0), fr(1.0))])])
+                .unwrap_or_default()
+        }
+
         taffy::style::Style {
             display: self.display.into(),
             overflow: self.overflow.into(),
@@ -274,7 +293,19 @@ impl ToTaffy<taffy::style::Style> for Style {
             flex_basis: self.flex_basis.to_taffy(rem_size),
             flex_grow: self.flex_grow,
             flex_shrink: self.flex_shrink,
-            ..Default::default() // Ignore grid properties for now
+            grid_template_rows: to_grid_repeat(&self.grid_rows),
+            grid_template_columns: to_grid_repeat(&self.grid_cols),
+            grid_row: self
+                .grid_location
+                .as_ref()
+                .map(|location| to_grid_line(&location.row))
+                .unwrap_or_default(),
+            grid_column: self
+                .grid_location
+                .as_ref()
+                .map(|location| to_grid_line(&location.column))
+                .unwrap_or_default(),
+            ..Default::default()
         }
     }
 }

From 5a6df38ccf61ac6196d56644e53e1909c11ff16a Mon Sep 17 00:00:00 2001
From: Oleksiy Syvokon <oleksiy@zed.dev>
Date: Thu, 14 Aug 2025 07:11:53 +0300
Subject: [PATCH 017/823] docs: Add example of controlling reasoning effort
 (#36135)

Release Notes:

- N/A
---
 docs/src/ai/llm-providers.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/src/ai/llm-providers.md b/docs/src/ai/llm-providers.md
index 21ff2a8a51..58c9230760 100644
--- a/docs/src/ai/llm-providers.md
+++ b/docs/src/ai/llm-providers.md
@@ -392,26 +392,26 @@ Zed will also use the `OPENAI_API_KEY` environment variable if it's defined.
 #### Custom Models {#openai-custom-models}
 
 The Zed agent comes pre-configured to use the latest version for common models (GPT-5, GPT-5 mini, o4-mini, GPT-4.1, and others).
-To use alternate models, perhaps a preview release or a dated model release, or if you wish to control the request parameters, you can do so by adding the following to your Zed `settings.json`:
+To use alternate models, perhaps a preview release, or if you wish to control the request parameters, you can do so by adding the following to your Zed `settings.json`:
 
 ```json
 {
   "language_models": {
     "openai": {
       "available_models": [
+        {
+          "name": "gpt-5",
+          "display_name": "gpt-5 high",
+          "reasoning_effort": "high",
+          "max_tokens": 272000,
+          "max_completion_tokens": 20000
+        },
         {
           "name": "gpt-4o-2024-08-06",
           "display_name": "GPT 4o Summer 2024",
           "max_tokens": 128000
-        },
-        {
-          "name": "o1-mini",
-          "display_name": "o1-mini",
-          "max_tokens": 128000,
-          "max_completion_tokens": 20000
         }
-      ],
-      "version": "1"
+      ]
     }
   }
 }

From ab9fa03d55fc52cc0afdde7fe6b5f063ce12ce92 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 13 Aug 2025 22:24:47 -0600
Subject: [PATCH 018/823] UI for checkpointing (#36124)

Co-authored-by: Antonio Scandurra <me@as-cii.com>

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent_ui/src/acp/thread_view.rs | 27 +++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 3aefae7265..5f67dc15b8 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1,6 +1,6 @@
 use acp_thread::{
     AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
-    LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
+    LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus, UserMessageId,
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
@@ -921,6 +921,16 @@ impl AcpThreadView {
         cx.notify();
     }
 
+    fn rewind(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
+        let Some(thread) = self.thread() else {
+            return;
+        };
+        thread
+            .update(cx, |thread, cx| thread.rewind(message_id.clone(), cx))
+            .detach_and_log_err(cx);
+        cx.notify();
+    }
+
     fn render_entry(
         &self,
         index: usize,
@@ -931,8 +941,23 @@ impl AcpThreadView {
     ) -> AnyElement {
         let primary = match &entry {
             AgentThreadEntry::UserMessage(message) => div()
+                .id(("user_message", index))
                 .py_4()
                 .px_2()
+                .children(message.id.clone().and_then(|message_id| {
+                    message.checkpoint.as_ref()?;
+
+                    Some(
+                        Button::new("restore-checkpoint", "Restore Checkpoint")
+                            .icon(IconName::Undo)
+                            .icon_size(IconSize::XSmall)
+                            .icon_position(IconPosition::Start)
+                            .label_size(LabelSize::XSmall)
+                            .on_click(cx.listener(move |this, _, _window, cx| {
+                                this.rewind(&message_id, cx);
+                            })),
+                    )
+                }))
                 .child(
                     v_flex()
                         .p_3()

From 5bbdd1a262732ceb195de65988fd7126d632b271 Mon Sep 17 00:00:00 2001
From: Maksim Bondarenkov <119937608+ognevny@users.noreply.github.com>
Date: Thu, 14 Aug 2025 13:02:52 +0700
Subject: [PATCH 019/823] docs: Update information in MSYS2 section (#36158)

- we are about to drop Zed for MINGW64 because `crash-handler` uses a
symbol which is not presented in `msvcrt.dll`
- mention MSYS2 docs page and CLANGARM64 environment

Release Notes:

- N/A
---
 docs/src/development/windows.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
index ac38e4d7d6..551d5f9f21 100644
--- a/docs/src/development/windows.md
+++ b/docs/src/development/windows.md
@@ -114,19 +114,19 @@ cargo test --workspace
 
 ## Installing from msys2
 
-[MSYS2](https://msys2.org/) distribution provides Zed as a package [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed). The package is available for UCRT64, MINGW64 and CLANG64 repositories. To download it, run
+[MSYS2](https://msys2.org/) distribution provides Zed as a package [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed). The package is available for UCRT64, CLANG64 and CLANGARM64 repositories. To download it, run
 
 ```sh
 pacman -Syu
 pacman -S $MINGW_PACKAGE_PREFIX-zed
 ```
 
-then you can run `zeditor` CLI. Editor executable is installed under `$MINGW_PREFIX/lib/zed` directory
-
 You can see the [build script](https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-zed/PKGBUILD) for more details on build process.
 
 > Please, report any issue in [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed) first.
 
+See also MSYS2 [documentation page](https://www.msys2.org/docs/ides-editors).
+
 Note that `collab` is not supported for MSYS2.
 
 ## Troubleshooting

From 0291db0d78d751bff518a49974b14ab6cf146a1a Mon Sep 17 00:00:00 2001
From: Alvaro Parker <64918109+AlvaroParker@users.noreply.github.com>
Date: Thu, 14 Aug 2025 02:10:38 -0400
Subject: [PATCH 020/823] git: Add handler to get default branch on remote
 (#36157)

Closes #36150

Release Notes:

- Fixed `git: branch` action not worked with ssh workflow
---
 crates/project/src/git_store.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 5d48c833ab..32deb0dbc4 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -414,6 +414,7 @@ impl GitStore {
     pub fn init(client: &AnyProtoClient) {
         client.add_entity_request_handler(Self::handle_get_remotes);
         client.add_entity_request_handler(Self::handle_get_branches);
+        client.add_entity_request_handler(Self::handle_get_default_branch);
         client.add_entity_request_handler(Self::handle_change_branch);
         client.add_entity_request_handler(Self::handle_create_branch);
         client.add_entity_request_handler(Self::handle_git_init);
@@ -1894,6 +1895,23 @@ impl GitStore {
                 .collect::<Vec<_>>(),
         })
     }
+    async fn handle_get_default_branch(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::GetDefaultBranch>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::GetDefaultBranchResponse> {
+        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
+        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
+
+        let branch = repository_handle
+            .update(&mut cx, |repository_handle, _| {
+                repository_handle.default_branch()
+            })?
+            .await??
+            .map(Into::into);
+
+        Ok(proto::GetDefaultBranchResponse { branch })
+    }
     async fn handle_create_branch(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::GitCreateBranch>,

From 8e4f30abcb83ab5ca920f8d545adbe15aaf4053a Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 14 Aug 2025 10:16:25 +0200
Subject: [PATCH 021/823] project: Print error causes when failing to spawn lsp
 command (#36163)

cc https://github.com/zed-industries/zed/issues/34666

Display printing anyhow errors only renders the error itself, but not
any of its causes so we've been dropping the important context when
showing the issue to the users.

Release Notes:

- N/A
---
 crates/lsp/src/lsp.rs           |  4 ++--
 crates/project/src/lsp_store.rs | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 22a227c231..ce9e2fe229 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -318,6 +318,8 @@ impl LanguageServer {
         } else {
             root_path.parent().unwrap_or_else(|| Path::new("/"))
         };
+        let root_uri = Url::from_file_path(&working_dir)
+            .map_err(|()| anyhow!("{working_dir:?} is not a valid URI"))?;
 
         log::info!(
             "starting language server process. binary path: {:?}, working directory: {:?}, args: {:?}",
@@ -345,8 +347,6 @@ impl LanguageServer {
         let stdin = server.stdin.take().unwrap();
         let stdout = server.stdout.take().unwrap();
         let stderr = server.stderr.take().unwrap();
-        let root_uri = Url::from_file_path(&working_dir)
-            .map_err(|()| anyhow!("{working_dir:?} is not a valid URI"))?;
         let server = Self::new_internal(
             server_id,
             server_name,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 827341d60d..60d847023f 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -390,13 +390,17 @@ impl LocalLspStore {
                         delegate.update_status(
                             adapter.name(),
                             BinaryStatus::Failed {
-                                error: format!("{err}\n-- stderr--\n{log}"),
+                                error: if log.is_empty() {
+                                    format!("{err:#}")
+                                } else {
+                                    format!("{err:#}\n-- stderr --\n{log}")
+                                },
                             },
                         );
-                        let message =
-                            format!("Failed to start language server {server_name:?}: {err:#?}");
-                        log::error!("{message}");
-                        log::error!("server stderr: {log}");
+                        log::error!("Failed to start language server {server_name:?}: {err:?}");
+                        if !log.is_empty() {
+                            log::error!("server stderr: {log}");
+                        }
                         None
                     }
                 }

From b3d048d6dcc60060f194d3402317397ccd84d561 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 14 Aug 2025 11:11:27 +0200
Subject: [PATCH 022/823] Add back `DeletePathTool` to agent2 (#36168)

This was probably removed accidentally as a result of a merge conflict.

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs  |  28 ++++-----
 crates/agent2/src/thread.rs | 109 ++++++++++++++----------------------
 2 files changed, 57 insertions(+), 80 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index ced8c5e401..6ebcece2b5 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1,8 +1,8 @@
 use crate::{AgentResponseEvent, Thread, templates::Templates};
 use crate::{
-    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DiagnosticsTool, EditFileTool,
-    FetchTool, FindPathTool, GrepTool, ListDirectoryTool, MovePathTool, NowTool, OpenTool,
-    ReadFileTool, TerminalTool, ThinkingTool, ToolCallAuthorization, UserMessageContent,
+    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DeletePathTool, DiagnosticsTool,
+    EditFileTool, FetchTool, FindPathTool, GrepTool, ListDirectoryTool, MovePathTool, NowTool,
+    OpenTool, ReadFileTool, TerminalTool, ThinkingTool, ToolCallAuthorization, UserMessageContent,
     WebSearchTool,
 };
 use acp_thread::AgentModelSelector;
@@ -583,22 +583,22 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             default_model,
                             cx,
                         );
-                        thread.add_tool(CreateDirectoryTool::new(project.clone()));
                         thread.add_tool(CopyPathTool::new(project.clone()));
+                        thread.add_tool(CreateDirectoryTool::new(project.clone()));
+                        thread.add_tool(DeletePathTool::new(project.clone(), action_log.clone()));
                         thread.add_tool(DiagnosticsTool::new(project.clone()));
-                        thread.add_tool(MovePathTool::new(project.clone()));
-                        thread.add_tool(ListDirectoryTool::new(project.clone()));
-                        thread.add_tool(OpenTool::new(project.clone()));
-                        thread.add_tool(ThinkingTool);
-                        thread.add_tool(FindPathTool::new(project.clone()));
-                        thread.add_tool(FetchTool::new(project.read(cx).client().http_client()));
-                        thread.add_tool(GrepTool::new(project.clone()));
-                        thread.add_tool(ReadFileTool::new(project.clone(), action_log));
                         thread.add_tool(EditFileTool::new(cx.entity()));
+                        thread.add_tool(FetchTool::new(project.read(cx).client().http_client()));
+                        thread.add_tool(FindPathTool::new(project.clone()));
+                        thread.add_tool(GrepTool::new(project.clone()));
+                        thread.add_tool(ListDirectoryTool::new(project.clone()));
+                        thread.add_tool(MovePathTool::new(project.clone()));
                         thread.add_tool(NowTool);
+                        thread.add_tool(OpenTool::new(project.clone()));
+                        thread.add_tool(ReadFileTool::new(project.clone(), action_log));
                         thread.add_tool(TerminalTool::new(project.clone(), cx));
-                        // TODO: Needs to be conditional based on zed model or not
-                        thread.add_tool(WebSearchTool);
+                        thread.add_tool(ThinkingTool);
+                        thread.add_tool(WebSearchTool); // TODO: Enable this only if it's a zed model.
                         thread
                     });
 
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index b48f9001ac..4156ec44d2 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -411,7 +411,7 @@ pub struct Thread {
     /// Survives across multiple requests as the model performs tool calls and
     /// we run tools, report their results.
     running_turn: Option<Task<()>>,
-    pending_agent_message: Option<AgentMessage>,
+    pending_message: Option<AgentMessage>,
     tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
     context_server_registry: Entity<ContextServerRegistry>,
     profile_id: AgentProfileId,
@@ -437,7 +437,7 @@ impl Thread {
             messages: Vec::new(),
             completion_mode: CompletionMode::Normal,
             running_turn: None,
-            pending_agent_message: None,
+            pending_message: None,
             tools: BTreeMap::default(),
             context_server_registry,
             profile_id,
@@ -463,7 +463,7 @@ impl Thread {
 
     #[cfg(any(test, feature = "test-support"))]
     pub fn last_message(&self) -> Option<Message> {
-        if let Some(message) = self.pending_agent_message.clone() {
+        if let Some(message) = self.pending_message.clone() {
             Some(Message::Agent(message))
         } else {
             self.messages.last().cloned()
@@ -485,7 +485,7 @@ impl Thread {
     pub fn cancel(&mut self) {
         // TODO: do we need to emit a stop::cancel for ACP?
         self.running_turn.take();
-        self.flush_pending_agent_message();
+        self.flush_pending_message();
     }
 
     pub fn truncate(&mut self, message_id: UserMessageId) -> Result<()> {
@@ -521,74 +521,58 @@ impl Thread {
             mpsc::unbounded::<Result<AgentResponseEvent, LanguageModelCompletionError>>();
         let event_stream = AgentResponseEventStream(events_tx);
 
-        let user_message_ix = self.messages.len();
         self.messages.push(Message::User(UserMessage {
-            id: message_id,
+            id: message_id.clone(),
             content,
         }));
         log::info!("Total messages in thread: {}", self.messages.len());
-        self.running_turn = Some(cx.spawn(async move |thread, cx| {
+        self.running_turn = Some(cx.spawn(async move |this, cx| {
             log::info!("Starting agent turn execution");
             let turn_result = async {
-                // Perform one request, then keep looping if the model makes tool calls.
                 let mut completion_intent = CompletionIntent::UserPrompt;
-                'outer: loop {
+                loop {
                     log::debug!(
                         "Building completion request with intent: {:?}",
                         completion_intent
                     );
-                    let request = thread.update(cx, |thread, cx| {
-                        thread.build_completion_request(completion_intent, cx)
+                    let request = this.update(cx, |this, cx| {
+                        this.build_completion_request(completion_intent, cx)
                     })?;
 
-                    // Stream events, appending to messages and collecting up tool uses.
                     log::info!("Calling model.stream_completion");
                     let mut events = model.stream_completion(request, cx).await?;
                     log::debug!("Stream completion started successfully");
 
                     let mut tool_uses = FuturesUnordered::new();
                     while let Some(event) = events.next().await {
-                        match event {
-                            Ok(LanguageModelCompletionEvent::Stop(reason)) => {
+                        match event? {
+                            LanguageModelCompletionEvent::Stop(reason) => {
                                 event_stream.send_stop(reason);
                                 if reason == StopReason::Refusal {
-                                    thread.update(cx, |thread, _cx| {
-                                        thread.pending_agent_message = None;
-                                        thread.messages.truncate(user_message_ix);
-                                    })?;
-                                    break 'outer;
+                                    this.update(cx, |this, _cx| this.truncate(message_id))??;
+                                    return Ok(());
                                 }
                             }
-                            Ok(event) => {
+                            event => {
                                 log::trace!("Received completion event: {:?}", event);
-                                thread
-                                    .update(cx, |thread, cx| {
-                                        tool_uses.extend(thread.handle_streamed_completion_event(
-                                            event,
-                                            &event_stream,
-                                            cx,
-                                        ));
-                                    })
-                                    .ok();
-                            }
-                            Err(error) => {
-                                log::error!("Error in completion stream: {:?}", error);
-                                event_stream.send_error(error);
-                                break;
+                                this.update(cx, |this, cx| {
+                                    tool_uses.extend(this.handle_streamed_completion_event(
+                                        event,
+                                        &event_stream,
+                                        cx,
+                                    ));
+                                })
+                                .ok();
                             }
                         }
                     }
 
-                    // If there are no tool uses, the turn is done.
                     if tool_uses.is_empty() {
                         log::info!("No tool uses found, completing turn");
-                        break;
+                        return Ok(());
                     }
                     log::info!("Found {} tool uses to execute", tool_uses.len());
 
-                    // As tool results trickle in, insert them in the last user
-                    // message so that they can be sent on the next tick of the
-                    // agentic loop.
                     while let Some(tool_result) = tool_uses.next().await {
                         log::info!("Tool finished {:?}", tool_result);
 
@@ -604,29 +588,21 @@ impl Thread {
                                 ..Default::default()
                             },
                         );
-                        thread
-                            .update(cx, |thread, _cx| {
-                                thread
-                                    .pending_agent_message()
-                                    .tool_results
-                                    .insert(tool_result.tool_use_id.clone(), tool_result);
-                            })
-                            .ok();
+                        this.update(cx, |this, _cx| {
+                            this.pending_message()
+                                .tool_results
+                                .insert(tool_result.tool_use_id.clone(), tool_result);
+                        })
+                        .ok();
                     }
 
-                    thread.update(cx, |thread, _cx| thread.flush_pending_agent_message())?;
-
+                    this.update(cx, |this, _| this.flush_pending_message())?;
                     completion_intent = CompletionIntent::ToolResults;
                 }
-
-                Ok(())
             }
             .await;
 
-            thread
-                .update(cx, |thread, _cx| thread.flush_pending_agent_message())
-                .ok();
-
+            this.update(cx, |this, _| this.flush_pending_message()).ok();
             if let Err(error) = turn_result {
                 log::error!("Turn execution failed: {:?}", error);
                 event_stream.send_error(error);
@@ -668,7 +644,8 @@ impl Thread {
 
         match event {
             StartMessage { .. } => {
-                self.messages.push(Message::Agent(AgentMessage::default()));
+                self.flush_pending_message();
+                self.pending_message = Some(AgentMessage::default());
             }
             Text(new_text) => self.handle_text_event(new_text, event_stream, cx),
             Thinking { text, signature } => {
@@ -706,7 +683,7 @@ impl Thread {
     ) {
         events_stream.send_text(&new_text);
 
-        let last_message = self.pending_agent_message();
+        let last_message = self.pending_message();
         if let Some(AgentMessageContent::Text(text)) = last_message.content.last_mut() {
             text.push_str(&new_text);
         } else {
@@ -727,7 +704,7 @@ impl Thread {
     ) {
         event_stream.send_thinking(&new_text);
 
-        let last_message = self.pending_agent_message();
+        let last_message = self.pending_message();
         if let Some(AgentMessageContent::Thinking { text, signature }) =
             last_message.content.last_mut()
         {
@@ -744,7 +721,7 @@ impl Thread {
     }
 
     fn handle_redacted_thinking_event(&mut self, data: String, cx: &mut Context<Self>) {
-        let last_message = self.pending_agent_message();
+        let last_message = self.pending_message();
         last_message
             .content
             .push(AgentMessageContent::RedactedThinking(data));
@@ -768,7 +745,7 @@ impl Thread {
         }
 
         // Ensure the last message ends in the current tool use
-        let last_message = self.pending_agent_message();
+        let last_message = self.pending_message();
         let push_new_tool_use = last_message.content.last_mut().map_or(true, |content| {
             if let AgentMessageContent::ToolUse(last_tool_use) = content {
                 if last_tool_use.id == tool_use.id {
@@ -871,12 +848,12 @@ impl Thread {
         }
     }
 
-    fn pending_agent_message(&mut self) -> &mut AgentMessage {
-        self.pending_agent_message.get_or_insert_default()
+    fn pending_message(&mut self) -> &mut AgentMessage {
+        self.pending_message.get_or_insert_default()
     }
 
-    fn flush_pending_agent_message(&mut self) {
-        let Some(mut message) = self.pending_agent_message.take() else {
+    fn flush_pending_message(&mut self) {
+        let Some(mut message) = self.pending_message.take() else {
             return;
         };
 
@@ -997,7 +974,7 @@ impl Thread {
             }
         }
 
-        if let Some(message) = self.pending_agent_message.as_ref() {
+        if let Some(message) = self.pending_message.as_ref() {
             messages.extend(message.to_request());
         }
 
@@ -1013,7 +990,7 @@ impl Thread {
             markdown.push_str(&message.to_markdown());
         }
 
-        if let Some(message) = self.pending_agent_message.as_ref() {
+        if let Some(message) = self.pending_message.as_ref() {
             markdown.push('\n');
             markdown.push_str(&message.to_markdown());
         }

From ffac8c512858789158d3c52d2cd50bca3a904f54 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 14 Aug 2025 11:11:46 +0200
Subject: [PATCH 023/823] editor: Render all targets in go to def multbuffer
 title (#36167)

Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 44 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c77262143d..cbee9021ed 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -15842,19 +15842,23 @@ impl Editor {
 
                 let tab_kind = match kind {
                     Some(GotoDefinitionKind::Implementation) => "Implementations",
-                    _ => "Definitions",
+                    Some(GotoDefinitionKind::Symbol) | None => "Definitions",
+                    Some(GotoDefinitionKind::Declaration) => "Declarations",
+                    Some(GotoDefinitionKind::Type) => "Types",
                 };
                 let title = editor
                     .update_in(acx, |_, _, cx| {
-                        let origin = locations.first().unwrap();
-                        let buffer = origin.buffer.read(cx);
-                        format!(
-                            "{} for {}",
-                            tab_kind,
-                            buffer
-                                .text_for_range(origin.range.clone())
-                                .collect::<String>()
-                        )
+                        let target = locations
+                            .iter()
+                            .map(|location| {
+                                location
+                                    .buffer
+                                    .read(cx)
+                                    .text_for_range(location.range.clone())
+                                    .collect::<String>()
+                            })
+                            .join(", ");
+                        format!("{tab_kind} for {target}")
                     })
                     .context("buffer title")?;
 
@@ -16050,19 +16054,17 @@ impl Editor {
             }
 
             workspace.update_in(cx, |workspace, window, cx| {
-                let title = locations
-                    .first()
-                    .as_ref()
+                let target = locations
+                    .iter()
                     .map(|location| {
-                        let buffer = location.buffer.read(cx);
-                        format!(
-                            "References to `{}`",
-                            buffer
-                                .text_for_range(location.range.clone())
-                                .collect::<String>()
-                        )
+                        location
+                            .buffer
+                            .read(cx)
+                            .text_for_range(location.range.clone())
+                            .collect::<String>()
                     })
-                    .unwrap();
+                    .join(", ");
+                let title = format!("References to {target}");
                 Self::open_locations_in_multibuffer(
                     workspace,
                     locations,

From e5402d546414a19112a2a0c4c3046bb414a3ec68 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 14 Aug 2025 07:39:33 -0600
Subject: [PATCH 024/823] Allow editing Agent2 messages (#36155)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 Cargo.lock                                    |   1 +
 assets/keymaps/default-linux.json             |   2 -
 assets/keymaps/default-macos.json             |   2 -
 crates/acp_thread/Cargo.toml                  |   1 +
 crates/acp_thread/src/acp_thread.rs           |  15 +-
 crates/acp_thread/src/mention.rs              |  94 ++-
 crates/agent2/src/thread.rs                   |   4 +-
 crates/agent_ui/src/acp.rs                    |   3 +-
 .../agent_ui/src/acp/completion_provider.rs   | 113 +--
 crates/agent_ui/src/acp/message_editor.rs     | 469 +++++++++++
 crates/agent_ui/src/acp/message_history.rs    |  88 --
 crates/agent_ui/src/acp/thread_view.rs        | 766 +++++++-----------
 crates/agent_ui/src/agent_panel.rs            |  15 +-
 crates/zed_actions/src/lib.rs                 |   4 -
 14 files changed, 956 insertions(+), 621 deletions(-)
 create mode 100644 crates/agent_ui/src/acp/message_editor.rs
 delete mode 100644 crates/agent_ui/src/acp/message_history.rs

diff --git a/Cargo.lock b/Cargo.lock
index f0fd3049c0..cb087f43b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,6 +14,7 @@ dependencies = [
  "collections",
  "editor",
  "env_logger 0.11.8",
+ "file_icons",
  "futures 0.3.31",
  "gpui",
  "indoc",
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index dda26f406b..01c0b4e969 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -331,8 +331,6 @@
     "use_key_equivalents": true,
     "bindings": {
       "enter": "agent::Chat",
-      "up": "agent::PreviousHistoryMessage",
-      "down": "agent::NextHistoryMessage",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "ctrl-shift-y": "agent::KeepAll",
       "ctrl-shift-n": "agent::RejectAll"
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 3966efd8df..e5b7fff9e1 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -383,8 +383,6 @@
     "use_key_equivalents": true,
     "bindings": {
       "enter": "agent::Chat",
-      "up": "agent::PreviousHistoryMessage",
-      "down": "agent::NextHistoryMessage",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "cmd-shift-y": "agent::KeepAll",
       "cmd-shift-n": "agent::RejectAll"
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 2ac15de08f..2d0fe2d264 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -23,6 +23,7 @@ anyhow.workspace = true
 buffer_diff.workspace = true
 collections.workspace = true
 editor.workspace = true
+file_icons.workspace = true
 futures.workspace = true
 gpui.workspace = true
 itertools.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index a5b512f31a..da4d82712a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -32,6 +32,7 @@ use util::ResultExt;
 pub struct UserMessage {
     pub id: Option<UserMessageId>,
     pub content: ContentBlock,
+    pub chunks: Vec<acp::ContentBlock>,
     pub checkpoint: Option<GitStoreCheckpoint>,
 }
 
@@ -804,18 +805,25 @@ impl AcpThread {
         let entries_len = self.entries.len();
 
         if let Some(last_entry) = self.entries.last_mut()
-            && let AgentThreadEntry::UserMessage(UserMessage { id, content, .. }) = last_entry
+            && let AgentThreadEntry::UserMessage(UserMessage {
+                id,
+                content,
+                chunks,
+                ..
+            }) = last_entry
         {
             *id = message_id.or(id.take());
-            content.append(chunk, &language_registry, cx);
+            content.append(chunk.clone(), &language_registry, cx);
+            chunks.push(chunk);
             let idx = entries_len - 1;
             cx.emit(AcpThreadEvent::EntryUpdated(idx));
         } else {
-            let content = ContentBlock::new(chunk, &language_registry, cx);
+            let content = ContentBlock::new(chunk.clone(), &language_registry, cx);
             self.push_entry(
                 AgentThreadEntry::UserMessage(UserMessage {
                     id: message_id,
                     content,
+                    chunks: vec![chunk],
                     checkpoint: None,
                 }),
                 cx,
@@ -1150,6 +1158,7 @@ impl AcpThread {
             AgentThreadEntry::UserMessage(UserMessage {
                 id: message_id.clone(),
                 content: block,
+                chunks: message.clone(),
                 checkpoint: None,
             }),
             cx,
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 03174608fb..b18cbfe18e 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -1,16 +1,21 @@
 use agent::ThreadId;
 use anyhow::{Context as _, Result, bail};
+use file_icons::FileIcons;
 use prompt_store::{PromptId, UserPromptId};
 use std::{
     fmt,
     ops::Range,
     path::{Path, PathBuf},
 };
+use ui::{App, IconName, SharedString};
 use url::Url;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum MentionUri {
-    File(PathBuf),
+    File {
+        abs_path: PathBuf,
+        is_directory: bool,
+    },
     Symbol {
         path: PathBuf,
         name: String,
@@ -75,8 +80,12 @@ impl MentionUri {
                 } else {
                     let file_path =
                         PathBuf::from(format!("{}{}", url.host_str().unwrap_or(""), path));
+                    let is_directory = input.ends_with("/");
 
-                    Ok(Self::File(file_path))
+                    Ok(Self::File {
+                        abs_path: file_path,
+                        is_directory,
+                    })
                 }
             }
             "zed" => {
@@ -108,9 +117,9 @@ impl MentionUri {
         }
     }
 
-    fn name(&self) -> String {
+    pub fn name(&self) -> String {
         match self {
-            MentionUri::File(path) => path
+            MentionUri::File { abs_path, .. } => abs_path
                 .file_name()
                 .unwrap_or_default()
                 .to_string_lossy()
@@ -126,15 +135,45 @@ impl MentionUri {
         }
     }
 
+    pub fn icon_path(&self, cx: &mut App) -> SharedString {
+        match self {
+            MentionUri::File {
+                abs_path,
+                is_directory,
+            } => {
+                if *is_directory {
+                    FileIcons::get_folder_icon(false, cx)
+                        .unwrap_or_else(|| IconName::Folder.path().into())
+                } else {
+                    FileIcons::get_icon(&abs_path, cx)
+                        .unwrap_or_else(|| IconName::File.path().into())
+                }
+            }
+            MentionUri::Symbol { .. } => IconName::Code.path().into(),
+            MentionUri::Thread { .. } => IconName::Thread.path().into(),
+            MentionUri::TextThread { .. } => IconName::Thread.path().into(),
+            MentionUri::Rule { .. } => IconName::Reader.path().into(),
+            MentionUri::Selection { .. } => IconName::Reader.path().into(),
+            MentionUri::Fetch { .. } => IconName::ToolWeb.path().into(),
+        }
+    }
+
     pub fn as_link<'a>(&'a self) -> MentionLink<'a> {
         MentionLink(self)
     }
 
     pub fn to_uri(&self) -> Url {
         match self {
-            MentionUri::File(path) => {
+            MentionUri::File {
+                abs_path,
+                is_directory,
+            } => {
                 let mut url = Url::parse("file:///").unwrap();
-                url.set_path(&path.to_string_lossy());
+                let mut path = abs_path.to_string_lossy().to_string();
+                if *is_directory && !path.ends_with("/") {
+                    path.push_str("/");
+                }
+                url.set_path(&path);
                 url
             }
             MentionUri::Symbol {
@@ -226,12 +265,53 @@ mod tests {
         let file_uri = "file:///path/to/file.rs";
         let parsed = MentionUri::parse(file_uri).unwrap();
         match &parsed {
-            MentionUri::File(path) => assert_eq!(path.to_str().unwrap(), "/path/to/file.rs"),
+            MentionUri::File {
+                abs_path,
+                is_directory,
+            } => {
+                assert_eq!(abs_path.to_str().unwrap(), "/path/to/file.rs");
+                assert!(!is_directory);
+            }
             _ => panic!("Expected File variant"),
         }
         assert_eq!(parsed.to_uri().to_string(), file_uri);
     }
 
+    #[test]
+    fn test_parse_directory_uri() {
+        let file_uri = "file:///path/to/dir/";
+        let parsed = MentionUri::parse(file_uri).unwrap();
+        match &parsed {
+            MentionUri::File {
+                abs_path,
+                is_directory,
+            } => {
+                assert_eq!(abs_path.to_str().unwrap(), "/path/to/dir/");
+                assert!(is_directory);
+            }
+            _ => panic!("Expected File variant"),
+        }
+        assert_eq!(parsed.to_uri().to_string(), file_uri);
+    }
+
+    #[test]
+    fn test_to_directory_uri_with_slash() {
+        let uri = MentionUri::File {
+            abs_path: PathBuf::from("/path/to/dir/"),
+            is_directory: true,
+        };
+        assert_eq!(uri.to_uri().to_string(), "file:///path/to/dir/");
+    }
+
+    #[test]
+    fn test_to_directory_uri_without_slash() {
+        let uri = MentionUri::File {
+            abs_path: PathBuf::from("/path/to/dir"),
+            is_directory: true,
+        };
+        assert_eq!(uri.to_uri().to_string(), "file:///path/to/dir/");
+    }
+
     #[test]
     fn test_parse_symbol_uri() {
         let symbol_uri = "file:///path/to/file.rs?symbol=MySymbol#L10:20";
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 4156ec44d2..260aaaf550 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -124,12 +124,12 @@ impl UserMessage {
                 }
                 UserMessageContent::Mention { uri, content } => {
                     match uri {
-                        MentionUri::File(path) => {
+                        MentionUri::File { abs_path, .. } => {
                             write!(
                                 &mut symbol_context,
                                 "\n{}",
                                 MarkdownCodeBlock {
-                                    tag: &codeblock_tag(&path, None),
+                                    tag: &codeblock_tag(&abs_path, None),
                                     text: &content.to_string(),
                                 }
                             )
diff --git a/crates/agent_ui/src/acp.rs b/crates/agent_ui/src/acp.rs
index b9814adb2d..630aa730a6 100644
--- a/crates/agent_ui/src/acp.rs
+++ b/crates/agent_ui/src/acp.rs
@@ -1,10 +1,9 @@
 mod completion_provider;
-mod message_history;
+mod message_editor;
 mod model_selector;
 mod model_selector_popover;
 mod thread_view;
 
-pub use message_history::MessageHistory;
 pub use model_selector::AcpModelSelector;
 pub use model_selector_popover::AcpModelSelectorPopover;
 pub use thread_view::AcpThreadView;
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 46c8aa92f1..720ee23b00 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,5 +1,5 @@
 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
@@ -8,7 +8,7 @@ use anyhow::{Context as _, Result, anyhow};
 use collections::{HashMap, HashSet};
 use editor::display_map::CreaseId;
 use editor::{CompletionProvider, Editor, ExcerptId, ToOffset as _};
-use file_icons::FileIcons;
+
 use futures::future::try_join_all;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{App, Entity, Task, WeakEntity};
@@ -28,10 +28,7 @@ use url::Url;
 use workspace::Workspace;
 use workspace::notifications::NotifyResultExt;
 
-use agent::{
-    context::RULES_ICON,
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use agent::thread_store::{TextThreadStore, ThreadStore};
 
 use crate::context_picker::fetch_context_picker::fetch_url_content;
 use crate::context_picker::file_context_picker::{FileMatch, search_files};
@@ -66,6 +63,11 @@ impl MentionSet {
         self.uri_by_crease_id.drain().map(|(id, _)| id)
     }
 
+    pub fn clear(&mut self) {
+        self.fetch_results.clear();
+        self.uri_by_crease_id.clear();
+    }
+
     pub fn contents(
         &self,
         project: Entity<Project>,
@@ -79,12 +81,13 @@ impl MentionSet {
             .iter()
             .map(|(&crease_id, uri)| {
                 match uri {
-                    MentionUri::File(path) => {
+                    MentionUri::File { abs_path, .. } => {
+                        // TODO directories
                         let uri = uri.clone();
-                        let path = path.to_path_buf();
+                        let abs_path = abs_path.to_path_buf();
                         let buffer_task = project.update(cx, |project, cx| {
                             let path = project
-                                .find_project_path(path, cx)
+                                .find_project_path(abs_path, cx)
                                 .context("Failed to find project path")?;
                             anyhow::Ok(project.open_buffer(path, cx))
                         });
@@ -508,9 +511,14 @@ impl ContextPickerCompletionProvider {
                                             })
                                             .unwrap_or_default();
                                         let line_range = point_range.start.row..point_range.end.row;
+
+                                        let uri = MentionUri::Selection {
+                                            path: path.clone(),
+                                            line_range: line_range.clone(),
+                                        };
                                         let crease = crate::context_picker::crease_for_mention(
                                             selection_name(&path, &line_range).into(),
-                                            IconName::Reader.path().into(),
+                                            uri.icon_path(cx),
                                             range,
                                             editor.downgrade(),
                                         );
@@ -528,10 +536,7 @@ impl ContextPickerCompletionProvider {
                                                 crease_ids.try_into().unwrap()
                                             });
 
-                                        mention_set.lock().insert(
-                                            crease_id,
-                                            MentionUri::Selection { path, line_range },
-                                        );
+                                        mention_set.lock().insert(crease_id, uri);
 
                                         current_offset += text_len + 1;
                                     }
@@ -569,13 +574,8 @@ impl ContextPickerCompletionProvider {
         recent: bool,
         editor: Entity<Editor>,
         mention_set: Arc<Mutex<MentionSet>>,
+        cx: &mut App,
     ) -> Completion {
-        let icon_for_completion = if recent {
-            IconName::HistoryRerun
-        } else {
-            IconName::Thread
-        };
-
         let uri = match &thread_entry {
             ThreadContextEntry::Thread { id, title } => MentionUri::Thread {
                 id: id.clone(),
@@ -586,6 +586,13 @@ impl ContextPickerCompletionProvider {
                 name: title.to_string(),
             },
         };
+
+        let icon_for_completion = if recent {
+            IconName::HistoryRerun.path().into()
+        } else {
+            uri.icon_path(cx)
+        };
+
         let new_text = format!("{} ", uri.as_link());
 
         let new_text_len = new_text.len();
@@ -596,9 +603,9 @@ impl ContextPickerCompletionProvider {
             documentation: None,
             insert_text_mode: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(icon_for_completion.path().into()),
+            icon_path: Some(icon_for_completion.clone()),
             confirm: Some(confirm_completion_callback(
-                IconName::Thread.path().into(),
+                uri.icon_path(cx),
                 thread_entry.title().clone(),
                 excerpt_id,
                 source_range.start,
@@ -616,6 +623,7 @@ impl ContextPickerCompletionProvider {
         source_range: Range<Anchor>,
         editor: Entity<Editor>,
         mention_set: Arc<Mutex<MentionSet>>,
+        cx: &mut App,
     ) -> Completion {
         let uri = MentionUri::Rule {
             id: rule.prompt_id.into(),
@@ -623,6 +631,7 @@ impl ContextPickerCompletionProvider {
         };
         let new_text = format!("{} ", uri.as_link());
         let new_text_len = new_text.len();
+        let icon_path = uri.icon_path(cx);
         Completion {
             replace_range: source_range.clone(),
             new_text,
@@ -630,9 +639,9 @@ impl ContextPickerCompletionProvider {
             documentation: None,
             insert_text_mode: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(RULES_ICON.path().into()),
+            icon_path: Some(icon_path.clone()),
             confirm: Some(confirm_completion_callback(
-                RULES_ICON.path().into(),
+                icon_path,
                 rule.title.clone(),
                 excerpt_id,
                 source_range.start,
@@ -654,7 +663,7 @@ impl ContextPickerCompletionProvider {
         editor: Entity<Editor>,
         mention_set: Arc<Mutex<MentionSet>>,
         project: Entity<Project>,
-        cx: &App,
+        cx: &mut App,
     ) -> Option<Completion> {
         let (file_name, directory) =
             crate::context_picker::file_context_picker::extract_file_name_and_directory(
@@ -664,27 +673,21 @@ impl ContextPickerCompletionProvider {
 
         let label =
             build_code_label_for_full_path(&file_name, directory.as_ref().map(|s| s.as_ref()), cx);
-        let full_path = if let Some(directory) = directory {
-            format!("{}{}", directory, file_name)
-        } else {
-            file_name.to_string()
+
+        let abs_path = project.read(cx).absolute_path(&project_path, cx)?;
+
+        let file_uri = MentionUri::File {
+            abs_path,
+            is_directory,
         };
 
-        let crease_icon_path = if is_directory {
-            FileIcons::get_folder_icon(false, cx).unwrap_or_else(|| IconName::Folder.path().into())
-        } else {
-            FileIcons::get_icon(Path::new(&full_path), cx)
-                .unwrap_or_else(|| IconName::File.path().into())
-        };
+        let crease_icon_path = file_uri.icon_path(cx);
         let completion_icon_path = if is_recent {
             IconName::HistoryRerun.path().into()
         } else {
             crease_icon_path.clone()
         };
 
-        let abs_path = project.read(cx).absolute_path(&project_path, cx)?;
-
-        let file_uri = MentionUri::File(abs_path);
         let new_text = format!("{} ", file_uri.as_link());
         let new_text_len = new_text.len();
         Some(Completion {
@@ -729,16 +732,17 @@ impl ContextPickerCompletionProvider {
         };
         let new_text = format!("{} ", uri.as_link());
         let new_text_len = new_text.len();
+        let icon_path = uri.icon_path(cx);
         Some(Completion {
             replace_range: source_range.clone(),
             new_text,
             label,
             documentation: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(IconName::Code.path().into()),
+            icon_path: Some(icon_path.clone()),
             insert_text_mode: None,
             confirm: Some(confirm_completion_callback(
-                IconName::Code.path().into(),
+                icon_path,
                 symbol.name.clone().into(),
                 excerpt_id,
                 source_range.start,
@@ -757,16 +761,23 @@ impl ContextPickerCompletionProvider {
         editor: Entity<Editor>,
         mention_set: Arc<Mutex<MentionSet>>,
         http_client: Arc<HttpClientWithUrl>,
+        cx: &mut App,
     ) -> Option<Completion> {
         let new_text = format!("@fetch {} ", url_to_fetch.clone());
         let new_text_len = new_text.len();
+        let mention_uri = MentionUri::Fetch {
+            url: url::Url::parse(url_to_fetch.as_ref())
+                .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
+                .ok()?,
+        };
+        let icon_path = mention_uri.icon_path(cx);
         Some(Completion {
             replace_range: source_range.clone(),
             new_text,
             label: CodeLabel::plain(url_to_fetch.to_string(), None),
             documentation: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(IconName::ToolWeb.path().into()),
+            icon_path: Some(icon_path.clone()),
             insert_text_mode: None,
             confirm: Some({
                 let start = source_range.start;
@@ -774,6 +785,7 @@ impl ContextPickerCompletionProvider {
                 let editor = editor.clone();
                 let url_to_fetch = url_to_fetch.clone();
                 let source_range = source_range.clone();
+                let icon_path = icon_path.clone();
                 Arc::new(move |_, window, cx| {
                     let Some(url) = url::Url::parse(url_to_fetch.as_ref())
                         .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
@@ -781,12 +793,12 @@ impl ContextPickerCompletionProvider {
                     else {
                         return false;
                     };
-                    let mention_uri = MentionUri::Fetch { url: url.clone() };
 
                     let editor = editor.clone();
                     let mention_set = mention_set.clone();
                     let http_client = http_client.clone();
                     let source_range = source_range.clone();
+                    let icon_path = icon_path.clone();
                     window.defer(cx, move |window, cx| {
                         let url = url.clone();
 
@@ -795,7 +807,7 @@ impl ContextPickerCompletionProvider {
                             start,
                             content_len,
                             url.to_string().into(),
-                            IconName::ToolWeb.path().into(),
+                            icon_path,
                             editor.clone(),
                             window,
                             cx,
@@ -814,8 +826,10 @@ impl ContextPickerCompletionProvider {
                                         .await
                                         .notify_async_err(cx)
                                 {
-                                    mention_set.lock().add_fetch_result(url, content);
-                                    mention_set.lock().insert(crease_id, mention_uri.clone());
+                                    mention_set.lock().add_fetch_result(url.clone(), content);
+                                    mention_set
+                                        .lock()
+                                        .insert(crease_id, MentionUri::Fetch { url });
                                 } else {
                                     // Remove crease if we failed to fetch
                                     editor
@@ -911,8 +925,8 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
             for uri in mention_set.uri_by_crease_id.values() {
                 match uri {
-                    MentionUri::File(path) => {
-                        excluded_paths.insert(path.clone());
+                    MentionUri::File { abs_path, .. } => {
+                        excluded_paths.insert(abs_path.clone());
                     }
                     MentionUri::Thread { id, .. } => {
                         excluded_threads.insert(id.clone());
@@ -1001,6 +1015,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                             is_recent,
                             editor.clone(),
                             mention_set.clone(),
+                            cx,
                         )),
 
                         Match::Rules(user_rules) => Some(Self::completion_for_rules(
@@ -1009,6 +1024,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                             source_range.clone(),
                             editor.clone(),
                             mention_set.clone(),
+                            cx,
                         )),
 
                         Match::Fetch(url) => Self::completion_for_fetch(
@@ -1018,6 +1034,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                             editor.clone(),
                             mention_set.clone(),
                             http_client.clone(),
+                            cx,
                         ),
 
                         Match::Entry(EntryMatch { entry, .. }) => Self::completion_for_entry(
@@ -1179,7 +1196,7 @@ mod tests {
     use serde_json::json;
     use settings::SettingsStore;
     use smol::stream::StreamExt as _;
-    use std::{ops::Deref, rc::Rc};
+    use std::{ops::Deref, path::Path, rc::Rc};
     use util::path;
     use workspace::{AppState, Item};
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
new file mode 100644
index 0000000000..fc34420d4e
--- /dev/null
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -0,0 +1,469 @@
+use crate::acp::completion_provider::ContextPickerCompletionProvider;
+use crate::acp::completion_provider::MentionSet;
+use acp_thread::MentionUri;
+use agent::TextThreadStore;
+use agent::ThreadStore;
+use agent_client_protocol as acp;
+use anyhow::Result;
+use collections::HashSet;
+use editor::{
+    AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorMode,
+    EditorStyle, MultiBuffer,
+};
+use gpui::{
+    AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, Task, TextStyle, WeakEntity,
+};
+use language::Buffer;
+use language::Language;
+use parking_lot::Mutex;
+use project::{CompletionIntent, Project};
+use settings::Settings;
+use std::fmt::Write;
+use std::rc::Rc;
+use std::sync::Arc;
+use theme::ThemeSettings;
+use ui::{
+    ActiveTheme, App, InteractiveElement, IntoElement, ParentElement, Render, Styled, TextSize,
+    Window, div,
+};
+use util::ResultExt;
+use workspace::Workspace;
+use zed_actions::agent::Chat;
+
+pub struct MessageEditor {
+    editor: Entity<Editor>,
+    project: Entity<Project>,
+    thread_store: Entity<ThreadStore>,
+    text_thread_store: Entity<TextThreadStore>,
+    mention_set: Arc<Mutex<MentionSet>>,
+}
+
+pub enum MessageEditorEvent {
+    Send,
+    Cancel,
+}
+
+impl EventEmitter<MessageEditorEvent> for MessageEditor {}
+
+impl MessageEditor {
+    pub fn new(
+        workspace: WeakEntity<Workspace>,
+        project: Entity<Project>,
+        thread_store: Entity<ThreadStore>,
+        text_thread_store: Entity<TextThreadStore>,
+        mode: EditorMode,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let language = Language::new(
+            language::LanguageConfig {
+                completion_query_characters: HashSet::from_iter(['.', '-', '_', '@']),
+                ..Default::default()
+            },
+            None,
+        );
+
+        let mention_set = Arc::new(Mutex::new(MentionSet::default()));
+        let editor = cx.new(|cx| {
+            let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
+            let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+
+            let mut editor = Editor::new(mode, buffer, None, window, cx);
+            editor.set_placeholder_text("Message the agent － @ to include files", cx);
+            editor.set_show_indent_guides(false, cx);
+            editor.set_soft_wrap();
+            editor.set_use_modal_editing(true);
+            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
+                mention_set.clone(),
+                workspace,
+                thread_store.downgrade(),
+                text_thread_store.downgrade(),
+                cx.weak_entity(),
+            ))));
+            editor.set_context_menu_options(ContextMenuOptions {
+                min_entries_visible: 12,
+                max_entries_visible: 12,
+                placement: Some(ContextMenuPlacement::Above),
+            });
+            editor
+        });
+
+        Self {
+            editor,
+            project,
+            mention_set,
+            thread_store,
+            text_thread_store,
+        }
+    }
+
+    pub fn is_empty(&self, cx: &App) -> bool {
+        self.editor.read(cx).is_empty(cx)
+    }
+
+    pub fn contents(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Vec<acp::ContentBlock>>> {
+        let contents = self.mention_set.lock().contents(
+            self.project.clone(),
+            self.thread_store.clone(),
+            self.text_thread_store.clone(),
+            window,
+            cx,
+        );
+        let editor = self.editor.clone();
+
+        cx.spawn(async move |_, cx| {
+            let contents = contents.await?;
+
+            editor.update(cx, |editor, cx| {
+                let mut ix = 0;
+                let mut chunks: Vec<acp::ContentBlock> = Vec::new();
+                let text = editor.text(cx);
+                editor.display_map.update(cx, |map, cx| {
+                    let snapshot = map.snapshot(cx);
+                    for (crease_id, crease) in snapshot.crease_snapshot.creases() {
+                        // Skip creases that have been edited out of the message buffer.
+                        if !crease.range().start.is_valid(&snapshot.buffer_snapshot) {
+                            continue;
+                        }
+
+                        if let Some(mention) = contents.get(&crease_id) {
+                            let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot);
+                            if crease_range.start > ix {
+                                chunks.push(text[ix..crease_range.start].into());
+                            }
+                            chunks.push(acp::ContentBlock::Resource(acp::EmbeddedResource {
+                                annotations: None,
+                                resource: acp::EmbeddedResourceResource::TextResourceContents(
+                                    acp::TextResourceContents {
+                                        mime_type: None,
+                                        text: mention.content.clone(),
+                                        uri: mention.uri.to_uri().to_string(),
+                                    },
+                                ),
+                            }));
+                            ix = crease_range.end;
+                        }
+                    }
+
+                    if ix < text.len() {
+                        let last_chunk = text[ix..].trim_end();
+                        if !last_chunk.is_empty() {
+                            chunks.push(last_chunk.into());
+                        }
+                    }
+                });
+
+                chunks
+            })
+        })
+    }
+
+    pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.clear(window, cx);
+            editor.remove_creases(self.mention_set.lock().drain(), cx)
+        });
+    }
+
+    fn chat(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
+        cx.emit(MessageEditorEvent::Send)
+    }
+
+    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
+        cx.emit(MessageEditorEvent::Cancel)
+    }
+
+    pub fn insert_dragged_files(
+        &self,
+        paths: Vec<project::ProjectPath>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let buffer = self.editor.read(cx).buffer().clone();
+        let Some((&excerpt_id, _, _)) = buffer.read(cx).snapshot(cx).as_singleton() else {
+            return;
+        };
+        let Some(buffer) = buffer.read(cx).as_singleton() else {
+            return;
+        };
+        for path in paths {
+            let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
+                continue;
+            };
+            let Some(abs_path) = self.project.read(cx).absolute_path(&path, cx) else {
+                continue;
+            };
+
+            let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
+            let path_prefix = abs_path
+                .file_name()
+                .unwrap_or(path.path.as_os_str())
+                .display()
+                .to_string();
+            let Some(completion) = ContextPickerCompletionProvider::completion_for_path(
+                path,
+                &path_prefix,
+                false,
+                entry.is_dir(),
+                excerpt_id,
+                anchor..anchor,
+                self.editor.clone(),
+                self.mention_set.clone(),
+                self.project.clone(),
+                cx,
+            ) else {
+                continue;
+            };
+
+            self.editor.update(cx, |message_editor, cx| {
+                message_editor.edit(
+                    [(
+                        multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
+                        completion.new_text,
+                    )],
+                    cx,
+                );
+            });
+            if let Some(confirm) = completion.confirm.clone() {
+                confirm(CompletionIntent::Complete, window, cx);
+            }
+        }
+    }
+
+    pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.set_mode(mode);
+            cx.notify()
+        });
+    }
+
+    pub fn set_message(
+        &mut self,
+        message: &[acp::ContentBlock],
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let mut text = String::new();
+        let mut mentions = Vec::new();
+
+        for chunk in message {
+            match chunk {
+                acp::ContentBlock::Text(text_content) => {
+                    text.push_str(&text_content.text);
+                }
+                acp::ContentBlock::Resource(acp::EmbeddedResource {
+                    resource: acp::EmbeddedResourceResource::TextResourceContents(resource),
+                    ..
+                }) => {
+                    if let Some(mention_uri) = MentionUri::parse(&resource.uri).log_err() {
+                        let start = text.len();
+                        write!(&mut text, "{}", mention_uri.as_link()).ok();
+                        let end = text.len();
+                        mentions.push((start..end, mention_uri));
+                    }
+                }
+                acp::ContentBlock::Image(_)
+                | acp::ContentBlock::Audio(_)
+                | acp::ContentBlock::Resource(_)
+                | acp::ContentBlock::ResourceLink(_) => {}
+            }
+        }
+
+        let snapshot = self.editor.update(cx, |editor, cx| {
+            editor.set_text(text, window, cx);
+            editor.buffer().read(cx).snapshot(cx)
+        });
+
+        self.mention_set.lock().clear();
+        for (range, mention_uri) in mentions {
+            let anchor = snapshot.anchor_before(range.start);
+            let crease_id = crate::context_picker::insert_crease_for_mention(
+                anchor.excerpt_id,
+                anchor.text_anchor,
+                range.end - range.start,
+                mention_uri.name().into(),
+                mention_uri.icon_path(cx),
+                self.editor.clone(),
+                window,
+                cx,
+            );
+
+            if let Some(crease_id) = crease_id {
+                self.mention_set.lock().insert(crease_id, mention_uri);
+            }
+        }
+        cx.notify();
+    }
+
+    #[cfg(test)]
+    pub fn set_text(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.set_text(text, window, cx);
+        });
+    }
+}
+
+impl Focusable for MessageEditor {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.editor.focus_handle(cx)
+    }
+}
+
+impl Render for MessageEditor {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .key_context("MessageEditor")
+            .on_action(cx.listener(Self::chat))
+            .on_action(cx.listener(Self::cancel))
+            .flex_1()
+            .child({
+                let settings = ThemeSettings::get_global(cx);
+                let font_size = TextSize::Small
+                    .rems(cx)
+                    .to_pixels(settings.agent_font_size(cx));
+                let line_height = settings.buffer_line_height.value() * font_size;
+
+                let text_style = TextStyle {
+                    color: cx.theme().colors().text,
+                    font_family: settings.buffer_font.family.clone(),
+                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
+                    font_features: settings.buffer_font.features.clone(),
+                    font_size: font_size.into(),
+                    line_height: line_height.into(),
+                    ..Default::default()
+                };
+
+                EditorElement::new(
+                    &self.editor,
+                    EditorStyle {
+                        background: cx.theme().colors().editor_background,
+                        local_player: cx.theme().players().local(),
+                        text: text_style,
+                        syntax: cx.theme().syntax().clone(),
+                        ..Default::default()
+                    },
+                )
+            })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use agent::{TextThreadStore, ThreadStore};
+    use agent_client_protocol as acp;
+    use editor::EditorMode;
+    use fs::FakeFs;
+    use gpui::{AppContext, TestAppContext};
+    use lsp::{CompletionContext, CompletionTriggerKind};
+    use project::{CompletionIntent, Project};
+    use serde_json::json;
+    use util::path;
+    use workspace::Workspace;
+
+    use crate::acp::{message_editor::MessageEditor, thread_view::tests::init_test};
+
+    #[gpui::test]
+    async fn test_at_mention_removal(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree("/project", json!({"file": ""})).await;
+        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
+
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
+        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+
+        let message_editor = cx.update(|window, cx| {
+            cx.new(|cx| {
+                MessageEditor::new(
+                    workspace.downgrade(),
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    EditorMode::AutoHeight {
+                        min_lines: 1,
+                        max_lines: None,
+                    },
+                    window,
+                    cx,
+                )
+            })
+        });
+        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
+
+        cx.run_until_parked();
+
+        let excerpt_id = editor.update(cx, |editor, cx| {
+            editor
+                .buffer()
+                .read(cx)
+                .excerpt_ids()
+                .into_iter()
+                .next()
+                .unwrap()
+        });
+        let completions = editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Hello @file ", window, cx);
+            let buffer = editor.buffer().read(cx).as_singleton().unwrap();
+            let completion_provider = editor.completion_provider().unwrap();
+            completion_provider.completions(
+                excerpt_id,
+                &buffer,
+                text::Anchor::MAX,
+                CompletionContext {
+                    trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
+                    trigger_character: Some("@".into()),
+                },
+                window,
+                cx,
+            )
+        });
+        let [_, completion]: [_; 2] = completions
+            .await
+            .unwrap()
+            .into_iter()
+            .flat_map(|response| response.completions)
+            .collect::<Vec<_>>()
+            .try_into()
+            .unwrap();
+
+        editor.update_in(cx, |editor, window, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            let start = snapshot
+                .anchor_in_excerpt(excerpt_id, completion.replace_range.start)
+                .unwrap();
+            let end = snapshot
+                .anchor_in_excerpt(excerpt_id, completion.replace_range.end)
+                .unwrap();
+            editor.edit([(start..end, completion.new_text)], cx);
+            (completion.confirm.unwrap())(CompletionIntent::Complete, window, cx);
+        });
+
+        cx.run_until_parked();
+
+        // Backspace over the inserted crease (and the following space).
+        editor.update_in(cx, |editor, window, cx| {
+            editor.backspace(&Default::default(), window, cx);
+            editor.backspace(&Default::default(), window, cx);
+        });
+
+        let content = message_editor
+            .update_in(cx, |message_editor, window, cx| {
+                message_editor.contents(window, cx)
+            })
+            .await
+            .unwrap();
+
+        // We don't send a resource link for the deleted crease.
+        pretty_assertions::assert_matches!(content.as_slice(), [acp::ContentBlock::Text { .. }]);
+    }
+}
diff --git a/crates/agent_ui/src/acp/message_history.rs b/crates/agent_ui/src/acp/message_history.rs
deleted file mode 100644
index c8280573a0..0000000000
--- a/crates/agent_ui/src/acp/message_history.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-pub struct MessageHistory<T> {
-    items: Vec<T>,
-    current: Option<usize>,
-}
-
-impl<T> Default for MessageHistory<T> {
-    fn default() -> Self {
-        MessageHistory {
-            items: Vec::new(),
-            current: None,
-        }
-    }
-}
-
-impl<T> MessageHistory<T> {
-    pub fn push(&mut self, message: T) {
-        self.current.take();
-        self.items.push(message);
-    }
-
-    pub fn reset_position(&mut self) {
-        self.current.take();
-    }
-
-    pub fn prev(&mut self) -> Option<&T> {
-        if self.items.is_empty() {
-            return None;
-        }
-
-        let new_ix = self
-            .current
-            .get_or_insert(self.items.len())
-            .saturating_sub(1);
-
-        self.current = Some(new_ix);
-        self.items.get(new_ix)
-    }
-
-    pub fn next(&mut self) -> Option<&T> {
-        let current = self.current.as_mut()?;
-        *current += 1;
-
-        self.items.get(*current).or_else(|| {
-            self.current.take();
-            None
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_prev_next() {
-        let mut history = MessageHistory::default();
-
-        // Test empty history
-        assert_eq!(history.prev(), None);
-        assert_eq!(history.next(), None);
-
-        // Add some messages
-        history.push("first");
-        history.push("second");
-        history.push("third");
-
-        // Test prev navigation
-        assert_eq!(history.prev(), Some(&"third"));
-        assert_eq!(history.prev(), Some(&"second"));
-        assert_eq!(history.prev(), Some(&"first"));
-        assert_eq!(history.prev(), Some(&"first"));
-
-        assert_eq!(history.next(), Some(&"second"));
-
-        // Test mixed navigation
-        history.push("fourth");
-        assert_eq!(history.prev(), Some(&"fourth"));
-        assert_eq!(history.prev(), Some(&"third"));
-        assert_eq!(history.next(), Some(&"fourth"));
-        assert_eq!(history.next(), None);
-
-        // Test that push resets navigation
-        history.prev();
-        history.prev();
-        history.push("fifth");
-        assert_eq!(history.prev(), Some(&"fifth"));
-    }
-}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 5f67dc15b8..2a72cc6f48 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -12,34 +12,25 @@ use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
-use editor::{
-    AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorMode,
-    EditorStyle, MinimapVisibility, MultiBuffer, PathKey, SelectionEffects,
-};
+use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
 use gpui::{
-    Action, Animation, AnimationExt, App, BorderStyle, EdgesRefinement, Empty, Entity, EntityId,
-    FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton, PlatformDisplay,
-    SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement,
-    Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div, linear_color_stop,
-    linear_gradient, list, percentage, point, prelude::*, pulsating_between,
+    Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, EdgesRefinement, Empty, Entity,
+    EntityId, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton,
+    PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle,
+    TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
+    linear_color_stop, linear_gradient, list, percentage, point, prelude::*, pulsating_between,
 };
+use language::Buffer;
 use language::language_settings::SoftWrap;
-use language::{Buffer, Language};
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
-use parking_lot::Mutex;
-use project::{CompletionIntent, Project};
+use project::Project;
 use prompt_store::PromptId;
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
-use std::fmt::Write as _;
-use std::path::PathBuf;
-use std::{
-    cell::RefCell, collections::BTreeMap, path::Path, process::ExitStatus, rc::Rc, sync::Arc,
-    time::Duration,
-};
+use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
 use terminal_view::TerminalView;
-use text::{Anchor, BufferSnapshot};
+use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
     Disclosure, Divider, DividerColor, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState,
@@ -47,14 +38,12 @@ use ui::{
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::{Chat, NextHistoryMessage, PreviousHistoryMessage, ToggleModelSelector};
+use zed_actions::agent::{Chat, ToggleModelSelector};
 use zed_actions::assistant::OpenRulesLibrary;
 
 use crate::acp::AcpModelSelectorPopover;
-use crate::acp::completion_provider::{ContextPickerCompletionProvider, MentionSet};
-use crate::acp::message_history::MessageHistory;
+use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
-use crate::message_editor::{MAX_EDITOR_LINES, MIN_EDITOR_LINES};
 use crate::ui::{AgentNotification, AgentNotificationEvent};
 use crate::{
     AgentDiffPane, AgentPanel, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, RejectAll,
@@ -62,6 +51,9 @@ use crate::{
 
 const RESPONSE_PADDING_X: Pixels = px(19.);
 
+pub const MIN_EDITOR_LINES: usize = 4;
+pub const MAX_EDITOR_LINES: usize = 8;
+
 pub struct AcpThreadView {
     agent: Rc<dyn AgentServer>,
     workspace: WeakEntity<Workspace>,
@@ -71,11 +63,8 @@ pub struct AcpThreadView {
     thread_state: ThreadState,
     diff_editors: HashMap<EntityId, Entity<Editor>>,
     terminal_views: HashMap<EntityId, Entity<TerminalView>>,
-    message_editor: Entity<Editor>,
+    message_editor: Entity<MessageEditor>,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
-    message_set_from_history: Option<BufferSnapshot>,
-    _message_editor_subscription: Subscription,
-    mention_set: Arc<Mutex<MentionSet>>,
     notifications: Vec<WindowHandle<AgentNotification>>,
     notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
     last_error: Option<Entity<Markdown>>,
@@ -88,9 +77,16 @@ pub struct AcpThreadView {
     plan_expanded: bool,
     editor_expanded: bool,
     terminal_expanded: bool,
-    message_history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
+    editing_message: Option<EditingMessage>,
     _cancel_task: Option<Task<()>>,
-    _subscriptions: [Subscription; 1],
+    _subscriptions: [Subscription; 2],
+}
+
+struct EditingMessage {
+    index: usize,
+    message_id: UserMessageId,
+    editor: Entity<MessageEditor>,
+    _subscription: Subscription,
 }
 
 enum ThreadState {
@@ -117,83 +113,30 @@ impl AcpThreadView {
         project: Entity<Project>,
         thread_store: Entity<ThreadStore>,
         text_thread_store: Entity<TextThreadStore>,
-        message_history: Rc<RefCell<MessageHistory<Vec<acp::ContentBlock>>>>,
-        min_lines: usize,
-        max_lines: Option<usize>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let language = Language::new(
-            language::LanguageConfig {
-                completion_query_characters: HashSet::from_iter(['.', '-', '_', '@']),
-                ..Default::default()
-            },
-            None,
-        );
-
-        let mention_set = Arc::new(Mutex::new(MentionSet::default()));
-
         let message_editor = cx.new(|cx| {
-            let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
-            let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-            let mut editor = Editor::new(
+            MessageEditor::new(
+                workspace.clone(),
+                project.clone(),
+                thread_store.clone(),
+                text_thread_store.clone(),
                 editor::EditorMode::AutoHeight {
-                    min_lines,
-                    max_lines: max_lines,
+                    min_lines: MIN_EDITOR_LINES,
+                    max_lines: Some(MAX_EDITOR_LINES),
                 },
-                buffer,
-                None,
                 window,
                 cx,
-            );
-            editor.set_placeholder_text("Message the agent － @ to include files", cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_soft_wrap();
-            editor.set_use_modal_editing(true);
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
-                mention_set.clone(),
-                workspace.clone(),
-                thread_store.downgrade(),
-                text_thread_store.downgrade(),
-                cx.weak_entity(),
-            ))));
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: Some(ContextMenuPlacement::Above),
-            });
-            editor
+            )
         });
 
-        let message_editor_subscription =
-            cx.subscribe(&message_editor, |this, editor, event, cx| {
-                if let editor::EditorEvent::BufferEdited = &event {
-                    let buffer = editor
-                        .read(cx)
-                        .buffer()
-                        .read(cx)
-                        .as_singleton()
-                        .unwrap()
-                        .read(cx)
-                        .snapshot();
-                    if let Some(message) = this.message_set_from_history.clone()
-                        && message.version() != buffer.version()
-                    {
-                        this.message_set_from_history = None;
-                    }
-
-                    if this.message_set_from_history.is_none() {
-                        this.message_history.borrow_mut().reset_position();
-                    }
-                }
-            });
-
-        let mention_set = mention_set.clone();
-
         let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0));
 
-        let subscription = cx.observe_global_in::<SettingsStore>(window, Self::settings_changed);
+        let subscriptions = [
+            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
+            cx.subscribe_in(&message_editor, window, Self::on_message_editor_event),
+        ];
 
         Self {
             agent: agent.clone(),
@@ -204,9 +147,6 @@ impl AcpThreadView {
             thread_state: Self::initial_state(agent, workspace, project, window, cx),
             message_editor,
             model_selector: None,
-            message_set_from_history: None,
-            _message_editor_subscription: message_editor_subscription,
-            mention_set,
             notifications: Vec::new(),
             notification_subscriptions: HashMap::default(),
             diff_editors: Default::default(),
@@ -217,12 +157,12 @@ impl AcpThreadView {
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
             expanded_thinking_blocks: HashSet::default(),
+            editing_message: None,
             edits_expanded: false,
             plan_expanded: false,
             editor_expanded: false,
             terminal_expanded: true,
-            message_history,
-            _subscriptions: [subscription],
+            _subscriptions: subscriptions,
             _cancel_task: None,
         }
     }
@@ -370,7 +310,7 @@ impl AcpThreadView {
         }
     }
 
-    pub fn cancel(&mut self, cx: &mut Context<Self>) {
+    pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
         self.last_error.take();
 
         if let Some(thread) = self.thread() {
@@ -390,193 +330,118 @@ impl AcpThreadView {
 
     fn set_editor_is_expanded(&mut self, is_expanded: bool, cx: &mut Context<Self>) {
         self.editor_expanded = is_expanded;
-        self.message_editor.update(cx, |editor, _| {
-            if self.editor_expanded {
-                editor.set_mode(EditorMode::Full {
-                    scale_ui_elements_with_buffer_font_size: false,
-                    show_active_line_background: false,
-                    sized_by_content: false,
-                })
+        self.message_editor.update(cx, |editor, cx| {
+            if is_expanded {
+                editor.set_mode(
+                    EditorMode::Full {
+                        scale_ui_elements_with_buffer_font_size: false,
+                        show_active_line_background: false,
+                        sized_by_content: false,
+                    },
+                    cx,
+                )
             } else {
-                editor.set_mode(EditorMode::AutoHeight {
-                    min_lines: MIN_EDITOR_LINES,
-                    max_lines: Some(MAX_EDITOR_LINES),
-                })
+                editor.set_mode(
+                    EditorMode::AutoHeight {
+                        min_lines: MIN_EDITOR_LINES,
+                        max_lines: Some(MAX_EDITOR_LINES),
+                    },
+                    cx,
+                )
             }
         });
         cx.notify();
     }
 
-    fn chat(&mut self, _: &Chat, window: &mut Window, cx: &mut Context<Self>) {
+    pub fn on_message_editor_event(
+        &mut self,
+        _: &Entity<MessageEditor>,
+        event: &MessageEditorEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match event {
+            MessageEditorEvent::Send => self.send(window, cx),
+            MessageEditorEvent::Cancel => self.cancel_generation(cx),
+        }
+    }
+
+    fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let contents = self
+            .message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(window, cx));
+        self.send_impl(contents, window, cx)
+    }
+
+    fn send_impl(
+        &mut self,
+        contents: Task<anyhow::Result<Vec<acp::ContentBlock>>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         self.last_error.take();
+        self.editing_message.take();
 
-        let mut ix = 0;
-        let mut chunks: Vec<acp::ContentBlock> = Vec::new();
-        let project = self.project.clone();
+        let Some(thread) = self.thread().cloned() else {
+            return;
+        };
+        let task = cx.spawn_in(window, async move |this, cx| {
+            let contents = contents.await?;
 
-        let thread_store = self.thread_store.clone();
-        let text_thread_store = self.text_thread_store.clone();
-
-        let contents =
-            self.mention_set
-                .lock()
-                .contents(project, thread_store, text_thread_store, window, cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            let contents = match contents.await {
-                Ok(contents) => contents,
-                Err(e) => {
-                    this.update(cx, |this, cx| {
-                        this.last_error =
-                            Some(cx.new(|cx| Markdown::new(e.to_string().into(), None, None, cx)));
-                    })
-                    .ok();
-                    return;
-                }
-            };
+            if contents.is_empty() {
+                return Ok(());
+            }
 
             this.update_in(cx, |this, window, cx| {
-                this.message_editor.update(cx, |editor, cx| {
-                    let text = editor.text(cx);
-                    editor.display_map.update(cx, |map, cx| {
-                        let snapshot = map.snapshot(cx);
-                        for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-                            // Skip creases that have been edited out of the message buffer.
-                            if !crease.range().start.is_valid(&snapshot.buffer_snapshot) {
-                                continue;
-                            }
-
-                            if let Some(mention) = contents.get(&crease_id) {
-                                let crease_range =
-                                    crease.range().to_offset(&snapshot.buffer_snapshot);
-                                if crease_range.start > ix {
-                                    chunks.push(text[ix..crease_range.start].into());
-                                }
-                                chunks.push(acp::ContentBlock::Resource(acp::EmbeddedResource {
-                                    annotations: None,
-                                    resource: acp::EmbeddedResourceResource::TextResourceContents(
-                                        acp::TextResourceContents {
-                                            mime_type: None,
-                                            text: mention.content.clone(),
-                                            uri: mention.uri.to_uri().to_string(),
-                                        },
-                                    ),
-                                }));
-                                ix = crease_range.end;
-                            }
-                        }
-
-                        if ix < text.len() {
-                            let last_chunk = text[ix..].trim_end();
-                            if !last_chunk.is_empty() {
-                                chunks.push(last_chunk.into());
-                            }
-                        }
-                    })
-                });
-
-                if chunks.is_empty() {
-                    return;
-                }
-
-                let Some(thread) = this.thread() else {
-                    return;
-                };
-                let task = thread.update(cx, |thread, cx| thread.send(chunks.clone(), cx));
-
-                cx.spawn(async move |this, cx| {
-                    let result = task.await;
-
-                    this.update(cx, |this, cx| {
-                        if let Err(err) = result {
-                            this.last_error =
-                                Some(cx.new(|cx| {
-                                    Markdown::new(err.to_string().into(), None, None, cx)
-                                }))
-                        }
-                    })
-                })
-                .detach();
-
-                let mention_set = this.mention_set.clone();
-
                 this.set_editor_is_expanded(false, cx);
-
-                this.message_editor.update(cx, |editor, cx| {
-                    editor.clear(window, cx);
-                    editor.remove_creases(mention_set.lock().drain(), cx)
-                });
-
                 this.scroll_to_bottom(cx);
+                this.message_editor.update(cx, |message_editor, cx| {
+                    message_editor.clear(window, cx);
+                });
+            })?;
+            let send = thread.update(cx, |thread, cx| thread.send(contents, cx))?;
+            send.await
+        });
 
-                this.message_history.borrow_mut().push(chunks);
-            })
-            .ok();
+        cx.spawn(async move |this, cx| {
+            if let Err(e) = task.await {
+                this.update(cx, |this, cx| {
+                    this.last_error =
+                        Some(cx.new(|cx| Markdown::new(e.to_string().into(), None, None, cx)));
+                    cx.notify()
+                })
+                .ok();
+            }
         })
         .detach();
     }
 
-    fn previous_history_message(
-        &mut self,
-        _: &PreviousHistoryMessage,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.message_set_from_history.is_none() && !self.message_editor.read(cx).is_empty(cx) {
-            self.message_editor.update(cx, |editor, cx| {
-                editor.move_up(&Default::default(), window, cx);
-            });
-            return;
-        }
-
-        self.message_set_from_history = Self::set_draft_message(
-            self.message_editor.clone(),
-            self.mention_set.clone(),
-            self.project.clone(),
-            self.message_history
-                .borrow_mut()
-                .prev()
-                .map(|blocks| blocks.as_slice()),
-            window,
-            cx,
-        );
+    fn cancel_editing(&mut self, _: &ClickEvent, _window: &mut Window, cx: &mut Context<Self>) {
+        self.editing_message.take();
+        cx.notify();
     }
 
-    fn next_history_message(
-        &mut self,
-        _: &NextHistoryMessage,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.message_set_from_history.is_none() {
-            self.message_editor.update(cx, |editor, cx| {
-                editor.move_down(&Default::default(), window, cx);
-            });
+    fn regenerate(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(editing_message) = self.editing_message.take() else {
             return;
-        }
-
-        let mut message_history = self.message_history.borrow_mut();
-        let next_history = message_history.next();
-
-        let set_draft_message = Self::set_draft_message(
-            self.message_editor.clone(),
-            self.mention_set.clone(),
-            self.project.clone(),
-            Some(
-                next_history
-                    .map(|blocks| blocks.as_slice())
-                    .unwrap_or_else(|| &[]),
-            ),
-            window,
-            cx,
-        );
-        // If we reset the text to an empty string because we ran out of history,
-        // we don't want to mark it as coming from the history
-        self.message_set_from_history = if next_history.is_some() {
-            set_draft_message
-        } else {
-            None
         };
+
+        let Some(thread) = self.thread().cloned() else {
+            return;
+        };
+
+        let rewind = thread.update(cx, |thread, cx| {
+            thread.rewind(editing_message.message_id, cx)
+        });
+
+        let contents = editing_message
+            .editor
+            .update(cx, |message_editor, cx| message_editor.contents(window, cx));
+        let task = cx.foreground_executor().spawn(async move {
+            rewind.await?;
+            contents.await
+        });
+        self.send_impl(task, window, cx);
     }
 
     fn open_agent_diff(&mut self, _: &OpenAgentDiff, window: &mut Window, cx: &mut Context<Self>) {
@@ -606,92 +471,6 @@ impl AcpThreadView {
         })
     }
 
-    fn set_draft_message(
-        message_editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
-        project: Entity<Project>,
-        message: Option<&[acp::ContentBlock]>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<BufferSnapshot> {
-        cx.notify();
-
-        let message = message?;
-
-        let mut text = String::new();
-        let mut mentions = Vec::new();
-
-        for chunk in message {
-            match chunk {
-                acp::ContentBlock::Text(text_content) => {
-                    text.push_str(&text_content.text);
-                }
-                acp::ContentBlock::Resource(acp::EmbeddedResource {
-                    resource: acp::EmbeddedResourceResource::TextResourceContents(resource),
-                    ..
-                }) => {
-                    let path = PathBuf::from(&resource.uri);
-                    let project_path = project.read(cx).project_path_for_absolute_path(&path, cx);
-                    let start = text.len();
-                    let _ = write!(&mut text, "{}", MentionUri::File(path).to_uri());
-                    let end = text.len();
-                    if let Some(project_path) = project_path {
-                        let filename: SharedString = project_path
-                            .path
-                            .file_name()
-                            .unwrap_or_default()
-                            .to_string_lossy()
-                            .to_string()
-                            .into();
-                        mentions.push((start..end, project_path, filename));
-                    }
-                }
-                acp::ContentBlock::Image(_)
-                | acp::ContentBlock::Audio(_)
-                | acp::ContentBlock::Resource(_)
-                | acp::ContentBlock::ResourceLink(_) => {}
-            }
-        }
-
-        let snapshot = message_editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-            editor.buffer().read(cx).snapshot(cx)
-        });
-
-        for (range, project_path, filename) in mentions {
-            let crease_icon_path = if project_path.path.is_dir() {
-                FileIcons::get_folder_icon(false, cx)
-                    .unwrap_or_else(|| IconName::Folder.path().into())
-            } else {
-                FileIcons::get_icon(Path::new(project_path.path.as_ref()), cx)
-                    .unwrap_or_else(|| IconName::File.path().into())
-            };
-
-            let anchor = snapshot.anchor_before(range.start);
-            if let Some(project_path) = project.read(cx).absolute_path(&project_path, cx) {
-                let crease_id = crate::context_picker::insert_crease_for_mention(
-                    anchor.excerpt_id,
-                    anchor.text_anchor,
-                    range.end - range.start,
-                    filename,
-                    crease_icon_path,
-                    message_editor.clone(),
-                    window,
-                    cx,
-                );
-
-                if let Some(crease_id) = crease_id {
-                    mention_set
-                        .lock()
-                        .insert(crease_id, MentionUri::File(project_path));
-                }
-            }
-        }
-
-        let snapshot = snapshot.as_singleton().unwrap().2.clone();
-        Some(snapshot.text)
-    }
-
     fn handle_thread_event(
         &mut self,
         thread: &Entity<AcpThread>,
@@ -968,12 +747,28 @@ impl AcpThreadView {
                         .border_1()
                         .border_color(cx.theme().colors().border)
                         .text_xs()
-                        .children(message.content.markdown().map(|md| {
-                            self.render_markdown(
-                                md.clone(),
-                                user_message_markdown_style(window, cx),
-                            )
-                        })),
+                        .id("message")
+                        .on_click(cx.listener({
+                            move |this, _, window, cx| this.start_editing_message(index, window, cx)
+                        }))
+                        .children(
+                            if let Some(editing) = self.editing_message.as_ref()
+                                && Some(&editing.message_id) == message.id.as_ref()
+                            {
+                                Some(
+                                    self.render_edit_message_editor(editing, cx)
+                                        .into_any_element(),
+                                )
+                            } else {
+                                message.content.markdown().map(|md| {
+                                    self.render_markdown(
+                                        md.clone(),
+                                        user_message_markdown_style(window, cx),
+                                    )
+                                    .into_any_element()
+                                })
+                            },
+                        ),
                 )
                 .into_any(),
             AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) => {
@@ -1035,7 +830,7 @@ impl AcpThreadView {
         };
 
         let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
-        if index == total_entries - 1 && !is_generating {
+        let primary = if index == total_entries - 1 && !is_generating {
             v_flex()
                 .w_full()
                 .child(primary)
@@ -1043,6 +838,28 @@ impl AcpThreadView {
                 .into_any_element()
         } else {
             primary
+        };
+
+        if let Some(editing) = self.editing_message.as_ref()
+            && editing.index < index
+        {
+            let backdrop = div()
+                .id(("backdrop", index))
+                .size_full()
+                .absolute()
+                .inset_0()
+                .bg(cx.theme().colors().panel_background)
+                .opacity(0.8)
+                .block_mouse_except_scroll()
+                .on_click(cx.listener(Self::cancel_editing));
+
+            div()
+                .relative()
+                .child(backdrop)
+                .child(primary)
+                .into_any_element()
+        } else {
+            primary
         }
     }
 
@@ -2561,34 +2378,7 @@ impl AcpThreadView {
                     .size_full()
                     .pt_1()
                     .pr_2p5()
-                    .child(div().flex_1().child({
-                        let settings = ThemeSettings::get_global(cx);
-                        let font_size = TextSize::Small
-                            .rems(cx)
-                            .to_pixels(settings.agent_font_size(cx));
-                        let line_height = settings.buffer_line_height.value() * font_size;
-
-                        let text_style = TextStyle {
-                            color: cx.theme().colors().text,
-                            font_family: settings.buffer_font.family.clone(),
-                            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                            font_features: settings.buffer_font.features.clone(),
-                            font_size: font_size.into(),
-                            line_height: line_height.into(),
-                            ..Default::default()
-                        };
-
-                        EditorElement::new(
-                            &self.message_editor,
-                            EditorStyle {
-                                background: editor_bg_color,
-                                local_player: cx.theme().players().local(),
-                                text: text_style,
-                                syntax: cx.theme().syntax().clone(),
-                                ..Default::default()
-                            },
-                        )
-                    }))
+                    .child(self.message_editor.clone())
                     .child(
                         h_flex()
                             .absolute()
@@ -2633,6 +2423,129 @@ impl AcpThreadView {
             .into_any()
     }
 
+    fn start_editing_message(&mut self, index: usize, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(thread) = self.thread() else {
+            return;
+        };
+        let Some(AgentThreadEntry::UserMessage(message)) = thread.read(cx).entries().get(index)
+        else {
+            return;
+        };
+        let Some(message_id) = message.id.clone() else {
+            return;
+        };
+
+        self.list_state.scroll_to_reveal_item(index);
+
+        let chunks = message.chunks.clone();
+        let editor = cx.new(|cx| {
+            let mut editor = MessageEditor::new(
+                self.workspace.clone(),
+                self.project.clone(),
+                self.thread_store.clone(),
+                self.text_thread_store.clone(),
+                editor::EditorMode::AutoHeight {
+                    min_lines: 1,
+                    max_lines: None,
+                },
+                window,
+                cx,
+            );
+            editor.set_message(&chunks, window, cx);
+            editor
+        });
+        let subscription =
+            cx.subscribe_in(&editor, window, |this, _, event, window, cx| match event {
+                MessageEditorEvent::Send => {
+                    this.regenerate(&Default::default(), window, cx);
+                }
+                MessageEditorEvent::Cancel => {
+                    this.cancel_editing(&Default::default(), window, cx);
+                }
+            });
+        editor.focus_handle(cx).focus(window);
+
+        self.editing_message.replace(EditingMessage {
+            index: index,
+            message_id: message_id.clone(),
+            editor,
+            _subscription: subscription,
+        });
+        cx.notify();
+    }
+
+    fn render_edit_message_editor(&self, editing: &EditingMessage, cx: &Context<Self>) -> Div {
+        v_flex()
+            .w_full()
+            .gap_2()
+            .child(editing.editor.clone())
+            .child(
+                h_flex()
+                    .gap_1()
+                    .child(
+                        Icon::new(IconName::Warning)
+                            .color(Color::Warning)
+                            .size(IconSize::XSmall),
+                    )
+                    .child(
+                        Label::new("Editing will restart the thread from this point.")
+                            .color(Color::Muted)
+                            .size(LabelSize::XSmall),
+                    )
+                    .child(self.render_editing_message_editor_buttons(editing, cx)),
+            )
+    }
+
+    fn render_editing_message_editor_buttons(
+        &self,
+        editing: &EditingMessage,
+        cx: &Context<Self>,
+    ) -> Div {
+        h_flex()
+            .gap_0p5()
+            .flex_1()
+            .justify_end()
+            .child(
+                IconButton::new("cancel-edit-message", IconName::Close)
+                    .shape(ui::IconButtonShape::Square)
+                    .icon_color(Color::Error)
+                    .icon_size(IconSize::Small)
+                    .tooltip({
+                        let focus_handle = editing.editor.focus_handle(cx);
+                        move |window, cx| {
+                            Tooltip::for_action_in(
+                                "Cancel Edit",
+                                &menu::Cancel,
+                                &focus_handle,
+                                window,
+                                cx,
+                            )
+                        }
+                    })
+                    .on_click(cx.listener(Self::cancel_editing)),
+            )
+            .child(
+                IconButton::new("confirm-edit-message", IconName::Return)
+                    .disabled(editing.editor.read(cx).is_empty(cx))
+                    .shape(ui::IconButtonShape::Square)
+                    .icon_color(Color::Muted)
+                    .icon_size(IconSize::Small)
+                    .tooltip({
+                        let focus_handle = editing.editor.focus_handle(cx);
+                        move |window, cx| {
+                            Tooltip::for_action_in(
+                                "Regenerate",
+                                &menu::Confirm,
+                                &focus_handle,
+                                window,
+                                cx,
+                            )
+                        }
+                    })
+                    .on_click(cx.listener(Self::regenerate)),
+            )
+    }
+
     fn render_send_button(&self, cx: &mut Context<Self>) -> AnyElement {
         if self.thread().map_or(true, |thread| {
             thread.read(cx).status() == ThreadStatus::Idle
@@ -2649,7 +2562,7 @@ impl AcpThreadView {
                     button.tooltip(Tooltip::text("Type a message to submit"))
                 })
                 .on_click(cx.listener(|this, _, window, cx| {
-                    this.chat(&Chat, window, cx);
+                    this.send(window, cx);
                 }))
                 .into_any_element()
         } else {
@@ -2659,7 +2572,7 @@ impl AcpThreadView {
                 .tooltip(move |window, cx| {
                     Tooltip::for_action("Stop Generation", &editor::actions::Cancel, window, cx)
                 })
-                .on_click(cx.listener(|this, _event, _, cx| this.cancel(cx)))
+                .on_click(cx.listener(|this, _event, _, cx| this.cancel_generation(cx)))
                 .into_any_element()
         }
     }
@@ -2723,10 +2636,10 @@ impl AcpThreadView {
 
         if let Some(mention) = MentionUri::parse(&url).log_err() {
             workspace.update(cx, |workspace, cx| match mention {
-                MentionUri::File(path) => {
+                MentionUri::File { abs_path, .. } => {
                     let project = workspace.project();
                     let Some((path, entry)) = project.update(cx, |project, cx| {
-                        let path = project.find_project_path(path, cx)?;
+                        let path = project.find_project_path(abs_path, cx)?;
                         let entry = project.entry_for_path(&path, cx)?;
                         Some((path, entry))
                     }) else {
@@ -3175,57 +3088,11 @@ impl AcpThreadView {
         paths: Vec<project::ProjectPath>,
         _added_worktrees: Vec<Entity<project::Worktree>>,
         window: &mut Window,
-        cx: &mut Context<'_, Self>,
+        cx: &mut Context<Self>,
     ) {
-        let buffer = self.message_editor.read(cx).buffer().clone();
-        let Some((&excerpt_id, _, _)) = buffer.read(cx).snapshot(cx).as_singleton() else {
-            return;
-        };
-        let Some(buffer) = buffer.read(cx).as_singleton() else {
-            return;
-        };
-        for path in paths {
-            let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
-                continue;
-            };
-            let Some(abs_path) = self.project.read(cx).absolute_path(&path, cx) else {
-                continue;
-            };
-
-            let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
-            let path_prefix = abs_path
-                .file_name()
-                .unwrap_or(path.path.as_os_str())
-                .display()
-                .to_string();
-            let Some(completion) = ContextPickerCompletionProvider::completion_for_path(
-                path,
-                &path_prefix,
-                false,
-                entry.is_dir(),
-                excerpt_id,
-                anchor..anchor,
-                self.message_editor.clone(),
-                self.mention_set.clone(),
-                self.project.clone(),
-                cx,
-            ) else {
-                continue;
-            };
-
-            self.message_editor.update(cx, |message_editor, cx| {
-                message_editor.edit(
-                    [(
-                        multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
-                        completion.new_text,
-                    )],
-                    cx,
-                );
-            });
-            if let Some(confirm) = completion.confirm.clone() {
-                confirm(CompletionIntent::Complete, window, cx);
-            }
-        }
+        self.message_editor.update(cx, |message_editor, cx| {
+            message_editor.insert_dragged_files(paths, window, cx);
+        })
     }
 }
 
@@ -3242,9 +3109,6 @@ impl Render for AcpThreadView {
         v_flex()
             .size_full()
             .key_context("AcpThread")
-            .on_action(cx.listener(Self::chat))
-            .on_action(cx.listener(Self::previous_history_message))
-            .on_action(cx.listener(Self::next_history_message))
             .on_action(cx.listener(Self::open_agent_diff))
             .bg(cx.theme().colors().panel_background)
             .child(match &self.thread_state {
@@ -3540,13 +3404,16 @@ fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 }
 
 #[cfg(test)]
-mod tests {
+pub(crate) mod tests {
+    use std::{path::Path, sync::Arc};
+
     use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol::SessionId;
     use editor::EditorSettings;
     use fs::FakeFs;
     use futures::future::try_join_all;
     use gpui::{SemanticVersion, TestAppContext, VisualTestContext};
+    use parking_lot::Mutex;
     use rand::Rng;
     use settings::SettingsStore;
 
@@ -3576,7 +3443,7 @@ mod tests {
         cx.deactivate_window();
 
         thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
+            thread_view.send(window, cx);
         });
 
         cx.run_until_parked();
@@ -3603,7 +3470,7 @@ mod tests {
         cx.deactivate_window();
 
         thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
+            thread_view.send(window, cx);
         });
 
         cx.run_until_parked();
@@ -3649,7 +3516,7 @@ mod tests {
         cx.deactivate_window();
 
         thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
+            thread_view.send(window, cx);
         });
 
         cx.run_until_parked();
@@ -3683,9 +3550,6 @@ mod tests {
                     project,
                     thread_store.clone(),
                     text_thread_store.clone(),
-                    Rc::new(RefCell::new(MessageHistory::default())),
-                    1,
-                    None,
                     window,
                     cx,
                 )
@@ -3899,7 +3763,7 @@ mod tests {
         }
     }
 
-    fn init_test(cx: &mut TestAppContext) {
+    pub(crate) fn init_test(cx: &mut TestAppContext) {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index e47cbe3714..73915195f5 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1,4 +1,3 @@
-use std::cell::RefCell;
 use std::ops::{Not, Range};
 use std::path::Path;
 use std::rc::Rc;
@@ -11,7 +10,6 @@ use serde::{Deserialize, Serialize};
 
 use crate::NewExternalAgentThread;
 use crate::agent_diff::AgentDiffThread;
-use crate::message_editor::{MAX_EDITOR_LINES, MIN_EDITOR_LINES};
 use crate::{
     AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
     DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
@@ -477,8 +475,6 @@ pub struct AgentPanel {
     configuration_subscription: Option<Subscription>,
     local_timezone: UtcOffset,
     active_view: ActiveView,
-    acp_message_history:
-        Rc<RefCell<crate::acp::MessageHistory<Vec<agent_client_protocol::ContentBlock>>>>,
     previous_view: Option<ActiveView>,
     history_store: Entity<HistoryStore>,
     history: Entity<ThreadHistory>,
@@ -766,7 +762,6 @@ impl AgentPanel {
             .unwrap(),
             inline_assist_context_store,
             previous_view: None,
-            acp_message_history: Default::default(),
             history_store: history_store.clone(),
             history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
             hovered_recent_history_item: None,
@@ -824,7 +819,9 @@ impl AgentPanel {
                 thread.update(cx, |thread, cx| thread.cancel_last_completion(window, cx));
             }
             ActiveView::ExternalAgentThread { thread_view, .. } => {
-                thread_view.update(cx, |thread_element, cx| thread_element.cancel(cx));
+                thread_view.update(cx, |thread_element, cx| {
+                    thread_element.cancel_generation(cx)
+                });
             }
             ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {}
         }
@@ -963,7 +960,6 @@ impl AgentPanel {
     ) {
         let workspace = self.workspace.clone();
         let project = self.project.clone();
-        let message_history = self.acp_message_history.clone();
         let fs = self.fs.clone();
 
         const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
@@ -1016,9 +1012,6 @@ impl AgentPanel {
                         project,
                         thread_store.clone(),
                         text_thread_store.clone(),
-                        message_history,
-                        MIN_EDITOR_LINES,
-                        Some(MAX_EDITOR_LINES),
                         window,
                         cx,
                     )
@@ -1575,8 +1568,6 @@ impl AgentPanel {
             self.active_view = new_view;
         }
 
-        self.acp_message_history.borrow_mut().reset_position();
-
         self.focus_handle(cx).focus(window);
     }
 
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 64891b6973..9455369e9a 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -285,10 +285,6 @@ pub mod agent {
             ResetOnboarding,
             /// Starts a chat conversation with the agent.
             Chat,
-            /// Displays the previous message in the history.
-            PreviousHistoryMessage,
-            /// Displays the next message in the history.
-            NextHistoryMessage,
             /// Toggles the language model selector dropdown.
             #[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
             ToggleModelSelector

From ba2c45bc53194d3e2b94d909966a06f213017de5 Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Thu, 14 Aug 2025 17:02:51 +0200
Subject: [PATCH 025/823] Add FutureExt::with_timeout and use it for for
 Room::maintain_connection (#36175)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/call/src/call_impl/room.rs   | 86 ++++++++++++++---------------
 crates/gpui/src/app/test_context.rs |  4 +-
 crates/gpui/src/gpui.rs             |  2 +-
 crates/gpui/src/util.rs             | 73 ++++++++++++++++++++----
 4 files changed, 105 insertions(+), 60 deletions(-)

diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
index afeee4c924..73cb8518a6 100644
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -10,10 +10,10 @@ use client::{
 };
 use collections::{BTreeMap, HashMap, HashSet};
 use fs::Fs;
-use futures::{FutureExt, StreamExt};
+use futures::StreamExt;
 use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, ScreenCaptureSource,
-    ScreenCaptureStream, Task, WeakEntity,
+    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FutureExt as _,
+    ScreenCaptureSource, ScreenCaptureStream, Task, Timeout, WeakEntity,
 };
 use gpui_tokio::Tokio;
 use language::LanguageRegistry;
@@ -370,57 +370,53 @@ impl Room {
                     })?;
 
                 // Wait for client to re-establish a connection to the server.
-                {
-                    let mut reconnection_timeout =
-                        cx.background_executor().timer(RECONNECT_TIMEOUT).fuse();
-                    let client_reconnection = async {
-                        let mut remaining_attempts = 3;
-                        while remaining_attempts > 0 {
-                            if client_status.borrow().is_connected() {
-                                log::info!("client reconnected, attempting to rejoin room");
+                let executor = cx.background_executor().clone();
+                let client_reconnection = async {
+                    let mut remaining_attempts = 3;
+                    while remaining_attempts > 0 {
+                        if client_status.borrow().is_connected() {
+                            log::info!("client reconnected, attempting to rejoin room");
 
-                                let Some(this) = this.upgrade() else { break };
-                                match this.update(cx, |this, cx| this.rejoin(cx)) {
-                                    Ok(task) => {
-                                        if task.await.log_err().is_some() {
-                                            return true;
-                                        } else {
-                                            remaining_attempts -= 1;
-                                        }
+                            let Some(this) = this.upgrade() else { break };
+                            match this.update(cx, |this, cx| this.rejoin(cx)) {
+                                Ok(task) => {
+                                    if task.await.log_err().is_some() {
+                                        return true;
+                                    } else {
+                                        remaining_attempts -= 1;
                                     }
-                                    Err(_app_dropped) => return false,
                                 }
-                            } else if client_status.borrow().is_signed_out() {
-                                return false;
+                                Err(_app_dropped) => return false,
                             }
-
-                            log::info!(
-                                "waiting for client status change, remaining attempts {}",
-                                remaining_attempts
-                            );
-                            client_status.next().await;
+                        } else if client_status.borrow().is_signed_out() {
+                            return false;
                         }
-                        false
+
+                        log::info!(
+                            "waiting for client status change, remaining attempts {}",
+                            remaining_attempts
+                        );
+                        client_status.next().await;
                     }
-                    .fuse();
-                    futures::pin_mut!(client_reconnection);
+                    false
+                };
 
-                    futures::select_biased! {
-                        reconnected = client_reconnection => {
-                            if reconnected {
-                                log::info!("successfully reconnected to room");
-                                // If we successfully joined the room, go back around the loop
-                                // waiting for future connection status changes.
-                                continue;
-                            }
-                        }
-                        _ = reconnection_timeout => {
-                            log::info!("room reconnection timeout expired");
-                        }
+                match client_reconnection
+                    .with_timeout(RECONNECT_TIMEOUT, &executor)
+                    .await
+                {
+                    Ok(true) => {
+                        log::info!("successfully reconnected to room");
+                        // If we successfully joined the room, go back around the loop
+                        // waiting for future connection status changes.
+                        continue;
+                    }
+                    Ok(false) => break,
+                    Err(Timeout) => {
+                        log::info!("room reconnection timeout expired");
+                        break;
                     }
                 }
-
-                break;
             }
         }
 
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index 35e6032671..a96c24432a 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -585,7 +585,7 @@ impl<V: 'static> Entity<V> {
         cx.executor().advance_clock(advance_clock_by);
 
         async move {
-            let notification = crate::util::timeout(duration, rx.recv())
+            let notification = crate::util::smol_timeout(duration, rx.recv())
                 .await
                 .expect("next notification timed out");
             drop(subscription);
@@ -629,7 +629,7 @@ impl<V> Entity<V> {
         let handle = self.downgrade();
 
         async move {
-            crate::util::timeout(Duration::from_secs(1), async move {
+            crate::util::smol_timeout(Duration::from_secs(1), async move {
                 loop {
                     {
                         let cx = cx.borrow();
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 09799eb910..f0ce04a915 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -157,7 +157,7 @@ pub use taffy::{AvailableSpace, LayoutId};
 #[cfg(any(test, feature = "test-support"))]
 pub use test::*;
 pub use text_system::*;
-pub use util::arc_cow::ArcCow;
+pub use util::{FutureExt, Timeout, arc_cow::ArcCow};
 pub use view::*;
 pub use window::*;
 
diff --git a/crates/gpui/src/util.rs b/crates/gpui/src/util.rs
index 5e92335fdc..f357034fbf 100644
--- a/crates/gpui/src/util.rs
+++ b/crates/gpui/src/util.rs
@@ -1,13 +1,11 @@
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering::SeqCst;
-#[cfg(any(test, feature = "test-support"))]
-use std::time::Duration;
-
-#[cfg(any(test, feature = "test-support"))]
-use futures::Future;
-
-#[cfg(any(test, feature = "test-support"))]
-use smol::future::FutureExt;
+use crate::{BackgroundExecutor, Task};
+use std::{
+    future::Future,
+    pin::Pin,
+    sync::atomic::{AtomicUsize, Ordering::SeqCst},
+    task,
+    time::Duration,
+};
 
 pub use util::*;
 
@@ -70,8 +68,59 @@ pub trait FluentBuilder {
     }
 }
 
+/// Extensions for Future types that provide additional combinators and utilities.
+pub trait FutureExt {
+    /// Requires a Future to complete before the specified duration has elapsed.
+    /// Similar to tokio::timeout.
+    fn with_timeout(self, timeout: Duration, executor: &BackgroundExecutor) -> WithTimeout<Self>
+    where
+        Self: Sized;
+}
+
+impl<T: Future> FutureExt for T {
+    fn with_timeout(self, timeout: Duration, executor: &BackgroundExecutor) -> WithTimeout<Self>
+    where
+        Self: Sized,
+    {
+        WithTimeout {
+            future: self,
+            timer: executor.timer(timeout),
+        }
+    }
+}
+
+pub struct WithTimeout<T> {
+    future: T,
+    timer: Task<()>,
+}
+
+#[derive(Debug, thiserror::Error)]
+#[error("Timed out before future resolved")]
+/// Error returned by with_timeout when the timeout duration elapsed before the future resolved
+pub struct Timeout;
+
+impl<T: Future> Future for WithTimeout<T> {
+    type Output = Result<T::Output, Timeout>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut task::Context) -> task::Poll<Self::Output> {
+        // SAFETY: the fields of Timeout are private and we never move the future ourselves
+        // And its already pinned since we are being polled (all futures need to be pinned to be polled)
+        let this = unsafe { self.get_unchecked_mut() };
+        let future = unsafe { Pin::new_unchecked(&mut this.future) };
+        let timer = unsafe { Pin::new_unchecked(&mut this.timer) };
+
+        if let task::Poll::Ready(output) = future.poll(cx) {
+            task::Poll::Ready(Ok(output))
+        } else if timer.poll(cx).is_ready() {
+            task::Poll::Ready(Err(Timeout))
+        } else {
+            task::Poll::Pending
+        }
+    }
+}
+
 #[cfg(any(test, feature = "test-support"))]
-pub async fn timeout<F, T>(timeout: Duration, f: F) -> Result<T, ()>
+pub async fn smol_timeout<F, T>(timeout: Duration, f: F) -> Result<T, ()>
 where
     F: Future<Output = T>,
 {
@@ -80,7 +129,7 @@ where
         Err(())
     };
     let future = async move { Ok(f.await) };
-    timer.race(future).await
+    smol::future::FutureExt::race(timer, future).await
 }
 
 /// Increment the given atomic counter if it is not zero.

From f514c7cc187eeb814415d0e78546ac780c857900 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 14 Aug 2025 11:22:38 -0400
Subject: [PATCH 026/823] Emit a `BreadcrumbsChanged` event when associated
 settings changed (#36177)

Closes https://github.com/zed-industries/zed/issues/36149

Release Notes:

- Fixed a bug where changing the `toolbar.breadcrumbs` setting didn't
immediately update the UI when saving the `settings.json` file.
---
 crates/editor/src/editor.rs | 6 ++++++
 crates/editor/src/items.rs  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index cbee9021ed..689f397341 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -20209,6 +20209,7 @@ impl Editor {
         );
 
         let old_cursor_shape = self.cursor_shape;
+        let old_show_breadcrumbs = self.show_breadcrumbs;
 
         {
             let editor_settings = EditorSettings::get_global(cx);
@@ -20222,6 +20223,10 @@ impl Editor {
             cx.emit(EditorEvent::CursorShapeChanged);
         }
 
+        if old_show_breadcrumbs != self.show_breadcrumbs {
+            cx.emit(EditorEvent::BreadcrumbsChanged);
+        }
+
         let project_settings = ProjectSettings::get_global(cx);
         self.serialize_dirty_buffers =
             !self.mode.is_minimap() && project_settings.session.restore_unsaved_buffers;
@@ -22843,6 +22848,7 @@ pub enum EditorEvent {
     },
     Reloaded,
     CursorShapeChanged,
+    BreadcrumbsChanged,
     PushedToNavHistory {
         anchor: Anchor,
         is_deactivate: bool,
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 1da82c605d..480757a491 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1036,6 +1036,10 @@ impl Item for Editor {
                 f(ItemEvent::UpdateBreadcrumbs);
             }
 
+            EditorEvent::BreadcrumbsChanged => {
+                f(ItemEvent::UpdateBreadcrumbs);
+            }
+
             EditorEvent::DirtyChanged => {
                 f(ItemEvent::UpdateTab);
             }

From 528d56e8072048b9b588fd60786c937be018f94d Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 14 Aug 2025 10:29:58 -0500
Subject: [PATCH 027/823] keymap_ui: Add open keymap JSON button (#36182)

Closes #ISSUE

Release Notes:

- Keymap Editor: Added a button in the top left to allow opening the
keymap JSON file. Right clicking the button provides shortcuts to
opening the default Zed and Vim keymaps as well.
---
 Cargo.lock                            |  2 ++
 assets/icons/json.svg                 |  4 ++++
 crates/icons/src/icons.rs             |  1 +
 crates/settings_ui/Cargo.toml         |  2 ++
 crates/settings_ui/src/keybindings.rs | 29 ++++++++++++++++++++++++++-
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/json.svg

diff --git a/Cargo.lock b/Cargo.lock
index cb087f43b7..96cc1581a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15054,8 +15054,10 @@ dependencies = [
  "ui",
  "ui_input",
  "util",
+ "vim",
  "workspace",
  "workspace-hack",
+ "zed_actions",
 ]
 
 [[package]]
diff --git a/assets/icons/json.svg b/assets/icons/json.svg
new file mode 100644
index 0000000000..5f012f8838
--- /dev/null
+++ b/assets/icons/json.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index f5c2a83fec..8bd76cbecf 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -140,6 +140,7 @@ pub enum IconName {
     Image,
     Indicator,
     Info,
+    Json,
     Keyboard,
     Library,
     LineHeight,
diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml
index a4c47081c6..8a151359ec 100644
--- a/crates/settings_ui/Cargo.toml
+++ b/crates/settings_ui/Cargo.toml
@@ -42,8 +42,10 @@ tree-sitter-rust.workspace = true
 ui.workspace = true
 ui_input.workspace = true
 util.workspace = true
+vim.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
 db = {"workspace"= true, "features" = ["test-support"]}
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index a62c669488..1aaab211aa 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -23,7 +23,7 @@ use settings::{BaseKeymap, KeybindSource, KeymapFile, Settings as _, SettingsAss
 use ui::{
     ActiveTheme as _, App, Banner, BorrowAppContext, ContextMenu, IconButtonShape, Indicator,
     Modal, ModalFooter, ModalHeader, ParentElement as _, Render, Section, SharedString,
-    Styled as _, Tooltip, Window, prelude::*,
+    Styled as _, Tooltip, Window, prelude::*, right_click_menu,
 };
 use ui_input::SingleLineInput;
 use util::ResultExt;
@@ -1536,6 +1536,33 @@ impl Render for KeymapEditor {
                     .child(
                         h_flex()
                             .gap_2()
+                            .child(
+                                right_click_menu("open-keymap-menu")
+                                    .menu(|window, cx| {
+                                        ContextMenu::build(window, cx, |menu, _, _| {
+                                            menu.header("Open Keymap JSON")
+                                                .action("User", zed_actions::OpenKeymap.boxed_clone())
+                                                .action("Zed Default", zed_actions::OpenDefaultKeymap.boxed_clone())
+                                                .action("Vim Default", vim::OpenDefaultKeymap.boxed_clone())
+                                        })
+                                    })
+                                    .anchor(gpui::Corner::TopLeft)
+                                    .trigger(|open, _, _|
+                                        IconButton::new(
+                                            "OpenKeymapJsonButton",
+                                            IconName::Json
+                                        )
+                                        .shape(ui::IconButtonShape::Square)
+                                        .when(!open, |this|
+                                            this.tooltip(move |window, cx| {
+                                                Tooltip::with_meta("Open Keymap JSON", Some(&zed_actions::OpenKeymap),"Right click to view more options", window, cx)
+                                            })
+                                        )
+                                        .on_click(|_, window, cx| {
+                                            window.dispatch_action(zed_actions::OpenKeymap.boxed_clone(), cx);
+                                        })
+                                    )
+                            )
                             .child(
                                 div()
                                     .key_context({

From 20be133713690fd92148a448bd57146fff73cbce Mon Sep 17 00:00:00 2001
From: Romans Malinovskis <me@nearly.guru>
Date: Thu, 14 Aug 2025 18:04:01 +0100
Subject: [PATCH 028/823] helix: Allow yank without a selection (#35612)

Related https://github.com/zed-industries/zed/issues/4642

Release Notes:
- Helix: without active selection, pressing `y` in helix mode will yank
a single character under cursor.

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/keymaps/vim.json                 |  2 +-
 crates/vim/src/helix.rs                 | 69 +++++++++++++++++++++++++
 crates/vim/src/test/vim_test_context.rs | 30 +++++++++++
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 98f9cafc40..a3f68a7730 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -390,7 +390,7 @@
       "right": "vim::WrappingRight",
       "h": "vim::WrappingLeft",
       "l": "vim::WrappingRight",
-      "y": "editor::Copy",
+      "y": "vim::HelixYank",
       "alt-;": "vim::OtherEnd",
       "ctrl-r": "vim::Redo",
       "f": ["vim::PushFindForward", { "before": false, "multiline": true }],
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 686c74f65e..29633ddef9 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -15,6 +15,8 @@ actions!(
     [
         /// Switches to normal mode after the cursor (Helix-style).
         HelixNormalAfter,
+        /// Yanks the current selection or character if no selection.
+        HelixYank,
         /// Inserts at the beginning of the selection.
         HelixInsert,
         /// Appends at the end of the selection.
@@ -26,6 +28,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
     Vim::action(editor, cx, Vim::helix_normal_after);
     Vim::action(editor, cx, Vim::helix_insert);
     Vim::action(editor, cx, Vim::helix_append);
+    Vim::action(editor, cx, Vim::helix_yank);
 }
 
 impl Vim {
@@ -310,6 +313,47 @@ impl Vim {
         }
     }
 
+    pub fn helix_yank(&mut self, _: &HelixYank, window: &mut Window, cx: &mut Context<Self>) {
+        self.update_editor(cx, |vim, editor, cx| {
+            let has_selection = editor
+                .selections
+                .all_adjusted(cx)
+                .iter()
+                .any(|selection| !selection.is_empty());
+
+            if !has_selection {
+                // If no selection, expand to current character (like 'v' does)
+                editor.change_selections(Default::default(), window, cx, |s| {
+                    s.move_with(|map, selection| {
+                        let head = selection.head();
+                        let new_head = movement::saturating_right(map, head);
+                        selection.set_tail(head, SelectionGoal::None);
+                        selection.set_head(new_head, SelectionGoal::None);
+                    });
+                });
+                vim.yank_selections_content(
+                    editor,
+                    crate::motion::MotionKind::Exclusive,
+                    window,
+                    cx,
+                );
+                editor.change_selections(Default::default(), window, cx, |s| {
+                    s.move_with(|_map, selection| {
+                        selection.collapse_to(selection.start, SelectionGoal::None);
+                    });
+                });
+            } else {
+                // Yank the selection(s)
+                vim.yank_selections_content(
+                    editor,
+                    crate::motion::MotionKind::Exclusive,
+                    window,
+                    cx,
+                );
+            }
+        });
+    }
+
     fn helix_insert(&mut self, _: &HelixInsert, window: &mut Window, cx: &mut Context<Self>) {
         self.start_recording(cx);
         self.update_editor(cx, |_, editor, cx| {
@@ -703,4 +747,29 @@ mod test {
 
         cx.assert_state("«xxˇ»", Mode::HelixNormal);
     }
+
+    #[gpui::test]
+    async fn test_helix_yank(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // Test yanking current character with no selection
+        cx.set_state("hello ˇworld", Mode::HelixNormal);
+        cx.simulate_keystrokes("y");
+
+        // Test cursor remains at the same position after yanking single character
+        cx.assert_state("hello ˇworld", Mode::HelixNormal);
+        cx.shared_clipboard().assert_eq("w");
+
+        // Move cursor and yank another character
+        cx.simulate_keystrokes("l");
+        cx.simulate_keystrokes("y");
+        cx.shared_clipboard().assert_eq("o");
+
+        // Test yanking with existing selection
+        cx.set_state("hello «worlˇ»d", Mode::HelixNormal);
+        cx.simulate_keystrokes("y");
+        cx.shared_clipboard().assert_eq("worl");
+        cx.assert_state("hello «worlˇ»d", Mode::HelixNormal);
+    }
 }
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index 904e48e5a3..5b6cb55e8c 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -143,6 +143,16 @@ impl VimTestContext {
         })
     }
 
+    pub fn enable_helix(&mut self) {
+        self.cx.update(|_, cx| {
+            SettingsStore::update_global(cx, |store, cx| {
+                store.update_user_settings::<vim_mode_setting::HelixModeSetting>(cx, |s| {
+                    *s = Some(true)
+                });
+            });
+        })
+    }
+
     pub fn mode(&mut self) -> Mode {
         self.update_editor(|editor, _, cx| editor.addon::<VimAddon>().unwrap().entity.read(cx).mode)
     }
@@ -210,6 +220,26 @@ impl VimTestContext {
         assert_eq!(self.mode(), Mode::Normal, "{}", self.assertion_context());
         assert_eq!(self.active_operator(), None, "{}", self.assertion_context());
     }
+
+    pub fn shared_clipboard(&mut self) -> VimClipboard {
+        VimClipboard {
+            editor: self
+                .read_from_clipboard()
+                .map(|item| item.text().unwrap().to_string())
+                .unwrap_or_default(),
+        }
+    }
+}
+
+pub struct VimClipboard {
+    editor: String,
+}
+
+impl VimClipboard {
+    #[track_caller]
+    pub fn assert_eq(&self, expected: &str) {
+        assert_eq!(self.editor, expected);
+    }
 }
 
 impl Deref for VimTestContext {

From 9a2b7ef372021e5bcad759a2dc871e0743b602c4 Mon Sep 17 00:00:00 2001
From: fantacell <ghub@giggo.de>
Date: Thu, 14 Aug 2025 19:04:07 +0200
Subject: [PATCH 029/823] helix: Change f and t motions (#35216)

In vim and zed (vim and helix modes) typing "tx" will jump before the
next `x`, but typing it again won't do anything. But in helix the cursor
just jumps before the `x` after that. I added that in helix mode.
This also solves another small issue where the selection doesn't include
the first `x` after typing "fx" twice. And similarly after typing "Fx"
or "Tx" the selection should include the character that the motion
startet on.

Release Notes:

- helix: Fixed inconsistencies in the "f" and "t" motions
---
 crates/text/src/selection.rs |  13 ++
 crates/vim/src/helix.rs      | 290 ++++++++++++++++++-----------------
 crates/vim/src/motion.rs     |   3 +-
 3 files changed, 162 insertions(+), 144 deletions(-)

diff --git a/crates/text/src/selection.rs b/crates/text/src/selection.rs
index 18b82dbb6a..d3c280bde8 100644
--- a/crates/text/src/selection.rs
+++ b/crates/text/src/selection.rs
@@ -104,6 +104,19 @@ impl<T: Copy + Ord> Selection<T> {
         self.goal = new_goal;
     }
 
+    pub fn set_head_tail(&mut self, head: T, tail: T, new_goal: SelectionGoal) {
+        if head < tail {
+            self.reversed = true;
+            self.start = head;
+            self.end = tail;
+        } else {
+            self.reversed = false;
+            self.start = tail;
+            self.end = head;
+        }
+        self.goal = new_goal;
+    }
+
     pub fn swap_head_tail(&mut self) {
         if self.reversed {
             self.reversed = false;
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 29633ddef9..0c8c06d8ab 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -1,9 +1,11 @@
+use editor::display_map::DisplaySnapshot;
 use editor::{DisplayPoint, Editor, SelectionEffects, ToOffset, ToPoint, movement};
 use gpui::{Action, actions};
 use gpui::{Context, Window};
 use language::{CharClassifier, CharKind};
 use text::{Bias, SelectionGoal};
 
+use crate::motion;
 use crate::{
     Vim,
     motion::{Motion, right},
@@ -58,6 +60,35 @@ impl Vim {
         self.helix_move_cursor(motion, times, window, cx);
     }
 
+    /// Updates all selections based on where the cursors are.
+    fn helix_new_selections(
+        &mut self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+        mut change: impl FnMut(
+            // the start of the cursor
+            DisplayPoint,
+            &DisplaySnapshot,
+        ) -> Option<(DisplayPoint, DisplayPoint)>,
+    ) {
+        self.update_editor(cx, |_, editor, cx| {
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.move_with(|map, selection| {
+                    let cursor_start = if selection.reversed || selection.is_empty() {
+                        selection.head()
+                    } else {
+                        movement::left(map, selection.head())
+                    };
+                    let Some((head, tail)) = change(cursor_start, map) else {
+                        return;
+                    };
+
+                    selection.set_head_tail(head, tail, SelectionGoal::None);
+                });
+            });
+        });
+    }
+
     fn helix_find_range_forward(
         &mut self,
         times: Option<usize>,
@@ -65,49 +96,30 @@ impl Vim {
         cx: &mut Context<Self>,
         mut is_boundary: impl FnMut(char, char, &CharClassifier) -> bool,
     ) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let times = times.unwrap_or(1);
-                    let new_goal = SelectionGoal::None;
-                    let mut head = selection.head();
-                    let mut tail = selection.tail();
+        let times = times.unwrap_or(1);
+        self.helix_new_selections(window, cx, |cursor, map| {
+            let mut head = movement::right(map, cursor);
+            let mut tail = cursor;
+            let classifier = map.buffer_snapshot.char_classifier_at(head.to_point(map));
+            if head == map.max_point() {
+                return None;
+            }
+            for _ in 0..times {
+                let (maybe_next_tail, next_head) =
+                    movement::find_boundary_trail(map, head, |left, right| {
+                        is_boundary(left, right, &classifier)
+                    });
 
-                    if head == map.max_point() {
-                        return;
-                    }
+                if next_head == head && maybe_next_tail.unwrap_or(next_head) == tail {
+                    break;
+                }
 
-                    // collapse to block cursor
-                    if tail < head {
-                        tail = movement::left(map, head);
-                    } else {
-                        tail = head;
-                        head = movement::right(map, head);
-                    }
-
-                    // create a classifier
-                    let classifier = map.buffer_snapshot.char_classifier_at(head.to_point(map));
-
-                    for _ in 0..times {
-                        let (maybe_next_tail, next_head) =
-                            movement::find_boundary_trail(map, head, |left, right| {
-                                is_boundary(left, right, &classifier)
-                            });
-
-                        if next_head == head && maybe_next_tail.unwrap_or(next_head) == tail {
-                            break;
-                        }
-
-                        head = next_head;
-                        if let Some(next_tail) = maybe_next_tail {
-                            tail = next_tail;
-                        }
-                    }
-
-                    selection.set_tail(tail, new_goal);
-                    selection.set_head(head, new_goal);
-                });
-            });
+                head = next_head;
+                if let Some(next_tail) = maybe_next_tail {
+                    tail = next_tail;
+                }
+            }
+            Some((head, tail))
         });
     }
 
@@ -118,56 +130,33 @@ impl Vim {
         cx: &mut Context<Self>,
         mut is_boundary: impl FnMut(char, char, &CharClassifier) -> bool,
     ) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let times = times.unwrap_or(1);
-                    let new_goal = SelectionGoal::None;
-                    let mut head = selection.head();
-                    let mut tail = selection.tail();
+        let times = times.unwrap_or(1);
+        self.helix_new_selections(window, cx, |cursor, map| {
+            let mut head = cursor;
+            // The original cursor was one character wide,
+            // but the search starts from the left side of it,
+            // so to include that space the selection must end one character to the right.
+            let mut tail = movement::right(map, cursor);
+            let classifier = map.buffer_snapshot.char_classifier_at(head.to_point(map));
+            if head == DisplayPoint::zero() {
+                return None;
+            }
+            for _ in 0..times {
+                let (maybe_next_tail, next_head) =
+                    movement::find_preceding_boundary_trail(map, head, |left, right| {
+                        is_boundary(left, right, &classifier)
+                    });
 
-                    if head == DisplayPoint::zero() {
-                        return;
-                    }
+                if next_head == head && maybe_next_tail.unwrap_or(next_head) == tail {
+                    break;
+                }
 
-                    // collapse to block cursor
-                    if tail < head {
-                        tail = movement::left(map, head);
-                    } else {
-                        tail = head;
-                        head = movement::right(map, head);
-                    }
-
-                    selection.set_head(head, new_goal);
-                    selection.set_tail(tail, new_goal);
-                    // flip the selection
-                    selection.swap_head_tail();
-                    head = selection.head();
-                    tail = selection.tail();
-
-                    // create a classifier
-                    let classifier = map.buffer_snapshot.char_classifier_at(head.to_point(map));
-
-                    for _ in 0..times {
-                        let (maybe_next_tail, next_head) =
-                            movement::find_preceding_boundary_trail(map, head, |left, right| {
-                                is_boundary(left, right, &classifier)
-                            });
-
-                        if next_head == head && maybe_next_tail.unwrap_or(next_head) == tail {
-                            break;
-                        }
-
-                        head = next_head;
-                        if let Some(next_tail) = maybe_next_tail {
-                            tail = next_tail;
-                        }
-                    }
-
-                    selection.set_tail(tail, new_goal);
-                    selection.set_head(head, new_goal);
-                });
-            })
+                head = next_head;
+                if let Some(next_tail) = maybe_next_tail {
+                    tail = next_tail;
+                }
+            }
+            Some((head, tail))
         });
     }
 
@@ -255,58 +244,53 @@ impl Vim {
                     found
                 })
             }
-            Motion::FindForward { .. } => {
-                self.update_editor(cx, |_, editor, cx| {
-                    let text_layout_details = editor.text_layout_details(window);
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.move_with(|map, selection| {
-                            let goal = selection.goal;
-                            let cursor = if selection.is_empty() || selection.reversed {
-                                selection.head()
-                            } else {
-                                movement::left(map, selection.head())
-                            };
-
-                            let (point, goal) = motion
-                                .move_point(
-                                    map,
-                                    cursor,
-                                    selection.goal,
-                                    times,
-                                    &text_layout_details,
-                                )
-                                .unwrap_or((cursor, goal));
-                            selection.set_tail(selection.head(), goal);
-                            selection.set_head(movement::right(map, point), goal);
-                        })
-                    });
+            Motion::FindForward {
+                before,
+                char,
+                mode,
+                smartcase,
+            } => {
+                self.helix_new_selections(window, cx, |cursor, map| {
+                    let start = cursor;
+                    let mut last_boundary = start;
+                    for _ in 0..times.unwrap_or(1) {
+                        last_boundary = movement::find_boundary(
+                            map,
+                            movement::right(map, last_boundary),
+                            mode,
+                            |left, right| {
+                                let current_char = if before { right } else { left };
+                                motion::is_character_match(char, current_char, smartcase)
+                            },
+                        );
+                    }
+                    Some((last_boundary, start))
                 });
             }
-            Motion::FindBackward { .. } => {
-                self.update_editor(cx, |_, editor, cx| {
-                    let text_layout_details = editor.text_layout_details(window);
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.move_with(|map, selection| {
-                            let goal = selection.goal;
-                            let cursor = if selection.is_empty() || selection.reversed {
-                                selection.head()
-                            } else {
-                                movement::left(map, selection.head())
-                            };
-
-                            let (point, goal) = motion
-                                .move_point(
-                                    map,
-                                    cursor,
-                                    selection.goal,
-                                    times,
-                                    &text_layout_details,
-                                )
-                                .unwrap_or((cursor, goal));
-                            selection.set_tail(selection.head(), goal);
-                            selection.set_head(point, goal);
-                        })
-                    });
+            Motion::FindBackward {
+                after,
+                char,
+                mode,
+                smartcase,
+            } => {
+                self.helix_new_selections(window, cx, |cursor, map| {
+                    let start = cursor;
+                    let mut last_boundary = start;
+                    for _ in 0..times.unwrap_or(1) {
+                        last_boundary = movement::find_preceding_boundary_display_point(
+                            map,
+                            last_boundary,
+                            mode,
+                            |left, right| {
+                                let current_char = if after { left } else { right };
+                                motion::is_character_match(char, current_char, smartcase)
+                            },
+                        );
+                    }
+                    // The original cursor was one character wide,
+                    // but the search started from the left side of it,
+                    // so to include that space the selection must end one character to the right.
+                    Some((last_boundary, movement::right(map, start)))
                 });
             }
             _ => self.helix_move_and_collapse(motion, times, window, cx),
@@ -630,13 +614,33 @@ mod test {
             Mode::HelixNormal,
         );
 
-        cx.simulate_keystrokes("2 T r");
+        cx.simulate_keystrokes("F e F e");
 
         cx.assert_state(
             indoc! {"
-                The quick br«ˇown
-                fox jumps over
-                the laz»y dog."},
+                The quick brown
+                fox jumps ov«ˇer
+                the» lazy dog."},
+            Mode::HelixNormal,
+        );
+
+        cx.simulate_keystrokes("e 2 F e");
+
+        cx.assert_state(
+            indoc! {"
+                Th«ˇe quick brown
+                fox jumps over»
+                the lazy dog."},
+            Mode::HelixNormal,
+        );
+
+        cx.simulate_keystrokes("t r t r");
+
+        cx.assert_state(
+            indoc! {"
+                The quick «brown
+                fox jumps oveˇ»r
+                the lazy dog."},
             Mode::HelixNormal,
         );
     }
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 7ef883f406..a6a07e7b2f 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -2639,7 +2639,8 @@ fn find_backward(
     }
 }
 
-fn is_character_match(target: char, other: char, smartcase: bool) -> bool {
+/// Returns true if one char is equal to the other or its uppercase variant (if smartcase is true).
+pub fn is_character_match(target: char, other: char, smartcase: bool) -> bool {
     if smartcase {
         if target.is_uppercase() {
             target == other

From 5a9546ff4badfb2c153663d51c41297f60ed25bc Mon Sep 17 00:00:00 2001
From: Mostafa Khaled <112074172+m04f@users.noreply.github.com>
Date: Thu, 14 Aug 2025 20:04:38 +0300
Subject: [PATCH 030/823] Add alt-s to helix mode (#33918)

Closes #31562

Release Notes:

- Helix: bind alt-s to SplitSelectionIntoLines

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 assets/keymaps/vim.json           |  1 +
 crates/editor/src/actions.rs      | 12 ++++++++++--
 crates/editor/src/editor.rs       | 30 ++++++++++++++++++++++++++----
 crates/editor/src/editor_tests.rs |  6 +++---
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index a3f68a7730..560ca3bdd8 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -407,6 +407,7 @@
       "g w": "vim::PushRewrap",
       "insert": "vim::InsertBefore",
       "alt-.": "vim::RepeatFind",
+      "alt-s": ["editor::SplitSelectionIntoLines", { "keep_selections": true }],
       // tree-sitter related commands
       "[ x": "editor::SelectLargerSyntaxNode",
       "] x": "editor::SelectSmallerSyntaxNode",
diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 39433b3c27..ce02c4d2bf 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -273,6 +273,16 @@ pub enum UuidVersion {
     V7,
 }
 
+/// Splits selection into individual lines.
+#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
+#[action(namespace = editor)]
+#[serde(deny_unknown_fields)]
+pub struct SplitSelectionIntoLines {
+    /// Keep the text selected after splitting instead of collapsing to cursors.
+    #[serde(default)]
+    pub keep_selections: bool,
+}
+
 /// Goes to the next diagnostic in the file.
 #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
 #[action(namespace = editor)]
@@ -672,8 +682,6 @@ actions!(
         SortLinesCaseInsensitive,
         /// Sorts selected lines case-sensitively.
         SortLinesCaseSensitive,
-        /// Splits selection into individual lines.
-        SplitSelectionIntoLines,
         /// Stops the language server for the current file.
         StopLanguageServer,
         /// Switches between source and header files.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 689f397341..1f350cf0d0 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -13612,7 +13612,7 @@ impl Editor {
 
     pub fn split_selection_into_lines(
         &mut self,
-        _: &SplitSelectionIntoLines,
+        action: &SplitSelectionIntoLines,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -13629,8 +13629,21 @@ impl Editor {
             let buffer = self.buffer.read(cx).read(cx);
             for selection in selections {
                 for row in selection.start.row..selection.end.row {
-                    let cursor = Point::new(row, buffer.line_len(MultiBufferRow(row)));
-                    new_selection_ranges.push(cursor..cursor);
+                    let line_start = Point::new(row, 0);
+                    let line_end = Point::new(row, buffer.line_len(MultiBufferRow(row)));
+
+                    if action.keep_selections {
+                        // Keep the selection range for each line
+                        let selection_start = if row == selection.start.row {
+                            selection.start
+                        } else {
+                            line_start
+                        };
+                        new_selection_ranges.push(selection_start..line_end);
+                    } else {
+                        // Collapse to cursor at end of line
+                        new_selection_ranges.push(line_end..line_end);
+                    }
                 }
 
                 let is_multiline_selection = selection.start.row != selection.end.row;
@@ -13638,7 +13651,16 @@ impl Editor {
                 // so this action feels more ergonomic when paired with other selection operations
                 let should_skip_last = is_multiline_selection && selection.end.column == 0;
                 if !should_skip_last {
-                    new_selection_ranges.push(selection.end..selection.end);
+                    if action.keep_selections {
+                        if is_multiline_selection {
+                            let line_start = Point::new(selection.end.row, 0);
+                            new_selection_ranges.push(line_start..selection.end);
+                        } else {
+                            new_selection_ranges.push(selection.start..selection.end);
+                        }
+                    } else {
+                        new_selection_ranges.push(selection.end..selection.end);
+                    }
                 }
             }
         }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 4421869703..a5966b3301 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -6401,7 +6401,7 @@ async fn test_split_selection_into_lines(cx: &mut TestAppContext) {
     fn test(cx: &mut EditorTestContext, initial_state: &'static str, expected_state: &'static str) {
         cx.set_state(initial_state);
         cx.update_editor(|e, window, cx| {
-            e.split_selection_into_lines(&SplitSelectionIntoLines, window, cx)
+            e.split_selection_into_lines(&Default::default(), window, cx)
         });
         cx.assert_editor_state(expected_state);
     }
@@ -6489,7 +6489,7 @@ async fn test_split_selection_into_lines_interacting_with_creases(cx: &mut TestA
                 DisplayPoint::new(DisplayRow(4), 4)..DisplayPoint::new(DisplayRow(4), 4),
             ])
         });
-        editor.split_selection_into_lines(&SplitSelectionIntoLines, window, cx);
+        editor.split_selection_into_lines(&Default::default(), window, cx);
         assert_eq!(
             editor.display_text(cx),
             "aaaaa\nbbbbb\nccc⋯eeee\nfffff\nggggg\n⋯i"
@@ -6505,7 +6505,7 @@ async fn test_split_selection_into_lines_interacting_with_creases(cx: &mut TestA
                 DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(0), 1)
             ])
         });
-        editor.split_selection_into_lines(&SplitSelectionIntoLines, window, cx);
+        editor.split_selection_into_lines(&Default::default(), window, cx);
         assert_eq!(
             editor.display_text(cx),
             "aaaaa\nbbbbb\nccccc\nddddd\neeeee\nfffff\nggggg\nhhhhh\niiiii"

From 1a169e0b16801b278140bb9a59fa45ab56644f4d Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 14 Aug 2025 13:54:19 -0400
Subject: [PATCH 031/823] git: Clear set of dirty paths when doing a full
 status scan (#36181)

Related to #35780

Release Notes:

- N/A

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/project/src/git_store.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 32deb0dbc4..3163a10239 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -2349,7 +2349,7 @@ impl GitStore {
                         return None;
                     };
 
-                    let mut paths = vec![];
+                    let mut paths = Vec::new();
                     // All paths prefixed by a given repo will constitute a continuous range.
                     while let Some(path) = entries.get(ix)
                         && let Some(repo_path) =
@@ -2358,7 +2358,11 @@ impl GitStore {
                         paths.push((repo_path, ix));
                         ix += 1;
                     }
-                    Some((repo, paths))
+                    if paths.is_empty() {
+                        None
+                    } else {
+                        Some((repo, paths))
+                    }
                 });
                 tasks.push_back(task);
             }
@@ -4338,7 +4342,8 @@ impl Repository {
                     bail!("not a local repository")
                 };
                 let (snapshot, events) = this
-                    .read_with(&mut cx, |this, _| {
+                    .update(&mut cx, |this, _| {
+                        this.paths_needing_status_update.clear();
                         compute_snapshot(
                             this.id,
                             this.work_directory_abs_path.clone(),
@@ -4568,6 +4573,9 @@ impl Repository {
                 };
 
                 let paths = changed_paths.iter().cloned().collect::<Vec<_>>();
+                if paths.is_empty() {
+                    return Ok(());
+                }
                 let statuses = backend.status(&paths).await?;
 
                 let changed_path_statuses = cx

From 2acfa5e948764cbe9ae5cbf9f95d6bf66ea904c2 Mon Sep 17 00:00:00 2001
From: smit <heysmitbarmase@gmail.com>
Date: Thu, 14 Aug 2025 23:28:15 +0530
Subject: [PATCH 032/823] copilot: Fix Copilot fails to sign in on newer
 versions (#36195)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up for #36093 and
https://github.com/zed-industries/zed/pull/36138

Since v1.355.0, `@github/copilot-language-server` has stopped responding
to `CheckStatus` requests if a `DidChangeConfiguration` notification
hasn’t been sent beforehand. This causes `CheckStatus` to remain in an
await state until it times out, leaving the connection stuck for a long
period before finally throwing a timeout error.

```rs
let status = server
    .request::<request::CheckStatus>(request::CheckStatusParams {
        local_checks_only: false,
    })
    .await
    .into_response() // bails here with ConnectionResult::Timeout
    .context("copilot: check status")?;
````

This PR fixes the issue by sending the `DidChangeConfiguration`
notification before making the `CheckStatus` request. It’s just an
ordering change i.e. no other LSP actions occur between these two calls.
Previously, we only updated our internal connection status and UI in
between.

Release Notes:

- Fixed an issue where GitHub Copilot could get stuck and fail to sign
in.
---
 crates/copilot/src/copilot.rs           | 95 +++++++++++++------------
 crates/languages/src/css.rs             |  5 +-
 crates/languages/src/json.rs            |  5 +-
 crates/languages/src/python.rs          |  5 +-
 crates/languages/src/tailwind.rs        |  5 +-
 crates/languages/src/typescript.rs      |  5 +-
 crates/languages/src/vtsls.rs           |  8 +--
 crates/languages/src/yaml.rs            |  5 +-
 crates/node_runtime/src/node_runtime.rs | 34 +++++----
 9 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 166a582c70..dcebeae721 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -21,7 +21,7 @@ use language::{
     point_from_lsp, point_to_lsp,
 };
 use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId, LanguageServerName};
-use node_runtime::{NodeRuntime, VersionCheck};
+use node_runtime::{NodeRuntime, VersionStrategy};
 use parking_lot::Mutex;
 use project::DisableAiSettings;
 use request::StatusNotification;
@@ -349,7 +349,11 @@ impl Copilot {
         this.start_copilot(true, false, cx);
         cx.observe_global::<SettingsStore>(move |this, cx| {
             this.start_copilot(true, false, cx);
-            this.send_configuration_update(cx);
+            if let Ok(server) = this.server.as_running() {
+                notify_did_change_config_to_server(&server.lsp, cx)
+                    .context("copilot setting change: did change configuration")
+                    .log_err();
+            }
         })
         .detach();
         this
@@ -438,43 +442,6 @@ impl Copilot {
         if env.is_empty() { None } else { Some(env) }
     }
 
-    fn send_configuration_update(&mut self, cx: &mut Context<Self>) {
-        let copilot_settings = all_language_settings(None, cx)
-            .edit_predictions
-            .copilot
-            .clone();
-
-        let settings = json!({
-            "http": {
-                "proxy": copilot_settings.proxy,
-                "proxyStrictSSL": !copilot_settings.proxy_no_verify.unwrap_or(false)
-            },
-            "github-enterprise": {
-                "uri": copilot_settings.enterprise_uri
-            }
-        });
-
-        if let Some(copilot_chat) = copilot_chat::CopilotChat::global(cx) {
-            copilot_chat.update(cx, |chat, cx| {
-                chat.set_configuration(
-                    copilot_chat::CopilotChatConfiguration {
-                        enterprise_uri: copilot_settings.enterprise_uri.clone(),
-                    },
-                    cx,
-                );
-            });
-        }
-
-        if let Ok(server) = self.server.as_running() {
-            server
-                .lsp
-                .notify::<lsp::notification::DidChangeConfiguration>(
-                    &lsp::DidChangeConfigurationParams { settings },
-                )
-                .log_err();
-        }
-    }
-
     #[cfg(any(test, feature = "test-support"))]
     pub fn fake(cx: &mut gpui::TestAppContext) -> (Entity<Self>, lsp::FakeLanguageServer) {
         use fs::FakeFs;
@@ -573,6 +540,9 @@ impl Copilot {
                 })?
                 .await?;
 
+            this.update(cx, |_, cx| notify_did_change_config_to_server(&server, cx))?
+                .context("copilot: did change configuration")?;
+
             let status = server
                 .request::<request::CheckStatus>(request::CheckStatusParams {
                     local_checks_only: false,
@@ -598,8 +568,6 @@ impl Copilot {
                     });
                     cx.emit(Event::CopilotLanguageServerStarted);
                     this.update_sign_in_status(status, cx);
-                    // Send configuration now that the LSP is fully started
-                    this.send_configuration_update(cx);
                 }
                 Err(error) => {
                     this.server = CopilotServer::Error(error.to_string().into());
@@ -1156,6 +1124,41 @@ fn uri_for_buffer(buffer: &Entity<Buffer>, cx: &App) -> Result<lsp::Url, ()> {
     }
 }
 
+fn notify_did_change_config_to_server(
+    server: &Arc<LanguageServer>,
+    cx: &mut Context<Copilot>,
+) -> std::result::Result<(), anyhow::Error> {
+    let copilot_settings = all_language_settings(None, cx)
+        .edit_predictions
+        .copilot
+        .clone();
+
+    if let Some(copilot_chat) = copilot_chat::CopilotChat::global(cx) {
+        copilot_chat.update(cx, |chat, cx| {
+            chat.set_configuration(
+                copilot_chat::CopilotChatConfiguration {
+                    enterprise_uri: copilot_settings.enterprise_uri.clone(),
+                },
+                cx,
+            );
+        });
+    }
+
+    let settings = json!({
+        "http": {
+            "proxy": copilot_settings.proxy,
+            "proxyStrictSSL": !copilot_settings.proxy_no_verify.unwrap_or(false)
+        },
+        "github-enterprise": {
+            "uri": copilot_settings.enterprise_uri
+        }
+    });
+
+    server.notify::<lsp::notification::DidChangeConfiguration>(&lsp::DidChangeConfigurationParams {
+        settings,
+    })
+}
+
 async fn clear_copilot_dir() {
     remove_matching(paths::copilot_dir(), |_| true).await
 }
@@ -1169,8 +1172,9 @@ async fn get_copilot_lsp(fs: Arc<dyn Fs>, node_runtime: NodeRuntime) -> anyhow::
     const SERVER_PATH: &str =
         "node_modules/@github/copilot-language-server/dist/language-server.js";
 
-    // pinning it: https://github.com/zed-industries/zed/issues/36093
-    const PINNED_VERSION: &str = "1.354";
+    let latest_version = node_runtime
+        .npm_package_latest_version(PACKAGE_NAME)
+        .await?;
     let server_path = paths::copilot_dir().join(SERVER_PATH);
 
     fs.create_dir(paths::copilot_dir()).await?;
@@ -1180,13 +1184,12 @@ async fn get_copilot_lsp(fs: Arc<dyn Fs>, node_runtime: NodeRuntime) -> anyhow::
             PACKAGE_NAME,
             &server_path,
             paths::copilot_dir(),
-            &PINNED_VERSION,
-            VersionCheck::VersionMismatch,
+            VersionStrategy::Latest(&latest_version),
         )
         .await;
     if should_install {
         node_runtime
-            .npm_install_packages(paths::copilot_dir(), &[(PACKAGE_NAME, &PINNED_VERSION)])
+            .npm_install_packages(paths::copilot_dir(), &[(PACKAGE_NAME, &latest_version)])
             .await?;
     }
 
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index 19329fcc6e..ffd9006c76 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -4,7 +4,7 @@ use futures::StreamExt;
 use gpui::AsyncApp;
 use language::{LanguageToolchainStore, LspAdapter, LspAdapterDelegate};
 use lsp::{LanguageServerBinary, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::json;
 use smol::fs;
@@ -107,8 +107,7 @@ impl LspAdapter for CssLspAdapter {
                 Self::PACKAGE_NAME,
                 &server_path,
                 &container_dir,
-                &version,
-                Default::default(),
+                VersionStrategy::Latest(version),
             )
             .await;
 
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 019b45d396..484631d01f 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -12,7 +12,7 @@ use language::{
     LspAdapter, LspAdapterDelegate,
 };
 use lsp::{LanguageServerBinary, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::{Value, json};
 use settings::{KeymapFile, SettingsJsonSchemaParams, SettingsStore};
@@ -344,8 +344,7 @@ impl LspAdapter for JsonLspAdapter {
                 Self::PACKAGE_NAME,
                 &server_path,
                 &container_dir,
-                &version,
-                Default::default(),
+                VersionStrategy::Latest(version),
             )
             .await;
 
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 5513324487..40131089d1 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -13,7 +13,7 @@ use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
 use language::{Toolchain, WorkspaceFoldersContent};
 use lsp::LanguageServerBinary;
 use lsp::LanguageServerName;
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use pet_core::Configuration;
 use pet_core::os_environment::Environment;
 use pet_core::python_environment::PythonEnvironmentKind;
@@ -205,8 +205,7 @@ impl LspAdapter for PythonLspAdapter {
                 Self::SERVER_NAME.as_ref(),
                 &server_path,
                 &container_dir,
-                &version,
-                Default::default(),
+                VersionStrategy::Latest(version),
             )
             .await;
 
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 6f03eeda8d..0d647f07cf 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -5,7 +5,7 @@ use futures::StreamExt;
 use gpui::AsyncApp;
 use language::{LanguageName, LanguageToolchainStore, LspAdapter, LspAdapterDelegate};
 use lsp::{LanguageServerBinary, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::{Value, json};
 use smol::fs;
@@ -112,8 +112,7 @@ impl LspAdapter for TailwindLspAdapter {
                 Self::PACKAGE_NAME,
                 &server_path,
                 &container_dir,
-                &version,
-                Default::default(),
+                VersionStrategy::Latest(version),
             )
             .await;
 
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index a8ba880889..1877c86dc5 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -10,7 +10,7 @@ use language::{
     LspAdapterDelegate,
 };
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::{Value, json};
 use smol::{fs, lock::RwLock, stream::StreamExt};
@@ -588,8 +588,7 @@ impl LspAdapter for TypeScriptLspAdapter {
                 Self::PACKAGE_NAME,
                 &server_path,
                 &container_dir,
-                version.typescript_version.as_str(),
-                Default::default(),
+                VersionStrategy::Latest(version.typescript_version.as_str()),
             )
             .await;
 
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 73498fc579..90faf883ba 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -4,7 +4,7 @@ use collections::HashMap;
 use gpui::AsyncApp;
 use language::{LanguageName, LanguageToolchainStore, LspAdapter, LspAdapterDelegate};
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::Value;
 use std::{
@@ -115,8 +115,7 @@ impl LspAdapter for VtslsLspAdapter {
                 Self::PACKAGE_NAME,
                 &server_path,
                 &container_dir,
-                &latest_version.server_version,
-                Default::default(),
+                VersionStrategy::Latest(&latest_version.server_version),
             )
             .await
         {
@@ -129,8 +128,7 @@ impl LspAdapter for VtslsLspAdapter {
                 Self::TYPESCRIPT_PACKAGE_NAME,
                 &container_dir.join(Self::TYPESCRIPT_TSDK_PATH),
                 &container_dir,
-                &latest_version.typescript_version,
-                Default::default(),
+                VersionStrategy::Latest(&latest_version.typescript_version),
             )
             .await
         {
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index 28be2cc1a4..15a4d590bc 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -6,7 +6,7 @@ use language::{
     LanguageToolchainStore, LspAdapter, LspAdapterDelegate, language_settings::AllLanguageSettings,
 };
 use lsp::{LanguageServerBinary, LanguageServerName};
-use node_runtime::NodeRuntime;
+use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::Value;
 use settings::{Settings, SettingsLocation};
@@ -108,8 +108,7 @@ impl LspAdapter for YamlLspAdapter {
                 Self::PACKAGE_NAME,
                 &server_path,
                 &container_dir,
-                &version,
-                Default::default(),
+                VersionStrategy::Latest(version),
             )
             .await;
 
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index 6fcc3a728a..f92c122e71 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -29,13 +29,11 @@ pub struct NodeBinaryOptions {
     pub use_paths: Option<(PathBuf, PathBuf)>,
 }
 
-#[derive(Default)]
-pub enum VersionCheck {
-    /// Check whether the installed and requested version have a mismatch
-    VersionMismatch,
-    /// Only check whether the currently installed version is older than the newest one
-    #[default]
-    OlderVersion,
+pub enum VersionStrategy<'a> {
+    /// Install if current version doesn't match pinned version
+    Pin(&'a str),
+    /// Install if current version is older than latest version
+    Latest(&'a str),
 }
 
 #[derive(Clone)]
@@ -295,8 +293,7 @@ impl NodeRuntime {
         package_name: &str,
         local_executable_path: &Path,
         local_package_directory: &Path,
-        latest_version: &str,
-        version_check: VersionCheck,
+        version_strategy: VersionStrategy<'_>,
     ) -> bool {
         // In the case of the local system not having the package installed,
         // or in the instances where we fail to parse package.json data,
@@ -317,13 +314,20 @@ impl NodeRuntime {
         let Some(installed_version) = Version::parse(&installed_version).log_err() else {
             return true;
         };
-        let Some(latest_version) = Version::parse(latest_version).log_err() else {
-            return true;
-        };
 
-        match version_check {
-            VersionCheck::VersionMismatch => installed_version != latest_version,
-            VersionCheck::OlderVersion => installed_version < latest_version,
+        match version_strategy {
+            VersionStrategy::Pin(pinned_version) => {
+                let Some(pinned_version) = Version::parse(pinned_version).log_err() else {
+                    return true;
+                };
+                installed_version != pinned_version
+            }
+            VersionStrategy::Latest(latest_version) => {
+                let Some(latest_version) = Version::parse(latest_version).log_err() else {
+                    return true;
+                };
+                installed_version < latest_version
+            }
         }
     }
 }

From 43ee604179ccda222eed29a173ac19e0514e8679 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Thu, 14 Aug 2025 15:30:18 -0300
Subject: [PATCH 033/823] acp: Clean up entry views on rewind (#36197)

We were leaking diffs and terminals on rewind, we'll now clean them up.
This PR also introduces a refactor of how we mantain the entry view
state to use a `Vec` that's kept in sync with the thread entries.

Release Notes:

- N/A
---
 crates/acp_thread/Cargo.toml                |   3 +-
 crates/acp_thread/src/acp_thread.rs         |  36 +-
 crates/acp_thread/src/connection.rs         | 156 +++++-
 crates/agent2/src/agent.rs                  |   8 +-
 crates/agent2/src/tests/mod.rs              |   2 +-
 crates/agent_servers/src/acp/v0.rs          |   2 +-
 crates/agent_servers/src/acp/v1.rs          |   2 +-
 crates/agent_servers/src/claude.rs          |   2 +-
 crates/agent_servers/src/e2e_tests.rs       |   4 +-
 crates/agent_ui/Cargo.toml                  |   1 +
 crates/agent_ui/src/acp.rs                  |   1 +
 crates/agent_ui/src/acp/entry_view_state.rs | 351 +++++++++++++
 crates/agent_ui/src/acp/thread_view.rs      | 536 +++++++++-----------
 13 files changed, 758 insertions(+), 346 deletions(-)
 create mode 100644 crates/agent_ui/src/acp/entry_view_state.rs

diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 2d0fe2d264..2b9a6513c8 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/acp_thread.rs"
 doctest = false
 
 [features]
-test-support = ["gpui/test-support", "project/test-support"]
+test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot"]
 
 [dependencies]
 action_log.workspace = true
@@ -29,6 +29,7 @@ gpui.workspace = true
 itertools.workspace = true
 language.workspace = true
 markdown.workspace = true
+parking_lot = { workspace = true, optional = true }
 project.workspace = true
 prompt_store.workspace = true
 serde.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index da4d82712a..4bdc42ea2e 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1575,11 +1575,7 @@ mod tests {
         let project = Project::test(fs, [], cx).await;
         let connection = Rc::new(FakeAgentConnection::new());
         let thread = cx
-            .spawn(async move |mut cx| {
-                connection
-                    .new_thread(project, Path::new(path!("/test")), &mut cx)
-                    .await
-            })
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
             .await
             .unwrap();
 
@@ -1699,11 +1695,7 @@ mod tests {
         ));
 
         let thread = cx
-            .spawn(async move |mut cx| {
-                connection
-                    .new_thread(project, Path::new(path!("/test")), &mut cx)
-                    .await
-            })
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
             .await
             .unwrap();
 
@@ -1786,7 +1778,7 @@ mod tests {
             .unwrap();
 
         let thread = cx
-            .spawn(|mut cx| connection.new_thread(project, Path::new(path!("/tmp")), &mut cx))
+            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
             .await
             .unwrap();
 
@@ -1849,11 +1841,7 @@ mod tests {
         }));
 
         let thread = cx
-            .spawn(async move |mut cx| {
-                connection
-                    .new_thread(project, Path::new(path!("/test")), &mut cx)
-                    .await
-            })
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
             .await
             .unwrap();
 
@@ -1961,10 +1949,11 @@ mod tests {
             }
         }));
 
-        let thread = connection
-            .new_thread(project, Path::new(path!("/test")), &mut cx.to_async())
+        let thread = cx
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
             .await
             .unwrap();
+
         cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Hi".into()], cx)))
             .await
             .unwrap();
@@ -2021,8 +2010,8 @@ mod tests {
                 .boxed_local()
             }
         }));
-        let thread = connection
-            .new_thread(project, Path::new(path!("/test")), &mut cx.to_async())
+        let thread = cx
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
             .await
             .unwrap();
 
@@ -2227,7 +2216,7 @@ mod tests {
             self: Rc<Self>,
             project: Entity<Project>,
             _cwd: &Path,
-            cx: &mut gpui::AsyncApp,
+            cx: &mut gpui::App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
             let session_id = acp::SessionId(
                 rand::thread_rng()
@@ -2237,9 +2226,8 @@ mod tests {
                     .collect::<String>()
                     .into(),
             );
-            let thread = cx
-                .new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx))
-                .unwrap();
+            let thread =
+                cx.new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx));
             self.sessions.lock().insert(session_id, thread.downgrade());
             Task::ready(Ok(thread))
         }
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index c3167eb2d4..0f531acbde 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -2,7 +2,7 @@ use crate::AcpThread;
 use agent_client_protocol::{self as acp};
 use anyhow::Result;
 use collections::IndexMap;
-use gpui::{AsyncApp, Entity, SharedString, Task};
+use gpui::{Entity, SharedString, Task};
 use project::Project;
 use std::{error::Error, fmt, path::Path, rc::Rc, sync::Arc};
 use ui::{App, IconName};
@@ -22,7 +22,7 @@ pub trait AgentConnection {
         self: Rc<Self>,
         project: Entity<Project>,
         cwd: &Path,
-        cx: &mut AsyncApp,
+        cx: &mut App,
     ) -> Task<Result<Entity<AcpThread>>>;
 
     fn auth_methods(&self) -> &[acp::AuthMethod];
@@ -160,3 +160,155 @@ impl AgentModelList {
         }
     }
 }
+
+#[cfg(feature = "test-support")]
+mod test_support {
+    use std::sync::Arc;
+
+    use collections::HashMap;
+    use futures::future::try_join_all;
+    use gpui::{AppContext as _, WeakEntity};
+    use parking_lot::Mutex;
+
+    use super::*;
+
+    #[derive(Clone, Default)]
+    pub struct StubAgentConnection {
+        sessions: Arc<Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
+        permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
+        next_prompt_updates: Arc<Mutex<Vec<acp::SessionUpdate>>>,
+    }
+
+    impl StubAgentConnection {
+        pub fn new() -> Self {
+            Self {
+                next_prompt_updates: Default::default(),
+                permission_requests: HashMap::default(),
+                sessions: Arc::default(),
+            }
+        }
+
+        pub fn set_next_prompt_updates(&self, updates: Vec<acp::SessionUpdate>) {
+            *self.next_prompt_updates.lock() = updates;
+        }
+
+        pub fn with_permission_requests(
+            mut self,
+            permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
+        ) -> Self {
+            self.permission_requests = permission_requests;
+            self
+        }
+
+        pub fn send_update(
+            &self,
+            session_id: acp::SessionId,
+            update: acp::SessionUpdate,
+            cx: &mut App,
+        ) {
+            self.sessions
+                .lock()
+                .get(&session_id)
+                .unwrap()
+                .update(cx, |thread, cx| {
+                    thread.handle_session_update(update.clone(), cx).unwrap();
+                })
+                .unwrap();
+        }
+    }
+
+    impl AgentConnection for StubAgentConnection {
+        fn auth_methods(&self) -> &[acp::AuthMethod] {
+            &[]
+        }
+
+        fn new_thread(
+            self: Rc<Self>,
+            project: Entity<Project>,
+            _cwd: &Path,
+            cx: &mut gpui::App,
+        ) -> Task<gpui::Result<Entity<AcpThread>>> {
+            let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
+            let thread =
+                cx.new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx));
+            self.sessions.lock().insert(session_id, thread.downgrade());
+            Task::ready(Ok(thread))
+        }
+
+        fn authenticate(
+            &self,
+            _method_id: acp::AuthMethodId,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<()>> {
+            unimplemented!()
+        }
+
+        fn prompt(
+            &self,
+            _id: Option<UserMessageId>,
+            params: acp::PromptRequest,
+            cx: &mut App,
+        ) -> Task<gpui::Result<acp::PromptResponse>> {
+            let sessions = self.sessions.lock();
+            let thread = sessions.get(&params.session_id).unwrap();
+            let mut tasks = vec![];
+            for update in self.next_prompt_updates.lock().drain(..) {
+                let thread = thread.clone();
+                let update = update.clone();
+                let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) = &update
+                    && let Some(options) = self.permission_requests.get(&tool_call.id)
+                {
+                    Some((tool_call.clone(), options.clone()))
+                } else {
+                    None
+                };
+                let task = cx.spawn(async move |cx| {
+                    if let Some((tool_call, options)) = permission_request {
+                        let permission = thread.update(cx, |thread, cx| {
+                            thread.request_tool_call_authorization(
+                                tool_call.clone(),
+                                options.clone(),
+                                cx,
+                            )
+                        })?;
+                        permission.await?;
+                    }
+                    thread.update(cx, |thread, cx| {
+                        thread.handle_session_update(update.clone(), cx).unwrap();
+                    })?;
+                    anyhow::Ok(())
+                });
+                tasks.push(task);
+            }
+            cx.spawn(async move |_| {
+                try_join_all(tasks).await?;
+                Ok(acp::PromptResponse {
+                    stop_reason: acp::StopReason::EndTurn,
+                })
+            })
+        }
+
+        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
+            unimplemented!()
+        }
+
+        fn session_editor(
+            &self,
+            _session_id: &agent_client_protocol::SessionId,
+            _cx: &mut App,
+        ) -> Option<Rc<dyn AgentSessionEditor>> {
+            Some(Rc::new(StubAgentSessionEditor))
+        }
+    }
+
+    struct StubAgentSessionEditor;
+
+    impl AgentSessionEditor for StubAgentSessionEditor {
+        fn truncate(&self, _: UserMessageId, _: &mut App) -> Task<Result<()>> {
+            Task::ready(Ok(()))
+        }
+    }
+}
+
+#[cfg(feature = "test-support")]
+pub use test_support::*;
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 6ebcece2b5..9ac3c2d0e5 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -522,7 +522,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         self: Rc<Self>,
         project: Entity<Project>,
         cwd: &Path,
-        cx: &mut AsyncApp,
+        cx: &mut App,
     ) -> Task<Result<Entity<acp_thread::AcpThread>>> {
         let agent = self.0.clone();
         log::info!("Creating new thread for project at: {:?}", cwd);
@@ -940,11 +940,7 @@ mod tests {
         // Create a thread/session
         let acp_thread = cx
             .update(|cx| {
-                Rc::new(connection.clone()).new_thread(
-                    project.clone(),
-                    Path::new("/a"),
-                    &mut cx.to_async(),
-                )
+                Rc::new(connection.clone()).new_thread(project.clone(), Path::new("/a"), cx)
             })
             .await
             .unwrap();
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 637af73d1a..1df664c029 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -841,7 +841,7 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
     // Create a thread using new_thread
     let connection_rc = Rc::new(connection.clone());
     let acp_thread = cx
-        .update(|cx| connection_rc.new_thread(project, cwd, &mut cx.to_async()))
+        .update(|cx| connection_rc.new_thread(project, cwd, cx))
         .await
         .expect("new_thread should succeed");
 
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index 327613de67..15f8635cde 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -423,7 +423,7 @@ impl AgentConnection for AcpConnection {
         self: Rc<Self>,
         project: Entity<Project>,
         _cwd: &Path,
-        cx: &mut AsyncApp,
+        cx: &mut App,
     ) -> Task<Result<Entity<AcpThread>>> {
         let task = self.connection.request_any(
             acp_old::InitializeParams {
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index de397fddf0..d93e3d023e 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -111,7 +111,7 @@ impl AgentConnection for AcpConnection {
         self: Rc<Self>,
         project: Entity<Project>,
         cwd: &Path,
-        cx: &mut AsyncApp,
+        cx: &mut App,
     ) -> Task<Result<Entity<AcpThread>>> {
         let conn = self.connection.clone();
         let sessions = self.sessions.clone();
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index c394ec4a9c..dbcda00e48 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -74,7 +74,7 @@ impl AgentConnection for ClaudeAgentConnection {
         self: Rc<Self>,
         project: Entity<Project>,
         cwd: &Path,
-        cx: &mut AsyncApp,
+        cx: &mut App,
     ) -> Task<Result<Entity<AcpThread>>> {
         let cwd = cwd.to_owned();
         cx.spawn(async move |cx| {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index ec6ca29b9d..5af7010f26 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -422,8 +422,8 @@ pub async fn new_test_thread(
         .await
         .unwrap();
 
-    let thread = connection
-        .new_thread(project.clone(), current_dir.as_ref(), &mut cx.to_async())
+    let thread = cx
+        .update(|cx| connection.new_thread(project.clone(), current_dir.as_ref(), cx))
         .await
         .unwrap();
 
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index b6a5710aa4..13fd9d13c5 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -103,6 +103,7 @@ workspace.workspace = true
 zed_actions.workspace = true
 
 [dev-dependencies]
+acp_thread = { workspace = true, features = ["test-support"] }
 agent = { workspace = true, features = ["test-support"] }
 assistant_context = { workspace = true, features = ["test-support"] }
 assistant_tools.workspace = true
diff --git a/crates/agent_ui/src/acp.rs b/crates/agent_ui/src/acp.rs
index 630aa730a6..831d296eeb 100644
--- a/crates/agent_ui/src/acp.rs
+++ b/crates/agent_ui/src/acp.rs
@@ -1,4 +1,5 @@
 mod completion_provider;
+mod entry_view_state;
 mod message_editor;
 mod model_selector;
 mod model_selector_popover;
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
new file mode 100644
index 0000000000..2f5f855e90
--- /dev/null
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -0,0 +1,351 @@
+use std::{collections::HashMap, ops::Range};
+
+use acp_thread::AcpThread;
+use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer};
+use gpui::{
+    AnyEntity, App, AppContext as _, Entity, EntityId, TextStyleRefinement, WeakEntity, Window,
+};
+use language::language_settings::SoftWrap;
+use settings::Settings as _;
+use terminal_view::TerminalView;
+use theme::ThemeSettings;
+use ui::TextSize;
+use workspace::Workspace;
+
+#[derive(Default)]
+pub struct EntryViewState {
+    entries: Vec<Entry>,
+}
+
+impl EntryViewState {
+    pub fn entry(&self, index: usize) -> Option<&Entry> {
+        self.entries.get(index)
+    }
+
+    pub fn sync_entry(
+        &mut self,
+        workspace: WeakEntity<Workspace>,
+        thread: Entity<AcpThread>,
+        index: usize,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        debug_assert!(index <= self.entries.len());
+        let entry = if let Some(entry) = self.entries.get_mut(index) {
+            entry
+        } else {
+            self.entries.push(Entry::default());
+            self.entries.last_mut().unwrap()
+        };
+
+        entry.sync_diff_multibuffers(&thread, index, window, cx);
+        entry.sync_terminals(&workspace, &thread, index, window, cx);
+    }
+
+    pub fn remove(&mut self, range: Range<usize>) {
+        self.entries.drain(range);
+    }
+
+    pub fn settings_changed(&mut self, cx: &mut App) {
+        for entry in self.entries.iter() {
+            for view in entry.views.values() {
+                if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
+                    diff_editor.update(cx, |diff_editor, cx| {
+                        diff_editor
+                            .set_text_style_refinement(diff_editor_text_style_refinement(cx));
+                        cx.notify();
+                    })
+                }
+            }
+        }
+    }
+}
+
+pub struct Entry {
+    views: HashMap<EntityId, AnyEntity>,
+}
+
+impl Entry {
+    pub fn editor_for_diff(&self, diff: &Entity<MultiBuffer>) -> Option<Entity<Editor>> {
+        self.views
+            .get(&diff.entity_id())
+            .cloned()
+            .map(|entity| entity.downcast::<Editor>().unwrap())
+    }
+
+    pub fn terminal(
+        &self,
+        terminal: &Entity<acp_thread::Terminal>,
+    ) -> Option<Entity<TerminalView>> {
+        self.views
+            .get(&terminal.entity_id())
+            .cloned()
+            .map(|entity| entity.downcast::<TerminalView>().unwrap())
+    }
+
+    fn sync_diff_multibuffers(
+        &mut self,
+        thread: &Entity<AcpThread>,
+        index: usize,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let Some(entry) = thread.read(cx).entries().get(index) else {
+            return;
+        };
+
+        let multibuffers = entry
+            .diffs()
+            .map(|diff| diff.read(cx).multibuffer().clone());
+
+        let multibuffers = multibuffers.collect::<Vec<_>>();
+
+        for multibuffer in multibuffers {
+            if self.views.contains_key(&multibuffer.entity_id()) {
+                return;
+            }
+
+            let editor = cx.new(|cx| {
+                let mut editor = Editor::new(
+                    EditorMode::Full {
+                        scale_ui_elements_with_buffer_font_size: false,
+                        show_active_line_background: false,
+                        sized_by_content: true,
+                    },
+                    multibuffer.clone(),
+                    None,
+                    window,
+                    cx,
+                );
+                editor.set_show_gutter(false, cx);
+                editor.disable_inline_diagnostics();
+                editor.disable_expand_excerpt_buttons(cx);
+                editor.set_show_vertical_scrollbar(false, cx);
+                editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
+                editor.set_soft_wrap_mode(SoftWrap::None, cx);
+                editor.scroll_manager.set_forbid_vertical_scroll(true);
+                editor.set_show_indent_guides(false, cx);
+                editor.set_read_only(true);
+                editor.set_show_breakpoints(false, cx);
+                editor.set_show_code_actions(false, cx);
+                editor.set_show_git_diff_gutter(false, cx);
+                editor.set_expand_all_diff_hunks(cx);
+                editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
+                editor
+            });
+
+            let entity_id = multibuffer.entity_id();
+            self.views.insert(entity_id, editor.into_any());
+        }
+    }
+
+    fn sync_terminals(
+        &mut self,
+        workspace: &WeakEntity<Workspace>,
+        thread: &Entity<AcpThread>,
+        index: usize,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let Some(entry) = thread.read(cx).entries().get(index) else {
+            return;
+        };
+
+        let terminals = entry
+            .terminals()
+            .map(|terminal| terminal.clone())
+            .collect::<Vec<_>>();
+
+        for terminal in terminals {
+            if self.views.contains_key(&terminal.entity_id()) {
+                return;
+            }
+
+            let Some(strong_workspace) = workspace.upgrade() else {
+                return;
+            };
+
+            let terminal_view = cx.new(|cx| {
+                let mut view = TerminalView::new(
+                    terminal.read(cx).inner().clone(),
+                    workspace.clone(),
+                    None,
+                    strong_workspace.read(cx).project().downgrade(),
+                    window,
+                    cx,
+                );
+                view.set_embedded_mode(Some(1000), cx);
+                view
+            });
+
+            let entity_id = terminal.entity_id();
+            self.views.insert(entity_id, terminal_view.into_any());
+        }
+    }
+
+    #[cfg(test)]
+    pub fn len(&self) -> usize {
+        self.views.len()
+    }
+}
+
+fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
+    TextStyleRefinement {
+        font_size: Some(
+            TextSize::Small
+                .rems(cx)
+                .to_pixels(ThemeSettings::get_global(cx).agent_font_size(cx))
+                .into(),
+        ),
+        ..Default::default()
+    }
+}
+
+impl Default for Entry {
+    fn default() -> Self {
+        Self {
+            // Avoid allocating in the heap by default
+            views: HashMap::with_capacity(0),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{path::Path, rc::Rc};
+
+    use acp_thread::{AgentConnection, StubAgentConnection};
+    use agent_client_protocol as acp;
+    use agent_settings::AgentSettings;
+    use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
+    use editor::{EditorSettings, RowInfo};
+    use fs::FakeFs;
+    use gpui::{SemanticVersion, TestAppContext};
+    use multi_buffer::MultiBufferRow;
+    use pretty_assertions::assert_matches;
+    use project::Project;
+    use serde_json::json;
+    use settings::{Settings as _, SettingsStore};
+    use theme::ThemeSettings;
+    use util::path;
+    use workspace::Workspace;
+
+    use crate::acp::entry_view_state::EntryViewState;
+
+    #[gpui::test]
+    async fn test_diff_sync(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/project",
+            json!({
+                "hello.txt": "hi world"
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
+
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+        let tool_call = acp::ToolCall {
+            id: acp::ToolCallId("tool".into()),
+            title: "Tool call".into(),
+            kind: acp::ToolKind::Other,
+            status: acp::ToolCallStatus::InProgress,
+            content: vec![acp::ToolCallContent::Diff {
+                diff: acp::Diff {
+                    path: "/project/hello.txt".into(),
+                    old_text: Some("hi world".into()),
+                    new_text: "hello world".into(),
+                },
+            }],
+            locations: vec![],
+            raw_input: None,
+            raw_output: None,
+        };
+        let connection = Rc::new(StubAgentConnection::new());
+        let thread = cx
+            .update(|_, cx| {
+                connection
+                    .clone()
+                    .new_thread(project, Path::new(path!("/project")), cx)
+            })
+            .await
+            .unwrap();
+        let session_id = thread.update(cx, |thread, _| thread.session_id().clone());
+
+        cx.update(|_, cx| {
+            connection.send_update(session_id, acp::SessionUpdate::ToolCall(tool_call), cx)
+        });
+
+        let mut view_state = EntryViewState::default();
+        cx.update(|window, cx| {
+            view_state.sync_entry(workspace.downgrade(), thread.clone(), 0, window, cx);
+        });
+
+        let multibuffer = thread.read_with(cx, |thread, cx| {
+            thread
+                .entries()
+                .get(0)
+                .unwrap()
+                .diffs()
+                .next()
+                .unwrap()
+                .read(cx)
+                .multibuffer()
+                .clone()
+        });
+
+        cx.run_until_parked();
+
+        let entry = view_state.entry(0).unwrap();
+        let diff_editor = entry.editor_for_diff(&multibuffer).unwrap();
+        assert_eq!(
+            diff_editor.read_with(cx, |editor, cx| editor.text(cx)),
+            "hi world\nhello world"
+        );
+        let row_infos = diff_editor.read_with(cx, |editor, cx| {
+            let multibuffer = editor.buffer().read(cx);
+            multibuffer
+                .snapshot(cx)
+                .row_infos(MultiBufferRow(0))
+                .collect::<Vec<_>>()
+        });
+        assert_matches!(
+            row_infos.as_slice(),
+            [
+                RowInfo {
+                    multibuffer_row: Some(MultiBufferRow(0)),
+                    diff_status: Some(DiffHunkStatus {
+                        kind: DiffHunkStatusKind::Deleted,
+                        ..
+                    }),
+                    ..
+                },
+                RowInfo {
+                    multibuffer_row: Some(MultiBufferRow(1)),
+                    diff_status: Some(DiffHunkStatus {
+                        kind: DiffHunkStatusKind::Added,
+                        ..
+                    }),
+                    ..
+                }
+            ]
+        );
+    }
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            language::init(cx);
+            Project::init_settings(cx);
+            AgentSettings::register(cx);
+            workspace::init_settings(cx);
+            ThemeSettings::register(cx);
+            release_channel::init(SemanticVersion::default(), cx);
+            EditorSettings::register(cx);
+        });
+    }
+}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2a72cc6f48..0e90b93f4d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -12,24 +12,22 @@ use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
-use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey, SelectionEffects};
+use editor::{Editor, EditorMode, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
 use gpui::{
     Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, EdgesRefinement, Empty, Entity,
-    EntityId, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton,
-    PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle,
-    TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
-    linear_color_stop, linear_gradient, list, percentage, point, prelude::*, pulsating_between,
+    FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton, PlatformDisplay,
+    SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement,
+    Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div, linear_color_stop,
+    linear_gradient, list, percentage, point, prelude::*, pulsating_between,
 };
 use language::Buffer;
-use language::language_settings::SoftWrap;
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use project::Project;
 use prompt_store::PromptId;
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
 use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
-use terminal_view::TerminalView;
 use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
@@ -41,6 +39,7 @@ use workspace::{CollaboratorId, Workspace};
 use zed_actions::agent::{Chat, ToggleModelSelector};
 use zed_actions::assistant::OpenRulesLibrary;
 
+use super::entry_view_state::EntryViewState;
 use crate::acp::AcpModelSelectorPopover;
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
@@ -61,8 +60,7 @@ pub struct AcpThreadView {
     thread_store: Entity<ThreadStore>,
     text_thread_store: Entity<TextThreadStore>,
     thread_state: ThreadState,
-    diff_editors: HashMap<EntityId, Entity<Editor>>,
-    terminal_views: HashMap<EntityId, Entity<TerminalView>>,
+    entry_view_state: EntryViewState,
     message_editor: Entity<MessageEditor>,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
     notifications: Vec<WindowHandle<AgentNotification>>,
@@ -149,8 +147,7 @@ impl AcpThreadView {
             model_selector: None,
             notifications: Vec::new(),
             notification_subscriptions: HashMap::default(),
-            diff_editors: Default::default(),
-            terminal_views: Default::default(),
+            entry_view_state: EntryViewState::default(),
             list_state: list_state.clone(),
             scrollbar_state: ScrollbarState::new(list_state).parent_entity(&cx.entity()),
             last_error: None,
@@ -209,11 +206,18 @@ impl AcpThreadView {
             // })
             // .ok();
 
-            let result = match connection
-                .clone()
-                .new_thread(project.clone(), &root_dir, cx)
-                .await
-            {
+            let Some(result) = cx
+                .update(|_, cx| {
+                    connection
+                        .clone()
+                        .new_thread(project.clone(), &root_dir, cx)
+                })
+                .log_err()
+            else {
+                return;
+            };
+
+            let result = match result.await {
                 Err(e) => {
                     let mut cx = cx.clone();
                     if e.is::<acp_thread::AuthRequired>() {
@@ -480,16 +484,29 @@ impl AcpThreadView {
     ) {
         match event {
             AcpThreadEvent::NewEntry => {
-                let index = thread.read(cx).entries().len() - 1;
-                self.sync_thread_entry_view(index, window, cx);
+                let len = thread.read(cx).entries().len();
+                let index = len - 1;
+                self.entry_view_state.sync_entry(
+                    self.workspace.clone(),
+                    thread.clone(),
+                    index,
+                    window,
+                    cx,
+                );
                 self.list_state.splice(index..index, 1);
             }
             AcpThreadEvent::EntryUpdated(index) => {
-                self.sync_thread_entry_view(*index, window, cx);
+                self.entry_view_state.sync_entry(
+                    self.workspace.clone(),
+                    thread.clone(),
+                    *index,
+                    window,
+                    cx,
+                );
                 self.list_state.splice(*index..index + 1, 1);
             }
             AcpThreadEvent::EntriesRemoved(range) => {
-                // TODO: Clean up unused diff editors and terminal views
+                self.entry_view_state.remove(range.clone());
                 self.list_state.splice(range.clone(), 0);
             }
             AcpThreadEvent::ToolAuthorizationRequired => {
@@ -523,128 +540,6 @@ impl AcpThreadView {
         cx.notify();
     }
 
-    fn sync_thread_entry_view(
-        &mut self,
-        entry_ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.sync_diff_multibuffers(entry_ix, window, cx);
-        self.sync_terminals(entry_ix, window, cx);
-    }
-
-    fn sync_diff_multibuffers(
-        &mut self,
-        entry_ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(multibuffers) = self.entry_diff_multibuffers(entry_ix, cx) else {
-            return;
-        };
-
-        let multibuffers = multibuffers.collect::<Vec<_>>();
-
-        for multibuffer in multibuffers {
-            if self.diff_editors.contains_key(&multibuffer.entity_id()) {
-                return;
-            }
-
-            let editor = cx.new(|cx| {
-                let mut editor = Editor::new(
-                    EditorMode::Full {
-                        scale_ui_elements_with_buffer_font_size: false,
-                        show_active_line_background: false,
-                        sized_by_content: true,
-                    },
-                    multibuffer.clone(),
-                    None,
-                    window,
-                    cx,
-                );
-                editor.set_show_gutter(false, cx);
-                editor.disable_inline_diagnostics();
-                editor.disable_expand_excerpt_buttons(cx);
-                editor.set_show_vertical_scrollbar(false, cx);
-                editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
-                editor.set_soft_wrap_mode(SoftWrap::None, cx);
-                editor.scroll_manager.set_forbid_vertical_scroll(true);
-                editor.set_show_indent_guides(false, cx);
-                editor.set_read_only(true);
-                editor.set_show_breakpoints(false, cx);
-                editor.set_show_code_actions(false, cx);
-                editor.set_show_git_diff_gutter(false, cx);
-                editor.set_expand_all_diff_hunks(cx);
-                editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
-                editor
-            });
-            let entity_id = multibuffer.entity_id();
-            cx.observe_release(&multibuffer, move |this, _, _| {
-                this.diff_editors.remove(&entity_id);
-            })
-            .detach();
-
-            self.diff_editors.insert(entity_id, editor);
-        }
-    }
-
-    fn entry_diff_multibuffers(
-        &self,
-        entry_ix: usize,
-        cx: &App,
-    ) -> Option<impl Iterator<Item = Entity<MultiBuffer>>> {
-        let entry = self.thread()?.read(cx).entries().get(entry_ix)?;
-        Some(
-            entry
-                .diffs()
-                .map(|diff| diff.read(cx).multibuffer().clone()),
-        )
-    }
-
-    fn sync_terminals(&mut self, entry_ix: usize, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(terminals) = self.entry_terminals(entry_ix, cx) else {
-            return;
-        };
-
-        let terminals = terminals.collect::<Vec<_>>();
-
-        for terminal in terminals {
-            if self.terminal_views.contains_key(&terminal.entity_id()) {
-                return;
-            }
-
-            let terminal_view = cx.new(|cx| {
-                let mut view = TerminalView::new(
-                    terminal.read(cx).inner().clone(),
-                    self.workspace.clone(),
-                    None,
-                    self.project.downgrade(),
-                    window,
-                    cx,
-                );
-                view.set_embedded_mode(Some(1000), cx);
-                view
-            });
-
-            let entity_id = terminal.entity_id();
-            cx.observe_release(&terminal, move |this, _, _| {
-                this.terminal_views.remove(&entity_id);
-            })
-            .detach();
-
-            self.terminal_views.insert(entity_id, terminal_view);
-        }
-    }
-
-    fn entry_terminals(
-        &self,
-        entry_ix: usize,
-        cx: &App,
-    ) -> Option<impl Iterator<Item = Entity<acp_thread::Terminal>>> {
-        let entry = self.thread()?.read(cx).entries().get(entry_ix)?;
-        Some(entry.terminals().map(|terminal| terminal.clone()))
-    }
-
     fn authenticate(
         &mut self,
         method: acp::AuthMethodId,
@@ -712,7 +607,7 @@ impl AcpThreadView {
 
     fn render_entry(
         &self,
-        index: usize,
+        entry_ix: usize,
         total_entries: usize,
         entry: &AgentThreadEntry,
         window: &mut Window,
@@ -720,7 +615,7 @@ impl AcpThreadView {
     ) -> AnyElement {
         let primary = match &entry {
             AgentThreadEntry::UserMessage(message) => div()
-                .id(("user_message", index))
+                .id(("user_message", entry_ix))
                 .py_4()
                 .px_2()
                 .children(message.id.clone().and_then(|message_id| {
@@ -749,7 +644,9 @@ impl AcpThreadView {
                         .text_xs()
                         .id("message")
                         .on_click(cx.listener({
-                            move |this, _, window, cx| this.start_editing_message(index, window, cx)
+                            move |this, _, window, cx| {
+                                this.start_editing_message(entry_ix, window, cx)
+                            }
                         }))
                         .children(
                             if let Some(editing) = self.editing_message.as_ref()
@@ -787,7 +684,7 @@ impl AcpThreadView {
                             AssistantMessageChunk::Thought { block } => {
                                 block.markdown().map(|md| {
                                     self.render_thinking_block(
-                                        index,
+                                        entry_ix,
                                         chunk_ix,
                                         md.clone(),
                                         window,
@@ -803,7 +700,7 @@ impl AcpThreadView {
                 v_flex()
                     .px_5()
                     .py_1()
-                    .when(index + 1 == total_entries, |this| this.pb_4())
+                    .when(entry_ix + 1 == total_entries, |this| this.pb_4())
                     .w_full()
                     .text_ui(cx)
                     .child(message_body)
@@ -815,10 +712,12 @@ impl AcpThreadView {
                 div().w_full().py_1p5().px_5().map(|this| {
                     if has_terminals {
                         this.children(tool_call.terminals().map(|terminal| {
-                            self.render_terminal_tool_call(terminal, tool_call, window, cx)
+                            self.render_terminal_tool_call(
+                                entry_ix, terminal, tool_call, window, cx,
+                            )
                         }))
                     } else {
-                        this.child(self.render_tool_call(index, tool_call, window, cx))
+                        this.child(self.render_tool_call(entry_ix, tool_call, window, cx))
                     }
                 })
             }
@@ -830,7 +729,7 @@ impl AcpThreadView {
         };
 
         let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
-        let primary = if index == total_entries - 1 && !is_generating {
+        let primary = if entry_ix == total_entries - 1 && !is_generating {
             v_flex()
                 .w_full()
                 .child(primary)
@@ -841,10 +740,10 @@ impl AcpThreadView {
         };
 
         if let Some(editing) = self.editing_message.as_ref()
-            && editing.index < index
+            && editing.index < entry_ix
         {
             let backdrop = div()
-                .id(("backdrop", index))
+                .id(("backdrop", entry_ix))
                 .size_full()
                 .absolute()
                 .inset_0()
@@ -1125,7 +1024,9 @@ impl AcpThreadView {
                 .w_full()
                 .children(tool_call.content.iter().map(|content| {
                     div()
-                        .child(self.render_tool_call_content(content, tool_call, window, cx))
+                        .child(
+                            self.render_tool_call_content(entry_ix, content, tool_call, window, cx),
+                        )
                         .into_any_element()
                 }))
                 .child(self.render_permission_buttons(
@@ -1139,7 +1040,9 @@ impl AcpThreadView {
                 .w_full()
                 .children(tool_call.content.iter().map(|content| {
                     div()
-                        .child(self.render_tool_call_content(content, tool_call, window, cx))
+                        .child(
+                            self.render_tool_call_content(entry_ix, content, tool_call, window, cx),
+                        )
                         .into_any_element()
                 })),
             ToolCallStatus::Rejected => v_flex().size_0(),
@@ -1257,6 +1160,7 @@ impl AcpThreadView {
 
     fn render_tool_call_content(
         &self,
+        entry_ix: usize,
         content: &ToolCallContent,
         tool_call: &ToolCall,
         window: &Window,
@@ -1273,10 +1177,10 @@ impl AcpThreadView {
                 }
             }
             ToolCallContent::Diff(diff) => {
-                self.render_diff_editor(&diff.read(cx).multibuffer(), cx)
+                self.render_diff_editor(entry_ix, &diff.read(cx).multibuffer(), cx)
             }
             ToolCallContent::Terminal(terminal) => {
-                self.render_terminal_tool_call(terminal, tool_call, window, cx)
+                self.render_terminal_tool_call(entry_ix, terminal, tool_call, window, cx)
             }
         }
     }
@@ -1420,6 +1324,7 @@ impl AcpThreadView {
 
     fn render_diff_editor(
         &self,
+        entry_ix: usize,
         multibuffer: &Entity<MultiBuffer>,
         cx: &Context<Self>,
     ) -> AnyElement {
@@ -1428,7 +1333,9 @@ impl AcpThreadView {
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
             .child(
-                if let Some(editor) = self.diff_editors.get(&multibuffer.entity_id()) {
+                if let Some(entry) = self.entry_view_state.entry(entry_ix)
+                    && let Some(editor) = entry.editor_for_diff(&multibuffer)
+                {
                     editor.clone().into_any_element()
                 } else {
                     Empty.into_any()
@@ -1439,6 +1346,7 @@ impl AcpThreadView {
 
     fn render_terminal_tool_call(
         &self,
+        entry_ix: usize,
         terminal: &Entity<acp_thread::Terminal>,
         tool_call: &ToolCall,
         window: &Window,
@@ -1627,8 +1535,11 @@ impl AcpThreadView {
                 })),
             );
 
-        let show_output =
-            self.terminal_expanded && self.terminal_views.contains_key(&terminal.entity_id());
+        let terminal_view = self
+            .entry_view_state
+            .entry(entry_ix)
+            .and_then(|entry| entry.terminal(&terminal));
+        let show_output = self.terminal_expanded && terminal_view.is_some();
 
         v_flex()
             .mb_2()
@@ -1661,8 +1572,6 @@ impl AcpThreadView {
                     ),
             )
             .when(show_output, |this| {
-                let terminal_view = self.terminal_views.get(&terminal.entity_id()).unwrap();
-
                 this.child(
                     div()
                         .pt_2()
@@ -1672,7 +1581,7 @@ impl AcpThreadView {
                         .bg(cx.theme().colors().editor_background)
                         .rounded_b_md()
                         .text_ui_sm(cx)
-                        .child(terminal_view.clone()),
+                        .children(terminal_view.clone()),
                 )
             })
             .into_any()
@@ -3075,12 +2984,7 @@ impl AcpThreadView {
     }
 
     fn settings_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        for diff_editor in self.diff_editors.values() {
-            diff_editor.update(cx, |diff_editor, cx| {
-                diff_editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
-                cx.notify();
-            })
-        }
+        self.entry_view_state.settings_changed(cx);
     }
 
     pub(crate) fn insert_dragged_files(
@@ -3379,18 +3283,6 @@ fn plan_label_markdown_style(
     }
 }
 
-fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
-    TextStyleRefinement {
-        font_size: Some(
-            TextSize::Small
-                .rems(cx)
-                .to_pixels(ThemeSettings::get_global(cx).agent_font_size(cx))
-                .into(),
-        ),
-        ..Default::default()
-    }
-}
-
 fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
     let default_md_style = default_markdown_style(true, window, cx);
 
@@ -3405,16 +3297,16 @@ fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use std::{path::Path, sync::Arc};
+    use std::path::Path;
 
+    use acp_thread::StubAgentConnection;
     use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol::SessionId;
     use editor::EditorSettings;
     use fs::FakeFs;
-    use futures::future::try_join_all;
     use gpui::{SemanticVersion, TestAppContext, VisualTestContext};
-    use parking_lot::Mutex;
-    use rand::Rng;
+    use project::Project;
+    use serde_json::json;
     use settings::SettingsStore;
 
     use super::*;
@@ -3497,8 +3389,8 @@ pub(crate) mod tests {
             raw_input: None,
             raw_output: None,
         };
-        let connection = StubAgentConnection::new(vec![acp::SessionUpdate::ToolCall(tool_call)])
-            .with_permission_requests(HashMap::from_iter([(
+        let connection =
+            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
                 tool_call_id,
                 vec![acp::PermissionOption {
                     id: acp::PermissionOptionId("1".into()),
@@ -3506,6 +3398,9 @@ pub(crate) mod tests {
                     kind: acp::PermissionOptionKind::AllowOnce,
                 }],
             )]));
+
+        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
+
         let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
 
         let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
@@ -3605,115 +3500,6 @@ pub(crate) mod tests {
         }
     }
 
-    #[derive(Clone, Default)]
-    struct StubAgentConnection {
-        sessions: Arc<Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
-        permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
-        updates: Vec<acp::SessionUpdate>,
-    }
-
-    impl StubAgentConnection {
-        fn new(updates: Vec<acp::SessionUpdate>) -> Self {
-            Self {
-                updates,
-                permission_requests: HashMap::default(),
-                sessions: Arc::default(),
-            }
-        }
-
-        fn with_permission_requests(
-            mut self,
-            permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
-        ) -> Self {
-            self.permission_requests = permission_requests;
-            self
-        }
-    }
-
-    impl AgentConnection for StubAgentConnection {
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::AsyncApp,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = SessionId(
-                rand::thread_rng()
-                    .sample_iter(&rand::distributions::Alphanumeric)
-                    .take(7)
-                    .map(char::from)
-                    .collect::<String>()
-                    .into(),
-            );
-            let thread = cx
-                .new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx))
-                .unwrap();
-            self.sessions.lock().insert(session_id, thread.downgrade());
-            Task::ready(Ok(thread))
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            params: acp::PromptRequest,
-            cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            let sessions = self.sessions.lock();
-            let thread = sessions.get(&params.session_id).unwrap();
-            let mut tasks = vec![];
-            for update in &self.updates {
-                let thread = thread.clone();
-                let update = update.clone();
-                let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) = &update
-                    && let Some(options) = self.permission_requests.get(&tool_call.id)
-                {
-                    Some((tool_call.clone(), options.clone()))
-                } else {
-                    None
-                };
-                let task = cx.spawn(async move |cx| {
-                    if let Some((tool_call, options)) = permission_request {
-                        let permission = thread.update(cx, |thread, cx| {
-                            thread.request_tool_call_authorization(
-                                tool_call.clone(),
-                                options.clone(),
-                                cx,
-                            )
-                        })?;
-                        permission.await?;
-                    }
-                    thread.update(cx, |thread, cx| {
-                        thread.handle_session_update(update.clone(), cx).unwrap();
-                    })?;
-                    anyhow::Ok(())
-                });
-                tasks.push(task);
-            }
-            cx.spawn(async move |_| {
-                try_join_all(tasks).await?;
-                Ok(acp::PromptResponse {
-                    stop_reason: acp::StopReason::EndTurn,
-                })
-            })
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-    }
-
     #[derive(Clone)]
     struct SaboteurAgentConnection;
 
@@ -3722,19 +3508,17 @@ pub(crate) mod tests {
             self: Rc<Self>,
             project: Entity<Project>,
             _cwd: &Path,
-            cx: &mut gpui::AsyncApp,
+            cx: &mut gpui::App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            Task::ready(Ok(cx
-                .new(|cx| {
-                    AcpThread::new(
-                        "SaboteurAgentConnection",
-                        self,
-                        project,
-                        SessionId("test".into()),
-                        cx,
-                    )
-                })
-                .unwrap()))
+            Task::ready(Ok(cx.new(|cx| {
+                AcpThread::new(
+                    "SaboteurAgentConnection",
+                    self,
+                    project,
+                    SessionId("test".into()),
+                    cx,
+                )
+            })))
         }
 
         fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -3776,4 +3560,142 @@ pub(crate) mod tests {
             EditorSettings::register(cx);
         });
     }
+
+    #[gpui::test]
+    async fn test_rewind_views(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/project",
+            json!({
+                "test1.txt": "old content 1",
+                "test2.txt": "old content 2"
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [Path::new("/project")], cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+        let thread_store =
+            cx.update(|_window, cx| cx.new(|cx| ThreadStore::fake(project.clone(), cx)));
+        let text_thread_store =
+            cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
+
+        let connection = Rc::new(StubAgentConnection::new());
+        let thread_view = cx.update(|window, cx| {
+            cx.new(|cx| {
+                AcpThreadView::new(
+                    Rc::new(StubAgentServer::new(connection.as_ref().clone())),
+                    workspace.downgrade(),
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    window,
+                    cx,
+                )
+            })
+        });
+
+        cx.run_until_parked();
+
+        let thread = thread_view
+            .read_with(cx, |view, _| view.thread().cloned())
+            .unwrap();
+
+        // First user message
+        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(acp::ToolCall {
+            id: acp::ToolCallId("tool1".into()),
+            title: "Edit file 1".into(),
+            kind: acp::ToolKind::Edit,
+            status: acp::ToolCallStatus::Completed,
+            content: vec![acp::ToolCallContent::Diff {
+                diff: acp::Diff {
+                    path: "/project/test1.txt".into(),
+                    old_text: Some("old content 1".into()),
+                    new_text: "new content 1".into(),
+                },
+            }],
+            locations: vec![],
+            raw_input: None,
+            raw_output: None,
+        })]);
+
+        thread
+            .update(cx, |thread, cx| thread.send_raw("Give me a diff", cx))
+            .await
+            .unwrap();
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(thread.entries().len(), 2);
+        });
+
+        thread_view.read_with(cx, |view, _| {
+            assert_eq!(view.entry_view_state.entry(0).unwrap().len(), 0);
+            assert_eq!(view.entry_view_state.entry(1).unwrap().len(), 1);
+        });
+
+        // Second user message
+        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(acp::ToolCall {
+            id: acp::ToolCallId("tool2".into()),
+            title: "Edit file 2".into(),
+            kind: acp::ToolKind::Edit,
+            status: acp::ToolCallStatus::Completed,
+            content: vec![acp::ToolCallContent::Diff {
+                diff: acp::Diff {
+                    path: "/project/test2.txt".into(),
+                    old_text: Some("old content 2".into()),
+                    new_text: "new content 2".into(),
+                },
+            }],
+            locations: vec![],
+            raw_input: None,
+            raw_output: None,
+        })]);
+
+        thread
+            .update(cx, |thread, cx| thread.send_raw("Another one", cx))
+            .await
+            .unwrap();
+        cx.run_until_parked();
+
+        let second_user_message_id = thread.read_with(cx, |thread, _| {
+            assert_eq!(thread.entries().len(), 4);
+            let AgentThreadEntry::UserMessage(user_message) = thread.entries().get(2).unwrap()
+            else {
+                panic!();
+            };
+            user_message.id.clone().unwrap()
+        });
+
+        thread_view.read_with(cx, |view, _| {
+            assert_eq!(view.entry_view_state.entry(0).unwrap().len(), 0);
+            assert_eq!(view.entry_view_state.entry(1).unwrap().len(), 1);
+            assert_eq!(view.entry_view_state.entry(2).unwrap().len(), 0);
+            assert_eq!(view.entry_view_state.entry(3).unwrap().len(), 1);
+        });
+
+        // Rewind to first message
+        thread
+            .update(cx, |thread, cx| thread.rewind(second_user_message_id, cx))
+            .await
+            .unwrap();
+
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(thread.entries().len(), 2);
+        });
+
+        thread_view.read_with(cx, |view, _| {
+            assert_eq!(view.entry_view_state.entry(0).unwrap().len(), 0);
+            assert_eq!(view.entry_view_state.entry(1).unwrap().len(), 1);
+
+            // Old views should be dropped
+            assert!(view.entry_view_state.entry(2).is_none());
+            assert!(view.entry_view_state.entry(3).is_none());
+        });
+    }
 }

From eb9bbaacb1ccd0f4d92325e24a158739faa3872c Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 14 Aug 2025 15:07:28 -0400
Subject: [PATCH 034/823] Add onboarding reset restore script (#36202)

Release Notes:

- N/A
---
 script/onboarding | 176 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100755 script/onboarding

diff --git a/script/onboarding b/script/onboarding
new file mode 100755
index 0000000000..6cc878ec96
--- /dev/null
+++ b/script/onboarding
@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+
+set -e
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+CHANNEL="$1"
+COMMAND="$2"
+
+if [[ "$CHANNEL" != "stable" && "$CHANNEL" != "preview" && "$CHANNEL" != "nightly" && "$CHANNEL" != "dev" ]]; then
+    echo -e "${RED}Error: Invalid channel '$CHANNEL'. Must be one of: stable, preview, nightly, dev${NC}"
+    exit 1
+fi
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    DB_BASE_DIR="$HOME/Library/Application Support/Zed/db"
+    DB_DIR="$DB_BASE_DIR/0-$CHANNEL"
+    DB_BACKUP_DIR="$DB_BASE_DIR/0-$CHANNEL.onboarding_backup"
+    case "$CHANNEL" in
+        stable) APP_NAME="Zed" ;;
+        preview) APP_NAME="Zed Preview" ;;
+        nightly) APP_NAME="Zed Nightly" ;;
+        dev) APP_NAME="Zed Dev" ;;
+    esac
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    DB_BASE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zed/db"
+    DB_DIR="$DB_BASE_DIR/0-$CHANNEL"
+    DB_BACKUP_DIR="$DB_BASE_DIR/0-$CHANNEL.onboarding_backup"
+    case "$CHANNEL" in
+        stable) APP_NAME="zed" ;;
+        preview) APP_NAME="zed-preview" ;;
+        nightly) APP_NAME="zed-nightly" ;;
+        dev) APP_NAME="zed-dev" ;;
+    esac
+elif [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "win32" ]]; then
+    LOCALAPPDATA_PATH="${LOCALAPPDATA:-$USERPROFILE/AppData/Local}"
+    DB_BASE_DIR="$LOCALAPPDATA_PATH/Zed/db"
+    DB_DIR="$DB_BASE_DIR/0-$CHANNEL"
+    DB_BACKUP_DIR="$DB_BASE_DIR/0-$CHANNEL.onboarding_backup"
+
+    case "$CHANNEL" in
+        stable) APP_NAME="Zed" ;;
+        preview) APP_NAME="Zed Preview" ;;
+        nightly) APP_NAME="Zed Nightly" ;;
+        dev) APP_NAME="Zed Dev" ;;
+    esac
+else
+    echo -e "${RED}Error: Unsupported OS type: $OSTYPE${NC}"
+    exit 1
+fi
+
+reset_onboarding() {
+    echo -e "${BLUE}=== Resetting $APP_NAME to First-Time User State ===${NC}"
+    echo ""
+
+    if [ ! -d "$DB_DIR" ]; then
+        echo -e "${YELLOW}No database directory found at: $DB_DIR${NC}"
+        echo "Zed will create a fresh database on next launch and show onboarding."
+        exit 0
+    fi
+
+    if [ -d "$DB_BACKUP_DIR" ]; then
+        echo -e "${RED}ERROR: Backup already exists at: $DB_BACKUP_DIR${NC}"
+        echo ""
+        echo "This suggests you've already run 'onboarding reset'."
+        echo "To avoid losing your original database, this script won't overwrite the backup."
+        echo ""
+        echo "Options:"
+        echo "  1. Run './script/onboarding $CHANNEL restore' to restore your original database"
+        echo "  2. Manually remove the backup if you're sure: rm -rf $DB_BACKUP_DIR"
+        exit 1
+    fi
+
+    echo -e "${YELLOW}Moving $DB_DIR to $DB_BACKUP_DIR${NC}"
+    mv "$DB_DIR" "$DB_BACKUP_DIR"
+
+    echo -e "${GREEN}✓ Backed up: $DB_BACKUP_DIR${NC}"
+    echo ""
+    echo -e "${GREEN}Success! Zed has been reset to first-time user state.${NC}"
+    echo ""
+    echo "Next steps:"
+    echo "  1. Start Zed - you should see the onboarding flow"
+    echo "  2. When done testing, run: ./script/onboarding $CHANNEL restore"
+    echo ""
+    echo -e "${YELLOW}Note: All your workspace data is safely preserved in the backup.${NC}"
+}
+
+restore_onboarding() {
+    echo -e "${BLUE}=== Restoring Original $APP_NAME Database ===${NC}"
+    echo ""
+
+    if [ ! -d "$DB_BACKUP_DIR" ]; then
+        echo -e "${RED}ERROR: No backup found at: $DB_BACKUP_DIR${NC}"
+        echo ""
+        echo "Run './script/onboarding $CHANNEL reset' first to create a backup."
+        exit 1
+    fi
+
+    if [ -d "$DB_DIR" ]; then
+        echo -e "${YELLOW}Removing current database directory: $DB_DIR${NC}"
+        rm -rf "$DB_DIR"
+    fi
+
+    echo -e "${YELLOW}Restoring $DB_BACKUP_DIR to $DB_DIR${NC}"
+    mv "$DB_BACKUP_DIR" "$DB_DIR"
+
+    echo -e "${GREEN}✓ Restored: $DB_DIR${NC}"
+    echo ""
+    echo -e "${GREEN}Success! Your original database has been restored.${NC}"
+}
+
+show_status() {
+    echo -e "${BLUE}=== Zed Onboarding Test Status ===${NC}"
+    echo ""
+
+    if [ -d "$DB_BACKUP_DIR" ]; then
+        echo -e "${YELLOW}Status: TESTING MODE${NC}"
+        echo "  • Original database: $DB_BACKUP_DIR"
+        echo "  • Zed is using: $DB_DIR"
+        echo "  • Run './script/onboarding $CHANNEL restore' to return to normal"
+    elif [ -d "$DB_DIR" ]; then
+        echo -e "${GREEN}Status: NORMAL${NC}"
+        echo "  • Zed is using: $DB_DIR"
+        echo "  • Run './script/onboarding $CHANNEL reset' to test onboarding"
+    else
+        echo -e "${BLUE}Status: NO DATABASE${NC}"
+        echo "  • No Zed database directory exists yet"
+        echo "  • Zed will show onboarding on next launch"
+    fi
+}
+
+case "${COMMAND:-}" in
+    reset)
+        reset_onboarding
+        ;;
+    restore)
+        restore_onboarding
+        ;;
+    status)
+        show_status
+        ;;
+    *)
+        echo -e "${BLUE}Zed Onboarding Test Script${NC}"
+        echo ""
+        echo "Usage: $(basename $0) [channel] <command>"
+        echo ""
+        echo "Commands:"
+        echo "  reset    - Back up current database and reset to show onboarding"
+        echo "  restore  - Restore the original database after testing"
+        echo "  status   - Show current testing status"
+        echo ""
+        echo "Channels:"
+        echo "  stable, preview, nightly, dev"
+        echo ""
+        echo "Working with channel: $CHANNEL"
+        echo "Database directory: $DB_DIR"
+        echo ""
+        echo "Examples:"
+        echo "  ./script/onboarding nightly reset     # Reset nightly"
+        echo "  ./script/onboarding stable reset      # Reset stable"
+        echo "  ./script/onboarding preview restore   # Restore preview"
+        echo ""
+        echo "Workflow:"
+        echo "  1. Close Zed"
+        echo "  2. ./script/onboarding nightly reset"
+        echo "  3. Open Zed"
+        echo "  4. Test onboarding"
+        echo "  5. Close Zed"
+        echo "  6. ./script/onboarding nightly restore"
+        exit 1
+        ;;
+esac

From b65e9af3e97a5198dd0b3665f7c712690cf19561 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 14 Aug 2025 13:08:35 -0600
Subject: [PATCH 035/823] Add [f/]f to follow the next collaborator (#36191)

Release Notes:

- vim: Add `[f`/`]f` to go to the next collaborator
---
 assets/keymaps/vim.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 560ca3bdd8..be6d34a134 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -58,6 +58,8 @@
       "[ space": "vim::InsertEmptyLineAbove",
       "[ e": "editor::MoveLineUp",
       "] e": "editor::MoveLineDown",
+      "[ f": "workspace::FollowNextCollaborator",
+      "] f": "workspace::FollowNextCollaborator",
 
       // Word motions
       "w": "vim::NextWordStart",

From 3a711d08149dbaf1ac40ee5578d276dbc69e35c1 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 14 Aug 2025 15:19:37 -0400
Subject: [PATCH 036/823] Remove onboarding script (#36203)

Just use `ZED_STATELESS=1 zed` instead!

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 script/onboarding | 176 ----------------------------------------------
 1 file changed, 176 deletions(-)
 delete mode 100755 script/onboarding

diff --git a/script/onboarding b/script/onboarding
deleted file mode 100755
index 6cc878ec96..0000000000
--- a/script/onboarding
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m'
-
-CHANNEL="$1"
-COMMAND="$2"
-
-if [[ "$CHANNEL" != "stable" && "$CHANNEL" != "preview" && "$CHANNEL" != "nightly" && "$CHANNEL" != "dev" ]]; then
-    echo -e "${RED}Error: Invalid channel '$CHANNEL'. Must be one of: stable, preview, nightly, dev${NC}"
-    exit 1
-fi
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    DB_BASE_DIR="$HOME/Library/Application Support/Zed/db"
-    DB_DIR="$DB_BASE_DIR/0-$CHANNEL"
-    DB_BACKUP_DIR="$DB_BASE_DIR/0-$CHANNEL.onboarding_backup"
-    case "$CHANNEL" in
-        stable) APP_NAME="Zed" ;;
-        preview) APP_NAME="Zed Preview" ;;
-        nightly) APP_NAME="Zed Nightly" ;;
-        dev) APP_NAME="Zed Dev" ;;
-    esac
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    DB_BASE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zed/db"
-    DB_DIR="$DB_BASE_DIR/0-$CHANNEL"
-    DB_BACKUP_DIR="$DB_BASE_DIR/0-$CHANNEL.onboarding_backup"
-    case "$CHANNEL" in
-        stable) APP_NAME="zed" ;;
-        preview) APP_NAME="zed-preview" ;;
-        nightly) APP_NAME="zed-nightly" ;;
-        dev) APP_NAME="zed-dev" ;;
-    esac
-elif [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "win32" ]]; then
-    LOCALAPPDATA_PATH="${LOCALAPPDATA:-$USERPROFILE/AppData/Local}"
-    DB_BASE_DIR="$LOCALAPPDATA_PATH/Zed/db"
-    DB_DIR="$DB_BASE_DIR/0-$CHANNEL"
-    DB_BACKUP_DIR="$DB_BASE_DIR/0-$CHANNEL.onboarding_backup"
-
-    case "$CHANNEL" in
-        stable) APP_NAME="Zed" ;;
-        preview) APP_NAME="Zed Preview" ;;
-        nightly) APP_NAME="Zed Nightly" ;;
-        dev) APP_NAME="Zed Dev" ;;
-    esac
-else
-    echo -e "${RED}Error: Unsupported OS type: $OSTYPE${NC}"
-    exit 1
-fi
-
-reset_onboarding() {
-    echo -e "${BLUE}=== Resetting $APP_NAME to First-Time User State ===${NC}"
-    echo ""
-
-    if [ ! -d "$DB_DIR" ]; then
-        echo -e "${YELLOW}No database directory found at: $DB_DIR${NC}"
-        echo "Zed will create a fresh database on next launch and show onboarding."
-        exit 0
-    fi
-
-    if [ -d "$DB_BACKUP_DIR" ]; then
-        echo -e "${RED}ERROR: Backup already exists at: $DB_BACKUP_DIR${NC}"
-        echo ""
-        echo "This suggests you've already run 'onboarding reset'."
-        echo "To avoid losing your original database, this script won't overwrite the backup."
-        echo ""
-        echo "Options:"
-        echo "  1. Run './script/onboarding $CHANNEL restore' to restore your original database"
-        echo "  2. Manually remove the backup if you're sure: rm -rf $DB_BACKUP_DIR"
-        exit 1
-    fi
-
-    echo -e "${YELLOW}Moving $DB_DIR to $DB_BACKUP_DIR${NC}"
-    mv "$DB_DIR" "$DB_BACKUP_DIR"
-
-    echo -e "${GREEN}✓ Backed up: $DB_BACKUP_DIR${NC}"
-    echo ""
-    echo -e "${GREEN}Success! Zed has been reset to first-time user state.${NC}"
-    echo ""
-    echo "Next steps:"
-    echo "  1. Start Zed - you should see the onboarding flow"
-    echo "  2. When done testing, run: ./script/onboarding $CHANNEL restore"
-    echo ""
-    echo -e "${YELLOW}Note: All your workspace data is safely preserved in the backup.${NC}"
-}
-
-restore_onboarding() {
-    echo -e "${BLUE}=== Restoring Original $APP_NAME Database ===${NC}"
-    echo ""
-
-    if [ ! -d "$DB_BACKUP_DIR" ]; then
-        echo -e "${RED}ERROR: No backup found at: $DB_BACKUP_DIR${NC}"
-        echo ""
-        echo "Run './script/onboarding $CHANNEL reset' first to create a backup."
-        exit 1
-    fi
-
-    if [ -d "$DB_DIR" ]; then
-        echo -e "${YELLOW}Removing current database directory: $DB_DIR${NC}"
-        rm -rf "$DB_DIR"
-    fi
-
-    echo -e "${YELLOW}Restoring $DB_BACKUP_DIR to $DB_DIR${NC}"
-    mv "$DB_BACKUP_DIR" "$DB_DIR"
-
-    echo -e "${GREEN}✓ Restored: $DB_DIR${NC}"
-    echo ""
-    echo -e "${GREEN}Success! Your original database has been restored.${NC}"
-}
-
-show_status() {
-    echo -e "${BLUE}=== Zed Onboarding Test Status ===${NC}"
-    echo ""
-
-    if [ -d "$DB_BACKUP_DIR" ]; then
-        echo -e "${YELLOW}Status: TESTING MODE${NC}"
-        echo "  • Original database: $DB_BACKUP_DIR"
-        echo "  • Zed is using: $DB_DIR"
-        echo "  • Run './script/onboarding $CHANNEL restore' to return to normal"
-    elif [ -d "$DB_DIR" ]; then
-        echo -e "${GREEN}Status: NORMAL${NC}"
-        echo "  • Zed is using: $DB_DIR"
-        echo "  • Run './script/onboarding $CHANNEL reset' to test onboarding"
-    else
-        echo -e "${BLUE}Status: NO DATABASE${NC}"
-        echo "  • No Zed database directory exists yet"
-        echo "  • Zed will show onboarding on next launch"
-    fi
-}
-
-case "${COMMAND:-}" in
-    reset)
-        reset_onboarding
-        ;;
-    restore)
-        restore_onboarding
-        ;;
-    status)
-        show_status
-        ;;
-    *)
-        echo -e "${BLUE}Zed Onboarding Test Script${NC}"
-        echo ""
-        echo "Usage: $(basename $0) [channel] <command>"
-        echo ""
-        echo "Commands:"
-        echo "  reset    - Back up current database and reset to show onboarding"
-        echo "  restore  - Restore the original database after testing"
-        echo "  status   - Show current testing status"
-        echo ""
-        echo "Channels:"
-        echo "  stable, preview, nightly, dev"
-        echo ""
-        echo "Working with channel: $CHANNEL"
-        echo "Database directory: $DB_DIR"
-        echo ""
-        echo "Examples:"
-        echo "  ./script/onboarding nightly reset     # Reset nightly"
-        echo "  ./script/onboarding stable reset      # Reset stable"
-        echo "  ./script/onboarding preview restore   # Restore preview"
-        echo ""
-        echo "Workflow:"
-        echo "  1. Close Zed"
-        echo "  2. ./script/onboarding nightly reset"
-        echo "  3. Open Zed"
-        echo "  4. Test onboarding"
-        echo "  5. Close Zed"
-        echo "  6. ./script/onboarding nightly restore"
-        exit 1
-        ;;
-esac

From b7c562f359b65f2d529916503d579c027c49614d Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 14 Aug 2025 21:28:59 +0200
Subject: [PATCH 037/823] Bump `async-trait` (#36201)

The latest release has span changes in it which prevents rust-analyzer
from constantly showing `Box` and `Box::pin` on hover as well as those
items polluting the go to definition feature on every identifier.

See https://github.com/dtolnay/async-trait/pull/293

Release Notes:

- N/A
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 96cc1581a3..b4e4d9f876 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1304,9 +1304,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",

From e2ce787c051032bd6d3ad61c6ffd26b062d0f246 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 14 Aug 2025 23:18:07 +0200
Subject: [PATCH 038/823] editor: Limit target names in hover links multibuffer
 titles (#36207)

Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1f350cf0d0..a9780ed6c2 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -15879,6 +15879,8 @@ impl Editor {
                                     .text_for_range(location.range.clone())
                                     .collect::<String>()
                             })
+                            .unique()
+                            .take(3)
                             .join(", ");
                         format!("{tab_kind} for {target}")
                     })
@@ -16085,6 +16087,8 @@ impl Editor {
                             .text_for_range(location.range.clone())
                             .collect::<String>()
                     })
+                    .unique()
+                    .take(3)
                     .join(", ");
                 let title = format!("References to {target}");
                 Self::open_locations_in_multibuffer(

From b1e806442aefd7cd5df740234b2d7c3539dc905a Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 14 Aug 2025 17:31:14 -0400
Subject: [PATCH 039/823] Support images in agent2 threads (#36152)

- Support adding ImageContent to messages through copy/paste and through
path completions
- Ensure images are fully converted to LanguageModelImageContent before
sending them to the model
- Update ACP crate to v0.0.24 to enable passing image paths through the
protocol

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 Cargo.lock                                    |   4 +-
 Cargo.toml                                    |   2 +-
 crates/acp_thread/src/acp_thread.rs           |   9 +-
 crates/acp_thread/src/mention.rs              |   9 +
 .../agent_ui/src/acp/completion_provider.rs   | 218 ++++++++++-----
 crates/agent_ui/src/acp/message_editor.rs     | 255 ++++++++++++++++--
 crates/agent_ui/src/acp/thread_view.rs        |  10 +-
 7 files changed, 415 insertions(+), 92 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4e4d9f876..d0809bd880 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.23"
+version = "0.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fad72b7b8ee4331b3a4c8d43c107e982a4725564b4ee658ae5c4e79d2b486e8"
+checksum = "8fd68bbbef8e424fb8a605c5f0b00c360f682c4528b0a5feb5ec928aaf5ce28e"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
diff --git a/Cargo.toml b/Cargo.toml
index 1baa6d3d74..a872cadd39 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -425,7 +425,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.23"
+agent-client-protocol = "0.0.24"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 4bdc42ea2e..4005f27a0c 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -443,9 +443,8 @@ impl ContentBlock {
                     }),
                 ..
             }) => Self::resource_link_md(&uri),
-            acp::ContentBlock::Image(_)
-            | acp::ContentBlock::Audio(_)
-            | acp::ContentBlock::Resource(_) => String::new(),
+            acp::ContentBlock::Image(image) => Self::image_md(&image),
+            acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => String::new(),
         }
     }
 
@@ -457,6 +456,10 @@ impl ContentBlock {
         }
     }
 
+    fn image_md(_image: &acp::ImageContent) -> String {
+        "`Image`".into()
+    }
+
     fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
         match self {
             ContentBlock::Empty => "",
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index b18cbfe18e..b9b021c4ca 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -6,6 +6,7 @@ use std::{
     fmt,
     ops::Range,
     path::{Path, PathBuf},
+    str::FromStr,
 };
 use ui::{App, IconName, SharedString};
 use url::Url;
@@ -224,6 +225,14 @@ impl MentionUri {
     }
 }
 
+impl FromStr for MentionUri {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> anyhow::Result<Self> {
+        Self::parse(s)
+    }
+}
+
 pub struct MentionLink<'a>(&'a MentionUri);
 
 impl fmt::Display for MentionLink<'_> {
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 720ee23b00..adcfab85b1 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,5 +1,6 @@
+use std::ffi::OsStr;
 use std::ops::Range;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
@@ -8,13 +9,14 @@ use anyhow::{Context as _, Result, anyhow};
 use collections::{HashMap, HashSet};
 use editor::display_map::CreaseId;
 use editor::{CompletionProvider, Editor, ExcerptId, ToOffset as _};
-
-use futures::future::try_join_all;
+use futures::future::{Shared, try_join_all};
+use futures::{FutureExt, TryFutureExt};
 use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{App, Entity, Task, WeakEntity};
+use gpui::{App, Entity, ImageFormat, Img, Task, WeakEntity};
 use http_client::HttpClientWithUrl;
 use itertools::Itertools as _;
 use language::{Buffer, CodeLabel, HighlightId};
+use language_model::LanguageModelImage;
 use lsp::CompletionContext;
 use parking_lot::Mutex;
 use project::{
@@ -43,24 +45,43 @@ use crate::context_picker::{
     available_context_picker_entries, recent_context_picker_entries, selection_ranges,
 };
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct MentionImage {
+    pub abs_path: Option<Arc<Path>>,
+    pub data: SharedString,
+    pub format: ImageFormat,
+}
+
 #[derive(Default)]
 pub struct MentionSet {
     uri_by_crease_id: HashMap<CreaseId, MentionUri>,
-    fetch_results: HashMap<Url, String>,
+    fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
+    images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
 }
 
 impl MentionSet {
-    pub fn insert(&mut self, crease_id: CreaseId, uri: MentionUri) {
+    pub fn insert_uri(&mut self, crease_id: CreaseId, uri: MentionUri) {
         self.uri_by_crease_id.insert(crease_id, uri);
     }
 
-    pub fn add_fetch_result(&mut self, url: Url, content: String) {
+    pub fn add_fetch_result(&mut self, url: Url, content: Shared<Task<Result<String, String>>>) {
         self.fetch_results.insert(url, content);
     }
 
+    pub fn insert_image(
+        &mut self,
+        crease_id: CreaseId,
+        task: Shared<Task<Result<MentionImage, String>>>,
+    ) {
+        self.images.insert(crease_id, task);
+    }
+
     pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
         self.fetch_results.clear();
-        self.uri_by_crease_id.drain().map(|(id, _)| id)
+        self.uri_by_crease_id
+            .drain()
+            .map(|(id, _)| id)
+            .chain(self.images.drain().map(|(id, _)| id))
     }
 
     pub fn clear(&mut self) {
@@ -76,7 +97,7 @@ impl MentionSet {
         window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, Mention>>> {
-        let contents = self
+        let mut contents = self
             .uri_by_crease_id
             .iter()
             .map(|(&crease_id, uri)| {
@@ -85,19 +106,59 @@ impl MentionSet {
                         // TODO directories
                         let uri = uri.clone();
                         let abs_path = abs_path.to_path_buf();
-                        let buffer_task = project.update(cx, |project, cx| {
-                            let path = project
-                                .find_project_path(abs_path, cx)
-                                .context("Failed to find project path")?;
-                            anyhow::Ok(project.open_buffer(path, cx))
-                        });
+                        let extension = abs_path.extension().and_then(OsStr::to_str).unwrap_or("");
 
-                        cx.spawn(async move |cx| {
-                            let buffer = buffer_task?.await?;
-                            let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+                        if Img::extensions().contains(&extension) && !extension.contains("svg") {
+                            let open_image_task = project.update(cx, |project, cx| {
+                                let path = project
+                                    .find_project_path(&abs_path, cx)
+                                    .context("Failed to find project path")?;
+                                anyhow::Ok(project.open_image(path, cx))
+                            });
 
-                            anyhow::Ok((crease_id, Mention { uri, content }))
-                        })
+                            cx.spawn(async move |cx| {
+                                let image_item = open_image_task?.await?;
+                                let (data, format) = image_item.update(cx, |image_item, cx| {
+                                    let format = image_item.image.format;
+                                    (
+                                        LanguageModelImage::from_image(
+                                            image_item.image.clone(),
+                                            cx,
+                                        ),
+                                        format,
+                                    )
+                                })?;
+                                let data = cx.spawn(async move |_| {
+                                    if let Some(data) = data.await {
+                                        Ok(data.source)
+                                    } else {
+                                        anyhow::bail!("Failed to convert image")
+                                    }
+                                });
+
+                                anyhow::Ok((
+                                    crease_id,
+                                    Mention::Image(MentionImage {
+                                        abs_path: Some(abs_path.as_path().into()),
+                                        data: data.await?,
+                                        format,
+                                    }),
+                                ))
+                            })
+                        } else {
+                            let buffer_task = project.update(cx, |project, cx| {
+                                let path = project
+                                    .find_project_path(abs_path, cx)
+                                    .context("Failed to find project path")?;
+                                anyhow::Ok(project.open_buffer(path, cx))
+                            });
+                            cx.spawn(async move |cx| {
+                                let buffer = buffer_task?.await?;
+                                let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+
+                                anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                            })
+                        }
                     }
                     MentionUri::Symbol {
                         path, line_range, ..
@@ -130,7 +191,7 @@ impl MentionSet {
                                     .collect()
                             })?;
 
-                            anyhow::Ok((crease_id, Mention { uri, content }))
+                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
                         })
                     }
                     MentionUri::Thread { id: thread_id, .. } => {
@@ -145,7 +206,7 @@ impl MentionSet {
                                 thread.latest_detailed_summary_or_text().to_string()
                             })?;
 
-                            anyhow::Ok((crease_id, Mention { uri, content }))
+                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
                         })
                     }
                     MentionUri::TextThread { path, .. } => {
@@ -156,7 +217,7 @@ impl MentionSet {
                         cx.spawn(async move |cx| {
                             let context = context.await?;
                             let xml = context.update(cx, |context, cx| context.to_xml(cx))?;
-                            anyhow::Ok((crease_id, Mention { uri, content: xml }))
+                            anyhow::Ok((crease_id, Mention::Text { uri, content: xml }))
                         })
                     }
                     MentionUri::Rule { id: prompt_id, .. } => {
@@ -169,25 +230,39 @@ impl MentionSet {
                         cx.spawn(async move |_| {
                             // TODO: report load errors instead of just logging
                             let text = text_task.await?;
-                            anyhow::Ok((crease_id, Mention { uri, content: text }))
+                            anyhow::Ok((crease_id, Mention::Text { uri, content: text }))
                         })
                     }
                     MentionUri::Fetch { url } => {
-                        let Some(content) = self.fetch_results.get(&url) else {
+                        let Some(content) = self.fetch_results.get(&url).cloned() else {
                             return Task::ready(Err(anyhow!("missing fetch result")));
                         };
-                        Task::ready(Ok((
-                            crease_id,
-                            Mention {
-                                uri: uri.clone(),
-                                content: content.clone(),
-                            },
-                        )))
+                        let uri = uri.clone();
+                        cx.spawn(async move |_| {
+                            Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
+                                },
+                            ))
+                        })
                     }
                 }
             })
             .collect::<Vec<_>>();
 
+        contents.extend(self.images.iter().map(|(crease_id, image)| {
+            let crease_id = *crease_id;
+            let image = image.clone();
+            cx.spawn(async move |_| {
+                Ok((
+                    crease_id,
+                    Mention::Image(image.await.map_err(|e| anyhow::anyhow!("{e}"))?),
+                ))
+            })
+        }));
+
         cx.spawn(async move |_cx| {
             let contents = try_join_all(contents).await?.into_iter().collect();
             anyhow::Ok(contents)
@@ -195,10 +270,10 @@ impl MentionSet {
     }
 }
 
-#[derive(Debug)]
-pub struct Mention {
-    pub uri: MentionUri,
-    pub content: String,
+#[derive(Debug, Eq, PartialEq)]
+pub enum Mention {
+    Text { uri: MentionUri, content: String },
+    Image(MentionImage),
 }
 
 pub(crate) enum Match {
@@ -536,7 +611,10 @@ impl ContextPickerCompletionProvider {
                                                 crease_ids.try_into().unwrap()
                                             });
 
-                                        mention_set.lock().insert(crease_id, uri);
+                                        mention_set.lock().insert_uri(
+                                            crease_id,
+                                            MentionUri::Selection { path, line_range },
+                                        );
 
                                         current_offset += text_len + 1;
                                     }
@@ -786,6 +864,7 @@ impl ContextPickerCompletionProvider {
                 let url_to_fetch = url_to_fetch.clone();
                 let source_range = source_range.clone();
                 let icon_path = icon_path.clone();
+                let mention_uri = mention_uri.clone();
                 Arc::new(move |_, window, cx| {
                     let Some(url) = url::Url::parse(url_to_fetch.as_ref())
                         .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
@@ -799,6 +878,7 @@ impl ContextPickerCompletionProvider {
                     let http_client = http_client.clone();
                     let source_range = source_range.clone();
                     let icon_path = icon_path.clone();
+                    let mention_uri = mention_uri.clone();
                     window.defer(cx, move |window, cx| {
                         let url = url.clone();
 
@@ -819,17 +899,24 @@ impl ContextPickerCompletionProvider {
                         let mention_set = mention_set.clone();
                         let http_client = http_client.clone();
                         let source_range = source_range.clone();
+
+                        let url_string = url.to_string();
+                        let fetch = cx
+                            .background_executor()
+                            .spawn(async move {
+                                fetch_url_content(http_client, url_string)
+                                    .map_err(|e| e.to_string())
+                                    .await
+                            })
+                            .shared();
+                        mention_set.lock().add_fetch_result(url, fetch.clone());
+
                         window
                             .spawn(cx, async move |cx| {
-                                if let Some(content) =
-                                    fetch_url_content(http_client, url.to_string())
-                                        .await
-                                        .notify_async_err(cx)
-                                {
-                                    mention_set.lock().add_fetch_result(url.clone(), content);
+                                if fetch.await.notify_async_err(cx).is_some() {
                                     mention_set
                                         .lock()
-                                        .insert(crease_id, MentionUri::Fetch { url });
+                                        .insert_uri(crease_id, mention_uri.clone());
                                 } else {
                                     // Remove crease if we failed to fetch
                                     editor
@@ -1121,7 +1208,9 @@ fn confirm_completion_callback(
                 window,
                 cx,
             ) {
-                mention_set.lock().insert(crease_id, mention_uri.clone());
+                mention_set
+                    .lock()
+                    .insert_uri(crease_id, mention_uri.clone());
             }
         });
         false
@@ -1499,11 +1588,12 @@ mod tests {
             .into_values()
             .collect::<Vec<_>>();
 
-        assert_eq!(contents.len(), 1);
-        assert_eq!(contents[0].content, "1");
-        assert_eq!(
-            contents[0].uri.to_uri().to_string(),
-            "file:///dir/a/one.txt"
+        pretty_assertions::assert_eq!(
+            contents,
+            [Mention::Text {
+                content: "1".into(),
+                uri: "file:///dir/a/one.txt".parse().unwrap()
+            }]
         );
 
         cx.simulate_input(" ");
@@ -1567,11 +1657,13 @@ mod tests {
             .collect::<Vec<_>>();
 
         assert_eq!(contents.len(), 2);
-        let new_mention = contents
-            .iter()
-            .find(|mention| mention.uri.to_uri().to_string() == "file:///dir/b/eight.txt")
-            .unwrap();
-        assert_eq!(new_mention.content, "8");
+        pretty_assertions::assert_eq!(
+            contents[1],
+            Mention::Text {
+                content: "8".to_string(),
+                uri: "file:///dir/b/eight.txt".parse().unwrap(),
+            }
+        );
 
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
@@ -1689,13 +1781,15 @@ mod tests {
             .collect::<Vec<_>>();
 
         assert_eq!(contents.len(), 3);
-        let new_mention = contents
-            .iter()
-            .find(|mention| {
-                mention.uri.to_uri().to_string() == "file:///dir/a/one.txt?symbol=MySymbol#L1:1"
-            })
-            .unwrap();
-        assert_eq!(new_mention.content, "1");
+        pretty_assertions::assert_eq!(
+            contents[2],
+            Mention::Text {
+                content: "1".into(),
+                uri: "file:///dir/a/one.txt?symbol=MySymbol#L1:1"
+                    .parse()
+                    .unwrap(),
+            }
+        );
 
         cx.run_until_parked();
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index fc34420d4e..8d512948dd 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1,4 +1,5 @@
 use crate::acp::completion_provider::ContextPickerCompletionProvider;
+use crate::acp::completion_provider::MentionImage;
 use crate::acp::completion_provider::MentionSet;
 use acp_thread::MentionUri;
 use agent::TextThreadStore;
@@ -6,30 +7,44 @@ use agent::ThreadStore;
 use agent_client_protocol as acp;
 use anyhow::Result;
 use collections::HashSet;
+use editor::ExcerptId;
+use editor::actions::Paste;
+use editor::display_map::CreaseId;
 use editor::{
     AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorMode,
     EditorStyle, MultiBuffer,
 };
+use futures::FutureExt as _;
+use gpui::ClipboardEntry;
+use gpui::Image;
+use gpui::ImageFormat;
 use gpui::{
     AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, Task, TextStyle, WeakEntity,
 };
 use language::Buffer;
 use language::Language;
+use language_model::LanguageModelImage;
 use parking_lot::Mutex;
 use project::{CompletionIntent, Project};
 use settings::Settings;
 use std::fmt::Write;
+use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
 use theme::ThemeSettings;
+use ui::IconName;
+use ui::SharedString;
 use ui::{
     ActiveTheme, App, InteractiveElement, IntoElement, ParentElement, Render, Styled, TextSize,
     Window, div,
 };
 use util::ResultExt;
 use workspace::Workspace;
+use workspace::notifications::NotifyResultExt as _;
 use zed_actions::agent::Chat;
 
+use super::completion_provider::Mention;
+
 pub struct MessageEditor {
     editor: Entity<Editor>,
     project: Entity<Project>,
@@ -130,23 +145,41 @@ impl MessageEditor {
                             continue;
                         }
 
-                        if let Some(mention) = contents.get(&crease_id) {
-                            let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot);
-                            if crease_range.start > ix {
-                                chunks.push(text[ix..crease_range.start].into());
-                            }
-                            chunks.push(acp::ContentBlock::Resource(acp::EmbeddedResource {
-                                annotations: None,
-                                resource: acp::EmbeddedResourceResource::TextResourceContents(
-                                    acp::TextResourceContents {
-                                        mime_type: None,
-                                        text: mention.content.clone(),
-                                        uri: mention.uri.to_uri().to_string(),
-                                    },
-                                ),
-                            }));
-                            ix = crease_range.end;
+                        let Some(mention) = contents.get(&crease_id) else {
+                            continue;
+                        };
+
+                        let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot);
+                        if crease_range.start > ix {
+                            chunks.push(text[ix..crease_range.start].into());
                         }
+                        let chunk = match mention {
+                            Mention::Text { uri, content } => {
+                                acp::ContentBlock::Resource(acp::EmbeddedResource {
+                                    annotations: None,
+                                    resource: acp::EmbeddedResourceResource::TextResourceContents(
+                                        acp::TextResourceContents {
+                                            mime_type: None,
+                                            text: content.clone(),
+                                            uri: uri.to_uri().to_string(),
+                                        },
+                                    ),
+                                })
+                            }
+                            Mention::Image(mention_image) => {
+                                acp::ContentBlock::Image(acp::ImageContent {
+                                    annotations: None,
+                                    data: mention_image.data.to_string(),
+                                    mime_type: mention_image.format.mime_type().into(),
+                                    uri: mention_image
+                                        .abs_path
+                                        .as_ref()
+                                        .map(|path| format!("file://{}", path.display())),
+                                })
+                            }
+                        };
+                        chunks.push(chunk);
+                        ix = crease_range.end;
                     }
 
                     if ix < text.len() {
@@ -177,6 +210,56 @@ impl MessageEditor {
         cx.emit(MessageEditorEvent::Cancel)
     }
 
+    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
+        let images = cx
+            .read_from_clipboard()
+            .map(|item| {
+                item.into_entries()
+                    .filter_map(|entry| {
+                        if let ClipboardEntry::Image(image) = entry {
+                            Some(image)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+
+        if images.is_empty() {
+            return;
+        }
+        cx.stop_propagation();
+
+        let replacement_text = "image";
+        for image in images {
+            let (excerpt_id, anchor) = self.editor.update(cx, |message_editor, cx| {
+                let snapshot = message_editor.snapshot(window, cx);
+                let (excerpt_id, _, snapshot) = snapshot.buffer_snapshot.as_singleton().unwrap();
+
+                let anchor = snapshot.anchor_before(snapshot.len());
+                message_editor.edit(
+                    [(
+                        multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
+                        format!("{replacement_text} "),
+                    )],
+                    cx,
+                );
+                (*excerpt_id, anchor)
+            });
+
+            self.insert_image(
+                excerpt_id,
+                anchor,
+                replacement_text.len(),
+                Arc::new(image),
+                None,
+                window,
+                cx,
+            );
+        }
+    }
+
     pub fn insert_dragged_files(
         &self,
         paths: Vec<project::ProjectPath>,
@@ -234,6 +317,68 @@ impl MessageEditor {
         }
     }
 
+    fn insert_image(
+        &mut self,
+        excerpt_id: ExcerptId,
+        crease_start: text::Anchor,
+        content_len: usize,
+        image: Arc<Image>,
+        abs_path: Option<Arc<Path>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(crease_id) = insert_crease_for_image(
+            excerpt_id,
+            crease_start,
+            content_len,
+            self.editor.clone(),
+            window,
+            cx,
+        ) else {
+            return;
+        };
+        self.editor.update(cx, |_editor, cx| {
+            let format = image.format;
+            let convert = LanguageModelImage::from_image(image, cx);
+
+            let task = cx
+                .spawn_in(window, async move |editor, cx| {
+                    if let Some(image) = convert.await {
+                        Ok(MentionImage {
+                            abs_path,
+                            data: image.source,
+                            format,
+                        })
+                    } else {
+                        editor
+                            .update(cx, |editor, cx| {
+                                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                                let Some(anchor) =
+                                    snapshot.anchor_in_excerpt(excerpt_id, crease_start)
+                                else {
+                                    return;
+                                };
+                                editor.display_map.update(cx, |display_map, cx| {
+                                    display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                                });
+                                editor.remove_creases([crease_id], cx);
+                            })
+                            .ok();
+                        Err("Failed to convert image".to_string())
+                    }
+                })
+                .shared();
+
+            cx.spawn_in(window, {
+                let task = task.clone();
+                async move |_, cx| task.clone().await.notify_async_err(cx)
+            })
+            .detach();
+
+            self.mention_set.lock().insert_image(crease_id, task);
+        });
+    }
+
     pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
             editor.set_mode(mode);
@@ -243,12 +388,13 @@ impl MessageEditor {
 
     pub fn set_message(
         &mut self,
-        message: &[acp::ContentBlock],
+        message: Vec<acp::ContentBlock>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         let mut text = String::new();
         let mut mentions = Vec::new();
+        let mut images = Vec::new();
 
         for chunk in message {
             match chunk {
@@ -266,8 +412,13 @@ impl MessageEditor {
                         mentions.push((start..end, mention_uri));
                     }
                 }
-                acp::ContentBlock::Image(_)
-                | acp::ContentBlock::Audio(_)
+                acp::ContentBlock::Image(content) => {
+                    let start = text.len();
+                    text.push_str("image");
+                    let end = text.len();
+                    images.push((start..end, content));
+                }
+                acp::ContentBlock::Audio(_)
                 | acp::ContentBlock::Resource(_)
                 | acp::ContentBlock::ResourceLink(_) => {}
             }
@@ -293,7 +444,50 @@ impl MessageEditor {
             );
 
             if let Some(crease_id) = crease_id {
-                self.mention_set.lock().insert(crease_id, mention_uri);
+                self.mention_set.lock().insert_uri(crease_id, mention_uri);
+            }
+        }
+        for (range, content) in images {
+            let Some(format) = ImageFormat::from_mime_type(&content.mime_type) else {
+                continue;
+            };
+            let anchor = snapshot.anchor_before(range.start);
+            let abs_path = content
+                .uri
+                .as_ref()
+                .and_then(|uri| uri.strip_prefix("file://").map(|s| Path::new(s).into()));
+
+            let name = content
+                .uri
+                .as_ref()
+                .and_then(|uri| {
+                    uri.strip_prefix("file://")
+                        .and_then(|path| Path::new(path).file_name())
+                })
+                .map(|name| name.to_string_lossy().to_string())
+                .unwrap_or("Image".to_owned());
+            let crease_id = crate::context_picker::insert_crease_for_mention(
+                anchor.excerpt_id,
+                anchor.text_anchor,
+                range.end - range.start,
+                name.into(),
+                IconName::Image.path().into(),
+                self.editor.clone(),
+                window,
+                cx,
+            );
+            let data: SharedString = content.data.to_string().into();
+
+            if let Some(crease_id) = crease_id {
+                self.mention_set.lock().insert_image(
+                    crease_id,
+                    Task::ready(Ok(MentionImage {
+                        abs_path,
+                        data,
+                        format,
+                    }))
+                    .shared(),
+                );
             }
         }
         cx.notify();
@@ -319,6 +513,7 @@ impl Render for MessageEditor {
             .key_context("MessageEditor")
             .on_action(cx.listener(Self::chat))
             .on_action(cx.listener(Self::cancel))
+            .capture_action(cx.listener(Self::paste))
             .flex_1()
             .child({
                 let settings = ThemeSettings::get_global(cx);
@@ -351,6 +546,26 @@ impl Render for MessageEditor {
     }
 }
 
+pub(crate) fn insert_crease_for_image(
+    excerpt_id: ExcerptId,
+    anchor: text::Anchor,
+    content_len: usize,
+    editor: Entity<Editor>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Option<CreaseId> {
+    crate::context_picker::insert_crease_for_mention(
+        excerpt_id,
+        anchor,
+        content_len,
+        "Image".into(),
+        IconName::Image.path().into(),
+        editor,
+        window,
+        cx,
+    )
+}
+
 #[cfg(test)]
 mod tests {
     use std::path::Path;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 0e90b93f4d..ee016b7503 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -5,9 +5,10 @@ use acp_thread::{
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
 use agent::{TextThreadStore, ThreadStore};
-use agent_client_protocol as acp;
+use agent_client_protocol::{self as acp};
 use agent_servers::AgentServer;
 use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
+use anyhow::bail;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use collections::{HashMap, HashSet};
@@ -2360,7 +2361,7 @@ impl AcpThreadView {
                 window,
                 cx,
             );
-            editor.set_message(&chunks, window, cx);
+            editor.set_message(chunks, window, cx);
             editor
         });
         let subscription =
@@ -2725,7 +2726,7 @@ impl AcpThreadView {
                 let project = workspace.project().clone();
 
                 if !project.read(cx).is_local() {
-                    anyhow::bail!("failed to open active thread as markdown in remote project");
+                    bail!("failed to open active thread as markdown in remote project");
                 }
 
                 let buffer = project.update(cx, |project, cx| {
@@ -2990,12 +2991,13 @@ impl AcpThreadView {
     pub(crate) fn insert_dragged_files(
         &self,
         paths: Vec<project::ProjectPath>,
-        _added_worktrees: Vec<Entity<project::Worktree>>,
+        added_worktrees: Vec<Entity<project::Worktree>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         self.message_editor.update(cx, |message_editor, cx| {
             message_editor.insert_dragged_files(paths, window, cx);
+            drop(added_worktrees);
         })
     }
 }

From 8366b6ce549d7695a5a544d98a035208531e2e5d Mon Sep 17 00:00:00 2001
From: Cretezy <Cretezy@users.noreply.github.com>
Date: Thu, 14 Aug 2025 17:46:38 -0400
Subject: [PATCH 040/823] workspace: Disable padding on zoomed panels (#36012)

Continuation of https://github.com/zed-industries/zed/pull/31913

| Before | After |
| -------|------|
|
![image](https://github.com/user-attachments/assets/629e7da2-6070-4abb-b469-3b0824524ca4)
|
![image](https://github.com/user-attachments/assets/99e54412-2e0b-4df9-9c40-a89b0411f6d8)
|


Release Notes:

- Disable padding on zoomed panels
---
 crates/workspace/src/workspace.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index fb78c62f9e..ba9e3bbb8a 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6664,25 +6664,15 @@ impl Render for Workspace {
                                     }
                                 })
                                 .children(self.zoomed.as_ref().and_then(|view| {
-                                    let zoomed_view = view.upgrade()?;
-                                    let div = div()
+                                    Some(div()
                                         .occlude()
                                         .absolute()
                                         .overflow_hidden()
                                         .border_color(colors.border)
                                         .bg(colors.background)
-                                        .child(zoomed_view)
+                                        .child(view.upgrade()?)
                                         .inset_0()
-                                        .shadow_lg();
-
-                                    Some(match self.zoomed_position {
-                                        Some(DockPosition::Left) => div.right_2().border_r_1(),
-                                        Some(DockPosition::Right) => div.left_2().border_l_1(),
-                                        Some(DockPosition::Bottom) => div.top_2().border_t_1(),
-                                        None => {
-                                            div.top_2().bottom_2().left_2().right_2().border_1()
-                                        }
-                                    })
+                                        .shadow_lg())
                                 }))
                                 .children(self.render_notifications(window, cx)),
                         )

From 4d27b228f776725b6f0f090b4856a7028b3dfe95 Mon Sep 17 00:00:00 2001
From: Alvaro Parker <64918109+AlvaroParker@users.noreply.github.com>
Date: Thu, 14 Aug 2025 22:31:01 -0400
Subject: [PATCH 041/823] remote server: Use env flag to opt out of musl remote
 server build (#36069)

Closes #ISSUE

This will allow devs to opt out of the musl build when developing zed by
running `ZED_BUILD_REMOTE_SERVER=nomusl cargo r` which also fixes remote
builds on NixOS.

Release Notes:

- Add a env flag (`ZED_BUILD_REMOTE_SERVER=nomusl`) to opt out of musl
builds when building the remote server
---
 crates/remote/src/ssh_session.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 4306251e44..df7212d44c 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -2069,11 +2069,17 @@ impl SshRemoteConnection {
             Ok(())
         }
 
+        let use_musl = !build_remote_server.contains("nomusl");
         let triple = format!(
             "{}-{}",
             self.ssh_platform.arch,
             match self.ssh_platform.os {
-                "linux" => "unknown-linux-musl",
+                "linux" =>
+                    if use_musl {
+                        "unknown-linux-musl"
+                    } else {
+                        "unknown-linux-gnu"
+                    },
                 "macos" => "apple-darwin",
                 _ => anyhow::bail!("can't cross compile for: {:?}", self.ssh_platform),
             }
@@ -2086,7 +2092,7 @@ impl SshRemoteConnection {
                 String::new()
             }
         };
-        if self.ssh_platform.os == "linux" {
+        if self.ssh_platform.os == "linux" && use_musl {
             rust_flags.push_str(" -C target-feature=+crt-static");
         }
         if build_remote_server.contains("mold") {

From 23d04331584edc7656a480715cab9532ccfc5861 Mon Sep 17 00:00:00 2001
From: smit <heysmitbarmase@gmail.com>
Date: Fri, 15 Aug 2025 12:51:32 +0530
Subject: [PATCH 042/823] linux: Fix keyboard events not working on first start
 in X11 (#36224)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #29083

On X11, `ibus-x11` crashes on some distros after Zed interacts with it.
This is not unique to Zed, `xim-rs` shows the same behavior, and there
are similar upstream `ibus` reports with apps like Blender:

- https://github.com/ibus/ibus/issues/2697

I opened an upstream issue to track this:

- https://github.com/ibus/ibus/issues/2789

When this crash happens, we don’t get a disconnect event, so Zed keeps
sending events to the IM server and waits for a response. It works on
subsequent starts because IM server doesn't exist now and we default to
non-XIM path.

This PR detects the crash via X11 events and falls back to the non-XIM
path so typing keeps working. We still need to investigate whether the
root cause is in `xim-rs` or `ibus-x11`.

Release Notes:

- Fixed an issue on X11 where keyboard input sometimes didn’t work on
first start.
---
 Cargo.lock                                   |  6 ++--
 crates/gpui/Cargo.toml                       |  2 +-
 crates/gpui/src/platform/linux/x11/client.rs | 38 ++++++++++++--------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0809bd880..0bafc3c386 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20277,7 +20277,7 @@ dependencies = [
 [[package]]
 name = "xim"
 version = "0.4.0"
-source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd"
+source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
 dependencies = [
  "ahash 0.8.11",
  "hashbrown 0.14.5",
@@ -20290,7 +20290,7 @@ dependencies = [
 [[package]]
 name = "xim-ctext"
 version = "0.3.0"
-source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd"
+source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
 dependencies = [
  "encoding_rs",
 ]
@@ -20298,7 +20298,7 @@ dependencies = [
 [[package]]
 name = "xim-parser"
 version = "0.2.1"
-source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd"
+source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
 dependencies = [
  "bitflags 2.9.0",
 ]
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index d720dfb2a1..6be8c5fd1f 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -209,7 +209,7 @@ xkbcommon = { version = "0.8.0", features = [
     "wayland",
     "x11",
 ], optional = true }
-xim = { git = "https://github.com/XDeme1/xim-rs", rev = "d50d461764c2213655cd9cf65a0ea94c70d3c4fd", features = [
+xim = { git = "https://github.com/zed-industries/xim-rs", rev = "c0a70c1bd2ce197364216e5e818a2cb3adb99a8d" , features = [
     "x11rb-xcb",
     "x11rb-client",
 ], optional = true }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 573e4addf7..053cd0387b 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -642,13 +642,7 @@ impl X11Client {
                 let xim_connected = xim_handler.connected;
                 drop(state);
 
-                let xim_filtered = match ximc.filter_event(&event, &mut xim_handler) {
-                    Ok(handled) => handled,
-                    Err(err) => {
-                        log::error!("XIMClientError: {}", err);
-                        false
-                    }
-                };
+                let xim_filtered = ximc.filter_event(&event, &mut xim_handler);
                 let xim_callback_event = xim_handler.last_callback_event.take();
 
                 let mut state = self.0.borrow_mut();
@@ -659,14 +653,28 @@ impl X11Client {
                     self.handle_xim_callback_event(event);
                 }
 
-                if xim_filtered {
-                    continue;
-                }
-
-                if xim_connected {
-                    self.xim_handle_event(event);
-                } else {
-                    self.handle_event(event);
+                match xim_filtered {
+                    Ok(handled) => {
+                        if handled {
+                            continue;
+                        }
+                        if xim_connected {
+                            self.xim_handle_event(event);
+                        } else {
+                            self.handle_event(event);
+                        }
+                    }
+                    Err(err) => {
+                        // this might happen when xim server crashes on one of the events
+                        // we do lose 1-2 keys when crash happens since there is no reliable way to get that info
+                        // luckily, x11 sends us window not found error when xim server crashes upon further key press
+                        // hence we fall back to handle_event
+                        log::error!("XIMClientError: {}", err);
+                        let mut state = self.0.borrow_mut();
+                        state.take_xim();
+                        drop(state);
+                        self.handle_event(event);
+                    }
                 }
             }
         }

From 8d6982e78f2493bb3ef2a23010f38dab141dc76a Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 15 Aug 2025 09:56:47 +0200
Subject: [PATCH 043/823] search: Fix some inconsistencies between project and
 buffer search bars (#36103)

- project search query string now turns red when no results are found
matching buffer search behavior
- General code deduplication as well as more consistent layout between
the two bars, as some minor details have drifted apart
- Tab cycling in buffer search now ends up in editor focus when cycling
backwards, matching forward cycling
- Report parse errors in filter include and exclude editors

Release Notes:

- N/A
---
 crates/search/src/buffer_search.rs  | 617 ++++++++++++----------------
 crates/search/src/project_search.rs | 526 ++++++++++--------------
 crates/search/src/search_bar.rs     |  83 +++-
 crates/workspace/src/workspace.rs   |   8 +-
 4 files changed, 545 insertions(+), 689 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 14703be7a2..ccef198f04 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -3,20 +3,23 @@ mod registrar;
 use crate::{
     FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext, SearchOptions,
     SelectAllMatches, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive, ToggleRegex,
-    ToggleReplace, ToggleSelection, ToggleWholeWord, search_bar::render_nav_button,
+    ToggleReplace, ToggleSelection, ToggleWholeWord,
+    search_bar::{
+        input_base_styles, render_action_button, render_text_input, toggle_replace_button,
+    },
 };
 use any_vec::AnyVec;
 use anyhow::Context as _;
 use collections::HashMap;
 use editor::{
-    DisplayPoint, Editor, EditorElement, EditorSettings, EditorStyle,
+    DisplayPoint, Editor, EditorSettings,
     actions::{Backtab, Tab},
 };
 use futures::channel::oneshot;
 use gpui::{
-    Action, App, ClickEvent, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement as _, IntoElement, KeyContext, ParentElement as _, Render, ScrollHandle,
-    Styled, Subscription, Task, TextStyle, Window, actions, div,
+    Action, App, ClickEvent, Context, Entity, EventEmitter, Focusable, InteractiveElement as _,
+    IntoElement, KeyContext, ParentElement as _, Render, ScrollHandle, Styled, Subscription, Task,
+    Window, actions, div,
 };
 use language::{Language, LanguageRegistry};
 use project::{
@@ -27,7 +30,6 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use settings::Settings;
 use std::sync::Arc;
-use theme::ThemeSettings;
 use zed_actions::outline::ToggleOutline;
 
 use ui::{
@@ -125,46 +127,6 @@ pub struct BufferSearchBar {
 }
 
 impl BufferSearchBar {
-    fn render_text_input(
-        &self,
-        editor: &Entity<Editor>,
-        color_override: Option<Color>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let (color, use_syntax) = if editor.read(cx).read_only(cx) {
-            (cx.theme().colors().text_disabled, false)
-        } else {
-            match color_override {
-                Some(color_override) => (color_override.color(cx), false),
-                None => (cx.theme().colors().text, true),
-            }
-        };
-
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color,
-            font_family: settings.buffer_font.family.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: rems(0.875).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(1.3),
-            ..TextStyle::default()
-        };
-
-        let mut editor_style = EditorStyle {
-            background: cx.theme().colors().toolbar_background,
-            local_player: cx.theme().players().local(),
-            text: text_style,
-            ..EditorStyle::default()
-        };
-        if use_syntax {
-            editor_style.syntax = cx.theme().syntax().clone();
-        }
-
-        EditorElement::new(editor, editor_style)
-    }
-
     pub fn query_editor_focused(&self) -> bool {
         self.query_editor_focused
     }
@@ -185,7 +147,14 @@ impl Render for BufferSearchBar {
         let hide_inline_icons = self.editor_needed_width
             > self.editor_scroll_handle.bounds().size.width - window.rem_size() * 6.;
 
-        let supported_options = self.supported_options(cx);
+        let workspace::searchable::SearchOptions {
+            case,
+            word,
+            regex,
+            replacement,
+            selection,
+            find_in_results,
+        } = self.supported_options(cx);
 
         if self.query_editor.update(cx, |query_editor, _cx| {
             query_editor.placeholder_text().is_none()
@@ -220,268 +189,205 @@ impl Render for BufferSearchBar {
                 }
             })
             .unwrap_or_else(|| "0/0".to_string());
-        let should_show_replace_input = self.replace_enabled && supported_options.replacement;
+        let should_show_replace_input = self.replace_enabled && replacement;
         let in_replace = self.replacement_editor.focus_handle(cx).is_focused(window);
 
+        let theme_colors = cx.theme().colors();
+        let query_border = if self.query_error.is_some() {
+            Color::Error.color(cx)
+        } else {
+            theme_colors.border
+        };
+        let replacement_border = theme_colors.border;
+
+        let container_width = window.viewport_size().width;
+        let input_width = SearchInputWidth::calc_width(container_width);
+
+        let input_base_styles =
+            |border_color| input_base_styles(border_color, |div| div.w(input_width));
+
+        let query_column = input_base_styles(query_border)
+            .id("editor-scroll")
+            .track_scroll(&self.editor_scroll_handle)
+            .child(render_text_input(&self.query_editor, color_override, cx))
+            .when(!hide_inline_icons, |div| {
+                div.child(
+                    h_flex()
+                        .gap_1()
+                        .when(case, |div| {
+                            div.child(SearchOptions::CASE_SENSITIVE.as_button(
+                                self.search_options.contains(SearchOptions::CASE_SENSITIVE),
+                                focus_handle.clone(),
+                                cx.listener(|this, _, window, cx| {
+                                    this.toggle_case_sensitive(&ToggleCaseSensitive, window, cx)
+                                }),
+                            ))
+                        })
+                        .when(word, |div| {
+                            div.child(SearchOptions::WHOLE_WORD.as_button(
+                                self.search_options.contains(SearchOptions::WHOLE_WORD),
+                                focus_handle.clone(),
+                                cx.listener(|this, _, window, cx| {
+                                    this.toggle_whole_word(&ToggleWholeWord, window, cx)
+                                }),
+                            ))
+                        })
+                        .when(regex, |div| {
+                            div.child(SearchOptions::REGEX.as_button(
+                                self.search_options.contains(SearchOptions::REGEX),
+                                focus_handle.clone(),
+                                cx.listener(|this, _, window, cx| {
+                                    this.toggle_regex(&ToggleRegex, window, cx)
+                                }),
+                            ))
+                        }),
+                )
+            });
+
+        let mode_column = h_flex()
+            .gap_1()
+            .min_w_64()
+            .when(replacement, |this| {
+                this.child(toggle_replace_button(
+                    "buffer-search-bar-toggle-replace-button",
+                    focus_handle.clone(),
+                    self.replace_enabled,
+                    cx.listener(|this, _: &ClickEvent, window, cx| {
+                        this.toggle_replace(&ToggleReplace, window, cx);
+                    }),
+                ))
+            })
+            .when(selection, |this| {
+                this.child(
+                    IconButton::new(
+                        "buffer-search-bar-toggle-search-selection-button",
+                        IconName::Quote,
+                    )
+                    .style(ButtonStyle::Subtle)
+                    .shape(IconButtonShape::Square)
+                    .when(self.selection_search_enabled, |button| {
+                        button.style(ButtonStyle::Filled)
+                    })
+                    .on_click(cx.listener(|this, _: &ClickEvent, window, cx| {
+                        this.toggle_selection(&ToggleSelection, window, cx);
+                    }))
+                    .toggle_state(self.selection_search_enabled)
+                    .tooltip({
+                        let focus_handle = focus_handle.clone();
+                        move |window, cx| {
+                            Tooltip::for_action_in(
+                                "Toggle Search Selection",
+                                &ToggleSelection,
+                                &focus_handle,
+                                window,
+                                cx,
+                            )
+                        }
+                    }),
+                )
+            })
+            .when(!find_in_results, |el| {
+                let query_focus = self.query_editor.focus_handle(cx);
+                let matches_column = h_flex()
+                    .pl_2()
+                    .ml_2()
+                    .border_l_1()
+                    .border_color(theme_colors.border_variant)
+                    .child(render_action_button(
+                        "buffer-search-nav-button",
+                        ui::IconName::ChevronLeft,
+                        self.active_match_index.is_some(),
+                        "Select Previous Match",
+                        &SelectPreviousMatch,
+                        query_focus.clone(),
+                    ))
+                    .child(render_action_button(
+                        "buffer-search-nav-button",
+                        ui::IconName::ChevronRight,
+                        self.active_match_index.is_some(),
+                        "Select Next Match",
+                        &SelectNextMatch,
+                        query_focus.clone(),
+                    ))
+                    .when(!narrow_mode, |this| {
+                        this.child(div().ml_2().min_w(rems_from_px(40.)).child(
+                            Label::new(match_text).size(LabelSize::Small).color(
+                                if self.active_match_index.is_some() {
+                                    Color::Default
+                                } else {
+                                    Color::Disabled
+                                },
+                            ),
+                        ))
+                    });
+
+                el.child(render_action_button(
+                    "buffer-search-nav-button",
+                    IconName::SelectAll,
+                    true,
+                    "Select All Matches",
+                    &SelectAllMatches,
+                    query_focus,
+                ))
+                .child(matches_column)
+            })
+            .when(find_in_results, |el| {
+                el.child(render_action_button(
+                    "buffer-search",
+                    IconName::Close,
+                    true,
+                    "Close Search Bar",
+                    &Dismiss,
+                    focus_handle.clone(),
+                ))
+            });
+
+        let search_line = h_flex()
+            .w_full()
+            .gap_2()
+            .when(find_in_results, |el| {
+                el.child(Label::new("Find in results").color(Color::Hint))
+            })
+            .child(query_column)
+            .child(mode_column);
+
+        let replace_line =
+            should_show_replace_input.then(|| {
+                let replace_column = input_base_styles(replacement_border)
+                    .child(render_text_input(&self.replacement_editor, None, cx));
+                let focus_handle = self.replacement_editor.read(cx).focus_handle(cx);
+
+                let replace_actions = h_flex()
+                    .min_w_64()
+                    .gap_1()
+                    .child(render_action_button(
+                        "buffer-search-replace-button",
+                        IconName::ReplaceNext,
+                        true,
+                        "Replace Next Match",
+                        &ReplaceNext,
+                        focus_handle.clone(),
+                    ))
+                    .child(render_action_button(
+                        "buffer-search-replace-button",
+                        IconName::ReplaceAll,
+                        true,
+                        "Replace All Matches",
+                        &ReplaceAll,
+                        focus_handle,
+                    ));
+                h_flex()
+                    .w_full()
+                    .gap_2()
+                    .child(replace_column)
+                    .child(replace_actions)
+            });
+
         let mut key_context = KeyContext::new_with_defaults();
         key_context.add("BufferSearchBar");
         if in_replace {
             key_context.add("in_replace");
         }
-        let query_border = if self.query_error.is_some() {
-            Color::Error.color(cx)
-        } else {
-            cx.theme().colors().border
-        };
-        let replacement_border = cx.theme().colors().border;
-
-        let container_width = window.viewport_size().width;
-        let input_width = SearchInputWidth::calc_width(container_width);
-
-        let input_base_styles = |border_color| {
-            h_flex()
-                .min_w_32()
-                .w(input_width)
-                .h_8()
-                .pl_2()
-                .pr_1()
-                .py_1()
-                .border_1()
-                .border_color(border_color)
-                .rounded_lg()
-        };
-
-        let search_line = h_flex()
-            .gap_2()
-            .when(supported_options.find_in_results, |el| {
-                el.child(Label::new("Find in results").color(Color::Hint))
-            })
-            .child(
-                input_base_styles(query_border)
-                    .id("editor-scroll")
-                    .track_scroll(&self.editor_scroll_handle)
-                    .child(self.render_text_input(&self.query_editor, color_override, cx))
-                    .when(!hide_inline_icons, |div| {
-                        div.child(
-                            h_flex()
-                                .gap_1()
-                                .children(supported_options.case.then(|| {
-                                    self.render_search_option_button(
-                                        SearchOptions::CASE_SENSITIVE,
-                                        focus_handle.clone(),
-                                        cx.listener(|this, _, window, cx| {
-                                            this.toggle_case_sensitive(
-                                                &ToggleCaseSensitive,
-                                                window,
-                                                cx,
-                                            )
-                                        }),
-                                    )
-                                }))
-                                .children(supported_options.word.then(|| {
-                                    self.render_search_option_button(
-                                        SearchOptions::WHOLE_WORD,
-                                        focus_handle.clone(),
-                                        cx.listener(|this, _, window, cx| {
-                                            this.toggle_whole_word(&ToggleWholeWord, window, cx)
-                                        }),
-                                    )
-                                }))
-                                .children(supported_options.regex.then(|| {
-                                    self.render_search_option_button(
-                                        SearchOptions::REGEX,
-                                        focus_handle.clone(),
-                                        cx.listener(|this, _, window, cx| {
-                                            this.toggle_regex(&ToggleRegex, window, cx)
-                                        }),
-                                    )
-                                })),
-                        )
-                    }),
-            )
-            .child(
-                h_flex()
-                    .gap_1()
-                    .min_w_64()
-                    .when(supported_options.replacement, |this| {
-                        this.child(
-                            IconButton::new(
-                                "buffer-search-bar-toggle-replace-button",
-                                IconName::Replace,
-                            )
-                            .style(ButtonStyle::Subtle)
-                            .shape(IconButtonShape::Square)
-                            .when(self.replace_enabled, |button| {
-                                button.style(ButtonStyle::Filled)
-                            })
-                            .on_click(cx.listener(|this, _: &ClickEvent, window, cx| {
-                                this.toggle_replace(&ToggleReplace, window, cx);
-                            }))
-                            .toggle_state(self.replace_enabled)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Toggle Replace",
-                                        &ToggleReplace,
-                                        &focus_handle,
-                                        window,
-                                        cx,
-                                    )
-                                }
-                            }),
-                        )
-                    })
-                    .when(supported_options.selection, |this| {
-                        this.child(
-                            IconButton::new(
-                                "buffer-search-bar-toggle-search-selection-button",
-                                IconName::Quote,
-                            )
-                            .style(ButtonStyle::Subtle)
-                            .shape(IconButtonShape::Square)
-                            .when(self.selection_search_enabled, |button| {
-                                button.style(ButtonStyle::Filled)
-                            })
-                            .on_click(cx.listener(|this, _: &ClickEvent, window, cx| {
-                                this.toggle_selection(&ToggleSelection, window, cx);
-                            }))
-                            .toggle_state(self.selection_search_enabled)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Toggle Search Selection",
-                                        &ToggleSelection,
-                                        &focus_handle,
-                                        window,
-                                        cx,
-                                    )
-                                }
-                            }),
-                        )
-                    })
-                    .when(!supported_options.find_in_results, |el| {
-                        el.child(
-                            IconButton::new("select-all", ui::IconName::SelectAll)
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(SelectAllMatches.boxed_clone(), cx)
-                                })
-                                .shape(IconButtonShape::Square)
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Select All Matches",
-                                            &SelectAllMatches,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                }),
-                        )
-                        .child(
-                            h_flex()
-                                .pl_2()
-                                .ml_1()
-                                .border_l_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(render_nav_button(
-                                    ui::IconName::ChevronLeft,
-                                    self.active_match_index.is_some(),
-                                    "Select Previous Match",
-                                    &SelectPreviousMatch,
-                                    focus_handle.clone(),
-                                ))
-                                .child(render_nav_button(
-                                    ui::IconName::ChevronRight,
-                                    self.active_match_index.is_some(),
-                                    "Select Next Match",
-                                    &SelectNextMatch,
-                                    focus_handle.clone(),
-                                )),
-                        )
-                        .when(!narrow_mode, |this| {
-                            this.child(h_flex().ml_2().min_w(rems_from_px(40.)).child(
-                                Label::new(match_text).size(LabelSize::Small).color(
-                                    if self.active_match_index.is_some() {
-                                        Color::Default
-                                    } else {
-                                        Color::Disabled
-                                    },
-                                ),
-                            ))
-                        })
-                    })
-                    .when(supported_options.find_in_results, |el| {
-                        el.child(
-                            IconButton::new(SharedString::from("Close"), IconName::Close)
-                                .shape(IconButtonShape::Square)
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Close Search Bar", &Dismiss, window, cx)
-                                })
-                                .on_click(cx.listener(|this, _: &ClickEvent, window, cx| {
-                                    this.dismiss(&Dismiss, window, cx)
-                                })),
-                        )
-                    }),
-            );
-
-        let replace_line = should_show_replace_input.then(|| {
-            h_flex()
-                .gap_2()
-                .child(
-                    input_base_styles(replacement_border).child(self.render_text_input(
-                        &self.replacement_editor,
-                        None,
-                        cx,
-                    )),
-                )
-                .child(
-                    h_flex()
-                        .min_w_64()
-                        .gap_1()
-                        .child(
-                            IconButton::new("search-replace-next", ui::IconName::ReplaceNext)
-                                .shape(IconButtonShape::Square)
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Replace Next Match",
-                                            &ReplaceNext,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                })
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.replace_next(&ReplaceNext, window, cx)
-                                })),
-                        )
-                        .child(
-                            IconButton::new("search-replace-all", ui::IconName::ReplaceAll)
-                                .shape(IconButtonShape::Square)
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Replace All Matches",
-                                            &ReplaceAll,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                })
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.replace_all(&ReplaceAll, window, cx)
-                                })),
-                        ),
-                )
-        });
 
         let query_error_line = self.query_error.as_ref().map(|error| {
             Label::new(error)
@@ -491,10 +397,26 @@ impl Render for BufferSearchBar {
                 .ml_2()
         });
 
+        let search_line =
+            h_flex()
+                .relative()
+                .child(search_line)
+                .when(!narrow_mode && !find_in_results, |div| {
+                    div.child(h_flex().absolute().right_0().child(render_action_button(
+                        "buffer-search",
+                        IconName::Close,
+                        true,
+                        "Close Search Bar",
+                        &Dismiss,
+                        focus_handle.clone(),
+                    )))
+                    .w_full()
+                });
         v_flex()
             .id("buffer_search")
             .gap_2()
             .py(px(1.0))
+            .w_full()
             .track_scroll(&self.scroll_handle)
             .key_context(key_context)
             .capture_action(cx.listener(Self::tab))
@@ -509,43 +431,26 @@ impl Render for BufferSearchBar {
                     active_searchable_item.relay_action(Box::new(ToggleOutline), window, cx);
                 }
             }))
-            .when(self.supported_options(cx).replacement, |this| {
+            .when(replacement, |this| {
                 this.on_action(cx.listener(Self::toggle_replace))
                     .when(in_replace, |this| {
                         this.on_action(cx.listener(Self::replace_next))
                             .on_action(cx.listener(Self::replace_all))
                     })
             })
-            .when(self.supported_options(cx).case, |this| {
+            .when(case, |this| {
                 this.on_action(cx.listener(Self::toggle_case_sensitive))
             })
-            .when(self.supported_options(cx).word, |this| {
+            .when(word, |this| {
                 this.on_action(cx.listener(Self::toggle_whole_word))
             })
-            .when(self.supported_options(cx).regex, |this| {
+            .when(regex, |this| {
                 this.on_action(cx.listener(Self::toggle_regex))
             })
-            .when(self.supported_options(cx).selection, |this| {
+            .when(selection, |this| {
                 this.on_action(cx.listener(Self::toggle_selection))
             })
-            .child(h_flex().relative().child(search_line.w_full()).when(
-                !narrow_mode && !supported_options.find_in_results,
-                |div| {
-                    div.child(
-                        h_flex().absolute().right_0().child(
-                            IconButton::new(SharedString::from("Close"), IconName::Close)
-                                .shape(IconButtonShape::Square)
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Close Search Bar", &Dismiss, window, cx)
-                                })
-                                .on_click(cx.listener(|this, _: &ClickEvent, window, cx| {
-                                    this.dismiss(&Dismiss, window, cx)
-                                })),
-                        ),
-                    )
-                    .w_full()
-                },
-            ))
+            .child(search_line)
             .children(query_error_line)
             .children(replace_line)
     }
@@ -792,7 +697,7 @@ impl BufferSearchBar {
             active_editor.search_bar_visibility_changed(false, window, cx);
             active_editor.toggle_filtered_search_ranges(false, window, cx);
             let handle = active_editor.item_focus_handle(cx);
-            self.focus(&handle, window, cx);
+            self.focus(&handle, window);
         }
         cx.emit(Event::UpdateLocation);
         cx.emit(ToolbarItemEvent::ChangeLocation(
@@ -948,7 +853,7 @@ impl BufferSearchBar {
     }
 
     pub fn focus_replace(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.focus(&self.replacement_editor.focus_handle(cx), window, cx);
+        self.focus(&self.replacement_editor.focus_handle(cx), window);
         cx.notify();
     }
 
@@ -975,16 +880,6 @@ impl BufferSearchBar {
         self.update_matches(!updated, window, cx)
     }
 
-    fn render_search_option_button<Action: Fn(&ClickEvent, &mut Window, &mut App) + 'static>(
-        &self,
-        option: SearchOptions,
-        focus_handle: FocusHandle,
-        action: Action,
-    ) -> impl IntoElement + use<Action> {
-        let is_active = self.search_options.contains(option);
-        option.as_button(is_active, focus_handle, action)
-    }
-
     pub fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(active_editor) = self.active_searchable_item.as_ref() {
             let handle = active_editor.item_focus_handle(cx);
@@ -1400,28 +1295,32 @@ impl BufferSearchBar {
     }
 
     fn tab(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
-        // Search -> Replace -> Editor
-        let focus_handle = if self.replace_enabled && self.query_editor_focused {
-            self.replacement_editor.focus_handle(cx)
-        } else if let Some(item) = self.active_searchable_item.as_ref() {
-            item.item_focus_handle(cx)
-        } else {
-            return;
-        };
-        self.focus(&focus_handle, window, cx);
-        cx.stop_propagation();
+        self.cycle_field(Direction::Next, window, cx);
     }
 
     fn backtab(&mut self, _: &Backtab, window: &mut Window, cx: &mut Context<Self>) {
-        // Search -> Replace -> Search
-        let focus_handle = if self.replace_enabled && self.query_editor_focused {
-            self.replacement_editor.focus_handle(cx)
-        } else if self.replacement_editor_focused {
-            self.query_editor.focus_handle(cx)
-        } else {
-            return;
+        self.cycle_field(Direction::Prev, window, cx);
+    }
+    fn cycle_field(&mut self, direction: Direction, window: &mut Window, cx: &mut Context<Self>) {
+        let mut handles = vec![self.query_editor.focus_handle(cx)];
+        if self.replace_enabled {
+            handles.push(self.replacement_editor.focus_handle(cx));
+        }
+        if let Some(item) = self.active_searchable_item.as_ref() {
+            handles.push(item.item_focus_handle(cx));
+        }
+        let current_index = match handles.iter().position(|focus| focus.is_focused(window)) {
+            Some(index) => index,
+            None => return,
         };
-        self.focus(&focus_handle, window, cx);
+
+        let new_index = match direction {
+            Direction::Next => (current_index + 1) % handles.len(),
+            Direction::Prev if current_index == 0 => handles.len() - 1,
+            Direction::Prev => (current_index - 1) % handles.len(),
+        };
+        let next_focus_handle = &handles[new_index];
+        self.focus(next_focus_handle, window);
         cx.stop_propagation();
     }
 
@@ -1469,10 +1368,8 @@ impl BufferSearchBar {
         }
     }
 
-    fn focus(&self, handle: &gpui::FocusHandle, window: &mut Window, cx: &mut Context<Self>) {
-        cx.on_next_frame(window, |_, window, _| {
-            window.invalidate_character_coordinates();
-        });
+    fn focus(&self, handle: &gpui::FocusHandle, window: &mut Window) {
+        window.invalidate_character_coordinates();
         window.focus(handle);
     }
 
@@ -1484,7 +1381,7 @@ impl BufferSearchBar {
             } else {
                 self.query_editor.focus_handle(cx)
             };
-            self.focus(&handle, window, cx);
+            self.focus(&handle, window);
             cx.notify();
         }
     }
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 96194cdad2..9e8afa4392 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1,20 +1,25 @@
 use crate::{
     BufferSearchBar, FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext,
     SearchOptions, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive, ToggleIncludeIgnored,
-    ToggleRegex, ToggleReplace, ToggleWholeWord, buffer_search::Deploy,
+    ToggleRegex, ToggleReplace, ToggleWholeWord,
+    buffer_search::Deploy,
+    search_bar::{
+        input_base_styles, render_action_button, render_text_input, toggle_replace_button,
+    },
 };
 use anyhow::Context as _;
-use collections::{HashMap, HashSet};
+use collections::HashMap;
 use editor::{
-    Anchor, Editor, EditorElement, EditorEvent, EditorSettings, EditorStyle, MAX_TAB_TITLE_LEN,
-    MultiBuffer, SelectionEffects, actions::SelectAll, items::active_match_index,
+    Anchor, Editor, EditorEvent, EditorSettings, MAX_TAB_TITLE_LEN, MultiBuffer, SelectionEffects,
+    actions::{Backtab, SelectAll, Tab},
+    items::active_match_index,
 };
 use futures::{StreamExt, stream::FuturesOrdered};
 use gpui::{
     Action, AnyElement, AnyView, App, Axis, Context, Entity, EntityId, EventEmitter, FocusHandle,
     Focusable, Global, Hsla, InteractiveElement, IntoElement, KeyContext, ParentElement, Point,
-    Render, SharedString, Styled, Subscription, Task, TextStyle, UpdateGlobal, WeakEntity, Window,
-    actions, div,
+    Render, SharedString, Styled, Subscription, Task, UpdateGlobal, WeakEntity, Window, actions,
+    div,
 };
 use language::{Buffer, Language};
 use menu::Confirm;
@@ -32,7 +37,6 @@ use std::{
     pin::pin,
     sync::Arc,
 };
-use theme::ThemeSettings;
 use ui::{
     Icon, IconButton, IconButtonShape, IconName, KeyBinding, Label, LabelCommon, LabelSize,
     Toggleable, Tooltip, h_flex, prelude::*, utils::SearchInputWidth, v_flex,
@@ -208,7 +212,7 @@ pub struct ProjectSearchView {
     replacement_editor: Entity<Editor>,
     results_editor: Entity<Editor>,
     search_options: SearchOptions,
-    panels_with_errors: HashSet<InputPanel>,
+    panels_with_errors: HashMap<InputPanel, String>,
     active_match_index: Option<usize>,
     search_id: usize,
     included_files_editor: Entity<Editor>,
@@ -218,7 +222,6 @@ pub struct ProjectSearchView {
     included_opened_only: bool,
     regex_language: Option<Arc<Language>>,
     _subscriptions: Vec<Subscription>,
-    query_error: Option<String>,
 }
 
 #[derive(Debug, Clone)]
@@ -879,7 +882,7 @@ impl ProjectSearchView {
             query_editor,
             results_editor,
             search_options: options,
-            panels_with_errors: HashSet::default(),
+            panels_with_errors: HashMap::default(),
             active_match_index: None,
             included_files_editor,
             excluded_files_editor,
@@ -888,7 +891,6 @@ impl ProjectSearchView {
             included_opened_only: false,
             regex_language: None,
             _subscriptions: subscriptions,
-            query_error: None,
         };
         this.entity_changed(window, cx);
         this
@@ -1152,14 +1154,16 @@ impl ProjectSearchView {
                     Ok(included_files) => {
                         let should_unmark_error =
                             self.panels_with_errors.remove(&InputPanel::Include);
-                        if should_unmark_error {
+                        if should_unmark_error.is_some() {
                             cx.notify();
                         }
                         included_files
                     }
-                    Err(_e) => {
-                        let should_mark_error = self.panels_with_errors.insert(InputPanel::Include);
-                        if should_mark_error {
+                    Err(e) => {
+                        let should_mark_error = self
+                            .panels_with_errors
+                            .insert(InputPanel::Include, e.to_string());
+                        if should_mark_error.is_none() {
                             cx.notify();
                         }
                         PathMatcher::default()
@@ -1174,15 +1178,17 @@ impl ProjectSearchView {
                     Ok(excluded_files) => {
                         let should_unmark_error =
                             self.panels_with_errors.remove(&InputPanel::Exclude);
-                        if should_unmark_error {
+                        if should_unmark_error.is_some() {
                             cx.notify();
                         }
 
                         excluded_files
                     }
-                    Err(_e) => {
-                        let should_mark_error = self.panels_with_errors.insert(InputPanel::Exclude);
-                        if should_mark_error {
+                    Err(e) => {
+                        let should_mark_error = self
+                            .panels_with_errors
+                            .insert(InputPanel::Exclude, e.to_string());
+                        if should_mark_error.is_none() {
                             cx.notify();
                         }
                         PathMatcher::default()
@@ -1219,19 +1225,19 @@ impl ProjectSearchView {
             ) {
                 Ok(query) => {
                     let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
-                    if should_unmark_error {
+                    if should_unmark_error.is_some() {
                         cx.notify();
                     }
-                    self.query_error = None;
 
                     Some(query)
                 }
                 Err(e) => {
-                    let should_mark_error = self.panels_with_errors.insert(InputPanel::Query);
-                    if should_mark_error {
+                    let should_mark_error = self
+                        .panels_with_errors
+                        .insert(InputPanel::Query, e.to_string());
+                    if should_mark_error.is_none() {
                         cx.notify();
                     }
-                    self.query_error = Some(e.to_string());
 
                     None
                 }
@@ -1249,15 +1255,17 @@ impl ProjectSearchView {
             ) {
                 Ok(query) => {
                     let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
-                    if should_unmark_error {
+                    if should_unmark_error.is_some() {
                         cx.notify();
                     }
 
                     Some(query)
                 }
-                Err(_e) => {
-                    let should_mark_error = self.panels_with_errors.insert(InputPanel::Query);
-                    if should_mark_error {
+                Err(e) => {
+                    let should_mark_error = self
+                        .panels_with_errors
+                        .insert(InputPanel::Query, e.to_string());
+                    if should_mark_error.is_none() {
                         cx.notify();
                     }
 
@@ -1512,7 +1520,7 @@ impl ProjectSearchView {
     }
 
     fn border_color_for(&self, panel: InputPanel, cx: &App) -> Hsla {
-        if self.panels_with_errors.contains(&panel) {
+        if self.panels_with_errors.contains_key(&panel) {
             Color::Error.color(cx)
         } else {
             cx.theme().colors().border
@@ -1610,16 +1618,11 @@ impl ProjectSearchBar {
         }
     }
 
-    fn tab(&mut self, _: &editor::actions::Tab, window: &mut Window, cx: &mut Context<Self>) {
+    fn tab(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
         self.cycle_field(Direction::Next, window, cx);
     }
 
-    fn backtab(
-        &mut self,
-        _: &editor::actions::Backtab,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    fn backtab(&mut self, _: &Backtab, window: &mut Window, cx: &mut Context<Self>) {
         self.cycle_field(Direction::Prev, window, cx);
     }
 
@@ -1634,29 +1637,22 @@ impl ProjectSearchBar {
     fn cycle_field(&mut self, direction: Direction, window: &mut Window, cx: &mut Context<Self>) {
         let active_project_search = match &self.active_project_search {
             Some(active_project_search) => active_project_search,
-
-            None => {
-                return;
-            }
+            None => return,
         };
 
         active_project_search.update(cx, |project_view, cx| {
-            let mut views = vec![&project_view.query_editor];
+            let mut views = vec![project_view.query_editor.focus_handle(cx)];
             if project_view.replace_enabled {
-                views.push(&project_view.replacement_editor);
+                views.push(project_view.replacement_editor.focus_handle(cx));
             }
             if project_view.filters_enabled {
                 views.extend([
-                    &project_view.included_files_editor,
-                    &project_view.excluded_files_editor,
+                    project_view.included_files_editor.focus_handle(cx),
+                    project_view.excluded_files_editor.focus_handle(cx),
                 ]);
             }
-            let current_index = match views
-                .iter()
-                .enumerate()
-                .find(|(_, editor)| editor.focus_handle(cx).is_focused(window))
-            {
-                Some((index, _)) => index,
+            let current_index = match views.iter().position(|focus| focus.is_focused(window)) {
+                Some(index) => index,
                 None => return,
             };
 
@@ -1665,8 +1661,8 @@ impl ProjectSearchBar {
                 Direction::Prev if current_index == 0 => views.len() - 1,
                 Direction::Prev => (current_index - 1) % views.len(),
             };
-            let next_focus_handle = views[new_index].focus_handle(cx);
-            window.focus(&next_focus_handle);
+            let next_focus_handle = &views[new_index];
+            window.focus(next_focus_handle);
             cx.stop_propagation();
         });
     }
@@ -1915,37 +1911,6 @@ impl ProjectSearchBar {
             })
         }
     }
-
-    fn render_text_input(&self, editor: &Entity<Editor>, cx: &Context<Self>) -> impl IntoElement {
-        let (color, use_syntax) = if editor.read(cx).read_only(cx) {
-            (cx.theme().colors().text_disabled, false)
-        } else {
-            (cx.theme().colors().text, true)
-        };
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color,
-            font_family: settings.buffer_font.family.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: rems(0.875).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(1.3),
-            ..TextStyle::default()
-        };
-
-        let mut editor_style = EditorStyle {
-            background: cx.theme().colors().toolbar_background,
-            local_player: cx.theme().players().local(),
-            text: text_style,
-            ..EditorStyle::default()
-        };
-        if use_syntax {
-            editor_style.syntax = cx.theme().syntax().clone();
-        }
-
-        EditorElement::new(editor, editor_style)
-    }
 }
 
 impl Render for ProjectSearchBar {
@@ -1959,28 +1924,43 @@ impl Render for ProjectSearchBar {
         let container_width = window.viewport_size().width;
         let input_width = SearchInputWidth::calc_width(container_width);
 
-        enum BaseStyle {
-            SingleInput,
-            MultipleInputs,
-        }
-
-        let input_base_styles = |base_style: BaseStyle, panel: InputPanel| {
-            h_flex()
-                .min_w_32()
-                .map(|div| match base_style {
-                    BaseStyle::SingleInput => div.w(input_width),
-                    BaseStyle::MultipleInputs => div.flex_grow(),
-                })
-                .h_8()
-                .pl_2()
-                .pr_1()
-                .py_1()
-                .border_1()
-                .border_color(search.border_color_for(panel, cx))
-                .rounded_lg()
+        let input_base_styles = |panel: InputPanel| {
+            input_base_styles(search.border_color_for(panel, cx), |div| match panel {
+                InputPanel::Query | InputPanel::Replacement => div.w(input_width),
+                InputPanel::Include | InputPanel::Exclude => div.flex_grow(),
+            })
         };
+        let theme_colors = cx.theme().colors();
+        let project_search = search.entity.read(cx);
+        let limit_reached = project_search.limit_reached;
 
-        let query_column = input_base_styles(BaseStyle::SingleInput, InputPanel::Query)
+        let color_override = match (
+            project_search.no_results,
+            &project_search.active_query,
+            &project_search.last_search_query_text,
+        ) {
+            (Some(true), Some(q), Some(p)) if q.as_str() == p => Some(Color::Error),
+            _ => None,
+        };
+        let match_text = search
+            .active_match_index
+            .and_then(|index| {
+                let index = index + 1;
+                let match_quantity = project_search.match_ranges.len();
+                if match_quantity > 0 {
+                    debug_assert!(match_quantity >= index);
+                    if limit_reached {
+                        Some(format!("{index}/{match_quantity}+"))
+                    } else {
+                        Some(format!("{index}/{match_quantity}"))
+                    }
+                } else {
+                    None
+                }
+            })
+            .unwrap_or_else(|| "0/0".to_string());
+
+        let query_column = input_base_styles(InputPanel::Query)
             .on_action(cx.listener(|this, action, window, cx| this.confirm(action, window, cx)))
             .on_action(cx.listener(|this, action, window, cx| {
                 this.previous_history_query(action, window, cx)
@@ -1988,7 +1968,7 @@ impl Render for ProjectSearchBar {
             .on_action(
                 cx.listener(|this, action, window, cx| this.next_history_query(action, window, cx)),
             )
-            .child(self.render_text_input(&search.query_editor, cx))
+            .child(render_text_input(&search.query_editor, color_override, cx))
             .child(
                 h_flex()
                     .gap_1()
@@ -2017,6 +1997,7 @@ impl Render for ProjectSearchBar {
 
         let mode_column = h_flex()
             .gap_1()
+            .min_w_64()
             .child(
                 IconButton::new("project-search-filter-button", IconName::Filter)
                     .shape(IconButtonShape::Square)
@@ -2045,109 +2026,46 @@ impl Render for ProjectSearchBar {
                         }
                     }),
             )
-            .child(
-                IconButton::new("project-search-toggle-replace", IconName::Replace)
-                    .shape(IconButtonShape::Square)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.toggle_replace(&ToggleReplace, window, cx);
-                    }))
-                    .toggle_state(
-                        self.active_project_search
-                            .as_ref()
-                            .map(|search| search.read(cx).replace_enabled)
-                            .unwrap_or_default(),
-                    )
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Toggle Replace",
-                                &ToggleReplace,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    }),
-            );
+            .child(toggle_replace_button(
+                "project-search-toggle-replace",
+                focus_handle.clone(),
+                self.active_project_search
+                    .as_ref()
+                    .map(|search| search.read(cx).replace_enabled)
+                    .unwrap_or_default(),
+                cx.listener(|this, _, window, cx| {
+                    this.toggle_replace(&ToggleReplace, window, cx);
+                }),
+            ));
 
-        let limit_reached = search.entity.read(cx).limit_reached;
-
-        let match_text = search
-            .active_match_index
-            .and_then(|index| {
-                let index = index + 1;
-                let match_quantity = search.entity.read(cx).match_ranges.len();
-                if match_quantity > 0 {
-                    debug_assert!(match_quantity >= index);
-                    if limit_reached {
-                        Some(format!("{index}/{match_quantity}+"))
-                    } else {
-                        Some(format!("{index}/{match_quantity}"))
-                    }
-                } else {
-                    None
-                }
-            })
-            .unwrap_or_else(|| "0/0".to_string());
+        let query_focus = search.query_editor.focus_handle(cx);
 
         let matches_column = h_flex()
             .pl_2()
             .ml_2()
             .border_l_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(
-                IconButton::new("project-search-prev-match", IconName::ChevronLeft)
-                    .shape(IconButtonShape::Square)
-                    .disabled(search.active_match_index.is_none())
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(search) = this.active_project_search.as_ref() {
-                            search.update(cx, |this, cx| {
-                                this.select_match(Direction::Prev, window, cx);
-                            })
-                        }
-                    }))
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Go To Previous Match",
-                                &SelectPreviousMatch,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    }),
-            )
-            .child(
-                IconButton::new("project-search-next-match", IconName::ChevronRight)
-                    .shape(IconButtonShape::Square)
-                    .disabled(search.active_match_index.is_none())
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(search) = this.active_project_search.as_ref() {
-                            search.update(cx, |this, cx| {
-                                this.select_match(Direction::Next, window, cx);
-                            })
-                        }
-                    }))
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Go To Next Match",
-                                &SelectNextMatch,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    }),
-            )
+            .border_color(theme_colors.border_variant)
+            .child(render_action_button(
+                "project-search-nav-button",
+                IconName::ChevronLeft,
+                search.active_match_index.is_some(),
+                "Select Previous Match",
+                &SelectPreviousMatch,
+                query_focus.clone(),
+            ))
+            .child(render_action_button(
+                "project-search-nav-button",
+                IconName::ChevronRight,
+                search.active_match_index.is_some(),
+                "Select Next Match",
+                &SelectNextMatch,
+                query_focus,
+            ))
             .child(
                 div()
                     .id("matches")
-                    .ml_1()
+                    .ml_2()
+                    .min_w(rems_from_px(40.))
                     .child(Label::new(match_text).size(LabelSize::Small).color(
                         if search.active_match_index.is_some() {
                             Color::Default
@@ -2169,63 +2087,30 @@ impl Render for ProjectSearchBar {
             .child(h_flex().min_w_64().child(mode_column).child(matches_column));
 
         let replace_line = search.replace_enabled.then(|| {
-            let replace_column = input_base_styles(BaseStyle::SingleInput, InputPanel::Replacement)
-                .child(self.render_text_input(&search.replacement_editor, cx));
+            let replace_column = input_base_styles(InputPanel::Replacement)
+                .child(render_text_input(&search.replacement_editor, None, cx));
 
             let focus_handle = search.replacement_editor.read(cx).focus_handle(cx);
 
-            let replace_actions =
-                h_flex()
-                    .min_w_64()
-                    .gap_1()
-                    .when(search.replace_enabled, |this| {
-                        this.child(
-                            IconButton::new("project-search-replace-next", IconName::ReplaceNext)
-                                .shape(IconButtonShape::Square)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    if let Some(search) = this.active_project_search.as_ref() {
-                                        search.update(cx, |this, cx| {
-                                            this.replace_next(&ReplaceNext, window, cx);
-                                        })
-                                    }
-                                }))
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Replace Next Match",
-                                            &ReplaceNext,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                }),
-                        )
-                        .child(
-                            IconButton::new("project-search-replace-all", IconName::ReplaceAll)
-                                .shape(IconButtonShape::Square)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    if let Some(search) = this.active_project_search.as_ref() {
-                                        search.update(cx, |this, cx| {
-                                            this.replace_all(&ReplaceAll, window, cx);
-                                        })
-                                    }
-                                }))
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Replace All Matches",
-                                            &ReplaceAll,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                }),
-                        )
-                    });
+            let replace_actions = h_flex()
+                .min_w_64()
+                .gap_1()
+                .child(render_action_button(
+                    "project-search-replace-button",
+                    IconName::ReplaceNext,
+                    true,
+                    "Replace Next Match",
+                    &ReplaceNext,
+                    focus_handle.clone(),
+                ))
+                .child(render_action_button(
+                    "project-search-replace-button",
+                    IconName::ReplaceAll,
+                    true,
+                    "Replace All Matches",
+                    &ReplaceAll,
+                    focus_handle,
+                ));
 
             h_flex()
                 .w_full()
@@ -2235,6 +2120,45 @@ impl Render for ProjectSearchBar {
         });
 
         let filter_line = search.filters_enabled.then(|| {
+            let include = input_base_styles(InputPanel::Include)
+                .on_action(cx.listener(|this, action, window, cx| {
+                    this.previous_history_query(action, window, cx)
+                }))
+                .on_action(cx.listener(|this, action, window, cx| {
+                    this.next_history_query(action, window, cx)
+                }))
+                .child(render_text_input(&search.included_files_editor, None, cx));
+            let exclude = input_base_styles(InputPanel::Exclude)
+                .on_action(cx.listener(|this, action, window, cx| {
+                    this.previous_history_query(action, window, cx)
+                }))
+                .on_action(cx.listener(|this, action, window, cx| {
+                    this.next_history_query(action, window, cx)
+                }))
+                .child(render_text_input(&search.excluded_files_editor, None, cx));
+            let mode_column = h_flex()
+                .gap_1()
+                .min_w_64()
+                .child(
+                    IconButton::new("project-search-opened-only", IconName::FolderSearch)
+                        .shape(IconButtonShape::Square)
+                        .toggle_state(self.is_opened_only_enabled(cx))
+                        .tooltip(Tooltip::text("Only Search Open Files"))
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            this.toggle_opened_only(window, cx);
+                        })),
+                )
+                .child(
+                    SearchOptions::INCLUDE_IGNORED.as_button(
+                        search
+                            .search_options
+                            .contains(SearchOptions::INCLUDE_IGNORED),
+                        focus_handle.clone(),
+                        cx.listener(|this, _, window, cx| {
+                            this.toggle_search_option(SearchOptions::INCLUDE_IGNORED, window, cx);
+                        }),
+                    ),
+                );
             h_flex()
                 .w_full()
                 .gap_2()
@@ -2242,62 +2166,14 @@ impl Render for ProjectSearchBar {
                     h_flex()
                         .gap_2()
                         .w(input_width)
-                        .child(
-                            input_base_styles(BaseStyle::MultipleInputs, InputPanel::Include)
-                                .on_action(cx.listener(|this, action, window, cx| {
-                                    this.previous_history_query(action, window, cx)
-                                }))
-                                .on_action(cx.listener(|this, action, window, cx| {
-                                    this.next_history_query(action, window, cx)
-                                }))
-                                .child(self.render_text_input(&search.included_files_editor, cx)),
-                        )
-                        .child(
-                            input_base_styles(BaseStyle::MultipleInputs, InputPanel::Exclude)
-                                .on_action(cx.listener(|this, action, window, cx| {
-                                    this.previous_history_query(action, window, cx)
-                                }))
-                                .on_action(cx.listener(|this, action, window, cx| {
-                                    this.next_history_query(action, window, cx)
-                                }))
-                                .child(self.render_text_input(&search.excluded_files_editor, cx)),
-                        ),
-                )
-                .child(
-                    h_flex()
-                        .min_w_64()
-                        .gap_1()
-                        .child(
-                            IconButton::new("project-search-opened-only", IconName::FolderSearch)
-                                .shape(IconButtonShape::Square)
-                                .toggle_state(self.is_opened_only_enabled(cx))
-                                .tooltip(Tooltip::text("Only Search Open Files"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.toggle_opened_only(window, cx);
-                                })),
-                        )
-                        .child(
-                            SearchOptions::INCLUDE_IGNORED.as_button(
-                                search
-                                    .search_options
-                                    .contains(SearchOptions::INCLUDE_IGNORED),
-                                focus_handle.clone(),
-                                cx.listener(|this, _, window, cx| {
-                                    this.toggle_search_option(
-                                        SearchOptions::INCLUDE_IGNORED,
-                                        window,
-                                        cx,
-                                    );
-                                }),
-                            ),
-                        ),
+                        .child(include)
+                        .child(exclude),
                 )
+                .child(mode_column)
         });
 
         let mut key_context = KeyContext::default();
-
         key_context.add("ProjectSearchBar");
-
         if search
             .replacement_editor
             .focus_handle(cx)
@@ -2306,16 +2182,33 @@ impl Render for ProjectSearchBar {
             key_context.add("in_replace");
         }
 
-        let query_error_line = search.query_error.as_ref().map(|error| {
-            Label::new(error)
-                .size(LabelSize::Small)
-                .color(Color::Error)
-                .mt_neg_1()
-                .ml_2()
-        });
+        let query_error_line = search
+            .panels_with_errors
+            .get(&InputPanel::Query)
+            .map(|error| {
+                Label::new(error)
+                    .size(LabelSize::Small)
+                    .color(Color::Error)
+                    .mt_neg_1()
+                    .ml_2()
+            });
+
+        let filter_error_line = search
+            .panels_with_errors
+            .get(&InputPanel::Include)
+            .or_else(|| search.panels_with_errors.get(&InputPanel::Exclude))
+            .map(|error| {
+                Label::new(error)
+                    .size(LabelSize::Small)
+                    .color(Color::Error)
+                    .mt_neg_1()
+                    .ml_2()
+            });
 
         v_flex()
+            .gap_2()
             .py(px(1.0))
+            .w_full()
             .key_context(key_context)
             .on_action(cx.listener(|this, _: &ToggleFocus, window, cx| {
                 this.move_focus_to_results(window, cx)
@@ -2323,14 +2216,8 @@ impl Render for ProjectSearchBar {
             .on_action(cx.listener(|this, _: &ToggleFilters, window, cx| {
                 this.toggle_filters(window, cx);
             }))
-            .capture_action(cx.listener(|this, action, window, cx| {
-                this.tab(action, window, cx);
-                cx.stop_propagation();
-            }))
-            .capture_action(cx.listener(|this, action, window, cx| {
-                this.backtab(action, window, cx);
-                cx.stop_propagation();
-            }))
+            .capture_action(cx.listener(Self::tab))
+            .capture_action(cx.listener(Self::backtab))
             .on_action(cx.listener(|this, action, window, cx| this.confirm(action, window, cx)))
             .on_action(cx.listener(|this, action, window, cx| {
                 this.toggle_replace(action, window, cx);
@@ -2362,12 +2249,11 @@ impl Render for ProjectSearchBar {
             })
             .on_action(cx.listener(Self::select_next_match))
             .on_action(cx.listener(Self::select_prev_match))
-            .gap_2()
-            .w_full()
             .child(search_line)
             .children(query_error_line)
             .children(replace_line)
             .children(filter_line)
+            .children(filter_error_line)
     }
 }
 
diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs
index 805664c794..2805b0c62d 100644
--- a/crates/search/src/search_bar.rs
+++ b/crates/search/src/search_bar.rs
@@ -1,8 +1,14 @@
-use gpui::{Action, FocusHandle, IntoElement};
+use editor::{Editor, EditorElement, EditorStyle};
+use gpui::{Action, Entity, FocusHandle, Hsla, IntoElement, TextStyle};
+use settings::Settings;
+use theme::ThemeSettings;
 use ui::{IconButton, IconButtonShape};
 use ui::{Tooltip, prelude::*};
 
-pub(super) fn render_nav_button(
+use crate::ToggleReplace;
+
+pub(super) fn render_action_button(
+    id_prefix: &'static str,
     icon: ui::IconName,
     active: bool,
     tooltip: &'static str,
@@ -10,7 +16,7 @@ pub(super) fn render_nav_button(
     focus_handle: FocusHandle,
 ) -> impl IntoElement {
     IconButton::new(
-        SharedString::from(format!("search-nav-button-{}", action.name())),
+        SharedString::from(format!("{id_prefix}-{}", action.name())),
         icon,
     )
     .shape(IconButtonShape::Square)
@@ -26,3 +32,74 @@ pub(super) fn render_nav_button(
     .tooltip(move |window, cx| Tooltip::for_action_in(tooltip, action, &focus_handle, window, cx))
     .disabled(!active)
 }
+
+pub(crate) fn input_base_styles(border_color: Hsla, map: impl FnOnce(Div) -> Div) -> Div {
+    h_flex()
+        .min_w_32()
+        .map(map)
+        .h_8()
+        .pl_2()
+        .pr_1()
+        .py_1()
+        .border_1()
+        .border_color(border_color)
+        .rounded_lg()
+}
+
+pub(crate) fn toggle_replace_button(
+    id: &'static str,
+    focus_handle: FocusHandle,
+    replace_enabled: bool,
+    on_click: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
+) -> IconButton {
+    IconButton::new(id, IconName::Replace)
+        .shape(IconButtonShape::Square)
+        .style(ButtonStyle::Subtle)
+        .when(replace_enabled, |button| button.style(ButtonStyle::Filled))
+        .on_click(on_click)
+        .toggle_state(replace_enabled)
+        .tooltip({
+            move |window, cx| {
+                Tooltip::for_action_in("Toggle Replace", &ToggleReplace, &focus_handle, window, cx)
+            }
+        })
+}
+
+pub(crate) fn render_text_input(
+    editor: &Entity<Editor>,
+    color_override: Option<Color>,
+    app: &App,
+) -> impl IntoElement {
+    let (color, use_syntax) = if editor.read(app).read_only(app) {
+        (app.theme().colors().text_disabled, false)
+    } else {
+        match color_override {
+            Some(color_override) => (color_override.color(app), false),
+            None => (app.theme().colors().text, true),
+        }
+    };
+
+    let settings = ThemeSettings::get_global(app);
+    let text_style = TextStyle {
+        color,
+        font_family: settings.buffer_font.family.clone(),
+        font_features: settings.buffer_font.features.clone(),
+        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+        font_size: rems(0.875).into(),
+        font_weight: settings.buffer_font.weight,
+        line_height: relative(1.3),
+        ..TextStyle::default()
+    };
+
+    let mut editor_style = EditorStyle {
+        background: app.theme().colors().toolbar_background,
+        local_player: app.theme().players().local(),
+        text: text_style,
+        ..EditorStyle::default()
+    };
+    if use_syntax {
+        editor_style.syntax = app.theme().syntax().clone();
+    }
+
+    EditorElement::new(editor, editor_style)
+}
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ba9e3bbb8a..ca98404194 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3878,9 +3878,7 @@ impl Workspace {
                 local,
                 focus_changed,
             } => {
-                cx.on_next_frame(window, |_, window, _| {
-                    window.invalidate_character_coordinates();
-                });
+                window.invalidate_character_coordinates();
 
                 pane.update(cx, |pane, _| {
                     pane.track_alternate_file_items();
@@ -3921,9 +3919,7 @@ impl Workspace {
                 }
             }
             pane::Event::Focus => {
-                cx.on_next_frame(window, |_, window, _| {
-                    window.invalidate_character_coordinates();
-                });
+                window.invalidate_character_coordinates();
                 self.handle_pane_focused(pane.clone(), window, cx);
             }
             pane::Event::ZoomIn => {

From a3dcc7668756f4ab6aae6d3d5b2ba9a309303723 Mon Sep 17 00:00:00 2001
From: Oleksiy Syvokon <oleksiy@zed.dev>
Date: Fri, 15 Aug 2025 12:12:18 +0300
Subject: [PATCH 044/823] openai: Don't send reasoning_effort if it's not set
 (#36228)

Release Notes:

- N/A
---
 crates/open_ai/src/open_ai.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 5801f29623..8bbe858995 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -257,6 +257,7 @@ pub struct Request {
     pub tools: Vec<ToolDefinition>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub prompt_cache_key: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub reasoning_effort: Option<ReasoningEffort>,
 }
 

From 4f0b00b0d9cd25798a3e20a789cf93835251d8c3 Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Fri, 15 Aug 2025 12:10:52 +0200
Subject: [PATCH 045/823] Add component NotificationFrame & CaptureAudio parts
 for testing (#36081)

Adds component NotificationFrame. It implements a subset of MessageNotification as a Component and refactors MessageNotification to use NotificationFrame. Having some notification UI Component is nice as it allows us to easily build new types of notifications.

Uses the new NotificationFrame component for CaptureAudioNotification.

Adds a CaptureAudio action in the dev namespace (not meant for
end-users). It records 10 seconds of audio and saves that to a wav file.

Release Notes:

- N/A

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
---
 .config/hakari.toml                           |   2 +
 Cargo.lock                                    |   9 +
 Cargo.toml                                    |   2 +-
 crates/audio/Cargo.toml                       |   2 +-
 crates/livekit_client/Cargo.toml              |   2 +
 crates/livekit_client/src/lib.rs              |  64 +++++
 crates/livekit_client/src/livekit_client.rs   |   2 +
 .../src/livekit_client/playback.rs            |  57 +----
 crates/livekit_client/src/record.rs           |  91 ++++++++
 crates/workspace/src/notifications.rs         | 218 ++++++++++++------
 crates/workspace/src/workspace.rs             |   3 +-
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/zed.rs                         | 122 +++++++++-
 13 files changed, 448 insertions(+), 127 deletions(-)
 create mode 100644 crates/livekit_client/src/record.rs

diff --git a/.config/hakari.toml b/.config/hakari.toml
index 2050065cc2..f71e97b45c 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -25,6 +25,8 @@ third-party = [
     { name = "reqwest", version = "0.11.27" },
     # build of remote_server should not include scap / its x11 dependency
     { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
+    # build of remote_server should not need to include on libalsa through rodio
+    { name = "rodio" },
 ]
 
 [final-excludes]
diff --git a/Cargo.lock b/Cargo.lock
index 0bafc3c386..2353733dc0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7883,6 +7883,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "hound"
+version = "3.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
+
 [[package]]
 name = "html5ever"
 version = "0.27.0"
@@ -9711,6 +9717,7 @@ dependencies = [
  "objc",
  "parking_lot",
  "postage",
+ "rodio",
  "scap",
  "serde",
  "serde_json",
@@ -13972,6 +13979,7 @@ checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
 dependencies = [
  "cpal",
  "dasp_sample",
+ "hound",
  "num-rational",
  "symphonia",
  "tracing",
@@ -20576,6 +20584,7 @@ dependencies = [
  "language_tools",
  "languages",
  "libc",
+ "livekit_client",
  "log",
  "markdown",
  "markdown_preview",
diff --git a/Cargo.toml b/Cargo.toml
index a872cadd39..baa4ee7f4e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -363,6 +363,7 @@ remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
+rodio = { version = "0.21.1", default-features = false }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
@@ -564,7 +565,6 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c77
     "socks",
     "stream",
 ] }
-rodio = { version = "0.21.1", default-features = false }
 rsa = "0.9.6"
 runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
     "async-dispatcher-runtime",
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index f1f40ad654..5146396b92 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -18,6 +18,6 @@ collections.workspace = true
 derive_more.workspace = true
 gpui.workspace = true
 parking_lot.workspace = true
-rodio = { workspace = true, features = ["wav", "playback", "tracing"] }
+rodio = { workspace = true, features = [ "wav", "playback", "tracing" ] }
 util.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/livekit_client/Cargo.toml b/crates/livekit_client/Cargo.toml
index 821fd5d390..58059967b7 100644
--- a/crates/livekit_client/Cargo.toml
+++ b/crates/livekit_client/Cargo.toml
@@ -39,6 +39,8 @@ tokio-tungstenite.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
 
+rodio = { workspace = true, features = ["wav_output"] }
+
 [target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
 libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
 livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = [
diff --git a/crates/livekit_client/src/lib.rs b/crates/livekit_client/src/lib.rs
index 149859fdc8..e3934410e1 100644
--- a/crates/livekit_client/src/lib.rs
+++ b/crates/livekit_client/src/lib.rs
@@ -1,7 +1,13 @@
+use anyhow::Context as _;
 use collections::HashMap;
 
 mod remote_video_track_view;
+use cpal::traits::HostTrait as _;
 pub use remote_video_track_view::{RemoteVideoTrackView, RemoteVideoTrackViewEvent};
+use rodio::DeviceTrait as _;
+
+mod record;
+pub use record::CaptureInput;
 
 #[cfg(not(any(
     test,
@@ -18,6 +24,8 @@ mod livekit_client;
 )))]
 pub use livekit_client::*;
 
+// If you need proper LSP in livekit_client you've got to comment out
+// the mocks and test
 #[cfg(any(
     test,
     feature = "test-support",
@@ -168,3 +176,59 @@ pub enum RoomEvent {
     Reconnecting,
     Reconnected,
 }
+
+pub(crate) fn default_device(
+    input: bool,
+) -> anyhow::Result<(cpal::Device, cpal::SupportedStreamConfig)> {
+    let device;
+    let config;
+    if input {
+        device = cpal::default_host()
+            .default_input_device()
+            .context("no audio input device available")?;
+        config = device
+            .default_input_config()
+            .context("failed to get default input config")?;
+    } else {
+        device = cpal::default_host()
+            .default_output_device()
+            .context("no audio output device available")?;
+        config = device
+            .default_output_config()
+            .context("failed to get default output config")?;
+    }
+    Ok((device, config))
+}
+
+pub(crate) fn get_sample_data(
+    sample_format: cpal::SampleFormat,
+    data: &cpal::Data,
+) -> anyhow::Result<Vec<i16>> {
+    match sample_format {
+        cpal::SampleFormat::I8 => Ok(convert_sample_data::<i8, i16>(data)),
+        cpal::SampleFormat::I16 => Ok(data.as_slice::<i16>().unwrap().to_vec()),
+        cpal::SampleFormat::I24 => Ok(convert_sample_data::<cpal::I24, i16>(data)),
+        cpal::SampleFormat::I32 => Ok(convert_sample_data::<i32, i16>(data)),
+        cpal::SampleFormat::I64 => Ok(convert_sample_data::<i64, i16>(data)),
+        cpal::SampleFormat::U8 => Ok(convert_sample_data::<u8, i16>(data)),
+        cpal::SampleFormat::U16 => Ok(convert_sample_data::<u16, i16>(data)),
+        cpal::SampleFormat::U32 => Ok(convert_sample_data::<u32, i16>(data)),
+        cpal::SampleFormat::U64 => Ok(convert_sample_data::<u64, i16>(data)),
+        cpal::SampleFormat::F32 => Ok(convert_sample_data::<f32, i16>(data)),
+        cpal::SampleFormat::F64 => Ok(convert_sample_data::<f64, i16>(data)),
+        _ => anyhow::bail!("Unsupported sample format"),
+    }
+}
+
+pub(crate) fn convert_sample_data<
+    TSource: cpal::SizedSample,
+    TDest: cpal::SizedSample + cpal::FromSample<TSource>,
+>(
+    data: &cpal::Data,
+) -> Vec<TDest> {
+    data.as_slice::<TSource>()
+        .unwrap()
+        .iter()
+        .map(|e| e.to_sample::<TDest>())
+        .collect()
+}
diff --git a/crates/livekit_client/src/livekit_client.rs b/crates/livekit_client/src/livekit_client.rs
index 8f0ac1a456..adeea4f512 100644
--- a/crates/livekit_client/src/livekit_client.rs
+++ b/crates/livekit_client/src/livekit_client.rs
@@ -8,6 +8,8 @@ use gpui_tokio::Tokio;
 use playback::capture_local_video_track;
 
 mod playback;
+#[cfg(feature = "record-microphone")]
+mod record;
 
 use crate::{LocalTrack, Participant, RemoteTrack, RoomEvent, TrackPublication};
 pub use playback::AudioStream;
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
index f14e156125..d1eec42f8f 100644
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ b/crates/livekit_client/src/livekit_client/playback.rs
@@ -1,7 +1,6 @@
 use anyhow::{Context as _, Result};
 
-use cpal::traits::{DeviceTrait, HostTrait, StreamTrait as _};
-use cpal::{Data, FromSample, I24, SampleFormat, SizedSample};
+use cpal::traits::{DeviceTrait, StreamTrait as _};
 use futures::channel::mpsc::UnboundedSender;
 use futures::{Stream, StreamExt as _};
 use gpui::{
@@ -166,7 +165,7 @@ impl AudioStack {
     ) -> Result<()> {
         loop {
             let mut device_change_listener = DeviceChangeListener::new(false)?;
-            let (output_device, output_config) = default_device(false)?;
+            let (output_device, output_config) = crate::default_device(false)?;
             let (end_on_drop_tx, end_on_drop_rx) = std::sync::mpsc::channel::<()>();
             let mixer = mixer.clone();
             let apm = apm.clone();
@@ -238,7 +237,7 @@ impl AudioStack {
     ) -> Result<()> {
         loop {
             let mut device_change_listener = DeviceChangeListener::new(true)?;
-            let (device, config) = default_device(true)?;
+            let (device, config) = crate::default_device(true)?;
             let (end_on_drop_tx, end_on_drop_rx) = std::sync::mpsc::channel::<()>();
             let apm = apm.clone();
             let frame_tx = frame_tx.clone();
@@ -262,7 +261,7 @@ impl AudioStack {
                             config.sample_format(),
                             move |data, _: &_| {
                                 let data =
-                                    Self::get_sample_data(config.sample_format(), data).log_err();
+                                    crate::get_sample_data(config.sample_format(), data).log_err();
                                 let Some(data) = data else {
                                     return;
                                 };
@@ -320,33 +319,6 @@ impl AudioStack {
             drop(end_on_drop_tx)
         }
     }
-
-    fn get_sample_data(sample_format: SampleFormat, data: &Data) -> Result<Vec<i16>> {
-        match sample_format {
-            SampleFormat::I8 => Ok(Self::convert_sample_data::<i8, i16>(data)),
-            SampleFormat::I16 => Ok(data.as_slice::<i16>().unwrap().to_vec()),
-            SampleFormat::I24 => Ok(Self::convert_sample_data::<I24, i16>(data)),
-            SampleFormat::I32 => Ok(Self::convert_sample_data::<i32, i16>(data)),
-            SampleFormat::I64 => Ok(Self::convert_sample_data::<i64, i16>(data)),
-            SampleFormat::U8 => Ok(Self::convert_sample_data::<u8, i16>(data)),
-            SampleFormat::U16 => Ok(Self::convert_sample_data::<u16, i16>(data)),
-            SampleFormat::U32 => Ok(Self::convert_sample_data::<u32, i16>(data)),
-            SampleFormat::U64 => Ok(Self::convert_sample_data::<u64, i16>(data)),
-            SampleFormat::F32 => Ok(Self::convert_sample_data::<f32, i16>(data)),
-            SampleFormat::F64 => Ok(Self::convert_sample_data::<f64, i16>(data)),
-            _ => anyhow::bail!("Unsupported sample format"),
-        }
-    }
-
-    fn convert_sample_data<TSource: SizedSample, TDest: SizedSample + FromSample<TSource>>(
-        data: &Data,
-    ) -> Vec<TDest> {
-        data.as_slice::<TSource>()
-            .unwrap()
-            .iter()
-            .map(|e| e.to_sample::<TDest>())
-            .collect()
-    }
 }
 
 use super::LocalVideoTrack;
@@ -393,27 +365,6 @@ pub(crate) async fn capture_local_video_track(
     ))
 }
 
-fn default_device(input: bool) -> Result<(cpal::Device, cpal::SupportedStreamConfig)> {
-    let device;
-    let config;
-    if input {
-        device = cpal::default_host()
-            .default_input_device()
-            .context("no audio input device available")?;
-        config = device
-            .default_input_config()
-            .context("failed to get default input config")?;
-    } else {
-        device = cpal::default_host()
-            .default_output_device()
-            .context("no audio output device available")?;
-        config = device
-            .default_output_config()
-            .context("failed to get default output config")?;
-    }
-    Ok((device, config))
-}
-
 #[derive(Clone)]
 struct AudioMixerSource {
     ssrc: i32,
diff --git a/crates/livekit_client/src/record.rs b/crates/livekit_client/src/record.rs
new file mode 100644
index 0000000000..925c0d4c67
--- /dev/null
+++ b/crates/livekit_client/src/record.rs
@@ -0,0 +1,91 @@
+use std::{
+    env,
+    path::{Path, PathBuf},
+    sync::{Arc, Mutex},
+    time::Duration,
+};
+
+use anyhow::{Context, Result};
+use cpal::traits::{DeviceTrait, StreamTrait};
+use rodio::{buffer::SamplesBuffer, conversions::SampleTypeConverter};
+use util::ResultExt;
+
+pub struct CaptureInput {
+    pub name: String,
+    config: cpal::SupportedStreamConfig,
+    samples: Arc<Mutex<Vec<i16>>>,
+    _stream: cpal::Stream,
+}
+
+impl CaptureInput {
+    pub fn start() -> anyhow::Result<Self> {
+        let (device, config) = crate::default_device(true)?;
+        let name = device.name().unwrap_or("<unknown>".to_string());
+        log::info!("Using microphone: {}", name);
+
+        let samples = Arc::new(Mutex::new(Vec::new()));
+        let stream = start_capture(device, config.clone(), samples.clone())?;
+
+        Ok(Self {
+            name,
+            _stream: stream,
+            config,
+            samples,
+        })
+    }
+
+    pub fn finish(self) -> Result<PathBuf> {
+        let name = self.name;
+        let mut path = env::current_dir().context("Could not get current dir")?;
+        path.push(&format!("test_recording_{name}.wav"));
+        log::info!("Test recording written to: {}", path.display());
+        write_out(self.samples, self.config, &path)?;
+        Ok(path)
+    }
+}
+
+fn start_capture(
+    device: cpal::Device,
+    config: cpal::SupportedStreamConfig,
+    samples: Arc<Mutex<Vec<i16>>>,
+) -> Result<cpal::Stream> {
+    let stream = device
+        .build_input_stream_raw(
+            &config.config(),
+            config.sample_format(),
+            move |data, _: &_| {
+                let data = crate::get_sample_data(config.sample_format(), data).log_err();
+                let Some(data) = data else {
+                    return;
+                };
+                samples
+                    .try_lock()
+                    .expect("Only locked after stream ends")
+                    .extend_from_slice(&data);
+            },
+            |err| log::error!("error capturing audio track: {:?}", err),
+            Some(Duration::from_millis(100)),
+        )
+        .context("failed to build input stream")?;
+
+    stream.play()?;
+    Ok(stream)
+}
+
+fn write_out(
+    samples: Arc<Mutex<Vec<i16>>>,
+    config: cpal::SupportedStreamConfig,
+    path: &Path,
+) -> Result<()> {
+    let samples = std::mem::take(
+        &mut *samples
+            .try_lock()
+            .expect("Stream has ended, callback cant hold the lock"),
+    );
+    let samples: Vec<f32> = SampleTypeConverter::<_, f32>::new(samples.into_iter()).collect();
+    let mut samples = SamplesBuffer::new(config.channels(), config.sample_rate().0, samples);
+    match rodio::output_to_wav(&mut samples, path) {
+        Ok(_) => Ok(()),
+        Err(e) => Err(anyhow::anyhow!("Failed to write wav file: {}", e)),
+    }
+}
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 96966435e1..7d8a28b0f1 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -6,6 +6,7 @@ use gpui::{
     Task, svg,
 };
 use parking_lot::Mutex;
+
 use std::ops::Deref;
 use std::sync::{Arc, LazyLock};
 use std::{any::TypeId, time::Duration};
@@ -189,6 +190,7 @@ impl Workspace {
         cx.notify();
     }
 
+    /// Hide all notifications matching the given ID
     pub fn suppress_notification(&mut self, id: &NotificationId, cx: &mut Context<Self>) {
         self.dismiss_notification(id, cx);
         self.suppressed_notifications.insert(id.clone());
@@ -462,16 +464,144 @@ impl EventEmitter<SuppressEvent> for ErrorMessagePrompt {}
 
 impl Notification for ErrorMessagePrompt {}
 
+#[derive(IntoElement, RegisterComponent)]
+pub struct NotificationFrame {
+    title: Option<SharedString>,
+    show_suppress_button: bool,
+    show_close_button: bool,
+    close: Option<Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>>,
+    contents: Option<AnyElement>,
+    suffix: Option<AnyElement>,
+}
+
+impl NotificationFrame {
+    pub fn new() -> Self {
+        Self {
+            title: None,
+            contents: None,
+            suffix: None,
+            show_suppress_button: true,
+            show_close_button: true,
+            close: None,
+        }
+    }
+
+    pub fn with_title(mut self, title: Option<impl Into<SharedString>>) -> Self {
+        self.title = title.map(Into::into);
+        self
+    }
+
+    pub fn with_content(self, content: impl IntoElement) -> Self {
+        Self {
+            contents: Some(content.into_any_element()),
+            ..self
+        }
+    }
+
+    /// Determines whether the given notification ID should be suppressible
+    /// Suppressed motifications will not be shown anymore
+    pub fn show_suppress_button(mut self, show: bool) -> Self {
+        self.show_suppress_button = show;
+        self
+    }
+
+    pub fn show_close_button(mut self, show: bool) -> Self {
+        self.show_close_button = show;
+        self
+    }
+
+    pub fn on_close(self, on_close: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
+        Self {
+            close: Some(Box::new(on_close)),
+            ..self
+        }
+    }
+
+    pub fn with_suffix(mut self, suffix: impl IntoElement) -> Self {
+        self.suffix = Some(suffix.into_any_element());
+        self
+    }
+}
+
+impl RenderOnce for NotificationFrame {
+    fn render(mut self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let entity = window.current_view();
+        let show_suppress_button = self.show_suppress_button;
+        let suppress = show_suppress_button && window.modifiers().shift;
+        let (close_id, close_icon) = if suppress {
+            ("suppress", IconName::Minimize)
+        } else {
+            ("close", IconName::Close)
+        };
+
+        v_flex()
+            .occlude()
+            .p_3()
+            .gap_2()
+            .elevation_3(cx)
+            .child(
+                h_flex()
+                    .gap_4()
+                    .justify_between()
+                    .items_start()
+                    .child(
+                        v_flex()
+                            .gap_0p5()
+                            .when_some(self.title.clone(), |div, title| {
+                                div.child(Label::new(title))
+                            })
+                            .child(div().max_w_96().children(self.contents)),
+                    )
+                    .when(self.show_close_button, |this| {
+                        this.on_modifiers_changed(move |_, _, cx| cx.notify(entity))
+                            .child(
+                                IconButton::new(close_id, close_icon)
+                                    .tooltip(move |window, cx| {
+                                        if suppress {
+                                            Tooltip::for_action(
+                                                "Suppress.\nClose with click.",
+                                                &SuppressNotification,
+                                                window,
+                                                cx,
+                                            )
+                                        } else if show_suppress_button {
+                                            Tooltip::for_action(
+                                                "Close.\nSuppress with shift-click.",
+                                                &menu::Cancel,
+                                                window,
+                                                cx,
+                                            )
+                                        } else {
+                                            Tooltip::for_action("Close", &menu::Cancel, window, cx)
+                                        }
+                                    })
+                                    .on_click({
+                                        let close = self.close.take();
+                                        move |_, window, cx| {
+                                            if let Some(close) = &close {
+                                                close(&suppress, window, cx)
+                                            }
+                                        }
+                                    }),
+                            )
+                    }),
+            )
+            .children(self.suffix)
+    }
+}
+
+impl Component for NotificationFrame {}
+
 pub mod simple_message_notification {
     use std::sync::Arc;
 
     use gpui::{
-        AnyElement, ClickEvent, DismissEvent, EventEmitter, FocusHandle, Focusable, ParentElement,
-        Render, SharedString, Styled, div,
+        AnyElement, DismissEvent, EventEmitter, FocusHandle, Focusable, ParentElement, Render,
+        SharedString, Styled,
     };
-    use ui::{Tooltip, prelude::*};
+    use ui::prelude::*;
 
-    use crate::SuppressNotification;
+    use crate::notifications::NotificationFrame;
 
     use super::{Notification, SuppressEvent};
 
@@ -631,6 +761,8 @@ pub mod simple_message_notification {
             self
         }
 
+        /// Determines whether the given notification ID should be supressable
+        /// Suppressed motifications will not be shown anymor
         pub fn show_suppress_button(mut self, show: bool) -> Self {
             self.show_suppress_button = show;
             self
@@ -647,71 +779,19 @@ pub mod simple_message_notification {
 
     impl Render for MessageNotification {
         fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            let show_suppress_button = self.show_suppress_button;
-            let suppress = show_suppress_button && window.modifiers().shift;
-            let (close_id, close_icon) = if suppress {
-                ("suppress", IconName::Minimize)
-            } else {
-                ("close", IconName::Close)
-            };
-
-            v_flex()
-                .occlude()
-                .p_3()
-                .gap_2()
-                .elevation_3(cx)
-                .child(
-                    h_flex()
-                        .gap_4()
-                        .justify_between()
-                        .items_start()
-                        .child(
-                            v_flex()
-                                .gap_0p5()
-                                .when_some(self.title.clone(), |element, title| {
-                                    element.child(Label::new(title))
-                                })
-                                .child(div().max_w_96().child((self.build_content)(window, cx))),
-                        )
-                        .when(self.show_close_button, |this| {
-                            this.on_modifiers_changed(cx.listener(|_, _, _, cx| cx.notify()))
-                                .child(
-                                    IconButton::new(close_id, close_icon)
-                                        .tooltip(move |window, cx| {
-                                            if suppress {
-                                                Tooltip::for_action(
-                                                    "Suppress.\nClose with click.",
-                                                    &SuppressNotification,
-                                                    window,
-                                                    cx,
-                                                )
-                                            } else if show_suppress_button {
-                                                Tooltip::for_action(
-                                                    "Close.\nSuppress with shift-click.",
-                                                    &menu::Cancel,
-                                                    window,
-                                                    cx,
-                                                )
-                                            } else {
-                                                Tooltip::for_action(
-                                                    "Close",
-                                                    &menu::Cancel,
-                                                    window,
-                                                    cx,
-                                                )
-                                            }
-                                        })
-                                        .on_click(cx.listener(move |_, _: &ClickEvent, _, cx| {
-                                            if suppress {
-                                                cx.emit(SuppressEvent);
-                                            } else {
-                                                cx.emit(DismissEvent);
-                                            }
-                                        })),
-                                )
-                        }),
-                )
-                .child(
+            NotificationFrame::new()
+                .with_title(self.title.clone())
+                .with_content((self.build_content)(window, cx))
+                .show_close_button(self.show_close_button)
+                .show_suppress_button(self.show_suppress_button)
+                .on_close(cx.listener(|_, suppress, _, cx| {
+                    if *suppress {
+                        cx.emit(SuppressEvent);
+                    } else {
+                        cx.emit(DismissEvent);
+                    }
+                }))
+                .with_suffix(
                     h_flex()
                         .gap_1()
                         .children(self.primary_message.iter().map(|message| {
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ca98404194..3129c12dbf 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -15,6 +15,8 @@ mod toast_layer;
 mod toolbar;
 mod workspace_settings;
 
+pub use crate::notifications::NotificationFrame;
+pub use dock::Panel;
 pub use toast_layer::{ToastAction, ToastLayer, ToastView};
 
 use anyhow::{Context as _, Result, anyhow};
@@ -24,7 +26,6 @@ use client::{
     proto::{self, ErrorCode, PanelId, PeerId},
 };
 use collections::{HashMap, HashSet, hash_map};
-pub use dock::Panel;
 use dock::{Dock, DockPosition, PanelButtons, PanelHandle, RESIZE_HANDLE_SIZE};
 use futures::{
     Future, FutureExt, StreamExt,
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 4335f2d5a1..d69efaf6c0 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -82,6 +82,7 @@ inspector_ui.workspace = true
 install_cli.workspace = true
 jj_ui.workspace = true
 journal.workspace = true
+livekit_client.workspace = true
 language.workspace = true
 language_extension.workspace = true
 language_model.workspace = true
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index ceda403fdd..84145a1be4 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -56,6 +56,7 @@ use settings::{
     initial_local_debug_tasks_content, initial_project_settings_content, initial_tasks_content,
     update_settings_file,
 };
+use std::time::{Duration, Instant};
 use std::{
     borrow::Cow,
     path::{Path, PathBuf},
@@ -69,13 +70,17 @@ use util::markdown::MarkdownString;
 use util::{ResultExt, asset_str};
 use uuid::Uuid;
 use vim_mode_setting::VimModeSetting;
-use workspace::notifications::{NotificationId, dismiss_app_notification, show_app_notification};
+use workspace::notifications::{
+    NotificationId, SuppressEvent, dismiss_app_notification, show_app_notification,
+};
 use workspace::{
     AppState, NewFile, NewWindow, OpenLog, Toast, Workspace, WorkspaceSettings,
     create_and_open_local_file, notifications::simple_message_notification::MessageNotification,
     open_new,
 };
-use workspace::{CloseIntent, CloseWindow, RestoreBanner, with_active_or_new_workspace};
+use workspace::{
+    CloseIntent, CloseWindow, NotificationFrame, RestoreBanner, with_active_or_new_workspace,
+};
 use workspace::{Pane, notifications::DetachAndPromptErr};
 use zed_actions::{
     OpenAccountSettings, OpenBrowser, OpenDocs, OpenServerSettings, OpenSettings, OpenZedUrl, Quit,
@@ -117,6 +122,14 @@ actions!(
     ]
 );
 
+actions!(
+    dev,
+    [
+        /// Record 10s of audio from your current microphone
+        CaptureAudio
+    ]
+);
+
 pub fn init(cx: &mut App) {
     #[cfg(target_os = "macos")]
     cx.on_action(|_: &Hide, cx| cx.hide());
@@ -897,7 +910,11 @@ fn register_actions(
                     .detach();
                 }
             }
+        })
+        .register_action(|workspace, _: &CaptureAudio, window, cx| {
+            capture_audio(workspace, window, cx);
         });
+
     if workspace.project().read(cx).is_via_ssh() {
         workspace.register_action({
             move |workspace, _: &OpenServerSettings, window, cx| {
@@ -1806,6 +1823,107 @@ fn open_settings_file(
     .detach_and_log_err(cx);
 }
 
+fn capture_audio(workspace: &mut Workspace, _: &mut Window, cx: &mut Context<Workspace>) {
+    #[derive(Default)]
+    enum State {
+        Recording(livekit_client::CaptureInput),
+        Failed(String),
+        Finished(PathBuf),
+        // Used during state switch. Should never occur naturally.
+        #[default]
+        Invalid,
+    }
+
+    struct CaptureAudioNotification {
+        focus_handle: gpui::FocusHandle,
+        start_time: Instant,
+        state: State,
+    }
+
+    impl gpui::EventEmitter<DismissEvent> for CaptureAudioNotification {}
+    impl gpui::EventEmitter<SuppressEvent> for CaptureAudioNotification {}
+    impl gpui::Focusable for CaptureAudioNotification {
+        fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
+            self.focus_handle.clone()
+        }
+    }
+    impl workspace::notifications::Notification for CaptureAudioNotification {}
+
+    const AUDIO_RECORDING_TIME_SECS: u64 = 10;
+
+    impl Render for CaptureAudioNotification {
+        fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+            let elapsed = self.start_time.elapsed().as_secs();
+            let message = match &self.state {
+                State::Recording(capture) => format!(
+                    "Recording {} seconds of audio from input: '{}'",
+                    AUDIO_RECORDING_TIME_SECS - elapsed,
+                    capture.name,
+                ),
+                State::Failed(e) => format!("Error capturing audio: {e}"),
+                State::Finished(path) => format!("Audio recorded to {}", path.display()),
+                State::Invalid => "Error invalid state".to_string(),
+            };
+
+            NotificationFrame::new()
+                .with_title(Some("Recording Audio"))
+                .show_suppress_button(false)
+                .on_close(cx.listener(|_, _, _, cx| {
+                    cx.emit(DismissEvent);
+                }))
+                .with_content(message)
+        }
+    }
+
+    impl CaptureAudioNotification {
+        fn finish(&mut self) {
+            let state = std::mem::take(&mut self.state);
+            self.state = if let State::Recording(capture) = state {
+                match capture.finish() {
+                    Ok(path) => State::Finished(path),
+                    Err(e) => State::Failed(e.to_string()),
+                }
+            } else {
+                state
+            };
+        }
+
+        fn new(cx: &mut Context<Self>) -> Self {
+            cx.spawn(async move |this, cx| {
+                for _ in 0..10 {
+                    cx.background_executor().timer(Duration::from_secs(1)).await;
+                    this.update(cx, |_, cx| {
+                        cx.notify();
+                    })?;
+                }
+
+                this.update(cx, |this, cx| {
+                    this.finish();
+                    cx.notify();
+                })?;
+
+                anyhow::Ok(())
+            })
+            .detach();
+
+            let state = match livekit_client::CaptureInput::start() {
+                Ok(capture_input) => State::Recording(capture_input),
+                Err(err) => State::Failed(format!("Error starting audio capture: {}", err)),
+            };
+
+            Self {
+                focus_handle: cx.focus_handle(),
+                start_time: Instant::now(),
+                state,
+            }
+        }
+    }
+
+    workspace.show_notification(NotificationId::unique::<CaptureAudio>(), cx, |cx| {
+        cx.new(CaptureAudioNotification::new)
+    });
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From d891348442f2196b248f992ef9067b3eee534f7c Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 15 Aug 2025 12:34:54 +0200
Subject: [PATCH 046/823] search: Simplify search options handling (#36233)

Release Notes:

- N/A
---
 crates/search/src/buffer_search.rs        |  55 +++++------
 crates/search/src/mode.rs                 |  36 -------
 crates/search/src/project_search.rs       |  71 +++++---------
 crates/search/src/search.rs               | 111 +++++++++++++---------
 crates/search/src/search_bar.rs           |  21 ----
 crates/search/src/search_status_button.rs |   4 +-
 crates/zed/src/zed/quick_action_bar.rs    |   2 +-
 7 files changed, 115 insertions(+), 185 deletions(-)
 delete mode 100644 crates/search/src/mode.rs

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index ccef198f04..da2d35d74c 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -1,12 +1,10 @@
 mod registrar;
 
 use crate::{
-    FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext, SearchOptions,
-    SelectAllMatches, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive, ToggleRegex,
-    ToggleReplace, ToggleSelection, ToggleWholeWord,
-    search_bar::{
-        input_base_styles, render_action_button, render_text_input, toggle_replace_button,
-    },
+    FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext, SearchOption,
+    SearchOptions, SelectAllMatches, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive,
+    ToggleRegex, ToggleReplace, ToggleSelection, ToggleWholeWord,
+    search_bar::{input_base_styles, render_action_button, render_text_input},
 };
 use any_vec::AnyVec;
 use anyhow::Context as _;
@@ -215,31 +213,22 @@ impl Render for BufferSearchBar {
                     h_flex()
                         .gap_1()
                         .when(case, |div| {
-                            div.child(SearchOptions::CASE_SENSITIVE.as_button(
-                                self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                                focus_handle.clone(),
-                                cx.listener(|this, _, window, cx| {
-                                    this.toggle_case_sensitive(&ToggleCaseSensitive, window, cx)
-                                }),
-                            ))
+                            div.child(
+                                SearchOption::CaseSensitive
+                                    .as_button(self.search_options, focus_handle.clone()),
+                            )
                         })
                         .when(word, |div| {
-                            div.child(SearchOptions::WHOLE_WORD.as_button(
-                                self.search_options.contains(SearchOptions::WHOLE_WORD),
-                                focus_handle.clone(),
-                                cx.listener(|this, _, window, cx| {
-                                    this.toggle_whole_word(&ToggleWholeWord, window, cx)
-                                }),
-                            ))
+                            div.child(
+                                SearchOption::WholeWord
+                                    .as_button(self.search_options, focus_handle.clone()),
+                            )
                         })
                         .when(regex, |div| {
-                            div.child(SearchOptions::REGEX.as_button(
-                                self.search_options.contains(SearchOptions::REGEX),
-                                focus_handle.clone(),
-                                cx.listener(|this, _, window, cx| {
-                                    this.toggle_regex(&ToggleRegex, window, cx)
-                                }),
-                            ))
+                            div.child(
+                                SearchOption::Regex
+                                    .as_button(self.search_options, focus_handle.clone()),
+                            )
                         }),
                 )
             });
@@ -248,13 +237,13 @@ impl Render for BufferSearchBar {
             .gap_1()
             .min_w_64()
             .when(replacement, |this| {
-                this.child(toggle_replace_button(
-                    "buffer-search-bar-toggle-replace-button",
-                    focus_handle.clone(),
+                this.child(render_action_button(
+                    "buffer-search-bar-toggle",
+                    IconName::Replace,
                     self.replace_enabled,
-                    cx.listener(|this, _: &ClickEvent, window, cx| {
-                        this.toggle_replace(&ToggleReplace, window, cx);
-                    }),
+                    "Toggle Replace",
+                    &ToggleReplace,
+                    focus_handle.clone(),
                 ))
             })
             .when(selection, |this| {
diff --git a/crates/search/src/mode.rs b/crates/search/src/mode.rs
deleted file mode 100644
index 957eb707a5..0000000000
--- a/crates/search/src/mode.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use gpui::{Action, SharedString};
-
-use crate::{ActivateRegexMode, ActivateTextMode};
-
-// TODO: Update the default search mode to get from config
-#[derive(Copy, Clone, Debug, Default, PartialEq)]
-pub enum SearchMode {
-    #[default]
-    Text,
-    Regex,
-}
-
-impl SearchMode {
-    pub(crate) fn label(&self) -> &'static str {
-        match self {
-            SearchMode::Text => "Text",
-            SearchMode::Regex => "Regex",
-        }
-    }
-    pub(crate) fn tooltip(&self) -> SharedString {
-        format!("Activate {} Mode", self.label()).into()
-    }
-    pub(crate) fn action(&self) -> Box<dyn Action> {
-        match self {
-            SearchMode::Text => ActivateTextMode.boxed_clone(),
-            SearchMode::Regex => ActivateRegexMode.boxed_clone(),
-        }
-    }
-}
-
-pub(crate) fn next_mode(mode: &SearchMode) -> SearchMode {
-    match mode {
-        SearchMode::Text => SearchMode::Regex,
-        SearchMode::Regex => SearchMode::Text,
-    }
-}
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 9e8afa4392..6b9777906a 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1,11 +1,9 @@
 use crate::{
     BufferSearchBar, FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext,
-    SearchOptions, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive, ToggleIncludeIgnored,
-    ToggleRegex, ToggleReplace, ToggleWholeWord,
+    SearchOption, SearchOptions, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive,
+    ToggleIncludeIgnored, ToggleRegex, ToggleReplace, ToggleWholeWord,
     buffer_search::Deploy,
-    search_bar::{
-        input_base_styles, render_action_button, render_text_input, toggle_replace_button,
-    },
+    search_bar::{input_base_styles, render_action_button, render_text_input},
 };
 use anyhow::Context as _;
 use collections::HashMap;
@@ -1784,14 +1782,6 @@ impl ProjectSearchBar {
         }
     }
 
-    fn is_option_enabled(&self, option: SearchOptions, cx: &App) -> bool {
-        if let Some(search) = self.active_project_search.as_ref() {
-            search.read(cx).search_options.contains(option)
-        } else {
-            false
-        }
-    }
-
     fn next_history_query(
         &mut self,
         _: &NextHistoryQuery,
@@ -1972,27 +1962,17 @@ impl Render for ProjectSearchBar {
             .child(
                 h_flex()
                     .gap_1()
-                    .child(SearchOptions::CASE_SENSITIVE.as_button(
-                        self.is_option_enabled(SearchOptions::CASE_SENSITIVE, cx),
-                        focus_handle.clone(),
-                        cx.listener(|this, _, window, cx| {
-                            this.toggle_search_option(SearchOptions::CASE_SENSITIVE, window, cx);
-                        }),
-                    ))
-                    .child(SearchOptions::WHOLE_WORD.as_button(
-                        self.is_option_enabled(SearchOptions::WHOLE_WORD, cx),
-                        focus_handle.clone(),
-                        cx.listener(|this, _, window, cx| {
-                            this.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-                        }),
-                    ))
-                    .child(SearchOptions::REGEX.as_button(
-                        self.is_option_enabled(SearchOptions::REGEX, cx),
-                        focus_handle.clone(),
-                        cx.listener(|this, _, window, cx| {
-                            this.toggle_search_option(SearchOptions::REGEX, window, cx);
-                        }),
-                    )),
+                    .child(
+                        SearchOption::CaseSensitive
+                            .as_button(search.search_options, focus_handle.clone()),
+                    )
+                    .child(
+                        SearchOption::WholeWord
+                            .as_button(search.search_options, focus_handle.clone()),
+                    )
+                    .child(
+                        SearchOption::Regex.as_button(search.search_options, focus_handle.clone()),
+                    ),
             );
 
         let mode_column = h_flex()
@@ -2026,16 +2006,16 @@ impl Render for ProjectSearchBar {
                         }
                     }),
             )
-            .child(toggle_replace_button(
-                "project-search-toggle-replace",
-                focus_handle.clone(),
+            .child(render_action_button(
+                "project-search",
+                IconName::Replace,
                 self.active_project_search
                     .as_ref()
                     .map(|search| search.read(cx).replace_enabled)
                     .unwrap_or_default(),
-                cx.listener(|this, _, window, cx| {
-                    this.toggle_replace(&ToggleReplace, window, cx);
-                }),
+                "Toggle Replace",
+                &ToggleReplace,
+                focus_handle.clone(),
             ));
 
         let query_focus = search.query_editor.focus_handle(cx);
@@ -2149,15 +2129,8 @@ impl Render for ProjectSearchBar {
                         })),
                 )
                 .child(
-                    SearchOptions::INCLUDE_IGNORED.as_button(
-                        search
-                            .search_options
-                            .contains(SearchOptions::INCLUDE_IGNORED),
-                        focus_handle.clone(),
-                        cx.listener(|this, _, window, cx| {
-                            this.toggle_search_option(SearchOptions::INCLUDE_IGNORED, window, cx);
-                        }),
-                    ),
+                    SearchOption::IncludeIgnored
+                        .as_button(search.search_options, focus_handle.clone()),
                 );
             h_flex()
                 .w_full()
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index 5f57bfb4b1..89064e0a27 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -9,6 +9,8 @@ use ui::{Tooltip, prelude::*};
 use workspace::notifications::NotificationId;
 use workspace::{Toast, Workspace};
 
+pub use search_status_button::SEARCH_ICON;
+
 pub mod buffer_search;
 pub mod project_search;
 pub(crate) mod search_bar;
@@ -59,48 +61,87 @@ actions!(
 bitflags! {
     #[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
     pub struct SearchOptions: u8 {
-        const NONE = 0b000;
-        const WHOLE_WORD = 0b001;
-        const CASE_SENSITIVE = 0b010;
-        const INCLUDE_IGNORED = 0b100;
-        const REGEX = 0b1000;
-        const ONE_MATCH_PER_LINE = 0b100000;
+        const NONE = 0;
+        const WHOLE_WORD = 1 << SearchOption::WholeWord as u8;
+        const CASE_SENSITIVE = 1 << SearchOption::CaseSensitive as u8;
+        const INCLUDE_IGNORED = 1 << SearchOption::IncludeIgnored as u8;
+        const REGEX = 1 << SearchOption::Regex as u8;
+        const ONE_MATCH_PER_LINE = 1 << SearchOption::OneMatchPerLine as u8;
         /// If set, reverse direction when finding the active match
-        const BACKWARDS = 0b10000;
+        const BACKWARDS = 1 << SearchOption::Backwards as u8;
     }
 }
 
-impl SearchOptions {
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+pub enum SearchOption {
+    WholeWord = 0,
+    CaseSensitive,
+    IncludeIgnored,
+    Regex,
+    OneMatchPerLine,
+    Backwards,
+}
+
+impl SearchOption {
+    pub fn as_options(self) -> SearchOptions {
+        SearchOptions::from_bits(1 << self as u8).unwrap()
+    }
+
     pub fn label(&self) -> &'static str {
-        match *self {
-            SearchOptions::WHOLE_WORD => "Match Whole Words",
-            SearchOptions::CASE_SENSITIVE => "Match Case Sensitively",
-            SearchOptions::INCLUDE_IGNORED => "Also search files ignored by configuration",
-            SearchOptions::REGEX => "Use Regular Expressions",
-            _ => panic!("{:?} is not a named SearchOption", self),
+        match self {
+            SearchOption::WholeWord => "Match Whole Words",
+            SearchOption::CaseSensitive => "Match Case Sensitively",
+            SearchOption::IncludeIgnored => "Also search files ignored by configuration",
+            SearchOption::Regex => "Use Regular Expressions",
+            SearchOption::OneMatchPerLine => "One Match Per Line",
+            SearchOption::Backwards => "Search Backwards",
         }
     }
 
     pub fn icon(&self) -> ui::IconName {
-        match *self {
-            SearchOptions::WHOLE_WORD => ui::IconName::WholeWord,
-            SearchOptions::CASE_SENSITIVE => ui::IconName::CaseSensitive,
-            SearchOptions::INCLUDE_IGNORED => ui::IconName::Sliders,
-            SearchOptions::REGEX => ui::IconName::Regex,
-            _ => panic!("{:?} is not a named SearchOption", self),
+        match self {
+            SearchOption::WholeWord => ui::IconName::WholeWord,
+            SearchOption::CaseSensitive => ui::IconName::CaseSensitive,
+            SearchOption::IncludeIgnored => ui::IconName::Sliders,
+            SearchOption::Regex => ui::IconName::Regex,
+            _ => panic!("{self:?} is not a named SearchOption"),
         }
     }
 
-    pub fn to_toggle_action(&self) -> Box<dyn Action + Sync + Send + 'static> {
+    pub fn to_toggle_action(&self) -> &'static dyn Action {
         match *self {
-            SearchOptions::WHOLE_WORD => Box::new(ToggleWholeWord),
-            SearchOptions::CASE_SENSITIVE => Box::new(ToggleCaseSensitive),
-            SearchOptions::INCLUDE_IGNORED => Box::new(ToggleIncludeIgnored),
-            SearchOptions::REGEX => Box::new(ToggleRegex),
-            _ => panic!("{:?} is not a named SearchOption", self),
+            SearchOption::WholeWord => &ToggleWholeWord,
+            SearchOption::CaseSensitive => &ToggleCaseSensitive,
+            SearchOption::IncludeIgnored => &ToggleIncludeIgnored,
+            SearchOption::Regex => &ToggleRegex,
+            _ => panic!("{self:?} is not a toggle action"),
         }
     }
 
+    pub fn as_button(&self, active: SearchOptions, focus_handle: FocusHandle) -> impl IntoElement {
+        let action = self.to_toggle_action();
+        let label = self.label();
+        IconButton::new(label, self.icon())
+            .on_click({
+                let focus_handle = focus_handle.clone();
+                move |_, window, cx| {
+                    if !focus_handle.is_focused(&window) {
+                        window.focus(&focus_handle);
+                    }
+                    window.dispatch_action(action.boxed_clone(), cx)
+                }
+            })
+            .style(ButtonStyle::Subtle)
+            .shape(IconButtonShape::Square)
+            .toggle_state(active.contains(self.as_options()))
+            .tooltip({
+                move |window, cx| Tooltip::for_action_in(label, action, &focus_handle, window, cx)
+            })
+    }
+}
+
+impl SearchOptions {
     pub fn none() -> SearchOptions {
         SearchOptions::NONE
     }
@@ -122,24 +163,6 @@ impl SearchOptions {
         options.set(SearchOptions::REGEX, settings.regex);
         options
     }
-
-    pub fn as_button<Action: Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static>(
-        &self,
-        active: bool,
-        focus_handle: FocusHandle,
-        action: Action,
-    ) -> impl IntoElement + use<Action> {
-        IconButton::new(self.label(), self.icon())
-            .on_click(action)
-            .style(ButtonStyle::Subtle)
-            .shape(IconButtonShape::Square)
-            .toggle_state(active)
-            .tooltip({
-                let action = self.to_toggle_action();
-                let label = self.label();
-                move |window, cx| Tooltip::for_action_in(label, &*action, &focus_handle, window, cx)
-            })
-    }
 }
 
 pub(crate) fn show_no_more_matches(window: &mut Window, cx: &mut App) {
diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs
index 2805b0c62d..094ce3638e 100644
--- a/crates/search/src/search_bar.rs
+++ b/crates/search/src/search_bar.rs
@@ -5,8 +5,6 @@ use theme::ThemeSettings;
 use ui::{IconButton, IconButtonShape};
 use ui::{Tooltip, prelude::*};
 
-use crate::ToggleReplace;
-
 pub(super) fn render_action_button(
     id_prefix: &'static str,
     icon: ui::IconName,
@@ -46,25 +44,6 @@ pub(crate) fn input_base_styles(border_color: Hsla, map: impl FnOnce(Div) -> Div
         .rounded_lg()
 }
 
-pub(crate) fn toggle_replace_button(
-    id: &'static str,
-    focus_handle: FocusHandle,
-    replace_enabled: bool,
-    on_click: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
-) -> IconButton {
-    IconButton::new(id, IconName::Replace)
-        .shape(IconButtonShape::Square)
-        .style(ButtonStyle::Subtle)
-        .when(replace_enabled, |button| button.style(ButtonStyle::Filled))
-        .on_click(on_click)
-        .toggle_state(replace_enabled)
-        .tooltip({
-            move |window, cx| {
-                Tooltip::for_action_in("Toggle Replace", &ToggleReplace, &focus_handle, window, cx)
-            }
-        })
-}
-
 pub(crate) fn render_text_input(
     editor: &Entity<Editor>,
     color_override: Option<Color>,
diff --git a/crates/search/src/search_status_button.rs b/crates/search/src/search_status_button.rs
index ff2ee1641d..fcf36e86fa 100644
--- a/crates/search/src/search_status_button.rs
+++ b/crates/search/src/search_status_button.rs
@@ -3,6 +3,8 @@ use settings::Settings as _;
 use ui::{ButtonCommon, Clickable, Context, Render, Tooltip, Window, prelude::*};
 use workspace::{ItemHandle, StatusItemView};
 
+pub const SEARCH_ICON: IconName = IconName::MagnifyingGlass;
+
 pub struct SearchButton;
 
 impl SearchButton {
@@ -20,7 +22,7 @@ impl Render for SearchButton {
         }
 
         button.child(
-            IconButton::new("project-search-indicator", IconName::MagnifyingGlass)
+            IconButton::new("project-search-indicator", SEARCH_ICON)
                 .icon_size(IconSize::Small)
                 .tooltip(|window, cx| {
                     Tooltip::for_action(
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index e76bef59a3..2b7c38f997 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -140,7 +140,7 @@ impl Render for QuickActionBar {
         let search_button = editor.is_singleton(cx).then(|| {
             QuickActionBarButton::new(
                 "toggle buffer search",
-                IconName::MagnifyingGlass,
+                search::SEARCH_ICON,
                 !self.buffer_search_bar.read(cx).is_dismissed(),
                 Box::new(buffer_search::Deploy::find()),
                 focus_handle.clone(),

From 2a57b160b03c8e8543fdae12a0c191ed1a985e54 Mon Sep 17 00:00:00 2001
From: Oleksiy Syvokon <oleksiy@zed.dev>
Date: Fri, 15 Aug 2025 13:54:24 +0300
Subject: [PATCH 047/823] openai: Don't send prompt_cache_key for
 OpenAI-compatible models (#36231)

Some APIs fail when they get this parameter

Closes #36215

Release Notes:

- Fixed OpenAI-compatible providers that don't support prompt caching
and/or reasoning
---
 crates/language_models/src/provider/cloud.rs              | 1 +
 crates/language_models/src/provider/open_ai.rs            | 8 +++++++-
 crates/language_models/src/provider/open_ai_compatible.rs | 5 ++++-
 crates/language_models/src/provider/vercel.rs             | 1 +
 crates/language_models/src/provider/x_ai.rs               | 1 +
 crates/open_ai/src/open_ai.rs                             | 7 +++++++
 crates/vercel/src/vercel.rs                               | 4 ++++
 crates/x_ai/src/x_ai.rs                                   | 4 ++++
 8 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index ff8048040e..c1337399f9 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -941,6 +941,7 @@ impl LanguageModel for CloudLanguageModel {
                     request,
                     model.id(),
                     model.supports_parallel_tool_calls(),
+                    model.supports_prompt_cache_key(),
                     None,
                     None,
                 );
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index 725027b2a7..eaf8d885b3 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -370,6 +370,7 @@ impl LanguageModel for OpenAiLanguageModel {
             request,
             self.model.id(),
             self.model.supports_parallel_tool_calls(),
+            self.model.supports_prompt_cache_key(),
             self.max_output_tokens(),
             self.model.reasoning_effort(),
         );
@@ -386,6 +387,7 @@ pub fn into_open_ai(
     request: LanguageModelRequest,
     model_id: &str,
     supports_parallel_tool_calls: bool,
+    supports_prompt_cache_key: bool,
     max_output_tokens: Option<u64>,
     reasoning_effort: Option<ReasoningEffort>,
 ) -> open_ai::Request {
@@ -477,7 +479,11 @@ pub fn into_open_ai(
         } else {
             None
         },
-        prompt_cache_key: request.thread_id,
+        prompt_cache_key: if supports_prompt_cache_key {
+            request.thread_id
+        } else {
+            None
+        },
         tools: request
             .tools
             .into_iter()
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index 6e912765cd..5f546f5219 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -355,10 +355,13 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
+        let supports_parallel_tool_call = true;
+        let supports_prompt_cache_key = false;
         let request = into_open_ai(
             request,
             &self.model.name,
-            true,
+            supports_parallel_tool_call,
+            supports_prompt_cache_key,
             self.max_output_tokens(),
             None,
         );
diff --git a/crates/language_models/src/provider/vercel.rs b/crates/language_models/src/provider/vercel.rs
index 57a89ba4aa..9f447cb68b 100644
--- a/crates/language_models/src/provider/vercel.rs
+++ b/crates/language_models/src/provider/vercel.rs
@@ -355,6 +355,7 @@ impl LanguageModel for VercelLanguageModel {
             request,
             self.model.id(),
             self.model.supports_parallel_tool_calls(),
+            self.model.supports_prompt_cache_key(),
             self.max_output_tokens(),
             None,
         );
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index 5e7190ea96..fed6fe92bf 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -359,6 +359,7 @@ impl LanguageModel for XAiLanguageModel {
             request,
             self.model.id(),
             self.model.supports_parallel_tool_calls(),
+            self.model.supports_prompt_cache_key(),
             self.max_output_tokens(),
             None,
         );
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 8bbe858995..604e8fe622 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -236,6 +236,13 @@ impl Model {
             Self::O1 | Self::O3 | Self::O3Mini | Self::O4Mini | Model::Custom { .. } => false,
         }
     }
+
+    /// Returns whether the given model supports the `prompt_cache_key` parameter.
+    ///
+    /// If the model does not support the parameter, do not pass it up.
+    pub fn supports_prompt_cache_key(&self) -> bool {
+        return true;
+    }
 }
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/crates/vercel/src/vercel.rs b/crates/vercel/src/vercel.rs
index 1ae22c5fef..8686fda53f 100644
--- a/crates/vercel/src/vercel.rs
+++ b/crates/vercel/src/vercel.rs
@@ -71,4 +71,8 @@ impl Model {
             Model::Custom { .. } => false,
         }
     }
+
+    pub fn supports_prompt_cache_key(&self) -> bool {
+        false
+    }
 }
diff --git a/crates/x_ai/src/x_ai.rs b/crates/x_ai/src/x_ai.rs
index ac116b2f8f..23cd5b9320 100644
--- a/crates/x_ai/src/x_ai.rs
+++ b/crates/x_ai/src/x_ai.rs
@@ -105,6 +105,10 @@ impl Model {
         }
     }
 
+    pub fn supports_prompt_cache_key(&self) -> bool {
+        false
+    }
+
     pub fn supports_tool(&self) -> bool {
         match self {
             Self::Grok2Vision

From f8b01052583d3e27fbbbf5f46eb4f5bd5ec279aa Mon Sep 17 00:00:00 2001
From: smit <heysmitbarmase@gmail.com>
Date: Fri, 15 Aug 2025 16:24:54 +0530
Subject: [PATCH 048/823] project: Fix LSP TextDocumentSyncCapability dynamic
 registration (#36234)

Closes #36213

Use `textDocument/didChange`
([docs](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_synchronization))
instead of `textDocument/synchronization`.

Release Notes:

- Fixed an issue where Dart projects were being formatted incorrectly by
the language server.
---
 crates/project/src/lsp_store.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 60d847023f..196f55171a 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11817,14 +11817,16 @@ impl LspStore {
                         notify_server_capabilities_updated(&server, cx);
                     }
                 }
-                "textDocument/synchronization" => {
-                    if let Some(caps) = reg
+                "textDocument/didChange" => {
+                    if let Some(sync_kind) = reg
                         .register_options
-                        .map(serde_json::from_value)
+                        .and_then(|opts| opts.get("syncKind").cloned())
+                        .map(serde_json::from_value::<lsp::TextDocumentSyncKind>)
                         .transpose()?
                     {
                         server.update_capabilities(|capabilities| {
-                            capabilities.text_document_sync = Some(caps);
+                            capabilities.text_document_sync =
+                                Some(lsp::TextDocumentSyncCapability::Kind(sync_kind));
                         });
                         notify_server_capabilities_updated(&server, cx);
                     }
@@ -11974,7 +11976,7 @@ impl LspStore {
                     });
                     notify_server_capabilities_updated(&server, cx);
                 }
-                "textDocument/synchronization" => {
+                "textDocument/didChange" => {
                     server.update_capabilities(|capabilities| {
                         capabilities.text_document_sync = None;
                     });

From 6f3cd42411c64879848d0bc96d838d3bef8c374c Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 15 Aug 2025 13:17:17 +0200
Subject: [PATCH 049/823] agent2: Port Zed AI features (#36172)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/acp_thread/src/acp_thread.rs           | 173 +++++---
 crates/acp_thread/src/connection.rs           |  26 +-
 crates/agent2/src/agent.rs                    | 282 +++++++------
 crates/agent2/src/tests/mod.rs                | 202 +++++++++-
 crates/agent2/src/tests/test_tools.rs         |   2 +-
 crates/agent2/src/thread.rs                   | 186 ++++++---
 crates/agent2/src/tools/edit_file_tool.rs     |   2 +-
 crates/agent_servers/src/acp/v0.rs            |   6 +-
 crates/agent_servers/src/acp/v1.rs            |   6 +-
 crates/agent_servers/src/claude.rs            |   5 +
 crates/agent_ui/src/acp/thread_view.rs        | 376 ++++++++++++++++--
 crates/agent_ui/src/agent_ui.rs               |   1 -
 crates/agent_ui/src/burn_mode_tooltip.rs      |  61 ---
 crates/agent_ui/src/message_editor.rs         |   4 +-
 crates/agent_ui/src/text_thread_editor.rs     |   2 +-
 crates/agent_ui/src/ui/burn_mode_tooltip.rs   |   6 +-
 .../language_model/src/model/cloud_model.rs   |  12 +
 17 files changed, 994 insertions(+), 358 deletions(-)
 delete mode 100644 crates/agent_ui/src/burn_mode_tooltip.rs

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 4005f27a0c..4995ddb9df 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -33,13 +33,23 @@ pub struct UserMessage {
     pub id: Option<UserMessageId>,
     pub content: ContentBlock,
     pub chunks: Vec<acp::ContentBlock>,
-    pub checkpoint: Option<GitStoreCheckpoint>,
+    pub checkpoint: Option<Checkpoint>,
+}
+
+#[derive(Debug)]
+pub struct Checkpoint {
+    git_checkpoint: GitStoreCheckpoint,
+    pub show: bool,
 }
 
 impl UserMessage {
     fn to_markdown(&self, cx: &App) -> String {
         let mut markdown = String::new();
-        if let Some(_) = self.checkpoint {
+        if self
+            .checkpoint
+            .as_ref()
+            .map_or(false, |checkpoint| checkpoint.show)
+        {
             writeln!(markdown, "## User (checkpoint)").unwrap();
         } else {
             writeln!(markdown, "## User").unwrap();
@@ -1145,9 +1155,12 @@ impl AcpThread {
             self.project.read(cx).languages().clone(),
             cx,
         );
+        let request = acp::PromptRequest {
+            prompt: message.clone(),
+            session_id: self.session_id.clone(),
+        };
         let git_store = self.project.read(cx).git_store().clone();
 
-        let old_checkpoint = git_store.update(cx, |git, cx| git.checkpoint(cx));
         let message_id = if self
             .connection
             .session_editor(&self.session_id, cx)
@@ -1161,68 +1174,63 @@ impl AcpThread {
             AgentThreadEntry::UserMessage(UserMessage {
                 id: message_id.clone(),
                 content: block,
-                chunks: message.clone(),
+                chunks: message,
                 checkpoint: None,
             }),
             cx,
         );
+
+        self.run_turn(cx, async move |this, cx| {
+            let old_checkpoint = git_store
+                .update(cx, |git, cx| git.checkpoint(cx))?
+                .await
+                .context("failed to get old checkpoint")
+                .log_err();
+            this.update(cx, |this, cx| {
+                if let Some((_ix, message)) = this.last_user_message() {
+                    message.checkpoint = old_checkpoint.map(|git_checkpoint| Checkpoint {
+                        git_checkpoint,
+                        show: false,
+                    });
+                }
+                this.connection.prompt(message_id, request, cx)
+            })?
+            .await
+        })
+    }
+
+    pub fn resume(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
+        self.run_turn(cx, async move |this, cx| {
+            this.update(cx, |this, cx| {
+                this.connection
+                    .resume(&this.session_id, cx)
+                    .map(|resume| resume.run(cx))
+            })?
+            .context("resuming a session is not supported")?
+            .await
+        })
+    }
+
+    fn run_turn(
+        &mut self,
+        cx: &mut Context<Self>,
+        f: impl 'static + AsyncFnOnce(WeakEntity<Self>, &mut AsyncApp) -> Result<acp::PromptResponse>,
+    ) -> BoxFuture<'static, Result<()>> {
         self.clear_completed_plan_entries(cx);
 
-        let (old_checkpoint_tx, old_checkpoint_rx) = oneshot::channel();
         let (tx, rx) = oneshot::channel();
         let cancel_task = self.cancel(cx);
-        let request = acp::PromptRequest {
-            prompt: message,
-            session_id: self.session_id.clone(),
-        };
 
-        self.send_task = Some(cx.spawn({
-            let message_id = message_id.clone();
-            async move |this, cx| {
-                cancel_task.await;
-
-                old_checkpoint_tx.send(old_checkpoint.await).ok();
-                if let Ok(result) = this.update(cx, |this, cx| {
-                    this.connection.prompt(message_id, request, cx)
-                }) {
-                    tx.send(result.await).log_err();
-                }
-            }
+        self.send_task = Some(cx.spawn(async move |this, cx| {
+            cancel_task.await;
+            tx.send(f(this, cx).await).ok();
         }));
 
         cx.spawn(async move |this, cx| {
-            let old_checkpoint = old_checkpoint_rx
-                .await
-                .map_err(|_| anyhow!("send canceled"))
-                .flatten()
-                .context("failed to get old checkpoint")
-                .log_err();
-
             let response = rx.await;
 
-            if let Some((old_checkpoint, message_id)) = old_checkpoint.zip(message_id) {
-                let new_checkpoint = git_store
-                    .update(cx, |git, cx| git.checkpoint(cx))?
-                    .await
-                    .context("failed to get new checkpoint")
-                    .log_err();
-                if let Some(new_checkpoint) = new_checkpoint {
-                    let equal = git_store
-                        .update(cx, |git, cx| {
-                            git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
-                        })?
-                        .await
-                        .unwrap_or(true);
-                    if !equal {
-                        this.update(cx, |this, cx| {
-                            if let Some((ix, message)) = this.user_message_mut(&message_id) {
-                                message.checkpoint = Some(old_checkpoint);
-                                cx.emit(AcpThreadEvent::EntryUpdated(ix));
-                            }
-                        })?;
-                    }
-                }
-            }
+            this.update(cx, |this, cx| this.update_last_checkpoint(cx))?
+                .await?;
 
             this.update(cx, |this, cx| {
                 match response {
@@ -1294,7 +1302,10 @@ impl AcpThread {
             return Task::ready(Err(anyhow!("message not found")));
         };
 
-        let checkpoint = message.checkpoint.clone();
+        let checkpoint = message
+            .checkpoint
+            .as_ref()
+            .map(|c| c.git_checkpoint.clone());
 
         let git_store = self.project.read(cx).git_store().clone();
         cx.spawn(async move |this, cx| {
@@ -1316,6 +1327,59 @@ impl AcpThread {
         })
     }
 
+    fn update_last_checkpoint(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let git_store = self.project.read(cx).git_store().clone();
+
+        let old_checkpoint = if let Some((_, message)) = self.last_user_message() {
+            if let Some(checkpoint) = message.checkpoint.as_ref() {
+                checkpoint.git_checkpoint.clone()
+            } else {
+                return Task::ready(Ok(()));
+            }
+        } else {
+            return Task::ready(Ok(()));
+        };
+
+        let new_checkpoint = git_store.update(cx, |git, cx| git.checkpoint(cx));
+        cx.spawn(async move |this, cx| {
+            let new_checkpoint = new_checkpoint
+                .await
+                .context("failed to get new checkpoint")
+                .log_err();
+            if let Some(new_checkpoint) = new_checkpoint {
+                let equal = git_store
+                    .update(cx, |git, cx| {
+                        git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
+                    })?
+                    .await
+                    .unwrap_or(true);
+                this.update(cx, |this, cx| {
+                    let (ix, message) = this.last_user_message().context("no user message")?;
+                    let checkpoint = message.checkpoint.as_mut().context("no checkpoint")?;
+                    checkpoint.show = !equal;
+                    cx.emit(AcpThreadEvent::EntryUpdated(ix));
+                    anyhow::Ok(())
+                })??;
+            }
+
+            Ok(())
+        })
+    }
+
+    fn last_user_message(&mut self) -> Option<(usize, &mut UserMessage)> {
+        self.entries
+            .iter_mut()
+            .enumerate()
+            .rev()
+            .find_map(|(ix, entry)| {
+                if let AgentThreadEntry::UserMessage(message) = entry {
+                    Some((ix, message))
+                } else {
+                    None
+                }
+            })
+    }
+
     fn user_message(&self, id: &UserMessageId) -> Option<&UserMessage> {
         self.entries.iter().find_map(|entry| {
             if let AgentThreadEntry::UserMessage(message) = entry {
@@ -1552,6 +1616,7 @@ mod tests {
     use settings::SettingsStore;
     use smol::stream::StreamExt as _;
     use std::{
+        any::Any,
         cell::RefCell,
         path::Path,
         rc::Rc,
@@ -2284,6 +2349,10 @@ mod tests {
                 _session_id: session_id.clone(),
             }))
         }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
     }
 
     struct FakeAgentSessionEditor {
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 0f531acbde..b2116020fb 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use collections::IndexMap;
 use gpui::{Entity, SharedString, Task};
 use project::Project;
-use std::{error::Error, fmt, path::Path, rc::Rc, sync::Arc};
+use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
 use ui::{App, IconName};
 use uuid::Uuid;
 
@@ -36,6 +36,14 @@ pub trait AgentConnection {
         cx: &mut App,
     ) -> Task<Result<acp::PromptResponse>>;
 
+    fn resume(
+        &self,
+        _session_id: &acp::SessionId,
+        _cx: &mut App,
+    ) -> Option<Rc<dyn AgentSessionResume>> {
+        None
+    }
+
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);
 
     fn session_editor(
@@ -53,12 +61,24 @@ pub trait AgentConnection {
     fn model_selector(&self) -> Option<Rc<dyn AgentModelSelector>> {
         None
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
+}
+
+impl dyn AgentConnection {
+    pub fn downcast<T: 'static + AgentConnection + Sized>(self: Rc<Self>) -> Option<Rc<T>> {
+        self.into_any().downcast().ok()
+    }
 }
 
 pub trait AgentSessionEditor {
     fn truncate(&self, message_id: UserMessageId, cx: &mut App) -> Task<Result<()>>;
 }
 
+pub trait AgentSessionResume {
+    fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>>;
+}
+
 #[derive(Debug)]
 pub struct AuthRequired;
 
@@ -299,6 +319,10 @@ mod test_support {
         ) -> Option<Rc<dyn AgentSessionEditor>> {
             Some(Rc::new(StubAgentSessionEditor))
         }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
     }
 
     struct StubAgentSessionEditor;
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 9ac3c2d0e5..358365d11f 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1,9 +1,8 @@
-use crate::{AgentResponseEvent, Thread, templates::Templates};
 use crate::{
-    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DeletePathTool, DiagnosticsTool,
-    EditFileTool, FetchTool, FindPathTool, GrepTool, ListDirectoryTool, MovePathTool, NowTool,
-    OpenTool, ReadFileTool, TerminalTool, ThinkingTool, ToolCallAuthorization, UserMessageContent,
-    WebSearchTool,
+    AgentResponseEvent, ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DeletePathTool,
+    DiagnosticsTool, EditFileTool, FetchTool, FindPathTool, GrepTool, ListDirectoryTool,
+    MovePathTool, NowTool, OpenTool, ReadFileTool, TerminalTool, ThinkingTool, Thread,
+    ToolCallAuthorization, UserMessageContent, WebSearchTool, templates::Templates,
 };
 use acp_thread::AgentModelSelector;
 use agent_client_protocol as acp;
@@ -11,6 +10,7 @@ use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, anyhow};
 use collections::{HashSet, IndexMap};
 use fs::Fs;
+use futures::channel::mpsc;
 use futures::{StreamExt, future};
 use gpui::{
     App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
@@ -21,6 +21,7 @@ use prompt_store::{
     ProjectContext, PromptId, PromptStore, RulesFileContext, UserRulesContext, WorktreeContext,
 };
 use settings::update_settings_file;
+use std::any::Any;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::path::Path;
@@ -426,9 +427,9 @@ impl NativeAgent {
         self.models.refresh_list(cx);
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, _| {
-                let model_id = LanguageModels::model_id(&thread.selected_model);
+                let model_id = LanguageModels::model_id(&thread.model());
                 if let Some(model) = self.models.model_from_id(&model_id) {
-                    thread.selected_model = model.clone();
+                    thread.set_model(model.clone());
                 }
             });
         }
@@ -439,6 +440,124 @@ impl NativeAgent {
 #[derive(Clone)]
 pub struct NativeAgentConnection(pub Entity<NativeAgent>);
 
+impl NativeAgentConnection {
+    pub fn thread(&self, session_id: &acp::SessionId, cx: &App) -> Option<Entity<Thread>> {
+        self.0
+            .read(cx)
+            .sessions
+            .get(session_id)
+            .map(|session| session.thread.clone())
+    }
+
+    fn run_turn(
+        &self,
+        session_id: acp::SessionId,
+        cx: &mut App,
+        f: impl 'static
+        + FnOnce(
+            Entity<Thread>,
+            &mut App,
+        ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>>,
+    ) -> Task<Result<acp::PromptResponse>> {
+        let Some((thread, acp_thread)) = self.0.update(cx, |agent, _cx| {
+            agent
+                .sessions
+                .get_mut(&session_id)
+                .map(|s| (s.thread.clone(), s.acp_thread.clone()))
+        }) else {
+            return Task::ready(Err(anyhow!("Session not found")));
+        };
+        log::debug!("Found session for: {}", session_id);
+
+        let mut response_stream = match f(thread, cx) {
+            Ok(stream) => stream,
+            Err(err) => return Task::ready(Err(err)),
+        };
+        cx.spawn(async move |cx| {
+            // Handle response stream and forward to session.acp_thread
+            while let Some(result) = response_stream.next().await {
+                match result {
+                    Ok(event) => {
+                        log::trace!("Received completion event: {:?}", event);
+
+                        match event {
+                            AgentResponseEvent::Text(text) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    thread.push_assistant_content_block(
+                                        acp::ContentBlock::Text(acp::TextContent {
+                                            text,
+                                            annotations: None,
+                                        }),
+                                        false,
+                                        cx,
+                                    )
+                                })?;
+                            }
+                            AgentResponseEvent::Thinking(text) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    thread.push_assistant_content_block(
+                                        acp::ContentBlock::Text(acp::TextContent {
+                                            text,
+                                            annotations: None,
+                                        }),
+                                        true,
+                                        cx,
+                                    )
+                                })?;
+                            }
+                            AgentResponseEvent::ToolCallAuthorization(ToolCallAuthorization {
+                                tool_call,
+                                options,
+                                response,
+                            }) => {
+                                let recv = acp_thread.update(cx, |thread, cx| {
+                                    thread.request_tool_call_authorization(tool_call, options, cx)
+                                })?;
+                                cx.background_spawn(async move {
+                                    if let Some(option) = recv
+                                        .await
+                                        .context("authorization sender was dropped")
+                                        .log_err()
+                                    {
+                                        response
+                                            .send(option)
+                                            .map(|_| anyhow!("authorization receiver was dropped"))
+                                            .log_err();
+                                    }
+                                })
+                                .detach();
+                            }
+                            AgentResponseEvent::ToolCall(tool_call) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    thread.upsert_tool_call(tool_call, cx)
+                                })?;
+                            }
+                            AgentResponseEvent::ToolCallUpdate(update) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    thread.update_tool_call(update, cx)
+                                })??;
+                            }
+                            AgentResponseEvent::Stop(stop_reason) => {
+                                log::debug!("Assistant message complete: {:?}", stop_reason);
+                                return Ok(acp::PromptResponse { stop_reason });
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        log::error!("Error in model response stream: {:?}", e);
+                        return Err(e);
+                    }
+                }
+            }
+
+            log::info!("Response stream completed");
+            anyhow::Ok(acp::PromptResponse {
+                stop_reason: acp::StopReason::EndTurn,
+            })
+        })
+    }
+}
+
 impl AgentModelSelector for NativeAgentConnection {
     fn list_models(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
         log::debug!("NativeAgentConnection::list_models called");
@@ -472,7 +591,7 @@ impl AgentModelSelector for NativeAgentConnection {
         };
 
         thread.update(cx, |thread, _cx| {
-            thread.selected_model = model.clone();
+            thread.set_model(model.clone());
         });
 
         update_settings_file::<AgentSettings>(
@@ -502,7 +621,7 @@ impl AgentModelSelector for NativeAgentConnection {
         else {
             return Task::ready(Err(anyhow!("Session not found")));
         };
-        let model = thread.read(cx).selected_model.clone();
+        let model = thread.read(cx).model().clone();
         let Some(provider) = LanguageModelRegistry::read_global(cx).provider(&model.provider_id())
         else {
             return Task::ready(Err(anyhow!("Provider not found")));
@@ -644,25 +763,10 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
     ) -> Task<Result<acp::PromptResponse>> {
         let id = id.expect("UserMessageId is required");
         let session_id = params.session_id.clone();
-        let agent = self.0.clone();
         log::info!("Received prompt request for session: {}", session_id);
         log::debug!("Prompt blocks count: {}", params.prompt.len());
 
-        cx.spawn(async move |cx| {
-            // Get session
-            let (thread, acp_thread) = agent
-                .update(cx, |agent, _| {
-                    agent
-                        .sessions
-                        .get_mut(&session_id)
-                        .map(|s| (s.thread.clone(), s.acp_thread.clone()))
-                })?
-                .ok_or_else(|| {
-                    log::error!("Session not found: {}", session_id);
-                    anyhow::anyhow!("Session not found")
-                })?;
-            log::debug!("Found session for: {}", session_id);
-
+        self.run_turn(session_id, cx, |thread, cx| {
             let content: Vec<UserMessageContent> = params
                 .prompt
                 .into_iter()
@@ -672,99 +776,27 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
             log::debug!("Message id: {:?}", id);
             log::debug!("Message content: {:?}", content);
 
-            // Get model using the ModelSelector capability (always available for agent2)
-            // Get the selected model from the thread directly
-            let model = thread.read_with(cx, |thread, _| thread.selected_model.clone())?;
-
-            // Send to thread
-            log::info!("Sending message to thread with model: {:?}", model.name());
-            let mut response_stream =
-                thread.update(cx, |thread, cx| thread.send(id, content, cx))?;
-
-            // Handle response stream and forward to session.acp_thread
-            while let Some(result) = response_stream.next().await {
-                match result {
-                    Ok(event) => {
-                        log::trace!("Received completion event: {:?}", event);
-
-                        match event {
-                            AgentResponseEvent::Text(text) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(
-                                        acp::ContentBlock::Text(acp::TextContent {
-                                            text,
-                                            annotations: None,
-                                        }),
-                                        false,
-                                        cx,
-                                    )
-                                })?;
-                            }
-                            AgentResponseEvent::Thinking(text) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(
-                                        acp::ContentBlock::Text(acp::TextContent {
-                                            text,
-                                            annotations: None,
-                                        }),
-                                        true,
-                                        cx,
-                                    )
-                                })?;
-                            }
-                            AgentResponseEvent::ToolCallAuthorization(ToolCallAuthorization {
-                                tool_call,
-                                options,
-                                response,
-                            }) => {
-                                let recv = acp_thread.update(cx, |thread, cx| {
-                                    thread.request_tool_call_authorization(tool_call, options, cx)
-                                })?;
-                                cx.background_spawn(async move {
-                                    if let Some(option) = recv
-                                        .await
-                                        .context("authorization sender was dropped")
-                                        .log_err()
-                                    {
-                                        response
-                                            .send(option)
-                                            .map(|_| anyhow!("authorization receiver was dropped"))
-                                            .log_err();
-                                    }
-                                })
-                                .detach();
-                            }
-                            AgentResponseEvent::ToolCall(tool_call) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.upsert_tool_call(tool_call, cx)
-                                })?;
-                            }
-                            AgentResponseEvent::ToolCallUpdate(update) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.update_tool_call(update, cx)
-                                })??;
-                            }
-                            AgentResponseEvent::Stop(stop_reason) => {
-                                log::debug!("Assistant message complete: {:?}", stop_reason);
-                                return Ok(acp::PromptResponse { stop_reason });
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        log::error!("Error in model response stream: {:?}", e);
-                        // TODO: Consider sending an error message to the UI
-                        break;
-                    }
-                }
-            }
-
-            log::info!("Response stream completed");
-            anyhow::Ok(acp::PromptResponse {
-                stop_reason: acp::StopReason::EndTurn,
-            })
+            Ok(thread.update(cx, |thread, cx| {
+                log::info!(
+                    "Sending message to thread with model: {:?}",
+                    thread.model().name()
+                );
+                thread.send(id, content, cx)
+            }))
         })
     }
 
+    fn resume(
+        &self,
+        session_id: &acp::SessionId,
+        _cx: &mut App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionResume>> {
+        Some(Rc::new(NativeAgentSessionResume {
+            connection: self.clone(),
+            session_id: session_id.clone(),
+        }) as _)
+    }
+
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
         log::info!("Cancelling on session: {}", session_id);
         self.0.update(cx, |agent, cx| {
@@ -786,6 +818,10 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                 .map(|session| Rc::new(NativeAgentSessionEditor(session.thread.clone())) as _)
         })
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
 
 struct NativeAgentSessionEditor(Entity<Thread>);
@@ -796,6 +832,20 @@ impl acp_thread::AgentSessionEditor for NativeAgentSessionEditor {
     }
 }
 
+struct NativeAgentSessionResume {
+    connection: NativeAgentConnection,
+    session_id: acp::SessionId,
+}
+
+impl acp_thread::AgentSessionResume for NativeAgentSessionResume {
+    fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>> {
+        self.connection
+            .run_turn(self.session_id.clone(), cx, |thread, cx| {
+                thread.update(cx, |thread, cx| thread.resume(cx))
+            })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -957,7 +1007,7 @@ mod tests {
         agent.read_with(cx, |agent, _| {
             let session = agent.sessions.get(&session_id).unwrap();
             session.thread.read_with(cx, |thread, _| {
-                assert_eq!(thread.selected_model.id().0, "fake");
+                assert_eq!(thread.model().id().0, "fake");
             });
         });
 
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 1df664c029..cf90c8f650 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -12,9 +12,9 @@ use gpui::{
 };
 use indoc::indoc;
 use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
-    LanguageModelRegistry, LanguageModelToolResult, LanguageModelToolUse, Role, StopReason,
-    fake_provider::FakeLanguageModel,
+    LanguageModel, LanguageModelCompletionEvent, LanguageModelId, LanguageModelRegistry,
+    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse, MessageContent,
+    Role, StopReason, fake_provider::FakeLanguageModel,
 };
 use project::Project;
 use prompt_store::ProjectContext;
@@ -394,8 +394,194 @@ async fn test_tool_hallucination(cx: &mut TestAppContext) {
     assert_eq!(update.fields.status, Some(acp::ToolCallStatus::Failed));
 }
 
+#[gpui::test]
+async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let events = thread.update(cx, |thread, cx| {
+        thread.add_tool(EchoTool);
+        thread.send(UserMessageId::new(), ["abc"], cx)
+    });
+    cx.run_until_parked();
+    let tool_use = LanguageModelToolUse {
+        id: "tool_id_1".into(),
+        name: EchoTool.name().into(),
+        raw_input: "{}".into(),
+        input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
+        is_input_complete: true,
+    };
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
+    fake_model.end_last_completion_stream();
+
+    cx.run_until_parked();
+    let completion = fake_model.pending_completions().pop().unwrap();
+    let tool_result = LanguageModelToolResult {
+        tool_use_id: "tool_id_1".into(),
+        tool_name: EchoTool.name().into(),
+        is_error: false,
+        content: "def".into(),
+        output: Some("def".into()),
+    };
+    assert_eq!(
+        completion.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["abc".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![MessageContent::ToolUse(tool_use.clone())],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::ToolResult(tool_result.clone())],
+                cache: false
+            },
+        ]
+    );
+
+    // Simulate reaching tool use limit.
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::StatusUpdate(
+        cloud_llm_client::CompletionRequestStatus::ToolUseLimitReached,
+    ));
+    fake_model.end_last_completion_stream();
+    let last_event = events.collect::<Vec<_>>().await.pop().unwrap();
+    assert!(
+        last_event
+            .unwrap_err()
+            .is::<language_model::ToolUseLimitReachedError>()
+    );
+
+    let events = thread.update(cx, |thread, cx| thread.resume(cx)).unwrap();
+    cx.run_until_parked();
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        completion.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["abc".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![MessageContent::ToolUse(tool_use)],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::ToolResult(tool_result)],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Continue where you left off".into()],
+                cache: false
+            }
+        ]
+    );
+
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text("Done".into()));
+    fake_model.end_last_completion_stream();
+    events.collect::<Vec<_>>().await;
+    thread.read_with(cx, |thread, _cx| {
+        assert_eq!(
+            thread.last_message().unwrap().to_markdown(),
+            indoc! {"
+                ## Assistant
+
+                Done
+            "}
+        )
+    });
+
+    // Ensure we error if calling resume when tool use limit was *not* reached.
+    let error = thread
+        .update(cx, |thread, cx| thread.resume(cx))
+        .unwrap_err();
+    assert_eq!(
+        error.to_string(),
+        "can only resume after tool use limit is reached"
+    )
+}
+
+#[gpui::test]
+async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let events = thread.update(cx, |thread, cx| {
+        thread.add_tool(EchoTool);
+        thread.send(UserMessageId::new(), ["abc"], cx)
+    });
+    cx.run_until_parked();
+
+    let tool_use = LanguageModelToolUse {
+        id: "tool_id_1".into(),
+        name: EchoTool.name().into(),
+        raw_input: "{}".into(),
+        input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
+        is_input_complete: true,
+    };
+    let tool_result = LanguageModelToolResult {
+        tool_use_id: "tool_id_1".into(),
+        tool_name: EchoTool.name().into(),
+        is_error: false,
+        content: "def".into(),
+        output: Some("def".into()),
+    };
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::StatusUpdate(
+        cloud_llm_client::CompletionRequestStatus::ToolUseLimitReached,
+    ));
+    fake_model.end_last_completion_stream();
+    let last_event = events.collect::<Vec<_>>().await.pop().unwrap();
+    assert!(
+        last_event
+            .unwrap_err()
+            .is::<language_model::ToolUseLimitReachedError>()
+    );
+
+    thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), vec!["ghi"], cx)
+    });
+    cx.run_until_parked();
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        completion.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["abc".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![MessageContent::ToolUse(tool_use)],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::ToolResult(tool_result)],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["ghi".into()],
+                cache: false
+            }
+        ]
+    );
+}
+
 async fn expect_tool_call(
-    events: &mut UnboundedReceiver<Result<AgentResponseEvent, LanguageModelCompletionError>>,
+    events: &mut UnboundedReceiver<Result<AgentResponseEvent>>,
 ) -> acp::ToolCall {
     let event = events
         .next()
@@ -411,7 +597,7 @@ async fn expect_tool_call(
 }
 
 async fn expect_tool_call_update_fields(
-    events: &mut UnboundedReceiver<Result<AgentResponseEvent, LanguageModelCompletionError>>,
+    events: &mut UnboundedReceiver<Result<AgentResponseEvent>>,
 ) -> acp::ToolCallUpdate {
     let event = events
         .next()
@@ -429,7 +615,7 @@ async fn expect_tool_call_update_fields(
 }
 
 async fn next_tool_call_authorization(
-    events: &mut UnboundedReceiver<Result<AgentResponseEvent, LanguageModelCompletionError>>,
+    events: &mut UnboundedReceiver<Result<AgentResponseEvent>>,
 ) -> ToolCallAuthorization {
     loop {
         let event = events
@@ -1007,9 +1193,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
 }
 
 /// Filters out the stop events for asserting against in tests
-fn stop_events(
-    result_events: Vec<Result<AgentResponseEvent, LanguageModelCompletionError>>,
-) -> Vec<acp::StopReason> {
+fn stop_events(result_events: Vec<Result<AgentResponseEvent>>) -> Vec<acp::StopReason> {
     result_events
         .into_iter()
         .filter_map(|event| match event.unwrap() {
diff --git a/crates/agent2/src/tests/test_tools.rs b/crates/agent2/src/tests/test_tools.rs
index 7c7b81f52f..cbff44cedf 100644
--- a/crates/agent2/src/tests/test_tools.rs
+++ b/crates/agent2/src/tests/test_tools.rs
@@ -7,7 +7,7 @@ use std::future;
 #[derive(JsonSchema, Serialize, Deserialize)]
 pub struct EchoToolInput {
     /// The text to echo.
-    text: String,
+    pub text: String,
 }
 
 pub struct EchoTool;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 260aaaf550..231ee92dda 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -2,10 +2,10 @@ use crate::{ContextServerRegistry, SystemPromptTemplate, Template, Templates};
 use acp_thread::{MentionUri, UserMessageId};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
-use agent_settings::{AgentProfileId, AgentSettings};
+use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
-use cloud_llm_client::{CompletionIntent, CompletionMode};
+use cloud_llm_client::{CompletionIntent, CompletionRequestStatus};
 use collections::IndexMap;
 use fs::Fs;
 use futures::{
@@ -14,10 +14,10 @@ use futures::{
 };
 use gpui::{App, Context, Entity, SharedString, Task};
 use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelImage,
-    LanguageModelProviderId, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolResultContent,
-    LanguageModelToolSchemaFormat, LanguageModelToolUse, LanguageModelToolUseId, Role, StopReason,
+    LanguageModel, LanguageModelCompletionEvent, LanguageModelImage, LanguageModelProviderId,
+    LanguageModelRequest, LanguageModelRequestMessage, LanguageModelRequestTool,
+    LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolSchemaFormat,
+    LanguageModelToolUse, LanguageModelToolUseId, Role, StopReason,
 };
 use project::Project;
 use prompt_store::ProjectContext;
@@ -33,6 +33,7 @@ use util::{ResultExt, markdown::MarkdownCodeBlock};
 pub enum Message {
     User(UserMessage),
     Agent(AgentMessage),
+    Resume,
 }
 
 impl Message {
@@ -47,6 +48,7 @@ impl Message {
         match self {
             Message::User(message) => message.to_markdown(),
             Message::Agent(message) => message.to_markdown(),
+            Message::Resume => "[resumed after tool use limit was reached]".into(),
         }
     }
 }
@@ -320,7 +322,11 @@ impl AgentMessage {
     }
 
     pub fn to_request(&self) -> Vec<LanguageModelRequestMessage> {
-        let mut content = Vec::with_capacity(self.content.len());
+        let mut assistant_message = LanguageModelRequestMessage {
+            role: Role::Assistant,
+            content: Vec::with_capacity(self.content.len()),
+            cache: false,
+        };
         for chunk in &self.content {
             let chunk = match chunk {
                 AgentMessageContent::Text(text) => {
@@ -342,29 +348,30 @@ impl AgentMessage {
                     language_model::MessageContent::Image(value.clone())
                 }
             };
-            content.push(chunk);
+            assistant_message.content.push(chunk);
         }
 
-        let mut messages = vec![LanguageModelRequestMessage {
-            role: Role::Assistant,
-            content,
+        let mut user_message = LanguageModelRequestMessage {
+            role: Role::User,
+            content: Vec::new(),
             cache: false,
-        }];
+        };
 
-        if !self.tool_results.is_empty() {
-            let mut tool_results = Vec::with_capacity(self.tool_results.len());
-            for tool_result in self.tool_results.values() {
-                tool_results.push(language_model::MessageContent::ToolResult(
+        for tool_result in self.tool_results.values() {
+            user_message
+                .content
+                .push(language_model::MessageContent::ToolResult(
                     tool_result.clone(),
                 ));
-            }
-            messages.push(LanguageModelRequestMessage {
-                role: Role::User,
-                content: tool_results,
-                cache: false,
-            });
         }
 
+        let mut messages = Vec::new();
+        if !assistant_message.content.is_empty() {
+            messages.push(assistant_message);
+        }
+        if !user_message.content.is_empty() {
+            messages.push(user_message);
+        }
         messages
     }
 }
@@ -413,11 +420,12 @@ pub struct Thread {
     running_turn: Option<Task<()>>,
     pending_message: Option<AgentMessage>,
     tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
+    tool_use_limit_reached: bool,
     context_server_registry: Entity<ContextServerRegistry>,
     profile_id: AgentProfileId,
     project_context: Rc<RefCell<ProjectContext>>,
     templates: Arc<Templates>,
-    pub selected_model: Arc<dyn LanguageModel>,
+    model: Arc<dyn LanguageModel>,
     project: Entity<Project>,
     action_log: Entity<ActionLog>,
 }
@@ -429,7 +437,7 @@ impl Thread {
         context_server_registry: Entity<ContextServerRegistry>,
         action_log: Entity<ActionLog>,
         templates: Arc<Templates>,
-        default_model: Arc<dyn LanguageModel>,
+        model: Arc<dyn LanguageModel>,
         cx: &mut Context<Self>,
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
@@ -439,11 +447,12 @@ impl Thread {
             running_turn: None,
             pending_message: None,
             tools: BTreeMap::default(),
+            tool_use_limit_reached: false,
             context_server_registry,
             profile_id,
             project_context,
             templates,
-            selected_model: default_model,
+            model,
             project,
             action_log,
         }
@@ -457,7 +466,19 @@ impl Thread {
         &self.action_log
     }
 
-    pub fn set_mode(&mut self, mode: CompletionMode) {
+    pub fn model(&self) -> &Arc<dyn LanguageModel> {
+        &self.model
+    }
+
+    pub fn set_model(&mut self, model: Arc<dyn LanguageModel>) {
+        self.model = model;
+    }
+
+    pub fn completion_mode(&self) -> CompletionMode {
+        self.completion_mode
+    }
+
+    pub fn set_completion_mode(&mut self, mode: CompletionMode) {
         self.completion_mode = mode;
     }
 
@@ -499,36 +520,59 @@ impl Thread {
         Ok(())
     }
 
+    pub fn resume(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>> {
+        anyhow::ensure!(
+            self.tool_use_limit_reached,
+            "can only resume after tool use limit is reached"
+        );
+
+        self.messages.push(Message::Resume);
+        cx.notify();
+
+        log::info!("Total messages in thread: {}", self.messages.len());
+        Ok(self.run_turn(cx))
+    }
+
     /// Sending a message results in the model streaming a response, which could include tool calls.
     /// After calling tools, the model will stops and waits for any outstanding tool calls to be completed and their results sent.
     /// The returned channel will report all the occurrences in which the model stops before erroring or ending its turn.
     pub fn send<T>(
         &mut self,
-        message_id: UserMessageId,
+        id: UserMessageId,
         content: impl IntoIterator<Item = T>,
         cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedReceiver<Result<AgentResponseEvent, LanguageModelCompletionError>>
+    ) -> mpsc::UnboundedReceiver<Result<AgentResponseEvent>>
     where
         T: Into<UserMessageContent>,
     {
-        let model = self.selected_model.clone();
+        log::info!("Thread::send called with model: {:?}", self.model.name());
+
         let content = content.into_iter().map(Into::into).collect::<Vec<_>>();
-        log::info!("Thread::send called with model: {:?}", model.name());
         log::debug!("Thread::send content: {:?}", content);
 
+        self.messages
+            .push(Message::User(UserMessage { id, content }));
         cx.notify();
-        let (events_tx, events_rx) =
-            mpsc::unbounded::<Result<AgentResponseEvent, LanguageModelCompletionError>>();
-        let event_stream = AgentResponseEventStream(events_tx);
 
-        self.messages.push(Message::User(UserMessage {
-            id: message_id.clone(),
-            content,
-        }));
         log::info!("Total messages in thread: {}", self.messages.len());
+        self.run_turn(cx)
+    }
+
+    fn run_turn(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> mpsc::UnboundedReceiver<Result<AgentResponseEvent>> {
+        let model = self.model.clone();
+        let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
+        let event_stream = AgentResponseEventStream(events_tx);
+        let message_ix = self.messages.len().saturating_sub(1);
+        self.tool_use_limit_reached = false;
         self.running_turn = Some(cx.spawn(async move |this, cx| {
             log::info!("Starting agent turn execution");
-            let turn_result = async {
+            let turn_result: Result<()> = async {
                 let mut completion_intent = CompletionIntent::UserPrompt;
                 loop {
                     log::debug!(
@@ -543,13 +587,22 @@ impl Thread {
                     let mut events = model.stream_completion(request, cx).await?;
                     log::debug!("Stream completion started successfully");
 
+                    let mut tool_use_limit_reached = false;
                     let mut tool_uses = FuturesUnordered::new();
                     while let Some(event) = events.next().await {
                         match event? {
+                            LanguageModelCompletionEvent::StatusUpdate(
+                                CompletionRequestStatus::ToolUseLimitReached,
+                            ) => {
+                                tool_use_limit_reached = true;
+                            }
                             LanguageModelCompletionEvent::Stop(reason) => {
                                 event_stream.send_stop(reason);
                                 if reason == StopReason::Refusal {
-                                    this.update(cx, |this, _cx| this.truncate(message_id))??;
+                                    this.update(cx, |this, _cx| {
+                                        this.flush_pending_message();
+                                        this.messages.truncate(message_ix);
+                                    })?;
                                     return Ok(());
                                 }
                             }
@@ -567,12 +620,7 @@ impl Thread {
                         }
                     }
 
-                    if tool_uses.is_empty() {
-                        log::info!("No tool uses found, completing turn");
-                        return Ok(());
-                    }
-                    log::info!("Found {} tool uses to execute", tool_uses.len());
-
+                    let used_tools = tool_uses.is_empty();
                     while let Some(tool_result) = tool_uses.next().await {
                         log::info!("Tool finished {:?}", tool_result);
 
@@ -596,8 +644,17 @@ impl Thread {
                         .ok();
                     }
 
-                    this.update(cx, |this, _| this.flush_pending_message())?;
-                    completion_intent = CompletionIntent::ToolResults;
+                    if tool_use_limit_reached {
+                        log::info!("Tool use limit reached, completing turn");
+                        this.update(cx, |this, _cx| this.tool_use_limit_reached = true)?;
+                        return Err(language_model::ToolUseLimitReachedError.into());
+                    } else if used_tools {
+                        log::info!("No tool uses found, completing turn");
+                        return Ok(());
+                    } else {
+                        this.update(cx, |this, _| this.flush_pending_message())?;
+                        completion_intent = CompletionIntent::ToolResults;
+                    }
                 }
             }
             .await;
@@ -678,10 +735,10 @@ impl Thread {
     fn handle_text_event(
         &mut self,
         new_text: String,
-        events_stream: &AgentResponseEventStream,
+        event_stream: &AgentResponseEventStream,
         cx: &mut Context<Self>,
     ) {
-        events_stream.send_text(&new_text);
+        event_stream.send_text(&new_text);
 
         let last_message = self.pending_message();
         if let Some(AgentMessageContent::Text(text)) = last_message.content.last_mut() {
@@ -798,8 +855,9 @@ impl Thread {
             status: Some(acp::ToolCallStatus::InProgress),
             ..Default::default()
         });
-        let supports_images = self.selected_model.supports_images();
+        let supports_images = self.model.supports_images();
         let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
+        log::info!("Running tool {}", tool_use.name);
         Some(cx.foreground_executor().spawn(async move {
             let tool_result = tool_result.await.and_then(|output| {
                 if let LanguageModelToolResultContent::Image(_) = &output.llm_output {
@@ -902,7 +960,7 @@ impl Thread {
                         name: tool_name,
                         description: tool.description().to_string(),
                         input_schema: tool
-                            .input_schema(self.selected_model.tool_input_format())
+                            .input_schema(self.model.tool_input_format())
                             .log_err()?,
                     })
                 })
@@ -917,7 +975,7 @@ impl Thread {
             thread_id: None,
             prompt_id: None,
             intent: Some(completion_intent),
-            mode: Some(self.completion_mode),
+            mode: Some(self.completion_mode.into()),
             messages,
             tools,
             tool_choice: None,
@@ -935,7 +993,7 @@ impl Thread {
             .profiles
             .get(&self.profile_id)
             .context("profile not found")?;
-        let provider_id = self.selected_model.provider_id();
+        let provider_id = self.model.provider_id();
 
         Ok(self
             .tools
@@ -971,6 +1029,11 @@ impl Thread {
             match message {
                 Message::User(message) => messages.push(message.to_request()),
                 Message::Agent(message) => messages.extend(message.to_request()),
+                Message::Resume => messages.push(LanguageModelRequestMessage {
+                    role: Role::User,
+                    content: vec!["Continue where you left off".into()],
+                    cache: false,
+                }),
             }
         }
 
@@ -1123,9 +1186,7 @@ where
 }
 
 #[derive(Clone)]
-struct AgentResponseEventStream(
-    mpsc::UnboundedSender<Result<AgentResponseEvent, LanguageModelCompletionError>>,
-);
+struct AgentResponseEventStream(mpsc::UnboundedSender<Result<AgentResponseEvent>>);
 
 impl AgentResponseEventStream {
     fn send_text(&self, text: &str) {
@@ -1212,8 +1273,8 @@ impl AgentResponseEventStream {
         }
     }
 
-    fn send_error(&self, error: LanguageModelCompletionError) {
-        self.0.unbounded_send(Err(error)).ok();
+    fn send_error(&self, error: impl Into<anyhow::Error>) {
+        self.0.unbounded_send(Err(error.into())).ok();
     }
 }
 
@@ -1229,8 +1290,7 @@ pub struct ToolCallEventStream {
 impl ToolCallEventStream {
     #[cfg(test)]
     pub fn test() -> (Self, ToolCallEventStreamReceiver) {
-        let (events_tx, events_rx) =
-            mpsc::unbounded::<Result<AgentResponseEvent, LanguageModelCompletionError>>();
+        let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
 
         let stream = ToolCallEventStream::new(
             &LanguageModelToolUse {
@@ -1351,9 +1411,7 @@ impl ToolCallEventStream {
 }
 
 #[cfg(test)]
-pub struct ToolCallEventStreamReceiver(
-    mpsc::UnboundedReceiver<Result<AgentResponseEvent, LanguageModelCompletionError>>,
-);
+pub struct ToolCallEventStreamReceiver(mpsc::UnboundedReceiver<Result<AgentResponseEvent>>);
 
 #[cfg(test)]
 impl ToolCallEventStreamReceiver {
@@ -1381,7 +1439,7 @@ impl ToolCallEventStreamReceiver {
 
 #[cfg(test)]
 impl std::ops::Deref for ToolCallEventStreamReceiver {
-    type Target = mpsc::UnboundedReceiver<Result<AgentResponseEvent, LanguageModelCompletionError>>;
+    type Target = mpsc::UnboundedReceiver<Result<AgentResponseEvent>>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 405afb585f..c77b9f6a69 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -241,7 +241,7 @@ impl AgentTool for EditFileTool {
             thread.build_completion_request(CompletionIntent::ToolResults, cx)
         });
         let thread = self.thread.read(cx);
-        let model = thread.selected_model.clone();
+        let model = thread.model().clone();
         let action_log = thread.action_log().clone();
 
         let authorize = self.authorize(&input, &event_stream, cx);
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index 15f8635cde..e936c87643 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -5,7 +5,7 @@ use anyhow::{Context as _, Result, anyhow};
 use futures::channel::oneshot;
 use gpui::{AppContext as _, AsyncApp, Entity, Task, WeakEntity};
 use project::Project;
-use std::{cell::RefCell, path::Path, rc::Rc};
+use std::{any::Any, cell::RefCell, path::Path, rc::Rc};
 use ui::App;
 use util::ResultExt as _;
 
@@ -507,4 +507,8 @@ impl AgentConnection for AcpConnection {
             })
             .detach_and_log_err(cx)
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index d93e3d023e..36511e4644 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -3,9 +3,9 @@ use anyhow::anyhow;
 use collections::HashMap;
 use futures::channel::oneshot;
 use project::Project;
-use std::cell::RefCell;
 use std::path::Path;
 use std::rc::Rc;
+use std::{any::Any, cell::RefCell};
 
 use anyhow::{Context as _, Result};
 use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
@@ -191,6 +191,10 @@ impl AgentConnection for AcpConnection {
             .spawn(async move { conn.cancel(params).await })
             .detach();
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
 
 struct ClientDelegate {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index dbcda00e48..e1cc709289 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -6,6 +6,7 @@ use context_server::listener::McpServerTool;
 use project::Project;
 use settings::SettingsStore;
 use smol::process::Child;
+use std::any::Any;
 use std::cell::RefCell;
 use std::fmt::Display;
 use std::path::Path;
@@ -289,6 +290,10 @@ impl AgentConnection for ClaudeAgentConnection {
             })
             .log_err();
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
 
 #[derive(Clone, Copy)]
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index ee016b7503..87af75f046 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -7,20 +7,21 @@ use action_log::ActionLog;
 use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol::{self as acp};
 use agent_servers::AgentServer;
-use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
+use agent_settings::{AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use anyhow::bail;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
+use client::zed_urls;
 use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
 use editor::{Editor, EditorMode, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
 use gpui::{
-    Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, EdgesRefinement, Empty, Entity,
-    FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton, PlatformDisplay,
-    SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement,
-    Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div, linear_color_stop,
-    linear_gradient, list, percentage, point, prelude::*, pulsating_between,
+    Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, ClipboardItem, EdgesRefinement,
+    Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton,
+    PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle,
+    TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
+    linear_color_stop, linear_gradient, list, percentage, point, prelude::*, pulsating_between,
 };
 use language::Buffer;
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
@@ -32,8 +33,8 @@ use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
 use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
-    Disclosure, Divider, DividerColor, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState,
-    Tooltip, prelude::*,
+    Callout, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding, PopoverMenuHandle,
+    Scrollbar, ScrollbarState, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -44,16 +45,39 @@ use super::entry_view_state::EntryViewState;
 use crate::acp::AcpModelSelectorPopover;
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
-use crate::ui::{AgentNotification, AgentNotificationEvent};
+use crate::ui::{AgentNotification, AgentNotificationEvent, BurnModeTooltip};
 use crate::{
-    AgentDiffPane, AgentPanel, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, RejectAll,
+    AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, ExpandMessageEditor, Follow,
+    KeepAll, OpenAgentDiff, RejectAll, ToggleBurnMode,
 };
 
 const RESPONSE_PADDING_X: Pixels = px(19.);
-
 pub const MIN_EDITOR_LINES: usize = 4;
 pub const MAX_EDITOR_LINES: usize = 8;
 
+enum ThreadError {
+    PaymentRequired,
+    ModelRequestLimitReached(cloud_llm_client::Plan),
+    ToolUseLimitReached,
+    Other(SharedString),
+}
+
+impl ThreadError {
+    fn from_err(error: anyhow::Error) -> Self {
+        if error.is::<language_model::PaymentRequiredError>() {
+            Self::PaymentRequired
+        } else if error.is::<language_model::ToolUseLimitReachedError>() {
+            Self::ToolUseLimitReached
+        } else if let Some(error) =
+            error.downcast_ref::<language_model::ModelRequestLimitReachedError>()
+        {
+            Self::ModelRequestLimitReached(error.plan)
+        } else {
+            Self::Other(error.to_string().into())
+        }
+    }
+}
+
 pub struct AcpThreadView {
     agent: Rc<dyn AgentServer>,
     workspace: WeakEntity<Workspace>,
@@ -66,7 +90,7 @@ pub struct AcpThreadView {
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
     notifications: Vec<WindowHandle<AgentNotification>>,
     notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
-    last_error: Option<Entity<Markdown>>,
+    thread_error: Option<ThreadError>,
     list_state: ListState,
     scrollbar_state: ScrollbarState,
     auth_task: Option<Task<()>>,
@@ -151,7 +175,7 @@ impl AcpThreadView {
             entry_view_state: EntryViewState::default(),
             list_state: list_state.clone(),
             scrollbar_state: ScrollbarState::new(list_state).parent_entity(&cx.entity()),
-            last_error: None,
+            thread_error: None,
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
             expanded_thinking_blocks: HashSet::default(),
@@ -316,7 +340,7 @@ impl AcpThreadView {
     }
 
     pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
-        self.last_error.take();
+        self.thread_error.take();
 
         if let Some(thread) = self.thread() {
             self._cancel_task = Some(thread.update(cx, |thread, cx| thread.cancel(cx)));
@@ -371,6 +395,25 @@ impl AcpThreadView {
         }
     }
 
+    fn resume_chat(&mut self, cx: &mut Context<Self>) {
+        self.thread_error.take();
+        let Some(thread) = self.thread() else {
+            return;
+        };
+
+        let task = thread.update(cx, |thread, cx| thread.resume(cx));
+        cx.spawn(async move |this, cx| {
+            let result = task.await;
+
+            this.update(cx, |this, cx| {
+                if let Err(err) = result {
+                    this.handle_thread_error(err, cx);
+                }
+            })
+        })
+        .detach();
+    }
+
     fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let contents = self
             .message_editor
@@ -384,7 +427,7 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.last_error.take();
+        self.thread_error.take();
         self.editing_message.take();
 
         let Some(thread) = self.thread().cloned() else {
@@ -409,11 +452,9 @@ impl AcpThreadView {
         });
 
         cx.spawn(async move |this, cx| {
-            if let Err(e) = task.await {
+            if let Err(err) = task.await {
                 this.update(cx, |this, cx| {
-                    this.last_error =
-                        Some(cx.new(|cx| Markdown::new(e.to_string().into(), None, None, cx)));
-                    cx.notify()
+                    this.handle_thread_error(err, cx);
                 })
                 .ok();
             }
@@ -476,6 +517,16 @@ impl AcpThreadView {
         })
     }
 
+    fn handle_thread_error(&mut self, error: anyhow::Error, cx: &mut Context<Self>) {
+        self.thread_error = Some(ThreadError::from_err(error));
+        cx.notify();
+    }
+
+    fn clear_thread_error(&mut self, cx: &mut Context<Self>) {
+        self.thread_error = None;
+        cx.notify();
+    }
+
     fn handle_thread_event(
         &mut self,
         thread: &Entity<AcpThread>,
@@ -551,7 +602,7 @@ impl AcpThreadView {
             return;
         };
 
-        self.last_error.take();
+        self.thread_error.take();
         let authenticate = connection.authenticate(method, cx);
         self.auth_task = Some(cx.spawn_in(window, {
             let project = self.project.clone();
@@ -561,9 +612,7 @@ impl AcpThreadView {
 
                 this.update_in(cx, |this, window, cx| {
                     if let Err(err) = result {
-                        this.last_error = Some(cx.new(|cx| {
-                            Markdown::new(format!("Error: {err}").into(), None, None, cx)
-                        }))
+                        this.handle_thread_error(err, cx);
                     } else {
                         this.thread_state = Self::initial_state(
                             agent,
@@ -620,9 +669,7 @@ impl AcpThreadView {
                 .py_4()
                 .px_2()
                 .children(message.id.clone().and_then(|message_id| {
-                    message.checkpoint.as_ref()?;
-
-                    Some(
+                    message.checkpoint.as_ref()?.show.then(|| {
                         Button::new("restore-checkpoint", "Restore Checkpoint")
                             .icon(IconName::Undo)
                             .icon_size(IconSize::XSmall)
@@ -630,8 +677,8 @@ impl AcpThreadView {
                             .label_size(LabelSize::XSmall)
                             .on_click(cx.listener(move |this, _, _window, cx| {
                                 this.rewind(&message_id, cx);
-                            })),
-                    )
+                            }))
+                    })
                 }))
                 .child(
                     v_flex()
@@ -2322,7 +2369,12 @@ impl AcpThreadView {
                 h_flex()
                     .flex_none()
                     .justify_between()
-                    .child(self.render_follow_toggle(cx))
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .child(self.render_follow_toggle(cx))
+                            .children(self.render_burn_mode_toggle(cx)),
+                    )
                     .child(
                         h_flex()
                             .gap_1()
@@ -2333,6 +2385,68 @@ impl AcpThreadView {
             .into_any()
     }
 
+    fn as_native_connection(&self, cx: &App) -> Option<Rc<agent2::NativeAgentConnection>> {
+        let acp_thread = self.thread()?.read(cx);
+        acp_thread.connection().clone().downcast()
+    }
+
+    fn as_native_thread(&self, cx: &App) -> Option<Entity<agent2::Thread>> {
+        let acp_thread = self.thread()?.read(cx);
+        self.as_native_connection(cx)?
+            .thread(acp_thread.session_id(), cx)
+    }
+
+    fn toggle_burn_mode(
+        &mut self,
+        _: &ToggleBurnMode,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(thread) = self.as_native_thread(cx) else {
+            return;
+        };
+
+        thread.update(cx, |thread, _cx| {
+            let current_mode = thread.completion_mode();
+            thread.set_completion_mode(match current_mode {
+                CompletionMode::Burn => CompletionMode::Normal,
+                CompletionMode::Normal => CompletionMode::Burn,
+            });
+        });
+    }
+
+    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+        let thread = self.as_native_thread(cx)?.read(cx);
+
+        if !thread.model().supports_burn_mode() {
+            return None;
+        }
+
+        let active_completion_mode = thread.completion_mode();
+        let burn_mode_enabled = active_completion_mode == CompletionMode::Burn;
+        let icon = if burn_mode_enabled {
+            IconName::ZedBurnModeOn
+        } else {
+            IconName::ZedBurnMode
+        };
+
+        Some(
+            IconButton::new("burn-mode", icon)
+                .icon_size(IconSize::Small)
+                .icon_color(Color::Muted)
+                .toggle_state(burn_mode_enabled)
+                .selected_icon_color(Color::Error)
+                .on_click(cx.listener(|this, _event, window, cx| {
+                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
+                }))
+                .tooltip(move |_window, cx| {
+                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
+                        .into()
+                })
+                .into_any_element(),
+        )
+    }
+
     fn start_editing_message(&mut self, index: usize, window: &mut Window, cx: &mut Context<Self>) {
         let Some(thread) = self.thread() else {
             return;
@@ -3002,6 +3116,187 @@ impl AcpThreadView {
     }
 }
 
+impl AcpThreadView {
+    fn render_thread_error(&self, window: &mut Window, cx: &mut Context<'_, Self>) -> Option<Div> {
+        let content = match self.thread_error.as_ref()? {
+            ThreadError::Other(error) => self.render_any_thread_error(error.clone(), cx),
+            ThreadError::PaymentRequired => self.render_payment_required_error(cx),
+            ThreadError::ModelRequestLimitReached(plan) => {
+                self.render_model_request_limit_reached_error(*plan, cx)
+            }
+            ThreadError::ToolUseLimitReached => {
+                self.render_tool_use_limit_reached_error(window, cx)?
+            }
+        };
+
+        Some(
+            div()
+                .border_t_1()
+                .border_color(cx.theme().colors().border)
+                .child(content),
+        )
+    }
+
+    fn render_any_thread_error(&self, error: SharedString, cx: &mut Context<'_, Self>) -> Callout {
+        let icon = Icon::new(IconName::XCircle)
+            .size(IconSize::Small)
+            .color(Color::Error);
+
+        Callout::new()
+            .icon(icon)
+            .title("Error")
+            .description(error.clone())
+            .secondary_action(self.create_copy_button(error.to_string()))
+            .primary_action(self.dismiss_error_button(cx))
+            .bg_color(self.error_callout_bg(cx))
+    }
+
+    fn render_payment_required_error(&self, cx: &mut Context<Self>) -> Callout {
+        const ERROR_MESSAGE: &str =
+            "You reached your free usage limit. Upgrade to Zed Pro for more prompts.";
+
+        let icon = Icon::new(IconName::XCircle)
+            .size(IconSize::Small)
+            .color(Color::Error);
+
+        Callout::new()
+            .icon(icon)
+            .title("Free Usage Exceeded")
+            .description(ERROR_MESSAGE)
+            .tertiary_action(self.upgrade_button(cx))
+            .secondary_action(self.create_copy_button(ERROR_MESSAGE))
+            .primary_action(self.dismiss_error_button(cx))
+            .bg_color(self.error_callout_bg(cx))
+    }
+
+    fn render_model_request_limit_reached_error(
+        &self,
+        plan: cloud_llm_client::Plan,
+        cx: &mut Context<Self>,
+    ) -> Callout {
+        let error_message = match plan {
+            cloud_llm_client::Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
+            cloud_llm_client::Plan::ZedProTrial | cloud_llm_client::Plan::ZedFree => {
+                "Upgrade to Zed Pro for more prompts."
+            }
+        };
+
+        let icon = Icon::new(IconName::XCircle)
+            .size(IconSize::Small)
+            .color(Color::Error);
+
+        Callout::new()
+            .icon(icon)
+            .title("Model Prompt Limit Reached")
+            .description(error_message)
+            .tertiary_action(self.upgrade_button(cx))
+            .secondary_action(self.create_copy_button(error_message))
+            .primary_action(self.dismiss_error_button(cx))
+            .bg_color(self.error_callout_bg(cx))
+    }
+
+    fn render_tool_use_limit_reached_error(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<Callout> {
+        let thread = self.as_native_thread(cx)?;
+        let supports_burn_mode = thread.read(cx).model().supports_burn_mode();
+
+        let focus_handle = self.focus_handle(cx);
+
+        let icon = Icon::new(IconName::Info)
+            .size(IconSize::Small)
+            .color(Color::Info);
+
+        Some(
+            Callout::new()
+                .icon(icon)
+                .title("Consecutive tool use limit reached.")
+                .when(supports_burn_mode, |this| {
+                    this.secondary_action(
+                        Button::new("continue-burn-mode", "Continue with Burn Mode")
+                            .style(ButtonStyle::Filled)
+                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
+                            .layer(ElevationIndex::ModalSurface)
+                            .label_size(LabelSize::Small)
+                            .key_binding(
+                                KeyBinding::for_action_in(
+                                    &ContinueWithBurnMode,
+                                    &focus_handle,
+                                    window,
+                                    cx,
+                                )
+                                .map(|kb| kb.size(rems_from_px(10.))),
+                            )
+                            .tooltip(Tooltip::text("Enable Burn Mode for unlimited tool use."))
+                            .on_click({
+                                cx.listener(move |this, _, _window, cx| {
+                                    thread.update(cx, |thread, _cx| {
+                                        thread.set_completion_mode(CompletionMode::Burn);
+                                    });
+                                    this.resume_chat(cx);
+                                })
+                            }),
+                    )
+                })
+                .primary_action(
+                    Button::new("continue-conversation", "Continue")
+                        .layer(ElevationIndex::ModalSurface)
+                        .label_size(LabelSize::Small)
+                        .key_binding(
+                            KeyBinding::for_action_in(&ContinueThread, &focus_handle, window, cx)
+                                .map(|kb| kb.size(rems_from_px(10.))),
+                        )
+                        .on_click(cx.listener(|this, _, _window, cx| {
+                            this.resume_chat(cx);
+                        })),
+                ),
+        )
+    }
+
+    fn create_copy_button(&self, message: impl Into<String>) -> impl IntoElement {
+        let message = message.into();
+
+        IconButton::new("copy", IconName::Copy)
+            .icon_size(IconSize::Small)
+            .icon_color(Color::Muted)
+            .tooltip(Tooltip::text("Copy Error Message"))
+            .on_click(move |_, _, cx| {
+                cx.write_to_clipboard(ClipboardItem::new_string(message.clone()))
+            })
+    }
+
+    fn dismiss_error_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        IconButton::new("dismiss", IconName::Close)
+            .icon_size(IconSize::Small)
+            .icon_color(Color::Muted)
+            .tooltip(Tooltip::text("Dismiss Error"))
+            .on_click(cx.listener({
+                move |this, _, _, cx| {
+                    this.clear_thread_error(cx);
+                    cx.notify();
+                }
+            }))
+    }
+
+    fn upgrade_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        Button::new("upgrade", "Upgrade")
+            .label_size(LabelSize::Small)
+            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
+            .on_click(cx.listener({
+                move |this, _, _, cx| {
+                    this.clear_thread_error(cx);
+                    cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx));
+                }
+            }))
+    }
+
+    fn error_callout_bg(&self, cx: &Context<Self>) -> Hsla {
+        cx.theme().status().error.opacity(0.08)
+    }
+}
+
 impl Focusable for AcpThreadView {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         self.message_editor.focus_handle(cx)
@@ -3016,6 +3311,7 @@ impl Render for AcpThreadView {
             .size_full()
             .key_context("AcpThread")
             .on_action(cx.listener(Self::open_agent_diff))
+            .on_action(cx.listener(Self::toggle_burn_mode))
             .bg(cx.theme().colors().panel_background)
             .child(match &self.thread_state {
                 ThreadState::Unauthenticated { connection } => v_flex()
@@ -3100,19 +3396,7 @@ impl Render for AcpThreadView {
                 }
                 _ => this,
             })
-            .when_some(self.last_error.clone(), |el, error| {
-                el.child(
-                    div()
-                        .p_2()
-                        .text_xs()
-                        .border_t_1()
-                        .border_color(cx.theme().colors().border)
-                        .bg(cx.theme().status().error_background)
-                        .child(
-                            self.render_markdown(error, default_markdown_style(false, window, cx)),
-                        ),
-                )
-            })
+            .children(self.render_thread_error(window, cx))
             .child(self.render_message_editor(window, cx))
     }
 }
@@ -3299,8 +3583,6 @@ fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use std::path::Path;
-
     use acp_thread::StubAgentConnection;
     use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol::SessionId;
@@ -3310,6 +3592,8 @@ pub(crate) mod tests {
     use project::Project;
     use serde_json::json;
     use settings::SettingsStore;
+    use std::any::Any;
+    use std::path::Path;
 
     use super::*;
 
@@ -3547,6 +3831,10 @@ pub(crate) mod tests {
         fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
             unimplemented!()
         }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
     }
 
     pub(crate) fn init_test(cx: &mut TestAppContext) {
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 231b9cfb38..4f5f022593 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -5,7 +5,6 @@ mod agent_diff;
 mod agent_model_selector;
 mod agent_panel;
 mod buffer_codegen;
-mod burn_mode_tooltip;
 mod context_picker;
 mod context_server_configuration;
 mod context_strip;
diff --git a/crates/agent_ui/src/burn_mode_tooltip.rs b/crates/agent_ui/src/burn_mode_tooltip.rs
deleted file mode 100644
index 6354c07760..0000000000
--- a/crates/agent_ui/src/burn_mode_tooltip.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use gpui::{Context, FontWeight, IntoElement, Render, Window};
-use ui::{prelude::*, tooltip_container};
-
-pub struct BurnModeTooltip {
-    selected: bool,
-}
-
-impl BurnModeTooltip {
-    pub fn new() -> Self {
-        Self { selected: false }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl Render for BurnModeTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (icon, color) = if self.selected {
-            (IconName::ZedBurnModeOn, Color::Error)
-        } else {
-            (IconName::ZedBurnMode, Color::Default)
-        };
-
-        let turned_on = h_flex()
-            .h_4()
-            .px_1()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().text_accent.opacity(0.1))
-            .rounded_sm()
-            .child(
-                Label::new("ON")
-                    .size(LabelSize::XSmall)
-                    .weight(FontWeight::SEMIBOLD)
-                    .color(Color::Accent),
-            );
-
-        let title = h_flex()
-            .gap_1p5()
-            .child(Icon::new(icon).size(IconSize::Small).color(color))
-            .child(Label::new("Burn Mode"))
-            .when(self.selected, |title| title.child(turned_on));
-
-        tooltip_container(window, cx, |this, _, _| {
-            this
-                .child(title)
-                .child(
-                    div()
-                        .max_w_64()
-                        .child(
-                            Label::new("Enables models to use large context windows, unlimited tool calls, and other capabilities for expanded reasoning.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                        )
-                )
-        })
-    }
-}
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 4b6d51c4c1..5d094811f1 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -6,7 +6,7 @@ use crate::agent_diff::AgentDiffThread;
 use crate::agent_model_selector::AgentModelSelector;
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
 use crate::ui::{
-    MaxModeTooltip,
+    BurnModeTooltip,
     preview::{AgentPreview, UsageCallout},
 };
 use agent::history_store::HistoryStore;
@@ -605,7 +605,7 @@ impl MessageEditor {
                     this.toggle_burn_mode(&ToggleBurnMode, window, cx);
                 }))
                 .tooltip(move |_window, cx| {
-                    cx.new(|_| MaxModeTooltip::new().selected(burn_mode_enabled))
+                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
                         .into()
                 })
                 .into_any_element(),
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 49a37002f7..2e3b4ed890 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1,6 +1,6 @@
 use crate::{
-    burn_mode_tooltip::BurnModeTooltip,
     language_model_selector::{LanguageModelSelector, language_model_selector},
+    ui::BurnModeTooltip,
 };
 use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::Result;
diff --git a/crates/agent_ui/src/ui/burn_mode_tooltip.rs b/crates/agent_ui/src/ui/burn_mode_tooltip.rs
index 97f7853a61..72faaa614d 100644
--- a/crates/agent_ui/src/ui/burn_mode_tooltip.rs
+++ b/crates/agent_ui/src/ui/burn_mode_tooltip.rs
@@ -2,11 +2,11 @@ use crate::ToggleBurnMode;
 use gpui::{Context, FontWeight, IntoElement, Render, Window};
 use ui::{KeyBinding, prelude::*, tooltip_container};
 
-pub struct MaxModeTooltip {
+pub struct BurnModeTooltip {
     selected: bool,
 }
 
-impl MaxModeTooltip {
+impl BurnModeTooltip {
     pub fn new() -> Self {
         Self { selected: false }
     }
@@ -17,7 +17,7 @@ impl MaxModeTooltip {
     }
 }
 
-impl Render for MaxModeTooltip {
+impl Render for BurnModeTooltip {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let (icon, color) = if self.selected {
             (IconName::ZedBurnModeOn, Color::Error)
diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs
index 3b4c1fa269..0e10050dae 100644
--- a/crates/language_model/src/model/cloud_model.rs
+++ b/crates/language_model/src/model/cloud_model.rs
@@ -42,6 +42,18 @@ impl fmt::Display for ModelRequestLimitReachedError {
     }
 }
 
+#[derive(Error, Debug)]
+pub struct ToolUseLimitReachedError;
+
+impl fmt::Display for ToolUseLimitReachedError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "Consecutive tool use limit reached. Enable Burn Mode for unlimited tool use."
+        )
+    }
+}
+
 #[derive(Clone, Default)]
 pub struct LlmApiToken(Arc<RwLock<Option<String>>>);
 

From 708c434bd4c21614a282fc31ae35d3e9414ec2c9 Mon Sep 17 00:00:00 2001
From: Daniel Sauble <djsauble@gmail.com>
Date: Fri, 15 Aug 2025 04:43:29 -0700
Subject: [PATCH 050/823] workspace: Highlight where dragged tab will be
 dropped (#34740)

Closes #18565

I could use some advice on the color palette / theming. A couple
options:

1. The `drop_target_background` color could be used for the border if we
didn't use it for the background of the tab. In VSCode, the background
color of tabs doesn't change as you're dragging, there's just a border
between tabs. My only concern with this option is that the current
`drop_target_background` color is a bit subtle when used for a small
area like a border.

2. Another option could be to add a `drop_target_border` theme color,
but I don't know how much complexity this adds to implementation
(presumably all existing themes would need to be updated?).

Demo:


https://github.com/user-attachments/assets/0b7c04ea-5ec5-4b45-adad-156dfbf552db

Release Notes:

- Highlight where a dragged tab will be dropped between two other tabs

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/theme/src/default_colors.rs  |  2 ++
 crates/theme/src/fallback_themes.rs |  1 +
 crates/theme/src/schema.rs          |  8 ++++++++
 crates/theme/src/styles/colors.rs   |  4 ++++
 crates/workspace/src/pane.rs        | 15 +++++++++++++--
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/crates/theme/src/default_colors.rs b/crates/theme/src/default_colors.rs
index 1c3f48b548..051b7acf10 100644
--- a/crates/theme/src/default_colors.rs
+++ b/crates/theme/src/default_colors.rs
@@ -54,6 +54,7 @@ impl ThemeColors {
             element_disabled: neutral().light_alpha().step_3(),
             element_selection_background: blue().light().step_3().alpha(0.25),
             drop_target_background: blue().light_alpha().step_2(),
+            drop_target_border: neutral().light().step_12(),
             ghost_element_background: system.transparent,
             ghost_element_hover: neutral().light_alpha().step_3(),
             ghost_element_active: neutral().light_alpha().step_4(),
@@ -179,6 +180,7 @@ impl ThemeColors {
             element_disabled: neutral().dark_alpha().step_3(),
             element_selection_background: blue().dark().step_3().alpha(0.25),
             drop_target_background: blue().dark_alpha().step_2(),
+            drop_target_border: neutral().dark().step_12(),
             ghost_element_background: system.transparent,
             ghost_element_hover: neutral().dark_alpha().step_4(),
             ghost_element_active: neutral().dark_alpha().step_5(),
diff --git a/crates/theme/src/fallback_themes.rs b/crates/theme/src/fallback_themes.rs
index 4d77dd5d81..e9e8e2d0db 100644
--- a/crates/theme/src/fallback_themes.rs
+++ b/crates/theme/src/fallback_themes.rs
@@ -115,6 +115,7 @@ pub(crate) fn zed_default_dark() -> Theme {
                 element_disabled: SystemColors::default().transparent,
                 element_selection_background: player.local().selection.alpha(0.25),
                 drop_target_background: hsla(220.0 / 360., 8.3 / 100., 21.4 / 100., 1.0),
+                drop_target_border: hsla(221. / 360., 11. / 100., 86. / 100., 1.0),
                 ghost_element_background: SystemColors::default().transparent,
                 ghost_element_hover: hover,
                 ghost_element_active: hsla(220.0 / 360., 11.8 / 100., 20.0 / 100., 1.0),
diff --git a/crates/theme/src/schema.rs b/crates/theme/src/schema.rs
index bfa2adcedf..425fedbc71 100644
--- a/crates/theme/src/schema.rs
+++ b/crates/theme/src/schema.rs
@@ -225,6 +225,10 @@ pub struct ThemeColorsContent {
     #[serde(rename = "drop_target.background")]
     pub drop_target_background: Option<String>,
 
+    /// Border Color. Used for the border that shows where a dragged element will be dropped.
+    #[serde(rename = "drop_target.border")]
+    pub drop_target_border: Option<String>,
+
     /// Used for the background of a ghost element that should have the same background as the surface it's on.
     ///
     /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
@@ -747,6 +751,10 @@ impl ThemeColorsContent {
                 .drop_target_background
                 .as_ref()
                 .and_then(|color| try_parse_color(color).ok()),
+            drop_target_border: self
+                .drop_target_border
+                .as_ref()
+                .and_then(|color| try_parse_color(color).ok()),
             ghost_element_background: self
                 .ghost_element_background
                 .as_ref()
diff --git a/crates/theme/src/styles/colors.rs b/crates/theme/src/styles/colors.rs
index aab11803f4..198ad97adb 100644
--- a/crates/theme/src/styles/colors.rs
+++ b/crates/theme/src/styles/colors.rs
@@ -59,6 +59,8 @@ pub struct ThemeColors {
     pub element_disabled: Hsla,
     /// Background Color. Used for the area that shows where a dragged element will be dropped.
     pub drop_target_background: Hsla,
+    /// Border Color. Used for the border that shows where a dragged element will be dropped.
+    pub drop_target_border: Hsla,
     /// Used for the background of a ghost element that should have the same background as the surface it's on.
     ///
     /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
@@ -304,6 +306,7 @@ pub enum ThemeColorField {
     ElementSelected,
     ElementDisabled,
     DropTargetBackground,
+    DropTargetBorder,
     GhostElementBackground,
     GhostElementHover,
     GhostElementActive,
@@ -418,6 +421,7 @@ impl ThemeColors {
             ThemeColorField::ElementSelected => self.element_selected,
             ThemeColorField::ElementDisabled => self.element_disabled,
             ThemeColorField::DropTargetBackground => self.drop_target_background,
+            ThemeColorField::DropTargetBorder => self.drop_target_border,
             ThemeColorField::GhostElementBackground => self.ghost_element_background,
             ThemeColorField::GhostElementHover => self.ghost_element_hover,
             ThemeColorField::GhostElementActive => self.ghost_element_active,
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index cffeea0a8d..45bd497705 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2478,8 +2478,19 @@ impl Pane {
                 },
                 |tab, _, _, cx| cx.new(|_| tab.clone()),
             )
-            .drag_over::<DraggedTab>(|tab, _, _, cx| {
-                tab.bg(cx.theme().colors().drop_target_background)
+            .drag_over::<DraggedTab>(move |tab, dragged_tab: &DraggedTab, _, cx| {
+                let mut styled_tab = tab
+                    .bg(cx.theme().colors().drop_target_background)
+                    .border_color(cx.theme().colors().drop_target_border)
+                    .border_0();
+
+                if ix < dragged_tab.ix {
+                    styled_tab = styled_tab.border_l_2();
+                } else if ix > dragged_tab.ix {
+                    styled_tab = styled_tab.border_r_2();
+                }
+
+                styled_tab
             })
             .drag_over::<DraggedSelection>(|tab, _, _, cx| {
                 tab.bg(cx.theme().colors().drop_target_background)

From 846ed6adf91fc63f585c921da0101802b031c855 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 15 Aug 2025 14:54:05 +0200
Subject: [PATCH 051/823] search: Fix project search not rendering matches
 count (#36238)

Follow up to https://github.com/zed-industries/zed/pull/36103/

Release Notes:

- N/A
---
 crates/search/src/project_search.rs | 89 +++++++++++++++--------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 6b9777906a..b791f748ad 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1975,49 +1975,6 @@ impl Render for ProjectSearchBar {
                     ),
             );
 
-        let mode_column = h_flex()
-            .gap_1()
-            .min_w_64()
-            .child(
-                IconButton::new("project-search-filter-button", IconName::Filter)
-                    .shape(IconButtonShape::Square)
-                    .tooltip(|window, cx| {
-                        Tooltip::for_action("Toggle Filters", &ToggleFilters, window, cx)
-                    })
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.toggle_filters(window, cx);
-                    }))
-                    .toggle_state(
-                        self.active_project_search
-                            .as_ref()
-                            .map(|search| search.read(cx).filters_enabled)
-                            .unwrap_or_default(),
-                    )
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Toggle Filters",
-                                &ToggleFilters,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    }),
-            )
-            .child(render_action_button(
-                "project-search",
-                IconName::Replace,
-                self.active_project_search
-                    .as_ref()
-                    .map(|search| search.read(cx).replace_enabled)
-                    .unwrap_or_default(),
-                "Toggle Replace",
-                &ToggleReplace,
-                focus_handle.clone(),
-            ));
-
         let query_focus = search.query_editor.focus_handle(cx);
 
         let matches_column = h_flex()
@@ -2060,11 +2017,55 @@ impl Render for ProjectSearchBar {
                     }),
             );
 
+        let mode_column = h_flex()
+            .gap_1()
+            .min_w_64()
+            .child(
+                IconButton::new("project-search-filter-button", IconName::Filter)
+                    .shape(IconButtonShape::Square)
+                    .tooltip(|window, cx| {
+                        Tooltip::for_action("Toggle Filters", &ToggleFilters, window, cx)
+                    })
+                    .on_click(cx.listener(|this, _, window, cx| {
+                        this.toggle_filters(window, cx);
+                    }))
+                    .toggle_state(
+                        self.active_project_search
+                            .as_ref()
+                            .map(|search| search.read(cx).filters_enabled)
+                            .unwrap_or_default(),
+                    )
+                    .tooltip({
+                        let focus_handle = focus_handle.clone();
+                        move |window, cx| {
+                            Tooltip::for_action_in(
+                                "Toggle Filters",
+                                &ToggleFilters,
+                                &focus_handle,
+                                window,
+                                cx,
+                            )
+                        }
+                    }),
+            )
+            .child(render_action_button(
+                "project-search",
+                IconName::Replace,
+                self.active_project_search
+                    .as_ref()
+                    .map(|search| search.read(cx).replace_enabled)
+                    .unwrap_or_default(),
+                "Toggle Replace",
+                &ToggleReplace,
+                focus_handle.clone(),
+            ))
+            .child(matches_column);
+
         let search_line = h_flex()
             .w_full()
             .gap_2()
             .child(query_column)
-            .child(h_flex().min_w_64().child(mode_column).child(matches_column));
+            .child(mode_column);
 
         let replace_line = search.replace_enabled.then(|| {
             let replace_column = input_base_styles(InputPanel::Replacement)

From f63036548c2229a4dfe1cd7576bf6cee5cd3f1ca Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 15 Aug 2025 15:17:56 +0200
Subject: [PATCH 052/823] agent2: Implement prompt caching (#36236)

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs | 135 ++++++++++++++++++++++++++++++++-
 crates/agent2/src/thread.rs    |   8 ++
 2 files changed, 140 insertions(+), 3 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index cf90c8f650..cc8bd483bb 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -16,6 +16,7 @@ use language_model::{
     LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse, MessageContent,
     Role, StopReason, fake_provider::FakeLanguageModel,
 };
+use pretty_assertions::assert_eq;
 use project::Project;
 use prompt_store::ProjectContext;
 use reqwest_client::ReqwestClient;
@@ -129,6 +130,134 @@ async fn test_system_prompt(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_prompt_caching(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    // Send initial user message and verify it's cached
+    thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Message 1"], cx)
+    });
+    cx.run_until_parked();
+
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        completion.messages[1..],
+        vec![LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec!["Message 1".into()],
+            cache: true
+        }]
+    );
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text(
+        "Response to Message 1".into(),
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // Send another user message and verify only the latest is cached
+    thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Message 2"], cx)
+    });
+    cx.run_until_parked();
+
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        completion.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Message 1".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec!["Response to Message 1".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Message 2".into()],
+                cache: true
+            }
+        ]
+    );
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text(
+        "Response to Message 2".into(),
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // Simulate a tool call and verify that the latest tool result is cached
+    thread.update(cx, |thread, _| thread.add_tool(EchoTool));
+    thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+    });
+    cx.run_until_parked();
+
+    let tool_use = LanguageModelToolUse {
+        id: "tool_1".into(),
+        name: EchoTool.name().into(),
+        raw_input: json!({"text": "test"}).to_string(),
+        input: json!({"text": "test"}),
+        is_input_complete: true,
+    };
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    let completion = fake_model.pending_completions().pop().unwrap();
+    let tool_result = LanguageModelToolResult {
+        tool_use_id: "tool_1".into(),
+        tool_name: EchoTool.name().into(),
+        is_error: false,
+        content: "test".into(),
+        output: Some("test".into()),
+    };
+    assert_eq!(
+        completion.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Message 1".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec!["Response to Message 1".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Message 2".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec!["Response to Message 2".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Use the echo tool".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![MessageContent::ToolUse(tool_use)],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::ToolResult(tool_result)],
+                cache: true
+            }
+        ]
+    );
+}
+
 #[gpui::test]
 #[ignore = "can't run on CI yet"]
 async fn test_basic_tool_calls(cx: &mut TestAppContext) {
@@ -440,7 +569,7 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec![MessageContent::ToolResult(tool_result.clone())],
-                cache: false
+                cache: true
             },
         ]
     );
@@ -481,7 +610,7 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Continue where you left off".into()],
-                cache: false
+                cache: true
             }
         ]
     );
@@ -574,7 +703,7 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["ghi".into()],
-                cache: false
+                cache: true
             }
         ]
     );
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 231ee92dda..2fe2dc20bb 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1041,6 +1041,14 @@ impl Thread {
             messages.extend(message.to_request());
         }
 
+        if let Some(last_user_message) = messages
+            .iter_mut()
+            .rev()
+            .find(|message| message.role == Role::User)
+        {
+            last_user_message.cache = true;
+        }
+
         messages
     }
 

From 91e6b382852fde4e880bc4aba7a15f7bb08c11aa Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Fri, 15 Aug 2025 10:58:57 -0300
Subject: [PATCH 053/823] Log agent servers stderr (#36243)

Release Notes:

- N/A
---
 crates/agent_servers/src/acp/v1.rs | 21 ++++++++++++++++++---
 crates/agent_servers/src/claude.rs | 21 +++++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 36511e4644..6cf9801d06 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -1,7 +1,9 @@
 use agent_client_protocol::{self as acp, Agent as _};
 use anyhow::anyhow;
 use collections::HashMap;
+use futures::AsyncBufReadExt as _;
 use futures::channel::oneshot;
+use futures::io::BufReader;
 use project::Project;
 use std::path::Path;
 use std::rc::Rc;
@@ -40,12 +42,13 @@ impl AcpConnection {
             .current_dir(root_dir)
             .stdin(std::process::Stdio::piped())
             .stdout(std::process::Stdio::piped())
-            .stderr(std::process::Stdio::inherit())
+            .stderr(std::process::Stdio::piped())
             .kill_on_drop(true)
             .spawn()?;
 
-        let stdout = child.stdout.take().expect("Failed to take stdout");
-        let stdin = child.stdin.take().expect("Failed to take stdin");
+        let stdout = child.stdout.take().context("Failed to take stdout")?;
+        let stdin = child.stdin.take().context("Failed to take stdin")?;
+        let stderr = child.stderr.take().context("Failed to take stderr")?;
         log::trace!("Spawned (pid: {})", child.id());
 
         let sessions = Rc::new(RefCell::new(HashMap::default()));
@@ -63,6 +66,18 @@ impl AcpConnection {
 
         let io_task = cx.background_spawn(io_task);
 
+        cx.background_spawn(async move {
+            let mut stderr = BufReader::new(stderr);
+            let mut line = String::new();
+            while let Ok(n) = stderr.read_line(&mut line).await
+                && n > 0
+            {
+                log::warn!("agent stderr: {}", &line);
+                line.clear();
+            }
+        })
+        .detach();
+
         cx.spawn({
             let sessions = sessions.clone();
             async move |cx| {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index e1cc709289..14a179ba3d 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -14,7 +14,7 @@ use std::rc::Rc;
 use uuid::Uuid;
 
 use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
+use anyhow::{Context as _, Result, anyhow};
 use futures::channel::oneshot;
 use futures::{AsyncBufReadExt, AsyncWriteExt};
 use futures::{
@@ -130,12 +130,25 @@ impl AgentConnection for ClaudeAgentConnection {
                 &cwd,
             )?;
 
-            let stdin = child.stdin.take().unwrap();
-            let stdout = child.stdout.take().unwrap();
+            let stdout = child.stdout.take().context("Failed to take stdout")?;
+            let stdin = child.stdin.take().context("Failed to take stdin")?;
+            let stderr = child.stderr.take().context("Failed to take stderr")?;
 
             let pid = child.id();
             log::trace!("Spawned (pid: {})", pid);
 
+            cx.background_spawn(async move {
+                let mut stderr = BufReader::new(stderr);
+                let mut line = String::new();
+                while let Ok(n) = stderr.read_line(&mut line).await
+                    && n > 0
+                {
+                    log::warn!("agent stderr: {}", &line);
+                    line.clear();
+                }
+            })
+            .detach();
+
             cx.background_spawn(async move {
                 let mut outgoing_rx = Some(outgoing_rx);
 
@@ -345,7 +358,7 @@ fn spawn_claude(
         .current_dir(root_dir)
         .stdin(std::process::Stdio::piped())
         .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::inherit())
+        .stderr(std::process::Stdio::piped())
         .kill_on_drop(true)
         .spawn()?;
 

From 10a2426a58e913e2715eb5eab760d40385c839f2 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 15 Aug 2025 16:06:56 +0200
Subject: [PATCH 054/823] agent2: Port profile selector (#36244)

Release Notes:

- N/A
---
 crates/agent2/src/thread.rs             |  4 ++
 crates/agent_ui/src/acp/thread_view.rs  | 42 ++++++++++++++++++++-
 crates/agent_ui/src/message_editor.rs   | 27 +++++++++++--
 crates/agent_ui/src/profile_selector.rs | 50 ++++++++++++-------------
 4 files changed, 91 insertions(+), 32 deletions(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 2fe2dc20bb..3f152c79cd 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -499,6 +499,10 @@ impl Thread {
         self.tools.remove(name).is_some()
     }
 
+    pub fn profile(&self) -> &AgentProfileId {
+        &self.profile_id
+    }
+
     pub fn set_profile(&mut self, profile_id: AgentProfileId) {
         self.profile_id = profile_id;
     }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 87af75f046..cb1a62fd11 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -7,7 +7,7 @@ use action_log::ActionLog;
 use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol::{self as acp};
 use agent_servers::AgentServer;
-use agent_settings::{AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
+use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use anyhow::bail;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -16,6 +16,7 @@ use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
 use editor::{Editor, EditorMode, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
+use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, ClipboardItem, EdgesRefinement,
     Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton,
@@ -29,6 +30,7 @@ use project::Project;
 use prompt_store::PromptId;
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
+use std::sync::Arc;
 use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
 use text::Anchor;
 use theme::ThemeSettings;
@@ -45,10 +47,11 @@ use super::entry_view_state::EntryViewState;
 use crate::acp::AcpModelSelectorPopover;
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
+use crate::profile_selector::{ProfileProvider, ProfileSelector};
 use crate::ui::{AgentNotification, AgentNotificationEvent, BurnModeTooltip};
 use crate::{
     AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, ExpandMessageEditor, Follow,
-    KeepAll, OpenAgentDiff, RejectAll, ToggleBurnMode,
+    KeepAll, OpenAgentDiff, RejectAll, ToggleBurnMode, ToggleProfileSelector,
 };
 
 const RESPONSE_PADDING_X: Pixels = px(19.);
@@ -78,6 +81,22 @@ impl ThreadError {
     }
 }
 
+impl ProfileProvider for Entity<agent2::Thread> {
+    fn profile_id(&self, cx: &App) -> AgentProfileId {
+        self.read(cx).profile().clone()
+    }
+
+    fn set_profile(&self, profile_id: AgentProfileId, cx: &mut App) {
+        self.update(cx, |thread, _cx| {
+            thread.set_profile(profile_id);
+        });
+    }
+
+    fn profiles_supported(&self, cx: &App) -> bool {
+        self.read(cx).model().supports_tools()
+    }
+}
+
 pub struct AcpThreadView {
     agent: Rc<dyn AgentServer>,
     workspace: WeakEntity<Workspace>,
@@ -88,6 +107,7 @@ pub struct AcpThreadView {
     entry_view_state: EntryViewState,
     message_editor: Entity<MessageEditor>,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
+    profile_selector: Option<Entity<ProfileSelector>>,
     notifications: Vec<WindowHandle<AgentNotification>>,
     notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
     thread_error: Option<ThreadError>,
@@ -170,6 +190,7 @@ impl AcpThreadView {
             thread_state: Self::initial_state(agent, workspace, project, window, cx),
             message_editor,
             model_selector: None,
+            profile_selector: None,
             notifications: Vec::new(),
             notification_subscriptions: HashMap::default(),
             entry_view_state: EntryViewState::default(),
@@ -297,6 +318,17 @@ impl AcpThreadView {
                             _subscription: [thread_subscription, action_log_subscription],
                         };
 
+                        this.profile_selector = this.as_native_thread(cx).map(|thread| {
+                            cx.new(|cx| {
+                                ProfileSelector::new(
+                                    <dyn Fs>::global(cx),
+                                    Arc::new(thread.clone()),
+                                    this.focus_handle(cx),
+                                    cx,
+                                )
+                            })
+                        });
+
                         cx.notify();
                     }
                     Err(err) => {
@@ -2315,6 +2347,11 @@ impl AcpThreadView {
 
         v_flex()
             .on_action(cx.listener(Self::expand_message_editor))
+            .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
+                if let Some(profile_selector) = this.profile_selector.as_ref() {
+                    profile_selector.read(cx).menu_handle().toggle(window, cx);
+                }
+            }))
             .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
                 if let Some(model_selector) = this.model_selector.as_ref() {
                     model_selector
@@ -2378,6 +2415,7 @@ impl AcpThreadView {
                     .child(
                         h_flex()
                             .gap_1()
+                            .children(self.profile_selector.clone())
                             .children(self.model_selector.clone())
                             .child(self.render_send_button(cx)),
                     ),
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 5d094811f1..127e9256be 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -14,7 +14,7 @@ use agent::{
     context::{AgentContextKey, ContextLoadResult, load_context},
     context_store::ContextStoreEvent,
 };
-use agent_settings::{AgentSettings, CompletionMode};
+use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
 use ai_onboarding::ApiKeysWithProviders;
 use buffer_diff::BufferDiff;
 use cloud_llm_client::CompletionIntent;
@@ -55,7 +55,7 @@ use zed_actions::agent::ToggleModelSelector;
 
 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::profile_selector::ProfileSelector;
+use crate::profile_selector::{ProfileProvider, ProfileSelector};
 use crate::{
     ActiveThread, AgentDiffPane, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
     ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
@@ -152,6 +152,24 @@ pub(crate) fn create_editor(
     editor
 }
 
+impl ProfileProvider for Entity<Thread> {
+    fn profiles_supported(&self, cx: &App) -> bool {
+        self.read(cx)
+            .configured_model()
+            .map_or(false, |model| model.model.supports_tools())
+    }
+
+    fn profile_id(&self, cx: &App) -> AgentProfileId {
+        self.read(cx).profile().id().clone()
+    }
+
+    fn set_profile(&self, profile_id: AgentProfileId, cx: &mut App) {
+        self.update(cx, |this, cx| {
+            this.set_profile(profile_id, cx);
+        });
+    }
+}
+
 impl MessageEditor {
     pub fn new(
         fs: Arc<dyn Fs>,
@@ -221,8 +239,9 @@ impl MessageEditor {
             )
         });
 
-        let profile_selector =
-            cx.new(|cx| ProfileSelector::new(fs, thread.clone(), editor.focus_handle(cx), cx));
+        let profile_selector = cx.new(|cx| {
+            ProfileSelector::new(fs, Arc::new(thread.clone()), editor.focus_handle(cx), cx)
+        });
 
         Self {
             editor: editor.clone(),
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index ddcb44d46b..27ca69590f 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -1,12 +1,8 @@
 use crate::{ManageProfiles, ToggleProfileSelector};
-use agent::{
-    Thread,
-    agent_profile::{AgentProfile, AvailableProfiles},
-};
+use agent::agent_profile::{AgentProfile, AvailableProfiles};
 use agent_settings::{AgentDockPosition, AgentProfileId, AgentSettings, builtin_profiles};
 use fs::Fs;
-use gpui::{Action, Empty, Entity, FocusHandle, Subscription, prelude::*};
-use language_model::LanguageModelRegistry;
+use gpui::{Action, Entity, FocusHandle, Subscription, prelude::*};
 use settings::{Settings as _, SettingsStore, update_settings_file};
 use std::sync::Arc;
 use ui::{
@@ -14,10 +10,22 @@ use ui::{
     prelude::*,
 };
 
+/// Trait for types that can provide and manage agent profiles
+pub trait ProfileProvider {
+    /// Get the current profile ID
+    fn profile_id(&self, cx: &App) -> AgentProfileId;
+
+    /// Set the profile ID
+    fn set_profile(&self, profile_id: AgentProfileId, cx: &mut App);
+
+    /// Check if profiles are supported in the current context (e.g. if the model that is selected has tool support)
+    fn profiles_supported(&self, cx: &App) -> bool;
+}
+
 pub struct ProfileSelector {
     profiles: AvailableProfiles,
     fs: Arc<dyn Fs>,
-    thread: Entity<Thread>,
+    provider: Arc<dyn ProfileProvider>,
     menu_handle: PopoverMenuHandle<ContextMenu>,
     focus_handle: FocusHandle,
     _subscriptions: Vec<Subscription>,
@@ -26,7 +34,7 @@ pub struct ProfileSelector {
 impl ProfileSelector {
     pub fn new(
         fs: Arc<dyn Fs>,
-        thread: Entity<Thread>,
+        provider: Arc<dyn ProfileProvider>,
         focus_handle: FocusHandle,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -37,7 +45,7 @@ impl ProfileSelector {
         Self {
             profiles: AgentProfile::available_profiles(cx),
             fs,
-            thread,
+            provider,
             menu_handle: PopoverMenuHandle::default(),
             focus_handle,
             _subscriptions: vec![settings_subscription],
@@ -113,10 +121,10 @@ impl ProfileSelector {
             builtin_profiles::MINIMAL => Some("Chat about anything with no tools."),
             _ => None,
         };
-        let thread_profile_id = self.thread.read(cx).profile().id();
+        let thread_profile_id = self.provider.profile_id(cx);
 
         let entry = ContextMenuEntry::new(profile_name.clone())
-            .toggleable(IconPosition::End, &profile_id == thread_profile_id);
+            .toggleable(IconPosition::End, profile_id == thread_profile_id);
 
         let entry = if let Some(doc_text) = documentation {
             entry.documentation_aside(documentation_side(settings.dock), move |_| {
@@ -128,7 +136,7 @@ impl ProfileSelector {
 
         entry.handler({
             let fs = self.fs.clone();
-            let thread = self.thread.clone();
+            let provider = self.provider.clone();
             let profile_id = profile_id.clone();
             move |_window, cx| {
                 update_settings_file::<AgentSettings>(fs.clone(), cx, {
@@ -138,9 +146,7 @@ impl ProfileSelector {
                     }
                 });
 
-                thread.update(cx, |this, cx| {
-                    this.set_profile(profile_id.clone(), cx);
-                });
+                provider.set_profile(profile_id.clone(), cx);
             }
         })
     }
@@ -149,22 +155,14 @@ impl ProfileSelector {
 impl Render for ProfileSelector {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let settings = AgentSettings::get_global(cx);
-        let profile_id = self.thread.read(cx).profile().id();
-        let profile = settings.profiles.get(profile_id);
+        let profile_id = self.provider.profile_id(cx);
+        let profile = settings.profiles.get(&profile_id);
 
         let selected_profile = profile
             .map(|profile| profile.name.clone())
             .unwrap_or_else(|| "Unknown".into());
 
-        let configured_model = self.thread.read(cx).configured_model().or_else(|| {
-            let model_registry = LanguageModelRegistry::read_global(cx);
-            model_registry.default_model()
-        });
-        let Some(configured_model) = configured_model else {
-            return Empty.into_any_element();
-        };
-
-        if configured_model.model.supports_tools() {
+        if self.provider.profiles_supported(cx) {
             let this = cx.entity().clone();
             let focus_handle = self.focus_handle.clone();
             let trigger_button = Button::new("profile-selector-model", selected_profile)

From 1e41d86b31b2225173c201cc00770bd485e044ce Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 15 Aug 2025 16:23:55 +0200
Subject: [PATCH 055/823] agent2: Set thread_id, prompt_id, temperature on
 request (#36246)

Release Notes:

- N/A
---
 crates/agent2/src/thread.rs | 57 +++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 3f152c79cd..cfd67f4b05 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -28,6 +28,48 @@ use smol::stream::StreamExt;
 use std::{cell::RefCell, collections::BTreeMap, path::Path, rc::Rc, sync::Arc};
 use std::{fmt::Write, ops::Range};
 use util::{ResultExt, markdown::MarkdownCodeBlock};
+use uuid::Uuid;
+
+#[derive(
+    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize, JsonSchema,
+)]
+pub struct ThreadId(Arc<str>);
+
+impl ThreadId {
+    pub fn new() -> Self {
+        Self(Uuid::new_v4().to_string().into())
+    }
+}
+
+impl std::fmt::Display for ThreadId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<&str> for ThreadId {
+    fn from(value: &str) -> Self {
+        Self(value.into())
+    }
+}
+
+/// The ID of the user prompt that initiated a request.
+///
+/// This equates to the user physically submitting a message to the model (e.g., by pressing the Enter key).
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize)]
+pub struct PromptId(Arc<str>);
+
+impl PromptId {
+    pub fn new() -> Self {
+        Self(Uuid::new_v4().to_string().into())
+    }
+}
+
+impl std::fmt::Display for PromptId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Message {
@@ -412,6 +454,8 @@ pub struct ToolCallAuthorization {
 }
 
 pub struct Thread {
+    id: ThreadId,
+    prompt_id: PromptId,
     messages: Vec<Message>,
     completion_mode: CompletionMode,
     /// Holds the task that handles agent interaction until the end of the turn.
@@ -442,6 +486,8 @@ impl Thread {
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
         Self {
+            id: ThreadId::new(),
+            prompt_id: PromptId::new(),
             messages: Vec::new(),
             completion_mode: CompletionMode::Normal,
             running_turn: None,
@@ -553,6 +599,7 @@ impl Thread {
         T: Into<UserMessageContent>,
     {
         log::info!("Thread::send called with model: {:?}", self.model.name());
+        self.advance_prompt_id();
 
         let content = content.into_iter().map(Into::into).collect::<Vec<_>>();
         log::debug!("Thread::send content: {:?}", content);
@@ -976,15 +1023,15 @@ impl Thread {
         log::info!("Request includes {} tools", tools.len());
 
         let request = LanguageModelRequest {
-            thread_id: None,
-            prompt_id: None,
+            thread_id: Some(self.id.to_string()),
+            prompt_id: Some(self.prompt_id.to_string()),
             intent: Some(completion_intent),
             mode: Some(self.completion_mode.into()),
             messages,
             tools,
             tool_choice: None,
             stop: Vec::new(),
-            temperature: None,
+            temperature: AgentSettings::temperature_for_model(self.model(), cx),
             thinking_allowed: true,
         };
 
@@ -1072,6 +1119,10 @@ impl Thread {
 
         markdown
     }
+
+    fn advance_prompt_id(&mut self) {
+        self.prompt_id = PromptId::new();
+    }
 }
 
 pub trait AgentTool

From 485802b9e5226cb00c14bf9d94211cabfd42a51b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 10:46:06 -0400
Subject: [PATCH 056/823] collab: Remove endpoints for issuing notifications
 from Cloud (#36249)

This PR removes the `POST /users/:id/refresh_llm_tokens` and `POST
/users/:id/update_plan` endpoints from Collab.

These endpoints were added to be called by Cloud in order to push down
notifications over the Collab RPC connection.

Cloud now sends down notifications to clients directly, so we no longer
need these endpoints.

All calls to these endpoints have already been removed in production.

Release Notes:

- N/A
---
 crates/collab/src/api.rs | 92 ----------------------------------------
 crates/collab/src/rpc.rs | 47 --------------------
 2 files changed, 139 deletions(-)

diff --git a/crates/collab/src/api.rs b/crates/collab/src/api.rs
index 6cf3f68f54..078a4469ae 100644
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@@ -11,9 +11,7 @@ use crate::{
     db::{User, UserId},
     rpc,
 };
-use ::rpc::proto;
 use anyhow::Context as _;
-use axum::extract;
 use axum::{
     Extension, Json, Router,
     body::Body,
@@ -25,7 +23,6 @@ use axum::{
     routing::{get, post},
 };
 use axum_extra::response::ErasedJson;
-use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::sync::{Arc, OnceLock};
 use tower::ServiceBuilder;
@@ -102,8 +99,6 @@ pub fn routes(rpc_server: Arc<rpc::Server>) -> Router<(), Body> {
     Router::new()
         .route("/users/look_up", get(look_up_user))
         .route("/users/:id/access_tokens", post(create_access_token))
-        .route("/users/:id/refresh_llm_tokens", post(refresh_llm_tokens))
-        .route("/users/:id/update_plan", post(update_plan))
         .route("/rpc_server_snapshot", get(get_rpc_server_snapshot))
         .merge(contributors::router())
         .layer(
@@ -295,90 +290,3 @@ async fn create_access_token(
         encrypted_access_token,
     }))
 }
-
-#[derive(Serialize)]
-struct RefreshLlmTokensResponse {}
-
-async fn refresh_llm_tokens(
-    Path(user_id): Path<UserId>,
-    Extension(rpc_server): Extension<Arc<rpc::Server>>,
-) -> Result<Json<RefreshLlmTokensResponse>> {
-    rpc_server.refresh_llm_tokens_for_user(user_id).await;
-
-    Ok(Json(RefreshLlmTokensResponse {}))
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct UpdatePlanBody {
-    pub plan: cloud_llm_client::Plan,
-    pub subscription_period: SubscriptionPeriod,
-    pub usage: cloud_llm_client::CurrentUsage,
-    pub trial_started_at: Option<DateTime<Utc>>,
-    pub is_usage_based_billing_enabled: bool,
-    pub is_account_too_young: bool,
-    pub has_overdue_invoices: bool,
-}
-
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
-struct SubscriptionPeriod {
-    pub started_at: DateTime<Utc>,
-    pub ended_at: DateTime<Utc>,
-}
-
-#[derive(Serialize)]
-struct UpdatePlanResponse {}
-
-async fn update_plan(
-    Path(user_id): Path<UserId>,
-    Extension(rpc_server): Extension<Arc<rpc::Server>>,
-    extract::Json(body): extract::Json<UpdatePlanBody>,
-) -> Result<Json<UpdatePlanResponse>> {
-    let plan = match body.plan {
-        cloud_llm_client::Plan::ZedFree => proto::Plan::Free,
-        cloud_llm_client::Plan::ZedPro => proto::Plan::ZedPro,
-        cloud_llm_client::Plan::ZedProTrial => proto::Plan::ZedProTrial,
-    };
-
-    let update_user_plan = proto::UpdateUserPlan {
-        plan: plan.into(),
-        trial_started_at: body
-            .trial_started_at
-            .map(|trial_started_at| trial_started_at.timestamp() as u64),
-        is_usage_based_billing_enabled: Some(body.is_usage_based_billing_enabled),
-        usage: Some(proto::SubscriptionUsage {
-            model_requests_usage_amount: body.usage.model_requests.used,
-            model_requests_usage_limit: Some(usage_limit_to_proto(body.usage.model_requests.limit)),
-            edit_predictions_usage_amount: body.usage.edit_predictions.used,
-            edit_predictions_usage_limit: Some(usage_limit_to_proto(
-                body.usage.edit_predictions.limit,
-            )),
-        }),
-        subscription_period: Some(proto::SubscriptionPeriod {
-            started_at: body.subscription_period.started_at.timestamp() as u64,
-            ended_at: body.subscription_period.ended_at.timestamp() as u64,
-        }),
-        account_too_young: Some(body.is_account_too_young),
-        has_overdue_invoices: Some(body.has_overdue_invoices),
-    };
-
-    rpc_server
-        .update_plan_for_user(user_id, update_user_plan)
-        .await?;
-
-    Ok(Json(UpdatePlanResponse {}))
-}
-
-fn usage_limit_to_proto(limit: cloud_llm_client::UsageLimit) -> proto::UsageLimit {
-    proto::UsageLimit {
-        variant: Some(match limit {
-            cloud_llm_client::UsageLimit::Limited(limit) => {
-                proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                    limit: limit as u32,
-                })
-            }
-            cloud_llm_client::UsageLimit::Unlimited => {
-                proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-            }
-        }),
-    }
-}
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 18eb1457dc..584970a4c6 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1081,53 +1081,6 @@ impl Server {
         Ok(())
     }
 
-    pub async fn update_plan_for_user(
-        self: &Arc<Self>,
-        user_id: UserId,
-        update_user_plan: proto::UpdateUserPlan,
-    ) -> Result<()> {
-        let pool = self.connection_pool.lock();
-        for connection_id in pool.user_connection_ids(user_id) {
-            self.peer
-                .send(connection_id, update_user_plan.clone())
-                .trace_err();
-        }
-
-        Ok(())
-    }
-
-    /// This is the legacy way of updating the user's plan, where we fetch the data to construct the `UpdateUserPlan`
-    /// message on the Collab server.
-    ///
-    /// The new way is to receive the data from Cloud via the `POST /users/:id/update_plan` endpoint.
-    pub async fn update_plan_for_user_legacy(self: &Arc<Self>, user_id: UserId) -> Result<()> {
-        let user = self
-            .app_state
-            .db
-            .get_user_by_id(user_id)
-            .await?
-            .context("user not found")?;
-
-        let update_user_plan = make_update_user_plan_message(
-            &user,
-            user.admin,
-            &self.app_state.db,
-            self.app_state.llm_db.clone(),
-        )
-        .await?;
-
-        self.update_plan_for_user(user_id, update_user_plan).await
-    }
-
-    pub async fn refresh_llm_tokens_for_user(self: &Arc<Self>, user_id: UserId) {
-        let pool = self.connection_pool.lock();
-        for connection_id in pool.user_connection_ids(user_id) {
-            self.peer
-                .send(connection_id, proto::RefreshLlmToken {})
-                .trace_err();
-        }
-    }
-
     pub async fn snapshot(self: &Arc<Self>) -> ServerSnapshot<'_> {
         ServerSnapshot {
             connection_pool: ConnectionPoolGuard {

From 7993ee9c07a56e61ead665ca95343c038ea2765a Mon Sep 17 00:00:00 2001
From: Igal Tabachnik <hmemcpy@gmail.com>
Date: Fri, 15 Aug 2025 18:26:38 +0300
Subject: [PATCH 057/823] Suggest unsaved buffer content text as the default
 filename (#35707)

Closes #24672

This PR complements a feature added earlier by @JosephTLyons (in
https://github.com/zed-industries/zed/pull/32353) where the text is
considered as the tab title in a new buffer. It piggybacks off that
change and sets the title as the suggested filename in the save dialog
(completely mirroring the same functionality in VSCode):

![2025-08-05 11 50
28](https://github.com/user-attachments/assets/49ad9e4a-5559-44b0-a4b0-ae19890e478e)

Release Notes:

- Text entered in a new untitled buffer is considered as the default
filename when saving
---
 crates/editor/src/items.rs                   |  4 +++
 crates/gpui/src/app.rs                       |  3 +-
 crates/gpui/src/platform.rs                  |  6 +++-
 crates/gpui/src/platform/linux/platform.rs   | 29 +++++++++++++-------
 crates/gpui/src/platform/mac/platform.rs     | 12 +++++++-
 crates/gpui/src/platform/test/platform.rs    |  1 +
 crates/gpui/src/platform/windows/platform.rs | 20 ++++++++++++--
 crates/workspace/src/item.rs                 | 11 ++++++++
 crates/workspace/src/pane.rs                 |  4 ++-
 crates/workspace/src/workspace.rs            |  3 +-
 10 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 480757a491..45a4f7365c 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -654,6 +654,10 @@ impl Item for Editor {
         }
     }
 
+    fn suggested_filename(&self, cx: &App) -> SharedString {
+        self.buffer.read(cx).title(cx).to_string().into()
+    }
+
     fn tab_icon(&self, _: &Window, cx: &App) -> Option<Icon> {
         ItemSettings::get_global(cx)
             .file_icons
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 5f6d252503..e1df6d0be4 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -816,8 +816,9 @@ impl App {
     pub fn prompt_for_new_path(
         &self,
         directory: &Path,
+        suggested_name: Option<&str>,
     ) -> oneshot::Receiver<Result<Option<PathBuf>>> {
-        self.platform.prompt_for_new_path(directory)
+        self.platform.prompt_for_new_path(directory, suggested_name)
     }
 
     /// Reveals the specified path at the platform level, such as in Finder on macOS.
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index b495d70dfd..bf6ce68703 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -220,7 +220,11 @@ pub(crate) trait Platform: 'static {
         &self,
         options: PathPromptOptions,
     ) -> oneshot::Receiver<Result<Option<Vec<PathBuf>>>>;
-    fn prompt_for_new_path(&self, directory: &Path) -> oneshot::Receiver<Result<Option<PathBuf>>>;
+    fn prompt_for_new_path(
+        &self,
+        directory: &Path,
+        suggested_name: Option<&str>,
+    ) -> oneshot::Receiver<Result<Option<PathBuf>>>;
     fn can_select_mixed_files_and_dirs(&self) -> bool;
     fn reveal_path(&self, path: &Path);
     fn open_with_system(&self, path: &Path);
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index fe6a36baa8..31d445be52 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -327,26 +327,35 @@ impl<P: LinuxClient + 'static> Platform for P {
         done_rx
     }
 
-    fn prompt_for_new_path(&self, directory: &Path) -> oneshot::Receiver<Result<Option<PathBuf>>> {
+    fn prompt_for_new_path(
+        &self,
+        directory: &Path,
+        suggested_name: Option<&str>,
+    ) -> oneshot::Receiver<Result<Option<PathBuf>>> {
         let (done_tx, done_rx) = oneshot::channel();
 
         #[cfg(not(any(feature = "wayland", feature = "x11")))]
-        let _ = (done_tx.send(Ok(None)), directory);
+        let _ = (done_tx.send(Ok(None)), directory, suggested_name);
 
         #[cfg(any(feature = "wayland", feature = "x11"))]
         self.foreground_executor()
             .spawn({
                 let directory = directory.to_owned();
+                let suggested_name = suggested_name.map(|s| s.to_owned());
 
                 async move {
-                    let request = match ashpd::desktop::file_chooser::SaveFileRequest::default()
-                        .modal(true)
-                        .title("Save File")
-                        .current_folder(directory)
-                        .expect("pathbuf should not be nul terminated")
-                        .send()
-                        .await
-                    {
+                    let mut request_builder =
+                        ashpd::desktop::file_chooser::SaveFileRequest::default()
+                            .modal(true)
+                            .title("Save File")
+                            .current_folder(directory)
+                            .expect("pathbuf should not be nul terminated");
+
+                    if let Some(suggested_name) = suggested_name {
+                        request_builder = request_builder.current_name(suggested_name.as_str());
+                    }
+
+                    let request = match request_builder.send().await {
                         Ok(request) => request,
                         Err(err) => {
                             let result = match err {
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index c573131799..533423229c 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -737,8 +737,13 @@ impl Platform for MacPlatform {
         done_rx
     }
 
-    fn prompt_for_new_path(&self, directory: &Path) -> oneshot::Receiver<Result<Option<PathBuf>>> {
+    fn prompt_for_new_path(
+        &self,
+        directory: &Path,
+        suggested_name: Option<&str>,
+    ) -> oneshot::Receiver<Result<Option<PathBuf>>> {
         let directory = directory.to_owned();
+        let suggested_name = suggested_name.map(|s| s.to_owned());
         let (done_tx, done_rx) = oneshot::channel();
         self.foreground_executor()
             .spawn(async move {
@@ -748,6 +753,11 @@ impl Platform for MacPlatform {
                     let url = NSURL::fileURLWithPath_isDirectory_(nil, path, true.to_objc());
                     panel.setDirectoryURL(url);
 
+                    if let Some(suggested_name) = suggested_name {
+                        let name_string = ns_string(&suggested_name);
+                        let _: () = msg_send![panel, setNameFieldStringValue: name_string];
+                    }
+
                     let done_tx = Cell::new(Some(done_tx));
                     let block = ConcreteBlock::new(move |response: NSModalResponse| {
                         let mut result = None;
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index a26b65576c..69371bc8c4 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -336,6 +336,7 @@ impl Platform for TestPlatform {
     fn prompt_for_new_path(
         &self,
         directory: &std::path::Path,
+        _suggested_name: Option<&str>,
     ) -> oneshot::Receiver<Result<Option<std::path::PathBuf>>> {
         let (tx, rx) = oneshot::channel();
         self.background_executor()
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index bbde655b80..c1fb0cabc4 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -490,13 +490,18 @@ impl Platform for WindowsPlatform {
         rx
     }
 
-    fn prompt_for_new_path(&self, directory: &Path) -> Receiver<Result<Option<PathBuf>>> {
+    fn prompt_for_new_path(
+        &self,
+        directory: &Path,
+        suggested_name: Option<&str>,
+    ) -> Receiver<Result<Option<PathBuf>>> {
         let directory = directory.to_owned();
+        let suggested_name = suggested_name.map(|s| s.to_owned());
         let (tx, rx) = oneshot::channel();
         let window = self.find_current_active_window();
         self.foreground_executor()
             .spawn(async move {
-                let _ = tx.send(file_save_dialog(directory, window));
+                let _ = tx.send(file_save_dialog(directory, suggested_name, window));
             })
             .detach();
 
@@ -804,7 +809,11 @@ fn file_open_dialog(
     Ok(Some(paths))
 }
 
-fn file_save_dialog(directory: PathBuf, window: Option<HWND>) -> Result<Option<PathBuf>> {
+fn file_save_dialog(
+    directory: PathBuf,
+    suggested_name: Option<String>,
+    window: Option<HWND>,
+) -> Result<Option<PathBuf>> {
     let dialog: IFileSaveDialog = unsafe { CoCreateInstance(&FileSaveDialog, None, CLSCTX_ALL)? };
     if !directory.to_string_lossy().is_empty() {
         if let Some(full_path) = directory.canonicalize().log_err() {
@@ -815,6 +824,11 @@ fn file_save_dialog(directory: PathBuf, window: Option<HWND>) -> Result<Option<P
             unsafe { dialog.SetFolder(&path_item).log_err() };
         }
     }
+
+    if let Some(suggested_name) = suggested_name {
+        unsafe { dialog.SetFileName(&HSTRING::from(suggested_name)).log_err() };
+    }
+
     unsafe {
         dialog.SetFileTypes(&[Common::COMDLG_FILTERSPEC {
             pszName: windows::core::w!("All files"),
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index bba50e4431..0c5543650e 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -270,6 +270,12 @@ pub trait Item: Focusable + EventEmitter<Self::Event> + Render + Sized {
     /// Returns the textual contents of the tab.
     fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString;
 
+    /// Returns the suggested filename for saving this item.
+    /// By default, returns the tab content text.
+    fn suggested_filename(&self, cx: &App) -> SharedString {
+        self.tab_content_text(0, cx)
+    }
+
     fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
         None
     }
@@ -497,6 +503,7 @@ pub trait ItemHandle: 'static + Send {
     ) -> gpui::Subscription;
     fn tab_content(&self, params: TabContentParams, window: &Window, cx: &App) -> AnyElement;
     fn tab_content_text(&self, detail: usize, cx: &App) -> SharedString;
+    fn suggested_filename(&self, cx: &App) -> SharedString;
     fn tab_icon(&self, window: &Window, cx: &App) -> Option<Icon>;
     fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString>;
     fn tab_tooltip_content(&self, cx: &App) -> Option<TabTooltipContent>;
@@ -631,6 +638,10 @@ impl<T: Item> ItemHandle for Entity<T> {
         self.read(cx).tab_content_text(detail, cx)
     }
 
+    fn suggested_filename(&self, cx: &App) -> SharedString {
+        self.read(cx).suggested_filename(cx)
+    }
+
     fn tab_icon(&self, window: &Window, cx: &App) -> Option<Icon> {
         self.read(cx).tab_icon(window, cx)
     }
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 45bd497705..759e91f758 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2062,6 +2062,8 @@ impl Pane {
                 })?
                 .await?;
             } else if can_save_as && is_singleton {
+                let suggested_name =
+                    cx.update(|_window, cx| item.suggested_filename(cx).to_string())?;
                 let new_path = pane.update_in(cx, |pane, window, cx| {
                     pane.activate_item(item_ix, true, true, window, cx);
                     pane.workspace.update(cx, |workspace, cx| {
@@ -2073,7 +2075,7 @@ impl Pane {
                         } else {
                             DirectoryLister::Project(workspace.project().clone())
                         };
-                        workspace.prompt_for_new_path(lister, window, cx)
+                        workspace.prompt_for_new_path(lister, Some(suggested_name), window, cx)
                     })
                 })??;
                 let Some(new_path) = new_path.await.ok().flatten().into_iter().flatten().next()
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 3129c12dbf..ade6838fad 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2067,6 +2067,7 @@ impl Workspace {
     pub fn prompt_for_new_path(
         &mut self,
         lister: DirectoryLister,
+        suggested_name: Option<String>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> oneshot::Receiver<Option<Vec<PathBuf>>> {
@@ -2094,7 +2095,7 @@ impl Workspace {
                     })
                     .or_else(std::env::home_dir)
                     .unwrap_or_else(|| PathBuf::from(""));
-                cx.prompt_for_new_path(&relative_to)
+                cx.prompt_for_new_path(&relative_to, suggested_name.as_deref())
             })?;
             let abs_path = match abs_path.await? {
                 Ok(path) => path,

From 7671f34f88aefbaf75a313cf4b1fc0523cb7a43a Mon Sep 17 00:00:00 2001
From: Oleksiy Syvokon <oleksiy@zed.dev>
Date: Fri, 15 Aug 2025 18:37:24 +0300
Subject: [PATCH 058/823] agent: Create checkpoint before/after every edit
 operation (#36253)

1. Previously, checkpoints only appeared when an agent's edit happened
immediately after a user message. This is rare (agent usually collects
some context first), so they were almost never shown. This is now fixed.

2. After this change, a checkpoint is created after every edit
operation. So when the agent edits files five times in a single dialog
turn, we will now display five checkpoints.

As a bonus, it's now possible to undo only a part of a long agent
response.

Closes #36092, #32917

Release Notes:

- Create agent checkpoints more frequently (before every edit)
---
 crates/agent/src/thread.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 1d417efbba..f3f1088483 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -844,11 +844,17 @@ impl Thread {
                     .await
                     .unwrap_or(false);
 
-                if !equal {
-                    this.update(cx, |this, cx| {
-                        this.insert_checkpoint(pending_checkpoint, cx)
-                    })?;
-                }
+                this.update(cx, |this, cx| {
+                    this.pending_checkpoint = if equal {
+                        Some(pending_checkpoint)
+                    } else {
+                        this.insert_checkpoint(pending_checkpoint, cx);
+                        Some(ThreadCheckpoint {
+                            message_id: this.next_message_id,
+                            git_checkpoint: final_checkpoint,
+                        })
+                    }
+                })?;
 
                 Ok(())
             }

From c39f294bcbae49e649d5cdd7d5bc774fa7a7190a Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Fri, 15 Aug 2025 21:43:18 +0530
Subject: [PATCH 059/823] remote: Add support for additional SSH arguments in
 SshSocket (#33243)

Closes #29438

Release Notes:

- Fix SSH agent forwarding doesn't work when using SSH remote
development.
---
 crates/remote/src/ssh_session.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index df7212d44c..2f462a86a5 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -400,6 +400,7 @@ impl SshSocket {
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
+            .args(self.connection_options.additional_args())
             .args(["-o", "ControlMaster=no", "-o"])
             .arg(format!("ControlPath={}", self.socket_path.display()))
     }
@@ -410,6 +411,7 @@ impl SshSocket {
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
+            .args(self.connection_options.additional_args())
             .envs(self.envs.clone())
     }
 
@@ -417,22 +419,26 @@ impl SshSocket {
     // On Linux, we use the `ControlPath` option to create a socket file that ssh can use to
     #[cfg(not(target_os = "windows"))]
     fn ssh_args(&self) -> SshArgs {
+        let mut arguments = self.connection_options.additional_args();
+        arguments.extend(vec![
+            "-o".to_string(),
+            "ControlMaster=no".to_string(),
+            "-o".to_string(),
+            format!("ControlPath={}", self.socket_path.display()),
+            self.connection_options.ssh_url(),
+        ]);
         SshArgs {
-            arguments: vec![
-                "-o".to_string(),
-                "ControlMaster=no".to_string(),
-                "-o".to_string(),
-                format!("ControlPath={}", self.socket_path.display()),
-                self.connection_options.ssh_url(),
-            ],
+            arguments,
             envs: None,
         }
     }
 
     #[cfg(target_os = "windows")]
     fn ssh_args(&self) -> SshArgs {
+        let mut arguments = self.connection_options.additional_args();
+        arguments.push(self.connection_options.ssh_url());
         SshArgs {
-            arguments: vec![self.connection_options.ssh_url()],
+            arguments,
             envs: Some(self.envs.clone()),
         }
     }

From 257e0991d8069face34e734ff9ca4e9baa027817 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 12:13:52 -0400
Subject: [PATCH 060/823] collab: Increase minimum required version to connect
 (#36255)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR increases the minimum required version to connect to Collab.

Previously this was set at v0.157.0.

The new minimum required version is v0.198.4, which is the first version
where we no longer connect to Collab automatically.

Clients on the v0.199.x minor version will also need to be v0.199.2 or
greater in order to connect, due to us hotfixing the connection changes
to the Preview branch.

We're doing this to force clients to upgrade in order to connect to
Collab, as we're going to be removing some of the old RPC usages related
to authentication that are no longer used. Therefore, we want users to
be on a version of Zed that does not rely on those messages.

Users will see a message similar to this one, prompting them to upgrade:

<img width="1209" height="875" alt="Screenshot 2025-08-15 at 11 37
55 AM"
src="https://github.com/user-attachments/assets/59ffff3e-8f82-4152-84a8-776c691eaaee"
/>

> Note: In this case I'm simulating the error state, which is why I'm
signed in via Cloud while still not being able to connect to Collab.
Users on older versions will see the "Please update Zed to Collaborate"
message without being signed in.

Release Notes:

- N/A
---
 crates/collab/src/rpc/connection_pool.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/crates/collab/src/rpc/connection_pool.rs b/crates/collab/src/rpc/connection_pool.rs
index 35290fa697..729e7c8533 100644
--- a/crates/collab/src/rpc/connection_pool.rs
+++ b/crates/collab/src/rpc/connection_pool.rs
@@ -30,7 +30,19 @@ impl fmt::Display for ZedVersion {
 
 impl ZedVersion {
     pub fn can_collaborate(&self) -> bool {
-        self.0 >= SemanticVersion::new(0, 157, 0)
+        // v0.198.4 is the first version where we no longer connect to Collab automatically.
+        // We reject any clients older than that to prevent them from connecting to Collab just for authentication.
+        if self.0 < SemanticVersion::new(0, 198, 4) {
+            return false;
+        }
+
+        // Since we hotfixed the changes to no longer connect to Collab automatically to Preview, we also need to reject
+        // versions in the range [v0.199.0, v0.199.1].
+        if self.0 >= SemanticVersion::new(0, 199, 0) && self.0 < SemanticVersion::new(0, 199, 2) {
+            return false;
+        }
+
+        true
     }
 }
 

From 75b832029a7ab35442e030fff05df55dbbd2d6de Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 13:26:21 -0400
Subject: [PATCH 061/823] Remove RPC messages pertaining to the LLM token
 (#36252)

This PR removes the RPC messages pertaining to the LLM token.

We now retrieve the LLM token from Cloud.

Release Notes:

- N/A
---
 Cargo.lock                     |   2 -
 crates/collab/Cargo.toml       |   2 -
 crates/collab/src/llm.rs       |   3 -
 crates/collab/src/llm/token.rs | 146 ---------------------------------
 crates/collab/src/rpc.rs       |  96 +---------------------
 crates/proto/proto/ai.proto    |   8 --
 crates/proto/proto/zed.proto   |   6 +-
 crates/proto/src/proto.rs      |   4 -
 8 files changed, 4 insertions(+), 263 deletions(-)
 delete mode 100644 crates/collab/src/llm/token.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2353733dc0..bfc797d6cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3324,7 +3324,6 @@ dependencies = [
  "http_client",
  "hyper 0.14.32",
  "indoc",
- "jsonwebtoken",
  "language",
  "language_model",
  "livekit_api",
@@ -3370,7 +3369,6 @@ dependencies = [
  "telemetry_events",
  "text",
  "theme",
- "thiserror 2.0.12",
  "time",
  "tokio",
  "toml 0.8.20",
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 9af95317e6..9a867f9e05 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -39,7 +39,6 @@ futures.workspace = true
 gpui.workspace = true
 hex.workspace = true
 http_client.workspace = true
-jsonwebtoken.workspace = true
 livekit_api.workspace = true
 log.workspace = true
 nanoid.workspace = true
@@ -65,7 +64,6 @@ subtle.workspace = true
 supermaven_api.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
-thiserror.workspace = true
 time.workspace = true
 tokio = { workspace = true, features = ["full"] }
 toml.workspace = true
diff --git a/crates/collab/src/llm.rs b/crates/collab/src/llm.rs
index de74858168..ca8e89bc6d 100644
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -1,7 +1,4 @@
 pub mod db;
-mod token;
-
-pub use token::*;
 
 pub const AGENT_EXTENDED_TRIAL_FEATURE_FLAG: &str = "agent-extended-trial";
 
diff --git a/crates/collab/src/llm/token.rs b/crates/collab/src/llm/token.rs
deleted file mode 100644
index da01c7f3be..0000000000
--- a/crates/collab/src/llm/token.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use crate::db::billing_subscription::SubscriptionKind;
-use crate::db::{billing_customer, billing_subscription, user};
-use crate::llm::{AGENT_EXTENDED_TRIAL_FEATURE_FLAG, BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG};
-use crate::{Config, db::billing_preference};
-use anyhow::{Context as _, Result};
-use chrono::{NaiveDateTime, Utc};
-use cloud_llm_client::Plan;
-use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation};
-use serde::{Deserialize, Serialize};
-use std::time::Duration;
-use thiserror::Error;
-use uuid::Uuid;
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LlmTokenClaims {
-    pub iat: u64,
-    pub exp: u64,
-    pub jti: String,
-    pub user_id: u64,
-    pub system_id: Option<String>,
-    pub metrics_id: Uuid,
-    pub github_user_login: String,
-    pub account_created_at: NaiveDateTime,
-    pub is_staff: bool,
-    pub has_llm_closed_beta_feature_flag: bool,
-    pub bypass_account_age_check: bool,
-    pub use_llm_request_queue: bool,
-    pub plan: Plan,
-    pub has_extended_trial: bool,
-    pub subscription_period: (NaiveDateTime, NaiveDateTime),
-    pub enable_model_request_overages: bool,
-    pub model_request_overages_spend_limit_in_cents: u32,
-    pub can_use_web_search_tool: bool,
-    #[serde(default)]
-    pub has_overdue_invoices: bool,
-}
-
-const LLM_TOKEN_LIFETIME: Duration = Duration::from_secs(60 * 60);
-
-impl LlmTokenClaims {
-    pub fn create(
-        user: &user::Model,
-        is_staff: bool,
-        billing_customer: billing_customer::Model,
-        billing_preferences: Option<billing_preference::Model>,
-        feature_flags: &Vec<String>,
-        subscription: billing_subscription::Model,
-        system_id: Option<String>,
-        config: &Config,
-    ) -> Result<String> {
-        let secret = config
-            .llm_api_secret
-            .as_ref()
-            .context("no LLM API secret")?;
-
-        let plan = if is_staff {
-            Plan::ZedPro
-        } else {
-            subscription.kind.map_or(Plan::ZedFree, |kind| match kind {
-                SubscriptionKind::ZedFree => Plan::ZedFree,
-                SubscriptionKind::ZedPro => Plan::ZedPro,
-                SubscriptionKind::ZedProTrial => Plan::ZedProTrial,
-            })
-        };
-        let subscription_period =
-            billing_subscription::Model::current_period(Some(subscription), is_staff)
-                .map(|(start, end)| (start.naive_utc(), end.naive_utc()))
-                .context("A plan is required to use Zed's hosted models or edit predictions. Visit https://zed.dev/account to get started.")?;
-
-        let now = Utc::now();
-        let claims = Self {
-            iat: now.timestamp() as u64,
-            exp: (now + LLM_TOKEN_LIFETIME).timestamp() as u64,
-            jti: uuid::Uuid::new_v4().to_string(),
-            user_id: user.id.to_proto(),
-            system_id,
-            metrics_id: user.metrics_id,
-            github_user_login: user.github_login.clone(),
-            account_created_at: user.account_created_at(),
-            is_staff,
-            has_llm_closed_beta_feature_flag: feature_flags
-                .iter()
-                .any(|flag| flag == "llm-closed-beta"),
-            bypass_account_age_check: feature_flags
-                .iter()
-                .any(|flag| flag == BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG),
-            can_use_web_search_tool: true,
-            use_llm_request_queue: feature_flags.iter().any(|flag| flag == "llm-request-queue"),
-            plan,
-            has_extended_trial: feature_flags
-                .iter()
-                .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG),
-            subscription_period,
-            enable_model_request_overages: billing_preferences
-                .as_ref()
-                .map_or(false, |preferences| {
-                    preferences.model_request_overages_enabled
-                }),
-            model_request_overages_spend_limit_in_cents: billing_preferences
-                .as_ref()
-                .map_or(0, |preferences| {
-                    preferences.model_request_overages_spend_limit_in_cents as u32
-                }),
-            has_overdue_invoices: billing_customer.has_overdue_invoices,
-        };
-
-        Ok(jsonwebtoken::encode(
-            &Header::default(),
-            &claims,
-            &EncodingKey::from_secret(secret.as_ref()),
-        )?)
-    }
-
-    pub fn validate(token: &str, config: &Config) -> Result<LlmTokenClaims, ValidateLlmTokenError> {
-        let secret = config
-            .llm_api_secret
-            .as_ref()
-            .context("no LLM API secret")?;
-
-        match jsonwebtoken::decode::<Self>(
-            token,
-            &DecodingKey::from_secret(secret.as_ref()),
-            &Validation::default(),
-        ) {
-            Ok(token) => Ok(token.claims),
-            Err(e) => {
-                if e.kind() == &jsonwebtoken::errors::ErrorKind::ExpiredSignature {
-                    Err(ValidateLlmTokenError::Expired)
-                } else {
-                    Err(ValidateLlmTokenError::JwtError(e))
-                }
-            }
-        }
-    }
-}
-
-#[derive(Error, Debug)]
-pub enum ValidateLlmTokenError {
-    #[error("access token is expired")]
-    Expired,
-    #[error("access token validation error: {0}")]
-    JwtError(#[from] jsonwebtoken::errors::Error),
-    #[error("{0}")]
-    Other(#[from] anyhow::Error),
-}
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 584970a4c6..715ff4e67d 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1,14 +1,12 @@
 mod connection_pool;
 
-use crate::api::billing::find_or_create_billing_customer;
 use crate::api::{CloudflareIpCountryHeader, SystemIdHeader};
 use crate::db::billing_subscription::SubscriptionKind;
 use crate::llm::db::LlmDatabase;
 use crate::llm::{
-    AGENT_EXTENDED_TRIAL_FEATURE_FLAG, BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG, LlmTokenClaims,
+    AGENT_EXTENDED_TRIAL_FEATURE_FLAG, BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG,
     MIN_ACCOUNT_AGE_FOR_LLM_USE,
 };
-use crate::stripe_client::StripeCustomerId;
 use crate::{
     AppState, Error, Result, auth,
     db::{
@@ -218,6 +216,7 @@ struct Session {
     /// The GeoIP country code for the user.
     #[allow(unused)]
     geoip_country_code: Option<String>,
+    #[allow(unused)]
     system_id: Option<String>,
     _executor: Executor,
 }
@@ -464,7 +463,6 @@ impl Server {
             .add_message_handler(unfollow)
             .add_message_handler(update_followers)
             .add_request_handler(get_private_user_info)
-            .add_request_handler(get_llm_api_token)
             .add_request_handler(accept_terms_of_service)
             .add_message_handler(acknowledge_channel_message)
             .add_message_handler(acknowledge_buffer_version)
@@ -4251,96 +4249,6 @@ async fn accept_terms_of_service(
         accepted_tos_at: accepted_tos_at.timestamp() as u64,
     })?;
 
-    // When the user accepts the terms of service, we want to refresh their LLM
-    // token to grant access.
-    session
-        .peer
-        .send(session.connection_id, proto::RefreshLlmToken {})?;
-
-    Ok(())
-}
-
-async fn get_llm_api_token(
-    _request: proto::GetLlmToken,
-    response: Response<proto::GetLlmToken>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-
-    let flags = db.get_user_flags(session.user_id()).await?;
-
-    let user_id = session.user_id();
-    let user = db
-        .get_user_by_id(user_id)
-        .await?
-        .with_context(|| format!("user {user_id} not found"))?;
-
-    if user.accepted_tos_at.is_none() {
-        Err(anyhow!("terms of service not accepted"))?
-    }
-
-    let stripe_client = session
-        .app_state
-        .stripe_client
-        .as_ref()
-        .context("failed to retrieve Stripe client")?;
-
-    let stripe_billing = session
-        .app_state
-        .stripe_billing
-        .as_ref()
-        .context("failed to retrieve Stripe billing object")?;
-
-    let billing_customer = if let Some(billing_customer) =
-        db.get_billing_customer_by_user_id(user.id).await?
-    {
-        billing_customer
-    } else {
-        let customer_id = stripe_billing
-            .find_or_create_customer_by_email(user.email_address.as_deref())
-            .await?;
-
-        find_or_create_billing_customer(&session.app_state, stripe_client.as_ref(), &customer_id)
-            .await?
-            .context("billing customer not found")?
-    };
-
-    let billing_subscription =
-        if let Some(billing_subscription) = db.get_active_billing_subscription(user.id).await? {
-            billing_subscription
-        } else {
-            let stripe_customer_id =
-                StripeCustomerId(billing_customer.stripe_customer_id.clone().into());
-
-            let stripe_subscription = stripe_billing
-                .subscribe_to_zed_free(stripe_customer_id)
-                .await?;
-
-            db.create_billing_subscription(&db::CreateBillingSubscriptionParams {
-                billing_customer_id: billing_customer.id,
-                kind: Some(SubscriptionKind::ZedFree),
-                stripe_subscription_id: stripe_subscription.id.to_string(),
-                stripe_subscription_status: stripe_subscription.status.into(),
-                stripe_cancellation_reason: None,
-                stripe_current_period_start: Some(stripe_subscription.current_period_start),
-                stripe_current_period_end: Some(stripe_subscription.current_period_end),
-            })
-            .await?
-        };
-
-    let billing_preferences = db.get_billing_preferences(user.id).await?;
-
-    let token = LlmTokenClaims::create(
-        &user,
-        session.is_staff(),
-        billing_customer,
-        billing_preferences,
-        &flags,
-        billing_subscription,
-        session.system_id.clone(),
-        &session.app_state.config,
-    )?;
-    response.send(proto::GetLlmTokenResponse { token })?;
     Ok(())
 }
 
diff --git a/crates/proto/proto/ai.proto b/crates/proto/proto/ai.proto
index 67c2224387..1064ed2f8d 100644
--- a/crates/proto/proto/ai.proto
+++ b/crates/proto/proto/ai.proto
@@ -158,14 +158,6 @@ message SynchronizeContextsResponse {
     repeated ContextVersion contexts = 1;
 }
 
-message GetLlmToken {}
-
-message GetLlmTokenResponse {
-    string token = 1;
-}
-
-message RefreshLlmToken {}
-
 enum LanguageModelRole {
     LanguageModelUser = 0;
     LanguageModelAssistant = 1;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 856a793c2f..b6c7fc3cac 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -250,10 +250,6 @@ message Envelope {
         AddWorktree add_worktree = 222;
         AddWorktreeResponse add_worktree_response = 223;
 
-        GetLlmToken get_llm_token = 235;
-        GetLlmTokenResponse get_llm_token_response = 236;
-        RefreshLlmToken refresh_llm_token = 259;
-
         LspExtSwitchSourceHeader lsp_ext_switch_source_header = 241;
         LspExtSwitchSourceHeaderResponse lsp_ext_switch_source_header_response = 242;
 
@@ -419,7 +415,9 @@ message Envelope {
     reserved 221;
     reserved 224 to 229;
     reserved 230 to 231;
+    reserved 235 to 236;
     reserved 246;
+    reserved 259;
     reserved 270;
     reserved 247 to 254;
     reserved 255 to 256;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index a5dd97661f..8be9fed172 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -119,8 +119,6 @@ messages!(
     (GetTypeDefinitionResponse, Background),
     (GetImplementation, Background),
     (GetImplementationResponse, Background),
-    (GetLlmToken, Background),
-    (GetLlmTokenResponse, Background),
     (OpenUnstagedDiff, Foreground),
     (OpenUnstagedDiffResponse, Foreground),
     (OpenUncommittedDiff, Foreground),
@@ -196,7 +194,6 @@ messages!(
     (PrepareRenameResponse, Background),
     (ProjectEntryResponse, Foreground),
     (RefreshInlayHints, Foreground),
-    (RefreshLlmToken, Background),
     (RegisterBufferWithLanguageServers, Background),
     (RejoinChannelBuffers, Foreground),
     (RejoinChannelBuffersResponse, Foreground),
@@ -354,7 +351,6 @@ request_messages!(
     (GetDocumentHighlights, GetDocumentHighlightsResponse),
     (GetDocumentSymbols, GetDocumentSymbolsResponse),
     (GetHover, GetHoverResponse),
-    (GetLlmToken, GetLlmTokenResponse),
     (GetNotifications, GetNotificationsResponse),
     (GetPrivateUserInfo, GetPrivateUserInfoResponse),
     (GetProjectSymbols, GetProjectSymbolsResponse),

From e452aba9da0cd66ec227371a2466f7a97847d5a9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 13:59:08 -0400
Subject: [PATCH 062/823] proto: Order `reserved` fields (#36261)

This PR orders the `reserved` fields in the RPC `Envelope`, as they had
gotten unsorted.

Release Notes:

- N/A
---
 crates/proto/proto/zed.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index b6c7fc3cac..7e7bd6b42b 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -417,10 +417,10 @@ message Envelope {
     reserved 230 to 231;
     reserved 235 to 236;
     reserved 246;
-    reserved 259;
-    reserved 270;
     reserved 247 to 254;
     reserved 255 to 256;
+    reserved 259;
+    reserved 270;
     reserved 280 to 281;
     reserved 332 to 333;
 }

From bd1fda6782933678be7ed8e39494aba32af871d1 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 14:27:31 -0400
Subject: [PATCH 063/823] proto: Remove `GetPrivateUserInfo` message (#36265)

This PR removes the `GetPrivateUserInfo` RPC message.

We're no longer using the message after
https://github.com/zed-industries/zed/pull/36255.

Release Notes:

- N/A
---
 crates/client/src/test.rs    | 67 +++++++++++-------------------------
 crates/collab/src/rpc.rs     | 25 --------------
 crates/proto/proto/app.proto |  9 -----
 crates/proto/proto/zed.proto |  3 +-
 crates/proto/src/proto.rs    |  3 --
 5 files changed, 21 insertions(+), 86 deletions(-)

diff --git a/crates/client/src/test.rs b/crates/client/src/test.rs
index 439fb100d2..3c451fcb01 100644
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -1,16 +1,12 @@
 use crate::{Client, Connection, Credentials, EstablishConnectionError, UserStore};
 use anyhow::{Context as _, Result, anyhow};
-use chrono::Duration;
 use cloud_api_client::{AuthenticatedUser, GetAuthenticatedUserResponse, PlanInfo};
 use cloud_llm_client::{CurrentUsage, Plan, UsageData, UsageLimit};
 use futures::{StreamExt, stream::BoxStream};
 use gpui::{AppContext as _, BackgroundExecutor, Entity, TestAppContext};
 use http_client::{AsyncBody, Method, Request, http};
 use parking_lot::Mutex;
-use rpc::{
-    ConnectionId, Peer, Receipt, TypedEnvelope,
-    proto::{self, GetPrivateUserInfo, GetPrivateUserInfoResponse},
-};
+use rpc::{ConnectionId, Peer, Receipt, TypedEnvelope, proto};
 use std::sync::Arc;
 
 pub struct FakeServer {
@@ -187,50 +183,27 @@ impl FakeServer {
     pub async fn receive<M: proto::EnvelopedMessage>(&self) -> Result<TypedEnvelope<M>> {
         self.executor.start_waiting();
 
-        loop {
-            let message = self
-                .state
-                .lock()
-                .incoming
-                .as_mut()
-                .expect("not connected")
-                .next()
-                .await
-                .context("other half hung up")?;
-            self.executor.finish_waiting();
-            let type_name = message.payload_type_name();
-            let message = message.into_any();
+        let message = self
+            .state
+            .lock()
+            .incoming
+            .as_mut()
+            .expect("not connected")
+            .next()
+            .await
+            .context("other half hung up")?;
+        self.executor.finish_waiting();
+        let type_name = message.payload_type_name();
+        let message = message.into_any();
 
-            if message.is::<TypedEnvelope<M>>() {
-                return Ok(*message.downcast().unwrap());
-            }
-
-            let accepted_tos_at = chrono::Utc::now()
-                .checked_sub_signed(Duration::hours(5))
-                .expect("failed to build accepted_tos_at")
-                .timestamp() as u64;
-
-            if message.is::<TypedEnvelope<GetPrivateUserInfo>>() {
-                self.respond(
-                    message
-                        .downcast::<TypedEnvelope<GetPrivateUserInfo>>()
-                        .unwrap()
-                        .receipt(),
-                    GetPrivateUserInfoResponse {
-                        metrics_id: "the-metrics-id".into(),
-                        staff: false,
-                        flags: Default::default(),
-                        accepted_tos_at: Some(accepted_tos_at),
-                    },
-                );
-                continue;
-            }
-
-            panic!(
-                "fake server received unexpected message type: {:?}",
-                type_name
-            );
+        if message.is::<TypedEnvelope<M>>() {
+            return Ok(*message.downcast().unwrap());
         }
+
+        panic!(
+            "fake server received unexpected message type: {:?}",
+            type_name
+        );
     }
 
     pub fn respond<T: proto::RequestMessage>(&self, receipt: Receipt<T>, response: T::Response) {
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 715ff4e67d..8366b2cf13 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -462,7 +462,6 @@ impl Server {
             .add_request_handler(follow)
             .add_message_handler(unfollow)
             .add_message_handler(update_followers)
-            .add_request_handler(get_private_user_info)
             .add_request_handler(accept_terms_of_service)
             .add_message_handler(acknowledge_channel_message)
             .add_message_handler(acknowledge_buffer_version)
@@ -4209,30 +4208,6 @@ async fn mark_notification_as_read(
     Ok(())
 }
 
-/// Get the current users information
-async fn get_private_user_info(
-    _request: proto::GetPrivateUserInfo,
-    response: Response<proto::GetPrivateUserInfo>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-
-    let metrics_id = db.get_user_metrics_id(session.user_id()).await?;
-    let user = db
-        .get_user_by_id(session.user_id())
-        .await?
-        .context("user not found")?;
-    let flags = db.get_user_flags(session.user_id()).await?;
-
-    response.send(proto::GetPrivateUserInfoResponse {
-        metrics_id,
-        staff: user.admin,
-        flags,
-        accepted_tos_at: user.accepted_tos_at.map(|t| t.and_utc().timestamp() as u64),
-    })?;
-    Ok(())
-}
-
 /// Accept the terms of service (tos) on behalf of the current user
 async fn accept_terms_of_service(
     _request: proto::AcceptTermsOfService,
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index 353f19adb2..66baf968e3 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -6,15 +6,6 @@ message UpdateInviteInfo {
     uint32 count = 2;
 }
 
-message GetPrivateUserInfo {}
-
-message GetPrivateUserInfoResponse {
-    string metrics_id = 1;
-    bool staff = 2;
-    repeated string flags = 3;
-    optional uint64 accepted_tos_at = 4;
-}
-
 enum Plan {
     Free = 0;
     ZedPro = 1;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 7e7bd6b42b..8984df2944 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -135,8 +135,6 @@ message Envelope {
         FollowResponse follow_response = 99;
         UpdateFollowers update_followers = 100;
         Unfollow unfollow = 101;
-        GetPrivateUserInfo get_private_user_info = 102;
-        GetPrivateUserInfoResponse get_private_user_info_response = 103;
         UpdateUserPlan update_user_plan = 234;
         UpdateDiffBases update_diff_bases = 104;
         AcceptTermsOfService accept_terms_of_service = 239;
@@ -402,6 +400,7 @@ message Envelope {
     }
 
     reserved 87 to 88;
+    reserved 102 to 103;
     reserved 158 to 161;
     reserved 164;
     reserved 166 to 169;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 8be9fed172..82bd1af6db 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -105,8 +105,6 @@ messages!(
     (GetPathMetadataResponse, Background),
     (GetPermalinkToLine, Foreground),
     (GetPermalinkToLineResponse, Foreground),
-    (GetPrivateUserInfo, Foreground),
-    (GetPrivateUserInfoResponse, Foreground),
     (GetProjectSymbols, Background),
     (GetProjectSymbolsResponse, Background),
     (GetReferences, Background),
@@ -352,7 +350,6 @@ request_messages!(
     (GetDocumentSymbols, GetDocumentSymbolsResponse),
     (GetHover, GetHoverResponse),
     (GetNotifications, GetNotificationsResponse),
-    (GetPrivateUserInfo, GetPrivateUserInfoResponse),
     (GetProjectSymbols, GetProjectSymbolsResponse),
     (GetReferences, GetReferencesResponse),
     (GetSignatureHelp, GetSignatureHelpResponse),

From 3c5d5a1d57f8569fa2818a0538d0ba950036c710 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 15 Aug 2025 20:34:22 +0200
Subject: [PATCH 064/823] editor: Add access method for `project` (#36266)

This resolves a `TODO` that I've stumbled upon too many times whilst
looking at the editor code.

Release Notes:

- N/A
---
 crates/diagnostics/src/diagnostics_tests.rs   | 10 +++---
 crates/editor/src/editor.rs                   | 36 ++++++++++---------
 crates/editor/src/editor_tests.rs             |  2 +-
 crates/editor/src/hover_popover.rs            |  2 +-
 crates/editor/src/items.rs                    |  2 +-
 crates/editor/src/linked_editing_ranges.rs    |  2 +-
 crates/editor/src/signature_help.rs           |  2 +-
 crates/editor/src/test/editor_test_context.rs | 20 +++++------
 crates/git_ui/src/conflict_view.rs            |  4 +--
 crates/vim/src/command.rs                     |  4 +--
 .../zed/src/zed/edit_prediction_registry.rs   |  3 +-
 11 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index 8fb223b2cb..5df1b13897 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -971,7 +971,7 @@ async fn active_diagnostics_dismiss_after_invalidation(cx: &mut TestAppContext)
 
     let mut cx = EditorTestContext::new(cx).await;
     let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
 
     cx.set_state(indoc! {"
         ˇfn func(abc def: i32) -> u32 {
@@ -1065,7 +1065,7 @@ async fn cycle_through_same_place_diagnostics(cx: &mut TestAppContext) {
 
     let mut cx = EditorTestContext::new(cx).await;
     let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
 
     cx.set_state(indoc! {"
         ˇfn func(abc def: i32) -> u32 {
@@ -1239,7 +1239,7 @@ async fn test_diagnostics_with_links(cx: &mut TestAppContext) {
         }
     "});
     let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
 
     cx.update(|_, cx| {
         lsp_store.update(cx, |lsp_store, cx| {
@@ -1293,7 +1293,7 @@ async fn test_hover_diagnostic_and_info_popovers(cx: &mut gpui::TestAppContext)
         fn «test»() { println!(); }
     "});
     let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
     cx.update(|_, cx| {
         lsp_store.update(cx, |lsp_store, cx| {
             lsp_store.update_diagnostics(
@@ -1450,7 +1450,7 @@ async fn go_to_diagnostic_with_severity(cx: &mut TestAppContext) {
 
     let mut cx = EditorTestContext::new(cx).await;
     let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
 
     cx.set_state(indoc! {"error warning info hiˇnt"});
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a9780ed6c2..f77e9ae08c 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1039,9 +1039,7 @@ pub struct Editor {
     inline_diagnostics: Vec<(Anchor, InlineDiagnostic)>,
     soft_wrap_mode_override: Option<language_settings::SoftWrap>,
     hard_wrap: Option<usize>,
-
-    // TODO: make this a access method
-    pub project: Option<Entity<Project>>,
+    project: Option<Entity<Project>>,
     semantics_provider: Option<Rc<dyn SemanticsProvider>>,
     completion_provider: Option<Rc<dyn CompletionProvider>>,
     collaboration_hub: Option<Box<dyn CollaborationHub>>,
@@ -2326,7 +2324,7 @@ impl Editor {
             editor.go_to_active_debug_line(window, cx);
 
             if let Some(buffer) = buffer.read(cx).as_singleton() {
-                if let Some(project) = editor.project.as_ref() {
+                if let Some(project) = editor.project() {
                     let handle = project.update(cx, |project, cx| {
                         project.register_buffer_with_language_servers(&buffer, cx)
                     });
@@ -2626,6 +2624,10 @@ impl Editor {
         &self.buffer
     }
 
+    pub fn project(&self) -> Option<&Entity<Project>> {
+        self.project.as_ref()
+    }
+
     pub fn workspace(&self) -> Option<Entity<Workspace>> {
         self.workspace.as_ref()?.0.upgrade()
     }
@@ -5212,7 +5214,7 @@ impl Editor {
         restrict_to_languages: Option<&HashSet<Arc<Language>>>,
         cx: &mut Context<Editor>,
     ) -> HashMap<ExcerptId, (Entity<Buffer>, clock::Global, Range<usize>)> {
-        let Some(project) = self.project.as_ref() else {
+        let Some(project) = self.project() else {
             return HashMap::default();
         };
         let project = project.read(cx);
@@ -5294,7 +5296,7 @@ impl Editor {
             return None;
         }
 
-        let project = self.project.as_ref()?;
+        let project = self.project()?;
         let position = self.selections.newest_anchor().head();
         let (buffer, buffer_position) = self
             .buffer
@@ -6141,7 +6143,7 @@ impl Editor {
         cx: &mut App,
     ) -> Task<Vec<task::DebugScenario>> {
         maybe!({
-            let project = self.project.as_ref()?;
+            let project = self.project()?;
             let dap_store = project.read(cx).dap_store();
             let mut scenarios = vec![];
             let resolved_tasks = resolved_tasks.as_ref()?;
@@ -7907,7 +7909,7 @@ impl Editor {
         let snapshot = self.snapshot(window, cx);
 
         let multi_buffer_snapshot = &snapshot.display_snapshot.buffer_snapshot;
-        let Some(project) = self.project.as_ref() else {
+        let Some(project) = self.project() else {
             return breakpoint_display_points;
         };
 
@@ -10501,7 +10503,7 @@ impl Editor {
     ) {
         if let Some(working_directory) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
             let project_path = buffer.read(cx).project_path(cx)?;
-            let project = self.project.as_ref()?.read(cx);
+            let project = self.project()?.read(cx);
             let entry = project.entry_for_path(&project_path, cx)?;
             let parent = match &entry.canonical_path {
                 Some(canonical_path) => canonical_path.to_path_buf(),
@@ -14875,7 +14877,7 @@ impl Editor {
             self.clear_tasks();
             return Task::ready(());
         }
-        let project = self.project.as_ref().map(Entity::downgrade);
+        let project = self.project().map(Entity::downgrade);
         let task_sources = self.lsp_task_sources(cx);
         let multi_buffer = self.buffer.downgrade();
         cx.spawn_in(window, async move |editor, cx| {
@@ -17054,7 +17056,7 @@ impl Editor {
         if !pull_diagnostics_settings.enabled {
             return None;
         }
-        let project = self.project.as_ref()?.downgrade();
+        let project = self.project()?.downgrade();
         let debounce = Duration::from_millis(pull_diagnostics_settings.debounce_ms);
         let mut buffers = self.buffer.read(cx).all_buffers();
         if let Some(buffer_id) = buffer_id {
@@ -18018,7 +18020,7 @@ impl Editor {
         hunks: impl Iterator<Item = MultiBufferDiffHunk>,
         cx: &mut App,
     ) -> Option<()> {
-        let project = self.project.as_ref()?;
+        let project = self.project()?;
         let buffer = project.read(cx).buffer_for_id(buffer_id, cx)?;
         let diff = self.buffer.read(cx).diff_for(buffer_id)?;
         let buffer_snapshot = buffer.read(cx).snapshot();
@@ -18678,7 +18680,7 @@ impl Editor {
         self.active_excerpt(cx).and_then(|(_, buffer, _)| {
             let buffer = buffer.read(cx);
             if let Some(project_path) = buffer.project_path(cx) {
-                let project = self.project.as_ref()?.read(cx);
+                let project = self.project()?.read(cx);
                 project.absolute_path(&project_path, cx)
             } else {
                 buffer
@@ -18691,7 +18693,7 @@ impl Editor {
     fn target_file_path(&self, cx: &mut Context<Self>) -> Option<PathBuf> {
         self.active_excerpt(cx).and_then(|(_, buffer, _)| {
             let project_path = buffer.read(cx).project_path(cx)?;
-            let project = self.project.as_ref()?.read(cx);
+            let project = self.project()?.read(cx);
             let entry = project.entry_for_path(&project_path, cx)?;
             let path = entry.path.to_path_buf();
             Some(path)
@@ -18912,7 +18914,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(project) = self.project.as_ref() {
+        if let Some(project) = self.project() {
             let Some(buffer) = self.buffer().read(cx).as_singleton() else {
                 return;
             };
@@ -19028,7 +19030,7 @@ impl Editor {
             return Task::ready(Err(anyhow!("failed to determine buffer and selection")));
         };
 
-        let Some(project) = self.project.as_ref() else {
+        let Some(project) = self.project() else {
             return Task::ready(Err(anyhow!("editor does not have project")));
         };
 
@@ -21015,7 +21017,7 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         let workspace = self.workspace();
-        let project = self.project.as_ref();
+        let project = self.project();
         let save_tasks = self.buffer().update(cx, |multi_buffer, cx| {
             let mut tasks = Vec::new();
             for (buffer_id, changes) in revert_changes {
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index a5966b3301..cf9954bc12 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -15082,7 +15082,7 @@ async fn go_to_prev_overlapping_diagnostic(executor: BackgroundExecutor, cx: &mu
 
     let mut cx = EditorTestContext::new(cx).await;
     let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
 
     cx.set_state(indoc! {"
         ˇfn func(abc def: i32) -> u32 {
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index bda229e346..3fc673bad9 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -251,7 +251,7 @@ fn show_hover(
 
     let (excerpt_id, _, _) = editor.buffer().read(cx).excerpt_containing(anchor, cx)?;
 
-    let language_registry = editor.project.as_ref()?.read(cx).languages().clone();
+    let language_registry = editor.project()?.read(cx).languages().clone();
     let provider = editor.semantics_provider.clone()?;
 
     if !ignore_timeout {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 45a4f7365c..34533002ff 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -678,7 +678,7 @@ impl Item for Editor {
                     let buffer = buffer.read(cx);
                     let path = buffer.project_path(cx)?;
                     let buffer_id = buffer.remote_id();
-                    let project = self.project.as_ref()?.read(cx);
+                    let project = self.project()?.read(cx);
                     let entry = project.entry_for_path(&path, cx)?;
                     let (repo, repo_path) = project
                         .git_store()
diff --git a/crates/editor/src/linked_editing_ranges.rs b/crates/editor/src/linked_editing_ranges.rs
index a185de33ca..aaf9032b04 100644
--- a/crates/editor/src/linked_editing_ranges.rs
+++ b/crates/editor/src/linked_editing_ranges.rs
@@ -51,7 +51,7 @@ pub(super) fn refresh_linked_ranges(
     if editor.pending_rename.is_some() {
         return None;
     }
-    let project = editor.project.as_ref()?.downgrade();
+    let project = editor.project()?.downgrade();
 
     editor.linked_editing_range_task = Some(cx.spawn_in(window, async move |editor, cx| {
         cx.background_executor().timer(UPDATE_DEBOUNCE).await;
diff --git a/crates/editor/src/signature_help.rs b/crates/editor/src/signature_help.rs
index e9f8d2dbd3..e0736a6e9f 100644
--- a/crates/editor/src/signature_help.rs
+++ b/crates/editor/src/signature_help.rs
@@ -169,7 +169,7 @@ impl Editor {
         else {
             return;
         };
-        let Some(lsp_store) = self.project.as_ref().map(|p| p.read(cx).lsp_store()) else {
+        let Some(lsp_store) = self.project().map(|p| p.read(cx).lsp_store()) else {
             return;
         };
         let task = lsp_store.update(cx, |lsp_store, cx| {
diff --git a/crates/editor/src/test/editor_test_context.rs b/crates/editor/src/test/editor_test_context.rs
index bdf73da5fb..dbb519c40e 100644
--- a/crates/editor/src/test/editor_test_context.rs
+++ b/crates/editor/src/test/editor_test_context.rs
@@ -297,9 +297,8 @@ impl EditorTestContext {
 
     pub fn set_head_text(&mut self, diff_base: &str) {
         self.cx.run_until_parked();
-        let fs = self.update_editor(|editor, _, cx| {
-            editor.project.as_ref().unwrap().read(cx).fs().as_fake()
-        });
+        let fs =
+            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
         let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
         fs.set_head_for_repo(
             &Self::root_path().join(".git"),
@@ -311,18 +310,16 @@ impl EditorTestContext {
 
     pub fn clear_index_text(&mut self) {
         self.cx.run_until_parked();
-        let fs = self.update_editor(|editor, _, cx| {
-            editor.project.as_ref().unwrap().read(cx).fs().as_fake()
-        });
+        let fs =
+            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
         fs.set_index_for_repo(&Self::root_path().join(".git"), &[]);
         self.cx.run_until_parked();
     }
 
     pub fn set_index_text(&mut self, diff_base: &str) {
         self.cx.run_until_parked();
-        let fs = self.update_editor(|editor, _, cx| {
-            editor.project.as_ref().unwrap().read(cx).fs().as_fake()
-        });
+        let fs =
+            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
         let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
         fs.set_index_for_repo(
             &Self::root_path().join(".git"),
@@ -333,9 +330,8 @@ impl EditorTestContext {
 
     #[track_caller]
     pub fn assert_index_text(&mut self, expected: Option<&str>) {
-        let fs = self.update_editor(|editor, _, cx| {
-            editor.project.as_ref().unwrap().read(cx).fs().as_fake()
-        });
+        let fs =
+            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
         let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
         let mut found = None;
         fs.with_git_state(&Self::root_path().join(".git"), false, |git_state| {
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
index 0bbb9411be..6482ebb9f8 100644
--- a/crates/git_ui/src/conflict_view.rs
+++ b/crates/git_ui/src/conflict_view.rs
@@ -112,7 +112,7 @@ fn excerpt_for_buffer_updated(
 }
 
 fn buffer_added(editor: &mut Editor, buffer: Entity<Buffer>, cx: &mut Context<Editor>) {
-    let Some(project) = &editor.project else {
+    let Some(project) = editor.project() else {
         return;
     };
     let git_store = project.read(cx).git_store().clone();
@@ -469,7 +469,7 @@ pub(crate) fn resolve_conflict(
         let Some((workspace, project, multibuffer, buffer)) = editor
             .update(cx, |editor, cx| {
                 let workspace = editor.workspace()?;
-                let project = editor.project.clone()?;
+                let project = editor.project()?.clone();
                 let multibuffer = editor.buffer().clone();
                 let buffer_id = resolved_conflict.ours.end.buffer_id?;
                 let buffer = multibuffer.read(cx).buffer(buffer_id)?;
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 264fa4bf2f..ce5e5a0300 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -299,7 +299,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
 
     Vim::action(editor, cx, |vim, action: &VimSave, window, cx| {
         vim.update_editor(cx, |_, editor, cx| {
-            let Some(project) = editor.project.clone() else {
+            let Some(project) = editor.project().cloned() else {
                 return;
             };
             let Some(worktree) = project.read(cx).visible_worktrees(cx).next() else {
@@ -436,7 +436,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
             let Some(workspace) = vim.workspace(window) else {
                 return;
             };
-            let Some(project) = editor.project.clone() else {
+            let Some(project) = editor.project().cloned() else {
                 return;
             };
             let Some(worktree) = project.read(cx).visible_worktrees(cx).next() else {
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index da4b6e78c6..5b0826413b 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -229,8 +229,7 @@ fn assign_edit_prediction_provider(
                     if let Some(file) = buffer.read(cx).file() {
                         let id = file.worktree_id(cx);
                         if let Some(inner_worktree) = editor
-                            .project
-                            .as_ref()
+                            .project()
                             .and_then(|project| project.read(cx).worktree_for_id(id, cx))
                         {
                             worktree = Some(inner_worktree);

From 19318897597071a64282d3bf4e1c4846485e7333 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 15 Aug 2025 14:55:34 -0400
Subject: [PATCH 065/823] thread_view: Move handlers for confirmed completions
 to the MessageEditor (#36214)

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 .../agent_ui/src/acp/completion_provider.rs   | 435 +++++-------------
 crates/agent_ui/src/acp/message_editor.rs     | 360 ++++++++++++---
 crates/agent_ui/src/context_picker.rs         |  41 +-
 crates/editor/src/editor.rs                   |  28 ++
 4 files changed, 455 insertions(+), 409 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index adcfab85b1..4ee1eb6948 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,38 +1,34 @@
 use std::ffi::OsStr;
 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
-use acp_thread::{MentionUri, selection_name};
+use acp_thread::MentionUri;
 use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
+use collections::HashMap;
 use editor::display_map::CreaseId;
-use editor::{CompletionProvider, Editor, ExcerptId, ToOffset as _};
+use editor::{CompletionProvider, Editor, ExcerptId};
 use futures::future::{Shared, try_join_all};
-use futures::{FutureExt, TryFutureExt};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{App, Entity, ImageFormat, Img, Task, WeakEntity};
 use http_client::HttpClientWithUrl;
-use itertools::Itertools as _;
 use language::{Buffer, CodeLabel, HighlightId};
 use language_model::LanguageModelImage;
 use lsp::CompletionContext;
-use parking_lot::Mutex;
 use project::{
     Completion, CompletionIntent, CompletionResponse, Project, ProjectPath, Symbol, WorktreeId,
 };
 use prompt_store::PromptStore;
 use rope::Point;
-use text::{Anchor, OffsetRangeExt as _, ToPoint as _};
+use text::{Anchor, ToPoint as _};
 use ui::prelude::*;
 use url::Url;
 use workspace::Workspace;
-use workspace::notifications::NotifyResultExt;
 
 use agent::thread_store::{TextThreadStore, ThreadStore};
 
-use crate::context_picker::fetch_context_picker::fetch_url_content;
+use crate::acp::message_editor::MessageEditor;
 use crate::context_picker::file_context_picker::{FileMatch, search_files};
 use crate::context_picker::rules_context_picker::{RulesContextEntry, search_rules};
 use crate::context_picker::symbol_context_picker::SymbolMatch;
@@ -54,7 +50,7 @@ pub struct MentionImage {
 
 #[derive(Default)]
 pub struct MentionSet {
-    uri_by_crease_id: HashMap<CreaseId, MentionUri>,
+    pub(crate) uri_by_crease_id: HashMap<CreaseId, MentionUri>,
     fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
     images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
 }
@@ -488,36 +484,31 @@ fn search(
 }
 
 pub struct ContextPickerCompletionProvider {
-    mention_set: Arc<Mutex<MentionSet>>,
     workspace: WeakEntity<Workspace>,
     thread_store: WeakEntity<ThreadStore>,
     text_thread_store: WeakEntity<TextThreadStore>,
-    editor: WeakEntity<Editor>,
+    message_editor: WeakEntity<MessageEditor>,
 }
 
 impl ContextPickerCompletionProvider {
     pub fn new(
-        mention_set: Arc<Mutex<MentionSet>>,
         workspace: WeakEntity<Workspace>,
         thread_store: WeakEntity<ThreadStore>,
         text_thread_store: WeakEntity<TextThreadStore>,
-        editor: WeakEntity<Editor>,
+        message_editor: WeakEntity<MessageEditor>,
     ) -> Self {
         Self {
-            mention_set,
             workspace,
             thread_store,
             text_thread_store,
-            editor,
+            message_editor,
         }
     }
 
     fn completion_for_entry(
         entry: ContextPickerEntry,
-        excerpt_id: ExcerptId,
         source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
+        message_editor: WeakEntity<MessageEditor>,
         workspace: &Entity<Workspace>,
         cx: &mut App,
     ) -> Option<Completion> {
@@ -538,88 +529,39 @@ impl ContextPickerCompletionProvider {
             ContextPickerEntry::Action(action) => {
                 let (new_text, on_action) = match action {
                     ContextPickerAction::AddSelections => {
-                        let selections = selection_ranges(workspace, cx);
-
                         const PLACEHOLDER: &str = "selection ";
+                        let selections = selection_ranges(workspace, cx)
+                            .into_iter()
+                            .enumerate()
+                            .map(|(ix, (buffer, range))| {
+                                (
+                                    buffer,
+                                    range,
+                                    (PLACEHOLDER.len() * ix)..(PLACEHOLDER.len() * (ix + 1) - 1),
+                                )
+                            })
+                            .collect::<Vec<_>>();
 
-                        let new_text = std::iter::repeat(PLACEHOLDER)
-                            .take(selections.len())
-                            .chain(std::iter::once(""))
-                            .join(" ");
+                        let new_text: String = PLACEHOLDER.repeat(selections.len());
 
                         let callback = Arc::new({
-                            let mention_set = mention_set.clone();
-                            let selections = selections.clone();
+                            let source_range = source_range.clone();
                             move |_, window: &mut Window, cx: &mut App| {
-                                let editor = editor.clone();
-                                let mention_set = mention_set.clone();
                                 let selections = selections.clone();
+                                let message_editor = message_editor.clone();
+                                let source_range = source_range.clone();
                                 window.defer(cx, move |window, cx| {
-                                    let mut current_offset = 0;
-
-                                    for (buffer, selection_range) in selections {
-                                        let snapshot =
-                                            editor.read(cx).buffer().read(cx).snapshot(cx);
-                                        let Some(start) = snapshot
-                                            .anchor_in_excerpt(excerpt_id, source_range.start)
-                                        else {
-                                            return;
-                                        };
-
-                                        let offset = start.to_offset(&snapshot) + current_offset;
-                                        let text_len = PLACEHOLDER.len() - 1;
-
-                                        let range = snapshot.anchor_after(offset)
-                                            ..snapshot.anchor_after(offset + text_len);
-
-                                        let path = buffer
-                                            .read(cx)
-                                            .file()
-                                            .map_or(PathBuf::from("untitled"), |file| {
-                                                file.path().to_path_buf()
-                                            });
-
-                                        let point_range = snapshot
-                                            .as_singleton()
-                                            .map(|(_, _, snapshot)| {
-                                                selection_range.to_point(&snapshot)
-                                            })
-                                            .unwrap_or_default();
-                                        let line_range = point_range.start.row..point_range.end.row;
-
-                                        let uri = MentionUri::Selection {
-                                            path: path.clone(),
-                                            line_range: line_range.clone(),
-                                        };
-                                        let crease = crate::context_picker::crease_for_mention(
-                                            selection_name(&path, &line_range).into(),
-                                            uri.icon_path(cx),
-                                            range,
-                                            editor.downgrade(),
-                                        );
-
-                                        let [crease_id]: [_; 1] =
-                                            editor.update(cx, |editor, cx| {
-                                                let crease_ids =
-                                                    editor.insert_creases(vec![crease.clone()], cx);
-                                                editor.fold_creases(
-                                                    vec![crease],
-                                                    false,
-                                                    window,
-                                                    cx,
-                                                );
-                                                crease_ids.try_into().unwrap()
-                                            });
-
-                                        mention_set.lock().insert_uri(
-                                            crease_id,
-                                            MentionUri::Selection { path, line_range },
-                                        );
-
-                                        current_offset += text_len + 1;
-                                    }
+                                    message_editor
+                                        .update(cx, |message_editor, cx| {
+                                            message_editor.confirm_mention_for_selection(
+                                                source_range,
+                                                selections,
+                                                window,
+                                                cx,
+                                            )
+                                        })
+                                        .ok();
                                 });
-
                                 false
                             }
                         });
@@ -647,11 +589,9 @@ impl ContextPickerCompletionProvider {
 
     fn completion_for_thread(
         thread_entry: ThreadContextEntry,
-        excerpt_id: ExcerptId,
         source_range: Range<Anchor>,
         recent: bool,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
+        editor: WeakEntity<MessageEditor>,
         cx: &mut App,
     ) -> Completion {
         let uri = match &thread_entry {
@@ -683,13 +623,10 @@ impl ContextPickerCompletionProvider {
             source: project::CompletionSource::Custom,
             icon_path: Some(icon_for_completion.clone()),
             confirm: Some(confirm_completion_callback(
-                uri.icon_path(cx),
                 thread_entry.title().clone(),
-                excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
-                mention_set,
+                editor,
                 uri,
             )),
         }
@@ -697,10 +634,8 @@ impl ContextPickerCompletionProvider {
 
     fn completion_for_rules(
         rule: RulesContextEntry,
-        excerpt_id: ExcerptId,
         source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
+        editor: WeakEntity<MessageEditor>,
         cx: &mut App,
     ) -> Completion {
         let uri = MentionUri::Rule {
@@ -719,13 +654,10 @@ impl ContextPickerCompletionProvider {
             source: project::CompletionSource::Custom,
             icon_path: Some(icon_path.clone()),
             confirm: Some(confirm_completion_callback(
-                icon_path,
                 rule.title.clone(),
-                excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
-                mention_set,
+                editor,
                 uri,
             )),
         }
@@ -736,10 +668,8 @@ impl ContextPickerCompletionProvider {
         path_prefix: &str,
         is_recent: bool,
         is_directory: bool,
-        excerpt_id: ExcerptId,
         source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
+        message_editor: WeakEntity<MessageEditor>,
         project: Entity<Project>,
         cx: &mut App,
     ) -> Option<Completion> {
@@ -777,13 +707,10 @@ impl ContextPickerCompletionProvider {
             icon_path: Some(completion_icon_path),
             insert_text_mode: None,
             confirm: Some(confirm_completion_callback(
-                crease_icon_path,
                 file_name,
-                excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor,
-                mention_set.clone(),
+                message_editor,
                 file_uri,
             )),
         })
@@ -791,10 +718,8 @@ impl ContextPickerCompletionProvider {
 
     fn completion_for_symbol(
         symbol: Symbol,
-        excerpt_id: ExcerptId,
         source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
+        message_editor: WeakEntity<MessageEditor>,
         workspace: Entity<Workspace>,
         cx: &mut App,
     ) -> Option<Completion> {
@@ -820,13 +745,10 @@ impl ContextPickerCompletionProvider {
             icon_path: Some(icon_path.clone()),
             insert_text_mode: None,
             confirm: Some(confirm_completion_callback(
-                icon_path,
                 symbol.name.clone().into(),
-                excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
-                mention_set.clone(),
+                message_editor,
                 uri,
             )),
         })
@@ -835,112 +757,46 @@ impl ContextPickerCompletionProvider {
     fn completion_for_fetch(
         source_range: Range<Anchor>,
         url_to_fetch: SharedString,
-        excerpt_id: ExcerptId,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
+        message_editor: WeakEntity<MessageEditor>,
         http_client: Arc<HttpClientWithUrl>,
         cx: &mut App,
     ) -> Option<Completion> {
         let new_text = format!("@fetch {} ", url_to_fetch.clone());
-        let new_text_len = new_text.len();
+        let url_to_fetch = url::Url::parse(url_to_fetch.as_ref())
+            .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
+            .ok()?;
         let mention_uri = MentionUri::Fetch {
-            url: url::Url::parse(url_to_fetch.as_ref())
-                .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
-                .ok()?,
+            url: url_to_fetch.clone(),
         };
         let icon_path = mention_uri.icon_path(cx);
         Some(Completion {
             replace_range: source_range.clone(),
-            new_text,
+            new_text: new_text.clone(),
             label: CodeLabel::plain(url_to_fetch.to_string(), None),
             documentation: None,
             source: project::CompletionSource::Custom,
             icon_path: Some(icon_path.clone()),
             insert_text_mode: None,
             confirm: Some({
-                let start = source_range.start;
-                let content_len = new_text_len - 1;
-                let editor = editor.clone();
-                let url_to_fetch = url_to_fetch.clone();
-                let source_range = source_range.clone();
-                let icon_path = icon_path.clone();
-                let mention_uri = mention_uri.clone();
                 Arc::new(move |_, window, cx| {
-                    let Some(url) = url::Url::parse(url_to_fetch.as_ref())
-                        .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
-                        .notify_app_err(cx)
-                    else {
-                        return false;
-                    };
-
-                    let editor = editor.clone();
-                    let mention_set = mention_set.clone();
-                    let http_client = http_client.clone();
+                    let url_to_fetch = url_to_fetch.clone();
                     let source_range = source_range.clone();
-                    let icon_path = icon_path.clone();
-                    let mention_uri = mention_uri.clone();
+                    let message_editor = message_editor.clone();
+                    let new_text = new_text.clone();
+                    let http_client = http_client.clone();
                     window.defer(cx, move |window, cx| {
-                        let url = url.clone();
-
-                        let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
-                            excerpt_id,
-                            start,
-                            content_len,
-                            url.to_string().into(),
-                            icon_path,
-                            editor.clone(),
-                            window,
-                            cx,
-                        ) else {
-                            return;
-                        };
-
-                        let editor = editor.clone();
-                        let mention_set = mention_set.clone();
-                        let http_client = http_client.clone();
-                        let source_range = source_range.clone();
-
-                        let url_string = url.to_string();
-                        let fetch = cx
-                            .background_executor()
-                            .spawn(async move {
-                                fetch_url_content(http_client, url_string)
-                                    .map_err(|e| e.to_string())
-                                    .await
+                        message_editor
+                            .update(cx, |message_editor, cx| {
+                                message_editor.confirm_mention_for_fetch(
+                                    new_text,
+                                    source_range,
+                                    url_to_fetch,
+                                    http_client,
+                                    window,
+                                    cx,
+                                )
                             })
-                            .shared();
-                        mention_set.lock().add_fetch_result(url, fetch.clone());
-
-                        window
-                            .spawn(cx, async move |cx| {
-                                if fetch.await.notify_async_err(cx).is_some() {
-                                    mention_set
-                                        .lock()
-                                        .insert_uri(crease_id, mention_uri.clone());
-                                } else {
-                                    // Remove crease if we failed to fetch
-                                    editor
-                                        .update(cx, |editor, cx| {
-                                            let snapshot = editor.buffer().read(cx).snapshot(cx);
-                                            let Some(anchor) = snapshot
-                                                .anchor_in_excerpt(excerpt_id, source_range.start)
-                                            else {
-                                                return;
-                                            };
-                                            editor.display_map.update(cx, |display_map, cx| {
-                                                display_map.unfold_intersecting(
-                                                    vec![anchor..anchor],
-                                                    true,
-                                                    cx,
-                                                );
-                                            });
-                                            editor.remove_creases([crease_id], cx);
-                                        })
-                                        .ok();
-                                }
-                                Some(())
-                            })
-                            .detach();
+                            .ok();
                     });
                     false
                 })
@@ -968,7 +824,7 @@ fn build_code_label_for_full_path(file_name: &str, directory: Option<&str>, cx:
 impl CompletionProvider for ContextPickerCompletionProvider {
     fn completions(
         &self,
-        excerpt_id: ExcerptId,
+        _excerpt_id: ExcerptId,
         buffer: &Entity<Buffer>,
         buffer_position: Anchor,
         _trigger: CompletionContext,
@@ -999,32 +855,18 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
         let thread_store = self.thread_store.clone();
         let text_thread_store = self.text_thread_store.clone();
-        let editor = self.editor.clone();
+        let editor = self.message_editor.clone();
+        let Ok((exclude_paths, exclude_threads)) =
+            self.message_editor.update(cx, |message_editor, cx| {
+                message_editor.mentioned_path_and_threads(cx)
+            })
+        else {
+            return Task::ready(Ok(Vec::new()));
+        };
 
         let MentionCompletion { mode, argument, .. } = state;
         let query = argument.unwrap_or_else(|| "".to_string());
 
-        let (exclude_paths, exclude_threads) = {
-            let mention_set = self.mention_set.lock();
-
-            let mut excluded_paths = HashSet::default();
-            let mut excluded_threads = HashSet::default();
-
-            for uri in mention_set.uri_by_crease_id.values() {
-                match uri {
-                    MentionUri::File { abs_path, .. } => {
-                        excluded_paths.insert(abs_path.clone());
-                    }
-                    MentionUri::Thread { id, .. } => {
-                        excluded_threads.insert(id.clone());
-                    }
-                    _ => {}
-                }
-            }
-
-            (excluded_paths, excluded_threads)
-        };
-
         let recent_entries = recent_context_picker_entries(
             Some(thread_store.clone()),
             Some(text_thread_store.clone()),
@@ -1051,13 +893,8 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             cx,
         );
 
-        let mention_set = self.mention_set.clone();
-
         cx.spawn(async move |_, cx| {
             let matches = search_task.await;
-            let Some(editor) = editor.upgrade() else {
-                return Ok(Vec::new());
-            };
 
             let completions = cx.update(|cx| {
                 matches
@@ -1074,10 +911,8 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                 &mat.path_prefix,
                                 is_recent,
                                 mat.is_dir,
-                                excerpt_id,
                                 source_range.clone(),
                                 editor.clone(),
-                                mention_set.clone(),
                                 project.clone(),
                                 cx,
                             )
@@ -1085,10 +920,8 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
                         Match::Symbol(SymbolMatch { symbol, .. }) => Self::completion_for_symbol(
                             symbol,
-                            excerpt_id,
                             source_range.clone(),
                             editor.clone(),
-                            mention_set.clone(),
                             workspace.clone(),
                             cx,
                         ),
@@ -1097,39 +930,31 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                             thread, is_recent, ..
                         }) => Some(Self::completion_for_thread(
                             thread,
-                            excerpt_id,
                             source_range.clone(),
                             is_recent,
                             editor.clone(),
-                            mention_set.clone(),
                             cx,
                         )),
 
                         Match::Rules(user_rules) => Some(Self::completion_for_rules(
                             user_rules,
-                            excerpt_id,
                             source_range.clone(),
                             editor.clone(),
-                            mention_set.clone(),
                             cx,
                         )),
 
                         Match::Fetch(url) => Self::completion_for_fetch(
                             source_range.clone(),
                             url,
-                            excerpt_id,
                             editor.clone(),
-                            mention_set.clone(),
                             http_client.clone(),
                             cx,
                         ),
 
                         Match::Entry(EntryMatch { entry, .. }) => Self::completion_for_entry(
                             entry,
-                            excerpt_id,
                             source_range.clone(),
                             editor.clone(),
-                            mention_set.clone(),
                             &workspace,
                             cx,
                         ),
@@ -1182,36 +1007,30 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 }
 
 fn confirm_completion_callback(
-    crease_icon_path: SharedString,
     crease_text: SharedString,
-    excerpt_id: ExcerptId,
     start: Anchor,
     content_len: usize,
-    editor: Entity<Editor>,
-    mention_set: Arc<Mutex<MentionSet>>,
+    message_editor: WeakEntity<MessageEditor>,
     mention_uri: MentionUri,
 ) -> Arc<dyn Fn(CompletionIntent, &mut Window, &mut App) -> bool + Send + Sync> {
     Arc::new(move |_, window, cx| {
+        let message_editor = message_editor.clone();
         let crease_text = crease_text.clone();
-        let crease_icon_path = crease_icon_path.clone();
-        let editor = editor.clone();
-        let mention_set = mention_set.clone();
         let mention_uri = mention_uri.clone();
         window.defer(cx, move |window, cx| {
-            if let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
-                excerpt_id,
-                start,
-                content_len,
-                crease_text.clone(),
-                crease_icon_path,
-                editor.clone(),
-                window,
-                cx,
-            ) {
-                mention_set
-                    .lock()
-                    .insert_uri(crease_id, mention_uri.clone());
-            }
+            message_editor
+                .clone()
+                .update(cx, |message_editor, cx| {
+                    message_editor.confirm_completion(
+                        crease_text,
+                        start,
+                        content_len,
+                        mention_uri,
+                        window,
+                        cx,
+                    )
+                })
+                .ok();
         });
         false
     })
@@ -1279,13 +1098,13 @@ impl MentionCompletion {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use editor::AnchorRangeExt;
+    use editor::{AnchorRangeExt, EditorMode};
     use gpui::{EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext};
     use project::{Project, ProjectPath};
     use serde_json::json;
     use settings::SettingsStore;
     use smol::stream::StreamExt as _;
-    use std::{ops::Deref, path::Path, rc::Rc};
+    use std::{ops::Deref, path::Path};
     use util::path;
     use workspace::{AppState, Item};
 
@@ -1359,9 +1178,9 @@ mod tests {
         assert_eq!(MentionCompletion::try_parse("test@", 0), None);
     }
 
-    struct AtMentionEditor(Entity<Editor>);
+    struct MessageEditorItem(Entity<MessageEditor>);
 
-    impl Item for AtMentionEditor {
+    impl Item for MessageEditorItem {
         type Event = ();
 
         fn include_in_nav_history() -> bool {
@@ -1373,15 +1192,15 @@ mod tests {
         }
     }
 
-    impl EventEmitter<()> for AtMentionEditor {}
+    impl EventEmitter<()> for MessageEditorItem {}
 
-    impl Focusable for AtMentionEditor {
+    impl Focusable for MessageEditorItem {
         fn focus_handle(&self, cx: &App) -> FocusHandle {
             self.0.read(cx).focus_handle(cx).clone()
         }
     }
 
-    impl Render for AtMentionEditor {
+    impl Render for MessageEditorItem {
         fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
             self.0.clone().into_any_element()
         }
@@ -1467,19 +1286,28 @@ mod tests {
             opened_editors.push(buffer);
         }
 
-        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let editor = cx.new(|cx| {
-                Editor::new(
-                    editor::EditorMode::full(),
-                    multi_buffer::MultiBuffer::build_simple("", cx),
-                    None,
+        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
+        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+
+        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
+            let workspace_handle = cx.weak_entity();
+            let message_editor = cx.new(|cx| {
+                MessageEditor::new(
+                    workspace_handle,
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    EditorMode::AutoHeight {
+                        max_lines: None,
+                        min_lines: 1,
+                    },
                     window,
                     cx,
                 )
             });
             workspace.active_pane().update(cx, |pane, cx| {
                 pane.add_item(
-                    Box::new(cx.new(|_| AtMentionEditor(editor.clone()))),
+                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
                     true,
                     true,
                     None,
@@ -1487,24 +1315,9 @@ mod tests {
                     cx,
                 );
             });
-            editor
-        });
-
-        let mention_set = Arc::new(Mutex::new(MentionSet::default()));
-
-        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-
-        let editor_entity = editor.downgrade();
-        editor.update_in(&mut cx, |editor, window, cx| {
-            window.focus(&editor.focus_handle(cx));
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
-                mention_set.clone(),
-                workspace.downgrade(),
-                thread_store.downgrade(),
-                text_thread_store.downgrade(),
-                editor_entity,
-            ))));
+            message_editor.read(cx).focus_handle(cx).focus(window);
+            let editor = message_editor.read(cx).editor().clone();
+            (message_editor, editor)
         });
 
         cx.simulate_input("Lorem ");
@@ -1573,9 +1386,9 @@ mod tests {
             );
         });
 
-        let contents = cx
-            .update(|window, cx| {
-                mention_set.lock().contents(
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
                     project.clone(),
                     thread_store.clone(),
                     text_thread_store.clone(),
@@ -1641,9 +1454,9 @@ mod tests {
 
         cx.run_until_parked();
 
-        let contents = cx
-            .update(|window, cx| {
-                mention_set.lock().contents(
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
                     project.clone(),
                     thread_store.clone(),
                     text_thread_store.clone(),
@@ -1765,9 +1578,9 @@ mod tests {
             editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
         });
 
-        let contents = cx
-            .update(|window, cx| {
-                mention_set.lock().contents(
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
                     project.clone(),
                     thread_store,
                     text_thread_store,
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 8d512948dd..32c37da519 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1,56 +1,55 @@
-use crate::acp::completion_provider::ContextPickerCompletionProvider;
-use crate::acp::completion_provider::MentionImage;
-use crate::acp::completion_provider::MentionSet;
-use acp_thread::MentionUri;
-use agent::TextThreadStore;
-use agent::ThreadStore;
+use crate::{
+    acp::completion_provider::{ContextPickerCompletionProvider, MentionImage, MentionSet},
+    context_picker::fetch_context_picker::fetch_url_content,
+};
+use acp_thread::{MentionUri, selection_name};
+use agent::{TextThreadStore, ThreadId, ThreadStore};
 use agent_client_protocol as acp;
 use anyhow::Result;
 use collections::HashSet;
-use editor::ExcerptId;
-use editor::actions::Paste;
-use editor::display_map::CreaseId;
 use editor::{
-    AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorMode,
-    EditorStyle, MultiBuffer,
+    Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
+    EditorMode, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer, ToOffset,
+    actions::Paste,
+    display_map::{Crease, CreaseId, FoldId},
 };
-use futures::FutureExt as _;
-use gpui::ClipboardEntry;
-use gpui::Image;
-use gpui::ImageFormat;
+use futures::{FutureExt as _, TryFutureExt as _};
 use gpui::{
-    AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, Task, TextStyle, WeakEntity,
+    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, Image,
+    ImageFormat, Task, TextStyle, WeakEntity,
 };
-use language::Buffer;
-use language::Language;
+use http_client::HttpClientWithUrl;
+use language::{Buffer, Language};
 use language_model::LanguageModelImage;
-use parking_lot::Mutex;
 use project::{CompletionIntent, Project};
 use settings::Settings;
-use std::fmt::Write;
-use std::path::Path;
-use std::rc::Rc;
-use std::sync::Arc;
+use std::{
+    fmt::Write,
+    ops::Range,
+    path::{Path, PathBuf},
+    rc::Rc,
+    sync::Arc,
+};
+use text::OffsetRangeExt;
 use theme::ThemeSettings;
-use ui::IconName;
-use ui::SharedString;
 use ui::{
-    ActiveTheme, App, InteractiveElement, IntoElement, ParentElement, Render, Styled, TextSize,
-    Window, div,
+    ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Icon, IconName,
+    IconSize, InteractiveElement, IntoElement, Label, LabelCommon, LabelSize, ParentElement,
+    Render, SelectableButton, SharedString, Styled, TextSize, TintColor, Toggleable, Window, div,
+    h_flex,
 };
 use util::ResultExt;
-use workspace::Workspace;
-use workspace::notifications::NotifyResultExt as _;
+use workspace::{Workspace, notifications::NotifyResultExt as _};
 use zed_actions::agent::Chat;
 
 use super::completion_provider::Mention;
 
 pub struct MessageEditor {
+    mention_set: MentionSet,
     editor: Entity<Editor>,
     project: Entity<Project>,
     thread_store: Entity<ThreadStore>,
     text_thread_store: Entity<TextThreadStore>,
-    mention_set: Arc<Mutex<MentionSet>>,
 }
 
 pub enum MessageEditorEvent {
@@ -77,8 +76,13 @@ impl MessageEditor {
             },
             None,
         );
-
-        let mention_set = Arc::new(Mutex::new(MentionSet::default()));
+        let completion_provider = ContextPickerCompletionProvider::new(
+            workspace,
+            thread_store.downgrade(),
+            text_thread_store.downgrade(),
+            cx.weak_entity(),
+        );
+        let mention_set = MentionSet::default();
         let editor = cx.new(|cx| {
             let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
             let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
@@ -88,13 +92,7 @@ impl MessageEditor {
             editor.set_show_indent_guides(false, cx);
             editor.set_soft_wrap();
             editor.set_use_modal_editing(true);
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
-                mention_set.clone(),
-                workspace,
-                thread_store.downgrade(),
-                text_thread_store.downgrade(),
-                cx.weak_entity(),
-            ))));
+            editor.set_completion_provider(Some(Rc::new(completion_provider)));
             editor.set_context_menu_options(ContextMenuOptions {
                 min_entries_visible: 12,
                 max_entries_visible: 12,
@@ -112,16 +110,202 @@ impl MessageEditor {
         }
     }
 
+    #[cfg(test)]
+    pub(crate) fn editor(&self) -> &Entity<Editor> {
+        &self.editor
+    }
+
+    #[cfg(test)]
+    pub(crate) fn mention_set(&mut self) -> &mut MentionSet {
+        &mut self.mention_set
+    }
+
     pub fn is_empty(&self, cx: &App) -> bool {
         self.editor.read(cx).is_empty(cx)
     }
 
+    pub fn mentioned_path_and_threads(&self, _: &App) -> (HashSet<PathBuf>, HashSet<ThreadId>) {
+        let mut excluded_paths = HashSet::default();
+        let mut excluded_threads = HashSet::default();
+
+        for uri in self.mention_set.uri_by_crease_id.values() {
+            match uri {
+                MentionUri::File { abs_path, .. } => {
+                    excluded_paths.insert(abs_path.clone());
+                }
+                MentionUri::Thread { id, .. } => {
+                    excluded_threads.insert(id.clone());
+                }
+                _ => {}
+            }
+        }
+
+        (excluded_paths, excluded_threads)
+    }
+
+    pub fn confirm_completion(
+        &mut self,
+        crease_text: SharedString,
+        start: text::Anchor,
+        content_len: usize,
+        mention_uri: MentionUri,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let snapshot = self
+            .editor
+            .update(cx, |editor, cx| editor.snapshot(window, cx));
+        let Some((excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
+            return;
+        };
+
+        if let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
+            *excerpt_id,
+            start,
+            content_len,
+            crease_text.clone(),
+            mention_uri.icon_path(cx),
+            self.editor.clone(),
+            window,
+            cx,
+        ) {
+            self.mention_set.insert_uri(crease_id, mention_uri.clone());
+        }
+    }
+
+    pub fn confirm_mention_for_fetch(
+        &mut self,
+        new_text: String,
+        source_range: Range<text::Anchor>,
+        url: url::Url,
+        http_client: Arc<HttpClientWithUrl>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let mention_uri = MentionUri::Fetch { url: url.clone() };
+        let icon_path = mention_uri.icon_path(cx);
+
+        let start = source_range.start;
+        let content_len = new_text.len() - 1;
+
+        let snapshot = self
+            .editor
+            .update(cx, |editor, cx| editor.snapshot(window, cx));
+        let Some((&excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
+            return;
+        };
+
+        let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
+            excerpt_id,
+            start,
+            content_len,
+            url.to_string().into(),
+            icon_path,
+            self.editor.clone(),
+            window,
+            cx,
+        ) else {
+            return;
+        };
+
+        let http_client = http_client.clone();
+        let source_range = source_range.clone();
+
+        let url_string = url.to_string();
+        let fetch = cx
+            .background_executor()
+            .spawn(async move {
+                fetch_url_content(http_client, url_string)
+                    .map_err(|e| e.to_string())
+                    .await
+            })
+            .shared();
+        self.mention_set.add_fetch_result(url, fetch.clone());
+
+        cx.spawn_in(window, async move |this, cx| {
+            let fetch = fetch.await.notify_async_err(cx);
+            this.update(cx, |this, cx| {
+                if fetch.is_some() {
+                    this.mention_set.insert_uri(crease_id, mention_uri.clone());
+                } else {
+                    // Remove crease if we failed to fetch
+                    this.editor.update(cx, |editor, cx| {
+                        let snapshot = editor.buffer().read(cx).snapshot(cx);
+                        let Some(anchor) =
+                            snapshot.anchor_in_excerpt(excerpt_id, source_range.start)
+                        else {
+                            return;
+                        };
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    });
+                }
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    pub fn confirm_mention_for_selection(
+        &mut self,
+        source_range: Range<text::Anchor>,
+        selections: Vec<(Entity<Buffer>, Range<text::Anchor>, Range<usize>)>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let snapshot = self.editor.read(cx).buffer().read(cx).snapshot(cx);
+        let Some((&excerpt_id, _, _)) = snapshot.as_singleton() else {
+            return;
+        };
+        let Some(start) = snapshot.anchor_in_excerpt(excerpt_id, source_range.start) else {
+            return;
+        };
+
+        let offset = start.to_offset(&snapshot);
+
+        for (buffer, selection_range, range_to_fold) in selections {
+            let range = snapshot.anchor_after(offset + range_to_fold.start)
+                ..snapshot.anchor_after(offset + range_to_fold.end);
+
+            let path = buffer
+                .read(cx)
+                .file()
+                .map_or(PathBuf::from("untitled"), |file| file.path().to_path_buf());
+            let snapshot = buffer.read(cx).snapshot();
+
+            let point_range = selection_range.to_point(&snapshot);
+            let line_range = point_range.start.row..point_range.end.row;
+
+            let uri = MentionUri::Selection {
+                path: path.clone(),
+                line_range: line_range.clone(),
+            };
+            let crease = crate::context_picker::crease_for_mention(
+                selection_name(&path, &line_range).into(),
+                uri.icon_path(cx),
+                range,
+                self.editor.downgrade(),
+            );
+
+            let crease_id = self.editor.update(cx, |editor, cx| {
+                let crease_ids = editor.insert_creases(vec![crease.clone()], cx);
+                editor.fold_creases(vec![crease], false, window, cx);
+                crease_ids.first().copied().unwrap()
+            });
+
+            self.mention_set
+                .insert_uri(crease_id, MentionUri::Selection { path, line_range });
+        }
+    }
+
     pub fn contents(
         &self,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<Vec<acp::ContentBlock>>> {
-        let contents = self.mention_set.lock().contents(
+        let contents = self.mention_set.contents(
             self.project.clone(),
             self.thread_store.clone(),
             self.text_thread_store.clone(),
@@ -198,7 +382,7 @@ impl MessageEditor {
     pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
             editor.clear(window, cx);
-            editor.remove_creases(self.mention_set.lock().drain(), cx)
+            editor.remove_creases(self.mention_set.drain(), cx)
         });
     }
 
@@ -267,9 +451,6 @@ impl MessageEditor {
         cx: &mut Context<Self>,
     ) {
         let buffer = self.editor.read(cx).buffer().clone();
-        let Some((&excerpt_id, _, _)) = buffer.read(cx).snapshot(cx).as_singleton() else {
-            return;
-        };
         let Some(buffer) = buffer.read(cx).as_singleton() else {
             return;
         };
@@ -292,10 +473,8 @@ impl MessageEditor {
                 &path_prefix,
                 false,
                 entry.is_dir(),
-                excerpt_id,
                 anchor..anchor,
-                self.editor.clone(),
-                self.mention_set.clone(),
+                cx.weak_entity(),
                 self.project.clone(),
                 cx,
             ) else {
@@ -331,6 +510,7 @@ impl MessageEditor {
             excerpt_id,
             crease_start,
             content_len,
+            abs_path.clone(),
             self.editor.clone(),
             window,
             cx,
@@ -375,7 +555,7 @@ impl MessageEditor {
             })
             .detach();
 
-            self.mention_set.lock().insert_image(crease_id, task);
+            self.mention_set.insert_image(crease_id, task);
         });
     }
 
@@ -429,7 +609,7 @@ impl MessageEditor {
             editor.buffer().read(cx).snapshot(cx)
         });
 
-        self.mention_set.lock().clear();
+        self.mention_set.clear();
         for (range, mention_uri) in mentions {
             let anchor = snapshot.anchor_before(range.start);
             let crease_id = crate::context_picker::insert_crease_for_mention(
@@ -444,7 +624,7 @@ impl MessageEditor {
             );
 
             if let Some(crease_id) = crease_id {
-                self.mention_set.lock().insert_uri(crease_id, mention_uri);
+                self.mention_set.insert_uri(crease_id, mention_uri);
             }
         }
         for (range, content) in images {
@@ -479,7 +659,7 @@ impl MessageEditor {
             let data: SharedString = content.data.to_string().into();
 
             if let Some(crease_id) = crease_id {
-                self.mention_set.lock().insert_image(
+                self.mention_set.insert_image(
                     crease_id,
                     Task::ready(Ok(MentionImage {
                         abs_path,
@@ -550,20 +730,78 @@ pub(crate) fn insert_crease_for_image(
     excerpt_id: ExcerptId,
     anchor: text::Anchor,
     content_len: usize,
+    abs_path: Option<Arc<Path>>,
     editor: Entity<Editor>,
     window: &mut Window,
     cx: &mut App,
 ) -> Option<CreaseId> {
-    crate::context_picker::insert_crease_for_mention(
-        excerpt_id,
-        anchor,
-        content_len,
-        "Image".into(),
-        IconName::Image.path().into(),
-        editor,
-        window,
-        cx,
-    )
+    let crease_label = abs_path
+        .as_ref()
+        .and_then(|path| path.file_name())
+        .map(|name| name.to_string_lossy().to_string().into())
+        .unwrap_or(SharedString::from("Image"));
+
+    editor.update(cx, |editor, cx| {
+        let snapshot = editor.buffer().read(cx).snapshot(cx);
+
+        let start = snapshot.anchor_in_excerpt(excerpt_id, anchor)?;
+
+        let start = start.bias_right(&snapshot);
+        let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);
+
+        let placeholder = FoldPlaceholder {
+            render: render_image_fold_icon_button(crease_label, cx.weak_entity()),
+            merge_adjacent: false,
+            ..Default::default()
+        };
+
+        let crease = Crease::Inline {
+            range: start..end,
+            placeholder,
+            render_toggle: None,
+            render_trailer: None,
+            metadata: None,
+        };
+
+        let ids = editor.insert_creases(vec![crease.clone()], cx);
+        editor.fold_creases(vec![crease], false, window, cx);
+
+        Some(ids[0])
+    })
+}
+
+fn render_image_fold_icon_button(
+    label: SharedString,
+    editor: WeakEntity<Editor>,
+) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
+    Arc::new({
+        move |fold_id, fold_range, cx| {
+            let is_in_text_selection = editor
+                .update(cx, |editor, cx| editor.is_range_selected(&fold_range, cx))
+                .unwrap_or_default();
+
+            ButtonLike::new(fold_id)
+                .style(ButtonStyle::Filled)
+                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+                .toggle_state(is_in_text_selection)
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Icon::new(IconName::Image)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            Label::new(label.clone())
+                                .size(LabelSize::Small)
+                                .buffer_font(cx)
+                                .single_line(),
+                        ),
+                )
+                .into_any_element()
+        }
+    })
 }
 
 #[cfg(test)]
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 7dc00bfae2..6c5546c6bb 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -13,7 +13,7 @@ use anyhow::{Result, anyhow};
 use collections::HashSet;
 pub use completion_provider::ContextPickerCompletionProvider;
 use editor::display_map::{Crease, CreaseId, CreaseMetadata, FoldId};
-use editor::{Anchor, AnchorRangeExt as _, Editor, ExcerptId, FoldPlaceholder, ToOffset};
+use editor::{Anchor, Editor, ExcerptId, FoldPlaceholder, ToOffset};
 use fetch_context_picker::FetchContextPicker;
 use file_context_picker::FileContextPicker;
 use file_context_picker::render_file_context_entry;
@@ -837,42 +837,9 @@ fn render_fold_icon_button(
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
     Arc::new({
         move |fold_id, fold_range, cx| {
-            let is_in_text_selection = editor.upgrade().is_some_and(|editor| {
-                editor.update(cx, |editor, cx| {
-                    let snapshot = editor
-                        .buffer()
-                        .update(cx, |multi_buffer, cx| multi_buffer.snapshot(cx));
-
-                    let is_in_pending_selection = || {
-                        editor
-                            .selections
-                            .pending
-                            .as_ref()
-                            .is_some_and(|pending_selection| {
-                                pending_selection
-                                    .selection
-                                    .range()
-                                    .includes(&fold_range, &snapshot)
-                            })
-                    };
-
-                    let mut is_in_complete_selection = || {
-                        editor
-                            .selections
-                            .disjoint_in_range::<usize>(fold_range.clone(), cx)
-                            .into_iter()
-                            .any(|selection| {
-                                // This is needed to cover a corner case, if we just check for an existing
-                                // selection in the fold range, having a cursor at the start of the fold
-                                // marks it as selected. Non-empty selections don't cause this.
-                                let length = selection.end - selection.start;
-                                length > 0
-                            })
-                    };
-
-                    is_in_pending_selection() || is_in_complete_selection()
-                })
-            });
+            let is_in_text_selection = editor
+                .update(cx, |editor, cx| editor.is_range_selected(&fold_range, cx))
+                .unwrap_or_default();
 
             ButtonLike::new(fold_id)
                 .style(ButtonStyle::Filled)
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f77e9ae08c..85f2e01ed4 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2369,6 +2369,34 @@ impl Editor {
             .is_some_and(|menu| menu.context_menu.focus_handle(cx).is_focused(window))
     }
 
+    pub fn is_range_selected(&mut self, range: &Range<Anchor>, cx: &mut Context<Self>) -> bool {
+        if self
+            .selections
+            .pending
+            .as_ref()
+            .is_some_and(|pending_selection| {
+                let snapshot = self.buffer().read(cx).snapshot(cx);
+                pending_selection
+                    .selection
+                    .range()
+                    .includes(&range, &snapshot)
+            })
+        {
+            return true;
+        }
+
+        self.selections
+            .disjoint_in_range::<usize>(range.clone(), cx)
+            .into_iter()
+            .any(|selection| {
+                // This is needed to cover a corner case, if we just check for an existing
+                // selection in the fold range, having a cursor at the start of the fold
+                // marks it as selected. Non-empty selections don't cause this.
+                let length = selection.end - selection.start;
+                length > 0
+            })
+    }
+
     pub fn key_context(&self, window: &Window, cx: &App) -> KeyContext {
         self.key_context_internal(self.has_active_edit_prediction(), window, cx)
     }

From b3cad8b527c773c3a541e1a9e3ff23a8fbbae548 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 15:21:04 -0400
Subject: [PATCH 066/823] proto: Remove `UpdateUserPlan` message (#36268)

This PR removes the `UpdateUserPlan` RPC message.

We're no longer using the message after
https://github.com/zed-industries/zed/pull/36255.

Release Notes:

- N/A
---
 crates/client/src/user.rs    |  21 ----
 crates/collab/src/llm.rs     |   8 --
 crates/collab/src/rpc.rs     | 223 -----------------------------------
 crates/proto/proto/app.proto |  10 --
 crates/proto/proto/zed.proto |   3 +-
 crates/proto/src/proto.rs    |   1 -
 6 files changed, 1 insertion(+), 265 deletions(-)

diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index faf46945d8..33a240eca1 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -177,7 +177,6 @@ impl UserStore {
         let (mut current_user_tx, current_user_rx) = watch::channel();
         let (update_contacts_tx, mut update_contacts_rx) = mpsc::unbounded();
         let rpc_subscriptions = vec![
-            client.add_message_handler(cx.weak_entity(), Self::handle_update_plan),
             client.add_message_handler(cx.weak_entity(), Self::handle_update_contacts),
             client.add_message_handler(cx.weak_entity(), Self::handle_update_invite_info),
             client.add_message_handler(cx.weak_entity(), Self::handle_show_contacts),
@@ -343,26 +342,6 @@ impl UserStore {
         Ok(())
     }
 
-    async fn handle_update_plan(
-        this: Entity<Self>,
-        _message: TypedEnvelope<proto::UpdateUserPlan>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let client = this
-            .read_with(&cx, |this, _| this.client.upgrade())?
-            .context("client was dropped")?;
-
-        let response = client
-            .cloud_client()
-            .get_authenticated_user()
-            .await
-            .context("failed to fetch authenticated user")?;
-
-        this.update(&mut cx, |this, cx| {
-            this.update_authenticated_user(response, cx);
-        })
-    }
-
     fn update_contacts(&mut self, message: UpdateContacts, cx: &Context<Self>) -> Task<Result<()>> {
         match message {
             UpdateContacts::Wait(barrier) => {
diff --git a/crates/collab/src/llm.rs b/crates/collab/src/llm.rs
index ca8e89bc6d..dec10232bd 100644
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -1,9 +1 @@
 pub mod db;
-
-pub const AGENT_EXTENDED_TRIAL_FEATURE_FLAG: &str = "agent-extended-trial";
-
-/// The name of the feature flag that bypasses the account age check.
-pub const BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG: &str = "bypass-account-age-check";
-
-/// The minimum account age an account must have in order to use the LLM service.
-pub const MIN_ACCOUNT_AGE_FOR_LLM_USE: chrono::Duration = chrono::Duration::days(30);
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 8366b2cf13..957cc30fe6 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1,12 +1,6 @@
 mod connection_pool;
 
 use crate::api::{CloudflareIpCountryHeader, SystemIdHeader};
-use crate::db::billing_subscription::SubscriptionKind;
-use crate::llm::db::LlmDatabase;
-use crate::llm::{
-    AGENT_EXTENDED_TRIAL_FEATURE_FLAG, BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG,
-    MIN_ACCOUNT_AGE_FOR_LLM_USE,
-};
 use crate::{
     AppState, Error, Result, auth,
     db::{
@@ -146,13 +140,6 @@ pub enum Principal {
 }
 
 impl Principal {
-    fn user(&self) -> &User {
-        match self {
-            Principal::User(user) => user,
-            Principal::Impersonated { user, .. } => user,
-        }
-    }
-
     fn update_span(&self, span: &tracing::Span) {
         match &self {
             Principal::User(user) => {
@@ -997,8 +984,6 @@ impl Server {
                         .await?;
                 }
 
-                update_user_plan(session).await?;
-
                 let contacts = self.app_state.db.get_contacts(user.id).await?;
 
                 {
@@ -2832,214 +2817,6 @@ fn should_auto_subscribe_to_channels(version: ZedVersion) -> bool {
     version.0.minor() < 139
 }
 
-async fn current_plan(db: &Arc<Database>, user_id: UserId, is_staff: bool) -> Result<proto::Plan> {
-    if is_staff {
-        return Ok(proto::Plan::ZedPro);
-    }
-
-    let subscription = db.get_active_billing_subscription(user_id).await?;
-    let subscription_kind = subscription.and_then(|subscription| subscription.kind);
-
-    let plan = if let Some(subscription_kind) = subscription_kind {
-        match subscription_kind {
-            SubscriptionKind::ZedPro => proto::Plan::ZedPro,
-            SubscriptionKind::ZedProTrial => proto::Plan::ZedProTrial,
-            SubscriptionKind::ZedFree => proto::Plan::Free,
-        }
-    } else {
-        proto::Plan::Free
-    };
-
-    Ok(plan)
-}
-
-async fn make_update_user_plan_message(
-    user: &User,
-    is_staff: bool,
-    db: &Arc<Database>,
-    llm_db: Option<Arc<LlmDatabase>>,
-) -> Result<proto::UpdateUserPlan> {
-    let feature_flags = db.get_user_flags(user.id).await?;
-    let plan = current_plan(db, user.id, is_staff).await?;
-    let billing_customer = db.get_billing_customer_by_user_id(user.id).await?;
-    let billing_preferences = db.get_billing_preferences(user.id).await?;
-
-    let (subscription_period, usage) = if let Some(llm_db) = llm_db {
-        let subscription = db.get_active_billing_subscription(user.id).await?;
-
-        let subscription_period =
-            crate::db::billing_subscription::Model::current_period(subscription, is_staff);
-
-        let usage = if let Some((period_start_at, period_end_at)) = subscription_period {
-            llm_db
-                .get_subscription_usage_for_period(user.id, period_start_at, period_end_at)
-                .await?
-        } else {
-            None
-        };
-
-        (subscription_period, usage)
-    } else {
-        (None, None)
-    };
-
-    let bypass_account_age_check = feature_flags
-        .iter()
-        .any(|flag| flag == BYPASS_ACCOUNT_AGE_CHECK_FEATURE_FLAG);
-    let account_too_young = !matches!(plan, proto::Plan::ZedPro)
-        && !bypass_account_age_check
-        && user.account_age() < MIN_ACCOUNT_AGE_FOR_LLM_USE;
-
-    Ok(proto::UpdateUserPlan {
-        plan: plan.into(),
-        trial_started_at: billing_customer
-            .as_ref()
-            .and_then(|billing_customer| billing_customer.trial_started_at)
-            .map(|trial_started_at| trial_started_at.and_utc().timestamp() as u64),
-        is_usage_based_billing_enabled: if is_staff {
-            Some(true)
-        } else {
-            billing_preferences.map(|preferences| preferences.model_request_overages_enabled)
-        },
-        subscription_period: subscription_period.map(|(started_at, ended_at)| {
-            proto::SubscriptionPeriod {
-                started_at: started_at.timestamp() as u64,
-                ended_at: ended_at.timestamp() as u64,
-            }
-        }),
-        account_too_young: Some(account_too_young),
-        has_overdue_invoices: billing_customer
-            .map(|billing_customer| billing_customer.has_overdue_invoices),
-        usage: Some(
-            usage
-                .map(|usage| subscription_usage_to_proto(plan, usage, &feature_flags))
-                .unwrap_or_else(|| make_default_subscription_usage(plan, &feature_flags)),
-        ),
-    })
-}
-
-fn model_requests_limit(
-    plan: cloud_llm_client::Plan,
-    feature_flags: &Vec<String>,
-) -> cloud_llm_client::UsageLimit {
-    match plan.model_requests_limit() {
-        cloud_llm_client::UsageLimit::Limited(limit) => {
-            let limit = if plan == cloud_llm_client::Plan::ZedProTrial
-                && feature_flags
-                    .iter()
-                    .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG)
-            {
-                1_000
-            } else {
-                limit
-            };
-
-            cloud_llm_client::UsageLimit::Limited(limit)
-        }
-        cloud_llm_client::UsageLimit::Unlimited => cloud_llm_client::UsageLimit::Unlimited,
-    }
-}
-
-fn subscription_usage_to_proto(
-    plan: proto::Plan,
-    usage: crate::llm::db::subscription_usage::Model,
-    feature_flags: &Vec<String>,
-) -> proto::SubscriptionUsage {
-    let plan = match plan {
-        proto::Plan::Free => cloud_llm_client::Plan::ZedFree,
-        proto::Plan::ZedPro => cloud_llm_client::Plan::ZedPro,
-        proto::Plan::ZedProTrial => cloud_llm_client::Plan::ZedProTrial,
-    };
-
-    proto::SubscriptionUsage {
-        model_requests_usage_amount: usage.model_requests as u32,
-        model_requests_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match model_requests_limit(plan, feature_flags) {
-                cloud_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                cloud_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-        edit_predictions_usage_amount: usage.edit_predictions as u32,
-        edit_predictions_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match plan.edit_predictions_limit() {
-                cloud_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                cloud_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-    }
-}
-
-fn make_default_subscription_usage(
-    plan: proto::Plan,
-    feature_flags: &Vec<String>,
-) -> proto::SubscriptionUsage {
-    let plan = match plan {
-        proto::Plan::Free => cloud_llm_client::Plan::ZedFree,
-        proto::Plan::ZedPro => cloud_llm_client::Plan::ZedPro,
-        proto::Plan::ZedProTrial => cloud_llm_client::Plan::ZedProTrial,
-    };
-
-    proto::SubscriptionUsage {
-        model_requests_usage_amount: 0,
-        model_requests_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match model_requests_limit(plan, feature_flags) {
-                cloud_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                cloud_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-        edit_predictions_usage_amount: 0,
-        edit_predictions_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match plan.edit_predictions_limit() {
-                cloud_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                cloud_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-    }
-}
-
-async fn update_user_plan(session: &Session) -> Result<()> {
-    let db = session.db().await;
-
-    let update_user_plan = make_update_user_plan_message(
-        session.principal.user(),
-        session.is_staff(),
-        &db.0,
-        session.app_state.llm_db.clone(),
-    )
-    .await?;
-
-    session
-        .peer
-        .send(session.connection_id, update_user_plan)
-        .trace_err();
-
-    Ok(())
-}
-
 async fn subscribe_to_channels(
     _: proto::SubscribeToChannels,
     session: MessageContext,
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index 66baf968e3..fe6f7be1b0 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -12,16 +12,6 @@ enum Plan {
     ZedProTrial = 2;
 }
 
-message UpdateUserPlan {
-    Plan plan = 1;
-    optional uint64 trial_started_at = 2;
-    optional bool is_usage_based_billing_enabled = 3;
-    optional SubscriptionUsage usage = 4;
-    optional SubscriptionPeriod subscription_period = 5;
-    optional bool account_too_young = 6;
-    optional bool has_overdue_invoices = 7;
-}
-
 message SubscriptionPeriod {
     uint64 started_at = 1;
     uint64 ended_at = 2;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 8984df2944..4b023a46bc 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -135,7 +135,6 @@ message Envelope {
         FollowResponse follow_response = 99;
         UpdateFollowers update_followers = 100;
         Unfollow unfollow = 101;
-        UpdateUserPlan update_user_plan = 234;
         UpdateDiffBases update_diff_bases = 104;
         AcceptTermsOfService accept_terms_of_service = 239;
         AcceptTermsOfServiceResponse accept_terms_of_service_response = 240;
@@ -414,7 +413,7 @@ message Envelope {
     reserved 221;
     reserved 224 to 229;
     reserved 230 to 231;
-    reserved 235 to 236;
+    reserved 234 to 236;
     reserved 246;
     reserved 247 to 254;
     reserved 255 to 256;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 82bd1af6db..18abf31c64 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -275,7 +275,6 @@ messages!(
     (UpdateProject, Foreground),
     (UpdateProjectCollaborator, Foreground),
     (UpdateUserChannels, Foreground),
-    (UpdateUserPlan, Foreground),
     (UpdateWorktree, Foreground),
     (UpdateWorktreeSettings, Foreground),
     (UpdateRepository, Foreground),

From 75f85b3aaa202f07185a39d855143851f609ddf7 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 15 Aug 2025 15:37:52 -0400
Subject: [PATCH 067/823] Remove old telemetry events and transformation layer
 (#36263)

Successor to: https://github.com/zed-industries/zed/pull/25179

Release Notes:

- N/A
---
 crates/collab/src/api/events.rs               | 166 +-----------------
 .../telemetry_events/src/telemetry_events.rs  | 108 +-----------
 2 files changed, 4 insertions(+), 270 deletions(-)

diff --git a/crates/collab/src/api/events.rs b/crates/collab/src/api/events.rs
index 2f34a843a8..cd1dc42e64 100644
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -564,170 +564,10 @@ fn for_snowflake(
     country_code: Option<String>,
     checksum_matched: bool,
 ) -> impl Iterator<Item = SnowflakeRow> {
-    body.events.into_iter().filter_map(move |event| {
+    body.events.into_iter().map(move |event| {
         let timestamp =
             first_event_at + Duration::milliseconds(event.milliseconds_since_first_event);
-        // We will need to double check, but I believe all of the events that
-        // are being transformed here are now migrated over to use the
-        // telemetry::event! macro, as of this commit so this code can go away
-        // when we feel enough users have upgraded past this point.
         let (event_type, mut event_properties) = match &event.event {
-            Event::Editor(e) => (
-                match e.operation.as_str() {
-                    "open" => "Editor Opened".to_string(),
-                    "save" => "Editor Saved".to_string(),
-                    _ => format!("Unknown Editor Event: {}", e.operation),
-                },
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::EditPrediction(e) => (
-                format!(
-                    "Edit Prediction {}",
-                    if e.suggestion_accepted {
-                        "Accepted"
-                    } else {
-                        "Discarded"
-                    }
-                ),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::EditPredictionRating(e) => (
-                "Edit Prediction Rated".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Call(e) => {
-                let event_type = match e.operation.trim() {
-                    "unshare project" => "Project Unshared".to_string(),
-                    "open channel notes" => "Channel Notes Opened".to_string(),
-                    "share project" => "Project Shared".to_string(),
-                    "join channel" => "Channel Joined".to_string(),
-                    "hang up" => "Call Ended".to_string(),
-                    "accept incoming" => "Incoming Call Accepted".to_string(),
-                    "invite" => "Participant Invited".to_string(),
-                    "disable microphone" => "Microphone Disabled".to_string(),
-                    "enable microphone" => "Microphone Enabled".to_string(),
-                    "enable screen share" => "Screen Share Enabled".to_string(),
-                    "disable screen share" => "Screen Share Disabled".to_string(),
-                    "decline incoming" => "Incoming Call Declined".to_string(),
-                    _ => format!("Unknown Call Event: {}", e.operation),
-                };
-
-                (event_type, serde_json::to_value(e).unwrap())
-            }
-            Event::Assistant(e) => (
-                match e.phase {
-                    telemetry_events::AssistantPhase::Response => "Assistant Responded".to_string(),
-                    telemetry_events::AssistantPhase::Invoked => "Assistant Invoked".to_string(),
-                    telemetry_events::AssistantPhase::Accepted => {
-                        "Assistant Response Accepted".to_string()
-                    }
-                    telemetry_events::AssistantPhase::Rejected => {
-                        "Assistant Response Rejected".to_string()
-                    }
-                },
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Cpu(_) | Event::Memory(_) => return None,
-            Event::App(e) => {
-                let mut properties = json!({});
-                let event_type = match e.operation.trim() {
-                    // App
-                    "open" => "App Opened".to_string(),
-                    "first open" => "App First Opened".to_string(),
-                    "first open for release channel" => {
-                        "App First Opened For Release Channel".to_string()
-                    }
-                    "close" => "App Closed".to_string(),
-
-                    // Project
-                    "open project" => "Project Opened".to_string(),
-                    "open node project" => {
-                        properties["project_type"] = json!("node");
-                        "Project Opened".to_string()
-                    }
-                    "open pnpm project" => {
-                        properties["project_type"] = json!("pnpm");
-                        "Project Opened".to_string()
-                    }
-                    "open yarn project" => {
-                        properties["project_type"] = json!("yarn");
-                        "Project Opened".to_string()
-                    }
-
-                    // SSH
-                    "create ssh server" => "SSH Server Created".to_string(),
-                    "create ssh project" => "SSH Project Created".to_string(),
-                    "open ssh project" => "SSH Project Opened".to_string(),
-
-                    // Welcome Page
-                    "welcome page: change keymap" => "Welcome Keymap Changed".to_string(),
-                    "welcome page: change theme" => "Welcome Theme Changed".to_string(),
-                    "welcome page: close" => "Welcome Page Closed".to_string(),
-                    "welcome page: edit settings" => "Welcome Settings Edited".to_string(),
-                    "welcome page: install cli" => "Welcome CLI Installed".to_string(),
-                    "welcome page: open" => "Welcome Page Opened".to_string(),
-                    "welcome page: open extensions" => "Welcome Extensions Page Opened".to_string(),
-                    "welcome page: sign in to copilot" => "Welcome Copilot Signed In".to_string(),
-                    "welcome page: toggle diagnostic telemetry" => {
-                        "Welcome Diagnostic Telemetry Toggled".to_string()
-                    }
-                    "welcome page: toggle metric telemetry" => {
-                        "Welcome Metric Telemetry Toggled".to_string()
-                    }
-                    "welcome page: toggle vim" => "Welcome Vim Mode Toggled".to_string(),
-                    "welcome page: view docs" => "Welcome Documentation Viewed".to_string(),
-
-                    // Extensions
-                    "extensions page: open" => "Extensions Page Opened".to_string(),
-                    "extensions: install extension" => "Extension Installed".to_string(),
-                    "extensions: uninstall extension" => "Extension Uninstalled".to_string(),
-
-                    // Misc
-                    "markdown preview: open" => "Markdown Preview Opened".to_string(),
-                    "project diagnostics: open" => "Project Diagnostics Opened".to_string(),
-                    "project search: open" => "Project Search Opened".to_string(),
-                    "repl sessions: open" => "REPL Session Started".to_string(),
-
-                    // Feature Upsell
-                    "feature upsell: toggle vim" => {
-                        properties["source"] = json!("Feature Upsell");
-                        "Vim Mode Toggled".to_string()
-                    }
-                    _ => e
-                        .operation
-                        .strip_prefix("feature upsell: viewed docs (")
-                        .and_then(|s| s.strip_suffix(')'))
-                        .map_or_else(
-                            || format!("Unknown App Event: {}", e.operation),
-                            |docs_url| {
-                                properties["url"] = json!(docs_url);
-                                properties["source"] = json!("Feature Upsell");
-                                "Documentation Viewed".to_string()
-                            },
-                        ),
-                };
-                (event_type, properties)
-            }
-            Event::Setting(e) => (
-                "Settings Changed".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Extension(e) => (
-                "Extension Loaded".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Edit(e) => (
-                "Editor Edited".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Action(e) => (
-                "Action Invoked".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Repl(e) => (
-                "Kernel Status Changed".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
             Event::Flexible(e) => (
                 e.event_type.clone(),
                 serde_json::to_value(&e.event_properties).unwrap(),
@@ -759,7 +599,7 @@ fn for_snowflake(
             })
         });
 
-        Some(SnowflakeRow {
+        SnowflakeRow {
             time: timestamp,
             user_id: body.metrics_id.clone(),
             device_id: body.system_id.clone(),
@@ -767,7 +607,7 @@ fn for_snowflake(
             event_properties,
             user_properties,
             insert_id: Some(Uuid::new_v4().to_string()),
-        })
+        }
     })
 }
 
diff --git a/crates/telemetry_events/src/telemetry_events.rs b/crates/telemetry_events/src/telemetry_events.rs
index 735a1310ae..12d8d4c04b 100644
--- a/crates/telemetry_events/src/telemetry_events.rs
+++ b/crates/telemetry_events/src/telemetry_events.rs
@@ -2,7 +2,7 @@
 
 use semantic_version::SemanticVersion;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, fmt::Display, sync::Arc, time::Duration};
+use std::{collections::HashMap, fmt::Display, time::Duration};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct EventRequestBody {
@@ -93,19 +93,6 @@ impl Display for AssistantPhase {
 #[serde(tag = "type")]
 pub enum Event {
     Flexible(FlexibleEvent),
-    Editor(EditorEvent),
-    EditPrediction(EditPredictionEvent),
-    EditPredictionRating(EditPredictionRatingEvent),
-    Call(CallEvent),
-    Assistant(AssistantEventData),
-    Cpu(CpuEvent),
-    Memory(MemoryEvent),
-    App(AppEvent),
-    Setting(SettingEvent),
-    Extension(ExtensionEvent),
-    Edit(EditEvent),
-    Action(ActionEvent),
-    Repl(ReplEvent),
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -114,54 +101,12 @@ pub struct FlexibleEvent {
     pub event_properties: HashMap<String, serde_json::Value>,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct EditorEvent {
-    /// The editor operation performed (open, save)
-    pub operation: String,
-    /// The extension of the file that was opened or saved
-    pub file_extension: Option<String>,
-    /// Whether the user is in vim mode or not
-    pub vim_mode: bool,
-    /// Whether the user has copilot enabled or not
-    pub copilot_enabled: bool,
-    /// Whether the user has copilot enabled for the language of the file opened or saved
-    pub copilot_enabled_for_language: bool,
-    /// Whether the client is opening/saving a local file or a remote file via SSH
-    #[serde(default)]
-    pub is_via_ssh: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct EditPredictionEvent {
-    /// Provider of the completion suggestion (e.g. copilot, supermaven)
-    pub provider: String,
-    pub suggestion_accepted: bool,
-    pub file_extension: Option<String>,
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum EditPredictionRating {
     Positive,
     Negative,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct EditPredictionRatingEvent {
-    pub rating: EditPredictionRating,
-    pub input_events: Arc<str>,
-    pub input_excerpt: Arc<str>,
-    pub output_excerpt: Arc<str>,
-    pub feedback: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct CallEvent {
-    /// Operation performed: invite/join call; begin/end screenshare; share/unshare project; etc
-    pub operation: String,
-    pub room_id: Option<u64>,
-    pub channel_id: Option<u64>,
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct AssistantEventData {
     /// Unique random identifier for each assistant tab (None for inline assist)
@@ -180,57 +125,6 @@ pub struct AssistantEventData {
     pub language_name: Option<String>,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct CpuEvent {
-    pub usage_as_percentage: f32,
-    pub core_count: u32,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MemoryEvent {
-    pub memory_in_bytes: u64,
-    pub virtual_memory_in_bytes: u64,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct ActionEvent {
-    pub source: String,
-    pub action: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct EditEvent {
-    pub duration: i64,
-    pub environment: String,
-    /// Whether the edits occurred locally or remotely via SSH
-    #[serde(default)]
-    pub is_via_ssh: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct SettingEvent {
-    pub setting: String,
-    pub value: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct ExtensionEvent {
-    pub extension_id: Arc<str>,
-    pub version: Arc<str>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AppEvent {
-    pub operation: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct ReplEvent {
-    pub kernel_language: String,
-    pub kernel_status: String,
-    pub repl_session_id: String,
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct BacktraceFrame {
     pub ip: usize,

From 2a9d4599cdeb61d5f6cf90f01d7475b14bf5b510 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 15:46:23 -0400
Subject: [PATCH 068/823] proto: Remove unused types (#36269)

This PR removes some unused types from the RPC protocol.

Release Notes:

- N/A
---
 .../agent_ui/src/language_model_selector.rs   |  6 ++--
 crates/client/src/user.rs                     | 13 --------
 crates/proto/proto/app.proto                  | 31 -------------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 7121624c87..bb8514a224 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -1,5 +1,6 @@
 use std::{cmp::Reverse, sync::Arc};
 
+use cloud_llm_client::Plan;
 use collections::{HashSet, IndexMap};
 use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
@@ -10,7 +11,6 @@ use language_model::{
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
-use proto::Plan;
 use ui::{ListItem, ListItemSpacing, prelude::*};
 
 const TRY_ZED_PRO_URL: &str = "https://zed.dev/pro";
@@ -536,7 +536,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
     ) -> Option<gpui::AnyElement> {
         use feature_flags::FeatureFlagAppExt;
 
-        let plan = proto::Plan::ZedPro;
+        let plan = Plan::ZedPro;
 
         Some(
             h_flex()
@@ -557,7 +557,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
                                 window
                                     .dispatch_action(Box::new(zed_actions::OpenAccountSettings), cx)
                             }),
-                        Plan::Free | Plan::ZedProTrial => Button::new(
+                        Plan::ZedFree | Plan::ZedProTrial => Button::new(
                             "try-pro",
                             if plan == Plan::ZedProTrial {
                                 "Upgrade to Pro"
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 33a240eca1..da7f50076b 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -998,19 +998,6 @@ impl RequestUsage {
         }
     }
 
-    pub fn from_proto(amount: u32, limit: proto::UsageLimit) -> Option<Self> {
-        let limit = match limit.variant? {
-            proto::usage_limit::Variant::Limited(limited) => {
-                UsageLimit::Limited(limited.limit as i32)
-            }
-            proto::usage_limit::Variant::Unlimited(_) => UsageLimit::Unlimited,
-        };
-        Some(RequestUsage {
-            limit,
-            amount: amount as i32,
-        })
-    }
-
     fn from_headers(
         limit_name: &str,
         amount_name: &str,
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index fe6f7be1b0..9611b607d0 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -6,37 +6,6 @@ message UpdateInviteInfo {
     uint32 count = 2;
 }
 
-enum Plan {
-    Free = 0;
-    ZedPro = 1;
-    ZedProTrial = 2;
-}
-
-message SubscriptionPeriod {
-    uint64 started_at = 1;
-    uint64 ended_at = 2;
-}
-
-message SubscriptionUsage {
-    uint32 model_requests_usage_amount = 1;
-    UsageLimit model_requests_usage_limit = 2;
-    uint32 edit_predictions_usage_amount = 3;
-    UsageLimit edit_predictions_usage_limit = 4;
-}
-
-message UsageLimit {
-    oneof variant {
-        Limited limited = 1;
-        Unlimited unlimited = 2;
-    }
-
-    message Limited {
-        uint32 limit = 1;
-    }
-
-    message Unlimited {}
-}
-
 message AcceptTermsOfService {}
 
 message AcceptTermsOfServiceResponse {

From 65f64aa5138a4cfcede025648cda973eeae21021 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 15 Aug 2025 22:21:21 +0200
Subject: [PATCH 069/823] search: Fix recently introduced issues with the
 search bars (#36271)

Follow-up to https://github.com/zed-industries/zed/pull/36233

The above PR simplified the handling but introduced some bugs: The
replace buttons were no longer clickable, some buttons also lost their
toggle states, some buttons shared their element id and, lastly, some
buttons were clickable but would not trigger the right action. This PR
fixes all that.

Release Notes:

- N/A
---
 crates/search/src/buffer_search.rs  | 53 +++++++++++++++-----------
 crates/search/src/project_search.rs | 59 +++++++++++++++++------------
 crates/search/src/search.rs         | 55 +++++++++++++++++++--------
 crates/search/src/search_bar.rs     | 12 +++++-
 4 files changed, 114 insertions(+), 65 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index da2d35d74c..189f48e6b6 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -2,9 +2,9 @@ mod registrar;
 
 use crate::{
     FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext, SearchOption,
-    SearchOptions, SelectAllMatches, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive,
-    ToggleRegex, ToggleReplace, ToggleSelection, ToggleWholeWord,
-    search_bar::{input_base_styles, render_action_button, render_text_input},
+    SearchOptions, SearchSource, SelectAllMatches, SelectNextMatch, SelectPreviousMatch,
+    ToggleCaseSensitive, ToggleRegex, ToggleReplace, ToggleSelection, ToggleWholeWord,
+    search_bar::{ActionButtonState, input_base_styles, render_action_button, render_text_input},
 };
 use any_vec::AnyVec;
 use anyhow::Context as _;
@@ -213,22 +213,25 @@ impl Render for BufferSearchBar {
                     h_flex()
                         .gap_1()
                         .when(case, |div| {
-                            div.child(
-                                SearchOption::CaseSensitive
-                                    .as_button(self.search_options, focus_handle.clone()),
-                            )
+                            div.child(SearchOption::CaseSensitive.as_button(
+                                self.search_options,
+                                SearchSource::Buffer,
+                                focus_handle.clone(),
+                            ))
                         })
                         .when(word, |div| {
-                            div.child(
-                                SearchOption::WholeWord
-                                    .as_button(self.search_options, focus_handle.clone()),
-                            )
+                            div.child(SearchOption::WholeWord.as_button(
+                                self.search_options,
+                                SearchSource::Buffer,
+                                focus_handle.clone(),
+                            ))
                         })
                         .when(regex, |div| {
-                            div.child(
-                                SearchOption::Regex
-                                    .as_button(self.search_options, focus_handle.clone()),
-                            )
+                            div.child(SearchOption::Regex.as_button(
+                                self.search_options,
+                                SearchSource::Buffer,
+                                focus_handle.clone(),
+                            ))
                         }),
                 )
             });
@@ -240,7 +243,7 @@ impl Render for BufferSearchBar {
                 this.child(render_action_button(
                     "buffer-search-bar-toggle",
                     IconName::Replace,
-                    self.replace_enabled,
+                    self.replace_enabled.then_some(ActionButtonState::Toggled),
                     "Toggle Replace",
                     &ToggleReplace,
                     focus_handle.clone(),
@@ -285,7 +288,9 @@ impl Render for BufferSearchBar {
                     .child(render_action_button(
                         "buffer-search-nav-button",
                         ui::IconName::ChevronLeft,
-                        self.active_match_index.is_some(),
+                        self.active_match_index
+                            .is_none()
+                            .then_some(ActionButtonState::Disabled),
                         "Select Previous Match",
                         &SelectPreviousMatch,
                         query_focus.clone(),
@@ -293,7 +298,9 @@ impl Render for BufferSearchBar {
                     .child(render_action_button(
                         "buffer-search-nav-button",
                         ui::IconName::ChevronRight,
-                        self.active_match_index.is_some(),
+                        self.active_match_index
+                            .is_none()
+                            .then_some(ActionButtonState::Disabled),
                         "Select Next Match",
                         &SelectNextMatch,
                         query_focus.clone(),
@@ -313,7 +320,7 @@ impl Render for BufferSearchBar {
                 el.child(render_action_button(
                     "buffer-search-nav-button",
                     IconName::SelectAll,
-                    true,
+                    Default::default(),
                     "Select All Matches",
                     &SelectAllMatches,
                     query_focus,
@@ -324,7 +331,7 @@ impl Render for BufferSearchBar {
                 el.child(render_action_button(
                     "buffer-search",
                     IconName::Close,
-                    true,
+                    Default::default(),
                     "Close Search Bar",
                     &Dismiss,
                     focus_handle.clone(),
@@ -352,7 +359,7 @@ impl Render for BufferSearchBar {
                     .child(render_action_button(
                         "buffer-search-replace-button",
                         IconName::ReplaceNext,
-                        true,
+                        Default::default(),
                         "Replace Next Match",
                         &ReplaceNext,
                         focus_handle.clone(),
@@ -360,7 +367,7 @@ impl Render for BufferSearchBar {
                     .child(render_action_button(
                         "buffer-search-replace-button",
                         IconName::ReplaceAll,
-                        true,
+                        Default::default(),
                         "Replace All Matches",
                         &ReplaceAll,
                         focus_handle,
@@ -394,7 +401,7 @@ impl Render for BufferSearchBar {
                     div.child(h_flex().absolute().right_0().child(render_action_button(
                         "buffer-search",
                         IconName::Close,
-                        true,
+                        Default::default(),
                         "Close Search Bar",
                         &Dismiss,
                         focus_handle.clone(),
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index b791f748ad..056c3556ba 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1,9 +1,9 @@
 use crate::{
     BufferSearchBar, FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext,
-    SearchOption, SearchOptions, SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive,
-    ToggleIncludeIgnored, ToggleRegex, ToggleReplace, ToggleWholeWord,
+    SearchOption, SearchOptions, SearchSource, SelectNextMatch, SelectPreviousMatch,
+    ToggleCaseSensitive, ToggleIncludeIgnored, ToggleRegex, ToggleReplace, ToggleWholeWord,
     buffer_search::Deploy,
-    search_bar::{input_base_styles, render_action_button, render_text_input},
+    search_bar::{ActionButtonState, input_base_styles, render_action_button, render_text_input},
 };
 use anyhow::Context as _;
 use collections::HashMap;
@@ -1665,7 +1665,7 @@ impl ProjectSearchBar {
         });
     }
 
-    fn toggle_search_option(
+    pub(crate) fn toggle_search_option(
         &mut self,
         option: SearchOptions,
         window: &mut Window,
@@ -1962,17 +1962,21 @@ impl Render for ProjectSearchBar {
             .child(
                 h_flex()
                     .gap_1()
-                    .child(
-                        SearchOption::CaseSensitive
-                            .as_button(search.search_options, focus_handle.clone()),
-                    )
-                    .child(
-                        SearchOption::WholeWord
-                            .as_button(search.search_options, focus_handle.clone()),
-                    )
-                    .child(
-                        SearchOption::Regex.as_button(search.search_options, focus_handle.clone()),
-                    ),
+                    .child(SearchOption::CaseSensitive.as_button(
+                        search.search_options,
+                        SearchSource::Project(cx),
+                        focus_handle.clone(),
+                    ))
+                    .child(SearchOption::WholeWord.as_button(
+                        search.search_options,
+                        SearchSource::Project(cx),
+                        focus_handle.clone(),
+                    ))
+                    .child(SearchOption::Regex.as_button(
+                        search.search_options,
+                        SearchSource::Project(cx),
+                        focus_handle.clone(),
+                    )),
             );
 
         let query_focus = search.query_editor.focus_handle(cx);
@@ -1985,7 +1989,10 @@ impl Render for ProjectSearchBar {
             .child(render_action_button(
                 "project-search-nav-button",
                 IconName::ChevronLeft,
-                search.active_match_index.is_some(),
+                search
+                    .active_match_index
+                    .is_none()
+                    .then_some(ActionButtonState::Disabled),
                 "Select Previous Match",
                 &SelectPreviousMatch,
                 query_focus.clone(),
@@ -1993,7 +2000,10 @@ impl Render for ProjectSearchBar {
             .child(render_action_button(
                 "project-search-nav-button",
                 IconName::ChevronRight,
-                search.active_match_index.is_some(),
+                search
+                    .active_match_index
+                    .is_none()
+                    .then_some(ActionButtonState::Disabled),
                 "Select Next Match",
                 &SelectNextMatch,
                 query_focus,
@@ -2054,7 +2064,7 @@ impl Render for ProjectSearchBar {
                 self.active_project_search
                     .as_ref()
                     .map(|search| search.read(cx).replace_enabled)
-                    .unwrap_or_default(),
+                    .and_then(|enabled| enabled.then_some(ActionButtonState::Toggled)),
                 "Toggle Replace",
                 &ToggleReplace,
                 focus_handle.clone(),
@@ -2079,7 +2089,7 @@ impl Render for ProjectSearchBar {
                 .child(render_action_button(
                     "project-search-replace-button",
                     IconName::ReplaceNext,
-                    true,
+                    Default::default(),
                     "Replace Next Match",
                     &ReplaceNext,
                     focus_handle.clone(),
@@ -2087,7 +2097,7 @@ impl Render for ProjectSearchBar {
                 .child(render_action_button(
                     "project-search-replace-button",
                     IconName::ReplaceAll,
-                    true,
+                    Default::default(),
                     "Replace All Matches",
                     &ReplaceAll,
                     focus_handle,
@@ -2129,10 +2139,11 @@ impl Render for ProjectSearchBar {
                             this.toggle_opened_only(window, cx);
                         })),
                 )
-                .child(
-                    SearchOption::IncludeIgnored
-                        .as_button(search.search_options, focus_handle.clone()),
-                );
+                .child(SearchOption::IncludeIgnored.as_button(
+                    search.search_options,
+                    SearchSource::Project(cx),
+                    focus_handle.clone(),
+                ));
             h_flex()
                 .w_full()
                 .gap_2()
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index 89064e0a27..904c74d03c 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -1,7 +1,7 @@
 use bitflags::bitflags;
 pub use buffer_search::BufferSearchBar;
 use editor::SearchSettings;
-use gpui::{Action, App, FocusHandle, IntoElement, actions};
+use gpui::{Action, App, ClickEvent, FocusHandle, IntoElement, actions};
 use project::search::SearchQuery;
 pub use project_search::ProjectSearchView;
 use ui::{ButtonStyle, IconButton, IconButtonShape};
@@ -11,6 +11,8 @@ use workspace::{Toast, Workspace};
 
 pub use search_status_button::SEARCH_ICON;
 
+use crate::project_search::ProjectSearchBar;
+
 pub mod buffer_search;
 pub mod project_search;
 pub(crate) mod search_bar;
@@ -83,9 +85,14 @@ pub enum SearchOption {
     Backwards,
 }
 
+pub(crate) enum SearchSource<'a, 'b> {
+    Buffer,
+    Project(&'a Context<'b, ProjectSearchBar>),
+}
+
 impl SearchOption {
-    pub fn as_options(self) -> SearchOptions {
-        SearchOptions::from_bits(1 << self as u8).unwrap()
+    pub fn as_options(&self) -> SearchOptions {
+        SearchOptions::from_bits(1 << *self as u8).unwrap()
     }
 
     pub fn label(&self) -> &'static str {
@@ -119,25 +126,41 @@ impl SearchOption {
         }
     }
 
-    pub fn as_button(&self, active: SearchOptions, focus_handle: FocusHandle) -> impl IntoElement {
+    pub(crate) fn as_button(
+        &self,
+        active: SearchOptions,
+        search_source: SearchSource,
+        focus_handle: FocusHandle,
+    ) -> impl IntoElement {
         let action = self.to_toggle_action();
         let label = self.label();
-        IconButton::new(label, self.icon())
-            .on_click({
+        IconButton::new(
+            (label, matches!(search_source, SearchSource::Buffer) as u32),
+            self.icon(),
+        )
+        .map(|button| match search_source {
+            SearchSource::Buffer => {
                 let focus_handle = focus_handle.clone();
-                move |_, window, cx| {
+                button.on_click(move |_: &ClickEvent, window, cx| {
                     if !focus_handle.is_focused(&window) {
                         window.focus(&focus_handle);
                     }
-                    window.dispatch_action(action.boxed_clone(), cx)
-                }
-            })
-            .style(ButtonStyle::Subtle)
-            .shape(IconButtonShape::Square)
-            .toggle_state(active.contains(self.as_options()))
-            .tooltip({
-                move |window, cx| Tooltip::for_action_in(label, action, &focus_handle, window, cx)
-            })
+                    window.dispatch_action(action.boxed_clone(), cx);
+                })
+            }
+            SearchSource::Project(cx) => {
+                let options = self.as_options();
+                button.on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
+                    this.toggle_search_option(options, window, cx);
+                }))
+            }
+        })
+        .style(ButtonStyle::Subtle)
+        .shape(IconButtonShape::Square)
+        .toggle_state(active.contains(self.as_options()))
+        .tooltip({
+            move |window, cx| Tooltip::for_action_in(label, action, &focus_handle, window, cx)
+        })
     }
 }
 
diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs
index 094ce3638e..8cc838a8a6 100644
--- a/crates/search/src/search_bar.rs
+++ b/crates/search/src/search_bar.rs
@@ -5,10 +5,15 @@ use theme::ThemeSettings;
 use ui::{IconButton, IconButtonShape};
 use ui::{Tooltip, prelude::*};
 
+pub(super) enum ActionButtonState {
+    Disabled,
+    Toggled,
+}
+
 pub(super) fn render_action_button(
     id_prefix: &'static str,
     icon: ui::IconName,
-    active: bool,
+    button_state: Option<ActionButtonState>,
     tooltip: &'static str,
     action: &'static dyn Action,
     focus_handle: FocusHandle,
@@ -28,7 +33,10 @@ pub(super) fn render_action_button(
         }
     })
     .tooltip(move |window, cx| Tooltip::for_action_in(tooltip, action, &focus_handle, window, cx))
-    .disabled(!active)
+    .when_some(button_state, |this, state| match state {
+        ActionButtonState::Toggled => this.toggle_state(true),
+        ActionButtonState::Disabled => this.disabled(true),
+    })
 }
 
 pub(crate) fn input_base_styles(border_color: Hsla, map: impl FnOnce(Div) -> Div) -> Div {

From 7199c733b252f62f84135e0b9102fab22d5480e5 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 16:21:45 -0400
Subject: [PATCH 070/823] proto: Remove `AcceptTermsOfService` message (#36272)

This PR removes the `AcceptTermsOfService` RPC message.

We're no longer using the message after
https://github.com/zed-industries/zed/pull/36255.

Release Notes:

- N/A
---
 crates/collab/src/rpc.rs     | 21 ---------------------
 crates/proto/proto/app.proto |  6 ------
 crates/proto/proto/zed.proto |  3 +--
 crates/proto/src/proto.rs    |  3 ---
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 957cc30fe6..ef749ac9b7 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -29,7 +29,6 @@ use axum::{
     response::IntoResponse,
     routing::get,
 };
-use chrono::Utc;
 use collections::{HashMap, HashSet};
 pub use connection_pool::{ConnectionPool, ZedVersion};
 use core::fmt::{self, Debug, Formatter};
@@ -449,7 +448,6 @@ impl Server {
             .add_request_handler(follow)
             .add_message_handler(unfollow)
             .add_message_handler(update_followers)
-            .add_request_handler(accept_terms_of_service)
             .add_message_handler(acknowledge_channel_message)
             .add_message_handler(acknowledge_buffer_version)
             .add_request_handler(get_supermaven_api_key)
@@ -3985,25 +3983,6 @@ async fn mark_notification_as_read(
     Ok(())
 }
 
-/// Accept the terms of service (tos) on behalf of the current user
-async fn accept_terms_of_service(
-    _request: proto::AcceptTermsOfService,
-    response: Response<proto::AcceptTermsOfService>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-
-    let accepted_tos_at = Utc::now();
-    db.set_user_accepted_tos_at(session.user_id(), Some(accepted_tos_at.naive_utc()))
-        .await?;
-
-    response.send(proto::AcceptTermsOfServiceResponse {
-        accepted_tos_at: accepted_tos_at.timestamp() as u64,
-    })?;
-
-    Ok(())
-}
-
 fn to_axum_message(message: TungsteniteMessage) -> anyhow::Result<AxumMessage> {
     let message = match message {
         TungsteniteMessage::Text(payload) => AxumMessage::Text(payload.as_str().to_string()),
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index 9611b607d0..1f2ab1f539 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -6,12 +6,6 @@ message UpdateInviteInfo {
     uint32 count = 2;
 }
 
-message AcceptTermsOfService {}
-
-message AcceptTermsOfServiceResponse {
-    uint64 accepted_tos_at = 1;
-}
-
 message ShutdownRemoteServer {}
 
 message Toast {
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 4b023a46bc..310fcf584e 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -136,8 +136,6 @@ message Envelope {
         UpdateFollowers update_followers = 100;
         Unfollow unfollow = 101;
         UpdateDiffBases update_diff_bases = 104;
-        AcceptTermsOfService accept_terms_of_service = 239;
-        AcceptTermsOfServiceResponse accept_terms_of_service_response = 240;
 
         OnTypeFormatting on_type_formatting = 105;
         OnTypeFormattingResponse on_type_formatting_response = 106;
@@ -414,6 +412,7 @@ message Envelope {
     reserved 224 to 229;
     reserved 230 to 231;
     reserved 234 to 236;
+    reserved 239 to 240;
     reserved 246;
     reserved 247 to 254;
     reserved 255 to 256;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 18abf31c64..802db09590 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -20,8 +20,6 @@ pub const SSH_PEER_ID: PeerId = PeerId { owner_id: 0, id: 0 };
 pub const SSH_PROJECT_ID: u64 = 0;
 
 messages!(
-    (AcceptTermsOfService, Foreground),
-    (AcceptTermsOfServiceResponse, Foreground),
     (Ack, Foreground),
     (AckBufferOperation, Background),
     (AckChannelMessage, Background),
@@ -315,7 +313,6 @@ messages!(
 );
 
 request_messages!(
-    (AcceptTermsOfService, AcceptTermsOfServiceResponse),
     (ApplyCodeAction, ApplyCodeActionResponse),
     (
         ApplyCompletionAdditionalEdits,

From 3e0a755486201a2fe6e77213af68494a784a4895 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 15 Aug 2025 22:27:44 +0200
Subject: [PATCH 071/823] Remove some redundant entity clones (#36274)

`cx.entity()` already returns an owned entity, so there is no need for
these clones.

Release Notes:

- N/A
---
 crates/agent_ui/src/context_picker.rs         |  2 +-
 crates/agent_ui/src/inline_assistant.rs       |  2 +-
 crates/agent_ui/src/profile_selector.rs       |  2 +-
 crates/collab_ui/src/chat_panel.rs            |  2 +-
 crates/collab_ui/src/collab_panel.rs          |  8 +-
 .../src/collab_panel/channel_modal.rs         |  2 +-
 crates/collab_ui/src/notification_panel.rs    |  4 +-
 crates/debugger_ui/src/session/running.rs     |  4 +-
 .../src/edit_prediction_button.rs             |  6 +-
 crates/editor/src/editor_tests.rs             | 13 +--
 crates/editor/src/element.rs                  |  2 +-
 crates/extensions_ui/src/extensions_ui.rs     |  2 +-
 crates/git_ui/src/git_panel.rs                |  2 +-
 crates/gpui/examples/input.rs                 |  4 +-
 crates/language_tools/src/lsp_log.rs          |  2 +-
 crates/language_tools/src/lsp_tool.rs         |  2 +-
 crates/language_tools/src/syntax_tree_view.rs |  2 +-
 crates/outline_panel/src/outline_panel.rs     | 80 +++++++++----------
 crates/project_panel/src/project_panel.rs     | 42 +++++-----
 crates/recent_projects/src/remote_servers.rs  |  4 +-
 crates/repl/src/session.rs                    |  2 +-
 crates/storybook/src/stories/indent_guides.rs |  2 +-
 crates/terminal_view/src/terminal_panel.rs    |  4 +-
 crates/terminal_view/src/terminal_view.rs     |  2 +-
 crates/vim/src/mode_indicator.rs              |  4 +-
 crates/vim/src/normal/search.rs               |  2 +-
 crates/vim/src/vim.rs                         |  2 +-
 crates/workspace/src/dock.rs                  |  2 +-
 crates/workspace/src/notifications.rs         |  2 +-
 crates/workspace/src/pane.rs                  | 16 ++--
 crates/workspace/src/workspace.rs             |  2 +-
 crates/zed/src/zed.rs                         |  2 +-
 32 files changed, 106 insertions(+), 123 deletions(-)

diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 6c5546c6bb..131023d249 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -228,7 +228,7 @@ impl ContextPicker {
     }
 
     fn build_menu(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Entity<ContextMenu> {
-        let context_picker = cx.entity().clone();
+        let context_picker = cx.entity();
 
         let menu = ContextMenu::build(window, cx, move |menu, _window, cx| {
             let recent = self.recent_entries(cx);
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 4a4a747899..bbd3595805 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -72,7 +72,7 @@ pub fn init(
         let Some(window) = window else {
             return;
         };
-        let workspace = cx.entity().clone();
+        let workspace = cx.entity();
         InlineAssistant::update_global(cx, |inline_assistant, cx| {
             inline_assistant.register_workspace(&workspace, window, cx)
         });
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index 27ca69590f..ce25f531e2 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -163,7 +163,7 @@ impl Render for ProfileSelector {
             .unwrap_or_else(|| "Unknown".into());
 
         if self.provider.profiles_supported(cx) {
-            let this = cx.entity().clone();
+            let this = cx.entity();
             let focus_handle = self.focus_handle.clone();
             let trigger_button = Button::new("profile-selector-model", selected_profile)
                 .label_size(LabelSize::Small)
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 51d9f003f8..2bbaa8446c 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -674,7 +674,7 @@ impl ChatPanel {
                 })
             })
             .when_some(message_id, |el, message_id| {
-                let this = cx.entity().clone();
+                let this = cx.entity();
 
                 el.child(
                     self.render_popover_button(
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 430b447580..c2cc6a7ad5 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -95,7 +95,7 @@ pub fn init(cx: &mut App) {
                 .and_then(|room| room.read(cx).channel_id());
 
             if let Some(channel_id) = channel_id {
-                let workspace = cx.entity().clone();
+                let workspace = cx.entity();
                 window.defer(cx, move |window, cx| {
                     ChannelView::open(channel_id, None, workspace, window, cx)
                         .detach_and_log_err(cx)
@@ -1142,7 +1142,7 @@ impl CollabPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let this = cx.entity().clone();
+        let this = cx.entity();
         if !(role == proto::ChannelRole::Guest
             || role == proto::ChannelRole::Talker
             || role == proto::ChannelRole::Member)
@@ -1272,7 +1272,7 @@ impl CollabPanel {
                 .channel_for_id(clipboard.channel_id)
                 .map(|channel| channel.name.clone())
         });
-        let this = cx.entity().clone();
+        let this = cx.entity();
 
         let context_menu = ContextMenu::build(window, cx, |mut context_menu, window, cx| {
             if self.has_subchannels(ix) {
@@ -1439,7 +1439,7 @@ impl CollabPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let this = cx.entity().clone();
+        let this = cx.entity();
         let in_room = ActiveCall::global(cx).read(cx).room().is_some();
 
         let context_menu = ContextMenu::build(window, cx, |mut context_menu, _, _| {
diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
index c0d3130ee9..e558835dba 100644
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -586,7 +586,7 @@ impl ChannelModalDelegate {
             return;
         };
         let user_id = membership.user.id;
-        let picker = cx.entity().clone();
+        let picker = cx.entity();
         let context_menu = ContextMenu::build(window, cx, |mut menu, _window, _cx| {
             let role = membership.role;
 
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index 3a280ff667..a3420d603b 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -321,7 +321,7 @@ impl NotificationPanel {
                                             .justify_end()
                                             .child(Button::new("decline", "Decline").on_click({
                                                 let notification = notification.clone();
-                                                let entity = cx.entity().clone();
+                                                let entity = cx.entity();
                                                 move |_, _, cx| {
                                                     entity.update(cx, |this, cx| {
                                                         this.respond_to_notification(
@@ -334,7 +334,7 @@ impl NotificationPanel {
                                             }))
                                             .child(Button::new("accept", "Accept").on_click({
                                                 let notification = notification.clone();
-                                                let entity = cx.entity().clone();
+                                                let entity = cx.entity();
                                                 move |_, _, cx| {
                                                     entity.update(cx, |this, cx| {
                                                         this.respond_to_notification(
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index c8bee42039..f3117aee07 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -291,7 +291,7 @@ pub(crate) fn new_debugger_pane(
             let Some(project) = project.upgrade() else {
                 return ControlFlow::Break(());
             };
-            let this_pane = cx.entity().clone();
+            let this_pane = cx.entity();
             let item = if tab.pane == this_pane {
                 pane.item_for_index(tab.ix)
             } else {
@@ -502,7 +502,7 @@ pub(crate) fn new_debugger_pane(
                                     .on_drag(
                                         DraggedTab {
                                             item: item.boxed_clone(),
-                                            pane: cx.entity().clone(),
+                                            pane: cx.entity(),
                                             detail: 0,
                                             is_active: selected,
                                             ix,
diff --git a/crates/edit_prediction_button/src/edit_prediction_button.rs b/crates/edit_prediction_button/src/edit_prediction_button.rs
index 3d3b43d71b..4632a03daf 100644
--- a/crates/edit_prediction_button/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_button/src/edit_prediction_button.rs
@@ -127,7 +127,7 @@ impl Render for EditPredictionButton {
                             }),
                     );
                 }
-                let this = cx.entity().clone();
+                let this = cx.entity();
 
                 div().child(
                     PopoverMenu::new("copilot")
@@ -182,7 +182,7 @@ impl Render for EditPredictionButton {
                 let icon = status.to_icon();
                 let tooltip_text = status.to_tooltip();
                 let has_menu = status.has_menu();
-                let this = cx.entity().clone();
+                let this = cx.entity();
                 let fs = self.fs.clone();
 
                 return div().child(
@@ -331,7 +331,7 @@ impl Render for EditPredictionButton {
                         })
                     });
 
-                let this = cx.entity().clone();
+                let this = cx.entity();
 
                 let mut popover_menu = PopoverMenu::new("zeta")
                     .menu(move |window, cx| {
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index cf9954bc12..ef2bdc5da3 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -74,7 +74,7 @@ fn test_edit_events(cx: &mut TestAppContext) {
     let editor1 = cx.add_window({
         let events = events.clone();
         |window, cx| {
-            let entity = cx.entity().clone();
+            let entity = cx.entity();
             cx.subscribe_in(
                 &entity,
                 window,
@@ -95,7 +95,7 @@ fn test_edit_events(cx: &mut TestAppContext) {
         let events = events.clone();
         |window, cx| {
             cx.subscribe_in(
-                &cx.entity().clone(),
+                &cx.entity(),
                 window,
                 move |_, _, event: &EditorEvent, _, _| match event {
                     EditorEvent::Edited { .. } => events.borrow_mut().push(("editor2", "edited")),
@@ -19634,13 +19634,8 @@ fn test_crease_insertion_and_rendering(cx: &mut TestAppContext) {
 
             editor.insert_creases(Some(crease), cx);
             let snapshot = editor.snapshot(window, cx);
-            let _div = snapshot.render_crease_toggle(
-                MultiBufferRow(1),
-                false,
-                cx.entity().clone(),
-                window,
-                cx,
-            );
+            let _div =
+                snapshot.render_crease_toggle(MultiBufferRow(1), false, cx.entity(), window, cx);
             snapshot
         })
         .unwrap();
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 8a5c65f994..5edfd7df30 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -7815,7 +7815,7 @@ impl Element for EditorElement {
                         min_lines,
                         max_lines,
                     } => {
-                        let editor_handle = cx.entity().clone();
+                        let editor_handle = cx.entity();
                         let max_line_number_width =
                             self.max_line_number_width(&editor.snapshot(window, cx), window);
                         window.request_measured_layout(
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index fe3e94f5c2..4915933920 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -703,7 +703,7 @@ impl ExtensionsPage {
         extension: &ExtensionMetadata,
         cx: &mut Context<Self>,
     ) -> ExtensionCard {
-        let this = cx.entity().clone();
+        let this = cx.entity();
         let status = Self::extension_status(&extension.id, cx);
         let has_dev_extension = Self::dev_extension_exists(&extension.id, cx);
 
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index de308b9dde..70987dd212 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3410,7 +3410,7 @@ impl GitPanel {
             * MAX_PANEL_EDITOR_LINES
             + gap;
 
-        let git_panel = cx.entity().clone();
+        let git_panel = cx.entity();
         let display_name = SharedString::from(Arc::from(
             active_repository
                 .read(cx)
diff --git a/crates/gpui/examples/input.rs b/crates/gpui/examples/input.rs
index 52a5b08b96..b0f560e38d 100644
--- a/crates/gpui/examples/input.rs
+++ b/crates/gpui/examples/input.rs
@@ -595,9 +595,7 @@ impl Render for TextInput {
                     .w_full()
                     .p(px(4.))
                     .bg(white())
-                    .child(TextElement {
-                        input: cx.entity().clone(),
-                    }),
+                    .child(TextElement { input: cx.entity() }),
             )
     }
 }
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index 606f3a3f0e..823d59ce12 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -1358,7 +1358,7 @@ impl Render for LspLogToolbarItemView {
             })
             .collect();
 
-        let log_toolbar_view = cx.entity().clone();
+        let log_toolbar_view = cx.entity();
 
         let lsp_menu = PopoverMenu::new("LspLogView")
             .anchor(Corner::TopLeft)
diff --git a/crates/language_tools/src/lsp_tool.rs b/crates/language_tools/src/lsp_tool.rs
index 50547253a9..3244350a34 100644
--- a/crates/language_tools/src/lsp_tool.rs
+++ b/crates/language_tools/src/lsp_tool.rs
@@ -1007,7 +1007,7 @@ impl Render for LspTool {
             (None, "All Servers Operational")
         };
 
-        let lsp_tool = cx.entity().clone();
+        let lsp_tool = cx.entity();
 
         div().child(
             PopoverMenu::new("lsp-tool")
diff --git a/crates/language_tools/src/syntax_tree_view.rs b/crates/language_tools/src/syntax_tree_view.rs
index eadba2c1d2..9946442ec8 100644
--- a/crates/language_tools/src/syntax_tree_view.rs
+++ b/crates/language_tools/src/syntax_tree_view.rs
@@ -456,7 +456,7 @@ impl SyntaxTreeToolbarItemView {
         let active_layer = buffer_state.active_layer.clone()?;
         let active_buffer = buffer_state.buffer.read(cx).snapshot();
 
-        let view = cx.entity().clone();
+        let view = cx.entity();
         Some(
             PopoverMenu::new("Syntax Tree")
                 .trigger(Self::render_header(&active_layer))
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 1cda3897ec..004a27b0cf 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -4815,51 +4815,45 @@ impl OutlinePanel {
                 .when(show_indent_guides, |list| {
                     list.with_decoration(
                         ui::indent_guides(px(indent_size), IndentGuideColors::panel(cx))
-                            .with_compute_indents_fn(
-                                cx.entity().clone(),
-                                |outline_panel, range, _, _| {
-                                    let entries = outline_panel.cached_entries.get(range);
-                                    if let Some(entries) = entries {
-                                        entries.into_iter().map(|item| item.depth).collect()
-                                    } else {
-                                        smallvec::SmallVec::new()
-                                    }
-                                },
-                            )
-                            .with_render_fn(
-                                cx.entity().clone(),
-                                move |outline_panel, params, _, _| {
-                                    const LEFT_OFFSET: Pixels = px(14.);
+                            .with_compute_indents_fn(cx.entity(), |outline_panel, range, _, _| {
+                                let entries = outline_panel.cached_entries.get(range);
+                                if let Some(entries) = entries {
+                                    entries.into_iter().map(|item| item.depth).collect()
+                                } else {
+                                    smallvec::SmallVec::new()
+                                }
+                            })
+                            .with_render_fn(cx.entity(), move |outline_panel, params, _, _| {
+                                const LEFT_OFFSET: Pixels = px(14.);
 
-                                    let indent_size = params.indent_size;
-                                    let item_height = params.item_height;
-                                    let active_indent_guide_ix = find_active_indent_guide_ix(
-                                        outline_panel,
-                                        &params.indent_guides,
-                                    );
+                                let indent_size = params.indent_size;
+                                let item_height = params.item_height;
+                                let active_indent_guide_ix = find_active_indent_guide_ix(
+                                    outline_panel,
+                                    &params.indent_guides,
+                                );
 
-                                    params
-                                        .indent_guides
-                                        .into_iter()
-                                        .enumerate()
-                                        .map(|(ix, layout)| {
-                                            let bounds = Bounds::new(
-                                                point(
-                                                    layout.offset.x * indent_size + LEFT_OFFSET,
-                                                    layout.offset.y * item_height,
-                                                ),
-                                                size(px(1.), layout.length * item_height),
-                                            );
-                                            ui::RenderedIndentGuide {
-                                                bounds,
-                                                layout,
-                                                is_active: active_indent_guide_ix == Some(ix),
-                                                hitbox: None,
-                                            }
-                                        })
-                                        .collect()
-                                },
-                            ),
+                                params
+                                    .indent_guides
+                                    .into_iter()
+                                    .enumerate()
+                                    .map(|(ix, layout)| {
+                                        let bounds = Bounds::new(
+                                            point(
+                                                layout.offset.x * indent_size + LEFT_OFFSET,
+                                                layout.offset.y * item_height,
+                                            ),
+                                            size(px(1.), layout.length * item_height),
+                                        );
+                                        ui::RenderedIndentGuide {
+                                            bounds,
+                                            layout,
+                                            is_active: active_indent_guide_ix == Some(ix),
+                                            hitbox: None,
+                                        }
+                                    })
+                                    .collect()
+                            }),
                     )
                 })
             };
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 967df41e23..4d7f2faf62 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -5351,26 +5351,22 @@ impl Render for ProjectPanel {
                     .when(show_indent_guides, |list| {
                         list.with_decoration(
                             ui::indent_guides(px(indent_size), IndentGuideColors::panel(cx))
-                                .with_compute_indents_fn(
-                                    cx.entity().clone(),
-                                    |this, range, window, cx| {
-                                        let mut items =
-                                            SmallVec::with_capacity(range.end - range.start);
-                                        this.iter_visible_entries(
-                                            range,
-                                            window,
-                                            cx,
-                                            |entry, _, entries, _, _| {
-                                                let (depth, _) =
-                                                    Self::calculate_depth_and_difference(
-                                                        entry, entries,
-                                                    );
-                                                items.push(depth);
-                                            },
-                                        );
-                                        items
-                                    },
-                                )
+                                .with_compute_indents_fn(cx.entity(), |this, range, window, cx| {
+                                    let mut items =
+                                        SmallVec::with_capacity(range.end - range.start);
+                                    this.iter_visible_entries(
+                                        range,
+                                        window,
+                                        cx,
+                                        |entry, _, entries, _, _| {
+                                            let (depth, _) = Self::calculate_depth_and_difference(
+                                                entry, entries,
+                                            );
+                                            items.push(depth);
+                                        },
+                                    );
+                                    items
+                                })
                                 .on_click(cx.listener(
                                     |this, active_indent_guide: &IndentGuideLayout, window, cx| {
                                         if window.modifiers().secondary() {
@@ -5394,7 +5390,7 @@ impl Render for ProjectPanel {
                                         }
                                     },
                                 ))
-                                .with_render_fn(cx.entity().clone(), move |this, params, _, cx| {
+                                .with_render_fn(cx.entity(), move |this, params, _, cx| {
                                     const LEFT_OFFSET: Pixels = px(14.);
                                     const PADDING_Y: Pixels = px(4.);
                                     const HITBOX_OVERDRAW: Pixels = px(3.);
@@ -5447,7 +5443,7 @@ impl Render for ProjectPanel {
                     })
                     .when(show_sticky_entries, |list| {
                         let sticky_items = ui::sticky_items(
-                            cx.entity().clone(),
+                            cx.entity(),
                             |this, range, window, cx| {
                                 let mut items = SmallVec::with_capacity(range.end - range.start);
                                 this.iter_visible_entries(
@@ -5474,7 +5470,7 @@ impl Render for ProjectPanel {
                         list.with_decoration(if show_indent_guides {
                             sticky_items.with_decoration(
                                 ui::indent_guides(px(indent_size), IndentGuideColors::panel(cx))
-                                    .with_render_fn(cx.entity().clone(), move |_, params, _, _| {
+                                    .with_render_fn(cx.entity(), move |_, params, _, _| {
                                         const LEFT_OFFSET: Pixels = px(14.);
 
                                         let indent_size = params.indent_size;
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 354434a7fc..e5e166cb4c 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1292,7 +1292,7 @@ impl RemoteServerProjects {
                                     let connection_string = connection_string.clone();
                                     move |_, _: &menu::Confirm, window, cx| {
                                         remove_ssh_server(
-                                            cx.entity().clone(),
+                                            cx.entity(),
                                             server_index,
                                             connection_string.clone(),
                                             window,
@@ -1312,7 +1312,7 @@ impl RemoteServerProjects {
                                         .child(Label::new("Remove Server").color(Color::Error))
                                         .on_click(cx.listener(move |_, _, window, cx| {
                                             remove_ssh_server(
-                                                cx.entity().clone(),
+                                                cx.entity(),
                                                 server_index,
                                                 connection_string.clone(),
                                                 window,
diff --git a/crates/repl/src/session.rs b/crates/repl/src/session.rs
index 729a616135..f945e5ed9f 100644
--- a/crates/repl/src/session.rs
+++ b/crates/repl/src/session.rs
@@ -244,7 +244,7 @@ impl Session {
             repl_session_id = cx.entity_id().to_string(),
         );
 
-        let session_view = cx.entity().clone();
+        let session_view = cx.entity();
 
         let kernel = match self.kernel_specification.clone() {
             KernelSpecification::Jupyter(kernel_specification)
diff --git a/crates/storybook/src/stories/indent_guides.rs b/crates/storybook/src/stories/indent_guides.rs
index e4f9669b1f..db23ea79bd 100644
--- a/crates/storybook/src/stories/indent_guides.rs
+++ b/crates/storybook/src/stories/indent_guides.rs
@@ -65,7 +65,7 @@ impl Render for IndentGuidesStory {
                             },
                         )
                         .with_compute_indents_fn(
-                            cx.entity().clone(),
+                            cx.entity(),
                             |this, range, _cx, _context| {
                                 this.depths
                                     .iter()
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index c9528c39b9..568dc1db2e 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -947,7 +947,7 @@ pub fn new_terminal_pane(
     cx: &mut Context<TerminalPanel>,
 ) -> Entity<Pane> {
     let is_local = project.read(cx).is_local();
-    let terminal_panel = cx.entity().clone();
+    let terminal_panel = cx.entity();
     let pane = cx.new(|cx| {
         let mut pane = Pane::new(
             workspace.clone(),
@@ -1009,7 +1009,7 @@ pub fn new_terminal_pane(
                 return ControlFlow::Break(());
             };
             if let Some(tab) = dropped_item.downcast_ref::<DraggedTab>() {
-                let this_pane = cx.entity().clone();
+                let this_pane = cx.entity();
                 let item = if tab.pane == this_pane {
                     pane.item_for_index(tab.ix)
                 } else {
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 219238496c..534c0a8051 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1491,7 +1491,7 @@ impl TerminalView {
 impl Render for TerminalView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let terminal_handle = self.terminal.clone();
-        let terminal_view_handle = cx.entity().clone();
+        let terminal_view_handle = cx.entity();
 
         let focused = self.focus_handle.is_focused(window);
 
diff --git a/crates/vim/src/mode_indicator.rs b/crates/vim/src/mode_indicator.rs
index d54b270074..714b74f239 100644
--- a/crates/vim/src/mode_indicator.rs
+++ b/crates/vim/src/mode_indicator.rs
@@ -20,7 +20,7 @@ impl ModeIndicator {
         })
         .detach();
 
-        let handle = cx.entity().clone();
+        let handle = cx.entity();
         let window_handle = window.window_handle();
         cx.observe_new::<Vim>(move |_, window, cx| {
             let Some(window) = window else {
@@ -29,7 +29,7 @@ impl ModeIndicator {
             if window.window_handle() != window_handle {
                 return;
             }
-            let vim = cx.entity().clone();
+            let vim = cx.entity();
             handle.update(cx, |_, cx| {
                 cx.subscribe(&vim, |mode_indicator, vim, event, cx| match event {
                     VimEvent::Focused => {
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index e4e95ca48e..4054c552ae 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -332,7 +332,7 @@ impl Vim {
         Vim::take_forced_motion(cx);
         let prior_selections = self.editor_selections(window, cx);
         let cursor_word = self.editor_cursor_word(window, cx);
-        let vim = cx.entity().clone();
+        let vim = cx.entity();
 
         let searched = pane.update(cx, |pane, cx| {
             self.search.direction = direction;
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 51bf2dd131..44d9b8f456 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -402,7 +402,7 @@ impl Vim {
     const NAMESPACE: &'static str = "vim";
 
     pub fn new(window: &mut Window, cx: &mut Context<Editor>) -> Entity<Self> {
-        let editor = cx.entity().clone();
+        let editor = cx.entity();
 
         let mut initial_mode = VimSettings::get_global(cx).default_mode;
         if initial_mode == Mode::Normal && HelixModeSetting::get_global(cx).0 {
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index ca63d3e553..ae72df3971 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -253,7 +253,7 @@ impl Dock {
         cx: &mut Context<Workspace>,
     ) -> Entity<Self> {
         let focus_handle = cx.focus_handle();
-        let workspace = cx.entity().clone();
+        let workspace = cx.entity();
         let dock = cx.new(|cx| {
             let focus_subscription =
                 cx.on_focus(&focus_handle, window, |dock: &mut Dock, window, cx| {
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 7d8a28b0f1..1356322a5c 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -346,7 +346,7 @@ impl Render for LanguageServerPrompt {
                     )
                     .child(Label::new(request.message.to_string()).size(LabelSize::Small))
                     .children(request.actions.iter().enumerate().map(|(ix, action)| {
-                        let this_handle = cx.entity().clone();
+                        let this_handle = cx.entity();
                         Button::new(ix, action.title.clone())
                             .size(ButtonSize::Large)
                             .on_click(move |_, window, cx| {
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 759e91f758..860a57c21f 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2198,7 +2198,7 @@ impl Pane {
 
     fn update_status_bar(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let workspace = self.workspace.clone();
-        let pane = cx.entity().clone();
+        let pane = cx.entity();
 
         window.defer(cx, move |window, cx| {
             let Ok(status_bar) =
@@ -2279,7 +2279,7 @@ impl Pane {
         cx: &mut Context<Self>,
     ) {
         maybe!({
-            let pane = cx.entity().clone();
+            let pane = cx.entity();
 
             let destination_index = match operation {
                 PinOperation::Pin => self.pinned_tab_count.min(ix),
@@ -2473,7 +2473,7 @@ impl Pane {
             .on_drag(
                 DraggedTab {
                     item: item.boxed_clone(),
-                    pane: cx.entity().clone(),
+                    pane: cx.entity(),
                     detail,
                     is_active,
                     ix,
@@ -2832,7 +2832,7 @@ impl Pane {
         let navigate_backward = IconButton::new("navigate_backward", IconName::ArrowLeft)
             .icon_size(IconSize::Small)
             .on_click({
-                let entity = cx.entity().clone();
+                let entity = cx.entity();
                 move |_, window, cx| {
                     entity.update(cx, |pane, cx| pane.navigate_backward(window, cx))
                 }
@@ -2848,7 +2848,7 @@ impl Pane {
         let navigate_forward = IconButton::new("navigate_forward", IconName::ArrowRight)
             .icon_size(IconSize::Small)
             .on_click({
-                let entity = cx.entity().clone();
+                let entity = cx.entity();
                 move |_, window, cx| entity.update(cx, |pane, cx| pane.navigate_forward(window, cx))
             })
             .disabled(!self.can_navigate_forward())
@@ -3054,7 +3054,7 @@ impl Pane {
                 return;
             }
         }
-        let mut to_pane = cx.entity().clone();
+        let mut to_pane = cx.entity();
         let split_direction = self.drag_split_direction;
         let item_id = dragged_tab.item.item_id();
         if let Some(preview_item_id) = self.preview_item_id {
@@ -3163,7 +3163,7 @@ impl Pane {
                 return;
             }
         }
-        let mut to_pane = cx.entity().clone();
+        let mut to_pane = cx.entity();
         let split_direction = self.drag_split_direction;
         let project_entry_id = *project_entry_id;
         self.workspace
@@ -3239,7 +3239,7 @@ impl Pane {
                 return;
             }
         }
-        let mut to_pane = cx.entity().clone();
+        let mut to_pane = cx.entity();
         let mut split_direction = self.drag_split_direction;
         let paths = paths.paths().to_vec();
         let is_remote = self
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ade6838fad..1eaa125ba5 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6338,7 +6338,7 @@ impl Render for Workspace {
                                 .border_b_1()
                                 .border_color(colors.border)
                                 .child({
-                                    let this = cx.entity().clone();
+                                    let this = cx.entity();
                                     canvas(
                                         move |bounds, window, cx| {
                                             this.update(cx, |this, cx| {
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 84145a1be4..b06652b2ce 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -319,7 +319,7 @@ pub fn initialize_workspace(
             return;
         };
 
-        let workspace_handle = cx.entity().clone();
+        let workspace_handle = cx.entity();
         let center_pane = workspace.active_pane().clone();
         initialize_pane(workspace, &center_pane, window, cx);
 

From 239e479aedebb45cbc2efd7d0417808a3001710c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 16:49:56 -0400
Subject: [PATCH 072/823] collab: Remove Stripe code (#36275)

This PR removes the code for integrating with Stripe from Collab.

All of these concerns are now handled by Cloud.

Release Notes:

- N/A
---
 Cargo.lock                                    | 159 +----
 Cargo.toml                                    |  14 -
 crates/collab/Cargo.toml                      |   5 -
 crates/collab/k8s/collab.template.yml         |   6 -
 crates/collab/src/api.rs                      |   1 -
 crates/collab/src/api/billing.rs              |  59 --
 .../src/db/tables/billing_subscription.rs     |  15 -
 crates/collab/src/lib.rs                      |  44 --
 crates/collab/src/main.rs                     |   7 -
 crates/collab/src/stripe_billing.rs           | 156 -----
 crates/collab/src/stripe_client.rs            | 285 --------
 .../src/stripe_client/fake_stripe_client.rs   | 247 -------
 .../src/stripe_client/real_stripe_client.rs   | 612 ------------------
 crates/collab/src/tests.rs                    |   2 -
 .../collab/src/tests/stripe_billing_tests.rs  | 123 ----
 crates/collab/src/tests/test_server.rs        |   5 -
 16 files changed, 2 insertions(+), 1738 deletions(-)
 delete mode 100644 crates/collab/src/api/billing.rs
 delete mode 100644 crates/collab/src/stripe_billing.rs
 delete mode 100644 crates/collab/src/stripe_client.rs
 delete mode 100644 crates/collab/src/stripe_client/fake_stripe_client.rs
 delete mode 100644 crates/collab/src/stripe_client/real_stripe_client.rs
 delete mode 100644 crates/collab/src/tests/stripe_billing_tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index bfc797d6cd..2be16cc22f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1262,26 +1262,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "async-stripe"
-version = "0.40.0"
-source = "git+https://github.com/zed-industries/async-stripe?rev=3672dd4efb7181aa597bf580bf5a2f5d23db6735#3672dd4efb7181aa597bf580bf5a2f5d23db6735"
-dependencies = [
- "chrono",
- "futures-util",
- "http-types",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_qs 0.10.1",
- "smart-default 0.6.0",
- "smol_str 0.1.24",
- "thiserror 1.0.69",
- "tokio",
-]
-
 [[package]]
 name = "async-tar"
 version = "0.5.0"
@@ -2083,12 +2063,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -3281,7 +3255,6 @@ dependencies = [
  "anyhow",
  "assistant_context",
  "assistant_slash_command",
- "async-stripe",
  "async-trait",
  "async-tungstenite",
  "audio",
@@ -3308,7 +3281,6 @@ dependencies = [
  "dap_adapters",
  "dashmap 6.1.0",
  "debugger_ui",
- "derive_more 0.99.19",
  "editor",
  "envy",
  "extension",
@@ -3870,7 +3842,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "rustybuzz 0.14.1",
  "self_cell",
- "smol_str 0.2.2",
+ "smol_str",
  "swash",
  "sys-locale",
  "ttf-parser 0.21.1",
@@ -6374,17 +6346,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -7988,27 +7949,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
-[[package]]
-name = "http-types"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
-dependencies = [
- "anyhow",
- "async-channel 1.9.0",
- "base64 0.13.1",
- "futures-lite 1.13.0",
- "http 0.2.12",
- "infer",
- "pin-project-lite",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "serde_qs 0.8.5",
- "serde_urlencoded",
- "url",
-]
-
 [[package]]
 name = "http_client"
 version = "0.1.0"
@@ -8487,12 +8427,6 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
-[[package]]
-name = "infer"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
-
 [[package]]
 name = "inherent"
 version = "1.0.12"
@@ -10269,7 +10203,7 @@ dependencies = [
  "num-traits",
  "range-map",
  "scroll",
- "smart-default 0.7.1",
+ "smart-default",
 ]
 
 [[package]]
@@ -13143,19 +13077,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -13177,16 +13098,6 @@ dependencies = [
  "rand_core 0.9.3",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -13207,15 +13118,6 @@ dependencies = [
  "rand_core 0.9.3",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -13234,15 +13136,6 @@ dependencies = [
  "getrandom 0.3.2",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "range-map"
 version = "0.2.0"
@@ -14897,28 +14790,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_qs"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "serde_qs"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "serde_repr"
 version = "0.1.20"
@@ -15295,17 +15166,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "smart-default"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "smart-default"
 version = "0.7.1"
@@ -15334,15 +15194,6 @@ dependencies = [
  "futures-lite 2.6.0",
 ]
 
-[[package]]
-name = "smol_str"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "smol_str"
 version = "0.2.2"
@@ -18191,12 +18042,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/Cargo.toml b/Cargo.toml
index baa4ee7f4e..644b6c0f40 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -667,20 +667,6 @@ workspace-hack = "0.1.0"
 yawc = { git = "https://github.com/deviant-forks/yawc", rev = "1899688f3e69ace4545aceb97b2a13881cf26142" }
 zstd = "0.11"
 
-[workspace.dependencies.async-stripe]
-git = "https://github.com/zed-industries/async-stripe"
-rev = "3672dd4efb7181aa597bf580bf5a2f5d23db6735"
-default-features = false
-features = [
-    "runtime-tokio-hyper-rustls",
-    "billing",
-    "checkout",
-    "events",
-    # The features below are only enabled to get the `events` feature to build.
-    "chrono",
-    "connect",
-]
-
 [workspace.dependencies.windows]
 version = "0.61"
 features = [
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 9a867f9e05..6fc591be13 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -19,7 +19,6 @@ test-support = ["sqlite"]
 
 [dependencies]
 anyhow.workspace = true
-async-stripe.workspace = true
 async-trait.workspace = true
 async-tungstenite.workspace = true
 aws-config = { version = "1.1.5" }
@@ -33,7 +32,6 @@ clock.workspace = true
 cloud_llm_client.workspace = true
 collections.workspace = true
 dashmap.workspace = true
-derive_more.workspace = true
 envy = "0.4.2"
 futures.workspace = true
 gpui.workspace = true
@@ -134,6 +132,3 @@ util.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 worktree = { workspace = true, features = ["test-support"] }
 zlog.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["async-stripe"]
diff --git a/crates/collab/k8s/collab.template.yml b/crates/collab/k8s/collab.template.yml
index 45fc018a4a..214b550ac2 100644
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -219,12 +219,6 @@ spec:
                 secretKeyRef:
                   name: slack
                   key: panics_webhook
-            - name: STRIPE_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: stripe
-                  key: api_key
-                  optional: true
             - name: COMPLETE_WITH_LANGUAGE_MODEL_RATE_LIMIT_PER_HOUR
               value: "1000"
             - name: SUPERMAVEN_ADMIN_API_KEY
diff --git a/crates/collab/src/api.rs b/crates/collab/src/api.rs
index 078a4469ae..143e764eb3 100644
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@@ -1,4 +1,3 @@
-pub mod billing;
 pub mod contributors;
 pub mod events;
 pub mod extensions;
diff --git a/crates/collab/src/api/billing.rs b/crates/collab/src/api/billing.rs
deleted file mode 100644
index a0325d14c4..0000000000
--- a/crates/collab/src/api/billing.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::sync::Arc;
-use stripe::SubscriptionStatus;
-
-use crate::AppState;
-use crate::db::billing_subscription::StripeSubscriptionStatus;
-use crate::db::{CreateBillingCustomerParams, billing_customer};
-use crate::stripe_client::{StripeClient, StripeCustomerId};
-
-impl From<SubscriptionStatus> for StripeSubscriptionStatus {
-    fn from(value: SubscriptionStatus) -> Self {
-        match value {
-            SubscriptionStatus::Incomplete => Self::Incomplete,
-            SubscriptionStatus::IncompleteExpired => Self::IncompleteExpired,
-            SubscriptionStatus::Trialing => Self::Trialing,
-            SubscriptionStatus::Active => Self::Active,
-            SubscriptionStatus::PastDue => Self::PastDue,
-            SubscriptionStatus::Canceled => Self::Canceled,
-            SubscriptionStatus::Unpaid => Self::Unpaid,
-            SubscriptionStatus::Paused => Self::Paused,
-        }
-    }
-}
-
-/// Finds or creates a billing customer using the provided customer.
-pub async fn find_or_create_billing_customer(
-    app: &Arc<AppState>,
-    stripe_client: &dyn StripeClient,
-    customer_id: &StripeCustomerId,
-) -> anyhow::Result<Option<billing_customer::Model>> {
-    // If we already have a billing customer record associated with the Stripe customer,
-    // there's nothing more we need to do.
-    if let Some(billing_customer) = app
-        .db
-        .get_billing_customer_by_stripe_customer_id(customer_id.0.as_ref())
-        .await?
-    {
-        return Ok(Some(billing_customer));
-    }
-
-    let customer = stripe_client.get_customer(customer_id).await?;
-
-    let Some(email) = customer.email else {
-        return Ok(None);
-    };
-
-    let Some(user) = app.db.get_user_by_email(&email).await? else {
-        return Ok(None);
-    };
-
-    let billing_customer = app
-        .db
-        .create_billing_customer(&CreateBillingCustomerParams {
-            user_id: user.id,
-            stripe_customer_id: customer.id.to_string(),
-        })
-        .await?;
-
-    Ok(Some(billing_customer))
-}
diff --git a/crates/collab/src/db/tables/billing_subscription.rs b/crates/collab/src/db/tables/billing_subscription.rs
index 522973dbc9..f5684aeec3 100644
--- a/crates/collab/src/db/tables/billing_subscription.rs
+++ b/crates/collab/src/db/tables/billing_subscription.rs
@@ -1,5 +1,4 @@
 use crate::db::{BillingCustomerId, BillingSubscriptionId};
-use crate::stripe_client;
 use chrono::{Datelike as _, NaiveDate, Utc};
 use sea_orm::entity::prelude::*;
 use serde::Serialize;
@@ -160,17 +159,3 @@ pub enum StripeCancellationReason {
     #[sea_orm(string_value = "payment_failed")]
     PaymentFailed,
 }
-
-impl From<stripe_client::StripeCancellationDetailsReason> for StripeCancellationReason {
-    fn from(value: stripe_client::StripeCancellationDetailsReason) -> Self {
-        match value {
-            stripe_client::StripeCancellationDetailsReason::CancellationRequested => {
-                Self::CancellationRequested
-            }
-            stripe_client::StripeCancellationDetailsReason::PaymentDisputed => {
-                Self::PaymentDisputed
-            }
-            stripe_client::StripeCancellationDetailsReason::PaymentFailed => Self::PaymentFailed,
-        }
-    }
-}
diff --git a/crates/collab/src/lib.rs b/crates/collab/src/lib.rs
index 905859ca69..a68286a5a3 100644
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -7,8 +7,6 @@ pub mod llm;
 pub mod migrations;
 pub mod rpc;
 pub mod seed;
-pub mod stripe_billing;
-pub mod stripe_client;
 pub mod user_backfiller;
 
 #[cfg(test)]
@@ -27,16 +25,12 @@ use serde::Deserialize;
 use std::{path::PathBuf, sync::Arc};
 use util::ResultExt;
 
-use crate::stripe_billing::StripeBilling;
-use crate::stripe_client::{RealStripeClient, StripeClient};
-
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 pub enum Error {
     Http(StatusCode, String, HeaderMap),
     Database(sea_orm::error::DbErr),
     Internal(anyhow::Error),
-    Stripe(stripe::StripeError),
 }
 
 impl From<anyhow::Error> for Error {
@@ -51,12 +45,6 @@ impl From<sea_orm::error::DbErr> for Error {
     }
 }
 
-impl From<stripe::StripeError> for Error {
-    fn from(error: stripe::StripeError) -> Self {
-        Self::Stripe(error)
-    }
-}
-
 impl From<axum::Error> for Error {
     fn from(error: axum::Error) -> Self {
         Self::Internal(error.into())
@@ -104,14 +92,6 @@ impl IntoResponse for Error {
                 );
                 (StatusCode::INTERNAL_SERVER_ERROR, format!("{}", &error)).into_response()
             }
-            Error::Stripe(error) => {
-                log::error!(
-                    "HTTP error {}: {:?}",
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    &error
-                );
-                (StatusCode::INTERNAL_SERVER_ERROR, format!("{}", &error)).into_response()
-            }
         }
     }
 }
@@ -122,7 +102,6 @@ impl std::fmt::Debug for Error {
             Error::Http(code, message, _headers) => (code, message).fmt(f),
             Error::Database(error) => error.fmt(f),
             Error::Internal(error) => error.fmt(f),
-            Error::Stripe(error) => error.fmt(f),
         }
     }
 }
@@ -133,7 +112,6 @@ impl std::fmt::Display for Error {
             Error::Http(code, message, _) => write!(f, "{code}: {message}"),
             Error::Database(error) => error.fmt(f),
             Error::Internal(error) => error.fmt(f),
-            Error::Stripe(error) => error.fmt(f),
         }
     }
 }
@@ -179,7 +157,6 @@ pub struct Config {
     pub zed_client_checksum_seed: Option<String>,
     pub slack_panics_webhook: Option<String>,
     pub auto_join_channel_id: Option<ChannelId>,
-    pub stripe_api_key: Option<String>,
     pub supermaven_admin_api_key: Option<Arc<str>>,
     pub user_backfiller_github_access_token: Option<Arc<str>>,
 }
@@ -234,7 +211,6 @@ impl Config {
             auto_join_channel_id: None,
             migrations_path: None,
             seed_path: None,
-            stripe_api_key: None,
             supermaven_admin_api_key: None,
             user_backfiller_github_access_token: None,
             kinesis_region: None,
@@ -269,11 +245,6 @@ pub struct AppState {
     pub llm_db: Option<Arc<LlmDatabase>>,
     pub livekit_client: Option<Arc<dyn livekit_api::Client>>,
     pub blob_store_client: Option<aws_sdk_s3::Client>,
-    /// This is a real instance of the Stripe client; we're working to replace references to this with the
-    /// [`StripeClient`] trait.
-    pub real_stripe_client: Option<Arc<stripe::Client>>,
-    pub stripe_client: Option<Arc<dyn StripeClient>>,
-    pub stripe_billing: Option<Arc<StripeBilling>>,
     pub executor: Executor,
     pub kinesis_client: Option<::aws_sdk_kinesis::Client>,
     pub config: Config,
@@ -316,18 +287,11 @@ impl AppState {
         };
 
         let db = Arc::new(db);
-        let stripe_client = build_stripe_client(&config).map(Arc::new).log_err();
         let this = Self {
             db: db.clone(),
             llm_db,
             livekit_client,
             blob_store_client: build_blob_store_client(&config).await.log_err(),
-            stripe_billing: stripe_client
-                .clone()
-                .map(|stripe_client| Arc::new(StripeBilling::new(stripe_client))),
-            real_stripe_client: stripe_client.clone(),
-            stripe_client: stripe_client
-                .map(|stripe_client| Arc::new(RealStripeClient::new(stripe_client)) as _),
             executor,
             kinesis_client: if config.kinesis_access_key.is_some() {
                 build_kinesis_client(&config).await.log_err()
@@ -340,14 +304,6 @@ impl AppState {
     }
 }
 
-fn build_stripe_client(config: &Config) -> anyhow::Result<stripe::Client> {
-    let api_key = config
-        .stripe_api_key
-        .as_ref()
-        .context("missing stripe_api_key")?;
-    Ok(stripe::Client::new(api_key))
-}
-
 async fn build_blob_store_client(config: &Config) -> anyhow::Result<aws_sdk_s3::Client> {
     let keys = aws_sdk_s3::config::Credentials::new(
         config
diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index 20641cb232..177c97f076 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -102,13 +102,6 @@ async fn main() -> Result<()> {
 
                 let state = AppState::new(config, Executor::Production).await?;
 
-                if let Some(stripe_billing) = state.stripe_billing.clone() {
-                    let executor = state.executor.clone();
-                    executor.spawn_detached(async move {
-                        stripe_billing.initialize().await.trace_err();
-                    });
-                }
-
                 if mode.is_collab() {
                     state.db.purge_old_embeddings().await.trace_err();
 
diff --git a/crates/collab/src/stripe_billing.rs b/crates/collab/src/stripe_billing.rs
deleted file mode 100644
index ef5bef3e7e..0000000000
--- a/crates/collab/src/stripe_billing.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::anyhow;
-use collections::HashMap;
-use stripe::SubscriptionStatus;
-use tokio::sync::RwLock;
-
-use crate::Result;
-use crate::stripe_client::{
-    RealStripeClient, StripeAutomaticTax, StripeClient, StripeCreateSubscriptionItems,
-    StripeCreateSubscriptionParams, StripeCustomerId, StripePrice, StripePriceId,
-    StripeSubscription,
-};
-
-pub struct StripeBilling {
-    state: RwLock<StripeBillingState>,
-    client: Arc<dyn StripeClient>,
-}
-
-#[derive(Default)]
-struct StripeBillingState {
-    prices_by_lookup_key: HashMap<String, StripePrice>,
-}
-
-impl StripeBilling {
-    pub fn new(client: Arc<stripe::Client>) -> Self {
-        Self {
-            client: Arc::new(RealStripeClient::new(client.clone())),
-            state: RwLock::default(),
-        }
-    }
-
-    #[cfg(test)]
-    pub fn test(client: Arc<crate::stripe_client::FakeStripeClient>) -> Self {
-        Self {
-            client,
-            state: RwLock::default(),
-        }
-    }
-
-    pub fn client(&self) -> &Arc<dyn StripeClient> {
-        &self.client
-    }
-
-    pub async fn initialize(&self) -> Result<()> {
-        log::info!("StripeBilling: initializing");
-
-        let mut state = self.state.write().await;
-
-        let prices = self.client.list_prices().await?;
-
-        for price in prices {
-            if let Some(lookup_key) = price.lookup_key.clone() {
-                state.prices_by_lookup_key.insert(lookup_key, price);
-            }
-        }
-
-        log::info!("StripeBilling: initialized");
-
-        Ok(())
-    }
-
-    pub async fn zed_pro_price_id(&self) -> Result<StripePriceId> {
-        self.find_price_id_by_lookup_key("zed-pro").await
-    }
-
-    pub async fn zed_free_price_id(&self) -> Result<StripePriceId> {
-        self.find_price_id_by_lookup_key("zed-free").await
-    }
-
-    pub async fn find_price_id_by_lookup_key(&self, lookup_key: &str) -> Result<StripePriceId> {
-        self.state
-            .read()
-            .await
-            .prices_by_lookup_key
-            .get(lookup_key)
-            .map(|price| price.id.clone())
-            .ok_or_else(|| crate::Error::Internal(anyhow!("no price ID found for {lookup_key:?}")))
-    }
-
-    pub async fn find_price_by_lookup_key(&self, lookup_key: &str) -> Result<StripePrice> {
-        self.state
-            .read()
-            .await
-            .prices_by_lookup_key
-            .get(lookup_key)
-            .cloned()
-            .ok_or_else(|| crate::Error::Internal(anyhow!("no price found for {lookup_key:?}")))
-    }
-
-    /// Returns the Stripe customer associated with the provided email address, or creates a new customer, if one does
-    /// not already exist.
-    ///
-    /// Always returns a new Stripe customer if the email address is `None`.
-    pub async fn find_or_create_customer_by_email(
-        &self,
-        email_address: Option<&str>,
-    ) -> Result<StripeCustomerId> {
-        let existing_customer = if let Some(email) = email_address {
-            let customers = self.client.list_customers_by_email(email).await?;
-
-            customers.first().cloned()
-        } else {
-            None
-        };
-
-        let customer_id = if let Some(existing_customer) = existing_customer {
-            existing_customer.id
-        } else {
-            let customer = self
-                .client
-                .create_customer(crate::stripe_client::CreateCustomerParams {
-                    email: email_address,
-                })
-                .await?;
-
-            customer.id
-        };
-
-        Ok(customer_id)
-    }
-
-    pub async fn subscribe_to_zed_free(
-        &self,
-        customer_id: StripeCustomerId,
-    ) -> Result<StripeSubscription> {
-        let zed_free_price_id = self.zed_free_price_id().await?;
-
-        let existing_subscriptions = self
-            .client
-            .list_subscriptions_for_customer(&customer_id)
-            .await?;
-
-        let existing_active_subscription =
-            existing_subscriptions.into_iter().find(|subscription| {
-                subscription.status == SubscriptionStatus::Active
-                    || subscription.status == SubscriptionStatus::Trialing
-            });
-        if let Some(subscription) = existing_active_subscription {
-            return Ok(subscription);
-        }
-
-        let params = StripeCreateSubscriptionParams {
-            customer: customer_id,
-            items: vec![StripeCreateSubscriptionItems {
-                price: Some(zed_free_price_id),
-                quantity: Some(1),
-            }],
-            automatic_tax: Some(StripeAutomaticTax { enabled: true }),
-        };
-
-        let subscription = self.client.create_subscription(params).await?;
-
-        Ok(subscription)
-    }
-}
diff --git a/crates/collab/src/stripe_client.rs b/crates/collab/src/stripe_client.rs
deleted file mode 100644
index 6e75a4d874..0000000000
--- a/crates/collab/src/stripe_client.rs
+++ /dev/null
@@ -1,285 +0,0 @@
-#[cfg(test)]
-mod fake_stripe_client;
-mod real_stripe_client;
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use anyhow::Result;
-use async_trait::async_trait;
-
-#[cfg(test)]
-pub use fake_stripe_client::*;
-pub use real_stripe_client::*;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, derive_more::Display, Serialize)]
-pub struct StripeCustomerId(pub Arc<str>);
-
-#[derive(Debug, Clone)]
-pub struct StripeCustomer {
-    pub id: StripeCustomerId,
-    pub email: Option<String>,
-}
-
-#[derive(Debug)]
-pub struct CreateCustomerParams<'a> {
-    pub email: Option<&'a str>,
-}
-
-#[derive(Debug)]
-pub struct UpdateCustomerParams<'a> {
-    pub email: Option<&'a str>,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, derive_more::Display)]
-pub struct StripeSubscriptionId(pub Arc<str>);
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeSubscription {
-    pub id: StripeSubscriptionId,
-    pub customer: StripeCustomerId,
-    // TODO: Create our own version of this enum.
-    pub status: stripe::SubscriptionStatus,
-    pub current_period_end: i64,
-    pub current_period_start: i64,
-    pub items: Vec<StripeSubscriptionItem>,
-    pub cancel_at: Option<i64>,
-    pub cancellation_details: Option<StripeCancellationDetails>,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, derive_more::Display)]
-pub struct StripeSubscriptionItemId(pub Arc<str>);
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeSubscriptionItem {
-    pub id: StripeSubscriptionItemId,
-    pub price: Option<StripePrice>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct StripeCancellationDetails {
-    pub reason: Option<StripeCancellationDetailsReason>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeCancellationDetailsReason {
-    CancellationRequested,
-    PaymentDisputed,
-    PaymentFailed,
-}
-
-#[derive(Debug)]
-pub struct StripeCreateSubscriptionParams {
-    pub customer: StripeCustomerId,
-    pub items: Vec<StripeCreateSubscriptionItems>,
-    pub automatic_tax: Option<StripeAutomaticTax>,
-}
-
-#[derive(Debug)]
-pub struct StripeCreateSubscriptionItems {
-    pub price: Option<StripePriceId>,
-    pub quantity: Option<u64>,
-}
-
-#[derive(Debug, Clone)]
-pub struct UpdateSubscriptionParams {
-    pub items: Option<Vec<UpdateSubscriptionItems>>,
-    pub trial_settings: Option<StripeSubscriptionTrialSettings>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct UpdateSubscriptionItems {
-    pub price: Option<StripePriceId>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeSubscriptionTrialSettings {
-    pub end_behavior: StripeSubscriptionTrialSettingsEndBehavior,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeSubscriptionTrialSettingsEndBehavior {
-    pub missing_payment_method: StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod {
-    Cancel,
-    CreateInvoice,
-    Pause,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, derive_more::Display)]
-pub struct StripePriceId(pub Arc<str>);
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripePrice {
-    pub id: StripePriceId,
-    pub unit_amount: Option<i64>,
-    pub lookup_key: Option<String>,
-    pub recurring: Option<StripePriceRecurring>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripePriceRecurring {
-    pub meter: Option<String>,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, derive_more::Display, Deserialize)]
-pub struct StripeMeterId(pub Arc<str>);
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct StripeMeter {
-    pub id: StripeMeterId,
-    pub event_name: String,
-}
-
-#[derive(Debug, Serialize)]
-pub struct StripeCreateMeterEventParams<'a> {
-    pub identifier: &'a str,
-    pub event_name: &'a str,
-    pub payload: StripeCreateMeterEventPayload<'a>,
-    pub timestamp: Option<i64>,
-}
-
-#[derive(Debug, Serialize)]
-pub struct StripeCreateMeterEventPayload<'a> {
-    pub value: u64,
-    pub stripe_customer_id: &'a StripeCustomerId,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeBillingAddressCollection {
-    Auto,
-    Required,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeCustomerUpdate {
-    pub address: Option<StripeCustomerUpdateAddress>,
-    pub name: Option<StripeCustomerUpdateName>,
-    pub shipping: Option<StripeCustomerUpdateShipping>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeCustomerUpdateAddress {
-    Auto,
-    Never,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeCustomerUpdateName {
-    Auto,
-    Never,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeCustomerUpdateShipping {
-    Auto,
-    Never,
-}
-
-#[derive(Debug, Default)]
-pub struct StripeCreateCheckoutSessionParams<'a> {
-    pub customer: Option<&'a StripeCustomerId>,
-    pub client_reference_id: Option<&'a str>,
-    pub mode: Option<StripeCheckoutSessionMode>,
-    pub line_items: Option<Vec<StripeCreateCheckoutSessionLineItems>>,
-    pub payment_method_collection: Option<StripeCheckoutSessionPaymentMethodCollection>,
-    pub subscription_data: Option<StripeCreateCheckoutSessionSubscriptionData>,
-    pub success_url: Option<&'a str>,
-    pub billing_address_collection: Option<StripeBillingAddressCollection>,
-    pub customer_update: Option<StripeCustomerUpdate>,
-    pub tax_id_collection: Option<StripeTaxIdCollection>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeCheckoutSessionMode {
-    Payment,
-    Setup,
-    Subscription,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeCreateCheckoutSessionLineItems {
-    pub price: Option<String>,
-    pub quantity: Option<u64>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StripeCheckoutSessionPaymentMethodCollection {
-    Always,
-    IfRequired,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeCreateCheckoutSessionSubscriptionData {
-    pub metadata: Option<HashMap<String, String>>,
-    pub trial_period_days: Option<u32>,
-    pub trial_settings: Option<StripeSubscriptionTrialSettings>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeTaxIdCollection {
-    pub enabled: bool,
-}
-
-#[derive(Debug, Clone)]
-pub struct StripeAutomaticTax {
-    pub enabled: bool,
-}
-
-#[derive(Debug)]
-pub struct StripeCheckoutSession {
-    pub url: Option<String>,
-}
-
-#[async_trait]
-pub trait StripeClient: Send + Sync {
-    async fn list_customers_by_email(&self, email: &str) -> Result<Vec<StripeCustomer>>;
-
-    async fn get_customer(&self, customer_id: &StripeCustomerId) -> Result<StripeCustomer>;
-
-    async fn create_customer(&self, params: CreateCustomerParams<'_>) -> Result<StripeCustomer>;
-
-    async fn update_customer(
-        &self,
-        customer_id: &StripeCustomerId,
-        params: UpdateCustomerParams<'_>,
-    ) -> Result<StripeCustomer>;
-
-    async fn list_subscriptions_for_customer(
-        &self,
-        customer_id: &StripeCustomerId,
-    ) -> Result<Vec<StripeSubscription>>;
-
-    async fn get_subscription(
-        &self,
-        subscription_id: &StripeSubscriptionId,
-    ) -> Result<StripeSubscription>;
-
-    async fn create_subscription(
-        &self,
-        params: StripeCreateSubscriptionParams,
-    ) -> Result<StripeSubscription>;
-
-    async fn update_subscription(
-        &self,
-        subscription_id: &StripeSubscriptionId,
-        params: UpdateSubscriptionParams,
-    ) -> Result<()>;
-
-    async fn cancel_subscription(&self, subscription_id: &StripeSubscriptionId) -> Result<()>;
-
-    async fn list_prices(&self) -> Result<Vec<StripePrice>>;
-
-    async fn list_meters(&self) -> Result<Vec<StripeMeter>>;
-
-    async fn create_meter_event(&self, params: StripeCreateMeterEventParams<'_>) -> Result<()>;
-
-    async fn create_checkout_session(
-        &self,
-        params: StripeCreateCheckoutSessionParams<'_>,
-    ) -> Result<StripeCheckoutSession>;
-}
diff --git a/crates/collab/src/stripe_client/fake_stripe_client.rs b/crates/collab/src/stripe_client/fake_stripe_client.rs
deleted file mode 100644
index 9bb08443ec..0000000000
--- a/crates/collab/src/stripe_client/fake_stripe_client.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Result, anyhow};
-use async_trait::async_trait;
-use chrono::{Duration, Utc};
-use collections::HashMap;
-use parking_lot::Mutex;
-use uuid::Uuid;
-
-use crate::stripe_client::{
-    CreateCustomerParams, StripeBillingAddressCollection, StripeCheckoutSession,
-    StripeCheckoutSessionMode, StripeCheckoutSessionPaymentMethodCollection, StripeClient,
-    StripeCreateCheckoutSessionLineItems, StripeCreateCheckoutSessionParams,
-    StripeCreateCheckoutSessionSubscriptionData, StripeCreateMeterEventParams,
-    StripeCreateSubscriptionParams, StripeCustomer, StripeCustomerId, StripeCustomerUpdate,
-    StripeMeter, StripeMeterId, StripePrice, StripePriceId, StripeSubscription,
-    StripeSubscriptionId, StripeSubscriptionItem, StripeSubscriptionItemId, StripeTaxIdCollection,
-    UpdateCustomerParams, UpdateSubscriptionParams,
-};
-
-#[derive(Debug, Clone)]
-pub struct StripeCreateMeterEventCall {
-    pub identifier: Arc<str>,
-    pub event_name: Arc<str>,
-    pub value: u64,
-    pub stripe_customer_id: StripeCustomerId,
-    pub timestamp: Option<i64>,
-}
-
-#[derive(Debug, Clone)]
-pub struct StripeCreateCheckoutSessionCall {
-    pub customer: Option<StripeCustomerId>,
-    pub client_reference_id: Option<String>,
-    pub mode: Option<StripeCheckoutSessionMode>,
-    pub line_items: Option<Vec<StripeCreateCheckoutSessionLineItems>>,
-    pub payment_method_collection: Option<StripeCheckoutSessionPaymentMethodCollection>,
-    pub subscription_data: Option<StripeCreateCheckoutSessionSubscriptionData>,
-    pub success_url: Option<String>,
-    pub billing_address_collection: Option<StripeBillingAddressCollection>,
-    pub customer_update: Option<StripeCustomerUpdate>,
-    pub tax_id_collection: Option<StripeTaxIdCollection>,
-}
-
-pub struct FakeStripeClient {
-    pub customers: Arc<Mutex<HashMap<StripeCustomerId, StripeCustomer>>>,
-    pub subscriptions: Arc<Mutex<HashMap<StripeSubscriptionId, StripeSubscription>>>,
-    pub update_subscription_calls:
-        Arc<Mutex<Vec<(StripeSubscriptionId, UpdateSubscriptionParams)>>>,
-    pub prices: Arc<Mutex<HashMap<StripePriceId, StripePrice>>>,
-    pub meters: Arc<Mutex<HashMap<StripeMeterId, StripeMeter>>>,
-    pub create_meter_event_calls: Arc<Mutex<Vec<StripeCreateMeterEventCall>>>,
-    pub create_checkout_session_calls: Arc<Mutex<Vec<StripeCreateCheckoutSessionCall>>>,
-}
-
-impl FakeStripeClient {
-    pub fn new() -> Self {
-        Self {
-            customers: Arc::new(Mutex::new(HashMap::default())),
-            subscriptions: Arc::new(Mutex::new(HashMap::default())),
-            update_subscription_calls: Arc::new(Mutex::new(Vec::new())),
-            prices: Arc::new(Mutex::new(HashMap::default())),
-            meters: Arc::new(Mutex::new(HashMap::default())),
-            create_meter_event_calls: Arc::new(Mutex::new(Vec::new())),
-            create_checkout_session_calls: Arc::new(Mutex::new(Vec::new())),
-        }
-    }
-}
-
-#[async_trait]
-impl StripeClient for FakeStripeClient {
-    async fn list_customers_by_email(&self, email: &str) -> Result<Vec<StripeCustomer>> {
-        Ok(self
-            .customers
-            .lock()
-            .values()
-            .filter(|customer| customer.email.as_deref() == Some(email))
-            .cloned()
-            .collect())
-    }
-
-    async fn get_customer(&self, customer_id: &StripeCustomerId) -> Result<StripeCustomer> {
-        self.customers
-            .lock()
-            .get(customer_id)
-            .cloned()
-            .ok_or_else(|| anyhow!("no customer found for {customer_id:?}"))
-    }
-
-    async fn create_customer(&self, params: CreateCustomerParams<'_>) -> Result<StripeCustomer> {
-        let customer = StripeCustomer {
-            id: StripeCustomerId(format!("cus_{}", Uuid::new_v4()).into()),
-            email: params.email.map(|email| email.to_string()),
-        };
-
-        self.customers
-            .lock()
-            .insert(customer.id.clone(), customer.clone());
-
-        Ok(customer)
-    }
-
-    async fn update_customer(
-        &self,
-        customer_id: &StripeCustomerId,
-        params: UpdateCustomerParams<'_>,
-    ) -> Result<StripeCustomer> {
-        let mut customers = self.customers.lock();
-        if let Some(customer) = customers.get_mut(customer_id) {
-            if let Some(email) = params.email {
-                customer.email = Some(email.to_string());
-            }
-            Ok(customer.clone())
-        } else {
-            Err(anyhow!("no customer found for {customer_id:?}"))
-        }
-    }
-
-    async fn list_subscriptions_for_customer(
-        &self,
-        customer_id: &StripeCustomerId,
-    ) -> Result<Vec<StripeSubscription>> {
-        let subscriptions = self
-            .subscriptions
-            .lock()
-            .values()
-            .filter(|subscription| subscription.customer == *customer_id)
-            .cloned()
-            .collect();
-
-        Ok(subscriptions)
-    }
-
-    async fn get_subscription(
-        &self,
-        subscription_id: &StripeSubscriptionId,
-    ) -> Result<StripeSubscription> {
-        self.subscriptions
-            .lock()
-            .get(subscription_id)
-            .cloned()
-            .ok_or_else(|| anyhow!("no subscription found for {subscription_id:?}"))
-    }
-
-    async fn create_subscription(
-        &self,
-        params: StripeCreateSubscriptionParams,
-    ) -> Result<StripeSubscription> {
-        let now = Utc::now();
-
-        let subscription = StripeSubscription {
-            id: StripeSubscriptionId(format!("sub_{}", Uuid::new_v4()).into()),
-            customer: params.customer,
-            status: stripe::SubscriptionStatus::Active,
-            current_period_start: now.timestamp(),
-            current_period_end: (now + Duration::days(30)).timestamp(),
-            items: params
-                .items
-                .into_iter()
-                .map(|item| StripeSubscriptionItem {
-                    id: StripeSubscriptionItemId(format!("si_{}", Uuid::new_v4()).into()),
-                    price: item
-                        .price
-                        .and_then(|price_id| self.prices.lock().get(&price_id).cloned()),
-                })
-                .collect(),
-            cancel_at: None,
-            cancellation_details: None,
-        };
-
-        self.subscriptions
-            .lock()
-            .insert(subscription.id.clone(), subscription.clone());
-
-        Ok(subscription)
-    }
-
-    async fn update_subscription(
-        &self,
-        subscription_id: &StripeSubscriptionId,
-        params: UpdateSubscriptionParams,
-    ) -> Result<()> {
-        let subscription = self.get_subscription(subscription_id).await?;
-
-        self.update_subscription_calls
-            .lock()
-            .push((subscription.id, params));
-
-        Ok(())
-    }
-
-    async fn cancel_subscription(&self, subscription_id: &StripeSubscriptionId) -> Result<()> {
-        // TODO: Implement fake subscription cancellation.
-        let _ = subscription_id;
-
-        Ok(())
-    }
-
-    async fn list_prices(&self) -> Result<Vec<StripePrice>> {
-        let prices = self.prices.lock().values().cloned().collect();
-
-        Ok(prices)
-    }
-
-    async fn list_meters(&self) -> Result<Vec<StripeMeter>> {
-        let meters = self.meters.lock().values().cloned().collect();
-
-        Ok(meters)
-    }
-
-    async fn create_meter_event(&self, params: StripeCreateMeterEventParams<'_>) -> Result<()> {
-        self.create_meter_event_calls
-            .lock()
-            .push(StripeCreateMeterEventCall {
-                identifier: params.identifier.into(),
-                event_name: params.event_name.into(),
-                value: params.payload.value,
-                stripe_customer_id: params.payload.stripe_customer_id.clone(),
-                timestamp: params.timestamp,
-            });
-
-        Ok(())
-    }
-
-    async fn create_checkout_session(
-        &self,
-        params: StripeCreateCheckoutSessionParams<'_>,
-    ) -> Result<StripeCheckoutSession> {
-        self.create_checkout_session_calls
-            .lock()
-            .push(StripeCreateCheckoutSessionCall {
-                customer: params.customer.cloned(),
-                client_reference_id: params.client_reference_id.map(|id| id.to_string()),
-                mode: params.mode,
-                line_items: params.line_items,
-                payment_method_collection: params.payment_method_collection,
-                subscription_data: params.subscription_data,
-                success_url: params.success_url.map(|url| url.to_string()),
-                billing_address_collection: params.billing_address_collection,
-                customer_update: params.customer_update,
-                tax_id_collection: params.tax_id_collection,
-            });
-
-        Ok(StripeCheckoutSession {
-            url: Some("https://checkout.stripe.com/c/pay/cs_test_1".to_string()),
-        })
-    }
-}
diff --git a/crates/collab/src/stripe_client/real_stripe_client.rs b/crates/collab/src/stripe_client/real_stripe_client.rs
deleted file mode 100644
index 07c191ff30..0000000000
--- a/crates/collab/src/stripe_client/real_stripe_client.rs
+++ /dev/null
@@ -1,612 +0,0 @@
-use std::str::FromStr as _;
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result, anyhow};
-use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
-use stripe::{
-    CancellationDetails, CancellationDetailsReason, CheckoutSession, CheckoutSessionMode,
-    CheckoutSessionPaymentMethodCollection, CreateCheckoutSession, CreateCheckoutSessionLineItems,
-    CreateCheckoutSessionSubscriptionData, CreateCheckoutSessionSubscriptionDataTrialSettings,
-    CreateCheckoutSessionSubscriptionDataTrialSettingsEndBehavior,
-    CreateCheckoutSessionSubscriptionDataTrialSettingsEndBehaviorMissingPaymentMethod,
-    CreateCustomer, CreateSubscriptionAutomaticTax, Customer, CustomerId, ListCustomers, Price,
-    PriceId, Recurring, Subscription, SubscriptionId, SubscriptionItem, SubscriptionItemId,
-    UpdateCustomer, UpdateSubscriptionItems, UpdateSubscriptionTrialSettings,
-    UpdateSubscriptionTrialSettingsEndBehavior,
-    UpdateSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod,
-};
-
-use crate::stripe_client::{
-    CreateCustomerParams, StripeAutomaticTax, StripeBillingAddressCollection,
-    StripeCancellationDetails, StripeCancellationDetailsReason, StripeCheckoutSession,
-    StripeCheckoutSessionMode, StripeCheckoutSessionPaymentMethodCollection, StripeClient,
-    StripeCreateCheckoutSessionLineItems, StripeCreateCheckoutSessionParams,
-    StripeCreateCheckoutSessionSubscriptionData, StripeCreateMeterEventParams,
-    StripeCreateSubscriptionParams, StripeCustomer, StripeCustomerId, StripeCustomerUpdate,
-    StripeCustomerUpdateAddress, StripeCustomerUpdateName, StripeCustomerUpdateShipping,
-    StripeMeter, StripePrice, StripePriceId, StripePriceRecurring, StripeSubscription,
-    StripeSubscriptionId, StripeSubscriptionItem, StripeSubscriptionItemId,
-    StripeSubscriptionTrialSettings, StripeSubscriptionTrialSettingsEndBehavior,
-    StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod, StripeTaxIdCollection,
-    UpdateCustomerParams, UpdateSubscriptionParams,
-};
-
-pub struct RealStripeClient {
-    client: Arc<stripe::Client>,
-}
-
-impl RealStripeClient {
-    pub fn new(client: Arc<stripe::Client>) -> Self {
-        Self { client }
-    }
-}
-
-#[async_trait]
-impl StripeClient for RealStripeClient {
-    async fn list_customers_by_email(&self, email: &str) -> Result<Vec<StripeCustomer>> {
-        let response = Customer::list(
-            &self.client,
-            &ListCustomers {
-                email: Some(email),
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(response
-            .data
-            .into_iter()
-            .map(StripeCustomer::from)
-            .collect())
-    }
-
-    async fn get_customer(&self, customer_id: &StripeCustomerId) -> Result<StripeCustomer> {
-        let customer_id = customer_id.try_into()?;
-
-        let customer = Customer::retrieve(&self.client, &customer_id, &[]).await?;
-
-        Ok(StripeCustomer::from(customer))
-    }
-
-    async fn create_customer(&self, params: CreateCustomerParams<'_>) -> Result<StripeCustomer> {
-        let customer = Customer::create(
-            &self.client,
-            CreateCustomer {
-                email: params.email,
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(StripeCustomer::from(customer))
-    }
-
-    async fn update_customer(
-        &self,
-        customer_id: &StripeCustomerId,
-        params: UpdateCustomerParams<'_>,
-    ) -> Result<StripeCustomer> {
-        let customer = Customer::update(
-            &self.client,
-            &customer_id.try_into()?,
-            UpdateCustomer {
-                email: params.email,
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(StripeCustomer::from(customer))
-    }
-
-    async fn list_subscriptions_for_customer(
-        &self,
-        customer_id: &StripeCustomerId,
-    ) -> Result<Vec<StripeSubscription>> {
-        let customer_id = customer_id.try_into()?;
-
-        let subscriptions = stripe::Subscription::list(
-            &self.client,
-            &stripe::ListSubscriptions {
-                customer: Some(customer_id),
-                status: None,
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(subscriptions
-            .data
-            .into_iter()
-            .map(StripeSubscription::from)
-            .collect())
-    }
-
-    async fn get_subscription(
-        &self,
-        subscription_id: &StripeSubscriptionId,
-    ) -> Result<StripeSubscription> {
-        let subscription_id = subscription_id.try_into()?;
-
-        let subscription = Subscription::retrieve(&self.client, &subscription_id, &[]).await?;
-
-        Ok(StripeSubscription::from(subscription))
-    }
-
-    async fn create_subscription(
-        &self,
-        params: StripeCreateSubscriptionParams,
-    ) -> Result<StripeSubscription> {
-        let customer_id = params.customer.try_into()?;
-
-        let mut create_subscription = stripe::CreateSubscription::new(customer_id);
-        create_subscription.items = Some(
-            params
-                .items
-                .into_iter()
-                .map(|item| stripe::CreateSubscriptionItems {
-                    price: item.price.map(|price| price.to_string()),
-                    quantity: item.quantity,
-                    ..Default::default()
-                })
-                .collect(),
-        );
-        create_subscription.automatic_tax = params.automatic_tax.map(Into::into);
-
-        let subscription = Subscription::create(&self.client, create_subscription).await?;
-
-        Ok(StripeSubscription::from(subscription))
-    }
-
-    async fn update_subscription(
-        &self,
-        subscription_id: &StripeSubscriptionId,
-        params: UpdateSubscriptionParams,
-    ) -> Result<()> {
-        let subscription_id = subscription_id.try_into()?;
-
-        stripe::Subscription::update(
-            &self.client,
-            &subscription_id,
-            stripe::UpdateSubscription {
-                items: params.items.map(|items| {
-                    items
-                        .into_iter()
-                        .map(|item| UpdateSubscriptionItems {
-                            price: item.price.map(|price| price.to_string()),
-                            ..Default::default()
-                        })
-                        .collect()
-                }),
-                trial_settings: params.trial_settings.map(Into::into),
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(())
-    }
-
-    async fn cancel_subscription(&self, subscription_id: &StripeSubscriptionId) -> Result<()> {
-        let subscription_id = subscription_id.try_into()?;
-
-        Subscription::cancel(
-            &self.client,
-            &subscription_id,
-            stripe::CancelSubscription {
-                invoice_now: None,
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(())
-    }
-
-    async fn list_prices(&self) -> Result<Vec<StripePrice>> {
-        let response = stripe::Price::list(
-            &self.client,
-            &stripe::ListPrices {
-                limit: Some(100),
-                ..Default::default()
-            },
-        )
-        .await?;
-
-        Ok(response.data.into_iter().map(StripePrice::from).collect())
-    }
-
-    async fn list_meters(&self) -> Result<Vec<StripeMeter>> {
-        #[derive(Serialize)]
-        struct Params {
-            #[serde(skip_serializing_if = "Option::is_none")]
-            limit: Option<u64>,
-        }
-
-        let response = self
-            .client
-            .get_query::<stripe::List<StripeMeter>, _>(
-                "/billing/meters",
-                Params { limit: Some(100) },
-            )
-            .await?;
-
-        Ok(response.data)
-    }
-
-    async fn create_meter_event(&self, params: StripeCreateMeterEventParams<'_>) -> Result<()> {
-        #[derive(Deserialize)]
-        struct StripeMeterEvent {
-            pub identifier: String,
-        }
-
-        let identifier = params.identifier;
-        match self
-            .client
-            .post_form::<StripeMeterEvent, _>("/billing/meter_events", params)
-            .await
-        {
-            Ok(_event) => Ok(()),
-            Err(stripe::StripeError::Stripe(error)) => {
-                if error.http_status == 400
-                    && error
-                        .message
-                        .as_ref()
-                        .map_or(false, |message| message.contains(identifier))
-                {
-                    Ok(())
-                } else {
-                    Err(anyhow!(stripe::StripeError::Stripe(error)))
-                }
-            }
-            Err(error) => Err(anyhow!("failed to create meter event: {error:?}")),
-        }
-    }
-
-    async fn create_checkout_session(
-        &self,
-        params: StripeCreateCheckoutSessionParams<'_>,
-    ) -> Result<StripeCheckoutSession> {
-        let params = params.try_into()?;
-        let session = CheckoutSession::create(&self.client, params).await?;
-
-        Ok(session.into())
-    }
-}
-
-impl From<CustomerId> for StripeCustomerId {
-    fn from(value: CustomerId) -> Self {
-        Self(value.as_str().into())
-    }
-}
-
-impl TryFrom<StripeCustomerId> for CustomerId {
-    type Error = anyhow::Error;
-
-    fn try_from(value: StripeCustomerId) -> Result<Self, Self::Error> {
-        Self::from_str(value.0.as_ref()).context("failed to parse Stripe customer ID")
-    }
-}
-
-impl TryFrom<&StripeCustomerId> for CustomerId {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &StripeCustomerId) -> Result<Self, Self::Error> {
-        Self::from_str(value.0.as_ref()).context("failed to parse Stripe customer ID")
-    }
-}
-
-impl From<Customer> for StripeCustomer {
-    fn from(value: Customer) -> Self {
-        StripeCustomer {
-            id: value.id.into(),
-            email: value.email,
-        }
-    }
-}
-
-impl From<SubscriptionId> for StripeSubscriptionId {
-    fn from(value: SubscriptionId) -> Self {
-        Self(value.as_str().into())
-    }
-}
-
-impl TryFrom<&StripeSubscriptionId> for SubscriptionId {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &StripeSubscriptionId) -> Result<Self, Self::Error> {
-        Self::from_str(value.0.as_ref()).context("failed to parse Stripe subscription ID")
-    }
-}
-
-impl From<Subscription> for StripeSubscription {
-    fn from(value: Subscription) -> Self {
-        Self {
-            id: value.id.into(),
-            customer: value.customer.id().into(),
-            status: value.status,
-            current_period_start: value.current_period_start,
-            current_period_end: value.current_period_end,
-            items: value.items.data.into_iter().map(Into::into).collect(),
-            cancel_at: value.cancel_at,
-            cancellation_details: value.cancellation_details.map(Into::into),
-        }
-    }
-}
-
-impl From<CancellationDetails> for StripeCancellationDetails {
-    fn from(value: CancellationDetails) -> Self {
-        Self {
-            reason: value.reason.map(Into::into),
-        }
-    }
-}
-
-impl From<CancellationDetailsReason> for StripeCancellationDetailsReason {
-    fn from(value: CancellationDetailsReason) -> Self {
-        match value {
-            CancellationDetailsReason::CancellationRequested => Self::CancellationRequested,
-            CancellationDetailsReason::PaymentDisputed => Self::PaymentDisputed,
-            CancellationDetailsReason::PaymentFailed => Self::PaymentFailed,
-        }
-    }
-}
-
-impl From<SubscriptionItemId> for StripeSubscriptionItemId {
-    fn from(value: SubscriptionItemId) -> Self {
-        Self(value.as_str().into())
-    }
-}
-
-impl From<SubscriptionItem> for StripeSubscriptionItem {
-    fn from(value: SubscriptionItem) -> Self {
-        Self {
-            id: value.id.into(),
-            price: value.price.map(Into::into),
-        }
-    }
-}
-
-impl From<StripeAutomaticTax> for CreateSubscriptionAutomaticTax {
-    fn from(value: StripeAutomaticTax) -> Self {
-        Self {
-            enabled: value.enabled,
-            liability: None,
-        }
-    }
-}
-
-impl From<StripeSubscriptionTrialSettings> for UpdateSubscriptionTrialSettings {
-    fn from(value: StripeSubscriptionTrialSettings) -> Self {
-        Self {
-            end_behavior: value.end_behavior.into(),
-        }
-    }
-}
-
-impl From<StripeSubscriptionTrialSettingsEndBehavior>
-    for UpdateSubscriptionTrialSettingsEndBehavior
-{
-    fn from(value: StripeSubscriptionTrialSettingsEndBehavior) -> Self {
-        Self {
-            missing_payment_method: value.missing_payment_method.into(),
-        }
-    }
-}
-
-impl From<StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod>
-    for UpdateSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod
-{
-    fn from(value: StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod) -> Self {
-        match value {
-            StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod::Cancel => Self::Cancel,
-            StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod::CreateInvoice => {
-                Self::CreateInvoice
-            }
-            StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod::Pause => Self::Pause,
-        }
-    }
-}
-
-impl From<PriceId> for StripePriceId {
-    fn from(value: PriceId) -> Self {
-        Self(value.as_str().into())
-    }
-}
-
-impl TryFrom<StripePriceId> for PriceId {
-    type Error = anyhow::Error;
-
-    fn try_from(value: StripePriceId) -> Result<Self, Self::Error> {
-        Self::from_str(value.0.as_ref()).context("failed to parse Stripe price ID")
-    }
-}
-
-impl From<Price> for StripePrice {
-    fn from(value: Price) -> Self {
-        Self {
-            id: value.id.into(),
-            unit_amount: value.unit_amount,
-            lookup_key: value.lookup_key,
-            recurring: value.recurring.map(StripePriceRecurring::from),
-        }
-    }
-}
-
-impl From<Recurring> for StripePriceRecurring {
-    fn from(value: Recurring) -> Self {
-        Self { meter: value.meter }
-    }
-}
-
-impl<'a> TryFrom<StripeCreateCheckoutSessionParams<'a>> for CreateCheckoutSession<'a> {
-    type Error = anyhow::Error;
-
-    fn try_from(value: StripeCreateCheckoutSessionParams<'a>) -> Result<Self, Self::Error> {
-        Ok(Self {
-            customer: value
-                .customer
-                .map(|customer_id| customer_id.try_into())
-                .transpose()?,
-            client_reference_id: value.client_reference_id,
-            mode: value.mode.map(Into::into),
-            line_items: value
-                .line_items
-                .map(|line_items| line_items.into_iter().map(Into::into).collect()),
-            payment_method_collection: value.payment_method_collection.map(Into::into),
-            subscription_data: value.subscription_data.map(Into::into),
-            success_url: value.success_url,
-            billing_address_collection: value.billing_address_collection.map(Into::into),
-            customer_update: value.customer_update.map(Into::into),
-            tax_id_collection: value.tax_id_collection.map(Into::into),
-            ..Default::default()
-        })
-    }
-}
-
-impl From<StripeCheckoutSessionMode> for CheckoutSessionMode {
-    fn from(value: StripeCheckoutSessionMode) -> Self {
-        match value {
-            StripeCheckoutSessionMode::Payment => Self::Payment,
-            StripeCheckoutSessionMode::Setup => Self::Setup,
-            StripeCheckoutSessionMode::Subscription => Self::Subscription,
-        }
-    }
-}
-
-impl From<StripeCreateCheckoutSessionLineItems> for CreateCheckoutSessionLineItems {
-    fn from(value: StripeCreateCheckoutSessionLineItems) -> Self {
-        Self {
-            price: value.price,
-            quantity: value.quantity,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<StripeCheckoutSessionPaymentMethodCollection> for CheckoutSessionPaymentMethodCollection {
-    fn from(value: StripeCheckoutSessionPaymentMethodCollection) -> Self {
-        match value {
-            StripeCheckoutSessionPaymentMethodCollection::Always => Self::Always,
-            StripeCheckoutSessionPaymentMethodCollection::IfRequired => Self::IfRequired,
-        }
-    }
-}
-
-impl From<StripeCreateCheckoutSessionSubscriptionData> for CreateCheckoutSessionSubscriptionData {
-    fn from(value: StripeCreateCheckoutSessionSubscriptionData) -> Self {
-        Self {
-            trial_period_days: value.trial_period_days,
-            trial_settings: value.trial_settings.map(Into::into),
-            metadata: value.metadata,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<StripeSubscriptionTrialSettings> for CreateCheckoutSessionSubscriptionDataTrialSettings {
-    fn from(value: StripeSubscriptionTrialSettings) -> Self {
-        Self {
-            end_behavior: value.end_behavior.into(),
-        }
-    }
-}
-
-impl From<StripeSubscriptionTrialSettingsEndBehavior>
-    for CreateCheckoutSessionSubscriptionDataTrialSettingsEndBehavior
-{
-    fn from(value: StripeSubscriptionTrialSettingsEndBehavior) -> Self {
-        Self {
-            missing_payment_method: value.missing_payment_method.into(),
-        }
-    }
-}
-
-impl From<StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod>
-    for CreateCheckoutSessionSubscriptionDataTrialSettingsEndBehaviorMissingPaymentMethod
-{
-    fn from(value: StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod) -> Self {
-        match value {
-            StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod::Cancel => Self::Cancel,
-            StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod::CreateInvoice => {
-                Self::CreateInvoice
-            }
-            StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod::Pause => Self::Pause,
-        }
-    }
-}
-
-impl From<CheckoutSession> for StripeCheckoutSession {
-    fn from(value: CheckoutSession) -> Self {
-        Self { url: value.url }
-    }
-}
-
-impl From<StripeBillingAddressCollection> for stripe::CheckoutSessionBillingAddressCollection {
-    fn from(value: StripeBillingAddressCollection) -> Self {
-        match value {
-            StripeBillingAddressCollection::Auto => {
-                stripe::CheckoutSessionBillingAddressCollection::Auto
-            }
-            StripeBillingAddressCollection::Required => {
-                stripe::CheckoutSessionBillingAddressCollection::Required
-            }
-        }
-    }
-}
-
-impl From<StripeCustomerUpdateAddress> for stripe::CreateCheckoutSessionCustomerUpdateAddress {
-    fn from(value: StripeCustomerUpdateAddress) -> Self {
-        match value {
-            StripeCustomerUpdateAddress::Auto => {
-                stripe::CreateCheckoutSessionCustomerUpdateAddress::Auto
-            }
-            StripeCustomerUpdateAddress::Never => {
-                stripe::CreateCheckoutSessionCustomerUpdateAddress::Never
-            }
-        }
-    }
-}
-
-impl From<StripeCustomerUpdateName> for stripe::CreateCheckoutSessionCustomerUpdateName {
-    fn from(value: StripeCustomerUpdateName) -> Self {
-        match value {
-            StripeCustomerUpdateName::Auto => stripe::CreateCheckoutSessionCustomerUpdateName::Auto,
-            StripeCustomerUpdateName::Never => {
-                stripe::CreateCheckoutSessionCustomerUpdateName::Never
-            }
-        }
-    }
-}
-
-impl From<StripeCustomerUpdateShipping> for stripe::CreateCheckoutSessionCustomerUpdateShipping {
-    fn from(value: StripeCustomerUpdateShipping) -> Self {
-        match value {
-            StripeCustomerUpdateShipping::Auto => {
-                stripe::CreateCheckoutSessionCustomerUpdateShipping::Auto
-            }
-            StripeCustomerUpdateShipping::Never => {
-                stripe::CreateCheckoutSessionCustomerUpdateShipping::Never
-            }
-        }
-    }
-}
-
-impl From<StripeCustomerUpdate> for stripe::CreateCheckoutSessionCustomerUpdate {
-    fn from(value: StripeCustomerUpdate) -> Self {
-        stripe::CreateCheckoutSessionCustomerUpdate {
-            address: value.address.map(Into::into),
-            name: value.name.map(Into::into),
-            shipping: value.shipping.map(Into::into),
-        }
-    }
-}
-
-impl From<StripeTaxIdCollection> for stripe::CreateCheckoutSessionTaxIdCollection {
-    fn from(value: StripeTaxIdCollection) -> Self {
-        stripe::CreateCheckoutSessionTaxIdCollection {
-            enabled: value.enabled,
-        }
-    }
-}
diff --git a/crates/collab/src/tests.rs b/crates/collab/src/tests.rs
index 8d5d076780..ddf245b06f 100644
--- a/crates/collab/src/tests.rs
+++ b/crates/collab/src/tests.rs
@@ -8,7 +8,6 @@ mod channel_buffer_tests;
 mod channel_guest_tests;
 mod channel_message_tests;
 mod channel_tests;
-// mod debug_panel_tests;
 mod editor_tests;
 mod following_tests;
 mod git_tests;
@@ -18,7 +17,6 @@ mod random_channel_buffer_tests;
 mod random_project_collaboration_tests;
 mod randomized_test_helpers;
 mod remote_editing_collaboration_tests;
-mod stripe_billing_tests;
 mod test_server;
 
 use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
diff --git a/crates/collab/src/tests/stripe_billing_tests.rs b/crates/collab/src/tests/stripe_billing_tests.rs
deleted file mode 100644
index bb84bedfcf..0000000000
--- a/crates/collab/src/tests/stripe_billing_tests.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use std::sync::Arc;
-
-use pretty_assertions::assert_eq;
-
-use crate::stripe_billing::StripeBilling;
-use crate::stripe_client::{FakeStripeClient, StripePrice, StripePriceId, StripePriceRecurring};
-
-fn make_stripe_billing() -> (StripeBilling, Arc<FakeStripeClient>) {
-    let stripe_client = Arc::new(FakeStripeClient::new());
-    let stripe_billing = StripeBilling::test(stripe_client.clone());
-
-    (stripe_billing, stripe_client)
-}
-
-#[gpui::test]
-async fn test_initialize() {
-    let (stripe_billing, stripe_client) = make_stripe_billing();
-
-    // Add test prices
-    let price1 = StripePrice {
-        id: StripePriceId("price_1".into()),
-        unit_amount: Some(1_000),
-        lookup_key: Some("zed-pro".to_string()),
-        recurring: None,
-    };
-    let price2 = StripePrice {
-        id: StripePriceId("price_2".into()),
-        unit_amount: Some(0),
-        lookup_key: Some("zed-free".to_string()),
-        recurring: None,
-    };
-    let price3 = StripePrice {
-        id: StripePriceId("price_3".into()),
-        unit_amount: Some(500),
-        lookup_key: None,
-        recurring: Some(StripePriceRecurring {
-            meter: Some("meter_1".to_string()),
-        }),
-    };
-    stripe_client
-        .prices
-        .lock()
-        .insert(price1.id.clone(), price1);
-    stripe_client
-        .prices
-        .lock()
-        .insert(price2.id.clone(), price2);
-    stripe_client
-        .prices
-        .lock()
-        .insert(price3.id.clone(), price3);
-
-    // Initialize the billing system
-    stripe_billing.initialize().await.unwrap();
-
-    // Verify that prices can be found by lookup key
-    let zed_pro_price_id = stripe_billing.zed_pro_price_id().await.unwrap();
-    assert_eq!(zed_pro_price_id.to_string(), "price_1");
-
-    let zed_free_price_id = stripe_billing.zed_free_price_id().await.unwrap();
-    assert_eq!(zed_free_price_id.to_string(), "price_2");
-
-    // Verify that a price can be found by lookup key
-    let zed_pro_price = stripe_billing
-        .find_price_by_lookup_key("zed-pro")
-        .await
-        .unwrap();
-    assert_eq!(zed_pro_price.id.to_string(), "price_1");
-    assert_eq!(zed_pro_price.unit_amount, Some(1_000));
-
-    // Verify that finding a non-existent lookup key returns an error
-    let result = stripe_billing
-        .find_price_by_lookup_key("non-existent")
-        .await;
-    assert!(result.is_err());
-}
-
-#[gpui::test]
-async fn test_find_or_create_customer_by_email() {
-    let (stripe_billing, stripe_client) = make_stripe_billing();
-
-    // Create a customer with an email that doesn't yet correspond to a customer.
-    {
-        let email = "user@example.com";
-
-        let customer_id = stripe_billing
-            .find_or_create_customer_by_email(Some(email))
-            .await
-            .unwrap();
-
-        let customer = stripe_client
-            .customers
-            .lock()
-            .get(&customer_id)
-            .unwrap()
-            .clone();
-        assert_eq!(customer.email.as_deref(), Some(email));
-    }
-
-    // Create a customer with an email that corresponds to an existing customer.
-    {
-        let email = "user2@example.com";
-
-        let existing_customer_id = stripe_billing
-            .find_or_create_customer_by_email(Some(email))
-            .await
-            .unwrap();
-
-        let customer_id = stripe_billing
-            .find_or_create_customer_by_email(Some(email))
-            .await
-            .unwrap();
-        assert_eq!(customer_id, existing_customer_id);
-
-        let customer = stripe_client
-            .customers
-            .lock()
-            .get(&customer_id)
-            .unwrap()
-            .clone();
-        assert_eq!(customer.email.as_deref(), Some(email));
-    }
-}
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index f5a0e8ea81..8c545b0670 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -1,4 +1,3 @@
-use crate::stripe_client::FakeStripeClient;
 use crate::{
     AppState, Config,
     db::{NewUserParams, UserId, tests::TestDb},
@@ -569,9 +568,6 @@ impl TestServer {
             llm_db: None,
             livekit_client: Some(Arc::new(livekit_test_server.create_api_client())),
             blob_store_client: None,
-            real_stripe_client: None,
-            stripe_client: Some(Arc::new(FakeStripeClient::new())),
-            stripe_billing: None,
             executor,
             kinesis_client: None,
             config: Config {
@@ -608,7 +604,6 @@ impl TestServer {
                 auto_join_channel_id: None,
                 migrations_path: None,
                 seed_path: None,
-                stripe_api_key: None,
                 supermaven_admin_api_key: None,
                 user_backfiller_github_access_token: None,
                 kinesis_region: None,

From 9eb1ff272693a811c8f3f1b251a67c3a97f856e4 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Fri, 15 Aug 2025 18:03:36 -0300
Subject: [PATCH 073/823] acp thread view: Always use editors for user messages
 (#36256)

This means the cursor will be at the position you clicked:


https://github.com/user-attachments/assets/0693950d-7513-4d90-88e2-55817df7213a


Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs           |  10 +-
 .../agent_ui/src/acp/completion_provider.rs   |   5 -
 crates/agent_ui/src/acp/entry_view_state.rs   | 387 ++++++-----
 crates/agent_ui/src/acp/message_editor.rs     |  28 +-
 crates/agent_ui/src/acp/thread_view.rs        | 605 ++++++++++++------
 crates/agent_ui/src/agent_panel.rs            |  10 +-
 6 files changed, 671 insertions(+), 374 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 4995ddb9df..2ef94a3cbe 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -109,7 +109,7 @@ pub enum AgentThreadEntry {
 }
 
 impl AgentThreadEntry {
-    fn to_markdown(&self, cx: &App) -> String {
+    pub fn to_markdown(&self, cx: &App) -> String {
         match self {
             Self::UserMessage(message) => message.to_markdown(cx),
             Self::AssistantMessage(message) => message.to_markdown(cx),
@@ -117,6 +117,14 @@ impl AgentThreadEntry {
         }
     }
 
+    pub fn user_message(&self) -> Option<&UserMessage> {
+        if let AgentThreadEntry::UserMessage(message) = self {
+            Some(message)
+        } else {
+            None
+        }
+    }
+
     pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
         if let AgentThreadEntry::ToolCall(call) = self {
             itertools::Either::Left(call.diffs())
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 4ee1eb6948..d7d2cd5d0e 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -80,11 +80,6 @@ impl MentionSet {
             .chain(self.images.drain().map(|(id, _)| id))
     }
 
-    pub fn clear(&mut self) {
-        self.fetch_results.clear();
-        self.uri_by_crease_id.clear();
-    }
-
     pub fn contents(
         &self,
         project: Entity<Project>,
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 2f5f855e90..e99d1f6323 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,45 +1,141 @@
-use std::{collections::HashMap, ops::Range};
+use std::ops::Range;
 
-use acp_thread::AcpThread;
-use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer};
+use acp_thread::{AcpThread, AgentThreadEntry};
+use agent::{TextThreadStore, ThreadStore};
+use collections::HashMap;
+use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, TextStyleRefinement, WeakEntity, Window,
+    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, TextStyleRefinement,
+    WeakEntity, Window,
 };
 use language::language_settings::SoftWrap;
+use project::Project;
 use settings::Settings as _;
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
-use ui::TextSize;
+use ui::{Context, TextSize};
 use workspace::Workspace;
 
-#[derive(Default)]
+use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
+
 pub struct EntryViewState {
+    workspace: WeakEntity<Workspace>,
+    project: Entity<Project>,
+    thread_store: Entity<ThreadStore>,
+    text_thread_store: Entity<TextThreadStore>,
     entries: Vec<Entry>,
 }
 
 impl EntryViewState {
+    pub fn new(
+        workspace: WeakEntity<Workspace>,
+        project: Entity<Project>,
+        thread_store: Entity<ThreadStore>,
+        text_thread_store: Entity<TextThreadStore>,
+    ) -> Self {
+        Self {
+            workspace,
+            project,
+            thread_store,
+            text_thread_store,
+            entries: Vec::new(),
+        }
+    }
+
     pub fn entry(&self, index: usize) -> Option<&Entry> {
         self.entries.get(index)
     }
 
     pub fn sync_entry(
         &mut self,
-        workspace: WeakEntity<Workspace>,
-        thread: Entity<AcpThread>,
         index: usize,
+        thread: &Entity<AcpThread>,
         window: &mut Window,
-        cx: &mut App,
+        cx: &mut Context<Self>,
     ) {
-        debug_assert!(index <= self.entries.len());
-        let entry = if let Some(entry) = self.entries.get_mut(index) {
-            entry
-        } else {
-            self.entries.push(Entry::default());
-            self.entries.last_mut().unwrap()
+        let Some(thread_entry) = thread.read(cx).entries().get(index) else {
+            return;
         };
 
-        entry.sync_diff_multibuffers(&thread, index, window, cx);
-        entry.sync_terminals(&workspace, &thread, index, window, cx);
+        match thread_entry {
+            AgentThreadEntry::UserMessage(message) => {
+                let has_id = message.id.is_some();
+                let chunks = message.chunks.clone();
+                let message_editor = cx.new(|cx| {
+                    let mut editor = MessageEditor::new(
+                        self.workspace.clone(),
+                        self.project.clone(),
+                        self.thread_store.clone(),
+                        self.text_thread_store.clone(),
+                        editor::EditorMode::AutoHeight {
+                            min_lines: 1,
+                            max_lines: None,
+                        },
+                        window,
+                        cx,
+                    );
+                    if !has_id {
+                        editor.set_read_only(true, cx);
+                    }
+                    editor.set_message(chunks, window, cx);
+                    editor
+                });
+                cx.subscribe(&message_editor, move |_, editor, event, cx| {
+                    cx.emit(EntryViewEvent {
+                        entry_index: index,
+                        view_event: ViewEvent::MessageEditorEvent(editor, *event),
+                    })
+                })
+                .detach();
+                self.set_entry(index, Entry::UserMessage(message_editor));
+            }
+            AgentThreadEntry::ToolCall(tool_call) => {
+                let terminals = tool_call.terminals().cloned().collect::<Vec<_>>();
+                let diffs = tool_call.diffs().cloned().collect::<Vec<_>>();
+
+                let views = if let Some(Entry::Content(views)) = self.entries.get_mut(index) {
+                    views
+                } else {
+                    self.set_entry(index, Entry::empty());
+                    let Some(Entry::Content(views)) = self.entries.get_mut(index) else {
+                        unreachable!()
+                    };
+                    views
+                };
+
+                for terminal in terminals {
+                    views.entry(terminal.entity_id()).or_insert_with(|| {
+                        create_terminal(
+                            self.workspace.clone(),
+                            self.project.clone(),
+                            terminal.clone(),
+                            window,
+                            cx,
+                        )
+                        .into_any()
+                    });
+                }
+
+                for diff in diffs {
+                    views
+                        .entry(diff.entity_id())
+                        .or_insert_with(|| create_editor_diff(diff.clone(), window, cx).into_any());
+                }
+            }
+            AgentThreadEntry::AssistantMessage(_) => {
+                if index == self.entries.len() {
+                    self.entries.push(Entry::empty())
+                }
+            }
+        };
+    }
+
+    fn set_entry(&mut self, index: usize, entry: Entry) {
+        if index == self.entries.len() {
+            self.entries.push(entry);
+        } else {
+            self.entries[index] = entry;
+        }
     }
 
     pub fn remove(&mut self, range: Range<usize>) {
@@ -48,26 +144,51 @@ impl EntryViewState {
 
     pub fn settings_changed(&mut self, cx: &mut App) {
         for entry in self.entries.iter() {
-            for view in entry.views.values() {
-                if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
-                    diff_editor.update(cx, |diff_editor, cx| {
-                        diff_editor
-                            .set_text_style_refinement(diff_editor_text_style_refinement(cx));
-                        cx.notify();
-                    })
+            match entry {
+                Entry::UserMessage { .. } => {}
+                Entry::Content(response_views) => {
+                    for view in response_views.values() {
+                        if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
+                            diff_editor.update(cx, |diff_editor, cx| {
+                                diff_editor.set_text_style_refinement(
+                                    diff_editor_text_style_refinement(cx),
+                                );
+                                cx.notify();
+                            })
+                        }
+                    }
                 }
             }
         }
     }
 }
 
-pub struct Entry {
-    views: HashMap<EntityId, AnyEntity>,
+impl EventEmitter<EntryViewEvent> for EntryViewState {}
+
+pub struct EntryViewEvent {
+    pub entry_index: usize,
+    pub view_event: ViewEvent,
+}
+
+pub enum ViewEvent {
+    MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
+}
+
+pub enum Entry {
+    UserMessage(Entity<MessageEditor>),
+    Content(HashMap<EntityId, AnyEntity>),
 }
 
 impl Entry {
-    pub fn editor_for_diff(&self, diff: &Entity<MultiBuffer>) -> Option<Entity<Editor>> {
-        self.views
+    pub fn message_editor(&self) -> Option<&Entity<MessageEditor>> {
+        match self {
+            Self::UserMessage(editor) => Some(editor),
+            Entry::Content(_) => None,
+        }
+    }
+
+    pub fn editor_for_diff(&self, diff: &Entity<acp_thread::Diff>) -> Option<Entity<Editor>> {
+        self.content_map()?
             .get(&diff.entity_id())
             .cloned()
             .map(|entity| entity.downcast::<Editor>().unwrap())
@@ -77,118 +198,88 @@ impl Entry {
         &self,
         terminal: &Entity<acp_thread::Terminal>,
     ) -> Option<Entity<TerminalView>> {
-        self.views
+        self.content_map()?
             .get(&terminal.entity_id())
             .cloned()
             .map(|entity| entity.downcast::<TerminalView>().unwrap())
     }
 
-    fn sync_diff_multibuffers(
-        &mut self,
-        thread: &Entity<AcpThread>,
-        index: usize,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(entry) = thread.read(cx).entries().get(index) else {
-            return;
-        };
-
-        let multibuffers = entry
-            .diffs()
-            .map(|diff| diff.read(cx).multibuffer().clone());
-
-        let multibuffers = multibuffers.collect::<Vec<_>>();
-
-        for multibuffer in multibuffers {
-            if self.views.contains_key(&multibuffer.entity_id()) {
-                return;
-            }
-
-            let editor = cx.new(|cx| {
-                let mut editor = Editor::new(
-                    EditorMode::Full {
-                        scale_ui_elements_with_buffer_font_size: false,
-                        show_active_line_background: false,
-                        sized_by_content: true,
-                    },
-                    multibuffer.clone(),
-                    None,
-                    window,
-                    cx,
-                );
-                editor.set_show_gutter(false, cx);
-                editor.disable_inline_diagnostics();
-                editor.disable_expand_excerpt_buttons(cx);
-                editor.set_show_vertical_scrollbar(false, cx);
-                editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
-                editor.set_soft_wrap_mode(SoftWrap::None, cx);
-                editor.scroll_manager.set_forbid_vertical_scroll(true);
-                editor.set_show_indent_guides(false, cx);
-                editor.set_read_only(true);
-                editor.set_show_breakpoints(false, cx);
-                editor.set_show_code_actions(false, cx);
-                editor.set_show_git_diff_gutter(false, cx);
-                editor.set_expand_all_diff_hunks(cx);
-                editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
-                editor
-            });
-
-            let entity_id = multibuffer.entity_id();
-            self.views.insert(entity_id, editor.into_any());
+    fn content_map(&self) -> Option<&HashMap<EntityId, AnyEntity>> {
+        match self {
+            Self::Content(map) => Some(map),
+            _ => None,
         }
     }
 
-    fn sync_terminals(
-        &mut self,
-        workspace: &WeakEntity<Workspace>,
-        thread: &Entity<AcpThread>,
-        index: usize,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(entry) = thread.read(cx).entries().get(index) else {
-            return;
-        };
-
-        let terminals = entry
-            .terminals()
-            .map(|terminal| terminal.clone())
-            .collect::<Vec<_>>();
-
-        for terminal in terminals {
-            if self.views.contains_key(&terminal.entity_id()) {
-                return;
-            }
-
-            let Some(strong_workspace) = workspace.upgrade() else {
-                return;
-            };
-
-            let terminal_view = cx.new(|cx| {
-                let mut view = TerminalView::new(
-                    terminal.read(cx).inner().clone(),
-                    workspace.clone(),
-                    None,
-                    strong_workspace.read(cx).project().downgrade(),
-                    window,
-                    cx,
-                );
-                view.set_embedded_mode(Some(1000), cx);
-                view
-            });
-
-            let entity_id = terminal.entity_id();
-            self.views.insert(entity_id, terminal_view.into_any());
-        }
+    fn empty() -> Self {
+        Self::Content(HashMap::default())
     }
 
     #[cfg(test)]
-    pub fn len(&self) -> usize {
-        self.views.len()
+    pub fn has_content(&self) -> bool {
+        match self {
+            Self::Content(map) => !map.is_empty(),
+            Self::UserMessage(_) => false,
+        }
     }
 }
 
+fn create_terminal(
+    workspace: WeakEntity<Workspace>,
+    project: Entity<Project>,
+    terminal: Entity<acp_thread::Terminal>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<TerminalView> {
+    cx.new(|cx| {
+        let mut view = TerminalView::new(
+            terminal.read(cx).inner().clone(),
+            workspace.clone(),
+            None,
+            project.downgrade(),
+            window,
+            cx,
+        );
+        view.set_embedded_mode(Some(1000), cx);
+        view
+    })
+}
+
+fn create_editor_diff(
+    diff: Entity<acp_thread::Diff>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<Editor> {
+    cx.new(|cx| {
+        let mut editor = Editor::new(
+            EditorMode::Full {
+                scale_ui_elements_with_buffer_font_size: false,
+                show_active_line_background: false,
+                sized_by_content: true,
+            },
+            diff.read(cx).multibuffer().clone(),
+            None,
+            window,
+            cx,
+        );
+        editor.set_show_gutter(false, cx);
+        editor.disable_inline_diagnostics();
+        editor.disable_expand_excerpt_buttons(cx);
+        editor.set_show_vertical_scrollbar(false, cx);
+        editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
+        editor.set_soft_wrap_mode(SoftWrap::None, cx);
+        editor.scroll_manager.set_forbid_vertical_scroll(true);
+        editor.set_show_indent_guides(false, cx);
+        editor.set_read_only(true);
+        editor.set_show_breakpoints(false, cx);
+        editor.set_show_code_actions(false, cx);
+        editor.set_show_git_diff_gutter(false, cx);
+        editor.set_expand_all_diff_hunks(cx);
+        editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
+        editor
+    })
+}
+
 fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
     TextStyleRefinement {
         font_size: Some(
@@ -201,26 +292,20 @@ fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
     }
 }
 
-impl Default for Entry {
-    fn default() -> Self {
-        Self {
-            // Avoid allocating in the heap by default
-            views: HashMap::with_capacity(0),
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::{path::Path, rc::Rc};
 
     use acp_thread::{AgentConnection, StubAgentConnection};
+    use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol as acp;
     use agent_settings::AgentSettings;
     use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
     use editor::{EditorSettings, RowInfo};
     use fs::FakeFs;
-    use gpui::{SemanticVersion, TestAppContext};
+    use gpui::{AppContext as _, SemanticVersion, TestAppContext};
+
+    use crate::acp::entry_view_state::EntryViewState;
     use multi_buffer::MultiBufferRow;
     use pretty_assertions::assert_matches;
     use project::Project;
@@ -230,8 +315,6 @@ mod tests {
     use util::path;
     use workspace::Workspace;
 
-    use crate::acp::entry_view_state::EntryViewState;
-
     #[gpui::test]
     async fn test_diff_sync(cx: &mut TestAppContext) {
         init_test(cx);
@@ -269,7 +352,7 @@ mod tests {
             .update(|_, cx| {
                 connection
                     .clone()
-                    .new_thread(project, Path::new(path!("/project")), cx)
+                    .new_thread(project.clone(), Path::new(path!("/project")), cx)
             })
             .await
             .unwrap();
@@ -279,12 +362,23 @@ mod tests {
             connection.send_update(session_id, acp::SessionUpdate::ToolCall(tool_call), cx)
         });
 
-        let mut view_state = EntryViewState::default();
-        cx.update(|window, cx| {
-            view_state.sync_entry(workspace.downgrade(), thread.clone(), 0, window, cx);
+        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
+        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+
+        let view_state = cx.new(|_cx| {
+            EntryViewState::new(
+                workspace.downgrade(),
+                project.clone(),
+                thread_store,
+                text_thread_store,
+            )
         });
 
-        let multibuffer = thread.read_with(cx, |thread, cx| {
+        view_state.update_in(cx, |view_state, window, cx| {
+            view_state.sync_entry(0, &thread, window, cx)
+        });
+
+        let diff = thread.read_with(cx, |thread, _cx| {
             thread
                 .entries()
                 .get(0)
@@ -292,15 +386,14 @@ mod tests {
                 .diffs()
                 .next()
                 .unwrap()
-                .read(cx)
-                .multibuffer()
                 .clone()
         });
 
         cx.run_until_parked();
 
-        let entry = view_state.entry(0).unwrap();
-        let diff_editor = entry.editor_for_diff(&multibuffer).unwrap();
+        let diff_editor = view_state.read_with(cx, |view_state, _cx| {
+            view_state.entry(0).unwrap().editor_for_diff(&diff).unwrap()
+        });
         assert_eq!(
             diff_editor.read_with(cx, |editor, cx| editor.text(cx)),
             "hi world\nhello world"
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 32c37da519..90827e5514 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -52,9 +52,11 @@ pub struct MessageEditor {
     text_thread_store: Entity<TextThreadStore>,
 }
 
+#[derive(Clone, Copy)]
 pub enum MessageEditorEvent {
     Send,
     Cancel,
+    Focus,
 }
 
 impl EventEmitter<MessageEditorEvent> for MessageEditor {}
@@ -101,6 +103,11 @@ impl MessageEditor {
             editor
         });
 
+        cx.on_focus(&editor.focus_handle(cx), window, |_, _, cx| {
+            cx.emit(MessageEditorEvent::Focus)
+        })
+        .detach();
+
         Self {
             editor,
             project,
@@ -386,11 +393,11 @@ impl MessageEditor {
         });
     }
 
-    fn chat(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
+    fn send(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
         cx.emit(MessageEditorEvent::Send)
     }
 
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
+    fn cancel(&mut self, _: &editor::actions::Cancel, _: &mut Window, cx: &mut Context<Self>) {
         cx.emit(MessageEditorEvent::Cancel)
     }
 
@@ -496,6 +503,13 @@ impl MessageEditor {
         }
     }
 
+    pub fn set_read_only(&mut self, read_only: bool, cx: &mut Context<Self>) {
+        self.editor.update(cx, |message_editor, cx| {
+            message_editor.set_read_only(read_only);
+            cx.notify()
+        })
+    }
+
     fn insert_image(
         &mut self,
         excerpt_id: ExcerptId,
@@ -572,6 +586,8 @@ impl MessageEditor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        self.clear(window, cx);
+
         let mut text = String::new();
         let mut mentions = Vec::new();
         let mut images = Vec::new();
@@ -609,7 +625,6 @@ impl MessageEditor {
             editor.buffer().read(cx).snapshot(cx)
         });
 
-        self.mention_set.clear();
         for (range, mention_uri) in mentions {
             let anchor = snapshot.anchor_before(range.start);
             let crease_id = crate::context_picker::insert_crease_for_mention(
@@ -679,6 +694,11 @@ impl MessageEditor {
             editor.set_text(text, window, cx);
         });
     }
+
+    #[cfg(test)]
+    pub fn text(&self, cx: &App) -> String {
+        self.editor.read(cx).text(cx)
+    }
 }
 
 impl Focusable for MessageEditor {
@@ -691,7 +711,7 @@ impl Render for MessageEditor {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         div()
             .key_context("MessageEditor")
-            .on_action(cx.listener(Self::chat))
+            .on_action(cx.listener(Self::send))
             .on_action(cx.listener(Self::cancel))
             .capture_action(cx.listener(Self::paste))
             .flex_1()
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index cb1a62fd11..17341e4c8a 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -45,6 +45,7 @@ use zed_actions::assistant::OpenRulesLibrary;
 
 use super::entry_view_state::EntryViewState;
 use crate::acp::AcpModelSelectorPopover;
+use crate::acp::entry_view_state::{EntryViewEvent, ViewEvent};
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
 use crate::profile_selector::{ProfileProvider, ProfileSelector};
@@ -101,10 +102,8 @@ pub struct AcpThreadView {
     agent: Rc<dyn AgentServer>,
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
-    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
     thread_state: ThreadState,
-    entry_view_state: EntryViewState,
+    entry_view_state: Entity<EntryViewState>,
     message_editor: Entity<MessageEditor>,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
     profile_selector: Option<Entity<ProfileSelector>>,
@@ -120,16 +119,9 @@ pub struct AcpThreadView {
     plan_expanded: bool,
     editor_expanded: bool,
     terminal_expanded: bool,
-    editing_message: Option<EditingMessage>,
+    editing_message: Option<usize>,
     _cancel_task: Option<Task<()>>,
-    _subscriptions: [Subscription; 2],
-}
-
-struct EditingMessage {
-    index: usize,
-    message_id: UserMessageId,
-    editor: Entity<MessageEditor>,
-    _subscription: Subscription,
+    _subscriptions: [Subscription; 3],
 }
 
 enum ThreadState {
@@ -176,24 +168,32 @@ impl AcpThreadView {
 
         let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0));
 
+        let entry_view_state = cx.new(|_| {
+            EntryViewState::new(
+                workspace.clone(),
+                project.clone(),
+                thread_store.clone(),
+                text_thread_store.clone(),
+            )
+        });
+
         let subscriptions = [
             cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-            cx.subscribe_in(&message_editor, window, Self::on_message_editor_event),
+            cx.subscribe_in(&message_editor, window, Self::handle_message_editor_event),
+            cx.subscribe_in(&entry_view_state, window, Self::handle_entry_view_event),
         ];
 
         Self {
             agent: agent.clone(),
             workspace: workspace.clone(),
             project: project.clone(),
-            thread_store,
-            text_thread_store,
+            entry_view_state,
             thread_state: Self::initial_state(agent, workspace, project, window, cx),
             message_editor,
             model_selector: None,
             profile_selector: None,
             notifications: Vec::new(),
             notification_subscriptions: HashMap::default(),
-            entry_view_state: EntryViewState::default(),
             list_state: list_state.clone(),
             scrollbar_state: ScrollbarState::new(list_state).parent_entity(&cx.entity()),
             thread_error: None,
@@ -414,7 +414,7 @@ impl AcpThreadView {
         cx.notify();
     }
 
-    pub fn on_message_editor_event(
+    pub fn handle_message_editor_event(
         &mut self,
         _: &Entity<MessageEditor>,
         event: &MessageEditorEvent,
@@ -424,6 +424,28 @@ impl AcpThreadView {
         match event {
             MessageEditorEvent::Send => self.send(window, cx),
             MessageEditorEvent::Cancel => self.cancel_generation(cx),
+            MessageEditorEvent::Focus => {}
+        }
+    }
+
+    pub fn handle_entry_view_event(
+        &mut self,
+        _: &Entity<EntryViewState>,
+        event: &EntryViewEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match &event.view_event {
+            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
+                self.editing_message = Some(event.entry_index);
+                cx.notify();
+            }
+            ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::Send) => {
+                self.regenerate(event.entry_index, editor, window, cx);
+            }
+            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Cancel) => {
+                self.cancel_editing(&Default::default(), window, cx);
+            }
         }
     }
 
@@ -494,27 +516,56 @@ impl AcpThreadView {
         .detach();
     }
 
-    fn cancel_editing(&mut self, _: &ClickEvent, _window: &mut Window, cx: &mut Context<Self>) {
-        self.editing_message.take();
-        cx.notify();
-    }
-
-    fn regenerate(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(editing_message) = self.editing_message.take() else {
-            return;
-        };
-
+    fn cancel_editing(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
         let Some(thread) = self.thread().cloned() else {
             return;
         };
 
-        let rewind = thread.update(cx, |thread, cx| {
-            thread.rewind(editing_message.message_id, cx)
-        });
+        if let Some(index) = self.editing_message.take() {
+            if let Some(editor) = self
+                .entry_view_state
+                .read(cx)
+                .entry(index)
+                .and_then(|e| e.message_editor())
+                .cloned()
+            {
+                editor.update(cx, |editor, cx| {
+                    if let Some(user_message) = thread
+                        .read(cx)
+                        .entries()
+                        .get(index)
+                        .and_then(|e| e.user_message())
+                    {
+                        editor.set_message(user_message.chunks.clone(), window, cx);
+                    }
+                })
+            }
+        };
+        self.focus_handle(cx).focus(window);
+        cx.notify();
+    }
+
+    fn regenerate(
+        &mut self,
+        entry_ix: usize,
+        message_editor: &Entity<MessageEditor>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(thread) = self.thread().cloned() else {
+            return;
+        };
+
+        let Some(rewind) = thread.update(cx, |thread, cx| {
+            let user_message_id = thread.entries().get(entry_ix)?.user_message()?.id.clone()?;
+            Some(thread.rewind(user_message_id, cx))
+        }) else {
+            return;
+        };
+
+        let contents =
+            message_editor.update(cx, |message_editor, cx| message_editor.contents(window, cx));
 
-        let contents = editing_message
-            .editor
-            .update(cx, |message_editor, cx| message_editor.contents(window, cx));
         let task = cx.foreground_executor().spawn(async move {
             rewind.await?;
             contents.await
@@ -570,27 +621,20 @@ impl AcpThreadView {
             AcpThreadEvent::NewEntry => {
                 let len = thread.read(cx).entries().len();
                 let index = len - 1;
-                self.entry_view_state.sync_entry(
-                    self.workspace.clone(),
-                    thread.clone(),
-                    index,
-                    window,
-                    cx,
-                );
+                self.entry_view_state.update(cx, |view_state, cx| {
+                    view_state.sync_entry(index, &thread, window, cx)
+                });
                 self.list_state.splice(index..index, 1);
             }
             AcpThreadEvent::EntryUpdated(index) => {
-                self.entry_view_state.sync_entry(
-                    self.workspace.clone(),
-                    thread.clone(),
-                    *index,
-                    window,
-                    cx,
-                );
+                self.entry_view_state.update(cx, |view_state, cx| {
+                    view_state.sync_entry(*index, &thread, window, cx)
+                });
                 self.list_state.splice(*index..index + 1, 1);
             }
             AcpThreadEvent::EntriesRemoved(range) => {
-                self.entry_view_state.remove(range.clone());
+                self.entry_view_state
+                    .update(cx, |view_state, _cx| view_state.remove(range.clone()));
                 self.list_state.splice(range.clone(), 0);
             }
             AcpThreadEvent::ToolAuthorizationRequired => {
@@ -722,29 +766,15 @@ impl AcpThreadView {
                         .border_1()
                         .border_color(cx.theme().colors().border)
                         .text_xs()
-                        .id("message")
-                        .on_click(cx.listener({
-                            move |this, _, window, cx| {
-                                this.start_editing_message(entry_ix, window, cx)
-                            }
-                        }))
                         .children(
-                            if let Some(editing) = self.editing_message.as_ref()
-                                && Some(&editing.message_id) == message.id.as_ref()
-                            {
-                                Some(
-                                    self.render_edit_message_editor(editing, cx)
-                                        .into_any_element(),
-                                )
-                            } else {
-                                message.content.markdown().map(|md| {
-                                    self.render_markdown(
-                                        md.clone(),
-                                        user_message_markdown_style(window, cx),
-                                    )
-                                    .into_any_element()
-                                })
-                            },
+                            self.entry_view_state
+                                .read(cx)
+                                .entry(entry_ix)
+                                .and_then(|entry| entry.message_editor())
+                                .map(|editor| {
+                                    self.render_sent_message_editor(entry_ix, editor, cx)
+                                        .into_any_element()
+                                }),
                         ),
                 )
                 .into_any(),
@@ -819,8 +849,8 @@ impl AcpThreadView {
             primary
         };
 
-        if let Some(editing) = self.editing_message.as_ref()
-            && editing.index < entry_ix
+        if let Some(editing_index) = self.editing_message.as_ref()
+            && *editing_index < entry_ix
         {
             let backdrop = div()
                 .id(("backdrop", entry_ix))
@@ -834,8 +864,8 @@ impl AcpThreadView {
 
             div()
                 .relative()
-                .child(backdrop)
                 .child(primary)
+                .child(backdrop)
                 .into_any_element()
         } else {
             primary
@@ -1256,9 +1286,7 @@ impl AcpThreadView {
                     Empty.into_any_element()
                 }
             }
-            ToolCallContent::Diff(diff) => {
-                self.render_diff_editor(entry_ix, &diff.read(cx).multibuffer(), cx)
-            }
+            ToolCallContent::Diff(diff) => self.render_diff_editor(entry_ix, &diff, cx),
             ToolCallContent::Terminal(terminal) => {
                 self.render_terminal_tool_call(entry_ix, terminal, tool_call, window, cx)
             }
@@ -1405,7 +1433,7 @@ impl AcpThreadView {
     fn render_diff_editor(
         &self,
         entry_ix: usize,
-        multibuffer: &Entity<MultiBuffer>,
+        diff: &Entity<acp_thread::Diff>,
         cx: &Context<Self>,
     ) -> AnyElement {
         v_flex()
@@ -1413,8 +1441,8 @@ impl AcpThreadView {
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
             .child(
-                if let Some(entry) = self.entry_view_state.entry(entry_ix)
-                    && let Some(editor) = entry.editor_for_diff(&multibuffer)
+                if let Some(entry) = self.entry_view_state.read(cx).entry(entry_ix)
+                    && let Some(editor) = entry.editor_for_diff(&diff)
                 {
                     editor.clone().into_any_element()
                 } else {
@@ -1617,6 +1645,7 @@ impl AcpThreadView {
 
         let terminal_view = self
             .entry_view_state
+            .read(cx)
             .entry(entry_ix)
             .and_then(|entry| entry.terminal(&terminal));
         let show_output = self.terminal_expanded && terminal_view.is_some();
@@ -2485,82 +2514,38 @@ impl AcpThreadView {
         )
     }
 
-    fn start_editing_message(&mut self, index: usize, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-        let Some(AgentThreadEntry::UserMessage(message)) = thread.read(cx).entries().get(index)
-        else {
-            return;
-        };
-        let Some(message_id) = message.id.clone() else {
-            return;
-        };
-
-        self.list_state.scroll_to_reveal_item(index);
-
-        let chunks = message.chunks.clone();
-        let editor = cx.new(|cx| {
-            let mut editor = MessageEditor::new(
-                self.workspace.clone(),
-                self.project.clone(),
-                self.thread_store.clone(),
-                self.text_thread_store.clone(),
-                editor::EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: None,
-                },
-                window,
-                cx,
-            );
-            editor.set_message(chunks, window, cx);
-            editor
-        });
-        let subscription =
-            cx.subscribe_in(&editor, window, |this, _, event, window, cx| match event {
-                MessageEditorEvent::Send => {
-                    this.regenerate(&Default::default(), window, cx);
-                }
-                MessageEditorEvent::Cancel => {
-                    this.cancel_editing(&Default::default(), window, cx);
-                }
-            });
-        editor.focus_handle(cx).focus(window);
-
-        self.editing_message.replace(EditingMessage {
-            index: index,
-            message_id: message_id.clone(),
-            editor,
-            _subscription: subscription,
-        });
-        cx.notify();
-    }
-
-    fn render_edit_message_editor(&self, editing: &EditingMessage, cx: &Context<Self>) -> Div {
-        v_flex()
-            .w_full()
-            .gap_2()
-            .child(editing.editor.clone())
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::new(IconName::Warning)
-                            .color(Color::Warning)
-                            .size(IconSize::XSmall),
-                    )
-                    .child(
-                        Label::new("Editing will restart the thread from this point.")
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall),
-                    )
-                    .child(self.render_editing_message_editor_buttons(editing, cx)),
-            )
-    }
-
-    fn render_editing_message_editor_buttons(
+    fn render_sent_message_editor(
         &self,
-        editing: &EditingMessage,
+        entry_ix: usize,
+        editor: &Entity<MessageEditor>,
+        cx: &Context<Self>,
+    ) -> Div {
+        v_flex().w_full().gap_2().child(editor.clone()).when(
+            self.editing_message == Some(entry_ix),
+            |el| {
+                el.child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Icon::new(IconName::Warning)
+                                .color(Color::Warning)
+                                .size(IconSize::XSmall),
+                        )
+                        .child(
+                            Label::new("Editing will restart the thread from this point.")
+                                .color(Color::Muted)
+                                .size(LabelSize::XSmall),
+                        )
+                        .child(self.render_sent_message_editor_buttons(entry_ix, editor, cx)),
+                )
+            },
+        )
+    }
+
+    fn render_sent_message_editor_buttons(
+        &self,
+        entry_ix: usize,
+        editor: &Entity<MessageEditor>,
         cx: &Context<Self>,
     ) -> Div {
         h_flex()
@@ -2573,7 +2558,7 @@ impl AcpThreadView {
                     .icon_color(Color::Error)
                     .icon_size(IconSize::Small)
                     .tooltip({
-                        let focus_handle = editing.editor.focus_handle(cx);
+                        let focus_handle = editor.focus_handle(cx);
                         move |window, cx| {
                             Tooltip::for_action_in(
                                 "Cancel Edit",
@@ -2588,12 +2573,12 @@ impl AcpThreadView {
             )
             .child(
                 IconButton::new("confirm-edit-message", IconName::Return)
-                    .disabled(editing.editor.read(cx).is_empty(cx))
+                    .disabled(editor.read(cx).is_empty(cx))
                     .shape(ui::IconButtonShape::Square)
                     .icon_color(Color::Muted)
                     .icon_size(IconSize::Small)
                     .tooltip({
-                        let focus_handle = editing.editor.focus_handle(cx);
+                        let focus_handle = editor.focus_handle(cx);
                         move |window, cx| {
                             Tooltip::for_action_in(
                                 "Regenerate",
@@ -2604,7 +2589,12 @@ impl AcpThreadView {
                             )
                         }
                     })
-                    .on_click(cx.listener(Self::regenerate)),
+                    .on_click(cx.listener({
+                        let editor = editor.clone();
+                        move |this, _, window, cx| {
+                            this.regenerate(entry_ix, &editor, window, cx);
+                        }
+                    })),
             )
     }
 
@@ -3137,7 +3127,9 @@ impl AcpThreadView {
     }
 
     fn settings_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.entry_view_state.settings_changed(cx);
+        self.entry_view_state.update(cx, |entry_view_state, cx| {
+            entry_view_state.settings_changed(cx);
+        });
     }
 
     pub(crate) fn insert_dragged_files(
@@ -3152,9 +3144,7 @@ impl AcpThreadView {
             drop(added_worktrees);
         })
     }
-}
 
-impl AcpThreadView {
     fn render_thread_error(&self, window: &mut Window, cx: &mut Context<'_, Self>) -> Option<Div> {
         let content = match self.thread_error.as_ref()? {
             ThreadError::Other(error) => self.render_any_thread_error(error.clone(), cx),
@@ -3439,35 +3429,6 @@ impl Render for AcpThreadView {
     }
 }
 
-fn user_message_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let mut style = default_markdown_style(false, window, cx);
-    let mut text_style = window.text_style();
-    let theme_settings = ThemeSettings::get_global(cx);
-
-    let buffer_font = theme_settings.buffer_font.family.clone();
-    let buffer_font_size = TextSize::Small.rems(cx);
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(buffer_font),
-        font_size: Some(buffer_font_size.into()),
-        ..Default::default()
-    });
-
-    style.base_text_style = text_style;
-    style.link_callback = Some(Rc::new(move |url, cx| {
-        if MentionUri::parse(url).is_ok() {
-            let colors = cx.theme().colors();
-            Some(TextStyleRefinement {
-                background_color: Some(colors.element_background),
-                ..Default::default()
-            })
-        } else {
-            None
-        }
-    }));
-    style
-}
-
 fn default_markdown_style(buffer_font: bool, window: &Window, cx: &App) -> MarkdownStyle {
     let theme_settings = ThemeSettings::get_global(cx);
     let colors = cx.theme().colors();
@@ -3626,12 +3587,13 @@ pub(crate) mod tests {
     use agent_client_protocol::SessionId;
     use editor::EditorSettings;
     use fs::FakeFs;
-    use gpui::{SemanticVersion, TestAppContext, VisualTestContext};
+    use gpui::{EventEmitter, SemanticVersion, TestAppContext, VisualTestContext};
     use project::Project;
     use serde_json::json;
     use settings::SettingsStore;
     use std::any::Any;
     use std::path::Path;
+    use workspace::Item;
 
     use super::*;
 
@@ -3778,6 +3740,50 @@ pub(crate) mod tests {
         (thread_view, cx)
     }
 
+    fn add_to_workspace(thread_view: Entity<AcpThreadView>, cx: &mut VisualTestContext) {
+        let workspace = thread_view.read_with(cx, |thread_view, _cx| thread_view.workspace.clone());
+
+        workspace
+            .update_in(cx, |workspace, window, cx| {
+                workspace.add_item_to_active_pane(
+                    Box::new(cx.new(|_| ThreadViewItem(thread_view.clone()))),
+                    None,
+                    true,
+                    window,
+                    cx,
+                );
+            })
+            .unwrap();
+    }
+
+    struct ThreadViewItem(Entity<AcpThreadView>);
+
+    impl Item for ThreadViewItem {
+        type Event = ();
+
+        fn include_in_nav_history() -> bool {
+            false
+        }
+
+        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+            "Test".into()
+        }
+    }
+
+    impl EventEmitter<()> for ThreadViewItem {}
+
+    impl Focusable for ThreadViewItem {
+        fn focus_handle(&self, cx: &App) -> FocusHandle {
+            self.0.read(cx).focus_handle(cx).clone()
+        }
+    }
+
+    impl Render for ThreadViewItem {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            self.0.clone().into_any_element()
+        }
+    }
+
     struct StubAgentServer<C> {
         connection: C,
     }
@@ -3799,19 +3805,19 @@ pub(crate) mod tests {
         C: 'static + AgentConnection + Send + Clone,
     {
         fn logo(&self) -> ui::IconName {
-            unimplemented!()
+            ui::IconName::Ai
         }
 
         fn name(&self) -> &'static str {
-            unimplemented!()
+            "Test"
         }
 
         fn empty_state_headline(&self) -> &'static str {
-            unimplemented!()
+            "Test"
         }
 
         fn empty_state_message(&self) -> &'static str {
-            unimplemented!()
+            "Test"
         }
 
         fn connect(
@@ -3960,9 +3966,17 @@ pub(crate) mod tests {
             assert_eq!(thread.entries().len(), 2);
         });
 
-        thread_view.read_with(cx, |view, _| {
-            assert_eq!(view.entry_view_state.entry(0).unwrap().len(), 0);
-            assert_eq!(view.entry_view_state.entry(1).unwrap().len(), 1);
+        thread_view.read_with(cx, |view, cx| {
+            view.entry_view_state.read_with(cx, |entry_view_state, _| {
+                assert!(
+                    entry_view_state
+                        .entry(0)
+                        .unwrap()
+                        .message_editor()
+                        .is_some()
+                );
+                assert!(entry_view_state.entry(1).unwrap().has_content());
+            });
         });
 
         // Second user message
@@ -3991,18 +4005,31 @@ pub(crate) mod tests {
 
         let second_user_message_id = thread.read_with(cx, |thread, _| {
             assert_eq!(thread.entries().len(), 4);
-            let AgentThreadEntry::UserMessage(user_message) = thread.entries().get(2).unwrap()
-            else {
+            let AgentThreadEntry::UserMessage(user_message) = &thread.entries()[2] else {
                 panic!();
             };
             user_message.id.clone().unwrap()
         });
 
-        thread_view.read_with(cx, |view, _| {
-            assert_eq!(view.entry_view_state.entry(0).unwrap().len(), 0);
-            assert_eq!(view.entry_view_state.entry(1).unwrap().len(), 1);
-            assert_eq!(view.entry_view_state.entry(2).unwrap().len(), 0);
-            assert_eq!(view.entry_view_state.entry(3).unwrap().len(), 1);
+        thread_view.read_with(cx, |view, cx| {
+            view.entry_view_state.read_with(cx, |entry_view_state, _| {
+                assert!(
+                    entry_view_state
+                        .entry(0)
+                        .unwrap()
+                        .message_editor()
+                        .is_some()
+                );
+                assert!(entry_view_state.entry(1).unwrap().has_content());
+                assert!(
+                    entry_view_state
+                        .entry(2)
+                        .unwrap()
+                        .message_editor()
+                        .is_some()
+                );
+                assert!(entry_view_state.entry(3).unwrap().has_content());
+            });
         });
 
         // Rewind to first message
@@ -4017,13 +4044,169 @@ pub(crate) mod tests {
             assert_eq!(thread.entries().len(), 2);
         });
 
-        thread_view.read_with(cx, |view, _| {
-            assert_eq!(view.entry_view_state.entry(0).unwrap().len(), 0);
-            assert_eq!(view.entry_view_state.entry(1).unwrap().len(), 1);
+        thread_view.read_with(cx, |view, cx| {
+            view.entry_view_state.read_with(cx, |entry_view_state, _| {
+                assert!(
+                    entry_view_state
+                        .entry(0)
+                        .unwrap()
+                        .message_editor()
+                        .is_some()
+                );
+                assert!(entry_view_state.entry(1).unwrap().has_content());
 
-            // Old views should be dropped
-            assert!(view.entry_view_state.entry(2).is_none());
-            assert!(view.entry_view_state.entry(3).is_none());
+                // Old views should be dropped
+                assert!(entry_view_state.entry(2).is_none());
+                assert!(entry_view_state.entry(3).is_none());
+            });
         });
     }
+
+    #[gpui::test]
+    async fn test_message_editing_cancel(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+
+        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk {
+            content: acp::ContentBlock::Text(acp::TextContent {
+                text: "Response".into(),
+                annotations: None,
+            }),
+        }]);
+
+        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
+        add_to_workspace(thread_view.clone(), cx);
+
+        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Original message to edit", window, cx);
+        });
+        thread_view.update_in(cx, |thread_view, window, cx| {
+            thread_view.send(window, cx);
+        });
+
+        cx.run_until_parked();
+
+        let user_message_editor = thread_view.read_with(cx, |view, cx| {
+            assert_eq!(view.editing_message, None);
+
+            view.entry_view_state
+                .read(cx)
+                .entry(0)
+                .unwrap()
+                .message_editor()
+                .unwrap()
+                .clone()
+        });
+
+        // Focus
+        cx.focus(&user_message_editor);
+        thread_view.read_with(cx, |view, _cx| {
+            assert_eq!(view.editing_message, Some(0));
+        });
+
+        // Edit
+        user_message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Edited message content", window, cx);
+        });
+
+        // Cancel
+        user_message_editor.update_in(cx, |_editor, window, cx| {
+            window.dispatch_action(Box::new(editor::actions::Cancel), cx);
+        });
+
+        thread_view.read_with(cx, |view, _cx| {
+            assert_eq!(view.editing_message, None);
+        });
+
+        user_message_editor.read_with(cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Original message to edit");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_message_editing_regenerate(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+
+        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk {
+            content: acp::ContentBlock::Text(acp::TextContent {
+                text: "Response".into(),
+                annotations: None,
+            }),
+        }]);
+
+        let (thread_view, cx) =
+            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
+        add_to_workspace(thread_view.clone(), cx);
+
+        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Original message to edit", window, cx);
+        });
+        thread_view.update_in(cx, |thread_view, window, cx| {
+            thread_view.send(window, cx);
+        });
+
+        cx.run_until_parked();
+
+        let user_message_editor = thread_view.read_with(cx, |view, cx| {
+            assert_eq!(view.editing_message, None);
+            assert_eq!(view.thread().unwrap().read(cx).entries().len(), 2);
+
+            view.entry_view_state
+                .read(cx)
+                .entry(0)
+                .unwrap()
+                .message_editor()
+                .unwrap()
+                .clone()
+        });
+
+        // Focus
+        cx.focus(&user_message_editor);
+
+        // Edit
+        user_message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Edited message content", window, cx);
+        });
+
+        // Send
+        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk {
+            content: acp::ContentBlock::Text(acp::TextContent {
+                text: "New Response".into(),
+                annotations: None,
+            }),
+        }]);
+
+        user_message_editor.update_in(cx, |_editor, window, cx| {
+            window.dispatch_action(Box::new(Chat), cx);
+        });
+
+        cx.run_until_parked();
+
+        thread_view.read_with(cx, |view, cx| {
+            assert_eq!(view.editing_message, None);
+
+            let entries = view.thread().unwrap().read(cx).entries();
+            assert_eq!(entries.len(), 2);
+            assert_eq!(
+                entries[0].to_markdown(cx),
+                "## User\n\nEdited message content\n\n"
+            );
+            assert_eq!(
+                entries[1].to_markdown(cx),
+                "## Assistant\n\nNew Response\n\n"
+            );
+
+            let new_editor = view.entry_view_state.read_with(cx, |state, _cx| {
+                assert!(!state.entry(1).unwrap().has_content());
+                state.entry(0).unwrap().message_editor().unwrap().clone()
+            });
+
+            assert_eq!(new_editor.read(cx).text(cx), "Edited message content");
+        })
+    }
 }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 73915195f5..519f7980ff 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -818,12 +818,10 @@ impl AgentPanel {
             ActiveView::Thread { thread, .. } => {
                 thread.update(cx, |thread, cx| thread.cancel_last_completion(window, cx));
             }
-            ActiveView::ExternalAgentThread { thread_view, .. } => {
-                thread_view.update(cx, |thread_element, cx| {
-                    thread_element.cancel_generation(cx)
-                });
-            }
-            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {}
+            ActiveView::ExternalAgentThread { .. }
+            | ActiveView::TextThread { .. }
+            | ActiveView::History
+            | ActiveView::Configuration => {}
         }
     }
 

From f3654036189ba5ca414f9827aee52c0a9f7e95d9 Mon Sep 17 00:00:00 2001
From: Yang Gang <yanggang.uefi@gmail.com>
Date: Sat, 16 Aug 2025 05:03:50 +0800
Subject: [PATCH 074/823] agent: Update use_modifier_to_send behavior
 description for Windows (#36230)

Release Notes:

- N/A

Signed-off-by: Yang Gang <yanggang.uefi@gmail.com>
---
 crates/agent_settings/src/agent_settings.rs | 2 +-
 crates/agent_ui/src/agent_configuration.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index d9557c5d00..fd38ba1f7f 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -309,7 +309,7 @@ pub struct AgentSettingsContent {
     ///
     /// Default: true
     expand_terminal_card: Option<bool>,
-    /// Whether to always use cmd-enter (or ctrl-enter on Linux) to send messages in the agent panel.
+    /// Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages in the agent panel.
     ///
     /// Default: false
     use_modifier_to_send: Option<bool>,
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 5f72fa58c8..96558f1bea 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -465,7 +465,7 @@ impl AgentConfiguration {
             "modifier-send",
             "Use modifier to submit a message",
             Some(
-                "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux) required to send messages.".into(),
+                "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux or Windows) required to send messages.".into(),
             ),
             use_modifier_to_send,
             move |state, _window, cx| {

From 3d77ad7e1a8a7afe068aac600d2ab56225fe1fed Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 15 Aug 2025 17:39:33 -0400
Subject: [PATCH 075/823] thread_view: Start loading images as soon as they're
 added (#36276)

Release Notes:

- N/A
---
 .../agent_ui/src/acp/completion_provider.rs   | 129 +++-------
 crates/agent_ui/src/acp/message_editor.rs     | 229 +++++++++++-------
 2 files changed, 176 insertions(+), 182 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index d7d2cd5d0e..1a9861d13a 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,20 +1,17 @@
-use std::ffi::OsStr;
 use std::ops::Range;
-use std::path::Path;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
 use acp_thread::MentionUri;
 use anyhow::{Context as _, Result, anyhow};
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use editor::display_map::CreaseId;
 use editor::{CompletionProvider, Editor, ExcerptId};
 use futures::future::{Shared, try_join_all};
 use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{App, Entity, ImageFormat, Img, Task, WeakEntity};
-use http_client::HttpClientWithUrl;
+use gpui::{App, Entity, ImageFormat, Task, WeakEntity};
 use language::{Buffer, CodeLabel, HighlightId};
-use language_model::LanguageModelImage;
 use lsp::CompletionContext;
 use project::{
     Completion, CompletionIntent, CompletionResponse, Project, ProjectPath, Symbol, WorktreeId,
@@ -43,7 +40,7 @@ use crate::context_picker::{
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct MentionImage {
-    pub abs_path: Option<Arc<Path>>,
+    pub abs_path: Option<PathBuf>,
     pub data: SharedString,
     pub format: ImageFormat,
 }
@@ -88,6 +85,8 @@ impl MentionSet {
         window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, Mention>>> {
+        let mut processed_image_creases = HashSet::default();
+
         let mut contents = self
             .uri_by_crease_id
             .iter()
@@ -97,59 +96,27 @@ impl MentionSet {
                         // TODO directories
                         let uri = uri.clone();
                         let abs_path = abs_path.to_path_buf();
-                        let extension = abs_path.extension().and_then(OsStr::to_str).unwrap_or("");
 
-                        if Img::extensions().contains(&extension) && !extension.contains("svg") {
-                            let open_image_task = project.update(cx, |project, cx| {
-                                let path = project
-                                    .find_project_path(&abs_path, cx)
-                                    .context("Failed to find project path")?;
-                                anyhow::Ok(project.open_image(path, cx))
+                        if let Some(task) = self.images.get(&crease_id).cloned() {
+                            processed_image_creases.insert(crease_id);
+                            return cx.spawn(async move |_| {
+                                let image = task.await.map_err(|e| anyhow!("{e}"))?;
+                                anyhow::Ok((crease_id, Mention::Image(image)))
                             });
-
-                            cx.spawn(async move |cx| {
-                                let image_item = open_image_task?.await?;
-                                let (data, format) = image_item.update(cx, |image_item, cx| {
-                                    let format = image_item.image.format;
-                                    (
-                                        LanguageModelImage::from_image(
-                                            image_item.image.clone(),
-                                            cx,
-                                        ),
-                                        format,
-                                    )
-                                })?;
-                                let data = cx.spawn(async move |_| {
-                                    if let Some(data) = data.await {
-                                        Ok(data.source)
-                                    } else {
-                                        anyhow::bail!("Failed to convert image")
-                                    }
-                                });
-
-                                anyhow::Ok((
-                                    crease_id,
-                                    Mention::Image(MentionImage {
-                                        abs_path: Some(abs_path.as_path().into()),
-                                        data: data.await?,
-                                        format,
-                                    }),
-                                ))
-                            })
-                        } else {
-                            let buffer_task = project.update(cx, |project, cx| {
-                                let path = project
-                                    .find_project_path(abs_path, cx)
-                                    .context("Failed to find project path")?;
-                                anyhow::Ok(project.open_buffer(path, cx))
-                            });
-                            cx.spawn(async move |cx| {
-                                let buffer = buffer_task?.await?;
-                                let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
-
-                                anyhow::Ok((crease_id, Mention::Text { uri, content }))
-                            })
                         }
+
+                        let buffer_task = project.update(cx, |project, cx| {
+                            let path = project
+                                .find_project_path(abs_path, cx)
+                                .context("Failed to find project path")?;
+                            anyhow::Ok(project.open_buffer(path, cx))
+                        });
+                        cx.spawn(async move |cx| {
+                            let buffer = buffer_task?.await?;
+                            let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+
+                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                        })
                     }
                     MentionUri::Symbol {
                         path, line_range, ..
@@ -243,15 +210,19 @@ impl MentionSet {
             })
             .collect::<Vec<_>>();
 
-        contents.extend(self.images.iter().map(|(crease_id, image)| {
+        // Handle images that didn't have a mention URI (because they were added by the paste handler).
+        contents.extend(self.images.iter().filter_map(|(crease_id, image)| {
+            if processed_image_creases.contains(crease_id) {
+                return None;
+            }
             let crease_id = *crease_id;
             let image = image.clone();
-            cx.spawn(async move |_| {
+            Some(cx.spawn(async move |_| {
                 Ok((
                     crease_id,
                     Mention::Image(image.await.map_err(|e| anyhow::anyhow!("{e}"))?),
                 ))
-            })
+            }))
         }));
 
         cx.spawn(async move |_cx| {
@@ -753,7 +724,6 @@ impl ContextPickerCompletionProvider {
         source_range: Range<Anchor>,
         url_to_fetch: SharedString,
         message_editor: WeakEntity<MessageEditor>,
-        http_client: Arc<HttpClientWithUrl>,
         cx: &mut App,
     ) -> Option<Completion> {
         let new_text = format!("@fetch {} ", url_to_fetch.clone());
@@ -772,30 +742,13 @@ impl ContextPickerCompletionProvider {
             source: project::CompletionSource::Custom,
             icon_path: Some(icon_path.clone()),
             insert_text_mode: None,
-            confirm: Some({
-                Arc::new(move |_, window, cx| {
-                    let url_to_fetch = url_to_fetch.clone();
-                    let source_range = source_range.clone();
-                    let message_editor = message_editor.clone();
-                    let new_text = new_text.clone();
-                    let http_client = http_client.clone();
-                    window.defer(cx, move |window, cx| {
-                        message_editor
-                            .update(cx, |message_editor, cx| {
-                                message_editor.confirm_mention_for_fetch(
-                                    new_text,
-                                    source_range,
-                                    url_to_fetch,
-                                    http_client,
-                                    window,
-                                    cx,
-                                )
-                            })
-                            .ok();
-                    });
-                    false
-                })
-            }),
+            confirm: Some(confirm_completion_callback(
+                url_to_fetch.to_string().into(),
+                source_range.start,
+                new_text.len() - 1,
+                message_editor,
+                mention_uri,
+            )),
         })
     }
 }
@@ -843,7 +796,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         };
 
         let project = workspace.read(cx).project().clone();
-        let http_client = workspace.read(cx).client().http_client();
         let snapshot = buffer.read(cx).snapshot();
         let source_range = snapshot.anchor_before(state.source_range.start)
             ..snapshot.anchor_after(state.source_range.end);
@@ -852,8 +804,8 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         let text_thread_store = self.text_thread_store.clone();
         let editor = self.message_editor.clone();
         let Ok((exclude_paths, exclude_threads)) =
-            self.message_editor.update(cx, |message_editor, cx| {
-                message_editor.mentioned_path_and_threads(cx)
+            self.message_editor.update(cx, |message_editor, _cx| {
+                message_editor.mentioned_path_and_threads()
             })
         else {
             return Task::ready(Ok(Vec::new()));
@@ -942,7 +894,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                             source_range.clone(),
                             url,
                             editor.clone(),
-                            http_client.clone(),
                             cx,
                         ),
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 90827e5514..a4d74db266 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -16,14 +16,14 @@ use editor::{
 use futures::{FutureExt as _, TryFutureExt as _};
 use gpui::{
     AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, Image,
-    ImageFormat, Task, TextStyle, WeakEntity,
+    ImageFormat, Img, Task, TextStyle, WeakEntity,
 };
-use http_client::HttpClientWithUrl;
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
 use project::{CompletionIntent, Project};
 use settings::Settings;
 use std::{
+    ffi::OsStr,
     fmt::Write,
     ops::Range,
     path::{Path, PathBuf},
@@ -48,6 +48,7 @@ pub struct MessageEditor {
     mention_set: MentionSet,
     editor: Entity<Editor>,
     project: Entity<Project>,
+    workspace: WeakEntity<Workspace>,
     thread_store: Entity<ThreadStore>,
     text_thread_store: Entity<TextThreadStore>,
 }
@@ -79,7 +80,7 @@ impl MessageEditor {
             None,
         );
         let completion_provider = ContextPickerCompletionProvider::new(
-            workspace,
+            workspace.clone(),
             thread_store.downgrade(),
             text_thread_store.downgrade(),
             cx.weak_entity(),
@@ -114,6 +115,7 @@ impl MessageEditor {
             mention_set,
             thread_store,
             text_thread_store,
+            workspace,
         }
     }
 
@@ -131,7 +133,7 @@ impl MessageEditor {
         self.editor.read(cx).is_empty(cx)
     }
 
-    pub fn mentioned_path_and_threads(&self, _: &App) -> (HashSet<PathBuf>, HashSet<ThreadId>) {
+    pub fn mentioned_path_and_threads(&self) -> (HashSet<PathBuf>, HashSet<ThreadId>) {
         let mut excluded_paths = HashSet::default();
         let mut excluded_threads = HashSet::default();
 
@@ -165,8 +167,14 @@ impl MessageEditor {
         let Some((excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
             return;
         };
+        let Some(anchor) = snapshot
+            .buffer_snapshot
+            .anchor_in_excerpt(*excerpt_id, start)
+        else {
+            return;
+        };
 
-        if let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
+        let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
             *excerpt_id,
             start,
             content_len,
@@ -175,48 +183,83 @@ impl MessageEditor {
             self.editor.clone(),
             window,
             cx,
-        ) {
-            self.mention_set.insert_uri(crease_id, mention_uri.clone());
-        }
-    }
-
-    pub fn confirm_mention_for_fetch(
-        &mut self,
-        new_text: String,
-        source_range: Range<text::Anchor>,
-        url: url::Url,
-        http_client: Arc<HttpClientWithUrl>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mention_uri = MentionUri::Fetch { url: url.clone() };
-        let icon_path = mention_uri.icon_path(cx);
-
-        let start = source_range.start;
-        let content_len = new_text.len() - 1;
-
-        let snapshot = self
-            .editor
-            .update(cx, |editor, cx| editor.snapshot(window, cx));
-        let Some((&excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
-            return;
-        };
-
-        let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
-            excerpt_id,
-            start,
-            content_len,
-            url.to_string().into(),
-            icon_path,
-            self.editor.clone(),
-            window,
-            cx,
         ) else {
             return;
         };
+        self.mention_set.insert_uri(crease_id, mention_uri.clone());
 
-        let http_client = http_client.clone();
-        let source_range = source_range.clone();
+        match mention_uri {
+            MentionUri::Fetch { url } => {
+                self.confirm_mention_for_fetch(crease_id, anchor, url, window, cx);
+            }
+            MentionUri::File {
+                abs_path,
+                is_directory,
+            } => {
+                self.confirm_mention_for_file(
+                    crease_id,
+                    anchor,
+                    abs_path,
+                    is_directory,
+                    window,
+                    cx,
+                );
+            }
+            MentionUri::Symbol { .. }
+            | MentionUri::Thread { .. }
+            | MentionUri::TextThread { .. }
+            | MentionUri::Rule { .. }
+            | MentionUri::Selection { .. } => {}
+        }
+    }
+
+    fn confirm_mention_for_file(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        abs_path: PathBuf,
+        _is_directory: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let extension = abs_path
+            .extension()
+            .and_then(OsStr::to_str)
+            .unwrap_or_default();
+        let project = self.project.clone();
+        let Some(project_path) = project
+            .read(cx)
+            .project_path_for_absolute_path(&abs_path, cx)
+        else {
+            return;
+        };
+
+        if Img::extensions().contains(&extension) && !extension.contains("svg") {
+            let image = cx.spawn(async move |_, cx| {
+                let image = project
+                    .update(cx, |project, cx| project.open_image(project_path, cx))?
+                    .await?;
+                image.read_with(cx, |image, _cx| image.image.clone())
+            });
+            self.confirm_mention_for_image(crease_id, anchor, Some(abs_path), image, window, cx);
+        }
+    }
+
+    fn confirm_mention_for_fetch(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        url: url::Url,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(http_client) = self
+            .workspace
+            .update(cx, |workspace, _cx| workspace.client().http_client())
+            .ok()
+        else {
+            return;
+        };
 
         let url_string = url.to_string();
         let fetch = cx
@@ -227,22 +270,18 @@ impl MessageEditor {
                     .await
             })
             .shared();
-        self.mention_set.add_fetch_result(url, fetch.clone());
+        self.mention_set
+            .add_fetch_result(url.clone(), fetch.clone());
 
         cx.spawn_in(window, async move |this, cx| {
             let fetch = fetch.await.notify_async_err(cx);
             this.update(cx, |this, cx| {
+                let mention_uri = MentionUri::Fetch { url };
                 if fetch.is_some() {
                     this.mention_set.insert_uri(crease_id, mention_uri.clone());
                 } else {
                     // Remove crease if we failed to fetch
                     this.editor.update(cx, |editor, cx| {
-                        let snapshot = editor.buffer().read(cx).snapshot(cx);
-                        let Some(anchor) =
-                            snapshot.anchor_in_excerpt(excerpt_id, source_range.start)
-                        else {
-                            return;
-                        };
                         editor.display_map.update(cx, |display_map, cx| {
                             display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
                         });
@@ -424,27 +463,46 @@ impl MessageEditor {
 
         let replacement_text = "image";
         for image in images {
-            let (excerpt_id, anchor) = self.editor.update(cx, |message_editor, cx| {
-                let snapshot = message_editor.snapshot(window, cx);
-                let (excerpt_id, _, snapshot) = snapshot.buffer_snapshot.as_singleton().unwrap();
+            let (excerpt_id, text_anchor, multibuffer_anchor) =
+                self.editor.update(cx, |message_editor, cx| {
+                    let snapshot = message_editor.snapshot(window, cx);
+                    let (excerpt_id, _, buffer_snapshot) =
+                        snapshot.buffer_snapshot.as_singleton().unwrap();
 
-                let anchor = snapshot.anchor_before(snapshot.len());
-                message_editor.edit(
-                    [(
-                        multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
-                        format!("{replacement_text} "),
-                    )],
-                    cx,
-                );
-                (*excerpt_id, anchor)
-            });
+                    let text_anchor = buffer_snapshot.anchor_before(buffer_snapshot.len());
+                    let multibuffer_anchor = snapshot
+                        .buffer_snapshot
+                        .anchor_in_excerpt(*excerpt_id, text_anchor);
+                    message_editor.edit(
+                        [(
+                            multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
+                            format!("{replacement_text} "),
+                        )],
+                        cx,
+                    );
+                    (*excerpt_id, text_anchor, multibuffer_anchor)
+                });
 
-            self.insert_image(
+            let content_len = replacement_text.len();
+            let Some(anchor) = multibuffer_anchor else {
+                return;
+            };
+            let Some(crease_id) = insert_crease_for_image(
                 excerpt_id,
+                text_anchor,
+                content_len,
+                None.clone(),
+                self.editor.clone(),
+                window,
+                cx,
+            ) else {
+                return;
+            };
+            self.confirm_mention_for_image(
+                crease_id,
                 anchor,
-                replacement_text.len(),
-                Arc::new(image),
                 None,
+                Task::ready(Ok(Arc::new(image))),
                 window,
                 cx,
             );
@@ -510,34 +568,25 @@ impl MessageEditor {
         })
     }
 
-    fn insert_image(
+    fn confirm_mention_for_image(
         &mut self,
-        excerpt_id: ExcerptId,
-        crease_start: text::Anchor,
-        content_len: usize,
-        image: Arc<Image>,
-        abs_path: Option<Arc<Path>>,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        abs_path: Option<PathBuf>,
+        image: Task<Result<Arc<Image>>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let Some(crease_id) = insert_crease_for_image(
-            excerpt_id,
-            crease_start,
-            content_len,
-            abs_path.clone(),
-            self.editor.clone(),
-            window,
-            cx,
-        ) else {
-            return;
-        };
         self.editor.update(cx, |_editor, cx| {
-            let format = image.format;
-            let convert = LanguageModelImage::from_image(image, cx);
-
             let task = cx
                 .spawn_in(window, async move |editor, cx| {
-                    if let Some(image) = convert.await {
+                    let image = image.await.map_err(|e| e.to_string())?;
+                    let format = image.format;
+                    let image = cx
+                        .update(|_, cx| LanguageModelImage::from_image(image, cx))
+                        .map_err(|e| e.to_string())?
+                        .await;
+                    if let Some(image) = image {
                         Ok(MentionImage {
                             abs_path,
                             data: image.source,
@@ -546,12 +595,6 @@ impl MessageEditor {
                     } else {
                         editor
                             .update(cx, |editor, cx| {
-                                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                                let Some(anchor) =
-                                    snapshot.anchor_in_excerpt(excerpt_id, crease_start)
-                                else {
-                                    return;
-                                };
                                 editor.display_map.update(cx, |display_map, cx| {
                                     display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
                                 });

From f642f7615f876f56b1cb5bad90c9ee2bbf574bf0 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Fri, 15 Aug 2025 16:59:57 -0500
Subject: [PATCH 076/823] keymap_ui: Don't try to parse empty action arguments
 as JSON (#36278)

Closes #ISSUE

Release Notes:

- Keymap Editor: Fixed an issue where leaving the arguments field empty
would result in an error even if arguments were optional
---
 crates/settings_ui/src/keybindings.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 1aaab211aa..b4e871c617 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -2181,6 +2181,7 @@ impl KeybindingEditorModal {
 
         let value = action_arguments
             .as_ref()
+            .filter(|args| !args.is_empty())
             .map(|args| {
                 serde_json::from_str(args).context("Failed to parse action arguments as JSON")
             })

From b9c110e63e02eea44cde2c1e24d6d332e2a6f0ee Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 18:01:41 -0400
Subject: [PATCH 077/823] collab: Remove `GET /users/look_up` endpoint (#36279)

This PR removes the `GET /users/look_up` endpoint from Collab, as it has
been moved to Cloud.

Release Notes:

- N/A
---
 crates/collab/src/api.rs | 101 +--------------------------------------
 1 file changed, 1 insertion(+), 100 deletions(-)

diff --git a/crates/collab/src/api.rs b/crates/collab/src/api.rs
index 143e764eb3..0cc7e2b2e9 100644
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@@ -4,12 +4,7 @@ pub mod extensions;
 pub mod ips_file;
 pub mod slack;
 
-use crate::db::Database;
-use crate::{
-    AppState, Error, Result, auth,
-    db::{User, UserId},
-    rpc,
-};
+use crate::{AppState, Error, Result, auth, db::UserId, rpc};
 use anyhow::Context as _;
 use axum::{
     Extension, Json, Router,
@@ -96,7 +91,6 @@ impl std::fmt::Display for SystemIdHeader {
 
 pub fn routes(rpc_server: Arc<rpc::Server>) -> Router<(), Body> {
     Router::new()
-        .route("/users/look_up", get(look_up_user))
         .route("/users/:id/access_tokens", post(create_access_token))
         .route("/rpc_server_snapshot", get(get_rpc_server_snapshot))
         .merge(contributors::router())
@@ -138,99 +132,6 @@ pub async fn validate_api_token<B>(req: Request<B>, next: Next<B>) -> impl IntoR
     Ok::<_, Error>(next.run(req).await)
 }
 
-#[derive(Debug, Deserialize)]
-struct LookUpUserParams {
-    identifier: String,
-}
-
-#[derive(Debug, Serialize)]
-struct LookUpUserResponse {
-    user: Option<User>,
-}
-
-async fn look_up_user(
-    Query(params): Query<LookUpUserParams>,
-    Extension(app): Extension<Arc<AppState>>,
-) -> Result<Json<LookUpUserResponse>> {
-    let user = resolve_identifier_to_user(&app.db, &params.identifier).await?;
-    let user = if let Some(user) = user {
-        match user {
-            UserOrId::User(user) => Some(user),
-            UserOrId::Id(id) => app.db.get_user_by_id(id).await?,
-        }
-    } else {
-        None
-    };
-
-    Ok(Json(LookUpUserResponse { user }))
-}
-
-enum UserOrId {
-    User(User),
-    Id(UserId),
-}
-
-async fn resolve_identifier_to_user(
-    db: &Arc<Database>,
-    identifier: &str,
-) -> Result<Option<UserOrId>> {
-    if let Some(identifier) = identifier.parse::<i32>().ok() {
-        let user = db.get_user_by_id(UserId(identifier)).await?;
-
-        return Ok(user.map(UserOrId::User));
-    }
-
-    if identifier.starts_with("cus_") {
-        let billing_customer = db
-            .get_billing_customer_by_stripe_customer_id(&identifier)
-            .await?;
-
-        return Ok(billing_customer.map(|billing_customer| UserOrId::Id(billing_customer.user_id)));
-    }
-
-    if identifier.starts_with("sub_") {
-        let billing_subscription = db
-            .get_billing_subscription_by_stripe_subscription_id(&identifier)
-            .await?;
-
-        if let Some(billing_subscription) = billing_subscription {
-            let billing_customer = db
-                .get_billing_customer_by_id(billing_subscription.billing_customer_id)
-                .await?;
-
-            return Ok(
-                billing_customer.map(|billing_customer| UserOrId::Id(billing_customer.user_id))
-            );
-        } else {
-            return Ok(None);
-        }
-    }
-
-    if identifier.contains('@') {
-        let user = db.get_user_by_email(identifier).await?;
-
-        return Ok(user.map(UserOrId::User));
-    }
-
-    if let Some(user) = db.get_user_by_github_login(identifier).await? {
-        return Ok(Some(UserOrId::User(user)));
-    }
-
-    Ok(None)
-}
-
-#[derive(Deserialize, Debug)]
-struct CreateUserParams {
-    github_user_id: i32,
-    github_login: String,
-    email_address: String,
-    email_confirmation_code: Option<String>,
-    #[serde(default)]
-    admin: bool,
-    #[serde(default)]
-    invite_count: i32,
-}
-
 async fn get_rpc_server_snapshot(
     Extension(rpc_server): Extension<Arc<rpc::Server>>,
 ) -> Result<ErasedJson> {

From bf34e185d518f02f032a420f5ed1a59f115b1a9f Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 15 Aug 2025 18:47:36 -0400
Subject: [PATCH 078/823] Move MentionSet to message_editor module (#36281)

This is a more natural place for it than its current home next to the
completion provider.

Release Notes:

- N/A
---
 .../agent_ui/src/acp/completion_provider.rs   | 686 +--------------
 crates/agent_ui/src/acp/message_editor.rs     | 796 ++++++++++++++++--
 2 files changed, 743 insertions(+), 739 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 1a9861d13a..8a413fc91e 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,16 +1,12 @@
 use std::ops::Range;
-use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
 use acp_thread::MentionUri;
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use editor::display_map::CreaseId;
+use anyhow::Result;
 use editor::{CompletionProvider, Editor, ExcerptId};
-use futures::future::{Shared, try_join_all};
 use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{App, Entity, ImageFormat, Task, WeakEntity};
+use gpui::{App, Entity, Task, WeakEntity};
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
 use project::{
@@ -20,7 +16,6 @@ use prompt_store::PromptStore;
 use rope::Point;
 use text::{Anchor, ToPoint as _};
 use ui::prelude::*;
-use url::Url;
 use workspace::Workspace;
 
 use agent::thread_store::{TextThreadStore, ThreadStore};
@@ -38,206 +33,6 @@ use crate::context_picker::{
     available_context_picker_entries, recent_context_picker_entries, selection_ranges,
 };
 
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct MentionImage {
-    pub abs_path: Option<PathBuf>,
-    pub data: SharedString,
-    pub format: ImageFormat,
-}
-
-#[derive(Default)]
-pub struct MentionSet {
-    pub(crate) uri_by_crease_id: HashMap<CreaseId, MentionUri>,
-    fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
-    images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
-}
-
-impl MentionSet {
-    pub fn insert_uri(&mut self, crease_id: CreaseId, uri: MentionUri) {
-        self.uri_by_crease_id.insert(crease_id, uri);
-    }
-
-    pub fn add_fetch_result(&mut self, url: Url, content: Shared<Task<Result<String, String>>>) {
-        self.fetch_results.insert(url, content);
-    }
-
-    pub fn insert_image(
-        &mut self,
-        crease_id: CreaseId,
-        task: Shared<Task<Result<MentionImage, String>>>,
-    ) {
-        self.images.insert(crease_id, task);
-    }
-
-    pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
-        self.fetch_results.clear();
-        self.uri_by_crease_id
-            .drain()
-            .map(|(id, _)| id)
-            .chain(self.images.drain().map(|(id, _)| id))
-    }
-
-    pub fn contents(
-        &self,
-        project: Entity<Project>,
-        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<HashMap<CreaseId, Mention>>> {
-        let mut processed_image_creases = HashSet::default();
-
-        let mut contents = self
-            .uri_by_crease_id
-            .iter()
-            .map(|(&crease_id, uri)| {
-                match uri {
-                    MentionUri::File { abs_path, .. } => {
-                        // TODO directories
-                        let uri = uri.clone();
-                        let abs_path = abs_path.to_path_buf();
-
-                        if let Some(task) = self.images.get(&crease_id).cloned() {
-                            processed_image_creases.insert(crease_id);
-                            return cx.spawn(async move |_| {
-                                let image = task.await.map_err(|e| anyhow!("{e}"))?;
-                                anyhow::Ok((crease_id, Mention::Image(image)))
-                            });
-                        }
-
-                        let buffer_task = project.update(cx, |project, cx| {
-                            let path = project
-                                .find_project_path(abs_path, cx)
-                                .context("Failed to find project path")?;
-                            anyhow::Ok(project.open_buffer(path, cx))
-                        });
-                        cx.spawn(async move |cx| {
-                            let buffer = buffer_task?.await?;
-                            let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
-
-                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
-                        })
-                    }
-                    MentionUri::Symbol {
-                        path, line_range, ..
-                    }
-                    | MentionUri::Selection {
-                        path, line_range, ..
-                    } => {
-                        let uri = uri.clone();
-                        let path_buf = path.clone();
-                        let line_range = line_range.clone();
-
-                        let buffer_task = project.update(cx, |project, cx| {
-                            let path = project
-                                .find_project_path(&path_buf, cx)
-                                .context("Failed to find project path")?;
-                            anyhow::Ok(project.open_buffer(path, cx))
-                        });
-
-                        cx.spawn(async move |cx| {
-                            let buffer = buffer_task?.await?;
-                            let content = buffer.read_with(cx, |buffer, _cx| {
-                                buffer
-                                    .text_for_range(
-                                        Point::new(line_range.start, 0)
-                                            ..Point::new(
-                                                line_range.end,
-                                                buffer.line_len(line_range.end),
-                                            ),
-                                    )
-                                    .collect()
-                            })?;
-
-                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
-                        })
-                    }
-                    MentionUri::Thread { id: thread_id, .. } => {
-                        let open_task = thread_store.update(cx, |thread_store, cx| {
-                            thread_store.open_thread(&thread_id, window, cx)
-                        });
-
-                        let uri = uri.clone();
-                        cx.spawn(async move |cx| {
-                            let thread = open_task.await?;
-                            let content = thread.read_with(cx, |thread, _cx| {
-                                thread.latest_detailed_summary_or_text().to_string()
-                            })?;
-
-                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
-                        })
-                    }
-                    MentionUri::TextThread { path, .. } => {
-                        let context = text_thread_store.update(cx, |text_thread_store, cx| {
-                            text_thread_store.open_local_context(path.as_path().into(), cx)
-                        });
-                        let uri = uri.clone();
-                        cx.spawn(async move |cx| {
-                            let context = context.await?;
-                            let xml = context.update(cx, |context, cx| context.to_xml(cx))?;
-                            anyhow::Ok((crease_id, Mention::Text { uri, content: xml }))
-                        })
-                    }
-                    MentionUri::Rule { id: prompt_id, .. } => {
-                        let Some(prompt_store) = thread_store.read(cx).prompt_store().clone()
-                        else {
-                            return Task::ready(Err(anyhow!("missing prompt store")));
-                        };
-                        let text_task = prompt_store.read(cx).load(*prompt_id, cx);
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            // TODO: report load errors instead of just logging
-                            let text = text_task.await?;
-                            anyhow::Ok((crease_id, Mention::Text { uri, content: text }))
-                        })
-                    }
-                    MentionUri::Fetch { url } => {
-                        let Some(content) = self.fetch_results.get(&url).cloned() else {
-                            return Task::ready(Err(anyhow!("missing fetch result")));
-                        };
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
-                                },
-                            ))
-                        })
-                    }
-                }
-            })
-            .collect::<Vec<_>>();
-
-        // Handle images that didn't have a mention URI (because they were added by the paste handler).
-        contents.extend(self.images.iter().filter_map(|(crease_id, image)| {
-            if processed_image_creases.contains(crease_id) {
-                return None;
-            }
-            let crease_id = *crease_id;
-            let image = image.clone();
-            Some(cx.spawn(async move |_| {
-                Ok((
-                    crease_id,
-                    Mention::Image(image.await.map_err(|e| anyhow::anyhow!("{e}"))?),
-                ))
-            }))
-        }));
-
-        cx.spawn(async move |_cx| {
-            let contents = try_join_all(contents).await?.into_iter().collect();
-            anyhow::Ok(contents)
-        })
-    }
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum Mention {
-    Text { uri: MentionUri, content: String },
-    Image(MentionImage),
-}
-
 pub(crate) enum Match {
     File(FileMatch),
     Symbol(SymbolMatch),
@@ -1044,15 +839,6 @@ impl MentionCompletion {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use editor::{AnchorRangeExt, EditorMode};
-    use gpui::{EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext};
-    use project::{Project, ProjectPath};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use smol::stream::StreamExt as _;
-    use std::{ops::Deref, path::Path};
-    use util::path;
-    use workspace::{AppState, Item};
 
     #[test]
     fn test_mention_completion_parse() {
@@ -1123,472 +909,4 @@ mod tests {
 
         assert_eq!(MentionCompletion::try_parse("test@", 0), None);
     }
-
-    struct MessageEditorItem(Entity<MessageEditor>);
-
-    impl Item for MessageEditorItem {
-        type Event = ();
-
-        fn include_in_nav_history() -> bool {
-            false
-        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
-    }
-
-    impl EventEmitter<()> for MessageEditorItem {}
-
-    impl Focusable for MessageEditorItem {
-        fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx).clone()
-        }
-    }
-
-    impl Render for MessageEditorItem {
-        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-            self.0.clone().into_any_element()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_context_completion_provider(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            language::init(cx);
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-            Project::init_settings(cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "editor": "",
-                    "a": {
-                        "one.txt": "1",
-                        "two.txt": "2",
-                        "three.txt": "3",
-                        "four.txt": "4"
-                    },
-                    "b": {
-                        "five.txt": "5",
-                        "six.txt": "6",
-                        "seven.txt": "7",
-                        "eight.txt": "8",
-                    }
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let worktree = project.update(cx, |project, cx| {
-            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            worktrees.pop().unwrap()
-        });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-
-        let mut cx = VisualTestContext::from_window(*window.deref(), cx);
-
-        let paths = vec![
-            path!("a/one.txt"),
-            path!("a/two.txt"),
-            path!("a/three.txt"),
-            path!("a/four.txt"),
-            path!("b/five.txt"),
-            path!("b/six.txt"),
-            path!("b/seven.txt"),
-            path!("b/eight.txt"),
-        ];
-
-        let mut opened_editors = Vec::new();
-        for path in paths {
-            let buffer = workspace
-                .update_in(&mut cx, |workspace, window, cx| {
-                    workspace.open_path(
-                        ProjectPath {
-                            worktree_id,
-                            path: Path::new(path).into(),
-                        },
-                        None,
-                        false,
-                        window,
-                        cx,
-                    )
-                })
-                .await
-                .unwrap();
-            opened_editors.push(buffer);
-        }
-
-        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-
-        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.clone(),
-                    thread_store.clone(),
-                    text_thread_store.clone(),
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        cx.simulate_input("Lorem ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem ");
-            assert!(!editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("@");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    "eight.txt dir/b/",
-                    "seven.txt dir/b/",
-                    "six.txt dir/b/",
-                    "five.txt dir/b/",
-                    "Files & Directories",
-                    "Symbols",
-                    "Threads",
-                    "Fetch"
-                ]
-            );
-        });
-
-        // Select and confirm "File"
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @file ");
-            assert!(editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("one");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @file one");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(current_completion_labels(editor), vec!["one.txt dir/a/"]);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt) ");
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
-        });
-
-        let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    project.clone(),
-                    thread_store.clone(),
-                    text_thread_store.clone(),
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        pretty_assertions::assert_eq!(
-            contents,
-            [Mention::Text {
-                content: "1".into(),
-                uri: "file:///dir/a/one.txt".parse().unwrap()
-            }]
-        );
-
-        cx.simulate_input(" ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt)  ");
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
-        });
-
-        cx.simulate_input("Ipsum ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum ",
-            );
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
-        });
-
-        cx.simulate_input("@file ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum @file ",
-            );
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    project.clone(),
-                    thread_store.clone(),
-                    text_thread_store.clone(),
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        assert_eq!(contents.len(), 2);
-        pretty_assertions::assert_eq!(
-            contents[1],
-            Mention::Text {
-                content: "8".to_string(),
-                uri: "file:///dir/b/eight.txt".parse().unwrap(),
-            }
-        );
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) "
-            );
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![
-                    Point::new(0, 6)..Point::new(0, 39),
-                    Point::new(0, 47)..Point::new(0, 84)
-                ]
-            );
-        });
-
-        let plain_text_language = Arc::new(language::Language::new(
-            language::LanguageConfig {
-                name: "Plain Text".into(),
-                matcher: language::LanguageMatcher {
-                    path_suffixes: vec!["txt".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        ));
-
-        // Register the language and fake LSP
-        let language_registry = project.read_with(&cx, |project, _| project.languages().clone());
-        language_registry.add(plain_text_language);
-
-        let mut fake_language_servers = language_registry.register_fake_lsp(
-            "Plain Text",
-            language::FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    workspace_symbol_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        );
-
-        // Open the buffer to trigger LSP initialization
-        let buffer = project
-            .update(&mut cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a/one.txt"), cx)
-            })
-            .await
-            .unwrap();
-
-        // Register the buffer with language servers
-        let _handle = project.update(&mut cx, |project, cx| {
-            project.register_buffer_with_language_servers(&buffer, cx)
-        });
-
-        cx.run_until_parked();
-
-        let fake_language_server = fake_language_servers.next().await.unwrap();
-        fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
-            |_, _| async move {
-                Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
-                    #[allow(deprecated)]
-                    lsp::SymbolInformation {
-                        name: "MySymbol".into(),
-                        location: lsp::Location {
-                            uri: lsp::Url::from_file_path(path!("/dir/a/one.txt")).unwrap(),
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 0),
-                                lsp::Position::new(0, 1),
-                            ),
-                        },
-                        kind: lsp::SymbolKind::CONSTANT,
-                        tags: None,
-                        container_name: None,
-                        deprecated: None,
-                    },
-                ])))
-            },
-        );
-
-        cx.simulate_input("@symbol ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) @symbol "
-            );
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    "MySymbol",
-                ]
-            );
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    project.clone(),
-                    thread_store,
-                    text_thread_store,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        assert_eq!(contents.len(), 3);
-        pretty_assertions::assert_eq!(
-            contents[2],
-            Mention::Text {
-                content: "1".into(),
-                uri: "file:///dir/a/one.txt?symbol=MySymbol#L1:1"
-                    .parse()
-                    .unwrap(),
-            }
-        );
-
-        cx.run_until_parked();
-
-        editor.read_with(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) [@MySymbol](file:///dir/a/one.txt?symbol=MySymbol#L1:1) "
-            );
-        });
-    }
-
-    fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        editor.display_map.update(cx, |display_map, cx| {
-            display_map
-                .snapshot(cx)
-                .folds_in_range(0..snapshot.len())
-                .map(|fold| fold.range.to_point(&snapshot))
-                .collect()
-        })
-    }
-
-    fn current_completion_labels(editor: &Editor) -> Vec<String> {
-        let completions = editor.current_completions().expect("Missing completions");
-        completions
-            .into_iter()
-            .map(|completion| completion.label.text.to_string())
-            .collect::<Vec<_>>()
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            client::init_settings(cx);
-            language::init(cx);
-            Project::init_settings(cx);
-            workspace::init_settings(cx);
-            editor::init_settings(cx);
-        });
-    }
 }
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index a4d74db266..f6fee3b87e 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1,19 +1,22 @@
 use crate::{
-    acp::completion_provider::{ContextPickerCompletionProvider, MentionImage, MentionSet},
+    acp::completion_provider::ContextPickerCompletionProvider,
     context_picker::fetch_context_picker::fetch_url_content,
 };
 use acp_thread::{MentionUri, selection_name};
 use agent::{TextThreadStore, ThreadId, ThreadStore};
 use agent_client_protocol as acp;
-use anyhow::Result;
-use collections::HashSet;
+use anyhow::{Context as _, Result, anyhow};
+use collections::{HashMap, HashSet};
 use editor::{
     Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
     EditorMode, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer, ToOffset,
     actions::Paste,
     display_map::{Crease, CreaseId, FoldId},
 };
-use futures::{FutureExt as _, TryFutureExt as _};
+use futures::{
+    FutureExt as _, TryFutureExt as _,
+    future::{Shared, try_join_all},
+};
 use gpui::{
     AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, Image,
     ImageFormat, Img, Task, TextStyle, WeakEntity,
@@ -21,6 +24,7 @@ use gpui::{
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
 use project::{CompletionIntent, Project};
+use rope::Point;
 use settings::Settings;
 use std::{
     ffi::OsStr,
@@ -38,12 +42,11 @@ use ui::{
     Render, SelectableButton, SharedString, Styled, TextSize, TintColor, Toggleable, Window, div,
     h_flex,
 };
+use url::Url;
 use util::ResultExt;
 use workspace::{Workspace, notifications::NotifyResultExt as _};
 use zed_actions::agent::Chat;
 
-use super::completion_provider::Mention;
-
 pub struct MessageEditor {
     mention_set: MentionSet,
     editor: Entity<Editor>,
@@ -186,7 +189,6 @@ impl MessageEditor {
         ) else {
             return;
         };
-        self.mention_set.insert_uri(crease_id, mention_uri.clone());
 
         match mention_uri {
             MentionUri::Fetch { url } => {
@@ -209,7 +211,9 @@ impl MessageEditor {
             | MentionUri::Thread { .. }
             | MentionUri::TextThread { .. }
             | MentionUri::Rule { .. }
-            | MentionUri::Selection { .. } => {}
+            | MentionUri::Selection { .. } => {
+                self.mention_set.insert_uri(crease_id, mention_uri.clone());
+            }
         }
     }
 
@@ -218,7 +222,7 @@ impl MessageEditor {
         crease_id: CreaseId,
         anchor: Anchor,
         abs_path: PathBuf,
-        _is_directory: bool,
+        is_directory: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -226,15 +230,15 @@ impl MessageEditor {
             .extension()
             .and_then(OsStr::to_str)
             .unwrap_or_default();
-        let project = self.project.clone();
-        let Some(project_path) = project
-            .read(cx)
-            .project_path_for_absolute_path(&abs_path, cx)
-        else {
-            return;
-        };
 
         if Img::extensions().contains(&extension) && !extension.contains("svg") {
+            let project = self.project.clone();
+            let Some(project_path) = project
+                .read(cx)
+                .project_path_for_absolute_path(&abs_path, cx)
+            else {
+                return;
+            };
             let image = cx.spawn(async move |_, cx| {
                 let image = project
                     .update(cx, |project, cx| project.open_image(project_path, cx))?
@@ -242,6 +246,14 @@ impl MessageEditor {
                 image.read_with(cx, |image, _cx| image.image.clone())
             });
             self.confirm_mention_for_image(crease_id, anchor, Some(abs_path), image, window, cx);
+        } else {
+            self.mention_set.insert_uri(
+                crease_id,
+                MentionUri::File {
+                    abs_path,
+                    is_directory,
+                },
+            );
         }
     }
 
@@ -577,43 +589,54 @@ impl MessageEditor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.editor.update(cx, |_editor, cx| {
-            let task = cx
-                .spawn_in(window, async move |editor, cx| {
-                    let image = image.await.map_err(|e| e.to_string())?;
-                    let format = image.format;
-                    let image = cx
-                        .update(|_, cx| LanguageModelImage::from_image(image, cx))
-                        .map_err(|e| e.to_string())?
-                        .await;
-                    if let Some(image) = image {
-                        Ok(MentionImage {
-                            abs_path,
-                            data: image.source,
-                            format,
+        let editor = self.editor.clone();
+        let task = cx
+            .spawn_in(window, async move |this, cx| {
+                let image = image.await.map_err(|e| e.to_string())?;
+                let format = image.format;
+                let image = cx
+                    .update(|_, cx| LanguageModelImage::from_image(image, cx))
+                    .map_err(|e| e.to_string())?
+                    .await;
+                if let Some(image) = image {
+                    if let Some(abs_path) = abs_path.clone() {
+                        this.update(cx, |this, _cx| {
+                            this.mention_set.insert_uri(
+                                crease_id,
+                                MentionUri::File {
+                                    abs_path,
+                                    is_directory: false,
+                                },
+                            );
                         })
-                    } else {
-                        editor
-                            .update(cx, |editor, cx| {
-                                editor.display_map.update(cx, |display_map, cx| {
-                                    display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                                });
-                                editor.remove_creases([crease_id], cx);
-                            })
-                            .ok();
-                        Err("Failed to convert image".to_string())
+                        .map_err(|e| e.to_string())?;
                     }
-                })
-                .shared();
-
-            cx.spawn_in(window, {
-                let task = task.clone();
-                async move |_, cx| task.clone().await.notify_async_err(cx)
+                    Ok(MentionImage {
+                        abs_path,
+                        data: image.source,
+                        format,
+                    })
+                } else {
+                    editor
+                        .update(cx, |editor, cx| {
+                            editor.display_map.update(cx, |display_map, cx| {
+                                display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                            });
+                            editor.remove_creases([crease_id], cx);
+                        })
+                        .ok();
+                    Err("Failed to convert image".to_string())
+                }
             })
-            .detach();
+            .shared();
 
-            self.mention_set.insert_image(crease_id, task);
-        });
+        cx.spawn_in(window, {
+            let task = task.clone();
+            async move |_, cx| task.clone().await.notify_async_err(cx)
+        })
+        .detach();
+
+        self.mention_set.insert_image(crease_id, task);
     }
 
     pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
@@ -867,22 +890,230 @@ fn render_image_fold_icon_button(
     })
 }
 
+#[derive(Debug, Eq, PartialEq)]
+pub enum Mention {
+    Text { uri: MentionUri, content: String },
+    Image(MentionImage),
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct MentionImage {
+    pub abs_path: Option<PathBuf>,
+    pub data: SharedString,
+    pub format: ImageFormat,
+}
+
+#[derive(Default)]
+pub struct MentionSet {
+    pub(crate) uri_by_crease_id: HashMap<CreaseId, MentionUri>,
+    fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
+    images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
+}
+
+impl MentionSet {
+    pub fn insert_uri(&mut self, crease_id: CreaseId, uri: MentionUri) {
+        self.uri_by_crease_id.insert(crease_id, uri);
+    }
+
+    pub fn add_fetch_result(&mut self, url: Url, content: Shared<Task<Result<String, String>>>) {
+        self.fetch_results.insert(url, content);
+    }
+
+    pub fn insert_image(
+        &mut self,
+        crease_id: CreaseId,
+        task: Shared<Task<Result<MentionImage, String>>>,
+    ) {
+        self.images.insert(crease_id, task);
+    }
+
+    pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
+        self.fetch_results.clear();
+        self.uri_by_crease_id
+            .drain()
+            .map(|(id, _)| id)
+            .chain(self.images.drain().map(|(id, _)| id))
+    }
+
+    pub fn contents(
+        &self,
+        project: Entity<Project>,
+        thread_store: Entity<ThreadStore>,
+        text_thread_store: Entity<TextThreadStore>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<HashMap<CreaseId, Mention>>> {
+        let mut processed_image_creases = HashSet::default();
+
+        let mut contents = self
+            .uri_by_crease_id
+            .iter()
+            .map(|(&crease_id, uri)| {
+                match uri {
+                    MentionUri::File { abs_path, .. } => {
+                        // TODO directories
+                        let uri = uri.clone();
+                        let abs_path = abs_path.to_path_buf();
+
+                        if let Some(task) = self.images.get(&crease_id).cloned() {
+                            processed_image_creases.insert(crease_id);
+                            return cx.spawn(async move |_| {
+                                let image = task.await.map_err(|e| anyhow!("{e}"))?;
+                                anyhow::Ok((crease_id, Mention::Image(image)))
+                            });
+                        }
+
+                        let buffer_task = project.update(cx, |project, cx| {
+                            let path = project
+                                .find_project_path(abs_path, cx)
+                                .context("Failed to find project path")?;
+                            anyhow::Ok(project.open_buffer(path, cx))
+                        });
+                        cx.spawn(async move |cx| {
+                            let buffer = buffer_task?.await?;
+                            let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+
+                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                        })
+                    }
+                    MentionUri::Symbol {
+                        path, line_range, ..
+                    }
+                    | MentionUri::Selection {
+                        path, line_range, ..
+                    } => {
+                        let uri = uri.clone();
+                        let path_buf = path.clone();
+                        let line_range = line_range.clone();
+
+                        let buffer_task = project.update(cx, |project, cx| {
+                            let path = project
+                                .find_project_path(&path_buf, cx)
+                                .context("Failed to find project path")?;
+                            anyhow::Ok(project.open_buffer(path, cx))
+                        });
+
+                        cx.spawn(async move |cx| {
+                            let buffer = buffer_task?.await?;
+                            let content = buffer.read_with(cx, |buffer, _cx| {
+                                buffer
+                                    .text_for_range(
+                                        Point::new(line_range.start, 0)
+                                            ..Point::new(
+                                                line_range.end,
+                                                buffer.line_len(line_range.end),
+                                            ),
+                                    )
+                                    .collect()
+                            })?;
+
+                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                        })
+                    }
+                    MentionUri::Thread { id: thread_id, .. } => {
+                        let open_task = thread_store.update(cx, |thread_store, cx| {
+                            thread_store.open_thread(&thread_id, window, cx)
+                        });
+
+                        let uri = uri.clone();
+                        cx.spawn(async move |cx| {
+                            let thread = open_task.await?;
+                            let content = thread.read_with(cx, |thread, _cx| {
+                                thread.latest_detailed_summary_or_text().to_string()
+                            })?;
+
+                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                        })
+                    }
+                    MentionUri::TextThread { path, .. } => {
+                        let context = text_thread_store.update(cx, |text_thread_store, cx| {
+                            text_thread_store.open_local_context(path.as_path().into(), cx)
+                        });
+                        let uri = uri.clone();
+                        cx.spawn(async move |cx| {
+                            let context = context.await?;
+                            let xml = context.update(cx, |context, cx| context.to_xml(cx))?;
+                            anyhow::Ok((crease_id, Mention::Text { uri, content: xml }))
+                        })
+                    }
+                    MentionUri::Rule { id: prompt_id, .. } => {
+                        let Some(prompt_store) = thread_store.read(cx).prompt_store().clone()
+                        else {
+                            return Task::ready(Err(anyhow!("missing prompt store")));
+                        };
+                        let text_task = prompt_store.read(cx).load(*prompt_id, cx);
+                        let uri = uri.clone();
+                        cx.spawn(async move |_| {
+                            // TODO: report load errors instead of just logging
+                            let text = text_task.await?;
+                            anyhow::Ok((crease_id, Mention::Text { uri, content: text }))
+                        })
+                    }
+                    MentionUri::Fetch { url } => {
+                        let Some(content) = self.fetch_results.get(&url).cloned() else {
+                            return Task::ready(Err(anyhow!("missing fetch result")));
+                        };
+                        let uri = uri.clone();
+                        cx.spawn(async move |_| {
+                            Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
+                                },
+                            ))
+                        })
+                    }
+                }
+            })
+            .collect::<Vec<_>>();
+
+        // Handle images that didn't have a mention URI (because they were added by the paste handler).
+        contents.extend(self.images.iter().filter_map(|(crease_id, image)| {
+            if processed_image_creases.contains(crease_id) {
+                return None;
+            }
+            let crease_id = *crease_id;
+            let image = image.clone();
+            Some(cx.spawn(async move |_| {
+                Ok((
+                    crease_id,
+                    Mention::Image(image.await.map_err(|e| anyhow::anyhow!("{e}"))?),
+                ))
+            }))
+        }));
+
+        cx.spawn(async move |_cx| {
+            let contents = try_join_all(contents).await?.into_iter().collect();
+            anyhow::Ok(contents)
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use std::path::Path;
+    use std::{ops::Range, path::Path, sync::Arc};
 
     use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol as acp;
-    use editor::EditorMode;
+    use editor::{AnchorRangeExt as _, Editor, EditorMode};
     use fs::FakeFs;
-    use gpui::{AppContext, TestAppContext};
+    use futures::StreamExt as _;
+    use gpui::{
+        AppContext, Entity, EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext,
+    };
     use lsp::{CompletionContext, CompletionTriggerKind};
-    use project::{CompletionIntent, Project};
+    use project::{CompletionIntent, Project, ProjectPath};
     use serde_json::json;
+    use text::Point;
+    use ui::{App, Context, IntoElement, Render, SharedString, Window};
     use util::path;
-    use workspace::Workspace;
+    use workspace::{AppState, Item, Workspace};
 
-    use crate::acp::{message_editor::MessageEditor, thread_view::tests::init_test};
+    use crate::acp::{
+        message_editor::{Mention, MessageEditor},
+        thread_view::tests::init_test,
+    };
 
     #[gpui::test]
     async fn test_at_mention_removal(cx: &mut TestAppContext) {
@@ -982,4 +1213,459 @@ mod tests {
         // We don't send a resource link for the deleted crease.
         pretty_assertions::assert_matches!(content.as_slice(), [acp::ContentBlock::Text { .. }]);
     }
+
+    struct MessageEditorItem(Entity<MessageEditor>);
+
+    impl Item for MessageEditorItem {
+        type Event = ();
+
+        fn include_in_nav_history() -> bool {
+            false
+        }
+
+        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+            "Test".into()
+        }
+    }
+
+    impl EventEmitter<()> for MessageEditorItem {}
+
+    impl Focusable for MessageEditorItem {
+        fn focus_handle(&self, cx: &App) -> FocusHandle {
+            self.0.read(cx).focus_handle(cx).clone()
+        }
+    }
+
+    impl Render for MessageEditorItem {
+        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+            self.0.clone().into_any_element()
+        }
+    }
+
+    #[gpui::test]
+    async fn test_context_completion_provider(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let app_state = cx.update(AppState::test);
+
+        cx.update(|cx| {
+            language::init(cx);
+            editor::init(cx);
+            workspace::init(app_state.clone(), cx);
+            Project::init_settings(cx);
+        });
+
+        app_state
+            .fs
+            .as_fake()
+            .insert_tree(
+                path!("/dir"),
+                json!({
+                    "editor": "",
+                    "a": {
+                        "one.txt": "1",
+                        "two.txt": "2",
+                        "three.txt": "3",
+                        "four.txt": "4"
+                    },
+                    "b": {
+                        "five.txt": "5",
+                        "six.txt": "6",
+                        "seven.txt": "7",
+                        "eight.txt": "8",
+                    }
+                }),
+            )
+            .await;
+
+        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+        let workspace = window.root(cx).unwrap();
+
+        let worktree = project.update(cx, |project, cx| {
+            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
+            assert_eq!(worktrees.len(), 1);
+            worktrees.pop().unwrap()
+        });
+        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
+
+        let mut cx = VisualTestContext::from_window(*window, cx);
+
+        let paths = vec![
+            path!("a/one.txt"),
+            path!("a/two.txt"),
+            path!("a/three.txt"),
+            path!("a/four.txt"),
+            path!("b/five.txt"),
+            path!("b/six.txt"),
+            path!("b/seven.txt"),
+            path!("b/eight.txt"),
+        ];
+
+        let mut opened_editors = Vec::new();
+        for path in paths {
+            let buffer = workspace
+                .update_in(&mut cx, |workspace, window, cx| {
+                    workspace.open_path(
+                        ProjectPath {
+                            worktree_id,
+                            path: Path::new(path).into(),
+                        },
+                        None,
+                        false,
+                        window,
+                        cx,
+                    )
+                })
+                .await
+                .unwrap();
+            opened_editors.push(buffer);
+        }
+
+        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
+        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+
+        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
+            let workspace_handle = cx.weak_entity();
+            let message_editor = cx.new(|cx| {
+                MessageEditor::new(
+                    workspace_handle,
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    EditorMode::AutoHeight {
+                        max_lines: None,
+                        min_lines: 1,
+                    },
+                    window,
+                    cx,
+                )
+            });
+            workspace.active_pane().update(cx, |pane, cx| {
+                pane.add_item(
+                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
+                    true,
+                    true,
+                    None,
+                    window,
+                    cx,
+                );
+            });
+            message_editor.read(cx).focus_handle(cx).focus(window);
+            let editor = message_editor.read(cx).editor().clone();
+            (message_editor, editor)
+        });
+
+        cx.simulate_input("Lorem ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem ");
+            assert!(!editor.has_visible_completions_menu());
+        });
+
+        cx.simulate_input("@");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem @");
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(
+                current_completion_labels(editor),
+                &[
+                    "eight.txt dir/b/",
+                    "seven.txt dir/b/",
+                    "six.txt dir/b/",
+                    "five.txt dir/b/",
+                    "Files & Directories",
+                    "Symbols",
+                    "Threads",
+                    "Fetch"
+                ]
+            );
+        });
+
+        // Select and confirm "File"
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert!(editor.has_visible_completions_menu());
+            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
+            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
+            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
+            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem @file ");
+            assert!(editor.has_visible_completions_menu());
+        });
+
+        cx.simulate_input("one");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem @file one");
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(current_completion_labels(editor), vec!["one.txt dir/a/"]);
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert!(editor.has_visible_completions_menu());
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt) ");
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        pretty_assertions::assert_eq!(
+            contents,
+            [Mention::Text {
+                content: "1".into(),
+                uri: "file:///dir/a/one.txt".parse().unwrap()
+            }]
+        );
+
+        cx.simulate_input(" ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt)  ");
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        cx.simulate_input("Ipsum ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum ",
+            );
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        cx.simulate_input("@file ");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum @file ",
+            );
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(
+                fold_ranges(editor, cx),
+                vec![Point::new(0, 6)..Point::new(0, 39)]
+            );
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
+                    project.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        assert_eq!(contents.len(), 2);
+        pretty_assertions::assert_eq!(
+            contents[1],
+            Mention::Text {
+                content: "8".to_string(),
+                uri: "file:///dir/b/eight.txt".parse().unwrap(),
+            }
+        );
+
+        editor.update(&mut cx, |editor, cx| {
+                assert_eq!(
+                    editor.text(cx),
+                    "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) "
+                );
+                assert!(!editor.has_visible_completions_menu());
+                assert_eq!(
+                    fold_ranges(editor, cx),
+                    vec![
+                        Point::new(0, 6)..Point::new(0, 39),
+                        Point::new(0, 47)..Point::new(0, 84)
+                    ]
+                );
+            });
+
+        let plain_text_language = Arc::new(language::Language::new(
+            language::LanguageConfig {
+                name: "Plain Text".into(),
+                matcher: language::LanguageMatcher {
+                    path_suffixes: vec!["txt".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            None,
+        ));
+
+        // Register the language and fake LSP
+        let language_registry = project.read_with(&cx, |project, _| project.languages().clone());
+        language_registry.add(plain_text_language);
+
+        let mut fake_language_servers = language_registry.register_fake_lsp(
+            "Plain Text",
+            language::FakeLspAdapter {
+                capabilities: lsp::ServerCapabilities {
+                    workspace_symbol_provider: Some(lsp::OneOf::Left(true)),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        );
+
+        // Open the buffer to trigger LSP initialization
+        let buffer = project
+            .update(&mut cx, |project, cx| {
+                project.open_local_buffer(path!("/dir/a/one.txt"), cx)
+            })
+            .await
+            .unwrap();
+
+        // Register the buffer with language servers
+        let _handle = project.update(&mut cx, |project, cx| {
+            project.register_buffer_with_language_servers(&buffer, cx)
+        });
+
+        cx.run_until_parked();
+
+        let fake_language_server = fake_language_servers.next().await.unwrap();
+        fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
+            |_, _| async move {
+                Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
+                    #[allow(deprecated)]
+                    lsp::SymbolInformation {
+                        name: "MySymbol".into(),
+                        location: lsp::Location {
+                            uri: lsp::Url::from_file_path(path!("/dir/a/one.txt")).unwrap(),
+                            range: lsp::Range::new(
+                                lsp::Position::new(0, 0),
+                                lsp::Position::new(0, 1),
+                            ),
+                        },
+                        kind: lsp::SymbolKind::CONSTANT,
+                        tags: None,
+                        container_name: None,
+                        deprecated: None,
+                    },
+                ])))
+            },
+        );
+
+        cx.simulate_input("@symbol ");
+
+        editor.update(&mut cx, |editor, cx| {
+                assert_eq!(
+                    editor.text(cx),
+                    "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) @symbol "
+                );
+                assert!(editor.has_visible_completions_menu());
+                assert_eq!(
+                    current_completion_labels(editor),
+                    &[
+                        "MySymbol",
+                    ]
+                );
+            });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
+                    project.clone(),
+                    thread_store,
+                    text_thread_store,
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        assert_eq!(contents.len(), 3);
+        pretty_assertions::assert_eq!(
+            contents[2],
+            Mention::Text {
+                content: "1".into(),
+                uri: "file:///dir/a/one.txt?symbol=MySymbol#L1:1"
+                    .parse()
+                    .unwrap(),
+            }
+        );
+
+        cx.run_until_parked();
+
+        editor.read_with(&mut cx, |editor, cx| {
+                assert_eq!(
+                    editor.text(cx),
+                    "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) [@MySymbol](file:///dir/a/one.txt?symbol=MySymbol#L1:1) "
+                );
+            });
+    }
+
+    fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
+        let snapshot = editor.buffer().read(cx).snapshot(cx);
+        editor.display_map.update(cx, |display_map, cx| {
+            display_map
+                .snapshot(cx)
+                .folds_in_range(0..snapshot.len())
+                .map(|fold| fold.range.to_point(&snapshot))
+                .collect()
+        })
+    }
+
+    fn current_completion_labels(editor: &Editor) -> Vec<String> {
+        let completions = editor.current_completions().expect("Missing completions");
+        completions
+            .into_iter()
+            .map(|completion| completion.label.text.to_string())
+            .collect::<Vec<_>>()
+    }
 }

From e664a9bc48dcc0e74d02772acd295ce6356e850b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 15 Aug 2025 18:58:10 -0400
Subject: [PATCH 079/823] collab: Remove unused billing-related database code
 (#36282)

This PR removes a bunch of unused database code related to billing, as
we no longer need it.

Release Notes:

- N/A
---
 Cargo.lock                                    |   1 -
 crates/collab/Cargo.toml                      |   1 -
 crates/collab/src/db.rs                       |   5 -
 crates/collab/src/db/ids.rs                   |   3 -
 crates/collab/src/db/queries.rs               |   4 -
 .../src/db/queries/billing_customers.rs       | 100 -----------
 .../src/db/queries/billing_preferences.rs     |  17 --
 .../src/db/queries/billing_subscriptions.rs   | 158 -----------------
 .../src/db/queries/processed_stripe_events.rs |  69 --------
 crates/collab/src/db/tables.rs                |   4 -
 .../collab/src/db/tables/billing_customer.rs  |  41 -----
 .../src/db/tables/billing_preference.rs       |  32 ----
 .../src/db/tables/billing_subscription.rs     | 161 ------------------
 .../src/db/tables/processed_stripe_event.rs   |  16 --
 crates/collab/src/db/tables/user.rs           |   8 -
 crates/collab/src/db/tests.rs                 |   1 -
 .../db/tests/processed_stripe_event_tests.rs  |  38 -----
 crates/collab/src/lib.rs                      |  17 --
 crates/collab/src/llm/db.rs                   |  74 +-------
 crates/collab/src/llm/db/ids.rs               |  11 --
 crates/collab/src/llm/db/queries.rs           |   5 -
 crates/collab/src/llm/db/queries/providers.rs | 134 ---------------
 .../src/llm/db/queries/subscription_usages.rs |  38 -----
 crates/collab/src/llm/db/queries/usages.rs    |  44 -----
 crates/collab/src/llm/db/seed.rs              |  45 -----
 crates/collab/src/llm/db/tables.rs            |   6 -
 crates/collab/src/llm/db/tables/model.rs      |  48 ------
 crates/collab/src/llm/db/tables/provider.rs   |  25 ---
 .../src/llm/db/tables/subscription_usage.rs   |  22 ---
 .../llm/db/tables/subscription_usage_meter.rs |  55 ------
 crates/collab/src/llm/db/tables/usage.rs      |  52 ------
 .../collab/src/llm/db/tables/usage_measure.rs |  36 ----
 crates/collab/src/llm/db/tests.rs             | 107 ------------
 .../collab/src/llm/db/tests/provider_tests.rs |  31 ----
 crates/collab/src/main.rs                     |  10 --
 crates/collab/src/tests/test_server.rs        |   1 -
 36 files changed, 1 insertion(+), 1419 deletions(-)
 delete mode 100644 crates/collab/src/db/queries/billing_customers.rs
 delete mode 100644 crates/collab/src/db/queries/billing_preferences.rs
 delete mode 100644 crates/collab/src/db/queries/billing_subscriptions.rs
 delete mode 100644 crates/collab/src/db/queries/processed_stripe_events.rs
 delete mode 100644 crates/collab/src/db/tables/billing_customer.rs
 delete mode 100644 crates/collab/src/db/tables/billing_preference.rs
 delete mode 100644 crates/collab/src/db/tables/billing_subscription.rs
 delete mode 100644 crates/collab/src/db/tables/processed_stripe_event.rs
 delete mode 100644 crates/collab/src/db/tests/processed_stripe_event_tests.rs
 delete mode 100644 crates/collab/src/llm/db/ids.rs
 delete mode 100644 crates/collab/src/llm/db/queries.rs
 delete mode 100644 crates/collab/src/llm/db/queries/providers.rs
 delete mode 100644 crates/collab/src/llm/db/queries/subscription_usages.rs
 delete mode 100644 crates/collab/src/llm/db/queries/usages.rs
 delete mode 100644 crates/collab/src/llm/db/seed.rs
 delete mode 100644 crates/collab/src/llm/db/tables.rs
 delete mode 100644 crates/collab/src/llm/db/tables/model.rs
 delete mode 100644 crates/collab/src/llm/db/tables/provider.rs
 delete mode 100644 crates/collab/src/llm/db/tables/subscription_usage.rs
 delete mode 100644 crates/collab/src/llm/db/tables/subscription_usage_meter.rs
 delete mode 100644 crates/collab/src/llm/db/tables/usage.rs
 delete mode 100644 crates/collab/src/llm/db/tables/usage_measure.rs
 delete mode 100644 crates/collab/src/llm/db/tests.rs
 delete mode 100644 crates/collab/src/llm/db/tests/provider_tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2be16cc22f..3d72eed42e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3270,7 +3270,6 @@ dependencies = [
  "chrono",
  "client",
  "clock",
- "cloud_llm_client",
  "collab_ui",
  "collections",
  "command_palette_hooks",
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 6fc591be13..4fccd3be7f 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -29,7 +29,6 @@ axum-extra = { version = "0.4", features = ["erased-json"] }
 base64.workspace = true
 chrono.workspace = true
 clock.workspace = true
-cloud_llm_client.workspace = true
 collections.workspace = true
 dashmap.workspace = true
 envy = "0.4.2"
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 2c22ca2069..774eec5d2c 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -41,12 +41,7 @@ use worktree_settings_file::LocalSettingsKind;
 pub use tests::TestDb;
 
 pub use ids::*;
-pub use queries::billing_customers::{CreateBillingCustomerParams, UpdateBillingCustomerParams};
-pub use queries::billing_subscriptions::{
-    CreateBillingSubscriptionParams, UpdateBillingSubscriptionParams,
-};
 pub use queries::contributors::ContributorSelector;
-pub use queries::processed_stripe_events::CreateProcessedStripeEventParams;
 pub use sea_orm::ConnectOptions;
 pub use tables::user::Model as User;
 pub use tables::*;
diff --git a/crates/collab/src/db/ids.rs b/crates/collab/src/db/ids.rs
index 2ba7ec1051..8f116cfd63 100644
--- a/crates/collab/src/db/ids.rs
+++ b/crates/collab/src/db/ids.rs
@@ -70,9 +70,6 @@ macro_rules! id_type {
 }
 
 id_type!(AccessTokenId);
-id_type!(BillingCustomerId);
-id_type!(BillingSubscriptionId);
-id_type!(BillingPreferencesId);
 id_type!(BufferId);
 id_type!(ChannelBufferCollaboratorId);
 id_type!(ChannelChatParticipantId);
diff --git a/crates/collab/src/db/queries.rs b/crates/collab/src/db/queries.rs
index 64b627e475..95e45dc004 100644
--- a/crates/collab/src/db/queries.rs
+++ b/crates/collab/src/db/queries.rs
@@ -1,9 +1,6 @@
 use super::*;
 
 pub mod access_tokens;
-pub mod billing_customers;
-pub mod billing_preferences;
-pub mod billing_subscriptions;
 pub mod buffers;
 pub mod channels;
 pub mod contacts;
@@ -12,7 +9,6 @@ pub mod embeddings;
 pub mod extensions;
 pub mod messages;
 pub mod notifications;
-pub mod processed_stripe_events;
 pub mod projects;
 pub mod rooms;
 pub mod servers;
diff --git a/crates/collab/src/db/queries/billing_customers.rs b/crates/collab/src/db/queries/billing_customers.rs
deleted file mode 100644
index ead9e6cd32..0000000000
--- a/crates/collab/src/db/queries/billing_customers.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use super::*;
-
-#[derive(Debug)]
-pub struct CreateBillingCustomerParams {
-    pub user_id: UserId,
-    pub stripe_customer_id: String,
-}
-
-#[derive(Debug, Default)]
-pub struct UpdateBillingCustomerParams {
-    pub user_id: ActiveValue<UserId>,
-    pub stripe_customer_id: ActiveValue<String>,
-    pub has_overdue_invoices: ActiveValue<bool>,
-    pub trial_started_at: ActiveValue<Option<DateTime>>,
-}
-
-impl Database {
-    /// Creates a new billing customer.
-    pub async fn create_billing_customer(
-        &self,
-        params: &CreateBillingCustomerParams,
-    ) -> Result<billing_customer::Model> {
-        self.transaction(|tx| async move {
-            let customer = billing_customer::Entity::insert(billing_customer::ActiveModel {
-                user_id: ActiveValue::set(params.user_id),
-                stripe_customer_id: ActiveValue::set(params.stripe_customer_id.clone()),
-                ..Default::default()
-            })
-            .exec_with_returning(&*tx)
-            .await?;
-
-            Ok(customer)
-        })
-        .await
-    }
-
-    /// Updates the specified billing customer.
-    pub async fn update_billing_customer(
-        &self,
-        id: BillingCustomerId,
-        params: &UpdateBillingCustomerParams,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            billing_customer::Entity::update(billing_customer::ActiveModel {
-                id: ActiveValue::set(id),
-                user_id: params.user_id.clone(),
-                stripe_customer_id: params.stripe_customer_id.clone(),
-                has_overdue_invoices: params.has_overdue_invoices.clone(),
-                trial_started_at: params.trial_started_at.clone(),
-                created_at: ActiveValue::not_set(),
-            })
-            .exec(&*tx)
-            .await?;
-
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn get_billing_customer_by_id(
-        &self,
-        id: BillingCustomerId,
-    ) -> Result<Option<billing_customer::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_customer::Entity::find()
-                .filter(billing_customer::Column::Id.eq(id))
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns the billing customer for the user with the specified ID.
-    pub async fn get_billing_customer_by_user_id(
-        &self,
-        user_id: UserId,
-    ) -> Result<Option<billing_customer::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_customer::Entity::find()
-                .filter(billing_customer::Column::UserId.eq(user_id))
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns the billing customer for the user with the specified Stripe customer ID.
-    pub async fn get_billing_customer_by_stripe_customer_id(
-        &self,
-        stripe_customer_id: &str,
-    ) -> Result<Option<billing_customer::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_customer::Entity::find()
-                .filter(billing_customer::Column::StripeCustomerId.eq(stripe_customer_id))
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/billing_preferences.rs b/crates/collab/src/db/queries/billing_preferences.rs
deleted file mode 100644
index f370964ecd..0000000000
--- a/crates/collab/src/db/queries/billing_preferences.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use super::*;
-
-impl Database {
-    /// Returns the billing preferences for the given user, if they exist.
-    pub async fn get_billing_preferences(
-        &self,
-        user_id: UserId,
-    ) -> Result<Option<billing_preference::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_preference::Entity::find()
-                .filter(billing_preference::Column::UserId.eq(user_id))
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/billing_subscriptions.rs b/crates/collab/src/db/queries/billing_subscriptions.rs
deleted file mode 100644
index 8361d6b4d0..0000000000
--- a/crates/collab/src/db/queries/billing_subscriptions.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use anyhow::Context as _;
-
-use crate::db::billing_subscription::{
-    StripeCancellationReason, StripeSubscriptionStatus, SubscriptionKind,
-};
-
-use super::*;
-
-#[derive(Debug)]
-pub struct CreateBillingSubscriptionParams {
-    pub billing_customer_id: BillingCustomerId,
-    pub kind: Option<SubscriptionKind>,
-    pub stripe_subscription_id: String,
-    pub stripe_subscription_status: StripeSubscriptionStatus,
-    pub stripe_cancellation_reason: Option<StripeCancellationReason>,
-    pub stripe_current_period_start: Option<i64>,
-    pub stripe_current_period_end: Option<i64>,
-}
-
-#[derive(Debug, Default)]
-pub struct UpdateBillingSubscriptionParams {
-    pub billing_customer_id: ActiveValue<BillingCustomerId>,
-    pub kind: ActiveValue<Option<SubscriptionKind>>,
-    pub stripe_subscription_id: ActiveValue<String>,
-    pub stripe_subscription_status: ActiveValue<StripeSubscriptionStatus>,
-    pub stripe_cancel_at: ActiveValue<Option<DateTime>>,
-    pub stripe_cancellation_reason: ActiveValue<Option<StripeCancellationReason>>,
-    pub stripe_current_period_start: ActiveValue<Option<i64>>,
-    pub stripe_current_period_end: ActiveValue<Option<i64>>,
-}
-
-impl Database {
-    /// Creates a new billing subscription.
-    pub async fn create_billing_subscription(
-        &self,
-        params: &CreateBillingSubscriptionParams,
-    ) -> Result<billing_subscription::Model> {
-        self.transaction(|tx| async move {
-            let id = billing_subscription::Entity::insert(billing_subscription::ActiveModel {
-                billing_customer_id: ActiveValue::set(params.billing_customer_id),
-                kind: ActiveValue::set(params.kind),
-                stripe_subscription_id: ActiveValue::set(params.stripe_subscription_id.clone()),
-                stripe_subscription_status: ActiveValue::set(params.stripe_subscription_status),
-                stripe_cancellation_reason: ActiveValue::set(params.stripe_cancellation_reason),
-                stripe_current_period_start: ActiveValue::set(params.stripe_current_period_start),
-                stripe_current_period_end: ActiveValue::set(params.stripe_current_period_end),
-                ..Default::default()
-            })
-            .exec(&*tx)
-            .await?
-            .last_insert_id;
-
-            Ok(billing_subscription::Entity::find_by_id(id)
-                .one(&*tx)
-                .await?
-                .context("failed to retrieve inserted billing subscription")?)
-        })
-        .await
-    }
-
-    /// Updates the specified billing subscription.
-    pub async fn update_billing_subscription(
-        &self,
-        id: BillingSubscriptionId,
-        params: &UpdateBillingSubscriptionParams,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            billing_subscription::Entity::update(billing_subscription::ActiveModel {
-                id: ActiveValue::set(id),
-                billing_customer_id: params.billing_customer_id.clone(),
-                kind: params.kind.clone(),
-                stripe_subscription_id: params.stripe_subscription_id.clone(),
-                stripe_subscription_status: params.stripe_subscription_status.clone(),
-                stripe_cancel_at: params.stripe_cancel_at.clone(),
-                stripe_cancellation_reason: params.stripe_cancellation_reason.clone(),
-                stripe_current_period_start: params.stripe_current_period_start.clone(),
-                stripe_current_period_end: params.stripe_current_period_end.clone(),
-                created_at: ActiveValue::not_set(),
-            })
-            .exec(&*tx)
-            .await?;
-
-            Ok(())
-        })
-        .await
-    }
-
-    /// Returns the billing subscription with the specified Stripe subscription ID.
-    pub async fn get_billing_subscription_by_stripe_subscription_id(
-        &self,
-        stripe_subscription_id: &str,
-    ) -> Result<Option<billing_subscription::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_subscription::Entity::find()
-                .filter(
-                    billing_subscription::Column::StripeSubscriptionId.eq(stripe_subscription_id),
-                )
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    pub async fn get_active_billing_subscription(
-        &self,
-        user_id: UserId,
-    ) -> Result<Option<billing_subscription::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_subscription::Entity::find()
-                .inner_join(billing_customer::Entity)
-                .filter(billing_customer::Column::UserId.eq(user_id))
-                .filter(
-                    Condition::all()
-                        .add(
-                            Condition::any()
-                                .add(
-                                    billing_subscription::Column::StripeSubscriptionStatus
-                                        .eq(StripeSubscriptionStatus::Active),
-                                )
-                                .add(
-                                    billing_subscription::Column::StripeSubscriptionStatus
-                                        .eq(StripeSubscriptionStatus::Trialing),
-                                ),
-                        )
-                        .add(billing_subscription::Column::Kind.is_not_null()),
-                )
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns whether the user has an active billing subscription.
-    pub async fn has_active_billing_subscription(&self, user_id: UserId) -> Result<bool> {
-        Ok(self.count_active_billing_subscriptions(user_id).await? > 0)
-    }
-
-    /// Returns the count of the active billing subscriptions for the user with the specified ID.
-    pub async fn count_active_billing_subscriptions(&self, user_id: UserId) -> Result<usize> {
-        self.transaction(|tx| async move {
-            let count = billing_subscription::Entity::find()
-                .inner_join(billing_customer::Entity)
-                .filter(
-                    billing_customer::Column::UserId.eq(user_id).and(
-                        billing_subscription::Column::StripeSubscriptionStatus
-                            .eq(StripeSubscriptionStatus::Active)
-                            .or(billing_subscription::Column::StripeSubscriptionStatus
-                                .eq(StripeSubscriptionStatus::Trialing)),
-                    ),
-                )
-                .count(&*tx)
-                .await?;
-
-            Ok(count as usize)
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/processed_stripe_events.rs b/crates/collab/src/db/queries/processed_stripe_events.rs
deleted file mode 100644
index f14ad480e0..0000000000
--- a/crates/collab/src/db/queries/processed_stripe_events.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use super::*;
-
-#[derive(Debug)]
-pub struct CreateProcessedStripeEventParams {
-    pub stripe_event_id: String,
-    pub stripe_event_type: String,
-    pub stripe_event_created_timestamp: i64,
-}
-
-impl Database {
-    /// Creates a new processed Stripe event.
-    pub async fn create_processed_stripe_event(
-        &self,
-        params: &CreateProcessedStripeEventParams,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            processed_stripe_event::Entity::insert(processed_stripe_event::ActiveModel {
-                stripe_event_id: ActiveValue::set(params.stripe_event_id.clone()),
-                stripe_event_type: ActiveValue::set(params.stripe_event_type.clone()),
-                stripe_event_created_timestamp: ActiveValue::set(
-                    params.stripe_event_created_timestamp,
-                ),
-                ..Default::default()
-            })
-            .exec_without_returning(&*tx)
-            .await?;
-
-            Ok(())
-        })
-        .await
-    }
-
-    /// Returns the processed Stripe event with the specified event ID.
-    pub async fn get_processed_stripe_event_by_event_id(
-        &self,
-        event_id: &str,
-    ) -> Result<Option<processed_stripe_event::Model>> {
-        self.transaction(|tx| async move {
-            Ok(processed_stripe_event::Entity::find_by_id(event_id)
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns the processed Stripe events with the specified event IDs.
-    pub async fn get_processed_stripe_events_by_event_ids(
-        &self,
-        event_ids: &[&str],
-    ) -> Result<Vec<processed_stripe_event::Model>> {
-        self.transaction(|tx| async move {
-            Ok(processed_stripe_event::Entity::find()
-                .filter(
-                    processed_stripe_event::Column::StripeEventId.is_in(event_ids.iter().copied()),
-                )
-                .all(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns whether the Stripe event with the specified ID has already been processed.
-    pub async fn already_processed_stripe_event(&self, event_id: &str) -> Result<bool> {
-        Ok(self
-            .get_processed_stripe_event_by_event_id(event_id)
-            .await?
-            .is_some())
-    }
-}
diff --git a/crates/collab/src/db/tables.rs b/crates/collab/src/db/tables.rs
index d87ab174bd..0082a9fb03 100644
--- a/crates/collab/src/db/tables.rs
+++ b/crates/collab/src/db/tables.rs
@@ -1,7 +1,4 @@
 pub mod access_token;
-pub mod billing_customer;
-pub mod billing_preference;
-pub mod billing_subscription;
 pub mod buffer;
 pub mod buffer_operation;
 pub mod buffer_snapshot;
@@ -23,7 +20,6 @@ pub mod notification;
 pub mod notification_kind;
 pub mod observed_buffer_edits;
 pub mod observed_channel_messages;
-pub mod processed_stripe_event;
 pub mod project;
 pub mod project_collaborator;
 pub mod project_repository;
diff --git a/crates/collab/src/db/tables/billing_customer.rs b/crates/collab/src/db/tables/billing_customer.rs
deleted file mode 100644
index e7d4a216e3..0000000000
--- a/crates/collab/src/db/tables/billing_customer.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use crate::db::{BillingCustomerId, UserId};
-use sea_orm::entity::prelude::*;
-
-/// A billing customer.
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "billing_customers")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: BillingCustomerId,
-    pub user_id: UserId,
-    pub stripe_customer_id: String,
-    pub has_overdue_invoices: bool,
-    pub trial_started_at: Option<DateTime>,
-    pub created_at: DateTime,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-    #[sea_orm(has_many = "super::billing_subscription::Entity")]
-    BillingSubscription,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl Related<super::billing_subscription::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::BillingSubscription.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/billing_preference.rs b/crates/collab/src/db/tables/billing_preference.rs
deleted file mode 100644
index c1888d3b2f..0000000000
--- a/crates/collab/src/db/tables/billing_preference.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::db::{BillingPreferencesId, UserId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "billing_preferences")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: BillingPreferencesId,
-    pub created_at: DateTime,
-    pub user_id: UserId,
-    pub max_monthly_llm_usage_spending_in_cents: i32,
-    pub model_request_overages_enabled: bool,
-    pub model_request_overages_spend_limit_in_cents: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/billing_subscription.rs b/crates/collab/src/db/tables/billing_subscription.rs
deleted file mode 100644
index f5684aeec3..0000000000
--- a/crates/collab/src/db/tables/billing_subscription.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-use crate::db::{BillingCustomerId, BillingSubscriptionId};
-use chrono::{Datelike as _, NaiveDate, Utc};
-use sea_orm::entity::prelude::*;
-use serde::Serialize;
-
-/// A billing subscription.
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "billing_subscriptions")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: BillingSubscriptionId,
-    pub billing_customer_id: BillingCustomerId,
-    pub kind: Option<SubscriptionKind>,
-    pub stripe_subscription_id: String,
-    pub stripe_subscription_status: StripeSubscriptionStatus,
-    pub stripe_cancel_at: Option<DateTime>,
-    pub stripe_cancellation_reason: Option<StripeCancellationReason>,
-    pub stripe_current_period_start: Option<i64>,
-    pub stripe_current_period_end: Option<i64>,
-    pub created_at: DateTime,
-}
-
-impl Model {
-    pub fn current_period_start_at(&self) -> Option<DateTimeUtc> {
-        let period_start = self.stripe_current_period_start?;
-        chrono::DateTime::from_timestamp(period_start, 0)
-    }
-
-    pub fn current_period_end_at(&self) -> Option<DateTimeUtc> {
-        let period_end = self.stripe_current_period_end?;
-        chrono::DateTime::from_timestamp(period_end, 0)
-    }
-
-    pub fn current_period(
-        subscription: Option<Self>,
-        is_staff: bool,
-    ) -> Option<(DateTimeUtc, DateTimeUtc)> {
-        if is_staff {
-            let now = Utc::now();
-            let year = now.year();
-            let month = now.month();
-
-            let first_day_of_this_month =
-                NaiveDate::from_ymd_opt(year, month, 1)?.and_hms_opt(0, 0, 0)?;
-
-            let next_month = if month == 12 { 1 } else { month + 1 };
-            let next_month_year = if month == 12 { year + 1 } else { year };
-            let first_day_of_next_month =
-                NaiveDate::from_ymd_opt(next_month_year, next_month, 1)?.and_hms_opt(23, 59, 59)?;
-
-            let last_day_of_this_month = first_day_of_next_month - chrono::Days::new(1);
-
-            Some((
-                first_day_of_this_month.and_utc(),
-                last_day_of_this_month.and_utc(),
-            ))
-        } else {
-            let subscription = subscription?;
-            let period_start_at = subscription.current_period_start_at()?;
-            let period_end_at = subscription.current_period_end_at()?;
-
-            Some((period_start_at, period_end_at))
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::billing_customer::Entity",
-        from = "Column::BillingCustomerId",
-        to = "super::billing_customer::Column::Id"
-    )]
-    BillingCustomer,
-}
-
-impl Related<super::billing_customer::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::BillingCustomer.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Hash, Serialize)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum SubscriptionKind {
-    #[sea_orm(string_value = "zed_pro")]
-    ZedPro,
-    #[sea_orm(string_value = "zed_pro_trial")]
-    ZedProTrial,
-    #[sea_orm(string_value = "zed_free")]
-    ZedFree,
-}
-
-impl From<SubscriptionKind> for cloud_llm_client::Plan {
-    fn from(value: SubscriptionKind) -> Self {
-        match value {
-            SubscriptionKind::ZedPro => Self::ZedPro,
-            SubscriptionKind::ZedProTrial => Self::ZedProTrial,
-            SubscriptionKind::ZedFree => Self::ZedFree,
-        }
-    }
-}
-
-/// The status of a Stripe subscription.
-///
-/// [Stripe docs](https://docs.stripe.com/api/subscriptions/object#subscription_object-status)
-#[derive(
-    Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Default, Hash, Serialize,
-)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum StripeSubscriptionStatus {
-    #[default]
-    #[sea_orm(string_value = "incomplete")]
-    Incomplete,
-    #[sea_orm(string_value = "incomplete_expired")]
-    IncompleteExpired,
-    #[sea_orm(string_value = "trialing")]
-    Trialing,
-    #[sea_orm(string_value = "active")]
-    Active,
-    #[sea_orm(string_value = "past_due")]
-    PastDue,
-    #[sea_orm(string_value = "canceled")]
-    Canceled,
-    #[sea_orm(string_value = "unpaid")]
-    Unpaid,
-    #[sea_orm(string_value = "paused")]
-    Paused,
-}
-
-impl StripeSubscriptionStatus {
-    pub fn is_cancelable(&self) -> bool {
-        match self {
-            Self::Trialing | Self::Active | Self::PastDue => true,
-            Self::Incomplete
-            | Self::IncompleteExpired
-            | Self::Canceled
-            | Self::Unpaid
-            | Self::Paused => false,
-        }
-    }
-}
-
-/// The cancellation reason for a Stripe subscription.
-///
-/// [Stripe docs](https://docs.stripe.com/api/subscriptions/object#subscription_object-cancellation_details-reason)
-#[derive(Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Hash, Serialize)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum StripeCancellationReason {
-    #[sea_orm(string_value = "cancellation_requested")]
-    CancellationRequested,
-    #[sea_orm(string_value = "payment_disputed")]
-    PaymentDisputed,
-    #[sea_orm(string_value = "payment_failed")]
-    PaymentFailed,
-}
diff --git a/crates/collab/src/db/tables/processed_stripe_event.rs b/crates/collab/src/db/tables/processed_stripe_event.rs
deleted file mode 100644
index 7b6f0cdc31..0000000000
--- a/crates/collab/src/db/tables/processed_stripe_event.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "processed_stripe_events")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub stripe_event_id: String,
-    pub stripe_event_type: String,
-    pub stripe_event_created_timestamp: i64,
-    pub processed_at: DateTime,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/user.rs b/crates/collab/src/db/tables/user.rs
index 49fe3eb58f..af43fe300a 100644
--- a/crates/collab/src/db/tables/user.rs
+++ b/crates/collab/src/db/tables/user.rs
@@ -29,8 +29,6 @@ pub struct Model {
 pub enum Relation {
     #[sea_orm(has_many = "super::access_token::Entity")]
     AccessToken,
-    #[sea_orm(has_one = "super::billing_customer::Entity")]
-    BillingCustomer,
     #[sea_orm(has_one = "super::room_participant::Entity")]
     RoomParticipant,
     #[sea_orm(has_many = "super::project::Entity")]
@@ -68,12 +66,6 @@ impl Related<super::access_token::Entity> for Entity {
     }
 }
 
-impl Related<super::billing_customer::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::BillingCustomer.def()
-    }
-}
-
 impl Related<super::room_participant::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::RoomParticipant.def()
diff --git a/crates/collab/src/db/tests.rs b/crates/collab/src/db/tests.rs
index 6c2f9dc82a..2eb8d377ac 100644
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -8,7 +8,6 @@ mod embedding_tests;
 mod extension_tests;
 mod feature_flag_tests;
 mod message_tests;
-mod processed_stripe_event_tests;
 mod user_tests;
 
 use crate::migrations::run_database_migrations;
diff --git a/crates/collab/src/db/tests/processed_stripe_event_tests.rs b/crates/collab/src/db/tests/processed_stripe_event_tests.rs
deleted file mode 100644
index ad93b5a658..0000000000
--- a/crates/collab/src/db/tests/processed_stripe_event_tests.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use std::sync::Arc;
-
-use crate::test_both_dbs;
-
-use super::{CreateProcessedStripeEventParams, Database};
-
-test_both_dbs!(
-    test_already_processed_stripe_event,
-    test_already_processed_stripe_event_postgres,
-    test_already_processed_stripe_event_sqlite
-);
-
-async fn test_already_processed_stripe_event(db: &Arc<Database>) {
-    let unprocessed_event_id = "evt_1PiJOuRxOf7d5PNaw2zzWiyO".to_string();
-    let processed_event_id = "evt_1PiIfMRxOf7d5PNakHrAUe8P".to_string();
-
-    db.create_processed_stripe_event(&CreateProcessedStripeEventParams {
-        stripe_event_id: processed_event_id.clone(),
-        stripe_event_type: "customer.created".into(),
-        stripe_event_created_timestamp: 1722355968,
-    })
-    .await
-    .unwrap();
-
-    assert!(
-        db.already_processed_stripe_event(&processed_event_id)
-            .await
-            .unwrap(),
-        "Expected {processed_event_id} to already be processed"
-    );
-
-    assert!(
-        !db.already_processed_stripe_event(&unprocessed_event_id)
-            .await
-            .unwrap(),
-        "Expected {unprocessed_event_id} to be unprocessed"
-    );
-}
diff --git a/crates/collab/src/lib.rs b/crates/collab/src/lib.rs
index a68286a5a3..191025df37 100644
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -20,7 +20,6 @@ use axum::{
 };
 use db::{ChannelId, Database};
 use executor::Executor;
-use llm::db::LlmDatabase;
 use serde::Deserialize;
 use std::{path::PathBuf, sync::Arc};
 use util::ResultExt;
@@ -242,7 +241,6 @@ impl ServiceMode {
 
 pub struct AppState {
     pub db: Arc<Database>,
-    pub llm_db: Option<Arc<LlmDatabase>>,
     pub livekit_client: Option<Arc<dyn livekit_api::Client>>,
     pub blob_store_client: Option<aws_sdk_s3::Client>,
     pub executor: Executor,
@@ -257,20 +255,6 @@ impl AppState {
         let mut db = Database::new(db_options).await?;
         db.initialize_notification_kinds().await?;
 
-        let llm_db = if let Some((llm_database_url, llm_database_max_connections)) = config
-            .llm_database_url
-            .clone()
-            .zip(config.llm_database_max_connections)
-        {
-            let mut llm_db_options = db::ConnectOptions::new(llm_database_url);
-            llm_db_options.max_connections(llm_database_max_connections);
-            let mut llm_db = LlmDatabase::new(llm_db_options, executor.clone()).await?;
-            llm_db.initialize().await?;
-            Some(Arc::new(llm_db))
-        } else {
-            None
-        };
-
         let livekit_client = if let Some(((server, key), secret)) = config
             .livekit_server
             .as_ref()
@@ -289,7 +273,6 @@ impl AppState {
         let db = Arc::new(db);
         let this = Self {
             db: db.clone(),
-            llm_db,
             livekit_client,
             blob_store_client: build_blob_store_client(&config).await.log_err(),
             executor,
diff --git a/crates/collab/src/llm/db.rs b/crates/collab/src/llm/db.rs
index 18ad624dab..b15d5a42b5 100644
--- a/crates/collab/src/llm/db.rs
+++ b/crates/collab/src/llm/db.rs
@@ -1,30 +1,9 @@
-mod ids;
-mod queries;
-mod seed;
-mod tables;
-
-#[cfg(test)]
-mod tests;
-
-use cloud_llm_client::LanguageModelProvider;
-use collections::HashMap;
-pub use ids::*;
-pub use seed::*;
-pub use tables::*;
-
-#[cfg(test)]
-pub use tests::TestLlmDb;
-use usage_measure::UsageMeasure;
-
 use std::future::Future;
 use std::sync::Arc;
 
 use anyhow::Context;
 pub use sea_orm::ConnectOptions;
-use sea_orm::prelude::*;
-use sea_orm::{
-    ActiveValue, DatabaseConnection, DatabaseTransaction, IsolationLevel, TransactionTrait,
-};
+use sea_orm::{DatabaseConnection, DatabaseTransaction, IsolationLevel, TransactionTrait};
 
 use crate::Result;
 use crate::db::TransactionHandle;
@@ -36,9 +15,6 @@ pub struct LlmDatabase {
     pool: DatabaseConnection,
     #[allow(unused)]
     executor: Executor,
-    provider_ids: HashMap<LanguageModelProvider, ProviderId>,
-    models: HashMap<(LanguageModelProvider, String), model::Model>,
-    usage_measure_ids: HashMap<UsageMeasure, UsageMeasureId>,
     #[cfg(test)]
     runtime: Option<tokio::runtime::Runtime>,
 }
@@ -51,59 +27,11 @@ impl LlmDatabase {
             options: options.clone(),
             pool: sea_orm::Database::connect(options).await?,
             executor,
-            provider_ids: HashMap::default(),
-            models: HashMap::default(),
-            usage_measure_ids: HashMap::default(),
             #[cfg(test)]
             runtime: None,
         })
     }
 
-    pub async fn initialize(&mut self) -> Result<()> {
-        self.initialize_providers().await?;
-        self.initialize_models().await?;
-        self.initialize_usage_measures().await?;
-        Ok(())
-    }
-
-    /// Returns the list of all known models, with their [`LanguageModelProvider`].
-    pub fn all_models(&self) -> Vec<(LanguageModelProvider, model::Model)> {
-        self.models
-            .iter()
-            .map(|((model_provider, _model_name), model)| (*model_provider, model.clone()))
-            .collect::<Vec<_>>()
-    }
-
-    /// Returns the names of the known models for the given [`LanguageModelProvider`].
-    pub fn model_names_for_provider(&self, provider: LanguageModelProvider) -> Vec<String> {
-        self.models
-            .keys()
-            .filter_map(|(model_provider, model_name)| {
-                if model_provider == &provider {
-                    Some(model_name)
-                } else {
-                    None
-                }
-            })
-            .cloned()
-            .collect::<Vec<_>>()
-    }
-
-    pub fn model(&self, provider: LanguageModelProvider, name: &str) -> Result<&model::Model> {
-        Ok(self
-            .models
-            .get(&(provider, name.to_string()))
-            .with_context(|| format!("unknown model {provider:?}:{name}"))?)
-    }
-
-    pub fn model_by_id(&self, id: ModelId) -> Result<&model::Model> {
-        Ok(self
-            .models
-            .values()
-            .find(|model| model.id == id)
-            .with_context(|| format!("no model for ID {id:?}"))?)
-    }
-
     pub fn options(&self) -> &ConnectOptions {
         &self.options
     }
diff --git a/crates/collab/src/llm/db/ids.rs b/crates/collab/src/llm/db/ids.rs
deleted file mode 100644
index 03cab6cee0..0000000000
--- a/crates/collab/src/llm/db/ids.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use sea_orm::{DbErr, entity::prelude::*};
-use serde::{Deserialize, Serialize};
-
-use crate::id_type;
-
-id_type!(BillingEventId);
-id_type!(ModelId);
-id_type!(ProviderId);
-id_type!(RevokedAccessTokenId);
-id_type!(UsageId);
-id_type!(UsageMeasureId);
diff --git a/crates/collab/src/llm/db/queries.rs b/crates/collab/src/llm/db/queries.rs
deleted file mode 100644
index 0087218b3f..0000000000
--- a/crates/collab/src/llm/db/queries.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use super::*;
-
-pub mod providers;
-pub mod subscription_usages;
-pub mod usages;
diff --git a/crates/collab/src/llm/db/queries/providers.rs b/crates/collab/src/llm/db/queries/providers.rs
deleted file mode 100644
index 9c7dbdd184..0000000000
--- a/crates/collab/src/llm/db/queries/providers.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use super::*;
-use sea_orm::{QueryOrder, sea_query::OnConflict};
-use std::str::FromStr;
-use strum::IntoEnumIterator as _;
-
-pub struct ModelParams {
-    pub provider: LanguageModelProvider,
-    pub name: String,
-    pub max_requests_per_minute: i64,
-    pub max_tokens_per_minute: i64,
-    pub max_tokens_per_day: i64,
-    pub price_per_million_input_tokens: i32,
-    pub price_per_million_output_tokens: i32,
-}
-
-impl LlmDatabase {
-    pub async fn initialize_providers(&mut self) -> Result<()> {
-        self.provider_ids = self
-            .transaction(|tx| async move {
-                let existing_providers = provider::Entity::find().all(&*tx).await?;
-
-                let mut new_providers = LanguageModelProvider::iter()
-                    .filter(|provider| {
-                        !existing_providers
-                            .iter()
-                            .any(|p| p.name == provider.to_string())
-                    })
-                    .map(|provider| provider::ActiveModel {
-                        name: ActiveValue::set(provider.to_string()),
-                        ..Default::default()
-                    })
-                    .peekable();
-
-                if new_providers.peek().is_some() {
-                    provider::Entity::insert_many(new_providers)
-                        .exec(&*tx)
-                        .await?;
-                }
-
-                let all_providers: HashMap<_, _> = provider::Entity::find()
-                    .all(&*tx)
-                    .await?
-                    .iter()
-                    .filter_map(|provider| {
-                        LanguageModelProvider::from_str(&provider.name)
-                            .ok()
-                            .map(|p| (p, provider.id))
-                    })
-                    .collect();
-
-                Ok(all_providers)
-            })
-            .await?;
-        Ok(())
-    }
-
-    pub async fn initialize_models(&mut self) -> Result<()> {
-        let all_provider_ids = &self.provider_ids;
-        self.models = self
-            .transaction(|tx| async move {
-                let all_models: HashMap<_, _> = model::Entity::find()
-                    .all(&*tx)
-                    .await?
-                    .into_iter()
-                    .filter_map(|model| {
-                        let provider = all_provider_ids.iter().find_map(|(provider, id)| {
-                            if *id == model.provider_id {
-                                Some(provider)
-                            } else {
-                                None
-                            }
-                        })?;
-                        Some(((*provider, model.name.clone()), model))
-                    })
-                    .collect();
-                Ok(all_models)
-            })
-            .await?;
-        Ok(())
-    }
-
-    pub async fn insert_models(&mut self, models: &[ModelParams]) -> Result<()> {
-        let all_provider_ids = &self.provider_ids;
-        self.transaction(|tx| async move {
-            model::Entity::insert_many(models.iter().map(|model_params| {
-                let provider_id = all_provider_ids[&model_params.provider];
-                model::ActiveModel {
-                    provider_id: ActiveValue::set(provider_id),
-                    name: ActiveValue::set(model_params.name.clone()),
-                    max_requests_per_minute: ActiveValue::set(model_params.max_requests_per_minute),
-                    max_tokens_per_minute: ActiveValue::set(model_params.max_tokens_per_minute),
-                    max_tokens_per_day: ActiveValue::set(model_params.max_tokens_per_day),
-                    price_per_million_input_tokens: ActiveValue::set(
-                        model_params.price_per_million_input_tokens,
-                    ),
-                    price_per_million_output_tokens: ActiveValue::set(
-                        model_params.price_per_million_output_tokens,
-                    ),
-                    ..Default::default()
-                }
-            }))
-            .on_conflict(
-                OnConflict::columns([model::Column::ProviderId, model::Column::Name])
-                    .update_columns([
-                        model::Column::MaxRequestsPerMinute,
-                        model::Column::MaxTokensPerMinute,
-                        model::Column::MaxTokensPerDay,
-                        model::Column::PricePerMillionInputTokens,
-                        model::Column::PricePerMillionOutputTokens,
-                    ])
-                    .to_owned(),
-            )
-            .exec_without_returning(&*tx)
-            .await?;
-            Ok(())
-        })
-        .await?;
-        self.initialize_models().await
-    }
-
-    /// Returns the list of LLM providers.
-    pub async fn list_providers(&self) -> Result<Vec<LanguageModelProvider>> {
-        self.transaction(|tx| async move {
-            Ok(provider::Entity::find()
-                .order_by_asc(provider::Column::Name)
-                .all(&*tx)
-                .await?
-                .into_iter()
-                .filter_map(|p| LanguageModelProvider::from_str(&p.name).ok())
-                .collect())
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/llm/db/queries/subscription_usages.rs b/crates/collab/src/llm/db/queries/subscription_usages.rs
deleted file mode 100644
index 8a51979075..0000000000
--- a/crates/collab/src/llm/db/queries/subscription_usages.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use crate::db::UserId;
-
-use super::*;
-
-impl LlmDatabase {
-    pub async fn get_subscription_usage_for_period(
-        &self,
-        user_id: UserId,
-        period_start_at: DateTimeUtc,
-        period_end_at: DateTimeUtc,
-    ) -> Result<Option<subscription_usage::Model>> {
-        self.transaction(|tx| async move {
-            self.get_subscription_usage_for_period_in_tx(
-                user_id,
-                period_start_at,
-                period_end_at,
-                &tx,
-            )
-            .await
-        })
-        .await
-    }
-
-    async fn get_subscription_usage_for_period_in_tx(
-        &self,
-        user_id: UserId,
-        period_start_at: DateTimeUtc,
-        period_end_at: DateTimeUtc,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<subscription_usage::Model>> {
-        Ok(subscription_usage::Entity::find()
-            .filter(subscription_usage::Column::UserId.eq(user_id))
-            .filter(subscription_usage::Column::PeriodStartAt.eq(period_start_at))
-            .filter(subscription_usage::Column::PeriodEndAt.eq(period_end_at))
-            .one(tx)
-            .await?)
-    }
-}
diff --git a/crates/collab/src/llm/db/queries/usages.rs b/crates/collab/src/llm/db/queries/usages.rs
deleted file mode 100644
index a917703f96..0000000000
--- a/crates/collab/src/llm/db/queries/usages.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use std::str::FromStr;
-use strum::IntoEnumIterator as _;
-
-use super::*;
-
-impl LlmDatabase {
-    pub async fn initialize_usage_measures(&mut self) -> Result<()> {
-        let all_measures = self
-            .transaction(|tx| async move {
-                let existing_measures = usage_measure::Entity::find().all(&*tx).await?;
-
-                let new_measures = UsageMeasure::iter()
-                    .filter(|measure| {
-                        !existing_measures
-                            .iter()
-                            .any(|m| m.name == measure.to_string())
-                    })
-                    .map(|measure| usage_measure::ActiveModel {
-                        name: ActiveValue::set(measure.to_string()),
-                        ..Default::default()
-                    })
-                    .collect::<Vec<_>>();
-
-                if !new_measures.is_empty() {
-                    usage_measure::Entity::insert_many(new_measures)
-                        .exec(&*tx)
-                        .await?;
-                }
-
-                Ok(usage_measure::Entity::find().all(&*tx).await?)
-            })
-            .await?;
-
-        self.usage_measure_ids = all_measures
-            .into_iter()
-            .filter_map(|measure| {
-                UsageMeasure::from_str(&measure.name)
-                    .ok()
-                    .map(|um| (um, measure.id))
-            })
-            .collect();
-        Ok(())
-    }
-}
diff --git a/crates/collab/src/llm/db/seed.rs b/crates/collab/src/llm/db/seed.rs
deleted file mode 100644
index 55c6c30cd5..0000000000
--- a/crates/collab/src/llm/db/seed.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use super::*;
-use crate::{Config, Result};
-use queries::providers::ModelParams;
-
-pub async fn seed_database(_config: &Config, db: &mut LlmDatabase, _force: bool) -> Result<()> {
-    db.insert_models(&[
-        ModelParams {
-            provider: LanguageModelProvider::Anthropic,
-            name: "claude-3-5-sonnet".into(),
-            max_requests_per_minute: 5,
-            max_tokens_per_minute: 20_000,
-            max_tokens_per_day: 300_000,
-            price_per_million_input_tokens: 300,   // $3.00/MTok
-            price_per_million_output_tokens: 1500, // $15.00/MTok
-        },
-        ModelParams {
-            provider: LanguageModelProvider::Anthropic,
-            name: "claude-3-opus".into(),
-            max_requests_per_minute: 5,
-            max_tokens_per_minute: 10_000,
-            max_tokens_per_day: 300_000,
-            price_per_million_input_tokens: 1500,  // $15.00/MTok
-            price_per_million_output_tokens: 7500, // $75.00/MTok
-        },
-        ModelParams {
-            provider: LanguageModelProvider::Anthropic,
-            name: "claude-3-sonnet".into(),
-            max_requests_per_minute: 5,
-            max_tokens_per_minute: 20_000,
-            max_tokens_per_day: 300_000,
-            price_per_million_input_tokens: 1500,  // $15.00/MTok
-            price_per_million_output_tokens: 7500, // $75.00/MTok
-        },
-        ModelParams {
-            provider: LanguageModelProvider::Anthropic,
-            name: "claude-3-haiku".into(),
-            max_requests_per_minute: 5,
-            max_tokens_per_minute: 25_000,
-            max_tokens_per_day: 300_000,
-            price_per_million_input_tokens: 25,   // $0.25/MTok
-            price_per_million_output_tokens: 125, // $1.25/MTok
-        },
-    ])
-    .await
-}
diff --git a/crates/collab/src/llm/db/tables.rs b/crates/collab/src/llm/db/tables.rs
deleted file mode 100644
index 75ea8f5140..0000000000
--- a/crates/collab/src/llm/db/tables.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod model;
-pub mod provider;
-pub mod subscription_usage;
-pub mod subscription_usage_meter;
-pub mod usage;
-pub mod usage_measure;
diff --git a/crates/collab/src/llm/db/tables/model.rs b/crates/collab/src/llm/db/tables/model.rs
deleted file mode 100644
index f0a858b4a6..0000000000
--- a/crates/collab/src/llm/db/tables/model.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use sea_orm::entity::prelude::*;
-
-use crate::llm::db::{ModelId, ProviderId};
-
-/// An LLM model.
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "models")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ModelId,
-    pub provider_id: ProviderId,
-    pub name: String,
-    pub max_requests_per_minute: i64,
-    pub max_tokens_per_minute: i64,
-    pub max_input_tokens_per_minute: i64,
-    pub max_output_tokens_per_minute: i64,
-    pub max_tokens_per_day: i64,
-    pub price_per_million_input_tokens: i32,
-    pub price_per_million_cache_creation_input_tokens: i32,
-    pub price_per_million_cache_read_input_tokens: i32,
-    pub price_per_million_output_tokens: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::provider::Entity",
-        from = "Column::ProviderId",
-        to = "super::provider::Column::Id"
-    )]
-    Provider,
-    #[sea_orm(has_many = "super::usage::Entity")]
-    Usages,
-}
-
-impl Related<super::provider::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Provider.def()
-    }
-}
-
-impl Related<super::usage::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Usages.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/llm/db/tables/provider.rs b/crates/collab/src/llm/db/tables/provider.rs
deleted file mode 100644
index 90838f7c65..0000000000
--- a/crates/collab/src/llm/db/tables/provider.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use crate::llm::db::ProviderId;
-use sea_orm::entity::prelude::*;
-
-/// An LLM provider.
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "providers")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ProviderId,
-    pub name: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::model::Entity")]
-    Models,
-}
-
-impl Related<super::model::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Models.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/llm/db/tables/subscription_usage.rs b/crates/collab/src/llm/db/tables/subscription_usage.rs
deleted file mode 100644
index dd93b03d05..0000000000
--- a/crates/collab/src/llm/db/tables/subscription_usage.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use crate::db::UserId;
-use crate::db::billing_subscription::SubscriptionKind;
-use sea_orm::entity::prelude::*;
-use time::PrimitiveDateTime;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "subscription_usages_v2")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: Uuid,
-    pub user_id: UserId,
-    pub period_start_at: PrimitiveDateTime,
-    pub period_end_at: PrimitiveDateTime,
-    pub plan: SubscriptionKind,
-    pub model_requests: i32,
-    pub edit_predictions: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/llm/db/tables/subscription_usage_meter.rs b/crates/collab/src/llm/db/tables/subscription_usage_meter.rs
deleted file mode 100644
index c082cf3bc1..0000000000
--- a/crates/collab/src/llm/db/tables/subscription_usage_meter.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use sea_orm::entity::prelude::*;
-use serde::Serialize;
-
-use crate::llm::db::ModelId;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "subscription_usage_meters_v2")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: Uuid,
-    pub subscription_usage_id: Uuid,
-    pub model_id: ModelId,
-    pub mode: CompletionMode,
-    pub requests: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::subscription_usage::Entity",
-        from = "Column::SubscriptionUsageId",
-        to = "super::subscription_usage::Column::Id"
-    )]
-    SubscriptionUsage,
-    #[sea_orm(
-        belongs_to = "super::model::Entity",
-        from = "Column::ModelId",
-        to = "super::model::Column::Id"
-    )]
-    Model,
-}
-
-impl Related<super::subscription_usage::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::SubscriptionUsage.def()
-    }
-}
-
-impl Related<super::model::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Model.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Hash, Serialize)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionMode {
-    #[sea_orm(string_value = "normal")]
-    Normal,
-    #[sea_orm(string_value = "max")]
-    Max,
-}
diff --git a/crates/collab/src/llm/db/tables/usage.rs b/crates/collab/src/llm/db/tables/usage.rs
deleted file mode 100644
index 331c94a8a9..0000000000
--- a/crates/collab/src/llm/db/tables/usage.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::{
-    db::UserId,
-    llm::db::{ModelId, UsageId, UsageMeasureId},
-};
-use sea_orm::entity::prelude::*;
-
-/// An LLM usage record.
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "usages")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: UsageId,
-    /// The ID of the Zed user.
-    ///
-    /// Corresponds to the `users` table in the primary collab database.
-    pub user_id: UserId,
-    pub model_id: ModelId,
-    pub measure_id: UsageMeasureId,
-    pub timestamp: DateTime,
-    pub buckets: Vec<i64>,
-    pub is_staff: bool,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::model::Entity",
-        from = "Column::ModelId",
-        to = "super::model::Column::Id"
-    )]
-    Model,
-    #[sea_orm(
-        belongs_to = "super::usage_measure::Entity",
-        from = "Column::MeasureId",
-        to = "super::usage_measure::Column::Id"
-    )]
-    UsageMeasure,
-}
-
-impl Related<super::model::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Model.def()
-    }
-}
-
-impl Related<super::usage_measure::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::UsageMeasure.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/llm/db/tables/usage_measure.rs b/crates/collab/src/llm/db/tables/usage_measure.rs
deleted file mode 100644
index 4f75577ed4..0000000000
--- a/crates/collab/src/llm/db/tables/usage_measure.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::llm::db::UsageMeasureId;
-use sea_orm::entity::prelude::*;
-
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, Hash, strum::EnumString, strum::Display, strum::EnumIter,
-)]
-#[strum(serialize_all = "snake_case")]
-pub enum UsageMeasure {
-    RequestsPerMinute,
-    TokensPerMinute,
-    InputTokensPerMinute,
-    OutputTokensPerMinute,
-    TokensPerDay,
-}
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "usage_measures")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: UsageMeasureId,
-    pub name: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::usage::Entity")]
-    Usages,
-}
-
-impl Related<super::usage::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Usages.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/llm/db/tests.rs b/crates/collab/src/llm/db/tests.rs
deleted file mode 100644
index 43a1b8b0d4..0000000000
--- a/crates/collab/src/llm/db/tests.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-mod provider_tests;
-
-use gpui::BackgroundExecutor;
-use parking_lot::Mutex;
-use rand::prelude::*;
-use sea_orm::ConnectionTrait;
-use sqlx::migrate::MigrateDatabase;
-use std::time::Duration;
-
-use crate::migrations::run_database_migrations;
-
-use super::*;
-
-pub struct TestLlmDb {
-    pub db: Option<LlmDatabase>,
-    pub connection: Option<sqlx::AnyConnection>,
-}
-
-impl TestLlmDb {
-    pub fn postgres(background: BackgroundExecutor) -> Self {
-        static LOCK: Mutex<()> = Mutex::new(());
-
-        let _guard = LOCK.lock();
-        let mut rng = StdRng::from_entropy();
-        let url = format!(
-            "postgres://postgres@localhost/zed-llm-test-{}",
-            rng.r#gen::<u128>()
-        );
-        let runtime = tokio::runtime::Builder::new_current_thread()
-            .enable_io()
-            .enable_time()
-            .build()
-            .unwrap();
-
-        let mut db = runtime.block_on(async {
-            sqlx::Postgres::create_database(&url)
-                .await
-                .expect("failed to create test db");
-            let mut options = ConnectOptions::new(url);
-            options
-                .max_connections(5)
-                .idle_timeout(Duration::from_secs(0));
-            let db = LlmDatabase::new(options, Executor::Deterministic(background))
-                .await
-                .unwrap();
-            let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations_llm");
-            run_database_migrations(db.options(), migrations_path)
-                .await
-                .unwrap();
-            db
-        });
-
-        db.runtime = Some(runtime);
-
-        Self {
-            db: Some(db),
-            connection: None,
-        }
-    }
-
-    pub fn db(&mut self) -> &mut LlmDatabase {
-        self.db.as_mut().unwrap()
-    }
-}
-
-#[macro_export]
-macro_rules! test_llm_db {
-    ($test_name:ident, $postgres_test_name:ident) => {
-        #[gpui::test]
-        async fn $postgres_test_name(cx: &mut gpui::TestAppContext) {
-            if !cfg!(target_os = "macos") {
-                return;
-            }
-
-            let mut test_db = $crate::llm::db::TestLlmDb::postgres(cx.executor().clone());
-            $test_name(test_db.db()).await;
-        }
-    };
-}
-
-impl Drop for TestLlmDb {
-    fn drop(&mut self) {
-        let db = self.db.take().unwrap();
-        if let sea_orm::DatabaseBackend::Postgres = db.pool.get_database_backend() {
-            db.runtime.as_ref().unwrap().block_on(async {
-                use util::ResultExt;
-                let query = "
-                        SELECT pg_terminate_backend(pg_stat_activity.pid)
-                        FROM pg_stat_activity
-                        WHERE
-                            pg_stat_activity.datname = current_database() AND
-                            pid <> pg_backend_pid();
-                    ";
-                db.pool
-                    .execute(sea_orm::Statement::from_string(
-                        db.pool.get_database_backend(),
-                        query,
-                    ))
-                    .await
-                    .log_err();
-                sqlx::Postgres::drop_database(db.options.get_url())
-                    .await
-                    .log_err();
-            })
-        }
-    }
-}
diff --git a/crates/collab/src/llm/db/tests/provider_tests.rs b/crates/collab/src/llm/db/tests/provider_tests.rs
deleted file mode 100644
index f4e1de40ec..0000000000
--- a/crates/collab/src/llm/db/tests/provider_tests.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use cloud_llm_client::LanguageModelProvider;
-use pretty_assertions::assert_eq;
-
-use crate::llm::db::LlmDatabase;
-use crate::test_llm_db;
-
-test_llm_db!(
-    test_initialize_providers,
-    test_initialize_providers_postgres
-);
-
-async fn test_initialize_providers(db: &mut LlmDatabase) {
-    let initial_providers = db.list_providers().await.unwrap();
-    assert_eq!(initial_providers, vec![]);
-
-    db.initialize_providers().await.unwrap();
-
-    // Do it twice, to make sure the operation is idempotent.
-    db.initialize_providers().await.unwrap();
-
-    let providers = db.list_providers().await.unwrap();
-
-    assert_eq!(
-        providers,
-        &[
-            LanguageModelProvider::Anthropic,
-            LanguageModelProvider::Google,
-            LanguageModelProvider::OpenAi,
-        ]
-    )
-}
diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index 177c97f076..cb6f6cad1d 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -62,13 +62,6 @@ async fn main() -> Result<()> {
             db.initialize_notification_kinds().await?;
 
             collab::seed::seed(&config, &db, false).await?;
-
-            if let Some(llm_database_url) = config.llm_database_url.clone() {
-                let db_options = db::ConnectOptions::new(llm_database_url);
-                let mut db = LlmDatabase::new(db_options.clone(), Executor::Production).await?;
-                db.initialize().await?;
-                collab::llm::db::seed_database(&config, &mut db, true).await?;
-            }
         }
         Some("serve") => {
             let mode = match args.next().as_deref() {
@@ -263,9 +256,6 @@ async fn setup_llm_database(config: &Config) -> Result<()> {
         .llm_database_migrations_path
         .as_deref()
         .unwrap_or_else(|| {
-            #[cfg(feature = "sqlite")]
-            let default_migrations = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations_llm.sqlite");
-            #[cfg(not(feature = "sqlite"))]
             let default_migrations = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations_llm");
 
             Path::new(default_migrations)
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index 8c545b0670..07ea1efc9d 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -565,7 +565,6 @@ impl TestServer {
     ) -> Arc<AppState> {
         Arc::new(AppState {
             db: test_db.db().clone(),
-            llm_db: None,
             livekit_client: Some(Arc::new(livekit_test_server.create_api_client())),
             blob_store_client: None,
             executor,

From f5f14111ef3203a7e28df531b808f47c2a6a79f0 Mon Sep 17 00:00:00 2001
From: zumbalogy <zumbalogy@users.noreply.github.com>
Date: Sat, 16 Aug 2025 08:19:38 +0200
Subject: [PATCH 080/823] Add setting for hiding the
 status_bar.cursor_position_button (#36288)

Release Notes:

- Added an option for the status_bar.cursor_position_button. Setting to
`false` will hide the button. It defaults to `true`.

This builds off the recent work to hide the language selection button
(https://github.com/zed-industries/zed/pull/33977). I tried to follow
that pattern, and to pick a clear name for the option, but any
feedback/change is welcome.

---------

Co-authored-by: zumbalogy <3770982+zumbalogy@users.noreply.github.com>
---
 assets/settings/default.json             | 4 +++-
 crates/editor/src/editor_settings.rs     | 8 ++++++++
 crates/go_to_line/src/cursor_position.rs | 9 ++++++++-
 docs/src/configuring-zed.md              | 1 +
 docs/src/visual-customization.md         | 4 ++++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 2c3bf6930d..1b485a8b28 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1256,7 +1256,9 @@
   // Status bar-related settings.
   "status_bar": {
     // Whether to show the active language button in the status bar.
-    "active_language_button": true
+    "active_language_button": true,
+    // Whether to show the cursor position button in the status bar.
+    "cursor_position_button": true
   },
   // Settings specific to the terminal
   "terminal": {
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 3d132651b8..d3a21c7642 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -132,6 +132,10 @@ pub struct StatusBar {
     ///
     /// Default: true
     pub active_language_button: bool,
+    /// Whether to show the cursor position button in the status bar.
+    ///
+    /// Default: true
+    pub cursor_position_button: bool,
 }
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
@@ -585,6 +589,10 @@ pub struct StatusBarContent {
     ///
     /// Default: true
     pub active_language_button: Option<bool>,
+    /// Whether to show the cursor position button in the status bar.
+    ///
+    /// Default: true
+    pub cursor_position_button: Option<bool>,
 }
 
 // Toolbar related settings
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index 29064eb29c..af92621378 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -1,4 +1,4 @@
-use editor::{Editor, MultiBufferSnapshot};
+use editor::{Editor, EditorSettings, MultiBufferSnapshot};
 use gpui::{App, Entity, FocusHandle, Focusable, Subscription, Task, WeakEntity};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -209,6 +209,13 @@ impl CursorPosition {
 
 impl Render for CursorPosition {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        if !EditorSettings::get_global(cx)
+            .status_bar
+            .cursor_position_button
+        {
+            return div();
+        }
+
         div().when_some(self.position, |el, position| {
             let mut text = format!(
                 "{}{FILE_ROW_COLUMN_DELIMITER}{}",
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index b4cb1fcb9b..9d56130256 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -1284,6 +1284,7 @@ Each option controls displaying of a particular toolbar element. If all elements
 ```json
 "status_bar": {
   "active_language_button": true,
+  "cursor_position_button": true
 },
 ```
 
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 7e75f6287d..6e598f4436 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -316,6 +316,10 @@ TBD: Centered layout related settings
     // Clicking the button brings up the language selector.
     // Defaults to true.
     "active_language_button": true,
+    // Show/hide a button that displays the cursor's position.
+    // Clicking the button brings up an input for jumping to a line and column.
+    // Defaults to true.
+    "cursor_position_button": true,
   },
 ```
 

From 7784fac288b89b5ffc5edbe634ecbc907325faa6 Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Sat, 16 Aug 2025 01:33:32 -0500
Subject: [PATCH 081/823] Separate minidump crashes from panics (#36267)

The minidump-based crash reporting is now entirely separate from our
legacy panic_hook-based reporting. This should improve the association
of minidumps with their metadata and give us more consistent crash
reports.

Release Notes:

- N/A

---------

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
---
 Cargo.lock                       |   2 +
 crates/crashes/Cargo.toml        |   2 +
 crates/crashes/src/crashes.rs    | 157 +++++++++++++-----
 crates/proto/proto/app.proto     |   6 +-
 crates/remote/src/ssh_session.rs |  30 ++--
 crates/remote_server/src/unix.rs |  93 +++++------
 crates/zed/src/main.rs           |  11 +-
 crates/zed/src/reliability.rs    | 262 ++++++++++++++-----------------
 8 files changed, 315 insertions(+), 248 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d72eed42e..1bce72b3a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4038,6 +4038,8 @@ dependencies = [
  "minidumper",
  "paths",
  "release_channel",
+ "serde",
+ "serde_json",
  "smol",
  "workspace-hack",
 ]
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index afb4936b63..2420b499f8 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -12,6 +12,8 @@ minidumper.workspace = true
 paths.workspace = true
 release_channel.workspace = true
 smol.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 workspace-hack.workspace = true
 
 [lints]
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index 5b9ae0b546..ddf6468be8 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -2,15 +2,17 @@ use crash_handler::CrashHandler;
 use log::info;
 use minidumper::{Client, LoopAction, MinidumpBinary};
 use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
+use serde::{Deserialize, Serialize};
 
 use std::{
     env,
-    fs::File,
+    fs::{self, File},
     io,
+    panic::Location,
     path::{Path, PathBuf},
     process::{self, Command},
     sync::{
-        LazyLock, OnceLock,
+        Arc, OnceLock,
         atomic::{AtomicBool, Ordering},
     },
     thread,
@@ -18,19 +20,17 @@ use std::{
 };
 
 // set once the crash handler has initialized and the client has connected to it
-pub static CRASH_HANDLER: AtomicBool = AtomicBool::new(false);
+pub static CRASH_HANDLER: OnceLock<Arc<Client>> = OnceLock::new();
 // set when the first minidump request is made to avoid generating duplicate crash reports
 pub static REQUESTED_MINIDUMP: AtomicBool = AtomicBool::new(false);
-const CRASH_HANDLER_TIMEOUT: Duration = Duration::from_secs(60);
+const CRASH_HANDLER_PING_TIMEOUT: Duration = Duration::from_secs(60);
+const CRASH_HANDLER_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 
-pub static GENERATE_MINIDUMPS: LazyLock<bool> = LazyLock::new(|| {
-    *RELEASE_CHANNEL != ReleaseChannel::Dev || env::var("ZED_GENERATE_MINIDUMPS").is_ok()
-});
-
-pub async fn init(id: String) {
-    if !*GENERATE_MINIDUMPS {
+pub async fn init(crash_init: InitCrashHandler) {
+    if *RELEASE_CHANNEL == ReleaseChannel::Dev && env::var("ZED_GENERATE_MINIDUMPS").is_err() {
         return;
     }
+
     let exe = env::current_exe().expect("unable to find ourselves");
     let zed_pid = process::id();
     // TODO: we should be able to get away with using 1 crash-handler process per machine,
@@ -61,9 +61,11 @@ pub async fn init(id: String) {
         smol::Timer::after(retry_frequency).await;
     }
     let client = maybe_client.unwrap();
-    client.send_message(1, id).unwrap(); // set session id on the server
+    client
+        .send_message(1, serde_json::to_vec(&crash_init).unwrap())
+        .unwrap();
 
-    let client = std::sync::Arc::new(client);
+    let client = Arc::new(client);
     let handler = crash_handler::CrashHandler::attach(unsafe {
         let client = client.clone();
         crash_handler::make_crash_event(move |crash_context: &crash_handler::CrashContext| {
@@ -72,7 +74,6 @@ pub async fn init(id: String) {
                 .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
                 .is_ok()
             {
-                client.send_message(2, "mistakes were made").unwrap();
                 client.ping().unwrap();
                 client.request_dump(crash_context).is_ok()
             } else {
@@ -87,7 +88,7 @@ pub async fn init(id: String) {
     {
         handler.set_ptracer(Some(server_pid));
     }
-    CRASH_HANDLER.store(true, Ordering::Release);
+    CRASH_HANDLER.set(client.clone()).ok();
     std::mem::forget(handler);
     info!("crash handler registered");
 
@@ -98,14 +99,43 @@ pub async fn init(id: String) {
 }
 
 pub struct CrashServer {
-    session_id: OnceLock<String>,
+    initialization_params: OnceLock<InitCrashHandler>,
+    panic_info: OnceLock<CrashPanic>,
+    has_connection: Arc<AtomicBool>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct CrashInfo {
+    pub init: InitCrashHandler,
+    pub panic: Option<CrashPanic>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct InitCrashHandler {
+    pub session_id: String,
+    pub zed_version: String,
+    pub release_channel: String,
+    pub commit_sha: String,
+    // pub gpu: String,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct CrashPanic {
+    pub message: String,
+    pub span: String,
 }
 
 impl minidumper::ServerHandler for CrashServer {
     fn create_minidump_file(&self) -> Result<(File, PathBuf), io::Error> {
-        let err_message = "Need to send a message with the ID upon starting the crash handler";
+        let err_message = "Missing initialization data";
         let dump_path = paths::logs_dir()
-            .join(self.session_id.get().expect(err_message))
+            .join(
+                &self
+                    .initialization_params
+                    .get()
+                    .expect(err_message)
+                    .session_id,
+            )
             .with_extension("dmp");
         let file = File::create(&dump_path)?;
         Ok((file, dump_path))
@@ -122,38 +152,71 @@ impl minidumper::ServerHandler for CrashServer {
                 info!("failed to write minidump: {:#}", e);
             }
         }
+
+        let crash_info = CrashInfo {
+            init: self
+                .initialization_params
+                .get()
+                .expect("not initialized")
+                .clone(),
+            panic: self.panic_info.get().cloned(),
+        };
+
+        let crash_data_path = paths::logs_dir()
+            .join(&crash_info.init.session_id)
+            .with_extension("json");
+
+        fs::write(crash_data_path, serde_json::to_vec(&crash_info).unwrap()).ok();
+
         LoopAction::Exit
     }
 
     fn on_message(&self, kind: u32, buffer: Vec<u8>) {
-        let message = String::from_utf8(buffer).expect("invalid utf-8");
-        info!("kind: {kind}, message: {message}",);
-        if kind == 1 {
-            self.session_id
-                .set(message)
-                .expect("session id already initialized");
+        match kind {
+            1 => {
+                let init_data =
+                    serde_json::from_slice::<InitCrashHandler>(&buffer).expect("invalid init data");
+                self.initialization_params
+                    .set(init_data)
+                    .expect("already initialized");
+            }
+            2 => {
+                let panic_data =
+                    serde_json::from_slice::<CrashPanic>(&buffer).expect("invalid panic data");
+                self.panic_info.set(panic_data).expect("already panicked");
+            }
+            _ => {
+                panic!("invalid message kind");
+            }
         }
     }
 
-    fn on_client_disconnected(&self, clients: usize) -> LoopAction {
-        info!("client disconnected, {clients} remaining");
-        if clients == 0 {
-            LoopAction::Exit
-        } else {
-            LoopAction::Continue
-        }
+    fn on_client_disconnected(&self, _clients: usize) -> LoopAction {
+        LoopAction::Exit
+    }
+
+    fn on_client_connected(&self, _clients: usize) -> LoopAction {
+        self.has_connection.store(true, Ordering::SeqCst);
+        LoopAction::Continue
     }
 }
 
-pub fn handle_panic() {
-    if !*GENERATE_MINIDUMPS {
-        return;
-    }
+pub fn handle_panic(message: String, span: Option<&Location>) {
+    let span = span
+        .map(|loc| format!("{}:{}", loc.file(), loc.line()))
+        .unwrap_or_default();
+
     // wait 500ms for the crash handler process to start up
     // if it's still not there just write panic info and no minidump
     let retry_frequency = Duration::from_millis(100);
     for _ in 0..5 {
-        if CRASH_HANDLER.load(Ordering::Acquire) {
+        if let Some(client) = CRASH_HANDLER.get() {
+            client
+                .send_message(
+                    2,
+                    serde_json::to_vec(&CrashPanic { message, span }).unwrap(),
+                )
+                .ok();
             log::error!("triggering a crash to generate a minidump...");
             #[cfg(target_os = "linux")]
             CrashHandler.simulate_signal(crash_handler::Signal::Trap as u32);
@@ -170,14 +233,30 @@ pub fn crash_server(socket: &Path) {
         log::info!("Couldn't create socket, there may already be a running crash server");
         return;
     };
-    let ab = AtomicBool::new(false);
+
+    let shutdown = Arc::new(AtomicBool::new(false));
+    let has_connection = Arc::new(AtomicBool::new(false));
+
+    std::thread::spawn({
+        let shutdown = shutdown.clone();
+        let has_connection = has_connection.clone();
+        move || {
+            std::thread::sleep(CRASH_HANDLER_CONNECT_TIMEOUT);
+            if !has_connection.load(Ordering::SeqCst) {
+                shutdown.store(true, Ordering::SeqCst);
+            }
+        }
+    });
+
     server
         .run(
             Box::new(CrashServer {
-                session_id: OnceLock::new(),
+                initialization_params: OnceLock::new(),
+                panic_info: OnceLock::new(),
+                has_connection,
             }),
-            &ab,
-            Some(CRASH_HANDLER_TIMEOUT),
+            &shutdown,
+            Some(CRASH_HANDLER_PING_TIMEOUT),
         )
         .expect("failed to run server");
 }
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index 1f2ab1f539..66f8da44f2 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -28,11 +28,13 @@ message GetCrashFiles {
 
 message GetCrashFilesResponse {
     repeated CrashReport crashes = 1;
+    repeated string legacy_panics = 2;
 }
 
 message CrashReport {
-    optional string panic_contents = 1;
-    optional bytes minidump_contents = 2;
+    reserved 1, 2;
+    string metadata = 3;
+    bytes minidump_contents = 4;
 }
 
 message Extension {
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 2f462a86a5..ea383ac264 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -1490,20 +1490,17 @@ impl RemoteConnection for SshRemoteConnection {
             identifier = &unique_identifier,
         );
 
-        if let Some(rust_log) = std::env::var("RUST_LOG").ok() {
-            start_proxy_command = format!(
-                "RUST_LOG={} {}",
-                shlex::try_quote(&rust_log).unwrap(),
-                start_proxy_command
-            )
-        }
-        if let Some(rust_backtrace) = std::env::var("RUST_BACKTRACE").ok() {
-            start_proxy_command = format!(
-                "RUST_BACKTRACE={} {}",
-                shlex::try_quote(&rust_backtrace).unwrap(),
-                start_proxy_command
-            )
+        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
+            if let Some(value) = std::env::var(env_var).ok() {
+                start_proxy_command = format!(
+                    "{}={} {} ",
+                    env_var,
+                    shlex::try_quote(&value).unwrap(),
+                    start_proxy_command,
+                );
+            }
         }
+
         if reconnect {
             start_proxy_command.push_str(" --reconnect");
         }
@@ -2241,8 +2238,7 @@ impl SshRemoteConnection {
 
             #[cfg(not(target_os = "windows"))]
             {
-                run_cmd(Command::new("gzip").args(["-9", "-f", &bin_path.to_string_lossy()]))
-                    .await?;
+                run_cmd(Command::new("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
             }
             #[cfg(target_os = "windows")]
             {
@@ -2474,7 +2470,7 @@ impl ChannelClient {
             },
             async {
                 smol::Timer::after(timeout).await;
-                anyhow::bail!("Timeout detected")
+                anyhow::bail!("Timed out resyncing remote client")
             },
         )
         .await
@@ -2488,7 +2484,7 @@ impl ChannelClient {
             },
             async {
                 smol::Timer::after(timeout).await;
-                anyhow::bail!("Timeout detected")
+                anyhow::bail!("Timed out pinging remote client")
             },
         )
         .await
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 9bb5645dc7..dc7fab8c3c 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -34,10 +34,10 @@ use smol::io::AsyncReadExt;
 
 use smol::Async;
 use smol::{net::unix::UnixListener, stream::StreamExt as _};
-use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::ops::ControlFlow;
 use std::str::FromStr;
+use std::sync::LazyLock;
 use std::{env, thread};
 use std::{
     io::Write,
@@ -48,6 +48,13 @@ use std::{
 use telemetry_events::LocationData;
 use util::ResultExt;
 
+pub static VERSION: LazyLock<&str> = LazyLock::new(|| match *RELEASE_CHANNEL {
+    ReleaseChannel::Stable | ReleaseChannel::Preview => env!("ZED_PKG_VERSION"),
+    ReleaseChannel::Nightly | ReleaseChannel::Dev => {
+        option_env!("ZED_COMMIT_SHA").unwrap_or("missing-zed-commit-sha")
+    }
+});
+
 fn init_logging_proxy() {
     env_logger::builder()
         .format(|buf, record| {
@@ -113,7 +120,6 @@ fn init_logging_server(log_file_path: PathBuf) -> Result<Receiver<Vec<u8>>> {
 
 fn init_panic_hook(session_id: String) {
     std::panic::set_hook(Box::new(move |info| {
-        crashes::handle_panic();
         let payload = info
             .payload()
             .downcast_ref::<&str>()
@@ -121,6 +127,8 @@ fn init_panic_hook(session_id: String) {
             .or_else(|| info.payload().downcast_ref::<String>().cloned())
             .unwrap_or_else(|| "Box<Any>".to_string());
 
+        crashes::handle_panic(payload.clone(), info.location());
+
         let backtrace = backtrace::Backtrace::new();
         let mut backtrace = backtrace
             .frames()
@@ -150,14 +158,6 @@ fn init_panic_hook(session_id: String) {
             (&backtrace).join("\n")
         );
 
-        let release_channel = *RELEASE_CHANNEL;
-        let version = match release_channel {
-            ReleaseChannel::Stable | ReleaseChannel::Preview => env!("ZED_PKG_VERSION"),
-            ReleaseChannel::Nightly | ReleaseChannel::Dev => {
-                option_env!("ZED_COMMIT_SHA").unwrap_or("missing-zed-commit-sha")
-            }
-        };
-
         let panic_data = telemetry_events::Panic {
             thread: thread_name.into(),
             payload: payload.clone(),
@@ -165,9 +165,9 @@ fn init_panic_hook(session_id: String) {
                 file: location.file().into(),
                 line: location.line(),
             }),
-            app_version: format!("remote-server-{version}"),
+            app_version: format!("remote-server-{}", *VERSION),
             app_commit_sha: option_env!("ZED_COMMIT_SHA").map(|sha| sha.into()),
-            release_channel: release_channel.dev_name().into(),
+            release_channel: RELEASE_CHANNEL.dev_name().into(),
             target: env!("TARGET").to_owned().into(),
             os_name: telemetry::os_name(),
             os_version: Some(telemetry::os_version()),
@@ -204,8 +204,8 @@ fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &Arc<C
     client.add_request_handler(
         project.downgrade(),
         |_, _: TypedEnvelope<proto::GetCrashFiles>, _cx| async move {
+            let mut legacy_panics = Vec::new();
             let mut crashes = Vec::new();
-            let mut minidumps_by_session_id = HashMap::new();
             let mut children = smol::fs::read_dir(paths::logs_dir()).await?;
             while let Some(child) = children.next().await {
                 let child = child?;
@@ -227,41 +227,31 @@ fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &Arc<C
                         .await
                         .context("error reading panic file")?;
 
-                    crashes.push(proto::CrashReport {
-                        panic_contents: Some(file_contents),
-                        minidump_contents: None,
-                    });
+                    legacy_panics.push(file_contents);
+                    smol::fs::remove_file(&child_path)
+                        .await
+                        .context("error removing panic")
+                        .log_err();
                 } else if extension == Some(OsStr::new("dmp")) {
-                    let session_id = child_path.file_stem().unwrap().to_string_lossy();
-                    minidumps_by_session_id
-                        .insert(session_id.to_string(), smol::fs::read(&child_path).await?);
-                }
-
-                // We've done what we can, delete the file
-                smol::fs::remove_file(&child_path)
-                    .await
-                    .context("error removing panic")
-                    .log_err();
-            }
-
-            for crash in &mut crashes {
-                let panic: telemetry_events::Panic =
-                    serde_json::from_str(crash.panic_contents.as_ref().unwrap())?;
-                if let dump @ Some(_) = minidumps_by_session_id.remove(&panic.session_id) {
-                    crash.minidump_contents = dump;
+                    let mut json_path = child_path.clone();
+                    json_path.set_extension("json");
+                    if let Ok(json_content) = smol::fs::read_to_string(&json_path).await {
+                        crashes.push(CrashReport {
+                            metadata: json_content,
+                            minidump_contents: smol::fs::read(&child_path).await?,
+                        });
+                        smol::fs::remove_file(&child_path).await.log_err();
+                        smol::fs::remove_file(&json_path).await.log_err();
+                    } else {
+                        log::error!("Couldn't find json metadata for crash: {child_path:?}");
+                    }
                 }
             }
 
-            crashes.extend(
-                minidumps_by_session_id
-                    .into_values()
-                    .map(|dmp| CrashReport {
-                        panic_contents: None,
-                        minidump_contents: Some(dmp),
-                    }),
-            );
-
-            anyhow::Ok(proto::GetCrashFilesResponse { crashes })
+            anyhow::Ok(proto::GetCrashFilesResponse {
+                crashes,
+                legacy_panics,
+            })
         },
     );
 }
@@ -442,7 +432,12 @@ pub fn execute_run(
     let app = gpui::Application::headless();
     let id = std::process::id().to_string();
     app.background_executor()
-        .spawn(crashes::init(id.clone()))
+        .spawn(crashes::init(crashes::InitCrashHandler {
+            session_id: id.clone(),
+            zed_version: VERSION.to_owned(),
+            release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
+            commit_sha: option_env!("ZED_COMMIT_SHA").unwrap_or("no_sha").to_owned(),
+        }))
         .detach();
     init_panic_hook(id);
     let log_rx = init_logging_server(log_file)?;
@@ -569,7 +564,13 @@ pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
     let server_paths = ServerPaths::new(&identifier)?;
 
     let id = std::process::id().to_string();
-    smol::spawn(crashes::init(id.clone())).detach();
+    smol::spawn(crashes::init(crashes::InitCrashHandler {
+        session_id: id.clone(),
+        zed_version: VERSION.to_owned(),
+        release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
+        commit_sha: option_env!("ZED_COMMIT_SHA").unwrap_or("no_sha").to_owned(),
+    }))
+    .detach();
     init_panic_hook(id);
 
     log::info!("starting proxy process. PID: {}", std::process::id());
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index fd987ef6c5..2a82f81b5b 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -8,6 +8,7 @@ use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
 use client::{Client, ProxySettings, UserStore, parse_zed_link};
 use collab_ui::channel_view::ChannelView;
 use collections::HashMap;
+use crashes::InitCrashHandler;
 use db::kvp::{GLOBAL_KEY_VALUE_STORE, KEY_VALUE_STORE};
 use editor::Editor;
 use extension::ExtensionHostProxy;
@@ -269,7 +270,15 @@ pub fn main() {
     let session = app.background_executor().block(Session::new());
 
     app.background_executor()
-        .spawn(crashes::init(session_id.clone()))
+        .spawn(crashes::init(InitCrashHandler {
+            session_id: session_id.clone(),
+            zed_version: app_version.to_string(),
+            release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
+            commit_sha: app_commit_sha
+                .as_ref()
+                .map(|sha| sha.full())
+                .unwrap_or_else(|| "no sha".to_owned()),
+        }))
         .detach();
     reliability::init_panic_hook(
         app_version,
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index fde44344b1..c27f4cb0a8 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -12,6 +12,7 @@ use gpui::{App, AppContext as _, SemanticVersion};
 use http_client::{self, HttpClient, HttpClientWithUrl, HttpRequestExt, Method};
 use paths::{crashes_dir, crashes_retired_dir};
 use project::Project;
+use proto::{CrashReport, GetCrashFilesResponse};
 use release_channel::{AppCommitSha, RELEASE_CHANNEL, ReleaseChannel};
 use reqwest::multipart::{Form, Part};
 use settings::Settings;
@@ -51,10 +52,6 @@ pub fn init_panic_hook(
                 thread::yield_now();
             }
         }
-        crashes::handle_panic();
-
-        let thread = thread::current();
-        let thread_name = thread.name().unwrap_or("<unnamed>");
 
         let payload = info
             .payload()
@@ -63,6 +60,11 @@ pub fn init_panic_hook(
             .or_else(|| info.payload().downcast_ref::<String>().cloned())
             .unwrap_or_else(|| "Box<Any>".to_string());
 
+        crashes::handle_panic(payload.clone(), info.location());
+
+        let thread = thread::current();
+        let thread_name = thread.name().unwrap_or("<unnamed>");
+
         if *release_channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
             let location = info.location().unwrap();
             let backtrace = Backtrace::new();
@@ -214,45 +216,53 @@ pub fn init(
         let installation_id = installation_id.clone();
         let system_id = system_id.clone();
 
-        if let Some(ssh_client) = project.ssh_client() {
-            ssh_client.update(cx, |client, cx| {
-                if TelemetrySettings::get_global(cx).diagnostics {
-                    let request = client.proto_client().request(proto::GetCrashFiles {});
-                    cx.background_spawn(async move {
-                        let crash_files = request.await?;
-                        for crash in crash_files.crashes {
-                            let mut panic: Option<Panic> = crash
-                                .panic_contents
-                                .and_then(|s| serde_json::from_str(&s).log_err());
+        let Some(ssh_client) = project.ssh_client() else {
+            return;
+        };
+        ssh_client.update(cx, |client, cx| {
+            if !TelemetrySettings::get_global(cx).diagnostics {
+                return;
+            }
+            let request = client.proto_client().request(proto::GetCrashFiles {});
+            cx.background_spawn(async move {
+                let GetCrashFilesResponse {
+                    legacy_panics,
+                    crashes,
+                } = request.await?;
 
-                            if let Some(panic) = panic.as_mut() {
-                                panic.session_id = session_id.clone();
-                                panic.system_id = system_id.clone();
-                                panic.installation_id = installation_id.clone();
-                            }
-
-                            if let Some(minidump) = crash.minidump_contents {
-                                upload_minidump(
-                                    http_client.clone(),
-                                    minidump.clone(),
-                                    panic.as_ref(),
-                                )
-                                .await
-                                .log_err();
-                            }
-
-                            if let Some(panic) = panic {
-                                upload_panic(&http_client, &panic_report_url, panic, &mut None)
-                                    .await?;
-                            }
-                        }
-
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
+                for panic in legacy_panics {
+                    if let Some(mut panic) = serde_json::from_str::<Panic>(&panic).log_err() {
+                        panic.session_id = session_id.clone();
+                        panic.system_id = system_id.clone();
+                        panic.installation_id = installation_id.clone();
+                        upload_panic(&http_client, &panic_report_url, panic, &mut None).await?;
+                    }
                 }
+
+                let Some(endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
+                    return Ok(());
+                };
+                for CrashReport {
+                    metadata,
+                    minidump_contents,
+                } in crashes
+                {
+                    if let Some(metadata) = serde_json::from_str(&metadata).log_err() {
+                        upload_minidump(
+                            http_client.clone(),
+                            endpoint,
+                            minidump_contents,
+                            &metadata,
+                        )
+                        .await
+                        .log_err();
+                    }
+                }
+
+                anyhow::Ok(())
             })
-        }
+            .detach_and_log_err(cx);
+        })
     })
     .detach();
 }
@@ -466,16 +476,18 @@ fn upload_panics_and_crashes(
     installation_id: Option<String>,
     cx: &App,
 ) {
-    let telemetry_settings = *client::TelemetrySettings::get_global(cx);
+    if !client::TelemetrySettings::get_global(cx).diagnostics {
+        return;
+    }
     cx.background_spawn(async move {
-        let most_recent_panic =
-            upload_previous_panics(http.clone(), &panic_report_url, telemetry_settings)
-                .await
-                .log_err()
-                .flatten();
-        upload_previous_crashes(http, most_recent_panic, installation_id, telemetry_settings)
+        upload_previous_minidumps(http.clone()).await.warn_on_err();
+        let most_recent_panic = upload_previous_panics(http.clone(), &panic_report_url)
             .await
             .log_err()
+            .flatten();
+        upload_previous_crashes(http, most_recent_panic, installation_id)
+            .await
+            .log_err();
     })
     .detach()
 }
@@ -484,7 +496,6 @@ fn upload_panics_and_crashes(
 async fn upload_previous_panics(
     http: Arc<HttpClientWithUrl>,
     panic_report_url: &Url,
-    telemetry_settings: client::TelemetrySettings,
 ) -> anyhow::Result<Option<(i64, String)>> {
     let mut children = smol::fs::read_dir(paths::logs_dir()).await?;
 
@@ -507,58 +518,41 @@ async fn upload_previous_panics(
             continue;
         }
 
-        if telemetry_settings.diagnostics {
-            let panic_file_content = smol::fs::read_to_string(&child_path)
-                .await
-                .context("error reading panic file")?;
+        let panic_file_content = smol::fs::read_to_string(&child_path)
+            .await
+            .context("error reading panic file")?;
 
-            let panic: Option<Panic> = serde_json::from_str(&panic_file_content)
-                .log_err()
-                .or_else(|| {
-                    panic_file_content
-                        .lines()
-                        .next()
-                        .and_then(|line| serde_json::from_str(line).ok())
-                })
-                .unwrap_or_else(|| {
-                    log::error!("failed to deserialize panic file {:?}", panic_file_content);
-                    None
-                });
+        let panic: Option<Panic> = serde_json::from_str(&panic_file_content)
+            .log_err()
+            .or_else(|| {
+                panic_file_content
+                    .lines()
+                    .next()
+                    .and_then(|line| serde_json::from_str(line).ok())
+            })
+            .unwrap_or_else(|| {
+                log::error!("failed to deserialize panic file {:?}", panic_file_content);
+                None
+            });
 
-            if let Some(panic) = panic {
-                let minidump_path = paths::logs_dir()
-                    .join(&panic.session_id)
-                    .with_extension("dmp");
-                if minidump_path.exists() {
-                    let minidump = smol::fs::read(&minidump_path)
-                        .await
-                        .context("Failed to read minidump")?;
-                    if upload_minidump(http.clone(), minidump, Some(&panic))
-                        .await
-                        .log_err()
-                        .is_some()
-                    {
-                        fs::remove_file(minidump_path).ok();
-                    }
-                }
-
-                if !upload_panic(&http, &panic_report_url, panic, &mut most_recent_panic).await? {
-                    continue;
-                }
-            }
+        if let Some(panic) = panic
+            && upload_panic(&http, &panic_report_url, panic, &mut most_recent_panic).await?
+        {
+            // We've done what we can, delete the file
+            fs::remove_file(child_path)
+                .context("error removing panic")
+                .log_err();
         }
-
-        // We've done what we can, delete the file
-        fs::remove_file(child_path)
-            .context("error removing panic")
-            .log_err();
     }
 
-    if MINIDUMP_ENDPOINT.is_none() {
-        return Ok(most_recent_panic);
-    }
+    Ok(most_recent_panic)
+}
+
+pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::Result<()> {
+    let Some(minidump_endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
+        return Err(anyhow::anyhow!("Minidump endpoint not set"));
+    };
 
-    // loop back over the directory again to upload any minidumps that are missing panics
     let mut children = smol::fs::read_dir(paths::logs_dir()).await?;
     while let Some(child) = children.next().await {
         let child = child?;
@@ -566,33 +560,35 @@ async fn upload_previous_panics(
         if child_path.extension() != Some(OsStr::new("dmp")) {
             continue;
         }
-        if upload_minidump(
-            http.clone(),
-            smol::fs::read(&child_path)
-                .await
-                .context("Failed to read minidump")?,
-            None,
-        )
-        .await
-        .log_err()
-        .is_some()
-        {
-            fs::remove_file(child_path).ok();
+        let mut json_path = child_path.clone();
+        json_path.set_extension("json");
+        if let Ok(metadata) = serde_json::from_slice(&smol::fs::read(&json_path).await?) {
+            if upload_minidump(
+                http.clone(),
+                &minidump_endpoint,
+                smol::fs::read(&child_path)
+                    .await
+                    .context("Failed to read minidump")?,
+                &metadata,
+            )
+            .await
+            .log_err()
+            .is_some()
+            {
+                fs::remove_file(child_path).ok();
+                fs::remove_file(json_path).ok();
+            }
         }
     }
-
-    Ok(most_recent_panic)
+    Ok(())
 }
 
 async fn upload_minidump(
     http: Arc<HttpClientWithUrl>,
+    endpoint: &str,
     minidump: Vec<u8>,
-    panic: Option<&Panic>,
+    metadata: &crashes::CrashInfo,
 ) -> Result<()> {
-    let minidump_endpoint = MINIDUMP_ENDPOINT
-        .to_owned()
-        .ok_or_else(|| anyhow::anyhow!("Minidump endpoint not set"))?;
-
     let mut form = Form::new()
         .part(
             "upload_file_minidump",
@@ -600,38 +596,22 @@ async fn upload_minidump(
                 .file_name("minidump.dmp")
                 .mime_str("application/octet-stream")?,
         )
+        .text(
+            "sentry[tags][channel]",
+            metadata.init.release_channel.clone(),
+        )
+        .text("sentry[tags][version]", metadata.init.zed_version.clone())
+        .text("sentry[release]", metadata.init.commit_sha.clone())
         .text("platform", "rust");
-    if let Some(panic) = panic {
-        form = form
-            .text("sentry[tags][channel]", panic.release_channel.clone())
-            .text("sentry[tags][version]", panic.app_version.clone())
-            .text("sentry[context][os][name]", panic.os_name.clone())
-            .text(
-                "sentry[context][device][architecture]",
-                panic.architecture.clone(),
-            )
-            .text("sentry[logentry][formatted]", panic.payload.clone());
-
-        if let Some(sha) = panic.app_commit_sha.clone() {
-            form = form.text("sentry[release]", sha)
-        } else {
-            form = form.text(
-                "sentry[release]",
-                format!("{}-{}", panic.release_channel, panic.app_version),
-            )
-        }
-        if let Some(v) = panic.os_version.clone() {
-            form = form.text("sentry[context][os][release]", v);
-        }
-        if let Some(location) = panic.location_data.as_ref() {
-            form = form.text("span", format!("{}:{}", location.file, location.line))
-        }
+    if let Some(panic_info) = metadata.panic.as_ref() {
+        form = form.text("sentry[logentry][formatted]", panic_info.message.clone());
+        form = form.text("span", panic_info.span.clone());
         // TODO: add gpu-context, feature-flag-context, and more of device-context like gpu
         // name, screen resolution, available ram, device model, etc
     }
 
     let mut response_text = String::new();
-    let mut response = http.send_multipart_form(&minidump_endpoint, form).await?;
+    let mut response = http.send_multipart_form(endpoint, form).await?;
     response
         .body_mut()
         .read_to_string(&mut response_text)
@@ -681,11 +661,7 @@ async fn upload_previous_crashes(
     http: Arc<HttpClientWithUrl>,
     most_recent_panic: Option<(i64, String)>,
     installation_id: Option<String>,
-    telemetry_settings: client::TelemetrySettings,
 ) -> Result<()> {
-    if !telemetry_settings.diagnostics {
-        return Ok(());
-    }
     let last_uploaded = KEY_VALUE_STORE
         .read_kvp(LAST_CRASH_UPLOADED)?
         .unwrap_or("zed-2024-01-17-221900.ips".to_string()); // don't upload old crash reports from before we had this.

From 864d4bc1d133e5beb24c64bc0bf7336fc274ed1c Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Sat, 16 Aug 2025 09:55:46 +0200
Subject: [PATCH 082/823] editor: Drop multiline targets in navigation buffers
 (#36291)

Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 85f2e01ed4..0111e91347 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -15909,10 +15909,15 @@ impl Editor {
                                     .text_for_range(location.range.clone())
                                     .collect::<String>()
                             })
+                            .filter(|text| !text.contains('\n'))
                             .unique()
                             .take(3)
                             .join(", ");
-                        format!("{tab_kind} for {target}")
+                        if target.is_empty() {
+                            tab_kind.to_owned()
+                        } else {
+                            format!("{tab_kind} for {target}")
+                        }
                     })
                     .context("buffer title")?;
 
@@ -16117,10 +16122,15 @@ impl Editor {
                             .text_for_range(location.range.clone())
                             .collect::<String>()
                     })
+                    .filter(|text| !text.contains('\n'))
                     .unique()
                     .take(3)
                     .join(", ");
-                let title = format!("References to {target}");
+                let title = if target.is_empty() {
+                    "References".to_owned()
+                } else {
+                    format!("References to {target}")
+                };
                 Self::open_locations_in_multibuffer(
                     workspace,
                     locations,

From 6f2e7c355ec4d2b68285047258af7e5d72596b33 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Sat, 16 Aug 2025 13:36:17 +0200
Subject: [PATCH 083/823] Ensure bundled files are opened as read-only (#36299)

Closes #36297

While we set the editor as read-only for bundled files, we didn't do
this for the underlying buffer. This PR fixes this and adds a test for
the corresponding case.

Release Notes:

- Fixed an issue where bundled files (e.g. the default settings) could
be edited in some circumstances
---
 crates/zed/src/zed.rs | 44 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index b06652b2ce..a324ba0932 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -31,6 +31,7 @@ use gpui::{
     px, retain_all,
 };
 use image_viewer::ImageInfo;
+use language::Capability;
 use language_tools::lsp_tool::{self, LspTool};
 use migrate::{MigrationBanner, MigrationEvent, MigrationNotification, MigrationType};
 use migrator::{migrate_keymap, migrate_settings};
@@ -1764,7 +1765,11 @@ fn open_bundled_file(
                 workspace.with_local_workspace(window, cx, |workspace, window, cx| {
                     let project = workspace.project();
                     let buffer = project.update(cx, move |project, cx| {
-                        project.create_local_buffer(text.as_ref(), language, cx)
+                        let buffer = project.create_local_buffer(text.as_ref(), language, cx);
+                        buffer.update(cx, |buffer, cx| {
+                            buffer.set_capability(Capability::ReadOnly, cx);
+                        });
+                        buffer
                     });
                     let buffer =
                         cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(title.into()));
@@ -4543,6 +4548,43 @@ mod tests {
         assert!(has_default_theme);
     }
 
+    #[gpui::test]
+    async fn test_bundled_files_editor(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+        cx.update(init);
+
+        let project = Project::test(app_state.fs.clone(), [], cx).await;
+        let _window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
+
+        cx.update(|cx| {
+            cx.dispatch_action(&OpenDefaultSettings);
+        });
+        cx.run_until_parked();
+
+        assert_eq!(cx.read(|cx| cx.windows().len()), 1);
+
+        let workspace = cx.windows()[0].downcast::<Workspace>().unwrap();
+        let active_editor = workspace
+            .update(cx, |workspace, _, cx| {
+                workspace.active_item_as::<Editor>(cx)
+            })
+            .unwrap();
+        assert!(
+            active_editor.is_some(),
+            "Settings action should have opened an editor with the default file contents"
+        );
+
+        let active_editor = active_editor.unwrap();
+        assert!(
+            active_editor.read_with(cx, |editor, cx| editor.read_only(cx)),
+            "Default settings should be readonly"
+        );
+        assert!(
+            active_editor.read_with(cx, |editor, cx| editor.buffer().read(cx).read_only()),
+            "The underlying buffer should also be readonly for the shipped default settings"
+        );
+    }
+
     #[gpui::test]
     async fn test_bundled_languages(cx: &mut TestAppContext) {
         env_logger::builder().is_test(true).try_init().ok();

From 5620e359af2c96aa420ade68d017c802012dd005 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 16 Aug 2025 09:09:14 -0400
Subject: [PATCH 084/823] collab: Make `admin` column non-nullable on `users`
 table (#36307)

This PR updates the `admin` column on the `users` table to be
non-nullable.

We were already treating it like this in practice.

All rows in the production database already have a value for the `admin`
column.

Release Notes:

- N/A
---
 .../migrations/20250816124707_make_admin_required_on_users.sql  | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 crates/collab/migrations/20250816124707_make_admin_required_on_users.sql

diff --git a/crates/collab/migrations/20250816124707_make_admin_required_on_users.sql b/crates/collab/migrations/20250816124707_make_admin_required_on_users.sql
new file mode 100644
index 0000000000..e372723d6d
--- /dev/null
+++ b/crates/collab/migrations/20250816124707_make_admin_required_on_users.sql
@@ -0,0 +1,2 @@
+alter table users
+alter column admin set not null;

From d1958aa43913889390c171e46d6e59259f7be2c0 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 16 Aug 2025 09:48:38 -0400
Subject: [PATCH 085/823] collab: Add `orb_customer_id` to `billing_customers`
 (#36310)

This PR adds an `orb_customer_id` column to the `billing_customers`
table.

Release Notes:

- N/A
---
 .../20250816133027_add_orb_customer_id_to_billing_customers.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 crates/collab/migrations/20250816133027_add_orb_customer_id_to_billing_customers.sql

diff --git a/crates/collab/migrations/20250816133027_add_orb_customer_id_to_billing_customers.sql b/crates/collab/migrations/20250816133027_add_orb_customer_id_to_billing_customers.sql
new file mode 100644
index 0000000000..ea5e4de52a
--- /dev/null
+++ b/crates/collab/migrations/20250816133027_add_orb_customer_id_to_billing_customers.sql
@@ -0,0 +1,2 @@
+alter table billing_customers
+    add column orb_customer_id text;

From ea7bc96c051371f93d7247492a91975608e4e1f7 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 16 Aug 2025 09:52:14 -0400
Subject: [PATCH 086/823] collab: Remove billing-related tables from SQLite
 schema (#36312)

This PR removes the billing-related tables from the SQLite schema, as we
don't actually reference these tables anywhere in the Collab codebase
anymore.

Release Notes:

- N/A
---
 .../20221109000000_test_schema.sql            | 50 -------------------
 1 file changed, 50 deletions(-)

diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 73d473ab76..63f999b3a7 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -485,56 +485,6 @@ CREATE TABLE rate_buckets (
 
 CREATE INDEX idx_user_id_rate_limit ON rate_buckets (user_id, rate_limit_name);
 
-CREATE TABLE IF NOT EXISTS billing_preferences (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    user_id INTEGER NOT NULL REFERENCES users (id),
-    max_monthly_llm_usage_spending_in_cents INTEGER NOT NULL,
-    model_request_overages_enabled bool NOT NULL DEFAULT FALSE,
-    model_request_overages_spend_limit_in_cents integer NOT NULL DEFAULT 0
-);
-
-CREATE UNIQUE INDEX "uix_billing_preferences_on_user_id" ON billing_preferences (user_id);
-
-CREATE TABLE IF NOT EXISTS billing_customers (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    user_id INTEGER NOT NULL REFERENCES users (id),
-    has_overdue_invoices BOOLEAN NOT NULL DEFAULT FALSE,
-    stripe_customer_id TEXT NOT NULL,
-    trial_started_at TIMESTAMP
-);
-
-CREATE UNIQUE INDEX "uix_billing_customers_on_user_id" ON billing_customers (user_id);
-
-CREATE UNIQUE INDEX "uix_billing_customers_on_stripe_customer_id" ON billing_customers (stripe_customer_id);
-
-CREATE TABLE IF NOT EXISTS billing_subscriptions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    billing_customer_id INTEGER NOT NULL REFERENCES billing_customers (id),
-    stripe_subscription_id TEXT NOT NULL,
-    stripe_subscription_status TEXT NOT NULL,
-    stripe_cancel_at TIMESTAMP,
-    stripe_cancellation_reason TEXT,
-    kind TEXT,
-    stripe_current_period_start BIGINT,
-    stripe_current_period_end BIGINT
-);
-
-CREATE INDEX "ix_billing_subscriptions_on_billing_customer_id" ON billing_subscriptions (billing_customer_id);
-
-CREATE UNIQUE INDEX "uix_billing_subscriptions_on_stripe_subscription_id" ON billing_subscriptions (stripe_subscription_id);
-
-CREATE TABLE IF NOT EXISTS processed_stripe_events (
-    stripe_event_id TEXT PRIMARY KEY,
-    stripe_event_type TEXT NOT NULL,
-    stripe_event_created_timestamp INTEGER NOT NULL,
-    processed_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE INDEX "ix_processed_stripe_events_on_stripe_event_created_timestamp" ON processed_stripe_events (stripe_event_created_timestamp);
-
 CREATE TABLE IF NOT EXISTS "breakpoints" (
     "id" INTEGER PRIMARY KEY AUTOINCREMENT,
     "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,

From 36184a71df8766fec6ceebd3c54c42f871abec84 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 16 Aug 2025 10:11:36 -0400
Subject: [PATCH 087/823] collab: Drop `rate_buckets` table (#36315)

This PR drops the `rate_buckets` table, as we're no longer using it.

Release Notes:

- N/A
---
 .../migrations.sqlite/20221109000000_test_schema.sql  | 11 -----------
 .../20250816135346_drop_rate_buckets_table.sql        |  1 +
 2 files changed, 1 insertion(+), 11 deletions(-)
 create mode 100644 crates/collab/migrations/20250816135346_drop_rate_buckets_table.sql

diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 63f999b3a7..170ac7b0a2 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -474,17 +474,6 @@ CREATE UNIQUE INDEX "index_extensions_external_id" ON "extensions" ("external_id
 
 CREATE INDEX "index_extensions_total_download_count" ON "extensions" ("total_download_count");
 
-CREATE TABLE rate_buckets (
-    user_id INT NOT NULL,
-    rate_limit_name VARCHAR(255) NOT NULL,
-    token_count INT NOT NULL,
-    last_refill TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    PRIMARY KEY (user_id, rate_limit_name),
-    FOREIGN KEY (user_id) REFERENCES users (id)
-);
-
-CREATE INDEX idx_user_id_rate_limit ON rate_buckets (user_id, rate_limit_name);
-
 CREATE TABLE IF NOT EXISTS "breakpoints" (
     "id" INTEGER PRIMARY KEY AUTOINCREMENT,
     "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
diff --git a/crates/collab/migrations/20250816135346_drop_rate_buckets_table.sql b/crates/collab/migrations/20250816135346_drop_rate_buckets_table.sql
new file mode 100644
index 0000000000..f51a33ed30
--- /dev/null
+++ b/crates/collab/migrations/20250816135346_drop_rate_buckets_table.sql
@@ -0,0 +1 @@
+drop table rate_buckets;

From 7b3fe0a474f5ead24fb9da976dfde745cc6ba936 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Sat, 16 Aug 2025 16:35:06 +0200
Subject: [PATCH 088/823] Make agent font size inherit the UI font size by
 default (#36306)

Ensures issues like #36242 and #36295 do not arise where users are
confused that the agent panel does not follow the default UI font size
whilst also keeping the possibility of customization. The agent font
size was matching the UI font size previously alredy, which makes it
easier to change it for most scenarios.

Also cleans up some related logic around modifying the font sizes.

Release Notes:

- The agent panel font size will now inherit the UI font size by default
if not set in your settings.
---
 assets/settings/default.json       |  4 +-
 crates/agent_ui/src/agent_panel.rs |  6 +--
 crates/theme/src/settings.rs       | 75 ++++++++++++++++--------------
 crates/theme/src/theme.rs          |  8 ++++
 crates/zed/src/zed.rs              | 16 ++-----
 5 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 1b485a8b28..ff000001b5 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -71,8 +71,8 @@
   "ui_font_weight": 400,
   // The default font size for text in the UI
   "ui_font_size": 16,
-  // The default font size for text in the agent panel
-  "agent_font_size": 16,
+  // The default font size for text in the agent panel. Falls back to the UI font size if unset.
+  "agent_font_size": null,
   // How much to fade out unused code.
   "unnecessary_code_fade": 0.3,
   // Active pane styling settings.
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 519f7980ff..44d605af57 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1257,13 +1257,11 @@ impl AgentPanel {
                                 ThemeSettings::get_global(cx).agent_font_size(cx) + delta;
                             let _ = settings
                                 .agent_font_size
-                                .insert(theme::clamp_font_size(agent_font_size).0);
+                                .insert(Some(theme::clamp_font_size(agent_font_size).into()));
                         },
                     );
                 } else {
-                    theme::adjust_agent_font_size(cx, |size| {
-                        *size += delta;
-                    });
+                    theme::adjust_agent_font_size(cx, |size| size + delta);
                 }
             }
             WhichFontSize::BufferFont => {
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index f5f1fd5547..df147cfe92 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -19,6 +19,7 @@ use util::ResultExt as _;
 use util::schemars::replace_subschema;
 
 const MIN_FONT_SIZE: Pixels = px(6.0);
+const MAX_FONT_SIZE: Pixels = px(100.0);
 const MIN_LINE_HEIGHT: f32 = 1.0;
 
 #[derive(
@@ -103,8 +104,8 @@ pub struct ThemeSettings {
     ///
     /// The terminal font family can be overridden using it's own setting.
     pub buffer_font: Font,
-    /// The agent font size. Determines the size of text in the agent panel.
-    agent_font_size: Pixels,
+    /// The agent font size. Determines the size of text in the agent panel. Falls back to the UI font size if unset.
+    agent_font_size: Option<Pixels>,
     /// The line height for buffers, and the terminal.
     ///
     /// Changing this may affect the spacing of some UI elements.
@@ -404,9 +405,9 @@ pub struct ThemeSettingsContent {
     #[serde(default)]
     #[schemars(default = "default_font_features")]
     pub buffer_font_features: Option<FontFeatures>,
-    /// The font size for the agent panel.
+    /// The font size for the agent panel. Falls back to the UI font size if unset.
     #[serde(default)]
-    pub agent_font_size: Option<f32>,
+    pub agent_font_size: Option<Option<f32>>,
     /// The name of the Zed theme to use.
     #[serde(default)]
     pub theme: Option<ThemeSelection>,
@@ -599,13 +600,13 @@ impl ThemeSettings {
         clamp_font_size(font_size)
     }
 
-    /// Returns the UI font size.
+    /// Returns the agent panel font size. Falls back to the UI font size if unset.
     pub fn agent_font_size(&self, cx: &App) -> Pixels {
-        let font_size = cx
-            .try_global::<AgentFontSize>()
+        cx.try_global::<AgentFontSize>()
             .map(|size| size.0)
-            .unwrap_or(self.agent_font_size);
-        clamp_font_size(font_size)
+            .or(self.agent_font_size)
+            .map(clamp_font_size)
+            .unwrap_or_else(|| self.ui_font_size(cx))
     }
 
     /// Returns the buffer font size, read from the settings.
@@ -624,6 +625,14 @@ impl ThemeSettings {
         self.ui_font_size
     }
 
+    /// Returns the agent font size, read from the settings.
+    ///
+    /// The real agent font size is stored in-memory, to support temporary font size changes.
+    /// Use [`Self::agent_font_size`] to get the real font size.
+    pub fn agent_font_size_settings(&self) -> Option<Pixels> {
+        self.agent_font_size
+    }
+
     // TODO: Rename: `line_height` -> `buffer_line_height`
     /// Returns the buffer's line height.
     pub fn line_height(&self) -> f32 {
@@ -732,14 +741,12 @@ pub fn adjusted_font_size(size: Pixels, cx: &App) -> Pixels {
 }
 
 /// Adjusts the buffer font size.
-pub fn adjust_buffer_font_size(cx: &mut App, mut f: impl FnMut(&mut Pixels)) {
+pub fn adjust_buffer_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
     let buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size;
-    let mut adjusted_size = cx
+    let adjusted_size = cx
         .try_global::<BufferFontSize>()
         .map_or(buffer_font_size, |adjusted_size| adjusted_size.0);
-
-    f(&mut adjusted_size);
-    cx.set_global(BufferFontSize(clamp_font_size(adjusted_size)));
+    cx.set_global(BufferFontSize(clamp_font_size(f(adjusted_size))));
     cx.refresh_windows();
 }
 
@@ -765,14 +772,12 @@ pub fn setup_ui_font(window: &mut Window, cx: &mut App) -> gpui::Font {
 }
 
 /// Sets the adjusted UI font size.
-pub fn adjust_ui_font_size(cx: &mut App, mut f: impl FnMut(&mut Pixels)) {
+pub fn adjust_ui_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
     let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-    let mut adjusted_size = cx
+    let adjusted_size = cx
         .try_global::<UiFontSize>()
         .map_or(ui_font_size, |adjusted_size| adjusted_size.0);
-
-    f(&mut adjusted_size);
-    cx.set_global(UiFontSize(clamp_font_size(adjusted_size)));
+    cx.set_global(UiFontSize(clamp_font_size(f(adjusted_size))));
     cx.refresh_windows();
 }
 
@@ -784,19 +789,17 @@ pub fn reset_ui_font_size(cx: &mut App) {
     }
 }
 
-/// Sets the adjusted UI font size.
-pub fn adjust_agent_font_size(cx: &mut App, mut f: impl FnMut(&mut Pixels)) {
+/// Sets the adjusted agent panel font size.
+pub fn adjust_agent_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
     let agent_font_size = ThemeSettings::get_global(cx).agent_font_size(cx);
-    let mut adjusted_size = cx
+    let adjusted_size = cx
         .try_global::<AgentFontSize>()
         .map_or(agent_font_size, |adjusted_size| adjusted_size.0);
-
-    f(&mut adjusted_size);
-    cx.set_global(AgentFontSize(clamp_font_size(adjusted_size)));
+    cx.set_global(AgentFontSize(clamp_font_size(f(adjusted_size))));
     cx.refresh_windows();
 }
 
-/// Resets the UI font size to the default value.
+/// Resets the agent panel font size to the default value.
 pub fn reset_agent_font_size(cx: &mut App) {
     if cx.has_global::<AgentFontSize>() {
         cx.remove_global::<AgentFontSize>();
@@ -806,7 +809,7 @@ pub fn reset_agent_font_size(cx: &mut App) {
 
 /// Ensures font size is within the valid range.
 pub fn clamp_font_size(size: Pixels) -> Pixels {
-    size.max(MIN_FONT_SIZE)
+    size.clamp(MIN_FONT_SIZE, MAX_FONT_SIZE)
 }
 
 fn clamp_font_weight(weight: f32) -> FontWeight {
@@ -860,7 +863,7 @@ impl settings::Settings for ThemeSettings {
             },
             buffer_font_size: defaults.buffer_font_size.unwrap().into(),
             buffer_line_height: defaults.buffer_line_height.unwrap(),
-            agent_font_size: defaults.agent_font_size.unwrap().into(),
+            agent_font_size: defaults.agent_font_size.flatten().map(Into::into),
             theme_selection: defaults.theme.clone(),
             active_theme: themes
                 .get(defaults.theme.as_ref().unwrap().theme(*system_appearance))
@@ -959,20 +962,20 @@ impl settings::Settings for ThemeSettings {
                 }
             }
 
-            merge(&mut this.ui_font_size, value.ui_font_size.map(Into::into));
-            this.ui_font_size = this.ui_font_size.clamp(px(6.), px(100.));
-
+            merge(
+                &mut this.ui_font_size,
+                value.ui_font_size.map(Into::into).map(clamp_font_size),
+            );
             merge(
                 &mut this.buffer_font_size,
-                value.buffer_font_size.map(Into::into),
+                value.buffer_font_size.map(Into::into).map(clamp_font_size),
             );
-            this.buffer_font_size = this.buffer_font_size.clamp(px(6.), px(100.));
-
             merge(
                 &mut this.agent_font_size,
-                value.agent_font_size.map(Into::into),
+                value
+                    .agent_font_size
+                    .map(|value| value.map(Into::into).map(clamp_font_size)),
             );
-            this.agent_font_size = this.agent_font_size.clamp(px(6.), px(100.));
 
             merge(&mut this.buffer_line_height, value.buffer_line_height);
 
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index f04eeade73..e02324a142 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -107,6 +107,8 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut App) {
     let mut prev_buffer_font_size_settings =
         ThemeSettings::get_global(cx).buffer_font_size_settings();
     let mut prev_ui_font_size_settings = ThemeSettings::get_global(cx).ui_font_size_settings();
+    let mut prev_agent_font_size_settings =
+        ThemeSettings::get_global(cx).agent_font_size_settings();
     cx.observe_global::<SettingsStore>(move |cx| {
         let buffer_font_size_settings = ThemeSettings::get_global(cx).buffer_font_size_settings();
         if buffer_font_size_settings != prev_buffer_font_size_settings {
@@ -119,6 +121,12 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut App) {
             prev_ui_font_size_settings = ui_font_size_settings;
             reset_ui_font_size(cx);
         }
+
+        let agent_font_size_settings = ThemeSettings::get_global(cx).agent_font_size_settings();
+        if agent_font_size_settings != prev_agent_font_size_settings {
+            prev_agent_font_size_settings = agent_font_size_settings;
+            reset_agent_font_size(cx);
+        }
     })
     .detach();
 }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index a324ba0932..cfafbb70f0 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -716,9 +716,7 @@ fn register_actions(
                             .insert(theme::clamp_font_size(ui_font_size).0);
                     });
                 } else {
-                    theme::adjust_ui_font_size(cx, |size| {
-                        *size += px(1.0);
-                    });
+                    theme::adjust_ui_font_size(cx, |size| size + px(1.0));
                 }
             }
         })
@@ -733,9 +731,7 @@ fn register_actions(
                             .insert(theme::clamp_font_size(ui_font_size).0);
                     });
                 } else {
-                    theme::adjust_ui_font_size(cx, |size| {
-                        *size -= px(1.0);
-                    });
+                    theme::adjust_ui_font_size(cx, |size| size - px(1.0));
                 }
             }
         })
@@ -763,9 +759,7 @@ fn register_actions(
                             .insert(theme::clamp_font_size(buffer_font_size).0);
                     });
                 } else {
-                    theme::adjust_buffer_font_size(cx, |size| {
-                        *size += px(1.0);
-                    });
+                    theme::adjust_buffer_font_size(cx, |size| size + px(1.0));
                 }
             }
         })
@@ -781,9 +775,7 @@ fn register_actions(
                             .insert(theme::clamp_font_size(buffer_font_size).0);
                     });
                 } else {
-                    theme::adjust_buffer_font_size(cx, |size| {
-                        *size -= px(1.0);
-                    });
+                    theme::adjust_buffer_font_size(cx, |size| size - px(1.0));
                 }
             }
         })

From 332626e5825564e97afc969292c90d9b0fb40b6d Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Sat, 16 Aug 2025 17:04:09 +0200
Subject: [PATCH 089/823] Allow Permission Request to only require a
 ToolCallUpdate instead of a full tool call (#36319)

Release Notes:

- N/A
---
 Cargo.lock                                    |  4 +-
 Cargo.toml                                    |  2 +-
 crates/acp_thread/src/acp_thread.rs           | 36 ++++++++++-------
 crates/acp_thread/src/connection.rs           |  4 +-
 crates/agent2/src/agent.rs                    | 11 ++---
 crates/agent2/src/thread.rs                   | 40 ++++++-------------
 crates/agent2/src/tools/edit_file_tool.rs     | 12 ++++--
 crates/agent_servers/src/acp/v0.rs            |  6 +--
 crates/agent_servers/src/acp/v1.rs            |  2 +-
 crates/agent_servers/src/claude.rs            |  3 +-
 crates/agent_servers/src/claude/mcp_server.rs |  4 +-
 11 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1bce72b3a1..f59d92739b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.24"
+version = "0.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd68bbbef8e424fb8a605c5f0b00c360f682c4528b0a5feb5ec928aaf5ce28e"
+checksum = "2ab66add8be8d6a963f5bf4070045c1bbf36472837654c73e2298dd16bda5bf7"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
diff --git a/Cargo.toml b/Cargo.toml
index 644b6c0f40..b467e8743e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -426,7 +426,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.24"
+agent-client-protocol = "0.0.25"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 2ef94a3cbe..3bb1b99ba1 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -792,7 +792,7 @@ impl AcpThread {
         &mut self,
         update: acp::SessionUpdate,
         cx: &mut Context<Self>,
-    ) -> Result<()> {
+    ) -> Result<(), acp::Error> {
         match update {
             acp::SessionUpdate::UserMessageChunk { content } => {
                 self.push_user_content_block(None, content, cx);
@@ -804,7 +804,7 @@ impl AcpThread {
                 self.push_assistant_content_block(content, true, cx);
             }
             acp::SessionUpdate::ToolCall(tool_call) => {
-                self.upsert_tool_call(tool_call, cx);
+                self.upsert_tool_call(tool_call, cx)?;
             }
             acp::SessionUpdate::ToolCallUpdate(tool_call_update) => {
                 self.update_tool_call(tool_call_update, cx)?;
@@ -940,32 +940,40 @@ impl AcpThread {
     }
 
     /// Updates a tool call if id matches an existing entry, otherwise inserts a new one.
-    pub fn upsert_tool_call(&mut self, tool_call: acp::ToolCall, cx: &mut Context<Self>) {
+    pub fn upsert_tool_call(
+        &mut self,
+        tool_call: acp::ToolCall,
+        cx: &mut Context<Self>,
+    ) -> Result<(), acp::Error> {
         let status = ToolCallStatus::Allowed {
             status: tool_call.status,
         };
-        self.upsert_tool_call_inner(tool_call, status, cx)
+        self.upsert_tool_call_inner(tool_call.into(), status, cx)
     }
 
+    /// Fails if id does not match an existing entry.
     pub fn upsert_tool_call_inner(
         &mut self,
-        tool_call: acp::ToolCall,
+        tool_call_update: acp::ToolCallUpdate,
         status: ToolCallStatus,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Result<(), acp::Error> {
         let language_registry = self.project.read(cx).languages().clone();
-        let call = ToolCall::from_acp(tool_call, status, language_registry, cx);
-        let id = call.id.clone();
+        let id = tool_call_update.id.clone();
 
-        if let Some((ix, current_call)) = self.tool_call_mut(&call.id) {
-            *current_call = call;
+        if let Some((ix, current_call)) = self.tool_call_mut(&id) {
+            current_call.update_fields(tool_call_update.fields, language_registry, cx);
+            current_call.status = status;
 
             cx.emit(AcpThreadEvent::EntryUpdated(ix));
         } else {
+            let call =
+                ToolCall::from_acp(tool_call_update.try_into()?, status, language_registry, cx);
             self.push_entry(AgentThreadEntry::ToolCall(call), cx);
         };
 
         self.resolve_locations(id, cx);
+        Ok(())
     }
 
     fn tool_call_mut(&mut self, id: &acp::ToolCallId) -> Option<(usize, &mut ToolCall)> {
@@ -1034,10 +1042,10 @@ impl AcpThread {
 
     pub fn request_tool_call_authorization(
         &mut self,
-        tool_call: acp::ToolCall,
+        tool_call: acp::ToolCallUpdate,
         options: Vec<acp::PermissionOption>,
         cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<acp::PermissionOptionId> {
+    ) -> Result<oneshot::Receiver<acp::PermissionOptionId>, acp::Error> {
         let (tx, rx) = oneshot::channel();
 
         let status = ToolCallStatus::WaitingForConfirmation {
@@ -1045,9 +1053,9 @@ impl AcpThread {
             respond_tx: tx,
         };
 
-        self.upsert_tool_call_inner(tool_call, status, cx);
+        self.upsert_tool_call_inner(tool_call, status, cx)?;
         cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
-        rx
+        Ok(rx)
     }
 
     pub fn authorize_tool_call(
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index b2116020fb..7497d2309f 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -286,12 +286,12 @@ mod test_support {
                     if let Some((tool_call, options)) = permission_request {
                         let permission = thread.update(cx, |thread, cx| {
                             thread.request_tool_call_authorization(
-                                tool_call.clone(),
+                                tool_call.clone().into(),
                                 options.clone(),
                                 cx,
                             )
                         })?;
-                        permission.await?;
+                        permission?.await?;
                     }
                     thread.update(cx, |thread, cx| {
                         thread.handle_session_update(update.clone(), cx).unwrap();
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 358365d11f..d63e3f8134 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -514,10 +514,11 @@ impl NativeAgentConnection {
                                     thread.request_tool_call_authorization(tool_call, options, cx)
                                 })?;
                                 cx.background_spawn(async move {
-                                    if let Some(option) = recv
-                                        .await
-                                        .context("authorization sender was dropped")
-                                        .log_err()
+                                    if let Some(recv) = recv.log_err()
+                                        && let Some(option) = recv
+                                            .await
+                                            .context("authorization sender was dropped")
+                                            .log_err()
                                     {
                                         response
                                             .send(option)
@@ -530,7 +531,7 @@ impl NativeAgentConnection {
                             AgentResponseEvent::ToolCall(tool_call) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.upsert_tool_call(tool_call, cx)
-                                })?;
+                                })??;
                             }
                             AgentResponseEvent::ToolCallUpdate(update) => {
                                 acp_thread.update(cx, |thread, cx| {
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index cfd67f4b05..0741bb9e08 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -448,7 +448,7 @@ pub enum AgentResponseEvent {
 
 #[derive(Debug)]
 pub struct ToolCallAuthorization {
-    pub tool_call: acp::ToolCall,
+    pub tool_call: acp::ToolCallUpdate,
     pub options: Vec<acp::PermissionOption>,
     pub response: oneshot::Sender<acp::PermissionOptionId>,
 }
@@ -901,7 +901,7 @@ impl Thread {
 
         let fs = self.project.read(cx).fs().clone();
         let tool_event_stream =
-            ToolCallEventStream::new(&tool_use, tool.kind(), event_stream.clone(), Some(fs));
+            ToolCallEventStream::new(tool_use.id.clone(), event_stream.clone(), Some(fs));
         tool_event_stream.update_fields(acp::ToolCallUpdateFields {
             status: Some(acp::ToolCallStatus::InProgress),
             ..Default::default()
@@ -1344,8 +1344,6 @@ impl AgentResponseEventStream {
 #[derive(Clone)]
 pub struct ToolCallEventStream {
     tool_use_id: LanguageModelToolUseId,
-    kind: acp::ToolKind,
-    input: serde_json::Value,
     stream: AgentResponseEventStream,
     fs: Option<Arc<dyn Fs>>,
 }
@@ -1355,32 +1353,19 @@ impl ToolCallEventStream {
     pub fn test() -> (Self, ToolCallEventStreamReceiver) {
         let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
 
-        let stream = ToolCallEventStream::new(
-            &LanguageModelToolUse {
-                id: "test_id".into(),
-                name: "test_tool".into(),
-                raw_input: String::new(),
-                input: serde_json::Value::Null,
-                is_input_complete: true,
-            },
-            acp::ToolKind::Other,
-            AgentResponseEventStream(events_tx),
-            None,
-        );
+        let stream =
+            ToolCallEventStream::new("test_id".into(), AgentResponseEventStream(events_tx), None);
 
         (stream, ToolCallEventStreamReceiver(events_rx))
     }
 
     fn new(
-        tool_use: &LanguageModelToolUse,
-        kind: acp::ToolKind,
+        tool_use_id: LanguageModelToolUseId,
         stream: AgentResponseEventStream,
         fs: Option<Arc<dyn Fs>>,
     ) -> Self {
         Self {
-            tool_use_id: tool_use.id.clone(),
-            kind,
-            input: tool_use.input.clone(),
+            tool_use_id,
             stream,
             fs,
         }
@@ -1427,12 +1412,13 @@ impl ToolCallEventStream {
             .0
             .unbounded_send(Ok(AgentResponseEvent::ToolCallAuthorization(
                 ToolCallAuthorization {
-                    tool_call: AgentResponseEventStream::initial_tool_call(
-                        &self.tool_use_id,
-                        title.into(),
-                        self.kind.clone(),
-                        self.input.clone(),
-                    ),
+                    tool_call: acp::ToolCallUpdate {
+                        id: acp::ToolCallId(self.tool_use_id.to_string().into()),
+                        fields: acp::ToolCallUpdateFields {
+                            title: Some(title.into()),
+                            ..Default::default()
+                        },
+                    },
                     options: vec![
                         acp::PermissionOption {
                             id: acp::PermissionOptionId("always_allow".into()),
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index c77b9f6a69..4b4f98daec 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -1001,7 +1001,10 @@ mod tests {
         });
 
         let event = stream_rx.expect_authorization().await;
-        assert_eq!(event.tool_call.title, "test 1 (local settings)");
+        assert_eq!(
+            event.tool_call.fields.title,
+            Some("test 1 (local settings)".into())
+        );
 
         // Test 2: Path outside project should require confirmation
         let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
@@ -1018,7 +1021,7 @@ mod tests {
         });
 
         let event = stream_rx.expect_authorization().await;
-        assert_eq!(event.tool_call.title, "test 2");
+        assert_eq!(event.tool_call.fields.title, Some("test 2".into()));
 
         // Test 3: Relative path without .zed should not require confirmation
         let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
@@ -1051,7 +1054,10 @@ mod tests {
             )
         });
         let event = stream_rx.expect_authorization().await;
-        assert_eq!(event.tool_call.title, "test 4 (local settings)");
+        assert_eq!(
+            event.tool_call.fields.title,
+            Some("test 4 (local settings)".into())
+        );
 
         // Test 5: When always_allow_tool_actions is enabled, no confirmation needed
         cx.update(|cx| {
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index e936c87643..74647f7313 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -135,9 +135,9 @@ impl acp_old::Client for OldAcpClientDelegate {
         let response = cx
             .update(|cx| {
                 self.thread.borrow().update(cx, |thread, cx| {
-                    thread.request_tool_call_authorization(tool_call, acp_options, cx)
+                    thread.request_tool_call_authorization(tool_call.into(), acp_options, cx)
                 })
-            })?
+            })??
             .context("Failed to update thread")?
             .await;
 
@@ -168,7 +168,7 @@ impl acp_old::Client for OldAcpClientDelegate {
                     cx,
                 )
             })
-        })?
+        })??
         .context("Failed to update thread")?;
 
         Ok(acp_old::PushToolCallResponse {
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 6cf9801d06..506ae80886 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -233,7 +233,7 @@ impl acp::Client for ClientDelegate {
                 thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
             })?;
 
-        let result = rx.await;
+        let result = rx?.await;
 
         let outcome = match result {
             Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 14a179ba3d..4b3a173349 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -560,8 +560,9 @@ impl ClaudeAgentSession {
                                         thread.upsert_tool_call(
                                             claude_tool.as_acp(acp::ToolCallId(id.into())),
                                             cx,
-                                        );
+                                        )?;
                                     }
+                                    anyhow::Ok(())
                                 })
                                 .log_err();
                         }
diff --git a/crates/agent_servers/src/claude/mcp_server.rs b/crates/agent_servers/src/claude/mcp_server.rs
index 53a8556e74..22cb2f8f8d 100644
--- a/crates/agent_servers/src/claude/mcp_server.rs
+++ b/crates/agent_servers/src/claude/mcp_server.rs
@@ -154,7 +154,7 @@ impl McpServerTool for PermissionTool {
         let chosen_option = thread
             .update(cx, |thread, cx| {
                 thread.request_tool_call_authorization(
-                    claude_tool.as_acp(tool_call_id),
+                    claude_tool.as_acp(tool_call_id).into(),
                     vec![
                         acp::PermissionOption {
                             id: allow_option_id.clone(),
@@ -169,7 +169,7 @@ impl McpServerTool for PermissionTool {
                     ],
                     cx,
                 )
-            })?
+            })??
             .await?;
 
         let response = if chosen_option == allow_option_id {

From 15a1eb2a2e3e249eae5ee402fc8a7a3d19260bf6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 16 Aug 2025 13:02:51 -0400
Subject: [PATCH 090/823] emmet: Extract to zed-extensions/emmet repository
 (#36323)

This PR extracts the Emmet extension to the
[zed-extensions/emmet](https://github.com/zed-extensions/emmet)
repository.

Release Notes:

- N/A
---
 .config/hakari.toml             |   1 -
 Cargo.lock                      |   7 ---
 Cargo.toml                      |   1 -
 docs/src/languages/emmet.md     |   2 +
 extensions/emmet/.gitignore     |   3 -
 extensions/emmet/Cargo.toml     |  16 -----
 extensions/emmet/LICENSE-APACHE |   1 -
 extensions/emmet/extension.toml |  24 --------
 extensions/emmet/src/emmet.rs   | 106 --------------------------------
 9 files changed, 2 insertions(+), 159 deletions(-)
 delete mode 100644 extensions/emmet/.gitignore
 delete mode 100644 extensions/emmet/Cargo.toml
 delete mode 120000 extensions/emmet/LICENSE-APACHE
 delete mode 100644 extensions/emmet/extension.toml
 delete mode 100644 extensions/emmet/src/emmet.rs

diff --git a/.config/hakari.toml b/.config/hakari.toml
index f71e97b45c..8ce0b77490 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -34,7 +34,6 @@ workspace-members = [
     "zed_extension_api",
 
     # exclude all extensions
-    "zed_emmet",
     "zed_glsl",
     "zed_html",
     "zed_proto",
diff --git a/Cargo.lock b/Cargo.lock
index f59d92739b..5100a63477 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20520,13 +20520,6 @@ dependencies = [
  "workspace-hack",
 ]
 
-[[package]]
-name = "zed_emmet"
-version = "0.0.6"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zed_extension_api"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index b467e8743e..a94db953ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -199,7 +199,6 @@ members = [
     # Extensions
     #
 
-    "extensions/emmet",
     "extensions/glsl",
     "extensions/html",
     "extensions/proto",
diff --git a/docs/src/languages/emmet.md b/docs/src/languages/emmet.md
index 1a76291ad4..73e34c209f 100644
--- a/docs/src/languages/emmet.md
+++ b/docs/src/languages/emmet.md
@@ -1,5 +1,7 @@
 # Emmet
 
+Emmet support is available through the [Emmet extension](https://github.com/zed-extensions/emmet).
+
 [Emmet](https://emmet.io/) is a web-developer’s toolkit that can greatly improve your HTML & CSS workflow.
 
 - Language Server: [olrtg/emmet-language-server](https://github.com/olrtg/emmet-language-server)
diff --git a/extensions/emmet/.gitignore b/extensions/emmet/.gitignore
deleted file mode 100644
index 62c0add260..0000000000
--- a/extensions/emmet/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.wasm
-grammars
-target
diff --git a/extensions/emmet/Cargo.toml b/extensions/emmet/Cargo.toml
deleted file mode 100644
index 2fbdf2a7e5..0000000000
--- a/extensions/emmet/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zed_emmet"
-version = "0.0.6"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/emmet.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
diff --git a/extensions/emmet/LICENSE-APACHE b/extensions/emmet/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/emmet/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/emmet/extension.toml b/extensions/emmet/extension.toml
deleted file mode 100644
index a1848400b8..0000000000
--- a/extensions/emmet/extension.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-id = "emmet"
-name = "Emmet"
-description = "Emmet support"
-version = "0.0.6"
-schema_version = 1
-authors = ["Piotr Osiewicz <piotr@zed.dev>"]
-repository = "https://github.com/zed-industries/zed"
-
-[language_servers.emmet-language-server]
-name = "Emmet Language Server"
-language = "HTML"
-languages = ["HTML", "PHP", "ERB", "HTML/ERB", "JavaScript", "TSX", "CSS", "HEEX", "Elixir", "Vue.js"]
-
-[language_servers.emmet-language-server.language_ids]
-"HTML" = "html"
-"PHP" = "php"
-"ERB" = "eruby"
-"HTML/ERB" = "eruby"
-"JavaScript" = "javascriptreact"
-"TSX" = "typescriptreact"
-"CSS" = "css"
-"HEEX" = "heex"
-"Elixir" = "heex"
-"Vue.js" = "vue"
diff --git a/extensions/emmet/src/emmet.rs b/extensions/emmet/src/emmet.rs
deleted file mode 100644
index 1434e16e88..0000000000
--- a/extensions/emmet/src/emmet.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use std::{env, fs};
-use zed_extension_api::{self as zed, Result};
-
-struct EmmetExtension {
-    did_find_server: bool,
-}
-
-const SERVER_PATH: &str = "node_modules/@olrtg/emmet-language-server/dist/index.js";
-const PACKAGE_NAME: &str = "@olrtg/emmet-language-server";
-
-impl EmmetExtension {
-    fn server_exists(&self) -> bool {
-        fs::metadata(SERVER_PATH).map_or(false, |stat| stat.is_file())
-    }
-
-    fn server_script_path(&mut self, language_server_id: &zed::LanguageServerId) -> Result<String> {
-        let server_exists = self.server_exists();
-        if self.did_find_server && server_exists {
-            return Ok(SERVER_PATH.to_string());
-        }
-
-        zed::set_language_server_installation_status(
-            language_server_id,
-            &zed::LanguageServerInstallationStatus::CheckingForUpdate,
-        );
-        let version = zed::npm_package_latest_version(PACKAGE_NAME)?;
-
-        if !server_exists
-            || zed::npm_package_installed_version(PACKAGE_NAME)?.as_ref() != Some(&version)
-        {
-            zed::set_language_server_installation_status(
-                language_server_id,
-                &zed::LanguageServerInstallationStatus::Downloading,
-            );
-            let result = zed::npm_install_package(PACKAGE_NAME, &version);
-            match result {
-                Ok(()) => {
-                    if !self.server_exists() {
-                        Err(format!(
-                            "installed package '{PACKAGE_NAME}' did not contain expected path '{SERVER_PATH}'",
-                        ))?;
-                    }
-                }
-                Err(error) => {
-                    if !self.server_exists() {
-                        Err(error)?;
-                    }
-                }
-            }
-        }
-
-        self.did_find_server = true;
-        Ok(SERVER_PATH.to_string())
-    }
-}
-
-impl zed::Extension for EmmetExtension {
-    fn new() -> Self {
-        Self {
-            did_find_server: false,
-        }
-    }
-
-    fn language_server_command(
-        &mut self,
-        language_server_id: &zed::LanguageServerId,
-        _worktree: &zed::Worktree,
-    ) -> Result<zed::Command> {
-        let server_path = self.server_script_path(language_server_id)?;
-        Ok(zed::Command {
-            command: zed::node_binary_path()?,
-            args: vec![
-                zed_ext::sanitize_windows_path(env::current_dir().unwrap())
-                    .join(&server_path)
-                    .to_string_lossy()
-                    .to_string(),
-                "--stdio".to_string(),
-            ],
-            env: Default::default(),
-        })
-    }
-}
-
-zed::register_extension!(EmmetExtension);
-
-/// Extensions to the Zed extension API that have not yet stabilized.
-mod zed_ext {
-    /// Sanitizes the given path to remove the leading `/` on Windows.
-    ///
-    /// On macOS and Linux this is a no-op.
-    ///
-    /// This is a workaround for https://github.com/bytecodealliance/wasmtime/issues/10415.
-    pub fn sanitize_windows_path(path: std::path::PathBuf) -> std::path::PathBuf {
-        use zed_extension_api::{Os, current_platform};
-
-        let (os, _arch) = current_platform();
-        match os {
-            Os::Mac | Os::Linux => path,
-            Os::Windows => path
-                .to_string_lossy()
-                .to_string()
-                .trim_start_matches('/')
-                .into(),
-        }
-    }
-}

From f17f63ec84424f772bfdb7c7998db598829596bf Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 16 Aug 2025 15:00:31 -0400
Subject: [PATCH 091/823] Remove `/docs` slash command (#36325)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR removes the `/docs` slash command.

We never fully shipped this—with it requiring explicit opt-in via a
setting—and it doesn't seem like the feature is needed in an agentic
world.

Release Notes:

- Removed the `/docs` slash command.
---
 Cargo.lock                                    |  30 -
 Cargo.toml                                    |   2 -
 assets/settings/default.json                  |   5 -
 crates/agent_ui/Cargo.toml                    |   1 -
 crates/agent_ui/src/agent_configuration.rs    |   1 -
 crates/agent_ui/src/agent_ui.rs               |   7 -
 crates/agent_ui/src/slash_command_settings.rs |  11 -
 crates/agent_ui/src/text_thread_editor.rs     |  86 +--
 crates/assistant_slash_commands/Cargo.toml    |   1 -
 .../src/assistant_slash_commands.rs           |   2 -
 .../src/docs_command.rs                       | 543 ---------------
 crates/extension/src/extension_host_proxy.rs  |  34 -
 crates/extension/src/extension_manifest.rs    |   7 -
 crates/extension_cli/src/main.rs              |   4 -
 .../extension_compilation_benchmark.rs        |   1 -
 .../extension_host/src/capability_granter.rs  |   1 -
 crates/extension_host/src/extension_host.rs   |  15 +-
 .../src/extension_store_test.rs               |   3 -
 crates/indexed_docs/Cargo.toml                |  38 --
 crates/indexed_docs/LICENSE-GPL               |   1 -
 .../src/extension_indexed_docs_provider.rs    |  81 ---
 crates/indexed_docs/src/indexed_docs.rs       |  16 -
 crates/indexed_docs/src/providers.rs          |   1 -
 crates/indexed_docs/src/providers/rustdoc.rs  | 291 ---------
 .../src/providers/rustdoc/item.rs             |  82 ---
 .../src/providers/rustdoc/popular_crates.txt  | 252 -------
 .../src/providers/rustdoc/to_markdown.rs      | 618 ------------------
 crates/indexed_docs/src/registry.rs           |  62 --
 crates/indexed_docs/src/store.rs              | 346 ----------
 typos.toml                                    |   3 -
 30 files changed, 6 insertions(+), 2539 deletions(-)
 delete mode 100644 crates/assistant_slash_commands/src/docs_command.rs
 delete mode 100644 crates/indexed_docs/Cargo.toml
 delete mode 120000 crates/indexed_docs/LICENSE-GPL
 delete mode 100644 crates/indexed_docs/src/extension_indexed_docs_provider.rs
 delete mode 100644 crates/indexed_docs/src/indexed_docs.rs
 delete mode 100644 crates/indexed_docs/src/providers.rs
 delete mode 100644 crates/indexed_docs/src/providers/rustdoc.rs
 delete mode 100644 crates/indexed_docs/src/providers/rustdoc/item.rs
 delete mode 100644 crates/indexed_docs/src/providers/rustdoc/popular_crates.txt
 delete mode 100644 crates/indexed_docs/src/providers/rustdoc/to_markdown.rs
 delete mode 100644 crates/indexed_docs/src/registry.rs
 delete mode 100644 crates/indexed_docs/src/store.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5100a63477..b4bf705eb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -347,7 +347,6 @@ dependencies = [
  "gpui",
  "html_to_markdown",
  "http_client",
- "indexed_docs",
  "indoc",
  "inventory",
  "itertools 0.14.0",
@@ -872,7 +871,6 @@ dependencies = [
  "gpui",
  "html_to_markdown",
  "http_client",
- "indexed_docs",
  "language",
  "pretty_assertions",
  "project",
@@ -8383,34 +8381,6 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
-[[package]]
-name = "indexed_docs"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "cargo_metadata",
- "collections",
- "derive_more 0.99.19",
- "extension",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "heed",
- "html_to_markdown",
- "http_client",
- "indexmap",
- "indoc",
- "parking_lot",
- "paths",
- "pretty_assertions",
- "serde",
- "strum 0.27.1",
- "util",
- "workspace-hack",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index a94db953ab..b3105bd97c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,6 @@ members = [
     "crates/http_client_tls",
     "crates/icons",
     "crates/image_viewer",
-    "crates/indexed_docs",
     "crates/edit_prediction",
     "crates/edit_prediction_button",
     "crates/inspector_ui",
@@ -305,7 +304,6 @@ http_client = { path = "crates/http_client" }
 http_client_tls = { path = "crates/http_client_tls" }
 icons = { path = "crates/icons" }
 image_viewer = { path = "crates/image_viewer" }
-indexed_docs = { path = "crates/indexed_docs" }
 edit_prediction = { path = "crates/edit_prediction" }
 edit_prediction_button = { path = "crates/edit_prediction_button" }
 inspector_ui = { path = "crates/inspector_ui" }
diff --git a/assets/settings/default.json b/assets/settings/default.json
index ff000001b5..6a8b034268 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -887,11 +887,6 @@
   },
   // The settings for slash commands.
   "slash_commands": {
-    // Settings for the `/docs` slash command.
-    "docs": {
-      // Whether `/docs` is enabled.
-      "enabled": false
-    },
     // Settings for the `/project` slash command.
     "project": {
       // Whether `/project` is enabled.
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 13fd9d13c5..fbf8590e68 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -50,7 +50,6 @@ fuzzy.workspace = true
 gpui.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
-indexed_docs.workspace = true
 indoc.workspace = true
 inventory.workspace = true
 itertools.workspace = true
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 96558f1bea..4a2dd88c33 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -1035,7 +1035,6 @@ fn extension_only_provides_context_server(manifest: &ExtensionManifest) -> bool
         && manifest.grammars.is_empty()
         && manifest.language_servers.is_empty()
         && manifest.slash_commands.is_empty()
-        && manifest.indexed_docs_providers.is_empty()
         && manifest.snippets.is_none()
         && manifest.debug_locators.is_empty()
 }
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 4f5f022593..f25b576886 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -242,7 +242,6 @@ pub fn init(
         client.telemetry().clone(),
         cx,
     );
-    indexed_docs::init(cx);
     cx.observe_new(move |workspace, window, cx| {
         ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
     })
@@ -409,12 +408,6 @@ fn update_slash_commands_from_settings(cx: &mut App) {
     let slash_command_registry = SlashCommandRegistry::global(cx);
     let settings = SlashCommandSettings::get_global(cx);
 
-    if settings.docs.enabled {
-        slash_command_registry.register_command(assistant_slash_commands::DocsSlashCommand, true);
-    } else {
-        slash_command_registry.unregister_command(assistant_slash_commands::DocsSlashCommand);
-    }
-
     if settings.cargo_workspace.enabled {
         slash_command_registry
             .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
diff --git a/crates/agent_ui/src/slash_command_settings.rs b/crates/agent_ui/src/slash_command_settings.rs
index f254d00ec6..73e5622aa9 100644
--- a/crates/agent_ui/src/slash_command_settings.rs
+++ b/crates/agent_ui/src/slash_command_settings.rs
@@ -7,22 +7,11 @@ use settings::{Settings, SettingsSources};
 /// Settings for slash commands.
 #[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema)]
 pub struct SlashCommandSettings {
-    /// Settings for the `/docs` slash command.
-    #[serde(default)]
-    pub docs: DocsCommandSettings,
     /// Settings for the `/cargo-workspace` slash command.
     #[serde(default)]
     pub cargo_workspace: CargoWorkspaceCommandSettings,
 }
 
-/// Settings for the `/docs` slash command.
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema)]
-pub struct DocsCommandSettings {
-    /// Whether `/docs` is enabled.
-    #[serde(default)]
-    pub enabled: bool,
-}
-
 /// Settings for the `/cargo-workspace` slash command.
 #[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema)]
 pub struct CargoWorkspaceCommandSettings {
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 2e3b4ed890..8c1e163eca 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -5,10 +5,7 @@ use crate::{
 use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::Result;
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection, SlashCommandWorkingSet};
-use assistant_slash_commands::{
-    DefaultSlashCommand, DocsSlashCommand, DocsSlashCommandArgs, FileSlashCommand,
-    selections_creases,
-};
+use assistant_slash_commands::{DefaultSlashCommand, FileSlashCommand, selections_creases};
 use client::{proto, zed_urls};
 use collections::{BTreeSet, HashMap, HashSet, hash_map};
 use editor::{
@@ -30,7 +27,6 @@ use gpui::{
     StatefulInteractiveElement, Styled, Subscription, Task, Transformation, WeakEntity, actions,
     div, img, percentage, point, prelude::*, pulsating_between, size,
 };
-use indexed_docs::IndexedDocsStore;
 use language::{
     BufferSnapshot, LspAdapterDelegate, ToOffset,
     language_settings::{SoftWrap, all_language_settings},
@@ -77,7 +73,7 @@ use crate::{slash_command::SlashCommandCompletionProvider, slash_command_picker}
 use assistant_context::{
     AssistantContext, CacheStatus, Content, ContextEvent, ContextId, InvokedSlashCommandId,
     InvokedSlashCommandStatus, Message, MessageId, MessageMetadata, MessageStatus,
-    ParsedSlashCommand, PendingSlashCommandStatus, ThoughtProcessOutputSection,
+    PendingSlashCommandStatus, ThoughtProcessOutputSection,
 };
 
 actions!(
@@ -701,19 +697,7 @@ impl TextThreadEditor {
                                 }
                             };
                             let render_trailer = {
-                                let command = command.clone();
-                                move |row, _unfold, _window: &mut Window, cx: &mut App| {
-                                    // TODO: In the future we should investigate how we can expose
-                                    // this as a hook on the `SlashCommand` trait so that we don't
-                                    // need to special-case it here.
-                                    if command.name == DocsSlashCommand::NAME {
-                                        return render_docs_slash_command_trailer(
-                                            row,
-                                            command.clone(),
-                                            cx,
-                                        );
-                                    }
-
+                                move |_row, _unfold, _window: &mut Window, _cx: &mut App| {
                                     Empty.into_any()
                                 }
                             };
@@ -2398,70 +2382,6 @@ fn render_pending_slash_command_gutter_decoration(
     icon.into_any_element()
 }
 
-fn render_docs_slash_command_trailer(
-    row: MultiBufferRow,
-    command: ParsedSlashCommand,
-    cx: &mut App,
-) -> AnyElement {
-    if command.arguments.is_empty() {
-        return Empty.into_any();
-    }
-    let args = DocsSlashCommandArgs::parse(&command.arguments);
-
-    let Some(store) = args
-        .provider()
-        .and_then(|provider| IndexedDocsStore::try_global(provider, cx).ok())
-    else {
-        return Empty.into_any();
-    };
-
-    let Some(package) = args.package() else {
-        return Empty.into_any();
-    };
-
-    let mut children = Vec::new();
-
-    if store.is_indexing(&package) {
-        children.push(
-            div()
-                .id(("crates-being-indexed", row.0))
-                .child(Icon::new(IconName::ArrowCircle).with_animation(
-                    "arrow-circle",
-                    Animation::new(Duration::from_secs(4)).repeat(),
-                    |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                ))
-                .tooltip({
-                    let package = package.clone();
-                    Tooltip::text(format!("Indexing {package}…"))
-                })
-                .into_any_element(),
-        );
-    }
-
-    if let Some(latest_error) = store.latest_error_for_package(&package) {
-        children.push(
-            div()
-                .id(("latest-error", row.0))
-                .child(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .color(Color::Warning),
-                )
-                .tooltip(Tooltip::text(format!("Failed to index: {latest_error}")))
-                .into_any_element(),
-        )
-    }
-
-    let is_indexing = store.is_indexing(&package);
-    let latest_error = store.latest_error_for_package(&package);
-
-    if !is_indexing && latest_error.is_none() {
-        return Empty.into_any();
-    }
-
-    h_flex().gap_2().children(children).into_any_element()
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 struct CopyMetadata {
     creases: Vec<SelectedCreaseMetadata>,
diff --git a/crates/assistant_slash_commands/Cargo.toml b/crates/assistant_slash_commands/Cargo.toml
index f703a753f5..c054c3ced8 100644
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -27,7 +27,6 @@ globset.workspace = true
 gpui.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
-indexed_docs.workspace = true
 language.workspace = true
 project.workspace = true
 prompt_store.workspace = true
diff --git a/crates/assistant_slash_commands/src/assistant_slash_commands.rs b/crates/assistant_slash_commands/src/assistant_slash_commands.rs
index fa5dd8b683..fb00a91219 100644
--- a/crates/assistant_slash_commands/src/assistant_slash_commands.rs
+++ b/crates/assistant_slash_commands/src/assistant_slash_commands.rs
@@ -3,7 +3,6 @@ mod context_server_command;
 mod default_command;
 mod delta_command;
 mod diagnostics_command;
-mod docs_command;
 mod fetch_command;
 mod file_command;
 mod now_command;
@@ -18,7 +17,6 @@ pub use crate::context_server_command::*;
 pub use crate::default_command::*;
 pub use crate::delta_command::*;
 pub use crate::diagnostics_command::*;
-pub use crate::docs_command::*;
 pub use crate::fetch_command::*;
 pub use crate::file_command::*;
 pub use crate::now_command::*;
diff --git a/crates/assistant_slash_commands/src/docs_command.rs b/crates/assistant_slash_commands/src/docs_command.rs
deleted file mode 100644
index bd87c72849..0000000000
--- a/crates/assistant_slash_commands/src/docs_command.rs
+++ /dev/null
@@ -1,543 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use std::time::Duration;
-
-use anyhow::{Context as _, Result, anyhow, bail};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use gpui::{App, BackgroundExecutor, Entity, Task, WeakEntity};
-use indexed_docs::{
-    DocsDotRsProvider, IndexedDocsRegistry, IndexedDocsStore, LocalRustdocProvider, PackageName,
-    ProviderId,
-};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use project::{Project, ProjectPath};
-use ui::prelude::*;
-use util::{ResultExt, maybe};
-use workspace::Workspace;
-
-pub struct DocsSlashCommand;
-
-impl DocsSlashCommand {
-    pub const NAME: &'static str = "docs";
-
-    fn path_to_cargo_toml(project: Entity<Project>, cx: &mut App) -> Option<Arc<Path>> {
-        let worktree = project.read(cx).worktrees(cx).next()?;
-        let worktree = worktree.read(cx);
-        let entry = worktree.entry_for_path("Cargo.toml")?;
-        let path = ProjectPath {
-            worktree_id: worktree.id(),
-            path: entry.path.clone(),
-        };
-        Some(Arc::from(
-            project.read(cx).absolute_path(&path, cx)?.as_path(),
-        ))
-    }
-
-    /// Ensures that the indexed doc providers for Rust are registered.
-    ///
-    /// Ideally we would do this sooner, but we need to wait until we're able to
-    /// access the workspace so we can read the project.
-    fn ensure_rust_doc_providers_are_registered(
-        &self,
-        workspace: Option<WeakEntity<Workspace>>,
-        cx: &mut App,
-    ) {
-        let indexed_docs_registry = IndexedDocsRegistry::global(cx);
-        if indexed_docs_registry
-            .get_provider_store(LocalRustdocProvider::id())
-            .is_none()
-        {
-            let index_provider_deps = maybe!({
-                let workspace = workspace
-                    .as_ref()
-                    .context("no workspace")?
-                    .upgrade()
-                    .context("workspace dropped")?;
-                let project = workspace.read(cx).project().clone();
-                let fs = project.read(cx).fs().clone();
-                let cargo_workspace_root = Self::path_to_cargo_toml(project, cx)
-                    .and_then(|path| path.parent().map(|path| path.to_path_buf()))
-                    .context("no Cargo workspace root found")?;
-
-                anyhow::Ok((fs, cargo_workspace_root))
-            });
-
-            if let Some((fs, cargo_workspace_root)) = index_provider_deps.log_err() {
-                indexed_docs_registry.register_provider(Box::new(LocalRustdocProvider::new(
-                    fs,
-                    cargo_workspace_root,
-                )));
-            }
-        }
-
-        if indexed_docs_registry
-            .get_provider_store(DocsDotRsProvider::id())
-            .is_none()
-        {
-            let http_client = maybe!({
-                let workspace = workspace
-                    .as_ref()
-                    .context("no workspace")?
-                    .upgrade()
-                    .context("workspace was dropped")?;
-                let project = workspace.read(cx).project().clone();
-                anyhow::Ok(project.read(cx).client().http_client())
-            });
-
-            if let Some(http_client) = http_client.log_err() {
-                indexed_docs_registry
-                    .register_provider(Box::new(DocsDotRsProvider::new(http_client)));
-            }
-        }
-    }
-
-    /// Runs just-in-time indexing for a given package, in case the slash command
-    /// is run without any entries existing in the index.
-    fn run_just_in_time_indexing(
-        store: Arc<IndexedDocsStore>,
-        key: String,
-        package: PackageName,
-        executor: BackgroundExecutor,
-    ) -> Task<()> {
-        executor.clone().spawn(async move {
-            let (prefix, needs_full_index) = if let Some((prefix, _)) = key.split_once('*') {
-                // If we have a wildcard in the search, we want to wait until
-                // we've completely finished indexing so we get a full set of
-                // results for the wildcard.
-                (prefix.to_string(), true)
-            } else {
-                (key, false)
-            };
-
-            // If we already have some entries, we assume that we've indexed the package before
-            // and don't need to do it again.
-            let has_any_entries = store
-                .any_with_prefix(prefix.clone())
-                .await
-                .unwrap_or_default();
-            if has_any_entries {
-                return ();
-            };
-
-            let index_task = store.clone().index(package.clone());
-
-            if needs_full_index {
-                _ = index_task.await;
-            } else {
-                loop {
-                    executor.timer(Duration::from_millis(200)).await;
-
-                    if store
-                        .any_with_prefix(prefix.clone())
-                        .await
-                        .unwrap_or_default()
-                        || !store.is_indexing(&package)
-                    {
-                        break;
-                    }
-                }
-            }
-        })
-    }
-}
-
-impl SlashCommand for DocsSlashCommand {
-    fn name(&self) -> String {
-        Self::NAME.into()
-    }
-
-    fn description(&self) -> String {
-        "insert docs".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert Documentation".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        workspace: Option<WeakEntity<Workspace>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        self.ensure_rust_doc_providers_are_registered(workspace, cx);
-
-        let indexed_docs_registry = IndexedDocsRegistry::global(cx);
-        let args = DocsSlashCommandArgs::parse(arguments);
-        let store = args
-            .provider()
-            .context("no docs provider specified")
-            .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
-        cx.background_spawn(async move {
-            fn build_completions(items: Vec<String>) -> Vec<ArgumentCompletion> {
-                items
-                    .into_iter()
-                    .map(|item| ArgumentCompletion {
-                        label: item.clone().into(),
-                        new_text: item.to_string(),
-                        after_completion: assistant_slash_command::AfterCompletion::Run,
-                        replace_previous_arguments: false,
-                    })
-                    .collect()
-            }
-
-            match args {
-                DocsSlashCommandArgs::NoProvider => {
-                    let providers = indexed_docs_registry.list_providers();
-                    if providers.is_empty() {
-                        return Ok(vec![ArgumentCompletion {
-                            label: "No available docs providers.".into(),
-                            new_text: String::new(),
-                            after_completion: false.into(),
-                            replace_previous_arguments: false,
-                        }]);
-                    }
-
-                    Ok(providers
-                        .into_iter()
-                        .map(|provider| ArgumentCompletion {
-                            label: provider.to_string().into(),
-                            new_text: provider.to_string(),
-                            after_completion: false.into(),
-                            replace_previous_arguments: false,
-                        })
-                        .collect())
-                }
-                DocsSlashCommandArgs::SearchPackageDocs {
-                    provider,
-                    package,
-                    index,
-                } => {
-                    let store = store?;
-
-                    if index {
-                        // We don't need to hold onto this task, as the `IndexedDocsStore` will hold it
-                        // until it completes.
-                        drop(store.clone().index(package.as_str().into()));
-                    }
-
-                    let suggested_packages = store.clone().suggest_packages().await?;
-                    let search_results = store.search(package).await;
-
-                    let mut items = build_completions(search_results);
-                    let workspace_crate_completions = suggested_packages
-                        .into_iter()
-                        .filter(|package_name| {
-                            !items
-                                .iter()
-                                .any(|item| item.label.text() == package_name.as_ref())
-                        })
-                        .map(|package_name| ArgumentCompletion {
-                            label: format!("{package_name} (unindexed)").into(),
-                            new_text: format!("{package_name}"),
-                            after_completion: true.into(),
-                            replace_previous_arguments: false,
-                        })
-                        .collect::<Vec<_>>();
-                    items.extend(workspace_crate_completions);
-
-                    if items.is_empty() {
-                        return Ok(vec![ArgumentCompletion {
-                            label: format!(
-                                "Enter a {package_term} name.",
-                                package_term = package_term(&provider)
-                            )
-                            .into(),
-                            new_text: provider.to_string(),
-                            after_completion: false.into(),
-                            replace_previous_arguments: false,
-                        }]);
-                    }
-
-                    Ok(items)
-                }
-                DocsSlashCommandArgs::SearchItemDocs { item_path, .. } => {
-                    let store = store?;
-                    let items = store.search(item_path).await;
-                    Ok(build_completions(items))
-                }
-            }
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        if arguments.is_empty() {
-            return Task::ready(Err(anyhow!("missing an argument")));
-        };
-
-        let args = DocsSlashCommandArgs::parse(arguments);
-        let executor = cx.background_executor().clone();
-        let task = cx.background_spawn({
-            let store = args
-                .provider()
-                .context("no docs provider specified")
-                .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
-            async move {
-                let (provider, key) = match args.clone() {
-                    DocsSlashCommandArgs::NoProvider => bail!("no docs provider specified"),
-                    DocsSlashCommandArgs::SearchPackageDocs {
-                        provider, package, ..
-                    } => (provider, package),
-                    DocsSlashCommandArgs::SearchItemDocs {
-                        provider,
-                        item_path,
-                        ..
-                    } => (provider, item_path),
-                };
-
-                if key.trim().is_empty() {
-                    bail!(
-                        "no {package_term} name provided",
-                        package_term = package_term(&provider)
-                    );
-                }
-
-                let store = store?;
-
-                if let Some(package) = args.package() {
-                    Self::run_just_in_time_indexing(store.clone(), key.clone(), package, executor)
-                        .await;
-                }
-
-                let (text, ranges) = if let Some((prefix, _)) = key.split_once('*') {
-                    let docs = store.load_many_by_prefix(prefix.to_string()).await?;
-
-                    let mut text = String::new();
-                    let mut ranges = Vec::new();
-
-                    for (key, docs) in docs {
-                        let prev_len = text.len();
-
-                        text.push_str(&docs.0);
-                        text.push_str("\n");
-                        ranges.push((key, prev_len..text.len()));
-                        text.push_str("\n");
-                    }
-
-                    (text, ranges)
-                } else {
-                    let item_docs = store.load(key.clone()).await?;
-                    let text = item_docs.to_string();
-                    let range = 0..text.len();
-
-                    (text, vec![(key, range)])
-                };
-
-                anyhow::Ok((provider, text, ranges))
-            }
-        });
-
-        cx.foreground_executor().spawn(async move {
-            let (provider, text, ranges) = task.await?;
-            Ok(SlashCommandOutput {
-                text,
-                sections: ranges
-                    .into_iter()
-                    .map(|(key, range)| SlashCommandOutputSection {
-                        range,
-                        icon: IconName::FileDoc,
-                        label: format!("docs ({provider}): {key}",).into(),
-                        metadata: None,
-                    })
-                    .collect(),
-                run_commands_in_text: false,
-            }
-            .to_event_stream())
-        })
-    }
-}
-
-fn is_item_path_delimiter(char: char) -> bool {
-    !char.is_alphanumeric() && char != '-' && char != '_'
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum DocsSlashCommandArgs {
-    NoProvider,
-    SearchPackageDocs {
-        provider: ProviderId,
-        package: String,
-        index: bool,
-    },
-    SearchItemDocs {
-        provider: ProviderId,
-        package: String,
-        item_path: String,
-    },
-}
-
-impl DocsSlashCommandArgs {
-    pub fn parse(arguments: &[String]) -> Self {
-        let Some(provider) = arguments
-            .get(0)
-            .cloned()
-            .filter(|arg| !arg.trim().is_empty())
-        else {
-            return Self::NoProvider;
-        };
-        let provider = ProviderId(provider.into());
-        let Some(argument) = arguments.get(1) else {
-            return Self::NoProvider;
-        };
-
-        if let Some((package, rest)) = argument.split_once(is_item_path_delimiter) {
-            if rest.trim().is_empty() {
-                Self::SearchPackageDocs {
-                    provider,
-                    package: package.to_owned(),
-                    index: true,
-                }
-            } else {
-                Self::SearchItemDocs {
-                    provider,
-                    package: package.to_owned(),
-                    item_path: argument.to_owned(),
-                }
-            }
-        } else {
-            Self::SearchPackageDocs {
-                provider,
-                package: argument.to_owned(),
-                index: false,
-            }
-        }
-    }
-
-    pub fn provider(&self) -> Option<ProviderId> {
-        match self {
-            Self::NoProvider => None,
-            Self::SearchPackageDocs { provider, .. } | Self::SearchItemDocs { provider, .. } => {
-                Some(provider.clone())
-            }
-        }
-    }
-
-    pub fn package(&self) -> Option<PackageName> {
-        match self {
-            Self::NoProvider => None,
-            Self::SearchPackageDocs { package, .. } | Self::SearchItemDocs { package, .. } => {
-                Some(package.as_str().into())
-            }
-        }
-    }
-}
-
-/// Returns the term used to refer to a package.
-fn package_term(provider: &ProviderId) -> &'static str {
-    if provider == &DocsDotRsProvider::id() || provider == &LocalRustdocProvider::id() {
-        return "crate";
-    }
-
-    "package"
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_docs_slash_command_args() {
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["".to_string()]),
-            DocsSlashCommandArgs::NoProvider
-        );
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["rustdoc".to_string()]),
-            DocsSlashCommandArgs::NoProvider
-        );
-
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["rustdoc".to_string(), "".to_string()]),
-            DocsSlashCommandArgs::SearchPackageDocs {
-                provider: ProviderId("rustdoc".into()),
-                package: "".into(),
-                index: false
-            }
-        );
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["gleam".to_string(), "".to_string()]),
-            DocsSlashCommandArgs::SearchPackageDocs {
-                provider: ProviderId("gleam".into()),
-                package: "".into(),
-                index: false
-            }
-        );
-
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["rustdoc".to_string(), "gpui".to_string()]),
-            DocsSlashCommandArgs::SearchPackageDocs {
-                provider: ProviderId("rustdoc".into()),
-                package: "gpui".into(),
-                index: false,
-            }
-        );
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["gleam".to_string(), "gleam_stdlib".to_string()]),
-            DocsSlashCommandArgs::SearchPackageDocs {
-                provider: ProviderId("gleam".into()),
-                package: "gleam_stdlib".into(),
-                index: false
-            }
-        );
-
-        // Adding an item path delimiter indicates we can start indexing.
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["rustdoc".to_string(), "gpui:".to_string()]),
-            DocsSlashCommandArgs::SearchPackageDocs {
-                provider: ProviderId("rustdoc".into()),
-                package: "gpui".into(),
-                index: true,
-            }
-        );
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&["gleam".to_string(), "gleam_stdlib/".to_string()]),
-            DocsSlashCommandArgs::SearchPackageDocs {
-                provider: ProviderId("gleam".into()),
-                package: "gleam_stdlib".into(),
-                index: true
-            }
-        );
-
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&[
-                "rustdoc".to_string(),
-                "gpui::foo::bar::Baz".to_string()
-            ]),
-            DocsSlashCommandArgs::SearchItemDocs {
-                provider: ProviderId("rustdoc".into()),
-                package: "gpui".into(),
-                item_path: "gpui::foo::bar::Baz".into()
-            }
-        );
-        assert_eq!(
-            DocsSlashCommandArgs::parse(&[
-                "gleam".to_string(),
-                "gleam_stdlib/gleam/int".to_string()
-            ]),
-            DocsSlashCommandArgs::SearchItemDocs {
-                provider: ProviderId("gleam".into()),
-                package: "gleam_stdlib".into(),
-                item_path: "gleam_stdlib/gleam/int".into()
-            }
-        );
-    }
-}
diff --git a/crates/extension/src/extension_host_proxy.rs b/crates/extension/src/extension_host_proxy.rs
index 917739759f..6a24e3ba3f 100644
--- a/crates/extension/src/extension_host_proxy.rs
+++ b/crates/extension/src/extension_host_proxy.rs
@@ -28,7 +28,6 @@ pub struct ExtensionHostProxy {
     snippet_proxy: RwLock<Option<Arc<dyn ExtensionSnippetProxy>>>,
     slash_command_proxy: RwLock<Option<Arc<dyn ExtensionSlashCommandProxy>>>,
     context_server_proxy: RwLock<Option<Arc<dyn ExtensionContextServerProxy>>>,
-    indexed_docs_provider_proxy: RwLock<Option<Arc<dyn ExtensionIndexedDocsProviderProxy>>>,
     debug_adapter_provider_proxy: RwLock<Option<Arc<dyn ExtensionDebugAdapterProviderProxy>>>,
 }
 
@@ -54,7 +53,6 @@ impl ExtensionHostProxy {
             snippet_proxy: RwLock::default(),
             slash_command_proxy: RwLock::default(),
             context_server_proxy: RwLock::default(),
-            indexed_docs_provider_proxy: RwLock::default(),
             debug_adapter_provider_proxy: RwLock::default(),
         }
     }
@@ -87,14 +85,6 @@ impl ExtensionHostProxy {
         self.context_server_proxy.write().replace(Arc::new(proxy));
     }
 
-    pub fn register_indexed_docs_provider_proxy(
-        &self,
-        proxy: impl ExtensionIndexedDocsProviderProxy,
-    ) {
-        self.indexed_docs_provider_proxy
-            .write()
-            .replace(Arc::new(proxy));
-    }
     pub fn register_debug_adapter_proxy(&self, proxy: impl ExtensionDebugAdapterProviderProxy) {
         self.debug_adapter_provider_proxy
             .write()
@@ -408,30 +398,6 @@ impl ExtensionContextServerProxy for ExtensionHostProxy {
     }
 }
 
-pub trait ExtensionIndexedDocsProviderProxy: Send + Sync + 'static {
-    fn register_indexed_docs_provider(&self, extension: Arc<dyn Extension>, provider_id: Arc<str>);
-
-    fn unregister_indexed_docs_provider(&self, provider_id: Arc<str>);
-}
-
-impl ExtensionIndexedDocsProviderProxy for ExtensionHostProxy {
-    fn register_indexed_docs_provider(&self, extension: Arc<dyn Extension>, provider_id: Arc<str>) {
-        let Some(proxy) = self.indexed_docs_provider_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_indexed_docs_provider(extension, provider_id)
-    }
-
-    fn unregister_indexed_docs_provider(&self, provider_id: Arc<str>) {
-        let Some(proxy) = self.indexed_docs_provider_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.unregister_indexed_docs_provider(provider_id)
-    }
-}
-
 pub trait ExtensionDebugAdapterProviderProxy: Send + Sync + 'static {
     fn register_debug_adapter(
         &self,
diff --git a/crates/extension/src/extension_manifest.rs b/crates/extension/src/extension_manifest.rs
index 5852b3e3fc..f5296198b0 100644
--- a/crates/extension/src/extension_manifest.rs
+++ b/crates/extension/src/extension_manifest.rs
@@ -84,8 +84,6 @@ pub struct ExtensionManifest {
     #[serde(default)]
     pub slash_commands: BTreeMap<Arc<str>, SlashCommandManifestEntry>,
     #[serde(default)]
-    pub indexed_docs_providers: BTreeMap<Arc<str>, IndexedDocsProviderEntry>,
-    #[serde(default)]
     pub snippets: Option<PathBuf>,
     #[serde(default)]
     pub capabilities: Vec<ExtensionCapability>,
@@ -195,9 +193,6 @@ pub struct SlashCommandManifestEntry {
     pub requires_argument: bool,
 }
 
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct IndexedDocsProviderEntry {}
-
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct DebugAdapterManifestEntry {
     pub schema_path: Option<PathBuf>,
@@ -271,7 +266,6 @@ fn manifest_from_old_manifest(
         language_servers: Default::default(),
         context_servers: BTreeMap::default(),
         slash_commands: BTreeMap::default(),
-        indexed_docs_providers: BTreeMap::default(),
         snippets: None,
         capabilities: Vec::new(),
         debug_adapters: Default::default(),
@@ -304,7 +298,6 @@ mod tests {
             language_servers: BTreeMap::default(),
             context_servers: BTreeMap::default(),
             slash_commands: BTreeMap::default(),
-            indexed_docs_providers: BTreeMap::default(),
             snippets: None,
             capabilities: vec![],
             debug_adapters: Default::default(),
diff --git a/crates/extension_cli/src/main.rs b/crates/extension_cli/src/main.rs
index ab4a9cddb0..d6c0501efd 100644
--- a/crates/extension_cli/src/main.rs
+++ b/crates/extension_cli/src/main.rs
@@ -144,10 +144,6 @@ fn extension_provides(manifest: &ExtensionManifest) -> BTreeSet<ExtensionProvide
         provides.insert(ExtensionProvides::ContextServers);
     }
 
-    if !manifest.indexed_docs_providers.is_empty() {
-        provides.insert(ExtensionProvides::IndexedDocsProviders);
-    }
-
     if manifest.snippets.is_some() {
         provides.insert(ExtensionProvides::Snippets);
     }
diff --git a/crates/extension_host/benches/extension_compilation_benchmark.rs b/crates/extension_host/benches/extension_compilation_benchmark.rs
index a4fa9bfeff..6f0897af6e 100644
--- a/crates/extension_host/benches/extension_compilation_benchmark.rs
+++ b/crates/extension_host/benches/extension_compilation_benchmark.rs
@@ -132,7 +132,6 @@ fn manifest() -> ExtensionManifest {
             .collect(),
         context_servers: BTreeMap::default(),
         slash_commands: BTreeMap::default(),
-        indexed_docs_providers: BTreeMap::default(),
         snippets: None,
         capabilities: vec![ExtensionCapability::ProcessExec(
             extension::ProcessExecCapability {
diff --git a/crates/extension_host/src/capability_granter.rs b/crates/extension_host/src/capability_granter.rs
index c77e5ecba1..5a2093c1dd 100644
--- a/crates/extension_host/src/capability_granter.rs
+++ b/crates/extension_host/src/capability_granter.rs
@@ -108,7 +108,6 @@ mod tests {
             language_servers: BTreeMap::default(),
             context_servers: BTreeMap::default(),
             slash_commands: BTreeMap::default(),
-            indexed_docs_providers: BTreeMap::default(),
             snippets: None,
             capabilities: vec![],
             debug_adapters: Default::default(),
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 67baf4e692..46deacfe69 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -16,9 +16,9 @@ pub use extension::ExtensionManifest;
 use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
 use extension::{
     ExtensionContextServerProxy, ExtensionDebugAdapterProviderProxy, ExtensionEvents,
-    ExtensionGrammarProxy, ExtensionHostProxy, ExtensionIndexedDocsProviderProxy,
-    ExtensionLanguageProxy, ExtensionLanguageServerProxy, ExtensionSlashCommandProxy,
-    ExtensionSnippetProxy, ExtensionThemeProxy,
+    ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageProxy,
+    ExtensionLanguageServerProxy, ExtensionSlashCommandProxy, ExtensionSnippetProxy,
+    ExtensionThemeProxy,
 };
 use fs::{Fs, RemoveOptions};
 use futures::future::join_all;
@@ -1192,10 +1192,6 @@ impl ExtensionStore {
             for (command_name, _) in &extension.manifest.slash_commands {
                 self.proxy.unregister_slash_command(command_name.clone());
             }
-            for (provider_id, _) in &extension.manifest.indexed_docs_providers {
-                self.proxy
-                    .unregister_indexed_docs_provider(provider_id.clone());
-            }
         }
 
         self.wasm_extensions
@@ -1399,11 +1395,6 @@ impl ExtensionStore {
                             .register_context_server(extension.clone(), id.clone(), cx);
                     }
 
-                    for (provider_id, _provider) in &manifest.indexed_docs_providers {
-                        this.proxy
-                            .register_indexed_docs_provider(extension.clone(), provider_id.clone());
-                    }
-
                     for (debug_adapter, meta) in &manifest.debug_adapters {
                         let mut path = root_dir.clone();
                         path.push(Path::new(manifest.id.as_ref()));
diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
index c31774c20d..347a610439 100644
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -160,7 +160,6 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                         language_servers: BTreeMap::default(),
                         context_servers: BTreeMap::default(),
                         slash_commands: BTreeMap::default(),
-                        indexed_docs_providers: BTreeMap::default(),
                         snippets: None,
                         capabilities: Vec::new(),
                         debug_adapters: Default::default(),
@@ -191,7 +190,6 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                         language_servers: BTreeMap::default(),
                         context_servers: BTreeMap::default(),
                         slash_commands: BTreeMap::default(),
-                        indexed_docs_providers: BTreeMap::default(),
                         snippets: None,
                         capabilities: Vec::new(),
                         debug_adapters: Default::default(),
@@ -371,7 +369,6 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                 language_servers: BTreeMap::default(),
                 context_servers: BTreeMap::default(),
                 slash_commands: BTreeMap::default(),
-                indexed_docs_providers: BTreeMap::default(),
                 snippets: None,
                 capabilities: Vec::new(),
                 debug_adapters: Default::default(),
diff --git a/crates/indexed_docs/Cargo.toml b/crates/indexed_docs/Cargo.toml
deleted file mode 100644
index eb269ad939..0000000000
--- a/crates/indexed_docs/Cargo.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[package]
-name = "indexed_docs"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/indexed_docs.rs"
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-cargo_metadata.workspace = true
-collections.workspace = true
-derive_more.workspace = true
-extension.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-heed.workspace = true
-html_to_markdown.workspace = true
-http_client.workspace = true
-indexmap.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-serde.workspace = true
-strum.workspace = true
-util.workspace = true
-workspace-hack.workspace = true
-
-[dev-dependencies]
-indoc.workspace = true
-pretty_assertions.workspace = true
diff --git a/crates/indexed_docs/LICENSE-GPL b/crates/indexed_docs/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/indexed_docs/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/indexed_docs/src/extension_indexed_docs_provider.rs b/crates/indexed_docs/src/extension_indexed_docs_provider.rs
deleted file mode 100644
index c77ea4066d..0000000000
--- a/crates/indexed_docs/src/extension_indexed_docs_provider.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use anyhow::Result;
-use async_trait::async_trait;
-use extension::{Extension, ExtensionHostProxy, ExtensionIndexedDocsProviderProxy};
-use gpui::App;
-
-use crate::{
-    IndexedDocsDatabase, IndexedDocsProvider, IndexedDocsRegistry, PackageName, ProviderId,
-};
-
-pub fn init(cx: &mut App) {
-    let proxy = ExtensionHostProxy::default_global(cx);
-    proxy.register_indexed_docs_provider_proxy(IndexedDocsRegistryProxy {
-        indexed_docs_registry: IndexedDocsRegistry::global(cx),
-    });
-}
-
-struct IndexedDocsRegistryProxy {
-    indexed_docs_registry: Arc<IndexedDocsRegistry>,
-}
-
-impl ExtensionIndexedDocsProviderProxy for IndexedDocsRegistryProxy {
-    fn register_indexed_docs_provider(&self, extension: Arc<dyn Extension>, provider_id: Arc<str>) {
-        self.indexed_docs_registry
-            .register_provider(Box::new(ExtensionIndexedDocsProvider::new(
-                extension,
-                ProviderId(provider_id),
-            )));
-    }
-
-    fn unregister_indexed_docs_provider(&self, provider_id: Arc<str>) {
-        self.indexed_docs_registry
-            .unregister_provider(&ProviderId(provider_id));
-    }
-}
-
-pub struct ExtensionIndexedDocsProvider {
-    extension: Arc<dyn Extension>,
-    id: ProviderId,
-}
-
-impl ExtensionIndexedDocsProvider {
-    pub fn new(extension: Arc<dyn Extension>, id: ProviderId) -> Self {
-        Self { extension, id }
-    }
-}
-
-#[async_trait]
-impl IndexedDocsProvider for ExtensionIndexedDocsProvider {
-    fn id(&self) -> ProviderId {
-        self.id.clone()
-    }
-
-    fn database_path(&self) -> PathBuf {
-        let mut database_path = PathBuf::from(self.extension.work_dir().as_ref());
-        database_path.push("docs");
-        database_path.push(format!("{}.0.mdb", self.id));
-
-        database_path
-    }
-
-    async fn suggest_packages(&self) -> Result<Vec<PackageName>> {
-        let packages = self
-            .extension
-            .suggest_docs_packages(self.id.0.clone())
-            .await?;
-
-        Ok(packages
-            .into_iter()
-            .map(|package| PackageName::from(package.as_str()))
-            .collect())
-    }
-
-    async fn index(&self, package: PackageName, database: Arc<IndexedDocsDatabase>) -> Result<()> {
-        self.extension
-            .index_docs(self.id.0.clone(), package.as_ref().into(), database)
-            .await
-    }
-}
diff --git a/crates/indexed_docs/src/indexed_docs.rs b/crates/indexed_docs/src/indexed_docs.rs
deleted file mode 100644
index 97538329d4..0000000000
--- a/crates/indexed_docs/src/indexed_docs.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-mod extension_indexed_docs_provider;
-mod providers;
-mod registry;
-mod store;
-
-use gpui::App;
-
-pub use crate::extension_indexed_docs_provider::ExtensionIndexedDocsProvider;
-pub use crate::providers::rustdoc::*;
-pub use crate::registry::*;
-pub use crate::store::*;
-
-pub fn init(cx: &mut App) {
-    IndexedDocsRegistry::init_global(cx);
-    extension_indexed_docs_provider::init(cx);
-}
diff --git a/crates/indexed_docs/src/providers.rs b/crates/indexed_docs/src/providers.rs
deleted file mode 100644
index c6505a2ab6..0000000000
--- a/crates/indexed_docs/src/providers.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod rustdoc;
diff --git a/crates/indexed_docs/src/providers/rustdoc.rs b/crates/indexed_docs/src/providers/rustdoc.rs
deleted file mode 100644
index ac6dc3a10b..0000000000
--- a/crates/indexed_docs/src/providers/rustdoc.rs
+++ /dev/null
@@ -1,291 +0,0 @@
-mod item;
-mod to_markdown;
-
-use cargo_metadata::MetadataCommand;
-use futures::future::BoxFuture;
-pub use item::*;
-use parking_lot::RwLock;
-pub use to_markdown::convert_rustdoc_to_markdown;
-
-use std::collections::BTreeSet;
-use std::path::PathBuf;
-use std::sync::{Arc, LazyLock};
-use std::time::{Duration, Instant};
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use collections::{HashSet, VecDeque};
-use fs::Fs;
-use futures::{AsyncReadExt, FutureExt};
-use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
-
-use crate::{IndexedDocsDatabase, IndexedDocsProvider, PackageName, ProviderId};
-
-#[derive(Debug)]
-struct RustdocItemWithHistory {
-    pub item: RustdocItem,
-    #[cfg(debug_assertions)]
-    pub history: Vec<String>,
-}
-
-pub struct LocalRustdocProvider {
-    fs: Arc<dyn Fs>,
-    cargo_workspace_root: PathBuf,
-}
-
-impl LocalRustdocProvider {
-    pub fn id() -> ProviderId {
-        ProviderId("rustdoc".into())
-    }
-
-    pub fn new(fs: Arc<dyn Fs>, cargo_workspace_root: PathBuf) -> Self {
-        Self {
-            fs,
-            cargo_workspace_root,
-        }
-    }
-}
-
-#[async_trait]
-impl IndexedDocsProvider for LocalRustdocProvider {
-    fn id(&self) -> ProviderId {
-        Self::id()
-    }
-
-    fn database_path(&self) -> PathBuf {
-        paths::data_dir().join("docs/rust/rustdoc-db.1.mdb")
-    }
-
-    async fn suggest_packages(&self) -> Result<Vec<PackageName>> {
-        static WORKSPACE_CRATES: LazyLock<RwLock<Option<(BTreeSet<PackageName>, Instant)>>> =
-            LazyLock::new(|| RwLock::new(None));
-
-        if let Some((crates, fetched_at)) = &*WORKSPACE_CRATES.read() {
-            if fetched_at.elapsed() < Duration::from_secs(300) {
-                return Ok(crates.iter().cloned().collect());
-            }
-        }
-
-        let workspace = MetadataCommand::new()
-            .manifest_path(self.cargo_workspace_root.join("Cargo.toml"))
-            .exec()
-            .context("failed to load cargo metadata")?;
-
-        let workspace_crates = workspace
-            .packages
-            .into_iter()
-            .map(|package| PackageName::from(package.name.as_str()))
-            .collect::<BTreeSet<_>>();
-
-        *WORKSPACE_CRATES.write() = Some((workspace_crates.clone(), Instant::now()));
-
-        Ok(workspace_crates.into_iter().collect())
-    }
-
-    async fn index(&self, package: PackageName, database: Arc<IndexedDocsDatabase>) -> Result<()> {
-        index_rustdoc(package, database, {
-            move |crate_name, item| {
-                let fs = self.fs.clone();
-                let cargo_workspace_root = self.cargo_workspace_root.clone();
-                let crate_name = crate_name.clone();
-                let item = item.cloned();
-                async move {
-                    let target_doc_path = cargo_workspace_root.join("target/doc");
-                    let mut local_cargo_doc_path = target_doc_path.join(crate_name.as_ref().replace('-', "_"));
-
-                    if !fs.is_dir(&local_cargo_doc_path).await {
-                        let cargo_doc_exists_at_all = fs.is_dir(&target_doc_path).await;
-                        if cargo_doc_exists_at_all {
-                            bail!(
-                                "no docs directory for '{crate_name}'. if this is a valid crate name, try running `cargo doc`"
-                            );
-                        } else {
-                            bail!("no cargo doc directory. run `cargo doc`");
-                        }
-                    }
-
-                    if let Some(item) = item {
-                        local_cargo_doc_path.push(item.url_path());
-                    } else {
-                        local_cargo_doc_path.push("index.html");
-                    }
-
-                    let Ok(contents) = fs.load(&local_cargo_doc_path).await else {
-                        return Ok(None);
-                    };
-
-                    Ok(Some(contents))
-                }
-                .boxed()
-            }
-        })
-        .await
-    }
-}
-
-pub struct DocsDotRsProvider {
-    http_client: Arc<HttpClientWithUrl>,
-}
-
-impl DocsDotRsProvider {
-    pub fn id() -> ProviderId {
-        ProviderId("docs-rs".into())
-    }
-
-    pub fn new(http_client: Arc<HttpClientWithUrl>) -> Self {
-        Self { http_client }
-    }
-}
-
-#[async_trait]
-impl IndexedDocsProvider for DocsDotRsProvider {
-    fn id(&self) -> ProviderId {
-        Self::id()
-    }
-
-    fn database_path(&self) -> PathBuf {
-        paths::data_dir().join("docs/rust/docs-rs-db.1.mdb")
-    }
-
-    async fn suggest_packages(&self) -> Result<Vec<PackageName>> {
-        static POPULAR_CRATES: LazyLock<Vec<PackageName>> = LazyLock::new(|| {
-            include_str!("./rustdoc/popular_crates.txt")
-                .lines()
-                .filter(|line| !line.starts_with('#'))
-                .map(|line| PackageName::from(line.trim()))
-                .collect()
-        });
-
-        Ok(POPULAR_CRATES.clone())
-    }
-
-    async fn index(&self, package: PackageName, database: Arc<IndexedDocsDatabase>) -> Result<()> {
-        index_rustdoc(package, database, {
-            move |crate_name, item| {
-                let http_client = self.http_client.clone();
-                let crate_name = crate_name.clone();
-                let item = item.cloned();
-                async move {
-                    let version = "latest";
-                    let path = format!(
-                        "{crate_name}/{version}/{crate_name}{item_path}",
-                        item_path = item
-                            .map(|item| format!("/{}", item.url_path()))
-                            .unwrap_or_default()
-                    );
-
-                    let mut response = http_client
-                        .get(
-                            &format!("https://docs.rs/{path}"),
-                            AsyncBody::default(),
-                            true,
-                        )
-                        .await?;
-
-                    let mut body = Vec::new();
-                    response
-                        .body_mut()
-                        .read_to_end(&mut body)
-                        .await
-                        .context("error reading docs.rs response body")?;
-
-                    if response.status().is_client_error() {
-                        let text = String::from_utf8_lossy(body.as_slice());
-                        bail!(
-                            "status error {}, response: {text:?}",
-                            response.status().as_u16()
-                        );
-                    }
-
-                    Ok(Some(String::from_utf8(body)?))
-                }
-                .boxed()
-            }
-        })
-        .await
-    }
-}
-
-async fn index_rustdoc(
-    package: PackageName,
-    database: Arc<IndexedDocsDatabase>,
-    fetch_page: impl Fn(
-        &PackageName,
-        Option<&RustdocItem>,
-    ) -> BoxFuture<'static, Result<Option<String>>>
-    + Send
-    + Sync,
-) -> Result<()> {
-    let Some(package_root_content) = fetch_page(&package, None).await? else {
-        return Ok(());
-    };
-
-    let (crate_root_markdown, items) =
-        convert_rustdoc_to_markdown(package_root_content.as_bytes())?;
-
-    database
-        .insert(package.to_string(), crate_root_markdown)
-        .await?;
-
-    let mut seen_items = HashSet::from_iter(items.clone());
-    let mut items_to_visit: VecDeque<RustdocItemWithHistory> =
-        VecDeque::from_iter(items.into_iter().map(|item| RustdocItemWithHistory {
-            item,
-            #[cfg(debug_assertions)]
-            history: Vec::new(),
-        }));
-
-    while let Some(item_with_history) = items_to_visit.pop_front() {
-        let item = &item_with_history.item;
-
-        let Some(result) = fetch_page(&package, Some(item)).await.with_context(|| {
-            #[cfg(debug_assertions)]
-            {
-                format!(
-                    "failed to fetch {item:?}: {history:?}",
-                    history = item_with_history.history
-                )
-            }
-
-            #[cfg(not(debug_assertions))]
-            {
-                format!("failed to fetch {item:?}")
-            }
-        })?
-        else {
-            continue;
-        };
-
-        let (markdown, referenced_items) = convert_rustdoc_to_markdown(result.as_bytes())?;
-
-        database
-            .insert(format!("{package}::{}", item.display()), markdown)
-            .await?;
-
-        let parent_item = item;
-        for mut item in referenced_items {
-            if seen_items.contains(&item) {
-                continue;
-            }
-
-            seen_items.insert(item.clone());
-
-            item.path.extend(parent_item.path.clone());
-            if parent_item.kind == RustdocItemKind::Mod {
-                item.path.push(parent_item.name.clone());
-            }
-
-            items_to_visit.push_back(RustdocItemWithHistory {
-                #[cfg(debug_assertions)]
-                history: {
-                    let mut history = item_with_history.history.clone();
-                    history.push(item.url_path());
-                    history
-                },
-                item,
-            });
-        }
-    }
-
-    Ok(())
-}
diff --git a/crates/indexed_docs/src/providers/rustdoc/item.rs b/crates/indexed_docs/src/providers/rustdoc/item.rs
deleted file mode 100644
index 7d9023ef3e..0000000000
--- a/crates/indexed_docs/src/providers/rustdoc/item.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use std::sync::Arc;
-
-use serde::{Deserialize, Serialize};
-use strum::EnumIter;
-
-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize, EnumIter,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum RustdocItemKind {
-    Mod,
-    Macro,
-    Struct,
-    Enum,
-    Constant,
-    Trait,
-    Function,
-    TypeAlias,
-    AttributeMacro,
-    DeriveMacro,
-}
-
-impl RustdocItemKind {
-    pub(crate) const fn class(&self) -> &'static str {
-        match self {
-            Self::Mod => "mod",
-            Self::Macro => "macro",
-            Self::Struct => "struct",
-            Self::Enum => "enum",
-            Self::Constant => "constant",
-            Self::Trait => "trait",
-            Self::Function => "fn",
-            Self::TypeAlias => "type",
-            Self::AttributeMacro => "attr",
-            Self::DeriveMacro => "derive",
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
-pub struct RustdocItem {
-    pub kind: RustdocItemKind,
-    /// The item path, up until the name of the item.
-    pub path: Vec<Arc<str>>,
-    /// The name of the item.
-    pub name: Arc<str>,
-}
-
-impl RustdocItem {
-    pub fn display(&self) -> String {
-        let mut path_segments = self.path.clone();
-        path_segments.push(self.name.clone());
-
-        path_segments.join("::")
-    }
-
-    pub fn url_path(&self) -> String {
-        let name = &self.name;
-        let mut path_components = self.path.clone();
-
-        match self.kind {
-            RustdocItemKind::Mod => {
-                path_components.push(name.clone());
-                path_components.push("index.html".into());
-            }
-            RustdocItemKind::Macro
-            | RustdocItemKind::Struct
-            | RustdocItemKind::Enum
-            | RustdocItemKind::Constant
-            | RustdocItemKind::Trait
-            | RustdocItemKind::Function
-            | RustdocItemKind::TypeAlias
-            | RustdocItemKind::AttributeMacro
-            | RustdocItemKind::DeriveMacro => {
-                path_components
-                    .push(format!("{kind}.{name}.html", kind = self.kind.class()).into());
-            }
-        }
-
-        path_components.join("/")
-    }
-}
diff --git a/crates/indexed_docs/src/providers/rustdoc/popular_crates.txt b/crates/indexed_docs/src/providers/rustdoc/popular_crates.txt
deleted file mode 100644
index ce2c3d51d8..0000000000
--- a/crates/indexed_docs/src/providers/rustdoc/popular_crates.txt
+++ /dev/null
@@ -1,252 +0,0 @@
-# A list of the most popular Rust crates.
-# Sourced from https://lib.rs/std.
-serde
-serde_json
-syn
-clap
-thiserror
-rand
-log
-tokio
-anyhow
-regex
-quote
-proc-macro2
-base64
-itertools
-chrono
-lazy_static
-once_cell
-libc
-reqwest
-futures
-bitflags
-tracing
-url
-bytes
-toml
-tempfile
-uuid
-indexmap
-env_logger
-num-traits
-async-trait
-sha2
-hex
-tracing-subscriber
-http
-parking_lot
-cfg-if
-futures-util
-cc
-hashbrown
-rayon
-hyper
-getrandom
-semver
-strum
-flate2
-tokio-util
-smallvec
-criterion
-paste
-heck
-rand_core
-nom
-rustls
-nix
-glob
-time
-byteorder
-strum_macros
-serde_yaml
-wasm-bindgen
-ahash
-either
-num_cpus
-rand_chacha
-prost
-percent-encoding
-pin-project-lite
-tokio-stream
-bincode
-walkdir
-bindgen
-axum
-windows-sys
-futures-core
-ring
-digest
-num-bigint
-rustls-pemfile
-serde_with
-crossbeam-channel
-tokio-rustls
-hmac
-fastrand
-dirs
-zeroize
-socket2
-pin-project
-tower
-derive_more
-memchr
-toml_edit
-static_assertions
-pretty_assertions
-js-sys
-convert_case
-unicode-width
-pkg-config
-itoa
-colored
-rustc-hash
-darling
-mime
-web-sys
-image
-bytemuck
-which
-sha1
-dashmap
-arrayvec
-fnv
-tonic
-humantime
-libloading
-winapi
-rustc_version
-http-body
-indoc
-num
-home
-serde_urlencoded
-http-body-util
-unicode-segmentation
-num-integer
-webpki-roots
-phf
-futures-channel
-indicatif
-petgraph
-ordered-float
-strsim
-zstd
-console
-encoding_rs
-wasm-bindgen-futures
-urlencoding
-subtle
-crc32fast
-slab
-rustix
-predicates
-spin
-hyper-rustls
-backtrace
-rustversion
-mio
-scopeguard
-proc-macro-error
-hyper-util
-ryu
-prost-types
-textwrap
-memmap2
-zip
-zerocopy
-generic-array
-tar
-pyo3
-async-stream
-quick-xml
-memoffset
-csv
-crossterm
-windows
-num_enum
-tokio-tungstenite
-crossbeam-utils
-async-channel
-lru
-aes
-futures-lite
-tracing-core
-prettyplease
-httparse
-serde_bytes
-tracing-log
-tower-service
-cargo_metadata
-pest
-mime_guess
-tower-http
-data-encoding
-native-tls
-prost-build
-proptest
-derivative
-serial_test
-libm
-half
-futures-io
-bitvec
-rustls-native-certs
-ureq
-object
-anstyle
-tonic-build
-form_urlencoded
-num-derive
-pest_derive
-schemars
-proc-macro-crate
-rstest
-futures-executor
-assert_cmd
-termcolor
-serde_repr
-ctrlc
-sha3
-clap_complete
-flume
-mockall
-ipnet
-aho-corasick
-atty
-signal-hook
-async-std
-filetime
-num-complex
-opentelemetry
-cmake
-arc-swap
-derive_builder
-async-recursion
-dyn-clone
-bumpalo
-fs_extra
-git2
-sysinfo
-shlex
-instant
-approx
-rmp-serde
-rand_distr
-rustls-pki-types
-maplit
-sqlx
-blake3
-hyper-tls
-dotenvy
-jsonwebtoken
-openssl-sys
-crossbeam
-camino
-winreg
-config
-rsa
-bit-vec
-chrono-tz
-async-lock
-bstr
diff --git a/crates/indexed_docs/src/providers/rustdoc/to_markdown.rs b/crates/indexed_docs/src/providers/rustdoc/to_markdown.rs
deleted file mode 100644
index 87e3863728..0000000000
--- a/crates/indexed_docs/src/providers/rustdoc/to_markdown.rs
+++ /dev/null
@@ -1,618 +0,0 @@
-use std::cell::RefCell;
-use std::io::Read;
-use std::rc::Rc;
-
-use anyhow::Result;
-use html_to_markdown::markdown::{
-    HeadingHandler, ListHandler, ParagraphHandler, StyledTextHandler, TableHandler,
-};
-use html_to_markdown::{
-    HandleTag, HandlerOutcome, HtmlElement, MarkdownWriter, StartTagOutcome, TagHandler,
-    convert_html_to_markdown,
-};
-use indexmap::IndexSet;
-use strum::IntoEnumIterator;
-
-use crate::{RustdocItem, RustdocItemKind};
-
-/// Converts the provided rustdoc HTML to Markdown.
-pub fn convert_rustdoc_to_markdown(html: impl Read) -> Result<(String, Vec<RustdocItem>)> {
-    let item_collector = Rc::new(RefCell::new(RustdocItemCollector::new()));
-
-    let mut handlers: Vec<TagHandler> = vec![
-        Rc::new(RefCell::new(ParagraphHandler)),
-        Rc::new(RefCell::new(HeadingHandler)),
-        Rc::new(RefCell::new(ListHandler)),
-        Rc::new(RefCell::new(TableHandler::new())),
-        Rc::new(RefCell::new(StyledTextHandler)),
-        Rc::new(RefCell::new(RustdocChromeRemover)),
-        Rc::new(RefCell::new(RustdocHeadingHandler)),
-        Rc::new(RefCell::new(RustdocCodeHandler)),
-        Rc::new(RefCell::new(RustdocItemHandler)),
-        item_collector.clone(),
-    ];
-
-    let markdown = convert_html_to_markdown(html, &mut handlers)?;
-
-    let items = item_collector
-        .borrow()
-        .items
-        .iter()
-        .cloned()
-        .collect::<Vec<_>>();
-
-    Ok((markdown, items))
-}
-
-pub struct RustdocHeadingHandler;
-
-impl HandleTag for RustdocHeadingHandler {
-    fn should_handle(&self, _tag: &str) -> bool {
-        // We're only handling text, so we don't need to visit any tags.
-        false
-    }
-
-    fn handle_text(&mut self, text: &str, writer: &mut MarkdownWriter) -> HandlerOutcome {
-        if writer.is_inside("h1")
-            || writer.is_inside("h2")
-            || writer.is_inside("h3")
-            || writer.is_inside("h4")
-            || writer.is_inside("h5")
-            || writer.is_inside("h6")
-        {
-            let text = text
-                .trim_matches(|char| char == '\n' || char == '\r')
-                .replace('\n', " ");
-            writer.push_str(&text);
-
-            return HandlerOutcome::Handled;
-        }
-
-        HandlerOutcome::NoOp
-    }
-}
-
-pub struct RustdocCodeHandler;
-
-impl HandleTag for RustdocCodeHandler {
-    fn should_handle(&self, tag: &str) -> bool {
-        matches!(tag, "pre" | "code")
-    }
-
-    fn handle_tag_start(
-        &mut self,
-        tag: &HtmlElement,
-        writer: &mut MarkdownWriter,
-    ) -> StartTagOutcome {
-        match tag.tag() {
-            "code" => {
-                if !writer.is_inside("pre") {
-                    writer.push_str("`");
-                }
-            }
-            "pre" => {
-                let classes = tag.classes();
-                let is_rust = classes.iter().any(|class| class == "rust");
-                let language = is_rust
-                    .then_some("rs")
-                    .or_else(|| {
-                        classes.iter().find_map(|class| {
-                            if let Some((_, language)) = class.split_once("language-") {
-                                Some(language.trim())
-                            } else {
-                                None
-                            }
-                        })
-                    })
-                    .unwrap_or("");
-
-                writer.push_str(&format!("\n\n```{language}\n"));
-            }
-            _ => {}
-        }
-
-        StartTagOutcome::Continue
-    }
-
-    fn handle_tag_end(&mut self, tag: &HtmlElement, writer: &mut MarkdownWriter) {
-        match tag.tag() {
-            "code" => {
-                if !writer.is_inside("pre") {
-                    writer.push_str("`");
-                }
-            }
-            "pre" => writer.push_str("\n```\n"),
-            _ => {}
-        }
-    }
-
-    fn handle_text(&mut self, text: &str, writer: &mut MarkdownWriter) -> HandlerOutcome {
-        if writer.is_inside("pre") {
-            writer.push_str(text);
-            return HandlerOutcome::Handled;
-        }
-
-        HandlerOutcome::NoOp
-    }
-}
-
-const RUSTDOC_ITEM_NAME_CLASS: &str = "item-name";
-
-pub struct RustdocItemHandler;
-
-impl RustdocItemHandler {
-    /// Returns whether we're currently inside of an `.item-name` element, which
-    /// rustdoc uses to display Rust items in a list.
-    fn is_inside_item_name(writer: &MarkdownWriter) -> bool {
-        writer
-            .current_element_stack()
-            .iter()
-            .any(|element| element.has_class(RUSTDOC_ITEM_NAME_CLASS))
-    }
-}
-
-impl HandleTag for RustdocItemHandler {
-    fn should_handle(&self, tag: &str) -> bool {
-        matches!(tag, "div" | "span")
-    }
-
-    fn handle_tag_start(
-        &mut self,
-        tag: &HtmlElement,
-        writer: &mut MarkdownWriter,
-    ) -> StartTagOutcome {
-        match tag.tag() {
-            "div" | "span" => {
-                if Self::is_inside_item_name(writer) && tag.has_class("stab") {
-                    writer.push_str(" [");
-                }
-            }
-            _ => {}
-        }
-
-        StartTagOutcome::Continue
-    }
-
-    fn handle_tag_end(&mut self, tag: &HtmlElement, writer: &mut MarkdownWriter) {
-        match tag.tag() {
-            "div" | "span" => {
-                if tag.has_class(RUSTDOC_ITEM_NAME_CLASS) {
-                    writer.push_str(": ");
-                }
-
-                if Self::is_inside_item_name(writer) && tag.has_class("stab") {
-                    writer.push_str("]");
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn handle_text(&mut self, text: &str, writer: &mut MarkdownWriter) -> HandlerOutcome {
-        if Self::is_inside_item_name(writer)
-            && !writer.is_inside("span")
-            && !writer.is_inside("code")
-        {
-            writer.push_str(&format!("`{text}`"));
-            return HandlerOutcome::Handled;
-        }
-
-        HandlerOutcome::NoOp
-    }
-}
-
-pub struct RustdocChromeRemover;
-
-impl HandleTag for RustdocChromeRemover {
-    fn should_handle(&self, tag: &str) -> bool {
-        matches!(
-            tag,
-            "head" | "script" | "nav" | "summary" | "button" | "a" | "div" | "span"
-        )
-    }
-
-    fn handle_tag_start(
-        &mut self,
-        tag: &HtmlElement,
-        _writer: &mut MarkdownWriter,
-    ) -> StartTagOutcome {
-        match tag.tag() {
-            "head" | "script" | "nav" => return StartTagOutcome::Skip,
-            "summary" => {
-                if tag.has_class("hideme") {
-                    return StartTagOutcome::Skip;
-                }
-            }
-            "button" => {
-                if tag.attr("id").as_deref() == Some("copy-path") {
-                    return StartTagOutcome::Skip;
-                }
-            }
-            "a" => {
-                if tag.has_any_classes(&["anchor", "doc-anchor", "src"]) {
-                    return StartTagOutcome::Skip;
-                }
-            }
-            "div" | "span" => {
-                if tag.has_any_classes(&["nav-container", "sidebar-elems", "out-of-band"]) {
-                    return StartTagOutcome::Skip;
-                }
-            }
-
-            _ => {}
-        }
-
-        StartTagOutcome::Continue
-    }
-}
-
-pub struct RustdocItemCollector {
-    pub items: IndexSet<RustdocItem>,
-}
-
-impl RustdocItemCollector {
-    pub fn new() -> Self {
-        Self {
-            items: IndexSet::new(),
-        }
-    }
-
-    fn parse_item(tag: &HtmlElement) -> Option<RustdocItem> {
-        if tag.tag() != "a" {
-            return None;
-        }
-
-        let href = tag.attr("href")?;
-        if href.starts_with('#') || href.starts_with("https://") || href.starts_with("../") {
-            return None;
-        }
-
-        for kind in RustdocItemKind::iter() {
-            if tag.has_class(kind.class()) {
-                let mut parts = href.trim_end_matches("/index.html").split('/');
-
-                if let Some(last_component) = parts.next_back() {
-                    let last_component = match last_component.split_once('#') {
-                        Some((component, _fragment)) => component,
-                        None => last_component,
-                    };
-
-                    let name = last_component
-                        .trim_start_matches(&format!("{}.", kind.class()))
-                        .trim_end_matches(".html");
-
-                    return Some(RustdocItem {
-                        kind,
-                        name: name.into(),
-                        path: parts.map(Into::into).collect(),
-                    });
-                }
-            }
-        }
-
-        None
-    }
-}
-
-impl HandleTag for RustdocItemCollector {
-    fn should_handle(&self, tag: &str) -> bool {
-        tag == "a"
-    }
-
-    fn handle_tag_start(
-        &mut self,
-        tag: &HtmlElement,
-        writer: &mut MarkdownWriter,
-    ) -> StartTagOutcome {
-        if tag.tag() == "a" {
-            let is_reexport = writer.current_element_stack().iter().any(|element| {
-                if let Some(id) = element.attr("id") {
-                    id.starts_with("reexport.") || id.starts_with("method.")
-                } else {
-                    false
-                }
-            });
-
-            if !is_reexport {
-                if let Some(item) = Self::parse_item(tag) {
-                    self.items.insert(item);
-                }
-            }
-        }
-
-        StartTagOutcome::Continue
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use html_to_markdown::{TagHandler, convert_html_to_markdown};
-    use indoc::indoc;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    fn rustdoc_handlers() -> Vec<TagHandler> {
-        vec![
-            Rc::new(RefCell::new(ParagraphHandler)),
-            Rc::new(RefCell::new(HeadingHandler)),
-            Rc::new(RefCell::new(ListHandler)),
-            Rc::new(RefCell::new(TableHandler::new())),
-            Rc::new(RefCell::new(StyledTextHandler)),
-            Rc::new(RefCell::new(RustdocChromeRemover)),
-            Rc::new(RefCell::new(RustdocHeadingHandler)),
-            Rc::new(RefCell::new(RustdocCodeHandler)),
-            Rc::new(RefCell::new(RustdocItemHandler)),
-        ]
-    }
-
-    #[test]
-    fn test_main_heading_buttons_get_removed() {
-        let html = indoc! {r##"
-            <div class="main-heading">
-                <h1>Crate <a class="mod" href="#">serde</a><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1>
-                <span class="out-of-band">
-                    <a class="src" href="../src/serde/lib.rs.html#1-340">source</a> · <button id="toggle-all-docs" title="collapse all docs">[<span>−</span>]</button>
-                </span>
-            </div>
-        "##};
-        let expected = indoc! {"
-            # Crate serde
-        "}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_single_paragraph() {
-        let html = indoc! {r#"
-            <p>In particular, the last point is what sets <code>axum</code> apart from other frameworks.
-            <code>axum</code> doesn’t have its own middleware system but instead uses
-            <a href="https://docs.rs/tower-service/0.3.2/x86_64-unknown-linux-gnu/tower_service/trait.Service.html" title="trait tower_service::Service"><code>tower::Service</code></a>. This means <code>axum</code> gets timeouts, tracing, compression,
-            authorization, and more, for free. It also enables you to share middleware with
-            applications written using <a href="http://crates.io/crates/hyper"><code>hyper</code></a> or <a href="http://crates.io/crates/tonic"><code>tonic</code></a>.</p>
-        "#};
-        let expected = indoc! {"
-            In particular, the last point is what sets `axum` apart from other frameworks. `axum` doesn’t have its own middleware system but instead uses `tower::Service`. This means `axum` gets timeouts, tracing, compression, authorization, and more, for free. It also enables you to share middleware with applications written using `hyper` or `tonic`.
-        "}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_multiple_paragraphs() {
-        let html = indoc! {r##"
-            <h2 id="serde"><a class="doc-anchor" href="#serde">§</a>Serde</h2>
-            <p>Serde is a framework for <em><strong>ser</strong></em>ializing and <em><strong>de</strong></em>serializing Rust data
-            structures efficiently and generically.</p>
-            <p>The Serde ecosystem consists of data structures that know how to serialize
-            and deserialize themselves along with data formats that know how to
-            serialize and deserialize other things. Serde provides the layer by which
-            these two groups interact with each other, allowing any supported data
-            structure to be serialized and deserialized using any supported data format.</p>
-            <p>See the Serde website <a href="https://serde.rs/">https://serde.rs/</a> for additional documentation and
-            usage examples.</p>
-            <h3 id="design"><a class="doc-anchor" href="#design">§</a>Design</h3>
-            <p>Where many other languages rely on runtime reflection for serializing data,
-            Serde is instead built on Rust’s powerful trait system. A data structure
-            that knows how to serialize and deserialize itself is one that implements
-            Serde’s <code>Serialize</code> and <code>Deserialize</code> traits (or uses Serde’s derive
-            attribute to automatically generate implementations at compile time). This
-            avoids any overhead of reflection or runtime type information. In fact in
-            many situations the interaction between data structure and data format can
-            be completely optimized away by the Rust compiler, leaving Serde
-            serialization to perform the same speed as a handwritten serializer for the
-            specific selection of data structure and data format.</p>
-        "##};
-        let expected = indoc! {"
-            ## Serde
-
-            Serde is a framework for _**ser**_ializing and _**de**_serializing Rust data structures efficiently and generically.
-
-            The Serde ecosystem consists of data structures that know how to serialize and deserialize themselves along with data formats that know how to serialize and deserialize other things. Serde provides the layer by which these two groups interact with each other, allowing any supported data structure to be serialized and deserialized using any supported data format.
-
-            See the Serde website https://serde.rs/ for additional documentation and usage examples.
-
-            ### Design
-
-            Where many other languages rely on runtime reflection for serializing data, Serde is instead built on Rust’s powerful trait system. A data structure that knows how to serialize and deserialize itself is one that implements Serde’s `Serialize` and `Deserialize` traits (or uses Serde’s derive attribute to automatically generate implementations at compile time). This avoids any overhead of reflection or runtime type information. In fact in many situations the interaction between data structure and data format can be completely optimized away by the Rust compiler, leaving Serde serialization to perform the same speed as a handwritten serializer for the specific selection of data structure and data format.
-        "}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_styled_text() {
-        let html = indoc! {r#"
-            <p>This text is <strong>bolded</strong>.</p>
-            <p>This text is <em>italicized</em>.</p>
-        "#};
-        let expected = indoc! {"
-            This text is **bolded**.
-
-            This text is _italicized_.
-        "}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_rust_code_block() {
-        let html = indoc! {r#"
-            <pre class="rust rust-example-rendered"><code><span class="kw">use </span>axum::extract::{Path, Query, Json};
-            <span class="kw">use </span>std::collections::HashMap;
-
-            <span class="comment">// `Path` gives you the path parameters and deserializes them.
-            </span><span class="kw">async fn </span>path(Path(user_id): Path&lt;u32&gt;) {}
-
-            <span class="comment">// `Query` gives you the query parameters and deserializes them.
-            </span><span class="kw">async fn </span>query(Query(params): Query&lt;HashMap&lt;String, String&gt;&gt;) {}
-
-            <span class="comment">// Buffer the request body and deserialize it as JSON into a
-            // `serde_json::Value`. `Json` supports any type that implements
-            // `serde::Deserialize`.
-            </span><span class="kw">async fn </span>json(Json(payload): Json&lt;serde_json::Value&gt;) {}</code></pre>
-        "#};
-        let expected = indoc! {"
-            ```rs
-            use axum::extract::{Path, Query, Json};
-            use std::collections::HashMap;
-
-            // `Path` gives you the path parameters and deserializes them.
-            async fn path(Path(user_id): Path<u32>) {}
-
-            // `Query` gives you the query parameters and deserializes them.
-            async fn query(Query(params): Query<HashMap<String, String>>) {}
-
-            // Buffer the request body and deserialize it as JSON into a
-            // `serde_json::Value`. `Json` supports any type that implements
-            // `serde::Deserialize`.
-            async fn json(Json(payload): Json<serde_json::Value>) {}
-            ```
-        "}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_toml_code_block() {
-        let html = indoc! {r##"
-            <h2 id="required-dependencies"><a class="doc-anchor" href="#required-dependencies">§</a>Required dependencies</h2>
-            <p>To use axum there are a few dependencies you have to pull in as well:</p>
-            <div class="example-wrap"><pre class="language-toml"><code>[dependencies]
-            axum = &quot;&lt;latest-version&gt;&quot;
-            tokio = { version = &quot;&lt;latest-version&gt;&quot;, features = [&quot;full&quot;] }
-            tower = &quot;&lt;latest-version&gt;&quot;
-            </code></pre></div>
-        "##};
-        let expected = indoc! {r#"
-            ## Required dependencies
-
-            To use axum there are a few dependencies you have to pull in as well:
-
-            ```toml
-            [dependencies]
-            axum = "<latest-version>"
-            tokio = { version = "<latest-version>", features = ["full"] }
-            tower = "<latest-version>"
-
-            ```
-        "#}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_item_table() {
-        let html = indoc! {r##"
-            <h2 id="structs" class="section-header">Structs<a href="#structs" class="anchor">§</a></h2>
-            <ul class="item-table">
-            <li><div class="item-name"><a class="struct" href="struct.Error.html" title="struct axum::Error">Error</a></div><div class="desc docblock-short">Errors that can happen when using axum.</div></li>
-            <li><div class="item-name"><a class="struct" href="struct.Extension.html" title="struct axum::Extension">Extension</a></div><div class="desc docblock-short">Extractor and response for extensions.</div></li>
-            <li><div class="item-name"><a class="struct" href="struct.Form.html" title="struct axum::Form">Form</a><span class="stab portability" title="Available on crate feature `form` only"><code>form</code></span></div><div class="desc docblock-short">URL encoded extractor and response.</div></li>
-            <li><div class="item-name"><a class="struct" href="struct.Json.html" title="struct axum::Json">Json</a><span class="stab portability" title="Available on crate feature `json` only"><code>json</code></span></div><div class="desc docblock-short">JSON Extractor / Response.</div></li>
-            <li><div class="item-name"><a class="struct" href="struct.Router.html" title="struct axum::Router">Router</a></div><div class="desc docblock-short">The router type for composing handlers and services.</div></li></ul>
-            <h2 id="functions" class="section-header">Functions<a href="#functions" class="anchor">§</a></h2>
-            <ul class="item-table">
-            <li><div class="item-name"><a class="fn" href="fn.serve.html" title="fn axum::serve">serve</a><span class="stab portability" title="Available on crate feature `tokio` and (crate features `http1` or `http2`) only"><code>tokio</code> and (<code>http1</code> or <code>http2</code>)</span></div><div class="desc docblock-short">Serve the service with the supplied listener.</div></li>
-            </ul>
-        "##};
-        let expected = indoc! {r#"
-            ## Structs
-
-            - `Error`: Errors that can happen when using axum.
-            - `Extension`: Extractor and response for extensions.
-            - `Form` [`form`]: URL encoded extractor and response.
-            - `Json` [`json`]: JSON Extractor / Response.
-            - `Router`: The router type for composing handlers and services.
-
-            ## Functions
-
-            - `serve` [`tokio` and (`http1` or `http2`)]: Serve the service with the supplied listener.
-        "#}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-
-    #[test]
-    fn test_table() {
-        let html = indoc! {r##"
-            <h2 id="feature-flags"><a class="doc-anchor" href="#feature-flags">§</a>Feature flags</h2>
-            <p>axum uses a set of <a href="https://doc.rust-lang.org/cargo/reference/features.html#the-features-section">feature flags</a> to reduce the amount of compiled and
-            optional dependencies.</p>
-            <p>The following optional features are available:</p>
-            <div><table><thead><tr><th>Name</th><th>Description</th><th>Default?</th></tr></thead><tbody>
-            <tr><td><code>http1</code></td><td>Enables hyper’s <code>http1</code> feature</td><td>Yes</td></tr>
-            <tr><td><code>http2</code></td><td>Enables hyper’s <code>http2</code> feature</td><td>No</td></tr>
-            <tr><td><code>json</code></td><td>Enables the <a href="struct.Json.html" title="struct axum::Json"><code>Json</code></a> type and some similar convenience functionality</td><td>Yes</td></tr>
-            <tr><td><code>macros</code></td><td>Enables optional utility macros</td><td>No</td></tr>
-            <tr><td><code>matched-path</code></td><td>Enables capturing of every request’s router path and the <a href="extract/struct.MatchedPath.html" title="struct axum::extract::MatchedPath"><code>MatchedPath</code></a> extractor</td><td>Yes</td></tr>
-            <tr><td><code>multipart</code></td><td>Enables parsing <code>multipart/form-data</code> requests with <a href="extract/struct.Multipart.html" title="struct axum::extract::Multipart"><code>Multipart</code></a></td><td>No</td></tr>
-            <tr><td><code>original-uri</code></td><td>Enables capturing of every request’s original URI and the <a href="extract/struct.OriginalUri.html" title="struct axum::extract::OriginalUri"><code>OriginalUri</code></a> extractor</td><td>Yes</td></tr>
-            <tr><td><code>tokio</code></td><td>Enables <code>tokio</code> as a dependency and <code>axum::serve</code>, <code>SSE</code> and <code>extract::connect_info</code> types.</td><td>Yes</td></tr>
-            <tr><td><code>tower-log</code></td><td>Enables <code>tower</code>’s <code>log</code> feature</td><td>Yes</td></tr>
-            <tr><td><code>tracing</code></td><td>Log rejections from built-in extractors</td><td>Yes</td></tr>
-            <tr><td><code>ws</code></td><td>Enables WebSockets support via <a href="extract/ws/index.html" title="mod axum::extract::ws"><code>extract::ws</code></a></td><td>No</td></tr>
-            <tr><td><code>form</code></td><td>Enables the <code>Form</code> extractor</td><td>Yes</td></tr>
-            <tr><td><code>query</code></td><td>Enables the <code>Query</code> extractor</td><td>Yes</td></tr>
-            </tbody></table>
-        "##};
-        let expected = indoc! {r#"
-            ## Feature flags
-
-            axum uses a set of feature flags to reduce the amount of compiled and optional dependencies.
-
-            The following optional features are available:
-
-            | Name | Description | Default? |
-            | --- | --- | --- |
-            | `http1` | Enables hyper’s `http1` feature | Yes |
-            | `http2` | Enables hyper’s `http2` feature | No |
-            | `json` | Enables the `Json` type and some similar convenience functionality | Yes |
-            | `macros` | Enables optional utility macros | No |
-            | `matched-path` | Enables capturing of every request’s router path and the `MatchedPath` extractor | Yes |
-            | `multipart` | Enables parsing `multipart/form-data` requests with `Multipart` | No |
-            | `original-uri` | Enables capturing of every request’s original URI and the `OriginalUri` extractor | Yes |
-            | `tokio` | Enables `tokio` as a dependency and `axum::serve`, `SSE` and `extract::connect_info` types. | Yes |
-            | `tower-log` | Enables `tower`’s `log` feature | Yes |
-            | `tracing` | Log rejections from built-in extractors | Yes |
-            | `ws` | Enables WebSockets support via `extract::ws` | No |
-            | `form` | Enables the `Form` extractor | Yes |
-            | `query` | Enables the `Query` extractor | Yes |
-        "#}
-        .trim();
-
-        assert_eq!(
-            convert_html_to_markdown(html.as_bytes(), &mut rustdoc_handlers()).unwrap(),
-            expected
-        )
-    }
-}
diff --git a/crates/indexed_docs/src/registry.rs b/crates/indexed_docs/src/registry.rs
deleted file mode 100644
index 6757cd9c1a..0000000000
--- a/crates/indexed_docs/src/registry.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use gpui::{App, BackgroundExecutor, Global, ReadGlobal, UpdateGlobal};
-use parking_lot::RwLock;
-
-use crate::{IndexedDocsProvider, IndexedDocsStore, ProviderId};
-
-struct GlobalIndexedDocsRegistry(Arc<IndexedDocsRegistry>);
-
-impl Global for GlobalIndexedDocsRegistry {}
-
-pub struct IndexedDocsRegistry {
-    executor: BackgroundExecutor,
-    stores_by_provider: RwLock<HashMap<ProviderId, Arc<IndexedDocsStore>>>,
-}
-
-impl IndexedDocsRegistry {
-    pub fn global(cx: &App) -> Arc<Self> {
-        GlobalIndexedDocsRegistry::global(cx).0.clone()
-    }
-
-    pub(crate) fn init_global(cx: &mut App) {
-        GlobalIndexedDocsRegistry::set_global(
-            cx,
-            GlobalIndexedDocsRegistry(Arc::new(Self::new(cx.background_executor().clone()))),
-        );
-    }
-
-    pub fn new(executor: BackgroundExecutor) -> Self {
-        Self {
-            executor,
-            stores_by_provider: RwLock::new(HashMap::default()),
-        }
-    }
-
-    pub fn list_providers(&self) -> Vec<ProviderId> {
-        self.stores_by_provider
-            .read()
-            .keys()
-            .cloned()
-            .collect::<Vec<_>>()
-    }
-
-    pub fn register_provider(
-        &self,
-        provider: Box<dyn IndexedDocsProvider + Send + Sync + 'static>,
-    ) {
-        self.stores_by_provider.write().insert(
-            provider.id(),
-            Arc::new(IndexedDocsStore::new(provider, self.executor.clone())),
-        );
-    }
-
-    pub fn unregister_provider(&self, provider_id: &ProviderId) {
-        self.stores_by_provider.write().remove(provider_id);
-    }
-
-    pub fn get_provider_store(&self, provider_id: ProviderId) -> Option<Arc<IndexedDocsStore>> {
-        self.stores_by_provider.read().get(&provider_id).cloned()
-    }
-}
diff --git a/crates/indexed_docs/src/store.rs b/crates/indexed_docs/src/store.rs
deleted file mode 100644
index 1407078efa..0000000000
--- a/crates/indexed_docs/src/store.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use anyhow::{Context as _, Result, anyhow};
-use async_trait::async_trait;
-use collections::HashMap;
-use derive_more::{Deref, Display};
-use futures::FutureExt;
-use futures::future::{self, BoxFuture, Shared};
-use fuzzy::StringMatchCandidate;
-use gpui::{App, BackgroundExecutor, Task};
-use heed::Database;
-use heed::types::SerdeBincode;
-use parking_lot::RwLock;
-use serde::{Deserialize, Serialize};
-use util::ResultExt;
-
-use crate::IndexedDocsRegistry;
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Deref, Display)]
-pub struct ProviderId(pub Arc<str>);
-
-/// The name of a package.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Deref, Display)]
-pub struct PackageName(Arc<str>);
-
-impl From<&str> for PackageName {
-    fn from(value: &str) -> Self {
-        Self(value.into())
-    }
-}
-
-#[async_trait]
-pub trait IndexedDocsProvider {
-    /// Returns the ID of this provider.
-    fn id(&self) -> ProviderId;
-
-    /// Returns the path to the database for this provider.
-    fn database_path(&self) -> PathBuf;
-
-    /// Returns a list of packages as suggestions to be included in the search
-    /// results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    async fn suggest_packages(&self) -> Result<Vec<PackageName>>;
-
-    /// Indexes the package with the given name.
-    async fn index(&self, package: PackageName, database: Arc<IndexedDocsDatabase>) -> Result<()>;
-}
-
-/// A store for indexed docs.
-pub struct IndexedDocsStore {
-    executor: BackgroundExecutor,
-    database_future:
-        Shared<BoxFuture<'static, Result<Arc<IndexedDocsDatabase>, Arc<anyhow::Error>>>>,
-    provider: Box<dyn IndexedDocsProvider + Send + Sync + 'static>,
-    indexing_tasks_by_package:
-        RwLock<HashMap<PackageName, Shared<Task<Result<(), Arc<anyhow::Error>>>>>>,
-    latest_errors_by_package: RwLock<HashMap<PackageName, Arc<str>>>,
-}
-
-impl IndexedDocsStore {
-    pub fn try_global(provider: ProviderId, cx: &App) -> Result<Arc<Self>> {
-        let registry = IndexedDocsRegistry::global(cx);
-        registry
-            .get_provider_store(provider.clone())
-            .with_context(|| format!("no indexed docs store found for {provider}"))
-    }
-
-    pub fn new(
-        provider: Box<dyn IndexedDocsProvider + Send + Sync + 'static>,
-        executor: BackgroundExecutor,
-    ) -> Self {
-        let database_future = executor
-            .spawn({
-                let executor = executor.clone();
-                let database_path = provider.database_path();
-                async move { IndexedDocsDatabase::new(database_path, executor) }
-            })
-            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
-            .boxed()
-            .shared();
-
-        Self {
-            executor,
-            database_future,
-            provider,
-            indexing_tasks_by_package: RwLock::new(HashMap::default()),
-            latest_errors_by_package: RwLock::new(HashMap::default()),
-        }
-    }
-
-    pub fn latest_error_for_package(&self, package: &PackageName) -> Option<Arc<str>> {
-        self.latest_errors_by_package.read().get(package).cloned()
-    }
-
-    /// Returns whether the package with the given name is currently being indexed.
-    pub fn is_indexing(&self, package: &PackageName) -> bool {
-        self.indexing_tasks_by_package.read().contains_key(package)
-    }
-
-    pub async fn load(&self, key: String) -> Result<MarkdownDocs> {
-        self.database_future
-            .clone()
-            .await
-            .map_err(|err| anyhow!(err))?
-            .load(key)
-            .await
-    }
-
-    pub async fn load_many_by_prefix(&self, prefix: String) -> Result<Vec<(String, MarkdownDocs)>> {
-        self.database_future
-            .clone()
-            .await
-            .map_err(|err| anyhow!(err))?
-            .load_many_by_prefix(prefix)
-            .await
-    }
-
-    /// Returns whether any entries exist with the given prefix.
-    pub async fn any_with_prefix(&self, prefix: String) -> Result<bool> {
-        self.database_future
-            .clone()
-            .await
-            .map_err(|err| anyhow!(err))?
-            .any_with_prefix(prefix)
-            .await
-    }
-
-    pub fn suggest_packages(self: Arc<Self>) -> Task<Result<Vec<PackageName>>> {
-        let this = self.clone();
-        self.executor
-            .spawn(async move { this.provider.suggest_packages().await })
-    }
-
-    pub fn index(
-        self: Arc<Self>,
-        package: PackageName,
-    ) -> Shared<Task<Result<(), Arc<anyhow::Error>>>> {
-        if let Some(existing_task) = self.indexing_tasks_by_package.read().get(&package) {
-            return existing_task.clone();
-        }
-
-        let indexing_task = self
-            .executor
-            .spawn({
-                let this = self.clone();
-                let package = package.clone();
-                async move {
-                    let _finally = util::defer({
-                        let this = this.clone();
-                        let package = package.clone();
-                        move || {
-                            this.indexing_tasks_by_package.write().remove(&package);
-                        }
-                    });
-
-                    let index_task = {
-                        let package = package.clone();
-                        async {
-                            let database = this
-                                .database_future
-                                .clone()
-                                .await
-                                .map_err(|err| anyhow!(err))?;
-                            this.provider.index(package, database).await
-                        }
-                    };
-
-                    let result = index_task.await.map_err(Arc::new);
-                    match &result {
-                        Ok(_) => {
-                            this.latest_errors_by_package.write().remove(&package);
-                        }
-                        Err(err) => {
-                            this.latest_errors_by_package
-                                .write()
-                                .insert(package, err.to_string().into());
-                        }
-                    }
-
-                    result
-                }
-            })
-            .shared();
-
-        self.indexing_tasks_by_package
-            .write()
-            .insert(package, indexing_task.clone());
-
-        indexing_task
-    }
-
-    pub fn search(&self, query: String) -> Task<Vec<String>> {
-        let executor = self.executor.clone();
-        let database_future = self.database_future.clone();
-        self.executor.spawn(async move {
-            let Some(database) = database_future.await.map_err(|err| anyhow!(err)).log_err() else {
-                return Vec::new();
-            };
-
-            let Some(items) = database.keys().await.log_err() else {
-                return Vec::new();
-            };
-
-            let candidates = items
-                .iter()
-                .enumerate()
-                .map(|(ix, item_path)| StringMatchCandidate::new(ix, &item_path))
-                .collect::<Vec<_>>();
-
-            let matches = fuzzy::match_strings(
-                &candidates,
-                &query,
-                false,
-                true,
-                100,
-                &AtomicBool::default(),
-                executor,
-            )
-            .await;
-
-            matches
-                .into_iter()
-                .map(|mat| items[mat.candidate_id].clone())
-                .collect()
-        })
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Display, Serialize, Deserialize)]
-pub struct MarkdownDocs(pub String);
-
-pub struct IndexedDocsDatabase {
-    executor: BackgroundExecutor,
-    env: heed::Env,
-    entries: Database<SerdeBincode<String>, SerdeBincode<MarkdownDocs>>,
-}
-
-impl IndexedDocsDatabase {
-    pub fn new(path: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
-        std::fs::create_dir_all(&path)?;
-
-        const ONE_GB_IN_BYTES: usize = 1024 * 1024 * 1024;
-        let env = unsafe {
-            heed::EnvOpenOptions::new()
-                .map_size(ONE_GB_IN_BYTES)
-                .max_dbs(1)
-                .open(path)?
-        };
-
-        let mut txn = env.write_txn()?;
-        let entries = env.create_database(&mut txn, Some("rustdoc_entries"))?;
-        txn.commit()?;
-
-        Ok(Self {
-            executor,
-            env,
-            entries,
-        })
-    }
-
-    pub fn keys(&self) -> Task<Result<Vec<String>>> {
-        let env = self.env.clone();
-        let entries = self.entries;
-
-        self.executor.spawn(async move {
-            let txn = env.read_txn()?;
-            let mut iter = entries.iter(&txn)?;
-            let mut keys = Vec::new();
-            while let Some((key, _value)) = iter.next().transpose()? {
-                keys.push(key);
-            }
-
-            Ok(keys)
-        })
-    }
-
-    pub fn load(&self, key: String) -> Task<Result<MarkdownDocs>> {
-        let env = self.env.clone();
-        let entries = self.entries;
-
-        self.executor.spawn(async move {
-            let txn = env.read_txn()?;
-            entries
-                .get(&txn, &key)?
-                .with_context(|| format!("no docs found for {key}"))
-        })
-    }
-
-    pub fn load_many_by_prefix(&self, prefix: String) -> Task<Result<Vec<(String, MarkdownDocs)>>> {
-        let env = self.env.clone();
-        let entries = self.entries;
-
-        self.executor.spawn(async move {
-            let txn = env.read_txn()?;
-            let results = entries
-                .iter(&txn)?
-                .filter_map(|entry| {
-                    let (key, value) = entry.ok()?;
-                    if key.starts_with(&prefix) {
-                        Some((key, value))
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            Ok(results)
-        })
-    }
-
-    /// Returns whether any entries exist with the given prefix.
-    pub fn any_with_prefix(&self, prefix: String) -> Task<Result<bool>> {
-        let env = self.env.clone();
-        let entries = self.entries;
-
-        self.executor.spawn(async move {
-            let txn = env.read_txn()?;
-            let any = entries
-                .iter(&txn)?
-                .any(|entry| entry.map_or(false, |(key, _value)| key.starts_with(&prefix)));
-            Ok(any)
-        })
-    }
-
-    pub fn insert(&self, key: String, docs: String) -> Task<Result<()>> {
-        let env = self.env.clone();
-        let entries = self.entries;
-
-        self.executor.spawn(async move {
-            let mut txn = env.write_txn()?;
-            entries.put(&mut txn, &key, &MarkdownDocs(docs))?;
-            txn.commit()?;
-            Ok(())
-        })
-    }
-}
-
-impl extension::KeyValueStoreDelegate for IndexedDocsDatabase {
-    fn insert(&self, key: String, docs: String) -> Task<Result<()>> {
-        IndexedDocsDatabase::insert(&self, key, docs)
-    }
-}
diff --git a/typos.toml b/typos.toml
index 336a829a44..e5f02b6415 100644
--- a/typos.toml
+++ b/typos.toml
@@ -16,9 +16,6 @@ extend-exclude = [
     "crates/google_ai/src/supported_countries.rs",
     "crates/open_ai/src/supported_countries.rs",
 
-    # Some crate names are flagged as typos.
-    "crates/indexed_docs/src/providers/rustdoc/popular_crates.txt",
-
     # Some mock data is flagged as typos.
     "crates/assistant_tools/src/web_search_tool.rs",
 

From da8a692ec0aab6d050fe9ab20f2f7d4a793b5b00 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sun, 17 Aug 2025 08:52:05 -0400
Subject: [PATCH 092/823] docs: Remove link to openSUSE Tumbleweed (#36355)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR removes the link to Zed on openSUSE Tumbleweed, as it has been
removed:
https://en.opensuse.org/index.php?title=Archive:Zed&action=history

<img width="1178" height="517" alt="Screenshot 2025-08-17 at 8 48 59 AM"
src="https://github.com/user-attachments/assets/3e441b1c-81ad-4f4b-a8a0-e872f916c2d8"
/>

Release Notes:

- N/A
---
 docs/src/linux.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/src/linux.md b/docs/src/linux.md
index 309354de6d..4a66445b78 100644
--- a/docs/src/linux.md
+++ b/docs/src/linux.md
@@ -48,7 +48,6 @@ There are several third-party Zed packages for various Linux distributions and p
 - Manjaro: [`zed`](https://packages.manjaro.org/?query=zed)
 - ALT Linux (Sisyphus): [`zed`](https://packages.altlinux.org/en/sisyphus/srpms/zed/)
 - AOSC OS: [`zed`](https://packages.aosc.io/packages/zed)
-- openSUSE Tumbleweed: [`zed`](https://en.opensuse.org/Zed)
 
 See [Repology](https://repology.org/project/zed-editor/versions) for a list of Zed packages in various repositories.
 

From 5895fac377b3c9abd3f14fd8e48188451b02d215 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Sun, 17 Aug 2025 15:05:23 +0200
Subject: [PATCH 093/823] Refactor ToolCallStatus enum to flat variants
 (#36356)

Replace nested Allowed variant with distinct statuses for clearer status
handling.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs    | 74 ++++++++++++++------------
 crates/agent_servers/src/e2e_tests.rs  | 12 +++--
 crates/agent_ui/src/acp/thread_view.rs | 56 ++++++++-----------
 3 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 3bb1b99ba1..c1c634612b 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -223,7 +223,7 @@ impl ToolCall {
         }
 
         if let Some(status) = status {
-            self.status = ToolCallStatus::Allowed { status };
+            self.status = status.into();
         }
 
         if let Some(title) = title {
@@ -344,30 +344,48 @@ impl ToolCall {
 
 #[derive(Debug)]
 pub enum ToolCallStatus {
+    /// The tool call hasn't started running yet, but we start showing it to
+    /// the user.
+    Pending,
+    /// The tool call is waiting for confirmation from the user.
     WaitingForConfirmation {
         options: Vec<acp::PermissionOption>,
         respond_tx: oneshot::Sender<acp::PermissionOptionId>,
     },
-    Allowed {
-        status: acp::ToolCallStatus,
-    },
+    /// The tool call is currently running.
+    InProgress,
+    /// The tool call completed successfully.
+    Completed,
+    /// The tool call failed.
+    Failed,
+    /// The user rejected the tool call.
     Rejected,
+    /// The user cancelled generation so the tool call was cancelled.
     Canceled,
 }
 
+impl From<acp::ToolCallStatus> for ToolCallStatus {
+    fn from(status: acp::ToolCallStatus) -> Self {
+        match status {
+            acp::ToolCallStatus::Pending => Self::Pending,
+            acp::ToolCallStatus::InProgress => Self::InProgress,
+            acp::ToolCallStatus::Completed => Self::Completed,
+            acp::ToolCallStatus::Failed => Self::Failed,
+        }
+    }
+}
+
 impl Display for ToolCallStatus {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
             "{}",
             match self {
+                ToolCallStatus::Pending => "Pending",
                 ToolCallStatus::WaitingForConfirmation { .. } => "Waiting for confirmation",
-                ToolCallStatus::Allowed { status } => match status {
-                    acp::ToolCallStatus::Pending => "Pending",
-                    acp::ToolCallStatus::InProgress => "In Progress",
-                    acp::ToolCallStatus::Completed => "Completed",
-                    acp::ToolCallStatus::Failed => "Failed",
-                },
+                ToolCallStatus::InProgress => "In Progress",
+                ToolCallStatus::Completed => "Completed",
+                ToolCallStatus::Failed => "Failed",
                 ToolCallStatus::Rejected => "Rejected",
                 ToolCallStatus::Canceled => "Canceled",
             }
@@ -759,11 +777,7 @@ impl AcpThread {
                 AgentThreadEntry::UserMessage(_) => return false,
                 AgentThreadEntry::ToolCall(
                     call @ ToolCall {
-                        status:
-                            ToolCallStatus::Allowed {
-                                status:
-                                    acp::ToolCallStatus::InProgress | acp::ToolCallStatus::Pending,
-                            },
+                        status: ToolCallStatus::InProgress | ToolCallStatus::Pending,
                         ..
                     },
                 ) if call.diffs().next().is_some() => {
@@ -945,9 +959,7 @@ impl AcpThread {
         tool_call: acp::ToolCall,
         cx: &mut Context<Self>,
     ) -> Result<(), acp::Error> {
-        let status = ToolCallStatus::Allowed {
-            status: tool_call.status,
-        };
+        let status = tool_call.status.into();
         self.upsert_tool_call_inner(tool_call.into(), status, cx)
     }
 
@@ -1074,9 +1086,7 @@ impl AcpThread {
                 ToolCallStatus::Rejected
             }
             acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
-                ToolCallStatus::Allowed {
-                    status: acp::ToolCallStatus::InProgress,
-                }
+                ToolCallStatus::InProgress
             }
         };
 
@@ -1097,7 +1107,10 @@ impl AcpThread {
             match &entry {
                 AgentThreadEntry::ToolCall(call) => match call.status {
                     ToolCallStatus::WaitingForConfirmation { .. } => return true,
-                    ToolCallStatus::Allowed { .. }
+                    ToolCallStatus::Pending
+                    | ToolCallStatus::InProgress
+                    | ToolCallStatus::Completed
+                    | ToolCallStatus::Failed
                     | ToolCallStatus::Rejected
                     | ToolCallStatus::Canceled => continue,
                 },
@@ -1290,10 +1303,9 @@ impl AcpThread {
             if let AgentThreadEntry::ToolCall(call) = entry {
                 let cancel = matches!(
                     call.status,
-                    ToolCallStatus::WaitingForConfirmation { .. }
-                        | ToolCallStatus::Allowed {
-                            status: acp::ToolCallStatus::InProgress
-                        }
+                    ToolCallStatus::Pending
+                        | ToolCallStatus::WaitingForConfirmation { .. }
+                        | ToolCallStatus::InProgress
                 );
 
                 if cancel {
@@ -1939,10 +1951,7 @@ mod tests {
             assert!(matches!(
                 thread.entries[1],
                 AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::Allowed {
-                        status: acp::ToolCallStatus::InProgress,
-                        ..
-                    },
+                    status: ToolCallStatus::InProgress,
                     ..
                 })
             ));
@@ -1981,10 +1990,7 @@ mod tests {
             assert!(matches!(
                 thread.entries[1],
                 AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::Allowed {
-                        status: acp::ToolCallStatus::Completed,
-                        ..
-                    },
+                    status: ToolCallStatus::Completed,
                     ..
                 })
             ));
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 5af7010f26..2b32edcd4f 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -134,7 +134,9 @@ pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestApp
             matches!(
                 entry,
                 AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::Allowed { .. },
+                    status: ToolCallStatus::Pending
+                        | ToolCallStatus::InProgress
+                        | ToolCallStatus::Completed,
                     ..
                 })
             )
@@ -212,7 +214,9 @@ pub async fn test_tool_call_with_permission(
         assert!(thread.entries().iter().any(|entry| matches!(
             entry,
             AgentThreadEntry::ToolCall(ToolCall {
-                status: ToolCallStatus::Allowed { .. },
+                status: ToolCallStatus::Pending
+                    | ToolCallStatus::InProgress
+                    | ToolCallStatus::Completed,
                 ..
             })
         )));
@@ -223,7 +227,9 @@ pub async fn test_tool_call_with_permission(
     thread.read_with(cx, |thread, cx| {
         let AgentThreadEntry::ToolCall(ToolCall {
             content,
-            status: ToolCallStatus::Allowed { .. },
+            status: ToolCallStatus::Pending
+                | ToolCallStatus::InProgress
+                | ToolCallStatus::Completed,
             ..
         }) = thread
             .entries()
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 17341e4c8a..7c1f3cf4ae 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1053,14 +1053,10 @@ impl AcpThreadView {
         let card_header_id = SharedString::from("inner-tool-call-header");
 
         let status_icon = match &tool_call.status {
-            ToolCallStatus::Allowed {
-                status: acp::ToolCallStatus::Pending,
-            }
-            | ToolCallStatus::WaitingForConfirmation { .. } => None,
-            ToolCallStatus::Allowed {
-                status: acp::ToolCallStatus::InProgress,
-                ..
-            } => Some(
+            ToolCallStatus::Pending
+            | ToolCallStatus::WaitingForConfirmation { .. }
+            | ToolCallStatus::Completed => None,
+            ToolCallStatus::InProgress => Some(
                 Icon::new(IconName::ArrowCircle)
                     .color(Color::Accent)
                     .size(IconSize::Small)
@@ -1071,16 +1067,7 @@ impl AcpThreadView {
                     )
                     .into_any(),
             ),
-            ToolCallStatus::Allowed {
-                status: acp::ToolCallStatus::Completed,
-                ..
-            } => None,
-            ToolCallStatus::Rejected
-            | ToolCallStatus::Canceled
-            | ToolCallStatus::Allowed {
-                status: acp::ToolCallStatus::Failed,
-                ..
-            } => Some(
+            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => Some(
                 Icon::new(IconName::Close)
                     .color(Color::Error)
                     .size(IconSize::Small)
@@ -1146,15 +1133,23 @@ impl AcpThreadView {
                     tool_call.content.is_empty(),
                     cx,
                 )),
-            ToolCallStatus::Allowed { .. } | ToolCallStatus::Canceled => v_flex()
-                .w_full()
-                .children(tool_call.content.iter().map(|content| {
-                    div()
-                        .child(
-                            self.render_tool_call_content(entry_ix, content, tool_call, window, cx),
-                        )
-                        .into_any_element()
-                })),
+            ToolCallStatus::Pending
+            | ToolCallStatus::InProgress
+            | ToolCallStatus::Completed
+            | ToolCallStatus::Failed
+            | ToolCallStatus::Canceled => {
+                v_flex()
+                    .w_full()
+                    .children(tool_call.content.iter().map(|content| {
+                        div()
+                            .child(
+                                self.render_tool_call_content(
+                                    entry_ix, content, tool_call, window, cx,
+                                ),
+                            )
+                            .into_any_element()
+                    }))
+            }
             ToolCallStatus::Rejected => v_flex().size_0(),
         };
 
@@ -1467,12 +1462,7 @@ impl AcpThreadView {
 
         let tool_failed = matches!(
             &tool_call.status,
-            ToolCallStatus::Rejected
-                | ToolCallStatus::Canceled
-                | ToolCallStatus::Allowed {
-                    status: acp::ToolCallStatus::Failed,
-                    ..
-                }
+            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed
         );
 
         let output = terminal_data.output();

From addc4f4a11a816fd6d116be379bf249aa203f535 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Sun, 17 Aug 2025 17:19:38 +0200
Subject: [PATCH 094/823] agent_ui: Ensure that all configuration views get
 rendered with full width (#36362)

Closes #36097

Release Notes:

- Fixed API key input fields getting shrunk in Agent Panel settings view
on low panel widths paired with high UI font sizes.
---
 crates/agent_ui/src/agent_configuration.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 4a2dd88c33..b4ebb8206c 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -300,6 +300,7 @@ impl AgentConfiguration {
             )
             .child(
                 div()
+                    .w_full()
                     .px_2()
                     .when(is_expanded, |parent| match configuration_view {
                         Some(configuration_view) => parent.child(configuration_view),

From faaaf02bf211e71743912b77cd6e7911e73965ff Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Sun, 17 Aug 2025 13:25:05 -0300
Subject: [PATCH 095/823] ui: Reduce icons stroke width (#36361)

After redesigning all Zed icons
(https://github.com/zed-industries/zed/pull/35856), it felt like using
1.5 for stroke width didn't really flow well with the default typeface
default font weight. Reducing it to 1.2 makes the UI much sharper, less
burry, and more cohesive overall.

Release Notes:

- N/A
---
 assets/icons/ai.svg                           |  2 +-
 assets/icons/arrow_circle.svg                 |  8 ++++----
 assets/icons/arrow_down.svg                   |  2 +-
 assets/icons/arrow_down10.svg                 |  2 +-
 assets/icons/arrow_down_right.svg             |  4 ++--
 assets/icons/arrow_left.svg                   |  2 +-
 assets/icons/arrow_right.svg                  |  2 +-
 assets/icons/arrow_right_left.svg             |  8 ++++----
 assets/icons/arrow_up.svg                     |  2 +-
 assets/icons/arrow_up_right.svg               |  4 ++--
 assets/icons/audio_off.svg                    | 10 +++++-----
 assets/icons/audio_on.svg                     |  6 +++---
 assets/icons/backspace.svg                    |  6 +++---
 assets/icons/bell.svg                         |  4 ++--
 assets/icons/bell_dot.svg                     |  4 ++--
 assets/icons/bell_off.svg                     |  6 +++---
 assets/icons/bell_ring.svg                    |  8 ++++----
 assets/icons/binary.svg                       |  2 +-
 assets/icons/blocks.svg                       |  2 +-
 assets/icons/bolt_outlined.svg                |  2 +-
 assets/icons/book.svg                         |  2 +-
 assets/icons/book_copy.svg                    |  2 +-
 assets/icons/chat.svg                         |  4 ++--
 assets/icons/check.svg                        |  2 +-
 assets/icons/check_circle.svg                 |  4 ++--
 assets/icons/check_double.svg                 |  4 ++--
 assets/icons/chevron_down.svg                 |  2 +-
 assets/icons/chevron_left.svg                 |  2 +-
 assets/icons/chevron_right.svg                |  2 +-
 assets/icons/chevron_up.svg                   |  2 +-
 assets/icons/chevron_up_down.svg              |  4 ++--
 assets/icons/circle_help.svg                  |  6 +++---
 assets/icons/close.svg                        |  2 +-
 assets/icons/cloud_download.svg               |  2 +-
 assets/icons/code.svg                         |  2 +-
 assets/icons/cog.svg                          |  2 +-
 assets/icons/command.svg                      |  2 +-
 assets/icons/control.svg                      |  2 +-
 assets/icons/copilot.svg                      |  6 +++---
 assets/icons/copy.svg                         |  2 +-
 assets/icons/countdown_timer.svg              |  2 +-
 assets/icons/crosshair.svg                    | 10 +++++-----
 assets/icons/cursor_i_beam.svg                |  4 ++--
 assets/icons/dash.svg                         |  2 +-
 assets/icons/database_zap.svg                 |  2 +-
 assets/icons/debug.svg                        | 20 +++++++++----------
 assets/icons/debug_breakpoint.svg             |  2 +-
 assets/icons/debug_continue.svg               |  2 +-
 assets/icons/debug_detach.svg                 |  2 +-
 assets/icons/debug_disabled_breakpoint.svg    |  2 +-
 .../icons/debug_disabled_log_breakpoint.svg   |  6 +++---
 assets/icons/debug_ignore_breakpoints.svg     |  2 +-
 assets/icons/debug_step_back.svg              |  2 +-
 assets/icons/debug_step_into.svg              |  2 +-
 assets/icons/debug_step_out.svg               |  2 +-
 assets/icons/debug_step_over.svg              |  2 +-
 assets/icons/diff.svg                         |  2 +-
 assets/icons/disconnected.svg                 |  2 +-
 assets/icons/download.svg                     |  2 +-
 assets/icons/envelope.svg                     |  4 ++--
 assets/icons/eraser.svg                       |  2 +-
 assets/icons/escape.svg                       |  2 +-
 assets/icons/exit.svg                         |  6 +++---
 assets/icons/expand_down.svg                  |  4 ++--
 assets/icons/expand_up.svg                    |  4 ++--
 assets/icons/expand_vertical.svg              |  2 +-
 assets/icons/eye.svg                          |  4 ++--
 assets/icons/file.svg                         |  2 +-
 assets/icons/file_code.svg                    |  2 +-
 assets/icons/file_diff.svg                    |  2 +-
 assets/icons/file_doc.svg                     |  6 +++---
 assets/icons/file_generic.svg                 |  6 +++---
 assets/icons/file_git.svg                     |  8 ++++----
 assets/icons/file_icons/ai.svg                |  2 +-
 assets/icons/file_icons/audio.svg             | 12 +++++------
 assets/icons/file_icons/book.svg              |  6 +++---
 assets/icons/file_icons/bun.svg               |  2 +-
 assets/icons/file_icons/chevron_down.svg      |  2 +-
 assets/icons/file_icons/chevron_left.svg      |  2 +-
 assets/icons/file_icons/chevron_right.svg     |  2 +-
 assets/icons/file_icons/chevron_up.svg        |  2 +-
 assets/icons/file_icons/code.svg              |  4 ++--
 assets/icons/file_icons/coffeescript.svg      |  2 +-
 assets/icons/file_icons/conversations.svg     |  2 +-
 assets/icons/file_icons/dart.svg              |  2 +-
 assets/icons/file_icons/database.svg          |  6 +++---
 assets/icons/file_icons/diff.svg              |  6 +++---
 assets/icons/file_icons/eslint.svg            |  2 +-
 assets/icons/file_icons/file.svg              |  6 +++---
 assets/icons/file_icons/folder.svg            |  2 +-
 assets/icons/file_icons/folder_open.svg       |  4 ++--
 assets/icons/file_icons/font.svg              |  2 +-
 assets/icons/file_icons/git.svg               |  8 ++++----
 assets/icons/file_icons/gleam.svg             |  4 ++--
 assets/icons/file_icons/graphql.svg           |  4 ++--
 assets/icons/file_icons/hash.svg              |  8 ++++----
 assets/icons/file_icons/heroku.svg            |  2 +-
 assets/icons/file_icons/html.svg              |  6 +++---
 assets/icons/file_icons/image.svg             |  6 +++---
 assets/icons/file_icons/java.svg              | 10 +++++-----
 assets/icons/file_icons/lock.svg              |  2 +-
 assets/icons/file_icons/magnifying_glass.svg  |  2 +-
 assets/icons/file_icons/nix.svg               | 12 +++++------
 assets/icons/file_icons/notebook.svg          | 10 +++++-----
 assets/icons/file_icons/package.svg           |  2 +-
 assets/icons/file_icons/phoenix.svg           |  2 +-
 assets/icons/file_icons/plus.svg              |  2 +-
 assets/icons/file_icons/prettier.svg          | 20 +++++++++----------
 assets/icons/file_icons/project.svg           |  2 +-
 assets/icons/file_icons/python.svg            |  4 ++--
 assets/icons/file_icons/replace.svg           |  2 +-
 assets/icons/file_icons/replace_next.svg      |  2 +-
 assets/icons/file_icons/rust.svg              |  2 +-
 assets/icons/file_icons/scala.svg             |  2 +-
 assets/icons/file_icons/settings.svg          |  2 +-
 assets/icons/file_icons/tcl.svg               |  2 +-
 assets/icons/file_icons/toml.svg              |  6 +++---
 assets/icons/file_icons/video.svg             |  4 ++--
 assets/icons/file_icons/vue.svg               |  2 +-
 assets/icons/file_lock.svg                    |  2 +-
 assets/icons/file_markdown.svg                |  2 +-
 assets/icons/file_rust.svg                    |  2 +-
 assets/icons/file_text_outlined.svg           |  8 ++++----
 assets/icons/file_toml.svg                    |  6 +++---
 assets/icons/file_tree.svg                    |  2 +-
 assets/icons/filter.svg                       |  2 +-
 assets/icons/flame.svg                        |  2 +-
 assets/icons/folder.svg                       |  2 +-
 assets/icons/folder_open.svg                  |  4 ++--
 assets/icons/folder_search.svg                |  2 +-
 assets/icons/font.svg                         |  2 +-
 assets/icons/font_size.svg                    |  2 +-
 assets/icons/font_weight.svg                  |  2 +-
 assets/icons/forward_arrow.svg                |  4 ++--
 assets/icons/git_branch.svg                   |  2 +-
 assets/icons/git_branch_alt.svg               | 10 +++++-----
 assets/icons/github.svg                       |  2 +-
 assets/icons/hash.svg                         |  2 +-
 assets/icons/history_rerun.svg                |  6 +++---
 assets/icons/image.svg                        |  2 +-
 assets/icons/info.svg                         |  4 ++--
 assets/icons/json.svg                         |  4 ++--
 assets/icons/keyboard.svg                     |  2 +-
 assets/icons/knockouts/x_fg.svg               |  2 +-
 assets/icons/library.svg                      |  8 ++++----
 assets/icons/line_height.svg                  |  2 +-
 assets/icons/list_collapse.svg                |  2 +-
 assets/icons/list_todo.svg                    |  2 +-
 assets/icons/list_tree.svg                    | 10 +++++-----
 assets/icons/list_x.svg                       | 10 +++++-----
 assets/icons/load_circle.svg                  |  2 +-
 assets/icons/location_edit.svg                |  2 +-
 assets/icons/lock_outlined.svg                |  6 +++---
 assets/icons/magnifying_glass.svg             |  2 +-
 assets/icons/maximize.svg                     |  8 ++++----
 assets/icons/menu.svg                         |  2 +-
 assets/icons/menu_alt.svg                     |  2 +-
 assets/icons/mic.svg                          |  6 +++---
 assets/icons/mic_mute.svg                     | 12 +++++------
 assets/icons/minimize.svg                     |  8 ++++----
 assets/icons/notepad.svg                      |  2 +-
 assets/icons/option.svg                       |  4 ++--
 assets/icons/pencil.svg                       |  4 ++--
 assets/icons/person.svg                       |  2 +-
 assets/icons/pin.svg                          |  4 ++--
 assets/icons/play_filled.svg                  |  2 +-
 assets/icons/play_outlined.svg                |  2 +-
 assets/icons/plus.svg                         |  4 ++--
 assets/icons/power.svg                        |  2 +-
 assets/icons/public.svg                       |  2 +-
 assets/icons/pull_request.svg                 |  2 +-
 assets/icons/quote.svg                        |  2 +-
 assets/icons/reader.svg                       |  6 +++---
 assets/icons/refresh_title.svg                |  2 +-
 assets/icons/regex.svg                        |  2 +-
 assets/icons/repl_neutral.svg                 |  8 ++++----
 assets/icons/repl_off.svg                     | 18 ++++++++---------
 assets/icons/repl_pause.svg                   | 12 +++++------
 assets/icons/repl_play.svg                    | 10 +++++-----
 assets/icons/replace.svg                      |  2 +-
 assets/icons/replace_next.svg                 |  2 +-
 assets/icons/rerun.svg                        |  2 +-
 assets/icons/return.svg                       |  4 ++--
 assets/icons/rotate_ccw.svg                   |  2 +-
 assets/icons/rotate_cw.svg                    |  2 +-
 assets/icons/scissors.svg                     |  2 +-
 assets/icons/screen.svg                       |  6 +++---
 assets/icons/select_all.svg                   |  2 +-
 assets/icons/send.svg                         |  2 +-
 assets/icons/server.svg                       |  8 ++++----
 assets/icons/settings.svg                     |  2 +-
 assets/icons/shield_check.svg                 |  4 ++--
 assets/icons/shift.svg                        |  2 +-
 assets/icons/slash.svg                        |  2 +-
 assets/icons/sliders.svg                      | 12 +++++------
 assets/icons/space.svg                        |  2 +-
 assets/icons/sparkle.svg                      |  2 +-
 assets/icons/split.svg                        |  4 ++--
 assets/icons/split_alt.svg                    |  2 +-
 assets/icons/square_dot.svg                   |  2 +-
 assets/icons/square_minus.svg                 |  4 ++--
 assets/icons/square_plus.svg                  |  6 +++---
 assets/icons/star.svg                         |  2 +-
 assets/icons/star_filled.svg                  |  2 +-
 assets/icons/stop.svg                         |  2 +-
 assets/icons/swatch_book.svg                  |  2 +-
 assets/icons/tab.svg                          |  6 +++---
 assets/icons/terminal_alt.svg                 |  6 +++---
 assets/icons/text_snippet.svg                 |  2 +-
 assets/icons/text_thread.svg                  | 10 +++++-----
 assets/icons/thread.svg                       |  2 +-
 assets/icons/thread_from_summary.svg          |  8 ++++----
 assets/icons/thumbs_down.svg                  |  2 +-
 assets/icons/thumbs_up.svg                    |  2 +-
 assets/icons/todo_complete.svg                |  2 +-
 assets/icons/todo_pending.svg                 | 16 +++++++--------
 assets/icons/todo_progress.svg                | 18 ++++++++---------
 assets/icons/tool_copy.svg                    |  4 ++--
 assets/icons/tool_delete_file.svg             |  6 +++---
 assets/icons/tool_diagnostics.svg             |  6 +++---
 assets/icons/tool_folder.svg                  |  2 +-
 assets/icons/tool_hammer.svg                  |  6 +++---
 assets/icons/tool_notification.svg            |  4 ++--
 assets/icons/tool_pencil.svg                  |  4 ++--
 assets/icons/tool_read.svg                    | 10 +++++-----
 assets/icons/tool_regex.svg                   |  2 +-
 assets/icons/tool_search.svg                  |  4 ++--
 assets/icons/tool_terminal.svg                |  6 +++---
 assets/icons/tool_think.svg                   |  2 +-
 assets/icons/tool_web.svg                     |  6 +++---
 assets/icons/trash.svg                        |  6 +++---
 assets/icons/undo.svg                         |  2 +-
 assets/icons/user_check.svg                   |  2 +-
 assets/icons/user_group.svg                   |  6 +++---
 assets/icons/user_round_pen.svg               |  2 +-
 assets/icons/warning.svg                      |  2 +-
 assets/icons/whole_word.svg                   |  2 +-
 assets/icons/x_circle.svg                     |  2 +-
 assets/icons/zed_assistant.svg                |  2 +-
 assets/icons/zed_burn_mode.svg                |  2 +-
 assets/icons/zed_burn_mode_on.svg             |  2 +-
 assets/icons/zed_mcp_custom.svg               |  2 +-
 assets/icons/zed_mcp_extension.svg            |  2 +-
 assets/icons/zed_predict.svg                  |  6 +++---
 assets/icons/zed_predict_down.svg             |  6 +++---
 assets/icons/zed_predict_error.svg            |  4 ++--
 assets/icons/zed_predict_up.svg               |  6 +++---
 crates/icons/README.md                        |  2 +-
 248 files changed, 499 insertions(+), 499 deletions(-)

diff --git a/assets/icons/ai.svg b/assets/icons/ai.svg
index d60396ad47..4236d50337 100644
--- a/assets/icons/ai.svg
+++ b/assets/icons/ai.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.5 8.75V10.5C8.43097 10.5 7.56903 10.5 5.5 10.5V10L10.5 6V5.5H5.5V7.25" stroke="black" stroke-width="1.5"/>
+    <path d="M10.5 8.75V10.5C8.43097 10.5 7.56903 10.5 5.5 10.5V10L10.5 6V5.5H5.5V7.25" stroke="black" stroke-width="1.2"/>
     <path d="M1.5 8.5C1.77614 8.5 2 8.27614 2 8C2 7.72386 1.77614 7.5 1.5 7.5C1.22386 7.5 1 7.72386 1 8C1 8.27614 1.22386 8.5 1.5 8.5Z" fill="black"/>
     <path d="M2.49976 6.33002C2.7759 6.33002 2.99976 6.10616 2.99976 5.83002C2.99976 5.55387 2.7759 5.33002 2.49976 5.33002C2.22361 5.33002 1.99976 5.55387 1.99976 5.83002C1.99976 6.10616 2.22361 6.33002 2.49976 6.33002Z" fill="black"/>
     <path d="M2.49976 10.66C2.7759 10.66 2.99976 10.4361 2.99976 10.16C2.99976 9.88383 2.7759 9.65997 2.49976 9.65997C2.22361 9.65997 1.99976 9.88383 1.99976 10.16C1.99976 10.4361 2.22361 10.66 2.49976 10.66Z" fill="black"/>
diff --git a/assets/icons/arrow_circle.svg b/assets/icons/arrow_circle.svg
index 76363c6270..cdfa939795 100644
--- a/assets/icons/arrow_circle.svg
+++ b/assets/icons/arrow_circle.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8989 5.77778L11.6434 4.52222C10.6384 3.55068 9.29673 3.00526 7.89893 3C6.57285 3 5.30103 3.52678 4.36343 4.46447C3.78887 5.03901 3.36856 5.73897 3.12921 6.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8989 3V5.77778H10.1211" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.1012 10.2222L4.3568 11.4778C5.3618 12.4493 6.70342 12.9947 8.10122 13C9.42731 13 10.6991 12.4732 11.6368 11.5355C12.2163 10.956 12.6389 10.2487 12.8772 9.47994" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.87891 10.2222H3.10111V13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8989 5.77778L11.6434 4.52222C10.6384 3.55068 9.29673 3.00526 7.89893 3C6.57285 3 5.30103 3.52678 4.36343 4.46447C3.78887 5.03901 3.36856 5.73897 3.12921 6.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8989 3V5.77778H10.1211" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.1012 10.2222L4.3568 11.4778C5.3618 12.4493 6.70342 12.9947 8.10122 13C9.42731 13 10.6991 12.4732 11.6368 11.5355C12.2163 10.956 12.6389 10.2487 12.8772 9.47994" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.87891 10.2222H3.10111V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_down.svg b/assets/icons/arrow_down.svg
index c71e5437f8..60e6584c45 100644
--- a/assets/icons/arrow_down.svg
+++ b/assets/icons/arrow_down.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 13L12.5 8.5M8 13L3.5 8.5M8 13V3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 13L12.5 8.5M8 13L3.5 8.5M8 13V3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_down10.svg b/assets/icons/arrow_down10.svg
index 8eed82276c..5933b758d9 100644
--- a/assets/icons/arrow_down10.svg
+++ b/assets/icons/arrow_down10.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m2.5 10.667 2.667 2.666 2.666-2.666M5.167 13.333V2.667M11.833 6.667v-4H10.5M10.5 6.667h2.667M13.167 10.667a1.333 1.333 0 0 0-2.667 0V12a1.333 1.333 0 0 0 2.667 0v-1.333Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m2.5 10.667 2.667 2.666 2.666-2.666M5.167 13.333V2.667M11.833 6.667v-4H10.5M10.5 6.667h2.667M13.167 10.667a1.333 1.333 0 0 0-2.667 0V12a1.333 1.333 0 0 0 2.667 0v-1.333Z"/></svg>
diff --git a/assets/icons/arrow_down_right.svg b/assets/icons/arrow_down_right.svg
index 73f72a2c38..ebdb06d77b 100644
--- a/assets/icons/arrow_down_right.svg
+++ b/assets/icons/arrow_down_right.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.25 4.25L11.125 11.125" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.75 4.25006V11.7501H4.25" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.25 4.25L11.125 11.125" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.75 4.25006V11.7501H4.25" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_left.svg b/assets/icons/arrow_left.svg
index ca441497a0..f7eacb2a77 100644
--- a/assets/icons/arrow_left.svg
+++ b/assets/icons/arrow_left.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 7.50001L8 3M3.5 7.50001L8 12M3.5 7.50001H12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 7.50001L8 3M3.5 7.50001L8 12M3.5 7.50001H12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_right.svg b/assets/icons/arrow_right.svg
index ae14888563..b9324af5a2 100644
--- a/assets/icons/arrow_right.svg
+++ b/assets/icons/arrow_right.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 8L8 12.5M12.5 8L8 3.5M12.5 8H3.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 8L8 12.5M12.5 8L8 3.5M12.5 8H3.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_right_left.svg b/assets/icons/arrow_right_left.svg
index cfeee0cc24..2c1211056a 100644
--- a/assets/icons/arrow_right_left.svg
+++ b/assets/icons/arrow_right_left.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 2L13 4.5L11 7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 4.5H2.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 14L3 11.5L5 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 11.5H13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 2L13 4.5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 4.5H2.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 14L3 11.5L5 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 11.5H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_up.svg b/assets/icons/arrow_up.svg
index b98c710374..ff3ad44123 100644
--- a/assets/icons/arrow_up.svg
+++ b/assets/icons/arrow_up.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 3L12.5 7.5M8 3L3.5 7.5M8 3V13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 3L12.5 7.5M8 3L3.5 7.5M8 3V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/arrow_up_right.svg b/assets/icons/arrow_up_right.svg
index fb065bc9ce..a948ef8f81 100644
--- a/assets/icons/arrow_up_right.svg
+++ b/assets/icons/arrow_up_right.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 11.5L11.5 4.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.5 4.5L11.5 4.5L11.5 11.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.5 11.5L11.5 4.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.5 4.5L11.5 4.5L11.5 11.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/audio_off.svg b/assets/icons/audio_off.svg
index dfb5a1c458..43d2a04344 100644
--- a/assets/icons/audio_off.svg
+++ b/assets/icons/audio_off.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 6C11.003 6.44823 11.2208 6.97398 11.3001 7.52867" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9094 3.75732C13.7621 4.6095 14.3383 5.69876 14.5629 6.88315C14.7875 8.06754 14.6502 9.29213 14.1688 10.3973" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 2L13.6667 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33333 4.66669L4.942 5.05802C4.85494 5.1456 4.75136 5.21504 4.63726 5.2623C4.52317 5.30957 4.40083 5.33372 4.27733 5.33335H2.66667C2.48986 5.33335 2.32029 5.40359 2.19526 5.52862C2.07024 5.65364 2 5.82321 2 6.00002V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3088 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2646 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8654V7.33335" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.21875 2.78136C7.28267 2.71719 7.36421 2.67345 7.45303 2.65568C7.54184 2.63791 7.63393 2.64691 7.71762 2.68154C7.80132 2.71618 7.87284 2.77488 7.92312 2.85022C7.97341 2.92555 8.0002 3.01412 8.00008 3.10469V3.56202" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.6667 6C11.003 6.44823 11.2208 6.97398 11.3001 7.52867" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9094 3.75732C13.7621 4.6095 14.3383 5.69876 14.5629 6.88315C14.7875 8.06754 14.6502 9.29213 14.1688 10.3973" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.66675 2L13.6667 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.33333 4.66669L4.942 5.05802C4.85494 5.1456 4.75136 5.21504 4.63726 5.2623C4.52317 5.30957 4.40083 5.33372 4.27733 5.33335H2.66667C2.48986 5.33335 2.32029 5.40359 2.19526 5.52862C2.07024 5.65364 2 5.82321 2 6.00002V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3088 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2646 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8654V7.33335" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.21875 2.78136C7.28267 2.71719 7.36421 2.67345 7.45303 2.65568C7.54184 2.63791 7.63393 2.64691 7.71762 2.68154C7.80132 2.71618 7.87284 2.77488 7.92312 2.85022C7.97341 2.92555 8.0002 3.01412 8.00008 3.10469V3.56202" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/audio_on.svg b/assets/icons/audio_on.svg
index d1bef0d337..6e183bd585 100644
--- a/assets/icons/audio_on.svg
+++ b/assets/icons/audio_on.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 3.13467C7.99987 3.04181 7.97223 2.95107 7.92057 2.8739C7.86892 2.79674 7.79557 2.7366 7.70977 2.70108C7.62397 2.66557 7.52958 2.65626 7.43849 2.67434C7.34741 2.69242 7.26373 2.73707 7.198 2.80266L4.942 5.058C4.85494 5.14558 4.75136 5.21502 4.63726 5.26228C4.52317 5.30954 4.40083 5.33369 4.27733 5.33333H2.66667C2.48986 5.33333 2.32029 5.40357 2.19526 5.52859C2.07024 5.65362 2 5.82319 2 6V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3087 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2645 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8653V3.13467Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.6667 6C11.0995 6.57699 11.3334 7.27877 11.3334 8C11.3334 8.72123 11.0995 9.42301 10.6667 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9094 12.2427C13.4666 11.6855 13.9085 11.0241 14.2101 10.2961C14.5116 9.56815 14.6668 8.78793 14.6668 7.99999C14.6668 7.21205 14.5116 6.43183 14.2101 5.70387C13.9085 4.97591 13.4666 4.31448 12.9094 3.75732" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 3.13467C7.99987 3.04181 7.97223 2.95107 7.92057 2.8739C7.86892 2.79674 7.79557 2.7366 7.70977 2.70108C7.62397 2.66557 7.52958 2.65626 7.43849 2.67434C7.34741 2.69242 7.26373 2.73707 7.198 2.80266L4.942 5.058C4.85494 5.14558 4.75136 5.21502 4.63726 5.26228C4.52317 5.30954 4.40083 5.33369 4.27733 5.33333H2.66667C2.48986 5.33333 2.32029 5.40357 2.19526 5.52859C2.07024 5.65362 2 5.82319 2 6V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3087 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2645 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8653V3.13467Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.6667 6C11.0995 6.57699 11.3334 7.27877 11.3334 8C11.3334 8.72123 11.0995 9.42301 10.6667 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9094 12.2427C13.4666 11.6855 13.9085 11.0241 14.2101 10.2961C14.5116 9.56815 14.6668 8.78793 14.6668 7.99999C14.6668 7.21205 14.5116 6.43183 14.2101 5.70387C13.9085 4.97591 13.4666 4.31448 12.9094 3.75732" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/backspace.svg b/assets/icons/backspace.svg
index 679ef1ade1..9ef4432b6f 100644
--- a/assets/icons/backspace.svg
+++ b/assets/icons/backspace.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.79998 4C6.50183 4.00002 6.21436 4.10574 5.99358 4.29657L2.19677 7.57657C2.1348 7.63013 2.08528 7.69545 2.05139 7.76832C2.01751 7.8412 2 7.92001 2 7.99971C2 8.07941 2.01751 8.15823 2.05139 8.23111C2.08528 8.30398 2.1348 8.36929 2.19677 8.42286L5.99358 11.7034C6.21436 11.8943 6.50183 12 6.79998 12H12.8C13.1183 12 13.4235 11.8796 13.6485 11.6653C13.8736 11.4509 14 11.1602 14 10.8571V5.14286C14 4.83975 13.8736 4.54906 13.6485 4.33474C13.4235 4.12041 13.1183 4 12.8 4H6.79998Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.5 6.5L11.5 9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 6.5L8.5 9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.79998 4C6.50183 4.00002 6.21436 4.10574 5.99358 4.29657L2.19677 7.57657C2.1348 7.63013 2.08528 7.69545 2.05139 7.76832C2.01751 7.8412 2 7.92001 2 7.99971C2 8.07941 2.01751 8.15823 2.05139 8.23111C2.08528 8.30398 2.1348 8.36929 2.19677 8.42286L5.99358 11.7034C6.21436 11.8943 6.50183 12 6.79998 12H12.8C13.1183 12 13.4235 11.8796 13.6485 11.6653C13.8736 11.4509 14 11.1602 14 10.8571V5.14286C14 4.83975 13.8736 4.54906 13.6485 4.33474C13.4235 4.12041 13.1183 4 12.8 4H6.79998Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.5 6.5L11.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5 6.5L8.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/bell.svg b/assets/icons/bell.svg
index f9b2a97fb3..70225bb105 100644
--- a/assets/icons/bell.svg
+++ b/assets/icons/bell.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M5.33333 5.8C5.33333 5.05739 5.61429 4.3452 6.11438 3.8201C6.61448 3.295 7.29276 3 8 3C8.70724 3 9.38552 3.295 9.88562 3.8201C10.3857 4.3452 10.6667 5.05739 10.6667 5.8C10.6667 9.06667 12 10 12 10H4C4 10 5.33333 9.06667 5.33333 5.8Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M5.33333 5.8C5.33333 5.05739 5.61429 4.3452 6.11438 3.8201C6.61448 3.295 7.29276 3 8 3C8.70724 3 9.38552 3.295 9.88562 3.8201C10.3857 4.3452 10.6667 5.05739 10.6667 5.8C10.6667 9.06667 12 10 12 10H4C4 10 5.33333 9.06667 5.33333 5.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/bell_dot.svg b/assets/icons/bell_dot.svg
index 09a17401da..959a7773cf 100644
--- a/assets/icons/bell_dot.svg
+++ b/assets/icons/bell_dot.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4.86142 8.6961C4.47786 9.66547 4 9.99997 4 9.99997H12C12 9.99997 10.6667 9.06664 10.6667 5.79997C10.6667 5.05737 10.3857 4.34518 9.88562 3.82007C9.52389 3.44026 9.06893 3.18083 8.57722 3.06635" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M4.86142 8.6961C4.47786 9.66547 4 9.99997 4 9.99997H12C12 9.99997 10.6667 9.06664 10.6667 5.79997C10.6667 5.05737 10.3857 4.34518 9.88562 3.82007C9.52389 3.44026 9.06893 3.18083 8.57722 3.06635" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
     <circle cx="4.5" cy="4.5" r="2.5" fill="black"/>
 </svg>
diff --git a/assets/icons/bell_off.svg b/assets/icons/bell_off.svg
index 98cbd1eb60..5c3c1a0d68 100644
--- a/assets/icons/bell_off.svg
+++ b/assets/icons/bell_off.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.6667 5.8C10.6667 5.05739 10.3857 4.3452 9.88562 3.8201C9.38552 3.295 8.70724 3 8 3C7.29276 3 6.61448 3.295 6.11438 3.8201C5.61428 4.3452 5.33333 5.05739 5.33333 5.8C5.33333 9.06667 4 10 4 10H7.375" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M4 3L12.5 11.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+    <path d="M10.6667 5.8C10.6667 5.05739 10.3857 4.3452 9.88562 3.8201C9.38552 3.295 8.70724 3 8 3C7.29276 3 6.61448 3.295 6.11438 3.8201C5.61428 4.3452 5.33333 5.05739 5.33333 5.8C5.33333 9.06667 4 10 4 10H7.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M4 3L12.5 11.5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/bell_ring.svg b/assets/icons/bell_ring.svg
index e411e7511b..838056cc03 100644
--- a/assets/icons/bell_ring.svg
+++ b/assets/icons/bell_ring.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M5.33333 5.8C5.33333 5.05739 5.61429 4.3452 6.11438 3.8201C6.61448 3.295 7.29276 3 8 3C8.70724 3 9.38552 3.295 9.88562 3.8201C10.3857 4.3452 10.6667 5.05739 10.6667 5.8C10.6667 9.06667 12 10 12 10H4C4 10 5.33333 9.06667 5.33333 5.8Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M12 2.02081C12.617 2.89491 13.0754 3.88797 13.2528 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M4 2.02081C3.38299 2.89491 2.92461 3.88797 2.74719 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M5.33333 5.8C5.33333 5.05739 5.61429 4.3452 6.11438 3.8201C6.61448 3.295 7.29276 3 8 3C8.70724 3 9.38552 3.295 9.88562 3.8201C10.3857 4.3452 10.6667 5.05739 10.6667 5.8C10.6667 9.06667 12 10 12 10H4C4 10 5.33333 9.06667 5.33333 5.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M12 2.02081C12.617 2.89491 13.0754 3.88797 13.2528 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M4 2.02081C3.38299 2.89491 2.92461 3.88797 2.74719 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/binary.svg b/assets/icons/binary.svg
index bbc375617f..3c15e9b547 100644
--- a/assets/icons/binary.svg
+++ b/assets/icons/binary.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 10.667a1.333 1.333 0 1 0-2.667 0V12A1.333 1.333 0 1 0 12 12v-1.333ZM6.667 4A1.333 1.333 0 0 0 4 4v1.333a1.333 1.333 0 1 0 2.667 0V4ZM4 13.333h2.667M9.333 6.667H12M4 9.333h1.333v4M9.333 2.667h1.334v4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12 10.667a1.333 1.333 0 1 0-2.667 0V12A1.333 1.333 0 1 0 12 12v-1.333ZM6.667 4A1.333 1.333 0 0 0 4 4v1.333a1.333 1.333 0 1 0 2.667 0V4ZM4 13.333h2.667M9.333 6.667H12M4 9.333h1.333v4M9.333 2.667h1.334v4"/></svg>
diff --git a/assets/icons/blocks.svg b/assets/icons/blocks.svg
index e1690e2642..84725d7892 100644
--- a/assets/icons/blocks.svg
+++ b/assets/icons/blocks.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 13.5V5.143C7 4.97247 6.93226 4.80892 6.81167 4.68833C6.69108 4.56774 6.52753 4.5 6.357 4.5H3.143C2.97247 4.5 2.80892 4.56774 2.68833 4.68833C2.56774 4.80892 2.5 4.97247 2.5 5.143V12.857C2.5 12.9414 2.51663 13.0251 2.54895 13.1031C2.58126 13.1811 2.62862 13.252 2.68833 13.3117C2.74804 13.3714 2.81892 13.4187 2.89693 13.4511C2.97495 13.4834 3.05856 13.5 3.143 13.5H10.857C10.9414 13.5 11.0251 13.4834 11.1031 13.4511C11.1811 13.4187 11.252 13.3714 11.3117 13.3117C11.3714 13.252 11.4187 13.1811 11.4511 13.1031C11.4834 13.0251 11.5 12.9414 11.5 12.857V9.643C11.5 9.47247 11.4323 9.30892 11.3117 9.18833C11.1911 9.06774 11.0275 9 10.857 9H2.5M12.929 2.5H10.07C9.91873 2.50026 9.77376 2.56054 9.66689 2.6676C9.56002 2.77465 9.5 2.91973 9.5 3.071V5.93C9.5 6.245 9.756 6.501 10.071 6.501H12.929C13.0041 6.501 13.0784 6.4862 13.1477 6.45744C13.2171 6.42868 13.2801 6.38653 13.3331 6.3334C13.3861 6.28028 13.4282 6.21721 13.4568 6.14782C13.4855 6.07843 13.5001 6.00407 13.5 5.929V3.07C13.4997 2.91873 13.4395 2.77376 13.3324 2.66689C13.2254 2.56002 13.0803 2.5 12.929 2.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 13.5V5.143C7 4.97247 6.93226 4.80892 6.81167 4.68833C6.69108 4.56774 6.52753 4.5 6.357 4.5H3.143C2.97247 4.5 2.80892 4.56774 2.68833 4.68833C2.56774 4.80892 2.5 4.97247 2.5 5.143V12.857C2.5 12.9414 2.51663 13.0251 2.54895 13.1031C2.58126 13.1811 2.62862 13.252 2.68833 13.3117C2.74804 13.3714 2.81892 13.4187 2.89693 13.4511C2.97495 13.4834 3.05856 13.5 3.143 13.5H10.857C10.9414 13.5 11.0251 13.4834 11.1031 13.4511C11.1811 13.4187 11.252 13.3714 11.3117 13.3117C11.3714 13.252 11.4187 13.1811 11.4511 13.1031C11.4834 13.0251 11.5 12.9414 11.5 12.857V9.643C11.5 9.47247 11.4323 9.30892 11.3117 9.18833C11.1911 9.06774 11.0275 9 10.857 9H2.5M12.929 2.5H10.07C9.91873 2.50026 9.77376 2.56054 9.66689 2.6676C9.56002 2.77465 9.5 2.91973 9.5 3.071V5.93C9.5 6.245 9.756 6.501 10.071 6.501H12.929C13.0041 6.501 13.0784 6.4862 13.1477 6.45744C13.2171 6.42868 13.2801 6.38653 13.3331 6.3334C13.3861 6.28028 13.4282 6.21721 13.4568 6.14782C13.4855 6.07843 13.5001 6.00407 13.5 5.929V3.07C13.4997 2.91873 13.4395 2.77376 13.3324 2.66689C13.2254 2.56002 13.0803 2.5 12.929 2.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/bolt_outlined.svg b/assets/icons/bolt_outlined.svg
index 58fccf7788..ca9c75fbfd 100644
--- a/assets/icons/bolt_outlined.svg
+++ b/assets/icons/bolt_outlined.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.29787 2.8462C9.41607 2.90046 9.51178 2.98975 9.5701 3.10016C9.62841 3.21057 9.64605 3.3359 9.62028 3.45666L8.96749 6.51117H12.2195C12.334 6.51115 12.446 6.54191 12.5423 6.59976C12.6386 6.65762 12.7151 6.74013 12.7627 6.83748C12.8102 6.93482 12.8269 7.04291 12.8106 7.14885C12.7943 7.2548 12.7458 7.35413 12.6709 7.43504L7.49631 13.0184C7.40998 13.1115 7.29318 13.1752 7.16411 13.1997C7.03504 13.2241 6.90092 13.2081 6.78264 13.1539C6.66437 13.0997 6.56859 13.0104 6.5102 12.9C6.4518 12.7896 6.43408 12.6643 6.45979 12.5435L7.11259 9.48899H3.86054C3.74609 9.489 3.63405 9.45825 3.53776 9.40039C3.44147 9.34254 3.36498 9.26003 3.31742 9.16268C3.26986 9.06534 3.25322 8.95725 3.26949 8.85131C3.28576 8.74536 3.33423 8.64603 3.40916 8.56513L8.58377 2.98169C8.67012 2.88856 8.78699 2.82478 8.91616 2.80028C9.04533 2.77576 9.17953 2.79192 9.29787 2.8462Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.29787 2.8462C9.41607 2.90046 9.51178 2.98975 9.5701 3.10016C9.62841 3.21057 9.64605 3.3359 9.62028 3.45666L8.96749 6.51117H12.2195C12.334 6.51115 12.446 6.54191 12.5423 6.59976C12.6386 6.65762 12.7151 6.74013 12.7627 6.83748C12.8102 6.93482 12.8269 7.04291 12.8106 7.14885C12.7943 7.2548 12.7458 7.35413 12.6709 7.43504L7.49631 13.0184C7.40998 13.1115 7.29318 13.1752 7.16411 13.1997C7.03504 13.2241 6.90092 13.2081 6.78264 13.1539C6.66437 13.0997 6.56859 13.0104 6.5102 12.9C6.4518 12.7896 6.43408 12.6643 6.45979 12.5435L7.11259 9.48899H3.86054C3.74609 9.489 3.63405 9.45825 3.53776 9.40039C3.44147 9.34254 3.36498 9.26003 3.31742 9.16268C3.26986 9.06534 3.25322 8.95725 3.26949 8.85131C3.28576 8.74536 3.33423 8.64603 3.40916 8.56513L8.58377 2.98169C8.67012 2.88856 8.78699 2.82478 8.91616 2.80028C9.04533 2.77576 9.17953 2.79192 9.29787 2.8462Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/book.svg b/assets/icons/book.svg
index 8b0f89e82d..a2ab394be4 100644
--- a/assets/icons/book.svg
+++ b/assets/icons/book.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4 12.125v-8.25c0-.365.132-.714.366-.972.235-.258.552-.403.884-.403H12v11H5.25c-.332 0-.65-.145-.884-.403A1.448 1.448 0 0 1 4 12.125Zm0 0c0-.365.132-.714.366-.972.235-.258.552-.403.884-.403H12"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 12.125v-8.25c0-.365.132-.714.366-.972.235-.258.552-.403.884-.403H12v11H5.25c-.332 0-.65-.145-.884-.403A1.448 1.448 0 0 1 4 12.125Zm0 0c0-.365.132-.714.366-.972.235-.258.552-.403.884-.403H12"/></svg>
diff --git a/assets/icons/book_copy.svg b/assets/icons/book_copy.svg
index f509beffe6..b7afd1df5c 100644
--- a/assets/icons/book_copy.svg
+++ b/assets/icons/book_copy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.5 10.5V3.643c0-.303.113-.594.315-.808.202-.215.476-.335.762-.335H9.5"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4.5 9.5h-.667c-.353 0-.692.105-.942.293-.25.187-.391.442-.391.707 0 .265.14.52.39.707.25.188.59.293.943.293H4.5M13.5 11.25H7.577c-.286 0-.56.118-.762.33a1.151 1.151 0 0 0-.315.795m0 0c0 .298.113.585.315.796.202.21.476.329.762.329H13.5v-9H7.577c-.286 0-.56.119-.762.33a1.151 1.151 0 0 0-.315.795v6.75Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.5 10.5V3.643c0-.303.113-.594.315-.808.202-.215.476-.335.762-.335H9.5"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4.5 9.5h-.667c-.353 0-.692.105-.942.293-.25.187-.391.442-.391.707 0 .265.14.52.39.707.25.188.59.293.943.293H4.5M13.5 11.25H7.577c-.286 0-.56.118-.762.33a1.151 1.151 0 0 0-.315.795m0 0c0 .298.113.585.315.796.202.21.476.329.762.329H13.5v-9H7.577c-.286 0-.56.119-.762.33a1.151 1.151 0 0 0-.315.795v6.75Z"/></svg>
diff --git a/assets/icons/chat.svg b/assets/icons/chat.svg
index a0548c3d3e..c64f6b5e0e 100644
--- a/assets/icons/chat.svg
+++ b/assets/icons/chat.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.17279 8.26346C4.87566 8.62402 5.68419 8.72168 6.4527 8.53885C7.2212 8.35601 7.89913 7.90471 8.36433 7.26626C8.82953 6.62781 9.0514 5.8442 8.98996 5.05664C8.92852 4.26908 8.58781 3.52936 8.02922 2.97078C7.47064 2.41219 6.73092 2.07148 5.94336 2.01004C5.1558 1.9486 4.37219 2.17047 3.73374 2.63567C3.09529 3.10087 2.64399 3.7788 2.46115 4.5473C2.27832 5.31581 2.37598 6.12435 2.73654 6.82721L2 9L4.17279 8.26346Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.07168 11C7.16761 11.4537 7.35843 11.8857 7.63567 12.2662C8.10087 12.9047 8.7788 13.356 9.5473 13.5388C10.3158 13.7217 11.1243 13.624 11.8272 13.2634L14 14L13.2635 11.8272C13.624 11.1243 13.7217 10.3158 13.5388 9.54728C13.356 8.77877 12.9047 8.10084 12.2663 7.63564C11.8858 7.3584 11.4537 7.16759 11 7.07166" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.17279 8.26346C4.87566 8.62402 5.68419 8.72168 6.4527 8.53885C7.2212 8.35601 7.89913 7.90471 8.36433 7.26626C8.82953 6.62781 9.0514 5.8442 8.98996 5.05664C8.92852 4.26908 8.58781 3.52936 8.02922 2.97078C7.47064 2.41219 6.73092 2.07148 5.94336 2.01004C5.1558 1.9486 4.37219 2.17047 3.73374 2.63567C3.09529 3.10087 2.64399 3.7788 2.46115 4.5473C2.27832 5.31581 2.37598 6.12435 2.73654 6.82721L2 9L4.17279 8.26346Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.07168 11C7.16761 11.4537 7.35843 11.8857 7.63567 12.2662C8.10087 12.9047 8.7788 13.356 9.5473 13.5388C10.3158 13.7217 11.1243 13.624 11.8272 13.2634L14 14L13.2635 11.8272C13.624 11.1243 13.7217 10.3158 13.5388 9.54728C13.356 8.77877 12.9047 8.10084 12.2663 7.63564C11.8858 7.3584 11.4537 7.16759 11 7.07166" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/check.svg b/assets/icons/check.svg
index 4563505aaa..21e2137965 100644
--- a/assets/icons/check.svg
+++ b/assets/icons/check.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.625 8.98121L7.03402 10.7714L11.3437 4.75989" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.625 8.98121L7.03402 10.7714L11.3437 4.75989" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/check_circle.svg b/assets/icons/check_circle.svg
index e6ec5d11ef..f9b88c4ce1 100644
--- a/assets/icons/check_circle.svg
+++ b/assets/icons/check_circle.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.94873 9.02564L7.48722 10.0513L10.0514 6.46149" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.5"/>
+<path d="M5.94873 9.02564L7.48722 10.0513L10.0514 6.46149" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/check_double.svg b/assets/icons/check_double.svg
index b52bef81a4..fabc700520 100644
--- a/assets/icons/check_double.svg
+++ b/assets/icons/check_double.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5999 4.38336L4.99996 10.9833L2 7.98332" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 6.78339L9.50009 11.2833L8.6001 10.3833" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5999 4.38336L4.99996 10.9833L2 7.98332" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 6.78339L9.50009 11.2833L8.6001 10.3833" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/chevron_down.svg b/assets/icons/chevron_down.svg
index 7894aae764..e4ca142a91 100644
--- a/assets/icons/chevron_down.svg
+++ b/assets/icons/chevron_down.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.15186 6.47321L7.99258 10.1696L11.8483 6.47321" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.15186 6.47321L7.99258 10.1696L11.8483 6.47321" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/chevron_left.svg b/assets/icons/chevron_left.svg
index 4be4c95dca..fbe438fd4b 100644
--- a/assets/icons/chevron_left.svg
+++ b/assets/icons/chevron_left.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.55361 4.15179L5.85718 7.99251L9.55361 11.8482" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.55361 4.15179L5.85718 7.99251L9.55361 11.8482" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/chevron_right.svg b/assets/icons/chevron_right.svg
index c8ff847177..4f170717c9 100644
--- a/assets/icons/chevron_right.svg
+++ b/assets/icons/chevron_right.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.44653 4.16071L10.1608 8.00143L6.44653 11.8571" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.44653 4.16071L10.1608 8.00143L6.44653 11.8571" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/chevron_up.svg b/assets/icons/chevron_up.svg
index 8e575e2e8d..bbe6b9762d 100644
--- a/assets/icons/chevron_up.svg
+++ b/assets/icons/chevron_up.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.15186 9.56252L7.99258 5.86609L11.8483 9.56252" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.15186 9.56252L7.99258 5.86609L11.8483 9.56252" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/chevron_up_down.svg b/assets/icons/chevron_up_down.svg
index c7af01d4a3..299f6bce5a 100644
--- a/assets/icons/chevron_up_down.svg
+++ b/assets/icons/chevron_up_down.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.66675 10L8.00008 13.3333L11.3334 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.66675 6.00002L8.00008 2.66669L11.3334 6.00002" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.66675 10L8.00008 13.3333L11.3334 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.66675 6.00002L8.00008 2.66669L11.3334 6.00002" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/circle_help.svg b/assets/icons/circle_help.svg
index 4e2890d3e1..0e623bd1da 100644
--- a/assets/icons/circle_help.svg
+++ b/assets/icons/circle_help.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.54492 6.5C6.66248 6.16582 6.8945 5.88404 7.19991 5.70455C7.50532 5.52506 7.86439 5.45945 8.21354 5.51934C8.56268 5.57922 8.87937 5.76075 9.1075 6.03175C9.33564 6.30276 9.4605 6.64576 9.45997 7C9.45997 8.00002 7.95994 8.50003 7.95994 8.50003" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.5H8.005" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.54492 6.5C6.66248 6.16582 6.8945 5.88404 7.19991 5.70455C7.50532 5.52506 7.86439 5.45945 8.21354 5.51934C8.56268 5.57922 8.87937 5.76075 9.1075 6.03175C9.33564 6.30276 9.4605 6.64576 9.45997 7C9.45997 8.00002 7.95994 8.50003 7.95994 8.50003" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 10.5H8.005" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/close.svg b/assets/icons/close.svg
index ad487e0a4f..846b3a703d 100644
--- a/assets/icons/close.svg
+++ b/assets/icons/close.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.70581 4.5L11.294 11.5M11.294 4.5L4.70581 11.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M4.70581 4.5L11.294 11.5M11.294 4.5L4.70581 11.5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/cloud_download.svg b/assets/icons/cloud_download.svg
index 0efcbe10f1..70cda55856 100644
--- a/assets/icons/cloud_download.svg
+++ b/assets/icons/cloud_download.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.001 9v4l-2-2M8.001 13l2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.436 10.389a4.215 4.215 0 0 1-1.424-3.484 4.227 4.227 0 0 1 1.92-3.236 4.19 4.19 0 0 1 5.335.665 4.22 4.22 0 0 1 .96 1.677H11.3c.584 0 1.151.19 1.618.54a2.71 2.71 0 0 1 .913 3.116A2.709 2.709 0 0 1 12.762 11"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8.001 9v4l-2-2M8.001 13l2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.436 10.389a4.215 4.215 0 0 1-1.424-3.484 4.227 4.227 0 0 1 1.92-3.236 4.19 4.19 0 0 1 5.335.665 4.22 4.22 0 0 1 .96 1.677H11.3c.584 0 1.151.19 1.618.54a2.71 2.71 0 0 1 .913 3.116A2.709 2.709 0 0 1 12.762 11"/></svg>
diff --git a/assets/icons/code.svg b/assets/icons/code.svg
index 6a1795b59c..72d145224a 100644
--- a/assets/icons/code.svg
+++ b/assets/icons/code.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m11.75 10.5 2.5-2.5-2.5-2.5M4.25 5.5 1.75 8l2.5 2.5M9.563 3 6.437 13"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m11.75 10.5 2.5-2.5-2.5-2.5M4.25 5.5 1.75 8l2.5 2.5M9.563 3 6.437 13"/></svg>
diff --git a/assets/icons/cog.svg b/assets/icons/cog.svg
index 4f3ada11a6..7dd3a8beff 100644
--- a/assets/icons/cog.svg
+++ b/assets/icons/cog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8 12.8a4.8 4.8 0 1 0 0-9.6 4.8 4.8 0 0 0 0 9.6Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8 9.2a1.2 1.2 0 1 0 0-2.4 1.2 1.2 0 0 0 0 2.4ZM8 2v1.2M8 14v-1.2M11 13.196l-.6-1.038M7.4 6.962 5 2.804M13.196 11l-1.038-.6M2.804 5l1.038.6M9.2 8H14M2 8h1.2M13.196 5l-1.038.6M2.804 11l1.038-.6M11 2.804l-.6 1.038M7.4 9.038 5 13.196"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12.8a4.8 4.8 0 1 0 0-9.6 4.8 4.8 0 0 0 0 9.6Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 9.2a1.2 1.2 0 1 0 0-2.4 1.2 1.2 0 0 0 0 2.4ZM8 2v1.2M8 14v-1.2M11 13.196l-.6-1.038M7.4 6.962 5 2.804M13.196 11l-1.038-.6M2.804 5l1.038.6M9.2 8H14M2 8h1.2M13.196 5l-1.038.6M2.804 11l1.038-.6M11 2.804l-.6 1.038M7.4 9.038 5 13.196"/></svg>
diff --git a/assets/icons/command.svg b/assets/icons/command.svg
index 6602af8e1f..f361ca2d05 100644
--- a/assets/icons/command.svg
+++ b/assets/icons/command.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.66667 4.66667V11.3333C9.66667 11.663 9.76441 11.9852 9.94755 12.2593C10.1307 12.5334 10.391 12.747 10.6955 12.8731C11.0001 12.9993 11.3352 13.0323 11.6585 12.968C11.9818 12.9037 12.2788 12.7449 12.5118 12.5118C12.7449 12.2788 12.9037 11.9818 12.968 11.6585C13.0323 11.3352 12.9993 11.0001 12.8731 10.6955C12.747 10.391 12.5334 10.1307 12.2593 9.94755C11.9852 9.76441 11.663 9.66667 11.3333 9.66667H4.66667C4.33703 9.66667 4.0148 9.76441 3.74072 9.94755C3.46663 10.1307 3.25301 10.391 3.12687 10.6955C3.00072 11.0001 2.96772 11.3352 3.03203 11.6585C3.09633 11.9818 3.25507 12.2788 3.48816 12.5118C3.72124 12.7449 4.01822 12.9037 4.34152 12.968C4.66482 13.0323 4.99993 12.9993 5.30447 12.8731C5.60902 12.747 5.86931 12.5334 6.05245 12.2593C6.23559 11.9852 6.33333 11.663 6.33333 11.3333V4.66667C6.33333 4.33703 6.23559 4.0148 6.05245 3.74072C5.86931 3.46663 5.60902 3.25301 5.30447 3.12687C4.99993 3.00072 4.66482 2.96772 4.34152 3.03203C4.01822 3.09633 3.72124 3.25507 3.48816 3.48816C3.25507 3.72124 3.09633 4.01822 3.03203 4.34152C2.96772 4.66482 3.00072 4.99993 3.12687 5.30447C3.25301 5.60902 3.46663 5.86931 3.74072 6.05245C4.0148 6.23559 4.33703 6.33333 4.66667 6.33333H11.3333C11.663 6.33333 11.9852 6.23559 12.2593 6.05245C12.5334 5.86931 12.747 5.60902 12.8731 5.30447C12.9993 4.99993 13.0323 4.66482 12.968 4.34152C12.9037 4.01822 12.7449 3.72124 12.5118 3.48816C12.2788 3.25507 11.9818 3.09633 11.6585 3.03203C11.3352 2.96772 11.0001 3.00072 10.6955 3.12687C10.391 3.25301 10.1307 3.46663 9.94755 3.74072C9.76441 4.0148 9.66667 4.33703 9.66667 4.66667Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.66667 4.66667V11.3333C9.66667 11.663 9.76441 11.9852 9.94755 12.2593C10.1307 12.5334 10.391 12.747 10.6955 12.8731C11.0001 12.9993 11.3352 13.0323 11.6585 12.968C11.9818 12.9037 12.2788 12.7449 12.5118 12.5118C12.7449 12.2788 12.9037 11.9818 12.968 11.6585C13.0323 11.3352 12.9993 11.0001 12.8731 10.6955C12.747 10.391 12.5334 10.1307 12.2593 9.94755C11.9852 9.76441 11.663 9.66667 11.3333 9.66667H4.66667C4.33703 9.66667 4.0148 9.76441 3.74072 9.94755C3.46663 10.1307 3.25301 10.391 3.12687 10.6955C3.00072 11.0001 2.96772 11.3352 3.03203 11.6585C3.09633 11.9818 3.25507 12.2788 3.48816 12.5118C3.72124 12.7449 4.01822 12.9037 4.34152 12.968C4.66482 13.0323 4.99993 12.9993 5.30447 12.8731C5.60902 12.747 5.86931 12.5334 6.05245 12.2593C6.23559 11.9852 6.33333 11.663 6.33333 11.3333V4.66667C6.33333 4.33703 6.23559 4.0148 6.05245 3.74072C5.86931 3.46663 5.60902 3.25301 5.30447 3.12687C4.99993 3.00072 4.66482 2.96772 4.34152 3.03203C4.01822 3.09633 3.72124 3.25507 3.48816 3.48816C3.25507 3.72124 3.09633 4.01822 3.03203 4.34152C2.96772 4.66482 3.00072 4.99993 3.12687 5.30447C3.25301 5.60902 3.46663 5.86931 3.74072 6.05245C4.0148 6.23559 4.33703 6.33333 4.66667 6.33333H11.3333C11.663 6.33333 11.9852 6.23559 12.2593 6.05245C12.5334 5.86931 12.747 5.60902 12.8731 5.30447C12.9993 4.99993 13.0323 4.66482 12.968 4.34152C12.9037 4.01822 12.7449 3.72124 12.5118 3.48816C12.2788 3.25507 11.9818 3.09633 11.6585 3.03203C11.3352 2.96772 11.0001 3.00072 10.6955 3.12687C10.391 3.25301 10.1307 3.46663 9.94755 3.74072C9.76441 4.0148 9.66667 4.33703 9.66667 4.66667Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/control.svg b/assets/icons/control.svg
index e831968df6..f9341b6256 100644
--- a/assets/icons/control.svg
+++ b/assets/icons/control.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 6.12487L7.64656 1.97852C7.84183 1.78327 8.1584 1.78328 8.35366 1.97853L12.5 6.12487" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M3.5 6.12487L7.64656 1.97852C7.84183 1.78327 8.1584 1.78328 8.35366 1.97853L12.5 6.12487" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/copilot.svg b/assets/icons/copilot.svg
index 57c0a5f91a..2584cd6310 100644
--- a/assets/icons/copilot.svg
+++ b/assets/icons/copilot.svg
@@ -1,9 +1,9 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M6.44643 8.76593C6.83106 8.76593 7.14286 9.0793 7.14286 9.46588V10.9825C7.14286 11.369 6.83106 11.6824 6.44643 11.6824C6.06181 11.6824 5.75 11.369 5.75 10.9825V9.46588C5.75 9.0793 6.06181 8.76593 6.44643 8.76593Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M9.57168 8.76593C9.95631 8.76593 10.2681 9.0793 10.2681 9.46588V10.9825C10.2681 11.369 9.95631 11.6824 9.57168 11.6824C9.18705 11.6824 8.87524 11.369 8.87524 10.9825V9.46588C8.87524 9.0793 9.18705 8.76593 9.57168 8.76593Z" fill="black"/>
-<path d="M7.99976 4.17853C7.99976 6.67853 5.83695 7.28202 4.30332 7.28202C2.76971 7.28202 2.44604 6.1547 2.44604 4.76409C2.44604 3.37347 3.68929 2.24615 5.2229 2.24615C6.75651 2.24615 7.99976 2.78791 7.99976 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.5"/>
-<path d="M8 4.17853C8 6.67853 10.1628 7.28202 11.6965 7.28202C13.2301 7.28202 13.5537 6.1547 13.5537 4.76409C13.5537 3.37347 12.3105 2.24615 10.7769 2.24615C9.24325 2.24615 8 2.78791 8 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.5"/>
-<path d="M12.5894 6.875C12.5894 6.875 13.3413 7.35585 13.7144 8.08398C14.0876 8.81212 14.0894 10.4985 13.7144 11.1064C13.3395 11.7143 12.8931 12.1429 11.7637 12.7543C10.6344 13.3657 9.143 13.7321 9.143 13.7321H6.85728C6.85728 13.7321 5.37513 13.4107 4.23656 12.7543C3.09798 12.0978 2.55371 11.6786 2.28585 11.1064C2.01799 10.5342 1.92871 8.85715 2.28585 8.08398C2.64299 7.31081 3.42871 6.875 3.42871 6.875" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M7.99976 4.17853C7.99976 6.67853 5.83695 7.28202 4.30332 7.28202C2.76971 7.28202 2.44604 6.1547 2.44604 4.76409C2.44604 3.37347 3.68929 2.24615 5.2229 2.24615C6.75651 2.24615 7.99976 2.78791 7.99976 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.2"/>
+<path d="M8 4.17853C8 6.67853 10.1628 7.28202 11.6965 7.28202C13.2301 7.28202 13.5537 6.1547 13.5537 4.76409C13.5537 3.37347 12.3105 2.24615 10.7769 2.24615C9.24325 2.24615 8 2.78791 8 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.2"/>
+<path d="M12.5894 6.875C12.5894 6.875 13.3413 7.35585 13.7144 8.08398C14.0876 8.81212 14.0894 10.4985 13.7144 11.1064C13.3395 11.7143 12.8931 12.1429 11.7637 12.7543C10.6344 13.3657 9.143 13.7321 9.143 13.7321H6.85728C6.85728 13.7321 5.37513 13.4107 4.23656 12.7543C3.09798 12.0978 2.55371 11.6786 2.28585 11.1064C2.01799 10.5342 1.92871 8.85715 2.28585 8.08398C2.64299 7.31081 3.42871 6.875 3.42871 6.875" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
 <path d="M11.9375 12.6016V7.33636L13.9052 7.99224V10.9255L11.9375 12.6016Z" fill="black" fill-opacity="0.75"/>
 <path d="M4.01793 12.6016V7.33636L2.05029 7.99224V10.9255L4.01793 12.6016Z" fill="black" fill-opacity="0.75"/>
 </svg>
diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg
index dfd8d9dbb9..bca13f8d56 100644
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12.286 6H7.048C6.469 6 6 6.469 6 7.048v5.238c0 .578.469 1.047 1.048 1.047h5.238c.578 0 1.047-.469 1.047-1.047V7.048c0-.579-.469-1.048-1.047-1.048Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.714 10a1.05 1.05 0 0 1-1.047-1.048V3.714a1.05 1.05 0 0 1 1.047-1.047h5.238A1.05 1.05 0 0 1 10 3.714"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12.286 6H7.048C6.469 6 6 6.469 6 7.048v5.238c0 .578.469 1.047 1.048 1.047h5.238c.578 0 1.047-.469 1.047-1.047V7.048c0-.579-.469-1.048-1.047-1.048Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.714 10a1.05 1.05 0 0 1-1.047-1.048V3.714a1.05 1.05 0 0 1 1.047-1.047h5.238A1.05 1.05 0 0 1 10 3.714"/></svg>
diff --git a/assets/icons/countdown_timer.svg b/assets/icons/countdown_timer.svg
index 5e69f1bfb4..5d1e775e68 100644
--- a/assets/icons/countdown_timer.svg
+++ b/assets/icons/countdown_timer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.8 2h2.4M8 9.2l1.8-1.8M8 14a4.8 4.8 0 1 0 0-9.6A4.8 4.8 0 0 0 8 14Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 2h2.4M8 9.2l1.8-1.8M8 14a4.8 4.8 0 1 0 0-9.6A4.8 4.8 0 0 0 8 14Z"/></svg>
diff --git a/assets/icons/crosshair.svg b/assets/icons/crosshair.svg
index 1492bf9245..3af6aa9fa3 100644
--- a/assets/icons/crosshair.svg
+++ b/assets/icons/crosshair.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.6863 11.3137 2 8 2C4.6863 2 2 4.6863 2 8C2 11.3137 4.6863 14 8 14Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 8L11 8" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 8H2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 5V2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 14V11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.6863 11.3137 2 8 2C4.6863 2 2 4.6863 2 8C2 11.3137 4.6863 14 8 14Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 8L11 8" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 8H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 5V2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14V11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/cursor_i_beam.svg b/assets/icons/cursor_i_beam.svg
index 3790de6f49..2d513181f9 100644
--- a/assets/icons/cursor_i_beam.svg
+++ b/assets/icons/cursor_i_beam.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 13H10.4C9.76346 13 9.15302 12.7893 8.70296 12.4142C8.25284 12.0391 8 11.5304 8 11V5C8 4.46957 8.25284 3.96086 8.70296 3.58579C9.15302 3.21071 9.76346 3 10.4 3H11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 13H5.6C6.23654 13 6.84698 12.7893 7.29704 12.4142C7.74716 12.0391 8 11.5304 8 11V5C8 4.46957 7.74716 3.96086 7.29704 3.58579C6.84698 3.21071 6.23654 3 5.6 3H5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 13H10.4C9.76346 13 9.15302 12.7893 8.70296 12.4142C8.25284 12.0391 8 11.5304 8 11V5C8 4.46957 8.25284 3.96086 8.70296 3.58579C9.15302 3.21071 9.76346 3 10.4 3H11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 13H5.6C6.23654 13 6.84698 12.7893 7.29704 12.4142C7.74716 12.0391 8 11.5304 8 11V5C8 4.46957 7.74716 3.96086 7.29704 3.58579C6.84698 3.21071 6.23654 3 5.6 3H5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/dash.svg b/assets/icons/dash.svg
index 9270f80781..3928ee7cfa 100644
--- a/assets/icons/dash.svg
+++ b/assets/icons/dash.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.333 8h9.334"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 8h9.334"/></svg>
diff --git a/assets/icons/database_zap.svg b/assets/icons/database_zap.svg
index 160ffa5041..76af0f9251 100644
--- a/assets/icons/database_zap.svg
+++ b/assets/icons/database_zap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.017 5.625c2.974 0 5.385-.804 5.385-1.795 0-.991-2.41-1.795-5.385-1.795-2.973 0-5.384.804-5.384 1.795 0 .991 2.41 1.795 5.384 1.795Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.633 3.83v8.376c-.003.288.201.571.596.827.394.256.967.477 1.671.643a13.12 13.12 0 0 0 2.373.314c.854.04 1.725.01 2.54-.085M13.402 3.83v1.795M13.402 8.018l-1.795 2.991H14l-1.795 2.992"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.633 8.018c0 .28.198.556.575.805.378.25.925.467 1.599.634.673.167 1.454.279 2.28.327.827.048 1.676.032 2.48-.049"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8.017 5.625c2.974 0 5.385-.804 5.385-1.795 0-.991-2.41-1.795-5.385-1.795-2.973 0-5.384.804-5.384 1.795 0 .991 2.41 1.795 5.384 1.795Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.633 3.83v8.376c-.003.288.201.571.596.827.394.256.967.477 1.671.643a13.12 13.12 0 0 0 2.373.314c.854.04 1.725.01 2.54-.085M13.402 3.83v1.795M13.402 8.018l-1.795 2.991H14l-1.795 2.992"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.633 8.018c0 .28.198.556.575.805.378.25.925.467 1.599.634.673.167 1.454.279 2.28.327.827.048 1.676.032 2.48-.049"/></svg>
diff --git a/assets/icons/debug.svg b/assets/icons/debug.svg
index 900caf4b98..6423a2b090 100644
--- a/assets/icons/debug.svg
+++ b/assets/icons/debug.svg
@@ -1,12 +1,12 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.44727 2.19177L6.38617 3.11055" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.64722 3.11055L10.553 2.19177" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.66298 6.07369L5.66298 5.10997C5.64886 4.80689 5.69884 4.50419 5.80993 4.22016C5.92101 3.93613 6.09088 3.67665 6.3093 3.45738C6.52771 3.23811 6.79013 3.0636 7.08074 2.94437C7.37134 2.82514 7.68409 2.76367 8.00011 2.76367C8.31614 2.76367 8.62889 2.82514 8.91949 2.94437C9.21008 3.0636 9.4725 3.23811 9.69092 3.45738C9.90933 3.67665 10.0792 3.93613 10.1903 4.22016C10.3014 4.50419 10.3514 4.80689 10.3373 5.10997V6.07369" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00017 13.1366C6.09924 13.1366 4.54395 11.6686 4.54395 9.87441V8.24333C4.54395 7.66653 4.7867 7.11337 5.21882 6.70552C5.65092 6.29767 6.237 6.06854 6.8481 6.06854H9.15225C9.76335 6.06854 10.3494 6.29767 10.7815 6.70552C11.2136 7.11337 11.4564 7.66653 11.4564 8.24333V9.87441C11.4564 11.6686 9.9011 13.1366 8.00017 13.1366Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.54343 6.22415C3.43167 6.10894 2.51001 5.12967 2.51001 3.91998" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.54367 8.83472H2.2395" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.35449 13.4175C2.35449 12.2078 3.33376 11.1709 4.54345 11.1134" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.1673 3.91998C13.1673 5.12967 12.2455 6.10894 11.1511 6.22415" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.7605 8.83472H11.4563" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.4563 11.1134C12.666 11.1709 13.6453 12.2078 13.6453 13.4175" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.44727 2.19177L6.38617 3.11055" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.64722 3.11055L10.553 2.19177" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.66298 6.07369L5.66298 5.10997C5.64886 4.80689 5.69884 4.50419 5.80993 4.22016C5.92101 3.93613 6.09088 3.67665 6.3093 3.45738C6.52771 3.23811 6.79013 3.0636 7.08074 2.94437C7.37134 2.82514 7.68409 2.76367 8.00011 2.76367C8.31614 2.76367 8.62889 2.82514 8.91949 2.94437C9.21008 3.0636 9.4725 3.23811 9.69092 3.45738C9.90933 3.67665 10.0792 3.93613 10.1903 4.22016C10.3014 4.50419 10.3514 4.80689 10.3373 5.10997V6.07369" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00017 13.1366C6.09924 13.1366 4.54395 11.6686 4.54395 9.87441V8.24333C4.54395 7.66653 4.7867 7.11337 5.21882 6.70552C5.65092 6.29767 6.237 6.06854 6.8481 6.06854H9.15225C9.76335 6.06854 10.3494 6.29767 10.7815 6.70552C11.2136 7.11337 11.4564 7.66653 11.4564 8.24333V9.87441C11.4564 11.6686 9.9011 13.1366 8.00017 13.1366Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.54343 6.22415C3.43167 6.10894 2.51001 5.12967 2.51001 3.91998" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.54367 8.83472H2.2395" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.35449 13.4175C2.35449 12.2078 3.33376 11.1709 4.54345 11.1134" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.1673 3.91998C13.1673 5.12967 12.2455 6.10894 11.1511 6.22415" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.7605 8.83472H11.4563" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4563 11.1134C12.666 11.1709 13.6453 12.2078 13.6453 13.4175" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/debug_breakpoint.svg b/assets/icons/debug_breakpoint.svg
index 9cab42eecd..c09a3c159f 100644
--- a/assets/icons/debug_breakpoint.svg
+++ b/assets/icons/debug_breakpoint.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/debug_continue.svg b/assets/icons/debug_continue.svg
index f663a5a041..f03a8b2364 100644
--- a/assets/icons/debug_continue.svg
+++ b/assets/icons/debug_continue.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4.167 3v10M7.167 3l6 5-6 5V3Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4.167 3v10M7.167 3l6 5-6 5V3Z"/></svg>
diff --git a/assets/icons/debug_detach.svg b/assets/icons/debug_detach.svg
index a34a0e8171..8b34845571 100644
--- a/assets/icons/debug_detach.svg
+++ b/assets/icons/debug_detach.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" clip-path="url(#a)"><path d="m13 3 2-2M1 15l2-2M4.202 13.53a1.598 1.598 0 0 0 2.266 0L8 11.997 4.003 8 2.47 9.532a1.6 1.6 0 0 0 0 2.265l1.732 1.733ZM5 9l1.5-1.5M7 11l1.5-1.5M8 4.003 11.997 8l1.533-1.532a1.599 1.599 0 0 0 0-2.266L11.798 2.47a1.598 1.598 0 0 0-2.266 0L8 4.003Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="m13 3 2-2M1 15l2-2M4.202 13.53a1.598 1.598 0 0 0 2.266 0L8 11.997 4.003 8 2.47 9.532a1.6 1.6 0 0 0 0 2.265l1.732 1.733ZM5 9l1.5-1.5M7 11l1.5-1.5M8 4.003 11.997 8l1.533-1.532a1.599 1.599 0 0 0 0-2.266L11.798 2.47a1.598 1.598 0 0 0-2.266 0L8 4.003Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/debug_disabled_breakpoint.svg b/assets/icons/debug_disabled_breakpoint.svg
index 8b80623b02..9a7c896f47 100644
--- a/assets/icons/debug_disabled_breakpoint.svg
+++ b/assets/icons/debug_disabled_breakpoint.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/debug_disabled_log_breakpoint.svg b/assets/icons/debug_disabled_log_breakpoint.svg
index 2ccc37623d..f477f4f32d 100644
--- a/assets/icons/debug_disabled_log_breakpoint.svg
+++ b/assets/icons/debug_disabled_log_breakpoint.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.8889 2H4.11111C3.49746 2 3 2.59695 3 3.33333V12.6667C3 13.403 3.49746 14 4.11111 14H11.8889C12.5025 14 13 13.403 13 12.6667V3.33333C13 2.59695 12.5025 2 11.8889 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 6H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 10H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.8889 2H4.11111C3.49746 2 3 2.59695 3 3.33333V12.6667C3 13.403 3.49746 14 4.11111 14H11.8889C12.5025 14 13 13.403 13 12.6667V3.33333C13 2.59695 12.5025 2 11.8889 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 6H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 10H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/debug_ignore_breakpoints.svg b/assets/icons/debug_ignore_breakpoints.svg
index b2a345d314..bc95329c7a 100644
--- a/assets/icons/debug_ignore_breakpoints.svg
+++ b/assets/icons/debug_ignore_breakpoints.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 2L14 14M5.81044 2.41392C6.89676 1.98976 8.08314 1.89138 9.22449 2.13079C10.3658 2.37021 11.4127 2.93705 12.237 3.76199C13.0613 4.58693 13.6273 5.6342 13.8658 6.77573C14.1044 7.91727 14.0051 9.10357 13.5801 10.1896M12.2484 12.2484C11.1176 13.3558 9.59562 13.9724 8.01292 13.9642C6.43021 13.956 4.91467 13.3236 3.79552 12.2045C2.67636 11.0853 2.044 9.56979 2.03578 7.98708C2.02757 6.40438 2.64417 4.88236 3.75165 3.75165" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 2L14 14M5.81044 2.41392C6.89676 1.98976 8.08314 1.89138 9.22449 2.13079C10.3658 2.37021 11.4127 2.93705 12.237 3.76199C13.0613 4.58693 13.6273 5.6342 13.8658 6.77573C14.1044 7.91727 14.0051 9.10357 13.5801 10.1896M12.2484 12.2484C11.1176 13.3558 9.59562 13.9724 8.01292 13.9642C6.43021 13.956 4.91467 13.3236 3.79552 12.2045C2.67636 11.0853 2.044 9.56979 2.03578 7.98708C2.02757 6.40438 2.64417 4.88236 3.75165 3.75165" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/debug_step_back.svg b/assets/icons/debug_step_back.svg
index d1112d6b8e..61d45866f6 100644
--- a/assets/icons/debug_step_back.svg
+++ b/assets/icons/debug_step_back.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14 11.333A6 6 0 0 0 4 6.867l-1 .9"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M2 4.667v4h4"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12a.667.667 0 1 0 0-1.333A.667.667 0 0 0 8 12Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 11.333A6 6 0 0 0 4 6.867l-1 .9"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M2 4.667v4h4"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12a.667.667 0 1 0 0-1.333A.667.667 0 0 0 8 12Z"/></svg>
diff --git a/assets/icons/debug_step_into.svg b/assets/icons/debug_step_into.svg
index 02bdd63cb4..9a517fc7ca 100644
--- a/assets/icons/debug_step_into.svg
+++ b/assets/icons/debug_step_into.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.333 10 8 14.667 12.667 10M8 5.333v9.334"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 2.667a.667.667 0 1 0 0-1.334.667.667 0 0 0 0 1.334Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 10 8 14.667 12.667 10M8 5.333v9.334"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 2.667a.667.667 0 1 0 0-1.334.667.667 0 0 0 0 1.334Z"/></svg>
diff --git a/assets/icons/debug_step_out.svg b/assets/icons/debug_step_out.svg
index 48190b704b..147a44f930 100644
--- a/assets/icons/debug_step_out.svg
+++ b/assets/icons/debug_step_out.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.333 6 8 1.333 12.667 6M8 10.667V1.333"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13.333a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 6 8 1.333 12.667 6M8 10.667V1.333"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13.333a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334Z"/></svg>
diff --git a/assets/icons/debug_step_over.svg b/assets/icons/debug_step_over.svg
index 54afac001f..336abc11de 100644
--- a/assets/icons/debug_step_over.svg
+++ b/assets/icons/debug_step_over.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2 11.333a6 6 0 0 1 10-4.466l1 .9"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M14 4.667v4h-4"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12a.667.667 0 1 1 0-1.333A.667.667 0 0 1 8 12Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 11.333a6 6 0 0 1 10-4.466l1 .9"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M14 4.667v4h-4"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12a.667.667 0 1 1 0-1.333A.667.667 0 0 1 8 12Z"/></svg>
diff --git a/assets/icons/diff.svg b/assets/icons/diff.svg
index 61aa617f5b..9d93b2d5b4 100644
--- a/assets/icons/diff.svg
+++ b/assets/icons/diff.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8 3v8M4 7h8M4 13h8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 3v8M4 7h8M4 13h8"/></svg>
diff --git a/assets/icons/disconnected.svg b/assets/icons/disconnected.svg
index f3069798d0..47bd1db478 100644
--- a/assets/icons/disconnected.svg
+++ b/assets/icons/disconnected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m2 2 12 12M4.269 4.27a4.2 4.2 0 0 0 1.93 7.93h5.1c.267 0 .53-.039.785-.116M13.72 10.7a2.699 2.699 0 0 0-2.42-3.9h-1.074A4.204 4.204 0 0 0 6.8 3.842"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m2 2 12 12M4.269 4.27a4.2 4.2 0 0 0 1.93 7.93h5.1c.267 0 .53-.039.785-.116M13.72 10.7a2.699 2.699 0 0 0-2.42-3.9h-1.074A4.204 4.204 0 0 0 6.8 3.842"/></svg>
diff --git a/assets/icons/download.svg b/assets/icons/download.svg
index 6ddcb1e100..6c105d3fd7 100644
--- a/assets/icons/download.svg
+++ b/assets/icons/download.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13 9.667v2.222A1.111 1.111 0 0 1 11.889 13H4.11A1.111 1.111 0 0 1 3 11.889V9.667M5.222 6.889 8 9.667l2.778-2.778M8 9.667V3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13 9.667v2.222A1.111 1.111 0 0 1 11.889 13H4.11A1.111 1.111 0 0 1 3 11.889V9.667M5.222 6.889 8 9.667l2.778-2.778M8 9.667V3"/></svg>
diff --git a/assets/icons/envelope.svg b/assets/icons/envelope.svg
index 0f5e95f968..273cc6de26 100644
--- a/assets/icons/envelope.svg
+++ b/assets/icons/envelope.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13 4C13.5523 4 14 4.44772 14 5V11C14 11.5523 13.5523 12 13 12H3C2.44772 12 2 11.5523 2 11V5C2 4.44772 2.44772 4 3 4H13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M13.5 5L7.9999 8.5L2.5 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M13 4C13.5523 4 14 4.44772 14 5V11C14 11.5523 13.5523 12 13 12H3C2.44772 12 2 11.5523 2 11V5C2 4.44772 2.44772 4 3 4H13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M13.5 5L7.9999 8.5L2.5 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/eraser.svg b/assets/icons/eraser.svg
index 601f2b9b90..ca6209785f 100644
--- a/assets/icons/eraser.svg
+++ b/assets/icons/eraser.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m5.015 12.983-2.567-2.382c-.597-.554-.597-1.385 0-1.884L8.179 3.4c.597-.554 1.493-.554 2.03 0L13.552 6.5c.597.554.597 1.385 0 1.884l-4.955 4.598M14 12.983H5M4.5 7.483l5 5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m5.015 12.983-2.567-2.382c-.597-.554-.597-1.385 0-1.884L8.179 3.4c.597-.554 1.493-.554 2.03 0L13.552 6.5c.597.554.597 1.385 0 1.884l-4.955 4.598M14 12.983H5M4.5 7.483l5 5"/></svg>
diff --git a/assets/icons/escape.svg b/assets/icons/escape.svg
index a87f03d2fa..1898588a67 100644
--- a/assets/icons/escape.svg
+++ b/assets/icons/escape.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3 6V3h3M3 3l5 5M8 3a5 5 0 1 1-5 5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3 6V3h3M3 3l5 5M8 3a5 5 0 1 1-5 5"/></svg>
diff --git a/assets/icons/exit.svg b/assets/icons/exit.svg
index 1ff9d78824..3619a55c87 100644
--- a/assets/icons/exit.svg
+++ b/assets/icons/exit.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.437 11.0461L13.4831 8L10.437 4.95392" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 8L8 8" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.6553 13.4659H4.21843C3.89528 13.4659 3.58537 13.3375 3.35687 13.109C3.12837 12.8805 3 12.5706 3 12.2475V3.71843C3 3.39528 3.12837 3.08537 3.35687 2.85687C3.58537 2.62837 3.89528 2.5 4.21843 2.5H6.6553" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.437 11.0461L13.4831 8L10.437 4.95392" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 8L8 8" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.6553 13.4659H4.21843C3.89528 13.4659 3.58537 13.3375 3.35687 13.109C3.12837 12.8805 3 12.5706 3 12.2475V3.71843C3 3.39528 3.12837 3.08537 3.35687 2.85687C3.58537 2.62837 3.89528 2.5 4.21843 2.5H6.6553" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/expand_down.svg b/assets/icons/expand_down.svg
index 07390aad18..9f85ee6720 100644
--- a/assets/icons/expand_down.svg
+++ b/assets/icons/expand_down.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.1998 9.60002L7.9998 12.8M7.9998 12.8L4.7998 9.60002M7.9998 12.8V6.40002" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 3.73334H10.6666" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M11.1998 9.60002L7.9998 12.8M7.9998 12.8L4.7998 9.60002M7.9998 12.8V6.40002" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.33325 3.73334H10.6666" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/expand_up.svg b/assets/icons/expand_up.svg
index 73c1358b99..49b084fa8f 100644
--- a/assets/icons/expand_up.svg
+++ b/assets/icons/expand_up.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.80005 6.93334L8.00005 3.73334M8.00005 3.73334L11.2 6.93334M8.00005 3.73334V10.1333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.3335 12.8H10.6668" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M4.80005 6.93334L8.00005 3.73334M8.00005 3.73334L11.2 6.93334M8.00005 3.73334V10.1333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.3335 12.8H10.6668" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/expand_vertical.svg b/assets/icons/expand_vertical.svg
index e2a6dd227e..5a5fa8ccb5 100644
--- a/assets/icons/expand_vertical.svg
+++ b/assets/icons/expand_vertical.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" clip-path="url(#a)"><path d="M8 14.667v-4M8 5.333v-4M2.667 8H1.333M6.667 8H5.333M10.667 8H9.333M14.667 8h-1.334M10 12.667l-2 2-2-2M10 3.333l-2-2-2 2"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M8 14.667v-4M8 5.333v-4M2.667 8H1.333M6.667 8H5.333M10.667 8H9.333M14.667 8h-1.334M10 12.667l-2 2-2-2M10 3.333l-2-2-2 2"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/eye.svg b/assets/icons/eye.svg
index 7f10f73801..327fa751e9 100644
--- a/assets/icons/eye.svg
+++ b/assets/icons/eye.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.0375 8.2088C1.9875 8.07409 1.9875 7.92592 2.0375 7.79122C2.5245 6.61039 3.35114 5.60076 4.41264 4.89031C5.47414 4.17986 6.72268 3.8006 7.99999 3.8006C9.2773 3.8006 10.5258 4.17986 11.5873 4.89031C12.6488 5.60076 13.4755 6.61039 13.9625 7.79122C14.0125 7.92592 14.0125 8.07409 13.9625 8.2088C13.4755 9.38962 12.6488 10.3993 11.5873 11.1097C10.5258 11.8202 9.2773 12.1994 7.99999 12.1994C6.72268 12.1994 5.47414 11.8202 4.41264 11.1097C3.35114 10.3993 2.5245 9.38962 2.0375 8.2088Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.0001 9.79988C8.99416 9.79988 9.80001 8.99404 9.80001 7.99998C9.80001 7.00592 8.99416 6.20007 8.0001 6.20007C7.00604 6.20007 6.2002 7.00592 6.2002 7.99998C6.2002 8.99404 7.00604 9.79988 8.0001 9.79988Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.0375 8.2088C1.9875 8.07409 1.9875 7.92592 2.0375 7.79122C2.5245 6.61039 3.35114 5.60076 4.41264 4.89031C5.47414 4.17986 6.72268 3.8006 7.99999 3.8006C9.2773 3.8006 10.5258 4.17986 11.5873 4.89031C12.6488 5.60076 13.4755 6.61039 13.9625 7.79122C14.0125 7.92592 14.0125 8.07409 13.9625 8.2088C13.4755 9.38962 12.6488 10.3993 11.5873 11.1097C10.5258 11.8202 9.2773 12.1994 7.99999 12.1994C6.72268 12.1994 5.47414 11.8202 4.41264 11.1097C3.35114 10.3993 2.5245 9.38962 2.0375 8.2088Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.0001 9.79988C8.99416 9.79988 9.80001 8.99404 9.80001 7.99998C9.80001 7.00592 8.99416 6.20007 8.0001 6.20007C7.00604 6.20007 6.2002 7.00592 6.2002 7.99998C6.2002 8.99404 7.00604 9.79988 8.0001 9.79988Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file.svg b/assets/icons/file.svg
index 85f3f543a5..60cf2537d9 100644
--- a/assets/icons/file.svg
+++ b/assets/icons/file.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.875 2H4.25c-.332 0-.65.126-.884.351-.234.226-.366.53-.366.849v9.6c0 .318.132.623.366.849.235.225.552.351.884.351h7.5c.332 0 .65-.127.884-.351.234-.225.366-.53.366-.85V5L9.875 2Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 2v2.667A1.333 1.333 0 0 0 10.333 6H13"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.875 2H4.25c-.332 0-.65.126-.884.351-.234.226-.366.53-.366.849v9.6c0 .318.132.623.366.849.235.225.552.351.884.351h7.5c.332 0 .65-.127.884-.351.234-.225.366-.53.366-.85V5L9.875 2Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9 2v2.667A1.333 1.333 0 0 0 10.333 6H13"/></svg>
diff --git a/assets/icons/file_code.svg b/assets/icons/file_code.svg
index b0e632b67f..548d5a153b 100644
--- a/assets/icons/file_code.svg
+++ b/assets/icons/file_code.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.8 8.3 5.6 9.8l1.2 1.5M9.2 8.3l1.2 1.5-1.2 1.5M9.2 2v2.4a1.2 1.2 0 0 0 1.2 1.2h2.4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.3 5.6 9.8l1.2 1.5M9.2 8.3l1.2 1.5-1.2 1.5M9.2 2v2.4a1.2 1.2 0 0 0 1.2 1.2h2.4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3Z"/></svg>
diff --git a/assets/icons/file_diff.svg b/assets/icons/file_diff.svg
index d6cb4440ea..193dd7392f 100644
--- a/assets/icons/file_diff.svg
+++ b/assets/icons/file_diff.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3ZM6.2 6.8h3.6M8 8.6V5M6.2 11h3.6"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3ZM6.2 6.8h3.6M8 8.6V5M6.2 11h3.6"/></svg>
diff --git a/assets/icons/file_doc.svg b/assets/icons/file_doc.svg
index 3b11995f36..ccd5eeea01 100644
--- a/assets/icons/file_doc.svg
+++ b/assets/icons/file_doc.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 11V11.8374C13 11.9431 12.9665 12.046 12.9044 12.1315L12.1498 13.1691C12.0557 13.2985 11.9054 13.375 11.7454 13.375H4.25461C4.09464 13.375 3.94433 13.2985 3.85024 13.1691L3.09563 12.1315C3.03348 12.046 3 11.9431 3 11.8374V3" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M13 11V11.8374C13 11.9431 12.9665 12.046 12.9044 12.1315L12.1498 13.1691C12.0557 13.2985 11.9054 13.375 11.7454 13.375H4.25461C4.09464 13.375 3.94433 13.2985 3.85024 13.1691L3.09563 12.1315C3.03348 12.046 3 11.9431 3 11.8374V3" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 <path d="M3 13V11L8 12H13V13H3Z" fill="black"/>
-<path d="M6.63246 3.04418C7.44914 3.31641 8 4.08069 8 4.94155V11.7306C8 12.0924 7.62757 12.3345 7.29693 12.1875L3.79693 10.632C3.61637 10.5518 3.5 10.3727 3.5 10.1751V2.69374C3.5 2.35246 3.83435 2.11148 4.15811 2.2194L6.63246 3.04418Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 3C8.67157 3 8 3.67157 8 4.5V13C8 12.1954 11.2366 12.0382 12.5017 12.0075C12.7778 12.0008 13 11.7761 13 11.5V3.5C13 3.22386 12.7761 3 12.5 3H9.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.63246 3.04418C7.44914 3.31641 8 4.08069 8 4.94155V11.7306C8 12.0924 7.62757 12.3345 7.29693 12.1875L3.79693 10.632C3.61637 10.5518 3.5 10.3727 3.5 10.1751V2.69374C3.5 2.35246 3.83435 2.11148 4.15811 2.2194L6.63246 3.04418Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 3C8.67157 3 8 3.67157 8 4.5V13C8 12.1954 11.2366 12.0382 12.5017 12.0075C12.7778 12.0008 13 11.7761 13 11.5V3.5C13 3.22386 12.7761 3 12.5 3H9.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_generic.svg b/assets/icons/file_generic.svg
index 3c72bd3320..790a5f18d7 100644
--- a/assets/icons/file_generic.svg
+++ b/assets/icons/file_generic.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5H11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M3 8H13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M3 11H9" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M3 5H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M3 8H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M3 11H9" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_git.svg b/assets/icons/file_git.svg
index 197db2e9e6..2b36b0ffd3 100644
--- a/assets/icons/file_git.svg
+++ b/assets/icons/file_git.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 13C6.10457 13 7 12.1046 7 11C7 9.89543 6.10457 9 5 9C3.89543 9 3 9.89543 3 11C3 12.1046 3.89543 13 5 13Z" stroke="black" stroke-width="1.5"/>
-<path d="M11 7C12.1046 7 13 6.10457 13 5C13 3.89543 12.1046 3 11 3C9.89543 3 9 3.89543 9 5C9 6.10457 9.89543 7 11 7Z" fill="black" stroke="black" stroke-width="1.5"/>
-<path d="M4.625 3.625V8.375" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M11 7C11 9.20914 9.20914 11 7 11" stroke="black" stroke-width="1.5"/>
+<path d="M5 13C6.10457 13 7 12.1046 7 11C7 9.89543 6.10457 9 5 9C3.89543 9 3 9.89543 3 11C3 12.1046 3.89543 13 5 13Z" stroke="black" stroke-width="1.2"/>
+<path d="M11 7C12.1046 7 13 6.10457 13 5C13 3.89543 12.1046 3 11 3C9.89543 3 9 3.89543 9 5C9 6.10457 9.89543 7 11 7Z" fill="black" stroke="black" stroke-width="1.2"/>
+<path d="M4.625 3.625V8.375" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M11 7C11 9.20914 9.20914 11 7 11" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/file_icons/ai.svg b/assets/icons/file_icons/ai.svg
index d60396ad47..4236d50337 100644
--- a/assets/icons/file_icons/ai.svg
+++ b/assets/icons/file_icons/ai.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.5 8.75V10.5C8.43097 10.5 7.56903 10.5 5.5 10.5V10L10.5 6V5.5H5.5V7.25" stroke="black" stroke-width="1.5"/>
+    <path d="M10.5 8.75V10.5C8.43097 10.5 7.56903 10.5 5.5 10.5V10L10.5 6V5.5H5.5V7.25" stroke="black" stroke-width="1.2"/>
     <path d="M1.5 8.5C1.77614 8.5 2 8.27614 2 8C2 7.72386 1.77614 7.5 1.5 7.5C1.22386 7.5 1 7.72386 1 8C1 8.27614 1.22386 8.5 1.5 8.5Z" fill="black"/>
     <path d="M2.49976 6.33002C2.7759 6.33002 2.99976 6.10616 2.99976 5.83002C2.99976 5.55387 2.7759 5.33002 2.49976 5.33002C2.22361 5.33002 1.99976 5.55387 1.99976 5.83002C1.99976 6.10616 2.22361 6.33002 2.49976 6.33002Z" fill="black"/>
     <path d="M2.49976 10.66C2.7759 10.66 2.99976 10.4361 2.99976 10.16C2.99976 9.88383 2.7759 9.65997 2.49976 9.65997C2.22361 9.65997 1.99976 9.88383 1.99976 10.16C1.99976 10.4361 2.22361 10.66 2.49976 10.66Z" fill="black"/>
diff --git a/assets/icons/file_icons/audio.svg b/assets/icons/file_icons/audio.svg
index 672f736c95..7948b04616 100644
--- a/assets/icons/file_icons/audio.svg
+++ b/assets/icons/file_icons/audio.svg
@@ -1,8 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 6.66666V8.66666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.5 5V11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 3V13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 5.33334V10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 4V12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5 6.66666V8.66666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 6.66666V8.66666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.5 5V11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.5 3V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 5.33334V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5 4V12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5 6.66666V8.66666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/book.svg b/assets/icons/file_icons/book.svg
index 3b11995f36..ccd5eeea01 100644
--- a/assets/icons/file_icons/book.svg
+++ b/assets/icons/file_icons/book.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 11V11.8374C13 11.9431 12.9665 12.046 12.9044 12.1315L12.1498 13.1691C12.0557 13.2985 11.9054 13.375 11.7454 13.375H4.25461C4.09464 13.375 3.94433 13.2985 3.85024 13.1691L3.09563 12.1315C3.03348 12.046 3 11.9431 3 11.8374V3" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M13 11V11.8374C13 11.9431 12.9665 12.046 12.9044 12.1315L12.1498 13.1691C12.0557 13.2985 11.9054 13.375 11.7454 13.375H4.25461C4.09464 13.375 3.94433 13.2985 3.85024 13.1691L3.09563 12.1315C3.03348 12.046 3 11.9431 3 11.8374V3" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 <path d="M3 13V11L8 12H13V13H3Z" fill="black"/>
-<path d="M6.63246 3.04418C7.44914 3.31641 8 4.08069 8 4.94155V11.7306C8 12.0924 7.62757 12.3345 7.29693 12.1875L3.79693 10.632C3.61637 10.5518 3.5 10.3727 3.5 10.1751V2.69374C3.5 2.35246 3.83435 2.11148 4.15811 2.2194L6.63246 3.04418Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 3C8.67157 3 8 3.67157 8 4.5V13C8 12.1954 11.2366 12.0382 12.5017 12.0075C12.7778 12.0008 13 11.7761 13 11.5V3.5C13 3.22386 12.7761 3 12.5 3H9.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.63246 3.04418C7.44914 3.31641 8 4.08069 8 4.94155V11.7306C8 12.0924 7.62757 12.3345 7.29693 12.1875L3.79693 10.632C3.61637 10.5518 3.5 10.3727 3.5 10.1751V2.69374C3.5 2.35246 3.83435 2.11148 4.15811 2.2194L6.63246 3.04418Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 3C8.67157 3 8 3.67157 8 4.5V13C8 12.1954 11.2366 12.0382 12.5017 12.0075C12.7778 12.0008 13 11.7761 13 11.5V3.5C13 3.22386 12.7761 3 12.5 3H9.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/bun.svg b/assets/icons/file_icons/bun.svg
index 48af8b3088..ca1ec900bc 100644
--- a/assets/icons/file_icons/bun.svg
+++ b/assets/icons/file_icons/bun.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M11.0426 5.32305L11.0426 5.32306L11.0457 5.32471C12.4534 6.05668 13.25 7.21804 13.25 8.42984C13.25 9.40862 12.7315 10.3471 11.7886 11.0652C10.845 11.7839 9.50819 12.25 8 12.25C6.49181 12.25 5.155 11.7839 4.21141 11.0652C3.2685 10.3471 2.75 9.40862 2.75 8.42984C2.75 7.21804 3.54655 6.05668 4.95426 5.32471L4.95427 5.32473L4.95849 5.3225C5.44976 5.06306 5.93128 4.79038 6.4063 4.50125C6.82126 4.25139 7.14467 4.05839 7.42857 3.92422C7.71398 3.78934 7.88783 3.75 8 3.75C8.28571 3.75 8.57685 3.89469 9.43489 4.41073L9.43488 4.41075L9.43944 4.41345C9.47377 4.43377 9.50881 4.45453 9.54456 4.47572C9.94472 4.71289 10.4345 5.00316 11.0426 5.32305Z" stroke="black" stroke-width="1.5"/>
+    <path d="M11.0426 5.32305L11.0426 5.32306L11.0457 5.32471C12.4534 6.05668 13.25 7.21804 13.25 8.42984C13.25 9.40862 12.7315 10.3471 11.7886 11.0652C10.845 11.7839 9.50819 12.25 8 12.25C6.49181 12.25 5.155 11.7839 4.21141 11.0652C3.2685 10.3471 2.75 9.40862 2.75 8.42984C2.75 7.21804 3.54655 6.05668 4.95426 5.32471L4.95427 5.32473L4.95849 5.3225C5.44976 5.06306 5.93128 4.79038 6.4063 4.50125C6.82126 4.25139 7.14467 4.05839 7.42857 3.92422C7.71398 3.78934 7.88783 3.75 8 3.75C8.28571 3.75 8.57685 3.89469 9.43489 4.41073L9.43488 4.41075L9.43944 4.41345C9.47377 4.43377 9.50881 4.45453 9.54456 4.47572C9.94472 4.71289 10.4345 5.00316 11.0426 5.32305Z" stroke="black" stroke-width="1.2"/>
     <path d="M13 7C15.5 12.5 7.92993 15 3.92993 11" stroke="black" stroke-width="1.25"/>
     <circle cx="6" cy="7.75" r="1" fill="black"/>
     <circle cx="10" cy="7.75" r="1" fill="black"/>
diff --git a/assets/icons/file_icons/chevron_down.svg b/assets/icons/file_icons/chevron_down.svg
index 9e60e40cf4..9918f6c9f7 100644
--- a/assets/icons/file_icons/chevron_down.svg
+++ b/assets/icons/file_icons/chevron_down.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.63281 6.66406L7.99344 9.89844L11.3672 6.66406" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.63281 6.66406L7.99344 9.89844L11.3672 6.66406" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/chevron_left.svg b/assets/icons/file_icons/chevron_left.svg
index a2aa9ad996..3299ee7168 100644
--- a/assets/icons/file_icons/chevron_left.svg
+++ b/assets/icons/file_icons/chevron_left.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.35938 4.63281L6.125 7.99344L9.35938 11.3672" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.35938 4.63281L6.125 7.99344L9.35938 11.3672" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/chevron_right.svg b/assets/icons/file_icons/chevron_right.svg
index 06608c95ee..140f644127 100644
--- a/assets/icons/file_icons/chevron_right.svg
+++ b/assets/icons/file_icons/chevron_right.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.64062 4.64062L9.89062 8.00125L6.64062 11.375" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.64062 4.64062L9.89062 8.00125L6.64062 11.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/chevron_up.svg b/assets/icons/file_icons/chevron_up.svg
index fd3d5e4470..ae8c12a989 100644
--- a/assets/icons/file_icons/chevron_up.svg
+++ b/assets/icons/file_icons/chevron_up.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.63281 9.36719L7.99344 6.13281L11.3672 9.36719" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.63281 9.36719L7.99344 6.13281L11.3672 9.36719" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/code.svg b/assets/icons/file_icons/code.svg
index 5f012f8838..af2f6c5dc0 100644
--- a/assets/icons/file_icons/code.svg
+++ b/assets/icons/file_icons/code.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/coffeescript.svg b/assets/icons/file_icons/coffeescript.svg
index fc49df62c0..e91d187615 100644
--- a/assets/icons/file_icons/coffeescript.svg
+++ b/assets/icons/file_icons/coffeescript.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M13.3061 6.5778C11.2118 7.65229 5.59818 7.64305 3.55456 6.49718C3.34826 6.38151 3.00857 6.53238 3.02549 6.76829C3.25878 10.0209 5.09256 13 8.49998 13C11.8648 13 13.6714 10.1058 13.9591 6.91373C13.9819 6.66029 13.5325 6.46164 13.3061 6.5778Z" fill="black"/>
     <path d="M10.0555 5.53646C10.4444 6.0547 11.9998 6.57297 12 4.49998C12.0002 2.42709 9.66679 2.94528 8.50013 4.49998C7.33348 6.05467 4.99991 6.57294 5 4.5C5.00009 2.42706 6.55548 2.94528 6.94443 3.46352" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-    <circle cx="4" cy="10.5" r="1.75" stroke="black" stroke-width="1.5"/>
+    <circle cx="4" cy="10.5" r="1.75" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/file_icons/conversations.svg b/assets/icons/file_icons/conversations.svg
index cef764661f..e25ed973ef 100644
--- a/assets/icons/file_icons/conversations.svg
+++ b/assets/icons/file_icons/conversations.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M6.46115 9.43419C8.30678 9.43419 9.92229 8.43411 9.92229 6.21171C9.92229 3.98933 8.30678 2.98926 6.46115 2.98926C4.61553 2.98926 3 3.98933 3 6.21171C3 7.028 3.21794 7.67935 3.58519 8.17685C3.7184 8.35732 3.69033 8.77795 3.58387 8.97539C3.32908 9.44793 3.81048 9.9657 4.33372 9.84571C4.72539 9.75597 5.13621 9.63447 5.49574 9.4715C5.62736 9.41181 5.7727 9.38777 5.91631 9.40402C6.09471 9.42416 6.27678 9.43419 6.46115 9.43419Z" fill="black" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.3385 7.24835C12.7049 7.74561 12.9224 8.39641 12.9224 9.2117C12.9224 10.028 12.7044 10.6793 12.3372 11.1768C12.204 11.3573 12.232 11.7779 12.3385 11.9754C12.5933 12.4479 12.1119 12.9657 11.5886 12.8457C11.197 12.756 10.7862 12.6345 10.4266 12.4715C10.295 12.4118 10.1497 12.3878 10.0061 12.404C9.82765 12.4242 9.64558 12.4342 9.46121 12.4342C8.61469 12.4342 7.81658 12.2238 7.20055 11.7816" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.3385 7.24835C12.7049 7.74561 12.9224 8.39641 12.9224 9.2117C12.9224 10.028 12.7044 10.6793 12.3372 11.1768C12.204 11.3573 12.232 11.7779 12.3385 11.9754C12.5933 12.4479 12.1119 12.9657 11.5886 12.8457C11.197 12.756 10.7862 12.6345 10.4266 12.4715C10.295 12.4118 10.1497 12.3878 10.0061 12.404C9.82765 12.4242 9.64558 12.4342 9.46121 12.4342C8.61469 12.4342 7.81658 12.2238 7.20055 11.7816" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/dart.svg b/assets/icons/file_icons/dart.svg
index fd3ab01c93..c9ec3de51a 100644
--- a/assets/icons/file_icons/dart.svg
+++ b/assets/icons/file_icons/dart.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 11.25H11.25V12V13.25H7.31066L2.35809 8.29743L3.60151 4.56717L7.81937 2.88003L13.25 8.31066V11.25H12Z" stroke="black" stroke-width="1.5"/>
+    <path d="M12 11.25H11.25V12V13.25H7.31066L2.35809 8.29743L3.60151 4.56717L7.81937 2.88003L13.25 8.31066V11.25H12Z" stroke="black" stroke-width="1.2"/>
     <path d="M10.928 11.4328L3.5 4.5H9.89645C9.96275 4.5 10.0263 4.52634 10.0732 4.57322L13.4268 7.92678C13.4737 7.97366 13.5 8.03725 13.5 8.10355V11.25C13.5 11.3881 13.3881 11.5 13.25 11.5H11.0985C11.0352 11.5 10.9743 11.476 10.928 11.4328Z" fill="black"/>
     <path d="M4 11L4.5 5C3.97221 4.7361 3.33305 5.00085 3.14645 5.56066L2.19544 8.41368C2.07566 8.77302 2.16918 9.16918 2.43702 9.43702L4 11Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/database.svg b/assets/icons/file_icons/database.svg
index 10fbdcbff4..a8226110d3 100644
--- a/assets/icons/file_icons/database.svg
+++ b/assets/icons/file_icons/database.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99993 6.85713C11.1558 6.85713 13.7142 5.83379 13.7142 4.57142C13.7142 3.30905 11.1558 2.28571 7.99993 2.28571C4.84402 2.28571 2.28564 3.30905 2.28564 4.57142C2.28564 5.83379 4.84402 6.85713 7.99993 6.85713Z" fill="black" stroke="black" stroke-width="1.5"/>
-<path d="M13.7142 4.57141V11.4286C13.7142 12.691 11.1558 13.7143 7.99993 13.7143C4.84402 13.7143 2.28564 12.691 2.28564 11.4286V4.57141" stroke="black" stroke-width="1.5"/>
-<path d="M13.7142 8C13.7142 9.26237 11.1558 10.2857 7.99993 10.2857C4.84402 10.2857 2.28564 9.26237 2.28564 8" stroke="black" stroke-width="1.5"/>
+<path d="M7.99993 6.85713C11.1558 6.85713 13.7142 5.83379 13.7142 4.57142C13.7142 3.30905 11.1558 2.28571 7.99993 2.28571C4.84402 2.28571 2.28564 3.30905 2.28564 4.57142C2.28564 5.83379 4.84402 6.85713 7.99993 6.85713Z" fill="black" stroke="black" stroke-width="1.2"/>
+<path d="M13.7142 4.57141V11.4286C13.7142 12.691 11.1558 13.7143 7.99993 13.7143C4.84402 13.7143 2.28564 12.691 2.28564 11.4286V4.57141" stroke="black" stroke-width="1.2"/>
+<path d="M13.7142 8C13.7142 9.26237 11.1558 10.2857 7.99993 10.2857C4.84402 10.2857 2.28564 9.26237 2.28564 8" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/file_icons/diff.svg b/assets/icons/file_icons/diff.svg
index 07c46f1799..ec59a0aabe 100644
--- a/assets/icons/file_icons/diff.svg
+++ b/assets/icons/file_icons/diff.svg
@@ -1,5 +1,5 @@
 <svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 3L8.5 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 6.5H12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 13H12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.5 3L8.5 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 6.5H12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 13H12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/eslint.svg b/assets/icons/file_icons/eslint.svg
index 0f42abe691..ba72d9166b 100644
--- a/assets/icons/file_icons/eslint.svg
+++ b/assets/icons/file_icons/eslint.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13.5413 8.31248C13.6529 8.11911 13.6529 7.88086 13.5413 7.68748L11.0413 3.35736C10.9296 3.16398 10.7233 3.04486 10.5 3.04486H5.5C5.27671 3.04486 5.07038 3.16398 4.95873 3.35736L2.45873 7.68748C2.34709 7.88086 2.34709 8.11911 2.45873 8.31248L4.95873 12.6426C5.07038 12.836 5.27671 12.9551 5.5 12.9551H10.5C10.7233 12.9551 10.9296 12.836 11.0413 12.6426L13.5413 8.31248Z" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
+    <path d="M13.5413 8.31248C13.6529 8.11911 13.6529 7.88086 13.5413 7.68748L11.0413 3.35736C10.9296 3.16398 10.7233 3.04486 10.5 3.04486H5.5C5.27671 3.04486 5.07038 3.16398 4.95873 3.35736L2.45873 7.68748C2.34709 7.88086 2.34709 8.11911 2.45873 8.31248L4.95873 12.6426C5.07038 12.836 5.27671 12.9551 5.5 12.9551H10.5C10.7233 12.9551 10.9296 12.836 11.0413 12.6426L13.5413 8.31248Z" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
     <path d="M7.74994 5.14432C7.90464 5.055 8.09524 5.055 8.24994 5.14432L10.348 6.35564C10.5027 6.44496 10.598 6.61002 10.598 6.78866V9.2113C10.598 9.38994 10.5027 9.555 10.348 9.64432L8.24994 10.8556C8.09524 10.945 7.90464 10.945 7.74994 10.8556L5.65186 9.64432C5.49716 9.555 5.40186 9.38994 5.40186 9.2113V6.78866C5.40186 6.61002 5.49716 6.44496 5.65186 6.35564L7.74994 5.14432Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/file.svg b/assets/icons/file_icons/file.svg
index 3c72bd3320..790a5f18d7 100644
--- a/assets/icons/file_icons/file.svg
+++ b/assets/icons/file_icons/file.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5H11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M3 8H13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M3 11H9" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M3 5H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M3 8H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M3 11H9" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/folder.svg b/assets/icons/file_icons/folder.svg
index a76dc63d1a..e40613000d 100644
--- a/assets/icons/file_icons/folder.svg
+++ b/assets/icons/file_icons/folder.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.26046 3.97337C8.3527 4.17617 8.4795 4.47151 8.57375 4.69341C8.65258 4.87898 8.83437 4.99999 9.03599 4.99999H12.5C12.7761 4.99999 13 5.22385 13 5.49999V12.125C13 12.4011 12.7761 12.625 12.5 12.625H3.5C3.22386 12.625 3 12.4011 3 12.125V3.86932C3 3.59318 3.22386 3.36932 3.5 3.36932H7.34219C7.74141 3.36932 8.09483 3.60924 8.26046 3.97337Z" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M8.26046 3.97337C8.3527 4.17617 8.4795 4.47151 8.57375 4.69341C8.65258 4.87898 8.83437 4.99999 9.03599 4.99999H12.5C12.7761 4.99999 13 5.22385 13 5.49999V12.125C13 12.4011 12.7761 12.625 12.5 12.625H3.5C3.22386 12.625 3 12.4011 3 12.125V3.86932C3 3.59318 3.22386 3.36932 3.5 3.36932H7.34219C7.74141 3.36932 8.09483 3.60924 8.26046 3.97337Z" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/folder_open.svg b/assets/icons/file_icons/folder_open.svg
index ef37f55f83..55231fb6ab 100644
--- a/assets/icons/file_icons/folder_open.svg
+++ b/assets/icons/file_icons/folder_open.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
-<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/font.svg b/assets/icons/file_icons/font.svg
index 4cb01a28f2..6f2b734b26 100644
--- a/assets/icons/file_icons/font.svg
+++ b/assets/icons/file_icons/font.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3352 13.2519H12.375M4.49719 13.2519L8.00001 2.74811L11.5028 13.2519M3.625 13.2519H5.6648M9.74908 9.16761H6.25095" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3352 13.2519H12.375M4.49719 13.2519L8.00001 2.74811L11.5028 13.2519M3.625 13.2519H5.6648M9.74908 9.16761H6.25095" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/git.svg b/assets/icons/file_icons/git.svg
index 197db2e9e6..2b36b0ffd3 100644
--- a/assets/icons/file_icons/git.svg
+++ b/assets/icons/file_icons/git.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 13C6.10457 13 7 12.1046 7 11C7 9.89543 6.10457 9 5 9C3.89543 9 3 9.89543 3 11C3 12.1046 3.89543 13 5 13Z" stroke="black" stroke-width="1.5"/>
-<path d="M11 7C12.1046 7 13 6.10457 13 5C13 3.89543 12.1046 3 11 3C9.89543 3 9 3.89543 9 5C9 6.10457 9.89543 7 11 7Z" fill="black" stroke="black" stroke-width="1.5"/>
-<path d="M4.625 3.625V8.375" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M11 7C11 9.20914 9.20914 11 7 11" stroke="black" stroke-width="1.5"/>
+<path d="M5 13C6.10457 13 7 12.1046 7 11C7 9.89543 6.10457 9 5 9C3.89543 9 3 9.89543 3 11C3 12.1046 3.89543 13 5 13Z" stroke="black" stroke-width="1.2"/>
+<path d="M11 7C12.1046 7 13 6.10457 13 5C13 3.89543 12.1046 3 11 3C9.89543 3 9 3.89543 9 5C9 6.10457 9.89543 7 11 7Z" fill="black" stroke="black" stroke-width="1.2"/>
+<path d="M4.625 3.625V8.375" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M11 7C11 9.20914 9.20914 11 7 11" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/file_icons/gleam.svg b/assets/icons/file_icons/gleam.svg
index 6a3dc2c96f..0399bb4dd2 100644
--- a/assets/icons/file_icons/gleam.svg
+++ b/assets/icons/file_icons/gleam.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M7.3848 9.30444C7.3848 9.30444 7.53254 10.2646 8.53248 10.0882C9.53242 9.91193 9.36378 8.95549 9.36378 8.95549" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="#FF7676" stroke-opacity="0.52" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="#FF7676" stroke-opacity="0.52" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <circle cx="6.25098" cy="7.75" r="0.75" fill="black"/>
 <circle cx="10.1035" cy="7.25" r="0.75" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/graphql.svg b/assets/icons/file_icons/graphql.svg
index 9688472599..e6c0368182 100644
--- a/assets/icons/file_icons/graphql.svg
+++ b/assets/icons/file_icons/graphql.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 5L10.5981 9.5H5.40192L8 5Z" stroke="black" stroke-width="1.5"/>
-<path d="M8 3L12.3301 5.5V10.5L8 13L3.66987 10.5V5.5L8 3Z" stroke="black" stroke-width="1.5"/>
+<path d="M8 5L10.5981 9.5H5.40192L8 5Z" stroke="black" stroke-width="1.2"/>
+<path d="M8 3L12.3301 5.5V10.5L8 13L3.66987 10.5V5.5L8 3Z" stroke="black" stroke-width="1.2"/>
 <circle cx="3.5" cy="5.5" r="1" fill="black"/>
 <circle cx="12.5" cy="5.5" r="1" fill="black"/>
 <circle cx="8" cy="3" r="1" fill="black"/>
diff --git a/assets/icons/file_icons/hash.svg b/assets/icons/file_icons/hash.svg
index 2241904266..77e6c60072 100644
--- a/assets/icons/file_icons/hash.svg
+++ b/assets/icons/file_icons/hash.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.2795 3.63849L8.7478 12.0142" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M7.26626 3.99597L4.73462 12.3717" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M4.15991 6.37988H12.9099" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M3.09839 9.62408H11.8484" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M11.2795 3.63849L8.7478 12.0142" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M7.26626 3.99597L4.73462 12.3717" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M4.15991 6.37988H12.9099" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M3.09839 9.62408H11.8484" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/heroku.svg b/assets/icons/file_icons/heroku.svg
index 826a88646b..732adf72cb 100644
--- a/assets/icons/file_icons/heroku.svg
+++ b/assets/icons/file_icons/heroku.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.5"/>
+<rect x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.2"/>
 <path d="M6.74217 7.13317V4.26172V4.13672H6.61717H5.50781H5.38281V4.26172V8.8824V9.07567L5.55908 8.9964L6.33378 8.64803L6.33378 8.64803L6.33389 8.64798L6.33443 8.64774L6.3347 8.64762L6.3369 8.64667L6.34717 8.64225C6.35635 8.63832 6.37013 8.63248 6.38816 8.62501C6.42423 8.61006 6.47729 8.58857 6.54454 8.56272C6.67911 8.511 6.87014 8.44194 7.09531 8.3729C7.54765 8.2342 8.12948 8.09817 8.66592 8.09817C8.92095 8.09817 9.05676 8.16584 9.12979 8.241C9.2037 8.31708 9.23311 8.42118 9.23311 8.53361V11.7383V11.8633H9.35811H10.4922H10.6172V11.7383V8.53361V8.53322C10.6172 8.43725 10.6172 7.81276 10.1093 7.32276C9.86619 7.08825 9.42187 6.80777 8.69373 6.80777C8.00022 6.80777 7.28721 6.96253 6.74217 7.13317ZM8.45652 5.91932L8.29694 6.12171H8.55468H9.66094H9.71713L9.75443 6.07969C10.2672 5.502 10.5291 4.91889 10.616 4.27855L10.6353 4.13672H10.4922H9.38592H9.28153L9.26292 4.23944C9.1561 4.82914 8.88874 5.37113 8.45652 5.91932Z" fill="black" stroke="black" stroke-width="0.25"/>
 <path d="M5.38281 11.7383V12.01L5.58915 11.8332L6.83447 10.766L6.94523 10.671L6.83447 10.5761L5.58915 9.50891L5.38281 9.33207V9.60382V11.7383Z" fill="black" stroke="black" stroke-width="0.25"/>
 </svg>
diff --git a/assets/icons/file_icons/html.svg b/assets/icons/file_icons/html.svg
index 41f254dd68..8832bcba3a 100644
--- a/assets/icons/file_icons/html.svg
+++ b/assets/icons/file_icons/html.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.15741 4.17108L6.84277 11.8289" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M4.74951 6L2.74951 8L4.74951 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.25 10L13.25 8L11.25 6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.15741 4.17108L6.84277 11.8289" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M4.74951 6L2.74951 8L4.74951 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.25 10L13.25 8L11.25 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/image.svg b/assets/icons/file_icons/image.svg
index 75e64c0a43..c89de1b128 100644
--- a/assets/icons/file_icons/image.svg
+++ b/assets/icons/file_icons/image.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M7.5 4C7.91421 4 8.25 3.66421 8.25 3.25C8.25 2.83579 7.91421 2.5 7.5 2.5C7.08579 2.5 6.75 2.83579 6.75 3.25C6.75 3.66421 7.08579 4 7.5 4Z" fill="black" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M8 8L10 6L12 8H8Z" fill="black"/>
-<path d="M3 11L6 8L8.375 10.375" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 9L8.5 7.5L10 6L11.5 7.5L13 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.375 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H8.35938M10.6406 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11.125" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M3 11L6 8L8.375 10.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 9L8.5 7.5L10 6L11.5 7.5L13 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.375 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H8.35938M10.6406 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11.125" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/java.svg b/assets/icons/file_icons/java.svg
index 63ce6e768c..70d2d10ed7 100644
--- a/assets/icons/file_icons/java.svg
+++ b/assets/icons/file_icons/java.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.99219 8.56632C6.5 9 10.5415 8.99989 12 7.99995C13.4585 7 12.5 9.49999 12.5 10" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M11.5 13C9 13.5781 6 13.5938 4 13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M10.0156 10.9844C8.51562 11.2031 6.5 11.2031 5 10.8906" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M6.5625 6.5C6.34375 6 6.06838 4.93125 6.99999 4.03125C7.93161 3.13125 8.58082 3.33636 9.00002 2" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M9.18477 6.50002C8.88168 6.05002 8.40637 5.71875 9.00014 5.40625C9.5939 5.09375 10.3126 4.65625 10.8751 3.53125" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M4.99219 8.56632C6.5 9 10.5415 8.99989 12 7.99995C13.4585 7 12.5 9.49999 12.5 10" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M11.5 13C9 13.5781 6 13.5938 4 13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M10.0156 10.9844C8.51562 11.2031 6.5 11.2031 5 10.8906" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M6.5625 6.5C6.34375 6 6.06838 4.93125 6.99999 4.03125C7.93161 3.13125 8.58082 3.33636 9.00002 2" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M9.18477 6.50002C8.88168 6.05002 8.40637 5.71875 9.00014 5.40625C9.5939 5.09375 10.3126 4.65625 10.8751 3.53125" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/lock.svg b/assets/icons/file_icons/lock.svg
index 6bfef249b4..10ae33869a 100644
--- a/assets/icons/file_icons/lock.svg
+++ b/assets/icons/file_icons/lock.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.5"/>
+<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 6.5C3.25 5.80964 3.80964 5.25 4.5 5.25H11.5C12.1904 5.25 12.75 5.80964 12.75 6.5V12.5C12.75 13.1904 12.1904 13.75 11.5 13.75H4.5C3.80964 13.75 3.25 13.1904 3.25 12.5V6.5ZM8.75 9.66146C8.90559 9.48517 9 9.25361 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.25361 7.09441 9.48517 7.25 9.66146V11C7.25 11.4142 7.58579 11.75 8 11.75C8.41421 11.75 8.75 11.4142 8.75 11V9.66146Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/magnifying_glass.svg b/assets/icons/file_icons/magnifying_glass.svg
index 75c3e76c80..d0440d905c 100644
--- a/assets/icons/file_icons/magnifying_glass.svg
+++ b/assets/icons/file_icons/magnifying_glass.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/nix.svg b/assets/icons/file_icons/nix.svg
index 879a4d76aa..215d58a035 100644
--- a/assets/icons/file_icons/nix.svg
+++ b/assets/icons/file_icons/nix.svg
@@ -1,8 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00005 4.76556L4.76569 2.74996M6.00005 4.76556L3.75 4.76563M6.00005 4.76556L7.25006 4.7656" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M10.0232 11.2311L11.2675 13.2406M10.0232 11.2311L12.2732 11.2199M10.0232 11.2311L8.7732 11.2373" stroke="black" stroke-opacity="0.5" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M9.99025 4.91551L10.9985 2.77781M9.99025 4.91551L8.75599 3.03419M9.99025 4.91551L10.6759 5.9607" stroke="black" stroke-opacity="0.5" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M6.0323 11.1009L5.03465 13.2436M6.0323 11.1009L7.27585 12.9761M6.0323 11.1009L5.34151 10.0592" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M11.883 8.19023L14.2466 8.19287M11.883 8.19023L13.0602 6.27268M11.883 8.19023L11.229 9.25547" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M4.12354 7.8356L1.76002 7.84465M4.12354 7.8356L2.95585 9.75894M4.12354 7.8356L4.7723 6.76713" stroke="black" stroke-opacity="0.5" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M6.00005 4.76556L4.76569 2.74996M6.00005 4.76556L3.75 4.76563M6.00005 4.76556L7.25006 4.7656" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M10.0232 11.2311L11.2675 13.2406M10.0232 11.2311L12.2732 11.2199M10.0232 11.2311L8.7732 11.2373" stroke="black" stroke-opacity="0.5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M9.99025 4.91551L10.9985 2.77781M9.99025 4.91551L8.75599 3.03419M9.99025 4.91551L10.6759 5.9607" stroke="black" stroke-opacity="0.5" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M6.0323 11.1009L5.03465 13.2436M6.0323 11.1009L7.27585 12.9761M6.0323 11.1009L5.34151 10.0592" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M11.883 8.19023L14.2466 8.19287M11.883 8.19023L13.0602 6.27268M11.883 8.19023L11.229 9.25547" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M4.12354 7.8356L1.76002 7.84465M4.12354 7.8356L2.95585 9.75894M4.12354 7.8356L4.7723 6.76713" stroke="black" stroke-opacity="0.5" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/notebook.svg b/assets/icons/file_icons/notebook.svg
index b72ebc3967..968d5c5982 100644
--- a/assets/icons/file_icons/notebook.svg
+++ b/assets/icons/file_icons/notebook.svg
@@ -1,8 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M3.03125 3.96875C3.03125 3.41647 3.47897 2.96875 4.03125 2.96875H6V13H4.03125C3.47897 13 3.03125 12.5523 3.03125 12V3.96875Z" fill="black"/>
-<path d="M12.5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H12.5C12.7761 13 13 12.7761 13 12.5V3.5C13 3.22386 12.7761 3 12.5 3Z" stroke="black" stroke-width="1.5"/>
-<path d="M10.5 5.75H8.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.5 8H8.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.5 10.25H8.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 3V14" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H12.5C12.7761 13 13 12.7761 13 12.5V3.5C13 3.22386 12.7761 3 12.5 3Z" stroke="black" stroke-width="1.2"/>
+<path d="M10.5 5.75H8.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.5 8H8.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.5 10.25H8.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 3V14" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/package.svg b/assets/icons/file_icons/package.svg
index 12889e8084..16bbccb2e6 100644
--- a/assets/icons/file_icons/package.svg
+++ b/assets/icons/file_icons/package.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.62671 4.88474L7.99977 7.78519M2.62671 4.88474L2.63131 10.9001L8.00436 13.8005M2.62671 4.88474L5.31111 3.54213M7.99977 7.78519L8.00436 13.8005M7.99977 7.78519L10.6841 6.33086M8.00436 13.8005L13.3729 10.8919L13.3683 4.87654M5.31111 3.54213L7.9955 2.19952L13.3683 4.87654M5.31111 3.54213L10.6841 6.33086M10.6841 6.33086L13.3683 4.87654" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.62671 4.88474L7.99977 7.78519M2.62671 4.88474L2.63131 10.9001L8.00436 13.8005M2.62671 4.88474L5.31111 3.54213M7.99977 7.78519L8.00436 13.8005M7.99977 7.78519L10.6841 6.33086M8.00436 13.8005L13.3729 10.8919L13.3683 4.87654M5.31111 3.54213L7.9955 2.19952L13.3683 4.87654M5.31111 3.54213L10.6841 6.33086M10.6841 6.33086L13.3683 4.87654" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M8.03125 13.5625V7.78125L2.5625 4.9375V10.75L8.03125 13.5625Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/phoenix.svg b/assets/icons/file_icons/phoenix.svg
index b61b8beda7..5db68b4e44 100644
--- a/assets/icons/file_icons/phoenix.svg
+++ b/assets/icons/file_icons/phoenix.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13 9C13 8.32138 12.9375 7.5 12.7188 6.75C12.0625 7.53125 10.875 8.1875 10 8.5C10.75 5.90625 9.5625 3.1875 8 3C8 4.96875 7.625 5.90625 6.5 7.5C5 5 3.5 6.5 3 7C3.5 7.5 4.21832 8.24064 4.34375 9.3125C4.6875 12.25 6.75 13 8.5 13C10.25 13 10.5 11 12.5 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M13 9C13 8.32138 12.9375 7.5 12.7188 6.75C12.0625 7.53125 10.875 8.1875 10 8.5C10.75 5.90625 9.5625 3.1875 8 3C8 4.96875 7.625 5.90625 6.5 7.5C5 5 3.5 6.5 3 7C3.5 7.5 4.21832 8.24064 4.34375 9.3125C4.6875 12.25 6.75 13 8.5 13C10.25 13 10.5 11 12.5 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
     <path d="M5.03125 9.15625C5.87694 9.15625 6.5625 8.47069 6.5625 7.625C6.5625 6.77931 5.87694 6.09375 5.03125 6.09375C4.18556 6.09375 3.5 6.77931 3.5 7.625C3.5 8.47069 4.18556 9.15625 5.03125 9.15625Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/plus.svg b/assets/icons/file_icons/plus.svg
index f343d5dd87..3449da3ecd 100644
--- a/assets/icons/file_icons/plus.svg
+++ b/assets/icons/file_icons/plus.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 4V12M12 8H4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M8 4V12M12 8H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/prettier.svg b/assets/icons/file_icons/prettier.svg
index 835bd3a126..f01230c33c 100644
--- a/assets/icons/file_icons/prettier.svg
+++ b/assets/icons/file_icons/prettier.svg
@@ -1,12 +1,12 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M3 3.86328H9.51563" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M12 3.86328H13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M10.6406 6.62628H13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M5.79688 6.62628H8.15625" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M3 6.62628H3.35937" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M8.15625 9.37372H13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M3 9.37372H5.64062" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M3 12.1094H4.54687" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M6.97656 12.1094H9.35938" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-    <path d="M11.8203 12.1094H13" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+    <path d="M3 3.86328H9.51563" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M12 3.86328H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M10.6406 6.62628H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M5.79688 6.62628H8.15625" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M3 6.62628H3.35937" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M8.15625 9.37372H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M3 9.37372H5.64062" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M3 12.1094H4.54687" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M6.97656 12.1094H9.35938" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+    <path d="M11.8203 12.1094H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/project.svg b/assets/icons/file_icons/project.svg
index 86a15d41bc..509cc5f4d0 100644
--- a/assets/icons/file_icons/project.svg
+++ b/assets/icons/file_icons/project.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.03125 3V3.03125M3.03125 3.03125V9M3.03125 3.03125C3.03125 5 6 5 6 5M3.03125 9C3.03125 11 6 11 6 11M3.03125 9V12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.03125 3V3.03125M3.03125 3.03125V9M3.03125 3.03125C3.03125 5 6 5 6 5M3.03125 9C3.03125 11 6 11 6 11M3.03125 9V12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <rect x="8" y="2.5" width="6" height="5" rx="1.5" fill="black"/>
 <rect x="8" y="8.46875" width="6" height="5.0625" rx="1.5" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/python.svg b/assets/icons/file_icons/python.svg
index de904d8e04..b44fdc539d 100644
--- a/assets/icons/file_icons/python.svg
+++ b/assets/icons/file_icons/python.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.18452 2.91638C6.01625 2.91638 4.98489 3.77623 4.91991 4.94678H4.72024C3.81569 4.94678 3 5.63731 3 6.58698V8.10978C3 9.05945 3.81569 9.74998 4.72024 9.74998H5.33631C5.67376 9.74998 6.02976 9.48559 6.02976 9.06153C6.02976 8.46056 6.51694 7.97338 7.11791 7.97338H8.27976C9.18431 7.97338 10 7.28286 10 6.33318V5.06418C10 3.83417 8.93913 2.91638 7.73214 2.91638H7.18452Z" stroke="black" stroke-width="1.5"/>
-<path d="M8.79613 13.0836C9.97889 13.0836 11.0103 12.2025 11.0702 11.0191H11.2738C12.1885 11.0191 13 10.3146 13 9.36187V7.8135C13 6.86077 12.1885 6.15625 11.2738 6.15625H10.6544C10.3099 6.15625 9.96057 6.42749 9.96057 6.84577C9.96057 7.46262 9.46051 7.96268 8.84365 7.96268H7.69494C6.78027 7.96268 5.96875 8.6672 5.96875 9.61993V10.9102C5.96875 12.148 7.02678 13.0836 8.24554 13.0836H8.79613Z" stroke="black" stroke-width="1.5"/>
+<path d="M7.18452 2.91638C6.01625 2.91638 4.98489 3.77623 4.91991 4.94678H4.72024C3.81569 4.94678 3 5.63731 3 6.58698V8.10978C3 9.05945 3.81569 9.74998 4.72024 9.74998H5.33631C5.67376 9.74998 6.02976 9.48559 6.02976 9.06153C6.02976 8.46056 6.51694 7.97338 7.11791 7.97338H8.27976C9.18431 7.97338 10 7.28286 10 6.33318V5.06418C10 3.83417 8.93913 2.91638 7.73214 2.91638H7.18452Z" stroke="black" stroke-width="1.2"/>
+<path d="M8.79613 13.0836C9.97889 13.0836 11.0103 12.2025 11.0702 11.0191H11.2738C12.1885 11.0191 13 10.3146 13 9.36187V7.8135C13 6.86077 12.1885 6.15625 11.2738 6.15625H10.6544C10.3099 6.15625 9.96057 6.42749 9.96057 6.84577C9.96057 7.46262 9.46051 7.96268 8.84365 7.96268H7.69494C6.78027 7.96268 5.96875 8.6672 5.96875 9.61993V10.9102C5.96875 12.148 7.02678 13.0836 8.24554 13.0836H8.79613Z" stroke="black" stroke-width="1.2"/>
 <path d="M7.20312 6.01758C7.64323 6.01758 8 5.6608 8 5.2207C8 4.7806 7.64323 4.42383 7.20312 4.42383C6.76302 4.42383 6.40625 4.7806 6.40625 5.2207C6.40625 5.6608 6.76302 6.01758 7.20312 6.01758Z" fill="black"/>
 <path d="M8.79687 11.5939C9.23698 11.5939 9.59375 11.2372 9.59375 10.7971C9.59375 10.357 9.23698 10.0002 8.79687 10.0002C8.35677 10.0002 8 10.357 8 10.7971C8 11.2372 8.35677 11.5939 8.79687 11.5939Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/replace.svg b/assets/icons/file_icons/replace.svg
index 837cb23b66..287328e82e 100644
--- a/assets/icons/file_icons/replace.svg
+++ b/assets/icons/file_icons/replace.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99988 13C5.97267 13 4.22723 11.7936 3.44238 10.0595M7.99988 3C10.1122 3 11.9185 4.30981 12.6511 6.16152" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99988 13C5.97267 13 4.22723 11.7936 3.44238 10.0595M7.99988 3C10.1122 3 11.9185 4.30981 12.6511 6.16152" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M2.65625 3.29688C3.00143 3.29688 3.28125 3.01705 3.28125 2.67188C3.28125 2.3267 3.00143 2.04688 2.65625 2.04688C2.31107 2.04688 2.03125 2.3267 2.03125 2.67188C2.03125 3.01705 2.31107 3.29688 2.65625 3.29688Z" fill="black"/>
 <path d="M4.71094 3.29688C5.05612 3.29688 5.33594 3.01705 5.33594 2.67188C5.33594 2.3267 5.05612 2.04688 4.71094 2.04688C4.36576 2.04688 4.08594 2.3267 4.08594 2.67188C4.08594 3.01705 4.36576 3.29688 4.71094 3.29688Z" fill="black"/>
 <path d="M5.96094 4.99219C6.30612 4.99219 6.58594 4.71237 6.58594 4.36719C6.58594 4.02201 6.30612 3.74219 5.96094 3.74219C5.61576 3.74219 5.33594 4.02201 5.33594 4.36719C5.33594 4.71237 5.61576 4.99219 5.96094 4.99219Z" fill="black"/>
diff --git a/assets/icons/file_icons/replace_next.svg b/assets/icons/file_icons/replace_next.svg
index 72511be70a..a9a9fc91f5 100644
--- a/assets/icons/file_icons/replace_next.svg
+++ b/assets/icons/file_icons/replace_next.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M8.5 6.88672C10.433 6.88672 12 8.45372 12 10.3867V13M12 13L14 11M12 13L10 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M8.5 6.88672C10.433 6.88672 12 8.45372 12 10.3867V13M12 13L14 11M12 13L10 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
     <path d="M4.94725 6.87672L4.94725 6.87672L5.74909 8.553C5.86125 8.78748 6.09809 8.93673 6.35802 8.93673H6.48391C6.98569 8.93673 7.31204 8.40867 7.08765 7.95986L6.97585 8.01576L7.08765 7.95986L6.41818 6.62094C6.41818 6.62093 6.41818 6.62093 6.41818 6.62093C6.41567 6.6159 6.414 6.60731 6.41826 6.59524C6.42256 6.58306 6.43223 6.57013 6.44764 6.56131L6.38553 6.45283L6.44764 6.56131C7.00658 6.24123 7.33902 5.62588 7.33902 4.92189C7.33902 4.32236 7.13648 3.82296 6.75336 3.47496L6.66932 3.56749L6.75336 3.47496C6.37232 3.12885 5.83204 2.95001 5.18746 2.95001H3.64058C3.26779 2.95001 2.96558 3.25222 2.96558 3.62501V8.26173C2.96558 8.63453 3.26779 8.93673 3.64058 8.93673H3.74605C4.11884 8.93673 4.42105 8.63453 4.42105 8.26173V6.88751C4.42105 6.87371 4.43224 6.86251 4.44605 6.86251H4.92471C4.93433 6.86251 4.9431 6.86804 4.94725 6.87672ZM5.65595 4.39879L5.65595 4.3988C5.78276 4.51357 5.86012 4.68648 5.86012 4.92579C5.86012 5.17095 5.78081 5.34783 5.65146 5.46508L5.65146 5.46508C5.51987 5.58438 5.31538 5.66095 5.03121 5.66095H4.44605C4.43224 5.66095 4.42105 5.64976 4.42105 5.63595V4.23126C4.42105 4.21746 4.43224 4.20626 4.44605 4.20626H5.04293C5.32535 4.20626 5.52689 4.28197 5.65595 4.39879Z" fill="black" stroke="black" stroke-width="0.25"/>
 </svg>
diff --git a/assets/icons/file_icons/rust.svg b/assets/icons/file_icons/rust.svg
index 5db753628a..9e4dc57adb 100644
--- a/assets/icons/file_icons/rust.svg
+++ b/assets/icons/file_icons/rust.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.27935 10.9821C5.32063 10.4038 4.9204 9.89049 4.35998 9.80276L3.60081 9.68387C3.37979 9.64945 3.20167 9.48001 3.15225 9.25614L3.01378 8.63511C2.96382 8.41235 3.05233 8.1807 3.23696 8.05125L3.8631 7.61242C4.33337 7.28297 4.47456 6.6369 4.18621 6.13364L3.79467 5.45092C3.68118 5.25261 3.69801 5.00374 3.83757 4.82321L4.22314 4.32436C4.3627 4.14438 4.59621 4.06994 4.81071 4.13772L5.57531 4.37769C6.11944 4.54879 6.70048 4.26159 6.90683 3.71886L7.1811 2.99782C7.26255 2.78395 7.46345 2.64285 7.68772 2.6423L8.31007 2.64063C8.53434 2.64007 8.73579 2.78006 8.81834 2.99337L9.09965 3.72275C9.30821 4.26214 9.88655 4.54712 10.429 4.37714L11.1632 4.14716C11.3772 4.07994 11.6096 4.15382 11.7492 4.3327L12.1374 4.83099" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.27935 10.9821C5.32063 10.4038 4.9204 9.89049 4.35998 9.80276L3.60081 9.68387C3.37979 9.64945 3.20167 9.48001 3.15225 9.25614L3.01378 8.63511C2.96382 8.41235 3.05233 8.1807 3.23696 8.05125L3.8631 7.61242C4.33337 7.28297 4.47456 6.6369 4.18621 6.13364L3.79467 5.45092C3.68118 5.25261 3.69801 5.00374 3.83757 4.82321L4.22314 4.32436C4.3627 4.14438 4.59621 4.06994 4.81071 4.13772L5.57531 4.37769C6.11944 4.54879 6.70048 4.26159 6.90683 3.71886L7.1811 2.99782C7.26255 2.78395 7.46345 2.64285 7.68772 2.6423L8.31007 2.64063C8.53434 2.64007 8.73579 2.78006 8.81834 2.99337L9.09965 3.72275C9.30821 4.26214 9.88655 4.54712 10.429 4.37714L11.1632 4.14716C11.3772 4.07994 11.6096 4.15382 11.7492 4.3327L12.1374 4.83099" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M8.76988 11.5933C8.76988 11.6595 8.8236 11.7133 8.88988 11.7133H8.97588C9.32602 11.7133 9.60988 11.9971 9.60988 12.3472C9.60988 12.6974 9.32602 12.9812 8.97588 12.9812H7.05587C6.70573 12.9812 6.42188 12.6974 6.42188 12.3472C6.42188 11.9971 6.70573 11.7133 7.05587 11.7133H7.14188C7.20815 11.7133 7.26188 11.6595 7.26188 11.5933V7.66925C7.26188 7.60298 7.20815 7.54925 7.14188 7.54925H7.05588C6.70573 7.54925 6.42188 7.2654 6.42188 6.91525C6.42188 6.5651 6.70573 6.28125 7.05588 6.28125H9.89988C11.0518 6.28125 12.8619 6.71487 12.8619 8.15185C12.8619 8.67078 12.7284 9.10362 12.4642 9.45348C12.1981 9.79765 11.8458 10.0564 11.4056 10.2293C11.3782 10.2401 11.3673 10.273 11.3829 10.298L12.2163 11.6342C12.247 11.6834 12.3008 11.7133 12.3588 11.7133H12.7319C13.082 11.7133 13.3659 11.9971 13.3659 12.3472C13.3659 12.6974 13.082 12.9812 12.7319 12.9812H11.5637C11.4955 12.9812 11.432 12.9465 11.3952 12.889L9.96523 10.6541C9.92847 10.5966 9.86495 10.5618 9.79675 10.5618H8.96988C8.85942 10.5618 8.76988 10.6514 8.76988 10.7619V11.5933ZM9.61188 7.54925C10.0296 7.54925 11.125 7.54925 11.2339 8.18785C11.2975 8.56123 11.1181 8.86557 10.8812 9.07715C10.6423 9.29046 10.2053 9.38985 9.58788 9.38985H8.86988C8.81465 9.38985 8.76988 9.34508 8.76988 9.28985V7.64925C8.76988 7.59402 8.81465 7.54925 8.86988 7.54925H9.61188Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/scala.svg b/assets/icons/file_icons/scala.svg
index 9e89d1fa82..0884cc96f4 100644
--- a/assets/icons/file_icons/scala.svg
+++ b/assets/icons/file_icons/scala.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M12.5827 1.27457C10.4978 2.48798 6.32365 2.94703 3.49893 2.99561C3.22283 3.00036 3.00001 3.22384 3.00001 3.49998L3.00002 6.00003C3.00002 6.27617 3.22284 6.50038 3.49895 6.49563C6.42334 6.44533 10.7942 5.95506 12.7954 4.64327C12.927 4.557 13 4.40741 13 4.25004L13 1.50027C13 1.29426 12.7607 1.17094 12.5827 1.27457Z" fill="black"/>
 <path d="M12.3072 6.51584C12.6851 6.6855 12.8539 7.12936 12.6842 7.50724C12.5145 7.88511 12.0707 8.05391 11.6928 7.88425L12.3072 6.51584ZM3 5.02142C4.32178 5.02142 6.01669 5.1159 7.68605 5.34579C9.34359 5.57406 11.0313 5.94302 12.3072 6.51584L11.6928 7.88425C10.611 7.39853 9.08921 7.05318 7.48142 6.83177C5.88546 6.61199 4.25922 6.52142 3 6.52142L3 5.02142Z" fill="black"/>
-<path d="M3 10.0214C5.581 10.0214 9.64229 10.3915 12 11.45" stroke="black" stroke-width="1.5"/>
+<path d="M3 10.0214C5.581 10.0214 9.64229 10.3915 12 11.45" stroke="black" stroke-width="1.2"/>
 <path d="M12.1401 10.0067C9.94879 11.0472 6.13586 11.4503 3.49893 11.4956C3.22283 11.5004 3.00001 11.7238 3.00001 12L3.00002 14.5C3.00002 14.7762 3.22284 15.0004 3.49895 14.9956C6.42334 14.9453 10.7942 14.4551 12.7954 13.1433C12.927 13.057 13 12.9074 13 12.75L13 10.5002C13 10.0882 12.5123 9.82995 12.1401 10.0067Z" fill="black"/>
 <path d="M12.1401 5.75668C9.94879 6.7972 6.13586 7.20026 3.49893 7.24561C3.22283 7.25036 3.00001 7.47384 3.00001 7.74998L3.00002 10.25C3.00002 10.5262 3.22284 10.7504 3.49895 10.7456C6.42334 10.6953 10.7942 10.2051 12.7954 8.89327C12.927 8.807 13 8.65741 13 8.50004L13 6.25023C13 5.83821 12.5123 5.57995 12.1401 5.75668Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/settings.svg b/assets/icons/file_icons/settings.svg
index 081d25bf48..d308135ff1 100644
--- a/assets/icons/file_icons/settings.svg
+++ b/assets/icons/file_icons/settings.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.16089 10.2476L3.99598 10.3784C4.61244 10.4749 5.05269 11.0395 5.00728 11.6755L4.94576 12.5377C4.92784 12.789 5.06165 13.0255 5.28326 13.1348L5.90091 13.4391C6.12253 13.5485 6.38717 13.5075 6.56817 13.3371L7.1888 12.7505C7.64641 12.3178 8.35245 12.3178 8.81059 12.7505L9.43121 13.3371C9.61222 13.5081 9.87629 13.5485 10.0985 13.4391L10.7173 13.1341C10.9384 13.0255 11.0716 12.7895 11.0537 12.539L10.9921 11.6755C10.9467 11.0395 11.3869 10.4749 12.0033 10.3784L12.8385 10.2476C13.0817 10.2097 13.2776 10.0233 13.3325 9.77768L13.4848 9.09455C13.5398 8.8489 13.4425 8.59408 13.2393 8.45229L12.5422 7.96404C12.0279 7.60355 11.8708 6.89963 12.1814 6.34659L12.6025 5.59745C12.7249 5.3793 12.7047 5.10616 12.5511 4.9094L12.1241 4.36128C11.9706 4.16451 11.7149 4.08325 11.4795 4.15719L10.6719 4.41016C10.0752 4.59714 9.43903 4.28367 9.20962 3.69035L8.90017 2.88803C8.80937 2.65339 8.58777 2.4994 8.34108 2.5L7.65649 2.50184C7.40979 2.50244 7.1888 2.65766 7.09921 2.89291L6.79751 3.68607C6.57053 4.28307 5.93138 4.59898 5.33284 4.41077L4.49178 4.1468C4.25583 4.07225 3.99897 4.15413 3.84545 4.35212L3.42133 4.90084C3.26781 5.09943 3.2493 5.37319 3.37414 5.59133L3.80483 6.34232C4.12201 6.89591 3.96671 7.60659 3.44941 7.96897L2.76065 8.45169C2.55756 8.59408 2.4602 8.84891 2.51516 9.09393L2.66747 9.77708C2.72184 10.0233 2.91777 10.2097 3.16089 10.2476Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.16089 10.2476L3.99598 10.3784C4.61244 10.4749 5.05269 11.0395 5.00728 11.6755L4.94576 12.5377C4.92784 12.789 5.06165 13.0255 5.28326 13.1348L5.90091 13.4391C6.12253 13.5485 6.38717 13.5075 6.56817 13.3371L7.1888 12.7505C7.64641 12.3178 8.35245 12.3178 8.81059 12.7505L9.43121 13.3371C9.61222 13.5081 9.87629 13.5485 10.0985 13.4391L10.7173 13.1341C10.9384 13.0255 11.0716 12.7895 11.0537 12.539L10.9921 11.6755C10.9467 11.0395 11.3869 10.4749 12.0033 10.3784L12.8385 10.2476C13.0817 10.2097 13.2776 10.0233 13.3325 9.77768L13.4848 9.09455C13.5398 8.8489 13.4425 8.59408 13.2393 8.45229L12.5422 7.96404C12.0279 7.60355 11.8708 6.89963 12.1814 6.34659L12.6025 5.59745C12.7249 5.3793 12.7047 5.10616 12.5511 4.9094L12.1241 4.36128C11.9706 4.16451 11.7149 4.08325 11.4795 4.15719L10.6719 4.41016C10.0752 4.59714 9.43903 4.28367 9.20962 3.69035L8.90017 2.88803C8.80937 2.65339 8.58777 2.4994 8.34108 2.5L7.65649 2.50184C7.40979 2.50244 7.1888 2.65766 7.09921 2.89291L6.79751 3.68607C6.57053 4.28307 5.93138 4.59898 5.33284 4.41077L4.49178 4.1468C4.25583 4.07225 3.99897 4.15413 3.84545 4.35212L3.42133 4.90084C3.26781 5.09943 3.2493 5.37319 3.37414 5.59133L3.80483 6.34232C4.12201 6.89591 3.96671 7.60659 3.44941 7.96897L2.76065 8.45169C2.55756 8.59408 2.4602 8.84891 2.51516 9.09393L2.66747 9.77708C2.72184 10.0233 2.91777 10.2097 3.16089 10.2476Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M9.41432 6.83576C8.63332 6.05481 7.36676 6.05476 6.58575 6.83571C5.8048 7.61672 5.80476 8.88327 6.58571 9.66427C7.36671 10.4452 8.63326 10.4452 9.41426 9.66432C10.1952 8.88332 10.1952 7.61676 9.41432 6.83576Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_icons/tcl.svg b/assets/icons/file_icons/tcl.svg
index bb15b0f8e7..1bd7c4a551 100644
--- a/assets/icons/file_icons/tcl.svg
+++ b/assets/icons/file_icons/tcl.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.03125 13C3.46875 12.2812 3.68556 12.0378 4.0625 11.5312M4.0625 11.5312C4.0625 9.86595 4.27768 8.02844 4.75687 7M4.0625 11.5312C4.75687 10.5981 6.6875 8.57812 7.92188 7.54688M4.0625 11.5312C7.875 11.5312 10.0507 9.46738 11.4062 8.03125C11.5818 7.84528 11.2307 7.34164 10.9157 6.96235C10.7718 6.78906 10.8964 6.50073 11.1213 6.48823C11.6657 6.45798 12.3874 6.36175 12.5 6.06684C12.7544 5.4003 12.9585 4.2437 13.0409 3.28832C13.0541 3.13644 12.9264 3.01119 12.7745 3.0243C10.5824 3.21343 8.22052 3.5262 6.5 4.82764" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M3.03125 13C3.46875 12.2812 3.68556 12.0378 4.0625 11.5312M4.0625 11.5312C4.0625 9.86595 4.27768 8.02844 4.75687 7M4.0625 11.5312C4.75687 10.5981 6.6875 8.57812 7.92188 7.54688M4.0625 11.5312C7.875 11.5312 10.0507 9.46738 11.4062 8.03125C11.5818 7.84528 11.2307 7.34164 10.9157 6.96235C10.7718 6.78906 10.8964 6.50073 11.1213 6.48823C11.6657 6.45798 12.3874 6.36175 12.5 6.06684C12.7544 5.4003 12.9585 4.2437 13.0409 3.28832C13.0541 3.13644 12.9264 3.01119 12.7745 3.0243C10.5824 3.21343 8.22052 3.5262 6.5 4.82764" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/toml.svg b/assets/icons/file_icons/toml.svg
index 9ab78af50f..ae31911d6a 100644
--- a/assets/icons/file_icons/toml.svg
+++ b/assets/icons/file_icons/toml.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 6H10" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M8 6V11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H5M11 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M6 6H10" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 6V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H5M11 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_icons/video.svg b/assets/icons/file_icons/video.svg
index b96e359edb..c249d4c82b 100644
--- a/assets/icons/file_icons/video.svg
+++ b/assets/icons/file_icons/video.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.65625 3H12.8437C13.1199 3 13.3438 3.22386 13.3438 3.5V10.3438M13.3438 13H3.15625C2.88011 13 2.65625 12.7761 2.65625 12.5V5.65625" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M10 8.01562L6.65625 10.3125V5.6875L10 8.01562Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.65625 3H12.8437C13.1199 3 13.3438 3.22386 13.3438 3.5V10.3438M13.3438 13H3.15625C2.88011 13 2.65625 12.7761 2.65625 12.5V5.65625" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M10 8.01562L6.65625 10.3125V5.6875L10 8.01562Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_icons/vue.svg b/assets/icons/file_icons/vue.svg
index 1cbe08dff5..1f993e90ef 100644
--- a/assets/icons/file_icons/vue.svg
+++ b/assets/icons/file_icons/vue.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8 9.13502L4.578 3.21202L4.47016 3.02509C4.42551 2.9477 4.34295 2.90002 4.25361 2.90002H2.43302C2.24057 2.90002 2.12029 3.10836 2.21651 3.27503L7.7835 12.917C7.87972 13.0837 8.12028 13.0837 8.2165 12.917L13.7835 3.27503C13.8797 3.10836 13.7594 2.90002 13.567 2.90002H11.7443C11.655 2.90002 11.5725 2.94767 11.5278 3.02502L8 9.13502Z" fill="black"/>
-<path d="M3.5 3.65002H6.80469L8 5.73596L9.20312 3.65002H12.5234" stroke="black" stroke-width="1.5"/>
+<path d="M3.5 3.65002H6.80469L8 5.73596L9.20312 3.65002H12.5234" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/file_lock.svg b/assets/icons/file_lock.svg
index 6bfef249b4..10ae33869a 100644
--- a/assets/icons/file_lock.svg
+++ b/assets/icons/file_lock.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.5"/>
+<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 6.5C3.25 5.80964 3.80964 5.25 4.5 5.25H11.5C12.1904 5.25 12.75 5.80964 12.75 6.5V12.5C12.75 13.1904 12.1904 13.75 11.5 13.75H4.5C3.80964 13.75 3.25 13.1904 3.25 12.5V6.5ZM8.75 9.66146C8.90559 9.48517 9 9.25361 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.25361 7.09441 9.48517 7.25 9.66146V11C7.25 11.4142 7.58579 11.75 8 11.75C8.41421 11.75 8.75 11.4142 8.75 11V9.66146Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_markdown.svg b/assets/icons/file_markdown.svg
index e26d7a532d..26688a3db0 100644
--- a/assets/icons/file_markdown.svg
+++ b/assets/icons/file_markdown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" clip-path="url(#a)"><path d="M13 13.5v-8L9.5 2h-6a.5.5 0 0 0-.5.5V6"/><path d="M9 2v4h4M8 9.5V13h1a1.75 1.75 0 0 0 0-3.5H8ZM6 13V9.5L4.25 12 2.5 9.5V13"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M13 13.5v-8L9.5 2h-6a.5.5 0 0 0-.5.5V6"/><path d="M9 2v4h4M8 9.5V13h1a1.75 1.75 0 0 0 0-3.5H8ZM6 13V9.5L4.25 12 2.5 9.5V13"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/file_rust.svg b/assets/icons/file_rust.svg
index 5db753628a..9e4dc57adb 100644
--- a/assets/icons/file_rust.svg
+++ b/assets/icons/file_rust.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.27935 10.9821C5.32063 10.4038 4.9204 9.89049 4.35998 9.80276L3.60081 9.68387C3.37979 9.64945 3.20167 9.48001 3.15225 9.25614L3.01378 8.63511C2.96382 8.41235 3.05233 8.1807 3.23696 8.05125L3.8631 7.61242C4.33337 7.28297 4.47456 6.6369 4.18621 6.13364L3.79467 5.45092C3.68118 5.25261 3.69801 5.00374 3.83757 4.82321L4.22314 4.32436C4.3627 4.14438 4.59621 4.06994 4.81071 4.13772L5.57531 4.37769C6.11944 4.54879 6.70048 4.26159 6.90683 3.71886L7.1811 2.99782C7.26255 2.78395 7.46345 2.64285 7.68772 2.6423L8.31007 2.64063C8.53434 2.64007 8.73579 2.78006 8.81834 2.99337L9.09965 3.72275C9.30821 4.26214 9.88655 4.54712 10.429 4.37714L11.1632 4.14716C11.3772 4.07994 11.6096 4.15382 11.7492 4.3327L12.1374 4.83099" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.27935 10.9821C5.32063 10.4038 4.9204 9.89049 4.35998 9.80276L3.60081 9.68387C3.37979 9.64945 3.20167 9.48001 3.15225 9.25614L3.01378 8.63511C2.96382 8.41235 3.05233 8.1807 3.23696 8.05125L3.8631 7.61242C4.33337 7.28297 4.47456 6.6369 4.18621 6.13364L3.79467 5.45092C3.68118 5.25261 3.69801 5.00374 3.83757 4.82321L4.22314 4.32436C4.3627 4.14438 4.59621 4.06994 4.81071 4.13772L5.57531 4.37769C6.11944 4.54879 6.70048 4.26159 6.90683 3.71886L7.1811 2.99782C7.26255 2.78395 7.46345 2.64285 7.68772 2.6423L8.31007 2.64063C8.53434 2.64007 8.73579 2.78006 8.81834 2.99337L9.09965 3.72275C9.30821 4.26214 9.88655 4.54712 10.429 4.37714L11.1632 4.14716C11.3772 4.07994 11.6096 4.15382 11.7492 4.3327L12.1374 4.83099" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M8.76988 11.5933C8.76988 11.6595 8.8236 11.7133 8.88988 11.7133H8.97588C9.32602 11.7133 9.60988 11.9971 9.60988 12.3472C9.60988 12.6974 9.32602 12.9812 8.97588 12.9812H7.05587C6.70573 12.9812 6.42188 12.6974 6.42188 12.3472C6.42188 11.9971 6.70573 11.7133 7.05587 11.7133H7.14188C7.20815 11.7133 7.26188 11.6595 7.26188 11.5933V7.66925C7.26188 7.60298 7.20815 7.54925 7.14188 7.54925H7.05588C6.70573 7.54925 6.42188 7.2654 6.42188 6.91525C6.42188 6.5651 6.70573 6.28125 7.05588 6.28125H9.89988C11.0518 6.28125 12.8619 6.71487 12.8619 8.15185C12.8619 8.67078 12.7284 9.10362 12.4642 9.45348C12.1981 9.79765 11.8458 10.0564 11.4056 10.2293C11.3782 10.2401 11.3673 10.273 11.3829 10.298L12.2163 11.6342C12.247 11.6834 12.3008 11.7133 12.3588 11.7133H12.7319C13.082 11.7133 13.3659 11.9971 13.3659 12.3472C13.3659 12.6974 13.082 12.9812 12.7319 12.9812H11.5637C11.4955 12.9812 11.432 12.9465 11.3952 12.889L9.96523 10.6541C9.92847 10.5966 9.86495 10.5618 9.79675 10.5618H8.96988C8.85942 10.5618 8.76988 10.6514 8.76988 10.7619V11.5933ZM9.61188 7.54925C10.0296 7.54925 11.125 7.54925 11.2339 8.18785C11.2975 8.56123 11.1181 8.86557 10.8812 9.07715C10.6423 9.29046 10.2053 9.38985 9.58788 9.38985H8.86988C8.81465 9.38985 8.76988 9.34508 8.76988 9.28985V7.64925C8.76988 7.59402 8.81465 7.54925 8.86988 7.54925H9.61188Z" fill="black"/>
 </svg>
diff --git a/assets/icons/file_text_outlined.svg b/assets/icons/file_text_outlined.svg
index bb9b85d62f..d2e8897251 100644
--- a/assets/icons/file_text_outlined.svg
+++ b/assets/icons/file_text_outlined.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.87504 2H4.25001C3.91848 2 3.60055 2.12643 3.36612 2.35148C3.1317 2.57652 3 2.88174 3 3.2V12.8C3 13.1182 3.1317 13.4234 3.36612 13.6485C3.60055 13.8735 3.91848 14 4.25001 14H11.75C12.0816 14 12.3995 13.8735 12.6339 13.6485C12.8683 13.4234 13 13.1182 13 12.8V5L9.87504 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 2V4.66666C9 5.02029 9.14048 5.35942 9.39053 5.60948C9.64059 5.85952 9.97972 6 10.3333 6H13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.4534 8.5H5.73267" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2672 10.7207H5.73267" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.87504 2H4.25001C3.91848 2 3.60055 2.12643 3.36612 2.35148C3.1317 2.57652 3 2.88174 3 3.2V12.8C3 13.1182 3.1317 13.4234 3.36612 13.6485C3.60055 13.8735 3.91848 14 4.25001 14H11.75C12.0816 14 12.3995 13.8735 12.6339 13.6485C12.8683 13.4234 13 13.1182 13 12.8V5L9.87504 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 2V4.66666C9 5.02029 9.14048 5.35942 9.39053 5.60948C9.64059 5.85952 9.97972 6 10.3333 6H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.4534 8.5H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2672 10.7207H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/file_toml.svg b/assets/icons/file_toml.svg
index 9ab78af50f..ae31911d6a 100644
--- a/assets/icons/file_toml.svg
+++ b/assets/icons/file_toml.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 6H10" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M8 6V11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H5M11 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M6 6H10" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 6V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H5M11 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/file_tree.svg b/assets/icons/file_tree.svg
index 74acb1fc25..baf0e26ce6 100644
--- a/assets/icons/file_tree.svg
+++ b/assets/icons/file_tree.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 2.5V3.5M3 3.5V9M3 3.5C3 5.46875 5.96875 5 5.96875 5M3 9C3 11 5.96875 11 5.96875 11M3 9V12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 2.5V3.5M3 3.5V9M3 3.5C3 5.46875 5.96875 5 5.96875 5M3 9C3 11 5.96875 11 5.96875 11M3 9V12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M12 3H9.5C8.67157 3 8 3.67157 8 4.5V5.5C8 6.32843 8.67157 7 9.5 7H12C12.8284 7 13.5 6.32843 13.5 5.5V4.5C13.5 3.67157 12.8284 3 12 3Z" fill="black"/>
 <path d="M12 9H9.5C8.67157 9 8 9.67157 8 10.5V11.5C8 12.3284 8.67157 13 9.5 13H12C12.8284 13 13.5 12.3284 13.5 11.5V10.5C13.5 9.67157 12.8284 9 12 9Z" fill="black"/>
 </svg>
diff --git a/assets/icons/filter.svg b/assets/icons/filter.svg
index 7391fea132..4aa14e93c0 100644
--- a/assets/icons/filter.svg
+++ b/assets/icons/filter.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9416 2.99643C13.08 2.79636 12.9568 2.5 12.7352 2.5H3.26475C3.04317 2.5 2.91999 2.79636 3.0584 2.99643L6.04033 7.30646C6.24713 7.60535 6.35981 7.97674 6.35981 8.3596C6.35981 9.18422 6.35981 11.4639 6.35981 12.891C6.35981 13.2285 6.59643 13.5 6.88831 13.5H9.11168C9.40357 13.5 9.64019 13.2285 9.64019 12.891C9.64019 11.4639 9.64019 9.18422 9.64019 8.3596C9.64019 7.97674 9.75289 7.60535 9.95969 7.30646L12.9416 2.99643Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9416 2.99643C13.08 2.79636 12.9568 2.5 12.7352 2.5H3.26475C3.04317 2.5 2.91999 2.79636 3.0584 2.99643L6.04033 7.30646C6.24713 7.60535 6.35981 7.97674 6.35981 8.3596C6.35981 9.18422 6.35981 11.4639 6.35981 12.891C6.35981 13.2285 6.59643 13.5 6.88831 13.5H9.11168C9.40357 13.5 9.64019 13.2285 9.64019 12.891C9.64019 11.4639 9.64019 9.18422 9.64019 8.3596C9.64019 7.97674 9.75289 7.60535 9.95969 7.30646L12.9416 2.99643Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/flame.svg b/assets/icons/flame.svg
index 3215f0d5ae..89fc6cab1e 100644
--- a/assets/icons/flame.svg
+++ b/assets/icons/flame.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.5 9.868c.474 0 .928-.18 1.263-.5.335-.321.523-.756.523-1.21 0-.944-.357-1.369-.715-2.053C5.806 4.64 6.411 3.331 8 2c.357 1.71 1.429 3.353 2.857 4.447C12.286 7.542 13 8.842 13 10.21c0 .63-.13 1.252-.38 1.833a4.781 4.781 0 0 1-1.084 1.554 5.021 5.021 0 0 1-1.623 1.038 5.191 5.191 0 0 1-3.826 0 5.02 5.02 0 0 1-1.623-1.038 4.78 4.78 0 0 1-1.083-1.554A4.615 4.615 0 0 1 3 10.211c0-.79.31-1.57.714-2.053 0 .454.188.889.523 1.21.335.32.79.5 1.263.5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.5 9.868c.474 0 .928-.18 1.263-.5.335-.321.523-.756.523-1.21 0-.944-.357-1.369-.715-2.053C5.806 4.64 6.411 3.331 8 2c.357 1.71 1.429 3.353 2.857 4.447C12.286 7.542 13 8.842 13 10.21c0 .63-.13 1.252-.38 1.833a4.781 4.781 0 0 1-1.084 1.554 5.021 5.021 0 0 1-1.623 1.038 5.191 5.191 0 0 1-3.826 0 5.02 5.02 0 0 1-1.623-1.038 4.78 4.78 0 0 1-1.083-1.554A4.615 4.615 0 0 1 3 10.211c0-.79.31-1.57.714-2.053 0 .454.188.889.523 1.21.335.32.79.5 1.263.5Z"/></svg>
diff --git a/assets/icons/folder.svg b/assets/icons/folder.svg
index 0d76b7e3f8..35f4c1f8ac 100644
--- a/assets/icons/folder.svg
+++ b/assets/icons/folder.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder_open.svg b/assets/icons/folder_open.svg
index ef37f55f83..55231fb6ab 100644
--- a/assets/icons/folder_open.svg
+++ b/assets/icons/folder_open.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
-<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/folder_search.svg b/assets/icons/folder_search.svg
index d1bc537c98..207ea5c10e 100644
--- a/assets/icons/folder_search.svg
+++ b/assets/icons/folder_search.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M14.0001 13.9999L12.7334 12.7333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M11.3333 13.3334C12.4378 13.3334 13.3333 12.4379 13.3333 11.3334C13.3333 10.2288 12.4378 9.33337 11.3333 9.33337C10.2287 9.33337 9.33325 10.2288 9.33325 11.3334C9.33325 12.4379 10.2287 13.3334 11.3333 13.3334Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 13H3.2C2.88174 13 2.57651 12.8761 2.35148 12.6554C2.12643 12.4349 2 12.1356 2 11.8236V4.17647C2 3.86445 2.12643 3.56521 2.35148 3.34458C2.57651 3.12395 2.88174 3 3.2 3H5.558C5.75666 3.00004 5.95221 3.04842 6.1271 3.14082C6.30199 3.23322 6.45073 3.36675 6.56 3.52941L7.046 4.2353C7.15637 4.39964 7.30703 4.53421 7.48418 4.6267C7.66133 4.71919 7.8593 4.76664 8.06 4.76471H12.8C13.1183 4.76471 13.4235 4.88866 13.6486 5.10929C13.8735 5.32992 14 5.62916 14 5.94118V7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H3.2C2.88174 13 2.57651 12.8761 2.35148 12.6554C2.12643 12.4349 2 12.1356 2 11.8236V4.17647C2 3.86445 2.12643 3.56521 2.35148 3.34458C2.57651 3.12395 2.88174 3 3.2 3H5.558C5.75666 3.00004 5.95221 3.04842 6.1271 3.14082C6.30199 3.23322 6.45073 3.36675 6.56 3.52941L7.046 4.2353C7.15637 4.39964 7.30703 4.53421 7.48418 4.6267C7.66133 4.71919 7.8593 4.76664 8.06 4.76471H12.8C13.1183 4.76471 13.4235 4.88866 13.6486 5.10929C13.8735 5.32992 14 5.62916 14 5.94118V7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/font.svg b/assets/icons/font.svg
index 1cc569ecb7..47633a58c9 100644
--- a/assets/icons/font.svg
+++ b/assets/icons/font.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3 5V3h10v2M6 13h4M8 3v10"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3 5V3h10v2M6 13h4M8 3v10"/></svg>
diff --git a/assets/icons/font_size.svg b/assets/icons/font_size.svg
index fd983cb5d3..4286277bd9 100644
--- a/assets/icons/font_size.svg
+++ b/assets/icons/font_size.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14 9.333h-3.333M10.667 10.667V8.333a1.667 1.667 0 1 1 3.333 0v2.334"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M3 8.667h4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m2 10.667 3-6 3 6"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 9.333h-3.333M10.667 10.667V8.333a1.667 1.667 0 1 1 3.333 0v2.334"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M3 8.667h4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m2 10.667 3-6 3 6"/></svg>
diff --git a/assets/icons/font_weight.svg b/assets/icons/font_weight.svg
index 73b9852e2f..410f43ec6e 100644
--- a/assets/icons/font_weight.svg
+++ b/assets/icons/font_weight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4.27 8h5.626a2.5 2.5 0 1 1 0 5h-5a.625.625 0 0 1-.625-.625v-8.75A.625.625 0 0 1 4.896 3H9.27a2.5 2.5 0 1 1 0 5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4.27 8h5.626a2.5 2.5 0 1 1 0 5h-5a.625.625 0 0 1-.625-.625v-8.75A.625.625 0 0 1 4.896 3H9.27a2.5 2.5 0 1 1 0 5"/></svg>
diff --git a/assets/icons/forward_arrow.svg b/assets/icons/forward_arrow.svg
index 503b0b309b..e51796e554 100644
--- a/assets/icons/forward_arrow.svg
+++ b/assets/icons/forward_arrow.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 11.3334L13.3333 8.00002L10 4.66669" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 12V10.6667C2.66675 9.95942 2.9477 9.28115 3.4478 8.78105C3.94789 8.28095 4.62617 8 5.33341 8H13.3334" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 11.3334L13.3333 8.00002L10 4.66669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.66675 12V10.6667C2.66675 9.95942 2.9477 9.28115 3.4478 8.78105C3.94789 8.28095 4.62617 8 5.33341 8H13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/git_branch.svg b/assets/icons/git_branch.svg
index 811bc74762..fc6dcfe1b2 100644
--- a/assets/icons/git_branch.svg
+++ b/assets/icons/git_branch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5 3v7M11.5 6a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM4.5 13a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM11 6a5 5 0 0 1-5 5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5 3v7M11.5 6a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM4.5 13a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM11 6a5 5 0 0 1-5 5"/></svg>
diff --git a/assets/icons/git_branch_alt.svg b/assets/icons/git_branch_alt.svg
index d18b072512..cf40195d8b 100644
--- a/assets/icons/git_branch_alt.svg
+++ b/assets/icons/git_branch_alt.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 14C5.32843 14 6 13.3284 6 12.5C6 11.6716 5.32843 11 4.5 11C3.67157 11 3 11.6716 3 12.5C3 13.3284 3.67157 14 4.5 14Z" stroke="black" stroke-width="1.5"/>
-<path d="M4.5 11V5.5" stroke="black" stroke-width="1.5"/>
-<path d="M4.5 10C4.5 10 4.875 8 6.5 8C7.29195 8 9.00787 8 9.87553 8C10.773 8 11.5 7.32843 11.5 6.5V5.5" stroke="black" stroke-width="1.5"/>
-<path d="M4.5 6C5.32843 6 6 5.32843 6 4.5C6 3.67157 5.32843 3 4.5 3C3.67157 3 3 3.67157 3 4.5C3 5.32843 3.67157 6 4.5 6Z" stroke="black" stroke-width="1.5"/>
-<path d="M11.5 6C12.3284 6 13 5.32843 13 4.5C13 3.67157 12.3284 3 11.5 3C10.6716 3 10 3.67157 10 4.5C10 5.32843 10.6716 6 11.5 6Z" stroke="black" stroke-width="1.5"/>
+<path d="M4.5 14C5.32843 14 6 13.3284 6 12.5C6 11.6716 5.32843 11 4.5 11C3.67157 11 3 11.6716 3 12.5C3 13.3284 3.67157 14 4.5 14Z" stroke="black" stroke-width="1.2"/>
+<path d="M4.5 11V5.5" stroke="black" stroke-width="1.2"/>
+<path d="M4.5 10C4.5 10 4.875 8 6.5 8C7.29195 8 9.00787 8 9.87553 8C10.773 8 11.5 7.32843 11.5 6.5V5.5" stroke="black" stroke-width="1.2"/>
+<path d="M4.5 6C5.32843 6 6 5.32843 6 4.5C6 3.67157 5.32843 3 4.5 3C3.67157 3 3 3.67157 3 4.5C3 5.32843 3.67157 6 4.5 6Z" stroke="black" stroke-width="1.2"/>
+<path d="M11.5 6C12.3284 6 13 5.32843 13 4.5C13 3.67157 12.3284 3 11.5 3C10.6716 3 10 3.67157 10 4.5C10 5.32843 10.6716 6 11.5 6Z" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/github.svg b/assets/icons/github.svg
index fe9186872b..0a12c9b656 100644
--- a/assets/icons/github.svg
+++ b/assets/icons/github.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.849 14.288v-2.515a3.018 3.018 0 0 0-.629-2.201c1.887 0 3.773-1.258 3.773-3.459.05-.786-.17-1.559-.629-2.2a4.65 4.65 0 0 0 0-2.201s-.629 0-1.886.943a13.533 13.533 0 0 0-5.03 0c-1.259-.943-1.887-.943-1.887-.943a4.35 4.35 0 0 0 0 2.2 3.398 3.398 0 0 0-.63 2.201c0 2.201 1.887 3.459 3.774 3.459a2.965 2.965 0 0 0-.63 2.2v2.516"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.076 11.773c-2.836 1.258-3.144-1.258-4.402-1.258"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.849 14.288v-2.515a3.018 3.018 0 0 0-.629-2.201c1.887 0 3.773-1.258 3.773-3.459.05-.786-.17-1.559-.629-2.2a4.65 4.65 0 0 0 0-2.201s-.629 0-1.886.943a13.533 13.533 0 0 0-5.03 0c-1.259-.943-1.887-.943-1.887-.943a4.35 4.35 0 0 0 0 2.2 3.398 3.398 0 0 0-.63 2.201c0 2.201 1.887 3.459 3.774 3.459a2.965 2.965 0 0 0-.63 2.2v2.516"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.076 11.773c-2.836 1.258-3.144-1.258-4.402-1.258"/></svg>
diff --git a/assets/icons/hash.svg b/assets/icons/hash.svg
index 9e4dd7c068..afc1f9c0b5 100644
--- a/assets/icons/hash.svg
+++ b/assets/icons/hash.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.5" d="m11.748 3.015-2.893 9.573M7.161 3.424l-2.893 9.572M3.611 6.148h10M2.398 9.856h10"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="m11.748 3.015-2.893 9.573M7.161 3.424l-2.893 9.572M3.611 6.148h10M2.398 9.856h10"/></svg>
diff --git a/assets/icons/history_rerun.svg b/assets/icons/history_rerun.svg
index 9ade606b31..e11e754318 100644
--- a/assets/icons/history_rerun.svg
+++ b/assets/icons/history_rerun.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 8C2 9.18669 2.35189 10.3467 3.01118 11.3334C3.67047 12.3201 4.60754 13.0892 5.7039 13.5433C6.80026 13.9974 8.00666 14.1162 9.17054 13.8847C10.3344 13.6532 11.4035 13.0818 12.2426 12.2426C13.0818 11.4035 13.6532 10.3344 13.8847 9.17054C14.1162 8.00666 13.9974 6.80026 13.5433 5.7039C13.0892 4.60754 12.3201 3.67047 11.3334 3.01118C10.3467 2.35189 9.18669 2 8 2C6.32263 2.00631 4.71265 2.66082 3.50667 3.82667L2 5.33333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2 2V5.33333H5.33333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 5V8.5L10 9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8C2 9.18669 2.35189 10.3467 3.01118 11.3334C3.67047 12.3201 4.60754 13.0892 5.7039 13.5433C6.80026 13.9974 8.00666 14.1162 9.17054 13.8847C10.3344 13.6532 11.4035 13.0818 12.2426 12.2426C13.0818 11.4035 13.6532 10.3344 13.8847 9.17054C14.1162 8.00666 13.9974 6.80026 13.5433 5.7039C13.0892 4.60754 12.3201 3.67047 11.3334 3.01118C10.3467 2.35189 9.18669 2 8 2C6.32263 2.00631 4.71265 2.66082 3.50667 3.82667L2 5.33333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 2V5.33333H5.33333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 5V8.5L10 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/image.svg b/assets/icons/image.svg
index 0a26c35182..e0d73d7621 100644
--- a/assets/icons/image.svg
+++ b/assets/icons/image.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M11.889 3H4.11C3.497 3 3 3.497 3 4.111v7.778C3 12.503 3.497 13 4.111 13h7.778c.614 0 1.111-.498 1.111-1.111V4.11C13 3.497 12.502 3 11.889 3Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.333 7.444a1.111 1.111 0 1 0 0-2.222 1.111 1.111 0 0 0 0 2.222ZM13 9.667l-1.714-1.715a1.11 1.11 0 0 0-1.571 0L4.667 13"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M11.889 3H4.11C3.497 3 3 3.497 3 4.111v7.778C3 12.503 3.497 13 4.111 13h7.778c.614 0 1.111-.498 1.111-1.111V4.11C13 3.497 12.502 3 11.889 3Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.333 7.444a1.111 1.111 0 1 0 0-2.222 1.111 1.111 0 0 0 0 2.222ZM13 9.667l-1.714-1.715a1.11 1.11 0 0 0-1.571 0L4.667 13"/></svg>
diff --git a/assets/icons/info.svg b/assets/icons/info.svg
index f3d2e6644f..c000f25867 100644
--- a/assets/icons/info.svg
+++ b/assets/icons/info.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.5"/>
-<path d="M7 11H8M8 11H9M8 11V8.1C8 8.04477 7.95523 8 7.9 8H7" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2"/>
+<path d="M7 11H8M8 11H9M8 11V8.1C8 8.04477 7.95523 8 7.9 8H7" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 <path d="M8 6.5C8.55228 6.5 9 6.05228 9 5.5C9 4.94772 8.55228 4.5 8 4.5C7.44772 4.5 7 4.94772 7 5.5C7 6.05228 7.44772 6.5 8 6.5Z" fill="black"/>
 </svg>
diff --git a/assets/icons/json.svg b/assets/icons/json.svg
index 5f012f8838..af2f6c5dc0 100644
--- a/assets/icons/json.svg
+++ b/assets/icons/json.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/keyboard.svg b/assets/icons/keyboard.svg
index de9afd9561..82791cda3f 100644
--- a/assets/icons/keyboard.svg
+++ b/assets/icons/keyboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.75 5.5h.007M8 8h.007M9.25 5.5h.007M10.5 8h.007M11.75 5.5h.007M4.25 5.5h.007M4.875 10.5h6.25M5.5 8h.007M13 3H3c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10c.69 0 1.25-.56 1.25-1.25v-7.5C14.25 3.56 13.69 3 13 3Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.75 5.5h.007M8 8h.007M9.25 5.5h.007M10.5 8h.007M11.75 5.5h.007M4.25 5.5h.007M4.875 10.5h6.25M5.5 8h.007M13 3H3c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10c.69 0 1.25-.56 1.25-1.25v-7.5C14.25 3.56 13.69 3 13 3Z"/></svg>
diff --git a/assets/icons/knockouts/x_fg.svg b/assets/icons/knockouts/x_fg.svg
index a3d47f1373..f459954f72 100644
--- a/assets/icons/knockouts/x_fg.svg
+++ b/assets/icons/knockouts/x_fg.svg
@@ -1,3 +1,3 @@
 <svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L5.5 5.5M8 8L5.5 5.5M5.5 5.5L3 8M5.5 5.5L8 3" stroke="black" stroke-width="1.5"/>
+<path d="M3 3L5.5 5.5M8 8L5.5 5.5M5.5 5.5L3 8M5.5 5.5L8 3" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/library.svg b/assets/icons/library.svg
index ed59e1818b..fc7f5afcd2 100644
--- a/assets/icons/library.svg
+++ b/assets/icons/library.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 4L13.3334 13.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 4V13.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 5.33331V13.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 2.66669V13.3334" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.6667 4L13.3334 13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 4V13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.33325 5.33331V13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.66675 2.66669V13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/line_height.svg b/assets/icons/line_height.svg
index 7afa70f767..3929fc4080 100644
--- a/assets/icons/line_height.svg
+++ b/assets/icons/line_height.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4 13.667h8M4 2.333h8M5 11l3-6 3 6M6 9h4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 13.667h8M4 2.333h8M5 11l3-6 3 6M6 9h4"/></svg>
diff --git a/assets/icons/list_collapse.svg b/assets/icons/list_collapse.svg
index 938799b151..f18bc550b9 100644
--- a/assets/icons/list_collapse.svg
+++ b/assets/icons/list_collapse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.857 6.857 4.286 5.43 2.857 4M2.857 12l1.429-1.429-1.429-1.428M6.857 4.571h6.286M6.857 8h6.286M6.857 11.428h6.286"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.857 6.857 4.286 5.43 2.857 4M2.857 12l1.429-1.429-1.429-1.428M6.857 4.571h6.286M6.857 8h6.286M6.857 11.428h6.286"/></svg>
diff --git a/assets/icons/list_todo.svg b/assets/icons/list_todo.svg
index 019af95734..709f26d89d 100644
--- a/assets/icons/list_todo.svg
+++ b/assets/icons/list_todo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.333 3.333H2.667A.667.667 0 0 0 2 4v2.667c0 .368.298.666.667.666h2.666A.667.667 0 0 0 6 6.667V4a.667.667 0 0 0-.667-.667ZM2 11.333l1.333 1.334L6 10M8.667 4H14M8.667 8H14M8.667 12H14"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.333 3.333H2.667A.667.667 0 0 0 2 4v2.667c0 .368.298.666.667.666h2.666A.667.667 0 0 0 6 6.667V4a.667.667 0 0 0-.667-.667ZM2 11.333l1.333 1.334L6 10M8.667 4H14M8.667 8H14M8.667 12H14"/></svg>
diff --git a/assets/icons/list_tree.svg b/assets/icons/list_tree.svg
index 09872a60f7..de3e0f3a57 100644
--- a/assets/icons/list_tree.svg
+++ b/assets/icons/list_tree.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.5 8H9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5 4L6.5 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5 12H9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 3.5V6.33333C3 7.25 3.72 8 4.6 8H7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 6V10.5C3 11.325 3.72 12 4.6 12H7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5 8H9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5 4L6.5 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5 12H9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 3.5V6.33333C3 7.25 3.72 8 4.6 8H7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 6V10.5C3 11.325 3.72 12 4.6 12H7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/list_x.svg b/assets/icons/list_x.svg
index 206faf2ce4..0fa3bd68fb 100644
--- a/assets/icons/list_x.svg
+++ b/assets/icons/list_x.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.33333 8H3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6667 4H3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6667 12H3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.6667 6.66663L11 9.33329" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 6.66663L13.6667 9.33329" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.33333 8H3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.6667 4H3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.6667 12H3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.6667 6.66663L11 9.33329" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 6.66663L13.6667 9.33329" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/load_circle.svg b/assets/icons/load_circle.svg
index 825aa335b0..eecf099310 100644
--- a/assets/icons/load_circle.svg
+++ b/assets/icons/load_circle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13 8a5 5 0 1 1-3.455-4.755"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13 8a5 5 0 1 1-3.455-4.755"/></svg>
diff --git a/assets/icons/location_edit.svg b/assets/icons/location_edit.svg
index 02cd6f3389..e342652eb1 100644
--- a/assets/icons/location_edit.svg
+++ b/assets/icons/location_edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 6.502a4.904 4.904 0 0 0-1.686-3.28 5.059 5.059 0 0 0-3.522-1.22A5.045 5.045 0 0 0 3.39 3.52 4.889 4.889 0 0 0 2 6.93c0 2.89 3.06 5.893 4.397 7.068M13.655 11.013a1.18 1.18 0 0 0-1.67-1.67l-2.227 2.23a1.112 1.112 0 0 0-.282.475l-.465 1.594a.278.278 0 0 0 .345.345l1.594-.465a1.11 1.11 0 0 0 .475-.281l2.23-2.228Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7 8.998a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12 6.502a4.904 4.904 0 0 0-1.686-3.28 5.059 5.059 0 0 0-3.522-1.22A5.045 5.045 0 0 0 3.39 3.52 4.889 4.889 0 0 0 2 6.93c0 2.89 3.06 5.893 4.397 7.068M13.655 11.013a1.18 1.18 0 0 0-1.67-1.67l-2.227 2.23a1.112 1.112 0 0 0-.282.475l-.465 1.594a.278.278 0 0 0 .345.345l1.594-.465a1.11 1.11 0 0 0 .475-.281l2.23-2.228Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M7 8.998a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/></svg>
diff --git a/assets/icons/lock_outlined.svg b/assets/icons/lock_outlined.svg
index 0bfd2fdc82..d69a245603 100644
--- a/assets/icons/lock_outlined.svg
+++ b/assets/icons/lock_outlined.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.5"/>
-<path d="M8 9V11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
+<path d="M8 9V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 <circle cx="8" cy="9" r="1" fill="black"/>
-<rect x="3.75" y="5.75" width="8.5" height="7.5" rx="1.25" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
+<rect x="3.75" y="5.75" width="8.5" height="7.5" rx="1.25" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/magnifying_glass.svg b/assets/icons/magnifying_glass.svg
index b7c22e64bd..24f00bb51b 100644
--- a/assets/icons/magnifying_glass.svg
+++ b/assets/icons/magnifying_glass.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M13 13L10.4138 10.4138ZM3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" fill="black" fill-opacity="0.15"/>
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/maximize.svg b/assets/icons/maximize.svg
index ee03a2c021..7b6d26fed8 100644
--- a/assets/icons/maximize.svg
+++ b/assets/icons/maximize.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 3H13V6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 13H3V10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 3L9.5 6.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 13L6.5 9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 3H13V6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H3V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 3L9.5 6.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 13L6.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/menu.svg b/assets/icons/menu.svg
index 0724fb2816..f12ce47f7e 100644
--- a/assets/icons/menu.svg
+++ b/assets/icons/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.667 8h10.666M2.667 4h10.666M2.667 12h10.666"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.667 8h10.666M2.667 4h10.666M2.667 12h10.666"/></svg>
diff --git a/assets/icons/menu_alt.svg b/assets/icons/menu_alt.svg
index b605e094e3..f73102e286 100644
--- a/assets/icons/menu_alt.svg
+++ b/assets/icons/menu_alt.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.667 8h8M2.667 4h10.666M2.667 12H8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.667 8h8M2.667 4h10.666M2.667 12H8"/></svg>
diff --git a/assets/icons/mic.svg b/assets/icons/mic.svg
index 1d9c5bc9ed..000d135ea5 100644
--- a/assets/icons/mic.svg
+++ b/assets/icons/mic.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 12.2028V14.3042" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.2027 6.94928V8.11672C12.2027 9.20041 11.7599 10.2397 10.9717 11.006C10.1836 11.7723 9.11457 12.2028 7.99992 12.2028C6.88527 12.2028 5.81627 11.7723 5.02809 11.006C4.23991 10.2397 3.79712 9.20041 3.79712 8.11672V6.94928" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.1015 3.63555C10.1015 2.56426 9.16065 1.6958 8.00008 1.6958C6.83951 1.6958 5.89868 2.56426 5.89868 3.63555V8.16165C5.89868 9.23294 6.83951 10.1014 8.00008 10.1014C9.16065 10.1014 10.1015 9.23294 10.1015 8.16165V3.63555Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 12.2028V14.3042" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.2027 6.94928V8.11672C12.2027 9.20041 11.7599 10.2397 10.9717 11.006C10.1836 11.7723 9.11457 12.2028 7.99992 12.2028C6.88527 12.2028 5.81627 11.7723 5.02809 11.006C4.23991 10.2397 3.79712 9.20041 3.79712 8.11672V6.94928" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.1015 3.63555C10.1015 2.56426 9.16065 1.6958 8.00008 1.6958C6.83951 1.6958 5.89868 2.56426 5.89868 3.63555V8.16165C5.89868 9.23294 6.83951 10.1014 8.00008 10.1014C9.16065 10.1014 10.1015 9.23294 10.1015 8.16165V3.63555Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/mic_mute.svg b/assets/icons/mic_mute.svg
index 8c61ae2f1c..8bc63be610 100644
--- a/assets/icons/mic_mute.svg
+++ b/assets/icons/mic_mute.svg
@@ -1,8 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L13 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 9C12 8.74858 12 8.49375 12 8.23839V7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.00043 7V8.09869C3.98856 8.86731 4.22157 9.62164 4.66938 10.2643C5.11718 10.907 5.75924 11.4085 6.51267 11.7042C7.2661 11.9999 8.09632 12.0761 8.89619 11.923C9.47851 11.8115 10.0253 11.5823 10.5 11.2539" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 6V3.62904C9.99714 3.26103 9.8347 2.90448 9.53885 2.6168C9.24299 2.32913 8.83093 2.12707 8.36903 2.04316C7.90713 1.95926 7.42226 1.9984 6.99252 2.15427C6.56278 2.31015 6.21317 2.57369 6 2.90245" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 6V8.00088C6.00031 8.39636 6.10356 8.78287 6.29674 9.11159C6.48991 9.44031 6.76433 9.69649 7.08534 9.84779C7.40634 9.99909 7.75954 10.0387 8.10032 9.96165C8.4411 9.88459 8.75417 9.69431 9 9.41483" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 12V14" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 3L13 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 9C12 8.74858 12 8.49375 12 8.23839V7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.00043 7V8.09869C3.98856 8.86731 4.22157 9.62164 4.66938 10.2643C5.11718 10.907 5.75924 11.4085 6.51267 11.7042C7.2661 11.9999 8.09632 12.0761 8.89619 11.923C9.47851 11.8115 10.0253 11.5823 10.5 11.2539" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 6V3.62904C9.99714 3.26103 9.8347 2.90448 9.53885 2.6168C9.24299 2.32913 8.83093 2.12707 8.36903 2.04316C7.90713 1.95926 7.42226 1.9984 6.99252 2.15427C6.56278 2.31015 6.21317 2.57369 6 2.90245" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 6V8.00088C6.00031 8.39636 6.10356 8.78287 6.29674 9.11159C6.48991 9.44031 6.76433 9.69649 7.08534 9.84779C7.40634 9.99909 7.75954 10.0387 8.10032 9.96165C8.4411 9.88459 8.75417 9.69431 9 9.41483" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 12V14" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/minimize.svg b/assets/icons/minimize.svg
index ea825f054e..082ade47db 100644
--- a/assets/icons/minimize.svg
+++ b/assets/icons/minimize.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 9.5H6.5V12.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6.5H9.5V3.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 6.5L13 3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 13L6.5 9.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 9.5H6.5V12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 6.5H9.5V3.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 6.5L13 3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 13L6.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/notepad.svg b/assets/icons/notepad.svg
index 48875eedee..27fd35566e 100644
--- a/assets/icons/notepad.svg
+++ b/assets/icons/notepad.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" clip-path="url(#a)"><path d="M6 8h4M6 10.5h4M3 3h10v9.565c0 .38-.158.746-.44 1.015-.28.269-.662.42-1.06.42h-7c-.398 0-.78-.151-1.06-.42A1.404 1.404 0 0 1 3 12.565V3ZM6.5 1v4M9.5 1v4"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M6 8h4M6 10.5h4M3 3h10v9.565c0 .38-.158.746-.44 1.015-.28.269-.662.42-1.06.42h-7c-.398 0-.78-.151-1.06-.42A1.404 1.404 0 0 1 3 12.565V3ZM6.5 1v4M9.5 1v4"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/option.svg b/assets/icons/option.svg
index 676c10c93b..47201f7c67 100644
--- a/assets/icons/option.svg
+++ b/assets/icons/option.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3H6.33333L9.66667 13H13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.11108 3H13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 3H6.33333L9.66667 13H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.11108 3H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/pencil.svg b/assets/icons/pencil.svg
index b913015c08..c4d289e9c0 100644
--- a/assets/icons/pencil.svg
+++ b/assets/icons/pencil.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5L11 7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/person.svg b/assets/icons/person.svg
index c641678303..a1c29e4acb 100644
--- a/assets/icons/person.svg
+++ b/assets/icons/person.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12.667 14v-1.333A2.667 2.667 0 0 0 10 10H6a2.667 2.667 0 0 0-2.667 2.667V14M8 7.333A2.667 2.667 0 1 0 8 2a2.667 2.667 0 0 0 0 5.333Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12.667 14v-1.333A2.667 2.667 0 0 0 10 10H6a2.667 2.667 0 0 0-2.667 2.667V14M8 7.333A2.667 2.667 0 1 0 8 2a2.667 2.667 0 0 0 0 5.333Z"/></svg>
diff --git a/assets/icons/pin.svg b/assets/icons/pin.svg
index f3f50cc659..d23daff8b9 100644
--- a/assets/icons/pin.svg
+++ b/assets/icons/pin.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 10V13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.71429 7.088C6.7142 7.26164 6.66963 7.43181 6.58559 7.57938C6.50156 7.72695 6.38138 7.84606 6.23857 7.92333L5.47571 8.34333C5.33291 8.4206 5.21273 8.53972 5.12869 8.68729C5.04465 8.83486 5.00008 9.00503 5 9.17867V9.53333C5 9.6571 5.04515 9.7758 5.12553 9.86332C5.2059 9.95083 5.31491 10 5.42857 10H10.5714C10.6851 10 10.7941 9.95083 10.8745 9.86332C10.9548 9.7758 11 9.6571 11 9.53333V9.17867C10.9999 9.00503 10.9553 8.83486 10.8713 8.68729C10.7873 8.53972 10.6671 8.4206 10.5243 8.34333L9.76143 7.92333C9.61862 7.84606 9.49844 7.72695 9.41441 7.57938C9.33037 7.43181 9.2858 7.26164 9.28571 7.088V5.33333C9.28571 5.20957 9.33087 5.09087 9.41124 5.00335C9.49161 4.91583 9.60062 4.86667 9.71429 4.86667C9.94161 4.86667 10.1596 4.76833 10.3204 4.5933C10.4811 4.41827 10.5714 4.18087 10.5714 3.93333C10.5714 3.6858 10.4811 3.4484 10.3204 3.27337C10.1596 3.09833 9.94161 3 9.71429 3H6.28571C6.05839 3 5.84037 3.09833 5.67962 3.27337C5.51888 3.4484 5.42857 3.6858 5.42857 3.93333C5.42857 4.18087 5.51888 4.41827 5.67962 4.5933C5.84037 4.76833 6.05839 4.86667 6.28571 4.86667C6.39938 4.86667 6.50839 4.91583 6.58876 5.00335C6.66913 5.09087 6.71429 5.20957 6.71429 5.33333V7.088Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 10V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.71429 7.088C6.7142 7.26164 6.66963 7.43181 6.58559 7.57938C6.50156 7.72695 6.38138 7.84606 6.23857 7.92333L5.47571 8.34333C5.33291 8.4206 5.21273 8.53972 5.12869 8.68729C5.04465 8.83486 5.00008 9.00503 5 9.17867V9.53333C5 9.6571 5.04515 9.7758 5.12553 9.86332C5.2059 9.95083 5.31491 10 5.42857 10H10.5714C10.6851 10 10.7941 9.95083 10.8745 9.86332C10.9548 9.7758 11 9.6571 11 9.53333V9.17867C10.9999 9.00503 10.9553 8.83486 10.8713 8.68729C10.7873 8.53972 10.6671 8.4206 10.5243 8.34333L9.76143 7.92333C9.61862 7.84606 9.49844 7.72695 9.41441 7.57938C9.33037 7.43181 9.2858 7.26164 9.28571 7.088V5.33333C9.28571 5.20957 9.33087 5.09087 9.41124 5.00335C9.49161 4.91583 9.60062 4.86667 9.71429 4.86667C9.94161 4.86667 10.1596 4.76833 10.3204 4.5933C10.4811 4.41827 10.5714 4.18087 10.5714 3.93333C10.5714 3.6858 10.4811 3.4484 10.3204 3.27337C10.1596 3.09833 9.94161 3 9.71429 3H6.28571C6.05839 3 5.84037 3.09833 5.67962 3.27337C5.51888 3.4484 5.42857 3.6858 5.42857 3.93333C5.42857 4.18087 5.51888 4.41827 5.67962 4.5933C5.84037 4.76833 6.05839 4.86667 6.28571 4.86667C6.39938 4.86667 6.50839 4.91583 6.58876 5.00335C6.66913 5.09087 6.71429 5.20957 6.71429 5.33333V7.088Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/play_filled.svg b/assets/icons/play_filled.svg
index c632434305..8075197ad2 100644
--- a/assets/icons/play_filled.svg
+++ b/assets/icons/play_filled.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 4L12 8L5 12V4Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 4L12 8L5 12V4Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/play_outlined.svg b/assets/icons/play_outlined.svg
index 7e1cacd5af..ba1ea2693d 100644
--- a/assets/icons/play_outlined.svg
+++ b/assets/icons/play_outlined.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 4L12 8L5 12V4Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 4L12 8L5 12V4Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/plus.svg b/assets/icons/plus.svg
index e26d430320..8ac57d8cdd 100644
--- a/assets/icons/plus.svg
+++ b/assets/icons/plus.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.33325 8H12.6666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 3.33333V12.6667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.33325 8H12.6666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 3.33333V12.6667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/power.svg b/assets/icons/power.svg
index 23f6f48f30..29bd2127c5 100644
--- a/assets/icons/power.svg
+++ b/assets/icons/power.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8 2v5M11.536 4a5.368 5.368 0 0 1 1.367 2.696 5.54 5.54 0 0 1-.28 3.042 5.223 5.223 0 0 1-1.836 2.367A4.82 4.82 0 0 1 8.016 13a4.817 4.817 0 0 1-2.777-.877 5.22 5.22 0 0 1-1.85-2.354 5.54 5.54 0 0 1-.298-3.041 5.371 5.371 0 0 1 1.35-2.705"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 2v5M11.536 4a5.368 5.368 0 0 1 1.367 2.696 5.54 5.54 0 0 1-.28 3.042 5.223 5.223 0 0 1-1.836 2.367A4.82 4.82 0 0 1 8.016 13a4.817 4.817 0 0 1-2.777-.877 5.22 5.22 0 0 1-1.85-2.354 5.54 5.54 0 0 1-.298-3.041 5.371 5.371 0 0 1 1.35-2.705"/></svg>
diff --git a/assets/icons/public.svg b/assets/icons/public.svg
index 574ee1010d..5659b5419f 100644
--- a/assets/icons/public.svg
+++ b/assets/icons/public.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4 6.375A5.625 5.625 0 0 1 9.625 12M4 10a2 2 0 0 1 2 2M4 3a9 9 0 0 1 9 9"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 6.375A5.625 5.625 0 0 1 9.625 12M4 10a2 2 0 0 1 2 2M4 3a9 9 0 0 1 9 9"/></svg>
diff --git a/assets/icons/pull_request.svg b/assets/icons/pull_request.svg
index ccfaaacfdc..515462ab64 100644
--- a/assets/icons/pull_request.svg
+++ b/assets/icons/pull_request.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4 6a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM4 6v7M12 13a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM10 6.5l-2-2 2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.5 4.389h2.357c.303 0 .594.117.808.325.215.209.335.491.335.786V10"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 6a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM4 6v7M12 13a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM10 6.5l-2-2 2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8.5 4.389h2.357c.303 0 .594.117.808.325.215.209.335.491.335.786V10"/></svg>
diff --git a/assets/icons/quote.svg b/assets/icons/quote.svg
index 5564a60f95..a958bc67f2 100644
--- a/assets/icons/quote.svg
+++ b/assets/icons/quote.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M11.333 4H2M14 8H5.333M12 12H5M2 8v4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M11.333 4H2M14 8H5.333M12 12H5M2 8v4"/></svg>
diff --git a/assets/icons/reader.svg b/assets/icons/reader.svg
index 2ccc37623d..f477f4f32d 100644
--- a/assets/icons/reader.svg
+++ b/assets/icons/reader.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.8889 2H4.11111C3.49746 2 3 2.59695 3 3.33333V12.6667C3 13.403 3.49746 14 4.11111 14H11.8889C12.5025 14 13 13.403 13 12.6667V3.33333C13 2.59695 12.5025 2 11.8889 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 6H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 10H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.8889 2H4.11111C3.49746 2 3 2.59695 3 3.33333V12.6667C3 13.403 3.49746 14 4.11111 14H11.8889C12.5025 14 13 13.403 13 12.6667V3.33333C13 2.59695 12.5025 2 11.8889 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 6H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 10H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/refresh_title.svg b/assets/icons/refresh_title.svg
index 8a8fdb04f3..c9e670bfab 100644
--- a/assets/icons/refresh_title.svg
+++ b/assets/icons/refresh_title.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.5" d="M4.667 14V8m0 0H2m2.667 0h2.666"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14 12.667h-3.333V9.333"/><path fill="#000" d="M4.03 3.5a.667.667 0 0 0 .883 1l-.882-1ZM8 3.333A4.667 4.667 0 0 1 12.666 8H14a6 6 0 0 0-6-6v1.333ZM12.666 8a4.656 4.656 0 0 1-1.75 3.643l.834 1.04A5.99 5.99 0 0 0 14 8h-1.334ZM5.667 3.957A4.642 4.642 0 0 1 8 3.333V2a5.976 5.976 0 0 0-3 .803l.667 1.154Zm-.754.543c.232-.205.485-.387.754-.543l-.668-1.154c-.346.2-.67.434-.968.697l.882 1Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="M4.667 14V8m0 0H2m2.667 0h2.666"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 12.667h-3.333V9.333"/><path fill="#000" d="M4.03 3.5a.667.667 0 0 0 .883 1l-.882-1ZM8 3.333A4.667 4.667 0 0 1 12.666 8H14a6 6 0 0 0-6-6v1.333ZM12.666 8a4.656 4.656 0 0 1-1.75 3.643l.834 1.04A5.99 5.99 0 0 0 14 8h-1.334ZM5.667 3.957A4.642 4.642 0 0 1 8 3.333V2a5.976 5.976 0 0 0-3 .803l.667 1.154Zm-.754.543c.232-.205.485-.387.754-.543l-.668-1.154c-.346.2-.67.434-.968.697l.882 1Z"/></svg>
diff --git a/assets/icons/regex.svg b/assets/icons/regex.svg
index 0432cd570f..818c2ba360 100644
--- a/assets/icons/regex.svg
+++ b/assets/icons/regex.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M4.57132 13.7143C5.20251 13.7143 5.71418 13.2026 5.71418 12.5714C5.71418 11.9403 5.20251 11.4286 4.57132 11.4286C3.94014 11.4286 3.42847 11.9403 3.42847 12.5714C3.42847 13.2026 3.94014 13.7143 4.57132 13.7143Z" fill="black"/>
-<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/repl_neutral.svg b/assets/icons/repl_neutral.svg
index d9c8b001df..2842e2c421 100644
--- a/assets/icons/repl_neutral.svg
+++ b/assets/icons/repl_neutral.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/repl_off.svg b/assets/icons/repl_off.svg
index ac249ad5ff..3018ceaf85 100644
--- a/assets/icons/repl_off.svg
+++ b/assets/icons/repl_off.svg
@@ -1,11 +1,11 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.0039 8.01361C13.9981 7.31989 13.8495 6.63699 13.5698 6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 2.01361C7.74152 2.01361 8.2084 2.01361 9.00391 2.01361" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.0039 11.0136C12.4719 11.8034 11.7928 12.4825 11.0039 13.0136" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 14.0136C8.28937 14.0136 7.71844 14.0136 7.00391 14.0136" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.00391 5.01361C3.53595 4.22382 4.21507 3.5447 5.00391 3.01361" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00391 9.01361C8.55621 9.01361 9.00391 8.56591 9.00391 8.01361C9.00391 7.46131 8.55621 7.01361 8.00391 7.01361C7.45161 7.01361 7.00391 7.46131 7.00391 8.01361C7.00391 8.56591 7.45161 9.01361 8.00391 9.01361Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.00391 8.01361C2.01055 8.69737 2.15535 9.37058 2.42723 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.0039 8.01361C13.9981 7.31989 13.8495 6.63699 13.5698 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00391 2.01361C7.74152 2.01361 8.2084 2.01361 9.00391 2.01361" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.0039 11.0136C12.4719 11.8034 11.7928 12.4825 11.0039 13.0136" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.00391 14.0136C8.28937 14.0136 7.71844 14.0136 7.00391 14.0136" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.00391 5.01361C3.53595 4.22382 4.21507 3.5447 5.00391 3.01361" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00391 9.01361C8.55621 9.01361 9.00391 8.56591 9.00391 8.01361C9.00391 7.46131 8.55621 7.01361 8.00391 7.01361C7.45161 7.01361 7.00391 7.46131 7.00391 8.01361C7.00391 8.56591 7.45161 9.01361 8.00391 9.01361Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.00391 8.01361C2.01055 8.69737 2.15535 9.37058 2.42723 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/repl_pause.svg b/assets/icons/repl_pause.svg
index 5273ed60bb..5a69a576c1 100644
--- a/assets/icons/repl_pause.svg
+++ b/assets/icons/repl_pause.svg
@@ -1,8 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 10.0059V6.00592" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 10.0059V6.00592" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00391 10.0059V6.00592" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.00391 10.0059V6.00592" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/repl_play.svg b/assets/icons/repl_play.svg
index 76c292a382..0c8f4b0832 100644
--- a/assets/icons/repl_play.svg
+++ b/assets/icons/repl_play.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.00366 6.16662C7.00366 6.03849 7.14274 5.96206 7.24661 6.03313L9.93408 7.87243C10.0269 7.93591 10.0269 8.07591 9.93408 8.13939L7.24661 9.97871C7.14274 10.0498 7.00366 9.97336 7.00366 9.84518V6.16662Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00366 6.16662C7.00366 6.03849 7.14274 5.96206 7.24661 6.03313L9.93408 7.87243C10.0269 7.93591 10.0269 8.07591 9.93408 8.13939L7.24661 9.97871C7.14274 10.0498 7.00366 9.97336 7.00366 9.84518V6.16662Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/replace.svg b/assets/icons/replace.svg
index 837cb23b66..287328e82e 100644
--- a/assets/icons/replace.svg
+++ b/assets/icons/replace.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99988 13C5.97267 13 4.22723 11.7936 3.44238 10.0595M7.99988 3C10.1122 3 11.9185 4.30981 12.6511 6.16152" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99988 13C5.97267 13 4.22723 11.7936 3.44238 10.0595M7.99988 3C10.1122 3 11.9185 4.30981 12.6511 6.16152" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M2.65625 3.29688C3.00143 3.29688 3.28125 3.01705 3.28125 2.67188C3.28125 2.3267 3.00143 2.04688 2.65625 2.04688C2.31107 2.04688 2.03125 2.3267 2.03125 2.67188C2.03125 3.01705 2.31107 3.29688 2.65625 3.29688Z" fill="black"/>
 <path d="M4.71094 3.29688C5.05612 3.29688 5.33594 3.01705 5.33594 2.67188C5.33594 2.3267 5.05612 2.04688 4.71094 2.04688C4.36576 2.04688 4.08594 2.3267 4.08594 2.67188C4.08594 3.01705 4.36576 3.29688 4.71094 3.29688Z" fill="black"/>
 <path d="M5.96094 4.99219C6.30612 4.99219 6.58594 4.71237 6.58594 4.36719C6.58594 4.02201 6.30612 3.74219 5.96094 3.74219C5.61576 3.74219 5.33594 4.02201 5.33594 4.36719C5.33594 4.71237 5.61576 4.99219 5.96094 4.99219Z" fill="black"/>
diff --git a/assets/icons/replace_next.svg b/assets/icons/replace_next.svg
index 72511be70a..a9a9fc91f5 100644
--- a/assets/icons/replace_next.svg
+++ b/assets/icons/replace_next.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M8.5 6.88672C10.433 6.88672 12 8.45372 12 10.3867V13M12 13L14 11M12 13L10 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M8.5 6.88672C10.433 6.88672 12 8.45372 12 10.3867V13M12 13L14 11M12 13L10 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
     <path d="M4.94725 6.87672L4.94725 6.87672L5.74909 8.553C5.86125 8.78748 6.09809 8.93673 6.35802 8.93673H6.48391C6.98569 8.93673 7.31204 8.40867 7.08765 7.95986L6.97585 8.01576L7.08765 7.95986L6.41818 6.62094C6.41818 6.62093 6.41818 6.62093 6.41818 6.62093C6.41567 6.6159 6.414 6.60731 6.41826 6.59524C6.42256 6.58306 6.43223 6.57013 6.44764 6.56131L6.38553 6.45283L6.44764 6.56131C7.00658 6.24123 7.33902 5.62588 7.33902 4.92189C7.33902 4.32236 7.13648 3.82296 6.75336 3.47496L6.66932 3.56749L6.75336 3.47496C6.37232 3.12885 5.83204 2.95001 5.18746 2.95001H3.64058C3.26779 2.95001 2.96558 3.25222 2.96558 3.62501V8.26173C2.96558 8.63453 3.26779 8.93673 3.64058 8.93673H3.74605C4.11884 8.93673 4.42105 8.63453 4.42105 8.26173V6.88751C4.42105 6.87371 4.43224 6.86251 4.44605 6.86251H4.92471C4.93433 6.86251 4.9431 6.86804 4.94725 6.87672ZM5.65595 4.39879L5.65595 4.3988C5.78276 4.51357 5.86012 4.68648 5.86012 4.92579C5.86012 5.17095 5.78081 5.34783 5.65146 5.46508L5.65146 5.46508C5.51987 5.58438 5.31538 5.66095 5.03121 5.66095H4.44605C4.43224 5.66095 4.42105 5.64976 4.42105 5.63595V4.23126C4.42105 4.21746 4.43224 4.20626 4.44605 4.20626H5.04293C5.32535 4.20626 5.52689 4.28197 5.65595 4.39879Z" fill="black" stroke="black" stroke-width="0.25"/>
 </svg>
diff --git a/assets/icons/rerun.svg b/assets/icons/rerun.svg
index a5daa5de1d..1a03a01ae6 100644
--- a/assets/icons/rerun.svg
+++ b/assets/icons/rerun.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2 8a6 6 0 0 1 6-6 6.5 6.5 0 0 1 4.493 1.827L14 5.333"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14 2v3.333h-3.333M14 8a6 6 0 0 1-6 6 6.5 6.5 0 0 1-4.493-1.827L2 10.667"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.333 10.667H2V14"/><path fill="#000" d="M6.667 6.247c0-.257.279-.418.501-.288l3.005 1.753c.22.129.22.447 0 .576L7.168 10.04a.333.333 0 0 1-.501-.288V6.247Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 8a6 6 0 0 1 6-6 6.5 6.5 0 0 1 4.493 1.827L14 5.333"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 2v3.333h-3.333M14 8a6 6 0 0 1-6 6 6.5 6.5 0 0 1-4.493-1.827L2 10.667"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.333 10.667H2V14"/><path fill="#000" d="M6.667 6.247c0-.257.279-.418.501-.288l3.005 1.753c.22.129.22.447 0 .576L7.168 10.04a.333.333 0 0 1-.501-.288V6.247Z"/></svg>
diff --git a/assets/icons/return.svg b/assets/icons/return.svg
index aed9242a95..c605eb6512 100644
--- a/assets/icons/return.svg
+++ b/assets/icons/return.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00008 6.66669L2.66675 10L6.00008 13.3334" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.3334 2.66669V7.33335C13.3334 8.0406 13.0525 8.71888 12.5524 9.21897C12.0523 9.71907 11.374 10 10.6667 10H2.66675" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.00008 6.66669L2.66675 10L6.00008 13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.3334 2.66669V7.33335C13.3334 8.0406 13.0525 8.71888 12.5524 9.21897C12.0523 9.71907 11.374 10 10.6667 10H2.66675" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/rotate_ccw.svg b/assets/icons/rotate_ccw.svg
index 8f6bd6346a..cdfa8d0ab4 100644
--- a/assets/icons/rotate_ccw.svg
+++ b/assets/icons/rotate_ccw.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m3 5.778 1.256-1.256A5.417 5.417 0 0 1 8 3a5 5 0 1 1-4.583 7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3 3v3h3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m3 5.778 1.256-1.256A5.417 5.417 0 0 1 8 3a5 5 0 1 1-4.583 7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3 3v3h3"/></svg>
diff --git a/assets/icons/rotate_cw.svg b/assets/icons/rotate_cw.svg
index b082096ee4..2adfa7f972 100644
--- a/assets/icons/rotate_cw.svg
+++ b/assets/icons/rotate_cw.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m13 5.778-1.256-1.256A5.416 5.416 0 0 0 8 3a5 5 0 1 0 4.583 7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13 3v3h-3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m13 5.778-1.256-1.256A5.416 5.416 0 0 0 8 3a5 5 0 1 0 4.583 7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13 3v3h-3"/></svg>
diff --git a/assets/icons/scissors.svg b/assets/icons/scissors.svg
index 430293f913..a19580bd89 100644
--- a/assets/icons/scissors.svg
+++ b/assets/icons/scissors.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.03641 5.53641L8.33797 7.83797M13.0825 3.0934L6.03641 10.1395M9.99896 9.49896L13.0825 12.5825M4.77932 6.05864C5.25123 6.05864 5.7038 5.87118 6.03749 5.53749C6.37118 5.2038 6.55864 4.75123 6.55864 4.27932C6.55864 3.80742 6.37118 3.35484 6.03749 3.02115C5.7038 2.68746 5.25123 2.5 4.77932 2.5C4.30742 2.5 3.85484 2.68746 3.52115 3.02115C3.18746 3.35484 3 3.80742 3 4.27932C3 4.75123 3.18746 5.2038 3.52115 5.53749C3.85484 5.87118 4.30742 6.05864 4.77932 6.05864ZM4.77932 13.1759C5.25123 13.1759 5.7038 12.9885 6.03749 12.6548C6.37118 12.3211 6.55864 11.8685 6.55864 11.3966C6.55864 10.9247 6.37118 10.4721 6.03749 10.1384C5.7038 9.80475 5.25123 9.61729 4.77932 9.61729C4.30742 9.61729 3.85484 9.80475 3.52115 10.1384C3.18746 10.4721 3 10.9247 3 11.3966C3 11.8685 3.18746 12.3211 3.52115 12.6548C3.85484 12.9885 4.30742 13.1759 4.77932 13.1759Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.03641 5.53641L8.33797 7.83797M13.0825 3.0934L6.03641 10.1395M9.99896 9.49896L13.0825 12.5825M4.77932 6.05864C5.25123 6.05864 5.7038 5.87118 6.03749 5.53749C6.37118 5.2038 6.55864 4.75123 6.55864 4.27932C6.55864 3.80742 6.37118 3.35484 6.03749 3.02115C5.7038 2.68746 5.25123 2.5 4.77932 2.5C4.30742 2.5 3.85484 2.68746 3.52115 3.02115C3.18746 3.35484 3 3.80742 3 4.27932C3 4.75123 3.18746 5.2038 3.52115 5.53749C3.85484 5.87118 4.30742 6.05864 4.77932 6.05864ZM4.77932 13.1759C5.25123 13.1759 5.7038 12.9885 6.03749 12.6548C6.37118 12.3211 6.55864 11.8685 6.55864 11.3966C6.55864 10.9247 6.37118 10.4721 6.03749 10.1384C5.7038 9.80475 5.25123 9.61729 4.77932 9.61729C4.30742 9.61729 3.85484 9.80475 3.52115 10.1384C3.18746 10.4721 3 10.9247 3 11.3966C3 11.8685 3.18746 12.3211 3.52115 12.6548C3.85484 12.9885 4.30742 13.1759 4.77932 13.1759Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/screen.svg b/assets/icons/screen.svg
index 4b686b58f9..4bcdf19528 100644
--- a/assets/icons/screen.svg
+++ b/assets/icons/screen.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 3H3.2C2.53726 3 2 3.51167 2 4.14286V9.85714C2 10.4883 2.53726 11 3.2 11H12.8C13.4627 11 14 10.4883 14 9.85714V4.14286C14 3.51167 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 14H10.6666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 11.3333V14" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8 3H3.2C2.53726 3 2 3.51167 2 4.14286V9.85714C2 10.4883 2.53726 11 3.2 11H12.8C13.4627 11 14 10.4883 14 9.85714V4.14286C14 3.51167 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.33325 14H10.6666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 11.3333V14" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/select_all.svg b/assets/icons/select_all.svg
index c15973c419..4fa17dcf63 100644
--- a/assets/icons/select_all.svg
+++ b/assets/icons/select_all.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.5" d="M10.857 8v2.857m0 0v2.857m0-2.857h2.857m-2.857 0H8m2.857 0 1.905-1.905m-1.905 1.905-1.905 1.905m1.905-1.905 1.905 1.905m-1.905-1.905L8.952 8.952"/><path fill="#000" d="M2.507 4.4c-.002.473.154.856.472 1.14.313.279.737.482 1.268.611l.678.17a3.6 3.6 0 0 1 .566.18.89.89 0 0 1 .337.228.462.462 0 0 1 .111.315.568.568 0 0 1-.124.363.834.834 0 0 1-.362.253 1.521 1.521 0 0 1-.56.093c-.221 0-.418-.033-.59-.099a.94.94 0 0 1-.405-.295.826.826 0 0 1-.145-.33c-.025-.116-.122-.215-.25-.215h-.916a.231.231 0 0 0-.234.249c.034.375.141.698.325.968.216.312.515.547.895.705.381.158.827.235 1.335.235.512 0 .953-.076 1.32-.232.37-.158.655-.38.852-.668.2-.29.3-.632.302-1.023a1.712 1.712 0 0 0-.148-.715 1.612 1.612 0 0 0-.4-.541 2.33 2.33 0 0 0-.604-.384 4.002 4.002 0 0 0-.759-.246l-.559-.134a3.236 3.236 0 0 1-.376-.108 1.584 1.584 0 0 1-.305-.149.673.673 0 0 1-.199-.198.456.456 0 0 1-.06-.26v-.002c0-.122.034-.23.103-.325a.71.71 0 0 1 .316-.227c.14-.057.313-.087.523-.087.309 0 .546.066.717.193a.687.687 0 0 1 .262.378c.03.109.126.204.251.204h.91c.133 0 .246-.11.232-.248a1.759 1.759 0 0 0-.297-.82 1.971 1.971 0 0 0-.832-.68l-.024.052M2.507 4.4c-.002-.388.101-.729.312-1.021.21-.291.5-.517.865-.679a3.03 3.03 0 0 1 1.24-.242c.468 0 .88.08 1.233.242l-.024.052m-.66 4.962a.89.89 0 0 0 .387-.27l-.386.27Zm.387-.27a.625.625 0 0 0 .137-.399l-.137.399Zm.137-.399a.518.518 0 0 0-.125-.352l.125.352Z"/><path stroke="#000" stroke-width=".114" d="M2.507 4.4c-.002.473.154.856.472 1.14.313.279.737.482 1.268.611l.678.17a3.6 3.6 0 0 1 .566.18.89.89 0 0 1 .337.228.462.462 0 0 1 .111.315.568.568 0 0 1-.124.363.834.834 0 0 1-.362.253 1.521 1.521 0 0 1-.56.093c-.221 0-.418-.033-.59-.099a.94.94 0 0 1-.405-.295.826.826 0 0 1-.145-.33c-.025-.116-.122-.215-.25-.215h-.916a.231.231 0 0 0-.234.249c.034.375.141.698.325.968.216.312.515.547.895.705.381.158.827.235 1.335.235.512 0 .953-.076 1.32-.232.37-.158.655-.38.852-.668.2-.29.3-.632.302-1.023a1.712 1.712 0 0 0-.148-.715 1.612 1.612 0 0 0-.4-.541 2.33 2.33 0 0 0-.604-.384 4.002 4.002 0 0 0-.759-.246l-.559-.134a3.236 3.236 0 0 1-.376-.108 1.584 1.584 0 0 1-.305-.149.673.673 0 0 1-.199-.198.456.456 0 0 1-.06-.26v-.002c0-.122.034-.23.103-.325a.71.71 0 0 1 .316-.227c.14-.057.313-.087.523-.087.309 0 .546.066.717.193a.687.687 0 0 1 .262.378c.03.109.126.204.251.204h.91c.133 0 .246-.11.232-.248a1.759 1.759 0 0 0-.297-.82 1.971 1.971 0 0 0-.832-.68m-3.65 1.7c-.002-.388.101-.729.312-1.021.21-.291.5-.517.865-.679a3.03 3.03 0 0 1 1.24-.242c.468 0 .88.08 1.233.242m-3.65 1.7h.057m3.593-1.7-.024.052m0 0c-.344-.158-.748-.237-1.21-.237-.454 0-.86.08-1.216.237a2.03 2.03 0 0 0-.842.66m3.268-.66c.347.159.617.378.81.66.159.234.255.498.286.794a.17.17 0 0 1-.175.185h-.91c-.094 0-.17-.072-.196-.162a.744.744 0 0 0-.283-.41c-.184-.135-.435-.203-.75-.203m.559 4.098a1.577 1.577 0 0 1-.581.098c-.227 0-.43-.035-.611-.104a.997.997 0 0 1-.429-.313m1.62.32a.89.89 0 0 0 .387-.271m-.386.27.386-.27m0 0a.625.625 0 0 0 .137-.399m-.137.399.137-.399m0 0a.518.518 0 0 0-.125-.352l.125.352Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="M10.857 8v2.857m0 0v2.857m0-2.857h2.857m-2.857 0H8m2.857 0 1.905-1.905m-1.905 1.905-1.905 1.905m1.905-1.905 1.905 1.905m-1.905-1.905L8.952 8.952"/><path fill="#000" d="M2.507 4.4c-.002.473.154.856.472 1.14.313.279.737.482 1.268.611l.678.17a3.6 3.6 0 0 1 .566.18.89.89 0 0 1 .337.228.462.462 0 0 1 .111.315.568.568 0 0 1-.124.363.834.834 0 0 1-.362.253 1.521 1.521 0 0 1-.56.093c-.221 0-.418-.033-.59-.099a.94.94 0 0 1-.405-.295.826.826 0 0 1-.145-.33c-.025-.116-.122-.215-.25-.215h-.916a.231.231 0 0 0-.234.249c.034.375.141.698.325.968.216.312.515.547.895.705.381.158.827.235 1.335.235.512 0 .953-.076 1.32-.232.37-.158.655-.38.852-.668.2-.29.3-.632.302-1.023a1.712 1.712 0 0 0-.148-.715 1.612 1.612 0 0 0-.4-.541 2.33 2.33 0 0 0-.604-.384 4.002 4.002 0 0 0-.759-.246l-.559-.134a3.236 3.236 0 0 1-.376-.108 1.584 1.584 0 0 1-.305-.149.673.673 0 0 1-.199-.198.456.456 0 0 1-.06-.26v-.002c0-.122.034-.23.103-.325a.71.71 0 0 1 .316-.227c.14-.057.313-.087.523-.087.309 0 .546.066.717.193a.687.687 0 0 1 .262.378c.03.109.126.204.251.204h.91c.133 0 .246-.11.232-.248a1.759 1.759 0 0 0-.297-.82 1.971 1.971 0 0 0-.832-.68l-.024.052M2.507 4.4c-.002-.388.101-.729.312-1.021.21-.291.5-.517.865-.679a3.03 3.03 0 0 1 1.24-.242c.468 0 .88.08 1.233.242l-.024.052m-.66 4.962a.89.89 0 0 0 .387-.27l-.386.27Zm.387-.27a.625.625 0 0 0 .137-.399l-.137.399Zm.137-.399a.518.518 0 0 0-.125-.352l.125.352Z"/><path stroke="#000" stroke-width=".114" d="M2.507 4.4c-.002.473.154.856.472 1.14.313.279.737.482 1.268.611l.678.17a3.6 3.6 0 0 1 .566.18.89.89 0 0 1 .337.228.462.462 0 0 1 .111.315.568.568 0 0 1-.124.363.834.834 0 0 1-.362.253 1.521 1.521 0 0 1-.56.093c-.221 0-.418-.033-.59-.099a.94.94 0 0 1-.405-.295.826.826 0 0 1-.145-.33c-.025-.116-.122-.215-.25-.215h-.916a.231.231 0 0 0-.234.249c.034.375.141.698.325.968.216.312.515.547.895.705.381.158.827.235 1.335.235.512 0 .953-.076 1.32-.232.37-.158.655-.38.852-.668.2-.29.3-.632.302-1.023a1.712 1.712 0 0 0-.148-.715 1.612 1.612 0 0 0-.4-.541 2.33 2.33 0 0 0-.604-.384 4.002 4.002 0 0 0-.759-.246l-.559-.134a3.236 3.236 0 0 1-.376-.108 1.584 1.584 0 0 1-.305-.149.673.673 0 0 1-.199-.198.456.456 0 0 1-.06-.26v-.002c0-.122.034-.23.103-.325a.71.71 0 0 1 .316-.227c.14-.057.313-.087.523-.087.309 0 .546.066.717.193a.687.687 0 0 1 .262.378c.03.109.126.204.251.204h.91c.133 0 .246-.11.232-.248a1.759 1.759 0 0 0-.297-.82 1.971 1.971 0 0 0-.832-.68m-3.65 1.7c-.002-.388.101-.729.312-1.021.21-.291.5-.517.865-.679a3.03 3.03 0 0 1 1.24-.242c.468 0 .88.08 1.233.242m-3.65 1.7h.057m3.593-1.7-.024.052m0 0c-.344-.158-.748-.237-1.21-.237-.454 0-.86.08-1.216.237a2.03 2.03 0 0 0-.842.66m3.268-.66c.347.159.617.378.81.66.159.234.255.498.286.794a.17.17 0 0 1-.175.185h-.91c-.094 0-.17-.072-.196-.162a.744.744 0 0 0-.283-.41c-.184-.135-.435-.203-.75-.203m.559 4.098a1.577 1.577 0 0 1-.581.098c-.227 0-.43-.035-.611-.104a.997.997 0 0 1-.429-.313m1.62.32a.89.89 0 0 0 .387-.271m-.386.27.386-.27m0 0a.625.625 0 0 0 .137-.399m-.137.399.137-.399m0 0a.518.518 0 0 0-.125-.352l.125.352Z"/></svg>
diff --git a/assets/icons/send.svg b/assets/icons/send.svg
index 1403a43ff5..5ceeef2af4 100644
--- a/assets/icons/send.svg
+++ b/assets/icons/send.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.377 3.028a.25.25 0 0 0-.292.045.291.291 0 0 0-.067.303l1.496 4.236c.088.25.088.526 0 .776l-1.496 4.236a.291.291 0 0 0 .067.303.25.25 0 0 0 .292.045l9.472-4.72a.267.267 0 0 0 .11-.103.288.288 0 0 0-.11-.4L3.377 3.028ZM5 8h8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.377 3.028a.25.25 0 0 0-.292.045.291.291 0 0 0-.067.303l1.496 4.236c.088.25.088.526 0 .776l-1.496 4.236a.291.291 0 0 0 .067.303.25.25 0 0 0 .292.045l9.472-4.72a.267.267 0 0 0 .11-.103.288.288 0 0 0-.11-.4L3.377 3.028ZM5 8h8"/></svg>
diff --git a/assets/icons/server.svg b/assets/icons/server.svg
index bde19efd75..8d851d1328 100644
--- a/assets/icons/server.svg
+++ b/assets/icons/server.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 9H3.2C2.53726 9 2 9.44772 2 10V12C2 12.5523 2.53726 13 3.2 13H12.8C13.4627 13 14 12.5523 14 12V10C14 9.44772 13.4627 9 12.8 9Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8 3H3.2C2.53726 3 2 3.44772 2 4V6C2 6.55228 2.53726 7 3.2 7H12.8C13.4627 7 14 6.55228 14 6V4C14 3.44772 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 11H4.00667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 5H4.00667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8 9H3.2C2.53726 9 2 9.44772 2 10V12C2 12.5523 2.53726 13 3.2 13H12.8C13.4627 13 14 12.5523 14 12V10C14 9.44772 13.4627 9 12.8 9Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8 3H3.2C2.53726 3 2 3.44772 2 4V6C2 6.55228 2.53726 7 3.2 7H12.8C13.4627 7 14 6.55228 14 6V4C14 3.44772 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 11H4.00667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 5H4.00667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/settings.svg b/assets/icons/settings.svg
index 617b14b3cd..33ac74f230 100644
--- a/assets/icons/settings.svg
+++ b/assets/icons/settings.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.13418 2H7.86581C7.54229 2 7.23202 2.12643 7.00326 2.35148C6.7745 2.57652 6.64597 2.88174 6.64597 3.2V3.308C6.64576 3.51843 6.58929 3.72512 6.48224 3.9073C6.37518 4.08949 6.22132 4.24078 6.03605 4.346L5.77379 4.496C5.58836 4.60132 5.378 4.65677 5.16387 4.65677C4.94974 4.65677 4.73939 4.60132 4.55395 4.496L4.46246 4.44799C4.18255 4.28915 3.85 4.24606 3.53783 4.32819C3.22565 4.4103 2.95935 4.61092 2.79738 4.886L2.6632 5.11399C2.50174 5.38936 2.45793 5.7165 2.5414 6.02359C2.62488 6.33069 2.82881 6.59266 3.10844 6.75199L3.19993 6.81199C3.38429 6.9167 3.53759 7.06704 3.64459 7.24809C3.75159 7.42914 3.80857 7.63457 3.80985 7.84399V8.14999C3.8107 8.36144 3.75475 8.56937 3.64764 8.7527C3.54054 8.93602 3.38609 9.08826 3.19993 9.19399L3.10844 9.24799C2.82881 9.40732 2.62488 9.66929 2.5414 9.97638C2.45793 10.2835 2.50174 10.6106 2.6632 10.886L2.79738 11.114C2.95935 11.3891 3.22565 11.5897 3.53783 11.6718C3.85 11.7539 4.18255 11.7109 4.46246 11.552L4.55395 11.5039C4.73939 11.3986 4.94974 11.3432 5.16387 11.3432C5.378 11.3432 5.58836 11.3986 5.77379 11.5039L6.03605 11.654C6.22132 11.7592 6.37518 11.9105 6.48224 12.0927C6.58929 12.2749 6.64576 12.4815 6.64597 12.6919V12.7999C6.64597 13.1183 6.7745 13.4235 7.00326 13.6486C7.23202 13.8735 7.54229 14 7.86581 14H8.13418C8.4577 14 8.76797 13.8735 8.99674 13.6486C9.22551 13.4235 9.35402 13.1183 9.35402 12.7999V12.6919C9.35424 12.4815 9.4107 12.2749 9.51776 12.0927C9.62481 11.9105 9.77869 11.7592 9.96397 11.654L10.2262 11.5039C10.4116 11.3986 10.622 11.3432 10.8361 11.3432C11.0503 11.3432 11.2606 11.3986 11.4461 11.5039L11.5376 11.552C11.8174 11.7109 12.15 11.7539 12.4621 11.6718C12.7744 11.5897 13.0406 11.3891 13.2026 11.114L13.3368 10.88C13.4982 10.6047 13.5421 10.2775 13.4586 9.97035C13.3751 9.66329 13.1712 9.40131 12.8916 9.24199L12.8001 9.19399C12.6139 9.08826 12.4595 8.93602 12.3524 8.7527C12.2452 8.56937 12.1893 8.36144 12.1901 8.14999V7.84999C12.1893 7.63854 12.2452 7.43062 12.3524 7.24729C12.4595 7.06396 12.6139 6.91172 12.8001 6.80599L12.8916 6.75199C13.1712 6.59266 13.3751 6.33069 13.4586 6.02359C13.5421 5.7165 13.4982 5.38936 13.3368 5.11399L13.2026 4.886C13.0406 4.61092 12.7744 4.4103 12.4621 4.32819C12.15 4.24606 11.8174 4.28915 11.5376 4.44799L11.4461 4.496C11.2606 4.60132 11.0503 4.65677 10.8361 4.65677C10.622 4.65677 10.4116 4.60132 10.2262 4.496L9.96397 4.346C9.77869 4.24078 9.62481 4.08949 9.51776 3.9073C9.4107 3.72512 9.35424 3.51843 9.35402 3.308V3.2C9.35402 2.88174 9.22551 2.57652 8.99674 2.35148C8.76797 2.12643 8.4577 2 8.13418 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.13418 2H7.86581C7.54229 2 7.23202 2.12643 7.00326 2.35148C6.7745 2.57652 6.64597 2.88174 6.64597 3.2V3.308C6.64576 3.51843 6.58929 3.72512 6.48224 3.9073C6.37518 4.08949 6.22132 4.24078 6.03605 4.346L5.77379 4.496C5.58836 4.60132 5.378 4.65677 5.16387 4.65677C4.94974 4.65677 4.73939 4.60132 4.55395 4.496L4.46246 4.44799C4.18255 4.28915 3.85 4.24606 3.53783 4.32819C3.22565 4.4103 2.95935 4.61092 2.79738 4.886L2.6632 5.11399C2.50174 5.38936 2.45793 5.7165 2.5414 6.02359C2.62488 6.33069 2.82881 6.59266 3.10844 6.75199L3.19993 6.81199C3.38429 6.9167 3.53759 7.06704 3.64459 7.24809C3.75159 7.42914 3.80857 7.63457 3.80985 7.84399V8.14999C3.8107 8.36144 3.75475 8.56937 3.64764 8.7527C3.54054 8.93602 3.38609 9.08826 3.19993 9.19399L3.10844 9.24799C2.82881 9.40732 2.62488 9.66929 2.5414 9.97638C2.45793 10.2835 2.50174 10.6106 2.6632 10.886L2.79738 11.114C2.95935 11.3891 3.22565 11.5897 3.53783 11.6718C3.85 11.7539 4.18255 11.7109 4.46246 11.552L4.55395 11.5039C4.73939 11.3986 4.94974 11.3432 5.16387 11.3432C5.378 11.3432 5.58836 11.3986 5.77379 11.5039L6.03605 11.654C6.22132 11.7592 6.37518 11.9105 6.48224 12.0927C6.58929 12.2749 6.64576 12.4815 6.64597 12.6919V12.7999C6.64597 13.1183 6.7745 13.4235 7.00326 13.6486C7.23202 13.8735 7.54229 14 7.86581 14H8.13418C8.4577 14 8.76797 13.8735 8.99674 13.6486C9.22551 13.4235 9.35402 13.1183 9.35402 12.7999V12.6919C9.35424 12.4815 9.4107 12.2749 9.51776 12.0927C9.62481 11.9105 9.77869 11.7592 9.96397 11.654L10.2262 11.5039C10.4116 11.3986 10.622 11.3432 10.8361 11.3432C11.0503 11.3432 11.2606 11.3986 11.4461 11.5039L11.5376 11.552C11.8174 11.7109 12.15 11.7539 12.4621 11.6718C12.7744 11.5897 13.0406 11.3891 13.2026 11.114L13.3368 10.88C13.4982 10.6047 13.5421 10.2775 13.4586 9.97035C13.3751 9.66329 13.1712 9.40131 12.8916 9.24199L12.8001 9.19399C12.6139 9.08826 12.4595 8.93602 12.3524 8.7527C12.2452 8.56937 12.1893 8.36144 12.1901 8.14999V7.84999C12.1893 7.63854 12.2452 7.43062 12.3524 7.24729C12.4595 7.06396 12.6139 6.91172 12.8001 6.80599L12.8916 6.75199C13.1712 6.59266 13.3751 6.33069 13.4586 6.02359C13.5421 5.7165 13.4982 5.38936 13.3368 5.11399L13.2026 4.886C13.0406 4.61092 12.7744 4.4103 12.4621 4.32819C12.15 4.24606 11.8174 4.28915 11.5376 4.44799L11.4461 4.496C11.2606 4.60132 11.0503 4.65677 10.8361 4.65677C10.622 4.65677 10.4116 4.60132 10.2262 4.496L9.96397 4.346C9.77869 4.24078 9.62481 4.08949 9.51776 3.9073C9.4107 3.72512 9.35424 3.51843 9.35402 3.308V3.2C9.35402 2.88174 9.22551 2.57652 8.99674 2.35148C8.76797 2.12643 8.4577 2 8.13418 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="black"/>
 </svg>
diff --git a/assets/icons/shield_check.svg b/assets/icons/shield_check.svg
index 6e58c31468..43b52f43a8 100644
--- a/assets/icons/shield_check.svg
+++ b/assets/icons/shield_check.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.0001 8.62505C13.0001 11.75 10.8126 13.3125 8.21266 14.2187C8.07651 14.2648 7.92862 14.2626 7.79392 14.2125C5.18771 13.3125 3.00024 11.75 3.00024 8.62505V4.25012C3.00024 4.08436 3.06609 3.92539 3.1833 3.80818C3.30051 3.69098 3.45948 3.62513 3.62523 3.62513C4.87521 3.62513 6.43769 2.87514 7.52517 1.92516C7.65758 1.81203 7.82601 1.74988 8.00016 1.74988C8.17431 1.74988 8.34275 1.81203 8.47515 1.92516C9.56889 2.88139 11.1251 3.62513 12.3751 3.62513C12.5408 3.62513 12.6998 3.69098 12.817 3.80818C12.9342 3.92539 13.0001 4.08436 13.0001 4.25012V8.62505Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8.00002L7.33333 9.33335L10 6.66669" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.0001 8.62505C13.0001 11.75 10.8126 13.3125 8.21266 14.2187C8.07651 14.2648 7.92862 14.2626 7.79392 14.2125C5.18771 13.3125 3.00024 11.75 3.00024 8.62505V4.25012C3.00024 4.08436 3.06609 3.92539 3.1833 3.80818C3.30051 3.69098 3.45948 3.62513 3.62523 3.62513C4.87521 3.62513 6.43769 2.87514 7.52517 1.92516C7.65758 1.81203 7.82601 1.74988 8.00016 1.74988C8.17431 1.74988 8.34275 1.81203 8.47515 1.92516C9.56889 2.88139 11.1251 3.62513 12.3751 3.62513C12.5408 3.62513 12.6998 3.69098 12.817 3.80818C12.9342 3.92539 13.0001 4.08436 13.0001 4.25012V8.62505Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8.00002L7.33333 9.33335L10 6.66669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/shift.svg b/assets/icons/shift.svg
index 35dc2f144c..c38807d8b0 100644
--- a/assets/icons/shift.svg
+++ b/assets/icons/shift.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.07136 7.95724L7.86916 3.05405C7.93967 2.98199 8.06036 2.98198 8.13087 3.05405L12.9286 7.95724C13.0866 8.11865 12.9652 8.38015 12.7324 8.38015H10.226V12.748C10.226 12.8872 10.1065 13 9.95892 13H6.04111C5.89358 13 5.77399 12.8872 5.77399 12.748V8.38015H3.26765C3.03479 8.38015 2.91342 8.11865 3.07136 7.95724Z" stroke="black" stroke-width="1.5"/>
+<path d="M3.07136 7.95724L7.86916 3.05405C7.93967 2.98199 8.06036 2.98198 8.13087 3.05405L12.9286 7.95724C13.0866 8.11865 12.9652 8.38015 12.7324 8.38015H10.226V12.748C10.226 12.8872 10.1065 13 9.95892 13H6.04111C5.89358 13 5.77399 12.8872 5.77399 12.748V8.38015H3.26765C3.03479 8.38015 2.91342 8.11865 3.07136 7.95724Z" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/slash.svg b/assets/icons/slash.svg
index e2313f0099..1ebf01eb9f 100644
--- a/assets/icons/slash.svg
+++ b/assets/icons/slash.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9999 2.99988L2.99976 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9999 2.99988L2.99976 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/sliders.svg b/assets/icons/sliders.svg
index 8ab83055ee..20a6a367dc 100644
--- a/assets/icons/sliders.svg
+++ b/assets/icons/sliders.svg
@@ -1,8 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5H4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M8 5L14 5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M12 11L14 11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M2 11H8" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
+<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/space.svg b/assets/icons/space.svg
index 86bd55cd53..0294c9bf1e 100644
--- a/assets/icons/space.svg
+++ b/assets/icons/space.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.9999 11.4V12C13.9999 12.3 13.6999 12.6 13.3999 12.6H2.59976C2.29976 12.6 1.99976 12.3 1.99976 12V11.4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.9999 11.4V12C13.9999 12.3 13.6999 12.6 13.3999 12.6H2.59976C2.29976 12.6 1.99976 12.3 1.99976 12V11.4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/sparkle.svg b/assets/icons/sparkle.svg
index e5cce9fafd..535c447723 100644
--- a/assets/icons/sparkle.svg
+++ b/assets/icons/sparkle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.762 10.1a1.2 1.2 0 0 0-.862-.862l-3.68-.95a.3.3 0 0 1 0-.577l3.68-.95a1.2 1.2 0 0 0 .862-.86l.95-3.682a.3.3 0 0 1 .577 0L9.238 5.9a1.2 1.2 0 0 0 .862.862l3.68.949a.3.3 0 0 1 0 .578l-3.68.949a1.2 1.2 0 0 0-.862.862l-.95 3.68a.3.3 0 0 1-.577 0l-.949-3.68Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.762 10.1a1.2 1.2 0 0 0-.862-.862l-3.68-.95a.3.3 0 0 1 0-.577l3.68-.95a1.2 1.2 0 0 0 .862-.86l.95-3.682a.3.3 0 0 1 .577 0L9.238 5.9a1.2 1.2 0 0 0 .862.862l3.68.949a.3.3 0 0 1 0 .578l-3.68.949a1.2 1.2 0 0 0-.862.862l-.95 3.68a.3.3 0 0 1-.577 0l-.949-3.68Z"/></svg>
diff --git a/assets/icons/split.svg b/assets/icons/split.svg
index eb031ab790..b2be46a875 100644
--- a/assets/icons/split.svg
+++ b/assets/icons/split.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect x="8" y="2" width="6" height="12" fill="black" fill-opacity="0.25"/>
-<path d="M13.4 2H2.6C2.26863 2 2 2.26863 2 2.6V13.4C2 13.7314 2.26863 14 2.6 14H13.4C13.7314 14 14 13.7314 14 13.4V2.6C14 2.26863 13.7314 2 13.4 2Z" stroke="black" stroke-width="1.5"/>
-<path d="M8 2L8 14" stroke="black" stroke-width="1.5"/>
+<path d="M13.4 2H2.6C2.26863 2 2 2.26863 2 2.6V13.4C2 13.7314 2.26863 14 2.6 14H13.4C13.7314 14 14 13.7314 14 13.4V2.6C14 2.26863 13.7314 2 13.4 2Z" stroke="black" stroke-width="1.2"/>
+<path d="M8 2L8 14" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/split_alt.svg b/assets/icons/split_alt.svg
index 5b99b7a26a..2f99e1436f 100644
--- a/assets/icons/split_alt.svg
+++ b/assets/icons/split_alt.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10 2.833h3v3M6 2.833H3v3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8 13.833V9.028a2.401 2.401 0 0 0-.165-.9 2.325 2.325 0 0 0-.486-.763L3 2.833M10 5.833l3-3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M10 2.833h3v3M6 2.833H3v3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13.833V9.028a2.401 2.401 0 0 0-.165-.9 2.325 2.325 0 0 0-.486-.763L3 2.833M10 5.833l3-3"/></svg>
diff --git a/assets/icons/square_dot.svg b/assets/icons/square_dot.svg
index 4bb684afb2..72b3273439 100644
--- a/assets/icons/square_dot.svg
+++ b/assets/icons/square_dot.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <circle cx="8" cy="8" r="1.25" fill="black" stroke="black" stroke-width="0.5"/>
 </svg>
diff --git a/assets/icons/square_minus.svg b/assets/icons/square_minus.svg
index 4b8fc4d982..5ba458e8b5 100644
--- a/assets/icons/square_minus.svg
+++ b/assets/icons/square_minus.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8H10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/square_plus.svg b/assets/icons/square_plus.svg
index e0ee106b52..063c7dbf82 100644
--- a/assets/icons/square_plus.svg
+++ b/assets/icons/square_plus.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8H10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 6V10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 6V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/star.svg b/assets/icons/star.svg
index fd1502ede8..b39638e386 100644
--- a/assets/icons/star.svg
+++ b/assets/icons/star.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/star_filled.svg b/assets/icons/star_filled.svg
index d7de9939db..16f64e5cb3 100644
--- a/assets/icons/star_filled.svg
+++ b/assets/icons/star_filled.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31233 11.7111 9.53043C11.6402 9.74853 11.6233 9.9806 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31233 11.7111 9.53043C11.6402 9.74853 11.6233 9.9806 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/stop.svg b/assets/icons/stop.svg
index 41e4fd35e9..cc2bbe9207 100644
--- a/assets/icons/stop.svg
+++ b/assets/icons/stop.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 10.8V5.2C5 5.08954 5.08954 5 5.2 5H10.8C10.9105 5 11 5.08954 11 5.2V10.8C11 10.9105 10.9105 11 10.8 11H5.2C5.08954 11 5 10.9105 5 10.8Z" fill="black" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M5 10.8V5.2C5 5.08954 5.08954 5 5.2 5H10.8C10.9105 5 11 5.08954 11 5.2V10.8C11 10.9105 10.9105 11 10.8 11H5.2C5.08954 11 5 10.9105 5 10.8Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/swatch_book.svg b/assets/icons/swatch_book.svg
index 99a1c88bd5..b37d5df8c1 100644
--- a/assets/icons/swatch_book.svg
+++ b/assets/icons/swatch_book.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.333 11.333a2.667 2.667 0 1 1-5.333 0v-8A1.333 1.333 0 0 1 3.333 2H6a1.333 1.333 0 0 1 1.333 1.333v8Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M11.133 8.667h1.534A1.333 1.333 0 0 1 14 10v2.667A1.334 1.334 0 0 1 12.667 14h-8M4.667 11.333h.006"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.333 5.333 8.867 3.8a1.6 1.6 0 0 1 2.269.003L12.4 5.067a1.6 1.6 0 0 1 .017 2.289L6.6 13.2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M7.333 11.333a2.667 2.667 0 1 1-5.333 0v-8A1.333 1.333 0 0 1 3.333 2H6a1.333 1.333 0 0 1 1.333 1.333v8Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M11.133 8.667h1.534A1.333 1.333 0 0 1 14 10v2.667A1.334 1.334 0 0 1 12.667 14h-8M4.667 11.333h.006"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M7.333 5.333 8.867 3.8a1.6 1.6 0 0 1 2.269.003L12.4 5.067a1.6 1.6 0 0 1 .017 2.289L6.6 13.2"/></svg>
diff --git a/assets/icons/tab.svg b/assets/icons/tab.svg
index f16d51ccf5..db93be4df5 100644
--- a/assets/icons/tab.svg
+++ b/assets/icons/tab.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3333 8H2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.33325 12L10.3333 8L6.33325 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 3.33331V12.6666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3333 8H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.33325 12L10.3333 8L6.33325 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 3.33331V12.6666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/terminal_alt.svg b/assets/icons/terminal_alt.svg
index 82d88167b2..d03c05423e 100644
--- a/assets/icons/terminal_alt.svg
+++ b/assets/icons/terminal_alt.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/text_snippet.svg b/assets/icons/text_snippet.svg
index 12f131fdd5..b8987546d3 100644
--- a/assets/icons/text_snippet.svg
+++ b/assets/icons/text_snippet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.333 2A1.333 1.333 0 0 0 2 3.333M12.667 2A1.334 1.334 0 0 1 14 3.333M14 12.667A1.334 1.334 0 0 1 12.667 14M3.333 14A1.334 1.334 0 0 1 2 12.667M6 2h.667M6 14h.667M9.333 2H10M9.333 14H10M2 6v.667M14 6v.667M2 9.333V10M14 9.333V10M4.667 5.333H10M4.667 8h6.666M4.667 10.667h4"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 2A1.333 1.333 0 0 0 2 3.333M12.667 2A1.334 1.334 0 0 1 14 3.333M14 12.667A1.334 1.334 0 0 1 12.667 14M3.333 14A1.334 1.334 0 0 1 2 12.667M6 2h.667M6 14h.667M9.333 2H10M9.333 14H10M2 6v.667M14 6v.667M2 9.333V10M14 9.333V10M4.667 5.333H10M4.667 8h6.666M4.667 10.667h4"/></svg>
diff --git a/assets/icons/text_thread.svg b/assets/icons/text_thread.svg
index 75afa934a0..aa078c72a2 100644
--- a/assets/icons/text_thread.svg
+++ b/assets/icons/text_thread.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.33333 8H2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.6667 5H2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 11H2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 7V11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 9H10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.33333 8H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.6667 5H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 11H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 7V11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 9H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/thread.svg b/assets/icons/thread.svg
index 8c2596a4c9..496cf42e3a 100644
--- a/assets/icons/thread.svg
+++ b/assets/icons/thread.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.31254 12.549C7.3841 13.0987 8.61676 13.2476 9.78839 12.9688C10.96 12.6901 11.9936 12.0021 12.7028 11.0287C13.412 10.0554 13.7503 8.8607 13.6566 7.66002C13.5629 6.45934 13.0435 5.33159 12.1919 4.48C11.3403 3.62841 10.2126 3.10898 9.01188 3.01531C7.8112 2.92164 6.61655 3.2599 5.64319 3.96912C4.66984 4.67834 3.9818 5.71188 3.70306 6.88351C3.42432 8.05514 3.5732 9.2878 4.12289 10.3594L3 13.6719L6.31254 12.549Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.31254 12.549C7.3841 13.0987 8.61676 13.2476 9.78839 12.9688C10.96 12.6901 11.9936 12.0021 12.7028 11.0287C13.412 10.0554 13.7503 8.8607 13.6566 7.66002C13.5629 6.45934 13.0435 5.33159 12.1919 4.48C11.3403 3.62841 10.2126 3.10898 9.01188 3.01531C7.8112 2.92164 6.61655 3.2599 5.64319 3.96912C4.66984 4.67834 3.9818 5.71188 3.70306 6.88351C3.42432 8.05514 3.5732 9.2878 4.12289 10.3594L3 13.6719L6.31254 12.549Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/thread_from_summary.svg b/assets/icons/thread_from_summary.svg
index 7519935aff..94ce9562da 100644
--- a/assets/icons/thread_from_summary.svg
+++ b/assets/icons/thread_from_summary.svg
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.98795 10.4323C9.40771 10.9919 9.99294 11.4054 10.6607 11.614C11.3285 11.8226 12.045 11.8158 12.7087 11.5945C13.3724 11.3733 13.9497 10.9488 14.3588 10.3813C14.7678 9.81373 14.9879 9.13186 14.9879 8.43225C14.9879 7.6366 14.6719 6.87354 14.1093 6.31093C13.5467 5.74832 12.7836 5.43225 11.9879 5.43225C11.6685 5.43225 11.3595 5.47897 11.0677 5.56586C10.0571 5.86681 9.46945 6.84992 8.98796 7.78806V7.78806" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.01318 5.93652V8.60319H10.6799" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.01318 5.93652V8.60319H10.6799" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00558 12.4263C6.16246 12.4494 5.3211 12.2612 4.56083 11.8712L1.24829 12.994L2.37119 9.68151C1.8215 8.60995 1.67261 7.37729 1.95135 6.20566C2.23009 5.03403 2.91813 4.00048 3.89148 3.29126C4.86484 2.58204 6.05949 2.24379 7.26018 2.33746C7.86645 2.38475 8.45413 2.54061 8.99705 2.79296" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.98795 10.4323C9.40771 10.9919 9.99294 11.4054 10.6607 11.614C11.3285 11.8226 12.045 11.8158 12.7087 11.5945C13.3724 11.3733 13.9497 10.9488 14.3588 10.3813C14.7678 9.81373 14.9879 9.13186 14.9879 8.43225C14.9879 7.6366 14.6719 6.87354 14.1093 6.31093C13.5467 5.74832 12.7836 5.43225 11.9879 5.43225C11.6685 5.43225 11.3595 5.47897 11.0677 5.56586C10.0571 5.86681 9.46945 6.84992 8.98796 7.78806V7.78806" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.01318 5.93652V8.60319H10.6799" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.01318 5.93652V8.60319H10.6799" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.00558 12.4263C6.16246 12.4494 5.3211 12.2612 4.56083 11.8712L1.24829 12.994L2.37119 9.68151C1.8215 8.60995 1.67261 7.37729 1.95135 6.20566C2.23009 5.03403 2.91813 4.00048 3.89148 3.29126C4.86484 2.58204 6.05949 2.24379 7.26018 2.33746C7.86645 2.38475 8.45413 2.54061 8.99705 2.79296" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/thumbs_down.svg b/assets/icons/thumbs_down.svg
index 334115a014..a396ff14f6 100644
--- a/assets/icons/thumbs_down.svg
+++ b/assets/icons/thumbs_down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" clip-path="url(#a)"><path d="M3.013 8.57h2.478V3.2H3.013a.413.413 0 0 0-.413.413v4.544a.413.413 0 0 0 .413.413ZM5.491 8.57l2.066 4.13a1.652 1.652 0 0 0 1.652-1.652v-1.24h3.304a.826.826 0 0 0 .82-.929l-.62-4.956a.827.827 0 0 0-.82-.723H5.492"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M3.013 8.57h2.478V3.2H3.013a.413.413 0 0 0-.413.413v4.544a.413.413 0 0 0 .413.413ZM5.491 8.57l2.066 4.13a1.652 1.652 0 0 0 1.652-1.652v-1.24h3.304a.826.826 0 0 0 .82-.929l-.62-4.956a.827.827 0 0 0-.82-.723H5.492"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/thumbs_up.svg b/assets/icons/thumbs_up.svg
index b1e435936b..73c859c355 100644
--- a/assets/icons/thumbs_up.svg
+++ b/assets/icons/thumbs_up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" clip-path="url(#a)"><path d="M3.013 7.33h2.478v5.37H3.013a.413.413 0 0 1-.413-.413V7.743a.413.413 0 0 1 .413-.413ZM5.491 7.33 7.557 3.2a1.652 1.652 0 0 1 1.652 1.652v1.24h3.304a.826.826 0 0 1 .82.929l-.62 4.956a.827.827 0 0 1-.82.723H5.492"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M3.013 7.33h2.478v5.37H3.013a.413.413 0 0 1-.413-.413V7.743a.413.413 0 0 1 .413-.413ZM5.491 7.33 7.557 3.2a1.652 1.652 0 0 1 1.652 1.652v1.24h3.304a.826.826 0 0 1 .82.929l-.62 4.956a.827.827 0 0 1-.82.723H5.492"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/todo_complete.svg b/assets/icons/todo_complete.svg
index d50044e435..5bf70841a8 100644
--- a/assets/icons/todo_complete.svg
+++ b/assets/icons/todo_complete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8 13A5 5 0 1 0 8 3a5 5 0 0 0 0 10Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m5.949 9.026 1.538 1.025 2.564-3.59"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13A5 5 0 1 0 8 3a5 5 0 0 0 0 10Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m5.949 9.026 1.538 1.025 2.564-3.59"/></svg>
diff --git a/assets/icons/todo_pending.svg b/assets/icons/todo_pending.svg
index dfb013b52b..e5e9776f11 100644
--- a/assets/icons/todo_pending.svg
+++ b/assets/icons/todo_pending.svg
@@ -1,10 +1,10 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 3C7.66045 3 8.33955 3 9 3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 4C11.3949 4.26602 11.7345 4.60558 12 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 7C13 7.66045 13 8.33955 13 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 11C11.734 11.3949 11.3944 11.7345 11 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 13C8.33954 13 7.66046 13 7 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 12C4.6051 11.734 4.26554 11.3944 4 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 9C3 8.33955 3 7.66045 3 7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 5C4.26602 4.6051 4.60558 4.26554 5 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 3C7.66045 3 8.33955 3 9 3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 4C11.3949 4.26602 11.7345 4.60558 12 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 7C13 7.66045 13 8.33955 13 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 11C11.734 11.3949 11.3944 11.7345 11 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 13C8.33954 13 7.66046 13 7 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 12C4.6051 11.734 4.26554 11.3944 4 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 9C3 8.33955 3 7.66045 3 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 5C4.26602 4.6051 4.60558 4.26554 5 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/todo_progress.svg b/assets/icons/todo_progress.svg
index 9b2ed7375d..b4a3e8c50e 100644
--- a/assets/icons/todo_progress.svg
+++ b/assets/icons/todo_progress.svg
@@ -1,11 +1,11 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 3C7.66045 3 8.33955 3 9 3" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 4C11.3949 4.26602 11.7345 4.60558 12 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 7C13 7.66045 13 8.33955 13 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 11C11.734 11.3949 11.3944 11.7345 11 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 13C8.33954 13 7.66046 13 7 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 12C4.6051 11.734 4.26554 11.3944 4 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 9C3 8.33955 3 7.66045 3 7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 5C4.26602 4.6051 4.60558 4.26554 5 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00016 8.66665C8.36835 8.66665 8.66683 8.36817 8.66683 7.99998C8.66683 7.63179 8.36835 7.33331 8.00016 7.33331C7.63197 7.33331 7.3335 7.63179 7.3335 7.99998C7.3335 8.36817 7.63197 8.66665 8.00016 8.66665Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 3C7.66045 3 8.33955 3 9 3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 4C11.3949 4.26602 11.7345 4.60558 12 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 7C13 7.66045 13 8.33955 13 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 11C11.734 11.3949 11.3944 11.7345 11 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 13C8.33954 13 7.66046 13 7 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 12C4.6051 11.734 4.26554 11.3944 4 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 9C3 8.33955 3 7.66045 3 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 5C4.26602 4.6051 4.60558 4.26554 5 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00016 8.66665C8.36835 8.66665 8.66683 8.36817 8.66683 7.99998C8.66683 7.63179 8.36835 7.33331 8.00016 7.33331C7.63197 7.33331 7.3335 7.63179 7.3335 7.99998C7.3335 8.36817 7.63197 8.66665 8.00016 8.66665Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_copy.svg b/assets/icons/tool_copy.svg
index e722d8a022..a497a5c9cb 100644
--- a/assets/icons/tool_copy.svg
+++ b/assets/icons/tool_copy.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 2.5H6.5C6.22386 2.5 6 2.83579 6 3.25V4.75C6 5.16421 6.22386 5.5 6.5 5.5H9.5C9.77614 5.5 10 5.16421 10 4.75V3.25C10 2.83579 9.77614 2.5 9.5 2.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 3.5H11C11.2652 3.5 11.5196 3.61706 11.7071 3.82544C11.8946 4.03381 12 4.31643 12 4.61111V12.3889C12 12.6836 11.8946 12.9662 11.7071 13.1746C11.5196 13.3829 11.2652 13.5 11 13.5H5C4.73478 13.5 4.48043 13.3829 4.29289 13.1746C4.10536 12.9662 4 12.6836 4 12.3889V4.61111C4 4.31643 4.10536 4.03381 4.29289 3.82544C4.48043 3.61706 4.73478 3.5 5 3.5H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 2.5H6.5C6.22386 2.5 6 2.83579 6 3.25V4.75C6 5.16421 6.22386 5.5 6.5 5.5H9.5C9.77614 5.5 10 5.16421 10 4.75V3.25C10 2.83579 9.77614 2.5 9.5 2.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 3.5H11C11.2652 3.5 11.5196 3.61706 11.7071 3.82544C11.8946 4.03381 12 4.31643 12 4.61111V12.3889C12 12.6836 11.8946 12.9662 11.7071 13.1746C11.5196 13.3829 11.2652 13.5 11 13.5H5C4.73478 13.5 4.48043 13.3829 4.29289 13.1746C4.10536 12.9662 4 12.6836 4 12.3889V4.61111C4 4.31643 4.10536 4.03381 4.29289 3.82544C4.48043 3.61706 4.73478 3.5 5 3.5H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_delete_file.svg b/assets/icons/tool_delete_file.svg
index 3276f3d78e..e15c0cb568 100644
--- a/assets/icons/tool_delete_file.svg
+++ b/assets/icons/tool_delete_file.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.50002 2.5H5C4.73478 2.5 4.48043 2.6159 4.29289 2.82219C4.10535 3.02848 4 3.30826 4 3.6V12.3999C4 12.6917 4.10535 12.9715 4.29289 13.1778C4.48043 13.3841 4.73478 13.5 5 13.5H11C11.2652 13.5 11.5195 13.3841 11.7071 13.1778C11.8946 12.9715 12 12.6917 12 12.3999V5.25L9.50002 2.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.3427 6.82379L6.65698 9.5095" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.65698 6.82379L9.3427 9.5095" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.50002 2.5H5C4.73478 2.5 4.48043 2.6159 4.29289 2.82219C4.10535 3.02848 4 3.30826 4 3.6V12.3999C4 12.6917 4.10535 12.9715 4.29289 13.1778C4.48043 13.3841 4.73478 13.5 5 13.5H11C11.2652 13.5 11.5195 13.3841 11.7071 13.1778C11.8946 12.9715 12 12.6917 12 12.3999V5.25L9.50002 2.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.3427 6.82379L6.65698 9.5095" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.65698 6.82379L9.3427 9.5095" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_diagnostics.svg b/assets/icons/tool_diagnostics.svg
index c659d96781..414810628d 100644
--- a/assets/icons/tool_diagnostics.svg
+++ b/assets/icons/tool_diagnostics.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.7244 11.5299L9.01711 3.2922C8.91447 3.11109 8.76562 2.96045 8.58576 2.85564C8.4059 2.75084 8.20145 2.69562 7.99328 2.69562C7.7851 2.69562 7.58066 2.75084 7.40079 2.85564C7.22093 2.96045 7.07209 3.11109 6.96945 3.2922L2.26218 11.5299C2.15844 11.7096 2.10404 11.9135 2.1045 12.121C2.10495 12.3285 2.16026 12.5321 2.2648 12.7113C2.36934 12.8905 2.5194 13.0389 2.69978 13.1415C2.88015 13.244 3.08443 13.297 3.2919 13.2951H12.7064C12.9129 13.2949 13.1157 13.2404 13.2944 13.137C13.4731 13.0336 13.6215 12.8851 13.7247 12.7062C13.8278 12.5273 13.8821 12.3245 13.882 12.118C13.882 11.9115 13.8276 11.7087 13.7244 11.5299Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99927 6.23425V8.58788" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99927 10.9415H8.00492" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.7244 11.5299L9.01711 3.2922C8.91447 3.11109 8.76562 2.96045 8.58576 2.85564C8.4059 2.75084 8.20145 2.69562 7.99328 2.69562C7.7851 2.69562 7.58066 2.75084 7.40079 2.85564C7.22093 2.96045 7.07209 3.11109 6.96945 3.2922L2.26218 11.5299C2.15844 11.7096 2.10404 11.9135 2.1045 12.121C2.10495 12.3285 2.16026 12.5321 2.2648 12.7113C2.36934 12.8905 2.5194 13.0389 2.69978 13.1415C2.88015 13.244 3.08443 13.297 3.2919 13.2951H12.7064C12.9129 13.2949 13.1157 13.2404 13.2944 13.137C13.4731 13.0336 13.6215 12.8851 13.7247 12.7062C13.8278 12.5273 13.8821 12.3245 13.882 12.118C13.882 11.9115 13.8276 11.7087 13.7244 11.5299Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99927 6.23425V8.58788" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99927 10.9415H8.00492" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_folder.svg b/assets/icons/tool_folder.svg
index 0d76b7e3f8..35f4c1f8ac 100644
--- a/assets/icons/tool_folder.svg
+++ b/assets/icons/tool_folder.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_hammer.svg b/assets/icons/tool_hammer.svg
index e66173ce70..f725012cdf 100644
--- a/assets/icons/tool_hammer.svg
+++ b/assets/icons/tool_hammer.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 8.5L4.94864 12.6222C4.71647 12.8544 4.40157 12.9848 4.07323 12.9848C3.74488 12.9848 3.42999 12.8544 3.19781 12.6222C2.96564 12.39 2.83521 12.0751 2.83521 11.7468C2.83521 11.4185 2.96564 11.1036 3.19781 10.8714L7.5 6.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.8352 9.98474L13.8352 6.98474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8352 7.42495L11.7634 6.4298C11.5533 6.23484 11.4353 5.97039 11.4352 5.69462V5.08526L10.1696 3.91022C9.54495 3.33059 8.69961 3.00261 7.81649 2.99722L5.83521 2.98474L6.35041 3.41108C6.71634 3.71233 7.00935 4.08216 7.21013 4.4962C7.4109 4.91024 7.51488 5.35909 7.51521 5.81316L7.5 6.5L9 8.5L9.5 8C9.5 8 9.87337 7.79457 10.0834 7.98959L11.1552 8.98474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 8.5L4.94864 12.6222C4.71647 12.8544 4.40157 12.9848 4.07323 12.9848C3.74488 12.9848 3.42999 12.8544 3.19781 12.6222C2.96564 12.39 2.83521 12.0751 2.83521 11.7468C2.83521 11.4185 2.96564 11.1036 3.19781 10.8714L7.5 6.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.8352 9.98474L13.8352 6.98474" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8352 7.42495L11.7634 6.4298C11.5533 6.23484 11.4353 5.97039 11.4352 5.69462V5.08526L10.1696 3.91022C9.54495 3.33059 8.69961 3.00261 7.81649 2.99722L5.83521 2.98474L6.35041 3.41108C6.71634 3.71233 7.00935 4.08216 7.21013 4.4962C7.4109 4.91024 7.51488 5.35909 7.51521 5.81316L7.5 6.5L9 8.5L9.5 8C9.5 8 9.87337 7.79457 10.0834 7.98959L11.1552 8.98474" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_notification.svg b/assets/icons/tool_notification.svg
index 7510b32040..7903a3369a 100644
--- a/assets/icons/tool_notification.svg
+++ b/assets/icons/tool_notification.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 12C6.65203 12.304 6.87068 12.5565 7.13399 12.7321C7.39729 12.9076 7.69597 13 8 13C8.30403 13 8.60271 12.9076 8.86601 12.7321C9.12932 12.5565 9.34797 12.304 9.5 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.63088 9.21874C3.56556 9.28556 3.52246 9.36865 3.50681 9.45791C3.49116 9.54718 3.50364 9.63876 3.54273 9.72152C3.58183 9.80429 3.64585 9.87467 3.72701 9.92409C3.80817 9.97352 3.90298 9.99987 3.99989 9.99994H12.0001C12.097 9.99997 12.1918 9.97372 12.273 9.92439C12.3542 9.87505 12.4183 9.80476 12.4575 9.72205C12.4967 9.63934 12.5093 9.54778 12.4938 9.45851C12.4783 9.36924 12.4353 9.2861 12.3701 9.21921C11.705 8.57941 11 7.89947 11 5.79994C11 5.05733 10.684 4.34514 10.1213 3.82004C9.55872 3.29494 8.79564 2.99994 7.99997 2.99994C7.20431 2.99994 6.44123 3.29494 5.87861 3.82004C5.31599 4.34514 4.99991 5.05733 4.99991 5.79994C4.99991 7.89947 4.2944 8.57941 3.63088 9.21874Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.5 12C6.65203 12.304 6.87068 12.5565 7.13399 12.7321C7.39729 12.9076 7.69597 13 8 13C8.30403 13 8.60271 12.9076 8.86601 12.7321C9.12932 12.5565 9.34797 12.304 9.5 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.63088 9.21874C3.56556 9.28556 3.52246 9.36865 3.50681 9.45791C3.49116 9.54718 3.50364 9.63876 3.54273 9.72152C3.58183 9.80429 3.64585 9.87467 3.72701 9.92409C3.80817 9.97352 3.90298 9.99987 3.99989 9.99994H12.0001C12.097 9.99997 12.1918 9.97372 12.273 9.92439C12.3542 9.87505 12.4183 9.80476 12.4575 9.72205C12.4967 9.63934 12.5093 9.54778 12.4938 9.45851C12.4783 9.36924 12.4353 9.2861 12.3701 9.21921C11.705 8.57941 11 7.89947 11 5.79994C11 5.05733 10.684 4.34514 10.1213 3.82004C9.55872 3.29494 8.79564 2.99994 7.99997 2.99994C7.20431 2.99994 6.44123 3.29494 5.87861 3.82004C5.31599 4.34514 4.99991 5.05733 4.99991 5.79994C4.99991 7.89947 4.2944 8.57941 3.63088 9.21874Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_pencil.svg b/assets/icons/tool_pencil.svg
index b913015c08..c4d289e9c0 100644
--- a/assets/icons/tool_pencil.svg
+++ b/assets/icons/tool_pencil.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5L11 7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_read.svg b/assets/icons/tool_read.svg
index 458cbb3660..d22e9d8c7d 100644
--- a/assets/icons/tool_read.svg
+++ b/assets/icons/tool_read.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5.66667V4.33333C3 3.97971 3.14048 3.64057 3.39052 3.39052C3.64057 3.14048 3.97971 3 4.33333 3H5.66667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.3333 3H11.6666C12.0202 3 12.3593 3.14048 12.6094 3.39052C12.8594 3.64057 12.9999 3.97971 12.9999 4.33333V5.66667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9999 10.3333V11.6666C12.9999 12.0203 12.8594 12.3594 12.6094 12.6095C12.3593 12.8595 12.0202 13 11.6666 13H10.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.66667 13H4.33333C3.97971 13 3.64057 12.8595 3.39052 12.6095C3.14048 12.3594 3 12.0203 3 11.6666V10.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.5 8H10.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 5.66667V4.33333C3 3.97971 3.14048 3.64057 3.39052 3.39052C3.64057 3.14048 3.97971 3 4.33333 3H5.66667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3333 3H11.6666C12.0202 3 12.3593 3.14048 12.6094 3.39052C12.8594 3.64057 12.9999 3.97971 12.9999 4.33333V5.66667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9999 10.3333V11.6666C12.9999 12.0203 12.8594 12.3594 12.6094 12.6095C12.3593 12.8595 12.0202 13 11.6666 13H10.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.66667 13H4.33333C3.97971 13 3.64057 12.8595 3.39052 12.6095C3.14048 12.3594 3 12.0203 3 11.6666V10.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.5 8H10.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_regex.svg b/assets/icons/tool_regex.svg
index 0432cd570f..818c2ba360 100644
--- a/assets/icons/tool_regex.svg
+++ b/assets/icons/tool_regex.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M4.57132 13.7143C5.20251 13.7143 5.71418 13.2026 5.71418 12.5714C5.71418 11.9403 5.20251 11.4286 4.57132 11.4286C3.94014 11.4286 3.42847 11.9403 3.42847 12.5714C3.42847 13.2026 3.94014 13.7143 4.57132 13.7143Z" fill="black"/>
-<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
 </svg>
diff --git a/assets/icons/tool_search.svg b/assets/icons/tool_search.svg
index 4f2750cfa2..b225a1298e 100644
--- a/assets/icons/tool_search.svg
+++ b/assets/icons/tool_search.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L11 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 12C9.98528 12 12 9.98528 12 7.5C12 5.01472 9.98528 3 7.5 3C5.01472 3 3 5.01472 3 7.5C3 9.98528 5.01472 12 7.5 12Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 13L11 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.5 12C9.98528 12 12 9.98528 12 7.5C12 5.01472 9.98528 3 7.5 3C5.01472 3 3 5.01472 3 7.5C3 9.98528 5.01472 12 7.5 12Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_terminal.svg b/assets/icons/tool_terminal.svg
index 3c4ab42a4d..24da5e3a10 100644
--- a/assets/icons/tool_terminal.svg
+++ b/assets/icons/tool_terminal.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_think.svg b/assets/icons/tool_think.svg
index 595f8070d8..efd5908a90 100644
--- a/assets/icons/tool_think.svg
+++ b/assets/icons/tool_think.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95231 10.2159C10.0803 9.58974 9.95231 9.57261 10.9111 8.46959C11.4686 7.82822 11.8699 7.09214 11.8699 6.27818C11.8699 5.28184 11.4658 4.32631 10.7467 3.62179C10.0275 2.91728 9.05201 2.52148 8.03492 2.52148C7.01782 2.52148 6.04239 2.91728 5.32319 3.62179C4.604 4.32631 4.19995 5.28184 4.19995 6.27818C4.19995 6.9043 4.32779 7.65565 5.1587 8.46959C6.11744 9.59098 5.98965 9.58974 6.11748 10.2159M9.95231 10.2159V12.2989C9.95231 12.9504 9.41327 13.4786 8.7482 13.4786H7.32165C6.65658 13.4786 6.11744 12.9504 6.11744 12.2989L6.11748 10.2159M9.95231 10.2159H8.03492H6.11748" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.95231 10.2159C10.0803 9.58974 9.95231 9.57261 10.9111 8.46959C11.4686 7.82822 11.8699 7.09214 11.8699 6.27818C11.8699 5.28184 11.4658 4.32631 10.7467 3.62179C10.0275 2.91728 9.05201 2.52148 8.03492 2.52148C7.01782 2.52148 6.04239 2.91728 5.32319 3.62179C4.604 4.32631 4.19995 5.28184 4.19995 6.27818C4.19995 6.9043 4.32779 7.65565 5.1587 8.46959C6.11744 9.59098 5.98965 9.58974 6.11748 10.2159M9.95231 10.2159V12.2989C9.95231 12.9504 9.41327 13.4786 8.7482 13.4786H7.32165C6.65658 13.4786 6.11744 12.9504 6.11744 12.2989L6.11748 10.2159M9.95231 10.2159H8.03492H6.11748" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/tool_web.svg b/assets/icons/tool_web.svg
index 6250a9f05a..288b54c432 100644
--- a/assets/icons/tool_web.svg
+++ b/assets/icons/tool_web.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99993 13.4804C11.0267 13.4804 13.4803 11.0267 13.4803 7.99999C13.4803 4.97325 11.0267 2.51959 7.99993 2.51959C4.97319 2.51959 2.51953 4.97325 2.51953 7.99999C2.51953 11.0267 4.97319 13.4804 7.99993 13.4804Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 3C6.71611 4.34807 6 6.13836 6 7.99999C6 9.86163 6.71611 11.6519 8 13C9.28387 11.6519 10 9.86163 10 7.99999C10 6.13836 9.28387 4.34807 8 3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.24121 7.04827C4.52425 8.27022 6.22817 8.95178 7.99999 8.95178C9.77182 8.95178 11.4757 8.27022 12.7588 7.04827" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99993 13.4804C11.0267 13.4804 13.4803 11.0267 13.4803 7.99999C13.4803 4.97325 11.0267 2.51959 7.99993 2.51959C4.97319 2.51959 2.51953 4.97325 2.51953 7.99999C2.51953 11.0267 4.97319 13.4804 7.99993 13.4804Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 3C6.71611 4.34807 6 6.13836 6 7.99999C6 9.86163 6.71611 11.6519 8 13C9.28387 11.6519 10 9.86163 10 7.99999C10 6.13836 9.28387 4.34807 8 3Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.24121 7.04827C4.52425 8.27022 6.22817 8.95178 7.99999 8.95178C9.77182 8.95178 11.4757 8.27022 12.7588 7.04827" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/trash.svg b/assets/icons/trash.svg
index 1322e90f9f..4a9e9add02 100644
--- a/assets/icons/trash.svg
+++ b/assets/icons/trash.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5L13 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 5V12.875C12 13.4375 11.4286 14 10.8571 14H5.14286C4.57143 14 4 13.4375 4 12.875V5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 5V3C10 2.44772 9.55228 2 9 2H7C6.44772 2 6 2.44772 6 3V5" stroke="black" stroke-width="1.5"/>
+<path d="M3 5L13 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 5V12.875C12 13.4375 11.4286 14 10.8571 14H5.14286C4.57143 14 4 13.4375 4 12.875V5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 5V3C10 2.44772 9.55228 2 9 2H7C6.44772 2 6 2.44772 6 3V5" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/undo.svg b/assets/icons/undo.svg
index b2407456dc..c714b58747 100644
--- a/assets/icons/undo.svg
+++ b/assets/icons/undo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.6 5v3.6h3.6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13.4 11A5.4 5.4 0 0 0 8 5.6a5.4 5.4 0 0 0-3.6 1.38L2.6 8.6"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.6 5v3.6h3.6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13.4 11A5.4 5.4 0 0 0 8 5.6a5.4 5.4 0 0 0-3.6 1.38L2.6 8.6"/></svg>
diff --git a/assets/icons/user_check.svg b/assets/icons/user_check.svg
index cd682b5eda..ee32a52590 100644
--- a/assets/icons/user_check.svg
+++ b/assets/icons/user_check.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2 13.4a4.8 4.8 0 0 1 7.975-3.6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.8 8.6a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM10.4 12.2l1.2 1.2L14 11"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 13.4a4.8 4.8 0 0 1 7.975-3.6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.6a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM10.4 12.2l1.2 1.2L14 11"/></svg>
diff --git a/assets/icons/user_group.svg b/assets/icons/user_group.svg
index ac1f7bdc63..30d2e5a7ea 100644
--- a/assets/icons/user_group.svg
+++ b/assets/icons/user_group.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.79118 8.27005C8.27568 8.27005 9.4791 7.06663 9.4791 5.58214C9.4791 4.09765 8.27568 2.89423 6.79118 2.89423C5.30669 2.89423 4.10327 4.09765 4.10327 5.58214C4.10327 7.06663 5.30669 8.27005 6.79118 8.27005Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.79112 8.60443C4.19441 8.60443 2.08936 10.7095 2.08936 13.3062H11.4929C11.4929 10.7095 9.38784 8.60443 6.79112 8.60443Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.6984 12.9263C14.6984 10.8893 13.4895 8.99736 12.2806 8.09067C12.6779 7.79254 12.9957 7.40104 13.2057 6.95083C13.4157 6.50062 13.5115 6.00558 13.4846 5.50952C13.4577 5.01346 13.309 4.53168 13.0515 4.10681C12.7941 3.68194 12.4358 3.3271 12.0085 3.07367" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.79118 8.27005C8.27568 8.27005 9.4791 7.06663 9.4791 5.58214C9.4791 4.09765 8.27568 2.89423 6.79118 2.89423C5.30669 2.89423 4.10327 4.09765 4.10327 5.58214C4.10327 7.06663 5.30669 8.27005 6.79118 8.27005Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.79112 8.60443C4.19441 8.60443 2.08936 10.7095 2.08936 13.3062H11.4929C11.4929 10.7095 9.38784 8.60443 6.79112 8.60443Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.6984 12.9263C14.6984 10.8893 13.4895 8.99736 12.2806 8.09067C12.6779 7.79254 12.9957 7.40104 13.2057 6.95083C13.4157 6.50062 13.5115 6.00558 13.4846 5.50952C13.4577 5.01346 13.309 4.53168 13.0515 4.10681C12.7941 3.68194 12.4358 3.3271 12.0085 3.07367" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/user_round_pen.svg b/assets/icons/user_round_pen.svg
index eb75517323..e684fd1a20 100644
--- a/assets/icons/user_round_pen.svg
+++ b/assets/icons/user_round_pen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2 13.433a4.8 4.8 0 0 1 6.493-4.492M13.627 10.809a1.275 1.275 0 0 0-1.803-1.803l-2.406 2.408a1.2 1.2 0 0 0-.303.512l-.502 1.722a.3.3 0 0 0 .372.372l1.722-.502c.193-.057.37-.161.512-.304l2.408-2.405Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.8 8.633a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 13.433a4.8 4.8 0 0 1 6.493-4.492M13.627 10.809a1.275 1.275 0 0 0-1.803-1.803l-2.406 2.408a1.2 1.2 0 0 0-.303.512l-.502 1.722a.3.3 0 0 0 .372.372l1.722-.502c.193-.057.37-.161.512-.304l2.408-2.405Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.633a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/></svg>
diff --git a/assets/icons/warning.svg b/assets/icons/warning.svg
index 456799fa5a..5af37dab9d 100644
--- a/assets/icons/warning.svg
+++ b/assets/icons/warning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13.84 11.6 9.037 3.199a1.2 1.2 0 0 0-2.089 0l-4.802 8.403a1.2 1.2 0 0 0 1.05 1.8h9.604a1.201 1.201 0 0 0 1.038-1.8ZM8 6v2.667M8 11.333h.007"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13.84 11.6 9.037 3.199a1.2 1.2 0 0 0-2.089 0l-4.802 8.403a1.2 1.2 0 0 0 1.05 1.8h9.604a1.201 1.201 0 0 0 1.038-1.8ZM8 6v2.667M8 11.333h.007"/></svg>
diff --git a/assets/icons/whole_word.svg b/assets/icons/whole_word.svg
index 77cecce38c..ce0d1606c8 100644
--- a/assets/icons/whole_word.svg
+++ b/assets/icons/whole_word.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-rule="evenodd" d="m5.425 10.842-.773-3.948-.782 3.948H2.487L1.147 4.58H2.6l.617 3.897.764-3.886h1.342l.754 3.88.616-3.89H8.15l-1.341 6.261H5.425ZM9.885 10.656c-.384-.218-.648-.577-.802-1.047-.152-.463-.222-1.104-.222-1.91 0-.798.066-1.431.21-1.885v-.002c.155-.47.419-.826.804-1.037.374-.212.88-.306 1.496-.306.447 0 .816.052 1.082.177.128.059.244.14.35.243V2.32h1.377v8.52h-1.376v-.337a1.545 1.545 0 0 1-.393.271c-.26.125-.601.178-1.007.178-.622 0-1.134-.09-1.514-.293l-.005-.003Zm2.817-1.679c.08-.288.124-.71.124-1.278 0-.56-.044-.975-.124-1.255-.078-.274-.199-.434-.342-.521l-.008-.005c-.146-.097-.385-.161-.748-.161-.395 0-.665.064-.835.167l-.005.003c-.158.09-.287.251-.37.522-.087.277-.135.69-.135 1.25 0 .568.048.984.134 1.262.084.27.214.439.376.536.17.102.44.167.835.167.364 0 .605-.061.752-.153.146-.094.268-.261.346-.534Z" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" stroke-width="1.5" d="M2 13h12"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-rule="evenodd" d="m5.425 10.842-.773-3.948-.782 3.948H2.487L1.147 4.58H2.6l.617 3.897.764-3.886h1.342l.754 3.88.616-3.89H8.15l-1.341 6.261H5.425ZM9.885 10.656c-.384-.218-.648-.577-.802-1.047-.152-.463-.222-1.104-.222-1.91 0-.798.066-1.431.21-1.885v-.002c.155-.47.419-.826.804-1.037.374-.212.88-.306 1.496-.306.447 0 .816.052 1.082.177.128.059.244.14.35.243V2.32h1.377v8.52h-1.376v-.337a1.545 1.545 0 0 1-.393.271c-.26.125-.601.178-1.007.178-.622 0-1.134-.09-1.514-.293l-.005-.003Zm2.817-1.679c.08-.288.124-.71.124-1.278 0-.56-.044-.975-.124-1.255-.078-.274-.199-.434-.342-.521l-.008-.005c-.146-.097-.385-.161-.748-.161-.395 0-.665.064-.835.167l-.005.003c-.158.09-.287.251-.37.522-.087.277-.135.69-.135 1.25 0 .568.048.984.134 1.262.084.27.214.439.376.536.17.102.44.167.835.167.364 0 .605-.061.752-.153.146-.094.268-.261.346-.534Z" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="M2 13h12"/></svg>
diff --git a/assets/icons/x_circle.svg b/assets/icons/x_circle.svg
index 69aaa3f6a1..8807e5fa1f 100644
--- a/assets/icons/x_circle.svg
+++ b/assets/icons/x_circle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-opacity=".157" stroke="#000" stroke-linejoin="round" stroke-width="1.5" d="M9.864 3a.5.5 0 0 1 .353.146l2.636 2.636a.5.5 0 0 1 .147.354v3.728a.5.5 0 0 1-.146.353l-2.637 2.637a.5.5 0 0 1-.353.146H6.136a.5.5 0 0 1-.354-.146l-2.636-2.636A.5.5 0 0 1 3 9.864V6.136a.5.5 0 0 1 .146-.354l2.636-2.636A.5.5 0 0 1 6.136 3h3.728Z"/><path stroke="#000" stroke-linecap="round" stroke-width="1.5" d="m9.5 6.5-3 3m3 0-3-3"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-opacity=".157" stroke="#000" stroke-linejoin="round" stroke-width="1.2" d="M9.864 3a.5.5 0 0 1 .353.146l2.636 2.636a.5.5 0 0 1 .147.354v3.728a.5.5 0 0 1-.146.353l-2.637 2.637a.5.5 0 0 1-.353.146H6.136a.5.5 0 0 1-.354-.146l-2.636-2.636A.5.5 0 0 1 3 9.864V6.136a.5.5 0 0 1 .146-.354l2.636-2.636A.5.5 0 0 1 6.136 3h3.728Z"/><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="m9.5 6.5-3 3m3 0-3-3"/></svg>
diff --git a/assets/icons/zed_assistant.svg b/assets/icons/zed_assistant.svg
index d21252de8c..470eb0fede 100644
--- a/assets/icons/zed_assistant.svg
+++ b/assets/icons/zed_assistant.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/zed_burn_mode.svg b/assets/icons/zed_burn_mode.svg
index f6192d16e7..cad6ed666b 100644
--- a/assets/icons/zed_burn_mode.svg
+++ b/assets/icons/zed_burn_mode.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.70519 9.31137C6.13992 9.31137 6.55683 9.13868 6.86423 8.83128C7.17163 8.52389 7.34432 8.10696 7.34432 7.67224C7.34432 6.76744 7.01649 6.36094 6.68868 5.70528C5.98581 4.30022 6.54181 3.04726 7.99998 1.77136C8.32781 3.41049 9.31128 4.98406 10.6226 6.03311C11.9339 7.08215 12.5896 8.3279 12.5896 9.6392C12.5896 10.2419 12.4708 10.8387 12.2402 11.3956C12.0096 11.9524 11.6715 12.4583 11.2453 12.8845C10.8191 13.3107 10.3132 13.6487 9.75633 13.8794C9.1995 14.1101 8.60269 14.2287 7.99998 14.2287C7.39727 14.2287 6.80046 14.1101 6.24362 13.8794C5.68679 13.6487 5.18083 13.3107 4.75465 12.8845C4.32848 12.4583 3.99041 11.9524 3.75976 11.3956C3.52911 10.8387 3.4104 10.2419 3.4104 9.6392C3.4104 8.88324 3.6943 8.13513 4.06606 7.67224C4.06606 8.10696 4.23875 8.52389 4.54615 8.83128C4.85354 9.13868 5.27047 9.31137 5.70519 9.31137Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.70519 9.31137C6.13992 9.31137 6.55683 9.13868 6.86423 8.83128C7.17163 8.52389 7.34432 8.10696 7.34432 7.67224C7.34432 6.76744 7.01649 6.36094 6.68868 5.70528C5.98581 4.30022 6.54181 3.04726 7.99998 1.77136C8.32781 3.41049 9.31128 4.98406 10.6226 6.03311C11.9339 7.08215 12.5896 8.3279 12.5896 9.6392C12.5896 10.2419 12.4708 10.8387 12.2402 11.3956C12.0096 11.9524 11.6715 12.4583 11.2453 12.8845C10.8191 13.3107 10.3132 13.6487 9.75633 13.8794C9.1995 14.1101 8.60269 14.2287 7.99998 14.2287C7.39727 14.2287 6.80046 14.1101 6.24362 13.8794C5.68679 13.6487 5.18083 13.3107 4.75465 12.8845C4.32848 12.4583 3.99041 11.9524 3.75976 11.3956C3.52911 10.8387 3.4104 10.2419 3.4104 9.6392C3.4104 8.88324 3.6943 8.13513 4.06606 7.67224C4.06606 8.10696 4.23875 8.52389 4.54615 8.83128C4.85354 9.13868 5.27047 9.31137 5.70519 9.31137Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/zed_burn_mode_on.svg b/assets/icons/zed_burn_mode_on.svg
index 29a74a3e63..10e0e42b13 100644
--- a/assets/icons/zed_burn_mode_on.svg
+++ b/assets/icons/zed_burn_mode_on.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g fill="#000" clip-path="url(#a)"><path fill-opacity=".5" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.705 9.311a1.64 1.64 0 0 0 1.64-1.639c0-.905-.328-1.311-.656-1.967C5.986 4.3 6.542 3.047 8 1.771c.328 1.64 1.312 3.213 2.623 4.262 1.311 1.05 1.967 2.295 1.967 3.606a4.59 4.59 0 1 1-9.18 0c0-.756.285-1.504.656-1.967a1.64 1.64 0 0 0 1.64 1.64Z"/><path d="M2.286 4.571a1.143 1.143 0 1 0 0-2.285 1.143 1.143 0 0 0 0 2.285ZM11.429 2.286a1.143 1.143 0 1 0 0-2.286 1.143 1.143 0 0 0 0 2.286ZM14.857 5.714a1.143 1.143 0 1 0 0-2.286 1.143 1.143 0 0 0 0 2.286Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g fill="#000" clip-path="url(#a)"><path fill-opacity=".5" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.705 9.311a1.64 1.64 0 0 0 1.64-1.639c0-.905-.328-1.311-.656-1.967C5.986 4.3 6.542 3.047 8 1.771c.328 1.64 1.312 3.213 2.623 4.262 1.311 1.05 1.967 2.295 1.967 3.606a4.59 4.59 0 1 1-9.18 0c0-.756.285-1.504.656-1.967a1.64 1.64 0 0 0 1.64 1.64Z"/><path d="M2.286 4.571a1.143 1.143 0 1 0 0-2.285 1.143 1.143 0 0 0 0 2.285ZM11.429 2.286a1.143 1.143 0 1 0 0-2.286 1.143 1.143 0 0 0 0 2.286ZM14.857 5.714a1.143 1.143 0 1 0 0-2.286 1.143 1.143 0 0 0 0 2.286Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/zed_mcp_custom.svg b/assets/icons/zed_mcp_custom.svg
index 6410a26fca..feff2d7d34 100644
--- a/assets/icons/zed_mcp_custom.svg
+++ b/assets/icons/zed_mcp_custom.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.5"/>
+<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.2"/>
 <path d="M8.17871 4.15039C9.57718 4.15047 10.7699 4.84416 11.25 6.00879L11.292 6.125C11.3291 6.2423 11.3496 6.36246 11.3496 6.47656C11.3496 6.67403 11.2827 6.86644 11.1357 7.00879C10.99 7.14999 10.797 7.21191 10.6035 7.21191C10.4311 7.21184 10.263 7.16459 10.1172 7.05469C9.97557 6.94786 9.88031 6.80045 9.81543 6.6416V6.64062C9.54483 5.99474 8.92921 5.62898 8.17871 5.62891C7.58712 5.62891 7.11895 5.85535 6.79297 6.24512C6.46181 6.64107 6.25488 7.2348 6.25488 7.99805C6.25495 8.76969 6.4603 9.36343 6.79004 9.75781C7.11426 10.1456 7.5828 10.3711 8.18359 10.3711C9.00554 10.371 9.57612 10.0476 9.83789 9.44922L9.83984 9.44531C9.90093 9.30959 9.98754 9.17654 10.1211 9.08008C10.2598 8.97992 10.4154 8.94341 10.5693 8.94336C10.9809 8.94336 11.3203 9.24379 11.3203 9.67383C11.3203 9.89213 11.2593 10.0749 11.1641 10.2578L11.1631 10.2568C10.6246 11.2962 9.56725 11.8495 8.17871 11.8496C7.12036 11.8496 6.22667 11.4786 5.60059 10.7891C4.97793 10.1031 4.65047 9.13626 4.65039 7.99805C4.65039 6.86743 4.98182 5.90203 5.60547 5.21582C6.23235 4.52617 7.12584 4.15039 8.17871 4.15039ZM7.67773 11.4678C7.68226 11.4684 7.68688 11.4682 7.69141 11.4688C7.68688 11.4682 7.68226 11.4684 7.67773 11.4678ZM7.35059 11.4082C7.37261 11.4133 7.39471 11.4182 7.41699 11.4229C7.39471 11.4182 7.37261 11.4133 7.35059 11.4082ZM7.07617 11.333C7.08849 11.337 7.10087 11.3408 7.11328 11.3447C7.10087 11.3408 7.08849 11.337 7.07617 11.333ZM6.80469 11.2295C6.81416 11.2336 6.82348 11.2381 6.83301 11.2422C6.82347 11.2381 6.81416 11.2336 6.80469 11.2295ZM6.32812 10.9648C6.33354 10.9686 6.33929 10.9719 6.34473 10.9756C6.33928 10.9719 6.33354 10.9686 6.32812 10.9648ZM6.10156 10.7891C6.11103 10.7972 6.12128 10.8045 6.13086 10.8125C6.12128 10.8045 6.11103 10.7972 6.10156 10.7891ZM10.5449 10.5586V10.5596V10.5586ZM5.90234 10.5986C5.909 10.6056 5.91613 10.6122 5.92285 10.6191C5.91612 10.6122 5.909 10.6056 5.90234 10.5986ZM5.71094 10.374C5.71943 10.3851 5.72769 10.3963 5.73633 10.4072C5.72769 10.3963 5.71944 10.3851 5.71094 10.374ZM5.55469 10.1504C5.55922 10.1576 5.56378 10.1647 5.56836 10.1719C5.56377 10.1647 5.55922 10.1576 5.55469 10.1504ZM10.9131 9.95898C10.9213 9.9374 10.9302 9.91676 10.9365 9.89551C10.9301 9.91674 10.9214 9.93742 10.9131 9.95898ZM10.21 9.49219C10.192 9.52099 10.1752 9.55324 10.1592 9.58887L10.1953 9.51758C10.2002 9.50891 10.2049 9.50031 10.21 9.49219ZM10.499 9.29688C10.4547 9.30262 10.4145 9.31428 10.3779 9.33203C10.4145 9.31437 10.4547 9.30259 10.499 9.29688ZM5.18652 9.33203C5.18988 9.34309 5.19284 9.35425 5.19629 9.36523C5.19284 9.35424 5.18988 9.34309 5.18652 9.33203ZM10.5693 9.29297C10.628 9.29297 10.6829 9.3029 10.7314 9.32129C10.6827 9.30276 10.6281 9.29297 10.5693 9.29297ZM5.10352 9.01172C5.1083 9.03397 5.11306 9.05613 5.11816 9.07812C5.11306 9.05612 5.1083 9.03397 5.10352 9.01172ZM5.01465 8.39062C5.02368 8.51203 5.03633 8.63062 5.05371 8.74609C5.03633 8.63061 5.02368 8.51204 5.01465 8.39062ZM5.01465 7.60742V7.6084V7.60742ZM10.6035 6.86133C10.6321 6.86133 10.6594 6.85865 10.6855 6.85449C10.6596 6.85862 10.632 6.86133 10.6035 6.86133ZM10.7002 6.85059C10.7213 6.84652 10.7415 6.84169 10.7607 6.83496C10.7415 6.8417 10.7213 6.84652 10.7002 6.85059ZM10.7773 6.82812C10.7929 6.82186 10.8081 6.81563 10.8223 6.80762C10.8081 6.81566 10.7929 6.82185 10.7773 6.82812ZM10.8516 6.78809C10.8602 6.782 10.868 6.77535 10.876 6.76855C10.8681 6.77537 10.8602 6.78198 10.8516 6.78809ZM10.8994 6.74707C10.9093 6.73683 10.9173 6.72535 10.9258 6.71387C10.9173 6.72537 10.9092 6.73681 10.8994 6.74707ZM10.9912 6.37305C10.9893 6.3598 10.9861 6.34659 10.9834 6.33301C10.9861 6.34658 10.9892 6.35981 10.9912 6.37305ZM10.9102 6.10645C10.8889 6.05715 10.867 6.00836 10.8428 5.96094C10.867 6.00837 10.8889 6.05714 10.9102 6.10645ZM10.7871 5.86328C10.7743 5.84084 10.7625 5.81787 10.749 5.7959C10.7625 5.81788 10.7743 5.84084 10.7871 5.86328ZM10.6973 5.7168C10.6775 5.68719 10.6578 5.65759 10.6367 5.62891C10.6578 5.65759 10.6775 5.68719 10.6973 5.7168ZM10.584 5.56152C10.563 5.53497 10.5425 5.5081 10.5205 5.48242C10.5425 5.50811 10.563 5.53497 10.584 5.56152ZM10.4492 5.4043C10.4285 5.3821 10.4083 5.35937 10.3867 5.33789C10.4083 5.35938 10.4285 5.38209 10.4492 5.4043ZM7.68457 5.32812H7.68555H7.68457ZM10.3096 5.26562C10.2895 5.24727 10.2697 5.2287 10.249 5.21094C10.2697 5.22871 10.2895 5.24726 10.3096 5.26562ZM10.1553 5.13477C10.1356 5.11933 10.1159 5.10379 10.0957 5.08887C10.1159 5.10379 10.1356 5.11933 10.1553 5.13477ZM10.0078 5.02734C9.9783 5.00732 9.94843 4.98772 9.91797 4.96875C9.94843 4.98773 9.9783 5.00731 10.0078 5.02734ZM9.83887 4.9209C9.81069 4.90462 9.78183 4.88942 9.75293 4.87402C9.78184 4.88943 9.81069 4.90461 9.83887 4.9209ZM9.65039 4.82129C9.62853 4.81074 9.60622 4.80108 9.58398 4.79102C9.60622 4.80108 9.62853 4.81073 9.65039 4.82129ZM9.45703 4.73633C9.43574 4.72785 9.41417 4.71996 9.39258 4.71191C9.41418 4.71996 9.43574 4.72784 9.45703 4.73633ZM9.27441 4.66895C9.23013 4.65444 9.18506 4.64161 9.13965 4.62891C9.18506 4.64161 9.23013 4.65444 9.27441 4.66895ZM9.08008 4.6123C9.03442 4.60046 8.98811 4.59009 8.94141 4.58008C8.98812 4.59009 9.03441 4.60046 9.08008 4.6123ZM8.85547 4.5625C8.83187 4.55807 8.80802 4.55474 8.78418 4.55078C8.80802 4.55474 8.83187 4.55807 8.85547 4.5625ZM10.9404 6.69336C10.9509 6.67671 10.96 6.65941 10.9678 6.64062C10.9601 6.65941 10.9509 6.67671 10.9404 6.69336ZM9.82812 5.99707C9.80503 5.96962 9.78129 5.94293 9.75684 5.91699C9.78129 5.94293 9.80502 5.96962 9.82812 5.99707Z" fill="black"/>
 </svg>
diff --git a/assets/icons/zed_mcp_extension.svg b/assets/icons/zed_mcp_extension.svg
index 996e0c1920..00117efcf4 100644
--- a/assets/icons/zed_mcp_extension.svg
+++ b/assets/icons/zed_mcp_extension.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.5"/>
+<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.2"/>
 <path d="M9.62109 4.65039C9.80393 4.65039 9.98678 4.70637 10.1279 4.83203C10.2722 4.96055 10.3496 5.14167 10.3496 5.33691C10.3496 5.53215 10.2723 5.71329 10.1279 5.8418C9.98678 5.96744 9.80392 6.02344 9.62109 6.02344H7.1416V7.24902H9.46289C9.6423 7.24902 9.82303 7.30362 9.96387 7.42773C10.1085 7.55531 10.1875 7.73591 10.1875 7.93164C10.1874 8.12674 10.1072 8.30592 9.96484 8.43262C9.82536 8.55656 9.64499 8.61426 9.46289 8.61426H7.1416V9.97656H9.62109C9.80392 9.97656 9.98678 10.0326 10.1279 10.1582C10.2723 10.2867 10.3496 10.4678 10.3496 10.6631C10.3496 10.8583 10.2722 11.0394 10.1279 11.168C9.98678 11.2936 9.80393 11.3496 9.62109 11.3496H6.39648C6.20308 11.3496 6.00965 11.289 5.86328 11.1465C5.7159 11.0028 5.65039 10.8095 5.65039 10.6133V5.38672C5.65039 5.19054 5.7159 4.99723 5.86328 4.85352C6.00965 4.71101 6.20308 4.65039 6.39648 4.65039H9.62109ZM9.70215 10.9941C9.72618 10.9903 9.74882 10.9838 9.77051 10.9766C9.74884 10.9838 9.72616 10.9903 9.70215 10.9941ZM9.78809 10.9688C9.80381 10.9626 9.81877 10.9561 9.83301 10.9482C9.81877 10.9561 9.80381 10.9626 9.78809 10.9688ZM9.85059 10.9375C9.86364 10.9292 9.87617 10.9209 9.8877 10.9111C9.87616 10.9209 9.86365 10.9293 9.85059 10.9375ZM6.1123 10.8994C6.12346 10.9099 6.1358 10.9188 6.14844 10.9277C6.1358 10.9188 6.12346 10.9099 6.1123 10.8994ZM9.90039 10.8984C9.91122 10.8882 9.92149 10.8778 9.93066 10.8662C9.92147 10.8778 9.91123 10.8882 9.90039 10.8984ZM6.07129 10.8516C6.0792 10.8626 6.08754 10.8729 6.09668 10.8828C6.08754 10.8729 6.0792 10.8626 6.07129 10.8516ZM9.94434 10.8477C9.95104 10.8377 9.95638 10.8272 9.96191 10.8164C9.95637 10.8271 9.95106 10.8377 9.94434 10.8477ZM6.03418 10.7842C6.04066 10.7995 6.04735 10.8143 6.05566 10.8281C6.04735 10.8143 6.04066 10.7995 6.03418 10.7842ZM9.97559 10.7891C9.97984 10.7783 9.98321 10.7673 9.98633 10.7559C9.98321 10.7673 9.97984 10.7783 9.97559 10.7891ZM6.01367 10.7236C6.0173 10.7388 6.02121 10.7535 6.02637 10.7676C6.02121 10.7535 6.0173 10.7388 6.01367 10.7236ZM9.62109 10.3262C9.67716 10.3262 9.72942 10.3346 9.77539 10.3506C9.72927 10.3345 9.67733 10.3262 9.62109 10.3262ZM9.56641 8.25098C9.5802 8.24792 9.59348 8.24449 9.60645 8.24023C9.59348 8.2445 9.58021 8.24792 9.56641 8.25098ZM9.625 8.2334C9.64073 8.22735 9.65566 8.2207 9.66992 8.21289C9.65565 8.22072 9.64074 8.22733 9.625 8.2334ZM9.68848 8.20117C9.69832 8.19495 9.70781 8.18872 9.7168 8.18164C9.70781 8.18874 9.69832 8.19493 9.68848 8.20117ZM9.74121 8.16016C9.7511 8.15059 9.76008 8.14059 9.76855 8.12988C9.76009 8.1406 9.75109 8.15057 9.74121 8.16016ZM9.77734 8.11914C9.78753 8.10499 9.79605 8.09004 9.80371 8.07422C9.79606 8.09005 9.78751 8.10498 9.77734 8.11914ZM9.79883 5.6377C9.80686 5.6343 9.81463 5.63082 9.82227 5.62695C9.81463 5.63084 9.80687 5.63429 9.79883 5.6377ZM9.93457 5.53516C9.91124 5.56582 9.88273 5.59214 9.84863 5.61328C9.88277 5.5922 9.91121 5.56576 9.93457 5.53516ZM9.94434 5.52246C9.95363 5.50886 9.96171 5.4946 9.96875 5.47949C9.96172 5.4946 9.9536 5.50885 9.94434 5.52246ZM6.02637 5.23145C6.02118 5.24552 6.01733 5.26024 6.01367 5.27539C6.01734 5.26023 6.02118 5.24552 6.02637 5.23145ZM6.05566 5.17188C6.04766 5.18525 6.04049 5.19914 6.03418 5.21387C6.04049 5.19914 6.04765 5.18525 6.05566 5.17188ZM6.09961 5.11328C6.08938 5.124 6.08003 5.13538 6.07129 5.14746C6.08003 5.13538 6.08938 5.12399 6.09961 5.11328ZM6.14844 5.07129C6.13601 5.08003 6.12428 5.08938 6.11328 5.09961C6.12428 5.08938 6.13601 5.08003 6.14844 5.07129ZM6.23242 5.02637C6.21195 5.03382 6.19287 5.04334 6.1748 5.05371C6.19287 5.04335 6.21195 5.03382 6.23242 5.02637ZM6.1748 10.9453C6.19195 10.9552 6.21017 10.9635 6.22949 10.9707C6.21017 10.9635 6.19195 10.9552 6.1748 10.9453ZM6.30957 5.00684C6.28239 5.01136 6.25651 5.01759 6.23242 5.02637C6.25651 5.01759 6.28239 5.01136 6.30957 5.00684Z" fill="black"/>
 </svg>
diff --git a/assets/icons/zed_predict.svg b/assets/icons/zed_predict.svg
index 79fd8c8fc1..605a0584d5 100644
--- a/assets/icons/zed_predict.svg
+++ b/assets/icons/zed_predict.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 5L14 8L12 11" stroke="black" stroke-width="1.5"/>
-<path d="M10 6.5L11 8L10 9.5" stroke="black" stroke-width="1.5"/>
-<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
+<path d="M12 5L14 8L12 11" stroke="black" stroke-width="1.2"/>
+<path d="M10 6.5L11 8L10 9.5" stroke="black" stroke-width="1.2"/>
+<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/zed_predict_down.svg b/assets/icons/zed_predict_down.svg
index 4532ad7e26..79eef9b0b4 100644
--- a/assets/icons/zed_predict_down.svg
+++ b/assets/icons/zed_predict_down.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 9.33333L14.5 9.66667L12.5 11L10.5 9.66667L10 9.33333" stroke="black" stroke-width="1.5"/>
-<path d="M12.5 11V4.5" stroke="black" stroke-width="1.5"/>
-<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
+<path d="M15 9.33333L14.5 9.66667L12.5 11L10.5 9.66667L10 9.33333" stroke="black" stroke-width="1.2"/>
+<path d="M12.5 11V4.5" stroke="black" stroke-width="1.2"/>
+<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/zed_predict_error.svg b/assets/icons/zed_predict_error.svg
index b2dc339fe9..6f75326179 100644
--- a/assets/icons/zed_predict_error.svg
+++ b/assets/icons/zed_predict_error.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
-<path d="M14 8L10 12M14 12L10 8" stroke="black" stroke-width="1.5"/>
+<path opacity="0.6" d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
+<path d="M14 8L10 12M14 12L10 8" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/assets/icons/zed_predict_up.svg b/assets/icons/zed_predict_up.svg
index 61ec143022..f77001e4bd 100644
--- a/assets/icons/zed_predict_up.svg
+++ b/assets/icons/zed_predict_up.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 6.66667L10.5 6.33333L12.5 5L14.5 6.33333L15 6.66667" stroke="black" stroke-width="1.5"/>
-<path d="M12.5 11V5" stroke="black" stroke-width="1.5"/>
-<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
+<path d="M10 6.66667L10.5 6.33333L12.5 5L14.5 6.33333L15 6.66667" stroke="black" stroke-width="1.2"/>
+<path d="M12.5 11V5" stroke="black" stroke-width="1.2"/>
+<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
 </svg>
diff --git a/crates/icons/README.md b/crates/icons/README.md
index 71bc5c8545..e340a00277 100644
--- a/crates/icons/README.md
+++ b/crates/icons/README.md
@@ -6,7 +6,7 @@ Icons are a big part of Zed, and they're how we convey hundreds of actions witho
 When introducing a new icon, it's important to ensure consistency with the existing set, which follows these guidelines:
 
 1. The SVG view box should be 16x16.
-2. For outlined icons, use a 1.5px stroke width.
+2. For outlined icons, use a 1.2px stroke width.
 3. Not all icons are mathematically aligned; there's quite a bit of optical adjustment. However, try to keep the icon within an internal 12x12 bounding box as much as possible while ensuring proper visibility.
 4. Use the `filled` and `outlined` terminology when introducing icons that will have these two variants.
 5. Icons that are deeply contextual may have the feature context as their name prefix. For example, `ToolWeb`, `ReplPlay`, `DebugStepInto`, etc.

From 9cd13a35de2fb658fee3af30a4863333816828b8 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Sun, 17 Aug 2025 13:39:14 -0300
Subject: [PATCH 096/823] agent2: Experiment with new toolbar design (#36366)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs    | 72 ++++++++++++++-------------
 crates/agent_ui/src/thread_history.rs |  1 +
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 44d605af57..b01bf39728 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -65,8 +65,8 @@ use theme::ThemeSettings;
 use time::UtcOffset;
 use ui::utils::WithRemSize;
 use ui::{
-    Banner, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding, PopoverMenu,
-    PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
+    Banner, Callout, ContextMenu, ContextMenuEntry, Divider, ElevationIndex, KeyBinding,
+    PopoverMenu, PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -243,9 +243,9 @@ pub enum AgentType {
 impl AgentType {
     fn label(self) -> impl Into<SharedString> {
         match self {
-            Self::Zed | Self::TextThread => "Zed",
+            Self::Zed | Self::TextThread => "Zed Agent",
             Self::NativeAgent => "Agent 2",
-            Self::Gemini => "Gemini",
+            Self::Gemini => "Google Gemini",
             Self::ClaudeCode => "Claude Code",
         }
     }
@@ -1784,7 +1784,8 @@ impl AgentPanel {
                         .w_full()
                         .child(change_title_editor.clone())
                         .child(
-                            ui::IconButton::new("retry-summary-generation", IconName::RotateCcw)
+                            IconButton::new("retry-summary-generation", IconName::RotateCcw)
+                                .icon_size(IconSize::Small)
                                 .on_click({
                                     let active_thread = active_thread.clone();
                                     move |_, _window, cx| {
@@ -1836,7 +1837,8 @@ impl AgentPanel {
                         .w_full()
                         .child(title_editor.clone())
                         .child(
-                            ui::IconButton::new("retry-summary-generation", IconName::RotateCcw)
+                            IconButton::new("retry-summary-generation", IconName::RotateCcw)
+                                .icon_size(IconSize::Small)
                                 .on_click({
                                     let context_editor = context_editor.clone();
                                     move |_, _window, cx| {
@@ -1974,21 +1976,17 @@ impl AgentPanel {
             })
     }
 
-    fn render_recent_entries_menu(
-        &self,
-        icon: IconName,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
+    fn render_recent_entries_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
 
         PopoverMenu::new("agent-nav-menu")
             .trigger_with_tooltip(
-                IconButton::new("agent-nav-menu", icon).icon_size(IconSize::Small),
+                IconButton::new("agent-nav-menu", IconName::MenuAlt).icon_size(IconSize::Small),
                 {
                     let focus_handle = focus_handle.clone();
                     move |window, cx| {
                         Tooltip::for_action_in(
-                            "Toggle Panel Menu",
+                            "Toggle Recent Threads",
                             &ToggleNavigationMenu,
                             &focus_handle,
                             window,
@@ -2124,9 +2122,7 @@ impl AgentPanel {
                             .pl(DynamicSpacing::Base04.rems(cx))
                             .child(self.render_toolbar_back_button(cx))
                             .into_any_element(),
-                        _ => self
-                            .render_recent_entries_menu(IconName::MenuAlt, cx)
-                            .into_any_element(),
+                        _ => self.render_recent_entries_menu(cx).into_any_element(),
                     })
                     .child(self.render_title_view(window, cx)),
             )
@@ -2364,6 +2360,22 @@ impl AgentPanel {
                 }
             });
 
+        let selected_agent_label = self.selected_agent.label().into();
+        let selected_agent = div()
+            .id("selected_agent_icon")
+            .px(DynamicSpacing::Base02.rems(cx))
+            .child(Icon::new(self.selected_agent.icon()).color(Color::Muted))
+            .tooltip(move |window, cx| {
+                Tooltip::with_meta(
+                    selected_agent_label.clone(),
+                    None,
+                    "Selected Agent",
+                    window,
+                    cx,
+                )
+            })
+            .into_any_element();
+
         h_flex()
             .id("agent-panel-toolbar")
             .h(Tab::container_height(cx))
@@ -2377,26 +2389,17 @@ impl AgentPanel {
             .child(
                 h_flex()
                     .size_full()
-                    .gap(DynamicSpacing::Base08.rems(cx))
+                    .gap(DynamicSpacing::Base04.rems(cx))
+                    .pl(DynamicSpacing::Base04.rems(cx))
                     .child(match &self.active_view {
-                        ActiveView::History | ActiveView::Configuration => div()
-                            .pl(DynamicSpacing::Base04.rems(cx))
-                            .child(self.render_toolbar_back_button(cx))
-                            .into_any_element(),
+                        ActiveView::History | ActiveView::Configuration => {
+                            self.render_toolbar_back_button(cx).into_any_element()
+                        }
                         _ => h_flex()
-                            .h_full()
-                            .px(DynamicSpacing::Base04.rems(cx))
-                            .border_r_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(
-                                h_flex()
-                                    .px_0p5()
-                                    .gap_1p5()
-                                    .child(
-                                        Icon::new(self.selected_agent.icon()).color(Color::Muted),
-                                    )
-                                    .child(Label::new(self.selected_agent.label())),
-                            )
+                            .gap_1()
+                            .child(self.render_recent_entries_menu(cx))
+                            .child(Divider::vertical())
+                            .child(selected_agent)
                             .into_any_element(),
                     })
                     .child(self.render_title_view(window, cx)),
@@ -2415,7 +2418,6 @@ impl AgentPanel {
                             .border_l_1()
                             .border_color(cx.theme().colors().border)
                             .child(new_thread_menu)
-                            .child(self.render_recent_entries_menu(IconName::HistoryRerun, cx))
                             .child(self.render_panel_options_menu(window, cx)),
                     ),
             )
diff --git a/crates/agent_ui/src/thread_history.rs b/crates/agent_ui/src/thread_history.rs
index b8d1db88d6..66afe2c2c5 100644
--- a/crates/agent_ui/src/thread_history.rs
+++ b/crates/agent_ui/src/thread_history.rs
@@ -541,6 +541,7 @@ impl Render for ThreadHistory {
         v_flex()
             .key_context("ThreadHistory")
             .size_full()
+            .bg(cx.theme().colors().panel_background)
             .on_action(cx.listener(Self::select_previous))
             .on_action(cx.listener(Self::select_next))
             .on_action(cx.listener(Self::select_first))

From 46a2d8d95aad9e0070f683050703bec384f2fec4 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Sun, 17 Aug 2025 14:03:58 -0300
Subject: [PATCH 097/823] git: Refine clone repo modal design (#36369)

Release Notes:

- N/A
---
 crates/git_ui/src/git_ui.rs                  | 87 +++++++++-----------
 crates/recent_projects/src/remote_servers.rs |  7 +-
 2 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index 79aa4a6bd0..3b4196b8ec 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -3,7 +3,7 @@ use std::any::Any;
 use ::settings::Settings;
 use command_palette_hooks::CommandPaletteFilter;
 use commit_modal::CommitModal;
-use editor::{Editor, EditorElement, EditorStyle, actions::DiffClipboardWithSelectionData};
+use editor::{Editor, actions::DiffClipboardWithSelectionData};
 mod blame_ui;
 use git::{
     repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus},
@@ -11,12 +11,11 @@ use git::{
 };
 use git_panel_settings::GitPanelSettings;
 use gpui::{
-    Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, TextStyle,
-    Window, actions,
+    Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Window,
+    actions,
 };
 use onboarding::GitOnboardingModal;
 use project_diff::ProjectDiff;
-use theme::ThemeSettings;
 use ui::prelude::*;
 use workspace::{ModalView, Workspace};
 use zed_actions;
@@ -637,7 +636,7 @@ impl GitCloneModal {
     pub fn show(panel: Entity<GitPanel>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let repo_input = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Enter repository", cx);
+            editor.set_placeholder_text("Enter repository URL…", cx);
             editor
         });
         let focus_handle = repo_input.focus_handle(cx);
@@ -650,46 +649,6 @@ impl GitCloneModal {
             focus_handle,
         }
     }
-
-    fn render_editor(&self, window: &Window, cx: &App) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let theme = cx.theme();
-
-        let text_style = TextStyle {
-            color: cx.theme().colors().text,
-            font_family: settings.buffer_font.family.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(settings.buffer_line_height.value()),
-            background_color: Some(theme.colors().editor_background),
-            ..Default::default()
-        };
-
-        let element = EditorElement::new(
-            &self.repo_input,
-            EditorStyle {
-                background: theme.colors().editor_background,
-                local_player: theme.players().local(),
-                text: text_style,
-                ..Default::default()
-            },
-        );
-
-        div()
-            .rounded_md()
-            .p_1()
-            .border_1()
-            .border_color(theme.colors().border_variant)
-            .when(
-                self.repo_input
-                    .focus_handle(cx)
-                    .contains_focused(window, cx),
-                |this| this.border_color(theme.colors().border_focused),
-            )
-            .child(element)
-            .bg(theme.colors().editor_background)
-    }
 }
 
 impl Focusable for GitCloneModal {
@@ -699,12 +658,42 @@ impl Focusable for GitCloneModal {
 }
 
 impl Render for GitCloneModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         div()
-            .size_full()
-            .w(rems(34.))
             .elevation_3(cx)
-            .child(self.render_editor(window, cx))
+            .w(rems(34.))
+            .flex_1()
+            .overflow_hidden()
+            .child(
+                div()
+                    .w_full()
+                    .p_2()
+                    .border_b_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .child(self.repo_input.clone()),
+            )
+            .child(
+                h_flex()
+                    .w_full()
+                    .p_2()
+                    .gap_0p5()
+                    .rounded_b_sm()
+                    .bg(cx.theme().colors().editor_background)
+                    .child(
+                        Label::new("Clone a repository from GitHub or other sources.")
+                            .color(Color::Muted)
+                            .size(LabelSize::Small),
+                    )
+                    .child(
+                        Button::new("learn-more", "Learn More")
+                            .label_size(LabelSize::Small)
+                            .icon(IconName::ArrowUpRight)
+                            .icon_size(IconSize::XSmall)
+                            .on_click(|_, _, cx| {
+                                cx.open_url("https://github.com/git-guides/git-clone");
+                            }),
+                    ),
+            )
             .on_action(cx.listener(|_, _: &menu::Cancel, _, cx| {
                 cx.emit(DismissEvent);
             }))
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index e5e166cb4c..81259c1aac 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1094,11 +1094,10 @@ impl RemoteServerProjects {
                                         .size(LabelSize::Small),
                                     )
                                     .child(
-                                        Button::new("learn-more", "Learn more…")
+                                        Button::new("learn-more", "Learn More")
                                             .label_size(LabelSize::Small)
-                                            .size(ButtonSize::None)
-                                            .color(Color::Accent)
-                                            .style(ButtonStyle::Transparent)
+                                            .icon(IconName::ArrowUpRight)
+                                            .icon_size(IconSize::XSmall)
                                             .on_click(|_, _, cx| {
                                                 cx.open_url(
                                                     "https://zed.dev/docs/remote-development",

From 8282b9cf000d3636fd69d29a00260edb6edecd63 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Sun, 17 Aug 2025 14:27:42 -0300
Subject: [PATCH 098/823] project panel: Add git clone action to empty state
 (#36371)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR adds the git clone action to the project panel. It also changes
the "open" button to open a folder instead of the recent projects modal,
which feels faster to start with, more intuitive, and also consistent
with VS Code (which I think is good in this specific case).

<img width="500" height="1334" alt="CleanShot 2025-08-17 at 2  10 01@2x"
src="https://github.com/user-attachments/assets/ff953228-9e8e-413b-89ba-fa0870a0df17"
/>

Release Notes:

- Improved the project panel empty state by including the git clone
action and allowing users to quickly open a local folder.
---
 crates/onboarding/src/welcome.rs          |  2 +-
 crates/project_panel/src/project_panel.rs | 41 ++++++++++++++++++-----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/crates/onboarding/src/welcome.rs b/crates/onboarding/src/welcome.rs
index ba0053a3b6..610f6a98e3 100644
--- a/crates/onboarding/src/welcome.rs
+++ b/crates/onboarding/src/welcome.rs
@@ -37,7 +37,7 @@ const CONTENT: (Section<4>, Section<3>) = (
             },
             SectionEntry {
                 icon: IconName::CloudDownload,
-                title: "Clone a Repo",
+                title: "Clone Repository",
                 action: &git::Clone,
             },
             SectionEntry {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 4d7f2faf62..d5ddd89419 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -57,9 +57,9 @@ use std::{
 };
 use theme::ThemeSettings;
 use ui::{
-    Color, ContextMenu, DecoratedIcon, Icon, IconDecoration, IconDecorationKind, IndentGuideColors,
-    IndentGuideLayout, KeyBinding, Label, LabelSize, ListItem, ListItemSpacing, ScrollableHandle,
-    Scrollbar, ScrollbarState, StickyCandidate, Tooltip, prelude::*, v_flex,
+    Color, ContextMenu, DecoratedIcon, Divider, Icon, IconDecoration, IconDecorationKind,
+    IndentGuideColors, IndentGuideLayout, KeyBinding, Label, LabelSize, ListItem, ListItemSpacing,
+    ScrollableHandle, Scrollbar, ScrollbarState, StickyCandidate, Tooltip, prelude::*, v_flex,
 };
 use util::{ResultExt, TakeUntilExt, TryFutureExt, maybe, paths::compare_paths};
 use workspace::{
@@ -69,7 +69,6 @@ use workspace::{
     notifications::{DetachAndPromptErr, NotifyTaskExt},
 };
 use worktree::CreatedEntry;
-use zed_actions::OpenRecent;
 
 const PROJECT_PANEL_KEY: &str = "ProjectPanel";
 const NEW_ENTRY_ID: ProjectEntryId = ProjectEntryId::MAX;
@@ -5521,24 +5520,48 @@ impl Render for ProjectPanel {
                     .with_priority(3)
                 }))
         } else {
+            let focus_handle = self.focus_handle(cx).clone();
+
             v_flex()
                 .id("empty-project_panel")
-                .size_full()
                 .p_4()
+                .size_full()
+                .items_center()
+                .justify_center()
+                .gap_1()
                 .track_focus(&self.focus_handle(cx))
                 .child(
-                    Button::new("open_project", "Open a project")
+                    Button::new("open_project", "Open Project")
                         .full_width()
                         .key_binding(KeyBinding::for_action_in(
-                            &OpenRecent::default(),
-                            &self.focus_handle,
+                            &workspace::Open,
+                            &focus_handle,
                             window,
                             cx,
                         ))
                         .on_click(cx.listener(|this, _, window, cx| {
                             this.workspace
                                 .update(cx, |_, cx| {
-                                    window.dispatch_action(OpenRecent::default().boxed_clone(), cx);
+                                    window.dispatch_action(workspace::Open.boxed_clone(), cx);
+                                })
+                                .log_err();
+                        })),
+                )
+                .child(
+                    h_flex()
+                        .w_1_2()
+                        .gap_2()
+                        .child(Divider::horizontal())
+                        .child(Label::new("or").size(LabelSize::XSmall).color(Color::Muted))
+                        .child(Divider::horizontal()),
+                )
+                .child(
+                    Button::new("clone_repo", "Clone Repository")
+                        .full_width()
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            this.workspace
+                                .update(cx, |_, cx| {
+                                    window.dispatch_action(git::Clone.boxed_clone(), cx);
                                 })
                                 .log_err();
                         })),

From 2dbc951058fe0b2325bca2452da330f2bafa34d7 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sun, 17 Aug 2025 16:38:07 -0400
Subject: [PATCH 099/823] agent2: Start loading mentioned threads and text
 threads as soon as they're added (#36374)

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/agent_ui/src/acp/message_editor.rs | 300 ++++++++++++++++------
 1 file changed, 217 insertions(+), 83 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index f6fee3b87e..12766ef458 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -207,11 +207,13 @@ impl MessageEditor {
                     cx,
                 );
             }
-            MentionUri::Symbol { .. }
-            | MentionUri::Thread { .. }
-            | MentionUri::TextThread { .. }
-            | MentionUri::Rule { .. }
-            | MentionUri::Selection { .. } => {
+            MentionUri::Thread { id, name } => {
+                self.confirm_mention_for_thread(crease_id, anchor, id, name, window, cx);
+            }
+            MentionUri::TextThread { path, name } => {
+                self.confirm_mention_for_text_thread(crease_id, anchor, path, name, window, cx);
+            }
+            MentionUri::Symbol { .. } | MentionUri::Rule { .. } | MentionUri::Selection { .. } => {
                 self.mention_set.insert_uri(crease_id, mention_uri.clone());
             }
         }
@@ -363,13 +365,9 @@ impl MessageEditor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<Vec<acp::ContentBlock>>> {
-        let contents = self.mention_set.contents(
-            self.project.clone(),
-            self.thread_store.clone(),
-            self.text_thread_store.clone(),
-            window,
-            cx,
-        );
+        let contents =
+            self.mention_set
+                .contents(self.project.clone(), self.thread_store.clone(), window, cx);
         let editor = self.editor.clone();
 
         cx.spawn(async move |_, cx| {
@@ -591,52 +589,154 @@ impl MessageEditor {
     ) {
         let editor = self.editor.clone();
         let task = cx
-            .spawn_in(window, async move |this, cx| {
-                let image = image.await.map_err(|e| e.to_string())?;
-                let format = image.format;
-                let image = cx
-                    .update(|_, cx| LanguageModelImage::from_image(image, cx))
-                    .map_err(|e| e.to_string())?
-                    .await;
-                if let Some(image) = image {
-                    if let Some(abs_path) = abs_path.clone() {
-                        this.update(cx, |this, _cx| {
-                            this.mention_set.insert_uri(
-                                crease_id,
-                                MentionUri::File {
-                                    abs_path,
-                                    is_directory: false,
-                                },
-                            );
+            .spawn_in(window, {
+                let abs_path = abs_path.clone();
+                async move |_, cx| {
+                    let image = image.await.map_err(|e| e.to_string())?;
+                    let format = image.format;
+                    let image = cx
+                        .update(|_, cx| LanguageModelImage::from_image(image, cx))
+                        .map_err(|e| e.to_string())?
+                        .await;
+                    if let Some(image) = image {
+                        Ok(MentionImage {
+                            abs_path,
+                            data: image.source,
+                            format,
                         })
-                        .map_err(|e| e.to_string())?;
+                    } else {
+                        Err("Failed to convert image".into())
                     }
-                    Ok(MentionImage {
-                        abs_path,
-                        data: image.source,
-                        format,
-                    })
-                } else {
-                    editor
-                        .update(cx, |editor, cx| {
-                            editor.display_map.update(cx, |display_map, cx| {
-                                display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                            });
-                            editor.remove_creases([crease_id], cx);
-                        })
-                        .ok();
-                    Err("Failed to convert image".to_string())
                 }
             })
             .shared();
 
-        cx.spawn_in(window, {
-            let task = task.clone();
-            async move |_, cx| task.clone().await.notify_async_err(cx)
+        self.mention_set.insert_image(crease_id, task.clone());
+
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_some() {
+                if let Some(abs_path) = abs_path.clone() {
+                    this.update(cx, |this, _cx| {
+                        this.mention_set.insert_uri(
+                            crease_id,
+                            MentionUri::File {
+                                abs_path,
+                                is_directory: false,
+                            },
+                        );
+                    })
+                    .ok();
+                }
+            } else {
+                editor
+                    .update(cx, |editor, cx| {
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    })
+                    .ok();
+            }
         })
         .detach();
+    }
 
-        self.mention_set.insert_image(crease_id, task);
+    fn confirm_mention_for_thread(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        id: ThreadId,
+        name: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let uri = MentionUri::Thread {
+            id: id.clone(),
+            name,
+        };
+        let open_task = self.thread_store.update(cx, |thread_store, cx| {
+            thread_store.open_thread(&id, window, cx)
+        });
+        let task = cx
+            .spawn(async move |_, cx| {
+                let thread = open_task.await.map_err(|e| e.to_string())?;
+                let content = thread
+                    .read_with(cx, |thread, _cx| thread.latest_detailed_summary_or_text())
+                    .map_err(|e| e.to_string())?;
+                Ok(content)
+            })
+            .shared();
+
+        self.mention_set.insert_thread(id, task.clone());
+
+        let editor = self.editor.clone();
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_some() {
+                this.update(cx, |this, _| {
+                    this.mention_set.insert_uri(crease_id, uri);
+                })
+                .ok();
+            } else {
+                editor
+                    .update(cx, |editor, cx| {
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    })
+                    .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn confirm_mention_for_text_thread(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        path: PathBuf,
+        name: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let uri = MentionUri::TextThread {
+            path: path.clone(),
+            name,
+        };
+        let context = self.text_thread_store.update(cx, |text_thread_store, cx| {
+            text_thread_store.open_local_context(path.as_path().into(), cx)
+        });
+        let task = cx
+            .spawn(async move |_, cx| {
+                let context = context.await.map_err(|e| e.to_string())?;
+                let xml = context
+                    .update(cx, |context, cx| context.to_xml(cx))
+                    .map_err(|e| e.to_string())?;
+                Ok(xml)
+            })
+            .shared();
+
+        self.mention_set.insert_text_thread(path, task.clone());
+
+        let editor = self.editor.clone();
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_some() {
+                this.update(cx, |this, _| {
+                    this.mention_set.insert_uri(crease_id, uri);
+                })
+                .ok();
+            } else {
+                editor
+                    .update(cx, |editor, cx| {
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    })
+                    .ok();
+            }
+        })
+        .detach();
     }
 
     pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
@@ -671,7 +771,7 @@ impl MessageEditor {
                         let start = text.len();
                         write!(&mut text, "{}", mention_uri.as_link()).ok();
                         let end = text.len();
-                        mentions.push((start..end, mention_uri));
+                        mentions.push((start..end, mention_uri, resource.text));
                     }
                 }
                 acp::ContentBlock::Image(content) => {
@@ -691,7 +791,7 @@ impl MessageEditor {
             editor.buffer().read(cx).snapshot(cx)
         });
 
-        for (range, mention_uri) in mentions {
+        for (range, mention_uri, text) in mentions {
             let anchor = snapshot.anchor_before(range.start);
             let crease_id = crate::context_picker::insert_crease_for_mention(
                 anchor.excerpt_id,
@@ -705,7 +805,26 @@ impl MessageEditor {
             );
 
             if let Some(crease_id) = crease_id {
-                self.mention_set.insert_uri(crease_id, mention_uri);
+                self.mention_set.insert_uri(crease_id, mention_uri.clone());
+            }
+
+            match mention_uri {
+                MentionUri::Thread { id, .. } => {
+                    self.mention_set
+                        .insert_thread(id, Task::ready(Ok(text.into())).shared());
+                }
+                MentionUri::TextThread { path, .. } => {
+                    self.mention_set
+                        .insert_text_thread(path, Task::ready(Ok(text)).shared());
+                }
+                MentionUri::Fetch { url } => {
+                    self.mention_set
+                        .add_fetch_result(url, Task::ready(Ok(text)).shared());
+                }
+                MentionUri::File { .. }
+                | MentionUri::Symbol { .. }
+                | MentionUri::Rule { .. }
+                | MentionUri::Selection { .. } => {}
             }
         }
         for (range, content) in images {
@@ -905,9 +1024,11 @@ pub struct MentionImage {
 
 #[derive(Default)]
 pub struct MentionSet {
-    pub(crate) uri_by_crease_id: HashMap<CreaseId, MentionUri>,
+    uri_by_crease_id: HashMap<CreaseId, MentionUri>,
     fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
     images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
+    thread_summaries: HashMap<ThreadId, Shared<Task<Result<SharedString, String>>>>,
+    text_thread_summaries: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
 }
 
 impl MentionSet {
@@ -927,8 +1048,18 @@ impl MentionSet {
         self.images.insert(crease_id, task);
     }
 
+    fn insert_thread(&mut self, id: ThreadId, task: Shared<Task<Result<SharedString, String>>>) {
+        self.thread_summaries.insert(id, task);
+    }
+
+    fn insert_text_thread(&mut self, path: PathBuf, task: Shared<Task<Result<String, String>>>) {
+        self.text_thread_summaries.insert(path, task);
+    }
+
     pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
         self.fetch_results.clear();
+        self.thread_summaries.clear();
+        self.text_thread_summaries.clear();
         self.uri_by_crease_id
             .drain()
             .map(|(id, _)| id)
@@ -939,8 +1070,7 @@ impl MentionSet {
         &self,
         project: Entity<Project>,
         thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
-        window: &mut Window,
+        _window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, Mention>>> {
         let mut processed_image_creases = HashSet::default();
@@ -1010,30 +1140,40 @@ impl MentionSet {
                             anyhow::Ok((crease_id, Mention::Text { uri, content }))
                         })
                     }
-                    MentionUri::Thread { id: thread_id, .. } => {
-                        let open_task = thread_store.update(cx, |thread_store, cx| {
-                            thread_store.open_thread(&thread_id, window, cx)
-                        });
-
+                    MentionUri::Thread { id, .. } => {
+                        let Some(content) = self.thread_summaries.get(id).cloned() else {
+                            return Task::ready(Err(anyhow!("missing thread summary")));
+                        };
                         let uri = uri.clone();
-                        cx.spawn(async move |cx| {
-                            let thread = open_task.await?;
-                            let content = thread.read_with(cx, |thread, _cx| {
-                                thread.latest_detailed_summary_or_text().to_string()
-                            })?;
-
-                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                        cx.spawn(async move |_| {
+                            Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content: content
+                                        .await
+                                        .map_err(|e| anyhow::anyhow!("{e}"))?
+                                        .to_string(),
+                                },
+                            ))
                         })
                     }
                     MentionUri::TextThread { path, .. } => {
-                        let context = text_thread_store.update(cx, |text_thread_store, cx| {
-                            text_thread_store.open_local_context(path.as_path().into(), cx)
-                        });
+                        let Some(content) = self.text_thread_summaries.get(path).cloned() else {
+                            return Task::ready(Err(anyhow!("missing text thread summary")));
+                        };
                         let uri = uri.clone();
-                        cx.spawn(async move |cx| {
-                            let context = context.await?;
-                            let xml = context.update(cx, |context, cx| context.to_xml(cx))?;
-                            anyhow::Ok((crease_id, Mention::Text { uri, content: xml }))
+                        cx.spawn(async move |_| {
+                            Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content: content
+                                        .await
+                                        .map_err(|e| anyhow::anyhow!("{e}"))?
+                                        .to_string(),
+                                },
+                            ))
                         })
                     }
                     MentionUri::Rule { id: prompt_id, .. } => {
@@ -1427,7 +1567,6 @@ mod tests {
                 message_editor.mention_set().contents(
                     project.clone(),
                     thread_store.clone(),
-                    text_thread_store.clone(),
                     window,
                     cx,
                 )
@@ -1495,7 +1634,6 @@ mod tests {
                 message_editor.mention_set().contents(
                     project.clone(),
                     thread_store.clone(),
-                    text_thread_store.clone(),
                     window,
                     cx,
                 )
@@ -1616,13 +1754,9 @@ mod tests {
 
         let contents = message_editor
             .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    project.clone(),
-                    thread_store,
-                    text_thread_store,
-                    window,
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(project.clone(), thread_store, window, cx)
             })
             .await
             .unwrap()

From 7dc4adbd4027b9b3ba80db589f93be25dcaaa64d Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Mon, 18 Aug 2025 08:16:17 +0530
Subject: [PATCH 100/823] gpui: Fix crash when starting Zed on macOS during
 texture creation (#36382)

Closes #36229

Fix zero-sized texture creation that triggers a SIGABRT in the Metal
renderer. Not sure why this happens yet, but it likely occurs when
`native_window.contentView()` returns a zero `NSSize` during initial
window creation, before the view size is computed.

Release Notes:

- Fixed a rare startup crash on macOS.
---
 crates/gpui/src/platform/mac/metal_renderer.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 629654014d..a686d8c45b 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -314,6 +314,15 @@ impl MetalRenderer {
     }
 
     fn update_path_intermediate_textures(&mut self, size: Size<DevicePixels>) {
+        // We are uncertain when this happens, but sometimes size can be 0 here. Most likely before
+        // the layout pass on window creation. Zero-sized texture creation causes SIGABRT.
+        // https://github.com/zed-industries/zed/issues/36229
+        if size.width.0 <= 0 || size.height.0 <= 0 {
+            self.path_intermediate_texture = None;
+            self.path_intermediate_msaa_texture = None;
+            return;
+        }
+
         let texture_descriptor = metal::TextureDescriptor::new();
         texture_descriptor.set_width(size.width.0 as u64);
         texture_descriptor.set_height(size.height.0 as u64);

From b3969ed427d44077595a329032969f35dc28c0fb Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 18 Aug 2025 06:07:32 +0200
Subject: [PATCH 101/823] Standardize on canceled instead of cancelled (#36385)

Release Notes:

- N/A
---
 Cargo.lock                            |  4 ++--
 Cargo.toml                            |  2 +-
 crates/acp_thread/src/acp_thread.rs   | 14 +++++++-------
 crates/agent/src/thread.rs            |  4 ++--
 crates/agent/src/tool_use.rs          |  6 +++---
 crates/agent_servers/src/acp/v1.rs    |  2 +-
 crates/agent_servers/src/claude.rs    | 17 ++++++++---------
 crates/agent_ui/src/active_thread.rs  |  2 +-
 crates/agent_ui/src/message_editor.rs |  6 +++---
 9 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4bf705eb9..a4f8c521a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab66add8be8d6a963f5bf4070045c1bbf36472837654c73e2298dd16bda5bf7"
+checksum = "160971bb53ca0b2e70ebc857c21e24eb448745f1396371015f4c59e9a9e51ed0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
diff --git a/Cargo.toml b/Cargo.toml
index b3105bd97c..14691cf8a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -423,7 +423,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.25"
+agent-client-protocol = "0.0.26"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index c1c634612b..fb31265326 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -360,7 +360,7 @@ pub enum ToolCallStatus {
     Failed,
     /// The user rejected the tool call.
     Rejected,
-    /// The user cancelled generation so the tool call was cancelled.
+    /// The user canceled generation so the tool call was canceled.
     Canceled,
 }
 
@@ -1269,19 +1269,19 @@ impl AcpThread {
                         Err(e)
                     }
                     result => {
-                        let cancelled = matches!(
+                        let canceled = matches!(
                             result,
                             Ok(Ok(acp::PromptResponse {
-                                stop_reason: acp::StopReason::Cancelled
+                                stop_reason: acp::StopReason::Canceled
                             }))
                         );
 
-                        // We only take the task if the current prompt wasn't cancelled.
+                        // We only take the task if the current prompt wasn't canceled.
                         //
-                        // This prompt may have been cancelled because another one was sent
+                        // This prompt may have been canceled because another one was sent
                         // while it was still generating. In these cases, dropping `send_task`
-                        // would cause the next generation to be cancelled.
-                        if !cancelled {
+                        // would cause the next generation to be canceled.
+                        if !canceled {
                             this.send_task.take();
                         }
 
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index f3f1088483..5491842185 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -5337,7 +5337,7 @@ fn main() {{
     }
 
     #[gpui::test]
-    async fn test_retry_cancelled_on_stop(cx: &mut TestAppContext) {
+    async fn test_retry_canceled_on_stop(cx: &mut TestAppContext) {
         init_test_settings(cx);
 
         let project = create_test_project(cx, json!({})).await;
@@ -5393,7 +5393,7 @@ fn main() {{
             "Should have no pending completions after cancellation"
         );
 
-        // Verify the retry was cancelled by checking retry state
+        // Verify the retry was canceled by checking retry state
         thread.read_with(cx, |thread, _| {
             if let Some(retry_state) = &thread.retry_state {
                 panic!(
diff --git a/crates/agent/src/tool_use.rs b/crates/agent/src/tool_use.rs
index 7392c0878d..74dfaf9a85 100644
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -137,7 +137,7 @@ impl ToolUseState {
     }
 
     pub fn cancel_pending(&mut self) -> Vec<PendingToolUse> {
-        let mut cancelled_tool_uses = Vec::new();
+        let mut canceled_tool_uses = Vec::new();
         self.pending_tool_uses_by_id
             .retain(|tool_use_id, tool_use| {
                 if matches!(tool_use.status, PendingToolUseStatus::Error { .. }) {
@@ -155,10 +155,10 @@ impl ToolUseState {
                         is_error: true,
                     },
                 );
-                cancelled_tool_uses.push(tool_use.clone());
+                canceled_tool_uses.push(tool_use.clone());
                 false
             });
-        cancelled_tool_uses
+        canceled_tool_uses
     }
 
     pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 506ae80886..b77b5ef36d 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -237,7 +237,7 @@ impl acp::Client for ClientDelegate {
 
         let outcome = match result {
             Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
-            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
+            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Canceled,
         };
 
         Ok(acp::RequestPermissionResponse { outcome })
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 4b3a173349..d15cc1dd89 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -285,7 +285,7 @@ impl AgentConnection for ClaudeAgentConnection {
 
         let turn_state = session.turn_state.take();
         let TurnState::InProgress { end_tx } = turn_state else {
-            // Already cancelled or idle, put it back
+            // Already canceled or idle, put it back
             session.turn_state.replace(turn_state);
             return;
         };
@@ -389,7 +389,7 @@ enum TurnState {
 }
 
 impl TurnState {
-    fn is_cancelled(&self) -> bool {
+    fn is_canceled(&self) -> bool {
         matches!(self, TurnState::CancelConfirmed { .. })
     }
 
@@ -439,7 +439,7 @@ impl ClaudeAgentSession {
                 for chunk in message.content.chunks() {
                     match chunk {
                         ContentChunk::Text { text } | ContentChunk::UntaggedText(text) => {
-                            if !turn_state.borrow().is_cancelled() {
+                            if !turn_state.borrow().is_canceled() {
                                 thread
                                     .update(cx, |thread, cx| {
                                         thread.push_user_content_block(None, text.into(), cx)
@@ -458,8 +458,8 @@ impl ClaudeAgentSession {
                                         acp::ToolCallUpdate {
                                             id: acp::ToolCallId(tool_use_id.into()),
                                             fields: acp::ToolCallUpdateFields {
-                                                status: if turn_state.borrow().is_cancelled() {
-                                                    // Do not set to completed if turn was cancelled
+                                                status: if turn_state.borrow().is_canceled() {
+                                                    // Do not set to completed if turn was canceled
                                                     None
                                                 } else {
                                                     Some(acp::ToolCallStatus::Completed)
@@ -592,14 +592,13 @@ impl ClaudeAgentSession {
                 ..
             } => {
                 let turn_state = turn_state.take();
-                let was_cancelled = turn_state.is_cancelled();
+                let was_canceled = turn_state.is_canceled();
                 let Some(end_turn_tx) = turn_state.end_tx() else {
                     debug_panic!("Received `SdkMessage::Result` but there wasn't an active turn");
                     return;
                 };
 
-                if is_error || (!was_cancelled && subtype == ResultErrorType::ErrorDuringExecution)
-                {
+                if is_error || (!was_canceled && subtype == ResultErrorType::ErrorDuringExecution) {
                     end_turn_tx
                         .send(Err(anyhow!(
                             "Error: {}",
@@ -610,7 +609,7 @@ impl ClaudeAgentSession {
                     let stop_reason = match subtype {
                         ResultErrorType::Success => acp::StopReason::EndTurn,
                         ResultErrorType::ErrorMaxTurns => acp::StopReason::MaxTurnRequests,
-                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Cancelled,
+                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Canceled,
                     };
                     end_turn_tx
                         .send(Ok(acp::PromptResponse { stop_reason }))
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index ffed62d41f..116c2b901b 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -4020,7 +4020,7 @@ mod tests {
 
         cx.run_until_parked();
 
-        // Verify that the previous completion was cancelled
+        // Verify that the previous completion was canceled
         assert_eq!(cancellation_events.lock().unwrap().len(), 1);
 
         // Verify that a new request was started after cancellation
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 127e9256be..d6c9a778a6 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -441,11 +441,11 @@ impl MessageEditor {
             thread.cancel_editing(cx);
         });
 
-        let cancelled = self.thread.update(cx, |thread, cx| {
+        let canceled = self.thread.update(cx, |thread, cx| {
             thread.cancel_last_completion(Some(window.window_handle()), cx)
         });
 
-        if cancelled {
+        if canceled {
             self.set_editor_is_expanded(false, cx);
             self.send_to_model(window, cx);
         }
@@ -1404,7 +1404,7 @@ impl MessageEditor {
             })
             .ok();
         });
-        // Replace existing load task, if any, causing it to be cancelled.
+        // Replace existing load task, if any, causing it to be canceled.
         let load_task = load_task.shared();
         self.load_context_task = Some(load_task.clone());
         cx.spawn(async move |this, cx| {

From ea828c0c597a00bd84941ca163dc1f063d14ae89 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Mon, 18 Aug 2025 09:58:30 +0200
Subject: [PATCH 102/823] agent2: Emit cancellation stop reason on cancel
 (#36381)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent2/src/tests/mod.rs |  66 +++++++++-
 crates/agent2/src/thread.rs    | 218 +++++++++++++++++++--------------
 2 files changed, 191 insertions(+), 93 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index cc8bd483bb..48a16bf685 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -941,7 +941,15 @@ async fn test_cancellation(cx: &mut TestAppContext) {
     // Cancel the current send and ensure that the event stream is closed, even
     // if one of the tools is still running.
     thread.update(cx, |thread, _cx| thread.cancel());
-    events.collect::<Vec<_>>().await;
+    let events = events.collect::<Vec<_>>().await;
+    let last_event = events.last();
+    assert!(
+        matches!(
+            last_event,
+            Some(Ok(AgentResponseEvent::Stop(acp::StopReason::Canceled)))
+        ),
+        "unexpected event {last_event:?}"
+    );
 
     // Ensure we can still send a new message after cancellation.
     let events = thread
@@ -965,6 +973,62 @@ async fn test_cancellation(cx: &mut TestAppContext) {
     assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
 }
 
+#[gpui::test]
+async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let events_1 = thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Hello 1"], cx)
+    });
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Hey 1!");
+    cx.run_until_parked();
+
+    let events_2 = thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Hello 2"], cx)
+    });
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Hey 2!");
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+
+    let events_1 = events_1.collect::<Vec<_>>().await;
+    assert_eq!(stop_events(events_1), vec![acp::StopReason::Canceled]);
+    let events_2 = events_2.collect::<Vec<_>>().await;
+    assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
+}
+
+#[gpui::test]
+async fn test_subsequent_successful_sends_dont_cancel(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let events_1 = thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Hello 1"], cx)
+    });
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Hey 1!");
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+    let events_1 = events_1.collect::<Vec<_>>().await;
+
+    let events_2 = thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Hello 2"], cx)
+    });
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Hey 2!");
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+    let events_2 = events_2.collect::<Vec<_>>().await;
+
+    assert_eq!(stop_events(events_1), vec![acp::StopReason::EndTurn]);
+    assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
+}
+
 #[gpui::test]
 async fn test_refusal(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 0741bb9e08..d8b6286f60 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -461,7 +461,7 @@ pub struct Thread {
     /// Holds the task that handles agent interaction until the end of the turn.
     /// Survives across multiple requests as the model performs tool calls and
     /// we run tools, report their results.
-    running_turn: Option<Task<()>>,
+    running_turn: Option<RunningTurn>,
     pending_message: Option<AgentMessage>,
     tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
     tool_use_limit_reached: bool,
@@ -554,8 +554,9 @@ impl Thread {
     }
 
     pub fn cancel(&mut self) {
-        // TODO: do we need to emit a stop::cancel for ACP?
-        self.running_turn.take();
+        if let Some(running_turn) = self.running_turn.take() {
+            running_turn.cancel();
+        }
         self.flush_pending_message();
     }
 
@@ -616,108 +617,118 @@ impl Thread {
         &mut self,
         cx: &mut Context<Self>,
     ) -> mpsc::UnboundedReceiver<Result<AgentResponseEvent>> {
+        self.cancel();
+
         let model = self.model.clone();
         let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
         let event_stream = AgentResponseEventStream(events_tx);
         let message_ix = self.messages.len().saturating_sub(1);
         self.tool_use_limit_reached = false;
-        self.running_turn = Some(cx.spawn(async move |this, cx| {
-            log::info!("Starting agent turn execution");
-            let turn_result: Result<()> = async {
-                let mut completion_intent = CompletionIntent::UserPrompt;
-                loop {
-                    log::debug!(
-                        "Building completion request with intent: {:?}",
-                        completion_intent
-                    );
-                    let request = this.update(cx, |this, cx| {
-                        this.build_completion_request(completion_intent, cx)
-                    })?;
+        self.running_turn = Some(RunningTurn {
+            event_stream: event_stream.clone(),
+            _task: cx.spawn(async move |this, cx| {
+                log::info!("Starting agent turn execution");
+                let turn_result: Result<()> = async {
+                    let mut completion_intent = CompletionIntent::UserPrompt;
+                    loop {
+                        log::debug!(
+                            "Building completion request with intent: {:?}",
+                            completion_intent
+                        );
+                        let request = this.update(cx, |this, cx| {
+                            this.build_completion_request(completion_intent, cx)
+                        })?;
 
-                    log::info!("Calling model.stream_completion");
-                    let mut events = model.stream_completion(request, cx).await?;
-                    log::debug!("Stream completion started successfully");
+                        log::info!("Calling model.stream_completion");
+                        let mut events = model.stream_completion(request, cx).await?;
+                        log::debug!("Stream completion started successfully");
 
-                    let mut tool_use_limit_reached = false;
-                    let mut tool_uses = FuturesUnordered::new();
-                    while let Some(event) = events.next().await {
-                        match event? {
-                            LanguageModelCompletionEvent::StatusUpdate(
-                                CompletionRequestStatus::ToolUseLimitReached,
-                            ) => {
-                                tool_use_limit_reached = true;
-                            }
-                            LanguageModelCompletionEvent::Stop(reason) => {
-                                event_stream.send_stop(reason);
-                                if reason == StopReason::Refusal {
-                                    this.update(cx, |this, _cx| {
-                                        this.flush_pending_message();
-                                        this.messages.truncate(message_ix);
-                                    })?;
-                                    return Ok(());
+                        let mut tool_use_limit_reached = false;
+                        let mut tool_uses = FuturesUnordered::new();
+                        while let Some(event) = events.next().await {
+                            match event? {
+                                LanguageModelCompletionEvent::StatusUpdate(
+                                    CompletionRequestStatus::ToolUseLimitReached,
+                                ) => {
+                                    tool_use_limit_reached = true;
+                                }
+                                LanguageModelCompletionEvent::Stop(reason) => {
+                                    event_stream.send_stop(reason);
+                                    if reason == StopReason::Refusal {
+                                        this.update(cx, |this, _cx| {
+                                            this.flush_pending_message();
+                                            this.messages.truncate(message_ix);
+                                        })?;
+                                        return Ok(());
+                                    }
+                                }
+                                event => {
+                                    log::trace!("Received completion event: {:?}", event);
+                                    this.update(cx, |this, cx| {
+                                        tool_uses.extend(this.handle_streamed_completion_event(
+                                            event,
+                                            &event_stream,
+                                            cx,
+                                        ));
+                                    })
+                                    .ok();
                                 }
                             }
-                            event => {
-                                log::trace!("Received completion event: {:?}", event);
-                                this.update(cx, |this, cx| {
-                                    tool_uses.extend(this.handle_streamed_completion_event(
-                                        event,
-                                        &event_stream,
-                                        cx,
-                                    ));
-                                })
-                                .ok();
-                            }
+                        }
+
+                        let used_tools = tool_uses.is_empty();
+                        while let Some(tool_result) = tool_uses.next().await {
+                            log::info!("Tool finished {:?}", tool_result);
+
+                            event_stream.update_tool_call_fields(
+                                &tool_result.tool_use_id,
+                                acp::ToolCallUpdateFields {
+                                    status: Some(if tool_result.is_error {
+                                        acp::ToolCallStatus::Failed
+                                    } else {
+                                        acp::ToolCallStatus::Completed
+                                    }),
+                                    raw_output: tool_result.output.clone(),
+                                    ..Default::default()
+                                },
+                            );
+                            this.update(cx, |this, _cx| {
+                                this.pending_message()
+                                    .tool_results
+                                    .insert(tool_result.tool_use_id.clone(), tool_result);
+                            })
+                            .ok();
+                        }
+
+                        if tool_use_limit_reached {
+                            log::info!("Tool use limit reached, completing turn");
+                            this.update(cx, |this, _cx| this.tool_use_limit_reached = true)?;
+                            return Err(language_model::ToolUseLimitReachedError.into());
+                        } else if used_tools {
+                            log::info!("No tool uses found, completing turn");
+                            return Ok(());
+                        } else {
+                            this.update(cx, |this, _| this.flush_pending_message())?;
+                            completion_intent = CompletionIntent::ToolResults;
                         }
                     }
-
-                    let used_tools = tool_uses.is_empty();
-                    while let Some(tool_result) = tool_uses.next().await {
-                        log::info!("Tool finished {:?}", tool_result);
-
-                        event_stream.update_tool_call_fields(
-                            &tool_result.tool_use_id,
-                            acp::ToolCallUpdateFields {
-                                status: Some(if tool_result.is_error {
-                                    acp::ToolCallStatus::Failed
-                                } else {
-                                    acp::ToolCallStatus::Completed
-                                }),
-                                raw_output: tool_result.output.clone(),
-                                ..Default::default()
-                            },
-                        );
-                        this.update(cx, |this, _cx| {
-                            this.pending_message()
-                                .tool_results
-                                .insert(tool_result.tool_use_id.clone(), tool_result);
-                        })
-                        .ok();
-                    }
-
-                    if tool_use_limit_reached {
-                        log::info!("Tool use limit reached, completing turn");
-                        this.update(cx, |this, _cx| this.tool_use_limit_reached = true)?;
-                        return Err(language_model::ToolUseLimitReachedError.into());
-                    } else if used_tools {
-                        log::info!("No tool uses found, completing turn");
-                        return Ok(());
-                    } else {
-                        this.update(cx, |this, _| this.flush_pending_message())?;
-                        completion_intent = CompletionIntent::ToolResults;
-                    }
                 }
-            }
-            .await;
+                .await;
 
-            this.update(cx, |this, _| this.flush_pending_message()).ok();
-            if let Err(error) = turn_result {
-                log::error!("Turn execution failed: {:?}", error);
-                event_stream.send_error(error);
-            } else {
-                log::info!("Turn execution completed successfully");
-            }
-        }));
+                if let Err(error) = turn_result {
+                    log::error!("Turn execution failed: {:?}", error);
+                    event_stream.send_error(error);
+                } else {
+                    log::info!("Turn execution completed successfully");
+                }
+
+                this.update(cx, |this, _| {
+                    this.flush_pending_message();
+                    this.running_turn.take();
+                })
+                .ok();
+            }),
+        });
         events_rx
     }
 
@@ -1125,6 +1136,23 @@ impl Thread {
     }
 }
 
+struct RunningTurn {
+    /// Holds the task that handles agent interaction until the end of the turn.
+    /// Survives across multiple requests as the model performs tool calls and
+    /// we run tools, report their results.
+    _task: Task<()>,
+    /// The current event stream for the running turn. Used to report a final
+    /// cancellation event if we cancel the turn.
+    event_stream: AgentResponseEventStream,
+}
+
+impl RunningTurn {
+    fn cancel(self) {
+        log::debug!("Cancelling in progress turn");
+        self.event_stream.send_canceled();
+    }
+}
+
 pub trait AgentTool
 where
     Self: 'static + Sized,
@@ -1336,6 +1364,12 @@ impl AgentResponseEventStream {
         }
     }
 
+    fn send_canceled(&self) {
+        self.0
+            .unbounded_send(Ok(AgentResponseEvent::Stop(acp::StopReason::Canceled)))
+            .ok();
+    }
+
     fn send_error(&self, error: impl Into<anyhow::Error>) {
         self.0.unbounded_send(Err(error.into())).ok();
     }

From 61ce07a91b06f3edf58d5fb7f76cdc1e79b6ae76 Mon Sep 17 00:00:00 2001
From: Cale Sennett <calesennett@users.noreply.github.com>
Date: Mon, 18 Aug 2025 03:36:52 -0500
Subject: [PATCH 103/823] Add capabilities to OpenAI-compatible model settings
 (#36370)

### TL;DR
* Adds `capabilities` configuration for OpenAI-compatible models
* Relates to
https://github.com/zed-industries/zed/issues/36215#issuecomment-3193920491

### Summary
This PR introduces support for configuring model capabilities for
OpenAI-compatible language models. The implementation addresses the
issue that not all OpenAI-compatible APIs support the same features -
for example, Cerebras' API explicitly does not support
`parallel_tool_calls` as documented in their [OpenAI compatibility
guide](https://inference-docs.cerebras.ai/resources/openai#currently-unsupported-openai-features).

### Changes

1. **Model Capabilities Structure**:
- Added `ModelCapabilityToggles` struct for UI representation with
boolean toggle states
- Implemented proper parsing of capability toggles into
`ModelCapabilities`

2. **UI Updates**:
- Modified the "Add LLM Provider" modal to include checkboxes for each
capability
- Each OpenAI-compatible model can now be configured with its specific
capabilities through the UI

3. **Configuration File Structure**:
- Updated the settings schema to support a `capabilities` object for
each `openai_compatible` model
- Each capability (`tools`, `images`, `parallel_tool_calls`,
`prompt_cache_key`) can be individually specified per model

### Example Configuration

```json
{
  "openai_compatible": {
    "Cerebras": {
      "api_url": "https://api.cerebras.ai/v1",
      "available_models": [
        {
          "name": "gpt-oss-120b",
          "max_tokens": 131000,
          "capabilities": {
            "tools": true,
            "images": false,
            "parallel_tool_calls": false,
            "prompt_cache_key": false
          }
        }
      ]
    }
  }
}
```

### Tests Added

- Added tests to verify default capability values are correctly applied
- Added tests to verify that deselected toggles are properly parsed as
`false`
- Added tests to verify that mixed capability selections work correctly

Thanks to @osyvokon for the desired `capabilities` configuration
structure!


Release Notes:

- OpenAI-compatible models now have configurable capabilities (#36370;
thanks @calesennett)

---------

Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>
---
 .../add_llm_provider_modal.rs                 | 168 +++++++++++++++++-
 .../src/provider/open_ai_compatible.rs        |  35 +++-
 docs/src/ai/llm-providers.md                  |  17 +-
 3 files changed, 208 insertions(+), 12 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
index 401a633488..c68c9c2730 100644
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
@@ -7,10 +7,12 @@ use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, T
 use language_model::LanguageModelRegistry;
 use language_models::{
     AllLanguageModelSettings, OpenAiCompatibleSettingsContent,
-    provider::open_ai_compatible::AvailableModel,
+    provider::open_ai_compatible::{AvailableModel, ModelCapabilities},
 };
 use settings::update_settings_file;
-use ui::{Banner, KeyBinding, Modal, ModalFooter, ModalHeader, Section, prelude::*};
+use ui::{
+    Banner, Checkbox, KeyBinding, Modal, ModalFooter, ModalHeader, Section, ToggleState, prelude::*,
+};
 use ui_input::SingleLineInput;
 use workspace::{ModalView, Workspace};
 
@@ -69,11 +71,19 @@ impl AddLlmProviderInput {
     }
 }
 
+struct ModelCapabilityToggles {
+    pub supports_tools: ToggleState,
+    pub supports_images: ToggleState,
+    pub supports_parallel_tool_calls: ToggleState,
+    pub supports_prompt_cache_key: ToggleState,
+}
+
 struct ModelInput {
     name: Entity<SingleLineInput>,
     max_completion_tokens: Entity<SingleLineInput>,
     max_output_tokens: Entity<SingleLineInput>,
     max_tokens: Entity<SingleLineInput>,
+    capabilities: ModelCapabilityToggles,
 }
 
 impl ModelInput {
@@ -100,11 +110,23 @@ impl ModelInput {
             cx,
         );
         let max_tokens = single_line_input("Max Tokens", "Max Tokens", Some("200000"), window, cx);
+        let ModelCapabilities {
+            tools,
+            images,
+            parallel_tool_calls,
+            prompt_cache_key,
+        } = ModelCapabilities::default();
         Self {
             name: model_name,
             max_completion_tokens,
             max_output_tokens,
             max_tokens,
+            capabilities: ModelCapabilityToggles {
+                supports_tools: tools.into(),
+                supports_images: images.into(),
+                supports_parallel_tool_calls: parallel_tool_calls.into(),
+                supports_prompt_cache_key: prompt_cache_key.into(),
+            },
         }
     }
 
@@ -136,6 +158,12 @@ impl ModelInput {
                 .text(cx)
                 .parse::<u64>()
                 .map_err(|_| SharedString::from("Max Tokens must be a number"))?,
+            capabilities: ModelCapabilities {
+                tools: self.capabilities.supports_tools.selected(),
+                images: self.capabilities.supports_images.selected(),
+                parallel_tool_calls: self.capabilities.supports_parallel_tool_calls.selected(),
+                prompt_cache_key: self.capabilities.supports_prompt_cache_key.selected(),
+            },
         })
     }
 }
@@ -322,6 +350,55 @@ impl AddLlmProviderModal {
                     .child(model.max_output_tokens.clone()),
             )
             .child(model.max_tokens.clone())
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        Checkbox::new(("supports-tools", ix), model.capabilities.supports_tools)
+                            .label("Supports tools")
+                            .on_click(cx.listener(move |this, checked, _window, cx| {
+                                this.input.models[ix].capabilities.supports_tools = *checked;
+                                cx.notify();
+                            })),
+                    )
+                    .child(
+                        Checkbox::new(("supports-images", ix), model.capabilities.supports_images)
+                            .label("Supports images")
+                            .on_click(cx.listener(move |this, checked, _window, cx| {
+                                this.input.models[ix].capabilities.supports_images = *checked;
+                                cx.notify();
+                            })),
+                    )
+                    .child(
+                        Checkbox::new(
+                            ("supports-parallel-tool-calls", ix),
+                            model.capabilities.supports_parallel_tool_calls,
+                        )
+                        .label("Supports parallel_tool_calls")
+                        .on_click(cx.listener(
+                            move |this, checked, _window, cx| {
+                                this.input.models[ix]
+                                    .capabilities
+                                    .supports_parallel_tool_calls = *checked;
+                                cx.notify();
+                            },
+                        )),
+                    )
+                    .child(
+                        Checkbox::new(
+                            ("supports-prompt-cache-key", ix),
+                            model.capabilities.supports_prompt_cache_key,
+                        )
+                        .label("Supports prompt_cache_key")
+                        .on_click(cx.listener(
+                            move |this, checked, _window, cx| {
+                                this.input.models[ix].capabilities.supports_prompt_cache_key =
+                                    *checked;
+                                cx.notify();
+                            },
+                        )),
+                    ),
+            )
             .when(has_more_than_one_model, |this| {
                 this.child(
                     Button::new(("remove-model", ix), "Remove Model")
@@ -562,6 +639,93 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_model_input_default_capabilities(cx: &mut TestAppContext) {
+        let cx = setup_test(cx).await;
+
+        cx.update(|window, cx| {
+            let model_input = ModelInput::new(window, cx);
+            model_input.name.update(cx, |input, cx| {
+                input.editor().update(cx, |editor, cx| {
+                    editor.set_text("somemodel", window, cx);
+                });
+            });
+            assert_eq!(
+                model_input.capabilities.supports_tools,
+                ToggleState::Selected
+            );
+            assert_eq!(
+                model_input.capabilities.supports_images,
+                ToggleState::Unselected
+            );
+            assert_eq!(
+                model_input.capabilities.supports_parallel_tool_calls,
+                ToggleState::Unselected
+            );
+            assert_eq!(
+                model_input.capabilities.supports_prompt_cache_key,
+                ToggleState::Unselected
+            );
+
+            let parsed_model = model_input.parse(cx).unwrap();
+            assert_eq!(parsed_model.capabilities.tools, true);
+            assert_eq!(parsed_model.capabilities.images, false);
+            assert_eq!(parsed_model.capabilities.parallel_tool_calls, false);
+            assert_eq!(parsed_model.capabilities.prompt_cache_key, false);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_model_input_deselected_capabilities(cx: &mut TestAppContext) {
+        let cx = setup_test(cx).await;
+
+        cx.update(|window, cx| {
+            let mut model_input = ModelInput::new(window, cx);
+            model_input.name.update(cx, |input, cx| {
+                input.editor().update(cx, |editor, cx| {
+                    editor.set_text("somemodel", window, cx);
+                });
+            });
+
+            model_input.capabilities.supports_tools = ToggleState::Unselected;
+            model_input.capabilities.supports_images = ToggleState::Unselected;
+            model_input.capabilities.supports_parallel_tool_calls = ToggleState::Unselected;
+            model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
+
+            let parsed_model = model_input.parse(cx).unwrap();
+            assert_eq!(parsed_model.capabilities.tools, false);
+            assert_eq!(parsed_model.capabilities.images, false);
+            assert_eq!(parsed_model.capabilities.parallel_tool_calls, false);
+            assert_eq!(parsed_model.capabilities.prompt_cache_key, false);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_model_input_with_name_and_capabilities(cx: &mut TestAppContext) {
+        let cx = setup_test(cx).await;
+
+        cx.update(|window, cx| {
+            let mut model_input = ModelInput::new(window, cx);
+            model_input.name.update(cx, |input, cx| {
+                input.editor().update(cx, |editor, cx| {
+                    editor.set_text("somemodel", window, cx);
+                });
+            });
+
+            model_input.capabilities.supports_tools = ToggleState::Selected;
+            model_input.capabilities.supports_images = ToggleState::Unselected;
+            model_input.capabilities.supports_parallel_tool_calls = ToggleState::Selected;
+            model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
+
+            let parsed_model = model_input.parse(cx).unwrap();
+            assert_eq!(parsed_model.name, "somemodel");
+            assert_eq!(parsed_model.capabilities.tools, true);
+            assert_eq!(parsed_model.capabilities.images, false);
+            assert_eq!(parsed_model.capabilities.parallel_tool_calls, true);
+            assert_eq!(parsed_model.capabilities.prompt_cache_key, false);
+        });
+    }
+
     async fn setup_test(cx: &mut TestAppContext) -> &mut VisualTestContext {
         cx.update(|cx| {
             let store = SettingsStore::test(cx);
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index 5f546f5219..e2d3adb198 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -38,6 +38,27 @@ pub struct AvailableModel {
     pub max_tokens: u64,
     pub max_output_tokens: Option<u64>,
     pub max_completion_tokens: Option<u64>,
+    #[serde(default)]
+    pub capabilities: ModelCapabilities,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema)]
+pub struct ModelCapabilities {
+    pub tools: bool,
+    pub images: bool,
+    pub parallel_tool_calls: bool,
+    pub prompt_cache_key: bool,
+}
+
+impl Default for ModelCapabilities {
+    fn default() -> Self {
+        Self {
+            tools: true,
+            images: false,
+            parallel_tool_calls: false,
+            prompt_cache_key: false,
+        }
+    }
 }
 
 pub struct OpenAiCompatibleLanguageModelProvider {
@@ -293,17 +314,17 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
     }
 
     fn supports_tools(&self) -> bool {
-        true
+        self.model.capabilities.tools
     }
 
     fn supports_images(&self) -> bool {
-        false
+        self.model.capabilities.images
     }
 
     fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
         match choice {
-            LanguageModelToolChoice::Auto => true,
-            LanguageModelToolChoice::Any => true,
+            LanguageModelToolChoice::Auto => self.model.capabilities.tools,
+            LanguageModelToolChoice::Any => self.model.capabilities.tools,
             LanguageModelToolChoice::None => true,
         }
     }
@@ -355,13 +376,11 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let supports_parallel_tool_call = true;
-        let supports_prompt_cache_key = false;
         let request = into_open_ai(
             request,
             &self.model.name,
-            supports_parallel_tool_call,
-            supports_prompt_cache_key,
+            self.model.capabilities.parallel_tool_calls,
+            self.model.capabilities.prompt_cache_key,
             self.max_output_tokens(),
             None,
         );
diff --git a/docs/src/ai/llm-providers.md b/docs/src/ai/llm-providers.md
index 58c9230760..5ef6081421 100644
--- a/docs/src/ai/llm-providers.md
+++ b/docs/src/ai/llm-providers.md
@@ -427,7 +427,7 @@ Custom models will be listed in the model dropdown in the Agent Panel.
 Zed supports using [OpenAI compatible APIs](https://platform.openai.com/docs/api-reference/chat) by specifying a custom `api_url` and `available_models` for the OpenAI provider.
 This is useful for connecting to other hosted services (like Together AI, Anyscale, etc.) or local models.
 
-You can add a custom, OpenAI-compatible model via either via the UI or by editing your `settings.json`.
+You can add a custom, OpenAI-compatible model either via the UI or by editing your `settings.json`.
 
 To do it via the UI, go to the Agent Panel settings (`agent: open settings`) and look for the "Add Provider" button to the right of the "LLM Providers" section title.
 Then, fill up the input fields available in the modal.
@@ -443,7 +443,13 @@ To do it via your `settings.json`, add the following snippet under `language_mod
         {
           "name": "mistralai/Mixtral-8x7B-Instruct-v0.1",
           "display_name": "Together Mixtral 8x7B",
-          "max_tokens": 32768
+          "max_tokens": 32768,
+          "capabilities": {
+            "tools": true,
+            "images": false,
+            "parallel_tool_calls": false,
+            "prompt_cache_key": false
+          }
         }
       ]
     }
@@ -451,6 +457,13 @@ To do it via your `settings.json`, add the following snippet under `language_mod
 }
 ```
 
+By default, OpenAI-compatible models inherit the following capabilities:
+
+- `tools`: true (supports tool/function calling)
+- `images`: false (does not support image inputs)
+- `parallel_tool_calls`: false (does not support `parallel_tool_calls` parameter)
+- `prompt_cache_key`: false (does not support `prompt_cache_key` parameter)
+
 Note that LLM API keys aren't stored in your settings file.
 So, ensure you have it set in your environment variables (`OPENAI_API_KEY=<your api key>`) so your settings can pick it up.
 

From 42ffa8900afaa6ec6bd954bdde08f1686d729019 Mon Sep 17 00:00:00 2001
From: Oleksiy Syvokon <oleksiy@zed.dev>
Date: Mon, 18 Aug 2025 11:54:31 +0300
Subject: [PATCH 104/823] open_ai: Fix error response parsing (#36390)

Closes #35925

Release Notes:

- Fixed OpenAI error response parsing in some cases
---
 crates/open_ai/src/open_ai.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 604e8fe622..1fb9a1342c 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -432,11 +432,16 @@ pub struct ChoiceDelta {
     pub finish_reason: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct OpenAiError {
+    message: String,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(untagged)]
 pub enum ResponseStreamResult {
     Ok(ResponseStreamEvent),
-    Err { error: String },
+    Err { error: OpenAiError },
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -475,7 +480,7 @@ pub async fn stream_completion(
                             match serde_json::from_str(line) {
                                 Ok(ResponseStreamResult::Ok(response)) => Some(Ok(response)),
                                 Ok(ResponseStreamResult::Err { error }) => {
-                                    Some(Err(anyhow!(error)))
+                                    Some(Err(anyhow!(error.message)))
                                 }
                                 Err(error) => {
                                     log::error!(
@@ -502,11 +507,6 @@ pub async fn stream_completion(
             error: OpenAiError,
         }
 
-        #[derive(Deserialize)]
-        struct OpenAiError {
-            message: String,
-        }
-
         match serde_json::from_str::<OpenAiResponse>(&body) {
             Ok(response) if !response.error.message.is_empty() => Err(anyhow!(
                 "API request to {} failed: {}",

From b8a106632fca78d6f07f88b003464e6573f90702 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 18 Aug 2025 11:43:52 +0200
Subject: [PATCH 105/823] lsp: Identify language servers by their configuration
 (#35270)

- **WIP: reorganize dispositions**
- **Introduce a LocalToolchainStore trait and use it for LspAdapter
methods**

Closes #35782
Closes #27331

Release Notes:

- Python: Improved propagation of a selected virtual environment into
the LSP configuration. This should the make all language-related
features such as Go to definition or Find all references more reliable.

---------

Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/editor/src/editor.rs                   |   46 +-
 crates/extension_host/src/extension_host.rs   |    1 +
 crates/extension_host/src/headless_host.rs    |    1 +
 .../src/wasm_host/wit/since_v0_6_0.rs         |    2 +-
 crates/language/src/buffer.rs                 |    1 +
 crates/language/src/language.rs               |   40 +-
 crates/language/src/language_registry.rs      |   12 +-
 crates/language/src/manifest.rs               |    6 +
 crates/language/src/toolchain.rs              |   33 +-
 .../src/extension_lsp_adapter.rs              |   10 +-
 .../src/language_extension.rs                 |    2 +-
 crates/languages/src/c.rs                     |    2 +-
 crates/languages/src/css.rs                   |    6 +-
 crates/languages/src/go.rs                    |    2 +-
 crates/languages/src/json.rs                  |   10 +-
 crates/languages/src/lib.rs                   |   11 +-
 crates/languages/src/python.rs                |   70 +-
 crates/languages/src/rust.rs                  |    6 +-
 crates/languages/src/tailwind.rs              |    6 +-
 crates/languages/src/typescript.rs            |    6 +-
 crates/languages/src/vtsls.rs                 |    6 +-
 crates/languages/src/yaml.rs                  |    8 +-
 crates/project/src/lsp_command.rs             |   26 +-
 crates/project/src/lsp_store.rs               | 1182 ++++++++---------
 crates/project/src/manifest_tree.rs           |  111 +-
 .../src/manifest_tree/manifest_store.rs       |   13 +-
 .../project/src/manifest_tree/server_tree.rs  |  386 +++---
 crates/project/src/project.rs                 |   18 +-
 crates/project/src/project_settings.rs        |    8 +-
 crates/project/src/project_tests.rs           |    7 +-
 crates/project/src/toolchain_store.rs         |   78 +-
 crates/remote_server/src/headless_project.rs  |    6 +-
 32 files changed, 1037 insertions(+), 1085 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 0111e91347..e645bfee67 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -16022,38 +16022,24 @@ impl Editor {
         cx.spawn_in(window, async move |editor, cx| {
             let location_task = editor.update(cx, |_, cx| {
                 project.update(cx, |project, cx| {
-                    let language_server_name = project
-                        .language_server_statuses(cx)
-                        .find(|(id, _)| server_id == *id)
-                        .map(|(_, status)| status.name.clone());
-                    language_server_name.map(|language_server_name| {
-                        project.open_local_buffer_via_lsp(
-                            lsp_location.uri.clone(),
-                            server_id,
-                            language_server_name,
-                            cx,
-                        )
-                    })
+                    project.open_local_buffer_via_lsp(lsp_location.uri.clone(), server_id, cx)
                 })
             })?;
-            let location = match location_task {
-                Some(task) => Some({
-                    let target_buffer_handle = task.await.context("open local buffer")?;
-                    let range = target_buffer_handle.read_with(cx, |target_buffer, _| {
-                        let target_start = target_buffer
-                            .clip_point_utf16(point_from_lsp(lsp_location.range.start), Bias::Left);
-                        let target_end = target_buffer
-                            .clip_point_utf16(point_from_lsp(lsp_location.range.end), Bias::Left);
-                        target_buffer.anchor_after(target_start)
-                            ..target_buffer.anchor_before(target_end)
-                    })?;
-                    Location {
-                        buffer: target_buffer_handle,
-                        range,
-                    }
-                }),
-                None => None,
-            };
+            let location = Some({
+                let target_buffer_handle = location_task.await.context("open local buffer")?;
+                let range = target_buffer_handle.read_with(cx, |target_buffer, _| {
+                    let target_start = target_buffer
+                        .clip_point_utf16(point_from_lsp(lsp_location.range.start), Bias::Left);
+                    let target_end = target_buffer
+                        .clip_point_utf16(point_from_lsp(lsp_location.range.end), Bias::Left);
+                    target_buffer.anchor_after(target_start)
+                        ..target_buffer.anchor_before(target_end)
+                })?;
+                Location {
+                    buffer: target_buffer_handle,
+                    range,
+                }
+            });
             Ok(location)
         })
     }
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 46deacfe69..e795fa5ac5 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -1275,6 +1275,7 @@ impl ExtensionStore {
                         queries,
                         context_provider,
                         toolchain_provider: None,
+                        manifest_name: None,
                     })
                 }),
             );
diff --git a/crates/extension_host/src/headless_host.rs b/crates/extension_host/src/headless_host.rs
index adc9638c29..8ce3847376 100644
--- a/crates/extension_host/src/headless_host.rs
+++ b/crates/extension_host/src/headless_host.rs
@@ -163,6 +163,7 @@ impl HeadlessExtensionStore {
                             queries: LanguageQueries::default(),
                             context_provider: None,
                             toolchain_provider: None,
+                            manifest_name: None,
                         })
                     }),
                 );
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
index 767b9033ad..84794d5386 100644
--- a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
@@ -938,7 +938,7 @@ impl ExtensionImports for WasmState {
                             binary: settings.binary.map(|binary| settings::CommandSettings {
                                 path: binary.path,
                                 arguments: binary.arguments,
-                                env: binary.env,
+                                env: binary.env.map(|env| env.into_iter().collect()),
                             }),
                             settings: settings.settings,
                             initialization_options: settings.initialization_options,
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 83517accc2..2080513f49 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1571,6 +1571,7 @@ impl Buffer {
             diagnostics: diagnostics.iter().cloned().collect(),
             lamport_timestamp,
         };
+
         self.apply_diagnostic_update(server_id, diagnostics, lamport_timestamp, cx);
         self.send_operation(op, true, cx);
     }
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index b9933dfcec..f299dee345 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -44,6 +44,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 use serde_json::Value;
 use settings::WorktreeId;
 use smol::future::FutureExt as _;
+use std::num::NonZeroU32;
 use std::{
     any::Any,
     ffi::OsStr,
@@ -59,7 +60,6 @@ use std::{
         atomic::{AtomicU64, AtomicUsize, Ordering::SeqCst},
     },
 };
-use std::{num::NonZeroU32, sync::OnceLock};
 use syntax_map::{QueryCursorHandle, SyntaxSnapshot};
 use task::RunnableTag;
 pub use task_context::{ContextLocation, ContextProvider, RunnableRange};
@@ -67,7 +67,9 @@ pub use text_diff::{
     DiffOptions, apply_diff_patch, line_diff, text_diff, text_diff_with_options, unified_diff,
 };
 use theme::SyntaxTheme;
-pub use toolchain::{LanguageToolchainStore, Toolchain, ToolchainList, ToolchainLister};
+pub use toolchain::{
+    LanguageToolchainStore, LocalLanguageToolchainStore, Toolchain, ToolchainList, ToolchainLister,
+};
 use tree_sitter::{self, Query, QueryCursor, WasmStore, wasmtime};
 use util::serde::default_true;
 
@@ -165,7 +167,6 @@ pub struct CachedLspAdapter {
     pub adapter: Arc<dyn LspAdapter>,
     pub reinstall_attempt_count: AtomicU64,
     cached_binary: futures::lock::Mutex<Option<LanguageServerBinary>>,
-    manifest_name: OnceLock<Option<ManifestName>>,
 }
 
 impl Debug for CachedLspAdapter {
@@ -201,7 +202,6 @@ impl CachedLspAdapter {
             adapter,
             cached_binary: Default::default(),
             reinstall_attempt_count: AtomicU64::new(0),
-            manifest_name: Default::default(),
         })
     }
 
@@ -212,7 +212,7 @@ impl CachedLspAdapter {
     pub async fn get_language_server_command(
         self: Arc<Self>,
         delegate: Arc<dyn LspAdapterDelegate>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
+        toolchains: Option<Toolchain>,
         binary_options: LanguageServerBinaryOptions,
         cx: &mut AsyncApp,
     ) -> Result<LanguageServerBinary> {
@@ -281,12 +281,6 @@ impl CachedLspAdapter {
             .cloned()
             .unwrap_or_else(|| language_name.lsp_id())
     }
-
-    pub fn manifest_name(&self) -> Option<ManifestName> {
-        self.manifest_name
-            .get_or_init(|| self.adapter.manifest_name())
-            .clone()
-    }
 }
 
 /// Determines what gets sent out as a workspace folders content
@@ -327,7 +321,7 @@ pub trait LspAdapter: 'static + Send + Sync {
     fn get_language_server_command<'a>(
         self: Arc<Self>,
         delegate: Arc<dyn LspAdapterDelegate>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
+        toolchains: Option<Toolchain>,
         binary_options: LanguageServerBinaryOptions,
         mut cached_binary: futures::lock::MutexGuard<'a, Option<LanguageServerBinary>>,
         cx: &'a mut AsyncApp,
@@ -402,7 +396,7 @@ pub trait LspAdapter: 'static + Send + Sync {
     async fn check_if_user_installed(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         None
@@ -535,7 +529,7 @@ pub trait LspAdapter: 'static + Send + Sync {
         self: Arc<Self>,
         _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _cx: &mut AsyncApp,
     ) -> Result<Value> {
         Ok(serde_json::json!({}))
@@ -555,7 +549,6 @@ pub trait LspAdapter: 'static + Send + Sync {
         _target_language_server_id: LanguageServerName,
         _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
         _cx: &mut AsyncApp,
     ) -> Result<Option<Value>> {
         Ok(None)
@@ -594,10 +587,6 @@ pub trait LspAdapter: 'static + Send + Sync {
         WorkspaceFoldersContent::SubprojectRoots
     }
 
-    fn manifest_name(&self) -> Option<ManifestName> {
-        None
-    }
-
     /// Method only implemented by the default JSON language server adapter.
     /// Used to provide dynamic reloading of the JSON schemas used to
     /// provide autocompletion and diagnostics in Zed setting and keybind
@@ -1108,6 +1097,7 @@ pub struct Language {
     pub(crate) grammar: Option<Arc<Grammar>>,
     pub(crate) context_provider: Option<Arc<dyn ContextProvider>>,
     pub(crate) toolchain: Option<Arc<dyn ToolchainLister>>,
+    pub(crate) manifest_name: Option<ManifestName>,
 }
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
@@ -1318,6 +1308,7 @@ impl Language {
             }),
             context_provider: None,
             toolchain: None,
+            manifest_name: None,
         }
     }
 
@@ -1331,6 +1322,10 @@ impl Language {
         self
     }
 
+    pub fn with_manifest(mut self, name: Option<ManifestName>) -> Self {
+        self.manifest_name = name;
+        self
+    }
     pub fn with_queries(mut self, queries: LanguageQueries) -> Result<Self> {
         if let Some(query) = queries.highlights {
             self = self
@@ -1764,6 +1759,9 @@ impl Language {
     pub fn name(&self) -> LanguageName {
         self.config.name.clone()
     }
+    pub fn manifest(&self) -> Option<&ManifestName> {
+        self.manifest_name.as_ref()
+    }
 
     pub fn code_fence_block_name(&self) -> Arc<str> {
         self.config
@@ -2209,7 +2207,7 @@ impl LspAdapter for FakeLspAdapter {
     async fn check_if_user_installed(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         Some(self.language_server_binary.clone())
@@ -2218,7 +2216,7 @@ impl LspAdapter for FakeLspAdapter {
     fn get_language_server_command<'a>(
         self: Arc<Self>,
         _: Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: LanguageServerBinaryOptions,
         _: futures::lock::MutexGuard<'a, Option<LanguageServerBinary>>,
         _: &'a mut AsyncApp,
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index ea988e8098..6a89b90462 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -1,6 +1,6 @@
 use crate::{
     CachedLspAdapter, File, Language, LanguageConfig, LanguageId, LanguageMatcher,
-    LanguageServerName, LspAdapter, PLAIN_TEXT, ToolchainLister,
+    LanguageServerName, LspAdapter, ManifestName, PLAIN_TEXT, ToolchainLister,
     language_settings::{
         AllLanguageSettingsContent, LanguageSettingsContent, all_language_settings,
     },
@@ -172,6 +172,7 @@ pub struct AvailableLanguage {
     hidden: bool,
     load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
     loaded: bool,
+    manifest_name: Option<ManifestName>,
 }
 
 impl AvailableLanguage {
@@ -259,6 +260,7 @@ pub struct LoadedLanguage {
     pub queries: LanguageQueries,
     pub context_provider: Option<Arc<dyn ContextProvider>>,
     pub toolchain_provider: Option<Arc<dyn ToolchainLister>>,
+    pub manifest_name: Option<ManifestName>,
 }
 
 impl LanguageRegistry {
@@ -349,12 +351,14 @@ impl LanguageRegistry {
             config.grammar.clone(),
             config.matcher.clone(),
             config.hidden,
+            None,
             Arc::new(move || {
                 Ok(LoadedLanguage {
                     config: config.clone(),
                     queries: Default::default(),
                     toolchain_provider: None,
                     context_provider: None,
+                    manifest_name: None,
                 })
             }),
         )
@@ -487,6 +491,7 @@ impl LanguageRegistry {
         grammar_name: Option<Arc<str>>,
         matcher: LanguageMatcher,
         hidden: bool,
+        manifest_name: Option<ManifestName>,
         load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
     ) {
         let state = &mut *self.state.write();
@@ -496,6 +501,7 @@ impl LanguageRegistry {
                 existing_language.grammar = grammar_name;
                 existing_language.matcher = matcher;
                 existing_language.load = load;
+                existing_language.manifest_name = manifest_name;
                 return;
             }
         }
@@ -508,6 +514,7 @@ impl LanguageRegistry {
             load,
             hidden,
             loaded: false,
+            manifest_name,
         });
         state.version += 1;
         state.reload_count += 1;
@@ -575,6 +582,7 @@ impl LanguageRegistry {
             grammar: language.config.grammar.clone(),
             matcher: language.config.matcher.clone(),
             hidden: language.config.hidden,
+            manifest_name: None,
             load: Arc::new(|| Err(anyhow!("already loaded"))),
             loaded: true,
         });
@@ -914,10 +922,12 @@ impl LanguageRegistry {
                                 Language::new_with_id(id, loaded_language.config, grammar)
                                     .with_context_provider(loaded_language.context_provider)
                                     .with_toolchain_lister(loaded_language.toolchain_provider)
+                                    .with_manifest(loaded_language.manifest_name)
                                     .with_queries(loaded_language.queries)
                             } else {
                                 Ok(Language::new_with_id(id, loaded_language.config, None)
                                     .with_context_provider(loaded_language.context_provider)
+                                    .with_manifest(loaded_language.manifest_name)
                                     .with_toolchain_lister(loaded_language.toolchain_provider))
                             }
                         }
diff --git a/crates/language/src/manifest.rs b/crates/language/src/manifest.rs
index 37505fec3b..3ca0ddf71d 100644
--- a/crates/language/src/manifest.rs
+++ b/crates/language/src/manifest.rs
@@ -12,6 +12,12 @@ impl Borrow<SharedString> for ManifestName {
     }
 }
 
+impl Borrow<str> for ManifestName {
+    fn borrow(&self) -> &str {
+        &self.0
+    }
+}
+
 impl From<SharedString> for ManifestName {
     fn from(value: SharedString) -> Self {
         Self(value)
diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
index 1f4b038f68..979513bc96 100644
--- a/crates/language/src/toolchain.rs
+++ b/crates/language/src/toolchain.rs
@@ -17,7 +17,7 @@ use settings::WorktreeId;
 use crate::{LanguageName, ManifestName};
 
 /// Represents a single toolchain.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Eq)]
 pub struct Toolchain {
     /// User-facing label
     pub name: SharedString,
@@ -27,6 +27,14 @@ pub struct Toolchain {
     pub as_json: serde_json::Value,
 }
 
+impl std::hash::Hash for Toolchain {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.name.hash(state);
+        self.path.hash(state);
+        self.language_name.hash(state);
+    }
+}
+
 impl PartialEq for Toolchain {
     fn eq(&self, other: &Self) -> bool {
         // Do not use as_json for comparisons; it shouldn't impact equality, as it's not user-surfaced.
@@ -64,6 +72,29 @@ pub trait LanguageToolchainStore: Send + Sync + 'static {
     ) -> Option<Toolchain>;
 }
 
+pub trait LocalLanguageToolchainStore: Send + Sync + 'static {
+    fn active_toolchain(
+        self: Arc<Self>,
+        worktree_id: WorktreeId,
+        relative_path: &Arc<Path>,
+        language_name: LanguageName,
+        cx: &mut AsyncApp,
+    ) -> Option<Toolchain>;
+}
+
+#[async_trait(?Send )]
+impl<T: LocalLanguageToolchainStore> LanguageToolchainStore for T {
+    async fn active_toolchain(
+        self: Arc<Self>,
+        worktree_id: WorktreeId,
+        relative_path: Arc<Path>,
+        language_name: LanguageName,
+        cx: &mut AsyncApp,
+    ) -> Option<Toolchain> {
+        self.active_toolchain(worktree_id, &relative_path, language_name, cx)
+    }
+}
+
 type DefaultIndex = usize;
 #[derive(Default, Clone)]
 pub struct ToolchainList {
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 98b6fd4b5a..e465a8dd0a 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -12,8 +12,8 @@ use fs::Fs;
 use futures::{Future, FutureExt, future::join_all};
 use gpui::{App, AppContext, AsyncApp, Task};
 use language::{
-    BinaryStatus, CodeLabel, HighlightId, Language, LanguageName, LanguageToolchainStore,
-    LspAdapter, LspAdapterDelegate,
+    BinaryStatus, CodeLabel, HighlightId, Language, LanguageName, LspAdapter, LspAdapterDelegate,
+    Toolchain,
 };
 use lsp::{
     CodeActionKind, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerName,
@@ -159,7 +159,7 @@ impl LspAdapter for ExtensionLspAdapter {
     fn get_language_server_command<'a>(
         self: Arc<Self>,
         delegate: Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: LanguageServerBinaryOptions,
         _: futures::lock::MutexGuard<'a, Option<LanguageServerBinary>>,
         _: &'a mut AsyncApp,
@@ -288,7 +288,7 @@ impl LspAdapter for ExtensionLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _cx: &mut AsyncApp,
     ) -> Result<Value> {
         let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
@@ -336,7 +336,7 @@ impl LspAdapter for ExtensionLspAdapter {
         target_language_server_id: LanguageServerName,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+
         _cx: &mut AsyncApp,
     ) -> Result<Option<serde_json::Value>> {
         let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
diff --git a/crates/language_extension/src/language_extension.rs b/crates/language_extension/src/language_extension.rs
index 1915eae2d1..7bca0eb485 100644
--- a/crates/language_extension/src/language_extension.rs
+++ b/crates/language_extension/src/language_extension.rs
@@ -52,7 +52,7 @@ impl ExtensionLanguageProxy for LanguageServerRegistryProxy {
         load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
     ) {
         self.language_registry
-            .register_language(language, grammar, matcher, hidden, load);
+            .register_language(language, grammar, matcher, hidden, None, load);
     }
 
     fn remove_languages(
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index aee1abee95..999d4a74c3 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -28,7 +28,7 @@ impl super::LspAdapter for CLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index ffd9006c76..a1a5418220 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -2,7 +2,7 @@ use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use futures::StreamExt;
 use gpui::AsyncApp;
-use language::{LanguageToolchainStore, LspAdapter, LspAdapterDelegate};
+use language::{LspAdapter, LspAdapterDelegate, Toolchain};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
@@ -43,7 +43,7 @@ impl LspAdapter for CssLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate
@@ -144,7 +144,7 @@ impl LspAdapter for CssLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<serde_json::Value> {
         let mut default_config = json!({
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 14f646133b..f739c5c4c6 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -75,7 +75,7 @@ impl super::LspAdapter for GoLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 484631d01f..4db48c67f0 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -8,8 +8,8 @@ use futures::StreamExt;
 use gpui::{App, AsyncApp, Task};
 use http_client::github::{GitHubLspBinaryVersion, latest_github_release};
 use language::{
-    ContextProvider, LanguageName, LanguageRegistry, LanguageToolchainStore, LocalFile as _,
-    LspAdapter, LspAdapterDelegate,
+    ContextProvider, LanguageName, LanguageRegistry, LocalFile as _, LspAdapter,
+    LspAdapterDelegate, Toolchain,
 };
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
@@ -303,7 +303,7 @@ impl LspAdapter for JsonLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate
@@ -404,7 +404,7 @@ impl LspAdapter for JsonLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
         let mut config = self.get_or_init_workspace_config(cx).await?;
@@ -529,7 +529,7 @@ impl LspAdapter for NodeVersionAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 195ba79e1d..e446f22713 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -1,6 +1,6 @@
 use anyhow::Context as _;
 use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
-use gpui::{App, UpdateGlobal};
+use gpui::{App, SharedString, UpdateGlobal};
 use node_runtime::NodeRuntime;
 use python::PyprojectTomlManifestProvider;
 use rust::CargoManifestProvider;
@@ -177,11 +177,13 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
             adapters: vec![python_lsp_adapter.clone(), py_lsp_adapter.clone()],
             context: Some(python_context_provider),
             toolchain: Some(python_toolchain_provider),
+            manifest_name: Some(SharedString::new_static("pyproject.toml").into()),
         },
         LanguageInfo {
             name: "rust",
             adapters: vec![rust_lsp_adapter],
             context: Some(rust_context_provider),
+            manifest_name: Some(SharedString::new_static("Cargo.toml").into()),
             ..Default::default()
         },
         LanguageInfo {
@@ -234,6 +236,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
             registration.adapters,
             registration.context,
             registration.toolchain,
+            registration.manifest_name,
         );
     }
 
@@ -340,7 +343,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         Arc::from(PyprojectTomlManifestProvider),
     ];
     for provider in manifest_providers {
-        project::ManifestProviders::global(cx).register(provider);
+        project::ManifestProvidersStore::global(cx).register(provider);
     }
 }
 
@@ -350,6 +353,7 @@ struct LanguageInfo {
     adapters: Vec<Arc<dyn LspAdapter>>,
     context: Option<Arc<dyn ContextProvider>>,
     toolchain: Option<Arc<dyn ToolchainLister>>,
+    manifest_name: Option<ManifestName>,
 }
 
 fn register_language(
@@ -358,6 +362,7 @@ fn register_language(
     adapters: Vec<Arc<dyn LspAdapter>>,
     context: Option<Arc<dyn ContextProvider>>,
     toolchain: Option<Arc<dyn ToolchainLister>>,
+    manifest_name: Option<ManifestName>,
 ) {
     let config = load_config(name);
     for adapter in adapters {
@@ -368,12 +373,14 @@ fn register_language(
         config.grammar.clone(),
         config.matcher.clone(),
         config.hidden,
+        manifest_name.clone(),
         Arc::new(move || {
             Ok(LoadedLanguage {
                 config: config.clone(),
                 queries: load_queries(name),
                 context_provider: context.clone(),
                 toolchain_provider: toolchain.clone(),
+                manifest_name: manifest_name.clone(),
             })
         }),
     );
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 40131089d1..b61ad2d36c 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -127,7 +127,7 @@ impl LspAdapter for PythonLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         if let Some(pyright_bin) = delegate.which("pyright-langserver".as_ref()).await {
@@ -319,17 +319,9 @@ impl LspAdapter for PythonLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         adapter: &Arc<dyn LspAdapterDelegate>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
+        toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
-        let toolchain = toolchains
-            .active_toolchain(
-                adapter.worktree_id(),
-                Arc::from("".as_ref()),
-                LanguageName::new("Python"),
-                cx,
-            )
-            .await;
         cx.update(move |cx| {
             let mut user_settings =
                 language_server_settings(adapter.as_ref(), &Self::SERVER_NAME, cx)
@@ -397,9 +389,7 @@ impl LspAdapter for PythonLspAdapter {
             user_settings
         })
     }
-    fn manifest_name(&self) -> Option<ManifestName> {
-        Some(SharedString::new_static("pyproject.toml").into())
-    }
+
     fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
         WorkspaceFoldersContent::WorktreeRoot
     }
@@ -1046,8 +1036,8 @@ impl LspAdapter for PyLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        toolchains: Arc<dyn LanguageToolchainStore>,
-        cx: &AsyncApp,
+        toolchain: Option<Toolchain>,
+        _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         if let Some(pylsp_bin) = delegate.which(Self::SERVER_NAME.as_ref()).await {
             let env = delegate.shell_env().await;
@@ -1057,14 +1047,7 @@ impl LspAdapter for PyLspAdapter {
                 arguments: vec![],
             })
         } else {
-            let venv = toolchains
-                .active_toolchain(
-                    delegate.worktree_id(),
-                    Arc::from("".as_ref()),
-                    LanguageName::new("Python"),
-                    &mut cx.clone(),
-                )
-                .await?;
+            let venv = toolchain?;
             let pylsp_path = Path::new(venv.path.as_ref()).parent()?.join("pylsp");
             pylsp_path.exists().then(|| LanguageServerBinary {
                 path: venv.path.to_string().into(),
@@ -1211,17 +1194,9 @@ impl LspAdapter for PyLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         adapter: &Arc<dyn LspAdapterDelegate>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
+        toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
-        let toolchain = toolchains
-            .active_toolchain(
-                adapter.worktree_id(),
-                Arc::from("".as_ref()),
-                LanguageName::new("Python"),
-                cx,
-            )
-            .await;
         cx.update(move |cx| {
             let mut user_settings =
                 language_server_settings(adapter.as_ref(), &Self::SERVER_NAME, cx)
@@ -1282,9 +1257,6 @@ impl LspAdapter for PyLspAdapter {
             user_settings
         })
     }
-    fn manifest_name(&self) -> Option<ManifestName> {
-        Some(SharedString::new_static("pyproject.toml").into())
-    }
     fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
         WorkspaceFoldersContent::WorktreeRoot
     }
@@ -1377,8 +1349,8 @@ impl LspAdapter for BasedPyrightLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        toolchains: Arc<dyn LanguageToolchainStore>,
-        cx: &AsyncApp,
+        toolchain: Option<Toolchain>,
+        _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         if let Some(bin) = delegate.which(Self::BINARY_NAME.as_ref()).await {
             let env = delegate.shell_env().await;
@@ -1388,15 +1360,7 @@ impl LspAdapter for BasedPyrightLspAdapter {
                 arguments: vec!["--stdio".into()],
             })
         } else {
-            let venv = toolchains
-                .active_toolchain(
-                    delegate.worktree_id(),
-                    Arc::from("".as_ref()),
-                    LanguageName::new("Python"),
-                    &mut cx.clone(),
-                )
-                .await?;
-            let path = Path::new(venv.path.as_ref())
+            let path = Path::new(toolchain?.path.as_ref())
                 .parent()?
                 .join(Self::BINARY_NAME);
             path.exists().then(|| LanguageServerBinary {
@@ -1543,17 +1507,9 @@ impl LspAdapter for BasedPyrightLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         adapter: &Arc<dyn LspAdapterDelegate>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
+        toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
-        let toolchain = toolchains
-            .active_toolchain(
-                adapter.worktree_id(),
-                Arc::from("".as_ref()),
-                LanguageName::new("Python"),
-                cx,
-            )
-            .await;
         cx.update(move |cx| {
             let mut user_settings =
                 language_server_settings(adapter.as_ref(), &Self::SERVER_NAME, cx)
@@ -1622,10 +1578,6 @@ impl LspAdapter for BasedPyrightLspAdapter {
         })
     }
 
-    fn manifest_name(&self) -> Option<ManifestName> {
-        Some(SharedString::new_static("pyproject.toml").into())
-    }
-
     fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
         WorkspaceFoldersContent::WorktreeRoot
     }
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 3baaec1842..3ef7c1ba34 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -109,14 +109,10 @@ impl LspAdapter for RustLspAdapter {
         SERVER_NAME.clone()
     }
 
-    fn manifest_name(&self) -> Option<ManifestName> {
-        Some(SharedString::new_static("Cargo.toml").into())
-    }
-
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate.which("rust-analyzer".as_ref()).await?;
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 0d647f07cf..27939c645c 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -3,7 +3,7 @@ use async_trait::async_trait;
 use collections::HashMap;
 use futures::StreamExt;
 use gpui::AsyncApp;
-use language::{LanguageName, LanguageToolchainStore, LspAdapter, LspAdapterDelegate};
+use language::{LanguageName, LspAdapter, LspAdapterDelegate, Toolchain};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
@@ -50,7 +50,7 @@ impl LspAdapter for TailwindLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
@@ -155,7 +155,7 @@ impl LspAdapter for TailwindLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
         let mut tailwind_user_settings = cx.update(|cx| {
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index 1877c86dc5..dec7df4060 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -7,7 +7,7 @@ use gpui::{App, AppContext, AsyncApp, Task};
 use http_client::github::{AssetKind, GitHubLspBinaryVersion, build_asset_url};
 use language::{
     ContextLocation, ContextProvider, File, LanguageName, LanguageToolchainStore, LspAdapter,
-    LspAdapterDelegate,
+    LspAdapterDelegate, Toolchain,
 };
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
@@ -722,7 +722,7 @@ impl LspAdapter for TypeScriptLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
         let override_options = cx.update(|cx| {
@@ -822,7 +822,7 @@ impl LspAdapter for EsLintLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
         let workspace_root = delegate.worktree_root_path();
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 90faf883ba..fd227e267d 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use async_trait::async_trait;
 use collections::HashMap;
 use gpui::AsyncApp;
-use language::{LanguageName, LanguageToolchainStore, LspAdapter, LspAdapterDelegate};
+use language::{LanguageName, LspAdapter, LspAdapterDelegate, Toolchain};
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
@@ -86,7 +86,7 @@ impl LspAdapter for VtslsLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let env = delegate.shell_env().await;
@@ -211,7 +211,7 @@ impl LspAdapter for VtslsLspAdapter {
         self: Arc<Self>,
         fs: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
         let tsdk_path = Self::tsdk_path(fs, delegate).await;
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index 15a4d590bc..137a9c2282 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -2,9 +2,7 @@ use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use futures::StreamExt;
 use gpui::AsyncApp;
-use language::{
-    LanguageToolchainStore, LspAdapter, LspAdapterDelegate, language_settings::AllLanguageSettings,
-};
+use language::{LspAdapter, LspAdapterDelegate, Toolchain, language_settings::AllLanguageSettings};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
@@ -57,7 +55,7 @@ impl LspAdapter for YamlLspAdapter {
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
@@ -135,7 +133,7 @@ impl LspAdapter for YamlLspAdapter {
         self: Arc<Self>,
         _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
         let location = SettingsLocation {
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index c458b6b300..fcfeb9c660 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -500,13 +500,12 @@ impl LspCommand for PerformRename {
         mut cx: AsyncApp,
     ) -> Result<ProjectTransaction> {
         if let Some(edit) = message {
-            let (lsp_adapter, lsp_server) =
+            let (_, lsp_server) =
                 language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
             LocalLspStore::deserialize_workspace_edit(
                 lsp_store,
                 edit,
                 self.push_to_history,
-                lsp_adapter,
                 lsp_server,
                 &mut cx,
             )
@@ -1116,18 +1115,12 @@ pub async fn location_links_from_lsp(
         }
     }
 
-    let (lsp_adapter, language_server) =
-        language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
+    let (_, language_server) = language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
     let mut definitions = Vec::new();
     for (origin_range, target_uri, target_range) in unresolved_links {
         let target_buffer_handle = lsp_store
             .update(&mut cx, |this, cx| {
-                this.open_local_buffer_via_lsp(
-                    target_uri,
-                    language_server.server_id(),
-                    lsp_adapter.name.clone(),
-                    cx,
-                )
+                this.open_local_buffer_via_lsp(target_uri, language_server.server_id(), cx)
             })?
             .await?;
 
@@ -1172,8 +1165,7 @@ pub async fn location_link_from_lsp(
     server_id: LanguageServerId,
     cx: &mut AsyncApp,
 ) -> Result<LocationLink> {
-    let (lsp_adapter, language_server) =
-        language_server_for_buffer(&lsp_store, &buffer, server_id, cx)?;
+    let (_, language_server) = language_server_for_buffer(&lsp_store, &buffer, server_id, cx)?;
 
     let (origin_range, target_uri, target_range) = (
         link.origin_selection_range,
@@ -1183,12 +1175,7 @@ pub async fn location_link_from_lsp(
 
     let target_buffer_handle = lsp_store
         .update(cx, |lsp_store, cx| {
-            lsp_store.open_local_buffer_via_lsp(
-                target_uri,
-                language_server.server_id(),
-                lsp_adapter.name.clone(),
-                cx,
-            )
+            lsp_store.open_local_buffer_via_lsp(target_uri, language_server.server_id(), cx)
         })?
         .await?;
 
@@ -1326,7 +1313,7 @@ impl LspCommand for GetReferences {
         mut cx: AsyncApp,
     ) -> Result<Vec<Location>> {
         let mut references = Vec::new();
-        let (lsp_adapter, language_server) =
+        let (_, language_server) =
             language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
 
         if let Some(locations) = locations {
@@ -1336,7 +1323,6 @@ impl LspCommand for GetReferences {
                         lsp_store.open_local_buffer_via_lsp(
                             lsp_location.uri,
                             language_server.server_id(),
-                            lsp_adapter.name.clone(),
                             cx,
                         )
                     })?
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 196f55171a..8ea41a100b 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1,3 +1,14 @@
+//! LSP store provides unified access to the language server protocol.
+//! The consumers of LSP store can interact with language servers without knowing exactly which language server they're interacting with.
+//!
+//! # Local/Remote LSP Stores
+//! This module is split up into three distinct parts:
+//! - [`LocalLspStore`], which is ran on the host machine (either project host or SSH host), that manages the lifecycle of language servers.
+//! - [`RemoteLspStore`], which is ran on the remote machine (project guests) which is mostly about passing through the requests via RPC.
+//!     The remote stores don't really care about which language server they're running against - they don't usually get to decide which language server is going to responsible for handling their request.
+//! - [`LspStore`], which unifies the two under one consistent interface for interacting with language servers.
+//!
+//! Most of the interesting work happens at the local layer, as bulk of the complexity is with managing the lifecycle of language servers. The actual implementation of the LSP protocol is handled by [`lsp`] crate.
 pub mod clangd_ext;
 pub mod json_language_server_ext;
 pub mod lsp_ext_command;
@@ -6,20 +17,20 @@ pub mod rust_analyzer_ext;
 use crate::{
     CodeAction, ColorPresentation, Completion, CompletionResponse, CompletionSource,
     CoreCompletion, DocumentColor, Hover, InlayHint, LocationLink, LspAction, LspPullDiagnostics,
-    ProjectItem, ProjectPath, ProjectTransaction, PulledDiagnostics, ResolveState, Symbol,
-    ToolchainStore,
+    ManifestProvidersStore, ProjectItem, ProjectPath, ProjectTransaction, PulledDiagnostics,
+    ResolveState, Symbol,
     buffer_store::{BufferStore, BufferStoreEvent},
     environment::ProjectEnvironment,
     lsp_command::{self, *},
     lsp_store,
     manifest_tree::{
-        AdapterQuery, LanguageServerTree, LanguageServerTreeNode, LaunchDisposition,
-        ManifestQueryDelegate, ManifestTree,
+        LanguageServerTree, LanguageServerTreeNode, LaunchDisposition, ManifestQueryDelegate,
+        ManifestTree,
     },
     prettier_store::{self, PrettierStore, PrettierStoreEvent},
     project_settings::{LspSettings, ProjectSettings},
     relativize_path, resolve_path,
-    toolchain_store::{EmptyToolchainStore, ToolchainStoreEvent},
+    toolchain_store::{LocalToolchainStore, ToolchainStoreEvent},
     worktree_store::{WorktreeStore, WorktreeStoreEvent},
     yarn::YarnPathStore,
 };
@@ -44,9 +55,9 @@ use itertools::Itertools as _;
 use language::{
     Bias, BinaryStatus, Buffer, BufferSnapshot, CachedLspAdapter, CodeLabel, Diagnostic,
     DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, Diff, File as _, Language, LanguageName,
-    LanguageRegistry, LanguageToolchainStore, LocalFile, LspAdapter, LspAdapterDelegate, Patch,
-    PointUtf16, TextBufferSnapshot, ToOffset, ToPointUtf16, Transaction, Unclipped,
-    WorkspaceFoldersContent,
+    LanguageRegistry, LocalFile, LspAdapter, LspAdapterDelegate, ManifestDelegate, ManifestName,
+    Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPointUtf16, Toolchain, Transaction,
+    Unclipped, WorkspaceFoldersContent,
     language_settings::{
         FormatOnSave, Formatter, LanguageSettings, SelectedFormatter, language_settings,
     },
@@ -140,6 +151,20 @@ impl FormatTrigger {
     }
 }
 
+#[derive(Clone)]
+struct UnifiedLanguageServer {
+    id: LanguageServerId,
+    project_roots: HashSet<Arc<Path>>,
+}
+
+#[derive(Clone, Hash, PartialEq, Eq)]
+struct LanguageServerSeed {
+    worktree_id: WorktreeId,
+    name: LanguageServerName,
+    toolchain: Option<Toolchain>,
+    settings: Arc<LspSettings>,
+}
+
 #[derive(Debug)]
 pub struct DocumentDiagnosticsUpdate<'a, D> {
     pub diagnostics: D,
@@ -157,17 +182,18 @@ pub struct DocumentDiagnostics {
 pub struct LocalLspStore {
     weak: WeakEntity<LspStore>,
     worktree_store: Entity<WorktreeStore>,
-    toolchain_store: Entity<ToolchainStore>,
+    toolchain_store: Entity<LocalToolchainStore>,
     http_client: Arc<dyn HttpClient>,
     environment: Entity<ProjectEnvironment>,
     fs: Arc<dyn Fs>,
     languages: Arc<LanguageRegistry>,
-    language_server_ids: HashMap<(WorktreeId, LanguageServerName), BTreeSet<LanguageServerId>>,
+    language_server_ids: HashMap<LanguageServerSeed, UnifiedLanguageServer>,
     yarn: Entity<YarnPathStore>,
     pub language_servers: HashMap<LanguageServerId, LanguageServerState>,
     buffers_being_formatted: HashSet<BufferId>,
     last_workspace_edits_by_language_server: HashMap<LanguageServerId, ProjectTransaction>,
     language_server_watched_paths: HashMap<LanguageServerId, LanguageServerWatchedPaths>,
+    watched_manifest_filenames: HashSet<ManifestName>,
     language_server_paths_watched_for_rename:
         HashMap<LanguageServerId, RenamePathsWatchedForServer>,
     language_server_watcher_registrations:
@@ -188,7 +214,7 @@ pub struct LocalLspStore {
     >,
     buffer_snapshots: HashMap<BufferId, HashMap<LanguageServerId, Vec<LspBufferSnapshot>>>, // buffer_id -> server_id -> vec of snapshots
     _subscription: gpui::Subscription,
-    lsp_tree: Entity<LanguageServerTree>,
+    lsp_tree: LanguageServerTree,
     registered_buffers: HashMap<BufferId, usize>,
     buffers_opened_in_servers: HashMap<BufferId, HashSet<LanguageServerId>>,
     buffer_pull_diagnostics_result_ids: HashMap<LanguageServerId, HashMap<PathBuf, Option<String>>>,
@@ -208,19 +234,63 @@ impl LocalLspStore {
         }
     }
 
+    fn get_or_insert_language_server(
+        &mut self,
+        worktree_handle: &Entity<Worktree>,
+        delegate: Arc<LocalLspAdapterDelegate>,
+        disposition: &Arc<LaunchDisposition>,
+        language_name: &LanguageName,
+        cx: &mut App,
+    ) -> LanguageServerId {
+        let key = LanguageServerSeed {
+            worktree_id: worktree_handle.read(cx).id(),
+            name: disposition.server_name.clone(),
+            settings: disposition.settings.clone(),
+            toolchain: disposition.toolchain.clone(),
+        };
+        if let Some(state) = self.language_server_ids.get_mut(&key) {
+            state.project_roots.insert(disposition.path.path.clone());
+            state.id
+        } else {
+            let adapter = self
+                .languages
+                .lsp_adapters(language_name)
+                .into_iter()
+                .find(|adapter| adapter.name() == disposition.server_name)
+                .expect("To find LSP adapter");
+            let new_language_server_id = self.start_language_server(
+                worktree_handle,
+                delegate,
+                adapter,
+                disposition.settings.clone(),
+                key.clone(),
+                cx,
+            );
+            if let Some(state) = self.language_server_ids.get_mut(&key) {
+                state.project_roots.insert(disposition.path.path.clone());
+            } else {
+                debug_assert!(
+                    false,
+                    "Expected `start_language_server` to ensure that `key` exists in a map"
+                );
+            }
+            new_language_server_id
+        }
+    }
+
     fn start_language_server(
         &mut self,
         worktree_handle: &Entity<Worktree>,
         delegate: Arc<LocalLspAdapterDelegate>,
         adapter: Arc<CachedLspAdapter>,
         settings: Arc<LspSettings>,
+        key: LanguageServerSeed,
         cx: &mut App,
     ) -> LanguageServerId {
         let worktree = worktree_handle.read(cx);
-        let worktree_id = worktree.id();
-        let root_path = worktree.abs_path();
-        let key = (worktree_id, adapter.name.clone());
 
+        let root_path = worktree.abs_path();
+        let toolchain = key.toolchain.clone();
         let override_options = settings.initialization_options.clone();
 
         let stderr_capture = Arc::new(Mutex::new(Some(String::new())));
@@ -231,7 +301,14 @@ impl LocalLspStore {
             adapter.name.0
         );
 
-        let binary = self.get_language_server_binary(adapter.clone(), delegate.clone(), true, cx);
+        let binary = self.get_language_server_binary(
+            adapter.clone(),
+            settings,
+            toolchain.clone(),
+            delegate.clone(),
+            true,
+            cx,
+        );
         let pending_workspace_folders: Arc<Mutex<BTreeSet<Url>>> = Default::default();
 
         let pending_server = cx.spawn({
@@ -290,15 +367,13 @@ impl LocalLspStore {
                 .enabled;
             cx.spawn(async move |cx| {
                 let result = async {
-                    let toolchains =
-                        lsp_store.update(cx, |lsp_store, cx| lsp_store.toolchain_store(cx))?;
                     let language_server = pending_server.await?;
 
                     let workspace_config = Self::workspace_configuration_for_adapter(
                         adapter.adapter.clone(),
                         fs.as_ref(),
                         &delegate,
-                        toolchains.clone(),
+                        toolchain,
                         cx,
                     )
                     .await?;
@@ -417,31 +492,26 @@ impl LocalLspStore {
         self.language_servers.insert(server_id, state);
         self.language_server_ids
             .entry(key)
-            .or_default()
-            .insert(server_id);
+            .or_insert(UnifiedLanguageServer {
+                id: server_id,
+                project_roots: Default::default(),
+            });
         server_id
     }
 
     fn get_language_server_binary(
         &self,
         adapter: Arc<CachedLspAdapter>,
+        settings: Arc<LspSettings>,
+        toolchain: Option<Toolchain>,
         delegate: Arc<dyn LspAdapterDelegate>,
         allow_binary_download: bool,
         cx: &mut App,
     ) -> Task<Result<LanguageServerBinary>> {
-        let settings = ProjectSettings::get(
-            Some(SettingsLocation {
-                worktree_id: delegate.worktree_id(),
-                path: Path::new(""),
-            }),
-            cx,
-        )
-        .lsp
-        .get(&adapter.name)
-        .and_then(|s| s.binary.clone());
-
-        if settings.as_ref().is_some_and(|b| b.path.is_some()) {
-            let settings = settings.unwrap();
+        if let Some(settings) = settings.binary.as_ref()
+            && settings.path.is_some()
+        {
+            let settings = settings.clone();
 
             return cx.background_spawn(async move {
                 let mut env = delegate.shell_env().await;
@@ -461,16 +531,17 @@ impl LocalLspStore {
         }
         let lsp_binary_options = LanguageServerBinaryOptions {
             allow_path_lookup: !settings
+                .binary
                 .as_ref()
                 .and_then(|b| b.ignore_system_version)
                 .unwrap_or_default(),
             allow_binary_download,
         };
-        let toolchains = self.toolchain_store.read(cx).as_language_toolchain_store();
+
         cx.spawn(async move |cx| {
             let binary_result = adapter
                 .clone()
-                .get_language_server_command(delegate.clone(), toolchains, lsp_binary_options, cx)
+                .get_language_server_command(delegate.clone(), toolchain, lsp_binary_options, cx)
                 .await;
 
             delegate.update_status(adapter.name.clone(), BinaryStatus::None);
@@ -480,12 +551,12 @@ impl LocalLspStore {
 
             shell_env.extend(binary.env.unwrap_or_default());
 
-            if let Some(settings) = settings {
-                if let Some(arguments) = settings.arguments {
+            if let Some(settings) = settings.binary.as_ref() {
+                if let Some(arguments) = &settings.arguments {
                     binary.arguments = arguments.into_iter().map(Into::into).collect();
                 }
-                if let Some(env) = settings.env {
-                    shell_env.extend(env);
+                if let Some(env) = &settings.env {
+                    shell_env.extend(env.iter().map(|(k, v)| (k.clone(), v.clone())));
                 }
             }
 
@@ -559,14 +630,20 @@ impl LocalLspStore {
                     let fs = fs.clone();
                     let mut cx = cx.clone();
                     async move {
-                        let toolchains =
-                            this.update(&mut cx, |this, cx| this.toolchain_store(cx))?;
-
+                        let toolchain_for_id = this
+                            .update(&mut cx, |this, _| {
+                                this.as_local()?.language_server_ids.iter().find_map(
+                                    |(seed, value)| {
+                                        (value.id == server_id).then(|| seed.toolchain.clone())
+                                    },
+                                )
+                            })?
+                            .context("Expected the LSP store to be in a local mode")?;
                         let workspace_config = Self::workspace_configuration_for_adapter(
                             adapter.clone(),
                             fs.as_ref(),
                             &delegate,
-                            toolchains.clone(),
+                            toolchain_for_id,
                             &mut cx,
                         )
                         .await?;
@@ -700,18 +777,15 @@ impl LocalLspStore {
 
         language_server
             .on_request::<lsp::request::ApplyWorkspaceEdit, _, _>({
-                let adapter = adapter.clone();
                 let this = this.clone();
                 move |params, cx| {
                     let mut cx = cx.clone();
                     let this = this.clone();
-                    let adapter = adapter.clone();
                     async move {
                         LocalLspStore::on_lsp_workspace_edit(
                             this.clone(),
                             params,
                             server_id,
-                            adapter.clone(),
                             &mut cx,
                         )
                         .await
@@ -960,19 +1034,18 @@ impl LocalLspStore {
     ) -> impl Iterator<Item = &Arc<LanguageServer>> {
         self.language_server_ids
             .iter()
-            .flat_map(move |((language_server_path, _), ids)| {
-                ids.iter().filter_map(move |id| {
-                    if *language_server_path != worktree_id {
-                        return None;
-                    }
-                    if let Some(LanguageServerState::Running { server, .. }) =
-                        self.language_servers.get(id)
-                    {
-                        return Some(server);
-                    } else {
-                        None
-                    }
-                })
+            .filter_map(move |(seed, state)| {
+                if seed.worktree_id != worktree_id {
+                    return None;
+                }
+
+                if let Some(LanguageServerState::Running { server, .. }) =
+                    self.language_servers.get(&state.id)
+                {
+                    return Some(server);
+                } else {
+                    None
+                }
             })
     }
 
@@ -989,17 +1062,18 @@ impl LocalLspStore {
         else {
             return Vec::new();
         };
-        let delegate = Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
-        let root = self.lsp_tree.update(cx, |this, cx| {
-            this.get(
+        let delegate: Arc<dyn ManifestDelegate> =
+            Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
+        let root = self
+            .lsp_tree
+            .get(
                 project_path,
-                AdapterQuery::Language(&language.name()),
-                delegate,
+                language.name(),
+                language.manifest(),
+                &delegate,
                 cx,
             )
-            .filter_map(|node| node.server_id())
-            .collect::<Vec<_>>()
-        });
+            .collect::<Vec<_>>();
 
         root
     }
@@ -1083,7 +1157,7 @@ impl LocalLspStore {
                         .collect::<Vec<_>>()
                 })
             })?;
-            for (lsp_adapter, language_server) in adapters_and_servers.iter() {
+            for (_, language_server) in adapters_and_servers.iter() {
                 let actions = Self::get_server_code_actions_from_action_kinds(
                     &lsp_store,
                     language_server.server_id(),
@@ -1095,7 +1169,6 @@ impl LocalLspStore {
                 Self::execute_code_actions_on_server(
                     &lsp_store,
                     language_server,
-                    lsp_adapter,
                     actions,
                     push_to_history,
                     &mut project_transaction,
@@ -2038,13 +2111,14 @@ impl LocalLspStore {
         let buffer = buffer_handle.read(cx);
 
         let file = buffer.file().cloned();
+
         let Some(file) = File::from_dyn(file.as_ref()) else {
             return;
         };
         if !file.is_local() {
             return;
         }
-
+        let path = ProjectPath::from_file(file, cx);
         let worktree_id = file.worktree_id(cx);
         let language = buffer.language().cloned();
 
@@ -2067,46 +2141,52 @@ impl LocalLspStore {
         let Some(language) = language else {
             return;
         };
-        for adapter in self.languages.lsp_adapters(&language.name()) {
-            let servers = self
-                .language_server_ids
-                .get(&(worktree_id, adapter.name.clone()));
-            if let Some(server_ids) = servers {
-                for server_id in server_ids {
-                    let server = self
-                        .language_servers
-                        .get(server_id)
-                        .and_then(|server_state| {
-                            if let LanguageServerState::Running { server, .. } = server_state {
-                                Some(server.clone())
-                            } else {
-                                None
-                            }
-                        });
-                    let server = match server {
-                        Some(server) => server,
-                        None => continue,
-                    };
+        let Some(snapshot) = self
+            .worktree_store
+            .read(cx)
+            .worktree_for_id(worktree_id, cx)
+            .map(|worktree| worktree.read(cx).snapshot())
+        else {
+            return;
+        };
+        let delegate: Arc<dyn ManifestDelegate> = Arc::new(ManifestQueryDelegate::new(snapshot));
 
-                    buffer_handle.update(cx, |buffer, cx| {
-                        buffer.set_completion_triggers(
-                            server.server_id(),
-                            server
-                                .capabilities()
-                                .completion_provider
+        for server_id in
+            self.lsp_tree
+                .get(path, language.name(), language.manifest(), &delegate, cx)
+        {
+            let server = self
+                .language_servers
+                .get(&server_id)
+                .and_then(|server_state| {
+                    if let LanguageServerState::Running { server, .. } = server_state {
+                        Some(server.clone())
+                    } else {
+                        None
+                    }
+                });
+            let server = match server {
+                Some(server) => server,
+                None => continue,
+            };
+
+            buffer_handle.update(cx, |buffer, cx| {
+                buffer.set_completion_triggers(
+                    server.server_id(),
+                    server
+                        .capabilities()
+                        .completion_provider
+                        .as_ref()
+                        .and_then(|provider| {
+                            provider
+                                .trigger_characters
                                 .as_ref()
-                                .and_then(|provider| {
-                                    provider
-                                        .trigger_characters
-                                        .as_ref()
-                                        .map(|characters| characters.iter().cloned().collect())
-                                })
-                                .unwrap_or_default(),
-                            cx,
-                        );
-                    });
-                }
-            }
+                                .map(|characters| characters.iter().cloned().collect())
+                        })
+                        .unwrap_or_default(),
+                    cx,
+                );
+            });
         }
     }
 
@@ -2216,6 +2296,31 @@ impl LocalLspStore {
         Ok(())
     }
 
+    fn register_language_server_for_invisible_worktree(
+        &mut self,
+        worktree: &Entity<Worktree>,
+        language_server_id: LanguageServerId,
+        cx: &mut App,
+    ) {
+        let worktree = worktree.read(cx);
+        let worktree_id = worktree.id();
+        debug_assert!(!worktree.is_visible());
+        let Some(mut origin_seed) = self
+            .language_server_ids
+            .iter()
+            .find_map(|(seed, state)| (state.id == language_server_id).then(|| seed.clone()))
+        else {
+            return;
+        };
+        origin_seed.worktree_id = worktree_id;
+        self.language_server_ids
+            .entry(origin_seed)
+            .or_insert_with(|| UnifiedLanguageServer {
+                id: language_server_id,
+                project_roots: Default::default(),
+            });
+    }
+
     fn register_buffer_with_language_servers(
         &mut self,
         buffer_handle: &Entity<Buffer>,
@@ -2256,27 +2361,23 @@ impl LocalLspStore {
         };
         let language_name = language.name();
         let (reused, delegate, servers) = self
-            .lsp_tree
-            .update(cx, |lsp_tree, cx| {
-                self.reuse_existing_language_server(lsp_tree, &worktree, &language_name, cx)
-            })
-            .map(|(delegate, servers)| (true, delegate, servers))
+            .reuse_existing_language_server(&self.lsp_tree, &worktree, &language_name, cx)
+            .map(|(delegate, apply)| (true, delegate, apply(&mut self.lsp_tree)))
             .unwrap_or_else(|| {
                 let lsp_delegate = LocalLspAdapterDelegate::from_local_lsp(self, &worktree, cx);
-                let delegate = Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
+                let delegate: Arc<dyn ManifestDelegate> =
+                    Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
+
                 let servers = self
                     .lsp_tree
-                    .clone()
-                    .update(cx, |language_server_tree, cx| {
-                        language_server_tree
-                            .get(
-                                ProjectPath { worktree_id, path },
-                                AdapterQuery::Language(&language.name()),
-                                delegate.clone(),
-                                cx,
-                            )
-                            .collect::<Vec<_>>()
-                    });
+                    .walk(
+                        ProjectPath { worktree_id, path },
+                        language.name(),
+                        language.manifest(),
+                        &delegate,
+                        cx,
+                    )
+                    .collect::<Vec<_>>();
                 (false, lsp_delegate, servers)
             });
         let servers_and_adapters = servers
@@ -2298,55 +2399,35 @@ impl LocalLspStore {
                     }
                 }
 
-                let server_id = server_node.server_id_or_init(
-                    |LaunchDisposition {
-                         server_name,
-                         path,
-                         settings,
-                     }| {
-                        let server_id =
-                           {
-                               let uri = Url::from_file_path(
-                                   worktree.read(cx).abs_path().join(&path.path),
-                               );
-                               let key = (worktree_id, server_name.clone());
-                               if !self.language_server_ids.contains_key(&key) {
-                                   let language_name = language.name();
-                                   let adapter = self.languages
-                                       .lsp_adapters(&language_name)
-                                       .into_iter()
-                                       .find(|adapter| &adapter.name() == server_name)
-                                       .expect("To find LSP adapter");
-                                   self.start_language_server(
-                                       &worktree,
-                                       delegate.clone(),
-                                       adapter,
-                                       settings,
-                                       cx,
-                                   );
-                               }
-                               if let Some(server_ids) = self
-                                   .language_server_ids
-                                   .get(&key)
-                               {
-                                   debug_assert_eq!(server_ids.len(), 1);
-                                   let server_id = server_ids.iter().cloned().next().unwrap();
-                                   if let Some(state) = self.language_servers.get(&server_id) {
-                                       if let Ok(uri) = uri {
-                                           state.add_workspace_folder(uri);
-                                       };
-                                   }
-                                   server_id
-                               } else {
-                                   unreachable!("Language server ID should be available, as it's registered on demand")
-                               }
+                let server_id = server_node.server_id_or_init(|disposition| {
+                    let path = &disposition.path;
+                    let server_id = {
+                        let uri =
+                            Url::from_file_path(worktree.read(cx).abs_path().join(&path.path));
 
-                        };
+                        let server_id = self.get_or_insert_language_server(
+                            &worktree,
+                            delegate.clone(),
+                            disposition,
+                            &language_name,
+                            cx,
+                        );
+
+                        if let Some(state) = self.language_servers.get(&server_id) {
+                            if let Ok(uri) = uri {
+                                state.add_workspace_folder(uri);
+                            };
+                        }
                         server_id
-                    },
-                )?;
+                    };
+
+                    server_id
+                })?;
                 let server_state = self.language_servers.get(&server_id)?;
-                if let LanguageServerState::Running { server, adapter, .. } = server_state {
+                if let LanguageServerState::Running {
+                    server, adapter, ..
+                } = server_state
+                {
                     Some((server.clone(), adapter.clone()))
                 } else {
                     None
@@ -2413,13 +2494,16 @@ impl LocalLspStore {
         }
     }
 
-    fn reuse_existing_language_server(
+    fn reuse_existing_language_server<'lang_name>(
         &self,
-        server_tree: &mut LanguageServerTree,
+        server_tree: &LanguageServerTree,
         worktree: &Entity<Worktree>,
-        language_name: &LanguageName,
+        language_name: &'lang_name LanguageName,
         cx: &mut App,
-    ) -> Option<(Arc<LocalLspAdapterDelegate>, Vec<LanguageServerTreeNode>)> {
+    ) -> Option<(
+        Arc<LocalLspAdapterDelegate>,
+        impl FnOnce(&mut LanguageServerTree) -> Vec<LanguageServerTreeNode> + use<'lang_name>,
+    )> {
         if worktree.read(cx).is_visible() {
             return None;
         }
@@ -2458,16 +2542,16 @@ impl LocalLspStore {
             .into_values()
             .max_by_key(|servers| servers.len())?;
 
-        for server_node in &servers {
-            server_tree.register_reused(
-                worktree.read(cx).id(),
-                language_name.clone(),
-                server_node.clone(),
-            );
-        }
+        let worktree_id = worktree.read(cx).id();
+        let apply = move |tree: &mut LanguageServerTree| {
+            for server_node in &servers {
+                tree.register_reused(worktree_id, language_name.clone(), server_node.clone());
+            }
+            servers
+        };
 
         let delegate = LocalLspAdapterDelegate::from_local_lsp(self, worktree, cx);
-        Some((delegate, servers))
+        Some((delegate, apply))
     }
 
     pub(crate) fn unregister_old_buffer_from_language_servers(
@@ -2568,7 +2652,7 @@ impl LocalLspStore {
     pub async fn execute_code_actions_on_server(
         lsp_store: &WeakEntity<LspStore>,
         language_server: &Arc<LanguageServer>,
-        lsp_adapter: &Arc<CachedLspAdapter>,
+
         actions: Vec<CodeAction>,
         push_to_history: bool,
         project_transaction: &mut ProjectTransaction,
@@ -2588,7 +2672,6 @@ impl LocalLspStore {
                     lsp_store.upgrade().context("project dropped")?,
                     edit.clone(),
                     push_to_history,
-                    lsp_adapter.clone(),
                     language_server.clone(),
                     cx,
                 )
@@ -2769,7 +2852,6 @@ impl LocalLspStore {
         this: Entity<LspStore>,
         edit: lsp::WorkspaceEdit,
         push_to_history: bool,
-        lsp_adapter: Arc<CachedLspAdapter>,
         language_server: Arc<LanguageServer>,
         cx: &mut AsyncApp,
     ) -> Result<ProjectTransaction> {
@@ -2870,7 +2952,6 @@ impl LocalLspStore {
                             this.open_local_buffer_via_lsp(
                                 op.text_document.uri.clone(),
                                 language_server.server_id(),
-                                lsp_adapter.name.clone(),
                                 cx,
                             )
                         })?
@@ -2995,7 +3076,6 @@ impl LocalLspStore {
         this: WeakEntity<LspStore>,
         params: lsp::ApplyWorkspaceEditParams,
         server_id: LanguageServerId,
-        adapter: Arc<CachedLspAdapter>,
         cx: &mut AsyncApp,
     ) -> Result<lsp::ApplyWorkspaceEditResponse> {
         let this = this.upgrade().context("project project closed")?;
@@ -3006,7 +3086,6 @@ impl LocalLspStore {
             this.clone(),
             params.edit,
             true,
-            adapter.clone(),
             language_server.clone(),
             cx,
         )
@@ -3037,23 +3116,19 @@ impl LocalLspStore {
             prettier_store.remove_worktree(id_to_remove, cx);
         });
 
-        let mut servers_to_remove = BTreeMap::default();
+        let mut servers_to_remove = BTreeSet::default();
         let mut servers_to_preserve = HashSet::default();
-        for ((path, server_name), ref server_ids) in &self.language_server_ids {
-            if *path == id_to_remove {
-                servers_to_remove.extend(server_ids.iter().map(|id| (*id, server_name.clone())));
+        for (seed, ref state) in &self.language_server_ids {
+            if seed.worktree_id == id_to_remove {
+                servers_to_remove.insert(state.id);
             } else {
-                servers_to_preserve.extend(server_ids.iter().cloned());
+                servers_to_preserve.insert(state.id);
             }
         }
-        servers_to_remove.retain(|server_id, _| !servers_to_preserve.contains(server_id));
-
-        for (server_id_to_remove, _) in &servers_to_remove {
-            self.language_server_ids
-                .values_mut()
-                .for_each(|server_ids| {
-                    server_ids.remove(server_id_to_remove);
-                });
+        servers_to_remove.retain(|server_id| !servers_to_preserve.contains(server_id));
+        self.language_server_ids
+            .retain(|_, state| !servers_to_remove.contains(&state.id));
+        for server_id_to_remove in &servers_to_remove {
             self.language_server_watched_paths
                 .remove(server_id_to_remove);
             self.language_server_paths_watched_for_rename
@@ -3068,7 +3143,7 @@ impl LocalLspStore {
             }
             cx.emit(LspStoreEvent::LanguageServerRemoved(*server_id_to_remove));
         }
-        servers_to_remove.into_keys().collect()
+        servers_to_remove.into_iter().collect()
     }
 
     fn rebuild_watched_paths_inner<'a>(
@@ -3326,16 +3401,20 @@ impl LocalLspStore {
         Ok(Some(initialization_config))
     }
 
+    fn toolchain_store(&self) -> &Entity<LocalToolchainStore> {
+        &self.toolchain_store
+    }
+
     async fn workspace_configuration_for_adapter(
         adapter: Arc<dyn LspAdapter>,
         fs: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
+        toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<serde_json::Value> {
         let mut workspace_config = adapter
             .clone()
-            .workspace_configuration(fs, delegate, toolchains.clone(), cx)
+            .workspace_configuration(fs, delegate, toolchain, cx)
             .await?;
 
         for other_adapter in delegate.registered_lsp_adapters() {
@@ -3344,13 +3423,7 @@ impl LocalLspStore {
             }
             if let Ok(Some(target_config)) = other_adapter
                 .clone()
-                .additional_workspace_configuration(
-                    adapter.name(),
-                    fs,
-                    delegate,
-                    toolchains.clone(),
-                    cx,
-                )
+                .additional_workspace_configuration(adapter.name(), fs, delegate, cx)
                 .await
             {
                 merge_json_value_into(target_config.clone(), &mut workspace_config);
@@ -3416,7 +3489,6 @@ pub struct LspStore {
     nonce: u128,
     buffer_store: Entity<BufferStore>,
     worktree_store: Entity<WorktreeStore>,
-    toolchain_store: Option<Entity<ToolchainStore>>,
     pub languages: Arc<LanguageRegistry>,
     language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
     active_entry: Option<ProjectEntryId>,
@@ -3607,7 +3679,7 @@ impl LspStore {
         buffer_store: Entity<BufferStore>,
         worktree_store: Entity<WorktreeStore>,
         prettier_store: Entity<PrettierStore>,
-        toolchain_store: Entity<ToolchainStore>,
+        toolchain_store: Entity<LocalToolchainStore>,
         environment: Entity<ProjectEnvironment>,
         manifest_tree: Entity<ManifestTree>,
         languages: Arc<LanguageRegistry>,
@@ -3649,7 +3721,7 @@ impl LspStore {
             mode: LspStoreMode::Local(LocalLspStore {
                 weak: cx.weak_entity(),
                 worktree_store: worktree_store.clone(),
-                toolchain_store: toolchain_store.clone(),
+
                 supplementary_language_servers: Default::default(),
                 languages: languages.clone(),
                 language_server_ids: Default::default(),
@@ -3672,16 +3744,22 @@ impl LspStore {
                         .unwrap()
                         .shutdown_language_servers_on_quit(cx)
                 }),
-                lsp_tree: LanguageServerTree::new(manifest_tree, languages.clone(), cx),
+                lsp_tree: LanguageServerTree::new(
+                    manifest_tree,
+                    languages.clone(),
+                    toolchain_store.clone(),
+                ),
+                toolchain_store,
                 registered_buffers: HashMap::default(),
                 buffers_opened_in_servers: HashMap::default(),
                 buffer_pull_diagnostics_result_ids: HashMap::default(),
+                watched_manifest_filenames: ManifestProvidersStore::global(cx)
+                    .manifest_file_names(),
             }),
             last_formatting_failure: None,
             downstream_client: None,
             buffer_store,
             worktree_store,
-            toolchain_store: Some(toolchain_store),
             languages: languages.clone(),
             language_server_statuses: Default::default(),
             nonce: StdRng::from_entropy().r#gen(),
@@ -3719,7 +3797,6 @@ impl LspStore {
     pub(super) fn new_remote(
         buffer_store: Entity<BufferStore>,
         worktree_store: Entity<WorktreeStore>,
-        toolchain_store: Option<Entity<ToolchainStore>>,
         languages: Arc<LanguageRegistry>,
         upstream_client: AnyProtoClient,
         project_id: u64,
@@ -3752,7 +3829,7 @@ impl LspStore {
             lsp_document_colors: HashMap::default(),
             lsp_code_lens: HashMap::default(),
             active_entry: None,
-            toolchain_store,
+
             _maintain_workspace_config,
             _maintain_buffer_languages: Self::maintain_buffer_languages(languages.clone(), cx),
         }
@@ -3851,7 +3928,7 @@ impl LspStore {
 
     fn on_toolchain_store_event(
         &mut self,
-        _: Entity<ToolchainStore>,
+        _: Entity<LocalToolchainStore>,
         event: &ToolchainStoreEvent,
         _: &mut Context<Self>,
     ) {
@@ -3930,9 +4007,9 @@ impl LspStore {
                     let local = this.as_local()?;
 
                     let mut servers = Vec::new();
-                    for ((worktree_id, _), server_ids) in &local.language_server_ids {
-                        for server_id in server_ids {
-                            let Some(states) = local.language_servers.get(server_id) else {
+                    for (seed, state) in &local.language_server_ids {
+
+                            let Some(states) = local.language_servers.get(&state.id) else {
                                 continue;
                             };
                             let (json_adapter, json_server) = match states {
@@ -3947,7 +4024,7 @@ impl LspStore {
                             let Some(worktree) = this
                                 .worktree_store
                                 .read(cx)
-                                .worktree_for_id(*worktree_id, cx)
+                                .worktree_for_id(seed.worktree_id, cx)
                             else {
                                 continue;
                             };
@@ -3963,7 +4040,7 @@ impl LspStore {
                                 );
 
                             servers.push((json_adapter, json_server, json_delegate));
-                        }
+
                     }
                     return Some(servers);
                 })
@@ -3974,9 +4051,9 @@ impl LspStore {
                 return;
             };
 
-            let Ok(Some((fs, toolchain_store))) = this.read_with(cx, |this, cx| {
+            let Ok(Some((fs, _))) = this.read_with(cx, |this, _| {
                 let local = this.as_local()?;
-                let toolchain_store = this.toolchain_store(cx);
+                let toolchain_store = local.toolchain_store().clone();
                 return Some((local.fs.clone(), toolchain_store));
             }) else {
                 return;
@@ -3988,7 +4065,7 @@ impl LspStore {
                         adapter,
                         fs.as_ref(),
                         &delegate,
-                        toolchain_store.clone(),
+                        None,
                         cx,
                     )
                     .await
@@ -4533,7 +4610,7 @@ impl LspStore {
             }
         }
 
-        self.refresh_server_tree(cx);
+        self.request_workspace_config_refresh();
 
         if let Some(prettier_store) = self.as_local().map(|s| s.prettier_store.clone()) {
             prettier_store.update(cx, |prettier_store, cx| {
@@ -4546,158 +4623,150 @@ impl LspStore {
 
     fn refresh_server_tree(&mut self, cx: &mut Context<Self>) {
         let buffer_store = self.buffer_store.clone();
-        if let Some(local) = self.as_local_mut() {
-            let mut adapters = BTreeMap::default();
-            let get_adapter = {
-                let languages = local.languages.clone();
-                let environment = local.environment.clone();
-                let weak = local.weak.clone();
-                let worktree_store = local.worktree_store.clone();
-                let http_client = local.http_client.clone();
-                let fs = local.fs.clone();
-                move |worktree_id, cx: &mut App| {
-                    let worktree = worktree_store.read(cx).worktree_for_id(worktree_id, cx)?;
-                    Some(LocalLspAdapterDelegate::new(
-                        languages.clone(),
-                        &environment,
-                        weak.clone(),
-                        &worktree,
-                        http_client.clone(),
-                        fs.clone(),
-                        cx,
-                    ))
-                }
-            };
+        let Some(local) = self.as_local_mut() else {
+            return;
+        };
+        let mut adapters = BTreeMap::default();
+        let get_adapter = {
+            let languages = local.languages.clone();
+            let environment = local.environment.clone();
+            let weak = local.weak.clone();
+            let worktree_store = local.worktree_store.clone();
+            let http_client = local.http_client.clone();
+            let fs = local.fs.clone();
+            move |worktree_id, cx: &mut App| {
+                let worktree = worktree_store.read(cx).worktree_for_id(worktree_id, cx)?;
+                Some(LocalLspAdapterDelegate::new(
+                    languages.clone(),
+                    &environment,
+                    weak.clone(),
+                    &worktree,
+                    http_client.clone(),
+                    fs.clone(),
+                    cx,
+                ))
+            }
+        };
 
-            let mut messages_to_report = Vec::new();
-            let to_stop = local.lsp_tree.clone().update(cx, |lsp_tree, cx| {
-                let mut rebase = lsp_tree.rebase();
-                for buffer_handle in buffer_store.read(cx).buffers().sorted_by_key(|buffer| {
-                    Reverse(
-                        File::from_dyn(buffer.read(cx).file())
-                            .map(|file| file.worktree.read(cx).is_visible()),
-                    )
-                }) {
-                    let buffer = buffer_handle.read(cx);
-                     let buffer_id = buffer.remote_id();
-                    if !local.registered_buffers.contains_key(&buffer_id) {
-                        continue;
-                    }
-                    if let Some((file, language)) = File::from_dyn(buffer.file())
-                        .cloned()
-                        .zip(buffer.language().map(|l| l.name()))
+        let mut messages_to_report = Vec::new();
+        let (new_tree, to_stop) = {
+            let mut rebase = local.lsp_tree.rebase();
+            let buffers = buffer_store
+                .read(cx)
+                .buffers()
+                .filter_map(|buffer| {
+                    let raw_buffer = buffer.read(cx);
+                    if !local
+                        .registered_buffers
+                        .contains_key(&raw_buffer.remote_id())
                     {
-                        let worktree_id = file.worktree_id(cx);
-                        let Some(worktree) = local
-                            .worktree_store
-                            .read(cx)
-                            .worktree_for_id(worktree_id, cx)
-                        else {
-                            continue;
-                        };
+                        return None;
+                    }
+                    let file = File::from_dyn(raw_buffer.file()).cloned()?;
+                    let language = raw_buffer.language().cloned()?;
+                    Some((file, language, raw_buffer.remote_id()))
+                })
+                .sorted_by_key(|(file, _, _)| Reverse(file.worktree.read(cx).is_visible()));
 
-                        let Some((reused, delegate, nodes)) = local
-                            .reuse_existing_language_server(
-                                rebase.server_tree(),
+            for (file, language, buffer_id) in buffers {
+                let worktree_id = file.worktree_id(cx);
+                let Some(worktree) = local
+                    .worktree_store
+                    .read(cx)
+                    .worktree_for_id(worktree_id, cx)
+                else {
+                    continue;
+                };
+
+                if let Some((_, apply)) = local.reuse_existing_language_server(
+                    rebase.server_tree(),
+                    &worktree,
+                    &language.name(),
+                    cx,
+                ) {
+                    (apply)(rebase.server_tree());
+                } else if let Some(lsp_delegate) = adapters
+                    .entry(worktree_id)
+                    .or_insert_with(|| get_adapter(worktree_id, cx))
+                    .clone()
+                {
+                    let delegate =
+                        Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
+                    let path = file
+                        .path()
+                        .parent()
+                        .map(Arc::from)
+                        .unwrap_or_else(|| file.path().clone());
+                    let worktree_path = ProjectPath { worktree_id, path };
+                    let abs_path = file.abs_path(cx);
+                    let worktree_root = worktree.read(cx).abs_path();
+                    let nodes = rebase
+                        .walk(
+                            worktree_path,
+                            language.name(),
+                            language.manifest(),
+                            delegate.clone(),
+                            cx,
+                        )
+                        .collect::<Vec<_>>();
+
+                    for node in nodes {
+                        let server_id = node.server_id_or_init(|disposition| {
+                            let path = &disposition.path;
+                            let uri = Url::from_file_path(worktree_root.join(&path.path));
+                            let key = LanguageServerSeed {
+                                worktree_id,
+                                name: disposition.server_name.clone(),
+                                settings: disposition.settings.clone(),
+                                toolchain: local.toolchain_store.read(cx).active_toolchain(
+                                    path.worktree_id,
+                                    &path.path,
+                                    language.name(),
+                                ),
+                            };
+                            local.language_server_ids.remove(&key);
+
+                            let server_id = local.get_or_insert_language_server(
                                 &worktree,
-                                &language,
+                                lsp_delegate.clone(),
+                                disposition,
+                                &language.name(),
                                 cx,
-                            )
-                            .map(|(delegate, servers)| (true, delegate, servers))
-                            .or_else(|| {
-                                let lsp_delegate = adapters
-                                    .entry(worktree_id)
-                                    .or_insert_with(|| get_adapter(worktree_id, cx))
-                                    .clone()?;
-                                let delegate = Arc::new(ManifestQueryDelegate::new(
-                                    worktree.read(cx).snapshot(),
-                                ));
-                                let path = file
-                                    .path()
-                                    .parent()
-                                    .map(Arc::from)
-                                    .unwrap_or_else(|| file.path().clone());
-                                let worktree_path = ProjectPath { worktree_id, path };
-
-                                let nodes = rebase.get(
-                                    worktree_path,
-                                    AdapterQuery::Language(&language),
-                                    delegate.clone(),
-                                    cx,
-                                );
-
-                                Some((false, lsp_delegate, nodes.collect()))
-                            })
-                        else {
-                            continue;
-                        };
-
-                        let abs_path = file.abs_path(cx);
-                        for node in nodes {
-                            if !reused {
-                                let server_id = node.server_id_or_init(
-                                    |LaunchDisposition {
-                                         server_name,
-
-                                         path,
-                                         settings,
-                                     }|
-                                         {
-                                            let uri = Url::from_file_path(
-                                                worktree.read(cx).abs_path().join(&path.path),
-                                            );
-                                            let key = (worktree_id, server_name.clone());
-                                            local.language_server_ids.remove(&key);
-
-                                            let adapter = local
-                                                .languages
-                                                .lsp_adapters(&language)
-                                                .into_iter()
-                                                .find(|adapter| &adapter.name() == server_name)
-                                                .expect("To find LSP adapter");
-                                            let server_id = local.start_language_server(
-                                                &worktree,
-                                                delegate.clone(),
-                                                adapter,
-                                                settings,
-                                                cx,
-                                            );
-                                            if let Some(state) =
-                                                local.language_servers.get(&server_id)
-                                            {
-                                                if let Ok(uri) = uri {
-                                                    state.add_workspace_folder(uri);
-                                                };
-                                            }
-                                            server_id
-                                        }
-                                );
-
-                                if let Some(language_server_id) = server_id {
-                                    messages_to_report.push(LspStoreEvent::LanguageServerUpdate {
-                                        language_server_id,
-                                        name: node.name(),
-                                        message:
-                                            proto::update_language_server::Variant::RegisteredForBuffer(
-                                                proto::RegisteredForBuffer {
-                                                    buffer_abs_path: abs_path.to_string_lossy().to_string(),
-                                                    buffer_id: buffer_id.to_proto(),
-                                                },
-                                            ),
-                                    });
-                                }
+                            );
+                            if let Some(state) = local.language_servers.get(&server_id) {
+                                if let Ok(uri) = uri {
+                                    state.add_workspace_folder(uri);
+                                };
                             }
+                            server_id
+                        });
+
+                        if let Some(language_server_id) = server_id {
+                            messages_to_report.push(LspStoreEvent::LanguageServerUpdate {
+                                language_server_id,
+                                name: node.name(),
+                                message:
+                                    proto::update_language_server::Variant::RegisteredForBuffer(
+                                        proto::RegisteredForBuffer {
+                                            buffer_abs_path: abs_path.to_string_lossy().to_string(),
+                                            buffer_id: buffer_id.to_proto(),
+                                        },
+                                    ),
+                            });
                         }
                     }
+                } else {
+                    continue;
                 }
-                rebase.finish()
-            });
-            for message in messages_to_report {
-                cx.emit(message);
-            }
-            for (id, _) in to_stop {
-                self.stop_local_language_server(id, cx).detach();
             }
+            rebase.finish()
+        };
+        for message in messages_to_report {
+            cx.emit(message);
+        }
+        local.lsp_tree = new_tree;
+        for (id, _) in to_stop {
+            self.stop_local_language_server(id, cx).detach();
         }
     }
 
@@ -4729,7 +4798,7 @@ impl LspStore {
                     .await
             })
         } else if self.mode.is_local() {
-            let Some((lsp_adapter, lang_server)) = buffer_handle.update(cx, |buffer, cx| {
+            let Some((_, lang_server)) = buffer_handle.update(cx, |buffer, cx| {
                 self.language_server_for_local_buffer(buffer, action.server_id, cx)
                     .map(|(adapter, server)| (adapter.clone(), server.clone()))
             }) else {
@@ -4745,7 +4814,7 @@ impl LspStore {
                             this.upgrade().context("no app present")?,
                             edit.clone(),
                             push_to_history,
-                            lsp_adapter.clone(),
+
                             lang_server.clone(),
                             cx,
                         )
@@ -7073,11 +7142,11 @@ impl LspStore {
 
             let mut requests = Vec::new();
             let mut requested_servers = BTreeSet::new();
-            'next_server: for ((worktree_id, _), server_ids) in local.language_server_ids.iter() {
+            for (seed, state) in local.language_server_ids.iter() {
                 let Some(worktree_handle) = self
                     .worktree_store
                     .read(cx)
-                    .worktree_for_id(*worktree_id, cx)
+                    .worktree_for_id(seed.worktree_id, cx)
                 else {
                     continue;
                 };
@@ -7086,31 +7155,30 @@ impl LspStore {
                     continue;
                 }
 
-                let mut servers_to_query = server_ids
-                    .difference(&requested_servers)
-                    .cloned()
-                    .collect::<BTreeSet<_>>();
-                for server_id in &servers_to_query {
-                    let (lsp_adapter, server) = match local.language_servers.get(server_id) {
-                        Some(LanguageServerState::Running {
-                            adapter, server, ..
-                        }) => (adapter.clone(), server),
+                if !requested_servers.insert(state.id) {
+                    continue;
+                }
 
-                        _ => continue 'next_server,
+                let (lsp_adapter, server) = match local.language_servers.get(&state.id) {
+                    Some(LanguageServerState::Running {
+                        adapter, server, ..
+                    }) => (adapter.clone(), server),
+
+                    _ => continue,
+                };
+                let supports_workspace_symbol_request =
+                    match server.capabilities().workspace_symbol_provider {
+                        Some(OneOf::Left(supported)) => supported,
+                        Some(OneOf::Right(_)) => true,
+                        None => false,
                     };
-                    let supports_workspace_symbol_request =
-                        match server.capabilities().workspace_symbol_provider {
-                            Some(OneOf::Left(supported)) => supported,
-                            Some(OneOf::Right(_)) => true,
-                            None => false,
-                        };
-                    if !supports_workspace_symbol_request {
-                        continue 'next_server;
-                    }
-                    let worktree_abs_path = worktree.abs_path().clone();
-                    let worktree_handle = worktree_handle.clone();
-                    let server_id = server.server_id();
-                    requests.push(
+                if !supports_workspace_symbol_request {
+                    continue;
+                }
+                let worktree_abs_path = worktree.abs_path().clone();
+                let worktree_handle = worktree_handle.clone();
+                let server_id = server.server_id();
+                requests.push(
                         server
                             .request::<lsp::request::WorkspaceSymbolRequest>(
                                 lsp::WorkspaceSymbolParams {
@@ -7152,8 +7220,6 @@ impl LspStore {
                                 }
                             }),
                     );
-                }
-                requested_servers.append(&mut servers_to_query);
             }
 
             cx.spawn(async move |this, cx| {
@@ -7416,7 +7482,7 @@ impl LspStore {
         None
     }
 
-    pub(crate) async fn refresh_workspace_configurations(
+    async fn refresh_workspace_configurations(
         lsp_store: &WeakEntity<Self>,
         fs: Arc<dyn Fs>,
         cx: &mut AsyncApp,
@@ -7425,71 +7491,70 @@ impl LspStore {
             let mut refreshed_servers = HashSet::default();
             let servers = lsp_store
                 .update(cx, |lsp_store, cx| {
-                    let toolchain_store = lsp_store.toolchain_store(cx);
-                    let Some(local) = lsp_store.as_local() else {
-                        return Vec::default();
-                    };
-                    local
+                    let local = lsp_store.as_local()?;
+
+                    let servers = local
                         .language_server_ids
                         .iter()
-                        .flat_map(|((worktree_id, _), server_ids)| {
+                        .filter_map(|(seed, state)| {
                             let worktree = lsp_store
                                 .worktree_store
                                 .read(cx)
-                                .worktree_for_id(*worktree_id, cx);
-                            let delegate = worktree.map(|worktree| {
-                                LocalLspAdapterDelegate::new(
-                                    local.languages.clone(),
-                                    &local.environment,
-                                    cx.weak_entity(),
-                                    &worktree,
-                                    local.http_client.clone(),
-                                    local.fs.clone(),
-                                    cx,
-                                )
-                            });
+                                .worktree_for_id(seed.worktree_id, cx);
+                            let delegate: Arc<dyn LspAdapterDelegate> =
+                                worktree.map(|worktree| {
+                                    LocalLspAdapterDelegate::new(
+                                        local.languages.clone(),
+                                        &local.environment,
+                                        cx.weak_entity(),
+                                        &worktree,
+                                        local.http_client.clone(),
+                                        local.fs.clone(),
+                                        cx,
+                                    )
+                                })?;
+                            let server_id = state.id;
 
-                            let fs = fs.clone();
-                            let toolchain_store = toolchain_store.clone();
-                            server_ids.iter().filter_map(|server_id| {
-                                let delegate = delegate.clone()? as Arc<dyn LspAdapterDelegate>;
-                                let states = local.language_servers.get(server_id)?;
+                            let states = local.language_servers.get(&server_id)?;
 
-                                match states {
-                                    LanguageServerState::Starting { .. } => None,
-                                    LanguageServerState::Running {
-                                        adapter, server, ..
-                                    } => {
-                                        let fs = fs.clone();
-                                        let toolchain_store = toolchain_store.clone();
-                                        let adapter = adapter.clone();
-                                        let server = server.clone();
-                                        refreshed_servers.insert(server.name());
-                                        Some(cx.spawn(async move |_, cx| {
-                                            let settings =
-                                                LocalLspStore::workspace_configuration_for_adapter(
-                                                    adapter.adapter.clone(),
-                                                    fs.as_ref(),
-                                                    &delegate,
-                                                    toolchain_store,
-                                                    cx,
-                                                )
-                                                .await
-                                                .ok()?;
-                                            server
-                                                .notify::<lsp::notification::DidChangeConfiguration>(
-                                                    &lsp::DidChangeConfigurationParams { settings },
-                                                )
-                                                .ok()?;
-                                            Some(())
-                                        }))
-                                    }
+                            match states {
+                                LanguageServerState::Starting { .. } => None,
+                                LanguageServerState::Running {
+                                    adapter, server, ..
+                                } => {
+                                    let fs = fs.clone();
+
+                                    let adapter = adapter.clone();
+                                    let server = server.clone();
+                                    refreshed_servers.insert(server.name());
+                                    let toolchain = seed.toolchain.clone();
+                                    Some(cx.spawn(async move |_, cx| {
+                                        let settings =
+                                            LocalLspStore::workspace_configuration_for_adapter(
+                                                adapter.adapter.clone(),
+                                                fs.as_ref(),
+                                                &delegate,
+                                                toolchain,
+                                                cx,
+                                            )
+                                            .await
+                                            .ok()?;
+                                        server
+                                            .notify::<lsp::notification::DidChangeConfiguration>(
+                                                &lsp::DidChangeConfigurationParams { settings },
+                                            )
+                                            .ok()?;
+                                        Some(())
+                                    }))
                                 }
-                            }).collect::<Vec<_>>()
+                            }
                         })
-                        .collect::<Vec<_>>()
+                        .collect::<Vec<_>>();
+
+                    Some(servers)
                 })
-                .ok()?;
+                .ok()
+                .flatten()?;
 
             log::info!("Refreshing workspace configurations for servers {refreshed_servers:?}");
             // TODO this asynchronous job runs concurrently with extension (de)registration and may take enough time for a certain extension
@@ -7497,18 +7562,12 @@ impl LspStore {
             // This is racy : an extension might have already removed all `local.language_servers` state, but here we `.clone()` and hold onto it anyway.
             // This now causes errors in the logs, we should find a way to remove such servers from the processing everywhere.
             let _: Vec<Option<()>> = join_all(servers).await;
+
             Some(())
         })
         .await;
     }
 
-    fn toolchain_store(&self, cx: &App) -> Arc<dyn LanguageToolchainStore> {
-        if let Some(toolchain_store) = self.toolchain_store.as_ref() {
-            toolchain_store.read(cx).as_language_toolchain_store()
-        } else {
-            Arc::new(EmptyToolchainStore)
-        }
-    }
     fn maintain_workspace_config(
         fs: Arc<dyn Fs>,
         external_refresh_requests: watch::Receiver<()>,
@@ -7523,8 +7582,19 @@ impl LspStore {
 
         let mut joint_future =
             futures::stream::select(settings_changed_rx, external_refresh_requests);
+        // Multiple things can happen when a workspace environment (selected toolchain + settings) change:
+        // - We might shut down a language server if it's no longer enabled for a given language (and there are no buffers using it otherwise).
+        // - We might also shut it down when the workspace configuration of all of the users of a given language server converges onto that of the other.
+        // - In the same vein, we might also decide to start a new language server if the workspace configuration *diverges* from the other.
+        // - In the easiest case (where we're not wrangling the lifetime of a language server anyhow), if none of the roots of a single language server diverge in their configuration,
+        // but it is still different to what we had before, we're gonna send out a workspace configuration update.
         cx.spawn(async move |this, cx| {
             while let Some(()) = joint_future.next().await {
+                this.update(cx, |this, cx| {
+                    this.refresh_server_tree(cx);
+                })
+                .ok();
+
                 Self::refresh_workspace_configurations(&this, fs.clone(), cx).await;
             }
 
@@ -7642,47 +7712,6 @@ impl LspStore {
             .collect();
     }
 
-    fn register_local_language_server(
-        &mut self,
-        worktree: Entity<Worktree>,
-        language_server_name: LanguageServerName,
-        language_server_id: LanguageServerId,
-        cx: &mut App,
-    ) {
-        let Some(local) = self.as_local_mut() else {
-            return;
-        };
-
-        let worktree_id = worktree.read(cx).id();
-        if worktree.read(cx).is_visible() {
-            let path = ProjectPath {
-                worktree_id,
-                path: Arc::from("".as_ref()),
-            };
-            let delegate = Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
-            local.lsp_tree.update(cx, |language_server_tree, cx| {
-                for node in language_server_tree.get(
-                    path,
-                    AdapterQuery::Adapter(&language_server_name),
-                    delegate,
-                    cx,
-                ) {
-                    node.server_id_or_init(|disposition| {
-                        assert_eq!(disposition.server_name, &language_server_name);
-
-                        language_server_id
-                    });
-                }
-            });
-        }
-
-        local
-            .language_server_ids
-            .entry((worktree_id, language_server_name))
-            .or_default()
-            .insert(language_server_id);
-    }
-
     #[cfg(test)]
     pub fn update_diagnostic_entries(
         &mut self,
@@ -7912,17 +7941,12 @@ impl LspStore {
                     .await
             })
         } else if let Some(local) = self.as_local() {
-            let Some(language_server_id) = local
-                .language_server_ids
-                .get(&(
-                    symbol.source_worktree_id,
-                    symbol.language_server_name.clone(),
-                ))
-                .and_then(|ids| {
-                    ids.contains(&symbol.source_language_server_id)
-                        .then_some(symbol.source_language_server_id)
-                })
-            else {
+            let is_valid = local.language_server_ids.iter().any(|(seed, state)| {
+                seed.worktree_id == symbol.source_worktree_id
+                    && state.id == symbol.source_language_server_id
+                    && symbol.language_server_name == seed.name
+            });
+            if !is_valid {
                 return Task::ready(Err(anyhow!(
                     "language server for worktree and language not found"
                 )));
@@ -7946,22 +7970,16 @@ impl LspStore {
                 return Task::ready(Err(anyhow!("invalid symbol path")));
             };
 
-            self.open_local_buffer_via_lsp(
-                symbol_uri,
-                language_server_id,
-                symbol.language_server_name.clone(),
-                cx,
-            )
+            self.open_local_buffer_via_lsp(symbol_uri, symbol.source_language_server_id, cx)
         } else {
             Task::ready(Err(anyhow!("no upstream client or local store")))
         }
     }
 
-    pub fn open_local_buffer_via_lsp(
+    pub(crate) fn open_local_buffer_via_lsp(
         &mut self,
         mut abs_path: lsp::Url,
         language_server_id: LanguageServerId,
-        language_server_name: LanguageServerName,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Buffer>>> {
         cx.spawn(async move |lsp_store, cx| {
@@ -8012,12 +8030,13 @@ impl LspStore {
                 if worktree.read_with(cx, |worktree, _| worktree.is_local())? {
                     lsp_store
                         .update(cx, |lsp_store, cx| {
-                            lsp_store.register_local_language_server(
-                                worktree.clone(),
-                                language_server_name,
-                                language_server_id,
-                                cx,
-                            )
+                            if let Some(local) = lsp_store.as_local_mut() {
+                                local.register_language_server_for_invisible_worktree(
+                                    &worktree,
+                                    language_server_id,
+                                    cx,
+                                )
+                            }
                         })
                         .ok();
                 }
@@ -9202,11 +9221,7 @@ impl LspStore {
                     else {
                         continue;
                     };
-                    let Some(adapter) =
-                        this.language_server_adapter_for_id(language_server.server_id())
-                    else {
-                        continue;
-                    };
+
                     if filter.should_send_will_rename(&old_uri, is_dir) {
                         let apply_edit = cx.spawn({
                             let old_uri = old_uri.clone();
@@ -9227,7 +9242,6 @@ impl LspStore {
                                     this.upgrade()?,
                                     edit,
                                     false,
-                                    adapter.clone(),
                                     language_server.clone(),
                                     cx,
                                 )
@@ -10290,28 +10304,18 @@ impl LspStore {
         &mut self,
         server_id: LanguageServerId,
         cx: &mut Context<Self>,
-    ) -> Task<Vec<WorktreeId>> {
+    ) -> Task<()> {
         let local = match &mut self.mode {
             LspStoreMode::Local(local) => local,
             _ => {
-                return Task::ready(Vec::new());
+                return Task::ready(());
             }
         };
 
-        let mut orphaned_worktrees = Vec::new();
         // Remove this server ID from all entries in the given worktree.
-        local.language_server_ids.retain(|(worktree, _), ids| {
-            if !ids.remove(&server_id) {
-                return true;
-            }
-
-            if ids.is_empty() {
-                orphaned_worktrees.push(*worktree);
-                false
-            } else {
-                true
-            }
-        });
+        local
+            .language_server_ids
+            .retain(|_, state| state.id != server_id);
         self.buffer_store.update(cx, |buffer_store, cx| {
             for buffer in buffer_store.buffers() {
                 buffer.update(cx, |buffer, cx| {
@@ -10390,14 +10394,13 @@ impl LspStore {
                         cx.notify();
                     })
                     .ok();
-                orphaned_worktrees
             });
         }
 
         if server_state.is_some() {
             cx.emit(LspStoreEvent::LanguageServerRemoved(server_id));
         }
-        Task::ready(orphaned_worktrees)
+        Task::ready(())
     }
 
     pub fn stop_all_language_servers(&mut self, cx: &mut Context<Self>) {
@@ -10416,12 +10419,9 @@ impl LspStore {
             let language_servers_to_stop = local
                 .language_server_ids
                 .values()
-                .flatten()
-                .copied()
+                .map(|state| state.id)
                 .collect();
-            local.lsp_tree.update(cx, |this, _| {
-                this.remove_nodes(&language_servers_to_stop);
-            });
+            local.lsp_tree.remove_nodes(&language_servers_to_stop);
             let tasks = language_servers_to_stop
                 .into_iter()
                 .map(|server| self.stop_local_language_server(server, cx))
@@ -10571,34 +10571,28 @@ impl LspStore {
                 if let Some(worktree_id) = buffer.file().map(|f| f.worktree_id(cx)) {
                     if covered_worktrees.insert(worktree_id) {
                         language_server_names_to_stop.retain(|name| {
-                            match local.language_server_ids.get(&(worktree_id, name.clone())) {
-                                Some(server_ids) => {
-                                    language_servers_to_stop
-                                        .extend(server_ids.into_iter().copied());
-                                    false
-                                }
-                                None => true,
-                            }
+                            let old_ids_count = language_servers_to_stop.len();
+                            let all_language_servers_with_this_name = local
+                                .language_server_ids
+                                .iter()
+                                .filter_map(|(seed, state)| seed.name.eq(name).then(|| state.id));
+                            language_servers_to_stop.extend(all_language_servers_with_this_name);
+                            old_ids_count == language_servers_to_stop.len()
                         });
                     }
                 }
             });
         }
         for name in language_server_names_to_stop {
-            if let Some(server_ids) = local
-                .language_server_ids
-                .iter()
-                .filter(|((_, server_name), _)| server_name == &name)
-                .map(|((_, _), server_ids)| server_ids)
-                .max_by_key(|server_ids| server_ids.len())
-            {
-                language_servers_to_stop.extend(server_ids.into_iter().copied());
-            }
+            language_servers_to_stop.extend(
+                local
+                    .language_server_ids
+                    .iter()
+                    .filter_map(|(seed, v)| seed.name.eq(&name).then(|| v.id)),
+            );
         }
 
-        local.lsp_tree.update(cx, |this, _| {
-            this.remove_nodes(&language_servers_to_stop);
-        });
+        local.lsp_tree.remove_nodes(&language_servers_to_stop);
         let tasks = language_servers_to_stop
             .into_iter()
             .map(|server| self.stop_local_language_server(server, cx))
@@ -10821,7 +10815,7 @@ impl LspStore {
         adapter: Arc<CachedLspAdapter>,
         language_server: Arc<LanguageServer>,
         server_id: LanguageServerId,
-        key: (WorktreeId, LanguageServerName),
+        key: LanguageServerSeed,
         workspace_folders: Arc<Mutex<BTreeSet<Url>>>,
         cx: &mut Context<Self>,
     ) {
@@ -10833,7 +10827,7 @@ impl LspStore {
         if local
             .language_server_ids
             .get(&key)
-            .map(|ids| !ids.contains(&server_id))
+            .map(|state| state.id != server_id)
             .unwrap_or(false)
         {
             return;
@@ -10890,7 +10884,7 @@ impl LspStore {
         cx.emit(LspStoreEvent::LanguageServerAdded(
             server_id,
             language_server.name(),
-            Some(key.0),
+            Some(key.worktree_id),
         ));
         cx.emit(LspStoreEvent::RefreshInlayHints);
 
@@ -10902,7 +10896,7 @@ impl LspStore {
                     server: Some(proto::LanguageServer {
                         id: server_id.to_proto(),
                         name: language_server.name().to_string(),
-                        worktree_id: Some(key.0.to_proto()),
+                        worktree_id: Some(key.worktree_id.to_proto()),
                     }),
                     capabilities: serde_json::to_string(&server_capabilities)
                         .expect("serializing server LSP capabilities"),
@@ -10914,13 +10908,13 @@ impl LspStore {
 
         // Tell the language server about every open buffer in the worktree that matches the language.
         // Also check for buffers in worktrees that reused this server
-        let mut worktrees_using_server = vec![key.0];
+        let mut worktrees_using_server = vec![key.worktree_id];
         if let Some(local) = self.as_local() {
             // Find all worktrees that have this server in their language server tree
-            for (worktree_id, servers) in &local.lsp_tree.read(cx).instances {
-                if *worktree_id != key.0 {
+            for (worktree_id, servers) in &local.lsp_tree.instances {
+                if *worktree_id != key.worktree_id {
                     for (_, server_map) in &servers.roots {
-                        if server_map.contains_key(&key.1) {
+                        if server_map.contains_key(&key.name) {
                             worktrees_using_server.push(*worktree_id);
                         }
                     }
@@ -10946,7 +10940,7 @@ impl LspStore {
                         .languages
                         .lsp_adapters(&language.name())
                         .iter()
-                        .any(|a| a.name == key.1)
+                        .any(|a| a.name == key.name)
                 {
                     continue;
                 }
@@ -11191,11 +11185,7 @@ impl LspStore {
         let mut language_server_ids = local
             .language_server_ids
             .iter()
-            .flat_map(|((server_worktree, _), server_ids)| {
-                server_ids
-                    .iter()
-                    .filter_map(|server_id| server_worktree.eq(&worktree_id).then(|| *server_id))
-            })
+            .filter_map(|(seed, v)| seed.worktree_id.eq(&worktree_id).then(|| v.id))
             .collect::<Vec<_>>();
         language_server_ids.sort();
         language_server_ids.dedup();
@@ -11239,6 +11229,14 @@ impl LspStore {
                 }
             }
         }
+        for (path, _, _) in changes {
+            if let Some(file_name) = path.file_name().and_then(|file_name| file_name.to_str())
+                && local.watched_manifest_filenames.contains(file_name)
+            {
+                self.request_workspace_config_refresh();
+                break;
+            }
+        }
     }
 
     pub fn wait_for_remote_buffer(
@@ -12785,7 +12783,7 @@ impl LspAdapter for SshLspAdapter {
     async fn check_if_user_installed(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: Arc<dyn LanguageToolchainStore>,
+        _: Option<Toolchain>,
         _: &AsyncApp,
     ) -> Option<LanguageServerBinary> {
         Some(self.binary.clone())
diff --git a/crates/project/src/manifest_tree.rs b/crates/project/src/manifest_tree.rs
index 7266acb5b4..8621d24d06 100644
--- a/crates/project/src/manifest_tree.rs
+++ b/crates/project/src/manifest_tree.rs
@@ -7,18 +7,12 @@ mod manifest_store;
 mod path_trie;
 mod server_tree;
 
-use std::{
-    borrow::Borrow,
-    collections::{BTreeMap, hash_map::Entry},
-    ops::ControlFlow,
-    path::Path,
-    sync::Arc,
-};
+use std::{borrow::Borrow, collections::hash_map::Entry, ops::ControlFlow, path::Path, sync::Arc};
 
 use collections::HashMap;
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription};
+use gpui::{App, AppContext as _, Context, Entity, Subscription};
 use language::{ManifestDelegate, ManifestName, ManifestQuery};
-pub use manifest_store::ManifestProviders;
+pub use manifest_store::ManifestProvidersStore;
 use path_trie::{LabelPresence, RootPathTrie, TriePath};
 use settings::{SettingsStore, WorktreeId};
 use worktree::{Event as WorktreeEvent, Snapshot, Worktree};
@@ -28,9 +22,7 @@ use crate::{
     worktree_store::{WorktreeStore, WorktreeStoreEvent},
 };
 
-pub(crate) use server_tree::{
-    AdapterQuery, LanguageServerTree, LanguageServerTreeNode, LaunchDisposition,
-};
+pub(crate) use server_tree::{LanguageServerTree, LanguageServerTreeNode, LaunchDisposition};
 
 struct WorktreeRoots {
     roots: RootPathTrie<ManifestName>,
@@ -81,14 +73,6 @@ pub struct ManifestTree {
     _subscriptions: [Subscription; 2],
 }
 
-#[derive(PartialEq)]
-pub(crate) enum ManifestTreeEvent {
-    WorktreeRemoved(WorktreeId),
-    Cleared,
-}
-
-impl EventEmitter<ManifestTreeEvent> for ManifestTree {}
-
 impl ManifestTree {
     pub fn new(worktree_store: Entity<WorktreeStore>, cx: &mut App) -> Entity<Self> {
         cx.new(|cx| Self {
@@ -101,30 +85,28 @@ impl ManifestTree {
                             worktree_roots.roots = RootPathTrie::new();
                         })
                     }
-                    cx.emit(ManifestTreeEvent::Cleared);
                 }),
             ],
             worktree_store,
         })
     }
+
     pub(crate) fn root_for_path(
         &mut self,
-        ProjectPath { worktree_id, path }: ProjectPath,
-        manifests: &mut dyn Iterator<Item = ManifestName>,
-        delegate: Arc<dyn ManifestDelegate>,
+        ProjectPath { worktree_id, path }: &ProjectPath,
+        manifest_name: &ManifestName,
+        delegate: &Arc<dyn ManifestDelegate>,
         cx: &mut App,
-    ) -> BTreeMap<ManifestName, ProjectPath> {
-        debug_assert_eq!(delegate.worktree_id(), worktree_id);
-        let mut roots = BTreeMap::from_iter(
-            manifests.map(|manifest| (manifest, (None, LabelPresence::KnownAbsent))),
-        );
-        let worktree_roots = match self.root_points.entry(worktree_id) {
+    ) -> Option<ProjectPath> {
+        debug_assert_eq!(delegate.worktree_id(), *worktree_id);
+        let (mut marked_path, mut current_presence) = (None, LabelPresence::KnownAbsent);
+        let worktree_roots = match self.root_points.entry(*worktree_id) {
             Entry::Occupied(occupied_entry) => occupied_entry.get().clone(),
             Entry::Vacant(vacant_entry) => {
                 let Some(worktree) = self
                     .worktree_store
                     .read(cx)
-                    .worktree_for_id(worktree_id, cx)
+                    .worktree_for_id(*worktree_id, cx)
                 else {
                     return Default::default();
                 };
@@ -133,16 +115,16 @@ impl ManifestTree {
             }
         };
 
-        let key = TriePath::from(&*path);
+        let key = TriePath::from(&**path);
         worktree_roots.read_with(cx, |this, _| {
             this.roots.walk(&key, &mut |path, labels| {
                 for (label, presence) in labels {
-                    if let Some((marked_path, current_presence)) = roots.get_mut(label) {
-                        if *current_presence > *presence {
+                    if label == manifest_name {
+                        if current_presence > *presence {
                             debug_assert!(false, "RootPathTrie precondition violation; while walking the tree label presence is only allowed to increase");
                         }
-                        *marked_path = Some(ProjectPath {worktree_id, path: path.clone()});
-                        *current_presence = *presence;
+                        marked_path = Some(ProjectPath {worktree_id: *worktree_id, path: path.clone()});
+                        current_presence = *presence;
                     }
 
                 }
@@ -150,12 +132,9 @@ impl ManifestTree {
             });
         });
 
-        for (manifest_name, (root_path, presence)) in &mut roots {
-            if *presence == LabelPresence::Present {
-                continue;
-            }
-
-            let depth = root_path
+        if current_presence == LabelPresence::KnownAbsent {
+            // Some part of the path is unexplored.
+            let depth = marked_path
                 .as_ref()
                 .map(|root_path| {
                     path.strip_prefix(&root_path.path)
@@ -165,13 +144,10 @@ impl ManifestTree {
                 })
                 .unwrap_or_else(|| path.components().count() + 1);
 
-            if depth > 0 {
-                let Some(provider) = ManifestProviders::global(cx).get(manifest_name.borrow())
-                else {
-                    log::warn!("Manifest provider `{}` not found", manifest_name.as_ref());
-                    continue;
-                };
-
+            if depth > 0
+                && let Some(provider) =
+                    ManifestProvidersStore::global(cx).get(manifest_name.borrow())
+            {
                 let root = provider.search(ManifestQuery {
                     path: path.clone(),
                     depth,
@@ -182,9 +158,9 @@ impl ManifestTree {
                         let root = TriePath::from(&*known_root);
                         this.roots
                             .insert(&root, manifest_name.clone(), LabelPresence::Present);
-                        *presence = LabelPresence::Present;
-                        *root_path = Some(ProjectPath {
-                            worktree_id,
+                        current_presence = LabelPresence::Present;
+                        marked_path = Some(ProjectPath {
+                            worktree_id: *worktree_id,
                             path: known_root,
                         });
                     }),
@@ -195,25 +171,35 @@ impl ManifestTree {
                 }
             }
         }
-
-        roots
-            .into_iter()
-            .filter_map(|(k, (path, presence))| {
-                let path = path?;
-                presence.eq(&LabelPresence::Present).then(|| (k, path))
-            })
-            .collect()
+        marked_path.filter(|_| current_presence.eq(&LabelPresence::Present))
     }
+
+    pub(crate) fn root_for_path_or_worktree_root(
+        &mut self,
+        project_path: &ProjectPath,
+        manifest_name: Option<&ManifestName>,
+        delegate: &Arc<dyn ManifestDelegate>,
+        cx: &mut App,
+    ) -> ProjectPath {
+        let worktree_id = project_path.worktree_id;
+        // Backwards-compat: Fill in any adapters for which we did not detect the root as having the project root at the root of a worktree.
+        manifest_name
+            .and_then(|manifest_name| self.root_for_path(project_path, manifest_name, delegate, cx))
+            .unwrap_or_else(|| ProjectPath {
+                worktree_id,
+                path: Arc::from(Path::new("")),
+            })
+    }
+
     fn on_worktree_store_event(
         &mut self,
         _: Entity<WorktreeStore>,
         evt: &WorktreeStoreEvent,
-        cx: &mut Context<Self>,
+        _: &mut Context<Self>,
     ) {
         match evt {
             WorktreeStoreEvent::WorktreeRemoved(_, worktree_id) => {
                 self.root_points.remove(&worktree_id);
-                cx.emit(ManifestTreeEvent::WorktreeRemoved(*worktree_id));
             }
             _ => {}
         }
@@ -223,6 +209,7 @@ impl ManifestTree {
 pub(crate) struct ManifestQueryDelegate {
     worktree: Snapshot,
 }
+
 impl ManifestQueryDelegate {
     pub fn new(worktree: Snapshot) -> Self {
         Self { worktree }
diff --git a/crates/project/src/manifest_tree/manifest_store.rs b/crates/project/src/manifest_tree/manifest_store.rs
index 0462b25798..cf9f81aee4 100644
--- a/crates/project/src/manifest_tree/manifest_store.rs
+++ b/crates/project/src/manifest_tree/manifest_store.rs
@@ -1,4 +1,4 @@
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use gpui::{App, Global, SharedString};
 use parking_lot::RwLock;
 use std::{ops::Deref, sync::Arc};
@@ -11,13 +11,13 @@ struct ManifestProvidersState {
 }
 
 #[derive(Clone, Default)]
-pub struct ManifestProviders(Arc<RwLock<ManifestProvidersState>>);
+pub struct ManifestProvidersStore(Arc<RwLock<ManifestProvidersState>>);
 
 #[derive(Default)]
-struct GlobalManifestProvider(ManifestProviders);
+struct GlobalManifestProvider(ManifestProvidersStore);
 
 impl Deref for GlobalManifestProvider {
-    type Target = ManifestProviders;
+    type Target = ManifestProvidersStore;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -26,7 +26,7 @@ impl Deref for GlobalManifestProvider {
 
 impl Global for GlobalManifestProvider {}
 
-impl ManifestProviders {
+impl ManifestProvidersStore {
     /// Returns the global [`ManifestStore`].
     ///
     /// Inserts a default [`ManifestStore`] if one does not yet exist.
@@ -45,4 +45,7 @@ impl ManifestProviders {
     pub(super) fn get(&self, name: &SharedString) -> Option<Arc<dyn ManifestProvider>> {
         self.0.read().providers.get(name).cloned()
     }
+    pub(crate) fn manifest_file_names(&self) -> HashSet<ManifestName> {
+        self.0.read().providers.keys().cloned().collect()
+    }
 }
diff --git a/crates/project/src/manifest_tree/server_tree.rs b/crates/project/src/manifest_tree/server_tree.rs
index 81cb1c450c..49c0cff730 100644
--- a/crates/project/src/manifest_tree/server_tree.rs
+++ b/crates/project/src/manifest_tree/server_tree.rs
@@ -4,8 +4,7 @@
 //!
 //! ## RPC
 //! LSP Tree is transparent to RPC peers; when clients ask host to spawn a new language server, the host will perform LSP Tree lookup for provided path; it may decide
-//! to reuse existing language server. The client maintains it's own LSP Tree that is a subset of host LSP Tree. Done this way, the client does not need to
-//! ask about suitable language server for each path it interacts with; it can resolve most of the queries locally.
+//! to reuse existing language server.
 
 use std::{
     collections::{BTreeMap, BTreeSet},
@@ -14,20 +13,23 @@ use std::{
 };
 
 use collections::IndexMap;
-use gpui::{App, AppContext as _, Entity, Subscription};
+use gpui::{App, Entity};
 use language::{
-    CachedLspAdapter, LanguageName, LanguageRegistry, ManifestDelegate,
+    CachedLspAdapter, LanguageName, LanguageRegistry, ManifestDelegate, ManifestName, Toolchain,
     language_settings::AllLanguageSettings,
 };
 use lsp::LanguageServerName;
 use settings::{Settings, SettingsLocation, WorktreeId};
 use std::sync::OnceLock;
 
-use crate::{LanguageServerId, ProjectPath, project_settings::LspSettings};
+use crate::{
+    LanguageServerId, ProjectPath, project_settings::LspSettings,
+    toolchain_store::LocalToolchainStore,
+};
 
-use super::{ManifestTree, ManifestTreeEvent};
+use super::ManifestTree;
 
-#[derive(Debug, Default)]
+#[derive(Clone, Debug, Default)]
 pub(crate) struct ServersForWorktree {
     pub(crate) roots: BTreeMap<
         Arc<Path>,
@@ -39,7 +41,7 @@ pub struct LanguageServerTree {
     manifest_tree: Entity<ManifestTree>,
     pub(crate) instances: BTreeMap<WorktreeId, ServersForWorktree>,
     languages: Arc<LanguageRegistry>,
-    _subscriptions: Subscription,
+    toolchains: Entity<LocalToolchainStore>,
 }
 
 /// A node in language server tree represents either:
@@ -49,22 +51,15 @@ pub struct LanguageServerTree {
 pub struct LanguageServerTreeNode(Weak<InnerTreeNode>);
 
 /// Describes a request to launch a language server.
-#[derive(Debug)]
-pub(crate) struct LaunchDisposition<'a> {
-    pub(crate) server_name: &'a LanguageServerName,
+#[derive(Clone, Debug)]
+pub(crate) struct LaunchDisposition {
+    pub(crate) server_name: LanguageServerName,
+    /// Path to the root directory of a subproject.
     pub(crate) path: ProjectPath,
     pub(crate) settings: Arc<LspSettings>,
+    pub(crate) toolchain: Option<Toolchain>,
 }
 
-impl<'a> From<&'a InnerTreeNode> for LaunchDisposition<'a> {
-    fn from(value: &'a InnerTreeNode) -> Self {
-        LaunchDisposition {
-            server_name: &value.name,
-            path: value.path.clone(),
-            settings: value.settings.clone(),
-        }
-    }
-}
 impl LanguageServerTreeNode {
     /// Returns a language server ID for this node if there is one.
     /// Returns None if this node has not been initialized yet or it is no longer in the tree.
@@ -76,19 +71,17 @@ impl LanguageServerTreeNode {
     /// May return None if the node no longer belongs to the server tree it was created in.
     pub(crate) fn server_id_or_init(
         &self,
-        init: impl FnOnce(LaunchDisposition) -> LanguageServerId,
+        init: impl FnOnce(&Arc<LaunchDisposition>) -> LanguageServerId,
     ) -> Option<LanguageServerId> {
         let this = self.0.upgrade()?;
-        Some(
-            *this
-                .id
-                .get_or_init(|| init(LaunchDisposition::from(&*this))),
-        )
+        Some(*this.id.get_or_init(|| init(&this.disposition)))
     }
 
     /// Returns a language server name as the language server adapter would return.
     pub fn name(&self) -> Option<LanguageServerName> {
-        self.0.upgrade().map(|node| node.name.clone())
+        self.0
+            .upgrade()
+            .map(|node| node.disposition.server_name.clone())
     }
 }
 
@@ -101,160 +94,149 @@ impl From<Weak<InnerTreeNode>> for LanguageServerTreeNode {
 #[derive(Debug)]
 pub struct InnerTreeNode {
     id: OnceLock<LanguageServerId>,
-    name: LanguageServerName,
-    path: ProjectPath,
-    settings: Arc<LspSettings>,
+    disposition: Arc<LaunchDisposition>,
 }
 
 impl InnerTreeNode {
     fn new(
-        name: LanguageServerName,
+        server_name: LanguageServerName,
         path: ProjectPath,
-        settings: impl Into<Arc<LspSettings>>,
+        settings: LspSettings,
+        toolchain: Option<Toolchain>,
     ) -> Self {
         InnerTreeNode {
             id: Default::default(),
-            name,
-            path,
-            settings: settings.into(),
+            disposition: Arc::new(LaunchDisposition {
+                server_name,
+                path,
+                settings: settings.into(),
+                toolchain,
+            }),
         }
     }
 }
 
-/// Determines how the list of adapters to query should be constructed.
-pub(crate) enum AdapterQuery<'a> {
-    /// Search for roots of all adapters associated with a given language name.
-    /// Layman: Look for all project roots along the queried path that have any
-    /// language server associated with this language running.
-    Language(&'a LanguageName),
-    /// Search for roots of adapter with a given name.
-    /// Layman: Look for all project roots along the queried path that have this server running.
-    Adapter(&'a LanguageServerName),
-}
-
 impl LanguageServerTree {
     pub(crate) fn new(
         manifest_tree: Entity<ManifestTree>,
         languages: Arc<LanguageRegistry>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| Self {
-            _subscriptions: cx.subscribe(&manifest_tree, |_: &mut Self, _, event, _| {
-                if event == &ManifestTreeEvent::Cleared {}
-            }),
+        toolchains: Entity<LocalToolchainStore>,
+    ) -> Self {
+        Self {
             manifest_tree,
             instances: Default::default(),
-
             languages,
-        })
+            toolchains,
+        }
+    }
+
+    /// Get all initialized language server IDs for a given path.
+    pub(crate) fn get<'a>(
+        &'a self,
+        path: ProjectPath,
+        language_name: LanguageName,
+        manifest_name: Option<&ManifestName>,
+        delegate: &Arc<dyn ManifestDelegate>,
+        cx: &mut App,
+    ) -> impl Iterator<Item = LanguageServerId> + 'a {
+        let manifest_location = self.manifest_location_for_path(&path, manifest_name, delegate, cx);
+        let adapters = self.adapters_for_language(&manifest_location, &language_name, cx);
+        self.get_with_adapters(manifest_location, adapters)
     }
 
     /// Get all language server root points for a given path and language; the language servers might already be initialized at a given path.
-    pub(crate) fn get<'a>(
+    pub(crate) fn walk<'a>(
         &'a mut self,
         path: ProjectPath,
-        query: AdapterQuery<'_>,
-        delegate: Arc<dyn ManifestDelegate>,
-        cx: &mut App,
+        language_name: LanguageName,
+        manifest_name: Option<&ManifestName>,
+        delegate: &Arc<dyn ManifestDelegate>,
+        cx: &'a mut App,
     ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
-        let settings_location = SettingsLocation {
-            worktree_id: path.worktree_id,
-            path: &path.path,
-        };
-        let adapters = match query {
-            AdapterQuery::Language(language_name) => {
-                self.adapters_for_language(settings_location, language_name, cx)
-            }
-            AdapterQuery::Adapter(language_server_name) => {
-                IndexMap::from_iter(self.adapter_for_name(language_server_name).map(|adapter| {
-                    (
+        let manifest_location = self.manifest_location_for_path(&path, manifest_name, delegate, cx);
+        let adapters = self.adapters_for_language(&manifest_location, &language_name, cx);
+        self.init_with_adapters(manifest_location, language_name, adapters, cx)
+    }
+
+    fn init_with_adapters<'a>(
+        &'a mut self,
+        root_path: ProjectPath,
+        language_name: LanguageName,
+        adapters: IndexMap<LanguageServerName, (LspSettings, Arc<CachedLspAdapter>)>,
+        cx: &'a App,
+    ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
+        adapters.into_iter().map(move |(_, (settings, adapter))| {
+            let root_path = root_path.clone();
+            let inner_node = self
+                .instances
+                .entry(root_path.worktree_id)
+                .or_default()
+                .roots
+                .entry(root_path.path.clone())
+                .or_default()
+                .entry(adapter.name());
+            let (node, languages) = inner_node.or_insert_with(|| {
+                let toolchain = self.toolchains.read(cx).active_toolchain(
+                    root_path.worktree_id,
+                    &root_path.path,
+                    language_name.clone(),
+                );
+                (
+                    Arc::new(InnerTreeNode::new(
                         adapter.name(),
-                        (LspSettings::default(), BTreeSet::new(), adapter),
-                    )
-                }))
-            }
-        };
-        self.get_with_adapters(path, adapters, delegate, cx)
+                        root_path.clone(),
+                        settings.clone(),
+                        toolchain,
+                    )),
+                    Default::default(),
+                )
+            });
+            languages.insert(language_name.clone());
+            Arc::downgrade(&node).into()
+        })
     }
 
     fn get_with_adapters<'a>(
-        &'a mut self,
-        path: ProjectPath,
-        adapters: IndexMap<
-            LanguageServerName,
-            (LspSettings, BTreeSet<LanguageName>, Arc<CachedLspAdapter>),
-        >,
-        delegate: Arc<dyn ManifestDelegate>,
-        cx: &mut App,
-    ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
-        let worktree_id = path.worktree_id;
-
-        let mut manifest_to_adapters = BTreeMap::default();
-        for (_, _, adapter) in adapters.values() {
-            if let Some(manifest_name) = adapter.manifest_name() {
-                manifest_to_adapters
-                    .entry(manifest_name)
-                    .or_insert_with(Vec::default)
-                    .push(adapter.clone());
-            }
-        }
-
-        let roots = self.manifest_tree.update(cx, |this, cx| {
-            this.root_for_path(
-                path,
-                &mut manifest_to_adapters.keys().cloned(),
-                delegate,
-                cx,
-            )
-        });
-        let root_path = std::cell::LazyCell::new(move || ProjectPath {
-            worktree_id,
-            path: Arc::from("".as_ref()),
-        });
-        adapters
-            .into_iter()
-            .map(move |(_, (settings, new_languages, adapter))| {
-                // Backwards-compat: Fill in any adapters for which we did not detect the root as having the project root at the root of a worktree.
-                let root_path = adapter
-                    .manifest_name()
-                    .and_then(|name| roots.get(&name))
-                    .cloned()
-                    .unwrap_or_else(|| root_path.clone());
-
-                let inner_node = self
-                    .instances
-                    .entry(root_path.worktree_id)
-                    .or_default()
-                    .roots
-                    .entry(root_path.path.clone())
-                    .or_default()
-                    .entry(adapter.name());
-                let (node, languages) = inner_node.or_insert_with(|| {
-                    (
-                        Arc::new(InnerTreeNode::new(
-                            adapter.name(),
-                            root_path.clone(),
-                            settings.clone(),
-                        )),
-                        Default::default(),
-                    )
-                });
-                languages.extend(new_languages.iter().cloned());
-                Arc::downgrade(&node).into()
-            })
+        &'a self,
+        root_path: ProjectPath,
+        adapters: IndexMap<LanguageServerName, (LspSettings, Arc<CachedLspAdapter>)>,
+    ) -> impl Iterator<Item = LanguageServerId> + 'a {
+        adapters.into_iter().filter_map(move |(_, (_, adapter))| {
+            let root_path = root_path.clone();
+            let inner_node = self
+                .instances
+                .get(&root_path.worktree_id)?
+                .roots
+                .get(&root_path.path)?
+                .get(&adapter.name())?;
+            inner_node.0.id.get().copied()
+        })
     }
 
-    fn adapter_for_name(&self, name: &LanguageServerName) -> Option<Arc<CachedLspAdapter>> {
-        self.languages.adapter_for_name(name)
+    fn manifest_location_for_path(
+        &self,
+        path: &ProjectPath,
+        manifest_name: Option<&ManifestName>,
+        delegate: &Arc<dyn ManifestDelegate>,
+        cx: &mut App,
+    ) -> ProjectPath {
+        // Find out what the root location of our subproject is.
+        // That's where we'll look for language settings (that include a set of language servers).
+        self.manifest_tree.update(cx, |this, cx| {
+            this.root_for_path_or_worktree_root(path, manifest_name, delegate, cx)
+        })
     }
 
     fn adapters_for_language(
         &self,
-        settings_location: SettingsLocation,
+        manifest_location: &ProjectPath,
         language_name: &LanguageName,
         cx: &App,
-    ) -> IndexMap<LanguageServerName, (LspSettings, BTreeSet<LanguageName>, Arc<CachedLspAdapter>)>
-    {
+    ) -> IndexMap<LanguageServerName, (LspSettings, Arc<CachedLspAdapter>)> {
+        let settings_location = SettingsLocation {
+            worktree_id: manifest_location.worktree_id,
+            path: &manifest_location.path,
+        };
         let settings = AllLanguageSettings::get(Some(settings_location), cx).language(
             Some(settings_location),
             Some(language_name),
@@ -295,14 +277,7 @@ impl LanguageServerTree {
                 )
                 .cloned()
                 .unwrap_or_default();
-                Some((
-                    adapter.name(),
-                    (
-                        adapter_settings,
-                        BTreeSet::from_iter([language_name.clone()]),
-                        adapter,
-                    ),
-                ))
+                Some((adapter.name(), (adapter_settings, adapter)))
             })
             .collect::<IndexMap<_, _>>();
         // After starting all the language servers, reorder them to reflect the desired order
@@ -315,17 +290,23 @@ impl LanguageServerTree {
             &language_name,
             adapters_with_settings
                 .values()
-                .map(|(_, _, adapter)| adapter.clone())
+                .map(|(_, adapter)| adapter.clone())
                 .collect(),
         );
 
         adapters_with_settings
     }
 
-    // Rebasing a tree:
-    // - Clears it out
-    // - Provides you with the indirect access to the old tree while you're reinitializing a new one (by querying it).
-    pub(crate) fn rebase(&mut self) -> ServerTreeRebase<'_> {
+    /// Server Tree is built up incrementally via queries for distinct paths of the worktree.
+    /// Results of these queries have to be invalidated when data used to build the tree changes.
+    ///
+    /// The environment of a server tree is a set of all user settings.
+    /// Rebasing a tree means invalidating it and building up a new one while reusing the old tree where applicable.
+    /// We want to reuse the old tree in order to preserve as many of the running language servers as possible.
+    /// E.g. if the user disables one of their language servers for Python, we don't want to shut down any language servers unaffected by this settings change.
+    ///
+    /// Thus, [`ServerTreeRebase`] mimics the interface of a [`ServerTree`], except that it tries to find a matching language server in the old tree before handing out an uninitialized node.
+    pub(crate) fn rebase(&mut self) -> ServerTreeRebase {
         ServerTreeRebase::new(self)
     }
 
@@ -354,16 +335,16 @@ impl LanguageServerTree {
             .roots
             .entry(Arc::from(Path::new("")))
             .or_default()
-            .entry(node.name.clone())
+            .entry(node.disposition.server_name.clone())
             .or_insert_with(|| (node, BTreeSet::new()))
             .1
             .insert(language_name);
     }
 }
 
-pub(crate) struct ServerTreeRebase<'a> {
+pub(crate) struct ServerTreeRebase {
     old_contents: BTreeMap<WorktreeId, ServersForWorktree>,
-    new_tree: &'a mut LanguageServerTree,
+    new_tree: LanguageServerTree,
     /// All server IDs seen in the old tree.
     all_server_ids: BTreeMap<LanguageServerId, LanguageServerName>,
     /// Server IDs we've preserved for a new iteration of the tree. `all_server_ids - rebased_server_ids` is the
@@ -371,9 +352,9 @@ pub(crate) struct ServerTreeRebase<'a> {
     rebased_server_ids: BTreeSet<LanguageServerId>,
 }
 
-impl<'tree> ServerTreeRebase<'tree> {
-    fn new(new_tree: &'tree mut LanguageServerTree) -> Self {
-        let old_contents = std::mem::take(&mut new_tree.instances);
+impl ServerTreeRebase {
+    fn new(old_tree: &LanguageServerTree) -> Self {
+        let old_contents = old_tree.instances.clone();
         let all_server_ids = old_contents
             .values()
             .flat_map(|nodes| {
@@ -384,69 +365,68 @@ impl<'tree> ServerTreeRebase<'tree> {
                             .id
                             .get()
                             .copied()
-                            .map(|id| (id, server.0.name.clone()))
+                            .map(|id| (id, server.0.disposition.server_name.clone()))
                     })
                 })
             })
             .collect();
+        let new_tree = LanguageServerTree::new(
+            old_tree.manifest_tree.clone(),
+            old_tree.languages.clone(),
+            old_tree.toolchains.clone(),
+        );
         Self {
             old_contents,
-            new_tree,
             all_server_ids,
+            new_tree,
             rebased_server_ids: BTreeSet::new(),
         }
     }
 
-    pub(crate) fn get<'a>(
+    pub(crate) fn walk<'a>(
         &'a mut self,
         path: ProjectPath,
-        query: AdapterQuery<'_>,
+        language_name: LanguageName,
+        manifest_name: Option<&ManifestName>,
         delegate: Arc<dyn ManifestDelegate>,
-        cx: &mut App,
+        cx: &'a mut App,
     ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
-        let settings_location = SettingsLocation {
-            worktree_id: path.worktree_id,
-            path: &path.path,
-        };
-        let adapters = match query {
-            AdapterQuery::Language(language_name) => {
-                self.new_tree
-                    .adapters_for_language(settings_location, language_name, cx)
-            }
-            AdapterQuery::Adapter(language_server_name) => {
-                IndexMap::from_iter(self.new_tree.adapter_for_name(language_server_name).map(
-                    |adapter| {
-                        (
-                            adapter.name(),
-                            (LspSettings::default(), BTreeSet::new(), adapter),
-                        )
-                    },
-                ))
-            }
-        };
+        let manifest =
+            self.new_tree
+                .manifest_location_for_path(&path, manifest_name, &delegate, cx);
+        let adapters = self
+            .new_tree
+            .adapters_for_language(&manifest, &language_name, cx);
 
         self.new_tree
-            .get_with_adapters(path, adapters, delegate, cx)
+            .init_with_adapters(manifest, language_name, adapters, cx)
             .filter_map(|node| {
                 // Inspect result of the query and initialize it ourselves before
                 // handing it off to the caller.
-                let disposition = node.0.upgrade()?;
+                let live_node = node.0.upgrade()?;
 
-                if disposition.id.get().is_some() {
+                if live_node.id.get().is_some() {
                     return Some(node);
                 }
+                let disposition = &live_node.disposition;
                 let Some((existing_node, _)) = self
                     .old_contents
                     .get(&disposition.path.worktree_id)
                     .and_then(|worktree_nodes| worktree_nodes.roots.get(&disposition.path.path))
-                    .and_then(|roots| roots.get(&disposition.name))
-                    .filter(|(old_node, _)| disposition.settings == old_node.settings)
+                    .and_then(|roots| roots.get(&disposition.server_name))
+                    .filter(|(old_node, _)| {
+                        (&disposition.toolchain, &disposition.settings)
+                            == (
+                                &old_node.disposition.toolchain,
+                                &old_node.disposition.settings,
+                            )
+                    })
                 else {
                     return Some(node);
                 };
                 if let Some(existing_id) = existing_node.id.get() {
                     self.rebased_server_ids.insert(*existing_id);
-                    disposition.id.set(*existing_id).ok();
+                    live_node.id.set(*existing_id).ok();
                 }
 
                 Some(node)
@@ -454,11 +434,19 @@ impl<'tree> ServerTreeRebase<'tree> {
     }
 
     /// Returns IDs of servers that are no longer referenced (and can be shut down).
-    pub(crate) fn finish(self) -> BTreeMap<LanguageServerId, LanguageServerName> {
-        self.all_server_ids
-            .into_iter()
-            .filter(|(id, _)| !self.rebased_server_ids.contains(id))
-            .collect()
+    pub(crate) fn finish(
+        self,
+    ) -> (
+        LanguageServerTree,
+        BTreeMap<LanguageServerId, LanguageServerName>,
+    ) {
+        (
+            self.new_tree,
+            self.all_server_ids
+                .into_iter()
+                .filter(|(id, _)| !self.rebased_server_ids.contains(id))
+                .collect(),
+        )
     }
 
     pub(crate) fn server_tree(&mut self) -> &mut LanguageServerTree {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 27ab55d53e..57afaceeca 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -84,7 +84,7 @@ use lsp::{
 };
 use lsp_command::*;
 use lsp_store::{CompletionDocumentation, LspFormatTarget, OpenLspBufferHandle};
-pub use manifest_tree::ManifestProviders;
+pub use manifest_tree::ManifestProvidersStore;
 use node_runtime::NodeRuntime;
 use parking_lot::Mutex;
 pub use prettier_store::PrettierStore;
@@ -1115,7 +1115,11 @@ impl Project {
                     buffer_store.clone(),
                     worktree_store.clone(),
                     prettier_store.clone(),
-                    toolchain_store.clone(),
+                    toolchain_store
+                        .read(cx)
+                        .as_local_store()
+                        .expect("Toolchain store to be local")
+                        .clone(),
                     environment.clone(),
                     manifest_tree,
                     languages.clone(),
@@ -1260,7 +1264,6 @@ impl Project {
                 LspStore::new_remote(
                     buffer_store.clone(),
                     worktree_store.clone(),
-                    Some(toolchain_store.clone()),
                     languages.clone(),
                     ssh_proto.clone(),
                     SSH_PROJECT_ID,
@@ -1485,7 +1488,6 @@ impl Project {
             let mut lsp_store = LspStore::new_remote(
                 buffer_store.clone(),
                 worktree_store.clone(),
-                None,
                 languages.clone(),
                 client.clone().into(),
                 remote_id,
@@ -3596,16 +3598,10 @@ impl Project {
         &mut self,
         abs_path: lsp::Url,
         language_server_id: LanguageServerId,
-        language_server_name: LanguageServerName,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Buffer>>> {
         self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.open_local_buffer_via_lsp(
-                abs_path,
-                language_server_id,
-                language_server_name,
-                cx,
-            )
+            lsp_store.open_local_buffer_via_lsp(abs_path, language_server_id, cx)
         })
     }
 
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 12e3aa88ad..d78526ddd0 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -22,6 +22,7 @@ use settings::{
     SettingsStore, parse_json_with_comments, watch_config_file,
 };
 use std::{
+    collections::BTreeMap,
     path::{Path, PathBuf},
     sync::Arc,
     time::Duration,
@@ -518,16 +519,15 @@ impl Default for InlineBlameSettings {
     }
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, Hash)]
 pub struct BinarySettings {
     pub path: Option<String>,
     pub arguments: Option<Vec<String>>,
-    // this can't be an FxHashMap because the extension APIs require the default SipHash
-    pub env: Option<std::collections::HashMap<String, String>>,
+    pub env: Option<BTreeMap<String, String>>,
     pub ignore_system_version: Option<bool>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, Hash)]
 #[serde(rename_all = "snake_case")]
 pub struct LspSettings {
     pub binary: Option<BinarySettings>,
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index cb3c9efe60..5b3827b42b 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1099,9 +1099,9 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
     let prev_read_dir_count = fs.read_dir_call_count();
 
     let fake_server = fake_servers.next().await.unwrap();
-    let (server_id, server_name) = lsp_store.read_with(cx, |lsp_store, _| {
-        let (id, status) = lsp_store.language_server_statuses().next().unwrap();
-        (id, status.name.clone())
+    let server_id = lsp_store.read_with(cx, |lsp_store, _| {
+        let (id, _) = lsp_store.language_server_statuses().next().unwrap();
+        id
     });
 
     // Simulate jumping to a definition in a dependency outside of the worktree.
@@ -1110,7 +1110,6 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
             project.open_local_buffer_via_lsp(
                 lsp::Url::from_file_path(path!("/the-registry/dep1/src/dep1.rs")).unwrap(),
                 server_id,
-                server_name.clone(),
                 cx,
             )
         })
diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
index 61a005520d..05531ebe9a 100644
--- a/crates/project/src/toolchain_store.rs
+++ b/crates/project/src/toolchain_store.rs
@@ -11,7 +11,10 @@ use collections::BTreeMap;
 use gpui::{
     App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,
 };
-use language::{LanguageName, LanguageRegistry, LanguageToolchainStore, Toolchain, ToolchainList};
+use language::{
+    LanguageName, LanguageRegistry, LanguageToolchainStore, ManifestDelegate, Toolchain,
+    ToolchainList,
+};
 use rpc::{
     AnyProtoClient, TypedEnvelope,
     proto::{self, FromProto, ToProto},
@@ -104,9 +107,11 @@ impl ToolchainStore {
         cx: &App,
     ) -> Task<Option<Toolchain>> {
         match &self.0 {
-            ToolchainStoreInner::Local(local, _) => {
-                local.read(cx).active_toolchain(path, language_name, cx)
-            }
+            ToolchainStoreInner::Local(local, _) => Task::ready(local.read(cx).active_toolchain(
+                path.worktree_id,
+                &path.path,
+                language_name,
+            )),
             ToolchainStoreInner::Remote(remote) => {
                 remote.read(cx).active_toolchain(path, language_name, cx)
             }
@@ -232,9 +237,15 @@ impl ToolchainStore {
             ToolchainStoreInner::Remote(remote) => Arc::new(RemoteStore(remote.downgrade())),
         }
     }
+    pub fn as_local_store(&self) -> Option<&Entity<LocalToolchainStore>> {
+        match &self.0 {
+            ToolchainStoreInner::Local(local, _) => Some(local),
+            ToolchainStoreInner::Remote(_) => None,
+        }
+    }
 }
 
-struct LocalToolchainStore {
+pub struct LocalToolchainStore {
     languages: Arc<LanguageRegistry>,
     worktree_store: Entity<WorktreeStore>,
     project_environment: Entity<ProjectEnvironment>,
@@ -243,20 +254,19 @@ struct LocalToolchainStore {
 }
 
 #[async_trait(?Send)]
-impl language::LanguageToolchainStore for LocalStore {
-    async fn active_toolchain(
+impl language::LocalLanguageToolchainStore for LocalStore {
+    fn active_toolchain(
         self: Arc<Self>,
         worktree_id: WorktreeId,
-        path: Arc<Path>,
+        path: &Arc<Path>,
         language_name: LanguageName,
         cx: &mut AsyncApp,
     ) -> Option<Toolchain> {
         self.0
-            .update(cx, |this, cx| {
-                this.active_toolchain(ProjectPath { worktree_id, path }, language_name, cx)
+            .update(cx, |this, _| {
+                this.active_toolchain(worktree_id, path, language_name)
             })
             .ok()?
-            .await
     }
 }
 
@@ -279,19 +289,18 @@ impl language::LanguageToolchainStore for RemoteStore {
 }
 
 pub struct EmptyToolchainStore;
-#[async_trait(?Send)]
-impl language::LanguageToolchainStore for EmptyToolchainStore {
-    async fn active_toolchain(
+impl language::LocalLanguageToolchainStore for EmptyToolchainStore {
+    fn active_toolchain(
         self: Arc<Self>,
         _: WorktreeId,
-        _: Arc<Path>,
+        _: &Arc<Path>,
         _: LanguageName,
         _: &mut AsyncApp,
     ) -> Option<Toolchain> {
         None
     }
 }
-struct LocalStore(WeakEntity<LocalToolchainStore>);
+pub(crate) struct LocalStore(WeakEntity<LocalToolchainStore>);
 struct RemoteStore(WeakEntity<RemoteToolchainStore>);
 
 #[derive(Clone)]
@@ -349,17 +358,13 @@ impl LocalToolchainStore {
                 .flatten()?;
             let worktree_id = snapshot.id();
             let worktree_root = snapshot.abs_path().to_path_buf();
+            let delegate =
+                Arc::from(ManifestQueryDelegate::new(snapshot)) as Arc<dyn ManifestDelegate>;
             let relative_path = manifest_tree
                 .update(cx, |this, cx| {
-                    this.root_for_path(
-                        path,
-                        &mut std::iter::once(manifest_name.clone()),
-                        Arc::new(ManifestQueryDelegate::new(snapshot)),
-                        cx,
-                    )
+                    this.root_for_path(&path, &manifest_name, &delegate, cx)
                 })
                 .ok()?
-                .remove(&manifest_name)
                 .unwrap_or_else(|| ProjectPath {
                     path: Arc::from(Path::new("")),
                     worktree_id,
@@ -394,21 +399,20 @@ impl LocalToolchainStore {
     }
     pub(crate) fn active_toolchain(
         &self,
-        path: ProjectPath,
+        worktree_id: WorktreeId,
+        relative_path: &Arc<Path>,
         language_name: LanguageName,
-        _: &App,
-    ) -> Task<Option<Toolchain>> {
-        let ancestors = path.path.ancestors();
-        Task::ready(
-            self.active_toolchains
-                .get(&(path.worktree_id, language_name))
-                .and_then(|paths| {
-                    ancestors
-                        .into_iter()
-                        .find_map(|root_path| paths.get(root_path))
-                })
-                .cloned(),
-        )
+    ) -> Option<Toolchain> {
+        let ancestors = relative_path.ancestors();
+
+        self.active_toolchains
+            .get(&(worktree_id, language_name))
+            .and_then(|paths| {
+                ancestors
+                    .into_iter()
+                    .find_map(|root_path| paths.get(root_path))
+            })
+            .cloned()
     }
 }
 struct RemoteToolchainStore {
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index b4d3162641..ac1737ba4b 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -171,7 +171,11 @@ impl HeadlessProject {
                 buffer_store.clone(),
                 worktree_store.clone(),
                 prettier_store.clone(),
-                toolchain_store.clone(),
+                toolchain_store
+                    .read(cx)
+                    .as_local_store()
+                    .expect("Toolchain store to be local")
+                    .clone(),
                 environment,
                 manifest_tree,
                 languages.clone(),

From 2075627d6c31a6661816335afc69e662ef0b60e2 Mon Sep 17 00:00:00 2001
From: Mahmud Ridwan <m@hjr265.me>
Date: Mon, 18 Aug 2025 15:54:45 +0600
Subject: [PATCH 106/823] Suggest single tracked commit message only when
 nothing else is staged (#36347)

Closes #36341

<img width="543" height="548" alt="image"
src="https://github.com/user-attachments/assets/ab76a32c-c622-4025-9b28-5accc8d3f04c"
/>

In the case where commit message was suggested based on single tracked
entry, this PR adds a clause to the condition to ensure there are no
staged entries.

Release Notes:

- Fixed commit message suggestion when there is one unstaged tracked
file, but multiple untracked files are staged.
---
 crates/git_ui/src/git_panel.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 70987dd212..b346f4d216 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1833,7 +1833,9 @@ impl GitPanel {
 
         let git_status_entry = if let Some(staged_entry) = &self.single_staged_entry {
             Some(staged_entry)
-        } else if let Some(single_tracked_entry) = &self.single_tracked_entry {
+        } else if self.total_staged_count() == 0
+            && let Some(single_tracked_entry) = &self.single_tracked_entry
+        {
             Some(single_tracked_entry)
         } else {
             None

From 2eadd5a3962e250fc14820ef60dbe94804959b41 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 18 Aug 2025 11:56:02 +0200
Subject: [PATCH 107/823] agent2: Make `model` of `Thread` optional (#36395)

Related to #36394

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs                |  42 ++---
 crates/agent2/src/tests/mod.rs            | 200 ++++++++++++++--------
 crates/agent2/src/thread.rs               |  45 ++---
 crates/agent2/src/tools/edit_file_tool.rs |  32 ++--
 crates/agent_ui/src/acp/thread_view.rs    |  14 +-
 5 files changed, 195 insertions(+), 138 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index d63e3f8134..0ad90753e1 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -427,9 +427,11 @@ impl NativeAgent {
         self.models.refresh_list(cx);
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, _| {
-                let model_id = LanguageModels::model_id(&thread.model());
-                if let Some(model) = self.models.model_from_id(&model_id) {
-                    thread.set_model(model.clone());
+                if let Some(model) = thread.model() {
+                    let model_id = LanguageModels::model_id(model);
+                    if let Some(model) = self.models.model_from_id(&model_id) {
+                        thread.set_model(model.clone());
+                    }
                 }
             });
         }
@@ -622,13 +624,15 @@ impl AgentModelSelector for NativeAgentConnection {
         else {
             return Task::ready(Err(anyhow!("Session not found")));
         };
-        let model = thread.read(cx).model().clone();
+        let Some(model) = thread.read(cx).model() else {
+            return Task::ready(Err(anyhow!("Model not found")));
+        };
         let Some(provider) = LanguageModelRegistry::read_global(cx).provider(&model.provider_id())
         else {
             return Task::ready(Err(anyhow!("Provider not found")));
         };
         Task::ready(Ok(LanguageModels::map_language_model_to_info(
-            &model, &provider,
+            model, &provider,
         )))
     }
 
@@ -679,19 +683,11 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                     let available_count = registry.available_models(cx).count();
                     log::debug!("Total available models: {}", available_count);
 
-                    let default_model = registry
-                        .default_model()
-                        .and_then(|default_model| {
-                            agent
-                                .models
-                                .model_from_id(&LanguageModels::model_id(&default_model.model))
-                        })
-                        .ok_or_else(|| {
-                            log::warn!("No default model configured in settings");
-                            anyhow!(
-                                "No default model. Please configure a default model in settings."
-                            )
-                        })?;
+                    let default_model = registry.default_model().and_then(|default_model| {
+                        agent
+                            .models
+                            .model_from_id(&LanguageModels::model_id(&default_model.model))
+                    });
 
                     let thread = cx.new(|cx| {
                         let mut thread = Thread::new(
@@ -777,13 +773,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
             log::debug!("Message id: {:?}", id);
             log::debug!("Message content: {:?}", content);
 
-            Ok(thread.update(cx, |thread, cx| {
-                log::info!(
-                    "Sending message to thread with model: {:?}",
-                    thread.model().name()
-                );
-                thread.send(id, content, cx)
-            }))
+            thread.update(cx, |thread, cx| thread.send(id, content, cx))
         })
     }
 
@@ -1008,7 +998,7 @@ mod tests {
         agent.read_with(cx, |agent, _| {
             let session = agent.sessions.get(&session_id).unwrap();
             session.thread.read_with(cx, |thread, _| {
-                assert_eq!(thread.model().id().0, "fake");
+                assert_eq!(thread.model().unwrap().id().0, "fake");
             });
         });
 
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 48a16bf685..e3e3050d49 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -40,6 +40,7 @@ async fn test_echo(cx: &mut TestAppContext) {
         .update(cx, |thread, cx| {
             thread.send(UserMessageId::new(), ["Testing: Reply with 'Hello'"], cx)
         })
+        .unwrap()
         .collect()
         .await;
     thread.update(cx, |thread, _cx| {
@@ -73,6 +74,7 @@ async fn test_thinking(cx: &mut TestAppContext) {
                 cx,
             )
         })
+        .unwrap()
         .collect()
         .await;
     thread.update(cx, |thread, _cx| {
@@ -101,9 +103,11 @@ async fn test_system_prompt(cx: &mut TestAppContext) {
 
     project_context.borrow_mut().shell = "test-shell".into();
     thread.update(cx, |thread, _| thread.add_tool(EchoTool));
-    thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["abc"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["abc"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     let mut pending_completions = fake_model.pending_completions();
     assert_eq!(
@@ -136,9 +140,11 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
     let fake_model = model.as_fake();
 
     // Send initial user message and verify it's cached
-    thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Message 1"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Message 1"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
 
     let completion = fake_model.pending_completions().pop().unwrap();
@@ -157,9 +163,11 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
     cx.run_until_parked();
 
     // Send another user message and verify only the latest is cached
-    thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Message 2"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Message 2"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
 
     let completion = fake_model.pending_completions().pop().unwrap();
@@ -191,9 +199,11 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
 
     // Simulate a tool call and verify that the latest tool result is cached
     thread.update(cx, |thread, _| thread.add_tool(EchoTool));
-    thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
 
     let tool_use = LanguageModelToolUse {
@@ -273,6 +283,7 @@ async fn test_basic_tool_calls(cx: &mut TestAppContext) {
                 cx,
             )
         })
+        .unwrap()
         .collect()
         .await;
     assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
@@ -291,6 +302,7 @@ async fn test_basic_tool_calls(cx: &mut TestAppContext) {
                 cx,
             )
         })
+        .unwrap()
         .collect()
         .await;
     assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
@@ -322,10 +334,12 @@ async fn test_streaming_tool_calls(cx: &mut TestAppContext) {
     let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
 
     // Test a tool call that's likely to complete *before* streaming stops.
-    let mut events = thread.update(cx, |thread, cx| {
-        thread.add_tool(WordListTool);
-        thread.send(UserMessageId::new(), ["Test the word_list tool."], cx)
-    });
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.add_tool(WordListTool);
+            thread.send(UserMessageId::new(), ["Test the word_list tool."], cx)
+        })
+        .unwrap();
 
     let mut saw_partial_tool_use = false;
     while let Some(event) = events.next().await {
@@ -371,10 +385,12 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let mut events = thread.update(cx, |thread, cx| {
-        thread.add_tool(ToolRequiringPermission);
-        thread.send(UserMessageId::new(), ["abc"], cx)
-    });
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.add_tool(ToolRequiringPermission);
+            thread.send(UserMessageId::new(), ["abc"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
@@ -501,9 +517,11 @@ async fn test_tool_hallucination(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let mut events = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["abc"], cx)
-    });
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["abc"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
@@ -528,10 +546,12 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let events = thread.update(cx, |thread, cx| {
-        thread.add_tool(EchoTool);
-        thread.send(UserMessageId::new(), ["abc"], cx)
-    });
+    let events = thread
+        .update(cx, |thread, cx| {
+            thread.add_tool(EchoTool);
+            thread.send(UserMessageId::new(), ["abc"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     let tool_use = LanguageModelToolUse {
         id: "tool_id_1".into(),
@@ -644,10 +664,12 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let events = thread.update(cx, |thread, cx| {
-        thread.add_tool(EchoTool);
-        thread.send(UserMessageId::new(), ["abc"], cx)
-    });
+    let events = thread
+        .update(cx, |thread, cx| {
+            thread.add_tool(EchoTool);
+            thread.send(UserMessageId::new(), ["abc"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
 
     let tool_use = LanguageModelToolUse {
@@ -677,9 +699,11 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
             .is::<language_model::ToolUseLimitReachedError>()
     );
 
-    thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), vec!["ghi"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), vec!["ghi"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     let completion = fake_model.pending_completions().pop().unwrap();
     assert_eq!(
@@ -790,6 +814,7 @@ async fn test_concurrent_tool_calls(cx: &mut TestAppContext) {
                 cx,
             )
         })
+        .unwrap()
         .collect()
         .await;
 
@@ -857,10 +882,12 @@ async fn test_profiles(cx: &mut TestAppContext) {
     cx.run_until_parked();
 
     // Test that test-1 profile (default) has echo and delay tools
-    thread.update(cx, |thread, cx| {
-        thread.set_profile(AgentProfileId("test-1".into()));
-        thread.send(UserMessageId::new(), ["test"], cx);
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.set_profile(AgentProfileId("test-1".into()));
+            thread.send(UserMessageId::new(), ["test"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
 
     let mut pending_completions = fake_model.pending_completions();
@@ -875,10 +902,12 @@ async fn test_profiles(cx: &mut TestAppContext) {
     fake_model.end_last_completion_stream();
 
     // Switch to test-2 profile, and verify that it has only the infinite tool.
-    thread.update(cx, |thread, cx| {
-        thread.set_profile(AgentProfileId("test-2".into()));
-        thread.send(UserMessageId::new(), ["test2"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.set_profile(AgentProfileId("test-2".into()));
+            thread.send(UserMessageId::new(), ["test2"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     let mut pending_completions = fake_model.pending_completions();
     assert_eq!(pending_completions.len(), 1);
@@ -896,15 +925,17 @@ async fn test_profiles(cx: &mut TestAppContext) {
 async fn test_cancellation(cx: &mut TestAppContext) {
     let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
 
-    let mut events = thread.update(cx, |thread, cx| {
-        thread.add_tool(InfiniteTool);
-        thread.add_tool(EchoTool);
-        thread.send(
-            UserMessageId::new(),
-            ["Call the echo tool, then call the infinite tool, then explain their output"],
-            cx,
-        )
-    });
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.add_tool(InfiniteTool);
+            thread.add_tool(EchoTool);
+            thread.send(
+                UserMessageId::new(),
+                ["Call the echo tool, then call the infinite tool, then explain their output"],
+                cx,
+            )
+        })
+        .unwrap();
 
     // Wait until both tools are called.
     let mut expected_tools = vec!["Echo", "Infinite Tool"];
@@ -960,6 +991,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
                 cx,
             )
         })
+        .unwrap()
         .collect::<Vec<_>>()
         .await;
     thread.update(cx, |thread, _cx| {
@@ -978,16 +1010,20 @@ async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let events_1 = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hello 1"], cx)
-    });
+    let events_1 = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello 1"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     fake_model.send_last_completion_stream_text_chunk("Hey 1!");
     cx.run_until_parked();
 
-    let events_2 = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hello 2"], cx)
-    });
+    let events_2 = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello 2"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     fake_model.send_last_completion_stream_text_chunk("Hey 2!");
     fake_model
@@ -1005,9 +1041,11 @@ async fn test_subsequent_successful_sends_dont_cancel(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let events_1 = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hello 1"], cx)
-    });
+    let events_1 = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello 1"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     fake_model.send_last_completion_stream_text_chunk("Hey 1!");
     fake_model
@@ -1015,9 +1053,11 @@ async fn test_subsequent_successful_sends_dont_cancel(cx: &mut TestAppContext) {
     fake_model.end_last_completion_stream();
     let events_1 = events_1.collect::<Vec<_>>().await;
 
-    let events_2 = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hello 2"], cx)
-    });
+    let events_2 = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello 2"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     fake_model.send_last_completion_stream_text_chunk("Hey 2!");
     fake_model
@@ -1034,9 +1074,11 @@ async fn test_refusal(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    let events = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hello"], cx)
-    });
+    let events = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     thread.read_with(cx, |thread, _| {
         assert_eq!(
@@ -1082,9 +1124,11 @@ async fn test_truncate(cx: &mut TestAppContext) {
     let fake_model = model.as_fake();
 
     let message_id = UserMessageId::new();
-    thread.update(cx, |thread, cx| {
-        thread.send(message_id.clone(), ["Hello"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(message_id.clone(), ["Hello"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
     thread.read_with(cx, |thread, _| {
         assert_eq!(
@@ -1123,9 +1167,11 @@ async fn test_truncate(cx: &mut TestAppContext) {
     });
 
     // Ensure we can still send a new message after truncation.
-    thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hi"], cx)
-    });
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hi"], cx)
+        })
+        .unwrap();
     thread.update(cx, |thread, _cx| {
         assert_eq!(
             thread.to_markdown(),
@@ -1291,9 +1337,11 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     thread.update(cx, |thread, _cx| thread.add_tool(ThinkingTool));
     let fake_model = model.as_fake();
 
-    let mut events = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Think"], cx)
-    });
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Think"], cx)
+        })
+        .unwrap();
     cx.run_until_parked();
 
     // Simulate streaming partial input.
@@ -1506,7 +1554,7 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
             context_server_registry,
             action_log,
             templates,
-            model.clone(),
+            Some(model.clone()),
             cx,
         )
     });
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index d8b6286f60..c4181a1f42 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -469,7 +469,7 @@ pub struct Thread {
     profile_id: AgentProfileId,
     project_context: Rc<RefCell<ProjectContext>>,
     templates: Arc<Templates>,
-    model: Arc<dyn LanguageModel>,
+    model: Option<Arc<dyn LanguageModel>>,
     project: Entity<Project>,
     action_log: Entity<ActionLog>,
 }
@@ -481,7 +481,7 @@ impl Thread {
         context_server_registry: Entity<ContextServerRegistry>,
         action_log: Entity<ActionLog>,
         templates: Arc<Templates>,
-        model: Arc<dyn LanguageModel>,
+        model: Option<Arc<dyn LanguageModel>>,
         cx: &mut Context<Self>,
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
@@ -512,12 +512,12 @@ impl Thread {
         &self.action_log
     }
 
-    pub fn model(&self) -> &Arc<dyn LanguageModel> {
-        &self.model
+    pub fn model(&self) -> Option<&Arc<dyn LanguageModel>> {
+        self.model.as_ref()
     }
 
     pub fn set_model(&mut self, model: Arc<dyn LanguageModel>) {
-        self.model = model;
+        self.model = Some(model);
     }
 
     pub fn completion_mode(&self) -> CompletionMode {
@@ -575,6 +575,7 @@ impl Thread {
         &mut self,
         cx: &mut Context<Self>,
     ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>> {
+        anyhow::ensure!(self.model.is_some(), "Model not set");
         anyhow::ensure!(
             self.tool_use_limit_reached,
             "can only resume after tool use limit is reached"
@@ -584,7 +585,7 @@ impl Thread {
         cx.notify();
 
         log::info!("Total messages in thread: {}", self.messages.len());
-        Ok(self.run_turn(cx))
+        self.run_turn(cx)
     }
 
     /// Sending a message results in the model streaming a response, which could include tool calls.
@@ -595,11 +596,13 @@ impl Thread {
         id: UserMessageId,
         content: impl IntoIterator<Item = T>,
         cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedReceiver<Result<AgentResponseEvent>>
+    ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>>
     where
         T: Into<UserMessageContent>,
     {
-        log::info!("Thread::send called with model: {:?}", self.model.name());
+        let model = self.model().context("No language model configured")?;
+
+        log::info!("Thread::send called with model: {:?}", model.name());
         self.advance_prompt_id();
 
         let content = content.into_iter().map(Into::into).collect::<Vec<_>>();
@@ -616,10 +619,10 @@ impl Thread {
     fn run_turn(
         &mut self,
         cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedReceiver<Result<AgentResponseEvent>> {
+    ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>> {
         self.cancel();
 
-        let model = self.model.clone();
+        let model = self.model.clone().context("No language model configured")?;
         let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
         let event_stream = AgentResponseEventStream(events_tx);
         let message_ix = self.messages.len().saturating_sub(1);
@@ -637,7 +640,7 @@ impl Thread {
                         );
                         let request = this.update(cx, |this, cx| {
                             this.build_completion_request(completion_intent, cx)
-                        })?;
+                        })??;
 
                         log::info!("Calling model.stream_completion");
                         let mut events = model.stream_completion(request, cx).await?;
@@ -729,7 +732,7 @@ impl Thread {
                 .ok();
             }),
         });
-        events_rx
+        Ok(events_rx)
     }
 
     pub fn build_system_message(&self) -> LanguageModelRequestMessage {
@@ -917,7 +920,7 @@ impl Thread {
             status: Some(acp::ToolCallStatus::InProgress),
             ..Default::default()
         });
-        let supports_images = self.model.supports_images();
+        let supports_images = self.model().map_or(false, |model| model.supports_images());
         let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
         log::info!("Running tool {}", tool_use.name);
         Some(cx.foreground_executor().spawn(async move {
@@ -1005,7 +1008,9 @@ impl Thread {
         &self,
         completion_intent: CompletionIntent,
         cx: &mut App,
-    ) -> LanguageModelRequest {
+    ) -> Result<LanguageModelRequest> {
+        let model = self.model().context("No language model configured")?;
+
         log::debug!("Building completion request");
         log::debug!("Completion intent: {:?}", completion_intent);
         log::debug!("Completion mode: {:?}", self.completion_mode);
@@ -1021,9 +1026,7 @@ impl Thread {
                     Some(LanguageModelRequestTool {
                         name: tool_name,
                         description: tool.description().to_string(),
-                        input_schema: tool
-                            .input_schema(self.model.tool_input_format())
-                            .log_err()?,
+                        input_schema: tool.input_schema(model.tool_input_format()).log_err()?,
                     })
                 })
                 .collect()
@@ -1042,20 +1045,22 @@ impl Thread {
             tools,
             tool_choice: None,
             stop: Vec::new(),
-            temperature: AgentSettings::temperature_for_model(self.model(), cx),
+            temperature: AgentSettings::temperature_for_model(&model, cx),
             thinking_allowed: true,
         };
 
         log::debug!("Completion request built successfully");
-        request
+        Ok(request)
     }
 
     fn tools<'a>(&'a self, cx: &'a App) -> Result<impl Iterator<Item = &'a Arc<dyn AnyAgentTool>>> {
+        let model = self.model().context("No language model configured")?;
+
         let profile = AgentSettings::get_global(cx)
             .profiles
             .get(&self.profile_id)
             .context("profile not found")?;
-        let provider_id = self.model.provider_id();
+        let provider_id = model.provider_id();
 
         Ok(self
             .tools
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 4b4f98daec..c55e503d76 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -237,11 +237,17 @@ impl AgentTool for EditFileTool {
             });
         }
 
-        let request = self.thread.update(cx, |thread, cx| {
-            thread.build_completion_request(CompletionIntent::ToolResults, cx)
-        });
+        let Some(request) = self.thread.update(cx, |thread, cx| {
+            thread
+                .build_completion_request(CompletionIntent::ToolResults, cx)
+                .ok()
+        }) else {
+            return Task::ready(Err(anyhow!("Failed to build completion request")));
+        };
         let thread = self.thread.read(cx);
-        let model = thread.model().clone();
+        let Some(model) = thread.model().cloned() else {
+            return Task::ready(Err(anyhow!("No language model configured")));
+        };
         let action_log = thread.action_log().clone();
 
         let authorize = self.authorize(&input, &event_stream, cx);
@@ -520,7 +526,7 @@ mod tests {
                 context_server_registry,
                 action_log,
                 Templates::new(),
-                model,
+                Some(model),
                 cx,
             )
         });
@@ -717,7 +723,7 @@ mod tests {
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -853,7 +859,7 @@ mod tests {
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -979,7 +985,7 @@ mod tests {
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -1116,7 +1122,7 @@ mod tests {
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -1226,7 +1232,7 @@ mod tests {
                 context_server_registry.clone(),
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -1307,7 +1313,7 @@ mod tests {
                 context_server_registry.clone(),
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -1391,7 +1397,7 @@ mod tests {
                 context_server_registry.clone(),
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
@@ -1472,7 +1478,7 @@ mod tests {
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
-                model.clone(),
+                Some(model.clone()),
                 cx,
             )
         });
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 7c1f3cf4ae..f011d72d3c 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -94,7 +94,9 @@ impl ProfileProvider for Entity<agent2::Thread> {
     }
 
     fn profiles_supported(&self, cx: &App) -> bool {
-        self.read(cx).model().supports_tools()
+        self.read(cx)
+            .model()
+            .map_or(false, |model| model.supports_tools())
     }
 }
 
@@ -2475,7 +2477,10 @@ impl AcpThreadView {
     fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let thread = self.as_native_thread(cx)?.read(cx);
 
-        if !thread.model().supports_burn_mode() {
+        if thread
+            .model()
+            .map_or(true, |model| !model.supports_burn_mode())
+        {
             return None;
         }
 
@@ -3219,7 +3224,10 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) -> Option<Callout> {
         let thread = self.as_native_thread(cx)?;
-        let supports_burn_mode = thread.read(cx).model().supports_burn_mode();
+        let supports_burn_mode = thread
+            .read(cx)
+            .model()
+            .map_or(false, |model| model.supports_burn_mode());
 
         let focus_handle = self.focus_handle(cx);
 

From 5591fc810e8c5cf31463bac2127cc89008c0599b Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 18 Aug 2025 12:22:00 +0200
Subject: [PATCH 108/823] agent: Restore last used agent session on startup
 (#36401)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs         | 17 ++++---
 crates/agent2/src/thread.rs        |  5 ++-
 crates/agent_ui/src/agent_panel.rs | 71 ++++++++++++++++++------------
 crates/agent_ui/src/agent_ui.rs    |  2 +-
 4 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 0ad90753e1..af740d9901 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -425,13 +425,18 @@ impl NativeAgent {
         cx: &mut Context<Self>,
     ) {
         self.models.refresh_list(cx);
+
+        let default_model = LanguageModelRegistry::read_global(cx)
+            .default_model()
+            .map(|m| m.model.clone());
+
         for session in self.sessions.values_mut() {
-            session.thread.update(cx, |thread, _| {
-                if let Some(model) = thread.model() {
-                    let model_id = LanguageModels::model_id(model);
-                    if let Some(model) = self.models.model_from_id(&model_id) {
-                        thread.set_model(model.clone());
-                    }
+            session.thread.update(cx, |thread, cx| {
+                if thread.model().is_none()
+                    && let Some(model) = default_model.clone()
+                {
+                    thread.set_model(model);
+                    cx.notify();
                 }
             });
         }
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index c4181a1f42..429832010b 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -622,7 +622,10 @@ impl Thread {
     ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>> {
         self.cancel();
 
-        let model = self.model.clone().context("No language model configured")?;
+        let model = self
+            .model()
+            .cloned()
+            .context("No language model configured")?;
         let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
         let event_stream = AgentResponseEventStream(events_tx);
         let message_ix = self.messages.len().saturating_sub(1);
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index b01bf39728..391d6aa6e9 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -573,6 +573,7 @@ impl AgentPanel {
                         panel.width = serialized_panel.width.map(|w| w.round());
                         if let Some(selected_agent) = serialized_panel.selected_agent {
                             panel.selected_agent = selected_agent;
+                            panel.new_agent_thread(selected_agent, window, cx);
                         }
                         cx.notify();
                     });
@@ -1631,16 +1632,53 @@ impl AgentPanel {
         menu
     }
 
-    pub fn set_selected_agent(&mut self, agent: AgentType, cx: &mut Context<Self>) {
+    pub fn set_selected_agent(
+        &mut self,
+        agent: AgentType,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         if self.selected_agent != agent {
             self.selected_agent = agent;
             self.serialize(cx);
+            self.new_agent_thread(agent, window, cx);
         }
     }
 
     pub fn selected_agent(&self) -> AgentType {
         self.selected_agent
     }
+
+    pub fn new_agent_thread(
+        &mut self,
+        agent: AgentType,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match agent {
+            AgentType::Zed => {
+                window.dispatch_action(
+                    NewThread {
+                        from_thread_id: None,
+                    }
+                    .boxed_clone(),
+                    cx,
+                );
+            }
+            AgentType::TextThread => {
+                window.dispatch_action(NewTextThread.boxed_clone(), cx);
+            }
+            AgentType::NativeAgent => {
+                self.new_external_thread(Some(crate::ExternalAgent::NativeAgent), window, cx)
+            }
+            AgentType::Gemini => {
+                self.new_external_thread(Some(crate::ExternalAgent::Gemini), window, cx)
+            }
+            AgentType::ClaudeCode => {
+                self.new_external_thread(Some(crate::ExternalAgent::ClaudeCode), window, cx)
+            }
+        }
+    }
 }
 
 impl Focusable for AgentPanel {
@@ -2221,16 +2259,13 @@ impl AgentPanel {
                                                         panel.update(cx, |panel, cx| {
                                                             panel.set_selected_agent(
                                                                 AgentType::Zed,
+                                                                window,
                                                                 cx,
                                                             );
                                                         });
                                                     }
                                                 });
                                             }
-                                            window.dispatch_action(
-                                                NewThread::default().boxed_clone(),
-                                                cx,
-                                            );
                                         }
                                     }),
                             )
@@ -2250,13 +2285,13 @@ impl AgentPanel {
                                                         panel.update(cx, |panel, cx| {
                                                             panel.set_selected_agent(
                                                                 AgentType::TextThread,
+                                                                window,
                                                                 cx,
                                                             );
                                                         });
                                                     }
                                                 });
                                             }
-                                            window.dispatch_action(NewTextThread.boxed_clone(), cx);
                                         }
                                     }),
                             )
@@ -2275,19 +2310,13 @@ impl AgentPanel {
                                                         panel.update(cx, |panel, cx| {
                                                             panel.set_selected_agent(
                                                                 AgentType::NativeAgent,
+                                                                window,
                                                                 cx,
                                                             );
                                                         });
                                                     }
                                                 });
                                             }
-                                            window.dispatch_action(
-                                                NewExternalAgentThread {
-                                                    agent: Some(crate::ExternalAgent::NativeAgent),
-                                                }
-                                                .boxed_clone(),
-                                                cx,
-                                            );
                                         }
                                     }),
                             )
@@ -2308,19 +2337,13 @@ impl AgentPanel {
                                                         panel.update(cx, |panel, cx| {
                                                             panel.set_selected_agent(
                                                                 AgentType::Gemini,
+                                                                window,
                                                                 cx,
                                                             );
                                                         });
                                                     }
                                                 });
                                             }
-                                            window.dispatch_action(
-                                                NewExternalAgentThread {
-                                                    agent: Some(crate::ExternalAgent::Gemini),
-                                                }
-                                                .boxed_clone(),
-                                                cx,
-                                            );
                                         }
                                     }),
                             )
@@ -2339,19 +2362,13 @@ impl AgentPanel {
                                                         panel.update(cx, |panel, cx| {
                                                             panel.set_selected_agent(
                                                                 AgentType::ClaudeCode,
+                                                                window,
                                                                 cx,
                                                             );
                                                         });
                                                     }
                                                 });
                                             }
-                                            window.dispatch_action(
-                                                NewExternalAgentThread {
-                                                    agent: Some(crate::ExternalAgent::ClaudeCode),
-                                                }
-                                                .boxed_clone(),
-                                                cx,
-                                            );
                                         }
                                     }),
                             );
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index f25b576886..ce1c2203bf 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -146,7 +146,7 @@ pub struct NewExternalAgentThread {
     agent: Option<ExternalAgent>,
 }
 
-#[derive(Default, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 enum ExternalAgent {
     #[default]

From 472f1a8cc21a4754c12f9a0e125a3242e3c9937a Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 18 Aug 2025 12:40:39 +0200
Subject: [PATCH 109/823] editor: Add right click context menu to buffer
 headers (#36398)

This adds a context menu to buffer headers mimicking that of pane tabs,
notably being able to copy the relative and absolute paths of the buffer
as well as opening a terminal in the parent.

Confusingly prior to this right clicking a buffer header used to open
the context menu of the underlying editor.

Release Notes:

- Added context menu for buffer titles
---
 crates/editor/src/element.rs | 418 ++++++++++++++++++++++-------------
 1 file changed, 260 insertions(+), 158 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 5edfd7df30..c15ff3e509 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -40,14 +40,15 @@ use git::{
 };
 use gpui::{
     Action, Along, AnyElement, App, AppContext, AvailableSpace, Axis as ScrollbarAxis, BorderStyle,
-    Bounds, ClickEvent, ContentMask, Context, Corner, Corners, CursorStyle, DispatchPhase, Edges,
-    Element, ElementInputHandler, Entity, Focusable as _, FontId, GlobalElementId, Hitbox,
-    HitboxBehavior, Hsla, InteractiveElement, IntoElement, IsZero, Keystroke, Length,
-    ModifiersChangedEvent, MouseButton, MouseClickEvent, MouseDownEvent, MouseMoveEvent,
-    MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta, ScrollHandle, ScrollWheelEvent,
-    ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled, TextRun,
-    TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill, linear_color_stop,
-    linear_gradient, outline, point, px, quad, relative, size, solid_background, transparent_black,
+    Bounds, ClickEvent, ClipboardItem, ContentMask, Context, Corner, Corners, CursorStyle,
+    DispatchPhase, Edges, Element, ElementInputHandler, Entity, Focusable as _, FontId,
+    GlobalElementId, Hitbox, HitboxBehavior, Hsla, InteractiveElement, IntoElement, IsZero,
+    Keystroke, Length, ModifiersChangedEvent, MouseButton, MouseClickEvent, MouseDownEvent,
+    MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta, ScrollHandle,
+    ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled,
+    TextRun, TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill,
+    linear_color_stop, linear_gradient, outline, point, px, quad, relative, size, solid_background,
+    transparent_black,
 };
 use itertools::Itertools;
 use language::language_settings::{
@@ -60,7 +61,7 @@ use multi_buffer::{
 };
 
 use project::{
-    ProjectPath,
+    Entry, ProjectPath,
     debugger::breakpoint_store::{Breakpoint, BreakpointSessionState},
     project_settings::{GitGutterSetting, GitHunkStyleSetting, ProjectSettings},
 };
@@ -80,11 +81,17 @@ use std::{
 use sum_tree::Bias;
 use text::{BufferId, SelectionGoal};
 use theme::{ActiveTheme, Appearance, BufferLineHeight, PlayerColor};
-use ui::{ButtonLike, KeyBinding, POPOVER_Y_PADDING, Tooltip, h_flex, prelude::*};
+use ui::{
+    ButtonLike, ContextMenu, KeyBinding, POPOVER_Y_PADDING, Tooltip, h_flex, prelude::*,
+    right_click_menu,
+};
 use unicode_segmentation::UnicodeSegmentation;
 use util::post_inc;
 use util::{RangeExt, ResultExt, debug_panic};
-use workspace::{CollaboratorId, Workspace, item::Item, notifications::NotifyTaskExt};
+use workspace::{
+    CollaboratorId, OpenInTerminal, OpenTerminal, RevealInProjectPanel, Workspace, item::Item,
+    notifications::NotifyTaskExt,
+};
 
 /// Determines what kinds of highlights should be applied to a lines background.
 #[derive(Clone, Copy, Default)]
@@ -3556,7 +3563,7 @@ impl EditorElement {
         jump_data: JumpData,
         window: &mut Window,
         cx: &mut App,
-    ) -> Div {
+    ) -> impl IntoElement {
         let editor = self.editor.read(cx);
         let file_status = editor
             .buffer
@@ -3577,126 +3584,125 @@ impl EditorElement {
             .map(|project| project.read(cx).visible_worktrees(cx).count() > 1)
             .unwrap_or_default();
         let can_open_excerpts = Editor::can_open_excerpts_in_file(for_excerpt.buffer.file());
-        let path = for_excerpt.buffer.resolve_file_path(cx, include_root);
-        let filename = path
+        let relative_path = for_excerpt.buffer.resolve_file_path(cx, include_root);
+        let filename = relative_path
             .as_ref()
             .and_then(|path| Some(path.file_name()?.to_string_lossy().to_string()));
-        let parent_path = path.as_ref().and_then(|path| {
+        let parent_path = relative_path.as_ref().and_then(|path| {
             Some(path.parent()?.to_string_lossy().to_string() + std::path::MAIN_SEPARATOR_STR)
         });
         let focus_handle = editor.focus_handle(cx);
         let colors = cx.theme().colors();
 
-        div()
-            .p_1()
-            .w_full()
-            .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
-            .child(
-                h_flex()
-                    .size_full()
-                    .gap_2()
-                    .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
-                    .pl_0p5()
-                    .pr_5()
-                    .rounded_sm()
-                    .when(is_sticky, |el| el.shadow_md())
-                    .border_1()
-                    .map(|div| {
-                        let border_color = if is_selected
-                            && is_folded
-                            && focus_handle.contains_focused(window, cx)
-                        {
-                            colors.border_focused
-                        } else {
-                            colors.border
-                        };
-                        div.border_color(border_color)
-                    })
-                    .bg(colors.editor_subheader_background)
-                    .hover(|style| style.bg(colors.element_hover))
-                    .map(|header| {
-                        let editor = self.editor.clone();
-                        let buffer_id = for_excerpt.buffer_id;
-                        let toggle_chevron_icon =
-                            FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
-                        header.child(
-                            div()
-                                .hover(|style| style.bg(colors.element_selected))
-                                .rounded_xs()
-                                .child(
-                                    ButtonLike::new("toggle-buffer-fold")
-                                        .style(ui::ButtonStyle::Transparent)
-                                        .height(px(28.).into())
-                                        .width(px(28.))
-                                        .children(toggle_chevron_icon)
-                                        .tooltip({
-                                            let focus_handle = focus_handle.clone();
-                                            move |window, cx| {
-                                                Tooltip::with_meta_in(
-                                                    "Toggle Excerpt Fold",
-                                                    Some(&ToggleFold),
-                                                    "Alt+click to toggle all",
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                )
-                                            }
-                                        })
-                                        .on_click(move |event, window, cx| {
-                                            if event.modifiers().alt {
-                                                // Alt+click toggles all buffers
-                                                editor.update(cx, |editor, cx| {
-                                                    editor.toggle_fold_all(
-                                                        &ToggleFoldAll,
+        let header =
+            div()
+                .p_1()
+                .w_full()
+                .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
+                .child(
+                    h_flex()
+                        .size_full()
+                        .gap_2()
+                        .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
+                        .pl_0p5()
+                        .pr_5()
+                        .rounded_sm()
+                        .when(is_sticky, |el| el.shadow_md())
+                        .border_1()
+                        .map(|div| {
+                            let border_color = if is_selected
+                                && is_folded
+                                && focus_handle.contains_focused(window, cx)
+                            {
+                                colors.border_focused
+                            } else {
+                                colors.border
+                            };
+                            div.border_color(border_color)
+                        })
+                        .bg(colors.editor_subheader_background)
+                        .hover(|style| style.bg(colors.element_hover))
+                        .map(|header| {
+                            let editor = self.editor.clone();
+                            let buffer_id = for_excerpt.buffer_id;
+                            let toggle_chevron_icon =
+                                FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
+                            header.child(
+                                div()
+                                    .hover(|style| style.bg(colors.element_selected))
+                                    .rounded_xs()
+                                    .child(
+                                        ButtonLike::new("toggle-buffer-fold")
+                                            .style(ui::ButtonStyle::Transparent)
+                                            .height(px(28.).into())
+                                            .width(px(28.))
+                                            .children(toggle_chevron_icon)
+                                            .tooltip({
+                                                let focus_handle = focus_handle.clone();
+                                                move |window, cx| {
+                                                    Tooltip::with_meta_in(
+                                                        "Toggle Excerpt Fold",
+                                                        Some(&ToggleFold),
+                                                        "Alt+click to toggle all",
+                                                        &focus_handle,
                                                         window,
                                                         cx,
-                                                    );
-                                                });
-                                            } else {
-                                                // Regular click toggles single buffer
-                                                if is_folded {
+                                                    )
+                                                }
+                                            })
+                                            .on_click(move |event, window, cx| {
+                                                if event.modifiers().alt {
+                                                    // Alt+click toggles all buffers
                                                     editor.update(cx, |editor, cx| {
-                                                        editor.unfold_buffer(buffer_id, cx);
+                                                        editor.toggle_fold_all(
+                                                            &ToggleFoldAll,
+                                                            window,
+                                                            cx,
+                                                        );
                                                     });
                                                 } else {
-                                                    editor.update(cx, |editor, cx| {
-                                                        editor.fold_buffer(buffer_id, cx);
-                                                    });
+                                                    // Regular click toggles single buffer
+                                                    if is_folded {
+                                                        editor.update(cx, |editor, cx| {
+                                                            editor.unfold_buffer(buffer_id, cx);
+                                                        });
+                                                    } else {
+                                                        editor.update(cx, |editor, cx| {
+                                                            editor.fold_buffer(buffer_id, cx);
+                                                        });
+                                                    }
                                                 }
-                                            }
-                                        }),
-                                ),
+                                            }),
+                                    ),
+                            )
+                        })
+                        .children(
+                            editor
+                                .addons
+                                .values()
+                                .filter_map(|addon| {
+                                    addon.render_buffer_header_controls(for_excerpt, window, cx)
+                                })
+                                .take(1),
                         )
-                    })
-                    .children(
-                        editor
-                            .addons
-                            .values()
-                            .filter_map(|addon| {
-                                addon.render_buffer_header_controls(for_excerpt, window, cx)
-                            })
-                            .take(1),
-                    )
-                    .child(
-                        h_flex()
-                            .cursor_pointer()
-                            .id("path header block")
-                            .size_full()
-                            .justify_between()
-                            .overflow_hidden()
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(
-                                        Label::new(
-                                            filename
-                                                .map(SharedString::from)
-                                                .unwrap_or_else(|| "untitled".into()),
-                                        )
-                                        .single_line()
-                                        .when_some(
-                                            file_status,
-                                            |el, status| {
+                        .child(
+                            h_flex()
+                                .cursor_pointer()
+                                .id("path header block")
+                                .size_full()
+                                .justify_between()
+                                .overflow_hidden()
+                                .child(
+                                    h_flex()
+                                        .gap_2()
+                                        .child(
+                                            Label::new(
+                                                filename
+                                                    .map(SharedString::from)
+                                                    .unwrap_or_else(|| "untitled".into()),
+                                            )
+                                            .single_line()
+                                            .when_some(file_status, |el, status| {
                                                 el.color(if status.is_conflicted() {
                                                     Color::Conflict
                                                 } else if status.is_modified() {
@@ -3707,49 +3713,145 @@ impl EditorElement {
                                                     Color::Created
                                                 })
                                                 .when(status.is_deleted(), |el| el.strikethrough())
-                                            },
-                                        ),
-                                    )
-                                    .when_some(parent_path, |then, path| {
-                                        then.child(div().child(path).text_color(
-                                            if file_status.is_some_and(FileStatus::is_deleted) {
-                                                colors.text_disabled
-                                            } else {
-                                                colors.text_muted
-                                            },
-                                        ))
+                                            }),
+                                        )
+                                        .when_some(parent_path, |then, path| {
+                                            then.child(div().child(path).text_color(
+                                                if file_status.is_some_and(FileStatus::is_deleted) {
+                                                    colors.text_disabled
+                                                } else {
+                                                    colors.text_muted
+                                                },
+                                            ))
+                                        }),
+                                )
+                                .when(
+                                    can_open_excerpts && is_selected && relative_path.is_some(),
+                                    |el| {
+                                        el.child(
+                                            h_flex()
+                                                .id("jump-to-file-button")
+                                                .gap_2p5()
+                                                .child(Label::new("Jump To File"))
+                                                .children(
+                                                    KeyBinding::for_action_in(
+                                                        &OpenExcerpts,
+                                                        &focus_handle,
+                                                        window,
+                                                        cx,
+                                                    )
+                                                    .map(|binding| binding.into_any_element()),
+                                                ),
+                                        )
+                                    },
+                                )
+                                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
+                                .on_click(window.listener_for(&self.editor, {
+                                    move |editor, e: &ClickEvent, window, cx| {
+                                        editor.open_excerpts_common(
+                                            Some(jump_data.clone()),
+                                            e.modifiers().secondary(),
+                                            window,
+                                            cx,
+                                        );
+                                    }
+                                })),
+                        ),
+                );
+
+        let file = for_excerpt.buffer.file().cloned();
+        let editor = self.editor.clone();
+        right_click_menu("buffer-header-context-menu")
+            .trigger(move |_, _, _| header)
+            .menu(move |window, cx| {
+                let menu_context = focus_handle.clone();
+                let editor = editor.clone();
+                let file = file.clone();
+                ContextMenu::build(window, cx, move |mut menu, window, cx| {
+                    if let Some(file) = file
+                        && let Some(project) = editor.read(cx).project()
+                        && let Some(worktree) =
+                            project.read(cx).worktree_for_id(file.worktree_id(cx), cx)
+                    {
+                        let relative_path = file.path();
+                        let entry_for_path = worktree.read(cx).entry_for_path(relative_path);
+                        let abs_path = entry_for_path.and_then(|e| e.canonical_path.as_deref());
+                        let has_relative_path =
+                            worktree.read(cx).root_entry().is_some_and(Entry::is_dir);
+
+                        let parent_abs_path =
+                            abs_path.and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
+                        let relative_path = has_relative_path
+                            .then_some(relative_path)
+                            .map(ToOwned::to_owned);
+
+                        let visible_in_project_panel =
+                            relative_path.is_some() && worktree.read(cx).is_visible();
+                        let reveal_in_project_panel = entry_for_path
+                            .filter(|_| visible_in_project_panel)
+                            .map(|entry| entry.id);
+                        menu = menu
+                            .when_some(abs_path.map(ToOwned::to_owned), |menu, abs_path| {
+                                menu.entry(
+                                    "Copy Path",
+                                    Some(Box::new(zed_actions::workspace::CopyPath)),
+                                    window.handler_for(&editor, move |_, _, cx| {
+                                        cx.write_to_clipboard(ClipboardItem::new_string(
+                                            abs_path.to_string_lossy().to_string(),
+                                        ));
                                     }),
-                            )
-                            .when(can_open_excerpts && is_selected && path.is_some(), |el| {
-                                el.child(
-                                    h_flex()
-                                        .id("jump-to-file-button")
-                                        .gap_2p5()
-                                        .child(Label::new("Jump To File"))
-                                        .children(
-                                            KeyBinding::for_action_in(
-                                                &OpenExcerpts,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                            .map(|binding| binding.into_any_element()),
-                                        ),
                                 )
                             })
-                            .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                            .on_click(window.listener_for(&self.editor, {
-                                move |editor, e: &ClickEvent, window, cx| {
-                                    editor.open_excerpts_common(
-                                        Some(jump_data.clone()),
-                                        e.modifiers().secondary(),
-                                        window,
-                                        cx,
-                                    );
-                                }
-                            })),
-                    ),
-            )
+                            .when_some(relative_path, |menu, relative_path| {
+                                menu.entry(
+                                    "Copy Relative Path",
+                                    Some(Box::new(zed_actions::workspace::CopyRelativePath)),
+                                    window.handler_for(&editor, move |_, _, cx| {
+                                        cx.write_to_clipboard(ClipboardItem::new_string(
+                                            relative_path.to_string_lossy().to_string(),
+                                        ));
+                                    }),
+                                )
+                            })
+                            .when(
+                                reveal_in_project_panel.is_some() || parent_abs_path.is_some(),
+                                |menu| menu.separator(),
+                            )
+                            .when_some(reveal_in_project_panel, |menu, entry_id| {
+                                menu.entry(
+                                    "Reveal In Project Panel",
+                                    Some(Box::new(RevealInProjectPanel::default())),
+                                    window.handler_for(&editor, move |editor, _, cx| {
+                                        if let Some(project) = &mut editor.project {
+                                            project.update(cx, |_, cx| {
+                                                cx.emit(project::Event::RevealInProjectPanel(
+                                                    entry_id,
+                                                ))
+                                            });
+                                        }
+                                    }),
+                                )
+                            })
+                            .when_some(parent_abs_path, |menu, parent_abs_path| {
+                                menu.entry(
+                                    "Open in Terminal",
+                                    Some(Box::new(OpenInTerminal)),
+                                    window.handler_for(&editor, move |_, window, cx| {
+                                        window.dispatch_action(
+                                            OpenTerminal {
+                                                working_directory: parent_abs_path.clone(),
+                                            }
+                                            .boxed_clone(),
+                                            cx,
+                                        );
+                                    }),
+                                )
+                            });
+                    }
+
+                    menu.context(menu_context)
+                })
+            })
     }
 
     fn render_blocks(

From d83f341d273394140c6052dcc404fe8b332570e1 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 18 Aug 2025 13:45:51 +0300
Subject: [PATCH 110/823] Silence "minidump endpoint not set" errors'
 backtraces in the logs (#36404)

<img width="1899" height="693" alt="bad"
src="https://github.com/user-attachments/assets/6e6eb2d7-0933-4bb7-b339-ecebba00b60b"
/>

Release Notes:

- N/A
---
 crates/zed/src/reliability.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index c27f4cb0a8..0a54572f6b 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -550,7 +550,8 @@ async fn upload_previous_panics(
 
 pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::Result<()> {
     let Some(minidump_endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
-        return Err(anyhow::anyhow!("Minidump endpoint not set"));
+        log::warn!("Minidump endpoint not set");
+        return Ok(());
     };
 
     let mut children = smol::fs::read_dir(paths::logs_dir()).await?;

From 843336970ad65fcb12c73f45f8d23823ed1167d5 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 18 Aug 2025 13:01:32 +0200
Subject: [PATCH 111/823] keymap_ui: Ensure keybind with empty arguments can be
 saved (#36393)

Follow up to #36278 to ensure this bug is actually fixed. Also fixes
this on two layers and adds a test for the lower layer, as we cannot
properly test it in the UI.

Furthermore, this improves the error message to show some more context
and ensures the status toast is actually only shown when the keybind was
successfully updated: Before, we would show the success toast whilst
also showing an error in the editor.

Lastly, this also fixes some issues with the status toast (and
animations) where no status toast or no animation would show in certain
scenarios.

Release Notes:

- N/A
---
 crates/settings/src/keymap_file.rs    | 24 +++++++-
 crates/settings_ui/src/keybindings.rs | 84 +++++++++++++--------------
 crates/ui/src/styles/animation.rs     | 27 +++++----
 crates/workspace/src/toast_layer.rs   | 32 +++++-----
 4 files changed, 93 insertions(+), 74 deletions(-)

diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index 7802671fec..fb03662290 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -928,14 +928,14 @@ impl<'a> KeybindUpdateTarget<'a> {
         }
         let action_name: Value = self.action_name.into();
         let value = match self.action_arguments {
-            Some(args) => {
+            Some(args) if !args.is_empty() => {
                 let args = serde_json::from_str::<Value>(args)
                     .context("Failed to parse action arguments as JSON")?;
                 serde_json::json!([action_name, args])
             }
-            None => action_name,
+            _ => action_name,
         };
-        return Ok(value);
+        Ok(value)
     }
 
     fn keystrokes_unparsed(&self) -> String {
@@ -1084,6 +1084,24 @@ mod tests {
             .unindent(),
         );
 
+        check_keymap_update(
+            "[]",
+            KeybindUpdateOperation::add(KeybindUpdateTarget {
+                keystrokes: &parse_keystrokes("ctrl-a"),
+                action_name: "zed::SomeAction",
+                context: None,
+                action_arguments: Some(""),
+            }),
+            r#"[
+                {
+                    "bindings": {
+                        "ctrl-a": "zed::SomeAction"
+                    }
+                }
+            ]"#
+            .unindent(),
+        );
+
         check_keymap_update(
             r#"[
                 {
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index b4e871c617..5181d86a78 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -2177,11 +2177,11 @@ impl KeybindingEditorModal {
         let action_arguments = self
             .action_arguments_editor
             .as_ref()
-            .map(|editor| editor.read(cx).editor.read(cx).text(cx));
+            .map(|arguments_editor| arguments_editor.read(cx).editor.read(cx).text(cx))
+            .filter(|args| !args.is_empty());
 
         let value = action_arguments
             .as_ref()
-            .filter(|args| !args.is_empty())
             .map(|args| {
                 serde_json::from_str(args).context("Failed to parse action arguments as JSON")
             })
@@ -2289,29 +2289,11 @@ impl KeybindingEditorModal {
 
         let create = self.creating;
 
-        let status_toast = StatusToast::new(
-            format!(
-                "Saved edits to the {} action.",
-                &self.editing_keybind.action().humanized_name
-            ),
-            cx,
-            move |this, _cx| {
-                this.icon(ToastIcon::new(IconName::Check).color(Color::Success))
-                    .dismiss_button(true)
-                // .action("Undo", f) todo: wire the undo functionality
-            },
-        );
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.toggle_status_toast(status_toast, cx);
-            })
-            .log_err();
-
         cx.spawn(async move |this, cx| {
             let action_name = existing_keybind.action().name;
+            let humanized_action_name = existing_keybind.action().humanized_name.clone();
 
-            if let Err(err) = save_keybinding_update(
+            match save_keybinding_update(
                 create,
                 existing_keybind,
                 &action_mapping,
@@ -2321,25 +2303,43 @@ impl KeybindingEditorModal {
             )
             .await
             {
-                this.update(cx, |this, cx| {
-                    this.set_error(InputError::error(err), cx);
-                })
-                .log_err();
-            } else {
-                this.update(cx, |this, cx| {
-                    this.keymap_editor.update(cx, |keymap, cx| {
-                        keymap.previous_edit = Some(PreviousEdit::Keybinding {
-                            action_mapping,
-                            action_name,
-                            fallback: keymap
-                                .table_interaction_state
-                                .read(cx)
-                                .get_scrollbar_offset(Axis::Vertical),
-                        })
-                    });
-                    cx.emit(DismissEvent);
-                })
-                .ok();
+                Ok(_) => {
+                    this.update(cx, |this, cx| {
+                        this.keymap_editor.update(cx, |keymap, cx| {
+                            keymap.previous_edit = Some(PreviousEdit::Keybinding {
+                                action_mapping,
+                                action_name,
+                                fallback: keymap
+                                    .table_interaction_state
+                                    .read(cx)
+                                    .get_scrollbar_offset(Axis::Vertical),
+                            });
+                            let status_toast = StatusToast::new(
+                                format!("Saved edits to the {} action.", humanized_action_name),
+                                cx,
+                                move |this, _cx| {
+                                    this.icon(ToastIcon::new(IconName::Check).color(Color::Success))
+                                        .dismiss_button(true)
+                                    // .action("Undo", f) todo: wire the undo functionality
+                                },
+                            );
+
+                            this.workspace
+                                .update(cx, |workspace, cx| {
+                                    workspace.toggle_status_toast(status_toast, cx);
+                                })
+                                .log_err();
+                        });
+                        cx.emit(DismissEvent);
+                    })
+                    .ok();
+                }
+                Err(err) => {
+                    this.update(cx, |this, cx| {
+                        this.set_error(InputError::error(err), cx);
+                    })
+                    .log_err();
+                }
             }
         })
         .detach();
@@ -3011,7 +3011,7 @@ async fn save_keybinding_update(
 
     let updated_keymap_contents =
         settings::KeymapFile::update_keybinding(operation, keymap_contents, tab_size)
-            .context("Failed to update keybinding")?;
+            .map_err(|err| anyhow::anyhow!("Could not save updated keybinding: {}", err))?;
     fs.write(
         paths::keymap_file().as_path(),
         updated_keymap_contents.as_bytes(),
diff --git a/crates/ui/src/styles/animation.rs b/crates/ui/src/styles/animation.rs
index ee5352d454..acea834548 100644
--- a/crates/ui/src/styles/animation.rs
+++ b/crates/ui/src/styles/animation.rs
@@ -31,7 +31,7 @@ pub enum AnimationDirection {
     FromTop,
 }
 
-pub trait DefaultAnimations: Styled + Sized {
+pub trait DefaultAnimations: Styled + Sized + Element {
     fn animate_in(
         self,
         animation_type: AnimationDirection,
@@ -44,8 +44,13 @@ pub trait DefaultAnimations: Styled + Sized {
             AnimationDirection::FromTop => "animate_from_top",
         };
 
+        let animation_id = self.id().map_or_else(
+            || ElementId::from(animation_name),
+            |id| (id, animation_name).into(),
+        );
+
         self.with_animation(
-            animation_name,
+            animation_id,
             gpui::Animation::new(AnimationDuration::Fast.into()).with_easing(ease_out_quint()),
             move |mut this, delta| {
                 let start_opacity = 0.4;
@@ -91,7 +96,7 @@ pub trait DefaultAnimations: Styled + Sized {
     }
 }
 
-impl<E: Styled> DefaultAnimations for E {}
+impl<E: Styled + Element> DefaultAnimations for E {}
 
 // Don't use this directly, it only exists to show animation previews
 #[derive(RegisterComponent)]
@@ -132,7 +137,7 @@ impl Component for Animation {
                                             .left(px(offset))
                                             .rounded_md()
                                             .bg(gpui::red())
-                                            .animate_in(AnimationDirection::FromBottom, false),
+                                            .animate_in_from_bottom(false),
                                     )
                                     .into_any_element(),
                             ),
@@ -151,7 +156,7 @@ impl Component for Animation {
                                             .left(px(offset))
                                             .rounded_md()
                                             .bg(gpui::blue())
-                                            .animate_in(AnimationDirection::FromTop, false),
+                                            .animate_in_from_top(false),
                                     )
                                     .into_any_element(),
                             ),
@@ -170,7 +175,7 @@ impl Component for Animation {
                                             .top(px(offset))
                                             .rounded_md()
                                             .bg(gpui::green())
-                                            .animate_in(AnimationDirection::FromLeft, false),
+                                            .animate_in_from_left(false),
                                     )
                                     .into_any_element(),
                             ),
@@ -189,7 +194,7 @@ impl Component for Animation {
                                             .top(px(offset))
                                             .rounded_md()
                                             .bg(gpui::yellow())
-                                            .animate_in(AnimationDirection::FromRight, false),
+                                            .animate_in_from_right(false),
                                     )
                                     .into_any_element(),
                             ),
@@ -214,7 +219,7 @@ impl Component for Animation {
                                             .left(px(offset))
                                             .rounded_md()
                                             .bg(gpui::red())
-                                            .animate_in(AnimationDirection::FromBottom, true),
+                                            .animate_in_from_bottom(true),
                                     )
                                     .into_any_element(),
                             ),
@@ -233,7 +238,7 @@ impl Component for Animation {
                                             .left(px(offset))
                                             .rounded_md()
                                             .bg(gpui::blue())
-                                            .animate_in(AnimationDirection::FromTop, true),
+                                            .animate_in_from_top(true),
                                     )
                                     .into_any_element(),
                             ),
@@ -252,7 +257,7 @@ impl Component for Animation {
                                             .top(px(offset))
                                             .rounded_md()
                                             .bg(gpui::green())
-                                            .animate_in(AnimationDirection::FromLeft, true),
+                                            .animate_in_from_left(true),
                                     )
                                     .into_any_element(),
                             ),
@@ -271,7 +276,7 @@ impl Component for Animation {
                                             .top(px(offset))
                                             .rounded_md()
                                             .bg(gpui::yellow())
-                                            .animate_in(AnimationDirection::FromRight, true),
+                                            .animate_in_from_right(true),
                                     )
                                     .into_any_element(),
                             ),
diff --git a/crates/workspace/src/toast_layer.rs b/crates/workspace/src/toast_layer.rs
index 28be3e7e47..5157945548 100644
--- a/crates/workspace/src/toast_layer.rs
+++ b/crates/workspace/src/toast_layer.rs
@@ -3,7 +3,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use gpui::{AnyView, DismissEvent, Entity, FocusHandle, ManagedView, Subscription, Task};
+use gpui::{AnyView, DismissEvent, Entity, EntityId, FocusHandle, ManagedView, Subscription, Task};
 use ui::{animation::DefaultAnimations, prelude::*};
 use zed_actions::toast;
 
@@ -76,6 +76,7 @@ impl<V: ToastView> ToastViewHandle for Entity<V> {
 }
 
 pub struct ActiveToast {
+    id: EntityId,
     toast: Box<dyn ToastViewHandle>,
     action: Option<ToastAction>,
     _subscriptions: [Subscription; 1],
@@ -113,9 +114,9 @@ impl ToastLayer {
         V: ToastView,
     {
         if let Some(active_toast) = &self.active_toast {
-            let is_close = active_toast.toast.view().downcast::<V>().is_ok();
-            let did_close = self.hide_toast(cx);
-            if is_close || !did_close {
+            let show_new = active_toast.id != new_toast.entity_id();
+            self.hide_toast(cx);
+            if !show_new {
                 return;
             }
         }
@@ -130,11 +131,12 @@ impl ToastLayer {
         let focus_handle = cx.focus_handle();
 
         self.active_toast = Some(ActiveToast {
-            toast: Box::new(new_toast.clone()),
-            action,
             _subscriptions: [cx.subscribe(&new_toast, |this, _, _: &DismissEvent, cx| {
                 this.hide_toast(cx);
             })],
+            id: new_toast.entity_id(),
+            toast: Box::new(new_toast),
+            action,
             focus_handle,
         });
 
@@ -143,11 +145,9 @@ impl ToastLayer {
         cx.notify();
     }
 
-    pub fn hide_toast(&mut self, cx: &mut Context<Self>) -> bool {
+    pub fn hide_toast(&mut self, cx: &mut Context<Self>) {
         self.active_toast.take();
         cx.notify();
-
-        true
     }
 
     pub fn active_toast<V>(&self) -> Option<Entity<V>>
@@ -218,11 +218,10 @@ impl Render for ToastLayer {
         let Some(active_toast) = &self.active_toast else {
             return div();
         };
-        let handle = cx.weak_entity();
 
         div().absolute().size_full().bottom_0().left_0().child(
             v_flex()
-                .id("toast-layer-container")
+                .id(("toast-layer-container", active_toast.id))
                 .absolute()
                 .w_full()
                 .bottom(px(0.))
@@ -234,17 +233,14 @@ impl Render for ToastLayer {
                     h_flex()
                         .id("active-toast-container")
                         .occlude()
-                        .on_hover(move |hover_start, _window, cx| {
-                            let Some(this) = handle.upgrade() else {
-                                return;
-                            };
+                        .on_hover(cx.listener(|this, hover_start, _window, cx| {
                             if *hover_start {
-                                this.update(cx, |this, _| this.pause_dismiss_timer());
+                                this.pause_dismiss_timer();
                             } else {
-                                this.update(cx, |this, cx| this.restart_dismiss_timer(cx));
+                                this.restart_dismiss_timer(cx);
                             }
                             cx.stop_propagation();
-                        })
+                        }))
                         .on_click(|_, _, cx| {
                             cx.stop_propagation();
                         })

From d5711d44a5cda4bd9f76849ca3e4904a1aed7c75 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Mon, 18 Aug 2025 16:32:01 +0530
Subject: [PATCH 112/823] editor: Fix panic in inlay hint while padding
 (#36405)

Closes #36247

Fix a panic when padding inlay hints if the last character is a
multi-byte character. Regressed in
https://github.com/zed-industries/zed/pull/35786.

Release Notes:

- Fixed a crash that could occur when an inlay hint ended with `...`.
---
 crates/editor/src/display_map/inlay_map.rs | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index b296b3e62a..76148af587 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -48,7 +48,7 @@ pub struct Inlay {
 impl Inlay {
     pub fn hint(id: usize, position: Anchor, hint: &project::InlayHint) -> Self {
         let mut text = hint.text();
-        if hint.padding_right && text.chars_at(text.len().saturating_sub(1)).next() != Some(' ') {
+        if hint.padding_right && text.reversed_chars_at(text.len()).next() != Some(' ') {
             text.push(" ");
         }
         if hint.padding_left && text.chars_at(0).next() != Some(' ') {
@@ -1305,6 +1305,29 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn test_inlay_hint_padding_with_multibyte_chars() {
+        assert_eq!(
+            Inlay::hint(
+                0,
+                Anchor::min(),
+                &InlayHint {
+                    label: InlayHintLabel::String("🎨".to_string()),
+                    position: text::Anchor::default(),
+                    padding_left: true,
+                    padding_right: true,
+                    tooltip: None,
+                    kind: None,
+                    resolve_state: ResolveState::Resolved,
+                },
+            )
+            .text
+            .to_string(),
+            " 🎨 ",
+            "Should pad single emoji correctly"
+        );
+    }
+
     #[gpui::test]
     fn test_basic_inlays(cx: &mut App) {
         let buffer = MultiBuffer::build_simple("abcdefghi", cx);

From 57198f33c46f79a8520049ad9de69498e449d533 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 18 Aug 2025 13:12:17 +0200
Subject: [PATCH 113/823] agent2: Show Zed AI onboarding (#36406)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs |  7 +++++--
 crates/agent_ui/src/agent_panel.rs     | 11 +++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f011d72d3c..271d9e5d4c 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2444,12 +2444,15 @@ impl AcpThreadView {
             .into_any()
     }
 
-    fn as_native_connection(&self, cx: &App) -> Option<Rc<agent2::NativeAgentConnection>> {
+    pub(crate) fn as_native_connection(
+        &self,
+        cx: &App,
+    ) -> Option<Rc<agent2::NativeAgentConnection>> {
         let acp_thread = self.thread()?.read(cx);
         acp_thread.connection().clone().downcast()
     }
 
-    fn as_native_thread(&self, cx: &App) -> Option<Entity<agent2::Thread>> {
+    pub(crate) fn as_native_thread(&self, cx: &App) -> Option<Entity<agent2::Thread>> {
         let acp_thread = self.thread()?.read(cx);
         self.as_native_connection(cx)?
             .thread(acp_thread.session_id(), cx)
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 391d6aa6e9..4cb231f357 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2619,7 +2619,13 @@ impl AgentPanel {
         }
 
         match &self.active_view {
-            ActiveView::Thread { .. } | ActiveView::TextThread { .. } => {
+            ActiveView::History | ActiveView::Configuration => false,
+            ActiveView::ExternalAgentThread { thread_view, .. }
+                if thread_view.read(cx).as_native_thread(cx).is_none() =>
+            {
+                false
+            }
+            _ => {
                 let history_is_empty = self
                     .history_store
                     .update(cx, |store, cx| store.recent_entries(1, cx).is_empty());
@@ -2634,9 +2640,6 @@ impl AgentPanel {
 
                 history_is_empty || !has_configured_non_zed_providers
             }
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => false,
         }
     }
 

From 5225844c9edc5a43c426b04cb05dc59289ba085b Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 18 Aug 2025 13:48:21 +0200
Subject: [PATCH 114/823] lsp: Always report innermost workspace_folders
 (#36407)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/language/src/language.rs | 16 ----------------
 crates/languages/src/python.rs  | 13 +------------
 crates/project/src/lsp_store.rs |  7 ++-----
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index f299dee345..6fa31da860 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -283,15 +283,6 @@ impl CachedLspAdapter {
     }
 }
 
-/// Determines what gets sent out as a workspace folders content
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum WorkspaceFoldersContent {
-    /// Send out a single entry with the root of the workspace.
-    WorktreeRoot,
-    /// Send out a list of subproject roots.
-    SubprojectRoots,
-}
-
 /// [`LspAdapterDelegate`] allows [`LspAdapter]` implementations to interface with the application
 // e.g. to display a notification or fetch data from the web.
 #[async_trait]
@@ -580,13 +571,6 @@ pub trait LspAdapter: 'static + Send + Sync {
         Ok(original)
     }
 
-    /// Determines whether a language server supports workspace folders.
-    ///
-    /// And does not trip over itself in the process.
-    fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
-        WorkspaceFoldersContent::SubprojectRoots
-    }
-
     /// Method only implemented by the default JSON language server adapter.
     /// Used to provide dynamic reloading of the JSON schemas used to
     /// provide autocompletion and diagnostics in Zed setting and keybind
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index b61ad2d36c..222e3f1946 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -4,13 +4,13 @@ use async_trait::async_trait;
 use collections::HashMap;
 use gpui::{App, Task};
 use gpui::{AsyncApp, SharedString};
+use language::Toolchain;
 use language::ToolchainList;
 use language::ToolchainLister;
 use language::language_settings::language_settings;
 use language::{ContextLocation, LanguageToolchainStore};
 use language::{ContextProvider, LspAdapter, LspAdapterDelegate};
 use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
-use language::{Toolchain, WorkspaceFoldersContent};
 use lsp::LanguageServerBinary;
 use lsp::LanguageServerName;
 use node_runtime::{NodeRuntime, VersionStrategy};
@@ -389,10 +389,6 @@ impl LspAdapter for PythonLspAdapter {
             user_settings
         })
     }
-
-    fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
-        WorkspaceFoldersContent::WorktreeRoot
-    }
 }
 
 async fn get_cached_server_binary(
@@ -1257,9 +1253,6 @@ impl LspAdapter for PyLspAdapter {
             user_settings
         })
     }
-    fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
-        WorkspaceFoldersContent::WorktreeRoot
-    }
 }
 
 pub(crate) struct BasedPyrightLspAdapter {
@@ -1577,10 +1570,6 @@ impl LspAdapter for BasedPyrightLspAdapter {
             user_settings
         })
     }
-
-    fn workspace_folders_content(&self) -> WorkspaceFoldersContent {
-        WorkspaceFoldersContent::WorktreeRoot
-    }
 }
 
 #[cfg(test)]
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 8ea41a100b..802b304e94 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -57,7 +57,7 @@ use language::{
     DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, Diff, File as _, Language, LanguageName,
     LanguageRegistry, LocalFile, LspAdapter, LspAdapterDelegate, ManifestDelegate, ManifestName,
     Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPointUtf16, Toolchain, Transaction,
-    Unclipped, WorkspaceFoldersContent,
+    Unclipped,
     language_settings::{
         FormatOnSave, Formatter, LanguageSettings, SelectedFormatter, language_settings,
     },
@@ -344,10 +344,7 @@ impl LocalLspStore {
                     binary,
                     &root_path,
                     code_action_kinds,
-                    Some(pending_workspace_folders).filter(|_| {
-                        adapter.adapter.workspace_folders_content()
-                            == WorkspaceFoldersContent::SubprojectRoots
-                    }),
+                    Some(pending_workspace_folders),
                     cx,
                 )
             }

From 1add1d042dc59d82ed9089bd792e5192e71b5e0f Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 18 Aug 2025 14:21:33 +0200
Subject: [PATCH 115/823] Add option to disable auto indentation (#36259)

Closes https://github.com/zed-industries/zed/issues/11780

While auto indentation is generally nice to have, there are cases where
it is currently just not good enough for some languages (e.g. Haskell)
or users just straight up do not want their editor to auto indent for
them. Hence, this PR adds the possibilty to disable auto indentation for
either all language or on a per-language basis. Manual invocation via
the `editor: auto indent` action will continue to work.

Also takes a similar approach as
https://github.com/zed-industries/zed/pull/31569 to ensure performance
is fine for larger multicursor edits.

Release Notes:

- Added the possibility to configure auto indentation for all languages
and per language. Add `"auto_indent": false"` to your settings or
desired language to disable the feature.
---
 assets/settings/default.json             |   2 +
 crates/editor/src/editor_tests.rs        | 210 +++++++++++++++++++++++
 crates/language/src/buffer.rs            |  45 +++--
 crates/language/src/language_settings.rs |   7 +
 4 files changed, 250 insertions(+), 14 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 6a8b034268..72e4dcbf4f 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -286,6 +286,8 @@
   // bracket, brace, single or double quote characters.
   // For example, when you select text and type (, Zed will surround the text with ().
   "use_auto_surround": true,
+  /// Whether indentation should be adjusted based on the context whilst typing.
+  "auto_indent": true,
   // Whether indentation of pasted content should be adjusted based on the context.
   "auto_indent_on_paste": true,
   // Controls how the editor handles the autoclosed characters.
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index ef2bdc5da3..f97dcd712c 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8214,6 +8214,216 @@ async fn test_autoindent(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_autoindent_disabled(cx: &mut TestAppContext) {
+    init_test(cx, |settings| settings.defaults.auto_indent = Some(false));
+
+    let language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                brackets: BracketPairConfig {
+                    pairs: vec![
+                        BracketPair {
+                            start: "{".to_string(),
+                            end: "}".to_string(),
+                            close: false,
+                            surround: false,
+                            newline: true,
+                        },
+                        BracketPair {
+                            start: "(".to_string(),
+                            end: ")".to_string(),
+                            close: false,
+                            surround: false,
+                            newline: true,
+                        },
+                    ],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+                (_ "(" ")" @end) @indent
+                (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap(),
+    );
+
+    let text = "fn a() {}";
+
+    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
+    editor
+        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
+        .await;
+
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_ranges([5..5, 8..8, 9..9])
+        });
+        editor.newline(&Newline, window, cx);
+        assert_eq!(
+            editor.text(cx),
+            indoc!(
+                "
+                fn a(
+
+                ) {
+
+                }
+                "
+            )
+        );
+        assert_eq!(
+            editor.selections.ranges(cx),
+            &[
+                Point::new(1, 0)..Point::new(1, 0),
+                Point::new(3, 0)..Point::new(3, 0),
+                Point::new(5, 0)..Point::new(5, 0)
+            ]
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_autoindent_disabled_with_nested_language(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        settings.defaults.auto_indent = Some(true);
+        settings.languages.0.insert(
+            "python".into(),
+            LanguageSettingsContent {
+                auto_indent: Some(false),
+                ..Default::default()
+            },
+        );
+    });
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let injected_language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                brackets: BracketPairConfig {
+                    pairs: vec![
+                        BracketPair {
+                            start: "{".to_string(),
+                            end: "}".to_string(),
+                            close: false,
+                            surround: false,
+                            newline: true,
+                        },
+                        BracketPair {
+                            start: "(".to_string(),
+                            end: ")".to_string(),
+                            close: true,
+                            surround: false,
+                            newline: true,
+                        },
+                    ],
+                    ..Default::default()
+                },
+                name: "python".into(),
+                ..Default::default()
+            },
+            Some(tree_sitter_python::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+                (_ "(" ")" @end) @indent
+                (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap(),
+    );
+
+    let language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                brackets: BracketPairConfig {
+                    pairs: vec![
+                        BracketPair {
+                            start: "{".to_string(),
+                            end: "}".to_string(),
+                            close: false,
+                            surround: false,
+                            newline: true,
+                        },
+                        BracketPair {
+                            start: "(".to_string(),
+                            end: ")".to_string(),
+                            close: true,
+                            surround: false,
+                            newline: true,
+                        },
+                    ],
+                    ..Default::default()
+                },
+                name: LanguageName::new("rust"),
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+                (_ "(" ")" @end) @indent
+                (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap()
+        .with_injection_query(
+            r#"
+            (macro_invocation
+                macro: (identifier) @_macro_name
+                (token_tree) @injection.content
+                (#set! injection.language "python"))
+           "#,
+        )
+        .unwrap(),
+    );
+
+    cx.language_registry().add(injected_language);
+    cx.language_registry().add(language.clone());
+
+    cx.update_buffer(|buffer, cx| {
+        buffer.set_language(Some(language), cx);
+    });
+
+    cx.set_state(&r#"struct A {ˇ}"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.newline(&Default::default(), window, cx);
+    });
+
+    cx.assert_editor_state(indoc!(
+        "struct A {
+            ˇ
+        }"
+    ));
+
+    cx.set_state(&r#"select_biased!(ˇ)"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.newline(&Default::default(), window, cx);
+        editor.handle_input("def ", window, cx);
+        editor.handle_input("(", window, cx);
+        editor.newline(&Default::default(), window, cx);
+        editor.handle_input("a", window, cx);
+    });
+
+    cx.assert_editor_state(indoc!(
+        "select_biased!(
+        def (
+        aˇ
+        )
+        )"
+    ));
+}
+
 #[gpui::test]
 async fn test_autoindent_selections(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 2080513f49..e2bcc938fa 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2271,13 +2271,11 @@ impl Buffer {
             }
             let new_text = new_text.into();
             if !new_text.is_empty() || !range.is_empty() {
-                if let Some((prev_range, prev_text)) = edits.last_mut() {
-                    if prev_range.end >= range.start {
-                        prev_range.end = cmp::max(prev_range.end, range.end);
-                        *prev_text = format!("{prev_text}{new_text}").into();
-                    } else {
-                        edits.push((range, new_text));
-                    }
+                if let Some((prev_range, prev_text)) = edits.last_mut()
+                    && prev_range.end >= range.start
+                {
+                    prev_range.end = cmp::max(prev_range.end, range.end);
+                    *prev_text = format!("{prev_text}{new_text}").into();
                 } else {
                     edits.push((range, new_text));
                 }
@@ -2297,10 +2295,27 @@ impl Buffer {
 
         if let Some((before_edit, mode)) = autoindent_request {
             let mut delta = 0isize;
-            let entries = edits
+            let mut previous_setting = None;
+            let entries: Vec<_> = edits
                 .into_iter()
                 .enumerate()
                 .zip(&edit_operation.as_edit().unwrap().new_text)
+                .filter(|((_, (range, _)), _)| {
+                    let language = before_edit.language_at(range.start);
+                    let language_id = language.map(|l| l.id());
+                    if let Some((cached_language_id, auto_indent)) = previous_setting
+                        && cached_language_id == language_id
+                    {
+                        auto_indent
+                    } else {
+                        // The auto-indent setting is not present in editorconfigs, hence
+                        // we can avoid passing the file here.
+                        let auto_indent =
+                            language_settings(language.map(|l| l.name()), None, cx).auto_indent;
+                        previous_setting = Some((language_id, auto_indent));
+                        auto_indent
+                    }
+                })
                 .map(|((ix, (range, _)), new_text)| {
                     let new_text_length = new_text.len();
                     let old_start = range.start.to_point(&before_edit);
@@ -2374,12 +2389,14 @@ impl Buffer {
                 })
                 .collect();
 
-            self.autoindent_requests.push(Arc::new(AutoindentRequest {
-                before_edit,
-                entries,
-                is_block_mode: matches!(mode, AutoindentMode::Block { .. }),
-                ignore_empty_lines: false,
-            }));
+            if !entries.is_empty() {
+                self.autoindent_requests.push(Arc::new(AutoindentRequest {
+                    before_edit,
+                    entries,
+                    is_block_mode: matches!(mode, AutoindentMode::Block { .. }),
+                    ignore_empty_lines: false,
+                }));
+            }
         }
 
         self.end_transaction(cx);
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 1aae0b2f7e..29669ba2a0 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -133,6 +133,8 @@ pub struct LanguageSettings {
     /// Whether to use additional LSP queries to format (and amend) the code after
     /// every "trigger" symbol input, defined by LSP server capabilities.
     pub use_on_type_format: bool,
+    /// Whether indentation should be adjusted based on the context whilst typing.
+    pub auto_indent: bool,
     /// Whether indentation of pasted content should be adjusted based on the context.
     pub auto_indent_on_paste: bool,
     /// Controls how the editor handles the autoclosed characters.
@@ -561,6 +563,10 @@ pub struct LanguageSettingsContent {
     ///
     /// Default: true
     pub linked_edits: Option<bool>,
+    /// Whether indentation should be adjusted based on the context whilst typing.
+    ///
+    /// Default: true
+    pub auto_indent: Option<bool>,
     /// Whether indentation of pasted content should be adjusted based on the context.
     ///
     /// Default: true
@@ -1517,6 +1523,7 @@ fn merge_settings(settings: &mut LanguageSettings, src: &LanguageSettingsContent
     merge(&mut settings.use_autoclose, src.use_autoclose);
     merge(&mut settings.use_auto_surround, src.use_auto_surround);
     merge(&mut settings.use_on_type_format, src.use_on_type_format);
+    merge(&mut settings.auto_indent, src.auto_indent);
     merge(&mut settings.auto_indent_on_paste, src.auto_indent_on_paste);
     merge(
         &mut settings.always_treat_brackets_as_autoclosed,

From 58f7006898d2f67f038f6305f08a9fb990f7a771 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 18 Aug 2025 14:35:54 +0200
Subject: [PATCH 116/823] editor: Add tests to ensure no horizontal scrolling
 is possible in soft wrap mode (#36411)

Prior to https://github.com/zed-industries/zed/pull/34564 as well as
https://github.com/zed-industries/zed/pull/26893, we would have cases
where editors would be scrollable even if `soft_wrap` was set to
`editor_width`. This has regressed and improved quite a few times back
and forth. The issue was only within the editor code, the code for the
wrap map was functioning and tested properly.

Hence, this PR adds two tests to the editor rendering code in an effort
to ensure that we maintain the current correct behavior.

Release Notes:

- N/A
---
 crates/editor/src/element.rs | 65 ++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index c15ff3e509..e56ac45fab 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -10187,6 +10187,71 @@ mod tests {
     use std::num::NonZeroU32;
     use util::test::sample_text;
 
+    #[gpui::test]
+    async fn test_soft_wrap_editor_width_auto_height_editor(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+
+        let window = cx.add_window(|window, cx| {
+            let buffer = MultiBuffer::build_simple(&"a ".to_string().repeat(100), cx);
+            let mut editor = Editor::new(
+                EditorMode::AutoHeight {
+                    min_lines: 1,
+                    max_lines: None,
+                },
+                buffer,
+                None,
+                window,
+                cx,
+            );
+            editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
+            editor
+        });
+        let cx = &mut VisualTestContext::from_window(*window, cx);
+        let editor = window.root(cx).unwrap();
+        let style = cx.update(|_, cx| editor.read(cx).style().unwrap().clone());
+
+        for x in 1..=100 {
+            let (_, state) = cx.draw(
+                Default::default(),
+                size(px(200. + 0.13 * x as f32), px(500.)),
+                |_, _| EditorElement::new(&editor, style.clone()),
+            );
+
+            assert!(
+                state.position_map.scroll_max.x == 0.,
+                "Soft wrapped editor should have no horizontal scrolling!"
+            );
+        }
+    }
+
+    #[gpui::test]
+    async fn test_soft_wrap_editor_width_full_editor(cx: &mut TestAppContext) {
+        init_test(cx, |_| {});
+
+        let window = cx.add_window(|window, cx| {
+            let buffer = MultiBuffer::build_simple(&"a ".to_string().repeat(100), cx);
+            let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
+            editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
+            editor
+        });
+        let cx = &mut VisualTestContext::from_window(*window, cx);
+        let editor = window.root(cx).unwrap();
+        let style = cx.update(|_, cx| editor.read(cx).style().unwrap().clone());
+
+        for x in 1..=100 {
+            let (_, state) = cx.draw(
+                Default::default(),
+                size(px(200. + 0.13 * x as f32), px(500.)),
+                |_, _| EditorElement::new(&editor, style.clone()),
+            );
+
+            assert!(
+                state.position_map.scroll_max.x == 0.,
+                "Soft wrapped editor should have no horizontal scrolling!"
+            );
+        }
+    }
+
     #[gpui::test]
     fn test_shape_line_numbers(cx: &mut TestAppContext) {
         init_test(cx, |_| {});

From e2db434920cc22e9905e84a50ffec2f0f01da67b Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 18 Aug 2025 09:50:29 -0300
Subject: [PATCH 117/823] acp thread view: Floating editing message controls
 (#36283)

Prevents layout shift when focusing the editor

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/agent_ui/src/acp/entry_view_state.rs |   1 +
 crates/agent_ui/src/acp/message_editor.rs   |   5 +-
 crates/agent_ui/src/acp/thread_view.rs      | 235 +++++++++-----------
 3 files changed, 105 insertions(+), 136 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index e99d1f6323..c7ab2353f1 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -67,6 +67,7 @@ impl EntryViewState {
                         self.project.clone(),
                         self.thread_store.clone(),
                         self.text_thread_store.clone(),
+                        "Edit message － @ to include context",
                         editor::EditorMode::AutoHeight {
                             min_lines: 1,
                             max_lines: None,
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 12766ef458..299f0c30be 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -71,6 +71,7 @@ impl MessageEditor {
         project: Entity<Project>,
         thread_store: Entity<ThreadStore>,
         text_thread_store: Entity<TextThreadStore>,
+        placeholder: impl Into<Arc<str>>,
         mode: EditorMode,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -94,7 +95,7 @@ impl MessageEditor {
             let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
 
             let mut editor = Editor::new(mode, buffer, None, window, cx);
-            editor.set_placeholder_text("Message the agent － @ to include files", cx);
+            editor.set_placeholder_text(placeholder, cx);
             editor.set_show_indent_guides(false, cx);
             editor.set_soft_wrap();
             editor.set_use_modal_editing(true);
@@ -1276,6 +1277,7 @@ mod tests {
                     project.clone(),
                     thread_store.clone(),
                     text_thread_store.clone(),
+                    "Test",
                     EditorMode::AutoHeight {
                         min_lines: 1,
                         max_lines: None,
@@ -1473,6 +1475,7 @@ mod tests {
                     project.clone(),
                     thread_store.clone(),
                     text_thread_store.clone(),
+                    "Test",
                     EditorMode::AutoHeight {
                         max_lines: None,
                         min_lines: 1,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 271d9e5d4c..3be6e355a9 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -159,6 +159,7 @@ impl AcpThreadView {
                 project.clone(),
                 thread_store.clone(),
                 text_thread_store.clone(),
+                "Message the agent － @ to include context",
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
                     max_lines: Some(MAX_EDITOR_LINES),
@@ -426,7 +427,9 @@ impl AcpThreadView {
         match event {
             MessageEditorEvent::Send => self.send(window, cx),
             MessageEditorEvent::Cancel => self.cancel_generation(cx),
-            MessageEditorEvent::Focus => {}
+            MessageEditorEvent::Focus => {
+                self.cancel_editing(&Default::default(), window, cx);
+            }
         }
     }
 
@@ -742,44 +745,98 @@ impl AcpThreadView {
         cx: &Context<Self>,
     ) -> AnyElement {
         let primary = match &entry {
-            AgentThreadEntry::UserMessage(message) => div()
-                .id(("user_message", entry_ix))
-                .py_4()
-                .px_2()
-                .children(message.id.clone().and_then(|message_id| {
-                    message.checkpoint.as_ref()?.show.then(|| {
-                        Button::new("restore-checkpoint", "Restore Checkpoint")
-                            .icon(IconName::Undo)
-                            .icon_size(IconSize::XSmall)
-                            .icon_position(IconPosition::Start)
-                            .label_size(LabelSize::XSmall)
-                            .on_click(cx.listener(move |this, _, _window, cx| {
-                                this.rewind(&message_id, cx);
-                            }))
-                    })
-                }))
-                .child(
-                    v_flex()
-                        .p_3()
-                        .gap_1p5()
-                        .rounded_lg()
-                        .shadow_md()
-                        .bg(cx.theme().colors().editor_background)
-                        .border_1()
-                        .border_color(cx.theme().colors().border)
-                        .text_xs()
-                        .children(
-                            self.entry_view_state
-                                .read(cx)
-                                .entry(entry_ix)
-                                .and_then(|entry| entry.message_editor())
-                                .map(|editor| {
-                                    self.render_sent_message_editor(entry_ix, editor, cx)
-                                        .into_any_element()
-                                }),
-                        ),
-                )
-                .into_any(),
+            AgentThreadEntry::UserMessage(message) => {
+                let Some(editor) = self
+                    .entry_view_state
+                    .read(cx)
+                    .entry(entry_ix)
+                    .and_then(|entry| entry.message_editor())
+                    .cloned()
+                else {
+                    return Empty.into_any_element();
+                };
+
+                let editing = self.editing_message == Some(entry_ix);
+                let editor_focus = editor.focus_handle(cx).is_focused(window);
+                let focus_border = cx.theme().colors().border_focused;
+
+                div()
+                    .id(("user_message", entry_ix))
+                    .py_4()
+                    .px_2()
+                    .children(message.id.clone().and_then(|message_id| {
+                        message.checkpoint.as_ref()?.show.then(|| {
+                            Button::new("restore-checkpoint", "Restore Checkpoint")
+                                .icon(IconName::Undo)
+                                .icon_size(IconSize::XSmall)
+                                .icon_position(IconPosition::Start)
+                                .label_size(LabelSize::XSmall)
+                                .on_click(cx.listener(move |this, _, _window, cx| {
+                                    this.rewind(&message_id, cx);
+                                }))
+                        })
+                    }))
+                    .child(
+                        div()
+                            .relative()
+                            .child(
+                                div()
+                                    .p_3()
+                                    .rounded_lg()
+                                    .shadow_md()
+                                    .bg(cx.theme().colors().editor_background)
+                                    .border_1()
+                                    .when(editing && !editor_focus, |this| this.border_dashed())
+                                    .border_color(cx.theme().colors().border)
+                                    .map(|this|{
+                                        if editor_focus {
+                                            this.border_color(focus_border)
+                                        } else {
+                                            this.hover(|s| s.border_color(focus_border.opacity(0.8)))
+                                        }
+                                    })
+                                    .text_xs()
+                                    .child(editor.clone().into_any_element()),
+                            )
+                            .when(editor_focus, |this|
+                                this.child(
+                                    h_flex()
+                                        .absolute()
+                                        .top_neg_3p5()
+                                        .right_3()
+                                        .gap_1()
+                                        .rounded_sm()
+                                        .border_1()
+                                        .border_color(cx.theme().colors().border)
+                                        .bg(cx.theme().colors().editor_background)
+                                        .overflow_hidden()
+                                        .child(
+                                            IconButton::new("cancel", IconName::Close)
+                                                .icon_color(Color::Error)
+                                                .icon_size(IconSize::XSmall)
+                                                .on_click(cx.listener(Self::cancel_editing))
+                                        )
+                                        .child(
+                                            IconButton::new("regenerate", IconName::Return)
+                                                .icon_color(Color::Muted)
+                                                .icon_size(IconSize::XSmall)
+                                                .tooltip(Tooltip::text(
+                                                    "Editing will restart the thread from this point."
+                                                ))
+                                                .on_click(cx.listener({
+                                                    let editor = editor.clone();
+                                                    move |this, _, window, cx| {
+                                                        this.regenerate(
+                                                            entry_ix, &editor, window, cx,
+                                                        );
+                                                    }
+                                                })),
+                                        )
+                                )
+                            ),
+                    )
+                    .into_any()
+            }
             AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) => {
                 let style = default_markdown_style(false, window, cx);
                 let message_body = v_flex()
@@ -854,20 +911,12 @@ impl AcpThreadView {
         if let Some(editing_index) = self.editing_message.as_ref()
             && *editing_index < entry_ix
         {
-            let backdrop = div()
-                .id(("backdrop", entry_ix))
-                .size_full()
-                .absolute()
-                .inset_0()
-                .bg(cx.theme().colors().panel_background)
-                .opacity(0.8)
-                .block_mouse_except_scroll()
-                .on_click(cx.listener(Self::cancel_editing));
-
             div()
-                .relative()
                 .child(primary)
-                .child(backdrop)
+                .opacity(0.2)
+                .block_mouse_except_scroll()
+                .id("overlay")
+                .on_click(cx.listener(Self::cancel_editing))
                 .into_any_element()
         } else {
             primary
@@ -2512,90 +2561,6 @@ impl AcpThreadView {
         )
     }
 
-    fn render_sent_message_editor(
-        &self,
-        entry_ix: usize,
-        editor: &Entity<MessageEditor>,
-        cx: &Context<Self>,
-    ) -> Div {
-        v_flex().w_full().gap_2().child(editor.clone()).when(
-            self.editing_message == Some(entry_ix),
-            |el| {
-                el.child(
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Warning)
-                                .color(Color::Warning)
-                                .size(IconSize::XSmall),
-                        )
-                        .child(
-                            Label::new("Editing will restart the thread from this point.")
-                                .color(Color::Muted)
-                                .size(LabelSize::XSmall),
-                        )
-                        .child(self.render_sent_message_editor_buttons(entry_ix, editor, cx)),
-                )
-            },
-        )
-    }
-
-    fn render_sent_message_editor_buttons(
-        &self,
-        entry_ix: usize,
-        editor: &Entity<MessageEditor>,
-        cx: &Context<Self>,
-    ) -> Div {
-        h_flex()
-            .gap_0p5()
-            .flex_1()
-            .justify_end()
-            .child(
-                IconButton::new("cancel-edit-message", IconName::Close)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_color(Color::Error)
-                    .icon_size(IconSize::Small)
-                    .tooltip({
-                        let focus_handle = editor.focus_handle(cx);
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Cancel Edit",
-                                &menu::Cancel,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    })
-                    .on_click(cx.listener(Self::cancel_editing)),
-            )
-            .child(
-                IconButton::new("confirm-edit-message", IconName::Return)
-                    .disabled(editor.read(cx).is_empty(cx))
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small)
-                    .tooltip({
-                        let focus_handle = editor.focus_handle(cx);
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Regenerate",
-                                &menu::Confirm,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    })
-                    .on_click(cx.listener({
-                        let editor = editor.clone();
-                        move |this, _, window, cx| {
-                            this.regenerate(entry_ix, &editor, window, cx);
-                        }
-                    })),
-            )
-    }
-
     fn render_send_button(&self, cx: &mut Context<Self>) -> AnyElement {
         if self.thread().map_or(true, |thread| {
             thread.read(cx).status() == ThreadStatus::Idle

From 6f56ac50fecf360a2983adc88fc1e164ac8f9dcc Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Mon, 18 Aug 2025 18:45:52 +0530
Subject: [PATCH 118/823] Use upstream version of yawc (#36412)

As this was merged in upstream:
https://github.com/infinitefield/yawc/pull/16. It's safe to point yawc
to upstream instead of fork. cc @maxdeviant

Release Notes:

- N/A
---
 Cargo.lock | 5 +++--
 Cargo.toml | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a4f8c521a1..98f10eff41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20196,8 +20196,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yawc"
-version = "0.2.4"
-source = "git+https://github.com/deviant-forks/yawc?rev=1899688f3e69ace4545aceb97b2a13881cf26142#1899688f3e69ace4545aceb97b2a13881cf26142"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19a5d82922135b4ae73a079a4ffb5501e9aadb4d785b8c660eaa0a8b899028c5"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.10.1",
diff --git a/Cargo.toml b/Cargo.toml
index 14691cf8a4..83d6da5cd7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -659,9 +659,7 @@ which = "6.0.0"
 windows-core = "0.61"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
-# We can switch back to the published version once https://github.com/infinitefield/yawc/pull/16 is merged and a new
-# version is released.
-yawc = { git = "https://github.com/deviant-forks/yawc", rev = "1899688f3e69ace4545aceb97b2a13881cf26142" }
+yawc = "0.2.5"
 zstd = "0.11"
 
 [workspace.dependencies.windows]

From 6bf666958c7a2cf931ae22690c1affa069c5bbd1 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 18 Aug 2025 10:49:17 -0300
Subject: [PATCH 119/823] agent2: Allow to interrupt and send a new message
 (#36185)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 77 +++++++++++++++++++-------
 1 file changed, 58 insertions(+), 19 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 3be6e355a9..2fc30e3007 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -474,12 +474,41 @@ impl AcpThreadView {
     }
 
     fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(thread) = self.thread() {
+            if thread.read(cx).status() != ThreadStatus::Idle {
+                self.stop_current_and_send_new_message(window, cx);
+                return;
+            }
+        }
+
         let contents = self
             .message_editor
             .update(cx, |message_editor, cx| message_editor.contents(window, cx));
         self.send_impl(contents, window, cx)
     }
 
+    fn stop_current_and_send_new_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(thread) = self.thread().cloned() else {
+            return;
+        };
+
+        let cancelled = thread.update(cx, |thread, cx| thread.cancel(cx));
+
+        let contents = self
+            .message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(window, cx));
+
+        cx.spawn_in(window, async move |this, cx| {
+            cancelled.await;
+
+            this.update_in(cx, |this, window, cx| {
+                this.send_impl(contents, window, cx);
+            })
+            .ok();
+        })
+        .detach();
+    }
+
     fn send_impl(
         &mut self,
         contents: Task<anyhow::Result<Vec<acp::ContentBlock>>>,
@@ -2562,25 +2591,12 @@ impl AcpThreadView {
     }
 
     fn render_send_button(&self, cx: &mut Context<Self>) -> AnyElement {
-        if self.thread().map_or(true, |thread| {
-            thread.read(cx).status() == ThreadStatus::Idle
-        }) {
-            let is_editor_empty = self.message_editor.read(cx).is_empty(cx);
-            IconButton::new("send-message", IconName::Send)
-                .icon_color(Color::Accent)
-                .style(ButtonStyle::Filled)
-                .disabled(self.thread().is_none() || is_editor_empty)
-                .when(!is_editor_empty, |button| {
-                    button.tooltip(move |window, cx| Tooltip::for_action("Send", &Chat, window, cx))
-                })
-                .when(is_editor_empty, |button| {
-                    button.tooltip(Tooltip::text("Type a message to submit"))
-                })
-                .on_click(cx.listener(|this, _, window, cx| {
-                    this.send(window, cx);
-                }))
-                .into_any_element()
-        } else {
+        let is_editor_empty = self.message_editor.read(cx).is_empty(cx);
+        let is_generating = self.thread().map_or(false, |thread| {
+            thread.read(cx).status() != ThreadStatus::Idle
+        });
+
+        if is_generating && is_editor_empty {
             IconButton::new("stop-generation", IconName::Stop)
                 .icon_color(Color::Error)
                 .style(ButtonStyle::Tinted(ui::TintColor::Error))
@@ -2589,6 +2605,29 @@ impl AcpThreadView {
                 })
                 .on_click(cx.listener(|this, _event, _, cx| this.cancel_generation(cx)))
                 .into_any_element()
+        } else {
+            let send_btn_tooltip = if is_editor_empty && !is_generating {
+                "Type to Send"
+            } else if is_generating {
+                "Stop and Send Message"
+            } else {
+                "Send"
+            };
+
+            IconButton::new("send-message", IconName::Send)
+                .style(ButtonStyle::Filled)
+                .map(|this| {
+                    if is_editor_empty && !is_generating {
+                        this.disabled(true).icon_color(Color::Muted)
+                    } else {
+                        this.icon_color(Color::Accent)
+                    }
+                })
+                .tooltip(move |window, cx| Tooltip::for_action(send_btn_tooltip, &Chat, window, cx))
+                .on_click(cx.listener(|this, _, window, cx| {
+                    this.send(window, cx);
+                }))
+                .into_any_element()
         }
     }
 

From db31fa67f301b0b22f029e455ddad86b28b28371 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 18 Aug 2025 11:37:28 -0300
Subject: [PATCH 120/823] acp: Stay in edit mode when current completion ends
 (#36413)

When a turn ends and the checkpoint is updated, `AcpThread` emits
`EntryUpdated` with the index of the user message. This was causing the
message editor to be recreated and, therefore, lose focus.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs         |   1 +
 crates/acp_thread/src/connection.rs         | 121 ++++++++++++++------
 crates/agent_ui/src/acp/entry_view_state.rs |  66 ++++++-----
 crates/agent_ui/src/acp/thread_view.rs      |  96 +++++++++++++++-
 4 files changed, 214 insertions(+), 70 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index fb31265326..3762c553cc 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -670,6 +670,7 @@ pub struct AcpThread {
     session_id: acp::SessionId,
 }
 
+#[derive(Debug)]
 pub enum AcpThreadEvent {
     NewEntry,
     EntryUpdated(usize),
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 7497d2309f..48310f07ce 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -186,7 +186,7 @@ mod test_support {
     use std::sync::Arc;
 
     use collections::HashMap;
-    use futures::future::try_join_all;
+    use futures::{channel::oneshot, future::try_join_all};
     use gpui::{AppContext as _, WeakEntity};
     use parking_lot::Mutex;
 
@@ -194,11 +194,16 @@ mod test_support {
 
     #[derive(Clone, Default)]
     pub struct StubAgentConnection {
-        sessions: Arc<Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
+        sessions: Arc<Mutex<HashMap<acp::SessionId, Session>>>,
         permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
         next_prompt_updates: Arc<Mutex<Vec<acp::SessionUpdate>>>,
     }
 
+    struct Session {
+        thread: WeakEntity<AcpThread>,
+        response_tx: Option<oneshot::Sender<()>>,
+    }
+
     impl StubAgentConnection {
         pub fn new() -> Self {
             Self {
@@ -226,15 +231,33 @@ mod test_support {
             update: acp::SessionUpdate,
             cx: &mut App,
         ) {
+            assert!(
+                self.next_prompt_updates.lock().is_empty(),
+                "Use either send_update or set_next_prompt_updates"
+            );
+
             self.sessions
                 .lock()
                 .get(&session_id)
                 .unwrap()
+                .thread
                 .update(cx, |thread, cx| {
                     thread.handle_session_update(update.clone(), cx).unwrap();
                 })
                 .unwrap();
         }
+
+        pub fn end_turn(&self, session_id: acp::SessionId) {
+            self.sessions
+                .lock()
+                .get_mut(&session_id)
+                .unwrap()
+                .response_tx
+                .take()
+                .expect("No pending turn")
+                .send(())
+                .unwrap();
+        }
     }
 
     impl AgentConnection for StubAgentConnection {
@@ -251,7 +274,13 @@ mod test_support {
             let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
             let thread =
                 cx.new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx));
-            self.sessions.lock().insert(session_id, thread.downgrade());
+            self.sessions.lock().insert(
+                session_id,
+                Session {
+                    thread: thread.downgrade(),
+                    response_tx: None,
+                },
+            );
             Task::ready(Ok(thread))
         }
 
@@ -269,43 +298,59 @@ mod test_support {
             params: acp::PromptRequest,
             cx: &mut App,
         ) -> Task<gpui::Result<acp::PromptResponse>> {
-            let sessions = self.sessions.lock();
-            let thread = sessions.get(&params.session_id).unwrap();
+            let mut sessions = self.sessions.lock();
+            let Session {
+                thread,
+                response_tx,
+            } = sessions.get_mut(&params.session_id).unwrap();
             let mut tasks = vec![];
-            for update in self.next_prompt_updates.lock().drain(..) {
-                let thread = thread.clone();
-                let update = update.clone();
-                let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) = &update
-                    && let Some(options) = self.permission_requests.get(&tool_call.id)
-                {
-                    Some((tool_call.clone(), options.clone()))
-                } else {
-                    None
-                };
-                let task = cx.spawn(async move |cx| {
-                    if let Some((tool_call, options)) = permission_request {
-                        let permission = thread.update(cx, |thread, cx| {
-                            thread.request_tool_call_authorization(
-                                tool_call.clone().into(),
-                                options.clone(),
-                                cx,
-                            )
-                        })?;
-                        permission?.await?;
-                    }
-                    thread.update(cx, |thread, cx| {
-                        thread.handle_session_update(update.clone(), cx).unwrap();
-                    })?;
-                    anyhow::Ok(())
-                });
-                tasks.push(task);
-            }
-            cx.spawn(async move |_| {
-                try_join_all(tasks).await?;
-                Ok(acp::PromptResponse {
-                    stop_reason: acp::StopReason::EndTurn,
+            if self.next_prompt_updates.lock().is_empty() {
+                let (tx, rx) = oneshot::channel();
+                response_tx.replace(tx);
+                cx.spawn(async move |_| {
+                    rx.await?;
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                    })
                 })
-            })
+            } else {
+                for update in self.next_prompt_updates.lock().drain(..) {
+                    let thread = thread.clone();
+                    let update = update.clone();
+                    let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) =
+                        &update
+                        && let Some(options) = self.permission_requests.get(&tool_call.id)
+                    {
+                        Some((tool_call.clone(), options.clone()))
+                    } else {
+                        None
+                    };
+                    let task = cx.spawn(async move |cx| {
+                        if let Some((tool_call, options)) = permission_request {
+                            let permission = thread.update(cx, |thread, cx| {
+                                thread.request_tool_call_authorization(
+                                    tool_call.clone().into(),
+                                    options.clone(),
+                                    cx,
+                                )
+                            })?;
+                            permission?.await?;
+                        }
+                        thread.update(cx, |thread, cx| {
+                            thread.handle_session_update(update.clone(), cx).unwrap();
+                        })?;
+                        anyhow::Ok(())
+                    });
+                    tasks.push(task);
+                }
+
+                cx.spawn(async move |_| {
+                    try_join_all(tasks).await?;
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                    })
+                })
+            }
         }
 
         fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index c7ab2353f1..18ef1ce2ab 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -5,8 +5,8 @@ use agent::{TextThreadStore, ThreadStore};
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, TextStyleRefinement,
-    WeakEntity, Window,
+    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, Focusable,
+    TextStyleRefinement, WeakEntity, Window,
 };
 use language::language_settings::SoftWrap;
 use project::Project;
@@ -61,34 +61,44 @@ impl EntryViewState {
             AgentThreadEntry::UserMessage(message) => {
                 let has_id = message.id.is_some();
                 let chunks = message.chunks.clone();
-                let message_editor = cx.new(|cx| {
-                    let mut editor = MessageEditor::new(
-                        self.workspace.clone(),
-                        self.project.clone(),
-                        self.thread_store.clone(),
-                        self.text_thread_store.clone(),
-                        "Edit message － @ to include context",
-                        editor::EditorMode::AutoHeight {
-                            min_lines: 1,
-                            max_lines: None,
-                        },
-                        window,
-                        cx,
-                    );
-                    if !has_id {
-                        editor.set_read_only(true, cx);
+                if let Some(Entry::UserMessage(editor)) = self.entries.get_mut(index) {
+                    if !editor.focus_handle(cx).is_focused(window) {
+                        // Only update if we are not editing.
+                        // If we are, cancelling the edit will set the message to the newest content.
+                        editor.update(cx, |editor, cx| {
+                            editor.set_message(chunks, window, cx);
+                        });
                     }
-                    editor.set_message(chunks, window, cx);
-                    editor
-                });
-                cx.subscribe(&message_editor, move |_, editor, event, cx| {
-                    cx.emit(EntryViewEvent {
-                        entry_index: index,
-                        view_event: ViewEvent::MessageEditorEvent(editor, *event),
+                } else {
+                    let message_editor = cx.new(|cx| {
+                        let mut editor = MessageEditor::new(
+                            self.workspace.clone(),
+                            self.project.clone(),
+                            self.thread_store.clone(),
+                            self.text_thread_store.clone(),
+                            "Edit message － @ to include context",
+                            editor::EditorMode::AutoHeight {
+                                min_lines: 1,
+                                max_lines: None,
+                            },
+                            window,
+                            cx,
+                        );
+                        if !has_id {
+                            editor.set_read_only(true, cx);
+                        }
+                        editor.set_message(chunks, window, cx);
+                        editor
+                    });
+                    cx.subscribe(&message_editor, move |_, editor, event, cx| {
+                        cx.emit(EntryViewEvent {
+                            entry_index: index,
+                            view_event: ViewEvent::MessageEditorEvent(editor, *event),
+                        })
                     })
-                })
-                .detach();
-                self.set_entry(index, Entry::UserMessage(message_editor));
+                    .detach();
+                    self.set_entry(index, Entry::UserMessage(message_editor));
+                }
             }
             AgentThreadEntry::ToolCall(tool_call) => {
                 let terminals = tool_call.terminals().cloned().collect::<Vec<_>>();
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2fc30e3007..4760677fa1 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -3606,7 +3606,7 @@ pub(crate) mod tests {
     async fn test_drop(cx: &mut TestAppContext) {
         init_test(cx);
 
-        let (thread_view, _cx) = setup_thread_view(StubAgentServer::default(), cx).await;
+        let (thread_view, _cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
         let weak_view = thread_view.downgrade();
         drop(thread_view);
         assert!(!weak_view.is_upgradable());
@@ -3616,7 +3616,7 @@ pub(crate) mod tests {
     async fn test_notification_for_stop_event(cx: &mut TestAppContext) {
         init_test(cx);
 
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default(), cx).await;
+        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
 
         let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
         message_editor.update_in(cx, |editor, window, cx| {
@@ -3800,8 +3800,12 @@ pub(crate) mod tests {
     }
 
     impl StubAgentServer<StubAgentConnection> {
-        fn default() -> Self {
-            Self::new(StubAgentConnection::default())
+        fn default_response() -> Self {
+            let conn = StubAgentConnection::new();
+            conn.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk {
+                content: "Default response".into(),
+            }]);
+            Self::new(conn)
         }
     }
 
@@ -4214,4 +4218,88 @@ pub(crate) mod tests {
             assert_eq!(new_editor.read(cx).text(cx), "Edited message content");
         })
     }
+
+    #[gpui::test]
+    async fn test_message_editing_while_generating(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+
+        let (thread_view, cx) =
+            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
+        add_to_workspace(thread_view.clone(), cx);
+
+        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Original message to edit", window, cx);
+        });
+        thread_view.update_in(cx, |thread_view, window, cx| {
+            thread_view.send(window, cx);
+        });
+
+        cx.run_until_parked();
+
+        let (user_message_editor, session_id) = thread_view.read_with(cx, |view, cx| {
+            let thread = view.thread().unwrap().read(cx);
+            assert_eq!(thread.entries().len(), 1);
+
+            let editor = view
+                .entry_view_state
+                .read(cx)
+                .entry(0)
+                .unwrap()
+                .message_editor()
+                .unwrap()
+                .clone();
+
+            (editor, thread.session_id().clone())
+        });
+
+        // Focus
+        cx.focus(&user_message_editor);
+
+        thread_view.read_with(cx, |view, _cx| {
+            assert_eq!(view.editing_message, Some(0));
+        });
+
+        // Edit
+        user_message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Edited message content", window, cx);
+        });
+
+        thread_view.read_with(cx, |view, _cx| {
+            assert_eq!(view.editing_message, Some(0));
+        });
+
+        // Finish streaming response
+        cx.update(|_, cx| {
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::AgentMessageChunk {
+                    content: acp::ContentBlock::Text(acp::TextContent {
+                        text: "Response".into(),
+                        annotations: None,
+                    }),
+                },
+                cx,
+            );
+            connection.end_turn(session_id);
+        });
+
+        thread_view.read_with(cx, |view, _cx| {
+            assert_eq!(view.editing_message, Some(0));
+        });
+
+        cx.run_until_parked();
+
+        // Should still be editing
+        cx.update(|window, cx| {
+            assert!(user_message_editor.focus_handle(cx).is_focused(window));
+            assert_eq!(thread_view.read(cx).editing_message, Some(0));
+            assert_eq!(
+                user_message_editor.read(cx).text(cx),
+                "Edited message content"
+            );
+        });
+    }
 }

From 9b78c4690208367444699f1e3a58e96437cdecd1 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 18 Aug 2025 16:48:38 +0200
Subject: [PATCH 121/823] python: Use pip provided by our 'base' venv (#36414)

Closes #36218

Release Notes:

- Debugger: Python debugger installation no longer assumes that pip is
available in global Python installation
---
 crates/dap_adapters/src/python.rs | 58 +++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
index a2bd934311..7b90f80fe2 100644
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -24,6 +24,7 @@ use util::{ResultExt, maybe};
 
 #[derive(Default)]
 pub(crate) struct PythonDebugAdapter {
+    base_venv_path: OnceCell<Result<Arc<Path>, String>>,
     debugpy_whl_base_path: OnceCell<Result<Arc<Path>, String>>,
 }
 
@@ -91,14 +92,12 @@ impl PythonDebugAdapter {
         })
     }
 
-    async fn fetch_wheel(delegate: &Arc<dyn DapDelegate>) -> Result<Arc<Path>, String> {
-        let system_python = Self::system_python_name(delegate)
-            .await
-            .ok_or_else(|| String::from("Could not find a Python installation"))?;
-        let command: &OsStr = system_python.as_ref();
+    async fn fetch_wheel(&self, delegate: &Arc<dyn DapDelegate>) -> Result<Arc<Path>, String> {
         let download_dir = debug_adapters_dir().join(Self::ADAPTER_NAME).join("wheels");
         std::fs::create_dir_all(&download_dir).map_err(|e| e.to_string())?;
-        let installation_succeeded = util::command::new_smol_command(command)
+        let system_python = self.base_venv_path(delegate).await?;
+
+        let installation_succeeded = util::command::new_smol_command(system_python.as_ref())
             .args([
                 "-m",
                 "pip",
@@ -114,7 +113,7 @@ impl PythonDebugAdapter {
             .status
             .success();
         if !installation_succeeded {
-            return Err("debugpy installation failed".into());
+            return Err("debugpy installation failed (could not fetch Debugpy's wheel)".into());
         }
 
         let wheel_path = std::fs::read_dir(&download_dir)
@@ -139,7 +138,7 @@ impl PythonDebugAdapter {
         Ok(Arc::from(wheel_path.path()))
     }
 
-    async fn maybe_fetch_new_wheel(delegate: &Arc<dyn DapDelegate>) {
+    async fn maybe_fetch_new_wheel(&self, delegate: &Arc<dyn DapDelegate>) {
         let latest_release = delegate
             .http_client()
             .get(
@@ -191,7 +190,7 @@ impl PythonDebugAdapter {
                     )
                     .await
                     .ok()?;
-                Self::fetch_wheel(delegate).await.ok()?;
+                self.fetch_wheel(delegate).await.ok()?;
             }
             Some(())
         })
@@ -204,7 +203,7 @@ impl PythonDebugAdapter {
     ) -> Result<Arc<Path>, String> {
         self.debugpy_whl_base_path
             .get_or_init(|| async move {
-                Self::maybe_fetch_new_wheel(delegate).await;
+                self.maybe_fetch_new_wheel(delegate).await;
                 Ok(Arc::from(
                     debug_adapters_dir()
                         .join(Self::ADAPTER_NAME)
@@ -217,6 +216,45 @@ impl PythonDebugAdapter {
             .clone()
     }
 
+    async fn base_venv_path(&self, delegate: &Arc<dyn DapDelegate>) -> Result<Arc<Path>, String> {
+        self.base_venv_path
+            .get_or_init(|| async {
+                let base_python = Self::system_python_name(delegate)
+                    .await
+                    .ok_or_else(|| String::from("Could not find a Python installation"))?;
+
+                let did_succeed = util::command::new_smol_command(base_python)
+                    .args(["-m", "venv", "zed_base_venv"])
+                    .current_dir(
+                        paths::debug_adapters_dir().join(Self::DEBUG_ADAPTER_NAME.as_ref()),
+                    )
+                    .spawn()
+                    .map_err(|e| format!("{e:#?}"))?
+                    .status()
+                    .await
+                    .map_err(|e| format!("{e:#?}"))?
+                    .success();
+                if !did_succeed {
+                    return Err("Failed to create base virtual environment".into());
+                }
+
+                const DIR: &'static str = if cfg!(target_os = "windows") {
+                    "Scripts"
+                } else {
+                    "bin"
+                };
+                Ok(Arc::from(
+                    paths::debug_adapters_dir()
+                        .join(Self::DEBUG_ADAPTER_NAME.as_ref())
+                        .join("zed_base_venv")
+                        .join(DIR)
+                        .join("python3")
+                        .as_ref(),
+                ))
+            })
+            .await
+            .clone()
+    }
     async fn system_python_name(delegate: &Arc<dyn DapDelegate>) -> Option<String> {
         const BINARY_NAMES: [&str; 3] = ["python3", "python", "py"];
         let mut name = None;

From 48fed866e60f1951bd8aa6ccec000670ce839b7f Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 18 Aug 2025 12:34:27 -0300
Subject: [PATCH 122/823] acp: Have `AcpThread` handle all interrupting
 (#36417)

The view was cancelling the generation, but `AcpThread` already handles
that, so we removed that extra code and fixed a bug where an update from
the first user message would appear after the second one.

Release Notes:

- N/A

Co-authored-by: Danilo <danilo@zed.dev>
---
 crates/acp_thread/src/acp_thread.rs    |  22 ++--
 crates/acp_thread/src/connection.rs    |  27 +++--
 crates/agent_ui/src/acp/thread_view.rs | 135 ++++++++++++++++++++++++-
 3 files changed, 164 insertions(+), 20 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 3762c553cc..e104c40bf2 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1200,17 +1200,21 @@ impl AcpThread {
         } else {
             None
         };
-        self.push_entry(
-            AgentThreadEntry::UserMessage(UserMessage {
-                id: message_id.clone(),
-                content: block,
-                chunks: message,
-                checkpoint: None,
-            }),
-            cx,
-        );
 
         self.run_turn(cx, async move |this, cx| {
+            this.update(cx, |this, cx| {
+                this.push_entry(
+                    AgentThreadEntry::UserMessage(UserMessage {
+                        id: message_id.clone(),
+                        content: block,
+                        chunks: message,
+                        checkpoint: None,
+                    }),
+                    cx,
+                );
+            })
+            .ok();
+
             let old_checkpoint = git_store
                 .update(cx, |git, cx| git.checkpoint(cx))?
                 .await
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 48310f07ce..a328499bbc 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -201,7 +201,7 @@ mod test_support {
 
     struct Session {
         thread: WeakEntity<AcpThread>,
-        response_tx: Option<oneshot::Sender<()>>,
+        response_tx: Option<oneshot::Sender<acp::StopReason>>,
     }
 
     impl StubAgentConnection {
@@ -242,12 +242,12 @@ mod test_support {
                 .unwrap()
                 .thread
                 .update(cx, |thread, cx| {
-                    thread.handle_session_update(update.clone(), cx).unwrap();
+                    thread.handle_session_update(update, cx).unwrap();
                 })
                 .unwrap();
         }
 
-        pub fn end_turn(&self, session_id: acp::SessionId) {
+        pub fn end_turn(&self, session_id: acp::SessionId, stop_reason: acp::StopReason) {
             self.sessions
                 .lock()
                 .get_mut(&session_id)
@@ -255,7 +255,7 @@ mod test_support {
                 .response_tx
                 .take()
                 .expect("No pending turn")
-                .send(())
+                .send(stop_reason)
                 .unwrap();
         }
     }
@@ -308,10 +308,8 @@ mod test_support {
                 let (tx, rx) = oneshot::channel();
                 response_tx.replace(tx);
                 cx.spawn(async move |_| {
-                    rx.await?;
-                    Ok(acp::PromptResponse {
-                        stop_reason: acp::StopReason::EndTurn,
-                    })
+                    let stop_reason = rx.await?;
+                    Ok(acp::PromptResponse { stop_reason })
                 })
             } else {
                 for update in self.next_prompt_updates.lock().drain(..) {
@@ -353,8 +351,17 @@ mod test_support {
             }
         }
 
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
+        fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
+            if let Some(end_turn_tx) = self
+                .sessions
+                .lock()
+                .get_mut(session_id)
+                .unwrap()
+                .response_tx
+                .take()
+            {
+                end_turn_tx.send(acp::StopReason::Canceled).unwrap();
+            }
         }
 
         fn session_editor(
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 4760677fa1..2c02027c4d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4283,7 +4283,7 @@ pub(crate) mod tests {
                 },
                 cx,
             );
-            connection.end_turn(session_id);
+            connection.end_turn(session_id, acp::StopReason::EndTurn);
         });
 
         thread_view.read_with(cx, |view, _cx| {
@@ -4302,4 +4302,137 @@ pub(crate) mod tests {
             );
         });
     }
+
+    #[gpui::test]
+    async fn test_interrupt(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+
+        let (thread_view, cx) =
+            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
+        add_to_workspace(thread_view.clone(), cx);
+
+        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Message 1", window, cx);
+        });
+        thread_view.update_in(cx, |thread_view, window, cx| {
+            thread_view.send(window, cx);
+        });
+
+        let (thread, session_id) = thread_view.read_with(cx, |view, cx| {
+            let thread = view.thread().unwrap();
+
+            (thread.clone(), thread.read(cx).session_id().clone())
+        });
+
+        cx.run_until_parked();
+
+        cx.update(|_, cx| {
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::AgentMessageChunk {
+                    content: "Message 1 resp".into(),
+                },
+                cx,
+            );
+        });
+
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc::indoc! {"
+                    ## User
+
+                    Message 1
+
+                    ## Assistant
+
+                    Message 1 resp
+
+                "}
+            )
+        });
+
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Message 2", window, cx);
+        });
+        thread_view.update_in(cx, |thread_view, window, cx| {
+            thread_view.send(window, cx);
+        });
+
+        cx.update(|_, cx| {
+            // Simulate a response sent after beginning to cancel
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::AgentMessageChunk {
+                    content: "onse".into(),
+                },
+                cx,
+            );
+        });
+
+        cx.run_until_parked();
+
+        // Last Message 1 response should appear before Message 2
+        thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc::indoc! {"
+                    ## User
+
+                    Message 1
+
+                    ## Assistant
+
+                    Message 1 response
+
+                    ## User
+
+                    Message 2
+
+                "}
+            )
+        });
+
+        cx.update(|_, cx| {
+            connection.send_update(
+                session_id.clone(),
+                acp::SessionUpdate::AgentMessageChunk {
+                    content: "Message 2 response".into(),
+                },
+                cx,
+            );
+            connection.end_turn(session_id.clone(), acp::StopReason::EndTurn);
+        });
+
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc::indoc! {"
+                    ## User
+
+                    Message 1
+
+                    ## Assistant
+
+                    Message 1 response
+
+                    ## User
+
+                    Message 2
+
+                    ## Assistant
+
+                    Message 2 response
+
+                "}
+            )
+        });
+    }
 }

From e1d31cfcc3360bf50f6230d6dd5d1aafc3295c4c Mon Sep 17 00:00:00 2001
From: AidanV <84053180+AidanV@users.noreply.github.com>
Date: Mon, 18 Aug 2025 08:52:25 -0700
Subject: [PATCH 123/823] vim: Display invisibles in mode indicator (#35760)

Release Notes:

- Fixes bug where `ctrl-k enter` while in `INSERT` mode would put a
newline in the Vim mode indicator


#### Old
<img width="729" height="486" alt="OldVimModeIndicator"
src="https://github.com/user-attachments/assets/58742745-5a58-4e7b-a1ef-29aa3ff1c4f7"
/>

#### New
<img width="729" height="486" alt="NewVimModeIndicator"
src="https://github.com/user-attachments/assets/e636359a-06b6-4cdd-9e62-5dc52c6f068f"
/>
---
 crates/vim/src/state.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index c4be034871..423859dadc 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -1028,13 +1028,21 @@ impl Operator {
     }
 
     pub fn status(&self) -> String {
+        fn make_visible(c: &str) -> &str {
+            match c {
+                "\n" => "enter",
+                "\t" => "tab",
+                " " => "space",
+                c => c,
+            }
+        }
         match self {
             Operator::Digraph {
                 first_char: Some(first_char),
-            } => format!("^K{first_char}"),
+            } => format!("^K{}", make_visible(&first_char.to_string())),
             Operator::Literal {
                 prefix: Some(prefix),
-            } => format!("^V{prefix}"),
+            } => format!("^V{}", make_visible(&prefix)),
             Operator::AutoIndent => "=".to_string(),
             Operator::ShellCommand => "=".to_string(),
             _ => self.id().to_string(),

From 768b2de368697a559a038f65e61aff81dc99f041 Mon Sep 17 00:00:00 2001
From: Lucas Vieira <vieiralucas4@gmail.com>
Date: Mon, 18 Aug 2025 12:57:53 -0300
Subject: [PATCH 124/823] vim: Fix `ap` text object selection when there is
 line wrapping (#35485)

In Vim mode, `ap` text object (used in `vap`, `dap`, `cap`) was
selecting multiple paragraphs when soft wrap was enabled. The bug was
caused by using DisplayRow coordinates for arithmetic instead of buffer
row coordinates in the paragraph boundary calculation.

Fix by converting to buffer coordinates before arithmetic, then back to
display coordinates for the final result.

Closes #35085

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/vim/src/normal/delete.rs               | 22 +++++
 crates/vim/src/object.rs                      | 93 ++++++++++++++++++-
 crates/vim/src/visual.rs                      | 33 +++++++
 ...hange_paragraph_object_with_soft_wrap.json | 72 ++++++++++++++
 ...elete_paragraph_object_with_soft_wrap.json | 72 ++++++++++++++
 .../test_delete_paragraph_whitespace.json     |  5 +
 ...isual_paragraph_object_with_soft_wrap.json | 72 ++++++++++++++
 7 files changed, 365 insertions(+), 4 deletions(-)
 create mode 100644 crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json
 create mode 100644 crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json
 create mode 100644 crates/vim/test_data/test_delete_paragraph_whitespace.json
 create mode 100644 crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json

diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index 1b7557371a..d7a6932baa 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -2,6 +2,7 @@ use crate::{
     Vim,
     motion::{Motion, MotionKind},
     object::Object,
+    state::Mode,
 };
 use collections::{HashMap, HashSet};
 use editor::{
@@ -102,8 +103,20 @@ impl Vim {
                 // Emulates behavior in vim where if we expanded backwards to include a newline
                 // the cursor gets set back to the start of the line
                 let mut should_move_to_start: HashSet<_> = Default::default();
+
+                // Emulates behavior in vim where after deletion the cursor should try to move
+                // to the same column it was before deletion if the line is not empty or only
+                // contains whitespace
+                let mut column_before_move: HashMap<_, _> = Default::default();
+                let target_mode = object.target_visual_mode(vim.mode, around);
+
                 editor.change_selections(Default::default(), window, cx, |s| {
                     s.move_with(|map, selection| {
+                        let cursor_point = selection.head().to_point(map);
+                        if target_mode == Mode::VisualLine {
+                            column_before_move.insert(selection.id, cursor_point.column);
+                        }
+
                         object.expand_selection(map, selection, around, times);
                         let offset_range = selection.map(|p| p.to_offset(map, Bias::Left)).range();
                         let mut move_selection_start_to_previous_line =
@@ -164,6 +177,15 @@ impl Vim {
                         let mut cursor = selection.head();
                         if should_move_to_start.contains(&selection.id) {
                             *cursor.column_mut() = 0;
+                        } else if let Some(column) = column_before_move.get(&selection.id)
+                            && *column > 0
+                        {
+                            let mut cursor_point = cursor.to_point(map);
+                            cursor_point.column = *column;
+                            cursor = map
+                                .buffer_snapshot
+                                .clip_point(cursor_point, Bias::Left)
+                                .to_display_point(map);
                         }
                         cursor = map.clip_point(cursor, Bias::Left);
                         selection.collapse_to(cursor, selection.goal)
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
index 63139d7e94..cff23c4bd4 100644
--- a/crates/vim/src/object.rs
+++ b/crates/vim/src/object.rs
@@ -1444,14 +1444,15 @@ fn paragraph(
                     return None;
                 }
 
-                let paragraph_start_row = paragraph_start.row();
-                if paragraph_start_row.0 != 0 {
+                let paragraph_start_buffer_point = paragraph_start.to_point(map);
+                if paragraph_start_buffer_point.row != 0 {
                     let previous_paragraph_last_line_start =
-                        Point::new(paragraph_start_row.0 - 1, 0).to_display_point(map);
+                        Point::new(paragraph_start_buffer_point.row - 1, 0).to_display_point(map);
                     paragraph_start = start_of_paragraph(map, previous_paragraph_last_line_start);
                 }
             } else {
-                let mut start_row = paragraph_end_row.0 + 1;
+                let paragraph_end_buffer_point = paragraph_end.to_point(map);
+                let mut start_row = paragraph_end_buffer_point.row + 1;
                 if i > 0 {
                     start_row += 1;
                 }
@@ -1903,6 +1904,90 @@ mod test {
         }
     }
 
+    #[gpui::test]
+    async fn test_change_paragraph_object_with_soft_wrap(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        const WRAPPING_EXAMPLE: &str = indoc! {"
+            ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.
+
+            ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.
+
+            ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.ˇ
+        "};
+
+        cx.set_shared_wrap(20).await;
+
+        cx.simulate_at_each_offset("c i p", WRAPPING_EXAMPLE)
+            .await
+            .assert_matches();
+        cx.simulate_at_each_offset("c a p", WRAPPING_EXAMPLE)
+            .await
+            .assert_matches();
+    }
+
+    #[gpui::test]
+    async fn test_delete_paragraph_object_with_soft_wrap(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        const WRAPPING_EXAMPLE: &str = indoc! {"
+            ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.
+
+            ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.
+
+            ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.ˇ
+        "};
+
+        cx.set_shared_wrap(20).await;
+
+        cx.simulate_at_each_offset("d i p", WRAPPING_EXAMPLE)
+            .await
+            .assert_matches();
+        cx.simulate_at_each_offset("d a p", WRAPPING_EXAMPLE)
+            .await
+            .assert_matches();
+    }
+
+    #[gpui::test]
+    async fn test_delete_paragraph_whitespace(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state(indoc! {"
+            a
+                   ˇ•
+            aaaaaaaaaaaaa
+        "})
+            .await;
+
+        cx.simulate_shared_keystrokes("d i p").await;
+        cx.shared_state().await.assert_eq(indoc! {"
+            a
+            aaaaaaaˇaaaaaa
+        "});
+    }
+
+    #[gpui::test]
+    async fn test_visual_paragraph_object_with_soft_wrap(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        const WRAPPING_EXAMPLE: &str = indoc! {"
+            ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.
+
+            ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.
+
+            ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.ˇ
+        "};
+
+        cx.set_shared_wrap(20).await;
+
+        cx.simulate_at_each_offset("v i p", WRAPPING_EXAMPLE)
+            .await
+            .assert_matches();
+        cx.simulate_at_each_offset("v a p", WRAPPING_EXAMPLE)
+            .await
+            .assert_matches();
+    }
+
     // Test string with "`" for opening surrounders and "'" for closing surrounders
     const SURROUNDING_MARKER_STRING: &str = indoc! {"
         ˇTh'ˇe ˇ`ˇ'ˇquˇi`ˇck broˇ'wn`
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index 7bfd8dc8be..3b789b1f3e 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -414,6 +414,8 @@ impl Vim {
                             );
                         }
 
+                        let original_point = selection.tail().to_point(&map);
+
                         if let Some(range) = object.range(map, mut_selection, around, count) {
                             if !range.is_empty() {
                                 let expand_both_ways = object.always_expands_both_ways()
@@ -462,6 +464,37 @@ impl Vim {
                                 };
                                 selection.end = new_selection_end.to_display_point(map);
                             }
+
+                            // To match vim, if the range starts of the same line as it originally
+                            // did, we keep the tail of the selection in the same place instead of
+                            // snapping it to the start of the line
+                            if target_mode == Mode::VisualLine {
+                                let new_start_point = selection.start.to_point(map);
+                                if new_start_point.row == original_point.row {
+                                    if selection.end.to_point(map).row > new_start_point.row {
+                                        if original_point.column
+                                            == map
+                                                .buffer_snapshot
+                                                .line_len(MultiBufferRow(original_point.row))
+                                        {
+                                            selection.start = movement::saturating_left(
+                                                map,
+                                                original_point.to_display_point(map),
+                                            )
+                                        } else {
+                                            selection.start = original_point.to_display_point(map)
+                                        }
+                                    } else {
+                                        selection.end = movement::saturating_right(
+                                            map,
+                                            original_point.to_display_point(map),
+                                        );
+                                        if original_point.column > 0 {
+                                            selection.reversed = true
+                                        }
+                                    }
+                                }
+                            }
                         }
                     });
                 });
diff --git a/crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json b/crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json
new file mode 100644
index 0000000000..47d68e13a6
--- /dev/null
+++ b/crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json
@@ -0,0 +1,72 @@
+{"SetOption":{"value":"wrap"}}
+{"SetOption":{"value":"columns=20"}}
+{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"ˇ\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"ˇ\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
+{"Key":"c"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ\n","mode":"Insert"}}
+{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Insert"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
+{"Key":"c"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json b/crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json
new file mode 100644
index 0000000000..19dcd175b3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json
@@ -0,0 +1,72 @@
+{"SetOption":{"value":"wrap"}}
+{"SetOption":{"value":"columns=20"}}
+{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Normal"}}
+{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"Second paragraph that is also quite long and will definitely wrap under soft wrap conditions andˇ should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nThird paragraph with additional long text content that will also wrap when line length is constraˇined by the wrapping settings.\n","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\nˇ","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\nˇ","mode":"Normal"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
+{"Key":"d"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_paragraph_whitespace.json b/crates/vim/test_data/test_delete_paragraph_whitespace.json
new file mode 100644
index 0000000000..e07b18eaa3
--- /dev/null
+++ b/crates/vim/test_data/test_delete_paragraph_whitespace.json
@@ -0,0 +1,5 @@
+{"Put":{"state":"a\n       ˇ•\naaaaaaaaaaaaa\n"}}
+{"Key":"d"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"a\naaaaaaaˇaaaaaa\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json b/crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json
new file mode 100644
index 0000000000..6bfce2f955
--- /dev/null
+++ b/crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json
@@ -0,0 +1,72 @@
+{"SetOption":{"value":"wrap"}}
+{"SetOption":{"value":"columns=20"}}
+{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"«Fˇ»irst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"«ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is l»imited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\n«Sˇ»econd paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\n«ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and s»hould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«Tˇ»hird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping s»ettings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.»\n","mode":"VisualLine"}}
+{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"«First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ»Second paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is «limited making it span multiple display lines.\n\nˇ»Second paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\n«Second paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ»Third paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and «should be handled correctly.\n\nˇ»Third paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«Third paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\nˇ»","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping «settings.\nˇ»","mode":"VisualLine"}}
+{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
+{"Key":"v"}
+{"Key":"a"}
+{"Key":"p"}
+{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings«.\nˇ»","mode":"VisualLine"}}

From e1d8e3bf6d74f260f8fc5b8d0ec3aa89fb3f6985 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Mon, 18 Aug 2025 18:58:12 +0300
Subject: [PATCH 125/823] language: Clean up allocations (#36418)

- Correctly pre-allocate `Vec` when deserializing regexes
- Simplify manual `Vec::with_capacity` calls by using `Iterator::unzip`
- Collect directly into `Arc<[T]>` (uses `Vec` internally anyway, but
simplifies code)
- Remove unnecessary `LazyLock` around Atomics by not using const
incompatible `Default` for initialization.

Release Notes:

- N/A
---
 crates/language/src/language.rs | 42 +++++++++++++++------------------
 crates/language/src/proto.rs    | 10 ++++----
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 6fa31da860..c377d7440a 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -121,8 +121,8 @@ where
     func(cursor.deref_mut())
 }
 
-static NEXT_LANGUAGE_ID: LazyLock<AtomicUsize> = LazyLock::new(Default::default);
-static NEXT_GRAMMAR_ID: LazyLock<AtomicUsize> = LazyLock::new(Default::default);
+static NEXT_LANGUAGE_ID: AtomicUsize = AtomicUsize::new(0);
+static NEXT_GRAMMAR_ID: AtomicUsize = AtomicUsize::new(0);
 static WASM_ENGINE: LazyLock<wasmtime::Engine> = LazyLock::new(|| {
     wasmtime::Engine::new(&wasmtime::Config::new()).expect("Failed to create Wasmtime engine")
 });
@@ -964,11 +964,11 @@ where
 
 fn deserialize_regex_vec<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<Regex>, D::Error> {
     let sources = Vec::<String>::deserialize(d)?;
-    let mut regexes = Vec::new();
-    for source in sources {
-        regexes.push(regex::Regex::new(&source).map_err(de::Error::custom)?);
-    }
-    Ok(regexes)
+    sources
+        .into_iter()
+        .map(|source| regex::Regex::new(&source))
+        .collect::<Result<_, _>>()
+        .map_err(de::Error::custom)
 }
 
 fn regex_vec_json_schema(_: &mut SchemaGenerator) -> schemars::Schema {
@@ -1034,12 +1034,10 @@ impl<'de> Deserialize<'de> for BracketPairConfig {
         D: Deserializer<'de>,
     {
         let result = Vec::<BracketPairContent>::deserialize(deserializer)?;
-        let mut brackets = Vec::with_capacity(result.len());
-        let mut disabled_scopes_by_bracket_ix = Vec::with_capacity(result.len());
-        for entry in result {
-            brackets.push(entry.bracket_pair);
-            disabled_scopes_by_bracket_ix.push(entry.not_in);
-        }
+        let (brackets, disabled_scopes_by_bracket_ix) = result
+            .into_iter()
+            .map(|entry| (entry.bracket_pair, entry.not_in))
+            .unzip();
 
         Ok(BracketPairConfig {
             pairs: brackets,
@@ -1379,16 +1377,14 @@ impl Language {
         let grammar = self.grammar_mut().context("cannot mutate grammar")?;
 
         let query = Query::new(&grammar.ts_language, source)?;
-        let mut extra_captures = Vec::with_capacity(query.capture_names().len());
-
-        for name in query.capture_names().iter() {
-            let kind = if *name == "run" {
-                RunnableCapture::Run
-            } else {
-                RunnableCapture::Named(name.to_string().into())
-            };
-            extra_captures.push(kind);
-        }
+        let extra_captures: Vec<_> = query
+            .capture_names()
+            .iter()
+            .map(|&name| match name {
+                "run" => RunnableCapture::Run,
+                name => RunnableCapture::Named(name.to_string().into()),
+            })
+            .collect();
 
         grammar.runnable_config = Some(RunnableConfig {
             extra_captures,
diff --git a/crates/language/src/proto.rs b/crates/language/src/proto.rs
index 18f6bb8709..acae97019f 100644
--- a/crates/language/src/proto.rs
+++ b/crates/language/src/proto.rs
@@ -385,12 +385,10 @@ pub fn deserialize_undo_map_entry(
 
 /// Deserializes selections from the RPC representation.
 pub fn deserialize_selections(selections: Vec<proto::Selection>) -> Arc<[Selection<Anchor>]> {
-    Arc::from(
-        selections
-            .into_iter()
-            .filter_map(deserialize_selection)
-            .collect::<Vec<_>>(),
-    )
+    selections
+        .into_iter()
+        .filter_map(deserialize_selection)
+        .collect()
 }
 
 /// Deserializes a [`Selection`] from the RPC representation.

From ed155ceba9e8add2193dc77220bf1a20bf7c5288 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 18 Aug 2025 18:27:26 +0200
Subject: [PATCH 126/823] title_bar: Fix screensharing errors not being shown
 to the user (#36424)

Release Notes:

- N/A
---
 crates/title_bar/src/collab.rs | 95 ++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 45 deletions(-)

diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index 74d60a6d66..b458c64b5f 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -14,7 +14,6 @@ use ui::{
     Avatar, AvatarAudioStatusIndicator, ContextMenu, ContextMenuItem, Divider, DividerColor,
     Facepile, PopoverMenu, SplitButton, SplitButtonStyle, TintColor, Tooltip, prelude::*,
 };
-use util::maybe;
 use workspace::notifications::DetachAndPromptErr;
 
 use crate::TitleBar;
@@ -32,52 +31,59 @@ actions!(
 );
 
 fn toggle_screen_sharing(
-    screen: Option<Rc<dyn ScreenCaptureSource>>,
+    screen: anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>,
     window: &mut Window,
     cx: &mut App,
 ) {
     let call = ActiveCall::global(cx).read(cx);
-    if let Some(room) = call.room().cloned() {
-        let toggle_screen_sharing = room.update(cx, |room, cx| {
-            let clicked_on_currently_shared_screen =
-                room.shared_screen_id().is_some_and(|screen_id| {
-                    Some(screen_id)
-                        == screen
-                            .as_deref()
-                            .and_then(|s| s.metadata().ok().map(|meta| meta.id))
-                });
-            let should_unshare_current_screen = room.is_sharing_screen();
-            let unshared_current_screen = should_unshare_current_screen.then(|| {
-                telemetry::event!(
-                    "Screen Share Disabled",
-                    room_id = room.id(),
-                    channel_id = room.channel_id(),
-                );
-                room.unshare_screen(clicked_on_currently_shared_screen || screen.is_none(), cx)
-            });
-            if let Some(screen) = screen {
-                if !should_unshare_current_screen {
+    let toggle_screen_sharing = match screen {
+        Ok(screen) => {
+            let Some(room) = call.room().cloned() else {
+                return;
+            };
+            let toggle_screen_sharing = room.update(cx, |room, cx| {
+                let clicked_on_currently_shared_screen =
+                    room.shared_screen_id().is_some_and(|screen_id| {
+                        Some(screen_id)
+                            == screen
+                                .as_deref()
+                                .and_then(|s| s.metadata().ok().map(|meta| meta.id))
+                    });
+                let should_unshare_current_screen = room.is_sharing_screen();
+                let unshared_current_screen = should_unshare_current_screen.then(|| {
                     telemetry::event!(
-                        "Screen Share Enabled",
+                        "Screen Share Disabled",
                         room_id = room.id(),
                         channel_id = room.channel_id(),
                     );
-                }
-                cx.spawn(async move |room, cx| {
-                    unshared_current_screen.transpose()?;
-                    if !clicked_on_currently_shared_screen {
-                        room.update(cx, |room, cx| room.share_screen(screen, cx))?
-                            .await
-                    } else {
-                        Ok(())
+                    room.unshare_screen(clicked_on_currently_shared_screen || screen.is_none(), cx)
+                });
+                if let Some(screen) = screen {
+                    if !should_unshare_current_screen {
+                        telemetry::event!(
+                            "Screen Share Enabled",
+                            room_id = room.id(),
+                            channel_id = room.channel_id(),
+                        );
                     }
-                })
-            } else {
-                Task::ready(Ok(()))
-            }
-        });
-        toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", window, cx, |e, _, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e)));
-    }
+                    cx.spawn(async move |room, cx| {
+                        unshared_current_screen.transpose()?;
+                        if !clicked_on_currently_shared_screen {
+                            room.update(cx, |room, cx| room.share_screen(screen, cx))?
+                                .await
+                        } else {
+                            Ok(())
+                        }
+                    })
+                } else {
+                    Task::ready(Ok(()))
+                }
+            });
+            toggle_screen_sharing
+        }
+        Err(e) => Task::ready(Err(e)),
+    };
+    toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", window, cx, |e, _, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e)));
 }
 
 fn toggle_mute(_: &ToggleMute, cx: &mut App) {
@@ -483,9 +489,8 @@ impl TitleBar {
                             let screen = if should_share {
                                 cx.update(|_, cx| pick_default_screen(cx))?.await
                             } else {
-                                None
+                                Ok(None)
                             };
-
                             cx.update(|window, cx| toggle_screen_sharing(screen, window, cx))?;
 
                             Result::<_, anyhow::Error>::Ok(())
@@ -571,7 +576,7 @@ impl TitleBar {
                                     selectable: true,
                                     documentation_aside: None,
                                     handler: Rc::new(move |_, window, cx| {
-                                        toggle_screen_sharing(Some(screen.clone()), window, cx);
+                                        toggle_screen_sharing(Ok(Some(screen.clone())), window, cx);
                                     }),
                                 });
                             }
@@ -585,11 +590,11 @@ impl TitleBar {
 }
 
 /// Picks the screen to share when clicking on the main screen sharing button.
-fn pick_default_screen(cx: &App) -> Task<Option<Rc<dyn ScreenCaptureSource>>> {
+fn pick_default_screen(cx: &App) -> Task<anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>> {
     let source = cx.screen_capture_sources();
     cx.spawn(async move |_| {
-        let available_sources = maybe!(async move { source.await? }).await.ok()?;
-        available_sources
+        let available_sources = source.await??;
+        Ok(available_sources
             .iter()
             .find(|it| {
                 it.as_ref()
@@ -597,6 +602,6 @@ fn pick_default_screen(cx: &App) -> Task<Option<Rc<dyn ScreenCaptureSource>>> {
                     .is_ok_and(|meta| meta.is_main.unwrap_or_default())
             })
             .or_else(|| available_sources.iter().next())
-            .cloned()
+            .cloned())
     })
 }

From fa61c3e24d8893a8a62ba0e46dba48e9cc4ae8bd Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 18 Aug 2025 13:27:23 -0400
Subject: [PATCH 127/823] gpui: Fix typo in `handle_gpui_events` (#36431)

This PR fixes a typo I noticed in the `handle_gpui_events` method name.

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/platform.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index c1fb0cabc4..ee0babf7cb 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -227,7 +227,7 @@ impl WindowsPlatform {
                     | WM_GPUI_CLOSE_ONE_WINDOW
                     | WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD
                     | WM_GPUI_DOCK_MENU_ACTION => {
-                        if self.handle_gpui_evnets(msg.message, msg.wParam, msg.lParam, &msg) {
+                        if self.handle_gpui_events(msg.message, msg.wParam, msg.lParam, &msg) {
                             return;
                         }
                     }
@@ -240,7 +240,7 @@ impl WindowsPlatform {
     }
 
     // Returns true if the app should quit.
-    fn handle_gpui_evnets(
+    fn handle_gpui_events(
         &self,
         message: u32,
         wparam: WPARAM,

From 3a3df5c0118e942893dd3f12aa0c2f734ffae0af Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Mon, 18 Aug 2025 15:48:02 -0400
Subject: [PATCH 128/823] gpui: Add support for custom prompt text in
 PathPromptOptions (#36410)

This will be used to improve the clarity of the git clone UI

### MacOS
<img width="1322" height="128" alt="image"
src="https://github.com/user-attachments/assets/3e511143-12c1-4440-89dd-841b21b2e98e"
/>

### Windows
<img width="338" height="80" alt="image"
src="https://github.com/user-attachments/assets/766d08d6-0c72-4175-ad24-59dc6188d5f1"
/>

### Linux

<img width="387" height="72" alt="Screenshot From 2025-08-18 15-32-06"
src="https://github.com/user-attachments/assets/3125a7c4-3975-462a-a547-d5d4fac48f22"
/>



Release Notes:

- N/A
---
 crates/extensions_ui/src/extensions_ui.rs    | 1 +
 crates/git_ui/src/git_panel.rs               | 1 +
 crates/gpui/src/platform.rs                  | 4 +++-
 crates/gpui/src/platform/linux/platform.rs   | 1 +
 crates/gpui/src/platform/mac/platform.rs     | 6 ++++++
 crates/gpui/src/platform/windows/platform.rs | 6 ++++++
 crates/gpui/src/shared_string.rs             | 5 +++++
 crates/workspace/src/workspace.rs            | 3 +++
 crates/zed/src/zed.rs                        | 2 ++
 9 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 4915933920..7c7f9e6836 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -116,6 +116,7 @@ pub fn init(cx: &mut App) {
                         files: false,
                         directories: true,
                         multiple: false,
+                        prompt: None,
                     },
                     DirectoryLister::Local(
                         workspace.project().clone(),
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index b346f4d216..754812cbdf 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2088,6 +2088,7 @@ impl GitPanel {
             files: false,
             directories: true,
             multiple: false,
+            prompt: Some("Select as Repository Destination".into()),
         });
 
         let workspace = self.workspace.clone();
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index bf6ce68703..ffd68d60e6 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1278,7 +1278,7 @@ pub enum WindowBackgroundAppearance {
 }
 
 /// The options that can be configured for a file dialog prompt
-#[derive(Copy, Clone, Debug)]
+#[derive(Clone, Debug)]
 pub struct PathPromptOptions {
     /// Should the prompt allow files to be selected?
     pub files: bool,
@@ -1286,6 +1286,8 @@ pub struct PathPromptOptions {
     pub directories: bool,
     /// Should the prompt allow multiple files to be selected?
     pub multiple: bool,
+    /// The prompt to show to a user when selecting a path
+    pub prompt: Option<SharedString>,
 }
 
 /// What kind of prompt styling to show
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 31d445be52..86e5a79e8a 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -294,6 +294,7 @@ impl<P: LinuxClient + 'static> Platform for P {
                 let request = match ashpd::desktop::file_chooser::OpenFileRequest::default()
                     .modal(true)
                     .title(title)
+                    .accept_label(options.prompt.as_ref().map(crate::SharedString::as_str))
                     .multiple(options.multiple)
                     .directory(options.directories)
                     .send()
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 533423229c..79177fb2c9 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -705,6 +705,7 @@ impl Platform for MacPlatform {
                     panel.setCanChooseDirectories_(options.directories.to_objc());
                     panel.setCanChooseFiles_(options.files.to_objc());
                     panel.setAllowsMultipleSelection_(options.multiple.to_objc());
+
                     panel.setCanCreateDirectories(true.to_objc());
                     panel.setResolvesAliases_(false.to_objc());
                     let done_tx = Cell::new(Some(done_tx));
@@ -730,6 +731,11 @@ impl Platform for MacPlatform {
                         }
                     });
                     let block = block.copy();
+
+                    if let Some(prompt) = options.prompt {
+                        let _: () = msg_send![panel, setPrompt: ns_string(&prompt)];
+                    }
+
                     let _: () = msg_send![panel, beginWithCompletionHandler: block];
                 }
             })
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index ee0babf7cb..856187fa57 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -787,6 +787,12 @@ fn file_open_dialog(
 
     unsafe {
         folder_dialog.SetOptions(dialog_options)?;
+
+        if let Some(prompt) = options.prompt {
+            let prompt: &str = &prompt;
+            folder_dialog.SetOkButtonLabel(&HSTRING::from(prompt))?;
+        }
+
         if folder_dialog.Show(window).is_err() {
             // User cancelled
             return Ok(None);
diff --git a/crates/gpui/src/shared_string.rs b/crates/gpui/src/shared_string.rs
index c325f98cd2..a34b7502f0 100644
--- a/crates/gpui/src/shared_string.rs
+++ b/crates/gpui/src/shared_string.rs
@@ -23,6 +23,11 @@ impl SharedString {
     pub fn new(str: impl Into<Arc<str>>) -> Self {
         SharedString(ArcCow::Owned(str.into()))
     }
+
+    /// Get a &str from the underlying string.
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
 }
 
 impl JsonSchema for SharedString {
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 1eaa125ba5..02eac1665b 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -561,6 +561,7 @@ pub fn init(app_state: Arc<AppState>, cx: &mut App) {
                         files: true,
                         directories: true,
                         multiple: true,
+                        prompt: None,
                     },
                     cx,
                 );
@@ -578,6 +579,7 @@ pub fn init(app_state: Arc<AppState>, cx: &mut App) {
                         files: true,
                         directories,
                         multiple: true,
+                        prompt: None,
                     },
                     cx,
                 );
@@ -2655,6 +2657,7 @@ impl Workspace {
                 files: false,
                 directories: true,
                 multiple: true,
+                prompt: None,
             },
             DirectoryLister::Project(self.project.clone()),
             window,
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index cfafbb70f0..6d5aecba70 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -645,6 +645,7 @@ fn register_actions(
                     files: true,
                     directories: true,
                     multiple: true,
+                    prompt: None,
                 },
                 DirectoryLister::Local(
                     workspace.project().clone(),
@@ -685,6 +686,7 @@ fn register_actions(
                     files: true,
                     directories: true,
                     multiple: true,
+                    prompt: None,
                 },
                 DirectoryLister::Project(workspace.project().clone()),
                 window,

From 50819a9d208917344d913800e818fe37e71974a8 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 18 Aug 2025 15:57:28 -0400
Subject: [PATCH 129/823] client: Parse auth callback query parameters before
 showing sign-in success page (#36440)

This PR fixes an issue where we would redirect the user's browser to the
sign-in success page even if the OAuth callback was malformed.

We now parse the OAuth callback parameters from the query string and
only redirect to the sign-in success page when they are valid.

Release Notes:

- Updated the sign-in flow to not show the sign-in success page
prematurely.
---
 Cargo.lock                  |  1 +
 Cargo.toml                  |  1 +
 crates/client/Cargo.toml    |  1 +
 crates/client/src/client.rs | 24 +++++++++++++-----------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 98f10eff41..3158a61ad8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3070,6 +3070,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
+ "serde_urlencoded",
  "settings",
  "sha2",
  "smol",
diff --git a/Cargo.toml b/Cargo.toml
index 83d6da5cd7..914f9e6837 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -582,6 +582,7 @@ serde_json_lenient = { version = "0.2", features = [
     "raw_value",
 ] }
 serde_repr = "0.1"
+serde_urlencoded = "0.7"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 365625b445..5c6d1157fd 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -44,6 +44,7 @@ rpc = { workspace = true, features = ["gpui"] }
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+serde_urlencoded.workspace = true
 settings.workspace = true
 sha2.workspace = true
 smol.workspace = true
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index f09c012a85..0f00471356 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1410,6 +1410,12 @@ impl Client {
 
                     open_url_tx.send(url).log_err();
 
+                    #[derive(Deserialize)]
+                    struct CallbackParams {
+                        pub user_id: String,
+                        pub access_token: String,
+                    }
+
                     // Receive the HTTP request from the user's browser. Retrieve the user id and encrypted
                     // access token from the query params.
                     //
@@ -1420,17 +1426,13 @@ impl Client {
                             for _ in 0..100 {
                                 if let Some(req) = server.recv_timeout(Duration::from_secs(1))? {
                                     let path = req.url();
-                                    let mut user_id = None;
-                                    let mut access_token = None;
                                     let url = Url::parse(&format!("http://example.com{}", path))
                                         .context("failed to parse login notification url")?;
-                                    for (key, value) in url.query_pairs() {
-                                        if key == "access_token" {
-                                            access_token = Some(value.to_string());
-                                        } else if key == "user_id" {
-                                            user_id = Some(value.to_string());
-                                        }
-                                    }
+                                    let callback_params: CallbackParams =
+                                        serde_urlencoded::from_str(url.query().unwrap_or_default())
+                                            .context(
+                                                "failed to parse sign-in callback query parameters",
+                                            )?;
 
                                     let post_auth_url =
                                         http.build_url("/native_app_signin_succeeded");
@@ -1445,8 +1447,8 @@ impl Client {
                                     )
                                     .context("failed to respond to login http request")?;
                                     return Ok((
-                                        user_id.context("missing user_id parameter")?,
-                                        access_token.context("missing access_token parameter")?,
+                                        callback_params.user_id,
+                                        callback_params.access_token,
                                     ));
                                 }
                             }

From 8b89ea1a801af6190b1b6e6557a69fadb08db93f Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 18 Aug 2025 17:40:59 -0300
Subject: [PATCH 130/823] Handle auth for claude (#36442)

We'll now use the anthropic provider to get credentials for `claude` and
embed its configuration view in the panel when they are not present.

Release Notes:

- N/A
---
 Cargo.lock                                    |   3 +
 crates/acp_thread/Cargo.toml                  |   1 +
 crates/acp_thread/src/connection.rs           |  27 ++-
 crates/agent_servers/Cargo.toml               |   2 +
 crates/agent_servers/src/acp/v0.rs            |   2 +-
 crates/agent_servers/src/acp/v1.rs            |   8 +-
 crates/agent_servers/src/claude.rs            |  54 ++++--
 crates/agent_ui/src/acp/thread_view.rs        | 182 +++++++++++++-----
 crates/agent_ui/src/agent_configuration.rs    |   6 +-
 crates/agent_ui/src/agent_ui.rs               |   2 +-
 .../agent_ui/src/language_model_selector.rs   |   2 +-
 .../src/agent_api_keys_onboarding.rs          |   2 +-
 .../src/agent_panel_onboarding_content.rs     |   2 +-
 crates/gpui/src/subscription.rs               |   6 +
 crates/language_model/src/fake_provider.rs    |  15 +-
 crates/language_model/src/language_model.rs   |  14 +-
 crates/language_model/src/registry.rs         |   9 +-
 .../language_models/src/provider/anthropic.rs |  90 ++++++---
 .../language_models/src/provider/bedrock.rs   |   7 +-
 crates/language_models/src/provider/cloud.rs  |   7 +-
 .../src/provider/copilot_chat.rs              |   7 +-
 .../language_models/src/provider/deepseek.rs  |   7 +-
 crates/language_models/src/provider/google.rs |   7 +-
 .../language_models/src/provider/lmstudio.rs  |   7 +-
 .../language_models/src/provider/mistral.rs   |   7 +-
 crates/language_models/src/provider/ollama.rs |   7 +-
 .../language_models/src/provider/open_ai.rs   |   7 +-
 .../src/provider/open_ai_compatible.rs        |   7 +-
 .../src/provider/open_router.rs               |   7 +-
 crates/language_models/src/provider/vercel.rs |   7 +-
 crates/language_models/src/provider/x_ai.rs   |   7 +-
 crates/onboarding/src/ai_setup_page.rs        |   6 +-
 32 files changed, 400 insertions(+), 124 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3158a61ad8..3bc2b63843 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,6 +20,7 @@ dependencies = [
  "indoc",
  "itertools 0.14.0",
  "language",
+ "language_model",
  "markdown",
  "parking_lot",
  "project",
@@ -267,6 +268,8 @@ dependencies = [
  "indoc",
  "itertools 0.14.0",
  "language",
+ "language_model",
+ "language_models",
  "libc",
  "log",
  "nix 0.29.0",
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 2b9a6513c8..173f4c4208 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -28,6 +28,7 @@ futures.workspace = true
 gpui.workspace = true
 itertools.workspace = true
 language.workspace = true
+language_model.workspace = true
 markdown.workspace = true
 parking_lot = { workspace = true, optional = true }
 project.workspace = true
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index a328499bbc..0d4116321d 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -3,6 +3,7 @@ use agent_client_protocol::{self as acp};
 use anyhow::Result;
 use collections::IndexMap;
 use gpui::{Entity, SharedString, Task};
+use language_model::LanguageModelProviderId;
 use project::Project;
 use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
 use ui::{App, IconName};
@@ -80,12 +81,34 @@ pub trait AgentSessionResume {
 }
 
 #[derive(Debug)]
-pub struct AuthRequired;
+pub struct AuthRequired {
+    pub description: Option<String>,
+    pub provider_id: Option<LanguageModelProviderId>,
+}
+
+impl AuthRequired {
+    pub fn new() -> Self {
+        Self {
+            description: None,
+            provider_id: None,
+        }
+    }
+
+    pub fn with_description(mut self, description: String) -> Self {
+        self.description = Some(description);
+        self
+    }
+
+    pub fn with_language_model_provider(mut self, provider_id: LanguageModelProviderId) -> Self {
+        self.provider_id = Some(provider_id);
+        self
+    }
+}
 
 impl Error for AuthRequired {}
 impl fmt::Display for AuthRequired {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "AuthRequired")
+        write!(f, "Authentication required")
     }
 }
 
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 81c97c8aa6..f894bb15bf 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -27,6 +27,8 @@ futures.workspace = true
 gpui.workspace = true
 indoc.workspace = true
 itertools.workspace = true
+language_model.workspace = true
+language_models.workspace = true
 log.workspace = true
 paths.workspace = true
 project.workspace = true
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index 74647f7313..551e9fa01a 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -437,7 +437,7 @@ impl AgentConnection for AcpConnection {
             let result = acp_old::InitializeParams::response_from_any(result)?;
 
             if !result.is_authenticated {
-                anyhow::bail!(AuthRequired)
+                anyhow::bail!(AuthRequired::new())
             }
 
             cx.update(|cx| {
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index b77b5ef36d..93a5ae757a 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -140,7 +140,13 @@ impl AgentConnection for AcpConnection {
                 .await
                 .map_err(|err| {
                     if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
-                        anyhow!(AuthRequired)
+                        let mut error = AuthRequired::new();
+
+                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
+                            error = error.with_description(err.message);
+                        }
+
+                        anyhow!(error)
                     } else {
                         anyhow!(err)
                     }
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index d15cc1dd89..d80d040aad 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -3,6 +3,7 @@ pub mod tools;
 
 use collections::HashMap;
 use context_server::listener::McpServerTool;
+use language_models::provider::anthropic::AnthropicLanguageModelProvider;
 use project::Project;
 use settings::SettingsStore;
 use smol::process::Child;
@@ -30,7 +31,7 @@ use util::{ResultExt, debug_panic};
 use crate::claude::mcp_server::{ClaudeZedMcpServer, McpConfig};
 use crate::claude::tools::ClaudeTool;
 use crate::{AgentServer, AgentServerCommand, AllAgentServersSettings};
-use acp_thread::{AcpThread, AgentConnection};
+use acp_thread::{AcpThread, AgentConnection, AuthRequired};
 
 #[derive(Clone)]
 pub struct ClaudeCode;
@@ -79,6 +80,36 @@ impl AgentConnection for ClaudeAgentConnection {
     ) -> Task<Result<Entity<AcpThread>>> {
         let cwd = cwd.to_owned();
         cx.spawn(async move |cx| {
+            let settings = cx.read_global(|settings: &SettingsStore, _| {
+                settings.get::<AllAgentServersSettings>(None).claude.clone()
+            })?;
+
+            let Some(command) = AgentServerCommand::resolve(
+                "claude",
+                &[],
+                Some(&util::paths::home_dir().join(".claude/local/claude")),
+                settings,
+                &project,
+                cx,
+            )
+            .await
+            else {
+                anyhow::bail!("Failed to find claude binary");
+            };
+
+            let api_key =
+                cx.update(AnthropicLanguageModelProvider::api_key)?
+                    .await
+                    .map_err(|err| {
+                        if err.is::<language_model::AuthenticateError>() {
+                            anyhow!(AuthRequired::new().with_language_model_provider(
+                                language_model::ANTHROPIC_PROVIDER_ID
+                            ))
+                        } else {
+                            anyhow!(err)
+                        }
+                    })?;
+
             let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
             let permission_mcp_server = ClaudeZedMcpServer::new(thread_rx.clone(), cx).await?;
 
@@ -98,23 +129,6 @@ impl AgentConnection for ClaudeAgentConnection {
                 .await?;
             mcp_config_file.flush().await?;
 
-            let settings = cx.read_global(|settings: &SettingsStore, _| {
-                settings.get::<AllAgentServersSettings>(None).claude.clone()
-            })?;
-
-            let Some(command) = AgentServerCommand::resolve(
-                "claude",
-                &[],
-                Some(&util::paths::home_dir().join(".claude/local/claude")),
-                settings,
-                &project,
-                cx,
-            )
-            .await
-            else {
-                anyhow::bail!("Failed to find claude binary");
-            };
-
             let (incoming_message_tx, mut incoming_message_rx) = mpsc::unbounded();
             let (outgoing_tx, outgoing_rx) = mpsc::unbounded();
 
@@ -126,6 +140,7 @@ impl AgentConnection for ClaudeAgentConnection {
                 &command,
                 ClaudeSessionMode::Start,
                 session_id.clone(),
+                api_key,
                 &mcp_config_path,
                 &cwd,
             )?;
@@ -320,6 +335,7 @@ fn spawn_claude(
     command: &AgentServerCommand,
     mode: ClaudeSessionMode,
     session_id: acp::SessionId,
+    api_key: language_models::provider::anthropic::ApiKey,
     mcp_config_path: &Path,
     root_dir: &Path,
 ) -> Result<Child> {
@@ -355,6 +371,8 @@ fn spawn_claude(
             ClaudeSessionMode::Resume => ["--resume".to_string(), session_id.to_string()],
         })
         .args(command.args.iter().map(|arg| arg.as_str()))
+        .envs(command.env.iter().flatten())
+        .env("ANTHROPIC_API_KEY", api_key.key)
         .current_dir(root_dir)
         .stdin(std::process::Stdio::piped())
         .stdout(std::process::Stdio::piped())
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2c02027c4d..e2e5820812 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1,6 +1,7 @@
 use acp_thread::{
     AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
-    LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus, UserMessageId,
+    AuthRequired, LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
+    UserMessageId,
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
@@ -18,13 +19,16 @@ use editor::{Editor, EditorMode, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, ClipboardItem, EdgesRefinement,
-    Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton,
-    PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle,
-    TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
-    linear_color_stop, linear_gradient, list, percentage, point, prelude::*, pulsating_between,
+    Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
+    EdgesRefinement, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState,
+    MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task,
+    TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
+    WindowHandle, div, linear_color_stop, linear_gradient, list, percentage, point, prelude::*,
+    pulsating_between,
 };
 use language::Buffer;
+
+use language_model::LanguageModelRegistry;
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use project::Project;
 use prompt_store::PromptId;
@@ -137,6 +141,9 @@ enum ThreadState {
     LoadError(LoadError),
     Unauthenticated {
         connection: Rc<dyn AgentConnection>,
+        description: Option<Entity<Markdown>>,
+        configuration_view: Option<AnyView>,
+        _subscription: Option<Subscription>,
     },
     ServerExited {
         status: ExitStatus,
@@ -267,19 +274,16 @@ impl AcpThreadView {
             };
 
             let result = match result.await {
-                Err(e) => {
-                    let mut cx = cx.clone();
-                    if e.is::<acp_thread::AuthRequired>() {
-                        this.update(&mut cx, |this, cx| {
-                            this.thread_state = ThreadState::Unauthenticated { connection };
-                            cx.notify();
+                Err(e) => match e.downcast::<acp_thread::AuthRequired>() {
+                    Ok(err) => {
+                        cx.update(|window, cx| {
+                            Self::handle_auth_required(this, err, agent, connection, window, cx)
                         })
-                        .ok();
+                        .log_err();
                         return;
-                    } else {
-                        Err(e)
                     }
-                }
+                    Err(err) => Err(err),
+                },
                 Ok(thread) => Ok(thread),
             };
 
@@ -345,6 +349,68 @@ impl AcpThreadView {
         ThreadState::Loading { _task: load_task }
     }
 
+    fn handle_auth_required(
+        this: WeakEntity<Self>,
+        err: AuthRequired,
+        agent: Rc<dyn AgentServer>,
+        connection: Rc<dyn AgentConnection>,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let agent_name = agent.name();
+        let (configuration_view, subscription) = if let Some(provider_id) = err.provider_id {
+            let registry = LanguageModelRegistry::global(cx);
+
+            let sub = window.subscribe(&registry, cx, {
+                let provider_id = provider_id.clone();
+                let this = this.clone();
+                move |_, ev, window, cx| {
+                    if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev {
+                        if &provider_id == updated_provider_id {
+                            this.update(cx, |this, cx| {
+                                this.thread_state = Self::initial_state(
+                                    agent.clone(),
+                                    this.workspace.clone(),
+                                    this.project.clone(),
+                                    window,
+                                    cx,
+                                );
+                                cx.notify();
+                            })
+                            .ok();
+                        }
+                    }
+                }
+            });
+
+            let view = registry.read(cx).provider(&provider_id).map(|provider| {
+                provider.configuration_view(
+                    language_model::ConfigurationViewTargetAgent::Other(agent_name),
+                    window,
+                    cx,
+                )
+            });
+
+            (view, Some(sub))
+        } else {
+            (None, None)
+        };
+
+        this.update(cx, |this, cx| {
+            this.thread_state = ThreadState::Unauthenticated {
+                connection,
+                configuration_view,
+                description: err
+                    .description
+                    .clone()
+                    .map(|desc| cx.new(|cx| Markdown::new(desc.into(), None, None, cx))),
+                _subscription: subscription,
+            };
+            cx.notify();
+        })
+        .ok();
+    }
+
     fn handle_load_error(&mut self, err: anyhow::Error, cx: &mut Context<Self>) {
         if let Some(load_err) = err.downcast_ref::<LoadError>() {
             self.thread_state = ThreadState::LoadError(load_err.clone());
@@ -369,7 +435,7 @@ impl AcpThreadView {
             ThreadState::Ready { thread, .. } => thread.read(cx).title(),
             ThreadState::Loading { .. } => "Loading…".into(),
             ThreadState::LoadError(_) => "Failed to load".into(),
-            ThreadState::Unauthenticated { .. } => "Not authenticated".into(),
+            ThreadState::Unauthenticated { .. } => "Authentication Required".into(),
             ThreadState::ServerExited { .. } => "Server exited unexpectedly".into(),
         }
     }
@@ -708,7 +774,7 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let ThreadState::Unauthenticated { ref connection } = self.thread_state else {
+        let ThreadState::Unauthenticated { ref connection, .. } = self.thread_state else {
             return;
         };
 
@@ -1841,19 +1907,53 @@ impl AcpThreadView {
             .into_any()
     }
 
-    fn render_pending_auth_state(&self) -> AnyElement {
+    fn render_auth_required_state(
+        &self,
+        connection: &Rc<dyn AgentConnection>,
+        description: Option<&Entity<Markdown>>,
+        configuration_view: Option<&AnyView>,
+        window: &mut Window,
+        cx: &Context<Self>,
+    ) -> Div {
         v_flex()
+            .p_2()
+            .gap_2()
+            .flex_1()
             .items_center()
             .justify_center()
-            .child(self.render_error_agent_logo())
             .child(
-                h_flex()
-                    .mt_4()
-                    .mb_1()
+                v_flex()
+                    .items_center()
                     .justify_center()
-                    .child(Headline::new("Not Authenticated").size(HeadlineSize::Medium)),
+                    .child(self.render_error_agent_logo())
+                    .child(
+                        h_flex().mt_4().mb_1().justify_center().child(
+                            Headline::new("Authentication Required").size(HeadlineSize::Medium),
+                        ),
+                    )
+                    .into_any(),
             )
-            .into_any()
+            .children(description.map(|desc| {
+                div().text_ui(cx).text_center().child(
+                    self.render_markdown(desc.clone(), default_markdown_style(false, window, cx)),
+                )
+            }))
+            .children(
+                configuration_view
+                    .cloned()
+                    .map(|view| div().px_4().w_full().max_w_128().child(view)),
+            )
+            .child(h_flex().mt_1p5().justify_center().children(
+                connection.auth_methods().into_iter().map(|method| {
+                    Button::new(SharedString::from(method.id.0.clone()), method.name.clone())
+                        .on_click({
+                            let method_id = method.id.clone();
+                            cx.listener(move |this, _, window, cx| {
+                                this.authenticate(method_id.clone(), window, cx)
+                            })
+                        })
+                }),
+            ))
     }
 
     fn render_server_exited(&self, status: ExitStatus, _cx: &Context<Self>) -> AnyElement {
@@ -3347,26 +3447,18 @@ impl Render for AcpThreadView {
             .on_action(cx.listener(Self::toggle_burn_mode))
             .bg(cx.theme().colors().panel_background)
             .child(match &self.thread_state {
-                ThreadState::Unauthenticated { connection } => v_flex()
-                    .p_2()
-                    .flex_1()
-                    .items_center()
-                    .justify_center()
-                    .child(self.render_pending_auth_state())
-                    .child(h_flex().mt_1p5().justify_center().children(
-                        connection.auth_methods().into_iter().map(|method| {
-                            Button::new(
-                                SharedString::from(method.id.0.clone()),
-                                method.name.clone(),
-                            )
-                            .on_click({
-                                let method_id = method.id.clone();
-                                cx.listener(move |this, _, window, cx| {
-                                    this.authenticate(method_id.clone(), window, cx)
-                                })
-                            })
-                        }),
-                    )),
+                ThreadState::Unauthenticated {
+                    connection,
+                    description,
+                    configuration_view,
+                    ..
+                } => self.render_auth_required_state(
+                    &connection,
+                    description.as_ref(),
+                    configuration_view.as_ref(),
+                    window,
+                    cx,
+                ),
                 ThreadState::Loading { .. } => v_flex().flex_1().child(self.render_empty_state(cx)),
                 ThreadState::LoadError(e) => v_flex()
                     .p_2()
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index b4ebb8206c..a0584f9e2e 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -137,7 +137,11 @@ impl AgentConfiguration {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let configuration_view = provider.configuration_view(window, cx);
+        let configuration_view = provider.configuration_view(
+            language_model::ConfigurationViewTargetAgent::ZedAgent,
+            window,
+            cx,
+        );
         self.configuration_views_by_provider
             .insert(provider.id(), configuration_view);
     }
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index ce1c2203bf..8525d7f9e5 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -320,7 +320,7 @@ fn init_language_model_settings(cx: &mut App) {
     cx.subscribe(
         &LanguageModelRegistry::global(cx),
         |_, event: &language_model::Event, cx| match event {
-            language_model::Event::ProviderStateChanged
+            language_model::Event::ProviderStateChanged(_)
             | language_model::Event::AddedProvider(_)
             | language_model::Event::RemovedProvider(_) => {
                 update_active_language_model_from_settings(cx);
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index bb8514a224..fa8ca490d8 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -104,7 +104,7 @@ impl LanguageModelPickerDelegate {
                 window,
                 |picker, _, event, window, cx| {
                     match event {
-                        language_model::Event::ProviderStateChanged
+                        language_model::Event::ProviderStateChanged(_)
                         | language_model::Event::AddedProvider(_)
                         | language_model::Event::RemovedProvider(_) => {
                             let query = picker.query(cx);
diff --git a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
index b55ad4c895..0a34a29068 100644
--- a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
+++ b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
@@ -11,7 +11,7 @@ impl ApiKeysWithProviders {
         cx.subscribe(
             &LanguageModelRegistry::global(cx),
             |this: &mut Self, _registry, event: &language_model::Event, cx| match event {
-                language_model::Event::ProviderStateChanged
+                language_model::Event::ProviderStateChanged(_)
                 | language_model::Event::AddedProvider(_)
                 | language_model::Event::RemovedProvider(_) => {
                     this.configured_providers = Self::compute_configured_providers(cx)
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
index f1629eeff8..23810b74f3 100644
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -25,7 +25,7 @@ impl AgentPanelOnboarding {
         cx.subscribe(
             &LanguageModelRegistry::global(cx),
             |this: &mut Self, _registry, event: &language_model::Event, cx| match event {
-                language_model::Event::ProviderStateChanged
+                language_model::Event::ProviderStateChanged(_)
                 | language_model::Event::AddedProvider(_)
                 | language_model::Event::RemovedProvider(_) => {
                     this.configured_providers = Self::compute_available_providers(cx)
diff --git a/crates/gpui/src/subscription.rs b/crates/gpui/src/subscription.rs
index a584f1a45f..bd869f8d32 100644
--- a/crates/gpui/src/subscription.rs
+++ b/crates/gpui/src/subscription.rs
@@ -201,3 +201,9 @@ impl Drop for Subscription {
         }
     }
 }
+
+impl std::fmt::Debug for Subscription {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Subscription").finish()
+    }
+}
diff --git a/crates/language_model/src/fake_provider.rs b/crates/language_model/src/fake_provider.rs
index a9c7d5c034..67fba44887 100644
--- a/crates/language_model/src/fake_provider.rs
+++ b/crates/language_model/src/fake_provider.rs
@@ -1,8 +1,8 @@
 use crate::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice,
+    AuthenticateError, ConfigurationViewTargetAgent, LanguageModel, LanguageModelCompletionError,
+    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
+    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
+    LanguageModelRequest, LanguageModelToolChoice,
 };
 use futures::{FutureExt, StreamExt, channel::mpsc, future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, App, AsyncApp, Entity, Task, Window};
@@ -62,7 +62,12 @@ impl LanguageModelProvider for FakeLanguageModelProvider {
         Task::ready(Ok(()))
     }
 
-    fn configuration_view(&self, _window: &mut Window, _: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: ConfigurationViewTargetAgent,
+        _window: &mut Window,
+        _: &mut App,
+    ) -> AnyView {
         unimplemented!()
     }
 
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index 1637d2de8a..70e42cb02d 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -634,7 +634,12 @@ pub trait LanguageModelProvider: 'static {
     }
     fn is_authenticated(&self, cx: &App) -> bool;
     fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>>;
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView;
+    fn configuration_view(
+        &self,
+        target_agent: ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView;
     fn must_accept_terms(&self, _cx: &App) -> bool {
         false
     }
@@ -648,6 +653,13 @@ pub trait LanguageModelProvider: 'static {
     fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
 }
 
+#[derive(Default, Clone, Copy)]
+pub enum ConfigurationViewTargetAgent {
+    #[default]
+    ZedAgent,
+    Other(&'static str),
+}
+
 #[derive(PartialEq, Eq)]
 pub enum LanguageModelProviderTosView {
     /// When there are some past interactions in the Agent Panel.
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index 7cf071808a..078b90a291 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -107,7 +107,7 @@ pub enum Event {
     InlineAssistantModelChanged,
     CommitMessageModelChanged,
     ThreadSummaryModelChanged,
-    ProviderStateChanged,
+    ProviderStateChanged(LanguageModelProviderId),
     AddedProvider(LanguageModelProviderId),
     RemovedProvider(LanguageModelProviderId),
 }
@@ -148,8 +148,11 @@ impl LanguageModelRegistry {
     ) {
         let id = provider.id();
 
-        let subscription = provider.subscribe(cx, |_, cx| {
-            cx.emit(Event::ProviderStateChanged);
+        let subscription = provider.subscribe(cx, {
+            let id = id.clone();
+            move |_, cx| {
+                cx.emit(Event::ProviderStateChanged(id.clone()));
+            }
         });
         if let Some(subscription) = subscription {
             subscription.detach();
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index ef21e85f71..810d4a5f44 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -15,11 +15,11 @@ use gpui::{
 };
 use http_client::HttpClient;
 use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
-    LanguageModelCompletionError, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent, MessageContent,
-    RateLimiter, Role,
+    AuthenticateError, ConfigurationViewTargetAgent, LanguageModel,
+    LanguageModelCacheConfiguration, LanguageModelCompletionError, LanguageModelId,
+    LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolResultContent, MessageContent, RateLimiter, Role,
 };
 use language_model::{LanguageModelCompletionEvent, LanguageModelToolUse, StopReason};
 use schemars::JsonSchema;
@@ -153,29 +153,14 @@ impl State {
             return Task::ready(Ok(()));
         }
 
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        let api_url = AllLanguageModelSettings::get_global(cx)
-            .anthropic
-            .api_url
-            .clone();
+        let key = AnthropicLanguageModelProvider::api_key(cx);
 
         cx.spawn(async move |this, cx| {
-            let (api_key, from_env) = if let Ok(api_key) = std::env::var(ANTHROPIC_API_KEY_VAR) {
-                (api_key, true)
-            } else {
-                let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
-                    .await?
-                    .ok_or(AuthenticateError::CredentialsNotFound)?;
-                (
-                    String::from_utf8(api_key).context("invalid {PROVIDER_NAME} API key")?,
-                    false,
-                )
-            };
+            let key = key.await?;
 
             this.update(cx, |this, cx| {
-                this.api_key = Some(api_key);
-                this.api_key_from_env = from_env;
+                this.api_key = Some(key.key);
+                this.api_key_from_env = key.from_env;
                 cx.notify();
             })?;
 
@@ -184,6 +169,11 @@ impl State {
     }
 }
 
+pub struct ApiKey {
+    pub key: String,
+    pub from_env: bool,
+}
+
 impl AnthropicLanguageModelProvider {
     pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
         let state = cx.new(|cx| State {
@@ -206,6 +196,33 @@ impl AnthropicLanguageModelProvider {
             request_limiter: RateLimiter::new(4),
         })
     }
+
+    pub fn api_key(cx: &mut App) -> Task<Result<ApiKey>> {
+        let credentials_provider = <dyn CredentialsProvider>::global(cx);
+        let api_url = AllLanguageModelSettings::get_global(cx)
+            .anthropic
+            .api_url
+            .clone();
+
+        if let Ok(key) = std::env::var(ANTHROPIC_API_KEY_VAR) {
+            Task::ready(Ok(ApiKey {
+                key,
+                from_env: true,
+            }))
+        } else {
+            cx.spawn(async move |cx| {
+                let (_, api_key) = credentials_provider
+                    .read_credentials(&api_url, &cx)
+                    .await?
+                    .ok_or(AuthenticateError::CredentialsNotFound)?;
+
+                Ok(ApiKey {
+                    key: String::from_utf8(api_key).context("invalid {PROVIDER_NAME} API key")?,
+                    from_env: false,
+                })
+            })
+        }
+    }
 }
 
 impl LanguageModelProviderState for AnthropicLanguageModelProvider {
@@ -299,8 +316,13 @@ impl LanguageModelProvider for AnthropicLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
+    fn configuration_view(
+        &self,
+        target_agent: ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
+        cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
             .into()
     }
 
@@ -902,12 +924,18 @@ struct ConfigurationView {
     api_key_editor: Entity<Editor>,
     state: gpui::Entity<State>,
     load_credentials_task: Option<Task<()>>,
+    target_agent: ConfigurationViewTargetAgent,
 }
 
 impl ConfigurationView {
     const PLACEHOLDER_TEXT: &'static str = "sk-ant-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
 
-    fn new(state: gpui::Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+    fn new(
+        state: gpui::Entity<State>,
+        target_agent: ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
         cx.observe(&state, |_, _, cx| {
             cx.notify();
         })
@@ -939,6 +967,7 @@ impl ConfigurationView {
             }),
             state,
             load_credentials_task,
+            target_agent,
         }
     }
 
@@ -1012,7 +1041,10 @@ impl Render for ConfigurationView {
             v_flex()
                 .size_full()
                 .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with Anthropic, you need to add an API key. Follow these steps:"))
+                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match self.target_agent {
+                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic",
+                    ConfigurationViewTargetAgent::Other(agent) => agent,
+                })))
                 .child(
                     List::new()
                         .child(
@@ -1023,7 +1055,7 @@ impl Render for ConfigurationView {
                             )
                         )
                         .child(
-                            InstructionListItem::text_only("Paste your API key below and hit enter to start using the assistant")
+                            InstructionListItem::text_only("Paste your API key below and hit enter to start using the agent")
                         )
                 )
                 .child(
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 6df96c5c56..4e6744d745 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -348,7 +348,12 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index c1337399f9..c3f4399832 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -391,7 +391,12 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
         Task::ready(Ok(()))
     }
 
-    fn configuration_view(&self, _: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        _: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|_| ConfigurationView::new(self.state.clone()))
             .into()
     }
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index 73f73a9a31..eb12c0056f 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -176,7 +176,12 @@ impl LanguageModelProvider for CopilotChatLanguageModelProvider {
         Task::ready(Err(err.into()))
     }
 
-    fn configuration_view(&self, _: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        _: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         let state = self.state.clone();
         cx.new(|cx| ConfigurationView::new(state, cx)).into()
     }
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
index a568ef4034..2b30d456ee 100644
--- a/crates/language_models/src/provider/deepseek.rs
+++ b/crates/language_models/src/provider/deepseek.rs
@@ -229,7 +229,12 @@ impl LanguageModelProvider for DeepSeekLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index b287e8181a..32f8838df7 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -277,7 +277,12 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
index 36a32ab941..7ac08f2c15 100644
--- a/crates/language_models/src/provider/lmstudio.rs
+++ b/crates/language_models/src/provider/lmstudio.rs
@@ -226,7 +226,12 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, _window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         let state = self.state.clone();
         cx.new(|cx| ConfigurationView::new(state, cx)).into()
     }
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index 4a0d740334..e1d55801eb 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -243,7 +243,12 @@ impl LanguageModelProvider for MistralLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 0c2b1107b1..93844542ea 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -255,7 +255,12 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         let state = self.state.clone();
         cx.new(|cx| ConfigurationView::new(state, window, cx))
             .into()
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index eaf8d885b3..04d89f2db1 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -233,7 +233,12 @@ impl LanguageModelProvider for OpenAiLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index e2d3adb198..c6b980c3ec 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -243,7 +243,12 @@ impl LanguageModelProvider for OpenAiCompatibleLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 3a492086f1..5d8bace6d3 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -306,7 +306,12 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/vercel.rs b/crates/language_models/src/provider/vercel.rs
index 9f447cb68b..98e4f60b6b 100644
--- a/crates/language_models/src/provider/vercel.rs
+++ b/crates/language_models/src/provider/vercel.rs
@@ -230,7 +230,12 @@ impl LanguageModelProvider for VercelLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index fed6fe92bf..2b8238cc5c 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -230,7 +230,12 @@ impl LanguageModelProvider for XAiLanguageModelProvider {
         self.state.update(cx, |state, cx| state.authenticate(cx))
     }
 
-    fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+    fn configuration_view(
+        &self,
+        _target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
         cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
             .into()
     }
diff --git a/crates/onboarding/src/ai_setup_page.rs b/crates/onboarding/src/ai_setup_page.rs
index bb1932bdf2..d700fa08bd 100644
--- a/crates/onboarding/src/ai_setup_page.rs
+++ b/crates/onboarding/src/ai_setup_page.rs
@@ -329,7 +329,11 @@ impl AiConfigurationModal {
         cx: &mut Context<Self>,
     ) -> Self {
         let focus_handle = cx.focus_handle();
-        let configuration_view = selected_provider.configuration_view(window, cx);
+        let configuration_view = selected_provider.configuration_view(
+            language_model::ConfigurationViewTargetAgent::ZedAgent,
+            window,
+            cx,
+        );
 
         Self {
             focus_handle,

From c5991e74bb6f305c299684dc7ac3f6ee9055efcd Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 19 Aug 2025 02:27:40 +0530
Subject: [PATCH 131/823] project: Handle `textDocument/didSave` and
 `textDocument/didChange` (un)registration and usage correctly (#36441)

Follow-up of https://github.com/zed-industries/zed/pull/35306

This PR contains two changes:

Both changes are inspired from:
https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/textSynchronization.ts

1. Handling `textDocument/didSave` and `textDocument/didChange`
registration and unregistration correctly:

```rs
#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
#[serde(untagged)]
pub enum TextDocumentSyncCapability {
    Kind(TextDocumentSyncKind),
    Options(TextDocumentSyncOptions),
}
```

- `textDocument/didSave` dynamic registration contains "includeText"
- `textDocument/didChange` dynamic registration contains "syncKind"

While storing this to Language Server, we use
`TextDocumentSyncCapability::Options` instead of
`TextDocumentSyncCapability::Kind` since it also include
[change](https://github.com/gluon-lang/lsp-types/blob/be7336e92a6ad23f214df19bcdceab17f39531a9/src/lib.rs#L1714-L1717)
field as `TextDocumentSyncCapability::Kind` as well as
[save](https://github.com/gluon-lang/lsp-types/blob/be7336e92a6ad23f214df19bcdceab17f39531a9/src/lib.rs#L1727-L1729)
field as `TextDocumentSyncSaveOptions`. This way while registering or
unregistering both of them, we don't accidentaly mess with other data.

So, if at intialization we end up getting
`TextDocumentSyncCapability::Kind` and we receive any above kind of
dynamic registration, we change `TextDocumentSyncCapability::Kind` to
`TextDocumentSyncCapability::Options` so we can store more data anyway.

2. Modify `include_text` method to only depend on
`TextDocumentSyncSaveOptions`, instead of depending on
`TextDocumentSyncKind`. Idea behind this is,
`TextDocumentSyncSaveOptions` should be responsible for
"textDocument/didSave" notification, and `TextDocumentSyncKind` should
be responsible for "textDocument/didChange", which it already is:
https://github.com/zed-industries/zed/blob/4b79eade1da2f5f7dfa18208cf882c8e6ca8a97f/crates/project/src/lsp_store.rs#L7324-L7331

Release Notes:

- N/A
---
 crates/project/src/lsp_store.rs | 72 +++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 802b304e94..11c78aad8d 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11820,8 +11820,28 @@ impl LspStore {
                         .transpose()?
                     {
                         server.update_capabilities(|capabilities| {
+                            let mut sync_options =
+                                Self::take_text_document_sync_options(capabilities);
+                            sync_options.change = Some(sync_kind);
                             capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Kind(sync_kind));
+                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                        });
+                        notify_server_capabilities_updated(&server, cx);
+                    }
+                }
+                "textDocument/didSave" => {
+                    if let Some(save_options) = reg
+                        .register_options
+                        .and_then(|opts| opts.get("includeText").cloned())
+                        .map(serde_json::from_value::<lsp::TextDocumentSyncSaveOptions>)
+                        .transpose()?
+                    {
+                        server.update_capabilities(|capabilities| {
+                            let mut sync_options =
+                                Self::take_text_document_sync_options(capabilities);
+                            sync_options.save = Some(save_options);
+                            capabilities.text_document_sync =
+                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
                         });
                         notify_server_capabilities_updated(&server, cx);
                     }
@@ -11973,7 +11993,19 @@ impl LspStore {
                 }
                 "textDocument/didChange" => {
                     server.update_capabilities(|capabilities| {
-                        capabilities.text_document_sync = None;
+                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
+                        sync_options.change = None;
+                        capabilities.text_document_sync =
+                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
+                "textDocument/didSave" => {
+                    server.update_capabilities(|capabilities| {
+                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
+                        sync_options.save = None;
+                        capabilities.text_document_sync =
+                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
                     });
                     notify_server_capabilities_updated(&server, cx);
                 }
@@ -12001,6 +12033,20 @@ impl LspStore {
 
         Ok(())
     }
+
+    fn take_text_document_sync_options(
+        capabilities: &mut lsp::ServerCapabilities,
+    ) -> lsp::TextDocumentSyncOptions {
+        match capabilities.text_document_sync.take() {
+            Some(lsp::TextDocumentSyncCapability::Options(sync_options)) => sync_options,
+            Some(lsp::TextDocumentSyncCapability::Kind(sync_kind)) => {
+                let mut sync_options = lsp::TextDocumentSyncOptions::default();
+                sync_options.change = Some(sync_kind);
+                sync_options
+            }
+            None => lsp::TextDocumentSyncOptions::default(),
+        }
+    }
 }
 
 // Registration with empty capabilities should be ignored.
@@ -13103,24 +13149,18 @@ async fn populate_labels_for_symbols(
 
 fn include_text(server: &lsp::LanguageServer) -> Option<bool> {
     match server.capabilities().text_document_sync.as_ref()? {
-        lsp::TextDocumentSyncCapability::Kind(kind) => match *kind {
-            lsp::TextDocumentSyncKind::NONE => None,
-            lsp::TextDocumentSyncKind::FULL => Some(true),
-            lsp::TextDocumentSyncKind::INCREMENTAL => Some(false),
-            _ => None,
-        },
-        lsp::TextDocumentSyncCapability::Options(options) => match options.save.as_ref()? {
-            lsp::TextDocumentSyncSaveOptions::Supported(supported) => {
-                if *supported {
-                    Some(true)
-                } else {
-                    None
-                }
-            }
+        lsp::TextDocumentSyncCapability::Options(opts) => match opts.save.as_ref()? {
+            // Server wants didSave but didn't specify includeText.
+            lsp::TextDocumentSyncSaveOptions::Supported(true) => Some(false),
+            // Server doesn't want didSave at all.
+            lsp::TextDocumentSyncSaveOptions::Supported(false) => None,
+            // Server provided SaveOptions.
             lsp::TextDocumentSyncSaveOptions::SaveOptions(save_options) => {
                 Some(save_options.include_text.unwrap_or(false))
             }
         },
+        // We do not have any save info. Kind affects didChange only.
+        lsp::TextDocumentSyncCapability::Kind(_) => None,
     }
 }
 

From 97f784dedf58a1f1337f6824918d73deb5abab97 Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Mon, 18 Aug 2025 23:30:02 +0200
Subject: [PATCH 132/823] Fix early dispatch crash on windows (#36445)

Closes #36384

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/events.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index 4ab257d27a..9b25ab360e 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -100,6 +100,7 @@ impl WindowsWindowInner {
             WM_SETCURSOR => self.handle_set_cursor(handle, lparam),
             WM_SETTINGCHANGE => self.handle_system_settings_changed(handle, wparam, lparam),
             WM_INPUTLANGCHANGE => self.handle_input_language_changed(lparam),
+            WM_SHOWWINDOW => self.handle_window_visibility_changed(handle, wparam),
             WM_GPUI_CURSOR_STYLE_CHANGED => self.handle_cursor_changed(lparam),
             WM_GPUI_FORCE_UPDATE_WINDOW => self.draw_window(handle, true),
             _ => None,
@@ -1160,6 +1161,13 @@ impl WindowsWindowInner {
         Some(0)
     }
 
+    fn handle_window_visibility_changed(&self, handle: HWND, wparam: WPARAM) -> Option<isize> {
+        if wparam.0 == 1 {
+            self.draw_window(handle, false);
+        }
+        None
+    }
+
     fn handle_device_change_msg(&self, handle: HWND, wparam: WPARAM) -> Option<isize> {
         if wparam.0 == DBT_DEVNODES_CHANGED as usize {
             // The reason for sending this message is to actually trigger a redraw of the window.

From eecf142f06a1f7d073242946b98e389dd94d0011 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Tue, 19 Aug 2025 00:49:22 +0300
Subject: [PATCH 133/823] Explicitly allow `clippy::new_without_default` style
 lint (#36434)

Discussed in #36432

Release Notes:

- N/A

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
---
 Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 914f9e6837..3edd8d802c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -832,6 +832,8 @@ new_ret_no_self = { level = "allow" }
 # compared to Iterator::next. Yet, clippy complains about those.
 should_implement_trait = { level = "allow" }
 let_underscore_future = "allow"
+# It doesn't make sense to implement `Default` unilaterally.
+new_without_default = "allow"
 
 # in Rust it can be very tedious to reduce argument count without
 # running afoul of the borrow checker.

From 9e0e233319d06956bb28fb0609bb843e89d1a812 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 18 Aug 2025 23:54:35 +0200
Subject: [PATCH 134/823] Fix clippy::needless_borrow lint violations (#36444)

Release Notes:

- N/A
---
 Cargo.toml                                    |  1 +
 crates/acp_thread/src/acp_thread.rs           |  8 +-
 crates/acp_thread/src/diff.rs                 | 10 +--
 crates/acp_thread/src/mention.rs              |  2 +-
 crates/action_log/src/action_log.rs           |  8 +-
 .../src/activity_indicator.rs                 |  6 +-
 crates/agent/src/thread.rs                    | 16 ++--
 crates/agent2/src/agent.rs                    |  2 +-
 crates/agent2/src/templates.rs                |  2 +-
 crates/agent2/src/thread.rs                   | 10 +--
 .../src/tools/context_server_registry.rs      |  2 +-
 crates/agent2/src/tools/edit_file_tool.rs     |  2 +-
 crates/agent2/src/tools/terminal_tool.rs      |  2 +-
 crates/agent_servers/src/acp.rs               |  4 +-
 crates/agent_servers/src/claude.rs            |  2 +-
 .../agent_ui/src/acp/completion_provider.rs   |  4 +-
 crates/agent_ui/src/acp/message_editor.rs     |  2 +-
 crates/agent_ui/src/acp/model_selector.rs     |  2 +-
 crates/agent_ui/src/acp/thread_view.rs        | 16 ++--
 crates/agent_ui/src/active_thread.rs          |  6 +-
 crates/agent_ui/src/agent_diff.rs             | 20 ++---
 crates/agent_ui/src/agent_panel.rs            |  6 +-
 crates/agent_ui/src/buffer_codegen.rs         |  6 +-
 .../src/context_picker/completion_provider.rs |  4 +-
 .../src/context_picker/file_context_picker.rs |  4 +-
 .../context_picker/symbol_context_picker.rs   |  2 +-
 .../context_picker/thread_context_picker.rs   |  6 +-
 crates/agent_ui/src/context_strip.rs          |  4 +-
 crates/agent_ui/src/inline_assistant.rs       |  8 +-
 crates/agent_ui/src/inline_prompt_editor.rs   |  2 +-
 .../agent_ui/src/language_model_selector.rs   |  2 +-
 crates/agent_ui/src/message_editor.rs         | 11 ++-
 crates/agent_ui/src/slash_command_picker.rs   |  2 +-
 crates/agent_ui/src/terminal_codegen.rs       |  2 +-
 crates/agent_ui/src/ui/context_pill.rs        |  6 +-
 .../src/assistant_context.rs                  | 16 ++--
 .../src/assistant_context_tests.rs            |  2 +-
 .../src/context_server_command.rs             |  2 +-
 .../src/diagnostics_command.rs                |  6 +-
 crates/assistant_tools/src/edit_file_tool.rs  |  8 +-
 crates/assistant_tools/src/grep_tool.rs       | 22 ++---
 .../src/project_notifications_tool.rs         |  2 +-
 crates/assistant_tools/src/terminal_tool.rs   |  2 +-
 crates/breadcrumbs/src/breadcrumbs.rs         |  2 +-
 crates/buffer_diff/src/buffer_diff.rs         | 26 +++---
 crates/cli/src/main.rs                        |  4 +-
 crates/client/src/client.rs                   | 16 ++--
 crates/collab/src/db/queries/projects.rs      |  6 +-
 crates/collab/src/db/queries/rooms.rs         |  6 +-
 .../src/chat_panel/message_editor.rs          |  4 +-
 crates/collab_ui/src/collab_panel.rs          |  2 +-
 crates/collab_ui/src/notification_panel.rs    |  2 +-
 crates/context_server/src/listener.rs         |  4 +-
 crates/context_server/src/types.rs            |  2 +-
 crates/copilot/src/copilot_chat.rs            |  4 +-
 crates/dap/src/adapters.rs                    |  2 +-
 crates/dap_adapters/src/go.rs                 |  2 +-
 crates/dap_adapters/src/javascript.rs         |  2 +-
 crates/dap_adapters/src/python.rs             |  6 +-
 crates/db/src/db.rs                           | 10 +--
 crates/debugger_tools/src/dap_log.rs          |  8 +-
 crates/debugger_ui/src/debugger_panel.rs      | 18 ++--
 crates/debugger_ui/src/new_process_modal.rs   | 13 +--
 crates/debugger_ui/src/persistence.rs         |  2 +-
 crates/debugger_ui/src/session/running.rs     | 12 +--
 .../src/session/running/breakpoint_list.rs    |  4 +-
 .../src/session/running/console.rs            |  4 +-
 .../src/session/running/memory_view.rs        |  4 +-
 .../src/session/running/variable_list.rs      |  4 +-
 crates/debugger_ui/src/tests/attach_modal.rs  |  4 +-
 .../src/tests/new_process_modal.rs            |  2 +-
 crates/diagnostics/src/diagnostic_renderer.rs |  4 +-
 crates/diagnostics/src/diagnostics.rs         |  4 +-
 crates/docs_preprocessor/src/main.rs          |  6 +-
 crates/editor/src/clangd_ext.rs               |  2 +-
 crates/editor/src/code_completion_tests.rs    |  4 +-
 crates/editor/src/code_context_menus.rs       |  2 +-
 .../src/display_map/custom_highlights.rs      |  8 +-
 crates/editor/src/display_map/invisibles.rs   |  6 +-
 crates/editor/src/display_map/wrap_map.rs     |  2 +-
 crates/editor/src/editor.rs                   | 67 +++++++--------
 crates/editor/src/editor_tests.rs             | 42 ++++-----
 crates/editor/src/element.rs                  | 22 ++---
 crates/editor/src/hover_links.rs              |  2 +-
 crates/editor/src/items.rs                    | 12 +--
 crates/editor/src/jsx_tag_auto_close.rs       |  2 +-
 crates/editor/src/lsp_colors.rs               |  2 +-
 crates/editor/src/lsp_ext.rs                  |  2 +-
 crates/editor/src/mouse_context_menu.rs       |  4 +-
 crates/editor/src/movement.rs                 | 12 +--
 crates/editor/src/proposed_changes_editor.rs  |  6 +-
 crates/editor/src/rust_analyzer_ext.rs        | 12 +--
 crates/editor/src/signature_help.rs           |  2 +-
 crates/editor/src/test.rs                     |  2 +-
 crates/eval/src/eval.rs                       |  2 +-
 crates/eval/src/example.rs                    |  4 +-
 crates/eval/src/instance.rs                   | 14 +--
 crates/extension/src/extension_builder.rs     |  2 +-
 crates/extension_host/src/extension_host.rs   |  4 +-
 crates/extension_host/src/headless_host.rs    |  2 +-
 crates/file_finder/src/file_finder.rs         | 10 +--
 crates/file_finder/src/file_finder_tests.rs   |  4 +-
 crates/file_finder/src/open_path_prompt.rs    |  2 +-
 crates/fs/src/fs.rs                           |  6 +-
 crates/git/src/repository.rs                  |  8 +-
 crates/git/src/status.rs                      |  2 +-
 .../src/git_hosting_providers.rs              |  2 +-
 .../src/providers/chromium.rs                 |  2 +-
 .../src/providers/github.rs                   |  4 +-
 crates/git_ui/src/commit_view.rs              |  6 +-
 crates/git_ui/src/conflict_view.rs            | 10 +--
 crates/git_ui/src/file_diff_view.rs           |  8 +-
 crates/git_ui/src/git_panel.rs                | 16 ++--
 crates/git_ui/src/picker_prompt.rs            |  2 +-
 crates/git_ui/src/project_diff.rs             |  6 +-
 crates/git_ui/src/text_diff_view.rs           |  4 +-
 crates/gpui/build.rs                          |  4 +-
 crates/gpui/examples/input.rs                 |  4 +-
 crates/gpui/src/app.rs                        |  4 +-
 crates/gpui/src/app/entity_map.rs             |  2 +-
 crates/gpui/src/elements/div.rs               |  2 +-
 crates/gpui/src/inspector.rs                  |  2 +-
 crates/gpui/src/key_dispatch.rs               |  4 +-
 crates/gpui/src/keymap.rs                     |  2 +-
 crates/gpui/src/path_builder.rs               |  2 +-
 crates/gpui/src/platform.rs                   |  2 +-
 crates/gpui/src/platform/linux/platform.rs    |  2 +-
 .../gpui/src/platform/linux/wayland/client.rs | 15 ++--
 .../gpui/src/platform/linux/wayland/cursor.rs |  2 +-
 crates/gpui/src/platform/linux/x11/client.rs  |  6 +-
 crates/gpui/src/platform/linux/x11/event.rs   |  4 +-
 crates/gpui/src/platform/linux/x11/window.rs  |  6 +-
 .../gpui/src/platform/mac/metal_renderer.rs   | 16 ++--
 crates/gpui/src/platform/mac/platform.rs      | 10 +--
 crates/gpui/src/platform/mac/window.rs        |  8 +-
 .../gpui/src/platform/windows/direct_write.rs |  4 +-
 .../src/platform/windows/directx_renderer.rs  |  4 +-
 crates/gpui/src/tab_stop.rs                   |  2 +-
 crates/gpui_macros/src/test.rs                |  2 +-
 crates/install_cli/src/install_cli.rs         |  2 +-
 crates/jj/src/jj_store.rs                     |  2 +-
 crates/language/src/buffer.rs                 |  8 +-
 crates/language/src/language.rs               |  2 +-
 crates/language/src/language_registry.rs      |  2 +-
 crates/language/src/language_settings.rs      |  4 +-
 crates/language/src/syntax_map.rs             |  2 +-
 crates/language/src/text_diff.rs              |  8 +-
 .../src/language_extension.rs                 |  2 +-
 crates/language_model/src/request.rs          |  6 +-
 .../language_models/src/provider/anthropic.rs |  6 +-
 .../language_models/src/provider/bedrock.rs   |  8 +-
 crates/language_models/src/provider/cloud.rs  |  2 +-
 .../language_models/src/provider/deepseek.rs  |  6 +-
 crates/language_models/src/provider/google.rs |  6 +-
 .../language_models/src/provider/mistral.rs   |  6 +-
 .../language_models/src/provider/open_ai.rs   |  6 +-
 .../src/provider/open_ai_compatible.rs        |  6 +-
 .../src/provider/open_router.rs               |  6 +-
 crates/language_models/src/provider/vercel.rs |  6 +-
 crates/language_models/src/provider/x_ai.rs   |  6 +-
 crates/language_tools/src/lsp_log.rs          |  2 +-
 crates/languages/src/css.rs                   |  2 +-
 crates/languages/src/github_download.rs       |  6 +-
 crates/languages/src/json.rs                  |  2 +-
 crates/languages/src/python.rs                |  2 +-
 crates/languages/src/rust.rs                  |  6 +-
 crates/languages/src/tailwind.rs              |  2 +-
 crates/languages/src/typescript.rs            |  2 +-
 crates/languages/src/yaml.rs                  |  2 +-
 crates/livekit_client/src/test.rs             |  4 +-
 crates/markdown/src/markdown.rs               |  2 +-
 crates/markdown/src/parser.rs                 |  2 +-
 .../markdown_preview/src/markdown_renderer.rs |  4 +-
 crates/migrator/src/migrator.rs               |  8 +-
 crates/multi_buffer/src/anchor.rs             |  4 +-
 crates/multi_buffer/src/multi_buffer.rs       | 38 ++++----
 crates/multi_buffer/src/multi_buffer_tests.rs | 19 ++--
 crates/multi_buffer/src/position.rs           |  6 +-
 crates/onboarding/src/onboarding.rs           |  2 +-
 crates/onboarding/src/welcome.rs              |  2 +-
 crates/outline_panel/src/outline_panel.rs     | 86 +++++++++----------
 crates/project/src/context_server_store.rs    |  6 +-
 .../project/src/debugger/breakpoint_store.rs  |  6 +-
 crates/project/src/debugger/dap_store.rs      |  4 +-
 crates/project/src/debugger/locators/cargo.rs |  4 +-
 crates/project/src/debugger/session.rs        |  4 +-
 crates/project/src/environment.rs             |  2 +-
 crates/project/src/git_store.rs               | 20 ++---
 crates/project/src/git_store/git_traversal.rs |  2 +-
 crates/project/src/image_store.rs             |  2 +-
 crates/project/src/lsp_command.rs             |  2 +-
 crates/project/src/lsp_store.rs               | 26 +++---
 crates/project/src/manifest_tree.rs           |  2 +-
 .../project/src/manifest_tree/server_tree.rs  |  8 +-
 crates/project/src/project.rs                 | 17 ++--
 crates/project/src/project_settings.rs        |  4 +-
 crates/project/src/task_inventory.rs          |  2 +-
 crates/project_panel/src/project_panel.rs     | 10 +--
 crates/project_symbols/src/project_symbols.rs |  2 +-
 crates/recent_projects/src/remote_servers.rs  |  2 +-
 crates/remote/src/ssh_session.rs              | 30 +++----
 crates/remote_server/src/headless_project.rs  |  4 +-
 crates/remote_server/src/unix.rs              |  9 +-
 crates/repl/src/notebook/notebook_ui.rs       |  2 +-
 crates/rope/src/chunk.rs                      |  4 +-
 crates/search/src/search.rs                   |  2 +-
 crates/search/src/search_bar.rs               |  2 +-
 crates/semantic_index/src/summary_index.rs    |  4 +-
 crates/settings/src/keymap_file.rs            |  6 +-
 crates/settings_ui/src/keybindings.rs         | 25 +++---
 crates/settings_ui/src/ui_components/table.rs |  2 +-
 crates/streaming_diff/src/streaming_diff.rs   | 30 +++----
 crates/task/src/vscode_debug_format.rs        |  2 +-
 crates/terminal/src/terminal.rs               |  6 +-
 crates/terminal_view/src/terminal_panel.rs    |  6 +-
 crates/terminal_view/src/terminal_view.rs     |  6 +-
 crates/title_bar/src/title_bar.rs             |  4 +-
 crates/ui/src/components/indent_guides.rs     |  4 +-
 crates/ui/src/components/keybinding.rs        |  4 +-
 crates/vim/src/command.rs                     |  2 +-
 crates/vim/src/motion.rs                      | 10 +--
 crates/vim/src/normal/increment.rs            |  4 +-
 crates/vim/src/normal/scroll.rs               |  4 +-
 crates/vim/src/state.rs                       |  8 +-
 crates/vim/src/test/neovim_connection.rs      |  4 +-
 crates/vim/src/vim.rs                         |  6 +-
 crates/vim/src/visual.rs                      |  2 +-
 crates/workspace/src/notifications.rs         |  2 +-
 crates/workspace/src/pane.rs                  |  5 +-
 crates/workspace/src/workspace.rs             | 22 ++---
 crates/worktree/src/worktree.rs               | 12 +--
 crates/zed/src/main.rs                        | 32 +++----
 crates/zed/src/reliability.rs                 |  4 +-
 crates/zed/src/zed.rs                         |  4 +-
 crates/zed/src/zed/component_preview.rs       |  2 +-
 .../zed/src/zed/edit_prediction_registry.rs   |  4 +-
 crates/zed/src/zed/open_listener.rs           |  4 +-
 crates/zed/src/zed/quick_action_bar.rs        |  2 +-
 crates/zeta/src/license_detection.rs          |  2 +-
 crates/zeta/src/zeta.rs                       | 14 +--
 crates/zeta_cli/src/main.rs                   |  6 +-
 crates/zlog/src/filter.rs                     |  2 +-
 242 files changed, 801 insertions(+), 821 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3edd8d802c..3854ebe010 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -824,6 +824,7 @@ module_inception = { level = "deny" }
 question_mark = { level = "deny" }
 redundant_closure = { level = "deny" }
 declare_interior_mutable_const = { level = "deny" }
+needless_borrow = { level = "warn"}
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
 # We often return trait objects from `new` functions.
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index e104c40bf2..8bc0635475 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -485,7 +485,7 @@ impl ContentBlock {
     }
 
     fn resource_link_md(uri: &str) -> String {
-        if let Some(uri) = MentionUri::parse(&uri).log_err() {
+        if let Some(uri) = MentionUri::parse(uri).log_err() {
             uri.as_link().to_string()
         } else {
             uri.to_string()
@@ -1416,7 +1416,7 @@ impl AcpThread {
     fn user_message(&self, id: &UserMessageId) -> Option<&UserMessage> {
         self.entries.iter().find_map(|entry| {
             if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(&id) {
+                if message.id.as_ref() == Some(id) {
                     Some(message)
                 } else {
                     None
@@ -1430,7 +1430,7 @@ impl AcpThread {
     fn user_message_mut(&mut self, id: &UserMessageId) -> Option<(usize, &mut UserMessage)> {
         self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
             if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(&id) {
+                if message.id.as_ref() == Some(id) {
                     Some((ix, message))
                 } else {
                     None
@@ -2356,7 +2356,7 @@ mod tests {
 
         fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
             let sessions = self.sessions.lock();
-            let thread = sessions.get(&session_id).unwrap().clone();
+            let thread = sessions.get(session_id).unwrap().clone();
 
             cx.spawn(async move |cx| {
                 thread
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index a2c2d6c322..e5f71d2109 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -71,8 +71,8 @@ impl Diff {
                         let hunk_ranges = {
                             let buffer = new_buffer.read(cx);
                             let diff = buffer_diff.read(cx);
-                            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, cx)
-                                .map(|diff_hunk| diff_hunk.buffer_range.to_point(&buffer))
+                            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
+                                .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
                                 .collect::<Vec<_>>()
                         };
 
@@ -306,13 +306,13 @@ impl PendingDiff {
         let buffer = self.buffer.read(cx);
         let diff = self.diff.read(cx);
         let mut ranges = diff
-            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, cx)
-            .map(|diff_hunk| diff_hunk.buffer_range.to_point(&buffer))
+            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
+            .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
             .collect::<Vec<_>>();
         ranges.extend(
             self.revealed_ranges
                 .iter()
-                .map(|range| range.to_point(&buffer)),
+                .map(|range| range.to_point(buffer)),
         );
         ranges.sort_unstable_by_key(|range| (range.start, Reverse(range.end)));
 
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index b9b021c4ca..17bc265fac 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -146,7 +146,7 @@ impl MentionUri {
                     FileIcons::get_folder_icon(false, cx)
                         .unwrap_or_else(|| IconName::Folder.path().into())
                 } else {
-                    FileIcons::get_icon(&abs_path, cx)
+                    FileIcons::get_icon(abs_path, cx)
                         .unwrap_or_else(|| IconName::File.path().into())
                 }
             }
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index c4eaffc228..20ba9586ea 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -290,7 +290,7 @@ impl ActionLog {
                 }
                 _ = git_diff_updates_rx.changed().fuse() => {
                     if let Some(git_diff) = git_diff.as_ref() {
-                        Self::keep_committed_edits(&this, &buffer, &git_diff, cx).await?;
+                        Self::keep_committed_edits(&this, &buffer, git_diff, cx).await?;
                     }
                 }
             }
@@ -498,7 +498,7 @@ impl ActionLog {
                                     new: new_range,
                                 },
                                 &new_diff_base,
-                                &buffer_snapshot.as_rope(),
+                                buffer_snapshot.as_rope(),
                             ));
                         }
                         unreviewed_edits
@@ -964,7 +964,7 @@ impl TrackedBuffer {
     fn has_edits(&self, cx: &App) -> bool {
         self.diff
             .read(cx)
-            .hunks(&self.buffer.read(cx), cx)
+            .hunks(self.buffer.read(cx), cx)
             .next()
             .is_some()
     }
@@ -2268,7 +2268,7 @@ mod tests {
             log::info!("quiescing...");
             cx.run_until_parked();
             action_log.update(cx, |log, cx| {
-                let tracked_buffer = log.tracked_buffers.get(&buffer).unwrap();
+                let tracked_buffer = log.tracked_buffers.get(buffer).unwrap();
                 let mut old_text = tracked_buffer.diff_base.clone();
                 let new_text = buffer.read(cx).as_rope();
                 for edit in tracked_buffer.unreviewed_edits.edits() {
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 7c562aaba4..090252d338 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -702,7 +702,7 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: Some(Self::version_tooltip_message(&version)),
+                    tooltip_message: Some(Self::version_tooltip_message(version)),
                 }),
                 AutoUpdateStatus::Installing { version } => Some(Content {
                     icon: Some(
@@ -714,13 +714,13 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: Some(Self::version_tooltip_message(&version)),
+                    tooltip_message: Some(Self::version_tooltip_message(version)),
                 }),
                 AutoUpdateStatus::Updated { version } => Some(Content {
                     icon: None,
                     message: "Click to restart and update Zed".to_string(),
                     on_click: Some(Arc::new(move |_, _, cx| workspace::reload(cx))),
-                    tooltip_message: Some(Self::version_tooltip_message(&version)),
+                    tooltip_message: Some(Self::version_tooltip_message(version)),
                 }),
                 AutoUpdateStatus::Errored => Some(Content {
                     icon: Some(
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 5491842185..469135a967 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1692,7 +1692,7 @@ impl Thread {
         self.last_received_chunk_at = Some(Instant::now());
 
         let task = cx.spawn(async move |thread, cx| {
-            let stream_completion_future = model.stream_completion(request, &cx);
+            let stream_completion_future = model.stream_completion(request, cx);
             let initial_token_usage =
                 thread.read_with(cx, |thread, _cx| thread.cumulative_token_usage);
             let stream_completion = async {
@@ -1824,7 +1824,7 @@ impl Thread {
                                 let streamed_input = if tool_use.is_input_complete {
                                     None
                                 } else {
-                                    Some((&tool_use.input).clone())
+                                    Some(tool_use.input.clone())
                                 };
 
                                 let ui_text = thread.tool_use.request_tool_use(
@@ -2051,7 +2051,7 @@ impl Thread {
 
                                             retry_scheduled = thread
                                                 .handle_retryable_error_with_delay(
-                                                    &completion_error,
+                                                    completion_error,
                                                     Some(retry_strategy),
                                                     model.clone(),
                                                     intent,
@@ -2130,7 +2130,7 @@ impl Thread {
 
         self.pending_summary = cx.spawn(async move |this, cx| {
             let result = async {
-                let mut messages = model.model.stream_completion(request, &cx).await?;
+                let mut messages = model.model.stream_completion(request, cx).await?;
 
                 let mut new_summary = String::new();
                 while let Some(event) = messages.next().await {
@@ -2456,7 +2456,7 @@ impl Thread {
         // which result to prefer (the old task could complete after the new one, resulting in a
         // stale summary).
         self.detailed_summary_task = cx.spawn(async move |thread, cx| {
-            let stream = model.stream_completion_text(request, &cx);
+            let stream = model.stream_completion_text(request, cx);
             let Some(mut messages) = stream.await.log_err() else {
                 thread
                     .update(cx, |thread, _cx| {
@@ -4043,7 +4043,7 @@ fn main() {{
         });
 
         let fake_model = model.as_fake();
-        simulate_successful_response(&fake_model, cx);
+        simulate_successful_response(fake_model, cx);
 
         // Should start generating summary when there are >= 2 messages
         thread.read_with(cx, |thread, _| {
@@ -4138,7 +4138,7 @@ fn main() {{
         });
 
         let fake_model = model.as_fake();
-        simulate_successful_response(&fake_model, cx);
+        simulate_successful_response(fake_model, cx);
 
         thread.read_with(cx, |thread, _| {
             // State is still Error, not Generating
@@ -5420,7 +5420,7 @@ fn main() {{
         });
 
         let fake_model = model.as_fake();
-        simulate_successful_response(&fake_model, cx);
+        simulate_successful_response(fake_model, cx);
 
         thread.read_with(cx, |thread, _| {
             assert!(matches!(thread.summary(), ThreadSummary::Generating));
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index af740d9901..985de4d123 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -91,7 +91,7 @@ impl LanguageModels {
         for provider in &providers {
             for model in provider.recommended_models(cx) {
                 recommended_models.insert(model.id());
-                recommended.push(Self::map_language_model_to_info(&model, &provider));
+                recommended.push(Self::map_language_model_to_info(&model, provider));
             }
         }
         if !recommended.is_empty() {
diff --git a/crates/agent2/src/templates.rs b/crates/agent2/src/templates.rs
index a63f0ad206..72a8f6633c 100644
--- a/crates/agent2/src/templates.rs
+++ b/crates/agent2/src/templates.rs
@@ -62,7 +62,7 @@ fn contains(
         handlebars::RenderError::new("contains: missing or invalid query parameter")
     })?;
 
-    if list.contains(&query) {
+    if list.contains(query) {
         out.write("true")?;
     }
 
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 429832010b..eed374e396 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -173,7 +173,7 @@ impl UserMessage {
                                 &mut symbol_context,
                                 "\n{}",
                                 MarkdownCodeBlock {
-                                    tag: &codeblock_tag(&abs_path, None),
+                                    tag: &codeblock_tag(abs_path, None),
                                     text: &content.to_string(),
                                 }
                             )
@@ -189,8 +189,8 @@ impl UserMessage {
                                 &mut rules_context,
                                 "\n{}",
                                 MarkdownCodeBlock {
-                                    tag: &codeblock_tag(&path, Some(line_range)),
-                                    text: &content
+                                    tag: &codeblock_tag(path, Some(line_range)),
+                                    text: content
                                 }
                             )
                             .ok();
@@ -207,7 +207,7 @@ impl UserMessage {
                                 "\n{}",
                                 MarkdownCodeBlock {
                                     tag: "",
-                                    text: &content
+                                    text: content
                                 }
                             )
                             .ok();
@@ -1048,7 +1048,7 @@ impl Thread {
             tools,
             tool_choice: None,
             stop: Vec::new(),
-            temperature: AgentSettings::temperature_for_model(&model, cx),
+            temperature: AgentSettings::temperature_for_model(model, cx),
             thinking_allowed: true,
         };
 
diff --git a/crates/agent2/src/tools/context_server_registry.rs b/crates/agent2/src/tools/context_server_registry.rs
index db39e9278c..ddeb08a046 100644
--- a/crates/agent2/src/tools/context_server_registry.rs
+++ b/crates/agent2/src/tools/context_server_registry.rs
@@ -103,7 +103,7 @@ impl ContextServerRegistry {
                         self.reload_tools_for_server(server_id.clone(), cx);
                     }
                     ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
-                        self.registered_servers.remove(&server_id);
+                        self.registered_servers.remove(server_id);
                         cx.notify();
                     }
                 }
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index c55e503d76..e70e5e8a14 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -471,7 +471,7 @@ fn resolve_path(
 
             let parent_entry = parent_project_path
                 .as_ref()
-                .and_then(|path| project.entry_for_path(&path, cx))
+                .and_then(|path| project.entry_for_path(path, cx))
                 .context("Can't create file: parent directory doesn't exist")?;
 
             anyhow::ensure!(
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index ecb855ac34..ac79874c36 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -80,7 +80,7 @@ impl AgentTool for TerminalTool {
             let first_line = lines.next().unwrap_or_default();
             let remaining_line_count = lines.count();
             match remaining_line_count {
-                0 => MarkdownInlineCode(&first_line).to_string().into(),
+                0 => MarkdownInlineCode(first_line).to_string().into(),
                 1 => MarkdownInlineCode(&format!(
                     "{} - {} more line",
                     first_line, remaining_line_count
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 00e3e3df50..1cfb1fcabf 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -19,14 +19,14 @@ pub async fn connect(
     root_dir: &Path,
     cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
-    let conn = v1::AcpConnection::stdio(server_name, command.clone(), &root_dir, cx).await;
+    let conn = v1::AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await;
 
     match conn {
         Ok(conn) => Ok(Rc::new(conn) as _),
         Err(err) if err.is::<UnsupportedVersion>() => {
             // Consider re-using initialize response and subprocess when adding another version here
             let conn: Rc<dyn AgentConnection> =
-                Rc::new(v0::AcpConnection::stdio(server_name, command, &root_dir, cx).await?);
+                Rc::new(v0::AcpConnection::stdio(server_name, command, root_dir, cx).await?);
             Ok(conn)
         }
         Err(err) => Err(err),
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index d80d040aad..354bda494d 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -291,7 +291,7 @@ impl AgentConnection for ClaudeAgentConnection {
 
     fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
         let sessions = self.sessions.borrow();
-        let Some(session) = sessions.get(&session_id) else {
+        let Some(session) = sessions.get(session_id) else {
             log::warn!("Attempted to cancel nonexistent session {}", session_id);
             return;
         };
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 8a413fc91e..e2ddd03f27 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -552,11 +552,11 @@ fn build_code_label_for_full_path(file_name: &str, directory: Option<&str>, cx:
     let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
     let mut label = CodeLabel::default();
 
-    label.push_str(&file_name, None);
+    label.push_str(file_name, None);
     label.push_str(" ", None);
 
     if let Some(directory) = directory {
-        label.push_str(&directory, comment_id);
+        label.push_str(directory, comment_id);
     }
 
     label.filter_range = 0..label.text().len();
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 299f0c30be..d592231726 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1191,7 +1191,7 @@ impl MentionSet {
                         })
                     }
                     MentionUri::Fetch { url } => {
-                        let Some(content) = self.fetch_results.get(&url).cloned() else {
+                        let Some(content) = self.fetch_results.get(url).cloned() else {
                             return Task::ready(Err(anyhow!("missing fetch result")));
                         };
                         let uri = uri.clone();
diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
index 563afee65f..77c88c461d 100644
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -330,7 +330,7 @@ async fn fuzzy_search(
             .collect::<Vec<_>>();
         let mut matches = match_strings(
             &candidates,
-            &query,
+            query,
             false,
             true,
             100,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index e2e5820812..4a8f9bf209 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -696,7 +696,7 @@ impl AcpThreadView {
         };
 
         diff.update(cx, |diff, cx| {
-            diff.move_to_path(PathKey::for_buffer(&buffer, cx), window, cx)
+            diff.move_to_path(PathKey::for_buffer(buffer, cx), window, cx)
         })
     }
 
@@ -722,13 +722,13 @@ impl AcpThreadView {
                 let len = thread.read(cx).entries().len();
                 let index = len - 1;
                 self.entry_view_state.update(cx, |view_state, cx| {
-                    view_state.sync_entry(index, &thread, window, cx)
+                    view_state.sync_entry(index, thread, window, cx)
                 });
                 self.list_state.splice(index..index, 1);
             }
             AcpThreadEvent::EntryUpdated(index) => {
                 self.entry_view_state.update(cx, |view_state, cx| {
-                    view_state.sync_entry(*index, &thread, window, cx)
+                    view_state.sync_entry(*index, thread, window, cx)
                 });
                 self.list_state.splice(*index..index + 1, 1);
             }
@@ -1427,7 +1427,7 @@ impl AcpThreadView {
                     Empty.into_any_element()
                 }
             }
-            ToolCallContent::Diff(diff) => self.render_diff_editor(entry_ix, &diff, cx),
+            ToolCallContent::Diff(diff) => self.render_diff_editor(entry_ix, diff, cx),
             ToolCallContent::Terminal(terminal) => {
                 self.render_terminal_tool_call(entry_ix, terminal, tool_call, window, cx)
             }
@@ -1583,7 +1583,7 @@ impl AcpThreadView {
             .border_color(self.tool_card_border_color(cx))
             .child(
                 if let Some(entry) = self.entry_view_state.read(cx).entry(entry_ix)
-                    && let Some(editor) = entry.editor_for_diff(&diff)
+                    && let Some(editor) = entry.editor_for_diff(diff)
                 {
                     editor.clone().into_any_element()
                 } else {
@@ -1783,7 +1783,7 @@ impl AcpThreadView {
             .entry_view_state
             .read(cx)
             .entry(entry_ix)
-            .and_then(|entry| entry.terminal(&terminal));
+            .and_then(|entry| entry.terminal(terminal));
         let show_output = self.terminal_expanded && terminal_view.is_some();
 
         v_flex()
@@ -2420,7 +2420,7 @@ impl AcpThreadView {
                         .buffer_font(cx)
                 });
 
-                let file_icon = FileIcons::get_icon(&path, cx)
+                let file_icon = FileIcons::get_icon(path, cx)
                     .map(Icon::from_path)
                     .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
                     .unwrap_or_else(|| {
@@ -3453,7 +3453,7 @@ impl Render for AcpThreadView {
                     configuration_view,
                     ..
                 } => self.render_auth_required_state(
-                    &connection,
+                    connection,
                     description.as_ref(),
                     configuration_view.as_ref(),
                     window,
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 116c2b901b..38be2b193c 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1044,12 +1044,12 @@ impl ActiveThread {
                 );
             }
             ThreadEvent::StreamedAssistantText(message_id, text) => {
-                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(&message_id) {
+                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(message_id) {
                     rendered_message.append_text(text, cx);
                 }
             }
             ThreadEvent::StreamedAssistantThinking(message_id, text) => {
-                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(&message_id) {
+                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(message_id) {
                     rendered_message.append_thinking(text, cx);
                 }
             }
@@ -2473,7 +2473,7 @@ impl ActiveThread {
                                 message_id,
                                 index,
                                 content.clone(),
-                                &scroll_handle,
+                                scroll_handle,
                                 Some(index) == pending_thinking_segment_index,
                                 window,
                                 cx,
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index b9e1ea5d0a..85e7297810 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -207,7 +207,7 @@ impl AgentDiffPane {
                 ),
                 match &thread {
                     AgentDiffThread::Native(thread) => {
-                        Some(cx.subscribe(&thread, |this, _thread, event, cx| {
+                        Some(cx.subscribe(thread, |this, _thread, event, cx| {
                             this.handle_thread_event(event, cx)
                         }))
                     }
@@ -398,7 +398,7 @@ fn keep_edits_in_selection(
         .disjoint_anchor_ranges()
         .collect::<Vec<_>>();
 
-    keep_edits_in_ranges(editor, buffer_snapshot, &thread, ranges, window, cx)
+    keep_edits_in_ranges(editor, buffer_snapshot, thread, ranges, window, cx)
 }
 
 fn reject_edits_in_selection(
@@ -412,7 +412,7 @@ fn reject_edits_in_selection(
         .selections
         .disjoint_anchor_ranges()
         .collect::<Vec<_>>();
-    reject_edits_in_ranges(editor, buffer_snapshot, &thread, ranges, window, cx)
+    reject_edits_in_ranges(editor, buffer_snapshot, thread, ranges, window, cx)
 }
 
 fn keep_edits_in_ranges(
@@ -1001,7 +1001,7 @@ impl AgentDiffToolbar {
             return;
         };
 
-        *state = agent_diff.read(cx).editor_state(&editor);
+        *state = agent_diff.read(cx).editor_state(editor);
         self.update_location(cx);
         cx.notify();
     }
@@ -1343,13 +1343,13 @@ impl AgentDiff {
         });
 
         let thread_subscription = match &thread {
-            AgentDiffThread::Native(thread) => cx.subscribe_in(&thread, window, {
+            AgentDiffThread::Native(thread) => cx.subscribe_in(thread, window, {
                 let workspace = workspace.clone();
                 move |this, _thread, event, window, cx| {
                     this.handle_native_thread_event(&workspace, event, window, cx)
                 }
             }),
-            AgentDiffThread::AcpThread(thread) => cx.subscribe_in(&thread, window, {
+            AgentDiffThread::AcpThread(thread) => cx.subscribe_in(thread, window, {
                 let workspace = workspace.clone();
                 move |this, thread, event, window, cx| {
                     this.handle_acp_thread_event(&workspace, thread, event, window, cx)
@@ -1357,11 +1357,11 @@ impl AgentDiff {
             }),
         };
 
-        if let Some(workspace_thread) = self.workspace_threads.get_mut(&workspace) {
+        if let Some(workspace_thread) = self.workspace_threads.get_mut(workspace) {
             // replace thread and action log subscription, but keep editors
             workspace_thread.thread = thread.downgrade();
             workspace_thread._thread_subscriptions = (action_log_subscription, thread_subscription);
-            self.update_reviewing_editors(&workspace, window, cx);
+            self.update_reviewing_editors(workspace, window, cx);
             return;
         }
 
@@ -1677,7 +1677,7 @@ impl AgentDiff {
                         editor.register_addon(EditorAgentDiffAddon);
                     });
                 } else {
-                    unaffected.remove(&weak_editor);
+                    unaffected.remove(weak_editor);
                 }
 
                 if new_state == EditorState::Reviewing && previous_state != Some(new_state) {
@@ -1730,7 +1730,7 @@ impl AgentDiff {
 
     fn editor_state(&self, editor: &WeakEntity<Editor>) -> EditorState {
         self.reviewing_editors
-            .get(&editor)
+            .get(editor)
             .cloned()
             .unwrap_or(EditorState::Idle)
     }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 4cb231f357..e1174a4191 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2923,7 +2923,7 @@ impl AgentPanel {
                         .style(ButtonStyle::Tinted(ui::TintColor::Warning))
                         .label_size(LabelSize::Small)
                         .key_binding(
-                            KeyBinding::for_action_in(&OpenSettings, &focus_handle, window, cx)
+                            KeyBinding::for_action_in(&OpenSettings, focus_handle, window, cx)
                                 .map(|kb| kb.size(rems_from_px(12.))),
                         )
                         .on_click(|_event, window, cx| {
@@ -3329,7 +3329,7 @@ impl AgentPanel {
                     .paths()
                     .into_iter()
                     .map(|path| {
-                        Workspace::project_path_for_path(this.project.clone(), &path, false, cx)
+                        Workspace::project_path_for_path(this.project.clone(), path, false, cx)
                     })
                     .collect::<Vec<_>>();
                 cx.spawn_in(window, async move |this, cx| {
@@ -3599,7 +3599,7 @@ impl rules_library::InlineAssistDelegate for PromptLibraryInlineAssist {
             let text_thread_store = None;
             let context_store = cx.new(|_| ContextStore::new(project.clone(), None));
             assistant.assist(
-                &prompt_editor,
+                prompt_editor,
                 self.workspace.clone(),
                 context_store,
                 project,
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index 615142b73d..23e04266db 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -388,7 +388,7 @@ impl CodegenAlternative {
             } else {
                 let request = self.build_request(&model, user_prompt, cx)?;
                 cx.spawn(async move |_, cx| {
-                    Ok(model.stream_completion_text(request.await, &cx).await?)
+                    Ok(model.stream_completion_text(request.await, cx).await?)
                 })
                 .boxed_local()
             };
@@ -447,7 +447,7 @@ impl CodegenAlternative {
             }
         });
 
-        let temperature = AgentSettings::temperature_for_model(&model, cx);
+        let temperature = AgentSettings::temperature_for_model(model, cx);
 
         Ok(cx.spawn(async move |_cx| {
             let mut request_message = LanguageModelRequestMessage {
@@ -1028,7 +1028,7 @@ where
                                 chunk.push('\n');
                             }
 
-                            chunk.push_str(&line);
+                            chunk.push_str(line);
                         }
 
                         consumed += line.len();
diff --git a/crates/agent_ui/src/context_picker/completion_provider.rs b/crates/agent_ui/src/context_picker/completion_provider.rs
index 962c0df03d..79e56acacf 100644
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -728,11 +728,11 @@ fn build_code_label_for_full_path(file_name: &str, directory: Option<&str>, cx:
     let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
     let mut label = CodeLabel::default();
 
-    label.push_str(&file_name, None);
+    label.push_str(file_name, None);
     label.push_str(" ", None);
 
     if let Some(directory) = directory {
-        label.push_str(&directory, comment_id);
+        label.push_str(directory, comment_id);
     }
 
     label.filter_range = 0..label.text().len();
diff --git a/crates/agent_ui/src/context_picker/file_context_picker.rs b/crates/agent_ui/src/context_picker/file_context_picker.rs
index eaf9ed16d6..4f74e2cea4 100644
--- a/crates/agent_ui/src/context_picker/file_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/file_context_picker.rs
@@ -315,7 +315,7 @@ pub fn render_file_context_entry(
     context_store: WeakEntity<ContextStore>,
     cx: &App,
 ) -> Stateful<Div> {
-    let (file_name, directory) = extract_file_name_and_directory(&path, path_prefix);
+    let (file_name, directory) = extract_file_name_and_directory(path, path_prefix);
 
     let added = context_store.upgrade().and_then(|context_store| {
         let project_path = ProjectPath {
@@ -334,7 +334,7 @@ pub fn render_file_context_entry(
     let file_icon = if is_directory {
         FileIcons::get_folder_icon(false, cx)
     } else {
-        FileIcons::get_icon(&path, cx)
+        FileIcons::get_icon(path, cx)
     }
     .map(Icon::from_path)
     .unwrap_or_else(|| Icon::new(IconName::File));
diff --git a/crates/agent_ui/src/context_picker/symbol_context_picker.rs b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
index 05e77deece..805c10c965 100644
--- a/crates/agent_ui/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
@@ -289,7 +289,7 @@ pub(crate) fn search_symbols(
                         .iter()
                         .enumerate()
                         .map(|(id, symbol)| {
-                            StringMatchCandidate::new(id, &symbol.label.filter_text())
+                            StringMatchCandidate::new(id, symbol.label.filter_text())
                         })
                         .partition(|candidate| {
                             project
diff --git a/crates/agent_ui/src/context_picker/thread_context_picker.rs b/crates/agent_ui/src/context_picker/thread_context_picker.rs
index 15cc731f8f..e660e64ae3 100644
--- a/crates/agent_ui/src/context_picker/thread_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/thread_context_picker.rs
@@ -167,7 +167,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
                     return;
                 };
                 let open_thread_task =
-                    thread_store.update(cx, |this, cx| this.open_thread(&id, window, cx));
+                    thread_store.update(cx, |this, cx| this.open_thread(id, window, cx));
 
                 cx.spawn(async move |this, cx| {
                     let thread = open_thread_task.await?;
@@ -236,7 +236,7 @@ pub fn render_thread_context_entry(
     let is_added = match entry {
         ThreadContextEntry::Thread { id, .. } => context_store
             .upgrade()
-            .map_or(false, |ctx_store| ctx_store.read(cx).includes_thread(&id)),
+            .map_or(false, |ctx_store| ctx_store.read(cx).includes_thread(id)),
         ThreadContextEntry::Context { path, .. } => {
             context_store.upgrade().map_or(false, |ctx_store| {
                 ctx_store.read(cx).includes_text_thread(path)
@@ -338,7 +338,7 @@ pub(crate) fn search_threads(
             let candidates = threads
                 .iter()
                 .enumerate()
-                .map(|(id, (_, thread))| StringMatchCandidate::new(id, &thread.title()))
+                .map(|(id, (_, thread))| StringMatchCandidate::new(id, thread.title()))
                 .collect::<Vec<_>>();
             let matches = fuzzy::match_strings(
                 &candidates,
diff --git a/crates/agent_ui/src/context_strip.rs b/crates/agent_ui/src/context_strip.rs
index 369964f165..51ed3a5e11 100644
--- a/crates/agent_ui/src/context_strip.rs
+++ b/crates/agent_ui/src/context_strip.rs
@@ -145,7 +145,7 @@ impl ContextStrip {
         }
 
         let file_name = active_buffer.file()?.file_name(cx);
-        let icon_path = FileIcons::get_icon(&Path::new(&file_name), cx);
+        let icon_path = FileIcons::get_icon(Path::new(&file_name), cx);
         Some(SuggestedContext::File {
             name: file_name.to_string_lossy().into_owned().into(),
             buffer: active_buffer_entity.downgrade(),
@@ -377,7 +377,7 @@ impl ContextStrip {
 
     fn add_suggested_context(&mut self, suggested: &SuggestedContext, cx: &mut Context<Self>) {
         self.context_store.update(cx, |context_store, cx| {
-            context_store.add_suggested_context(&suggested, cx)
+            context_store.add_suggested_context(suggested, cx)
         });
         cx.notify();
     }
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index bbd3595805..781e242fba 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -526,9 +526,9 @@ impl InlineAssistant {
 
             if assist_to_focus.is_none() {
                 let focus_assist = if newest_selection.reversed {
-                    range.start.to_point(&snapshot) == newest_selection.start
+                    range.start.to_point(snapshot) == newest_selection.start
                 } else {
-                    range.end.to_point(&snapshot) == newest_selection.end
+                    range.end.to_point(snapshot) == newest_selection.end
                 };
                 if focus_assist {
                     assist_to_focus = Some(assist_id);
@@ -550,7 +550,7 @@ impl InlineAssistant {
         let editor_assists = self
             .assists_by_editor
             .entry(editor.downgrade())
-            .or_insert_with(|| EditorInlineAssists::new(&editor, window, cx));
+            .or_insert_with(|| EditorInlineAssists::new(editor, window, cx));
         let mut assist_group = InlineAssistGroup::new();
         for (assist_id, range, prompt_editor, prompt_block_id, end_block_id) in assists {
             let codegen = prompt_editor.read(cx).codegen().clone();
@@ -649,7 +649,7 @@ impl InlineAssistant {
         let editor_assists = self
             .assists_by_editor
             .entry(editor.downgrade())
-            .or_insert_with(|| EditorInlineAssists::new(&editor, window, cx));
+            .or_insert_with(|| EditorInlineAssists::new(editor, window, cx));
 
         let mut assist_group = InlineAssistGroup::new();
         self.assists.insert(
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index e6fca16984..6f12050f88 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -75,7 +75,7 @@ impl<T: 'static> Render for PromptEditor<T> {
                 let codegen = codegen.read(cx);
 
                 if codegen.alternative_count(cx) > 1 {
-                    buttons.push(self.render_cycle_controls(&codegen, cx));
+                    buttons.push(self.render_cycle_controls(codegen, cx));
                 }
 
                 let editor_margins = editor_margins.lock();
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index fa8ca490d8..845540979a 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -296,7 +296,7 @@ impl ModelMatcher {
     pub fn fuzzy_search(&self, query: &str) -> Vec<ModelInfo> {
         let mut matches = self.bg_executor.block(match_strings(
             &self.candidates,
-            &query,
+            query,
             false,
             true,
             100,
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index d6c9a778a6..181a0dd5d2 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1166,7 +1166,7 @@ impl MessageEditor {
                                     .buffer_font(cx)
                             });
 
-                            let file_icon = FileIcons::get_icon(&path, cx)
+                            let file_icon = FileIcons::get_icon(path, cx)
                                 .map(Icon::from_path)
                                 .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
                                 .unwrap_or_else(|| {
@@ -1559,9 +1559,8 @@ impl ContextCreasesAddon {
         cx: &mut Context<Editor>,
     ) {
         self.creases.entry(key).or_default().extend(creases);
-        self._subscription = Some(cx.subscribe(
-            &context_store,
-            |editor, _, event, cx| match event {
+        self._subscription = Some(
+            cx.subscribe(context_store, |editor, _, event, cx| match event {
                 ContextStoreEvent::ContextRemoved(key) => {
                     let Some(this) = editor.addon_mut::<Self>() else {
                         return;
@@ -1581,8 +1580,8 @@ impl ContextCreasesAddon {
                     editor.edit(ranges.into_iter().zip(replacement_texts), cx);
                     cx.notify();
                 }
-            },
-        ))
+            }),
+        )
     }
 
     pub fn into_inner(self) -> HashMap<AgentContextKey, Vec<(CreaseId, SharedString)>> {
diff --git a/crates/agent_ui/src/slash_command_picker.rs b/crates/agent_ui/src/slash_command_picker.rs
index 678562e059..bab2364679 100644
--- a/crates/agent_ui/src/slash_command_picker.rs
+++ b/crates/agent_ui/src/slash_command_picker.rs
@@ -214,7 +214,7 @@ impl PickerDelegate for SlashCommandDelegate {
                                         let mut label = format!("{}", info.name);
                                         if let Some(args) = info.args.as_ref().filter(|_| selected)
                                         {
-                                            label.push_str(&args);
+                                            label.push_str(args);
                                         }
                                         Label::new(label)
                                             .single_line()
diff --git a/crates/agent_ui/src/terminal_codegen.rs b/crates/agent_ui/src/terminal_codegen.rs
index 54f5b52f58..5a4a9d560a 100644
--- a/crates/agent_ui/src/terminal_codegen.rs
+++ b/crates/agent_ui/src/terminal_codegen.rs
@@ -48,7 +48,7 @@ impl TerminalCodegen {
             let prompt = prompt_task.await;
             let model_telemetry_id = model.telemetry_id();
             let model_provider_id = model.provider_id();
-            let response = model.stream_completion_text(prompt, &cx).await;
+            let response = model.stream_completion_text(prompt, cx).await;
             let generate = async {
                 let message_id = response
                     .as_ref()
diff --git a/crates/agent_ui/src/ui/context_pill.rs b/crates/agent_ui/src/ui/context_pill.rs
index 5dd57de244..4e33e151cd 100644
--- a/crates/agent_ui/src/ui/context_pill.rs
+++ b/crates/agent_ui/src/ui/context_pill.rs
@@ -353,7 +353,7 @@ impl AddedContext {
             name,
             parent,
             tooltip: Some(full_path_string),
-            icon_path: FileIcons::get_icon(&full_path, cx),
+            icon_path: FileIcons::get_icon(full_path, cx),
             status: ContextStatus::Ready,
             render_hover: None,
             handle: AgentContextHandle::File(handle),
@@ -615,7 +615,7 @@ impl AddedContext {
             let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
             let (name, parent) =
                 extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
-            let icon_path = FileIcons::get_icon(&full_path, cx);
+            let icon_path = FileIcons::get_icon(full_path, cx);
             (name, parent, icon_path)
         } else {
             ("Image".into(), None, None)
@@ -706,7 +706,7 @@ impl ContextFileExcerpt {
             .and_then(|p| p.file_name())
             .map(|n| n.to_string_lossy().into_owned().into());
 
-        let icon_path = FileIcons::get_icon(&full_path, cx);
+        let icon_path = FileIcons::get_icon(full_path, cx);
 
         ContextFileExcerpt {
             file_name_and_range: file_name_and_range.into(),
diff --git a/crates/assistant_context/src/assistant_context.rs b/crates/assistant_context/src/assistant_context.rs
index 557f9592e4..06abbad39f 100644
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -592,7 +592,7 @@ impl MessageMetadata {
     pub fn is_cache_valid(&self, buffer: &BufferSnapshot, range: &Range<usize>) -> bool {
         let result = match &self.cache {
             Some(MessageCacheMetadata { cached_at, .. }) => !buffer.has_edits_since_in_range(
-                &cached_at,
+                cached_at,
                 Range {
                     start: buffer.anchor_at(range.start, Bias::Right),
                     end: buffer.anchor_at(range.end, Bias::Left),
@@ -1413,7 +1413,7 @@ impl AssistantContext {
         }
 
         let request = {
-            let mut req = self.to_completion_request(Some(&model), cx);
+            let mut req = self.to_completion_request(Some(model), cx);
             // Skip the last message because it's likely to change and
             // therefore would be a waste to cache.
             req.messages.pop();
@@ -1428,7 +1428,7 @@ impl AssistantContext {
         let model = Arc::clone(model);
         self.pending_cache_warming_task = cx.spawn(async move |this, cx| {
             async move {
-                match model.stream_completion(request, &cx).await {
+                match model.stream_completion(request, cx).await {
                     Ok(mut stream) => {
                         stream.next().await;
                         log::info!("Cache warming completed successfully");
@@ -1661,12 +1661,12 @@ impl AssistantContext {
     ) -> Range<usize> {
         let buffer = self.buffer.read(cx);
         let start_ix = match all_annotations
-            .binary_search_by(|probe| probe.range().end.cmp(&range.start, &buffer))
+            .binary_search_by(|probe| probe.range().end.cmp(&range.start, buffer))
         {
             Ok(ix) | Err(ix) => ix,
         };
         let end_ix = match all_annotations
-            .binary_search_by(|probe| probe.range().start.cmp(&range.end, &buffer))
+            .binary_search_by(|probe| probe.range().start.cmp(&range.end, buffer))
         {
             Ok(ix) => ix + 1,
             Err(ix) => ix,
@@ -2045,7 +2045,7 @@ impl AssistantContext {
 
         let task = cx.spawn({
             async move |this, cx| {
-                let stream = model.stream_completion(request, &cx);
+                let stream = model.stream_completion(request, cx);
                 let assistant_message_id = assistant_message.id;
                 let mut response_latency = None;
                 let stream_completion = async {
@@ -2708,7 +2708,7 @@ impl AssistantContext {
 
             self.summary_task = cx.spawn(async move |this, cx| {
                 let result = async {
-                    let stream = model.model.stream_completion_text(request, &cx);
+                    let stream = model.model.stream_completion_text(request, cx);
                     let mut messages = stream.await?;
 
                     let mut replaced = !replace_old;
@@ -2927,7 +2927,7 @@ impl AssistantContext {
                 if let Some(old_path) = old_path.as_ref() {
                     if new_path.as_path() != old_path.as_ref() {
                         fs.rename(
-                            &old_path,
+                            old_path,
                             &new_path,
                             RenameOptions {
                                 overwrite: true,
diff --git a/crates/assistant_context/src/assistant_context_tests.rs b/crates/assistant_context/src/assistant_context_tests.rs
index efcad8ed96..eae7741358 100644
--- a/crates/assistant_context/src/assistant_context_tests.rs
+++ b/crates/assistant_context/src/assistant_context_tests.rs
@@ -1300,7 +1300,7 @@ fn test_summarize_error(
         context.assist(cx);
     });
 
-    simulate_successful_response(&model, cx);
+    simulate_successful_response(model, cx);
 
     context.read_with(cx, |context, _| {
         assert!(!context.summary().content().unwrap().done);
diff --git a/crates/assistant_slash_commands/src/context_server_command.rs b/crates/assistant_slash_commands/src/context_server_command.rs
index f223d3b184..15f3901bfb 100644
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -44,7 +44,7 @@ impl SlashCommand for ContextServerSlashCommand {
                 parts.push(arg.name.as_str());
             }
         }
-        create_label_for_command(&parts[0], &parts[1..], cx)
+        create_label_for_command(parts[0], &parts[1..], cx)
     }
 
     fn description(&self) -> String {
diff --git a/crates/assistant_slash_commands/src/diagnostics_command.rs b/crates/assistant_slash_commands/src/diagnostics_command.rs
index 2feabd8b1e..31014f8fb8 100644
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -249,7 +249,7 @@ fn collect_diagnostics(
                     let worktree = worktree.read(cx);
                     let worktree_root_path = Path::new(worktree.root_name());
                     let relative_path = path.strip_prefix(worktree_root_path).ok()?;
-                    worktree.absolutize(&relative_path).ok()
+                    worktree.absolutize(relative_path).ok()
                 })
             })
             .is_some()
@@ -365,7 +365,7 @@ pub fn collect_buffer_diagnostics(
 ) {
     for (_, group) in snapshot.diagnostic_groups(None) {
         let entry = &group.entries[group.primary_ix];
-        collect_diagnostic(output, entry, &snapshot, include_warnings)
+        collect_diagnostic(output, entry, snapshot, include_warnings)
     }
 }
 
@@ -396,7 +396,7 @@ fn collect_diagnostic(
     let start_row = range.start.row.saturating_sub(EXCERPT_EXPANSION_SIZE);
     let end_row = (range.end.row + EXCERPT_EXPANSION_SIZE).min(snapshot.max_point().row) + 1;
     let excerpt_range =
-        Point::new(start_row, 0).to_offset(&snapshot)..Point::new(end_row, 0).to_offset(&snapshot);
+        Point::new(start_row, 0).to_offset(snapshot)..Point::new(end_row, 0).to_offset(snapshot);
 
     output.text.push_str("```");
     if let Some(language_name) = snapshot.language().map(|l| l.code_fence_block_name()) {
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index e819c51e1e..039f9d9316 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -536,7 +536,7 @@ fn resolve_path(
 
             let parent_entry = parent_project_path
                 .as_ref()
-                .and_then(|path| project.entry_for_path(&path, cx))
+                .and_then(|path| project.entry_for_path(path, cx))
                 .context("Can't create file: parent directory doesn't exist")?;
 
             anyhow::ensure!(
@@ -723,13 +723,13 @@ impl EditFileToolCard {
         let buffer = buffer.read(cx);
         let diff = diff.read(cx);
         let mut ranges = diff
-            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, cx)
-            .map(|diff_hunk| diff_hunk.buffer_range.to_point(&buffer))
+            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
+            .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
             .collect::<Vec<_>>();
         ranges.extend(
             self.revealed_ranges
                 .iter()
-                .map(|range| range.to_point(&buffer)),
+                .map(|range| range.to_point(buffer)),
         );
         ranges.sort_unstable_by_key(|range| (range.start, Reverse(range.end)));
 
diff --git a/crates/assistant_tools/src/grep_tool.rs b/crates/assistant_tools/src/grep_tool.rs
index a5ce07823f..1f00332c5a 100644
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -894,7 +894,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not find files outside the project worktree"
@@ -920,7 +920,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.iter().any(|p| p.contains("allowed_file.rs")),
             "grep_tool should be able to search files inside worktrees"
@@ -946,7 +946,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not search files in .secretdir (file_scan_exclusions)"
@@ -971,7 +971,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not search .mymetadata files (file_scan_exclusions)"
@@ -997,7 +997,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not search .mysecrets (private_files)"
@@ -1022,7 +1022,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not search .privatekey files (private_files)"
@@ -1047,7 +1047,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not search .mysensitive files (private_files)"
@@ -1073,7 +1073,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.iter().any(|p| p.contains("normal_file.rs")),
             "Should be able to search normal files"
@@ -1100,7 +1100,7 @@ mod tests {
             })
             .await;
         let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
+        let paths = extract_paths_from_results(results.content.as_str().unwrap());
         assert!(
             paths.is_empty(),
             "grep_tool should not allow escaping project boundaries with relative paths"
@@ -1206,7 +1206,7 @@ mod tests {
             .unwrap();
 
         let content = result.content.as_str().unwrap();
-        let paths = extract_paths_from_results(&content);
+        let paths = extract_paths_from_results(content);
 
         // Should find matches in non-private files
         assert!(
@@ -1271,7 +1271,7 @@ mod tests {
             .unwrap();
 
         let content = result.content.as_str().unwrap();
-        let paths = extract_paths_from_results(&content);
+        let paths = extract_paths_from_results(content);
 
         // Should only find matches in worktree1 *.rs files (excluding private ones)
         assert!(
diff --git a/crates/assistant_tools/src/project_notifications_tool.rs b/crates/assistant_tools/src/project_notifications_tool.rs
index c65cfd0ca7..e30d80207d 100644
--- a/crates/assistant_tools/src/project_notifications_tool.rs
+++ b/crates/assistant_tools/src/project_notifications_tool.rs
@@ -81,7 +81,7 @@ fn fit_patch_to_size(patch: &str, max_size: usize) -> String {
     // Compression level 1: remove context lines in diff bodies, but
     // leave the counts and positions of inserted/deleted lines
     let mut current_size = patch.len();
-    let mut file_patches = split_patch(&patch);
+    let mut file_patches = split_patch(patch);
     file_patches.sort_by_key(|patch| patch.len());
     let compressed_patches = file_patches
         .iter()
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index 46227f130d..3de22ad28d 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -105,7 +105,7 @@ impl Tool for TerminalTool {
                 let first_line = lines.next().unwrap_or_default();
                 let remaining_line_count = lines.count();
                 match remaining_line_count {
-                    0 => MarkdownInlineCode(&first_line).to_string(),
+                    0 => MarkdownInlineCode(first_line).to_string(),
                     1 => MarkdownInlineCode(&format!(
                         "{} - {} more line",
                         first_line, remaining_line_count
diff --git a/crates/breadcrumbs/src/breadcrumbs.rs b/crates/breadcrumbs/src/breadcrumbs.rs
index 8eed7497da..990fc27fbd 100644
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -231,7 +231,7 @@ fn apply_dirty_filename_style(
     let highlight = vec![(filename_position..text.len(), highlight_style)];
     Some(
         StyledText::new(text)
-            .with_default_highlights(&text_style, highlight)
+            .with_default_highlights(text_style, highlight)
             .into_any(),
     )
 }
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index 97f529fe37..e20ea9713f 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -928,7 +928,7 @@ impl BufferDiff {
         let new_index_text = self.inner.stage_or_unstage_hunks_impl(
             &self.secondary_diff.as_ref()?.read(cx).inner,
             stage,
-            &hunks,
+            hunks,
             buffer,
             file_exists,
         );
@@ -952,12 +952,12 @@ impl BufferDiff {
         cx: &App,
     ) -> Option<Range<Anchor>> {
         let start = self
-            .hunks_intersecting_range(range.clone(), &buffer, cx)
+            .hunks_intersecting_range(range.clone(), buffer, cx)
             .next()?
             .buffer_range
             .start;
         let end = self
-            .hunks_intersecting_range_rev(range.clone(), &buffer)
+            .hunks_intersecting_range_rev(range.clone(), buffer)
             .next()?
             .buffer_range
             .end;
@@ -1031,18 +1031,18 @@ impl BufferDiff {
                         && state.base_text.syntax_update_count()
                             == new_state.base_text.syntax_update_count() =>
                 {
-                    (false, new_state.compare(&state, buffer))
+                    (false, new_state.compare(state, buffer))
                 }
                 _ => (true, Some(text::Anchor::MIN..text::Anchor::MAX)),
             };
 
         if let Some(secondary_changed_range) = secondary_diff_change {
             if let Some(secondary_hunk_range) =
-                self.range_to_hunk_range(secondary_changed_range, &buffer, cx)
+                self.range_to_hunk_range(secondary_changed_range, buffer, cx)
             {
                 if let Some(range) = &mut changed_range {
-                    range.start = secondary_hunk_range.start.min(&range.start, &buffer);
-                    range.end = secondary_hunk_range.end.max(&range.end, &buffer);
+                    range.start = secondary_hunk_range.start.min(&range.start, buffer);
+                    range.end = secondary_hunk_range.end.max(&range.end, buffer);
                 } else {
                     changed_range = Some(secondary_hunk_range);
                 }
@@ -1057,8 +1057,8 @@ impl BufferDiff {
             if let Some((first, last)) = state.pending_hunks.first().zip(state.pending_hunks.last())
             {
                 if let Some(range) = &mut changed_range {
-                    range.start = range.start.min(&first.buffer_range.start, &buffer);
-                    range.end = range.end.max(&last.buffer_range.end, &buffer);
+                    range.start = range.start.min(&first.buffer_range.start, buffer);
+                    range.end = range.end.max(&last.buffer_range.end, buffer);
                 } else {
                     changed_range = Some(first.buffer_range.start..last.buffer_range.end);
                 }
@@ -1797,7 +1797,7 @@ mod tests {
 
             uncommitted_diff.update(cx, |diff, cx| {
                 let hunks = diff
-                    .hunks_intersecting_range(hunk_range.clone(), &buffer, &cx)
+                    .hunks_intersecting_range(hunk_range.clone(), &buffer, cx)
                     .collect::<Vec<_>>();
                 for hunk in &hunks {
                     assert_ne!(
@@ -1812,7 +1812,7 @@ mod tests {
                     .to_string();
 
                 let hunks = diff
-                    .hunks_intersecting_range(hunk_range.clone(), &buffer, &cx)
+                    .hunks_intersecting_range(hunk_range.clone(), &buffer, cx)
                     .collect::<Vec<_>>();
                 for hunk in &hunks {
                     assert_eq!(
@@ -1870,7 +1870,7 @@ mod tests {
                 .to_string();
             assert_eq!(new_index_text, buffer_text);
 
-            let hunk = diff.hunks(&buffer, &cx).next().unwrap();
+            let hunk = diff.hunks(&buffer, cx).next().unwrap();
             assert_eq!(
                 hunk.secondary_status,
                 DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
@@ -1882,7 +1882,7 @@ mod tests {
                 .to_string();
             assert_eq!(index_text, head_text);
 
-            let hunk = diff.hunks(&buffer, &cx).next().unwrap();
+            let hunk = diff.hunks(&buffer, cx).next().unwrap();
             // optimistically unstaged (fine, could also be HasSecondaryHunk)
             assert_eq!(
                 hunk.secondary_status,
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 67591167df..a61d8e0911 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -518,11 +518,11 @@ mod linux {
         ) -> Result<(), std::io::Error> {
             for _ in 0..100 {
                 thread::sleep(Duration::from_millis(10));
-                if sock.connect_addr(&sock_addr).is_ok() {
+                if sock.connect_addr(sock_addr).is_ok() {
                     return Ok(());
                 }
             }
-            sock.connect_addr(&sock_addr)
+            sock.connect_addr(sock_addr)
         }
     }
 }
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 0f00471356..91bdf001d8 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -162,7 +162,7 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
         let client = client.clone();
         move |_: &SignIn, cx| {
             if let Some(client) = client.upgrade() {
-                cx.spawn(async move |cx| client.sign_in_with_optional_connect(true, &cx).await)
+                cx.spawn(async move |cx| client.sign_in_with_optional_connect(true, cx).await)
                     .detach_and_log_err(cx);
             }
         }
@@ -173,7 +173,7 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
         move |_: &SignOut, cx| {
             if let Some(client) = client.upgrade() {
                 cx.spawn(async move |cx| {
-                    client.sign_out(&cx).await;
+                    client.sign_out(cx).await;
                 })
                 .detach();
             }
@@ -185,7 +185,7 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
         move |_: &Reconnect, cx| {
             if let Some(client) = client.upgrade() {
                 cx.spawn(async move |cx| {
-                    client.reconnect(&cx);
+                    client.reconnect(cx);
                 })
                 .detach();
             }
@@ -677,7 +677,7 @@ impl Client {
 
                     let mut delay = INITIAL_RECONNECTION_DELAY;
                     loop {
-                        match client.connect(true, &cx).await {
+                        match client.connect(true, cx).await {
                             ConnectionResult::Timeout => {
                                 log::error!("client connect attempt timed out")
                             }
@@ -701,7 +701,7 @@ impl Client {
                                 Status::ReconnectionError {
                                     next_reconnection: Instant::now() + delay,
                                 },
-                                &cx,
+                                cx,
                             );
                             let jitter =
                                 Duration::from_millis(rng.gen_range(0..delay.as_millis() as u64));
@@ -1151,7 +1151,7 @@ impl Client {
             let this = self.clone();
             async move |cx| {
                 while let Some(message) = incoming.next().await {
-                    this.handle_message(message, &cx);
+                    this.handle_message(message, cx);
                     // Don't starve the main thread when receiving lots of messages at once.
                     smol::future::yield_now().await;
                 }
@@ -1169,12 +1169,12 @@ impl Client {
                             peer_id,
                         })
                     {
-                        this.set_status(Status::SignedOut, &cx);
+                        this.set_status(Status::SignedOut, cx);
                     }
                 }
                 Err(err) => {
                     log::error!("connection error: {:?}", err);
-                    this.set_status(Status::ConnectionLost, &cx);
+                    this.set_status(Status::ConnectionLost, cx);
                 }
             }
         })
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 82f74d910b..6783d8ed2a 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -943,21 +943,21 @@ impl Database {
                 let current_merge_conflicts = db_repository_entry
                     .current_merge_conflicts
                     .as_ref()
-                    .map(|conflicts| serde_json::from_str(&conflicts))
+                    .map(|conflicts| serde_json::from_str(conflicts))
                     .transpose()?
                     .unwrap_or_default();
 
                 let branch_summary = db_repository_entry
                     .branch_summary
                     .as_ref()
-                    .map(|branch_summary| serde_json::from_str(&branch_summary))
+                    .map(|branch_summary| serde_json::from_str(branch_summary))
                     .transpose()?
                     .unwrap_or_default();
 
                 let head_commit_details = db_repository_entry
                     .head_commit_details
                     .as_ref()
-                    .map(|head_commit_details| serde_json::from_str(&head_commit_details))
+                    .map(|head_commit_details| serde_json::from_str(head_commit_details))
                     .transpose()?
                     .unwrap_or_default();
 
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index c63d7133be..1b128e3a23 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -746,21 +746,21 @@ impl Database {
                     let current_merge_conflicts = db_repository
                         .current_merge_conflicts
                         .as_ref()
-                        .map(|conflicts| serde_json::from_str(&conflicts))
+                        .map(|conflicts| serde_json::from_str(conflicts))
                         .transpose()?
                         .unwrap_or_default();
 
                     let branch_summary = db_repository
                         .branch_summary
                         .as_ref()
-                        .map(|branch_summary| serde_json::from_str(&branch_summary))
+                        .map(|branch_summary| serde_json::from_str(branch_summary))
                         .transpose()?
                         .unwrap_or_default();
 
                     let head_commit_details = db_repository
                         .head_commit_details
                         .as_ref()
-                        .map(|head_commit_details| serde_json::from_str(&head_commit_details))
+                        .map(|head_commit_details| serde_json::from_str(head_commit_details))
                         .transpose()?
                         .unwrap_or_default();
 
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 03d39cb8ce..28d60d9221 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -245,7 +245,7 @@ impl MessageEditor {
             if !candidates.is_empty() {
                 return cx.spawn(async move |_, cx| {
                     let completion_response = Self::completions_for_candidates(
-                        &cx,
+                        cx,
                         query.as_str(),
                         &candidates,
                         start_anchor..end_anchor,
@@ -263,7 +263,7 @@ impl MessageEditor {
             if !candidates.is_empty() {
                 return cx.spawn(async move |_, cx| {
                     let completion_response = Self::completions_for_candidates(
-                        &cx,
+                        cx,
                         query.as_str(),
                         candidates,
                         start_anchor..end_anchor,
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index c2cc6a7ad5..8016481f6f 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2317,7 +2317,7 @@ impl CollabPanel {
                                 let client = this.client.clone();
                                 cx.spawn_in(window, async move |_, cx| {
                                     client
-                                        .connect(true, &cx)
+                                        .connect(true, cx)
                                         .await
                                         .into_response()
                                         .notify_async_err(cx);
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index a3420d603b..01ca533c10 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -643,7 +643,7 @@ impl Render for NotificationPanel {
                                             let client = client.clone();
                                             window
                                                 .spawn(cx, async move |cx| {
-                                                    match client.connect(true, &cx).await {
+                                                    match client.connect(true, cx).await {
                                                         util::ConnectionResult::Timeout => {
                                                             log::error!("Connection timeout");
                                                         }
diff --git a/crates/context_server/src/listener.rs b/crates/context_server/src/listener.rs
index 0e85fb2129..f3c199a14e 100644
--- a/crates/context_server/src/listener.rs
+++ b/crates/context_server/src/listener.rs
@@ -315,12 +315,12 @@ impl McpServer {
                     Self::send_err(
                         request_id,
                         format!("Tool not found: {}", params.name),
-                        &outgoing_tx,
+                        outgoing_tx,
                     );
                 }
             }
             Err(err) => {
-                Self::send_err(request_id, err.to_string(), &outgoing_tx);
+                Self::send_err(request_id, err.to_string(), outgoing_tx);
             }
         }
     }
diff --git a/crates/context_server/src/types.rs b/crates/context_server/src/types.rs
index 5fa2420a3d..e92a18c763 100644
--- a/crates/context_server/src/types.rs
+++ b/crates/context_server/src/types.rs
@@ -691,7 +691,7 @@ impl CallToolResponse {
         let mut text = String::new();
         for chunk in &self.content {
             if let ToolResponseContent::Text { text: chunk } = chunk {
-                text.push_str(&chunk)
+                text.push_str(chunk)
             };
         }
         text
diff --git a/crates/copilot/src/copilot_chat.rs b/crates/copilot/src/copilot_chat.rs
index 4c91b4fedb..e8e2251648 100644
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -484,7 +484,7 @@ impl CopilotChat {
         };
 
         if this.oauth_token.is_some() {
-            cx.spawn(async move |this, mut cx| Self::update_models(&this, &mut cx).await)
+            cx.spawn(async move |this, cx| Self::update_models(&this, cx).await)
                 .detach_and_log_err(cx);
         }
 
@@ -863,7 +863,7 @@ mod tests {
               "object": "list"
             }"#;
 
-        let schema: ModelSchema = serde_json::from_str(&json).unwrap();
+        let schema: ModelSchema = serde_json::from_str(json).unwrap();
 
         assert_eq!(schema.data.len(), 2);
         assert_eq!(schema.data[0].id, "gpt-4");
diff --git a/crates/dap/src/adapters.rs b/crates/dap/src/adapters.rs
index 687305ae94..2cef266677 100644
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -285,7 +285,7 @@ pub async fn download_adapter_from_github(
     }
 
     if !adapter_path.exists() {
-        fs.create_dir(&adapter_path.as_path())
+        fs.create_dir(adapter_path.as_path())
             .await
             .context("Failed creating adapter path")?;
     }
diff --git a/crates/dap_adapters/src/go.rs b/crates/dap_adapters/src/go.rs
index 22d8262b93..db8a45ceb4 100644
--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -36,7 +36,7 @@ impl GoDebugAdapter {
         delegate: &Arc<dyn DapDelegate>,
     ) -> Result<AdapterVersion> {
         let release = latest_github_release(
-            &"zed-industries/delve-shim-dap",
+            "zed-industries/delve-shim-dap",
             true,
             false,
             delegate.http_client(),
diff --git a/crates/dap_adapters/src/javascript.rs b/crates/dap_adapters/src/javascript.rs
index 2d19921a0f..70b0638120 100644
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -514,7 +514,7 @@ impl DebugAdapter for JsDebugAdapter {
             }
         }
 
-        self.get_installed_binary(delegate, &config, user_installed_path, user_args, cx)
+        self.get_installed_binary(delegate, config, user_installed_path, user_args, cx)
             .await
     }
 
diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
index 7b90f80fe2..6e80ec484c 100644
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -717,7 +717,7 @@ impl DebugAdapter for PythonDebugAdapter {
                 local_path.display()
             );
             return self
-                .get_installed_binary(delegate, &config, Some(local_path.clone()), user_args, None)
+                .get_installed_binary(delegate, config, Some(local_path.clone()), user_args, None)
                 .await;
         }
 
@@ -754,7 +754,7 @@ impl DebugAdapter for PythonDebugAdapter {
             return self
                 .get_installed_binary(
                     delegate,
-                    &config,
+                    config,
                     None,
                     user_args,
                     Some(toolchain.path.to_string()),
@@ -762,7 +762,7 @@ impl DebugAdapter for PythonDebugAdapter {
                 .await;
         }
 
-        self.get_installed_binary(delegate, &config, None, user_args, None)
+        self.get_installed_binary(delegate, config, None, user_args, None)
             .await
     }
 
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
index de55212cba..7fed761f5a 100644
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -238,7 +238,7 @@ mod tests {
             .unwrap();
         let _bad_db = open_db::<BadDB>(
             tempdir.path(),
-            &release_channel::ReleaseChannel::Dev.dev_name(),
+            release_channel::ReleaseChannel::Dev.dev_name(),
         )
         .await;
     }
@@ -279,7 +279,7 @@ mod tests {
         {
             let corrupt_db = open_db::<CorruptedDB>(
                 tempdir.path(),
-                &release_channel::ReleaseChannel::Dev.dev_name(),
+                release_channel::ReleaseChannel::Dev.dev_name(),
             )
             .await;
             assert!(corrupt_db.persistent());
@@ -287,7 +287,7 @@ mod tests {
 
         let good_db = open_db::<GoodDB>(
             tempdir.path(),
-            &release_channel::ReleaseChannel::Dev.dev_name(),
+            release_channel::ReleaseChannel::Dev.dev_name(),
         )
         .await;
         assert!(
@@ -334,7 +334,7 @@ mod tests {
             // Setup the bad database
             let corrupt_db = open_db::<CorruptedDB>(
                 tempdir.path(),
-                &release_channel::ReleaseChannel::Dev.dev_name(),
+                release_channel::ReleaseChannel::Dev.dev_name(),
             )
             .await;
             assert!(corrupt_db.persistent());
@@ -347,7 +347,7 @@ mod tests {
             let guard = thread::spawn(move || {
                 let good_db = smol::block_on(open_db::<GoodDB>(
                     tmp_path.as_path(),
-                    &release_channel::ReleaseChannel::Dev.dev_name(),
+                    release_channel::ReleaseChannel::Dev.dev_name(),
                 ));
                 assert!(
                     good_db.select_row::<usize>("SELECT * FROM test2").unwrap()()
diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rs
index b806381d25..14154e5b39 100644
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -485,7 +485,7 @@ impl LogStore {
         &mut self,
         id: &LogStoreEntryIdentifier<'_>,
     ) -> Option<&Vec<SharedString>> {
-        self.get_debug_adapter_state(&id)
+        self.get_debug_adapter_state(id)
             .map(|state| &state.rpc_messages.initialization_sequence)
     }
 }
@@ -536,11 +536,11 @@ impl Render for DapLogToolbarItemView {
                     })
                     .unwrap_or_else(|| "No adapter selected".into()),
             ))
-            .menu(move |mut window, cx| {
+            .menu(move |window, cx| {
                 let log_view = log_view.clone();
                 let menu_rows = menu_rows.clone();
                 let project = project.clone();
-                ContextMenu::build(&mut window, cx, move |mut menu, window, _cx| {
+                ContextMenu::build(window, cx, move |mut menu, window, _cx| {
                     for row in menu_rows.into_iter() {
                         menu = menu.custom_row(move |_window, _cx| {
                             div()
@@ -1131,7 +1131,7 @@ impl LogStore {
         project: &WeakEntity<Project>,
         session_id: SessionId,
     ) -> Vec<SharedString> {
-        self.projects.get(&project).map_or(vec![], |state| {
+        self.projects.get(project).map_or(vec![], |state| {
             state
                 .debug_sessions
                 .get(&session_id)
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index 1d44c5c244..cf038871bc 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -693,7 +693,7 @@ impl DebugPanel {
                                                 )
                                                 .icon_size(IconSize::Small)
                                                 .on_click(window.listener_for(
-                                                    &running_state,
+                                                    running_state,
                                                     |this, _, _window, cx| {
                                                         this.pause_thread(cx);
                                                     },
@@ -719,7 +719,7 @@ impl DebugPanel {
                                                 )
                                                 .icon_size(IconSize::Small)
                                                 .on_click(window.listener_for(
-                                                    &running_state,
+                                                    running_state,
                                                     |this, _, _window, cx| this.continue_thread(cx),
                                                 ))
                                                 .disabled(thread_status != ThreadStatus::Stopped)
@@ -742,7 +742,7 @@ impl DebugPanel {
                                         IconButton::new("debug-step-over", IconName::ArrowRight)
                                             .icon_size(IconSize::Small)
                                             .on_click(window.listener_for(
-                                                &running_state,
+                                                running_state,
                                                 |this, _, _window, cx| {
                                                     this.step_over(cx);
                                                 },
@@ -768,7 +768,7 @@ impl DebugPanel {
                                         )
                                         .icon_size(IconSize::Small)
                                         .on_click(window.listener_for(
-                                            &running_state,
+                                            running_state,
                                             |this, _, _window, cx| {
                                                 this.step_in(cx);
                                             },
@@ -791,7 +791,7 @@ impl DebugPanel {
                                         IconButton::new("debug-step-out", IconName::ArrowUpRight)
                                             .icon_size(IconSize::Small)
                                             .on_click(window.listener_for(
-                                                &running_state,
+                                                running_state,
                                                 |this, _, _window, cx| {
                                                     this.step_out(cx);
                                                 },
@@ -815,7 +815,7 @@ impl DebugPanel {
                                         IconButton::new("debug-restart", IconName::RotateCcw)
                                             .icon_size(IconSize::Small)
                                             .on_click(window.listener_for(
-                                                &running_state,
+                                                running_state,
                                                 |this, _, window, cx| {
                                                     this.rerun_session(window, cx);
                                                 },
@@ -837,7 +837,7 @@ impl DebugPanel {
                                         IconButton::new("debug-stop", IconName::Power)
                                             .icon_size(IconSize::Small)
                                             .on_click(window.listener_for(
-                                                &running_state,
+                                                running_state,
                                                 |this, _, _window, cx| {
                                                     if this.session().read(cx).is_building() {
                                                         this.session().update(cx, |session, cx| {
@@ -892,7 +892,7 @@ impl DebugPanel {
                                                 )
                                                 .icon_size(IconSize::Small)
                                                 .on_click(window.listener_for(
-                                                    &running_state,
+                                                    running_state,
                                                     |this, _, _, cx| {
                                                         this.detach_client(cx);
                                                     },
@@ -1160,7 +1160,7 @@ impl DebugPanel {
                         workspace
                             .project()
                             .read(cx)
-                            .project_path_for_absolute_path(&path, cx)
+                            .project_path_for_absolute_path(path, cx)
                             .context(
                                 "Couldn't get project path for .zed/debug.json in active worktree",
                             )
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index 4ac8e371a1..51ea25a5cb 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -413,7 +413,7 @@ impl NewProcessModal {
         let Some(adapter) = self.debugger.as_ref() else {
             return;
         };
-        let scenario = self.debug_scenario(&adapter, cx);
+        let scenario = self.debug_scenario(adapter, cx);
         cx.spawn_in(window, async move |this, cx| {
             let scenario = scenario.await.context("no scenario to save")?;
             let worktree_id = task_contexts
@@ -659,12 +659,7 @@ impl Render for NewProcessModal {
                             this.mode = NewProcessMode::Attach;
 
                             if let Some(debugger) = this.debugger.as_ref() {
-                                Self::update_attach_picker(
-                                    &this.attach_mode,
-                                    &debugger,
-                                    window,
-                                    cx,
-                                );
+                                Self::update_attach_picker(&this.attach_mode, debugger, window, cx);
                             }
                             this.mode_focus_handle(cx).focus(window);
                             cx.notify();
@@ -1083,7 +1078,7 @@ impl DebugDelegate {
                     .into_iter()
                     .map(|(scenario, context)| {
                         let (kind, scenario) =
-                            Self::get_scenario_kind(&languages, &dap_registry, scenario);
+                            Self::get_scenario_kind(&languages, dap_registry, scenario);
                         (kind, scenario, Some(context))
                     })
                     .chain(
@@ -1100,7 +1095,7 @@ impl DebugDelegate {
                             .filter(|(_, scenario)| valid_adapters.contains(&scenario.adapter))
                             .map(|(kind, scenario)| {
                                 let (language, scenario) =
-                                    Self::get_scenario_kind(&languages, &dap_registry, scenario);
+                                    Self::get_scenario_kind(&languages, dap_registry, scenario);
                                 (language.or(Some(kind)), scenario, None)
                             }),
                     )
diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rs
index 3a0ad7a40e..f0d7fd6fdd 100644
--- a/crates/debugger_ui/src/persistence.rs
+++ b/crates/debugger_ui/src/persistence.rs
@@ -341,7 +341,7 @@ impl SerializedPaneLayout {
     pub(crate) fn in_order(&self) -> Vec<SerializedPaneLayout> {
         let mut panes = vec![];
 
-        Self::inner_in_order(&self, &mut panes);
+        Self::inner_in_order(self, &mut panes);
         panes
     }
 
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index f3117aee07..3c1d35cdd3 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -102,7 +102,7 @@ impl Render for RunningState {
             .find(|pane| pane.read(cx).is_zoomed());
 
         let active = self.panes.panes().into_iter().next();
-        let pane = if let Some(ref zoomed_pane) = zoomed_pane {
+        let pane = if let Some(zoomed_pane) = zoomed_pane {
             zoomed_pane.update(cx, |pane, cx| pane.render(window, cx).into_any_element())
         } else if let Some(active) = active {
             self.panes
@@ -627,7 +627,7 @@ impl RunningState {
                 if s.starts_with("\"$ZED_") && s.ends_with('"') {
                     *s = s[1..s.len() - 1].to_string();
                 }
-                if let Some(substituted) = substitute_variables_in_str(&s, context) {
+                if let Some(substituted) = substitute_variables_in_str(s, context) {
                     *s = substituted;
                 }
             }
@@ -657,7 +657,7 @@ impl RunningState {
                 }
                 resolve_path(s);
 
-                if let Some(substituted) = substitute_variables_in_str(&s, context) {
+                if let Some(substituted) = substitute_variables_in_str(s, context) {
                     *s = substituted;
                 }
             }
@@ -954,7 +954,7 @@ impl RunningState {
                                 inventory.read(cx).task_template_by_label(
                                     buffer,
                                     worktree_id,
-                                    &label,
+                                    label,
                                     cx,
                                 )
                             })
@@ -1310,7 +1310,7 @@ impl RunningState {
         let mut pane_item_status = IndexMap::from_iter(
             DebuggerPaneItem::all()
                 .iter()
-                .filter(|kind| kind.is_supported(&caps))
+                .filter(|kind| kind.is_supported(caps))
                 .map(|kind| (*kind, false)),
         );
         self.panes.panes().iter().for_each(|pane| {
@@ -1371,7 +1371,7 @@ impl RunningState {
         this.serialize_layout(window, cx);
         match event {
             Event::Remove { .. } => {
-                let _did_find_pane = this.panes.remove(&source_pane).is_ok();
+                let _did_find_pane = this.panes.remove(source_pane).is_ok();
                 debug_assert!(_did_find_pane);
                 cx.notify();
             }
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index 38108dbfbc..9768f02e8e 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -494,7 +494,7 @@ impl BreakpointList {
     fn toggle_data_breakpoint(&mut self, id: &str, cx: &mut Context<Self>) {
         if let Some(session) = &self.session {
             session.update(cx, |this, cx| {
-                this.toggle_data_breakpoint(&id, cx);
+                this.toggle_data_breakpoint(id, cx);
             });
         }
     }
@@ -502,7 +502,7 @@ impl BreakpointList {
     fn toggle_exception_breakpoint(&mut self, id: &str, cx: &mut Context<Self>) {
         if let Some(session) = &self.session {
             session.update(cx, |this, cx| {
-                this.toggle_exception_breakpoint(&id, cx);
+                this.toggle_exception_breakpoint(id, cx);
             });
             cx.notify();
             const EXCEPTION_SERIALIZATION_INTERVAL: Duration = Duration::from_secs(1);
diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs
index e6308518e4..42989ddc20 100644
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -697,7 +697,7 @@ impl ConsoleQueryBarCompletionProvider {
         new_bytes: &[u8],
         snapshot: &TextBufferSnapshot,
     ) -> Range<Anchor> {
-        let buffer_offset = buffer_position.to_offset(&snapshot);
+        let buffer_offset = buffer_position.to_offset(snapshot);
         let buffer_bytes = &buffer_text.as_bytes()[0..buffer_offset];
 
         let mut prefix_len = 0;
@@ -977,7 +977,7 @@ mod tests {
             &cx.buffer_text(),
             snapshot.anchor_before(buffer_position),
             replacement.as_bytes(),
-            &snapshot,
+            snapshot,
         );
 
         cx.update_editor(|editor, _, cx| {
diff --git a/crates/debugger_ui/src/session/running/memory_view.rs b/crates/debugger_ui/src/session/running/memory_view.rs
index f936d908b1..a09df6e728 100644
--- a/crates/debugger_ui/src/session/running/memory_view.rs
+++ b/crates/debugger_ui/src/session/running/memory_view.rs
@@ -262,7 +262,7 @@ impl MemoryView {
         cx: &mut Context<Self>,
     ) {
         use parse_int::parse;
-        let Ok(as_address) = parse::<u64>(&memory_reference) else {
+        let Ok(as_address) = parse::<u64>(memory_reference) else {
             return;
         };
         let access_size = evaluate_name
@@ -931,7 +931,7 @@ impl Render for MemoryView {
                 v_flex()
                     .size_full()
                     .on_drag_move(cx.listener(|this, evt, _, _| {
-                        this.handle_memory_drag(&evt);
+                        this.handle_memory_drag(evt);
                     }))
                     .child(self.render_memory(cx).size_full())
                     .children(self.open_context_menu.as_ref().map(|(menu, position, _)| {
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index efbc72e8cf..b54ee29e15 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -1289,7 +1289,7 @@ impl VariableList {
                             }),
                         )
                         .child(self.render_variable_value(
-                            &entry,
+                            entry,
                             &variable_color,
                             watcher.value.to_string(),
                             cx,
@@ -1494,7 +1494,7 @@ impl VariableList {
                             }),
                         )
                         .child(self.render_variable_value(
-                            &variable,
+                            variable,
                             &variable_color,
                             dap.value.clone(),
                             cx,
diff --git a/crates/debugger_ui/src/tests/attach_modal.rs b/crates/debugger_ui/src/tests/attach_modal.rs
index 906a7a0d4b..80e2b73d5a 100644
--- a/crates/debugger_ui/src/tests/attach_modal.rs
+++ b/crates/debugger_ui/src/tests/attach_modal.rs
@@ -139,7 +139,7 @@ async fn test_show_attach_modal_and_select_process(
     workspace
         .update(cx, |_, window, cx| {
             let names =
-                attach_modal.update(cx, |modal, cx| attach_modal::_process_names(&modal, cx));
+                attach_modal.update(cx, |modal, cx| attach_modal::_process_names(modal, cx));
             // Initially all processes are visible.
             assert_eq!(3, names.len());
             attach_modal.update(cx, |this, cx| {
@@ -154,7 +154,7 @@ async fn test_show_attach_modal_and_select_process(
     workspace
         .update(cx, |_, _, cx| {
             let names =
-                attach_modal.update(cx, |modal, cx| attach_modal::_process_names(&modal, cx));
+                attach_modal.update(cx, |modal, cx| attach_modal::_process_names(modal, cx));
             // Initially all processes are visible.
             assert_eq!(2, names.len());
         })
diff --git a/crates/debugger_ui/src/tests/new_process_modal.rs b/crates/debugger_ui/src/tests/new_process_modal.rs
index d6b0dfa004..5ac6af389d 100644
--- a/crates/debugger_ui/src/tests/new_process_modal.rs
+++ b/crates/debugger_ui/src/tests/new_process_modal.rs
@@ -107,7 +107,7 @@ async fn test_debug_session_substitutes_variables_and_relativizes_paths(
 
                         let expected_other_field = if input_path.contains("$ZED_WORKTREE_ROOT") {
                             input_path
-                                .replace("$ZED_WORKTREE_ROOT", &path!("/test/worktree/path"))
+                                .replace("$ZED_WORKTREE_ROOT", path!("/test/worktree/path"))
                                 .to_owned()
                         } else {
                             input_path.to_string()
diff --git a/crates/diagnostics/src/diagnostic_renderer.rs b/crates/diagnostics/src/diagnostic_renderer.rs
index ce7b253702..cb1c052925 100644
--- a/crates/diagnostics/src/diagnostic_renderer.rs
+++ b/crates/diagnostics/src/diagnostic_renderer.rs
@@ -46,7 +46,7 @@ impl DiagnosticRenderer {
                     markdown.push_str(" (");
                 }
                 if let Some(source) = diagnostic.source.as_ref() {
-                    markdown.push_str(&Markdown::escape(&source));
+                    markdown.push_str(&Markdown::escape(source));
                 }
                 if diagnostic.source.is_some() && diagnostic.code.is_some() {
                     markdown.push(' ');
@@ -306,7 +306,7 @@ impl DiagnosticBlock {
         cx: &mut Context<Editor>,
     ) {
         let snapshot = &editor.buffer().read(cx).snapshot(cx);
-        let range = range.start.to_offset(&snapshot)..range.end.to_offset(&snapshot);
+        let range = range.start.to_offset(snapshot)..range.end.to_offset(snapshot);
 
         editor.unfold_ranges(&[range.start..range.end], true, false, cx);
         editor.change_selections(Default::default(), window, cx, |s| {
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index e7660920da..23dbf33322 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -528,7 +528,7 @@ impl ProjectDiagnosticsEditor {
             lsp::DiagnosticSeverity::ERROR
         };
 
-        cx.spawn_in(window, async move |this, mut cx| {
+        cx.spawn_in(window, async move |this, cx| {
             let diagnostics = buffer_snapshot
                 .diagnostics_in_range::<_, text::Anchor>(
                     Point::zero()..buffer_snapshot.max_point(),
@@ -595,7 +595,7 @@ impl ProjectDiagnosticsEditor {
                     b.initial_range.clone(),
                     DEFAULT_MULTIBUFFER_CONTEXT,
                     buffer_snapshot.clone(),
-                    &mut cx,
+                    cx,
                 )
                 .await;
                 let i = excerpt_ranges
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index 17804b4281..29011352fb 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -129,7 +129,7 @@ fn handle_frontmatter(book: &mut Book, errors: &mut HashSet<PreprocessorError>)
                 let Some((name, value)) = line.split_once(':') else {
                     errors.insert(PreprocessorError::InvalidFrontmatterLine(format!(
                         "{}: {}",
-                        chapter_breadcrumbs(&chapter),
+                        chapter_breadcrumbs(chapter),
                         line
                     )));
                     continue;
@@ -402,11 +402,11 @@ fn handle_postprocessing() -> Result<()> {
         path: &'a std::path::PathBuf,
         root: &'a std::path::PathBuf,
     ) -> &'a std::path::Path {
-        &path.strip_prefix(&root).unwrap_or(&path)
+        path.strip_prefix(&root).unwrap_or(path)
     }
     fn extract_title_from_page(contents: &str, pretty_path: &std::path::Path) -> String {
         let title_tag_contents = &title_regex()
-            .captures(&contents)
+            .captures(contents)
             .with_context(|| format!("Failed to find title in {:?}", pretty_path))
             .expect("Page has <title> element")[1];
         let title = title_tag_contents
diff --git a/crates/editor/src/clangd_ext.rs b/crates/editor/src/clangd_ext.rs
index 3239fdc653..07be9ea9e9 100644
--- a/crates/editor/src/clangd_ext.rs
+++ b/crates/editor/src/clangd_ext.rs
@@ -104,6 +104,6 @@ pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &
         .filter_map(|buffer| buffer.read(cx).language())
         .any(|language| is_c_language(language))
     {
-        register_action(&editor, window, switch_source_header);
+        register_action(editor, window, switch_source_header);
     }
 }
diff --git a/crates/editor/src/code_completion_tests.rs b/crates/editor/src/code_completion_tests.rs
index fd8db29584..a1d9f04a9c 100644
--- a/crates/editor/src/code_completion_tests.rs
+++ b/crates/editor/src/code_completion_tests.rs
@@ -317,7 +317,7 @@ async fn filter_and_sort_matches(
     let candidates: Arc<[StringMatchCandidate]> = completions
         .iter()
         .enumerate()
-        .map(|(id, completion)| StringMatchCandidate::new(id, &completion.label.filter_text()))
+        .map(|(id, completion)| StringMatchCandidate::new(id, completion.label.filter_text()))
         .collect();
     let cancel_flag = Arc::new(AtomicBool::new(false));
     let background_executor = cx.executor();
@@ -331,5 +331,5 @@ async fn filter_and_sort_matches(
         background_executor,
     )
     .await;
-    CompletionsMenu::sort_string_matches(matches, Some(query), snippet_sort_order, &completions)
+    CompletionsMenu::sort_string_matches(matches, Some(query), snippet_sort_order, completions)
 }
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 4ae2a14ca7..24d2cfddcb 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -321,7 +321,7 @@ impl CompletionsMenu {
         let match_candidates = choices
             .iter()
             .enumerate()
-            .map(|(id, completion)| StringMatchCandidate::new(id, &completion))
+            .map(|(id, completion)| StringMatchCandidate::new(id, completion))
             .collect();
         let entries = choices
             .iter()
diff --git a/crates/editor/src/display_map/custom_highlights.rs b/crates/editor/src/display_map/custom_highlights.rs
index ae69e9cf8c..f3737ea4b7 100644
--- a/crates/editor/src/display_map/custom_highlights.rs
+++ b/crates/editor/src/display_map/custom_highlights.rs
@@ -77,7 +77,7 @@ fn create_highlight_endpoints(
             let ranges = &text_highlights.1;
 
             let start_ix = match ranges.binary_search_by(|probe| {
-                let cmp = probe.end.cmp(&start, &buffer);
+                let cmp = probe.end.cmp(&start, buffer);
                 if cmp.is_gt() {
                     cmp::Ordering::Greater
                 } else {
@@ -88,18 +88,18 @@ fn create_highlight_endpoints(
             };
 
             for range in &ranges[start_ix..] {
-                if range.start.cmp(&end, &buffer).is_ge() {
+                if range.start.cmp(&end, buffer).is_ge() {
                     break;
                 }
 
                 highlight_endpoints.push(HighlightEndpoint {
-                    offset: range.start.to_offset(&buffer),
+                    offset: range.start.to_offset(buffer),
                     is_start: true,
                     tag,
                     style,
                 });
                 highlight_endpoints.push(HighlightEndpoint {
-                    offset: range.end.to_offset(&buffer),
+                    offset: range.end.to_offset(buffer),
                     is_start: false,
                     tag,
                     style,
diff --git a/crates/editor/src/display_map/invisibles.rs b/crates/editor/src/display_map/invisibles.rs
index 199986f2a4..19e4c2b42a 100644
--- a/crates/editor/src/display_map/invisibles.rs
+++ b/crates/editor/src/display_map/invisibles.rs
@@ -36,8 +36,8 @@ pub fn is_invisible(c: char) -> bool {
     } else if c >= '\u{7f}' {
         c <= '\u{9f}'
             || (c.is_whitespace() && c != IDEOGRAPHIC_SPACE)
-            || contains(c, &FORMAT)
-            || contains(c, &OTHER)
+            || contains(c, FORMAT)
+            || contains(c, OTHER)
     } else {
         false
     }
@@ -50,7 +50,7 @@ pub fn replacement(c: char) -> Option<&'static str> {
         Some(C0_SYMBOLS[c as usize])
     } else if c == '\x7f' {
         Some(DEL)
-    } else if contains(c, &PRESERVE) {
+    } else if contains(c, PRESERVE) {
         None
     } else {
         Some("\u{2007}") // fixed width space
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
index caa4882a6e..0d2d1c4a4c 100644
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -1461,7 +1461,7 @@ mod tests {
                 }
 
                 let mut prev_ix = 0;
-                for boundary in line_wrapper.wrap_line(&[LineFragment::text(&line)], wrap_width) {
+                for boundary in line_wrapper.wrap_line(&[LineFragment::text(line)], wrap_width) {
                     wrapped_text.push_str(&line[prev_ix..boundary.ix]);
                     wrapped_text.push('\n');
                     wrapped_text.push_str(&" ".repeat(boundary.next_indent as usize));
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index e645bfee67..6edd4e9d8c 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2379,7 +2379,7 @@ impl Editor {
                 pending_selection
                     .selection
                     .range()
-                    .includes(&range, &snapshot)
+                    .includes(range, &snapshot)
             })
         {
             return true;
@@ -3342,9 +3342,9 @@ impl Editor {
 
             let old_cursor_position = &state.old_cursor_position;
 
-            self.selections_did_change(true, &old_cursor_position, state.effects, window, cx);
+            self.selections_did_change(true, old_cursor_position, state.effects, window, cx);
 
-            if self.should_open_signature_help_automatically(&old_cursor_position, cx) {
+            if self.should_open_signature_help_automatically(old_cursor_position, cx) {
                 self.show_signature_help(&ShowSignatureHelp, window, cx);
             }
         }
@@ -3764,9 +3764,9 @@ impl Editor {
             ColumnarSelectionState::FromMouse {
                 selection_tail,
                 display_point,
-            } => display_point.unwrap_or_else(|| selection_tail.to_display_point(&display_map)),
+            } => display_point.unwrap_or_else(|| selection_tail.to_display_point(display_map)),
             ColumnarSelectionState::FromSelection { selection_tail } => {
-                selection_tail.to_display_point(&display_map)
+                selection_tail.to_display_point(display_map)
             }
         };
 
@@ -6082,7 +6082,7 @@ impl Editor {
                 if let Some(tasks) = &tasks {
                     if let Some(project) = project {
                         task_context_task =
-                            Self::build_tasks_context(&project, &buffer, buffer_row, &tasks, cx);
+                            Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx);
                     }
                 }
 
@@ -6864,7 +6864,7 @@ impl Editor {
                 for (buffer_snapshot, search_range, excerpt_id) in buffer_ranges {
                     match_ranges.extend(
                         regex
-                            .search(&buffer_snapshot, Some(search_range.clone()))
+                            .search(buffer_snapshot, Some(search_range.clone()))
                             .await
                             .into_iter()
                             .filter_map(|match_range| {
@@ -7206,7 +7206,7 @@ impl Editor {
                 return Some(false);
             }
             let provider = self.edit_prediction_provider()?;
-            if !provider.is_enabled(&buffer, buffer_position, cx) {
+            if !provider.is_enabled(buffer, buffer_position, cx) {
                 return Some(false);
             }
             let buffer = buffer.read(cx);
@@ -7966,7 +7966,7 @@ impl Editor {
                 let multi_buffer_anchor =
                     Anchor::in_buffer(excerpt_id, buffer_snapshot.remote_id(), breakpoint.position);
                 let position = multi_buffer_anchor
-                    .to_point(&multi_buffer_snapshot)
+                    .to_point(multi_buffer_snapshot)
                     .to_display_point(&snapshot);
 
                 breakpoint_display_points.insert(
@@ -8859,7 +8859,7 @@ impl Editor {
         }
 
         let highlighted_edits = if let Some(edit_preview) = edit_preview.as_ref() {
-            crate::edit_prediction_edit_text(&snapshot, edits, edit_preview, false, cx)
+            crate::edit_prediction_edit_text(snapshot, edits, edit_preview, false, cx)
         } else {
             // Fallback for providers without edit_preview
             crate::edit_prediction_fallback_text(edits, cx)
@@ -9222,7 +9222,7 @@ impl Editor {
                             .child(div().px_1p5().child(match &prediction.completion {
                                 EditPrediction::Move { target, snapshot } => {
                                     use text::ToPoint as _;
-                                    if target.text_anchor.to_point(&snapshot).row > cursor_point.row
+                                    if target.text_anchor.to_point(snapshot).row > cursor_point.row
                                     {
                                         Icon::new(IconName::ZedPredictDown)
                                     } else {
@@ -9424,7 +9424,7 @@ impl Editor {
                         .gap_2()
                         .flex_1()
                         .child(
-                            if target.text_anchor.to_point(&snapshot).row > cursor_point.row {
+                            if target.text_anchor.to_point(snapshot).row > cursor_point.row {
                                 Icon::new(IconName::ZedPredictDown)
                             } else {
                                 Icon::new(IconName::ZedPredictUp)
@@ -9440,14 +9440,14 @@ impl Editor {
                 snapshot,
                 display_mode: _,
             } => {
-                let first_edit_row = edits.first()?.0.start.text_anchor.to_point(&snapshot).row;
+                let first_edit_row = edits.first()?.0.start.text_anchor.to_point(snapshot).row;
 
                 let (highlighted_edits, has_more_lines) =
                     if let Some(edit_preview) = edit_preview.as_ref() {
-                        crate::edit_prediction_edit_text(&snapshot, &edits, edit_preview, true, cx)
+                        crate::edit_prediction_edit_text(snapshot, edits, edit_preview, true, cx)
                             .first_line_preview()
                     } else {
-                        crate::edit_prediction_fallback_text(&edits, cx).first_line_preview()
+                        crate::edit_prediction_fallback_text(edits, cx).first_line_preview()
                     };
 
                 let styled_text = gpui::StyledText::new(highlighted_edits.text)
@@ -9770,7 +9770,7 @@ impl Editor {
 
                 if let Some(choices) = &snippet.choices[snippet.active_index] {
                     if let Some(selection) = current_ranges.first() {
-                        self.show_snippet_choices(&choices, selection.clone(), cx);
+                        self.show_snippet_choices(choices, selection.clone(), cx);
                     }
                 }
 
@@ -12284,7 +12284,7 @@ impl Editor {
             let trigger_in_words =
                 this.show_edit_predictions_in_menu() || !had_active_edit_prediction;
 
-            this.trigger_completion_on_input(&text, trigger_in_words, window, cx);
+            this.trigger_completion_on_input(text, trigger_in_words, window, cx);
         });
     }
 
@@ -17896,7 +17896,7 @@ impl Editor {
         ranges: &[Range<Anchor>],
         snapshot: &MultiBufferSnapshot,
     ) -> bool {
-        let mut hunks = self.diff_hunks_in_ranges(ranges, &snapshot);
+        let mut hunks = self.diff_hunks_in_ranges(ranges, snapshot);
         hunks.any(|hunk| hunk.status().has_secondary_hunk())
     }
 
@@ -19042,8 +19042,8 @@ impl Editor {
                 buffer_ranges.last()
             }?;
 
-            let selection = text::ToPoint::to_point(&range.start, &buffer).row
-                ..text::ToPoint::to_point(&range.end, &buffer).row;
+            let selection = text::ToPoint::to_point(&range.start, buffer).row
+                ..text::ToPoint::to_point(&range.end, buffer).row;
             Some((
                 multi_buffer.buffer(buffer.remote_id()).unwrap().clone(),
                 selection,
@@ -20055,8 +20055,7 @@ impl Editor {
                             self.registered_buffers
                                 .entry(edited_buffer.read(cx).remote_id())
                                 .or_insert_with(|| {
-                                    project
-                                        .register_buffer_with_language_servers(&edited_buffer, cx)
+                                    project.register_buffer_with_language_servers(edited_buffer, cx)
                                 });
                         });
                     }
@@ -21079,7 +21078,7 @@ impl Editor {
                     };
                     if let Some((workspace, path)) = workspace.as_ref().zip(path) {
                         let Some(task) = cx
-                            .update_window_entity(&workspace, |workspace, window, cx| {
+                            .update_window_entity(workspace, |workspace, window, cx| {
                                 workspace
                                     .open_path_preview(path, None, false, false, false, window, cx)
                             })
@@ -21303,14 +21302,14 @@ fn process_completion_for_edit(
             debug_assert!(
                 insert_range
                     .start
-                    .cmp(&cursor_position, &buffer_snapshot)
+                    .cmp(cursor_position, &buffer_snapshot)
                     .is_le(),
                 "insert_range should start before or at cursor position"
             );
             debug_assert!(
                 replace_range
                     .start
-                    .cmp(&cursor_position, &buffer_snapshot)
+                    .cmp(cursor_position, &buffer_snapshot)
                     .is_le(),
                 "replace_range should start before or at cursor position"
             );
@@ -21344,7 +21343,7 @@ fn process_completion_for_edit(
                         LspInsertMode::ReplaceSuffix => {
                             if replace_range
                                 .end
-                                .cmp(&cursor_position, &buffer_snapshot)
+                                .cmp(cursor_position, &buffer_snapshot)
                                 .is_gt()
                             {
                                 let range_after_cursor = *cursor_position..replace_range.end;
@@ -21380,7 +21379,7 @@ fn process_completion_for_edit(
 
     if range_to_replace
         .end
-        .cmp(&cursor_position, &buffer_snapshot)
+        .cmp(cursor_position, &buffer_snapshot)
         .is_lt()
     {
         range_to_replace.end = *cursor_position;
@@ -21388,7 +21387,7 @@ fn process_completion_for_edit(
 
     CompletionEdit {
         new_text,
-        replace_range: range_to_replace.to_offset(&buffer),
+        replace_range: range_to_replace.to_offset(buffer),
         snippet,
     }
 }
@@ -22137,7 +22136,7 @@ fn snippet_completions(
                     snippet
                         .prefix
                         .iter()
-                        .map(move |prefix| StringMatchCandidate::new(ix, &prefix))
+                        .map(move |prefix| StringMatchCandidate::new(ix, prefix))
                 })
                 .collect::<Vec<StringMatchCandidate>>();
 
@@ -22366,10 +22365,10 @@ impl SemanticsProvider for Entity<Project> {
         cx: &mut App,
     ) -> Option<Task<Result<Vec<LocationLink>>>> {
         Some(self.update(cx, |project, cx| match kind {
-            GotoDefinitionKind::Symbol => project.definitions(&buffer, position, cx),
-            GotoDefinitionKind::Declaration => project.declarations(&buffer, position, cx),
-            GotoDefinitionKind::Type => project.type_definitions(&buffer, position, cx),
-            GotoDefinitionKind::Implementation => project.implementations(&buffer, position, cx),
+            GotoDefinitionKind::Symbol => project.definitions(buffer, position, cx),
+            GotoDefinitionKind::Declaration => project.declarations(buffer, position, cx),
+            GotoDefinitionKind::Type => project.type_definitions(buffer, position, cx),
+            GotoDefinitionKind::Implementation => project.implementations(buffer, position, cx),
         }))
     }
 
@@ -23778,7 +23777,7 @@ fn all_edits_insertions_or_deletions(
     let mut all_deletions = true;
 
     for (range, new_text) in edits.iter() {
-        let range_is_empty = range.to_offset(&snapshot).is_empty();
+        let range_is_empty = range.to_offset(snapshot).is_empty();
         let text_is_empty = new_text.is_empty();
 
         if range_is_empty != text_is_empty {
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index f97dcd712c..189bdd1bf7 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8393,7 +8393,7 @@ async fn test_autoindent_disabled_with_nested_language(cx: &mut TestAppContext)
         buffer.set_language(Some(language), cx);
     });
 
-    cx.set_state(&r#"struct A {ˇ}"#);
+    cx.set_state(r#"struct A {ˇ}"#);
 
     cx.update_editor(|editor, window, cx| {
         editor.newline(&Default::default(), window, cx);
@@ -8405,7 +8405,7 @@ async fn test_autoindent_disabled_with_nested_language(cx: &mut TestAppContext)
         }"
     ));
 
-    cx.set_state(&r#"select_biased!(ˇ)"#);
+    cx.set_state(r#"select_biased!(ˇ)"#);
 
     cx.update_editor(|editor, window, cx| {
         editor.newline(&Default::default(), window, cx);
@@ -12319,7 +12319,7 @@ async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext)
     let counter = Arc::new(AtomicUsize::new(0));
     handle_completion_request_with_insert_and_replace(
         &mut cx,
-        &buffer_marked_text,
+        buffer_marked_text,
         vec![(completion_text, completion_text)],
         counter.clone(),
     )
@@ -12333,7 +12333,7 @@ async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext)
             .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
             .unwrap()
     });
-    cx.assert_editor_state(&expected_with_replace_mode);
+    cx.assert_editor_state(expected_with_replace_mode);
     handle_resolve_completion_request(&mut cx, None).await;
     apply_additional_edits.await.unwrap();
 
@@ -12353,7 +12353,7 @@ async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext)
     });
     handle_completion_request_with_insert_and_replace(
         &mut cx,
-        &buffer_marked_text,
+        buffer_marked_text,
         vec![(completion_text, completion_text)],
         counter.clone(),
     )
@@ -12367,7 +12367,7 @@ async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext)
             .confirm_completion_insert(&ConfirmCompletionInsert, window, cx)
             .unwrap()
     });
-    cx.assert_editor_state(&expected_with_insert_mode);
+    cx.assert_editor_state(expected_with_insert_mode);
     handle_resolve_completion_request(&mut cx, None).await;
     apply_additional_edits.await.unwrap();
 }
@@ -13141,7 +13141,7 @@ async fn test_word_completion(cx: &mut TestAppContext) {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
             assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(menu),
                 &["first", "last"],
                 "When LSP server is fast to reply, no fallback word completions are used"
             );
@@ -13164,7 +13164,7 @@ async fn test_word_completion(cx: &mut TestAppContext) {
     cx.update_editor(|editor, _, _| {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
-            assert_eq!(completion_menu_entries(&menu), &["one", "three", "two"],
+            assert_eq!(completion_menu_entries(menu), &["one", "three", "two"],
                 "When LSP server is slow, document words can be shown instead, if configured accordingly");
         } else {
             panic!("expected completion menu to be open");
@@ -13225,7 +13225,7 @@ async fn test_word_completions_do_not_duplicate_lsp_ones(cx: &mut TestAppContext
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
             assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(menu),
                 &["first", "last", "second"],
                 "Word completions that has the same edit as the any of the LSP ones, should not be proposed"
             );
@@ -13281,7 +13281,7 @@ async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
             assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(menu),
                 &["first", "last", "second"],
                 "`ShowWordCompletions` action should show word completions"
             );
@@ -13298,7 +13298,7 @@ async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
             assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(menu),
                 &["last"],
                 "After showing word completions, further editing should filter them and not query the LSP"
             );
@@ -13337,7 +13337,7 @@ async fn test_word_completions_usually_skip_digits(cx: &mut TestAppContext) {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
             assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(menu),
                 &["let"],
                 "With no digits in the completion query, no digits should be in the word completions"
             );
@@ -13362,7 +13362,7 @@ async fn test_word_completions_usually_skip_digits(cx: &mut TestAppContext) {
     cx.update_editor(|editor, _, _| {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
-            assert_eq!(completion_menu_entries(&menu), &["33", "35f32"], "The digit is in the completion query, \
+            assert_eq!(completion_menu_entries(menu), &["33", "35f32"], "The digit is in the completion query, \
                 return matching words with digits (`33`, `35f32`) but exclude query duplicates (`3`)");
         } else {
             panic!("expected completion menu to be open");
@@ -13599,7 +13599,7 @@ async fn test_completion_page_up_down_keys(cx: &mut TestAppContext) {
     cx.update_editor(|editor, _, _| {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
-            assert_eq!(completion_menu_entries(&menu), &["first", "last"]);
+            assert_eq!(completion_menu_entries(menu), &["first", "last"]);
         } else {
             panic!("expected completion menu to be open");
         }
@@ -16702,7 +16702,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut TestA
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
             assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(menu),
                 &["bg-blue", "bg-red", "bg-yellow"]
             );
         } else {
@@ -16715,7 +16715,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut TestA
     cx.update_editor(|editor, _, _| {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
-            assert_eq!(completion_menu_entries(&menu), &["bg-blue", "bg-yellow"]);
+            assert_eq!(completion_menu_entries(menu), &["bg-blue", "bg-yellow"]);
         } else {
             panic!("expected completion menu to be open");
         }
@@ -16729,7 +16729,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut TestA
     cx.update_editor(|editor, _, _| {
         if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
         {
-            assert_eq!(completion_menu_entries(&menu), &["bg-yellow"]);
+            assert_eq!(completion_menu_entries(menu), &["bg-yellow"]);
         } else {
             panic!("expected completion menu to be open");
         }
@@ -17298,7 +17298,7 @@ async fn test_multibuffer_reverts(cx: &mut TestAppContext) {
             (buffer_2.clone(), base_text_2),
             (buffer_3.clone(), base_text_3),
         ] {
-            let diff = cx.new(|cx| BufferDiff::new_with_base_text(&diff_base, &buffer, cx));
+            let diff = cx.new(|cx| BufferDiff::new_with_base_text(diff_base, &buffer, cx));
             editor
                 .buffer
                 .update(cx, |buffer, cx| buffer.add_diff(diff, cx));
@@ -17919,7 +17919,7 @@ async fn test_toggle_diff_expand_in_multi_buffer(cx: &mut TestAppContext) {
                 (buffer_2.clone(), file_2_old),
                 (buffer_3.clone(), file_3_old),
             ] {
-                let diff = cx.new(|cx| BufferDiff::new_with_base_text(&diff_base, &buffer, cx));
+                let diff = cx.new(|cx| BufferDiff::new_with_base_text(diff_base, &buffer, cx));
                 editor
                     .buffer
                     .update(cx, |buffer, cx| buffer.add_diff(diff, cx));
@@ -21024,7 +21024,7 @@ async fn assert_highlighted_edits(
 
     cx.update(|_window, cx| {
         let highlighted_edits = edit_prediction_edit_text(
-            &snapshot.as_singleton().unwrap().2,
+            snapshot.as_singleton().unwrap().2,
             &edits,
             &edit_preview,
             include_deletions,
@@ -21091,7 +21091,7 @@ fn add_log_breakpoint_at_cursor(
                 .buffer_snapshot
                 .anchor_before(Point::new(cursor_position.row, 0));
 
-            (breakpoint_position, Breakpoint::new_log(&log_message))
+            (breakpoint_position, Breakpoint::new_log(log_message))
         });
 
     editor.edit_breakpoint_at_anchor(
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index e56ac45fab..927a207358 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1162,7 +1162,7 @@ impl EditorElement {
                 .map_or(false, |state| state.keyboard_grace);
 
             if mouse_over_inline_blame || mouse_over_popover {
-                editor.show_blame_popover(&blame_entry, event.position, false, cx);
+                editor.show_blame_popover(blame_entry, event.position, false, cx);
             } else if !keyboard_grace {
                 editor.hide_blame_popover(cx);
             }
@@ -2818,7 +2818,7 @@ impl EditorElement {
                     }
 
                     let row =
-                        MultiBufferRow(DisplayPoint::new(display_row, 0).to_point(&snapshot).row);
+                        MultiBufferRow(DisplayPoint::new(display_row, 0).to_point(snapshot).row);
                     if snapshot.is_line_folded(row) {
                         return None;
                     }
@@ -3312,7 +3312,7 @@ impl EditorElement {
             let chunks = snapshot.highlighted_chunks(rows.clone(), true, style);
             LineWithInvisibles::from_chunks(
                 chunks,
-                &style,
+                style,
                 MAX_LINE_LEN,
                 rows.len(),
                 &snapshot.mode,
@@ -3393,7 +3393,7 @@ impl EditorElement {
                 let line_ix = align_to.row().0.checked_sub(rows.start.0);
                 x_position =
                     if let Some(layout) = line_ix.and_then(|ix| line_layouts.get(ix as usize)) {
-                        x_and_width(&layout)
+                        x_and_width(layout)
                     } else {
                         x_and_width(&layout_line(
                             align_to.row(),
@@ -5549,9 +5549,9 @@ impl EditorElement {
             // In singleton buffers, we select corresponding lines on the line number click, so use | -like cursor.
             // In multi buffers, we open file at the line number clicked, so use a pointing hand cursor.
             if is_singleton {
-                window.set_cursor_style(CursorStyle::IBeam, &hitbox);
+                window.set_cursor_style(CursorStyle::IBeam, hitbox);
             } else {
-                window.set_cursor_style(CursorStyle::PointingHand, &hitbox);
+                window.set_cursor_style(CursorStyle::PointingHand, hitbox);
             }
         }
     }
@@ -5570,7 +5570,7 @@ impl EditorElement {
                             &layout.position_map.snapshot,
                             line_height,
                             layout.gutter_hitbox.bounds,
-                            &hunk,
+                            hunk,
                         );
                         Some((
                             hunk_bounds,
@@ -6092,10 +6092,10 @@ impl EditorElement {
 
                     if axis == ScrollbarAxis::Vertical {
                         let fast_markers =
-                            self.collect_fast_scrollbar_markers(layout, &scrollbar_layout, cx);
+                            self.collect_fast_scrollbar_markers(layout, scrollbar_layout, cx);
                         // Refresh slow scrollbar markers in the background. Below, we
                         // paint whatever markers have already been computed.
-                        self.refresh_slow_scrollbar_markers(layout, &scrollbar_layout, window, cx);
+                        self.refresh_slow_scrollbar_markers(layout, scrollbar_layout, window, cx);
 
                         let markers = self.editor.read(cx).scrollbar_marker_state.markers.clone();
                         for marker in markers.iter().chain(&fast_markers) {
@@ -6129,7 +6129,7 @@ impl EditorElement {
                         if any_scrollbar_dragged {
                             window.set_window_cursor_style(CursorStyle::Arrow);
                         } else {
-                            window.set_cursor_style(CursorStyle::Arrow, &hitbox);
+                            window.set_cursor_style(CursorStyle::Arrow, hitbox);
                         }
                     }
                 })
@@ -9782,7 +9782,7 @@ pub fn layout_line(
     let chunks = snapshot.highlighted_chunks(row..row + DisplayRow(1), true, style);
     LineWithInvisibles::from_chunks(
         chunks,
-        &style,
+        style,
         MAX_LINE_LEN,
         1,
         &snapshot.mode,
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 02f93e6829..8b6e2cea84 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -794,7 +794,7 @@ pub(crate) async fn find_file(
     ) -> Option<ResolvedPath> {
         project
             .update(cx, |project, cx| {
-                project.resolve_path_in_buffer(&candidate_file_path, buffer, cx)
+                project.resolve_path_in_buffer(candidate_file_path, buffer, cx)
             })
             .ok()?
             .await
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 34533002ff..22430ab5e1 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -524,8 +524,8 @@ fn serialize_selection(
 ) -> proto::Selection {
     proto::Selection {
         id: selection.id as u64,
-        start: Some(serialize_anchor(&selection.start, &buffer)),
-        end: Some(serialize_anchor(&selection.end, &buffer)),
+        start: Some(serialize_anchor(&selection.start, buffer)),
+        end: Some(serialize_anchor(&selection.end, buffer)),
         reversed: selection.reversed,
     }
 }
@@ -1010,7 +1010,7 @@ impl Item for Editor {
         self.workspace = Some((workspace.weak_handle(), workspace.database_id()));
         if let Some(workspace) = &workspace.weak_handle().upgrade() {
             cx.subscribe(
-                &workspace,
+                workspace,
                 |editor, _, event: &workspace::Event, _cx| match event {
                     workspace::Event::ModalOpened => {
                         editor.mouse_context_menu.take();
@@ -1296,7 +1296,7 @@ impl SerializableItem for Editor {
             project
                 .read(cx)
                 .worktree_for_id(worktree_id, cx)
-                .and_then(|worktree| worktree.read(cx).absolutize(&file.path()).ok())
+                .and_then(|worktree| worktree.read(cx).absolutize(file.path()).ok())
                 .or_else(|| {
                     let full_path = file.full_path(cx);
                     let project_path = project.read(cx).find_project_path(&full_path, cx)?;
@@ -1385,14 +1385,14 @@ impl ProjectItem for Editor {
                     })
                 {
                     editor.fold_ranges(
-                        clip_ranges(&restoration_data.folds, &snapshot),
+                        clip_ranges(&restoration_data.folds, snapshot),
                         false,
                         window,
                         cx,
                     );
                     if !restoration_data.selections.is_empty() {
                         editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.select_ranges(clip_ranges(&restoration_data.selections, &snapshot));
+                            s.select_ranges(clip_ranges(&restoration_data.selections, snapshot));
                         });
                     }
                     let (top_row, offset) = restoration_data.scroll_position;
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
index 95a7925839..f358ab7b93 100644
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -37,7 +37,7 @@ pub(crate) fn should_auto_close(
         let text = buffer
             .text_for_range(edited_range.clone())
             .collect::<String>();
-        let edited_range = edited_range.to_offset(&buffer);
+        let edited_range = edited_range.to_offset(buffer);
         if !text.ends_with(">") {
             continue;
         }
diff --git a/crates/editor/src/lsp_colors.rs b/crates/editor/src/lsp_colors.rs
index 08cf9078f2..29eb9f249a 100644
--- a/crates/editor/src/lsp_colors.rs
+++ b/crates/editor/src/lsp_colors.rs
@@ -207,7 +207,7 @@ impl Editor {
                             .entry(buffer_snapshot.remote_id())
                             .or_insert_with(Vec::new);
                         let excerpt_point_range =
-                            excerpt_range.context.to_point_utf16(&buffer_snapshot);
+                            excerpt_range.context.to_point_utf16(buffer_snapshot);
                         excerpt_data.push((
                             excerpt_id,
                             buffer_snapshot.clone(),
diff --git a/crates/editor/src/lsp_ext.rs b/crates/editor/src/lsp_ext.rs
index 6161afbbc0..d02fc0f901 100644
--- a/crates/editor/src/lsp_ext.rs
+++ b/crates/editor/src/lsp_ext.rs
@@ -76,7 +76,7 @@ async fn lsp_task_context(
 
     let project_env = project
         .update(cx, |project, cx| {
-            project.buffer_environment(&buffer, &worktree_store, cx)
+            project.buffer_environment(buffer, &worktree_store, cx)
         })
         .ok()?
         .await;
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
index 9d5145dec1..7f9eb374e8 100644
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -102,11 +102,11 @@ impl MouseContextMenu {
                 let display_snapshot = &editor
                     .display_map
                     .update(cx, |display_map, cx| display_map.snapshot(cx));
-                let selection_init_range = selection_init.display_range(&display_snapshot);
+                let selection_init_range = selection_init.display_range(display_snapshot);
                 let selection_now_range = editor
                     .selections
                     .newest_anchor()
-                    .display_range(&display_snapshot);
+                    .display_range(display_snapshot);
                 if selection_now_range == selection_init_range {
                     return;
                 }
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index fdda0e82bc..0bf875095b 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -439,17 +439,17 @@ pub fn start_of_excerpt(
     };
     match direction {
         Direction::Prev => {
-            let mut start = excerpt.start_anchor().to_display_point(&map);
+            let mut start = excerpt.start_anchor().to_display_point(map);
             if start >= display_point && start.row() > DisplayRow(0) {
                 let Some(excerpt) = map.buffer_snapshot.excerpt_before(excerpt.id()) else {
                     return display_point;
                 };
-                start = excerpt.start_anchor().to_display_point(&map);
+                start = excerpt.start_anchor().to_display_point(map);
             }
             start
         }
         Direction::Next => {
-            let mut end = excerpt.end_anchor().to_display_point(&map);
+            let mut end = excerpt.end_anchor().to_display_point(map);
             *end.row_mut() += 1;
             map.clip_point(end, Bias::Right)
         }
@@ -467,7 +467,7 @@ pub fn end_of_excerpt(
     };
     match direction {
         Direction::Prev => {
-            let mut start = excerpt.start_anchor().to_display_point(&map);
+            let mut start = excerpt.start_anchor().to_display_point(map);
             if start.row() > DisplayRow(0) {
                 *start.row_mut() -= 1;
             }
@@ -476,7 +476,7 @@ pub fn end_of_excerpt(
             start
         }
         Direction::Next => {
-            let mut end = excerpt.end_anchor().to_display_point(&map);
+            let mut end = excerpt.end_anchor().to_display_point(map);
             *end.column_mut() = 0;
             if end <= display_point {
                 *end.row_mut() += 1;
@@ -485,7 +485,7 @@ pub fn end_of_excerpt(
                 else {
                     return display_point;
                 };
-                end = excerpt.end_anchor().to_display_point(&map);
+                end = excerpt.end_anchor().to_display_point(map);
                 *end.column_mut() = 0;
             }
             end
diff --git a/crates/editor/src/proposed_changes_editor.rs b/crates/editor/src/proposed_changes_editor.rs
index 1ead45b3de..e549f64758 100644
--- a/crates/editor/src/proposed_changes_editor.rs
+++ b/crates/editor/src/proposed_changes_editor.rs
@@ -478,7 +478,7 @@ impl SemanticsProvider for BranchBufferSemanticsProvider {
     }
 
     fn supports_inlay_hints(&self, buffer: &Entity<Buffer>, cx: &mut App) -> bool {
-        if let Some(buffer) = self.to_base(&buffer, &[], cx) {
+        if let Some(buffer) = self.to_base(buffer, &[], cx) {
             self.0.supports_inlay_hints(&buffer, cx)
         } else {
             false
@@ -491,7 +491,7 @@ impl SemanticsProvider for BranchBufferSemanticsProvider {
         position: text::Anchor,
         cx: &mut App,
     ) -> Option<Task<anyhow::Result<Vec<project::DocumentHighlight>>>> {
-        let buffer = self.to_base(&buffer, &[position], cx)?;
+        let buffer = self.to_base(buffer, &[position], cx)?;
         self.0.document_highlights(&buffer, position, cx)
     }
 
@@ -502,7 +502,7 @@ impl SemanticsProvider for BranchBufferSemanticsProvider {
         kind: crate::GotoDefinitionKind,
         cx: &mut App,
     ) -> Option<Task<anyhow::Result<Vec<project::LocationLink>>>> {
-        let buffer = self.to_base(&buffer, &[position], cx)?;
+        let buffer = self.to_base(buffer, &[position], cx)?;
         self.0.definitions(&buffer, position, kind, cx)
     }
 
diff --git a/crates/editor/src/rust_analyzer_ext.rs b/crates/editor/src/rust_analyzer_ext.rs
index 2b8150de67..bee9464124 100644
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@@ -35,12 +35,12 @@ pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &
         .filter_map(|buffer| buffer.read(cx).language())
         .any(|language| is_rust_language(language))
     {
-        register_action(&editor, window, go_to_parent_module);
-        register_action(&editor, window, expand_macro_recursively);
-        register_action(&editor, window, open_docs);
-        register_action(&editor, window, cancel_flycheck_action);
-        register_action(&editor, window, run_flycheck_action);
-        register_action(&editor, window, clear_flycheck_action);
+        register_action(editor, window, go_to_parent_module);
+        register_action(editor, window, expand_macro_recursively);
+        register_action(editor, window, open_docs);
+        register_action(editor, window, cancel_flycheck_action);
+        register_action(editor, window, run_flycheck_action);
+        register_action(editor, window, clear_flycheck_action);
     }
 }
 
diff --git a/crates/editor/src/signature_help.rs b/crates/editor/src/signature_help.rs
index e0736a6e9f..5c9800ab55 100644
--- a/crates/editor/src/signature_help.rs
+++ b/crates/editor/src/signature_help.rs
@@ -196,7 +196,7 @@ impl Editor {
                                     .highlight_text(&text, 0..signature.label.len())
                                     .into_iter()
                                     .flat_map(|(range, highlight_id)| {
-                                        Some((range, highlight_id.style(&cx.theme().syntax())?))
+                                        Some((range, highlight_id.style(cx.theme().syntax())?))
                                     });
                                 signature.highlights =
                                     combine_highlights(signature.highlights.clone(), highlights)
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index f328945dbe..819d6d9fed 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -189,7 +189,7 @@ pub fn editor_content_with_blocks(editor: &Entity<Editor>, cx: &mut VisualTestCo
                         continue;
                     }
                 };
-                let content = block_content_for_tests(&editor, custom_block.id, cx)
+                let content = block_content_for_tests(editor, custom_block.id, cx)
                     .expect("block content not found");
                 // 2: "related info 1 for diagnostic 0"
                 if let Some(height) = custom_block.height {
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index 6558222d89..53c9113934 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -520,7 +520,7 @@ async fn judge_example(
     enable_telemetry: bool,
     cx: &AsyncApp,
 ) -> JudgeOutput {
-    let judge_output = example.judge(model.clone(), &run_output, cx).await;
+    let judge_output = example.judge(model.clone(), run_output, cx).await;
 
     if enable_telemetry {
         telemetry::event!(
diff --git a/crates/eval/src/example.rs b/crates/eval/src/example.rs
index 23c8814916..82e95728a1 100644
--- a/crates/eval/src/example.rs
+++ b/crates/eval/src/example.rs
@@ -64,7 +64,7 @@ impl ExampleMetadata {
         self.url
             .split('/')
             .next_back()
-            .unwrap_or(&"")
+            .unwrap_or("")
             .trim_end_matches(".git")
             .into()
     }
@@ -255,7 +255,7 @@ impl ExampleContext {
                     thread.update(cx, |thread, _cx| {
                         if let Some(tool_use) = pending_tool_use {
                             let mut tool_metrics = tool_metrics.lock().unwrap();
-                            if let Some(tool_result) = thread.tool_result(&tool_use_id) {
+                            if let Some(tool_result) = thread.tool_result(tool_use_id) {
                                 let message = if tool_result.is_error {
                                     format!("✖︎ {}", tool_use.name)
                                 } else {
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
index 0f2b4c18ea..e3b67ed355 100644
--- a/crates/eval/src/instance.rs
+++ b/crates/eval/src/instance.rs
@@ -459,8 +459,8 @@ impl ExampleInstance {
         let mut output_file =
             File::create(self.run_directory.join("judge.md")).expect("failed to create judge.md");
 
-        let diff_task = self.judge_diff(model.clone(), &run_output, cx);
-        let thread_task = self.judge_thread(model.clone(), &run_output, cx);
+        let diff_task = self.judge_diff(model.clone(), run_output, cx);
+        let thread_task = self.judge_thread(model.clone(), run_output, cx);
 
         let (diff_result, thread_result) = futures::join!(diff_task, thread_task);
 
@@ -661,7 +661,7 @@ pub fn wait_for_lang_server(
         .update(cx, |buffer, cx| {
             lsp_store.update(cx, |lsp_store, cx| {
                 lsp_store
-                    .language_servers_for_local_buffer(&buffer, cx)
+                    .language_servers_for_local_buffer(buffer, cx)
                     .next()
                     .is_some()
             })
@@ -693,7 +693,7 @@ pub fn wait_for_lang_server(
                     _ => {}
                 }
             }),
-            cx.subscribe(&project, {
+            cx.subscribe(project, {
                 let buffer = buffer.clone();
                 move |project, event, cx| match event {
                     project::Event::LanguageServerAdded(_, _, _) => {
@@ -838,7 +838,7 @@ fn messages_to_markdown<'a>(message_iter: impl IntoIterator<Item = &'a Message>)
         for segment in &message.segments {
             match segment {
                 MessageSegment::Text(text) => {
-                    messages.push_str(&text);
+                    messages.push_str(text);
                     messages.push_str("\n\n");
                 }
                 MessageSegment::Thinking { text, signature } => {
@@ -846,7 +846,7 @@ fn messages_to_markdown<'a>(message_iter: impl IntoIterator<Item = &'a Message>)
                     if let Some(sig) = signature {
                         messages.push_str(&format!("Signature: {}\n\n", sig));
                     }
-                    messages.push_str(&text);
+                    messages.push_str(text);
                     messages.push_str("\n");
                 }
                 MessageSegment::RedactedThinking(items) => {
@@ -878,7 +878,7 @@ pub async fn send_language_model_request(
     request: LanguageModelRequest,
     cx: &AsyncApp,
 ) -> anyhow::Result<String> {
-    match model.stream_completion_text(request, &cx).await {
+    match model.stream_completion_text(request, cx).await {
         Ok(mut stream) => {
             let mut full_response = String::new();
             while let Some(chunk_result) = stream.stream.next().await {
diff --git a/crates/extension/src/extension_builder.rs b/crates/extension/src/extension_builder.rs
index 621ba9250c..b80525798b 100644
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -452,7 +452,7 @@ impl ExtensionBuilder {
         let mut output = Vec::new();
         let mut stack = Vec::new();
 
-        for payload in Parser::new(0).parse_all(&input) {
+        for payload in Parser::new(0).parse_all(input) {
             let payload = payload?;
 
             // Track nesting depth, so that we don't mess with inner producer sections:
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index e795fa5ac5..4ee948dda8 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -1341,7 +1341,7 @@ impl ExtensionStore {
                     &extension_path,
                     &extension.manifest,
                     wasm_host.clone(),
-                    &cx,
+                    cx,
                 )
                 .await
                 .with_context(|| format!("Loading extension from {extension_path:?}"));
@@ -1776,7 +1776,7 @@ impl ExtensionStore {
         })?;
 
         for client in clients {
-            Self::sync_extensions_over_ssh(&this, client, cx)
+            Self::sync_extensions_over_ssh(this, client, cx)
                 .await
                 .log_err();
         }
diff --git a/crates/extension_host/src/headless_host.rs b/crates/extension_host/src/headless_host.rs
index 8ce3847376..a6305118cd 100644
--- a/crates/extension_host/src/headless_host.rs
+++ b/crates/extension_host/src/headless_host.rs
@@ -175,7 +175,7 @@ impl HeadlessExtensionStore {
         }
 
         let wasm_extension: Arc<dyn Extension> =
-            Arc::new(WasmExtension::load(&extension_dir, &manifest, wasm_host.clone(), &cx).await?);
+            Arc::new(WasmExtension::load(&extension_dir, &manifest, wasm_host.clone(), cx).await?);
 
         for (language_server_id, language_server_config) in &manifest.language_servers {
             for language in language_server_config.languages() {
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index c6997ccdc0..e8f80e5ef2 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -210,7 +210,7 @@ impl FileFinder {
             return;
         };
         if self.picker.read(cx).delegate.has_changed_selected_index {
-            if !event.modified() || !init_modifiers.is_subset_of(&event) {
+            if !event.modified() || !init_modifiers.is_subset_of(event) {
                 self.init_modifiers = None;
                 window.dispatch_action(menu::Confirm.boxed_clone(), cx);
             }
@@ -497,7 +497,7 @@ impl Match {
     fn panel_match(&self) -> Option<&ProjectPanelOrdMatch> {
         match self {
             Match::History { panel_match, .. } => panel_match.as_ref(),
-            Match::Search(panel_match) => Some(&panel_match),
+            Match::Search(panel_match) => Some(panel_match),
             Match::CreateNew(_) => None,
         }
     }
@@ -537,7 +537,7 @@ impl Matches {
             self.matches.binary_search_by(|m| {
                 // `reverse()` since if cmp_matches(a, b) == Ordering::Greater, then a is better than b.
                 // And we want the better entries go first.
-                Self::cmp_matches(self.separate_history, currently_opened, &m, &entry).reverse()
+                Self::cmp_matches(self.separate_history, currently_opened, m, entry).reverse()
             })
         }
     }
@@ -1082,7 +1082,7 @@ impl FileFinderDelegate {
             if let Some(user_home_path) = std::env::var("HOME").ok() {
                 let user_home_path = user_home_path.trim();
                 if !user_home_path.is_empty() {
-                    if (&full_path).starts_with(user_home_path) {
+                    if full_path.starts_with(user_home_path) {
                         full_path.replace_range(0..user_home_path.len(), "~");
                         full_path_positions.retain_mut(|pos| {
                             if *pos >= user_home_path.len() {
@@ -1402,7 +1402,7 @@ impl PickerDelegate for FileFinderDelegate {
             cx.notify();
             Task::ready(())
         } else {
-            let path_position = PathWithPosition::parse_str(&raw_query);
+            let path_position = PathWithPosition::parse_str(raw_query);
 
             #[cfg(windows)]
             let raw_query = raw_query.trim().to_owned().replace("/", "\\");
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index db259ccef8..8203d1b1fd 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1614,7 +1614,7 @@ async fn test_select_current_open_file_when_no_history(cx: &mut gpui::TestAppCon
 
     let picker = open_file_picker(&workspace, cx);
     picker.update(cx, |finder, _| {
-        assert_match_selection(&finder, 0, "1_qw");
+        assert_match_selection(finder, 0, "1_qw");
     });
 }
 
@@ -2623,7 +2623,7 @@ async fn open_queried_buffer(
     workspace: &Entity<Workspace>,
     cx: &mut gpui::VisualTestContext,
 ) -> Vec<FoundPath> {
-    let picker = open_file_picker(&workspace, cx);
+    let picker = open_file_picker(workspace, cx);
     cx.simulate_input(input);
 
     let history_items = picker.update(cx, |finder, _| {
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index 68ba7a78b5..7235568e4f 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -637,7 +637,7 @@ impl PickerDelegate for OpenPathDelegate {
                 FileIcons::get_folder_icon(false, cx)?
             } else {
                 let path = path::Path::new(&candidate.path.string);
-                FileIcons::get_icon(&path, cx)?
+                FileIcons::get_icon(path, cx)?
             };
             Some(Icon::from_path(icon).color(Color::Muted))
         });
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 22bfdbcd66..64eeae99d1 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -776,7 +776,7 @@ impl Fs for RealFs {
         }
 
         // Check if path is a symlink and follow the target parent
-        if let Some(mut target) = self.read_link(&path).await.ok() {
+        if let Some(mut target) = self.read_link(path).await.ok() {
             // Check if symlink target is relative path, if so make it absolute
             if target.is_relative() {
                 if let Some(parent) = path.parent() {
@@ -1677,7 +1677,7 @@ impl FakeFs {
     /// by mutating the head, index, and unmerged state.
     pub fn set_status_for_repo(&self, dot_git: &Path, statuses: &[(&Path, FileStatus)]) {
         let workdir_path = dot_git.parent().unwrap();
-        let workdir_contents = self.files_with_contents(&workdir_path);
+        let workdir_contents = self.files_with_contents(workdir_path);
         self.with_git_state(dot_git, true, |state| {
             state.index_contents.clear();
             state.head_contents.clear();
@@ -2244,7 +2244,7 @@ impl Fs for FakeFs {
     async fn open_handle(&self, path: &Path) -> Result<Arc<dyn FileHandle>> {
         self.simulate_random_delay().await;
         let mut state = self.state.lock();
-        let inode = match state.entry(&path)? {
+        let inode = match state.entry(path)? {
             FakeFsEntry::File { inode, .. } => *inode,
             FakeFsEntry::Dir { inode, .. } => *inode,
             _ => unreachable!(),
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 49eee84840..ae8c5f849c 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -858,7 +858,7 @@ impl GitRepository for RealGitRepository {
                     let output = new_smol_command(&git_binary_path)
                         .current_dir(&working_directory)
                         .envs(env.iter())
-                        .args(["update-index", "--add", "--cacheinfo", "100644", &sha])
+                        .args(["update-index", "--add", "--cacheinfo", "100644", sha])
                         .arg(path.to_unix_style())
                         .output()
                         .await?;
@@ -959,7 +959,7 @@ impl GitRepository for RealGitRepository {
             Ok(working_directory) => working_directory,
             Err(e) => return Task::ready(Err(e)),
         };
-        let args = git_status_args(&path_prefixes);
+        let args = git_status_args(path_prefixes);
         log::debug!("Checking for git status in {path_prefixes:?}");
         self.executor.spawn(async move {
             let output = new_std_command(&git_binary_path)
@@ -1056,7 +1056,7 @@ impl GitRepository for RealGitRepository {
                 let (_, branch_name) = name.split_once("/").context("Unexpected branch format")?;
                 let revision = revision.get();
                 let branch_commit = revision.peel_to_commit()?;
-                let mut branch = repo.branch(&branch_name, &branch_commit, false)?;
+                let mut branch = repo.branch(branch_name, &branch_commit, false)?;
                 branch.set_upstream(Some(&name))?;
                 branch
             } else {
@@ -2349,7 +2349,7 @@ mod tests {
         #[allow(clippy::octal_escapes)]
         let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0generated protobuf\n";
         assert_eq!(
-            parse_branch_input(&input).unwrap(),
+            parse_branch_input(input).unwrap(),
             vec![Branch {
                 is_head: true,
                 ref_name: "refs/heads/zed-patches".into(),
diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs
index 6158b51798..92836042f2 100644
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -468,7 +468,7 @@ impl FromStr for GitStatus {
                 Some((path, status))
             })
             .collect::<Vec<_>>();
-        entries.sort_unstable_by(|(a, _), (b, _)| a.cmp(&b));
+        entries.sort_unstable_by(|(a, _), (b, _)| a.cmp(b));
         // When a file exists in HEAD, is deleted in the index, and exists again in the working copy,
         // git produces two lines for it, one reading `D ` (deleted in index, unmodified in working copy)
         // and the other reading `??` (untracked). Merge these two into the equivalent of `DA`.
diff --git a/crates/git_hosting_providers/src/git_hosting_providers.rs b/crates/git_hosting_providers/src/git_hosting_providers.rs
index b31412ed4a..d4b3a59375 100644
--- a/crates/git_hosting_providers/src/git_hosting_providers.rs
+++ b/crates/git_hosting_providers/src/git_hosting_providers.rs
@@ -55,7 +55,7 @@ pub fn get_host_from_git_remote_url(remote_url: &str) -> Result<String> {
             }
         }
 
-        Url::parse(&remote_url)
+        Url::parse(remote_url)
             .ok()
             .and_then(|remote_url| remote_url.host_str().map(|host| host.to_string()))
     })
diff --git a/crates/git_hosting_providers/src/providers/chromium.rs b/crates/git_hosting_providers/src/providers/chromium.rs
index b68c629ec7..5d940fb496 100644
--- a/crates/git_hosting_providers/src/providers/chromium.rs
+++ b/crates/git_hosting_providers/src/providers/chromium.rs
@@ -292,7 +292,7 @@ mod tests {
 
         assert_eq!(
             Chromium
-                .extract_pull_request(&remote, &message)
+                .extract_pull_request(&remote, message)
                 .unwrap()
                 .url
                 .as_str(),
diff --git a/crates/git_hosting_providers/src/providers/github.rs b/crates/git_hosting_providers/src/providers/github.rs
index 30f8d058a7..4475afeb49 100644
--- a/crates/git_hosting_providers/src/providers/github.rs
+++ b/crates/git_hosting_providers/src/providers/github.rs
@@ -474,7 +474,7 @@ mod tests {
 
         assert_eq!(
             github
-                .extract_pull_request(&remote, &message)
+                .extract_pull_request(&remote, message)
                 .unwrap()
                 .url
                 .as_str(),
@@ -488,6 +488,6 @@ mod tests {
             See the original PR, this is a fix.
             "#
         };
-        assert_eq!(github.extract_pull_request(&remote, &message), None);
+        assert_eq!(github.extract_pull_request(&remote, message), None);
     }
 }
diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs
index c8c237fe90..07896b0c01 100644
--- a/crates/git_ui/src/commit_view.rs
+++ b/crates/git_ui/src/commit_view.rs
@@ -160,7 +160,7 @@ impl CommitView {
             });
         }
 
-        cx.spawn(async move |this, mut cx| {
+        cx.spawn(async move |this, cx| {
             for file in commit_diff.files {
                 let is_deleted = file.new_text.is_none();
                 let new_text = file.new_text.unwrap_or_default();
@@ -179,9 +179,9 @@ impl CommitView {
                     worktree_id,
                 }) as Arc<dyn language::File>;
 
-                let buffer = build_buffer(new_text, file, &language_registry, &mut cx).await?;
+                let buffer = build_buffer(new_text, file, &language_registry, cx).await?;
                 let buffer_diff =
-                    build_buffer_diff(old_text, &buffer, &language_registry, &mut cx).await?;
+                    build_buffer_diff(old_text, &buffer, &language_registry, cx).await?;
 
                 this.update(cx, |this, cx| {
                     this.multibuffer.update(cx, |multibuffer, cx| {
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
index 6482ebb9f8..5c1b1325a5 100644
--- a/crates/git_ui/src/conflict_view.rs
+++ b/crates/git_ui/src/conflict_view.rs
@@ -156,7 +156,7 @@ fn buffers_removed(editor: &mut Editor, removed_buffer_ids: &[BufferId], cx: &mu
         .unwrap()
         .buffers
         .retain(|buffer_id, buffer| {
-            if removed_buffer_ids.contains(&buffer_id) {
+            if removed_buffer_ids.contains(buffer_id) {
                 removed_block_ids.extend(buffer.block_ids.iter().map(|(_, block_id)| *block_id));
                 false
             } else {
@@ -222,12 +222,12 @@ fn conflicts_updated(
                 let precedes_start = range
                     .context
                     .start
-                    .cmp(&conflict_range.start, &buffer_snapshot)
+                    .cmp(&conflict_range.start, buffer_snapshot)
                     .is_le();
                 let follows_end = range
                     .context
                     .end
-                    .cmp(&conflict_range.start, &buffer_snapshot)
+                    .cmp(&conflict_range.start, buffer_snapshot)
                     .is_ge();
                 precedes_start && follows_end
             }) else {
@@ -268,12 +268,12 @@ fn conflicts_updated(
             let precedes_start = range
                 .context
                 .start
-                .cmp(&conflict.range.start, &buffer_snapshot)
+                .cmp(&conflict.range.start, buffer_snapshot)
                 .is_le();
             let follows_end = range
                 .context
                 .end
-                .cmp(&conflict.range.start, &buffer_snapshot)
+                .cmp(&conflict.range.start, buffer_snapshot)
                 .is_ge();
             precedes_start && follows_end
         }) else {
diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index 2f8a744ed8..f7d29cdfa7 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -398,7 +398,7 @@ mod tests {
 
         let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
 
-        let (workspace, mut cx) =
+        let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
         let diff_view = workspace
@@ -417,7 +417,7 @@ mod tests {
         // Verify initial diff
         assert_state_with_diff(
             &diff_view.read_with(cx, |diff_view, _| diff_view.editor.clone()),
-            &mut cx,
+            cx,
             &unindent(
                 "
                 - old line 1
@@ -452,7 +452,7 @@ mod tests {
         cx.executor().advance_clock(RECALCULATE_DIFF_DEBOUNCE);
         assert_state_with_diff(
             &diff_view.read_with(cx, |diff_view, _| diff_view.editor.clone()),
-            &mut cx,
+            cx,
             &unindent(
                 "
                 - old line 1
@@ -487,7 +487,7 @@ mod tests {
         cx.executor().advance_clock(RECALCULATE_DIFF_DEBOUNCE);
         assert_state_with_diff(
             &diff_view.read_with(cx, |diff_view, _| diff_view.editor.clone()),
-            &mut cx,
+            cx,
             &unindent(
                 "
                   ˇnew line 1
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 754812cbdf..c21ac286cb 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -103,7 +103,7 @@ fn prompt<T>(
 where
     T: IntoEnumIterator + VariantNames + 'static,
 {
-    let rx = window.prompt(PromptLevel::Info, msg, detail, &T::VARIANTS, cx);
+    let rx = window.prompt(PromptLevel::Info, msg, detail, T::VARIANTS, cx);
     cx.spawn(async move |_| Ok(T::iter().nth(rx.await?).unwrap()))
 }
 
@@ -652,14 +652,14 @@ impl GitPanel {
         if GitPanelSettings::get_global(cx).sort_by_path {
             return self
                 .entries
-                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
+                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(path))
                 .ok();
         }
 
         if self.conflicted_count > 0 {
             let conflicted_start = 1;
             if let Ok(ix) = self.entries[conflicted_start..conflicted_start + self.conflicted_count]
-                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
+                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(path))
             {
                 return Some(conflicted_start + ix);
             }
@@ -671,7 +671,7 @@ impl GitPanel {
                 0
             } + 1;
             if let Ok(ix) = self.entries[tracked_start..tracked_start + self.tracked_count]
-                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
+                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(path))
             {
                 return Some(tracked_start + ix);
             }
@@ -687,7 +687,7 @@ impl GitPanel {
                 0
             } + 1;
             if let Ok(ix) = self.entries[untracked_start..untracked_start + self.new_count]
-                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
+                .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(path))
             {
                 return Some(untracked_start + ix);
             }
@@ -1341,7 +1341,7 @@ impl GitPanel {
                     .iter()
                     .filter_map(|entry| entry.status_entry())
                     .filter(|status_entry| {
-                        section.contains(&status_entry, repository)
+                        section.contains(status_entry, repository)
                             && status_entry.staging.as_bool() != Some(goal_staged_state)
                     })
                     .map(|status_entry| status_entry.clone())
@@ -1952,7 +1952,7 @@ impl GitPanel {
                     thinking_allowed: false,
                 };
 
-                let stream = model.stream_completion_text(request, &cx);
+                let stream = model.stream_completion_text(request, cx);
                 match stream.await {
                     Ok(mut messages) => {
                         if !text_empty {
@@ -4620,7 +4620,7 @@ impl editor::Addon for GitPanelAddon {
 
         git_panel
             .read(cx)
-            .render_buffer_header_controls(&git_panel, &file, window, cx)
+            .render_buffer_header_controls(&git_panel, file, window, cx)
     }
 }
 
diff --git a/crates/git_ui/src/picker_prompt.rs b/crates/git_ui/src/picker_prompt.rs
index 4077e0f362..3f1d507c42 100644
--- a/crates/git_ui/src/picker_prompt.rs
+++ b/crates/git_ui/src/picker_prompt.rs
@@ -152,7 +152,7 @@ impl PickerDelegate for PickerPromptDelegate {
                     .all_options
                     .iter()
                     .enumerate()
-                    .map(|(ix, option)| StringMatchCandidate::new(ix, &option))
+                    .map(|(ix, option)| StringMatchCandidate::new(ix, option))
                     .collect::<Vec<StringMatchCandidate>>()
             });
             let Some(candidates) = candidates.log_err() else {
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index d6a4e27286..e312d6a2aa 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -1173,7 +1173,7 @@ impl RenderOnce for ProjectDiffEmptyState {
                             .child(Label::new("No Changes").color(Color::Muted))
                     } else {
                         this.when_some(self.current_branch.as_ref(), |this, branch| {
-                            this.child(has_branch_container(&branch))
+                            this.child(has_branch_container(branch))
                         })
                     }
                 }),
@@ -1332,14 +1332,14 @@ fn merge_anchor_ranges<'a>(
         loop {
             if let Some(left_range) = left
                 .peek()
-                .filter(|range| range.start.cmp(&next_range.end, &snapshot).is_le())
+                .filter(|range| range.start.cmp(&next_range.end, snapshot).is_le())
                 .cloned()
             {
                 left.next();
                 next_range.end = left_range.end;
             } else if let Some(right_range) = right
                 .peek()
-                .filter(|range| range.start.cmp(&next_range.end, &snapshot).is_le())
+                .filter(|range| range.start.cmp(&next_range.end, snapshot).is_le())
                 .cloned()
             {
                 right.next();
diff --git a/crates/git_ui/src/text_diff_view.rs b/crates/git_ui/src/text_diff_view.rs
index 005c1e18b4..d07868c3e1 100644
--- a/crates/git_ui/src/text_diff_view.rs
+++ b/crates/git_ui/src/text_diff_view.rs
@@ -686,7 +686,7 @@ mod tests {
 
         let project = Project::test(fs, [project_root.as_ref()], cx).await;
 
-        let (workspace, mut cx) =
+        let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
         let buffer = project
@@ -725,7 +725,7 @@ mod tests {
 
         assert_state_with_diff(
             &diff_view.read_with(cx, |diff_view, _| diff_view.diff_editor.clone()),
-            &mut cx,
+            cx,
             expected_diff,
         );
 
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 93a1c15c41..3a80ee12a0 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -374,7 +374,7 @@ mod windows {
             shader_path,
             "vs_4_1",
         );
-        generate_rust_binding(&const_name, &output_file, &rust_binding_path);
+        generate_rust_binding(&const_name, &output_file, rust_binding_path);
 
         // Compile fragment shader
         let output_file = format!("{}/{}_ps.h", out_dir, module);
@@ -387,7 +387,7 @@ mod windows {
             shader_path,
             "ps_4_1",
         );
-        generate_rust_binding(&const_name, &output_file, &rust_binding_path);
+        generate_rust_binding(&const_name, &output_file, rust_binding_path);
     }
 
     fn compile_shader_impl(
diff --git a/crates/gpui/examples/input.rs b/crates/gpui/examples/input.rs
index b0f560e38d..170df3cad7 100644
--- a/crates/gpui/examples/input.rs
+++ b/crates/gpui/examples/input.rs
@@ -137,14 +137,14 @@ impl TextInput {
     fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
         if !self.selected_range.is_empty() {
             cx.write_to_clipboard(ClipboardItem::new_string(
-                (&self.content[self.selected_range.clone()]).to_string(),
+                self.content[self.selected_range.clone()].to_string(),
             ));
         }
     }
     fn cut(&mut self, _: &Cut, window: &mut Window, cx: &mut Context<Self>) {
         if !self.selected_range.is_empty() {
             cx.write_to_clipboard(ClipboardItem::new_string(
-                (&self.content[self.selected_range.clone()]).to_string(),
+                self.content[self.selected_range.clone()].to_string(),
             ));
             self.replace_text_in_range(None, "", window, cx)
         }
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index e1df6d0be4..ed1b935c58 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1310,7 +1310,7 @@ impl App {
         T: 'static,
     {
         let window_handle = window.handle;
-        self.observe_release(&handle, move |entity, cx| {
+        self.observe_release(handle, move |entity, cx| {
             let _ = window_handle.update(cx, |_, window, cx| on_release(entity, window, cx));
         })
     }
@@ -1917,7 +1917,7 @@ impl AppContext for App {
         G: Global,
     {
         let mut g = self.global::<G>();
-        callback(&g, self)
+        callback(g, self)
     }
 }
 
diff --git a/crates/gpui/src/app/entity_map.rs b/crates/gpui/src/app/entity_map.rs
index fccb417caa..48b2bcaf98 100644
--- a/crates/gpui/src/app/entity_map.rs
+++ b/crates/gpui/src/app/entity_map.rs
@@ -661,7 +661,7 @@ pub struct WeakEntity<T> {
 
 impl<T> std::fmt::Debug for WeakEntity<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct(&type_name::<Self>())
+        f.debug_struct(type_name::<Self>())
             .field("entity_id", &self.any_entity.entity_id)
             .field("entity_type", &type_name::<T>())
             .finish()
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 09afbff929..78114b7ecf 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -2785,7 +2785,7 @@ fn handle_tooltip_check_visible_and_update(
 
     match action {
         Action::None => {}
-        Action::Hide => clear_active_tooltip(&active_tooltip, window),
+        Action::Hide => clear_active_tooltip(active_tooltip, window),
         Action::ScheduleHide(tooltip) => {
             let delayed_hide_task = window.spawn(cx, {
                 let active_tooltip = active_tooltip.clone();
diff --git a/crates/gpui/src/inspector.rs b/crates/gpui/src/inspector.rs
index 23c46edcc1..9f86576a59 100644
--- a/crates/gpui/src/inspector.rs
+++ b/crates/gpui/src/inspector.rs
@@ -164,7 +164,7 @@ mod conditional {
                     if let Some(render_inspector) = cx
                         .inspector_element_registry
                         .renderers_by_type_id
-                        .remove(&type_id)
+                        .remove(type_id)
                     {
                         let mut element = (render_inspector)(
                             active_element.id.clone(),
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index c3f5d18603..f682b78c41 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -408,7 +408,7 @@ impl DispatchTree {
         keymap
             .bindings_for_action(action)
             .filter(|binding| {
-                Self::binding_matches_predicate_and_not_shadowed(&keymap, &binding, context_stack)
+                Self::binding_matches_predicate_and_not_shadowed(&keymap, binding, context_stack)
             })
             .cloned()
             .collect()
@@ -426,7 +426,7 @@ impl DispatchTree {
             .bindings_for_action(action)
             .rev()
             .find(|binding| {
-                Self::binding_matches_predicate_and_not_shadowed(&keymap, &binding, context_stack)
+                Self::binding_matches_predicate_and_not_shadowed(&keymap, binding, context_stack)
             })
             .cloned()
     }
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index 83d7479a04..66f191ca5d 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -148,7 +148,7 @@ impl Keymap {
         let mut pending_bindings = SmallVec::<[(BindingIndex, &KeyBinding); 1]>::new();
 
         for (ix, binding) in self.bindings().enumerate().rev() {
-            let Some(depth) = self.binding_enabled(binding, &context_stack) else {
+            let Some(depth) = self.binding_enabled(binding, context_stack) else {
                 continue;
             };
             let Some(pending) = binding.match_keystrokes(input) else {
diff --git a/crates/gpui/src/path_builder.rs b/crates/gpui/src/path_builder.rs
index 6c8cfddd52..38903ea588 100644
--- a/crates/gpui/src/path_builder.rs
+++ b/crates/gpui/src/path_builder.rs
@@ -278,7 +278,7 @@ impl PathBuilder {
         options: &StrokeOptions,
     ) -> Result<Path<Pixels>, Error> {
         let path = if let Some(dash_array) = dash_array {
-            let measurements = lyon::algorithms::measure::PathMeasurements::from_path(&path, 0.01);
+            let measurements = lyon::algorithms::measure::PathMeasurements::from_path(path, 0.01);
             let mut sampler = measurements
                 .create_sampler(path, lyon::algorithms::measure::SampleType::Normalized);
             let mut builder = lyon::path::Path::builder();
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index ffd68d60e6..3e002309e4 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1508,7 +1508,7 @@ impl ClipboardItem {
 
         for entry in self.entries.iter() {
             if let ClipboardEntry::String(ClipboardString { text, metadata: _ }) = entry {
-                answer.push_str(&text);
+                answer.push_str(text);
                 any_entries = true;
             }
         }
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 86e5a79e8a..a1da088b75 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -642,7 +642,7 @@ pub(super) fn get_xkb_compose_state(cx: &xkb::Context) -> Option<xkb::compose::S
     let mut state: Option<xkb::compose::State> = None;
     for locale in locales {
         if let Ok(table) =
-            xkb::compose::Table::new_from_locale(&cx, &locale, xkb::compose::COMPILE_NO_FLAGS)
+            xkb::compose::Table::new_from_locale(cx, &locale, xkb::compose::COMPILE_NO_FLAGS)
         {
             state = Some(xkb::compose::State::new(
                 &table,
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 72e4477ecf..0ab61fbf0c 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -1145,7 +1145,7 @@ impl Dispatch<wl_seat::WlSeat, ()> for WaylandClientStatePtr {
                     .globals
                     .text_input_manager
                     .as_ref()
-                    .map(|text_input_manager| text_input_manager.get_text_input(&seat, qh, ()));
+                    .map(|text_input_manager| text_input_manager.get_text_input(seat, qh, ()));
 
                 if let Some(wl_keyboard) = &state.wl_keyboard {
                     wl_keyboard.release();
@@ -1294,7 +1294,7 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                 match key_state {
                     wl_keyboard::KeyState::Pressed if !keysym.is_modifier_key() => {
                         let mut keystroke =
-                            Keystroke::from_xkb(&keymap_state, state.modifiers, keycode);
+                            Keystroke::from_xkb(keymap_state, state.modifiers, keycode);
                         if let Some(mut compose) = state.compose_state.take() {
                             compose.feed(keysym);
                             match compose.status() {
@@ -1538,12 +1538,9 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                             cursor_shape_device.set_shape(serial, style.to_shape());
                         } else {
                             let scale = window.primary_output_scale();
-                            state.cursor.set_icon(
-                                &wl_pointer,
-                                serial,
-                                style.to_icon_names(),
-                                scale,
-                            );
+                            state
+                                .cursor
+                                .set_icon(wl_pointer, serial, style.to_icon_names(), scale);
                         }
                     }
                     drop(state);
@@ -1580,7 +1577,7 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                     if state
                         .keyboard_focused_window
                         .as_ref()
-                        .map_or(false, |keyboard_window| window.ptr_eq(&keyboard_window))
+                        .map_or(false, |keyboard_window| window.ptr_eq(keyboard_window))
                     {
                         state.enter_token = None;
                     }
diff --git a/crates/gpui/src/platform/linux/wayland/cursor.rs b/crates/gpui/src/platform/linux/wayland/cursor.rs
index 2a24d0e1ba..bfbedf234d 100644
--- a/crates/gpui/src/platform/linux/wayland/cursor.rs
+++ b/crates/gpui/src/platform/linux/wayland/cursor.rs
@@ -144,7 +144,7 @@ impl Cursor {
             hot_y as i32 / scale,
         );
 
-        self.surface.attach(Some(&buffer), 0, 0);
+        self.surface.attach(Some(buffer), 0, 0);
         self.surface.damage(0, 0, width as i32, height as i32);
         self.surface.commit();
     }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 053cd0387b..dd0cea3290 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -1212,7 +1212,7 @@ impl X11Client {
 
                 state = self.0.borrow_mut();
                 if let Some(mut pointer) = state.pointer_device_states.get_mut(&event.sourceid) {
-                    let scroll_delta = get_scroll_delta_and_update_state(&mut pointer, &event);
+                    let scroll_delta = get_scroll_delta_and_update_state(pointer, &event);
                     drop(state);
                     if let Some(scroll_delta) = scroll_delta {
                         window.handle_input(PlatformInput::ScrollWheel(make_scroll_wheel_event(
@@ -1271,7 +1271,7 @@ impl X11Client {
             Event::XinputDeviceChanged(event) => {
                 let mut state = self.0.borrow_mut();
                 if let Some(mut pointer) = state.pointer_device_states.get_mut(&event.sourceid) {
-                    reset_pointer_device_scroll_positions(&mut pointer);
+                    reset_pointer_device_scroll_positions(pointer);
                 }
             }
             _ => {}
@@ -2038,7 +2038,7 @@ fn xdnd_get_supported_atom(
     {
         if let Some(atoms) = reply.value32() {
             for atom in atoms {
-                if xdnd_is_atom_supported(atom, &supported_atoms) {
+                if xdnd_is_atom_supported(atom, supported_atoms) {
                     return atom;
                 }
             }
diff --git a/crates/gpui/src/platform/linux/x11/event.rs b/crates/gpui/src/platform/linux/x11/event.rs
index cd4cef24a3..a566762c54 100644
--- a/crates/gpui/src/platform/linux/x11/event.rs
+++ b/crates/gpui/src/platform/linux/x11/event.rs
@@ -73,8 +73,8 @@ pub(crate) fn get_valuator_axis_index(
     // valuator present in this event's axisvalues. Axisvalues is ordered from
     // lowest valuator number to highest, so counting bits before the 1 bit for
     // this valuator yields the index in axisvalues.
-    if bit_is_set_in_vec(&valuator_mask, valuator_number) {
-        Some(popcount_upto_bit_index(&valuator_mask, valuator_number) as usize)
+    if bit_is_set_in_vec(valuator_mask, valuator_number) {
+        Some(popcount_upto_bit_index(valuator_mask, valuator_number) as usize)
     } else {
         None
     }
diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs
index 1a3c323c35..2bf58d6184 100644
--- a/crates/gpui/src/platform/linux/x11/window.rs
+++ b/crates/gpui/src/platform/linux/x11/window.rs
@@ -397,7 +397,7 @@ impl X11WindowState {
             .display_id
             .map_or(x_main_screen_index, |did| did.0 as usize);
 
-        let visual_set = find_visuals(&xcb, x_screen_index);
+        let visual_set = find_visuals(xcb, x_screen_index);
 
         let visual = match visual_set.transparent {
             Some(visual) => visual,
@@ -604,7 +604,7 @@ impl X11WindowState {
                 ),
             )?;
 
-            xcb_flush(&xcb);
+            xcb_flush(xcb);
 
             let renderer = {
                 let raw_window = RawWindow {
@@ -664,7 +664,7 @@ impl X11WindowState {
                 || "X11 DestroyWindow failed while cleaning it up after setup failure.",
                 xcb.destroy_window(x_window),
             )?;
-            xcb_flush(&xcb);
+            xcb_flush(xcb);
         }
 
         setup_result
diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index a686d8c45b..49a5edceb2 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -445,14 +445,14 @@ impl MetalRenderer {
                     instance_buffer,
                     &mut instance_offset,
                     viewport_size,
-                    &command_encoder,
+                    command_encoder,
                 ),
                 PrimitiveBatch::Quads(quads) => self.draw_quads(
                     quads,
                     instance_buffer,
                     &mut instance_offset,
                     viewport_size,
-                    &command_encoder,
+                    command_encoder,
                 ),
                 PrimitiveBatch::Paths(paths) => {
                     command_encoder.end_encoding();
@@ -480,7 +480,7 @@ impl MetalRenderer {
                             instance_buffer,
                             &mut instance_offset,
                             viewport_size,
-                            &command_encoder,
+                            command_encoder,
                         )
                     } else {
                         false
@@ -491,7 +491,7 @@ impl MetalRenderer {
                     instance_buffer,
                     &mut instance_offset,
                     viewport_size,
-                    &command_encoder,
+                    command_encoder,
                 ),
                 PrimitiveBatch::MonochromeSprites {
                     texture_id,
@@ -502,7 +502,7 @@ impl MetalRenderer {
                     instance_buffer,
                     &mut instance_offset,
                     viewport_size,
-                    &command_encoder,
+                    command_encoder,
                 ),
                 PrimitiveBatch::PolychromeSprites {
                     texture_id,
@@ -513,14 +513,14 @@ impl MetalRenderer {
                     instance_buffer,
                     &mut instance_offset,
                     viewport_size,
-                    &command_encoder,
+                    command_encoder,
                 ),
                 PrimitiveBatch::Surfaces(surfaces) => self.draw_surfaces(
                     surfaces,
                     instance_buffer,
                     &mut instance_offset,
                     viewport_size,
-                    &command_encoder,
+                    command_encoder,
                 ),
             };
             if !ok {
@@ -763,7 +763,7 @@ impl MetalRenderer {
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
-        let Some(ref first_path) = paths.first() else {
+        let Some(first_path) = paths.first() else {
             return true;
         };
 
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 79177fb2c9..f094ed9f30 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -371,7 +371,7 @@ impl MacPlatform {
 
                             item = NSMenuItem::alloc(nil)
                                 .initWithTitle_action_keyEquivalent_(
-                                    ns_string(&name),
+                                    ns_string(name),
                                     selector,
                                     ns_string(key_to_native(&keystroke.key).as_ref()),
                                 )
@@ -383,7 +383,7 @@ impl MacPlatform {
                         } else {
                             item = NSMenuItem::alloc(nil)
                                 .initWithTitle_action_keyEquivalent_(
-                                    ns_string(&name),
+                                    ns_string(name),
                                     selector,
                                     ns_string(""),
                                 )
@@ -392,7 +392,7 @@ impl MacPlatform {
                     } else {
                         item = NSMenuItem::alloc(nil)
                             .initWithTitle_action_keyEquivalent_(
-                                ns_string(&name),
+                                ns_string(name),
                                 selector,
                                 ns_string(""),
                             )
@@ -412,7 +412,7 @@ impl MacPlatform {
                         submenu.addItem_(Self::create_menu_item(item, delegate, actions, keymap));
                     }
                     item.setSubmenu_(submenu);
-                    item.setTitle_(ns_string(&name));
+                    item.setTitle_(ns_string(name));
                     item
                 }
                 MenuItem::SystemMenu(OsMenu { name, menu_type }) => {
@@ -420,7 +420,7 @@ impl MacPlatform {
                     let submenu = NSMenu::new(nil).autorelease();
                     submenu.setDelegate_(delegate);
                     item.setSubmenu_(submenu);
-                    item.setTitle_(ns_string(&name));
+                    item.setTitle_(ns_string(name));
 
                     match menu_type {
                         SystemMenuType::Services => {
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index aedf131909..40a03b6c4a 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1480,9 +1480,9 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
 
             if key_down_event.is_held {
                 if let Some(key_char) = key_down_event.keystroke.key_char.as_ref() {
-                    let handled = with_input_handler(&this, |input_handler| {
+                    let handled = with_input_handler(this, |input_handler| {
                         if !input_handler.apple_press_and_hold_enabled() {
-                            input_handler.replace_text_in_range(None, &key_char);
+                            input_handler.replace_text_in_range(None, key_char);
                             return YES;
                         }
                         NO
@@ -1949,7 +1949,7 @@ extern "C" fn insert_text(this: &Object, _: Sel, text: id, replacement_range: NS
         let text = text.to_str();
         let replacement_range = replacement_range.to_range();
         with_input_handler(this, |input_handler| {
-            input_handler.replace_text_in_range(replacement_range, &text)
+            input_handler.replace_text_in_range(replacement_range, text)
         });
     }
 }
@@ -1973,7 +1973,7 @@ extern "C" fn set_marked_text(
         let replacement_range = replacement_range.to_range();
         let text = text.to_str();
         with_input_handler(this, |input_handler| {
-            input_handler.replace_and_mark_text_in_range(replacement_range, &text, selected_range)
+            input_handler.replace_and_mark_text_in_range(replacement_range, text, selected_range)
         });
     }
 }
diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index 75cb50243b..a86a1fab62 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -850,7 +850,7 @@ impl DirectWriteState {
         }
 
         let bitmap_data = if params.is_emoji {
-            if let Ok(color) = self.rasterize_color(&params, glyph_bounds) {
+            if let Ok(color) = self.rasterize_color(params, glyph_bounds) {
                 color
             } else {
                 let monochrome = self.rasterize_monochrome(params, glyph_bounds)?;
@@ -1784,7 +1784,7 @@ fn apply_font_features(
         }
 
         unsafe {
-            direct_write_features.AddFontFeature(make_direct_write_feature(&tag, *value))?;
+            direct_write_features.AddFontFeature(make_direct_write_feature(tag, *value))?;
         }
     }
     unsafe {
diff --git a/crates/gpui/src/platform/windows/directx_renderer.rs b/crates/gpui/src/platform/windows/directx_renderer.rs
index 4e72ded534..f84a1c1b6d 100644
--- a/crates/gpui/src/platform/windows/directx_renderer.rs
+++ b/crates/gpui/src/platform/windows/directx_renderer.rs
@@ -758,7 +758,7 @@ impl DirectXRenderPipelines {
 
 impl DirectComposition {
     pub fn new(dxgi_device: &IDXGIDevice, hwnd: HWND) -> Result<Self> {
-        let comp_device = get_comp_device(&dxgi_device)?;
+        let comp_device = get_comp_device(dxgi_device)?;
         let comp_target = unsafe { comp_device.CreateTargetForHwnd(hwnd, true) }?;
         let comp_visual = unsafe { comp_device.CreateVisual() }?;
 
@@ -1144,7 +1144,7 @@ fn create_resources(
     [D3D11_VIEWPORT; 1],
 )> {
     let (render_target, render_target_view) =
-        create_render_target_and_its_view(&swap_chain, &devices.device)?;
+        create_render_target_and_its_view(swap_chain, &devices.device)?;
     let (path_intermediate_texture, path_intermediate_srv) =
         create_path_intermediate_texture(&devices.device, width, height)?;
     let (path_intermediate_msaa_texture, path_intermediate_msaa_view) =
diff --git a/crates/gpui/src/tab_stop.rs b/crates/gpui/src/tab_stop.rs
index 7dde42efed..30d24e85e7 100644
--- a/crates/gpui/src/tab_stop.rs
+++ b/crates/gpui/src/tab_stop.rs
@@ -90,7 +90,7 @@ mod tests {
         ];
 
         for handle in focus_handles.iter() {
-            tab.insert(&handle);
+            tab.insert(handle);
         }
         assert_eq!(
             tab.handles
diff --git a/crates/gpui_macros/src/test.rs b/crates/gpui_macros/src/test.rs
index adb27f42ea..5a8b1cf7fc 100644
--- a/crates/gpui_macros/src/test.rs
+++ b/crates/gpui_macros/src/test.rs
@@ -73,7 +73,7 @@ impl Parse for Args {
                 (Meta::NameValue(meta), "seed") => {
                     seeds = vec![parse_usize_from_expr(&meta.value)? as u64]
                 }
-                (Meta::List(list), "seeds") => seeds = parse_u64_array(&list)?,
+                (Meta::List(list), "seeds") => seeds = parse_u64_array(list)?,
                 (Meta::Path(_), _) => {
                     return Err(syn::Error::new(meta.span(), "invalid path argument"));
                 }
diff --git a/crates/install_cli/src/install_cli.rs b/crates/install_cli/src/install_cli.rs
index 12c094448b..dc9e0e31ab 100644
--- a/crates/install_cli/src/install_cli.rs
+++ b/crates/install_cli/src/install_cli.rs
@@ -105,7 +105,7 @@ pub fn install_cli(window: &mut Window, cx: &mut Context<Workspace>) {
                 cx,
             )
         })?;
-        register_zed_scheme(&cx).await.log_err();
+        register_zed_scheme(cx).await.log_err();
         Ok(())
     })
     .detach_and_prompt_err("Error installing zed cli", window, cx, |_, _, _| None);
diff --git a/crates/jj/src/jj_store.rs b/crates/jj/src/jj_store.rs
index a10f06fad4..2d2d958d7f 100644
--- a/crates/jj/src/jj_store.rs
+++ b/crates/jj/src/jj_store.rs
@@ -16,7 +16,7 @@ pub struct JujutsuStore {
 
 impl JujutsuStore {
     pub fn init_global(cx: &mut App) {
-        let Some(repository) = RealJujutsuRepository::new(&Path::new(".")).ok() else {
+        let Some(repository) = RealJujutsuRepository::new(Path::new(".")).ok() else {
             return;
         };
 
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index e2bcc938fa..abb8d3b151 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -716,7 +716,7 @@ impl EditPreview {
                     &self.applied_edits_snapshot,
                     &self.syntax_snapshot,
                     None,
-                    &syntax_theme,
+                    syntax_theme,
                 );
             }
 
@@ -727,7 +727,7 @@ impl EditPreview {
                     &current_snapshot.text,
                     &current_snapshot.syntax,
                     Some(deletion_highlight_style),
-                    &syntax_theme,
+                    syntax_theme,
                 );
             }
 
@@ -737,7 +737,7 @@ impl EditPreview {
                     &self.applied_edits_snapshot,
                     &self.syntax_snapshot,
                     Some(insertion_highlight_style),
-                    &syntax_theme,
+                    syntax_theme,
                 );
             }
 
@@ -749,7 +749,7 @@ impl EditPreview {
             &self.applied_edits_snapshot,
             &self.syntax_snapshot,
             None,
-            &syntax_theme,
+            syntax_theme,
         );
 
         highlighted_text.build()
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index c377d7440a..3a41733191 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1830,7 +1830,7 @@ impl Language {
 
 impl LanguageScope {
     pub fn path_suffixes(&self) -> &[String] {
-        &self.language.path_suffixes()
+        self.language.path_suffixes()
     }
 
     pub fn language_name(&self) -> LanguageName {
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index 6a89b90462..83c16f4558 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -1102,7 +1102,7 @@ impl LanguageRegistry {
         use gpui::AppContext as _;
 
         let mut state = self.state.write();
-        let fake_entry = state.fake_server_entries.get_mut(&name)?;
+        let fake_entry = state.fake_server_entries.get_mut(name)?;
         let (server, mut fake_server) = lsp::FakeLanguageServer::new(
             server_id,
             binary,
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 29669ba2a0..62fe75b6a8 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -187,8 +187,8 @@ impl LanguageSettings {
         let rest = available_language_servers
             .iter()
             .filter(|&available_language_server| {
-                !disabled_language_servers.contains(&available_language_server)
-                    && !enabled_language_servers.contains(&available_language_server)
+                !disabled_language_servers.contains(available_language_server)
+                    && !enabled_language_servers.contains(available_language_server)
             })
             .cloned()
             .collect::<Vec<_>>();
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
index c56ffed066..30bbc88f7e 100644
--- a/crates/language/src/syntax_map.rs
+++ b/crates/language/src/syntax_map.rs
@@ -1297,7 +1297,7 @@ fn parse_text(
 ) -> anyhow::Result<Tree> {
     with_parser(|parser| {
         let mut chunks = text.chunks_in_range(start_byte..text.len());
-        parser.set_included_ranges(&ranges)?;
+        parser.set_included_ranges(ranges)?;
         parser.set_language(&grammar.ts_language)?;
         parser
             .parse_with_options(
diff --git a/crates/language/src/text_diff.rs b/crates/language/src/text_diff.rs
index f9221f571a..af8ce60881 100644
--- a/crates/language/src/text_diff.rs
+++ b/crates/language/src/text_diff.rs
@@ -154,19 +154,19 @@ fn diff_internal(
         input,
         |old_tokens: Range<u32>, new_tokens: Range<u32>| {
             old_offset += token_len(
-                &input,
+                input,
                 &input.before[old_token_ix as usize..old_tokens.start as usize],
             );
             new_offset += token_len(
-                &input,
+                input,
                 &input.after[new_token_ix as usize..new_tokens.start as usize],
             );
             let old_len = token_len(
-                &input,
+                input,
                 &input.before[old_tokens.start as usize..old_tokens.end as usize],
             );
             let new_len = token_len(
-                &input,
+                input,
                 &input.after[new_tokens.start as usize..new_tokens.end as usize],
             );
             let old_byte_range = old_offset..old_offset + old_len;
diff --git a/crates/language_extension/src/language_extension.rs b/crates/language_extension/src/language_extension.rs
index 7bca0eb485..510f870ce8 100644
--- a/crates/language_extension/src/language_extension.rs
+++ b/crates/language_extension/src/language_extension.rs
@@ -61,6 +61,6 @@ impl ExtensionLanguageProxy for LanguageServerRegistryProxy {
         grammars_to_remove: &[Arc<str>],
     ) {
         self.language_registry
-            .remove_languages(&languages_to_remove, &grammars_to_remove);
+            .remove_languages(languages_to_remove, grammars_to_remove);
     }
 }
diff --git a/crates/language_model/src/request.rs b/crates/language_model/src/request.rs
index edce3d03b7..8c2d169973 100644
--- a/crates/language_model/src/request.rs
+++ b/crates/language_model/src/request.rs
@@ -220,7 +220,7 @@ impl<'de> Deserialize<'de> for LanguageModelToolResultContent {
 
             // Accept wrapped text format: { "type": "text", "text": "..." }
             if let (Some(type_value), Some(text_value)) =
-                (get_field(&obj, "type"), get_field(&obj, "text"))
+                (get_field(obj, "type"), get_field(obj, "text"))
             {
                 if let Some(type_str) = type_value.as_str() {
                     if type_str.to_lowercase() == "text" {
@@ -255,7 +255,7 @@ impl<'de> Deserialize<'de> for LanguageModelToolResultContent {
             }
 
             // Try as direct Image (object with "source" and "size" fields)
-            if let Some(image) = LanguageModelImage::from_json(&obj) {
+            if let Some(image) = LanguageModelImage::from_json(obj) {
                 return Ok(Self::Image(image));
             }
         }
@@ -272,7 +272,7 @@ impl<'de> Deserialize<'de> for LanguageModelToolResultContent {
 impl LanguageModelToolResultContent {
     pub fn to_str(&self) -> Option<&str> {
         match self {
-            Self::Text(text) => Some(&text),
+            Self::Text(text) => Some(text),
             Self::Image(_) => None,
         }
     }
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 810d4a5f44..7ba56ec775 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -114,7 +114,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .ok();
             this.update(cx, |this, cx| {
@@ -133,7 +133,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await
                 .ok();
 
@@ -212,7 +212,7 @@ impl AnthropicLanguageModelProvider {
         } else {
             cx.spawn(async move |cx| {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
 
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 4e6744d745..f33a00972d 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -150,7 +150,7 @@ impl State {
         let credentials_provider = <dyn CredentialsProvider>::global(cx);
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(AMAZON_AWS_URL, &cx)
+                .delete_credentials(AMAZON_AWS_URL, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -174,7 +174,7 @@ impl State {
                     AMAZON_AWS_URL,
                     "Bearer",
                     &serde_json::to_vec(&credentials)?,
-                    &cx,
+                    cx,
                 )
                 .await?;
             this.update(cx, |this, cx| {
@@ -206,7 +206,7 @@ impl State {
                     (credentials, true)
                 } else {
                     let (_, credentials) = credentials_provider
-                        .read_credentials(AMAZON_AWS_URL, &cx)
+                        .read_credentials(AMAZON_AWS_URL, cx)
                         .await?
                         .ok_or_else(|| AuthenticateError::CredentialsNotFound)?;
                     (
@@ -465,7 +465,7 @@ impl BedrockModel {
         Result<BoxStream<'static, Result<BedrockStreamingResponse, BedrockError>>>,
     > {
         let Ok(runtime_client) = self
-            .get_or_init_client(&cx)
+            .get_or_init_client(cx)
             .cloned()
             .context("Bedrock client not initialized")
         else {
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index c3f4399832..f226d0c6a8 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -193,7 +193,7 @@ impl State {
     fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
         let client = self.client.clone();
         cx.spawn(async move |state, cx| {
-            client.sign_in_with_optional_connect(true, &cx).await?;
+            client.sign_in_with_optional_connect(true, cx).await?;
             state.update(cx, |_, cx| cx.notify())
         })
     }
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
index 2b30d456ee..8c7f8bcc35 100644
--- a/crates/language_models/src/provider/deepseek.rs
+++ b/crates/language_models/src/provider/deepseek.rs
@@ -77,7 +77,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -96,7 +96,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await?;
             this.update(cx, |this, cx| {
                 this.api_key = Some(api_key);
@@ -120,7 +120,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 32f8838df7..1bb9f3fa00 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -110,7 +110,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -129,7 +129,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await?;
             this.update(cx, |this, cx| {
                 this.api_key = Some(api_key);
@@ -156,7 +156,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index e1d55801eb..3f8c2e2a67 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -76,7 +76,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -95,7 +95,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await?;
             this.update(cx, |this, cx| {
                 this.api_key = Some(api_key);
@@ -119,7 +119,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index 04d89f2db1..1a5c09cdc4 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -75,7 +75,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -94,7 +94,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -119,7 +119,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index c6b980c3ec..55df534cc9 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -87,7 +87,7 @@ impl State {
         let api_url = self.settings.api_url.clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -103,7 +103,7 @@ impl State {
         let api_url = self.settings.api_url.clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -126,7 +126,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 5d8bace6d3..8f2abfce35 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -112,7 +112,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -131,7 +131,7 @@ impl State {
             .clone();
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -157,7 +157,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/vercel.rs b/crates/language_models/src/provider/vercel.rs
index 98e4f60b6b..84f3175d1e 100644
--- a/crates/language_models/src/provider/vercel.rs
+++ b/crates/language_models/src/provider/vercel.rs
@@ -71,7 +71,7 @@ impl State {
         };
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -92,7 +92,7 @@ impl State {
         };
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -119,7 +119,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index 2b8238cc5c..b37a55e19f 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -71,7 +71,7 @@ impl State {
         };
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .delete_credentials(&api_url, &cx)
+                .delete_credentials(&api_url, cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -92,7 +92,7 @@ impl State {
         };
         cx.spawn(async move |this, cx| {
             credentials_provider
-                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), &cx)
+                .write_credentials(&api_url, "Bearer", api_key.as_bytes(), cx)
                 .await
                 .log_err();
             this.update(cx, |this, cx| {
@@ -119,7 +119,7 @@ impl State {
                 (api_key, true)
             } else {
                 let (_, api_key) = credentials_provider
-                    .read_credentials(&api_url, &cx)
+                    .read_credentials(&api_url, cx)
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index 823d59ce12..c303a8c305 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -661,7 +661,7 @@ impl LogStore {
             IoKind::StdOut => true,
             IoKind::StdIn => false,
             IoKind::StdErr => {
-                self.add_language_server_log(language_server_id, MessageType::LOG, &message, cx);
+                self.add_language_server_log(language_server_id, MessageType::LOG, message, cx);
                 return Some(());
             }
         };
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index a1a5418220..2480d40268 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -106,7 +106,7 @@ impl LspAdapter for CssLspAdapter {
             .should_install_npm_package(
                 Self::PACKAGE_NAME,
                 &server_path,
-                &container_dir,
+                container_dir,
                 VersionStrategy::Latest(version),
             )
             .await;
diff --git a/crates/languages/src/github_download.rs b/crates/languages/src/github_download.rs
index 5b0f1d0729..766c894fbb 100644
--- a/crates/languages/src/github_download.rs
+++ b/crates/languages/src/github_download.rs
@@ -96,7 +96,7 @@ async fn stream_response_archive(
         AssetKind::TarGz => extract_tar_gz(destination_path, url, response).await?,
         AssetKind::Gz => extract_gz(destination_path, url, response).await?,
         AssetKind::Zip => {
-            util::archive::extract_zip(&destination_path, response).await?;
+            util::archive::extract_zip(destination_path, response).await?;
         }
     };
     Ok(())
@@ -113,11 +113,11 @@ async fn stream_file_archive(
         AssetKind::Gz => extract_gz(destination_path, url, file_archive).await?,
         #[cfg(not(windows))]
         AssetKind::Zip => {
-            util::archive::extract_seekable_zip(&destination_path, file_archive).await?;
+            util::archive::extract_seekable_zip(destination_path, file_archive).await?;
         }
         #[cfg(windows)]
         AssetKind::Zip => {
-            util::archive::extract_zip(&destination_path, file_archive).await?;
+            util::archive::extract_zip(destination_path, file_archive).await?;
         }
     };
     Ok(())
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 4db48c67f0..6f57ace488 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -343,7 +343,7 @@ impl LspAdapter for JsonLspAdapter {
             .should_install_npm_package(
                 Self::PACKAGE_NAME,
                 &server_path,
-                &container_dir,
+                container_dir,
                 VersionStrategy::Latest(version),
             )
             .await;
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 222e3f1946..17d0d98fad 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -204,7 +204,7 @@ impl LspAdapter for PythonLspAdapter {
             .should_install_npm_package(
                 Self::SERVER_NAME.as_ref(),
                 &server_path,
-                &container_dir,
+                container_dir,
                 VersionStrategy::Latest(version),
             )
             .await;
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 3ef7c1ba34..bbdfcdb499 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -581,7 +581,7 @@ impl ContextProvider for RustContextProvider {
 
         if let (Some(path), Some(stem)) = (&local_abs_path, task_variables.get(&VariableName::Stem))
         {
-            let fragment = test_fragment(&variables, &path, stem);
+            let fragment = test_fragment(&variables, path, stem);
             variables.insert(RUST_TEST_FRAGMENT_TASK_VARIABLE, fragment);
         };
         if let Some(test_name) =
@@ -607,7 +607,7 @@ impl ContextProvider for RustContextProvider {
             }
             if let Some(path) = local_abs_path.as_ref()
                 && let Some((target, manifest_path)) =
-                    target_info_from_abs_path(&path, project_env.as_ref()).await
+                    target_info_from_abs_path(path, project_env.as_ref()).await
             {
                 if let Some(target) = target {
                     variables.extend(TaskVariables::from_iter([
@@ -1570,7 +1570,7 @@ mod tests {
             let found = test_fragment(
                 &TaskVariables::from_iter(variables.into_iter().map(|(k, v)| (k, v.to_owned()))),
                 path,
-                &path.file_stem().unwrap().to_str().unwrap(),
+                path.file_stem().unwrap().to_str().unwrap(),
             );
             assert_eq!(expected, found);
         }
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 27939c645c..29a96d9515 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -111,7 +111,7 @@ impl LspAdapter for TailwindLspAdapter {
             .should_install_npm_package(
                 Self::PACKAGE_NAME,
                 &server_path,
-                &container_dir,
+                container_dir,
                 VersionStrategy::Latest(version),
             )
             .await;
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index dec7df4060..d477acc7f6 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -587,7 +587,7 @@ impl LspAdapter for TypeScriptLspAdapter {
             .should_install_npm_package(
                 Self::PACKAGE_NAME,
                 &server_path,
-                &container_dir,
+                container_dir,
                 VersionStrategy::Latest(version.typescript_version.as_str()),
             )
             .await;
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index 137a9c2282..6ac92e0b2b 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -105,7 +105,7 @@ impl LspAdapter for YamlLspAdapter {
             .should_install_npm_package(
                 Self::PACKAGE_NAME,
                 &server_path,
-                &container_dir,
+                container_dir,
                 VersionStrategy::Latest(version),
             )
             .await;
diff --git a/crates/livekit_client/src/test.rs b/crates/livekit_client/src/test.rs
index e02c4d876f..e0058d1163 100644
--- a/crates/livekit_client/src/test.rs
+++ b/crates/livekit_client/src/test.rs
@@ -421,7 +421,7 @@ impl TestServer {
         track_sid: &TrackSid,
         muted: bool,
     ) -> Result<()> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
+        let claims = livekit_api::token::validate(token, &self.secret_key)?;
         let room_name = claims.video.room.unwrap();
         let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
         let mut server_rooms = self.rooms.lock();
@@ -475,7 +475,7 @@ impl TestServer {
     }
 
     pub(crate) fn is_track_muted(&self, token: &str, track_sid: &TrackSid) -> Option<bool> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key).ok()?;
+        let claims = livekit_api::token::validate(token, &self.secret_key).ok()?;
         let room_name = claims.video.room.unwrap();
 
         let mut server_rooms = self.rooms.lock();
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index a3235a9773..e5709bc07c 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -875,7 +875,7 @@ impl Element for MarkdownElement {
                                 (CodeBlockRenderer::Custom { render, .. }, _) => {
                                     let parent_container = render(
                                         kind,
-                                        &parsed_markdown,
+                                        parsed_markdown,
                                         range.clone(),
                                         metadata.clone(),
                                         window,
diff --git a/crates/markdown/src/parser.rs b/crates/markdown/src/parser.rs
index 1035335ccb..3720e5b1ef 100644
--- a/crates/markdown/src/parser.rs
+++ b/crates/markdown/src/parser.rs
@@ -247,7 +247,7 @@ pub fn parse_markdown(
                             events.push(event_for(
                                 text,
                                 range.source_range.start..range.source_range.start + prefix_len,
-                                &head,
+                                head,
                             ));
                             range.parsed = CowStr::Boxed(tail.into());
                             range.merged_range.start += prefix_len;
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index 37d2ca2110..3acc4b5600 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -459,13 +459,13 @@ fn render_markdown_table(parsed: &ParsedMarkdownTable, cx: &mut RenderContext) -
     let mut max_lengths: Vec<usize> = vec![0; parsed.header.children.len()];
 
     for (index, cell) in parsed.header.children.iter().enumerate() {
-        let length = paragraph_len(&cell);
+        let length = paragraph_len(cell);
         max_lengths[index] = length;
     }
 
     for row in &parsed.body {
         for (index, cell) in row.children.iter().enumerate() {
-            let length = paragraph_len(&cell);
+            let length = paragraph_len(cell);
 
             if length > max_lengths[index] {
                 max_lengths[index] = length;
diff --git a/crates/migrator/src/migrator.rs b/crates/migrator/src/migrator.rs
index b425f7f1d5..88e3e12f02 100644
--- a/crates/migrator/src/migrator.rs
+++ b/crates/migrator/src/migrator.rs
@@ -37,7 +37,7 @@ fn migrate(text: &str, patterns: MigrationPatterns, query: &Query) -> Result<Opt
     let mut edits = vec![];
     while let Some(mat) = matches.next() {
         if let Some((_, callback)) = patterns.get(mat.pattern_index) {
-            edits.extend(callback(&text, &mat, query));
+            edits.extend(callback(text, mat, query));
         }
     }
 
@@ -170,7 +170,7 @@ pub fn migrate_settings(text: &str) -> Result<Option<String>> {
 
 pub fn migrate_edit_prediction_provider_settings(text: &str) -> Result<Option<String>> {
     migrate(
-        &text,
+        text,
         &[(
             SETTINGS_NESTED_KEY_VALUE_PATTERN,
             migrations::m_2025_01_29::replace_edit_prediction_provider_setting,
@@ -293,12 +293,12 @@ mod tests {
     use super::*;
 
     fn assert_migrate_keymap(input: &str, output: Option<&str>) {
-        let migrated = migrate_keymap(&input).unwrap();
+        let migrated = migrate_keymap(input).unwrap();
         pretty_assertions::assert_eq!(migrated.as_deref(), output);
     }
 
     fn assert_migrate_settings(input: &str, output: Option<&str>) {
-        let migrated = migrate_settings(&input).unwrap();
+        let migrated = migrate_settings(input).unwrap();
         pretty_assertions::assert_eq!(migrated.as_deref(), output);
     }
 
diff --git a/crates/multi_buffer/src/anchor.rs b/crates/multi_buffer/src/anchor.rs
index 1305328d38..8584519d56 100644
--- a/crates/multi_buffer/src/anchor.rs
+++ b/crates/multi_buffer/src/anchor.rs
@@ -145,7 +145,7 @@ impl Anchor {
                             .map(|diff| diff.base_text())
                         {
                             if a.buffer_id == Some(base_text.remote_id()) {
-                                return a.bias_right(&base_text);
+                                return a.bias_right(base_text);
                             }
                         }
                         a
@@ -212,7 +212,7 @@ impl AnchorRangeExt for Range<Anchor> {
     }
 
     fn includes(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> bool {
-        self.start.cmp(&other.start, &buffer).is_le() && other.end.cmp(&self.end, &buffer).is_le()
+        self.start.cmp(&other.start, buffer).is_le() && other.end.cmp(&self.end, buffer).is_le()
     }
 
     fn overlaps(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> bool {
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index eb12e6929c..59eaa9934d 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -1686,7 +1686,7 @@ impl MultiBuffer {
         cx: &mut Context<Self>,
     ) -> (Vec<Range<Anchor>>, bool) {
         let (excerpt_ids, added_a_new_excerpt) =
-            self.update_path_excerpts(path, buffer, &buffer_snapshot, new, cx);
+            self.update_path_excerpts(path, buffer, buffer_snapshot, new, cx);
 
         let mut result = Vec::new();
         let mut ranges = ranges.into_iter();
@@ -1784,7 +1784,7 @@ impl MultiBuffer {
                     }
                     Some((
                         *existing_id,
-                        excerpt.range.context.to_point(&buffer_snapshot),
+                        excerpt.range.context.to_point(buffer_snapshot),
                     ))
                 } else {
                     None
@@ -3056,7 +3056,7 @@ impl MultiBuffer {
         snapshot.has_conflict = has_conflict;
 
         for (id, diff) in self.diffs.iter() {
-            if snapshot.diffs.get(&id).is_none() {
+            if snapshot.diffs.get(id).is_none() {
                 snapshot.diffs.insert(*id, diff.diff.read(cx).snapshot(cx));
             }
         }
@@ -3177,7 +3177,7 @@ impl MultiBuffer {
                 &mut new_diff_transforms,
                 &mut end_of_current_insert,
                 &mut old_expanded_hunks,
-                &snapshot,
+                snapshot,
                 change_kind,
             );
 
@@ -3223,7 +3223,7 @@ impl MultiBuffer {
 
                 old_expanded_hunks.clear();
                 self.push_buffer_content_transform(
-                    &snapshot,
+                    snapshot,
                     &mut new_diff_transforms,
                     excerpt_offset,
                     end_of_current_insert,
@@ -3916,8 +3916,8 @@ impl MultiBufferSnapshot {
         &self,
         range: Range<T>,
     ) -> Vec<(&BufferSnapshot, Range<usize>, ExcerptId)> {
-        let start = range.start.to_offset(&self);
-        let end = range.end.to_offset(&self);
+        let start = range.start.to_offset(self);
+        let end = range.end.to_offset(self);
 
         let mut cursor = self.cursor::<usize>();
         cursor.seek(&start);
@@ -3955,8 +3955,8 @@ impl MultiBufferSnapshot {
         &self,
         range: Range<T>,
     ) -> impl Iterator<Item = (&BufferSnapshot, Range<usize>, ExcerptId, Option<Anchor>)> + '_ {
-        let start = range.start.to_offset(&self);
-        let end = range.end.to_offset(&self);
+        let start = range.start.to_offset(self);
+        let end = range.end.to_offset(self);
 
         let mut cursor = self.cursor::<usize>();
         cursor.seek(&start);
@@ -4186,7 +4186,7 @@ impl MultiBufferSnapshot {
                 }
                 let start =
                     Anchor::in_buffer(excerpt.id, excerpt.buffer_id, hunk.buffer_range.start)
-                        .to_point(&self);
+                        .to_point(self);
                 return Some(MultiBufferRow(start.row));
             }
         }
@@ -4204,7 +4204,7 @@ impl MultiBufferSnapshot {
                 continue;
             };
             let start = Anchor::in_buffer(excerpt.id, excerpt.buffer_id, hunk.buffer_range.start)
-                .to_point(&self);
+                .to_point(self);
             return Some(MultiBufferRow(start.row));
         }
     }
@@ -4455,7 +4455,7 @@ impl MultiBufferSnapshot {
             let mut buffer_position = region.buffer_range.start;
             buffer_position.add_assign(&overshoot);
             let clipped_buffer_position =
-                clip_buffer_position(&region.buffer, buffer_position, bias);
+                clip_buffer_position(region.buffer, buffer_position, bias);
             let mut position = region.range.start;
             position.add_assign(&(clipped_buffer_position - region.buffer_range.start));
             position
@@ -4485,7 +4485,7 @@ impl MultiBufferSnapshot {
             let buffer_start_value = region.buffer_range.start.value.unwrap();
             let mut buffer_key = buffer_start_key;
             buffer_key.add_assign(&(key - start_key));
-            let buffer_value = convert_buffer_dimension(&region.buffer, buffer_key);
+            let buffer_value = convert_buffer_dimension(region.buffer, buffer_key);
             let mut result = start_value;
             result.add_assign(&(buffer_value - buffer_start_value));
             result
@@ -4633,7 +4633,7 @@ impl MultiBufferSnapshot {
                         .as_str()
                         == **delimiter
                     {
-                        indent.push_str(&delimiter);
+                        indent.push_str(delimiter);
                         break;
                     }
                 }
@@ -4897,8 +4897,8 @@ impl MultiBufferSnapshot {
                         if let Some(base_text) =
                             self.diffs.get(buffer_id).map(|diff| diff.base_text())
                         {
-                            if base_text.can_resolve(&diff_base_anchor) {
-                                let base_text_offset = diff_base_anchor.to_offset(&base_text);
+                            if base_text.can_resolve(diff_base_anchor) {
+                                let base_text_offset = diff_base_anchor.to_offset(base_text);
                                 if base_text_offset >= base_text_byte_range.start
                                     && base_text_offset <= base_text_byte_range.end
                                 {
@@ -6418,7 +6418,7 @@ impl MultiBufferSnapshot {
 
         for (ix, entry) in excerpt_ids.iter().enumerate() {
             if ix == 0 {
-                if entry.id.cmp(&ExcerptId::min(), &self).is_le() {
+                if entry.id.cmp(&ExcerptId::min(), self).is_le() {
                     panic!("invalid first excerpt id {:?}", entry.id);
                 }
             } else if entry.id <= excerpt_ids[ix - 1].id {
@@ -6648,7 +6648,7 @@ where
                 hunk_info,
                 ..
             } => {
-                let diff = self.diffs.get(&buffer_id)?;
+                let diff = self.diffs.get(buffer_id)?;
                 let buffer = diff.base_text();
                 let mut rope_cursor = buffer.as_rope().cursor(0);
                 let buffer_start = rope_cursor.summary::<D>(base_text_byte_range.start);
@@ -7767,7 +7767,7 @@ impl<'a> Iterator for MultiBufferChunks<'a> {
                     }
                     chunks
                 } else {
-                    let base_buffer = &self.diffs.get(&buffer_id)?.base_text();
+                    let base_buffer = &self.diffs.get(buffer_id)?.base_text();
                     base_buffer.chunks(base_text_start..base_text_end, self.language_aware)
                 };
 
diff --git a/crates/multi_buffer/src/multi_buffer_tests.rs b/crates/multi_buffer/src/multi_buffer_tests.rs
index 824efa559f..fefeddb4da 100644
--- a/crates/multi_buffer/src/multi_buffer_tests.rs
+++ b/crates/multi_buffer/src/multi_buffer_tests.rs
@@ -473,7 +473,7 @@ fn test_editing_text_in_diff_hunks(cx: &mut TestAppContext) {
     let base_text = "one\ntwo\nfour\nfive\nsix\nseven\n";
     let text = "one\ntwo\nTHREE\nfour\nfive\nseven\n";
     let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(&base_text, &buffer, cx));
+    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
     let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
 
     let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
@@ -2265,14 +2265,14 @@ impl ReferenceMultibuffer {
                 }
 
                 if !excerpt.expanded_diff_hunks.iter().any(|expanded_anchor| {
-                    expanded_anchor.to_offset(&buffer).max(buffer_range.start)
+                    expanded_anchor.to_offset(buffer).max(buffer_range.start)
                         == hunk_range.start.max(buffer_range.start)
                 }) {
                     log::trace!("skipping a hunk that's not marked as expanded");
                     continue;
                 }
 
-                if !hunk.buffer_range.start.is_valid(&buffer) {
+                if !hunk.buffer_range.start.is_valid(buffer) {
                     log::trace!("skipping hunk with deleted start: {:?}", hunk.range);
                     continue;
                 }
@@ -2449,7 +2449,7 @@ impl ReferenceMultibuffer {
                     return false;
                 }
                 while let Some(hunk) = hunks.peek() {
-                    match hunk.buffer_range.start.cmp(&hunk_anchor, &buffer) {
+                    match hunk.buffer_range.start.cmp(hunk_anchor, &buffer) {
                         cmp::Ordering::Less => {
                             hunks.next();
                         }
@@ -2519,8 +2519,8 @@ async fn test_random_set_ranges(cx: &mut TestAppContext, mut rng: StdRng) {
         let mut seen_ranges = Vec::default();
 
         for (_, buf, range) in snapshot.excerpts() {
-            let start = range.context.start.to_point(&buf);
-            let end = range.context.end.to_point(&buf);
+            let start = range.context.start.to_point(buf);
+            let end = range.context.end.to_point(buf);
             seen_ranges.push(start..end);
 
             if let Some(last_end) = last_end.take() {
@@ -2739,9 +2739,8 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
                     let id = buffer_handle.read(cx).remote_id();
                     if multibuffer.diff_for(id).is_none() {
                         let base_text = base_texts.get(&id).unwrap();
-                        let diff = cx.new(|cx| {
-                            BufferDiff::new_with_base_text(base_text, &buffer_handle, cx)
-                        });
+                        let diff = cx
+                            .new(|cx| BufferDiff::new_with_base_text(base_text, buffer_handle, cx));
                         reference.add_diff(diff.clone(), cx);
                         multibuffer.add_diff(diff, cx)
                     }
@@ -3604,7 +3603,7 @@ fn assert_position_translation(snapshot: &MultiBufferSnapshot) {
                             offsets[ix - 1],
                         );
                         assert!(
-                            prev_anchor.cmp(&anchor, snapshot).is_lt(),
+                            prev_anchor.cmp(anchor, snapshot).is_lt(),
                             "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_lt()",
                             offsets[ix - 1],
                             offsets[ix],
diff --git a/crates/multi_buffer/src/position.rs b/crates/multi_buffer/src/position.rs
index 0650875059..8a3ce78d0d 100644
--- a/crates/multi_buffer/src/position.rs
+++ b/crates/multi_buffer/src/position.rs
@@ -126,17 +126,17 @@ impl<T> Default for TypedRow<T> {
 
 impl<T> PartialOrd for TypedOffset<T> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(&other))
+        Some(self.cmp(other))
     }
 }
 impl<T> PartialOrd for TypedPoint<T> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(&other))
+        Some(self.cmp(other))
     }
 }
 impl<T> PartialOrd for TypedRow<T> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(&other))
+        Some(self.cmp(other))
     }
 }
 
diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs
index e07a8dc9fb..884374a72f 100644
--- a/crates/onboarding/src/onboarding.rs
+++ b/crates/onboarding/src/onboarding.rs
@@ -494,7 +494,7 @@ impl Onboarding {
         window
             .spawn(cx, async move |cx| {
                 client
-                    .sign_in_with_optional_connect(true, &cx)
+                    .sign_in_with_optional_connect(true, cx)
                     .await
                     .notify_async_err(cx);
             })
diff --git a/crates/onboarding/src/welcome.rs b/crates/onboarding/src/welcome.rs
index 610f6a98e3..3fe9c32a48 100644
--- a/crates/onboarding/src/welcome.rs
+++ b/crates/onboarding/src/welcome.rs
@@ -104,7 +104,7 @@ impl<const COLS: usize> Section<COLS> {
                 self.entries
                     .iter()
                     .enumerate()
-                    .map(|(index, entry)| entry.render(index_offset + index, &focus, window, cx)),
+                    .map(|(index, entry)| entry.render(index_offset + index, focus, window, cx)),
             )
     }
 }
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 004a27b0cf..9514fd7e36 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -5498,7 +5498,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5514,7 +5514,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5532,7 +5532,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5569,7 +5569,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5583,7 +5583,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5602,7 +5602,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5630,7 +5630,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5718,7 +5718,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     None,
                     cx,
@@ -5741,7 +5741,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     None,
                     cx,
@@ -5767,7 +5767,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     None,
                     cx,
@@ -5873,7 +5873,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5896,7 +5896,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5933,7 +5933,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -5970,7 +5970,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6073,7 +6073,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6099,7 +6099,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6123,7 +6123,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6144,7 +6144,7 @@ mod tests {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6232,7 +6232,7 @@ struct OutlineEntryExcerpt {
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6259,7 +6259,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6286,7 +6286,7 @@ outline: struct OutlineEntryExcerpt  <==== selected
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6313,7 +6313,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6340,7 +6340,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6367,7 +6367,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6394,7 +6394,7 @@ outline: struct OutlineEntryExcerpt  <==== selected
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6421,7 +6421,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6448,7 +6448,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6475,7 +6475,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6502,7 +6502,7 @@ outline: struct OutlineEntryExcerpt  <==== selected
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6608,7 +6608,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6645,7 +6645,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6673,7 +6673,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6705,7 +6705,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6736,7 +6736,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -6864,7 +6864,7 @@ outline: struct OutlineEntryExcerpt
                             .render_data
                             .get_or_init(|| SearchData::new(
                                 &search_entry.match_range,
-                                &multi_buffer_snapshot
+                                multi_buffer_snapshot
                             ))
                             .context_text
                     )
@@ -7255,7 +7255,7 @@ outline: struct OutlineEntryExcerpt
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7314,7 +7314,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7338,7 +7338,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7403,7 +7403,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7544,7 +7544,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7582,7 +7582,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7616,7 +7616,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
@@ -7648,7 +7648,7 @@ outline: fn main()"
             assert_eq!(
                 display_entries(
                     &project,
-                    &snapshot(&outline_panel, cx),
+                    &snapshot(outline_panel, cx),
                     &outline_panel.cached_entries,
                     outline_panel.selected_entry(),
                     cx,
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index c96ab4e8f3..f80f24bb71 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -368,7 +368,7 @@ impl ContextServerStore {
     }
 
     pub fn restart_server(&mut self, id: &ContextServerId, cx: &mut Context<Self>) -> Result<()> {
-        if let Some(state) = self.servers.get(&id) {
+        if let Some(state) = self.servers.get(id) {
             let configuration = state.configuration();
 
             self.stop_server(&state.server().id(), cx)?;
@@ -397,7 +397,7 @@ impl ContextServerStore {
             let server = server.clone();
             let configuration = configuration.clone();
             async move |this, cx| {
-                match server.clone().start(&cx).await {
+                match server.clone().start(cx).await {
                     Ok(_) => {
                         log::info!("Started {} context server", id);
                         debug_assert!(server.client().is_some());
@@ -588,7 +588,7 @@ impl ContextServerStore {
             for server_id in this.servers.keys() {
                 // All servers that are not in desired_servers should be removed from the store.
                 // This can happen if the user removed a server from the context server settings.
-                if !configured_servers.contains_key(&server_id) {
+                if !configured_servers.contains_key(server_id) {
                     if disabled_servers.contains_key(&server_id.0) {
                         servers_to_stop.insert(server_id.clone());
                     } else {
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
index 025dca4100..091189db7c 100644
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ b/crates/project/src/debugger/breakpoint_store.rs
@@ -317,8 +317,8 @@ impl BreakpointStore {
                         .iter()
                         .filter_map(|breakpoint| {
                             breakpoint.bp.bp.to_proto(
-                                &path,
-                                &breakpoint.position(),
+                                path,
+                                breakpoint.position(),
                                 &breakpoint.session_state,
                             )
                         })
@@ -753,7 +753,7 @@ impl BreakpointStore {
                         .iter()
                         .map(|breakpoint| {
                             let position = snapshot
-                                .summary_for_anchor::<PointUtf16>(&breakpoint.position())
+                                .summary_for_anchor::<PointUtf16>(breakpoint.position())
                                 .row;
                             let breakpoint = &breakpoint.bp;
                             SourceBreakpoint {
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index 6f834b5dc0..ccda64fba8 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -215,7 +215,7 @@ impl DapStore {
                     dap_settings.and_then(|s| s.binary.as_ref().map(PathBuf::from));
                 let user_args = dap_settings.map(|s| s.args.clone());
 
-                let delegate = self.delegate(&worktree, console, cx);
+                let delegate = self.delegate(worktree, console, cx);
                 let cwd: Arc<Path> = worktree.read(cx).abs_path().as_ref().into();
 
                 cx.spawn(async move |this, cx| {
@@ -902,7 +902,7 @@ impl dap::adapters::DapDelegate for DapAdapterDelegate {
     }
 
     fn worktree_root_path(&self) -> &Path {
-        &self.worktree.abs_path()
+        self.worktree.abs_path()
     }
     fn http_client(&self) -> Arc<dyn HttpClient> {
         self.http_client.clone()
diff --git a/crates/project/src/debugger/locators/cargo.rs b/crates/project/src/debugger/locators/cargo.rs
index fa265dae58..9a36584e71 100644
--- a/crates/project/src/debugger/locators/cargo.rs
+++ b/crates/project/src/debugger/locators/cargo.rs
@@ -187,12 +187,12 @@ impl DapLocator for CargoLocator {
                 .cloned();
         }
         let executable = {
-            if let Some(ref name) = test_name.as_ref().and_then(|name| {
+            if let Some(name) = test_name.as_ref().and_then(|name| {
                 name.strip_prefix('$')
                     .map(|name| build_config.env.get(name))
                     .unwrap_or(Some(name))
             }) {
-                find_best_executable(&executables, &name).await
+                find_best_executable(&executables, name).await
             } else {
                 None
             }
diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs
index d9c28df497..b5ae714841 100644
--- a/crates/project/src/debugger/session.rs
+++ b/crates/project/src/debugger/session.rs
@@ -1630,7 +1630,7 @@ impl Session {
         + 'static,
         cx: &mut Context<Self>,
     ) -> Task<Option<T::Response>> {
-        if !T::is_supported(&capabilities) {
+        if !T::is_supported(capabilities) {
             log::warn!(
                 "Attempted to send a DAP request that isn't supported: {:?}",
                 request
@@ -1688,7 +1688,7 @@ impl Session {
         self.requests
             .entry((&*key.0 as &dyn Any).type_id())
             .and_modify(|request_map| {
-                request_map.remove(&key);
+                request_map.remove(key);
             });
     }
 
diff --git a/crates/project/src/environment.rs b/crates/project/src/environment.rs
index 7379a7ef72..d109e307a8 100644
--- a/crates/project/src/environment.rs
+++ b/crates/project/src/environment.rs
@@ -198,7 +198,7 @@ async fn load_directory_shell_environment(
                 );
             };
 
-            load_shell_environment(&dir, load_direnv).await
+            load_shell_environment(dir, load_direnv).await
         }
         Err(err) => (
             None,
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 3163a10239..e8ba2425d1 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -561,7 +561,7 @@ impl GitStore {
     pub fn active_repository(&self) -> Option<Entity<Repository>> {
         self.active_repo_id
             .as_ref()
-            .map(|id| self.repositories[&id].clone())
+            .map(|id| self.repositories[id].clone())
     }
 
     pub fn open_unstaged_diff(
@@ -1277,7 +1277,7 @@ impl GitStore {
     ) {
         match event {
             BufferStoreEvent::BufferAdded(buffer) => {
-                cx.subscribe(&buffer, |this, buffer, event, cx| {
+                cx.subscribe(buffer, |this, buffer, event, cx| {
                     if let BufferEvent::LanguageChanged = event {
                         let buffer_id = buffer.read(cx).remote_id();
                         if let Some(diff_state) = this.diffs.get(&buffer_id) {
@@ -1295,7 +1295,7 @@ impl GitStore {
                 }
             }
             BufferStoreEvent::BufferDropped(buffer_id) => {
-                self.diffs.remove(&buffer_id);
+                self.diffs.remove(buffer_id);
                 for diffs in self.shared_diffs.values_mut() {
                     diffs.remove(buffer_id);
                 }
@@ -1384,8 +1384,8 @@ impl GitStore {
             repository.update(cx, |repository, cx| {
                 let repo_abs_path = &repository.work_directory_abs_path;
                 if changed_repos.iter().any(|update| {
-                    update.old_work_directory_abs_path.as_ref() == Some(&repo_abs_path)
-                        || update.new_work_directory_abs_path.as_ref() == Some(&repo_abs_path)
+                    update.old_work_directory_abs_path.as_ref() == Some(repo_abs_path)
+                        || update.new_work_directory_abs_path.as_ref() == Some(repo_abs_path)
                 }) {
                     repository.reload_buffer_diff_bases(cx);
                 }
@@ -1536,7 +1536,7 @@ impl GitStore {
             });
             if is_new {
                 this._subscriptions
-                    .push(cx.subscribe(&repo, Self::on_repository_event))
+                    .push(cx.subscribe(repo, Self::on_repository_event))
             }
 
             repo.update(cx, {
@@ -2353,7 +2353,7 @@ impl GitStore {
                     // All paths prefixed by a given repo will constitute a continuous range.
                     while let Some(path) = entries.get(ix)
                         && let Some(repo_path) =
-                            RepositorySnapshot::abs_path_to_repo_path_inner(&repo_path, &path)
+                            RepositorySnapshot::abs_path_to_repo_path_inner(&repo_path, path)
                     {
                         paths.push((repo_path, ix));
                         ix += 1;
@@ -2875,14 +2875,14 @@ impl RepositorySnapshot {
     }
 
     pub fn had_conflict_on_last_merge_head_change(&self, repo_path: &RepoPath) -> bool {
-        self.merge.conflicted_paths.contains(&repo_path)
+        self.merge.conflicted_paths.contains(repo_path)
     }
 
     pub fn has_conflict(&self, repo_path: &RepoPath) -> bool {
         let had_conflict_on_last_merge_head_change =
-            self.merge.conflicted_paths.contains(&repo_path);
+            self.merge.conflicted_paths.contains(repo_path);
         let has_conflict_currently = self
-            .status_for_path(&repo_path)
+            .status_for_path(repo_path)
             .map_or(false, |entry| entry.status.is_conflicted());
         had_conflict_on_last_merge_head_change || has_conflict_currently
     }
diff --git a/crates/project/src/git_store/git_traversal.rs b/crates/project/src/git_store/git_traversal.rs
index bbcffe046d..de5ff9b935 100644
--- a/crates/project/src/git_store/git_traversal.rs
+++ b/crates/project/src/git_store/git_traversal.rs
@@ -211,7 +211,7 @@ impl Deref for GitEntryRef<'_> {
     type Target = Entry;
 
     fn deref(&self) -> &Self::Target {
-        &self.entry
+        self.entry
     }
 }
 
diff --git a/crates/project/src/image_store.rs b/crates/project/src/image_store.rs
index 79f134b91a..54d87d230c 100644
--- a/crates/project/src/image_store.rs
+++ b/crates/project/src/image_store.rs
@@ -224,7 +224,7 @@ impl ProjectItem for ImageItem {
         path: &ProjectPath,
         cx: &mut App,
     ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-        if is_image_file(&project, &path, cx) {
+        if is_image_file(project, path, cx) {
             Some(cx.spawn({
                 let path = path.clone();
                 let project = project.clone();
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index fcfeb9c660..d5c3cc424f 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -1165,7 +1165,7 @@ pub async fn location_link_from_lsp(
     server_id: LanguageServerId,
     cx: &mut AsyncApp,
 ) -> Result<LocationLink> {
-    let (_, language_server) = language_server_for_buffer(&lsp_store, &buffer, server_id, cx)?;
+    let (_, language_server) = language_server_for_buffer(lsp_store, buffer, server_id, cx)?;
 
     let (origin_range, target_uri, target_range) = (
         link.origin_selection_range,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 11c78aad8d..1bc6770d4e 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -442,14 +442,14 @@ impl LocalLspStore {
                 match result {
                     Ok(server) => {
                         lsp_store
-                            .update(cx, |lsp_store, mut cx| {
+                            .update(cx, |lsp_store, cx| {
                                 lsp_store.insert_newly_running_language_server(
                                     adapter,
                                     server.clone(),
                                     server_id,
                                     key,
                                     pending_workspace_folders,
-                                    &mut cx,
+                                    cx,
                                 );
                             })
                             .ok();
@@ -1927,7 +1927,7 @@ impl LocalLspStore {
         if let Some(lsp_edits) = lsp_edits {
             this.update(cx, |this, cx| {
                 this.as_local_mut().unwrap().edits_from_lsp(
-                    &buffer_handle,
+                    buffer_handle,
                     lsp_edits,
                     language_server.server_id(),
                     None,
@@ -3115,7 +3115,7 @@ impl LocalLspStore {
 
         let mut servers_to_remove = BTreeSet::default();
         let mut servers_to_preserve = HashSet::default();
-        for (seed, ref state) in &self.language_server_ids {
+        for (seed, state) in &self.language_server_ids {
             if seed.worktree_id == id_to_remove {
                 servers_to_remove.insert(state.id);
             } else {
@@ -3169,7 +3169,7 @@ impl LocalLspStore {
 
         for watcher in watchers {
             if let Some((worktree, literal_prefix, pattern)) =
-                self.worktree_and_path_for_file_watcher(&worktrees, &watcher, cx)
+                self.worktree_and_path_for_file_watcher(&worktrees, watcher, cx)
             {
                 worktree.update(cx, |worktree, _| {
                     if let Some((tree, glob)) =
@@ -4131,7 +4131,7 @@ impl LspStore {
                         local.registered_buffers.remove(&buffer_id);
                         local.buffers_opened_in_servers.remove(&buffer_id);
                         if let Some(file) = File::from_dyn(buffer.read(cx).file()).cloned() {
-                            local.unregister_old_buffer_from_language_servers(&buffer, &file, cx);
+                            local.unregister_old_buffer_from_language_servers(buffer, &file, cx);
                         }
                     }
                 })
@@ -4453,7 +4453,7 @@ impl LspStore {
                     .contains(&server_status.name)
                     .then_some(server_id)
             })
-            .filter_map(|server_id| self.lsp_server_capabilities.get(&server_id))
+            .filter_map(|server_id| self.lsp_server_capabilities.get(server_id))
             .any(check)
     }
 
@@ -5419,7 +5419,7 @@ impl LspStore {
     ) -> Task<Result<Vec<LocationLink>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetTypeDefinitions { position };
-            if !self.is_capable_for_proto_request(&buffer, &request, cx) {
+            if !self.is_capable_for_proto_request(buffer, &request, cx) {
                 return Task::ready(Ok(Vec::new()));
             }
             let request_task = upstream_client.request(proto::MultiLspQuery {
@@ -5573,7 +5573,7 @@ impl LspStore {
     ) -> Task<Result<Vec<Location>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetReferences { position };
-            if !self.is_capable_for_proto_request(&buffer, &request, cx) {
+            if !self.is_capable_for_proto_request(buffer, &request, cx) {
                 return Task::ready(Ok(Vec::new()));
             }
             let request_task = upstream_client.request(proto::MultiLspQuery {
@@ -5755,7 +5755,7 @@ impl LspStore {
 
         let lsp_data = self.lsp_code_lens.entry(buffer_id).or_default();
         if let Some((updating_for, running_update)) = &lsp_data.update {
-            if !version_queried_for.changed_since(&updating_for) {
+            if !version_queried_for.changed_since(updating_for) {
                 return running_update.clone();
             }
         }
@@ -6786,7 +6786,7 @@ impl LspStore {
 
         let lsp_data = self.lsp_document_colors.entry(buffer_id).or_default();
         if let Some((updating_for, running_update)) = &lsp_data.colors_update {
-            if !version_queried_for.changed_since(&updating_for) {
+            if !version_queried_for.changed_since(updating_for) {
                 return Some(running_update.clone());
             }
         }
@@ -10057,7 +10057,7 @@ impl LspStore {
     ) -> Shared<Task<Option<HashMap<String, String>>>> {
         if let Some(environment) = &self.as_local().map(|local| local.environment.clone()) {
             environment.update(cx, |env, cx| {
-                env.get_buffer_environment(&buffer, &self.worktree_store, cx)
+                env.get_buffer_environment(buffer, &self.worktree_store, cx)
             })
         } else {
             Task::ready(None).shared()
@@ -11175,7 +11175,7 @@ impl LspStore {
         let Some(local) = self.as_local() else { return };
 
         local.prettier_store.update(cx, |prettier_store, cx| {
-            prettier_store.update_prettier_settings(&worktree_handle, changes, cx)
+            prettier_store.update_prettier_settings(worktree_handle, changes, cx)
         });
 
         let worktree_id = worktree_handle.read(cx).id();
diff --git a/crates/project/src/manifest_tree.rs b/crates/project/src/manifest_tree.rs
index 8621d24d06..f68905d14c 100644
--- a/crates/project/src/manifest_tree.rs
+++ b/crates/project/src/manifest_tree.rs
@@ -199,7 +199,7 @@ impl ManifestTree {
     ) {
         match evt {
             WorktreeStoreEvent::WorktreeRemoved(_, worktree_id) => {
-                self.root_points.remove(&worktree_id);
+                self.root_points.remove(worktree_id);
             }
             _ => {}
         }
diff --git a/crates/project/src/manifest_tree/server_tree.rs b/crates/project/src/manifest_tree/server_tree.rs
index 49c0cff730..7da43feeef 100644
--- a/crates/project/src/manifest_tree/server_tree.rs
+++ b/crates/project/src/manifest_tree/server_tree.rs
@@ -192,7 +192,7 @@ impl LanguageServerTree {
                 )
             });
             languages.insert(language_name.clone());
-            Arc::downgrade(&node).into()
+            Arc::downgrade(node).into()
         })
     }
 
@@ -245,7 +245,7 @@ impl LanguageServerTree {
         if !settings.enable_language_server {
             return Default::default();
         }
-        let available_lsp_adapters = self.languages.lsp_adapters(&language_name);
+        let available_lsp_adapters = self.languages.lsp_adapters(language_name);
         let available_language_servers = available_lsp_adapters
             .iter()
             .map(|lsp_adapter| lsp_adapter.name.clone())
@@ -287,7 +287,7 @@ impl LanguageServerTree {
         // (e.g., native vs extension) still end up in the right order at the end, rather than
         // it being based on which language server happened to be loaded in first.
         self.languages.reorder_language_servers(
-            &language_name,
+            language_name,
             adapters_with_settings
                 .values()
                 .map(|(_, adapter)| adapter.clone())
@@ -314,7 +314,7 @@ impl LanguageServerTree {
     pub(crate) fn remove_nodes(&mut self, ids: &BTreeSet<LanguageServerId>) {
         for (_, servers) in &mut self.instances {
             for (_, nodes) in &mut servers.roots {
-                nodes.retain(|_, (node, _)| node.id.get().map_or(true, |id| !ids.contains(&id)));
+                nodes.retain(|_, (node, _)| node.id.get().map_or(true, |id| !ids.contains(id)));
             }
         }
     }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 57afaceeca..17997850b6 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1848,7 +1848,7 @@ impl Project {
         cx: &'a mut App,
     ) -> Shared<Task<Option<HashMap<String, String>>>> {
         self.environment.update(cx, |environment, cx| {
-            environment.get_buffer_environment(&buffer, &worktree_store, cx)
+            environment.get_buffer_environment(buffer, worktree_store, cx)
         })
     }
 
@@ -2592,7 +2592,7 @@ impl Project {
         cx: &mut App,
     ) -> OpenLspBufferHandle {
         self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.register_buffer_with_language_servers(&buffer, HashSet::default(), false, cx)
+            lsp_store.register_buffer_with_language_servers(buffer, HashSet::default(), false, cx)
         })
     }
 
@@ -4167,15 +4167,14 @@ impl Project {
             })
             .collect();
 
-        cx.spawn(async move |_, mut cx| {
+        cx.spawn(async move |_, cx| {
             if let Some(buffer_worktree_id) = buffer_worktree_id {
                 if let Some((worktree, _)) = worktrees_with_ids
                     .iter()
                     .find(|(_, id)| *id == buffer_worktree_id)
                 {
                     for candidate in candidates.iter() {
-                        if let Some(path) =
-                            Self::resolve_path_in_worktree(&worktree, candidate, &mut cx)
+                        if let Some(path) = Self::resolve_path_in_worktree(worktree, candidate, cx)
                         {
                             return Some(path);
                         }
@@ -4187,9 +4186,7 @@ impl Project {
                     continue;
                 }
                 for candidate in candidates.iter() {
-                    if let Some(path) =
-                        Self::resolve_path_in_worktree(&worktree, candidate, &mut cx)
-                    {
+                    if let Some(path) = Self::resolve_path_in_worktree(&worktree, candidate, cx) {
                         return Some(path);
                     }
                 }
@@ -5329,7 +5326,7 @@ impl ResolvedPath {
 
     pub fn project_path(&self) -> Option<&ProjectPath> {
         match self {
-            Self::ProjectPath { project_path, .. } => Some(&project_path),
+            Self::ProjectPath { project_path, .. } => Some(project_path),
             _ => None,
         }
     }
@@ -5399,7 +5396,7 @@ impl Completion {
                 _ => None,
             })
             .unwrap_or(DEFAULT_KIND_KEY);
-        (kind_key, &self.label.filter_text())
+        (kind_key, self.label.filter_text())
     }
 
     /// Whether this completion is a snippet.
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index d78526ddd0..050ca60e7a 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -1105,7 +1105,7 @@ impl SettingsObserver {
         cx: &mut Context<Self>,
     ) -> Task<()> {
         let mut user_tasks_file_rx =
-            watch_config_file(&cx.background_executor(), fs, file_path.clone());
+            watch_config_file(cx.background_executor(), fs, file_path.clone());
         let user_tasks_content = cx.background_executor().block(user_tasks_file_rx.next());
         let weak_entry = cx.weak_entity();
         cx.spawn(async move |settings_observer, cx| {
@@ -1160,7 +1160,7 @@ impl SettingsObserver {
         cx: &mut Context<Self>,
     ) -> Task<()> {
         let mut user_tasks_file_rx =
-            watch_config_file(&cx.background_executor(), fs, file_path.clone());
+            watch_config_file(cx.background_executor(), fs, file_path.clone());
         let user_tasks_content = cx.background_executor().block(user_tasks_file_rx.next());
         let weak_entry = cx.weak_entity();
         cx.spawn(async move |settings_observer, cx| {
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
index d0f1c71daf..8d8a1bd008 100644
--- a/crates/project/src/task_inventory.rs
+++ b/crates/project/src/task_inventory.rs
@@ -333,7 +333,7 @@ impl Inventory {
 
                     for locator in locators.values() {
                         if let Some(scenario) = locator
-                            .create_scenario(&task.original_task(), &task.display_label(), &adapter)
+                            .create_scenario(task.original_task(), task.display_label(), &adapter)
                             .await
                         {
                             scenarios.push((kind, scenario));
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index d5ddd89419..892847a380 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -503,7 +503,7 @@ impl ProjectPanel {
                     if let Some((worktree, expanded_dir_ids)) = project
                         .read(cx)
                         .worktree_for_id(*worktree_id, cx)
-                        .zip(this.expanded_dir_ids.get_mut(&worktree_id))
+                        .zip(this.expanded_dir_ids.get_mut(worktree_id))
                     {
                         let worktree = worktree.read(cx);
 
@@ -3043,7 +3043,7 @@ impl ProjectPanel {
                 if hide_root && Some(entry.entry) == worktree.read(cx).root_entry() {
                     if new_entry_parent_id == Some(entry.id) {
                         visible_worktree_entries.push(Self::create_new_git_entry(
-                            &entry.entry,
+                            entry.entry,
                             entry.git_summary,
                             new_entry_kind,
                         ));
@@ -3106,7 +3106,7 @@ impl ProjectPanel {
                 };
                 if precedes_new_entry && (!hide_gitignore || !entry.is_ignored) {
                     visible_worktree_entries.push(Self::create_new_git_entry(
-                        &entry.entry,
+                        entry.entry,
                         entry.git_summary,
                         new_entry_kind,
                     ));
@@ -3503,7 +3503,7 @@ impl ProjectPanel {
             let base_index = ix + entry_range.start;
             for (i, entry) in visible.entries[entry_range].iter().enumerate() {
                 let global_index = base_index + i;
-                callback(&entry, global_index, entries, window, cx);
+                callback(entry, global_index, entries, window, cx);
             }
             ix = end_ix;
         }
@@ -4669,7 +4669,7 @@ impl ProjectPanel {
         };
 
         let (depth, difference) =
-            ProjectPanel::calculate_depth_and_difference(&entry, entries_paths);
+            ProjectPanel::calculate_depth_and_difference(entry, entries_paths);
 
         let filename = match difference {
             diff if diff > 1 => entry
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 47aed8f470..9fffbde5f7 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -191,7 +191,7 @@ impl PickerDelegate for ProjectSymbolsDelegate {
                         .iter()
                         .enumerate()
                         .map(|(id, symbol)| {
-                            StringMatchCandidate::new(id, &symbol.label.filter_text())
+                            StringMatchCandidate::new(id, symbol.label.filter_text())
                         })
                         .partition(|candidate| {
                             project
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 81259c1aac..bc837b1a1e 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1490,7 +1490,7 @@ impl RemoteServerProjects {
                 .track_focus(&self.focus_handle(cx))
                 .id("ssh-server-list")
                 .overflow_y_scroll()
-                .track_scroll(&scroll_handle)
+                .track_scroll(scroll_handle)
                 .size_full()
                 .child(connect_button)
                 .child(
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index ea383ac264..71e8f6e8e7 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -730,7 +730,7 @@ impl SshRemoteClient {
                     cx,
                 );
 
-                let multiplex_task = Self::monitor(this.downgrade(), io_task, &cx);
+                let multiplex_task = Self::monitor(this.downgrade(), io_task, cx);
 
                 if let Err(error) = client.ping(HEARTBEAT_TIMEOUT).await {
                     log::error!("failed to establish connection: {}", error);
@@ -918,8 +918,8 @@ impl SshRemoteClient {
                 }
             };
 
-            let multiplex_task = Self::monitor(this.clone(), io_task, &cx);
-            client.reconnect(incoming_rx, outgoing_tx, &cx);
+            let multiplex_task = Self::monitor(this.clone(), io_task, cx);
+            client.reconnect(incoming_rx, outgoing_tx, cx);
 
             if let Err(error) = client.resync(HEARTBEAT_TIMEOUT).await {
                 failed!(error, attempts, ssh_connection, delegate);
@@ -1005,8 +1005,8 @@ impl SshRemoteClient {
 
                             if missed_heartbeats != 0 {
                                 missed_heartbeats = 0;
-                                let _ =this.update(cx, |this, mut cx| {
-                                    this.handle_heartbeat_result(missed_heartbeats, &mut cx)
+                                let _ =this.update(cx, |this, cx| {
+                                    this.handle_heartbeat_result(missed_heartbeats, cx)
                                 })?;
                             }
                         }
@@ -1036,8 +1036,8 @@ impl SshRemoteClient {
                                 continue;
                             }
 
-                            let result = this.update(cx, |this, mut cx| {
-                                this.handle_heartbeat_result(missed_heartbeats, &mut cx)
+                            let result = this.update(cx, |this, cx| {
+                                this.handle_heartbeat_result(missed_heartbeats, cx)
                             })?;
                             if result.is_break() {
                                 return Ok(());
@@ -1214,7 +1214,7 @@ impl SshRemoteClient {
                 .await
                 .unwrap();
 
-            connection.simulate_disconnect(&cx);
+            connection.simulate_disconnect(cx);
         })
     }
 
@@ -1523,7 +1523,7 @@ impl RemoteConnection for SshRemoteConnection {
             incoming_tx,
             outgoing_rx,
             connection_activity_tx,
-            &cx,
+            cx,
         )
     }
 
@@ -1908,8 +1908,8 @@ impl SshRemoteConnection {
                     "-H",
                     "Content-Type: application/json",
                     "-d",
-                    &body,
-                    &url,
+                    body,
+                    url,
                     "-o",
                     &tmp_path_gz.to_string(),
                 ],
@@ -1930,8 +1930,8 @@ impl SshRemoteConnection {
                             "--method=GET",
                             "--header=Content-Type: application/json",
                             "--body-data",
-                            &body,
-                            &url,
+                            body,
+                            url,
                             "-O",
                             &tmp_path_gz.to_string(),
                         ],
@@ -1982,7 +1982,7 @@ impl SshRemoteConnection {
             tmp_path_gz,
             size / 1024
         );
-        self.upload_file(&src_path, &tmp_path_gz)
+        self.upload_file(src_path, tmp_path_gz)
             .await
             .context("failed to upload server binary")?;
         log::info!("uploaded remote development server in {:?}", t0.elapsed());
@@ -2654,7 +2654,7 @@ mod fake {
             let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
             let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
             self.server_channel
-                .reconnect(incoming_rx, outgoing_tx, &self.server_cx.get(&cx));
+                .reconnect(incoming_rx, outgoing_tx, &self.server_cx.get(cx));
         }
 
         fn start_proxy(
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index ac1737ba4b..6b0cc2219f 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -348,7 +348,7 @@ impl HeadlessProject {
                         .iter()
                         .map(|action| action.title.to_string())
                         .collect(),
-                    level: Some(prompt_to_proto(&prompt)),
+                    level: Some(prompt_to_proto(prompt)),
                     lsp_name: prompt.lsp_name.clone(),
                     message: prompt.message.clone(),
                 });
@@ -388,7 +388,7 @@ impl HeadlessProject {
                 let parent = fs.canonicalize(parent).await.map_err(|_| {
                     anyhow!(
                         proto::ErrorCode::DevServerProjectPathDoesNotExist
-                            .with_tag("path", &path.to_string_lossy().as_ref())
+                            .with_tag("path", path.to_string_lossy().as_ref())
                     )
                 })?;
                 parent.join(path.file_name().unwrap())
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index dc7fab8c3c..4daacb3eec 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -155,7 +155,7 @@ fn init_panic_hook(session_id: String) {
         log::error!(
             "panic occurred: {}\nBacktrace:\n{}",
             &payload,
-            (&backtrace).join("\n")
+            backtrace.join("\n")
         );
 
         let panic_data = telemetry_events::Panic {
@@ -796,11 +796,8 @@ fn initialize_settings(
     fs: Arc<dyn Fs>,
     cx: &mut App,
 ) -> watch::Receiver<Option<NodeBinaryOptions>> {
-    let user_settings_file_rx = watch_config_file(
-        &cx.background_executor(),
-        fs,
-        paths::settings_file().clone(),
-    );
+    let user_settings_file_rx =
+        watch_config_file(cx.background_executor(), fs, paths::settings_file().clone());
 
     handle_settings_file_changes(user_settings_file_rx, cx, {
         let session = session.clone();
diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rs
index 36a0af30d0..a84f147dd2 100644
--- a/crates/repl/src/notebook/notebook_ui.rs
+++ b/crates/repl/src/notebook/notebook_ui.rs
@@ -575,7 +575,7 @@ impl project::ProjectItem for NotebookItem {
                     .with_context(|| format!("finding the absolute path of {path:?}"))?;
 
                 // todo: watch for changes to the file
-                let file_content = fs.load(&abs_path.as_path()).await?;
+                let file_content = fs.load(abs_path.as_path()).await?;
                 let notebook = nbformat::parse_notebook(&file_content);
 
                 let notebook = match notebook {
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
index dc00674380..96f7d1db11 100644
--- a/crates/rope/src/chunk.rs
+++ b/crates/rope/src/chunk.rs
@@ -49,7 +49,7 @@ impl Chunk {
         self.chars_utf16 |= slice.chars_utf16 << base_ix;
         self.newlines |= slice.newlines << base_ix;
         self.tabs |= slice.tabs << base_ix;
-        self.text.push_str(&slice.text);
+        self.text.push_str(slice.text);
     }
 
     #[inline(always)]
@@ -623,7 +623,7 @@ mod tests {
         let text = &text[..ix];
 
         log::info!("Chunk: {:?}", text);
-        let chunk = Chunk::new(&text);
+        let chunk = Chunk::new(text);
         verify_chunk(chunk.as_slice(), text);
 
         for _ in 0..10 {
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index 904c74d03c..1afbc2c23b 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -142,7 +142,7 @@ impl SearchOption {
             SearchSource::Buffer => {
                 let focus_handle = focus_handle.clone();
                 button.on_click(move |_: &ClickEvent, window, cx| {
-                    if !focus_handle.is_focused(&window) {
+                    if !focus_handle.is_focused(window) {
                         window.focus(&focus_handle);
                     }
                     window.dispatch_action(action.boxed_clone(), cx);
diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs
index 8cc838a8a6..44f6b3fdd2 100644
--- a/crates/search/src/search_bar.rs
+++ b/crates/search/src/search_bar.rs
@@ -26,7 +26,7 @@ pub(super) fn render_action_button(
     .on_click({
         let focus_handle = focus_handle.clone();
         move |_, window, cx| {
-            if !focus_handle.is_focused(&window) {
+            if !focus_handle.is_focused(window) {
                 window.focus(&focus_handle);
             }
             window.dispatch_action(action.boxed_clone(), cx)
diff --git a/crates/semantic_index/src/summary_index.rs b/crates/semantic_index/src/summary_index.rs
index 6e3aae1344..20858c8d3f 100644
--- a/crates/semantic_index/src/summary_index.rs
+++ b/crates/semantic_index/src/summary_index.rs
@@ -324,7 +324,7 @@ impl SummaryIndex {
     ) -> Vec<(Arc<Path>, Option<MTime>)> {
         let entry_db_key = db_key_for_path(&entry.path);
 
-        match digest_db.get(&txn, &entry_db_key) {
+        match digest_db.get(txn, &entry_db_key) {
             Ok(opt_saved_digest) => {
                 // The file path is the same, but the mtime is different. (Or there was no mtime.)
                 // It needs updating, so add it to the backlog! Then, if the backlog is full, drain it and summarize its contents.
@@ -575,7 +575,7 @@ impl SummaryIndex {
 
         let code_len = code.len();
         cx.spawn(async move |cx| {
-            let stream = model.stream_completion(request, &cx);
+            let stream = model.stream_completion(request, cx);
             cx.background_spawn(async move {
                 let answer: String = stream
                     .await?
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index fb03662290..b0f7d2449e 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -358,11 +358,11 @@ impl KeymapFile {
                 let action_input = items[1].clone();
                 let action_input_string = action_input.to_string();
                 (
-                    cx.build_action(&name, Some(action_input)),
+                    cx.build_action(name, Some(action_input)),
                     Some(action_input_string),
                 )
             }
-            Value::String(name) => (cx.build_action(&name, None), None),
+            Value::String(name) => (cx.build_action(name, None), None),
             Value::Null => (Ok(NoAction.boxed_clone()), None),
             _ => {
                 return Err(format!(
@@ -839,7 +839,7 @@ impl KeymapFile {
                     if &action.0 != target_action_value {
                         continue;
                     }
-                    return Some((index, &keystrokes_str));
+                    return Some((index, keystrokes_str));
                 }
             }
             None
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 5181d86a78..58090d2060 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -270,7 +270,7 @@ impl ConflictState {
 
             for origin in indices.iter() {
                 conflicts[origin.index] =
-                    origin.get_conflict_with(if origin == fst { &snd } else { &fst })
+                    origin.get_conflict_with(if origin == fst { snd } else { fst })
             }
 
             has_user_conflicts |= fst.override_source == KeybindSource::User
@@ -673,8 +673,8 @@ impl KeymapEditor {
                 action_name,
                 action_arguments,
                 &actions_with_schemas,
-                &action_documentation,
-                &humanized_action_names,
+                action_documentation,
+                humanized_action_names,
             );
 
             let index = processed_bindings.len();
@@ -696,8 +696,8 @@ impl KeymapEditor {
                 action_name,
                 None,
                 &actions_with_schemas,
-                &action_documentation,
-                &humanized_action_names,
+                action_documentation,
+                humanized_action_names,
             );
             let string_match_candidate =
                 StringMatchCandidate::new(index, &action_information.humanized_name);
@@ -2187,7 +2187,7 @@ impl KeybindingEditorModal {
             })
             .transpose()?;
 
-        cx.build_action(&self.editing_keybind.action().name, value)
+        cx.build_action(self.editing_keybind.action().name, value)
             .context("Failed to validate action arguments")?;
         Ok(action_arguments)
     }
@@ -2862,11 +2862,8 @@ impl CompletionProvider for KeyContextCompletionProvider {
                 break;
             }
         }
-        let start_anchor = buffer.anchor_before(
-            buffer_position
-                .to_offset(&buffer)
-                .saturating_sub(count_back),
-        );
+        let start_anchor =
+            buffer.anchor_before(buffer_position.to_offset(buffer).saturating_sub(count_back));
         let replace_range = start_anchor..buffer_position;
         gpui::Task::ready(Ok(vec![project::CompletionResponse {
             completions: self
@@ -2983,14 +2980,14 @@ async fn save_keybinding_update(
     let target = settings::KeybindUpdateTarget {
         context: existing_context,
         keystrokes: existing_keystrokes,
-        action_name: &existing.action().name,
+        action_name: existing.action().name,
         action_arguments: existing_args,
     };
 
     let source = settings::KeybindUpdateTarget {
         context: action_mapping.context.as_ref().map(|a| &***a),
         keystrokes: &action_mapping.keystrokes,
-        action_name: &existing.action().name,
+        action_name: existing.action().name,
         action_arguments: new_args,
     };
 
@@ -3044,7 +3041,7 @@ async fn remove_keybinding(
         target: settings::KeybindUpdateTarget {
             context: existing.context().and_then(KeybindContextString::local_str),
             keystrokes,
-            action_name: &existing.action().name,
+            action_name: existing.action().name,
             action_arguments: existing
                 .action()
                 .arguments
diff --git a/crates/settings_ui/src/ui_components/table.rs b/crates/settings_ui/src/ui_components/table.rs
index 2b3e815f36..66dd636d21 100644
--- a/crates/settings_ui/src/ui_components/table.rs
+++ b/crates/settings_ui/src/ui_components/table.rs
@@ -343,7 +343,7 @@ impl TableInteractionState {
             .on_any_mouse_down(|_, _, cx| {
                 cx.stop_propagation();
             })
-            .on_scroll_wheel(Self::listener(&this, |_, _, _, cx| {
+            .on_scroll_wheel(Self::listener(this, |_, _, _, cx| {
                 cx.notify();
             }))
             .children(Scrollbar::vertical(
diff --git a/crates/streaming_diff/src/streaming_diff.rs b/crates/streaming_diff/src/streaming_diff.rs
index f7649b1bf1..704164e01e 100644
--- a/crates/streaming_diff/src/streaming_diff.rs
+++ b/crates/streaming_diff/src/streaming_diff.rs
@@ -303,10 +303,10 @@ impl LineDiff {
                         self.flush_insert(old_text);
                         self.buffered_insert.push_str(suffix);
                     } else {
-                        self.buffered_insert.push_str(&text);
+                        self.buffered_insert.push_str(text);
                     }
                 } else {
-                    self.buffered_insert.push_str(&text);
+                    self.buffered_insert.push_str(text);
                     if !text.ends_with('\n') {
                         self.flush_insert(old_text);
                     }
@@ -523,7 +523,7 @@ mod tests {
             apply_line_operations(old_text, &new_text, &expected_line_ops)
         );
 
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(line_ops, expected_line_ops);
     }
 
@@ -534,7 +534,7 @@ mod tests {
             CharOperation::Keep { bytes: 5 },
             CharOperation::Delete { bytes: 4 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -559,7 +559,7 @@ mod tests {
                 text: "\ncccc".into(),
             },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -582,7 +582,7 @@ mod tests {
             CharOperation::Delete { bytes: 5 },
             CharOperation::Keep { bytes: 4 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -609,7 +609,7 @@ mod tests {
             },
             CharOperation::Keep { bytes: 5 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -638,7 +638,7 @@ mod tests {
                 text: "\nEEEE".into(),
             },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -664,7 +664,7 @@ mod tests {
             CharOperation::Insert { text: "A".into() },
             CharOperation::Keep { bytes: 10 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -689,7 +689,7 @@ mod tests {
             CharOperation::Keep { bytes: 4 },
         ];
         let new_text = apply_char_operations(old_text, &char_ops);
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -710,7 +710,7 @@ mod tests {
             CharOperation::Insert { text: "\n".into() },
             CharOperation::Keep { bytes: 9 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -733,7 +733,7 @@ mod tests {
             CharOperation::Delete { bytes: 1 },
             CharOperation::Keep { bytes: 4 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -759,7 +759,7 @@ mod tests {
             },
             CharOperation::Keep { bytes: 4 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -783,7 +783,7 @@ mod tests {
             CharOperation::Delete { bytes: 2 },
             CharOperation::Keep { bytes: 4 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
@@ -814,7 +814,7 @@ mod tests {
             },
             CharOperation::Keep { bytes: 6 },
         ];
-        let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
         assert_eq!(
             line_ops,
             vec![
diff --git a/crates/task/src/vscode_debug_format.rs b/crates/task/src/vscode_debug_format.rs
index 2990716686..e688760a5e 100644
--- a/crates/task/src/vscode_debug_format.rs
+++ b/crates/task/src/vscode_debug_format.rs
@@ -131,7 +131,7 @@ mod tests {
             }
         "#;
         let parsed: VsCodeDebugTaskFile =
-            serde_json_lenient::from_str(&raw).expect("deserializing launch.json");
+            serde_json_lenient::from_str(raw).expect("deserializing launch.json");
         let zed = DebugTaskFile::try_from(parsed).expect("converting to Zed debug templates");
         pretty_assertions::assert_eq!(
             zed,
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 86728cc11c..2f3b7aa28d 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -890,15 +890,15 @@ impl Terminal {
                 if self.vi_mode_enabled {
                     match *scroll {
                         AlacScroll::Delta(delta) => {
-                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(&term, delta);
+                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(term, delta);
                         }
                         AlacScroll::PageUp => {
                             let lines = term.screen_lines() as i32;
-                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(&term, lines);
+                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(term, lines);
                         }
                         AlacScroll::PageDown => {
                             let lines = -(term.screen_lines() as i32);
-                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(&term, lines);
+                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(term, lines);
                         }
                         AlacScroll::Top => {
                             let point = AlacPoint::new(term.topmost_line(), Column(0));
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 568dc1db2e..cdf405b642 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -346,7 +346,7 @@ impl TerminalPanel {
             pane::Event::RemovedItem { .. } => self.serialize(cx),
             pane::Event::Remove { focus_on_pane } => {
                 let pane_count_before_removal = self.center.panes().len();
-                let _removal_result = self.center.remove(&pane);
+                let _removal_result = self.center.remove(pane);
                 if pane_count_before_removal == 1 {
                     self.center.first_pane().update(cx, |pane, cx| {
                         pane.set_zoomed(false, cx);
@@ -1181,10 +1181,10 @@ impl Render for TerminalPanel {
                 registrar.size_full().child(self.center.render(
                     workspace.zoomed_item(),
                     &workspace::PaneRenderContext {
-                        follower_states: &&HashMap::default(),
+                        follower_states: &HashMap::default(),
                         active_call: workspace.active_call(),
                         active_pane: &self.active_pane,
-                        app_state: &workspace.app_state(),
+                        app_state: workspace.app_state(),
                         project: workspace.project(),
                         workspace: &workspace.weak_handle(),
                     },
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 534c0a8051..559faea42a 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1604,15 +1604,15 @@ impl Item for TerminalView {
                 TaskStatus::Running => (
                     IconName::PlayFilled,
                     Color::Disabled,
-                    TerminalView::rerun_button(&terminal_task),
+                    TerminalView::rerun_button(terminal_task),
                 ),
                 TaskStatus::Unknown => (
                     IconName::Warning,
                     Color::Warning,
-                    TerminalView::rerun_button(&terminal_task),
+                    TerminalView::rerun_button(terminal_task),
                 ),
                 TaskStatus::Completed { success } => {
-                    let rerun_button = TerminalView::rerun_button(&terminal_task);
+                    let rerun_button = TerminalView::rerun_button(terminal_task);
 
                     if *success {
                         (IconName::Check, Color::Success, rerun_button)
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index eb317a5616..84622888f1 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -478,7 +478,7 @@ impl TitleBar {
             repo.branch
                 .as_ref()
                 .map(|branch| branch.name())
-                .map(|name| util::truncate_and_trailoff(&name, MAX_BRANCH_NAME_LENGTH))
+                .map(|name| util::truncate_and_trailoff(name, MAX_BRANCH_NAME_LENGTH))
                 .or_else(|| {
                     repo.head_commit.as_ref().map(|commit| {
                         commit
@@ -617,7 +617,7 @@ impl TitleBar {
                 window
                     .spawn(cx, async move |cx| {
                         client
-                            .sign_in_with_optional_connect(true, &cx)
+                            .sign_in_with_optional_connect(true, cx)
                             .await
                             .notify_async_err(cx);
                     })
diff --git a/crates/ui/src/components/indent_guides.rs b/crates/ui/src/components/indent_guides.rs
index e3dc1f35fa..5e6f4ee8ba 100644
--- a/crates/ui/src/components/indent_guides.rs
+++ b/crates/ui/src/components/indent_guides.rs
@@ -216,7 +216,7 @@ mod uniform_list {
             };
             let visible_entries = &compute_indents_fn(visible_range.clone(), window, cx);
             let indent_guides = compute_indent_guides(
-                &visible_entries,
+                visible_entries,
                 visible_range.start,
                 includes_trailing_indent,
             );
@@ -241,7 +241,7 @@ mod sticky_items {
             window: &mut Window,
             cx: &mut App,
         ) -> AnyElement {
-            let indent_guides = compute_indent_guides(&indents, 0, false);
+            let indent_guides = compute_indent_guides(indents, 0, false);
             self.render_from_layout(indent_guides, bounds, item_height, window, cx)
         }
     }
diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs
index 56be867796..bbce6101f4 100644
--- a/crates/ui/src/components/keybinding.rs
+++ b/crates/ui/src/components/keybinding.rs
@@ -163,7 +163,7 @@ pub fn render_keystroke(
     let size = size.into();
 
     if use_text {
-        let element = Key::new(keystroke_text(&keystroke, platform_style, vim_mode), color)
+        let element = Key::new(keystroke_text(keystroke, platform_style, vim_mode), color)
             .size(size)
             .into_any_element();
         vec![element]
@@ -176,7 +176,7 @@ pub fn render_keystroke(
             size,
             true,
         ));
-        elements.push(render_key(&keystroke, color, platform_style, size));
+        elements.push(render_key(keystroke, color, platform_style, size));
         elements
     }
 }
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index ce5e5a0300..fe1537684c 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -95,7 +95,7 @@ impl VimOption {
             }
         }
 
-        Self::possibilities(&prefix)
+        Self::possibilities(prefix)
             .map(|possible| {
                 let mut options = prefix_of_options.clone();
                 options.push(possible);
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index a6a07e7b2f..367b5130b6 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -2280,8 +2280,8 @@ fn go_to_line(map: &DisplaySnapshot, display_point: DisplayPoint, line: usize) -
     }
     let mut last_position = None;
     for (excerpt, buffer, range) in map.buffer_snapshot.excerpts() {
-        let excerpt_range = language::ToOffset::to_offset(&range.context.start, &buffer)
-            ..language::ToOffset::to_offset(&range.context.end, &buffer);
+        let excerpt_range = language::ToOffset::to_offset(&range.context.start, buffer)
+            ..language::ToOffset::to_offset(&range.context.end, buffer);
         if offset >= excerpt_range.start && offset <= excerpt_range.end {
             let text_anchor = buffer.anchor_after(offset);
             let anchor = Anchor::in_buffer(excerpt, buffer.remote_id(), text_anchor);
@@ -2882,7 +2882,7 @@ fn method_motion(
         } else {
             possibilities.min().unwrap_or(offset)
         };
-        let new_point = map.clip_point(dest.to_display_point(&map), Bias::Left);
+        let new_point = map.clip_point(dest.to_display_point(map), Bias::Left);
         if new_point == display_point {
             break;
         }
@@ -2936,7 +2936,7 @@ fn comment_motion(
         } else {
             possibilities.min().unwrap_or(offset)
         };
-        let new_point = map.clip_point(dest.to_display_point(&map), Bias::Left);
+        let new_point = map.clip_point(dest.to_display_point(map), Bias::Left);
         if new_point == display_point {
             break;
         }
@@ -3003,7 +3003,7 @@ fn section_motion(
                 possibilities.min().unwrap_or(map.buffer_snapshot.len())
             };
 
-            let new_point = map.clip_point(offset.to_display_point(&map), Bias::Left);
+            let new_point = map.clip_point(offset.to_display_point(map), Bias::Left);
             if new_point == display_point {
                 break;
             }
diff --git a/crates/vim/src/normal/increment.rs b/crates/vim/src/normal/increment.rs
index 007514e472..115aef1dab 100644
--- a/crates/vim/src/normal/increment.rs
+++ b/crates/vim/src/normal/increment.rs
@@ -155,7 +155,7 @@ fn increment_decimal_string(num: &str, delta: i64) -> String {
 }
 
 fn increment_hex_string(num: &str, delta: i64) -> String {
-    let result = if let Ok(val) = u64::from_str_radix(&num, 16) {
+    let result = if let Ok(val) = u64::from_str_radix(num, 16) {
         val.wrapping_add_signed(delta)
     } else {
         u64::MAX
@@ -181,7 +181,7 @@ fn should_use_lowercase(num: &str) -> bool {
 }
 
 fn increment_binary_string(num: &str, delta: i64) -> String {
-    let result = if let Ok(val) = u64::from_str_radix(&num, 2) {
+    let result = if let Ok(val) = u64::from_str_radix(num, 2) {
         val.wrapping_add_signed(delta)
     } else {
         u64::MAX
diff --git a/crates/vim/src/normal/scroll.rs b/crates/vim/src/normal/scroll.rs
index af13bc0fd0..9eb8367f57 100644
--- a/crates/vim/src/normal/scroll.rs
+++ b/crates/vim/src/normal/scroll.rs
@@ -549,7 +549,7 @@ mod test {
         cx.set_neovim_option("nowrap").await;
 
         let content = "ˇ01234567890123456789";
-        cx.set_shared_state(&content).await;
+        cx.set_shared_state(content).await;
 
         cx.simulate_shared_keystrokes("z shift-l").await;
         cx.shared_state().await.assert_eq("012345ˇ67890123456789");
@@ -560,7 +560,7 @@ mod test {
         cx.shared_state().await.assert_eq("012345ˇ67890123456789");
 
         let content = "ˇ01234567890123456789";
-        cx.set_shared_state(&content).await;
+        cx.set_shared_state(content).await;
 
         cx.simulate_shared_keystrokes("z l").await;
         cx.shared_state().await.assert_eq("0ˇ1234567890123456789");
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 423859dadc..2e8e2f76bd 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -540,7 +540,7 @@ impl MarksState {
         cx: &mut Context<Self>,
     ) {
         let buffer = multibuffer.read(cx).as_singleton();
-        let abs_path = buffer.as_ref().and_then(|b| self.path_for_buffer(&b, cx));
+        let abs_path = buffer.as_ref().and_then(|b| self.path_for_buffer(b, cx));
 
         let Some(abs_path) = abs_path else {
             self.multibuffer_marks
@@ -606,7 +606,7 @@ impl MarksState {
 
         match target? {
             MarkLocation::Buffer(entity_id) => {
-                let anchors = self.multibuffer_marks.get(&entity_id)?;
+                let anchors = self.multibuffer_marks.get(entity_id)?;
                 return Some(Mark::Buffer(*entity_id, anchors.get(name)?.clone()));
             }
             MarkLocation::Path(path) => {
@@ -636,7 +636,7 @@ impl MarksState {
             match target {
                 MarkLocation::Buffer(entity_id) => {
                     self.multibuffer_marks
-                        .get_mut(&entity_id)
+                        .get_mut(entity_id)
                         .map(|m| m.remove(&mark_name.clone()));
                     return;
                 }
@@ -1042,7 +1042,7 @@ impl Operator {
             } => format!("^K{}", make_visible(&first_char.to_string())),
             Operator::Literal {
                 prefix: Some(prefix),
-            } => format!("^V{}", make_visible(&prefix)),
+            } => format!("^V{}", make_visible(prefix)),
             Operator::AutoIndent => "=".to_string(),
             Operator::ShellCommand => "=".to_string(),
             _ => self.id().to_string(),
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
index 46ea261cd6..45cef3a2b9 100644
--- a/crates/vim/src/test/neovim_connection.rs
+++ b/crates/vim/src/test/neovim_connection.rs
@@ -67,7 +67,7 @@ impl NeovimConnection {
             // Ensure we don't create neovim connections in parallel
             let _lock = NEOVIM_LOCK.lock();
             let (nvim, join_handle, child) = new_child_cmd(
-                &mut Command::new("nvim")
+                Command::new("nvim")
                     .arg("--embed")
                     .arg("--clean")
                     // disable swap (otherwise after about 1000 test runs you run out of swap file names)
@@ -161,7 +161,7 @@ impl NeovimConnection {
 
     #[cfg(feature = "neovim")]
     pub async fn set_state(&mut self, marked_text: &str) {
-        let (text, selections) = parse_state(&marked_text);
+        let (text, selections) = parse_state(marked_text);
 
         let nvim_buffer = self
             .nvim
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 44d9b8f456..15b0b443b5 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -265,7 +265,7 @@ pub fn init(cx: &mut App) {
 
         workspace.register_action(|workspace, _: &MaximizePane, window, cx| {
             let pane = workspace.active_pane();
-            let Some(size) = workspace.bounding_box_for_pane(&pane) else {
+            let Some(size) = workspace.bounding_box_for_pane(pane) else {
                 return;
             };
 
@@ -1599,7 +1599,7 @@ impl Vim {
                             second_char,
                             smartcase: VimSettings::get_global(cx).use_smartcase_find,
                         };
-                        Vim::globals(cx).last_find = Some((&sneak).clone());
+                        Vim::globals(cx).last_find = Some(sneak.clone());
                         self.motion(sneak, window, cx)
                     }
                 } else {
@@ -1616,7 +1616,7 @@ impl Vim {
                             second_char,
                             smartcase: VimSettings::get_global(cx).use_smartcase_find,
                         };
-                        Vim::globals(cx).last_find = Some((&sneak).clone());
+                        Vim::globals(cx).last_find = Some(sneak.clone());
                         self.motion(sneak, window, cx)
                     }
                 } else {
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index 3b789b1f3e..ffbae3ff76 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -414,7 +414,7 @@ impl Vim {
                             );
                         }
 
-                        let original_point = selection.tail().to_point(&map);
+                        let original_point = selection.tail().to_point(map);
 
                         if let Some(range) = object.range(map, mut_selection, around, count) {
                             if !range.is_empty() {
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 1356322a5c..8af39be3e7 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -1038,7 +1038,7 @@ where
 {
     fn detach_and_notify_err(self, window: &mut Window, cx: &mut App) {
         window
-            .spawn(cx, async move |mut cx| self.await.notify_async_err(&mut cx))
+            .spawn(cx, async move |cx| self.await.notify_async_err(cx))
             .detach();
     }
 }
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 860a57c21f..0a40dbc12c 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1627,8 +1627,7 @@ impl Pane {
                 items_to_close
                     .iter()
                     .filter(|item| {
-                        item.is_dirty(cx)
-                            && !Self::skip_save_on_close(item.as_ref(), &workspace, cx)
+                        item.is_dirty(cx) && !Self::skip_save_on_close(item.as_ref(), workspace, cx)
                     })
                     .map(|item| item.boxed_clone())
                     .collect::<Vec<_>>()
@@ -1657,7 +1656,7 @@ impl Pane {
                 let mut should_save = true;
                 if save_intent == SaveIntent::Close {
                     workspace.update(cx, |workspace, cx| {
-                        if Self::skip_save_on_close(item_to_close.as_ref(), &workspace, cx) {
+                        if Self::skip_save_on_close(item_to_close.as_ref(), workspace, cx) {
                             should_save = false;
                         }
                     })?;
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 02eac1665b..8ec61b6f10 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -647,7 +647,7 @@ impl ProjectItemRegistry {
             .build_project_item_for_path_fns
             .iter()
             .rev()
-            .find_map(|open_project_item| open_project_item(&project, &path, window, cx))
+            .find_map(|open_project_item| open_project_item(project, path, window, cx))
         else {
             return Task::ready(Err(anyhow!("cannot open file {:?}", path.path)));
         };
@@ -2431,7 +2431,7 @@ impl Workspace {
                         );
                         window.prompt(
                             PromptLevel::Warning,
-                            &"Do you want to save all changes in the following files?",
+                            "Do you want to save all changes in the following files?",
                             Some(&detail),
                             &["Save all", "Discard all", "Cancel"],
                             cx,
@@ -2767,9 +2767,9 @@ impl Workspace {
         let item = pane.read(cx).active_item();
         let pane = pane.downgrade();
 
-        window.spawn(cx, async move |mut cx| {
+        window.spawn(cx, async move |cx| {
             if let Some(item) = item {
-                Pane::save_item(project, &pane, item.as_ref(), save_intent, &mut cx)
+                Pane::save_item(project, &pane, item.as_ref(), save_intent, cx)
                     .await
                     .map(|_| ())
             } else {
@@ -3889,14 +3889,14 @@ impl Workspace {
                     pane.track_alternate_file_items();
                 });
                 if *local {
-                    self.unfollow_in_pane(&pane, window, cx);
+                    self.unfollow_in_pane(pane, window, cx);
                 }
                 serialize_workspace = *focus_changed || pane != self.active_pane();
                 if pane == self.active_pane() {
                     self.active_item_path_changed(window, cx);
                     self.update_active_view_for_followers(window, cx);
                 } else if *local {
-                    self.set_active_pane(&pane, window, cx);
+                    self.set_active_pane(pane, window, cx);
                 }
             }
             pane::Event::UserSavedItem { item, save_intent } => {
@@ -7182,9 +7182,9 @@ pub fn open_paths(
                 .collect::<Vec<_>>();
 
             cx.update(|cx| {
-                for window in local_workspace_windows(&cx) {
-                    if let Ok(workspace) = window.read(&cx) {
-                        let m = workspace.project.read(&cx).visibility_for_paths(
+                for window in local_workspace_windows(cx) {
+                    if let Ok(workspace) = window.read(cx) {
+                        let m = workspace.project.read(cx).visibility_for_paths(
                             &abs_paths,
                             &all_metadatas,
                             open_options.open_new_workspace == None,
@@ -7341,7 +7341,7 @@ pub fn open_ssh_project_with_new_connection(
 ) -> Task<Result<()>> {
     cx.spawn(async move |cx| {
         let (serialized_ssh_project, workspace_id, serialized_workspace) =
-            serialize_ssh_project(connection_options.clone(), paths.clone(), &cx).await?;
+            serialize_ssh_project(connection_options.clone(), paths.clone(), cx).await?;
 
         let session = match cx
             .update(|cx| {
@@ -7395,7 +7395,7 @@ pub fn open_ssh_project_with_existing_connection(
 ) -> Task<Result<()>> {
     cx.spawn(async move |cx| {
         let (serialized_ssh_project, workspace_id, serialized_workspace) =
-            serialize_ssh_project(connection_options.clone(), paths.clone(), &cx).await?;
+            serialize_ssh_project(connection_options.clone(), paths.clone(), cx).await?;
 
         open_ssh_project_inner(
             project,
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index b5a0f71e81..f110726afd 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -3199,7 +3199,7 @@ impl BackgroundScannerState {
 }
 
 async fn is_git_dir(path: &Path, fs: &dyn Fs) -> bool {
-    if path.file_name() == Some(&*DOT_GIT) {
+    if path.file_name() == Some(*DOT_GIT) {
         return true;
     }
 
@@ -3575,7 +3575,7 @@ impl<'a>
         cursor_location: &Dimensions<TraversalProgress<'a>, GitSummary>,
         _: &(),
     ) -> Ordering {
-        self.cmp_path(&cursor_location.0.max_path)
+        self.cmp_path(cursor_location.0.max_path)
     }
 }
 
@@ -5364,13 +5364,13 @@ impl PathTarget<'_> {
 
 impl<'a, S: Summary> SeekTarget<'a, PathSummary<S>, PathProgress<'a>> for PathTarget<'_> {
     fn cmp(&self, cursor_location: &PathProgress<'a>, _: &S::Context) -> Ordering {
-        self.cmp_path(&cursor_location.max_path)
+        self.cmp_path(cursor_location.max_path)
     }
 }
 
 impl<'a, S: Summary> SeekTarget<'a, PathSummary<S>, TraversalProgress<'a>> for PathTarget<'_> {
     fn cmp(&self, cursor_location: &TraversalProgress<'a>, _: &S::Context) -> Ordering {
-        self.cmp_path(&cursor_location.max_path)
+        self.cmp_path(cursor_location.max_path)
     }
 }
 
@@ -5396,7 +5396,7 @@ impl<'a> TraversalTarget<'a> {
 
     fn cmp_progress(&self, progress: &TraversalProgress) -> Ordering {
         match self {
-            TraversalTarget::Path(path) => path.cmp_path(&progress.max_path),
+            TraversalTarget::Path(path) => path.cmp_path(progress.max_path),
             TraversalTarget::Count {
                 count,
                 include_files,
@@ -5551,7 +5551,7 @@ fn discover_git_paths(dot_git_abs_path: &Arc<Path>, fs: &dyn Fs) -> (Arc<Path>,
     let mut repository_dir_abs_path = dot_git_abs_path.clone();
     let mut common_dir_abs_path = dot_git_abs_path.clone();
 
-    if let Some(path) = smol::block_on(fs.load(&dot_git_abs_path))
+    if let Some(path) = smol::block_on(fs.load(dot_git_abs_path))
         .ok()
         .as_ref()
         .and_then(|contents| parse_gitfile(contents).log_err())
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 2a82f81b5b..a66b30c44a 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -371,9 +371,9 @@ pub fn main() {
         {
             cx.spawn({
                 let app_state = app_state.clone();
-                async move |mut cx| {
-                    if let Err(e) = restore_or_create_workspace(app_state, &mut cx).await {
-                        fail_to_open_window_async(e, &mut cx)
+                async move |cx| {
+                    if let Err(e) = restore_or_create_workspace(app_state, cx).await {
+                        fail_to_open_window_async(e, cx)
                     }
                 }
             })
@@ -690,7 +690,7 @@ pub fn main() {
 
         cx.spawn({
             let client = app_state.client.clone();
-            async move |cx| authenticate(client, &cx).await
+            async move |cx| authenticate(client, cx).await
         })
         .detach_and_log_err(cx);
 
@@ -722,9 +722,9 @@ pub fn main() {
             None => {
                 cx.spawn({
                     let app_state = app_state.clone();
-                    async move |mut cx| {
-                        if let Err(e) = restore_or_create_workspace(app_state, &mut cx).await {
-                            fail_to_open_window_async(e, &mut cx)
+                    async move |cx| {
+                        if let Err(e) = restore_or_create_workspace(app_state, cx).await {
+                            fail_to_open_window_async(e, cx)
                         }
                     }
                 })
@@ -795,14 +795,14 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
     }
 
     if let Some(connection_options) = request.ssh_connection {
-        cx.spawn(async move |mut cx| {
+        cx.spawn(async move |cx| {
             let paths: Vec<PathBuf> = request.open_paths.into_iter().map(PathBuf::from).collect();
             open_ssh_project(
                 connection_options,
                 paths,
                 app_state,
                 workspace::OpenOptions::default(),
-                &mut cx,
+                cx,
             )
             .await
         })
@@ -813,7 +813,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
     let mut task = None;
     if !request.open_paths.is_empty() || !request.diff_paths.is_empty() {
         let app_state = app_state.clone();
-        task = Some(cx.spawn(async move |mut cx| {
+        task = Some(cx.spawn(async move |cx| {
             let paths_with_position =
                 derive_paths_with_position(app_state.fs.as_ref(), request.open_paths).await;
             let (_window, results) = open_paths_with_positions(
@@ -821,7 +821,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                 &request.diff_paths,
                 app_state,
                 workspace::OpenOptions::default(),
-                &mut cx,
+                cx,
             )
             .await?;
             for result in results.into_iter().flatten() {
@@ -834,7 +834,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
     }
 
     if !request.open_channel_notes.is_empty() || request.join_channel.is_some() {
-        cx.spawn(async move |mut cx| {
+        cx.spawn(async move |cx| {
             let result = maybe!(async {
                 if let Some(task) = task {
                     task.await?;
@@ -842,7 +842,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                 let client = app_state.client.clone();
                 // we continue even if authentication fails as join_channel/ open channel notes will
                 // show a visible error message.
-                authenticate(client, &cx).await.log_err();
+                authenticate(client, cx).await.log_err();
 
                 if let Some(channel_id) = request.join_channel {
                     cx.update(|cx| {
@@ -878,14 +878,14 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
             })
             .await;
             if let Err(err) = result {
-                fail_to_open_window_async(err, &mut cx);
+                fail_to_open_window_async(err, cx);
             }
         })
         .detach()
     } else if let Some(task) = task {
-        cx.spawn(async move |mut cx| {
+        cx.spawn(async move |cx| {
             if let Err(err) = task.await {
-                fail_to_open_window_async(err, &mut cx);
+                fail_to_open_window_async(err, cx);
             }
         })
         .detach();
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index 0a54572f6b..f2e65b4f53 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -536,7 +536,7 @@ async fn upload_previous_panics(
             });
 
         if let Some(panic) = panic
-            && upload_panic(&http, &panic_report_url, panic, &mut most_recent_panic).await?
+            && upload_panic(&http, panic_report_url, panic, &mut most_recent_panic).await?
         {
             // We've done what we can, delete the file
             fs::remove_file(child_path)
@@ -566,7 +566,7 @@ pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::
         if let Ok(metadata) = serde_json::from_slice(&smol::fs::read(&json_path).await?) {
             if upload_minidump(
                 http.clone(),
-                &minidump_endpoint,
+                minidump_endpoint,
                 smol::fs::read(&child_path)
                     .await
                     .context("Failed to read minidump")?,
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 6d5aecba70..535cb12e1a 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -327,7 +327,7 @@ pub fn initialize_workspace(
         cx.subscribe_in(&workspace_handle, window, {
             move |workspace, _, event, window, cx| match event {
                 workspace::Event::PaneAdded(pane) => {
-                    initialize_pane(workspace, &pane, window, cx);
+                    initialize_pane(workspace, pane, window, cx);
                 }
                 workspace::Event::OpenBundledFile {
                     text,
@@ -796,7 +796,7 @@ fn register_actions(
         .register_action(install_cli)
         .register_action(|_, _: &install_cli::RegisterZedScheme, window, cx| {
             cx.spawn_in(window, async move |workspace, cx| {
-                install_cli::register_zed_scheme(&cx).await?;
+                install_cli::register_zed_scheme(cx).await?;
                 workspace.update_in(cx, |workspace, _, cx| {
                     struct RegisterZedScheme;
 
diff --git a/crates/zed/src/zed/component_preview.rs b/crates/zed/src/zed/component_preview.rs
index 4609ecce9b..915c40030a 100644
--- a/crates/zed/src/zed/component_preview.rs
+++ b/crates/zed/src/zed/component_preview.rs
@@ -650,7 +650,7 @@ impl ComponentPreview {
         _window: &mut Window,
         _cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let component = self.component_map.get(&component_id);
+        let component = self.component_map.get(component_id);
 
         if let Some(component) = component {
             v_flex()
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index 5b0826413b..587786fe8f 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -147,7 +147,7 @@ fn assign_edit_prediction_providers(
                 assign_edit_prediction_provider(
                     editor,
                     provider,
-                    &client,
+                    client,
                     user_store.clone(),
                     window,
                     cx,
@@ -248,7 +248,7 @@ fn assign_edit_prediction_provider(
                 if let Some(buffer) = &singleton_buffer {
                     if buffer.read(cx).file().is_some() {
                         zeta.update(cx, |zeta, cx| {
-                            zeta.register_buffer(&buffer, cx);
+                            zeta.register_buffer(buffer, cx);
                         });
                     }
                 }
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index 82d3795e94..f282860e2c 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -432,13 +432,13 @@ async fn open_workspaces(
                             .connection_options_for(ssh.host, ssh.port, ssh.user)
                     });
                     if let Ok(connection_options) = connection_options {
-                        cx.spawn(async move |mut cx| {
+                        cx.spawn(async move |cx| {
                             open_ssh_project(
                                 connection_options,
                                 ssh.paths.into_iter().map(PathBuf::from).collect(),
                                 app_state,
                                 OpenOptions::default(),
-                                &mut cx,
+                                cx,
                             )
                             .await
                             .log_err();
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index 2b7c38f997..d65053c05f 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -182,7 +182,7 @@ impl Render for QuickActionBar {
             let code_action_element = if is_deployed {
                 editor.update(cx, |editor, cx| {
                     if let Some(style) = editor.style() {
-                        editor.render_context_menu(&style, MAX_CODE_ACTION_MENU_LINES, window, cx)
+                        editor.render_context_menu(style, MAX_CODE_ACTION_MENU_LINES, window, cx)
                     } else {
                         None
                     }
diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index fa1eabf524..3dd025c1e1 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -198,7 +198,7 @@ mod tests {
 
     #[test]
     fn test_mit_positive_detection() {
-        assert!(is_license_eligible_for_data_collection(&MIT_LICENSE));
+        assert!(is_license_eligible_for_data_collection(MIT_LICENSE));
     }
 
     #[test]
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 1a6a8c2934..956e416fe9 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -505,7 +505,7 @@ impl Zeta {
                 input_events,
                 input_excerpt,
                 buffer_snapshotted_at,
-                &cx,
+                cx,
             )
             .await;
 
@@ -981,7 +981,7 @@ and then another
             old_text,
             new_text,
             editable_range.start,
-            &snapshot,
+            snapshot,
         ))
     }
 
@@ -991,7 +991,7 @@ and then another
         offset: usize,
         snapshot: &BufferSnapshot,
     ) -> Vec<(Range<Anchor>, String)> {
-        text_diff(&old_text, &new_text)
+        text_diff(&old_text, new_text)
             .into_iter()
             .map(|(mut old_range, new_text)| {
                 old_range.start += offset;
@@ -1182,7 +1182,7 @@ pub fn gather_context(
                 .filter_map(|(language_server_id, diagnostic_group)| {
                     let language_server =
                         local_lsp_store.running_language_server_for_id(language_server_id)?;
-                    let diagnostic_group = diagnostic_group.resolve::<usize>(&snapshot);
+                    let diagnostic_group = diagnostic_group.resolve::<usize>(snapshot);
                     let language_server_name = language_server.name().to_string();
                     let serialized = serde_json::to_value(diagnostic_group).unwrap();
                     Some((language_server_name, serialized))
@@ -1313,10 +1313,10 @@ impl CurrentEditPrediction {
             return true;
         }
 
-        let Some(old_edits) = old_completion.completion.interpolate(&snapshot) else {
+        let Some(old_edits) = old_completion.completion.interpolate(snapshot) else {
             return true;
         };
-        let Some(new_edits) = self.completion.interpolate(&snapshot) else {
+        let Some(new_edits) = self.completion.interpolate(snapshot) else {
             return false;
         };
 
@@ -1664,7 +1664,7 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
 
                 if let Some(old_completion) = this.current_completion.as_ref() {
                     let snapshot = buffer.read(cx).snapshot();
-                    if new_completion.should_replace_completion(&old_completion, &snapshot) {
+                    if new_completion.should_replace_completion(old_completion, &snapshot) {
                         this.zeta.update(cx, |zeta, cx| {
                             zeta.completion_shown(&new_completion.completion, cx);
                         });
diff --git a/crates/zeta_cli/src/main.rs b/crates/zeta_cli/src/main.rs
index d78035bc9d..ba854b8732 100644
--- a/crates/zeta_cli/src/main.rs
+++ b/crates/zeta_cli/src/main.rs
@@ -131,7 +131,7 @@ async fn get_context(
 
     let (project, _lsp_open_handle, buffer) = if use_language_server {
         let (project, lsp_open_handle, buffer) =
-            open_buffer_with_language_server(&worktree_path, &cursor.path, &app_state, cx).await?;
+            open_buffer_with_language_server(&worktree_path, &cursor.path, app_state, cx).await?;
         (Some(project), Some(lsp_open_handle), buffer)
     } else {
         let abs_path = worktree_path.join(&cursor.path);
@@ -260,7 +260,7 @@ pub fn wait_for_lang_server(
         .update(cx, |buffer, cx| {
             lsp_store.update(cx, |lsp_store, cx| {
                 lsp_store
-                    .language_servers_for_local_buffer(&buffer, cx)
+                    .language_servers_for_local_buffer(buffer, cx)
                     .next()
                     .is_some()
             })
@@ -291,7 +291,7 @@ pub fn wait_for_lang_server(
                 _ => {}
             }
         }),
-        cx.subscribe(&project, {
+        cx.subscribe(project, {
             let buffer = buffer.clone();
             move |project, event, cx| match event {
                 project::Event::LanguageServerAdded(_, _, _) => {
diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
index 56350d34c3..cf1604bd9f 100644
--- a/crates/zlog/src/filter.rs
+++ b/crates/zlog/src/filter.rs
@@ -82,7 +82,7 @@ pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Le
         // if no scopes are enabled, return false because it's not <= LEVEL_ENABLED_MAX_STATIC
         return is_enabled_by_default;
     }
-    let enabled_status = map.is_enabled(&scope, module_path, level);
+    let enabled_status = map.is_enabled(scope, module_path, level);
     return match enabled_status {
         EnabledStatus::NotConfigured => is_enabled_by_default,
         EnabledStatus::Enabled => true,

From bb640c6a1c8b77031b8aabf1d5100945bf1d00ff Mon Sep 17 00:00:00 2001
From: Gregor <mail@watwa.re>
Date: Tue, 19 Aug 2025 00:01:46 +0200
Subject: [PATCH 135/823] Add multi selection support to UnwrapSyntaxNode
 (#35991)

Closes #35932
Closes #35933

I only intended to fix multi select in this, I accidentally drive-by
fixed the VIM issue as well. `replace_text_in_range` which I was using
before has two, to me unexpected, side-effects:
- it no-ops when input is disabled, which is the case in VIM's
Insert/Visual modes
- it takes the current selection into account, and does not just operate
on the given range (which I erroneously assumed before)

Now the code is using `buffer.edit` instead, which seems more lower
level, and does not have those side-effects. I was enthused to see that
it accepts a vec of edits, so I didn't have to calculate offsets for
following edits... until I also wanted to set selections, where I do
need to do it by hand. I'm still wondering if there is a simpler way to
do it, but for now it at least passes my muster

Release Notes:

- Added multiple selection support to UnwrapSyntaxNode action
- Fixed UnwrapSyntaxNode not working in VIM Insert/Visual modes
---
 crates/editor/src/editor.rs       | 85 +++++++++++++++++--------------
 crates/editor/src/editor_tests.rs | 17 ++-----
 2 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 6edd4e9d8c..365cd1ea5a 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -14834,15 +14834,18 @@ impl Editor {
         self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
 
         let buffer = self.buffer.read(cx).snapshot(cx);
-        let old_selections: Box<[_]> = self.selections.all::<usize>(cx).into();
+        let selections = self
+            .selections
+            .all::<usize>(cx)
+            .into_iter()
+            // subtracting the offset requires sorting
+            .sorted_by_key(|i| i.start);
 
-        let edits = old_selections
-            .iter()
-            // only consider the first selection for now
-            .take(1)
-            .map(|selection| {
+        let full_edits = selections
+            .into_iter()
+            .filter_map(|selection| {
                 // Only requires two branches once if-let-chains stabilize (#53667)
-                let selection_range = if !selection.is_empty() {
+                let child = if !selection.is_empty() {
                     selection.range()
                 } else if let Some((_, ancestor_range)) =
                     buffer.syntax_ancestor(selection.start..selection.end)
@@ -14855,48 +14858,52 @@ impl Editor {
                     selection.range()
                 };
 
-                let mut new_range = selection_range.clone();
-                while let Some((_, ancestor_range)) = buffer.syntax_ancestor(new_range.clone()) {
-                    new_range = match ancestor_range {
+                let mut parent = child.clone();
+                while let Some((_, ancestor_range)) = buffer.syntax_ancestor(parent.clone()) {
+                    parent = match ancestor_range {
                         MultiOrSingleBufferOffsetRange::Single(range) => range,
                         MultiOrSingleBufferOffsetRange::Multi(range) => range,
                     };
-                    if new_range.start < selection_range.start
-                        || new_range.end > selection_range.end
-                    {
+                    if parent.start < child.start || parent.end > child.end {
                         break;
                     }
                 }
 
-                (selection, selection_range, new_range)
+                if parent == child {
+                    return None;
+                }
+                let text = buffer.text_for_range(child.clone()).collect::<String>();
+                Some((selection.id, parent, text))
             })
             .collect::<Vec<_>>();
 
-        self.transact(window, cx, |editor, window, cx| {
-            for (_, child, parent) in &edits {
-                let text = buffer.text_for_range(child.clone()).collect::<String>();
-                editor.replace_text_in_range(Some(parent.clone()), &text, window, cx);
-            }
-
-            editor.change_selections(
-                SelectionEffects::scroll(Autoscroll::fit()),
-                window,
-                cx,
-                |s| {
-                    s.select(
-                        edits
-                            .iter()
-                            .map(|(s, old, new)| Selection {
-                                id: s.id,
-                                start: new.start,
-                                end: new.start + old.len(),
-                                goal: SelectionGoal::None,
-                                reversed: s.reversed,
-                            })
-                            .collect(),
-                    );
-                },
-            );
+        self.transact(window, cx, |this, window, cx| {
+            this.buffer.update(cx, |buffer, cx| {
+                buffer.edit(
+                    full_edits
+                        .iter()
+                        .map(|(_, p, t)| (p.clone(), t.clone()))
+                        .collect::<Vec<_>>(),
+                    None,
+                    cx,
+                );
+            });
+            this.change_selections(Default::default(), window, cx, |s| {
+                let mut offset = 0;
+                let mut selections = vec![];
+                for (id, parent, text) in full_edits {
+                    let start = parent.start - offset;
+                    offset += parent.len() - text.len();
+                    selections.push(Selection {
+                        id: id,
+                        start,
+                        end: start + text.len(),
+                        reversed: false,
+                        goal: Default::default(),
+                    });
+                }
+                s.select(selections);
+            });
         });
     }
 
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 189bdd1bf7..685cc47cdb 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8015,7 +8015,7 @@ async fn test_select_larger_smaller_syntax_node_for_string(cx: &mut TestAppConte
 }
 
 #[gpui::test]
-async fn test_unwrap_syntax_node(cx: &mut gpui::TestAppContext) {
+async fn test_unwrap_syntax_nodes(cx: &mut gpui::TestAppContext) {
     init_test(cx, |_| {});
 
     let mut cx = EditorTestContext::new(cx).await;
@@ -8029,21 +8029,12 @@ async fn test_unwrap_syntax_node(cx: &mut gpui::TestAppContext) {
         buffer.set_language(Some(language), cx);
     });
 
-    cx.set_state(
-        &r#"
-            use mod1::mod2::{«mod3ˇ», mod4};
-        "#
-        .unindent(),
-    );
+    cx.set_state(indoc! { r#"use mod1::{mod2::{«mod3ˇ», mod4}, mod5::{mod6, «mod7ˇ»}};"# });
     cx.update_editor(|editor, window, cx| {
         editor.unwrap_syntax_node(&UnwrapSyntaxNode, window, cx);
     });
-    cx.assert_editor_state(
-        &r#"
-            use mod1::mod2::«mod3ˇ»;
-        "#
-        .unindent(),
-    );
+
+    cx.assert_editor_state(indoc! { r#"use mod1::{mod2::«mod3ˇ», mod5::«mod7ˇ»};"# });
 }
 
 #[gpui::test]

From e7b7c206a0233c19c982cf0ef95c87d98a2fd8a9 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Tue, 19 Aug 2025 01:03:16 +0300
Subject: [PATCH 136/823] terminal: Fix python venv path when spawning tasks on
 windows (#35909)

I haven't found any issues related to this, but it seems like currently
the wrong directory is added to the path when spawning tasks on windows
with a python virtual environment. I also deduplicated the logic at a
few places. The same constant exists in the languages crate, but we
don't want to pull an additional dependency just for this.

-1 papercut

Release Notes:

- Fix python venv path when spawning tasks on windows
---
 crates/project/src/terminals.rs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 5ea7b87fbe..f5d08990b5 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -23,6 +23,13 @@ use util::{
     paths::{PathStyle, RemotePathBuf},
 };
 
+/// The directory inside a Python virtual environment that contains executables
+const PYTHON_VENV_BIN_DIR: &str = if cfg!(target_os = "windows") {
+    "Scripts"
+} else {
+    "bin"
+};
+
 pub struct Terminals {
     pub(crate) local_handles: Vec<WeakEntity<terminal::Terminal>>,
 }
@@ -368,7 +375,8 @@ impl Project {
                     }
                     None => {
                         if let Some(venv_path) = &python_venv_directory {
-                            add_environment_path(&mut env, &venv_path.join("bin")).log_err();
+                            add_environment_path(&mut env, &venv_path.join(PYTHON_VENV_BIN_DIR))
+                                .log_err();
                         }
 
                         let shell = if let Some(program) = spawn_task.command {
@@ -478,16 +486,12 @@ impl Project {
         venv_settings: &terminal_settings::VenvSettingsContent,
         cx: &App,
     ) -> Option<PathBuf> {
-        let bin_dir_name = match std::env::consts::OS {
-            "windows" => "Scripts",
-            _ => "bin",
-        };
         venv_settings
             .directories
             .iter()
             .map(|name| abs_path.join(name))
             .find(|venv_path| {
-                let bin_path = venv_path.join(bin_dir_name);
+                let bin_path = venv_path.join(PYTHON_VENV_BIN_DIR);
                 self.find_worktree(&bin_path, cx)
                     .and_then(|(worktree, relative_path)| {
                         worktree.read(cx).entry_for_path(&relative_path)
@@ -504,16 +508,12 @@ impl Project {
     ) -> Option<PathBuf> {
         let (worktree, _) = self.find_worktree(abs_path, cx)?;
         let fs = worktree.read(cx).as_local()?.fs();
-        let bin_dir_name = match std::env::consts::OS {
-            "windows" => "Scripts",
-            _ => "bin",
-        };
         venv_settings
             .directories
             .iter()
             .map(|name| abs_path.join(name))
             .find(|venv_path| {
-                let bin_path = venv_path.join(bin_dir_name);
+                let bin_path = venv_path.join(PYTHON_VENV_BIN_DIR);
                 // One-time synchronous check is acceptable for terminal/task initialization
                 smol::block_on(fs.metadata(&bin_path))
                     .ok()
@@ -589,10 +589,7 @@ impl Project {
 
         if venv_settings.venv_name.is_empty() {
             let path = venv_base_directory
-                .join(match std::env::consts::OS {
-                    "windows" => "Scripts",
-                    _ => "bin",
-                })
+                .join(PYTHON_VENV_BIN_DIR)
                 .join(activate_script_name)
                 .to_string_lossy()
                 .to_string();

From 3648dbe939172bba070be8b29e64cb5b7d749a0c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 18 Aug 2025 18:09:30 -0400
Subject: [PATCH 137/823] terminal: Temporarily disable `test_basic_terminal`
 test (#36447)

This PR temporarily disables the `test_basic_terminal` test, as it
flakes on macOS.

Release Notes:

- N/A
---
 crates/terminal/src/terminal.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 2f3b7aa28d..3dfde8a9af 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -2160,7 +2160,7 @@ mod tests {
     use gpui::{Pixels, Point, TestAppContext, bounds, point, size};
     use rand::{Rng, distributions::Alphanumeric, rngs::ThreadRng, thread_rng};
 
-    #[cfg_attr(windows, ignore = "TODO: fix on windows")]
+    #[ignore = "Test is flaky on macOS, and doesn't run on Windows"]
     #[gpui::test]
     async fn test_basic_terminal(cx: &mut TestAppContext) {
         cx.executor().allow_parking();

From 567ceffd429d8711a0ef6674bd01f22dfc0e98ff Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 19 Aug 2025 01:54:37 +0300
Subject: [PATCH 138/823] Remove an unused struct (#36448)

Release Notes:

- N/A
---
 crates/workspace/src/workspace.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 8ec61b6f10..babf2ac1d5 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -256,11 +256,6 @@ actions!(
     ]
 );
 
-#[derive(Clone, PartialEq)]
-pub struct OpenPaths {
-    pub paths: Vec<PathBuf>,
-}
-
 /// Activates a specific pane by its index.
 #[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
 #[action(namespace = workspace)]
@@ -6823,14 +6818,6 @@ impl WorkspaceHandle for Entity<Workspace> {
     }
 }
 
-impl std::fmt::Debug for OpenPaths {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("OpenPaths")
-            .field("paths", &self.paths)
-            .finish()
-    }
-}
-
 pub async fn last_opened_workspace_location() -> Option<SerializedWorkspaceLocation> {
     DB.last_workspace().await.log_err().flatten()
 }

From 33fbe53d48291c6c622e8d3b4bbf4d0210d41025 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 18 Aug 2025 19:16:28 -0400
Subject: [PATCH 139/823] client: Make `Client::sign_in_with_optional_connect`
 a no-op when already connected to Collab (#36449)

This PR makes it so `Client::sign_in_with_optional_connect` does nothing
when the user is already connected to Collab.

This fixes the issue where clicking on a channel link would temporarily
disconnect you from Collab.

Release Notes:

- N/A
---
 crates/client/src/client.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 91bdf001d8..66d5fd89b1 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -973,6 +973,11 @@ impl Client {
         try_provider: bool,
         cx: &AsyncApp,
     ) -> Result<()> {
+        // Don't try to sign in again if we're already connected to Collab, as it will temporarily disconnect us.
+        if self.status().borrow().is_connected() {
+            return Ok(());
+        }
+
         let (is_staff_tx, is_staff_rx) = oneshot::channel::<bool>();
         let mut is_staff_tx = Some(is_staff_tx);
         cx.update(|cx| {

From b578031120b7ab294e86877656d54bd95157683c Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 18 Aug 2025 20:27:08 -0300
Subject: [PATCH 140/823] claude: Respect always allow setting (#36450)

Claude will now respect the `agent.always_allow_tool_actions` setting
and will set it when "Always Allow" is clicked.

Release Notes:

- N/A
---
 Cargo.lock                                    |  1 +
 crates/agent_servers/Cargo.toml               |  1 +
 crates/agent_servers/src/claude.rs            |  3 +-
 crates/agent_servers/src/claude/mcp_server.rs | 70 ++++++++++++++++---
 4 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3bc2b63843..6c05839ef3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -258,6 +258,7 @@ version = "0.1.0"
 dependencies = [
  "acp_thread",
  "agent-client-protocol",
+ "agent_settings",
  "agentic-coding-protocol",
  "anyhow",
  "collections",
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index f894bb15bf..886f650470 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -19,6 +19,7 @@ doctest = false
 [dependencies]
 acp_thread.workspace = true
 agent-client-protocol.workspace = true
+agent_settings.workspace = true
 agentic-coding-protocol.workspace = true
 anyhow.workspace = true
 collections.workspace = true
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 354bda494d..9b273cb091 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -111,7 +111,8 @@ impl AgentConnection for ClaudeAgentConnection {
                     })?;
 
             let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
-            let permission_mcp_server = ClaudeZedMcpServer::new(thread_rx.clone(), cx).await?;
+            let fs = project.read_with(cx, |project, _cx| project.fs().clone())?;
+            let permission_mcp_server = ClaudeZedMcpServer::new(thread_rx.clone(), fs, cx).await?;
 
             let mut mcp_servers = HashMap::default();
             mcp_servers.insert(
diff --git a/crates/agent_servers/src/claude/mcp_server.rs b/crates/agent_servers/src/claude/mcp_server.rs
index 22cb2f8f8d..38587574db 100644
--- a/crates/agent_servers/src/claude/mcp_server.rs
+++ b/crates/agent_servers/src/claude/mcp_server.rs
@@ -1,8 +1,10 @@
 use std::path::PathBuf;
+use std::sync::Arc;
 
 use crate::claude::tools::{ClaudeTool, EditToolParams, ReadToolParams};
 use acp_thread::AcpThread;
 use agent_client_protocol as acp;
+use agent_settings::AgentSettings;
 use anyhow::{Context, Result};
 use collections::HashMap;
 use context_server::listener::{McpServerTool, ToolResponse};
@@ -11,8 +13,11 @@ use context_server::types::{
     ToolAnnotations, ToolResponseContent, ToolsCapabilities, requests,
 };
 use gpui::{App, AsyncApp, Task, WeakEntity};
+use project::Fs;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use settings::{Settings as _, update_settings_file};
+use util::debug_panic;
 
 pub struct ClaudeZedMcpServer {
     server: context_server::listener::McpServer,
@@ -23,6 +28,7 @@ pub const SERVER_NAME: &str = "zed";
 impl ClaudeZedMcpServer {
     pub async fn new(
         thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
+        fs: Arc<dyn Fs>,
         cx: &AsyncApp,
     ) -> Result<Self> {
         let mut mcp_server = context_server::listener::McpServer::new(cx).await?;
@@ -30,6 +36,7 @@ impl ClaudeZedMcpServer {
 
         mcp_server.add_tool(PermissionTool {
             thread_rx: thread_rx.clone(),
+            fs: fs.clone(),
         });
         mcp_server.add_tool(ReadTool {
             thread_rx: thread_rx.clone(),
@@ -102,6 +109,7 @@ pub struct McpServerConfig {
 
 #[derive(Clone)]
 pub struct PermissionTool {
+    fs: Arc<dyn Fs>,
     thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
 }
 
@@ -141,6 +149,24 @@ impl McpServerTool for PermissionTool {
         input: Self::Input,
         cx: &mut AsyncApp,
     ) -> Result<ToolResponse<Self::Output>> {
+        if agent_settings::AgentSettings::try_read_global(cx, |settings| {
+            settings.always_allow_tool_actions
+        })
+        .unwrap_or(false)
+        {
+            let response = PermissionToolResponse {
+                behavior: PermissionToolBehavior::Allow,
+                updated_input: input.input,
+            };
+
+            return Ok(ToolResponse {
+                content: vec![ToolResponseContent::Text {
+                    text: serde_json::to_string(&response)?,
+                }],
+                structured_content: (),
+            });
+        }
+
         let mut thread_rx = self.thread_rx.clone();
         let Some(thread) = thread_rx.recv().await?.upgrade() else {
             anyhow::bail!("Thread closed");
@@ -148,8 +174,10 @@ impl McpServerTool for PermissionTool {
 
         let claude_tool = ClaudeTool::infer(&input.tool_name, input.input.clone());
         let tool_call_id = acp::ToolCallId(input.tool_use_id.context("Tool ID required")?.into());
-        let allow_option_id = acp::PermissionOptionId("allow".into());
-        let reject_option_id = acp::PermissionOptionId("reject".into());
+
+        const ALWAYS_ALLOW: &'static str = "always_allow";
+        const ALLOW: &'static str = "allow";
+        const REJECT: &'static str = "reject";
 
         let chosen_option = thread
             .update(cx, |thread, cx| {
@@ -157,12 +185,17 @@ impl McpServerTool for PermissionTool {
                     claude_tool.as_acp(tool_call_id).into(),
                     vec![
                         acp::PermissionOption {
-                            id: allow_option_id.clone(),
+                            id: acp::PermissionOptionId(ALWAYS_ALLOW.into()),
+                            name: "Always Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowAlways,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId(ALLOW.into()),
                             name: "Allow".into(),
                             kind: acp::PermissionOptionKind::AllowOnce,
                         },
                         acp::PermissionOption {
-                            id: reject_option_id.clone(),
+                            id: acp::PermissionOptionId(REJECT.into()),
                             name: "Reject".into(),
                             kind: acp::PermissionOptionKind::RejectOnce,
                         },
@@ -172,16 +205,33 @@ impl McpServerTool for PermissionTool {
             })??
             .await?;
 
-        let response = if chosen_option == allow_option_id {
-            PermissionToolResponse {
+        let response = match chosen_option.0.as_ref() {
+            ALWAYS_ALLOW => {
+                cx.update(|cx| {
+                    update_settings_file::<AgentSettings>(self.fs.clone(), cx, |settings, _| {
+                        settings.set_always_allow_tool_actions(true);
+                    });
+                })?;
+
+                PermissionToolResponse {
+                    behavior: PermissionToolBehavior::Allow,
+                    updated_input: input.input,
+                }
+            }
+            ALLOW => PermissionToolResponse {
                 behavior: PermissionToolBehavior::Allow,
                 updated_input: input.input,
-            }
-        } else {
-            debug_assert_eq!(chosen_option, reject_option_id);
-            PermissionToolResponse {
+            },
+            REJECT => PermissionToolResponse {
                 behavior: PermissionToolBehavior::Deny,
                 updated_input: input.input,
+            },
+            opt => {
+                debug_panic!("Unexpected option: {}", opt);
+                PermissionToolResponse {
+                    behavior: PermissionToolBehavior::Deny,
+                    updated_input: input.input,
+                }
             }
         };
 

From b7edc89a87e2589fbe69c13a53aba57260371a5f Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 18 Aug 2025 21:44:07 -0300
Subject: [PATCH 141/823] agent: Improve error and warnings display (#36425)

This PR refactors the callout component and improves how we display
errors and warnings in the agent panel, along with improvements for
specific cases (e.g., you have `zed.dev` as your LLM provider and is
signed out).

Still a work in progress, though, wrapping up some details.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs        | 145 ++++---
 crates/agent_ui/src/active_thread.rs          |   2 +-
 .../add_llm_provider_modal.rs                 |   2 +-
 crates/agent_ui/src/agent_panel.rs            | 357 +++++++++---------
 crates/agent_ui/src/message_editor.rs         |  50 +--
 .../agent_ui/src/ui/preview/usage_callouts.rs |  14 +-
 .../ai_onboarding/src/young_account_banner.rs |   2 +-
 crates/language_model/src/registry.rs         |   2 +-
 crates/settings_ui/src/keybindings.rs         |  14 +-
 crates/ui/src/components/banner.rs            |   9 -
 crates/ui/src/components/callout.rs           | 217 +++++++----
 crates/ui/src/prelude.rs                      |   4 +-
 crates/ui/src/styles.rs                       |   2 +
 crates/ui/src/styles/severity.rs              |  10 +
 14 files changed, 436 insertions(+), 394 deletions(-)
 create mode 100644 crates/ui/src/styles/severity.rs

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 4a8f9bf209..0d15e27e0c 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -3259,44 +3259,33 @@ impl AcpThreadView {
             }
         };
 
-        Some(
-            div()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .child(content),
-        )
+        Some(div().child(content))
     }
 
     fn render_any_thread_error(&self, error: SharedString, cx: &mut Context<'_, Self>) -> Callout {
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
         Callout::new()
-            .icon(icon)
+            .severity(Severity::Error)
             .title("Error")
             .description(error.clone())
-            .secondary_action(self.create_copy_button(error.to_string()))
-            .primary_action(self.dismiss_error_button(cx))
-            .bg_color(self.error_callout_bg(cx))
+            .actions_slot(self.create_copy_button(error.to_string()))
+            .dismiss_action(self.dismiss_error_button(cx))
     }
 
     fn render_payment_required_error(&self, cx: &mut Context<Self>) -> Callout {
         const ERROR_MESSAGE: &str =
             "You reached your free usage limit. Upgrade to Zed Pro for more prompts.";
 
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
         Callout::new()
-            .icon(icon)
+            .severity(Severity::Error)
             .title("Free Usage Exceeded")
             .description(ERROR_MESSAGE)
-            .tertiary_action(self.upgrade_button(cx))
-            .secondary_action(self.create_copy_button(ERROR_MESSAGE))
-            .primary_action(self.dismiss_error_button(cx))
-            .bg_color(self.error_callout_bg(cx))
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .child(self.upgrade_button(cx))
+                    .child(self.create_copy_button(ERROR_MESSAGE)),
+            )
+            .dismiss_action(self.dismiss_error_button(cx))
     }
 
     fn render_model_request_limit_reached_error(
@@ -3311,18 +3300,17 @@ impl AcpThreadView {
             }
         };
 
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
         Callout::new()
-            .icon(icon)
+            .severity(Severity::Error)
             .title("Model Prompt Limit Reached")
             .description(error_message)
-            .tertiary_action(self.upgrade_button(cx))
-            .secondary_action(self.create_copy_button(error_message))
-            .primary_action(self.dismiss_error_button(cx))
-            .bg_color(self.error_callout_bg(cx))
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .child(self.upgrade_button(cx))
+                    .child(self.create_copy_button(error_message)),
+            )
+            .dismiss_action(self.dismiss_error_button(cx))
     }
 
     fn render_tool_use_limit_reached_error(
@@ -3338,52 +3326,59 @@ impl AcpThreadView {
 
         let focus_handle = self.focus_handle(cx);
 
-        let icon = Icon::new(IconName::Info)
-            .size(IconSize::Small)
-            .color(Color::Info);
-
         Some(
             Callout::new()
-                .icon(icon)
+                .icon(IconName::Info)
                 .title("Consecutive tool use limit reached.")
-                .when(supports_burn_mode, |this| {
-                    this.secondary_action(
-                        Button::new("continue-burn-mode", "Continue with Burn Mode")
-                            .style(ButtonStyle::Filled)
-                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                            .layer(ElevationIndex::ModalSurface)
-                            .label_size(LabelSize::Small)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &ContinueWithBurnMode,
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(10.))),
+                .actions_slot(
+                    h_flex()
+                        .gap_0p5()
+                        .when(supports_burn_mode, |this| {
+                            this.child(
+                                Button::new("continue-burn-mode", "Continue with Burn Mode")
+                                    .style(ButtonStyle::Filled)
+                                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
+                                    .layer(ElevationIndex::ModalSurface)
+                                    .label_size(LabelSize::Small)
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &ContinueWithBurnMode,
+                                            &focus_handle,
+                                            window,
+                                            cx,
+                                        )
+                                        .map(|kb| kb.size(rems_from_px(10.))),
+                                    )
+                                    .tooltip(Tooltip::text(
+                                        "Enable Burn Mode for unlimited tool use.",
+                                    ))
+                                    .on_click({
+                                        cx.listener(move |this, _, _window, cx| {
+                                            thread.update(cx, |thread, _cx| {
+                                                thread.set_completion_mode(CompletionMode::Burn);
+                                            });
+                                            this.resume_chat(cx);
+                                        })
+                                    }),
                             )
-                            .tooltip(Tooltip::text("Enable Burn Mode for unlimited tool use."))
-                            .on_click({
-                                cx.listener(move |this, _, _window, cx| {
-                                    thread.update(cx, |thread, _cx| {
-                                        thread.set_completion_mode(CompletionMode::Burn);
-                                    });
+                        })
+                        .child(
+                            Button::new("continue-conversation", "Continue")
+                                .layer(ElevationIndex::ModalSurface)
+                                .label_size(LabelSize::Small)
+                                .key_binding(
+                                    KeyBinding::for_action_in(
+                                        &ContinueThread,
+                                        &focus_handle,
+                                        window,
+                                        cx,
+                                    )
+                                    .map(|kb| kb.size(rems_from_px(10.))),
+                                )
+                                .on_click(cx.listener(|this, _, _window, cx| {
                                     this.resume_chat(cx);
-                                })
-                            }),
-                    )
-                })
-                .primary_action(
-                    Button::new("continue-conversation", "Continue")
-                        .layer(ElevationIndex::ModalSurface)
-                        .label_size(LabelSize::Small)
-                        .key_binding(
-                            KeyBinding::for_action_in(&ContinueThread, &focus_handle, window, cx)
-                                .map(|kb| kb.size(rems_from_px(10.))),
-                        )
-                        .on_click(cx.listener(|this, _, _window, cx| {
-                            this.resume_chat(cx);
-                        })),
+                                })),
+                        ),
                 ),
         )
     }
@@ -3424,10 +3419,6 @@ impl AcpThreadView {
                 }
             }))
     }
-
-    fn error_callout_bg(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme().status().error.opacity(0.08)
-    }
 }
 
 impl Focusable for AcpThreadView {
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 38be2b193c..d2f448635e 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -2597,7 +2597,7 @@ impl ActiveThread {
             .id(("message-container", ix))
             .py_1()
             .px_2p5()
-            .child(Banner::new().severity(ui::Severity::Warning).child(message))
+            .child(Banner::new().severity(Severity::Warning).child(message))
     }
 
     fn render_message_thinking_segment(
diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
index c68c9c2730..998641bf01 100644
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
@@ -454,7 +454,7 @@ impl Render for AddLlmProviderModal {
                         this.section(
                             Section::new().child(
                                 Banner::new()
-                                    .severity(ui::Severity::Warning)
+                                    .severity(Severity::Warning)
                                     .child(div().text_xs().child(error)),
                             ),
                         )
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index e1174a4191..cb354222b6 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -48,9 +48,8 @@ use feature_flags::{self, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem,
-    Corner, DismissEvent, Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable, Hsla,
-    KeyContext, Pixels, Subscription, Task, UpdateGlobal, WeakEntity, prelude::*,
-    pulsating_between,
+    Corner, DismissEvent, Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable, KeyContext,
+    Pixels, Subscription, Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,
 };
 use language::LanguageRegistry;
 use language_model::{
@@ -2712,20 +2711,22 @@ impl AgentPanel {
         action_slot: Option<AnyElement>,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        h_flex()
-            .mt_2()
-            .pl_1p5()
-            .pb_1()
-            .w_full()
-            .justify_between()
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(
-                Label::new(label.into())
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .children(action_slot)
+        div().pl_1().pr_1p5().child(
+            h_flex()
+                .mt_2()
+                .pl_1p5()
+                .pb_1()
+                .w_full()
+                .justify_between()
+                .border_b_1()
+                .border_color(cx.theme().colors().border_variant)
+                .child(
+                    Label::new(label.into())
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+                .children(action_slot),
+        )
     }
 
     fn render_thread_empty_state(
@@ -2831,22 +2832,12 @@ impl AgentPanel {
                                                 }),
                                         ),
                                 )
-                        })
-                        .when_some(configuration_error.as_ref(), |this, err| {
-                            this.child(self.render_configuration_error(
-                                err,
-                                &focus_handle,
-                                window,
-                                cx,
-                            ))
                         }),
                 )
             })
             .when(!recent_history.is_empty(), |parent| {
-                let focus_handle = focus_handle.clone();
                 parent
                     .overflow_hidden()
-                    .p_1p5()
                     .justify_end()
                     .gap_1()
                     .child(
@@ -2874,10 +2865,11 @@ impl AgentPanel {
                         ),
                     )
                     .child(
-                        v_flex()
-                            .gap_1()
-                            .children(recent_history.into_iter().enumerate().map(
-                                |(index, entry)| {
+                        v_flex().p_1().pr_1p5().gap_1().children(
+                            recent_history
+                                .into_iter()
+                                .enumerate()
+                                .map(|(index, entry)| {
                                     // TODO: Add keyboard navigation.
                                     let is_hovered =
                                         self.hovered_recent_history_item == Some(index);
@@ -2896,30 +2888,68 @@ impl AgentPanel {
                                             },
                                         ))
                                         .into_any_element()
-                                },
-                            )),
+                                }),
+                        ),
                     )
-                    .when_some(configuration_error.as_ref(), |this, err| {
-                        this.child(self.render_configuration_error(err, &focus_handle, window, cx))
-                    })
+            })
+            .when_some(configuration_error.as_ref(), |this, err| {
+                this.child(self.render_configuration_error(false, err, &focus_handle, window, cx))
             })
     }
 
     fn render_configuration_error(
         &self,
+        border_bottom: bool,
         configuration_error: &ConfigurationError,
         focus_handle: &FocusHandle,
         window: &mut Window,
         cx: &mut App,
     ) -> impl IntoElement {
-        match configuration_error {
-            ConfigurationError::ModelNotFound
-            | ConfigurationError::ProviderNotAuthenticated(_)
-            | ConfigurationError::NoProvider => Banner::new()
-                .severity(ui::Severity::Warning)
-                .child(Label::new(configuration_error.to_string()))
-                .action_slot(
-                    Button::new("settings", "Configure Provider")
+        let zed_provider_configured = AgentSettings::get_global(cx)
+            .default_model
+            .as_ref()
+            .map_or(false, |selection| {
+                selection.provider.0.as_str() == "zed.dev"
+            });
+
+        let callout = if zed_provider_configured {
+            Callout::new()
+                .icon(IconName::Warning)
+                .severity(Severity::Warning)
+                .when(border_bottom, |this| {
+                    this.border_position(ui::BorderPosition::Bottom)
+                })
+                .title("Sign in to continue using Zed as your LLM provider.")
+                .actions_slot(
+                    Button::new("sign_in", "Sign In")
+                        .style(ButtonStyle::Tinted(ui::TintColor::Warning))
+                        .label_size(LabelSize::Small)
+                        .on_click({
+                            let workspace = self.workspace.clone();
+                            move |_, _, cx| {
+                                let Ok(client) =
+                                    workspace.update(cx, |workspace, _| workspace.client().clone())
+                                else {
+                                    return;
+                                };
+
+                                cx.spawn(async move |cx| {
+                                    client.sign_in_with_optional_connect(true, cx).await
+                                })
+                                .detach_and_log_err(cx);
+                            }
+                        }),
+                )
+        } else {
+            Callout::new()
+                .icon(IconName::Warning)
+                .severity(Severity::Warning)
+                .when(border_bottom, |this| {
+                    this.border_position(ui::BorderPosition::Bottom)
+                })
+                .title(configuration_error.to_string())
+                .actions_slot(
+                    Button::new("settings", "Configure")
                         .style(ButtonStyle::Tinted(ui::TintColor::Warning))
                         .label_size(LabelSize::Small)
                         .key_binding(
@@ -2929,16 +2959,23 @@ impl AgentPanel {
                         .on_click(|_event, window, cx| {
                             window.dispatch_action(OpenSettings.boxed_clone(), cx)
                         }),
-                ),
+                )
+        };
+
+        match configuration_error {
+            ConfigurationError::ModelNotFound
+            | ConfigurationError::ProviderNotAuthenticated(_)
+            | ConfigurationError::NoProvider => callout.into_any_element(),
             ConfigurationError::ProviderPendingTermsAcceptance(provider) => {
-                Banner::new().severity(ui::Severity::Warning).child(
-                    h_flex().w_full().children(
+                Banner::new()
+                    .severity(Severity::Warning)
+                    .child(h_flex().w_full().children(
                         provider.render_accept_terms(
                             LanguageModelProviderTosView::ThreadEmptyState,
                             cx,
                         ),
-                    ),
-                )
+                    ))
+                    .into_any_element()
             }
         }
     }
@@ -2970,7 +3007,7 @@ impl AgentPanel {
         let focus_handle = self.focus_handle(cx);
 
         let banner = Banner::new()
-            .severity(ui::Severity::Info)
+            .severity(Severity::Info)
             .child(Label::new("Consecutive tool use limit reached.").size(LabelSize::Small))
             .action_slot(
                 h_flex()
@@ -3081,10 +3118,6 @@ impl AgentPanel {
             }))
     }
 
-    fn error_callout_bg(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme().status().error.opacity(0.08)
-    }
-
     fn render_payment_required_error(
         &self,
         thread: &Entity<ActiveThread>,
@@ -3093,23 +3126,18 @@ impl AgentPanel {
         const ERROR_MESSAGE: &str =
             "You reached your free usage limit. Upgrade to Zed Pro for more prompts.";
 
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                Callout::new()
-                    .icon(icon)
-                    .title("Free Usage Exceeded")
-                    .description(ERROR_MESSAGE)
-                    .tertiary_action(self.upgrade_button(thread, cx))
-                    .secondary_action(self.create_copy_button(ERROR_MESSAGE))
-                    .primary_action(self.dismiss_error_button(thread, cx))
-                    .bg_color(self.error_callout_bg(cx)),
+        Callout::new()
+            .severity(Severity::Error)
+            .icon(IconName::XCircle)
+            .title("Free Usage Exceeded")
+            .description(ERROR_MESSAGE)
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .child(self.upgrade_button(thread, cx))
+                    .child(self.create_copy_button(ERROR_MESSAGE)),
             )
+            .dismiss_action(self.dismiss_error_button(thread, cx))
             .into_any_element()
     }
 
@@ -3124,23 +3152,37 @@ impl AgentPanel {
             Plan::ZedProTrial | Plan::ZedFree => "Upgrade to Zed Pro for more prompts.",
         };
 
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                Callout::new()
-                    .icon(icon)
-                    .title("Model Prompt Limit Reached")
-                    .description(error_message)
-                    .tertiary_action(self.upgrade_button(thread, cx))
-                    .secondary_action(self.create_copy_button(error_message))
-                    .primary_action(self.dismiss_error_button(thread, cx))
-                    .bg_color(self.error_callout_bg(cx)),
+        Callout::new()
+            .severity(Severity::Error)
+            .title("Model Prompt Limit Reached")
+            .description(error_message)
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .child(self.upgrade_button(thread, cx))
+                    .child(self.create_copy_button(error_message)),
             )
+            .dismiss_action(self.dismiss_error_button(thread, cx))
+            .into_any_element()
+    }
+
+    fn render_retry_button(&self, thread: &Entity<ActiveThread>) -> AnyElement {
+        Button::new("retry", "Retry")
+            .icon(IconName::RotateCw)
+            .icon_position(IconPosition::Start)
+            .icon_size(IconSize::Small)
+            .label_size(LabelSize::Small)
+            .on_click({
+                let thread = thread.clone();
+                move |_, window, cx| {
+                    thread.update(cx, |thread, cx| {
+                        thread.clear_last_error();
+                        thread.thread().update(cx, |thread, cx| {
+                            thread.retry_last_completion(Some(window.window_handle()), cx);
+                        });
+                    });
+                }
+            })
             .into_any_element()
     }
 
@@ -3153,40 +3195,18 @@ impl AgentPanel {
     ) -> AnyElement {
         let message_with_header = format!("{}\n{}", header, message);
 
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
-        let retry_button = Button::new("retry", "Retry")
-            .icon(IconName::RotateCw)
-            .icon_position(IconPosition::Start)
-            .icon_size(IconSize::Small)
-            .label_size(LabelSize::Small)
-            .on_click({
-                let thread = thread.clone();
-                move |_, window, cx| {
-                    thread.update(cx, |thread, cx| {
-                        thread.clear_last_error();
-                        thread.thread().update(cx, |thread, cx| {
-                            thread.retry_last_completion(Some(window.window_handle()), cx);
-                        });
-                    });
-                }
-            });
-
-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                Callout::new()
-                    .icon(icon)
-                    .title(header)
-                    .description(message.clone())
-                    .primary_action(retry_button)
-                    .secondary_action(self.dismiss_error_button(thread, cx))
-                    .tertiary_action(self.create_copy_button(message_with_header))
-                    .bg_color(self.error_callout_bg(cx)),
+        Callout::new()
+            .severity(Severity::Error)
+            .icon(IconName::XCircle)
+            .title(header)
+            .description(message.clone())
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .child(self.render_retry_button(thread))
+                    .child(self.create_copy_button(message_with_header)),
             )
+            .dismiss_action(self.dismiss_error_button(thread, cx))
             .into_any_element()
     }
 
@@ -3195,60 +3215,39 @@ impl AgentPanel {
         message: SharedString,
         can_enable_burn_mode: bool,
         thread: &Entity<ActiveThread>,
-        cx: &mut Context<Self>,
     ) -> AnyElement {
-        let icon = Icon::new(IconName::XCircle)
-            .size(IconSize::Small)
-            .color(Color::Error);
-
-        let retry_button = Button::new("retry", "Retry")
-            .icon(IconName::RotateCw)
-            .icon_position(IconPosition::Start)
-            .icon_size(IconSize::Small)
-            .label_size(LabelSize::Small)
-            .on_click({
-                let thread = thread.clone();
-                move |_, window, cx| {
-                    thread.update(cx, |thread, cx| {
-                        thread.clear_last_error();
-                        thread.thread().update(cx, |thread, cx| {
-                            thread.retry_last_completion(Some(window.window_handle()), cx);
-                        });
-                    });
-                }
-            });
-
-        let mut callout = Callout::new()
-            .icon(icon)
+        Callout::new()
+            .severity(Severity::Error)
             .title("Error")
             .description(message.clone())
-            .bg_color(self.error_callout_bg(cx))
-            .primary_action(retry_button);
-
-        if can_enable_burn_mode {
-            let burn_mode_button = Button::new("enable_burn_retry", "Enable Burn Mode and Retry")
-                .icon(IconName::ZedBurnMode)
-                .icon_position(IconPosition::Start)
-                .icon_size(IconSize::Small)
-                .label_size(LabelSize::Small)
-                .on_click({
-                    let thread = thread.clone();
-                    move |_, window, cx| {
-                        thread.update(cx, |thread, cx| {
-                            thread.clear_last_error();
-                            thread.thread().update(cx, |thread, cx| {
-                                thread.enable_burn_mode_and_retry(Some(window.window_handle()), cx);
-                            });
-                        });
-                    }
-                });
-            callout = callout.secondary_action(burn_mode_button);
-        }
-
-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(callout)
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .when(can_enable_burn_mode, |this| {
+                        this.child(
+                            Button::new("enable_burn_retry", "Enable Burn Mode and Retry")
+                                .icon(IconName::ZedBurnMode)
+                                .icon_position(IconPosition::Start)
+                                .icon_size(IconSize::Small)
+                                .label_size(LabelSize::Small)
+                                .on_click({
+                                    let thread = thread.clone();
+                                    move |_, window, cx| {
+                                        thread.update(cx, |thread, cx| {
+                                            thread.clear_last_error();
+                                            thread.thread().update(cx, |thread, cx| {
+                                                thread.enable_burn_mode_and_retry(
+                                                    Some(window.window_handle()),
+                                                    cx,
+                                                );
+                                            });
+                                        });
+                                    }
+                                }),
+                        )
+                    })
+                    .child(self.render_retry_button(thread)),
+            )
             .into_any_element()
     }
 
@@ -3503,7 +3502,6 @@ impl Render for AgentPanel {
                                         message,
                                         can_enable_burn_mode,
                                         thread,
-                                        cx,
                                     ),
                                 })
                                 .into_any(),
@@ -3531,16 +3529,13 @@ impl Render for AgentPanel {
                             if !self.should_render_onboarding(cx)
                                 && let Some(err) = configuration_error.as_ref()
                             {
-                                this.child(
-                                    div().bg(cx.theme().colors().editor_background).p_2().child(
-                                        self.render_configuration_error(
-                                            err,
-                                            &self.focus_handle(cx),
-                                            window,
-                                            cx,
-                                        ),
-                                    ),
-                                )
+                                this.child(self.render_configuration_error(
+                                    true,
+                                    err,
+                                    &self.focus_handle(cx),
+                                    window,
+                                    cx,
+                                ))
                             } else {
                                 this
                             }
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 181a0dd5d2..ddb51154f5 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1323,14 +1323,10 @@ impl MessageEditor {
         token_usage_ratio: TokenUsageRatio,
         cx: &mut Context<Self>,
     ) -> Option<Div> {
-        let icon = if token_usage_ratio == TokenUsageRatio::Exceeded {
-            Icon::new(IconName::Close)
-                .color(Color::Error)
-                .size(IconSize::XSmall)
+        let (icon, severity) = if token_usage_ratio == TokenUsageRatio::Exceeded {
+            (IconName::Close, Severity::Error)
         } else {
-            Icon::new(IconName::Warning)
-                .color(Color::Warning)
-                .size(IconSize::XSmall)
+            (IconName::Warning, Severity::Warning)
         };
 
         let title = if token_usage_ratio == TokenUsageRatio::Exceeded {
@@ -1345,30 +1341,34 @@ impl MessageEditor {
             "To continue, start a new thread from a summary."
         };
 
-        let mut callout = Callout::new()
+        let callout = Callout::new()
             .line_height(line_height)
+            .severity(severity)
             .icon(icon)
             .title(title)
             .description(description)
-            .primary_action(
-                Button::new("start-new-thread", "Start New Thread")
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let from_thread_id = Some(this.thread.read(cx).id().clone());
-                        window.dispatch_action(Box::new(NewThread { from_thread_id }), cx);
-                    })),
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .when(self.is_using_zed_provider(cx), |this| {
+                        this.child(
+                            IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
+                                .icon_size(IconSize::XSmall)
+                                .on_click(cx.listener(|this, _event, window, cx| {
+                                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
+                                })),
+                        )
+                    })
+                    .child(
+                        Button::new("start-new-thread", "Start New Thread")
+                            .label_size(LabelSize::Small)
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                let from_thread_id = Some(this.thread.read(cx).id().clone());
+                                window.dispatch_action(Box::new(NewThread { from_thread_id }), cx);
+                            })),
+                    ),
             );
 
-        if self.is_using_zed_provider(cx) {
-            callout = callout.secondary_action(
-                IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
-                    .icon_size(IconSize::XSmall)
-                    .on_click(cx.listener(|this, _event, window, cx| {
-                        this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                    })),
-            );
-        }
-
         Some(
             div()
                 .border_t_1()
diff --git a/crates/agent_ui/src/ui/preview/usage_callouts.rs b/crates/agent_ui/src/ui/preview/usage_callouts.rs
index eef878a9d1..29b12ea627 100644
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -80,14 +80,10 @@ impl RenderOnce for UsageCallout {
             }
         };
 
-        let icon = if is_limit_reached {
-            Icon::new(IconName::Close)
-                .color(Color::Error)
-                .size(IconSize::XSmall)
+        let (icon, severity) = if is_limit_reached {
+            (IconName::Close, Severity::Error)
         } else {
-            Icon::new(IconName::Warning)
-                .color(Color::Warning)
-                .size(IconSize::XSmall)
+            (IconName::Warning, Severity::Warning)
         };
 
         div()
@@ -95,10 +91,12 @@ impl RenderOnce for UsageCallout {
             .border_color(cx.theme().colors().border)
             .child(
                 Callout::new()
+                    .icon(icon)
+                    .severity(severity)
                     .icon(icon)
                     .title(title)
                     .description(message)
-                    .primary_action(
+                    .actions_slot(
                         Button::new("upgrade", button_text)
                             .label_size(LabelSize::Small)
                             .on_click(move |_, _, cx| {
diff --git a/crates/ai_onboarding/src/young_account_banner.rs b/crates/ai_onboarding/src/young_account_banner.rs
index 54f563e4aa..ed9a6b3b35 100644
--- a/crates/ai_onboarding/src/young_account_banner.rs
+++ b/crates/ai_onboarding/src/young_account_banner.rs
@@ -17,6 +17,6 @@ impl RenderOnce for YoungAccountBanner {
         div()
             .max_w_full()
             .my_1()
-            .child(Banner::new().severity(ui::Severity::Warning).child(label))
+            .child(Banner::new().severity(Severity::Warning).child(label))
     }
 }
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index 078b90a291..8f52f8c1c3 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -21,7 +21,7 @@ impl Global for GlobalLanguageModelRegistry {}
 pub enum ConfigurationError {
     #[error("Configure at least one LLM provider to start using the panel.")]
     NoProvider,
-    #[error("LLM Provider is not configured or does not support the configured model.")]
+    #[error("LLM provider is not configured or does not support the configured model.")]
     ModelNotFound,
     #[error("{} LLM provider is not configured.", .0.name().0)]
     ProviderNotAuthenticated(Arc<dyn LanguageModelProvider>),
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 58090d2060..757a0ca226 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -2021,21 +2021,21 @@ impl RenderOnce for SyntaxHighlightedText {
 
 #[derive(PartialEq)]
 struct InputError {
-    severity: ui::Severity,
+    severity: Severity,
     content: SharedString,
 }
 
 impl InputError {
     fn warning(message: impl Into<SharedString>) -> Self {
         Self {
-            severity: ui::Severity::Warning,
+            severity: Severity::Warning,
             content: message.into(),
         }
     }
 
     fn error(message: anyhow::Error) -> Self {
         Self {
-            severity: ui::Severity::Error,
+            severity: Severity::Error,
             content: message.to_string().into(),
         }
     }
@@ -2162,9 +2162,11 @@ impl KeybindingEditorModal {
     }
 
     fn set_error(&mut self, error: InputError, cx: &mut Context<Self>) -> bool {
-        if self.error.as_ref().is_some_and(|old_error| {
-            old_error.severity == ui::Severity::Warning && *old_error == error
-        }) {
+        if self
+            .error
+            .as_ref()
+            .is_some_and(|old_error| old_error.severity == Severity::Warning && *old_error == error)
+        {
             false
         } else {
             self.error = Some(error);
diff --git a/crates/ui/src/components/banner.rs b/crates/ui/src/components/banner.rs
index d493e8a0d3..7458ad8eb0 100644
--- a/crates/ui/src/components/banner.rs
+++ b/crates/ui/src/components/banner.rs
@@ -1,15 +1,6 @@
 use crate::prelude::*;
 use gpui::{AnyElement, IntoElement, ParentElement, Styled};
 
-/// Severity levels that determine the style of the banner.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Severity {
-    Info,
-    Success,
-    Warning,
-    Error,
-}
-
 /// Banners provide informative and brief messages without interrupting the user.
 /// This component offers four severity levels that can be used depending on the message.
 ///
diff --git a/crates/ui/src/components/callout.rs b/crates/ui/src/components/callout.rs
index abb03198ab..22ba0468cd 100644
--- a/crates/ui/src/components/callout.rs
+++ b/crates/ui/src/components/callout.rs
@@ -1,7 +1,13 @@
-use gpui::{AnyElement, Hsla};
+use gpui::AnyElement;
 
 use crate::prelude::*;
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum BorderPosition {
+    Top,
+    Bottom,
+}
+
 /// A callout component for displaying important information that requires user attention.
 ///
 /// # Usage Example
@@ -10,42 +16,48 @@ use crate::prelude::*;
 /// use ui::{Callout};
 ///
 /// Callout::new()
-///     .icon(Icon::new(IconName::Warning).color(Color::Warning))
+///     .severity(Severity::Warning)
+///     .icon(IconName::Warning)
 ///     .title(Label::new("Be aware of your subscription!"))
 ///     .description(Label::new("Your subscription is about to expire. Renew now!"))
-///     .primary_action(Button::new("renew", "Renew Now"))
-///     .secondary_action(Button::new("remind", "Remind Me Later"))
+///     .actions_slot(Button::new("renew", "Renew Now"))
 /// ```
 ///
 #[derive(IntoElement, RegisterComponent)]
 pub struct Callout {
-    icon: Option<Icon>,
+    severity: Severity,
+    icon: Option<IconName>,
     title: Option<SharedString>,
     description: Option<SharedString>,
-    primary_action: Option<AnyElement>,
-    secondary_action: Option<AnyElement>,
-    tertiary_action: Option<AnyElement>,
+    actions_slot: Option<AnyElement>,
+    dismiss_action: Option<AnyElement>,
     line_height: Option<Pixels>,
-    bg_color: Option<Hsla>,
+    border_position: BorderPosition,
 }
 
 impl Callout {
     /// Creates a new `Callout` component with default styling.
     pub fn new() -> Self {
         Self {
+            severity: Severity::Info,
             icon: None,
             title: None,
             description: None,
-            primary_action: None,
-            secondary_action: None,
-            tertiary_action: None,
+            actions_slot: None,
+            dismiss_action: None,
             line_height: None,
-            bg_color: None,
+            border_position: BorderPosition::Top,
         }
     }
 
+    /// Sets the severity of the callout.
+    pub fn severity(mut self, severity: Severity) -> Self {
+        self.severity = severity;
+        self
+    }
+
     /// Sets the icon to display in the callout.
-    pub fn icon(mut self, icon: Icon) -> Self {
+    pub fn icon(mut self, icon: IconName) -> Self {
         self.icon = Some(icon);
         self
     }
@@ -64,20 +76,14 @@ impl Callout {
     }
 
     /// Sets the primary call-to-action button.
-    pub fn primary_action(mut self, action: impl IntoElement) -> Self {
-        self.primary_action = Some(action.into_any_element());
-        self
-    }
-
-    /// Sets an optional secondary call-to-action button.
-    pub fn secondary_action(mut self, action: impl IntoElement) -> Self {
-        self.secondary_action = Some(action.into_any_element());
+    pub fn actions_slot(mut self, action: impl IntoElement) -> Self {
+        self.actions_slot = Some(action.into_any_element());
         self
     }
 
     /// Sets an optional tertiary call-to-action button.
-    pub fn tertiary_action(mut self, action: impl IntoElement) -> Self {
-        self.tertiary_action = Some(action.into_any_element());
+    pub fn dismiss_action(mut self, action: impl IntoElement) -> Self {
+        self.dismiss_action = Some(action.into_any_element());
         self
     }
 
@@ -87,9 +93,9 @@ impl Callout {
         self
     }
 
-    /// Sets a custom background color for the callout content.
-    pub fn bg_color(mut self, color: Hsla) -> Self {
-        self.bg_color = Some(color);
+    /// Sets the border position in the callout.
+    pub fn border_position(mut self, border_position: BorderPosition) -> Self {
+        self.border_position = border_position;
         self
     }
 }
@@ -97,21 +103,51 @@ impl Callout {
 impl RenderOnce for Callout {
     fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
         let line_height = self.line_height.unwrap_or(window.line_height());
-        let bg_color = self
-            .bg_color
-            .unwrap_or(cx.theme().colors().panel_background);
-        let has_actions = self.primary_action.is_some()
-            || self.secondary_action.is_some()
-            || self.tertiary_action.is_some();
+
+        let has_actions = self.actions_slot.is_some() || self.dismiss_action.is_some();
+
+        let (icon, icon_color, bg_color) = match self.severity {
+            Severity::Info => (
+                IconName::Info,
+                Color::Muted,
+                cx.theme().colors().panel_background.opacity(0.),
+            ),
+            Severity::Success => (
+                IconName::Check,
+                Color::Success,
+                cx.theme().status().success.opacity(0.1),
+            ),
+            Severity::Warning => (
+                IconName::Warning,
+                Color::Warning,
+                cx.theme().status().warning_background.opacity(0.2),
+            ),
+            Severity::Error => (
+                IconName::XCircle,
+                Color::Error,
+                cx.theme().status().error.opacity(0.08),
+            ),
+        };
 
         h_flex()
+            .min_w_0()
             .p_2()
             .gap_2()
             .items_start()
+            .map(|this| match self.border_position {
+                BorderPosition::Top => this.border_t_1(),
+                BorderPosition::Bottom => this.border_b_1(),
+            })
+            .border_color(cx.theme().colors().border)
             .bg(bg_color)
             .overflow_x_hidden()
-            .when_some(self.icon, |this, icon| {
-                this.child(h_flex().h(line_height).justify_center().child(icon))
+            .when(self.icon.is_some(), |this| {
+                this.child(
+                    h_flex()
+                        .h(line_height)
+                        .justify_center()
+                        .child(Icon::new(icon).size(IconSize::Small).color(icon_color)),
+                )
             })
             .child(
                 v_flex()
@@ -119,10 +155,11 @@ impl RenderOnce for Callout {
                     .w_full()
                     .child(
                         h_flex()
-                            .h(line_height)
+                            .min_h(line_height)
                             .w_full()
                             .gap_1()
                             .justify_between()
+                            .flex_wrap()
                             .when_some(self.title, |this, title| {
                                 this.child(h_flex().child(Label::new(title).size(LabelSize::Small)))
                             })
@@ -130,13 +167,10 @@ impl RenderOnce for Callout {
                                 this.child(
                                     h_flex()
                                         .gap_0p5()
-                                        .when_some(self.tertiary_action, |this, action| {
+                                        .when_some(self.actions_slot, |this, action| {
                                             this.child(action)
                                         })
-                                        .when_some(self.secondary_action, |this, action| {
-                                            this.child(action)
-                                        })
-                                        .when_some(self.primary_action, |this, action| {
+                                        .when_some(self.dismiss_action, |this, action| {
                                             this.child(action)
                                         }),
                                 )
@@ -168,84 +202,101 @@ impl Component for Callout {
     }
 
     fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let callout_examples = vec![
+        let single_action = || Button::new("got-it", "Got it").label_size(LabelSize::Small);
+        let multiple_actions = || {
+            h_flex()
+                .gap_0p5()
+                .child(Button::new("update", "Backup & Update").label_size(LabelSize::Small))
+                .child(Button::new("dismiss", "Dismiss").label_size(LabelSize::Small))
+        };
+
+        let basic_examples = vec![
             single_example(
                 "Simple with Title Only",
                 Callout::new()
-                    .icon(
-                        Icon::new(IconName::Info)
-                            .color(Color::Accent)
-                            .size(IconSize::Small),
-                    )
+                    .icon(IconName::Info)
                     .title("System maintenance scheduled for tonight")
-                    .primary_action(Button::new("got-it", "Got it").label_size(LabelSize::Small))
+                    .actions_slot(single_action())
                     .into_any_element(),
             )
             .width(px(580.)),
             single_example(
                 "With Title and Description",
                 Callout::new()
-                    .icon(
-                        Icon::new(IconName::Warning)
-                            .color(Color::Warning)
-                            .size(IconSize::Small),
-                    )
+                    .icon(IconName::Warning)
                     .title("Your settings contain deprecated values")
                     .description(
                         "We'll backup your current settings and update them to the new format.",
                     )
-                    .primary_action(
-                        Button::new("update", "Backup & Update").label_size(LabelSize::Small),
-                    )
-                    .secondary_action(
-                        Button::new("dismiss", "Dismiss").label_size(LabelSize::Small),
-                    )
+                    .actions_slot(single_action())
                     .into_any_element(),
             )
             .width(px(580.)),
             single_example(
                 "Error with Multiple Actions",
                 Callout::new()
-                    .icon(
-                        Icon::new(IconName::Close)
-                            .color(Color::Error)
-                            .size(IconSize::Small),
-                    )
+                    .icon(IconName::Close)
                     .title("Thread reached the token limit")
                     .description("Start a new thread from a summary to continue the conversation.")
-                    .primary_action(
-                        Button::new("new-thread", "Start New Thread").label_size(LabelSize::Small),
-                    )
-                    .secondary_action(
-                        Button::new("view-summary", "View Summary").label_size(LabelSize::Small),
-                    )
+                    .actions_slot(multiple_actions())
                     .into_any_element(),
             )
             .width(px(580.)),
             single_example(
                 "Multi-line Description",
                 Callout::new()
-                    .icon(
-                        Icon::new(IconName::Sparkle)
-                            .color(Color::Accent)
-                            .size(IconSize::Small),
-                    )
+                    .icon(IconName::Sparkle)
                     .title("Upgrade to Pro")
                     .description("• Unlimited threads\n• Priority support\n• Advanced analytics")
-                    .primary_action(
-                        Button::new("upgrade", "Upgrade Now").label_size(LabelSize::Small),
-                    )
-                    .secondary_action(
-                        Button::new("learn-more", "Learn More").label_size(LabelSize::Small),
-                    )
+                    .actions_slot(multiple_actions())
                     .into_any_element(),
             )
             .width(px(580.)),
         ];
 
+        let severity_examples = vec![
+            single_example(
+                "Info",
+                Callout::new()
+                    .icon(IconName::Info)
+                    .title("System maintenance scheduled for tonight")
+                    .actions_slot(single_action())
+                    .into_any_element(),
+            ),
+            single_example(
+                "Warning",
+                Callout::new()
+                    .severity(Severity::Warning)
+                    .icon(IconName::Triangle)
+                    .title("System maintenance scheduled for tonight")
+                    .actions_slot(single_action())
+                    .into_any_element(),
+            ),
+            single_example(
+                "Error",
+                Callout::new()
+                    .severity(Severity::Error)
+                    .icon(IconName::XCircle)
+                    .title("System maintenance scheduled for tonight")
+                    .actions_slot(single_action())
+                    .into_any_element(),
+            ),
+            single_example(
+                "Success",
+                Callout::new()
+                    .severity(Severity::Success)
+                    .icon(IconName::Check)
+                    .title("System maintenance scheduled for tonight")
+                    .actions_slot(single_action())
+                    .into_any_element(),
+            ),
+        ];
+
         Some(
-            example_group(callout_examples)
-                .vertical()
+            v_flex()
+                .gap_4()
+                .child(example_group(basic_examples).vertical())
+                .child(example_group_with_title("Severity", severity_examples).vertical())
                 .into_any_element(),
         )
     }
diff --git a/crates/ui/src/prelude.rs b/crates/ui/src/prelude.rs
index 80f8f863f8..0357e498bb 100644
--- a/crates/ui/src/prelude.rs
+++ b/crates/ui/src/prelude.rs
@@ -14,7 +14,9 @@ pub use ui_macros::RegisterComponent;
 
 pub use crate::DynamicSpacing;
 pub use crate::animation::{AnimationDirection, AnimationDuration, DefaultAnimations};
-pub use crate::styles::{PlatformStyle, StyledTypography, TextSize, rems_from_px, vh, vw};
+pub use crate::styles::{
+    PlatformStyle, Severity, StyledTypography, TextSize, rems_from_px, vh, vw,
+};
 pub use crate::traits::clickable::*;
 pub use crate::traits::disableable::*;
 pub use crate::traits::fixed::*;
diff --git a/crates/ui/src/styles.rs b/crates/ui/src/styles.rs
index af6ab57029..bc2399f54b 100644
--- a/crates/ui/src/styles.rs
+++ b/crates/ui/src/styles.rs
@@ -3,6 +3,7 @@ mod appearance;
 mod color;
 mod elevation;
 mod platform;
+mod severity;
 mod spacing;
 mod typography;
 mod units;
@@ -11,6 +12,7 @@ pub use appearance::*;
 pub use color::*;
 pub use elevation::*;
 pub use platform::*;
+pub use severity::*;
 pub use spacing::*;
 pub use typography::*;
 pub use units::*;
diff --git a/crates/ui/src/styles/severity.rs b/crates/ui/src/styles/severity.rs
new file mode 100644
index 0000000000..464f835186
--- /dev/null
+++ b/crates/ui/src/styles/severity.rs
@@ -0,0 +1,10 @@
+/// Severity levels that determine the style of the component.
+/// Usually, it affects the background. Most of the time,
+/// it also follows with an icon corresponding the severity level.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Severity {
+    Info,
+    Success,
+    Warning,
+    Error,
+}

From 6ee06bf2a0f0db312e4ec916e2802bd5bef034e8 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 18 Aug 2025 21:53:05 -0300
Subject: [PATCH 142/823] ai onboarding: Adjust the Zed Pro banner (#36452)

Release Notes:

- N/A
---
 crates/ai_onboarding/src/ai_onboarding.rs | 30 ++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index 75177d4bd2..717abebfd1 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -332,17 +332,25 @@ impl ZedAiOnboarding {
                     .mb_2(),
             )
             .child(plan_definitions.pro_plan(false))
-            .child(
-                Button::new("pro", "Continue with Zed Pro")
-                    .full_width()
-                    .style(ButtonStyle::Outlined)
-                    .on_click({
-                        let callback = self.continue_with_zed_ai.clone();
-                        move |_, window, cx| {
-                            telemetry::event!("Banner Dismissed", source = "AI Onboarding");
-                            callback(window, cx)
-                        }
-                    }),
+            .when_some(
+                self.dismiss_onboarding.as_ref(),
+                |this, dismiss_callback| {
+                    let callback = dismiss_callback.clone();
+                    this.child(
+                        h_flex().absolute().top_0().right_0().child(
+                            IconButton::new("dismiss_onboarding", IconName::Close)
+                                .icon_size(IconSize::Small)
+                                .tooltip(Tooltip::text("Dismiss"))
+                                .on_click(move |_, window, cx| {
+                                    telemetry::event!(
+                                        "Banner Dismissed",
+                                        source = "AI Onboarding",
+                                    );
+                                    callback(window, cx)
+                                }),
+                        ),
+                    )
+                },
             )
             .into_any_element()
     }

From 4abfcbaff987c0b42081e501aa431935e5dad27d Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 18 Aug 2025 21:08:20 -0500
Subject: [PATCH 143/823] git: Suggest merge commit message in remote (#36430)

Closes #ISSUE

Adds `merge_message` field to the `UpdateRepository` proto message so
that suggested merge messages are displayed in remote projects.

Release Notes:

- git: Fixed an issue where suggested merge commit messages would not
appear for remote projects
---
 .../migrations.sqlite/20221109000000_test_schema.sql       | 1 +
 .../migrations/20250818192156_add_git_merge_message.sql    | 1 +
 crates/collab/src/db/queries/projects.rs                   | 7 +++++--
 crates/collab/src/db/queries/rooms.rs                      | 1 +
 crates/collab/src/db/tables/project_repository.rs          | 2 ++
 crates/project/src/git_store.rs                            | 3 +++
 crates/proto/proto/git.proto                               | 1 +
 7 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 crates/collab/migrations/20250818192156_add_git_merge_message.sql

diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 170ac7b0a2..43581fd942 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -116,6 +116,7 @@ CREATE TABLE "project_repositories" (
     "scan_id" INTEGER NOT NULL,
     "is_deleted" BOOL NOT NULL,
     "current_merge_conflicts" VARCHAR,
+    "merge_message" VARCHAR,
     "branch_summary" VARCHAR,
     "head_commit_details" VARCHAR,
     PRIMARY KEY (project_id, id)
diff --git a/crates/collab/migrations/20250818192156_add_git_merge_message.sql b/crates/collab/migrations/20250818192156_add_git_merge_message.sql
new file mode 100644
index 0000000000..335ea2f824
--- /dev/null
+++ b/crates/collab/migrations/20250818192156_add_git_merge_message.sql
@@ -0,0 +1 @@
+ALTER TABLE "project_repositories" ADD COLUMN "merge_message" VARCHAR;
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 6783d8ed2a..9abab25ede 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -349,11 +349,11 @@ impl Database {
                                     serde_json::to_string(&repository.current_merge_conflicts)
                                         .unwrap(),
                                 )),
-
-                                // Old clients do not use abs path, entry ids or head_commit_details.
+                                // Old clients do not use abs path, entry ids, head_commit_details, or merge_message.
                                 abs_path: ActiveValue::set(String::new()),
                                 entry_ids: ActiveValue::set("[]".into()),
                                 head_commit_details: ActiveValue::set(None),
+                                merge_message: ActiveValue::set(None),
                             }
                         }),
                     )
@@ -502,6 +502,7 @@ impl Database {
                 current_merge_conflicts: ActiveValue::Set(Some(
                     serde_json::to_string(&update.current_merge_conflicts).unwrap(),
                 )),
+                merge_message: ActiveValue::set(update.merge_message.clone()),
             })
             .on_conflict(
                 OnConflict::columns([
@@ -515,6 +516,7 @@ impl Database {
                     project_repository::Column::AbsPath,
                     project_repository::Column::CurrentMergeConflicts,
                     project_repository::Column::HeadCommitDetails,
+                    project_repository::Column::MergeMessage,
                 ])
                 .to_owned(),
             )
@@ -990,6 +992,7 @@ impl Database {
                         head_commit_details,
                         scan_id: db_repository_entry.scan_id as u64,
                         is_last_update: true,
+                        merge_message: db_repository_entry.merge_message,
                     });
                 }
             }
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index 1b128e3a23..9e7cabf9b2 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -793,6 +793,7 @@ impl Database {
                             abs_path: db_repository.abs_path,
                             scan_id: db_repository.scan_id as u64,
                             is_last_update: true,
+                            merge_message: db_repository.merge_message,
                         });
                     }
                 }
diff --git a/crates/collab/src/db/tables/project_repository.rs b/crates/collab/src/db/tables/project_repository.rs
index 665e87cd1f..eb653ecee3 100644
--- a/crates/collab/src/db/tables/project_repository.rs
+++ b/crates/collab/src/db/tables/project_repository.rs
@@ -16,6 +16,8 @@ pub struct Model {
     pub is_deleted: bool,
     // JSON array typed string
     pub current_merge_conflicts: Option<String>,
+    // The suggested merge commit message
+    pub merge_message: Option<String>,
     // A JSON object representing the current Branch values
     pub branch_summary: Option<String>,
     // A JSON object representing the current Head commit values
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index e8ba2425d1..9539008530 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -2774,6 +2774,7 @@ impl RepositorySnapshot {
                 .iter()
                 .map(|repo_path| repo_path.to_proto())
                 .collect(),
+            merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
             project_id,
             id: self.id.to_proto(),
             abs_path: self.work_directory_abs_path.to_proto(),
@@ -2836,6 +2837,7 @@ impl RepositorySnapshot {
                 .iter()
                 .map(|path| path.as_ref().to_proto())
                 .collect(),
+            merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
             project_id,
             id: self.id.to_proto(),
             abs_path: self.work_directory_abs_path.to_proto(),
@@ -4266,6 +4268,7 @@ impl Repository {
             .map(proto_to_commit_details);
 
         self.snapshot.merge.conflicted_paths = conflicted_paths;
+        self.snapshot.merge.message = update.merge_message.map(SharedString::from);
 
         let edits = update
             .removed_statuses
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index f2c388a3a3..cfb0369875 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -121,6 +121,7 @@ message UpdateRepository {
     uint64 scan_id = 9;
     bool is_last_update = 10;
     optional GitCommitDetails head_commit_details = 11;
+    optional string merge_message = 12;
 }
 
 message RemoveRepository {

From 5004cb647bd843e46c47c830085f3564771f476e Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 18 Aug 2025 22:43:27 -0400
Subject: [PATCH 144/823] collab: Add `orb_subscription_id` to
 `billing_subscriptions` (#36455)

This PR adds an `orb_subscription_id` column to the
`billing_subscriptions` table.

Release Notes:

- N/A
---
 ...9022421_add_orb_subscription_id_to_billing_subscriptions.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 crates/collab/migrations/20250819022421_add_orb_subscription_id_to_billing_subscriptions.sql

diff --git a/crates/collab/migrations/20250819022421_add_orb_subscription_id_to_billing_subscriptions.sql b/crates/collab/migrations/20250819022421_add_orb_subscription_id_to_billing_subscriptions.sql
new file mode 100644
index 0000000000..317f6a7653
--- /dev/null
+++ b/crates/collab/migrations/20250819022421_add_orb_subscription_id_to_billing_subscriptions.sql
@@ -0,0 +1,2 @@
+alter table billing_subscriptions
+    add column orb_subscription_id text;

From 1b6fd996f8bd0ed1934c99495f36e7f9b16c41fd Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Mon, 18 Aug 2025 21:23:07 -0600
Subject: [PATCH 145/823] Fix `InlineCompletion` -> `EditPrediction` keymap
 migration (#36457)

Accidentally regressed this in #35512, causing this migration to not
work and an error log to appear when one of these actions is in the user
keymap

Release Notes:

- N/A
---
 .../migrator/src/migrations/m_2025_01_29/keymap.rs   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/migrator/src/migrations/m_2025_01_29/keymap.rs b/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
index 646af8f63d..c32da88229 100644
--- a/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
+++ b/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
@@ -242,22 +242,22 @@ static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
             "inline_completion::ToggleMenu",
             "edit_prediction::ToggleMenu",
         ),
-        ("editor::NextEditPrediction", "editor::NextEditPrediction"),
+        ("editor::NextInlineCompletion", "editor::NextEditPrediction"),
         (
-            "editor::PreviousEditPrediction",
+            "editor::PreviousInlineCompletion",
             "editor::PreviousEditPrediction",
         ),
         (
-            "editor::AcceptPartialEditPrediction",
+            "editor::AcceptPartialInlineCompletion",
             "editor::AcceptPartialEditPrediction",
         ),
-        ("editor::ShowEditPrediction", "editor::ShowEditPrediction"),
+        ("editor::ShowInlineCompletion", "editor::ShowEditPrediction"),
         (
-            "editor::AcceptEditPrediction",
+            "editor::AcceptInlineCompletion",
             "editor::AcceptEditPrediction",
         ),
         (
-            "editor::ToggleEditPredictions",
+            "editor::ToggleInlineCompletions",
             "editor::ToggleEditPrediction",
         ),
     ])

From 821e97a392d9ec8c9cf736f26fae86d188dcb409 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 18 Aug 2025 23:26:15 -0400
Subject: [PATCH 146/823] agent2: Add hover preview for image creases (#36427)

Note that (at least for now) this only works for creases in the "new
message" editor, not when editing past messages. That's because we don't
have the original image available when putting together the creases for
past messages, only the base64-encoded language model content.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/message_editor.rs     | 162 +++++++++++-------
 .../ui/src/components/button/button_like.rs   |  13 ++
 2 files changed, 111 insertions(+), 64 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index d592231726..441ca9cf18 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -178,6 +178,56 @@ impl MessageEditor {
             return;
         };
 
+        if let MentionUri::File { abs_path, .. } = &mention_uri {
+            let extension = abs_path
+                .extension()
+                .and_then(OsStr::to_str)
+                .unwrap_or_default();
+
+            if Img::extensions().contains(&extension) && !extension.contains("svg") {
+                let project = self.project.clone();
+                let Some(project_path) = project
+                    .read(cx)
+                    .project_path_for_absolute_path(abs_path, cx)
+                else {
+                    return;
+                };
+                let image = cx
+                    .spawn(async move |_, cx| {
+                        let image = project
+                            .update(cx, |project, cx| project.open_image(project_path, cx))
+                            .map_err(|e| e.to_string())?
+                            .await
+                            .map_err(|e| e.to_string())?;
+                        image
+                            .read_with(cx, |image, _cx| image.image.clone())
+                            .map_err(|e| e.to_string())
+                    })
+                    .shared();
+                let Some(crease_id) = insert_crease_for_image(
+                    *excerpt_id,
+                    start,
+                    content_len,
+                    Some(abs_path.as_path().into()),
+                    image.clone(),
+                    self.editor.clone(),
+                    window,
+                    cx,
+                ) else {
+                    return;
+                };
+                self.confirm_mention_for_image(
+                    crease_id,
+                    anchor,
+                    Some(abs_path.clone()),
+                    image,
+                    window,
+                    cx,
+                );
+                return;
+            }
+        }
+
         let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
             *excerpt_id,
             start,
@@ -195,71 +245,21 @@ impl MessageEditor {
             MentionUri::Fetch { url } => {
                 self.confirm_mention_for_fetch(crease_id, anchor, url, window, cx);
             }
-            MentionUri::File {
-                abs_path,
-                is_directory,
-            } => {
-                self.confirm_mention_for_file(
-                    crease_id,
-                    anchor,
-                    abs_path,
-                    is_directory,
-                    window,
-                    cx,
-                );
-            }
             MentionUri::Thread { id, name } => {
                 self.confirm_mention_for_thread(crease_id, anchor, id, name, window, cx);
             }
             MentionUri::TextThread { path, name } => {
                 self.confirm_mention_for_text_thread(crease_id, anchor, path, name, window, cx);
             }
-            MentionUri::Symbol { .. } | MentionUri::Rule { .. } | MentionUri::Selection { .. } => {
+            MentionUri::File { .. }
+            | MentionUri::Symbol { .. }
+            | MentionUri::Rule { .. }
+            | MentionUri::Selection { .. } => {
                 self.mention_set.insert_uri(crease_id, mention_uri.clone());
             }
         }
     }
 
-    fn confirm_mention_for_file(
-        &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
-        abs_path: PathBuf,
-        is_directory: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let extension = abs_path
-            .extension()
-            .and_then(OsStr::to_str)
-            .unwrap_or_default();
-
-        if Img::extensions().contains(&extension) && !extension.contains("svg") {
-            let project = self.project.clone();
-            let Some(project_path) = project
-                .read(cx)
-                .project_path_for_absolute_path(&abs_path, cx)
-            else {
-                return;
-            };
-            let image = cx.spawn(async move |_, cx| {
-                let image = project
-                    .update(cx, |project, cx| project.open_image(project_path, cx))?
-                    .await?;
-                image.read_with(cx, |image, _cx| image.image.clone())
-            });
-            self.confirm_mention_for_image(crease_id, anchor, Some(abs_path), image, window, cx);
-        } else {
-            self.mention_set.insert_uri(
-                crease_id,
-                MentionUri::File {
-                    abs_path,
-                    is_directory,
-                },
-            );
-        }
-    }
-
     fn confirm_mention_for_fetch(
         &mut self,
         crease_id: CreaseId,
@@ -498,25 +498,20 @@ impl MessageEditor {
             let Some(anchor) = multibuffer_anchor else {
                 return;
             };
+            let task = Task::ready(Ok(Arc::new(image))).shared();
             let Some(crease_id) = insert_crease_for_image(
                 excerpt_id,
                 text_anchor,
                 content_len,
                 None.clone(),
+                task.clone(),
                 self.editor.clone(),
                 window,
                 cx,
             ) else {
                 return;
             };
-            self.confirm_mention_for_image(
-                crease_id,
-                anchor,
-                None,
-                Task::ready(Ok(Arc::new(image))),
-                window,
-                cx,
-            );
+            self.confirm_mention_for_image(crease_id, anchor, None, task, window, cx);
         }
     }
 
@@ -584,7 +579,7 @@ impl MessageEditor {
         crease_id: CreaseId,
         anchor: Anchor,
         abs_path: Option<PathBuf>,
-        image: Task<Result<Arc<Image>>>,
+        image: Shared<Task<Result<Arc<Image>, String>>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -937,6 +932,7 @@ pub(crate) fn insert_crease_for_image(
     anchor: text::Anchor,
     content_len: usize,
     abs_path: Option<Arc<Path>>,
+    image: Shared<Task<Result<Arc<Image>, String>>>,
     editor: Entity<Editor>,
     window: &mut Window,
     cx: &mut App,
@@ -956,7 +952,7 @@ pub(crate) fn insert_crease_for_image(
         let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);
 
         let placeholder = FoldPlaceholder {
-            render: render_image_fold_icon_button(crease_label, cx.weak_entity()),
+            render: render_image_fold_icon_button(crease_label, image, cx.weak_entity()),
             merge_adjacent: false,
             ..Default::default()
         };
@@ -978,9 +974,11 @@ pub(crate) fn insert_crease_for_image(
 
 fn render_image_fold_icon_button(
     label: SharedString,
+    image_task: Shared<Task<Result<Arc<Image>, String>>>,
     editor: WeakEntity<Editor>,
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
     Arc::new({
+        let image_task = image_task.clone();
         move |fold_id, fold_range, cx| {
             let is_in_text_selection = editor
                 .update(cx, |editor, cx| editor.is_range_selected(&fold_range, cx))
@@ -1005,11 +1003,47 @@ fn render_image_fold_icon_button(
                                 .single_line(),
                         ),
                 )
+                .hoverable_tooltip({
+                    let image_task = image_task.clone();
+                    move |_, cx| {
+                        let image = image_task.peek().cloned().transpose().ok().flatten();
+                        let image_task = image_task.clone();
+                        cx.new::<ImageHover>(|cx| ImageHover {
+                            image,
+                            _task: cx.spawn(async move |this, cx| {
+                                if let Ok(image) = image_task.clone().await {
+                                    this.update(cx, |this, cx| {
+                                        if this.image.replace(image).is_none() {
+                                            cx.notify();
+                                        }
+                                    })
+                                    .ok();
+                                }
+                            }),
+                        })
+                        .into()
+                    }
+                })
                 .into_any_element()
         }
     })
 }
 
+struct ImageHover {
+    image: Option<Arc<Image>>,
+    _task: Task<()>,
+}
+
+impl Render for ImageHover {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        if let Some(image) = self.image.clone() {
+            gpui::img(image).max_w_96().max_h_96().into_any_element()
+        } else {
+            gpui::Empty.into_any_element()
+        }
+    }
+}
+
 #[derive(Debug, Eq, PartialEq)]
 pub enum Mention {
     Text { uri: MentionUri, content: String },
diff --git a/crates/ui/src/components/button/button_like.rs b/crates/ui/src/components/button/button_like.rs
index 0b30007e44..31bf76e843 100644
--- a/crates/ui/src/components/button/button_like.rs
+++ b/crates/ui/src/components/button/button_like.rs
@@ -400,6 +400,7 @@ pub struct ButtonLike {
     size: ButtonSize,
     rounding: Option<ButtonLikeRounding>,
     tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
+    hoverable_tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
     cursor_style: CursorStyle,
     on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
     on_right_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
@@ -420,6 +421,7 @@ impl ButtonLike {
             size: ButtonSize::Default,
             rounding: Some(ButtonLikeRounding::All),
             tooltip: None,
+            hoverable_tooltip: None,
             children: SmallVec::new(),
             cursor_style: CursorStyle::PointingHand,
             on_click: None,
@@ -463,6 +465,14 @@ impl ButtonLike {
         self.on_right_click = Some(Box::new(handler));
         self
     }
+
+    pub fn hoverable_tooltip(
+        mut self,
+        tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
+    ) -> Self {
+        self.hoverable_tooltip = Some(Box::new(tooltip));
+        self
+    }
 }
 
 impl Disableable for ButtonLike {
@@ -654,6 +664,9 @@ impl RenderOnce for ButtonLike {
             .when_some(self.tooltip, |this, tooltip| {
                 this.tooltip(move |window, cx| tooltip(window, cx))
             })
+            .when_some(self.hoverable_tooltip, |this, tooltip| {
+                this.hoverable_tooltip(move |window, cx| tooltip(window, cx))
+            })
             .children(self.children)
     }
 }

From 7bcea7dc2c0fbeb6d9f42cddc55fa1e4bdf97744 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 19 Aug 2025 00:09:43 -0400
Subject: [PATCH 147/823] agent2: Support directories in @file mentions
 (#36416)

Release Notes:

- N/A
---
 crates/acp_thread/src/mention.rs              |  66 ++--
 crates/agent2/src/thread.rs                   |  14 +-
 .../agent_ui/src/acp/completion_provider.rs   |  13 +-
 crates/agent_ui/src/acp/message_editor.rs     | 369 ++++++++++++------
 crates/agent_ui/src/acp/thread_view.rs        |  31 +-
 5 files changed, 325 insertions(+), 168 deletions(-)

diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 17bc265fac..25e64acbee 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -15,7 +15,9 @@ use url::Url;
 pub enum MentionUri {
     File {
         abs_path: PathBuf,
-        is_directory: bool,
+    },
+    Directory {
+        abs_path: PathBuf,
     },
     Symbol {
         path: PathBuf,
@@ -79,14 +81,14 @@ impl MentionUri {
                         })
                     }
                 } else {
-                    let file_path =
+                    let abs_path =
                         PathBuf::from(format!("{}{}", url.host_str().unwrap_or(""), path));
-                    let is_directory = input.ends_with("/");
 
-                    Ok(Self::File {
-                        abs_path: file_path,
-                        is_directory,
-                    })
+                    if input.ends_with("/") {
+                        Ok(Self::Directory { abs_path })
+                    } else {
+                        Ok(Self::File { abs_path })
+                    }
                 }
             }
             "zed" => {
@@ -120,7 +122,7 @@ impl MentionUri {
 
     pub fn name(&self) -> String {
         match self {
-            MentionUri::File { abs_path, .. } => abs_path
+            MentionUri::File { abs_path, .. } | MentionUri::Directory { abs_path, .. } => abs_path
                 .file_name()
                 .unwrap_or_default()
                 .to_string_lossy()
@@ -138,18 +140,11 @@ impl MentionUri {
 
     pub fn icon_path(&self, cx: &mut App) -> SharedString {
         match self {
-            MentionUri::File {
-                abs_path,
-                is_directory,
-            } => {
-                if *is_directory {
-                    FileIcons::get_folder_icon(false, cx)
-                        .unwrap_or_else(|| IconName::Folder.path().into())
-                } else {
-                    FileIcons::get_icon(abs_path, cx)
-                        .unwrap_or_else(|| IconName::File.path().into())
-                }
+            MentionUri::File { abs_path } => {
+                FileIcons::get_icon(abs_path, cx).unwrap_or_else(|| IconName::File.path().into())
             }
+            MentionUri::Directory { .. } => FileIcons::get_folder_icon(false, cx)
+                .unwrap_or_else(|| IconName::Folder.path().into()),
             MentionUri::Symbol { .. } => IconName::Code.path().into(),
             MentionUri::Thread { .. } => IconName::Thread.path().into(),
             MentionUri::TextThread { .. } => IconName::Thread.path().into(),
@@ -165,13 +160,16 @@ impl MentionUri {
 
     pub fn to_uri(&self) -> Url {
         match self {
-            MentionUri::File {
-                abs_path,
-                is_directory,
-            } => {
+            MentionUri::File { abs_path } => {
+                let mut url = Url::parse("file:///").unwrap();
+                let path = abs_path.to_string_lossy();
+                url.set_path(&path);
+                url
+            }
+            MentionUri::Directory { abs_path } => {
                 let mut url = Url::parse("file:///").unwrap();
                 let mut path = abs_path.to_string_lossy().to_string();
-                if *is_directory && !path.ends_with("/") {
+                if !path.ends_with("/") {
                     path.push_str("/");
                 }
                 url.set_path(&path);
@@ -274,12 +272,8 @@ mod tests {
         let file_uri = "file:///path/to/file.rs";
         let parsed = MentionUri::parse(file_uri).unwrap();
         match &parsed {
-            MentionUri::File {
-                abs_path,
-                is_directory,
-            } => {
+            MentionUri::File { abs_path } => {
                 assert_eq!(abs_path.to_str().unwrap(), "/path/to/file.rs");
-                assert!(!is_directory);
             }
             _ => panic!("Expected File variant"),
         }
@@ -291,32 +285,26 @@ mod tests {
         let file_uri = "file:///path/to/dir/";
         let parsed = MentionUri::parse(file_uri).unwrap();
         match &parsed {
-            MentionUri::File {
-                abs_path,
-                is_directory,
-            } => {
+            MentionUri::Directory { abs_path } => {
                 assert_eq!(abs_path.to_str().unwrap(), "/path/to/dir/");
-                assert!(is_directory);
             }
-            _ => panic!("Expected File variant"),
+            _ => panic!("Expected Directory variant"),
         }
         assert_eq!(parsed.to_uri().to_string(), file_uri);
     }
 
     #[test]
     fn test_to_directory_uri_with_slash() {
-        let uri = MentionUri::File {
+        let uri = MentionUri::Directory {
             abs_path: PathBuf::from("/path/to/dir/"),
-            is_directory: true,
         };
         assert_eq!(uri.to_uri().to_string(), "file:///path/to/dir/");
     }
 
     #[test]
     fn test_to_directory_uri_without_slash() {
-        let uri = MentionUri::File {
+        let uri = MentionUri::Directory {
             abs_path: PathBuf::from("/path/to/dir"),
-            is_directory: true,
         };
         assert_eq!(uri.to_uri().to_string(), "file:///path/to/dir/");
     }
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index eed374e396..e0819abcc5 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -146,6 +146,7 @@ impl UserMessage {
             They are up-to-date and don't need to be re-read.\n\n";
 
         const OPEN_FILES_TAG: &str = "<files>";
+        const OPEN_DIRECTORIES_TAG: &str = "<directories>";
         const OPEN_SYMBOLS_TAG: &str = "<symbols>";
         const OPEN_THREADS_TAG: &str = "<threads>";
         const OPEN_FETCH_TAG: &str = "<fetched_urls>";
@@ -153,6 +154,7 @@ impl UserMessage {
             "<rules>\nThe user has specified the following rules that should be applied:\n";
 
         let mut file_context = OPEN_FILES_TAG.to_string();
+        let mut directory_context = OPEN_DIRECTORIES_TAG.to_string();
         let mut symbol_context = OPEN_SYMBOLS_TAG.to_string();
         let mut thread_context = OPEN_THREADS_TAG.to_string();
         let mut fetch_context = OPEN_FETCH_TAG.to_string();
@@ -168,7 +170,7 @@ impl UserMessage {
                 }
                 UserMessageContent::Mention { uri, content } => {
                     match uri {
-                        MentionUri::File { abs_path, .. } => {
+                        MentionUri::File { abs_path } => {
                             write!(
                                 &mut symbol_context,
                                 "\n{}",
@@ -179,6 +181,9 @@ impl UserMessage {
                             )
                             .ok();
                         }
+                        MentionUri::Directory { .. } => {
+                            write!(&mut directory_context, "\n{}\n", content).ok();
+                        }
                         MentionUri::Symbol {
                             path, line_range, ..
                         }
@@ -233,6 +238,13 @@ impl UserMessage {
                 .push(language_model::MessageContent::Text(file_context));
         }
 
+        if directory_context.len() > OPEN_DIRECTORIES_TAG.len() {
+            directory_context.push_str("</directories>\n");
+            message
+                .content
+                .push(language_model::MessageContent::Text(directory_context));
+        }
+
         if symbol_context.len() > OPEN_SYMBOLS_TAG.len() {
             symbol_context.push_str("</symbols>\n");
             message
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index e2ddd03f27..d2af2a880d 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -445,19 +445,20 @@ impl ContextPickerCompletionProvider {
 
         let abs_path = project.read(cx).absolute_path(&project_path, cx)?;
 
-        let file_uri = MentionUri::File {
-            abs_path,
-            is_directory,
+        let uri = if is_directory {
+            MentionUri::Directory { abs_path }
+        } else {
+            MentionUri::File { abs_path }
         };
 
-        let crease_icon_path = file_uri.icon_path(cx);
+        let crease_icon_path = uri.icon_path(cx);
         let completion_icon_path = if is_recent {
             IconName::HistoryRerun.path().into()
         } else {
             crease_icon_path.clone()
         };
 
-        let new_text = format!("{} ", file_uri.as_link());
+        let new_text = format!("{} ", uri.as_link());
         let new_text_len = new_text.len();
         Some(Completion {
             replace_range: source_range.clone(),
@@ -472,7 +473,7 @@ impl ContextPickerCompletionProvider {
                 source_range.start,
                 new_text_len - 1,
                 message_editor,
-                file_uri,
+                uri,
             )),
         })
     }
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 441ca9cf18..e5ecf43ef5 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -6,6 +6,7 @@ use acp_thread::{MentionUri, selection_name};
 use agent::{TextThreadStore, ThreadId, ThreadStore};
 use agent_client_protocol as acp;
 use anyhow::{Context as _, Result, anyhow};
+use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
 use editor::{
     Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
@@ -15,7 +16,7 @@ use editor::{
 };
 use futures::{
     FutureExt as _, TryFutureExt as _,
-    future::{Shared, try_join_all},
+    future::{Shared, join_all, try_join_all},
 };
 use gpui::{
     AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, Image,
@@ -23,12 +24,12 @@ use gpui::{
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
-use project::{CompletionIntent, Project};
+use project::{CompletionIntent, Project, ProjectPath, Worktree};
 use rope::Point;
 use settings::Settings;
 use std::{
     ffi::OsStr,
-    fmt::Write,
+    fmt::{Display, Write},
     ops::Range,
     path::{Path, PathBuf},
     rc::Rc,
@@ -245,6 +246,9 @@ impl MessageEditor {
             MentionUri::Fetch { url } => {
                 self.confirm_mention_for_fetch(crease_id, anchor, url, window, cx);
             }
+            MentionUri::Directory { abs_path } => {
+                self.confirm_mention_for_directory(crease_id, anchor, abs_path, window, cx);
+            }
             MentionUri::Thread { id, name } => {
                 self.confirm_mention_for_thread(crease_id, anchor, id, name, window, cx);
             }
@@ -260,6 +264,124 @@ impl MessageEditor {
         }
     }
 
+    fn confirm_mention_for_directory(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        abs_path: PathBuf,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<(Arc<Path>, PathBuf)> {
+            let mut files = Vec::new();
+
+            for entry in worktree.child_entries(path) {
+                if entry.is_dir() {
+                    files.extend(collect_files_in_path(worktree, &entry.path));
+                } else if entry.is_file() {
+                    files.push((entry.path.clone(), worktree.full_path(&entry.path)));
+                }
+            }
+
+            files
+        }
+
+        let uri = MentionUri::Directory {
+            abs_path: abs_path.clone(),
+        };
+        let Some(project_path) = self
+            .project
+            .read(cx)
+            .project_path_for_absolute_path(&abs_path, cx)
+        else {
+            return;
+        };
+        let Some(entry) = self.project.read(cx).entry_for_path(&project_path, cx) else {
+            return;
+        };
+        let Some(worktree) = self.project.read(cx).worktree_for_entry(entry.id, cx) else {
+            return;
+        };
+        let project = self.project.clone();
+        let task = cx.spawn(async move |_, cx| {
+            let directory_path = entry.path.clone();
+
+            let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id())?;
+            let file_paths = worktree.read_with(cx, |worktree, _cx| {
+                collect_files_in_path(worktree, &directory_path)
+            })?;
+            let descendants_future = cx.update(|cx| {
+                join_all(file_paths.into_iter().map(|(worktree_path, full_path)| {
+                    let rel_path = worktree_path
+                        .strip_prefix(&directory_path)
+                        .log_err()
+                        .map_or_else(|| worktree_path.clone(), |rel_path| rel_path.into());
+
+                    let open_task = project.update(cx, |project, cx| {
+                        project.buffer_store().update(cx, |buffer_store, cx| {
+                            let project_path = ProjectPath {
+                                worktree_id,
+                                path: worktree_path,
+                            };
+                            buffer_store.open_buffer(project_path, cx)
+                        })
+                    });
+
+                    // TODO: report load errors instead of just logging
+                    let rope_task = cx.spawn(async move |cx| {
+                        let buffer = open_task.await.log_err()?;
+                        let rope = buffer
+                            .read_with(cx, |buffer, _cx| buffer.as_rope().clone())
+                            .log_err()?;
+                        Some(rope)
+                    });
+
+                    cx.background_spawn(async move {
+                        let rope = rope_task.await?;
+                        Some((rel_path, full_path, rope.to_string()))
+                    })
+                }))
+            })?;
+
+            let contents = cx
+                .background_spawn(async move {
+                    let contents = descendants_future.await.into_iter().flatten();
+                    contents.collect()
+                })
+                .await;
+            anyhow::Ok(contents)
+        });
+        let task = cx
+            .spawn(async move |_, _| {
+                task.await
+                    .map(|contents| DirectoryContents(contents).to_string())
+                    .map_err(|e| e.to_string())
+            })
+            .shared();
+
+        self.mention_set.directories.insert(abs_path, task.clone());
+
+        let editor = self.editor.clone();
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_some() {
+                this.update(cx, |this, _| {
+                    this.mention_set.insert_uri(crease_id, uri);
+                })
+                .ok();
+            } else {
+                editor
+                    .update(cx, |editor, cx| {
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    })
+                    .ok();
+            }
+        })
+        .detach();
+    }
+
     fn confirm_mention_for_fetch(
         &mut self,
         crease_id: CreaseId,
@@ -361,6 +483,104 @@ impl MessageEditor {
         }
     }
 
+    fn confirm_mention_for_thread(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        id: ThreadId,
+        name: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let uri = MentionUri::Thread {
+            id: id.clone(),
+            name,
+        };
+        let open_task = self.thread_store.update(cx, |thread_store, cx| {
+            thread_store.open_thread(&id, window, cx)
+        });
+        let task = cx
+            .spawn(async move |_, cx| {
+                let thread = open_task.await.map_err(|e| e.to_string())?;
+                let content = thread
+                    .read_with(cx, |thread, _cx| thread.latest_detailed_summary_or_text())
+                    .map_err(|e| e.to_string())?;
+                Ok(content)
+            })
+            .shared();
+
+        self.mention_set.insert_thread(id, task.clone());
+
+        let editor = self.editor.clone();
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_some() {
+                this.update(cx, |this, _| {
+                    this.mention_set.insert_uri(crease_id, uri);
+                })
+                .ok();
+            } else {
+                editor
+                    .update(cx, |editor, cx| {
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    })
+                    .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn confirm_mention_for_text_thread(
+        &mut self,
+        crease_id: CreaseId,
+        anchor: Anchor,
+        path: PathBuf,
+        name: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let uri = MentionUri::TextThread {
+            path: path.clone(),
+            name,
+        };
+        let context = self.text_thread_store.update(cx, |text_thread_store, cx| {
+            text_thread_store.open_local_context(path.as_path().into(), cx)
+        });
+        let task = cx
+            .spawn(async move |_, cx| {
+                let context = context.await.map_err(|e| e.to_string())?;
+                let xml = context
+                    .update(cx, |context, cx| context.to_xml(cx))
+                    .map_err(|e| e.to_string())?;
+                Ok(xml)
+            })
+            .shared();
+
+        self.mention_set.insert_text_thread(path, task.clone());
+
+        let editor = self.editor.clone();
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_some() {
+                this.update(cx, |this, _| {
+                    this.mention_set.insert_uri(crease_id, uri);
+                })
+                .ok();
+            } else {
+                editor
+                    .update(cx, |editor, cx| {
+                        editor.display_map.update(cx, |display_map, cx| {
+                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
+                        });
+                        editor.remove_creases([crease_id], cx);
+                    })
+                    .ok();
+            }
+        })
+        .detach();
+    }
+
     pub fn contents(
         &self,
         window: &mut Window,
@@ -613,13 +833,8 @@ impl MessageEditor {
             if task.await.notify_async_err(cx).is_some() {
                 if let Some(abs_path) = abs_path.clone() {
                     this.update(cx, |this, _cx| {
-                        this.mention_set.insert_uri(
-                            crease_id,
-                            MentionUri::File {
-                                abs_path,
-                                is_directory: false,
-                            },
-                        );
+                        this.mention_set
+                            .insert_uri(crease_id, MentionUri::File { abs_path });
                     })
                     .ok();
                 }
@@ -637,104 +852,6 @@ impl MessageEditor {
         .detach();
     }
 
-    fn confirm_mention_for_thread(
-        &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
-        id: ThreadId,
-        name: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let uri = MentionUri::Thread {
-            id: id.clone(),
-            name,
-        };
-        let open_task = self.thread_store.update(cx, |thread_store, cx| {
-            thread_store.open_thread(&id, window, cx)
-        });
-        let task = cx
-            .spawn(async move |_, cx| {
-                let thread = open_task.await.map_err(|e| e.to_string())?;
-                let content = thread
-                    .read_with(cx, |thread, _cx| thread.latest_detailed_summary_or_text())
-                    .map_err(|e| e.to_string())?;
-                Ok(content)
-            })
-            .shared();
-
-        self.mention_set.insert_thread(id, task.clone());
-
-        let editor = self.editor.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_some() {
-                this.update(cx, |this, _| {
-                    this.mention_set.insert_uri(crease_id, uri);
-                })
-                .ok();
-            } else {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn confirm_mention_for_text_thread(
-        &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
-        path: PathBuf,
-        name: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let uri = MentionUri::TextThread {
-            path: path.clone(),
-            name,
-        };
-        let context = self.text_thread_store.update(cx, |text_thread_store, cx| {
-            text_thread_store.open_local_context(path.as_path().into(), cx)
-        });
-        let task = cx
-            .spawn(async move |_, cx| {
-                let context = context.await.map_err(|e| e.to_string())?;
-                let xml = context
-                    .update(cx, |context, cx| context.to_xml(cx))
-                    .map_err(|e| e.to_string())?;
-                Ok(xml)
-            })
-            .shared();
-
-        self.mention_set.insert_text_thread(path, task.clone());
-
-        let editor = self.editor.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_some() {
-                this.update(cx, |this, _| {
-                    this.mention_set.insert_uri(crease_id, uri);
-                })
-                .ok();
-            } else {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-    }
-
     pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
             editor.set_mode(mode);
@@ -817,6 +934,10 @@ impl MessageEditor {
                     self.mention_set
                         .add_fetch_result(url, Task::ready(Ok(text)).shared());
                 }
+                MentionUri::Directory { abs_path } => {
+                    let task = Task::ready(Ok(text)).shared();
+                    self.mention_set.directories.insert(abs_path, task);
+                }
                 MentionUri::File { .. }
                 | MentionUri::Symbol { .. }
                 | MentionUri::Rule { .. }
@@ -882,6 +1003,18 @@ impl MessageEditor {
     }
 }
 
+struct DirectoryContents(Arc<[(Arc<Path>, PathBuf, String)]>);
+
+impl Display for DirectoryContents {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for (_relative_path, full_path, content) in self.0.iter() {
+            let fence = codeblock_fence_for_path(Some(full_path), None);
+            write!(f, "\n{fence}\n{content}\n```")?;
+        }
+        Ok(())
+    }
+}
+
 impl Focusable for MessageEditor {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         self.editor.focus_handle(cx)
@@ -1064,6 +1197,7 @@ pub struct MentionSet {
     images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
     thread_summaries: HashMap<ThreadId, Shared<Task<Result<SharedString, String>>>>,
     text_thread_summaries: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
+    directories: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
 }
 
 impl MentionSet {
@@ -1116,7 +1250,6 @@ impl MentionSet {
             .map(|(&crease_id, uri)| {
                 match uri {
                     MentionUri::File { abs_path, .. } => {
-                        // TODO directories
                         let uri = uri.clone();
                         let abs_path = abs_path.to_path_buf();
 
@@ -1141,6 +1274,24 @@ impl MentionSet {
                             anyhow::Ok((crease_id, Mention::Text { uri, content }))
                         })
                     }
+                    MentionUri::Directory { abs_path } => {
+                        let Some(content) = self.directories.get(abs_path).cloned() else {
+                            return Task::ready(Err(anyhow!("missing directory load task")));
+                        };
+                        let uri = uri.clone();
+                        cx.spawn(async move |_| {
+                            Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content: content
+                                        .await
+                                        .map_err(|e| anyhow::anyhow!("{e}"))?
+                                        .to_string(),
+                                },
+                            ))
+                        })
+                    }
                     MentionUri::Symbol {
                         path, line_range, ..
                     }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 0d15e27e0c..b3ebe86674 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2790,25 +2790,30 @@ impl AcpThreadView {
 
         if let Some(mention) = MentionUri::parse(&url).log_err() {
             workspace.update(cx, |workspace, cx| match mention {
-                MentionUri::File { abs_path, .. } => {
+                MentionUri::File { abs_path } => {
                     let project = workspace.project();
-                    let Some((path, entry)) = project.update(cx, |project, cx| {
+                    let Some(path) =
+                        project.update(cx, |project, cx| project.find_project_path(abs_path, cx))
+                    else {
+                        return;
+                    };
+
+                    workspace
+                        .open_path(path, None, true, window, cx)
+                        .detach_and_log_err(cx);
+                }
+                MentionUri::Directory { abs_path } => {
+                    let project = workspace.project();
+                    let Some(entry) = project.update(cx, |project, cx| {
                         let path = project.find_project_path(abs_path, cx)?;
-                        let entry = project.entry_for_path(&path, cx)?;
-                        Some((path, entry))
+                        project.entry_for_path(&path, cx)
                     }) else {
                         return;
                     };
 
-                    if entry.is_dir() {
-                        project.update(cx, |_, cx| {
-                            cx.emit(project::Event::RevealInProjectPanel(entry.id));
-                        });
-                    } else {
-                        workspace
-                            .open_path(path, None, true, window, cx)
-                            .detach_and_log_err(cx);
-                    }
+                    project.update(cx, |_, cx| {
+                        cx.emit(project::Event::RevealInProjectPanel(entry.id));
+                    });
                 }
                 MentionUri::Symbol {
                     path, line_range, ..

From d30b017d1f7dda921ebd1ab6a3ef726e1f796571 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 19 Aug 2025 02:00:41 -0400
Subject: [PATCH 148/823] Prevent sending slash commands in CC threads (#36453)

Highlight them as errors in the editor, and add a leading space when
sending them so users don't hit the odd behavior when sending these
commands to the SDK.

Release Notes:

- N/A
---
 crates/agent2/src/native_agent_server.rs    |   6 +-
 crates/agent_servers/src/agent_servers.rs   |   9 +
 crates/agent_servers/src/claude.rs          |   4 +
 crates/agent_servers/src/gemini.rs          |   6 +-
 crates/agent_ui/src/acp/entry_view_state.rs |   5 +
 crates/agent_ui/src/acp/message_editor.rs   | 223 +++++++++++++++++++-
 crates/agent_ui/src/acp/thread_view.rs      |   9 +-
 crates/editor/src/hover_popover.rs          |  17 +-
 8 files changed, 263 insertions(+), 16 deletions(-)

diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index cadd88a846..6f09ee1175 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -1,4 +1,4 @@
-use std::{path::Path, rc::Rc, sync::Arc};
+use std::{any::Any, path::Path, rc::Rc, sync::Arc};
 
 use agent_servers::AgentServer;
 use anyhow::Result;
@@ -66,4 +66,8 @@ impl AgentServer for NativeAgentServer {
             Ok(Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>)
         })
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index b3b8a33170..8f8aa1d788 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -18,6 +18,7 @@ use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::{
+    any::Any,
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
@@ -40,6 +41,14 @@ pub trait AgentServer: Send {
         project: &Entity<Project>,
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>>;
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
+}
+
+impl dyn AgentServer {
+    pub fn downcast<T: 'static + AgentServer + Sized>(self: Rc<Self>) -> Option<Rc<T>> {
+        self.into_any().downcast().ok()
+    }
 }
 
 impl std::fmt::Debug for AgentServerCommand {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 9b273cb091..7034d6fbce 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -65,6 +65,10 @@ impl AgentServer for ClaudeCode {
 
         Task::ready(Ok(Rc::new(connection) as _))
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
 
 struct ClaudeAgentConnection {
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index ad883f6da8..167e632d79 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -1,5 +1,5 @@
-use std::path::Path;
 use std::rc::Rc;
+use std::{any::Any, path::Path};
 
 use crate::{AgentServer, AgentServerCommand};
 use acp_thread::{AgentConnection, LoadError};
@@ -86,6 +86,10 @@ impl AgentServer for Gemini {
             result
         })
     }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 18ef1ce2ab..0b0b8471a7 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -24,6 +24,7 @@ pub struct EntryViewState {
     thread_store: Entity<ThreadStore>,
     text_thread_store: Entity<TextThreadStore>,
     entries: Vec<Entry>,
+    prevent_slash_commands: bool,
 }
 
 impl EntryViewState {
@@ -32,6 +33,7 @@ impl EntryViewState {
         project: Entity<Project>,
         thread_store: Entity<ThreadStore>,
         text_thread_store: Entity<TextThreadStore>,
+        prevent_slash_commands: bool,
     ) -> Self {
         Self {
             workspace,
@@ -39,6 +41,7 @@ impl EntryViewState {
             thread_store,
             text_thread_store,
             entries: Vec::new(),
+            prevent_slash_commands,
         }
     }
 
@@ -77,6 +80,7 @@ impl EntryViewState {
                             self.thread_store.clone(),
                             self.text_thread_store.clone(),
                             "Edit message － @ to include context",
+                            self.prevent_slash_commands,
                             editor::EditorMode::AutoHeight {
                                 min_lines: 1,
                                 max_lines: None,
@@ -382,6 +386,7 @@ mod tests {
                 project.clone(),
                 thread_store,
                 text_thread_store,
+                false,
             )
         });
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index e5ecf43ef5..a32d0ce6ce 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -10,7 +10,8 @@ use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
 use editor::{
     Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorMode, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer, ToOffset,
+    EditorEvent, EditorMode, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer,
+    SemanticsProvider, ToOffset,
     actions::Paste,
     display_map::{Crease, CreaseId, FoldId},
 };
@@ -19,8 +20,9 @@ use futures::{
     future::{Shared, join_all, try_join_all},
 };
 use gpui::{
-    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, Image,
-    ImageFormat, Img, Task, TextStyle, WeakEntity,
+    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable,
+    HighlightStyle, Image, ImageFormat, Img, Subscription, Task, TextStyle, UnderlineStyle,
+    WeakEntity,
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
@@ -28,26 +30,30 @@ use project::{CompletionIntent, Project, ProjectPath, Worktree};
 use rope::Point;
 use settings::Settings;
 use std::{
+    cell::Cell,
     ffi::OsStr,
     fmt::{Display, Write},
     ops::Range,
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
+    time::Duration,
 };
-use text::OffsetRangeExt;
+use text::{OffsetRangeExt, ToOffset as _};
 use theme::ThemeSettings;
 use ui::{
     ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Icon, IconName,
     IconSize, InteractiveElement, IntoElement, Label, LabelCommon, LabelSize, ParentElement,
     Render, SelectableButton, SharedString, Styled, TextSize, TintColor, Toggleable, Window, div,
-    h_flex,
+    h_flex, px,
 };
 use url::Url;
 use util::ResultExt;
 use workspace::{Workspace, notifications::NotifyResultExt as _};
 use zed_actions::agent::Chat;
 
+const PARSE_SLASH_COMMAND_DEBOUNCE: Duration = Duration::from_millis(50);
+
 pub struct MessageEditor {
     mention_set: MentionSet,
     editor: Entity<Editor>,
@@ -55,6 +61,9 @@ pub struct MessageEditor {
     workspace: WeakEntity<Workspace>,
     thread_store: Entity<ThreadStore>,
     text_thread_store: Entity<TextThreadStore>,
+    prevent_slash_commands: bool,
+    _subscriptions: Vec<Subscription>,
+    _parse_slash_command_task: Task<()>,
 }
 
 #[derive(Clone, Copy)]
@@ -73,6 +82,7 @@ impl MessageEditor {
         thread_store: Entity<ThreadStore>,
         text_thread_store: Entity<TextThreadStore>,
         placeholder: impl Into<Arc<str>>,
+        prevent_slash_commands: bool,
         mode: EditorMode,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -90,6 +100,9 @@ impl MessageEditor {
             text_thread_store.downgrade(),
             cx.weak_entity(),
         );
+        let semantics_provider = Rc::new(SlashCommandSemanticsProvider {
+            range: Cell::new(None),
+        });
         let mention_set = MentionSet::default();
         let editor = cx.new(|cx| {
             let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
@@ -106,6 +119,9 @@ impl MessageEditor {
                 max_entries_visible: 12,
                 placement: Some(ContextMenuPlacement::Above),
             });
+            if prevent_slash_commands {
+                editor.set_semantics_provider(Some(semantics_provider.clone()));
+            }
             editor
         });
 
@@ -114,6 +130,24 @@ impl MessageEditor {
         })
         .detach();
 
+        let mut subscriptions = Vec::new();
+        if prevent_slash_commands {
+            subscriptions.push(cx.subscribe_in(&editor, window, {
+                let semantics_provider = semantics_provider.clone();
+                move |this, editor, event, window, cx| match event {
+                    EditorEvent::Edited { .. } => {
+                        this.highlight_slash_command(
+                            semantics_provider.clone(),
+                            editor.clone(),
+                            window,
+                            cx,
+                        );
+                    }
+                    _ => {}
+                }
+            }));
+        }
+
         Self {
             editor,
             project,
@@ -121,6 +155,9 @@ impl MessageEditor {
             thread_store,
             text_thread_store,
             workspace,
+            prevent_slash_commands,
+            _subscriptions: subscriptions,
+            _parse_slash_command_task: Task::ready(()),
         }
     }
 
@@ -590,6 +627,7 @@ impl MessageEditor {
             self.mention_set
                 .contents(self.project.clone(), self.thread_store.clone(), window, cx);
         let editor = self.editor.clone();
+        let prevent_slash_commands = self.prevent_slash_commands;
 
         cx.spawn(async move |_, cx| {
             let contents = contents.await?;
@@ -612,7 +650,15 @@ impl MessageEditor {
 
                         let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot);
                         if crease_range.start > ix {
-                            chunks.push(text[ix..crease_range.start].into());
+                            let chunk = if prevent_slash_commands
+                                && ix == 0
+                                && parse_slash_command(&text[ix..]).is_some()
+                            {
+                                format!(" {}", &text[ix..crease_range.start]).into()
+                            } else {
+                                text[ix..crease_range.start].into()
+                            };
+                            chunks.push(chunk);
                         }
                         let chunk = match mention {
                             Mention::Text { uri, content } => {
@@ -644,7 +690,14 @@ impl MessageEditor {
                     }
 
                     if ix < text.len() {
-                        let last_chunk = text[ix..].trim_end();
+                        let last_chunk = if prevent_slash_commands
+                            && ix == 0
+                            && parse_slash_command(&text[ix..]).is_some()
+                        {
+                            format!(" {}", text[ix..].trim_end())
+                        } else {
+                            text[ix..].trim_end().to_owned()
+                        };
                         if !last_chunk.is_empty() {
                             chunks.push(last_chunk.into());
                         }
@@ -990,6 +1043,48 @@ impl MessageEditor {
         cx.notify();
     }
 
+    fn highlight_slash_command(
+        &mut self,
+        semantics_provider: Rc<SlashCommandSemanticsProvider>,
+        editor: Entity<Editor>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        struct InvalidSlashCommand;
+
+        self._parse_slash_command_task = cx.spawn_in(window, async move |_, cx| {
+            cx.background_executor()
+                .timer(PARSE_SLASH_COMMAND_DEBOUNCE)
+                .await;
+            editor
+                .update_in(cx, |editor, window, cx| {
+                    let snapshot = editor.snapshot(window, cx);
+                    let range = parse_slash_command(&editor.text(cx));
+                    semantics_provider.range.set(range);
+                    if let Some((start, end)) = range {
+                        editor.highlight_text::<InvalidSlashCommand>(
+                            vec![
+                                snapshot.buffer_snapshot.anchor_after(start)
+                                    ..snapshot.buffer_snapshot.anchor_before(end),
+                            ],
+                            HighlightStyle {
+                                underline: Some(UnderlineStyle {
+                                    thickness: px(1.),
+                                    color: Some(gpui::red()),
+                                    wavy: true,
+                                }),
+                                ..Default::default()
+                            },
+                            cx,
+                        );
+                    } else {
+                        editor.clear_highlights::<InvalidSlashCommand>(cx);
+                    }
+                })
+                .ok();
+        })
+    }
+
     #[cfg(test)]
     pub fn set_text(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
@@ -1416,6 +1511,118 @@ impl MentionSet {
     }
 }
 
+struct SlashCommandSemanticsProvider {
+    range: Cell<Option<(usize, usize)>>,
+}
+
+impl SemanticsProvider for SlashCommandSemanticsProvider {
+    fn hover(
+        &self,
+        buffer: &Entity<Buffer>,
+        position: text::Anchor,
+        cx: &mut App,
+    ) -> Option<Task<Vec<project::Hover>>> {
+        let snapshot = buffer.read(cx).snapshot();
+        let offset = position.to_offset(&snapshot);
+        let (start, end) = self.range.get()?;
+        if !(start..end).contains(&offset) {
+            return None;
+        }
+        let range = snapshot.anchor_after(start)..snapshot.anchor_after(end);
+        return Some(Task::ready(vec![project::Hover {
+            contents: vec![project::HoverBlock {
+                text: "Slash commands are not supported".into(),
+                kind: project::HoverBlockKind::PlainText,
+            }],
+            range: Some(range),
+            language: None,
+        }]));
+    }
+
+    fn inline_values(
+        &self,
+        _buffer_handle: Entity<Buffer>,
+        _range: Range<text::Anchor>,
+        _cx: &mut App,
+    ) -> Option<Task<anyhow::Result<Vec<project::InlayHint>>>> {
+        None
+    }
+
+    fn inlay_hints(
+        &self,
+        _buffer_handle: Entity<Buffer>,
+        _range: Range<text::Anchor>,
+        _cx: &mut App,
+    ) -> Option<Task<anyhow::Result<Vec<project::InlayHint>>>> {
+        None
+    }
+
+    fn resolve_inlay_hint(
+        &self,
+        _hint: project::InlayHint,
+        _buffer_handle: Entity<Buffer>,
+        _server_id: lsp::LanguageServerId,
+        _cx: &mut App,
+    ) -> Option<Task<anyhow::Result<project::InlayHint>>> {
+        None
+    }
+
+    fn supports_inlay_hints(&self, _buffer: &Entity<Buffer>, _cx: &mut App) -> bool {
+        false
+    }
+
+    fn document_highlights(
+        &self,
+        _buffer: &Entity<Buffer>,
+        _position: text::Anchor,
+        _cx: &mut App,
+    ) -> Option<Task<Result<Vec<project::DocumentHighlight>>>> {
+        None
+    }
+
+    fn definitions(
+        &self,
+        _buffer: &Entity<Buffer>,
+        _position: text::Anchor,
+        _kind: editor::GotoDefinitionKind,
+        _cx: &mut App,
+    ) -> Option<Task<Result<Vec<project::LocationLink>>>> {
+        None
+    }
+
+    fn range_for_rename(
+        &self,
+        _buffer: &Entity<Buffer>,
+        _position: text::Anchor,
+        _cx: &mut App,
+    ) -> Option<Task<Result<Option<Range<text::Anchor>>>>> {
+        None
+    }
+
+    fn perform_rename(
+        &self,
+        _buffer: &Entity<Buffer>,
+        _position: text::Anchor,
+        _new_name: String,
+        _cx: &mut App,
+    ) -> Option<Task<Result<project::ProjectTransaction>>> {
+        None
+    }
+}
+
+fn parse_slash_command(text: &str) -> Option<(usize, usize)> {
+    if let Some(remainder) = text.strip_prefix('/') {
+        let pos = remainder
+            .find(char::is_whitespace)
+            .unwrap_or(remainder.len());
+        let command = &remainder[..pos];
+        if !command.is_empty() && command.chars().all(char::is_alphanumeric) {
+            return Some((0, 1 + command.len()));
+        }
+    }
+    None
+}
+
 #[cfg(test)]
 mod tests {
     use std::{ops::Range, path::Path, sync::Arc};
@@ -1463,6 +1670,7 @@ mod tests {
                     thread_store.clone(),
                     text_thread_store.clone(),
                     "Test",
+                    false,
                     EditorMode::AutoHeight {
                         min_lines: 1,
                         max_lines: None,
@@ -1661,6 +1869,7 @@ mod tests {
                     thread_store.clone(),
                     text_thread_store.clone(),
                     "Test",
+                    false,
                     EditorMode::AutoHeight {
                         max_lines: None,
                         min_lines: 1,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index b3ebe86674..2cfedfe840 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -7,7 +7,7 @@ use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
 use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol::{self as acp};
-use agent_servers::AgentServer;
+use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use anyhow::bail;
 use audio::{Audio, Sound};
@@ -160,6 +160,7 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
+        let prevent_slash_commands = agent.clone().downcast::<ClaudeCode>().is_some();
         let message_editor = cx.new(|cx| {
             MessageEditor::new(
                 workspace.clone(),
@@ -167,6 +168,7 @@ impl AcpThreadView {
                 thread_store.clone(),
                 text_thread_store.clone(),
                 "Message the agent － @ to include context",
+                prevent_slash_commands,
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
                     max_lines: Some(MAX_EDITOR_LINES),
@@ -184,6 +186,7 @@ impl AcpThreadView {
                 project.clone(),
                 thread_store.clone(),
                 text_thread_store.clone(),
+                prevent_slash_commands,
             )
         });
 
@@ -3925,6 +3928,10 @@ pub(crate) mod tests {
         ) -> Task<gpui::Result<Rc<dyn AgentConnection>>> {
             Task::ready(Ok(Rc::new(self.connection.clone())))
         }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
     }
 
     #[derive(Clone)]
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 3fc673bad9..6fe981fd6e 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -167,7 +167,8 @@ pub fn hover_at_inlay(
 
                 let language_registry = project.read_with(cx, |p, _| p.languages().clone())?;
                 let blocks = vec![inlay_hover.tooltip];
-                let parsed_content = parse_blocks(&blocks, &language_registry, None, cx).await;
+                let parsed_content =
+                    parse_blocks(&blocks, Some(&language_registry), None, cx).await;
 
                 let scroll_handle = ScrollHandle::new();
 
@@ -251,7 +252,9 @@ fn show_hover(
 
     let (excerpt_id, _, _) = editor.buffer().read(cx).excerpt_containing(anchor, cx)?;
 
-    let language_registry = editor.project()?.read(cx).languages().clone();
+    let language_registry = editor
+        .project()
+        .map(|project| project.read(cx).languages().clone());
     let provider = editor.semantics_provider.clone()?;
 
     if !ignore_timeout {
@@ -443,7 +446,8 @@ fn show_hover(
                     text: format!("Unicode character U+{:02X}", invisible as u32),
                     kind: HoverBlockKind::PlainText,
                 }];
-                let parsed_content = parse_blocks(&blocks, &language_registry, None, cx).await;
+                let parsed_content =
+                    parse_blocks(&blocks, language_registry.as_ref(), None, cx).await;
                 let scroll_handle = ScrollHandle::new();
                 let subscription = this
                     .update(cx, |_, cx| {
@@ -493,7 +497,8 @@ fn show_hover(
 
                 let blocks = hover_result.contents;
                 let language = hover_result.language;
-                let parsed_content = parse_blocks(&blocks, &language_registry, language, cx).await;
+                let parsed_content =
+                    parse_blocks(&blocks, language_registry.as_ref(), language, cx).await;
                 let scroll_handle = ScrollHandle::new();
                 hover_highlights.push(range.clone());
                 let subscription = this
@@ -583,7 +588,7 @@ fn same_diagnostic_hover(editor: &Editor, snapshot: &EditorSnapshot, anchor: Anc
 
 async fn parse_blocks(
     blocks: &[HoverBlock],
-    language_registry: &Arc<LanguageRegistry>,
+    language_registry: Option<&Arc<LanguageRegistry>>,
     language: Option<Arc<Language>>,
     cx: &mut AsyncWindowContext,
 ) -> Option<Entity<Markdown>> {
@@ -603,7 +608,7 @@ async fn parse_blocks(
         .new_window_entity(|_window, cx| {
             Markdown::new(
                 combined_text.into(),
-                Some(language_registry.clone()),
+                language_registry.cloned(),
                 language.map(|language| language.name()),
                 cx,
             )

From 176c445817c431ec2557d2df074d97e600983b96 Mon Sep 17 00:00:00 2001
From: 0x5457 <0x5457@protonmail.com>
Date: Tue, 19 Aug 2025 15:28:24 +0800
Subject: [PATCH 149/823] Avoid symlink conflicts when re-extracting
 `eslint-xx.tar.gz` (#36068)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #34325

**Background**
When upgrading/reinstalling the ESLint language server, extracting the
archive over an existing version directory that contains symlinks can
fail and interrupt the installation.
```
failed to unpack .../vscode-eslint-2.4.4/.../client/src/shared
File exists (os error 17) when symlinking ../../$shared/ to .../client/src/shared
```

**Root cause**
Extracting into a non-empty directory conflicts with leftover
files/symlinks (e.g., `client/src/shared -> ../../$shared`), causing
“File exists (os error 17)”.

When `fs::metadata(&server_path).await.is_err()` is true, the code falls
back to cached_server_binary, but that still targets the same
(potentially corrupted/half-installed) directory and does not run `npm
install` or `npm run compile`, so the system cannot recover and remains
broken.

**Change**
Before downloading and extracting, delete the target version directory
(vscode-eslint-<version>) to ensure an empty extraction destination and
avoid conflicts.

**Alternative approaches**
temp directory + rename: extract into a clean temp directory and rename
into place to avoid half-installed states

[async-tar](https://github.com/dignifiedquire/async-tar) enhancement:
tolerate already-existing symlinks (or add a “replace-existing” option).

Release Notes:

- Fixed eslint installation not clearing files after previous attempts'
---
 crates/languages/src/typescript.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index d477acc7f6..7937adbc09 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -910,7 +910,7 @@ impl LspAdapter for EsLintLspAdapter {
         let server_path = destination_path.join(Self::SERVER_PATH);
 
         if fs::metadata(&server_path).await.is_err() {
-            remove_matching(&container_dir, |entry| entry != destination_path).await;
+            remove_matching(&container_dir, |_| true).await;
 
             download_server_binary(
                 delegate,

From 1fbb318714624e5fa1e7fdd5e97cfa325ae0b5ca Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:06:35 +0300
Subject: [PATCH 150/823] Fix iterator related clippy style lint violations
 (#36437)

Release Notes:

- N/A
---
 Cargo.toml                                             |  5 +++++
 crates/agent_ui/src/agent_diff.rs                      |  3 +--
 crates/agent_ui/src/message_editor.rs                  |  6 +-----
 crates/agent_ui/src/text_thread_editor.rs              |  6 +-----
 .../debugger_ui/src/session/running/variable_list.rs   |  2 +-
 crates/editor/src/editor.rs                            |  2 +-
 crates/git_ui/src/git_panel.rs                         | 10 +++++-----
 crates/git_ui/src/project_diff.rs                      |  2 +-
 crates/language/src/proto.rs                           |  2 +-
 crates/language_tools/src/key_context_view.rs          |  4 +---
 crates/settings_ui/src/keybindings.rs                  |  8 +-------
 crates/title_bar/src/collab.rs                         |  2 +-
 crates/vim/src/normal.rs                               |  2 +-
 13 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3854ebe010..b61eb3c260 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -820,6 +820,11 @@ single_range_in_vec_init = "allow"
 style = { level = "allow", priority = -1 }
 
 # Temporary list of style lints that we've fixed so far.
+iter_cloned_collect = "warn"
+iter_next_slice = "warn"
+iter_nth = "warn"
+iter_nth_zero = "warn"
+iter_skip_next = "warn"
 module_inception = { level = "deny" }
 question_mark = { level = "deny" }
 redundant_closure = { level = "deny" }
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 85e7297810..3522a0c9ab 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -503,8 +503,7 @@ fn update_editor_selection(
                         &[last_kept_hunk_end..editor::Anchor::max()],
                         buffer_snapshot,
                     )
-                    .skip(1)
-                    .next()
+                    .nth(1)
             })
             .or_else(|| {
                 let first_kept_hunk = diff_hunks.first()?;
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index ddb51154f5..64c9a873f5 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -690,11 +690,7 @@ impl MessageEditor {
             .as_ref()
             .map(|model| {
                 self.incompatible_tools_state.update(cx, |state, cx| {
-                    state
-                        .incompatible_tools(&model.model, cx)
-                        .iter()
-                        .cloned()
-                        .collect::<Vec<_>>()
+                    state.incompatible_tools(&model.model, cx).to_vec()
                 })
             })
             .unwrap_or_default();
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 8c1e163eca..376d3c54fd 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -747,11 +747,7 @@ impl TextThreadEditor {
             self.context.read(cx).invoked_slash_command(&command_id)
         {
             if let InvokedSlashCommandStatus::Finished = invoked_slash_command.status {
-                let run_commands_in_ranges = invoked_slash_command
-                    .run_commands_in_ranges
-                    .iter()
-                    .cloned()
-                    .collect::<Vec<_>>();
+                let run_commands_in_ranges = invoked_slash_command.run_commands_in_ranges.clone();
                 for range in run_commands_in_ranges {
                     let commands = self.context.update(cx, |context, cx| {
                         context.reparse(cx);
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index b54ee29e15..3cc5fbc272 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -272,7 +272,7 @@ impl VariableList {
         let mut entries = vec![];
 
         let scopes: Vec<_> = self.session.update(cx, |session, cx| {
-            session.scopes(stack_frame_id, cx).iter().cloned().collect()
+            session.scopes(stack_frame_id, cx).to_vec()
         });
 
         let mut contains_local_scope = false;
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 365cd1ea5a..a49f1dba86 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -20932,7 +20932,7 @@ impl Editor {
 
         let existing_pending = self
             .text_highlights::<PendingInput>(cx)
-            .map(|(_, ranges)| ranges.iter().cloned().collect::<Vec<_>>());
+            .map(|(_, ranges)| ranges.to_vec());
         if existing_pending.is_none() && pending.is_empty() {
             return;
         }
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index c21ac286cb..b1bdcdc3e0 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2756,7 +2756,7 @@ impl GitPanel {
         for pending in self.pending.iter() {
             if pending.target_status == TargetStatus::Staged {
                 pending_staged_count += pending.entries.len();
-                last_pending_staged = pending.entries.iter().next().cloned();
+                last_pending_staged = pending.entries.first().cloned();
             }
             if let Some(single_staged) = &single_staged_entry {
                 if pending
@@ -5261,7 +5261,7 @@ mod tests {
             project
                 .read(cx)
                 .worktrees(cx)
-                .nth(0)
+                .next()
                 .unwrap()
                 .read(cx)
                 .as_local()
@@ -5386,7 +5386,7 @@ mod tests {
             project
                 .read(cx)
                 .worktrees(cx)
-                .nth(0)
+                .next()
                 .unwrap()
                 .read(cx)
                 .as_local()
@@ -5437,7 +5437,7 @@ mod tests {
             project
                 .read(cx)
                 .worktrees(cx)
-                .nth(0)
+                .next()
                 .unwrap()
                 .read(cx)
                 .as_local()
@@ -5486,7 +5486,7 @@ mod tests {
             project
                 .read(cx)
                 .worktrees(cx)
-                .nth(0)
+                .next()
                 .unwrap()
                 .read(cx)
                 .as_local()
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index e312d6a2aa..09c5ce1152 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -280,7 +280,7 @@ impl ProjectDiff {
     fn button_states(&self, cx: &App) -> ButtonStates {
         let editor = self.editor.read(cx);
         let snapshot = self.multibuffer.read(cx).snapshot(cx);
-        let prev_next = snapshot.diff_hunks().skip(1).next().is_some();
+        let prev_next = snapshot.diff_hunks().nth(1).is_some();
         let mut selection = true;
 
         let mut ranges = editor
diff --git a/crates/language/src/proto.rs b/crates/language/src/proto.rs
index acae97019f..3be189cea0 100644
--- a/crates/language/src/proto.rs
+++ b/crates/language/src/proto.rs
@@ -86,7 +86,7 @@ pub fn serialize_operation(operation: &crate::Operation) -> proto::Operation {
                 proto::operation::UpdateCompletionTriggers {
                     replica_id: lamport_timestamp.replica_id as u32,
                     lamport_timestamp: lamport_timestamp.value,
-                    triggers: triggers.iter().cloned().collect(),
+                    triggers: triggers.clone(),
                     language_server_id: server_id.to_proto(),
                 },
             ),
diff --git a/crates/language_tools/src/key_context_view.rs b/crates/language_tools/src/key_context_view.rs
index 88131781ec..320668cfc2 100644
--- a/crates/language_tools/src/key_context_view.rs
+++ b/crates/language_tools/src/key_context_view.rs
@@ -98,9 +98,7 @@ impl KeyContextView {
             cx.notify();
         });
         let sub2 = cx.observe_pending_input(window, |this, window, cx| {
-            this.pending_keystrokes = window
-                .pending_input_keystrokes()
-                .map(|k| k.iter().cloned().collect());
+            this.pending_keystrokes = window.pending_input_keystrokes().map(|k| k.to_vec());
             if this.pending_keystrokes.is_some() {
                 this.last_keystrokes.take();
             }
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 757a0ca226..b8c52602a6 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -472,13 +472,7 @@ impl KeymapEditor {
 
     fn current_keystroke_query(&self, cx: &App) -> Vec<Keystroke> {
         match self.search_mode {
-            SearchMode::KeyStroke { .. } => self
-                .keystroke_editor
-                .read(cx)
-                .keystrokes()
-                .iter()
-                .cloned()
-                .collect(),
+            SearchMode::KeyStroke { .. } => self.keystroke_editor.read(cx).keystrokes().to_vec(),
             SearchMode::Normal => Default::default(),
         }
     }
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index b458c64b5f..c2171d3899 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -601,7 +601,7 @@ fn pick_default_screen(cx: &App) -> Task<anyhow::Result<Option<Rc<dyn ScreenCapt
                     .metadata()
                     .is_ok_and(|meta| meta.is_main.unwrap_or_default())
             })
-            .or_else(|| available_sources.iter().next())
+            .or_else(|| available_sources.first())
             .cloned())
     })
 }
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index b74d85b7c5..0c7b6e55a1 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -221,7 +221,7 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
                 return;
             };
 
-            let anchors = last_change.iter().cloned().collect::<Vec<_>>();
+            let anchors = last_change.to_vec();
             let mut last_row = None;
             let ranges: Vec<_> = anchors
                 .iter()

From ed14ab8c02e6c96e67053764da1f012df3ad7f74 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:26:37 +0200
Subject: [PATCH 151/823] gpui: Introduce stacker to address stack overflows
 with deep layout trees (#35813)

Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
Co-authored-by: Ben Kunkle <ben@zed.dev>

Release Notes:

- N/A

Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 Cargo.lock                      | 35 +++++++++++++++++++++++++++++++++
 Cargo.toml                      |  1 +
 crates/gpui/Cargo.toml          |  1 +
 crates/gpui/src/elements/div.rs |  9 +++++++--
 crates/gpui/src/taffy.rs        | 15 +++++++++++---
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c05839ef3..2ef91c79c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7482,6 +7482,7 @@ dependencies = [
  "slotmap",
  "smallvec",
  "smol",
+ "stacksafe",
  "strum 0.27.1",
  "sum_tree",
  "taffy",
@@ -15541,6 +15542,40 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
+[[package]]
+name = "stacker"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "psm",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "stacksafe"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9c1172965d317e87ddb6d364a040d958b40a1db82b6ef97da26253a8b3d090"
+dependencies = [
+ "stacker",
+ "stacksafe-macro",
+]
+
+[[package]]
+name = "stacksafe-macro"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "172175341049678163e979d9107ca3508046d4d2a7c6682bee46ac541b17db69"
+dependencies = [
+ "proc-macro-error2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index b61eb3c260..f326090b51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -590,6 +590,7 @@ simplelog = "0.12.2"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "2.0"
 sqlformat = "0.2"
+stacksafe = "0.1"
 streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.0", features = ["derive"] }
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 6be8c5fd1f..9f5b66087d 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -119,6 +119,7 @@ serde_json.workspace = true
 slotmap = "1.0.6"
 smallvec.workspace = true
 smol.workspace = true
+stacksafe.workspace = true
 strum.workspace = true
 sum_tree.workspace = true
 taffy = "=0.9.0"
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 78114b7ecf..f553bf55f6 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -27,6 +27,7 @@ use crate::{
 use collections::HashMap;
 use refineable::Refineable;
 use smallvec::SmallVec;
+use stacksafe::{StackSafe, stacksafe};
 use std::{
     any::{Any, TypeId},
     cell::RefCell,
@@ -1195,7 +1196,7 @@ pub fn div() -> Div {
 /// A [`Div`] element, the all-in-one element for building complex UIs in GPUI
 pub struct Div {
     interactivity: Interactivity,
-    children: SmallVec<[AnyElement; 2]>,
+    children: SmallVec<[StackSafe<AnyElement>; 2]>,
     prepaint_listener: Option<Box<dyn Fn(Vec<Bounds<Pixels>>, &mut Window, &mut App) + 'static>>,
     image_cache: Option<Box<dyn ImageCacheProvider>>,
 }
@@ -1256,7 +1257,8 @@ impl InteractiveElement for Div {
 
 impl ParentElement for Div {
     fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
+        self.children
+            .extend(elements.into_iter().map(StackSafe::new))
     }
 }
 
@@ -1272,6 +1274,7 @@ impl Element for Div {
         self.interactivity.source_location()
     }
 
+    #[stacksafe]
     fn request_layout(
         &mut self,
         global_id: Option<&GlobalElementId>,
@@ -1307,6 +1310,7 @@ impl Element for Div {
         (layout_id, DivFrameState { child_layout_ids })
     }
 
+    #[stacksafe]
     fn prepaint(
         &mut self,
         global_id: Option<&GlobalElementId>,
@@ -1376,6 +1380,7 @@ impl Element for Div {
         )
     }
 
+    #[stacksafe]
     fn paint(
         &mut self,
         global_id: Option<&GlobalElementId>,
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index ee21ecd8c4..f78d6b30c7 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -3,6 +3,7 @@ use crate::{
 };
 use collections::{FxHashMap, FxHashSet};
 use smallvec::SmallVec;
+use stacksafe::{StackSafe, stacksafe};
 use std::{fmt::Debug, ops::Range};
 use taffy::{
     TaffyTree, TraversePartialTree as _,
@@ -11,8 +12,15 @@ use taffy::{
     tree::NodeId,
 };
 
-type NodeMeasureFn = Box<
-    dyn FnMut(Size<Option<Pixels>>, Size<AvailableSpace>, &mut Window, &mut App) -> Size<Pixels>,
+type NodeMeasureFn = StackSafe<
+    Box<
+        dyn FnMut(
+            Size<Option<Pixels>>,
+            Size<AvailableSpace>,
+            &mut Window,
+            &mut App,
+        ) -> Size<Pixels>,
+    >,
 >;
 
 struct NodeContext {
@@ -88,7 +96,7 @@ impl TaffyLayoutEngine {
             .new_leaf_with_context(
                 taffy_style,
                 NodeContext {
-                    measure: Box::new(measure),
+                    measure: StackSafe::new(Box::new(measure)),
                 },
             )
             .expect(EXPECT_MESSAGE)
@@ -143,6 +151,7 @@ impl TaffyLayoutEngine {
         Ok(edges)
     }
 
+    #[stacksafe]
     pub fn compute_layout(
         &mut self,
         id: LayoutId,

From b8ddb0141c0625a47fdc7b68aa8a8a782c439f62 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 11:12:57 +0200
Subject: [PATCH 152/823] agent2: Port rules UI (#36429)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs                |  19 +--
 crates/agent2/src/tests/mod.rs            |  10 +-
 crates/agent2/src/thread.rs               |  20 +--
 crates/agent2/src/tools/edit_file_tool.rs |  20 +--
 crates/agent_ui/src/acp/thread_view.rs    | 160 +++++++++++++++++++++-
 5 files changed, 197 insertions(+), 32 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 985de4d123..6347f5f9a4 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -22,7 +22,6 @@ use prompt_store::{
 };
 use settings::update_settings_file;
 use std::any::Any;
-use std::cell::RefCell;
 use std::collections::HashMap;
 use std::path::Path;
 use std::rc::Rc;
@@ -156,7 +155,7 @@ pub struct NativeAgent {
     /// Session ID -> Session mapping
     sessions: HashMap<acp::SessionId, Session>,
     /// Shared project context for all threads
-    project_context: Rc<RefCell<ProjectContext>>,
+    project_context: Entity<ProjectContext>,
     project_context_needs_refresh: watch::Sender<()>,
     _maintain_project_context: Task<Result<()>>,
     context_server_registry: Entity<ContextServerRegistry>,
@@ -200,7 +199,7 @@ impl NativeAgent {
                 watch::channel(());
             Self {
                 sessions: HashMap::new(),
-                project_context: Rc::new(RefCell::new(project_context)),
+                project_context: cx.new(|_| project_context),
                 project_context_needs_refresh: project_context_needs_refresh_tx,
                 _maintain_project_context: cx.spawn(async move |this, cx| {
                     Self::maintain_project_context(this, project_context_needs_refresh_rx, cx).await
@@ -233,7 +232,9 @@ impl NativeAgent {
                     Self::build_project_context(&this.project, this.prompt_store.as_ref(), cx)
                 })?
                 .await;
-            this.update(cx, |this, _| this.project_context.replace(project_context))?;
+            this.update(cx, |this, cx| {
+                this.project_context = cx.new(|_| project_context);
+            })?;
         }
 
         Ok(())
@@ -872,8 +873,8 @@ mod tests {
         )
         .await
         .unwrap();
-        agent.read_with(cx, |agent, _| {
-            assert_eq!(agent.project_context.borrow().worktrees, vec![])
+        agent.read_with(cx, |agent, cx| {
+            assert_eq!(agent.project_context.read(cx).worktrees, vec![])
         });
 
         let worktree = project
@@ -881,9 +882,9 @@ mod tests {
             .await
             .unwrap();
         cx.run_until_parked();
-        agent.read_with(cx, |agent, _| {
+        agent.read_with(cx, |agent, cx| {
             assert_eq!(
-                agent.project_context.borrow().worktrees,
+                agent.project_context.read(cx).worktrees,
                 vec![WorktreeContext {
                     root_name: "a".into(),
                     abs_path: Path::new("/a").into(),
@@ -898,7 +899,7 @@ mod tests {
         agent.read_with(cx, |agent, cx| {
             let rules_entry = worktree.read(cx).entry_for_path(".rules").unwrap();
             assert_eq!(
-                agent.project_context.borrow().worktrees,
+                agent.project_context.read(cx).worktrees,
                 vec![WorktreeContext {
                     root_name: "a".into(),
                     abs_path: Path::new("/a").into(),
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index e3e3050d49..13b37fbaa2 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -25,7 +25,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use settings::SettingsStore;
 use smol::stream::StreamExt;
-use std::{cell::RefCell, path::Path, rc::Rc, sync::Arc, time::Duration};
+use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
 use util::path;
 
 mod test_tools;
@@ -101,7 +101,9 @@ async fn test_system_prompt(cx: &mut TestAppContext) {
     } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
-    project_context.borrow_mut().shell = "test-shell".into();
+    project_context.update(cx, |project_context, _cx| {
+        project_context.shell = "test-shell".into()
+    });
     thread.update(cx, |thread, _| thread.add_tool(EchoTool));
     thread
         .update(cx, |thread, cx| {
@@ -1447,7 +1449,7 @@ fn stop_events(result_events: Vec<Result<AgentResponseEvent>>) -> Vec<acp::StopR
 struct ThreadTest {
     model: Arc<dyn LanguageModel>,
     thread: Entity<Thread>,
-    project_context: Rc<RefCell<ProjectContext>>,
+    project_context: Entity<ProjectContext>,
     fs: Arc<FakeFs>,
 }
 
@@ -1543,7 +1545,7 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
         })
         .await;
 
-    let project_context = Rc::new(RefCell::new(ProjectContext::default()));
+    let project_context = cx.new(|_cx| ProjectContext::default());
     let context_server_registry =
         cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
     let action_log = cx.new(|_| ActionLog::new(project.clone()));
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index e0819abcc5..7f0465f5ce 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -25,7 +25,7 @@ use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;
-use std::{cell::RefCell, collections::BTreeMap, path::Path, rc::Rc, sync::Arc};
+use std::{collections::BTreeMap, path::Path, sync::Arc};
 use std::{fmt::Write, ops::Range};
 use util::{ResultExt, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
@@ -479,7 +479,7 @@ pub struct Thread {
     tool_use_limit_reached: bool,
     context_server_registry: Entity<ContextServerRegistry>,
     profile_id: AgentProfileId,
-    project_context: Rc<RefCell<ProjectContext>>,
+    project_context: Entity<ProjectContext>,
     templates: Arc<Templates>,
     model: Option<Arc<dyn LanguageModel>>,
     project: Entity<Project>,
@@ -489,7 +489,7 @@ pub struct Thread {
 impl Thread {
     pub fn new(
         project: Entity<Project>,
-        project_context: Rc<RefCell<ProjectContext>>,
+        project_context: Entity<ProjectContext>,
         context_server_registry: Entity<ContextServerRegistry>,
         action_log: Entity<ActionLog>,
         templates: Arc<Templates>,
@@ -520,6 +520,10 @@ impl Thread {
         &self.project
     }
 
+    pub fn project_context(&self) -> &Entity<ProjectContext> {
+        &self.project_context
+    }
+
     pub fn action_log(&self) -> &Entity<ActionLog> {
         &self.action_log
     }
@@ -750,10 +754,10 @@ impl Thread {
         Ok(events_rx)
     }
 
-    pub fn build_system_message(&self) -> LanguageModelRequestMessage {
+    pub fn build_system_message(&self, cx: &App) -> LanguageModelRequestMessage {
         log::debug!("Building system message");
         let prompt = SystemPromptTemplate {
-            project: &self.project_context.borrow(),
+            project: &self.project_context.read(cx),
             available_tools: self.tools.keys().cloned().collect(),
         }
         .render(&self.templates)
@@ -1030,7 +1034,7 @@ impl Thread {
         log::debug!("Completion intent: {:?}", completion_intent);
         log::debug!("Completion mode: {:?}", self.completion_mode);
 
-        let messages = self.build_request_messages();
+        let messages = self.build_request_messages(cx);
         log::info!("Request will include {} messages", messages.len());
 
         let tools = if let Some(tools) = self.tools(cx).log_err() {
@@ -1101,12 +1105,12 @@ impl Thread {
             )))
     }
 
-    fn build_request_messages(&self) -> Vec<LanguageModelRequestMessage> {
+    fn build_request_messages(&self, cx: &App) -> Vec<LanguageModelRequestMessage> {
         log::trace!(
             "Building request messages from {} thread messages",
             self.messages.len()
         );
-        let mut messages = vec![self.build_system_message()];
+        let mut messages = vec![self.build_system_message(cx)];
         for message in &self.messages {
             match message {
                 Message::User(message) => messages.push(message.to_request()),
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index e70e5e8a14..8ebd2936a5 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -503,9 +503,9 @@ mod tests {
     use fs::Fs;
     use gpui::{TestAppContext, UpdateGlobal};
     use language_model::fake_provider::FakeLanguageModel;
+    use prompt_store::ProjectContext;
     use serde_json::json;
     use settings::SettingsStore;
-    use std::rc::Rc;
     use util::path;
 
     #[gpui::test]
@@ -522,7 +522,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 action_log,
                 Templates::new(),
@@ -719,7 +719,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
@@ -855,7 +855,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
@@ -981,7 +981,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
@@ -1118,7 +1118,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
@@ -1228,7 +1228,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project.clone(),
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry.clone(),
                 action_log.clone(),
                 Templates::new(),
@@ -1309,7 +1309,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project.clone(),
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry.clone(),
                 action_log.clone(),
                 Templates::new(),
@@ -1393,7 +1393,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project.clone(),
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry.clone(),
                 action_log.clone(),
                 Templates::new(),
@@ -1474,7 +1474,7 @@ mod tests {
         let thread = cx.new(|cx| {
             Thread::new(
                 project.clone(),
-                Rc::default(),
+                cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 action_log.clone(),
                 Templates::new(),
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2cfedfe840..2fffe1b179 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -30,7 +30,7 @@ use language::Buffer;
 
 use language_model::LanguageModelRegistry;
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
-use project::Project;
+use project::{Project, ProjectEntryId};
 use prompt_store::PromptId;
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
@@ -703,6 +703,38 @@ impl AcpThreadView {
         })
     }
 
+    fn handle_open_rules(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(thread) = self.as_native_thread(cx) else {
+            return;
+        };
+        let project_context = thread.read(cx).project_context().read(cx);
+
+        let project_entry_ids = project_context
+            .worktrees
+            .iter()
+            .flat_map(|worktree| worktree.rules_file.as_ref())
+            .map(|rules_file| ProjectEntryId::from_usize(rules_file.project_entry_id))
+            .collect::<Vec<_>>();
+
+        self.workspace
+            .update(cx, move |workspace, cx| {
+                // TODO: Open a multibuffer instead? In some cases this doesn't make the set of rules
+                // files clear. For example, if rules file 1 is already open but rules file 2 is not,
+                // this would open and focus rules file 2 in a tab that is not next to rules file 1.
+                let project = workspace.project().read(cx);
+                let project_paths = project_entry_ids
+                    .into_iter()
+                    .flat_map(|entry_id| project.path_for_entry(entry_id, cx))
+                    .collect::<Vec<_>>();
+                for project_path in project_paths {
+                    workspace
+                        .open_path(project_path, None, true, window, cx)
+                        .detach_and_log_err(cx);
+                }
+            })
+            .ok();
+    }
+
     fn handle_thread_error(&mut self, error: anyhow::Error, cx: &mut Context<Self>) {
         self.thread_error = Some(ThreadError::from_err(error));
         cx.notify();
@@ -858,6 +890,12 @@ impl AcpThreadView {
                 let editor_focus = editor.focus_handle(cx).is_focused(window);
                 let focus_border = cx.theme().colors().border_focused;
 
+                let rules_item = if entry_ix == 0 {
+                    self.render_rules_item(cx)
+                } else {
+                    None
+                };
+
                 div()
                     .id(("user_message", entry_ix))
                     .py_4()
@@ -874,6 +912,7 @@ impl AcpThreadView {
                                 }))
                         })
                     }))
+                    .children(rules_item)
                     .child(
                         div()
                             .relative()
@@ -1862,6 +1901,125 @@ impl AcpThreadView {
             .into_any_element()
     }
 
+    fn render_rules_item(&self, cx: &Context<Self>) -> Option<AnyElement> {
+        let project_context = self
+            .as_native_thread(cx)?
+            .read(cx)
+            .project_context()
+            .read(cx);
+
+        let user_rules_text = if project_context.user_rules.is_empty() {
+            None
+        } else if project_context.user_rules.len() == 1 {
+            let user_rules = &project_context.user_rules[0];
+
+            match user_rules.title.as_ref() {
+                Some(title) => Some(format!("Using \"{title}\" user rule")),
+                None => Some("Using user rule".into()),
+            }
+        } else {
+            Some(format!(
+                "Using {} user rules",
+                project_context.user_rules.len()
+            ))
+        };
+
+        let first_user_rules_id = project_context
+            .user_rules
+            .first()
+            .map(|user_rules| user_rules.uuid.0);
+
+        let rules_files = project_context
+            .worktrees
+            .iter()
+            .filter_map(|worktree| worktree.rules_file.as_ref())
+            .collect::<Vec<_>>();
+
+        let rules_file_text = match rules_files.as_slice() {
+            &[] => None,
+            &[rules_file] => Some(format!(
+                "Using project {:?} file",
+                rules_file.path_in_worktree
+            )),
+            rules_files => Some(format!("Using {} project rules files", rules_files.len())),
+        };
+
+        if user_rules_text.is_none() && rules_file_text.is_none() {
+            return None;
+        }
+
+        Some(
+            v_flex()
+                .pt_2()
+                .px_2p5()
+                .gap_1()
+                .when_some(user_rules_text, |parent, user_rules_text| {
+                    parent.child(
+                        h_flex()
+                            .w_full()
+                            .child(
+                                Icon::new(IconName::Reader)
+                                    .size(IconSize::XSmall)
+                                    .color(Color::Disabled),
+                            )
+                            .child(
+                                Label::new(user_rules_text)
+                                    .size(LabelSize::XSmall)
+                                    .color(Color::Muted)
+                                    .truncate()
+                                    .buffer_font(cx)
+                                    .ml_1p5()
+                                    .mr_0p5(),
+                            )
+                            .child(
+                                IconButton::new("open-prompt-library", IconName::ArrowUpRight)
+                                    .shape(ui::IconButtonShape::Square)
+                                    .icon_size(IconSize::XSmall)
+                                    .icon_color(Color::Ignored)
+                                    // TODO: Figure out a way to pass focus handle here so we can display the `OpenRulesLibrary`  keybinding
+                                    .tooltip(Tooltip::text("View User Rules"))
+                                    .on_click(move |_event, window, cx| {
+                                        window.dispatch_action(
+                                            Box::new(OpenRulesLibrary {
+                                                prompt_to_select: first_user_rules_id,
+                                            }),
+                                            cx,
+                                        )
+                                    }),
+                            ),
+                    )
+                })
+                .when_some(rules_file_text, |parent, rules_file_text| {
+                    parent.child(
+                        h_flex()
+                            .w_full()
+                            .child(
+                                Icon::new(IconName::File)
+                                    .size(IconSize::XSmall)
+                                    .color(Color::Disabled),
+                            )
+                            .child(
+                                Label::new(rules_file_text)
+                                    .size(LabelSize::XSmall)
+                                    .color(Color::Muted)
+                                    .buffer_font(cx)
+                                    .ml_1p5()
+                                    .mr_0p5(),
+                            )
+                            .child(
+                                IconButton::new("open-rule", IconName::ArrowUpRight)
+                                    .shape(ui::IconButtonShape::Square)
+                                    .icon_size(IconSize::XSmall)
+                                    .icon_color(Color::Ignored)
+                                    .on_click(cx.listener(Self::handle_open_rules))
+                                    .tooltip(Tooltip::text("View Rules")),
+                            ),
+                    )
+                })
+                .into_any(),
+        )
+    }
+
     fn render_empty_state(&self, cx: &App) -> AnyElement {
         let loading = matches!(&self.thread_state, ThreadState::Loading { .. });
 

From 47e1d4511cda45a2044435523209282ffd2f8627 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 19 Aug 2025 14:43:41 +0530
Subject: [PATCH 153/823] editor: Fix `edit_predictions_disabled_in` not
 disabling predictions (#36469)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #25744

Only setting changes and editor init determined whether to show
predictions, so glob patterns and toggles correctly disabled them. On
cursor changes we call `update_visible_edit_prediction`, but we weren’t
discarding predictions when the scope changed. This PR fixes that.

Release Notes:

- Fixed an issue where the `edit_predictions_disabled_in` setting was
ignored in some cases.
---
 crates/editor/src/edit_prediction_tests.rs | 42 +++++++++++++++++++++-
 crates/editor/src/editor.rs                |  8 +++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/edit_prediction_tests.rs b/crates/editor/src/edit_prediction_tests.rs
index 7bf51e45d7..bba632e81f 100644
--- a/crates/editor/src/edit_prediction_tests.rs
+++ b/crates/editor/src/edit_prediction_tests.rs
@@ -7,7 +7,9 @@ use std::ops::Range;
 use text::{Point, ToOffset};
 
 use crate::{
-    EditPrediction, editor_tests::init_test, test::editor_test_context::EditorTestContext,
+    EditPrediction,
+    editor_tests::{init_test, update_test_language_settings},
+    test::editor_test_context::EditorTestContext,
 };
 
 #[gpui::test]
@@ -271,6 +273,44 @@ async fn test_edit_prediction_jump_disabled_for_non_zed_providers(cx: &mut gpui:
     });
 }
 
+#[gpui::test]
+async fn test_edit_predictions_disabled_in_scope(cx: &mut gpui::TestAppContext) {
+    init_test(cx, |_| {});
+
+    update_test_language_settings(cx, |settings| {
+        settings.defaults.edit_predictions_disabled_in = Some(vec!["string".to_string()]);
+    });
+
+    let mut cx = EditorTestContext::new(cx).await;
+    let provider = cx.new(|_| FakeEditPredictionProvider::default());
+    assign_editor_completion_provider(provider.clone(), &mut cx);
+
+    let language = languages::language("javascript", tree_sitter_typescript::LANGUAGE_TSX.into());
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+    // Test disabled inside of string
+    cx.set_state("const x = \"hello ˇworld\";");
+    propose_edits(&provider, vec![(17..17, "beautiful ")], &mut cx);
+    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
+    cx.editor(|editor, _, _| {
+        assert!(
+            editor.active_edit_prediction.is_none(),
+            "Edit predictions should be disabled in string scopes when configured in edit_predictions_disabled_in"
+        );
+    });
+
+    // Test enabled outside of string
+    cx.set_state("const x = \"hello world\"; ˇ");
+    propose_edits(&provider, vec![(24..24, "// comment")], &mut cx);
+    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
+    cx.editor(|editor, _, _| {
+        assert!(
+            editor.active_edit_prediction.is_some(),
+            "Edit predictions should work outside of disabled scopes"
+        );
+    });
+}
+
 fn assert_editor_active_edit_completion(
     cx: &mut EditorTestContext,
     assert: impl FnOnce(MultiBufferSnapshot, &Vec<(Range<Anchor>, String)>),
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a49f1dba86..c52a59a909 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -7764,6 +7764,14 @@ impl Editor {
         self.edit_prediction_settings =
             self.edit_prediction_settings_at_position(&buffer, cursor_buffer_position, cx);
 
+        match self.edit_prediction_settings {
+            EditPredictionSettings::Disabled => {
+                self.discard_edit_prediction(false, cx);
+                return None;
+            }
+            _ => {}
+        };
+
         self.edit_prediction_indent_conflict = multibuffer.is_line_whitespace_upto(cursor);
 
         if self.edit_prediction_indent_conflict {

From 0ea0d466d289ff2c57bdac3ab4b20f61c9ab7494 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 11:41:55 +0200
Subject: [PATCH 154/823] agent2: Port retry logic (#36421)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs        |  15 ++
 crates/agent2/src/agent.rs                 |   5 +
 crates/agent2/src/tests/mod.rs             | 166 +++++++++++-
 crates/agent2/src/thread.rs                | 286 ++++++++++++++++++---
 crates/agent_ui/src/acp/thread_view.rs     |  61 ++++-
 crates/agent_ui/src/agent_diff.rs          |   1 +
 crates/language_model/src/fake_provider.rs |  32 ++-
 7 files changed, 514 insertions(+), 52 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 8bc0635475..916f48cbe0 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -24,6 +24,7 @@ use std::fmt::{Formatter, Write};
 use std::ops::Range;
 use std::process::ExitStatus;
 use std::rc::Rc;
+use std::time::{Duration, Instant};
 use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
 use ui::App;
 use util::ResultExt;
@@ -658,6 +659,15 @@ impl PlanEntry {
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct RetryStatus {
+    pub last_error: SharedString,
+    pub attempt: usize,
+    pub max_attempts: usize,
+    pub started_at: Instant,
+    pub duration: Duration,
+}
+
 pub struct AcpThread {
     title: SharedString,
     entries: Vec<AgentThreadEntry>,
@@ -676,6 +686,7 @@ pub enum AcpThreadEvent {
     EntryUpdated(usize),
     EntriesRemoved(Range<usize>),
     ToolAuthorizationRequired,
+    Retry(RetryStatus),
     Stopped,
     Error,
     ServerExited(ExitStatus),
@@ -916,6 +927,10 @@ impl AcpThread {
         cx.emit(AcpThreadEvent::NewEntry);
     }
 
+    pub fn update_retry_status(&mut self, status: RetryStatus, cx: &mut Context<Self>) {
+        cx.emit(AcpThreadEvent::Retry(status));
+    }
+
     pub fn update_tool_call(
         &mut self,
         update: impl Into<ToolCallUpdate>,
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 6347f5f9a4..480b2baa95 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -546,6 +546,11 @@ impl NativeAgentConnection {
                                     thread.update_tool_call(update, cx)
                                 })??;
                             }
+                            AgentResponseEvent::Retry(status) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    thread.update_retry_status(status, cx)
+                                })?;
+                            }
                             AgentResponseEvent::Stop(stop_reason) => {
                                 log::debug!("Assistant message complete: {:?}", stop_reason);
                                 return Ok(acp::PromptResponse { stop_reason });
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 13b37fbaa2..c83479f2cf 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -6,15 +6,16 @@ use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, UserStore};
 use fs::{FakeFs, Fs};
-use futures::channel::mpsc::UnboundedReceiver;
+use futures::{StreamExt, channel::mpsc::UnboundedReceiver};
 use gpui::{
     App, AppContext, Entity, Task, TestAppContext, UpdateGlobal, http_client::FakeHttpClient,
 };
 use indoc::indoc;
 use language_model::{
-    LanguageModel, LanguageModelCompletionEvent, LanguageModelId, LanguageModelRegistry,
-    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse, MessageContent,
-    Role, StopReason, fake_provider::FakeLanguageModel,
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
+    LanguageModelProviderName, LanguageModelRegistry, LanguageModelRequestMessage,
+    LanguageModelToolResult, LanguageModelToolUse, MessageContent, Role, StopReason,
+    fake_provider::FakeLanguageModel,
 };
 use pretty_assertions::assert_eq;
 use project::Project;
@@ -24,7 +25,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use settings::SettingsStore;
-use smol::stream::StreamExt;
 use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
 use util::path;
 
@@ -1435,6 +1435,162 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_send_no_retry_on_success(cx: &mut TestAppContext) {
+    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn);
+            thread.send(UserMessageId::new(), ["Hello!"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_text_chunk("Hey!");
+    fake_model.end_last_completion_stream();
+
+    let mut retry_events = Vec::new();
+    while let Some(Ok(event)) = events.next().await {
+        match event {
+            AgentResponseEvent::Retry(retry_status) => {
+                retry_events.push(retry_status);
+            }
+            AgentResponseEvent::Stop(..) => break,
+            _ => {}
+        }
+    }
+
+    assert_eq!(retry_events.len(), 0);
+    thread.read_with(cx, |thread, _cx| {
+        assert_eq!(
+            thread.to_markdown(),
+            indoc! {"
+                ## User
+
+                Hello!
+
+                ## Assistant
+
+                Hey!
+            "}
+        )
+    });
+}
+
+#[gpui::test]
+async fn test_send_retry_on_error(cx: &mut TestAppContext) {
+    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn);
+            thread.send(UserMessageId::new(), ["Hello!"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
+        provider: LanguageModelProviderName::new("Anthropic"),
+        retry_after: Some(Duration::from_secs(3)),
+    });
+    fake_model.end_last_completion_stream();
+
+    cx.executor().advance_clock(Duration::from_secs(3));
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_text_chunk("Hey!");
+    fake_model.end_last_completion_stream();
+
+    let mut retry_events = Vec::new();
+    while let Some(Ok(event)) = events.next().await {
+        match event {
+            AgentResponseEvent::Retry(retry_status) => {
+                retry_events.push(retry_status);
+            }
+            AgentResponseEvent::Stop(..) => break,
+            _ => {}
+        }
+    }
+
+    assert_eq!(retry_events.len(), 1);
+    assert!(matches!(
+        retry_events[0],
+        acp_thread::RetryStatus { attempt: 1, .. }
+    ));
+    thread.read_with(cx, |thread, _cx| {
+        assert_eq!(
+            thread.to_markdown(),
+            indoc! {"
+                ## User
+
+                Hello!
+
+                ## Assistant
+
+                Hey!
+            "}
+        )
+    });
+}
+
+#[gpui::test]
+async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
+    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let mut events = thread
+        .update(cx, |thread, cx| {
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn);
+            thread.send(UserMessageId::new(), ["Hello!"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    for _ in 0..crate::thread::MAX_RETRY_ATTEMPTS + 1 {
+        fake_model.send_last_completion_stream_error(
+            LanguageModelCompletionError::ServerOverloaded {
+                provider: LanguageModelProviderName::new("Anthropic"),
+                retry_after: Some(Duration::from_secs(3)),
+            },
+        );
+        fake_model.end_last_completion_stream();
+        cx.executor().advance_clock(Duration::from_secs(3));
+        cx.run_until_parked();
+    }
+
+    let mut errors = Vec::new();
+    let mut retry_events = Vec::new();
+    while let Some(event) = events.next().await {
+        match event {
+            Ok(AgentResponseEvent::Retry(retry_status)) => {
+                retry_events.push(retry_status);
+            }
+            Ok(AgentResponseEvent::Stop(..)) => break,
+            Err(error) => errors.push(error),
+            _ => {}
+        }
+    }
+
+    assert_eq!(
+        retry_events.len(),
+        crate::thread::MAX_RETRY_ATTEMPTS as usize
+    );
+    for i in 0..crate::thread::MAX_RETRY_ATTEMPTS as usize {
+        assert_eq!(retry_events[i].attempt, i + 1);
+    }
+    assert_eq!(errors.len(), 1);
+    let error = errors[0]
+        .downcast_ref::<LanguageModelCompletionError>()
+        .unwrap();
+    assert!(matches!(
+        error,
+        LanguageModelCompletionError::ServerOverloaded { .. }
+    ));
+}
+
 /// Filters out the stop events for asserting against in tests
 fn stop_events(result_events: Vec<Result<AgentResponseEvent>>) -> Vec<acp::StopReason> {
     result_events
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 7f0465f5ce..beb780850c 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -12,12 +12,12 @@ use futures::{
     channel::{mpsc, oneshot},
     stream::FuturesUnordered,
 };
-use gpui::{App, Context, Entity, SharedString, Task};
+use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
 use language_model::{
-    LanguageModel, LanguageModelCompletionEvent, LanguageModelImage, LanguageModelProviderId,
-    LanguageModelRequest, LanguageModelRequestMessage, LanguageModelRequestTool,
-    LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolSchemaFormat,
-    LanguageModelToolUse, LanguageModelToolUseId, Role, StopReason,
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelImage,
+    LanguageModelProviderId, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolResultContent,
+    LanguageModelToolSchemaFormat, LanguageModelToolUse, LanguageModelToolUseId, Role, StopReason,
 };
 use project::Project;
 use prompt_store::ProjectContext;
@@ -25,7 +25,12 @@ use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;
-use std::{collections::BTreeMap, path::Path, sync::Arc};
+use std::{
+    collections::BTreeMap,
+    path::Path,
+    sync::Arc,
+    time::{Duration, Instant},
+};
 use std::{fmt::Write, ops::Range};
 use util::{ResultExt, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
@@ -71,6 +76,21 @@ impl std::fmt::Display for PromptId {
     }
 }
 
+pub(crate) const MAX_RETRY_ATTEMPTS: u8 = 4;
+pub(crate) const BASE_RETRY_DELAY: Duration = Duration::from_secs(5);
+
+#[derive(Debug, Clone)]
+enum RetryStrategy {
+    ExponentialBackoff {
+        initial_delay: Duration,
+        max_attempts: u8,
+    },
+    Fixed {
+        delay: Duration,
+        max_attempts: u8,
+    },
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Message {
     User(UserMessage),
@@ -455,6 +475,7 @@ pub enum AgentResponseEvent {
     ToolCall(acp::ToolCall),
     ToolCallUpdate(acp_thread::ToolCallUpdate),
     ToolCallAuthorization(ToolCallAuthorization),
+    Retry(acp_thread::RetryStatus),
     Stop(acp::StopReason),
 }
 
@@ -662,41 +683,18 @@ impl Thread {
                         })??;
 
                         log::info!("Calling model.stream_completion");
-                        let mut events = model.stream_completion(request, cx).await?;
-                        log::debug!("Stream completion started successfully");
 
                         let mut tool_use_limit_reached = false;
-                        let mut tool_uses = FuturesUnordered::new();
-                        while let Some(event) = events.next().await {
-                            match event? {
-                                LanguageModelCompletionEvent::StatusUpdate(
-                                    CompletionRequestStatus::ToolUseLimitReached,
-                                ) => {
-                                    tool_use_limit_reached = true;
-                                }
-                                LanguageModelCompletionEvent::Stop(reason) => {
-                                    event_stream.send_stop(reason);
-                                    if reason == StopReason::Refusal {
-                                        this.update(cx, |this, _cx| {
-                                            this.flush_pending_message();
-                                            this.messages.truncate(message_ix);
-                                        })?;
-                                        return Ok(());
-                                    }
-                                }
-                                event => {
-                                    log::trace!("Received completion event: {:?}", event);
-                                    this.update(cx, |this, cx| {
-                                        tool_uses.extend(this.handle_streamed_completion_event(
-                                            event,
-                                            &event_stream,
-                                            cx,
-                                        ));
-                                    })
-                                    .ok();
-                                }
-                            }
-                        }
+                        let mut tool_uses = Self::stream_completion_with_retries(
+                            this.clone(),
+                            model.clone(),
+                            request,
+                            message_ix,
+                            &event_stream,
+                            &mut tool_use_limit_reached,
+                            cx,
+                        )
+                        .await?;
 
                         let used_tools = tool_uses.is_empty();
                         while let Some(tool_result) = tool_uses.next().await {
@@ -754,10 +752,105 @@ impl Thread {
         Ok(events_rx)
     }
 
+    async fn stream_completion_with_retries(
+        this: WeakEntity<Self>,
+        model: Arc<dyn LanguageModel>,
+        request: LanguageModelRequest,
+        message_ix: usize,
+        event_stream: &AgentResponseEventStream,
+        tool_use_limit_reached: &mut bool,
+        cx: &mut AsyncApp,
+    ) -> Result<FuturesUnordered<Task<LanguageModelToolResult>>> {
+        log::debug!("Stream completion started successfully");
+
+        let mut attempt = None;
+        'retry: loop {
+            let mut events = model.stream_completion(request.clone(), cx).await?;
+            let mut tool_uses = FuturesUnordered::new();
+            while let Some(event) = events.next().await {
+                match event {
+                    Ok(LanguageModelCompletionEvent::StatusUpdate(
+                        CompletionRequestStatus::ToolUseLimitReached,
+                    )) => {
+                        *tool_use_limit_reached = true;
+                    }
+                    Ok(LanguageModelCompletionEvent::Stop(reason)) => {
+                        event_stream.send_stop(reason);
+                        if reason == StopReason::Refusal {
+                            this.update(cx, |this, _cx| {
+                                this.flush_pending_message();
+                                this.messages.truncate(message_ix);
+                            })?;
+                            return Ok(tool_uses);
+                        }
+                    }
+                    Ok(event) => {
+                        log::trace!("Received completion event: {:?}", event);
+                        this.update(cx, |this, cx| {
+                            tool_uses.extend(this.handle_streamed_completion_event(
+                                event,
+                                event_stream,
+                                cx,
+                            ));
+                        })
+                        .ok();
+                    }
+                    Err(error) => {
+                        let completion_mode =
+                            this.read_with(cx, |thread, _cx| thread.completion_mode())?;
+                        if completion_mode == CompletionMode::Normal {
+                            return Err(error.into());
+                        }
+
+                        let Some(strategy) = Self::retry_strategy_for(&error) else {
+                            return Err(error.into());
+                        };
+
+                        let max_attempts = match &strategy {
+                            RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
+                            RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
+                        };
+
+                        let attempt = attempt.get_or_insert(0u8);
+
+                        *attempt += 1;
+
+                        let attempt = *attempt;
+                        if attempt > max_attempts {
+                            return Err(error.into());
+                        }
+
+                        let delay = match &strategy {
+                            RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
+                                let delay_secs =
+                                    initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
+                                Duration::from_secs(delay_secs)
+                            }
+                            RetryStrategy::Fixed { delay, .. } => *delay,
+                        };
+                        log::debug!("Retry attempt {attempt} with delay {delay:?}");
+
+                        event_stream.send_retry(acp_thread::RetryStatus {
+                            last_error: error.to_string().into(),
+                            attempt: attempt as usize,
+                            max_attempts: max_attempts as usize,
+                            started_at: Instant::now(),
+                            duration: delay,
+                        });
+
+                        cx.background_executor().timer(delay).await;
+                        continue 'retry;
+                    }
+                }
+            }
+            return Ok(tool_uses);
+        }
+    }
+
     pub fn build_system_message(&self, cx: &App) -> LanguageModelRequestMessage {
         log::debug!("Building system message");
         let prompt = SystemPromptTemplate {
-            project: &self.project_context.read(cx),
+            project: self.project_context.read(cx),
             available_tools: self.tools.keys().cloned().collect(),
         }
         .render(&self.templates)
@@ -1158,6 +1251,113 @@ impl Thread {
     fn advance_prompt_id(&mut self) {
         self.prompt_id = PromptId::new();
     }
+
+    fn retry_strategy_for(error: &LanguageModelCompletionError) -> Option<RetryStrategy> {
+        use LanguageModelCompletionError::*;
+        use http_client::StatusCode;
+
+        // General strategy here:
+        // - If retrying won't help (e.g. invalid API key or payload too large), return None so we don't retry at all.
+        // - If it's a time-based issue (e.g. server overloaded, rate limit exceeded), retry up to 4 times with exponential backoff.
+        // - If it's an issue that *might* be fixed by retrying (e.g. internal server error), retry up to 3 times.
+        match error {
+            HttpResponseError {
+                status_code: StatusCode::TOO_MANY_REQUESTS,
+                ..
+            } => Some(RetryStrategy::ExponentialBackoff {
+                initial_delay: BASE_RETRY_DELAY,
+                max_attempts: MAX_RETRY_ATTEMPTS,
+            }),
+            ServerOverloaded { retry_after, .. } | RateLimitExceeded { retry_after, .. } => {
+                Some(RetryStrategy::Fixed {
+                    delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
+                    max_attempts: MAX_RETRY_ATTEMPTS,
+                })
+            }
+            UpstreamProviderError {
+                status,
+                retry_after,
+                ..
+            } => match *status {
+                StatusCode::TOO_MANY_REQUESTS | StatusCode::SERVICE_UNAVAILABLE => {
+                    Some(RetryStrategy::Fixed {
+                        delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
+                        max_attempts: MAX_RETRY_ATTEMPTS,
+                    })
+                }
+                StatusCode::INTERNAL_SERVER_ERROR => Some(RetryStrategy::Fixed {
+                    delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
+                    // Internal Server Error could be anything, retry up to 3 times.
+                    max_attempts: 3,
+                }),
+                status => {
+                    // There is no StatusCode variant for the unofficial HTTP 529 ("The service is overloaded"),
+                    // but we frequently get them in practice. See https://http.dev/529
+                    if status.as_u16() == 529 {
+                        Some(RetryStrategy::Fixed {
+                            delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
+                            max_attempts: MAX_RETRY_ATTEMPTS,
+                        })
+                    } else {
+                        Some(RetryStrategy::Fixed {
+                            delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
+                            max_attempts: 2,
+                        })
+                    }
+                }
+            },
+            ApiInternalServerError { .. } => Some(RetryStrategy::Fixed {
+                delay: BASE_RETRY_DELAY,
+                max_attempts: 3,
+            }),
+            ApiReadResponseError { .. }
+            | HttpSend { .. }
+            | DeserializeResponse { .. }
+            | BadRequestFormat { .. } => Some(RetryStrategy::Fixed {
+                delay: BASE_RETRY_DELAY,
+                max_attempts: 3,
+            }),
+            // Retrying these errors definitely shouldn't help.
+            HttpResponseError {
+                status_code:
+                    StatusCode::PAYLOAD_TOO_LARGE | StatusCode::FORBIDDEN | StatusCode::UNAUTHORIZED,
+                ..
+            }
+            | AuthenticationError { .. }
+            | PermissionError { .. }
+            | NoApiKey { .. }
+            | ApiEndpointNotFound { .. }
+            | PromptTooLarge { .. } => None,
+            // These errors might be transient, so retry them
+            SerializeRequest { .. } | BuildRequestBody { .. } => Some(RetryStrategy::Fixed {
+                delay: BASE_RETRY_DELAY,
+                max_attempts: 1,
+            }),
+            // Retry all other 4xx and 5xx errors once.
+            HttpResponseError { status_code, .. }
+                if status_code.is_client_error() || status_code.is_server_error() =>
+            {
+                Some(RetryStrategy::Fixed {
+                    delay: BASE_RETRY_DELAY,
+                    max_attempts: 3,
+                })
+            }
+            Other(err)
+                if err.is::<language_model::PaymentRequiredError>()
+                    || err.is::<language_model::ModelRequestLimitReachedError>() =>
+            {
+                // Retrying won't help for Payment Required or Model Request Limit errors (where
+                // the user must upgrade to usage-based billing to get more requests, or else wait
+                // for a significant amount of time for the request limit to reset).
+                None
+            }
+            // Conservatively assume that any other errors are non-retryable
+            HttpResponseError { .. } | Other(..) => Some(RetryStrategy::Fixed {
+                delay: BASE_RETRY_DELAY,
+                max_attempts: 2,
+            }),
+        }
+    }
 }
 
 struct RunningTurn {
@@ -1367,6 +1567,12 @@ impl AgentResponseEventStream {
             .ok();
     }
 
+    fn send_retry(&self, status: acp_thread::RetryStatus) {
+        self.0
+            .unbounded_send(Ok(AgentResponseEvent::Retry(status)))
+            .ok();
+    }
+
     fn send_stop(&self, reason: StopReason) {
         match reason {
             StopReason::EndTurn => {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2fffe1b179..370dae53e4 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1,7 +1,7 @@
 use acp_thread::{
     AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
-    AuthRequired, LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
-    UserMessageId,
+    AuthRequired, LoadError, MentionUri, RetryStatus, ThreadStatus, ToolCall, ToolCallContent,
+    ToolCallStatus, UserMessageId,
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
@@ -35,6 +35,7 @@ use prompt_store::PromptId;
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
 use std::sync::Arc;
+use std::time::Instant;
 use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
 use text::Anchor;
 use theme::ThemeSettings;
@@ -115,6 +116,7 @@ pub struct AcpThreadView {
     profile_selector: Option<Entity<ProfileSelector>>,
     notifications: Vec<WindowHandle<AgentNotification>>,
     notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
+    thread_retry_status: Option<RetryStatus>,
     thread_error: Option<ThreadError>,
     list_state: ListState,
     scrollbar_state: ScrollbarState,
@@ -209,6 +211,7 @@ impl AcpThreadView {
             notification_subscriptions: HashMap::default(),
             list_state: list_state.clone(),
             scrollbar_state: ScrollbarState::new(list_state).parent_entity(&cx.entity()),
+            thread_retry_status: None,
             thread_error: None,
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
@@ -445,6 +448,7 @@ impl AcpThreadView {
 
     pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
         self.thread_error.take();
+        self.thread_retry_status.take();
 
         if let Some(thread) = self.thread() {
             self._cancel_task = Some(thread.update(cx, |thread, cx| thread.cancel(cx)));
@@ -775,7 +779,11 @@ impl AcpThreadView {
             AcpThreadEvent::ToolAuthorizationRequired => {
                 self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
             }
+            AcpThreadEvent::Retry(retry) => {
+                self.thread_retry_status = Some(retry.clone());
+            }
             AcpThreadEvent::Stopped => {
+                self.thread_retry_status.take();
                 let used_tools = thread.read(cx).used_tools_since_last_user_message();
                 self.notify_with_sound(
                     if used_tools {
@@ -789,6 +797,7 @@ impl AcpThreadView {
                 );
             }
             AcpThreadEvent::Error => {
+                self.thread_retry_status.take();
                 self.notify_with_sound(
                     "Agent stopped due to an error",
                     IconName::Warning,
@@ -797,6 +806,7 @@ impl AcpThreadView {
                 );
             }
             AcpThreadEvent::ServerExited(status) => {
+                self.thread_retry_status.take();
                 self.thread_state = ThreadState::ServerExited { status: *status };
             }
         }
@@ -3413,7 +3423,51 @@ impl AcpThreadView {
         })
     }
 
-    fn render_thread_error(&self, window: &mut Window, cx: &mut Context<'_, Self>) -> Option<Div> {
+    fn render_thread_retry_status_callout(
+        &self,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<Callout> {
+        let state = self.thread_retry_status.as_ref()?;
+
+        let next_attempt_in = state
+            .duration
+            .saturating_sub(Instant::now().saturating_duration_since(state.started_at));
+        if next_attempt_in.is_zero() {
+            return None;
+        }
+
+        let next_attempt_in_secs = next_attempt_in.as_secs() + 1;
+
+        let retry_message = if state.max_attempts == 1 {
+            if next_attempt_in_secs == 1 {
+                "Retrying. Next attempt in 1 second.".to_string()
+            } else {
+                format!("Retrying. Next attempt in {next_attempt_in_secs} seconds.")
+            }
+        } else {
+            if next_attempt_in_secs == 1 {
+                format!(
+                    "Retrying. Next attempt in 1 second (Attempt {} of {}).",
+                    state.attempt, state.max_attempts,
+                )
+            } else {
+                format!(
+                    "Retrying. Next attempt in {next_attempt_in_secs} seconds (Attempt {} of {}).",
+                    state.attempt, state.max_attempts,
+                )
+            }
+        };
+
+        Some(
+            Callout::new()
+                .severity(Severity::Warning)
+                .title(state.last_error.clone())
+                .description(retry_message),
+        )
+    }
+
+    fn render_thread_error(&self, window: &mut Window, cx: &mut Context<Self>) -> Option<Div> {
         let content = match self.thread_error.as_ref()? {
             ThreadError::Other(error) => self.render_any_thread_error(error.clone(), cx),
             ThreadError::PaymentRequired => self.render_payment_required_error(cx),
@@ -3678,6 +3732,7 @@ impl Render for AcpThreadView {
                 }
                 _ => this,
             })
+            .children(self.render_thread_retry_status_callout(window, cx))
             .children(self.render_thread_error(window, cx))
             .child(self.render_message_editor(window, cx))
     }
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 3522a0c9ab..b0b06583a4 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1523,6 +1523,7 @@ impl AgentDiff {
             AcpThreadEvent::EntriesRemoved(_)
             | AcpThreadEvent::Stopped
             | AcpThreadEvent::ToolAuthorizationRequired
+            | AcpThreadEvent::Retry(_)
             | AcpThreadEvent::Error
             | AcpThreadEvent::ServerExited(_) => {}
         }
diff --git a/crates/language_model/src/fake_provider.rs b/crates/language_model/src/fake_provider.rs
index 67fba44887..ebfd37d16c 100644
--- a/crates/language_model/src/fake_provider.rs
+++ b/crates/language_model/src/fake_provider.rs
@@ -4,10 +4,11 @@ use crate::{
     LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
     LanguageModelRequest, LanguageModelToolChoice,
 };
-use futures::{FutureExt, StreamExt, channel::mpsc, future::BoxFuture, stream::BoxStream};
+use futures::{FutureExt, channel::mpsc, future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, App, AsyncApp, Entity, Task, Window};
 use http_client::Result;
 use parking_lot::Mutex;
+use smol::stream::StreamExt;
 use std::sync::Arc;
 
 #[derive(Clone)]
@@ -100,7 +101,9 @@ pub struct FakeLanguageModel {
     current_completion_txs: Mutex<
         Vec<(
             LanguageModelRequest,
-            mpsc::UnboundedSender<LanguageModelCompletionEvent>,
+            mpsc::UnboundedSender<
+                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
+            >,
         )>,
     >,
 }
@@ -150,7 +153,21 @@ impl FakeLanguageModel {
             .find(|(req, _)| req == request)
             .map(|(_, tx)| tx)
             .unwrap();
-        tx.unbounded_send(event.into()).unwrap();
+        tx.unbounded_send(Ok(event.into())).unwrap();
+    }
+
+    pub fn send_completion_stream_error(
+        &self,
+        request: &LanguageModelRequest,
+        error: impl Into<LanguageModelCompletionError>,
+    ) {
+        let current_completion_txs = self.current_completion_txs.lock();
+        let tx = current_completion_txs
+            .iter()
+            .find(|(req, _)| req == request)
+            .map(|(_, tx)| tx)
+            .unwrap();
+        tx.unbounded_send(Err(error.into())).unwrap();
     }
 
     pub fn end_completion_stream(&self, request: &LanguageModelRequest) {
@@ -170,6 +187,13 @@ impl FakeLanguageModel {
         self.send_completion_stream_event(self.pending_completions().last().unwrap(), event);
     }
 
+    pub fn send_last_completion_stream_error(
+        &self,
+        error: impl Into<LanguageModelCompletionError>,
+    ) {
+        self.send_completion_stream_error(self.pending_completions().last().unwrap(), error);
+    }
+
     pub fn end_last_completion_stream(&self) {
         self.end_completion_stream(self.pending_completions().last().unwrap());
     }
@@ -229,7 +253,7 @@ impl LanguageModel for FakeLanguageModel {
     > {
         let (tx, rx) = mpsc::unbounded();
         self.current_completion_txs.lock().push((request, tx));
-        async move { Ok(rx.map(Ok).boxed()) }.boxed()
+        async move { Ok(rx.boxed()) }.boxed()
     }
 
     fn as_fake(&self) -> &Self {

From 5df9c7c1c22f60cf48abbc9bb7b8519481923ed7 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 19 Aug 2025 12:16:49 +0200
Subject: [PATCH 155/823] search: Fix project search query flickering (#36470)

Release Notes:

- N/A

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/search/src/project_search.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 056c3556ba..443bbb0427 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1925,13 +1925,15 @@ impl Render for ProjectSearchBar {
         let limit_reached = project_search.limit_reached;
 
         let color_override = match (
+            &project_search.pending_search,
             project_search.no_results,
             &project_search.active_query,
             &project_search.last_search_query_text,
         ) {
-            (Some(true), Some(q), Some(p)) if q.as_str() == p => Some(Color::Error),
+            (None, Some(true), Some(q), Some(p)) if q.as_str() == p => Some(Color::Error),
             _ => None,
         };
+
         let match_text = search
             .active_match_index
             .and_then(|index| {

From 97a31c59c99781e33143321849e7613c62acd482 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 12:22:17 +0200
Subject: [PATCH 156/823] agent2: Fix agent location still being present after
 thread stopped (#36471)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs | 2 ++
 crates/agent_ui/src/agent_diff.rs   | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 916f48cbe0..b86696d437 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1282,6 +1282,8 @@ impl AcpThread {
                 .await?;
 
             this.update(cx, |this, cx| {
+                this.project
+                    .update(cx, |project, cx| project.set_agent_location(None, cx));
                 match response {
                     Ok(Err(e)) => {
                         this.send_task.take();
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index b0b06583a4..b010f8a424 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1520,12 +1520,12 @@ impl AgentDiff {
                     self.update_reviewing_editors(workspace, window, cx);
                 }
             }
+            AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::ServerExited(_) => {
+                self.update_reviewing_editors(workspace, window, cx);
+            }
             AcpThreadEvent::EntriesRemoved(_)
-            | AcpThreadEvent::Stopped
             | AcpThreadEvent::ToolAuthorizationRequired
-            | AcpThreadEvent::Retry(_)
-            | AcpThreadEvent::Error
-            | AcpThreadEvent::ServerExited(_) => {}
+            | AcpThreadEvent::Retry(_) => {}
         }
     }
 

From 790a2a0cfa603b0fcf1ddff29eab9434fcdc1e65 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 12:40:02 +0200
Subject: [PATCH 157/823] agent2: Support `preferred_completion_mode` setting
 (#36473)

Release Notes:

- N/A
---
 crates/agent2/src/thread.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index beb780850c..f0b5d2f08a 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -522,7 +522,7 @@ impl Thread {
             id: ThreadId::new(),
             prompt_id: PromptId::new(),
             messages: Vec::new(),
-            completion_mode: CompletionMode::Normal,
+            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
             running_turn: None,
             pending_message: None,
             tools: BTreeMap::default(),

From e6d5a6a4fdb0ebcdfdc6c1f903cf98469934dcce Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 12:59:34 +0200
Subject: [PATCH 158/823] agent: Remove `thread-auto-capture` feature (#36474)

We never ended up using this in practice (the feature flag is not
enabled for anyone, not even staff)

Release Notes:

- N/A
---
 Cargo.lock                                |  1 -
 crates/agent/Cargo.toml                   |  1 -
 crates/agent/src/thread.rs                | 55 -----------------------
 crates/feature_flags/src/feature_flags.rs |  8 ----
 4 files changed, 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ef91c79c9..d7edc54257 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,7 +131,6 @@ dependencies = [
  "component",
  "context_server",
  "convert_case 0.8.0",
- "feature_flags",
  "fs",
  "futures 0.3.31",
  "git",
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index 53ad2f4967..391abb38fe 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -31,7 +31,6 @@ collections.workspace = true
 component.workspace = true
 context_server.workspace = true
 convert_case.workspace = true
-feature_flags.workspace = true
 fs.workspace = true
 futures.workspace = true
 git.workspace = true
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 469135a967..a3f903a60d 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -16,7 +16,6 @@ use chrono::{DateTime, Utc};
 use client::{ModelRequestUsage, RequestUsage};
 use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, Plan, UsageLimit};
 use collections::HashMap;
-use feature_flags::{self, FeatureFlagAppExt};
 use futures::{FutureExt, StreamExt as _, future::Shared};
 use git::repository::DiffType;
 use gpui::{
@@ -388,7 +387,6 @@ pub struct Thread {
     feedback: Option<ThreadFeedback>,
     retry_state: Option<RetryState>,
     message_feedback: HashMap<MessageId, ThreadFeedback>,
-    last_auto_capture_at: Option<Instant>,
     last_received_chunk_at: Option<Instant>,
     request_callback: Option<
         Box<dyn FnMut(&LanguageModelRequest, &[Result<LanguageModelCompletionEvent, String>])>,
@@ -489,7 +487,6 @@ impl Thread {
             feedback: None,
             retry_state: None,
             message_feedback: HashMap::default(),
-            last_auto_capture_at: None,
             last_error_context: None,
             last_received_chunk_at: None,
             request_callback: None,
@@ -614,7 +611,6 @@ impl Thread {
             tool_use_limit_reached: serialized.tool_use_limit_reached,
             feedback: None,
             message_feedback: HashMap::default(),
-            last_auto_capture_at: None,
             last_error_context: None,
             last_received_chunk_at: None,
             request_callback: None,
@@ -1033,8 +1029,6 @@ impl Thread {
             });
         }
 
-        self.auto_capture_telemetry(cx);
-
         message_id
     }
 
@@ -1906,7 +1900,6 @@ impl Thread {
                         cx.emit(ThreadEvent::StreamedCompletion);
                         cx.notify();
 
-                        thread.auto_capture_telemetry(cx);
                         Ok(())
                     })??;
 
@@ -2081,8 +2074,6 @@ impl Thread {
                         request_callback(request, response_events);
                     }
 
-                    thread.auto_capture_telemetry(cx);
-
                     if let Ok(initial_usage) = initial_token_usage {
                         let usage = thread.cumulative_token_usage - initial_usage;
 
@@ -2536,7 +2527,6 @@ impl Thread {
         model: Arc<dyn LanguageModel>,
         cx: &mut Context<Self>,
     ) -> Vec<PendingToolUse> {
-        self.auto_capture_telemetry(cx);
         let request =
             Arc::new(self.to_completion_request(model.clone(), CompletionIntent::ToolResults, cx));
         let pending_tool_uses = self
@@ -2745,7 +2735,6 @@ impl Thread {
                 if !canceled {
                     self.send_to_model(model.clone(), CompletionIntent::ToolResults, window, cx);
                 }
-                self.auto_capture_telemetry(cx);
             }
         }
 
@@ -3147,50 +3136,6 @@ impl Thread {
         &self.project
     }
 
-    pub fn auto_capture_telemetry(&mut self, cx: &mut Context<Self>) {
-        if !cx.has_flag::<feature_flags::ThreadAutoCaptureFeatureFlag>() {
-            return;
-        }
-
-        let now = Instant::now();
-        if let Some(last) = self.last_auto_capture_at {
-            if now.duration_since(last).as_secs() < 10 {
-                return;
-            }
-        }
-
-        self.last_auto_capture_at = Some(now);
-
-        let thread_id = self.id().clone();
-        let github_login = self
-            .project
-            .read(cx)
-            .user_store()
-            .read(cx)
-            .current_user()
-            .map(|user| user.github_login.clone());
-        let client = self.project.read(cx).client();
-        let serialize_task = self.serialize(cx);
-
-        cx.background_executor()
-            .spawn(async move {
-                if let Ok(serialized_thread) = serialize_task.await {
-                    if let Ok(thread_data) = serde_json::to_value(serialized_thread) {
-                        telemetry::event!(
-                            "Agent Thread Auto-Captured",
-                            thread_id = thread_id.to_string(),
-                            thread_data = thread_data,
-                            auto_capture_reason = "tracked_user",
-                            github_login = github_login
-                        );
-
-                        client.telemetry().flush_events().await;
-                    }
-                }
-            })
-            .detach();
-    }
-
     pub fn cumulative_token_usage(&self) -> TokenUsage {
         self.cumulative_token_usage
     }
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index ef357adf35..f87932bfaf 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -77,14 +77,6 @@ impl FeatureFlag for NotebookFeatureFlag {
     const NAME: &'static str = "notebooks";
 }
 
-pub struct ThreadAutoCaptureFeatureFlag {}
-impl FeatureFlag for ThreadAutoCaptureFeatureFlag {
-    const NAME: &'static str = "thread-auto-capture";
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
-}
 pub struct PanicFeatureFlag;
 
 impl FeatureFlag for PanicFeatureFlag {

From 2fb89c9b3eb0f76f57f179a3cc4f0b37f2007b42 Mon Sep 17 00:00:00 2001
From: Vincent Durewski <vincent.durewski@gmail.com>
Date: Tue, 19 Aug 2025 13:08:10 +0200
Subject: [PATCH 159/823] chore: Default settings: Comments: dock option
 (#36476)

Minor tweak in the wording of the comments for the default settings
regarding the `dock` option of the panels, in order to make them
congruent across all panels.

Release Notes:

- N/A
---
 assets/settings/default.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 72e4dcbf4f..c290baf003 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -717,7 +717,7 @@
     // Can be 'never', 'always', or 'when_in_call',
     // or a boolean (interpreted as 'never'/'always').
     "button": "when_in_call",
-    // Where to the chat panel. Can be 'left' or 'right'.
+    // Where to dock the chat panel. Can be 'left' or 'right'.
     "dock": "right",
     // Default width of the chat panel.
     "default_width": 240
@@ -725,7 +725,7 @@
   "git_panel": {
     // Whether to show the git panel button in the status bar.
     "button": true,
-    // Where to show the git panel. Can be 'left' or 'right'.
+    // Where to dock the git panel. Can be 'left' or 'right'.
     "dock": "left",
     // Default width of the git panel.
     "default_width": 360,

From 9e8ec72bd5c697edc6b61f4e18542afc4e343a1b Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 19 Aug 2025 14:32:26 +0200
Subject: [PATCH 160/823] Revert "project: Handle `textDocument/didSave` and
 `textDocument/didChange` (un)registration and usage correctly (#36441)"
 (#36480)

This reverts commit c5991e74bb6f305c299684dc7ac3f6ee9055efcd.

This PR broke rust-analyzer's check on save function, so reverting for
now

Release Notes:

- N/A
---
 crates/lsp/src/lsp.rs           |  2 +-
 crates/project/src/lsp_store.rs | 72 ++++++++-------------------------
 2 files changed, 17 insertions(+), 57 deletions(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index ce9e2fe229..366005a4ab 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -827,7 +827,7 @@ impl LanguageServer {
                     }),
                     synchronization: Some(TextDocumentSyncClientCapabilities {
                         did_save: Some(true),
-                        dynamic_registration: Some(true),
+                        dynamic_registration: Some(false),
                         ..TextDocumentSyncClientCapabilities::default()
                     }),
                     code_lens: Some(CodeLensClientCapabilities {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 1bc6770d4e..9410eea742 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11820,28 +11820,8 @@ impl LspStore {
                         .transpose()?
                     {
                         server.update_capabilities(|capabilities| {
-                            let mut sync_options =
-                                Self::take_text_document_sync_options(capabilities);
-                            sync_options.change = Some(sync_kind);
                             capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/didSave" => {
-                    if let Some(save_options) = reg
-                        .register_options
-                        .and_then(|opts| opts.get("includeText").cloned())
-                        .map(serde_json::from_value::<lsp::TextDocumentSyncSaveOptions>)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            let mut sync_options =
-                                Self::take_text_document_sync_options(capabilities);
-                            sync_options.save = Some(save_options);
-                            capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                                Some(lsp::TextDocumentSyncCapability::Kind(sync_kind));
                         });
                         notify_server_capabilities_updated(&server, cx);
                     }
@@ -11993,19 +11973,7 @@ impl LspStore {
                 }
                 "textDocument/didChange" => {
                     server.update_capabilities(|capabilities| {
-                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
-                        sync_options.change = None;
-                        capabilities.text_document_sync =
-                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/didSave" => {
-                    server.update_capabilities(|capabilities| {
-                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
-                        sync_options.save = None;
-                        capabilities.text_document_sync =
-                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                        capabilities.text_document_sync = None;
                     });
                     notify_server_capabilities_updated(&server, cx);
                 }
@@ -12033,20 +12001,6 @@ impl LspStore {
 
         Ok(())
     }
-
-    fn take_text_document_sync_options(
-        capabilities: &mut lsp::ServerCapabilities,
-    ) -> lsp::TextDocumentSyncOptions {
-        match capabilities.text_document_sync.take() {
-            Some(lsp::TextDocumentSyncCapability::Options(sync_options)) => sync_options,
-            Some(lsp::TextDocumentSyncCapability::Kind(sync_kind)) => {
-                let mut sync_options = lsp::TextDocumentSyncOptions::default();
-                sync_options.change = Some(sync_kind);
-                sync_options
-            }
-            None => lsp::TextDocumentSyncOptions::default(),
-        }
-    }
 }
 
 // Registration with empty capabilities should be ignored.
@@ -13149,18 +13103,24 @@ async fn populate_labels_for_symbols(
 
 fn include_text(server: &lsp::LanguageServer) -> Option<bool> {
     match server.capabilities().text_document_sync.as_ref()? {
-        lsp::TextDocumentSyncCapability::Options(opts) => match opts.save.as_ref()? {
-            // Server wants didSave but didn't specify includeText.
-            lsp::TextDocumentSyncSaveOptions::Supported(true) => Some(false),
-            // Server doesn't want didSave at all.
-            lsp::TextDocumentSyncSaveOptions::Supported(false) => None,
-            // Server provided SaveOptions.
+        lsp::TextDocumentSyncCapability::Kind(kind) => match *kind {
+            lsp::TextDocumentSyncKind::NONE => None,
+            lsp::TextDocumentSyncKind::FULL => Some(true),
+            lsp::TextDocumentSyncKind::INCREMENTAL => Some(false),
+            _ => None,
+        },
+        lsp::TextDocumentSyncCapability::Options(options) => match options.save.as_ref()? {
+            lsp::TextDocumentSyncSaveOptions::Supported(supported) => {
+                if *supported {
+                    Some(true)
+                } else {
+                    None
+                }
+            }
             lsp::TextDocumentSyncSaveOptions::SaveOptions(save_options) => {
                 Some(save_options.include_text.unwrap_or(false))
             }
         },
-        // We do not have any save info. Kind affects didChange only.
-        lsp::TextDocumentSyncCapability::Kind(_) => None,
     }
 }
 

From 8f567383e4bef1914c2e349fc8e984cfa5aae397 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 19 Aug 2025 15:27:24 +0200
Subject: [PATCH 161/823] Auto-fix clippy::collapsible_if violations (#36428)

Release Notes:

- N/A
---
 Cargo.toml                                    |   1 +
 crates/acp_thread/src/acp_thread.rs           |  25 +-
 crates/action_log/src/action_log.rs           |   8 +-
 .../src/activity_indicator.rs                 |  65 +-
 crates/agent/src/context.rs                   |  34 +-
 crates/agent/src/context_store.rs             |   8 +-
 crates/agent/src/thread.rs                    |  49 +-
 crates/agent/src/thread_store.rs              |  58 +-
 crates/agent/src/tool_use.rs                  |  20 +-
 crates/agent2/src/thread.rs                   |  12 +-
 crates/agent2/src/tools/edit_file_tool.rs     |  14 +-
 crates/agent2/src/tools/grep_tool.rs          |  10 +-
 crates/agent_servers/src/claude.rs            |  16 +-
 crates/agent_settings/src/agent_settings.rs   |  16 +-
 crates/agent_ui/src/acp/thread_view.rs        | 158 ++--
 crates/agent_ui/src/active_thread.rs          | 124 ++-
 .../configure_context_server_modal.rs         |  32 +-
 .../src/agent_configuration/tool_picker.rs    |   8 +-
 crates/agent_ui/src/agent_diff.rs             |  62 +-
 crates/agent_ui/src/agent_panel.rs            |  13 +-
 crates/agent_ui/src/buffer_codegen.rs         |  66 +-
 crates/agent_ui/src/context_strip.rs          |   8 +-
 crates/agent_ui/src/inline_assistant.rs       | 109 ++-
 .../agent_ui/src/terminal_inline_assistant.rs |  55 +-
 crates/agent_ui/src/text_thread_editor.rs     |  39 +-
 crates/agent_ui/src/thread_history.rs         |   9 +-
 .../src/assistant_context.rs                  | 122 ++-
 crates/assistant_context/src/context_store.rs |  47 +-
 .../src/context_server_command.rs             |   8 +-
 .../src/delta_command.rs                      |  69 +-
 .../src/diagnostics_command.rs                |   8 +-
 .../src/tab_command.rs                        |  16 +-
 crates/assistant_tool/src/tool_schema.rs      |  38 +-
 crates/assistant_tools/src/edit_agent.rs      |  43 +-
 .../assistant_tools/src/edit_agent/evals.rs   |  16 +-
 crates/assistant_tools/src/edit_file_tool.rs  |  16 +-
 crates/assistant_tools/src/grep_tool.rs       |  10 +-
 crates/assistant_tools/src/schema.rs          |  11 +-
 crates/auto_update_helper/src/dialog.rs       |  10 +-
 crates/breadcrumbs/src/breadcrumbs.rs         |  11 +-
 crates/buffer_diff/src/buffer_diff.rs         |  29 +-
 crates/call/src/call_impl/room.rs             |  62 +-
 crates/channel/src/channel_buffer.rs          |  11 +-
 crates/channel/src/channel_chat.rs            | 119 ++-
 crates/channel/src/channel_store.rs           |  78 +-
 crates/cli/src/main.rs                        |   9 +-
 crates/client/src/client.rs                   |  29 +-
 crates/client/src/user.rs                     |   8 +-
 crates/collab/src/api/events.rs               | 160 ++--
 crates/collab/src/api/extensions.rs           |  14 +-
 crates/collab/src/auth.rs                     |  40 +-
 crates/collab/src/db/queries/extensions.rs    |  16 +-
 crates/collab/src/db/queries/projects.rs      |   8 +-
 crates/collab/src/rpc.rs                      |  93 +-
 .../random_project_collaboration_tests.rs     |   5 +-
 .../src/tests/randomized_test_helpers.rs      |  30 +-
 crates/collab/src/user_backfiller.rs          |  22 +-
 crates/collab_ui/src/channel_view.rs          |  80 +-
 crates/collab_ui/src/chat_panel.rs            |  81 +-
 .../src/chat_panel/message_editor.rs          |  65 +-
 crates/collab_ui/src/collab_panel.rs          | 187 ++--
 crates/collab_ui/src/notification_panel.rs    |  76 +-
 crates/context_server/src/client.rs           |   8 +-
 crates/copilot/src/copilot.rs                 | 121 ++-
 crates/dap_adapters/src/javascript.rs         |   8 +-
 crates/debugger_tools/src/dap_log.rs          |  10 +-
 crates/debugger_ui/src/debugger_panel.rs      |  13 +-
 crates/debugger_ui/src/new_process_modal.rs   |   8 +-
 .../src/session/running/breakpoint_list.rs    |  40 +-
 .../src/session/running/console.rs            |  17 +-
 crates/diagnostics/src/diagnostics.rs         |  38 +-
 crates/editor/src/display_map.rs              |  36 +-
 crates/editor/src/display_map/block_map.rs    | 148 ++--
 crates/editor/src/display_map/fold_map.rs     |  60 +-
 crates/editor/src/display_map/inlay_map.rs    |  10 +-
 crates/editor/src/display_map/wrap_map.rs     |  94 +-
 crates/editor/src/editor.rs                   | 834 +++++++++---------
 crates/editor/src/element.rs                  | 261 +++---
 crates/editor/src/git/blame.rs                |  31 +-
 crates/editor/src/hover_links.rs              |  41 +-
 crates/editor/src/hover_popover.rs            | 139 ++-
 crates/editor/src/indent_guides.rs            |  10 +-
 crates/editor/src/inlay_hint_cache.rs         | 121 ++-
 crates/editor/src/items.rs                    |  61 +-
 crates/editor/src/jsx_tag_auto_close.rs       |  17 +-
 crates/editor/src/lsp_ext.rs                  |  19 +-
 crates/editor/src/movement.rs                 |  50 +-
 crates/editor/src/rust_analyzer_ext.rs        |  10 +-
 crates/editor/src/scroll.rs                   |  24 +-
 crates/editor/src/scroll/autoscroll.rs        |  12 +-
 crates/editor/src/test.rs                     |   8 +-
 crates/eval/src/eval.rs                       |   5 +-
 crates/eval/src/explorer.rs                   |  28 +-
 crates/eval/src/instance.rs                   |   5 +-
 crates/extension/src/extension.rs             |  17 +-
 crates/extension_host/src/extension_host.rs   |  71 +-
 crates/extension_host/src/wasm_host.rs        |  17 +-
 crates/extensions_ui/src/extensions_ui.rs     |  15 +-
 crates/file_finder/src/file_finder.rs         | 399 ++++-----
 crates/file_finder/src/open_path_prompt.rs    |  20 +-
 crates/fs/src/fs.rs                           |  82 +-
 crates/fs/src/mac_watcher.rs                  |   5 +-
 crates/fsevent/src/fsevent.rs                 |  61 +-
 crates/git/src/blame.rs                       |  12 +-
 crates/git/src/repository.rs                  |  16 +-
 .../src/git_hosting_providers.rs              |   8 +-
 crates/git_ui/src/commit_modal.rs             |  19 +-
 crates/git_ui/src/git_panel.rs                |  42 +-
 crates/git_ui/src/project_diff.rs             |   8 +-
 crates/go_to_line/src/cursor_position.rs      |  16 +-
 crates/go_to_line/src/go_to_line.rs           |  10 +-
 crates/google_ai/src/google_ai.rs             |   5 +-
 crates/gpui/build.rs                          |  15 +-
 crates/gpui/examples/input.rs                 |   8 +-
 crates/gpui/src/app.rs                        |  42 +-
 crates/gpui/src/app/context.rs                |  20 +-
 crates/gpui/src/element.rs                    |   6 +-
 crates/gpui/src/elements/div.rs               | 229 +++--
 crates/gpui/src/elements/image_cache.rs       |   8 +-
 crates/gpui/src/elements/img.rs               |  13 +-
 crates/gpui/src/elements/list.rs              |  74 +-
 crates/gpui/src/elements/text.rs              |  32 +-
 crates/gpui/src/keymap/binding.rs             |   8 +-
 .../gpui/src/platform/blade/blade_renderer.rs |  30 +-
 .../gpui/src/platform/linux/wayland/client.rs |  52 +-
 .../gpui/src/platform/linux/wayland/cursor.rs |   9 +-
 .../gpui/src/platform/linux/wayland/window.rs |  27 +-
 crates/gpui/src/platform/linux/x11/client.rs  |  29 +-
 .../gpui/src/platform/linux/x11/clipboard.rs  |  38 +-
 crates/gpui/src/platform/linux/x11/window.rs  |  49 +-
 crates/gpui/src/platform/mac/open_type.rs     |  16 +-
 crates/gpui/src/platform/mac/platform.rs      |  27 +-
 crates/gpui/src/platform/mac/window.rs        |  41 +-
 crates/gpui/src/platform/test/dispatcher.rs   |  10 +-
 crates/gpui/src/platform/test/platform.rs     |   8 +-
 crates/gpui/src/platform/windows/events.rs    |  75 +-
 crates/gpui/src/platform/windows/platform.rs  |  16 +-
 crates/gpui/src/text_system.rs                |  43 +-
 crates/gpui/src/text_system/line.rs           |  24 +-
 crates/gpui/src/text_system/line_layout.rs    |   8 +-
 crates/gpui/src/view.rs                       |  29 +-
 crates/gpui/src/window.rs                     |  68 +-
 .../src/derive_inspector_reflection.rs        |  18 +-
 crates/gpui_macros/src/test.rs                | 116 +--
 crates/html_to_markdown/src/markdown.rs       |  17 +-
 crates/http_client/src/github.rs              |   8 +-
 crates/journal/src/journal.rs                 |  32 +-
 crates/language/src/buffer.rs                 | 215 +++--
 crates/language/src/language.rs               |  33 +-
 crates/language/src/syntax_map.rs             | 104 +--
 crates/language/src/text_diff.rs              |  10 +-
 crates/language_model/src/request.rs          |  41 +-
 .../language_models/src/provider/anthropic.rs |  10 +-
 .../language_models/src/provider/bedrock.rs   |  18 +-
 crates/language_models/src/provider/cloud.rs  |  52 +-
 .../src/active_buffer_language.rs             |   8 +-
 crates/language_tools/src/lsp_log.rs          | 116 ++-
 crates/language_tools/src/syntax_tree_view.rs |  23 +-
 crates/languages/src/go.rs                    |  24 +-
 crates/languages/src/lib.rs                   |   7 +-
 crates/languages/src/python.rs                |  96 +-
 crates/languages/src/rust.rs                  |   8 +-
 crates/languages/src/typescript.rs            |   8 +-
 crates/livekit_client/src/test.rs             |  16 +-
 crates/markdown/src/markdown.rs               |  71 +-
 .../markdown_preview/src/markdown_parser.rs   |  21 +-
 .../src/markdown_preview_view.rs              |  52 +-
 .../src/migrations/m_2025_06_16/settings.rs   |  28 +-
 .../src/migrations/m_2025_06_25/settings.rs   |  16 +-
 .../src/migrations/m_2025_06_27/settings.rs   |  25 +-
 crates/multi_buffer/src/anchor.rs             | 113 ++-
 crates/multi_buffer/src/multi_buffer.rs       | 475 +++++-----
 crates/multi_buffer/src/multi_buffer_tests.rs |  32 +-
 .../notifications/src/notification_store.rs   |  51 +-
 crates/open_router/src/open_router.rs         |   8 +-
 crates/outline_panel/src/outline_panel.rs     | 238 +++--
 crates/prettier/src/prettier.rs               |  38 +-
 crates/project/src/buffer_store.rs            |  32 +-
 .../project/src/debugger/breakpoint_store.rs  |  11 +-
 crates/project/src/debugger/memory.rs         |  13 +-
 crates/project/src/git_store.rs               | 152 ++--
 crates/project/src/git_store/git_traversal.rs |  10 +-
 crates/project/src/lsp_command.rs             |  26 +-
 crates/project/src/lsp_store.rs               | 392 ++++----
 crates/project/src/manifest_tree/path_trie.rs |  10 +-
 crates/project/src/prettier_store.rs          |  21 +-
 crates/project/src/project.rs                 | 147 ++-
 crates/project/src/search.rs                  |  16 +-
 crates/project/src/search_history.rs          |  23 +-
 crates/project/src/terminals.rs               |  52 +-
 crates/project_panel/src/project_panel.rs     | 497 +++++------
 crates/prompt_store/src/prompts.rs            |  19 +-
 crates/proto/src/error.rs                     |   8 +-
 crates/recent_projects/src/remote_servers.rs  |   8 +-
 .../src/derive_refineable.rs                  |  12 +-
 crates/remote/src/ssh_session.rs              |  41 +-
 crates/remote_server/src/unix.rs              |  14 +-
 crates/repl/src/kernels/native_kernel.rs      |  24 +-
 crates/repl/src/outputs.rs                    |  39 +-
 crates/repl/src/repl_editor.rs                |   8 +-
 crates/repl/src/repl_sessions_ui.rs           |  25 +-
 crates/repl/src/repl_store.rs                 |   8 +-
 crates/reqwest_client/src/reqwest_client.rs   |  11 +-
 crates/rich_text/src/rich_text.rs             |  21 +-
 crates/rope/src/rope.rs                       |  41 +-
 crates/rpc/src/notification.rs                |   8 +-
 crates/rpc/src/peer.rs                        |   8 +-
 crates/rules_library/src/rules_library.rs     |  34 +-
 crates/search/src/buffer_search.rs            | 180 ++--
 crates/search/src/project_search.rs           |  45 +-
 crates/semantic_index/src/embedding_index.rs  |  10 +-
 crates/semantic_index/src/project_index.rs    |   8 +-
 crates/semantic_index/src/semantic_index.rs   |  15 +-
 crates/semantic_index/src/summary_index.rs    |  18 +-
 crates/session/src/session.rs                 |  10 +-
 crates/settings/src/keymap_file.rs            |  48 +-
 crates/settings/src/settings_file.rs          |  27 +-
 crates/settings/src/settings_json.rs          |  17 +-
 crates/settings/src/settings_store.rs         | 109 ++-
 crates/snippets_ui/src/snippets_ui.rs         |  13 +-
 crates/sqlez/src/connection.rs                |  63 +-
 crates/sum_tree/src/cursor.rs                 |   8 +-
 crates/sum_tree/src/sum_tree.rs               |  30 +-
 crates/svg_preview/src/svg_preview_view.rs    | 160 ++--
 crates/task/src/debug_format.rs               |   9 +-
 crates/task/src/vscode_debug_format.rs        |  12 +-
 crates/tasks_ui/src/tasks_ui.rs               |  17 +-
 crates/terminal/src/terminal.rs               |  36 +-
 crates/terminal/src/terminal_settings.rs      |   8 +-
 crates/terminal_view/src/terminal_element.rs  |  29 +-
 crates/terminal_view/src/terminal_panel.rs    |  23 +-
 crates/terminal_view/src/terminal_view.rs     |  80 +-
 crates/text/src/text.rs                       |  26 +-
 crates/theme/src/fallback_themes.rs           |   8 +-
 crates/title_bar/src/application_menu.rs      |  41 +-
 crates/title_bar/src/title_bar.rs             |  10 +-
 .../src/active_toolchain.rs                   |  47 +-
 .../src/toolchain_selector.rs                 |   9 +-
 .../src/components/label/highlighted_label.rs |  12 +-
 crates/ui/src/components/popover_menu.rs      |  32 +-
 crates/ui/src/components/right_click_menu.rs  |   9 +-
 crates/util/src/fs.rs                         |  27 +-
 crates/util/src/schemars.rs                   |  13 +-
 crates/util/src/util.rs                       |   8 +-
 crates/vim/src/command.rs                     |  55 +-
 crates/vim/src/digraph.rs                     |  16 +-
 crates/vim/src/motion.rs                      |  24 +-
 crates/vim/src/normal/delete.rs               |   8 +-
 crates/vim/src/normal/mark.rs                 |   6 +-
 crates/vim/src/normal/repeat.rs               |  24 +-
 crates/vim/src/object.rs                      |  56 +-
 crates/vim/src/state.rs                       |  71 +-
 crates/vim/src/surrounds.rs                   |  22 +-
 crates/vim/src/test/neovim_connection.rs      |   9 +-
 crates/vim/src/vim.rs                         |  54 +-
 crates/workspace/src/dock.rs                  |  41 +-
 crates/workspace/src/history_manager.rs       |  10 +-
 crates/workspace/src/item.rs                  |  26 +-
 crates/workspace/src/modal_layer.rs           |   8 +-
 crates/workspace/src/pane.rs                  | 133 ++-
 crates/workspace/src/pane_group.rs            |  55 +-
 crates/workspace/src/workspace.rs             | 432 +++++----
 crates/workspace/src/workspace_settings.rs    |  28 +-
 crates/worktree/src/worktree.rs               | 126 ++-
 crates/zed/build.rs                           |  26 +-
 crates/zed/src/main.rs                        | 113 ++-
 crates/zed/src/reliability.rs                 |  43 +-
 crates/zed/src/zed.rs                         |  73 +-
 crates/zed/src/zed/component_preview.rs       |  93 +-
 .../zed/src/zed/edit_prediction_registry.rs   |  42 +-
 crates/zed/src/zed/mac_only_instance.rs       |  23 +-
 crates/zed/src/zed/open_listener.rs           |  63 +-
 crates/zeta/src/rate_completion_modal.rs      |  12 +-
 crates/zeta/src/zeta.rs                       |   9 +-
 crates/zlog/src/sink.rs                       |   8 +-
 crates/zlog/src/zlog.rs                       |  30 +-
 extensions/glsl/src/glsl.rs                   |   8 +-
 extensions/ruff/src/ruff.rs                   |  14 +-
 extensions/snippets/src/snippets.rs           |   8 +-
 .../test-extension/src/test_extension.rs      |   8 +-
 extensions/toml/src/toml.rs                   |  14 +-
 281 files changed, 6628 insertions(+), 7089 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f326090b51..89aadbcba0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -830,6 +830,7 @@ module_inception = { level = "deny" }
 question_mark = { level = "deny" }
 redundant_closure = { level = "deny" }
 declare_interior_mutable_const = { level = "deny" }
+collapsible_if = { level = "warn"}
 needless_borrow = { level = "warn"}
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index b86696d437..227ca984d4 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -249,14 +249,13 @@ impl ToolCall {
         }
 
         if let Some(raw_output) = raw_output {
-            if self.content.is_empty() {
-                if let Some(markdown) = markdown_for_raw_output(&raw_output, &language_registry, cx)
-                {
-                    self.content
-                        .push(ToolCallContent::ContentBlock(ContentBlock::Markdown {
-                            markdown,
-                        }));
-                }
+            if self.content.is_empty()
+                && let Some(markdown) = markdown_for_raw_output(&raw_output, &language_registry, cx)
+            {
+                self.content
+                    .push(ToolCallContent::ContentBlock(ContentBlock::Markdown {
+                        markdown,
+                    }));
             }
             self.raw_output = Some(raw_output);
         }
@@ -430,11 +429,11 @@ impl ContentBlock {
         language_registry: &Arc<LanguageRegistry>,
         cx: &mut App,
     ) {
-        if matches!(self, ContentBlock::Empty) {
-            if let acp::ContentBlock::ResourceLink(resource_link) = block {
-                *self = ContentBlock::ResourceLink { resource_link };
-                return;
-            }
+        if matches!(self, ContentBlock::Empty)
+            && let acp::ContentBlock::ResourceLink(resource_link) = block
+        {
+            *self = ContentBlock::ResourceLink { resource_link };
+            return;
         }
 
         let new_content = self.block_string_contents(block);
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index 20ba9586ea..ceced1bcdd 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -614,10 +614,10 @@ impl ActionLog {
                         false
                     }
                 });
-                if tracked_buffer.unreviewed_edits.is_empty() {
-                    if let TrackedBufferStatus::Created { .. } = &mut tracked_buffer.status {
-                        tracked_buffer.status = TrackedBufferStatus::Modified;
-                    }
+                if tracked_buffer.unreviewed_edits.is_empty()
+                    && let TrackedBufferStatus::Created { .. } = &mut tracked_buffer.status
+                {
+                    tracked_buffer.status = TrackedBufferStatus::Modified;
                 }
                 tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
             }
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 090252d338..8faf74736a 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -458,26 +458,24 @@ impl ActivityIndicator {
             .map(|r| r.read(cx))
             .and_then(Repository::current_job);
         // Show any long-running git command
-        if let Some(job_info) = current_job {
-            if Instant::now() - job_info.start >= GIT_OPERATION_DELAY {
-                return Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::Small)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            )
-                            .into_any_element(),
-                    ),
-                    message: job_info.message.into(),
-                    on_click: None,
-                    tooltip_message: None,
-                });
-            }
+        if let Some(job_info) = current_job
+            && Instant::now() - job_info.start >= GIT_OPERATION_DELAY
+        {
+            return Some(Content {
+                icon: Some(
+                    Icon::new(IconName::ArrowCircle)
+                        .size(IconSize::Small)
+                        .with_animation(
+                            "arrow-circle",
+                            Animation::new(Duration::from_secs(2)).repeat(),
+                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                        )
+                        .into_any_element(),
+                ),
+                message: job_info.message.into(),
+                on_click: None,
+                tooltip_message: None,
+            });
         }
 
         // Show any language server installation info.
@@ -740,21 +738,20 @@ impl ActivityIndicator {
 
         if let Some(extension_store) =
             ExtensionStore::try_global(cx).map(|extension_store| extension_store.read(cx))
+            && let Some(extension_id) = extension_store.outstanding_operations().keys().next()
         {
-            if let Some(extension_id) = extension_store.outstanding_operations().keys().next() {
-                return Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::Download)
-                            .size(IconSize::Small)
-                            .into_any_element(),
-                    ),
-                    message: format!("Updating {extension_id} extension…"),
-                    on_click: Some(Arc::new(|this, window, cx| {
-                        this.dismiss_error_message(&DismissErrorMessage, window, cx)
-                    })),
-                    tooltip_message: None,
-                });
-            }
+            return Some(Content {
+                icon: Some(
+                    Icon::new(IconName::Download)
+                        .size(IconSize::Small)
+                        .into_any_element(),
+                ),
+                message: format!("Updating {extension_id} extension…"),
+                on_click: Some(Arc::new(|this, window, cx| {
+                    this.dismiss_error_message(&DismissErrorMessage, window, cx)
+                })),
+                tooltip_message: None,
+            });
         }
 
         None
diff --git a/crates/agent/src/context.rs b/crates/agent/src/context.rs
index 8cdb87ef8d..9bb8fc0eae 100644
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -201,24 +201,24 @@ impl FileContextHandle {
                         parse_status.changed().await.log_err();
                     }
 
-                    if let Ok(snapshot) = buffer.read_with(cx, |buffer, _| buffer.snapshot()) {
-                        if let Some(outline) = snapshot.outline(None) {
-                            let items = outline
-                                .items
-                                .into_iter()
-                                .map(|item| item.to_point(&snapshot));
+                    if let Ok(snapshot) = buffer.read_with(cx, |buffer, _| buffer.snapshot())
+                        && let Some(outline) = snapshot.outline(None)
+                    {
+                        let items = outline
+                            .items
+                            .into_iter()
+                            .map(|item| item.to_point(&snapshot));
 
-                            if let Ok(outline_text) =
-                                outline::render_outline(items, None, 0, usize::MAX).await
-                            {
-                                let context = AgentContext::File(FileContext {
-                                    handle: self,
-                                    full_path,
-                                    text: outline_text.into(),
-                                    is_outline: true,
-                                });
-                                return Some((context, vec![buffer]));
-                            }
+                        if let Ok(outline_text) =
+                            outline::render_outline(items, None, 0, usize::MAX).await
+                        {
+                            let context = AgentContext::File(FileContext {
+                                handle: self,
+                                full_path,
+                                text: outline_text.into(),
+                                is_outline: true,
+                            });
+                            return Some((context, vec![buffer]));
                         }
                     }
                 }
diff --git a/crates/agent/src/context_store.rs b/crates/agent/src/context_store.rs
index 60ba5527dc..b531852a18 100644
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -338,11 +338,9 @@ impl ContextStore {
             image_task,
             context_id: self.next_context_id.post_inc(),
         });
-        if self.has_context(&context) {
-            if remove_if_exists {
-                self.remove_context(&context, cx);
-                return None;
-            }
+        if self.has_context(&context) && remove_if_exists {
+            self.remove_context(&context, cx);
+            return None;
         }
 
         self.insert_context(context.clone(), cx);
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index a3f903a60d..5c4b2b8ebf 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1967,11 +1967,9 @@ impl Thread {
 
                                                 if let Some(prev_message) =
                                                     thread.messages.get(ix - 1)
-                                                {
-                                                    if prev_message.role == Role::Assistant {
+                                                    && prev_message.role == Role::Assistant {
                                                         break;
                                                     }
-                                                }
                                             }
                                         }
 
@@ -2476,13 +2474,13 @@ impl Thread {
                 .ok()?;
 
             // Save thread so its summary can be reused later
-            if let Some(thread) = thread.upgrade() {
-                if let Ok(Ok(save_task)) = cx.update(|cx| {
+            if let Some(thread) = thread.upgrade()
+                && let Ok(Ok(save_task)) = cx.update(|cx| {
                     thread_store
                         .update(cx, |thread_store, cx| thread_store.save_thread(&thread, cx))
-                }) {
-                    save_task.await.log_err();
-                }
+                })
+            {
+                save_task.await.log_err();
             }
 
             Some(())
@@ -2730,12 +2728,11 @@ impl Thread {
         window: Option<AnyWindowHandle>,
         cx: &mut Context<Self>,
     ) {
-        if self.all_tools_finished() {
-            if let Some(ConfiguredModel { model, .. }) = self.configured_model.as_ref() {
-                if !canceled {
-                    self.send_to_model(model.clone(), CompletionIntent::ToolResults, window, cx);
-                }
-            }
+        if self.all_tools_finished()
+            && let Some(ConfiguredModel { model, .. }) = self.configured_model.as_ref()
+            && !canceled
+        {
+            self.send_to_model(model.clone(), CompletionIntent::ToolResults, window, cx);
         }
 
         cx.emit(ThreadEvent::ToolFinished {
@@ -2922,11 +2919,11 @@ impl Thread {
                 let buffer_store = project.read(app_cx).buffer_store();
                 for buffer_handle in buffer_store.read(app_cx).buffers() {
                     let buffer = buffer_handle.read(app_cx);
-                    if buffer.is_dirty() {
-                        if let Some(file) = buffer.file() {
-                            let path = file.path().to_string_lossy().to_string();
-                            unsaved_buffers.push(path);
-                        }
+                    if buffer.is_dirty()
+                        && let Some(file) = buffer.file()
+                    {
+                        let path = file.path().to_string_lossy().to_string();
+                        unsaved_buffers.push(path);
                     }
                 }
             })
@@ -3178,13 +3175,13 @@ impl Thread {
             .model
             .max_token_count_for_mode(self.completion_mode().into());
 
-        if let Some(exceeded_error) = &self.exceeded_window_error {
-            if model.model.id() == exceeded_error.model_id {
-                return Some(TotalTokenUsage {
-                    total: exceeded_error.token_count,
-                    max,
-                });
-            }
+        if let Some(exceeded_error) = &self.exceeded_window_error
+            && model.model.id() == exceeded_error.model_id
+        {
+            return Some(TotalTokenUsage {
+                total: exceeded_error.token_count,
+                max,
+            });
         }
 
         let total = self
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index 12c94a522d..96bf639306 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -581,33 +581,32 @@ impl ThreadStore {
                 return;
             };
 
-            if protocol.capable(context_server::protocol::ServerCapability::Tools) {
-                if let Some(response) = protocol
+            if protocol.capable(context_server::protocol::ServerCapability::Tools)
+                && let Some(response) = protocol
                     .request::<context_server::types::requests::ListTools>(())
                     .await
                     .log_err()
-                {
-                    let tool_ids = tool_working_set
-                        .update(cx, |tool_working_set, cx| {
-                            tool_working_set.extend(
-                                response.tools.into_iter().map(|tool| {
-                                    Arc::new(ContextServerTool::new(
-                                        context_server_store.clone(),
-                                        server.id(),
-                                        tool,
-                                    )) as Arc<dyn Tool>
-                                }),
-                                cx,
-                            )
-                        })
-                        .log_err();
+            {
+                let tool_ids = tool_working_set
+                    .update(cx, |tool_working_set, cx| {
+                        tool_working_set.extend(
+                            response.tools.into_iter().map(|tool| {
+                                Arc::new(ContextServerTool::new(
+                                    context_server_store.clone(),
+                                    server.id(),
+                                    tool,
+                                )) as Arc<dyn Tool>
+                            }),
+                            cx,
+                        )
+                    })
+                    .log_err();
 
-                    if let Some(tool_ids) = tool_ids {
-                        this.update(cx, |this, _| {
-                            this.context_server_tool_ids.insert(server_id, tool_ids);
-                        })
-                        .log_err();
-                    }
+                if let Some(tool_ids) = tool_ids {
+                    this.update(cx, |this, _| {
+                        this.context_server_tool_ids.insert(server_id, tool_ids);
+                    })
+                    .log_err();
                 }
             }
         })
@@ -697,13 +696,14 @@ impl SerializedThreadV0_1_0 {
         let mut messages: Vec<SerializedMessage> = Vec::with_capacity(self.0.messages.len());
 
         for message in self.0.messages {
-            if message.role == Role::User && !message.tool_results.is_empty() {
-                if let Some(last_message) = messages.last_mut() {
-                    debug_assert!(last_message.role == Role::Assistant);
+            if message.role == Role::User
+                && !message.tool_results.is_empty()
+                && let Some(last_message) = messages.last_mut()
+            {
+                debug_assert!(last_message.role == Role::Assistant);
 
-                    last_message.tool_results = message.tool_results;
-                    continue;
-                }
+                last_message.tool_results = message.tool_results;
+                continue;
             }
 
             messages.push(message);
diff --git a/crates/agent/src/tool_use.rs b/crates/agent/src/tool_use.rs
index 74dfaf9a85..d109891bf2 100644
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -112,19 +112,13 @@ impl ToolUseState {
                                 },
                             );
 
-                            if let Some(window) = &mut window {
-                                if let Some(tool) = this.tools.read(cx).tool(tool_use, cx) {
-                                    if let Some(output) = tool_result.output.clone() {
-                                        if let Some(card) = tool.deserialize_card(
-                                            output,
-                                            project.clone(),
-                                            window,
-                                            cx,
-                                        ) {
-                                            this.tool_result_cards.insert(tool_use_id, card);
-                                        }
-                                    }
-                                }
+                            if let Some(window) = &mut window
+                                && let Some(tool) = this.tools.read(cx).tool(tool_use, cx)
+                                && let Some(output) = tool_result.output.clone()
+                                && let Some(card) =
+                                    tool.deserialize_card(output, project.clone(), window, cx)
+                            {
+                                this.tool_result_cards.insert(tool_use_id, card);
                             }
                         }
                     }
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index f0b5d2f08a..856e70ce59 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1037,12 +1037,12 @@ impl Thread {
         log::info!("Running tool {}", tool_use.name);
         Some(cx.foreground_executor().spawn(async move {
             let tool_result = tool_result.await.and_then(|output| {
-                if let LanguageModelToolResultContent::Image(_) = &output.llm_output {
-                    if !supports_images {
-                        return Err(anyhow!(
-                            "Attempted to read an image, but this model doesn't support it.",
-                        ));
-                    }
+                if let LanguageModelToolResultContent::Image(_) = &output.llm_output
+                    && !supports_images
+                {
+                    return Err(anyhow!(
+                        "Attempted to read an image, but this model doesn't support it.",
+                    ));
                 }
                 Ok(output)
             });
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 8ebd2936a5..7687d68702 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -156,13 +156,13 @@ impl EditFileTool {
 
         // It's also possible that the global config dir is configured to be inside the project,
         // so check for that edge case too.
-        if let Ok(canonical_path) = std::fs::canonicalize(&input.path) {
-            if canonical_path.starts_with(paths::config_dir()) {
-                return event_stream.authorize(
-                    format!("{} (global settings)", input.display_description),
-                    cx,
-                );
-            }
+        if let Ok(canonical_path) = std::fs::canonicalize(&input.path)
+            && canonical_path.starts_with(paths::config_dir())
+        {
+            return event_stream.authorize(
+                format!("{} (global settings)", input.display_description),
+                cx,
+            );
         }
 
         // Check if path is inside the global config directory
diff --git a/crates/agent2/src/tools/grep_tool.rs b/crates/agent2/src/tools/grep_tool.rs
index e5d92b3c1d..6d7c05d211 100644
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -179,15 +179,14 @@ impl AgentTool for GrepTool {
                 // Check if this file should be excluded based on its worktree settings
                 if let Ok(Some(project_path)) = project.read_with(cx, |project, cx| {
                     project.find_project_path(&path, cx)
-                }) {
-                    if cx.update(|cx| {
+                })
+                    && cx.update(|cx| {
                         let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
                         worktree_settings.is_path_excluded(&project_path.path)
                             || worktree_settings.is_path_private(&project_path.path)
                     }).unwrap_or(false) {
                         continue;
                     }
-                }
 
                 while *parse_status.borrow() != ParseStatus::Idle {
                     parse_status.changed().await?;
@@ -275,12 +274,11 @@ impl AgentTool for GrepTool {
                     output.extend(snapshot.text_for_range(range));
                     output.push_str("\n```\n");
 
-                    if let Some(ancestor_range) = ancestor_range {
-                        if end_row < ancestor_range.end.row {
+                    if let Some(ancestor_range) = ancestor_range
+                        && end_row < ancestor_range.end.row {
                             let remaining_lines = ancestor_range.end.row - end_row;
                             writeln!(output, "\n{} lines remaining in ancestor node. Read the file to see all.", remaining_lines)?;
                         }
-                    }
 
                     matches_found += 1;
                 }
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 7034d6fbce..34d55f39dc 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -203,14 +203,14 @@ impl AgentConnection for ClaudeAgentConnection {
                         .await
                     }
 
-                    if let Some(status) = child.status().await.log_err() {
-                        if let Some(thread) = thread_rx.recv().await.ok() {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.emit_server_exited(status, cx);
-                                })
-                                .ok();
-                        }
+                    if let Some(status) = child.status().await.log_err()
+                        && let Some(thread) = thread_rx.recv().await.ok()
+                    {
+                        thread
+                            .update(cx, |thread, cx| {
+                                thread.emit_server_exited(status, cx);
+                            })
+                            .ok();
                     }
                 }
             });
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index fd38ba1f7f..afc834cdd8 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -116,15 +116,15 @@ pub struct LanguageModelParameters {
 
 impl LanguageModelParameters {
     pub fn matches(&self, model: &Arc<dyn LanguageModel>) -> bool {
-        if let Some(provider) = &self.provider {
-            if provider.0 != model.provider_id().0 {
-                return false;
-            }
+        if let Some(provider) = &self.provider
+            && provider.0 != model.provider_id().0
+        {
+            return false;
         }
-        if let Some(setting_model) = &self.model {
-            if *setting_model != model.id().0 {
-                return false;
-            }
+        if let Some(setting_model) = &self.model
+            && *setting_model != model.id().0
+        {
+            return false;
         }
         true
     }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 370dae53e4..ad0920bc4a 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -371,20 +371,20 @@ impl AcpThreadView {
                 let provider_id = provider_id.clone();
                 let this = this.clone();
                 move |_, ev, window, cx| {
-                    if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev {
-                        if &provider_id == updated_provider_id {
-                            this.update(cx, |this, cx| {
-                                this.thread_state = Self::initial_state(
-                                    agent.clone(),
-                                    this.workspace.clone(),
-                                    this.project.clone(),
-                                    window,
-                                    cx,
-                                );
-                                cx.notify();
-                            })
-                            .ok();
-                        }
+                    if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev
+                        && &provider_id == updated_provider_id
+                    {
+                        this.update(cx, |this, cx| {
+                            this.thread_state = Self::initial_state(
+                                agent.clone(),
+                                this.workspace.clone(),
+                                this.project.clone(),
+                                window,
+                                cx,
+                            );
+                            cx.notify();
+                        })
+                        .ok();
                     }
                 }
             });
@@ -547,11 +547,11 @@ impl AcpThreadView {
     }
 
     fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(thread) = self.thread() {
-            if thread.read(cx).status() != ThreadStatus::Idle {
-                self.stop_current_and_send_new_message(window, cx);
-                return;
-            }
+        if let Some(thread) = self.thread()
+            && thread.read(cx).status() != ThreadStatus::Idle
+        {
+            self.stop_current_and_send_new_message(window, cx);
+            return;
         }
 
         let contents = self
@@ -628,25 +628,24 @@ impl AcpThreadView {
             return;
         };
 
-        if let Some(index) = self.editing_message.take() {
-            if let Some(editor) = self
+        if let Some(index) = self.editing_message.take()
+            && let Some(editor) = self
                 .entry_view_state
                 .read(cx)
                 .entry(index)
                 .and_then(|e| e.message_editor())
                 .cloned()
-            {
-                editor.update(cx, |editor, cx| {
-                    if let Some(user_message) = thread
-                        .read(cx)
-                        .entries()
-                        .get(index)
-                        .and_then(|e| e.user_message())
-                    {
-                        editor.set_message(user_message.chunks.clone(), window, cx);
-                    }
-                })
-            }
+        {
+            editor.update(cx, |editor, cx| {
+                if let Some(user_message) = thread
+                    .read(cx)
+                    .entries()
+                    .get(index)
+                    .and_then(|e| e.user_message())
+                {
+                    editor.set_message(user_message.chunks.clone(), window, cx);
+                }
+            })
         };
         self.focus_handle(cx).focus(window);
         cx.notify();
@@ -3265,62 +3264,61 @@ impl AcpThreadView {
                 })
             })
             .log_err()
+            && let Some(pop_up) = screen_window.entity(cx).log_err()
         {
-            if let Some(pop_up) = screen_window.entity(cx).log_err() {
-                self.notification_subscriptions
-                    .entry(screen_window)
-                    .or_insert_with(Vec::new)
-                    .push(cx.subscribe_in(&pop_up, window, {
-                        |this, _, event, window, cx| match event {
-                            AgentNotificationEvent::Accepted => {
-                                let handle = window.window_handle();
-                                cx.activate(true);
+            self.notification_subscriptions
+                .entry(screen_window)
+                .or_insert_with(Vec::new)
+                .push(cx.subscribe_in(&pop_up, window, {
+                    |this, _, event, window, cx| match event {
+                        AgentNotificationEvent::Accepted => {
+                            let handle = window.window_handle();
+                            cx.activate(true);
 
-                                let workspace_handle = this.workspace.clone();
+                            let workspace_handle = this.workspace.clone();
 
-                                // If there are multiple Zed windows, activate the correct one.
-                                cx.defer(move |cx| {
-                                    handle
-                                        .update(cx, |_view, window, _cx| {
-                                            window.activate_window();
+                            // If there are multiple Zed windows, activate the correct one.
+                            cx.defer(move |cx| {
+                                handle
+                                    .update(cx, |_view, window, _cx| {
+                                        window.activate_window();
 
-                                            if let Some(workspace) = workspace_handle.upgrade() {
-                                                workspace.update(_cx, |workspace, cx| {
-                                                    workspace.focus_panel::<AgentPanel>(window, cx);
-                                                });
-                                            }
-                                        })
-                                        .log_err();
-                                });
+                                        if let Some(workspace) = workspace_handle.upgrade() {
+                                            workspace.update(_cx, |workspace, cx| {
+                                                workspace.focus_panel::<AgentPanel>(window, cx);
+                                            });
+                                        }
+                                    })
+                                    .log_err();
+                            });
 
-                                this.dismiss_notifications(cx);
-                            }
-                            AgentNotificationEvent::Dismissed => {
-                                this.dismiss_notifications(cx);
-                            }
+                            this.dismiss_notifications(cx);
                         }
-                    }));
+                        AgentNotificationEvent::Dismissed => {
+                            this.dismiss_notifications(cx);
+                        }
+                    }
+                }));
 
-                self.notifications.push(screen_window);
+            self.notifications.push(screen_window);
 
-                // If the user manually refocuses the original window, dismiss the popup.
-                self.notification_subscriptions
-                    .entry(screen_window)
-                    .or_insert_with(Vec::new)
-                    .push({
-                        let pop_up_weak = pop_up.downgrade();
+            // If the user manually refocuses the original window, dismiss the popup.
+            self.notification_subscriptions
+                .entry(screen_window)
+                .or_insert_with(Vec::new)
+                .push({
+                    let pop_up_weak = pop_up.downgrade();
 
-                        cx.observe_window_activation(window, move |_, window, cx| {
-                            if window.is_window_active() {
-                                if let Some(pop_up) = pop_up_weak.upgrade() {
-                                    pop_up.update(cx, |_, cx| {
-                                        cx.emit(AgentNotificationEvent::Dismissed);
-                                    });
-                                }
-                            }
-                        })
-                    });
-            }
+                    cx.observe_window_activation(window, move |_, window, cx| {
+                        if window.is_window_active()
+                            && let Some(pop_up) = pop_up_weak.upgrade()
+                        {
+                            pop_up.update(cx, |_, cx| {
+                                cx.emit(AgentNotificationEvent::Dismissed);
+                            });
+                        }
+                    })
+                });
         }
     }
 
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index d2f448635e..3defa42d17 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1072,8 +1072,8 @@ impl ActiveThread {
             }
             ThreadEvent::MessageEdited(message_id) => {
                 self.clear_last_error();
-                if let Some(index) = self.messages.iter().position(|id| id == message_id) {
-                    if let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
+                if let Some(index) = self.messages.iter().position(|id| id == message_id)
+                    && let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
                         thread.message(*message_id).map(|message| {
                             let mut rendered_message = RenderedMessage {
                                 language_registry: self.language_registry.clone(),
@@ -1084,14 +1084,14 @@ impl ActiveThread {
                             }
                             rendered_message
                         })
-                    }) {
-                        self.list_state.splice(index..index + 1, 1);
-                        self.rendered_messages_by_id
-                            .insert(*message_id, rendered_message);
-                        self.scroll_to_bottom(cx);
-                        self.save_thread(cx);
-                        cx.notify();
-                    }
+                    })
+                {
+                    self.list_state.splice(index..index + 1, 1);
+                    self.rendered_messages_by_id
+                        .insert(*message_id, rendered_message);
+                    self.scroll_to_bottom(cx);
+                    self.save_thread(cx);
+                    cx.notify();
                 }
             }
             ThreadEvent::MessageDeleted(message_id) => {
@@ -1272,62 +1272,61 @@ impl ActiveThread {
                 })
             })
             .log_err()
+            && let Some(pop_up) = screen_window.entity(cx).log_err()
         {
-            if let Some(pop_up) = screen_window.entity(cx).log_err() {
-                self.notification_subscriptions
-                    .entry(screen_window)
-                    .or_insert_with(Vec::new)
-                    .push(cx.subscribe_in(&pop_up, window, {
-                        |this, _, event, window, cx| match event {
-                            AgentNotificationEvent::Accepted => {
-                                let handle = window.window_handle();
-                                cx.activate(true);
+            self.notification_subscriptions
+                .entry(screen_window)
+                .or_insert_with(Vec::new)
+                .push(cx.subscribe_in(&pop_up, window, {
+                    |this, _, event, window, cx| match event {
+                        AgentNotificationEvent::Accepted => {
+                            let handle = window.window_handle();
+                            cx.activate(true);
 
-                                let workspace_handle = this.workspace.clone();
+                            let workspace_handle = this.workspace.clone();
 
-                                // If there are multiple Zed windows, activate the correct one.
-                                cx.defer(move |cx| {
-                                    handle
-                                        .update(cx, |_view, window, _cx| {
-                                            window.activate_window();
+                            // If there are multiple Zed windows, activate the correct one.
+                            cx.defer(move |cx| {
+                                handle
+                                    .update(cx, |_view, window, _cx| {
+                                        window.activate_window();
 
-                                            if let Some(workspace) = workspace_handle.upgrade() {
-                                                workspace.update(_cx, |workspace, cx| {
-                                                    workspace.focus_panel::<AgentPanel>(window, cx);
-                                                });
-                                            }
-                                        })
-                                        .log_err();
-                                });
+                                        if let Some(workspace) = workspace_handle.upgrade() {
+                                            workspace.update(_cx, |workspace, cx| {
+                                                workspace.focus_panel::<AgentPanel>(window, cx);
+                                            });
+                                        }
+                                    })
+                                    .log_err();
+                            });
 
-                                this.dismiss_notifications(cx);
-                            }
-                            AgentNotificationEvent::Dismissed => {
-                                this.dismiss_notifications(cx);
-                            }
+                            this.dismiss_notifications(cx);
                         }
-                    }));
+                        AgentNotificationEvent::Dismissed => {
+                            this.dismiss_notifications(cx);
+                        }
+                    }
+                }));
 
-                self.notifications.push(screen_window);
+            self.notifications.push(screen_window);
 
-                // If the user manually refocuses the original window, dismiss the popup.
-                self.notification_subscriptions
-                    .entry(screen_window)
-                    .or_insert_with(Vec::new)
-                    .push({
-                        let pop_up_weak = pop_up.downgrade();
+            // If the user manually refocuses the original window, dismiss the popup.
+            self.notification_subscriptions
+                .entry(screen_window)
+                .or_insert_with(Vec::new)
+                .push({
+                    let pop_up_weak = pop_up.downgrade();
 
-                        cx.observe_window_activation(window, move |_, window, cx| {
-                            if window.is_window_active() {
-                                if let Some(pop_up) = pop_up_weak.upgrade() {
-                                    pop_up.update(cx, |_, cx| {
-                                        cx.emit(AgentNotificationEvent::Dismissed);
-                                    });
-                                }
-                            }
-                        })
-                    });
-            }
+                    cx.observe_window_activation(window, move |_, window, cx| {
+                        if window.is_window_active()
+                            && let Some(pop_up) = pop_up_weak.upgrade()
+                        {
+                            pop_up.update(cx, |_, cx| {
+                                cx.emit(AgentNotificationEvent::Dismissed);
+                            });
+                        }
+                    })
+                });
         }
     }
 
@@ -2269,13 +2268,12 @@ impl ActiveThread {
                     let mut error = None;
                     if let Some(last_restore_checkpoint) =
                         self.thread.read(cx).last_restore_checkpoint()
+                        && last_restore_checkpoint.message_id() == message_id
                     {
-                        if last_restore_checkpoint.message_id() == message_id {
-                            match last_restore_checkpoint {
-                                LastRestoreCheckpoint::Pending { .. } => is_pending = true,
-                                LastRestoreCheckpoint::Error { error: err, .. } => {
-                                    error = Some(err.clone());
-                                }
+                        match last_restore_checkpoint {
+                            LastRestoreCheckpoint::Pending { .. } => is_pending = true,
+                            LastRestoreCheckpoint::Error { error: err, .. } => {
+                                error = Some(err.clone());
                             }
                         }
                     }
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index 32360dd56e..311f75af3b 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -163,10 +163,10 @@ impl ConfigurationSource {
                     .read(cx)
                     .text(cx);
                 let settings = serde_json_lenient::from_str::<serde_json::Value>(&text)?;
-                if let Some(settings_validator) = settings_validator {
-                    if let Err(error) = settings_validator.validate(&settings) {
-                        return Err(anyhow::anyhow!(error.to_string()));
-                    }
+                if let Some(settings_validator) = settings_validator
+                    && let Err(error) = settings_validator.validate(&settings)
+                {
+                    return Err(anyhow::anyhow!(error.to_string()));
                 }
                 Ok((
                     id.clone(),
@@ -716,24 +716,24 @@ fn wait_for_context_server(
         project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
             match status {
                 ContextServerStatus::Running => {
-                    if server_id == &context_server_id {
-                        if let Some(tx) = tx.lock().unwrap().take() {
-                            let _ = tx.send(Ok(()));
-                        }
+                    if server_id == &context_server_id
+                        && let Some(tx) = tx.lock().unwrap().take()
+                    {
+                        let _ = tx.send(Ok(()));
                     }
                 }
                 ContextServerStatus::Stopped => {
-                    if server_id == &context_server_id {
-                        if let Some(tx) = tx.lock().unwrap().take() {
-                            let _ = tx.send(Err("Context server stopped running".into()));
-                        }
+                    if server_id == &context_server_id
+                        && let Some(tx) = tx.lock().unwrap().take()
+                    {
+                        let _ = tx.send(Err("Context server stopped running".into()));
                     }
                 }
                 ContextServerStatus::Error(error) => {
-                    if server_id == &context_server_id {
-                        if let Some(tx) = tx.lock().unwrap().take() {
-                            let _ = tx.send(Err(error.clone()));
-                        }
+                    if server_id == &context_server_id
+                        && let Some(tx) = tx.lock().unwrap().take()
+                    {
+                        let _ = tx.send(Err(error.clone()));
                     }
                 }
                 _ => {}
diff --git a/crates/agent_ui/src/agent_configuration/tool_picker.rs b/crates/agent_ui/src/agent_configuration/tool_picker.rs
index 8f1e0d71c0..25947a1e58 100644
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/crates/agent_ui/src/agent_configuration/tool_picker.rs
@@ -191,10 +191,10 @@ impl PickerDelegate for ToolPickerDelegate {
                         BTreeMap::default();
 
                     for item in all_items.iter() {
-                        if let PickerItem::Tool { server_id, name } = item.clone() {
-                            if name.contains(&query) {
-                                tools_by_provider.entry(server_id).or_default().push(name);
-                            }
+                        if let PickerItem::Tool { server_id, name } = item.clone()
+                            && name.contains(&query)
+                        {
+                            tools_by_provider.entry(server_id).or_default().push(name);
                         }
                     }
 
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index b010f8a424..f474fdf3ae 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1043,18 +1043,18 @@ impl ToolbarItemView for AgentDiffToolbar {
                 return self.location(cx);
             }
 
-            if let Some(editor) = item.act_as::<Editor>(cx) {
-                if editor.read(cx).mode().is_full() {
-                    let agent_diff = AgentDiff::global(cx);
+            if let Some(editor) = item.act_as::<Editor>(cx)
+                && editor.read(cx).mode().is_full()
+            {
+                let agent_diff = AgentDiff::global(cx);
 
-                    self.active_item = Some(AgentDiffToolbarItem::Editor {
-                        editor: editor.downgrade(),
-                        state: agent_diff.read(cx).editor_state(&editor.downgrade()),
-                        _diff_subscription: cx.observe(&agent_diff, Self::handle_diff_notify),
-                    });
+                self.active_item = Some(AgentDiffToolbarItem::Editor {
+                    editor: editor.downgrade(),
+                    state: agent_diff.read(cx).editor_state(&editor.downgrade()),
+                    _diff_subscription: cx.observe(&agent_diff, Self::handle_diff_notify),
+                });
 
-                    return self.location(cx);
-                }
+                return self.location(cx);
             }
         }
 
@@ -1538,16 +1538,10 @@ impl AgentDiff {
     ) {
         match event {
             workspace::Event::ItemAdded { item } => {
-                if let Some(editor) = item.downcast::<Editor>() {
-                    if let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx) {
-                        self.register_editor(
-                            workspace.downgrade(),
-                            buffer.clone(),
-                            editor,
-                            window,
-                            cx,
-                        );
-                    }
+                if let Some(editor) = item.downcast::<Editor>()
+                    && let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx)
+                {
+                    self.register_editor(workspace.downgrade(), buffer.clone(), editor, window, cx);
                 }
             }
             _ => {}
@@ -1850,22 +1844,22 @@ impl AgentDiff {
 
         let thread = thread.upgrade()?;
 
-        if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx) {
-            if let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
-                let changed_buffers = thread.action_log(cx).read(cx).changed_buffers(cx);
+        if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx)
+            && let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton()
+        {
+            let changed_buffers = thread.action_log(cx).read(cx).changed_buffers(cx);
 
-                let mut keys = changed_buffers.keys().cycle();
-                keys.find(|k| *k == &curr_buffer);
-                let next_project_path = keys
-                    .next()
-                    .filter(|k| *k != &curr_buffer)
-                    .and_then(|after| after.read(cx).project_path(cx));
+            let mut keys = changed_buffers.keys().cycle();
+            keys.find(|k| *k == &curr_buffer);
+            let next_project_path = keys
+                .next()
+                .filter(|k| *k != &curr_buffer)
+                .and_then(|after| after.read(cx).project_path(cx));
 
-                if let Some(path) = next_project_path {
-                    let task = workspace.open_path(path, None, true, window, cx);
-                    let task = cx.spawn(async move |_, _cx| task.await.map(|_| ()));
-                    return Some(task);
-                }
+            if let Some(path) = next_project_path {
+                let task = workspace.open_path(path, None, true, window, cx);
+                let task = cx.spawn(async move |_, _cx| task.await.map(|_| ()));
+                return Some(task);
             }
         }
 
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index cb354222b6..55d07ed495 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1398,14 +1398,13 @@ impl AgentPanel {
                 if LanguageModelRegistry::read_global(cx)
                     .default_model()
                     .map_or(true, |model| model.provider.id() != provider.id())
+                    && let Some(model) = provider.default_model(cx)
                 {
-                    if let Some(model) = provider.default_model(cx) {
-                        update_settings_file::<AgentSettings>(
-                            self.fs.clone(),
-                            cx,
-                            move |settings, _| settings.set_model(model),
-                        );
-                    }
+                    update_settings_file::<AgentSettings>(
+                        self.fs.clone(),
+                        cx,
+                        move |settings, _| settings.set_model(model),
+                    );
                 }
 
                 self.new_thread(&NewThread::default(), window, cx);
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index 23e04266db..ff5e9362dd 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -352,12 +352,12 @@ impl CodegenAlternative {
         event: &multi_buffer::Event,
         cx: &mut Context<Self>,
     ) {
-        if let multi_buffer::Event::TransactionUndone { transaction_id } = event {
-            if self.transformation_transaction_id == Some(*transaction_id) {
-                self.transformation_transaction_id = None;
-                self.generation = Task::ready(());
-                cx.emit(CodegenEvent::Undone);
-            }
+        if let multi_buffer::Event::TransactionUndone { transaction_id } = event
+            && self.transformation_transaction_id == Some(*transaction_id)
+        {
+            self.transformation_transaction_id = None;
+            self.generation = Task::ready(());
+            cx.emit(CodegenEvent::Undone);
         }
     }
 
@@ -576,38 +576,34 @@ impl CodegenAlternative {
                                 let mut lines = chunk.split('\n').peekable();
                                 while let Some(line) = lines.next() {
                                     new_text.push_str(line);
-                                    if line_indent.is_none() {
-                                        if let Some(non_whitespace_ch_ix) =
+                                    if line_indent.is_none()
+                                        && let Some(non_whitespace_ch_ix) =
                                             new_text.find(|ch: char| !ch.is_whitespace())
-                                        {
-                                            line_indent = Some(non_whitespace_ch_ix);
-                                            base_indent = base_indent.or(line_indent);
+                                    {
+                                        line_indent = Some(non_whitespace_ch_ix);
+                                        base_indent = base_indent.or(line_indent);
 
-                                            let line_indent = line_indent.unwrap();
-                                            let base_indent = base_indent.unwrap();
-                                            let indent_delta =
-                                                line_indent as i32 - base_indent as i32;
-                                            let mut corrected_indent_len = cmp::max(
-                                                0,
-                                                suggested_line_indent.len as i32 + indent_delta,
-                                            )
-                                                as usize;
-                                            if first_line {
-                                                corrected_indent_len = corrected_indent_len
-                                                    .saturating_sub(
-                                                        selection_start.column as usize,
-                                                    );
-                                            }
-
-                                            let indent_char = suggested_line_indent.char();
-                                            let mut indent_buffer = [0; 4];
-                                            let indent_str =
-                                                indent_char.encode_utf8(&mut indent_buffer);
-                                            new_text.replace_range(
-                                                ..line_indent,
-                                                &indent_str.repeat(corrected_indent_len),
-                                            );
+                                        let line_indent = line_indent.unwrap();
+                                        let base_indent = base_indent.unwrap();
+                                        let indent_delta = line_indent as i32 - base_indent as i32;
+                                        let mut corrected_indent_len = cmp::max(
+                                            0,
+                                            suggested_line_indent.len as i32 + indent_delta,
+                                        )
+                                            as usize;
+                                        if first_line {
+                                            corrected_indent_len = corrected_indent_len
+                                                .saturating_sub(selection_start.column as usize);
                                         }
+
+                                        let indent_char = suggested_line_indent.char();
+                                        let mut indent_buffer = [0; 4];
+                                        let indent_str =
+                                            indent_char.encode_utf8(&mut indent_buffer);
+                                        new_text.replace_range(
+                                            ..line_indent,
+                                            &indent_str.repeat(corrected_indent_len),
+                                        );
                                     }
 
                                     if line_indent.is_some() {
diff --git a/crates/agent_ui/src/context_strip.rs b/crates/agent_ui/src/context_strip.rs
index 51ed3a5e11..d25d7d3544 100644
--- a/crates/agent_ui/src/context_strip.rs
+++ b/crates/agent_ui/src/context_strip.rs
@@ -368,10 +368,10 @@ impl ContextStrip {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(suggested) = self.suggested_context(cx) {
-            if self.is_suggested_focused(&self.added_contexts(cx)) {
-                self.add_suggested_context(&suggested, cx);
-            }
+        if let Some(suggested) = self.suggested_context(cx)
+            && self.is_suggested_focused(&self.added_contexts(cx))
+        {
+            self.add_suggested_context(&suggested, cx);
         }
     }
 
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 781e242fba..101eb899b2 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -182,13 +182,13 @@ impl InlineAssistant {
         match event {
             workspace::Event::UserSavedItem { item, .. } => {
                 // When the user manually saves an editor, automatically accepts all finished transformations.
-                if let Some(editor) = item.upgrade().and_then(|item| item.act_as::<Editor>(cx)) {
-                    if let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) {
-                        for assist_id in editor_assists.assist_ids.clone() {
-                            let assist = &self.assists[&assist_id];
-                            if let CodegenStatus::Done = assist.codegen.read(cx).status(cx) {
-                                self.finish_assist(assist_id, false, window, cx)
-                            }
+                if let Some(editor) = item.upgrade().and_then(|item| item.act_as::<Editor>(cx))
+                    && let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade())
+                {
+                    for assist_id in editor_assists.assist_ids.clone() {
+                        let assist = &self.assists[&assist_id];
+                        if let CodegenStatus::Done = assist.codegen.read(cx).status(cx) {
+                            self.finish_assist(assist_id, false, window, cx)
                         }
                     }
                 }
@@ -342,13 +342,11 @@ impl InlineAssistant {
                         )
                         .await
                         .ok();
-                    if let Some(answer) = answer {
-                        if answer == 0 {
-                            cx.update(|window, cx| {
-                                window.dispatch_action(Box::new(OpenSettings), cx)
-                            })
+                    if let Some(answer) = answer
+                        && answer == 0
+                    {
+                        cx.update(|window, cx| window.dispatch_action(Box::new(OpenSettings), cx))
                             .ok();
-                        }
                     }
                     anyhow::Ok(())
                 })
@@ -435,11 +433,11 @@ impl InlineAssistant {
                 }
             }
 
-            if let Some(prev_selection) = selections.last_mut() {
-                if selection.start <= prev_selection.end {
-                    prev_selection.end = selection.end;
-                    continue;
-                }
+            if let Some(prev_selection) = selections.last_mut()
+                && selection.start <= prev_selection.end
+            {
+                prev_selection.end = selection.end;
+                continue;
             }
 
             let latest_selection = newest_selection.get_or_insert_with(|| selection.clone());
@@ -985,14 +983,13 @@ impl InlineAssistant {
             EditorEvent::SelectionsChanged { .. } => {
                 for assist_id in editor_assists.assist_ids.clone() {
                     let assist = &self.assists[&assist_id];
-                    if let Some(decorations) = assist.decorations.as_ref() {
-                        if decorations
+                    if let Some(decorations) = assist.decorations.as_ref()
+                        && decorations
                             .prompt_editor
                             .focus_handle(cx)
                             .is_focused(window)
-                        {
-                            return;
-                        }
+                    {
+                        return;
                     }
                 }
 
@@ -1503,20 +1500,18 @@ impl InlineAssistant {
         window: &mut Window,
         cx: &mut App,
     ) -> Option<InlineAssistTarget> {
-        if let Some(terminal_panel) = workspace.panel::<TerminalPanel>(cx) {
-            if terminal_panel
+        if let Some(terminal_panel) = workspace.panel::<TerminalPanel>(cx)
+            && terminal_panel
                 .read(cx)
                 .focus_handle(cx)
                 .contains_focused(window, cx)
-            {
-                if let Some(terminal_view) = terminal_panel.read(cx).pane().and_then(|pane| {
-                    pane.read(cx)
-                        .active_item()
-                        .and_then(|t| t.downcast::<TerminalView>())
-                }) {
-                    return Some(InlineAssistTarget::Terminal(terminal_view));
-                }
-            }
+            && let Some(terminal_view) = terminal_panel.read(cx).pane().and_then(|pane| {
+                pane.read(cx)
+                    .active_item()
+                    .and_then(|t| t.downcast::<TerminalView>())
+            })
+        {
+            return Some(InlineAssistTarget::Terminal(terminal_view));
         }
 
         let context_editor = agent_panel
@@ -1741,22 +1736,20 @@ impl InlineAssist {
                                 return;
                             };
 
-                            if let CodegenStatus::Error(error) = codegen.read(cx).status(cx) {
-                                if assist.decorations.is_none() {
-                                    if let Some(workspace) = assist.workspace.upgrade() {
-                                        let error = format!("Inline assistant error: {}", error);
-                                        workspace.update(cx, |workspace, cx| {
-                                            struct InlineAssistantError;
+                            if let CodegenStatus::Error(error) = codegen.read(cx).status(cx)
+                                && assist.decorations.is_none()
+                                && let Some(workspace) = assist.workspace.upgrade()
+                            {
+                                let error = format!("Inline assistant error: {}", error);
+                                workspace.update(cx, |workspace, cx| {
+                                    struct InlineAssistantError;
 
-                                            let id =
-                                                NotificationId::composite::<InlineAssistantError>(
-                                                    assist_id.0,
-                                                );
+                                    let id = NotificationId::composite::<InlineAssistantError>(
+                                        assist_id.0,
+                                    );
 
-                                            workspace.show_toast(Toast::new(id, error), cx);
-                                        })
-                                    }
-                                }
+                                    workspace.show_toast(Toast::new(id, error), cx);
+                                })
                             }
 
                             if assist.decorations.is_none() {
@@ -1821,18 +1814,18 @@ impl CodeActionProvider for AssistantCodeActionProvider {
             has_diagnostics = true;
         }
         if has_diagnostics {
-            if let Some(symbols_containing_start) = snapshot.symbols_containing(range.start, None) {
-                if let Some(symbol) = symbols_containing_start.last() {
-                    range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
-                    range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
-                }
+            if let Some(symbols_containing_start) = snapshot.symbols_containing(range.start, None)
+                && let Some(symbol) = symbols_containing_start.last()
+            {
+                range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
+                range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
             }
 
-            if let Some(symbols_containing_end) = snapshot.symbols_containing(range.end, None) {
-                if let Some(symbol) = symbols_containing_end.last() {
-                    range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
-                    range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
-                }
+            if let Some(symbols_containing_end) = snapshot.symbols_containing(range.end, None)
+                && let Some(symbol) = symbols_containing_end.last()
+            {
+                range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
+                range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
             }
 
             Task::ready(Ok(vec![CodeAction {
diff --git a/crates/agent_ui/src/terminal_inline_assistant.rs b/crates/agent_ui/src/terminal_inline_assistant.rs
index bcbc308c99..3859863ebe 100644
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -388,20 +388,20 @@ impl TerminalInlineAssistant {
         window: &mut Window,
         cx: &mut App,
     ) {
-        if let Some(assist) = self.assists.get_mut(&assist_id) {
-            if let Some(prompt_editor) = assist.prompt_editor.as_ref().cloned() {
-                assist
-                    .terminal
-                    .update(cx, |terminal, cx| {
-                        terminal.clear_block_below_cursor(cx);
-                        let block = terminal_view::BlockProperties {
-                            height,
-                            render: Box::new(move |_| prompt_editor.clone().into_any_element()),
-                        };
-                        terminal.set_block_below_cursor(block, window, cx);
-                    })
-                    .log_err();
-            }
+        if let Some(assist) = self.assists.get_mut(&assist_id)
+            && let Some(prompt_editor) = assist.prompt_editor.as_ref().cloned()
+        {
+            assist
+                .terminal
+                .update(cx, |terminal, cx| {
+                    terminal.clear_block_below_cursor(cx);
+                    let block = terminal_view::BlockProperties {
+                        height,
+                        render: Box::new(move |_| prompt_editor.clone().into_any_element()),
+                    };
+                    terminal.set_block_below_cursor(block, window, cx);
+                })
+                .log_err();
         }
     }
 }
@@ -450,23 +450,20 @@ impl TerminalInlineAssist {
                                 return;
                             };
 
-                            if let CodegenStatus::Error(error) = &codegen.read(cx).status {
-                                if assist.prompt_editor.is_none() {
-                                    if let Some(workspace) = assist.workspace.upgrade() {
-                                        let error =
-                                            format!("Terminal inline assistant error: {}", error);
-                                        workspace.update(cx, |workspace, cx| {
-                                            struct InlineAssistantError;
+                            if let CodegenStatus::Error(error) = &codegen.read(cx).status
+                                && assist.prompt_editor.is_none()
+                                && let Some(workspace) = assist.workspace.upgrade()
+                            {
+                                let error = format!("Terminal inline assistant error: {}", error);
+                                workspace.update(cx, |workspace, cx| {
+                                    struct InlineAssistantError;
 
-                                            let id =
-                                                NotificationId::composite::<InlineAssistantError>(
-                                                    assist_id.0,
-                                                );
+                                    let id = NotificationId::composite::<InlineAssistantError>(
+                                        assist_id.0,
+                                    );
 
-                                            workspace.show_toast(Toast::new(id, error), cx);
-                                        })
-                                    }
-                                }
+                                    workspace.show_toast(Toast::new(id, error), cx);
+                                })
                             }
 
                             if assist.prompt_editor.is_none() {
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 376d3c54fd..3b5f2e5069 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -745,28 +745,27 @@ impl TextThreadEditor {
     ) {
         if let Some(invoked_slash_command) =
             self.context.read(cx).invoked_slash_command(&command_id)
+            && let InvokedSlashCommandStatus::Finished = invoked_slash_command.status
         {
-            if let InvokedSlashCommandStatus::Finished = invoked_slash_command.status {
-                let run_commands_in_ranges = invoked_slash_command.run_commands_in_ranges.clone();
-                for range in run_commands_in_ranges {
-                    let commands = self.context.update(cx, |context, cx| {
-                        context.reparse(cx);
-                        context
-                            .pending_commands_for_range(range.clone(), cx)
-                            .to_vec()
-                    });
+            let run_commands_in_ranges = invoked_slash_command.run_commands_in_ranges.clone();
+            for range in run_commands_in_ranges {
+                let commands = self.context.update(cx, |context, cx| {
+                    context.reparse(cx);
+                    context
+                        .pending_commands_for_range(range.clone(), cx)
+                        .to_vec()
+                });
 
-                    for command in commands {
-                        self.run_command(
-                            command.source_range,
-                            &command.name,
-                            &command.arguments,
-                            false,
-                            self.workspace.clone(),
-                            window,
-                            cx,
-                        );
-                    }
+                for command in commands {
+                    self.run_command(
+                        command.source_range,
+                        &command.name,
+                        &command.arguments,
+                        false,
+                        self.workspace.clone(),
+                        window,
+                        cx,
+                    );
                 }
             }
         }
diff --git a/crates/agent_ui/src/thread_history.rs b/crates/agent_ui/src/thread_history.rs
index 66afe2c2c5..4ec2078e5d 100644
--- a/crates/agent_ui/src/thread_history.rs
+++ b/crates/agent_ui/src/thread_history.rs
@@ -166,14 +166,13 @@ impl ThreadHistory {
                                 this.all_entries.len().saturating_sub(1),
                                 cx,
                             );
-                        } else if let Some(prev_id) = previously_selected_entry {
-                            if let Some(new_ix) = this
+                        } else if let Some(prev_id) = previously_selected_entry
+                            && let Some(new_ix) = this
                                 .all_entries
                                 .iter()
                                 .position(|probe| probe.id() == prev_id)
-                            {
-                                this.set_selected_entry_index(new_ix, cx);
-                            }
+                        {
+                            this.set_selected_entry_index(new_ix, cx);
                         }
                     }
                     SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
diff --git a/crates/assistant_context/src/assistant_context.rs b/crates/assistant_context/src/assistant_context.rs
index 06abbad39f..151586564f 100644
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -1076,20 +1076,20 @@ impl AssistantContext {
                     timestamp,
                     ..
                 } => {
-                    if let Some(slash_command) = self.invoked_slash_commands.get_mut(&id) {
-                        if timestamp > slash_command.timestamp {
-                            slash_command.timestamp = timestamp;
-                            match error_message {
-                                Some(message) => {
-                                    slash_command.status =
-                                        InvokedSlashCommandStatus::Error(message.into());
-                                }
-                                None => {
-                                    slash_command.status = InvokedSlashCommandStatus::Finished;
-                                }
+                    if let Some(slash_command) = self.invoked_slash_commands.get_mut(&id)
+                        && timestamp > slash_command.timestamp
+                    {
+                        slash_command.timestamp = timestamp;
+                        match error_message {
+                            Some(message) => {
+                                slash_command.status =
+                                    InvokedSlashCommandStatus::Error(message.into());
+                            }
+                            None => {
+                                slash_command.status = InvokedSlashCommandStatus::Finished;
                             }
-                            cx.emit(ContextEvent::InvokedSlashCommandChanged { command_id: id });
                         }
+                        cx.emit(ContextEvent::InvokedSlashCommandChanged { command_id: id });
                     }
                 }
                 ContextOperation::BufferOperation(_) => unreachable!(),
@@ -1368,10 +1368,10 @@ impl AssistantContext {
                 continue;
             }
 
-            if let Some(last_anchor) = last_anchor {
-                if message.id == last_anchor {
-                    hit_last_anchor = true;
-                }
+            if let Some(last_anchor) = last_anchor
+                && message.id == last_anchor
+            {
+                hit_last_anchor = true;
             }
 
             new_anchor_needs_caching = new_anchor_needs_caching
@@ -1406,10 +1406,10 @@ impl AssistantContext {
         if !self.pending_completions.is_empty() {
             return;
         }
-        if let Some(cache_configuration) = cache_configuration {
-            if !cache_configuration.should_speculate {
-                return;
-            }
+        if let Some(cache_configuration) = cache_configuration
+            && !cache_configuration.should_speculate
+        {
+            return;
         }
 
         let request = {
@@ -1552,25 +1552,24 @@ impl AssistantContext {
                     })
                     .map(ToOwned::to_owned)
                     .collect::<SmallVec<_>>();
-                if let Some(command) = self.slash_commands.command(name, cx) {
-                    if !command.requires_argument() || !arguments.is_empty() {
-                        let start_ix = offset + command_line.name.start - 1;
-                        let end_ix = offset
-                            + command_line
-                                .arguments
-                                .last()
-                                .map_or(command_line.name.end, |argument| argument.end);
-                        let source_range =
-                            buffer.anchor_after(start_ix)..buffer.anchor_after(end_ix);
-                        let pending_command = ParsedSlashCommand {
-                            name: name.to_string(),
-                            arguments,
-                            source_range,
-                            status: PendingSlashCommandStatus::Idle,
-                        };
-                        updated.push(pending_command.clone());
-                        new_commands.push(pending_command);
-                    }
+                if let Some(command) = self.slash_commands.command(name, cx)
+                    && (!command.requires_argument() || !arguments.is_empty())
+                {
+                    let start_ix = offset + command_line.name.start - 1;
+                    let end_ix = offset
+                        + command_line
+                            .arguments
+                            .last()
+                            .map_or(command_line.name.end, |argument| argument.end);
+                    let source_range = buffer.anchor_after(start_ix)..buffer.anchor_after(end_ix);
+                    let pending_command = ParsedSlashCommand {
+                        name: name.to_string(),
+                        arguments,
+                        source_range,
+                        status: PendingSlashCommandStatus::Idle,
+                    };
+                    updated.push(pending_command.clone());
+                    new_commands.push(pending_command);
                 }
             }
 
@@ -1799,14 +1798,13 @@ impl AssistantContext {
                                 });
 
                                 let end = this.buffer.read(cx).anchor_before(insert_position);
-                                if run_commands_in_text {
-                                    if let Some(invoked_slash_command) =
+                                if run_commands_in_text
+                                    && let Some(invoked_slash_command) =
                                         this.invoked_slash_commands.get_mut(&command_id)
-                                    {
-                                        invoked_slash_command
-                                            .run_commands_in_ranges
-                                            .push(start..end);
-                                    }
+                                {
+                                    invoked_slash_command
+                                        .run_commands_in_ranges
+                                        .push(start..end);
                                 }
                             }
                             SlashCommandEvent::EndSection => {
@@ -2741,10 +2739,10 @@ impl AssistantContext {
                     }
 
                     this.read_with(cx, |this, _cx| {
-                        if let Some(summary) = this.summary.content() {
-                            if summary.text.is_empty() {
-                                bail!("Model generated an empty summary");
-                            }
+                        if let Some(summary) = this.summary.content()
+                            && summary.text.is_empty()
+                        {
+                            bail!("Model generated an empty summary");
                         }
                         Ok(())
                     })??;
@@ -2924,18 +2922,18 @@ impl AssistantContext {
                 fs.create_dir(contexts_dir().as_ref()).await?;
 
                 // rename before write ensures that only one file exists
-                if let Some(old_path) = old_path.as_ref() {
-                    if new_path.as_path() != old_path.as_ref() {
-                        fs.rename(
-                            old_path,
-                            &new_path,
-                            RenameOptions {
-                                overwrite: true,
-                                ignore_if_exists: true,
-                            },
-                        )
-                        .await?;
-                    }
+                if let Some(old_path) = old_path.as_ref()
+                    && new_path.as_path() != old_path.as_ref()
+                {
+                    fs.rename(
+                        old_path,
+                        &new_path,
+                        RenameOptions {
+                            overwrite: true,
+                            ignore_if_exists: true,
+                        },
+                    )
+                    .await?;
                 }
 
                 // update path before write in case it fails
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index 622d8867a7..af43b912e9 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -894,34 +894,33 @@ impl ContextStore {
                 return;
             };
 
-            if protocol.capable(context_server::protocol::ServerCapability::Prompts) {
-                if let Some(response) = protocol
+            if protocol.capable(context_server::protocol::ServerCapability::Prompts)
+                && let Some(response) = protocol
                     .request::<context_server::types::requests::PromptsList>(())
                     .await
                     .log_err()
-                {
-                    let slash_command_ids = response
-                        .prompts
-                        .into_iter()
-                        .filter(assistant_slash_commands::acceptable_prompt)
-                        .map(|prompt| {
-                            log::info!("registering context server command: {:?}", prompt.name);
-                            slash_command_working_set.insert(Arc::new(
-                                assistant_slash_commands::ContextServerSlashCommand::new(
-                                    context_server_store.clone(),
-                                    server.id(),
-                                    prompt,
-                                ),
-                            ))
-                        })
-                        .collect::<Vec<_>>();
-
-                    this.update(cx, |this, _cx| {
-                        this.context_server_slash_command_ids
-                            .insert(server_id.clone(), slash_command_ids);
+            {
+                let slash_command_ids = response
+                    .prompts
+                    .into_iter()
+                    .filter(assistant_slash_commands::acceptable_prompt)
+                    .map(|prompt| {
+                        log::info!("registering context server command: {:?}", prompt.name);
+                        slash_command_working_set.insert(Arc::new(
+                            assistant_slash_commands::ContextServerSlashCommand::new(
+                                context_server_store.clone(),
+                                server.id(),
+                                prompt,
+                            ),
+                        ))
                     })
-                    .log_err();
-                }
+                    .collect::<Vec<_>>();
+
+                this.update(cx, |this, _cx| {
+                    this.context_server_slash_command_ids
+                        .insert(server_id.clone(), slash_command_ids);
+                })
+                .log_err();
             }
         })
         .detach();
diff --git a/crates/assistant_slash_commands/src/context_server_command.rs b/crates/assistant_slash_commands/src/context_server_command.rs
index 15f3901bfb..219c3b30bc 100644
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -39,10 +39,10 @@ impl SlashCommand for ContextServerSlashCommand {
 
     fn label(&self, cx: &App) -> language::CodeLabel {
         let mut parts = vec![self.prompt.name.as_str()];
-        if let Some(args) = &self.prompt.arguments {
-            if let Some(arg) = args.first() {
-                parts.push(arg.name.as_str());
-            }
+        if let Some(args) = &self.prompt.arguments
+            && let Some(arg) = args.first()
+        {
+            parts.push(arg.name.as_str());
         }
         create_label_for_command(parts[0], &parts[1..], cx)
     }
diff --git a/crates/assistant_slash_commands/src/delta_command.rs b/crates/assistant_slash_commands/src/delta_command.rs
index 8c840c17b2..2cc4591386 100644
--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -66,23 +66,22 @@ impl SlashCommand for DeltaSlashCommand {
                 .metadata
                 .as_ref()
                 .and_then(|value| serde_json::from_value::<FileCommandMetadata>(value.clone()).ok())
+                && paths.insert(metadata.path.clone())
             {
-                if paths.insert(metadata.path.clone()) {
-                    file_command_old_outputs.push(
-                        context_buffer
-                            .as_rope()
-                            .slice(section.range.to_offset(&context_buffer)),
-                    );
-                    file_command_new_outputs.push(Arc::new(FileSlashCommand).run(
-                        std::slice::from_ref(&metadata.path),
-                        context_slash_command_output_sections,
-                        context_buffer.clone(),
-                        workspace.clone(),
-                        delegate.clone(),
-                        window,
-                        cx,
-                    ));
-                }
+                file_command_old_outputs.push(
+                    context_buffer
+                        .as_rope()
+                        .slice(section.range.to_offset(&context_buffer)),
+                );
+                file_command_new_outputs.push(Arc::new(FileSlashCommand).run(
+                    std::slice::from_ref(&metadata.path),
+                    context_slash_command_output_sections,
+                    context_buffer.clone(),
+                    workspace.clone(),
+                    delegate.clone(),
+                    window,
+                    cx,
+                ));
             }
         }
 
@@ -95,25 +94,25 @@ impl SlashCommand for DeltaSlashCommand {
                 .into_iter()
                 .zip(file_command_new_outputs)
             {
-                if let Ok(new_output) = new_output {
-                    if let Ok(new_output) = SlashCommandOutput::from_event_stream(new_output).await
-                    {
-                        if let Some(file_command_range) = new_output.sections.first() {
-                            let new_text = &new_output.text[file_command_range.range.clone()];
-                            if old_text.chars().ne(new_text.chars()) {
-                                changes_detected = true;
-                                output.sections.extend(new_output.sections.into_iter().map(
-                                    |section| SlashCommandOutputSection {
-                                        range: output.text.len() + section.range.start
-                                            ..output.text.len() + section.range.end,
-                                        icon: section.icon,
-                                        label: section.label,
-                                        metadata: section.metadata,
-                                    },
-                                ));
-                                output.text.push_str(&new_output.text);
-                            }
-                        }
+                if let Ok(new_output) = new_output
+                    && let Ok(new_output) = SlashCommandOutput::from_event_stream(new_output).await
+                    && let Some(file_command_range) = new_output.sections.first()
+                {
+                    let new_text = &new_output.text[file_command_range.range.clone()];
+                    if old_text.chars().ne(new_text.chars()) {
+                        changes_detected = true;
+                        output
+                            .sections
+                            .extend(new_output.sections.into_iter().map(|section| {
+                                SlashCommandOutputSection {
+                                    range: output.text.len() + section.range.start
+                                        ..output.text.len() + section.range.end,
+                                    icon: section.icon,
+                                    label: section.label,
+                                    metadata: section.metadata,
+                                }
+                            }));
+                        output.text.push_str(&new_output.text);
                     }
                 }
             }
diff --git a/crates/assistant_slash_commands/src/diagnostics_command.rs b/crates/assistant_slash_commands/src/diagnostics_command.rs
index 31014f8fb8..45c976c826 100644
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -280,10 +280,10 @@ fn collect_diagnostics(
 
         let mut project_summary = DiagnosticSummary::default();
         for (project_path, path, summary) in diagnostic_summaries {
-            if let Some(path_matcher) = &options.path_matcher {
-                if !path_matcher.is_match(&path) {
-                    continue;
-                }
+            if let Some(path_matcher) = &options.path_matcher
+                && !path_matcher.is_match(&path)
+            {
+                continue;
             }
 
             project_summary.error_count += summary.error_count;
diff --git a/crates/assistant_slash_commands/src/tab_command.rs b/crates/assistant_slash_commands/src/tab_command.rs
index ca7601bc4c..e4ae391a9c 100644
--- a/crates/assistant_slash_commands/src/tab_command.rs
+++ b/crates/assistant_slash_commands/src/tab_command.rs
@@ -195,16 +195,14 @@ fn tab_items_for_queries(
                     }
 
                     for editor in workspace.items_of_type::<Editor>(cx) {
-                        if let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
-                            if let Some(timestamp) =
+                        if let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton()
+                            && let Some(timestamp) =
                                 timestamps_by_entity_id.get(&editor.entity_id())
-                            {
-                                if visited_buffers.insert(buffer.read(cx).remote_id()) {
-                                    let snapshot = buffer.read(cx).snapshot();
-                                    let full_path = snapshot.resolve_file_path(cx, true);
-                                    open_buffers.push((full_path, snapshot, *timestamp));
-                                }
-                            }
+                            && visited_buffers.insert(buffer.read(cx).remote_id())
+                        {
+                            let snapshot = buffer.read(cx).snapshot();
+                            let full_path = snapshot.resolve_file_path(cx, true);
+                            open_buffers.push((full_path, snapshot, *timestamp));
                         }
                     }
 
diff --git a/crates/assistant_tool/src/tool_schema.rs b/crates/assistant_tool/src/tool_schema.rs
index 7b48f93ba6..192f7c8a2b 100644
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -24,16 +24,16 @@ pub fn adapt_schema_to_format(
 fn preprocess_json_schema(json: &mut Value) -> Result<()> {
     // `additionalProperties` defaults to `false` unless explicitly specified.
     // This prevents models from hallucinating tool parameters.
-    if let Value::Object(obj) = json {
-        if matches!(obj.get("type"), Some(Value::String(s)) if s == "object") {
-            if !obj.contains_key("additionalProperties") {
-                obj.insert("additionalProperties".to_string(), Value::Bool(false));
-            }
+    if let Value::Object(obj) = json
+        && matches!(obj.get("type"), Some(Value::String(s)) if s == "object")
+    {
+        if !obj.contains_key("additionalProperties") {
+            obj.insert("additionalProperties".to_string(), Value::Bool(false));
+        }
 
-            // OpenAI API requires non-missing `properties`
-            if !obj.contains_key("properties") {
-                obj.insert("properties".to_string(), Value::Object(Default::default()));
-            }
+        // OpenAI API requires non-missing `properties`
+        if !obj.contains_key("properties") {
+            obj.insert("properties".to_string(), Value::Object(Default::default()));
         }
     }
     Ok(())
@@ -59,10 +59,10 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
             ("optional", |value| value.is_boolean()),
         ];
         for (key, predicate) in KEYS_TO_REMOVE {
-            if let Some(value) = obj.get(key) {
-                if predicate(value) {
-                    obj.remove(key);
-                }
+            if let Some(value) = obj.get(key)
+                && predicate(value)
+            {
+                obj.remove(key);
             }
         }
 
@@ -77,12 +77,12 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
         }
 
         // Handle oneOf -> anyOf conversion
-        if let Some(subschemas) = obj.get_mut("oneOf") {
-            if subschemas.is_array() {
-                let subschemas_clone = subschemas.clone();
-                obj.remove("oneOf");
-                obj.insert("anyOf".to_string(), subschemas_clone);
-            }
+        if let Some(subschemas) = obj.get_mut("oneOf")
+            && subschemas.is_array()
+        {
+            let subschemas_clone = subschemas.clone();
+            obj.remove("oneOf");
+            obj.insert("anyOf".to_string(), subschemas_clone);
         }
 
         // Recursively process all nested objects and arrays
diff --git a/crates/assistant_tools/src/edit_agent.rs b/crates/assistant_tools/src/edit_agent.rs
index aa321aa8f3..665ece2baa 100644
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -672,29 +672,30 @@ impl EditAgent {
         cx: &mut AsyncApp,
     ) -> Result<BoxStream<'static, Result<String, LanguageModelCompletionError>>> {
         let mut messages_iter = conversation.messages.iter_mut();
-        if let Some(last_message) = messages_iter.next_back() {
-            if last_message.role == Role::Assistant {
-                let old_content_len = last_message.content.len();
-                last_message
-                    .content
-                    .retain(|content| !matches!(content, MessageContent::ToolUse(_)));
-                let new_content_len = last_message.content.len();
+        if let Some(last_message) = messages_iter.next_back()
+            && last_message.role == Role::Assistant
+        {
+            let old_content_len = last_message.content.len();
+            last_message
+                .content
+                .retain(|content| !matches!(content, MessageContent::ToolUse(_)));
+            let new_content_len = last_message.content.len();
 
-                // We just removed pending tool uses from the content of the
-                // last message, so it doesn't make sense to cache it anymore
-                // (e.g., the message will look very different on the next
-                // request). Thus, we move the flag to the message prior to it,
-                // as it will still be a valid prefix of the conversation.
-                if old_content_len != new_content_len && last_message.cache {
-                    if let Some(prev_message) = messages_iter.next_back() {
-                        last_message.cache = false;
-                        prev_message.cache = true;
-                    }
-                }
+            // We just removed pending tool uses from the content of the
+            // last message, so it doesn't make sense to cache it anymore
+            // (e.g., the message will look very different on the next
+            // request). Thus, we move the flag to the message prior to it,
+            // as it will still be a valid prefix of the conversation.
+            if old_content_len != new_content_len
+                && last_message.cache
+                && let Some(prev_message) = messages_iter.next_back()
+            {
+                last_message.cache = false;
+                prev_message.cache = true;
+            }
 
-                if last_message.content.is_empty() {
-                    conversation.messages.pop();
-                }
+            if last_message.content.is_empty() {
+                conversation.messages.pop();
             }
         }
 
diff --git a/crates/assistant_tools/src/edit_agent/evals.rs b/crates/assistant_tools/src/edit_agent/evals.rs
index 9a8e762455..0d529a5573 100644
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1283,14 +1283,14 @@ impl EvalAssertion {
 
             // Parse the score from the response
             let re = regex::Regex::new(r"<score>(\d+)</score>").unwrap();
-            if let Some(captures) = re.captures(&output) {
-                if let Some(score_match) = captures.get(1) {
-                    let score = score_match.as_str().parse().unwrap_or(0);
-                    return Ok(EvalAssertionOutcome {
-                        score,
-                        message: Some(output),
-                    });
-                }
+            if let Some(captures) = re.captures(&output)
+                && let Some(score_match) = captures.get(1)
+            {
+                let score = score_match.as_str().parse().unwrap_or(0);
+                return Ok(EvalAssertionOutcome {
+                    score,
+                    message: Some(output),
+                });
             }
 
             anyhow::bail!("No score found in response. Raw output: {output}");
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index 039f9d9316..2d6b5ce924 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -155,10 +155,10 @@ impl Tool for EditFileTool {
 
         // It's also possible that the global config dir is configured to be inside the project,
         // so check for that edge case too.
-        if let Ok(canonical_path) = std::fs::canonicalize(&input.path) {
-            if canonical_path.starts_with(paths::config_dir()) {
-                return true;
-            }
+        if let Ok(canonical_path) = std::fs::canonicalize(&input.path)
+            && canonical_path.starts_with(paths::config_dir())
+        {
+            return true;
         }
 
         // Check if path is inside the global config directory
@@ -199,10 +199,10 @@ impl Tool for EditFileTool {
                     .any(|c| c.as_os_str() == local_settings_folder.as_os_str())
                 {
                     description.push_str(" (local settings)");
-                } else if let Ok(canonical_path) = std::fs::canonicalize(&input.path) {
-                    if canonical_path.starts_with(paths::config_dir()) {
-                        description.push_str(" (global settings)");
-                    }
+                } else if let Ok(canonical_path) = std::fs::canonicalize(&input.path)
+                    && canonical_path.starts_with(paths::config_dir())
+                {
+                    description.push_str(" (global settings)");
                 }
 
                 description
diff --git a/crates/assistant_tools/src/grep_tool.rs b/crates/assistant_tools/src/grep_tool.rs
index 1f00332c5a..1dd74b99e7 100644
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -188,15 +188,14 @@ impl Tool for GrepTool {
                 // Check if this file should be excluded based on its worktree settings
                 if let Ok(Some(project_path)) = project.read_with(cx, |project, cx| {
                     project.find_project_path(&path, cx)
-                }) {
-                    if cx.update(|cx| {
+                })
+                    && cx.update(|cx| {
                         let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
                         worktree_settings.is_path_excluded(&project_path.path)
                             || worktree_settings.is_path_private(&project_path.path)
                     }).unwrap_or(false) {
                         continue;
                     }
-                }
 
                 while *parse_status.borrow() != ParseStatus::Idle {
                     parse_status.changed().await?;
@@ -284,12 +283,11 @@ impl Tool for GrepTool {
                     output.extend(snapshot.text_for_range(range));
                     output.push_str("\n```\n");
 
-                    if let Some(ancestor_range) = ancestor_range {
-                        if end_row < ancestor_range.end.row {
+                    if let Some(ancestor_range) = ancestor_range
+                        && end_row < ancestor_range.end.row {
                             let remaining_lines = ancestor_range.end.row - end_row;
                             writeln!(output, "\n{} lines remaining in ancestor node. Read the file to see all.", remaining_lines)?;
                         }
-                    }
 
                     matches_found += 1;
                 }
diff --git a/crates/assistant_tools/src/schema.rs b/crates/assistant_tools/src/schema.rs
index 10a8bf0acd..dab7384efd 100644
--- a/crates/assistant_tools/src/schema.rs
+++ b/crates/assistant_tools/src/schema.rs
@@ -43,12 +43,11 @@ impl Transform for ToJsonSchemaSubsetTransform {
     fn transform(&mut self, schema: &mut Schema) {
         // Ensure that the type field is not an array, this happens when we use
         // Option<T>, the type will be [T, "null"].
-        if let Some(type_field) = schema.get_mut("type") {
-            if let Some(types) = type_field.as_array() {
-                if let Some(first_type) = types.first() {
-                    *type_field = first_type.clone();
-                }
-            }
+        if let Some(type_field) = schema.get_mut("type")
+            && let Some(types) = type_field.as_array()
+            && let Some(first_type) = types.first()
+        {
+            *type_field = first_type.clone();
         }
 
         // oneOf is not supported, use anyOf instead
diff --git a/crates/auto_update_helper/src/dialog.rs b/crates/auto_update_helper/src/dialog.rs
index 757819df51..903ac34da2 100644
--- a/crates/auto_update_helper/src/dialog.rs
+++ b/crates/auto_update_helper/src/dialog.rs
@@ -186,11 +186,11 @@ unsafe extern "system" fn wnd_proc(
         }),
         WM_TERMINATE => {
             with_dialog_data(hwnd, |data| {
-                if let Ok(result) = data.borrow_mut().rx.recv() {
-                    if let Err(e) = result {
-                        log::error!("Failed to update Zed: {:?}", e);
-                        show_error(format!("Error: {:?}", e));
-                    }
+                if let Ok(result) = data.borrow_mut().rx.recv()
+                    && let Err(e) = result
+                {
+                    log::error!("Failed to update Zed: {:?}", e);
+                    show_error(format!("Error: {:?}", e));
                 }
             });
             unsafe { PostQuitMessage(0) };
diff --git a/crates/breadcrumbs/src/breadcrumbs.rs b/crates/breadcrumbs/src/breadcrumbs.rs
index 990fc27fbd..a6b27476fe 100644
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -82,11 +82,12 @@ impl Render for Breadcrumbs {
             }
             text_style.color = Color::Muted.color(cx);
 
-            if index == 0 && !TabBarSettings::get_global(cx).show && active_item.is_dirty(cx) {
-                if let Some(styled_element) = apply_dirty_filename_style(&segment, &text_style, cx)
-                {
-                    return styled_element;
-                }
+            if index == 0
+                && !TabBarSettings::get_global(cx).show
+                && active_item.is_dirty(cx)
+                && let Some(styled_element) = apply_dirty_filename_style(&segment, &text_style, cx)
+            {
+                return styled_element;
             }
 
             StyledText::new(segment.text.replace('\n', "⏎"))
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index e20ea9713f..6b38fe5576 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -572,14 +572,14 @@ impl BufferDiffInner {
                         pending_range.end.column = 0;
                     }
 
-                    if pending_range == (start_point..end_point) {
-                        if !buffer.has_edits_since_in_range(
+                    if pending_range == (start_point..end_point)
+                        && !buffer.has_edits_since_in_range(
                             &pending_hunk.buffer_version,
                             start_anchor..end_anchor,
-                        ) {
-                            has_pending = true;
-                            secondary_status = pending_hunk.new_status;
-                        }
+                        )
+                    {
+                        has_pending = true;
+                        secondary_status = pending_hunk.new_status;
                     }
                 }
 
@@ -1036,16 +1036,15 @@ impl BufferDiff {
                 _ => (true, Some(text::Anchor::MIN..text::Anchor::MAX)),
             };
 
-        if let Some(secondary_changed_range) = secondary_diff_change {
-            if let Some(secondary_hunk_range) =
+        if let Some(secondary_changed_range) = secondary_diff_change
+            && let Some(secondary_hunk_range) =
                 self.range_to_hunk_range(secondary_changed_range, buffer, cx)
-            {
-                if let Some(range) = &mut changed_range {
-                    range.start = secondary_hunk_range.start.min(&range.start, buffer);
-                    range.end = secondary_hunk_range.end.max(&range.end, buffer);
-                } else {
-                    changed_range = Some(secondary_hunk_range);
-                }
+        {
+            if let Some(range) = &mut changed_range {
+                range.start = secondary_hunk_range.start.min(&range.start, buffer);
+                range.end = secondary_hunk_range.end.max(&range.end, buffer);
+            } else {
+                changed_range = Some(secondary_hunk_range);
             }
         }
 
diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
index 73cb8518a6..bab99cd3f3 100644
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -827,24 +827,23 @@ impl Room {
                             );
 
                             Audio::play_sound(Sound::Joined, cx);
-                            if let Some(livekit_participants) = &livekit_participants {
-                                if let Some(livekit_participant) = livekit_participants
+                            if let Some(livekit_participants) = &livekit_participants
+                                && let Some(livekit_participant) = livekit_participants
                                     .get(&ParticipantIdentity(user.id.to_string()))
+                            {
+                                for publication in
+                                    livekit_participant.track_publications().into_values()
                                 {
-                                    for publication in
-                                        livekit_participant.track_publications().into_values()
-                                    {
-                                        if let Some(track) = publication.track() {
-                                            this.livekit_room_updated(
-                                                RoomEvent::TrackSubscribed {
-                                                    track,
-                                                    publication,
-                                                    participant: livekit_participant.clone(),
-                                                },
-                                                cx,
-                                            )
-                                            .warn_on_err();
-                                        }
+                                    if let Some(track) = publication.track() {
+                                        this.livekit_room_updated(
+                                            RoomEvent::TrackSubscribed {
+                                                track,
+                                                publication,
+                                                participant: livekit_participant.clone(),
+                                            },
+                                            cx,
+                                        )
+                                        .warn_on_err();
                                     }
                                 }
                             }
@@ -940,10 +939,9 @@ impl Room {
                                 self.client.user_id()
                             )
                         })?;
-                if self.live_kit.as_ref().map_or(true, |kit| kit.deafened) {
-                    if publication.is_audio() {
-                        publication.set_enabled(false, cx);
-                    }
+                if self.live_kit.as_ref().map_or(true, |kit| kit.deafened) && publication.is_audio()
+                {
+                    publication.set_enabled(false, cx);
                 }
                 match track {
                     livekit_client::RemoteTrack::Audio(track) => {
@@ -1005,10 +1003,10 @@ impl Room {
                 for (sid, participant) in &mut self.remote_participants {
                     participant.speaking = speaker_ids.binary_search(sid).is_ok();
                 }
-                if let Some(id) = self.client.user_id() {
-                    if let Some(room) = &mut self.live_kit {
-                        room.speaking = speaker_ids.binary_search(&id).is_ok();
-                    }
+                if let Some(id) = self.client.user_id()
+                    && let Some(room) = &mut self.live_kit
+                {
+                    room.speaking = speaker_ids.binary_search(&id).is_ok();
                 }
             }
 
@@ -1042,18 +1040,16 @@ impl Room {
                     if let LocalTrack::Published {
                         track_publication, ..
                     } = &room.microphone_track
+                        && track_publication.sid() == publication.sid()
                     {
-                        if track_publication.sid() == publication.sid() {
-                            room.microphone_track = LocalTrack::None;
-                        }
+                        room.microphone_track = LocalTrack::None;
                     }
                     if let LocalTrack::Published {
                         track_publication, ..
                     } = &room.screen_track
+                        && track_publication.sid() == publication.sid()
                     {
-                        if track_publication.sid() == publication.sid() {
-                            room.screen_track = LocalTrack::None;
-                        }
+                        room.screen_track = LocalTrack::None;
                     }
                 }
             }
@@ -1484,10 +1480,8 @@ impl Room {
 
             self.set_deafened(deafened, cx);
 
-            if should_change_mute {
-                if let Some(task) = self.set_mute(deafened, cx) {
-                    task.detach_and_log_err(cx);
-                }
+            if should_change_mute && let Some(task) = self.set_mute(deafened, cx) {
+                task.detach_and_log_err(cx);
             }
         }
     }
diff --git a/crates/channel/src/channel_buffer.rs b/crates/channel/src/channel_buffer.rs
index 183f7eb3c6..a367ffbf09 100644
--- a/crates/channel/src/channel_buffer.rs
+++ b/crates/channel/src/channel_buffer.rs
@@ -191,12 +191,11 @@ impl ChannelBuffer {
                 operation,
                 is_local: true,
             } => {
-                if *ZED_ALWAYS_ACTIVE {
-                    if let language::Operation::UpdateSelections { selections, .. } = operation {
-                        if selections.is_empty() {
-                            return;
-                        }
-                    }
+                if *ZED_ALWAYS_ACTIVE
+                    && let language::Operation::UpdateSelections { selections, .. } = operation
+                    && selections.is_empty()
+                {
+                    return;
                 }
                 let operation = language::proto::serialize_operation(operation);
                 self.client
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index 4ac37ffd14..02b5ccec68 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -329,24 +329,24 @@ impl ChannelChat {
         loop {
             let step = chat
                 .update(&mut cx, |chat, cx| {
-                    if let Some(first_id) = chat.first_loaded_message_id() {
-                        if first_id <= message_id {
-                            let mut cursor = chat
-                                .messages
-                                .cursor::<Dimensions<ChannelMessageId, Count>>(&());
-                            let message_id = ChannelMessageId::Saved(message_id);
-                            cursor.seek(&message_id, Bias::Left);
-                            return ControlFlow::Break(
-                                if cursor
-                                    .item()
-                                    .map_or(false, |message| message.id == message_id)
-                                {
-                                    Some(cursor.start().1.0)
-                                } else {
-                                    None
-                                },
-                            );
-                        }
+                    if let Some(first_id) = chat.first_loaded_message_id()
+                        && first_id <= message_id
+                    {
+                        let mut cursor = chat
+                            .messages
+                            .cursor::<Dimensions<ChannelMessageId, Count>>(&());
+                        let message_id = ChannelMessageId::Saved(message_id);
+                        cursor.seek(&message_id, Bias::Left);
+                        return ControlFlow::Break(
+                            if cursor
+                                .item()
+                                .map_or(false, |message| message.id == message_id)
+                            {
+                                Some(cursor.start().1.0)
+                            } else {
+                                None
+                            },
+                        );
                     }
                     ControlFlow::Continue(chat.load_more_messages(cx))
                 })
@@ -359,22 +359,21 @@ impl ChannelChat {
     }
 
     pub fn acknowledge_last_message(&mut self, cx: &mut Context<Self>) {
-        if let ChannelMessageId::Saved(latest_message_id) = self.messages.summary().max_id {
-            if self
+        if let ChannelMessageId::Saved(latest_message_id) = self.messages.summary().max_id
+            && self
                 .last_acknowledged_id
                 .map_or(true, |acknowledged_id| acknowledged_id < latest_message_id)
-            {
-                self.rpc
-                    .send(proto::AckChannelMessage {
-                        channel_id: self.channel_id.0,
-                        message_id: latest_message_id,
-                    })
-                    .ok();
-                self.last_acknowledged_id = Some(latest_message_id);
-                self.channel_store.update(cx, |store, cx| {
-                    store.acknowledge_message_id(self.channel_id, latest_message_id, cx);
-                });
-            }
+        {
+            self.rpc
+                .send(proto::AckChannelMessage {
+                    channel_id: self.channel_id.0,
+                    message_id: latest_message_id,
+                })
+                .ok();
+            self.last_acknowledged_id = Some(latest_message_id);
+            self.channel_store.update(cx, |store, cx| {
+                store.acknowledge_message_id(self.channel_id, latest_message_id, cx);
+            });
         }
     }
 
@@ -407,10 +406,10 @@ impl ChannelChat {
         let missing_ancestors = loaded_messages
             .iter()
             .filter_map(|message| {
-                if let Some(ancestor_id) = message.reply_to_message_id {
-                    if !loaded_message_ids.contains(&ancestor_id) {
-                        return Some(ancestor_id);
-                    }
+                if let Some(ancestor_id) = message.reply_to_message_id
+                    && !loaded_message_ids.contains(&ancestor_id)
+                {
+                    return Some(ancestor_id);
                 }
                 None
             })
@@ -646,32 +645,32 @@ impl ChannelChat {
     fn message_removed(&mut self, id: u64, cx: &mut Context<Self>) {
         let mut cursor = self.messages.cursor::<ChannelMessageId>(&());
         let mut messages = cursor.slice(&ChannelMessageId::Saved(id), Bias::Left);
-        if let Some(item) = cursor.item() {
-            if item.id == ChannelMessageId::Saved(id) {
-                let deleted_message_ix = messages.summary().count;
-                cursor.next();
-                messages.append(cursor.suffix(), &());
-                drop(cursor);
-                self.messages = messages;
+        if let Some(item) = cursor.item()
+            && item.id == ChannelMessageId::Saved(id)
+        {
+            let deleted_message_ix = messages.summary().count;
+            cursor.next();
+            messages.append(cursor.suffix(), &());
+            drop(cursor);
+            self.messages = messages;
 
-                // If the message that was deleted was the last acknowledged message,
-                // replace the acknowledged message with an earlier one.
-                self.channel_store.update(cx, |store, _| {
-                    let summary = self.messages.summary();
-                    if summary.count == 0 {
-                        store.set_acknowledged_message_id(self.channel_id, None);
-                    } else if deleted_message_ix == summary.count {
-                        if let ChannelMessageId::Saved(id) = summary.max_id {
-                            store.set_acknowledged_message_id(self.channel_id, Some(id));
-                        }
-                    }
-                });
+            // If the message that was deleted was the last acknowledged message,
+            // replace the acknowledged message with an earlier one.
+            self.channel_store.update(cx, |store, _| {
+                let summary = self.messages.summary();
+                if summary.count == 0 {
+                    store.set_acknowledged_message_id(self.channel_id, None);
+                } else if deleted_message_ix == summary.count
+                    && let ChannelMessageId::Saved(id) = summary.max_id
+                {
+                    store.set_acknowledged_message_id(self.channel_id, Some(id));
+                }
+            });
 
-                cx.emit(ChannelChatEvent::MessagesUpdated {
-                    old_range: deleted_message_ix..deleted_message_ix + 1,
-                    new_count: 0,
-                });
-            }
+            cx.emit(ChannelChatEvent::MessagesUpdated {
+                old_range: deleted_message_ix..deleted_message_ix + 1,
+                new_count: 0,
+            });
         }
     }
 
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 4ad156b9fb..6d1716a7ea 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -262,13 +262,12 @@ impl ChannelStore {
                         }
                     }
                     status = status_receiver.next().fuse() => {
-                        if let Some(status) = status {
-                            if status.is_connected() {
+                        if let Some(status) = status
+                            && status.is_connected() {
                                 this.update(cx, |this, _cx| {
                                     this.initialize();
                                 }).ok();
                             }
-                        }
                         continue;
                     }
                     _ = timer => {
@@ -336,10 +335,10 @@ impl ChannelStore {
     }
 
     pub fn has_open_channel_buffer(&self, channel_id: ChannelId, _cx: &App) -> bool {
-        if let Some(buffer) = self.opened_buffers.get(&channel_id) {
-            if let OpenEntityHandle::Open(buffer) = buffer {
-                return buffer.upgrade().is_some();
-            }
+        if let Some(buffer) = self.opened_buffers.get(&channel_id)
+            && let OpenEntityHandle::Open(buffer) = buffer
+        {
+            return buffer.upgrade().is_some();
         }
         false
     }
@@ -408,13 +407,12 @@ impl ChannelStore {
 
     pub fn last_acknowledge_message_id(&self, channel_id: ChannelId) -> Option<u64> {
         self.channel_states.get(&channel_id).and_then(|state| {
-            if let Some(last_message_id) = state.latest_chat_message {
-                if state
+            if let Some(last_message_id) = state.latest_chat_message
+                && state
                     .last_acknowledged_message_id()
                     .is_some_and(|id| id < last_message_id)
-                {
-                    return state.last_acknowledged_message_id();
-                }
+            {
+                return state.last_acknowledged_message_id();
             }
 
             None
@@ -962,27 +960,27 @@ impl ChannelStore {
         self.disconnect_channel_buffers_task.take();
 
         for chat in self.opened_chats.values() {
-            if let OpenEntityHandle::Open(chat) = chat {
-                if let Some(chat) = chat.upgrade() {
-                    chat.update(cx, |chat, cx| {
-                        chat.rejoin(cx);
-                    });
-                }
+            if let OpenEntityHandle::Open(chat) = chat
+                && let Some(chat) = chat.upgrade()
+            {
+                chat.update(cx, |chat, cx| {
+                    chat.rejoin(cx);
+                });
             }
         }
 
         let mut buffer_versions = Vec::new();
         for buffer in self.opened_buffers.values() {
-            if let OpenEntityHandle::Open(buffer) = buffer {
-                if let Some(buffer) = buffer.upgrade() {
-                    let channel_buffer = buffer.read(cx);
-                    let buffer = channel_buffer.buffer().read(cx);
-                    buffer_versions.push(proto::ChannelBufferVersion {
-                        channel_id: channel_buffer.channel_id.0,
-                        epoch: channel_buffer.epoch(),
-                        version: language::proto::serialize_version(&buffer.version()),
-                    });
-                }
+            if let OpenEntityHandle::Open(buffer) = buffer
+                && let Some(buffer) = buffer.upgrade()
+            {
+                let channel_buffer = buffer.read(cx);
+                let buffer = channel_buffer.buffer().read(cx);
+                buffer_versions.push(proto::ChannelBufferVersion {
+                    channel_id: channel_buffer.channel_id.0,
+                    epoch: channel_buffer.epoch(),
+                    version: language::proto::serialize_version(&buffer.version()),
+                });
             }
         }
 
@@ -1078,10 +1076,10 @@ impl ChannelStore {
                 if let Some(this) = this.upgrade() {
                     this.update(cx, |this, cx| {
                         for (_, buffer) in &this.opened_buffers {
-                            if let OpenEntityHandle::Open(buffer) = &buffer {
-                                if let Some(buffer) = buffer.upgrade() {
-                                    buffer.update(cx, |buffer, cx| buffer.disconnect(cx));
-                                }
+                            if let OpenEntityHandle::Open(buffer) = &buffer
+                                && let Some(buffer) = buffer.upgrade()
+                            {
+                                buffer.update(cx, |buffer, cx| buffer.disconnect(cx));
                             }
                         }
                     })
@@ -1157,10 +1155,9 @@ impl ChannelStore {
                     }
                     if let Some(OpenEntityHandle::Open(buffer)) =
                         self.opened_buffers.remove(&channel_id)
+                        && let Some(buffer) = buffer.upgrade()
                     {
-                        if let Some(buffer) = buffer.upgrade() {
-                            buffer.update(cx, ChannelBuffer::disconnect);
-                        }
+                        buffer.update(cx, ChannelBuffer::disconnect);
                     }
                 }
             }
@@ -1170,12 +1167,11 @@ impl ChannelStore {
                 let id = ChannelId(channel.id);
                 let channel_changed = index.insert(channel);
 
-                if channel_changed {
-                    if let Some(OpenEntityHandle::Open(buffer)) = self.opened_buffers.get(&id) {
-                        if let Some(buffer) = buffer.upgrade() {
-                            buffer.update(cx, ChannelBuffer::channel_changed);
-                        }
-                    }
+                if channel_changed
+                    && let Some(OpenEntityHandle::Open(buffer)) = self.opened_buffers.get(&id)
+                    && let Some(buffer) = buffer.upgrade()
+                {
+                    buffer.update(cx, ChannelBuffer::channel_changed);
                 }
             }
 
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index a61d8e0911..d8b46dabb6 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -587,13 +587,10 @@ mod flatpak {
     pub fn set_bin_if_no_escape(mut args: super::Args) -> super::Args {
         if env::var(NO_ESCAPE_ENV_NAME).is_ok()
             && env::var("FLATPAK_ID").map_or(false, |id| id.starts_with("dev.zed.Zed"))
+            && args.zed.is_none()
         {
-            if args.zed.is_none() {
-                args.zed = Some("/app/libexec/zed-editor".into());
-                unsafe {
-                    env::set_var("ZED_UPDATE_EXPLANATION", "Please use flatpak to update zed")
-                };
-            }
+            args.zed = Some("/app/libexec/zed-editor".into());
+            unsafe { env::set_var("ZED_UPDATE_EXPLANATION", "Please use flatpak to update zed") };
         }
         args
     }
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 66d5fd89b1..d7d8b60211 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -864,22 +864,23 @@ impl Client {
         let mut credentials = None;
 
         let old_credentials = self.state.read().credentials.clone();
-        if let Some(old_credentials) = old_credentials {
-            if self.validate_credentials(&old_credentials, cx).await? {
-                credentials = Some(old_credentials);
-            }
+        if let Some(old_credentials) = old_credentials
+            && self.validate_credentials(&old_credentials, cx).await?
+        {
+            credentials = Some(old_credentials);
         }
 
-        if credentials.is_none() && try_provider {
-            if let Some(stored_credentials) = self.credentials_provider.read_credentials(cx).await {
-                if self.validate_credentials(&stored_credentials, cx).await? {
-                    credentials = Some(stored_credentials);
-                } else {
-                    self.credentials_provider
-                        .delete_credentials(cx)
-                        .await
-                        .log_err();
-                }
+        if credentials.is_none()
+            && try_provider
+            && let Some(stored_credentials) = self.credentials_provider.read_credentials(cx).await
+        {
+            if self.validate_credentials(&stored_credentials, cx).await? {
+                credentials = Some(stored_credentials);
+            } else {
+                self.credentials_provider
+                    .delete_credentials(cx)
+                    .await
+                    .log_err();
             }
         }
 
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index da7f50076b..3509a8c57f 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -894,10 +894,10 @@ impl UserStore {
         let mut ret = Vec::with_capacity(users.len());
         for user in users {
             let user = User::new(user);
-            if let Some(old) = self.users.insert(user.id, user.clone()) {
-                if old.github_login != user.github_login {
-                    self.by_github_login.remove(&old.github_login);
-                }
+            if let Some(old) = self.users.insert(user.id, user.clone())
+                && old.github_login != user.github_login
+            {
+                self.by_github_login.remove(&old.github_login);
             }
             self.by_github_login
                 .insert(user.github_login.clone(), user.id);
diff --git a/crates/collab/src/api/events.rs b/crates/collab/src/api/events.rs
index cd1dc42e64..c500872fd7 100644
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -149,35 +149,35 @@ pub async fn post_crash(
         "crash report"
     );
 
-    if let Some(kinesis_client) = app.kinesis_client.clone() {
-        if let Some(stream) = app.config.kinesis_stream.clone() {
-            let properties = json!({
-                "app_version": report.header.app_version,
-                "os_version": report.header.os_version,
-                "os_name": "macOS",
-                "bundle_id": report.header.bundle_id,
-                "incident_id": report.header.incident_id,
-                "installation_id": installation_id,
-                "description": description,
-                "backtrace": summary,
-            });
-            let row = SnowflakeRow::new(
-                "Crash Reported",
-                None,
-                false,
-                Some(installation_id),
-                properties,
-            );
-            let data = serde_json::to_vec(&row)?;
-            kinesis_client
-                .put_record()
-                .stream_name(stream)
-                .partition_key(row.insert_id.unwrap_or_default())
-                .data(data.into())
-                .send()
-                .await
-                .log_err();
-        }
+    if let Some(kinesis_client) = app.kinesis_client.clone()
+        && let Some(stream) = app.config.kinesis_stream.clone()
+    {
+        let properties = json!({
+            "app_version": report.header.app_version,
+            "os_version": report.header.os_version,
+            "os_name": "macOS",
+            "bundle_id": report.header.bundle_id,
+            "incident_id": report.header.incident_id,
+            "installation_id": installation_id,
+            "description": description,
+            "backtrace": summary,
+        });
+        let row = SnowflakeRow::new(
+            "Crash Reported",
+            None,
+            false,
+            Some(installation_id),
+            properties,
+        );
+        let data = serde_json::to_vec(&row)?;
+        kinesis_client
+            .put_record()
+            .stream_name(stream)
+            .partition_key(row.insert_id.unwrap_or_default())
+            .data(data.into())
+            .send()
+            .await
+            .log_err();
     }
 
     if let Some(slack_panics_webhook) = app.config.slack_panics_webhook.clone() {
@@ -359,34 +359,34 @@ pub async fn post_panic(
         "panic report"
     );
 
-    if let Some(kinesis_client) = app.kinesis_client.clone() {
-        if let Some(stream) = app.config.kinesis_stream.clone() {
-            let properties = json!({
-                "app_version": panic.app_version,
-                "os_name": panic.os_name,
-                "os_version": panic.os_version,
-                "incident_id": incident_id,
-                "installation_id": panic.installation_id,
-                "description": panic.payload,
-                "backtrace": backtrace,
-            });
-            let row = SnowflakeRow::new(
-                "Panic Reported",
-                None,
-                false,
-                panic.installation_id.clone(),
-                properties,
-            );
-            let data = serde_json::to_vec(&row)?;
-            kinesis_client
-                .put_record()
-                .stream_name(stream)
-                .partition_key(row.insert_id.unwrap_or_default())
-                .data(data.into())
-                .send()
-                .await
-                .log_err();
-        }
+    if let Some(kinesis_client) = app.kinesis_client.clone()
+        && let Some(stream) = app.config.kinesis_stream.clone()
+    {
+        let properties = json!({
+            "app_version": panic.app_version,
+            "os_name": panic.os_name,
+            "os_version": panic.os_version,
+            "incident_id": incident_id,
+            "installation_id": panic.installation_id,
+            "description": panic.payload,
+            "backtrace": backtrace,
+        });
+        let row = SnowflakeRow::new(
+            "Panic Reported",
+            None,
+            false,
+            panic.installation_id.clone(),
+            properties,
+        );
+        let data = serde_json::to_vec(&row)?;
+        kinesis_client
+            .put_record()
+            .stream_name(stream)
+            .partition_key(row.insert_id.unwrap_or_default())
+            .data(data.into())
+            .send()
+            .await
+            .log_err();
     }
 
     if !report_to_slack(&panic) {
@@ -518,31 +518,31 @@ pub async fn post_events(
     let first_event_at = chrono::Utc::now()
         - chrono::Duration::milliseconds(last_event.milliseconds_since_first_event);
 
-    if let Some(kinesis_client) = app.kinesis_client.clone() {
-        if let Some(stream) = app.config.kinesis_stream.clone() {
-            let mut request = kinesis_client.put_records().stream_name(stream);
-            let mut has_records = false;
-            for row in for_snowflake(
-                request_body.clone(),
-                first_event_at,
-                country_code.clone(),
-                checksum_matched,
-            ) {
-                if let Some(data) = serde_json::to_vec(&row).log_err() {
-                    request = request.records(
-                        aws_sdk_kinesis::types::PutRecordsRequestEntry::builder()
-                            .partition_key(request_body.system_id.clone().unwrap_or_default())
-                            .data(data.into())
-                            .build()
-                            .unwrap(),
-                    );
-                    has_records = true;
-                }
-            }
-            if has_records {
-                request.send().await.log_err();
+    if let Some(kinesis_client) = app.kinesis_client.clone()
+        && let Some(stream) = app.config.kinesis_stream.clone()
+    {
+        let mut request = kinesis_client.put_records().stream_name(stream);
+        let mut has_records = false;
+        for row in for_snowflake(
+            request_body.clone(),
+            first_event_at,
+            country_code.clone(),
+            checksum_matched,
+        ) {
+            if let Some(data) = serde_json::to_vec(&row).log_err() {
+                request = request.records(
+                    aws_sdk_kinesis::types::PutRecordsRequestEntry::builder()
+                        .partition_key(request_body.system_id.clone().unwrap_or_default())
+                        .data(data.into())
+                        .build()
+                        .unwrap(),
+                );
+                has_records = true;
             }
         }
+        if has_records {
+            request.send().await.log_err();
+        }
     };
 
     Ok(())
diff --git a/crates/collab/src/api/extensions.rs b/crates/collab/src/api/extensions.rs
index 9170c39e47..1ace433db2 100644
--- a/crates/collab/src/api/extensions.rs
+++ b/crates/collab/src/api/extensions.rs
@@ -337,8 +337,7 @@ async fn fetch_extensions_from_blob_store(
             if known_versions
                 .binary_search_by_key(&published_version, |known_version| known_version)
                 .is_err()
-            {
-                if let Some(extension) = fetch_extension_manifest(
+                && let Some(extension) = fetch_extension_manifest(
                     blob_store_client,
                     blob_store_bucket,
                     extension_id,
@@ -346,12 +345,11 @@ async fn fetch_extensions_from_blob_store(
                 )
                 .await
                 .log_err()
-                {
-                    new_versions
-                        .entry(extension_id)
-                        .or_default()
-                        .push(extension);
-                }
+            {
+                new_versions
+                    .entry(extension_id)
+                    .or_default()
+                    .push(extension);
             }
         }
     }
diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs
index 00f37c6758..5a2a1329bb 100644
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -79,27 +79,27 @@ pub async fn validate_header<B>(mut req: Request<B>, next: Next<B>) -> impl Into
         verify_access_token(access_token, user_id, &state.db).await
     };
 
-    if let Ok(validate_result) = validate_result {
-        if validate_result.is_valid {
-            let user = state
-                .db
-                .get_user_by_id(user_id)
-                .await?
-                .with_context(|| format!("user {user_id} not found"))?;
+    if let Ok(validate_result) = validate_result
+        && validate_result.is_valid
+    {
+        let user = state
+            .db
+            .get_user_by_id(user_id)
+            .await?
+            .with_context(|| format!("user {user_id} not found"))?;
 
-            if let Some(impersonator_id) = validate_result.impersonator_id {
-                let admin = state
-                    .db
-                    .get_user_by_id(impersonator_id)
-                    .await?
-                    .with_context(|| format!("user {impersonator_id} not found"))?;
-                req.extensions_mut()
-                    .insert(Principal::Impersonated { user, admin });
-            } else {
-                req.extensions_mut().insert(Principal::User(user));
-            };
-            return Ok::<_, Error>(next.run(req).await);
-        }
+        if let Some(impersonator_id) = validate_result.impersonator_id {
+            let admin = state
+                .db
+                .get_user_by_id(impersonator_id)
+                .await?
+                .with_context(|| format!("user {impersonator_id} not found"))?;
+            req.extensions_mut()
+                .insert(Principal::Impersonated { user, admin });
+        } else {
+            req.extensions_mut().insert(Principal::User(user));
+        };
+        return Ok::<_, Error>(next.run(req).await);
     }
 
     Err(Error::http(
diff --git a/crates/collab/src/db/queries/extensions.rs b/crates/collab/src/db/queries/extensions.rs
index 7d8aad2be4..f218ff2850 100644
--- a/crates/collab/src/db/queries/extensions.rs
+++ b/crates/collab/src/db/queries/extensions.rs
@@ -87,10 +87,10 @@ impl Database {
                 continue;
             };
 
-            if let Some((_, max_extension_version)) = &max_versions.get(&version.extension_id) {
-                if max_extension_version > &extension_version {
-                    continue;
-                }
+            if let Some((_, max_extension_version)) = &max_versions.get(&version.extension_id)
+                && max_extension_version > &extension_version
+            {
+                continue;
             }
 
             if let Some(constraints) = constraints {
@@ -331,10 +331,10 @@ impl Database {
                 .exec_without_returning(&*tx)
                 .await?;
 
-                if let Ok(db_version) = semver::Version::parse(&extension.latest_version) {
-                    if db_version >= latest_version.version {
-                        continue;
-                    }
+                if let Ok(db_version) = semver::Version::parse(&extension.latest_version)
+                    && db_version >= latest_version.version
+                {
+                    continue;
                 }
 
                 let mut extension = extension.into_active_model();
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 9abab25ede..393f2c80f8 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -1321,10 +1321,10 @@ impl Database {
             .await?;
 
         let mut connection_ids = HashSet::default();
-        if let Some(host_connection) = project.host_connection().log_err() {
-            if !exclude_dev_server {
-                connection_ids.insert(host_connection);
-            }
+        if let Some(host_connection) = project.host_connection().log_err()
+            && !exclude_dev_server
+        {
+            connection_ids.insert(host_connection);
         }
 
         while let Some(collaborator) = collaborators.next().await {
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index ef749ac9b7..01f553edf2 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -616,10 +616,10 @@ impl Server {
                             }
                         }
 
-                        if let Some(live_kit) = livekit_client.as_ref() {
-                            if delete_livekit_room {
-                                live_kit.delete_room(livekit_room).await.trace_err();
-                            }
+                        if let Some(live_kit) = livekit_client.as_ref()
+                            && delete_livekit_room
+                        {
+                            live_kit.delete_room(livekit_room).await.trace_err();
                         }
                     }
                 }
@@ -1015,47 +1015,47 @@ impl Server {
         inviter_id: UserId,
         invitee_id: UserId,
     ) -> Result<()> {
-        if let Some(user) = self.app_state.db.get_user_by_id(inviter_id).await? {
-            if let Some(code) = &user.invite_code {
-                let pool = self.connection_pool.lock();
-                let invitee_contact = contact_for_user(invitee_id, false, &pool);
-                for connection_id in pool.user_connection_ids(inviter_id) {
-                    self.peer.send(
-                        connection_id,
-                        proto::UpdateContacts {
-                            contacts: vec![invitee_contact.clone()],
-                            ..Default::default()
-                        },
-                    )?;
-                    self.peer.send(
-                        connection_id,
-                        proto::UpdateInviteInfo {
-                            url: format!("{}{}", self.app_state.config.invite_link_prefix, &code),
-                            count: user.invite_count as u32,
-                        },
-                    )?;
-                }
+        if let Some(user) = self.app_state.db.get_user_by_id(inviter_id).await?
+            && let Some(code) = &user.invite_code
+        {
+            let pool = self.connection_pool.lock();
+            let invitee_contact = contact_for_user(invitee_id, false, &pool);
+            for connection_id in pool.user_connection_ids(inviter_id) {
+                self.peer.send(
+                    connection_id,
+                    proto::UpdateContacts {
+                        contacts: vec![invitee_contact.clone()],
+                        ..Default::default()
+                    },
+                )?;
+                self.peer.send(
+                    connection_id,
+                    proto::UpdateInviteInfo {
+                        url: format!("{}{}", self.app_state.config.invite_link_prefix, &code),
+                        count: user.invite_count as u32,
+                    },
+                )?;
             }
         }
         Ok(())
     }
 
     pub async fn invite_count_updated(self: &Arc<Self>, user_id: UserId) -> Result<()> {
-        if let Some(user) = self.app_state.db.get_user_by_id(user_id).await? {
-            if let Some(invite_code) = &user.invite_code {
-                let pool = self.connection_pool.lock();
-                for connection_id in pool.user_connection_ids(user_id) {
-                    self.peer.send(
-                        connection_id,
-                        proto::UpdateInviteInfo {
-                            url: format!(
-                                "{}{}",
-                                self.app_state.config.invite_link_prefix, invite_code
-                            ),
-                            count: user.invite_count as u32,
-                        },
-                    )?;
-                }
+        if let Some(user) = self.app_state.db.get_user_by_id(user_id).await?
+            && let Some(invite_code) = &user.invite_code
+        {
+            let pool = self.connection_pool.lock();
+            for connection_id in pool.user_connection_ids(user_id) {
+                self.peer.send(
+                    connection_id,
+                    proto::UpdateInviteInfo {
+                        url: format!(
+                            "{}{}",
+                            self.app_state.config.invite_link_prefix, invite_code
+                        ),
+                        count: user.invite_count as u32,
+                    },
+                )?;
             }
         }
         Ok(())
@@ -1101,10 +1101,10 @@ fn broadcast<F>(
     F: FnMut(ConnectionId) -> anyhow::Result<()>,
 {
     for receiver_id in receiver_ids {
-        if Some(receiver_id) != sender_id {
-            if let Err(error) = f(receiver_id) {
-                tracing::error!("failed to send to {:?} {}", receiver_id, error);
-            }
+        if Some(receiver_id) != sender_id
+            && let Err(error) = f(receiver_id)
+        {
+            tracing::error!("failed to send to {:?} {}", receiver_id, error);
         }
     }
 }
@@ -2294,11 +2294,10 @@ async fn update_language_server(
     let db = session.db().await;
 
     if let Some(proto::update_language_server::Variant::MetadataUpdated(update)) = &request.variant
+        && let Some(capabilities) = update.capabilities.clone()
     {
-        if let Some(capabilities) = update.capabilities.clone() {
-            db.update_server_capabilities(project_id, request.language_server_id, capabilities)
-                .await?;
-        }
+        db.update_server_capabilities(project_id, request.language_server_id, capabilities)
+            .await?;
     }
 
     let project_connection_ids = db
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
index 4d94d041b9..ca8a42d54d 100644
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -1162,8 +1162,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                             Some((project, cx))
                         });
 
-                        if !guest_project.is_disconnected(cx) {
-                            if let Some((host_project, host_cx)) = host_project {
+                        if !guest_project.is_disconnected(cx)
+                            && let Some((host_project, host_cx)) = host_project {
                                 let host_worktree_snapshots =
                                     host_project.read_with(host_cx, |host_project, cx| {
                                         host_project
@@ -1235,7 +1235,6 @@ impl RandomizedTest for ProjectCollaborationTest {
                                     );
                                 }
                             }
-                        }
 
                         for buffer in guest_project.opened_buffers(cx) {
                             let buffer = buffer.read(cx);
diff --git a/crates/collab/src/tests/randomized_test_helpers.rs b/crates/collab/src/tests/randomized_test_helpers.rs
index cabf10cfbc..d6c299a6a9 100644
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -198,11 +198,11 @@ pub async fn run_randomized_test<T: RandomizedTest>(
 }
 
 pub fn save_randomized_test_plan() {
-    if let Some(serialize_plan) = LAST_PLAN.lock().take() {
-        if let Some(path) = plan_save_path() {
-            eprintln!("saved test plan to path {:?}", path);
-            std::fs::write(path, serialize_plan()).unwrap();
-        }
+    if let Some(serialize_plan) = LAST_PLAN.lock().take()
+        && let Some(path) = plan_save_path()
+    {
+        eprintln!("saved test plan to path {:?}", path);
+        std::fs::write(path, serialize_plan()).unwrap();
     }
 }
 
@@ -290,10 +290,9 @@ impl<T: RandomizedTest> TestPlan<T> {
                         if let StoredOperation::Client {
                             user_id, batch_id, ..
                         } = operation
+                            && batch_id == current_batch_id
                         {
-                            if batch_id == current_batch_id {
-                                return Some(user_id);
-                            }
+                            return Some(user_id);
                         }
                         None
                     }));
@@ -366,10 +365,9 @@ impl<T: RandomizedTest> TestPlan<T> {
                     },
                     applied,
                 ) = stored_operation
+                    && user_id == &current_user_id
                 {
-                    if user_id == &current_user_id {
-                        return Some((operation.clone(), applied.clone()));
-                    }
+                    return Some((operation.clone(), applied.clone()));
                 }
             }
             None
@@ -550,11 +548,11 @@ impl<T: RandomizedTest> TestPlan<T> {
                         .unwrap();
                     let pool = server.connection_pool.lock();
                     for contact in contacts {
-                        if let db::Contact::Accepted { user_id, busy, .. } = contact {
-                            if user_id == removed_user_id {
-                                assert!(!pool.is_user_online(user_id));
-                                assert!(!busy);
-                            }
+                        if let db::Contact::Accepted { user_id, busy, .. } = contact
+                            && user_id == removed_user_id
+                        {
+                            assert!(!pool.is_user_online(user_id));
+                            assert!(!busy);
                         }
                     }
                 }
diff --git a/crates/collab/src/user_backfiller.rs b/crates/collab/src/user_backfiller.rs
index 71b99a3d4c..569a298c9c 100644
--- a/crates/collab/src/user_backfiller.rs
+++ b/crates/collab/src/user_backfiller.rs
@@ -130,17 +130,17 @@ impl UserBackfiller {
             .and_then(|value| value.parse::<i64>().ok())
             .and_then(|value| DateTime::from_timestamp(value, 0));
 
-        if rate_limit_remaining == Some(0) {
-            if let Some(reset_at) = rate_limit_reset {
-                let now = Utc::now();
-                if reset_at > now {
-                    let sleep_duration = reset_at - now;
-                    log::info!(
-                        "rate limit reached. Sleeping for {} seconds",
-                        sleep_duration.num_seconds()
-                    );
-                    self.executor.sleep(sleep_duration.to_std().unwrap()).await;
-                }
+        if rate_limit_remaining == Some(0)
+            && let Some(reset_at) = rate_limit_reset
+        {
+            let now = Utc::now();
+            if reset_at > now {
+                let sleep_duration = reset_at - now;
+                log::info!(
+                    "rate limit reached. Sleeping for {} seconds",
+                    sleep_duration.num_seconds()
+                );
+                self.executor.sleep(sleep_duration.to_std().unwrap()).await;
             }
         }
 
diff --git a/crates/collab_ui/src/channel_view.rs b/crates/collab_ui/src/channel_view.rs
index b86d72d92f..9993c0841c 100644
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -107,43 +107,32 @@ impl ChannelView {
                     .find(|view| view.read(cx).channel_buffer.read(cx).remote_id(cx) == buffer_id);
 
                 // If this channel buffer is already open in this pane, just return it.
-                if let Some(existing_view) = existing_view.clone() {
-                    if existing_view.read(cx).channel_buffer == channel_view.read(cx).channel_buffer
-                    {
-                        if let Some(link_position) = link_position {
-                            existing_view.update(cx, |channel_view, cx| {
-                                channel_view.focus_position_from_link(
-                                    link_position,
-                                    true,
-                                    window,
-                                    cx,
-                                )
-                            });
-                        }
-                        return existing_view;
+                if let Some(existing_view) = existing_view.clone()
+                    && existing_view.read(cx).channel_buffer == channel_view.read(cx).channel_buffer
+                {
+                    if let Some(link_position) = link_position {
+                        existing_view.update(cx, |channel_view, cx| {
+                            channel_view.focus_position_from_link(link_position, true, window, cx)
+                        });
                     }
+                    return existing_view;
                 }
 
                 // If the pane contained a disconnected view for this channel buffer,
                 // replace that.
-                if let Some(existing_item) = existing_view {
-                    if let Some(ix) = pane.index_for_item(&existing_item) {
-                        pane.close_item_by_id(
-                            existing_item.entity_id(),
-                            SaveIntent::Skip,
-                            window,
-                            cx,
-                        )
+                if let Some(existing_item) = existing_view
+                    && let Some(ix) = pane.index_for_item(&existing_item)
+                {
+                    pane.close_item_by_id(existing_item.entity_id(), SaveIntent::Skip, window, cx)
                         .detach();
-                        pane.add_item(
-                            Box::new(channel_view.clone()),
-                            true,
-                            true,
-                            Some(ix),
-                            window,
-                            cx,
-                        );
-                    }
+                    pane.add_item(
+                        Box::new(channel_view.clone()),
+                        true,
+                        true,
+                        Some(ix),
+                        window,
+                        cx,
+                    );
                 }
 
                 if let Some(link_position) = link_position {
@@ -259,26 +248,21 @@ impl ChannelView {
             .editor
             .update(cx, |editor, cx| editor.snapshot(window, cx));
 
-        if let Some(outline) = snapshot.buffer_snapshot.outline(None) {
-            if let Some(item) = outline
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None)
+            && let Some(item) = outline
                 .items
                 .iter()
                 .find(|item| &Channel::slug(&item.text).to_lowercase() == &position)
-            {
-                self.editor.update(cx, |editor, cx| {
-                    editor.change_selections(
-                        SelectionEffects::scroll(Autoscroll::focused()),
-                        window,
-                        cx,
-                        |s| {
-                            s.replace_cursors_with(|map| {
-                                vec![item.range.start.to_display_point(map)]
-                            })
-                        },
-                    )
-                });
-                return;
-            }
+        {
+            self.editor.update(cx, |editor, cx| {
+                editor.change_selections(
+                    SelectionEffects::scroll(Autoscroll::focused()),
+                    window,
+                    cx,
+                    |s| s.replace_cursors_with(|map| vec![item.range.start.to_display_point(map)]),
+                )
+            });
+            return;
         }
 
         if !first_attempt {
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 2bbaa8446c..77ce74d581 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -287,19 +287,20 @@ impl ChatPanel {
     }
 
     fn acknowledge_last_message(&mut self, cx: &mut Context<Self>) {
-        if self.active && self.is_scrolled_to_bottom {
-            if let Some((chat, _)) = &self.active_chat {
-                if let Some(channel_id) = self.channel_id(cx) {
-                    self.last_acknowledged_message_id = self
-                        .channel_store
-                        .read(cx)
-                        .last_acknowledge_message_id(channel_id);
-                }
-
-                chat.update(cx, |chat, cx| {
-                    chat.acknowledge_last_message(cx);
-                });
+        if self.active
+            && self.is_scrolled_to_bottom
+            && let Some((chat, _)) = &self.active_chat
+        {
+            if let Some(channel_id) = self.channel_id(cx) {
+                self.last_acknowledged_message_id = self
+                    .channel_store
+                    .read(cx)
+                    .last_acknowledge_message_id(channel_id);
             }
+
+            chat.update(cx, |chat, cx| {
+                chat.acknowledge_last_message(cx);
+            });
         }
     }
 
@@ -405,14 +406,13 @@ impl ChatPanel {
                     && last_message.id != this_message.id
                     && duration_since_last_message < Duration::from_secs(5 * 60);
 
-                if let ChannelMessageId::Saved(id) = this_message.id {
-                    if this_message
+                if let ChannelMessageId::Saved(id) = this_message.id
+                    && this_message
                         .mentions
                         .iter()
                         .any(|(_, user_id)| Some(*user_id) == self.client.user_id())
-                    {
-                        active_chat.acknowledge_message(id);
-                    }
+                {
+                    active_chat.acknowledge_message(id);
                 }
 
                 (this_message, is_continuation_from_previous, is_admin)
@@ -871,34 +871,33 @@ impl ChatPanel {
                 scroll_to_message_id.or(this.last_acknowledged_message_id)
             })?;
 
-            if let Some(message_id) = scroll_to_message_id {
-                if let Some(item_ix) =
+            if let Some(message_id) = scroll_to_message_id
+                && let Some(item_ix) =
                     ChannelChat::load_history_since_message(chat.clone(), message_id, cx.clone())
                         .await
-                {
-                    this.update(cx, |this, cx| {
-                        if let Some(highlight_message_id) = highlight_message_id {
-                            let task = cx.spawn(async move |this, cx| {
-                                cx.background_executor().timer(Duration::from_secs(2)).await;
-                                this.update(cx, |this, cx| {
-                                    this.highlighted_message.take();
-                                    cx.notify();
-                                })
-                                .ok();
-                            });
+            {
+                this.update(cx, |this, cx| {
+                    if let Some(highlight_message_id) = highlight_message_id {
+                        let task = cx.spawn(async move |this, cx| {
+                            cx.background_executor().timer(Duration::from_secs(2)).await;
+                            this.update(cx, |this, cx| {
+                                this.highlighted_message.take();
+                                cx.notify();
+                            })
+                            .ok();
+                        });
 
-                            this.highlighted_message = Some((highlight_message_id, task));
-                        }
+                        this.highlighted_message = Some((highlight_message_id, task));
+                    }
 
-                        if this.active_chat.as_ref().map_or(false, |(c, _)| *c == chat) {
-                            this.message_list.scroll_to(ListOffset {
-                                item_ix,
-                                offset_in_item: px(0.0),
-                            });
-                            cx.notify();
-                        }
-                    })?;
-                }
+                    if this.active_chat.as_ref().map_or(false, |(c, _)| *c == chat) {
+                        this.message_list.scroll_to(ListOffset {
+                            item_ix,
+                            offset_in_item: px(0.0),
+                        });
+                        cx.notify();
+                    }
+                })?;
             }
 
             Ok(())
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 28d60d9221..57f6341297 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -241,38 +241,36 @@ impl MessageEditor {
     ) -> Task<Result<Vec<CompletionResponse>>> {
         if let Some((start_anchor, query, candidates)) =
             self.collect_mention_candidates(buffer, end_anchor, cx)
+            && !candidates.is_empty()
         {
-            if !candidates.is_empty() {
-                return cx.spawn(async move |_, cx| {
-                    let completion_response = Self::completions_for_candidates(
-                        cx,
-                        query.as_str(),
-                        &candidates,
-                        start_anchor..end_anchor,
-                        Self::completion_for_mention,
-                    )
-                    .await;
-                    Ok(vec![completion_response])
-                });
-            }
+            return cx.spawn(async move |_, cx| {
+                let completion_response = Self::completions_for_candidates(
+                    cx,
+                    query.as_str(),
+                    &candidates,
+                    start_anchor..end_anchor,
+                    Self::completion_for_mention,
+                )
+                .await;
+                Ok(vec![completion_response])
+            });
         }
 
         if let Some((start_anchor, query, candidates)) =
             self.collect_emoji_candidates(buffer, end_anchor, cx)
+            && !candidates.is_empty()
         {
-            if !candidates.is_empty() {
-                return cx.spawn(async move |_, cx| {
-                    let completion_response = Self::completions_for_candidates(
-                        cx,
-                        query.as_str(),
-                        candidates,
-                        start_anchor..end_anchor,
-                        Self::completion_for_emoji,
-                    )
-                    .await;
-                    Ok(vec![completion_response])
-                });
-            }
+            return cx.spawn(async move |_, cx| {
+                let completion_response = Self::completions_for_candidates(
+                    cx,
+                    query.as_str(),
+                    candidates,
+                    start_anchor..end_anchor,
+                    Self::completion_for_emoji,
+                )
+                .await;
+                Ok(vec![completion_response])
+            });
         }
 
         Task::ready(Ok(vec![CompletionResponse {
@@ -474,18 +472,17 @@ impl MessageEditor {
                 for range in ranges {
                     text.clear();
                     text.extend(buffer.text_for_range(range.clone()));
-                    if let Some(username) = text.strip_prefix('@') {
-                        if let Some(user) = this
+                    if let Some(username) = text.strip_prefix('@')
+                        && let Some(user) = this
                             .user_store
                             .read(cx)
                             .cached_user_by_github_login(username)
-                        {
-                            let start = multi_buffer.anchor_after(range.start);
-                            let end = multi_buffer.anchor_after(range.end);
+                    {
+                        let start = multi_buffer.anchor_after(range.start);
+                        let end = multi_buffer.anchor_after(range.end);
 
-                            mentioned_user_ids.push(user.id);
-                            anchor_ranges.push(start..end);
-                        }
+                        mentioned_user_ids.push(user.id);
+                        anchor_ranges.push(start..end);
                     }
                 }
 
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 8016481f6f..526aacf066 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -311,10 +311,10 @@ impl CollabPanel {
                 window,
                 |this: &mut Self, _, event, window, cx| {
                     if let editor::EditorEvent::Blurred = event {
-                        if let Some(state) = &this.channel_editing_state {
-                            if state.pending_name().is_some() {
-                                return;
-                            }
+                        if let Some(state) = &this.channel_editing_state
+                            && state.pending_name().is_some()
+                        {
+                            return;
                         }
                         this.take_editing_state(window, cx);
                         this.update_entries(false, cx);
@@ -491,11 +491,11 @@ impl CollabPanel {
             if !self.collapsed_sections.contains(&Section::ActiveCall) {
                 let room = room.read(cx);
 
-                if query.is_empty() {
-                    if let Some(channel_id) = room.channel_id() {
-                        self.entries.push(ListEntry::ChannelNotes { channel_id });
-                        self.entries.push(ListEntry::ChannelChat { channel_id });
-                    }
+                if query.is_empty()
+                    && let Some(channel_id) = room.channel_id()
+                {
+                    self.entries.push(ListEntry::ChannelNotes { channel_id });
+                    self.entries.push(ListEntry::ChannelChat { channel_id });
                 }
 
                 // Populate the active user.
@@ -639,10 +639,10 @@ impl CollabPanel {
                 &Default::default(),
                 executor.clone(),
             ));
-            if let Some(state) = &self.channel_editing_state {
-                if matches!(state, ChannelEditingState::Create { location: None, .. }) {
-                    self.entries.push(ListEntry::ChannelEditor { depth: 0 });
-                }
+            if let Some(state) = &self.channel_editing_state
+                && matches!(state, ChannelEditingState::Create { location: None, .. })
+            {
+                self.entries.push(ListEntry::ChannelEditor { depth: 0 });
             }
             let mut collapse_depth = None;
             for mat in matches {
@@ -1552,98 +1552,93 @@ impl CollabPanel {
             return;
         }
 
-        if let Some(selection) = self.selection {
-            if let Some(entry) = self.entries.get(selection) {
-                match entry {
-                    ListEntry::Header(section) => match section {
-                        Section::ActiveCall => Self::leave_call(window, cx),
-                        Section::Channels => self.new_root_channel(window, cx),
-                        Section::Contacts => self.toggle_contact_finder(window, cx),
-                        Section::ContactRequests
-                        | Section::Online
-                        | Section::Offline
-                        | Section::ChannelInvites => {
-                            self.toggle_section_expanded(*section, cx);
-                        }
-                    },
-                    ListEntry::Contact { contact, calling } => {
-                        if contact.online && !contact.busy && !calling {
-                            self.call(contact.user.id, window, cx);
-                        }
+        if let Some(selection) = self.selection
+            && let Some(entry) = self.entries.get(selection)
+        {
+            match entry {
+                ListEntry::Header(section) => match section {
+                    Section::ActiveCall => Self::leave_call(window, cx),
+                    Section::Channels => self.new_root_channel(window, cx),
+                    Section::Contacts => self.toggle_contact_finder(window, cx),
+                    Section::ContactRequests
+                    | Section::Online
+                    | Section::Offline
+                    | Section::ChannelInvites => {
+                        self.toggle_section_expanded(*section, cx);
                     }
-                    ListEntry::ParticipantProject {
-                        project_id,
-                        host_user_id,
-                        ..
-                    } => {
-                        if let Some(workspace) = self.workspace.upgrade() {
-                            let app_state = workspace.read(cx).app_state().clone();
-                            workspace::join_in_room_project(
-                                *project_id,
-                                *host_user_id,
-                                app_state,
-                                cx,
-                            )
+                },
+                ListEntry::Contact { contact, calling } => {
+                    if contact.online && !contact.busy && !calling {
+                        self.call(contact.user.id, window, cx);
+                    }
+                }
+                ListEntry::ParticipantProject {
+                    project_id,
+                    host_user_id,
+                    ..
+                } => {
+                    if let Some(workspace) = self.workspace.upgrade() {
+                        let app_state = workspace.read(cx).app_state().clone();
+                        workspace::join_in_room_project(*project_id, *host_user_id, app_state, cx)
                             .detach_and_prompt_err(
                                 "Failed to join project",
                                 window,
                                 cx,
                                 |_, _, _| None,
                             );
-                        }
                     }
-                    ListEntry::ParticipantScreen { peer_id, .. } => {
-                        let Some(peer_id) = peer_id else {
-                            return;
-                        };
-                        if let Some(workspace) = self.workspace.upgrade() {
-                            workspace.update(cx, |workspace, cx| {
-                                workspace.open_shared_screen(*peer_id, window, cx)
-                            });
-                        }
-                    }
-                    ListEntry::Channel { channel, .. } => {
-                        let is_active = maybe!({
-                            let call_channel = ActiveCall::global(cx)
-                                .read(cx)
-                                .room()?
-                                .read(cx)
-                                .channel_id()?;
-
-                            Some(call_channel == channel.id)
-                        })
-                        .unwrap_or(false);
-                        if is_active {
-                            self.open_channel_notes(channel.id, window, cx)
-                        } else {
-                            self.join_channel(channel.id, window, cx)
-                        }
-                    }
-                    ListEntry::ContactPlaceholder => self.toggle_contact_finder(window, cx),
-                    ListEntry::CallParticipant { user, peer_id, .. } => {
-                        if Some(user) == self.user_store.read(cx).current_user().as_ref() {
-                            Self::leave_call(window, cx);
-                        } else if let Some(peer_id) = peer_id {
-                            self.workspace
-                                .update(cx, |workspace, cx| workspace.follow(*peer_id, window, cx))
-                                .ok();
-                        }
-                    }
-                    ListEntry::IncomingRequest(user) => {
-                        self.respond_to_contact_request(user.id, true, window, cx)
-                    }
-                    ListEntry::ChannelInvite(channel) => {
-                        self.respond_to_channel_invite(channel.id, true, cx)
-                    }
-                    ListEntry::ChannelNotes { channel_id } => {
-                        self.open_channel_notes(*channel_id, window, cx)
-                    }
-                    ListEntry::ChannelChat { channel_id } => {
-                        self.join_channel_chat(*channel_id, window, cx)
-                    }
-                    ListEntry::OutgoingRequest(_) => {}
-                    ListEntry::ChannelEditor { .. } => {}
                 }
+                ListEntry::ParticipantScreen { peer_id, .. } => {
+                    let Some(peer_id) = peer_id else {
+                        return;
+                    };
+                    if let Some(workspace) = self.workspace.upgrade() {
+                        workspace.update(cx, |workspace, cx| {
+                            workspace.open_shared_screen(*peer_id, window, cx)
+                        });
+                    }
+                }
+                ListEntry::Channel { channel, .. } => {
+                    let is_active = maybe!({
+                        let call_channel = ActiveCall::global(cx)
+                            .read(cx)
+                            .room()?
+                            .read(cx)
+                            .channel_id()?;
+
+                        Some(call_channel == channel.id)
+                    })
+                    .unwrap_or(false);
+                    if is_active {
+                        self.open_channel_notes(channel.id, window, cx)
+                    } else {
+                        self.join_channel(channel.id, window, cx)
+                    }
+                }
+                ListEntry::ContactPlaceholder => self.toggle_contact_finder(window, cx),
+                ListEntry::CallParticipant { user, peer_id, .. } => {
+                    if Some(user) == self.user_store.read(cx).current_user().as_ref() {
+                        Self::leave_call(window, cx);
+                    } else if let Some(peer_id) = peer_id {
+                        self.workspace
+                            .update(cx, |workspace, cx| workspace.follow(*peer_id, window, cx))
+                            .ok();
+                    }
+                }
+                ListEntry::IncomingRequest(user) => {
+                    self.respond_to_contact_request(user.id, true, window, cx)
+                }
+                ListEntry::ChannelInvite(channel) => {
+                    self.respond_to_channel_invite(channel.id, true, cx)
+                }
+                ListEntry::ChannelNotes { channel_id } => {
+                    self.open_channel_notes(*channel_id, window, cx)
+                }
+                ListEntry::ChannelChat { channel_id } => {
+                    self.join_channel_chat(*channel_id, window, cx)
+                }
+                ListEntry::OutgoingRequest(_) => {}
+                ListEntry::ChannelEditor { .. } => {}
             }
         }
     }
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index 01ca533c10..00c3bbf623 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -121,13 +121,12 @@ impl NotificationPanel {
             let notification_list = ListState::new(0, ListAlignment::Top, px(1000.));
             notification_list.set_scroll_handler(cx.listener(
                 |this, event: &ListScrollEvent, _, cx| {
-                    if event.count.saturating_sub(event.visible_range.end) < LOADING_THRESHOLD {
-                        if let Some(task) = this
+                    if event.count.saturating_sub(event.visible_range.end) < LOADING_THRESHOLD
+                        && let Some(task) = this
                             .notification_store
                             .update(cx, |store, cx| store.load_more_notifications(false, cx))
-                        {
-                            task.detach();
-                        }
+                    {
+                        task.detach();
                     }
                 },
             ));
@@ -469,20 +468,19 @@ impl NotificationPanel {
             channel_id,
             ..
         } = notification.clone()
+            && let Some(workspace) = self.workspace.upgrade()
         {
-            if let Some(workspace) = self.workspace.upgrade() {
-                window.defer(cx, move |window, cx| {
-                    workspace.update(cx, |workspace, cx| {
-                        if let Some(panel) = workspace.focus_panel::<ChatPanel>(window, cx) {
-                            panel.update(cx, |panel, cx| {
-                                panel
-                                    .select_channel(ChannelId(channel_id), Some(message_id), cx)
-                                    .detach_and_log_err(cx);
-                            });
-                        }
-                    });
+            window.defer(cx, move |window, cx| {
+                workspace.update(cx, |workspace, cx| {
+                    if let Some(panel) = workspace.focus_panel::<ChatPanel>(window, cx) {
+                        panel.update(cx, |panel, cx| {
+                            panel
+                                .select_channel(ChannelId(channel_id), Some(message_id), cx)
+                                .detach_and_log_err(cx);
+                        });
+                    }
                 });
-            }
+            });
         }
     }
 
@@ -491,18 +489,18 @@ impl NotificationPanel {
             return false;
         }
 
-        if let Notification::ChannelMessageMention { channel_id, .. } = &notification {
-            if let Some(workspace) = self.workspace.upgrade() {
-                return if let Some(panel) = workspace.read(cx).panel::<ChatPanel>(cx) {
-                    let panel = panel.read(cx);
-                    panel.is_scrolled_to_bottom()
-                        && panel
-                            .active_chat()
-                            .map_or(false, |chat| chat.read(cx).channel_id.0 == *channel_id)
-                } else {
-                    false
-                };
-            }
+        if let Notification::ChannelMessageMention { channel_id, .. } = &notification
+            && let Some(workspace) = self.workspace.upgrade()
+        {
+            return if let Some(panel) = workspace.read(cx).panel::<ChatPanel>(cx) {
+                let panel = panel.read(cx);
+                panel.is_scrolled_to_bottom()
+                    && panel
+                        .active_chat()
+                        .map_or(false, |chat| chat.read(cx).channel_id.0 == *channel_id)
+            } else {
+                false
+            };
         }
 
         false
@@ -582,16 +580,16 @@ impl NotificationPanel {
     }
 
     fn remove_toast(&mut self, notification_id: u64, cx: &mut Context<Self>) {
-        if let Some((current_id, _)) = &self.current_notification_toast {
-            if *current_id == notification_id {
-                self.current_notification_toast.take();
-                self.workspace
-                    .update(cx, |workspace, cx| {
-                        let id = NotificationId::unique::<NotificationToast>();
-                        workspace.dismiss_notification(&id, cx)
-                    })
-                    .ok();
-            }
+        if let Some((current_id, _)) = &self.current_notification_toast
+            && *current_id == notification_id
+        {
+            self.current_notification_toast.take();
+            self.workspace
+                .update(cx, |workspace, cx| {
+                    let id = NotificationId::unique::<NotificationToast>();
+                    workspace.dismiss_notification(&id, cx)
+                })
+                .ok();
         }
     }
 
diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs
index 65283afa87..609d2c43e3 100644
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -271,10 +271,10 @@ impl Client {
                     );
                 }
             } else if let Ok(response) = serde_json::from_str::<AnyResponse>(&message) {
-                if let Some(handlers) = response_handlers.lock().as_mut() {
-                    if let Some(handler) = handlers.remove(&response.id) {
-                        handler(Ok(message.to_string()));
-                    }
+                if let Some(handlers) = response_handlers.lock().as_mut()
+                    && let Some(handler) = handlers.remove(&response.id)
+                {
+                    handler(Ok(message.to_string()));
                 }
             } else if let Ok(notification) = serde_json::from_str::<AnyNotification>(&message) {
                 let mut notification_handlers = notification_handlers.lock();
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index dcebeae721..1916853a69 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -608,15 +608,13 @@ impl Copilot {
                                                 sign_in_status: status,
                                                 ..
                                             }) = &mut this.server
-                                            {
-                                                if let SignInStatus::SigningIn {
+                                                && let SignInStatus::SigningIn {
                                                     prompt: prompt_flow,
                                                     ..
                                                 } = status
-                                                {
-                                                    *prompt_flow = Some(flow.clone());
-                                                    cx.notify();
-                                                }
+                                            {
+                                                *prompt_flow = Some(flow.clone());
+                                                cx.notify();
                                             }
                                         })?;
                                         let response = lsp
@@ -782,59 +780,58 @@ impl Copilot {
         event: &language::BufferEvent,
         cx: &mut Context<Self>,
     ) -> Result<()> {
-        if let Ok(server) = self.server.as_running() {
-            if let Some(registered_buffer) = server.registered_buffers.get_mut(&buffer.entity_id())
-            {
-                match event {
-                    language::BufferEvent::Edited => {
-                        drop(registered_buffer.report_changes(&buffer, cx));
-                    }
-                    language::BufferEvent::Saved => {
+        if let Ok(server) = self.server.as_running()
+            && let Some(registered_buffer) = server.registered_buffers.get_mut(&buffer.entity_id())
+        {
+            match event {
+                language::BufferEvent::Edited => {
+                    drop(registered_buffer.report_changes(&buffer, cx));
+                }
+                language::BufferEvent::Saved => {
+                    server
+                        .lsp
+                        .notify::<lsp::notification::DidSaveTextDocument>(
+                            &lsp::DidSaveTextDocumentParams {
+                                text_document: lsp::TextDocumentIdentifier::new(
+                                    registered_buffer.uri.clone(),
+                                ),
+                                text: None,
+                            },
+                        )?;
+                }
+                language::BufferEvent::FileHandleChanged
+                | language::BufferEvent::LanguageChanged => {
+                    let new_language_id = id_for_language(buffer.read(cx).language());
+                    let Ok(new_uri) = uri_for_buffer(&buffer, cx) else {
+                        return Ok(());
+                    };
+                    if new_uri != registered_buffer.uri
+                        || new_language_id != registered_buffer.language_id
+                    {
+                        let old_uri = mem::replace(&mut registered_buffer.uri, new_uri);
+                        registered_buffer.language_id = new_language_id;
                         server
                             .lsp
-                            .notify::<lsp::notification::DidSaveTextDocument>(
-                                &lsp::DidSaveTextDocumentParams {
-                                    text_document: lsp::TextDocumentIdentifier::new(
+                            .notify::<lsp::notification::DidCloseTextDocument>(
+                                &lsp::DidCloseTextDocumentParams {
+                                    text_document: lsp::TextDocumentIdentifier::new(old_uri),
+                                },
+                            )?;
+                        server
+                            .lsp
+                            .notify::<lsp::notification::DidOpenTextDocument>(
+                                &lsp::DidOpenTextDocumentParams {
+                                    text_document: lsp::TextDocumentItem::new(
                                         registered_buffer.uri.clone(),
+                                        registered_buffer.language_id.clone(),
+                                        registered_buffer.snapshot_version,
+                                        registered_buffer.snapshot.text(),
                                     ),
-                                    text: None,
                                 },
                             )?;
                     }
-                    language::BufferEvent::FileHandleChanged
-                    | language::BufferEvent::LanguageChanged => {
-                        let new_language_id = id_for_language(buffer.read(cx).language());
-                        let Ok(new_uri) = uri_for_buffer(&buffer, cx) else {
-                            return Ok(());
-                        };
-                        if new_uri != registered_buffer.uri
-                            || new_language_id != registered_buffer.language_id
-                        {
-                            let old_uri = mem::replace(&mut registered_buffer.uri, new_uri);
-                            registered_buffer.language_id = new_language_id;
-                            server
-                                .lsp
-                                .notify::<lsp::notification::DidCloseTextDocument>(
-                                    &lsp::DidCloseTextDocumentParams {
-                                        text_document: lsp::TextDocumentIdentifier::new(old_uri),
-                                    },
-                                )?;
-                            server
-                                .lsp
-                                .notify::<lsp::notification::DidOpenTextDocument>(
-                                    &lsp::DidOpenTextDocumentParams {
-                                        text_document: lsp::TextDocumentItem::new(
-                                            registered_buffer.uri.clone(),
-                                            registered_buffer.language_id.clone(),
-                                            registered_buffer.snapshot_version,
-                                            registered_buffer.snapshot.text(),
-                                        ),
-                                    },
-                                )?;
-                        }
-                    }
-                    _ => {}
                 }
+                _ => {}
             }
         }
 
@@ -842,17 +839,17 @@ impl Copilot {
     }
 
     fn unregister_buffer(&mut self, buffer: &WeakEntity<Buffer>) {
-        if let Ok(server) = self.server.as_running() {
-            if let Some(buffer) = server.registered_buffers.remove(&buffer.entity_id()) {
-                server
-                    .lsp
-                    .notify::<lsp::notification::DidCloseTextDocument>(
-                        &lsp::DidCloseTextDocumentParams {
-                            text_document: lsp::TextDocumentIdentifier::new(buffer.uri),
-                        },
-                    )
-                    .ok();
-            }
+        if let Ok(server) = self.server.as_running()
+            && let Some(buffer) = server.registered_buffers.remove(&buffer.entity_id())
+        {
+            server
+                .lsp
+                .notify::<lsp::notification::DidCloseTextDocument>(
+                    &lsp::DidCloseTextDocumentParams {
+                        text_document: lsp::TextDocumentIdentifier::new(buffer.uri),
+                    },
+                )
+                .ok();
         }
     }
 
diff --git a/crates/dap_adapters/src/javascript.rs b/crates/dap_adapters/src/javascript.rs
index 70b0638120..a8826d563b 100644
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -99,10 +99,10 @@ impl JsDebugAdapter {
                 }
             }
 
-            if let Some(env) = configuration.get("env").cloned() {
-                if let Ok(env) = serde_json::from_value(env) {
-                    envs = env;
-                }
+            if let Some(env) = configuration.get("env").cloned()
+                && let Ok(env) = serde_json::from_value(env)
+            {
+                envs = env;
             }
 
             configuration
diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rs
index 14154e5b39..e60c08cd0f 100644
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -661,11 +661,11 @@ impl ToolbarItemView for DapLogToolbarItemView {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> workspace::ToolbarItemLocation {
-        if let Some(item) = active_pane_item {
-            if let Some(log_view) = item.downcast::<DapLogView>() {
-                self.log_view = Some(log_view.clone());
-                return workspace::ToolbarItemLocation::PrimaryLeft;
-            }
+        if let Some(item) = active_pane_item
+            && let Some(log_view) = item.downcast::<DapLogView>()
+        {
+            self.log_view = Some(log_view.clone());
+            return workspace::ToolbarItemLocation::PrimaryLeft;
         }
         self.log_view = None;
 
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index cf038871bc..4e1b0d19e2 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -530,10 +530,9 @@ impl DebugPanel {
                     .active_session
                     .as_ref()
                     .map(|session| session.entity_id())
+                    && active_session_id == entity_id
                 {
-                    if active_session_id == entity_id {
-                        this.active_session = this.sessions_with_children.keys().next().cloned();
-                    }
+                    this.active_session = this.sessions_with_children.keys().next().cloned();
                 }
                 cx.notify()
             })
@@ -1302,10 +1301,10 @@ impl DebugPanel {
         cx: &mut Context<'_, Self>,
     ) -> Option<SharedString> {
         let adapter = parent_session.read(cx).adapter();
-        if let Some(adapter) = DapRegistry::global(cx).adapter(&adapter) {
-            if let Some(label) = adapter.label_for_child_session(request) {
-                return Some(label.into());
-            }
+        if let Some(adapter) = DapRegistry::global(cx).adapter(&adapter)
+            && let Some(label) = adapter.label_for_child_session(request)
+        {
+            return Some(label.into());
         }
         None
     }
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index 51ea25a5cb..eb0ad92dcc 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -343,10 +343,10 @@ impl NewProcessModal {
             return;
         }
 
-        if let NewProcessMode::Launch = &self.mode {
-            if self.configure_mode.read(cx).save_to_debug_json.selected() {
-                self.save_debug_scenario(window, cx);
-            }
+        if let NewProcessMode::Launch = &self.mode
+            && self.configure_mode.read(cx).save_to_debug_json.selected()
+        {
+            self.save_debug_scenario(window, cx);
         }
 
         let Some(debugger) = self.debugger.clone() else {
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index 9768f02e8e..095b069fa3 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -239,11 +239,9 @@ impl BreakpointList {
     }
 
     fn select_next(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
+        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
+            cx.propagate();
+            return;
         }
         let ix = match self.selected_ix {
             _ if self.breakpoints.len() == 0 => None,
@@ -265,11 +263,9 @@ impl BreakpointList {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
+        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
+            cx.propagate();
+            return;
         }
         let ix = match self.selected_ix {
             _ if self.breakpoints.len() == 0 => None,
@@ -286,11 +282,9 @@ impl BreakpointList {
     }
 
     fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
+        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
+            cx.propagate();
+            return;
         }
         let ix = if self.breakpoints.len() > 0 {
             Some(0)
@@ -301,11 +295,9 @@ impl BreakpointList {
     }
 
     fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
+        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
+            cx.propagate();
+            return;
         }
         let ix = if self.breakpoints.len() > 0 {
             Some(self.breakpoints.len() - 1)
@@ -401,11 +393,9 @@ impl BreakpointList {
         let Some(entry) = self.selected_ix.and_then(|ix| self.breakpoints.get_mut(ix)) else {
             return;
         };
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
+        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
+            cx.propagate();
+            return;
         }
 
         match &mut entry.kind {
diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs
index 42989ddc20..05d2231da4 100644
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -611,17 +611,16 @@ impl ConsoleQueryBarCompletionProvider {
             for variable in console.variable_list.update(cx, |variable_list, cx| {
                 variable_list.completion_variables(cx)
             }) {
-                if let Some(evaluate_name) = &variable.evaluate_name {
-                    if variables
+                if let Some(evaluate_name) = &variable.evaluate_name
+                    && variables
                         .insert(evaluate_name.clone(), variable.value.clone())
                         .is_none()
-                    {
-                        string_matches.push(StringMatchCandidate {
-                            id: 0,
-                            string: evaluate_name.clone(),
-                            char_bag: evaluate_name.chars().collect(),
-                        });
-                    }
+                {
+                    string_matches.push(StringMatchCandidate {
+                        id: 0,
+                        string: evaluate_name.clone(),
+                        char_bag: evaluate_name.chars().collect(),
+                    });
                 }
 
                 if variables
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 23dbf33322..c15c0f2493 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -639,17 +639,15 @@ impl ProjectDiagnosticsEditor {
                 #[cfg(test)]
                 let cloned_blocks = blocks.clone();
 
-                if was_empty {
-                    if let Some(anchor_range) = anchor_ranges.first() {
-                        let range_to_select = anchor_range.start..anchor_range.start;
-                        this.editor.update(cx, |editor, cx| {
-                            editor.change_selections(Default::default(), window, cx, |s| {
-                                s.select_anchor_ranges([range_to_select]);
-                            })
-                        });
-                        if this.focus_handle.is_focused(window) {
-                            this.editor.read(cx).focus_handle(cx).focus(window);
-                        }
+                if was_empty && let Some(anchor_range) = anchor_ranges.first() {
+                    let range_to_select = anchor_range.start..anchor_range.start;
+                    this.editor.update(cx, |editor, cx| {
+                        editor.change_selections(Default::default(), window, cx, |s| {
+                            s.select_anchor_ranges([range_to_select]);
+                        })
+                    });
+                    if this.focus_handle.is_focused(window) {
+                        this.editor.read(cx).focus_handle(cx).focus(window);
                     }
                 }
 
@@ -980,18 +978,16 @@ async fn heuristic_syntactic_expand(
         // Remove blank lines from start and end
         if let Some(start_row) = (outline_range.start.row..outline_range.end.row)
             .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
-        {
-            if let Some(end_row) = (outline_range.start.row..outline_range.end.row + 1)
+            && let Some(end_row) = (outline_range.start.row..outline_range.end.row + 1)
                 .rev()
                 .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
-            {
-                let row_count = end_row.saturating_sub(start_row);
-                if row_count <= max_row_count {
-                    return Some(RangeInclusive::new(
-                        outline_range.start.row,
-                        outline_range.end.row,
-                    ));
-                }
+        {
+            let row_count = end_row.saturating_sub(start_row);
+            if row_count <= max_row_count {
+                return Some(RangeInclusive::new(
+                    outline_range.start.row,
+                    outline_range.end.row,
+                ));
             }
         }
     }
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index a16e516a70..cc1cc2c440 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -969,13 +969,13 @@ impl DisplaySnapshot {
             if let Some(chunk_highlight) = chunk.highlight_style {
                 // For color inlays, blend the color with the editor background
                 let mut processed_highlight = chunk_highlight;
-                if chunk.is_inlay {
-                    if let Some(inlay_color) = chunk_highlight.color {
-                        // Only blend if the color has transparency (alpha < 1.0)
-                        if inlay_color.a < 1.0 {
-                            let blended_color = editor_style.background.blend(inlay_color);
-                            processed_highlight.color = Some(blended_color);
-                        }
+                if chunk.is_inlay
+                    && let Some(inlay_color) = chunk_highlight.color
+                {
+                    // Only blend if the color has transparency (alpha < 1.0)
+                    if inlay_color.a < 1.0 {
+                        let blended_color = editor_style.background.blend(inlay_color);
+                        processed_highlight.color = Some(blended_color);
                     }
                 }
 
@@ -2351,11 +2351,12 @@ pub mod tests {
                 .highlight_style
                 .and_then(|style| style.color)
                 .map_or(black, |color| color.to_rgb());
-            if let Some((last_chunk, last_severity, last_color)) = chunks.last_mut() {
-                if *last_severity == chunk.diagnostic_severity && *last_color == color {
-                    last_chunk.push_str(chunk.text);
-                    continue;
-                }
+            if let Some((last_chunk, last_severity, last_color)) = chunks.last_mut()
+                && *last_severity == chunk.diagnostic_severity
+                && *last_color == color
+            {
+                last_chunk.push_str(chunk.text);
+                continue;
             }
 
             chunks.push((chunk.text.to_string(), chunk.diagnostic_severity, color));
@@ -2901,11 +2902,12 @@ pub mod tests {
                 .syntax_highlight_id
                 .and_then(|id| id.style(theme)?.color);
             let highlight_color = chunk.highlight_style.and_then(|style| style.color);
-            if let Some((last_chunk, last_syntax_color, last_highlight_color)) = chunks.last_mut() {
-                if syntax_color == *last_syntax_color && highlight_color == *last_highlight_color {
-                    last_chunk.push_str(chunk.text);
-                    continue;
-                }
+            if let Some((last_chunk, last_syntax_color, last_highlight_color)) = chunks.last_mut()
+                && syntax_color == *last_syntax_color
+                && highlight_color == *last_highlight_color
+            {
+                last_chunk.push_str(chunk.text);
+                continue;
             }
             chunks.push((chunk.text.to_string(), syntax_color, highlight_color));
         }
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index c4c9f2004a..5ae37d20fa 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -525,26 +525,25 @@ impl BlockMap {
             // * Below blocks that end at the start of the edit
             // However, if we hit a replace block that ends at the start of the edit we want to reconstruct it.
             new_transforms.append(cursor.slice(&old_start, Bias::Left), &());
-            if let Some(transform) = cursor.item() {
-                if transform.summary.input_rows > 0
-                    && cursor.end() == old_start
-                    && transform
-                        .block
-                        .as_ref()
-                        .map_or(true, |b| !b.is_replacement())
-                {
-                    // Preserve the transform (push and next)
-                    new_transforms.push(transform.clone(), &());
-                    cursor.next();
+            if let Some(transform) = cursor.item()
+                && transform.summary.input_rows > 0
+                && cursor.end() == old_start
+                && transform
+                    .block
+                    .as_ref()
+                    .map_or(true, |b| !b.is_replacement())
+            {
+                // Preserve the transform (push and next)
+                new_transforms.push(transform.clone(), &());
+                cursor.next();
 
-                    // Preserve below blocks at end of edit
-                    while let Some(transform) = cursor.item() {
-                        if transform.block.as_ref().map_or(false, |b| b.place_below()) {
-                            new_transforms.push(transform.clone(), &());
-                            cursor.next();
-                        } else {
-                            break;
-                        }
+                // Preserve below blocks at end of edit
+                while let Some(transform) = cursor.item() {
+                    if transform.block.as_ref().map_or(false, |b| b.place_below()) {
+                        new_transforms.push(transform.clone(), &());
+                        cursor.next();
+                    } else {
+                        break;
                     }
                 }
             }
@@ -657,10 +656,10 @@ impl BlockMap {
                     .iter()
                     .filter_map(|block| {
                         let placement = block.placement.to_wrap_row(wrap_snapshot)?;
-                        if let BlockPlacement::Above(row) = placement {
-                            if row < new_start {
-                                return None;
-                            }
+                        if let BlockPlacement::Above(row) = placement
+                            && row < new_start
+                        {
+                            return None;
                         }
                         Some((placement, Block::Custom(block.clone())))
                     }),
@@ -977,10 +976,10 @@ impl BlockMapReader<'_> {
                 break;
             }
 
-            if let Some(BlockId::Custom(id)) = transform.block.as_ref().map(|block| block.id()) {
-                if id == block_id {
-                    return Some(cursor.start().1);
-                }
+            if let Some(BlockId::Custom(id)) = transform.block.as_ref().map(|block| block.id())
+                && id == block_id
+            {
+                return Some(cursor.start().1);
             }
             cursor.next();
         }
@@ -1299,14 +1298,14 @@ impl BlockSnapshot {
 
         let mut input_start = transform_input_start;
         let mut input_end = transform_input_start;
-        if let Some(transform) = cursor.item() {
-            if transform.block.is_none() {
-                input_start += rows.start - transform_output_start;
-                input_end += cmp::min(
-                    rows.end - transform_output_start,
-                    transform.summary.input_rows,
-                );
-            }
+        if let Some(transform) = cursor.item()
+            && transform.block.is_none()
+        {
+            input_start += rows.start - transform_output_start;
+            input_end += cmp::min(
+                rows.end - transform_output_start,
+                transform.summary.input_rows,
+            );
         }
 
         BlockChunks {
@@ -1472,18 +1471,18 @@ impl BlockSnapshot {
                 longest_row_chars = summary.longest_row_chars;
             }
 
-            if let Some(transform) = cursor.item() {
-                if transform.block.is_none() {
-                    let Dimensions(output_start, input_start, _) = cursor.start();
-                    let overshoot = range.end.0 - output_start.0;
-                    let wrap_start_row = input_start.0;
-                    let wrap_end_row = input_start.0 + overshoot;
-                    let summary = self
-                        .wrap_snapshot
-                        .text_summary_for_range(wrap_start_row..wrap_end_row);
-                    if summary.longest_row_chars > longest_row_chars {
-                        longest_row = BlockRow(output_start.0 + summary.longest_row);
-                    }
+            if let Some(transform) = cursor.item()
+                && transform.block.is_none()
+            {
+                let Dimensions(output_start, input_start, _) = cursor.start();
+                let overshoot = range.end.0 - output_start.0;
+                let wrap_start_row = input_start.0;
+                let wrap_end_row = input_start.0 + overshoot;
+                let summary = self
+                    .wrap_snapshot
+                    .text_summary_for_range(wrap_start_row..wrap_end_row);
+                if summary.longest_row_chars > longest_row_chars {
+                    longest_row = BlockRow(output_start.0 + summary.longest_row);
                 }
             }
         }
@@ -1557,12 +1556,11 @@ impl BlockSnapshot {
 
                 match transform.block.as_ref() {
                     Some(block) => {
-                        if block.is_replacement() {
-                            if ((bias == Bias::Left || search_left) && output_start <= point.0)
-                                || (!search_left && output_start >= point.0)
-                            {
-                                return BlockPoint(output_start);
-                            }
+                        if block.is_replacement()
+                            && (((bias == Bias::Left || search_left) && output_start <= point.0)
+                                || (!search_left && output_start >= point.0))
+                        {
+                            return BlockPoint(output_start);
                         }
                     }
                     None => {
@@ -3228,34 +3226,32 @@ mod tests {
                 let mut is_in_replace_block = false;
                 if let Some((BlockPlacement::Replace(replace_range), block)) =
                     sorted_blocks_iter.peek()
+                    && wrap_row >= replace_range.start().0
                 {
-                    if wrap_row >= replace_range.start().0 {
-                        is_in_replace_block = true;
+                    is_in_replace_block = true;
 
-                        if wrap_row == replace_range.start().0 {
-                            if matches!(block, Block::FoldedBuffer { .. }) {
-                                expected_buffer_rows.push(None);
-                            } else {
-                                expected_buffer_rows
-                                    .push(input_buffer_rows[multibuffer_row as usize]);
-                            }
+                    if wrap_row == replace_range.start().0 {
+                        if matches!(block, Block::FoldedBuffer { .. }) {
+                            expected_buffer_rows.push(None);
+                        } else {
+                            expected_buffer_rows.push(input_buffer_rows[multibuffer_row as usize]);
                         }
+                    }
 
-                        if wrap_row == replace_range.end().0 {
-                            expected_block_positions.push((block_row, block.id()));
-                            let text = "\n".repeat((block.height() - 1) as usize);
-                            if block_row > 0 {
-                                expected_text.push('\n');
-                            }
-                            expected_text.push_str(&text);
-
-                            for _ in 1..block.height() {
-                                expected_buffer_rows.push(None);
-                            }
-                            block_row += block.height();
-
-                            sorted_blocks_iter.next();
+                    if wrap_row == replace_range.end().0 {
+                        expected_block_positions.push((block_row, block.id()));
+                        let text = "\n".repeat((block.height() - 1) as usize);
+                        if block_row > 0 {
+                            expected_text.push('\n');
                         }
+                        expected_text.push_str(&text);
+
+                        for _ in 1..block.height() {
+                            expected_buffer_rows.push(None);
+                        }
+                        block_row += block.height();
+
+                        sorted_blocks_iter.next();
                     }
                 }
 
diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs
index c4e53a0f43..3509bcbba8 100644
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -289,25 +289,25 @@ impl FoldMapWriter<'_> {
             let ChunkRendererId::Fold(id) = id else {
                 continue;
             };
-            if let Some(metadata) = self.0.snapshot.fold_metadata_by_id.get(&id).cloned() {
-                if Some(new_width) != metadata.width {
-                    let buffer_start = metadata.range.start.to_offset(buffer);
-                    let buffer_end = metadata.range.end.to_offset(buffer);
-                    let inlay_range = inlay_snapshot.to_inlay_offset(buffer_start)
-                        ..inlay_snapshot.to_inlay_offset(buffer_end);
-                    edits.push(InlayEdit {
-                        old: inlay_range.clone(),
-                        new: inlay_range.clone(),
-                    });
+            if let Some(metadata) = self.0.snapshot.fold_metadata_by_id.get(&id).cloned()
+                && Some(new_width) != metadata.width
+            {
+                let buffer_start = metadata.range.start.to_offset(buffer);
+                let buffer_end = metadata.range.end.to_offset(buffer);
+                let inlay_range = inlay_snapshot.to_inlay_offset(buffer_start)
+                    ..inlay_snapshot.to_inlay_offset(buffer_end);
+                edits.push(InlayEdit {
+                    old: inlay_range.clone(),
+                    new: inlay_range.clone(),
+                });
 
-                    self.0.snapshot.fold_metadata_by_id.insert(
-                        id,
-                        FoldMetadata {
-                            range: metadata.range,
-                            width: Some(new_width),
-                        },
-                    );
-                }
+                self.0.snapshot.fold_metadata_by_id.insert(
+                    id,
+                    FoldMetadata {
+                        range: metadata.range,
+                        width: Some(new_width),
+                    },
+                );
             }
         }
 
@@ -417,18 +417,18 @@ impl FoldMap {
             cursor.seek(&InlayOffset(0), Bias::Right);
 
             while let Some(mut edit) = inlay_edits_iter.next() {
-                if let Some(item) = cursor.item() {
-                    if !item.is_fold() {
-                        new_transforms.update_last(
-                            |transform| {
-                                if !transform.is_fold() {
-                                    transform.summary.add_summary(&item.summary, &());
-                                    cursor.next();
-                                }
-                            },
-                            &(),
-                        );
-                    }
+                if let Some(item) = cursor.item()
+                    && !item.is_fold()
+                {
+                    new_transforms.update_last(
+                        |transform| {
+                            if !transform.is_fold() {
+                                transform.summary.add_summary(&item.summary, &());
+                                cursor.next();
+                            }
+                        },
+                        &(),
+                    );
                 }
                 new_transforms.append(cursor.slice(&edit.old.start, Bias::Left), &());
                 edit.new.start -= edit.old.start - *cursor.start();
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index 76148af587..626dbf5cba 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -557,11 +557,11 @@ impl InlayMap {
             let mut buffer_edits_iter = buffer_edits.iter().peekable();
             while let Some(buffer_edit) = buffer_edits_iter.next() {
                 new_transforms.append(cursor.slice(&buffer_edit.old.start, Bias::Left), &());
-                if let Some(Transform::Isomorphic(transform)) = cursor.item() {
-                    if cursor.end().0 == buffer_edit.old.start {
-                        push_isomorphic(&mut new_transforms, *transform);
-                        cursor.next();
-                    }
+                if let Some(Transform::Isomorphic(transform)) = cursor.item()
+                    && cursor.end().0 == buffer_edit.old.start
+                {
+                    push_isomorphic(&mut new_transforms, *transform);
+                    cursor.next();
                 }
 
                 // Remove all the inlays and transforms contained by the edit.
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
index 0d2d1c4a4c..7aa252a7f3 100644
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -249,48 +249,48 @@ impl WrapMap {
             return;
         }
 
-        if let Some(wrap_width) = self.wrap_width {
-            if self.background_task.is_none() {
-                let pending_edits = self.pending_edits.clone();
-                let mut snapshot = self.snapshot.clone();
-                let text_system = cx.text_system().clone();
-                let (font, font_size) = self.font_with_size.clone();
-                let update_task = cx.background_spawn(async move {
-                    let mut edits = Patch::default();
-                    let mut line_wrapper = text_system.line_wrapper(font, font_size);
-                    for (tab_snapshot, tab_edits) in pending_edits {
-                        let wrap_edits = snapshot
-                            .update(tab_snapshot, &tab_edits, wrap_width, &mut line_wrapper)
-                            .await;
-                        edits = edits.compose(&wrap_edits);
-                    }
-                    (snapshot, edits)
-                });
+        if let Some(wrap_width) = self.wrap_width
+            && self.background_task.is_none()
+        {
+            let pending_edits = self.pending_edits.clone();
+            let mut snapshot = self.snapshot.clone();
+            let text_system = cx.text_system().clone();
+            let (font, font_size) = self.font_with_size.clone();
+            let update_task = cx.background_spawn(async move {
+                let mut edits = Patch::default();
+                let mut line_wrapper = text_system.line_wrapper(font, font_size);
+                for (tab_snapshot, tab_edits) in pending_edits {
+                    let wrap_edits = snapshot
+                        .update(tab_snapshot, &tab_edits, wrap_width, &mut line_wrapper)
+                        .await;
+                    edits = edits.compose(&wrap_edits);
+                }
+                (snapshot, edits)
+            });
 
-                match cx
-                    .background_executor()
-                    .block_with_timeout(Duration::from_millis(1), update_task)
-                {
-                    Ok((snapshot, output_edits)) => {
-                        self.snapshot = snapshot;
-                        self.edits_since_sync = self.edits_since_sync.compose(&output_edits);
-                    }
-                    Err(update_task) => {
-                        self.background_task = Some(cx.spawn(async move |this, cx| {
-                            let (snapshot, edits) = update_task.await;
-                            this.update(cx, |this, cx| {
-                                this.snapshot = snapshot;
-                                this.edits_since_sync = this
-                                    .edits_since_sync
-                                    .compose(mem::take(&mut this.interpolated_edits).invert())
-                                    .compose(&edits);
-                                this.background_task = None;
-                                this.flush_edits(cx);
-                                cx.notify();
-                            })
-                            .ok();
-                        }));
-                    }
+            match cx
+                .background_executor()
+                .block_with_timeout(Duration::from_millis(1), update_task)
+            {
+                Ok((snapshot, output_edits)) => {
+                    self.snapshot = snapshot;
+                    self.edits_since_sync = self.edits_since_sync.compose(&output_edits);
+                }
+                Err(update_task) => {
+                    self.background_task = Some(cx.spawn(async move |this, cx| {
+                        let (snapshot, edits) = update_task.await;
+                        this.update(cx, |this, cx| {
+                            this.snapshot = snapshot;
+                            this.edits_since_sync = this
+                                .edits_since_sync
+                                .compose(mem::take(&mut this.interpolated_edits).invert())
+                                .compose(&edits);
+                            this.background_task = None;
+                            this.flush_edits(cx);
+                            cx.notify();
+                        })
+                        .ok();
+                    }));
                 }
             }
         }
@@ -1065,12 +1065,12 @@ impl sum_tree::Item for Transform {
 }
 
 fn push_isomorphic(transforms: &mut Vec<Transform>, summary: TextSummary) {
-    if let Some(last_transform) = transforms.last_mut() {
-        if last_transform.is_isomorphic() {
-            last_transform.summary.input += &summary;
-            last_transform.summary.output += &summary;
-            return;
-        }
+    if let Some(last_transform) = transforms.last_mut()
+        && last_transform.is_isomorphic()
+    {
+        last_transform.summary.input += &summary;
+        last_transform.summary.output += &summary;
+        return;
     }
     transforms.push(Transform::isomorphic(summary));
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c52a59a909..ca1f1f8828 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -942,10 +942,10 @@ impl ChangeList {
     }
 
     pub fn invert_last_group(&mut self) {
-        if let Some(last) = self.changes.last_mut() {
-            if let Some(current) = last.current.as_mut() {
-                mem::swap(&mut last.original, current);
-            }
+        if let Some(last) = self.changes.last_mut()
+            && let Some(current) = last.current.as_mut()
+        {
+            mem::swap(&mut last.original, current);
         }
     }
 }
@@ -1861,114 +1861,110 @@ impl Editor {
             .then(|| language_settings::SoftWrap::None);
 
         let mut project_subscriptions = Vec::new();
-        if full_mode {
-            if let Some(project) = project.as_ref() {
-                project_subscriptions.push(cx.subscribe_in(
-                    project,
-                    window,
-                    |editor, _, event, window, cx| match event {
-                        project::Event::RefreshCodeLens => {
-                            // we always query lens with actions, without storing them, always refreshing them
+        if full_mode && let Some(project) = project.as_ref() {
+            project_subscriptions.push(cx.subscribe_in(
+                project,
+                window,
+                |editor, _, event, window, cx| match event {
+                    project::Event::RefreshCodeLens => {
+                        // we always query lens with actions, without storing them, always refreshing them
+                    }
+                    project::Event::RefreshInlayHints => {
+                        editor.refresh_inlay_hints(InlayHintRefreshReason::RefreshRequested, cx);
+                    }
+                    project::Event::LanguageServerAdded(..)
+                    | project::Event::LanguageServerRemoved(..) => {
+                        if editor.tasks_update_task.is_none() {
+                            editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
                         }
-                        project::Event::RefreshInlayHints => {
-                            editor
-                                .refresh_inlay_hints(InlayHintRefreshReason::RefreshRequested, cx);
-                        }
-                        project::Event::LanguageServerAdded(..)
-                        | project::Event::LanguageServerRemoved(..) => {
-                            if editor.tasks_update_task.is_none() {
-                                editor.tasks_update_task =
-                                    Some(editor.refresh_runnables(window, cx));
-                            }
-                        }
-                        project::Event::SnippetEdit(id, snippet_edits) => {
-                            if let Some(buffer) = editor.buffer.read(cx).buffer(*id) {
-                                let focus_handle = editor.focus_handle(cx);
-                                if focus_handle.is_focused(window) {
-                                    let snapshot = buffer.read(cx).snapshot();
-                                    for (range, snippet) in snippet_edits {
-                                        let editor_range =
-                                            language::range_from_lsp(*range).to_offset(&snapshot);
-                                        editor
-                                            .insert_snippet(
-                                                &[editor_range],
-                                                snippet.clone(),
-                                                window,
-                                                cx,
-                                            )
-                                            .ok();
-                                    }
+                    }
+                    project::Event::SnippetEdit(id, snippet_edits) => {
+                        if let Some(buffer) = editor.buffer.read(cx).buffer(*id) {
+                            let focus_handle = editor.focus_handle(cx);
+                            if focus_handle.is_focused(window) {
+                                let snapshot = buffer.read(cx).snapshot();
+                                for (range, snippet) in snippet_edits {
+                                    let editor_range =
+                                        language::range_from_lsp(*range).to_offset(&snapshot);
+                                    editor
+                                        .insert_snippet(
+                                            &[editor_range],
+                                            snippet.clone(),
+                                            window,
+                                            cx,
+                                        )
+                                        .ok();
                                 }
                             }
                         }
-                        project::Event::LanguageServerBufferRegistered { buffer_id, .. } => {
-                            if editor.buffer().read(cx).buffer(*buffer_id).is_some() {
-                                editor.update_lsp_data(false, Some(*buffer_id), window, cx);
-                            }
-                        }
-                        _ => {}
-                    },
-                ));
-                if let Some(task_inventory) = project
-                    .read(cx)
-                    .task_store()
-                    .read(cx)
-                    .task_inventory()
-                    .cloned()
-                {
-                    project_subscriptions.push(cx.observe_in(
-                        &task_inventory,
-                        window,
-                        |editor, _, window, cx| {
-                            editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
-                        },
-                    ));
-                };
-
-                project_subscriptions.push(cx.subscribe_in(
-                    &project.read(cx).breakpoint_store(),
-                    window,
-                    |editor, _, event, window, cx| match event {
-                        BreakpointStoreEvent::ClearDebugLines => {
-                            editor.clear_row_highlights::<ActiveDebugLine>();
-                            editor.refresh_inline_values(cx);
-                        }
-                        BreakpointStoreEvent::SetDebugLine => {
-                            if editor.go_to_active_debug_line(window, cx) {
-                                cx.stop_propagation();
-                            }
-
-                            editor.refresh_inline_values(cx);
-                        }
-                        _ => {}
-                    },
-                ));
-                let git_store = project.read(cx).git_store().clone();
-                let project = project.clone();
-                project_subscriptions.push(cx.subscribe(&git_store, move |this, _, event, cx| {
-                    match event {
-                        GitStoreEvent::RepositoryUpdated(
-                            _,
-                            RepositoryEvent::Updated {
-                                new_instance: true, ..
-                            },
-                            _,
-                        ) => {
-                            this.load_diff_task = Some(
-                                update_uncommitted_diff_for_buffer(
-                                    cx.entity(),
-                                    &project,
-                                    this.buffer.read(cx).all_buffers(),
-                                    this.buffer.clone(),
-                                    cx,
-                                )
-                                .shared(),
-                            );
-                        }
-                        _ => {}
                     }
-                }));
-            }
+                    project::Event::LanguageServerBufferRegistered { buffer_id, .. } => {
+                        if editor.buffer().read(cx).buffer(*buffer_id).is_some() {
+                            editor.update_lsp_data(false, Some(*buffer_id), window, cx);
+                        }
+                    }
+                    _ => {}
+                },
+            ));
+            if let Some(task_inventory) = project
+                .read(cx)
+                .task_store()
+                .read(cx)
+                .task_inventory()
+                .cloned()
+            {
+                project_subscriptions.push(cx.observe_in(
+                    &task_inventory,
+                    window,
+                    |editor, _, window, cx| {
+                        editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
+                    },
+                ));
+            };
+
+            project_subscriptions.push(cx.subscribe_in(
+                &project.read(cx).breakpoint_store(),
+                window,
+                |editor, _, event, window, cx| match event {
+                    BreakpointStoreEvent::ClearDebugLines => {
+                        editor.clear_row_highlights::<ActiveDebugLine>();
+                        editor.refresh_inline_values(cx);
+                    }
+                    BreakpointStoreEvent::SetDebugLine => {
+                        if editor.go_to_active_debug_line(window, cx) {
+                            cx.stop_propagation();
+                        }
+
+                        editor.refresh_inline_values(cx);
+                    }
+                    _ => {}
+                },
+            ));
+            let git_store = project.read(cx).git_store().clone();
+            let project = project.clone();
+            project_subscriptions.push(cx.subscribe(&git_store, move |this, _, event, cx| {
+                match event {
+                    GitStoreEvent::RepositoryUpdated(
+                        _,
+                        RepositoryEvent::Updated {
+                            new_instance: true, ..
+                        },
+                        _,
+                    ) => {
+                        this.load_diff_task = Some(
+                            update_uncommitted_diff_for_buffer(
+                                cx.entity(),
+                                &project,
+                                this.buffer.read(cx).all_buffers(),
+                                this.buffer.clone(),
+                                cx,
+                            )
+                            .shared(),
+                        );
+                    }
+                    _ => {}
+                }
+            }));
         }
 
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
@@ -2323,15 +2319,15 @@ impl Editor {
 
             editor.go_to_active_debug_line(window, cx);
 
-            if let Some(buffer) = buffer.read(cx).as_singleton() {
-                if let Some(project) = editor.project() {
-                    let handle = project.update(cx, |project, cx| {
-                        project.register_buffer_with_language_servers(&buffer, cx)
-                    });
-                    editor
-                        .registered_buffers
-                        .insert(buffer.read(cx).remote_id(), handle);
-                }
+            if let Some(buffer) = buffer.read(cx).as_singleton()
+                && let Some(project) = editor.project()
+            {
+                let handle = project.update(cx, |project, cx| {
+                    project.register_buffer_with_language_servers(&buffer, cx)
+                });
+                editor
+                    .registered_buffers
+                    .insert(buffer.read(cx).remote_id(), handle);
             }
 
             editor.minimap =
@@ -3035,20 +3031,19 @@ impl Editor {
         }
 
         if local {
-            if let Some(buffer_id) = new_cursor_position.buffer_id {
-                if !self.registered_buffers.contains_key(&buffer_id) {
-                    if let Some(project) = self.project.as_ref() {
-                        project.update(cx, |project, cx| {
-                            let Some(buffer) = self.buffer.read(cx).buffer(buffer_id) else {
-                                return;
-                            };
-                            self.registered_buffers.insert(
-                                buffer_id,
-                                project.register_buffer_with_language_servers(&buffer, cx),
-                            );
-                        })
-                    }
-                }
+            if let Some(buffer_id) = new_cursor_position.buffer_id
+                && !self.registered_buffers.contains_key(&buffer_id)
+                && let Some(project) = self.project.as_ref()
+            {
+                project.update(cx, |project, cx| {
+                    let Some(buffer) = self.buffer.read(cx).buffer(buffer_id) else {
+                        return;
+                    };
+                    self.registered_buffers.insert(
+                        buffer_id,
+                        project.register_buffer_with_language_servers(&buffer, cx),
+                    );
+                })
             }
 
             let mut context_menu = self.context_menu.borrow_mut();
@@ -3063,28 +3058,28 @@ impl Editor {
             let completion_position = completion_menu.map(|menu| menu.initial_position);
             drop(context_menu);
 
-            if effects.completions {
-                if let Some(completion_position) = completion_position {
-                    let start_offset = selection_start.to_offset(buffer);
-                    let position_matches = start_offset == completion_position.to_offset(buffer);
-                    let continue_showing = if position_matches {
-                        if self.snippet_stack.is_empty() {
-                            buffer.char_kind_before(start_offset, true) == Some(CharKind::Word)
-                        } else {
-                            // Snippet choices can be shown even when the cursor is in whitespace.
-                            // Dismissing the menu with actions like backspace is handled by
-                            // invalidation regions.
-                            true
-                        }
+            if effects.completions
+                && let Some(completion_position) = completion_position
+            {
+                let start_offset = selection_start.to_offset(buffer);
+                let position_matches = start_offset == completion_position.to_offset(buffer);
+                let continue_showing = if position_matches {
+                    if self.snippet_stack.is_empty() {
+                        buffer.char_kind_before(start_offset, true) == Some(CharKind::Word)
                     } else {
-                        false
-                    };
-
-                    if continue_showing {
-                        self.show_completions(&ShowCompletions { trigger: None }, window, cx);
-                    } else {
-                        self.hide_context_menu(window, cx);
+                        // Snippet choices can be shown even when the cursor is in whitespace.
+                        // Dismissing the menu with actions like backspace is handled by
+                        // invalidation regions.
+                        true
                     }
+                } else {
+                    false
+                };
+
+                if continue_showing {
+                    self.show_completions(&ShowCompletions { trigger: None }, window, cx);
+                } else {
+                    self.hide_context_menu(window, cx);
                 }
             }
 
@@ -3115,30 +3110,27 @@ impl Editor {
         if selections.len() == 1 {
             cx.emit(SearchEvent::ActiveMatchChanged)
         }
-        if local {
-            if let Some((_, _, buffer_snapshot)) = buffer.as_singleton() {
-                let inmemory_selections = selections
-                    .iter()
-                    .map(|s| {
-                        text::ToPoint::to_point(&s.range().start.text_anchor, buffer_snapshot)
-                            ..text::ToPoint::to_point(&s.range().end.text_anchor, buffer_snapshot)
-                    })
-                    .collect();
-                self.update_restoration_data(cx, |data| {
-                    data.selections = inmemory_selections;
-                });
+        if local && let Some((_, _, buffer_snapshot)) = buffer.as_singleton() {
+            let inmemory_selections = selections
+                .iter()
+                .map(|s| {
+                    text::ToPoint::to_point(&s.range().start.text_anchor, buffer_snapshot)
+                        ..text::ToPoint::to_point(&s.range().end.text_anchor, buffer_snapshot)
+                })
+                .collect();
+            self.update_restoration_data(cx, |data| {
+                data.selections = inmemory_selections;
+            });
 
-                if WorkspaceSettings::get(None, cx).restore_on_startup
-                    != RestoreOnStartupBehavior::None
-                {
-                    if let Some(workspace_id) =
-                        self.workspace.as_ref().and_then(|workspace| workspace.1)
-                    {
-                        let snapshot = self.buffer().read(cx).snapshot(cx);
-                        let selections = selections.clone();
-                        let background_executor = cx.background_executor().clone();
-                        let editor_id = cx.entity().entity_id().as_u64() as ItemId;
-                        self.serialize_selections = cx.background_spawn(async move {
+            if WorkspaceSettings::get(None, cx).restore_on_startup != RestoreOnStartupBehavior::None
+                && let Some(workspace_id) =
+                    self.workspace.as_ref().and_then(|workspace| workspace.1)
+            {
+                let snapshot = self.buffer().read(cx).snapshot(cx);
+                let selections = selections.clone();
+                let background_executor = cx.background_executor().clone();
+                let editor_id = cx.entity().entity_id().as_u64() as ItemId;
+                self.serialize_selections = cx.background_spawn(async move {
                             background_executor.timer(SERIALIZATION_THROTTLE_TIME).await;
                             let db_selections = selections
                                 .iter()
@@ -3155,8 +3147,6 @@ impl Editor {
                                 .with_context(|| format!("persisting editor selections for editor {editor_id}, workspace {workspace_id:?}"))
                                 .log_err();
                         });
-                    }
-                }
             }
         }
 
@@ -4154,42 +4144,38 @@ impl Editor {
             if self.auto_replace_emoji_shortcode
                 && selection.is_empty()
                 && text.as_ref().ends_with(':')
-            {
-                if let Some(possible_emoji_short_code) =
+                && let Some(possible_emoji_short_code) =
                     Self::find_possible_emoji_shortcode_at_position(&snapshot, selection.start)
-                {
-                    if !possible_emoji_short_code.is_empty() {
-                        if let Some(emoji) = emojis::get_by_shortcode(&possible_emoji_short_code) {
-                            let emoji_shortcode_start = Point::new(
-                                selection.start.row,
-                                selection.start.column - possible_emoji_short_code.len() as u32 - 1,
-                            );
+                && !possible_emoji_short_code.is_empty()
+                && let Some(emoji) = emojis::get_by_shortcode(&possible_emoji_short_code)
+            {
+                let emoji_shortcode_start = Point::new(
+                    selection.start.row,
+                    selection.start.column - possible_emoji_short_code.len() as u32 - 1,
+                );
 
-                            // Remove shortcode from buffer
-                            edits.push((
-                                emoji_shortcode_start..selection.start,
-                                "".to_string().into(),
-                            ));
-                            new_selections.push((
-                                Selection {
-                                    id: selection.id,
-                                    start: snapshot.anchor_after(emoji_shortcode_start),
-                                    end: snapshot.anchor_before(selection.start),
-                                    reversed: selection.reversed,
-                                    goal: selection.goal,
-                                },
-                                0,
-                            ));
+                // Remove shortcode from buffer
+                edits.push((
+                    emoji_shortcode_start..selection.start,
+                    "".to_string().into(),
+                ));
+                new_selections.push((
+                    Selection {
+                        id: selection.id,
+                        start: snapshot.anchor_after(emoji_shortcode_start),
+                        end: snapshot.anchor_before(selection.start),
+                        reversed: selection.reversed,
+                        goal: selection.goal,
+                    },
+                    0,
+                ));
 
-                            // Insert emoji
-                            let selection_start_anchor = snapshot.anchor_after(selection.start);
-                            new_selections.push((selection.map(|_| selection_start_anchor), 0));
-                            edits.push((selection.start..selection.end, emoji.to_string().into()));
+                // Insert emoji
+                let selection_start_anchor = snapshot.anchor_after(selection.start);
+                new_selections.push((selection.map(|_| selection_start_anchor), 0));
+                edits.push((selection.start..selection.end, emoji.to_string().into()));
 
-                            continue;
-                        }
-                    }
-                }
+                continue;
             }
 
             // If not handling any auto-close operation, then just replace the selected
@@ -4303,12 +4289,11 @@ impl Editor {
                 |s| s.select(new_selections),
             );
 
-            if !bracket_inserted {
-                if let Some(on_type_format_task) =
+            if !bracket_inserted
+                && let Some(on_type_format_task) =
                     this.trigger_on_type_formatting(text.to_string(), window, cx)
-                {
-                    on_type_format_task.detach_and_log_err(cx);
-                }
+            {
+                on_type_format_task.detach_and_log_err(cx);
             }
 
             let editor_settings = EditorSettings::get_global(cx);
@@ -5274,10 +5259,10 @@ impl Editor {
                 }
 
                 let language = buffer.language()?;
-                if let Some(restrict_to_languages) = restrict_to_languages {
-                    if !restrict_to_languages.contains(language) {
-                        return None;
-                    }
+                if let Some(restrict_to_languages) = restrict_to_languages
+                    && !restrict_to_languages.contains(language)
+                {
+                    return None;
                 }
                 Some((
                     excerpt_id,
@@ -5605,15 +5590,15 @@ impl Editor {
             // that having one source with `is_incomplete: true` doesn't cause all to be re-queried.
             let mut completions = Vec::new();
             let mut is_incomplete = false;
-            if let Some(provider_responses) = provider_responses.await.log_err() {
-                if !provider_responses.is_empty() {
-                    for response in provider_responses {
-                        completions.extend(response.completions);
-                        is_incomplete = is_incomplete || response.is_incomplete;
-                    }
-                    if completion_settings.words == WordsCompletionMode::Fallback {
-                        words = Task::ready(BTreeMap::default());
-                    }
+            if let Some(provider_responses) = provider_responses.await.log_err()
+                && !provider_responses.is_empty()
+            {
+                for response in provider_responses {
+                    completions.extend(response.completions);
+                    is_incomplete = is_incomplete || response.is_incomplete;
+                }
+                if completion_settings.words == WordsCompletionMode::Fallback {
+                    words = Task::ready(BTreeMap::default());
                 }
             }
 
@@ -5718,21 +5703,21 @@ impl Editor {
 
             editor
                 .update_in(cx, |editor, window, cx| {
-                    if editor.focus_handle.is_focused(window) {
-                        if let Some(menu) = menu {
-                            *editor.context_menu.borrow_mut() =
-                                Some(CodeContextMenu::Completions(menu));
+                    if editor.focus_handle.is_focused(window)
+                        && let Some(menu) = menu
+                    {
+                        *editor.context_menu.borrow_mut() =
+                            Some(CodeContextMenu::Completions(menu));
 
-                            crate::hover_popover::hide_hover(editor, cx);
-                            if editor.show_edit_predictions_in_menu() {
-                                editor.update_visible_edit_prediction(window, cx);
-                            } else {
-                                editor.discard_edit_prediction(false, cx);
-                            }
-
-                            cx.notify();
-                            return;
+                        crate::hover_popover::hide_hover(editor, cx);
+                        if editor.show_edit_predictions_in_menu() {
+                            editor.update_visible_edit_prediction(window, cx);
+                        } else {
+                            editor.discard_edit_prediction(false, cx);
                         }
+
+                        cx.notify();
+                        return;
                     }
 
                     if editor.completion_tasks.len() <= 1 {
@@ -6079,11 +6064,11 @@ impl Editor {
             Some(CodeActionSource::Indicator(_)) => Task::ready(Ok(Default::default())),
             _ => {
                 let mut task_context_task = Task::ready(None);
-                if let Some(tasks) = &tasks {
-                    if let Some(project) = project {
-                        task_context_task =
-                            Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx);
-                    }
+                if let Some(tasks) = &tasks
+                    && let Some(project) = project
+                {
+                    task_context_task =
+                        Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx);
                 }
 
                 cx.spawn_in(window, {
@@ -6148,14 +6133,14 @@ impl Editor {
                         deployed_from,
                     }));
                 cx.notify();
-                if spawn_straight_away {
-                    if let Some(task) = editor.confirm_code_action(
+                if spawn_straight_away
+                    && let Some(task) = editor.confirm_code_action(
                         &ConfirmCodeAction { item_ix: Some(0) },
                         window,
                         cx,
-                    ) {
-                        return task;
-                    }
+                    )
+                {
+                    return task;
                 }
 
                 Task::ready(Ok(()))
@@ -6342,21 +6327,20 @@ impl Editor {
                         .read(cx)
                         .excerpt_containing(editor.selections.newest_anchor().head(), cx)
                 })?;
-                if let Some((_, excerpted_buffer, excerpt_range)) = excerpt {
-                    if excerpted_buffer == *buffer {
-                        let all_edits_within_excerpt = buffer.read_with(cx, |buffer, _| {
-                            let excerpt_range = excerpt_range.to_offset(buffer);
-                            buffer
-                                .edited_ranges_for_transaction::<usize>(transaction)
-                                .all(|range| {
-                                    excerpt_range.start <= range.start
-                                        && excerpt_range.end >= range.end
-                                })
-                        })?;
+                if let Some((_, excerpted_buffer, excerpt_range)) = excerpt
+                    && excerpted_buffer == *buffer
+                {
+                    let all_edits_within_excerpt = buffer.read_with(cx, |buffer, _| {
+                        let excerpt_range = excerpt_range.to_offset(buffer);
+                        buffer
+                            .edited_ranges_for_transaction::<usize>(transaction)
+                            .all(|range| {
+                                excerpt_range.start <= range.start && excerpt_range.end >= range.end
+                            })
+                    })?;
 
-                        if all_edits_within_excerpt {
-                            return Ok(());
-                        }
+                    if all_edits_within_excerpt {
+                        return Ok(());
                     }
                 }
             }
@@ -7779,10 +7763,10 @@ impl Editor {
 
             let indents = multibuffer.suggested_indents(cursor_point.row..cursor_point.row + 1, cx);
 
-            if let Some((_, indent)) = indents.iter().next() {
-                if indent.len == cursor_point.column {
-                    self.edit_prediction_indent_conflict = false;
-                }
+            if let Some((_, indent)) = indents.iter().next()
+                && indent.len == cursor_point.column
+            {
+                self.edit_prediction_indent_conflict = false;
             }
         }
 
@@ -9531,10 +9515,10 @@ impl Editor {
         let context_menu = self.context_menu.borrow_mut().take();
         self.stale_edit_prediction_in_menu.take();
         self.update_visible_edit_prediction(window, cx);
-        if let Some(CodeContextMenu::Completions(_)) = &context_menu {
-            if let Some(completion_provider) = &self.completion_provider {
-                completion_provider.selection_changed(None, window, cx);
-            }
+        if let Some(CodeContextMenu::Completions(_)) = &context_menu
+            && let Some(completion_provider) = &self.completion_provider
+        {
+            completion_provider.selection_changed(None, window, cx);
         }
         context_menu
     }
@@ -9639,10 +9623,10 @@ impl Editor {
                 s.select_ranges(tabstop.ranges.iter().rev().cloned());
             });
 
-            if let Some(choices) = &tabstop.choices {
-                if let Some(selection) = tabstop.ranges.first() {
-                    self.show_snippet_choices(choices, selection.clone(), cx)
-                }
+            if let Some(choices) = &tabstop.choices
+                && let Some(selection) = tabstop.ranges.first()
+            {
+                self.show_snippet_choices(choices, selection.clone(), cx)
             }
 
             // If we're already at the last tabstop and it's at the end of the snippet,
@@ -9776,10 +9760,10 @@ impl Editor {
                     s.select_ranges(current_ranges.iter().rev().cloned())
                 });
 
-                if let Some(choices) = &snippet.choices[snippet.active_index] {
-                    if let Some(selection) = current_ranges.first() {
-                        self.show_snippet_choices(choices, selection.clone(), cx);
-                    }
+                if let Some(choices) = &snippet.choices[snippet.active_index]
+                    && let Some(selection) = current_ranges.first()
+                {
+                    self.show_snippet_choices(choices, selection.clone(), cx);
                 }
 
                 // If snippet state is not at the last tabstop, push it back on the stack
@@ -10176,10 +10160,10 @@ impl Editor {
 
                 // Avoid re-outdenting a row that has already been outdented by a
                 // previous selection.
-                if let Some(last_row) = last_outdent {
-                    if last_row == rows.start {
-                        rows.start = rows.start.next_row();
-                    }
+                if let Some(last_row) = last_outdent
+                    && last_row == rows.start
+                {
+                    rows.start = rows.start.next_row();
                 }
                 let has_multiple_rows = rows.len() > 1;
                 for row in rows.iter_rows() {
@@ -10357,11 +10341,11 @@ impl Editor {
                 MultiBufferRow(selection.end.row)
             };
 
-            if let Some(last_row_range) = row_ranges.last_mut() {
-                if start <= last_row_range.end {
-                    last_row_range.end = end;
-                    continue;
-                }
+            if let Some(last_row_range) = row_ranges.last_mut()
+                && start <= last_row_range.end
+            {
+                last_row_range.end = end;
+                continue;
             }
             row_ranges.push(start..end);
         }
@@ -15331,17 +15315,15 @@ impl Editor {
         if direction == ExpandExcerptDirection::Down {
             let multi_buffer = self.buffer.read(cx);
             let snapshot = multi_buffer.snapshot(cx);
-            if let Some(buffer_id) = snapshot.buffer_id_for_excerpt(excerpt) {
-                if let Some(buffer) = multi_buffer.buffer(buffer_id) {
-                    if let Some(excerpt_range) = snapshot.buffer_range_for_excerpt(excerpt) {
-                        let buffer_snapshot = buffer.read(cx).snapshot();
-                        let excerpt_end_row =
-                            Point::from_anchor(&excerpt_range.end, &buffer_snapshot).row;
-                        let last_row = buffer_snapshot.max_point().row;
-                        let lines_below = last_row.saturating_sub(excerpt_end_row);
-                        should_scroll_up = lines_below >= lines_to_expand;
-                    }
-                }
+            if let Some(buffer_id) = snapshot.buffer_id_for_excerpt(excerpt)
+                && let Some(buffer) = multi_buffer.buffer(buffer_id)
+                && let Some(excerpt_range) = snapshot.buffer_range_for_excerpt(excerpt)
+            {
+                let buffer_snapshot = buffer.read(cx).snapshot();
+                let excerpt_end_row = Point::from_anchor(&excerpt_range.end, &buffer_snapshot).row;
+                let last_row = buffer_snapshot.max_point().row;
+                let lines_below = last_row.saturating_sub(excerpt_end_row);
+                should_scroll_up = lines_below >= lines_to_expand;
             }
         }
 
@@ -15426,10 +15408,10 @@ impl Editor {
         let selection = self.selections.newest::<usize>(cx);
 
         let mut active_group_id = None;
-        if let ActiveDiagnostic::Group(active_group) = &self.active_diagnostics {
-            if active_group.active_range.start.to_offset(&buffer) == selection.start {
-                active_group_id = Some(active_group.group_id);
-            }
+        if let ActiveDiagnostic::Group(active_group) = &self.active_diagnostics
+            && active_group.active_range.start.to_offset(&buffer) == selection.start
+        {
+            active_group_id = Some(active_group.group_id);
         }
 
         fn filtered(
@@ -16674,10 +16656,10 @@ impl Editor {
 
             buffer
                 .update(cx, |buffer, cx| {
-                    if let Some(transaction) = transaction {
-                        if !buffer.is_singleton() {
-                            buffer.push_transaction(&transaction.0, cx);
-                        }
+                    if let Some(transaction) = transaction
+                        && !buffer.is_singleton()
+                    {
+                        buffer.push_transaction(&transaction.0, cx);
                     }
                     cx.notify();
                 })
@@ -16743,10 +16725,10 @@ impl Editor {
             buffer
                 .update(cx, |buffer, cx| {
                     // check if we need this
-                    if let Some(transaction) = transaction {
-                        if !buffer.is_singleton() {
-                            buffer.push_transaction(&transaction.0, cx);
-                        }
+                    if let Some(transaction) = transaction
+                        && !buffer.is_singleton()
+                    {
+                        buffer.push_transaction(&transaction.0, cx);
                     }
                     cx.notify();
                 })
@@ -17378,12 +17360,12 @@ impl Editor {
                 }
 
                 for row in (0..=range.start.row).rev() {
-                    if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row)) {
-                        if crease.range().end.row >= buffer_start_row {
-                            to_fold.push(crease);
-                            if row <= range.start.row {
-                                break;
-                            }
+                    if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row))
+                        && crease.range().end.row >= buffer_start_row
+                    {
+                        to_fold.push(crease);
+                        if row <= range.start.row {
+                            break;
                         }
                     }
                 }
@@ -18693,10 +18675,10 @@ impl Editor {
 
     pub fn working_directory(&self, cx: &App) -> Option<PathBuf> {
         if let Some(buffer) = self.buffer().read(cx).as_singleton() {
-            if let Some(file) = buffer.read(cx).file().and_then(|f| f.as_local()) {
-                if let Some(dir) = file.abs_path(cx).parent() {
-                    return Some(dir.to_owned());
-                }
+            if let Some(file) = buffer.read(cx).file().and_then(|f| f.as_local())
+                && let Some(dir) = file.abs_path(cx).parent()
+            {
+                return Some(dir.to_owned());
             }
 
             if let Some(project_path) = buffer.read(cx).project_path(cx) {
@@ -18756,10 +18738,10 @@ impl Editor {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(path) = self.target_file_abs_path(cx) {
-            if let Some(path) = path.to_str() {
-                cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
-            }
+        if let Some(path) = self.target_file_abs_path(cx)
+            && let Some(path) = path.to_str()
+        {
+            cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
         }
     }
 
@@ -18769,10 +18751,10 @@ impl Editor {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(path) = self.target_file_path(cx) {
-            if let Some(path) = path.to_str() {
-                cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
-            }
+        if let Some(path) = self.target_file_path(cx)
+            && let Some(path) = path.to_str()
+        {
+            cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
         }
     }
 
@@ -18841,22 +18823,20 @@ impl Editor {
         _: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(file) = self.target_file(cx) {
-            if let Some(file_stem) = file.path().file_stem() {
-                if let Some(name) = file_stem.to_str() {
-                    cx.write_to_clipboard(ClipboardItem::new_string(name.to_string()));
-                }
-            }
+        if let Some(file) = self.target_file(cx)
+            && let Some(file_stem) = file.path().file_stem()
+            && let Some(name) = file_stem.to_str()
+        {
+            cx.write_to_clipboard(ClipboardItem::new_string(name.to_string()));
         }
     }
 
     pub fn copy_file_name(&mut self, _: &CopyFileName, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(file) = self.target_file(cx) {
-            if let Some(file_name) = file.path().file_name() {
-                if let Some(name) = file_name.to_str() {
-                    cx.write_to_clipboard(ClipboardItem::new_string(name.to_string()));
-                }
-            }
+        if let Some(file) = self.target_file(cx)
+            && let Some(file_name) = file.path().file_name()
+            && let Some(name) = file_name.to_str()
+        {
+            cx.write_to_clipboard(ClipboardItem::new_string(name.to_string()));
         }
     }
 
@@ -19126,10 +19106,10 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         let selection = self.selections.newest::<Point>(cx).start.row + 1;
-        if let Some(file) = self.target_file(cx) {
-            if let Some(path) = file.path().to_str() {
-                cx.write_to_clipboard(ClipboardItem::new_string(format!("{path}:{selection}")));
-            }
+        if let Some(file) = self.target_file(cx)
+            && let Some(path) = file.path().to_str()
+        {
+            cx.write_to_clipboard(ClipboardItem::new_string(format!("{path}:{selection}")));
         }
     }
 
@@ -19769,10 +19749,10 @@ impl Editor {
                 break;
             }
             let end = range.end.to_point(&display_snapshot.buffer_snapshot);
-            if let Some(current_row) = &end_row {
-                if end.row == current_row.row {
-                    continue;
-                }
+            if let Some(current_row) = &end_row
+                && end.row == current_row.row
+            {
+                continue;
             }
             let start = range.start.to_point(&display_snapshot.buffer_snapshot);
             if start_row.is_none() {
@@ -20064,16 +20044,16 @@ impl Editor {
                 if self.has_active_edit_prediction() {
                     self.update_visible_edit_prediction(window, cx);
                 }
-                if let Some(project) = self.project.as_ref() {
-                    if let Some(edited_buffer) = edited_buffer {
-                        project.update(cx, |project, cx| {
-                            self.registered_buffers
-                                .entry(edited_buffer.read(cx).remote_id())
-                                .or_insert_with(|| {
-                                    project.register_buffer_with_language_servers(edited_buffer, cx)
-                                });
-                        });
-                    }
+                if let Some(project) = self.project.as_ref()
+                    && let Some(edited_buffer) = edited_buffer
+                {
+                    project.update(cx, |project, cx| {
+                        self.registered_buffers
+                            .entry(edited_buffer.read(cx).remote_id())
+                            .or_insert_with(|| {
+                                project.register_buffer_with_language_servers(edited_buffer, cx)
+                            });
+                    });
                 }
                 cx.emit(EditorEvent::BufferEdited);
                 cx.emit(SearchEvent::MatchesInvalidated);
@@ -20083,10 +20063,10 @@ impl Editor {
                 }
 
                 if *singleton_buffer_edited {
-                    if let Some(buffer) = edited_buffer {
-                        if buffer.read(cx).file().is_none() {
-                            cx.emit(EditorEvent::TitleChanged);
-                        }
+                    if let Some(buffer) = edited_buffer
+                        && buffer.read(cx).file().is_none()
+                    {
+                        cx.emit(EditorEvent::TitleChanged);
                     }
                     if let Some(project) = &self.project {
                         #[allow(clippy::mutable_key_type)]
@@ -20132,17 +20112,17 @@ impl Editor {
             } => {
                 self.tasks_update_task = Some(self.refresh_runnables(window, cx));
                 let buffer_id = buffer.read(cx).remote_id();
-                if self.buffer.read(cx).diff_for(buffer_id).is_none() {
-                    if let Some(project) = &self.project {
-                        update_uncommitted_diff_for_buffer(
-                            cx.entity(),
-                            project,
-                            [buffer.clone()],
-                            self.buffer.clone(),
-                            cx,
-                        )
-                        .detach();
-                    }
+                if self.buffer.read(cx).diff_for(buffer_id).is_none()
+                    && let Some(project) = &self.project
+                {
+                    update_uncommitted_diff_for_buffer(
+                        cx.entity(),
+                        project,
+                        [buffer.clone()],
+                        self.buffer.clone(),
+                        cx,
+                    )
+                    .detach();
                 }
                 self.update_lsp_data(false, Some(buffer_id), window, cx);
                 cx.emit(EditorEvent::ExcerptsAdded {
@@ -20746,11 +20726,11 @@ impl Editor {
             let mut chunk_lines = chunk.text.split('\n').peekable();
             while let Some(text) = chunk_lines.next() {
                 let mut merged_with_last_token = false;
-                if let Some(last_token) = line.back_mut() {
-                    if last_token.highlight == highlight {
-                        last_token.text.push_str(text);
-                        merged_with_last_token = true;
-                    }
+                if let Some(last_token) = line.back_mut()
+                    && last_token.highlight == highlight
+                {
+                    last_token.text.push_str(text);
+                    merged_with_last_token = true;
                 }
 
                 if !merged_with_last_token {
@@ -21209,39 +21189,37 @@ impl Editor {
         {
             let buffer_snapshot = OnceCell::new();
 
-            if let Some(folds) = DB.get_editor_folds(item_id, workspace_id).log_err() {
-                if !folds.is_empty() {
-                    let snapshot =
-                        buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
-                    self.fold_ranges(
-                        folds
-                            .into_iter()
-                            .map(|(start, end)| {
-                                snapshot.clip_offset(start, Bias::Left)
-                                    ..snapshot.clip_offset(end, Bias::Right)
-                            })
-                            .collect(),
-                        false,
-                        window,
-                        cx,
-                    );
-                }
-            }
-
-            if let Some(selections) = DB.get_editor_selections(item_id, workspace_id).log_err() {
-                if !selections.is_empty() {
-                    let snapshot =
-                        buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
-                    // skip adding the initial selection to selection history
-                    self.selection_history.mode = SelectionHistoryMode::Skipping;
-                    self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        s.select_ranges(selections.into_iter().map(|(start, end)| {
+            if let Some(folds) = DB.get_editor_folds(item_id, workspace_id).log_err()
+                && !folds.is_empty()
+            {
+                let snapshot = buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
+                self.fold_ranges(
+                    folds
+                        .into_iter()
+                        .map(|(start, end)| {
                             snapshot.clip_offset(start, Bias::Left)
                                 ..snapshot.clip_offset(end, Bias::Right)
-                        }));
-                    });
-                    self.selection_history.mode = SelectionHistoryMode::Normal;
-                }
+                        })
+                        .collect(),
+                    false,
+                    window,
+                    cx,
+                );
+            }
+
+            if let Some(selections) = DB.get_editor_selections(item_id, workspace_id).log_err()
+                && !selections.is_empty()
+            {
+                let snapshot = buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
+                // skip adding the initial selection to selection history
+                self.selection_history.mode = SelectionHistoryMode::Skipping;
+                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+                    s.select_ranges(selections.into_iter().map(|(start, end)| {
+                        snapshot.clip_offset(start, Bias::Left)
+                            ..snapshot.clip_offset(end, Bias::Right)
+                    }));
+                });
+                self.selection_history.mode = SelectionHistoryMode::Normal;
             };
         }
 
@@ -21283,17 +21261,15 @@ fn process_completion_for_edit(
         let mut snippet_source = completion.new_text.clone();
         let mut previous_point = text::ToPoint::to_point(cursor_position, buffer);
         previous_point.column = previous_point.column.saturating_sub(1);
-        if let Some(scope) = buffer_snapshot.language_scope_at(previous_point) {
-            if scope.prefers_label_for_snippet_in_completion() {
-                if let Some(label) = completion.label() {
-                    if matches!(
-                        completion.kind(),
-                        Some(CompletionItemKind::FUNCTION) | Some(CompletionItemKind::METHOD)
-                    ) {
-                        snippet_source = label;
-                    }
-                }
-            }
+        if let Some(scope) = buffer_snapshot.language_scope_at(previous_point)
+            && scope.prefers_label_for_snippet_in_completion()
+            && let Some(label) = completion.label()
+            && matches!(
+                completion.kind(),
+                Some(CompletionItemKind::FUNCTION) | Some(CompletionItemKind::METHOD)
+            )
+        {
+            snippet_source = label;
         }
         match Snippet::parse(&snippet_source).log_err() {
             Some(parsed_snippet) => (Some(parsed_snippet.clone()), parsed_snippet.text),
@@ -21347,10 +21323,10 @@ fn process_completion_for_edit(
                             );
                             let mut current_needle = text_to_replace.next();
                             for haystack_ch in completion.label.text.chars() {
-                                if let Some(needle_ch) = current_needle {
-                                    if haystack_ch.eq_ignore_ascii_case(&needle_ch) {
-                                        current_needle = text_to_replace.next();
-                                    }
+                                if let Some(needle_ch) = current_needle
+                                    && haystack_ch.eq_ignore_ascii_case(&needle_ch)
+                                {
+                                    current_needle = text_to_replace.next();
                                 }
                             }
                             current_needle.is_none()
@@ -21604,11 +21580,11 @@ impl<'a> Iterator for WordBreakingTokenizer<'a> {
             offset += first_grapheme.len();
             grapheme_len += 1;
             if is_grapheme_ideographic(first_grapheme) && !is_whitespace {
-                if let Some(grapheme) = iter.peek().copied() {
-                    if should_stay_with_preceding_ideograph(grapheme) {
-                        offset += grapheme.len();
-                        grapheme_len += 1;
-                    }
+                if let Some(grapheme) = iter.peek().copied()
+                    && should_stay_with_preceding_ideograph(grapheme)
+                {
+                    offset += grapheme.len();
+                    grapheme_len += 1;
                 }
             } else {
                 let mut words = self.input[offset..].split_word_bound_indices().peekable();
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 927a207358..915a3cdc38 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -917,6 +917,10 @@ impl EditorElement {
         } else if cfg!(any(target_os = "linux", target_os = "freebsd"))
             && event.button == MouseButton::Middle
         {
+            #[allow(
+                clippy::collapsible_if,
+                reason = "The cfg-block below makes this a false positive"
+            )]
             if !text_hitbox.is_hovered(window) || editor.read_only(cx) {
                 return;
             }
@@ -1387,29 +1391,27 @@ impl EditorElement {
                     ref drop_cursor,
                     ref hide_drop_cursor,
                 } = editor.selection_drag_state
+                    && !hide_drop_cursor
+                    && (drop_cursor
+                        .start
+                        .cmp(&selection.start, &snapshot.buffer_snapshot)
+                        .eq(&Ordering::Less)
+                        || drop_cursor
+                            .end
+                            .cmp(&selection.end, &snapshot.buffer_snapshot)
+                            .eq(&Ordering::Greater))
                 {
-                    if !hide_drop_cursor
-                        && (drop_cursor
-                            .start
-                            .cmp(&selection.start, &snapshot.buffer_snapshot)
-                            .eq(&Ordering::Less)
-                            || drop_cursor
-                                .end
-                                .cmp(&selection.end, &snapshot.buffer_snapshot)
-                                .eq(&Ordering::Greater))
-                    {
-                        let drag_cursor_layout = SelectionLayout::new(
-                            drop_cursor.clone(),
-                            false,
-                            CursorShape::Bar,
-                            &snapshot.display_snapshot,
-                            false,
-                            false,
-                            None,
-                        );
-                        let absent_color = cx.theme().players().absent();
-                        selections.push((absent_color, vec![drag_cursor_layout]));
-                    }
+                    let drag_cursor_layout = SelectionLayout::new(
+                        drop_cursor.clone(),
+                        false,
+                        CursorShape::Bar,
+                        &snapshot.display_snapshot,
+                        false,
+                        false,
+                        None,
+                    );
+                    let absent_color = cx.theme().players().absent();
+                    selections.push((absent_color, vec![drag_cursor_layout]));
                 }
             }
 
@@ -1420,19 +1422,15 @@ impl EditorElement {
                         CollaboratorId::PeerId(peer_id) => {
                             if let Some(collaborator) =
                                 collaboration_hub.collaborators(cx).get(&peer_id)
-                            {
-                                if let Some(participant_index) = collaboration_hub
+                                && let Some(participant_index) = collaboration_hub
                                     .user_participant_indices(cx)
                                     .get(&collaborator.user_id)
-                                {
-                                    if let Some((local_selection_style, _)) = selections.first_mut()
-                                    {
-                                        *local_selection_style = cx
-                                            .theme()
-                                            .players()
-                                            .color_for_participant(participant_index.0);
-                                    }
-                                }
+                                && let Some((local_selection_style, _)) = selections.first_mut()
+                            {
+                                *local_selection_style = cx
+                                    .theme()
+                                    .players()
+                                    .color_for_participant(participant_index.0);
                             }
                         }
                         CollaboratorId::Agent => {
@@ -3518,33 +3516,33 @@ impl EditorElement {
         let mut x_offset = px(0.);
         let mut is_block = true;
 
-        if let BlockId::Custom(custom_block_id) = block_id {
-            if block.has_height() {
-                if block.place_near() {
-                    if let Some((x_target, line_width)) = x_position {
-                        let margin = em_width * 2;
-                        if line_width + final_size.width + margin
-                            < editor_width + editor_margins.gutter.full_width()
-                            && !row_block_types.contains_key(&(row - 1))
-                            && element_height_in_lines == 1
-                        {
-                            x_offset = line_width + margin;
-                            row = row - 1;
-                            is_block = false;
-                            element_height_in_lines = 0;
-                            row_block_types.insert(row, is_block);
-                        } else {
-                            let max_offset = editor_width + editor_margins.gutter.full_width()
-                                - final_size.width;
-                            let min_offset = (x_target + em_width - final_size.width)
-                                .max(editor_margins.gutter.full_width());
-                            x_offset = x_target.min(max_offset).max(min_offset);
-                        }
-                    }
-                };
-                if element_height_in_lines != block.height() {
-                    resized_blocks.insert(custom_block_id, element_height_in_lines);
+        if let BlockId::Custom(custom_block_id) = block_id
+            && block.has_height()
+        {
+            if block.place_near()
+                && let Some((x_target, line_width)) = x_position
+            {
+                let margin = em_width * 2;
+                if line_width + final_size.width + margin
+                    < editor_width + editor_margins.gutter.full_width()
+                    && !row_block_types.contains_key(&(row - 1))
+                    && element_height_in_lines == 1
+                {
+                    x_offset = line_width + margin;
+                    row = row - 1;
+                    is_block = false;
+                    element_height_in_lines = 0;
+                    row_block_types.insert(row, is_block);
+                } else {
+                    let max_offset =
+                        editor_width + editor_margins.gutter.full_width() - final_size.width;
+                    let min_offset = (x_target + em_width - final_size.width)
+                        .max(editor_margins.gutter.full_width());
+                    x_offset = x_target.min(max_offset).max(min_offset);
                 }
+            };
+            if element_height_in_lines != block.height() {
+                resized_blocks.insert(custom_block_id, element_height_in_lines);
             }
         }
         for i in 0..element_height_in_lines {
@@ -3987,60 +3985,58 @@ impl EditorElement {
             }
         }
 
-        if let Some(focused_block) = focused_block {
-            if let Some(focus_handle) = focused_block.focus_handle.upgrade() {
-                if focus_handle.is_focused(window) {
-                    if let Some(block) = snapshot.block_for_id(focused_block.id) {
-                        let style = block.style();
-                        let width = match style {
-                            BlockStyle::Fixed => AvailableSpace::MinContent,
-                            BlockStyle::Flex => AvailableSpace::Definite(
-                                hitbox
-                                    .size
-                                    .width
-                                    .max(fixed_block_max_width)
-                                    .max(editor_margins.gutter.width + *scroll_width),
-                            ),
-                            BlockStyle::Sticky => AvailableSpace::Definite(hitbox.size.width),
-                        };
+        if let Some(focused_block) = focused_block
+            && let Some(focus_handle) = focused_block.focus_handle.upgrade()
+            && focus_handle.is_focused(window)
+            && let Some(block) = snapshot.block_for_id(focused_block.id)
+        {
+            let style = block.style();
+            let width = match style {
+                BlockStyle::Fixed => AvailableSpace::MinContent,
+                BlockStyle::Flex => AvailableSpace::Definite(
+                    hitbox
+                        .size
+                        .width
+                        .max(fixed_block_max_width)
+                        .max(editor_margins.gutter.width + *scroll_width),
+                ),
+                BlockStyle::Sticky => AvailableSpace::Definite(hitbox.size.width),
+            };
 
-                        if let Some((element, element_size, _, x_offset)) = self.render_block(
-                            &block,
-                            width,
-                            focused_block.id,
-                            rows.end,
-                            snapshot,
-                            text_x,
-                            &rows,
-                            line_layouts,
-                            editor_margins,
-                            line_height,
-                            em_width,
-                            text_hitbox,
-                            editor_width,
-                            scroll_width,
-                            &mut resized_blocks,
-                            &mut row_block_types,
-                            selections,
-                            selected_buffer_ids,
-                            is_row_soft_wrapped,
-                            sticky_header_excerpt_id,
-                            window,
-                            cx,
-                        ) {
-                            blocks.push(BlockLayout {
-                                id: block.id(),
-                                x_offset,
-                                row: None,
-                                element,
-                                available_space: size(width, element_size.height.into()),
-                                style,
-                                overlaps_gutter: true,
-                                is_buffer_header: block.is_buffer_header(),
-                            });
-                        }
-                    }
-                }
+            if let Some((element, element_size, _, x_offset)) = self.render_block(
+                &block,
+                width,
+                focused_block.id,
+                rows.end,
+                snapshot,
+                text_x,
+                &rows,
+                line_layouts,
+                editor_margins,
+                line_height,
+                em_width,
+                text_hitbox,
+                editor_width,
+                scroll_width,
+                &mut resized_blocks,
+                &mut row_block_types,
+                selections,
+                selected_buffer_ids,
+                is_row_soft_wrapped,
+                sticky_header_excerpt_id,
+                window,
+                cx,
+            ) {
+                blocks.push(BlockLayout {
+                    id: block.id(),
+                    x_offset,
+                    row: None,
+                    element,
+                    available_space: size(width, element_size.height.into()),
+                    style,
+                    overlaps_gutter: true,
+                    is_buffer_header: block.is_buffer_header(),
+                });
             }
         }
 
@@ -4203,19 +4199,19 @@ impl EditorElement {
                 edit_prediction_popover_visible = true;
             }
 
-            if editor.context_menu_visible() {
-                if let Some(crate::ContextMenuOrigin::Cursor) = editor.context_menu_origin() {
-                    let (min_height_in_lines, max_height_in_lines) = editor
-                        .context_menu_options
-                        .as_ref()
-                        .map_or((3, 12), |options| {
-                            (options.min_entries_visible, options.max_entries_visible)
-                        });
+            if editor.context_menu_visible()
+                && let Some(crate::ContextMenuOrigin::Cursor) = editor.context_menu_origin()
+            {
+                let (min_height_in_lines, max_height_in_lines) = editor
+                    .context_menu_options
+                    .as_ref()
+                    .map_or((3, 12), |options| {
+                        (options.min_entries_visible, options.max_entries_visible)
+                    });
 
-                    min_menu_height += line_height * min_height_in_lines as f32 + POPOVER_Y_PADDING;
-                    max_menu_height += line_height * max_height_in_lines as f32 + POPOVER_Y_PADDING;
-                    context_menu_visible = true;
-                }
+                min_menu_height += line_height * min_height_in_lines as f32 + POPOVER_Y_PADDING;
+                max_menu_height += line_height * max_height_in_lines as f32 + POPOVER_Y_PADDING;
+                context_menu_visible = true;
             }
             context_menu_placement = editor
                 .context_menu_options
@@ -5761,16 +5757,15 @@ impl EditorElement {
         cx: &mut App,
     ) {
         for (_, hunk_hitbox) in &layout.display_hunks {
-            if let Some(hunk_hitbox) = hunk_hitbox {
-                if !self
+            if let Some(hunk_hitbox) = hunk_hitbox
+                && !self
                     .editor
                     .read(cx)
                     .buffer()
                     .read(cx)
                     .all_diff_hunks_expanded()
-                {
-                    window.set_cursor_style(CursorStyle::PointingHand, hunk_hitbox);
-                }
+            {
+                window.set_cursor_style(CursorStyle::PointingHand, hunk_hitbox);
             }
         }
 
@@ -10152,10 +10147,10 @@ fn compute_auto_height_layout(
     let overscroll = size(em_width, px(0.));
 
     let editor_width = text_width - gutter_dimensions.margin - overscroll.width - em_width;
-    if !matches!(editor.soft_wrap_mode(cx), SoftWrap::None) {
-        if editor.set_wrap_width(Some(editor_width), cx) {
-            snapshot = editor.snapshot(window, cx);
-        }
+    if !matches!(editor.soft_wrap_mode(cx), SoftWrap::None)
+        && editor.set_wrap_width(Some(editor_width), cx)
+    {
+        snapshot = editor.snapshot(window, cx);
     }
 
     let scroll_height = (snapshot.max_point().row().next_row().0 as f32) * line_height;
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index fc350a5a15..712325f339 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -312,10 +312,10 @@ impl GitBlame {
                 .as_ref()
                 .and_then(|entry| entry.author.as_ref())
                 .map(|author| author.len());
-            if let Some(author_len) = author_len {
-                if author_len > max_author_length {
-                    max_author_length = author_len;
-                }
+            if let Some(author_len) = author_len
+                && author_len > max_author_length
+            {
+                max_author_length = author_len;
             }
         }
 
@@ -416,20 +416,19 @@ impl GitBlame {
             if row_edits
                 .peek()
                 .map_or(true, |next_edit| next_edit.old.start >= old_end)
+                && let Some(entry) = cursor.item()
             {
-                if let Some(entry) = cursor.item() {
-                    if old_end > edit.old.end {
-                        new_entries.push(
-                            GitBlameEntry {
-                                rows: cursor.end() - edit.old.end,
-                                blame: entry.blame.clone(),
-                            },
-                            &(),
-                        );
-                    }
-
-                    cursor.next();
+                if old_end > edit.old.end {
+                    new_entries.push(
+                        GitBlameEntry {
+                            rows: cursor.end() - edit.old.end,
+                            blame: entry.blame.clone(),
+                        },
+                        &(),
+                    );
                 }
+
+                cursor.next();
             }
         }
         new_entries.append(cursor.suffix(), &());
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 8b6e2cea84..b431834d35 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -418,24 +418,22 @@ pub fn update_inlay_link_and_hover_points(
                                     }
                                     if let Some((language_server_id, location)) =
                                         hovered_hint_part.location
+                                        && secondary_held
+                                        && !editor.has_pending_nonempty_selection()
                                     {
-                                        if secondary_held
-                                            && !editor.has_pending_nonempty_selection()
-                                        {
-                                            go_to_definition_updated = true;
-                                            show_link_definition(
-                                                shift_held,
-                                                editor,
-                                                TriggerPoint::InlayHint(
-                                                    highlight,
-                                                    location,
-                                                    language_server_id,
-                                                ),
-                                                snapshot,
-                                                window,
-                                                cx,
-                                            );
-                                        }
+                                        go_to_definition_updated = true;
+                                        show_link_definition(
+                                            shift_held,
+                                            editor,
+                                            TriggerPoint::InlayHint(
+                                                highlight,
+                                                location,
+                                                language_server_id,
+                                            ),
+                                            snapshot,
+                                            window,
+                                            cx,
+                                        );
                                     }
                                 }
                             }
@@ -766,10 +764,11 @@ pub(crate) fn find_url_from_range(
     let mut finder = LinkFinder::new();
     finder.kinds(&[LinkKind::Url]);
 
-    if let Some(link) = finder.links(&text).next() {
-        if link.start() == 0 && link.end() == text.len() {
-            return Some(link.as_str().to_string());
-        }
+    if let Some(link) = finder.links(&text).next()
+        && link.start() == 0
+        && link.end() == text.len()
+    {
+        return Some(link.as_str().to_string());
     }
 
     None
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 6fe981fd6e..a8cdfa99df 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -142,11 +142,11 @@ pub fn hover_at_inlay(
             .info_popovers
             .iter()
             .any(|InfoPopover { symbol_range, .. }| {
-                if let RangeInEditor::Inlay(range) = symbol_range {
-                    if range == &inlay_hover.range {
-                        // Hover triggered from same location as last time. Don't show again.
-                        return true;
-                    }
+                if let RangeInEditor::Inlay(range) = symbol_range
+                    && range == &inlay_hover.range
+                {
+                    // Hover triggered from same location as last time. Don't show again.
+                    return true;
                 }
                 false
             })
@@ -270,13 +270,12 @@ fn show_hover(
     }
 
     // Don't request again if the location is the same as the previous request
-    if let Some(triggered_from) = &editor.hover_state.triggered_from {
-        if triggered_from
+    if let Some(triggered_from) = &editor.hover_state.triggered_from
+        && triggered_from
             .cmp(&anchor, &snapshot.buffer_snapshot)
             .is_eq()
-        {
-            return None;
-        }
+    {
+        return None;
     }
 
     let hover_popover_delay = EditorSettings::get_global(cx).hover_popover_delay;
@@ -717,59 +716,54 @@ pub fn diagnostics_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 }
 
 pub fn open_markdown_url(link: SharedString, window: &mut Window, cx: &mut App) {
-    if let Ok(uri) = Url::parse(&link) {
-        if uri.scheme() == "file" {
-            if let Some(workspace) = window.root::<Workspace>().flatten() {
-                workspace.update(cx, |workspace, cx| {
-                    let task = workspace.open_abs_path(
-                        PathBuf::from(uri.path()),
-                        OpenOptions {
-                            visible: Some(OpenVisible::None),
-                            ..Default::default()
-                        },
-                        window,
-                        cx,
-                    );
+    if let Ok(uri) = Url::parse(&link)
+        && uri.scheme() == "file"
+        && let Some(workspace) = window.root::<Workspace>().flatten()
+    {
+        workspace.update(cx, |workspace, cx| {
+            let task = workspace.open_abs_path(
+                PathBuf::from(uri.path()),
+                OpenOptions {
+                    visible: Some(OpenVisible::None),
+                    ..Default::default()
+                },
+                window,
+                cx,
+            );
 
-                    cx.spawn_in(window, async move |_, cx| {
-                        let item = task.await?;
-                        // Ruby LSP uses URLs with #L1,1-4,4
-                        // we'll just take the first number and assume it's a line number
-                        let Some(fragment) = uri.fragment() else {
-                            return anyhow::Ok(());
-                        };
-                        let mut accum = 0u32;
-                        for c in fragment.chars() {
-                            if c >= '0' && c <= '9' && accum < u32::MAX / 2 {
-                                accum *= 10;
-                                accum += c as u32 - '0' as u32;
-                            } else if accum > 0 {
-                                break;
-                            }
-                        }
-                        if accum == 0 {
-                            return Ok(());
-                        }
-                        let Some(editor) = cx.update(|_, cx| item.act_as::<Editor>(cx))? else {
-                            return Ok(());
-                        };
-                        editor.update_in(cx, |editor, window, cx| {
-                            editor.change_selections(
-                                Default::default(),
-                                window,
-                                cx,
-                                |selections| {
-                                    selections.select_ranges([text::Point::new(accum - 1, 0)
-                                        ..text::Point::new(accum - 1, 0)]);
-                                },
-                            );
-                        })
-                    })
-                    .detach_and_log_err(cx);
-                });
-                return;
-            }
-        }
+            cx.spawn_in(window, async move |_, cx| {
+                let item = task.await?;
+                // Ruby LSP uses URLs with #L1,1-4,4
+                // we'll just take the first number and assume it's a line number
+                let Some(fragment) = uri.fragment() else {
+                    return anyhow::Ok(());
+                };
+                let mut accum = 0u32;
+                for c in fragment.chars() {
+                    if c >= '0' && c <= '9' && accum < u32::MAX / 2 {
+                        accum *= 10;
+                        accum += c as u32 - '0' as u32;
+                    } else if accum > 0 {
+                        break;
+                    }
+                }
+                if accum == 0 {
+                    return Ok(());
+                }
+                let Some(editor) = cx.update(|_, cx| item.act_as::<Editor>(cx))? else {
+                    return Ok(());
+                };
+                editor.update_in(cx, |editor, window, cx| {
+                    editor.change_selections(Default::default(), window, cx, |selections| {
+                        selections.select_ranges([
+                            text::Point::new(accum - 1, 0)..text::Point::new(accum - 1, 0)
+                        ]);
+                    });
+                })
+            })
+            .detach_and_log_err(cx);
+        });
+        return;
     }
     cx.open_url(&link);
 }
@@ -839,21 +833,20 @@ impl HoverState {
     pub fn focused(&self, window: &mut Window, cx: &mut Context<Editor>) -> bool {
         let mut hover_popover_is_focused = false;
         for info_popover in &self.info_popovers {
-            if let Some(markdown_view) = &info_popover.parsed_content {
-                if markdown_view.focus_handle(cx).is_focused(window) {
-                    hover_popover_is_focused = true;
-                }
-            }
-        }
-        if let Some(diagnostic_popover) = &self.diagnostic_popover {
-            if diagnostic_popover
-                .markdown
-                .focus_handle(cx)
-                .is_focused(window)
+            if let Some(markdown_view) = &info_popover.parsed_content
+                && markdown_view.focus_handle(cx).is_focused(window)
             {
                 hover_popover_is_focused = true;
             }
         }
+        if let Some(diagnostic_popover) = &self.diagnostic_popover
+            && diagnostic_popover
+                .markdown
+                .focus_handle(cx)
+                .is_focused(window)
+        {
+            hover_popover_is_focused = true;
+        }
         hover_popover_is_focused
     }
 }
diff --git a/crates/editor/src/indent_guides.rs b/crates/editor/src/indent_guides.rs
index f6d51c929a..a1de2b604b 100644
--- a/crates/editor/src/indent_guides.rs
+++ b/crates/editor/src/indent_guides.rs
@@ -168,11 +168,11 @@ pub fn indent_guides_in_range(
     while let Some(fold) = folds.next() {
         let start = fold.range.start.to_point(&snapshot.buffer_snapshot);
         let end = fold.range.end.to_point(&snapshot.buffer_snapshot);
-        if let Some(last_range) = fold_ranges.last_mut() {
-            if last_range.end >= start {
-                last_range.end = last_range.end.max(end);
-                continue;
-            }
+        if let Some(last_range) = fold_ranges.last_mut()
+            && last_range.end >= start
+        {
+            last_range.end = last_range.end.max(end);
+            continue;
         }
         fold_ranges.push(start..end);
     }
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index 60ad0e5bf6..cea0e32d7f 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -498,16 +498,14 @@ impl InlayHintCache {
                                 cmp::Ordering::Less | cmp::Ordering::Equal => {
                                     if !old_kinds.contains(&cached_hint.kind)
                                         && new_kinds.contains(&cached_hint.kind)
-                                    {
-                                        if let Some(anchor) = multi_buffer_snapshot
+                                        && let Some(anchor) = multi_buffer_snapshot
                                             .anchor_in_excerpt(*excerpt_id, cached_hint.position)
-                                        {
-                                            to_insert.push(Inlay::hint(
-                                                cached_hint_id.id(),
-                                                anchor,
-                                                cached_hint,
-                                            ));
-                                        }
+                                    {
+                                        to_insert.push(Inlay::hint(
+                                            cached_hint_id.id(),
+                                            anchor,
+                                            cached_hint,
+                                        ));
                                     }
                                     excerpt_cache.next();
                                 }
@@ -522,16 +520,16 @@ impl InlayHintCache {
             for cached_hint_id in excerpt_cache {
                 let maybe_missed_cached_hint = &excerpt_cached_hints.hints_by_id[cached_hint_id];
                 let cached_hint_kind = maybe_missed_cached_hint.kind;
-                if !old_kinds.contains(&cached_hint_kind) && new_kinds.contains(&cached_hint_kind) {
-                    if let Some(anchor) = multi_buffer_snapshot
+                if !old_kinds.contains(&cached_hint_kind)
+                    && new_kinds.contains(&cached_hint_kind)
+                    && let Some(anchor) = multi_buffer_snapshot
                         .anchor_in_excerpt(*excerpt_id, maybe_missed_cached_hint.position)
-                    {
-                        to_insert.push(Inlay::hint(
-                            cached_hint_id.id(),
-                            anchor,
-                            maybe_missed_cached_hint,
-                        ));
-                    }
+                {
+                    to_insert.push(Inlay::hint(
+                        cached_hint_id.id(),
+                        anchor,
+                        maybe_missed_cached_hint,
+                    ));
                 }
             }
         }
@@ -620,44 +618,44 @@ impl InlayHintCache {
     ) {
         if let Some(excerpt_hints) = self.hints.get(&excerpt_id) {
             let mut guard = excerpt_hints.write();
-            if let Some(cached_hint) = guard.hints_by_id.get_mut(&id) {
-                if let ResolveState::CanResolve(server_id, _) = &cached_hint.resolve_state {
-                    let hint_to_resolve = cached_hint.clone();
-                    let server_id = *server_id;
-                    cached_hint.resolve_state = ResolveState::Resolving;
-                    drop(guard);
-                    cx.spawn_in(window, async move |editor, cx| {
-                        let resolved_hint_task = editor.update(cx, |editor, cx| {
-                            let buffer = editor.buffer().read(cx).buffer(buffer_id)?;
-                            editor.semantics_provider.as_ref()?.resolve_inlay_hint(
-                                hint_to_resolve,
-                                buffer,
-                                server_id,
-                                cx,
-                            )
-                        })?;
-                        if let Some(resolved_hint_task) = resolved_hint_task {
-                            let mut resolved_hint =
-                                resolved_hint_task.await.context("hint resolve task")?;
-                            editor.read_with(cx, |editor, _| {
-                                if let Some(excerpt_hints) =
-                                    editor.inlay_hint_cache.hints.get(&excerpt_id)
+            if let Some(cached_hint) = guard.hints_by_id.get_mut(&id)
+                && let ResolveState::CanResolve(server_id, _) = &cached_hint.resolve_state
+            {
+                let hint_to_resolve = cached_hint.clone();
+                let server_id = *server_id;
+                cached_hint.resolve_state = ResolveState::Resolving;
+                drop(guard);
+                cx.spawn_in(window, async move |editor, cx| {
+                    let resolved_hint_task = editor.update(cx, |editor, cx| {
+                        let buffer = editor.buffer().read(cx).buffer(buffer_id)?;
+                        editor.semantics_provider.as_ref()?.resolve_inlay_hint(
+                            hint_to_resolve,
+                            buffer,
+                            server_id,
+                            cx,
+                        )
+                    })?;
+                    if let Some(resolved_hint_task) = resolved_hint_task {
+                        let mut resolved_hint =
+                            resolved_hint_task.await.context("hint resolve task")?;
+                        editor.read_with(cx, |editor, _| {
+                            if let Some(excerpt_hints) =
+                                editor.inlay_hint_cache.hints.get(&excerpt_id)
+                            {
+                                let mut guard = excerpt_hints.write();
+                                if let Some(cached_hint) = guard.hints_by_id.get_mut(&id)
+                                    && cached_hint.resolve_state == ResolveState::Resolving
                                 {
-                                    let mut guard = excerpt_hints.write();
-                                    if let Some(cached_hint) = guard.hints_by_id.get_mut(&id) {
-                                        if cached_hint.resolve_state == ResolveState::Resolving {
-                                            resolved_hint.resolve_state = ResolveState::Resolved;
-                                            *cached_hint = resolved_hint;
-                                        }
-                                    }
+                                    resolved_hint.resolve_state = ResolveState::Resolved;
+                                    *cached_hint = resolved_hint;
                                 }
-                            })?;
-                        }
+                            }
+                        })?;
+                    }
 
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
-                }
+                    anyhow::Ok(())
+                })
+                .detach_and_log_err(cx);
             }
         }
     }
@@ -990,8 +988,8 @@ fn fetch_and_update_hints(
 
                 let buffer = editor.buffer().read(cx).buffer(query.buffer_id)?;
 
-                if !editor.registered_buffers.contains_key(&query.buffer_id) {
-                    if let Some(project) = editor.project.as_ref() {
+                if !editor.registered_buffers.contains_key(&query.buffer_id)
+                    && let Some(project) = editor.project.as_ref() {
                         project.update(cx, |project, cx| {
                             editor.registered_buffers.insert(
                                 query.buffer_id,
@@ -999,7 +997,6 @@ fn fetch_and_update_hints(
                             );
                         })
                     }
-                }
 
                 editor
                     .semantics_provider
@@ -1240,14 +1237,12 @@ fn apply_hint_update(
             .inlay_hint_cache
             .allowed_hint_kinds
             .contains(&new_hint.kind)
-        {
-            if let Some(new_hint_position) =
+            && let Some(new_hint_position) =
                 multi_buffer_snapshot.anchor_in_excerpt(query.excerpt_id, new_hint.position)
-            {
-                splice
-                    .to_insert
-                    .push(Inlay::hint(new_inlay_id, new_hint_position, &new_hint));
-            }
+        {
+            splice
+                .to_insert
+                .push(Inlay::hint(new_inlay_id, new_hint_position, &new_hint));
         }
         let new_id = InlayId::Hint(new_inlay_id);
         cached_excerpt_hints.hints_by_id.insert(new_id, new_hint);
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 22430ab5e1..136b0b314d 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -930,10 +930,10 @@ impl Item for Editor {
             })?;
             buffer
                 .update(cx, |buffer, cx| {
-                    if let Some(transaction) = transaction {
-                        if !buffer.is_singleton() {
-                            buffer.push_transaction(&transaction.0, cx);
-                        }
+                    if let Some(transaction) = transaction
+                        && !buffer.is_singleton()
+                    {
+                        buffer.push_transaction(&transaction.0, cx);
                     }
                 })
                 .ok();
@@ -1374,36 +1374,33 @@ impl ProjectItem for Editor {
         let mut editor = Self::for_buffer(buffer.clone(), Some(project), window, cx);
         if let Some((excerpt_id, buffer_id, snapshot)) =
             editor.buffer().read(cx).snapshot(cx).as_singleton()
+            && WorkspaceSettings::get(None, cx).restore_on_file_reopen
+            && let Some(restoration_data) = Self::project_item_kind()
+                .and_then(|kind| pane.as_ref()?.project_item_restoration_data.get(&kind))
+                .and_then(|data| data.downcast_ref::<EditorRestorationData>())
+                .and_then(|data| {
+                    let file = project::File::from_dyn(buffer.read(cx).file())?;
+                    data.entries.get(&file.abs_path(cx))
+                })
         {
-            if WorkspaceSettings::get(None, cx).restore_on_file_reopen {
-                if let Some(restoration_data) = Self::project_item_kind()
-                    .and_then(|kind| pane.as_ref()?.project_item_restoration_data.get(&kind))
-                    .and_then(|data| data.downcast_ref::<EditorRestorationData>())
-                    .and_then(|data| {
-                        let file = project::File::from_dyn(buffer.read(cx).file())?;
-                        data.entries.get(&file.abs_path(cx))
-                    })
-                {
-                    editor.fold_ranges(
-                        clip_ranges(&restoration_data.folds, snapshot),
-                        false,
-                        window,
-                        cx,
-                    );
-                    if !restoration_data.selections.is_empty() {
-                        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.select_ranges(clip_ranges(&restoration_data.selections, snapshot));
-                        });
-                    }
-                    let (top_row, offset) = restoration_data.scroll_position;
-                    let anchor = Anchor::in_buffer(
-                        *excerpt_id,
-                        buffer_id,
-                        snapshot.anchor_before(Point::new(top_row, 0)),
-                    );
-                    editor.set_scroll_anchor(ScrollAnchor { anchor, offset }, window, cx);
-                }
+            editor.fold_ranges(
+                clip_ranges(&restoration_data.folds, snapshot),
+                false,
+                window,
+                cx,
+            );
+            if !restoration_data.selections.is_empty() {
+                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+                    s.select_ranges(clip_ranges(&restoration_data.selections, snapshot));
+                });
             }
+            let (top_row, offset) = restoration_data.scroll_position;
+            let anchor = Anchor::in_buffer(
+                *excerpt_id,
+                buffer_id,
+                snapshot.anchor_before(Point::new(top_row, 0)),
+            );
+            editor.set_scroll_anchor(ScrollAnchor { anchor, offset }, window, cx);
         }
 
         editor
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
index f358ab7b93..cae4b565b4 100644
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -51,12 +51,11 @@ pub(crate) fn should_auto_close(
             continue;
         };
         let mut jsx_open_tag_node = node;
-        if node.grammar_name() != config.open_tag_node_name {
-            if let Some(parent) = node.parent() {
-                if parent.grammar_name() == config.open_tag_node_name {
-                    jsx_open_tag_node = parent;
-                }
-            }
+        if node.grammar_name() != config.open_tag_node_name
+            && let Some(parent) = node.parent()
+            && parent.grammar_name() == config.open_tag_node_name
+        {
+            jsx_open_tag_node = parent;
         }
         if jsx_open_tag_node.grammar_name() != config.open_tag_node_name {
             continue;
@@ -284,10 +283,8 @@ pub(crate) fn generate_auto_close_edits(
                         unclosed_open_tag_count -= 1;
                     }
                 } else if has_erroneous_close_tag && kind == erroneous_close_tag_node_name {
-                    if tag_node_name_equals(&node, &tag_name) {
-                        if !is_after_open_tag(&node) {
-                            unclosed_open_tag_count -= 1;
-                        }
+                    if tag_node_name_equals(&node, &tag_name) && !is_after_open_tag(&node) {
+                        unclosed_open_tag_count -= 1;
                     }
                 } else if kind == config.jsx_element_node_name {
                     // perf: filter only open,close,element,erroneous nodes
diff --git a/crates/editor/src/lsp_ext.rs b/crates/editor/src/lsp_ext.rs
index d02fc0f901..18ad2d71c8 100644
--- a/crates/editor/src/lsp_ext.rs
+++ b/crates/editor/src/lsp_ext.rs
@@ -147,16 +147,15 @@ pub fn lsp_tasks(
                             },
                             cx,
                         )
-                    }) {
-                        if let Some(new_runnables) = runnables_task.await.log_err() {
-                            new_lsp_tasks.extend(new_runnables.runnables.into_iter().filter_map(
-                                |(location, runnable)| {
-                                    let resolved_task =
-                                        runnable.resolve_task(&id_base, &lsp_buffer_context)?;
-                                    Some((location, resolved_task))
-                                },
-                            ));
-                        }
+                    }) && let Some(new_runnables) = runnables_task.await.log_err()
+                    {
+                        new_lsp_tasks.extend(new_runnables.runnables.into_iter().filter_map(
+                            |(location, runnable)| {
+                                let resolved_task =
+                                    runnable.resolve_task(&id_base, &lsp_buffer_context)?;
+                                Some((location, resolved_task))
+                            },
+                        ));
                     }
                     lsp_tasks
                         .entry(source_kind)
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 0bf875095b..7a008e3ba2 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -510,10 +510,10 @@ pub fn find_preceding_boundary_point(
         if find_range == FindRange::SingleLine && ch == '\n' {
             break;
         }
-        if let Some(prev_ch) = prev_ch {
-            if is_boundary(ch, prev_ch) {
-                break;
-            }
+        if let Some(prev_ch) = prev_ch
+            && is_boundary(ch, prev_ch)
+        {
+            break;
         }
 
         offset -= ch.len_utf8();
@@ -562,13 +562,13 @@ pub fn find_boundary_point(
         if find_range == FindRange::SingleLine && ch == '\n' {
             break;
         }
-        if let Some(prev_ch) = prev_ch {
-            if is_boundary(prev_ch, ch) {
-                if return_point_before_boundary {
-                    return map.clip_point(prev_offset.to_display_point(map), Bias::Right);
-                } else {
-                    break;
-                }
+        if let Some(prev_ch) = prev_ch
+            && is_boundary(prev_ch, ch)
+        {
+            if return_point_before_boundary {
+                return map.clip_point(prev_offset.to_display_point(map), Bias::Right);
+            } else {
+                break;
             }
         }
         prev_offset = offset;
@@ -603,13 +603,13 @@ pub fn find_preceding_boundary_trail(
     // Find the boundary
     let start_offset = offset;
     for ch in forward {
-        if let Some(prev_ch) = prev_ch {
-            if is_boundary(prev_ch, ch) {
-                if start_offset == offset {
-                    trail_offset = Some(offset);
-                } else {
-                    break;
-                }
+        if let Some(prev_ch) = prev_ch
+            && is_boundary(prev_ch, ch)
+        {
+            if start_offset == offset {
+                trail_offset = Some(offset);
+            } else {
+                break;
             }
         }
         offset -= ch.len_utf8();
@@ -651,13 +651,13 @@ pub fn find_boundary_trail(
     // Find the boundary
     let start_offset = offset;
     for ch in forward {
-        if let Some(prev_ch) = prev_ch {
-            if is_boundary(prev_ch, ch) {
-                if start_offset == offset {
-                    trail_offset = Some(offset);
-                } else {
-                    break;
-                }
+        if let Some(prev_ch) = prev_ch
+            && is_boundary(prev_ch, ch)
+        {
+            if start_offset == offset {
+                trail_offset = Some(offset);
+            } else {
+                break;
             }
         }
         offset += ch.len_utf8();
diff --git a/crates/editor/src/rust_analyzer_ext.rs b/crates/editor/src/rust_analyzer_ext.rs
index bee9464124..e3d83ab160 100644
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@@ -285,11 +285,11 @@ pub fn open_docs(editor: &mut Editor, _: &OpenDocs, window: &mut Window, cx: &mu
         workspace.update(cx, |_workspace, cx| {
             // Check if the local document exists, otherwise fallback to the online document.
             // Open with the default browser.
-            if let Some(local_url) = docs_urls.local {
-                if fs::metadata(Path::new(&local_url[8..])).is_ok() {
-                    cx.open_url(&local_url);
-                    return;
-                }
+            if let Some(local_url) = docs_urls.local
+                && fs::metadata(Path::new(&local_url[8..])).is_ok()
+            {
+                cx.open_url(&local_url);
+                return;
             }
 
             if let Some(web_url) = docs_urls.web {
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index 08ff23f8f7..b47f1cd711 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -703,20 +703,20 @@ impl Editor {
         if matches!(
             settings.defaults.soft_wrap,
             SoftWrap::PreferredLineLength | SoftWrap::Bounded
-        ) {
-            if (settings.defaults.preferred_line_length as f32) < visible_column_count {
-                visible_column_count = settings.defaults.preferred_line_length as f32;
-            }
+        ) && (settings.defaults.preferred_line_length as f32) < visible_column_count
+        {
+            visible_column_count = settings.defaults.preferred_line_length as f32;
         }
 
         // If the scroll position is currently at the left edge of the document
         // (x == 0.0) and the intent is to scroll right, the gutter's margin
         // should first be added to the current position, otherwise the cursor
         // will end at the column position minus the margin, which looks off.
-        if current_position.x == 0.0 && amount.columns(visible_column_count) > 0. {
-            if let Some(last_position_map) = &self.last_position_map {
-                current_position.x += self.gutter_dimensions.margin / last_position_map.em_advance;
-            }
+        if current_position.x == 0.0
+            && amount.columns(visible_column_count) > 0.
+            && let Some(last_position_map) = &self.last_position_map
+        {
+            current_position.x += self.gutter_dimensions.margin / last_position_map.em_advance;
         }
         let new_position = current_position
             + point(
@@ -749,12 +749,10 @@ impl Editor {
 
         if let (Some(visible_lines), Some(visible_columns)) =
             (self.visible_line_count(), self.visible_column_count())
+            && newest_head.row() <= DisplayRow(screen_top.row().0 + visible_lines as u32)
+            && newest_head.column() <= screen_top.column() + visible_columns as u32
         {
-            if newest_head.row() <= DisplayRow(screen_top.row().0 + visible_lines as u32)
-                && newest_head.column() <= screen_top.column() + visible_columns as u32
-            {
-                return Ordering::Equal;
-            }
+            return Ordering::Equal;
         }
 
         Ordering::Greater
diff --git a/crates/editor/src/scroll/autoscroll.rs b/crates/editor/src/scroll/autoscroll.rs
index 88d3b52d76..057d622903 100644
--- a/crates/editor/src/scroll/autoscroll.rs
+++ b/crates/editor/src/scroll/autoscroll.rs
@@ -116,12 +116,12 @@ impl Editor {
         let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
         let mut scroll_position = self.scroll_manager.scroll_position(&display_map);
         let original_y = scroll_position.y;
-        if let Some(last_bounds) = self.expect_bounds_change.take() {
-            if scroll_position.y != 0. {
-                scroll_position.y += (bounds.top() - last_bounds.top()) / line_height;
-                if scroll_position.y < 0. {
-                    scroll_position.y = 0.;
-                }
+        if let Some(last_bounds) = self.expect_bounds_change.take()
+            && scroll_position.y != 0.
+        {
+            scroll_position.y += (bounds.top() - last_bounds.top()) / line_height;
+            if scroll_position.y < 0. {
+                scroll_position.y = 0.;
             }
         }
         if scroll_position.y > max_scroll_top {
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index 819d6d9fed..d388e8f3b7 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -184,10 +184,10 @@ pub fn editor_content_with_blocks(editor: &Entity<Editor>, cx: &mut VisualTestCo
     for (row, block) in blocks {
         match block {
             Block::Custom(custom_block) => {
-                if let BlockPlacement::Near(x) = &custom_block.placement {
-                    if snapshot.intersects_fold(x.to_point(&snapshot.buffer_snapshot)) {
-                        continue;
-                    }
+                if let BlockPlacement::Near(x) = &custom_block.placement
+                    && snapshot.intersects_fold(x.to_point(&snapshot.buffer_snapshot))
+                {
+                    continue;
                 };
                 let content = block_content_for_tests(editor, custom_block.id, cx)
                     .expect("block content not found");
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index 53c9113934..809b530ed7 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -167,15 +167,14 @@ fn main() {
                     continue;
                 }
 
-                if let Some(language) = meta.language_server {
-                    if !languages.contains(&language.file_extension) {
+                if let Some(language) = meta.language_server
+                    && !languages.contains(&language.file_extension) {
                         panic!(
                             "Eval for {:?} could not be run because no language server was found for extension {:?}",
                             meta.name,
                             language.file_extension
                         );
                     }
-                }
 
                 // TODO: This creates a worktree per repetition. Ideally these examples should
                 // either be run sequentially on the same worktree, or reuse worktrees when there
diff --git a/crates/eval/src/explorer.rs b/crates/eval/src/explorer.rs
index ee1dfa95c3..3326070cea 100644
--- a/crates/eval/src/explorer.rs
+++ b/crates/eval/src/explorer.rs
@@ -46,27 +46,25 @@ fn find_target_files_recursive(
                 max_depth,
                 found_files,
             )?;
-        } else if path.is_file() {
-            if let Some(filename_osstr) = path.file_name() {
-                if let Some(filename_str) = filename_osstr.to_str() {
-                    if filename_str == target_filename {
-                        found_files.push(path);
-                    }
-                }
-            }
+        } else if path.is_file()
+            && let Some(filename_osstr) = path.file_name()
+            && let Some(filename_str) = filename_osstr.to_str()
+            && filename_str == target_filename
+        {
+            found_files.push(path);
         }
     }
     Ok(())
 }
 
 pub fn generate_explorer_html(input_paths: &[PathBuf], output_path: &PathBuf) -> Result<String> {
-    if let Some(parent) = output_path.parent() {
-        if !parent.exists() {
-            fs::create_dir_all(parent).context(format!(
-                "Failed to create output directory: {}",
-                parent.display()
-            ))?;
-        }
+    if let Some(parent) = output_path.parent()
+        && !parent.exists()
+    {
+        fs::create_dir_all(parent).context(format!(
+            "Failed to create output directory: {}",
+            parent.display()
+        ))?;
     }
 
     let template_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("src/explorer.html");
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
index e3b67ed355..dd9b4f8bba 100644
--- a/crates/eval/src/instance.rs
+++ b/crates/eval/src/instance.rs
@@ -376,11 +376,10 @@ impl ExampleInstance {
             );
             let result = this.thread.conversation(&mut example_cx).await;
 
-            if let Err(err) = result {
-                if !err.is::<FailedAssertion>() {
+            if let Err(err) = result
+                && !err.is::<FailedAssertion>() {
                     return Err(err);
                 }
-            }
 
             println!("{}Stopped", this.log_prefix);
 
diff --git a/crates/extension/src/extension.rs b/crates/extension/src/extension.rs
index 35f7f41938..6af793253b 100644
--- a/crates/extension/src/extension.rs
+++ b/crates/extension/src/extension.rs
@@ -178,16 +178,15 @@ pub fn parse_wasm_extension_version(
     for part in wasmparser::Parser::new(0).parse_all(wasm_bytes) {
         if let wasmparser::Payload::CustomSection(s) =
             part.context("error parsing wasm extension")?
+            && s.name() == "zed:api-version"
         {
-            if s.name() == "zed:api-version" {
-                version = parse_wasm_extension_version_custom_section(s.data());
-                if version.is_none() {
-                    bail!(
-                        "extension {} has invalid zed:api-version section: {:?}",
-                        extension_id,
-                        s.data()
-                    );
-                }
+            version = parse_wasm_extension_version_custom_section(s.data());
+            if version.is_none() {
+                bail!(
+                    "extension {} has invalid zed:api-version section: {:?}",
+                    extension_id,
+                    s.data()
+                );
             }
         }
     }
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 4ee948dda8..01edb5c033 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -93,10 +93,9 @@ pub fn is_version_compatible(
         .wasm_api_version
         .as_ref()
         .and_then(|wasm_api_version| SemanticVersion::from_str(wasm_api_version).ok())
+        && !is_supported_wasm_api_version(release_channel, wasm_api_version)
     {
-        if !is_supported_wasm_api_version(release_channel, wasm_api_version) {
-            return false;
-        }
+        return false;
     }
 
     true
@@ -292,19 +291,17 @@ impl ExtensionStore {
         // it must be asynchronously rebuilt.
         let mut extension_index = ExtensionIndex::default();
         let mut extension_index_needs_rebuild = true;
-        if let Ok(index_content) = index_content {
-            if let Some(index) = serde_json::from_str(&index_content).log_err() {
-                extension_index = index;
-                if let (Ok(Some(index_metadata)), Ok(Some(extensions_metadata))) =
-                    (index_metadata, extensions_metadata)
-                {
-                    if index_metadata
-                        .mtime
-                        .bad_is_greater_than(extensions_metadata.mtime)
-                    {
-                        extension_index_needs_rebuild = false;
-                    }
-                }
+        if let Ok(index_content) = index_content
+            && let Some(index) = serde_json::from_str(&index_content).log_err()
+        {
+            extension_index = index;
+            if let (Ok(Some(index_metadata)), Ok(Some(extensions_metadata))) =
+                (index_metadata, extensions_metadata)
+                && index_metadata
+                    .mtime
+                    .bad_is_greater_than(extensions_metadata.mtime)
+            {
+                extension_index_needs_rebuild = false;
             }
         }
 
@@ -392,10 +389,9 @@ impl ExtensionStore {
 
                         if let Some(path::Component::Normal(extension_dir_name)) =
                             event_path.components().next()
+                            && let Some(extension_id) = extension_dir_name.to_str()
                         {
-                            if let Some(extension_id) = extension_dir_name.to_str() {
-                                reload_tx.unbounded_send(Some(extension_id.into())).ok();
-                            }
+                            reload_tx.unbounded_send(Some(extension_id.into())).ok();
                         }
                     }
                 }
@@ -763,8 +759,8 @@ impl ExtensionStore {
             if let ExtensionOperation::Install = operation {
                 this.update( cx, |this, cx| {
                     cx.emit(Event::ExtensionInstalled(extension_id.clone()));
-                    if let Some(events) = ExtensionEvents::try_global(cx) {
-                        if let Some(manifest) = this.extension_manifest_for_id(&extension_id) {
+                    if let Some(events) = ExtensionEvents::try_global(cx)
+                        && let Some(manifest) = this.extension_manifest_for_id(&extension_id) {
                             events.update(cx, |this, cx| {
                                 this.emit(
                                     extension::Event::ExtensionInstalled(manifest.clone()),
@@ -772,7 +768,6 @@ impl ExtensionStore {
                                 )
                             });
                         }
-                    }
                 })
                 .ok();
             }
@@ -912,12 +907,12 @@ impl ExtensionStore {
 
             extension_store.update(cx, |_, cx| {
                 cx.emit(Event::ExtensionUninstalled(extension_id.clone()));
-                if let Some(events) = ExtensionEvents::try_global(cx) {
-                    if let Some(manifest) = extension_manifest {
-                        events.update(cx, |this, cx| {
-                            this.emit(extension::Event::ExtensionUninstalled(manifest.clone()), cx)
-                        });
-                    }
+                if let Some(events) = ExtensionEvents::try_global(cx)
+                    && let Some(manifest) = extension_manifest
+                {
+                    events.update(cx, |this, cx| {
+                        this.emit(extension::Event::ExtensionUninstalled(manifest.clone()), cx)
+                    });
                 }
             })?;
 
@@ -997,12 +992,12 @@ impl ExtensionStore {
             this.update(cx, |this, cx| this.reload(None, cx))?.await;
             this.update(cx, |this, cx| {
                 cx.emit(Event::ExtensionInstalled(extension_id.clone()));
-                if let Some(events) = ExtensionEvents::try_global(cx) {
-                    if let Some(manifest) = this.extension_manifest_for_id(&extension_id) {
-                        events.update(cx, |this, cx| {
-                            this.emit(extension::Event::ExtensionInstalled(manifest.clone()), cx)
-                        });
-                    }
+                if let Some(events) = ExtensionEvents::try_global(cx)
+                    && let Some(manifest) = this.extension_manifest_for_id(&extension_id)
+                {
+                    events.update(cx, |this, cx| {
+                        this.emit(extension::Event::ExtensionInstalled(manifest.clone()), cx)
+                    });
                 }
             })?;
 
@@ -1788,10 +1783,10 @@ impl ExtensionStore {
         let connection_options = client.read(cx).connection_options();
         let ssh_url = connection_options.ssh_url();
 
-        if let Some(existing_client) = self.ssh_clients.get(&ssh_url) {
-            if existing_client.upgrade().is_some() {
-                return;
-            }
+        if let Some(existing_client) = self.ssh_clients.get(&ssh_url)
+            && existing_client.upgrade().is_some()
+        {
+            return;
         }
 
         self.ssh_clients.insert(ssh_url, client.downgrade());
diff --git a/crates/extension_host/src/wasm_host.rs b/crates/extension_host/src/wasm_host.rs
index d990b670f4..4fe27aedc9 100644
--- a/crates/extension_host/src/wasm_host.rs
+++ b/crates/extension_host/src/wasm_host.rs
@@ -701,16 +701,15 @@ pub fn parse_wasm_extension_version(
     for part in wasmparser::Parser::new(0).parse_all(wasm_bytes) {
         if let wasmparser::Payload::CustomSection(s) =
             part.context("error parsing wasm extension")?
+            && s.name() == "zed:api-version"
         {
-            if s.name() == "zed:api-version" {
-                version = parse_wasm_extension_version_custom_section(s.data());
-                if version.is_none() {
-                    bail!(
-                        "extension {} has invalid zed:api-version section: {:?}",
-                        extension_id,
-                        s.data()
-                    );
-                }
+            version = parse_wasm_extension_version_custom_section(s.data());
+            if version.is_none() {
+                bail!(
+                    "extension {} has invalid zed:api-version section: {:?}",
+                    extension_id,
+                    s.data()
+                );
             }
         }
     }
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 7c7f9e6836..7f0e8171f6 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -1031,15 +1031,14 @@ impl ExtensionsPage {
                                 .read(cx)
                                 .extension_manifest_for_id(&extension_id)
                                 .cloned()
+                                && let Some(events) = extension::ExtensionEvents::try_global(cx)
                             {
-                                if let Some(events) = extension::ExtensionEvents::try_global(cx) {
-                                    events.update(cx, |this, cx| {
-                                        this.emit(
-                                            extension::Event::ConfigureExtensionRequested(manifest),
-                                            cx,
-                                        )
-                                    });
-                                }
+                                events.update(cx, |this, cx| {
+                                    this.emit(
+                                        extension::Event::ConfigureExtensionRequested(manifest),
+                                        cx,
+                                    )
+                                });
                             }
                         }
                     })
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index e8f80e5ef2..aebc262af0 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -209,11 +209,11 @@ impl FileFinder {
         let Some(init_modifiers) = self.init_modifiers.take() else {
             return;
         };
-        if self.picker.read(cx).delegate.has_changed_selected_index {
-            if !event.modified() || !init_modifiers.is_subset_of(event) {
-                self.init_modifiers = None;
-                window.dispatch_action(menu::Confirm.boxed_clone(), cx);
-            }
+        if self.picker.read(cx).delegate.has_changed_selected_index
+            && (!event.modified() || !init_modifiers.is_subset_of(event))
+        {
+            self.init_modifiers = None;
+            window.dispatch_action(menu::Confirm.boxed_clone(), cx);
         }
     }
 
@@ -323,27 +323,27 @@ impl FileFinder {
     ) {
         self.picker.update(cx, |picker, cx| {
             let delegate = &mut picker.delegate;
-            if let Some(workspace) = delegate.workspace.upgrade() {
-                if let Some(m) = delegate.matches.get(delegate.selected_index()) {
-                    let path = match &m {
-                        Match::History { path, .. } => {
-                            let worktree_id = path.project.worktree_id;
-                            ProjectPath {
-                                worktree_id,
-                                path: Arc::clone(&path.project.path),
-                            }
+            if let Some(workspace) = delegate.workspace.upgrade()
+                && let Some(m) = delegate.matches.get(delegate.selected_index())
+            {
+                let path = match &m {
+                    Match::History { path, .. } => {
+                        let worktree_id = path.project.worktree_id;
+                        ProjectPath {
+                            worktree_id,
+                            path: Arc::clone(&path.project.path),
                         }
-                        Match::Search(m) => ProjectPath {
-                            worktree_id: WorktreeId::from_usize(m.0.worktree_id),
-                            path: m.0.path.clone(),
-                        },
-                        Match::CreateNew(p) => p.clone(),
-                    };
-                    let open_task = workspace.update(cx, move |workspace, cx| {
-                        workspace.split_path_preview(path, false, Some(split_direction), window, cx)
-                    });
-                    open_task.detach_and_log_err(cx);
-                }
+                    }
+                    Match::Search(m) => ProjectPath {
+                        worktree_id: WorktreeId::from_usize(m.0.worktree_id),
+                        path: m.0.path.clone(),
+                    },
+                    Match::CreateNew(p) => p.clone(),
+                };
+                let open_task = workspace.update(cx, move |workspace, cx| {
+                    workspace.split_path_preview(path, false, Some(split_direction), window, cx)
+                });
+                open_task.detach_and_log_err(cx);
             }
         })
     }
@@ -675,17 +675,17 @@ impl Matches {
             let path_str = panel_match.0.path.to_string_lossy();
             let filename_str = filename.to_string_lossy();
 
-            if let Some(filename_pos) = path_str.rfind(&*filename_str) {
-                if panel_match.0.positions[0] >= filename_pos {
-                    let mut prev_position = panel_match.0.positions[0];
-                    for p in &panel_match.0.positions[1..] {
-                        if *p != prev_position + 1 {
-                            return false;
-                        }
-                        prev_position = *p;
+            if let Some(filename_pos) = path_str.rfind(&*filename_str)
+                && panel_match.0.positions[0] >= filename_pos
+            {
+                let mut prev_position = panel_match.0.positions[0];
+                for p in &panel_match.0.positions[1..] {
+                    if *p != prev_position + 1 {
+                        return false;
                     }
-                    return true;
+                    prev_position = *p;
                 }
+                return true;
             }
         }
 
@@ -1045,10 +1045,10 @@ impl FileFinderDelegate {
                         )
                     } else {
                         let mut path = Arc::clone(project_relative_path);
-                        if project_relative_path.as_ref() == Path::new("") {
-                            if let Some(absolute_path) = &entry_path.absolute {
-                                path = Arc::from(absolute_path.as_path());
-                            }
+                        if project_relative_path.as_ref() == Path::new("")
+                            && let Some(absolute_path) = &entry_path.absolute
+                        {
+                            path = Arc::from(absolute_path.as_path());
                         }
 
                         let mut path_match = PathMatch {
@@ -1078,23 +1078,21 @@ impl FileFinderDelegate {
                 ),
             };
 
-        if file_name_positions.is_empty() {
-            if let Some(user_home_path) = std::env::var("HOME").ok() {
-                let user_home_path = user_home_path.trim();
-                if !user_home_path.is_empty() {
-                    if full_path.starts_with(user_home_path) {
-                        full_path.replace_range(0..user_home_path.len(), "~");
-                        full_path_positions.retain_mut(|pos| {
-                            if *pos >= user_home_path.len() {
-                                *pos -= user_home_path.len();
-                                *pos += 1;
-                                true
-                            } else {
-                                false
-                            }
-                        })
+        if file_name_positions.is_empty()
+            && let Some(user_home_path) = std::env::var("HOME").ok()
+        {
+            let user_home_path = user_home_path.trim();
+            if !user_home_path.is_empty() && full_path.starts_with(user_home_path) {
+                full_path.replace_range(0..user_home_path.len(), "~");
+                full_path_positions.retain_mut(|pos| {
+                    if *pos >= user_home_path.len() {
+                        *pos -= user_home_path.len();
+                        *pos += 1;
+                        true
+                    } else {
+                        false
                     }
-                }
+                })
             }
         }
 
@@ -1242,14 +1240,13 @@ impl FileFinderDelegate {
 
     /// Skips first history match (that is displayed topmost) if it's currently opened.
     fn calculate_selected_index(&self, cx: &mut Context<Picker<Self>>) -> usize {
-        if FileFinderSettings::get_global(cx).skip_focus_for_active_in_search {
-            if let Some(Match::History { path, .. }) = self.matches.get(0) {
-                if Some(path) == self.currently_opened_path.as_ref() {
-                    let elements_after_first = self.matches.len() - 1;
-                    if elements_after_first > 0 {
-                        return 1;
-                    }
-                }
+        if FileFinderSettings::get_global(cx).skip_focus_for_active_in_search
+            && let Some(Match::History { path, .. }) = self.matches.get(0)
+            && Some(path) == self.currently_opened_path.as_ref()
+        {
+            let elements_after_first = self.matches.len() - 1;
+            if elements_after_first > 0 {
+                return 1;
             }
         }
 
@@ -1310,10 +1307,10 @@ impl PickerDelegate for FileFinderDelegate {
                 .enumerate()
                 .find(|(_, m)| !matches!(m, Match::History { .. }))
                 .map(|(i, _)| i);
-            if let Some(first_non_history_index) = first_non_history_index {
-                if first_non_history_index > 0 {
-                    return vec![first_non_history_index - 1];
-                }
+            if let Some(first_non_history_index) = first_non_history_index
+                && first_non_history_index > 0
+            {
+                return vec![first_non_history_index - 1];
             }
         }
         Vec::new()
@@ -1436,69 +1433,101 @@ impl PickerDelegate for FileFinderDelegate {
         window: &mut Window,
         cx: &mut Context<Picker<FileFinderDelegate>>,
     ) {
-        if let Some(m) = self.matches.get(self.selected_index()) {
-            if let Some(workspace) = self.workspace.upgrade() {
-                let open_task = workspace.update(cx, |workspace, cx| {
-                    let split_or_open =
-                        |workspace: &mut Workspace,
-                         project_path,
-                         window: &mut Window,
-                         cx: &mut Context<Workspace>| {
-                            let allow_preview =
-                                PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
-                            if secondary {
-                                workspace.split_path_preview(
-                                    project_path,
-                                    allow_preview,
-                                    None,
-                                    window,
-                                    cx,
-                                )
-                            } else {
-                                workspace.open_path_preview(
-                                    project_path,
-                                    None,
-                                    true,
-                                    allow_preview,
-                                    true,
-                                    window,
-                                    cx,
-                                )
-                            }
-                        };
-                    match &m {
-                        Match::CreateNew(project_path) => {
-                            // Create a new file with the given filename
-                            if secondary {
-                                workspace.split_path_preview(
-                                    project_path.clone(),
-                                    false,
-                                    None,
-                                    window,
-                                    cx,
-                                )
-                            } else {
-                                workspace.open_path_preview(
-                                    project_path.clone(),
-                                    None,
-                                    true,
-                                    false,
-                                    true,
-                                    window,
-                                    cx,
-                                )
-                            }
+        if let Some(m) = self.matches.get(self.selected_index())
+            && let Some(workspace) = self.workspace.upgrade()
+        {
+            let open_task = workspace.update(cx, |workspace, cx| {
+                let split_or_open =
+                    |workspace: &mut Workspace,
+                     project_path,
+                     window: &mut Window,
+                     cx: &mut Context<Workspace>| {
+                        let allow_preview =
+                            PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
+                        if secondary {
+                            workspace.split_path_preview(
+                                project_path,
+                                allow_preview,
+                                None,
+                                window,
+                                cx,
+                            )
+                        } else {
+                            workspace.open_path_preview(
+                                project_path,
+                                None,
+                                true,
+                                allow_preview,
+                                true,
+                                window,
+                                cx,
+                            )
                         }
+                    };
+                match &m {
+                    Match::CreateNew(project_path) => {
+                        // Create a new file with the given filename
+                        if secondary {
+                            workspace.split_path_preview(
+                                project_path.clone(),
+                                false,
+                                None,
+                                window,
+                                cx,
+                            )
+                        } else {
+                            workspace.open_path_preview(
+                                project_path.clone(),
+                                None,
+                                true,
+                                false,
+                                true,
+                                window,
+                                cx,
+                            )
+                        }
+                    }
 
-                        Match::History { path, .. } => {
-                            let worktree_id = path.project.worktree_id;
-                            if workspace
-                                .project()
-                                .read(cx)
-                                .worktree_for_id(worktree_id, cx)
-                                .is_some()
-                            {
-                                split_or_open(
+                    Match::History { path, .. } => {
+                        let worktree_id = path.project.worktree_id;
+                        if workspace
+                            .project()
+                            .read(cx)
+                            .worktree_for_id(worktree_id, cx)
+                            .is_some()
+                        {
+                            split_or_open(
+                                workspace,
+                                ProjectPath {
+                                    worktree_id,
+                                    path: Arc::clone(&path.project.path),
+                                },
+                                window,
+                                cx,
+                            )
+                        } else {
+                            match path.absolute.as_ref() {
+                                Some(abs_path) => {
+                                    if secondary {
+                                        workspace.split_abs_path(
+                                            abs_path.to_path_buf(),
+                                            false,
+                                            window,
+                                            cx,
+                                        )
+                                    } else {
+                                        workspace.open_abs_path(
+                                            abs_path.to_path_buf(),
+                                            OpenOptions {
+                                                visible: Some(OpenVisible::None),
+                                                ..Default::default()
+                                            },
+                                            window,
+                                            cx,
+                                        )
+                                    }
+                                }
+                                None => split_or_open(
                                     workspace,
                                     ProjectPath {
                                         worktree_id,
@@ -1506,88 +1535,52 @@ impl PickerDelegate for FileFinderDelegate {
                                     },
                                     window,
                                     cx,
-                                )
-                            } else {
-                                match path.absolute.as_ref() {
-                                    Some(abs_path) => {
-                                        if secondary {
-                                            workspace.split_abs_path(
-                                                abs_path.to_path_buf(),
-                                                false,
-                                                window,
-                                                cx,
-                                            )
-                                        } else {
-                                            workspace.open_abs_path(
-                                                abs_path.to_path_buf(),
-                                                OpenOptions {
-                                                    visible: Some(OpenVisible::None),
-                                                    ..Default::default()
-                                                },
-                                                window,
-                                                cx,
-                                            )
-                                        }
-                                    }
-                                    None => split_or_open(
-                                        workspace,
-                                        ProjectPath {
-                                            worktree_id,
-                                            path: Arc::clone(&path.project.path),
-                                        },
-                                        window,
-                                        cx,
-                                    ),
-                                }
+                                ),
                             }
                         }
-                        Match::Search(m) => split_or_open(
-                            workspace,
-                            ProjectPath {
-                                worktree_id: WorktreeId::from_usize(m.0.worktree_id),
-                                path: m.0.path.clone(),
-                            },
-                            window,
-                            cx,
-                        ),
                     }
-                });
+                    Match::Search(m) => split_or_open(
+                        workspace,
+                        ProjectPath {
+                            worktree_id: WorktreeId::from_usize(m.0.worktree_id),
+                            path: m.0.path.clone(),
+                        },
+                        window,
+                        cx,
+                    ),
+                }
+            });
 
-                let row = self
-                    .latest_search_query
-                    .as_ref()
-                    .and_then(|query| query.path_position.row)
-                    .map(|row| row.saturating_sub(1));
-                let col = self
-                    .latest_search_query
-                    .as_ref()
-                    .and_then(|query| query.path_position.column)
-                    .unwrap_or(0)
-                    .saturating_sub(1);
-                let finder = self.file_finder.clone();
+            let row = self
+                .latest_search_query
+                .as_ref()
+                .and_then(|query| query.path_position.row)
+                .map(|row| row.saturating_sub(1));
+            let col = self
+                .latest_search_query
+                .as_ref()
+                .and_then(|query| query.path_position.column)
+                .unwrap_or(0)
+                .saturating_sub(1);
+            let finder = self.file_finder.clone();
 
-                cx.spawn_in(window, async move |_, cx| {
-                    let item = open_task.await.notify_async_err(cx)?;
-                    if let Some(row) = row {
-                        if let Some(active_editor) = item.downcast::<Editor>() {
-                            active_editor
-                                .downgrade()
-                                .update_in(cx, |editor, window, cx| {
-                                    editor.go_to_singleton_buffer_point(
-                                        Point::new(row, col),
-                                        window,
-                                        cx,
-                                    );
-                                })
-                                .log_err();
-                        }
-                    }
-                    finder.update(cx, |_, cx| cx.emit(DismissEvent)).ok()?;
+            cx.spawn_in(window, async move |_, cx| {
+                let item = open_task.await.notify_async_err(cx)?;
+                if let Some(row) = row
+                    && let Some(active_editor) = item.downcast::<Editor>()
+                {
+                    active_editor
+                        .downgrade()
+                        .update_in(cx, |editor, window, cx| {
+                            editor.go_to_singleton_buffer_point(Point::new(row, col), window, cx);
+                        })
+                        .log_err();
+                }
+                finder.update(cx, |_, cx| cx.emit(DismissEvent)).ok()?;
 
-                    Some(())
-                })
-                .detach();
-            }
+                Some(())
+            })
+            .detach();
         }
     }
 
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index 7235568e4f..3a99afc8cb 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -75,16 +75,16 @@ impl OpenPathDelegate {
                 ..
             } => {
                 let mut i = selected_match_index;
-                if let Some(user_input) = user_input {
-                    if !user_input.exists || !user_input.is_dir {
-                        if i == 0 {
-                            return Some(CandidateInfo {
-                                path: user_input.file.clone(),
-                                is_dir: false,
-                            });
-                        } else {
-                            i -= 1;
-                        }
+                if let Some(user_input) = user_input
+                    && (!user_input.exists || !user_input.is_dir)
+                {
+                    if i == 0 {
+                        return Some(CandidateInfo {
+                            path: user_input.file.clone(),
+                            is_dir: false,
+                        });
+                    } else {
+                        i -= 1;
                     }
                 }
                 let id = self.string_matches.get(i)?.candidate_id;
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 64eeae99d1..847e98d6c4 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -420,18 +420,19 @@ impl Fs for RealFs {
 
     async fn remove_file(&self, path: &Path, options: RemoveOptions) -> Result<()> {
         #[cfg(windows)]
-        if let Ok(Some(metadata)) = self.metadata(path).await {
-            if metadata.is_symlink && metadata.is_dir {
-                self.remove_dir(
-                    path,
-                    RemoveOptions {
-                        recursive: false,
-                        ignore_if_not_exists: true,
-                    },
-                )
-                .await?;
-                return Ok(());
-            }
+        if let Ok(Some(metadata)) = self.metadata(path).await
+            && metadata.is_symlink
+            && metadata.is_dir
+        {
+            self.remove_dir(
+                path,
+                RemoveOptions {
+                    recursive: false,
+                    ignore_if_not_exists: true,
+                },
+            )
+            .await?;
+            return Ok(());
         }
 
         match smol::fs::remove_file(path).await {
@@ -467,11 +468,11 @@ impl Fs for RealFs {
 
     #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     async fn trash_file(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
-        if let Ok(Some(metadata)) = self.metadata(path).await {
-            if metadata.is_symlink {
-                // TODO: trash_file does not support trashing symlinks yet - https://github.com/bilelmoussaoui/ashpd/issues/255
-                return self.remove_file(path, RemoveOptions::default()).await;
-            }
+        if let Ok(Some(metadata)) = self.metadata(path).await
+            && metadata.is_symlink
+        {
+            // TODO: trash_file does not support trashing symlinks yet - https://github.com/bilelmoussaoui/ashpd/issues/255
+            return self.remove_file(path, RemoveOptions::default()).await;
         }
         let file = smol::fs::File::open(path).await?;
         match trash::trash_file(&file.as_fd()).await {
@@ -766,24 +767,23 @@ impl Fs for RealFs {
         let pending_paths: Arc<Mutex<Vec<PathEvent>>> = Default::default();
         let watcher = Arc::new(fs_watcher::FsWatcher::new(tx, pending_paths.clone()));
 
-        if watcher.add(path).is_err() {
-            // If the path doesn't exist yet (e.g. settings.json), watch the parent dir to learn when it's created.
-            if let Some(parent) = path.parent() {
-                if let Err(e) = watcher.add(parent) {
-                    log::warn!("Failed to watch: {e}");
-                }
-            }
+        // If the path doesn't exist yet (e.g. settings.json), watch the parent dir to learn when it's created.
+        if watcher.add(path).is_err()
+            && let Some(parent) = path.parent()
+            && let Err(e) = watcher.add(parent)
+        {
+            log::warn!("Failed to watch: {e}");
         }
 
         // Check if path is a symlink and follow the target parent
         if let Some(mut target) = self.read_link(path).await.ok() {
             // Check if symlink target is relative path, if so make it absolute
-            if target.is_relative() {
-                if let Some(parent) = path.parent() {
-                    target = parent.join(target);
-                    if let Ok(canonical) = self.canonicalize(&target).await {
-                        target = SanitizedPath::from(canonical).as_path().to_path_buf();
-                    }
+            if target.is_relative()
+                && let Some(parent) = path.parent()
+            {
+                target = parent.join(target);
+                if let Ok(canonical) = self.canonicalize(&target).await {
+                    target = SanitizedPath::from(canonical).as_path().to_path_buf();
                 }
             }
             watcher.add(&target).ok();
@@ -1068,13 +1068,13 @@ impl FakeFsState {
                         let current_entry = *entry_stack.last()?;
                         if let FakeFsEntry::Dir { entries, .. } = current_entry {
                             let entry = entries.get(name.to_str().unwrap())?;
-                            if path_components.peek().is_some() || follow_symlink {
-                                if let FakeFsEntry::Symlink { target, .. } = entry {
-                                    let mut target = target.clone();
-                                    target.extend(path_components);
-                                    path = target;
-                                    continue 'outer;
-                                }
+                            if (path_components.peek().is_some() || follow_symlink)
+                                && let FakeFsEntry::Symlink { target, .. } = entry
+                            {
+                                let mut target = target.clone();
+                                target.extend(path_components);
+                                path = target;
+                                continue 'outer;
                             }
                             entry_stack.push(entry);
                             canonical_path = canonical_path.join(name);
@@ -1566,10 +1566,10 @@ impl FakeFs {
 
     pub fn insert_branches(&self, dot_git: &Path, branches: &[&str]) {
         self.with_git_state(dot_git, true, |state| {
-            if let Some(first) = branches.first() {
-                if state.current_branch_name.is_none() {
-                    state.current_branch_name = Some(first.to_string())
-                }
+            if let Some(first) = branches.first()
+                && state.current_branch_name.is_none()
+            {
+                state.current_branch_name = Some(first.to_string())
             }
             state
                 .branches
diff --git a/crates/fs/src/mac_watcher.rs b/crates/fs/src/mac_watcher.rs
index aa75ad31d9..7bd176639f 100644
--- a/crates/fs/src/mac_watcher.rs
+++ b/crates/fs/src/mac_watcher.rs
@@ -41,10 +41,9 @@ impl Watcher for MacWatcher {
         if let Some((watched_path, _)) = handles
             .range::<Path, _>((Bound::Unbounded, Bound::Included(path)))
             .next_back()
+            && path.starts_with(watched_path)
         {
-            if path.starts_with(watched_path) {
-                return Ok(());
-            }
+            return Ok(());
         }
 
         let (stream, handle) = EventStream::new(&[path], self.latency);
diff --git a/crates/fsevent/src/fsevent.rs b/crates/fsevent/src/fsevent.rs
index 81ca0a4114..c97ab5f35d 100644
--- a/crates/fsevent/src/fsevent.rs
+++ b/crates/fsevent/src/fsevent.rs
@@ -178,40 +178,39 @@ impl EventStream {
                     flags.contains(StreamFlags::USER_DROPPED)
                         || flags.contains(StreamFlags::KERNEL_DROPPED)
                 })
+                && let Some(last_valid_event_id) = state.last_valid_event_id.take()
             {
-                if let Some(last_valid_event_id) = state.last_valid_event_id.take() {
-                    fs::FSEventStreamStop(state.stream);
-                    fs::FSEventStreamInvalidate(state.stream);
-                    fs::FSEventStreamRelease(state.stream);
+                fs::FSEventStreamStop(state.stream);
+                fs::FSEventStreamInvalidate(state.stream);
+                fs::FSEventStreamRelease(state.stream);
 
-                    let stream_context = fs::FSEventStreamContext {
-                        version: 0,
-                        info,
-                        retain: None,
-                        release: None,
-                        copy_description: None,
-                    };
-                    let stream = fs::FSEventStreamCreate(
-                        cf::kCFAllocatorDefault,
-                        Self::trampoline,
-                        &stream_context,
-                        state.paths,
-                        last_valid_event_id,
-                        state.latency.as_secs_f64(),
-                        fs::kFSEventStreamCreateFlagFileEvents
-                            | fs::kFSEventStreamCreateFlagNoDefer
-                            | fs::kFSEventStreamCreateFlagWatchRoot,
-                    );
+                let stream_context = fs::FSEventStreamContext {
+                    version: 0,
+                    info,
+                    retain: None,
+                    release: None,
+                    copy_description: None,
+                };
+                let stream = fs::FSEventStreamCreate(
+                    cf::kCFAllocatorDefault,
+                    Self::trampoline,
+                    &stream_context,
+                    state.paths,
+                    last_valid_event_id,
+                    state.latency.as_secs_f64(),
+                    fs::kFSEventStreamCreateFlagFileEvents
+                        | fs::kFSEventStreamCreateFlagNoDefer
+                        | fs::kFSEventStreamCreateFlagWatchRoot,
+                );
 
-                    state.stream = stream;
-                    fs::FSEventStreamScheduleWithRunLoop(
-                        state.stream,
-                        cf::CFRunLoopGetCurrent(),
-                        cf::kCFRunLoopDefaultMode,
-                    );
-                    fs::FSEventStreamStart(state.stream);
-                    stream_restarted = true;
-                }
+                state.stream = stream;
+                fs::FSEventStreamScheduleWithRunLoop(
+                    state.stream,
+                    cf::CFRunLoopGetCurrent(),
+                    cf::kCFRunLoopDefaultMode,
+                );
+                fs::FSEventStreamStart(state.stream);
+                stream_restarted = true;
             }
 
             if !stream_restarted {
diff --git a/crates/git/src/blame.rs b/crates/git/src/blame.rs
index 6f12681ea0..24b2c44218 100644
--- a/crates/git/src/blame.rs
+++ b/crates/git/src/blame.rs
@@ -289,14 +289,12 @@ fn parse_git_blame(output: &str) -> Result<Vec<BlameEntry>> {
             }
         };
 
-        if done {
-            if let Some(entry) = current_entry.take() {
-                index.insert(entry.sha, entries.len());
+        if done && let Some(entry) = current_entry.take() {
+            index.insert(entry.sha, entries.len());
 
-                // We only want annotations that have a commit.
-                if !entry.sha.is_zero() {
-                    entries.push(entry);
-                }
+            // We only want annotations that have a commit.
+            if !entry.sha.is_zero() {
+                entries.push(entry);
             }
         }
     }
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index ae8c5f849c..c30b789d9f 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1447,12 +1447,11 @@ impl GitRepository for RealGitRepository {
 
                 let mut remote_branches = vec![];
                 let mut add_if_matching = async |remote_head: &str| {
-                    if let Ok(merge_base) = git_cmd(&["merge-base", &head, remote_head]).await {
-                        if merge_base.trim() == head {
-                            if let Some(s) = remote_head.strip_prefix("refs/remotes/") {
-                                remote_branches.push(s.to_owned().into());
-                            }
-                        }
+                    if let Ok(merge_base) = git_cmd(&["merge-base", &head, remote_head]).await
+                        && merge_base.trim() == head
+                        && let Some(s) = remote_head.strip_prefix("refs/remotes/")
+                    {
+                        remote_branches.push(s.to_owned().into());
                     }
                 };
 
@@ -1574,10 +1573,9 @@ impl GitRepository for RealGitRepository {
                     Err(error) => {
                         if let Some(GitBinaryCommandError { status, .. }) =
                             error.downcast_ref::<GitBinaryCommandError>()
+                            && status.code() == Some(1)
                         {
-                            if status.code() == Some(1) {
-                                return Ok(false);
-                            }
+                            return Ok(false);
                         }
 
                         Err(error)
diff --git a/crates/git_hosting_providers/src/git_hosting_providers.rs b/crates/git_hosting_providers/src/git_hosting_providers.rs
index d4b3a59375..1d88c47f2e 100644
--- a/crates/git_hosting_providers/src/git_hosting_providers.rs
+++ b/crates/git_hosting_providers/src/git_hosting_providers.rs
@@ -49,10 +49,10 @@ pub fn register_additional_providers(
 
 pub fn get_host_from_git_remote_url(remote_url: &str) -> Result<String> {
     maybe!({
-        if let Some(remote_url) = remote_url.strip_prefix("git@") {
-            if let Some((host, _)) = remote_url.trim_start_matches("git@").split_once(':') {
-                return Some(host.to_string());
-            }
+        if let Some(remote_url) = remote_url.strip_prefix("git@")
+            && let Some((host, _)) = remote_url.trim_start_matches("git@").split_once(':')
+        {
+            return Some(host.to_string());
         }
 
         Url::parse(remote_url)
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index 5e7430ebc6..4303f53275 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -135,11 +135,10 @@ impl CommitModal {
                             .as_ref()
                             .and_then(|repo| repo.read(cx).head_commit.as_ref())
                             .is_some()
+                            && !git_panel.amend_pending()
                         {
-                            if !git_panel.amend_pending() {
-                                git_panel.set_amend_pending(true, cx);
-                                git_panel.load_last_commit_message_if_empty(cx);
-                            }
+                            git_panel.set_amend_pending(true, cx);
+                            git_panel.load_last_commit_message_if_empty(cx);
                         }
                     }
                     ForceMode::Commit => {
@@ -195,12 +194,12 @@ impl CommitModal {
 
         let commit_message = commit_editor.read(cx).text(cx);
 
-        if let Some(suggested_commit_message) = suggested_commit_message {
-            if commit_message.is_empty() {
-                commit_editor.update(cx, |editor, cx| {
-                    editor.set_placeholder_text(suggested_commit_message, cx);
-                });
-            }
+        if let Some(suggested_commit_message) = suggested_commit_message
+            && commit_message.is_empty()
+        {
+            commit_editor.update(cx, |editor, cx| {
+                editor.set_placeholder_text(suggested_commit_message, cx);
+            });
         }
 
         let focus_handle = commit_editor.focus_handle(cx);
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index b1bdcdc3e0..82870b4e75 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -926,19 +926,17 @@ impl GitPanel {
             let workspace = self.workspace.upgrade()?;
             let git_repo = self.active_repository.as_ref()?;
 
-            if let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx) {
-                if let Some(project_path) = project_diff.read(cx).active_path(cx) {
-                    if Some(&entry.repo_path)
-                        == git_repo
-                            .read(cx)
-                            .project_path_to_repo_path(&project_path, cx)
-                            .as_ref()
-                    {
-                        project_diff.focus_handle(cx).focus(window);
-                        project_diff.update(cx, |project_diff, cx| project_diff.autoscroll(cx));
-                        return None;
-                    }
-                }
+            if let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx)
+                && let Some(project_path) = project_diff.read(cx).active_path(cx)
+                && Some(&entry.repo_path)
+                    == git_repo
+                        .read(cx)
+                        .project_path_to_repo_path(&project_path, cx)
+                        .as_ref()
+            {
+                project_diff.focus_handle(cx).focus(window);
+                project_diff.update(cx, |project_diff, cx| project_diff.autoscroll(cx));
+                return None;
             };
 
             self.workspace
@@ -2514,10 +2512,11 @@ impl GitPanel {
                 new_co_authors.push((name.clone(), email.clone()))
             }
         }
-        if !project.is_local() && !project.is_read_only(cx) {
-            if let Some(local_committer) = self.local_committer(room, cx) {
-                new_co_authors.push(local_committer);
-            }
+        if !project.is_local()
+            && !project.is_read_only(cx)
+            && let Some(local_committer) = self.local_committer(room, cx)
+        {
+            new_co_authors.push(local_committer);
         }
         new_co_authors
     }
@@ -2758,14 +2757,13 @@ impl GitPanel {
                 pending_staged_count += pending.entries.len();
                 last_pending_staged = pending.entries.first().cloned();
             }
-            if let Some(single_staged) = &single_staged_entry {
-                if pending
+            if let Some(single_staged) = &single_staged_entry
+                && pending
                     .entries
                     .iter()
                     .any(|entry| entry.repo_path == single_staged.repo_path)
-                {
-                    pending_status_for_single_staged = Some(pending.target_status);
-                }
+            {
+                pending_status_for_single_staged = Some(pending.target_status);
             }
         }
 
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 09c5ce1152..3c0898fabf 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -363,10 +363,10 @@ impl ProjectDiff {
             }
             _ => {}
         }
-        if editor.focus_handle(cx).contains_focused(window, cx) {
-            if self.multibuffer.read(cx).is_empty() {
-                self.focus_handle.focus(window)
-            }
+        if editor.focus_handle(cx).contains_focused(window, cx)
+            && self.multibuffer.read(cx).is_empty()
+        {
+            self.focus_handle.focus(window)
         }
     }
 
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index af92621378..9d918048fa 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -95,10 +95,8 @@ impl CursorPosition {
                 .ok()
                 .unwrap_or(true);
 
-            if !is_singleton {
-                if let Some(debounce) = debounce {
-                    cx.background_executor().timer(debounce).await;
-                }
+            if !is_singleton && let Some(debounce) = debounce {
+                cx.background_executor().timer(debounce).await;
             }
 
             editor
@@ -234,13 +232,11 @@ impl Render for CursorPosition {
                                 if let Some(editor) = workspace
                                     .active_item(cx)
                                     .and_then(|item| item.act_as::<Editor>(cx))
+                                    && let Some((_, buffer, _)) = editor.read(cx).active_excerpt(cx)
                                 {
-                                    if let Some((_, buffer, _)) = editor.read(cx).active_excerpt(cx)
-                                    {
-                                        workspace.toggle_modal(window, cx, |window, cx| {
-                                            crate::GoToLine::new(editor, buffer, window, cx)
-                                        })
-                                    }
+                                    workspace.toggle_modal(window, cx, |window, cx| {
+                                        crate::GoToLine::new(editor, buffer, window, cx)
+                                    })
                                 }
                             });
                         }
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
index 1ac933e316..908e61cac7 100644
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -103,11 +103,11 @@ impl GoToLine {
                             return;
                         };
                         editor.update(cx, |editor, cx| {
-                            if let Some(placeholder_text) = editor.placeholder_text() {
-                                if editor.text(cx).is_empty() {
-                                    let placeholder_text = placeholder_text.to_string();
-                                    editor.set_text(placeholder_text, window, cx);
-                                }
+                            if let Some(placeholder_text) = editor.placeholder_text()
+                                && editor.text(cx).is_empty()
+                            {
+                                let placeholder_text = placeholder_text.to_string();
+                                editor.set_text(placeholder_text, window, cx);
                             }
                         });
                     }
diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
index dfa51d024c..95a6daa1d9 100644
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -106,10 +106,9 @@ pub fn validate_generate_content_request(request: &GenerateContentRequest) -> Re
         .contents
         .iter()
         .find(|content| content.role == Role::User)
+        && user_content.parts.is_empty()
     {
-        if user_content.parts.is_empty() {
-            bail!("User content must contain at least one part");
-        }
+        bail!("User content must contain at least one part");
     }
 
     Ok(())
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 3a80ee12a0..0040046f90 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -327,10 +327,10 @@ mod windows {
     /// You can set the `GPUI_FXC_PATH` environment variable to specify the path to the fxc.exe compiler.
     fn find_fxc_compiler() -> String {
         // Check environment variable
-        if let Ok(path) = std::env::var("GPUI_FXC_PATH") {
-            if Path::new(&path).exists() {
-                return path;
-            }
+        if let Ok(path) = std::env::var("GPUI_FXC_PATH")
+            && Path::new(&path).exists()
+        {
+            return path;
         }
 
         // Try to find in PATH
@@ -338,11 +338,10 @@ mod windows {
         if let Ok(output) = std::process::Command::new("where.exe")
             .arg("fxc.exe")
             .output()
+            && output.status.success()
         {
-            if output.status.success() {
-                let path = String::from_utf8_lossy(&output.stdout);
-                return path.trim().to_string();
-            }
+            let path = String::from_utf8_lossy(&output.stdout);
+            return path.trim().to_string();
         }
 
         // Check the default path
diff --git a/crates/gpui/examples/input.rs b/crates/gpui/examples/input.rs
index 170df3cad7..ae635c94b8 100644
--- a/crates/gpui/examples/input.rs
+++ b/crates/gpui/examples/input.rs
@@ -549,10 +549,10 @@ impl Element for TextElement {
         line.paint(bounds.origin, window.line_height(), window, cx)
             .unwrap();
 
-        if focus_handle.is_focused(window) {
-            if let Some(cursor) = prepaint.cursor.take() {
-                window.paint_quad(cursor);
-            }
+        if focus_handle.is_focused(window)
+            && let Some(cursor) = prepaint.cursor.take()
+        {
+            window.paint_quad(cursor);
         }
 
         self.input.update(cx, |input, _cx| {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index ed1b935c58..c4499aff07 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1516,12 +1516,11 @@ impl App {
     /// the bindings in the element tree, and any global action listeners.
     pub fn is_action_available(&mut self, action: &dyn Action) -> bool {
         let mut action_available = false;
-        if let Some(window) = self.active_window() {
-            if let Ok(window_action_available) =
+        if let Some(window) = self.active_window()
+            && let Ok(window_action_available) =
                 window.update(self, |_, window, cx| window.is_action_available(action, cx))
-            {
-                action_available = window_action_available;
-            }
+        {
+            action_available = window_action_available;
         }
 
         action_available
@@ -1606,27 +1605,26 @@ impl App {
                 .insert(action.as_any().type_id(), global_listeners);
         }
 
-        if self.propagate_event {
-            if let Some(mut global_listeners) = self
+        if self.propagate_event
+            && let Some(mut global_listeners) = self
                 .global_action_listeners
                 .remove(&action.as_any().type_id())
-            {
-                for listener in global_listeners.iter().rev() {
-                    listener(action.as_any(), DispatchPhase::Bubble, self);
-                    if !self.propagate_event {
-                        break;
-                    }
+        {
+            for listener in global_listeners.iter().rev() {
+                listener(action.as_any(), DispatchPhase::Bubble, self);
+                if !self.propagate_event {
+                    break;
                 }
-
-                global_listeners.extend(
-                    self.global_action_listeners
-                        .remove(&action.as_any().type_id())
-                        .unwrap_or_default(),
-                );
-
-                self.global_action_listeners
-                    .insert(action.as_any().type_id(), global_listeners);
             }
+
+            global_listeners.extend(
+                self.global_action_listeners
+                    .remove(&action.as_any().type_id())
+                    .unwrap_or_default(),
+            );
+
+            self.global_action_listeners
+                .insert(action.as_any().type_id(), global_listeners);
         }
     }
 
diff --git a/crates/gpui/src/app/context.rs b/crates/gpui/src/app/context.rs
index 68c41592b3..a6ab026770 100644
--- a/crates/gpui/src/app/context.rs
+++ b/crates/gpui/src/app/context.rs
@@ -610,16 +610,16 @@ impl<'a, T: 'static> Context<'a, T> {
         let (subscription, activate) =
             window.new_focus_listener(Box::new(move |event, window, cx| {
                 view.update(cx, |view, cx| {
-                    if let Some(blurred_id) = event.previous_focus_path.last().copied() {
-                        if event.is_focus_out(focus_id) {
-                            let event = FocusOutEvent {
-                                blurred: WeakFocusHandle {
-                                    id: blurred_id,
-                                    handles: Arc::downgrade(&cx.focus_handles),
-                                },
-                            };
-                            listener(view, event, window, cx)
-                        }
+                    if let Some(blurred_id) = event.previous_focus_path.last().copied()
+                        && event.is_focus_out(focus_id)
+                    {
+                        let event = FocusOutEvent {
+                            blurred: WeakFocusHandle {
+                                id: blurred_id,
+                                handles: Arc::downgrade(&cx.focus_handles),
+                            },
+                        };
+                        listener(view, event, window, cx)
                     }
                 })
                 .is_ok()
diff --git a/crates/gpui/src/element.rs b/crates/gpui/src/element.rs
index e5f49c7be1..f537bc5ac8 100644
--- a/crates/gpui/src/element.rs
+++ b/crates/gpui/src/element.rs
@@ -603,10 +603,8 @@ impl AnyElement {
 
         self.0.prepaint(window, cx);
 
-        if !focus_assigned {
-            if let Some(focus_id) = window.next_frame.focus {
-                return FocusHandle::for_id(focus_id, &cx.focus_handles);
-            }
+        if !focus_assigned && let Some(focus_id) = window.next_frame.focus {
+            return FocusHandle::for_id(focus_id, &cx.focus_handles);
         }
 
         None
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index f553bf55f6..7b689ca0ad 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -286,21 +286,20 @@ impl Interactivity {
     {
         self.mouse_move_listeners
             .push(Box::new(move |event, phase, hitbox, window, cx| {
-                if phase == DispatchPhase::Capture {
-                    if let Some(drag) = &cx.active_drag {
-                        if drag.value.as_ref().type_id() == TypeId::of::<T>() {
-                            (listener)(
-                                &DragMoveEvent {
-                                    event: event.clone(),
-                                    bounds: hitbox.bounds,
-                                    drag: PhantomData,
-                                    dragged_item: Arc::clone(&drag.value),
-                                },
-                                window,
-                                cx,
-                            );
-                        }
-                    }
+                if phase == DispatchPhase::Capture
+                    && let Some(drag) = &cx.active_drag
+                    && drag.value.as_ref().type_id() == TypeId::of::<T>()
+                {
+                    (listener)(
+                        &DragMoveEvent {
+                            event: event.clone(),
+                            bounds: hitbox.bounds,
+                            drag: PhantomData,
+                            dragged_item: Arc::clone(&drag.value),
+                        },
+                        window,
+                        cx,
+                    );
                 }
             }));
     }
@@ -1514,15 +1513,14 @@ impl Interactivity {
                 let mut element_state =
                     element_state.map(|element_state| element_state.unwrap_or_default());
 
-                if let Some(element_state) = element_state.as_ref() {
-                    if cx.has_active_drag() {
-                        if let Some(pending_mouse_down) = element_state.pending_mouse_down.as_ref()
-                        {
-                            *pending_mouse_down.borrow_mut() = None;
-                        }
-                        if let Some(clicked_state) = element_state.clicked_state.as_ref() {
-                            *clicked_state.borrow_mut() = ElementClickedState::default();
-                        }
+                if let Some(element_state) = element_state.as_ref()
+                    && cx.has_active_drag()
+                {
+                    if let Some(pending_mouse_down) = element_state.pending_mouse_down.as_ref() {
+                        *pending_mouse_down.borrow_mut() = None;
+                    }
+                    if let Some(clicked_state) = element_state.clicked_state.as_ref() {
+                        *clicked_state.borrow_mut() = ElementClickedState::default();
                     }
                 }
 
@@ -1530,35 +1528,35 @@ impl Interactivity {
                 // If there's an explicit focus handle we're tracking, use that. Otherwise
                 // create a new handle and store it in the element state, which lives for as
                 // as frames contain an element with this id.
-                if self.focusable && self.tracked_focus_handle.is_none() {
-                    if let Some(element_state) = element_state.as_mut() {
-                        let mut handle = element_state
-                            .focus_handle
-                            .get_or_insert_with(|| cx.focus_handle())
-                            .clone()
-                            .tab_stop(false);
+                if self.focusable
+                    && self.tracked_focus_handle.is_none()
+                    && let Some(element_state) = element_state.as_mut()
+                {
+                    let mut handle = element_state
+                        .focus_handle
+                        .get_or_insert_with(|| cx.focus_handle())
+                        .clone()
+                        .tab_stop(false);
 
-                        if let Some(index) = self.tab_index {
-                            handle = handle.tab_index(index).tab_stop(true);
-                        }
-
-                        self.tracked_focus_handle = Some(handle);
+                    if let Some(index) = self.tab_index {
+                        handle = handle.tab_index(index).tab_stop(true);
                     }
+
+                    self.tracked_focus_handle = Some(handle);
                 }
 
                 if let Some(scroll_handle) = self.tracked_scroll_handle.as_ref() {
                     self.scroll_offset = Some(scroll_handle.0.borrow().offset.clone());
-                } else if self.base_style.overflow.x == Some(Overflow::Scroll)
-                    || self.base_style.overflow.y == Some(Overflow::Scroll)
+                } else if (self.base_style.overflow.x == Some(Overflow::Scroll)
+                    || self.base_style.overflow.y == Some(Overflow::Scroll))
+                    && let Some(element_state) = element_state.as_mut()
                 {
-                    if let Some(element_state) = element_state.as_mut() {
-                        self.scroll_offset = Some(
-                            element_state
-                                .scroll_offset
-                                .get_or_insert_with(Rc::default)
-                                .clone(),
-                        );
-                    }
+                    self.scroll_offset = Some(
+                        element_state
+                            .scroll_offset
+                            .get_or_insert_with(Rc::default)
+                            .clone(),
+                    );
                 }
 
                 let style = self.compute_style_internal(None, element_state.as_mut(), window, cx);
@@ -2031,26 +2029,27 @@ impl Interactivity {
             let hitbox = hitbox.clone();
             window.on_mouse_event({
                 move |_: &MouseUpEvent, phase, window, cx| {
-                    if let Some(drag) = &cx.active_drag {
-                        if phase == DispatchPhase::Bubble && hitbox.is_hovered(window) {
-                            let drag_state_type = drag.value.as_ref().type_id();
-                            for (drop_state_type, listener) in &drop_listeners {
-                                if *drop_state_type == drag_state_type {
-                                    let drag = cx
-                                        .active_drag
-                                        .take()
-                                        .expect("checked for type drag state type above");
+                    if let Some(drag) = &cx.active_drag
+                        && phase == DispatchPhase::Bubble
+                        && hitbox.is_hovered(window)
+                    {
+                        let drag_state_type = drag.value.as_ref().type_id();
+                        for (drop_state_type, listener) in &drop_listeners {
+                            if *drop_state_type == drag_state_type {
+                                let drag = cx
+                                    .active_drag
+                                    .take()
+                                    .expect("checked for type drag state type above");
 
-                                    let mut can_drop = true;
-                                    if let Some(predicate) = &can_drop_predicate {
-                                        can_drop = predicate(drag.value.as_ref(), window, cx);
-                                    }
+                                let mut can_drop = true;
+                                if let Some(predicate) = &can_drop_predicate {
+                                    can_drop = predicate(drag.value.as_ref(), window, cx);
+                                }
 
-                                    if can_drop {
-                                        listener(drag.value.as_ref(), window, cx);
-                                        window.refresh();
-                                        cx.stop_propagation();
-                                    }
+                                if can_drop {
+                                    listener(drag.value.as_ref(), window, cx);
+                                    window.refresh();
+                                    cx.stop_propagation();
                                 }
                             }
                         }
@@ -2094,31 +2093,24 @@ impl Interactivity {
                         }
 
                         let mut pending_mouse_down = pending_mouse_down.borrow_mut();
-                        if let Some(mouse_down) = pending_mouse_down.clone() {
-                            if !cx.has_active_drag()
-                                && (event.position - mouse_down.position).magnitude()
-                                    > DRAG_THRESHOLD
-                            {
-                                if let Some((drag_value, drag_listener)) = drag_listener.take() {
-                                    *clicked_state.borrow_mut() = ElementClickedState::default();
-                                    let cursor_offset = event.position - hitbox.origin;
-                                    let drag = (drag_listener)(
-                                        drag_value.as_ref(),
-                                        cursor_offset,
-                                        window,
-                                        cx,
-                                    );
-                                    cx.active_drag = Some(AnyDrag {
-                                        view: drag,
-                                        value: drag_value,
-                                        cursor_offset,
-                                        cursor_style: drag_cursor_style,
-                                    });
-                                    pending_mouse_down.take();
-                                    window.refresh();
-                                    cx.stop_propagation();
-                                }
-                            }
+                        if let Some(mouse_down) = pending_mouse_down.clone()
+                            && !cx.has_active_drag()
+                            && (event.position - mouse_down.position).magnitude() > DRAG_THRESHOLD
+                            && let Some((drag_value, drag_listener)) = drag_listener.take()
+                        {
+                            *clicked_state.borrow_mut() = ElementClickedState::default();
+                            let cursor_offset = event.position - hitbox.origin;
+                            let drag =
+                                (drag_listener)(drag_value.as_ref(), cursor_offset, window, cx);
+                            cx.active_drag = Some(AnyDrag {
+                                view: drag,
+                                value: drag_value,
+                                cursor_offset,
+                                cursor_style: drag_cursor_style,
+                            });
+                            pending_mouse_down.take();
+                            window.refresh();
+                            cx.stop_propagation();
                         }
                     }
                 });
@@ -2428,33 +2420,32 @@ impl Interactivity {
         style.refine(&self.base_style);
 
         if let Some(focus_handle) = self.tracked_focus_handle.as_ref() {
-            if let Some(in_focus_style) = self.in_focus_style.as_ref() {
-                if focus_handle.within_focused(window, cx) {
-                    style.refine(in_focus_style);
-                }
+            if let Some(in_focus_style) = self.in_focus_style.as_ref()
+                && focus_handle.within_focused(window, cx)
+            {
+                style.refine(in_focus_style);
             }
 
-            if let Some(focus_style) = self.focus_style.as_ref() {
-                if focus_handle.is_focused(window) {
-                    style.refine(focus_style);
-                }
+            if let Some(focus_style) = self.focus_style.as_ref()
+                && focus_handle.is_focused(window)
+            {
+                style.refine(focus_style);
             }
         }
 
         if let Some(hitbox) = hitbox {
             if !cx.has_active_drag() {
-                if let Some(group_hover) = self.group_hover_style.as_ref() {
-                    if let Some(group_hitbox_id) = GroupHitboxes::get(&group_hover.group, cx) {
-                        if group_hitbox_id.is_hovered(window) {
-                            style.refine(&group_hover.style);
-                        }
-                    }
+                if let Some(group_hover) = self.group_hover_style.as_ref()
+                    && let Some(group_hitbox_id) = GroupHitboxes::get(&group_hover.group, cx)
+                    && group_hitbox_id.is_hovered(window)
+                {
+                    style.refine(&group_hover.style);
                 }
 
-                if let Some(hover_style) = self.hover_style.as_ref() {
-                    if hitbox.is_hovered(window) {
-                        style.refine(hover_style);
-                    }
+                if let Some(hover_style) = self.hover_style.as_ref()
+                    && hitbox.is_hovered(window)
+                {
+                    style.refine(hover_style);
                 }
             }
 
@@ -2468,12 +2459,10 @@ impl Interactivity {
                     for (state_type, group_drag_style) in &self.group_drag_over_styles {
                         if let Some(group_hitbox_id) =
                             GroupHitboxes::get(&group_drag_style.group, cx)
+                            && *state_type == drag.value.as_ref().type_id()
+                            && group_hitbox_id.is_hovered(window)
                         {
-                            if *state_type == drag.value.as_ref().type_id()
-                                && group_hitbox_id.is_hovered(window)
-                            {
-                                style.refine(&group_drag_style.style);
-                            }
+                            style.refine(&group_drag_style.style);
                         }
                     }
 
@@ -2495,16 +2484,16 @@ impl Interactivity {
                 .clicked_state
                 .get_or_insert_with(Default::default)
                 .borrow();
-            if clicked_state.group {
-                if let Some(group) = self.group_active_style.as_ref() {
-                    style.refine(&group.style)
-                }
+            if clicked_state.group
+                && let Some(group) = self.group_active_style.as_ref()
+            {
+                style.refine(&group.style)
             }
 
-            if let Some(active_style) = self.active_style.as_ref() {
-                if clicked_state.element {
-                    style.refine(active_style)
-                }
+            if let Some(active_style) = self.active_style.as_ref()
+                && clicked_state.element
+            {
+                style.refine(active_style)
             }
         }
 
diff --git a/crates/gpui/src/elements/image_cache.rs b/crates/gpui/src/elements/image_cache.rs
index e7bdeaf9eb..263f0aafc2 100644
--- a/crates/gpui/src/elements/image_cache.rs
+++ b/crates/gpui/src/elements/image_cache.rs
@@ -297,10 +297,10 @@ impl RetainAllImageCache {
     /// Remove the image from the cache by the given source.
     pub fn remove(&mut self, source: &Resource, window: &mut Window, cx: &mut App) {
         let hash = hash(source);
-        if let Some(mut item) = self.0.remove(&hash) {
-            if let Some(Ok(image)) = item.get() {
-                cx.drop_image(image, Some(window));
-            }
+        if let Some(mut item) = self.0.remove(&hash)
+            && let Some(Ok(image)) = item.get()
+        {
+            cx.drop_image(image, Some(window));
         }
     }
 
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index 993b319b69..ae63819ca2 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -379,13 +379,12 @@ impl Element for Img {
                         None => {
                             if let Some(state) = &mut state {
                                 if let Some((started_loading, _)) = state.started_loading {
-                                    if started_loading.elapsed() > LOADING_DELAY {
-                                        if let Some(loading) = self.style.loading.as_ref() {
-                                            let mut element = loading();
-                                            replacement_id =
-                                                Some(element.request_layout(window, cx));
-                                            layout_state.replacement = Some(element);
-                                        }
+                                    if started_loading.elapsed() > LOADING_DELAY
+                                        && let Some(loading) = self.style.loading.as_ref()
+                                    {
+                                        let mut element = loading();
+                                        replacement_id = Some(element.request_layout(window, cx));
+                                        layout_state.replacement = Some(element);
                                     }
                                 } else {
                                     let current_view = window.current_view();
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 39f38bdc69..98b63ef907 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -732,46 +732,44 @@ impl StateInner {
                         item.element.prepaint_at(item_origin, window, cx);
                     });
 
-                    if let Some(autoscroll_bounds) = window.take_autoscroll() {
-                        if autoscroll {
-                            if autoscroll_bounds.top() < bounds.top() {
-                                return Err(ListOffset {
-                                    item_ix: item.index,
-                                    offset_in_item: autoscroll_bounds.top() - item_origin.y,
-                                });
-                            } else if autoscroll_bounds.bottom() > bounds.bottom() {
-                                let mut cursor = self.items.cursor::<Count>(&());
-                                cursor.seek(&Count(item.index), Bias::Right);
-                                let mut height = bounds.size.height - padding.top - padding.bottom;
-
-                                // Account for the height of the element down until the autoscroll bottom.
-                                height -= autoscroll_bounds.bottom() - item_origin.y;
-
-                                // Keep decreasing the scroll top until we fill all the available space.
-                                while height > Pixels::ZERO {
-                                    cursor.prev();
-                                    let Some(item) = cursor.item() else { break };
-
-                                    let size = item.size().unwrap_or_else(|| {
-                                        let mut item = render_item(cursor.start().0, window, cx);
-                                        let item_available_size = size(
-                                            bounds.size.width.into(),
-                                            AvailableSpace::MinContent,
-                                        );
-                                        item.layout_as_root(item_available_size, window, cx)
-                                    });
-                                    height -= size.height;
-                                }
-
-                                return Err(ListOffset {
-                                    item_ix: cursor.start().0,
-                                    offset_in_item: if height < Pixels::ZERO {
-                                        -height
-                                    } else {
-                                        Pixels::ZERO
-                                    },
+                    if let Some(autoscroll_bounds) = window.take_autoscroll()
+                        && autoscroll
+                    {
+                        if autoscroll_bounds.top() < bounds.top() {
+                            return Err(ListOffset {
+                                item_ix: item.index,
+                                offset_in_item: autoscroll_bounds.top() - item_origin.y,
+                            });
+                        } else if autoscroll_bounds.bottom() > bounds.bottom() {
+                            let mut cursor = self.items.cursor::<Count>(&());
+                            cursor.seek(&Count(item.index), Bias::Right);
+                            let mut height = bounds.size.height - padding.top - padding.bottom;
+
+                            // Account for the height of the element down until the autoscroll bottom.
+                            height -= autoscroll_bounds.bottom() - item_origin.y;
+
+                            // Keep decreasing the scroll top until we fill all the available space.
+                            while height > Pixels::ZERO {
+                                cursor.prev();
+                                let Some(item) = cursor.item() else { break };
+
+                                let size = item.size().unwrap_or_else(|| {
+                                    let mut item = render_item(cursor.start().0, window, cx);
+                                    let item_available_size =
+                                        size(bounds.size.width.into(), AvailableSpace::MinContent);
+                                    item.layout_as_root(item_available_size, window, cx)
                                 });
+                                height -= size.height;
                             }
+
+                            return Err(ListOffset {
+                                item_ix: cursor.start().0,
+                                offset_in_item: if height < Pixels::ZERO {
+                                    -height
+                                } else {
+                                    Pixels::ZERO
+                                },
+                            });
                         }
                     }
 
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 014f617e2c..c58f72267c 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -356,12 +356,11 @@ impl TextLayout {
                         (None, "".into())
                     };
 
-                if let Some(text_layout) = element_state.0.borrow().as_ref() {
-                    if text_layout.size.is_some()
-                        && (wrap_width.is_none() || wrap_width == text_layout.wrap_width)
-                    {
-                        return text_layout.size.unwrap();
-                    }
+                if let Some(text_layout) = element_state.0.borrow().as_ref()
+                    && text_layout.size.is_some()
+                    && (wrap_width.is_none() || wrap_width == text_layout.wrap_width)
+                {
+                    return text_layout.size.unwrap();
                 }
 
                 let mut line_wrapper = cx.text_system().line_wrapper(text_style.font(), font_size);
@@ -763,14 +762,13 @@ impl Element for InteractiveText {
                 let mut interactive_state = interactive_state.unwrap_or_default();
                 if let Some(click_listener) = self.click_listener.take() {
                     let mouse_position = window.mouse_position();
-                    if let Ok(ix) = text_layout.index_for_position(mouse_position) {
-                        if self
+                    if let Ok(ix) = text_layout.index_for_position(mouse_position)
+                        && self
                             .clickable_ranges
                             .iter()
                             .any(|range| range.contains(&ix))
-                        {
-                            window.set_cursor_style(crate::CursorStyle::PointingHand, hitbox)
-                        }
+                    {
+                        window.set_cursor_style(crate::CursorStyle::PointingHand, hitbox)
                     }
 
                     let text_layout = text_layout.clone();
@@ -803,13 +801,13 @@ impl Element for InteractiveText {
                     } else {
                         let hitbox = hitbox.clone();
                         window.on_mouse_event(move |event: &MouseDownEvent, phase, window, _| {
-                            if phase == DispatchPhase::Bubble && hitbox.is_hovered(window) {
-                                if let Ok(mouse_down_index) =
+                            if phase == DispatchPhase::Bubble
+                                && hitbox.is_hovered(window)
+                                && let Ok(mouse_down_index) =
                                     text_layout.index_for_position(event.position)
-                                {
-                                    mouse_down.set(Some(mouse_down_index));
-                                    window.refresh();
-                                }
+                            {
+                                mouse_down.set(Some(mouse_down_index));
+                                window.refresh();
                             }
                         });
                     }
diff --git a/crates/gpui/src/keymap/binding.rs b/crates/gpui/src/keymap/binding.rs
index 1d3f612c5b..6d36cbb4e0 100644
--- a/crates/gpui/src/keymap/binding.rs
+++ b/crates/gpui/src/keymap/binding.rs
@@ -53,10 +53,10 @@ impl KeyBinding {
 
         if let Some(equivalents) = key_equivalents {
             for keystroke in keystrokes.iter_mut() {
-                if keystroke.key.chars().count() == 1 {
-                    if let Some(key) = equivalents.get(&keystroke.key.chars().next().unwrap()) {
-                        keystroke.key = key.to_string();
-                    }
+                if keystroke.key.chars().count() == 1
+                    && let Some(key) = equivalents.get(&keystroke.key.chars().next().unwrap())
+                {
+                    keystroke.key = key.to_string();
                 }
             }
         }
diff --git a/crates/gpui/src/platform/blade/blade_renderer.rs b/crates/gpui/src/platform/blade/blade_renderer.rs
index 46d3c16c72..cc1df7748b 100644
--- a/crates/gpui/src/platform/blade/blade_renderer.rs
+++ b/crates/gpui/src/platform/blade/blade_renderer.rs
@@ -434,24 +434,24 @@ impl BladeRenderer {
     }
 
     fn wait_for_gpu(&mut self) {
-        if let Some(last_sp) = self.last_sync_point.take() {
-            if !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) {
-                log::error!("GPU hung");
-                #[cfg(target_os = "linux")]
-                if self.gpu.device_information().driver_name == "radv" {
-                    log::error!(
-                        "there's a known bug with amdgpu/radv, try setting ZED_PATH_SAMPLE_COUNT=0 as a workaround"
-                    );
-                    log::error!(
-                        "if that helps you're running into https://github.com/zed-industries/zed/issues/26143"
-                    );
-                }
+        if let Some(last_sp) = self.last_sync_point.take()
+            && !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS)
+        {
+            log::error!("GPU hung");
+            #[cfg(target_os = "linux")]
+            if self.gpu.device_information().driver_name == "radv" {
                 log::error!(
-                    "your device information is: {:?}",
-                    self.gpu.device_information()
+                    "there's a known bug with amdgpu/radv, try setting ZED_PATH_SAMPLE_COUNT=0 as a workaround"
+                );
+                log::error!(
+                    "if that helps you're running into https://github.com/zed-industries/zed/issues/26143"
                 );
-                while !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) {}
             }
+            log::error!(
+                "your device information is: {:?}",
+                self.gpu.device_information()
+            );
+            while !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) {}
         }
     }
 
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 0ab61fbf0c..d1aa590192 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -359,13 +359,13 @@ impl WaylandClientStatePtr {
             }
             changed
         };
-        if changed {
-            if let Some(mut callback) = state.common.callbacks.keyboard_layout_change.take() {
-                drop(state);
-                callback();
-                state = client.borrow_mut();
-                state.common.callbacks.keyboard_layout_change = Some(callback);
-            }
+
+        if changed && let Some(mut callback) = state.common.callbacks.keyboard_layout_change.take()
+        {
+            drop(state);
+            callback();
+            state = client.borrow_mut();
+            state.common.callbacks.keyboard_layout_change = Some(callback);
         }
     }
 
@@ -373,15 +373,15 @@ impl WaylandClientStatePtr {
         let mut client = self.get_client();
         let mut state = client.borrow_mut();
         let closed_window = state.windows.remove(surface_id).unwrap();
-        if let Some(window) = state.mouse_focused_window.take() {
-            if !window.ptr_eq(&closed_window) {
-                state.mouse_focused_window = Some(window);
-            }
+        if let Some(window) = state.mouse_focused_window.take()
+            && !window.ptr_eq(&closed_window)
+        {
+            state.mouse_focused_window = Some(window);
         }
-        if let Some(window) = state.keyboard_focused_window.take() {
-            if !window.ptr_eq(&closed_window) {
-                state.keyboard_focused_window = Some(window);
-            }
+        if let Some(window) = state.keyboard_focused_window.take()
+            && !window.ptr_eq(&closed_window)
+        {
+            state.keyboard_focused_window = Some(window);
         }
         if state.windows.is_empty() {
             state.common.signal.stop();
@@ -1784,17 +1784,17 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                             drop(state);
                             window.handle_input(input);
                         }
-                    } else if let Some(discrete) = discrete {
-                        if let Some(window) = state.mouse_focused_window.clone() {
-                            let input = PlatformInput::ScrollWheel(ScrollWheelEvent {
-                                position: state.mouse_location.unwrap(),
-                                delta: ScrollDelta::Lines(discrete),
-                                modifiers: state.modifiers,
-                                touch_phase: TouchPhase::Moved,
-                            });
-                            drop(state);
-                            window.handle_input(input);
-                        }
+                    } else if let Some(discrete) = discrete
+                        && let Some(window) = state.mouse_focused_window.clone()
+                    {
+                        let input = PlatformInput::ScrollWheel(ScrollWheelEvent {
+                            position: state.mouse_location.unwrap(),
+                            delta: ScrollDelta::Lines(discrete),
+                            modifiers: state.modifiers,
+                            touch_phase: TouchPhase::Moved,
+                        });
+                        drop(state);
+                        window.handle_input(input);
                     }
                 }
             }
diff --git a/crates/gpui/src/platform/linux/wayland/cursor.rs b/crates/gpui/src/platform/linux/wayland/cursor.rs
index bfbedf234d..a21263ccfe 100644
--- a/crates/gpui/src/platform/linux/wayland/cursor.rs
+++ b/crates/gpui/src/platform/linux/wayland/cursor.rs
@@ -45,10 +45,11 @@ impl Cursor {
     }
 
     fn set_theme_internal(&mut self, theme_name: Option<String>) {
-        if let Some(loaded_theme) = self.loaded_theme.as_ref() {
-            if loaded_theme.name == theme_name && loaded_theme.scaled_size == self.scaled_size {
-                return;
-            }
+        if let Some(loaded_theme) = self.loaded_theme.as_ref()
+            && loaded_theme.name == theme_name
+            && loaded_theme.scaled_size == self.scaled_size
+        {
+            return;
         }
         let result = if let Some(theme_name) = theme_name.as_ref() {
             CursorTheme::load_from_name(
diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs
index 2b2207e22c..7cf2d02d3b 100644
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -713,21 +713,20 @@ impl WaylandWindowStatePtr {
     }
 
     pub fn handle_input(&self, input: PlatformInput) {
-        if let Some(ref mut fun) = self.callbacks.borrow_mut().input {
-            if !fun(input.clone()).propagate {
-                return;
-            }
+        if let Some(ref mut fun) = self.callbacks.borrow_mut().input
+            && !fun(input.clone()).propagate
+        {
+            return;
         }
-        if let PlatformInput::KeyDown(event) = input {
-            if event.keystroke.modifiers.is_subset_of(&Modifiers::shift()) {
-                if let Some(key_char) = &event.keystroke.key_char {
-                    let mut state = self.state.borrow_mut();
-                    if let Some(mut input_handler) = state.input_handler.take() {
-                        drop(state);
-                        input_handler.replace_text_in_range(None, key_char);
-                        self.state.borrow_mut().input_handler = Some(input_handler);
-                    }
-                }
+        if let PlatformInput::KeyDown(event) = input
+            && event.keystroke.modifiers.is_subset_of(&Modifiers::shift())
+            && let Some(key_char) = &event.keystroke.key_char
+        {
+            let mut state = self.state.borrow_mut();
+            if let Some(mut input_handler) = state.input_handler.take() {
+                drop(state);
+                input_handler.replace_text_in_range(None, key_char);
+                self.state.borrow_mut().input_handler = Some(input_handler);
             }
         }
     }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index dd0cea3290..b4914c9dd2 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -565,10 +565,10 @@ impl X11Client {
                                     events.push(last_keymap_change_event);
                                 }
 
-                                if let Some(last_press) = last_key_press.as_ref() {
-                                    if last_press.detail == key_press.detail {
-                                        continue;
-                                    }
+                                if let Some(last_press) = last_key_press.as_ref()
+                                    && last_press.detail == key_press.detail
+                                {
+                                    continue;
                                 }
 
                                 if let Some(Event::KeyRelease(key_release)) =
@@ -2035,12 +2035,11 @@ fn xdnd_get_supported_atom(
         ),
     )
     .log_with_level(Level::Warn)
+        && let Some(atoms) = reply.value32()
     {
-        if let Some(atoms) = reply.value32() {
-            for atom in atoms {
-                if xdnd_is_atom_supported(atom, supported_atoms) {
-                    return atom;
-                }
+        for atom in atoms {
+            if xdnd_is_atom_supported(atom, supported_atoms) {
+                return atom;
             }
         }
     }
@@ -2411,11 +2410,13 @@ fn legacy_get_randr_scale_factor(connection: &XCBConnection, root: u32) -> Optio
     let mut crtc_infos: HashMap<randr::Crtc, randr::GetCrtcInfoReply> = HashMap::default();
     let mut valid_outputs: HashSet<randr::Output> = HashSet::new();
     for (crtc, cookie) in crtc_cookies {
-        if let Ok(reply) = cookie.reply() {
-            if reply.width > 0 && reply.height > 0 && !reply.outputs.is_empty() {
-                crtc_infos.insert(crtc, reply.clone());
-                valid_outputs.extend(&reply.outputs);
-            }
+        if let Ok(reply) = cookie.reply()
+            && reply.width > 0
+            && reply.height > 0
+            && !reply.outputs.is_empty()
+        {
+            crtc_infos.insert(crtc, reply.clone());
+            valid_outputs.extend(&reply.outputs);
         }
     }
 
diff --git a/crates/gpui/src/platform/linux/x11/clipboard.rs b/crates/gpui/src/platform/linux/x11/clipboard.rs
index 5d42eadaaf..5b32f2c93e 100644
--- a/crates/gpui/src/platform/linux/x11/clipboard.rs
+++ b/crates/gpui/src/platform/linux/x11/clipboard.rs
@@ -1120,25 +1120,25 @@ impl Drop for Clipboard {
                 log::error!("Failed to flush the clipboard window. Error: {}", e);
                 return;
             }
-            if let Some(global_cb) = global_cb {
-                if let Err(e) = global_cb.server_handle.join() {
-                    // Let's try extracting the error message
-                    let message;
-                    if let Some(msg) = e.downcast_ref::<&'static str>() {
-                        message = Some((*msg).to_string());
-                    } else if let Some(msg) = e.downcast_ref::<String>() {
-                        message = Some(msg.clone());
-                    } else {
-                        message = None;
-                    }
-                    if let Some(message) = message {
-                        log::error!(
-                            "The clipboard server thread panicked. Panic message: '{}'",
-                            message,
-                        );
-                    } else {
-                        log::error!("The clipboard server thread panicked.");
-                    }
+            if let Some(global_cb) = global_cb
+                && let Err(e) = global_cb.server_handle.join()
+            {
+                // Let's try extracting the error message
+                let message;
+                if let Some(msg) = e.downcast_ref::<&'static str>() {
+                    message = Some((*msg).to_string());
+                } else if let Some(msg) = e.downcast_ref::<String>() {
+                    message = Some(msg.clone());
+                } else {
+                    message = None;
+                }
+                if let Some(message) = message {
+                    log::error!(
+                        "The clipboard server thread panicked. Panic message: '{}'",
+                        message,
+                    );
+                } else {
+                    log::error!("The clipboard server thread panicked.");
                 }
             }
         }
diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs
index 2bf58d6184..c33d6fa462 100644
--- a/crates/gpui/src/platform/linux/x11/window.rs
+++ b/crates/gpui/src/platform/linux/x11/window.rs
@@ -515,19 +515,19 @@ impl X11WindowState {
                     xcb.configure_window(x_window, &xproto::ConfigureWindowAux::new().x(x).y(y)),
                 )?;
             }
-            if let Some(titlebar) = params.titlebar {
-                if let Some(title) = titlebar.title {
-                    check_reply(
-                        || "X11 ChangeProperty8 on window title failed.",
-                        xcb.change_property8(
-                            xproto::PropMode::REPLACE,
-                            x_window,
-                            xproto::AtomEnum::WM_NAME,
-                            xproto::AtomEnum::STRING,
-                            title.as_bytes(),
-                        ),
-                    )?;
-                }
+            if let Some(titlebar) = params.titlebar
+                && let Some(title) = titlebar.title
+            {
+                check_reply(
+                    || "X11 ChangeProperty8 on window title failed.",
+                    xcb.change_property8(
+                        xproto::PropMode::REPLACE,
+                        x_window,
+                        xproto::AtomEnum::WM_NAME,
+                        xproto::AtomEnum::STRING,
+                        title.as_bytes(),
+                    ),
+                )?;
             }
             if params.kind == WindowKind::PopUp {
                 check_reply(
@@ -956,10 +956,10 @@ impl X11WindowStatePtr {
     }
 
     pub fn handle_input(&self, input: PlatformInput) {
-        if let Some(ref mut fun) = self.callbacks.borrow_mut().input {
-            if !fun(input.clone()).propagate {
-                return;
-            }
+        if let Some(ref mut fun) = self.callbacks.borrow_mut().input
+            && !fun(input.clone()).propagate
+        {
+            return;
         }
         if let PlatformInput::KeyDown(event) = input {
             // only allow shift modifier when inserting text
@@ -1068,15 +1068,14 @@ impl X11WindowStatePtr {
         }
 
         let mut callbacks = self.callbacks.borrow_mut();
-        if let Some((content_size, scale_factor)) = resize_args {
-            if let Some(ref mut fun) = callbacks.resize {
-                fun(content_size, scale_factor)
-            }
+        if let Some((content_size, scale_factor)) = resize_args
+            && let Some(ref mut fun) = callbacks.resize
+        {
+            fun(content_size, scale_factor)
         }
-        if !is_resize {
-            if let Some(ref mut fun) = callbacks.moved {
-                fun();
-            }
+
+        if !is_resize && let Some(ref mut fun) = callbacks.moved {
+            fun();
         }
 
         Ok(())
diff --git a/crates/gpui/src/platform/mac/open_type.rs b/crates/gpui/src/platform/mac/open_type.rs
index 2ae5e8f87a..37a29559fd 100644
--- a/crates/gpui/src/platform/mac/open_type.rs
+++ b/crates/gpui/src/platform/mac/open_type.rs
@@ -35,14 +35,14 @@ pub fn apply_features_and_fallbacks(
     unsafe {
         let mut keys = vec![kCTFontFeatureSettingsAttribute];
         let mut values = vec![generate_feature_array(features)];
-        if let Some(fallbacks) = fallbacks {
-            if !fallbacks.fallback_list().is_empty() {
-                keys.push(kCTFontCascadeListAttribute);
-                values.push(generate_fallback_array(
-                    fallbacks,
-                    font.native_font().as_concrete_TypeRef(),
-                ));
-            }
+        if let Some(fallbacks) = fallbacks
+            && !fallbacks.fallback_list().is_empty()
+        {
+            keys.push(kCTFontCascadeListAttribute);
+            values.push(generate_fallback_array(
+                fallbacks,
+                font.native_font().as_concrete_TypeRef(),
+            ));
         }
         let attrs = CFDictionaryCreate(
             kCFAllocatorDefault,
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index f094ed9f30..57dfa9c603 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -715,10 +715,10 @@ impl Platform for MacPlatform {
                             let urls = panel.URLs();
                             for i in 0..urls.count() {
                                 let url = urls.objectAtIndex(i);
-                                if url.isFileURL() == YES {
-                                    if let Ok(path) = ns_url_to_path(url) {
-                                        result.push(path)
-                                    }
+                                if url.isFileURL() == YES
+                                    && let Ok(path) = ns_url_to_path(url)
+                                {
+                                    result.push(path)
                                 }
                             }
                             Some(result)
@@ -786,15 +786,16 @@ impl Platform for MacPlatform {
                                     // This is conditional on OS version because I'd like to get rid of it, so that
                                     // you can manually create a file called `a.sql.s`. That said it seems better
                                     // to break that use-case than breaking `a.sql`.
-                                    if chunks.len() == 3 && chunks[1].starts_with(chunks[2]) {
-                                        if Self::os_version() >= SemanticVersion::new(15, 0, 0) {
-                                            let new_filename = OsStr::from_bytes(
-                                                &filename.as_bytes()
-                                                    [..chunks[0].len() + 1 + chunks[1].len()],
-                                            )
-                                            .to_owned();
-                                            result.set_file_name(&new_filename);
-                                        }
+                                    if chunks.len() == 3
+                                        && chunks[1].starts_with(chunks[2])
+                                        && Self::os_version() >= SemanticVersion::new(15, 0, 0)
+                                    {
+                                        let new_filename = OsStr::from_bytes(
+                                            &filename.as_bytes()
+                                                [..chunks[0].len() + 1 + chunks[1].len()],
+                                        )
+                                        .to_owned();
+                                        result.set_file_name(&new_filename);
                                     }
                                     return result;
                                 })
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 40a03b6c4a..b6f684a72c 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1478,18 +1478,18 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                 return YES;
             }
 
-            if key_down_event.is_held {
-                if let Some(key_char) = key_down_event.keystroke.key_char.as_ref() {
-                    let handled = with_input_handler(this, |input_handler| {
-                        if !input_handler.apple_press_and_hold_enabled() {
-                            input_handler.replace_text_in_range(None, key_char);
-                            return YES;
-                        }
-                        NO
-                    });
-                    if handled == Some(YES) {
+            if key_down_event.is_held
+                && let Some(key_char) = key_down_event.keystroke.key_char.as_ref()
+            {
+                let handled = with_input_handler(this, |input_handler| {
+                    if !input_handler.apple_press_and_hold_enabled() {
+                        input_handler.replace_text_in_range(None, key_char);
                         return YES;
                     }
+                    NO
+                });
+                if handled == Some(YES) {
+                    return YES;
                 }
             }
 
@@ -1624,10 +1624,10 @@ extern "C" fn handle_view_event(this: &Object, _: Sel, native_event: id) {
                     modifiers: prev_modifiers,
                     capslock: prev_capslock,
                 })) = &lock.previous_modifiers_changed_event
+                    && prev_modifiers == modifiers
+                    && prev_capslock == capslock
                 {
-                    if prev_modifiers == modifiers && prev_capslock == capslock {
-                        return;
-                    }
+                    return;
                 }
 
                 lock.previous_modifiers_changed_event = Some(event.clone());
@@ -1995,10 +1995,10 @@ extern "C" fn attributed_substring_for_proposed_range(
         let mut adjusted: Option<Range<usize>> = None;
 
         let selected_text = input_handler.text_for_range(range.clone(), &mut adjusted)?;
-        if let Some(adjusted) = adjusted {
-            if adjusted != range {
-                unsafe { (actual_range as *mut NSRange).write(NSRange::from(adjusted)) };
-            }
+        if let Some(adjusted) = adjusted
+            && adjusted != range
+        {
+            unsafe { (actual_range as *mut NSRange).write(NSRange::from(adjusted)) };
         }
         unsafe {
             let string: id = msg_send![class!(NSAttributedString), alloc];
@@ -2073,11 +2073,10 @@ extern "C" fn dragging_entered(this: &Object, _: Sel, dragging_info: id) -> NSDr
     let paths = external_paths_from_event(dragging_info);
     if let Some(event) =
         paths.map(|paths| PlatformInput::FileDrop(FileDropEvent::Entered { position, paths }))
+        && send_new_event(&window_state, event)
     {
-        if send_new_event(&window_state, event) {
-            window_state.lock().external_files_dragged = true;
-            return NSDragOperationCopy;
-        }
+        window_state.lock().external_files_dragged = true;
+        return NSDragOperationCopy;
     }
     NSDragOperationNone
 }
diff --git a/crates/gpui/src/platform/test/dispatcher.rs b/crates/gpui/src/platform/test/dispatcher.rs
index 16edabfa4b..bdc7834931 100644
--- a/crates/gpui/src/platform/test/dispatcher.rs
+++ b/crates/gpui/src/platform/test/dispatcher.rs
@@ -78,11 +78,11 @@ impl TestDispatcher {
             let state = self.state.lock();
             let next_due_time = state.delayed.first().map(|(time, _)| *time);
             drop(state);
-            if let Some(due_time) = next_due_time {
-                if due_time <= new_now {
-                    self.state.lock().time = due_time;
-                    continue;
-                }
+            if let Some(due_time) = next_due_time
+                && due_time <= new_now
+            {
+                self.state.lock().time = due_time;
+                continue;
             }
             break;
         }
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 69371bc8c4..2b4914baed 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -201,10 +201,10 @@ impl TestPlatform {
         executor
             .spawn(async move {
                 if let Some(previous_window) = previous_window {
-                    if let Some(window) = window.as_ref() {
-                        if Rc::ptr_eq(&previous_window.0, &window.0) {
-                            return;
-                        }
+                    if let Some(window) = window.as_ref()
+                        && Rc::ptr_eq(&previous_window.0, &window.0)
+                    {
+                        return;
                     }
                     previous_window.simulate_active_status_change(false);
                 }
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index 9b25ab360e..c3bb8bb22b 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -701,29 +701,28 @@ impl WindowsWindowInner {
         // Fix auto hide taskbar not showing. This solution is based on the approach
         // used by Chrome. However, it may result in one row of pixels being obscured
         // in our client area. But as Chrome says, "there seems to be no better solution."
-        if is_maximized {
-            if let Some(ref taskbar_position) = self
+        if is_maximized
+            && let Some(ref taskbar_position) = self
                 .state
                 .borrow()
                 .system_settings
                 .auto_hide_taskbar_position
-            {
-                // Fot the auto-hide taskbar, adjust in by 1 pixel on taskbar edge,
-                // so the window isn't treated as a "fullscreen app", which would cause
-                // the taskbar to disappear.
-                match taskbar_position {
-                    AutoHideTaskbarPosition::Left => {
-                        requested_client_rect[0].left += AUTO_HIDE_TASKBAR_THICKNESS_PX
-                    }
-                    AutoHideTaskbarPosition::Top => {
-                        requested_client_rect[0].top += AUTO_HIDE_TASKBAR_THICKNESS_PX
-                    }
-                    AutoHideTaskbarPosition::Right => {
-                        requested_client_rect[0].right -= AUTO_HIDE_TASKBAR_THICKNESS_PX
-                    }
-                    AutoHideTaskbarPosition::Bottom => {
-                        requested_client_rect[0].bottom -= AUTO_HIDE_TASKBAR_THICKNESS_PX
-                    }
+        {
+            // Fot the auto-hide taskbar, adjust in by 1 pixel on taskbar edge,
+            // so the window isn't treated as a "fullscreen app", which would cause
+            // the taskbar to disappear.
+            match taskbar_position {
+                AutoHideTaskbarPosition::Left => {
+                    requested_client_rect[0].left += AUTO_HIDE_TASKBAR_THICKNESS_PX
+                }
+                AutoHideTaskbarPosition::Top => {
+                    requested_client_rect[0].top += AUTO_HIDE_TASKBAR_THICKNESS_PX
+                }
+                AutoHideTaskbarPosition::Right => {
+                    requested_client_rect[0].right -= AUTO_HIDE_TASKBAR_THICKNESS_PX
+                }
+                AutoHideTaskbarPosition::Bottom => {
+                    requested_client_rect[0].bottom -= AUTO_HIDE_TASKBAR_THICKNESS_PX
                 }
             }
         }
@@ -1125,28 +1124,26 @@ impl WindowsWindowInner {
         // lParam is a pointer to a string that indicates the area containing the system parameter
         // that was changed.
         let parameter = PCWSTR::from_raw(lparam.0 as _);
-        if unsafe { !parameter.is_null() && !parameter.is_empty() } {
-            if let Some(parameter_string) = unsafe { parameter.to_string() }.log_err() {
-                log::info!("System settings changed: {}", parameter_string);
-                match parameter_string.as_str() {
-                    "ImmersiveColorSet" => {
-                        let new_appearance = system_appearance()
-                            .context(
-                                "unable to get system appearance when handling ImmersiveColorSet",
-                            )
-                            .log_err()?;
-                        let mut lock = self.state.borrow_mut();
-                        if new_appearance != lock.appearance {
-                            lock.appearance = new_appearance;
-                            let mut callback = lock.callbacks.appearance_changed.take()?;
-                            drop(lock);
-                            callback();
-                            self.state.borrow_mut().callbacks.appearance_changed = Some(callback);
-                            configure_dwm_dark_mode(handle, new_appearance);
-                        }
+        if unsafe { !parameter.is_null() && !parameter.is_empty() }
+            && let Some(parameter_string) = unsafe { parameter.to_string() }.log_err()
+        {
+            log::info!("System settings changed: {}", parameter_string);
+            match parameter_string.as_str() {
+                "ImmersiveColorSet" => {
+                    let new_appearance = system_appearance()
+                        .context("unable to get system appearance when handling ImmersiveColorSet")
+                        .log_err()?;
+                    let mut lock = self.state.borrow_mut();
+                    if new_appearance != lock.appearance {
+                        lock.appearance = new_appearance;
+                        let mut callback = lock.callbacks.appearance_changed.take()?;
+                        drop(lock);
+                        callback();
+                        self.state.borrow_mut().callbacks.appearance_changed = Some(callback);
+                        configure_dwm_dark_mode(handle, new_appearance);
                     }
-                    _ => {}
                 }
+                _ => {}
             }
         }
         Some(0)
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index 856187fa57..b13b9915f1 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -821,14 +821,14 @@ fn file_save_dialog(
     window: Option<HWND>,
 ) -> Result<Option<PathBuf>> {
     let dialog: IFileSaveDialog = unsafe { CoCreateInstance(&FileSaveDialog, None, CLSCTX_ALL)? };
-    if !directory.to_string_lossy().is_empty() {
-        if let Some(full_path) = directory.canonicalize().log_err() {
-            let full_path = SanitizedPath::from(full_path);
-            let full_path_string = full_path.to_string();
-            let path_item: IShellItem =
-                unsafe { SHCreateItemFromParsingName(&HSTRING::from(full_path_string), None)? };
-            unsafe { dialog.SetFolder(&path_item).log_err() };
-        }
+    if !directory.to_string_lossy().is_empty()
+        && let Some(full_path) = directory.canonicalize().log_err()
+    {
+        let full_path = SanitizedPath::from(full_path);
+        let full_path_string = full_path.to_string();
+        let path_item: IShellItem =
+            unsafe { SHCreateItemFromParsingName(&HSTRING::from(full_path_string), None)? };
+        unsafe { dialog.SetFolder(&path_item).log_err() };
     }
 
     if let Some(suggested_name) = suggested_name {
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index b48c3a2935..29af900b66 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -366,15 +366,14 @@ impl WindowTextSystem {
 
         let mut decoration_runs = SmallVec::<[DecorationRun; 32]>::new();
         for run in runs {
-            if let Some(last_run) = decoration_runs.last_mut() {
-                if last_run.color == run.color
-                    && last_run.underline == run.underline
-                    && last_run.strikethrough == run.strikethrough
-                    && last_run.background_color == run.background_color
-                {
-                    last_run.len += run.len as u32;
-                    continue;
-                }
+            if let Some(last_run) = decoration_runs.last_mut()
+                && last_run.color == run.color
+                && last_run.underline == run.underline
+                && last_run.strikethrough == run.strikethrough
+                && last_run.background_color == run.background_color
+            {
+                last_run.len += run.len as u32;
+                continue;
             }
             decoration_runs.push(DecorationRun {
                 len: run.len as u32,
@@ -492,14 +491,14 @@ impl WindowTextSystem {
         let mut split_lines = text.split('\n');
         let mut processed = false;
 
-        if let Some(first_line) = split_lines.next() {
-            if let Some(second_line) = split_lines.next() {
-                processed = true;
-                process_line(first_line.to_string().into());
-                process_line(second_line.to_string().into());
-                for line_text in split_lines {
-                    process_line(line_text.to_string().into());
-                }
+        if let Some(first_line) = split_lines.next()
+            && let Some(second_line) = split_lines.next()
+        {
+            processed = true;
+            process_line(first_line.to_string().into());
+            process_line(second_line.to_string().into());
+            for line_text in split_lines {
+                process_line(line_text.to_string().into());
             }
         }
 
@@ -534,11 +533,11 @@ impl WindowTextSystem {
         let mut font_runs = self.font_runs_pool.lock().pop().unwrap_or_default();
         for run in runs.iter() {
             let font_id = self.resolve_font(&run.font);
-            if let Some(last_run) = font_runs.last_mut() {
-                if last_run.font_id == font_id {
-                    last_run.len += run.len;
-                    continue;
-                }
+            if let Some(last_run) = font_runs.last_mut()
+                && last_run.font_id == font_id
+            {
+                last_run.len += run.len;
+                continue;
             }
             font_runs.push(FontRun {
                 len: run.len,
diff --git a/crates/gpui/src/text_system/line.rs b/crates/gpui/src/text_system/line.rs
index 3813393d81..8d559f9815 100644
--- a/crates/gpui/src/text_system/line.rs
+++ b/crates/gpui/src/text_system/line.rs
@@ -292,10 +292,10 @@ fn paint_line(
                     }
 
                     if let Some(style_run) = style_run {
-                        if let Some((_, underline_style)) = &mut current_underline {
-                            if style_run.underline.as_ref() != Some(underline_style) {
-                                finished_underline = current_underline.take();
-                            }
+                        if let Some((_, underline_style)) = &mut current_underline
+                            && style_run.underline.as_ref() != Some(underline_style)
+                        {
+                            finished_underline = current_underline.take();
                         }
                         if let Some(run_underline) = style_run.underline.as_ref() {
                             current_underline.get_or_insert((
@@ -310,10 +310,10 @@ fn paint_line(
                                 },
                             ));
                         }
-                        if let Some((_, strikethrough_style)) = &mut current_strikethrough {
-                            if style_run.strikethrough.as_ref() != Some(strikethrough_style) {
-                                finished_strikethrough = current_strikethrough.take();
-                            }
+                        if let Some((_, strikethrough_style)) = &mut current_strikethrough
+                            && style_run.strikethrough.as_ref() != Some(strikethrough_style)
+                        {
+                            finished_strikethrough = current_strikethrough.take();
                         }
                         if let Some(run_strikethrough) = style_run.strikethrough.as_ref() {
                             current_strikethrough.get_or_insert((
@@ -509,10 +509,10 @@ fn paint_line_background(
                     }
 
                     if let Some(style_run) = style_run {
-                        if let Some((_, background_color)) = &mut current_background {
-                            if style_run.background_color.as_ref() != Some(background_color) {
-                                finished_background = current_background.take();
-                            }
+                        if let Some((_, background_color)) = &mut current_background
+                            && style_run.background_color.as_ref() != Some(background_color)
+                        {
+                            finished_background = current_background.take();
                         }
                         if let Some(run_background) = style_run.background_color {
                             current_background.get_or_insert((
diff --git a/crates/gpui/src/text_system/line_layout.rs b/crates/gpui/src/text_system/line_layout.rs
index 9c2dd7f087..43694702a8 100644
--- a/crates/gpui/src/text_system/line_layout.rs
+++ b/crates/gpui/src/text_system/line_layout.rs
@@ -185,10 +185,10 @@ impl LineLayout {
 
             if width > wrap_width && boundary > last_boundary {
                 // When used line_clamp, we should limit the number of lines.
-                if let Some(max_lines) = max_lines {
-                    if boundaries.len() >= max_lines - 1 {
-                        break;
-                    }
+                if let Some(max_lines) = max_lines
+                    && boundaries.len() >= max_lines - 1
+                {
+                    break;
                 }
 
                 if let Some(last_candidate_ix) = last_candidate_ix.take() {
diff --git a/crates/gpui/src/view.rs b/crates/gpui/src/view.rs
index f461e2f7d0..217971792e 100644
--- a/crates/gpui/src/view.rs
+++ b/crates/gpui/src/view.rs
@@ -205,22 +205,21 @@ impl Element for AnyView {
                     let content_mask = window.content_mask();
                     let text_style = window.text_style();
 
-                    if let Some(mut element_state) = element_state {
-                        if element_state.cache_key.bounds == bounds
-                            && element_state.cache_key.content_mask == content_mask
-                            && element_state.cache_key.text_style == text_style
-                            && !window.dirty_views.contains(&self.entity_id())
-                            && !window.refreshing
-                        {
-                            let prepaint_start = window.prepaint_index();
-                            window.reuse_prepaint(element_state.prepaint_range.clone());
-                            cx.entities
-                                .extend_accessed(&element_state.accessed_entities);
-                            let prepaint_end = window.prepaint_index();
-                            element_state.prepaint_range = prepaint_start..prepaint_end;
+                    if let Some(mut element_state) = element_state
+                        && element_state.cache_key.bounds == bounds
+                        && element_state.cache_key.content_mask == content_mask
+                        && element_state.cache_key.text_style == text_style
+                        && !window.dirty_views.contains(&self.entity_id())
+                        && !window.refreshing
+                    {
+                        let prepaint_start = window.prepaint_index();
+                        window.reuse_prepaint(element_state.prepaint_range.clone());
+                        cx.entities
+                            .extend_accessed(&element_state.accessed_entities);
+                        let prepaint_end = window.prepaint_index();
+                        element_state.prepaint_range = prepaint_start..prepaint_end;
 
-                            return (None, element_state);
-                        }
+                        return (None, element_state);
                     }
 
                     let refreshing = mem::replace(&mut window.refreshing, true);
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index c0ffd34a0d..62aeb0df11 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -3401,16 +3401,16 @@ impl Window {
         let focus_id = handle.id;
         let (subscription, activate) =
             self.new_focus_listener(Box::new(move |event, window, cx| {
-                if let Some(blurred_id) = event.previous_focus_path.last().copied() {
-                    if event.is_focus_out(focus_id) {
-                        let event = FocusOutEvent {
-                            blurred: WeakFocusHandle {
-                                id: blurred_id,
-                                handles: Arc::downgrade(&cx.focus_handles),
-                            },
-                        };
-                        listener(event, window, cx)
-                    }
+                if let Some(blurred_id) = event.previous_focus_path.last().copied()
+                    && event.is_focus_out(focus_id)
+                {
+                    let event = FocusOutEvent {
+                        blurred: WeakFocusHandle {
+                            id: blurred_id,
+                            handles: Arc::downgrade(&cx.focus_handles),
+                        },
+                    };
+                    listener(event, window, cx)
                 }
                 true
             }));
@@ -3444,12 +3444,12 @@ impl Window {
             return true;
         }
 
-        if let Some(input) = keystroke.key_char {
-            if let Some(mut input_handler) = self.platform_window.take_input_handler() {
-                input_handler.dispatch_input(&input, self, cx);
-                self.platform_window.set_input_handler(input_handler);
-                return true;
-            }
+        if let Some(input) = keystroke.key_char
+            && let Some(mut input_handler) = self.platform_window.take_input_handler()
+        {
+            input_handler.dispatch_input(&input, self, cx);
+            self.platform_window.set_input_handler(input_handler);
+            return true;
         }
 
         false
@@ -3864,11 +3864,11 @@ impl Window {
             if !cx.propagate_event {
                 continue 'replay;
             }
-            if let Some(input) = replay.keystroke.key_char.as_ref().cloned() {
-                if let Some(mut input_handler) = self.platform_window.take_input_handler() {
-                    input_handler.dispatch_input(&input, self, cx);
-                    self.platform_window.set_input_handler(input_handler)
-                }
+            if let Some(input) = replay.keystroke.key_char.as_ref().cloned()
+                && let Some(mut input_handler) = self.platform_window.take_input_handler()
+            {
+                input_handler.dispatch_input(&input, self, cx);
+                self.platform_window.set_input_handler(input_handler)
             }
         }
     }
@@ -4309,15 +4309,15 @@ impl Window {
         cx: &mut App,
         f: impl FnOnce(&mut Option<T>, &mut Self) -> R,
     ) -> R {
-        if let Some(inspector_id) = _inspector_id {
-            if let Some(inspector) = &self.inspector {
-                let inspector = inspector.clone();
-                let active_element_id = inspector.read(cx).active_element_id();
-                if Some(inspector_id) == active_element_id {
-                    return inspector.update(cx, |inspector, _cx| {
-                        inspector.with_active_element_state(self, f)
-                    });
-                }
+        if let Some(inspector_id) = _inspector_id
+            && let Some(inspector) = &self.inspector
+        {
+            let inspector = inspector.clone();
+            let active_element_id = inspector.read(cx).active_element_id();
+            if Some(inspector_id) == active_element_id {
+                return inspector.update(cx, |inspector, _cx| {
+                    inspector.with_active_element_state(self, f)
+                });
             }
         }
         f(&mut None, self)
@@ -4389,15 +4389,13 @@ impl Window {
         if let Some(inspector) = self.inspector.as_ref() {
             let inspector = inspector.read(cx);
             if let Some((hitbox_id, _)) = self.hovered_inspector_hitbox(inspector, &self.next_frame)
-            {
-                if let Some(hitbox) = self
+                && let Some(hitbox) = self
                     .next_frame
                     .hitboxes
                     .iter()
                     .find(|hitbox| hitbox.id == hitbox_id)
-                {
-                    self.paint_quad(crate::fill(hitbox.bounds, crate::rgba(0x61afef4d)));
-                }
+            {
+                self.paint_quad(crate::fill(hitbox.bounds, crate::rgba(0x61afef4d)));
             }
         }
     }
diff --git a/crates/gpui_macros/src/derive_inspector_reflection.rs b/crates/gpui_macros/src/derive_inspector_reflection.rs
index fa22f95f9a..5415807ea0 100644
--- a/crates/gpui_macros/src/derive_inspector_reflection.rs
+++ b/crates/gpui_macros/src/derive_inspector_reflection.rs
@@ -160,16 +160,14 @@ fn extract_doc_comment(attrs: &[Attribute]) -> Option<String> {
     let mut doc_lines = Vec::new();
 
     for attr in attrs {
-        if attr.path().is_ident("doc") {
-            if let Meta::NameValue(meta) = &attr.meta {
-                if let Expr::Lit(expr_lit) = &meta.value {
-                    if let Lit::Str(lit_str) = &expr_lit.lit {
-                        let line = lit_str.value();
-                        let line = line.strip_prefix(' ').unwrap_or(&line);
-                        doc_lines.push(line.to_string());
-                    }
-                }
-            }
+        if attr.path().is_ident("doc")
+            && let Meta::NameValue(meta) = &attr.meta
+            && let Expr::Lit(expr_lit) = &meta.value
+            && let Lit::Str(lit_str) = &expr_lit.lit
+        {
+            let line = lit_str.value();
+            let line = line.strip_prefix(' ').unwrap_or(&line);
+            doc_lines.push(line.to_string());
         }
     }
 
diff --git a/crates/gpui_macros/src/test.rs b/crates/gpui_macros/src/test.rs
index 5a8b1cf7fc..0153c5889a 100644
--- a/crates/gpui_macros/src/test.rs
+++ b/crates/gpui_macros/src/test.rs
@@ -152,28 +152,28 @@ fn generate_test_function(
                         }
                         _ => {}
                     }
-                } else if let Type::Reference(ty) = &*arg.ty {
-                    if let Type::Path(ty) = &*ty.elem {
-                        let last_segment = ty.path.segments.last();
-                        if let Some("TestAppContext") =
-                            last_segment.map(|s| s.ident.to_string()).as_deref()
-                        {
-                            let cx_varname = format_ident!("cx_{}", ix);
-                            cx_vars.extend(quote!(
-                                let mut #cx_varname = gpui::TestAppContext::build(
-                                    dispatcher.clone(),
-                                    Some(stringify!(#outer_fn_name)),
-                                );
-                            ));
-                            cx_teardowns.extend(quote!(
-                                dispatcher.run_until_parked();
-                                #cx_varname.executor().forbid_parking();
-                                #cx_varname.quit();
-                                dispatcher.run_until_parked();
-                            ));
-                            inner_fn_args.extend(quote!(&mut #cx_varname,));
-                            continue;
-                        }
+                } else if let Type::Reference(ty) = &*arg.ty
+                    && let Type::Path(ty) = &*ty.elem
+                {
+                    let last_segment = ty.path.segments.last();
+                    if let Some("TestAppContext") =
+                        last_segment.map(|s| s.ident.to_string()).as_deref()
+                    {
+                        let cx_varname = format_ident!("cx_{}", ix);
+                        cx_vars.extend(quote!(
+                            let mut #cx_varname = gpui::TestAppContext::build(
+                                dispatcher.clone(),
+                                Some(stringify!(#outer_fn_name)),
+                            );
+                        ));
+                        cx_teardowns.extend(quote!(
+                            dispatcher.run_until_parked();
+                            #cx_varname.executor().forbid_parking();
+                            #cx_varname.quit();
+                            dispatcher.run_until_parked();
+                        ));
+                        inner_fn_args.extend(quote!(&mut #cx_varname,));
+                        continue;
                     }
                 }
             }
@@ -215,48 +215,48 @@ fn generate_test_function(
                         inner_fn_args.extend(quote!(rand::SeedableRng::seed_from_u64(_seed),));
                         continue;
                     }
-                } else if let Type::Reference(ty) = &*arg.ty {
-                    if let Type::Path(ty) = &*ty.elem {
-                        let last_segment = ty.path.segments.last();
-                        match last_segment.map(|s| s.ident.to_string()).as_deref() {
-                            Some("App") => {
-                                let cx_varname = format_ident!("cx_{}", ix);
-                                let cx_varname_lock = format_ident!("cx_{}_lock", ix);
-                                cx_vars.extend(quote!(
-                                    let mut #cx_varname = gpui::TestAppContext::build(
-                                       dispatcher.clone(),
-                                       Some(stringify!(#outer_fn_name))
-                                    );
-                                    let mut #cx_varname_lock = #cx_varname.app.borrow_mut();
-                                ));
-                                inner_fn_args.extend(quote!(&mut #cx_varname_lock,));
-                                cx_teardowns.extend(quote!(
+                } else if let Type::Reference(ty) = &*arg.ty
+                    && let Type::Path(ty) = &*ty.elem
+                {
+                    let last_segment = ty.path.segments.last();
+                    match last_segment.map(|s| s.ident.to_string()).as_deref() {
+                        Some("App") => {
+                            let cx_varname = format_ident!("cx_{}", ix);
+                            let cx_varname_lock = format_ident!("cx_{}_lock", ix);
+                            cx_vars.extend(quote!(
+                                let mut #cx_varname = gpui::TestAppContext::build(
+                                   dispatcher.clone(),
+                                   Some(stringify!(#outer_fn_name))
+                                );
+                                let mut #cx_varname_lock = #cx_varname.app.borrow_mut();
+                            ));
+                            inner_fn_args.extend(quote!(&mut #cx_varname_lock,));
+                            cx_teardowns.extend(quote!(
                                     drop(#cx_varname_lock);
                                     dispatcher.run_until_parked();
                                     #cx_varname.update(|cx| { cx.background_executor().forbid_parking(); cx.quit(); });
                                     dispatcher.run_until_parked();
                                 ));
-                                continue;
-                            }
-                            Some("TestAppContext") => {
-                                let cx_varname = format_ident!("cx_{}", ix);
-                                cx_vars.extend(quote!(
-                                    let mut #cx_varname = gpui::TestAppContext::build(
-                                        dispatcher.clone(),
-                                        Some(stringify!(#outer_fn_name))
-                                    );
-                                ));
-                                cx_teardowns.extend(quote!(
-                                    dispatcher.run_until_parked();
-                                    #cx_varname.executor().forbid_parking();
-                                    #cx_varname.quit();
-                                    dispatcher.run_until_parked();
-                                ));
-                                inner_fn_args.extend(quote!(&mut #cx_varname,));
-                                continue;
-                            }
-                            _ => {}
+                            continue;
                         }
+                        Some("TestAppContext") => {
+                            let cx_varname = format_ident!("cx_{}", ix);
+                            cx_vars.extend(quote!(
+                                let mut #cx_varname = gpui::TestAppContext::build(
+                                    dispatcher.clone(),
+                                    Some(stringify!(#outer_fn_name))
+                                );
+                            ));
+                            cx_teardowns.extend(quote!(
+                                dispatcher.run_until_parked();
+                                #cx_varname.executor().forbid_parking();
+                                #cx_varname.quit();
+                                dispatcher.run_until_parked();
+                            ));
+                            inner_fn_args.extend(quote!(&mut #cx_varname,));
+                            continue;
+                        }
+                        _ => {}
                     }
                 }
             }
diff --git a/crates/html_to_markdown/src/markdown.rs b/crates/html_to_markdown/src/markdown.rs
index b9ffbac79c..bb3b3563bc 100644
--- a/crates/html_to_markdown/src/markdown.rs
+++ b/crates/html_to_markdown/src/markdown.rs
@@ -34,15 +34,14 @@ impl HandleTag for ParagraphHandler {
         tag: &HtmlElement,
         writer: &mut MarkdownWriter,
     ) -> StartTagOutcome {
-        if tag.is_inline() && writer.is_inside("p") {
-            if let Some(parent) = writer.current_element_stack().iter().last() {
-                if !(parent.is_inline()
-                    || writer.markdown.ends_with(' ')
-                    || writer.markdown.ends_with('\n'))
-                {
-                    writer.push_str(" ");
-                }
-            }
+        if tag.is_inline()
+            && writer.is_inside("p")
+            && let Some(parent) = writer.current_element_stack().iter().last()
+            && !(parent.is_inline()
+                || writer.markdown.ends_with(' ')
+                || writer.markdown.ends_with('\n'))
+        {
+            writer.push_str(" ");
         }
 
         if tag.tag() == "p" {
diff --git a/crates/http_client/src/github.rs b/crates/http_client/src/github.rs
index 89309ff344..32efed8e72 100644
--- a/crates/http_client/src/github.rs
+++ b/crates/http_client/src/github.rs
@@ -77,10 +77,10 @@ pub async fn latest_github_release(
         .find(|release| release.pre_release == pre_release)
         .context("finding a prerelease")?;
     release.assets.iter_mut().for_each(|asset| {
-        if let Some(digest) = &mut asset.digest {
-            if let Some(stripped) = digest.strip_prefix("sha256:") {
-                *digest = stripped.to_owned();
-            }
+        if let Some(digest) = &mut asset.digest
+            && let Some(stripped) = digest.strip_prefix("sha256:")
+        {
+            *digest = stripped.to_owned();
         }
     });
     Ok(release)
diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs
index 0335a746cd..53887eb736 100644
--- a/crates/journal/src/journal.rs
+++ b/crates/journal/src/journal.rs
@@ -170,23 +170,23 @@ pub fn new_journal_entry(workspace: &Workspace, window: &mut Window, cx: &mut Ap
                     .await
             };
 
-            if let Some(Some(Ok(item))) = opened.first() {
-                if let Some(editor) = item.downcast::<Editor>().map(|editor| editor.downgrade()) {
-                    editor.update_in(cx, |editor, window, cx| {
-                        let len = editor.buffer().read(cx).len(cx);
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| s.select_ranges([len..len]),
-                        );
-                        if len > 0 {
-                            editor.insert("\n\n", window, cx);
-                        }
-                        editor.insert(&entry_heading, window, cx);
+            if let Some(Some(Ok(item))) = opened.first()
+                && let Some(editor) = item.downcast::<Editor>().map(|editor| editor.downgrade())
+            {
+                editor.update_in(cx, |editor, window, cx| {
+                    let len = editor.buffer().read(cx).len(cx);
+                    editor.change_selections(
+                        SelectionEffects::scroll(Autoscroll::center()),
+                        window,
+                        cx,
+                        |s| s.select_ranges([len..len]),
+                    );
+                    if len > 0 {
                         editor.insert("\n\n", window, cx);
-                    })?;
-                }
+                    }
+                    editor.insert(&entry_heading, window, cx);
+                    editor.insert("\n\n", window, cx);
+                })?;
             }
 
             anyhow::Ok(())
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index abb8d3b151..9227d35a50 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1158,13 +1158,12 @@ impl Buffer {
             base_buffer.edit(edits, None, cx)
         });
 
-        if let Some(operation) = operation {
-            if let Some(BufferBranchState {
+        if let Some(operation) = operation
+            && let Some(BufferBranchState {
                 merged_operations, ..
             }) = &mut self.branch_state
-            {
-                merged_operations.push(operation);
-            }
+        {
+            merged_operations.push(operation);
         }
     }
 
@@ -1185,11 +1184,11 @@ impl Buffer {
         };
 
         let mut operation_to_undo = None;
-        if let Operation::Buffer(text::Operation::Edit(operation)) = &operation {
-            if let Ok(ix) = merged_operations.binary_search(&operation.timestamp) {
-                merged_operations.remove(ix);
-                operation_to_undo = Some(operation.timestamp);
-            }
+        if let Operation::Buffer(text::Operation::Edit(operation)) = &operation
+            && let Ok(ix) = merged_operations.binary_search(&operation.timestamp)
+        {
+            merged_operations.remove(ix);
+            operation_to_undo = Some(operation.timestamp);
         }
 
         self.apply_ops([operation.clone()], cx);
@@ -1424,10 +1423,10 @@ impl Buffer {
             .map(|info| info.language.clone())
             .collect();
 
-        if languages.is_empty() {
-            if let Some(buffer_language) = self.language() {
-                languages.push(buffer_language.clone());
-            }
+        if languages.is_empty()
+            && let Some(buffer_language) = self.language()
+        {
+            languages.push(buffer_language.clone());
         }
 
         languages
@@ -2589,10 +2588,10 @@ impl Buffer {
                 line_mode,
                 cursor_shape,
             } => {
-                if let Some(set) = self.remote_selections.get(&lamport_timestamp.replica_id) {
-                    if set.lamport_timestamp > lamport_timestamp {
-                        return;
-                    }
+                if let Some(set) = self.remote_selections.get(&lamport_timestamp.replica_id)
+                    && set.lamport_timestamp > lamport_timestamp
+                {
+                    return;
                 }
 
                 self.remote_selections.insert(
@@ -3365,8 +3364,8 @@ impl BufferSnapshot {
                 }
             }
 
-            if let Some(range) = range {
-                if smallest_range_and_depth.as_ref().map_or(
+            if let Some(range) = range
+                && smallest_range_and_depth.as_ref().map_or(
                     true,
                     |(smallest_range, smallest_range_depth)| {
                         if layer.depth > *smallest_range_depth {
@@ -3377,13 +3376,13 @@ impl BufferSnapshot {
                             false
                         }
                     },
-                ) {
-                    smallest_range_and_depth = Some((range, layer.depth));
-                    scope = Some(LanguageScope {
-                        language: layer.language.clone(),
-                        override_id: layer.override_id(offset, &self.text),
-                    });
-                }
+                )
+            {
+                smallest_range_and_depth = Some((range, layer.depth));
+                scope = Some(LanguageScope {
+                    language: layer.language.clone(),
+                    override_id: layer.override_id(offset, &self.text),
+                });
             }
         }
 
@@ -3499,17 +3498,17 @@ impl BufferSnapshot {
                 // If there is a candidate node on both sides of the (empty) range, then
                 // decide between the two by favoring a named node over an anonymous token.
                 // If both nodes are the same in that regard, favor the right one.
-                if let Some(right_node) = right_node {
-                    if right_node.is_named() || !left_node.is_named() {
-                        layer_result = right_node;
-                    }
+                if let Some(right_node) = right_node
+                    && (right_node.is_named() || !left_node.is_named())
+                {
+                    layer_result = right_node;
                 }
             }
 
-            if let Some(previous_result) = &result {
-                if previous_result.byte_range().len() < layer_result.byte_range().len() {
-                    continue;
-                }
+            if let Some(previous_result) = &result
+                && previous_result.byte_range().len() < layer_result.byte_range().len()
+            {
+                continue;
             }
             result = Some(layer_result);
         }
@@ -4081,10 +4080,10 @@ impl BufferSnapshot {
         let mut result: Option<(Range<usize>, Range<usize>)> = None;
 
         for pair in self.enclosing_bracket_ranges(range.clone()) {
-            if let Some(range_filter) = range_filter {
-                if !range_filter(pair.open_range.clone(), pair.close_range.clone()) {
-                    continue;
-                }
+            if let Some(range_filter) = range_filter
+                && !range_filter(pair.open_range.clone(), pair.close_range.clone())
+            {
+                continue;
             }
 
             let len = pair.close_range.end - pair.open_range.start;
@@ -4474,27 +4473,26 @@ impl BufferSnapshot {
                         current_word_start_ix = Some(ix);
                     }
 
-                    if let Some(query_chars) = &query_chars {
-                        if query_ix < query_len {
-                            if c.to_lowercase().eq(query_chars[query_ix].to_lowercase()) {
-                                query_ix += 1;
-                            }
-                        }
+                    if let Some(query_chars) = &query_chars
+                        && query_ix < query_len
+                        && c.to_lowercase().eq(query_chars[query_ix].to_lowercase())
+                    {
+                        query_ix += 1;
                     }
                     continue;
-                } else if let Some(word_start) = current_word_start_ix.take() {
-                    if query_ix == query_len {
-                        let word_range = self.anchor_before(word_start)..self.anchor_after(ix);
-                        let mut word_text = self.text_for_range(word_start..ix).peekable();
-                        let first_char = word_text
-                            .peek()
-                            .and_then(|first_chunk| first_chunk.chars().next());
-                        // Skip empty and "words" starting with digits as a heuristic to reduce useless completions
-                        if !query.skip_digits
-                            || first_char.map_or(true, |first_char| !first_char.is_digit(10))
-                        {
-                            words.insert(word_text.collect(), word_range);
-                        }
+                } else if let Some(word_start) = current_word_start_ix.take()
+                    && query_ix == query_len
+                {
+                    let word_range = self.anchor_before(word_start)..self.anchor_after(ix);
+                    let mut word_text = self.text_for_range(word_start..ix).peekable();
+                    let first_char = word_text
+                        .peek()
+                        .and_then(|first_chunk| first_chunk.chars().next());
+                    // Skip empty and "words" starting with digits as a heuristic to reduce useless completions
+                    if !query.skip_digits
+                        || first_char.map_or(true, |first_char| !first_char.is_digit(10))
+                    {
+                        words.insert(word_text.collect(), word_range);
                     }
                 }
                 query_ix = 0;
@@ -4607,17 +4605,17 @@ impl<'a> BufferChunks<'a> {
                 highlights
                     .stack
                     .retain(|(end_offset, _)| *end_offset > range.start);
-                if let Some(capture) = &highlights.next_capture {
-                    if range.start >= capture.node.start_byte() {
-                        let next_capture_end = capture.node.end_byte();
-                        if range.start < next_capture_end {
-                            highlights.stack.push((
-                                next_capture_end,
-                                highlights.highlight_maps[capture.grammar_index].get(capture.index),
-                            ));
-                        }
-                        highlights.next_capture.take();
+                if let Some(capture) = &highlights.next_capture
+                    && range.start >= capture.node.start_byte()
+                {
+                    let next_capture_end = capture.node.end_byte();
+                    if range.start < next_capture_end {
+                        highlights.stack.push((
+                            next_capture_end,
+                            highlights.highlight_maps[capture.grammar_index].get(capture.index),
+                        ));
                     }
+                    highlights.next_capture.take();
                 }
             } else if let Some(snapshot) = self.buffer_snapshot {
                 let (captures, highlight_maps) = snapshot.get_highlights(self.range.clone());
@@ -4642,33 +4640,33 @@ impl<'a> BufferChunks<'a> {
     }
 
     fn initialize_diagnostic_endpoints(&mut self) {
-        if let Some(diagnostics) = self.diagnostic_endpoints.as_mut() {
-            if let Some(buffer) = self.buffer_snapshot {
-                let mut diagnostic_endpoints = Vec::new();
-                for entry in buffer.diagnostics_in_range::<_, usize>(self.range.clone(), false) {
-                    diagnostic_endpoints.push(DiagnosticEndpoint {
-                        offset: entry.range.start,
-                        is_start: true,
-                        severity: entry.diagnostic.severity,
-                        is_unnecessary: entry.diagnostic.is_unnecessary,
-                        underline: entry.diagnostic.underline,
-                    });
-                    diagnostic_endpoints.push(DiagnosticEndpoint {
-                        offset: entry.range.end,
-                        is_start: false,
-                        severity: entry.diagnostic.severity,
-                        is_unnecessary: entry.diagnostic.is_unnecessary,
-                        underline: entry.diagnostic.underline,
-                    });
-                }
-                diagnostic_endpoints
-                    .sort_unstable_by_key(|endpoint| (endpoint.offset, !endpoint.is_start));
-                *diagnostics = diagnostic_endpoints.into_iter().peekable();
-                self.hint_depth = 0;
-                self.error_depth = 0;
-                self.warning_depth = 0;
-                self.information_depth = 0;
+        if let Some(diagnostics) = self.diagnostic_endpoints.as_mut()
+            && let Some(buffer) = self.buffer_snapshot
+        {
+            let mut diagnostic_endpoints = Vec::new();
+            for entry in buffer.diagnostics_in_range::<_, usize>(self.range.clone(), false) {
+                diagnostic_endpoints.push(DiagnosticEndpoint {
+                    offset: entry.range.start,
+                    is_start: true,
+                    severity: entry.diagnostic.severity,
+                    is_unnecessary: entry.diagnostic.is_unnecessary,
+                    underline: entry.diagnostic.underline,
+                });
+                diagnostic_endpoints.push(DiagnosticEndpoint {
+                    offset: entry.range.end,
+                    is_start: false,
+                    severity: entry.diagnostic.severity,
+                    is_unnecessary: entry.diagnostic.is_unnecessary,
+                    underline: entry.diagnostic.underline,
+                });
             }
+            diagnostic_endpoints
+                .sort_unstable_by_key(|endpoint| (endpoint.offset, !endpoint.is_start));
+            *diagnostics = diagnostic_endpoints.into_iter().peekable();
+            self.hint_depth = 0;
+            self.error_depth = 0;
+            self.warning_depth = 0;
+            self.information_depth = 0;
         }
     }
 
@@ -4779,11 +4777,11 @@ impl<'a> Iterator for BufferChunks<'a> {
                 .min(next_capture_start)
                 .min(next_diagnostic_endpoint);
             let mut highlight_id = None;
-            if let Some(highlights) = self.highlights.as_ref() {
-                if let Some((parent_capture_end, parent_highlight_id)) = highlights.stack.last() {
-                    chunk_end = chunk_end.min(*parent_capture_end);
-                    highlight_id = Some(*parent_highlight_id);
-                }
+            if let Some(highlights) = self.highlights.as_ref()
+                && let Some((parent_capture_end, parent_highlight_id)) = highlights.stack.last()
+            {
+                chunk_end = chunk_end.min(*parent_capture_end);
+                highlight_id = Some(*parent_highlight_id);
             }
 
             let slice =
@@ -4977,11 +4975,12 @@ pub(crate) fn contiguous_ranges(
     std::iter::from_fn(move || {
         loop {
             if let Some(value) = values.next() {
-                if let Some(range) = &mut current_range {
-                    if value == range.end && range.len() < max_len {
-                        range.end += 1;
-                        continue;
-                    }
+                if let Some(range) = &mut current_range
+                    && value == range.end
+                    && range.len() < max_len
+                {
+                    range.end += 1;
+                    continue;
                 }
 
                 let prev_range = current_range.clone();
@@ -5049,10 +5048,10 @@ impl CharClassifier {
             } else {
                 scope.word_characters()
             };
-            if let Some(characters) = characters {
-                if characters.contains(&c) {
-                    return CharKind::Word;
-                }
+            if let Some(characters) = characters
+                && characters.contains(&c)
+            {
+                return CharKind::Word;
             }
         }
 
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 3a41733191..68addc804e 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -329,8 +329,8 @@ pub trait LspAdapter: 'static + Send + Sync {
             // We only want to cache when we fall back to the global one,
             // because we don't want to download and overwrite our global one
             // for each worktree we might have open.
-            if binary_options.allow_path_lookup {
-                if let Some(binary) = self.check_if_user_installed(delegate.as_ref(), toolchains, cx).await {
+            if binary_options.allow_path_lookup
+                && let Some(binary) = self.check_if_user_installed(delegate.as_ref(), toolchains, cx).await {
                     log::info!(
                         "found user-installed language server for {}. path: {:?}, arguments: {:?}",
                         self.name().0,
@@ -339,7 +339,6 @@ pub trait LspAdapter: 'static + Send + Sync {
                     );
                     return Ok(binary);
                 }
-            }
 
             anyhow::ensure!(binary_options.allow_binary_download, "downloading language servers disabled");
 
@@ -1776,10 +1775,10 @@ impl Language {
                 BufferChunks::new(text, range, Some((captures, highlight_maps)), false, None)
             {
                 let end_offset = offset + chunk.text.len();
-                if let Some(highlight_id) = chunk.syntax_highlight_id {
-                    if !highlight_id.is_default() {
-                        result.push((offset..end_offset, highlight_id));
-                    }
+                if let Some(highlight_id) = chunk.syntax_highlight_id
+                    && !highlight_id.is_default()
+                {
+                    result.push((offset..end_offset, highlight_id));
                 }
                 offset = end_offset;
             }
@@ -1796,11 +1795,11 @@ impl Language {
     }
 
     pub fn set_theme(&self, theme: &SyntaxTheme) {
-        if let Some(grammar) = self.grammar.as_ref() {
-            if let Some(highlights_query) = &grammar.highlights_query {
-                *grammar.highlight_map.lock() =
-                    HighlightMap::new(highlights_query.capture_names(), theme);
-            }
+        if let Some(grammar) = self.grammar.as_ref()
+            && let Some(highlights_query) = &grammar.highlights_query
+        {
+            *grammar.highlight_map.lock() =
+                HighlightMap::new(highlights_query.capture_names(), theme);
         }
     }
 
@@ -1920,11 +1919,11 @@ impl LanguageScope {
             .enumerate()
             .map(move |(ix, bracket)| {
                 let mut is_enabled = true;
-                if let Some(next_disabled_ix) = disabled_ids.first() {
-                    if ix == *next_disabled_ix as usize {
-                        disabled_ids = &disabled_ids[1..];
-                        is_enabled = false;
-                    }
+                if let Some(next_disabled_ix) = disabled_ids.first()
+                    && ix == *next_disabled_ix as usize
+                {
+                    disabled_ids = &disabled_ids[1..];
+                    is_enabled = false;
                 }
                 (bracket, is_enabled)
             })
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
index 30bbc88f7e..1e1060c843 100644
--- a/crates/language/src/syntax_map.rs
+++ b/crates/language/src/syntax_map.rs
@@ -414,42 +414,42 @@ impl SyntaxSnapshot {
             .collect::<Vec<_>>();
         self.reparse_with_ranges(text, root_language.clone(), edit_ranges, registry.as_ref());
 
-        if let Some(registry) = registry {
-            if registry.version() != self.language_registry_version {
-                let mut resolved_injection_ranges = Vec::new();
-                let mut cursor = self
-                    .layers
-                    .filter::<_, ()>(text, |summary| summary.contains_unknown_injections);
+        if let Some(registry) = registry
+            && registry.version() != self.language_registry_version
+        {
+            let mut resolved_injection_ranges = Vec::new();
+            let mut cursor = self
+                .layers
+                .filter::<_, ()>(text, |summary| summary.contains_unknown_injections);
+            cursor.next();
+            while let Some(layer) = cursor.item() {
+                let SyntaxLayerContent::Pending { language_name } = &layer.content else {
+                    unreachable!()
+                };
+                if registry
+                    .language_for_name_or_extension(language_name)
+                    .now_or_never()
+                    .and_then(|language| language.ok())
+                    .is_some()
+                {
+                    let range = layer.range.to_offset(text);
+                    log::trace!("reparse range {range:?} for language {language_name:?}");
+                    resolved_injection_ranges.push(range);
+                }
+
                 cursor.next();
-                while let Some(layer) = cursor.item() {
-                    let SyntaxLayerContent::Pending { language_name } = &layer.content else {
-                        unreachable!()
-                    };
-                    if registry
-                        .language_for_name_or_extension(language_name)
-                        .now_or_never()
-                        .and_then(|language| language.ok())
-                        .is_some()
-                    {
-                        let range = layer.range.to_offset(text);
-                        log::trace!("reparse range {range:?} for language {language_name:?}");
-                        resolved_injection_ranges.push(range);
-                    }
-
-                    cursor.next();
-                }
-                drop(cursor);
-
-                if !resolved_injection_ranges.is_empty() {
-                    self.reparse_with_ranges(
-                        text,
-                        root_language,
-                        resolved_injection_ranges,
-                        Some(&registry),
-                    );
-                }
-                self.language_registry_version = registry.version();
             }
+            drop(cursor);
+
+            if !resolved_injection_ranges.is_empty() {
+                self.reparse_with_ranges(
+                    text,
+                    root_language,
+                    resolved_injection_ranges,
+                    Some(&registry),
+                );
+            }
+            self.language_registry_version = registry.version();
         }
 
         self.update_count += 1;
@@ -1065,10 +1065,10 @@ impl<'a> SyntaxMapCaptures<'a> {
     pub fn set_byte_range(&mut self, range: Range<usize>) {
         for layer in &mut self.layers {
             layer.captures.set_byte_range(range.clone());
-            if let Some(capture) = &layer.next_capture {
-                if capture.node.end_byte() > range.start {
-                    continue;
-                }
+            if let Some(capture) = &layer.next_capture
+                && capture.node.end_byte() > range.start
+            {
+                continue;
             }
             layer.advance();
         }
@@ -1277,11 +1277,11 @@ fn join_ranges(
             (None, None) => break,
         };
 
-        if let Some(last) = result.last_mut() {
-            if range.start <= last.end {
-                last.end = last.end.max(range.end);
-                continue;
-            }
+        if let Some(last) = result.last_mut()
+            && range.start <= last.end
+        {
+            last.end = last.end.max(range.end);
+            continue;
         }
         result.push(range);
     }
@@ -1330,14 +1330,13 @@ fn get_injections(
     // if there currently no matches for that injection.
     combined_injection_ranges.clear();
     for pattern in &config.patterns {
-        if let (Some(language_name), true) = (pattern.language.as_ref(), pattern.combined) {
-            if let Some(language) = language_registry
+        if let (Some(language_name), true) = (pattern.language.as_ref(), pattern.combined)
+            && let Some(language) = language_registry
                 .language_for_name_or_extension(language_name)
                 .now_or_never()
                 .and_then(|language| language.ok())
-            {
-                combined_injection_ranges.insert(language.id, (language, Vec::new()));
-            }
+        {
+            combined_injection_ranges.insert(language.id, (language, Vec::new()));
         }
     }
 
@@ -1357,10 +1356,11 @@ fn get_injections(
                 content_ranges.first().unwrap().start_byte..content_ranges.last().unwrap().end_byte;
 
             // Avoid duplicate matches if two changed ranges intersect the same injection.
-            if let Some((prev_pattern_ix, prev_range)) = &prev_match {
-                if mat.pattern_index == *prev_pattern_ix && content_range == *prev_range {
-                    continue;
-                }
+            if let Some((prev_pattern_ix, prev_range)) = &prev_match
+                && mat.pattern_index == *prev_pattern_ix
+                && content_range == *prev_range
+            {
+                continue;
             }
 
             prev_match = Some((mat.pattern_index, content_range.clone()));
diff --git a/crates/language/src/text_diff.rs b/crates/language/src/text_diff.rs
index af8ce60881..1e3e12758d 100644
--- a/crates/language/src/text_diff.rs
+++ b/crates/language/src/text_diff.rs
@@ -189,11 +189,11 @@ fn tokenize(text: &str, language_scope: Option<LanguageScope>) -> impl Iterator<
         while let Some((ix, c)) = chars.next() {
             let mut token = None;
             let kind = classifier.kind(c);
-            if let Some((prev_char, prev_kind)) = prev {
-                if kind != prev_kind || (kind == CharKind::Punctuation && c != prev_char) {
-                    token = Some(&text[start_ix..ix]);
-                    start_ix = ix;
-                }
+            if let Some((prev_char, prev_kind)) = prev
+                && (kind != prev_kind || (kind == CharKind::Punctuation && c != prev_char))
+            {
+                token = Some(&text[start_ix..ix]);
+                start_ix = ix;
             }
             prev = Some((c, kind));
             if token.is_some() {
diff --git a/crates/language_model/src/request.rs b/crates/language_model/src/request.rs
index 8c2d169973..1182e0f7a8 100644
--- a/crates/language_model/src/request.rs
+++ b/crates/language_model/src/request.rs
@@ -221,36 +221,33 @@ impl<'de> Deserialize<'de> for LanguageModelToolResultContent {
             // Accept wrapped text format: { "type": "text", "text": "..." }
             if let (Some(type_value), Some(text_value)) =
                 (get_field(obj, "type"), get_field(obj, "text"))
+                && let Some(type_str) = type_value.as_str()
+                && type_str.to_lowercase() == "text"
+                && let Some(text) = text_value.as_str()
             {
-                if let Some(type_str) = type_value.as_str() {
-                    if type_str.to_lowercase() == "text" {
-                        if let Some(text) = text_value.as_str() {
-                            return Ok(Self::Text(Arc::from(text)));
-                        }
-                    }
-                }
+                return Ok(Self::Text(Arc::from(text)));
             }
 
             // Check for wrapped Text variant: { "text": "..." }
-            if let Some((_key, value)) = obj.iter().find(|(k, _)| k.to_lowercase() == "text") {
-                if obj.len() == 1 {
-                    // Only one field, and it's "text" (case-insensitive)
-                    if let Some(text) = value.as_str() {
-                        return Ok(Self::Text(Arc::from(text)));
-                    }
+            if let Some((_key, value)) = obj.iter().find(|(k, _)| k.to_lowercase() == "text")
+                && obj.len() == 1
+            {
+                // Only one field, and it's "text" (case-insensitive)
+                if let Some(text) = value.as_str() {
+                    return Ok(Self::Text(Arc::from(text)));
                 }
             }
 
             // Check for wrapped Image variant: { "image": { "source": "...", "size": ... } }
-            if let Some((_key, value)) = obj.iter().find(|(k, _)| k.to_lowercase() == "image") {
-                if obj.len() == 1 {
-                    // Only one field, and it's "image" (case-insensitive)
-                    // Try to parse the nested image object
-                    if let Some(image_obj) = value.as_object() {
-                        if let Some(image) = LanguageModelImage::from_json(image_obj) {
-                            return Ok(Self::Image(image));
-                        }
-                    }
+            if let Some((_key, value)) = obj.iter().find(|(k, _)| k.to_lowercase() == "image")
+                && obj.len() == 1
+            {
+                // Only one field, and it's "image" (case-insensitive)
+                // Try to parse the nested image object
+                if let Some(image_obj) = value.as_object()
+                    && let Some(image) = LanguageModelImage::from_json(image_obj)
+                {
+                    return Ok(Self::Image(image));
                 }
             }
 
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 7ba56ec775..b16be36ea1 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -633,11 +633,11 @@ pub fn into_anthropic(
                     Role::Assistant => anthropic::Role::Assistant,
                     Role::System => unreachable!("System role should never occur here"),
                 };
-                if let Some(last_message) = new_messages.last_mut() {
-                    if last_message.role == anthropic_role {
-                        last_message.content.extend(anthropic_message_content);
-                        continue;
-                    }
+                if let Some(last_message) = new_messages.last_mut()
+                    && last_message.role == anthropic_role
+                {
+                    last_message.content.extend(anthropic_message_content);
+                    continue;
                 }
 
                 // Mark the last segment of the message as cached
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index f33a00972d..193d218094 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -412,10 +412,10 @@ impl BedrockModel {
                     .region(Region::new(region))
                     .timeout_config(TimeoutConfig::disabled());
 
-                if let Some(endpoint_url) = endpoint {
-                    if !endpoint_url.is_empty() {
-                        config_builder = config_builder.endpoint_url(endpoint_url);
-                    }
+                if let Some(endpoint_url) = endpoint
+                    && !endpoint_url.is_empty()
+                {
+                    config_builder = config_builder.endpoint_url(endpoint_url);
                 }
 
                 match auth_method {
@@ -728,11 +728,11 @@ pub fn into_bedrock(
                     Role::Assistant => bedrock::BedrockRole::Assistant,
                     Role::System => unreachable!("System role should never occur here"),
                 };
-                if let Some(last_message) = new_messages.last_mut() {
-                    if last_message.role == bedrock_role {
-                        last_message.content.extend(bedrock_message_content);
-                        continue;
-                    }
+                if let Some(last_message) = new_messages.last_mut()
+                    && last_message.role == bedrock_role
+                {
+                    last_message.content.extend(bedrock_message_content);
+                    continue;
                 }
                 new_messages.push(
                     BedrockMessage::builder()
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index f226d0c6a8..e99dadc28d 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -597,15 +597,13 @@ impl CloudLanguageModel {
                     .headers()
                     .get(SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME)
                     .and_then(|resource| resource.to_str().ok())
-                {
-                    if let Some(plan) = response
+                    && let Some(plan) = response
                         .headers()
                         .get(CURRENT_PLAN_HEADER_NAME)
                         .and_then(|plan| plan.to_str().ok())
                         .and_then(|plan| cloud_llm_client::Plan::from_str(plan).ok())
-                    {
-                        return Err(anyhow!(ModelRequestLimitReachedError { plan }));
-                    }
+                {
+                    return Err(anyhow!(ModelRequestLimitReachedError { plan }));
                 }
             } else if status == StatusCode::PAYMENT_REQUIRED {
                 return Err(anyhow!(PaymentRequiredError));
@@ -662,29 +660,29 @@ where
 
 impl From<ApiError> for LanguageModelCompletionError {
     fn from(error: ApiError) -> Self {
-        if let Ok(cloud_error) = serde_json::from_str::<CloudApiError>(&error.body) {
-            if cloud_error.code.starts_with("upstream_http_") {
-                let status = if let Some(status) = cloud_error.upstream_status {
-                    status
-                } else if cloud_error.code.ends_with("_error") {
-                    error.status
-                } else {
-                    // If there's a status code in the code string (e.g. "upstream_http_429")
-                    // then use that; otherwise, see if the JSON contains a status code.
-                    cloud_error
-                        .code
-                        .strip_prefix("upstream_http_")
-                        .and_then(|code_str| code_str.parse::<u16>().ok())
-                        .and_then(|code| StatusCode::from_u16(code).ok())
-                        .unwrap_or(error.status)
-                };
+        if let Ok(cloud_error) = serde_json::from_str::<CloudApiError>(&error.body)
+            && cloud_error.code.starts_with("upstream_http_")
+        {
+            let status = if let Some(status) = cloud_error.upstream_status {
+                status
+            } else if cloud_error.code.ends_with("_error") {
+                error.status
+            } else {
+                // If there's a status code in the code string (e.g. "upstream_http_429")
+                // then use that; otherwise, see if the JSON contains a status code.
+                cloud_error
+                    .code
+                    .strip_prefix("upstream_http_")
+                    .and_then(|code_str| code_str.parse::<u16>().ok())
+                    .and_then(|code| StatusCode::from_u16(code).ok())
+                    .unwrap_or(error.status)
+            };
 
-                return LanguageModelCompletionError::UpstreamProviderError {
-                    message: cloud_error.message,
-                    status,
-                    retry_after: cloud_error.retry_after.map(Duration::from_secs_f64),
-                };
-            }
+            return LanguageModelCompletionError::UpstreamProviderError {
+                message: cloud_error.message,
+                status,
+                retry_after: cloud_error.retry_after.map(Duration::from_secs_f64),
+            };
         }
 
         let retry_after = None;
diff --git a/crates/language_selector/src/active_buffer_language.rs b/crates/language_selector/src/active_buffer_language.rs
index c5c5eceab5..56924c4cd2 100644
--- a/crates/language_selector/src/active_buffer_language.rs
+++ b/crates/language_selector/src/active_buffer_language.rs
@@ -28,10 +28,10 @@ impl ActiveBufferLanguage {
         self.active_language = Some(None);
 
         let editor = editor.read(cx);
-        if let Some((_, buffer, _)) = editor.active_excerpt(cx) {
-            if let Some(language) = buffer.read(cx).language() {
-                self.active_language = Some(Some(language.name()));
-            }
+        if let Some((_, buffer, _)) = editor.active_excerpt(cx)
+            && let Some(language) = buffer.read(cx).language()
+        {
+            self.active_language = Some(Some(language.name()));
         }
 
         cx.notify();
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index c303a8c305..3285efaaef 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -254,35 +254,35 @@ impl LogStore {
         let copilot_subscription = Copilot::global(cx).map(|copilot| {
             let copilot = &copilot;
             cx.subscribe(copilot, |this, copilot, edit_prediction_event, cx| {
-                if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event {
-                    if let Some(server) = copilot.read(cx).language_server() {
-                        let server_id = server.server_id();
-                        let weak_this = cx.weak_entity();
-                        this.copilot_log_subscription =
-                            Some(server.on_notification::<copilot::request::LogMessage, _>(
-                                move |params, cx| {
-                                    weak_this
-                                        .update(cx, |this, cx| {
-                                            this.add_language_server_log(
-                                                server_id,
-                                                MessageType::LOG,
-                                                &params.message,
-                                                cx,
-                                            );
-                                        })
-                                        .ok();
-                                },
-                            ));
-                        let name = LanguageServerName::new_static("copilot");
-                        this.add_language_server(
-                            LanguageServerKind::Global,
-                            server.server_id(),
-                            Some(name),
-                            None,
-                            Some(server.clone()),
-                            cx,
-                        );
-                    }
+                if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event
+                    && let Some(server) = copilot.read(cx).language_server()
+                {
+                    let server_id = server.server_id();
+                    let weak_this = cx.weak_entity();
+                    this.copilot_log_subscription =
+                        Some(server.on_notification::<copilot::request::LogMessage, _>(
+                            move |params, cx| {
+                                weak_this
+                                    .update(cx, |this, cx| {
+                                        this.add_language_server_log(
+                                            server_id,
+                                            MessageType::LOG,
+                                            &params.message,
+                                            cx,
+                                        );
+                                    })
+                                    .ok();
+                            },
+                        ));
+                    let name = LanguageServerName::new_static("copilot");
+                    this.add_language_server(
+                        LanguageServerKind::Global,
+                        server.server_id(),
+                        Some(name),
+                        None,
+                        Some(server.clone()),
+                        cx,
+                    );
                 }
             })
         });
@@ -733,16 +733,14 @@ impl LspLogView {
                 let first_server_id_for_project =
                     store.read(cx).server_ids_for_project(&weak_project).next();
                 if let Some(current_lsp) = this.current_server_id {
-                    if !store.read(cx).language_servers.contains_key(&current_lsp) {
-                        if let Some(server_id) = first_server_id_for_project {
-                            match this.active_entry_kind {
-                                LogKind::Rpc => {
-                                    this.show_rpc_trace_for_server(server_id, window, cx)
-                                }
-                                LogKind::Trace => this.show_trace_for_server(server_id, window, cx),
-                                LogKind::Logs => this.show_logs_for_server(server_id, window, cx),
-                                LogKind::ServerInfo => this.show_server_info(server_id, window, cx),
-                            }
+                    if !store.read(cx).language_servers.contains_key(&current_lsp)
+                        && let Some(server_id) = first_server_id_for_project
+                    {
+                        match this.active_entry_kind {
+                            LogKind::Rpc => this.show_rpc_trace_for_server(server_id, window, cx),
+                            LogKind::Trace => this.show_trace_for_server(server_id, window, cx),
+                            LogKind::Logs => this.show_logs_for_server(server_id, window, cx),
+                            LogKind::ServerInfo => this.show_server_info(server_id, window, cx),
                         }
                     }
                 } else if let Some(server_id) = first_server_id_for_project {
@@ -776,21 +774,17 @@ impl LspLogView {
                                 ],
                                 cx,
                             );
-                            if text.len() > 1024 {
-                                if let Some((fold_offset, _)) =
+                            if text.len() > 1024
+                                && let Some((fold_offset, _)) =
                                     text.char_indices().dropping(1024).next()
-                                {
-                                    if fold_offset < text.len() {
-                                        editor.fold_ranges(
-                                            vec![
-                                                last_offset + fold_offset..last_offset + text.len(),
-                                            ],
-                                            false,
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                }
+                                && fold_offset < text.len()
+                            {
+                                editor.fold_ranges(
+                                    vec![last_offset + fold_offset..last_offset + text.len()],
+                                    false,
+                                    window,
+                                    cx,
+                                );
                             }
 
                             if newest_cursor_is_at_end {
@@ -1311,14 +1305,14 @@ impl ToolbarItemView for LspLogToolbarItemView {
         _: &mut Window,
         cx: &mut Context<Self>,
     ) -> workspace::ToolbarItemLocation {
-        if let Some(item) = active_pane_item {
-            if let Some(log_view) = item.downcast::<LspLogView>() {
-                self.log_view = Some(log_view.clone());
-                self._log_view_subscription = Some(cx.observe(&log_view, |_, _, cx| {
-                    cx.notify();
-                }));
-                return ToolbarItemLocation::PrimaryLeft;
-            }
+        if let Some(item) = active_pane_item
+            && let Some(log_view) = item.downcast::<LspLogView>()
+        {
+            self.log_view = Some(log_view.clone());
+            self._log_view_subscription = Some(cx.observe(&log_view, |_, _, cx| {
+                cx.notify();
+            }));
+            return ToolbarItemLocation::PrimaryLeft;
         }
         self.log_view = None;
         self._log_view_subscription = None;
diff --git a/crates/language_tools/src/syntax_tree_view.rs b/crates/language_tools/src/syntax_tree_view.rs
index 9946442ec8..4fe8e11f94 100644
--- a/crates/language_tools/src/syntax_tree_view.rs
+++ b/crates/language_tools/src/syntax_tree_view.rs
@@ -103,12 +103,11 @@ impl SyntaxTreeView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(item) = active_item {
-            if item.item_id() != cx.entity_id() {
-                if let Some(editor) = item.act_as::<Editor>(cx) {
-                    self.set_editor(editor, window, cx);
-                }
-            }
+        if let Some(item) = active_item
+            && item.item_id() != cx.entity_id()
+            && let Some(editor) = item.act_as::<Editor>(cx)
+        {
+            self.set_editor(editor, window, cx);
         }
     }
 
@@ -537,12 +536,12 @@ impl ToolbarItemView for SyntaxTreeToolbarItemView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> ToolbarItemLocation {
-        if let Some(item) = active_pane_item {
-            if let Some(view) = item.downcast::<SyntaxTreeView>() {
-                self.tree_view = Some(view.clone());
-                self.subscription = Some(cx.observe_in(&view, window, |_, _, _, cx| cx.notify()));
-                return ToolbarItemLocation::PrimaryLeft;
-            }
+        if let Some(item) = active_pane_item
+            && let Some(view) = item.downcast::<SyntaxTreeView>()
+        {
+            self.tree_view = Some(view.clone());
+            self.subscription = Some(cx.observe_in(&view, window, |_, _, _, cx| cx.notify()));
+            return ToolbarItemLocation::PrimaryLeft;
         }
         self.tree_view = None;
         self.subscription = None;
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index f739c5c4c6..00e3cad436 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -131,19 +131,19 @@ impl super::LspAdapter for GoLspAdapter {
 
         if let Some(version) = *version {
             let binary_path = container_dir.join(format!("gopls_{version}_go_{go_version}"));
-            if let Ok(metadata) = fs::metadata(&binary_path).await {
-                if metadata.is_file() {
-                    remove_matching(&container_dir, |entry| {
-                        entry != binary_path && entry.file_name() != Some(OsStr::new("gobin"))
-                    })
-                    .await;
+            if let Ok(metadata) = fs::metadata(&binary_path).await
+                && metadata.is_file()
+            {
+                remove_matching(&container_dir, |entry| {
+                    entry != binary_path && entry.file_name() != Some(OsStr::new("gobin"))
+                })
+                .await;
 
-                    return Ok(LanguageServerBinary {
-                        path: binary_path.to_path_buf(),
-                        arguments: server_binary_arguments(),
-                        env: None,
-                    });
-                }
+                return Ok(LanguageServerBinary {
+                    path: binary_path.to_path_buf(),
+                    arguments: server_binary_arguments(),
+                    env: None,
+                });
             }
         } else if let Some(path) = this
             .cached_server_binary(container_dir.clone(), delegate)
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index e446f22713..75289dd59d 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -244,11 +244,8 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
     cx.observe_flag::<BasedPyrightFeatureFlag, _>({
         let languages = languages.clone();
         move |enabled, _| {
-            if enabled {
-                if let Some(adapter) = basedpyright_lsp_adapter.take() {
-                    languages
-                        .register_available_lsp_adapter(adapter.name(), move || adapter.clone());
-                }
+            if enabled && let Some(adapter) = basedpyright_lsp_adapter.take() {
+                languages.register_available_lsp_adapter(adapter.name(), move || adapter.clone());
             }
         }
     })
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 17d0d98fad..89a091797e 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -338,31 +338,31 @@ impl LspAdapter for PythonLspAdapter {
                 let interpreter_path = toolchain.path.to_string();
 
                 // Detect if this is a virtual environment
-                if let Some(interpreter_dir) = Path::new(&interpreter_path).parent() {
-                    if let Some(venv_dir) = interpreter_dir.parent() {
-                        // Check if this looks like a virtual environment
-                        if venv_dir.join("pyvenv.cfg").exists()
-                            || venv_dir.join("bin/activate").exists()
-                            || venv_dir.join("Scripts/activate.bat").exists()
-                        {
-                            // Set venvPath and venv at the root level
-                            // This matches the format of a pyrightconfig.json file
-                            if let Some(parent) = venv_dir.parent() {
-                                // Use relative path if the venv is inside the workspace
-                                let venv_path = if parent == adapter.worktree_root_path() {
-                                    ".".to_string()
-                                } else {
-                                    parent.to_string_lossy().into_owned()
-                                };
-                                object.insert("venvPath".to_string(), Value::String(venv_path));
-                            }
+                if let Some(interpreter_dir) = Path::new(&interpreter_path).parent()
+                    && let Some(venv_dir) = interpreter_dir.parent()
+                {
+                    // Check if this looks like a virtual environment
+                    if venv_dir.join("pyvenv.cfg").exists()
+                        || venv_dir.join("bin/activate").exists()
+                        || venv_dir.join("Scripts/activate.bat").exists()
+                    {
+                        // Set venvPath and venv at the root level
+                        // This matches the format of a pyrightconfig.json file
+                        if let Some(parent) = venv_dir.parent() {
+                            // Use relative path if the venv is inside the workspace
+                            let venv_path = if parent == adapter.worktree_root_path() {
+                                ".".to_string()
+                            } else {
+                                parent.to_string_lossy().into_owned()
+                            };
+                            object.insert("venvPath".to_string(), Value::String(venv_path));
+                        }
 
-                            if let Some(venv_name) = venv_dir.file_name() {
-                                object.insert(
-                                    "venv".to_owned(),
-                                    Value::String(venv_name.to_string_lossy().into_owned()),
-                                );
-                            }
+                        if let Some(venv_name) = venv_dir.file_name() {
+                            object.insert(
+                                "venv".to_owned(),
+                                Value::String(venv_name.to_string_lossy().into_owned()),
+                            );
                         }
                     }
                 }
@@ -1519,31 +1519,31 @@ impl LspAdapter for BasedPyrightLspAdapter {
                 let interpreter_path = toolchain.path.to_string();
 
                 // Detect if this is a virtual environment
-                if let Some(interpreter_dir) = Path::new(&interpreter_path).parent() {
-                    if let Some(venv_dir) = interpreter_dir.parent() {
-                        // Check if this looks like a virtual environment
-                        if venv_dir.join("pyvenv.cfg").exists()
-                            || venv_dir.join("bin/activate").exists()
-                            || venv_dir.join("Scripts/activate.bat").exists()
-                        {
-                            // Set venvPath and venv at the root level
-                            // This matches the format of a pyrightconfig.json file
-                            if let Some(parent) = venv_dir.parent() {
-                                // Use relative path if the venv is inside the workspace
-                                let venv_path = if parent == adapter.worktree_root_path() {
-                                    ".".to_string()
-                                } else {
-                                    parent.to_string_lossy().into_owned()
-                                };
-                                object.insert("venvPath".to_string(), Value::String(venv_path));
-                            }
+                if let Some(interpreter_dir) = Path::new(&interpreter_path).parent()
+                    && let Some(venv_dir) = interpreter_dir.parent()
+                {
+                    // Check if this looks like a virtual environment
+                    if venv_dir.join("pyvenv.cfg").exists()
+                        || venv_dir.join("bin/activate").exists()
+                        || venv_dir.join("Scripts/activate.bat").exists()
+                    {
+                        // Set venvPath and venv at the root level
+                        // This matches the format of a pyrightconfig.json file
+                        if let Some(parent) = venv_dir.parent() {
+                            // Use relative path if the venv is inside the workspace
+                            let venv_path = if parent == adapter.worktree_root_path() {
+                                ".".to_string()
+                            } else {
+                                parent.to_string_lossy().into_owned()
+                            };
+                            object.insert("venvPath".to_string(), Value::String(venv_path));
+                        }
 
-                            if let Some(venv_name) = venv_dir.file_name() {
-                                object.insert(
-                                    "venv".to_owned(),
-                                    Value::String(venv_name.to_string_lossy().into_owned()),
-                                );
-                            }
+                        if let Some(venv_name) = venv_dir.file_name() {
+                            object.insert(
+                                "venv".to_owned(),
+                                Value::String(venv_name.to_string_lossy().into_owned()),
+                            );
                         }
                     }
                 }
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index bbdfcdb499..f9b23ed9f4 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -598,12 +598,10 @@ impl ContextProvider for RustContextProvider {
             if let Some(path) = local_abs_path
                 .as_deref()
                 .and_then(|local_abs_path| local_abs_path.parent())
-            {
-                if let Some(package_name) =
+                && let Some(package_name) =
                     human_readable_package_name(path, project_env.as_ref()).await
-                {
-                    variables.insert(RUST_PACKAGE_TASK_VARIABLE.clone(), package_name);
-                }
+            {
+                variables.insert(RUST_PACKAGE_TASK_VARIABLE.clone(), package_name);
             }
             if let Some(path) = local_abs_path.as_ref()
                 && let Some((target, manifest_path)) =
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index 7937adbc09..afc84c3aff 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -341,10 +341,10 @@ async fn detect_package_manager(
     fs: Arc<dyn Fs>,
     package_json_data: Option<PackageJsonData>,
 ) -> &'static str {
-    if let Some(package_json_data) = package_json_data {
-        if let Some(package_manager) = package_json_data.package_manager {
-            return package_manager;
-        }
+    if let Some(package_json_data) = package_json_data
+        && let Some(package_manager) = package_json_data.package_manager
+    {
+        return package_manager;
     }
     if fs.is_file(&worktree_root.join("pnpm-lock.yaml")).await {
         return "pnpm";
diff --git a/crates/livekit_client/src/test.rs b/crates/livekit_client/src/test.rs
index e0058d1163..873e0222d0 100644
--- a/crates/livekit_client/src/test.rs
+++ b/crates/livekit_client/src/test.rs
@@ -736,14 +736,14 @@ impl Room {
 
 impl Drop for RoomState {
     fn drop(&mut self) {
-        if self.connection_state == ConnectionState::Connected {
-            if let Ok(server) = TestServer::get(&self.url) {
-                let executor = server.executor.clone();
-                let token = self.token.clone();
-                executor
-                    .spawn(async move { server.leave_room(token).await.ok() })
-                    .detach();
-            }
+        if self.connection_state == ConnectionState::Connected
+            && let Ok(server) = TestServer::get(&self.url)
+        {
+            let executor = server.executor.clone();
+            let token = self.token.clone();
+            executor
+                .spawn(async move { server.leave_room(token).await.ok() })
+                .detach();
         }
     }
 }
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index e5709bc07c..7939e97e48 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -340,27 +340,26 @@ impl Markdown {
             }
 
             for (range, event) in &events {
-                if let MarkdownEvent::Start(MarkdownTag::Image { dest_url, .. }) = event {
-                    if let Some(data_url) = dest_url.strip_prefix("data:") {
-                        let Some((mime_info, data)) = data_url.split_once(',') else {
-                            continue;
-                        };
-                        let Some((mime_type, encoding)) = mime_info.split_once(';') else {
-                            continue;
-                        };
-                        let Some(format) = ImageFormat::from_mime_type(mime_type) else {
-                            continue;
-                        };
-                        let is_base64 = encoding == "base64";
-                        if is_base64 {
-                            if let Some(bytes) = base64::prelude::BASE64_STANDARD
-                                .decode(data)
-                                .log_with_level(Level::Debug)
-                            {
-                                let image = Arc::new(Image::from_bytes(format, bytes));
-                                images_by_source_offset.insert(range.start, image);
-                            }
-                        }
+                if let MarkdownEvent::Start(MarkdownTag::Image { dest_url, .. }) = event
+                    && let Some(data_url) = dest_url.strip_prefix("data:")
+                {
+                    let Some((mime_info, data)) = data_url.split_once(',') else {
+                        continue;
+                    };
+                    let Some((mime_type, encoding)) = mime_info.split_once(';') else {
+                        continue;
+                    };
+                    let Some(format) = ImageFormat::from_mime_type(mime_type) else {
+                        continue;
+                    };
+                    let is_base64 = encoding == "base64";
+                    if is_base64
+                        && let Some(bytes) = base64::prelude::BASE64_STANDARD
+                            .decode(data)
+                            .log_with_level(Level::Debug)
+                    {
+                        let image = Arc::new(Image::from_bytes(format, bytes));
+                        images_by_source_offset.insert(range.start, image);
                     }
                 }
             }
@@ -659,13 +658,13 @@ impl MarkdownElement {
             let rendered_text = rendered_text.clone();
             move |markdown, event: &MouseUpEvent, phase, window, cx| {
                 if phase.bubble() {
-                    if let Some(pressed_link) = markdown.pressed_link.take() {
-                        if Some(&pressed_link) == rendered_text.link_for_position(event.position) {
-                            if let Some(open_url) = on_open_url.as_ref() {
-                                open_url(pressed_link.destination_url, window, cx);
-                            } else {
-                                cx.open_url(&pressed_link.destination_url);
-                            }
+                    if let Some(pressed_link) = markdown.pressed_link.take()
+                        && Some(&pressed_link) == rendered_text.link_for_position(event.position)
+                    {
+                        if let Some(open_url) = on_open_url.as_ref() {
+                            open_url(pressed_link.destination_url, window, cx);
+                        } else {
+                            cx.open_url(&pressed_link.destination_url);
                         }
                     }
                 } else if markdown.selection.pending {
@@ -758,10 +757,10 @@ impl Element for MarkdownElement {
         let mut current_img_block_range: Option<Range<usize>> = None;
         for (range, event) in parsed_markdown.events.iter() {
             // Skip alt text for images that rendered
-            if let Some(current_img_block_range) = &current_img_block_range {
-                if current_img_block_range.end > range.end {
-                    continue;
-                }
+            if let Some(current_img_block_range) = &current_img_block_range
+                && current_img_block_range.end > range.end
+            {
+                continue;
             }
 
             match event {
@@ -1696,10 +1695,10 @@ impl RenderedText {
         while let Some(line) = lines.next() {
             let line_bounds = line.layout.bounds();
             if position.y > line_bounds.bottom() {
-                if let Some(next_line) = lines.peek() {
-                    if position.y < next_line.layout.bounds().top() {
-                        return Err(line.source_end);
-                    }
+                if let Some(next_line) = lines.peek()
+                    && position.y < next_line.layout.bounds().top()
+                {
+                    return Err(line.source_end);
                 }
 
                 continue;
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
index 27691f2ecf..890d564b7a 100644
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -300,13 +300,12 @@ impl<'a> MarkdownParser<'a> {
 
                     if style != MarkdownHighlightStyle::default() && last_run_len < text.len() {
                         let mut new_highlight = true;
-                        if let Some((last_range, last_style)) = highlights.last_mut() {
-                            if last_range.end == last_run_len
-                                && last_style == &MarkdownHighlight::Style(style.clone())
-                            {
-                                last_range.end = text.len();
-                                new_highlight = false;
-                            }
+                        if let Some((last_range, last_style)) = highlights.last_mut()
+                            && last_range.end == last_run_len
+                            && last_style == &MarkdownHighlight::Style(style.clone())
+                        {
+                            last_range.end = text.len();
+                            new_highlight = false;
                         }
                         if new_highlight {
                             highlights.push((
@@ -579,10 +578,10 @@ impl<'a> MarkdownParser<'a> {
                             }
                         } else {
                             let block = self.parse_block().await;
-                            if let Some(block) = block {
-                                if let Some(list_item) = items_stack.last_mut() {
-                                    list_item.content.extend(block);
-                                }
+                            if let Some(block) = block
+                                && let Some(list_item) = items_stack.last_mut()
+                            {
+                                list_item.content.extend(block);
                             }
                         }
                     }
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index a0c8819991..c2b98f69c8 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -151,10 +151,9 @@ impl MarkdownPreviewView {
         if let Some(editor) = workspace
             .active_item(cx)
             .and_then(|item| item.act_as::<Editor>(cx))
+            && Self::is_markdown_file(&editor, cx)
         {
-            if Self::is_markdown_file(&editor, cx) {
-                return Some(editor);
-            }
+            return Some(editor);
         }
         None
     }
@@ -243,32 +242,30 @@ impl MarkdownPreviewView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(item) = active_item {
-            if item.item_id() != cx.entity_id() {
-                if let Some(editor) = item.act_as::<Editor>(cx) {
-                    if Self::is_markdown_file(&editor, cx) {
-                        self.set_editor(editor, window, cx);
-                    }
-                }
-            }
+        if let Some(item) = active_item
+            && item.item_id() != cx.entity_id()
+            && let Some(editor) = item.act_as::<Editor>(cx)
+            && Self::is_markdown_file(&editor, cx)
+        {
+            self.set_editor(editor, window, cx);
         }
     }
 
     pub fn is_markdown_file<V>(editor: &Entity<Editor>, cx: &mut Context<V>) -> bool {
         let buffer = editor.read(cx).buffer().read(cx);
-        if let Some(buffer) = buffer.as_singleton() {
-            if let Some(language) = buffer.read(cx).language() {
-                return language.name() == "Markdown".into();
-            }
+        if let Some(buffer) = buffer.as_singleton()
+            && let Some(language) = buffer.read(cx).language()
+        {
+            return language.name() == "Markdown".into();
         }
         false
     }
 
     fn set_editor(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active) = &self.active_editor {
-            if active.editor == editor {
-                return;
-            }
+        if let Some(active) = &self.active_editor
+            && active.editor == editor
+        {
+            return;
         }
 
         let subscription = cx.subscribe_in(
@@ -552,21 +549,20 @@ impl Render for MarkdownPreviewView {
                                 .group("markdown-block")
                                 .on_click(cx.listener(
                                     move |this, event: &ClickEvent, window, cx| {
-                                        if event.click_count() == 2 {
-                                            if let Some(source_range) = this
+                                        if event.click_count() == 2
+                                            && let Some(source_range) = this
                                                 .contents
                                                 .as_ref()
                                                 .and_then(|c| c.children.get(ix))
                                                 .and_then(|block: &ParsedMarkdownElement| {
                                                     block.source_range()
                                                 })
-                                            {
-                                                this.move_cursor_to_block(
-                                                    window,
-                                                    cx,
-                                                    source_range.start..source_range.start,
-                                                );
-                                            }
+                                        {
+                                            this.move_cursor_to_block(
+                                                window,
+                                                cx,
+                                                source_range.start..source_range.start,
+                                            );
                                         }
                                     },
                                 ))
diff --git a/crates/migrator/src/migrations/m_2025_06_16/settings.rs b/crates/migrator/src/migrations/m_2025_06_16/settings.rs
index cce407e21b..cd79eae204 100644
--- a/crates/migrator/src/migrations/m_2025_06_16/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_06_16/settings.rs
@@ -40,20 +40,20 @@ fn migrate_context_server_settings(
     // Parse the server settings to check what keys it contains
     let mut cursor = server_settings.walk();
     for child in server_settings.children(&mut cursor) {
-        if child.kind() == "pair" {
-            if let Some(key_node) = child.child_by_field_name("key") {
-                if let (None, Some(quote_content)) = (column, key_node.child(0)) {
-                    column = Some(quote_content.start_position().column);
-                }
-                if let Some(string_content) = key_node.child(1) {
-                    let key = &contents[string_content.byte_range()];
-                    match key {
-                        // If it already has a source key, don't modify it
-                        "source" => return None,
-                        "command" => has_command = true,
-                        "settings" => has_settings = true,
-                        _ => other_keys += 1,
-                    }
+        if child.kind() == "pair"
+            && let Some(key_node) = child.child_by_field_name("key")
+        {
+            if let (None, Some(quote_content)) = (column, key_node.child(0)) {
+                column = Some(quote_content.start_position().column);
+            }
+            if let Some(string_content) = key_node.child(1) {
+                let key = &contents[string_content.byte_range()];
+                match key {
+                    // If it already has a source key, don't modify it
+                    "source" => return None,
+                    "command" => has_command = true,
+                    "settings" => has_settings = true,
+                    _ => other_keys += 1,
                 }
             }
         }
diff --git a/crates/migrator/src/migrations/m_2025_06_25/settings.rs b/crates/migrator/src/migrations/m_2025_06_25/settings.rs
index 5dd6c3093a..2bf7658eeb 100644
--- a/crates/migrator/src/migrations/m_2025_06_25/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_06_25/settings.rs
@@ -84,10 +84,10 @@ fn remove_pair_with_whitespace(
         }
     } else {
         // If no next sibling, check if there's a comma before
-        if let Some(prev_sibling) = pair_node.prev_sibling() {
-            if prev_sibling.kind() == "," {
-                range_to_remove.start = prev_sibling.start_byte();
-            }
+        if let Some(prev_sibling) = pair_node.prev_sibling()
+            && prev_sibling.kind() == ","
+        {
+            range_to_remove.start = prev_sibling.start_byte();
         }
     }
 
@@ -123,10 +123,10 @@ fn remove_pair_with_whitespace(
 
     // Also check if we need to include trailing whitespace up to the next line
     let text_after = &contents[range_to_remove.end..];
-    if let Some(newline_pos) = text_after.find('\n') {
-        if text_after[..newline_pos].chars().all(|c| c.is_whitespace()) {
-            range_to_remove.end += newline_pos + 1;
-        }
+    if let Some(newline_pos) = text_after.find('\n')
+        && text_after[..newline_pos].chars().all(|c| c.is_whitespace())
+    {
+        range_to_remove.end += newline_pos + 1;
     }
 
     Some((range_to_remove, String::new()))
diff --git a/crates/migrator/src/migrations/m_2025_06_27/settings.rs b/crates/migrator/src/migrations/m_2025_06_27/settings.rs
index 6156308fce..e3e951b1a6 100644
--- a/crates/migrator/src/migrations/m_2025_06_27/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_06_27/settings.rs
@@ -56,19 +56,18 @@ fn flatten_context_server_command(
 
     let mut cursor = command_object.walk();
     for child in command_object.children(&mut cursor) {
-        if child.kind() == "pair" {
-            if let Some(key_node) = child.child_by_field_name("key") {
-                if let Some(string_content) = key_node.child(1) {
-                    let key = &contents[string_content.byte_range()];
-                    if let Some(value_node) = child.child_by_field_name("value") {
-                        let value_range = value_node.byte_range();
-                        match key {
-                            "path" => path_value = Some(&contents[value_range]),
-                            "args" => args_value = Some(&contents[value_range]),
-                            "env" => env_value = Some(&contents[value_range]),
-                            _ => {}
-                        }
-                    }
+        if child.kind() == "pair"
+            && let Some(key_node) = child.child_by_field_name("key")
+            && let Some(string_content) = key_node.child(1)
+        {
+            let key = &contents[string_content.byte_range()];
+            if let Some(value_node) = child.child_by_field_name("value") {
+                let value_range = value_node.byte_range();
+                match key {
+                    "path" => path_value = Some(&contents[value_range]),
+                    "args" => args_value = Some(&contents[value_range]),
+                    "env" => env_value = Some(&contents[value_range]),
+                    _ => {}
                 }
             }
         }
diff --git a/crates/multi_buffer/src/anchor.rs b/crates/multi_buffer/src/anchor.rs
index 8584519d56..6bed0a4028 100644
--- a/crates/multi_buffer/src/anchor.rs
+++ b/crates/multi_buffer/src/anchor.rs
@@ -76,27 +76,26 @@ impl Anchor {
             if text_cmp.is_ne() {
                 return text_cmp;
             }
-            if self.diff_base_anchor.is_some() || other.diff_base_anchor.is_some() {
-                if let Some(base_text) = snapshot
+            if (self.diff_base_anchor.is_some() || other.diff_base_anchor.is_some())
+                && let Some(base_text) = snapshot
                     .diffs
                     .get(&excerpt.buffer_id)
                     .map(|diff| diff.base_text())
-                {
-                    let self_anchor = self.diff_base_anchor.filter(|a| base_text.can_resolve(a));
-                    let other_anchor = other.diff_base_anchor.filter(|a| base_text.can_resolve(a));
-                    return match (self_anchor, other_anchor) {
-                        (Some(a), Some(b)) => a.cmp(&b, base_text),
-                        (Some(_), None) => match other.text_anchor.bias {
-                            Bias::Left => Ordering::Greater,
-                            Bias::Right => Ordering::Less,
-                        },
-                        (None, Some(_)) => match self.text_anchor.bias {
-                            Bias::Left => Ordering::Less,
-                            Bias::Right => Ordering::Greater,
-                        },
-                        (None, None) => Ordering::Equal,
-                    };
-                }
+            {
+                let self_anchor = self.diff_base_anchor.filter(|a| base_text.can_resolve(a));
+                let other_anchor = other.diff_base_anchor.filter(|a| base_text.can_resolve(a));
+                return match (self_anchor, other_anchor) {
+                    (Some(a), Some(b)) => a.cmp(&b, base_text),
+                    (Some(_), None) => match other.text_anchor.bias {
+                        Bias::Left => Ordering::Greater,
+                        Bias::Right => Ordering::Less,
+                    },
+                    (None, Some(_)) => match self.text_anchor.bias {
+                        Bias::Left => Ordering::Less,
+                        Bias::Right => Ordering::Greater,
+                    },
+                    (None, None) => Ordering::Equal,
+                };
             }
         }
         Ordering::Equal
@@ -107,51 +106,49 @@ impl Anchor {
     }
 
     pub fn bias_left(&self, snapshot: &MultiBufferSnapshot) -> Anchor {
-        if self.text_anchor.bias != Bias::Left {
-            if let Some(excerpt) = snapshot.excerpt(self.excerpt_id) {
-                return Self {
-                    buffer_id: self.buffer_id,
-                    excerpt_id: self.excerpt_id,
-                    text_anchor: self.text_anchor.bias_left(&excerpt.buffer),
-                    diff_base_anchor: self.diff_base_anchor.map(|a| {
-                        if let Some(base_text) = snapshot
-                            .diffs
-                            .get(&excerpt.buffer_id)
-                            .map(|diff| diff.base_text())
-                        {
-                            if a.buffer_id == Some(base_text.remote_id()) {
-                                return a.bias_left(base_text);
-                            }
-                        }
-                        a
-                    }),
-                };
-            }
+        if self.text_anchor.bias != Bias::Left
+            && let Some(excerpt) = snapshot.excerpt(self.excerpt_id)
+        {
+            return Self {
+                buffer_id: self.buffer_id,
+                excerpt_id: self.excerpt_id,
+                text_anchor: self.text_anchor.bias_left(&excerpt.buffer),
+                diff_base_anchor: self.diff_base_anchor.map(|a| {
+                    if let Some(base_text) = snapshot
+                        .diffs
+                        .get(&excerpt.buffer_id)
+                        .map(|diff| diff.base_text())
+                        && a.buffer_id == Some(base_text.remote_id())
+                    {
+                        return a.bias_left(base_text);
+                    }
+                    a
+                }),
+            };
         }
         *self
     }
 
     pub fn bias_right(&self, snapshot: &MultiBufferSnapshot) -> Anchor {
-        if self.text_anchor.bias != Bias::Right {
-            if let Some(excerpt) = snapshot.excerpt(self.excerpt_id) {
-                return Self {
-                    buffer_id: self.buffer_id,
-                    excerpt_id: self.excerpt_id,
-                    text_anchor: self.text_anchor.bias_right(&excerpt.buffer),
-                    diff_base_anchor: self.diff_base_anchor.map(|a| {
-                        if let Some(base_text) = snapshot
-                            .diffs
-                            .get(&excerpt.buffer_id)
-                            .map(|diff| diff.base_text())
-                        {
-                            if a.buffer_id == Some(base_text.remote_id()) {
-                                return a.bias_right(base_text);
-                            }
-                        }
-                        a
-                    }),
-                };
-            }
+        if self.text_anchor.bias != Bias::Right
+            && let Some(excerpt) = snapshot.excerpt(self.excerpt_id)
+        {
+            return Self {
+                buffer_id: self.buffer_id,
+                excerpt_id: self.excerpt_id,
+                text_anchor: self.text_anchor.bias_right(&excerpt.buffer),
+                diff_base_anchor: self.diff_base_anchor.map(|a| {
+                    if let Some(base_text) = snapshot
+                        .diffs
+                        .get(&excerpt.buffer_id)
+                        .map(|diff| diff.base_text())
+                        && a.buffer_id == Some(base_text.remote_id())
+                    {
+                        return a.bias_right(base_text);
+                    }
+                    a
+                }),
+            };
         }
         *self
     }
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 59eaa9934d..ab5f148d6c 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -1082,11 +1082,11 @@ impl MultiBuffer {
 
                 let mut ranges: Vec<Range<usize>> = Vec::new();
                 for edit in edits {
-                    if let Some(last_range) = ranges.last_mut() {
-                        if edit.range.start <= last_range.end {
-                            last_range.end = last_range.end.max(edit.range.end);
-                            continue;
-                        }
+                    if let Some(last_range) = ranges.last_mut()
+                        && edit.range.start <= last_range.end
+                    {
+                        last_range.end = last_range.end.max(edit.range.end);
+                        continue;
                     }
                     ranges.push(edit.range);
                 }
@@ -1212,25 +1212,24 @@ impl MultiBuffer {
             for range in buffer.edited_ranges_for_transaction_id::<D>(*buffer_transaction) {
                 for excerpt_id in &buffer_state.excerpts {
                     cursor.seek(excerpt_id, Bias::Left);
-                    if let Some(excerpt) = cursor.item() {
-                        if excerpt.locator == *excerpt_id {
-                            let excerpt_buffer_start =
-                                excerpt.range.context.start.summary::<D>(buffer);
-                            let excerpt_buffer_end = excerpt.range.context.end.summary::<D>(buffer);
-                            let excerpt_range = excerpt_buffer_start..excerpt_buffer_end;
-                            if excerpt_range.contains(&range.start)
-                                && excerpt_range.contains(&range.end)
-                            {
-                                let excerpt_start = D::from_text_summary(&cursor.start().text);
+                    if let Some(excerpt) = cursor.item()
+                        && excerpt.locator == *excerpt_id
+                    {
+                        let excerpt_buffer_start = excerpt.range.context.start.summary::<D>(buffer);
+                        let excerpt_buffer_end = excerpt.range.context.end.summary::<D>(buffer);
+                        let excerpt_range = excerpt_buffer_start..excerpt_buffer_end;
+                        if excerpt_range.contains(&range.start)
+                            && excerpt_range.contains(&range.end)
+                        {
+                            let excerpt_start = D::from_text_summary(&cursor.start().text);
 
-                                let mut start = excerpt_start;
-                                start.add_assign(&(range.start - excerpt_buffer_start));
-                                let mut end = excerpt_start;
-                                end.add_assign(&(range.end - excerpt_buffer_start));
+                            let mut start = excerpt_start;
+                            start.add_assign(&(range.start - excerpt_buffer_start));
+                            let mut end = excerpt_start;
+                            end.add_assign(&(range.end - excerpt_buffer_start));
 
-                                ranges.push(start..end);
-                                break;
-                            }
+                            ranges.push(start..end);
+                            break;
                         }
                     }
                 }
@@ -1251,25 +1250,25 @@ impl MultiBuffer {
             buffer.update(cx, |buffer, _| {
                 buffer.merge_transactions(transaction, destination)
             });
-        } else if let Some(transaction) = self.history.forget(transaction) {
-            if let Some(destination) = self.history.transaction_mut(destination) {
-                for (buffer_id, buffer_transaction_id) in transaction.buffer_transactions {
-                    if let Some(destination_buffer_transaction_id) =
-                        destination.buffer_transactions.get(&buffer_id)
-                    {
-                        if let Some(state) = self.buffers.borrow().get(&buffer_id) {
-                            state.buffer.update(cx, |buffer, _| {
-                                buffer.merge_transactions(
-                                    buffer_transaction_id,
-                                    *destination_buffer_transaction_id,
-                                )
-                            });
-                        }
-                    } else {
-                        destination
-                            .buffer_transactions
-                            .insert(buffer_id, buffer_transaction_id);
+        } else if let Some(transaction) = self.history.forget(transaction)
+            && let Some(destination) = self.history.transaction_mut(destination)
+        {
+            for (buffer_id, buffer_transaction_id) in transaction.buffer_transactions {
+                if let Some(destination_buffer_transaction_id) =
+                    destination.buffer_transactions.get(&buffer_id)
+                {
+                    if let Some(state) = self.buffers.borrow().get(&buffer_id) {
+                        state.buffer.update(cx, |buffer, _| {
+                            buffer.merge_transactions(
+                                buffer_transaction_id,
+                                *destination_buffer_transaction_id,
+                            )
+                        });
                     }
+                } else {
+                    destination
+                        .buffer_transactions
+                        .insert(buffer_id, buffer_transaction_id);
                 }
             }
         }
@@ -1562,11 +1561,11 @@ impl MultiBuffer {
             });
             let mut merged_ranges: Vec<ExcerptRange<Point>> = Vec::new();
             for range in expanded_ranges {
-                if let Some(last_range) = merged_ranges.last_mut() {
-                    if last_range.context.end >= range.context.start {
-                        last_range.context.end = range.context.end;
-                        continue;
-                    }
+                if let Some(last_range) = merged_ranges.last_mut()
+                    && last_range.context.end >= range.context.start
+                {
+                    last_range.context.end = range.context.end;
+                    continue;
                 }
                 merged_ranges.push(range)
             }
@@ -1794,25 +1793,25 @@ impl MultiBuffer {
             };
 
             if let Some((last_id, last)) = to_insert.last_mut() {
-                if let Some(new) = new {
-                    if last.context.end >= new.context.start {
-                        last.context.end = last.context.end.max(new.context.end);
-                        excerpt_ids.push(*last_id);
-                        new_iter.next();
-                        continue;
-                    }
+                if let Some(new) = new
+                    && last.context.end >= new.context.start
+                {
+                    last.context.end = last.context.end.max(new.context.end);
+                    excerpt_ids.push(*last_id);
+                    new_iter.next();
+                    continue;
                 }
-                if let Some((existing_id, existing_range)) = &existing {
-                    if last.context.end >= existing_range.start {
-                        last.context.end = last.context.end.max(existing_range.end);
-                        to_remove.push(*existing_id);
-                        self.snapshot
-                            .borrow_mut()
-                            .replaced_excerpts
-                            .insert(*existing_id, *last_id);
-                        existing_iter.next();
-                        continue;
-                    }
+                if let Some((existing_id, existing_range)) = &existing
+                    && last.context.end >= existing_range.start
+                {
+                    last.context.end = last.context.end.max(existing_range.end);
+                    to_remove.push(*existing_id);
+                    self.snapshot
+                        .borrow_mut()
+                        .replaced_excerpts
+                        .insert(*existing_id, *last_id);
+                    existing_iter.next();
+                    continue;
                 }
             }
 
@@ -2105,10 +2104,10 @@ impl MultiBuffer {
             .flatten()
         {
             cursor.seek_forward(&Some(locator), Bias::Left);
-            if let Some(excerpt) = cursor.item() {
-                if excerpt.locator == *locator {
-                    excerpts.push((excerpt.id, excerpt.range.clone()));
-                }
+            if let Some(excerpt) = cursor.item()
+                && excerpt.locator == *locator
+            {
+                excerpts.push((excerpt.id, excerpt.range.clone()));
             }
         }
 
@@ -2132,22 +2131,21 @@ impl MultiBuffer {
         let mut result = Vec::new();
         for locator in locators {
             excerpts.seek_forward(&Some(locator), Bias::Left);
-            if let Some(excerpt) = excerpts.item() {
-                if excerpt.locator == *locator {
-                    let excerpt_start = excerpts.start().1.clone();
-                    let excerpt_end =
-                        ExcerptDimension(excerpt_start.0 + excerpt.text_summary.lines);
+            if let Some(excerpt) = excerpts.item()
+                && excerpt.locator == *locator
+            {
+                let excerpt_start = excerpts.start().1.clone();
+                let excerpt_end = ExcerptDimension(excerpt_start.0 + excerpt.text_summary.lines);
 
-                    diff_transforms.seek_forward(&excerpt_start, Bias::Left);
-                    let overshoot = excerpt_start.0 - diff_transforms.start().0.0;
-                    let start = diff_transforms.start().1.0 + overshoot;
+                diff_transforms.seek_forward(&excerpt_start, Bias::Left);
+                let overshoot = excerpt_start.0 - diff_transforms.start().0.0;
+                let start = diff_transforms.start().1.0 + overshoot;
 
-                    diff_transforms.seek_forward(&excerpt_end, Bias::Right);
-                    let overshoot = excerpt_end.0 - diff_transforms.start().0.0;
-                    let end = diff_transforms.start().1.0 + overshoot;
+                diff_transforms.seek_forward(&excerpt_end, Bias::Right);
+                let overshoot = excerpt_end.0 - diff_transforms.start().0.0;
+                let end = diff_transforms.start().1.0 + overshoot;
 
-                    result.push(start..end)
-                }
+                result.push(start..end)
             }
         }
         result
@@ -2316,12 +2314,12 @@ impl MultiBuffer {
                     // Skip over any subsequent excerpts that are also removed.
                     if let Some(&next_excerpt_id) = excerpt_ids.peek() {
                         let next_locator = snapshot.excerpt_locator_for_id(next_excerpt_id);
-                        if let Some(next_excerpt) = cursor.item() {
-                            if next_excerpt.locator == *next_locator {
-                                excerpt_ids.next();
-                                excerpt = next_excerpt;
-                                continue 'remove_excerpts;
-                            }
+                        if let Some(next_excerpt) = cursor.item()
+                            && next_excerpt.locator == *next_locator
+                        {
+                            excerpt_ids.next();
+                            excerpt = next_excerpt;
+                            continue 'remove_excerpts;
                         }
                     }
 
@@ -2494,33 +2492,33 @@ impl MultiBuffer {
                 .excerpts
                 .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(&());
             cursor.seek_forward(&Some(locator), Bias::Left);
-            if let Some(excerpt) = cursor.item() {
-                if excerpt.locator == *locator {
-                    let excerpt_buffer_range = excerpt.range.context.to_offset(&excerpt.buffer);
-                    if diff_change_range.end < excerpt_buffer_range.start
-                        || diff_change_range.start > excerpt_buffer_range.end
-                    {
-                        continue;
-                    }
-                    let excerpt_start = cursor.start().1;
-                    let excerpt_len = ExcerptOffset::new(excerpt.text_summary.len);
-                    let diff_change_start_in_excerpt = ExcerptOffset::new(
-                        diff_change_range
-                            .start
-                            .saturating_sub(excerpt_buffer_range.start),
-                    );
-                    let diff_change_end_in_excerpt = ExcerptOffset::new(
-                        diff_change_range
-                            .end
-                            .saturating_sub(excerpt_buffer_range.start),
-                    );
-                    let edit_start = excerpt_start + diff_change_start_in_excerpt.min(excerpt_len);
-                    let edit_end = excerpt_start + diff_change_end_in_excerpt.min(excerpt_len);
-                    excerpt_edits.push(Edit {
-                        old: edit_start..edit_end,
-                        new: edit_start..edit_end,
-                    });
+            if let Some(excerpt) = cursor.item()
+                && excerpt.locator == *locator
+            {
+                let excerpt_buffer_range = excerpt.range.context.to_offset(&excerpt.buffer);
+                if diff_change_range.end < excerpt_buffer_range.start
+                    || diff_change_range.start > excerpt_buffer_range.end
+                {
+                    continue;
                 }
+                let excerpt_start = cursor.start().1;
+                let excerpt_len = ExcerptOffset::new(excerpt.text_summary.len);
+                let diff_change_start_in_excerpt = ExcerptOffset::new(
+                    diff_change_range
+                        .start
+                        .saturating_sub(excerpt_buffer_range.start),
+                );
+                let diff_change_end_in_excerpt = ExcerptOffset::new(
+                    diff_change_range
+                        .end
+                        .saturating_sub(excerpt_buffer_range.start),
+                );
+                let edit_start = excerpt_start + diff_change_start_in_excerpt.min(excerpt_len);
+                let edit_end = excerpt_start + diff_change_end_in_excerpt.min(excerpt_len);
+                excerpt_edits.push(Edit {
+                    old: edit_start..edit_end,
+                    new: edit_start..edit_end,
+                });
             }
         }
 
@@ -3155,13 +3153,12 @@ impl MultiBuffer {
                 at_transform_boundary = false;
                 let transforms_before_edit = old_diff_transforms.slice(&edit.old.start, Bias::Left);
                 self.append_diff_transforms(&mut new_diff_transforms, transforms_before_edit);
-                if let Some(transform) = old_diff_transforms.item() {
-                    if old_diff_transforms.end().0 == edit.old.start
-                        && old_diff_transforms.start().0 < edit.old.start
-                    {
-                        self.push_diff_transform(&mut new_diff_transforms, transform.clone());
-                        old_diff_transforms.next();
-                    }
+                if let Some(transform) = old_diff_transforms.item()
+                    && old_diff_transforms.end().0 == edit.old.start
+                    && old_diff_transforms.start().0 < edit.old.start
+                {
+                    self.push_diff_transform(&mut new_diff_transforms, transform.clone());
+                    old_diff_transforms.next();
                 }
             }
 
@@ -3431,18 +3428,17 @@ impl MultiBuffer {
             inserted_hunk_info,
             summary,
         }) = subtree.first()
-        {
-            if self.extend_last_buffer_content_transform(
+            && self.extend_last_buffer_content_transform(
                 new_transforms,
                 *inserted_hunk_info,
                 *summary,
-            ) {
-                let mut cursor = subtree.cursor::<()>(&());
-                cursor.next();
-                cursor.next();
-                new_transforms.append(cursor.suffix(), &());
-                return;
-            }
+            )
+        {
+            let mut cursor = subtree.cursor::<()>(&());
+            cursor.next();
+            cursor.next();
+            new_transforms.append(cursor.suffix(), &());
+            return;
         }
         new_transforms.append(subtree, &());
     }
@@ -3456,14 +3452,13 @@ impl MultiBuffer {
             inserted_hunk_info: inserted_hunk_anchor,
             summary,
         } = transform
-        {
-            if self.extend_last_buffer_content_transform(
+            && self.extend_last_buffer_content_transform(
                 new_transforms,
                 inserted_hunk_anchor,
                 summary,
-            ) {
-                return;
-            }
+            )
+        {
+            return;
         }
         new_transforms.push(transform, &());
     }
@@ -3518,11 +3513,10 @@ impl MultiBuffer {
                     summary,
                     inserted_hunk_info: inserted_hunk_anchor,
                 } = last_transform
+                    && *inserted_hunk_anchor == new_inserted_hunk_info
                 {
-                    if *inserted_hunk_anchor == new_inserted_hunk_info {
-                        *summary += summary_to_add;
-                        did_extend = true;
-                    }
+                    *summary += summary_to_add;
+                    did_extend = true;
                 }
             },
             &(),
@@ -4037,10 +4031,10 @@ impl MultiBufferSnapshot {
 
         cursor.seek(&query_range.start);
 
-        if let Some(region) = cursor.region().filter(|region| !region.is_main_buffer) {
-            if region.range.start > D::zero(&()) {
-                cursor.prev()
-            }
+        if let Some(region) = cursor.region().filter(|region| !region.is_main_buffer)
+            && region.range.start > D::zero(&())
+        {
+            cursor.prev()
         }
 
         iter::from_fn(move || {
@@ -4070,10 +4064,10 @@ impl MultiBufferSnapshot {
                         buffer_start = cursor.main_buffer_position()?;
                     };
                     let mut buffer_end = excerpt.range.context.end.summary::<D>(&excerpt.buffer);
-                    if let Some((end_excerpt_id, end_buffer_offset)) = range_end {
-                        if excerpt.id == end_excerpt_id {
-                            buffer_end = buffer_end.min(end_buffer_offset);
-                        }
+                    if let Some((end_excerpt_id, end_buffer_offset)) = range_end
+                        && excerpt.id == end_excerpt_id
+                    {
+                        buffer_end = buffer_end.min(end_buffer_offset);
                     }
 
                     if let Some(iterator) =
@@ -4144,10 +4138,10 @@ impl MultiBufferSnapshot {
                 // When there are no more metadata items for this excerpt, move to the next excerpt.
                 else {
                     current_excerpt_metadata.take();
-                    if let Some((end_excerpt_id, _)) = range_end {
-                        if excerpt.id == end_excerpt_id {
-                            return None;
-                        }
+                    if let Some((end_excerpt_id, _)) = range_end
+                        && excerpt.id == end_excerpt_id
+                    {
+                        return None;
                     }
                     cursor.next_excerpt();
                 }
@@ -4622,20 +4616,20 @@ impl MultiBufferSnapshot {
     pub fn indent_and_comment_for_line(&self, row: MultiBufferRow, cx: &App) -> String {
         let mut indent = self.indent_size_for_line(row).chars().collect::<String>();
 
-        if self.language_settings(cx).extend_comment_on_newline {
-            if let Some(language_scope) = self.language_scope_at(Point::new(row.0, 0)) {
-                let delimiters = language_scope.line_comment_prefixes();
-                for delimiter in delimiters {
-                    if *self
-                        .chars_at(Point::new(row.0, indent.len() as u32))
-                        .take(delimiter.chars().count())
-                        .collect::<String>()
-                        .as_str()
-                        == **delimiter
-                    {
-                        indent.push_str(delimiter);
-                        break;
-                    }
+        if self.language_settings(cx).extend_comment_on_newline
+            && let Some(language_scope) = self.language_scope_at(Point::new(row.0, 0))
+        {
+            let delimiters = language_scope.line_comment_prefixes();
+            for delimiter in delimiters {
+                if *self
+                    .chars_at(Point::new(row.0, indent.len() as u32))
+                    .take(delimiter.chars().count())
+                    .collect::<String>()
+                    .as_str()
+                    == **delimiter
+                {
+                    indent.push_str(delimiter);
+                    break;
                 }
             }
         }
@@ -4893,25 +4887,22 @@ impl MultiBufferSnapshot {
                     base_text_byte_range,
                     ..
                 }) => {
-                    if let Some(diff_base_anchor) = &anchor.diff_base_anchor {
-                        if let Some(base_text) =
+                    if let Some(diff_base_anchor) = &anchor.diff_base_anchor
+                        && let Some(base_text) =
                             self.diffs.get(buffer_id).map(|diff| diff.base_text())
+                        && base_text.can_resolve(diff_base_anchor)
+                    {
+                        let base_text_offset = diff_base_anchor.to_offset(base_text);
+                        if base_text_offset >= base_text_byte_range.start
+                            && base_text_offset <= base_text_byte_range.end
                         {
-                            if base_text.can_resolve(diff_base_anchor) {
-                                let base_text_offset = diff_base_anchor.to_offset(base_text);
-                                if base_text_offset >= base_text_byte_range.start
-                                    && base_text_offset <= base_text_byte_range.end
-                                {
-                                    let position_in_hunk = base_text
-                                        .text_summary_for_range::<D, _>(
-                                            base_text_byte_range.start..base_text_offset,
-                                        );
-                                    position.add_assign(&position_in_hunk);
-                                } else if at_transform_end {
-                                    diff_transforms.next();
-                                    continue;
-                                }
-                            }
+                            let position_in_hunk = base_text.text_summary_for_range::<D, _>(
+                                base_text_byte_range.start..base_text_offset,
+                            );
+                            position.add_assign(&position_in_hunk);
+                        } else if at_transform_end {
+                            diff_transforms.next();
+                            continue;
                         }
                     }
                 }
@@ -4941,20 +4932,19 @@ impl MultiBufferSnapshot {
         }
 
         let mut position = cursor.start().1;
-        if let Some(excerpt) = cursor.item() {
-            if excerpt.id == anchor.excerpt_id {
-                let excerpt_buffer_start = excerpt
-                    .buffer
-                    .offset_for_anchor(&excerpt.range.context.start);
-                let excerpt_buffer_end =
-                    excerpt.buffer.offset_for_anchor(&excerpt.range.context.end);
-                let buffer_position = cmp::min(
-                    excerpt_buffer_end,
-                    excerpt.buffer.offset_for_anchor(&anchor.text_anchor),
-                );
-                if buffer_position > excerpt_buffer_start {
-                    position.value += buffer_position - excerpt_buffer_start;
-                }
+        if let Some(excerpt) = cursor.item()
+            && excerpt.id == anchor.excerpt_id
+        {
+            let excerpt_buffer_start = excerpt
+                .buffer
+                .offset_for_anchor(&excerpt.range.context.start);
+            let excerpt_buffer_end = excerpt.buffer.offset_for_anchor(&excerpt.range.context.end);
+            let buffer_position = cmp::min(
+                excerpt_buffer_end,
+                excerpt.buffer.offset_for_anchor(&anchor.text_anchor),
+            );
+            if buffer_position > excerpt_buffer_start {
+                position.value += buffer_position - excerpt_buffer_start;
             }
         }
         position
@@ -5211,14 +5201,15 @@ impl MultiBufferSnapshot {
             .cursor::<Dimensions<usize, ExcerptOffset>>(&());
         diff_transforms.seek(&offset, Bias::Right);
 
-        if offset == diff_transforms.start().0 && bias == Bias::Left {
-            if let Some(prev_item) = diff_transforms.prev_item() {
-                match prev_item {
-                    DiffTransform::DeletedHunk { .. } => {
-                        diff_transforms.prev();
-                    }
-                    _ => {}
+        if offset == diff_transforms.start().0
+            && bias == Bias::Left
+            && let Some(prev_item) = diff_transforms.prev_item()
+        {
+            match prev_item {
+                DiffTransform::DeletedHunk { .. } => {
+                    diff_transforms.prev();
                 }
+                _ => {}
             }
         }
         let offset_in_transform = offset - diff_transforms.start().0;
@@ -5296,17 +5287,17 @@ impl MultiBufferSnapshot {
         let locator = self.excerpt_locator_for_id(excerpt_id);
         let mut cursor = self.excerpts.cursor::<Option<&Locator>>(&());
         cursor.seek(locator, Bias::Left);
-        if let Some(excerpt) = cursor.item() {
-            if excerpt.id == excerpt_id {
-                let text_anchor = excerpt.clip_anchor(text_anchor);
-                drop(cursor);
-                return Some(Anchor {
-                    buffer_id: Some(excerpt.buffer_id),
-                    excerpt_id,
-                    text_anchor,
-                    diff_base_anchor: None,
-                });
-            }
+        if let Some(excerpt) = cursor.item()
+            && excerpt.id == excerpt_id
+        {
+            let text_anchor = excerpt.clip_anchor(text_anchor);
+            drop(cursor);
+            return Some(Anchor {
+                buffer_id: Some(excerpt.buffer_id),
+                excerpt_id,
+                text_anchor,
+                diff_base_anchor: None,
+            });
         }
         None
     }
@@ -5860,10 +5851,10 @@ impl MultiBufferSnapshot {
             let current_depth = indent_stack.len() as u32;
 
             // Avoid retrieving the language settings repeatedly for every buffer row.
-            if let Some((prev_buffer_id, _)) = &prev_settings {
-                if prev_buffer_id != &buffer.remote_id() {
-                    prev_settings.take();
-                }
+            if let Some((prev_buffer_id, _)) = &prev_settings
+                && prev_buffer_id != &buffer.remote_id()
+            {
+                prev_settings.take();
             }
             let settings = &prev_settings
                 .get_or_insert_with(|| {
@@ -6192,10 +6183,10 @@ impl MultiBufferSnapshot {
         } else {
             let mut cursor = self.excerpt_ids.cursor::<ExcerptId>(&());
             cursor.seek(&id, Bias::Left);
-            if let Some(entry) = cursor.item() {
-                if entry.id == id {
-                    return &entry.locator;
-                }
+            if let Some(entry) = cursor.item()
+                && entry.id == id
+            {
+                return &entry.locator;
             }
             panic!("invalid excerpt id {id:?}")
         }
@@ -6272,10 +6263,10 @@ impl MultiBufferSnapshot {
     pub fn buffer_range_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<Range<text::Anchor>> {
         let mut cursor = self.excerpts.cursor::<Option<&Locator>>(&());
         let locator = self.excerpt_locator_for_id(excerpt_id);
-        if cursor.seek(&Some(locator), Bias::Left) {
-            if let Some(excerpt) = cursor.item() {
-                return Some(excerpt.range.context.clone());
-            }
+        if cursor.seek(&Some(locator), Bias::Left)
+            && let Some(excerpt) = cursor.item()
+        {
+            return Some(excerpt.range.context.clone());
         }
         None
     }
@@ -6284,10 +6275,10 @@ impl MultiBufferSnapshot {
         let mut cursor = self.excerpts.cursor::<Option<&Locator>>(&());
         let locator = self.excerpt_locator_for_id(excerpt_id);
         cursor.seek(&Some(locator), Bias::Left);
-        if let Some(excerpt) = cursor.item() {
-            if excerpt.id == excerpt_id {
-                return Some(excerpt);
-            }
+        if let Some(excerpt) = cursor.item()
+            && excerpt.id == excerpt_id
+        {
+            return Some(excerpt);
         }
         None
     }
@@ -6446,13 +6437,12 @@ impl MultiBufferSnapshot {
                     inserted_hunk_info: prev_inserted_hunk_info,
                     ..
                 }) = prev_transform
+                    && *inserted_hunk_info == *prev_inserted_hunk_info
                 {
-                    if *inserted_hunk_info == *prev_inserted_hunk_info {
-                        panic!(
-                            "multiple adjacent buffer content transforms with is_inserted_hunk = {inserted_hunk_info:?}. transforms: {:+?}",
-                            self.diff_transforms.items(&())
-                        );
-                    }
+                    panic!(
+                        "multiple adjacent buffer content transforms with is_inserted_hunk = {inserted_hunk_info:?}. transforms: {:+?}",
+                        self.diff_transforms.items(&())
+                    );
                 }
                 if summary.len == 0 && !self.is_empty() {
                     panic!("empty buffer content transform");
@@ -6552,14 +6542,12 @@ where
                     self.excerpts.next();
                 } else if let Some(DiffTransform::DeletedHunk { hunk_info, .. }) =
                     self.diff_transforms.item()
-                {
-                    if self
+                    && self
                         .excerpts
                         .item()
                         .map_or(false, |excerpt| excerpt.id != hunk_info.excerpt_id)
-                    {
-                        self.excerpts.next();
-                    }
+                {
+                    self.excerpts.next();
                 }
             }
         }
@@ -7855,10 +7843,11 @@ impl io::Read for ReversedMultiBufferBytes<'_> {
         if len > 0 {
             self.range.end -= len;
             self.chunk = &self.chunk[..self.chunk.len() - len];
-            if !self.range.is_empty() && self.chunk.is_empty() {
-                if let Some(chunk) = self.chunks.next() {
-                    self.chunk = chunk.as_bytes();
-                }
+            if !self.range.is_empty()
+                && self.chunk.is_empty()
+                && let Some(chunk) = self.chunks.next()
+            {
+                self.chunk = chunk.as_bytes();
             }
         }
         Ok(len)
diff --git a/crates/multi_buffer/src/multi_buffer_tests.rs b/crates/multi_buffer/src/multi_buffer_tests.rs
index fefeddb4da..598ee0f9cb 100644
--- a/crates/multi_buffer/src/multi_buffer_tests.rs
+++ b/crates/multi_buffer/src/multi_buffer_tests.rs
@@ -3592,24 +3592,20 @@ fn assert_position_translation(snapshot: &MultiBufferSnapshot) {
 
     for (anchors, bias) in [(&left_anchors, Bias::Left), (&right_anchors, Bias::Right)] {
         for (ix, (offset, anchor)) in offsets.iter().zip(anchors).enumerate() {
-            if ix > 0 {
-                if *offset == 252 {
-                    if offset > &offsets[ix - 1] {
-                        let prev_anchor = left_anchors[ix - 1];
-                        assert!(
-                            anchor.cmp(&prev_anchor, snapshot).is_gt(),
-                            "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_gt()",
-                            offsets[ix],
-                            offsets[ix - 1],
-                        );
-                        assert!(
-                            prev_anchor.cmp(anchor, snapshot).is_lt(),
-                            "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_lt()",
-                            offsets[ix - 1],
-                            offsets[ix],
-                        );
-                    }
-                }
+            if ix > 0 && *offset == 252 && offset > &offsets[ix - 1] {
+                let prev_anchor = left_anchors[ix - 1];
+                assert!(
+                    anchor.cmp(&prev_anchor, snapshot).is_gt(),
+                    "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_gt()",
+                    offsets[ix],
+                    offsets[ix - 1],
+                );
+                assert!(
+                    prev_anchor.cmp(anchor, snapshot).is_lt(),
+                    "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_lt()",
+                    offsets[ix - 1],
+                    offsets[ix],
+                );
             }
         }
     }
diff --git a/crates/notifications/src/notification_store.rs b/crates/notifications/src/notification_store.rs
index 29653748e4..af2601bd18 100644
--- a/crates/notifications/src/notification_store.rs
+++ b/crates/notifications/src/notification_store.rs
@@ -138,10 +138,10 @@ impl NotificationStore {
     pub fn notification_for_id(&self, id: u64) -> Option<&NotificationEntry> {
         let mut cursor = self.notifications.cursor::<NotificationId>(&());
         cursor.seek(&NotificationId(id), Bias::Left);
-        if let Some(item) = cursor.item() {
-            if item.id == id {
-                return Some(item);
-            }
+        if let Some(item) = cursor.item()
+            && item.id == id
+        {
+            return Some(item);
         }
         None
     }
@@ -229,25 +229,24 @@ impl NotificationStore {
         mut cx: AsyncApp,
     ) -> Result<()> {
         this.update(&mut cx, |this, cx| {
-            if let Some(notification) = envelope.payload.notification {
-                if let Some(rpc::Notification::ChannelMessageMention { message_id, .. }) =
+            if let Some(notification) = envelope.payload.notification
+                && let Some(rpc::Notification::ChannelMessageMention { message_id, .. }) =
                     Notification::from_proto(&notification)
-                {
-                    let fetch_message_task = this.channel_store.update(cx, |this, cx| {
-                        this.fetch_channel_messages(vec![message_id], cx)
-                    });
+            {
+                let fetch_message_task = this.channel_store.update(cx, |this, cx| {
+                    this.fetch_channel_messages(vec![message_id], cx)
+                });
 
-                    cx.spawn(async move |this, cx| {
-                        let messages = fetch_message_task.await?;
-                        this.update(cx, move |this, cx| {
-                            for message in messages {
-                                this.channel_messages.insert(message_id, message);
-                            }
-                            cx.notify();
-                        })
+                cx.spawn(async move |this, cx| {
+                    let messages = fetch_message_task.await?;
+                    this.update(cx, move |this, cx| {
+                        for message in messages {
+                            this.channel_messages.insert(message_id, message);
+                        }
+                        cx.notify();
                     })
-                    .detach_and_log_err(cx)
-                }
+                })
+                .detach_and_log_err(cx)
             }
             Ok(())
         })?
@@ -390,12 +389,12 @@ impl NotificationStore {
                         });
                     }
                 }
-            } else if let Some(new_notification) = &new_notification {
-                if is_new {
-                    cx.emit(NotificationEvent::NewNotification {
-                        entry: new_notification.clone(),
-                    });
-                }
+            } else if let Some(new_notification) = &new_notification
+                && is_new
+            {
+                cx.emit(NotificationEvent::NewNotification {
+                    entry: new_notification.clone(),
+                });
             }
 
             if let Some(notification) = new_notification {
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index 3e6e406d98..7c304bad64 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -240,10 +240,10 @@ impl MessageContent {
 
 impl From<Vec<MessagePart>> for MessageContent {
     fn from(parts: Vec<MessagePart>) -> Self {
-        if parts.len() == 1 {
-            if let MessagePart::Text { text } = &parts[0] {
-                return Self::Plain(text.clone());
-            }
+        if parts.len() == 1
+            && let MessagePart::Text { text } = &parts[0]
+        {
+            return Self::Plain(text.clone());
         }
         Self::Multipart(parts)
     }
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 9514fd7e36..9b7ec473fd 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -1170,12 +1170,11 @@ impl OutlinePanel {
                     });
                 } else {
                     let mut offset = Point::default();
-                    if let Some(buffer_id) = scroll_to_buffer {
-                        if multi_buffer_snapshot.as_singleton().is_none()
-                            && !active_editor.read(cx).is_buffer_folded(buffer_id, cx)
-                        {
-                            offset.y = -(active_editor.read(cx).file_header_size() as f32);
-                        }
+                    if let Some(buffer_id) = scroll_to_buffer
+                        && multi_buffer_snapshot.as_singleton().is_none()
+                        && !active_editor.read(cx).is_buffer_folded(buffer_id, cx)
+                    {
+                        offset.y = -(active_editor.read(cx).file_header_size() as f32);
                     }
 
                     active_editor.update(cx, |editor, cx| {
@@ -1606,16 +1605,14 @@ impl OutlinePanel {
             }
             PanelEntry::FoldedDirs(folded_dirs) => {
                 let mut folded = false;
-                if let Some(dir_entry) = folded_dirs.entries.last() {
-                    if self
+                if let Some(dir_entry) = folded_dirs.entries.last()
+                    && self
                         .collapsed_entries
                         .insert(CollapsedEntry::Dir(folded_dirs.worktree_id, dir_entry.id))
-                    {
-                        folded = true;
-                        buffers_to_fold.extend(
-                            self.buffers_inside_directory(folded_dirs.worktree_id, dir_entry),
-                        );
-                    }
+                {
+                    folded = true;
+                    buffers_to_fold
+                        .extend(self.buffers_inside_directory(folded_dirs.worktree_id, dir_entry));
                 }
                 folded
             }
@@ -2108,11 +2105,11 @@ impl OutlinePanel {
                                 dirs_to_expand.push(current_entry.id);
                             }
 
-                            if traversal.back_to_parent() {
-                                if let Some(parent_entry) = traversal.entry() {
-                                    current_entry = parent_entry.clone();
-                                    continue;
-                                }
+                            if traversal.back_to_parent()
+                                && let Some(parent_entry) = traversal.entry()
+                            {
+                                current_entry = parent_entry.clone();
+                                continue;
                             }
                             break;
                         }
@@ -2475,17 +2472,17 @@ impl OutlinePanel {
         let search_data = match render_data.get() {
             Some(search_data) => search_data,
             None => {
-                if let ItemsDisplayMode::Search(search_state) = &mut self.mode {
-                    if let Some(multi_buffer_snapshot) = multi_buffer_snapshot {
-                        search_state
-                            .highlight_search_match_tx
-                            .try_send(HighlightArguments {
-                                multi_buffer_snapshot: multi_buffer_snapshot.clone(),
-                                match_range: match_range.clone(),
-                                search_data: Arc::clone(render_data),
-                            })
-                            .ok();
-                    }
+                if let ItemsDisplayMode::Search(search_state) = &mut self.mode
+                    && let Some(multi_buffer_snapshot) = multi_buffer_snapshot
+                {
+                    search_state
+                        .highlight_search_match_tx
+                        .try_send(HighlightArguments {
+                            multi_buffer_snapshot: multi_buffer_snapshot.clone(),
+                            match_range: match_range.clone(),
+                            search_data: Arc::clone(render_data),
+                        })
+                        .ok();
                 }
                 return None;
             }
@@ -2833,11 +2830,12 @@ impl OutlinePanel {
                                         let new_entry_added = entries_to_add
                                             .insert(current_entry.id, current_entry)
                                             .is_none();
-                                        if new_entry_added && traversal.back_to_parent() {
-                                            if let Some(parent_entry) = traversal.entry() {
-                                                current_entry = parent_entry.to_owned();
-                                                continue;
-                                            }
+                                        if new_entry_added
+                                            && traversal.back_to_parent()
+                                            && let Some(parent_entry) = traversal.entry()
+                                        {
+                                            current_entry = parent_entry.to_owned();
+                                            continue;
                                         }
                                         break;
                                     }
@@ -2878,18 +2876,17 @@ impl OutlinePanel {
                                 entries
                                     .into_iter()
                                     .filter_map(|entry| {
-                                        if auto_fold_dirs {
-                                            if let Some(parent) = entry.path.parent() {
-                                                let children = new_children_count
-                                                    .entry(worktree_id)
-                                                    .or_default()
-                                                    .entry(Arc::from(parent))
-                                                    .or_default();
-                                                if entry.is_dir() {
-                                                    children.dirs += 1;
-                                                } else {
-                                                    children.files += 1;
-                                                }
+                                        if auto_fold_dirs && let Some(parent) = entry.path.parent()
+                                        {
+                                            let children = new_children_count
+                                                .entry(worktree_id)
+                                                .or_default()
+                                                .entry(Arc::from(parent))
+                                                .or_default();
+                                            if entry.is_dir() {
+                                                children.dirs += 1;
+                                            } else {
+                                                children.files += 1;
                                             }
                                         }
 
@@ -3409,30 +3406,29 @@ impl OutlinePanel {
                                 {
                                     excerpt.outlines = ExcerptOutlines::Outlines(fetched_outlines);
 
-                                    if let Some(default_depth) = pending_default_depth {
-                                        if let ExcerptOutlines::Outlines(outlines) =
+                                    if let Some(default_depth) = pending_default_depth
+                                        && let ExcerptOutlines::Outlines(outlines) =
                                             &excerpt.outlines
-                                        {
-                                            outlines
-                                                .iter()
-                                                .filter(|outline| {
-                                                    (default_depth == 0
-                                                        || outline.depth >= default_depth)
-                                                        && outlines_with_children.contains(&(
-                                                            outline.range.clone(),
-                                                            outline.depth,
-                                                        ))
-                                                })
-                                                .for_each(|outline| {
-                                                    outline_panel.collapsed_entries.insert(
-                                                        CollapsedEntry::Outline(
-                                                            buffer_id,
-                                                            excerpt_id,
-                                                            outline.range.clone(),
-                                                        ),
-                                                    );
-                                                });
-                                        }
+                                    {
+                                        outlines
+                                            .iter()
+                                            .filter(|outline| {
+                                                (default_depth == 0
+                                                    || outline.depth >= default_depth)
+                                                    && outlines_with_children.contains(&(
+                                                        outline.range.clone(),
+                                                        outline.depth,
+                                                    ))
+                                            })
+                                            .for_each(|outline| {
+                                                outline_panel.collapsed_entries.insert(
+                                                    CollapsedEntry::Outline(
+                                                        buffer_id,
+                                                        excerpt_id,
+                                                        outline.range.clone(),
+                                                    ),
+                                                );
+                                            });
                                     }
 
                                     // Even if no outlines to check, we still need to update cached entries
@@ -3611,10 +3607,9 @@ impl OutlinePanel {
                 .update_in(cx, |outline_panel, window, cx| {
                     outline_panel.cached_entries = new_cached_entries;
                     outline_panel.max_width_item_index = max_width_item_index;
-                    if outline_panel.selected_entry.is_invalidated()
-                        || matches!(outline_panel.selected_entry, SelectedEntry::None)
-                    {
-                        if let Some(new_selected_entry) =
+                    if (outline_panel.selected_entry.is_invalidated()
+                        || matches!(outline_panel.selected_entry, SelectedEntry::None))
+                        && let Some(new_selected_entry) =
                             outline_panel.active_editor().and_then(|active_editor| {
                                 outline_panel.location_for_editor_selection(
                                     &active_editor,
@@ -3622,9 +3617,8 @@ impl OutlinePanel {
                                     cx,
                                 )
                             })
-                        {
-                            outline_panel.select_entry(new_selected_entry, false, window, cx);
-                        }
+                    {
+                        outline_panel.select_entry(new_selected_entry, false, window, cx);
                     }
 
                     outline_panel.autoscroll(cx);
@@ -3921,19 +3915,19 @@ impl OutlinePanel {
                                 } else {
                                     None
                                 };
-                            if let Some((buffer_id, entry_excerpts)) = excerpts_to_consider {
-                                if !active_editor.read(cx).is_buffer_folded(buffer_id, cx) {
-                                    outline_panel.add_excerpt_entries(
-                                        &mut generation_state,
-                                        buffer_id,
-                                        entry_excerpts,
-                                        depth,
-                                        track_matches,
-                                        is_singleton,
-                                        query.as_deref(),
-                                        cx,
-                                    );
-                                }
+                            if let Some((buffer_id, entry_excerpts)) = excerpts_to_consider
+                                && !active_editor.read(cx).is_buffer_folded(buffer_id, cx)
+                            {
+                                outline_panel.add_excerpt_entries(
+                                    &mut generation_state,
+                                    buffer_id,
+                                    entry_excerpts,
+                                    depth,
+                                    track_matches,
+                                    is_singleton,
+                                    query.as_deref(),
+                                    cx,
+                                );
                             }
                         }
                     }
@@ -4404,15 +4398,15 @@ impl OutlinePanel {
             })
             .filter(|(match_range, _)| {
                 let editor = active_editor.read(cx);
-                if let Some(buffer_id) = match_range.start.buffer_id {
-                    if editor.is_buffer_folded(buffer_id, cx) {
-                        return false;
-                    }
+                if let Some(buffer_id) = match_range.start.buffer_id
+                    && editor.is_buffer_folded(buffer_id, cx)
+                {
+                    return false;
                 }
-                if let Some(buffer_id) = match_range.start.buffer_id {
-                    if editor.is_buffer_folded(buffer_id, cx) {
-                        return false;
-                    }
+                if let Some(buffer_id) = match_range.start.buffer_id
+                    && editor.is_buffer_folded(buffer_id, cx)
+                {
+                    return false;
                 }
                 true
             });
@@ -4456,16 +4450,14 @@ impl OutlinePanel {
         cx: &mut Context<Self>,
     ) {
         self.pinned = !self.pinned;
-        if !self.pinned {
-            if let Some((active_item, active_editor)) = self
+        if !self.pinned
+            && let Some((active_item, active_editor)) = self
                 .workspace
                 .upgrade()
                 .and_then(|workspace| workspace_active_editor(workspace.read(cx), cx))
-            {
-                if self.should_replace_active_item(active_item.as_ref()) {
-                    self.replace_active_editor(active_item, active_editor, window, cx);
-                }
-            }
+            && self.should_replace_active_item(active_item.as_ref())
+        {
+            self.replace_active_editor(active_item, active_editor, window, cx);
         }
 
         cx.notify();
@@ -5067,24 +5059,23 @@ impl Panel for OutlinePanel {
                     let old_active = outline_panel.active;
                     outline_panel.active = active;
                     if old_active != active {
-                        if active {
-                            if let Some((active_item, active_editor)) =
+                        if active
+                            && let Some((active_item, active_editor)) =
                                 outline_panel.workspace.upgrade().and_then(|workspace| {
                                     workspace_active_editor(workspace.read(cx), cx)
                                 })
-                            {
-                                if outline_panel.should_replace_active_item(active_item.as_ref()) {
-                                    outline_panel.replace_active_editor(
-                                        active_item,
-                                        active_editor,
-                                        window,
-                                        cx,
-                                    );
-                                } else {
-                                    outline_panel.update_fs_entries(active_editor, None, window, cx)
-                                }
-                                return;
+                        {
+                            if outline_panel.should_replace_active_item(active_item.as_ref()) {
+                                outline_panel.replace_active_editor(
+                                    active_item,
+                                    active_editor,
+                                    window,
+                                    cx,
+                                );
+                            } else {
+                                outline_panel.update_fs_entries(active_editor, None, window, cx)
                             }
+                            return;
                         }
 
                         if !outline_panel.pinned {
@@ -5319,8 +5310,8 @@ fn subscribe_for_editor_events(
                             })
                             .copied(),
                     );
-                    if !ignore_selections_change {
-                        if let Some(entry_to_select) = latest_unfolded_buffer_id
+                    if !ignore_selections_change
+                        && let Some(entry_to_select) = latest_unfolded_buffer_id
                             .or(latest_folded_buffer_id)
                             .and_then(|toggled_buffer_id| {
                                 outline_panel.fs_entries.iter().find_map(
@@ -5344,9 +5335,8 @@ fn subscribe_for_editor_events(
                                 )
                             })
                             .map(PanelEntry::Fs)
-                        {
-                            outline_panel.select_entry(entry_to_select, true, window, cx);
-                        }
+                    {
+                        outline_panel.select_entry(entry_to_select, true, window, cx);
                     }
 
                     outline_panel.update_fs_entries(editor.clone(), debounce, window, cx);
diff --git a/crates/prettier/src/prettier.rs b/crates/prettier/src/prettier.rs
index 33320e6845..8e1485dc9a 100644
--- a/crates/prettier/src/prettier.rs
+++ b/crates/prettier/src/prettier.rs
@@ -185,11 +185,11 @@ impl Prettier {
                     .metadata(&ignore_path)
                     .await
                     .with_context(|| format!("fetching metadata for {ignore_path:?}"))?
+                    && !metadata.is_dir
+                    && !metadata.is_symlink
                 {
-                    if !metadata.is_dir && !metadata.is_symlink {
-                        log::info!("Found prettier ignore at {ignore_path:?}");
-                        return Ok(ControlFlow::Continue(Some(path_to_check)));
-                    }
+                    log::info!("Found prettier ignore at {ignore_path:?}");
+                    return Ok(ControlFlow::Continue(Some(path_to_check)));
                 }
                 match &closest_package_json_path {
                     None => closest_package_json_path = Some(path_to_check.clone()),
@@ -223,13 +223,13 @@ impl Prettier {
                                 })
                             {
                                 let workspace_ignore = path_to_check.join(".prettierignore");
-                                if let Some(metadata) = fs.metadata(&workspace_ignore).await? {
-                                    if !metadata.is_dir {
-                                        log::info!(
-                                            "Found prettier ignore at workspace root {workspace_ignore:?}"
-                                        );
-                                        return Ok(ControlFlow::Continue(Some(path_to_check)));
-                                    }
+                                if let Some(metadata) = fs.metadata(&workspace_ignore).await?
+                                    && !metadata.is_dir
+                                {
+                                    log::info!(
+                                        "Found prettier ignore at workspace root {workspace_ignore:?}"
+                                    );
+                                    return Ok(ControlFlow::Continue(Some(path_to_check)));
                                 }
                             }
                         }
@@ -549,18 +549,16 @@ async fn read_package_json(
         .metadata(&possible_package_json)
         .await
         .with_context(|| format!("fetching metadata for package json {possible_package_json:?}"))?
+        && !package_json_metadata.is_dir
+        && !package_json_metadata.is_symlink
     {
-        if !package_json_metadata.is_dir && !package_json_metadata.is_symlink {
-            let package_json_contents = fs
-                .load(&possible_package_json)
-                .await
-                .with_context(|| format!("reading {possible_package_json:?} file contents"))?;
-            return serde_json::from_str::<HashMap<String, serde_json::Value>>(
-                &package_json_contents,
-            )
+        let package_json_contents = fs
+            .load(&possible_package_json)
+            .await
+            .with_context(|| format!("reading {possible_package_json:?} file contents"))?;
+        return serde_json::from_str::<HashMap<String, serde_json::Value>>(&package_json_contents)
             .map(Some)
             .with_context(|| format!("parsing {possible_package_json:?} file contents"));
-        }
     }
     Ok(None)
 }
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index b8101e14f3..1522376e9a 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -1094,10 +1094,10 @@ impl BufferStore {
                         .collect::<Vec<_>>()
                 })?;
                 for buffer_task in buffers {
-                    if let Some(buffer) = buffer_task.await.log_err() {
-                        if tx.send(buffer).await.is_err() {
-                            return anyhow::Ok(());
-                        }
+                    if let Some(buffer) = buffer_task.await.log_err()
+                        && tx.send(buffer).await.is_err()
+                    {
+                        return anyhow::Ok(());
                     }
                 }
             }
@@ -1173,11 +1173,11 @@ impl BufferStore {
         buffer_id: BufferId,
         handle: OpenLspBufferHandle,
     ) {
-        if let Some(shared_buffers) = self.shared_buffers.get_mut(&peer_id) {
-            if let Some(buffer) = shared_buffers.get_mut(&buffer_id) {
-                buffer.lsp_handle = Some(handle);
-                return;
-            }
+        if let Some(shared_buffers) = self.shared_buffers.get_mut(&peer_id)
+            && let Some(buffer) = shared_buffers.get_mut(&buffer_id)
+        {
+            buffer.lsp_handle = Some(handle);
+            return;
         }
         debug_panic!("tried to register shared lsp handle, but buffer was not shared")
     }
@@ -1388,14 +1388,14 @@ impl BufferStore {
         let peer_id = envelope.sender_id;
         let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
         this.update(&mut cx, |this, cx| {
-            if let Some(shared) = this.shared_buffers.get_mut(&peer_id) {
-                if shared.remove(&buffer_id).is_some() {
-                    cx.emit(BufferStoreEvent::SharedBufferClosed(peer_id, buffer_id));
-                    if shared.is_empty() {
-                        this.shared_buffers.remove(&peer_id);
-                    }
-                    return;
+            if let Some(shared) = this.shared_buffers.get_mut(&peer_id)
+                && shared.remove(&buffer_id).is_some()
+            {
+                cx.emit(BufferStoreEvent::SharedBufferClosed(peer_id, buffer_id));
+                if shared.is_empty() {
+                    this.shared_buffers.remove(&peer_id);
                 }
+                return;
             }
             debug_panic!(
                 "peer_id {} closed buffer_id {} which was either not open or already closed",
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
index 091189db7c..faa9948596 100644
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ b/crates/project/src/debugger/breakpoint_store.rs
@@ -623,12 +623,11 @@ impl BreakpointStore {
                 file_breakpoints.breakpoints.iter().filter_map({
                     let range = range.clone();
                     move |bp| {
-                        if let Some(range) = &range {
-                            if bp.position().cmp(&range.start, buffer_snapshot).is_lt()
-                                || bp.position().cmp(&range.end, buffer_snapshot).is_gt()
-                            {
-                                return None;
-                            }
+                        if let Some(range) = &range
+                            && (bp.position().cmp(&range.start, buffer_snapshot).is_lt()
+                                || bp.position().cmp(&range.end, buffer_snapshot).is_gt())
+                        {
+                            return None;
                         }
                         let session_state = active_session_id
                             .and_then(|id| bp.session_state.get(&id))
diff --git a/crates/project/src/debugger/memory.rs b/crates/project/src/debugger/memory.rs
index fec3c344c5..092435fda7 100644
--- a/crates/project/src/debugger/memory.rs
+++ b/crates/project/src/debugger/memory.rs
@@ -318,14 +318,13 @@ impl Iterator for MemoryIterator {
             return None;
         }
         if let Some((current_page_address, current_memory_chunk)) = self.current_known_page.as_mut()
+            && current_page_address.0 <= self.start
         {
-            if current_page_address.0 <= self.start {
-                if let Some(next_cell) = current_memory_chunk.next() {
-                    self.start += 1;
-                    return Some(next_cell);
-                } else {
-                    self.current_known_page.take();
-                }
+            if let Some(next_cell) = current_memory_chunk.next() {
+                self.start += 1;
+                return Some(next_cell);
+            } else {
+                self.current_known_page.take();
             }
         }
         if !self.fetch_next_page() {
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 9539008530..ebc29a0a4b 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -570,23 +570,22 @@ impl GitStore {
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<BufferDiff>>> {
         let buffer_id = buffer.read(cx).remote_id();
-        if let Some(diff_state) = self.diffs.get(&buffer_id) {
-            if let Some(unstaged_diff) = diff_state
+        if let Some(diff_state) = self.diffs.get(&buffer_id)
+            && let Some(unstaged_diff) = diff_state
                 .read(cx)
                 .unstaged_diff
                 .as_ref()
                 .and_then(|weak| weak.upgrade())
+        {
+            if let Some(task) =
+                diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
             {
-                if let Some(task) =
-                    diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
-                {
-                    return cx.background_executor().spawn(async move {
-                        task.await;
-                        Ok(unstaged_diff)
-                    });
-                }
-                return Task::ready(Ok(unstaged_diff));
+                return cx.background_executor().spawn(async move {
+                    task.await;
+                    Ok(unstaged_diff)
+                });
             }
+            return Task::ready(Ok(unstaged_diff));
         }
 
         let Some((repo, repo_path)) =
@@ -627,23 +626,22 @@ impl GitStore {
     ) -> Task<Result<Entity<BufferDiff>>> {
         let buffer_id = buffer.read(cx).remote_id();
 
-        if let Some(diff_state) = self.diffs.get(&buffer_id) {
-            if let Some(uncommitted_diff) = diff_state
+        if let Some(diff_state) = self.diffs.get(&buffer_id)
+            && let Some(uncommitted_diff) = diff_state
                 .read(cx)
                 .uncommitted_diff
                 .as_ref()
                 .and_then(|weak| weak.upgrade())
+        {
+            if let Some(task) =
+                diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
             {
-                if let Some(task) =
-                    diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
-                {
-                    return cx.background_executor().spawn(async move {
-                        task.await;
-                        Ok(uncommitted_diff)
-                    });
-                }
-                return Task::ready(Ok(uncommitted_diff));
+                return cx.background_executor().spawn(async move {
+                    task.await;
+                    Ok(uncommitted_diff)
+                });
             }
+            return Task::ready(Ok(uncommitted_diff));
         }
 
         let Some((repo, repo_path)) =
@@ -764,22 +762,21 @@ impl GitStore {
         log::debug!("open conflict set");
         let buffer_id = buffer.read(cx).remote_id();
 
-        if let Some(git_state) = self.diffs.get(&buffer_id) {
-            if let Some(conflict_set) = git_state
+        if let Some(git_state) = self.diffs.get(&buffer_id)
+            && let Some(conflict_set) = git_state
                 .read(cx)
                 .conflict_set
                 .as_ref()
                 .and_then(|weak| weak.upgrade())
-            {
-                let conflict_set = conflict_set.clone();
-                let buffer_snapshot = buffer.read(cx).text_snapshot();
+        {
+            let conflict_set = conflict_set.clone();
+            let buffer_snapshot = buffer.read(cx).text_snapshot();
 
-                git_state.update(cx, |state, cx| {
-                    let _ = state.reparse_conflict_markers(buffer_snapshot, cx);
-                });
+            git_state.update(cx, |state, cx| {
+                let _ = state.reparse_conflict_markers(buffer_snapshot, cx);
+            });
 
-                return conflict_set;
-            }
+            return conflict_set;
         }
 
         let is_unmerged = self
@@ -1151,29 +1148,26 @@ impl GitStore {
         for (buffer_id, diff) in self.diffs.iter() {
             if let Some((buffer_repo, repo_path)) =
                 self.repository_and_path_for_buffer_id(*buffer_id, cx)
+                && buffer_repo == repo
             {
-                if buffer_repo == repo {
-                    diff.update(cx, |diff, cx| {
-                        if let Some(conflict_set) = &diff.conflict_set {
-                            let conflict_status_changed =
-                                conflict_set.update(cx, |conflict_set, cx| {
-                                    let has_conflict = repo_snapshot.has_conflict(&repo_path);
-                                    conflict_set.set_has_conflict(has_conflict, cx)
-                                })?;
-                            if conflict_status_changed {
-                                let buffer_store = self.buffer_store.read(cx);
-                                if let Some(buffer) = buffer_store.get(*buffer_id) {
-                                    let _ = diff.reparse_conflict_markers(
-                                        buffer.read(cx).text_snapshot(),
-                                        cx,
-                                    );
-                                }
+                diff.update(cx, |diff, cx| {
+                    if let Some(conflict_set) = &diff.conflict_set {
+                        let conflict_status_changed =
+                            conflict_set.update(cx, |conflict_set, cx| {
+                                let has_conflict = repo_snapshot.has_conflict(&repo_path);
+                                conflict_set.set_has_conflict(has_conflict, cx)
+                            })?;
+                        if conflict_status_changed {
+                            let buffer_store = self.buffer_store.read(cx);
+                            if let Some(buffer) = buffer_store.get(*buffer_id) {
+                                let _ = diff
+                                    .reparse_conflict_markers(buffer.read(cx).text_snapshot(), cx);
                             }
                         }
-                        anyhow::Ok(())
-                    })
-                    .ok();
-                }
+                    }
+                    anyhow::Ok(())
+                })
+                .ok();
             }
         }
         cx.emit(GitStoreEvent::RepositoryUpdated(
@@ -2231,13 +2225,13 @@ impl GitStore {
     ) -> Result<()> {
         let buffer_id = BufferId::new(request.payload.buffer_id)?;
         this.update(&mut cx, |this, cx| {
-            if let Some(diff_state) = this.diffs.get_mut(&buffer_id) {
-                if let Some(buffer) = this.buffer_store.read(cx).get(buffer_id) {
-                    let buffer = buffer.read(cx).text_snapshot();
-                    diff_state.update(cx, |diff_state, cx| {
-                        diff_state.handle_base_texts_updated(buffer, request.payload, cx);
-                    })
-                }
+            if let Some(diff_state) = this.diffs.get_mut(&buffer_id)
+                && let Some(buffer) = this.buffer_store.read(cx).get(buffer_id)
+            {
+                let buffer = buffer.read(cx).text_snapshot();
+                diff_state.update(cx, |diff_state, cx| {
+                    diff_state.handle_base_texts_updated(buffer, request.payload, cx);
+                })
             }
         })
     }
@@ -3533,14 +3527,13 @@ impl Repository {
                     let Some(project_path) = self.repo_path_to_project_path(path, cx) else {
                         continue;
                     };
-                    if let Some(buffer) = buffer_store.get_by_path(&project_path) {
-                        if buffer
+                    if let Some(buffer) = buffer_store.get_by_path(&project_path)
+                        && buffer
                             .read(cx)
                             .file()
                             .map_or(false, |file| file.disk_state().exists())
-                        {
-                            save_futures.push(buffer_store.save_buffer(buffer, cx));
-                        }
+                    {
+                        save_futures.push(buffer_store.save_buffer(buffer, cx));
                     }
                 }
             })
@@ -3600,14 +3593,13 @@ impl Repository {
                     let Some(project_path) = self.repo_path_to_project_path(path, cx) else {
                         continue;
                     };
-                    if let Some(buffer) = buffer_store.get_by_path(&project_path) {
-                        if buffer
+                    if let Some(buffer) = buffer_store.get_by_path(&project_path)
+                        && buffer
                             .read(cx)
                             .file()
                             .map_or(false, |file| file.disk_state().exists())
-                        {
-                            save_futures.push(buffer_store.save_buffer(buffer, cx));
-                        }
+                    {
+                        save_futures.push(buffer_store.save_buffer(buffer, cx));
                     }
                 }
             })
@@ -4421,14 +4413,13 @@ impl Repository {
                 }
 
                 if let Some(job) = jobs.pop_front() {
-                    if let Some(current_key) = &job.key {
-                        if jobs
+                    if let Some(current_key) = &job.key
+                        && jobs
                             .iter()
                             .any(|other_job| other_job.key.as_ref() == Some(current_key))
                         {
                             continue;
                         }
-                    }
                     (job.job)(state.clone(), cx).await;
                 } else if let Some(job) = job_rx.next().await {
                     jobs.push_back(job);
@@ -4459,13 +4450,12 @@ impl Repository {
                 }
 
                 if let Some(job) = jobs.pop_front() {
-                    if let Some(current_key) = &job.key {
-                        if jobs
+                    if let Some(current_key) = &job.key
+                        && jobs
                             .iter()
                             .any(|other_job| other_job.key.as_ref() == Some(current_key))
-                        {
-                            continue;
-                        }
+                    {
+                        continue;
                     }
                     (job.job)(state.clone(), cx).await;
                 } else if let Some(job) = job_rx.next().await {
@@ -4589,10 +4579,10 @@ impl Repository {
 
                         for (repo_path, status) in &*statuses.entries {
                             changed_paths.remove(repo_path);
-                            if cursor.seek_forward(&PathTarget::Path(repo_path), Bias::Left) {
-                                if cursor.item().is_some_and(|entry| entry.status == *status) {
-                                    continue;
-                                }
+                            if cursor.seek_forward(&PathTarget::Path(repo_path), Bias::Left)
+                                && cursor.item().is_some_and(|entry| entry.status == *status)
+                            {
+                                continue;
                             }
 
                             changed_path_statuses.push(Edit::Insert(StatusEntry {
diff --git a/crates/project/src/git_store/git_traversal.rs b/crates/project/src/git_store/git_traversal.rs
index de5ff9b935..4594e8d140 100644
--- a/crates/project/src/git_store/git_traversal.rs
+++ b/crates/project/src/git_store/git_traversal.rs
@@ -182,11 +182,11 @@ impl<'a> Iterator for ChildEntriesGitIter<'a> {
     type Item = GitEntryRef<'a>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if let Some(item) = self.traversal.entry() {
-            if item.path.starts_with(self.parent_path) {
-                self.traversal.advance_to_sibling();
-                return Some(item);
-            }
+        if let Some(item) = self.traversal.entry()
+            && item.path.starts_with(self.parent_path)
+        {
+            self.traversal.advance_to_sibling();
+            return Some(item);
         }
         None
     }
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index d5c3cc424f..2a1facd3c0 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -2341,15 +2341,14 @@ impl LspCommand for GetCompletions {
             .zip(completion_edits)
             .map(|(mut lsp_completion, mut edit)| {
                 LineEnding::normalize(&mut edit.new_text);
-                if lsp_completion.data.is_none() {
-                    if let Some(default_data) = lsp_defaults
+                if lsp_completion.data.is_none()
+                    && let Some(default_data) = lsp_defaults
                         .as_ref()
                         .and_then(|item_defaults| item_defaults.data.clone())
-                    {
-                        // Servers (e.g. JDTLS) prefer unchanged completions, when resolving the items later,
-                        // so we do not insert the defaults here, but `data` is needed for resolving, so this is an exception.
-                        lsp_completion.data = Some(default_data);
-                    }
+                {
+                    // Servers (e.g. JDTLS) prefer unchanged completions, when resolving the items later,
+                    // so we do not insert the defaults here, but `data` is needed for resolving, so this is an exception.
+                    lsp_completion.data = Some(default_data);
                 }
                 CoreCompletion {
                     replace_range: edit.replace_range,
@@ -2623,10 +2622,10 @@ impl LspCommand for GetCodeActions {
             .filter_map(|entry| {
                 let (lsp_action, resolved) = match entry {
                     lsp::CodeActionOrCommand::CodeAction(lsp_action) => {
-                        if let Some(command) = lsp_action.command.as_ref() {
-                            if !available_commands.contains(&command.command) {
-                                return None;
-                            }
+                        if let Some(command) = lsp_action.command.as_ref()
+                            && !available_commands.contains(&command.command)
+                        {
+                            return None;
                         }
                         (LspAction::Action(Box::new(lsp_action)), false)
                     }
@@ -2641,10 +2640,9 @@ impl LspCommand for GetCodeActions {
 
                 if let Some((requested_kinds, kind)) =
                     requested_kinds_set.as_ref().zip(lsp_action.action_kind())
+                    && !requested_kinds.contains(&kind)
                 {
-                    if !requested_kinds.contains(&kind) {
-                        return None;
-                    }
+                    return None;
                 }
 
                 Some(CodeAction {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 9410eea742..23061149bf 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -701,10 +701,9 @@ impl LocalLspStore {
                     async move {
                         this.update(&mut cx, |this, _| {
                             if let Some(status) = this.language_server_statuses.get_mut(&server_id)
+                                && let lsp::NumberOrString::String(token) = params.token
                             {
-                                if let lsp::NumberOrString::String(token) = params.token {
-                                    status.progress_tokens.insert(token);
-                                }
+                                status.progress_tokens.insert(token);
                             }
                         })?;
 
@@ -1015,10 +1014,10 @@ impl LocalLspStore {
                 }
             }
             LanguageServerState::Starting { startup, .. } => {
-                if let Some(server) = startup.await {
-                    if let Some(shutdown) = server.shutdown() {
-                        shutdown.await;
-                    }
+                if let Some(server) = startup.await
+                    && let Some(shutdown) = server.shutdown()
+                {
+                    shutdown.await;
                 }
             }
         }
@@ -2384,15 +2383,15 @@ impl LocalLspStore {
                     return None;
                 }
                 if !only_register_servers.is_empty() {
-                    if let Some(server_id) = server_node.server_id() {
-                        if !only_register_servers.contains(&LanguageServerSelector::Id(server_id)) {
-                            return None;
-                        }
+                    if let Some(server_id) = server_node.server_id()
+                        && !only_register_servers.contains(&LanguageServerSelector::Id(server_id))
+                    {
+                        return None;
                     }
-                    if let Some(name) = server_node.name() {
-                        if !only_register_servers.contains(&LanguageServerSelector::Name(name)) {
-                            return None;
-                        }
+                    if let Some(name) = server_node.name()
+                        && !only_register_servers.contains(&LanguageServerSelector::Name(name))
+                    {
+                        return None;
                     }
                 }
 
@@ -2410,11 +2409,11 @@ impl LocalLspStore {
                             cx,
                         );
 
-                        if let Some(state) = self.language_servers.get(&server_id) {
-                            if let Ok(uri) = uri {
-                                state.add_workspace_folder(uri);
-                            };
-                        }
+                        if let Some(state) = self.language_servers.get(&server_id)
+                            && let Ok(uri) = uri
+                        {
+                            state.add_workspace_folder(uri);
+                        };
                         server_id
                     };
 
@@ -3844,13 +3843,13 @@ impl LspStore {
             }
             BufferStoreEvent::BufferChangedFilePath { buffer, old_file } => {
                 let buffer_id = buffer.read(cx).remote_id();
-                if let Some(local) = self.as_local_mut() {
-                    if let Some(old_file) = File::from_dyn(old_file.as_ref()) {
-                        local.reset_buffer(buffer, old_file, cx);
+                if let Some(local) = self.as_local_mut()
+                    && let Some(old_file) = File::from_dyn(old_file.as_ref())
+                {
+                    local.reset_buffer(buffer, old_file, cx);
 
-                        if local.registered_buffers.contains_key(&buffer_id) {
-                            local.unregister_old_buffer_from_language_servers(buffer, old_file, cx);
-                        }
+                    if local.registered_buffers.contains_key(&buffer_id) {
+                        local.unregister_old_buffer_from_language_servers(buffer, old_file, cx);
                     }
                 }
 
@@ -4201,14 +4200,12 @@ impl LspStore {
                                             if local
                                                 .registered_buffers
                                                 .contains_key(&buffer.read(cx).remote_id())
-                                            {
-                                                if let Some(file_url) =
+                                                && let Some(file_url) =
                                                     file_path_to_lsp_url(&f.abs_path(cx)).log_err()
-                                                {
-                                                    local.unregister_buffer_from_language_servers(
-                                                        &buffer, &file_url, cx,
-                                                    );
-                                                }
+                                            {
+                                                local.unregister_buffer_from_language_servers(
+                                                    &buffer, &file_url, cx,
+                                                );
                                             }
                                         }
                                     }
@@ -4306,20 +4303,13 @@ impl LspStore {
         let buffer = buffer_entity.read(cx);
         let buffer_file = buffer.file().cloned();
         let buffer_id = buffer.remote_id();
-        if let Some(local_store) = self.as_local_mut() {
-            if local_store.registered_buffers.contains_key(&buffer_id) {
-                if let Some(abs_path) =
-                    File::from_dyn(buffer_file.as_ref()).map(|file| file.abs_path(cx))
-                {
-                    if let Some(file_url) = file_path_to_lsp_url(&abs_path).log_err() {
-                        local_store.unregister_buffer_from_language_servers(
-                            buffer_entity,
-                            &file_url,
-                            cx,
-                        );
-                    }
-                }
-            }
+        if let Some(local_store) = self.as_local_mut()
+            && local_store.registered_buffers.contains_key(&buffer_id)
+            && let Some(abs_path) =
+                File::from_dyn(buffer_file.as_ref()).map(|file| file.abs_path(cx))
+            && let Some(file_url) = file_path_to_lsp_url(&abs_path).log_err()
+        {
+            local_store.unregister_buffer_from_language_servers(buffer_entity, &file_url, cx);
         }
         buffer_entity.update(cx, |buffer, cx| {
             if buffer.language().map_or(true, |old_language| {
@@ -4336,33 +4326,28 @@ impl LspStore {
         let worktree_id = if let Some(file) = buffer_file {
             let worktree = file.worktree.clone();
 
-            if let Some(local) = self.as_local_mut() {
-                if local.registered_buffers.contains_key(&buffer_id) {
-                    local.register_buffer_with_language_servers(
-                        buffer_entity,
-                        HashSet::default(),
-                        cx,
-                    );
-                }
+            if let Some(local) = self.as_local_mut()
+                && local.registered_buffers.contains_key(&buffer_id)
+            {
+                local.register_buffer_with_language_servers(buffer_entity, HashSet::default(), cx);
             }
             Some(worktree.read(cx).id())
         } else {
             None
         };
 
-        if settings.prettier.allowed {
-            if let Some(prettier_plugins) = prettier_store::prettier_plugins_for_language(&settings)
-            {
-                let prettier_store = self.as_local().map(|s| s.prettier_store.clone());
-                if let Some(prettier_store) = prettier_store {
-                    prettier_store.update(cx, |prettier_store, cx| {
-                        prettier_store.install_default_prettier(
-                            worktree_id,
-                            prettier_plugins.iter().map(|s| Arc::from(s.as_str())),
-                            cx,
-                        )
-                    })
-                }
+        if settings.prettier.allowed
+            && let Some(prettier_plugins) = prettier_store::prettier_plugins_for_language(&settings)
+        {
+            let prettier_store = self.as_local().map(|s| s.prettier_store.clone());
+            if let Some(prettier_store) = prettier_store {
+                prettier_store.update(cx, |prettier_store, cx| {
+                    prettier_store.install_default_prettier(
+                        worktree_id,
+                        prettier_plugins.iter().map(|s| Arc::from(s.as_str())),
+                        cx,
+                    )
+                })
             }
         }
 
@@ -4381,26 +4366,25 @@ impl LspStore {
     }
 
     pub(crate) fn send_diagnostic_summaries(&self, worktree: &mut Worktree) {
-        if let Some((client, downstream_project_id)) = self.downstream_client.clone() {
-            if let Some(diangostic_summaries) = self.diagnostic_summaries.get(&worktree.id()) {
-                let mut summaries =
-                    diangostic_summaries
+        if let Some((client, downstream_project_id)) = self.downstream_client.clone()
+            && let Some(diangostic_summaries) = self.diagnostic_summaries.get(&worktree.id())
+        {
+            let mut summaries = diangostic_summaries
+                .into_iter()
+                .flat_map(|(path, summaries)| {
+                    summaries
                         .into_iter()
-                        .flat_map(|(path, summaries)| {
-                            summaries
-                                .into_iter()
-                                .map(|(server_id, summary)| summary.to_proto(*server_id, path))
-                        });
-                if let Some(summary) = summaries.next() {
-                    client
-                        .send(proto::UpdateDiagnosticSummary {
-                            project_id: downstream_project_id,
-                            worktree_id: worktree.id().to_proto(),
-                            summary: Some(summary),
-                            more_summaries: summaries.collect(),
-                        })
-                        .log_err();
-                }
+                        .map(|(server_id, summary)| summary.to_proto(*server_id, path))
+                });
+            if let Some(summary) = summaries.next() {
+                client
+                    .send(proto::UpdateDiagnosticSummary {
+                        project_id: downstream_project_id,
+                        worktree_id: worktree.id().to_proto(),
+                        summary: Some(summary),
+                        more_summaries: summaries.collect(),
+                    })
+                    .log_err();
             }
         }
     }
@@ -4730,11 +4714,11 @@ impl LspStore {
                                 &language.name(),
                                 cx,
                             );
-                            if let Some(state) = local.language_servers.get(&server_id) {
-                                if let Ok(uri) = uri {
-                                    state.add_workspace_folder(uri);
-                                };
-                            }
+                            if let Some(state) = local.language_servers.get(&server_id)
+                                && let Ok(uri) = uri
+                            {
+                                state.add_workspace_folder(uri);
+                            };
                             server_id
                         });
 
@@ -4805,8 +4789,8 @@ impl LspStore {
                 LocalLspStore::try_resolve_code_action(&lang_server, &mut action)
                     .await
                     .context("resolving a code action")?;
-                if let Some(edit) = action.lsp_action.edit() {
-                    if edit.changes.is_some() || edit.document_changes.is_some() {
+                if let Some(edit) = action.lsp_action.edit()
+                    && (edit.changes.is_some() || edit.document_changes.is_some()) {
                         return LocalLspStore::deserialize_workspace_edit(
                             this.upgrade().context("no app present")?,
                             edit.clone(),
@@ -4817,7 +4801,6 @@ impl LspStore {
                         )
                         .await;
                     }
-                }
 
                 if let Some(command) = action.lsp_action.command() {
                     let server_capabilities = lang_server.capabilities();
@@ -5736,28 +5719,28 @@ impl LspStore {
         let version_queried_for = buffer.read(cx).version();
         let buffer_id = buffer.read(cx).remote_id();
 
-        if let Some(cached_data) = self.lsp_code_lens.get(&buffer_id) {
-            if !version_queried_for.changed_since(&cached_data.lens_for_version) {
-                let has_different_servers = self.as_local().is_some_and(|local| {
-                    local
-                        .buffers_opened_in_servers
-                        .get(&buffer_id)
-                        .cloned()
-                        .unwrap_or_default()
-                        != cached_data.lens.keys().copied().collect()
-                });
-                if !has_different_servers {
-                    return Task::ready(Ok(cached_data.lens.values().flatten().cloned().collect()))
-                        .shared();
-                }
+        if let Some(cached_data) = self.lsp_code_lens.get(&buffer_id)
+            && !version_queried_for.changed_since(&cached_data.lens_for_version)
+        {
+            let has_different_servers = self.as_local().is_some_and(|local| {
+                local
+                    .buffers_opened_in_servers
+                    .get(&buffer_id)
+                    .cloned()
+                    .unwrap_or_default()
+                    != cached_data.lens.keys().copied().collect()
+            });
+            if !has_different_servers {
+                return Task::ready(Ok(cached_data.lens.values().flatten().cloned().collect()))
+                    .shared();
             }
         }
 
         let lsp_data = self.lsp_code_lens.entry(buffer_id).or_default();
-        if let Some((updating_for, running_update)) = &lsp_data.update {
-            if !version_queried_for.changed_since(updating_for) {
-                return running_update.clone();
-            }
+        if let Some((updating_for, running_update)) = &lsp_data.update
+            && !version_queried_for.changed_since(updating_for)
+        {
+            return running_update.clone();
         }
         let buffer = buffer.clone();
         let query_version_queried_for = version_queried_for.clone();
@@ -6372,11 +6355,11 @@ impl LspStore {
             .old_replace_start
             .and_then(deserialize_anchor)
             .zip(response.old_replace_end.and_then(deserialize_anchor));
-        if let Some((old_replace_start, old_replace_end)) = replace_range {
-            if !response.new_text.is_empty() {
-                completion.new_text = response.new_text;
-                completion.replace_range = old_replace_start..old_replace_end;
-            }
+        if let Some((old_replace_start, old_replace_end)) = replace_range
+            && !response.new_text.is_empty()
+        {
+            completion.new_text = response.new_text;
+            completion.replace_range = old_replace_start..old_replace_end;
         }
 
         Ok(())
@@ -6751,33 +6734,33 @@ impl LspStore {
             LspFetchStrategy::UseCache {
                 known_cache_version,
             } => {
-                if let Some(cached_data) = self.lsp_document_colors.get(&buffer_id) {
-                    if !version_queried_for.changed_since(&cached_data.colors_for_version) {
-                        let has_different_servers = self.as_local().is_some_and(|local| {
-                            local
-                                .buffers_opened_in_servers
-                                .get(&buffer_id)
-                                .cloned()
-                                .unwrap_or_default()
-                                != cached_data.colors.keys().copied().collect()
-                        });
-                        if !has_different_servers {
-                            if Some(cached_data.cache_version) == known_cache_version {
-                                return None;
-                            } else {
-                                return Some(
-                                    Task::ready(Ok(DocumentColors {
-                                        colors: cached_data
-                                            .colors
-                                            .values()
-                                            .flatten()
-                                            .cloned()
-                                            .collect(),
-                                        cache_version: Some(cached_data.cache_version),
-                                    }))
-                                    .shared(),
-                                );
-                            }
+                if let Some(cached_data) = self.lsp_document_colors.get(&buffer_id)
+                    && !version_queried_for.changed_since(&cached_data.colors_for_version)
+                {
+                    let has_different_servers = self.as_local().is_some_and(|local| {
+                        local
+                            .buffers_opened_in_servers
+                            .get(&buffer_id)
+                            .cloned()
+                            .unwrap_or_default()
+                            != cached_data.colors.keys().copied().collect()
+                    });
+                    if !has_different_servers {
+                        if Some(cached_data.cache_version) == known_cache_version {
+                            return None;
+                        } else {
+                            return Some(
+                                Task::ready(Ok(DocumentColors {
+                                    colors: cached_data
+                                        .colors
+                                        .values()
+                                        .flatten()
+                                        .cloned()
+                                        .collect(),
+                                    cache_version: Some(cached_data.cache_version),
+                                }))
+                                .shared(),
+                            );
                         }
                     }
                 }
@@ -6785,10 +6768,10 @@ impl LspStore {
         }
 
         let lsp_data = self.lsp_document_colors.entry(buffer_id).or_default();
-        if let Some((updating_for, running_update)) = &lsp_data.colors_update {
-            if !version_queried_for.changed_since(updating_for) {
-                return Some(running_update.clone());
-            }
+        if let Some((updating_for, running_update)) = &lsp_data.colors_update
+            && !version_queried_for.changed_since(updating_for)
+        {
+            return Some(running_update.clone());
         }
         let query_version_queried_for = version_queried_for.clone();
         let new_task = cx
@@ -8785,12 +8768,11 @@ impl LspStore {
                 if summary.is_empty() {
                     if let Some(worktree_summaries) =
                         lsp_store.diagnostic_summaries.get_mut(&worktree_id)
+                        && let Some(summaries) = worktree_summaries.get_mut(&path)
                     {
-                        if let Some(summaries) = worktree_summaries.get_mut(&path) {
-                            summaries.remove(&server_id);
-                            if summaries.is_empty() {
-                                worktree_summaries.remove(&path);
-                            }
+                        summaries.remove(&server_id);
+                        if summaries.is_empty() {
+                            worktree_summaries.remove(&path);
                         }
                     }
                 } else {
@@ -9491,10 +9473,10 @@ impl LspStore {
         cx: &mut Context<Self>,
     ) {
         if let Some(status) = self.language_server_statuses.get_mut(&language_server_id) {
-            if let Some(work) = status.pending_work.remove(&token) {
-                if !work.is_disk_based_diagnostics_progress {
-                    cx.emit(LspStoreEvent::RefreshInlayHints);
-                }
+            if let Some(work) = status.pending_work.remove(&token)
+                && !work.is_disk_based_diagnostics_progress
+            {
+                cx.emit(LspStoreEvent::RefreshInlayHints);
             }
             cx.notify();
         }
@@ -10288,10 +10270,10 @@ impl LspStore {
             None => None,
         };
 
-        if let Some(server) = server {
-            if let Some(shutdown) = server.shutdown() {
-                shutdown.await;
-            }
+        if let Some(server) = server
+            && let Some(shutdown) = server.shutdown()
+        {
+            shutdown.await;
         }
     }
 
@@ -10565,18 +10547,18 @@ impl LspStore {
         for buffer in buffers {
             buffer.update(cx, |buffer, cx| {
                 language_servers_to_stop.extend(local.language_server_ids_for_buffer(buffer, cx));
-                if let Some(worktree_id) = buffer.file().map(|f| f.worktree_id(cx)) {
-                    if covered_worktrees.insert(worktree_id) {
-                        language_server_names_to_stop.retain(|name| {
-                            let old_ids_count = language_servers_to_stop.len();
-                            let all_language_servers_with_this_name = local
-                                .language_server_ids
-                                .iter()
-                                .filter_map(|(seed, state)| seed.name.eq(name).then(|| state.id));
-                            language_servers_to_stop.extend(all_language_servers_with_this_name);
-                            old_ids_count == language_servers_to_stop.len()
-                        });
-                    }
+                if let Some(worktree_id) = buffer.file().map(|f| f.worktree_id(cx))
+                    && covered_worktrees.insert(worktree_id)
+                {
+                    language_server_names_to_stop.retain(|name| {
+                        let old_ids_count = language_servers_to_stop.len();
+                        let all_language_servers_with_this_name = local
+                            .language_server_ids
+                            .iter()
+                            .filter_map(|(seed, state)| seed.name.eq(name).then(|| state.id));
+                        language_servers_to_stop.extend(all_language_servers_with_this_name);
+                        old_ids_count == language_servers_to_stop.len()
+                    });
                 }
             });
         }
@@ -11081,10 +11063,10 @@ impl LspStore {
             if let Some((LanguageServerState::Running { server, .. }, status)) = server.zip(status)
             {
                 for (token, progress) in &status.pending_work {
-                    if let Some(token_to_cancel) = token_to_cancel.as_ref() {
-                        if token != token_to_cancel {
-                            continue;
-                        }
+                    if let Some(token_to_cancel) = token_to_cancel.as_ref()
+                        && token != token_to_cancel
+                    {
+                        continue;
                     }
                     if progress.is_cancellable {
                         server
@@ -11191,38 +11173,36 @@ impl LspStore {
         for server_id in &language_server_ids {
             if let Some(LanguageServerState::Running { server, .. }) =
                 local.language_servers.get(server_id)
-            {
-                if let Some(watched_paths) = local
+                && let Some(watched_paths) = local
                     .language_server_watched_paths
                     .get(server_id)
                     .and_then(|paths| paths.worktree_paths.get(&worktree_id))
-                {
-                    let params = lsp::DidChangeWatchedFilesParams {
-                        changes: changes
-                            .iter()
-                            .filter_map(|(path, _, change)| {
-                                if !watched_paths.is_match(path) {
-                                    return None;
-                                }
-                                let typ = match change {
-                                    PathChange::Loaded => return None,
-                                    PathChange::Added => lsp::FileChangeType::CREATED,
-                                    PathChange::Removed => lsp::FileChangeType::DELETED,
-                                    PathChange::Updated => lsp::FileChangeType::CHANGED,
-                                    PathChange::AddedOrUpdated => lsp::FileChangeType::CHANGED,
-                                };
-                                Some(lsp::FileEvent {
-                                    uri: lsp::Url::from_file_path(abs_path.join(path)).unwrap(),
-                                    typ,
-                                })
+            {
+                let params = lsp::DidChangeWatchedFilesParams {
+                    changes: changes
+                        .iter()
+                        .filter_map(|(path, _, change)| {
+                            if !watched_paths.is_match(path) {
+                                return None;
+                            }
+                            let typ = match change {
+                                PathChange::Loaded => return None,
+                                PathChange::Added => lsp::FileChangeType::CREATED,
+                                PathChange::Removed => lsp::FileChangeType::DELETED,
+                                PathChange::Updated => lsp::FileChangeType::CHANGED,
+                                PathChange::AddedOrUpdated => lsp::FileChangeType::CHANGED,
+                            };
+                            Some(lsp::FileEvent {
+                                uri: lsp::Url::from_file_path(abs_path.join(path)).unwrap(),
+                                typ,
                             })
-                            .collect(),
-                    };
-                    if !params.changes.is_empty() {
-                        server
-                            .notify::<lsp::notification::DidChangeWatchedFiles>(&params)
-                            .ok();
-                    }
+                        })
+                        .collect(),
+                };
+                if !params.changes.is_empty() {
+                    server
+                        .notify::<lsp::notification::DidChangeWatchedFiles>(&params)
+                        .ok();
                 }
             }
         }
diff --git a/crates/project/src/manifest_tree/path_trie.rs b/crates/project/src/manifest_tree/path_trie.rs
index 1a0736765a..16110463ac 100644
--- a/crates/project/src/manifest_tree/path_trie.rs
+++ b/crates/project/src/manifest_tree/path_trie.rs
@@ -84,11 +84,11 @@ impl<Label: Ord + Clone> RootPathTrie<Label> {
     ) {
         let mut current = self;
         for key in path.0.iter() {
-            if !current.labels.is_empty() {
-                if (callback)(&current.worktree_relative_path, &current.labels).is_break() {
-                    return;
-                };
-            }
+            if !current.labels.is_empty()
+                && (callback)(&current.worktree_relative_path, &current.labels).is_break()
+            {
+                return;
+            };
             current = match current.children.get(key) {
                 Some(child) => child,
                 None => return,
diff --git a/crates/project/src/prettier_store.rs b/crates/project/src/prettier_store.rs
index 29997545cd..3ae5dc24ae 100644
--- a/crates/project/src/prettier_store.rs
+++ b/crates/project/src/prettier_store.rs
@@ -590,8 +590,8 @@ impl PrettierStore {
                             new_plugins.clear();
                         }
                         let mut needs_install = should_write_prettier_server_file(fs.as_ref()).await;
-                        if let Some(previous_installation_task) = previous_installation_task {
-                            if let Err(e) = previous_installation_task.await {
+                        if let Some(previous_installation_task) = previous_installation_task
+                            && let Err(e) = previous_installation_task.await {
                                 log::error!("Failed to install default prettier: {e:#}");
                                 prettier_store.update(cx, |prettier_store, _| {
                                     if let PrettierInstallation::NotInstalled { attempts, not_installed_plugins, .. } = &mut prettier_store.default_prettier.prettier {
@@ -601,8 +601,7 @@ impl PrettierStore {
                                         needs_install = true;
                                     };
                                 })?;
-                            }
-                        };
+                            };
                         if installation_attempt > prettier::FAIL_THRESHOLD {
                             prettier_store.update(cx, |prettier_store, _| {
                                 if let PrettierInstallation::NotInstalled { installation_task, .. } = &mut prettier_store.default_prettier.prettier {
@@ -679,13 +678,13 @@ impl PrettierStore {
     ) {
         let mut prettier_plugins_by_worktree = HashMap::default();
         for (worktree, language_settings) in language_formatters_to_check {
-            if language_settings.prettier.allowed {
-                if let Some(plugins) = prettier_plugins_for_language(&language_settings) {
-                    prettier_plugins_by_worktree
-                        .entry(worktree)
-                        .or_insert_with(HashSet::default)
-                        .extend(plugins.iter().cloned());
-                }
+            if language_settings.prettier.allowed
+                && let Some(plugins) = prettier_plugins_for_language(&language_settings)
+            {
+                prettier_plugins_by_worktree
+                    .entry(worktree)
+                    .or_insert_with(HashSet::default)
+                    .extend(plugins.iter().cloned());
             }
         }
         for (worktree, prettier_plugins) in prettier_plugins_by_worktree {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 17997850b6..3906befee2 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -489,67 +489,63 @@ impl CompletionSource {
             ..
         } = self
         {
-            if apply_defaults {
-                if let Some(lsp_defaults) = lsp_defaults {
-                    let mut completion_with_defaults = *lsp_completion.clone();
-                    let default_commit_characters = lsp_defaults.commit_characters.as_ref();
-                    let default_edit_range = lsp_defaults.edit_range.as_ref();
-                    let default_insert_text_format = lsp_defaults.insert_text_format.as_ref();
-                    let default_insert_text_mode = lsp_defaults.insert_text_mode.as_ref();
+            if apply_defaults && let Some(lsp_defaults) = lsp_defaults {
+                let mut completion_with_defaults = *lsp_completion.clone();
+                let default_commit_characters = lsp_defaults.commit_characters.as_ref();
+                let default_edit_range = lsp_defaults.edit_range.as_ref();
+                let default_insert_text_format = lsp_defaults.insert_text_format.as_ref();
+                let default_insert_text_mode = lsp_defaults.insert_text_mode.as_ref();
 
-                    if default_commit_characters.is_some()
-                        || default_edit_range.is_some()
-                        || default_insert_text_format.is_some()
-                        || default_insert_text_mode.is_some()
+                if default_commit_characters.is_some()
+                    || default_edit_range.is_some()
+                    || default_insert_text_format.is_some()
+                    || default_insert_text_mode.is_some()
+                {
+                    if completion_with_defaults.commit_characters.is_none()
+                        && default_commit_characters.is_some()
                     {
-                        if completion_with_defaults.commit_characters.is_none()
-                            && default_commit_characters.is_some()
-                        {
-                            completion_with_defaults.commit_characters =
-                                default_commit_characters.cloned()
-                        }
-                        if completion_with_defaults.text_edit.is_none() {
-                            match default_edit_range {
-                                Some(lsp::CompletionListItemDefaultsEditRange::Range(range)) => {
-                                    completion_with_defaults.text_edit =
-                                        Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                            range: *range,
-                                            new_text: completion_with_defaults.label.clone(),
-                                        }))
-                                }
-                                Some(
-                                    lsp::CompletionListItemDefaultsEditRange::InsertAndReplace {
-                                        insert,
-                                        replace,
-                                    },
-                                ) => {
-                                    completion_with_defaults.text_edit =
-                                        Some(lsp::CompletionTextEdit::InsertAndReplace(
-                                            lsp::InsertReplaceEdit {
-                                                new_text: completion_with_defaults.label.clone(),
-                                                insert: *insert,
-                                                replace: *replace,
-                                            },
-                                        ))
-                                }
-                                None => {}
+                        completion_with_defaults.commit_characters =
+                            default_commit_characters.cloned()
+                    }
+                    if completion_with_defaults.text_edit.is_none() {
+                        match default_edit_range {
+                            Some(lsp::CompletionListItemDefaultsEditRange::Range(range)) => {
+                                completion_with_defaults.text_edit =
+                                    Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                                        range: *range,
+                                        new_text: completion_with_defaults.label.clone(),
+                                    }))
                             }
-                        }
-                        if completion_with_defaults.insert_text_format.is_none()
-                            && default_insert_text_format.is_some()
-                        {
-                            completion_with_defaults.insert_text_format =
-                                default_insert_text_format.cloned()
-                        }
-                        if completion_with_defaults.insert_text_mode.is_none()
-                            && default_insert_text_mode.is_some()
-                        {
-                            completion_with_defaults.insert_text_mode =
-                                default_insert_text_mode.cloned()
+                            Some(lsp::CompletionListItemDefaultsEditRange::InsertAndReplace {
+                                insert,
+                                replace,
+                            }) => {
+                                completion_with_defaults.text_edit =
+                                    Some(lsp::CompletionTextEdit::InsertAndReplace(
+                                        lsp::InsertReplaceEdit {
+                                            new_text: completion_with_defaults.label.clone(),
+                                            insert: *insert,
+                                            replace: *replace,
+                                        },
+                                    ))
+                            }
+                            None => {}
                         }
                     }
-                    return Some(Cow::Owned(completion_with_defaults));
+                    if completion_with_defaults.insert_text_format.is_none()
+                        && default_insert_text_format.is_some()
+                    {
+                        completion_with_defaults.insert_text_format =
+                            default_insert_text_format.cloned()
+                    }
+                    if completion_with_defaults.insert_text_mode.is_none()
+                        && default_insert_text_mode.is_some()
+                    {
+                        completion_with_defaults.insert_text_mode =
+                            default_insert_text_mode.cloned()
+                    }
                 }
+                return Some(Cow::Owned(completion_with_defaults));
             }
             Some(Cow::Borrowed(lsp_completion))
         } else {
@@ -2755,11 +2751,12 @@ impl Project {
                         operations,
                     }))
                 })?;
-                if let Some(request) = request {
-                    if request.await.is_err() && !is_local {
-                        *needs_resync_with_host = true;
-                        break;
-                    }
+                if let Some(request) = request
+                    && request.await.is_err()
+                    && !is_local
+                {
+                    *needs_resync_with_host = true;
+                    break;
                 }
             }
             Ok(())
@@ -3939,10 +3936,10 @@ impl Project {
                     if let Some(entry) = b
                         .entry_id(cx)
                         .and_then(|entry_id| worktree_store.entry_for_id(entry_id, cx))
+                        && entry.is_ignored
+                        && !search_query.include_ignored()
                     {
-                        if entry.is_ignored && !search_query.include_ignored() {
-                            return false;
-                        }
+                        return false;
                     }
                 }
                 true
@@ -4151,11 +4148,11 @@ impl Project {
     ) -> Task<Option<ResolvedPath>> {
         let mut candidates = vec![path.clone()];
 
-        if let Some(file) = buffer.read(cx).file() {
-            if let Some(dir) = file.path().parent() {
-                let joined = dir.to_path_buf().join(path);
-                candidates.push(joined);
-            }
+        if let Some(file) = buffer.read(cx).file()
+            && let Some(dir) = file.path().parent()
+        {
+            let joined = dir.to_path_buf().join(path);
+            candidates.push(joined);
         }
 
         let buffer_worktree_id = buffer.read(cx).file().map(|file| file.worktree_id(cx));
@@ -4168,16 +4165,14 @@ impl Project {
             .collect();
 
         cx.spawn(async move |_, cx| {
-            if let Some(buffer_worktree_id) = buffer_worktree_id {
-                if let Some((worktree, _)) = worktrees_with_ids
+            if let Some(buffer_worktree_id) = buffer_worktree_id
+                && let Some((worktree, _)) = worktrees_with_ids
                     .iter()
                     .find(|(_, id)| *id == buffer_worktree_id)
-                {
-                    for candidate in candidates.iter() {
-                        if let Some(path) = Self::resolve_path_in_worktree(worktree, candidate, cx)
-                        {
-                            return Some(path);
-                        }
+            {
+                for candidate in candidates.iter() {
+                    if let Some(path) = Self::resolve_path_in_worktree(worktree, candidate, cx) {
+                        return Some(path);
                     }
                 }
             }
diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index 4f024837c8..ee216a9976 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -155,16 +155,16 @@ impl SearchQuery {
         let initial_query = Arc::from(query.as_str());
         if whole_word {
             let mut word_query = String::new();
-            if let Some(first) = query.get(0..1) {
-                if WORD_MATCH_TEST.is_match(first).is_ok_and(|x| !x) {
-                    word_query.push_str("\\b");
-                }
+            if let Some(first) = query.get(0..1)
+                && WORD_MATCH_TEST.is_match(first).is_ok_and(|x| !x)
+            {
+                word_query.push_str("\\b");
             }
             word_query.push_str(&query);
-            if let Some(last) = query.get(query.len() - 1..) {
-                if WORD_MATCH_TEST.is_match(last).is_ok_and(|x| !x) {
-                    word_query.push_str("\\b");
-                }
+            if let Some(last) = query.get(query.len() - 1..)
+                && WORD_MATCH_TEST.is_match(last).is_ok_and(|x| !x)
+            {
+                word_query.push_str("\\b");
             }
             query = word_query
         }
diff --git a/crates/project/src/search_history.rs b/crates/project/src/search_history.rs
index 90b169bb0c..401f375094 100644
--- a/crates/project/src/search_history.rs
+++ b/crates/project/src/search_history.rs
@@ -45,20 +45,19 @@ impl SearchHistory {
     }
 
     pub fn add(&mut self, cursor: &mut SearchHistoryCursor, search_string: String) {
-        if self.insertion_behavior == QueryInsertionBehavior::ReplacePreviousIfContains {
-            if let Some(previously_searched) = self.history.back_mut() {
-                if search_string.contains(previously_searched.as_str()) {
-                    *previously_searched = search_string;
-                    cursor.selection = Some(self.history.len() - 1);
-                    return;
-                }
-            }
+        if self.insertion_behavior == QueryInsertionBehavior::ReplacePreviousIfContains
+            && let Some(previously_searched) = self.history.back_mut()
+            && search_string.contains(previously_searched.as_str())
+        {
+            *previously_searched = search_string;
+            cursor.selection = Some(self.history.len() - 1);
+            return;
         }
 
-        if let Some(max_history_len) = self.max_history_len {
-            if self.history.len() >= max_history_len {
-                self.history.pop_front();
-            }
+        if let Some(max_history_len) = self.max_history_len
+            && self.history.len() >= max_history_len
+        {
+            self.history.pop_front();
         }
         self.history.push_back(search_string);
 
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index f5d08990b5..5f98a10c75 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -119,13 +119,13 @@ impl Project {
         };
 
         let mut settings_location = None;
-        if let Some(path) = path.as_ref() {
-            if let Some((worktree, _)) = self.find_worktree(path, cx) {
-                settings_location = Some(SettingsLocation {
-                    worktree_id: worktree.read(cx).id(),
-                    path,
-                });
-            }
+        if let Some(path) = path.as_ref()
+            && let Some((worktree, _)) = self.find_worktree(path, cx)
+        {
+            settings_location = Some(SettingsLocation {
+                worktree_id: worktree.read(cx).id(),
+                path,
+            });
         }
         let venv = TerminalSettings::get(settings_location, cx)
             .detect_venv
@@ -151,13 +151,13 @@ impl Project {
         cx: &'a App,
     ) -> &'a TerminalSettings {
         let mut settings_location = None;
-        if let Some(path) = path.as_ref() {
-            if let Some((worktree, _)) = self.find_worktree(path, cx) {
-                settings_location = Some(SettingsLocation {
-                    worktree_id: worktree.read(cx).id(),
-                    path,
-                });
-            }
+        if let Some(path) = path.as_ref()
+            && let Some((worktree, _)) = self.find_worktree(path, cx)
+        {
+            settings_location = Some(SettingsLocation {
+                worktree_id: worktree.read(cx).id(),
+                path,
+            });
         }
         TerminalSettings::get(settings_location, cx)
     }
@@ -239,13 +239,13 @@ impl Project {
         let is_ssh_terminal = ssh_details.is_some();
 
         let mut settings_location = None;
-        if let Some(path) = path.as_ref() {
-            if let Some((worktree, _)) = this.find_worktree(path, cx) {
-                settings_location = Some(SettingsLocation {
-                    worktree_id: worktree.read(cx).id(),
-                    path,
-                });
-            }
+        if let Some(path) = path.as_ref()
+            && let Some((worktree, _)) = this.find_worktree(path, cx)
+        {
+            settings_location = Some(SettingsLocation {
+                worktree_id: worktree.read(cx).id(),
+                path,
+            });
         }
         let settings = TerminalSettings::get(settings_location, cx).clone();
 
@@ -665,11 +665,11 @@ pub fn wrap_for_ssh(
             env_changes.push_str(&format!("{}={} ", k, v));
         }
     }
-    if let Some(venv_directory) = venv_directory {
-        if let Ok(str) = shlex::try_quote(venv_directory.to_string_lossy().as_ref()) {
-            let path = RemotePathBuf::new(PathBuf::from(str.to_string()), path_style).to_string();
-            env_changes.push_str(&format!("PATH={}:$PATH ", path));
-        }
+    if let Some(venv_directory) = venv_directory
+        && let Ok(str) = shlex::try_quote(venv_directory.to_string_lossy().as_ref())
+    {
+        let path = RemotePathBuf::new(PathBuf::from(str.to_string()), path_style).to_string();
+        env_changes.push_str(&format!("PATH={}:$PATH ", path));
     }
 
     let commands = if let Some(path) = path {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 892847a380..dd6b081e98 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -652,8 +652,8 @@ impl ProjectPanel {
                     focus_opened_item,
                     allow_preview,
                 } => {
-                    if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx) {
-                        if let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
+                    if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx)
+                        && let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
                             let file_path = entry.path.clone();
                             let worktree_id = worktree.read(cx).id();
                             let entry_id = entry.id;
@@ -703,11 +703,10 @@ impl ProjectPanel {
                                 }
                             }
                         }
-                    }
                 }
                 &Event::SplitEntry { entry_id } => {
-                    if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx) {
-                        if let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
+                    if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx)
+                        && let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
                             workspace
                                 .split_path(
                                     ProjectPath {
@@ -718,7 +717,6 @@ impl ProjectPanel {
                                 )
                                 .detach_and_log_err(cx);
                         }
-                    }
                 }
 
                 _ => {}
@@ -1002,10 +1000,10 @@ impl ProjectPanel {
         if let Some(parent_path) = entry.path.parent() {
             let snapshot = worktree.snapshot();
             let mut child_entries = snapshot.child_entries(parent_path);
-            if let Some(child) = child_entries.next() {
-                if child_entries.next().is_none() {
-                    return child.kind.is_dir();
-                }
+            if let Some(child) = child_entries.next()
+                && child_entries.next().is_none()
+            {
+                return child.kind.is_dir();
             }
         };
         false
@@ -1016,10 +1014,10 @@ impl ProjectPanel {
             let snapshot = worktree.snapshot();
 
             let mut child_entries = snapshot.child_entries(&entry.path);
-            if let Some(child) = child_entries.next() {
-                if child_entries.next().is_none() {
-                    return child.kind.is_dir();
-                }
+            if let Some(child) = child_entries.next()
+                && child_entries.next().is_none()
+            {
+                return child.kind.is_dir();
             }
         }
         false
@@ -1032,12 +1030,12 @@ impl ProjectPanel {
         cx: &mut Context<Self>,
     ) {
         if let Some((worktree, entry)) = self.selected_entry(cx) {
-            if let Some(folded_ancestors) = self.ancestors.get_mut(&entry.id) {
-                if folded_ancestors.current_ancestor_depth > 0 {
-                    folded_ancestors.current_ancestor_depth -= 1;
-                    cx.notify();
-                    return;
-                }
+            if let Some(folded_ancestors) = self.ancestors.get_mut(&entry.id)
+                && folded_ancestors.current_ancestor_depth > 0
+            {
+                folded_ancestors.current_ancestor_depth -= 1;
+                cx.notify();
+                return;
             }
             if entry.is_dir() {
                 let worktree_id = worktree.id();
@@ -1079,12 +1077,12 @@ impl ProjectPanel {
 
     fn collapse_entry(&mut self, entry: Entry, worktree: Entity<Worktree>, cx: &mut Context<Self>) {
         let worktree = worktree.read(cx);
-        if let Some(folded_ancestors) = self.ancestors.get_mut(&entry.id) {
-            if folded_ancestors.current_ancestor_depth + 1 < folded_ancestors.max_ancestor_depth() {
-                folded_ancestors.current_ancestor_depth += 1;
-                cx.notify();
-                return;
-            }
+        if let Some(folded_ancestors) = self.ancestors.get_mut(&entry.id)
+            && folded_ancestors.current_ancestor_depth + 1 < folded_ancestors.max_ancestor_depth()
+        {
+            folded_ancestors.current_ancestor_depth += 1;
+            cx.notify();
+            return;
         }
         let worktree_id = worktree.id();
         let expanded_dir_ids =
@@ -1137,23 +1135,23 @@ impl ProjectPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx) {
-            if let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree_id) {
-                self.project.update(cx, |project, cx| {
-                    match expanded_dir_ids.binary_search(&entry_id) {
-                        Ok(ix) => {
-                            expanded_dir_ids.remove(ix);
-                        }
-                        Err(ix) => {
-                            project.expand_entry(worktree_id, entry_id, cx);
-                            expanded_dir_ids.insert(ix, entry_id);
-                        }
+        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx)
+            && let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree_id)
+        {
+            self.project.update(cx, |project, cx| {
+                match expanded_dir_ids.binary_search(&entry_id) {
+                    Ok(ix) => {
+                        expanded_dir_ids.remove(ix);
                     }
-                });
-                self.update_visible_entries(Some((worktree_id, entry_id)), cx);
-                window.focus(&self.focus_handle);
-                cx.notify();
-            }
+                    Err(ix) => {
+                        project.expand_entry(worktree_id, entry_id, cx);
+                        expanded_dir_ids.insert(ix, entry_id);
+                    }
+                }
+            });
+            self.update_visible_entries(Some((worktree_id, entry_id)), cx);
+            window.focus(&self.focus_handle);
+            cx.notify();
         }
     }
 
@@ -1163,20 +1161,20 @@ impl ProjectPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx) {
-            if let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree_id) {
-                match expanded_dir_ids.binary_search(&entry_id) {
-                    Ok(_ix) => {
-                        self.collapse_all_for_entry(worktree_id, entry_id, cx);
-                    }
-                    Err(_ix) => {
-                        self.expand_all_for_entry(worktree_id, entry_id, cx);
-                    }
+        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx)
+            && let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree_id)
+        {
+            match expanded_dir_ids.binary_search(&entry_id) {
+                Ok(_ix) => {
+                    self.collapse_all_for_entry(worktree_id, entry_id, cx);
+                }
+                Err(_ix) => {
+                    self.expand_all_for_entry(worktree_id, entry_id, cx);
                 }
-                self.update_visible_entries(Some((worktree_id, entry_id)), cx);
-                window.focus(&self.focus_handle);
-                cx.notify();
             }
+            self.update_visible_entries(Some((worktree_id, entry_id)), cx);
+            window.focus(&self.focus_handle);
+            cx.notify();
         }
     }
 
@@ -1251,20 +1249,20 @@ impl ProjectPanel {
     }
 
     fn select_previous(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(edit_state) = &self.edit_state {
-            if edit_state.processing_filename.is_none() {
-                self.filename_editor.update(cx, |editor, cx| {
-                    editor.move_to_beginning_of_line(
-                        &editor::actions::MoveToBeginningOfLine {
-                            stop_at_soft_wraps: false,
-                            stop_at_indent: false,
-                        },
-                        window,
-                        cx,
-                    );
-                });
-                return;
-            }
+        if let Some(edit_state) = &self.edit_state
+            && edit_state.processing_filename.is_none()
+        {
+            self.filename_editor.update(cx, |editor, cx| {
+                editor.move_to_beginning_of_line(
+                    &editor::actions::MoveToBeginningOfLine {
+                        stop_at_soft_wraps: false,
+                        stop_at_indent: false,
+                    },
+                    window,
+                    cx,
+                );
+            });
+            return;
         }
         if let Some(selection) = self.selection {
             let (mut worktree_ix, mut entry_ix, _) =
@@ -1341,39 +1339,37 @@ impl ProjectPanel {
                 .project
                 .read(cx)
                 .worktree_for_id(edit_state.worktree_id, cx)
+                && let Some(entry) = worktree.read(cx).entry_for_id(edit_state.entry_id)
             {
-                if let Some(entry) = worktree.read(cx).entry_for_id(edit_state.entry_id) {
-                    let mut already_exists = false;
-                    if edit_state.is_new_entry() {
-                        let new_path = entry.path.join(filename.trim_start_matches('/'));
-                        if worktree
-                            .read(cx)
-                            .entry_for_path(new_path.as_path())
-                            .is_some()
-                        {
-                            already_exists = true;
-                        }
-                    } else {
-                        let new_path = if let Some(parent) = entry.path.clone().parent() {
-                            parent.join(&filename)
-                        } else {
-                            filename.clone().into()
-                        };
-                        if let Some(existing) = worktree.read(cx).entry_for_path(new_path.as_path())
-                        {
-                            if existing.id != entry.id {
-                                already_exists = true;
-                            }
-                        }
-                    };
-                    if already_exists {
-                        edit_state.validation_state = ValidationState::Error(format!(
-                            "File or directory '{}' already exists at location. Please choose a different name.",
-                            filename
-                        ));
-                        cx.notify();
-                        return;
+                let mut already_exists = false;
+                if edit_state.is_new_entry() {
+                    let new_path = entry.path.join(filename.trim_start_matches('/'));
+                    if worktree
+                        .read(cx)
+                        .entry_for_path(new_path.as_path())
+                        .is_some()
+                    {
+                        already_exists = true;
                     }
+                } else {
+                    let new_path = if let Some(parent) = entry.path.clone().parent() {
+                        parent.join(&filename)
+                    } else {
+                        filename.clone().into()
+                    };
+                    if let Some(existing) = worktree.read(cx).entry_for_path(new_path.as_path())
+                        && existing.id != entry.id
+                    {
+                        already_exists = true;
+                    }
+                };
+                if already_exists {
+                    edit_state.validation_state = ValidationState::Error(format!(
+                        "File or directory '{}' already exists at location. Please choose a different name.",
+                        filename
+                    ));
+                    cx.notify();
+                    return;
                 }
             }
             let trimmed_filename = filename.trim();
@@ -1477,14 +1473,13 @@ impl ProjectPanel {
                 }
                 Ok(CreatedEntry::Included(new_entry)) => {
                     project_panel.update( cx, |project_panel, cx| {
-                        if let Some(selection) = &mut project_panel.selection {
-                            if selection.entry_id == edited_entry_id {
+                        if let Some(selection) = &mut project_panel.selection
+                            && selection.entry_id == edited_entry_id {
                                 selection.worktree_id = worktree_id;
                                 selection.entry_id = new_entry.id;
                                 project_panel.marked_entries.clear();
                                 project_panel.expand_to_selection(cx);
                             }
-                        }
                         project_panel.update_visible_entries(None, cx);
                         if is_new_entry && !is_dir {
                             project_panel.open_entry(new_entry.id, true, false, cx);
@@ -1617,11 +1612,11 @@ impl ProjectPanel {
                         directory_id = entry.id;
                         break;
                     } else {
-                        if let Some(parent_path) = entry.path.parent() {
-                            if let Some(parent_entry) = worktree.entry_for_path(parent_path) {
-                                entry = parent_entry;
-                                continue;
-                            }
+                        if let Some(parent_path) = entry.path.parent()
+                            && let Some(parent_entry) = worktree.entry_for_path(parent_path)
+                        {
+                            entry = parent_entry;
+                            continue;
                         }
                         return;
                     }
@@ -1675,57 +1670,56 @@ impl ProjectPanel {
             worktree_id,
             entry_id,
         }) = self.selection
+            && let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx)
         {
-            if let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx) {
-                let sub_entry_id = self.unflatten_entry_id(entry_id);
-                if let Some(entry) = worktree.read(cx).entry_for_id(sub_entry_id) {
-                    #[cfg(target_os = "windows")]
-                    if Some(entry) == worktree.read(cx).root_entry() {
+            let sub_entry_id = self.unflatten_entry_id(entry_id);
+            if let Some(entry) = worktree.read(cx).entry_for_id(sub_entry_id) {
+                #[cfg(target_os = "windows")]
+                if Some(entry) == worktree.read(cx).root_entry() {
+                    return;
+                }
+
+                if Some(entry) == worktree.read(cx).root_entry() {
+                    let settings = ProjectPanelSettings::get_global(cx);
+                    let visible_worktrees_count =
+                        self.project.read(cx).visible_worktrees(cx).count();
+                    if settings.hide_root && visible_worktrees_count == 1 {
                         return;
                     }
-
-                    if Some(entry) == worktree.read(cx).root_entry() {
-                        let settings = ProjectPanelSettings::get_global(cx);
-                        let visible_worktrees_count =
-                            self.project.read(cx).visible_worktrees(cx).count();
-                        if settings.hide_root && visible_worktrees_count == 1 {
-                            return;
-                        }
-                    }
-
-                    self.edit_state = Some(EditState {
-                        worktree_id,
-                        entry_id: sub_entry_id,
-                        leaf_entry_id: Some(entry_id),
-                        is_dir: entry.is_dir(),
-                        processing_filename: None,
-                        previously_focused: None,
-                        depth: 0,
-                        validation_state: ValidationState::None,
-                    });
-                    let file_name = entry
-                        .path
-                        .file_name()
-                        .map(|s| s.to_string_lossy())
-                        .unwrap_or_default()
-                        .to_string();
-                    let selection = selection.unwrap_or_else(|| {
-                        let file_stem = entry.path.file_stem().map(|s| s.to_string_lossy());
-                        let selection_end =
-                            file_stem.map_or(file_name.len(), |file_stem| file_stem.len());
-                        0..selection_end
-                    });
-                    self.filename_editor.update(cx, |editor, cx| {
-                        editor.set_text(file_name, window, cx);
-                        editor.change_selections(Default::default(), window, cx, |s| {
-                            s.select_ranges([selection])
-                        });
-                        window.focus(&editor.focus_handle(cx));
-                    });
-                    self.update_visible_entries(None, cx);
-                    self.autoscroll(cx);
-                    cx.notify();
                 }
+
+                self.edit_state = Some(EditState {
+                    worktree_id,
+                    entry_id: sub_entry_id,
+                    leaf_entry_id: Some(entry_id),
+                    is_dir: entry.is_dir(),
+                    processing_filename: None,
+                    previously_focused: None,
+                    depth: 0,
+                    validation_state: ValidationState::None,
+                });
+                let file_name = entry
+                    .path
+                    .file_name()
+                    .map(|s| s.to_string_lossy())
+                    .unwrap_or_default()
+                    .to_string();
+                let selection = selection.unwrap_or_else(|| {
+                    let file_stem = entry.path.file_stem().map(|s| s.to_string_lossy());
+                    let selection_end =
+                        file_stem.map_or(file_name.len(), |file_stem| file_stem.len());
+                    0..selection_end
+                });
+                self.filename_editor.update(cx, |editor, cx| {
+                    editor.set_text(file_name, window, cx);
+                    editor.change_selections(Default::default(), window, cx, |s| {
+                        s.select_ranges([selection])
+                    });
+                    window.focus(&editor.focus_handle(cx));
+                });
+                self.update_visible_entries(None, cx);
+                self.autoscroll(cx);
+                cx.notify();
             }
         }
     }
@@ -1831,10 +1825,10 @@ impl ProjectPanel {
             };
             let next_selection = self.find_next_selection_after_deletion(items_to_delete, cx);
             cx.spawn_in(window, async move |panel, cx| {
-                if let Some(answer) = answer {
-                    if answer.await != Ok(0) {
-                        return anyhow::Ok(());
-                    }
+                if let Some(answer) = answer
+                    && answer.await != Ok(0)
+                {
+                    return anyhow::Ok(());
                 }
                 for (entry_id, _) in file_paths {
                     panel
@@ -1999,19 +1993,19 @@ impl ProjectPanel {
     }
 
     fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(edit_state) = &self.edit_state {
-            if edit_state.processing_filename.is_none() {
-                self.filename_editor.update(cx, |editor, cx| {
-                    editor.move_to_end_of_line(
-                        &editor::actions::MoveToEndOfLine {
-                            stop_at_soft_wraps: false,
-                        },
-                        window,
-                        cx,
-                    );
-                });
-                return;
-            }
+        if let Some(edit_state) = &self.edit_state
+            && edit_state.processing_filename.is_none()
+        {
+            self.filename_editor.update(cx, |editor, cx| {
+                editor.move_to_end_of_line(
+                    &editor::actions::MoveToEndOfLine {
+                        stop_at_soft_wraps: false,
+                    },
+                    window,
+                    cx,
+                );
+            });
+            return;
         }
         if let Some(selection) = self.selection {
             let (mut worktree_ix, mut entry_ix, _) =
@@ -2032,20 +2026,19 @@ impl ProjectPanel {
                 entries,
                 ..
             }) = self.visible_entries.get(worktree_ix)
+                && let Some(entry) = entries.get(entry_ix)
             {
-                if let Some(entry) = entries.get(entry_ix) {
-                    let selection = SelectedEntry {
-                        worktree_id: *worktree_id,
-                        entry_id: entry.id,
-                    };
-                    self.selection = Some(selection);
-                    if window.modifiers().shift {
-                        self.marked_entries.push(selection);
-                    }
-
-                    self.autoscroll(cx);
-                    cx.notify();
+                let selection = SelectedEntry {
+                    worktree_id: *worktree_id,
+                    entry_id: entry.id,
+                };
+                self.selection = Some(selection);
+                if window.modifiers().shift {
+                    self.marked_entries.push(selection);
                 }
+
+                self.autoscroll(cx);
+                cx.notify();
             }
         } else {
             self.select_first(&SelectFirst {}, window, cx);
@@ -2274,19 +2267,18 @@ impl ProjectPanel {
             entries,
             ..
         }) = self.visible_entries.first()
+            && let Some(entry) = entries.first()
         {
-            if let Some(entry) = entries.first() {
-                let selection = SelectedEntry {
-                    worktree_id: *worktree_id,
-                    entry_id: entry.id,
-                };
-                self.selection = Some(selection);
-                if window.modifiers().shift {
-                    self.marked_entries.push(selection);
-                }
-                self.autoscroll(cx);
-                cx.notify();
+            let selection = SelectedEntry {
+                worktree_id: *worktree_id,
+                entry_id: entry.id,
+            };
+            self.selection = Some(selection);
+            if window.modifiers().shift {
+                self.marked_entries.push(selection);
             }
+            self.autoscroll(cx);
+            cx.notify();
         }
     }
 
@@ -2947,10 +2939,10 @@ impl ProjectPanel {
             let Some(entry) = worktree.entry_for_path(path) else {
                 continue;
             };
-            if entry.is_dir() {
-                if let Err(idx) = expanded_dir_ids.binary_search(&entry.id) {
-                    expanded_dir_ids.insert(idx, entry.id);
-                }
+            if entry.is_dir()
+                && let Err(idx) = expanded_dir_ids.binary_search(&entry.id)
+            {
+                expanded_dir_ids.insert(idx, entry.id);
             }
         }
 
@@ -3024,15 +3016,16 @@ impl ProjectPanel {
 
             let mut new_entry_parent_id = None;
             let mut new_entry_kind = EntryKind::Dir;
-            if let Some(edit_state) = &self.edit_state {
-                if edit_state.worktree_id == worktree_id && edit_state.is_new_entry() {
-                    new_entry_parent_id = Some(edit_state.entry_id);
-                    new_entry_kind = if edit_state.is_dir {
-                        EntryKind::Dir
-                    } else {
-                        EntryKind::File
-                    };
-                }
+            if let Some(edit_state) = &self.edit_state
+                && edit_state.worktree_id == worktree_id
+                && edit_state.is_new_entry()
+            {
+                new_entry_parent_id = Some(edit_state.entry_id);
+                new_entry_kind = if edit_state.is_dir {
+                    EntryKind::Dir
+                } else {
+                    EntryKind::File
+                };
             }
 
             let mut visible_worktree_entries = Vec::new();
@@ -3054,19 +3047,18 @@ impl ProjectPanel {
                 }
                 if auto_collapse_dirs && entry.kind.is_dir() {
                     auto_folded_ancestors.push(entry.id);
-                    if !self.unfolded_dir_ids.contains(&entry.id) {
-                        if let Some(root_path) = worktree_snapshot.root_entry() {
-                            let mut child_entries = worktree_snapshot.child_entries(&entry.path);
-                            if let Some(child) = child_entries.next() {
-                                if entry.path != root_path.path
-                                    && child_entries.next().is_none()
-                                    && child.kind.is_dir()
-                                {
-                                    entry_iter.advance();
+                    if !self.unfolded_dir_ids.contains(&entry.id)
+                        && let Some(root_path) = worktree_snapshot.root_entry()
+                    {
+                        let mut child_entries = worktree_snapshot.child_entries(&entry.path);
+                        if let Some(child) = child_entries.next()
+                            && entry.path != root_path.path
+                            && child_entries.next().is_none()
+                            && child.kind.is_dir()
+                        {
+                            entry_iter.advance();
 
-                                    continue;
-                                }
-                            }
+                            continue;
                         }
                     }
                     let depth = old_ancestors
@@ -3074,10 +3066,10 @@ impl ProjectPanel {
                         .map(|ancestor| ancestor.current_ancestor_depth)
                         .unwrap_or_default()
                         .min(auto_folded_ancestors.len());
-                    if let Some(edit_state) = &mut self.edit_state {
-                        if edit_state.entry_id == entry.id {
-                            edit_state.depth = depth;
-                        }
+                    if let Some(edit_state) = &mut self.edit_state
+                        && edit_state.entry_id == entry.id
+                    {
+                        edit_state.depth = depth;
                     }
                     let mut ancestors = std::mem::take(&mut auto_folded_ancestors);
                     if ancestors.len() > 1 {
@@ -3314,11 +3306,10 @@ impl ProjectPanel {
                             )
                     })?.await?;
 
-                    if answer == 1 {
-                        if let Some(item_idx) = paths.iter().position(|p| p == original_path) {
+                    if answer == 1
+                        && let Some(item_idx) = paths.iter().position(|p| p == original_path) {
                             paths.remove(item_idx);
                         }
-                    }
                 }
 
                 if paths.is_empty() {
@@ -4309,8 +4300,8 @@ impl ProjectPanel {
                         }
                     } else if kind.is_dir() {
                         project_panel.marked_entries.clear();
-                        if is_sticky {
-                            if let Some((_, _, index)) = project_panel.index_for_entry(entry_id, worktree_id) {
+                        if is_sticky
+                            && let Some((_, _, index)) = project_panel.index_for_entry(entry_id, worktree_id) {
                                 project_panel.scroll_handle.scroll_to_item_with_offset(index, ScrollStrategy::Top, sticky_index.unwrap_or(0));
                                 cx.notify();
                                 // move down by 1px so that clicked item
@@ -4325,7 +4316,6 @@ impl ProjectPanel {
                                 });
                                 return;
                             }
-                        }
                         if event.modifiers().alt {
                             project_panel.toggle_expand_all(entry_id, window, cx);
                         } else {
@@ -4547,15 +4537,14 @@ impl ProjectPanel {
                                                 })
                                             })
                                             .on_click(cx.listener(move |this, _, _, cx| {
-                                                if index != active_index {
-                                                    if let Some(folds) =
+                                                if index != active_index
+                                                    && let Some(folds) =
                                                         this.ancestors.get_mut(&entry_id)
                                                     {
                                                         folds.current_ancestor_depth =
                                                             components_len - 1 - index;
                                                         cx.notify();
                                                     }
-                                                }
                                             }))
                                             .child(
                                                 Label::new(component)
@@ -5034,12 +5023,12 @@ impl ProjectPanel {
         'outer: loop {
             if let Some(parent_path) = current_path.parent() {
                 for ancestor_path in parent_path.ancestors() {
-                    if paths.contains(ancestor_path) {
-                        if let Some(parent_entry) = worktree.entry_for_path(ancestor_path) {
-                            sticky_parents.push(parent_entry.clone());
-                            current_path = parent_entry.path.clone();
-                            continue 'outer;
-                        }
+                    if paths.contains(ancestor_path)
+                        && let Some(parent_entry) = worktree.entry_for_path(ancestor_path)
+                    {
+                        sticky_parents.push(parent_entry.clone());
+                        current_path = parent_entry.path.clone();
+                        continue 'outer;
                     }
                 }
             }
@@ -5291,25 +5280,25 @@ impl Render for ProjectPanel {
                         .on_action(cx.listener(Self::paste))
                         .on_action(cx.listener(Self::duplicate))
                         .on_click(cx.listener(|this, event: &gpui::ClickEvent, window, cx| {
-                            if event.click_count() > 1 {
-                                if let Some(entry_id) = this.last_worktree_root_id {
-                                    let project = this.project.read(cx);
+                            if event.click_count() > 1
+                                && let Some(entry_id) = this.last_worktree_root_id
+                            {
+                                let project = this.project.read(cx);
 
-                                    let worktree_id = if let Some(worktree) =
-                                        project.worktree_for_entry(entry_id, cx)
-                                    {
-                                        worktree.read(cx).id()
-                                    } else {
-                                        return;
-                                    };
+                                let worktree_id = if let Some(worktree) =
+                                    project.worktree_for_entry(entry_id, cx)
+                                {
+                                    worktree.read(cx).id()
+                                } else {
+                                    return;
+                                };
 
-                                    this.selection = Some(SelectedEntry {
-                                        worktree_id,
-                                        entry_id,
-                                    });
+                                this.selection = Some(SelectedEntry {
+                                    worktree_id,
+                                    entry_id,
+                                });
 
-                                    this.new_file(&NewFile, window, cx);
-                                }
+                                this.new_file(&NewFile, window, cx);
                             }
                         }))
                 })
diff --git a/crates/prompt_store/src/prompts.rs b/crates/prompt_store/src/prompts.rs
index 7eb63eec5e..526d2c6a34 100644
--- a/crates/prompt_store/src/prompts.rs
+++ b/crates/prompt_store/src/prompts.rs
@@ -261,13 +261,12 @@ impl PromptBuilder {
                 // Initial scan of the prompt overrides directory
                 if let Ok(mut entries) = params.fs.read_dir(&templates_dir).await {
                     while let Some(Ok(file_path)) = entries.next().await {
-                        if file_path.to_string_lossy().ends_with(".hbs") {
-                            if let Ok(content) = params.fs.load(&file_path).await {
+                        if file_path.to_string_lossy().ends_with(".hbs")
+                            && let Ok(content) = params.fs.load(&file_path).await {
                                 let file_name = file_path.file_stem().unwrap().to_string_lossy();
                                 log::debug!("Registering prompt template override: {}", file_name);
                                 handlebars.lock().register_template_string(&file_name, content).log_err();
                             }
-                        }
                     }
                 }
 
@@ -280,13 +279,12 @@ impl PromptBuilder {
                 let mut combined_changes = futures::stream::select(changes, parent_changes);
 
                 while let Some(changed_paths) = combined_changes.next().await {
-                    if changed_paths.iter().any(|p| &p.path == &templates_dir) {
-                        if !params.fs.is_dir(&templates_dir).await {
+                    if changed_paths.iter().any(|p| &p.path == &templates_dir)
+                        && !params.fs.is_dir(&templates_dir).await {
                             log::info!("Prompt template overrides directory removed. Restoring built-in prompt templates.");
                             Self::register_built_in_templates(&mut handlebars.lock()).log_err();
                             break;
                         }
-                    }
                     for event in changed_paths {
                         if event.path.starts_with(&templates_dir) && event.path.extension().map_or(false, |ext| ext == "hbs") {
                             log::info!("Reloading prompt template override: {}", event.path.display());
@@ -311,12 +309,11 @@ impl PromptBuilder {
                 .split('/')
                 .next_back()
                 .and_then(|s| s.strip_suffix(".hbs"))
+                && let Some(prompt) = Assets.load(path.as_ref()).log_err().flatten()
             {
-                if let Some(prompt) = Assets.load(path.as_ref()).log_err().flatten() {
-                    log::debug!("Registering built-in prompt template: {}", id);
-                    let prompt = String::from_utf8_lossy(prompt.as_ref());
-                    handlebars.register_template_string(id, LineEnding::normalize_cow(prompt))?
-                }
+                log::debug!("Registering built-in prompt template: {}", id);
+                let prompt = String::from_utf8_lossy(prompt.as_ref());
+                handlebars.register_template_string(id, LineEnding::normalize_cow(prompt))?
             }
         }
 
diff --git a/crates/proto/src/error.rs b/crates/proto/src/error.rs
index 7ba08df57d..1724a70217 100644
--- a/crates/proto/src/error.rs
+++ b/crates/proto/src/error.rs
@@ -190,10 +190,10 @@ impl ErrorExt for RpcError {
     fn error_tag(&self, k: &str) -> Option<&str> {
         for tag in &self.tags {
             let mut parts = tag.split('=');
-            if let Some(key) = parts.next() {
-                if key == k {
-                    return parts.next();
-                }
+            if let Some(key) = parts.next()
+                && key == k
+            {
+                return parts.next();
             }
         }
         None
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index bc837b1a1e..0fd6d5af8c 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -664,10 +664,10 @@ impl RemoteServerProjects {
                 let text = Some(state.editor.read(cx).text(cx)).filter(|text| !text.is_empty());
                 let index = state.index;
                 self.update_settings_file(cx, move |setting, _| {
-                    if let Some(connections) = setting.ssh_connections.as_mut() {
-                        if let Some(connection) = connections.get_mut(index) {
-                            connection.nickname = text;
-                        }
+                    if let Some(connections) = setting.ssh_connections.as_mut()
+                        && let Some(connection) = connections.get_mut(index)
+                    {
+                        connection.nickname = text;
                     }
                 });
                 self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
diff --git a/crates/refineable/derive_refineable/src/derive_refineable.rs b/crates/refineable/derive_refineable/src/derive_refineable.rs
index 3f6b45cc12..ddf3855a4d 100644
--- a/crates/refineable/derive_refineable/src/derive_refineable.rs
+++ b/crates/refineable/derive_refineable/src/derive_refineable.rs
@@ -510,12 +510,12 @@ fn is_refineable_field(f: &Field) -> bool {
 }
 
 fn is_optional_field(f: &Field) -> bool {
-    if let Type::Path(typepath) = &f.ty {
-        if typepath.qself.is_none() {
-            let segments = &typepath.path.segments;
-            if segments.len() == 1 && segments.iter().any(|s| s.ident == "Option") {
-                return true;
-            }
+    if let Type::Path(typepath) = &f.ty
+        && typepath.qself.is_none()
+    {
+        let segments = &typepath.path.segments;
+        if segments.len() == 1 && segments.iter().any(|s| s.ident == "Option") {
+            return true;
         }
     }
     false
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 71e8f6e8e7..2180fbb5ee 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -1310,10 +1310,10 @@ impl ConnectionPool {
                 return task.clone();
             }
             Some(ConnectionPoolEntry::Connected(ssh)) => {
-                if let Some(ssh) = ssh.upgrade() {
-                    if !ssh.has_been_killed() {
-                        return Task::ready(Ok(ssh)).shared();
-                    }
+                if let Some(ssh) = ssh.upgrade()
+                    && !ssh.has_been_killed()
+                {
+                    return Task::ready(Ok(ssh)).shared();
                 }
                 self.connections.remove(&opts);
             }
@@ -1840,26 +1840,25 @@ impl SshRemoteConnection {
             )),
             self.ssh_path_style,
         );
-        if !self.socket.connection_options.upload_binary_over_ssh {
-            if let Some((url, body)) = delegate
+        if !self.socket.connection_options.upload_binary_over_ssh
+            && let Some((url, body)) = delegate
                 .get_download_params(self.ssh_platform, release_channel, wanted_version, cx)
                 .await?
+        {
+            match self
+                .download_binary_on_server(&url, &body, &tmp_path_gz, delegate, cx)
+                .await
             {
-                match self
-                    .download_binary_on_server(&url, &body, &tmp_path_gz, delegate, cx)
-                    .await
-                {
-                    Ok(_) => {
-                        self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
-                            .await?;
-                        return Ok(dst_path);
-                    }
-                    Err(e) => {
-                        log::error!(
-                            "Failed to download binary on server, attempting to upload server: {}",
-                            e
-                        )
-                    }
+                Ok(_) => {
+                    self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
+                        .await?;
+                    return Ok(dst_path);
+                }
+                Err(e) => {
+                    log::error!(
+                        "Failed to download binary on server, attempting to upload server: {}",
+                        e
+                    )
                 }
             }
         }
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 4daacb3eec..76e74b75bd 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -951,13 +951,13 @@ fn cleanup_old_binaries() -> Result<()> {
     for entry in std::fs::read_dir(server_dir)? {
         let path = entry?.path();
 
-        if let Some(file_name) = path.file_name() {
-            if let Some(version) = file_name.to_string_lossy().strip_prefix(&prefix) {
-                if !is_new_version(version) && !is_file_in_use(file_name) {
-                    log::info!("removing old remote server binary: {:?}", path);
-                    std::fs::remove_file(&path)?;
-                }
-            }
+        if let Some(file_name) = path.file_name()
+            && let Some(version) = file_name.to_string_lossy().strip_prefix(&prefix)
+            && !is_new_version(version)
+            && !is_file_in_use(file_name)
+        {
+            log::info!("removing old remote server binary: {:?}", path);
+            std::fs::remove_file(&path)?;
         }
     }
 
diff --git a/crates/repl/src/kernels/native_kernel.rs b/crates/repl/src/kernels/native_kernel.rs
index aa6a812809..83271fae16 100644
--- a/crates/repl/src/kernels/native_kernel.rs
+++ b/crates/repl/src/kernels/native_kernel.rs
@@ -399,10 +399,10 @@ async fn read_kernels_dir(path: PathBuf, fs: &dyn Fs) -> Result<Vec<LocalKernelS
     while let Some(path) = kernelspec_dirs.next().await {
         match path {
             Ok(path) => {
-                if fs.is_dir(path.as_path()).await {
-                    if let Ok(kernelspec) = read_kernelspec_at(path, fs).await {
-                        valid_kernelspecs.push(kernelspec);
-                    }
+                if fs.is_dir(path.as_path()).await
+                    && let Ok(kernelspec) = read_kernelspec_at(path, fs).await
+                {
+                    valid_kernelspecs.push(kernelspec);
                 }
             }
             Err(err) => log::warn!("Error reading kernelspec directory: {err:?}"),
@@ -429,14 +429,14 @@ pub async fn local_kernel_specifications(fs: Arc<dyn Fs>) -> Result<Vec<LocalKer
         .output()
         .await;
 
-    if let Ok(command) = command {
-        if command.status.success() {
-            let python_prefix = String::from_utf8(command.stdout);
-            if let Ok(python_prefix) = python_prefix {
-                let python_prefix = PathBuf::from(python_prefix.trim());
-                let python_data_dir = python_prefix.join("share").join("jupyter");
-                data_dirs.push(python_data_dir);
-            }
+    if let Ok(command) = command
+        && command.status.success()
+    {
+        let python_prefix = String::from_utf8(command.stdout);
+        if let Ok(python_prefix) = python_prefix {
+            let python_prefix = PathBuf::from(python_prefix.trim());
+            let python_data_dir = python_prefix.join("share").join("jupyter");
+            data_dirs.push(python_data_dir);
         }
     }
 
diff --git a/crates/repl/src/outputs.rs b/crates/repl/src/outputs.rs
index ed252b239f..1508c2b531 100644
--- a/crates/repl/src/outputs.rs
+++ b/crates/repl/src/outputs.rs
@@ -412,10 +412,10 @@ impl ExecutionView {
         };
 
         // Check for a clear output marker as the previous output, so we can clear it out
-        if let Some(output) = self.outputs.last() {
-            if let Output::ClearOutputWaitMarker = output {
-                self.outputs.clear();
-            }
+        if let Some(output) = self.outputs.last()
+            && let Output::ClearOutputWaitMarker = output
+        {
+            self.outputs.clear();
         }
 
         self.outputs.push(output);
@@ -433,11 +433,11 @@ impl ExecutionView {
         let mut any = false;
 
         self.outputs.iter_mut().for_each(|output| {
-            if let Some(other_display_id) = output.display_id().as_ref() {
-                if other_display_id == display_id {
-                    *output = Output::new(data, Some(display_id.to_owned()), window, cx);
-                    any = true;
-                }
+            if let Some(other_display_id) = output.display_id().as_ref()
+                && other_display_id == display_id
+            {
+                *output = Output::new(data, Some(display_id.to_owned()), window, cx);
+                any = true;
             }
         });
 
@@ -452,19 +452,18 @@ impl ExecutionView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<Output> {
-        if let Some(last_output) = self.outputs.last_mut() {
-            if let Output::Stream {
+        if let Some(last_output) = self.outputs.last_mut()
+            && let Output::Stream {
                 content: last_stream,
             } = last_output
-            {
-                // Don't need to add a new output, we already have a terminal output
-                // and can just update the most recent terminal output
-                last_stream.update(cx, |last_stream, cx| {
-                    last_stream.append_text(text, cx);
-                    cx.notify();
-                });
-                return None;
-            }
+        {
+            // Don't need to add a new output, we already have a terminal output
+            // and can just update the most recent terminal output
+            last_stream.update(cx, |last_stream, cx| {
+                last_stream.append_text(text, cx);
+                cx.notify();
+            });
+            return None;
         }
 
         Some(Output::Stream {
diff --git a/crates/repl/src/repl_editor.rs b/crates/repl/src/repl_editor.rs
index 32b59d639d..f5dd659597 100644
--- a/crates/repl/src/repl_editor.rs
+++ b/crates/repl/src/repl_editor.rs
@@ -417,10 +417,10 @@ fn runnable_ranges(
     range: Range<Point>,
     cx: &mut App,
 ) -> (Vec<Range<Point>>, Option<Point>) {
-    if let Some(language) = buffer.language() {
-        if language.name() == "Markdown".into() {
-            return (markdown_code_blocks(buffer, range.clone(), cx), None);
-        }
+    if let Some(language) = buffer.language()
+        && language.name() == "Markdown".into()
+    {
+        return (markdown_code_blocks(buffer, range.clone(), cx), None);
     }
 
     let (jupytext_snippets, next_cursor) = jupytext_cells(buffer, range.clone());
diff --git a/crates/repl/src/repl_sessions_ui.rs b/crates/repl/src/repl_sessions_ui.rs
index 2f4c1f86fc..f57dd64770 100644
--- a/crates/repl/src/repl_sessions_ui.rs
+++ b/crates/repl/src/repl_sessions_ui.rs
@@ -102,21 +102,16 @@ pub fn init(cx: &mut App) {
 
                 let editor_handle = cx.entity().downgrade();
 
-                if let Some(language) = language {
-                    if language.name() == "Python".into() {
-                        if let (Some(project_path), Some(project)) = (project_path, project) {
-                            let store = ReplStore::global(cx);
-                            store.update(cx, |store, cx| {
-                                store
-                                    .refresh_python_kernelspecs(
-                                        project_path.worktree_id,
-                                        &project,
-                                        cx,
-                                    )
-                                    .detach_and_log_err(cx);
-                            });
-                        }
-                    }
+                if let Some(language) = language
+                    && language.name() == "Python".into()
+                    && let (Some(project_path), Some(project)) = (project_path, project)
+                {
+                    let store = ReplStore::global(cx);
+                    store.update(cx, |store, cx| {
+                        store
+                            .refresh_python_kernelspecs(project_path.worktree_id, &project, cx)
+                            .detach_and_log_err(cx);
+                    });
                 }
 
                 editor
diff --git a/crates/repl/src/repl_store.rs b/crates/repl/src/repl_store.rs
index 1a3c9fa49a..b9a36a18ae 100644
--- a/crates/repl/src/repl_store.rs
+++ b/crates/repl/src/repl_store.rs
@@ -171,10 +171,10 @@ impl ReplStore {
                 .map(KernelSpecification::Jupyter)
                 .collect::<Vec<_>>();
 
-            if let Some(remote_task) = remote_kernel_specifications {
-                if let Ok(remote_specs) = remote_task.await {
-                    all_specs.extend(remote_specs);
-                }
+            if let Some(remote_task) = remote_kernel_specifications
+                && let Ok(remote_specs) = remote_task.await
+            {
+                all_specs.extend(remote_specs);
             }
 
             anyhow::Ok(all_specs)
diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index 6461a0ae17..9053f4e452 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -201,12 +201,11 @@ pub fn poll_read_buf(
 }
 
 fn redact_error(mut error: reqwest::Error) -> reqwest::Error {
-    if let Some(url) = error.url_mut() {
-        if let Some(query) = url.query() {
-            if let Cow::Owned(redacted) = REDACT_REGEX.replace_all(query, "key=REDACTED") {
-                url.set_query(Some(redacted.as_str()));
-            }
-        }
+    if let Some(url) = error.url_mut()
+        && let Some(query) = url.query()
+        && let Cow::Owned(redacted) = REDACT_REGEX.replace_all(query, "key=REDACTED")
+    {
+        url.set_query(Some(redacted.as_str()));
     }
     error
 }
diff --git a/crates/rich_text/src/rich_text.rs b/crates/rich_text/src/rich_text.rs
index 575e4318c3..2af9988f03 100644
--- a/crates/rich_text/src/rich_text.rs
+++ b/crates/rich_text/src/rich_text.rs
@@ -162,10 +162,10 @@ impl RichText {
                     }
                 }
                 for range in &custom_tooltip_ranges {
-                    if range.contains(&idx) {
-                        if let Some(f) = &custom_tooltip_fn {
-                            return f(idx, range.clone(), window, cx);
-                        }
+                    if range.contains(&idx)
+                        && let Some(f) = &custom_tooltip_fn
+                    {
+                        return f(idx, range.clone(), window, cx);
                     }
                 }
                 None
@@ -281,13 +281,12 @@ pub fn render_markdown_mut(
 
                     if style != HighlightStyle::default() && last_run_len < text.len() {
                         let mut new_highlight = true;
-                        if let Some((last_range, last_style)) = highlights.last_mut() {
-                            if last_range.end == last_run_len
-                                && last_style == &Highlight::Highlight(style)
-                            {
-                                last_range.end = text.len();
-                                new_highlight = false;
-                            }
+                        if let Some((last_range, last_style)) = highlights.last_mut()
+                            && last_range.end == last_run_len
+                            && last_style == &Highlight::Highlight(style)
+                        {
+                            last_range.end = text.len();
+                            new_highlight = false;
                         }
                         if new_highlight {
                             highlights
diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
index d8ed3bfac8..78ce6f78a2 100644
--- a/crates/rope/src/rope.rs
+++ b/crates/rope/src/rope.rs
@@ -31,22 +31,21 @@ impl Rope {
     }
 
     pub fn append(&mut self, rope: Rope) {
-        if let Some(chunk) = rope.chunks.first() {
-            if self
+        if let Some(chunk) = rope.chunks.first()
+            && (self
                 .chunks
                 .last()
                 .map_or(false, |c| c.text.len() < chunk::MIN_BASE)
-                || chunk.text.len() < chunk::MIN_BASE
-            {
-                self.push_chunk(chunk.as_slice());
+                || chunk.text.len() < chunk::MIN_BASE)
+        {
+            self.push_chunk(chunk.as_slice());
 
-                let mut chunks = rope.chunks.cursor::<()>(&());
-                chunks.next();
-                chunks.next();
-                self.chunks.append(chunks.suffix(), &());
-                self.check_invariants();
-                return;
-            }
+            let mut chunks = rope.chunks.cursor::<()>(&());
+            chunks.next();
+            chunks.next();
+            self.chunks.append(chunks.suffix(), &());
+            self.check_invariants();
+            return;
         }
 
         self.chunks.append(rope.chunks.clone(), &());
@@ -735,16 +734,16 @@ impl<'a> Chunks<'a> {
         self.chunks
             .search_backward(|summary| summary.text.lines.row > 0);
         self.offset = *self.chunks.start();
-        if let Some(chunk) = self.chunks.item() {
-            if let Some(newline_ix) = chunk.text.rfind('\n') {
-                self.offset += newline_ix + 1;
-                if self.offset_is_valid() {
-                    if self.offset == self.chunks.end() {
-                        self.chunks.next();
-                    }
-
-                    return true;
+        if let Some(chunk) = self.chunks.item()
+            && let Some(newline_ix) = chunk.text.rfind('\n')
+        {
+            self.offset += newline_ix + 1;
+            if self.offset_is_valid() {
+                if self.offset == self.chunks.end() {
+                    self.chunks.next();
                 }
+
+                return true;
             }
         }
 
diff --git a/crates/rpc/src/notification.rs b/crates/rpc/src/notification.rs
index cb405b63ca..338ef33c8a 100644
--- a/crates/rpc/src/notification.rs
+++ b/crates/rpc/src/notification.rs
@@ -48,10 +48,10 @@ impl Notification {
         let Some(Value::String(kind)) = value.remove(KIND) else {
             unreachable!("kind is the enum tag")
         };
-        if let map::Entry::Occupied(e) = value.entry(ENTITY_ID) {
-            if e.get().is_u64() {
-                entity_id = e.remove().as_u64();
-            }
+        if let map::Entry::Occupied(e) = value.entry(ENTITY_ID)
+            && e.get().is_u64()
+        {
+            entity_id = e.remove().as_u64();
         }
         proto::Notification {
             kind,
diff --git a/crates/rpc/src/peer.rs b/crates/rpc/src/peer.rs
index 80a104641f..8b77788d22 100644
--- a/crates/rpc/src/peer.rs
+++ b/crates/rpc/src/peer.rs
@@ -520,10 +520,10 @@ impl Peer {
                             &response.payload
                         {
                             // Remove the transmitting end of the response channel to end the stream.
-                            if let Some(channels) = stream_response_channels.upgrade() {
-                                if let Some(channels) = channels.lock().as_mut() {
-                                    channels.remove(&message_id);
-                                }
+                            if let Some(channels) = stream_response_channels.upgrade()
+                                && let Some(channels) = channels.lock().as_mut()
+                            {
+                                channels.remove(&message_id);
                             }
                             None
                         } else {
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
index ebec96dd7b..ec83993e5f 100644
--- a/crates/rules_library/src/rules_library.rs
+++ b/crates/rules_library/src/rules_library.rs
@@ -456,11 +456,11 @@ impl RulesLibrary {
     pub fn new_rule(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         // If we already have an untitled rule, use that instead
         // of creating a new one.
-        if let Some(metadata) = self.store.read(cx).first() {
-            if metadata.title.is_none() {
-                self.load_rule(metadata.id, true, window, cx);
-                return;
-            }
+        if let Some(metadata) = self.store.read(cx).first()
+            && metadata.title.is_none()
+        {
+            self.load_rule(metadata.id, true, window, cx);
+            return;
         }
 
         let prompt_id = PromptId::new();
@@ -706,15 +706,13 @@ impl RulesLibrary {
                     .map_or(true, |old_selected_prompt| {
                         old_selected_prompt.id != prompt_id
                     })
-                {
-                    if let Some(ix) = picker
+                    && let Some(ix) = picker
                         .delegate
                         .matches
                         .iter()
                         .position(|mat| mat.id == prompt_id)
-                    {
-                        picker.set_selected_index(ix, None, true, window, cx);
-                    }
+                {
+                    picker.set_selected_index(ix, None, true, window, cx);
                 }
             } else {
                 picker.focus(window, cx);
@@ -869,10 +867,10 @@ impl RulesLibrary {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(rule_id) = self.active_rule_id {
-            if let Some(rule_editor) = self.rule_editors.get(&rule_id) {
-                window.focus(&rule_editor.body_editor.focus_handle(cx));
-            }
+        if let Some(rule_id) = self.active_rule_id
+            && let Some(rule_editor) = self.rule_editors.get(&rule_id)
+        {
+            window.focus(&rule_editor.body_editor.focus_handle(cx));
         }
     }
 
@@ -882,10 +880,10 @@ impl RulesLibrary {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(rule_id) = self.active_rule_id {
-            if let Some(rule_editor) = self.rule_editors.get(&rule_id) {
-                window.focus(&rule_editor.title_editor.focus_handle(cx));
-            }
+        if let Some(rule_id) = self.active_rule_id
+            && let Some(rule_editor) = self.rule_editors.get(&rule_id)
+        {
+            window.focus(&rule_editor.title_editor.focus_handle(cx));
         }
     }
 
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 189f48e6b6..78e4da7bc6 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -794,15 +794,13 @@ impl BufferSearchBar {
     }
 
     pub fn activate_current_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(match_ix) = self.active_match_index {
-            if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
-                if let Some(matches) = self
-                    .searchable_items_with_matches
-                    .get(&active_searchable_item.downgrade())
-                {
-                    active_searchable_item.activate_match(match_ix, matches, window, cx)
-                }
-            }
+        if let Some(match_ix) = self.active_match_index
+            && let Some(active_searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(matches) = self
+                .searchable_items_with_matches
+                .get(&active_searchable_item.downgrade())
+        {
+            active_searchable_item.activate_match(match_ix, matches, window, cx)
         }
     }
 
@@ -951,16 +949,15 @@ impl BufferSearchBar {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !self.dismissed && self.active_match_index.is_some() {
-            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-                if let Some(matches) = self
-                    .searchable_items_with_matches
-                    .get(&searchable_item.downgrade())
-                {
-                    searchable_item.select_matches(matches, window, cx);
-                    self.focus_editor(&FocusEditor, window, cx);
-                }
-            }
+        if !self.dismissed
+            && self.active_match_index.is_some()
+            && let Some(searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(matches) = self
+                .searchable_items_with_matches
+                .get(&searchable_item.downgrade())
+        {
+            searchable_item.select_matches(matches, window, cx);
+            self.focus_editor(&FocusEditor, window, cx);
         }
     }
 
@@ -971,59 +968,55 @@ impl BufferSearchBar {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(index) = self.active_match_index {
-            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-                if let Some(matches) = self
-                    .searchable_items_with_matches
-                    .get(&searchable_item.downgrade())
-                    .filter(|matches| !matches.is_empty())
-                {
-                    // If 'wrapscan' is disabled, searches do not wrap around the end of the file.
-                    if !EditorSettings::get_global(cx).search_wrap
-                        && ((direction == Direction::Next && index + count >= matches.len())
-                            || (direction == Direction::Prev && index < count))
-                    {
-                        crate::show_no_more_matches(window, cx);
-                        return;
-                    }
-                    let new_match_index = searchable_item
-                        .match_index_for_direction(matches, index, direction, count, window, cx);
-
-                    searchable_item.update_matches(matches, window, cx);
-                    searchable_item.activate_match(new_match_index, matches, window, cx);
-                }
+        if let Some(index) = self.active_match_index
+            && let Some(searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(matches) = self
+                .searchable_items_with_matches
+                .get(&searchable_item.downgrade())
+                .filter(|matches| !matches.is_empty())
+        {
+            // If 'wrapscan' is disabled, searches do not wrap around the end of the file.
+            if !EditorSettings::get_global(cx).search_wrap
+                && ((direction == Direction::Next && index + count >= matches.len())
+                    || (direction == Direction::Prev && index < count))
+            {
+                crate::show_no_more_matches(window, cx);
+                return;
             }
+            let new_match_index = searchable_item
+                .match_index_for_direction(matches, index, direction, count, window, cx);
+
+            searchable_item.update_matches(matches, window, cx);
+            searchable_item.activate_match(new_match_index, matches, window, cx);
         }
     }
 
     pub fn select_first_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-            if let Some(matches) = self
+        if let Some(searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(matches) = self
                 .searchable_items_with_matches
                 .get(&searchable_item.downgrade())
-            {
-                if matches.is_empty() {
-                    return;
-                }
-                searchable_item.update_matches(matches, window, cx);
-                searchable_item.activate_match(0, matches, window, cx);
+        {
+            if matches.is_empty() {
+                return;
             }
+            searchable_item.update_matches(matches, window, cx);
+            searchable_item.activate_match(0, matches, window, cx);
         }
     }
 
     pub fn select_last_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-            if let Some(matches) = self
+        if let Some(searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(matches) = self
                 .searchable_items_with_matches
                 .get(&searchable_item.downgrade())
-            {
-                if matches.is_empty() {
-                    return;
-                }
-                let new_match_index = matches.len() - 1;
-                searchable_item.update_matches(matches, window, cx);
-                searchable_item.activate_match(new_match_index, matches, window, cx);
+        {
+            if matches.is_empty() {
+                return;
             }
+            let new_match_index = matches.len() - 1;
+            searchable_item.update_matches(matches, window, cx);
+            searchable_item.activate_match(new_match_index, matches, window, cx);
         }
     }
 
@@ -1344,15 +1337,14 @@ impl BufferSearchBar {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.query(cx).is_empty() {
-            if let Some(new_query) = self
+        if self.query(cx).is_empty()
+            && let Some(new_query) = self
                 .search_history
                 .current(&mut self.search_history_cursor)
                 .map(str::to_string)
-            {
-                drop(self.search(&new_query, Some(self.search_options), window, cx));
-                return;
-            }
+        {
+            drop(self.search(&new_query, Some(self.search_options), window, cx));
+            return;
         }
 
         if let Some(new_query) = self
@@ -1384,25 +1376,23 @@ impl BufferSearchBar {
 
     fn replace_next(&mut self, _: &ReplaceNext, window: &mut Window, cx: &mut Context<Self>) {
         let mut should_propagate = true;
-        if !self.dismissed && self.active_search.is_some() {
-            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-                if let Some(query) = self.active_search.as_ref() {
-                    if let Some(matches) = self
-                        .searchable_items_with_matches
-                        .get(&searchable_item.downgrade())
-                    {
-                        if let Some(active_index) = self.active_match_index {
-                            let query = query
-                                .as_ref()
-                                .clone()
-                                .with_replacement(self.replacement(cx));
-                            searchable_item.replace(matches.at(active_index), &query, window, cx);
-                            self.select_next_match(&SelectNextMatch, window, cx);
-                        }
-                        should_propagate = false;
-                    }
-                }
+        if !self.dismissed
+            && self.active_search.is_some()
+            && let Some(searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(query) = self.active_search.as_ref()
+            && let Some(matches) = self
+                .searchable_items_with_matches
+                .get(&searchable_item.downgrade())
+        {
+            if let Some(active_index) = self.active_match_index {
+                let query = query
+                    .as_ref()
+                    .clone()
+                    .with_replacement(self.replacement(cx));
+                searchable_item.replace(matches.at(active_index), &query, window, cx);
+                self.select_next_match(&SelectNextMatch, window, cx);
             }
+            should_propagate = false;
         }
         if !should_propagate {
             cx.stop_propagation();
@@ -1410,21 +1400,19 @@ impl BufferSearchBar {
     }
 
     pub fn replace_all(&mut self, _: &ReplaceAll, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.dismissed && self.active_search.is_some() {
-            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-                if let Some(query) = self.active_search.as_ref() {
-                    if let Some(matches) = self
-                        .searchable_items_with_matches
-                        .get(&searchable_item.downgrade())
-                    {
-                        let query = query
-                            .as_ref()
-                            .clone()
-                            .with_replacement(self.replacement(cx));
-                        searchable_item.replace_all(&mut matches.iter(), &query, window, cx);
-                    }
-                }
-            }
+        if !self.dismissed
+            && self.active_search.is_some()
+            && let Some(searchable_item) = self.active_searchable_item.as_ref()
+            && let Some(query) = self.active_search.as_ref()
+            && let Some(matches) = self
+                .searchable_items_with_matches
+                .get(&searchable_item.downgrade())
+        {
+            let query = query
+                .as_ref()
+                .clone()
+                .with_replacement(self.replacement(cx));
+            searchable_item.replace_all(&mut matches.iter(), &query, window, cx);
         }
     }
 
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 443bbb0427..51cb1fdb26 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -775,15 +775,15 @@ impl ProjectSearchView {
         // Subscribe to query_editor in order to reraise editor events for workspace item activation purposes
         subscriptions.push(
             cx.subscribe(&query_editor, |this, _, event: &EditorEvent, cx| {
-                if let EditorEvent::Edited { .. } = event {
-                    if EditorSettings::get_global(cx).use_smartcase_search {
-                        let query = this.search_query_text(cx);
-                        if !query.is_empty()
-                            && this.search_options.contains(SearchOptions::CASE_SENSITIVE)
-                                != contains_uppercase(&query)
-                        {
-                            this.toggle_search_option(SearchOptions::CASE_SENSITIVE, cx);
-                        }
+                if let EditorEvent::Edited { .. } = event
+                    && EditorSettings::get_global(cx).use_smartcase_search
+                {
+                    let query = this.search_query_text(cx);
+                    if !query.is_empty()
+                        && this.search_options.contains(SearchOptions::CASE_SENSITIVE)
+                            != contains_uppercase(&query)
+                    {
+                        this.toggle_search_option(SearchOptions::CASE_SENSITIVE, cx);
                     }
                 }
                 cx.emit(ViewEvent::EditorEvent(event.clone()))
@@ -947,14 +947,14 @@ impl ProjectSearchView {
         {
             let new_query = search_view.update(cx, |search_view, cx| {
                 let new_query = search_view.build_search_query(cx);
-                if new_query.is_some() {
-                    if let Some(old_query) = search_view.entity.read(cx).active_query.clone() {
-                        search_view.query_editor.update(cx, |editor, cx| {
-                            editor.set_text(old_query.as_str(), window, cx);
-                        });
-                        search_view.search_options = SearchOptions::from_query(&old_query);
-                        search_view.adjust_query_regex_language(cx);
-                    }
+                if new_query.is_some()
+                    && let Some(old_query) = search_view.entity.read(cx).active_query.clone()
+                {
+                    search_view.query_editor.update(cx, |editor, cx| {
+                        editor.set_text(old_query.as_str(), window, cx);
+                    });
+                    search_view.search_options = SearchOptions::from_query(&old_query);
+                    search_view.adjust_query_regex_language(cx);
                 }
                 new_query
             });
@@ -1844,8 +1844,8 @@ impl ProjectSearchBar {
                     ),
                 ] {
                     if editor.focus_handle(cx).is_focused(window) {
-                        if editor.read(cx).text(cx).is_empty() {
-                            if let Some(new_query) = search_view
+                        if editor.read(cx).text(cx).is_empty()
+                            && let Some(new_query) = search_view
                                 .entity
                                 .read(cx)
                                 .project
@@ -1853,10 +1853,9 @@ impl ProjectSearchBar {
                                 .search_history(kind)
                                 .current(search_view.entity.read(cx).cursor(kind))
                                 .map(str::to_string)
-                            {
-                                search_view.set_search_editor(kind, &new_query, window, cx);
-                                return;
-                            }
+                        {
+                            search_view.set_search_editor(kind, &new_query, window, cx);
+                            return;
                         }
 
                         if let Some(new_query) = search_view.entity.update(cx, |model, cx| {
diff --git a/crates/semantic_index/src/embedding_index.rs b/crates/semantic_index/src/embedding_index.rs
index d2d10ad0ad..eeb3c91fcd 100644
--- a/crates/semantic_index/src/embedding_index.rs
+++ b/crates/semantic_index/src/embedding_index.rs
@@ -194,11 +194,11 @@ impl EmbeddingIndex {
                     project::PathChange::Added
                     | project::PathChange::Updated
                     | project::PathChange::AddedOrUpdated => {
-                        if let Some(entry) = worktree.entry_for_id(*entry_id) {
-                            if entry.is_file() {
-                                let handle = entries_being_indexed.insert(entry.id);
-                                updated_entries_tx.send((entry.clone(), handle)).await?;
-                            }
+                        if let Some(entry) = worktree.entry_for_id(*entry_id)
+                            && entry.is_file()
+                        {
+                            let handle = entries_being_indexed.insert(entry.id);
+                            updated_entries_tx.send((entry.clone(), handle)).await?;
                         }
                     }
                     project::PathChange::Removed => {
diff --git a/crates/semantic_index/src/project_index.rs b/crates/semantic_index/src/project_index.rs
index 5e852327dd..60b2770dd3 100644
--- a/crates/semantic_index/src/project_index.rs
+++ b/crates/semantic_index/src/project_index.rs
@@ -384,10 +384,10 @@ impl ProjectIndex {
         cx: &App,
     ) -> Option<Entity<WorktreeIndex>> {
         for index in self.worktree_indices.values() {
-            if let WorktreeIndexHandle::Loaded { index, .. } = index {
-                if index.read(cx).worktree().read(cx).id() == worktree_id {
-                    return Some(index.clone());
-                }
+            if let WorktreeIndexHandle::Loaded { index, .. } = index
+                && index.read(cx).worktree().read(cx).id() == worktree_id
+            {
+                return Some(index.clone());
             }
         }
         None
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index a9cc08382b..1dafeb072f 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -174,14 +174,13 @@ impl SemanticDb {
                 file_content[start_line_byte_offset..end_line_byte_offset].to_string();
             LineEnding::normalize(&mut excerpt_content);
 
-            if let Some(prev_result) = loaded_results.last_mut() {
-                if prev_result.full_path == full_path {
-                    if *prev_result.row_range.end() + 1 == start_row {
-                        prev_result.row_range = *prev_result.row_range.start()..=end_row;
-                        prev_result.excerpt_content.push_str(&excerpt_content);
-                        continue;
-                    }
-                }
+            if let Some(prev_result) = loaded_results.last_mut()
+                && prev_result.full_path == full_path
+                && *prev_result.row_range.end() + 1 == start_row
+            {
+                prev_result.row_range = *prev_result.row_range.start()..=end_row;
+                prev_result.excerpt_content.push_str(&excerpt_content);
+                continue;
             }
 
             loaded_results.push(LoadedSearchResult {
diff --git a/crates/semantic_index/src/summary_index.rs b/crates/semantic_index/src/summary_index.rs
index 20858c8d3f..d1c9a3abac 100644
--- a/crates/semantic_index/src/summary_index.rs
+++ b/crates/semantic_index/src/summary_index.rs
@@ -379,18 +379,14 @@ impl SummaryIndex {
                     | project::PathChange::Added
                     | project::PathChange::Updated
                     | project::PathChange::AddedOrUpdated => {
-                        if let Some(entry) = worktree.entry_for_id(*entry_id) {
-                            if entry.is_file() {
-                                let needs_summary = Self::add_to_backlog(
-                                    Arc::clone(&backlog),
-                                    digest_db,
-                                    &txn,
-                                    entry,
-                                );
+                        if let Some(entry) = worktree.entry_for_id(*entry_id)
+                            && entry.is_file()
+                        {
+                            let needs_summary =
+                                Self::add_to_backlog(Arc::clone(&backlog), digest_db, &txn, entry);
 
-                                if !needs_summary.is_empty() {
-                                    tx.send(needs_summary).await?;
-                                }
+                            if !needs_summary.is_empty() {
+                                tx.send(needs_summary).await?;
                             }
                         }
                     }
diff --git a/crates/session/src/session.rs b/crates/session/src/session.rs
index f027df8762..438059fef7 100644
--- a/crates/session/src/session.rs
+++ b/crates/session/src/session.rs
@@ -70,11 +70,11 @@ impl AppSession {
         let _serialization_task = cx.spawn(async move |_, cx| {
             let mut current_window_stack = Vec::new();
             loop {
-                if let Some(windows) = cx.update(|cx| window_stack(cx)).ok().flatten() {
-                    if windows != current_window_stack {
-                        store_window_stack(&windows).await;
-                        current_window_stack = windows;
-                    }
+                if let Some(windows) = cx.update(|cx| window_stack(cx)).ok().flatten()
+                    && windows != current_window_stack
+                {
+                    store_window_stack(&windows).await;
+                    current_window_stack = windows;
                 }
 
                 cx.background_executor()
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index b0f7d2449e..e95617512d 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -543,27 +543,27 @@ impl KeymapFile {
             //
             // When a struct with no deserializable fields is added by deriving `Action`, an empty
             // object schema is produced. The action should be invoked without data in this case.
-            if let Some(schema) = action_schema {
-                if schema != empty_object {
-                    let mut matches_action_name = json_schema!({
-                        "const": name
-                    });
-                    if let Some(desc) = description.clone() {
-                        add_description(&mut matches_action_name, desc);
-                    }
-                    if let Some(message) = deprecation_messages.get(name) {
-                        add_deprecation(&mut matches_action_name, message.to_string());
-                    } else if let Some(new_name) = deprecation {
-                        add_deprecation_preferred_name(&mut matches_action_name, new_name);
-                    }
-                    let action_with_input = json_schema!({
-                        "type": "array",
-                        "items": [matches_action_name, schema],
-                        "minItems": 2,
-                        "maxItems": 2
-                    });
-                    keymap_action_alternatives.push(action_with_input);
+            if let Some(schema) = action_schema
+                && schema != empty_object
+            {
+                let mut matches_action_name = json_schema!({
+                    "const": name
+                });
+                if let Some(desc) = description.clone() {
+                    add_description(&mut matches_action_name, desc);
                 }
+                if let Some(message) = deprecation_messages.get(name) {
+                    add_deprecation(&mut matches_action_name, message.to_string());
+                } else if let Some(new_name) = deprecation {
+                    add_deprecation_preferred_name(&mut matches_action_name, new_name);
+                }
+                let action_with_input = json_schema!({
+                    "type": "array",
+                    "items": [matches_action_name, schema],
+                    "minItems": 2,
+                    "maxItems": 2
+                });
+                keymap_action_alternatives.push(action_with_input);
             }
         }
 
@@ -593,10 +593,10 @@ impl KeymapFile {
         match fs.load(paths::keymap_file()).await {
             result @ Ok(_) => result,
             Err(err) => {
-                if let Some(e) = err.downcast_ref::<std::io::Error>() {
-                    if e.kind() == std::io::ErrorKind::NotFound {
-                        return Ok(crate::initial_keymap_content().to_string());
-                    }
+                if let Some(e) = err.downcast_ref::<std::io::Error>()
+                    && e.kind() == std::io::ErrorKind::NotFound
+                {
+                    return Ok(crate::initial_keymap_content().to_string());
                 }
                 Err(err)
             }
diff --git a/crates/settings/src/settings_file.rs b/crates/settings/src/settings_file.rs
index c43f3e79e8..d31dd82da4 100644
--- a/crates/settings/src/settings_file.rs
+++ b/crates/settings/src/settings_file.rs
@@ -67,10 +67,10 @@ pub fn watch_config_file(
                     break;
                 }
 
-                if let Ok(contents) = fs.load(&path).await {
-                    if tx.unbounded_send(contents).is_err() {
-                        break;
-                    }
+                if let Ok(contents) = fs.load(&path).await
+                    && tx.unbounded_send(contents).is_err()
+                {
+                    break;
                 }
             }
         })
@@ -88,12 +88,11 @@ pub fn watch_config_dir(
     executor
         .spawn(async move {
             for file_path in &config_paths {
-                if fs.metadata(file_path).await.is_ok_and(|v| v.is_some()) {
-                    if let Ok(contents) = fs.load(file_path).await {
-                        if tx.unbounded_send(contents).is_err() {
-                            return;
-                        }
-                    }
+                if fs.metadata(file_path).await.is_ok_and(|v| v.is_some())
+                    && let Ok(contents) = fs.load(file_path).await
+                    && tx.unbounded_send(contents).is_err()
+                {
+                    return;
                 }
             }
 
@@ -110,10 +109,10 @@ pub fn watch_config_dir(
                                 }
                             }
                             Some(PathEventKind::Created) | Some(PathEventKind::Changed) => {
-                                if let Ok(contents) = fs.load(&event.path).await {
-                                    if tx.unbounded_send(contents).is_err() {
-                                        return;
-                                    }
+                                if let Ok(contents) = fs.load(&event.path).await
+                                    && tx.unbounded_send(contents).is_err()
+                                {
+                                    return;
                                 }
                             }
                             _ => {}
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index e6683857e7..8e7e11dc82 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -369,13 +369,12 @@ pub fn replace_top_level_array_value_in_json_text(
             if cursor.node().kind() == "," {
                 remove_range.end = cursor.node().range().end_byte;
             }
-            if let Some(next_newline) = &text[remove_range.end + 1..].find('\n') {
-                if text[remove_range.end + 1..remove_range.end + next_newline]
+            if let Some(next_newline) = &text[remove_range.end + 1..].find('\n')
+                && text[remove_range.end + 1..remove_range.end + next_newline]
                     .chars()
                     .all(|c| c.is_ascii_whitespace())
-                {
-                    remove_range.end = remove_range.end + next_newline;
-                }
+            {
+                remove_range.end = remove_range.end + next_newline;
             }
         } else {
             while cursor.goto_previous_sibling()
@@ -508,10 +507,10 @@ pub fn append_top_level_array_value_in_json_text(
             replace_value.insert(0, ',');
         }
     } else {
-        if let Some(prev_newline) = text[..replace_range.start].rfind('\n') {
-            if text[prev_newline..replace_range.start].trim().is_empty() {
-                replace_range.start = prev_newline;
-            }
+        if let Some(prev_newline) = text[..replace_range.start].rfind('\n')
+            && text[prev_newline..replace_range.start].trim().is_empty()
+        {
+            replace_range.start = prev_newline;
         }
         let indent = format!("\n{space:width$}", width = tab_size);
         replace_value = replace_value.replace('\n', &indent);
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index bfdafbffe8..23f495d850 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -346,14 +346,13 @@ impl SettingsStore {
             }
 
             let mut profile_value = None;
-            if let Some(active_profile) = cx.try_global::<ActiveSettingsProfileName>() {
-                if let Some(profiles) = self.raw_user_settings.get("profiles") {
-                    if let Some(profile_settings) = profiles.get(&active_profile.0) {
-                        profile_value = setting_value
-                            .deserialize_setting(profile_settings)
-                            .log_err();
-                    }
-                }
+            if let Some(active_profile) = cx.try_global::<ActiveSettingsProfileName>()
+                && let Some(profiles) = self.raw_user_settings.get("profiles")
+                && let Some(profile_settings) = profiles.get(&active_profile.0)
+            {
+                profile_value = setting_value
+                    .deserialize_setting(profile_settings)
+                    .log_err();
             }
 
             let server_value = self
@@ -482,10 +481,10 @@ impl SettingsStore {
         match fs.load(paths::settings_file()).await {
             result @ Ok(_) => result,
             Err(err) => {
-                if let Some(e) = err.downcast_ref::<std::io::Error>() {
-                    if e.kind() == std::io::ErrorKind::NotFound {
-                        return Ok(crate::initial_user_settings_content().to_string());
-                    }
+                if let Some(e) = err.downcast_ref::<std::io::Error>()
+                    && e.kind() == std::io::ErrorKind::NotFound
+                {
+                    return Ok(crate::initial_user_settings_content().to_string());
                 }
                 Err(err)
             }
@@ -496,10 +495,10 @@ impl SettingsStore {
         match fs.load(paths::global_settings_file()).await {
             result @ Ok(_) => result,
             Err(err) => {
-                if let Some(e) = err.downcast_ref::<std::io::Error>() {
-                    if e.kind() == std::io::ErrorKind::NotFound {
-                        return Ok("{}".to_string());
-                    }
+                if let Some(e) = err.downcast_ref::<std::io::Error>()
+                    && e.kind() == std::io::ErrorKind::NotFound
+                {
+                    return Ok("{}".to_string());
                 }
                 Err(err)
             }
@@ -955,13 +954,13 @@ impl SettingsStore {
             let mut setting_schema = setting_value.json_schema(&mut generator);
 
             if let Some(key) = setting_value.key() {
-                if let Some(properties) = combined_schema.get_mut("properties") {
-                    if let Some(properties_obj) = properties.as_object_mut() {
-                        if let Some(target) = properties_obj.get_mut(key) {
-                            merge_schema(target, setting_schema.to_value());
-                        } else {
-                            properties_obj.insert(key.to_string(), setting_schema.to_value());
-                        }
+                if let Some(properties) = combined_schema.get_mut("properties")
+                    && let Some(properties_obj) = properties.as_object_mut()
+                {
+                    if let Some(target) = properties_obj.get_mut(key) {
+                        merge_schema(target, setting_schema.to_value());
+                    } else {
+                        properties_obj.insert(key.to_string(), setting_schema.to_value());
                     }
                 }
             } else {
@@ -1038,16 +1037,15 @@ impl SettingsStore {
                     | "additionalProperties" => {
                         if let Some(old_value) =
                             target_obj.insert(source_key.clone(), source_value.clone())
+                            && old_value != source_value
                         {
-                            if old_value != source_value {
-                                log::error!(
-                                    "bug: while merging JSON schemas, \
+                            log::error!(
+                                "bug: while merging JSON schemas, \
                                     mismatch `\"{}\": {}` (before was `{}`)",
-                                    source_key,
-                                    old_value,
-                                    source_value
-                                );
-                            }
+                                source_key,
+                                old_value,
+                                source_value
+                            );
                         }
                     }
                     _ => {
@@ -1168,35 +1166,31 @@ impl SettingsStore {
             if let Some(release_settings) = &self
                 .raw_user_settings
                 .get(release_channel::RELEASE_CHANNEL.dev_name())
-            {
-                if let Some(release_settings) = setting_value
+                && let Some(release_settings) = setting_value
                     .deserialize_setting(release_settings)
                     .log_err()
-                {
-                    release_channel_settings = Some(release_settings);
-                }
+            {
+                release_channel_settings = Some(release_settings);
             }
 
             let mut os_settings = None;
-            if let Some(settings) = &self.raw_user_settings.get(env::consts::OS) {
-                if let Some(settings) = setting_value.deserialize_setting(settings).log_err() {
-                    os_settings = Some(settings);
-                }
+            if let Some(settings) = &self.raw_user_settings.get(env::consts::OS)
+                && let Some(settings) = setting_value.deserialize_setting(settings).log_err()
+            {
+                os_settings = Some(settings);
             }
 
             let mut profile_settings = None;
-            if let Some(active_profile) = cx.try_global::<ActiveSettingsProfileName>() {
-                if let Some(profiles) = self.raw_user_settings.get("profiles") {
-                    if let Some(profile_json) = profiles.get(&active_profile.0) {
-                        profile_settings =
-                            setting_value.deserialize_setting(profile_json).log_err();
-                    }
-                }
+            if let Some(active_profile) = cx.try_global::<ActiveSettingsProfileName>()
+                && let Some(profiles) = self.raw_user_settings.get("profiles")
+                && let Some(profile_json) = profiles.get(&active_profile.0)
+            {
+                profile_settings = setting_value.deserialize_setting(profile_json).log_err();
             }
 
             // If the global settings file changed, reload the global value for the field.
-            if changed_local_path.is_none() {
-                if let Some(value) = setting_value
+            if changed_local_path.is_none()
+                && let Some(value) = setting_value
                     .load_setting(
                         SettingsSources {
                             default: &default_settings,
@@ -1212,9 +1206,8 @@ impl SettingsStore {
                         cx,
                     )
                     .log_err()
-                {
-                    setting_value.set_global_value(value);
-                }
+            {
+                setting_value.set_global_value(value);
             }
 
             // Reload the local values for the setting.
@@ -1223,12 +1216,12 @@ impl SettingsStore {
             for ((root_id, directory_path), local_settings) in &self.raw_local_settings {
                 // Build a stack of all of the local values for that setting.
                 while let Some(prev_entry) = paths_stack.last() {
-                    if let Some((prev_root_id, prev_path)) = prev_entry {
-                        if root_id != prev_root_id || !directory_path.starts_with(prev_path) {
-                            paths_stack.pop();
-                            project_settings_stack.pop();
-                            continue;
-                        }
+                    if let Some((prev_root_id, prev_path)) = prev_entry
+                        && (root_id != prev_root_id || !directory_path.starts_with(prev_path))
+                    {
+                        paths_stack.pop();
+                        project_settings_stack.pop();
+                        continue;
                     }
                     break;
                 }
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
index bf0ef63bff..db76ab6f9a 100644
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ b/crates/snippets_ui/src/snippets_ui.rs
@@ -163,13 +163,12 @@ impl ScopeSelectorDelegate {
             for entry in read_dir {
                 if let Some(entry) = entry.log_err() {
                     let path = entry.path();
-                    if let (Some(stem), Some(extension)) = (path.file_stem(), path.extension()) {
-                        if extension.to_os_string().to_str() == Some("json") {
-                            if let Ok(file_name) = stem.to_os_string().into_string() {
-                                existing_scopes
-                                    .insert(ScopeName::from(ScopeFileName(Cow::Owned(file_name))));
-                            }
-                        }
+                    if let (Some(stem), Some(extension)) = (path.file_stem(), path.extension())
+                        && extension.to_os_string().to_str() == Some("json")
+                        && let Ok(file_name) = stem.to_os_string().into_string()
+                    {
+                        existing_scopes
+                            .insert(ScopeName::from(ScopeFileName(Cow::Owned(file_name))));
                     }
                 }
             }
diff --git a/crates/sqlez/src/connection.rs b/crates/sqlez/src/connection.rs
index f56ae2427d..228bd4c6a2 100644
--- a/crates/sqlez/src/connection.rs
+++ b/crates/sqlez/src/connection.rs
@@ -213,38 +213,37 @@ impl Connection {
 
 fn parse_alter_table(remaining_sql_str: &str) -> Option<(String, String)> {
     let remaining_sql_str = remaining_sql_str.to_lowercase();
-    if remaining_sql_str.starts_with("alter") {
-        if let Some(table_offset) = remaining_sql_str.find("table") {
-            let after_table_offset = table_offset + "table".len();
-            let table_to_alter = remaining_sql_str
-                .chars()
-                .skip(after_table_offset)
-                .skip_while(|c| c.is_whitespace())
-                .take_while(|c| !c.is_whitespace())
-                .collect::<String>();
-            if !table_to_alter.is_empty() {
-                let column_name =
-                    if let Some(rename_offset) = remaining_sql_str.find("rename column") {
-                        let after_rename_offset = rename_offset + "rename column".len();
-                        remaining_sql_str
-                            .chars()
-                            .skip(after_rename_offset)
-                            .skip_while(|c| c.is_whitespace())
-                            .take_while(|c| !c.is_whitespace())
-                            .collect::<String>()
-                    } else if let Some(drop_offset) = remaining_sql_str.find("drop column") {
-                        let after_drop_offset = drop_offset + "drop column".len();
-                        remaining_sql_str
-                            .chars()
-                            .skip(after_drop_offset)
-                            .skip_while(|c| c.is_whitespace())
-                            .take_while(|c| !c.is_whitespace())
-                            .collect::<String>()
-                    } else {
-                        "__place_holder_column_for_syntax_checking".to_string()
-                    };
-                return Some((table_to_alter, column_name));
-            }
+    if remaining_sql_str.starts_with("alter")
+        && let Some(table_offset) = remaining_sql_str.find("table")
+    {
+        let after_table_offset = table_offset + "table".len();
+        let table_to_alter = remaining_sql_str
+            .chars()
+            .skip(after_table_offset)
+            .skip_while(|c| c.is_whitespace())
+            .take_while(|c| !c.is_whitespace())
+            .collect::<String>();
+        if !table_to_alter.is_empty() {
+            let column_name = if let Some(rename_offset) = remaining_sql_str.find("rename column") {
+                let after_rename_offset = rename_offset + "rename column".len();
+                remaining_sql_str
+                    .chars()
+                    .skip(after_rename_offset)
+                    .skip_while(|c| c.is_whitespace())
+                    .take_while(|c| !c.is_whitespace())
+                    .collect::<String>()
+            } else if let Some(drop_offset) = remaining_sql_str.find("drop column") {
+                let after_drop_offset = drop_offset + "drop column".len();
+                remaining_sql_str
+                    .chars()
+                    .skip(after_drop_offset)
+                    .skip_while(|c| c.is_whitespace())
+                    .take_while(|c| !c.is_whitespace())
+                    .collect::<String>()
+            } else {
+                "__place_holder_column_for_syntax_checking".to_string()
+            };
+            return Some((table_to_alter, column_name));
         }
     }
     None
diff --git a/crates/sum_tree/src/cursor.rs b/crates/sum_tree/src/cursor.rs
index 50a556a6d2..53458b65ec 100644
--- a/crates/sum_tree/src/cursor.rs
+++ b/crates/sum_tree/src/cursor.rs
@@ -530,10 +530,10 @@ where
         debug_assert!(self.stack.is_empty() || self.stack.last().unwrap().tree.0.is_leaf());
 
         let mut end = self.position.clone();
-        if bias == Bias::Left {
-            if let Some(summary) = self.item_summary() {
-                end.add_summary(summary, self.cx);
-            }
+        if bias == Bias::Left
+            && let Some(summary) = self.item_summary()
+        {
+            end.add_summary(summary, self.cx);
         }
 
         target.cmp(&end, self.cx) == Ordering::Equal
diff --git a/crates/sum_tree/src/sum_tree.rs b/crates/sum_tree/src/sum_tree.rs
index 3a12e3a681..f551bb32e6 100644
--- a/crates/sum_tree/src/sum_tree.rs
+++ b/crates/sum_tree/src/sum_tree.rs
@@ -674,11 +674,11 @@ impl<T: KeyedItem> SumTree<T> {
         *self = {
             let mut cursor = self.cursor::<T::Key>(cx);
             let mut new_tree = cursor.slice(&item.key(), Bias::Left);
-            if let Some(cursor_item) = cursor.item() {
-                if cursor_item.key() == item.key() {
-                    replaced = Some(cursor_item.clone());
-                    cursor.next();
-                }
+            if let Some(cursor_item) = cursor.item()
+                && cursor_item.key() == item.key()
+            {
+                replaced = Some(cursor_item.clone());
+                cursor.next();
             }
             new_tree.push(item, cx);
             new_tree.append(cursor.suffix(), cx);
@@ -692,11 +692,11 @@ impl<T: KeyedItem> SumTree<T> {
         *self = {
             let mut cursor = self.cursor::<T::Key>(cx);
             let mut new_tree = cursor.slice(key, Bias::Left);
-            if let Some(item) = cursor.item() {
-                if item.key() == *key {
-                    removed = Some(item.clone());
-                    cursor.next();
-                }
+            if let Some(item) = cursor.item()
+                && item.key() == *key
+            {
+                removed = Some(item.clone());
+                cursor.next();
             }
             new_tree.append(cursor.suffix(), cx);
             new_tree
@@ -736,11 +736,11 @@ impl<T: KeyedItem> SumTree<T> {
                     old_item = cursor.item();
                 }
 
-                if let Some(old_item) = old_item {
-                    if old_item.key() == new_key {
-                        removed.push(old_item.clone());
-                        cursor.next();
-                    }
+                if let Some(old_item) = old_item
+                    && old_item.key() == new_key
+                {
+                    removed.push(old_item.clone());
+                    cursor.next();
                 }
 
                 match edit {
diff --git a/crates/svg_preview/src/svg_preview_view.rs b/crates/svg_preview/src/svg_preview_view.rs
index 327856d749..4e4c83c8de 100644
--- a/crates/svg_preview/src/svg_preview_view.rs
+++ b/crates/svg_preview/src/svg_preview_view.rs
@@ -32,79 +32,74 @@ pub enum SvgPreviewMode {
 impl SvgPreviewView {
     pub fn register(workspace: &mut Workspace, _window: &mut Window, _cx: &mut Context<Workspace>) {
         workspace.register_action(move |workspace, _: &OpenPreview, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_svg_editor(workspace, cx) {
-                if Self::is_svg_file(&editor, cx) {
-                    let view = Self::create_svg_view(
-                        SvgPreviewMode::Default,
-                        workspace,
-                        editor.clone(),
-                        window,
-                        cx,
-                    );
-                    workspace.active_pane().update(cx, |pane, cx| {
-                        if let Some(existing_view_idx) =
-                            Self::find_existing_preview_item_idx(pane, &editor, cx)
-                        {
-                            pane.activate_item(existing_view_idx, true, true, window, cx);
-                        } else {
-                            pane.add_item(Box::new(view), true, true, None, window, cx)
-                        }
-                    });
-                    cx.notify();
-                }
+            if let Some(editor) = Self::resolve_active_item_as_svg_editor(workspace, cx)
+                && Self::is_svg_file(&editor, cx)
+            {
+                let view = Self::create_svg_view(
+                    SvgPreviewMode::Default,
+                    workspace,
+                    editor.clone(),
+                    window,
+                    cx,
+                );
+                workspace.active_pane().update(cx, |pane, cx| {
+                    if let Some(existing_view_idx) =
+                        Self::find_existing_preview_item_idx(pane, &editor, cx)
+                    {
+                        pane.activate_item(existing_view_idx, true, true, window, cx);
+                    } else {
+                        pane.add_item(Box::new(view), true, true, None, window, cx)
+                    }
+                });
+                cx.notify();
             }
         });
 
         workspace.register_action(move |workspace, _: &OpenPreviewToTheSide, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_svg_editor(workspace, cx) {
-                if Self::is_svg_file(&editor, cx) {
-                    let editor_clone = editor.clone();
-                    let view = Self::create_svg_view(
-                        SvgPreviewMode::Default,
-                        workspace,
-                        editor_clone,
-                        window,
-                        cx,
-                    );
-                    let pane = workspace
-                        .find_pane_in_direction(workspace::SplitDirection::Right, cx)
-                        .unwrap_or_else(|| {
-                            workspace.split_pane(
-                                workspace.active_pane().clone(),
-                                workspace::SplitDirection::Right,
-                                window,
-                                cx,
-                            )
-                        });
-                    pane.update(cx, |pane, cx| {
-                        if let Some(existing_view_idx) =
-                            Self::find_existing_preview_item_idx(pane, &editor, cx)
-                        {
-                            pane.activate_item(existing_view_idx, true, true, window, cx);
-                        } else {
-                            pane.add_item(Box::new(view), false, false, None, window, cx)
-                        }
+            if let Some(editor) = Self::resolve_active_item_as_svg_editor(workspace, cx)
+                && Self::is_svg_file(&editor, cx)
+            {
+                let editor_clone = editor.clone();
+                let view = Self::create_svg_view(
+                    SvgPreviewMode::Default,
+                    workspace,
+                    editor_clone,
+                    window,
+                    cx,
+                );
+                let pane = workspace
+                    .find_pane_in_direction(workspace::SplitDirection::Right, cx)
+                    .unwrap_or_else(|| {
+                        workspace.split_pane(
+                            workspace.active_pane().clone(),
+                            workspace::SplitDirection::Right,
+                            window,
+                            cx,
+                        )
                     });
-                    cx.notify();
-                }
+                pane.update(cx, |pane, cx| {
+                    if let Some(existing_view_idx) =
+                        Self::find_existing_preview_item_idx(pane, &editor, cx)
+                    {
+                        pane.activate_item(existing_view_idx, true, true, window, cx);
+                    } else {
+                        pane.add_item(Box::new(view), false, false, None, window, cx)
+                    }
+                });
+                cx.notify();
             }
         });
 
         workspace.register_action(move |workspace, _: &OpenFollowingPreview, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_svg_editor(workspace, cx) {
-                if Self::is_svg_file(&editor, cx) {
-                    let view = Self::create_svg_view(
-                        SvgPreviewMode::Follow,
-                        workspace,
-                        editor,
-                        window,
-                        cx,
-                    );
-                    workspace.active_pane().update(cx, |pane, cx| {
-                        pane.add_item(Box::new(view), true, true, None, window, cx)
-                    });
-                    cx.notify();
-                }
+            if let Some(editor) = Self::resolve_active_item_as_svg_editor(workspace, cx)
+                && Self::is_svg_file(&editor, cx)
+            {
+                let view =
+                    Self::create_svg_view(SvgPreviewMode::Follow, workspace, editor, window, cx);
+                workspace.active_pane().update(cx, |pane, cx| {
+                    pane.add_item(Box::new(view), true, true, None, window, cx)
+                });
+                cx.notify();
             }
         });
     }
@@ -192,18 +187,15 @@ impl SvgPreviewView {
                             match event {
                                 workspace::Event::ActiveItemChanged => {
                                     let workspace_read = workspace.read(cx);
-                                    if let Some(active_item) = workspace_read.active_item(cx) {
-                                        if let Some(editor_entity) =
+                                    if let Some(active_item) = workspace_read.active_item(cx)
+                                        && let Some(editor_entity) =
                                             active_item.downcast::<Editor>()
-                                        {
-                                            if Self::is_svg_file(&editor_entity, cx) {
-                                                let new_path =
-                                                    Self::get_svg_path(&editor_entity, cx);
-                                                if this.svg_path != new_path {
-                                                    this.svg_path = new_path;
-                                                    cx.notify();
-                                                }
-                                            }
+                                        && Self::is_svg_file(&editor_entity, cx)
+                                    {
+                                        let new_path = Self::get_svg_path(&editor_entity, cx);
+                                        if this.svg_path != new_path {
+                                            this.svg_path = new_path;
+                                            cx.notify();
                                         }
                                     }
                                 }
@@ -232,15 +224,15 @@ impl SvgPreviewView {
     {
         let app = cx.borrow();
         let buffer = editor.read(app).buffer().read(app);
-        if let Some(buffer) = buffer.as_singleton() {
-            if let Some(file) = buffer.read(app).file() {
-                return file
-                    .path()
-                    .extension()
-                    .and_then(|ext| ext.to_str())
-                    .map(|ext| ext.eq_ignore_ascii_case("svg"))
-                    .unwrap_or(false);
-            }
+        if let Some(buffer) = buffer.as_singleton()
+            && let Some(file) = buffer.read(app).file()
+        {
+            return file
+                .path()
+                .extension()
+                .and_then(|ext| ext.to_str())
+                .map(|ext| ext.eq_ignore_ascii_case("svg"))
+                .unwrap_or(false);
         }
         false
     }
diff --git a/crates/task/src/debug_format.rs b/crates/task/src/debug_format.rs
index f20f55975e..38089670e2 100644
--- a/crates/task/src/debug_format.rs
+++ b/crates/task/src/debug_format.rs
@@ -299,13 +299,12 @@ impl DebugTaskFile {
             if let Some(properties) = template_object
                 .get_mut("properties")
                 .and_then(|value| value.as_object_mut())
+                && properties.remove("label").is_none()
             {
-                if properties.remove("label").is_none() {
-                    debug_panic!(
-                        "Generated TaskTemplate json schema did not have expected 'label' field. \
+                debug_panic!(
+                    "Generated TaskTemplate json schema did not have expected 'label' field. \
                         Schema of 2nd alternative is: {template_object:?}"
-                    );
-                }
+                );
             }
 
             if let Some(arr) = template_object
diff --git a/crates/task/src/vscode_debug_format.rs b/crates/task/src/vscode_debug_format.rs
index e688760a5e..5e21cd6530 100644
--- a/crates/task/src/vscode_debug_format.rs
+++ b/crates/task/src/vscode_debug_format.rs
@@ -30,12 +30,12 @@ impl VsCodeDebugTaskDefinition {
         let label = replacer.replace(&self.name);
         let mut config = replacer.replace_value(self.other_attributes);
         let adapter = task_type_to_adapter_name(&self.r#type);
-        if let Some(config) = config.as_object_mut() {
-            if adapter == "JavaScript" {
-                config.insert("type".to_owned(), self.r#type.clone().into());
-                if let Some(port) = self.port.take() {
-                    config.insert("port".to_owned(), port.into());
-                }
+        if let Some(config) = config.as_object_mut()
+            && adapter == "JavaScript"
+        {
+            config.insert("type".to_owned(), self.r#type.clone().into());
+            if let Some(port) = self.port.take() {
+                config.insert("port".to_owned(), port.into());
             }
         }
         let definition = DebugScenario {
diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs
index 0b3f70e6bc..90e6ea8878 100644
--- a/crates/tasks_ui/src/tasks_ui.rs
+++ b/crates/tasks_ui/src/tasks_ui.rs
@@ -227,10 +227,10 @@ where
 
                 tasks.retain_mut(|(task_source_kind, target_task)| {
                     if predicate((task_source_kind, target_task)) {
-                        if let Some(overrides) = &overrides {
-                            if let Some(target_override) = overrides.reveal_target {
-                                target_task.reveal_target = target_override;
-                            }
+                        if let Some(overrides) = &overrides
+                            && let Some(target_override) = overrides.reveal_target
+                        {
+                            target_task.reveal_target = target_override;
                         }
                         workspace.schedule_task(
                             task_source_kind.clone(),
@@ -343,11 +343,10 @@ pub fn task_contexts(
         task_contexts.lsp_task_sources = lsp_task_sources;
         task_contexts.latest_selection = latest_selection;
 
-        if let Some(editor_context_task) = editor_context_task {
-            if let Some(editor_context) = editor_context_task.await {
-                task_contexts.active_item_context =
-                    Some((active_worktree, location, editor_context));
-            }
+        if let Some(editor_context_task) = editor_context_task
+            && let Some(editor_context) = editor_context_task.await
+        {
+            task_contexts.active_item_context = Some((active_worktree, location, editor_context));
         }
 
         if let Some(active_worktree) = active_worktree {
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 3dfde8a9af..42b3694789 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -1051,15 +1051,16 @@ impl Terminal {
         navigation_target: MaybeNavigationTarget,
         cx: &mut Context<Self>,
     ) {
-        if let Some(prev_word) = prev_word {
-            if prev_word.word == word && prev_word.word_match == word_match {
-                self.last_content.last_hovered_word = Some(HoveredWord {
-                    word,
-                    word_match,
-                    id: prev_word.id,
-                });
-                return;
-            }
+        if let Some(prev_word) = prev_word
+            && prev_word.word == word
+            && prev_word.word_match == word_match
+        {
+            self.last_content.last_hovered_word = Some(HoveredWord {
+                word,
+                word_match,
+                id: prev_word.id,
+            });
+            return;
         }
 
         self.last_content.last_hovered_word = Some(HoveredWord {
@@ -1517,12 +1518,11 @@ impl Terminal {
                 self.last_content.display_offset,
             );
 
-            if self.mouse_changed(point, side) {
-                if let Some(bytes) =
+            if self.mouse_changed(point, side)
+                && let Some(bytes) =
                     mouse_moved_report(point, e.pressed_button, e.modifiers, self.last_content.mode)
-                {
-                    self.pty_tx.notify(bytes);
-                }
+            {
+                self.pty_tx.notify(bytes);
             }
         } else if e.modifiers.secondary() {
             self.word_from_position(e.position);
@@ -1864,10 +1864,10 @@ impl Terminal {
     }
 
     pub fn kill_active_task(&mut self) {
-        if let Some(task) = self.task() {
-            if task.status == TaskStatus::Running {
-                self.pty_info.kill_current_process();
-            }
+        if let Some(task) = self.task()
+            && task.status == TaskStatus::Running
+        {
+            self.pty_info.kill_current_process();
         }
     }
 
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 3f89afffab..635e3e2ca5 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -325,10 +325,10 @@ impl settings::Settings for TerminalSettings {
             .and_then(|v| v.as_object())
         {
             for (k, v) in env {
-                if v.is_null() {
-                    if let Some(zed_env) = current.env.as_mut() {
-                        zed_env.remove(k);
-                    }
+                if v.is_null()
+                    && let Some(zed_env) = current.env.as_mut()
+                {
+                    zed_env.remove(k);
                 }
                 let Some(v) = v.as_str() else { continue };
                 if let Some(zed_env) = current.env.as_mut() {
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 6c1be9d5e7..7575706db0 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -583,15 +583,15 @@ impl TerminalElement {
             strikethrough,
         };
 
-        if let Some((style, range)) = hyperlink {
-            if range.contains(&indexed.point) {
-                if let Some(underline) = style.underline {
-                    result.underline = Some(underline);
-                }
+        if let Some((style, range)) = hyperlink
+            && range.contains(&indexed.point)
+        {
+            if let Some(underline) = style.underline {
+                result.underline = Some(underline);
+            }
 
-                if let Some(color) = style.color {
-                    result.color = color;
-                }
+            if let Some(color) = style.color {
+                result.color = color;
             }
         }
 
@@ -1275,9 +1275,9 @@ impl Element for TerminalElement {
                     }
                     let text_paint_time = text_paint_start.elapsed();
 
-                    if let Some(text_to_mark) = &marked_text_cloned {
-                        if !text_to_mark.is_empty() {
-                            if let Some(cursor_layout) = &original_cursor {
+                    if let Some(text_to_mark) = &marked_text_cloned
+                        && !text_to_mark.is_empty()
+                            && let Some(cursor_layout) = &original_cursor {
                                 let ime_position = cursor_layout.bounding_rect(origin).origin;
                                 let mut ime_style = layout.base_text_style.clone();
                                 ime_style.underline = Some(UnderlineStyle {
@@ -1303,14 +1303,11 @@ impl Element for TerminalElement {
                                     .paint(ime_position, layout.dimensions.line_height, window, cx)
                                     .log_err();
                             }
-                        }
-                    }
 
-                    if self.cursor_visible && marked_text_cloned.is_none() {
-                        if let Some(mut cursor) = original_cursor {
+                    if self.cursor_visible && marked_text_cloned.is_none()
+                        && let Some(mut cursor) = original_cursor {
                             cursor.paint(origin, window, cx);
                         }
-                    }
 
                     if let Some(mut element) = block_below_cursor_element {
                         element.paint(window, cx);
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index cdf405b642..b161a8ea89 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -255,8 +255,7 @@ impl TerminalPanel {
                     .transpose()
                     .log_err()
                     .flatten()
-                {
-                    if let Ok(serialized) = workspace
+                    && let Ok(serialized) = workspace
                         .update_in(&mut cx, |workspace, window, cx| {
                             deserialize_terminal_panel(
                                 workspace.weak_handle(),
@@ -268,9 +267,8 @@ impl TerminalPanel {
                             )
                         })?
                         .await
-                    {
-                        terminal_panel = Some(serialized);
-                    }
+                {
+                    terminal_panel = Some(serialized);
                 }
             }
             _ => {}
@@ -1077,11 +1075,10 @@ pub fn new_terminal_pane(
                                 return ControlFlow::Break(());
                             }
                         };
-                    } else if let Some(project_path) = item.project_path(cx) {
-                        if let Some(entry_path) = project.read(cx).absolute_path(&project_path, cx)
-                        {
-                            add_paths_to_terminal(pane, &[entry_path], window, cx);
-                        }
+                    } else if let Some(project_path) = item.project_path(cx)
+                        && let Some(entry_path) = project.read(cx).absolute_path(&project_path, cx)
+                    {
+                        add_paths_to_terminal(pane, &[entry_path], window, cx);
                     }
                 }
             } else if let Some(selection) = dropped_item.downcast_ref::<DraggedSelection>() {
@@ -1103,10 +1100,8 @@ pub fn new_terminal_pane(
                 {
                     add_paths_to_terminal(pane, &[entry_path], window, cx);
                 }
-            } else if is_local {
-                if let Some(paths) = dropped_item.downcast_ref::<ExternalPaths>() {
-                    add_paths_to_terminal(pane, paths.paths(), window, cx);
-                }
+            } else if is_local && let Some(paths) = dropped_item.downcast_ref::<ExternalPaths>() {
+                add_paths_to_terminal(pane, paths.paths(), window, cx);
             }
 
             ControlFlow::Break(())
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 559faea42a..14b642bc12 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -308,10 +308,10 @@ impl TerminalView {
                 } else {
                     let mut displayed_lines = total_lines;
 
-                    if !self.focus_handle.is_focused(window) {
-                        if let Some(max_lines) = max_lines_when_unfocused {
-                            displayed_lines = displayed_lines.min(*max_lines)
-                        }
+                    if !self.focus_handle.is_focused(window)
+                        && let Some(max_lines) = max_lines_when_unfocused
+                    {
+                        displayed_lines = displayed_lines.min(*max_lines)
                     }
 
                     ContentMode::Inline {
@@ -1156,26 +1156,26 @@ fn subscribe_for_terminal_events(
 
                                 if let Some(opened_item) = opened_items.first() {
                                     if open_target.is_file() {
-                                        if let Some(Ok(opened_item)) = opened_item {
-                                            if let Some(row) = path_to_open.row {
-                                                let col = path_to_open.column.unwrap_or(0);
-                                                if let Some(active_editor) =
-                                                    opened_item.downcast::<Editor>()
-                                                {
-                                                    active_editor
-                                                        .downgrade()
-                                                        .update_in(cx, |editor, window, cx| {
-                                                            editor.go_to_singleton_buffer_point(
-                                                                language::Point::new(
-                                                                    row.saturating_sub(1),
-                                                                    col.saturating_sub(1),
-                                                                ),
-                                                                window,
-                                                                cx,
-                                                            )
-                                                        })
-                                                        .log_err();
-                                                }
+                                        if let Some(Ok(opened_item)) = opened_item
+                                            && let Some(row) = path_to_open.row
+                                        {
+                                            let col = path_to_open.column.unwrap_or(0);
+                                            if let Some(active_editor) =
+                                                opened_item.downcast::<Editor>()
+                                            {
+                                                active_editor
+                                                    .downgrade()
+                                                    .update_in(cx, |editor, window, cx| {
+                                                        editor.go_to_singleton_buffer_point(
+                                                            language::Point::new(
+                                                                row.saturating_sub(1),
+                                                                col.saturating_sub(1),
+                                                            ),
+                                                            window,
+                                                            cx,
+                                                        )
+                                                    })
+                                                    .log_err();
                                             }
                                         }
                                     } else if open_target.is_dir() {
@@ -1321,17 +1321,17 @@ fn possible_open_target(
                 }
             };
 
-            if path_to_check.path.is_relative() {
-                if let Some(entry) = worktree.read(cx).entry_for_path(&path_to_check.path) {
-                    return Task::ready(Some(OpenTarget::Worktree(
-                        PathWithPosition {
-                            path: worktree_root.join(&entry.path),
-                            row: path_to_check.row,
-                            column: path_to_check.column,
-                        },
-                        entry.clone(),
-                    )));
-                }
+            if path_to_check.path.is_relative()
+                && let Some(entry) = worktree.read(cx).entry_for_path(&path_to_check.path)
+            {
+                return Task::ready(Some(OpenTarget::Worktree(
+                    PathWithPosition {
+                        path: worktree_root.join(&entry.path),
+                        row: path_to_check.row,
+                        column: path_to_check.column,
+                    },
+                    entry.clone(),
+                )));
             }
 
             paths_to_check.push(path_to_check);
@@ -1428,11 +1428,11 @@ fn possible_open_target(
     let fs = workspace.read(cx).project().read(cx).fs().clone();
     cx.background_spawn(async move {
         for mut path_to_check in fs_paths_to_check {
-            if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok() {
-                if let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten() {
-                    path_to_check.path = fs_path_to_check;
-                    return Some(OpenTarget::File(path_to_check, metadata));
-                }
+            if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
+                && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
+            {
+                path_to_check.path = fs_path_to_check;
+                return Some(OpenTarget::File(path_to_check, metadata));
             }
         }
 
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index 9f7e49d24d..8e37567738 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -446,10 +446,10 @@ impl History {
     }
 
     fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
-        if let Some(transaction) = self.forget(transaction) {
-            if let Some(destination) = self.transaction_mut(destination) {
-                destination.edit_ids.extend(transaction.edit_ids);
-            }
+        if let Some(transaction) = self.forget(transaction)
+            && let Some(destination) = self.transaction_mut(destination)
+        {
+            destination.edit_ids.extend(transaction.edit_ids);
         }
     }
 
@@ -1585,11 +1585,11 @@ impl Buffer {
             .map(Some)
             .chain([None])
             .filter_map(move |range| {
-                if let Some((range, prev_range)) = range.as_ref().zip(prev_range.as_mut()) {
-                    if prev_range.end == range.start {
-                        prev_range.end = range.end;
-                        return None;
-                    }
+                if let Some((range, prev_range)) = range.as_ref().zip(prev_range.as_mut())
+                    && prev_range.end == range.start
+                {
+                    prev_range.end = range.end;
+                    return None;
                 }
                 let result = prev_range.clone();
                 prev_range = range;
@@ -1685,10 +1685,10 @@ impl Buffer {
             rx = Some(channel.1);
         }
         async move {
-            if let Some(mut rx) = rx {
-                if rx.recv().await.is_none() {
-                    anyhow::bail!("gave up waiting for version");
-                }
+            if let Some(mut rx) = rx
+                && rx.recv().await.is_none()
+            {
+                anyhow::bail!("gave up waiting for version");
             }
             Ok(())
         }
diff --git a/crates/theme/src/fallback_themes.rs b/crates/theme/src/fallback_themes.rs
index e9e8e2d0db..13786aca57 100644
--- a/crates/theme/src/fallback_themes.rs
+++ b/crates/theme/src/fallback_themes.rs
@@ -34,10 +34,10 @@ pub(crate) fn apply_status_color_defaults(status: &mut StatusColorsRefinement) {
         (&status.error, &mut status.error_background),
         (&status.hidden, &mut status.hidden_background),
     ] {
-        if bg_color.is_none() {
-            if let Some(fg_color) = fg_color {
-                *bg_color = Some(fg_color.opacity(0.25));
-            }
+        if bg_color.is_none()
+            && let Some(fg_color) = fg_color
+        {
+            *bg_color = Some(fg_color.opacity(0.25));
         }
     }
 }
diff --git a/crates/title_bar/src/application_menu.rs b/crates/title_bar/src/application_menu.rs
index 98f0eeb6cc..d8b0b8dc6b 100644
--- a/crates/title_bar/src/application_menu.rs
+++ b/crates/title_bar/src/application_menu.rs
@@ -269,32 +269,31 @@ impl Render for ApplicationMenu {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let all_menus_shown = self.all_menus_shown(cx);
 
-        if let Some(pending_menu_open) = self.pending_menu_open.take() {
-            if let Some(entry) = self
+        if let Some(pending_menu_open) = self.pending_menu_open.take()
+            && let Some(entry) = self
                 .entries
                 .iter()
                 .find(|entry| entry.menu.name == pending_menu_open && !entry.handle.is_deployed())
-            {
-                let handle_to_show = entry.handle.clone();
-                let handles_to_hide: Vec<_> = self
-                    .entries
-                    .iter()
-                    .filter(|e| e.menu.name != pending_menu_open && e.handle.is_deployed())
-                    .map(|e| e.handle.clone())
-                    .collect();
+        {
+            let handle_to_show = entry.handle.clone();
+            let handles_to_hide: Vec<_> = self
+                .entries
+                .iter()
+                .filter(|e| e.menu.name != pending_menu_open && e.handle.is_deployed())
+                .map(|e| e.handle.clone())
+                .collect();
 
-                if handles_to_hide.is_empty() {
-                    // We need to wait for the next frame to show all menus first,
-                    // before we can handle show/hide operations
-                    window.on_next_frame(move |window, cx| {
-                        handles_to_hide.iter().for_each(|handle| handle.hide(cx));
-                        window.defer(cx, move |window, cx| handle_to_show.show(window, cx));
-                    });
-                } else {
-                    // Since menus are already shown, we can directly handle show/hide operations
+            if handles_to_hide.is_empty() {
+                // We need to wait for the next frame to show all menus first,
+                // before we can handle show/hide operations
+                window.on_next_frame(move |window, cx| {
                     handles_to_hide.iter().for_each(|handle| handle.hide(cx));
-                    cx.defer_in(window, move |_, window, cx| handle_to_show.show(window, cx));
-                }
+                    window.defer(cx, move |window, cx| handle_to_show.show(window, cx));
+                });
+            } else {
+                // Since menus are already shown, we can directly handle show/hide operations
+                handles_to_hide.iter().for_each(|handle| handle.hide(cx));
+                cx.defer_in(window, move |_, window, cx| handle_to_show.show(window, cx));
             }
         }
 
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 84622888f1..5bd6a17e4b 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -593,11 +593,11 @@ impl TitleBar {
                     Button::new("connection-status", label)
                         .label_size(LabelSize::Small)
                         .on_click(|_, window, cx| {
-                            if let Some(auto_updater) = auto_update::AutoUpdater::get(cx) {
-                                if auto_updater.read(cx).status().is_updated() {
-                                    workspace::reload(cx);
-                                    return;
-                                }
+                            if let Some(auto_updater) = auto_update::AutoUpdater::get(cx)
+                                && auto_updater.read(cx).status().is_updated()
+                            {
+                                workspace::reload(cx);
+                                return;
                             }
                             auto_update::check(&Default::default(), window, cx);
                         })
diff --git a/crates/toolchain_selector/src/active_toolchain.rs b/crates/toolchain_selector/src/active_toolchain.rs
index 01bd7b0a9c..ea5dcc2a19 100644
--- a/crates/toolchain_selector/src/active_toolchain.rs
+++ b/crates/toolchain_selector/src/active_toolchain.rs
@@ -121,31 +121,30 @@ impl ActiveToolchain {
         cx: &mut Context<Self>,
     ) {
         let editor = editor.read(cx);
-        if let Some((_, buffer, _)) = editor.active_excerpt(cx) {
-            if let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx)) {
-                if self
-                    .active_buffer
-                    .as_ref()
-                    .is_some_and(|(old_worktree_id, old_buffer, _)| {
-                        (old_worktree_id, old_buffer.entity_id())
-                            == (&worktree_id, buffer.entity_id())
-                    })
-                {
-                    return;
-                }
-
-                let subscription = cx.subscribe_in(
-                    &buffer,
-                    window,
-                    |this, _, event: &BufferEvent, window, cx| {
-                        if matches!(event, BufferEvent::LanguageChanged) {
-                            this._update_toolchain_task = Self::spawn_tracker_task(window, cx);
-                        }
-                    },
-                );
-                self.active_buffer = Some((worktree_id, buffer.downgrade(), subscription));
-                self._update_toolchain_task = Self::spawn_tracker_task(window, cx);
+        if let Some((_, buffer, _)) = editor.active_excerpt(cx)
+            && let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx))
+        {
+            if self
+                .active_buffer
+                .as_ref()
+                .is_some_and(|(old_worktree_id, old_buffer, _)| {
+                    (old_worktree_id, old_buffer.entity_id()) == (&worktree_id, buffer.entity_id())
+                })
+            {
+                return;
             }
+
+            let subscription = cx.subscribe_in(
+                &buffer,
+                window,
+                |this, _, event: &BufferEvent, window, cx| {
+                    if matches!(event, BufferEvent::LanguageChanged) {
+                        this._update_toolchain_task = Self::spawn_tracker_task(window, cx);
+                    }
+                },
+            );
+            self.active_buffer = Some((worktree_id, buffer.downgrade(), subscription));
+            self._update_toolchain_task = Self::spawn_tracker_task(window, cx);
         }
 
         cx.notify();
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index 21d95a66de..cdd3db99e0 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -211,16 +211,15 @@ impl ToolchainSelectorDelegate {
                 let _ = this.update_in(cx, move |this, window, cx| {
                     this.delegate.candidates = available_toolchains;
 
-                    if let Some(active_toolchain) = active_toolchain {
-                        if let Some(position) = this
+                    if let Some(active_toolchain) = active_toolchain
+                        && let Some(position) = this
                             .delegate
                             .candidates
                             .toolchains
                             .iter()
                             .position(|toolchain| *toolchain == active_toolchain)
-                        {
-                            this.delegate.set_selected_index(position, window, cx);
-                        }
+                    {
+                        this.delegate.set_selected_index(position, window, cx);
                     }
                     this.update_matches(this.query(cx), window, cx);
                 });
diff --git a/crates/ui/src/components/label/highlighted_label.rs b/crates/ui/src/components/label/highlighted_label.rs
index 72f54e08da..576d47eda5 100644
--- a/crates/ui/src/components/label/highlighted_label.rs
+++ b/crates/ui/src/components/label/highlighted_label.rs
@@ -98,12 +98,12 @@ pub fn highlight_ranges(
 
         loop {
             end_ix = end_ix + text[end_ix..].chars().next().unwrap().len_utf8();
-            if let Some(&next_ix) = highlight_indices.peek() {
-                if next_ix == end_ix {
-                    end_ix = next_ix;
-                    highlight_indices.next();
-                    continue;
-                }
+            if let Some(&next_ix) = highlight_indices.peek()
+                && next_ix == end_ix
+            {
+                end_ix = next_ix;
+                highlight_indices.next();
+                continue;
             }
             break;
         }
diff --git a/crates/ui/src/components/popover_menu.rs b/crates/ui/src/components/popover_menu.rs
index 55ce0218c7..f77eea4bdc 100644
--- a/crates/ui/src/components/popover_menu.rs
+++ b/crates/ui/src/components/popover_menu.rs
@@ -72,10 +72,10 @@ impl<M: ManagedView> PopoverMenuHandle<M> {
     }
 
     pub fn hide(&self, cx: &mut App) {
-        if let Some(state) = self.0.borrow().as_ref() {
-            if let Some(menu) = state.menu.borrow().as_ref() {
-                menu.update(cx, |_, cx| cx.emit(DismissEvent));
-            }
+        if let Some(state) = self.0.borrow().as_ref()
+            && let Some(menu) = state.menu.borrow().as_ref()
+        {
+            menu.update(cx, |_, cx| cx.emit(DismissEvent));
         }
     }
 
@@ -278,10 +278,10 @@ fn show_menu<M: ManagedView>(
 
     window
         .subscribe(&new_menu, cx, move |modal, _: &DismissEvent, window, cx| {
-            if modal.focus_handle(cx).contains_focused(window, cx) {
-                if let Some(previous_focus_handle) = previous_focus_handle.as_ref() {
-                    window.focus(previous_focus_handle);
-                }
+            if modal.focus_handle(cx).contains_focused(window, cx)
+                && let Some(previous_focus_handle) = previous_focus_handle.as_ref()
+            {
+                window.focus(previous_focus_handle);
             }
             *menu2.borrow_mut() = None;
             window.refresh();
@@ -373,14 +373,14 @@ impl<M: ManagedView> Element for PopoverMenu<M> {
                     (child_builder)(element_state.menu.clone(), self.menu_builder.clone())
                 });
 
-                if let Some(trigger_handle) = self.trigger_handle.take() {
-                    if let Some(menu_builder) = self.menu_builder.clone() {
-                        *trigger_handle.0.borrow_mut() = Some(PopoverMenuHandleState {
-                            menu_builder,
-                            menu: element_state.menu.clone(),
-                            on_open: self.on_open.clone(),
-                        });
-                    }
+                if let Some(trigger_handle) = self.trigger_handle.take()
+                    && let Some(menu_builder) = self.menu_builder.clone()
+                {
+                    *trigger_handle.0.borrow_mut() = Some(PopoverMenuHandleState {
+                        menu_builder,
+                        menu: element_state.menu.clone(),
+                        on_open: self.on_open.clone(),
+                    });
                 }
 
                 let child_layout_id = child_element
diff --git a/crates/ui/src/components/right_click_menu.rs b/crates/ui/src/components/right_click_menu.rs
index 85ef549bc0..761189671b 100644
--- a/crates/ui/src/components/right_click_menu.rs
+++ b/crates/ui/src/components/right_click_menu.rs
@@ -250,12 +250,11 @@ impl<M: ManagedView> Element for RightClickMenu<M> {
 
                         window
                             .subscribe(&new_menu, cx, move |modal, _: &DismissEvent, window, cx| {
-                                if modal.focus_handle(cx).contains_focused(window, cx) {
-                                    if let Some(previous_focus_handle) =
+                                if modal.focus_handle(cx).contains_focused(window, cx)
+                                    && let Some(previous_focus_handle) =
                                         previous_focus_handle.as_ref()
-                                    {
-                                        window.focus(previous_focus_handle);
-                                    }
+                                {
+                                    window.focus(previous_focus_handle);
                                 }
                                 *menu2.borrow_mut() = None;
                                 window.refresh();
diff --git a/crates/util/src/fs.rs b/crates/util/src/fs.rs
index 3e96594f85..60aab4a2e7 100644
--- a/crates/util/src/fs.rs
+++ b/crates/util/src/fs.rs
@@ -13,13 +13,13 @@ where
         while let Some(entry) = entries.next().await {
             if let Some(entry) = entry.log_err() {
                 let entry_path = entry.path();
-                if predicate(entry_path.as_path()) {
-                    if let Ok(metadata) = fs::metadata(&entry_path).await {
-                        if metadata.is_file() {
-                            fs::remove_file(&entry_path).await.log_err();
-                        } else {
-                            fs::remove_dir_all(&entry_path).await.log_err();
-                        }
+                if predicate(entry_path.as_path())
+                    && let Ok(metadata) = fs::metadata(&entry_path).await
+                {
+                    if metadata.is_file() {
+                        fs::remove_file(&entry_path).await.log_err();
+                    } else {
+                        fs::remove_dir_all(&entry_path).await.log_err();
                     }
                 }
             }
@@ -35,10 +35,10 @@ where
 
     if let Some(mut entries) = fs::read_dir(dir).await.log_err() {
         while let Some(entry) = entries.next().await {
-            if let Some(entry) = entry.log_err() {
-                if predicate(entry.path().as_path()) {
-                    matching.push(entry.path());
-                }
+            if let Some(entry) = entry.log_err()
+                && predicate(entry.path().as_path())
+            {
+                matching.push(entry.path());
             }
         }
     }
@@ -58,10 +58,9 @@ where
                 if let Some(file_name) = entry_path
                     .file_name()
                     .map(|file_name| file_name.to_string_lossy())
+                    && predicate(&file_name)
                 {
-                    if predicate(&file_name) {
-                        return Some(entry_path);
-                    }
+                    return Some(entry_path);
                 }
             }
         }
diff --git a/crates/util/src/schemars.rs b/crates/util/src/schemars.rs
index e162b41933..a59d24c325 100644
--- a/crates/util/src/schemars.rs
+++ b/crates/util/src/schemars.rs
@@ -44,13 +44,12 @@ pub struct DefaultDenyUnknownFields;
 
 impl schemars::transform::Transform for DefaultDenyUnknownFields {
     fn transform(&mut self, schema: &mut schemars::Schema) {
-        if let Some(object) = schema.as_object_mut() {
-            if object.contains_key("properties")
-                && !object.contains_key("additionalProperties")
-                && !object.contains_key("unevaluatedProperties")
-            {
-                object.insert("additionalProperties".to_string(), false.into());
-            }
+        if let Some(object) = schema.as_object_mut()
+            && object.contains_key("properties")
+            && !object.contains_key("additionalProperties")
+            && !object.contains_key("unevaluatedProperties")
+        {
+            object.insert("additionalProperties".to_string(), false.into());
         }
         transform_subschemas(self, schema);
     }
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index e1b25f4dba..187678f8af 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -128,11 +128,9 @@ pub fn truncate_lines_to_byte_limit(s: &str, max_bytes: usize) -> &str {
     }
 
     for i in (0..max_bytes).rev() {
-        if s.is_char_boundary(i) {
-            if s.as_bytes()[i] == b'\n' {
-                // Since the i-th character is \n, valid to slice at i + 1.
-                return &s[..i + 1];
-            }
+        if s.is_char_boundary(i) && s.as_bytes()[i] == b'\n' {
+            // Since the i-th character is \n, valid to slice at i + 1.
+            return &s[..i + 1];
         }
     }
 
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index fe1537684c..00d3bde750 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -510,17 +510,16 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
                     vim.switch_mode(Mode::Normal, true, window, cx);
                 }
                 vim.update_editor(cx, |_, editor, cx| {
-                    if let Some(first_sel) = initial_selections {
-                        if let Some(tx_id) = editor
+                    if let Some(first_sel) = initial_selections
+                        && let Some(tx_id) = editor
                             .buffer()
                             .update(cx, |multi, cx| multi.last_transaction_id(cx))
-                        {
-                            let last_sel = editor.selections.disjoint_anchors();
-                            editor.modify_transaction_selection_history(tx_id, |old| {
-                                old.0 = first_sel;
-                                old.1 = Some(last_sel);
-                            });
-                        }
+                    {
+                        let last_sel = editor.selections.disjoint_anchors();
+                        editor.modify_transaction_selection_history(tx_id, |old| {
+                            old.0 = first_sel;
+                            old.1 = Some(last_sel);
+                        });
                     }
                 });
             })
@@ -1713,14 +1712,12 @@ impl Vim {
             match c {
                 '%' => {
                     self.update_editor(cx, |_, editor, cx| {
-                        if let Some((_, buffer, _)) = editor.active_excerpt(cx) {
-                            if let Some(file) = buffer.read(cx).file() {
-                                if let Some(local) = file.as_local() {
-                                    if let Some(str) = local.path().to_str() {
-                                        ret.push_str(str)
-                                    }
-                                }
-                            }
+                        if let Some((_, buffer, _)) = editor.active_excerpt(cx)
+                            && let Some(file) = buffer.read(cx).file()
+                            && let Some(local) = file.as_local()
+                            && let Some(str) = local.path().to_str()
+                        {
+                            ret.push_str(str)
                         }
                     });
                 }
@@ -1954,19 +1951,19 @@ impl ShellExec {
                 return;
             };
 
-            if let Some(mut stdin) = running.stdin.take() {
-                if let Some(snapshot) = input_snapshot {
-                    let range = range.clone();
-                    cx.background_spawn(async move {
-                        for chunk in snapshot.text_for_range(range) {
-                            if stdin.write_all(chunk.as_bytes()).log_err().is_none() {
-                                return;
-                            }
+            if let Some(mut stdin) = running.stdin.take()
+                && let Some(snapshot) = input_snapshot
+            {
+                let range = range.clone();
+                cx.background_spawn(async move {
+                    for chunk in snapshot.text_for_range(range) {
+                        if stdin.write_all(chunk.as_bytes()).log_err().is_none() {
+                            return;
                         }
-                        stdin.flush().log_err();
-                    })
-                    .detach();
-                }
+                    }
+                    stdin.flush().log_err();
+                })
+                .detach();
             };
 
             let output = cx
diff --git a/crates/vim/src/digraph.rs b/crates/vim/src/digraph.rs
index c555b781b1..beb3bd54ba 100644
--- a/crates/vim/src/digraph.rs
+++ b/crates/vim/src/digraph.rs
@@ -63,15 +63,15 @@ impl Vim {
     }
 
     fn literal(&mut self, action: &Literal, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(Operator::Literal { prefix }) = self.active_operator() {
-            if let Some(prefix) = prefix {
-                if let Some(keystroke) = Keystroke::parse(&action.0).ok() {
-                    window.defer(cx, |window, cx| {
-                        window.dispatch_keystroke(keystroke, cx);
-                    });
-                }
-                return self.handle_literal_input(prefix, "", window, cx);
+        if let Some(Operator::Literal { prefix }) = self.active_operator()
+            && let Some(prefix) = prefix
+        {
+            if let Some(keystroke) = Keystroke::parse(&action.0).ok() {
+                window.defer(cx, |window, cx| {
+                    window.dispatch_keystroke(keystroke, cx);
+                });
             }
+            return self.handle_literal_input(prefix, "", window, cx);
         }
 
         self.insert_literal(Some(action.1), "", window, cx);
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 367b5130b6..e703b18117 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -1811,10 +1811,10 @@ fn previous_word_end(
         .ignore_punctuation(ignore_punctuation);
     let mut point = point.to_point(map);
 
-    if point.column < map.buffer_snapshot.line_len(MultiBufferRow(point.row)) {
-        if let Some(ch) = map.buffer_snapshot.chars_at(point).next() {
-            point.column += ch.len_utf8() as u32;
-        }
+    if point.column < map.buffer_snapshot.line_len(MultiBufferRow(point.row))
+        && let Some(ch) = map.buffer_snapshot.chars_at(point).next()
+    {
+        point.column += ch.len_utf8() as u32;
     }
     for _ in 0..times {
         let new_point = movement::find_preceding_boundary_point(
@@ -1986,10 +1986,10 @@ fn previous_subword_end(
         .ignore_punctuation(ignore_punctuation);
     let mut point = point.to_point(map);
 
-    if point.column < map.buffer_snapshot.line_len(MultiBufferRow(point.row)) {
-        if let Some(ch) = map.buffer_snapshot.chars_at(point).next() {
-            point.column += ch.len_utf8() as u32;
-        }
+    if point.column < map.buffer_snapshot.line_len(MultiBufferRow(point.row))
+        && let Some(ch) = map.buffer_snapshot.chars_at(point).next()
+    {
+        point.column += ch.len_utf8() as u32;
     }
     for _ in 0..times {
         let new_point = movement::find_preceding_boundary_point(
@@ -2054,10 +2054,10 @@ pub(crate) fn last_non_whitespace(
     let classifier = map.buffer_snapshot.char_classifier_at(from.to_point(map));
 
     // NOTE: depending on clip_at_line_end we may already be one char back from the end.
-    if let Some((ch, _)) = map.buffer_chars_at(end_of_line).next() {
-        if classifier.kind(ch) != CharKind::Whitespace {
-            return end_of_line.to_display_point(map);
-        }
+    if let Some((ch, _)) = map.buffer_chars_at(end_of_line).next()
+        && classifier.kind(ch) != CharKind::Whitespace
+    {
+        return end_of_line.to_display_point(map);
     }
 
     for (ch, offset) in map.reverse_buffer_chars_at(end_of_line) {
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index d7a6932baa..6f406d0c44 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -74,10 +74,10 @@ impl Vim {
                 editor.change_selections(Default::default(), window, cx, |s| {
                     s.move_with(|map, selection| {
                         let mut cursor = selection.head();
-                        if kind.linewise() {
-                            if let Some(column) = original_columns.get(&selection.id) {
-                                *cursor.column_mut() = *column
-                            }
+                        if kind.linewise()
+                            && let Some(column) = original_columns.get(&selection.id)
+                        {
+                            *cursor.column_mut() = *column
                         }
                         cursor = map.clip_point(cursor, Bias::Left);
                         selection.collapse_to(cursor, selection.goal)
diff --git a/crates/vim/src/normal/mark.rs b/crates/vim/src/normal/mark.rs
index 1d6264d593..80d94def05 100644
--- a/crates/vim/src/normal/mark.rs
+++ b/crates/vim/src/normal/mark.rs
@@ -256,10 +256,8 @@ impl Vim {
                 }
             });
 
-            if should_jump {
-                if let Some(anchor) = anchor {
-                    self.motion(Motion::Jump { anchor, line }, window, cx)
-                }
+            if should_jump && let Some(anchor) = anchor {
+                self.motion(Motion::Jump { anchor, line }, window, cx)
             }
         }
     }
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 5cc3762990..2d79274808 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -221,14 +221,14 @@ impl Vim {
             if actions.is_empty() {
                 return None;
             }
-            if globals.replayer.is_none() {
-                if let Some(recording_register) = globals.recording_register {
-                    globals
-                        .recordings
-                        .entry(recording_register)
-                        .or_default()
-                        .push(ReplayableAction::Action(Repeat.boxed_clone()));
-                }
+            if globals.replayer.is_none()
+                && let Some(recording_register) = globals.recording_register
+            {
+                globals
+                    .recordings
+                    .entry(recording_register)
+                    .or_default()
+                    .push(ReplayableAction::Action(Repeat.boxed_clone()));
             }
 
             let mut mode = None;
@@ -320,10 +320,10 @@ impl Vim {
         // vim doesn't treat 3a1 as though you literally repeated a1
         // 3 times, instead it inserts the content thrice at the insert position.
         if let Some(to_repeat) = repeatable_insert(&actions[0]) {
-            if let Some(ReplayableAction::Action(action)) = actions.last() {
-                if NormalBefore.partial_eq(&**action) {
-                    actions.pop();
-                }
+            if let Some(ReplayableAction::Action(action)) = actions.last()
+                && NormalBefore.partial_eq(&**action)
+            {
+                actions.pop();
             }
 
             let mut new_actions = actions.clone();
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
index cff23c4bd4..c65da4f90b 100644
--- a/crates/vim/src/object.rs
+++ b/crates/vim/src/object.rs
@@ -100,10 +100,10 @@ fn cover_or_next<I: Iterator<Item = (Range<usize>, Range<usize>)>>(
         for (open_range, close_range) in ranges {
             let start_off = open_range.start;
             let end_off = close_range.end;
-            if let Some(range_filter) = range_filter {
-                if !range_filter(open_range.clone(), close_range.clone()) {
-                    continue;
-                }
+            if let Some(range_filter) = range_filter
+                && !range_filter(open_range.clone(), close_range.clone())
+            {
+                continue;
             }
             let candidate = CandidateWithRanges {
                 candidate: CandidateRange {
@@ -1060,11 +1060,11 @@ fn text_object(
         .filter_map(|(r, m)| if m == target { Some(r) } else { None })
         .collect();
     matches.sort_by_key(|r| r.start);
-    if let Some(buffer_range) = matches.first() {
-        if !buffer_range.is_empty() {
-            let range = excerpt.map_range_from_buffer(buffer_range.clone());
-            return Some(range.start.to_display_point(map)..range.end.to_display_point(map));
-        }
+    if let Some(buffer_range) = matches.first()
+        && !buffer_range.is_empty()
+    {
+        let range = excerpt.map_range_from_buffer(buffer_range.clone());
+        return Some(range.start.to_display_point(map)..range.end.to_display_point(map));
     }
     let buffer_range = excerpt.map_range_from_buffer(around_range.clone());
     return Some(buffer_range.start.to_display_point(map)..buffer_range.end.to_display_point(map));
@@ -1529,25 +1529,25 @@ fn surrounding_markers(
         Some((ch, _)) => ch,
         _ => '\0',
     };
-    if let Some((ch, range)) = movement::chars_after(map, point).next() {
-        if ch == open_marker && before_ch != '\\' {
-            if open_marker == close_marker {
-                let mut total = 0;
-                for ((ch, _), (before_ch, _)) in movement::chars_before(map, point).tuple_windows()
-                {
-                    if ch == '\n' {
-                        break;
-                    }
-                    if ch == open_marker && before_ch != '\\' {
-                        total += 1;
-                    }
+    if let Some((ch, range)) = movement::chars_after(map, point).next()
+        && ch == open_marker
+        && before_ch != '\\'
+    {
+        if open_marker == close_marker {
+            let mut total = 0;
+            for ((ch, _), (before_ch, _)) in movement::chars_before(map, point).tuple_windows() {
+                if ch == '\n' {
+                    break;
                 }
-                if total % 2 == 0 {
-                    opening = Some(range)
+                if ch == open_marker && before_ch != '\\' {
+                    total += 1;
                 }
-            } else {
+            }
+            if total % 2 == 0 {
                 opening = Some(range)
             }
+        } else {
+            opening = Some(range)
         }
     }
 
@@ -1558,10 +1558,10 @@ fn surrounding_markers(
                 break;
             }
 
-            if let Some((before_ch, _)) = chars_before.peek() {
-                if *before_ch == '\\' {
-                    continue;
-                }
+            if let Some((before_ch, _)) = chars_before.peek()
+                && *before_ch == '\\'
+            {
+                continue;
             }
 
             if ch == open_marker {
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 2e8e2f76bd..db19562f02 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -412,20 +412,20 @@ impl MarksState {
         let mut to_write = HashMap::default();
 
         for (key, value) in &new_points {
-            if self.is_global_mark(key) {
-                if self.global_marks.get(key) != Some(&MarkLocation::Path(path.clone())) {
-                    if let Some(workspace_id) = self.workspace_id(cx) {
-                        let path = path.clone();
-                        let key = key.clone();
-                        cx.background_spawn(async move {
-                            DB.set_global_mark_path(workspace_id, key, path).await
-                        })
-                        .detach_and_log_err(cx);
-                    }
-
-                    self.global_marks
-                        .insert(key.clone(), MarkLocation::Path(path.clone()));
+            if self.is_global_mark(key)
+                && self.global_marks.get(key) != Some(&MarkLocation::Path(path.clone()))
+            {
+                if let Some(workspace_id) = self.workspace_id(cx) {
+                    let path = path.clone();
+                    let key = key.clone();
+                    cx.background_spawn(async move {
+                        DB.set_global_mark_path(workspace_id, key, path).await
+                    })
+                    .detach_and_log_err(cx);
                 }
+
+                self.global_marks
+                    .insert(key.clone(), MarkLocation::Path(path.clone()));
             }
             if old_points.and_then(|o| o.get(key)) != Some(value) {
                 to_write.insert(key.clone(), value.clone());
@@ -456,15 +456,15 @@ impl MarksState {
         buffer: &Entity<Buffer>,
         cx: &mut Context<Self>,
     ) {
-        if let MarkLocation::Buffer(entity_id) = old_path {
-            if let Some(old_marks) = self.multibuffer_marks.remove(&entity_id) {
-                let buffer_marks = old_marks
-                    .into_iter()
-                    .map(|(k, v)| (k, v.into_iter().map(|anchor| anchor.text_anchor).collect()))
-                    .collect();
-                self.buffer_marks
-                    .insert(buffer.read(cx).remote_id(), buffer_marks);
-            }
+        if let MarkLocation::Buffer(entity_id) = old_path
+            && let Some(old_marks) = self.multibuffer_marks.remove(&entity_id)
+        {
+            let buffer_marks = old_marks
+                .into_iter()
+                .map(|(k, v)| (k, v.into_iter().map(|anchor| anchor.text_anchor).collect()))
+                .collect();
+            self.buffer_marks
+                .insert(buffer.read(cx).remote_id(), buffer_marks);
         }
         self.watch_buffer(MarkLocation::Path(new_path.clone()), buffer, cx);
         self.serialize_buffer_marks(new_path, buffer, cx);
@@ -512,10 +512,9 @@ impl MarksState {
                     .watched_buffers
                     .get(&buffer_id.clone())
                     .map(|(path, _, _)| path.clone())
+                    && let Some(new_path) = this.path_for_buffer(&buffer, cx)
                 {
-                    if let Some(new_path) = this.path_for_buffer(&buffer, cx) {
-                        this.rename_buffer(old_path, new_path, &buffer, cx)
-                    }
+                    this.rename_buffer(old_path, new_path, &buffer, cx)
                 }
             }
             _ => {}
@@ -897,13 +896,13 @@ impl VimGlobals {
                 self.stop_recording_after_next_action = false;
             }
         }
-        if self.replayer.is_none() {
-            if let Some(recording_register) = self.recording_register {
-                self.recordings
-                    .entry(recording_register)
-                    .or_default()
-                    .push(ReplayableAction::Action(action));
-            }
+        if self.replayer.is_none()
+            && let Some(recording_register) = self.recording_register
+        {
+            self.recordings
+                .entry(recording_register)
+                .or_default()
+                .push(ReplayableAction::Action(action));
         }
     }
 
@@ -1330,10 +1329,10 @@ impl MarksMatchInfo {
         let mut offset = 0;
         for chunk in chunks {
             line.push_str(chunk.text);
-            if let Some(highlight_style) = chunk.syntax_highlight_id {
-                if let Some(highlight) = highlight_style.style(cx.theme().syntax()) {
-                    highlights.push((offset..offset + chunk.text.len(), highlight))
-                }
+            if let Some(highlight_style) = chunk.syntax_highlight_id
+                && let Some(highlight) = highlight_style.style(cx.theme().syntax())
+            {
+                highlights.push((offset..offset + chunk.text.len(), highlight))
             }
             offset += chunk.text.len();
         }
diff --git a/crates/vim/src/surrounds.rs b/crates/vim/src/surrounds.rs
index 63cd21e88c..ca65204fab 100644
--- a/crates/vim/src/surrounds.rs
+++ b/crates/vim/src/surrounds.rs
@@ -174,12 +174,11 @@ impl Vim {
                             if ch.to_string() == pair.start {
                                 let start = offset;
                                 let mut end = start + 1;
-                                if surround {
-                                    if let Some((next_ch, _)) = chars_and_offset.peek() {
-                                        if next_ch.eq(&' ') {
-                                            end += 1;
-                                        }
-                                    }
+                                if surround
+                                    && let Some((next_ch, _)) = chars_and_offset.peek()
+                                    && next_ch.eq(&' ')
+                                {
+                                    end += 1;
                                 }
                                 edits.push((start..end, ""));
                                 anchors.push(start..start);
@@ -193,12 +192,11 @@ impl Vim {
                             if ch.to_string() == pair.end {
                                 let mut start = offset;
                                 let end = start + 1;
-                                if surround {
-                                    if let Some((next_ch, _)) = reverse_chars_and_offsets.peek() {
-                                        if next_ch.eq(&' ') {
-                                            start -= 1;
-                                        }
-                                    }
+                                if surround
+                                    && let Some((next_ch, _)) = reverse_chars_and_offsets.peek()
+                                    && next_ch.eq(&' ')
+                                {
+                                    start -= 1;
                                 }
                                 edits.push((start..end, ""));
                                 break;
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
index 45cef3a2b9..98dabb8316 100644
--- a/crates/vim/src/test/neovim_connection.rs
+++ b/crates/vim/src/test/neovim_connection.rs
@@ -217,10 +217,11 @@ impl NeovimConnection {
                 .expect("Could not set nvim cursor position");
         }
 
-        if let Some(NeovimData::Get { mode, state }) = self.data.back() {
-            if *mode == Mode::Normal && *state == marked_text {
-                return;
-            }
+        if let Some(NeovimData::Get { mode, state }) = self.data.back()
+            && *mode == Mode::Normal
+            && *state == marked_text
+        {
+            return;
         }
         self.data.push_back(NeovimData::Put {
             state: marked_text.to_string(),
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 15b0b443b5..81c1a6b0b3 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -788,10 +788,10 @@ impl Vim {
         editor.selections.line_mode = false;
         editor.unregister_addon::<VimAddon>();
         editor.set_relative_line_number(None, cx);
-        if let Some(vim) = Vim::globals(cx).focused_vim() {
-            if vim.entity_id() == cx.entity().entity_id() {
-                Vim::globals(cx).focused_vim = None;
-            }
+        if let Some(vim) = Vim::globals(cx).focused_vim()
+            && vim.entity_id() == cx.entity().entity_id()
+        {
+            Vim::globals(cx).focused_vim = None;
         }
     }
 
@@ -833,10 +833,10 @@ impl Vim {
         if self.exit_temporary_mode {
             self.exit_temporary_mode = false;
             // Don't switch to insert mode if the action is temporary_normal.
-            if let Some(action) = keystroke_event.action.as_ref() {
-                if action.as_any().downcast_ref::<TemporaryNormal>().is_some() {
-                    return;
-                }
+            if let Some(action) = keystroke_event.action.as_ref()
+                && action.as_any().downcast_ref::<TemporaryNormal>().is_some()
+            {
+                return;
             }
             self.switch_mode(Mode::Insert, false, window, cx)
         }
@@ -1006,10 +1006,10 @@ impl Vim {
                     Some((point, goal))
                 })
             }
-            if last_mode == Mode::Insert || last_mode == Mode::Replace {
-                if let Some(prior_tx) = prior_tx {
-                    editor.group_until_transaction(prior_tx, cx)
-                }
+            if (last_mode == Mode::Insert || last_mode == Mode::Replace)
+                && let Some(prior_tx) = prior_tx
+            {
+                editor.group_until_transaction(prior_tx, cx)
             }
 
             editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
@@ -1031,14 +1031,16 @@ impl Vim {
                 }
 
                 let snapshot = s.display_map();
-                if let Some(pending) = s.pending.as_mut() {
-                    if pending.selection.reversed && mode.is_visual() && !last_mode.is_visual() {
-                        let mut end = pending.selection.end.to_point(&snapshot.buffer_snapshot);
-                        end = snapshot
-                            .buffer_snapshot
-                            .clip_point(end + Point::new(0, 1), Bias::Right);
-                        pending.selection.end = snapshot.buffer_snapshot.anchor_before(end);
-                    }
+                if let Some(pending) = s.pending.as_mut()
+                    && pending.selection.reversed
+                    && mode.is_visual()
+                    && !last_mode.is_visual()
+                {
+                    let mut end = pending.selection.end.to_point(&snapshot.buffer_snapshot);
+                    end = snapshot
+                        .buffer_snapshot
+                        .clip_point(end + Point::new(0, 1), Bias::Right);
+                    pending.selection.end = snapshot.buffer_snapshot.anchor_before(end);
                 }
 
                 s.move_with(|map, selection| {
@@ -1536,12 +1538,12 @@ impl Vim {
         if self.mode == Mode::Insert && self.current_tx.is_some() {
             if self.current_anchor.is_none() {
                 self.current_anchor = Some(newest);
-            } else if self.current_anchor.as_ref().unwrap() != &newest {
-                if let Some(tx_id) = self.current_tx.take() {
-                    self.update_editor(cx, |_, editor, cx| {
-                        editor.group_until_transaction(tx_id, cx)
-                    });
-                }
+            } else if self.current_anchor.as_ref().unwrap() != &newest
+                && let Some(tx_id) = self.current_tx.take()
+            {
+                self.update_editor(cx, |_, editor, cx| {
+                    editor.group_until_transaction(tx_id, cx)
+                });
             }
         } else if self.mode == Mode::Normal && newest.start != newest.end {
             if matches!(newest.goal, SelectionGoal::HorizontalRange { .. }) {
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index ae72df3971..079f66ae9d 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -305,15 +305,14 @@ impl Dock {
         .detach();
 
         cx.observe_in(&dock, window, move |workspace, dock, window, cx| {
-            if dock.read(cx).is_open() {
-                if let Some(panel) = dock.read(cx).active_panel() {
-                    if panel.is_zoomed(window, cx) {
-                        workspace.zoomed = Some(panel.to_any().downgrade());
-                        workspace.zoomed_position = Some(position);
-                        cx.emit(Event::ZoomChanged);
-                        return;
-                    }
-                }
+            if dock.read(cx).is_open()
+                && let Some(panel) = dock.read(cx).active_panel()
+                && panel.is_zoomed(window, cx)
+            {
+                workspace.zoomed = Some(panel.to_any().downgrade());
+                workspace.zoomed_position = Some(position);
+                cx.emit(Event::ZoomChanged);
+                return;
             }
             if workspace.zoomed_position == Some(position) {
                 workspace.zoomed = None;
@@ -541,10 +540,10 @@ impl Dock {
             Ok(ix) => ix,
             Err(ix) => ix,
         };
-        if let Some(active_index) = self.active_panel_index.as_mut() {
-            if *active_index >= index {
-                *active_index += 1;
-            }
+        if let Some(active_index) = self.active_panel_index.as_mut()
+            && *active_index >= index
+        {
+            *active_index += 1;
         }
         self.panel_entries.insert(
             index,
@@ -566,16 +565,16 @@ impl Dock {
 
     pub fn restore_state(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
         if let Some(serialized) = self.serialized_dock.clone() {
-            if let Some(active_panel) = serialized.active_panel.filter(|_| serialized.visible) {
-                if let Some(idx) = self.panel_index_for_persistent_name(active_panel.as_str(), cx) {
-                    self.activate_panel(idx, window, cx);
-                }
+            if let Some(active_panel) = serialized.active_panel.filter(|_| serialized.visible)
+                && let Some(idx) = self.panel_index_for_persistent_name(active_panel.as_str(), cx)
+            {
+                self.activate_panel(idx, window, cx);
             }
 
-            if serialized.zoom {
-                if let Some(panel) = self.active_panel() {
-                    panel.set_zoomed(true, window, cx)
-                }
+            if serialized.zoom
+                && let Some(panel) = self.active_panel()
+            {
+                panel.set_zoomed(true, window, cx)
             }
             self.set_open(serialized.visible, window, cx);
             return true;
diff --git a/crates/workspace/src/history_manager.rs b/crates/workspace/src/history_manager.rs
index e63b1823ea..a8387369f4 100644
--- a/crates/workspace/src/history_manager.rs
+++ b/crates/workspace/src/history_manager.rs
@@ -101,11 +101,11 @@ impl HistoryManager {
         }
         let mut deleted_ids = Vec::new();
         for idx in (0..self.history.len()).rev() {
-            if let Some(entry) = self.history.get(idx) {
-                if user_removed.contains(&entry.path) {
-                    deleted_ids.push(entry.id);
-                    self.history.remove(idx);
-                }
+            if let Some(entry) = self.history.get(idx)
+                && user_removed.contains(&entry.path)
+            {
+                deleted_ids.push(entry.id);
+                self.history.remove(idx);
             }
         }
         cx.spawn(async move |_| {
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 0c5543650e..014af7b0bc 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -832,10 +832,10 @@ impl<T: Item> ItemHandle for Entity<T> {
                     if let Some(item) = item.to_followable_item_handle(cx) {
                         let leader_id = workspace.leader_for_pane(&pane);
 
-                        if let Some(leader_id) = leader_id {
-                            if let Some(FollowEvent::Unfollow) = item.to_follow_event(event) {
-                                workspace.unfollow(leader_id, window, cx);
-                            }
+                        if let Some(leader_id) = leader_id
+                            && let Some(FollowEvent::Unfollow) = item.to_follow_event(event)
+                        {
+                            workspace.unfollow(leader_id, window, cx);
                         }
 
                         if item.item_focus_handle(cx).contains_focused(window, cx) {
@@ -863,10 +863,10 @@ impl<T: Item> ItemHandle for Entity<T> {
                         }
                     }
 
-                    if let Some(item) = item.to_serializable_item_handle(cx) {
-                        if item.should_serialize(event, cx) {
-                            workspace.enqueue_item_serialization(item).ok();
-                        }
+                    if let Some(item) = item.to_serializable_item_handle(cx)
+                        && item.should_serialize(event, cx)
+                    {
+                        workspace.enqueue_item_serialization(item).ok();
                     }
 
                     T::to_item_events(event, |event| match event {
@@ -948,11 +948,11 @@ impl<T: Item> ItemHandle for Entity<T> {
                 &self.read(cx).focus_handle(cx),
                 window,
                 move |workspace, window, cx| {
-                    if let Some(item) = weak_item.upgrade() {
-                        if item.workspace_settings(cx).autosave == AutosaveSetting::OnFocusChange {
-                            Pane::autosave_item(&item, workspace.project.clone(), window, cx)
-                                .detach_and_log_err(cx);
-                        }
+                    if let Some(item) = weak_item.upgrade()
+                        && item.workspace_settings(cx).autosave == AutosaveSetting::OnFocusChange
+                    {
+                        Pane::autosave_item(&item, workspace.project.clone(), window, cx)
+                            .detach_and_log_err(cx);
                     }
                 },
             )
diff --git a/crates/workspace/src/modal_layer.rs b/crates/workspace/src/modal_layer.rs
index 7e92c7b8e9..bcd7db3a82 100644
--- a/crates/workspace/src/modal_layer.rs
+++ b/crates/workspace/src/modal_layer.rs
@@ -141,10 +141,10 @@ impl ModalLayer {
         }
 
         if let Some(active_modal) = self.active_modal.take() {
-            if let Some(previous_focus) = active_modal.previous_focus_handle {
-                if active_modal.focus_handle.contains_focused(window, cx) {
-                    previous_focus.focus(window);
-                }
+            if let Some(previous_focus) = active_modal.previous_focus_handle
+                && active_modal.focus_handle.contains_focused(window, cx)
+            {
+                previous_focus.focus(window);
             }
             cx.notify();
         }
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 0a40dbc12c..a1affc5362 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -580,19 +580,18 @@ impl Pane {
                 // or focus the active item itself
                 if let Some(weak_last_focus_handle) =
                     self.last_focus_handle_by_item.get(&active_item.item_id())
+                    && let Some(focus_handle) = weak_last_focus_handle.upgrade()
                 {
-                    if let Some(focus_handle) = weak_last_focus_handle.upgrade() {
-                        focus_handle.focus(window);
-                        return;
-                    }
+                    focus_handle.focus(window);
+                    return;
                 }
 
                 active_item.item_focus_handle(cx).focus(window);
-            } else if let Some(focused) = window.focused(cx) {
-                if !self.context_menu_focused(window, cx) {
-                    self.last_focus_handle_by_item
-                        .insert(active_item.item_id(), focused.downgrade());
-                }
+            } else if let Some(focused) = window.focused(cx)
+                && !self.context_menu_focused(window, cx)
+            {
+                self.last_focus_handle_by_item
+                    .insert(active_item.item_id(), focused.downgrade());
             }
         }
     }
@@ -858,10 +857,11 @@ impl Pane {
     }
 
     pub fn handle_item_edit(&mut self, item_id: EntityId, cx: &App) {
-        if let Some(preview_item) = self.preview_item() {
-            if preview_item.item_id() == item_id && !preview_item.preserve_preview(cx) {
-                self.set_preview_item_id(None, cx);
-            }
+        if let Some(preview_item) = self.preview_item()
+            && preview_item.item_id() == item_id
+            && !preview_item.preserve_preview(cx)
+        {
+            self.set_preview_item_id(None, cx);
         }
     }
 
@@ -900,12 +900,12 @@ impl Pane {
         if let Some((index, existing_item)) = existing_item {
             // If the item is already open, and the item is a preview item
             // and we are not allowing items to open as preview, mark the item as persistent.
-            if let Some(preview_item_id) = self.preview_item_id {
-                if let Some(tab) = self.items.get(index) {
-                    if tab.item_id() == preview_item_id && !allow_preview {
-                        self.set_preview_item_id(None, cx);
-                    }
-                }
+            if let Some(preview_item_id) = self.preview_item_id
+                && let Some(tab) = self.items.get(index)
+                && tab.item_id() == preview_item_id
+                && !allow_preview
+            {
+                self.set_preview_item_id(None, cx);
             }
             if activate {
                 self.activate_item(index, focus_item, focus_item, window, cx);
@@ -977,21 +977,21 @@ impl Pane {
             self.close_items_on_item_open(window, cx);
         }
 
-        if item.is_singleton(cx) {
-            if let Some(&entry_id) = item.project_entry_ids(cx).first() {
-                let Some(project) = self.project.upgrade() else {
-                    return;
-                };
+        if item.is_singleton(cx)
+            && let Some(&entry_id) = item.project_entry_ids(cx).first()
+        {
+            let Some(project) = self.project.upgrade() else {
+                return;
+            };
 
-                let project = project.read(cx);
-                if let Some(project_path) = project.path_for_entry(entry_id, cx) {
-                    let abs_path = project.absolute_path(&project_path, cx);
-                    self.nav_history
-                        .0
-                        .lock()
-                        .paths_by_item
-                        .insert(item.item_id(), (project_path, abs_path));
-                }
+            let project = project.read(cx);
+            if let Some(project_path) = project.path_for_entry(entry_id, cx) {
+                let abs_path = project.absolute_path(&project_path, cx);
+                self.nav_history
+                    .0
+                    .lock()
+                    .paths_by_item
+                    .insert(item.item_id(), (project_path, abs_path));
             }
         }
         // If no destination index is specified, add or move the item after the
@@ -1192,12 +1192,11 @@ impl Pane {
         use NavigationMode::{GoingBack, GoingForward};
         if index < self.items.len() {
             let prev_active_item_ix = mem::replace(&mut self.active_item_index, index);
-            if prev_active_item_ix != self.active_item_index
-                || matches!(self.nav_history.mode(), GoingBack | GoingForward)
+            if (prev_active_item_ix != self.active_item_index
+                || matches!(self.nav_history.mode(), GoingBack | GoingForward))
+                && let Some(prev_item) = self.items.get(prev_active_item_ix)
             {
-                if let Some(prev_item) = self.items.get(prev_active_item_ix) {
-                    prev_item.deactivated(window, cx);
-                }
+                prev_item.deactivated(window, cx);
             }
             self.update_history(index);
             self.update_toolbar(window, cx);
@@ -2462,10 +2461,11 @@ impl Pane {
             .on_mouse_down(
                 MouseButton::Left,
                 cx.listener(move |pane, event: &MouseDownEvent, _, cx| {
-                    if let Some(id) = pane.preview_item_id {
-                        if id == item_id && event.click_count > 1 {
-                            pane.set_preview_item_id(None, cx);
-                        }
+                    if let Some(id) = pane.preview_item_id
+                        && id == item_id
+                        && event.click_count > 1
+                    {
+                        pane.set_preview_item_id(None, cx);
                     }
                 }),
             )
@@ -3048,18 +3048,18 @@ impl Pane {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone() {
-            if let ControlFlow::Break(()) = custom_drop_handle(self, dragged_tab, window, cx) {
-                return;
-            }
+        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
+            && let ControlFlow::Break(()) = custom_drop_handle(self, dragged_tab, window, cx)
+        {
+            return;
         }
         let mut to_pane = cx.entity();
         let split_direction = self.drag_split_direction;
         let item_id = dragged_tab.item.item_id();
-        if let Some(preview_item_id) = self.preview_item_id {
-            if item_id == preview_item_id {
-                self.set_preview_item_id(None, cx);
-            }
+        if let Some(preview_item_id) = self.preview_item_id
+            && item_id == preview_item_id
+        {
+            self.set_preview_item_id(None, cx);
         }
 
         let is_clone = cfg!(target_os = "macos") && window.modifiers().alt
@@ -3136,11 +3136,10 @@ impl Pane {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone() {
-            if let ControlFlow::Break(()) = custom_drop_handle(self, dragged_selection, window, cx)
-            {
-                return;
-            }
+        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
+            && let ControlFlow::Break(()) = custom_drop_handle(self, dragged_selection, window, cx)
+        {
+            return;
         }
         self.handle_project_entry_drop(
             &dragged_selection.active_selection.entry_id,
@@ -3157,10 +3156,10 @@ impl Pane {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone() {
-            if let ControlFlow::Break(()) = custom_drop_handle(self, project_entry_id, window, cx) {
-                return;
-            }
+        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
+            && let ControlFlow::Break(()) = custom_drop_handle(self, project_entry_id, window, cx)
+        {
+            return;
         }
         let mut to_pane = cx.entity();
         let split_direction = self.drag_split_direction;
@@ -3233,10 +3232,10 @@ impl Pane {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone() {
-            if let ControlFlow::Break(()) = custom_drop_handle(self, paths, window, cx) {
-                return;
-            }
+        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
+            && let ControlFlow::Break(()) = custom_drop_handle(self, paths, window, cx)
+        {
+            return;
         }
         let mut to_pane = cx.entity();
         let mut split_direction = self.drag_split_direction;
@@ -3790,10 +3789,10 @@ impl NavHistory {
                     borrowed_history.paths_by_item.get(&entry.item.id())
                 {
                     f(entry, project_and_abs_path.clone());
-                } else if let Some(item) = entry.item.upgrade() {
-                    if let Some(path) = item.project_path(cx) {
-                        f(entry, (path, None));
-                    }
+                } else if let Some(item) = entry.item.upgrade()
+                    && let Some(path) = item.project_path(cx)
+                {
+                    f(entry, (path, None));
                 }
             })
     }
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 5c87206e9e..bd2aafb7f4 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -619,15 +619,15 @@ impl PaneAxis {
         let mut found_axis_index: Option<usize> = None;
         if !found_pane {
             for (i, pa) in self.members.iter_mut().enumerate() {
-                if let Member::Axis(pa) = pa {
-                    if let Some(done) = pa.resize(pane, axis, amount, bounds) {
-                        if done {
-                            return Some(true); // pane found and operations already done
-                        } else if self.axis != axis {
-                            return Some(false); // pane found but this is not the correct axis direction
-                        } else {
-                            found_axis_index = Some(i); // pane found and this is correct direction
-                        }
+                if let Member::Axis(pa) = pa
+                    && let Some(done) = pa.resize(pane, axis, amount, bounds)
+                {
+                    if done {
+                        return Some(true); // pane found and operations already done
+                    } else if self.axis != axis {
+                        return Some(false); // pane found but this is not the correct axis direction
+                    } else {
+                        found_axis_index = Some(i); // pane found and this is correct direction
                     }
                 }
             }
@@ -743,13 +743,13 @@ impl PaneAxis {
         let bounding_boxes = self.bounding_boxes.lock();
 
         for (idx, member) in self.members.iter().enumerate() {
-            if let Some(coordinates) = bounding_boxes[idx] {
-                if coordinates.contains(&coordinate) {
-                    return match member {
-                        Member::Pane(found) => Some(found),
-                        Member::Axis(axis) => axis.pane_at_pixel_position(coordinate),
-                    };
-                }
+            if let Some(coordinates) = bounding_boxes[idx]
+                && coordinates.contains(&coordinate)
+            {
+                return match member {
+                    Member::Pane(found) => Some(found),
+                    Member::Axis(axis) => axis.pane_at_pixel_position(coordinate),
+                };
             }
         }
         None
@@ -1273,17 +1273,18 @@ mod element {
                         window.paint_quad(gpui::fill(overlay_bounds, overlay_background));
                     }
 
-                    if let Some(border) = overlay_border {
-                        if self.active_pane_ix == Some(ix) && child.is_leaf_pane {
-                            window.paint_quad(gpui::quad(
-                                overlay_bounds,
-                                0.,
-                                gpui::transparent_black(),
-                                border,
-                                cx.theme().colors().border_selected,
-                                BorderStyle::Solid,
-                            ));
-                        }
+                    if let Some(border) = overlay_border
+                        && self.active_pane_ix == Some(ix)
+                        && child.is_leaf_pane
+                    {
+                        window.paint_quad(gpui::quad(
+                            overlay_bounds,
+                            0.,
+                            gpui::transparent_black(),
+                            border,
+                            cx.theme().colors().border_selected,
+                            BorderStyle::Solid,
+                        ));
                     }
                 }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index babf2ac1d5..4a22107c42 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1345,18 +1345,18 @@ impl Workspace {
                         .timer(Duration::from_millis(100))
                         .await;
                     this.update_in(cx, |this, window, cx| {
-                        if let Some(display) = window.display(cx) {
-                            if let Ok(display_uuid) = display.uuid() {
-                                let window_bounds = window.inner_window_bounds();
-                                if let Some(database_id) = workspace_id {
-                                    cx.background_executor()
-                                        .spawn(DB.set_window_open_status(
-                                            database_id,
-                                            SerializedWindowBounds(window_bounds),
-                                            display_uuid,
-                                        ))
-                                        .detach_and_log_err(cx);
-                                }
+                        if let Some(display) = window.display(cx)
+                            && let Ok(display_uuid) = display.uuid()
+                        {
+                            let window_bounds = window.inner_window_bounds();
+                            if let Some(database_id) = workspace_id {
+                                cx.background_executor()
+                                    .spawn(DB.set_window_open_status(
+                                        database_id,
+                                        SerializedWindowBounds(window_bounds),
+                                        display_uuid,
+                                    ))
+                                    .detach_and_log_err(cx);
                             }
                         }
                         this.bounds_save_task_queued.take();
@@ -1729,13 +1729,12 @@ impl Workspace {
             let item_map: HashMap<EntityId, &Box<dyn ItemHandle>> =
                 pane.items().map(|item| (item.item_id(), item)).collect();
             for entry in pane.activation_history() {
-                if entry.timestamp > recent_timestamp {
-                    if let Some(&item) = item_map.get(&entry.entity_id) {
-                        if let Some(typed_item) = item.act_as::<T>(cx) {
-                            recent_timestamp = entry.timestamp;
-                            recent_item = Some(typed_item);
-                        }
-                    }
+                if entry.timestamp > recent_timestamp
+                    && let Some(&item) = item_map.get(&entry.entity_id)
+                    && let Some(typed_item) = item.act_as::<T>(cx)
+                {
+                    recent_timestamp = entry.timestamp;
+                    recent_item = Some(typed_item);
                 }
             }
         }
@@ -1774,19 +1773,19 @@ impl Workspace {
                     }
                 });
 
-            if let Some(item) = pane.active_item() {
-                if let Some(project_path) = item.project_path(cx) {
-                    let fs_path = self.project.read(cx).absolute_path(&project_path, cx);
+            if let Some(item) = pane.active_item()
+                && let Some(project_path) = item.project_path(cx)
+            {
+                let fs_path = self.project.read(cx).absolute_path(&project_path, cx);
 
-                    if let Some(fs_path) = &fs_path {
-                        abs_paths_opened
-                            .entry(fs_path.clone())
-                            .or_default()
-                            .insert(project_path.clone());
-                    }
-
-                    history.insert(project_path, (fs_path, std::usize::MAX));
+                if let Some(fs_path) = &fs_path {
+                    abs_paths_opened
+                        .entry(fs_path.clone())
+                        .or_default()
+                        .insert(project_path.clone());
                 }
+
+                history.insert(project_path, (fs_path, std::usize::MAX));
             }
         }
 
@@ -2250,29 +2249,28 @@ impl Workspace {
                     .count()
             })?;
 
-            if let Some(active_call) = active_call {
-                if close_intent != CloseIntent::Quit
-                    && workspace_count == 1
-                    && active_call.read_with(cx, |call, _| call.room().is_some())?
-                {
-                    let answer = cx.update(|window, cx| {
-                        window.prompt(
-                            PromptLevel::Warning,
-                            "Do you want to leave the current call?",
-                            None,
-                            &["Close window and hang up", "Cancel"],
-                            cx,
-                        )
-                    })?;
+            if let Some(active_call) = active_call
+                && close_intent != CloseIntent::Quit
+                && workspace_count == 1
+                && active_call.read_with(cx, |call, _| call.room().is_some())?
+            {
+                let answer = cx.update(|window, cx| {
+                    window.prompt(
+                        PromptLevel::Warning,
+                        "Do you want to leave the current call?",
+                        None,
+                        &["Close window and hang up", "Cancel"],
+                        cx,
+                    )
+                })?;
 
-                    if answer.await.log_err() == Some(1) {
-                        return anyhow::Ok(false);
-                    } else {
-                        active_call
-                            .update(cx, |call, cx| call.hang_up(cx))?
-                            .await
-                            .log_err();
-                    }
+                if answer.await.log_err() == Some(1) {
+                    return anyhow::Ok(false);
+                } else {
+                    active_call
+                        .update(cx, |call, cx| call.hang_up(cx))?
+                        .await
+                        .log_err();
                 }
             }
 
@@ -2448,10 +2446,10 @@ impl Workspace {
             for (pane, item) in dirty_items {
                 let (singleton, project_entry_ids) =
                     cx.update(|_, cx| (item.is_singleton(cx), item.project_entry_ids(cx)))?;
-                if singleton || !project_entry_ids.is_empty() {
-                    if !Pane::save_item(project.clone(), &pane, &*item, save_intent, cx).await? {
-                        return Ok(false);
-                    }
+                if (singleton || !project_entry_ids.is_empty())
+                    && !Pane::save_item(project.clone(), &pane, &*item, save_intent, cx).await?
+                {
+                    return Ok(false);
                 }
             }
             Ok(true)
@@ -3080,14 +3078,12 @@ impl Workspace {
         let mut focus_center = false;
         for dock in self.all_docks() {
             dock.update(cx, |dock, cx| {
-                if Some(dock.position()) != dock_to_reveal {
-                    if let Some(panel) = dock.active_panel() {
-                        if panel.is_zoomed(window, cx) {
-                            focus_center |=
-                                panel.panel_focus_handle(cx).contains_focused(window, cx);
-                            dock.set_open(false, window, cx);
-                        }
-                    }
+                if Some(dock.position()) != dock_to_reveal
+                    && let Some(panel) = dock.active_panel()
+                    && panel.is_zoomed(window, cx)
+                {
+                    focus_center |= panel.panel_focus_handle(cx).contains_focused(window, cx);
+                    dock.set_open(false, window, cx);
                 }
             });
         }
@@ -3328,10 +3324,10 @@ impl Workspace {
                 .downgrade()
         });
 
-        if let Member::Pane(center_pane) = &self.center.root {
-            if center_pane.read(cx).items_len() == 0 {
-                return self.open_path(path, Some(pane), true, window, cx);
-            }
+        if let Member::Pane(center_pane) = &self.center.root
+            && center_pane.read(cx).items_len() == 0
+        {
+            return self.open_path(path, Some(pane), true, window, cx);
         }
 
         let project_path = path.into();
@@ -3393,10 +3389,10 @@ impl Workspace {
         if let Some(entry_id) = entry_id {
             item = pane.read(cx).item_for_entry(entry_id, cx);
         }
-        if item.is_none() {
-            if let Some(project_path) = project_path {
-                item = pane.read(cx).item_for_path(project_path, cx);
-            }
+        if item.is_none()
+            && let Some(project_path) = project_path
+        {
+            item = pane.read(cx).item_for_path(project_path, cx);
         }
 
         item.and_then(|item| item.downcast::<T>())
@@ -3440,12 +3436,11 @@ impl Workspace {
         let item_id = item.item_id();
         let mut destination_index = None;
         pane.update(cx, |pane, cx| {
-            if PreviewTabsSettings::get_global(cx).enable_preview_from_code_navigation {
-                if let Some(preview_item_id) = pane.preview_item_id() {
-                    if preview_item_id != item_id {
-                        destination_index = pane.close_current_preview_item(window, cx);
-                    }
-                }
+            if PreviewTabsSettings::get_global(cx).enable_preview_from_code_navigation
+                && let Some(preview_item_id) = pane.preview_item_id()
+                && preview_item_id != item_id
+            {
+                destination_index = pane.close_current_preview_item(window, cx);
             }
             pane.set_preview_item_id(Some(item.item_id()), cx)
         });
@@ -3912,10 +3907,10 @@ impl Workspace {
             pane::Event::RemovedItem { item } => {
                 cx.emit(Event::ActiveItemChanged);
                 self.update_window_edited(window, cx);
-                if let hash_map::Entry::Occupied(entry) = self.panes_by_item.entry(item.item_id()) {
-                    if entry.get().entity_id() == pane.entity_id() {
-                        entry.remove();
-                    }
+                if let hash_map::Entry::Occupied(entry) = self.panes_by_item.entry(item.item_id())
+                    && entry.get().entity_id() == pane.entity_id()
+                {
+                    entry.remove();
                 }
             }
             pane::Event::Focus => {
@@ -4105,14 +4100,13 @@ impl Workspace {
 
     pub fn focused_pane(&self, window: &Window, cx: &App) -> Entity<Pane> {
         for dock in self.all_docks() {
-            if dock.focus_handle(cx).contains_focused(window, cx) {
-                if let Some(pane) = dock
+            if dock.focus_handle(cx).contains_focused(window, cx)
+                && let Some(pane) = dock
                     .read(cx)
                     .active_panel()
                     .and_then(|panel| panel.pane(cx))
-                {
-                    return pane;
-                }
+            {
+                return pane;
             }
         }
         self.active_pane().clone()
@@ -4393,10 +4387,10 @@ impl Workspace {
             title.push_str(" ↗");
         }
 
-        if let Some(last_title) = self.last_window_title.as_ref() {
-            if &title == last_title {
-                return;
-            }
+        if let Some(last_title) = self.last_window_title.as_ref()
+            && &title == last_title
+        {
+            return;
         }
         window.set_window_title(&title);
         self.last_window_title = Some(title);
@@ -4575,10 +4569,8 @@ impl Workspace {
                     }
                 })??;
 
-                if should_add_view {
-                    if let Some(view) = update_active_view.view {
-                        Self::add_view_from_leader(this.clone(), leader_id, &view, cx).await?
-                    }
+                if should_add_view && let Some(view) = update_active_view.view {
+                    Self::add_view_from_leader(this.clone(), leader_id, &view, cx).await?
                 }
             }
             proto::update_followers::Variant::UpdateView(update_view) => {
@@ -4774,40 +4766,40 @@ impl Workspace {
         if window.is_window_active() {
             let (active_item, panel_id) = self.active_item_for_followers(window, cx);
 
-            if let Some(item) = active_item {
-                if item.item_focus_handle(cx).contains_focused(window, cx) {
-                    let leader_id = self
-                        .pane_for(&*item)
-                        .and_then(|pane| self.leader_for_pane(&pane));
-                    let leader_peer_id = match leader_id {
-                        Some(CollaboratorId::PeerId(peer_id)) => Some(peer_id),
-                        Some(CollaboratorId::Agent) | None => None,
-                    };
+            if let Some(item) = active_item
+                && item.item_focus_handle(cx).contains_focused(window, cx)
+            {
+                let leader_id = self
+                    .pane_for(&*item)
+                    .and_then(|pane| self.leader_for_pane(&pane));
+                let leader_peer_id = match leader_id {
+                    Some(CollaboratorId::PeerId(peer_id)) => Some(peer_id),
+                    Some(CollaboratorId::Agent) | None => None,
+                };
 
-                    if let Some(item) = item.to_followable_item_handle(cx) {
-                        let id = item
-                            .remote_id(&self.app_state.client, window, cx)
-                            .map(|id| id.to_proto());
+                if let Some(item) = item.to_followable_item_handle(cx) {
+                    let id = item
+                        .remote_id(&self.app_state.client, window, cx)
+                        .map(|id| id.to_proto());
 
-                        if let Some(id) = id {
-                            if let Some(variant) = item.to_state_proto(window, cx) {
-                                let view = Some(proto::View {
-                                    id: id.clone(),
-                                    leader_id: leader_peer_id,
-                                    variant: Some(variant),
-                                    panel_id: panel_id.map(|id| id as i32),
-                                });
+                    if let Some(id) = id
+                        && let Some(variant) = item.to_state_proto(window, cx)
+                    {
+                        let view = Some(proto::View {
+                            id: id.clone(),
+                            leader_id: leader_peer_id,
+                            variant: Some(variant),
+                            panel_id: panel_id.map(|id| id as i32),
+                        });
 
-                                is_project_item = item.is_project_item(window, cx);
-                                update = proto::UpdateActiveView {
-                                    view,
-                                    // TODO: Remove after version 0.145.x stabilizes.
-                                    id,
-                                    leader_id: leader_peer_id,
-                                };
-                            }
+                        is_project_item = item.is_project_item(window, cx);
+                        update = proto::UpdateActiveView {
+                            view,
+                            // TODO: Remove after version 0.145.x stabilizes.
+                            id,
+                            leader_id: leader_peer_id,
                         };
-                    }
+                    };
                 }
             }
         }
@@ -4832,16 +4824,14 @@ impl Workspace {
         let mut active_item = None;
         let mut panel_id = None;
         for dock in self.all_docks() {
-            if dock.focus_handle(cx).contains_focused(window, cx) {
-                if let Some(panel) = dock.read(cx).active_panel() {
-                    if let Some(pane) = panel.pane(cx) {
-                        if let Some(item) = pane.read(cx).active_item() {
-                            active_item = Some(item);
-                            panel_id = panel.remote_id();
-                            break;
-                        }
-                    }
-                }
+            if dock.focus_handle(cx).contains_focused(window, cx)
+                && let Some(panel) = dock.read(cx).active_panel()
+                && let Some(pane) = panel.pane(cx)
+                && let Some(item) = pane.read(cx).active_item()
+            {
+                active_item = Some(item);
+                panel_id = panel.remote_id();
+                break;
             }
         }
 
@@ -4969,10 +4959,10 @@ impl Workspace {
         let state = self.follower_states.get(&peer_id.into())?;
         let mut item_to_activate = None;
         if let (Some(active_view_id), true) = (state.active_view_id, leader_in_this_app) {
-            if let Some(item) = state.items_by_leader_view_id.get(&active_view_id) {
-                if leader_in_this_project || !item.view.is_project_item(window, cx) {
-                    item_to_activate = Some((item.location, item.view.boxed_clone()));
-                }
+            if let Some(item) = state.items_by_leader_view_id.get(&active_view_id)
+                && (leader_in_this_project || !item.view.is_project_item(window, cx))
+            {
+                item_to_activate = Some((item.location, item.view.boxed_clone()));
             }
         } else if let Some(shared_screen) =
             self.shared_screen_for_peer(peer_id, &state.center_pane, window, cx)
@@ -6079,10 +6069,10 @@ fn open_items(
             project_paths_to_open
                 .iter_mut()
                 .for_each(|(_, project_path)| {
-                    if let Some(project_path_to_open) = project_path {
-                        if restored_project_paths.contains(project_path_to_open) {
-                            *project_path = None;
-                        }
+                    if let Some(project_path_to_open) = project_path
+                        && restored_project_paths.contains(project_path_to_open)
+                    {
+                        *project_path = None;
                     }
                 });
         } else {
@@ -6109,24 +6099,24 @@ fn open_items(
                         // We only want to open file paths here. If one of the items
                         // here is a directory, it was already opened further above
                         // with a `find_or_create_worktree`.
-                        if let Ok(task) = abs_path_task {
-                            if task.await.map_or(true, |p| p.is_file()) {
-                                return Some((
-                                    ix,
-                                    workspace
-                                        .update_in(cx, |workspace, window, cx| {
-                                            workspace.open_path(
-                                                file_project_path,
-                                                None,
-                                                true,
-                                                window,
-                                                cx,
-                                            )
-                                        })
-                                        .log_err()?
-                                        .await,
-                                ));
-                            }
+                        if let Ok(task) = abs_path_task
+                            && task.await.map_or(true, |p| p.is_file())
+                        {
+                            return Some((
+                                ix,
+                                workspace
+                                    .update_in(cx, |workspace, window, cx| {
+                                        workspace.open_path(
+                                            file_project_path,
+                                            None,
+                                            true,
+                                            window,
+                                            cx,
+                                        )
+                                    })
+                                    .log_err()?
+                                    .await,
+                            ));
                         }
                         None
                     })
@@ -6728,10 +6718,10 @@ impl WorkspaceStore {
                     .update(cx, |workspace, window, cx| {
                         let handler_response =
                             workspace.handle_follow(follower.project_id, window, cx);
-                        if let Some(active_view) = handler_response.active_view.clone() {
-                            if workspace.project.read(cx).remote_id() == follower.project_id {
-                                response.active_view = Some(active_view)
-                            }
+                        if let Some(active_view) = handler_response.active_view.clone()
+                            && workspace.project.read(cx).remote_id() == follower.project_id
+                        {
+                            response.active_view = Some(active_view)
                         }
                     })
                     .is_ok()
@@ -6965,34 +6955,35 @@ async fn join_channel_internal(
         }
 
         // If you are the first to join a channel, see if you should share your project.
-        if room.remote_participants().is_empty() && !room.local_participant_is_guest() {
-            if let Some(workspace) = requesting_window {
-                let project = workspace.update(cx, |workspace, _, cx| {
-                    let project = workspace.project.read(cx);
+        if room.remote_participants().is_empty()
+            && !room.local_participant_is_guest()
+            && let Some(workspace) = requesting_window
+        {
+            let project = workspace.update(cx, |workspace, _, cx| {
+                let project = workspace.project.read(cx);
 
-                    if !CallSettings::get_global(cx).share_on_join {
-                        return None;
-                    }
-
-                    if (project.is_local() || project.is_via_ssh())
-                        && project.visible_worktrees(cx).any(|tree| {
-                            tree.read(cx)
-                                .root_entry()
-                                .map_or(false, |entry| entry.is_dir())
-                        })
-                    {
-                        Some(workspace.project.clone())
-                    } else {
-                        None
-                    }
-                });
-                if let Ok(Some(project)) = project {
-                    return Some(cx.spawn(async move |room, cx| {
-                        room.update(cx, |room, cx| room.share_project(project, cx))?
-                            .await?;
-                        Ok(())
-                    }));
+                if !CallSettings::get_global(cx).share_on_join {
+                    return None;
                 }
+
+                if (project.is_local() || project.is_via_ssh())
+                    && project.visible_worktrees(cx).any(|tree| {
+                        tree.read(cx)
+                            .root_entry()
+                            .map_or(false, |entry| entry.is_dir())
+                    })
+                {
+                    Some(workspace.project.clone())
+                } else {
+                    None
+                }
+            });
+            if let Ok(Some(project)) = project {
+                return Some(cx.spawn(async move |room, cx| {
+                    room.update(cx, |room, cx| room.share_project(project, cx))?
+                        .await?;
+                    Ok(())
+                }));
             }
         }
 
@@ -7189,35 +7180,35 @@ pub fn open_paths(
                 }
             })?;
 
-            if open_options.open_new_workspace.is_none() && existing.is_none() {
-                if all_metadatas.iter().all(|file| !file.is_dir) {
-                    cx.update(|cx| {
-                        if let Some(window) = cx
-                            .active_window()
-                            .and_then(|window| window.downcast::<Workspace>())
-                        {
-                            if let Ok(workspace) = window.read(cx) {
-                                let project = workspace.project().read(cx);
-                                if project.is_local() && !project.is_via_collab() {
-                                    existing = Some(window);
-                                    open_visible = OpenVisible::None;
-                                    return;
-                                }
-                            }
+            if open_options.open_new_workspace.is_none()
+                && existing.is_none()
+                && all_metadatas.iter().all(|file| !file.is_dir)
+            {
+                cx.update(|cx| {
+                    if let Some(window) = cx
+                        .active_window()
+                        .and_then(|window| window.downcast::<Workspace>())
+                        && let Ok(workspace) = window.read(cx)
+                    {
+                        let project = workspace.project().read(cx);
+                        if project.is_local() && !project.is_via_collab() {
+                            existing = Some(window);
+                            open_visible = OpenVisible::None;
+                            return;
                         }
-                        for window in local_workspace_windows(cx) {
-                            if let Ok(workspace) = window.read(cx) {
-                                let project = workspace.project().read(cx);
-                                if project.is_via_collab() {
-                                    continue;
-                                }
-                                existing = Some(window);
-                                open_visible = OpenVisible::None;
-                                break;
+                    }
+                    for window in local_workspace_windows(cx) {
+                        if let Ok(workspace) = window.read(cx) {
+                            let project = workspace.project().read(cx);
+                            if project.is_via_collab() {
+                                continue;
                             }
+                            existing = Some(window);
+                            open_visible = OpenVisible::None;
+                            break;
                         }
-                    })?;
-                }
+                    }
+                })?;
             }
         }
 
@@ -7651,10 +7642,9 @@ pub fn reload(cx: &mut App) {
         for window in workspace_windows {
             if let Ok(should_close) = window.update(cx, |workspace, window, cx| {
                 workspace.prepare_to_close(CloseIntent::Quit, window, cx)
-            }) {
-                if !should_close.await? {
-                    return Ok(());
-                }
+            }) && !should_close.await?
+            {
+                return Ok(());
             }
         }
         cx.update(|cx| cx.restart())
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 4a8c9d4666..5635347514 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -282,19 +282,17 @@ impl Settings for WorkspaceSettings {
         if vscode
             .read_bool("accessibility.dimUnfocused.enabled")
             .unwrap_or_default()
-        {
-            if let Some(opacity) = vscode
+            && let Some(opacity) = vscode
                 .read_value("accessibility.dimUnfocused.opacity")
                 .and_then(|v| v.as_f64())
-            {
-                if let Some(settings) = current.active_pane_modifiers.as_mut() {
-                    settings.inactive_opacity = Some(opacity as f32)
-                } else {
-                    current.active_pane_modifiers = Some(ActivePanelModifiers {
-                        inactive_opacity: Some(opacity as f32),
-                        ..Default::default()
-                    })
-                }
+        {
+            if let Some(settings) = current.active_pane_modifiers.as_mut() {
+                settings.inactive_opacity = Some(opacity as f32)
+            } else {
+                current.active_pane_modifiers = Some(ActivePanelModifiers {
+                    inactive_opacity: Some(opacity as f32),
+                    ..Default::default()
+                })
             }
         }
 
@@ -345,13 +343,11 @@ impl Settings for WorkspaceSettings {
             .read_value("workbench.editor.limit.value")
             .and_then(|v| v.as_u64())
             .and_then(|n| NonZeroUsize::new(n as usize))
-        {
-            if vscode
+            && vscode
                 .read_bool("workbench.editor.limit.enabled")
                 .unwrap_or_default()
-            {
-                current.max_tabs = Some(n)
-            }
+        {
+            current.max_tabs = Some(n)
         }
 
         // some combination of "window.restoreWindows" and "workbench.startupEditor" might
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index f110726afd..9e1832721f 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -1522,10 +1522,10 @@ impl LocalWorktree {
             //       reasonable limit
             {
                 const FILE_SIZE_MAX: u64 = 6 * 1024 * 1024 * 1024; // 6GB
-                if let Ok(Some(metadata)) = fs.metadata(&abs_path).await {
-                    if metadata.len >= FILE_SIZE_MAX {
-                        anyhow::bail!("File is too large to load");
-                    }
+                if let Ok(Some(metadata)) = fs.metadata(&abs_path).await
+                    && metadata.len >= FILE_SIZE_MAX
+                {
+                    anyhow::bail!("File is too large to load");
                 }
             }
             let text = fs.load(&abs_path).await?;
@@ -2503,10 +2503,10 @@ impl Snapshot {
             if let Some(PathEntry { path, .. }) = self.entries_by_id.get(&entry.id, &()) {
                 entries_by_path_edits.push(Edit::Remove(PathKey(path.clone())));
             }
-            if let Some(old_entry) = self.entries_by_path.get(&PathKey(entry.path.clone()), &()) {
-                if old_entry.id != entry.id {
-                    entries_by_id_edits.push(Edit::Remove(old_entry.id));
-                }
+            if let Some(old_entry) = self.entries_by_path.get(&PathKey(entry.path.clone()), &())
+                && old_entry.id != entry.id
+            {
+                entries_by_id_edits.push(Edit::Remove(old_entry.id));
             }
             entries_by_id_edits.push(Edit::Insert(PathEntry {
                 id: entry.id,
@@ -2747,20 +2747,19 @@ impl LocalSnapshot {
             }
         }
 
-        if entry.kind == EntryKind::PendingDir {
-            if let Some(existing_entry) =
+        if entry.kind == EntryKind::PendingDir
+            && let Some(existing_entry) =
                 self.entries_by_path.get(&PathKey(entry.path.clone()), &())
-            {
-                entry.kind = existing_entry.kind;
-            }
+        {
+            entry.kind = existing_entry.kind;
         }
 
         let scan_id = self.scan_id;
         let removed = self.entries_by_path.insert_or_replace(entry.clone(), &());
-        if let Some(removed) = removed {
-            if removed.id != entry.id {
-                self.entries_by_id.remove(&removed.id, &());
-            }
+        if let Some(removed) = removed
+            && removed.id != entry.id
+        {
+            self.entries_by_id.remove(&removed.id, &());
         }
         self.entries_by_id.insert_or_replace(
             PathEntry {
@@ -4138,13 +4137,13 @@ impl BackgroundScanner {
             let root_path = state.snapshot.abs_path.clone();
             for path in paths {
                 for ancestor in path.ancestors() {
-                    if let Some(entry) = state.snapshot.entry_for_path(ancestor) {
-                        if entry.kind == EntryKind::UnloadedDir {
-                            let abs_path = root_path.as_path().join(ancestor);
-                            state.enqueue_scan_dir(abs_path.into(), entry, &scan_job_tx);
-                            state.paths_to_scan.insert(path.clone());
-                            break;
-                        }
+                    if let Some(entry) = state.snapshot.entry_for_path(ancestor)
+                        && entry.kind == EntryKind::UnloadedDir
+                    {
+                        let abs_path = root_path.as_path().join(ancestor);
+                        state.enqueue_scan_dir(abs_path.into(), entry, &scan_job_tx);
+                        state.paths_to_scan.insert(path.clone());
+                        break;
                     }
                 }
             }
@@ -4214,11 +4213,10 @@ impl BackgroundScanner {
                                 // Recursively load directories from the file system.
                                 job = scan_jobs_rx.recv().fuse() => {
                                     let Ok(job) = job else { break };
-                                    if let Err(err) = self.scan_dir(&job).await {
-                                        if job.path.as_ref() != Path::new("") {
+                                    if let Err(err) = self.scan_dir(&job).await
+                                        && job.path.as_ref() != Path::new("") {
                                             log::error!("error scanning directory {:?}: {}", job.abs_path, err);
                                         }
-                                    }
                                 }
                             }
                         }
@@ -4554,18 +4552,18 @@ impl BackgroundScanner {
 
                     state.insert_entry(fs_entry.clone(), self.fs.as_ref(), self.watcher.as_ref());
 
-                    if path.as_ref() == Path::new("") {
-                        if let Some((ignores, repo)) = new_ancestor_repo.take() {
-                            log::trace!("updating ancestor git repository");
-                            state.snapshot.ignores_by_parent_abs_path.extend(ignores);
-                            if let Some((ancestor_dot_git, work_directory)) = repo {
-                                state.insert_git_repository_for_path(
-                                    work_directory,
-                                    ancestor_dot_git.as_path().into(),
-                                    self.fs.as_ref(),
-                                    self.watcher.as_ref(),
-                                );
-                            }
+                    if path.as_ref() == Path::new("")
+                        && let Some((ignores, repo)) = new_ancestor_repo.take()
+                    {
+                        log::trace!("updating ancestor git repository");
+                        state.snapshot.ignores_by_parent_abs_path.extend(ignores);
+                        if let Some((ancestor_dot_git, work_directory)) = repo {
+                            state.insert_git_repository_for_path(
+                                work_directory,
+                                ancestor_dot_git.as_path().into(),
+                                self.fs.as_ref(),
+                                self.watcher.as_ref(),
+                            );
                         }
                     }
                 }
@@ -4590,13 +4588,12 @@ impl BackgroundScanner {
         if !path
             .components()
             .any(|component| component.as_os_str() == *DOT_GIT)
+            && let Some(local_repo) = snapshot.local_repo_for_work_directory_path(path)
         {
-            if let Some(local_repo) = snapshot.local_repo_for_work_directory_path(path) {
-                let id = local_repo.work_directory_id;
-                log::debug!("remove repo path: {:?}", path);
-                snapshot.git_repositories.remove(&id);
-                return Some(());
-            }
+            let id = local_repo.work_directory_id;
+            log::debug!("remove repo path: {:?}", path);
+            snapshot.git_repositories.remove(&id);
+            return Some(());
         }
 
         Some(())
@@ -4738,10 +4735,10 @@ impl BackgroundScanner {
 
         let state = &mut self.state.lock();
         for edit in &entries_by_path_edits {
-            if let Edit::Insert(entry) = edit {
-                if let Err(ix) = state.changed_paths.binary_search(&entry.path) {
-                    state.changed_paths.insert(ix, entry.path.clone());
-                }
+            if let Edit::Insert(entry) = edit
+                && let Err(ix) = state.changed_paths.binary_search(&entry.path)
+            {
+                state.changed_paths.insert(ix, entry.path.clone());
             }
         }
 
@@ -5287,13 +5284,12 @@ impl<'a> Traversal<'a> {
         while let Some(entry) = self.cursor.item() {
             self.cursor
                 .seek_forward(&TraversalTarget::successor(&entry.path), Bias::Left);
-            if let Some(entry) = self.cursor.item() {
-                if (self.include_files || !entry.is_file())
-                    && (self.include_dirs || !entry.is_dir())
-                    && (self.include_ignored || !entry.is_ignored || entry.is_always_included)
-                {
-                    return true;
-                }
+            if let Some(entry) = self.cursor.item()
+                && (self.include_files || !entry.is_file())
+                && (self.include_dirs || !entry.is_dir())
+                && (self.include_ignored || !entry.is_ignored || entry.is_always_included)
+            {
+                return true;
             }
         }
         false
@@ -5437,11 +5433,11 @@ impl<'a> Iterator for ChildEntriesIter<'a> {
     type Item = &'a Entry;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if let Some(item) = self.traversal.entry() {
-            if item.path.starts_with(self.parent_path) {
-                self.traversal.advance_to_sibling();
-                return Some(item);
-            }
+        if let Some(item) = self.traversal.entry()
+            && item.path.starts_with(self.parent_path)
+        {
+            self.traversal.advance_to_sibling();
+            return Some(item);
         }
         None
     }
@@ -5564,12 +5560,10 @@ fn discover_git_paths(dot_git_abs_path: &Arc<Path>, fs: &dyn Fs) -> (Arc<Path>,
             repository_dir_abs_path = Path::new(&path).into();
             common_dir_abs_path = repository_dir_abs_path.clone();
             if let Some(commondir_contents) = smol::block_on(fs.load(&path.join("commondir"))).ok()
-            {
-                if let Some(commondir_path) =
+                && let Some(commondir_path) =
                     smol::block_on(fs.canonicalize(&path.join(commondir_contents.trim()))).log_err()
-                {
-                    common_dir_abs_path = commondir_path.as_path().into();
-                }
+            {
+                common_dir_abs_path = commondir_path.as_path().into();
             }
         }
     };
diff --git a/crates/zed/build.rs b/crates/zed/build.rs
index eb18617add..c6d943a459 100644
--- a/crates/zed/build.rs
+++ b/crates/zed/build.rs
@@ -23,22 +23,20 @@ fn main() {
         "cargo:rustc-env=TARGET={}",
         std::env::var("TARGET").unwrap()
     );
-    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
-        if output.status.success() {
-            let git_sha = String::from_utf8_lossy(&output.stdout);
-            let git_sha = git_sha.trim();
+    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output()
+        && output.status.success()
+    {
+        let git_sha = String::from_utf8_lossy(&output.stdout);
+        let git_sha = git_sha.trim();
 
-            println!("cargo:rustc-env=ZED_COMMIT_SHA={git_sha}");
+        println!("cargo:rustc-env=ZED_COMMIT_SHA={git_sha}");
 
-            if let Ok(build_profile) = std::env::var("PROFILE") {
-                if build_profile == "release" {
-                    // This is currently the best way to make `cargo build ...`'s build script
-                    // to print something to stdout without extra verbosity.
-                    println!(
-                        "cargo:warning=Info: using '{git_sha}' hash for ZED_COMMIT_SHA env var"
-                    );
-                }
-            }
+        if let Ok(build_profile) = std::env::var("PROFILE")
+            && build_profile == "release"
+        {
+            // This is currently the best way to make `cargo build ...`'s build script
+            // to print something to stdout without extra verbosity.
+            println!("cargo:warning=Info: using '{git_sha}' hash for ZED_COMMIT_SHA env var");
         }
     }
 
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index a66b30c44a..df30d4dd7b 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -1026,18 +1026,18 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
             // Try to find an active workspace to show the toast
             let toast_shown = cx
                 .update(|cx| {
-                    if let Some(window) = cx.active_window() {
-                        if let Some(workspace) = window.downcast::<Workspace>() {
-                            workspace
-                                .update(cx, |workspace, _, cx| {
-                                    workspace.show_toast(
-                                        Toast::new(NotificationId::unique::<()>(), message),
-                                        cx,
-                                    )
-                                })
-                                .ok();
-                            return true;
-                        }
+                    if let Some(window) = cx.active_window()
+                        && let Some(workspace) = window.downcast::<Workspace>()
+                    {
+                        workspace
+                            .update(cx, |workspace, _, cx| {
+                                workspace.show_toast(
+                                    Toast::new(NotificationId::unique::<()>(), message),
+                                    cx,
+                                )
+                            })
+                            .ok();
+                        return true;
                     }
                     false
                 })
@@ -1117,10 +1117,8 @@ pub(crate) async fn restorable_workspace_locations(
 
                 // Since last_session_window_order returns the windows ordered front-to-back
                 // we need to open the window that was frontmost last.
-                if ordered {
-                    if let Some(locations) = locations.as_mut() {
-                        locations.reverse();
-                    }
+                if ordered && let Some(locations) = locations.as_mut() {
+                    locations.reverse();
                 }
 
                 locations
@@ -1290,21 +1288,21 @@ fn eager_load_active_theme_and_icon_theme(fs: Arc<dyn Fs>, cx: &App) {
 
     if let Some(theme_selection) = theme_settings.theme_selection.as_ref() {
         let theme_name = theme_selection.theme(appearance);
-        if matches!(theme_registry.get(theme_name), Err(ThemeNotFoundError(_))) {
-            if let Some(theme_path) = extension_store.read(cx).path_to_extension_theme(theme_name) {
-                cx.spawn({
-                    let theme_registry = theme_registry.clone();
-                    let fs = fs.clone();
-                    async move |cx| {
-                        theme_registry.load_user_theme(&theme_path, fs).await?;
+        if matches!(theme_registry.get(theme_name), Err(ThemeNotFoundError(_)))
+            && let Some(theme_path) = extension_store.read(cx).path_to_extension_theme(theme_name)
+        {
+            cx.spawn({
+                let theme_registry = theme_registry.clone();
+                let fs = fs.clone();
+                async move |cx| {
+                    theme_registry.load_user_theme(&theme_path, fs).await?;
 
-                        cx.update(|cx| {
-                            ThemeSettings::reload_current_theme(cx);
-                        })
-                    }
-                })
-                .detach_and_log_err(cx);
-            }
+                    cx.update(|cx| {
+                        ThemeSettings::reload_current_theme(cx);
+                    })
+                }
+            })
+            .detach_and_log_err(cx);
         }
     }
 
@@ -1313,26 +1311,24 @@ fn eager_load_active_theme_and_icon_theme(fs: Arc<dyn Fs>, cx: &App) {
         if matches!(
             theme_registry.get_icon_theme(icon_theme_name),
             Err(IconThemeNotFoundError(_))
-        ) {
-            if let Some((icon_theme_path, icons_root_path)) = extension_store
-                .read(cx)
-                .path_to_extension_icon_theme(icon_theme_name)
-            {
-                cx.spawn({
-                    let theme_registry = theme_registry.clone();
-                    let fs = fs.clone();
-                    async move |cx| {
-                        theme_registry
-                            .load_icon_theme(&icon_theme_path, &icons_root_path, fs)
-                            .await?;
+        ) && let Some((icon_theme_path, icons_root_path)) = extension_store
+            .read(cx)
+            .path_to_extension_icon_theme(icon_theme_name)
+        {
+            cx.spawn({
+                let theme_registry = theme_registry.clone();
+                let fs = fs.clone();
+                async move |cx| {
+                    theme_registry
+                        .load_icon_theme(&icon_theme_path, &icons_root_path, fs)
+                        .await?;
 
-                        cx.update(|cx| {
-                            ThemeSettings::reload_current_icon_theme(cx);
-                        })
-                    }
-                })
-                .detach_and_log_err(cx);
-            }
+                    cx.update(|cx| {
+                        ThemeSettings::reload_current_icon_theme(cx);
+                    })
+                }
+            })
+            .detach_and_log_err(cx);
         }
     }
 }
@@ -1381,18 +1377,15 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut App) {
 
         while let Some(paths) = events.next().await {
             for event in paths {
-                if fs.metadata(&event.path).await.ok().flatten().is_some() {
-                    if let Some(theme_registry) =
+                if fs.metadata(&event.path).await.ok().flatten().is_some()
+                    && let Some(theme_registry) =
                         cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
-                    {
-                        if let Some(()) = theme_registry
-                            .load_user_theme(&event.path, fs.clone())
-                            .await
-                            .log_err()
-                        {
-                            cx.update(ThemeSettings::reload_current_theme).log_err();
-                        }
-                    }
+                    && let Some(()) = theme_registry
+                        .load_user_theme(&event.path, fs.clone())
+                        .await
+                        .log_err()
+                {
+                    cx.update(ThemeSettings::reload_current_theme).log_err();
                 }
             }
         }
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index f2e65b4f53..cbd31c2e26 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -146,19 +146,17 @@ pub fn init_panic_hook(
         }
         zlog::flush();
 
-        if !is_pty {
-            if let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err() {
-                let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
-                let panic_file_path = paths::logs_dir().join(format!("zed-{timestamp}.panic"));
-                let panic_file = fs::OpenOptions::new()
-                    .write(true)
-                    .create_new(true)
-                    .open(&panic_file_path)
-                    .log_err();
-                if let Some(mut panic_file) = panic_file {
-                    writeln!(&mut panic_file, "{panic_data_json}").log_err();
-                    panic_file.flush().log_err();
-                }
+        if !is_pty && let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err() {
+            let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
+            let panic_file_path = paths::logs_dir().join(format!("zed-{timestamp}.panic"));
+            let panic_file = fs::OpenOptions::new()
+                .write(true)
+                .create_new(true)
+                .open(&panic_file_path)
+                .log_err();
+            if let Some(mut panic_file) = panic_file {
+                writeln!(&mut panic_file, "{panic_data_json}").log_err();
+                panic_file.flush().log_err();
             }
         }
 
@@ -459,10 +457,10 @@ pub fn monitor_main_thread_hangs(
                         continue;
                     };
 
-                    if let Some(response) = http_client.send(request).await.log_err() {
-                        if response.status() != 200 {
-                            log::error!("Failed to send hang report: HTTP {:?}", response.status());
-                        }
+                    if let Some(response) = http_client.send(request).await.log_err()
+                        && response.status() != 200
+                    {
+                        log::error!("Failed to send hang report: HTTP {:?}", response.status());
                     }
                 }
             }
@@ -563,8 +561,8 @@ pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::
         }
         let mut json_path = child_path.clone();
         json_path.set_extension("json");
-        if let Ok(metadata) = serde_json::from_slice(&smol::fs::read(&json_path).await?) {
-            if upload_minidump(
+        if let Ok(metadata) = serde_json::from_slice(&smol::fs::read(&json_path).await?)
+            && upload_minidump(
                 http.clone(),
                 minidump_endpoint,
                 smol::fs::read(&child_path)
@@ -575,10 +573,9 @@ pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::
             .await
             .log_err()
             .is_some()
-            {
-                fs::remove_file(child_path).ok();
-                fs::remove_file(json_path).ok();
-            }
+        {
+            fs::remove_file(child_path).ok();
+            fs::remove_file(json_path).ok();
         }
     }
     Ok(())
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 535cb12e1a..93a62afc6f 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1054,27 +1054,25 @@ fn quit(_: &Quit, cx: &mut App) {
         })
         .log_err();
 
-        if should_confirm {
-            if let Some(workspace) = workspace_windows.first() {
-                let answer = workspace
-                    .update(cx, |_, window, cx| {
-                        window.prompt(
-                            PromptLevel::Info,
-                            "Are you sure you want to quit?",
-                            None,
-                            &["Quit", "Cancel"],
-                            cx,
-                        )
-                    })
-                    .log_err();
+        if should_confirm && let Some(workspace) = workspace_windows.first() {
+            let answer = workspace
+                .update(cx, |_, window, cx| {
+                    window.prompt(
+                        PromptLevel::Info,
+                        "Are you sure you want to quit?",
+                        None,
+                        &["Quit", "Cancel"],
+                        cx,
+                    )
+                })
+                .log_err();
 
-                if let Some(answer) = answer {
-                    WAITING_QUIT_CONFIRMATION.store(true, atomic::Ordering::Release);
-                    let answer = answer.await.ok();
-                    WAITING_QUIT_CONFIRMATION.store(false, atomic::Ordering::Release);
-                    if answer != Some(0) {
-                        return Ok(());
-                    }
+            if let Some(answer) = answer {
+                WAITING_QUIT_CONFIRMATION.store(true, atomic::Ordering::Release);
+                let answer = answer.await.ok();
+                WAITING_QUIT_CONFIRMATION.store(false, atomic::Ordering::Release);
+                if answer != Some(0) {
+                    return Ok(());
                 }
             }
         }
@@ -1086,10 +1084,9 @@ fn quit(_: &Quit, cx: &mut App) {
                     workspace.prepare_to_close(CloseIntent::Quit, window, cx)
                 })
                 .log_err()
+                && !should_close.await?
             {
-                if !should_close.await? {
-                    return Ok(());
-                }
+                return Ok(());
             }
         }
         cx.update(|cx| cx.quit())?;
@@ -1633,15 +1630,15 @@ fn open_local_file(
             };
 
             if !file_exists {
-                if let Some(dir_path) = settings_relative_path.parent() {
-                    if worktree.read_with(cx, |tree, _| tree.entry_for_path(dir_path).is_none())? {
-                        project
-                            .update(cx, |project, cx| {
-                                project.create_entry((tree_id, dir_path), true, cx)
-                            })?
-                            .await
-                            .context("worktree was removed")?;
-                    }
+                if let Some(dir_path) = settings_relative_path.parent()
+                    && worktree.read_with(cx, |tree, _| tree.entry_for_path(dir_path).is_none())?
+                {
+                    project
+                        .update(cx, |project, cx| {
+                            project.create_entry((tree_id, dir_path), true, cx)
+                        })?
+                        .await
+                        .context("worktree was removed")?;
                 }
 
                 if worktree.read_with(cx, |tree, _| {
@@ -1667,12 +1664,12 @@ fn open_local_file(
             editor
                 .downgrade()
                 .update(cx, |editor, cx| {
-                    if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                        if buffer.read(cx).is_empty() {
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.edit([(0..0, initial_contents)], None, cx)
-                            });
-                        }
+                    if let Some(buffer) = editor.buffer().read(cx).as_singleton()
+                        && buffer.read(cx).is_empty()
+                    {
+                        buffer.update(cx, |buffer, cx| {
+                            buffer.edit([(0..0, initial_contents)], None, cx)
+                        });
                     }
                 })
                 .ok();
diff --git a/crates/zed/src/zed/component_preview.rs b/crates/zed/src/zed/component_preview.rs
index 915c40030a..d855fc3af7 100644
--- a/crates/zed/src/zed/component_preview.rs
+++ b/crates/zed/src/zed/component_preview.rs
@@ -318,25 +318,25 @@ impl ComponentPreview {
             let lowercase_scope = scope_name.to_lowercase();
             let lowercase_desc = description.to_lowercase();
 
-            if lowercase_scopeless.contains(&lowercase_filter) {
-                if let Some(index) = lowercase_scopeless.find(&lowercase_filter) {
-                    let end = index + lowercase_filter.len();
+            if lowercase_scopeless.contains(&lowercase_filter)
+                && let Some(index) = lowercase_scopeless.find(&lowercase_filter)
+            {
+                let end = index + lowercase_filter.len();
 
-                    if end <= scopeless_name.len() {
-                        let mut positions = Vec::new();
-                        for i in index..end {
-                            if scopeless_name.is_char_boundary(i) {
-                                positions.push(i);
-                            }
+                if end <= scopeless_name.len() {
+                    let mut positions = Vec::new();
+                    for i in index..end {
+                        if scopeless_name.is_char_boundary(i) {
+                            positions.push(i);
                         }
+                    }
 
-                        if !positions.is_empty() {
-                            scope_groups
-                                .entry(component.scope())
-                                .or_insert_with(Vec::new)
-                                .push((component.clone(), Some(positions)));
-                            continue;
-                        }
+                    if !positions.is_empty() {
+                        scope_groups
+                            .entry(component.scope())
+                            .or_insert_with(Vec::new)
+                            .push((component.clone(), Some(positions)));
+                        continue;
                     }
                 }
             }
@@ -372,32 +372,32 @@ impl ComponentPreview {
         scopes.sort_by_key(|s| s.to_string());
 
         for scope in scopes {
-            if let Some(components) = scope_groups.remove(&scope) {
-                if !components.is_empty() {
-                    entries.push(PreviewEntry::Separator);
-                    entries.push(PreviewEntry::SectionHeader(scope.to_string().into()));
+            if let Some(components) = scope_groups.remove(&scope)
+                && !components.is_empty()
+            {
+                entries.push(PreviewEntry::Separator);
+                entries.push(PreviewEntry::SectionHeader(scope.to_string().into()));
 
-                    let mut sorted_components = components;
-                    sorted_components.sort_by_key(|(component, _)| component.sort_name());
+                let mut sorted_components = components;
+                sorted_components.sort_by_key(|(component, _)| component.sort_name());
 
-                    for (component, positions) in sorted_components {
-                        entries.push(PreviewEntry::Component(component, positions));
-                    }
+                for (component, positions) in sorted_components {
+                    entries.push(PreviewEntry::Component(component, positions));
                 }
             }
         }
 
         // Add uncategorized components last
-        if let Some(components) = scope_groups.get(&ComponentScope::None) {
-            if !components.is_empty() {
-                entries.push(PreviewEntry::Separator);
-                entries.push(PreviewEntry::SectionHeader("Uncategorized".into()));
-                let mut sorted_components = components.clone();
-                sorted_components.sort_by_key(|(c, _)| c.sort_name());
+        if let Some(components) = scope_groups.get(&ComponentScope::None)
+            && !components.is_empty()
+        {
+            entries.push(PreviewEntry::Separator);
+            entries.push(PreviewEntry::SectionHeader("Uncategorized".into()));
+            let mut sorted_components = components.clone();
+            sorted_components.sort_by_key(|(c, _)| c.sort_name());
 
-                for (component, positions) in sorted_components {
-                    entries.push(PreviewEntry::Component(component, positions));
-                }
+            for (component, positions) in sorted_components {
+                entries.push(PreviewEntry::Component(component, positions));
             }
         }
 
@@ -415,19 +415,20 @@ impl ComponentPreview {
 
         let filtered_components = self.filtered_components();
 
-        if !self.filter_text.is_empty() && !matches!(self.active_page, PreviewPage::AllComponents) {
-            if let PreviewPage::Component(ref component_id) = self.active_page {
-                let component_still_visible = filtered_components
-                    .iter()
-                    .any(|component| component.id() == *component_id);
+        if !self.filter_text.is_empty()
+            && !matches!(self.active_page, PreviewPage::AllComponents)
+            && let PreviewPage::Component(ref component_id) = self.active_page
+        {
+            let component_still_visible = filtered_components
+                .iter()
+                .any(|component| component.id() == *component_id);
 
-                if !component_still_visible {
-                    if !filtered_components.is_empty() {
-                        let first_component = &filtered_components[0];
-                        self.set_active_page(PreviewPage::Component(first_component.id()), cx);
-                    } else {
-                        self.set_active_page(PreviewPage::AllComponents, cx);
-                    }
+            if !component_still_visible {
+                if !filtered_components.is_empty() {
+                    let first_component = &filtered_components[0];
+                    self.set_active_page(PreviewPage::Component(first_component.id()), cx);
+                } else {
+                    self.set_active_page(PreviewPage::AllComponents, cx);
                 }
             }
         }
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index 587786fe8f..8d12a5bfad 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -204,12 +204,12 @@ fn assign_edit_prediction_provider(
         }
         EditPredictionProvider::Copilot => {
             if let Some(copilot) = Copilot::global(cx) {
-                if let Some(buffer) = singleton_buffer {
-                    if buffer.read(cx).file().is_some() {
-                        copilot.update(cx, |copilot, cx| {
-                            copilot.register_buffer(&buffer, cx);
-                        });
-                    }
+                if let Some(buffer) = singleton_buffer
+                    && buffer.read(cx).file().is_some()
+                {
+                    copilot.update(cx, |copilot, cx| {
+                        copilot.register_buffer(&buffer, cx);
+                    });
                 }
                 let provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
                 editor.set_edit_prediction_provider(Some(provider), window, cx);
@@ -225,15 +225,15 @@ fn assign_edit_prediction_provider(
             if user_store.read(cx).current_user().is_some() {
                 let mut worktree = None;
 
-                if let Some(buffer) = &singleton_buffer {
-                    if let Some(file) = buffer.read(cx).file() {
-                        let id = file.worktree_id(cx);
-                        if let Some(inner_worktree) = editor
-                            .project()
-                            .and_then(|project| project.read(cx).worktree_for_id(id, cx))
-                        {
-                            worktree = Some(inner_worktree);
-                        }
+                if let Some(buffer) = &singleton_buffer
+                    && let Some(file) = buffer.read(cx).file()
+                {
+                    let id = file.worktree_id(cx);
+                    if let Some(inner_worktree) = editor
+                        .project()
+                        .and_then(|project| project.read(cx).worktree_for_id(id, cx))
+                    {
+                        worktree = Some(inner_worktree);
                     }
                 }
 
@@ -245,12 +245,12 @@ fn assign_edit_prediction_provider(
                 let zeta =
                     zeta::Zeta::register(workspace, worktree, client.clone(), user_store, cx);
 
-                if let Some(buffer) = &singleton_buffer {
-                    if buffer.read(cx).file().is_some() {
-                        zeta.update(cx, |zeta, cx| {
-                            zeta.register_buffer(buffer, cx);
-                        });
-                    }
+                if let Some(buffer) = &singleton_buffer
+                    && buffer.read(cx).file().is_some()
+                {
+                    zeta.update(cx, |zeta, cx| {
+                        zeta.register_buffer(buffer, cx);
+                    });
                 }
 
                 let data_collection =
diff --git a/crates/zed/src/zed/mac_only_instance.rs b/crates/zed/src/zed/mac_only_instance.rs
index 716c2224e3..cb9641e9df 100644
--- a/crates/zed/src/zed/mac_only_instance.rs
+++ b/crates/zed/src/zed/mac_only_instance.rs
@@ -37,20 +37,19 @@ fn address() -> SocketAddr {
     let mut user_port = port;
     let mut sys = System::new_all();
     sys.refresh_all();
-    if let Ok(current_pid) = sysinfo::get_current_pid() {
-        if let Some(uid) = sys
+    if let Ok(current_pid) = sysinfo::get_current_pid()
+        && let Some(uid) = sys
             .process(current_pid)
             .and_then(|process| process.user_id())
-        {
-            let uid_u32 = get_uid_as_u32(uid);
-            // Ensure that the user ID is not too large to avoid overflow when
-            // calculating the port number. This seems unlikely but it doesn't
-            // hurt to be safe.
-            let max_port = 65535;
-            let max_uid: u32 = max_port - port as u32;
-            let wrapped_uid: u16 = (uid_u32 % max_uid) as u16;
-            user_port += wrapped_uid;
-        }
+    {
+        let uid_u32 = get_uid_as_u32(uid);
+        // Ensure that the user ID is not too large to avoid overflow when
+        // calculating the port number. This seems unlikely but it doesn't
+        // hurt to be safe.
+        let max_port = 65535;
+        let max_uid: u32 = max_port - port as u32;
+        let wrapped_uid: u16 = (uid_u32 % max_uid) as u16;
+        user_port += wrapped_uid;
     }
 
     SocketAddr::V4(SocketAddrV4::new(LOCALHOST, user_port))
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index f282860e2c..5baf76b64c 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -123,26 +123,24 @@ impl OpenRequest {
 
     fn parse_request_path(&mut self, request_path: &str) -> Result<()> {
         let mut parts = request_path.split('/');
-        if parts.next() == Some("channel") {
-            if let Some(slug) = parts.next() {
-                if let Some(id_str) = slug.split('-').next_back() {
-                    if let Ok(channel_id) = id_str.parse::<u64>() {
-                        let Some(next) = parts.next() else {
-                            self.join_channel = Some(channel_id);
-                            return Ok(());
-                        };
+        if parts.next() == Some("channel")
+            && let Some(slug) = parts.next()
+            && let Some(id_str) = slug.split('-').next_back()
+            && let Ok(channel_id) = id_str.parse::<u64>()
+        {
+            let Some(next) = parts.next() else {
+                self.join_channel = Some(channel_id);
+                return Ok(());
+            };
 
-                        if let Some(heading) = next.strip_prefix("notes#") {
-                            self.open_channel_notes
-                                .push((channel_id, Some(heading.to_string())));
-                            return Ok(());
-                        }
-                        if next == "notes" {
-                            self.open_channel_notes.push((channel_id, None));
-                            return Ok(());
-                        }
-                    }
-                }
+            if let Some(heading) = next.strip_prefix("notes#") {
+                self.open_channel_notes
+                    .push((channel_id, Some(heading.to_string())));
+                return Ok(());
+            }
+            if next == "notes" {
+                self.open_channel_notes.push((channel_id, None));
+                return Ok(());
             }
         }
         anyhow::bail!("invalid zed url: {request_path}")
@@ -181,10 +179,10 @@ pub fn listen_for_cli_connections(opener: OpenListener) -> Result<()> {
 
     let sock_path = paths::data_dir().join(format!("zed-{}.sock", *RELEASE_CHANNEL_NAME));
     // remove the socket if the process listening on it has died
-    if let Err(e) = UnixDatagram::unbound()?.connect(&sock_path) {
-        if e.kind() == std::io::ErrorKind::ConnectionRefused {
-            std::fs::remove_file(&sock_path)?;
-        }
+    if let Err(e) = UnixDatagram::unbound()?.connect(&sock_path)
+        && e.kind() == std::io::ErrorKind::ConnectionRefused
+    {
+        std::fs::remove_file(&sock_path)?;
     }
     let listener = UnixDatagram::bind(&sock_path)?;
     thread::spawn(move || {
@@ -244,12 +242,12 @@ pub async fn open_paths_with_positions(
         .iter()
         .map(|path_with_position| {
             let path = path_with_position.path.clone();
-            if let Some(row) = path_with_position.row {
-                if path.is_file() {
-                    let row = row.saturating_sub(1);
-                    let col = path_with_position.column.unwrap_or(0).saturating_sub(1);
-                    caret_positions.insert(path.clone(), Point::new(row, col));
-                }
+            if let Some(row) = path_with_position.row
+                && path.is_file()
+            {
+                let row = row.saturating_sub(1);
+                let col = path_with_position.column.unwrap_or(0).saturating_sub(1);
+                caret_positions.insert(path.clone(), Point::new(row, col));
             }
             path
         })
@@ -264,10 +262,9 @@ pub async fn open_paths_with_positions(
         let new_path = Path::new(&diff_pair[1]).canonicalize()?;
         if let Ok(diff_view) = workspace.update(cx, |workspace, window, cx| {
             FileDiffView::open(old_path, new_path, workspace, window, cx)
-        }) {
-            if let Some(diff_view) = diff_view.await.log_err() {
-                items.push(Some(Ok(Box::new(diff_view))))
-            }
+        }) && let Some(diff_view) = diff_view.await.log_err()
+        {
+            items.push(Some(Ok(Box::new(diff_view))))
         }
     }
 
diff --git a/crates/zeta/src/rate_completion_modal.rs b/crates/zeta/src/rate_completion_modal.rs
index ac7fcade91..313e4c3779 100644
--- a/crates/zeta/src/rate_completion_modal.rs
+++ b/crates/zeta/src/rate_completion_modal.rs
@@ -267,13 +267,13 @@ impl RateCompletionModal {
                 .unwrap_or(self.selected_index);
             cx.notify();
 
-            if let Some(prev_completion) = self.active_completion.as_ref() {
-                if completion.id == prev_completion.completion.id {
-                    if focus {
-                        window.focus(&prev_completion.feedback_editor.focus_handle(cx));
-                    }
-                    return;
+            if let Some(prev_completion) = self.active_completion.as_ref()
+                && completion.id == prev_completion.completion.id
+            {
+                if focus {
+                    window.focus(&prev_completion.feedback_editor.focus_handle(cx));
                 }
+                return;
             }
         }
 
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 956e416fe9..2a121c407c 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -836,12 +836,11 @@ and then another
                 .headers()
                 .get(MINIMUM_REQUIRED_VERSION_HEADER_NAME)
                 .and_then(|version| SemanticVersion::from_str(version.to_str().ok()?).ok())
+                && app_version < minimum_required_version
             {
-                if app_version < minimum_required_version {
-                    return Err(anyhow!(ZedUpdateRequiredError {
-                        minimum_version: minimum_required_version
-                    }));
-                }
+                return Err(anyhow!(ZedUpdateRequiredError {
+                    minimum_version: minimum_required_version
+                }));
             }
 
             if response.status().is_success() {
diff --git a/crates/zlog/src/sink.rs b/crates/zlog/src/sink.rs
index 17aa08026e..3ac85d4bbf 100644
--- a/crates/zlog/src/sink.rs
+++ b/crates/zlog/src/sink.rs
@@ -194,10 +194,10 @@ pub fn flush() {
         ENABLED_SINKS_FILE.clear_poison();
         handle.into_inner()
     });
-    if let Some(file) = file.as_mut() {
-        if let Err(err) = file.flush() {
-            eprintln!("Failed to flush log file: {}", err);
-        }
+    if let Some(file) = file.as_mut()
+        && let Err(err) = file.flush()
+    {
+        eprintln!("Failed to flush log file: {}", err);
     }
 }
 
diff --git a/crates/zlog/src/zlog.rs b/crates/zlog/src/zlog.rs
index 5b40278f3f..df3a210231 100644
--- a/crates/zlog/src/zlog.rs
+++ b/crates/zlog/src/zlog.rs
@@ -28,10 +28,8 @@ pub fn try_init() -> anyhow::Result<()> {
 }
 
 pub fn init_test() {
-    if get_env_config().is_some() {
-        if try_init().is_ok() {
-            init_output_stdout();
-        }
+    if get_env_config().is_some() && try_init().is_ok() {
+        init_output_stdout();
     }
 }
 
@@ -344,18 +342,18 @@ impl Timer {
             return;
         }
         let elapsed = self.start_time.elapsed();
-        if let Some(warn_limit) = self.warn_if_longer_than {
-            if elapsed > warn_limit {
-                crate::warn!(
-                    self.logger =>
-                    "Timer '{}' took {:?}. Which was longer than the expected limit of {:?}",
-                    self.name,
-                    elapsed,
-                    warn_limit
-                );
-                self.done = true;
-                return;
-            }
+        if let Some(warn_limit) = self.warn_if_longer_than
+            && elapsed > warn_limit
+        {
+            crate::warn!(
+                self.logger =>
+                "Timer '{}' took {:?}. Which was longer than the expected limit of {:?}",
+                self.name,
+                elapsed,
+                warn_limit
+            );
+            self.done = true;
+            return;
         }
         crate::trace!(
             self.logger =>
diff --git a/extensions/glsl/src/glsl.rs b/extensions/glsl/src/glsl.rs
index a42403ebef..ba506d2b11 100644
--- a/extensions/glsl/src/glsl.rs
+++ b/extensions/glsl/src/glsl.rs
@@ -16,10 +16,10 @@ impl GlslExtension {
             return Ok(path);
         }
 
-        if let Some(path) = &self.cached_binary_path {
-            if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
-                return Ok(path.clone());
-            }
+        if let Some(path) = &self.cached_binary_path
+            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+        {
+            return Ok(path.clone());
         }
 
         zed::set_language_server_installation_status(
diff --git a/extensions/ruff/src/ruff.rs b/extensions/ruff/src/ruff.rs
index da9b6c0bf1..7b811db212 100644
--- a/extensions/ruff/src/ruff.rs
+++ b/extensions/ruff/src/ruff.rs
@@ -38,13 +38,13 @@ impl RuffExtension {
             });
         }
 
-        if let Some(path) = &self.cached_binary_path {
-            if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
-                return Ok(RuffBinary {
-                    path: path.clone(),
-                    args: binary_args,
-                });
-            }
+        if let Some(path) = &self.cached_binary_path
+            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+        {
+            return Ok(RuffBinary {
+                path: path.clone(),
+                args: binary_args,
+            });
         }
 
         zed::set_language_server_installation_status(
diff --git a/extensions/snippets/src/snippets.rs b/extensions/snippets/src/snippets.rs
index 46ba746930..682709a28a 100644
--- a/extensions/snippets/src/snippets.rs
+++ b/extensions/snippets/src/snippets.rs
@@ -17,10 +17,10 @@ impl SnippetExtension {
             return Ok(path);
         }
 
-        if let Some(path) = &self.cached_binary_path {
-            if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
-                return Ok(path.clone());
-            }
+        if let Some(path) = &self.cached_binary_path
+            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+        {
+            return Ok(path.clone());
         }
 
         zed::set_language_server_installation_status(
diff --git a/extensions/test-extension/src/test_extension.rs b/extensions/test-extension/src/test_extension.rs
index 5b6a3f920a..0ef522bd51 100644
--- a/extensions/test-extension/src/test_extension.rs
+++ b/extensions/test-extension/src/test_extension.rs
@@ -18,10 +18,10 @@ impl TestExtension {
 
         println!("{}", String::from_utf8_lossy(&echo_output.stdout));
 
-        if let Some(path) = &self.cached_binary_path {
-            if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
-                return Ok(path.clone());
-            }
+        if let Some(path) = &self.cached_binary_path
+            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+        {
+            return Ok(path.clone());
         }
 
         zed::set_language_server_installation_status(
diff --git a/extensions/toml/src/toml.rs b/extensions/toml/src/toml.rs
index 20f27b6d97..30a2cd6ce3 100644
--- a/extensions/toml/src/toml.rs
+++ b/extensions/toml/src/toml.rs
@@ -39,13 +39,13 @@ impl TomlExtension {
             });
         }
 
-        if let Some(path) = &self.cached_binary_path {
-            if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
-                return Ok(TaploBinary {
-                    path: path.clone(),
-                    args: binary_args,
-                });
-            }
+        if let Some(path) = &self.cached_binary_path
+            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+        {
+            return Ok(TaploBinary {
+                path: path.clone(),
+                args: binary_args,
+            });
         }
 
         zed::set_language_server_installation_status(

From e3b593efbdfab2609a44ce3dee14be143d341155 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 19 Aug 2025 19:04:48 +0530
Subject: [PATCH 162/823] project: Take 2 on Handle textDocument/didSave and
 textDocument/didChange (un)registration and usage correctly  (#36485)

Relands https://github.com/zed-industries/zed/pull/36441 with a
deserialization fix.

Previously, deserializing `"includeText"` into
`lsp::TextDocumentSyncSaveOptions` resulted in a `Supported(false)` type
instead of `SaveOptions(SaveOptions { include_text: Option<bool> })`.

```rs
impl From<bool> for TextDocumentSyncSaveOptions {
    fn from(from: bool) -> Self {
        Self::Supported(from)
    }
}
```

Looks like, while dynamic registartion we only get `SaveOptions` type
and never `Supported` type.
(https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentSaveRegistrationOptions)

Release Notes:

- N/A

---------

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/project/src/lsp_store.rs | 88 ++++++++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 18 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 23061149bf..75609b3187 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -74,8 +74,8 @@ use lsp::{
     FileOperationPatternKind, FileOperationRegistrationOptions, FileRename, FileSystemWatcher,
     LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId,
     LanguageServerName, LanguageServerSelector, LspRequestFuture, MessageActionItem, MessageType,
-    OneOf, RenameFilesParams, SymbolKind, TextEdit, WillRenameFiles, WorkDoneProgressCancelParams,
-    WorkspaceFolder, notification::DidRenameFiles,
+    OneOf, RenameFilesParams, SymbolKind, TextDocumentSyncSaveOptions, TextEdit, WillRenameFiles,
+    WorkDoneProgressCancelParams, WorkspaceFolder, notification::DidRenameFiles,
 };
 use node_runtime::read_package_installed_version;
 use parking_lot::Mutex;
@@ -11800,8 +11800,40 @@ impl LspStore {
                         .transpose()?
                     {
                         server.update_capabilities(|capabilities| {
+                            let mut sync_options =
+                                Self::take_text_document_sync_options(capabilities);
+                            sync_options.change = Some(sync_kind);
                             capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Kind(sync_kind));
+                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                        });
+                        notify_server_capabilities_updated(&server, cx);
+                    }
+                }
+                "textDocument/didSave" => {
+                    if let Some(include_text) = reg
+                        .register_options
+                        .map(|opts| {
+                            let transpose = opts
+                                .get("includeText")
+                                .cloned()
+                                .map(serde_json::from_value::<Option<bool>>)
+                                .transpose();
+                            match transpose {
+                                Ok(value) => Ok(value.flatten()),
+                                Err(e) => Err(e),
+                            }
+                        })
+                        .transpose()?
+                    {
+                        server.update_capabilities(|capabilities| {
+                            let mut sync_options =
+                                Self::take_text_document_sync_options(capabilities);
+                            sync_options.save =
+                                Some(TextDocumentSyncSaveOptions::SaveOptions(lsp::SaveOptions {
+                                    include_text,
+                                }));
+                            capabilities.text_document_sync =
+                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
                         });
                         notify_server_capabilities_updated(&server, cx);
                     }
@@ -11953,7 +11985,19 @@ impl LspStore {
                 }
                 "textDocument/didChange" => {
                     server.update_capabilities(|capabilities| {
-                        capabilities.text_document_sync = None;
+                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
+                        sync_options.change = None;
+                        capabilities.text_document_sync =
+                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
+                "textDocument/didSave" => {
+                    server.update_capabilities(|capabilities| {
+                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
+                        sync_options.save = None;
+                        capabilities.text_document_sync =
+                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
                     });
                     notify_server_capabilities_updated(&server, cx);
                 }
@@ -11981,6 +12025,20 @@ impl LspStore {
 
         Ok(())
     }
+
+    fn take_text_document_sync_options(
+        capabilities: &mut lsp::ServerCapabilities,
+    ) -> lsp::TextDocumentSyncOptions {
+        match capabilities.text_document_sync.take() {
+            Some(lsp::TextDocumentSyncCapability::Options(sync_options)) => sync_options,
+            Some(lsp::TextDocumentSyncCapability::Kind(sync_kind)) => {
+                let mut sync_options = lsp::TextDocumentSyncOptions::default();
+                sync_options.change = Some(sync_kind);
+                sync_options
+            }
+            None => lsp::TextDocumentSyncOptions::default(),
+        }
+    }
 }
 
 // Registration with empty capabilities should be ignored.
@@ -13083,24 +13141,18 @@ async fn populate_labels_for_symbols(
 
 fn include_text(server: &lsp::LanguageServer) -> Option<bool> {
     match server.capabilities().text_document_sync.as_ref()? {
-        lsp::TextDocumentSyncCapability::Kind(kind) => match *kind {
-            lsp::TextDocumentSyncKind::NONE => None,
-            lsp::TextDocumentSyncKind::FULL => Some(true),
-            lsp::TextDocumentSyncKind::INCREMENTAL => Some(false),
-            _ => None,
-        },
-        lsp::TextDocumentSyncCapability::Options(options) => match options.save.as_ref()? {
-            lsp::TextDocumentSyncSaveOptions::Supported(supported) => {
-                if *supported {
-                    Some(true)
-                } else {
-                    None
-                }
-            }
+        lsp::TextDocumentSyncCapability::Options(opts) => match opts.save.as_ref()? {
+            // Server wants didSave but didn't specify includeText.
+            lsp::TextDocumentSyncSaveOptions::Supported(true) => Some(false),
+            // Server doesn't want didSave at all.
+            lsp::TextDocumentSyncSaveOptions::Supported(false) => None,
+            // Server provided SaveOptions.
             lsp::TextDocumentSyncSaveOptions::SaveOptions(save_options) => {
                 Some(save_options.include_text.unwrap_or(false))
             }
         },
+        // We do not have any save info. Kind affects didChange only.
+        lsp::TextDocumentSyncCapability::Kind(_) => None,
     }
 }
 

From c4083b9b63efddd093126a2b613e44ceb9e7e505 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:20:01 +0200
Subject: [PATCH 163/823] Fix unnecessary-mut-passed lint (#36490)

Release Notes:

- N/A
---
 Cargo.toml                                    |  1 +
 crates/agent_ui/src/acp/message_editor.rs     |  2 +-
 crates/assistant_context/src/context_store.rs |  2 +-
 crates/auto_update/src/auto_update.rs         |  2 +-
 crates/call/src/call_impl/mod.rs              |  2 +-
 crates/channel/src/channel_buffer.rs          |  4 +-
 crates/channel/src/channel_chat.rs            |  4 +-
 crates/channel/src/channel_store.rs           |  4 +-
 crates/client/src/client.rs                   | 10 ++--
 crates/client/src/user.rs                     |  4 +-
 crates/editor/src/hover_links.rs              |  8 ++--
 crates/gpui/src/app.rs                        |  6 +--
 crates/gpui/src/app/context.rs                |  2 +-
 crates/gpui/src/app/test_context.rs           |  6 +--
 crates/project/src/buffer_store.rs            |  6 +--
 .../project/src/debugger/breakpoint_store.rs  |  2 +-
 crates/project/src/lsp_command.rs             | 46 +++++++++----------
 crates/project/src/lsp_store.rs               | 24 +++++-----
 .../project/src/lsp_store/lsp_ext_command.rs  | 12 ++---
 crates/project/src/project.rs                 | 32 ++++++-------
 crates/project/src/search_history.rs          |  2 +-
 crates/project/src/task_store.rs              |  2 +-
 crates/remote_server/src/headless_project.rs  |  8 ++--
 crates/remote_server/src/unix.rs              |  2 +-
 crates/search/src/buffer_search.rs            |  2 +-
 crates/search/src/project_search.rs           |  2 +-
 .../src/ui_components/keystroke_input.rs      |  4 +-
 crates/snippet_provider/src/lib.rs            |  6 +--
 28 files changed, 103 insertions(+), 104 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 89aadbcba0..603897084c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -832,6 +832,7 @@ redundant_closure = { level = "deny" }
 declare_interior_mutable_const = { level = "deny" }
 collapsible_if = { level = "warn"}
 needless_borrow = { level = "warn"}
+unnecessary_mut_passed = {level = "warn"}
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
 # We often return trait objects from `new` functions.
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index a32d0ce6ce..00368d6087 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -2173,7 +2173,7 @@ mod tests {
 
         cx.run_until_parked();
 
-        editor.read_with(&mut cx, |editor, cx| {
+        editor.read_with(&cx, |editor, cx| {
                 assert_eq!(
                     editor.text(cx),
                     "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) [@MySymbol](file:///dir/a/one.txt?symbol=MySymbol#L1:1) "
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index af43b912e9..a2b3adc686 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -320,7 +320,7 @@ impl ContextStore {
                 .client
                 .subscribe_to_entity(remote_id)
                 .log_err()
-                .map(|subscription| subscription.set_entity(&cx.entity(), &mut cx.to_async()));
+                .map(|subscription| subscription.set_entity(&cx.entity(), &cx.to_async()));
             self.advertise_contexts(cx);
         } else {
             self.client_subscription = None;
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 4d0d2d5984..2150873cad 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -543,7 +543,7 @@ impl AutoUpdater {
 
     async fn update(this: Entity<Self>, mut cx: AsyncApp) -> Result<()> {
         let (client, installed_version, previous_status, release_channel) =
-            this.read_with(&mut cx, |this, cx| {
+            this.read_with(&cx, |this, cx| {
                 (
                     this.http_client.clone(),
                     this.current_version,
diff --git a/crates/call/src/call_impl/mod.rs b/crates/call/src/call_impl/mod.rs
index 71c3149324..6cc94a5dd5 100644
--- a/crates/call/src/call_impl/mod.rs
+++ b/crates/call/src/call_impl/mod.rs
@@ -116,7 +116,7 @@ impl ActiveCall {
         envelope: TypedEnvelope<proto::IncomingCall>,
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
-        let user_store = this.read_with(&mut cx, |this, _| this.user_store.clone())?;
+        let user_store = this.read_with(&cx, |this, _| this.user_store.clone())?;
         let call = IncomingCall {
             room_id: envelope.payload.room_id,
             participants: user_store
diff --git a/crates/channel/src/channel_buffer.rs b/crates/channel/src/channel_buffer.rs
index a367ffbf09..943e819ad6 100644
--- a/crates/channel/src/channel_buffer.rs
+++ b/crates/channel/src/channel_buffer.rs
@@ -82,7 +82,7 @@ impl ChannelBuffer {
                 collaborators: Default::default(),
                 acknowledge_task: None,
                 channel_id: channel.id,
-                subscription: Some(subscription.set_entity(&cx.entity(), &mut cx.to_async())),
+                subscription: Some(subscription.set_entity(&cx.entity(), &cx.to_async())),
                 user_store,
                 channel_store,
             };
@@ -110,7 +110,7 @@ impl ChannelBuffer {
             let Ok(subscription) = self.client.subscribe_to_entity(self.channel_id.0) else {
                 return;
             };
-            self.subscription = Some(subscription.set_entity(&cx.entity(), &mut cx.to_async()));
+            self.subscription = Some(subscription.set_entity(&cx.entity(), &cx.to_async()));
             cx.emit(ChannelBufferEvent::Connected);
         }
     }
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index 02b5ccec68..86f307717c 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -532,7 +532,7 @@ impl ChannelChat {
         message: TypedEnvelope<proto::ChannelMessageSent>,
         mut cx: AsyncApp,
     ) -> Result<()> {
-        let user_store = this.read_with(&mut cx, |this, _| this.user_store.clone())?;
+        let user_store = this.read_with(&cx, |this, _| this.user_store.clone())?;
         let message = message.payload.message.context("empty message")?;
         let message_id = message.id;
 
@@ -564,7 +564,7 @@ impl ChannelChat {
         message: TypedEnvelope<proto::ChannelMessageUpdate>,
         mut cx: AsyncApp,
     ) -> Result<()> {
-        let user_store = this.read_with(&mut cx, |this, _| this.user_store.clone())?;
+        let user_store = this.read_with(&cx, |this, _| this.user_store.clone())?;
         let message = message.payload.message.context("empty message")?;
 
         let message = ChannelMessage::from_proto(message, &user_store, &mut cx).await?;
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 6d1716a7ea..42a1851408 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -908,9 +908,9 @@ impl ChannelStore {
     async fn handle_update_channels(
         this: Entity<Self>,
         message: TypedEnvelope<proto::UpdateChannels>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<()> {
-        this.read_with(&mut cx, |this, _| {
+        this.read_with(&cx, |this, _| {
             this.update_channels_tx
                 .unbounded_send(message.payload)
                 .unwrap();
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index d7d8b60211..218cf2b079 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -2073,8 +2073,8 @@ mod tests {
         let (done_tx1, done_rx1) = smol::channel::unbounded();
         let (done_tx2, done_rx2) = smol::channel::unbounded();
         AnyProtoClient::from(client.clone()).add_entity_message_handler(
-            move |entity: Entity<TestEntity>, _: TypedEnvelope<proto::JoinProject>, mut cx| {
-                match entity.read_with(&mut cx, |entity, _| entity.id).unwrap() {
+            move |entity: Entity<TestEntity>, _: TypedEnvelope<proto::JoinProject>, cx| {
+                match entity.read_with(&cx, |entity, _| entity.id).unwrap() {
                     1 => done_tx1.try_send(()).unwrap(),
                     2 => done_tx2.try_send(()).unwrap(),
                     _ => unreachable!(),
@@ -2098,17 +2098,17 @@ mod tests {
         let _subscription1 = client
             .subscribe_to_entity(1)
             .unwrap()
-            .set_entity(&entity1, &mut cx.to_async());
+            .set_entity(&entity1, &cx.to_async());
         let _subscription2 = client
             .subscribe_to_entity(2)
             .unwrap()
-            .set_entity(&entity2, &mut cx.to_async());
+            .set_entity(&entity2, &cx.to_async());
         // Ensure dropping a subscription for the same entity type still allows receiving of
         // messages for other entity IDs of the same type.
         let subscription3 = client
             .subscribe_to_entity(3)
             .unwrap()
-            .set_entity(&entity3, &mut cx.to_async());
+            .set_entity(&entity3, &cx.to_async());
         drop(subscription3);
 
         server.send(proto::JoinProject {
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 3509a8c57f..722d6861ff 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -332,9 +332,9 @@ impl UserStore {
     async fn handle_update_contacts(
         this: Entity<Self>,
         message: TypedEnvelope<proto::UpdateContacts>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<()> {
-        this.read_with(&mut cx, |this, _| {
+        this.read_with(&cx, |this, _| {
             this.update_contacts_tx
                 .unbounded_send(UpdateContacts::Update(message.payload))
                 .unwrap();
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index b431834d35..358d8683fe 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -655,11 +655,11 @@ pub fn show_link_definition(
 pub(crate) fn find_url(
     buffer: &Entity<language::Buffer>,
     position: text::Anchor,
-    mut cx: AsyncWindowContext,
+    cx: AsyncWindowContext,
 ) -> Option<(Range<text::Anchor>, String)> {
     const LIMIT: usize = 2048;
 
-    let Ok(snapshot) = buffer.read_with(&mut cx, |buffer, _| buffer.snapshot()) else {
+    let Ok(snapshot) = buffer.read_with(&cx, |buffer, _| buffer.snapshot()) else {
         return None;
     };
 
@@ -717,11 +717,11 @@ pub(crate) fn find_url(
 pub(crate) fn find_url_from_range(
     buffer: &Entity<language::Buffer>,
     range: Range<text::Anchor>,
-    mut cx: AsyncWindowContext,
+    cx: AsyncWindowContext,
 ) -> Option<String> {
     const LIMIT: usize = 2048;
 
-    let Ok(snapshot) = buffer.read_with(&mut cx, |buffer, _| buffer.snapshot()) else {
+    let Ok(snapshot) = buffer.read_with(&cx, |buffer, _| buffer.snapshot()) else {
         return None;
     };
 
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index c4499aff07..2be1a34e49 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -368,7 +368,7 @@ impl App {
             }),
         });
 
-        init_app_menus(platform.as_ref(), &mut app.borrow_mut());
+        init_app_menus(platform.as_ref(), &app.borrow());
 
         platform.on_keyboard_layout_change(Box::new({
             let app = Rc::downgrade(&app);
@@ -1332,7 +1332,7 @@ impl App {
         }
 
         inner(
-            &mut self.keystroke_observers,
+            &self.keystroke_observers,
             Box::new(move |event, window, cx| {
                 f(event, window, cx);
                 true
@@ -1358,7 +1358,7 @@ impl App {
         }
 
         inner(
-            &mut self.keystroke_interceptors,
+            &self.keystroke_interceptors,
             Box::new(move |event, window, cx| {
                 f(event, window, cx);
                 true
diff --git a/crates/gpui/src/app/context.rs b/crates/gpui/src/app/context.rs
index a6ab026770..1112878a66 100644
--- a/crates/gpui/src/app/context.rs
+++ b/crates/gpui/src/app/context.rs
@@ -472,7 +472,7 @@ impl<'a, T: 'static> Context<'a, T> {
 
         let view = self.weak_entity();
         inner(
-            &mut self.keystroke_observers,
+            &self.keystroke_observers,
             Box::new(move |event, window, cx| {
                 if let Some(view) = view.upgrade() {
                     view.update(cx, |view, cx| f(view, event, window, cx));
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index a96c24432a..43adacf7dd 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -219,7 +219,7 @@ impl TestAppContext {
         let mut cx = self.app.borrow_mut();
 
         // Some tests rely on the window size matching the bounds of the test display
-        let bounds = Bounds::maximized(None, &mut cx);
+        let bounds = Bounds::maximized(None, &cx);
         cx.open_window(
             WindowOptions {
                 window_bounds: Some(WindowBounds::Windowed(bounds)),
@@ -233,7 +233,7 @@ impl TestAppContext {
     /// Adds a new window with no content.
     pub fn add_empty_window(&mut self) -> &mut VisualTestContext {
         let mut cx = self.app.borrow_mut();
-        let bounds = Bounds::maximized(None, &mut cx);
+        let bounds = Bounds::maximized(None, &cx);
         let window = cx
             .open_window(
                 WindowOptions {
@@ -261,7 +261,7 @@ impl TestAppContext {
         V: 'static + Render,
     {
         let mut cx = self.app.borrow_mut();
-        let bounds = Bounds::maximized(None, &mut cx);
+        let bounds = Bounds::maximized(None, &cx);
         let window = cx
             .open_window(
                 WindowOptions {
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index 1522376e9a..96e87b1fe0 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -1345,7 +1345,7 @@ impl BufferStore {
         mut cx: AsyncApp,
     ) -> Result<proto::BufferSaved> {
         let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let (buffer, project_id) = this.read_with(&mut cx, |this, _| {
+        let (buffer, project_id) = this.read_with(&cx, |this, _| {
             anyhow::Ok((
                 this.get_existing(buffer_id)?,
                 this.downstream_client
@@ -1359,7 +1359,7 @@ impl BufferStore {
                 buffer.wait_for_version(deserialize_version(&envelope.payload.version))
             })?
             .await?;
-        let buffer_id = buffer.read_with(&mut cx, |buffer, _| buffer.remote_id())?;
+        let buffer_id = buffer.read_with(&cx, |buffer, _| buffer.remote_id())?;
 
         if let Some(new_path) = envelope.payload.new_path {
             let new_path = ProjectPath::from_proto(new_path);
@@ -1372,7 +1372,7 @@ impl BufferStore {
                 .await?;
         }
 
-        buffer.read_with(&mut cx, |buffer, _| proto::BufferSaved {
+        buffer.read_with(&cx, |buffer, _| proto::BufferSaved {
             project_id,
             buffer_id: buffer_id.into(),
             version: serialize_version(buffer.saved_version()),
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
index faa9948596..38d8b4cfc6 100644
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ b/crates/project/src/debugger/breakpoint_store.rs
@@ -267,7 +267,7 @@ impl BreakpointStore {
         message: TypedEnvelope<proto::ToggleBreakpoint>,
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
-        let breakpoints = this.read_with(&mut cx, |this, _| this.breakpoint_store())?;
+        let breakpoints = this.read_with(&cx, |this, _| this.breakpoint_store())?;
         let path = this
             .update(&mut cx, |this, cx| {
                 this.project_path_for_absolute_path(message.payload.path.as_ref(), cx)
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index 2a1facd3c0..64414c6545 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -332,9 +332,9 @@ impl LspCommand for PrepareRename {
         _: Entity<LspStore>,
         buffer: Entity<Buffer>,
         _: LanguageServerId,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<PrepareRenameResponse> {
-        buffer.read_with(&mut cx, |buffer, _| match message {
+        buffer.read_with(&cx, |buffer, _| match message {
             Some(lsp::PrepareRenameResponse::Range(range))
             | Some(lsp::PrepareRenameResponse::RangeWithPlaceholder { range, .. }) => {
                 let Range { start, end } = range_from_lsp(range);
@@ -386,7 +386,7 @@ impl LspCommand for PrepareRename {
             .await?;
 
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -543,7 +543,7 @@ impl LspCommand for PerformRename {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
             new_name: message.new_name,
             push_to_history: false,
         })
@@ -658,7 +658,7 @@ impl LspCommand for GetDefinitions {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -761,7 +761,7 @@ impl LspCommand for GetDeclarations {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -863,7 +863,7 @@ impl LspCommand for GetImplementations {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -962,7 +962,7 @@ impl LspCommand for GetTypeDefinitions {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -1330,7 +1330,7 @@ impl LspCommand for GetReferences {
 
                 target_buffer_handle
                     .clone()
-                    .read_with(&mut cx, |target_buffer, _| {
+                    .read_with(&cx, |target_buffer, _| {
                         let target_start = target_buffer
                             .clip_point_utf16(point_from_lsp(lsp_location.range.start), Bias::Left);
                         let target_end = target_buffer
@@ -1374,7 +1374,7 @@ impl LspCommand for GetReferences {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -1484,9 +1484,9 @@ impl LspCommand for GetDocumentHighlights {
         _: Entity<LspStore>,
         buffer: Entity<Buffer>,
         _: LanguageServerId,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<Vec<DocumentHighlight>> {
-        buffer.read_with(&mut cx, |buffer, _| {
+        buffer.read_with(&cx, |buffer, _| {
             let mut lsp_highlights = lsp_highlights.unwrap_or_default();
             lsp_highlights.sort_unstable_by_key(|h| (h.range.start, Reverse(h.range.end)));
             lsp_highlights
@@ -1534,7 +1534,7 @@ impl LspCommand for GetDocumentHighlights {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -1865,7 +1865,7 @@ impl LspCommand for GetSignatureHelp {
             })?
             .await
             .with_context(|| format!("waiting for version for buffer {}", buffer.entity_id()))?;
-        let buffer_snapshot = buffer.read_with(&mut cx, |buffer, _| buffer.snapshot())?;
+        let buffer_snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot())?;
         Ok(Self {
             position: payload
                 .position
@@ -1947,13 +1947,13 @@ impl LspCommand for GetHover {
         _: Entity<LspStore>,
         buffer: Entity<Buffer>,
         _: LanguageServerId,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<Self::Response> {
         let Some(hover) = message else {
             return Ok(None);
         };
 
-        let (language, range) = buffer.read_with(&mut cx, |buffer, _| {
+        let (language, range) = buffer.read_with(&cx, |buffer, _| {
             (
                 buffer.language().cloned(),
                 hover.range.map(|range| {
@@ -2039,7 +2039,7 @@ impl LspCommand for GetHover {
             })?
             .await?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -2113,7 +2113,7 @@ impl LspCommand for GetHover {
             return Ok(None);
         }
 
-        let language = buffer.read_with(&mut cx, |buffer, _| buffer.language().cloned())?;
+        let language = buffer.read_with(&cx, |buffer, _| buffer.language().cloned())?;
         let range = if let (Some(start), Some(end)) = (message.start, message.end) {
             language::proto::deserialize_anchor(start)
                 .and_then(|start| language::proto::deserialize_anchor(end).map(|end| start..end))
@@ -2208,7 +2208,7 @@ impl LspCommand for GetCompletions {
         let unfiltered_completions_count = completions.len();
 
         let language_server_adapter = lsp_store
-            .read_with(&mut cx, |lsp_store, _| {
+            .read_with(&cx, |lsp_store, _| {
                 lsp_store.language_server_adapter_for_id(server_id)
             })?
             .with_context(|| format!("no language server with id {server_id}"))?;
@@ -2394,7 +2394,7 @@ impl LspCommand for GetCompletions {
             .position
             .and_then(language::proto::deserialize_anchor)
             .map(|p| {
-                buffer.read_with(&mut cx, |buffer, _| {
+                buffer.read_with(&cx, |buffer, _| {
                     buffer.clip_point_utf16(Unclipped(p.to_point_utf16(buffer)), Bias::Left)
                 })
             })
@@ -2862,7 +2862,7 @@ impl LspCommand for OnTypeFormatting {
         })?;
 
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
             trigger: message.trigger.clone(),
             options,
             push_to_history: false,
@@ -3474,9 +3474,9 @@ impl LspCommand for GetCodeLens {
         lsp_store: Entity<LspStore>,
         buffer: Entity<Buffer>,
         server_id: LanguageServerId,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> anyhow::Result<Vec<CodeAction>> {
-        let snapshot = buffer.read_with(&mut cx, |buffer, _| buffer.snapshot())?;
+        let snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot())?;
         let language_server = cx.update(|cx| {
             lsp_store
                 .read(cx)
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 75609b3187..e93e859dcf 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -669,10 +669,10 @@ impl LocalLspStore {
                 let this = this.clone();
                 move |_, cx| {
                     let this = this.clone();
-                    let mut cx = cx.clone();
+                    let cx = cx.clone();
                     async move {
-                        let Some(server) = this
-                            .read_with(&mut cx, |this, _| this.language_server_for_id(server_id))?
+                        let Some(server) =
+                            this.read_with(&cx, |this, _| this.language_server_for_id(server_id))?
                         else {
                             return Ok(None);
                         };
@@ -8154,7 +8154,7 @@ impl LspStore {
         envelope: TypedEnvelope<proto::MultiLspQuery>,
         mut cx: AsyncApp,
     ) -> Result<proto::MultiLspQueryResponse> {
-        let response_from_ssh = lsp_store.read_with(&mut cx, |this, _| {
+        let response_from_ssh = lsp_store.read_with(&cx, |this, _| {
             let (upstream_client, project_id) = this.upstream_client()?;
             let mut payload = envelope.payload.clone();
             payload.project_id = project_id;
@@ -8176,7 +8176,7 @@ impl LspStore {
                 buffer.wait_for_version(version.clone())
             })?
             .await?;
-        let buffer_version = buffer.read_with(&mut cx, |buffer, _| buffer.version())?;
+        let buffer_version = buffer.read_with(&cx, |buffer, _| buffer.version())?;
         match envelope
             .payload
             .strategy
@@ -8717,7 +8717,7 @@ impl LspStore {
             })?
             .context("worktree not found")?;
         let (old_abs_path, new_abs_path) = {
-            let root_path = worktree.read_with(&mut cx, |this, _| this.abs_path())?;
+            let root_path = worktree.read_with(&cx, |this, _| this.abs_path())?;
             let new_path = PathBuf::from_proto(envelope.payload.new_path.clone());
             (root_path.join(&old_path), root_path.join(&new_path))
         };
@@ -8732,7 +8732,7 @@ impl LspStore {
         )
         .await;
         let response = Worktree::handle_rename_entry(worktree, envelope.payload, cx.clone()).await;
-        this.read_with(&mut cx, |this, _| {
+        this.read_with(&cx, |this, _| {
             this.did_rename_entry(worktree_id, &old_abs_path, &new_abs_path, is_dir);
         })
         .ok();
@@ -8966,10 +8966,10 @@ impl LspStore {
     async fn handle_lsp_ext_cancel_flycheck(
         lsp_store: Entity<Self>,
         envelope: TypedEnvelope<proto::LspExtCancelFlycheck>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<proto::Ack> {
         let server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-        lsp_store.read_with(&mut cx, |lsp_store, _| {
+        lsp_store.read_with(&cx, |lsp_store, _| {
             if let Some(server) = lsp_store.language_server_for_id(server_id) {
                 server
                     .notify::<lsp_store::lsp_ext_command::LspExtCancelFlycheck>(&())
@@ -9018,10 +9018,10 @@ impl LspStore {
     async fn handle_lsp_ext_clear_flycheck(
         lsp_store: Entity<Self>,
         envelope: TypedEnvelope<proto::LspExtClearFlycheck>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> Result<proto::Ack> {
         let server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-        lsp_store.read_with(&mut cx, |lsp_store, _| {
+        lsp_store.read_with(&cx, |lsp_store, _| {
             if let Some(server) = lsp_store.language_server_for_id(server_id) {
                 server
                     .notify::<lsp_store::lsp_ext_command::LspExtClearFlycheck>(&())
@@ -9789,7 +9789,7 @@ impl LspStore {
         let peer_id = envelope.original_sender_id().unwrap_or_default();
         let symbol = envelope.payload.symbol.context("invalid symbol")?;
         let symbol = Self::deserialize_symbol(symbol)?;
-        let symbol = this.read_with(&mut cx, |this, _| {
+        let symbol = this.read_with(&cx, |this, _| {
             let signature = this.symbol_signature(&symbol.path);
             anyhow::ensure!(signature == symbol.signature, "invalid symbol signature");
             Ok(symbol)
diff --git a/crates/project/src/lsp_store/lsp_ext_command.rs b/crates/project/src/lsp_store/lsp_ext_command.rs
index cb13fa5efc..1c969f8114 100644
--- a/crates/project/src/lsp_store/lsp_ext_command.rs
+++ b/crates/project/src/lsp_store/lsp_ext_command.rs
@@ -115,14 +115,14 @@ impl LspCommand for ExpandMacro {
         message: Self::ProtoRequest,
         _: Entity<LspStore>,
         buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> anyhow::Result<Self> {
         let position = message
             .position
             .and_then(deserialize_anchor)
             .context("invalid position")?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -249,14 +249,14 @@ impl LspCommand for OpenDocs {
         message: Self::ProtoRequest,
         _: Entity<LspStore>,
         buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> anyhow::Result<Self> {
         let position = message
             .position
             .and_then(deserialize_anchor)
             .context("invalid position")?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
@@ -462,14 +462,14 @@ impl LspCommand for GoToParentModule {
         request: Self::ProtoRequest,
         _: Entity<LspStore>,
         buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
+        cx: AsyncApp,
     ) -> anyhow::Result<Self> {
         let position = request
             .position
             .and_then(deserialize_anchor)
             .context("bad request with bad position")?;
         Ok(Self {
-            position: buffer.read_with(&mut cx, |buffer, _| position.to_point_utf16(buffer))?,
+            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
         })
     }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 3906befee2..f825cd8c47 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1613,25 +1613,23 @@ impl Project {
             .into_iter()
             .map(|s| match s {
                 EntitySubscription::BufferStore(subscription) => {
-                    subscription.set_entity(&buffer_store, &mut cx)
+                    subscription.set_entity(&buffer_store, &cx)
                 }
                 EntitySubscription::WorktreeStore(subscription) => {
-                    subscription.set_entity(&worktree_store, &mut cx)
+                    subscription.set_entity(&worktree_store, &cx)
                 }
                 EntitySubscription::GitStore(subscription) => {
-                    subscription.set_entity(&git_store, &mut cx)
+                    subscription.set_entity(&git_store, &cx)
                 }
                 EntitySubscription::SettingsObserver(subscription) => {
-                    subscription.set_entity(&settings_observer, &mut cx)
-                }
-                EntitySubscription::Project(subscription) => {
-                    subscription.set_entity(&this, &mut cx)
+                    subscription.set_entity(&settings_observer, &cx)
                 }
+                EntitySubscription::Project(subscription) => subscription.set_entity(&this, &cx),
                 EntitySubscription::LspStore(subscription) => {
-                    subscription.set_entity(&lsp_store, &mut cx)
+                    subscription.set_entity(&lsp_store, &cx)
                 }
                 EntitySubscription::DapStore(subscription) => {
-                    subscription.set_entity(&dap_store, &mut cx)
+                    subscription.set_entity(&dap_store, &cx)
                 }
             })
             .collect::<Vec<_>>();
@@ -2226,28 +2224,28 @@ impl Project {
         self.client_subscriptions.extend([
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&cx.entity(), &mut cx.to_async()),
+                .set_entity(&cx.entity(), &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.worktree_store, &mut cx.to_async()),
+                .set_entity(&self.worktree_store, &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.buffer_store, &mut cx.to_async()),
+                .set_entity(&self.buffer_store, &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.lsp_store, &mut cx.to_async()),
+                .set_entity(&self.lsp_store, &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.settings_observer, &mut cx.to_async()),
+                .set_entity(&self.settings_observer, &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.dap_store, &mut cx.to_async()),
+                .set_entity(&self.dap_store, &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.breakpoint_store, &mut cx.to_async()),
+                .set_entity(&self.breakpoint_store, &cx.to_async()),
             self.client
                 .subscribe_to_entity(project_id)?
-                .set_entity(&self.git_store, &mut cx.to_async()),
+                .set_entity(&self.git_store, &cx.to_async()),
         ]);
 
         self.buffer_store.update(cx, |buffer_store, cx| {
diff --git a/crates/project/src/search_history.rs b/crates/project/src/search_history.rs
index 401f375094..4b2a7a065b 100644
--- a/crates/project/src/search_history.rs
+++ b/crates/project/src/search_history.rs
@@ -202,7 +202,7 @@ mod tests {
 
         assert_eq!(search_history.current(&cursor), Some("TypeScript"));
         cursor.reset();
-        assert_eq!(search_history.current(&mut cursor), None);
+        assert_eq!(search_history.current(&cursor), None);
         assert_eq!(
             search_history.previous(&mut cursor),
             Some("TypeScript"),
diff --git a/crates/project/src/task_store.rs b/crates/project/src/task_store.rs
index f6718a3f3c..ae49ce5b4d 100644
--- a/crates/project/src/task_store.rs
+++ b/crates/project/src/task_store.rs
@@ -71,7 +71,7 @@ impl TaskStore {
             .payload
             .location
             .context("no location given for task context handling")?;
-        let (buffer_store, is_remote) = store.read_with(&mut cx, |store, _| {
+        let (buffer_store, is_remote) = store.read_with(&cx, |store, _| {
             Ok(match store {
                 TaskStore::Functional(state) => (
                     state.buffer_store.clone(),
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 6b0cc2219f..85150f629e 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -372,7 +372,7 @@ impl HeadlessProject {
         mut cx: AsyncApp,
     ) -> Result<proto::AddWorktreeResponse> {
         use client::ErrorCodeExt;
-        let fs = this.read_with(&mut cx, |this, _| this.fs.clone())?;
+        let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
         let path = PathBuf::from_proto(shellexpand::tilde(&message.payload.path).to_string());
 
         let canonicalized = match fs.canonicalize(&path).await {
@@ -396,7 +396,7 @@ impl HeadlessProject {
         };
 
         let worktree = this
-            .read_with(&mut cx.clone(), |this, _| {
+            .read_with(&cx.clone(), |this, _| {
                 Worktree::local(
                     Arc::from(canonicalized.as_path()),
                     message.payload.visible,
@@ -407,7 +407,7 @@ impl HeadlessProject {
             })?
             .await?;
 
-        let response = this.read_with(&mut cx, |_, cx| {
+        let response = this.read_with(&cx, |_, cx| {
             let worktree = worktree.read(cx);
             proto::AddWorktreeResponse {
                 worktree_id: worktree.id().to_proto(),
@@ -586,7 +586,7 @@ impl HeadlessProject {
         let buffer_store = this.read_with(&cx, |this, _| this.buffer_store.clone())?;
 
         while let Ok(buffer) = results.recv().await {
-            let buffer_id = buffer.read_with(&mut cx, |this, _| this.remote_id())?;
+            let buffer_id = buffer.read_with(&cx, |this, _| this.remote_id())?;
             response.buffer_ids.push(buffer_id.to_proto());
             buffer_store
                 .update(&mut cx, |buffer_store, cx| {
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 76e74b75bd..9315536e6b 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -622,7 +622,7 @@ pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
                     Err(anyhow!(error))?;
                 }
                 n => {
-                    stderr.write_all(&mut stderr_buffer[..n]).await?;
+                    stderr.write_all(&stderr_buffer[..n]).await?;
                     stderr.flush().await?;
                 }
             }
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 78e4da7bc6..75042f184f 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -1340,7 +1340,7 @@ impl BufferSearchBar {
         if self.query(cx).is_empty()
             && let Some(new_query) = self
                 .search_history
-                .current(&mut self.search_history_cursor)
+                .current(&self.search_history_cursor)
                 .map(str::to_string)
         {
             drop(self.search(&new_query, Some(self.search_options), window, cx));
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 51cb1fdb26..b6836324db 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -4111,7 +4111,7 @@ pub mod tests {
         });
         cx.run_until_parked();
         let project_search_view = pane
-            .read_with(&mut cx, |pane, _| {
+            .read_with(&cx, |pane, _| {
                 pane.active_item()
                     .and_then(|item| item.downcast::<ProjectSearchView>())
             })
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/settings_ui/src/ui_components/keystroke_input.rs
index f23d80931c..de133d406b 100644
--- a/crates/settings_ui/src/ui_components/keystroke_input.rs
+++ b/crates/settings_ui/src/ui_components/keystroke_input.rs
@@ -811,7 +811,7 @@ mod tests {
         pub fn expect_keystrokes(&mut self, expected: &[&str]) -> &mut Self {
             let actual = self
                 .input
-                .read_with(&mut self.cx, |input, _| input.keystrokes.clone());
+                .read_with(&self.cx, |input, _| input.keystrokes.clone());
             Self::expect_keystrokes_equal(&actual, expected);
             self
         }
@@ -820,7 +820,7 @@ mod tests {
         pub fn expect_close_keystrokes(&mut self, expected: &[&str]) -> &mut Self {
             let actual = self
                 .input
-                .read_with(&mut self.cx, |input, _| input.close_keystrokes.clone())
+                .read_with(&self.cx, |input, _| input.close_keystrokes.clone())
                 .unwrap_or_default();
             Self::expect_keystrokes_equal(&actual, expected);
             self
diff --git a/crates/snippet_provider/src/lib.rs b/crates/snippet_provider/src/lib.rs
index d1112a8d00..c8d2555df2 100644
--- a/crates/snippet_provider/src/lib.rs
+++ b/crates/snippet_provider/src/lib.rs
@@ -69,7 +69,7 @@ async fn process_updates(
     entries: Vec<PathBuf>,
     mut cx: AsyncApp,
 ) -> Result<()> {
-    let fs = this.read_with(&mut cx, |this, _| this.fs.clone())?;
+    let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
     for entry_path in entries {
         if !entry_path
             .extension()
@@ -118,9 +118,9 @@ async fn process_updates(
 async fn initial_scan(
     this: WeakEntity<SnippetProvider>,
     path: Arc<Path>,
-    mut cx: AsyncApp,
+    cx: AsyncApp,
 ) -> Result<()> {
-    let fs = this.read_with(&mut cx, |this, _| this.fs.clone())?;
+    let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
     let entries = fs.read_dir(&path).await;
     if let Ok(entries) = entries {
         let entries = entries

From 6c255c19736389916e8862f339464ae319dc9019 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 19 Aug 2025 16:24:23 +0200
Subject: [PATCH 164/823] Lay the groundwork to support history in agent2
 (#36483)

This pull request introduces title generation and history replaying. We
still need to wire up the rest of the history but this gets us very
close. I extracted a lot of this code from `agent2-history` because that
branch was starting to get long-lived and there were lots of changes
since we started.

Release Notes:

- N/A
---
 Cargo.lock                                    |   3 +
 crates/acp_thread/src/acp_thread.rs           |  39 +-
 crates/acp_thread/src/connection.rs           |  16 +-
 crates/acp_thread/src/diff.rs                 |  13 +-
 crates/acp_thread/src/mention.rs              |   3 +-
 crates/agent2/Cargo.toml                      |   4 +
 crates/agent2/src/agent.rs                    | 104 +--
 crates/agent2/src/tests/mod.rs                |  94 ++-
 crates/agent2/src/thread.rs                   | 667 ++++++++++++++----
 .../src/tools/context_server_registry.rs      |  10 +
 crates/agent2/src/tools/edit_file_tool.rs     | 137 ++--
 crates/agent2/src/tools/terminal_tool.rs      |   4 +-
 crates/agent2/src/tools/web_search_tool.rs    |  67 +-
 crates/agent_servers/Cargo.toml               |   1 +
 crates/agent_servers/src/acp/v0.rs            |   4 +-
 crates/agent_servers/src/acp/v1.rs            |   7 +-
 crates/agent_servers/src/claude.rs            |  12 +-
 crates/agent_ui/src/acp/thread_view.rs        |  31 +-
 crates/agent_ui/src/agent_diff.rs             |  41 +-
 19 files changed, 929 insertions(+), 328 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d7edc54257..dc9d074f01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -191,6 +191,7 @@ version = "0.1.0"
 dependencies = [
  "acp_thread",
  "action_log",
+ "agent",
  "agent-client-protocol",
  "agent_servers",
  "agent_settings",
@@ -208,6 +209,7 @@ dependencies = [
  "env_logger 0.11.8",
  "fs",
  "futures 0.3.31",
+ "git",
  "gpui",
  "gpui_tokio",
  "handlebars 4.5.0",
@@ -256,6 +258,7 @@ name = "agent_servers"
 version = "0.1.0"
 dependencies = [
  "acp_thread",
+ "action_log",
  "agent-client-protocol",
  "agent_settings",
  "agentic-coding-protocol",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 227ca984d4..7d70727252 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -537,9 +537,15 @@ impl ToolCallContent {
             acp::ToolCallContent::Content { content } => {
                 Self::ContentBlock(ContentBlock::new(content, &language_registry, cx))
             }
-            acp::ToolCallContent::Diff { diff } => {
-                Self::Diff(cx.new(|cx| Diff::from_acp(diff, language_registry, cx)))
-            }
+            acp::ToolCallContent::Diff { diff } => Self::Diff(cx.new(|cx| {
+                Diff::finalized(
+                    diff.path,
+                    diff.old_text,
+                    diff.new_text,
+                    language_registry,
+                    cx,
+                )
+            })),
         }
     }
 
@@ -682,6 +688,7 @@ pub struct AcpThread {
 #[derive(Debug)]
 pub enum AcpThreadEvent {
     NewEntry,
+    TitleUpdated,
     EntryUpdated(usize),
     EntriesRemoved(Range<usize>),
     ToolAuthorizationRequired,
@@ -728,11 +735,9 @@ impl AcpThread {
         title: impl Into<SharedString>,
         connection: Rc<dyn AgentConnection>,
         project: Entity<Project>,
+        action_log: Entity<ActionLog>,
         session_id: acp::SessionId,
-        cx: &mut Context<Self>,
     ) -> Self {
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
         Self {
             action_log,
             shared_buffers: Default::default(),
@@ -926,6 +931,12 @@ impl AcpThread {
         cx.emit(AcpThreadEvent::NewEntry);
     }
 
+    pub fn update_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Result<()> {
+        self.title = title;
+        cx.emit(AcpThreadEvent::TitleUpdated);
+        Ok(())
+    }
+
     pub fn update_retry_status(&mut self, status: RetryStatus, cx: &mut Context<Self>) {
         cx.emit(AcpThreadEvent::Retry(status));
     }
@@ -1657,7 +1668,7 @@ mod tests {
     use super::*;
     use anyhow::anyhow;
     use futures::{channel::mpsc, future::LocalBoxFuture, select};
-    use gpui::{AsyncApp, TestAppContext, WeakEntity};
+    use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
     use indoc::indoc;
     use project::{FakeFs, Fs};
     use rand::Rng as _;
@@ -2327,7 +2338,7 @@ mod tests {
             self: Rc<Self>,
             project: Entity<Project>,
             _cwd: &Path,
-            cx: &mut gpui::App,
+            cx: &mut App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
             let session_id = acp::SessionId(
                 rand::thread_rng()
@@ -2337,8 +2348,16 @@ mod tests {
                     .collect::<String>()
                     .into(),
             );
-            let thread =
-                cx.new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx));
+            let action_log = cx.new(|_| ActionLog::new(project.clone()));
+            let thread = cx.new(|_cx| {
+                AcpThread::new(
+                    "Test",
+                    self.clone(),
+                    project,
+                    action_log,
+                    session_id.clone(),
+                )
+            });
             self.sessions.lock().insert(session_id, thread.downgrade());
             Task::ready(Ok(thread))
         }
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 0d4116321d..b09f383029 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -5,11 +5,12 @@ use collections::IndexMap;
 use gpui::{Entity, SharedString, Task};
 use language_model::LanguageModelProviderId;
 use project::Project;
+use serde::{Deserialize, Serialize};
 use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
 use ui::{App, IconName};
 use uuid::Uuid;
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct UserMessageId(Arc<str>);
 
 impl UserMessageId {
@@ -208,6 +209,7 @@ impl AgentModelList {
 mod test_support {
     use std::sync::Arc;
 
+    use action_log::ActionLog;
     use collections::HashMap;
     use futures::{channel::oneshot, future::try_join_all};
     use gpui::{AppContext as _, WeakEntity};
@@ -295,8 +297,16 @@ mod test_support {
             cx: &mut gpui::App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
             let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
-            let thread =
-                cx.new(|cx| AcpThread::new("Test", self.clone(), project, session_id.clone(), cx));
+            let action_log = cx.new(|_| ActionLog::new(project.clone()));
+            let thread = cx.new(|_cx| {
+                AcpThread::new(
+                    "Test",
+                    self.clone(),
+                    project,
+                    action_log,
+                    session_id.clone(),
+                )
+            });
             self.sessions.lock().insert(
                 session_id,
                 Session {
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index e5f71d2109..4b779931c5 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -1,4 +1,3 @@
-use agent_client_protocol as acp;
 use anyhow::Result;
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
 use editor::{MultiBuffer, PathKey};
@@ -21,17 +20,13 @@ pub enum Diff {
 }
 
 impl Diff {
-    pub fn from_acp(
-        diff: acp::Diff,
+    pub fn finalized(
+        path: PathBuf,
+        old_text: Option<String>,
+        new_text: String,
         language_registry: Arc<LanguageRegistry>,
         cx: &mut Context<Self>,
     ) -> Self {
-        let acp::Diff {
-            path,
-            old_text,
-            new_text,
-        } = diff;
-
         let multibuffer = cx.new(|_cx| MultiBuffer::without_headers(Capability::ReadOnly));
 
         let new_buffer = cx.new(|cx| Buffer::local(new_text, cx));
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 25e64acbee..350785ec1e 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -2,6 +2,7 @@ use agent::ThreadId;
 use anyhow::{Context as _, Result, bail};
 use file_icons::FileIcons;
 use prompt_store::{PromptId, UserPromptId};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     ops::Range,
@@ -11,7 +12,7 @@ use std::{
 use ui::{App, IconName, SharedString};
 use url::Url;
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum MentionUri {
     File {
         abs_path: PathBuf,
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index ac1840e5e5..8129341545 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -14,6 +14,7 @@ workspace = true
 [dependencies]
 acp_thread.workspace = true
 action_log.workspace = true
+agent.workspace = true
 agent-client-protocol.workspace = true
 agent_servers.workspace = true
 agent_settings.workspace = true
@@ -26,6 +27,7 @@ collections.workspace = true
 context_server.workspace = true
 fs.workspace = true
 futures.workspace = true
+git.workspace = true
 gpui.workspace = true
 handlebars = { workspace = true, features = ["rust-embed"] }
 html_to_markdown.workspace = true
@@ -59,6 +61,7 @@ which.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
+agent = { workspace = true, "features" = ["test-support"] }
 ctor.workspace = true
 client = { workspace = true, "features" = ["test-support"] }
 clock = { workspace = true, "features" = ["test-support"] }
@@ -66,6 +69,7 @@ context_server = { workspace = true, "features" = ["test-support"] }
 editor = { workspace = true, "features" = ["test-support"] }
 env_logger.workspace = true
 fs = { workspace = true, "features" = ["test-support"] }
+git = { workspace = true, "features" = ["test-support"] }
 gpui = { workspace = true, "features" = ["test-support"] }
 gpui_tokio.workspace = true
 language = { workspace = true, "features" = ["test-support"] }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 480b2baa95..9cf0c3b603 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1,10 +1,11 @@
 use crate::{
-    AgentResponseEvent, ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DeletePathTool,
-    DiagnosticsTool, EditFileTool, FetchTool, FindPathTool, GrepTool, ListDirectoryTool,
-    MovePathTool, NowTool, OpenTool, ReadFileTool, TerminalTool, ThinkingTool, Thread,
-    ToolCallAuthorization, UserMessageContent, WebSearchTool, templates::Templates,
+    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DeletePathTool, DiagnosticsTool,
+    EditFileTool, FetchTool, FindPathTool, GrepTool, ListDirectoryTool, MovePathTool, NowTool,
+    OpenTool, ReadFileTool, TerminalTool, ThinkingTool, Thread, ThreadEvent, ToolCallAuthorization,
+    UserMessageContent, WebSearchTool, templates::Templates,
 };
 use acp_thread::AgentModelSelector;
+use action_log::ActionLog;
 use agent_client_protocol as acp;
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, anyhow};
@@ -427,18 +428,19 @@ impl NativeAgent {
     ) {
         self.models.refresh_list(cx);
 
-        let default_model = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|m| m.model.clone());
+        let registry = LanguageModelRegistry::read_global(cx);
+        let default_model = registry.default_model().map(|m| m.model.clone());
+        let summarization_model = registry.thread_summary_model().map(|m| m.model.clone());
 
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, cx| {
                 if thread.model().is_none()
                     && let Some(model) = default_model.clone()
                 {
-                    thread.set_model(model);
+                    thread.set_model(model, cx);
                     cx.notify();
                 }
+                thread.set_summarization_model(summarization_model.clone(), cx);
             });
         }
     }
@@ -462,10 +464,7 @@ impl NativeAgentConnection {
         session_id: acp::SessionId,
         cx: &mut App,
         f: impl 'static
-        + FnOnce(
-            Entity<Thread>,
-            &mut App,
-        ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>>,
+        + FnOnce(Entity<Thread>, &mut App) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>>,
     ) -> Task<Result<acp::PromptResponse>> {
         let Some((thread, acp_thread)) = self.0.update(cx, |agent, _cx| {
             agent
@@ -489,7 +488,18 @@ impl NativeAgentConnection {
                         log::trace!("Received completion event: {:?}", event);
 
                         match event {
-                            AgentResponseEvent::Text(text) => {
+                            ThreadEvent::UserMessage(message) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    for content in message.content {
+                                        thread.push_user_content_block(
+                                            Some(message.id.clone()),
+                                            content.into(),
+                                            cx,
+                                        );
+                                    }
+                                })?;
+                            }
+                            ThreadEvent::AgentText(text) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.push_assistant_content_block(
                                         acp::ContentBlock::Text(acp::TextContent {
@@ -501,7 +511,7 @@ impl NativeAgentConnection {
                                     )
                                 })?;
                             }
-                            AgentResponseEvent::Thinking(text) => {
+                            ThreadEvent::AgentThinking(text) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.push_assistant_content_block(
                                         acp::ContentBlock::Text(acp::TextContent {
@@ -513,7 +523,7 @@ impl NativeAgentConnection {
                                     )
                                 })?;
                             }
-                            AgentResponseEvent::ToolCallAuthorization(ToolCallAuthorization {
+                            ThreadEvent::ToolCallAuthorization(ToolCallAuthorization {
                                 tool_call,
                                 options,
                                 response,
@@ -536,22 +546,26 @@ impl NativeAgentConnection {
                                 })
                                 .detach();
                             }
-                            AgentResponseEvent::ToolCall(tool_call) => {
+                            ThreadEvent::ToolCall(tool_call) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.upsert_tool_call(tool_call, cx)
                                 })??;
                             }
-                            AgentResponseEvent::ToolCallUpdate(update) => {
+                            ThreadEvent::ToolCallUpdate(update) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.update_tool_call(update, cx)
                                 })??;
                             }
-                            AgentResponseEvent::Retry(status) => {
+                            ThreadEvent::TitleUpdate(title) => {
+                                acp_thread
+                                    .update(cx, |thread, cx| thread.update_title(title, cx))??;
+                            }
+                            ThreadEvent::Retry(status) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.update_retry_status(status, cx)
                                 })?;
                             }
-                            AgentResponseEvent::Stop(stop_reason) => {
+                            ThreadEvent::Stop(stop_reason) => {
                                 log::debug!("Assistant message complete: {:?}", stop_reason);
                                 return Ok(acp::PromptResponse { stop_reason });
                             }
@@ -604,8 +618,8 @@ impl AgentModelSelector for NativeAgentConnection {
             return Task::ready(Err(anyhow!("Invalid model ID {}", model_id)));
         };
 
-        thread.update(cx, |thread, _cx| {
-            thread.set_model(model.clone());
+        thread.update(cx, |thread, cx| {
+            thread.set_model(model.clone(), cx);
         });
 
         update_settings_file::<AgentSettings>(
@@ -665,30 +679,14 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         cx.spawn(async move |cx| {
             log::debug!("Starting thread creation in async context");
 
-            // Generate session ID
-            let session_id = acp::SessionId(uuid::Uuid::new_v4().to_string().into());
-            log::info!("Created session with ID: {}", session_id);
-
-            // Create AcpThread
-            let acp_thread = cx.update(|cx| {
-                cx.new(|cx| {
-                    acp_thread::AcpThread::new(
-                        "agent2",
-                        self.clone(),
-                        project.clone(),
-                        session_id.clone(),
-                        cx,
-                    )
-                })
-            })?;
-            let action_log = cx.update(|cx| acp_thread.read(cx).action_log().clone())?;
-
+            let action_log = cx.new(|_cx| ActionLog::new(project.clone()))?;
             // Create Thread
             let thread = agent.update(
                 cx,
                 |agent, cx: &mut gpui::Context<NativeAgent>| -> Result<_> {
                     // Fetch default model from registry settings
                     let registry = LanguageModelRegistry::read_global(cx);
+                    let language_registry = project.read(cx).languages().clone();
 
                     // Log available models for debugging
                     let available_count = registry.available_models(cx).count();
@@ -699,6 +697,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             .models
                             .model_from_id(&LanguageModels::model_id(&default_model.model))
                     });
+                    let summarization_model = registry.thread_summary_model().map(|c| c.model);
 
                     let thread = cx.new(|cx| {
                         let mut thread = Thread::new(
@@ -708,13 +707,14 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             action_log.clone(),
                             agent.templates.clone(),
                             default_model,
+                            summarization_model,
                             cx,
                         );
                         thread.add_tool(CopyPathTool::new(project.clone()));
                         thread.add_tool(CreateDirectoryTool::new(project.clone()));
                         thread.add_tool(DeletePathTool::new(project.clone(), action_log.clone()));
                         thread.add_tool(DiagnosticsTool::new(project.clone()));
-                        thread.add_tool(EditFileTool::new(cx.entity()));
+                        thread.add_tool(EditFileTool::new(cx.weak_entity(), language_registry));
                         thread.add_tool(FetchTool::new(project.read(cx).client().http_client()));
                         thread.add_tool(FindPathTool::new(project.clone()));
                         thread.add_tool(GrepTool::new(project.clone()));
@@ -722,7 +722,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                         thread.add_tool(MovePathTool::new(project.clone()));
                         thread.add_tool(NowTool);
                         thread.add_tool(OpenTool::new(project.clone()));
-                        thread.add_tool(ReadFileTool::new(project.clone(), action_log));
+                        thread.add_tool(ReadFileTool::new(project.clone(), action_log.clone()));
                         thread.add_tool(TerminalTool::new(project.clone(), cx));
                         thread.add_tool(ThinkingTool);
                         thread.add_tool(WebSearchTool); // TODO: Enable this only if it's a zed model.
@@ -733,6 +733,21 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                 },
             )??;
 
+            let session_id = thread.read_with(cx, |thread, _| thread.id().clone())?;
+            log::info!("Created session with ID: {}", session_id);
+            // Create AcpThread
+            let acp_thread = cx.update(|cx| {
+                cx.new(|_cx| {
+                    acp_thread::AcpThread::new(
+                        "agent2",
+                        self.clone(),
+                        project.clone(),
+                        action_log.clone(),
+                        session_id.clone(),
+                    )
+                })
+            })?;
+
             // Store the session
             agent.update(cx, |agent, cx| {
                 agent.sessions.insert(
@@ -803,7 +818,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         log::info!("Cancelling on session: {}", session_id);
         self.0.update(cx, |agent, cx| {
             if let Some(agent) = agent.sessions.get(session_id) {
-                agent.thread.update(cx, |thread, _cx| thread.cancel());
+                agent.thread.update(cx, |thread, cx| thread.cancel(cx));
             }
         });
     }
@@ -830,7 +845,10 @@ struct NativeAgentSessionEditor(Entity<Thread>);
 
 impl acp_thread::AgentSessionEditor for NativeAgentSessionEditor {
     fn truncate(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
-        Task::ready(self.0.update(cx, |thread, _cx| thread.truncate(message_id)))
+        Task::ready(
+            self.0
+                .update(cx, |thread, cx| thread.truncate(message_id, cx)),
+        )
     }
 }
 
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index c83479f2cf..33706b05de 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -345,7 +345,7 @@ async fn test_streaming_tool_calls(cx: &mut TestAppContext) {
 
     let mut saw_partial_tool_use = false;
     while let Some(event) = events.next().await {
-        if let Ok(AgentResponseEvent::ToolCall(tool_call)) = event {
+        if let Ok(ThreadEvent::ToolCall(tool_call)) = event {
             thread.update(cx, |thread, _cx| {
                 // Look for a tool use in the thread's last message
                 let message = thread.last_message().unwrap();
@@ -735,16 +735,14 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
     );
 }
 
-async fn expect_tool_call(
-    events: &mut UnboundedReceiver<Result<AgentResponseEvent>>,
-) -> acp::ToolCall {
+async fn expect_tool_call(events: &mut UnboundedReceiver<Result<ThreadEvent>>) -> acp::ToolCall {
     let event = events
         .next()
         .await
         .expect("no tool call authorization event received")
         .unwrap();
     match event {
-        AgentResponseEvent::ToolCall(tool_call) => return tool_call,
+        ThreadEvent::ToolCall(tool_call) => return tool_call,
         event => {
             panic!("Unexpected event {event:?}");
         }
@@ -752,7 +750,7 @@ async fn expect_tool_call(
 }
 
 async fn expect_tool_call_update_fields(
-    events: &mut UnboundedReceiver<Result<AgentResponseEvent>>,
+    events: &mut UnboundedReceiver<Result<ThreadEvent>>,
 ) -> acp::ToolCallUpdate {
     let event = events
         .next()
@@ -760,7 +758,7 @@ async fn expect_tool_call_update_fields(
         .expect("no tool call authorization event received")
         .unwrap();
     match event {
-        AgentResponseEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(update)) => {
+        ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(update)) => {
             return update;
         }
         event => {
@@ -770,7 +768,7 @@ async fn expect_tool_call_update_fields(
 }
 
 async fn next_tool_call_authorization(
-    events: &mut UnboundedReceiver<Result<AgentResponseEvent>>,
+    events: &mut UnboundedReceiver<Result<ThreadEvent>>,
 ) -> ToolCallAuthorization {
     loop {
         let event = events
@@ -778,7 +776,7 @@ async fn next_tool_call_authorization(
             .await
             .expect("no tool call authorization event received")
             .unwrap();
-        if let AgentResponseEvent::ToolCallAuthorization(tool_call_authorization) = event {
+        if let ThreadEvent::ToolCallAuthorization(tool_call_authorization) = event {
             let permission_kinds = tool_call_authorization
                 .options
                 .iter()
@@ -945,13 +943,13 @@ async fn test_cancellation(cx: &mut TestAppContext) {
     let mut echo_completed = false;
     while let Some(event) = events.next().await {
         match event.unwrap() {
-            AgentResponseEvent::ToolCall(tool_call) => {
+            ThreadEvent::ToolCall(tool_call) => {
                 assert_eq!(tool_call.title, expected_tools.remove(0));
                 if tool_call.title == "Echo" {
                     echo_id = Some(tool_call.id);
                 }
             }
-            AgentResponseEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
+            ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
                 acp::ToolCallUpdate {
                     id,
                     fields:
@@ -973,13 +971,13 @@ async fn test_cancellation(cx: &mut TestAppContext) {
 
     // Cancel the current send and ensure that the event stream is closed, even
     // if one of the tools is still running.
-    thread.update(cx, |thread, _cx| thread.cancel());
+    thread.update(cx, |thread, cx| thread.cancel(cx));
     let events = events.collect::<Vec<_>>().await;
     let last_event = events.last();
     assert!(
         matches!(
             last_event,
-            Some(Ok(AgentResponseEvent::Stop(acp::StopReason::Canceled)))
+            Some(Ok(ThreadEvent::Stop(acp::StopReason::Canceled)))
         ),
         "unexpected event {last_event:?}"
     );
@@ -1161,7 +1159,7 @@ async fn test_truncate(cx: &mut TestAppContext) {
     });
 
     thread
-        .update(cx, |thread, _cx| thread.truncate(message_id))
+        .update(cx, |thread, cx| thread.truncate(message_id, cx))
         .unwrap();
     cx.run_until_parked();
     thread.read_with(cx, |thread, _| {
@@ -1203,6 +1201,51 @@ async fn test_truncate(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_title_generation(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let summary_model = Arc::new(FakeLanguageModel::default());
+    thread.update(cx, |thread, cx| {
+        thread.set_summarization_model(Some(summary_model.clone()), cx)
+    });
+
+    let send = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_text_chunk("Hey!");
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "New Thread"));
+
+    // Ensure the summary model has been invoked to generate a title.
+    summary_model.send_last_completion_stream_text_chunk("Hello ");
+    summary_model.send_last_completion_stream_text_chunk("world\nG");
+    summary_model.send_last_completion_stream_text_chunk("oodnight Moon");
+    summary_model.end_last_completion_stream();
+    send.collect::<Vec<_>>().await;
+    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
+
+    // Send another message, ensuring no title is generated this time.
+    let send = thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Hello again"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Hey again!");
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+    assert_eq!(summary_model.pending_completions(), Vec::new());
+    send.collect::<Vec<_>>().await;
+    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
+}
+
 #[gpui::test]
 async fn test_agent_connection(cx: &mut TestAppContext) {
     cx.update(settings::init);
@@ -1442,7 +1485,7 @@ async fn test_send_no_retry_on_success(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn);
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
             thread.send(UserMessageId::new(), ["Hello!"], cx)
         })
         .unwrap();
@@ -1454,10 +1497,10 @@ async fn test_send_no_retry_on_success(cx: &mut TestAppContext) {
     let mut retry_events = Vec::new();
     while let Some(Ok(event)) = events.next().await {
         match event {
-            AgentResponseEvent::Retry(retry_status) => {
+            ThreadEvent::Retry(retry_status) => {
                 retry_events.push(retry_status);
             }
-            AgentResponseEvent::Stop(..) => break,
+            ThreadEvent::Stop(..) => break,
             _ => {}
         }
     }
@@ -1486,7 +1529,7 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn);
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
             thread.send(UserMessageId::new(), ["Hello!"], cx)
         })
         .unwrap();
@@ -1507,10 +1550,10 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
     let mut retry_events = Vec::new();
     while let Some(Ok(event)) = events.next().await {
         match event {
-            AgentResponseEvent::Retry(retry_status) => {
+            ThreadEvent::Retry(retry_status) => {
                 retry_events.push(retry_status);
             }
-            AgentResponseEvent::Stop(..) => break,
+            ThreadEvent::Stop(..) => break,
             _ => {}
         }
     }
@@ -1543,7 +1586,7 @@ async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
 
     let mut events = thread
         .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn);
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
             thread.send(UserMessageId::new(), ["Hello!"], cx)
         })
         .unwrap();
@@ -1565,10 +1608,10 @@ async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
     let mut retry_events = Vec::new();
     while let Some(event) = events.next().await {
         match event {
-            Ok(AgentResponseEvent::Retry(retry_status)) => {
+            Ok(ThreadEvent::Retry(retry_status)) => {
                 retry_events.push(retry_status);
             }
-            Ok(AgentResponseEvent::Stop(..)) => break,
+            Ok(ThreadEvent::Stop(..)) => break,
             Err(error) => errors.push(error),
             _ => {}
         }
@@ -1592,11 +1635,11 @@ async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
 }
 
 /// Filters out the stop events for asserting against in tests
-fn stop_events(result_events: Vec<Result<AgentResponseEvent>>) -> Vec<acp::StopReason> {
+fn stop_events(result_events: Vec<Result<ThreadEvent>>) -> Vec<acp::StopReason> {
     result_events
         .into_iter()
         .filter_map(|event| match event.unwrap() {
-            AgentResponseEvent::Stop(stop_reason) => Some(stop_reason),
+            ThreadEvent::Stop(stop_reason) => Some(stop_reason),
             _ => None,
         })
         .collect()
@@ -1713,6 +1756,7 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
             action_log,
             templates,
             Some(model.clone()),
+            None,
             cx,
         )
     });
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 856e70ce59..aeb600e232 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1,25 +1,34 @@
 use crate::{ContextServerRegistry, SystemPromptTemplate, Template, Templates};
 use acp_thread::{MentionUri, UserMessageId};
 use action_log::ActionLog;
+use agent::thread::{DetailedSummaryState, GitState, ProjectSnapshot, WorktreeSnapshot};
 use agent_client_protocol as acp;
-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
+use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, SUMMARIZE_THREAD_PROMPT};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
+use chrono::{DateTime, Utc};
 use cloud_llm_client::{CompletionIntent, CompletionRequestStatus};
 use collections::IndexMap;
 use fs::Fs;
 use futures::{
+    FutureExt,
     channel::{mpsc, oneshot},
+    future::Shared,
     stream::FuturesUnordered,
 };
+use git::repository::DiffType;
 use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
 use language_model::{
     LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelImage,
     LanguageModelProviderId, LanguageModelRequest, LanguageModelRequestMessage,
     LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolResultContent,
     LanguageModelToolSchemaFormat, LanguageModelToolUse, LanguageModelToolUseId, Role, StopReason,
+    TokenUsage,
+};
+use project::{
+    Project,
+    git_store::{GitStore, RepositoryState},
 };
-use project::Project;
 use prompt_store::ProjectContext;
 use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
@@ -35,28 +44,7 @@ use std::{fmt::Write, ops::Range};
 use util::{ResultExt, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
 
-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize, JsonSchema,
-)]
-pub struct ThreadId(Arc<str>);
-
-impl ThreadId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4().to_string().into())
-    }
-}
-
-impl std::fmt::Display for ThreadId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<&str> for ThreadId {
-    fn from(value: &str) -> Self {
-        Self(value.into())
-    }
-}
+const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
 
 /// The ID of the user prompt that initiated a request.
 ///
@@ -91,7 +79,7 @@ enum RetryStrategy {
     },
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Message {
     User(UserMessage),
     Agent(AgentMessage),
@@ -106,6 +94,18 @@ impl Message {
         }
     }
 
+    pub fn to_request(&self) -> Vec<LanguageModelRequestMessage> {
+        match self {
+            Message::User(message) => vec![message.to_request()],
+            Message::Agent(message) => message.to_request(),
+            Message::Resume => vec![LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Continue where you left off".into()],
+                cache: false,
+            }],
+        }
+    }
+
     pub fn to_markdown(&self) -> String {
         match self {
             Message::User(message) => message.to_markdown(),
@@ -113,15 +113,22 @@ impl Message {
             Message::Resume => "[resumed after tool use limit was reached]".into(),
         }
     }
+
+    pub fn role(&self) -> Role {
+        match self {
+            Message::User(_) | Message::Resume => Role::User,
+            Message::Agent(_) => Role::Assistant,
+        }
+    }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct UserMessage {
     pub id: UserMessageId,
     pub content: Vec<UserMessageContent>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum UserMessageContent {
     Text(String),
     Mention { uri: MentionUri, content: String },
@@ -345,9 +352,6 @@ impl AgentMessage {
                 AgentMessageContent::RedactedThinking(_) => {
                     markdown.push_str("<redacted_thinking />\n")
                 }
-                AgentMessageContent::Image(_) => {
-                    markdown.push_str("<image />\n");
-                }
                 AgentMessageContent::ToolUse(tool_use) => {
                     markdown.push_str(&format!(
                         "**Tool Use**: {} (ID: {})\n",
@@ -418,9 +422,6 @@ impl AgentMessage {
                 AgentMessageContent::ToolUse(value) => {
                     language_model::MessageContent::ToolUse(value.clone())
                 }
-                AgentMessageContent::Image(value) => {
-                    language_model::MessageContent::Image(value.clone())
-                }
             };
             assistant_message.content.push(chunk);
         }
@@ -450,13 +451,13 @@ impl AgentMessage {
     }
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AgentMessage {
     pub content: Vec<AgentMessageContent>,
     pub tool_results: IndexMap<LanguageModelToolUseId, LanguageModelToolResult>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AgentMessageContent {
     Text(String),
     Thinking {
@@ -464,17 +465,18 @@ pub enum AgentMessageContent {
         signature: Option<String>,
     },
     RedactedThinking(String),
-    Image(LanguageModelImage),
     ToolUse(LanguageModelToolUse),
 }
 
 #[derive(Debug)]
-pub enum AgentResponseEvent {
-    Text(String),
-    Thinking(String),
+pub enum ThreadEvent {
+    UserMessage(UserMessage),
+    AgentText(String),
+    AgentThinking(String),
     ToolCall(acp::ToolCall),
     ToolCallUpdate(acp_thread::ToolCallUpdate),
     ToolCallAuthorization(ToolCallAuthorization),
+    TitleUpdate(SharedString),
     Retry(acp_thread::RetryStatus),
     Stop(acp::StopReason),
 }
@@ -487,8 +489,12 @@ pub struct ToolCallAuthorization {
 }
 
 pub struct Thread {
-    id: ThreadId,
+    id: acp::SessionId,
     prompt_id: PromptId,
+    updated_at: DateTime<Utc>,
+    title: Option<SharedString>,
+    #[allow(unused)]
+    summary: DetailedSummaryState,
     messages: Vec<Message>,
     completion_mode: CompletionMode,
     /// Holds the task that handles agent interaction until the end of the turn.
@@ -498,11 +504,18 @@ pub struct Thread {
     pending_message: Option<AgentMessage>,
     tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
     tool_use_limit_reached: bool,
+    #[allow(unused)]
+    request_token_usage: Vec<TokenUsage>,
+    #[allow(unused)]
+    cumulative_token_usage: TokenUsage,
+    #[allow(unused)]
+    initial_project_snapshot: Shared<Task<Option<Arc<ProjectSnapshot>>>>,
     context_server_registry: Entity<ContextServerRegistry>,
     profile_id: AgentProfileId,
     project_context: Entity<ProjectContext>,
     templates: Arc<Templates>,
     model: Option<Arc<dyn LanguageModel>>,
+    summarization_model: Option<Arc<dyn LanguageModel>>,
     project: Entity<Project>,
     action_log: Entity<ActionLog>,
 }
@@ -515,36 +528,254 @@ impl Thread {
         action_log: Entity<ActionLog>,
         templates: Arc<Templates>,
         model: Option<Arc<dyn LanguageModel>>,
+        summarization_model: Option<Arc<dyn LanguageModel>>,
         cx: &mut Context<Self>,
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
         Self {
-            id: ThreadId::new(),
+            id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
             prompt_id: PromptId::new(),
+            updated_at: Utc::now(),
+            title: None,
+            summary: DetailedSummaryState::default(),
             messages: Vec::new(),
             completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
             running_turn: None,
             pending_message: None,
             tools: BTreeMap::default(),
             tool_use_limit_reached: false,
+            request_token_usage: Vec::new(),
+            cumulative_token_usage: TokenUsage::default(),
+            initial_project_snapshot: {
+                let project_snapshot = Self::project_snapshot(project.clone(), cx);
+                cx.foreground_executor()
+                    .spawn(async move { Some(project_snapshot.await) })
+                    .shared()
+            },
             context_server_registry,
             profile_id,
             project_context,
             templates,
             model,
+            summarization_model,
             project,
             action_log,
         }
     }
 
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
+    pub fn id(&self) -> &acp::SessionId {
+        &self.id
+    }
+
+    pub fn replay(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> mpsc::UnboundedReceiver<Result<ThreadEvent>> {
+        let (tx, rx) = mpsc::unbounded();
+        let stream = ThreadEventStream(tx);
+        for message in &self.messages {
+            match message {
+                Message::User(user_message) => stream.send_user_message(user_message),
+                Message::Agent(assistant_message) => {
+                    for content in &assistant_message.content {
+                        match content {
+                            AgentMessageContent::Text(text) => stream.send_text(text),
+                            AgentMessageContent::Thinking { text, .. } => {
+                                stream.send_thinking(text)
+                            }
+                            AgentMessageContent::RedactedThinking(_) => {}
+                            AgentMessageContent::ToolUse(tool_use) => {
+                                self.replay_tool_call(
+                                    tool_use,
+                                    assistant_message.tool_results.get(&tool_use.id),
+                                    &stream,
+                                    cx,
+                                );
+                            }
+                        }
+                    }
+                }
+                Message::Resume => {}
+            }
+        }
+        rx
+    }
+
+    fn replay_tool_call(
+        &self,
+        tool_use: &LanguageModelToolUse,
+        tool_result: Option<&LanguageModelToolResult>,
+        stream: &ThreadEventStream,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(tool) = self.tools.get(tool_use.name.as_ref()) else {
+            stream
+                .0
+                .unbounded_send(Ok(ThreadEvent::ToolCall(acp::ToolCall {
+                    id: acp::ToolCallId(tool_use.id.to_string().into()),
+                    title: tool_use.name.to_string(),
+                    kind: acp::ToolKind::Other,
+                    status: acp::ToolCallStatus::Failed,
+                    content: Vec::new(),
+                    locations: Vec::new(),
+                    raw_input: Some(tool_use.input.clone()),
+                    raw_output: None,
+                })))
+                .ok();
+            return;
+        };
+
+        let title = tool.initial_title(tool_use.input.clone());
+        let kind = tool.kind();
+        stream.send_tool_call(&tool_use.id, title, kind, tool_use.input.clone());
+
+        let output = tool_result
+            .as_ref()
+            .and_then(|result| result.output.clone());
+        if let Some(output) = output.clone() {
+            let tool_event_stream = ToolCallEventStream::new(
+                tool_use.id.clone(),
+                stream.clone(),
+                Some(self.project.read(cx).fs().clone()),
+            );
+            tool.replay(tool_use.input.clone(), output, tool_event_stream, cx)
+                .log_err();
+        }
+
+        stream.update_tool_call_fields(
+            &tool_use.id,
+            acp::ToolCallUpdateFields {
+                status: Some(acp::ToolCallStatus::Completed),
+                raw_output: output,
+                ..Default::default()
+            },
+        );
+    }
+
+    /// Create a snapshot of the current project state including git information and unsaved buffers.
+    fn project_snapshot(
+        project: Entity<Project>,
+        cx: &mut Context<Self>,
+    ) -> Task<Arc<agent::thread::ProjectSnapshot>> {
+        let git_store = project.read(cx).git_store().clone();
+        let worktree_snapshots: Vec<_> = project
+            .read(cx)
+            .visible_worktrees(cx)
+            .map(|worktree| Self::worktree_snapshot(worktree, git_store.clone(), cx))
+            .collect();
+
+        cx.spawn(async move |_, cx| {
+            let worktree_snapshots = futures::future::join_all(worktree_snapshots).await;
+
+            let mut unsaved_buffers = Vec::new();
+            cx.update(|app_cx| {
+                let buffer_store = project.read(app_cx).buffer_store();
+                for buffer_handle in buffer_store.read(app_cx).buffers() {
+                    let buffer = buffer_handle.read(app_cx);
+                    if buffer.is_dirty()
+                        && let Some(file) = buffer.file()
+                    {
+                        let path = file.path().to_string_lossy().to_string();
+                        unsaved_buffers.push(path);
+                    }
+                }
+            })
+            .ok();
+
+            Arc::new(ProjectSnapshot {
+                worktree_snapshots,
+                unsaved_buffer_paths: unsaved_buffers,
+                timestamp: Utc::now(),
+            })
+        })
+    }
+
+    fn worktree_snapshot(
+        worktree: Entity<project::Worktree>,
+        git_store: Entity<GitStore>,
+        cx: &App,
+    ) -> Task<agent::thread::WorktreeSnapshot> {
+        cx.spawn(async move |cx| {
+            // Get worktree path and snapshot
+            let worktree_info = cx.update(|app_cx| {
+                let worktree = worktree.read(app_cx);
+                let path = worktree.abs_path().to_string_lossy().to_string();
+                let snapshot = worktree.snapshot();
+                (path, snapshot)
+            });
+
+            let Ok((worktree_path, _snapshot)) = worktree_info else {
+                return WorktreeSnapshot {
+                    worktree_path: String::new(),
+                    git_state: None,
+                };
+            };
+
+            let git_state = git_store
+                .update(cx, |git_store, cx| {
+                    git_store
+                        .repositories()
+                        .values()
+                        .find(|repo| {
+                            repo.read(cx)
+                                .abs_path_to_repo_path(&worktree.read(cx).abs_path())
+                                .is_some()
+                        })
+                        .cloned()
+                })
+                .ok()
+                .flatten()
+                .map(|repo| {
+                    repo.update(cx, |repo, _| {
+                        let current_branch =
+                            repo.branch.as_ref().map(|branch| branch.name().to_owned());
+                        repo.send_job(None, |state, _| async move {
+                            let RepositoryState::Local { backend, .. } = state else {
+                                return GitState {
+                                    remote_url: None,
+                                    head_sha: None,
+                                    current_branch,
+                                    diff: None,
+                                };
+                            };
+
+                            let remote_url = backend.remote_url("origin");
+                            let head_sha = backend.head_sha().await;
+                            let diff = backend.diff(DiffType::HeadToWorktree).await.ok();
+
+                            GitState {
+                                remote_url,
+                                head_sha,
+                                current_branch,
+                                diff,
+                            }
+                        })
+                    })
+                });
+
+            let git_state = match git_state {
+                Some(git_state) => match git_state.ok() {
+                    Some(git_state) => git_state.await.ok(),
+                    None => None,
+                },
+                None => None,
+            };
+
+            WorktreeSnapshot {
+                worktree_path,
+                git_state,
+            }
+        })
     }
 
     pub fn project_context(&self) -> &Entity<ProjectContext> {
         &self.project_context
     }
 
+    pub fn project(&self) -> &Entity<Project> {
+        &self.project
+    }
+
     pub fn action_log(&self) -> &Entity<ActionLog> {
         &self.action_log
     }
@@ -553,16 +784,27 @@ impl Thread {
         self.model.as_ref()
     }
 
-    pub fn set_model(&mut self, model: Arc<dyn LanguageModel>) {
+    pub fn set_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
         self.model = Some(model);
+        cx.notify()
+    }
+
+    pub fn set_summarization_model(
+        &mut self,
+        model: Option<Arc<dyn LanguageModel>>,
+        cx: &mut Context<Self>,
+    ) {
+        self.summarization_model = model;
+        cx.notify()
     }
 
     pub fn completion_mode(&self) -> CompletionMode {
         self.completion_mode
     }
 
-    pub fn set_completion_mode(&mut self, mode: CompletionMode) {
+    pub fn set_completion_mode(&mut self, mode: CompletionMode, cx: &mut Context<Self>) {
         self.completion_mode = mode;
+        cx.notify()
     }
 
     #[cfg(any(test, feature = "test-support"))]
@@ -590,29 +832,29 @@ impl Thread {
         self.profile_id = profile_id;
     }
 
-    pub fn cancel(&mut self) {
+    pub fn cancel(&mut self, cx: &mut Context<Self>) {
         if let Some(running_turn) = self.running_turn.take() {
             running_turn.cancel();
         }
-        self.flush_pending_message();
+        self.flush_pending_message(cx);
     }
 
-    pub fn truncate(&mut self, message_id: UserMessageId) -> Result<()> {
-        self.cancel();
+    pub fn truncate(&mut self, message_id: UserMessageId, cx: &mut Context<Self>) -> Result<()> {
+        self.cancel(cx);
         let Some(position) = self.messages.iter().position(
             |msg| matches!(msg, Message::User(UserMessage { id, .. }) if id == &message_id),
         ) else {
             return Err(anyhow!("Message not found"));
         };
         self.messages.truncate(position);
+        cx.notify();
         Ok(())
     }
 
     pub fn resume(
         &mut self,
         cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>> {
-        anyhow::ensure!(self.model.is_some(), "Model not set");
+    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
         anyhow::ensure!(
             self.tool_use_limit_reached,
             "can only resume after tool use limit is reached"
@@ -633,7 +875,7 @@ impl Thread {
         id: UserMessageId,
         content: impl IntoIterator<Item = T>,
         cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>>
+    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>>
     where
         T: Into<UserMessageContent>,
     {
@@ -656,22 +898,19 @@ impl Thread {
     fn run_turn(
         &mut self,
         cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<AgentResponseEvent>>> {
-        self.cancel();
+    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
+        self.cancel(cx);
 
-        let model = self
-            .model()
-            .cloned()
-            .context("No language model configured")?;
-        let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
-        let event_stream = AgentResponseEventStream(events_tx);
+        let model = self.model.clone().context("No language model configured")?;
+        let (events_tx, events_rx) = mpsc::unbounded::<Result<ThreadEvent>>();
+        let event_stream = ThreadEventStream(events_tx);
         let message_ix = self.messages.len().saturating_sub(1);
         self.tool_use_limit_reached = false;
         self.running_turn = Some(RunningTurn {
             event_stream: event_stream.clone(),
             _task: cx.spawn(async move |this, cx| {
                 log::info!("Starting agent turn execution");
-                let turn_result: Result<()> = async {
+                let turn_result: Result<StopReason> = async {
                     let mut completion_intent = CompletionIntent::UserPrompt;
                     loop {
                         log::debug!(
@@ -685,18 +924,27 @@ impl Thread {
                         log::info!("Calling model.stream_completion");
 
                         let mut tool_use_limit_reached = false;
+                        let mut refused = false;
+                        let mut reached_max_tokens = false;
                         let mut tool_uses = Self::stream_completion_with_retries(
                             this.clone(),
                             model.clone(),
                             request,
-                            message_ix,
                             &event_stream,
                             &mut tool_use_limit_reached,
+                            &mut refused,
+                            &mut reached_max_tokens,
                             cx,
                         )
                         .await?;
 
-                        let used_tools = tool_uses.is_empty();
+                        if refused {
+                            return Ok(StopReason::Refusal);
+                        } else if reached_max_tokens {
+                            return Ok(StopReason::MaxTokens);
+                        }
+
+                        let end_turn = tool_uses.is_empty();
                         while let Some(tool_result) = tool_uses.next().await {
                             log::info!("Tool finished {:?}", tool_result);
 
@@ -724,29 +972,42 @@ impl Thread {
                             log::info!("Tool use limit reached, completing turn");
                             this.update(cx, |this, _cx| this.tool_use_limit_reached = true)?;
                             return Err(language_model::ToolUseLimitReachedError.into());
-                        } else if used_tools {
+                        } else if end_turn {
                             log::info!("No tool uses found, completing turn");
-                            return Ok(());
+                            return Ok(StopReason::EndTurn);
                         } else {
-                            this.update(cx, |this, _| this.flush_pending_message())?;
+                            this.update(cx, |this, cx| this.flush_pending_message(cx))?;
                             completion_intent = CompletionIntent::ToolResults;
                         }
                     }
                 }
                 .await;
+                _ = this.update(cx, |this, cx| this.flush_pending_message(cx));
 
-                if let Err(error) = turn_result {
-                    log::error!("Turn execution failed: {:?}", error);
-                    event_stream.send_error(error);
-                } else {
-                    log::info!("Turn execution completed successfully");
+                match turn_result {
+                    Ok(reason) => {
+                        log::info!("Turn execution completed: {:?}", reason);
+
+                        let update_title = this
+                            .update(cx, |this, cx| this.update_title(&event_stream, cx))
+                            .ok()
+                            .flatten();
+                        if let Some(update_title) = update_title {
+                            update_title.await.context("update title failed").log_err();
+                        }
+
+                        event_stream.send_stop(reason);
+                        if reason == StopReason::Refusal {
+                            _ = this.update(cx, |this, _| this.messages.truncate(message_ix));
+                        }
+                    }
+                    Err(error) => {
+                        log::error!("Turn execution failed: {:?}", error);
+                        event_stream.send_error(error);
+                    }
                 }
 
-                this.update(cx, |this, _| {
-                    this.flush_pending_message();
-                    this.running_turn.take();
-                })
-                .ok();
+                _ = this.update(cx, |this, _| this.running_turn.take());
             }),
         });
         Ok(events_rx)
@@ -756,9 +1017,10 @@ impl Thread {
         this: WeakEntity<Self>,
         model: Arc<dyn LanguageModel>,
         request: LanguageModelRequest,
-        message_ix: usize,
-        event_stream: &AgentResponseEventStream,
+        event_stream: &ThreadEventStream,
         tool_use_limit_reached: &mut bool,
+        refusal: &mut bool,
+        max_tokens_reached: &mut bool,
         cx: &mut AsyncApp,
     ) -> Result<FuturesUnordered<Task<LanguageModelToolResult>>> {
         log::debug!("Stream completion started successfully");
@@ -774,16 +1036,17 @@ impl Thread {
                     )) => {
                         *tool_use_limit_reached = true;
                     }
-                    Ok(LanguageModelCompletionEvent::Stop(reason)) => {
-                        event_stream.send_stop(reason);
-                        if reason == StopReason::Refusal {
-                            this.update(cx, |this, _cx| {
-                                this.flush_pending_message();
-                                this.messages.truncate(message_ix);
-                            })?;
-                            return Ok(tool_uses);
-                        }
+                    Ok(LanguageModelCompletionEvent::Stop(StopReason::Refusal)) => {
+                        *refusal = true;
+                        return Ok(FuturesUnordered::default());
                     }
+                    Ok(LanguageModelCompletionEvent::Stop(StopReason::MaxTokens)) => {
+                        *max_tokens_reached = true;
+                        return Ok(FuturesUnordered::default());
+                    }
+                    Ok(LanguageModelCompletionEvent::Stop(
+                        StopReason::ToolUse | StopReason::EndTurn,
+                    )) => break,
                     Ok(event) => {
                         log::trace!("Received completion event: {:?}", event);
                         this.update(cx, |this, cx| {
@@ -843,6 +1106,7 @@ impl Thread {
                     }
                 }
             }
+
             return Ok(tool_uses);
         }
     }
@@ -870,7 +1134,7 @@ impl Thread {
     fn handle_streamed_completion_event(
         &mut self,
         event: LanguageModelCompletionEvent,
-        event_stream: &AgentResponseEventStream,
+        event_stream: &ThreadEventStream,
         cx: &mut Context<Self>,
     ) -> Option<Task<LanguageModelToolResult>> {
         log::trace!("Handling streamed completion event: {:?}", event);
@@ -878,7 +1142,7 @@ impl Thread {
 
         match event {
             StartMessage { .. } => {
-                self.flush_pending_message();
+                self.flush_pending_message(cx);
                 self.pending_message = Some(AgentMessage::default());
             }
             Text(new_text) => self.handle_text_event(new_text, event_stream, cx),
@@ -912,7 +1176,7 @@ impl Thread {
     fn handle_text_event(
         &mut self,
         new_text: String,
-        event_stream: &AgentResponseEventStream,
+        event_stream: &ThreadEventStream,
         cx: &mut Context<Self>,
     ) {
         event_stream.send_text(&new_text);
@@ -933,7 +1197,7 @@ impl Thread {
         &mut self,
         new_text: String,
         new_signature: Option<String>,
-        event_stream: &AgentResponseEventStream,
+        event_stream: &ThreadEventStream,
         cx: &mut Context<Self>,
     ) {
         event_stream.send_thinking(&new_text);
@@ -965,7 +1229,7 @@ impl Thread {
     fn handle_tool_use_event(
         &mut self,
         tool_use: LanguageModelToolUse,
-        event_stream: &AgentResponseEventStream,
+        event_stream: &ThreadEventStream,
         cx: &mut Context<Self>,
     ) -> Option<Task<LanguageModelToolResult>> {
         cx.notify();
@@ -1083,11 +1347,85 @@ impl Thread {
         }
     }
 
+    pub fn title(&self) -> SharedString {
+        self.title.clone().unwrap_or("New Thread".into())
+    }
+
+    fn update_title(
+        &mut self,
+        event_stream: &ThreadEventStream,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<()>>> {
+        if self.title.is_some() {
+            log::debug!("Skipping title generation because we already have one.");
+            return None;
+        }
+
+        log::info!(
+            "Generating title with model: {:?}",
+            self.summarization_model.as_ref().map(|model| model.name())
+        );
+        let model = self.summarization_model.clone()?;
+        let event_stream = event_stream.clone();
+        let mut request = LanguageModelRequest {
+            intent: Some(CompletionIntent::ThreadSummarization),
+            temperature: AgentSettings::temperature_for_model(&model, cx),
+            ..Default::default()
+        };
+
+        for message in &self.messages {
+            request.messages.extend(message.to_request());
+        }
+
+        request.messages.push(LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec![SUMMARIZE_THREAD_PROMPT.into()],
+            cache: false,
+        });
+        Some(cx.spawn(async move |this, cx| {
+            let mut title = String::new();
+            let mut messages = model.stream_completion(request, cx).await?;
+            while let Some(event) = messages.next().await {
+                let event = event?;
+                let text = match event {
+                    LanguageModelCompletionEvent::Text(text) => text,
+                    LanguageModelCompletionEvent::StatusUpdate(
+                        CompletionRequestStatus::UsageUpdated { .. },
+                    ) => {
+                        // this.update(cx, |thread, cx| {
+                        //     thread.update_model_request_usage(amount as u32, limit, cx);
+                        // })?;
+                        // TODO: handle usage update
+                        continue;
+                    }
+                    _ => continue,
+                };
+
+                let mut lines = text.lines();
+                title.extend(lines.next());
+
+                // Stop if the LLM generated multiple lines.
+                if lines.next().is_some() {
+                    break;
+                }
+            }
+
+            log::info!("Setting title: {}", title);
+
+            this.update(cx, |this, cx| {
+                let title = SharedString::from(title);
+                event_stream.send_title_update(title.clone());
+                this.title = Some(title);
+                cx.notify();
+            })
+        }))
+    }
+
     fn pending_message(&mut self) -> &mut AgentMessage {
         self.pending_message.get_or_insert_default()
     }
 
-    fn flush_pending_message(&mut self) {
+    fn flush_pending_message(&mut self, cx: &mut Context<Self>) {
         let Some(mut message) = self.pending_message.take() else {
             return;
         };
@@ -1104,9 +1442,7 @@ impl Thread {
                         tool_use_id: tool_use.id.clone(),
                         tool_name: tool_use.name.clone(),
                         is_error: true,
-                        content: LanguageModelToolResultContent::Text(
-                            "Tool canceled by user".into(),
-                        ),
+                        content: LanguageModelToolResultContent::Text(TOOL_CANCELED_MESSAGE.into()),
                         output: None,
                     },
                 );
@@ -1114,6 +1450,8 @@ impl Thread {
         }
 
         self.messages.push(Message::Agent(message));
+        self.updated_at = Utc::now();
+        cx.notify()
     }
 
     pub(crate) fn build_completion_request(
@@ -1205,15 +1543,7 @@ impl Thread {
         );
         let mut messages = vec![self.build_system_message(cx)];
         for message in &self.messages {
-            match message {
-                Message::User(message) => messages.push(message.to_request()),
-                Message::Agent(message) => messages.extend(message.to_request()),
-                Message::Resume => messages.push(LanguageModelRequestMessage {
-                    role: Role::User,
-                    content: vec!["Continue where you left off".into()],
-                    cache: false,
-                }),
-            }
+            messages.extend(message.to_request());
         }
 
         if let Some(message) = self.pending_message.as_ref() {
@@ -1367,7 +1697,7 @@ struct RunningTurn {
     _task: Task<()>,
     /// The current event stream for the running turn. Used to report a final
     /// cancellation event if we cancel the turn.
-    event_stream: AgentResponseEventStream,
+    event_stream: ThreadEventStream,
 }
 
 impl RunningTurn {
@@ -1420,6 +1750,17 @@ where
         cx: &mut App,
     ) -> Task<Result<Self::Output>>;
 
+    /// Emits events for a previous execution of the tool.
+    fn replay(
+        &self,
+        _input: Self::Input,
+        _output: Self::Output,
+        _event_stream: ToolCallEventStream,
+        _cx: &mut App,
+    ) -> Result<()> {
+        Ok(())
+    }
+
     fn erase(self) -> Arc<dyn AnyAgentTool> {
         Arc::new(Erased(Arc::new(self)))
     }
@@ -1447,6 +1788,13 @@ pub trait AnyAgentTool {
         event_stream: ToolCallEventStream,
         cx: &mut App,
     ) -> Task<Result<AgentToolOutput>>;
+    fn replay(
+        &self,
+        input: serde_json::Value,
+        output: serde_json::Value,
+        event_stream: ToolCallEventStream,
+        cx: &mut App,
+    ) -> Result<()>;
 }
 
 impl<T> AnyAgentTool for Erased<Arc<T>>
@@ -1498,21 +1846,45 @@ where
             })
         })
     }
+
+    fn replay(
+        &self,
+        input: serde_json::Value,
+        output: serde_json::Value,
+        event_stream: ToolCallEventStream,
+        cx: &mut App,
+    ) -> Result<()> {
+        let input = serde_json::from_value(input)?;
+        let output = serde_json::from_value(output)?;
+        self.0.replay(input, output, event_stream, cx)
+    }
 }
 
 #[derive(Clone)]
-struct AgentResponseEventStream(mpsc::UnboundedSender<Result<AgentResponseEvent>>);
+struct ThreadEventStream(mpsc::UnboundedSender<Result<ThreadEvent>>);
+
+impl ThreadEventStream {
+    fn send_title_update(&self, text: SharedString) {
+        self.0
+            .unbounded_send(Ok(ThreadEvent::TitleUpdate(text)))
+            .ok();
+    }
+
+    fn send_user_message(&self, message: &UserMessage) {
+        self.0
+            .unbounded_send(Ok(ThreadEvent::UserMessage(message.clone())))
+            .ok();
+    }
 
-impl AgentResponseEventStream {
     fn send_text(&self, text: &str) {
         self.0
-            .unbounded_send(Ok(AgentResponseEvent::Text(text.to_string())))
+            .unbounded_send(Ok(ThreadEvent::AgentText(text.to_string())))
             .ok();
     }
 
     fn send_thinking(&self, text: &str) {
         self.0
-            .unbounded_send(Ok(AgentResponseEvent::Thinking(text.to_string())))
+            .unbounded_send(Ok(ThreadEvent::AgentThinking(text.to_string())))
             .ok();
     }
 
@@ -1524,7 +1896,7 @@ impl AgentResponseEventStream {
         input: serde_json::Value,
     ) {
         self.0
-            .unbounded_send(Ok(AgentResponseEvent::ToolCall(Self::initial_tool_call(
+            .unbounded_send(Ok(ThreadEvent::ToolCall(Self::initial_tool_call(
                 id,
                 title.to_string(),
                 kind,
@@ -1557,7 +1929,7 @@ impl AgentResponseEventStream {
         fields: acp::ToolCallUpdateFields,
     ) {
         self.0
-            .unbounded_send(Ok(AgentResponseEvent::ToolCallUpdate(
+            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                 acp::ToolCallUpdate {
                     id: acp::ToolCallId(tool_use_id.to_string().into()),
                     fields,
@@ -1568,26 +1940,24 @@ impl AgentResponseEventStream {
     }
 
     fn send_retry(&self, status: acp_thread::RetryStatus) {
-        self.0
-            .unbounded_send(Ok(AgentResponseEvent::Retry(status)))
-            .ok();
+        self.0.unbounded_send(Ok(ThreadEvent::Retry(status))).ok();
     }
 
     fn send_stop(&self, reason: StopReason) {
         match reason {
             StopReason::EndTurn => {
                 self.0
-                    .unbounded_send(Ok(AgentResponseEvent::Stop(acp::StopReason::EndTurn)))
+                    .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::EndTurn)))
                     .ok();
             }
             StopReason::MaxTokens => {
                 self.0
-                    .unbounded_send(Ok(AgentResponseEvent::Stop(acp::StopReason::MaxTokens)))
+                    .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::MaxTokens)))
                     .ok();
             }
             StopReason::Refusal => {
                 self.0
-                    .unbounded_send(Ok(AgentResponseEvent::Stop(acp::StopReason::Refusal)))
+                    .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Refusal)))
                     .ok();
             }
             StopReason::ToolUse => {}
@@ -1596,7 +1966,7 @@ impl AgentResponseEventStream {
 
     fn send_canceled(&self) {
         self.0
-            .unbounded_send(Ok(AgentResponseEvent::Stop(acp::StopReason::Canceled)))
+            .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Canceled)))
             .ok();
     }
 
@@ -1608,24 +1978,23 @@ impl AgentResponseEventStream {
 #[derive(Clone)]
 pub struct ToolCallEventStream {
     tool_use_id: LanguageModelToolUseId,
-    stream: AgentResponseEventStream,
+    stream: ThreadEventStream,
     fs: Option<Arc<dyn Fs>>,
 }
 
 impl ToolCallEventStream {
     #[cfg(test)]
     pub fn test() -> (Self, ToolCallEventStreamReceiver) {
-        let (events_tx, events_rx) = mpsc::unbounded::<Result<AgentResponseEvent>>();
+        let (events_tx, events_rx) = mpsc::unbounded::<Result<ThreadEvent>>();
 
-        let stream =
-            ToolCallEventStream::new("test_id".into(), AgentResponseEventStream(events_tx), None);
+        let stream = ToolCallEventStream::new("test_id".into(), ThreadEventStream(events_tx), None);
 
         (stream, ToolCallEventStreamReceiver(events_rx))
     }
 
     fn new(
         tool_use_id: LanguageModelToolUseId,
-        stream: AgentResponseEventStream,
+        stream: ThreadEventStream,
         fs: Option<Arc<dyn Fs>>,
     ) -> Self {
         Self {
@@ -1643,7 +2012,7 @@ impl ToolCallEventStream {
     pub fn update_diff(&self, diff: Entity<acp_thread::Diff>) {
         self.stream
             .0
-            .unbounded_send(Ok(AgentResponseEvent::ToolCallUpdate(
+            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                 acp_thread::ToolCallUpdateDiff {
                     id: acp::ToolCallId(self.tool_use_id.to_string().into()),
                     diff,
@@ -1656,7 +2025,7 @@ impl ToolCallEventStream {
     pub fn update_terminal(&self, terminal: Entity<acp_thread::Terminal>) {
         self.stream
             .0
-            .unbounded_send(Ok(AgentResponseEvent::ToolCallUpdate(
+            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                 acp_thread::ToolCallUpdateTerminal {
                     id: acp::ToolCallId(self.tool_use_id.to_string().into()),
                     terminal,
@@ -1674,7 +2043,7 @@ impl ToolCallEventStream {
         let (response_tx, response_rx) = oneshot::channel();
         self.stream
             .0
-            .unbounded_send(Ok(AgentResponseEvent::ToolCallAuthorization(
+            .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                 ToolCallAuthorization {
                     tool_call: acp::ToolCallUpdate {
                         id: acp::ToolCallId(self.tool_use_id.to_string().into()),
@@ -1724,13 +2093,13 @@ impl ToolCallEventStream {
 }
 
 #[cfg(test)]
-pub struct ToolCallEventStreamReceiver(mpsc::UnboundedReceiver<Result<AgentResponseEvent>>);
+pub struct ToolCallEventStreamReceiver(mpsc::UnboundedReceiver<Result<ThreadEvent>>);
 
 #[cfg(test)]
 impl ToolCallEventStreamReceiver {
     pub async fn expect_authorization(&mut self) -> ToolCallAuthorization {
         let event = self.0.next().await;
-        if let Some(Ok(AgentResponseEvent::ToolCallAuthorization(auth))) = event {
+        if let Some(Ok(ThreadEvent::ToolCallAuthorization(auth))) = event {
             auth
         } else {
             panic!("Expected ToolCallAuthorization but got: {:?}", event);
@@ -1739,9 +2108,9 @@ impl ToolCallEventStreamReceiver {
 
     pub async fn expect_terminal(&mut self) -> Entity<acp_thread::Terminal> {
         let event = self.0.next().await;
-        if let Some(Ok(AgentResponseEvent::ToolCallUpdate(
-            acp_thread::ToolCallUpdate::UpdateTerminal(update),
-        ))) = event
+        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateTerminal(
+            update,
+        )))) = event
         {
             update.terminal
         } else {
@@ -1752,7 +2121,7 @@ impl ToolCallEventStreamReceiver {
 
 #[cfg(test)]
 impl std::ops::Deref for ToolCallEventStreamReceiver {
-    type Target = mpsc::UnboundedReceiver<Result<AgentResponseEvent>>;
+    type Target = mpsc::UnboundedReceiver<Result<ThreadEvent>>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -1821,6 +2190,38 @@ impl From<acp::ContentBlock> for UserMessageContent {
     }
 }
 
+impl From<UserMessageContent> for acp::ContentBlock {
+    fn from(content: UserMessageContent) -> Self {
+        match content {
+            UserMessageContent::Text(text) => acp::ContentBlock::Text(acp::TextContent {
+                text,
+                annotations: None,
+            }),
+            UserMessageContent::Image(image) => acp::ContentBlock::Image(acp::ImageContent {
+                data: image.source.to_string(),
+                mime_type: "image/png".to_string(),
+                annotations: None,
+                uri: None,
+            }),
+            UserMessageContent::Mention { uri, content } => {
+                acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                    uri: uri.to_uri().to_string(),
+                    name: uri.name(),
+                    annotations: None,
+                    description: if content.is_empty() {
+                        None
+                    } else {
+                        Some(content)
+                    },
+                    mime_type: None,
+                    size: None,
+                    title: None,
+                })
+            }
+        }
+    }
+}
+
 fn convert_image(image_content: acp::ImageContent) -> LanguageModelImage {
     LanguageModelImage {
         source: image_content.data.into(),
diff --git a/crates/agent2/src/tools/context_server_registry.rs b/crates/agent2/src/tools/context_server_registry.rs
index ddeb08a046..69c4221a81 100644
--- a/crates/agent2/src/tools/context_server_registry.rs
+++ b/crates/agent2/src/tools/context_server_registry.rs
@@ -228,4 +228,14 @@ impl AnyAgentTool for ContextServerTool {
             })
         })
     }
+
+    fn replay(
+        &self,
+        _input: serde_json::Value,
+        _output: serde_json::Value,
+        _event_stream: ToolCallEventStream,
+        _cx: &mut App,
+    ) -> Result<()> {
+        Ok(())
+    }
 }
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 7687d68702..b3b1a428bf 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -5,10 +5,10 @@ use anyhow::{Context as _, Result, anyhow};
 use assistant_tools::edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent, EditFormat};
 use cloud_llm_client::CompletionIntent;
 use collections::HashSet;
-use gpui::{App, AppContext, AsyncApp, Entity, Task};
+use gpui::{App, AppContext, AsyncApp, Entity, Task, WeakEntity};
 use indoc::formatdoc;
-use language::ToPoint;
 use language::language_settings::{self, FormatOnSave};
+use language::{LanguageRegistry, ToPoint};
 use language_model::LanguageModelToolResultContent;
 use paths;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
@@ -98,11 +98,13 @@ pub enum EditFileMode {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct EditFileToolOutput {
+    #[serde(alias = "original_path")]
     input_path: PathBuf,
-    project_path: PathBuf,
     new_text: String,
     old_text: Arc<String>,
+    #[serde(default)]
     diff: String,
+    #[serde(alias = "raw_output")]
     edit_agent_output: EditAgentOutput,
 }
 
@@ -122,12 +124,16 @@ impl From<EditFileToolOutput> for LanguageModelToolResultContent {
 }
 
 pub struct EditFileTool {
-    thread: Entity<Thread>,
+    thread: WeakEntity<Thread>,
+    language_registry: Arc<LanguageRegistry>,
 }
 
 impl EditFileTool {
-    pub fn new(thread: Entity<Thread>) -> Self {
-        Self { thread }
+    pub fn new(thread: WeakEntity<Thread>, language_registry: Arc<LanguageRegistry>) -> Self {
+        Self {
+            thread,
+            language_registry,
+        }
     }
 
     fn authorize(
@@ -167,8 +173,11 @@ impl EditFileTool {
 
         // Check if path is inside the global config directory
         // First check if it's already inside project - if not, try to canonicalize
-        let thread = self.thread.read(cx);
-        let project_path = thread.project().read(cx).find_project_path(&input.path, cx);
+        let Ok(project_path) = self.thread.read_with(cx, |thread, cx| {
+            thread.project().read(cx).find_project_path(&input.path, cx)
+        }) else {
+            return Task::ready(Err(anyhow!("thread was dropped")));
+        };
 
         // If the path is inside the project, and it's not one of the above edge cases,
         // then no confirmation is necessary. Otherwise, confirmation is necessary.
@@ -221,7 +230,12 @@ impl AgentTool for EditFileTool {
         event_stream: ToolCallEventStream,
         cx: &mut App,
     ) -> Task<Result<Self::Output>> {
-        let project = self.thread.read(cx).project().clone();
+        let Ok(project) = self
+            .thread
+            .read_with(cx, |thread, _cx| thread.project().clone())
+        else {
+            return Task::ready(Err(anyhow!("thread was dropped")));
+        };
         let project_path = match resolve_path(&input, project.clone(), cx) {
             Ok(path) => path,
             Err(err) => return Task::ready(Err(anyhow!(err))),
@@ -237,23 +251,17 @@ impl AgentTool for EditFileTool {
             });
         }
 
-        let Some(request) = self.thread.update(cx, |thread, cx| {
-            thread
-                .build_completion_request(CompletionIntent::ToolResults, cx)
-                .ok()
-        }) else {
-            return Task::ready(Err(anyhow!("Failed to build completion request")));
-        };
-        let thread = self.thread.read(cx);
-        let Some(model) = thread.model().cloned() else {
-            return Task::ready(Err(anyhow!("No language model configured")));
-        };
-        let action_log = thread.action_log().clone();
-
         let authorize = self.authorize(&input, &event_stream, cx);
         cx.spawn(async move |cx: &mut AsyncApp| {
             authorize.await?;
 
+            let (request, model, action_log) = self.thread.update(cx, |thread, cx| {
+                let request = thread.build_completion_request(CompletionIntent::ToolResults, cx);
+                (request, thread.model().cloned(), thread.action_log().clone())
+            })?;
+            let request = request?;
+            let model = model.context("No language model configured")?;
+
             let edit_format = EditFormat::from_model(model.clone())?;
             let edit_agent = EditAgent::new(
                 model,
@@ -419,7 +427,6 @@ impl AgentTool for EditFileTool {
 
             Ok(EditFileToolOutput {
                 input_path: input.path,
-                project_path: project_path.path.to_path_buf(),
                 new_text: new_text.clone(),
                 old_text,
                 diff: unified_diff,
@@ -427,6 +434,25 @@ impl AgentTool for EditFileTool {
             })
         })
     }
+
+    fn replay(
+        &self,
+        _input: Self::Input,
+        output: Self::Output,
+        event_stream: ToolCallEventStream,
+        cx: &mut App,
+    ) -> Result<()> {
+        event_stream.update_diff(cx.new(|cx| {
+            Diff::finalized(
+                output.input_path,
+                Some(output.old_text.to_string()),
+                output.new_text,
+                self.language_registry.clone(),
+                cx,
+            )
+        }));
+        Ok(())
+    }
 }
 
 /// Validate that the file path is valid, meaning:
@@ -515,6 +541,7 @@ mod tests {
         let fs = project::FakeFs::new(cx.executor());
         fs.insert_tree("/root", json!({})).await;
         let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -527,6 +554,7 @@ mod tests {
                 action_log,
                 Templates::new(),
                 Some(model),
+                None,
                 cx,
             )
         });
@@ -537,7 +565,11 @@ mod tests {
                     path: "root/nonexistent_file.txt".into(),
                     mode: EditFileMode::Edit,
                 };
-                Arc::new(EditFileTool { thread }).run(input, ToolCallEventStream::test().0, cx)
+                Arc::new(EditFileTool::new(thread.downgrade(), language_registry)).run(
+                    input,
+                    ToolCallEventStream::test().0,
+                    cx,
+                )
             })
             .await;
         assert_eq!(
@@ -724,6 +756,7 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
@@ -750,9 +783,10 @@ mod tests {
                     path: "root/src/main.rs".into(),
                     mode: EditFileMode::Overwrite,
                 };
-                Arc::new(EditFileTool {
-                    thread: thread.clone(),
-                })
+                Arc::new(EditFileTool::new(
+                    thread.downgrade(),
+                    language_registry.clone(),
+                ))
                 .run(input, ToolCallEventStream::test().0, cx)
             });
 
@@ -806,7 +840,11 @@ mod tests {
                     path: "root/src/main.rs".into(),
                     mode: EditFileMode::Overwrite,
                 };
-                Arc::new(EditFileTool { thread }).run(input, ToolCallEventStream::test().0, cx)
+                Arc::new(EditFileTool::new(thread.downgrade(), language_registry)).run(
+                    input,
+                    ToolCallEventStream::test().0,
+                    cx,
+                )
             });
 
             // Stream the unformatted content
@@ -850,6 +888,7 @@ mod tests {
         let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
@@ -860,6 +899,7 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
@@ -887,9 +927,10 @@ mod tests {
                     path: "root/src/main.rs".into(),
                     mode: EditFileMode::Overwrite,
                 };
-                Arc::new(EditFileTool {
-                    thread: thread.clone(),
-                })
+                Arc::new(EditFileTool::new(
+                    thread.downgrade(),
+                    language_registry.clone(),
+                ))
                 .run(input, ToolCallEventStream::test().0, cx)
             });
 
@@ -938,10 +979,11 @@ mod tests {
                     path: "root/src/main.rs".into(),
                     mode: EditFileMode::Overwrite,
                 };
-                Arc::new(EditFileTool {
-                    thread: thread.clone(),
-                })
-                .run(input, ToolCallEventStream::test().0, cx)
+                Arc::new(EditFileTool::new(thread.downgrade(), language_registry)).run(
+                    input,
+                    ToolCallEventStream::test().0,
+                    cx,
+                )
             });
 
             // Stream the content with trailing whitespace
@@ -976,6 +1018,7 @@ mod tests {
         let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
@@ -986,10 +1029,11 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool { thread });
+        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
         fs.insert_tree("/root", json!({})).await;
 
         // Test 1: Path with .zed component should require confirmation
@@ -1111,6 +1155,7 @@ mod tests {
         let fs = project::FakeFs::new(cx.executor());
         fs.insert_tree("/project", json!({})).await;
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
@@ -1123,10 +1168,11 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool { thread });
+        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
 
         // Test global config paths - these should require confirmation if they exist and are outside the project
         let test_cases = vec![
@@ -1220,7 +1266,7 @@ mod tests {
             cx,
         )
         .await;
-
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -1233,10 +1279,11 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool { thread });
+        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
 
         // Test files in different worktrees
         let test_cases = vec![
@@ -1302,6 +1349,7 @@ mod tests {
         )
         .await;
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -1314,10 +1362,11 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool { thread });
+        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
 
         // Test edge cases
         let test_cases = vec![
@@ -1386,6 +1435,7 @@ mod tests {
         )
         .await;
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -1398,10 +1448,11 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool { thread });
+        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
 
         // Test different EditFileMode values
         let modes = vec![
@@ -1467,6 +1518,7 @@ mod tests {
         init_test(cx);
         let fs = project::FakeFs::new(cx.executor());
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -1479,10 +1531,11 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
+                None,
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool { thread });
+        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
 
         assert_eq!(
             tool.initial_title(Err(json!({
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index ac79874c36..1804d0ab30 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -319,7 +319,7 @@ mod tests {
     use theme::ThemeSettings;
     use util::test::TempTree;
 
-    use crate::AgentResponseEvent;
+    use crate::ThreadEvent;
 
     use super::*;
 
@@ -396,7 +396,7 @@ mod tests {
             });
             cx.run_until_parked();
             let event = stream_rx.try_next();
-            if let Ok(Some(Ok(AgentResponseEvent::ToolCallAuthorization(auth)))) = event {
+            if let Ok(Some(Ok(ThreadEvent::ToolCallAuthorization(auth)))) = event {
                 auth.response.send(auth.options[0].id.clone()).unwrap();
             }
 
diff --git a/crates/agent2/src/tools/web_search_tool.rs b/crates/agent2/src/tools/web_search_tool.rs
index c1c0970742..d71a128bfe 100644
--- a/crates/agent2/src/tools/web_search_tool.rs
+++ b/crates/agent2/src/tools/web_search_tool.rs
@@ -80,33 +80,48 @@ impl AgentTool for WebSearchTool {
                 }
             };
 
-            let result_text = if response.results.len() == 1 {
-                "1 result".to_string()
-            } else {
-                format!("{} results", response.results.len())
-            };
-            event_stream.update_fields(acp::ToolCallUpdateFields {
-                title: Some(format!("Searched the web: {result_text}")),
-                content: Some(
-                    response
-                        .results
-                        .iter()
-                        .map(|result| acp::ToolCallContent::Content {
-                            content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
-                                name: result.title.clone(),
-                                uri: result.url.clone(),
-                                title: Some(result.title.clone()),
-                                description: Some(result.text.clone()),
-                                mime_type: None,
-                                annotations: None,
-                                size: None,
-                            }),
-                        })
-                        .collect(),
-                ),
-                ..Default::default()
-            });
+            emit_update(&response, &event_stream);
             Ok(WebSearchToolOutput(response))
         })
     }
+
+    fn replay(
+        &self,
+        _input: Self::Input,
+        output: Self::Output,
+        event_stream: ToolCallEventStream,
+        _cx: &mut App,
+    ) -> Result<()> {
+        emit_update(&output.0, &event_stream);
+        Ok(())
+    }
+}
+
+fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream) {
+    let result_text = if response.results.len() == 1 {
+        "1 result".to_string()
+    } else {
+        format!("{} results", response.results.len())
+    };
+    event_stream.update_fields(acp::ToolCallUpdateFields {
+        title: Some(format!("Searched the web: {result_text}")),
+        content: Some(
+            response
+                .results
+                .iter()
+                .map(|result| acp::ToolCallContent::Content {
+                    content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        name: result.title.clone(),
+                        uri: result.url.clone(),
+                        title: Some(result.title.clone()),
+                        description: Some(result.text.clone()),
+                        mime_type: None,
+                        annotations: None,
+                        size: None,
+                    }),
+                })
+                .collect(),
+        ),
+        ..Default::default()
+    });
 }
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 886f650470..cbc874057a 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -18,6 +18,7 @@ doctest = false
 
 [dependencies]
 acp_thread.workspace = true
+action_log.workspace = true
 agent-client-protocol.workspace = true
 agent_settings.workspace = true
 agentic-coding-protocol.workspace = true
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index 551e9fa01a..aa80f01c15 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -1,4 +1,5 @@
 // Translates old acp agents into the new schema
+use action_log::ActionLog;
 use agent_client_protocol as acp;
 use agentic_coding_protocol::{self as acp_old, AgentRequest as _};
 use anyhow::{Context as _, Result, anyhow};
@@ -443,7 +444,8 @@ impl AgentConnection for AcpConnection {
             cx.update(|cx| {
                 let thread = cx.new(|cx| {
                     let session_id = acp::SessionId("acp-old-no-id".into());
-                    AcpThread::new(self.name, self.clone(), project, session_id, cx)
+                    let action_log = cx.new(|_| ActionLog::new(project.clone()));
+                    AcpThread::new(self.name, self.clone(), project, action_log, session_id)
                 });
                 current_thread.replace(thread.downgrade());
                 thread
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 93a5ae757a..d749537c4c 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -1,3 +1,4 @@
+use action_log::ActionLog;
 use agent_client_protocol::{self as acp, Agent as _};
 use anyhow::anyhow;
 use collections::HashMap;
@@ -153,14 +154,14 @@ impl AgentConnection for AcpConnection {
                 })?;
 
             let session_id = response.session_id;
-
-            let thread = cx.new(|cx| {
+            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
+            let thread = cx.new(|_cx| {
                 AcpThread::new(
                     self.server_name,
                     self.clone(),
                     project,
+                    action_log,
                     session_id.clone(),
-                    cx,
                 )
             })?;
 
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 34d55f39dc..f27c973ad6 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,6 +1,7 @@
 mod mcp_server;
 pub mod tools;
 
+use action_log::ActionLog;
 use collections::HashMap;
 use context_server::listener::McpServerTool;
 use language_models::provider::anthropic::AnthropicLanguageModelProvider;
@@ -215,8 +216,15 @@ impl AgentConnection for ClaudeAgentConnection {
                 }
             });
 
-            let thread = cx.new(|cx| {
-                AcpThread::new("Claude Code", self.clone(), project, session_id.clone(), cx)
+            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
+            let thread = cx.new(|_cx| {
+                AcpThread::new(
+                    "Claude Code",
+                    self.clone(),
+                    project,
+                    action_log,
+                    session_id.clone(),
+                )
             })?;
 
             thread_tx.send(thread.downgrade())?;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index ad0920bc4a..150f1ea73b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -303,8 +303,13 @@ impl AcpThreadView {
                         let action_log_subscription =
                             cx.observe(&action_log, |_, _, cx| cx.notify());
 
-                        this.list_state
-                            .splice(0..0, thread.read(cx).entries().len());
+                        let count = thread.read(cx).entries().len();
+                        this.list_state.splice(0..0, count);
+                        this.entry_view_state.update(cx, |view_state, cx| {
+                            for ix in 0..count {
+                                view_state.sync_entry(ix, &thread, window, cx);
+                            }
+                        });
 
                         AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
 
@@ -808,6 +813,7 @@ impl AcpThreadView {
                 self.thread_retry_status.take();
                 self.thread_state = ThreadState::ServerExited { status: *status };
             }
+            AcpThreadEvent::TitleUpdated => {}
         }
         cx.notify();
     }
@@ -2816,12 +2822,15 @@ impl AcpThreadView {
             return;
         };
 
-        thread.update(cx, |thread, _cx| {
+        thread.update(cx, |thread, cx| {
             let current_mode = thread.completion_mode();
-            thread.set_completion_mode(match current_mode {
-                CompletionMode::Burn => CompletionMode::Normal,
-                CompletionMode::Normal => CompletionMode::Burn,
-            });
+            thread.set_completion_mode(
+                match current_mode {
+                    CompletionMode::Burn => CompletionMode::Normal,
+                    CompletionMode::Normal => CompletionMode::Burn,
+                },
+                cx,
+            );
         });
     }
 
@@ -3572,8 +3581,9 @@ impl AcpThreadView {
                                     ))
                                     .on_click({
                                         cx.listener(move |this, _, _window, cx| {
-                                            thread.update(cx, |thread, _cx| {
-                                                thread.set_completion_mode(CompletionMode::Burn);
+                                            thread.update(cx, |thread, cx| {
+                                                thread
+                                                    .set_completion_mode(CompletionMode::Burn, cx);
                                             });
                                             this.resume_chat(cx);
                                         })
@@ -4156,12 +4166,13 @@ pub(crate) mod tests {
             cx: &mut gpui::App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
             Task::ready(Ok(cx.new(|cx| {
+                let action_log = cx.new(|_| ActionLog::new(project.clone()));
                 AcpThread::new(
                     "SaboteurAgentConnection",
                     self,
                     project,
+                    action_log,
                     SessionId("test".into()),
-                    cx,
                 )
             })))
         }
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index f474fdf3ae..5b4f1038e2 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -199,24 +199,21 @@ impl AgentDiffPane {
         let action_log = thread.action_log(cx).clone();
 
         let mut this = Self {
-            _subscriptions: [
-                Some(
-                    cx.observe_in(&action_log, window, |this, _action_log, window, cx| {
-                        this.update_excerpts(window, cx)
-                    }),
-                ),
+            _subscriptions: vec![
+                cx.observe_in(&action_log, window, |this, _action_log, window, cx| {
+                    this.update_excerpts(window, cx)
+                }),
                 match &thread {
-                    AgentDiffThread::Native(thread) => {
-                        Some(cx.subscribe(thread, |this, _thread, event, cx| {
-                            this.handle_thread_event(event, cx)
-                        }))
-                    }
-                    AgentDiffThread::AcpThread(_) => None,
+                    AgentDiffThread::Native(thread) => cx
+                        .subscribe(thread, |this, _thread, event, cx| {
+                            this.handle_native_thread_event(event, cx)
+                        }),
+                    AgentDiffThread::AcpThread(thread) => cx
+                        .subscribe(thread, |this, _thread, event, cx| {
+                            this.handle_acp_thread_event(event, cx)
+                        }),
                 },
-            ]
-            .into_iter()
-            .flatten()
-            .collect(),
+            ],
             title: SharedString::default(),
             multibuffer,
             editor,
@@ -324,13 +321,20 @@ impl AgentDiffPane {
         }
     }
 
-    fn handle_thread_event(&mut self, event: &ThreadEvent, cx: &mut Context<Self>) {
+    fn handle_native_thread_event(&mut self, event: &ThreadEvent, cx: &mut Context<Self>) {
         match event {
             ThreadEvent::SummaryGenerated => self.update_title(cx),
             _ => {}
         }
     }
 
+    fn handle_acp_thread_event(&mut self, event: &AcpThreadEvent, cx: &mut Context<Self>) {
+        match event {
+            AcpThreadEvent::TitleUpdated => self.update_title(cx),
+            _ => {}
+        }
+    }
+
     pub fn move_to_path(&self, path_key: PathKey, window: &mut Window, cx: &mut App) {
         if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
             self.editor.update(cx, |editor, cx| {
@@ -1523,7 +1527,8 @@ impl AgentDiff {
             AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::ServerExited(_) => {
                 self.update_reviewing_editors(workspace, window, cx);
             }
-            AcpThreadEvent::EntriesRemoved(_)
+            AcpThreadEvent::TitleUpdated
+            | AcpThreadEvent::EntriesRemoved(_)
             | AcpThreadEvent::ToolAuthorizationRequired
             | AcpThreadEvent::Retry(_) => {}
         }

From 1444cd9839dcd04f60bb3ba2284be2183cae567d Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 19 Aug 2025 10:53:10 -0400
Subject: [PATCH 165/823] Fix Windows test failures not being detected in CI
 (#36446)

Bug introduced in #35926

Release Notes:

- N/A
---
 .github/actions/run_tests_windows/action.yml |  1 -
 crates/acp_thread/src/acp_thread.rs          | 14 ++-
 crates/acp_thread/src/mention.rs             | 83 ++++++++---------
 crates/agent_ui/src/acp/message_editor.rs    | 93 +++++++-------------
 crates/fs/src/fake_git_repo.rs               |  6 +-
 crates/fs/src/fs.rs                          |  4 +-
 6 files changed, 87 insertions(+), 114 deletions(-)

diff --git a/.github/actions/run_tests_windows/action.yml b/.github/actions/run_tests_windows/action.yml
index e3e3b7142e..0a550c7d32 100644
--- a/.github/actions/run_tests_windows/action.yml
+++ b/.github/actions/run_tests_windows/action.yml
@@ -56,7 +56,6 @@ runs:
         $env:COMPlus_CreateDumpDiagnostics = "1"
 
         cargo nextest run --workspace --no-fail-fast
-      continue-on-error: true
 
     - name: Analyze crash dumps
       if: always()
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 7d70727252..1de8110f07 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2155,7 +2155,7 @@ mod tests {
                 "}
             );
         });
-        assert_eq!(fs.files(), vec![Path::new("/test/file-0")]);
+        assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
 
         cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["ipsum".into()], cx)))
             .await
@@ -2185,7 +2185,10 @@ mod tests {
         });
         assert_eq!(
             fs.files(),
-            vec![Path::new("/test/file-0"), Path::new("/test/file-1")]
+            vec![
+                Path::new(path!("/test/file-0")),
+                Path::new(path!("/test/file-1"))
+            ]
         );
 
         // Checkpoint isn't stored when there are no changes.
@@ -2226,7 +2229,10 @@ mod tests {
         });
         assert_eq!(
             fs.files(),
-            vec![Path::new("/test/file-0"), Path::new("/test/file-1")]
+            vec![
+                Path::new(path!("/test/file-0")),
+                Path::new(path!("/test/file-1"))
+            ]
         );
 
         // Rewinding the conversation truncates the history and restores the checkpoint.
@@ -2254,7 +2260,7 @@ mod tests {
                 "}
             );
         });
-        assert_eq!(fs.files(), vec![Path::new("/test/file-0")]);
+        assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
     }
 
     async fn run_until_first_tool_call(
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 350785ec1e..fcf50b0fd7 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -52,6 +52,7 @@ impl MentionUri {
         let path = url.path();
         match url.scheme() {
             "file" => {
+                let path = url.to_file_path().ok().context("Extracting file path")?;
                 if let Some(fragment) = url.fragment() {
                     let range = fragment
                         .strip_prefix("L")
@@ -72,23 +73,17 @@ impl MentionUri {
                     if let Some(name) = single_query_param(&url, "symbol")? {
                         Ok(Self::Symbol {
                             name,
-                            path: path.into(),
+                            path,
                             line_range,
                         })
                     } else {
-                        Ok(Self::Selection {
-                            path: path.into(),
-                            line_range,
-                        })
+                        Ok(Self::Selection { path, line_range })
                     }
                 } else {
-                    let abs_path =
-                        PathBuf::from(format!("{}{}", url.host_str().unwrap_or(""), path));
-
                     if input.ends_with("/") {
-                        Ok(Self::Directory { abs_path })
+                        Ok(Self::Directory { abs_path: path })
                     } else {
-                        Ok(Self::File { abs_path })
+                        Ok(Self::File { abs_path: path })
                     }
                 }
             }
@@ -162,27 +157,17 @@ impl MentionUri {
     pub fn to_uri(&self) -> Url {
         match self {
             MentionUri::File { abs_path } => {
-                let mut url = Url::parse("file:///").unwrap();
-                let path = abs_path.to_string_lossy();
-                url.set_path(&path);
-                url
+                Url::from_file_path(abs_path).expect("mention path should be absolute")
             }
             MentionUri::Directory { abs_path } => {
-                let mut url = Url::parse("file:///").unwrap();
-                let mut path = abs_path.to_string_lossy().to_string();
-                if !path.ends_with("/") {
-                    path.push_str("/");
-                }
-                url.set_path(&path);
-                url
+                Url::from_directory_path(abs_path).expect("mention path should be absolute")
             }
             MentionUri::Symbol {
                 path,
                 name,
                 line_range,
             } => {
-                let mut url = Url::parse("file:///").unwrap();
-                url.set_path(&path.to_string_lossy());
+                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
                 url.query_pairs_mut().append_pair("symbol", name);
                 url.set_fragment(Some(&format!(
                     "L{}:{}",
@@ -192,8 +177,7 @@ impl MentionUri {
                 url
             }
             MentionUri::Selection { path, line_range } => {
-                let mut url = Url::parse("file:///").unwrap();
-                url.set_path(&path.to_string_lossy());
+                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
                 url.set_fragment(Some(&format!(
                     "L{}:{}",
                     line_range.start + 1,
@@ -266,15 +250,17 @@ pub fn selection_name(path: &Path, line_range: &Range<u32>) -> String {
 
 #[cfg(test)]
 mod tests {
+    use util::{path, uri};
+
     use super::*;
 
     #[test]
     fn test_parse_file_uri() {
-        let file_uri = "file:///path/to/file.rs";
+        let file_uri = uri!("file:///path/to/file.rs");
         let parsed = MentionUri::parse(file_uri).unwrap();
         match &parsed {
             MentionUri::File { abs_path } => {
-                assert_eq!(abs_path.to_str().unwrap(), "/path/to/file.rs");
+                assert_eq!(abs_path.to_str().unwrap(), path!("/path/to/file.rs"));
             }
             _ => panic!("Expected File variant"),
         }
@@ -283,11 +269,11 @@ mod tests {
 
     #[test]
     fn test_parse_directory_uri() {
-        let file_uri = "file:///path/to/dir/";
+        let file_uri = uri!("file:///path/to/dir/");
         let parsed = MentionUri::parse(file_uri).unwrap();
         match &parsed {
             MentionUri::Directory { abs_path } => {
-                assert_eq!(abs_path.to_str().unwrap(), "/path/to/dir/");
+                assert_eq!(abs_path.to_str().unwrap(), path!("/path/to/dir/"));
             }
             _ => panic!("Expected Directory variant"),
         }
@@ -297,22 +283,24 @@ mod tests {
     #[test]
     fn test_to_directory_uri_with_slash() {
         let uri = MentionUri::Directory {
-            abs_path: PathBuf::from("/path/to/dir/"),
+            abs_path: PathBuf::from(path!("/path/to/dir/")),
         };
-        assert_eq!(uri.to_uri().to_string(), "file:///path/to/dir/");
+        let expected = uri!("file:///path/to/dir/");
+        assert_eq!(uri.to_uri().to_string(), expected);
     }
 
     #[test]
     fn test_to_directory_uri_without_slash() {
         let uri = MentionUri::Directory {
-            abs_path: PathBuf::from("/path/to/dir"),
+            abs_path: PathBuf::from(path!("/path/to/dir")),
         };
-        assert_eq!(uri.to_uri().to_string(), "file:///path/to/dir/");
+        let expected = uri!("file:///path/to/dir/");
+        assert_eq!(uri.to_uri().to_string(), expected);
     }
 
     #[test]
     fn test_parse_symbol_uri() {
-        let symbol_uri = "file:///path/to/file.rs?symbol=MySymbol#L10:20";
+        let symbol_uri = uri!("file:///path/to/file.rs?symbol=MySymbol#L10:20");
         let parsed = MentionUri::parse(symbol_uri).unwrap();
         match &parsed {
             MentionUri::Symbol {
@@ -320,7 +308,7 @@ mod tests {
                 name,
                 line_range,
             } => {
-                assert_eq!(path.to_str().unwrap(), "/path/to/file.rs");
+                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
                 assert_eq!(name, "MySymbol");
                 assert_eq!(line_range.start, 9);
                 assert_eq!(line_range.end, 19);
@@ -332,11 +320,11 @@ mod tests {
 
     #[test]
     fn test_parse_selection_uri() {
-        let selection_uri = "file:///path/to/file.rs#L5:15";
+        let selection_uri = uri!("file:///path/to/file.rs#L5:15");
         let parsed = MentionUri::parse(selection_uri).unwrap();
         match &parsed {
             MentionUri::Selection { path, line_range } => {
-                assert_eq!(path.to_str().unwrap(), "/path/to/file.rs");
+                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
                 assert_eq!(line_range.start, 4);
                 assert_eq!(line_range.end, 14);
             }
@@ -418,32 +406,35 @@ mod tests {
     #[test]
     fn test_invalid_line_range_format() {
         // Missing L prefix
-        assert!(MentionUri::parse("file:///path/to/file.rs#10:20").is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#10:20")).is_err());
 
         // Missing colon separator
-        assert!(MentionUri::parse("file:///path/to/file.rs#L1020").is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#L1020")).is_err());
 
         // Invalid numbers
-        assert!(MentionUri::parse("file:///path/to/file.rs#L10:abc").is_err());
-        assert!(MentionUri::parse("file:///path/to/file.rs#Labc:20").is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#L10:abc")).is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#Labc:20")).is_err());
     }
 
     #[test]
     fn test_invalid_query_parameters() {
         // Invalid query parameter name
-        assert!(MentionUri::parse("file:///path/to/file.rs#L10:20?invalid=test").is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#L10:20?invalid=test")).is_err());
 
         // Too many query parameters
         assert!(
-            MentionUri::parse("file:///path/to/file.rs#L10:20?symbol=test&another=param").is_err()
+            MentionUri::parse(uri!(
+                "file:///path/to/file.rs#L10:20?symbol=test&another=param"
+            ))
+            .is_err()
         );
     }
 
     #[test]
     fn test_zero_based_line_numbers() {
         // Test that 0-based line numbers are rejected (should be 1-based)
-        assert!(MentionUri::parse("file:///path/to/file.rs#L0:10").is_err());
-        assert!(MentionUri::parse("file:///path/to/file.rs#L1:0").is_err());
-        assert!(MentionUri::parse("file:///path/to/file.rs#L0:0").is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#L0:10")).is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#L1:0")).is_err());
+        assert!(MentionUri::parse(uri!("file:///path/to/file.rs#L0:0")).is_err());
     }
 }
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 00368d6087..afb1512e5d 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1640,7 +1640,7 @@ mod tests {
     use serde_json::json;
     use text::Point;
     use ui::{App, Context, IntoElement, Render, SharedString, Window};
-    use util::path;
+    use util::{path, uri};
     use workspace::{AppState, Item, Workspace};
 
     use crate::acp::{
@@ -1950,13 +1950,12 @@ mod tests {
             editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
         });
 
+        let url_one = uri!("file:///dir/a/one.txt");
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt) ");
+            let text = editor.text(cx);
+            assert_eq!(text, format!("Lorem [@one.txt]({url_one}) "));
             assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
+            assert_eq!(fold_ranges(editor, cx).len(), 1);
         });
 
         let contents = message_editor
@@ -1977,47 +1976,35 @@ mod tests {
             contents,
             [Mention::Text {
                 content: "1".into(),
-                uri: "file:///dir/a/one.txt".parse().unwrap()
+                uri: url_one.parse().unwrap()
             }]
         );
 
         cx.simulate_input(" ");
 
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](file:///dir/a/one.txt)  ");
+            let text = editor.text(cx);
+            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  "));
             assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
+            assert_eq!(fold_ranges(editor, cx).len(), 1);
         });
 
         cx.simulate_input("Ipsum ");
 
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum ",
-            );
+            let text = editor.text(cx);
+            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  Ipsum "),);
             assert!(!editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
+            assert_eq!(fold_ranges(editor, cx).len(), 1);
         });
 
         cx.simulate_input("@file ");
 
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum @file ",
-            );
+            let text = editor.text(cx);
+            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  Ipsum @file "),);
             assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                fold_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 39)]
-            );
+            assert_eq!(fold_ranges(editor, cx).len(), 1);
         });
 
         editor.update_in(&mut cx, |editor, window, cx| {
@@ -2041,28 +2028,23 @@ mod tests {
             .collect::<Vec<_>>();
 
         assert_eq!(contents.len(), 2);
+        let url_eight = uri!("file:///dir/b/eight.txt");
         pretty_assertions::assert_eq!(
             contents[1],
             Mention::Text {
                 content: "8".to_string(),
-                uri: "file:///dir/b/eight.txt".parse().unwrap(),
+                uri: url_eight.parse().unwrap(),
             }
         );
 
         editor.update(&mut cx, |editor, cx| {
-                assert_eq!(
-                    editor.text(cx),
-                    "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) "
-                );
-                assert!(!editor.has_visible_completions_menu());
-                assert_eq!(
-                    fold_ranges(editor, cx),
-                    vec![
-                        Point::new(0, 6)..Point::new(0, 39),
-                        Point::new(0, 47)..Point::new(0, 84)
-                    ]
-                );
-            });
+            assert_eq!(
+                editor.text(cx),
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) ")
+            );
+            assert!(!editor.has_visible_completions_menu());
+            assert_eq!(fold_ranges(editor, cx).len(), 2);
+        });
 
         let plain_text_language = Arc::new(language::Language::new(
             language::LanguageConfig {
@@ -2108,7 +2090,7 @@ mod tests {
 
         let fake_language_server = fake_language_servers.next().await.unwrap();
         fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
-            |_, _| async move {
+            move |_, _| async move {
                 Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
                     #[allow(deprecated)]
                     lsp::SymbolInformation {
@@ -2132,18 +2114,13 @@ mod tests {
         cx.simulate_input("@symbol ");
 
         editor.update(&mut cx, |editor, cx| {
-                assert_eq!(
-                    editor.text(cx),
-                    "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) @symbol "
-                );
-                assert!(editor.has_visible_completions_menu());
-                assert_eq!(
-                    current_completion_labels(editor),
-                    &[
-                        "MySymbol",
-                    ]
-                );
-            });
+            assert_eq!(
+                editor.text(cx),
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) @symbol ")
+            );
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(current_completion_labels(editor), &["MySymbol"]);
+        });
 
         editor.update_in(&mut cx, |editor, window, cx| {
             editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
@@ -2165,9 +2142,7 @@ mod tests {
             contents[2],
             Mention::Text {
                 content: "1".into(),
-                uri: "file:///dir/a/one.txt?symbol=MySymbol#L1:1"
-                    .parse()
-                    .unwrap(),
+                uri: format!("{url_one}?symbol=MySymbol#L1:1").parse().unwrap(),
             }
         );
 
@@ -2176,7 +2151,7 @@ mod tests {
         editor.read_with(&cx, |editor, cx| {
                 assert_eq!(
                     editor.text(cx),
-                    "Lorem [@one.txt](file:///dir/a/one.txt)  Ipsum [@eight.txt](file:///dir/b/eight.txt) [@MySymbol](file:///dir/a/one.txt?symbol=MySymbol#L1:1) "
+                    format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
                 );
             });
     }
diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index f0936d400a..5b093ac6a0 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -590,9 +590,9 @@ mod tests {
         assert_eq!(
             fs.files_with_contents(Path::new("")),
             [
-                (Path::new("/bar/baz").into(), b"qux".into()),
-                (Path::new("/foo/a").into(), b"lorem".into()),
-                (Path::new("/foo/b").into(), b"ipsum".into())
+                (Path::new(path!("/bar/baz")).into(), b"qux".into()),
+                (Path::new(path!("/foo/a")).into(), b"lorem".into()),
+                (Path::new(path!("/foo/b")).into(), b"ipsum".into())
             ]
         );
     }
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 847e98d6c4..399c0f3e32 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1101,7 +1101,9 @@ impl FakeFsState {
     ) -> Option<(&mut FakeFsEntry, PathBuf)> {
         let canonical_path = self.canonicalize(target, follow_symlink)?;
 
-        let mut components = canonical_path.components();
+        let mut components = canonical_path
+            .components()
+            .skip_while(|component| matches!(component, Component::Prefix(_)));
         let Some(Component::RootDir) = components.next() else {
             panic!(
                 "the path {:?} was not canonicalized properly {:?}",

From 43b4363b34ceb5070ab80343cecd83c55be1e942 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 19 Aug 2025 20:30:25 +0530
Subject: [PATCH 166/823] lsp: Enable dynamic registration for
 TextDocumentSyncClientCapabilities post revert (#36494)

Follow up: https://github.com/zed-industries/zed/pull/36485

Release Notes:

- N/A
---
 crates/lsp/src/lsp.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 366005a4ab..ce9e2fe229 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -827,7 +827,7 @@ impl LanguageServer {
                     }),
                     synchronization: Some(TextDocumentSyncClientCapabilities {
                         did_save: Some(true),
-                        dynamic_registration: Some(false),
+                        dynamic_registration: Some(true),
                         ..TextDocumentSyncClientCapabilities::default()
                     }),
                     code_lens: Some(CodeLensClientCapabilities {

From 013eaaeadd9952a8bf3b546a271b7d8e08368e1b Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 19 Aug 2025 18:43:42 +0200
Subject: [PATCH 167/823] editor: Render dirty and conflict markers in
 multibuffer headers (#36489)

Release Notes:

- Added rendering of status indicators for multi buffer headers
---
 crates/editor/src/element.rs             | 19 +++++++++++++++----
 crates/inspector_ui/src/div_inspector.rs | 12 ++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 915a3cdc38..0922752e44 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -82,7 +82,7 @@ use sum_tree::Bias;
 use text::{BufferId, SelectionGoal};
 use theme::{ActiveTheme, Appearance, BufferLineHeight, PlayerColor};
 use ui::{
-    ButtonLike, ContextMenu, KeyBinding, POPOVER_Y_PADDING, Tooltip, h_flex, prelude::*,
+    ButtonLike, ContextMenu, Indicator, KeyBinding, POPOVER_Y_PADDING, Tooltip, h_flex, prelude::*,
     right_click_menu,
 };
 use unicode_segmentation::UnicodeSegmentation;
@@ -3563,9 +3563,8 @@ impl EditorElement {
         cx: &mut App,
     ) -> impl IntoElement {
         let editor = self.editor.read(cx);
-        let file_status = editor
-            .buffer
-            .read(cx)
+        let multi_buffer = editor.buffer.read(cx);
+        let file_status = multi_buffer
             .all_diff_hunks_expanded()
             .then(|| {
                 editor
@@ -3575,6 +3574,17 @@ impl EditorElement {
                     .status_for_buffer_id(for_excerpt.buffer_id, cx)
             })
             .flatten();
+        let indicator = multi_buffer
+            .buffer(for_excerpt.buffer_id)
+            .and_then(|buffer| {
+                let buffer = buffer.read(cx);
+                let indicator_color = match (buffer.has_conflict(), buffer.is_dirty()) {
+                    (true, _) => Some(Color::Warning),
+                    (_, true) => Some(Color::Accent),
+                    (false, false) => None,
+                };
+                indicator_color.map(|indicator_color| Indicator::dot().color(indicator_color))
+            });
 
         let include_root = editor
             .project
@@ -3683,6 +3693,7 @@ impl EditorElement {
                                 })
                                 .take(1),
                         )
+                        .children(indicator)
                         .child(
                             h_flex()
                                 .cursor_pointer()
diff --git a/crates/inspector_ui/src/div_inspector.rs b/crates/inspector_ui/src/div_inspector.rs
index bd395aa01b..e9460cc9cc 100644
--- a/crates/inspector_ui/src/div_inspector.rs
+++ b/crates/inspector_ui/src/div_inspector.rs
@@ -395,11 +395,11 @@ impl DivInspector {
             .zip(self.rust_completion_replace_range.as_ref())
         {
             let before_text = snapshot
-                .text_for_range(0..completion_range.start.to_offset(&snapshot))
+                .text_for_range(0..completion_range.start.to_offset(snapshot))
                 .collect::<String>();
             let after_text = snapshot
                 .text_for_range(
-                    completion_range.end.to_offset(&snapshot)
+                    completion_range.end.to_offset(snapshot)
                         ..snapshot.clip_offset(usize::MAX, Bias::Left),
                 )
                 .collect::<String>();
@@ -702,10 +702,10 @@ impl CompletionProvider for RustStyleCompletionProvider {
 }
 
 fn completion_replace_range(snapshot: &BufferSnapshot, anchor: &Anchor) -> Option<Range<Anchor>> {
-    let point = anchor.to_point(&snapshot);
-    let offset = point.to_offset(&snapshot);
-    let line_start = Point::new(point.row, 0).to_offset(&snapshot);
-    let line_end = Point::new(point.row, snapshot.line_len(point.row)).to_offset(&snapshot);
+    let point = anchor.to_point(snapshot);
+    let offset = point.to_offset(snapshot);
+    let line_start = Point::new(point.row, 0).to_offset(snapshot);
+    let line_end = Point::new(point.row, snapshot.line_len(point.row)).to_offset(snapshot);
     let mut lines = snapshot.text_for_range(line_start..line_end).lines();
     let line = lines.next()?;
 

From d1cabef2bfbe37bea8415d6b32835be9ed108249 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 19 Aug 2025 18:53:45 +0200
Subject: [PATCH 168/823] editor: Fix inline diagnostics min column inaccuracy
 (#36501)

Closes https://github.com/zed-industries/zed/issues/33346

Release Notes:

- Fixed `diagnostic.inline.min_column` being inaccurate
---
 crates/editor/src/element.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 0922752e44..d8fe3ccf15 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -2173,11 +2173,13 @@ impl EditorElement {
         };
 
         let padding = ProjectSettings::get_global(cx).diagnostics.inline.padding as f32 * em_width;
-        let min_x = ProjectSettings::get_global(cx)
-            .diagnostics
-            .inline
-            .min_column as f32
-            * em_width;
+        let min_x = self.column_pixels(
+            ProjectSettings::get_global(cx)
+                .diagnostics
+                .inline
+                .min_column as usize,
+            window,
+        );
 
         let mut elements = HashMap::default();
         for (row, mut diagnostics) in diagnostics_by_rows {

From e092aed253a7814f3fb04b4b700e9b65c80ec993 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 19 Aug 2025 14:25:25 -0300
Subject: [PATCH 169/823] Split external agent flags (#36499)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs        | 132 +++++++++++++---------
 crates/feature_flags/src/feature_flags.rs |   6 +
 2 files changed, 82 insertions(+), 56 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 55d07ed495..995bf771e2 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -4,7 +4,6 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::time::Duration;
 
-use agent_servers::AgentServer;
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
 
@@ -44,7 +43,7 @@ use assistant_tool::ToolWorkingSet;
 use client::{UserStore, zed_urls};
 use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
-use feature_flags::{self, FeatureFlagAppExt};
+use feature_flags::{self, AcpFeatureFlag, ClaudeCodeFeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem,
@@ -971,7 +970,7 @@ impl AgentPanel {
         let text_thread_store = self.context_store.clone();
 
         cx.spawn_in(window, async move |this, cx| {
-            let server: Rc<dyn AgentServer> = match agent_choice {
+            let ext_agent = match agent_choice {
                 Some(agent) => {
                     cx.background_spawn(async move {
                         if let Some(serialized) =
@@ -985,10 +984,10 @@ impl AgentPanel {
                     })
                     .detach();
 
-                    agent.server(fs)
+                    agent
                 }
-                None => cx
-                    .background_spawn(async move {
+                None => {
+                    cx.background_spawn(async move {
                         KEY_VALUE_STORE.read_kvp(LAST_USED_EXTERNAL_AGENT_KEY)
                     })
                     .await
@@ -999,10 +998,25 @@ impl AgentPanel {
                     })
                     .unwrap_or_default()
                     .agent
-                    .server(fs),
+                }
             };
 
+            let server = ext_agent.server(fs);
+
             this.update_in(cx, |this, window, cx| {
+                match ext_agent {
+                    crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => {
+                        if !cx.has_flag::<AcpFeatureFlag>() {
+                            return;
+                        }
+                    }
+                    crate::ExternalAgent::ClaudeCode => {
+                        if !cx.has_flag::<ClaudeCodeFeatureFlag>() {
+                            return;
+                        }
+                    }
+                }
+
                 let thread_view = cx.new(|cx| {
                     crate::acp::AcpThreadView::new(
                         server,
@@ -2320,56 +2334,60 @@ impl AgentPanel {
                             )
                             .separator()
                             .header("External Agents")
-                            .item(
-                                ContextMenuEntry::new("New Gemini Thread")
-                                    .icon(IconName::AiGemini)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.set_selected_agent(
-                                                                AgentType::Gemini,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
+                            .when(cx.has_flag::<AcpFeatureFlag>(), |menu| {
+                                menu.item(
+                                    ContextMenuEntry::new("New Gemini Thread")
+                                        .icon(IconName::AiGemini)
+                                        .icon_color(Color::Muted)
+                                        .handler({
+                                            let workspace = workspace.clone();
+                                            move |window, cx| {
+                                                if let Some(workspace) = workspace.upgrade() {
+                                                    workspace.update(cx, |workspace, cx| {
+                                                        if let Some(panel) =
+                                                            workspace.panel::<AgentPanel>(cx)
+                                                        {
+                                                            panel.update(cx, |panel, cx| {
+                                                                panel.set_selected_agent(
+                                                                    AgentType::Gemini,
+                                                                    window,
+                                                                    cx,
+                                                                );
+                                                            });
+                                                        }
+                                                    });
+                                                }
                                             }
-                                        }
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("New Claude Code Thread")
-                                    .icon(IconName::AiClaude)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.set_selected_agent(
-                                                                AgentType::ClaudeCode,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
+                                        }),
+                                )
+                            })
+                            .when(cx.has_flag::<ClaudeCodeFeatureFlag>(), |menu| {
+                                menu.item(
+                                    ContextMenuEntry::new("New Claude Code Thread")
+                                        .icon(IconName::AiClaude)
+                                        .icon_color(Color::Muted)
+                                        .handler({
+                                            let workspace = workspace.clone();
+                                            move |window, cx| {
+                                                if let Some(workspace) = workspace.upgrade() {
+                                                    workspace.update(cx, |workspace, cx| {
+                                                        if let Some(panel) =
+                                                            workspace.panel::<AgentPanel>(cx)
+                                                        {
+                                                            panel.update(cx, |panel, cx| {
+                                                                panel.set_selected_agent(
+                                                                    AgentType::ClaudeCode,
+                                                                    window,
+                                                                    cx,
+                                                                );
+                                                            });
+                                                        }
+                                                    });
+                                                }
                                             }
-                                        }
-                                    }),
-                            );
+                                        }),
+                                )
+                            });
                         menu
                     }))
                 }
@@ -2439,7 +2457,9 @@ impl AgentPanel {
     }
 
     fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if cx.has_flag::<feature_flags::AcpFeatureFlag>() {
+        if cx.has_flag::<feature_flags::AcpFeatureFlag>()
+            || cx.has_flag::<feature_flags::ClaudeCodeFeatureFlag>()
+        {
             self.render_toolbar_new(window, cx).into_any_element()
         } else {
             self.render_toolbar_old(window, cx).into_any_element()
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index f87932bfaf..7c12571f24 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -95,6 +95,12 @@ impl FeatureFlag for AcpFeatureFlag {
     const NAME: &'static str = "acp";
 }
 
+pub struct ClaudeCodeFeatureFlag;
+
+impl FeatureFlag for ClaudeCodeFeatureFlag {
+    const NAME: &'static str = "claude-code";
+}
+
 pub trait FeatureFlagViewExt<V: 'static> {
     fn observe_flag<T: FeatureFlag, F>(&mut self, window: &Window, callback: F) -> Subscription
     where

From 1af47a563fd11ac83d676dee07f87e2b46fe3649 Mon Sep 17 00:00:00 2001
From: fantacell <ghub@giggo.de>
Date: Tue, 19 Aug 2025 19:52:29 +0200
Subject: [PATCH 170/823] helix: Uncomment one test (#36328)

There are two tests commented out in the helix file, but one of them
works again. I don't know if this is too little a change to be merged,
but I wanted to suggest it.
The other test might be more complicated though, so I didn't touch it.

Release Notes:

- N/A
---
 crates/vim/src/helix.rs | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 0c8c06d8ab..3cc9772d42 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -547,27 +547,27 @@ mod test {
         );
     }
 
-    // #[gpui::test]
-    // async fn test_delete_character_end_of_line(cx: &mut gpui::TestAppContext) {
-    //     let mut cx = VimTestContext::new(cx, true).await;
+    #[gpui::test]
+    async fn test_delete_character_end_of_line(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
 
-    //     cx.set_state(
-    //         indoc! {"
-    //         The quick brownˇ
-    //         fox jumps over
-    //         the lazy dog."},
-    //         Mode::HelixNormal,
-    //     );
+        cx.set_state(
+            indoc! {"
+            The quick brownˇ
+            fox jumps over
+            the lazy dog."},
+            Mode::HelixNormal,
+        );
 
-    //     cx.simulate_keystrokes("d");
+        cx.simulate_keystrokes("d");
 
-    //     cx.assert_state(
-    //         indoc! {"
-    //         The quick brownˇfox jumps over
-    //         the lazy dog."},
-    //         Mode::HelixNormal,
-    //     );
-    // }
+        cx.assert_state(
+            indoc! {"
+            The quick brownˇfox jumps over
+            the lazy dog."},
+            Mode::HelixNormal,
+        );
+    }
 
     // #[gpui::test]
     // async fn test_delete_character_end_of_buffer(cx: &mut gpui::TestAppContext) {

From 6b6eb116438f055cb6344d510e37138d8b998ccb Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 20:06:09 +0200
Subject: [PATCH 171/823] agent2: Fix tool schemas for Gemini (#36507)

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 crates/agent2/src/agent2.rs       |  1 +
 crates/agent2/src/thread.rs       |  6 ++---
 crates/agent2/src/tool_schema.rs  | 43 +++++++++++++++++++++++++++++++
 crates/google_ai/src/google_ai.rs |  2 +-
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 crates/agent2/src/tool_schema.rs

diff --git a/crates/agent2/src/agent2.rs b/crates/agent2/src/agent2.rs
index f13cd1bd67..8d18da7fe1 100644
--- a/crates/agent2/src/agent2.rs
+++ b/crates/agent2/src/agent2.rs
@@ -2,6 +2,7 @@ mod agent;
 mod native_agent_server;
 mod templates;
 mod thread;
+mod tool_schema;
 mod tools;
 
 #[cfg(test)]
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index aeb600e232..d90d0bd4f8 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1732,8 +1732,8 @@ where
     fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString;
 
     /// Returns the JSON schema that describes the tool's input.
-    fn input_schema(&self) -> Schema {
-        schemars::schema_for!(Self::Input)
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Schema {
+        crate::tool_schema::root_schema_for::<Self::Input>(format)
     }
 
     /// Some tools rely on a provider for the underlying billing or other reasons.
@@ -1819,7 +1819,7 @@ where
     }
 
     fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        let mut json = serde_json::to_value(self.0.input_schema())?;
+        let mut json = serde_json::to_value(self.0.input_schema(format))?;
         adapt_schema_to_format(&mut json, format)?;
         Ok(json)
     }
diff --git a/crates/agent2/src/tool_schema.rs b/crates/agent2/src/tool_schema.rs
new file mode 100644
index 0000000000..f608336b41
--- /dev/null
+++ b/crates/agent2/src/tool_schema.rs
@@ -0,0 +1,43 @@
+use language_model::LanguageModelToolSchemaFormat;
+use schemars::{
+    JsonSchema, Schema,
+    generate::SchemaSettings,
+    transform::{Transform, transform_subschemas},
+};
+
+pub(crate) fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> Schema {
+    let mut generator = match format {
+        LanguageModelToolSchemaFormat::JsonSchema => SchemaSettings::draft07().into_generator(),
+        LanguageModelToolSchemaFormat::JsonSchemaSubset => SchemaSettings::openapi3()
+            .with(|settings| {
+                settings.meta_schema = None;
+                settings.inline_subschemas = true;
+            })
+            .with_transform(ToJsonSchemaSubsetTransform)
+            .into_generator(),
+    };
+    generator.root_schema_for::<T>()
+}
+
+#[derive(Debug, Clone)]
+struct ToJsonSchemaSubsetTransform;
+
+impl Transform for ToJsonSchemaSubsetTransform {
+    fn transform(&mut self, schema: &mut Schema) {
+        // Ensure that the type field is not an array, this happens when we use
+        // Option<T>, the type will be [T, "null"].
+        if let Some(type_field) = schema.get_mut("type")
+            && let Some(types) = type_field.as_array()
+            && let Some(first_type) = types.first()
+        {
+            *type_field = first_type.clone();
+        }
+
+        // oneOf is not supported, use anyOf instead
+        if let Some(one_of) = schema.remove("oneOf") {
+            schema.insert("anyOf".to_string(), one_of);
+        }
+
+        transform_subschemas(self, schema);
+    }
+}
diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
index 95a6daa1d9..a1b5ca3a03 100644
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -266,7 +266,7 @@ pub struct CitationMetadata {
 pub struct PromptFeedback {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub block_reason: Option<String>,
-    pub safety_ratings: Vec<SafetyRating>,
+    pub safety_ratings: Option<Vec<SafetyRating>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub block_reason_message: Option<String>,
 }

From 6ba52a3a42cbbb9dc4daa3d3e283ca1f98e11d30 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 19 Aug 2025 12:08:11 -0600
Subject: [PATCH 172/823] Re-add history entries for native agent threads
 (#36500)

Closes #ISSUE

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 Cargo.lock                                |   4 +
 crates/agent/src/thread_store.rs          |   2 +-
 crates/agent2/Cargo.toml                  |   4 +
 crates/agent2/src/agent.rs                | 200 ++++--
 crates/agent2/src/agent2.rs               |   4 +
 crates/agent2/src/db.rs                   | 470 +++++++++++++
 crates/agent2/src/history_store.rs        | 314 +++++++++
 crates/agent2/src/native_agent_server.rs  |  11 +-
 crates/agent2/src/tests/mod.rs            |   4 +-
 crates/agent2/src/thread.rs               | 132 +++-
 crates/agent2/src/tools/edit_file_tool.rs |   9 -
 crates/agent_ui/src/acp.rs                |   2 +
 crates/agent_ui/src/acp/thread_history.rs | 766 ++++++++++++++++++++++
 crates/agent_ui/src/acp/thread_view.rs    |  42 +-
 crates/agent_ui/src/agent_panel.rs        | 154 ++++-
 crates/agent_ui/src/agent_ui.rs           |   8 +-
 16 files changed, 2007 insertions(+), 119 deletions(-)
 create mode 100644 crates/agent2/src/db.rs
 create mode 100644 crates/agent2/src/history_store.rs
 create mode 100644 crates/agent_ui/src/acp/thread_history.rs

diff --git a/Cargo.lock b/Cargo.lock
index dc9d074f01..4a5dec4734 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -196,6 +196,7 @@ dependencies = [
  "agent_servers",
  "agent_settings",
  "anyhow",
+ "assistant_context",
  "assistant_tool",
  "assistant_tools",
  "chrono",
@@ -223,6 +224,7 @@ dependencies = [
  "log",
  "lsp",
  "open",
+ "parking_lot",
  "paths",
  "portable-pty",
  "pretty_assertions",
@@ -235,6 +237,7 @@ dependencies = [
  "serde_json",
  "settings",
  "smol",
+ "sqlez",
  "task",
  "tempfile",
  "terminal",
@@ -251,6 +254,7 @@ dependencies = [
  "workspace-hack",
  "worktree",
  "zlog",
+ "zstd",
 ]
 
 [[package]]
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index 96bf639306..ed1605aacf 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -893,7 +893,7 @@ impl ThreadsDatabase {
 
         let needs_migration_from_heed = mdb_path.exists();
 
-        let connection = if *ZED_STATELESS {
+        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
             Connection::open_memory(Some("THREAD_FALLBACK_DB"))
         } else {
             Connection::open_file(&sqlite_path.to_string_lossy())
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 8129341545..890f7e774b 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -19,6 +19,7 @@ agent-client-protocol.workspace = true
 agent_servers.workspace = true
 agent_settings.workspace = true
 anyhow.workspace = true
+assistant_context.workspace = true
 assistant_tool.workspace = true
 assistant_tools.workspace = true
 chrono.workspace = true
@@ -39,6 +40,7 @@ language_model.workspace = true
 language_models.workspace = true
 log.workspace = true
 open.workspace = true
+parking_lot.workspace = true
 paths.workspace = true
 portable-pty.workspace = true
 project.workspace = true
@@ -49,6 +51,7 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+sqlez.workspace = true
 task.workspace = true
 terminal.workspace = true
 text.workspace = true
@@ -59,6 +62,7 @@ watch.workspace = true
 web_search.workspace = true
 which.workspace = true
 workspace-hack.workspace = true
+zstd.workspace = true
 
 [dev-dependencies]
 agent = { workspace = true, "features" = ["test-support"] }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 9cf0c3b603..bc46ad1657 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1,10 +1,9 @@
 use crate::{
-    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DeletePathTool, DiagnosticsTool,
-    EditFileTool, FetchTool, FindPathTool, GrepTool, ListDirectoryTool, MovePathTool, NowTool,
-    OpenTool, ReadFileTool, TerminalTool, ThinkingTool, Thread, ThreadEvent, ToolCallAuthorization,
-    UserMessageContent, WebSearchTool, templates::Templates,
+    ContextServerRegistry, Thread, ThreadEvent, ToolCallAuthorization, UserMessageContent,
+    templates::Templates,
 };
-use acp_thread::AgentModelSelector;
+use crate::{HistoryStore, ThreadsDatabase};
+use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
 use agent_settings::AgentSettings;
@@ -51,7 +50,8 @@ struct Session {
     thread: Entity<Thread>,
     /// The ACP thread that handles protocol communication
     acp_thread: WeakEntity<acp_thread::AcpThread>,
-    _subscription: Subscription,
+    pending_save: Task<()>,
+    _subscriptions: Vec<Subscription>,
 }
 
 pub struct LanguageModels {
@@ -155,6 +155,7 @@ impl LanguageModels {
 pub struct NativeAgent {
     /// Session ID -> Session mapping
     sessions: HashMap<acp::SessionId, Session>,
+    history: Entity<HistoryStore>,
     /// Shared project context for all threads
     project_context: Entity<ProjectContext>,
     project_context_needs_refresh: watch::Sender<()>,
@@ -173,6 +174,7 @@ pub struct NativeAgent {
 impl NativeAgent {
     pub async fn new(
         project: Entity<Project>,
+        history: Entity<HistoryStore>,
         templates: Arc<Templates>,
         prompt_store: Option<Entity<PromptStore>>,
         fs: Arc<dyn Fs>,
@@ -200,6 +202,7 @@ impl NativeAgent {
                 watch::channel(());
             Self {
                 sessions: HashMap::new(),
+                history,
                 project_context: cx.new(|_| project_context),
                 project_context_needs_refresh: project_context_needs_refresh_tx,
                 _maintain_project_context: cx.spawn(async move |this, cx| {
@@ -218,6 +221,55 @@ impl NativeAgent {
         })
     }
 
+    fn register_session(
+        &mut self,
+        thread_handle: Entity<Thread>,
+        cx: &mut Context<Self>,
+    ) -> Entity<AcpThread> {
+        let connection = Rc::new(NativeAgentConnection(cx.entity()));
+        let registry = LanguageModelRegistry::read_global(cx);
+        let summarization_model = registry.thread_summary_model().map(|c| c.model);
+
+        thread_handle.update(cx, |thread, cx| {
+            thread.set_summarization_model(summarization_model, cx);
+            thread.add_default_tools(cx)
+        });
+
+        let thread = thread_handle.read(cx);
+        let session_id = thread.id().clone();
+        let title = thread.title();
+        let project = thread.project.clone();
+        let action_log = thread.action_log.clone();
+        let acp_thread = cx.new(|_cx| {
+            acp_thread::AcpThread::new(
+                title,
+                connection,
+                project.clone(),
+                action_log.clone(),
+                session_id.clone(),
+            )
+        });
+        let subscriptions = vec![
+            cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
+                this.sessions.remove(acp_thread.session_id());
+            }),
+            cx.observe(&thread_handle, move |this, thread, cx| {
+                this.save_thread(thread.clone(), cx)
+            }),
+        ];
+
+        self.sessions.insert(
+            session_id,
+            Session {
+                thread: thread_handle,
+                acp_thread: acp_thread.downgrade(),
+                _subscriptions: subscriptions,
+                pending_save: Task::ready(()),
+            },
+        );
+        acp_thread
+    }
+
     pub fn models(&self) -> &LanguageModels {
         &self.models
     }
@@ -444,6 +496,63 @@ impl NativeAgent {
             });
         }
     }
+
+    pub fn open_thread(
+        &mut self,
+        id: acp::SessionId,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Entity<AcpThread>>> {
+        let database_future = ThreadsDatabase::connect(cx);
+        cx.spawn(async move |this, cx| {
+            let database = database_future.await.map_err(|err| anyhow!(err))?;
+            let db_thread = database
+                .load_thread(id.clone())
+                .await?
+                .with_context(|| format!("no thread found with ID: {id:?}"))?;
+
+            let thread = this.update(cx, |this, cx| {
+                let action_log = cx.new(|_cx| ActionLog::new(this.project.clone()));
+                cx.new(|cx| {
+                    Thread::from_db(
+                        id.clone(),
+                        db_thread,
+                        this.project.clone(),
+                        this.project_context.clone(),
+                        this.context_server_registry.clone(),
+                        action_log.clone(),
+                        this.templates.clone(),
+                        cx,
+                    )
+                })
+            })?;
+            let acp_thread =
+                this.update(cx, |this, cx| this.register_session(thread.clone(), cx))?;
+            let events = thread.update(cx, |thread, cx| thread.replay(cx))?;
+            cx.update(|cx| {
+                NativeAgentConnection::handle_thread_events(events, acp_thread.downgrade(), cx)
+            })?
+            .await?;
+            Ok(acp_thread)
+        })
+    }
+
+    fn save_thread(&mut self, thread: Entity<Thread>, cx: &mut Context<Self>) {
+        let database_future = ThreadsDatabase::connect(cx);
+        let (id, db_thread) =
+            thread.update(cx, |thread, cx| (thread.id().clone(), thread.to_db(cx)));
+        let Some(session) = self.sessions.get_mut(&id) else {
+            return;
+        };
+        let history = self.history.clone();
+        session.pending_save = cx.spawn(async move |_, cx| {
+            let Some(database) = database_future.await.map_err(|err| anyhow!(err)).log_err() else {
+                return;
+            };
+            let db_thread = db_thread.await;
+            database.save_thread(id, db_thread).await.log_err();
+            history.update(cx, |history, cx| history.reload(cx)).ok();
+        });
+    }
 }
 
 /// Wrapper struct that implements the AgentConnection trait
@@ -476,13 +585,21 @@ impl NativeAgentConnection {
         };
         log::debug!("Found session for: {}", session_id);
 
-        let mut response_stream = match f(thread, cx) {
+        let response_stream = match f(thread, cx) {
             Ok(stream) => stream,
             Err(err) => return Task::ready(Err(err)),
         };
+        Self::handle_thread_events(response_stream, acp_thread, cx)
+    }
+
+    fn handle_thread_events(
+        mut events: mpsc::UnboundedReceiver<Result<ThreadEvent>>,
+        acp_thread: WeakEntity<AcpThread>,
+        cx: &App,
+    ) -> Task<Result<acp::PromptResponse>> {
         cx.spawn(async move |cx| {
             // Handle response stream and forward to session.acp_thread
-            while let Some(result) = response_stream.next().await {
+            while let Some(result) = events.next().await {
                 match result {
                     Ok(event) => {
                         log::trace!("Received completion event: {:?}", event);
@@ -686,8 +803,6 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                 |agent, cx: &mut gpui::Context<NativeAgent>| -> Result<_> {
                     // Fetch default model from registry settings
                     let registry = LanguageModelRegistry::read_global(cx);
-                    let language_registry = project.read(cx).languages().clone();
-
                     // Log available models for debugging
                     let available_count = registry.available_models(cx).count();
                     log::debug!("Total available models: {}", available_count);
@@ -697,72 +812,23 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             .models
                             .model_from_id(&LanguageModels::model_id(&default_model.model))
                     });
-                    let summarization_model = registry.thread_summary_model().map(|c| c.model);
 
                     let thread = cx.new(|cx| {
-                        let mut thread = Thread::new(
+                        Thread::new(
                             project.clone(),
                             agent.project_context.clone(),
                             agent.context_server_registry.clone(),
                             action_log.clone(),
                             agent.templates.clone(),
                             default_model,
-                            summarization_model,
                             cx,
-                        );
-                        thread.add_tool(CopyPathTool::new(project.clone()));
-                        thread.add_tool(CreateDirectoryTool::new(project.clone()));
-                        thread.add_tool(DeletePathTool::new(project.clone(), action_log.clone()));
-                        thread.add_tool(DiagnosticsTool::new(project.clone()));
-                        thread.add_tool(EditFileTool::new(cx.weak_entity(), language_registry));
-                        thread.add_tool(FetchTool::new(project.read(cx).client().http_client()));
-                        thread.add_tool(FindPathTool::new(project.clone()));
-                        thread.add_tool(GrepTool::new(project.clone()));
-                        thread.add_tool(ListDirectoryTool::new(project.clone()));
-                        thread.add_tool(MovePathTool::new(project.clone()));
-                        thread.add_tool(NowTool);
-                        thread.add_tool(OpenTool::new(project.clone()));
-                        thread.add_tool(ReadFileTool::new(project.clone(), action_log.clone()));
-                        thread.add_tool(TerminalTool::new(project.clone(), cx));
-                        thread.add_tool(ThinkingTool);
-                        thread.add_tool(WebSearchTool); // TODO: Enable this only if it's a zed model.
-                        thread
+                        )
                     });
 
                     Ok(thread)
                 },
             )??;
-
-            let session_id = thread.read_with(cx, |thread, _| thread.id().clone())?;
-            log::info!("Created session with ID: {}", session_id);
-            // Create AcpThread
-            let acp_thread = cx.update(|cx| {
-                cx.new(|_cx| {
-                    acp_thread::AcpThread::new(
-                        "agent2",
-                        self.clone(),
-                        project.clone(),
-                        action_log.clone(),
-                        session_id.clone(),
-                    )
-                })
-            })?;
-
-            // Store the session
-            agent.update(cx, |agent, cx| {
-                agent.sessions.insert(
-                    session_id,
-                    Session {
-                        thread,
-                        acp_thread: acp_thread.downgrade(),
-                        _subscription: cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
-                            this.sessions.remove(acp_thread.session_id());
-                        }),
-                    },
-                );
-            })?;
-
-            Ok(acp_thread)
+            agent.update(cx, |agent, cx| agent.register_session(thread, cx))
         })
     }
 
@@ -887,8 +953,11 @@ mod tests {
         )
         .await;
         let project = Project::test(fs.clone(), [], cx).await;
+        let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
         let agent = NativeAgent::new(
             project.clone(),
+            history_store,
             Templates::new(),
             None,
             fs.clone(),
@@ -942,9 +1011,12 @@ mod tests {
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree("/", json!({ "a": {}  })).await;
         let project = Project::test(fs.clone(), [], cx).await;
+        let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
         let connection = NativeAgentConnection(
             NativeAgent::new(
                 project.clone(),
+                history_store,
                 Templates::new(),
                 None,
                 fs.clone(),
@@ -995,9 +1067,13 @@ mod tests {
         .await;
         let project = Project::test(fs.clone(), [], cx).await;
 
+        let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
+
         // Create the agent and connection
         let agent = NativeAgent::new(
             project.clone(),
+            history_store,
             Templates::new(),
             None,
             fs.clone(),
diff --git a/crates/agent2/src/agent2.rs b/crates/agent2/src/agent2.rs
index 8d18da7fe1..1fc9c1cb95 100644
--- a/crates/agent2/src/agent2.rs
+++ b/crates/agent2/src/agent2.rs
@@ -1,4 +1,6 @@
 mod agent;
+mod db;
+mod history_store;
 mod native_agent_server;
 mod templates;
 mod thread;
@@ -9,6 +11,8 @@ mod tools;
 mod tests;
 
 pub use agent::*;
+pub use db::*;
+pub use history_store::*;
 pub use native_agent_server::NativeAgentServer;
 pub use templates::*;
 pub use thread::*;
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
new file mode 100644
index 0000000000..c3e6352ef6
--- /dev/null
+++ b/crates/agent2/src/db.rs
@@ -0,0 +1,470 @@
+use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
+use agent::thread_store;
+use agent_client_protocol as acp;
+use agent_settings::{AgentProfileId, CompletionMode};
+use anyhow::{Result, anyhow};
+use chrono::{DateTime, Utc};
+use collections::{HashMap, IndexMap};
+use futures::{FutureExt, future::Shared};
+use gpui::{BackgroundExecutor, Global, Task};
+use indoc::indoc;
+use parking_lot::Mutex;
+use serde::{Deserialize, Serialize};
+use sqlez::{
+    bindable::{Bind, Column},
+    connection::Connection,
+    statement::Statement,
+};
+use std::sync::Arc;
+use ui::{App, SharedString};
+
+pub type DbMessage = crate::Message;
+pub type DbSummary = agent::thread::DetailedSummaryState;
+pub type DbLanguageModel = thread_store::SerializedLanguageModel;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DbThreadMetadata {
+    pub id: acp::SessionId,
+    #[serde(alias = "summary")]
+    pub title: SharedString,
+    pub updated_at: DateTime<Utc>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DbThread {
+    pub title: SharedString,
+    pub messages: Vec<DbMessage>,
+    pub updated_at: DateTime<Utc>,
+    #[serde(default)]
+    pub summary: DbSummary,
+    #[serde(default)]
+    pub initial_project_snapshot: Option<Arc<agent::thread::ProjectSnapshot>>,
+    #[serde(default)]
+    pub cumulative_token_usage: language_model::TokenUsage,
+    #[serde(default)]
+    pub request_token_usage: Vec<language_model::TokenUsage>,
+    #[serde(default)]
+    pub model: Option<DbLanguageModel>,
+    #[serde(default)]
+    pub completion_mode: Option<CompletionMode>,
+    #[serde(default)]
+    pub profile: Option<AgentProfileId>,
+}
+
+impl DbThread {
+    pub const VERSION: &'static str = "0.3.0";
+
+    pub fn from_json(json: &[u8]) -> Result<Self> {
+        let saved_thread_json = serde_json::from_slice::<serde_json::Value>(json)?;
+        match saved_thread_json.get("version") {
+            Some(serde_json::Value::String(version)) => match version.as_str() {
+                Self::VERSION => Ok(serde_json::from_value(saved_thread_json)?),
+                _ => Self::upgrade_from_agent_1(agent::SerializedThread::from_json(json)?),
+            },
+            _ => Self::upgrade_from_agent_1(agent::SerializedThread::from_json(json)?),
+        }
+    }
+
+    fn upgrade_from_agent_1(thread: agent::SerializedThread) -> Result<Self> {
+        let mut messages = Vec::new();
+        for msg in thread.messages {
+            let message = match msg.role {
+                language_model::Role::User => {
+                    let mut content = Vec::new();
+
+                    // Convert segments to content
+                    for segment in msg.segments {
+                        match segment {
+                            thread_store::SerializedMessageSegment::Text { text } => {
+                                content.push(UserMessageContent::Text(text));
+                            }
+                            thread_store::SerializedMessageSegment::Thinking { text, .. } => {
+                                // User messages don't have thinking segments, but handle gracefully
+                                content.push(UserMessageContent::Text(text));
+                            }
+                            thread_store::SerializedMessageSegment::RedactedThinking { .. } => {
+                                // User messages don't have redacted thinking, skip.
+                            }
+                        }
+                    }
+
+                    // If no content was added, add context as text if available
+                    if content.is_empty() && !msg.context.is_empty() {
+                        content.push(UserMessageContent::Text(msg.context));
+                    }
+
+                    crate::Message::User(UserMessage {
+                        // MessageId from old format can't be meaningfully converted, so generate a new one
+                        id: acp_thread::UserMessageId::new(),
+                        content,
+                    })
+                }
+                language_model::Role::Assistant => {
+                    let mut content = Vec::new();
+
+                    // Convert segments to content
+                    for segment in msg.segments {
+                        match segment {
+                            thread_store::SerializedMessageSegment::Text { text } => {
+                                content.push(AgentMessageContent::Text(text));
+                            }
+                            thread_store::SerializedMessageSegment::Thinking {
+                                text,
+                                signature,
+                            } => {
+                                content.push(AgentMessageContent::Thinking { text, signature });
+                            }
+                            thread_store::SerializedMessageSegment::RedactedThinking { data } => {
+                                content.push(AgentMessageContent::RedactedThinking(data));
+                            }
+                        }
+                    }
+
+                    // Convert tool uses
+                    let mut tool_names_by_id = HashMap::default();
+                    for tool_use in msg.tool_uses {
+                        tool_names_by_id.insert(tool_use.id.clone(), tool_use.name.clone());
+                        content.push(AgentMessageContent::ToolUse(
+                            language_model::LanguageModelToolUse {
+                                id: tool_use.id,
+                                name: tool_use.name.into(),
+                                raw_input: serde_json::to_string(&tool_use.input)
+                                    .unwrap_or_default(),
+                                input: tool_use.input,
+                                is_input_complete: true,
+                            },
+                        ));
+                    }
+
+                    // Convert tool results
+                    let mut tool_results = IndexMap::default();
+                    for tool_result in msg.tool_results {
+                        let name = tool_names_by_id
+                            .remove(&tool_result.tool_use_id)
+                            .unwrap_or_else(|| SharedString::from("unknown"));
+                        tool_results.insert(
+                            tool_result.tool_use_id.clone(),
+                            language_model::LanguageModelToolResult {
+                                tool_use_id: tool_result.tool_use_id,
+                                tool_name: name.into(),
+                                is_error: tool_result.is_error,
+                                content: tool_result.content,
+                                output: tool_result.output,
+                            },
+                        );
+                    }
+
+                    crate::Message::Agent(AgentMessage {
+                        content,
+                        tool_results,
+                    })
+                }
+                language_model::Role::System => {
+                    // Skip system messages as they're not supported in the new format
+                    continue;
+                }
+            };
+
+            messages.push(message);
+        }
+
+        Ok(Self {
+            title: thread.summary,
+            messages,
+            updated_at: thread.updated_at,
+            summary: thread.detailed_summary_state,
+            initial_project_snapshot: thread.initial_project_snapshot,
+            cumulative_token_usage: thread.cumulative_token_usage,
+            request_token_usage: thread.request_token_usage,
+            model: thread.model,
+            completion_mode: thread.completion_mode,
+            profile: thread.profile,
+        })
+    }
+}
+
+pub static ZED_STATELESS: std::sync::LazyLock<bool> =
+    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DataType {
+    #[serde(rename = "json")]
+    Json,
+    #[serde(rename = "zstd")]
+    Zstd,
+}
+
+impl Bind for DataType {
+    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
+        let value = match self {
+            DataType::Json => "json",
+            DataType::Zstd => "zstd",
+        };
+        value.bind(statement, start_index)
+    }
+}
+
+impl Column for DataType {
+    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
+        let (value, next_index) = String::column(statement, start_index)?;
+        let data_type = match value.as_str() {
+            "json" => DataType::Json,
+            "zstd" => DataType::Zstd,
+            _ => anyhow::bail!("Unknown data type: {}", value),
+        };
+        Ok((data_type, next_index))
+    }
+}
+
+pub(crate) struct ThreadsDatabase {
+    executor: BackgroundExecutor,
+    connection: Arc<Mutex<Connection>>,
+}
+
+struct GlobalThreadsDatabase(Shared<Task<Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>);
+
+impl Global for GlobalThreadsDatabase {}
+
+impl ThreadsDatabase {
+    pub fn connect(cx: &mut App) -> Shared<Task<Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>> {
+        if cx.has_global::<GlobalThreadsDatabase>() {
+            return cx.global::<GlobalThreadsDatabase>().0.clone();
+        }
+        let executor = cx.background_executor().clone();
+        let task = executor
+            .spawn({
+                let executor = executor.clone();
+                async move {
+                    match ThreadsDatabase::new(executor) {
+                        Ok(db) => Ok(Arc::new(db)),
+                        Err(err) => Err(Arc::new(err)),
+                    }
+                }
+            })
+            .shared();
+
+        cx.set_global(GlobalThreadsDatabase(task.clone()));
+        task
+    }
+
+    pub fn new(executor: BackgroundExecutor) -> Result<Self> {
+        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
+            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
+        } else {
+            let threads_dir = paths::data_dir().join("threads");
+            std::fs::create_dir_all(&threads_dir)?;
+            let sqlite_path = threads_dir.join("threads.db");
+            Connection::open_file(&sqlite_path.to_string_lossy())
+        };
+
+        connection.exec(indoc! {"
+            CREATE TABLE IF NOT EXISTS threads (
+                id TEXT PRIMARY KEY,
+                summary TEXT NOT NULL,
+                updated_at TEXT NOT NULL,
+                data_type TEXT NOT NULL,
+                data BLOB NOT NULL
+            )
+        "})?()
+        .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
+
+        let db = Self {
+            executor: executor.clone(),
+            connection: Arc::new(Mutex::new(connection)),
+        };
+
+        Ok(db)
+    }
+
+    fn save_thread_sync(
+        connection: &Arc<Mutex<Connection>>,
+        id: acp::SessionId,
+        thread: DbThread,
+    ) -> Result<()> {
+        const COMPRESSION_LEVEL: i32 = 3;
+
+        #[derive(Serialize)]
+        struct SerializedThread {
+            #[serde(flatten)]
+            thread: DbThread,
+            version: &'static str,
+        }
+
+        let title = thread.title.to_string();
+        let updated_at = thread.updated_at.to_rfc3339();
+        let json_data = serde_json::to_string(&SerializedThread {
+            thread,
+            version: DbThread::VERSION,
+        })?;
+
+        let connection = connection.lock();
+
+        let compressed = zstd::encode_all(json_data.as_bytes(), COMPRESSION_LEVEL)?;
+        let data_type = DataType::Zstd;
+        let data = compressed;
+
+        let mut insert = connection.exec_bound::<(Arc<str>, String, String, DataType, Vec<u8>)>(indoc! {"
+            INSERT OR REPLACE INTO threads (id, summary, updated_at, data_type, data) VALUES (?, ?, ?, ?, ?)
+        "})?;
+
+        insert((id.0.clone(), title, updated_at, data_type, data))?;
+
+        Ok(())
+    }
+
+    pub fn list_threads(&self) -> Task<Result<Vec<DbThreadMetadata>>> {
+        let connection = self.connection.clone();
+
+        self.executor.spawn(async move {
+            let connection = connection.lock();
+
+            let mut select =
+                connection.select_bound::<(), (Arc<str>, String, String)>(indoc! {"
+                SELECT id, summary, updated_at FROM threads ORDER BY updated_at DESC
+            "})?;
+
+            let rows = select(())?;
+            let mut threads = Vec::new();
+
+            for (id, summary, updated_at) in rows {
+                threads.push(DbThreadMetadata {
+                    id: acp::SessionId(id),
+                    title: summary.into(),
+                    updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
+                });
+            }
+
+            Ok(threads)
+        })
+    }
+
+    pub fn load_thread(&self, id: acp::SessionId) -> Task<Result<Option<DbThread>>> {
+        let connection = self.connection.clone();
+
+        self.executor.spawn(async move {
+            let connection = connection.lock();
+            let mut select = connection.select_bound::<Arc<str>, (DataType, Vec<u8>)>(indoc! {"
+                SELECT data_type, data FROM threads WHERE id = ? LIMIT 1
+            "})?;
+
+            let rows = select(id.0)?;
+            if let Some((data_type, data)) = rows.into_iter().next() {
+                let json_data = match data_type {
+                    DataType::Zstd => {
+                        let decompressed = zstd::decode_all(&data[..])?;
+                        String::from_utf8(decompressed)?
+                    }
+                    DataType::Json => String::from_utf8(data)?,
+                };
+                let thread = DbThread::from_json(json_data.as_bytes())?;
+                Ok(Some(thread))
+            } else {
+                Ok(None)
+            }
+        })
+    }
+
+    pub fn save_thread(&self, id: acp::SessionId, thread: DbThread) -> Task<Result<()>> {
+        let connection = self.connection.clone();
+
+        self.executor
+            .spawn(async move { Self::save_thread_sync(&connection, id, thread) })
+    }
+
+    pub fn delete_thread(&self, id: acp::SessionId) -> Task<Result<()>> {
+        let connection = self.connection.clone();
+
+        self.executor.spawn(async move {
+            let connection = connection.lock();
+
+            let mut delete = connection.exec_bound::<Arc<str>>(indoc! {"
+                DELETE FROM threads WHERE id = ?
+            "})?;
+
+            delete(id.0)?;
+
+            Ok(())
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+    use agent::MessageSegment;
+    use agent::context::LoadedContext;
+    use client::Client;
+    use fs::FakeFs;
+    use gpui::AppContext;
+    use gpui::TestAppContext;
+    use http_client::FakeHttpClient;
+    use language_model::Role;
+    use project::Project;
+    use settings::SettingsStore;
+
+    fn init_test(cx: &mut TestAppContext) {
+        env_logger::try_init().ok();
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            Project::init_settings(cx);
+            language::init(cx);
+
+            let http_client = FakeHttpClient::with_404_response();
+            let clock = Arc::new(clock::FakeSystemClock::new());
+            let client = Client::new(clock, http_client, cx);
+            agent::init(cx);
+            agent_settings::init(cx);
+            language_model::init(client.clone(), cx);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_retrieving_old_thread(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+
+        // Save a thread using the old agent.
+        let thread_store = cx.new(|cx| agent::ThreadStore::fake(project, cx));
+        let thread = thread_store.update(cx, |thread_store, cx| thread_store.create_thread(cx));
+        thread.update(cx, |thread, cx| {
+            thread.insert_message(
+                Role::User,
+                vec![MessageSegment::Text("Hey!".into())],
+                LoadedContext::default(),
+                vec![],
+                false,
+                cx,
+            );
+            thread.insert_message(
+                Role::Assistant,
+                vec![MessageSegment::Text("How're you doing?".into())],
+                LoadedContext::default(),
+                vec![],
+                false,
+                cx,
+            )
+        });
+        thread_store
+            .update(cx, |thread_store, cx| thread_store.save_thread(&thread, cx))
+            .await
+            .unwrap();
+
+        // Open that same thread using the new agent.
+        let db = cx.update(ThreadsDatabase::connect).await.unwrap();
+        let threads = db.list_threads().await.unwrap();
+        assert_eq!(threads.len(), 1);
+        let thread = db
+            .load_thread(threads[0].id.clone())
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(thread.messages[0].to_markdown(), "## User\n\nHey!\n");
+        assert_eq!(
+            thread.messages[1].to_markdown(),
+            "## Assistant\n\nHow're you doing?\n"
+        );
+    }
+}
diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
new file mode 100644
index 0000000000..34a5e7b4ef
--- /dev/null
+++ b/crates/agent2/src/history_store.rs
@@ -0,0 +1,314 @@
+use crate::{DbThreadMetadata, ThreadsDatabase};
+use agent_client_protocol as acp;
+use anyhow::{Context as _, Result, anyhow};
+use assistant_context::SavedContextMetadata;
+use chrono::{DateTime, Utc};
+use gpui::{App, AsyncApp, Entity, SharedString, Task, prelude::*};
+use itertools::Itertools;
+use paths::contexts_dir;
+use serde::{Deserialize, Serialize};
+use std::{collections::VecDeque, path::Path, sync::Arc, time::Duration};
+use util::ResultExt as _;
+
+const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
+const NAVIGATION_HISTORY_PATH: &str = "agent-navigation-history.json";
+const SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE: Duration = Duration::from_millis(50);
+
+const DEFAULT_TITLE: &SharedString = &SharedString::new_static("New Thread");
+
+#[derive(Clone, Debug)]
+pub enum HistoryEntry {
+    AcpThread(DbThreadMetadata),
+    TextThread(SavedContextMetadata),
+}
+
+impl HistoryEntry {
+    pub fn updated_at(&self) -> DateTime<Utc> {
+        match self {
+            HistoryEntry::AcpThread(thread) => thread.updated_at,
+            HistoryEntry::TextThread(context) => context.mtime.to_utc(),
+        }
+    }
+
+    pub fn id(&self) -> HistoryEntryId {
+        match self {
+            HistoryEntry::AcpThread(thread) => HistoryEntryId::AcpThread(thread.id.clone()),
+            HistoryEntry::TextThread(context) => HistoryEntryId::TextThread(context.path.clone()),
+        }
+    }
+
+    pub fn title(&self) -> &SharedString {
+        match self {
+            HistoryEntry::AcpThread(thread) if thread.title.is_empty() => DEFAULT_TITLE,
+            HistoryEntry::AcpThread(thread) => &thread.title,
+            HistoryEntry::TextThread(context) => &context.title,
+        }
+    }
+}
+
+/// Generic identifier for a history entry.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum HistoryEntryId {
+    AcpThread(acp::SessionId),
+    TextThread(Arc<Path>),
+}
+
+#[derive(Serialize, Deserialize)]
+enum SerializedRecentOpen {
+    Thread(String),
+    ContextName(String),
+    /// Old format which stores the full path
+    Context(String),
+}
+
+pub struct HistoryStore {
+    threads: Vec<DbThreadMetadata>,
+    context_store: Entity<assistant_context::ContextStore>,
+    recently_opened_entries: VecDeque<HistoryEntryId>,
+    _subscriptions: Vec<gpui::Subscription>,
+    _save_recently_opened_entries_task: Task<()>,
+}
+
+impl HistoryStore {
+    pub fn new(
+        context_store: Entity<assistant_context::ContextStore>,
+        initial_recent_entries: impl IntoIterator<Item = HistoryEntryId>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let subscriptions = vec![cx.observe(&context_store, |_, _, cx| cx.notify())];
+
+        cx.spawn(async move |this, cx| {
+            let entries = Self::load_recently_opened_entries(cx).await.log_err()?;
+            this.update(cx, |this, _| {
+                this.recently_opened_entries
+                    .extend(
+                        entries.into_iter().take(
+                            MAX_RECENTLY_OPENED_ENTRIES
+                                .saturating_sub(this.recently_opened_entries.len()),
+                        ),
+                    );
+            })
+            .ok()
+        })
+        .detach();
+
+        Self {
+            context_store,
+            recently_opened_entries: initial_recent_entries.into_iter().collect(),
+            threads: Vec::default(),
+            _subscriptions: subscriptions,
+            _save_recently_opened_entries_task: Task::ready(()),
+        }
+    }
+
+    pub fn delete_thread(
+        &mut self,
+        id: acp::SessionId,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        let database_future = ThreadsDatabase::connect(cx);
+        cx.spawn(async move |this, cx| {
+            let database = database_future.await.map_err(|err| anyhow!(err))?;
+            database.delete_thread(id.clone()).await?;
+            this.update(cx, |this, cx| this.reload(cx))
+        })
+    }
+
+    pub fn delete_text_thread(
+        &mut self,
+        path: Arc<Path>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.context_store.update(cx, |context_store, cx| {
+            context_store.delete_local_context(path, cx)
+        })
+    }
+
+    pub fn reload(&self, cx: &mut Context<Self>) {
+        let database_future = ThreadsDatabase::connect(cx);
+        cx.spawn(async move |this, cx| {
+            let threads = database_future
+                .await
+                .map_err(|err| anyhow!(err))?
+                .list_threads()
+                .await?;
+
+            this.update(cx, |this, cx| {
+                this.threads = threads;
+                cx.notify();
+            })
+        })
+        .detach_and_log_err(cx);
+    }
+
+    pub fn entries(&self, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
+        let mut history_entries = Vec::new();
+
+        #[cfg(debug_assertions)]
+        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
+            return history_entries;
+        }
+
+        history_entries.extend(self.threads.iter().cloned().map(HistoryEntry::AcpThread));
+        history_entries.extend(
+            self.context_store
+                .read(cx)
+                .unordered_contexts()
+                .cloned()
+                .map(HistoryEntry::TextThread),
+        );
+
+        history_entries.sort_unstable_by_key(|entry| std::cmp::Reverse(entry.updated_at()));
+        history_entries
+    }
+
+    pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
+        self.entries(cx).into_iter().take(limit).collect()
+    }
+
+    pub fn recently_opened_entries(&self, cx: &App) -> Vec<HistoryEntry> {
+        #[cfg(debug_assertions)]
+        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
+            return Vec::new();
+        }
+
+        let thread_entries = self.threads.iter().flat_map(|thread| {
+            self.recently_opened_entries
+                .iter()
+                .enumerate()
+                .flat_map(|(index, entry)| match entry {
+                    HistoryEntryId::AcpThread(id) if &thread.id == id => {
+                        Some((index, HistoryEntry::AcpThread(thread.clone())))
+                    }
+                    _ => None,
+                })
+        });
+
+        let context_entries =
+            self.context_store
+                .read(cx)
+                .unordered_contexts()
+                .flat_map(|context| {
+                    self.recently_opened_entries
+                        .iter()
+                        .enumerate()
+                        .flat_map(|(index, entry)| match entry {
+                            HistoryEntryId::TextThread(path) if &context.path == path => {
+                                Some((index, HistoryEntry::TextThread(context.clone())))
+                            }
+                            _ => None,
+                        })
+                });
+
+        thread_entries
+            .chain(context_entries)
+            // optimization to halt iteration early
+            .take(self.recently_opened_entries.len())
+            .sorted_unstable_by_key(|(index, _)| *index)
+            .map(|(_, entry)| entry)
+            .collect()
+    }
+
+    fn save_recently_opened_entries(&mut self, cx: &mut Context<Self>) {
+        let serialized_entries = self
+            .recently_opened_entries
+            .iter()
+            .filter_map(|entry| match entry {
+                HistoryEntryId::TextThread(path) => path.file_name().map(|file| {
+                    SerializedRecentOpen::ContextName(file.to_string_lossy().to_string())
+                }),
+                HistoryEntryId::AcpThread(id) => Some(SerializedRecentOpen::Thread(id.to_string())),
+            })
+            .collect::<Vec<_>>();
+
+        self._save_recently_opened_entries_task = cx.spawn(async move |_, cx| {
+            cx.background_executor()
+                .timer(SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE)
+                .await;
+            cx.background_spawn(async move {
+                let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
+                let content = serde_json::to_string(&serialized_entries)?;
+                std::fs::write(path, content)?;
+                anyhow::Ok(())
+            })
+            .await
+            .log_err();
+        });
+    }
+
+    fn load_recently_opened_entries(cx: &AsyncApp) -> Task<Result<Vec<HistoryEntryId>>> {
+        cx.background_spawn(async move {
+            let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
+            let contents = match smol::fs::read_to_string(path).await {
+                Ok(it) => it,
+                Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
+                    return Ok(Vec::new());
+                }
+                Err(e) => {
+                    return Err(e)
+                        .context("deserializing persisted agent panel navigation history");
+                }
+            };
+            let entries = serde_json::from_str::<Vec<SerializedRecentOpen>>(&contents)
+                .context("deserializing persisted agent panel navigation history")?
+                .into_iter()
+                .take(MAX_RECENTLY_OPENED_ENTRIES)
+                .flat_map(|entry| match entry {
+                    SerializedRecentOpen::Thread(id) => Some(HistoryEntryId::AcpThread(
+                        acp::SessionId(id.as_str().into()),
+                    )),
+                    SerializedRecentOpen::ContextName(file_name) => Some(
+                        HistoryEntryId::TextThread(contexts_dir().join(file_name).into()),
+                    ),
+                    SerializedRecentOpen::Context(path) => {
+                        Path::new(&path).file_name().map(|file_name| {
+                            HistoryEntryId::TextThread(contexts_dir().join(file_name).into())
+                        })
+                    }
+                })
+                .collect::<Vec<_>>();
+            Ok(entries)
+        })
+    }
+
+    pub fn push_recently_opened_entry(&mut self, entry: HistoryEntryId, cx: &mut Context<Self>) {
+        self.recently_opened_entries
+            .retain(|old_entry| old_entry != &entry);
+        self.recently_opened_entries.push_front(entry);
+        self.recently_opened_entries
+            .truncate(MAX_RECENTLY_OPENED_ENTRIES);
+        self.save_recently_opened_entries(cx);
+    }
+
+    pub fn remove_recently_opened_thread(&mut self, id: acp::SessionId, cx: &mut Context<Self>) {
+        self.recently_opened_entries.retain(|entry| match entry {
+            HistoryEntryId::AcpThread(thread_id) if thread_id == &id => false,
+            _ => true,
+        });
+        self.save_recently_opened_entries(cx);
+    }
+
+    pub fn replace_recently_opened_text_thread(
+        &mut self,
+        old_path: &Path,
+        new_path: &Arc<Path>,
+        cx: &mut Context<Self>,
+    ) {
+        for entry in &mut self.recently_opened_entries {
+            match entry {
+                HistoryEntryId::TextThread(path) if path.as_ref() == old_path => {
+                    *entry = HistoryEntryId::TextThread(new_path.clone());
+                    break;
+                }
+                _ => {}
+            }
+        }
+        self.save_recently_opened_entries(cx);
+    }
+
+    pub fn remove_recently_opened_entry(&mut self, entry: &HistoryEntryId, cx: &mut Context<Self>) {
+        self.recently_opened_entries
+            .retain(|old_entry| old_entry != entry);
+        self.save_recently_opened_entries(cx);
+    }
+}
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 6f09ee1175..f8cf3dd602 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -7,16 +7,17 @@ use gpui::{App, Entity, Task};
 use project::Project;
 use prompt_store::PromptStore;
 
-use crate::{NativeAgent, NativeAgentConnection, templates::Templates};
+use crate::{HistoryStore, NativeAgent, NativeAgentConnection, templates::Templates};
 
 #[derive(Clone)]
 pub struct NativeAgentServer {
     fs: Arc<dyn Fs>,
+    history: Entity<HistoryStore>,
 }
 
 impl NativeAgentServer {
-    pub fn new(fs: Arc<dyn Fs>) -> Self {
-        Self { fs }
+    pub fn new(fs: Arc<dyn Fs>, history: Entity<HistoryStore>) -> Self {
+        Self { fs, history }
     }
 }
 
@@ -50,6 +51,7 @@ impl AgentServer for NativeAgentServer {
         );
         let project = project.clone();
         let fs = self.fs.clone();
+        let history = self.history.clone();
         let prompt_store = PromptStore::global(cx);
         cx.spawn(async move |cx| {
             log::debug!("Creating templates for native agent");
@@ -57,7 +59,8 @@ impl AgentServer for NativeAgentServer {
             let prompt_store = prompt_store.await?;
 
             log::debug!("Creating native agent entity");
-            let agent = NativeAgent::new(project, templates, Some(prompt_store), fs, cx).await?;
+            let agent =
+                NativeAgent::new(project, history, templates, Some(prompt_store), fs, cx).await?;
 
             // Create the connection wrapper
             let connection = NativeAgentConnection(agent);
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 33706b05de..f01873cfc1 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1273,10 +1273,13 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
     fake_fs.insert_tree(path!("/test"), json!({})).await;
     let project = Project::test(fake_fs.clone(), [Path::new("/test")], cx).await;
     let cwd = Path::new("/test");
+    let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
+    let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
 
     // Create agent and connection
     let agent = NativeAgent::new(
         project.clone(),
+        history_store,
         templates.clone(),
         None,
         fake_fs.clone(),
@@ -1756,7 +1759,6 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
             action_log,
             templates,
             Some(model.clone()),
-            None,
             cx,
         )
     });
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index d90d0bd4f8..66b4485f72 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1,4 +1,9 @@
-use crate::{ContextServerRegistry, SystemPromptTemplate, Template, Templates};
+use crate::{
+    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DbLanguageModel, DbThread,
+    DeletePathTool, DiagnosticsTool, EditFileTool, FetchTool, FindPathTool, GrepTool,
+    ListDirectoryTool, MovePathTool, NowTool, OpenTool, ReadFileTool, SystemPromptTemplate,
+    Template, Templates, TerminalTool, ThinkingTool, WebSearchTool,
+};
 use acp_thread::{MentionUri, UserMessageId};
 use action_log::ActionLog;
 use agent::thread::{DetailedSummaryState, GitState, ProjectSnapshot, WorktreeSnapshot};
@@ -17,13 +22,13 @@ use futures::{
     stream::FuturesUnordered,
 };
 use git::repository::DiffType;
-use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
 use language_model::{
     LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelImage,
-    LanguageModelProviderId, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolResultContent,
-    LanguageModelToolSchemaFormat, LanguageModelToolUse, LanguageModelToolUseId, Role, StopReason,
-    TokenUsage,
+    LanguageModelProviderId, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
+    LanguageModelToolResultContent, LanguageModelToolSchemaFormat, LanguageModelToolUse,
+    LanguageModelToolUseId, Role, SelectedModel, StopReason, TokenUsage,
 };
 use project::{
     Project,
@@ -516,8 +521,8 @@ pub struct Thread {
     templates: Arc<Templates>,
     model: Option<Arc<dyn LanguageModel>>,
     summarization_model: Option<Arc<dyn LanguageModel>>,
-    project: Entity<Project>,
-    action_log: Entity<ActionLog>,
+    pub(crate) project: Entity<Project>,
+    pub(crate) action_log: Entity<ActionLog>,
 }
 
 impl Thread {
@@ -528,7 +533,6 @@ impl Thread {
         action_log: Entity<ActionLog>,
         templates: Arc<Templates>,
         model: Option<Arc<dyn LanguageModel>>,
-        summarization_model: Option<Arc<dyn LanguageModel>>,
         cx: &mut Context<Self>,
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
@@ -557,7 +561,7 @@ impl Thread {
             project_context,
             templates,
             model,
-            summarization_model,
+            summarization_model: None,
             project,
             action_log,
         }
@@ -652,6 +656,88 @@ impl Thread {
         );
     }
 
+    pub fn from_db(
+        id: acp::SessionId,
+        db_thread: DbThread,
+        project: Entity<Project>,
+        project_context: Entity<ProjectContext>,
+        context_server_registry: Entity<ContextServerRegistry>,
+        action_log: Entity<ActionLog>,
+        templates: Arc<Templates>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let profile_id = db_thread
+            .profile
+            .unwrap_or_else(|| AgentSettings::get_global(cx).default_profile.clone());
+        let model = LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+            db_thread
+                .model
+                .and_then(|model| {
+                    let model = SelectedModel {
+                        provider: model.provider.clone().into(),
+                        model: model.model.clone().into(),
+                    };
+                    registry.select_model(&model, cx)
+                })
+                .or_else(|| registry.default_model())
+                .map(|model| model.model)
+        });
+
+        Self {
+            id,
+            prompt_id: PromptId::new(),
+            title: if db_thread.title.is_empty() {
+                None
+            } else {
+                Some(db_thread.title.clone())
+            },
+            summary: db_thread.summary,
+            messages: db_thread.messages,
+            completion_mode: db_thread.completion_mode.unwrap_or_default(),
+            running_turn: None,
+            pending_message: None,
+            tools: BTreeMap::default(),
+            tool_use_limit_reached: false,
+            request_token_usage: db_thread.request_token_usage.clone(),
+            cumulative_token_usage: db_thread.cumulative_token_usage,
+            initial_project_snapshot: Task::ready(db_thread.initial_project_snapshot).shared(),
+            context_server_registry,
+            profile_id,
+            project_context,
+            templates,
+            model,
+            summarization_model: None,
+            project,
+            action_log,
+            updated_at: db_thread.updated_at,
+        }
+    }
+
+    pub fn to_db(&self, cx: &App) -> Task<DbThread> {
+        let initial_project_snapshot = self.initial_project_snapshot.clone();
+        let mut thread = DbThread {
+            title: self.title.clone().unwrap_or_default(),
+            messages: self.messages.clone(),
+            updated_at: self.updated_at,
+            summary: self.summary.clone(),
+            initial_project_snapshot: None,
+            cumulative_token_usage: self.cumulative_token_usage,
+            request_token_usage: self.request_token_usage.clone(),
+            model: self.model.as_ref().map(|model| DbLanguageModel {
+                provider: model.provider_id().to_string(),
+                model: model.name().0.to_string(),
+            }),
+            completion_mode: Some(self.completion_mode),
+            profile: Some(self.profile_id.clone()),
+        };
+
+        cx.background_spawn(async move {
+            let initial_project_snapshot = initial_project_snapshot.await;
+            thread.initial_project_snapshot = initial_project_snapshot;
+            thread
+        })
+    }
+
     /// Create a snapshot of the current project state including git information and unsaved buffers.
     fn project_snapshot(
         project: Entity<Project>,
@@ -816,6 +902,32 @@ impl Thread {
         }
     }
 
+    pub fn add_default_tools(&mut self, cx: &mut Context<Self>) {
+        let language_registry = self.project.read(cx).languages().clone();
+        self.add_tool(CopyPathTool::new(self.project.clone()));
+        self.add_tool(CreateDirectoryTool::new(self.project.clone()));
+        self.add_tool(DeletePathTool::new(
+            self.project.clone(),
+            self.action_log.clone(),
+        ));
+        self.add_tool(DiagnosticsTool::new(self.project.clone()));
+        self.add_tool(EditFileTool::new(cx.weak_entity(), language_registry));
+        self.add_tool(FetchTool::new(self.project.read(cx).client().http_client()));
+        self.add_tool(FindPathTool::new(self.project.clone()));
+        self.add_tool(GrepTool::new(self.project.clone()));
+        self.add_tool(ListDirectoryTool::new(self.project.clone()));
+        self.add_tool(MovePathTool::new(self.project.clone()));
+        self.add_tool(NowTool);
+        self.add_tool(OpenTool::new(self.project.clone()));
+        self.add_tool(ReadFileTool::new(
+            self.project.clone(),
+            self.action_log.clone(),
+        ));
+        self.add_tool(TerminalTool::new(self.project.clone(), cx));
+        self.add_tool(ThinkingTool);
+        self.add_tool(WebSearchTool); // TODO: Enable this only if it's a zed model.
+    }
+
     pub fn add_tool(&mut self, tool: impl AgentTool) {
         self.tools.insert(tool.name(), tool.erase());
     }
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index b3b1a428bf..21eb282110 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -554,7 +554,6 @@ mod tests {
                 action_log,
                 Templates::new(),
                 Some(model),
-                None,
                 cx,
             )
         });
@@ -756,7 +755,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -899,7 +897,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -1029,7 +1026,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -1168,7 +1164,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -1279,7 +1274,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -1362,7 +1356,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -1448,7 +1441,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
@@ -1531,7 +1523,6 @@ mod tests {
                 action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
-                None,
                 cx,
             )
         });
diff --git a/crates/agent_ui/src/acp.rs b/crates/agent_ui/src/acp.rs
index 831d296eeb..6f228b91d6 100644
--- a/crates/agent_ui/src/acp.rs
+++ b/crates/agent_ui/src/acp.rs
@@ -3,8 +3,10 @@ mod entry_view_state;
 mod message_editor;
 mod model_selector;
 mod model_selector_popover;
+mod thread_history;
 mod thread_view;
 
 pub use model_selector::AcpModelSelector;
 pub use model_selector_popover::AcpModelSelectorPopover;
+pub use thread_history::*;
 pub use thread_view::AcpThreadView;
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
new file mode 100644
index 0000000000..8a05801139
--- /dev/null
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -0,0 +1,766 @@
+use crate::RemoveSelectedThread;
+use agent2::{HistoryEntry, HistoryStore};
+use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
+use editor::{Editor, EditorEvent};
+use fuzzy::{StringMatch, StringMatchCandidate};
+use gpui::{
+    App, Empty, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
+    UniformListScrollHandle, Window, uniform_list,
+};
+use std::{fmt::Display, ops::Range, sync::Arc};
+use time::{OffsetDateTime, UtcOffset};
+use ui::{
+    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Scrollbar, ScrollbarState,
+    Tooltip, prelude::*,
+};
+use util::ResultExt;
+
+pub struct AcpThreadHistory {
+    pub(crate) history_store: Entity<HistoryStore>,
+    scroll_handle: UniformListScrollHandle,
+    selected_index: usize,
+    hovered_index: Option<usize>,
+    search_editor: Entity<Editor>,
+    all_entries: Arc<Vec<HistoryEntry>>,
+    // When the search is empty, we display date separators between history entries
+    // This vector contains an enum of either a separator or an actual entry
+    separated_items: Vec<ListItemType>,
+    // Maps entry indexes to list item indexes
+    separated_item_indexes: Vec<u32>,
+    _separated_items_task: Option<Task<()>>,
+    search_state: SearchState,
+    scrollbar_visibility: bool,
+    scrollbar_state: ScrollbarState,
+    local_timezone: UtcOffset,
+    _subscriptions: Vec<gpui::Subscription>,
+}
+
+enum SearchState {
+    Empty,
+    Searching {
+        query: SharedString,
+        _task: Task<()>,
+    },
+    Searched {
+        query: SharedString,
+        matches: Vec<StringMatch>,
+    },
+}
+
+enum ListItemType {
+    BucketSeparator(TimeBucket),
+    Entry {
+        index: usize,
+        format: EntryTimeFormat,
+    },
+}
+
+pub enum ThreadHistoryEvent {
+    Open(HistoryEntry),
+}
+
+impl EventEmitter<ThreadHistoryEvent> for AcpThreadHistory {}
+
+impl AcpThreadHistory {
+    pub(crate) fn new(
+        history_store: Entity<agent2::HistoryStore>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let search_editor = cx.new(|cx| {
+            let mut editor = Editor::single_line(window, cx);
+            editor.set_placeholder_text("Search threads...", cx);
+            editor
+        });
+
+        let search_editor_subscription =
+            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
+                if let EditorEvent::BufferEdited = event {
+                    let query = search_editor.read(cx).text(cx);
+                    this.search(query.into(), cx);
+                }
+            });
+
+        let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
+            this.update_all_entries(cx);
+        });
+
+        let scroll_handle = UniformListScrollHandle::default();
+        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
+
+        let mut this = Self {
+            history_store,
+            scroll_handle,
+            selected_index: 0,
+            hovered_index: None,
+            search_state: SearchState::Empty,
+            all_entries: Default::default(),
+            separated_items: Default::default(),
+            separated_item_indexes: Default::default(),
+            search_editor,
+            scrollbar_visibility: true,
+            scrollbar_state,
+            local_timezone: UtcOffset::from_whole_seconds(
+                chrono::Local::now().offset().local_minus_utc(),
+            )
+            .unwrap(),
+            _subscriptions: vec![search_editor_subscription, history_store_subscription],
+            _separated_items_task: None,
+        };
+        this.update_all_entries(cx);
+        this
+    }
+
+    fn update_all_entries(&mut self, cx: &mut Context<Self>) {
+        let new_entries: Arc<Vec<HistoryEntry>> = self
+            .history_store
+            .update(cx, |store, cx| store.entries(cx))
+            .into();
+
+        self._separated_items_task.take();
+
+        let mut items = Vec::with_capacity(new_entries.len() + 1);
+        let mut indexes = Vec::with_capacity(new_entries.len() + 1);
+
+        let bg_task = cx.background_spawn(async move {
+            let mut bucket = None;
+            let today = Local::now().naive_local().date();
+
+            for (index, entry) in new_entries.iter().enumerate() {
+                let entry_date = entry
+                    .updated_at()
+                    .with_timezone(&Local)
+                    .naive_local()
+                    .date();
+                let entry_bucket = TimeBucket::from_dates(today, entry_date);
+
+                if Some(entry_bucket) != bucket {
+                    bucket = Some(entry_bucket);
+                    items.push(ListItemType::BucketSeparator(entry_bucket));
+                }
+
+                indexes.push(items.len() as u32);
+                items.push(ListItemType::Entry {
+                    index,
+                    format: entry_bucket.into(),
+                });
+            }
+            (new_entries, items, indexes)
+        });
+
+        let task = cx.spawn(async move |this, cx| {
+            let (new_entries, items, indexes) = bg_task.await;
+            this.update(cx, |this, cx| {
+                let previously_selected_entry =
+                    this.all_entries.get(this.selected_index).map(|e| e.id());
+
+                this.all_entries = new_entries;
+                this.separated_items = items;
+                this.separated_item_indexes = indexes;
+
+                match &this.search_state {
+                    SearchState::Empty => {
+                        if this.selected_index >= this.all_entries.len() {
+                            this.set_selected_entry_index(
+                                this.all_entries.len().saturating_sub(1),
+                                cx,
+                            );
+                        } else if let Some(prev_id) = previously_selected_entry
+                            && let Some(new_ix) = this
+                                .all_entries
+                                .iter()
+                                .position(|probe| probe.id() == prev_id)
+                        {
+                            this.set_selected_entry_index(new_ix, cx);
+                        }
+                    }
+                    SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
+                        this.search(query.clone(), cx);
+                    }
+                }
+
+                cx.notify();
+            })
+            .log_err();
+        });
+        self._separated_items_task = Some(task);
+    }
+
+    fn search(&mut self, query: SharedString, cx: &mut Context<Self>) {
+        if query.is_empty() {
+            self.search_state = SearchState::Empty;
+            cx.notify();
+            return;
+        }
+
+        let all_entries = self.all_entries.clone();
+
+        let fuzzy_search_task = cx.background_spawn({
+            let query = query.clone();
+            let executor = cx.background_executor().clone();
+            async move {
+                let mut candidates = Vec::with_capacity(all_entries.len());
+
+                for (idx, entry) in all_entries.iter().enumerate() {
+                    candidates.push(StringMatchCandidate::new(idx, entry.title()));
+                }
+
+                const MAX_MATCHES: usize = 100;
+
+                fuzzy::match_strings(
+                    &candidates,
+                    &query,
+                    false,
+                    true,
+                    MAX_MATCHES,
+                    &Default::default(),
+                    executor,
+                )
+                .await
+            }
+        });
+
+        let task = cx.spawn({
+            let query = query.clone();
+            async move |this, cx| {
+                let matches = fuzzy_search_task.await;
+
+                this.update(cx, |this, cx| {
+                    let SearchState::Searching {
+                        query: current_query,
+                        _task,
+                    } = &this.search_state
+                    else {
+                        return;
+                    };
+
+                    if &query == current_query {
+                        this.search_state = SearchState::Searched {
+                            query: query.clone(),
+                            matches,
+                        };
+
+                        this.set_selected_entry_index(0, cx);
+                        cx.notify();
+                    };
+                })
+                .log_err();
+            }
+        });
+
+        self.search_state = SearchState::Searching { query, _task: task };
+        cx.notify();
+    }
+
+    fn matched_count(&self) -> usize {
+        match &self.search_state {
+            SearchState::Empty => self.all_entries.len(),
+            SearchState::Searching { .. } => 0,
+            SearchState::Searched { matches, .. } => matches.len(),
+        }
+    }
+
+    fn list_item_count(&self) -> usize {
+        match &self.search_state {
+            SearchState::Empty => self.separated_items.len(),
+            SearchState::Searching { .. } => 0,
+            SearchState::Searched { matches, .. } => matches.len(),
+        }
+    }
+
+    fn search_produced_no_matches(&self) -> bool {
+        match &self.search_state {
+            SearchState::Empty => false,
+            SearchState::Searching { .. } => false,
+            SearchState::Searched { matches, .. } => matches.is_empty(),
+        }
+    }
+
+    fn get_match(&self, ix: usize) -> Option<&HistoryEntry> {
+        match &self.search_state {
+            SearchState::Empty => self.all_entries.get(ix),
+            SearchState::Searching { .. } => None,
+            SearchState::Searched { matches, .. } => matches
+                .get(ix)
+                .and_then(|m| self.all_entries.get(m.candidate_id)),
+        }
+    }
+
+    pub fn select_previous(
+        &mut self,
+        _: &menu::SelectPrevious,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let count = self.matched_count();
+        if count > 0 {
+            if self.selected_index == 0 {
+                self.set_selected_entry_index(count - 1, cx);
+            } else {
+                self.set_selected_entry_index(self.selected_index - 1, cx);
+            }
+        }
+    }
+
+    pub fn select_next(
+        &mut self,
+        _: &menu::SelectNext,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let count = self.matched_count();
+        if count > 0 {
+            if self.selected_index == count - 1 {
+                self.set_selected_entry_index(0, cx);
+            } else {
+                self.set_selected_entry_index(self.selected_index + 1, cx);
+            }
+        }
+    }
+
+    fn select_first(
+        &mut self,
+        _: &menu::SelectFirst,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let count = self.matched_count();
+        if count > 0 {
+            self.set_selected_entry_index(0, cx);
+        }
+    }
+
+    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
+        let count = self.matched_count();
+        if count > 0 {
+            self.set_selected_entry_index(count - 1, cx);
+        }
+    }
+
+    fn set_selected_entry_index(&mut self, entry_index: usize, cx: &mut Context<Self>) {
+        self.selected_index = entry_index;
+
+        let scroll_ix = match self.search_state {
+            SearchState::Empty | SearchState::Searching { .. } => self
+                .separated_item_indexes
+                .get(entry_index)
+                .map(|ix| *ix as usize)
+                .unwrap_or(entry_index + 1),
+            SearchState::Searched { .. } => entry_index,
+        };
+
+        self.scroll_handle
+            .scroll_to_item(scroll_ix, ScrollStrategy::Top);
+
+        cx.notify();
+    }
+
+    fn render_scrollbar(&self, cx: &mut Context<Self>) -> Option<Stateful<Div>> {
+        if !(self.scrollbar_visibility || self.scrollbar_state.is_dragging()) {
+            return None;
+        }
+
+        Some(
+            div()
+                .occlude()
+                .id("thread-history-scroll")
+                .h_full()
+                .bg(cx.theme().colors().panel_background.opacity(0.8))
+                .border_l_1()
+                .border_color(cx.theme().colors().border_variant)
+                .absolute()
+                .right_1()
+                .top_0()
+                .bottom_0()
+                .w_4()
+                .pl_1()
+                .cursor_default()
+                .on_mouse_move(cx.listener(|_, _, _window, cx| {
+                    cx.notify();
+                    cx.stop_propagation()
+                }))
+                .on_hover(|_, _window, cx| {
+                    cx.stop_propagation();
+                })
+                .on_any_mouse_down(|_, _window, cx| {
+                    cx.stop_propagation();
+                })
+                .on_scroll_wheel(cx.listener(|_, _, _window, cx| {
+                    cx.notify();
+                }))
+                .children(Scrollbar::vertical(self.scrollbar_state.clone())),
+        )
+    }
+
+    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
+        self.confirm_entry(self.selected_index, cx);
+    }
+
+    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
+        let Some(entry) = self.get_match(ix) else {
+            return;
+        };
+        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
+    }
+
+    fn remove_selected_thread(
+        &mut self,
+        _: &RemoveSelectedThread,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.remove_thread(self.selected_index, cx)
+    }
+
+    fn remove_thread(&mut self, ix: usize, cx: &mut Context<Self>) {
+        let Some(entry) = self.get_match(ix) else {
+            return;
+        };
+
+        let task = match entry {
+            HistoryEntry::AcpThread(thread) => self
+                .history_store
+                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
+            HistoryEntry::TextThread(context) => self.history_store.update(cx, |this, cx| {
+                this.delete_text_thread(context.path.clone(), cx)
+            }),
+        };
+        task.detach_and_log_err(cx);
+    }
+
+    fn list_items(
+        &mut self,
+        range: Range<usize>,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Vec<AnyElement> {
+        match &self.search_state {
+            SearchState::Empty => self
+                .separated_items
+                .get(range)
+                .iter()
+                .flat_map(|items| {
+                    items
+                        .iter()
+                        .map(|item| self.render_list_item(item, vec![], cx))
+                })
+                .collect(),
+            SearchState::Searched { matches, .. } => matches[range]
+                .iter()
+                .filter_map(|m| {
+                    let entry = self.all_entries.get(m.candidate_id)?;
+                    Some(self.render_history_entry(
+                        entry,
+                        EntryTimeFormat::DateAndTime,
+                        m.candidate_id,
+                        m.positions.clone(),
+                        cx,
+                    ))
+                })
+                .collect(),
+            SearchState::Searching { .. } => {
+                vec![]
+            }
+        }
+    }
+
+    fn render_list_item(
+        &self,
+        item: &ListItemType,
+        highlight_positions: Vec<usize>,
+        cx: &Context<Self>,
+    ) -> AnyElement {
+        match item {
+            ListItemType::Entry { index, format } => match self.all_entries.get(*index) {
+                Some(entry) => self
+                    .render_history_entry(entry, *format, *index, highlight_positions, cx)
+                    .into_any(),
+                None => Empty.into_any_element(),
+            },
+            ListItemType::BucketSeparator(bucket) => div()
+                .px(DynamicSpacing::Base06.rems(cx))
+                .pt_2()
+                .pb_1()
+                .child(
+                    Label::new(bucket.to_string())
+                        .size(LabelSize::XSmall)
+                        .color(Color::Muted),
+                )
+                .into_any_element(),
+        }
+    }
+
+    fn render_history_entry(
+        &self,
+        entry: &HistoryEntry,
+        format: EntryTimeFormat,
+        list_entry_ix: usize,
+        highlight_positions: Vec<usize>,
+        cx: &Context<Self>,
+    ) -> AnyElement {
+        let selected = list_entry_ix == self.selected_index;
+        let hovered = Some(list_entry_ix) == self.hovered_index;
+        let timestamp = entry.updated_at().timestamp();
+        let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);
+
+        h_flex()
+            .w_full()
+            .pb_1()
+            .child(
+                ListItem::new(list_entry_ix)
+                    .rounded()
+                    .toggle_state(selected)
+                    .spacing(ListItemSpacing::Sparse)
+                    .start_slot(
+                        h_flex()
+                            .w_full()
+                            .gap_2()
+                            .justify_between()
+                            .child(
+                                HighlightedLabel::new(entry.title(), highlight_positions)
+                                    .size(LabelSize::Small)
+                                    .truncate(),
+                            )
+                            .child(
+                                Label::new(thread_timestamp)
+                                    .color(Color::Muted)
+                                    .size(LabelSize::XSmall),
+                            ),
+                    )
+                    .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
+                        if *is_hovered {
+                            this.hovered_index = Some(list_entry_ix);
+                        } else if this.hovered_index == Some(list_entry_ix) {
+                            this.hovered_index = None;
+                        }
+
+                        cx.notify();
+                    }))
+                    .end_slot::<IconButton>(if hovered || selected {
+                        Some(
+                            IconButton::new("delete", IconName::Trash)
+                                .shape(IconButtonShape::Square)
+                                .icon_size(IconSize::XSmall)
+                                .icon_color(Color::Muted)
+                                .tooltip(move |window, cx| {
+                                    Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
+                                })
+                                .on_click(cx.listener(move |this, _, _, cx| {
+                                    this.remove_thread(list_entry_ix, cx)
+                                })),
+                        )
+                    } else {
+                        None
+                    })
+                    .on_click(
+                        cx.listener(move |this, _, _, cx| this.confirm_entry(list_entry_ix, cx)),
+                    ),
+            )
+            .into_any_element()
+    }
+}
+
+impl Focusable for AcpThreadHistory {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.search_editor.focus_handle(cx)
+    }
+}
+
+impl Render for AcpThreadHistory {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .key_context("ThreadHistory")
+            .size_full()
+            .on_action(cx.listener(Self::select_previous))
+            .on_action(cx.listener(Self::select_next))
+            .on_action(cx.listener(Self::select_first))
+            .on_action(cx.listener(Self::select_last))
+            .on_action(cx.listener(Self::confirm))
+            .on_action(cx.listener(Self::remove_selected_thread))
+            .when(!self.all_entries.is_empty(), |parent| {
+                parent.child(
+                    h_flex()
+                        .h(px(41.)) // Match the toolbar perfectly
+                        .w_full()
+                        .py_1()
+                        .px_2()
+                        .gap_2()
+                        .justify_between()
+                        .border_b_1()
+                        .border_color(cx.theme().colors().border)
+                        .child(
+                            Icon::new(IconName::MagnifyingGlass)
+                                .color(Color::Muted)
+                                .size(IconSize::Small),
+                        )
+                        .child(self.search_editor.clone()),
+                )
+            })
+            .child({
+                let view = v_flex()
+                    .id("list-container")
+                    .relative()
+                    .overflow_hidden()
+                    .flex_grow();
+
+                if self.all_entries.is_empty() {
+                    view.justify_center()
+                        .child(
+                            h_flex().w_full().justify_center().child(
+                                Label::new("You don't have any past threads yet.")
+                                    .size(LabelSize::Small),
+                            ),
+                        )
+                } else if self.search_produced_no_matches() {
+                    view.justify_center().child(
+                        h_flex().w_full().justify_center().child(
+                            Label::new("No threads match your search.").size(LabelSize::Small),
+                        ),
+                    )
+                } else {
+                    view.pr_5()
+                        .child(
+                            uniform_list(
+                                "thread-history",
+                                self.list_item_count(),
+                                cx.processor(|this, range: Range<usize>, window, cx| {
+                                    this.list_items(range, window, cx)
+                                }),
+                            )
+                            .p_1()
+                            .track_scroll(self.scroll_handle.clone())
+                            .flex_grow(),
+                        )
+                        .when_some(self.render_scrollbar(cx), |div, scrollbar| {
+                            div.child(scrollbar)
+                        })
+                }
+            })
+    }
+}
+
+#[derive(Clone, Copy)]
+pub enum EntryTimeFormat {
+    DateAndTime,
+    TimeOnly,
+}
+
+impl EntryTimeFormat {
+    fn format_timestamp(&self, timestamp: i64, timezone: UtcOffset) -> String {
+        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
+
+        match self {
+            EntryTimeFormat::DateAndTime => time_format::format_localized_timestamp(
+                timestamp,
+                OffsetDateTime::now_utc(),
+                timezone,
+                time_format::TimestampFormat::EnhancedAbsolute,
+            ),
+            EntryTimeFormat::TimeOnly => time_format::format_time(timestamp),
+        }
+    }
+}
+
+impl From<TimeBucket> for EntryTimeFormat {
+    fn from(bucket: TimeBucket) -> Self {
+        match bucket {
+            TimeBucket::Today => EntryTimeFormat::TimeOnly,
+            TimeBucket::Yesterday => EntryTimeFormat::TimeOnly,
+            TimeBucket::ThisWeek => EntryTimeFormat::DateAndTime,
+            TimeBucket::PastWeek => EntryTimeFormat::DateAndTime,
+            TimeBucket::All => EntryTimeFormat::DateAndTime,
+        }
+    }
+}
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+enum TimeBucket {
+    Today,
+    Yesterday,
+    ThisWeek,
+    PastWeek,
+    All,
+}
+
+impl TimeBucket {
+    fn from_dates(reference: NaiveDate, date: NaiveDate) -> Self {
+        if date == reference {
+            return TimeBucket::Today;
+        }
+
+        if date == reference - TimeDelta::days(1) {
+            return TimeBucket::Yesterday;
+        }
+
+        let week = date.iso_week();
+
+        if reference.iso_week() == week {
+            return TimeBucket::ThisWeek;
+        }
+
+        let last_week = (reference - TimeDelta::days(7)).iso_week();
+
+        if week == last_week {
+            return TimeBucket::PastWeek;
+        }
+
+        TimeBucket::All
+    }
+}
+
+impl Display for TimeBucket {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TimeBucket::Today => write!(f, "Today"),
+            TimeBucket::Yesterday => write!(f, "Yesterday"),
+            TimeBucket::ThisWeek => write!(f, "This Week"),
+            TimeBucket::PastWeek => write!(f, "Past Week"),
+            TimeBucket::All => write!(f, "All"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use chrono::NaiveDate;
+
+    #[test]
+    fn test_time_bucket_from_dates() {
+        let today = NaiveDate::from_ymd_opt(2023, 1, 15).unwrap();
+
+        let date = today;
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Today);
+
+        let date = NaiveDate::from_ymd_opt(2023, 1, 14).unwrap();
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Yesterday);
+
+        let date = NaiveDate::from_ymd_opt(2023, 1, 13).unwrap();
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
+
+        let date = NaiveDate::from_ymd_opt(2023, 1, 11).unwrap();
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
+
+        let date = NaiveDate::from_ymd_opt(2023, 1, 8).unwrap();
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
+
+        let date = NaiveDate::from_ymd_opt(2023, 1, 5).unwrap();
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
+
+        // All: not in this week or last week
+        let date = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
+        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::All);
+
+        // Test year boundary cases
+        let new_year = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
+
+        let date = NaiveDate::from_ymd_opt(2022, 12, 31).unwrap();
+        assert_eq!(
+            TimeBucket::from_dates(new_year, date),
+            TimeBucket::Yesterday
+        );
+
+        let date = NaiveDate::from_ymd_opt(2022, 12, 28).unwrap();
+        assert_eq!(TimeBucket::from_dates(new_year, date), TimeBucket::ThisWeek);
+    }
+}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 150f1ea73b..bf5b8efbc8 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -9,6 +9,7 @@ use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol::{self as acp};
 use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
+use agent2::DbThreadMetadata;
 use anyhow::bail;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -155,6 +156,7 @@ enum ThreadState {
 impl AcpThreadView {
     pub fn new(
         agent: Rc<dyn AgentServer>,
+        resume_thread: Option<DbThreadMetadata>,
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
         thread_store: Entity<ThreadStore>,
@@ -203,7 +205,7 @@ impl AcpThreadView {
             workspace: workspace.clone(),
             project: project.clone(),
             entry_view_state,
-            thread_state: Self::initial_state(agent, workspace, project, window, cx),
+            thread_state: Self::initial_state(agent, resume_thread, workspace, project, window, cx),
             message_editor,
             model_selector: None,
             profile_selector: None,
@@ -228,6 +230,7 @@ impl AcpThreadView {
 
     fn initial_state(
         agent: Rc<dyn AgentServer>,
+        resume_thread: Option<DbThreadMetadata>,
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
         window: &mut Window,
@@ -254,28 +257,27 @@ impl AcpThreadView {
                 }
             };
 
-            // this.update_in(cx, |_this, _window, cx| {
-            //     let status = connection.exit_status(cx);
-            //     cx.spawn(async move |this, cx| {
-            //         let status = status.await.ok();
-            //         this.update(cx, |this, cx| {
-            //             this.thread_state = ThreadState::ServerExited { status };
-            //             cx.notify();
-            //         })
-            //         .ok();
-            //     })
-            //     .detach();
-            // })
-            // .ok();
-
-            let Some(result) = cx
-                .update(|_, cx| {
+            let result = if let Some(native_agent) = connection
+                .clone()
+                .downcast::<agent2::NativeAgentConnection>()
+                && let Some(resume) = resume_thread
+            {
+                cx.update(|_, cx| {
+                    native_agent
+                        .0
+                        .update(cx, |agent, cx| agent.open_thread(resume.id, cx))
+                })
+                .log_err()
+            } else {
+                cx.update(|_, cx| {
                     connection
                         .clone()
                         .new_thread(project.clone(), &root_dir, cx)
                 })
                 .log_err()
-            else {
+            };
+
+            let Some(result) = result else {
                 return;
             };
 
@@ -382,6 +384,7 @@ impl AcpThreadView {
                         this.update(cx, |this, cx| {
                             this.thread_state = Self::initial_state(
                                 agent.clone(),
+                                None,
                                 this.workspace.clone(),
                                 this.project.clone(),
                                 window,
@@ -842,6 +845,7 @@ impl AcpThreadView {
                     } else {
                         this.thread_state = Self::initial_state(
                             agent,
+                            None,
                             this.workspace.clone(),
                             project.clone(),
                             window,
@@ -4044,6 +4048,7 @@ pub(crate) mod tests {
             cx.new(|cx| {
                 AcpThreadView::new(
                     Rc::new(agent),
+                    None,
                     workspace.downgrade(),
                     project,
                     thread_store.clone(),
@@ -4248,6 +4253,7 @@ pub(crate) mod tests {
             cx.new(|cx| {
                 AcpThreadView::new(
                     Rc::new(StubAgentServer::new(connection.as_ref().clone())),
+                    None,
                     workspace.downgrade(),
                     project.clone(),
                     thread_store.clone(),
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 995bf771e2..f9aea84376 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -4,10 +4,11 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::time::Duration;
 
+use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
 
-use crate::NewExternalAgentThread;
+use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
 use crate::agent_diff::AgentDiffThread;
 use crate::{
     AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
@@ -28,6 +29,7 @@ use crate::{
     thread_history::{HistoryEntryElement, ThreadHistory},
     ui::{AgentOnboardingModal, EndTrialUpsell},
 };
+use crate::{ExternalAgent, NewExternalAgentThread};
 use agent::{
     Thread, ThreadError, ThreadEvent, ThreadId, ThreadSummary, TokenUsageRatio,
     context_store::ContextStore,
@@ -117,7 +119,7 @@ pub fn init(cx: &mut App) {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
                         panel.update(cx, |panel, cx| {
-                            panel.new_external_thread(action.agent, window, cx)
+                            panel.external_thread(action.agent, None, window, cx)
                         });
                     }
                 })
@@ -360,6 +362,7 @@ impl ActiveView {
     pub fn prompt_editor(
         context_editor: Entity<TextThreadEditor>,
         history_store: Entity<HistoryStore>,
+        acp_history_store: Entity<agent2::HistoryStore>,
         language_registry: Arc<LanguageRegistry>,
         window: &mut Window,
         cx: &mut App,
@@ -437,6 +440,18 @@ impl ActiveView {
                                 );
                             }
                         });
+
+                        acp_history_store.update(cx, |history_store, cx| {
+                            if let Some(old_path) = old_path {
+                                history_store
+                                    .replace_recently_opened_text_thread(old_path, new_path, cx);
+                            } else {
+                                history_store.push_recently_opened_entry(
+                                    agent2::HistoryEntryId::TextThread(new_path.clone()),
+                                    cx,
+                                );
+                            }
+                        });
                     }
                     _ => {}
                 }
@@ -465,6 +480,8 @@ pub struct AgentPanel {
     fs: Arc<dyn Fs>,
     language_registry: Arc<LanguageRegistry>,
     thread_store: Entity<ThreadStore>,
+    acp_history: Entity<AcpThreadHistory>,
+    acp_history_store: Entity<agent2::HistoryStore>,
     _default_model_subscription: Subscription,
     context_store: Entity<TextThreadStore>,
     prompt_store: Option<Entity<PromptStore>>,
@@ -631,6 +648,29 @@ impl AgentPanel {
             )
         });
 
+        let acp_history_store =
+            cx.new(|cx| agent2::HistoryStore::new(context_store.clone(), [], cx));
+        let acp_history = cx.new(|cx| AcpThreadHistory::new(acp_history_store.clone(), window, cx));
+        cx.subscribe_in(
+            &acp_history,
+            window,
+            |this, _, event, window, cx| match event {
+                ThreadHistoryEvent::Open(HistoryEntry::AcpThread(thread)) => {
+                    this.external_thread(
+                        Some(crate::ExternalAgent::NativeAgent),
+                        Some(thread.clone()),
+                        window,
+                        cx,
+                    );
+                }
+                ThreadHistoryEvent::Open(HistoryEntry::TextThread(thread)) => {
+                    this.open_saved_prompt_editor(thread.path.clone(), window, cx)
+                        .detach_and_log_err(cx);
+                }
+            },
+        )
+        .detach();
+
         cx.observe(&history_store, |_, _, cx| cx.notify()).detach();
 
         let active_thread = cx.new(|cx| {
@@ -669,6 +709,7 @@ impl AgentPanel {
                 ActiveView::prompt_editor(
                     context_editor,
                     history_store.clone(),
+                    acp_history_store.clone(),
                     language_registry.clone(),
                     window,
                     cx,
@@ -685,7 +726,11 @@ impl AgentPanel {
             let assistant_navigation_menu =
                 ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| {
                     if let Some(panel) = panel.upgrade() {
-                        menu = Self::populate_recently_opened_menu_section(menu, panel, cx);
+                        if cx.has_flag::<AcpFeatureFlag>() {
+                            menu = Self::populate_recently_opened_menu_section_new(menu, panel, cx);
+                        } else {
+                            menu = Self::populate_recently_opened_menu_section_old(menu, panel, cx);
+                        }
                     }
                     menu.action("View All", Box::new(OpenHistory))
                         .end_slot_action(DeleteRecentlyOpenThread.boxed_clone())
@@ -773,6 +818,8 @@ impl AgentPanel {
             zoomed: false,
             pending_serialization: None,
             onboarding,
+            acp_history,
+            acp_history_store,
             selected_agent: AgentType::default(),
         }
     }
@@ -939,6 +986,7 @@ impl AgentPanel {
             ActiveView::prompt_editor(
                 context_editor.clone(),
                 self.history_store.clone(),
+                self.acp_history_store.clone(),
                 self.language_registry.clone(),
                 window,
                 cx,
@@ -949,9 +997,10 @@ impl AgentPanel {
         context_editor.focus_handle(cx).focus(window);
     }
 
-    fn new_external_thread(
+    fn external_thread(
         &mut self,
         agent_choice: Option<crate::ExternalAgent>,
+        resume_thread: Option<DbThreadMetadata>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -968,6 +1017,7 @@ impl AgentPanel {
 
         let thread_store = self.thread_store.clone();
         let text_thread_store = self.context_store.clone();
+        let history = self.acp_history_store.clone();
 
         cx.spawn_in(window, async move |this, cx| {
             let ext_agent = match agent_choice {
@@ -1001,7 +1051,7 @@ impl AgentPanel {
                 }
             };
 
-            let server = ext_agent.server(fs);
+            let server = ext_agent.server(fs, history);
 
             this.update_in(cx, |this, window, cx| {
                 match ext_agent {
@@ -1020,6 +1070,7 @@ impl AgentPanel {
                 let thread_view = cx.new(|cx| {
                     crate::acp::AcpThreadView::new(
                         server,
+                        resume_thread,
                         workspace.clone(),
                         project,
                         thread_store.clone(),
@@ -1114,6 +1165,7 @@ impl AgentPanel {
             ActiveView::prompt_editor(
                 editor.clone(),
                 self.history_store.clone(),
+                self.acp_history_store.clone(),
                 self.language_registry.clone(),
                 window,
                 cx,
@@ -1580,7 +1632,7 @@ impl AgentPanel {
         self.focus_handle(cx).focus(window);
     }
 
-    fn populate_recently_opened_menu_section(
+    fn populate_recently_opened_menu_section_old(
         mut menu: ContextMenu,
         panel: Entity<Self>,
         cx: &mut Context<ContextMenu>,
@@ -1644,6 +1696,72 @@ impl AgentPanel {
         menu
     }
 
+    fn populate_recently_opened_menu_section_new(
+        mut menu: ContextMenu,
+        panel: Entity<Self>,
+        cx: &mut Context<ContextMenu>,
+    ) -> ContextMenu {
+        let entries = panel
+            .read(cx)
+            .acp_history_store
+            .read(cx)
+            .recently_opened_entries(cx);
+
+        if entries.is_empty() {
+            return menu;
+        }
+
+        menu = menu.header("Recently Opened");
+
+        for entry in entries {
+            let title = entry.title().clone();
+
+            menu = menu.entry_with_end_slot_on_hover(
+                title,
+                None,
+                {
+                    let panel = panel.downgrade();
+                    let entry = entry.clone();
+                    move |window, cx| {
+                        let entry = entry.clone();
+                        panel
+                            .update(cx, move |this, cx| match &entry {
+                                agent2::HistoryEntry::AcpThread(entry) => this.external_thread(
+                                    Some(ExternalAgent::NativeAgent),
+                                    Some(entry.clone()),
+                                    window,
+                                    cx,
+                                ),
+                                agent2::HistoryEntry::TextThread(entry) => this
+                                    .open_saved_prompt_editor(entry.path.clone(), window, cx)
+                                    .detach_and_log_err(cx),
+                            })
+                            .ok();
+                    }
+                },
+                IconName::Close,
+                "Close Entry".into(),
+                {
+                    let panel = panel.downgrade();
+                    let id = entry.id();
+                    move |_window, cx| {
+                        panel
+                            .update(cx, |this, cx| {
+                                this.acp_history_store.update(cx, |history_store, cx| {
+                                    history_store.remove_recently_opened_entry(&id, cx);
+                                });
+                            })
+                            .ok();
+                    }
+                },
+            );
+        }
+
+        menu = menu.separator();
+
+        menu
+    }
+
     pub fn set_selected_agent(
         &mut self,
         agent: AgentType,
@@ -1653,8 +1771,8 @@ impl AgentPanel {
         if self.selected_agent != agent {
             self.selected_agent = agent;
             self.serialize(cx);
-            self.new_agent_thread(agent, window, cx);
         }
+        self.new_agent_thread(agent, window, cx);
     }
 
     pub fn selected_agent(&self) -> AgentType {
@@ -1681,13 +1799,13 @@ impl AgentPanel {
                 window.dispatch_action(NewTextThread.boxed_clone(), cx);
             }
             AgentType::NativeAgent => {
-                self.new_external_thread(Some(crate::ExternalAgent::NativeAgent), window, cx)
+                self.external_thread(Some(crate::ExternalAgent::NativeAgent), None, window, cx)
             }
             AgentType::Gemini => {
-                self.new_external_thread(Some(crate::ExternalAgent::Gemini), window, cx)
+                self.external_thread(Some(crate::ExternalAgent::Gemini), None, window, cx)
             }
             AgentType::ClaudeCode => {
-                self.new_external_thread(Some(crate::ExternalAgent::ClaudeCode), window, cx)
+                self.external_thread(Some(crate::ExternalAgent::ClaudeCode), None, window, cx)
             }
         }
     }
@@ -1698,7 +1816,13 @@ impl Focusable for AgentPanel {
         match &self.active_view {
             ActiveView::Thread { message_editor, .. } => message_editor.focus_handle(cx),
             ActiveView::ExternalAgentThread { thread_view, .. } => thread_view.focus_handle(cx),
-            ActiveView::History => self.history.focus_handle(cx),
+            ActiveView::History => {
+                if cx.has_flag::<feature_flags::AcpFeatureFlag>() {
+                    self.acp_history.focus_handle(cx)
+                } else {
+                    self.history.focus_handle(cx)
+                }
+            }
             ActiveView::TextThread { context_editor, .. } => context_editor.focus_handle(cx),
             ActiveView::Configuration => {
                 if let Some(configuration) = self.configuration.as_ref() {
@@ -3534,7 +3658,13 @@ impl Render for AgentPanel {
                 ActiveView::ExternalAgentThread { thread_view, .. } => parent
                     .child(thread_view.clone())
                     .child(self.render_drag_target(cx)),
-                ActiveView::History => parent.child(self.history.clone()),
+                ActiveView::History => {
+                    if cx.has_flag::<feature_flags::AcpFeatureFlag>() {
+                        parent.child(self.acp_history.clone())
+                    } else {
+                        parent.child(self.history.clone())
+                    }
+                }
                 ActiveView::TextThread {
                     context_editor,
                     buffer_search_bar,
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 8525d7f9e5..a1dbc77084 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -156,11 +156,15 @@ enum ExternalAgent {
 }
 
 impl ExternalAgent {
-    pub fn server(&self, fs: Arc<dyn fs::Fs>) -> Rc<dyn agent_servers::AgentServer> {
+    pub fn server(
+        &self,
+        fs: Arc<dyn fs::Fs>,
+        history: Entity<agent2::HistoryStore>,
+    ) -> Rc<dyn agent_servers::AgentServer> {
         match self {
             ExternalAgent::Gemini => Rc::new(agent_servers::Gemini),
             ExternalAgent::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            ExternalAgent::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs)),
+            ExternalAgent::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
         }
     }
 }

From a91acb5f4126fe650efc758a4159d0758e34b02e Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 20 Aug 2025 00:13:54 +0530
Subject: [PATCH 173/823] onboarding: Fix theme selection in system mode
 (#36484)

Previously, selecting the "System" theme during onboarding would
hardcode the theme based on the device's current mode (e.g., Light or
Dark). This change ensures the "System" setting is saved correctly,
allowing the app to dynamically follow the OS theme by inserting the
correct theme in the config for both light and dark mode.

Release Notes:

- N/A

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 crates/onboarding/src/basics_page.rs | 32 +++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 86ddc22a86..8d89c6662e 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -16,6 +16,23 @@ use vim_mode_setting::VimModeSetting;
 
 use crate::theme_preview::{ThemePreviewStyle, ThemePreviewTile};
 
+const LIGHT_THEMES: [&'static str; 3] = ["One Light", "Ayu Light", "Gruvbox Light"];
+const DARK_THEMES: [&'static str; 3] = ["One Dark", "Ayu Dark", "Gruvbox Dark"];
+const FAMILY_NAMES: [SharedString; 3] = [
+    SharedString::new_static("One"),
+    SharedString::new_static("Ayu"),
+    SharedString::new_static("Gruvbox"),
+];
+
+fn get_theme_family_themes(theme_name: &str) -> Option<(&'static str, &'static str)> {
+    for i in 0..LIGHT_THEMES.len() {
+        if LIGHT_THEMES[i] == theme_name || DARK_THEMES[i] == theme_name {
+            return Some((LIGHT_THEMES[i], DARK_THEMES[i]));
+        }
+    }
+    None
+}
+
 fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement {
     let theme_selection = ThemeSettings::get_global(cx).theme_selection.clone();
     let system_appearance = theme::SystemAppearance::global(cx);
@@ -90,14 +107,6 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
         };
         let current_theme_name = theme_selection.theme(appearance);
 
-        const LIGHT_THEMES: [&'static str; 3] = ["One Light", "Ayu Light", "Gruvbox Light"];
-        const DARK_THEMES: [&'static str; 3] = ["One Dark", "Ayu Dark", "Gruvbox Dark"];
-        const FAMILY_NAMES: [SharedString; 3] = [
-            SharedString::new_static("One"),
-            SharedString::new_static("Ayu"),
-            SharedString::new_static("Gruvbox"),
-        ];
-
         let theme_names = match appearance {
             Appearance::Light => LIGHT_THEMES,
             Appearance::Dark => DARK_THEMES,
@@ -184,10 +193,13 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
         let theme = theme.into();
         update_settings_file::<ThemeSettings>(fs, cx, move |settings, cx| {
             if theme_mode == ThemeMode::System {
+                let (light_theme, dark_theme) =
+                    get_theme_family_themes(&theme).unwrap_or((theme.as_ref(), theme.as_ref()));
+
                 settings.theme = Some(ThemeSelection::Dynamic {
                     mode: ThemeMode::System,
-                    light: ThemeName(theme.clone()),
-                    dark: ThemeName(theme.clone()),
+                    light: ThemeName(light_theme.into()),
+                    dark: ThemeName(dark_theme.into()),
                 });
             } else {
                 let appearance = *SystemAppearance::global(cx);

From df9c2aefb1e4f589753980dbdf6622a1f2dcf52a Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 19 Aug 2025 15:14:43 -0400
Subject: [PATCH 174/823] thread_view: Fix issues with images (#36509)

- Clean up failed load tasks for mentions that require async processing
- When dragging and dropping files, hold onto added worktrees until any
async processing has completed; this fixes a bug when dragging items
from outside the project

Release Notes:

- N/A
---
 .../agent_ui/src/acp/completion_provider.rs   |  18 +--
 crates/agent_ui/src/acp/message_editor.rs     | 125 +++++++++++-------
 crates/agent_ui/src/acp/thread_view.rs        |   3 +-
 3 files changed, 85 insertions(+), 61 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index d2af2a880d..a8a690190a 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -763,14 +763,16 @@ fn confirm_completion_callback(
             message_editor
                 .clone()
                 .update(cx, |message_editor, cx| {
-                    message_editor.confirm_completion(
-                        crease_text,
-                        start,
-                        content_len,
-                        mention_uri,
-                        window,
-                        cx,
-                    )
+                    message_editor
+                        .confirm_completion(
+                            crease_text,
+                            start,
+                            content_len,
+                            mention_uri,
+                            window,
+                            cx,
+                        )
+                        .detach();
                 })
                 .ok();
         });
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index afb1512e5d..3ed202f66a 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -26,7 +26,7 @@ use gpui::{
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
-use project::{CompletionIntent, Project, ProjectPath, Worktree};
+use project::{Project, ProjectPath, Worktree};
 use rope::Point;
 use settings::Settings;
 use std::{
@@ -202,18 +202,18 @@ impl MessageEditor {
         mention_uri: MentionUri,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Task<()> {
         let snapshot = self
             .editor
             .update(cx, |editor, cx| editor.snapshot(window, cx));
         let Some((excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
-            return;
+            return Task::ready(());
         };
         let Some(anchor) = snapshot
             .buffer_snapshot
             .anchor_in_excerpt(*excerpt_id, start)
         else {
-            return;
+            return Task::ready(());
         };
 
         if let MentionUri::File { abs_path, .. } = &mention_uri {
@@ -228,7 +228,7 @@ impl MessageEditor {
                     .read(cx)
                     .project_path_for_absolute_path(abs_path, cx)
                 else {
-                    return;
+                    return Task::ready(());
                 };
                 let image = cx
                     .spawn(async move |_, cx| {
@@ -252,9 +252,9 @@ impl MessageEditor {
                     window,
                     cx,
                 ) else {
-                    return;
+                    return Task::ready(());
                 };
-                self.confirm_mention_for_image(
+                return self.confirm_mention_for_image(
                     crease_id,
                     anchor,
                     Some(abs_path.clone()),
@@ -262,7 +262,6 @@ impl MessageEditor {
                     window,
                     cx,
                 );
-                return;
             }
         }
 
@@ -276,27 +275,28 @@ impl MessageEditor {
             window,
             cx,
         ) else {
-            return;
+            return Task::ready(());
         };
 
         match mention_uri {
             MentionUri::Fetch { url } => {
-                self.confirm_mention_for_fetch(crease_id, anchor, url, window, cx);
+                self.confirm_mention_for_fetch(crease_id, anchor, url, window, cx)
             }
             MentionUri::Directory { abs_path } => {
-                self.confirm_mention_for_directory(crease_id, anchor, abs_path, window, cx);
+                self.confirm_mention_for_directory(crease_id, anchor, abs_path, window, cx)
             }
             MentionUri::Thread { id, name } => {
-                self.confirm_mention_for_thread(crease_id, anchor, id, name, window, cx);
+                self.confirm_mention_for_thread(crease_id, anchor, id, name, window, cx)
             }
             MentionUri::TextThread { path, name } => {
-                self.confirm_mention_for_text_thread(crease_id, anchor, path, name, window, cx);
+                self.confirm_mention_for_text_thread(crease_id, anchor, path, name, window, cx)
             }
             MentionUri::File { .. }
             | MentionUri::Symbol { .. }
             | MentionUri::Rule { .. }
             | MentionUri::Selection { .. } => {
                 self.mention_set.insert_uri(crease_id, mention_uri.clone());
+                Task::ready(())
             }
         }
     }
@@ -308,7 +308,7 @@ impl MessageEditor {
         abs_path: PathBuf,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Task<()> {
         fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<(Arc<Path>, PathBuf)> {
             let mut files = Vec::new();
 
@@ -331,13 +331,13 @@ impl MessageEditor {
             .read(cx)
             .project_path_for_absolute_path(&abs_path, cx)
         else {
-            return;
+            return Task::ready(());
         };
         let Some(entry) = self.project.read(cx).entry_for_path(&project_path, cx) else {
-            return;
+            return Task::ready(());
         };
         let Some(worktree) = self.project.read(cx).worktree_for_entry(entry.id, cx) else {
-            return;
+            return Task::ready(());
         };
         let project = self.project.clone();
         let task = cx.spawn(async move |_, cx| {
@@ -396,7 +396,9 @@ impl MessageEditor {
             })
             .shared();
 
-        self.mention_set.directories.insert(abs_path, task.clone());
+        self.mention_set
+            .directories
+            .insert(abs_path.clone(), task.clone());
 
         let editor = self.editor.clone();
         cx.spawn_in(window, async move |this, cx| {
@@ -414,9 +416,12 @@ impl MessageEditor {
                         editor.remove_creases([crease_id], cx);
                     })
                     .ok();
+                this.update(cx, |this, _cx| {
+                    this.mention_set.directories.remove(&abs_path);
+                })
+                .ok();
             }
         })
-        .detach();
     }
 
     fn confirm_mention_for_fetch(
@@ -426,13 +431,13 @@ impl MessageEditor {
         url: url::Url,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Task<()> {
         let Some(http_client) = self
             .workspace
             .update(cx, |workspace, _cx| workspace.client().http_client())
             .ok()
         else {
-            return;
+            return Task::ready(());
         };
 
         let url_string = url.to_string();
@@ -450,9 +455,9 @@ impl MessageEditor {
         cx.spawn_in(window, async move |this, cx| {
             let fetch = fetch.await.notify_async_err(cx);
             this.update(cx, |this, cx| {
-                let mention_uri = MentionUri::Fetch { url };
                 if fetch.is_some() {
-                    this.mention_set.insert_uri(crease_id, mention_uri.clone());
+                    this.mention_set
+                        .insert_uri(crease_id, MentionUri::Fetch { url });
                 } else {
                     // Remove crease if we failed to fetch
                     this.editor.update(cx, |editor, cx| {
@@ -461,11 +466,11 @@ impl MessageEditor {
                         });
                         editor.remove_creases([crease_id], cx);
                     });
+                    this.mention_set.fetch_results.remove(&url);
                 }
             })
             .ok();
         })
-        .detach();
     }
 
     pub fn confirm_mention_for_selection(
@@ -528,7 +533,7 @@ impl MessageEditor {
         name: String,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Task<()> {
         let uri = MentionUri::Thread {
             id: id.clone(),
             name,
@@ -546,7 +551,7 @@ impl MessageEditor {
             })
             .shared();
 
-        self.mention_set.insert_thread(id, task.clone());
+        self.mention_set.insert_thread(id.clone(), task.clone());
 
         let editor = self.editor.clone();
         cx.spawn_in(window, async move |this, cx| {
@@ -564,9 +569,12 @@ impl MessageEditor {
                         editor.remove_creases([crease_id], cx);
                     })
                     .ok();
+                this.update(cx, |this, _| {
+                    this.mention_set.thread_summaries.remove(&id);
+                })
+                .ok();
             }
         })
-        .detach();
     }
 
     fn confirm_mention_for_text_thread(
@@ -577,7 +585,7 @@ impl MessageEditor {
         name: String,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Task<()> {
         let uri = MentionUri::TextThread {
             path: path.clone(),
             name,
@@ -595,7 +603,8 @@ impl MessageEditor {
             })
             .shared();
 
-        self.mention_set.insert_text_thread(path, task.clone());
+        self.mention_set
+            .insert_text_thread(path.clone(), task.clone());
 
         let editor = self.editor.clone();
         cx.spawn_in(window, async move |this, cx| {
@@ -613,9 +622,12 @@ impl MessageEditor {
                         editor.remove_creases([crease_id], cx);
                     })
                     .ok();
+                this.update(cx, |this, _| {
+                    this.mention_set.text_thread_summaries.remove(&path);
+                })
+                .ok();
             }
         })
-        .detach();
     }
 
     pub fn contents(
@@ -784,13 +796,15 @@ impl MessageEditor {
             ) else {
                 return;
             };
-            self.confirm_mention_for_image(crease_id, anchor, None, task, window, cx);
+            self.confirm_mention_for_image(crease_id, anchor, None, task, window, cx)
+                .detach();
         }
     }
 
     pub fn insert_dragged_files(
-        &self,
+        &mut self,
         paths: Vec<project::ProjectPath>,
+        added_worktrees: Vec<Entity<Worktree>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -798,6 +812,7 @@ impl MessageEditor {
         let Some(buffer) = buffer.read(cx).as_singleton() else {
             return;
         };
+        let mut tasks = Vec::new();
         for path in paths {
             let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
                 continue;
@@ -805,39 +820,44 @@ impl MessageEditor {
             let Some(abs_path) = self.project.read(cx).absolute_path(&path, cx) else {
                 continue;
             };
-
-            let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
             let path_prefix = abs_path
                 .file_name()
                 .unwrap_or(path.path.as_os_str())
                 .display()
                 .to_string();
-            let Some(completion) = ContextPickerCompletionProvider::completion_for_path(
-                path,
-                &path_prefix,
-                false,
-                entry.is_dir(),
-                anchor..anchor,
-                cx.weak_entity(),
-                self.project.clone(),
-                cx,
-            ) else {
-                continue;
+            let (file_name, _) =
+                crate::context_picker::file_context_picker::extract_file_name_and_directory(
+                    &path.path,
+                    &path_prefix,
+                );
+
+            let uri = if entry.is_dir() {
+                MentionUri::Directory { abs_path }
+            } else {
+                MentionUri::File { abs_path }
             };
 
+            let new_text = format!("{} ", uri.as_link());
+            let content_len = new_text.len() - 1;
+
+            let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
+
             self.editor.update(cx, |message_editor, cx| {
                 message_editor.edit(
                     [(
                         multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
-                        completion.new_text,
+                        new_text,
                     )],
                     cx,
                 );
             });
-            if let Some(confirm) = completion.confirm.clone() {
-                confirm(CompletionIntent::Complete, window, cx);
-            }
+            tasks.push(self.confirm_completion(file_name, anchor, content_len, uri, window, cx));
         }
+        cx.spawn(async move |_, _| {
+            join_all(tasks).await;
+            drop(added_worktrees);
+        })
+        .detach();
     }
 
     pub fn set_read_only(&mut self, read_only: bool, cx: &mut Context<Self>) {
@@ -855,7 +875,7 @@ impl MessageEditor {
         image: Shared<Task<Result<Arc<Image>, String>>>,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) {
+    ) -> Task<()> {
         let editor = self.editor.clone();
         let task = cx
             .spawn_in(window, {
@@ -900,9 +920,12 @@ impl MessageEditor {
                         editor.remove_creases([crease_id], cx);
                     })
                     .ok();
+                this.update(cx, |this, _cx| {
+                    this.mention_set.images.remove(&crease_id);
+                })
+                .ok();
             }
         })
-        .detach();
     }
 
     pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index bf5b8efbc8..f1d3870d6d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -3429,8 +3429,7 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) {
         self.message_editor.update(cx, |message_editor, cx| {
-            message_editor.insert_dragged_files(paths, window, cx);
-            drop(added_worktrees);
+            message_editor.insert_dragged_files(paths, added_worktrees, window, cx);
         })
     }
 

From 05fc0c432c024596e68ac5223c556d2a642ff135 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 19 Aug 2025 21:26:17 +0200
Subject: [PATCH 175/823] Fix a bunch of other low-hanging style lints (#36498)

- **Fix a bunch of low hanging style lints like unnecessary-return**
- **Fix single worktree violation**
- **And the rest**

Release Notes:

- N/A
---
 Cargo.toml                                    |   6 +
 crates/acp_thread/src/acp_thread.rs           |   2 +-
 crates/acp_thread/src/mention.rs              |   8 +-
 crates/action_log/src/action_log.rs           |  10 +-
 crates/agent/src/agent_profile.rs             |   2 +-
 crates/agent/src/thread_store.rs              |   2 +-
 crates/agent/src/tool_use.rs                  |   2 +-
 crates/agent2/src/db.rs                       |   2 +-
 crates/agent2/src/tests/mod.rs                |   6 +-
 crates/agent2/src/thread.rs                   |   4 +-
 crates/agent2/src/tools/read_file_tool.rs     |   2 +-
 crates/agent2/src/tools/terminal_tool.rs      |   8 +-
 crates/agent_servers/src/agent_servers.rs     |   4 +-
 crates/agent_servers/src/e2e_tests.rs         |   2 +-
 crates/agent_settings/src/agent_profile.rs    |   2 +-
 .../agent_ui/src/acp/completion_provider.rs   |   2 +-
 crates/agent_ui/src/acp/message_editor.rs     |   4 +-
 crates/agent_ui/src/acp/thread_view.rs        |  32 ++--
 crates/agent_ui/src/active_thread.rs          |   4 +-
 crates/agent_ui/src/agent_configuration.rs    |   2 +-
 crates/agent_ui/src/agent_diff.rs             |  12 +-
 crates/agent_ui/src/agent_panel.rs            |  14 +-
 crates/agent_ui/src/context_picker.rs         |   6 +-
 .../src/context_picker/completion_provider.rs |   2 +-
 .../context_picker/fetch_context_picker.rs    |   7 +-
 .../src/context_picker/file_context_picker.rs |   4 +-
 .../context_picker/rules_context_picker.rs    |   2 +-
 .../context_picker/symbol_context_picker.rs   |   2 +-
 .../context_picker/thread_context_picker.rs   |  10 +-
 crates/agent_ui/src/inline_assistant.rs       |   2 +-
 crates/agent_ui/src/inline_prompt_editor.rs   |   2 +-
 crates/agent_ui/src/message_editor.rs         |   6 +-
 crates/agent_ui/src/slash_command_picker.rs   |  10 +-
 crates/agent_ui/src/text_thread_editor.rs     |   4 +-
 crates/askpass/src/askpass.rs                 |   6 +-
 .../src/assistant_context.rs                  |  21 ++-
 .../src/assistant_context_tests.rs            |   8 +-
 crates/assistant_context/src/context_store.rs |   2 +-
 .../src/context_server_command.rs             |   7 +-
 .../src/diagnostics_command.rs                |   2 +-
 .../src/file_command.rs                       |   4 +-
 crates/assistant_tools/src/assistant_tools.rs |   2 +-
 .../assistant_tools/src/edit_agent/evals.rs   |   2 +-
 crates/assistant_tools/src/read_file_tool.rs  |   2 +-
 crates/assistant_tools/src/terminal_tool.rs   |   8 +-
 crates/bedrock/src/bedrock.rs                 |   6 +-
 crates/call/src/call_impl/mod.rs              |   2 +-
 crates/call/src/call_impl/participant.rs      |   2 +-
 crates/call/src/call_impl/room.rs             |  23 ++-
 crates/channel/src/channel_chat.rs            |   6 +-
 crates/channel/src/channel_store.rs           |   6 +-
 crates/cli/src/main.rs                        |   8 +-
 crates/client/src/client.rs                   |   2 +-
 crates/client/src/user.rs                     |   2 +-
 .../cloud_api_client/src/cloud_api_client.rs  |   6 +-
 .../random_project_collaboration_tests.rs     |   2 +-
 crates/collab_ui/src/chat_panel.rs            |   4 +-
 crates/collab_ui/src/collab_panel.rs          |   6 +-
 crates/collab_ui/src/notification_panel.rs    |   2 +-
 .../src/credentials_provider.rs               |   2 +-
 crates/dap_adapters/src/codelldb.rs           |   2 +-
 crates/db/src/db.rs                           |   2 +-
 crates/db/src/kvp.rs                          |   2 +-
 crates/debugger_tools/src/dap_log.rs          |   2 +-
 crates/debugger_ui/src/session/running.rs     |   5 +-
 .../src/session/running/breakpoint_list.rs    |   2 +-
 crates/diagnostics/src/diagnostic_renderer.rs |  16 +-
 crates/diagnostics/src/diagnostics.rs         |  10 +-
 crates/docs_preprocessor/src/main.rs          |   2 +-
 .../src/edit_prediction_button.rs             |   6 +-
 crates/editor/src/clangd_ext.rs               |   2 +-
 crates/editor/src/code_context_menus.rs       |   6 +-
 crates/editor/src/display_map.rs              |   2 +-
 crates/editor/src/display_map/block_map.rs    |  27 ++-
 crates/editor/src/display_map/fold_map.rs     |  22 +--
 crates/editor/src/display_map/inlay_map.rs    |   2 +-
 crates/editor/src/display_map/wrap_map.rs     |  20 +--
 crates/editor/src/editor.rs                   | 111 ++++++-------
 crates/editor/src/editor_settings.rs          |   6 +-
 crates/editor/src/element.rs                  | 120 ++++++-------
 crates/editor/src/git/blame.rs                |   2 +-
 crates/editor/src/hover_links.rs              |   4 +-
 crates/editor/src/items.rs                    |   4 +-
 crates/editor/src/jsx_tag_auto_close.rs       |  24 ++-
 crates/editor/src/mouse_context_menu.rs       |   4 +-
 crates/editor/src/tasks.rs                    |   2 +-
 crates/eval/src/assertions.rs                 |   2 +-
 crates/eval/src/eval.rs                       |   2 +-
 .../src/examples/add_arg_to_trait_method.rs   |   6 +-
 crates/extension/src/extension_builder.rs     |   2 +-
 crates/extension/src/extension_events.rs      |   5 +-
 crates/extension_host/src/extension_host.rs   |  12 +-
 crates/feature_flags/src/feature_flags.rs     |   2 +-
 crates/feedback/src/system_specs.rs           |   6 +-
 crates/file_finder/src/file_finder.rs         |   4 +-
 crates/file_finder/src/open_path_prompt.rs    |   2 +-
 crates/file_icons/src/file_icons.rs           |   2 +-
 crates/fs/src/fs.rs                           |   4 +-
 crates/git/src/repository.rs                  |   8 +-
 crates/git_ui/src/commit_view.rs              |   3 +-
 crates/git_ui/src/git_panel.rs                |  45 ++---
 crates/git_ui/src/project_diff.rs             |   4 +-
 crates/go_to_line/src/cursor_position.rs      |   2 +-
 crates/google_ai/src/google_ai.rs             |   4 +-
 crates/gpui/src/app/entity_map.rs             |   2 +-
 crates/gpui/src/elements/div.rs               |   6 +-
 crates/gpui/src/elements/image_cache.rs       |   2 +-
 crates/gpui/src/elements/list.rs              |   7 +-
 crates/gpui/src/key_dispatch.rs               |   7 +-
 crates/gpui/src/keymap/context.rs             |   4 +-
 crates/gpui/src/platform.rs                   |   2 +-
 .../gpui/src/platform/blade/blade_context.rs  |   2 +-
 crates/gpui/src/platform/linux/platform.rs    |   2 +-
 .../gpui/src/platform/linux/wayland/client.rs |   6 +-
 .../gpui/src/platform/linux/wayland/window.rs |   4 +-
 crates/gpui/src/platform/linux/x11/client.rs  |  16 +-
 .../gpui/src/platform/linux/x11/clipboard.rs  |   4 +-
 crates/gpui/src/platform/linux/x11/event.rs   |   2 +-
 crates/gpui/src/platform/mac/events.rs        |   5 +-
 crates/gpui/src/platform/mac/platform.rs      |   2 +-
 crates/gpui/src/platform/mac/text_system.rs   |   2 +-
 crates/gpui/src/platform/mac/window.rs        |   4 +-
 crates/gpui/src/platform/test/dispatcher.rs   |   4 +-
 crates/gpui/src/style.rs                      |   6 +-
 crates/gpui/src/text_system.rs                |   2 +-
 crates/gpui/src/window.rs                     |  10 +-
 .../src/derive_inspector_reflection.rs        |   2 +-
 crates/language/src/buffer.rs                 |  37 ++---
 crates/language/src/language_registry.rs      |   2 +-
 crates/language/src/language_settings.rs      |   2 +-
 crates/language/src/syntax_map.rs             |   6 +-
 .../language_models/src/provider/anthropic.rs |   4 +-
 crates/language_models/src/provider/cloud.rs  |   2 +-
 crates/language_models/src/provider/google.rs |   2 +-
 crates/language_tools/src/key_context_view.rs |   8 +-
 crates/language_tools/src/lsp_tool.rs         |   2 -
 crates/languages/src/go.rs                    |   2 +-
 crates/languages/src/json.rs                  |   2 +-
 crates/languages/src/python.rs                |   2 +-
 crates/languages/src/rust.rs                  |   4 +-
 crates/livekit_client/examples/test_app.rs    |   4 +-
 .../markdown_preview/src/markdown_parser.rs   |   8 +-
 .../markdown_preview/src/markdown_renderer.rs |   5 +-
 .../src/migrations/m_2025_05_05/settings.rs   |   4 +-
 crates/multi_buffer/src/multi_buffer.rs       | 157 +++++++++---------
 crates/node_runtime/src/node_runtime.rs       |   2 +-
 crates/onboarding/src/theme_preview.rs        |   8 +-
 crates/open_ai/src/open_ai.rs                 |   4 +-
 crates/open_router/src/open_router.rs         |   2 +-
 crates/outline_panel/src/outline_panel.rs     |  35 ++--
 crates/prettier/src/prettier.rs               |   4 +-
 crates/project/src/buffer_store.rs            |   7 +-
 crates/project/src/color_extractor.rs         |   2 +-
 crates/project/src/debugger/locators/cargo.rs |   2 +-
 .../project/src/debugger/locators/python.rs   |   4 +-
 crates/project/src/debugger/memory.rs         |   2 +-
 crates/project/src/debugger/session.rs        |   8 +-
 crates/project/src/git_store.rs               |  14 +-
 crates/project/src/lsp_command.rs             |   4 +-
 crates/project/src/lsp_store.rs               |  45 +++--
 crates/project/src/manifest_tree.rs           |   6 +-
 .../project/src/manifest_tree/server_tree.rs  |   2 +-
 crates/project/src/project.rs                 |  19 ++-
 crates/project/src/project_settings.rs        |   6 +-
 crates/project/src/project_tests.rs           |   7 +-
 crates/project/src/terminals.rs               |   4 +-
 crates/project_panel/src/project_panel.rs     |  42 +++--
 crates/project_symbols/src/project_symbols.rs |   2 +-
 crates/prompt_store/src/prompt_store.rs       |   4 +-
 crates/prompt_store/src/prompts.rs            |   2 +-
 .../src/disconnected_overlay.rs               |   2 +-
 crates/recent_projects/src/remote_servers.rs  |   2 +-
 crates/recent_projects/src/ssh_connections.rs |   2 +-
 crates/remote/src/ssh_session.rs              |   4 +-
 crates/repl/src/components/kernel_options.rs  |   2 +-
 crates/repl/src/repl_editor.rs                |   2 +-
 crates/rope/src/rope.rs                       |   4 +-
 crates/rules_library/src/rules_library.rs     |   4 +-
 crates/settings/src/keymap_file.rs            |   8 +-
 crates/settings/src/settings_json.rs          |   8 +-
 crates/settings/src/settings_store.rs         |   3 +-
 .../src/settings_profile_selector.rs          |   2 +-
 crates/settings_ui/src/keybindings.rs         |  35 ++--
 .../src/ui_components/keystroke_input.rs      |  16 +-
 crates/settings_ui/src/ui_components/table.rs |   2 +-
 crates/snippet/src/snippet.rs                 |   2 +-
 crates/snippet_provider/src/lib.rs            |   6 +-
 crates/sum_tree/src/sum_tree.rs               |   6 +-
 crates/supermaven/src/supermaven.rs           |   2 +-
 crates/supermaven_api/src/supermaven_api.rs   |   4 +-
 crates/tasks_ui/src/tasks_ui.rs               |   4 +-
 crates/telemetry/src/telemetry.rs             |   1 -
 crates/terminal/src/pty_info.rs               |   2 +-
 crates/terminal/src/terminal.rs               |   8 +-
 crates/terminal/src/terminal_hyperlinks.rs    |   4 +-
 crates/terminal_view/src/color_contrast.rs    |   8 +-
 crates/terminal_view/src/terminal_element.rs  |   2 +-
 crates/terminal_view/src/terminal_panel.rs    |  42 +++--
 crates/terminal_view/src/terminal_view.rs     |   4 +-
 crates/text/src/anchor.rs                     |   2 +-
 crates/text/src/patch.rs                      |   4 +-
 crates/text/src/text.rs                       |   6 +-
 crates/title_bar/src/collab.rs                |   2 +-
 crates/title_bar/src/onboarding_banner.rs     |   2 +-
 crates/ui/src/components/popover_menu.rs      |   6 +-
 crates/ui/src/components/sticky_items.rs      |   1 -
 crates/util/src/paths.rs                      |   4 +-
 crates/util/src/size.rs                       |  12 +-
 crates/util/src/util.rs                       |   4 +-
 crates/vim/src/command.rs                     |   3 +-
 crates/vim/src/digraph.rs                     |   1 -
 crates/vim/src/helix.rs                       |   1 -
 crates/vim/src/motion.rs                      |   4 +-
 crates/vim/src/normal/mark.rs                 |   1 -
 crates/vim/src/normal/search.rs               |   2 +-
 crates/vim/src/state.rs                       |   4 +-
 .../src/web_search_providers.rs               |   2 +-
 crates/workspace/src/dock.rs                  |   4 +-
 crates/workspace/src/item.rs                  |   2 +-
 crates/workspace/src/pane.rs                  |  16 +-
 crates/workspace/src/workspace.rs             |  28 ++--
 crates/worktree/src/worktree.rs               |  26 ++-
 crates/worktree/src/worktree_settings.rs      |   2 +-
 crates/zed/src/zed.rs                         |   2 +-
 crates/zed/src/zed/migrate.rs                 |   2 +-
 crates/zed/src/zed/quick_action_bar.rs        |   6 +-
 crates/zeta/src/init.rs                       |   8 +-
 crates/zeta/src/onboarding_modal.rs           |   2 +-
 crates/zeta/src/rate_completion_modal.rs      |   2 +-
 crates/zeta/src/zeta.rs                       |   4 +-
 crates/zlog/src/filter.rs                     |  28 ++--
 crates/zlog/src/zlog.rs                       |  10 +-
 extensions/glsl/src/glsl.rs                   |   4 +-
 extensions/html/src/html.rs                   |   2 +-
 extensions/ruff/src/ruff.rs                   |   4 +-
 extensions/snippets/src/snippets.rs           |   4 +-
 .../test-extension/src/test_extension.rs      |   4 +-
 extensions/toml/src/toml.rs                   |   4 +-
 tooling/xtask/src/tasks/package_conformity.rs |   6 +-
 239 files changed, 854 insertions(+), 1015 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 603897084c..46c5646c90 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -821,6 +821,7 @@ single_range_in_vec_init = "allow"
 style = { level = "allow", priority = -1 }
 
 # Temporary list of style lints that we've fixed so far.
+comparison_to_empty = "warn"
 iter_cloned_collect = "warn"
 iter_next_slice = "warn"
 iter_nth = "warn"
@@ -831,8 +832,13 @@ question_mark = { level = "deny" }
 redundant_closure = { level = "deny" }
 declare_interior_mutable_const = { level = "deny" }
 collapsible_if = { level = "warn"}
+collapsible_else_if = { level = "warn" }
 needless_borrow = { level = "warn"}
+needless_return = { level = "warn" }
 unnecessary_mut_passed = {level = "warn"}
+unnecessary_map_or = { level = "warn" }
+unused_unit = "warn"
+
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
 # We often return trait objects from `new` functions.
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 1de8110f07..d4d73e1edd 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -49,7 +49,7 @@ impl UserMessage {
         if self
             .checkpoint
             .as_ref()
-            .map_or(false, |checkpoint| checkpoint.show)
+            .is_some_and(|checkpoint| checkpoint.show)
         {
             writeln!(markdown, "## User (checkpoint)").unwrap();
         } else {
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index fcf50b0fd7..4615e9a551 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -79,12 +79,10 @@ impl MentionUri {
                     } else {
                         Ok(Self::Selection { path, line_range })
                     }
+                } else if input.ends_with("/") {
+                    Ok(Self::Directory { abs_path: path })
                 } else {
-                    if input.ends_with("/") {
-                        Ok(Self::Directory { abs_path: path })
-                    } else {
-                        Ok(Self::File { abs_path: path })
-                    }
+                    Ok(Self::File { abs_path: path })
                 }
             }
             "zed" => {
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index ceced1bcdd..602357ed2b 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -116,7 +116,7 @@ impl ActionLog {
             } else if buffer
                 .read(cx)
                 .file()
-                .map_or(false, |file| file.disk_state().exists())
+                .is_some_and(|file| file.disk_state().exists())
             {
                 TrackedBufferStatus::Created {
                     existing_file_content: Some(buffer.read(cx).as_rope().clone()),
@@ -215,7 +215,7 @@ impl ActionLog {
                 if buffer
                     .read(cx)
                     .file()
-                    .map_or(false, |file| file.disk_state() == DiskState::Deleted)
+                    .is_some_and(|file| file.disk_state() == DiskState::Deleted)
                 {
                     // If the buffer had been edited by a tool, but it got
                     // deleted externally, we want to stop tracking it.
@@ -227,7 +227,7 @@ impl ActionLog {
                 if buffer
                     .read(cx)
                     .file()
-                    .map_or(false, |file| file.disk_state() != DiskState::Deleted)
+                    .is_some_and(|file| file.disk_state() != DiskState::Deleted)
                 {
                     // If the buffer had been deleted by a tool, but it got
                     // resurrected externally, we want to clear the edits we
@@ -811,7 +811,7 @@ impl ActionLog {
                 tracked.version != buffer.version
                     && buffer
                         .file()
-                        .map_or(false, |file| file.disk_state() != DiskState::Deleted)
+                        .is_some_and(|file| file.disk_state() != DiskState::Deleted)
             })
             .map(|(buffer, _)| buffer)
     }
@@ -847,7 +847,7 @@ fn apply_non_conflicting_edits(
                 conflict = true;
                 if new_edits
                     .peek()
-                    .map_or(false, |next_edit| next_edit.old.overlaps(&old_edit.new))
+                    .is_some_and(|next_edit| next_edit.old.overlaps(&old_edit.new))
                 {
                     new_edit = new_edits.next().unwrap();
                 } else {
diff --git a/crates/agent/src/agent_profile.rs b/crates/agent/src/agent_profile.rs
index 38e697dd9b..1636508df6 100644
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -90,7 +90,7 @@ impl AgentProfile {
             return false;
         };
 
-        return Self::is_enabled(settings, source, tool_name);
+        Self::is_enabled(settings, source, tool_name)
     }
 
     fn is_enabled(settings: &AgentProfileSettings, source: ToolSource, name: String) -> bool {
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index ed1605aacf..63d0f72e00 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -42,7 +42,7 @@ use std::{
 use util::ResultExt as _;
 
 pub static ZED_STATELESS: std::sync::LazyLock<bool> =
-    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
+    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
diff --git a/crates/agent/src/tool_use.rs b/crates/agent/src/tool_use.rs
index d109891bf2..962dca591f 100644
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -275,7 +275,7 @@ impl ToolUseState {
     pub fn message_has_tool_results(&self, assistant_message_id: MessageId) -> bool {
         self.tool_uses_by_assistant_message
             .get(&assistant_message_id)
-            .map_or(false, |results| !results.is_empty())
+            .is_some_and(|results| !results.is_empty())
     }
 
     pub fn tool_result(
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index c3e6352ef6..27a109c573 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -184,7 +184,7 @@ impl DbThread {
 }
 
 pub static ZED_STATELESS: std::sync::LazyLock<bool> =
-    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
+    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index f01873cfc1..7fa12e5711 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -742,7 +742,7 @@ async fn expect_tool_call(events: &mut UnboundedReceiver<Result<ThreadEvent>>) -
         .expect("no tool call authorization event received")
         .unwrap();
     match event {
-        ThreadEvent::ToolCall(tool_call) => return tool_call,
+        ThreadEvent::ToolCall(tool_call) => tool_call,
         event => {
             panic!("Unexpected event {event:?}");
         }
@@ -758,9 +758,7 @@ async fn expect_tool_call_update_fields(
         .expect("no tool call authorization event received")
         .unwrap();
     match event {
-        ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(update)) => {
-            return update;
-        }
+        ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(update)) => update,
         event => {
             panic!("Unexpected event {event:?}");
         }
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 66b4485f72..ba5cd1f477 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1356,7 +1356,7 @@ impl Thread {
 
         // Ensure the last message ends in the current tool use
         let last_message = self.pending_message();
-        let push_new_tool_use = last_message.content.last_mut().map_or(true, |content| {
+        let push_new_tool_use = last_message.content.last_mut().is_none_or(|content| {
             if let AgentMessageContent::ToolUse(last_tool_use) = content {
                 if last_tool_use.id == tool_use.id {
                     *last_tool_use = tool_use.clone();
@@ -1408,7 +1408,7 @@ impl Thread {
             status: Some(acp::ToolCallStatus::InProgress),
             ..Default::default()
         });
-        let supports_images = self.model().map_or(false, |model| model.supports_images());
+        let supports_images = self.model().is_some_and(|model| model.supports_images());
         let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
         log::info!("Running tool {}", tool_use.name);
         Some(cx.foreground_executor().spawn(async move {
diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index f21643cbbb..f37dff4f47 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -175,7 +175,7 @@ impl AgentTool for ReadFileTool {
                 buffer
                     .file()
                     .as_ref()
-                    .map_or(true, |file| !file.disk_state().exists())
+                    .is_none_or(|file| !file.disk_state().exists())
             })? {
                 anyhow::bail!("{file_path} not found");
             }
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index 1804d0ab30..d8f0282f4b 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -271,7 +271,7 @@ fn working_dir(
     let project = project.read(cx);
     let cd = &input.cd;
 
-    if cd == "." || cd == "" {
+    if cd == "." || cd.is_empty() {
         // Accept "." or "" as meaning "the one worktree" if we only have one worktree.
         let mut worktrees = project.worktrees(cx);
 
@@ -296,10 +296,8 @@ fn working_dir(
             {
                 return Ok(Some(input_path.into()));
             }
-        } else {
-            if let Some(worktree) = project.worktree_for_root_name(cd, cx) {
-                return Ok(Some(worktree.read(cx).abs_path().to_path_buf()));
-            }
+        } else if let Some(worktree) = project.worktree_for_root_name(cd, cx) {
+            return Ok(Some(worktree.read(cx).abs_path().to_path_buf()));
         }
 
         anyhow::bail!("`cd` directory {cd:?} was not in any of the project's worktrees.");
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 8f8aa1d788..cebf82cddb 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -104,7 +104,7 @@ impl AgentServerCommand {
         cx: &mut AsyncApp,
     ) -> Option<Self> {
         if let Some(agent_settings) = settings {
-            return Some(Self {
+            Some(Self {
                 path: agent_settings.command.path,
                 args: agent_settings
                     .command
@@ -113,7 +113,7 @@ impl AgentServerCommand {
                     .chain(extra_args.iter().map(|arg| arg.to_string()))
                     .collect(),
                 env: agent_settings.command.env,
-            });
+            })
         } else {
             match find_bin_in_path(path_bin_name, project, cx).await {
                 Some(path) => Some(Self {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 2b32edcd4f..fef80b4d42 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -471,7 +471,7 @@ pub fn get_zed_path() -> PathBuf {
 
     while zed_path
         .file_name()
-        .map_or(true, |name| name.to_string_lossy() != "debug")
+        .is_none_or(|name| name.to_string_lossy() != "debug")
     {
         if !zed_path.pop() {
             panic!("Could not find target directory");
diff --git a/crates/agent_settings/src/agent_profile.rs b/crates/agent_settings/src/agent_profile.rs
index 402cf81678..04fdd4a753 100644
--- a/crates/agent_settings/src/agent_profile.rs
+++ b/crates/agent_settings/src/agent_profile.rs
@@ -58,7 +58,7 @@ impl AgentProfileSettings {
             || self
                 .context_servers
                 .get(server_id)
-                .map_or(false, |preset| preset.tools.get(tool_name) == Some(&true))
+                .is_some_and(|preset| preset.tools.get(tool_name) == Some(&true))
     }
 }
 
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index a8a690190a..1a5e9c7d81 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -797,7 +797,7 @@ impl MentionCompletion {
             && line
                 .chars()
                 .nth(last_mention_start - 1)
-                .map_or(false, |c| !c.is_whitespace())
+                .is_some_and(|c| !c.is_whitespace())
         {
             return None;
         }
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 3ed202f66a..e7f0d4f88f 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1552,14 +1552,14 @@ impl SemanticsProvider for SlashCommandSemanticsProvider {
             return None;
         }
         let range = snapshot.anchor_after(start)..snapshot.anchor_after(end);
-        return Some(Task::ready(vec![project::Hover {
+        Some(Task::ready(vec![project::Hover {
             contents: vec![project::HoverBlock {
                 text: "Slash commands are not supported".into(),
                 kind: project::HoverBlockKind::PlainText,
             }],
             range: Some(range),
             language: None,
-        }]));
+        }]))
     }
 
     fn inline_values(
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f1d3870d6d..7b38ba9301 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -102,7 +102,7 @@ impl ProfileProvider for Entity<agent2::Thread> {
     fn profiles_supported(&self, cx: &App) -> bool {
         self.read(cx)
             .model()
-            .map_or(false, |model| model.supports_tools())
+            .is_some_and(|model| model.supports_tools())
     }
 }
 
@@ -2843,7 +2843,7 @@ impl AcpThreadView {
 
         if thread
             .model()
-            .map_or(true, |model| !model.supports_burn_mode())
+            .is_none_or(|model| !model.supports_burn_mode())
         {
             return None;
         }
@@ -2875,9 +2875,9 @@ impl AcpThreadView {
 
     fn render_send_button(&self, cx: &mut Context<Self>) -> AnyElement {
         let is_editor_empty = self.message_editor.read(cx).is_empty(cx);
-        let is_generating = self.thread().map_or(false, |thread| {
-            thread.read(cx).status() != ThreadStatus::Idle
-        });
+        let is_generating = self
+            .thread()
+            .is_some_and(|thread| thread.read(cx).status() != ThreadStatus::Idle);
 
         if is_generating && is_editor_empty {
             IconButton::new("stop-generation", IconName::Stop)
@@ -3455,18 +3455,16 @@ impl AcpThreadView {
             } else {
                 format!("Retrying. Next attempt in {next_attempt_in_secs} seconds.")
             }
+        } else if next_attempt_in_secs == 1 {
+            format!(
+                "Retrying. Next attempt in 1 second (Attempt {} of {}).",
+                state.attempt, state.max_attempts,
+            )
         } else {
-            if next_attempt_in_secs == 1 {
-                format!(
-                    "Retrying. Next attempt in 1 second (Attempt {} of {}).",
-                    state.attempt, state.max_attempts,
-                )
-            } else {
-                format!(
-                    "Retrying. Next attempt in {next_attempt_in_secs} seconds (Attempt {} of {}).",
-                    state.attempt, state.max_attempts,
-                )
-            }
+            format!(
+                "Retrying. Next attempt in {next_attempt_in_secs} seconds (Attempt {} of {}).",
+                state.attempt, state.max_attempts,
+            )
         };
 
         Some(
@@ -3552,7 +3550,7 @@ impl AcpThreadView {
         let supports_burn_mode = thread
             .read(cx)
             .model()
-            .map_or(false, |model| model.supports_burn_mode());
+            .is_some_and(|model| model.supports_burn_mode());
 
         let focus_handle = self.focus_handle(cx);
 
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 3defa42d17..a1e51f883a 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -2246,9 +2246,7 @@ impl ActiveThread {
         let after_editing_message = self
             .editing_message
             .as_ref()
-            .map_or(false, |(editing_message_id, _)| {
-                message_id > *editing_message_id
-            });
+            .is_some_and(|(editing_message_id, _)| message_id > *editing_message_id);
 
         let backdrop = div()
             .id(("backdrop", ix))
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index a0584f9e2e..b032201d8c 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -96,7 +96,7 @@ impl AgentConfiguration {
         let mut expanded_provider_configurations = HashMap::default();
         if LanguageModelRegistry::read_global(cx)
             .provider(&ZED_CLOUD_PROVIDER_ID)
-            .map_or(false, |cloud_provider| cloud_provider.must_accept_terms(cx))
+            .is_some_and(|cloud_provider| cloud_provider.must_accept_terms(cx))
         {
             expanded_provider_configurations.insert(ZED_CLOUD_PROVIDER_ID, true);
         }
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 5b4f1038e2..e80cd20846 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -285,7 +285,7 @@ impl AgentDiffPane {
                     && buffer
                         .read(cx)
                         .file()
-                        .map_or(false, |file| file.disk_state() == DiskState::Deleted)
+                        .is_some_and(|file| file.disk_state() == DiskState::Deleted)
                 {
                     editor.fold_buffer(snapshot.text.remote_id(), cx)
                 }
@@ -1063,7 +1063,7 @@ impl ToolbarItemView for AgentDiffToolbar {
         }
 
         self.active_item = None;
-        return self.location(cx);
+        self.location(cx)
     }
 
     fn pane_focus_update(
@@ -1509,7 +1509,7 @@ impl AgentDiff {
                     .read(cx)
                     .entries()
                     .last()
-                    .map_or(false, |entry| entry.diffs().next().is_some())
+                    .is_some_and(|entry| entry.diffs().next().is_some())
                 {
                     self.update_reviewing_editors(workspace, window, cx);
                 }
@@ -1519,7 +1519,7 @@ impl AgentDiff {
                     .read(cx)
                     .entries()
                     .get(*ix)
-                    .map_or(false, |entry| entry.diffs().next().is_some())
+                    .is_some_and(|entry| entry.diffs().next().is_some())
                 {
                     self.update_reviewing_editors(workspace, window, cx);
                 }
@@ -1709,7 +1709,7 @@ impl AgentDiff {
                 .read_with(cx, |editor, _cx| editor.workspace())
                 .ok()
                 .flatten()
-                .map_or(false, |editor_workspace| {
+                .is_some_and(|editor_workspace| {
                     editor_workspace.entity_id() == workspace.entity_id()
                 });
 
@@ -1868,7 +1868,7 @@ impl AgentDiff {
             }
         }
 
-        return Some(Task::ready(Ok(())));
+        Some(Task::ready(Ok(())))
     }
 }
 
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index f9aea84376..c79349e3a9 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1463,7 +1463,7 @@ impl AgentPanel {
             AssistantConfigurationEvent::NewThread(provider) => {
                 if LanguageModelRegistry::read_global(cx)
                     .default_model()
-                    .map_or(true, |model| model.provider.id() != provider.id())
+                    .is_none_or(|model| model.provider.id() != provider.id())
                     && let Some(model) = provider.default_model(cx)
                 {
                     update_settings_file::<AgentSettings>(
@@ -2708,9 +2708,7 @@ impl AgentPanel {
             }
             ActiveView::ExternalAgentThread { .. }
             | ActiveView::History
-            | ActiveView::Configuration => {
-                return None;
-            }
+            | ActiveView::Configuration => None,
         }
     }
 
@@ -2726,7 +2724,7 @@ impl AgentPanel {
                     .thread()
                     .read(cx)
                     .configured_model()
-                    .map_or(false, |model| {
+                    .is_some_and(|model| {
                         model.provider.id() != language_model::ZED_CLOUD_PROVIDER_ID
                     })
                 {
@@ -2737,7 +2735,7 @@ impl AgentPanel {
                 if LanguageModelRegistry::global(cx)
                     .read(cx)
                     .default_model()
-                    .map_or(false, |model| {
+                    .is_some_and(|model| {
                         model.provider.id() != language_model::ZED_CLOUD_PROVIDER_ID
                     })
                 {
@@ -3051,9 +3049,7 @@ impl AgentPanel {
         let zed_provider_configured = AgentSettings::get_global(cx)
             .default_model
             .as_ref()
-            .map_or(false, |selection| {
-                selection.provider.0.as_str() == "zed.dev"
-            });
+            .is_some_and(|selection| selection.provider.0.as_str() == "zed.dev");
 
         let callout = if zed_provider_configured {
             Callout::new()
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 131023d249..697f704991 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -610,9 +610,7 @@ pub(crate) fn available_context_picker_entries(
         .read(cx)
         .active_item(cx)
         .and_then(|item| item.downcast::<Editor>())
-        .map_or(false, |editor| {
-            editor.update(cx, |editor, cx| editor.has_non_empty_selection(cx))
-        });
+        .is_some_and(|editor| editor.update(cx, |editor, cx| editor.has_non_empty_selection(cx)));
     if has_selection {
         entries.push(ContextPickerEntry::Action(
             ContextPickerAction::AddSelections,
@@ -680,7 +678,7 @@ pub(crate) fn recent_context_picker_entries(
             .filter(|(_, abs_path)| {
                 abs_path
                     .as_ref()
-                    .map_or(true, |path| !exclude_paths.contains(path.as_path()))
+                    .is_none_or(|path| !exclude_paths.contains(path.as_path()))
             })
             .take(4)
             .filter_map(|(project_path, _)| {
diff --git a/crates/agent_ui/src/context_picker/completion_provider.rs b/crates/agent_ui/src/context_picker/completion_provider.rs
index 79e56acacf..747ec46e0a 100644
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -1020,7 +1020,7 @@ impl MentionCompletion {
             && line
                 .chars()
                 .nth(last_mention_start - 1)
-                .map_or(false, |c| !c.is_whitespace())
+                .is_some_and(|c| !c.is_whitespace())
         {
             return None;
         }
diff --git a/crates/agent_ui/src/context_picker/fetch_context_picker.rs b/crates/agent_ui/src/context_picker/fetch_context_picker.rs
index 8ff68a8365..dd558b2a1c 100644
--- a/crates/agent_ui/src/context_picker/fetch_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/fetch_context_picker.rs
@@ -226,9 +226,10 @@ impl PickerDelegate for FetchContextPickerDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let added = self.context_store.upgrade().map_or(false, |context_store| {
-            context_store.read(cx).includes_url(&self.url)
-        });
+        let added = self
+            .context_store
+            .upgrade()
+            .is_some_and(|context_store| context_store.read(cx).includes_url(&self.url));
 
         Some(
             ListItem::new(ix)
diff --git a/crates/agent_ui/src/context_picker/file_context_picker.rs b/crates/agent_ui/src/context_picker/file_context_picker.rs
index 4f74e2cea4..6c224caf4c 100644
--- a/crates/agent_ui/src/context_picker/file_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/file_context_picker.rs
@@ -239,9 +239,7 @@ pub(crate) fn search_files(
 
                 PathMatchCandidateSet {
                     snapshot: worktree.snapshot(),
-                    include_ignored: worktree
-                        .root_entry()
-                        .map_or(false, |entry| entry.is_ignored),
+                    include_ignored: worktree.root_entry().is_some_and(|entry| entry.is_ignored),
                     include_root_name: true,
                     candidates: project::Candidates::Entries,
                 }
diff --git a/crates/agent_ui/src/context_picker/rules_context_picker.rs b/crates/agent_ui/src/context_picker/rules_context_picker.rs
index 8ce821cfaa..f3982f61cb 100644
--- a/crates/agent_ui/src/context_picker/rules_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/rules_context_picker.rs
@@ -159,7 +159,7 @@ pub fn render_thread_context_entry(
     context_store: WeakEntity<ContextStore>,
     cx: &mut App,
 ) -> Div {
-    let added = context_store.upgrade().map_or(false, |context_store| {
+    let added = context_store.upgrade().is_some_and(|context_store| {
         context_store
             .read(cx)
             .includes_user_rules(user_rules.prompt_id)
diff --git a/crates/agent_ui/src/context_picker/symbol_context_picker.rs b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
index 805c10c965..b00d4e3693 100644
--- a/crates/agent_ui/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
@@ -294,7 +294,7 @@ pub(crate) fn search_symbols(
                         .partition(|candidate| {
                             project
                                 .entry_for_path(&symbols[candidate.id].path, cx)
-                                .map_or(false, |e| !e.is_ignored)
+                                .is_some_and(|e| !e.is_ignored)
                         })
                 })
                 .log_err()
diff --git a/crates/agent_ui/src/context_picker/thread_context_picker.rs b/crates/agent_ui/src/context_picker/thread_context_picker.rs
index e660e64ae3..66654f3d8c 100644
--- a/crates/agent_ui/src/context_picker/thread_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/thread_context_picker.rs
@@ -236,12 +236,10 @@ pub fn render_thread_context_entry(
     let is_added = match entry {
         ThreadContextEntry::Thread { id, .. } => context_store
             .upgrade()
-            .map_or(false, |ctx_store| ctx_store.read(cx).includes_thread(id)),
-        ThreadContextEntry::Context { path, .. } => {
-            context_store.upgrade().map_or(false, |ctx_store| {
-                ctx_store.read(cx).includes_text_thread(path)
-            })
-        }
+            .is_some_and(|ctx_store| ctx_store.read(cx).includes_thread(id)),
+        ThreadContextEntry::Context { path, .. } => context_store
+            .upgrade()
+            .is_some_and(|ctx_store| ctx_store.read(cx).includes_text_thread(path)),
     };
 
     h_flex()
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 101eb899b2..90302236fb 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1120,7 +1120,7 @@ impl InlineAssistant {
             if editor_assists
                 .scroll_lock
                 .as_ref()
-                .map_or(false, |lock| lock.assist_id == assist_id)
+                .is_some_and(|lock| lock.assist_id == assist_id)
             {
                 editor_assists.scroll_lock = None;
             }
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index 6f12050f88..5608143464 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -345,7 +345,7 @@ impl<T: 'static> PromptEditor<T> {
                 let prompt = self.editor.read(cx).text(cx);
                 if self
                     .prompt_history_ix
-                    .map_or(true, |ix| self.prompt_history[ix] != prompt)
+                    .is_none_or(|ix| self.prompt_history[ix] != prompt)
                 {
                     self.prompt_history_ix.take();
                     self.pending_prompt = prompt;
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 64c9a873f5..6e4d2638c1 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -156,7 +156,7 @@ impl ProfileProvider for Entity<Thread> {
     fn profiles_supported(&self, cx: &App) -> bool {
         self.read(cx)
             .configured_model()
-            .map_or(false, |model| model.model.supports_tools())
+            .is_some_and(|model| model.model.supports_tools())
     }
 
     fn profile_id(&self, cx: &App) -> AgentProfileId {
@@ -1289,7 +1289,7 @@ impl MessageEditor {
         self.thread
             .read(cx)
             .configured_model()
-            .map_or(false, |model| model.provider.id() == ZED_CLOUD_PROVIDER_ID)
+            .is_some_and(|model| model.provider.id() == ZED_CLOUD_PROVIDER_ID)
     }
 
     fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
@@ -1442,7 +1442,7 @@ impl MessageEditor {
                     let message_text = editor.read(cx).text(cx);
 
                     if message_text.is_empty()
-                        && loaded_context.map_or(true, |loaded_context| loaded_context.is_empty())
+                        && loaded_context.is_none_or(|loaded_context| loaded_context.is_empty())
                     {
                         return None;
                     }
diff --git a/crates/agent_ui/src/slash_command_picker.rs b/crates/agent_ui/src/slash_command_picker.rs
index bab2364679..03f2c97887 100644
--- a/crates/agent_ui/src/slash_command_picker.rs
+++ b/crates/agent_ui/src/slash_command_picker.rs
@@ -140,12 +140,10 @@ impl PickerDelegate for SlashCommandDelegate {
                     );
                     ret.push(index - 1);
                 }
-            } else {
-                if let SlashCommandEntry::Advert { .. } = command {
-                    previous_is_advert = true;
-                    if index != 0 {
-                        ret.push(index - 1);
-                    }
+            } else if let SlashCommandEntry::Advert { .. } = command {
+                previous_is_advert = true;
+                if index != 0 {
+                    ret.push(index - 1);
                 }
             }
         }
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 3b5f2e5069..b7e5d83d6d 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -373,7 +373,7 @@ impl TextThreadEditor {
             .map(|default| default.provider);
         if provider
             .as_ref()
-            .map_or(false, |provider| provider.must_accept_terms(cx))
+            .is_some_and(|provider| provider.must_accept_terms(cx))
         {
             self.show_accept_terms = true;
             cx.notify();
@@ -457,7 +457,7 @@ impl TextThreadEditor {
                         || snapshot
                             .chars_at(newest_cursor)
                             .next()
-                            .map_or(false, |ch| ch != '\n')
+                            .is_some_and(|ch| ch != '\n')
                     {
                         editor.move_to_end_of_line(
                             &MoveToEndOfLine {
diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs
index f085a2be72..9e84a9fed0 100644
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -177,11 +177,11 @@ impl AskPassSession {
             _ = askpass_opened_rx.fuse() => {
                 // Note: this await can only resolve after we are dropped.
                 askpass_kill_master_rx.await.ok();
-                return AskPassResult::CancelledByUser
+                AskPassResult::CancelledByUser
             }
 
             _ = futures::FutureExt::fuse(smol::Timer::after(connection_timeout)) => {
-                return AskPassResult::Timedout
+                AskPassResult::Timedout
             }
         }
     }
@@ -215,7 +215,7 @@ pub fn main(socket: &str) {
     }
 
     #[cfg(target_os = "windows")]
-    while buffer.last().map_or(false, |&b| b == b'\n' || b == b'\r') {
+    while buffer.last().is_some_and(|&b| b == b'\n' || b == b'\r') {
         buffer.pop();
     }
     if buffer.last() != Some(&b'\0') {
diff --git a/crates/assistant_context/src/assistant_context.rs b/crates/assistant_context/src/assistant_context.rs
index 151586564f..2d71a1c08a 100644
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -1023,9 +1023,11 @@ impl AssistantContext {
                     summary: new_summary,
                     ..
                 } => {
-                    if self.summary.timestamp().map_or(true, |current_timestamp| {
-                        new_summary.timestamp > current_timestamp
-                    }) {
+                    if self
+                        .summary
+                        .timestamp()
+                        .is_none_or(|current_timestamp| new_summary.timestamp > current_timestamp)
+                    {
                         self.summary = ContextSummary::Content(new_summary);
                         summary_generated = true;
                     }
@@ -1339,7 +1341,7 @@ impl AssistantContext {
                 let is_invalid = self
                     .messages_metadata
                     .get(&message_id)
-                    .map_or(true, |metadata| {
+                    .is_none_or(|metadata| {
                         !metadata.is_cache_valid(&buffer, &message.offset_range)
                             || *encountered_invalid
                     });
@@ -1860,7 +1862,7 @@ impl AssistantContext {
                         {
                             let newline_offset = insert_position.saturating_sub(1);
                             if buffer.contains_str_at(newline_offset, "\n")
-                                && last_section_range.map_or(true, |last_section_range| {
+                                && last_section_range.is_none_or(|last_section_range| {
                                     !last_section_range
                                         .to_offset(buffer)
                                         .contains(&newline_offset)
@@ -2313,10 +2315,7 @@ impl AssistantContext {
             let mut request_message = LanguageModelRequestMessage {
                 role: message.role,
                 content: Vec::new(),
-                cache: message
-                    .cache
-                    .as_ref()
-                    .map_or(false, |cache| cache.is_anchor),
+                cache: message.cache.as_ref().is_some_and(|cache| cache.is_anchor),
             };
 
             while let Some(content) = contents.peek() {
@@ -2797,7 +2796,7 @@ impl AssistantContext {
         let mut current_message = messages.next();
         while let Some(offset) = offsets.next() {
             // Locate the message that contains the offset.
-            while current_message.as_ref().map_or(false, |message| {
+            while current_message.as_ref().is_some_and(|message| {
                 !message.offset_range.contains(&offset) && messages.peek().is_some()
             }) {
                 current_message = messages.next();
@@ -2807,7 +2806,7 @@ impl AssistantContext {
             };
 
             // Skip offsets that are in the same message.
-            while offsets.peek().map_or(false, |offset| {
+            while offsets.peek().is_some_and(|offset| {
                 message.offset_range.contains(offset) || messages.peek().is_none()
             }) {
                 offsets.next();
diff --git a/crates/assistant_context/src/assistant_context_tests.rs b/crates/assistant_context/src/assistant_context_tests.rs
index eae7741358..28cc8ef8f0 100644
--- a/crates/assistant_context/src/assistant_context_tests.rs
+++ b/crates/assistant_context/src/assistant_context_tests.rs
@@ -1055,7 +1055,7 @@ fn test_mark_cache_anchors(cx: &mut App) {
     assert_eq!(
         messages_cache(&context, cx)
             .iter()
-            .filter(|(_, cache)| cache.as_ref().map_or(false, |cache| cache.is_anchor))
+            .filter(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
             .count(),
         0,
         "Empty messages should not have any cache anchors."
@@ -1083,7 +1083,7 @@ fn test_mark_cache_anchors(cx: &mut App) {
     assert_eq!(
         messages_cache(&context, cx)
             .iter()
-            .filter(|(_, cache)| cache.as_ref().map_or(false, |cache| cache.is_anchor))
+            .filter(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
             .count(),
         0,
         "Messages should not be marked for cache before going over the token minimum."
@@ -1098,7 +1098,7 @@ fn test_mark_cache_anchors(cx: &mut App) {
     assert_eq!(
         messages_cache(&context, cx)
             .iter()
-            .map(|(_, cache)| cache.as_ref().map_or(false, |cache| cache.is_anchor))
+            .map(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
             .collect::<Vec<bool>>(),
         vec![true, true, false],
         "Last message should not be an anchor on speculative request."
@@ -1116,7 +1116,7 @@ fn test_mark_cache_anchors(cx: &mut App) {
     assert_eq!(
         messages_cache(&context, cx)
             .iter()
-            .map(|(_, cache)| cache.as_ref().map_or(false, |cache| cache.is_anchor))
+            .map(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
             .collect::<Vec<bool>>(),
         vec![false, true, true, false],
         "Most recent message should also be cached if not a speculative request."
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index a2b3adc686..6d13531a57 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -789,7 +789,7 @@ impl ContextStore {
         let fs = self.fs.clone();
         cx.spawn(async move |this, cx| {
             pub static ZED_STATELESS: LazyLock<bool> =
-                LazyLock::new(|| std::env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
+                LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
             if *ZED_STATELESS {
                 return Ok(());
             }
diff --git a/crates/assistant_slash_commands/src/context_server_command.rs b/crates/assistant_slash_commands/src/context_server_command.rs
index 219c3b30bc..6caa1beb3b 100644
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -62,9 +62,10 @@ impl SlashCommand for ContextServerSlashCommand {
     }
 
     fn requires_argument(&self) -> bool {
-        self.prompt.arguments.as_ref().map_or(false, |args| {
-            args.iter().any(|arg| arg.required == Some(true))
-        })
+        self.prompt
+            .arguments
+            .as_ref()
+            .is_some_and(|args| args.iter().any(|arg| arg.required == Some(true)))
     }
 
     fn complete_argument(
diff --git a/crates/assistant_slash_commands/src/diagnostics_command.rs b/crates/assistant_slash_commands/src/diagnostics_command.rs
index 45c976c826..536fe9f0ef 100644
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -61,7 +61,7 @@ impl DiagnosticsSlashCommand {
                         snapshot: worktree.snapshot(),
                         include_ignored: worktree
                             .root_entry()
-                            .map_or(false, |entry| entry.is_ignored),
+                            .is_some_and(|entry| entry.is_ignored),
                         include_root_name: true,
                         candidates: project::Candidates::Entries,
                     }
diff --git a/crates/assistant_slash_commands/src/file_command.rs b/crates/assistant_slash_commands/src/file_command.rs
index c913ccc0f1..6875189927 100644
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -92,7 +92,7 @@ impl FileSlashCommand {
                         snapshot: worktree.snapshot(),
                         include_ignored: worktree
                             .root_entry()
-                            .map_or(false, |entry| entry.is_ignored),
+                            .is_some_and(|entry| entry.is_ignored),
                         include_root_name: true,
                         candidates: project::Candidates::Entries,
                     }
@@ -536,7 +536,7 @@ mod custom_path_matcher {
             let path_str = path.to_string_lossy();
             let separator = std::path::MAIN_SEPARATOR_STR;
             if path_str.ends_with(separator) {
-                return false;
+                false
             } else {
                 self.glob.is_match(path_str.to_string() + separator)
             }
diff --git a/crates/assistant_tools/src/assistant_tools.rs b/crates/assistant_tools/src/assistant_tools.rs
index bf668e6918..f381103c27 100644
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -86,7 +86,7 @@ fn register_web_search_tool(registry: &Entity<LanguageModelRegistry>, cx: &mut A
     let using_zed_provider = registry
         .read(cx)
         .default_model()
-        .map_or(false, |default| default.is_provided_by_zed());
+        .is_some_and(|default| default.is_provided_by_zed());
     if using_zed_provider {
         ToolRegistry::global(cx).register_tool(WebSearchTool);
     } else {
diff --git a/crates/assistant_tools/src/edit_agent/evals.rs b/crates/assistant_tools/src/edit_agent/evals.rs
index 0d529a5573..ea2fa02663 100644
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1586,7 +1586,7 @@ impl EditAgentTest {
         let has_system_prompt = eval
             .conversation
             .first()
-            .map_or(false, |msg| msg.role == Role::System);
+            .is_some_and(|msg| msg.role == Role::System);
         let messages = if has_system_prompt {
             eval.conversation
         } else {
diff --git a/crates/assistant_tools/src/read_file_tool.rs b/crates/assistant_tools/src/read_file_tool.rs
index 68b870e40f..766ee3b161 100644
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -201,7 +201,7 @@ impl Tool for ReadFileTool {
                 buffer
                     .file()
                     .as_ref()
-                    .map_or(true, |file| !file.disk_state().exists())
+                    .is_none_or(|file| !file.disk_state().exists())
             })? {
                 anyhow::bail!("{file_path} not found");
             }
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index 3de22ad28d..dd0a0c8e4c 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -387,7 +387,7 @@ fn working_dir(
     let project = project.read(cx);
     let cd = &input.cd;
 
-    if cd == "." || cd == "" {
+    if cd == "." || cd.is_empty() {
         // Accept "." or "" as meaning "the one worktree" if we only have one worktree.
         let mut worktrees = project.worktrees(cx);
 
@@ -412,10 +412,8 @@ fn working_dir(
             {
                 return Ok(Some(input_path.into()));
             }
-        } else {
-            if let Some(worktree) = project.worktree_for_root_name(cd, cx) {
-                return Ok(Some(worktree.read(cx).abs_path().to_path_buf()));
-            }
+        } else if let Some(worktree) = project.worktree_for_root_name(cd, cx) {
+            return Ok(Some(worktree.read(cx).abs_path().to_path_buf()));
         }
 
         anyhow::bail!("`cd` directory {cd:?} was not in any of the project's worktrees.");
diff --git a/crates/bedrock/src/bedrock.rs b/crates/bedrock/src/bedrock.rs
index 1c6a9bd0a1..c8315d4201 100644
--- a/crates/bedrock/src/bedrock.rs
+++ b/crates/bedrock/src/bedrock.rs
@@ -54,11 +54,7 @@ pub async fn stream_completion(
         )])));
     }
 
-    if request
-        .tools
-        .as_ref()
-        .map_or(false, |t| !t.tools.is_empty())
-    {
+    if request.tools.as_ref().is_some_and(|t| !t.tools.is_empty()) {
         response = response.set_tool_config(request.tools);
     }
 
diff --git a/crates/call/src/call_impl/mod.rs b/crates/call/src/call_impl/mod.rs
index 6cc94a5dd5..156a80faba 100644
--- a/crates/call/src/call_impl/mod.rs
+++ b/crates/call/src/call_impl/mod.rs
@@ -147,7 +147,7 @@ impl ActiveCall {
             let mut incoming_call = this.incoming_call.0.borrow_mut();
             if incoming_call
                 .as_ref()
-                .map_or(false, |call| call.room_id == envelope.payload.room_id)
+                .is_some_and(|call| call.room_id == envelope.payload.room_id)
             {
                 incoming_call.take();
             }
diff --git a/crates/call/src/call_impl/participant.rs b/crates/call/src/call_impl/participant.rs
index 8e1e264a23..6fb6a2eb79 100644
--- a/crates/call/src/call_impl/participant.rs
+++ b/crates/call/src/call_impl/participant.rs
@@ -64,7 +64,7 @@ pub struct RemoteParticipant {
 
 impl RemoteParticipant {
     pub fn has_video_tracks(&self) -> bool {
-        return !self.video_tracks.is_empty();
+        !self.video_tracks.is_empty()
     }
 
     pub fn can_write(&self) -> bool {
diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
index bab99cd3f3..ffe4c6c251 100644
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -939,8 +939,7 @@ impl Room {
                                 self.client.user_id()
                             )
                         })?;
-                if self.live_kit.as_ref().map_or(true, |kit| kit.deafened) && publication.is_audio()
-                {
+                if self.live_kit.as_ref().is_none_or(|kit| kit.deafened) && publication.is_audio() {
                     publication.set_enabled(false, cx);
                 }
                 match track {
@@ -1174,7 +1173,7 @@ impl Room {
             this.update(cx, |this, cx| {
                 this.shared_projects.insert(project.downgrade());
                 let active_project = this.local_participant.active_project.as_ref();
-                if active_project.map_or(false, |location| *location == project) {
+                if active_project.is_some_and(|location| *location == project) {
                     this.set_location(Some(&project), cx)
                 } else {
                     Task::ready(Ok(()))
@@ -1247,9 +1246,9 @@ impl Room {
     }
 
     pub fn is_sharing_screen(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
-            !matches!(live_kit.screen_track, LocalTrack::None)
-        })
+        self.live_kit
+            .as_ref()
+            .is_some_and(|live_kit| !matches!(live_kit.screen_track, LocalTrack::None))
     }
 
     pub fn shared_screen_id(&self) -> Option<u64> {
@@ -1262,13 +1261,13 @@ impl Room {
     }
 
     pub fn is_sharing_mic(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
-            !matches!(live_kit.microphone_track, LocalTrack::None)
-        })
+        self.live_kit
+            .as_ref()
+            .is_some_and(|live_kit| !matches!(live_kit.microphone_track, LocalTrack::None))
     }
 
     pub fn is_muted(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
+        self.live_kit.as_ref().is_some_and(|live_kit| {
             matches!(live_kit.microphone_track, LocalTrack::None)
                 || live_kit.muted_by_user
                 || live_kit.deafened
@@ -1278,13 +1277,13 @@ impl Room {
     pub fn muted_by_user(&self) -> bool {
         self.live_kit
             .as_ref()
-            .map_or(false, |live_kit| live_kit.muted_by_user)
+            .is_some_and(|live_kit| live_kit.muted_by_user)
     }
 
     pub fn is_speaking(&self) -> bool {
         self.live_kit
             .as_ref()
-            .map_or(false, |live_kit| live_kit.speaking)
+            .is_some_and(|live_kit| live_kit.speaking)
     }
 
     pub fn is_deafened(&self) -> Option<bool> {
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index 86f307717c..baf23ac39f 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -340,7 +340,7 @@ impl ChannelChat {
                         return ControlFlow::Break(
                             if cursor
                                 .item()
-                                .map_or(false, |message| message.id == message_id)
+                                .is_some_and(|message| message.id == message_id)
                             {
                                 Some(cursor.start().1.0)
                             } else {
@@ -362,7 +362,7 @@ impl ChannelChat {
         if let ChannelMessageId::Saved(latest_message_id) = self.messages.summary().max_id
             && self
                 .last_acknowledged_id
-                .map_or(true, |acknowledged_id| acknowledged_id < latest_message_id)
+                .is_none_or(|acknowledged_id| acknowledged_id < latest_message_id)
         {
             self.rpc
                 .send(proto::AckChannelMessage {
@@ -612,7 +612,7 @@ impl ChannelChat {
                 while let Some(message) = old_cursor.item() {
                     let message_ix = old_cursor.start().1.0;
                     if nonces.contains(&message.nonce) {
-                        if ranges.last().map_or(false, |r| r.end == message_ix) {
+                        if ranges.last().is_some_and(|r| r.end == message_ix) {
                             ranges.last_mut().unwrap().end += 1;
                         } else {
                             ranges.push(message_ix..message_ix + 1);
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 42a1851408..850a494613 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -568,16 +568,14 @@ impl ChannelStore {
         self.channel_index
             .by_id()
             .get(&channel_id)
-            .map_or(false, |channel| channel.is_root_channel())
+            .is_some_and(|channel| channel.is_root_channel())
     }
 
     pub fn is_public_channel(&self, channel_id: ChannelId) -> bool {
         self.channel_index
             .by_id()
             .get(&channel_id)
-            .map_or(false, |channel| {
-                channel.visibility == ChannelVisibility::Public
-            })
+            .is_some_and(|channel| channel.visibility == ChannelVisibility::Public)
     }
 
     pub fn channel_capability(&self, channel_id: ChannelId) -> Capability {
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index d8b46dabb6..57890628f2 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -363,7 +363,7 @@ fn anonymous_fd(path: &str) -> Option<fs::File> {
 
         let fd: fd::RawFd = fd_str.parse().ok()?;
         let file = unsafe { fs::File::from_raw_fd(fd) };
-        return Some(file);
+        Some(file)
     }
     #[cfg(any(target_os = "macos", target_os = "freebsd"))]
     {
@@ -381,13 +381,13 @@ fn anonymous_fd(path: &str) -> Option<fs::File> {
         }
         let fd: fd::RawFd = fd_str.parse().ok()?;
         let file = unsafe { fs::File::from_raw_fd(fd) };
-        return Some(file);
+        Some(file)
     }
     #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "freebsd")))]
     {
         _ = path;
         // not implemented for bsd, windows. Could be, but isn't yet
-        return None;
+        None
     }
 }
 
@@ -586,7 +586,7 @@ mod flatpak {
 
     pub fn set_bin_if_no_escape(mut args: super::Args) -> super::Args {
         if env::var(NO_ESCAPE_ENV_NAME).is_ok()
-            && env::var("FLATPAK_ID").map_or(false, |id| id.starts_with("dev.zed.Zed"))
+            && env::var("FLATPAK_ID").is_ok_and(|id| id.starts_with("dev.zed.Zed"))
             && args.zed.is_none()
         {
             args.zed = Some("/app/libexec/zed-editor".into());
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 218cf2b079..058a12417a 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -76,7 +76,7 @@ pub static ZED_APP_PATH: LazyLock<Option<PathBuf>> =
     LazyLock::new(|| std::env::var("ZED_APP_PATH").ok().map(PathBuf::from));
 
 pub static ZED_ALWAYS_ACTIVE: LazyLock<bool> =
-    LazyLock::new(|| std::env::var("ZED_ALWAYS_ACTIVE").map_or(false, |e| !e.is_empty()));
+    LazyLock::new(|| std::env::var("ZED_ALWAYS_ACTIVE").is_ok_and(|e| !e.is_empty()));
 
 pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(500);
 pub const MAX_RECONNECTION_DELAY: Duration = Duration::from_secs(30);
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 722d6861ff..2599be9b16 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -848,7 +848,7 @@ impl UserStore {
 
     pub fn has_accepted_terms_of_service(&self) -> bool {
         self.accepted_tos_at
-            .map_or(false, |accepted_tos_at| accepted_tos_at.is_some())
+            .is_some_and(|accepted_tos_at| accepted_tos_at.is_some())
     }
 
     pub fn accept_terms_of_service(&self, cx: &Context<Self>) -> Task<Result<()>> {
diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
index ef9a1a9a55..92417d8319 100644
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -205,12 +205,12 @@ impl CloudApiClient {
             let mut body = String::new();
             response.body_mut().read_to_string(&mut body).await?;
             if response.status() == StatusCode::UNAUTHORIZED {
-                return Ok(false);
+                Ok(false)
             } else {
-                return Err(anyhow!(
+                Err(anyhow!(
                     "Failed to get authenticated user.\nStatus: {:?}\nBody: {body}",
                     response.status()
-                ));
+                ))
             }
         }
     }
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
index ca8a42d54d..cd4cf69f60 100644
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -304,7 +304,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                         let worktree = worktree.read(cx);
                                         worktree.is_visible()
                                             && worktree.entries(false, 0).any(|e| e.is_file())
-                                            && worktree.root_entry().map_or(false, |e| e.is_dir())
+                                            && worktree.root_entry().is_some_and(|e| e.is_dir())
                                     })
                                     .choose(rng)
                             });
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 77ce74d581..5ed3907f6c 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -890,7 +890,7 @@ impl ChatPanel {
                         this.highlighted_message = Some((highlight_message_id, task));
                     }
 
-                    if this.active_chat.as_ref().map_or(false, |(c, _)| *c == chat) {
+                    if this.active_chat.as_ref().is_some_and(|(c, _)| *c == chat) {
                         this.message_list.scroll_to(ListOffset {
                             item_ix,
                             offset_in_item: px(0.0),
@@ -1186,7 +1186,7 @@ impl Panel for ChatPanel {
                 let is_in_call = ActiveCall::global(cx)
                     .read(cx)
                     .room()
-                    .map_or(false, |room| room.read(cx).contains_guests());
+                    .is_some_and(|room| room.read(cx).contains_guests());
 
                 self.active || is_in_call
             }
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 526aacf066..0f785c1f90 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -664,9 +664,7 @@ impl CollabPanel {
 
                 let has_children = channel_store
                     .channel_at_index(mat.candidate_id + 1)
-                    .map_or(false, |next_channel| {
-                        next_channel.parent_path.ends_with(&[channel.id])
-                    });
+                    .is_some_and(|next_channel| next_channel.parent_path.ends_with(&[channel.id]));
 
                 match &self.channel_editing_state {
                     Some(ChannelEditingState::Create {
@@ -1125,7 +1123,7 @@ impl CollabPanel {
     }
 
     fn has_subchannels(&self, ix: usize) -> bool {
-        self.entries.get(ix).map_or(false, |entry| {
+        self.entries.get(ix).is_some_and(|entry| {
             if let ListEntry::Channel { has_children, .. } = entry {
                 *has_children
             } else {
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index 00c3bbf623..a900d585f8 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -497,7 +497,7 @@ impl NotificationPanel {
                 panel.is_scrolled_to_bottom()
                     && panel
                         .active_chat()
-                        .map_or(false, |chat| chat.read(cx).channel_id.0 == *channel_id)
+                        .is_some_and(|chat| chat.read(cx).channel_id.0 == *channel_id)
             } else {
                 false
             };
diff --git a/crates/credentials_provider/src/credentials_provider.rs b/crates/credentials_provider/src/credentials_provider.rs
index f72fd6c39b..2c8dd6fc81 100644
--- a/crates/credentials_provider/src/credentials_provider.rs
+++ b/crates/credentials_provider/src/credentials_provider.rs
@@ -19,7 +19,7 @@ use release_channel::ReleaseChannel;
 /// Only works in development. Setting this environment variable in other
 /// release channels is a no-op.
 static ZED_DEVELOPMENT_USE_KEYCHAIN: LazyLock<bool> = LazyLock::new(|| {
-    std::env::var("ZED_DEVELOPMENT_USE_KEYCHAIN").map_or(false, |value| !value.is_empty())
+    std::env::var("ZED_DEVELOPMENT_USE_KEYCHAIN").is_ok_and(|value| !value.is_empty())
 });
 
 /// A provider for credentials.
diff --git a/crates/dap_adapters/src/codelldb.rs b/crates/dap_adapters/src/codelldb.rs
index 842bb264a8..25dc875740 100644
--- a/crates/dap_adapters/src/codelldb.rs
+++ b/crates/dap_adapters/src/codelldb.rs
@@ -385,7 +385,7 @@ impl DebugAdapter for CodeLldbDebugAdapter {
                     && let Some(source_languages) = config.get("sourceLanguages").filter(|value| {
                         value
                             .as_array()
-                            .map_or(false, |array| array.iter().all(Value::is_string))
+                            .is_some_and(|array| array.iter().all(Value::is_string))
                     })
                 {
                     let ret = vec![
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
index 7fed761f5a..37e347282d 100644
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -37,7 +37,7 @@ const FALLBACK_DB_NAME: &str = "FALLBACK_MEMORY_DB";
 const DB_FILE_NAME: &str = "db.sqlite";
 
 pub static ZED_STATELESS: LazyLock<bool> =
-    LazyLock::new(|| env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
+    LazyLock::new(|| env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
 
 pub static ALL_FILE_DB_FAILED: LazyLock<AtomicBool> = LazyLock::new(|| AtomicBool::new(false));
 
diff --git a/crates/db/src/kvp.rs b/crates/db/src/kvp.rs
index daf0b136fd..256b789c9b 100644
--- a/crates/db/src/kvp.rs
+++ b/crates/db/src/kvp.rs
@@ -20,7 +20,7 @@ pub trait Dismissable {
         KEY_VALUE_STORE
             .read_kvp(Self::KEY)
             .log_err()
-            .map_or(false, |s| s.is_some())
+            .is_some_and(|s| s.is_some())
     }
 
     fn set_dismissed(is_dismissed: bool, cx: &mut App) {
diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rs
index e60c08cd0f..131272da6b 100644
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -392,7 +392,7 @@ impl LogStore {
                         session.label(),
                         session
                             .adapter_client()
-                            .map_or(false, |client| client.has_adapter_logs()),
+                            .is_some_and(|client| client.has_adapter_logs()),
                     )
                 });
 
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 3c1d35cdd3..449deb4ddb 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -414,7 +414,7 @@ pub(crate) fn new_debugger_pane(
                     .and_then(|item| item.downcast::<SubView>());
                 let is_hovered = as_subview
                     .as_ref()
-                    .map_or(false, |item| item.read(cx).hovered);
+                    .is_some_and(|item| item.read(cx).hovered);
 
                 h_flex()
                     .track_focus(&focus_handle)
@@ -427,7 +427,6 @@ pub(crate) fn new_debugger_pane(
                     .bg(cx.theme().colors().tab_bar_background)
                     .on_action(|_: &menu::Cancel, window, cx| {
                         if cx.stop_active_drag(window) {
-                            return;
                         } else {
                             cx.propagate();
                         }
@@ -449,7 +448,7 @@ pub(crate) fn new_debugger_pane(
                             .children(pane.items().enumerate().map(|(ix, item)| {
                                 let selected = active_pane_item
                                     .as_ref()
-                                    .map_or(false, |active| active.item_id() == item.item_id());
+                                    .is_some_and(|active| active.item_id() == item.item_id());
                                 let deemphasized = !pane.has_focus(window, cx);
                                 let item_ = item.boxed_clone();
                                 div()
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index 095b069fa3..26a26c7bef 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -528,7 +528,7 @@ impl BreakpointList {
             cx.background_executor()
                 .spawn(async move { KEY_VALUE_STORE.write_kvp(key, value?).await })
         } else {
-            return Task::ready(Result::Ok(()));
+            Task::ready(Result::Ok(()))
         }
     }
 
diff --git a/crates/diagnostics/src/diagnostic_renderer.rs b/crates/diagnostics/src/diagnostic_renderer.rs
index cb1c052925..e9731f84ce 100644
--- a/crates/diagnostics/src/diagnostic_renderer.rs
+++ b/crates/diagnostics/src/diagnostic_renderer.rs
@@ -287,15 +287,13 @@ impl DiagnosticBlock {
                     }
                 }
             }
-        } else {
-            if let Some(diagnostic) = editor
-                .snapshot(window, cx)
-                .buffer_snapshot
-                .diagnostic_group(buffer_id, group_id)
-                .nth(ix)
-            {
-                Self::jump_to(editor, diagnostic.range, window, cx)
-            }
+        } else if let Some(diagnostic) = editor
+            .snapshot(window, cx)
+            .buffer_snapshot
+            .diagnostic_group(buffer_id, group_id)
+            .nth(ix)
+        {
+            Self::jump_to(editor, diagnostic.range, window, cx)
         };
     }
 
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index c15c0f2493..2e20118381 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -383,12 +383,10 @@ impl ProjectDiagnosticsEditor {
             } else {
                 self.update_all_diagnostics(false, window, cx);
             }
+        } else if self.update_excerpts_task.is_some() {
+            self.update_excerpts_task = None;
         } else {
-            if self.update_excerpts_task.is_some() {
-                self.update_excerpts_task = None;
-            } else {
-                self.update_all_diagnostics(false, window, cx);
-            }
+            self.update_all_diagnostics(false, window, cx);
         }
         cx.notify();
     }
@@ -542,7 +540,7 @@ impl ProjectDiagnosticsEditor {
                     return true;
                 }
                 this.diagnostics.insert(buffer_id, diagnostics.clone());
-                return false;
+                false
             })?;
             if unchanged {
                 return Ok(());
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index 29011352fb..6ac0f49fad 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -295,7 +295,7 @@ fn dump_all_gpui_actions() -> Vec<ActionDef> {
 
     actions.sort_by_key(|a| a.name);
 
-    return actions;
+    actions
 }
 
 fn handle_postprocessing() -> Result<()> {
diff --git a/crates/edit_prediction_button/src/edit_prediction_button.rs b/crates/edit_prediction_button/src/edit_prediction_button.rs
index 4632a03daf..21c934fefa 100644
--- a/crates/edit_prediction_button/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_button/src/edit_prediction_button.rs
@@ -185,7 +185,7 @@ impl Render for EditPredictionButton {
                 let this = cx.entity();
                 let fs = self.fs.clone();
 
-                return div().child(
+                div().child(
                     PopoverMenu::new("supermaven")
                         .menu(move |window, cx| match &status {
                             SupermavenButtonStatus::NeedsActivation(activate_url) => {
@@ -230,7 +230,7 @@ impl Render for EditPredictionButton {
                             },
                         )
                         .with_handle(self.popover_menu_handle.clone()),
-                );
+                )
             }
 
             EditPredictionProvider::Zed => {
@@ -343,7 +343,7 @@ impl Render for EditPredictionButton {
                 let is_refreshing = self
                     .edit_prediction_provider
                     .as_ref()
-                    .map_or(false, |provider| provider.is_refreshing(cx));
+                    .is_some_and(|provider| provider.is_refreshing(cx));
 
                 if is_refreshing {
                     popover_menu = popover_menu.trigger(
diff --git a/crates/editor/src/clangd_ext.rs b/crates/editor/src/clangd_ext.rs
index 07be9ea9e9..c78d4c83c0 100644
--- a/crates/editor/src/clangd_ext.rs
+++ b/crates/editor/src/clangd_ext.rs
@@ -13,7 +13,7 @@ use crate::{Editor, SwitchSourceHeader, element::register_action};
 use project::lsp_store::clangd_ext::CLANGD_SERVER_NAME;
 
 fn is_c_language(language: &Language) -> bool {
-    return language.name() == "C++".into() || language.name() == "C".into();
+    language.name() == "C++".into() || language.name() == "C".into()
 }
 
 pub fn switch_source_header(
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 24d2cfddcb..4847bc2565 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1111,10 +1111,8 @@ impl CompletionsMenu {
             let query_start_doesnt_match_split_words = query_start_lower
                 .map(|query_char| {
                     !split_words(&string_match.string).any(|word| {
-                        word.chars()
-                            .next()
-                            .and_then(|c| c.to_lowercase().next())
-                            .map_or(false, |word_char| word_char == query_char)
+                        word.chars().next().and_then(|c| c.to_lowercase().next())
+                            == Some(query_char)
                     })
                 })
                 .unwrap_or(false);
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index cc1cc2c440..c16e4a6ddb 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -991,7 +991,7 @@ impl DisplaySnapshot {
             if let Some(severity) = chunk.diagnostic_severity.filter(|severity| {
                 self.diagnostics_max_severity
                     .into_lsp()
-                    .map_or(false, |max_severity| severity <= &max_severity)
+                    .is_some_and(|max_severity| severity <= &max_severity)
             }) {
                 if chunk.is_unnecessary {
                     diagnostic_highlight.fade_out = Some(editor_style.unnecessary_code_fade);
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 5ae37d20fa..5d5c9500eb 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -528,10 +528,7 @@ impl BlockMap {
             if let Some(transform) = cursor.item()
                 && transform.summary.input_rows > 0
                 && cursor.end() == old_start
-                && transform
-                    .block
-                    .as_ref()
-                    .map_or(true, |b| !b.is_replacement())
+                && transform.block.as_ref().is_none_or(|b| !b.is_replacement())
             {
                 // Preserve the transform (push and next)
                 new_transforms.push(transform.clone(), &());
@@ -539,7 +536,7 @@ impl BlockMap {
 
                 // Preserve below blocks at end of edit
                 while let Some(transform) = cursor.item() {
-                    if transform.block.as_ref().map_or(false, |b| b.place_below()) {
+                    if transform.block.as_ref().is_some_and(|b| b.place_below()) {
                         new_transforms.push(transform.clone(), &());
                         cursor.next();
                     } else {
@@ -606,7 +603,7 @@ impl BlockMap {
 
             // Discard below blocks at the end of the edit. They'll be reconstructed.
             while let Some(transform) = cursor.item() {
-                if transform.block.as_ref().map_or(false, |b| b.place_below()) {
+                if transform.block.as_ref().is_some_and(|b| b.place_below()) {
                     cursor.next();
                 } else {
                     break;
@@ -1328,7 +1325,7 @@ impl BlockSnapshot {
         let Dimensions(output_start, input_start, _) = cursor.start();
         let overshoot = if cursor
             .item()
-            .map_or(false, |transform| transform.block.is_none())
+            .is_some_and(|transform| transform.block.is_none())
         {
             start_row.0 - output_start.0
         } else {
@@ -1358,7 +1355,7 @@ impl BlockSnapshot {
                         && transform
                             .block
                             .as_ref()
-                            .map_or(false, |block| block.height() > 0))
+                            .is_some_and(|block| block.height() > 0))
                 {
                     break;
                 }
@@ -1511,7 +1508,7 @@ impl BlockSnapshot {
     pub(super) fn is_block_line(&self, row: BlockRow) -> bool {
         let mut cursor = self.transforms.cursor::<Dimensions<BlockRow, WrapRow>>(&());
         cursor.seek(&row, Bias::Right);
-        cursor.item().map_or(false, |t| t.block.is_some())
+        cursor.item().is_some_and(|t| t.block.is_some())
     }
 
     pub(super) fn is_folded_buffer_header(&self, row: BlockRow) -> bool {
@@ -1529,11 +1526,11 @@ impl BlockSnapshot {
             .make_wrap_point(Point::new(row.0, 0), Bias::Left);
         let mut cursor = self.transforms.cursor::<Dimensions<WrapRow, BlockRow>>(&());
         cursor.seek(&WrapRow(wrap_point.row()), Bias::Right);
-        cursor.item().map_or(false, |transform| {
+        cursor.item().is_some_and(|transform| {
             transform
                 .block
                 .as_ref()
-                .map_or(false, |block| block.is_replacement())
+                .is_some_and(|block| block.is_replacement())
         })
     }
 
@@ -1653,7 +1650,7 @@ impl BlockChunks<'_> {
             if transform
                 .block
                 .as_ref()
-                .map_or(false, |block| block.height() == 0)
+                .is_some_and(|block| block.height() == 0)
             {
                 self.transforms.next();
             } else {
@@ -1664,7 +1661,7 @@ impl BlockChunks<'_> {
         if self
             .transforms
             .item()
-            .map_or(false, |transform| transform.block.is_none())
+            .is_some_and(|transform| transform.block.is_none())
         {
             let start_input_row = self.transforms.start().1.0;
             let start_output_row = self.transforms.start().0.0;
@@ -1774,7 +1771,7 @@ impl Iterator for BlockRows<'_> {
                 if transform
                     .block
                     .as_ref()
-                    .map_or(false, |block| block.height() == 0)
+                    .is_some_and(|block| block.height() == 0)
                 {
                     self.transforms.next();
                 } else {
@@ -1786,7 +1783,7 @@ impl Iterator for BlockRows<'_> {
             if transform
                 .block
                 .as_ref()
-                .map_or(true, |block| block.is_replacement())
+                .is_none_or(|block| block.is_replacement())
             {
                 self.input_rows.seek(self.transforms.start().1.0);
             }
diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs
index 3509bcbba8..3dcd172c3c 100644
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -491,14 +491,14 @@ impl FoldMap {
 
                 while folds
                     .peek()
-                    .map_or(false, |(_, fold_range)| fold_range.start < edit.new.end)
+                    .is_some_and(|(_, fold_range)| fold_range.start < edit.new.end)
                 {
                     let (fold, mut fold_range) = folds.next().unwrap();
                     let sum = new_transforms.summary();
 
                     assert!(fold_range.start.0 >= sum.input.len);
 
-                    while folds.peek().map_or(false, |(next_fold, next_fold_range)| {
+                    while folds.peek().is_some_and(|(next_fold, next_fold_range)| {
                         next_fold_range.start < fold_range.end
                             || (next_fold_range.start == fold_range.end
                                 && fold.placeholder.merge_adjacent
@@ -575,14 +575,14 @@ impl FoldMap {
 
                 for mut edit in inlay_edits {
                     old_transforms.seek(&edit.old.start, Bias::Left);
-                    if old_transforms.item().map_or(false, |t| t.is_fold()) {
+                    if old_transforms.item().is_some_and(|t| t.is_fold()) {
                         edit.old.start = old_transforms.start().0;
                     }
                     let old_start =
                         old_transforms.start().1.0 + (edit.old.start - old_transforms.start().0).0;
 
                     old_transforms.seek_forward(&edit.old.end, Bias::Right);
-                    if old_transforms.item().map_or(false, |t| t.is_fold()) {
+                    if old_transforms.item().is_some_and(|t| t.is_fold()) {
                         old_transforms.next();
                         edit.old.end = old_transforms.start().0;
                     }
@@ -590,14 +590,14 @@ impl FoldMap {
                         old_transforms.start().1.0 + (edit.old.end - old_transforms.start().0).0;
 
                     new_transforms.seek(&edit.new.start, Bias::Left);
-                    if new_transforms.item().map_or(false, |t| t.is_fold()) {
+                    if new_transforms.item().is_some_and(|t| t.is_fold()) {
                         edit.new.start = new_transforms.start().0;
                     }
                     let new_start =
                         new_transforms.start().1.0 + (edit.new.start - new_transforms.start().0).0;
 
                     new_transforms.seek_forward(&edit.new.end, Bias::Right);
-                    if new_transforms.item().map_or(false, |t| t.is_fold()) {
+                    if new_transforms.item().is_some_and(|t| t.is_fold()) {
                         new_transforms.next();
                         edit.new.end = new_transforms.start().0;
                     }
@@ -709,7 +709,7 @@ impl FoldSnapshot {
             .transforms
             .cursor::<Dimensions<InlayPoint, FoldPoint>>(&());
         cursor.seek(&point, Bias::Right);
-        if cursor.item().map_or(false, |t| t.is_fold()) {
+        if cursor.item().is_some_and(|t| t.is_fold()) {
             if bias == Bias::Left || point == cursor.start().0 {
                 cursor.start().1
             } else {
@@ -788,7 +788,7 @@ impl FoldSnapshot {
         let inlay_offset = self.inlay_snapshot.to_inlay_offset(buffer_offset);
         let mut cursor = self.transforms.cursor::<InlayOffset>(&());
         cursor.seek(&inlay_offset, Bias::Right);
-        cursor.item().map_or(false, |t| t.placeholder.is_some())
+        cursor.item().is_some_and(|t| t.placeholder.is_some())
     }
 
     pub fn is_line_folded(&self, buffer_row: MultiBufferRow) -> bool {
@@ -839,7 +839,7 @@ impl FoldSnapshot {
 
         let inlay_end = if transform_cursor
             .item()
-            .map_or(true, |transform| transform.is_fold())
+            .is_none_or(|transform| transform.is_fold())
         {
             inlay_start
         } else if range.end < transform_end.0 {
@@ -1348,7 +1348,7 @@ impl FoldChunks<'_> {
         let inlay_end = if self
             .transform_cursor
             .item()
-            .map_or(true, |transform| transform.is_fold())
+            .is_none_or(|transform| transform.is_fold())
         {
             inlay_start
         } else if range.end < transform_end.0 {
@@ -1463,7 +1463,7 @@ impl FoldOffset {
             .transforms
             .cursor::<Dimensions<FoldOffset, TransformSummary>>(&());
         cursor.seek(&self, Bias::Right);
-        let overshoot = if cursor.item().map_or(true, |t| t.is_fold()) {
+        let overshoot = if cursor.item().is_none_or(|t| t.is_fold()) {
             Point::new(0, (self.0 - cursor.start().0.0) as u32)
         } else {
             let inlay_offset = cursor.start().1.input.len + self.0 - cursor.start().0.0;
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index 626dbf5cba..3db9d10fdc 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -625,7 +625,7 @@ impl InlayMap {
                 // we can push its remainder.
                 if buffer_edits_iter
                     .peek()
-                    .map_or(true, |edit| edit.old.start >= cursor.end().0)
+                    .is_none_or(|edit| edit.old.start >= cursor.end().0)
                 {
                     let transform_start = new_transforms.summary().input.len;
                     let transform_end =
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
index 7aa252a7f3..500ec3a0bb 100644
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -74,10 +74,10 @@ impl WrapRows<'_> {
         self.transforms
             .seek(&WrapPoint::new(start_row, 0), Bias::Left);
         let mut input_row = self.transforms.start().1.row();
-        if self.transforms.item().map_or(false, |t| t.is_isomorphic()) {
+        if self.transforms.item().is_some_and(|t| t.is_isomorphic()) {
             input_row += start_row - self.transforms.start().0.row();
         }
-        self.soft_wrapped = self.transforms.item().map_or(false, |t| !t.is_isomorphic());
+        self.soft_wrapped = self.transforms.item().is_some_and(|t| !t.is_isomorphic());
         self.input_buffer_rows.seek(input_row);
         self.input_buffer_row = self.input_buffer_rows.next().unwrap();
         self.output_row = start_row;
@@ -603,7 +603,7 @@ impl WrapSnapshot {
             .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
         transforms.seek(&output_start, Bias::Right);
         let mut input_start = TabPoint(transforms.start().1.0);
-        if transforms.item().map_or(false, |t| t.is_isomorphic()) {
+        if transforms.item().is_some_and(|t| t.is_isomorphic()) {
             input_start.0 += output_start.0 - transforms.start().0.0;
         }
         let input_end = self
@@ -634,7 +634,7 @@ impl WrapSnapshot {
         cursor.seek(&WrapPoint::new(row + 1, 0), Bias::Left);
         if cursor
             .item()
-            .map_or(false, |transform| transform.is_isomorphic())
+            .is_some_and(|transform| transform.is_isomorphic())
         {
             let overshoot = row - cursor.start().0.row();
             let tab_row = cursor.start().1.row() + overshoot;
@@ -732,10 +732,10 @@ impl WrapSnapshot {
             .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
         transforms.seek(&WrapPoint::new(start_row, 0), Bias::Left);
         let mut input_row = transforms.start().1.row();
-        if transforms.item().map_or(false, |t| t.is_isomorphic()) {
+        if transforms.item().is_some_and(|t| t.is_isomorphic()) {
             input_row += start_row - transforms.start().0.row();
         }
-        let soft_wrapped = transforms.item().map_or(false, |t| !t.is_isomorphic());
+        let soft_wrapped = transforms.item().is_some_and(|t| !t.is_isomorphic());
         let mut input_buffer_rows = self.tab_snapshot.rows(input_row);
         let input_buffer_row = input_buffer_rows.next().unwrap();
         WrapRows {
@@ -754,7 +754,7 @@ impl WrapSnapshot {
             .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
         cursor.seek(&point, Bias::Right);
         let mut tab_point = cursor.start().1.0;
-        if cursor.item().map_or(false, |t| t.is_isomorphic()) {
+        if cursor.item().is_some_and(|t| t.is_isomorphic()) {
             tab_point += point.0 - cursor.start().0.0;
         }
         TabPoint(tab_point)
@@ -780,7 +780,7 @@ impl WrapSnapshot {
         if bias == Bias::Left {
             let mut cursor = self.transforms.cursor::<WrapPoint>(&());
             cursor.seek(&point, Bias::Right);
-            if cursor.item().map_or(false, |t| !t.is_isomorphic()) {
+            if cursor.item().is_some_and(|t| !t.is_isomorphic()) {
                 point = *cursor.start();
                 *point.column_mut() -= 1;
             }
@@ -901,7 +901,7 @@ impl WrapChunks<'_> {
         let output_end = WrapPoint::new(rows.end, 0);
         self.transforms.seek(&output_start, Bias::Right);
         let mut input_start = TabPoint(self.transforms.start().1.0);
-        if self.transforms.item().map_or(false, |t| t.is_isomorphic()) {
+        if self.transforms.item().is_some_and(|t| t.is_isomorphic()) {
             input_start.0 += output_start.0 - self.transforms.start().0.0;
         }
         let input_end = self
@@ -993,7 +993,7 @@ impl Iterator for WrapRows<'_> {
         self.output_row += 1;
         self.transforms
             .seek_forward(&WrapPoint::new(self.output_row, 0), Bias::Left);
-        if self.transforms.item().map_or(false, |t| t.is_isomorphic()) {
+        if self.transforms.item().is_some_and(|t| t.is_isomorphic()) {
             self.input_buffer_row = self.input_buffer_rows.next().unwrap();
             self.soft_wrapped = false;
         } else {
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index ca1f1f8828..7c36a41046 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1429,7 +1429,7 @@ impl SelectionHistory {
         if self
             .undo_stack
             .back()
-            .map_or(true, |e| e.selections != entry.selections)
+            .is_none_or(|e| e.selections != entry.selections)
         {
             self.undo_stack.push_back(entry);
             if self.undo_stack.len() > MAX_SELECTION_HISTORY_LEN {
@@ -1442,7 +1442,7 @@ impl SelectionHistory {
         if self
             .redo_stack
             .back()
-            .map_or(true, |e| e.selections != entry.selections)
+            .is_none_or(|e| e.selections != entry.selections)
         {
             self.redo_stack.push_back(entry);
             if self.redo_stack.len() > MAX_SELECTION_HISTORY_LEN {
@@ -2512,9 +2512,7 @@ impl Editor {
             .context_menu
             .borrow()
             .as_ref()
-            .map_or(false, |context| {
-                matches!(context, CodeContextMenu::Completions(_))
-            });
+            .is_some_and(|context| matches!(context, CodeContextMenu::Completions(_)));
 
         showing_completions
             || self.edit_prediction_requires_modifier()
@@ -2545,7 +2543,7 @@ impl Editor {
                 || binding
                     .keystrokes()
                     .first()
-                    .map_or(false, |keystroke| keystroke.modifiers.modified())
+                    .is_some_and(|keystroke| keystroke.modifiers.modified())
         }))
     }
 
@@ -2941,7 +2939,7 @@ impl Editor {
             return false;
         };
 
-        scope.override_name().map_or(false, |scope_name| {
+        scope.override_name().is_some_and(|scope_name| {
             settings
                 .edit_predictions_disabled_in
                 .iter()
@@ -4033,18 +4031,18 @@ impl Editor {
                             let following_text_allows_autoclose = snapshot
                                 .chars_at(selection.start)
                                 .next()
-                                .map_or(true, |c| scope.should_autoclose_before(c));
+                                .is_none_or(|c| scope.should_autoclose_before(c));
 
                             let preceding_text_allows_autoclose = selection.start.column == 0
-                                || snapshot.reversed_chars_at(selection.start).next().map_or(
-                                    true,
-                                    |c| {
+                                || snapshot
+                                    .reversed_chars_at(selection.start)
+                                    .next()
+                                    .is_none_or(|c| {
                                         bracket_pair.start != bracket_pair.end
                                             || !snapshot
                                                 .char_classifier_at(selection.start)
                                                 .is_word(c)
-                                    },
-                                );
+                                    });
 
                             let is_closing_quote = if bracket_pair.end == bracket_pair.start
                                 && bracket_pair.start.len() == 1
@@ -4185,7 +4183,7 @@ impl Editor {
             if !self.linked_edit_ranges.is_empty() {
                 let start_anchor = snapshot.anchor_before(selection.start);
 
-                let is_word_char = text.chars().next().map_or(true, |char| {
+                let is_word_char = text.chars().next().is_none_or(|char| {
                     let classifier = snapshot
                         .char_classifier_at(start_anchor.to_offset(&snapshot))
                         .ignore_punctuation(true);
@@ -5427,11 +5425,11 @@ impl Editor {
 
         let sort_completions = provider
             .as_ref()
-            .map_or(false, |provider| provider.sort_completions());
+            .is_some_and(|provider| provider.sort_completions());
 
         let filter_completions = provider
             .as_ref()
-            .map_or(true, |provider| provider.filter_completions());
+            .is_none_or(|provider| provider.filter_completions());
 
         let trigger_kind = match trigger {
             Some(trigger) if buffer.read(cx).completion_triggers().contains(trigger) => {
@@ -5537,7 +5535,7 @@ impl Editor {
 
         let skip_digits = query
             .as_ref()
-            .map_or(true, |query| !query.chars().any(|c| c.is_digit(10)));
+            .is_none_or(|query| !query.chars().any(|c| c.is_digit(10)));
 
         let (mut words, provider_responses) = match &provider {
             Some(provider) => {
@@ -5971,7 +5969,7 @@ impl Editor {
         let show_new_completions_on_confirm = completion
             .confirm
             .as_ref()
-            .map_or(false, |confirm| confirm(intent, window, cx));
+            .is_some_and(|confirm| confirm(intent, window, cx));
         if show_new_completions_on_confirm {
             self.show_completions(&ShowCompletions { trigger: None }, window, cx);
         }
@@ -6103,10 +6101,10 @@ impl Editor {
             let spawn_straight_away = quick_launch
                 && resolved_tasks
                     .as_ref()
-                    .map_or(false, |tasks| tasks.templates.len() == 1)
+                    .is_some_and(|tasks| tasks.templates.len() == 1)
                 && code_actions
                     .as_ref()
-                    .map_or(true, |actions| actions.is_empty())
+                    .is_none_or(|actions| actions.is_empty())
                 && debug_scenarios.is_empty();
 
             editor.update_in(cx, |editor, window, cx| {
@@ -6720,9 +6718,9 @@ impl Editor {
 
                     let buffer_id = cursor_position.buffer_id;
                     let buffer = this.buffer.read(cx);
-                    if !buffer
+                    if buffer
                         .text_anchor_for_position(cursor_position, cx)
-                        .map_or(false, |(buffer, _)| buffer == cursor_buffer)
+                        .is_none_or(|(buffer, _)| buffer != cursor_buffer)
                     {
                         return;
                     }
@@ -6972,9 +6970,7 @@ impl Editor {
             || self
                 .quick_selection_highlight_task
                 .as_ref()
-                .map_or(true, |(prev_anchor_range, _)| {
-                    prev_anchor_range != &query_range
-                })
+                .is_none_or(|(prev_anchor_range, _)| prev_anchor_range != &query_range)
         {
             let multi_buffer_visible_start = self
                 .scroll_manager
@@ -7003,9 +6999,7 @@ impl Editor {
             || self
                 .debounced_selection_highlight_task
                 .as_ref()
-                .map_or(true, |(prev_anchor_range, _)| {
-                    prev_anchor_range != &query_range
-                })
+                .is_none_or(|(prev_anchor_range, _)| prev_anchor_range != &query_range)
         {
             let multi_buffer_start = multi_buffer_snapshot
                 .anchor_before(0)
@@ -7140,9 +7134,7 @@ impl Editor {
             && self
                 .edit_prediction_provider
                 .as_ref()
-                .map_or(false, |provider| {
-                    provider.provider.show_completions_in_menu()
-                });
+                .is_some_and(|provider| provider.provider.show_completions_in_menu());
 
         let preview_requires_modifier =
             all_language_settings(file, cx).edit_predictions_mode() == EditPredictionsMode::Subtle;
@@ -7726,7 +7718,7 @@ impl Editor {
             || self
                 .active_edit_prediction
                 .as_ref()
-                .map_or(false, |completion| {
+                .is_some_and(|completion| {
                     let invalidation_range = completion.invalidation_range.to_offset(&multibuffer);
                     let invalidation_range = invalidation_range.start..=invalidation_range.end;
                     !invalidation_range.contains(&offset_selection.head())
@@ -8427,7 +8419,7 @@ impl Editor {
                 .context_menu
                 .borrow()
                 .as_ref()
-                .map_or(false, |menu| menu.visible())
+                .is_some_and(|menu| menu.visible())
     }
 
     pub fn context_menu_origin(&self) -> Option<ContextMenuOrigin> {
@@ -8973,9 +8965,8 @@ impl Editor {
                     let end_row = start_row + line_count as u32;
                     visible_row_range.contains(&start_row)
                         && visible_row_range.contains(&end_row)
-                        && cursor_row.map_or(true, |cursor_row| {
-                            !((start_row..end_row).contains(&cursor_row))
-                        })
+                        && cursor_row
+                            .is_none_or(|cursor_row| !((start_row..end_row).contains(&cursor_row)))
                 })?;
 
             content_origin
@@ -9585,7 +9576,7 @@ impl Editor {
                 .tabstops
                 .iter()
                 .map(|tabstop| {
-                    let is_end_tabstop = tabstop.ranges.first().map_or(false, |tabstop| {
+                    let is_end_tabstop = tabstop.ranges.first().is_some_and(|tabstop| {
                         tabstop.is_empty() && tabstop.start == snippet.text.len() as isize
                     });
                     let mut tabstop_ranges = tabstop
@@ -11716,7 +11707,7 @@ impl Editor {
                     let transpose_start = display_map
                         .buffer_snapshot
                         .clip_offset(transpose_offset.saturating_sub(1), Bias::Left);
-                    if edits.last().map_or(true, |e| e.0.end <= transpose_start) {
+                    if edits.last().is_none_or(|e| e.0.end <= transpose_start) {
                         let transpose_end = display_map
                             .buffer_snapshot
                             .clip_offset(transpose_offset + 1, Bias::Right);
@@ -16229,23 +16220,21 @@ impl Editor {
 
         if split {
             workspace.split_item(SplitDirection::Right, item.clone(), window, cx);
-        } else {
-            if PreviewTabsSettings::get_global(cx).enable_preview_from_code_navigation {
-                let (preview_item_id, preview_item_idx) =
-                    workspace.active_pane().read_with(cx, |pane, _| {
-                        (pane.preview_item_id(), pane.preview_item_idx())
-                    });
+        } else if PreviewTabsSettings::get_global(cx).enable_preview_from_code_navigation {
+            let (preview_item_id, preview_item_idx) =
+                workspace.active_pane().read_with(cx, |pane, _| {
+                    (pane.preview_item_id(), pane.preview_item_idx())
+                });
 
-                workspace.add_item_to_active_pane(item.clone(), preview_item_idx, true, window, cx);
+            workspace.add_item_to_active_pane(item.clone(), preview_item_idx, true, window, cx);
 
-                if let Some(preview_item_id) = preview_item_id {
-                    workspace.active_pane().update(cx, |pane, cx| {
-                        pane.remove_item(preview_item_id, false, false, window, cx);
-                    });
-                }
-            } else {
-                workspace.add_item_to_active_pane(item.clone(), None, true, window, cx);
+            if let Some(preview_item_id) = preview_item_id {
+                workspace.active_pane().update(cx, |pane, cx| {
+                    pane.remove_item(preview_item_id, false, false, window, cx);
+                });
             }
+        } else {
+            workspace.add_item_to_active_pane(item.clone(), None, true, window, cx);
         }
         workspace.active_pane().update(cx, |pane, cx| {
             pane.set_preview_item_id(Some(item_id), cx);
@@ -19010,7 +18999,7 @@ impl Editor {
 
     fn has_blame_entries(&self, cx: &App) -> bool {
         self.blame()
-            .map_or(false, |blame| blame.read(cx).has_generated_entries())
+            .is_some_and(|blame| blame.read(cx).has_generated_entries())
     }
 
     fn newest_selection_head_on_empty_line(&self, cx: &App) -> bool {
@@ -19660,7 +19649,7 @@ impl Editor {
     pub fn has_background_highlights<T: 'static>(&self) -> bool {
         self.background_highlights
             .get(&HighlightKey::Type(TypeId::of::<T>()))
-            .map_or(false, |(_, highlights)| !highlights.is_empty())
+            .is_some_and(|(_, highlights)| !highlights.is_empty())
     }
 
     pub fn background_highlights_in_range(
@@ -20582,7 +20571,7 @@ impl Editor {
     // For now, don't allow opening excerpts in buffers that aren't backed by
     // regular project files.
     fn can_open_excerpts_in_file(file: Option<&Arc<dyn language::File>>) -> bool {
-        file.map_or(true, |file| project::File::from_dyn(Some(file)).is_some())
+        file.is_none_or(|file| project::File::from_dyn(Some(file)).is_some())
     }
 
     fn marked_text_ranges(&self, cx: &App) -> Option<Vec<Range<OffsetUtf16>>> {
@@ -21125,7 +21114,7 @@ impl Editor {
 
     pub fn has_visible_completions_menu(&self) -> bool {
         !self.edit_prediction_preview_is_active()
-            && self.context_menu.borrow().as_ref().map_or(false, |menu| {
+            && self.context_menu.borrow().as_ref().is_some_and(|menu| {
                 menu.visible() && matches!(menu, CodeContextMenu::Completions(_))
             })
     }
@@ -21548,9 +21537,9 @@ fn is_grapheme_whitespace(text: &str) -> bool {
 }
 
 fn should_stay_with_preceding_ideograph(text: &str) -> bool {
-    text.chars().next().map_or(false, |ch| {
-        matches!(ch, '。' | '、' | '，' | '？' | '！' | '：' | '；' | '…')
-    })
+    text.chars()
+        .next()
+        .is_some_and(|ch| matches!(ch, '。' | '、' | '，' | '？' | '！' | '：' | '；' | '…'))
 }
 
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
@@ -21589,11 +21578,11 @@ impl<'a> Iterator for WordBreakingTokenizer<'a> {
             } else {
                 let mut words = self.input[offset..].split_word_bound_indices().peekable();
                 let mut next_word_bound = words.peek().copied();
-                if next_word_bound.map_or(false, |(i, _)| i == 0) {
+                if next_word_bound.is_some_and(|(i, _)| i == 0) {
                     next_word_bound = words.next();
                 }
                 while let Some(grapheme) = iter.peek().copied() {
-                    if next_word_bound.map_or(false, |(i, _)| i == offset) {
+                    if next_word_bound.is_some_and(|(i, _)| i == offset) {
                         break;
                     };
                     if is_grapheme_whitespace(grapheme) != is_whitespace
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index d3a21c7642..1d7e04cae0 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -810,10 +810,8 @@ impl Settings for EditorSettings {
             if gutter.line_numbers.is_some() {
                 old_gutter.line_numbers = gutter.line_numbers
             }
-        } else {
-            if gutter != GutterContent::default() {
-                current.gutter = Some(gutter)
-            }
+        } else if gutter != GutterContent::default() {
+            current.gutter = Some(gutter)
         }
         if let Some(b) = vscode.read_bool("editor.scrollBeyondLastLine") {
             current.scroll_beyond_last_line = Some(if b {
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index d8fe3ccf15..c14e49fc1d 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -919,6 +919,7 @@ impl EditorElement {
         {
             #[allow(
                 clippy::collapsible_if,
+                clippy::needless_return,
                 reason = "The cfg-block below makes this a false positive"
             )]
             if !text_hitbox.is_hovered(window) || editor.read_only(cx) {
@@ -1126,26 +1127,24 @@ impl EditorElement {
 
         let hovered_diff_hunk_row = if let Some(control_row) = hovered_diff_control {
             Some(control_row)
-        } else {
-            if text_hovered {
-                let current_row = valid_point.row();
-                position_map.display_hunks.iter().find_map(|(hunk, _)| {
-                    if let DisplayDiffHunk::Unfolded {
-                        display_row_range, ..
-                    } = hunk
-                    {
-                        if display_row_range.contains(&current_row) {
-                            Some(display_row_range.start)
-                        } else {
-                            None
-                        }
+        } else if text_hovered {
+            let current_row = valid_point.row();
+            position_map.display_hunks.iter().find_map(|(hunk, _)| {
+                if let DisplayDiffHunk::Unfolded {
+                    display_row_range, ..
+                } = hunk
+                {
+                    if display_row_range.contains(&current_row) {
+                        Some(display_row_range.start)
                     } else {
                         None
                     }
-                })
-            } else {
-                None
-            }
+                } else {
+                    None
+                }
+            })
+        } else {
+            None
         };
 
         if hovered_diff_hunk_row != editor.hovered_diff_hunk_row {
@@ -1159,11 +1158,11 @@ impl EditorElement {
                 .inline_blame_popover
                 .as_ref()
                 .and_then(|state| state.popover_bounds)
-                .map_or(false, |bounds| bounds.contains(&event.position));
+                .is_some_and(|bounds| bounds.contains(&event.position));
             let keyboard_grace = editor
                 .inline_blame_popover
                 .as_ref()
-                .map_or(false, |state| state.keyboard_grace);
+                .is_some_and(|state| state.keyboard_grace);
 
             if mouse_over_inline_blame || mouse_over_popover {
                 editor.show_blame_popover(blame_entry, event.position, false, cx);
@@ -1190,10 +1189,10 @@ impl EditorElement {
                 let is_visible = editor
                     .gutter_breakpoint_indicator
                     .0
-                    .map_or(false, |indicator| indicator.is_active);
+                    .is_some_and(|indicator| indicator.is_active);
 
                 let has_existing_breakpoint =
-                    editor.breakpoint_store.as_ref().map_or(false, |store| {
+                    editor.breakpoint_store.as_ref().is_some_and(|store| {
                         let Some(project) = &editor.project else {
                             return false;
                         };
@@ -2220,12 +2219,11 @@ impl EditorElement {
                 cmp::max(padded_line, min_start)
             };
 
-            let behind_edit_prediction_popover = edit_prediction_popover_origin.as_ref().map_or(
-                false,
-                |edit_prediction_popover_origin| {
+            let behind_edit_prediction_popover = edit_prediction_popover_origin
+                .as_ref()
+                .is_some_and(|edit_prediction_popover_origin| {
                     (pos_y..pos_y + line_height).contains(&edit_prediction_popover_origin.y)
-                },
-            );
+                });
             let opacity = if behind_edit_prediction_popover {
                 0.5
             } else {
@@ -2291,9 +2289,7 @@ impl EditorElement {
                         None
                     }
                 })
-                .map_or(false, |source| {
-                    matches!(source, CodeActionSource::Indicator(..))
-                });
+                .is_some_and(|source| matches!(source, CodeActionSource::Indicator(..)));
             Some(editor.render_inline_code_actions(icon_size, display_point.row(), active, cx))
         })?;
 
@@ -2909,7 +2905,7 @@ impl EditorElement {
                         if multibuffer_row
                             .0
                             .checked_sub(1)
-                            .map_or(false, |previous_row| {
+                            .is_some_and(|previous_row| {
                                 snapshot.is_line_folded(MultiBufferRow(previous_row))
                             })
                         {
@@ -3900,7 +3896,7 @@ impl EditorElement {
         for (row, block) in fixed_blocks {
             let block_id = block.id();
 
-            if focused_block.as_ref().map_or(false, |b| b.id == block_id) {
+            if focused_block.as_ref().is_some_and(|b| b.id == block_id) {
                 focused_block = None;
             }
 
@@ -3957,7 +3953,7 @@ impl EditorElement {
             };
             let block_id = block.id();
 
-            if focused_block.as_ref().map_or(false, |b| b.id == block_id) {
+            if focused_block.as_ref().is_some_and(|b| b.id == block_id) {
                 focused_block = None;
             }
 
@@ -4736,7 +4732,7 @@ impl EditorElement {
                 }
             };
 
-            let source_included = source_display_point.map_or(true, |source_display_point| {
+            let source_included = source_display_point.is_none_or(|source_display_point| {
                 visible_range
                     .to_inclusive()
                     .contains(&source_display_point.row())
@@ -4916,7 +4912,7 @@ impl EditorElement {
         let intersects_menu = |bounds: Bounds<Pixels>| -> bool {
             context_menu_layout
                 .as_ref()
-                .map_or(false, |menu| bounds.intersects(&menu.bounds))
+                .is_some_and(|menu| bounds.intersects(&menu.bounds))
         };
 
         let can_place_above = {
@@ -5101,7 +5097,7 @@ impl EditorElement {
 
                 if active_positions
                     .iter()
-                    .any(|p| p.map_or(false, |p| display_row_range.contains(&p.row())))
+                    .any(|p| p.is_some_and(|p| display_row_range.contains(&p.row())))
                 {
                     let y = display_row_range.start.as_f32() * line_height
                         + text_hitbox.bounds.top()
@@ -5214,7 +5210,7 @@ impl EditorElement {
         let intersects_menu = |bounds: Bounds<Pixels>| -> bool {
             context_menu_layout
                 .as_ref()
-                .map_or(false, |menu| bounds.intersects(&menu.bounds))
+                .is_some_and(|menu| bounds.intersects(&menu.bounds))
         };
 
         let final_origin = if popover_bounds_above.is_contained_within(hitbox)
@@ -5299,7 +5295,7 @@ impl EditorElement {
                     let mut end_row = start_row.0;
                     while active_rows
                         .peek()
-                        .map_or(false, |(active_row, has_selection)| {
+                        .is_some_and(|(active_row, has_selection)| {
                             active_row.0 == end_row + 1
                                 && has_selection.selection == contains_non_empty_selection.selection
                         })
@@ -6687,25 +6683,23 @@ impl EditorElement {
                                 editor.set_scroll_position(position, window, cx);
                             }
                             cx.stop_propagation();
-                        } else {
-                            if minimap_hitbox.is_hovered(window) {
-                                editor.scroll_manager.set_is_hovering_minimap_thumb(
-                                    !event.dragging()
-                                        && layout
-                                            .thumb_layout
-                                            .thumb_bounds
-                                            .is_some_and(|bounds| bounds.contains(&event.position)),
-                                    cx,
-                                );
+                        } else if minimap_hitbox.is_hovered(window) {
+                            editor.scroll_manager.set_is_hovering_minimap_thumb(
+                                !event.dragging()
+                                    && layout
+                                        .thumb_layout
+                                        .thumb_bounds
+                                        .is_some_and(|bounds| bounds.contains(&event.position)),
+                                cx,
+                            );
 
-                                // Stop hover events from propagating to the
-                                // underlying editor if the minimap hitbox is hovered
-                                if !event.dragging() {
-                                    cx.stop_propagation();
-                                }
-                            } else {
-                                editor.scroll_manager.hide_minimap_thumb(cx);
+                            // Stop hover events from propagating to the
+                            // underlying editor if the minimap hitbox is hovered
+                            if !event.dragging() {
+                                cx.stop_propagation();
                             }
+                        } else {
+                            editor.scroll_manager.hide_minimap_thumb(cx);
                         }
                         mouse_position = event.position;
                     });
@@ -7084,9 +7078,7 @@ impl EditorElement {
         let unstaged_hollow = ProjectSettings::get_global(cx)
             .git
             .hunk_style
-            .map_or(false, |style| {
-                matches!(style, GitHunkStyleSetting::UnstagedHollow)
-            });
+            .is_some_and(|style| matches!(style, GitHunkStyleSetting::UnstagedHollow));
 
         unstaged == unstaged_hollow
     }
@@ -8183,7 +8175,7 @@ impl Element for EditorElement {
                     let is_row_soft_wrapped = |row: usize| {
                         row_infos
                             .get(row)
-                            .map_or(true, |info| info.buffer_row.is_none())
+                            .is_none_or(|info| info.buffer_row.is_none())
                     };
 
                     let start_anchor = if start_row == Default::default() {
@@ -9718,14 +9710,12 @@ impl PointForPosition {
             false
         } else if start_row == end_row {
             candidate_col >= start_col && candidate_col < end_col
+        } else if candidate_row == start_row {
+            candidate_col >= start_col
+        } else if candidate_row == end_row {
+            candidate_col < end_col
         } else {
-            if candidate_row == start_row {
-                candidate_col >= start_col
-            } else if candidate_row == end_row {
-                candidate_col < end_col
-            } else {
-                true
-            }
+            true
         }
     }
 }
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index 712325f339..2f6106c86c 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -415,7 +415,7 @@ impl GitBlame {
             let old_end = cursor.end();
             if row_edits
                 .peek()
-                .map_or(true, |next_edit| next_edit.old.start >= old_end)
+                .is_none_or(|next_edit| next_edit.old.start >= old_end)
                 && let Some(entry) = cursor.item()
             {
                 if old_end > edit.old.end {
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 358d8683fe..04e66a234c 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -271,7 +271,7 @@ impl Editor {
             Task::ready(Ok(Navigated::No))
         };
         self.select(SelectPhase::End, window, cx);
-        return navigate_task;
+        navigate_task
     }
 }
 
@@ -871,7 +871,7 @@ fn surrounding_filename(
         .peekable();
     while let Some(ch) = forwards.next() {
         // Skip escaped whitespace
-        if ch == '\\' && forwards.peek().map_or(false, |ch| ch.is_whitespace()) {
+        if ch == '\\' && forwards.peek().is_some_and(|ch| ch.is_whitespace()) {
             token_end += ch.len_utf8();
             let whitespace = forwards.next().unwrap();
             token_end += whitespace.len_utf8();
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 136b0b314d..e3d2f92c55 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -201,7 +201,7 @@ impl FollowableItem for Editor {
         if buffer
             .as_singleton()
             .and_then(|buffer| buffer.read(cx).file())
-            .map_or(false, |file| file.is_private())
+            .is_some_and(|file| file.is_private())
         {
             return None;
         }
@@ -715,7 +715,7 @@ impl Item for Editor {
             .read(cx)
             .as_singleton()
             .and_then(|buffer| buffer.read(cx).file())
-            .map_or(false, |file| file.disk_state() == DiskState::Deleted);
+            .is_some_and(|file| file.disk_state() == DiskState::Deleted);
 
         h_flex()
             .gap_2()
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
index cae4b565b4..13e5d0a8c7 100644
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -86,9 +86,9 @@ pub(crate) fn should_auto_close(
         });
     }
     if to_auto_edit.is_empty() {
-        return None;
+        None
     } else {
-        return Some(to_auto_edit);
+        Some(to_auto_edit)
     }
 }
 
@@ -186,7 +186,7 @@ pub(crate) fn generate_auto_close_edits(
                     let range = node_name.byte_range();
                     return buffer.text_for_range(range).equals_str(name);
                 }
-                return is_empty;
+                is_empty
             };
 
             let tree_root_node = {
@@ -227,7 +227,7 @@ pub(crate) fn generate_auto_close_edits(
                             let has_open_tag_with_same_tag_name = ancestor
                                 .named_child(0)
                                 .filter(|n| n.kind() == config.open_tag_node_name)
-                                .map_or(false, |element_open_tag_node| {
+                                .is_some_and(|element_open_tag_node| {
                                     tag_node_name_equals(&element_open_tag_node, &tag_name)
                                 });
                             if has_open_tag_with_same_tag_name {
@@ -263,8 +263,7 @@ pub(crate) fn generate_auto_close_edits(
             }
 
             let is_after_open_tag = |node: &Node| {
-                return node.start_byte() < open_tag.start_byte()
-                    && node.end_byte() < open_tag.start_byte();
+                node.start_byte() < open_tag.start_byte() && node.end_byte() < open_tag.start_byte()
             };
 
             // perf: use cursor for more efficient traversal
@@ -301,7 +300,7 @@ pub(crate) fn generate_auto_close_edits(
         let edit_range = edit_anchor..edit_anchor;
         edits.push((edit_range, format!("</{}>", tag_name)));
     }
-    return Ok(edits);
+    Ok(edits)
 }
 
 pub(crate) fn refresh_enabled_in_any_buffer(
@@ -367,7 +366,7 @@ pub(crate) fn construct_initial_buffer_versions_map<
             initial_buffer_versions.insert(buffer_id, buffer_version);
         }
     }
-    return initial_buffer_versions;
+    initial_buffer_versions
 }
 
 pub(crate) fn handle_from(
@@ -455,12 +454,9 @@ pub(crate) fn handle_from(
             let ensure_no_edits_since_start = || -> Option<()> {
                 let has_edits_since_start = this
                     .read_with(cx, |this, cx| {
-                        this.buffer
-                            .read(cx)
-                            .buffer(buffer_id)
-                            .map_or(true, |buffer| {
-                                buffer.read(cx).has_edits_since(&buffer_version_initial)
-                            })
+                        this.buffer.read(cx).buffer(buffer_id).is_none_or(|buffer| {
+                            buffer.read(cx).has_edits_since(&buffer_version_initial)
+                        })
                     })
                     .ok()?;
 
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
index 7f9eb374e8..5cf22de537 100644
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -61,13 +61,13 @@ impl MouseContextMenu {
             source,
             offset: position - (source_position + content_origin),
         };
-        return Some(MouseContextMenu::new(
+        Some(MouseContextMenu::new(
             editor,
             menu_position,
             context_menu,
             window,
             cx,
-        ));
+        ))
     }
 
     pub(crate) fn new(
diff --git a/crates/editor/src/tasks.rs b/crates/editor/src/tasks.rs
index 0d497e4cac..8be2a3a2e1 100644
--- a/crates/editor/src/tasks.rs
+++ b/crates/editor/src/tasks.rs
@@ -89,7 +89,7 @@ impl Editor {
                     .lsp_task_source()?;
                 if lsp_settings
                     .get(&lsp_tasks_source)
-                    .map_or(true, |s| s.enable_lsp_tasks)
+                    .is_none_or(|s| s.enable_lsp_tasks)
                 {
                     let buffer_id = buffer.read(cx).remote_id();
                     Some((lsp_tasks_source, buffer_id))
diff --git a/crates/eval/src/assertions.rs b/crates/eval/src/assertions.rs
index 489e4aa22e..01fac186d3 100644
--- a/crates/eval/src/assertions.rs
+++ b/crates/eval/src/assertions.rs
@@ -54,7 +54,7 @@ impl AssertionsReport {
     pub fn passed_count(&self) -> usize {
         self.ran
             .iter()
-            .filter(|a| a.result.as_ref().map_or(false, |result| result.passed))
+            .filter(|a| a.result.as_ref().is_ok_and(|result| result.passed))
             .count()
     }
 
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index 809b530ed7..1d2bece5cc 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -112,7 +112,7 @@ fn main() {
         let telemetry = app_state.client.telemetry();
         telemetry.start(system_id, installation_id, session_id, cx);
 
-        let enable_telemetry = env::var("ZED_EVAL_TELEMETRY").map_or(false, |value| value == "1")
+        let enable_telemetry = env::var("ZED_EVAL_TELEMETRY").is_ok_and(|value| value == "1")
             && telemetry.has_checksum_seed();
         if enable_telemetry {
             println!("Telemetry enabled");
diff --git a/crates/eval/src/examples/add_arg_to_trait_method.rs b/crates/eval/src/examples/add_arg_to_trait_method.rs
index 9c538f9260..084f12bc62 100644
--- a/crates/eval/src/examples/add_arg_to_trait_method.rs
+++ b/crates/eval/src/examples/add_arg_to_trait_method.rs
@@ -70,10 +70,10 @@ impl Example for AddArgToTraitMethod {
             let path_str = format!("crates/assistant_tools/src/{}.rs", tool_name);
             let edits = edits.get(Path::new(&path_str));
 
-            let ignored = edits.map_or(false, |edits| {
+            let ignored = edits.is_some_and(|edits| {
                 edits.has_added_line("        _window: Option<gpui::AnyWindowHandle>,\n")
             });
-            let uningored = edits.map_or(false, |edits| {
+            let uningored = edits.is_some_and(|edits| {
                 edits.has_added_line("        window: Option<gpui::AnyWindowHandle>,\n")
             });
 
@@ -89,7 +89,7 @@ impl Example for AddArgToTraitMethod {
         let batch_tool_edits = edits.get(Path::new("crates/assistant_tools/src/batch_tool.rs"));
 
         cx.assert(
-            batch_tool_edits.map_or(false, |edits| {
+            batch_tool_edits.is_some_and(|edits| {
                 edits.has_added_line("        window: Option<gpui::AnyWindowHandle>,\n")
             }),
             "Argument:   batch_tool",
diff --git a/crates/extension/src/extension_builder.rs b/crates/extension/src/extension_builder.rs
index b80525798b..432adaf4bc 100644
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -401,7 +401,7 @@ impl ExtensionBuilder {
         let mut clang_path = wasi_sdk_dir.clone();
         clang_path.extend(["bin", &format!("clang{}", env::consts::EXE_SUFFIX)]);
 
-        if fs::metadata(&clang_path).map_or(false, |metadata| metadata.is_file()) {
+        if fs::metadata(&clang_path).is_ok_and(|metadata| metadata.is_file()) {
             return Ok(clang_path);
         }
 
diff --git a/crates/extension/src/extension_events.rs b/crates/extension/src/extension_events.rs
index b151b3f412..94f3277b05 100644
--- a/crates/extension/src/extension_events.rs
+++ b/crates/extension/src/extension_events.rs
@@ -19,9 +19,8 @@ pub struct ExtensionEvents;
 impl ExtensionEvents {
     /// Returns the global [`ExtensionEvents`].
     pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        return cx
-            .try_global::<GlobalExtensionEvents>()
-            .map(|g| g.0.clone());
+        cx.try_global::<GlobalExtensionEvents>()
+            .map(|g| g.0.clone())
     }
 
     fn new(_cx: &mut Context<Self>) -> Self {
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 01edb5c033..1a05dbc570 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -562,12 +562,12 @@ impl ExtensionStore {
                 extensions
                     .into_iter()
                     .filter(|extension| {
-                        this.extension_index.extensions.get(&extension.id).map_or(
-                            true,
-                            |installed_extension| {
+                        this.extension_index
+                            .extensions
+                            .get(&extension.id)
+                            .is_none_or(|installed_extension| {
                                 installed_extension.manifest.version != extension.manifest.version
-                            },
-                        )
+                            })
                     })
                     .collect()
             })
@@ -1451,7 +1451,7 @@ impl ExtensionStore {
 
                     if extension_dir
                         .file_name()
-                        .map_or(false, |file_name| file_name == ".DS_Store")
+                        .is_some_and(|file_name| file_name == ".DS_Store")
                     {
                         continue;
                     }
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 7c12571f24..49ccfcc85c 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -14,7 +14,7 @@ struct FeatureFlags {
 }
 
 pub static ZED_DISABLE_STAFF: LazyLock<bool> = LazyLock::new(|| {
-    std::env::var("ZED_DISABLE_STAFF").map_or(false, |value| !value.is_empty() && value != "0")
+    std::env::var("ZED_DISABLE_STAFF").is_ok_and(|value| !value.is_empty() && value != "0")
 });
 
 impl FeatureFlags {
diff --git a/crates/feedback/src/system_specs.rs b/crates/feedback/src/system_specs.rs
index 7c002d90e9..b5ccaca689 100644
--- a/crates/feedback/src/system_specs.rs
+++ b/crates/feedback/src/system_specs.rs
@@ -135,7 +135,7 @@ impl Display for SystemSpecs {
 fn try_determine_available_gpus() -> Option<String> {
     #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     {
-        return std::process::Command::new("vulkaninfo")
+        std::process::Command::new("vulkaninfo")
             .args(&["--summary"])
             .output()
             .ok()
@@ -150,11 +150,11 @@ fn try_determine_available_gpus() -> Option<String> {
                 ]
                 .join("\n")
             })
-            .or(Some("Failed to run `vulkaninfo --summary`".to_string()));
+            .or(Some("Failed to run `vulkaninfo --summary`".to_string()))
     }
     #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
     {
-        return None;
+        None
     }
 }
 
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index aebc262af0..3a08ec08e0 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -878,9 +878,7 @@ impl FileFinderDelegate {
                 PathMatchCandidateSet {
                     snapshot: worktree.snapshot(),
                     include_ignored: self.include_ignored.unwrap_or_else(|| {
-                        worktree
-                            .root_entry()
-                            .map_or(false, |entry| entry.is_ignored)
+                        worktree.root_entry().is_some_and(|entry| entry.is_ignored)
                     }),
                     include_root_name,
                     candidates: project::Candidates::Files,
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index 3a99afc8cb..77acdf8097 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -728,7 +728,7 @@ impl PickerDelegate for OpenPathDelegate {
                         .child(LabelLike::new().child(label_with_highlights)),
                 )
             }
-            DirectoryState::None { .. } => return None,
+            DirectoryState::None { .. } => None,
         }
     }
 
diff --git a/crates/file_icons/src/file_icons.rs b/crates/file_icons/src/file_icons.rs
index 82a8e05d85..42c00fb12d 100644
--- a/crates/file_icons/src/file_icons.rs
+++ b/crates/file_icons/src/file_icons.rs
@@ -72,7 +72,7 @@ impl FileIcons {
                 return maybe_path;
             }
         }
-        return this.get_icon_for_type("default", cx);
+        this.get_icon_for_type("default", cx)
     }
 
     fn default_icon_theme(cx: &App) -> Option<Arc<IconTheme>> {
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 399c0f3e32..d17cbdcf51 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -625,13 +625,13 @@ impl Fs for RealFs {
     async fn is_file(&self, path: &Path) -> bool {
         smol::fs::metadata(path)
             .await
-            .map_or(false, |metadata| metadata.is_file())
+            .is_ok_and(|metadata| metadata.is_file())
     }
 
     async fn is_dir(&self, path: &Path) -> bool {
         smol::fs::metadata(path)
             .await
-            .map_or(false, |metadata| metadata.is_dir())
+            .is_ok_and(|metadata| metadata.is_dir())
     }
 
     async fn metadata(&self, path: &Path) -> Result<Option<Metadata>> {
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index c30b789d9f..edcad514bb 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -269,10 +269,8 @@ impl GitExcludeOverride {
     pub async fn restore_original(&mut self) -> Result<()> {
         if let Some(ref original) = self.original_excludes {
             smol::fs::write(&self.git_exclude_path, original).await?;
-        } else {
-            if self.git_exclude_path.exists() {
-                smol::fs::remove_file(&self.git_exclude_path).await?;
-            }
+        } else if self.git_exclude_path.exists() {
+            smol::fs::remove_file(&self.git_exclude_path).await?;
         }
 
         self.added_excludes = None;
@@ -2052,7 +2050,7 @@ fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
 }
 
 fn parse_upstream_track(upstream_track: &str) -> Result<UpstreamTracking> {
-    if upstream_track == "" {
+    if upstream_track.is_empty() {
         return Ok(UpstreamTracking::Tracked(UpstreamTrackingStatus {
             ahead: 0,
             behind: 0,
diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs
index 07896b0c01..d428ccbb05 100644
--- a/crates/git_ui/src/commit_view.rs
+++ b/crates/git_ui/src/commit_view.rs
@@ -88,11 +88,10 @@ impl CommitView {
                             let ix = pane.items().position(|item| {
                                 let commit_view = item.downcast::<CommitView>();
                                 commit_view
-                                    .map_or(false, |view| view.read(cx).commit.sha == commit.sha)
+                                    .is_some_and(|view| view.read(cx).commit.sha == commit.sha)
                             });
                             if let Some(ix) = ix {
                                 pane.activate_item(ix, true, true, window, cx);
-                                return;
                             } else {
                                 pane.add_item(Box::new(commit_view), true, true, None, window, cx);
                             }
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 82870b4e75..ace3a8eb15 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -775,7 +775,7 @@ impl GitPanel {
 
         if window
             .focused(cx)
-            .map_or(false, |focused| self.focus_handle == focused)
+            .is_some_and(|focused| self.focus_handle == focused)
         {
             dispatch_context.add("menu");
             dispatch_context.add("ChangesList");
@@ -894,9 +894,7 @@ impl GitPanel {
         let have_entries = self
             .active_repository
             .as_ref()
-            .map_or(false, |active_repository| {
-                active_repository.read(cx).status_summary().count > 0
-            });
+            .is_some_and(|active_repository| active_repository.read(cx).status_summary().count > 0);
         if have_entries && self.selected_entry.is_none() {
             self.selected_entry = Some(1);
             self.scroll_to_selected_entry(cx);
@@ -1207,9 +1205,7 @@ impl GitPanel {
                 })
                 .ok();
             }
-            _ => {
-                return;
-            }
+            _ => {}
         })
         .detach();
     }
@@ -1640,13 +1636,12 @@ impl GitPanel {
     fn has_commit_message(&self, cx: &mut Context<Self>) -> bool {
         let text = self.commit_editor.read(cx).text(cx);
         if !text.trim().is_empty() {
-            return true;
+            true
         } else if text.is_empty() {
-            return self
-                .suggest_commit_message(cx)
-                .is_some_and(|text| !text.trim().is_empty());
+            self.suggest_commit_message(cx)
+                .is_some_and(|text| !text.trim().is_empty())
         } else {
-            return false;
+            false
         }
     }
 
@@ -2938,8 +2933,7 @@ impl GitPanel {
             .matches(git::repository::REMOTE_CANCELLED_BY_USER)
             .next()
             .is_some()
-        {
-            return; // Hide the cancelled by user message
+        { // Hide the cancelled by user message
         } else {
             workspace.update(cx, |workspace, cx| {
                 let workspace_weak = cx.weak_entity();
@@ -3272,12 +3266,10 @@ impl GitPanel {
             } else {
                 "Amend Tracked"
             }
+        } else if self.has_staged_changes() {
+            "Commit"
         } else {
-            if self.has_staged_changes() {
-                "Commit"
-            } else {
-                "Commit Tracked"
-            }
+            "Commit Tracked"
         }
     }
 
@@ -4498,7 +4490,7 @@ impl Render for GitPanel {
 
         let has_write_access = self.has_write_access(cx);
 
-        let has_co_authors = room.map_or(false, |room| {
+        let has_co_authors = room.is_some_and(|room| {
             self.load_local_committer(cx);
             let room = room.read(cx);
             room.remote_participants()
@@ -4814,12 +4806,10 @@ impl RenderOnce for PanelRepoFooter {
 
         // ideally, show the whole branch and repo names but
         // when we can't, use a budget to allocate space between the two
-        let (repo_display_len, branch_display_len) = if branch_actual_len + repo_actual_len
-            <= LABEL_CHARACTER_BUDGET
-        {
-            (repo_actual_len, branch_actual_len)
-        } else {
-            if branch_actual_len <= MAX_BRANCH_LEN {
+        let (repo_display_len, branch_display_len) =
+            if branch_actual_len + repo_actual_len <= LABEL_CHARACTER_BUDGET {
+                (repo_actual_len, branch_actual_len)
+            } else if branch_actual_len <= MAX_BRANCH_LEN {
                 let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
                 (repo_space, branch_actual_len)
             } else if repo_actual_len <= MAX_REPO_LEN {
@@ -4827,8 +4817,7 @@ impl RenderOnce for PanelRepoFooter {
                 (repo_actual_len, branch_space)
             } else {
                 (MAX_REPO_LEN, MAX_BRANCH_LEN)
-            }
-        };
+            };
 
         let truncated_repo_name = if repo_actual_len <= repo_display_len {
             active_repo_name.to_string()
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 3c0898fabf..c12ef58ce2 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -329,14 +329,14 @@ impl ProjectDiff {
             })
             .ok();
 
-        return ButtonStates {
+        ButtonStates {
             stage: has_unstaged_hunks,
             unstage: has_staged_hunks,
             prev_next,
             selection,
             stage_all,
             unstage_all,
-        };
+        }
     }
 
     fn handle_editor_event(
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index 9d918048fa..23729be062 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -129,7 +129,7 @@ impl CursorPosition {
                                                 cursor_position.selected_count.lines += 1;
                                             }
                                         }
-                                        if last_selection.as_ref().map_or(true, |last_selection| {
+                                        if last_selection.as_ref().is_none_or(|last_selection| {
                                             selection.id > last_selection.id
                                         }) {
                                             last_selection = Some(selection);
diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
index a1b5ca3a03..ca0aa309b1 100644
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -477,10 +477,10 @@ impl<'de> Deserialize<'de> for ModelName {
                 model_id: id.to_string(),
             })
         } else {
-            return Err(serde::de::Error::custom(format!(
+            Err(serde::de::Error::custom(format!(
                 "Expected model name to begin with {}, got: {}",
                 MODEL_NAME_PREFIX, string
-            )));
+            )))
         }
     }
 }
diff --git a/crates/gpui/src/app/entity_map.rs b/crates/gpui/src/app/entity_map.rs
index 48b2bcaf98..6099ee5857 100644
--- a/crates/gpui/src/app/entity_map.rs
+++ b/crates/gpui/src/app/entity_map.rs
@@ -786,7 +786,7 @@ impl<T: 'static> PartialOrd for WeakEntity<T> {
 
 #[cfg(any(test, feature = "leak-detection"))]
 static LEAK_BACKTRACE: std::sync::LazyLock<bool> =
-    std::sync::LazyLock::new(|| std::env::var("LEAK_BACKTRACE").map_or(false, |b| !b.is_empty()));
+    std::sync::LazyLock::new(|| std::env::var("LEAK_BACKTRACE").is_ok_and(|b| !b.is_empty()));
 
 #[cfg(any(test, feature = "leak-detection"))]
 #[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq)]
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 7b689ca0ad..c9826b704e 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -2274,7 +2274,7 @@ impl Interactivity {
                 window.on_mouse_event(move |_: &MouseDownEvent, phase, window, _cx| {
                     if phase == DispatchPhase::Bubble && !window.default_prevented() {
                         let group_hovered = active_group_hitbox
-                            .map_or(false, |group_hitbox_id| group_hitbox_id.is_hovered(window));
+                            .is_some_and(|group_hitbox_id| group_hitbox_id.is_hovered(window));
                         let element_hovered = hitbox.is_hovered(window);
                         if group_hovered || element_hovered {
                             *active_state.borrow_mut() = ElementClickedState {
@@ -2614,7 +2614,7 @@ pub(crate) fn register_tooltip_mouse_handlers(
     window.on_mouse_event({
         let active_tooltip = active_tooltip.clone();
         move |_: &MouseDownEvent, _phase, window: &mut Window, _cx| {
-            if !tooltip_id.map_or(false, |tooltip_id| tooltip_id.is_hovered(window)) {
+            if !tooltip_id.is_some_and(|tooltip_id| tooltip_id.is_hovered(window)) {
                 clear_active_tooltip_if_not_hoverable(&active_tooltip, window);
             }
         }
@@ -2623,7 +2623,7 @@ pub(crate) fn register_tooltip_mouse_handlers(
     window.on_mouse_event({
         let active_tooltip = active_tooltip.clone();
         move |_: &ScrollWheelEvent, _phase, window: &mut Window, _cx| {
-            if !tooltip_id.map_or(false, |tooltip_id| tooltip_id.is_hovered(window)) {
+            if !tooltip_id.is_some_and(|tooltip_id| tooltip_id.is_hovered(window)) {
                 clear_active_tooltip_if_not_hoverable(&active_tooltip, window);
             }
         }
diff --git a/crates/gpui/src/elements/image_cache.rs b/crates/gpui/src/elements/image_cache.rs
index 263f0aafc2..ee1436134a 100644
--- a/crates/gpui/src/elements/image_cache.rs
+++ b/crates/gpui/src/elements/image_cache.rs
@@ -64,7 +64,7 @@ mod any_image_cache {
         cx: &mut App,
     ) -> Option<Result<Arc<RenderImage>, ImageCacheError>> {
         let image_cache = image_cache.clone().downcast::<I>().unwrap();
-        return image_cache.update(cx, |image_cache, cx| image_cache.load(resource, window, cx));
+        image_cache.update(cx, |image_cache, cx| image_cache.load(resource, window, cx))
     }
 }
 
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 98b63ef907..6758f4eee1 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -938,9 +938,10 @@ impl Element for List {
         let hitbox = window.insert_hitbox(bounds, HitboxBehavior::Normal);
 
         // If the width of the list has changed, invalidate all cached item heights
-        if state.last_layout_bounds.map_or(true, |last_bounds| {
-            last_bounds.size.width != bounds.size.width
-        }) {
+        if state
+            .last_layout_bounds
+            .is_none_or(|last_bounds| last_bounds.size.width != bounds.size.width)
+        {
             let new_items = SumTree::from_iter(
                 state.items.iter().map(|item| ListItem::Unmeasured {
                     focus_handle: item.focus_handle(),
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index f682b78c41..95374e579f 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -458,7 +458,7 @@ impl DispatchTree {
             .keymap
             .borrow()
             .bindings_for_input(input, &context_stack);
-        return (bindings, partial, context_stack);
+        (bindings, partial, context_stack)
     }
 
     /// dispatch_key processes the keystroke
@@ -639,10 +639,7 @@ mod tests {
         }
 
         fn partial_eq(&self, action: &dyn Action) -> bool {
-            action
-                .as_any()
-                .downcast_ref::<Self>()
-                .map_or(false, |a| self == a)
+            action.as_any().downcast_ref::<Self>() == Some(self)
         }
 
         fn boxed_clone(&self) -> std::boxed::Box<dyn Action> {
diff --git a/crates/gpui/src/keymap/context.rs b/crates/gpui/src/keymap/context.rs
index 281035fe97..976f99c26e 100644
--- a/crates/gpui/src/keymap/context.rs
+++ b/crates/gpui/src/keymap/context.rs
@@ -287,7 +287,7 @@ impl KeyBindingContextPredicate {
                         return false;
                     }
                 }
-                return true;
+                true
             }
             // Workspace > Pane > Editor
             //
@@ -305,7 +305,7 @@ impl KeyBindingContextPredicate {
                         return true;
                     }
                 }
-                return false;
+                false
             }
             Self::And(left, right) => {
                 left.eval_inner(contexts, all_contexts) && right.eval_inner(contexts, all_contexts)
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 3e002309e4..1df8a608f4 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -592,7 +592,7 @@ impl PlatformTextSystem for NoopTextSystem {
     }
 
     fn font_id(&self, _descriptor: &Font) -> Result<FontId> {
-        return Ok(FontId(1));
+        Ok(FontId(1))
     }
 
     fn font_metrics(&self, _font_id: FontId) -> FontMetrics {
diff --git a/crates/gpui/src/platform/blade/blade_context.rs b/crates/gpui/src/platform/blade/blade_context.rs
index 48872f1619..12c68a1e70 100644
--- a/crates/gpui/src/platform/blade/blade_context.rs
+++ b/crates/gpui/src/platform/blade/blade_context.rs
@@ -49,7 +49,7 @@ fn parse_pci_id(id: &str) -> anyhow::Result<u32> {
         "Expected a 4 digit PCI ID in hexadecimal format"
     );
 
-    return u32::from_str_radix(id, 16).context("parsing PCI ID as hex");
+    u32::from_str_radix(id, 16).context("parsing PCI ID as hex")
 }
 
 #[cfg(test)]
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index a1da088b75..ed824744a9 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -441,7 +441,7 @@ impl<P: LinuxClient + 'static> Platform for P {
     fn app_path(&self) -> Result<PathBuf> {
         // get the path of the executable of the current process
         let app_path = env::current_exe()?;
-        return Ok(app_path);
+        Ok(app_path)
     }
 
     fn set_menus(&self, menus: Vec<Menu>, _keymap: &Keymap) {
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index d1aa590192..3278dfbe38 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -710,9 +710,7 @@ impl LinuxClient for WaylandClient {
     fn set_cursor_style(&self, style: CursorStyle) {
         let mut state = self.0.borrow_mut();
 
-        let need_update = state
-            .cursor_style
-            .map_or(true, |current_style| current_style != style);
+        let need_update = state.cursor_style != Some(style);
 
         if need_update {
             let serial = state.serial_tracker.get(SerialKind::MouseEnter);
@@ -1577,7 +1575,7 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                     if state
                         .keyboard_focused_window
                         .as_ref()
-                        .map_or(false, |keyboard_window| window.ptr_eq(keyboard_window))
+                        .is_some_and(|keyboard_window| window.ptr_eq(keyboard_window))
                     {
                         state.enter_token = None;
                     }
diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs
index 7cf2d02d3b..1d1166a56c 100644
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -669,8 +669,8 @@ impl WaylandWindowStatePtr {
     pub fn set_size_and_scale(&self, size: Option<Size<Pixels>>, scale: Option<f32>) {
         let (size, scale) = {
             let mut state = self.state.borrow_mut();
-            if size.map_or(true, |size| size == state.bounds.size)
-                && scale.map_or(true, |scale| scale == state.scale)
+            if size.is_none_or(|size| size == state.bounds.size)
+                && scale.is_none_or(|scale| scale == state.scale)
             {
                 return;
             }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index b4914c9dd2..e422af961f 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -1586,11 +1586,11 @@ impl LinuxClient for X11Client {
 
     fn read_from_primary(&self) -> Option<crate::ClipboardItem> {
         let state = self.0.borrow_mut();
-        return state
+        state
             .clipboard
             .get_any(clipboard::ClipboardKind::Primary)
             .context("X11: Failed to read from clipboard (primary)")
-            .log_with_level(log::Level::Debug);
+            .log_with_level(log::Level::Debug)
     }
 
     fn read_from_clipboard(&self) -> Option<crate::ClipboardItem> {
@@ -1603,11 +1603,11 @@ impl LinuxClient for X11Client {
         {
             return state.clipboard_item.clone();
         }
-        return state
+        state
             .clipboard
             .get_any(clipboard::ClipboardKind::Clipboard)
             .context("X11: Failed to read from clipboard (clipboard)")
-            .log_with_level(log::Level::Debug);
+            .log_with_level(log::Level::Debug)
     }
 
     fn run(&self) {
@@ -2010,12 +2010,12 @@ fn check_gtk_frame_extents_supported(
 }
 
 fn xdnd_is_atom_supported(atom: u32, atoms: &XcbAtoms) -> bool {
-    return atom == atoms.TEXT
+    atom == atoms.TEXT
         || atom == atoms.STRING
         || atom == atoms.UTF8_STRING
         || atom == atoms.TEXT_PLAIN
         || atom == atoms.TEXT_PLAIN_UTF8
-        || atom == atoms.TextUriList;
+        || atom == atoms.TextUriList
 }
 
 fn xdnd_get_supported_atom(
@@ -2043,7 +2043,7 @@ fn xdnd_get_supported_atom(
             }
         }
     }
-    return 0;
+    0
 }
 
 fn xdnd_send_finished(
@@ -2144,7 +2144,7 @@ fn current_pointer_device_states(
     if pointer_device_states.is_empty() {
         log::error!("Found no xinput mouse pointers.");
     }
-    return Some(pointer_device_states);
+    Some(pointer_device_states)
 }
 
 /// Returns true if the device is a pointer device. Does not include pointer device groups.
diff --git a/crates/gpui/src/platform/linux/x11/clipboard.rs b/crates/gpui/src/platform/linux/x11/clipboard.rs
index 5b32f2c93e..a6f96d38c4 100644
--- a/crates/gpui/src/platform/linux/x11/clipboard.rs
+++ b/crates/gpui/src/platform/linux/x11/clipboard.rs
@@ -1078,11 +1078,11 @@ impl Clipboard {
         } else {
             String::from_utf8(result.bytes).map_err(|_| Error::ConversionFailure)?
         };
-        return Ok(ClipboardItem::new_string(text));
+        Ok(ClipboardItem::new_string(text))
     }
 
     pub fn is_owner(&self, selection: ClipboardKind) -> bool {
-        return self.inner.is_owner(selection).unwrap_or(false);
+        self.inner.is_owner(selection).unwrap_or(false)
     }
 }
 
diff --git a/crates/gpui/src/platform/linux/x11/event.rs b/crates/gpui/src/platform/linux/x11/event.rs
index a566762c54..17bcc908d3 100644
--- a/crates/gpui/src/platform/linux/x11/event.rs
+++ b/crates/gpui/src/platform/linux/x11/event.rs
@@ -104,7 +104,7 @@ fn bit_is_set_in_vec(bit_vec: &Vec<u32>, bit_index: u16) -> bool {
     let array_index = bit_index as usize / 32;
     bit_vec
         .get(array_index)
-        .map_or(false, |bits| bit_is_set(*bits, bit_index % 32))
+        .is_some_and(|bits| bit_is_set(*bits, bit_index % 32))
 }
 
 fn bit_is_set(bits: u32, bit_index: u16) -> bool {
diff --git a/crates/gpui/src/platform/mac/events.rs b/crates/gpui/src/platform/mac/events.rs
index 0dc361b9dc..50a516cb38 100644
--- a/crates/gpui/src/platform/mac/events.rs
+++ b/crates/gpui/src/platform/mac/events.rs
@@ -311,9 +311,8 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
         let mut shift = modifiers.contains(NSEventModifierFlags::NSShiftKeyMask);
         let command = modifiers.contains(NSEventModifierFlags::NSCommandKeyMask);
         let function = modifiers.contains(NSEventModifierFlags::NSFunctionKeyMask)
-            && first_char.map_or(true, |ch| {
-                !(NSUpArrowFunctionKey..=NSModeSwitchFunctionKey).contains(&ch)
-            });
+            && first_char
+                .is_none_or(|ch| !(NSUpArrowFunctionKey..=NSModeSwitchFunctionKey).contains(&ch));
 
         #[allow(non_upper_case_globals)]
         let key = match first_char {
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 57dfa9c603..832550dc46 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -797,7 +797,7 @@ impl Platform for MacPlatform {
                                         .to_owned();
                                         result.set_file_name(&new_filename);
                                     }
-                                    return result;
+                                    result
                                 })
                             }
                         }
diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index 849925c727..72a0f2e565 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -319,7 +319,7 @@ impl MacTextSystemState {
     fn is_emoji(&self, font_id: FontId) -> bool {
         self.postscript_names_by_font_id
             .get(&font_id)
-            .map_or(false, |postscript_name| {
+            .is_some_and(|postscript_name| {
                 postscript_name == "AppleColorEmoji" || postscript_name == ".AppleColorEmojiUI"
             })
     }
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index b6f684a72c..bc60e13a59 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -653,7 +653,7 @@ impl MacWindow {
                     .and_then(|titlebar| titlebar.traffic_light_position),
                 transparent_titlebar: titlebar
                     .as_ref()
-                    .map_or(true, |titlebar| titlebar.appears_transparent),
+                    .is_none_or(|titlebar| titlebar.appears_transparent),
                 previous_modifiers_changed_event: None,
                 keystroke_for_do_command: None,
                 do_command_handled: None,
@@ -688,7 +688,7 @@ impl MacWindow {
                 });
             }
 
-            if titlebar.map_or(true, |titlebar| titlebar.appears_transparent) {
+            if titlebar.is_none_or(|titlebar| titlebar.appears_transparent) {
                 native_window.setTitlebarAppearsTransparent_(YES);
                 native_window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden);
             }
diff --git a/crates/gpui/src/platform/test/dispatcher.rs b/crates/gpui/src/platform/test/dispatcher.rs
index bdc7834931..4ce62c4bdc 100644
--- a/crates/gpui/src/platform/test/dispatcher.rs
+++ b/crates/gpui/src/platform/test/dispatcher.rs
@@ -270,9 +270,7 @@ impl PlatformDispatcher for TestDispatcher {
     fn dispatch(&self, runnable: Runnable, label: Option<TaskLabel>) {
         {
             let mut state = self.state.lock();
-            if label.map_or(false, |label| {
-                state.deprioritized_task_labels.contains(&label)
-            }) {
+            if label.is_some_and(|label| state.deprioritized_task_labels.contains(&label)) {
                 state.deprioritized_background.push(runnable);
             } else {
                 state.background.push(runnable);
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 09985722ef..5b69ce7fa6 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -573,7 +573,7 @@ impl Style {
 
                 if self
                     .border_color
-                    .map_or(false, |color| !color.is_transparent())
+                    .is_some_and(|color| !color.is_transparent())
                 {
                     min.x += self.border_widths.left.to_pixels(rem_size);
                     max.x -= self.border_widths.right.to_pixels(rem_size);
@@ -633,7 +633,7 @@ impl Style {
         window.paint_shadows(bounds, corner_radii, &self.box_shadow);
 
         let background_color = self.background.as_ref().and_then(Fill::color);
-        if background_color.map_or(false, |color| !color.is_transparent()) {
+        if background_color.is_some_and(|color| !color.is_transparent()) {
             let mut border_color = match background_color {
                 Some(color) => match color.tag {
                     BackgroundTag::Solid => color.solid,
@@ -729,7 +729,7 @@ impl Style {
 
     fn is_border_visible(&self) -> bool {
         self.border_color
-            .map_or(false, |color| !color.is_transparent())
+            .is_some_and(|color| !color.is_transparent())
             && self.border_widths.any(|length| !length.is_zero())
     }
 }
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 29af900b66..53991089da 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -435,7 +435,7 @@ impl WindowTextSystem {
                     });
                 }
 
-                if decoration_runs.last().map_or(false, |last_run| {
+                if decoration_runs.last().is_some_and(|last_run| {
                     last_run.color == run.color
                         && last_run.underline == run.underline
                         && last_run.strikethrough == run.strikethrough
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 62aeb0df11..89c1595a3f 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -243,14 +243,14 @@ impl FocusId {
     pub fn contains_focused(&self, window: &Window, cx: &App) -> bool {
         window
             .focused(cx)
-            .map_or(false, |focused| self.contains(focused.id, window))
+            .is_some_and(|focused| self.contains(focused.id, window))
     }
 
     /// Obtains whether the element associated with this handle is contained within the
     /// focused element or is itself focused.
     pub fn within_focused(&self, window: &Window, cx: &App) -> bool {
         let focused = window.focused(cx);
-        focused.map_or(false, |focused| focused.id.contains(*self, window))
+        focused.is_some_and(|focused| focused.id.contains(*self, window))
     }
 
     /// Obtains whether this handle contains the given handle in the most recently rendered frame.
@@ -504,7 +504,7 @@ impl HitboxId {
                 return true;
             }
         }
-        return false;
+        false
     }
 
     /// Checks if the hitbox with this ID contains the mouse and should handle scroll events.
@@ -634,7 +634,7 @@ impl TooltipId {
         window
             .tooltip_bounds
             .as_ref()
-            .map_or(false, |tooltip_bounds| {
+            .is_some_and(|tooltip_bounds| {
                 tooltip_bounds.id == *self
                     && tooltip_bounds.bounds.contains(&window.mouse_position())
             })
@@ -4466,7 +4466,7 @@ impl Window {
                 }
             }
         }
-        return None;
+        None
     }
 }
 
diff --git a/crates/gpui_macros/src/derive_inspector_reflection.rs b/crates/gpui_macros/src/derive_inspector_reflection.rs
index 5415807ea0..9c1cb503a8 100644
--- a/crates/gpui_macros/src/derive_inspector_reflection.rs
+++ b/crates/gpui_macros/src/derive_inspector_reflection.rs
@@ -189,7 +189,7 @@ fn extract_cfg_attributes(attrs: &[Attribute]) -> Vec<Attribute> {
 fn is_called_from_gpui_crate(_span: Span) -> bool {
     // Check if we're being called from within the gpui crate by examining the call site
     // This is a heuristic approach - we check if the current crate name is "gpui"
-    std::env::var("CARGO_PKG_NAME").map_or(false, |name| name == "gpui")
+    std::env::var("CARGO_PKG_NAME").is_ok_and(|name| name == "gpui")
 }
 
 struct MacroExpander;
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 9227d35a50..972a90ddab 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1406,7 +1406,7 @@ impl Buffer {
                     })
                     .unwrap_or(true);
                 let result = any_sub_ranges_contain_range;
-                return result;
+                result
             })
             .last()
             .map(|info| info.language.clone())
@@ -1520,12 +1520,12 @@ impl Buffer {
                     let new_syntax_map = parse_task.await;
                     this.update(cx, move |this, cx| {
                         let grammar_changed =
-                            this.language.as_ref().map_or(true, |current_language| {
+                            this.language.as_ref().is_none_or(|current_language| {
                                 !Arc::ptr_eq(&language, current_language)
                             });
                         let language_registry_changed = new_syntax_map
                             .contains_unknown_injections()
-                            && language_registry.map_or(false, |registry| {
+                            && language_registry.is_some_and(|registry| {
                                 registry.version() != new_syntax_map.language_registry_version()
                             });
                         let parse_again = language_registry_changed
@@ -1719,8 +1719,7 @@ impl Buffer {
                                 })
                                 .with_delta(suggestion.delta, language_indent_size);
 
-                            if old_suggestions.get(&new_row).map_or(
-                                true,
+                            if old_suggestions.get(&new_row).is_none_or(
                                 |(old_indentation, was_within_error)| {
                                     suggested_indent != *old_indentation
                                         && (!suggestion.within_error || *was_within_error)
@@ -2014,7 +2013,7 @@ impl Buffer {
 
     fn was_changed(&mut self) {
         self.change_bits.retain(|change_bit| {
-            change_bit.upgrade().map_or(false, |bit| {
+            change_bit.upgrade().is_some_and(|bit| {
                 bit.replace(true);
                 true
             })
@@ -2191,7 +2190,7 @@ impl Buffer {
         if self
             .remote_selections
             .get(&self.text.replica_id())
-            .map_or(true, |set| !set.selections.is_empty())
+            .is_none_or(|set| !set.selections.is_empty())
         {
             self.set_active_selections(Arc::default(), false, Default::default(), cx);
         }
@@ -2839,7 +2838,7 @@ impl Buffer {
         let mut edits: Vec<(Range<usize>, String)> = Vec::new();
         let mut last_end = None;
         for _ in 0..old_range_count {
-            if last_end.map_or(false, |last_end| last_end >= self.len()) {
+            if last_end.is_some_and(|last_end| last_end >= self.len()) {
                 break;
             }
 
@@ -3059,14 +3058,14 @@ impl BufferSnapshot {
                 if config
                     .decrease_indent_pattern
                     .as_ref()
-                    .map_or(false, |regex| regex.is_match(line))
+                    .is_some_and(|regex| regex.is_match(line))
                 {
                     indent_change_rows.push((row, Ordering::Less));
                 }
                 if config
                     .increase_indent_pattern
                     .as_ref()
-                    .map_or(false, |regex| regex.is_match(line))
+                    .is_some_and(|regex| regex.is_match(line))
                 {
                     indent_change_rows.push((row + 1, Ordering::Greater));
                 }
@@ -3082,7 +3081,7 @@ impl BufferSnapshot {
                     }
                 }
                 for rule in &config.decrease_indent_patterns {
-                    if rule.pattern.as_ref().map_or(false, |r| r.is_match(line)) {
+                    if rule.pattern.as_ref().is_some_and(|r| r.is_match(line)) {
                         let row_start_column = self.indent_size_for_line(row).len;
                         let basis_row = rule
                             .valid_after
@@ -3295,8 +3294,7 @@ impl BufferSnapshot {
         range: Range<D>,
     ) -> Option<SyntaxLayer<'_>> {
         let range = range.to_offset(self);
-        return self
-            .syntax
+        self.syntax
             .layers_for_range(range, &self.text, false)
             .max_by(|a, b| {
                 if a.depth != b.depth {
@@ -3306,7 +3304,7 @@ impl BufferSnapshot {
                 } else {
                     a.node().end_byte().cmp(&b.node().end_byte()).reverse()
                 }
-            });
+            })
     }
 
     /// Returns the main [`Language`].
@@ -3365,8 +3363,7 @@ impl BufferSnapshot {
             }
 
             if let Some(range) = range
-                && smallest_range_and_depth.as_ref().map_or(
-                    true,
+                && smallest_range_and_depth.as_ref().is_none_or(
                     |(smallest_range, smallest_range_depth)| {
                         if layer.depth > *smallest_range_depth {
                             true
@@ -3543,7 +3540,7 @@ impl BufferSnapshot {
             }
         }
 
-        return Some(cursor.node());
+        Some(cursor.node())
     }
 
     /// Returns the outline for the buffer.
@@ -3572,7 +3569,7 @@ impl BufferSnapshot {
         )?;
         let mut prev_depth = None;
         items.retain(|item| {
-            let result = prev_depth.map_or(true, |prev_depth| item.depth > prev_depth);
+            let result = prev_depth.is_none_or(|prev_depth| item.depth > prev_depth);
             prev_depth = Some(item.depth);
             result
         });
@@ -4449,7 +4446,7 @@ impl BufferSnapshot {
 
     pub fn words_in_range(&self, query: WordsQuery) -> BTreeMap<String, Range<Anchor>> {
         let query_str = query.fuzzy_contents;
-        if query_str.map_or(false, |query| query.is_empty()) {
+        if query_str.is_some_and(|query| query.is_empty()) {
             return BTreeMap::default();
         }
 
@@ -4490,7 +4487,7 @@ impl BufferSnapshot {
                         .and_then(|first_chunk| first_chunk.chars().next());
                     // Skip empty and "words" starting with digits as a heuristic to reduce useless completions
                     if !query.skip_digits
-                        || first_char.map_or(true, |first_char| !first_char.is_digit(10))
+                        || first_char.is_none_or(|first_char| !first_char.is_digit(10))
                     {
                         words.insert(word_text.collect(), word_range);
                     }
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index 83c16f4558..589fc68e99 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -773,7 +773,7 @@ impl LanguageRegistry {
             };
 
             let content_matches = || {
-                config.first_line_pattern.as_ref().map_or(false, |pattern| {
+                config.first_line_pattern.as_ref().is_some_and(|pattern| {
                     content
                         .as_ref()
                         .is_some_and(|content| pattern.is_match(content))
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 62fe75b6a8..fbb67a9818 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -253,7 +253,7 @@ impl EditPredictionSettings {
         !self.disabled_globs.iter().any(|glob| {
             if glob.is_absolute {
                 file.as_local()
-                    .map_or(false, |local| glob.matcher.is_match(local.abs_path(cx)))
+                    .is_some_and(|local| glob.matcher.is_match(local.abs_path(cx)))
             } else {
                 glob.matcher.is_match(file.path())
             }
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
index 1e1060c843..f10056af13 100644
--- a/crates/language/src/syntax_map.rs
+++ b/crates/language/src/syntax_map.rs
@@ -1630,10 +1630,8 @@ impl<'a> SyntaxLayer<'a> {
                     if offset < range.start || offset > range.end {
                         continue;
                     }
-                } else {
-                    if offset <= range.start || offset >= range.end {
-                        continue;
-                    }
+                } else if offset <= range.start || offset >= range.end {
+                    continue;
                 }
 
                 if let Some((_, smallest_range)) = &smallest_match {
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index b16be36ea1..0d061c0587 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -554,7 +554,7 @@ pub fn into_anthropic(
                     .into_iter()
                     .filter_map(|content| match content {
                         MessageContent::Text(text) => {
-                            let text = if text.chars().last().map_or(false, |c| c.is_whitespace()) {
+                            let text = if text.chars().last().is_some_and(|c| c.is_whitespace()) {
                                 text.trim_end().to_string()
                             } else {
                                 text
@@ -813,7 +813,7 @@ impl AnthropicEventMapper {
                             ))];
                         }
                     }
-                    return vec![];
+                    vec![]
                 }
             },
             Event::ContentBlockStop { index } => {
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index e99dadc28d..d3fee7b63b 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -270,7 +270,7 @@ impl State {
         if response.status().is_success() {
             let mut body = String::new();
             response.body_mut().read_to_string(&mut body).await?;
-            return Ok(serde_json::from_str(&body)?);
+            Ok(serde_json::from_str(&body)?)
         } else {
             let mut body = String::new();
             response.body_mut().read_to_string(&mut body).await?;
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 1bb9f3fa00..a36ce949b1 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -530,7 +530,7 @@ pub fn into_google(
     let system_instructions = if request
         .messages
         .first()
-        .map_or(false, |msg| matches!(msg.role, Role::System))
+        .is_some_and(|msg| matches!(msg.role, Role::System))
     {
         let message = request.messages.remove(0);
         Some(SystemInstruction {
diff --git a/crates/language_tools/src/key_context_view.rs b/crates/language_tools/src/key_context_view.rs
index 320668cfc2..057259d114 100644
--- a/crates/language_tools/src/key_context_view.rs
+++ b/crates/language_tools/src/key_context_view.rs
@@ -71,12 +71,10 @@ impl KeyContextView {
                         } else {
                             None
                         }
+                    } else if this.action_matches(&e.action, binding.action()) {
+                        Some(true)
                     } else {
-                        if this.action_matches(&e.action, binding.action()) {
-                            Some(true)
-                        } else {
-                            Some(false)
-                        }
+                        Some(false)
                     };
                     let predicate = if let Some(predicate) = binding.predicate() {
                         format!("{}", predicate)
diff --git a/crates/language_tools/src/lsp_tool.rs b/crates/language_tools/src/lsp_tool.rs
index 3244350a34..dd3e80212f 100644
--- a/crates/language_tools/src/lsp_tool.rs
+++ b/crates/language_tools/src/lsp_tool.rs
@@ -349,7 +349,6 @@ impl LanguageServerState {
                             .detach();
                         } else {
                             cx.propagate();
-                            return;
                         }
                     }
                 },
@@ -523,7 +522,6 @@ impl LspTool {
                 if ProjectSettings::get_global(cx).global_lsp_settings.button {
                     if lsp_tool.lsp_menu.is_none() {
                         lsp_tool.refresh_lsp_menu(true, window, cx);
-                        return;
                     }
                 } else if lsp_tool.lsp_menu.take().is_some() {
                     cx.notify();
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 00e3cad436..d6f9538ee4 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -452,7 +452,7 @@ async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServ
                 && entry
                     .file_name()
                     .to_str()
-                    .map_or(false, |name| name.starts_with("gopls_"))
+                    .is_some_and(|name| name.starts_with("gopls_"))
             {
                 last_binary_path = Some(entry.path());
             }
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 6f57ace488..2c490b45cf 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -280,7 +280,7 @@ impl JsonLspAdapter {
             )
         })?;
         writer.replace(config.clone());
-        return Ok(config);
+        Ok(config)
     }
 }
 
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 89a091797e..906e45bb3a 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -828,7 +828,7 @@ impl ToolchainLister for PythonToolchainProvider {
                         .get_env_var("CONDA_PREFIX".to_string())
                         .map(|conda_prefix| {
                             let is_match = |exe: &Option<PathBuf>| {
-                                exe.as_ref().map_or(false, |e| e.starts_with(&conda_prefix))
+                                exe.as_ref().is_some_and(|e| e.starts_with(&conda_prefix))
                             };
                             match (is_match(&lhs.executable), is_match(&rhs.executable)) {
                                 (true, false) => Ordering::Less,
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index f9b23ed9f4..eb5e0cee7c 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -403,7 +403,7 @@ impl LspAdapter for RustLspAdapter {
                 } else if completion
                     .detail
                     .as_ref()
-                    .map_or(false, |detail| detail.starts_with("macro_rules! "))
+                    .is_some_and(|detail| detail.starts_with("macro_rules! "))
                 {
                     let text = completion.label.clone();
                     let len = text.len();
@@ -496,7 +496,7 @@ impl LspAdapter for RustLspAdapter {
         let enable_lsp_tasks = ProjectSettings::get_global(cx)
             .lsp
             .get(&SERVER_NAME)
-            .map_or(false, |s| s.enable_lsp_tasks);
+            .is_some_and(|s| s.enable_lsp_tasks);
         if enable_lsp_tasks {
             let experimental = json!({
                 "runnables": {
diff --git a/crates/livekit_client/examples/test_app.rs b/crates/livekit_client/examples/test_app.rs
index e1d01df534..51f335c2db 100644
--- a/crates/livekit_client/examples/test_app.rs
+++ b/crates/livekit_client/examples/test_app.rs
@@ -159,14 +159,14 @@ impl LivekitWindow {
                 if output
                     .audio_output_stream
                     .as_ref()
-                    .map_or(false, |(track, _)| track.sid() == unpublish_sid)
+                    .is_some_and(|(track, _)| track.sid() == unpublish_sid)
                 {
                     output.audio_output_stream.take();
                 }
                 if output
                     .screen_share_output_view
                     .as_ref()
-                    .map_or(false, |(track, _)| track.sid() == unpublish_sid)
+                    .is_some_and(|(track, _)| track.sid() == unpublish_sid)
                 {
                     output.screen_share_output_view.take();
                 }
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
index 890d564b7a..8c8d9e177f 100644
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -76,22 +76,22 @@ impl<'a> MarkdownParser<'a> {
         if self.eof() || (steps + self.cursor) >= self.tokens.len() {
             return self.tokens.last();
         }
-        return self.tokens.get(self.cursor + steps);
+        self.tokens.get(self.cursor + steps)
     }
 
     fn previous(&self) -> Option<&(Event<'_>, Range<usize>)> {
         if self.cursor == 0 || self.cursor > self.tokens.len() {
             return None;
         }
-        return self.tokens.get(self.cursor - 1);
+        self.tokens.get(self.cursor - 1)
     }
 
     fn current(&self) -> Option<&(Event<'_>, Range<usize>)> {
-        return self.peek(0);
+        self.peek(0)
     }
 
     fn current_event(&self) -> Option<&Event<'_>> {
-        return self.current().map(|(event, _)| event);
+        self.current().map(|(event, _)| event)
     }
 
     fn is_text_like(event: &Event) -> bool {
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index 3acc4b5600..b0b10e927c 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -111,11 +111,10 @@ impl RenderContext {
     /// buffer font size changes. The callees of this function should be reimplemented to use real
     /// relative sizing once that is implemented in GPUI
     pub fn scaled_rems(&self, rems: f32) -> Rems {
-        return self
-            .buffer_text_style
+        self.buffer_text_style
             .font_size
             .to_rems(self.window_rem_size)
-            .mul(rems);
+            .mul(rems)
     }
 
     /// This ensures that children inside of block quotes
diff --git a/crates/migrator/src/migrations/m_2025_05_05/settings.rs b/crates/migrator/src/migrations/m_2025_05_05/settings.rs
index 88c6c338d1..77da1b9a07 100644
--- a/crates/migrator/src/migrations/m_2025_05_05/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_05_05/settings.rs
@@ -24,7 +24,7 @@ fn rename_assistant(
         .nodes_for_capture_index(key_capture_ix)
         .next()?
         .byte_range();
-    return Some((key_range, "agent".to_string()));
+    Some((key_range, "agent".to_string()))
 }
 
 fn rename_edit_prediction_assistant(
@@ -37,5 +37,5 @@ fn rename_edit_prediction_assistant(
         .nodes_for_capture_index(key_capture_ix)
         .next()?
         .byte_range();
-    return Some((key_range, "enabled_in_text_threads".to_string()));
+    Some((key_range, "enabled_in_text_threads".to_string()))
 }
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index ab5f148d6c..7f65ccf5ea 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -1146,13 +1146,13 @@ impl MultiBuffer {
 
     pub fn last_transaction_id(&self, cx: &App) -> Option<TransactionId> {
         if let Some(buffer) = self.as_singleton() {
-            return buffer
+            buffer
                 .read(cx)
                 .peek_undo_stack()
-                .map(|history_entry| history_entry.transaction_id());
+                .map(|history_entry| history_entry.transaction_id())
         } else {
             let last_transaction = self.history.undo_stack.last()?;
-            return Some(last_transaction.id);
+            Some(last_transaction.id)
         }
     }
 
@@ -1725,7 +1725,7 @@ impl MultiBuffer {
             merged_ranges.push(range.clone());
             counts.push(1);
         }
-        return (merged_ranges, counts);
+        (merged_ranges, counts)
     }
 
     fn update_path_excerpts(
@@ -2482,7 +2482,7 @@ impl MultiBuffer {
         let base_text_changed = snapshot
             .diffs
             .get(&buffer_id)
-            .map_or(true, |old_diff| !new_diff.base_texts_eq(old_diff));
+            .is_none_or(|old_diff| !new_diff.base_texts_eq(old_diff));
 
         snapshot.diffs.insert(buffer_id, new_diff);
 
@@ -2776,7 +2776,7 @@ impl MultiBuffer {
                 if diff_hunk.excerpt_id.cmp(&end_excerpt_id, &snapshot).is_gt() {
                     continue;
                 }
-                if last_hunk_row.map_or(false, |row| row >= diff_hunk.row_range.start) {
+                if last_hunk_row.is_some_and(|row| row >= diff_hunk.row_range.start) {
                     continue;
                 }
                 let start = Anchor::in_buffer(
@@ -3040,7 +3040,7 @@ impl MultiBuffer {
             is_dirty |= buffer.is_dirty();
             has_deleted_file |= buffer
                 .file()
-                .map_or(false, |file| file.disk_state() == DiskState::Deleted);
+                .is_some_and(|file| file.disk_state() == DiskState::Deleted);
             has_conflict |= buffer.has_conflict();
         }
         if edited {
@@ -3198,9 +3198,10 @@ impl MultiBuffer {
             // If this is the last edit that intersects the current diff transform,
             // then recreate the content up to the end of this transform, to prepare
             // for reusing additional slices of the old transforms.
-            if excerpt_edits.peek().map_or(true, |next_edit| {
-                next_edit.old.start >= old_diff_transforms.end().0
-            }) {
+            if excerpt_edits
+                .peek()
+                .is_none_or(|next_edit| next_edit.old.start >= old_diff_transforms.end().0)
+            {
                 let keep_next_old_transform = (old_diff_transforms.start().0 >= edit.old.end)
                     && match old_diff_transforms.item() {
                         Some(DiffTransform::BufferContent {
@@ -3595,7 +3596,7 @@ impl MultiBuffer {
         let mut edits: Vec<(Range<usize>, Arc<str>)> = Vec::new();
         let mut last_end = None;
         for _ in 0..edit_count {
-            if last_end.map_or(false, |last_end| last_end >= snapshot.len()) {
+            if last_end.is_some_and(|last_end| last_end >= snapshot.len()) {
                 break;
             }
 
@@ -4649,7 +4650,7 @@ impl MultiBufferSnapshot {
                 return true;
             }
         }
-        return true;
+        true
     }
 
     pub fn prev_non_blank_row(&self, mut row: MultiBufferRow) -> Option<MultiBufferRow> {
@@ -4954,7 +4955,7 @@ impl MultiBufferSnapshot {
         while let Some(replacement) = self.replaced_excerpts.get(&excerpt_id) {
             excerpt_id = *replacement;
         }
-        return excerpt_id;
+        excerpt_id
     }
 
     pub fn summaries_for_anchors<'a, D, I>(&'a self, anchors: I) -> Vec<D>
@@ -5072,9 +5073,9 @@ impl MultiBufferSnapshot {
                 if point == region.range.end.key && region.has_trailing_newline {
                     position.add_assign(&D::from_text_summary(&TextSummary::newline()));
                 }
-                return Some(position);
+                Some(position)
             } else {
-                return Some(D::from_text_summary(&self.text_summary()));
+                Some(D::from_text_summary(&self.text_summary()))
             }
         })
     }
@@ -5114,7 +5115,7 @@ impl MultiBufferSnapshot {
                 // Leave min and max anchors unchanged if invalid or
                 // if the old excerpt still exists at this location
                 let mut kept_position = next_excerpt
-                    .map_or(false, |e| e.id == old_excerpt_id && e.contains(&anchor))
+                    .is_some_and(|e| e.id == old_excerpt_id && e.contains(&anchor))
                     || old_excerpt_id == ExcerptId::max()
                     || old_excerpt_id == ExcerptId::min();
 
@@ -5482,7 +5483,7 @@ impl MultiBufferSnapshot {
         let range_filter = |open: Range<usize>, close: Range<usize>| -> bool {
             excerpt_buffer_range.contains(&open.start)
                 && excerpt_buffer_range.contains(&close.end)
-                && range_filter.map_or(true, |filter| filter(buffer, open, close))
+                && range_filter.is_none_or(|filter| filter(buffer, open, close))
         };
 
         let (open, close) = excerpt.buffer().innermost_enclosing_bracket_ranges(
@@ -5642,10 +5643,10 @@ impl MultiBufferSnapshot {
                 .buffer
                 .line_indents_in_row_range(buffer_start_row..buffer_end_row);
             cursor.next();
-            return Some(line_indents.map(move |(buffer_row, indent)| {
+            Some(line_indents.map(move |(buffer_row, indent)| {
                 let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
                 (MultiBufferRow(row), indent, &region.excerpt.buffer)
-            }));
+            }))
         })
         .flatten()
     }
@@ -5682,10 +5683,10 @@ impl MultiBufferSnapshot {
                 .buffer
                 .reversed_line_indents_in_row_range(buffer_start_row..buffer_end_row);
             cursor.prev();
-            return Some(line_indents.map(move |(buffer_row, indent)| {
+            Some(line_indents.map(move |(buffer_row, indent)| {
                 let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
                 (MultiBufferRow(row), indent, &region.excerpt.buffer)
-            }));
+            }))
         })
         .flatten()
     }
@@ -6545,7 +6546,7 @@ where
                     && self
                         .excerpts
                         .item()
-                        .map_or(false, |excerpt| excerpt.id != hunk_info.excerpt_id)
+                        .is_some_and(|excerpt| excerpt.id != hunk_info.excerpt_id)
                 {
                     self.excerpts.next();
                 }
@@ -6592,7 +6593,7 @@ where
         let prev_transform = self.diff_transforms.item();
         self.diff_transforms.next();
 
-        prev_transform.map_or(true, |next_transform| {
+        prev_transform.is_none_or(|next_transform| {
             matches!(next_transform, DiffTransform::BufferContent { .. })
         })
     }
@@ -6607,12 +6608,12 @@ where
         }
 
         let next_transform = self.diff_transforms.next_item();
-        next_transform.map_or(true, |next_transform| match next_transform {
+        next_transform.is_none_or(|next_transform| match next_transform {
             DiffTransform::BufferContent { .. } => true,
             DiffTransform::DeletedHunk { hunk_info, .. } => self
                 .excerpts
                 .item()
-                .map_or(false, |excerpt| excerpt.id != hunk_info.excerpt_id),
+                .is_some_and(|excerpt| excerpt.id != hunk_info.excerpt_id),
         })
     }
 
@@ -6645,7 +6646,7 @@ where
                 buffer_end.add_assign(&buffer_range_len);
                 let start = self.diff_transforms.start().output_dimension.0;
                 let end = self.diff_transforms.end().output_dimension.0;
-                return Some(MultiBufferRegion {
+                Some(MultiBufferRegion {
                     buffer,
                     excerpt,
                     has_trailing_newline: *has_trailing_newline,
@@ -6655,7 +6656,7 @@ where
                     )),
                     buffer_range: buffer_start..buffer_end,
                     range: start..end,
-                });
+                })
             }
             DiffTransform::BufferContent {
                 inserted_hunk_info, ..
@@ -7493,61 +7494,59 @@ impl Iterator for MultiBufferRows<'_> {
             self.cursor.next();
             if let Some(next_region) = self.cursor.region() {
                 region = next_region;
-            } else {
-                if self.point == self.cursor.diff_transforms.end().output_dimension.0 {
-                    let multibuffer_row = MultiBufferRow(self.point.row);
-                    let last_excerpt = self
-                        .cursor
-                        .excerpts
-                        .item()
-                        .or(self.cursor.excerpts.prev_item())?;
-                    let last_row = last_excerpt
-                        .range
-                        .context
-                        .end
-                        .to_point(&last_excerpt.buffer)
-                        .row;
+            } else if self.point == self.cursor.diff_transforms.end().output_dimension.0 {
+                let multibuffer_row = MultiBufferRow(self.point.row);
+                let last_excerpt = self
+                    .cursor
+                    .excerpts
+                    .item()
+                    .or(self.cursor.excerpts.prev_item())?;
+                let last_row = last_excerpt
+                    .range
+                    .context
+                    .end
+                    .to_point(&last_excerpt.buffer)
+                    .row;
 
-                    let first_row = last_excerpt
-                        .range
-                        .context
-                        .start
-                        .to_point(&last_excerpt.buffer)
-                        .row;
+                let first_row = last_excerpt
+                    .range
+                    .context
+                    .start
+                    .to_point(&last_excerpt.buffer)
+                    .row;
 
-                    let expand_info = if self.is_singleton {
-                        None
-                    } else {
-                        let needs_expand_up = first_row == last_row
-                            && last_row > 0
-                            && !region.diff_hunk_status.is_some_and(|d| d.is_deleted());
-                        let needs_expand_down = last_row < last_excerpt.buffer.max_point().row;
-
-                        if needs_expand_up && needs_expand_down {
-                            Some(ExpandExcerptDirection::UpAndDown)
-                        } else if needs_expand_up {
-                            Some(ExpandExcerptDirection::Up)
-                        } else if needs_expand_down {
-                            Some(ExpandExcerptDirection::Down)
-                        } else {
-                            None
-                        }
-                        .map(|direction| ExpandInfo {
-                            direction,
-                            excerpt_id: last_excerpt.id,
-                        })
-                    };
-                    self.point += Point::new(1, 0);
-                    return Some(RowInfo {
-                        buffer_id: Some(last_excerpt.buffer_id),
-                        buffer_row: Some(last_row),
-                        multibuffer_row: Some(multibuffer_row),
-                        diff_status: None,
-                        expand_info,
-                    });
+                let expand_info = if self.is_singleton {
+                    None
                 } else {
-                    return None;
-                }
+                    let needs_expand_up = first_row == last_row
+                        && last_row > 0
+                        && !region.diff_hunk_status.is_some_and(|d| d.is_deleted());
+                    let needs_expand_down = last_row < last_excerpt.buffer.max_point().row;
+
+                    if needs_expand_up && needs_expand_down {
+                        Some(ExpandExcerptDirection::UpAndDown)
+                    } else if needs_expand_up {
+                        Some(ExpandExcerptDirection::Up)
+                    } else if needs_expand_down {
+                        Some(ExpandExcerptDirection::Down)
+                    } else {
+                        None
+                    }
+                    .map(|direction| ExpandInfo {
+                        direction,
+                        excerpt_id: last_excerpt.id,
+                    })
+                };
+                self.point += Point::new(1, 0);
+                return Some(RowInfo {
+                    buffer_id: Some(last_excerpt.buffer_id),
+                    buffer_row: Some(last_row),
+                    multibuffer_row: Some(multibuffer_row),
+                    diff_status: None,
+                    expand_info,
+                });
+            } else {
+                return None;
             };
         }
 
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index f92c122e71..871c72ea0b 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -197,7 +197,7 @@ impl NodeRuntime {
 
         state.instance = Some(instance.boxed_clone());
         state.last_options = Some(options);
-        return instance;
+        instance
     }
 
     pub async fn binary_path(&self) -> Result<PathBuf> {
diff --git a/crates/onboarding/src/theme_preview.rs b/crates/onboarding/src/theme_preview.rs
index 9f299eb6ea..6a072b00e9 100644
--- a/crates/onboarding/src/theme_preview.rs
+++ b/crates/onboarding/src/theme_preview.rs
@@ -210,12 +210,12 @@ impl ThemePreviewTile {
     }
 
     fn render_borderless(seed: f32, theme: Arc<Theme>) -> impl IntoElement {
-        return Self::render_editor(
+        Self::render_editor(
             seed,
             theme,
             Self::SIDEBAR_WIDTH_DEFAULT,
             Self::SKELETON_HEIGHT_DEFAULT,
-        );
+        )
     }
 
     fn render_border(seed: f32, theme: Arc<Theme>) -> impl IntoElement {
@@ -246,7 +246,7 @@ impl ThemePreviewTile {
     ) -> impl IntoElement {
         let sidebar_width = relative(0.20);
 
-        return div()
+        div()
             .size_full()
             .p(Self::ROOT_PADDING)
             .rounded(Self::ROOT_RADIUS)
@@ -278,7 +278,7 @@ impl ThemePreviewTile {
                             )),
                     ),
             )
-            .into_any_element();
+            .into_any_element()
     }
 }
 
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 1fb9a1342c..acf6ec434a 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -9,7 +9,7 @@ use strum::EnumIter;
 pub const OPEN_AI_API_URL: &str = "https://api.openai.com/v1";
 
 fn is_none_or_empty<T: AsRef<[U]>, U>(opt: &Option<T>) -> bool {
-    opt.as_ref().map_or(true, |v| v.as_ref().is_empty())
+    opt.as_ref().is_none_or(|v| v.as_ref().is_empty())
 }
 
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
@@ -241,7 +241,7 @@ impl Model {
     ///
     /// If the model does not support the parameter, do not pass it up.
     pub fn supports_prompt_cache_key(&self) -> bool {
-        return true;
+        true
     }
 }
 
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index 7c304bad64..b7e6d69d8f 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -8,7 +8,7 @@ use std::convert::TryFrom;
 pub const OPEN_ROUTER_API_URL: &str = "https://openrouter.ai/api/v1";
 
 fn is_none_or_empty<T: AsRef<[U]>, U>(opt: &Option<T>) -> bool {
-    opt.as_ref().map_or(true, |v| v.as_ref().is_empty())
+    opt.as_ref().is_none_or(|v| v.as_ref().is_empty())
 }
 
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 9b7ec473fd..78f512f7f3 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -503,16 +503,16 @@ impl SearchData {
             && multi_buffer_snapshot
                 .chars_at(extended_context_left_border)
                 .last()
-                .map_or(false, |c| !c.is_whitespace());
+                .is_some_and(|c| !c.is_whitespace());
         let truncated_right = entire_context_text
             .chars()
             .last()
-            .map_or(true, |c| !c.is_whitespace())
+            .is_none_or(|c| !c.is_whitespace())
             && extended_context_right_border > context_right_border
             && multi_buffer_snapshot
                 .chars_at(extended_context_right_border)
                 .next()
-                .map_or(false, |c| !c.is_whitespace());
+                .is_some_and(|c| !c.is_whitespace());
         search_match_indices.iter_mut().for_each(|range| {
             range.start = multi_buffer_snapshot.clip_offset(
                 range.start.saturating_sub(left_whitespaces_offset),
@@ -1259,7 +1259,7 @@ impl OutlinePanel {
                                 dirs_worktree_id == worktree_id
                                     && dirs
                                         .last()
-                                        .map_or(false, |dir| dir.path.as_ref() == parent_path)
+                                        .is_some_and(|dir| dir.path.as_ref() == parent_path)
                             }
                             _ => false,
                         })
@@ -1453,9 +1453,7 @@ impl OutlinePanel {
         if self
             .unfolded_dirs
             .get(&directory_worktree)
-            .map_or(true, |unfolded_dirs| {
-                !unfolded_dirs.contains(&directory_entry.id)
-            })
+            .is_none_or(|unfolded_dirs| !unfolded_dirs.contains(&directory_entry.id))
         {
             return false;
         }
@@ -2156,7 +2154,7 @@ impl OutlinePanel {
                 ExcerptOutlines::Invalidated(outlines) => Some(outlines),
                 ExcerptOutlines::NotFetched => None,
             })
-            .map_or(false, |outlines| !outlines.is_empty());
+            .is_some_and(|outlines| !outlines.is_empty());
         let is_expanded = !self
             .collapsed_entries
             .contains(&CollapsedEntry::Excerpt(excerpt.buffer_id, excerpt.id));
@@ -2953,7 +2951,7 @@ impl OutlinePanel {
                                                         .map(|(parent_dir_id, _)| {
                                                             new_unfolded_dirs
                                                                 .get(&directory.worktree_id)
-                                                                .map_or(true, |unfolded_dirs| {
+                                                                .is_none_or(|unfolded_dirs| {
                                                                     unfolded_dirs
                                                                         .contains(parent_dir_id)
                                                                 })
@@ -3444,9 +3442,8 @@ impl OutlinePanel {
     }
 
     fn is_singleton_active(&self, cx: &App) -> bool {
-        self.active_editor().map_or(false, |active_editor| {
-            active_editor.read(cx).buffer().read(cx).is_singleton()
-        })
+        self.active_editor()
+            .is_some_and(|active_editor| active_editor.read(cx).buffer().read(cx).is_singleton())
     }
 
     fn invalidate_outlines(&mut self, ids: &[ExcerptId]) {
@@ -3664,7 +3661,7 @@ impl OutlinePanel {
                             let is_root = project
                                 .read(cx)
                                 .worktree_for_id(directory_entry.worktree_id, cx)
-                                .map_or(false, |worktree| {
+                                .is_some_and(|worktree| {
                                     worktree.read(cx).root_entry() == Some(&directory_entry.entry)
                                 });
                             let folded = auto_fold_dirs
@@ -3672,7 +3669,7 @@ impl OutlinePanel {
                                 && outline_panel
                                     .unfolded_dirs
                                     .get(&directory_entry.worktree_id)
-                                    .map_or(true, |unfolded_dirs| {
+                                    .is_none_or(|unfolded_dirs| {
                                         !unfolded_dirs.contains(&directory_entry.entry.id)
                                     });
                             let fs_depth = outline_panel
@@ -3752,7 +3749,7 @@ impl OutlinePanel {
                                                 .iter()
                                                 .rev()
                                                 .nth(folded_dirs.entries.len() + 1)
-                                                .map_or(true, |parent| parent.expanded);
+                                                .is_none_or(|parent| parent.expanded);
                                         if start_of_collapsed_dir_sequence
                                             || parent_expanded
                                             || query.is_some()
@@ -3812,7 +3809,7 @@ impl OutlinePanel {
                                             .iter()
                                             .all(|entry| entry.path != parent.path)
                                     })
-                                    .map_or(true, |parent| parent.expanded);
+                                    .is_none_or(|parent| parent.expanded);
                                 if !is_singleton && (parent_expanded || query.is_some()) {
                                     outline_panel.push_entry(
                                         &mut generation_state,
@@ -3837,7 +3834,7 @@ impl OutlinePanel {
                                             .iter()
                                             .all(|entry| entry.path != parent.path)
                                     })
-                                    .map_or(true, |parent| parent.expanded);
+                                    .is_none_or(|parent| parent.expanded);
                                 if !is_singleton && (parent_expanded || query.is_some()) {
                                     outline_panel.push_entry(
                                         &mut generation_state,
@@ -3958,7 +3955,7 @@ impl OutlinePanel {
                                 .iter()
                                 .all(|entry| entry.path != parent.path)
                         })
-                        .map_or(true, |parent| parent.expanded);
+                        .is_none_or(|parent| parent.expanded);
                     if parent_expanded || query.is_some() {
                         outline_panel.push_entry(
                             &mut generation_state,
@@ -4438,7 +4435,7 @@ impl OutlinePanel {
     }
 
     fn should_replace_active_item(&self, new_active_item: &dyn ItemHandle) -> bool {
-        self.active_item().map_or(true, |active_item| {
+        self.active_item().is_none_or(|active_item| {
             !self.pinned && active_item.item_id() != new_active_item.item_id()
         })
     }
diff --git a/crates/prettier/src/prettier.rs b/crates/prettier/src/prettier.rs
index 8e1485dc9a..32e39d466f 100644
--- a/crates/prettier/src/prettier.rs
+++ b/crates/prettier/src/prettier.rs
@@ -119,7 +119,7 @@ impl Prettier {
                                             None
                                         }
                                     }).any(|workspace_definition| {
-                                        workspace_definition == subproject_path.to_string_lossy() || PathMatcher::new(&[workspace_definition]).ok().map_or(false, |path_matcher| path_matcher.is_match(subproject_path))
+                                        workspace_definition == subproject_path.to_string_lossy() || PathMatcher::new(&[workspace_definition]).ok().is_some_and(|path_matcher| path_matcher.is_match(subproject_path))
                                     }) {
                                         anyhow::ensure!(has_prettier_in_node_modules(fs, &path_to_check).await?, "Path {path_to_check:?} is the workspace root for project in {closest_package_json_path:?}, but it has no prettier installed");
                                         log::info!("Found prettier path {path_to_check:?} in the workspace root for project in {closest_package_json_path:?}");
@@ -217,7 +217,7 @@ impl Prettier {
                                     workspace_definition == subproject_path.to_string_lossy()
                                         || PathMatcher::new(&[workspace_definition])
                                             .ok()
-                                            .map_or(false, |path_matcher| {
+                                            .is_some_and(|path_matcher| {
                                                 path_matcher.is_match(subproject_path)
                                             })
                                 })
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index 96e87b1fe0..296749c14e 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -234,7 +234,7 @@ impl RemoteBufferStore {
                 }
             }
         }
-        return Ok(None);
+        Ok(None)
     }
 
     pub fn incomplete_buffer_ids(&self) -> Vec<BufferId> {
@@ -1313,10 +1313,7 @@ impl BufferStore {
                     let new_path = file.path.clone();
 
                     buffer.file_updated(Arc::new(file), cx);
-                    if old_file
-                        .as_ref()
-                        .map_or(true, |old| *old.path() != new_path)
-                    {
+                    if old_file.as_ref().is_none_or(|old| *old.path() != new_path) {
                         Some(old_file)
                     } else {
                         None
diff --git a/crates/project/src/color_extractor.rs b/crates/project/src/color_extractor.rs
index 5473da88af..dbbd3d7b99 100644
--- a/crates/project/src/color_extractor.rs
+++ b/crates/project/src/color_extractor.rs
@@ -102,7 +102,7 @@ fn parse(str: &str, mode: ParseMode) -> Option<Hsla> {
         };
     }
 
-    return None;
+    None
 }
 
 fn parse_component(value: &str, max: f32) -> Option<f32> {
diff --git a/crates/project/src/debugger/locators/cargo.rs b/crates/project/src/debugger/locators/cargo.rs
index 9a36584e71..3e28fac8af 100644
--- a/crates/project/src/debugger/locators/cargo.rs
+++ b/crates/project/src/debugger/locators/cargo.rs
@@ -146,7 +146,7 @@ impl DapLocator for CargoLocator {
         let is_test = build_config
             .args
             .first()
-            .map_or(false, |arg| arg == "test" || arg == "t");
+            .is_some_and(|arg| arg == "test" || arg == "t");
 
         let executables = output
             .lines()
diff --git a/crates/project/src/debugger/locators/python.rs b/crates/project/src/debugger/locators/python.rs
index 3de1281aed..71efbb75b9 100644
--- a/crates/project/src/debugger/locators/python.rs
+++ b/crates/project/src/debugger/locators/python.rs
@@ -28,9 +28,7 @@ impl DapLocator for PythonLocator {
         let valid_program = build_config.command.starts_with("$ZED_")
             || Path::new(&build_config.command)
                 .file_name()
-                .map_or(false, |name| {
-                    name.to_str().is_some_and(|path| path.starts_with("python"))
-                });
+                .is_some_and(|name| name.to_str().is_some_and(|path| path.starts_with("python")));
         if !valid_program || build_config.args.iter().any(|arg| arg == "-c") {
             // We cannot debug selections.
             return None;
diff --git a/crates/project/src/debugger/memory.rs b/crates/project/src/debugger/memory.rs
index 092435fda7..a8729a8ff4 100644
--- a/crates/project/src/debugger/memory.rs
+++ b/crates/project/src/debugger/memory.rs
@@ -329,7 +329,7 @@ impl Iterator for MemoryIterator {
         }
         if !self.fetch_next_page() {
             self.start += 1;
-            return Some(MemoryCell(None));
+            Some(MemoryCell(None))
         } else {
             self.next()
         }
diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs
index b5ae714841..ee5baf1d3b 100644
--- a/crates/project/src/debugger/session.rs
+++ b/crates/project/src/debugger/session.rs
@@ -431,7 +431,7 @@ impl RunningMode {
         let should_send_exception_breakpoints = capabilities
             .exception_breakpoint_filters
             .as_ref()
-            .map_or(false, |filters| !filters.is_empty())
+            .is_some_and(|filters| !filters.is_empty())
             || !configuration_done_supported;
         let supports_exception_filters = capabilities
             .supports_exception_filter_options
@@ -710,9 +710,7 @@ where
     T: LocalDapCommand + PartialEq + Eq + Hash,
 {
     fn dyn_eq(&self, rhs: &dyn CacheableCommand) -> bool {
-        (rhs as &dyn Any)
-            .downcast_ref::<Self>()
-            .map_or(false, |rhs| self == rhs)
+        (rhs as &dyn Any).downcast_ref::<Self>() == Some(self)
     }
 
     fn dyn_hash(&self, mut hasher: &mut dyn Hasher) {
@@ -1085,7 +1083,7 @@ impl Session {
         })
         .detach();
 
-        return tx;
+        tx
     }
 
     pub fn is_started(&self) -> bool {
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index ebc29a0a4b..edc6b00a7b 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -781,9 +781,7 @@ impl GitStore {
 
         let is_unmerged = self
             .repository_and_path_for_buffer_id(buffer_id, cx)
-            .map_or(false, |(repo, path)| {
-                repo.read(cx).snapshot.has_conflict(&path)
-            });
+            .is_some_and(|(repo, path)| repo.read(cx).snapshot.has_conflict(&path));
         let git_store = cx.weak_entity();
         let buffer_git_state = self
             .diffs
@@ -2501,14 +2499,14 @@ impl BufferGitState {
     pub fn wait_for_recalculation(&mut self) -> Option<impl Future<Output = ()> + use<>> {
         if *self.recalculating_tx.borrow() {
             let mut rx = self.recalculating_tx.subscribe();
-            return Some(async move {
+            Some(async move {
                 loop {
                     let is_recalculating = rx.recv().await;
                     if is_recalculating != Some(true) {
                         break;
                     }
                 }
-            });
+            })
         } else {
             None
         }
@@ -2879,7 +2877,7 @@ impl RepositorySnapshot {
             self.merge.conflicted_paths.contains(repo_path);
         let has_conflict_currently = self
             .status_for_path(repo_path)
-            .map_or(false, |entry| entry.status.is_conflicted());
+            .is_some_and(|entry| entry.status.is_conflicted());
         had_conflict_on_last_merge_head_change || has_conflict_currently
     }
 
@@ -3531,7 +3529,7 @@ impl Repository {
                         && buffer
                             .read(cx)
                             .file()
-                            .map_or(false, |file| file.disk_state().exists())
+                            .is_some_and(|file| file.disk_state().exists())
                     {
                         save_futures.push(buffer_store.save_buffer(buffer, cx));
                     }
@@ -3597,7 +3595,7 @@ impl Repository {
                         && buffer
                             .read(cx)
                             .file()
-                            .map_or(false, |file| file.disk_state().exists())
+                            .is_some_and(|file| file.disk_state().exists())
                     {
                         save_futures.push(buffer_store.save_buffer(buffer, cx));
                     }
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index 64414c6545..217e00ee96 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -3447,9 +3447,7 @@ impl LspCommand for GetCodeLens {
             .server_capabilities
             .code_lens_provider
             .as_ref()
-            .map_or(false, |code_lens_options| {
-                code_lens_options.resolve_provider.unwrap_or(false)
-            })
+            .is_some_and(|code_lens_options| code_lens_options.resolve_provider.unwrap_or(false))
     }
 
     fn to_lsp(
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e93e859dcf..e6ea01ff9a 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -1038,7 +1038,7 @@ impl LocalLspStore {
                 if let Some(LanguageServerState::Running { server, .. }) =
                     self.language_servers.get(&state.id)
                 {
-                    return Some(server);
+                    Some(server)
                 } else {
                     None
                 }
@@ -1879,7 +1879,7 @@ impl LocalLspStore {
     ) -> Result<Vec<(Range<Anchor>, Arc<str>)>> {
         let capabilities = &language_server.capabilities();
         let range_formatting_provider = capabilities.document_range_formatting_provider.as_ref();
-        if range_formatting_provider.map_or(false, |provider| provider == &OneOf::Left(false)) {
+        if range_formatting_provider == Some(&OneOf::Left(false)) {
             anyhow::bail!(
                 "{} language server does not support range formatting",
                 language_server.name()
@@ -2642,7 +2642,7 @@ impl LocalLspStore {
                 this.request_lsp(buffer.clone(), server, request, cx)
             })?
             .await?;
-        return Ok(actions);
+        Ok(actions)
     }
 
     pub async fn execute_code_actions_on_server(
@@ -2718,7 +2718,7 @@ impl LocalLspStore {
                 }
             }
         }
-        return Ok(());
+        Ok(())
     }
 
     pub async fn deserialize_text_edits(
@@ -2957,11 +2957,11 @@ impl LocalLspStore {
                         .update(cx, |this, cx| {
                             let path = buffer_to_edit.read(cx).project_path(cx);
                             let active_entry = this.active_entry;
-                            let is_active_entry = path.clone().map_or(false, |project_path| {
+                            let is_active_entry = path.clone().is_some_and(|project_path| {
                                 this.worktree_store
                                     .read(cx)
                                     .entry_for_path(&project_path, cx)
-                                    .map_or(false, |entry| Some(entry.id) == active_entry)
+                                    .is_some_and(|entry| Some(entry.id) == active_entry)
                             });
                             let local = this.as_local_mut().unwrap();
 
@@ -4038,7 +4038,7 @@ impl LspStore {
                             servers.push((json_adapter, json_server, json_delegate));
 
                     }
-                    return Some(servers);
+                    Some(servers)
                 })
                 .ok()
                 .flatten();
@@ -4050,7 +4050,7 @@ impl LspStore {
             let Ok(Some((fs, _))) = this.read_with(cx, |this, _| {
                 let local = this.as_local()?;
                 let toolchain_store = local.toolchain_store().clone();
-                return Some((local.fs.clone(), toolchain_store));
+                Some((local.fs.clone(), toolchain_store))
             }) else {
                 return;
             };
@@ -4312,9 +4312,10 @@ impl LspStore {
             local_store.unregister_buffer_from_language_servers(buffer_entity, &file_url, cx);
         }
         buffer_entity.update(cx, |buffer, cx| {
-            if buffer.language().map_or(true, |old_language| {
-                !Arc::ptr_eq(old_language, &new_language)
-            }) {
+            if buffer
+                .language()
+                .is_none_or(|old_language| !Arc::ptr_eq(old_language, &new_language))
+            {
                 buffer.set_language(Some(new_language.clone()), cx);
             }
         });
@@ -4514,7 +4515,7 @@ impl LspStore {
         if !request.check_capabilities(language_server.adapter_server_capabilities()) {
             return Task::ready(Ok(Default::default()));
         }
-        return cx.spawn(async move |this, cx| {
+        cx.spawn(async move |this, cx| {
             let lsp_request = language_server.request::<R::LspRequest>(lsp_params);
 
             let id = lsp_request.id();
@@ -4573,7 +4574,7 @@ impl LspStore {
                 )
                 .await;
             response
-        });
+        })
     }
 
     fn on_settings_changed(&mut self, cx: &mut Context<Self>) {
@@ -7297,7 +7298,7 @@ impl LspStore {
                         include_ignored
                             || worktree
                                 .entry_for_path(path.as_ref())
-                                .map_or(false, |entry| !entry.is_ignored)
+                                .is_some_and(|entry| !entry.is_ignored)
                     })
                     .flat_map(move |(path, summaries)| {
                         summaries.iter().map(move |(server_id, summary)| {
@@ -9341,9 +9342,7 @@ impl LspStore {
 
         let is_disk_based_diagnostics_progress = disk_based_diagnostics_progress_token
             .as_ref()
-            .map_or(false, |disk_based_token| {
-                token.starts_with(disk_based_token)
-            });
+            .is_some_and(|disk_based_token| token.starts_with(disk_based_token));
 
         match progress {
             lsp::WorkDoneProgress::Begin(report) => {
@@ -10676,7 +10675,7 @@ impl LspStore {
             let is_supporting = diagnostic
                 .related_information
                 .as_ref()
-                .map_or(false, |infos| {
+                .is_some_and(|infos| {
                     infos.iter().any(|info| {
                         primary_diagnostic_group_ids.contains_key(&(
                             source,
@@ -10689,11 +10688,11 @@ impl LspStore {
             let is_unnecessary = diagnostic
                 .tags
                 .as_ref()
-                .map_or(false, |tags| tags.contains(&DiagnosticTag::UNNECESSARY));
+                .is_some_and(|tags| tags.contains(&DiagnosticTag::UNNECESSARY));
 
             let underline = self
                 .language_server_adapter_for_id(server_id)
-                .map_or(true, |adapter| adapter.underline_diagnostic(diagnostic));
+                .is_none_or(|adapter| adapter.underline_diagnostic(diagnostic));
 
             if is_supporting {
                 supporting_diagnostics.insert(
@@ -10703,7 +10702,7 @@ impl LspStore {
             } else {
                 let group_id = post_inc(&mut self.as_local_mut().unwrap().next_diagnostic_group_id);
                 let is_disk_based =
-                    source.map_or(false, |source| disk_based_sources.contains(source));
+                    source.is_some_and(|source| disk_based_sources.contains(source));
 
                 sources_by_group_id.insert(group_id, source);
                 primary_diagnostic_group_ids
@@ -12409,7 +12408,7 @@ impl TryFrom<&FileOperationFilter> for RenameActionPredicate {
                     ops.pattern
                         .options
                         .as_ref()
-                        .map_or(false, |ops| ops.ignore_case.unwrap_or(false)),
+                        .is_some_and(|ops| ops.ignore_case.unwrap_or(false)),
                 )
                 .build()?
                 .compile_matcher(),
@@ -12424,7 +12423,7 @@ struct RenameActionPredicate {
 impl RenameActionPredicate {
     // Returns true if language server should be notified
     fn eval(&self, path: &str, is_dir: bool) -> bool {
-        self.kind.as_ref().map_or(true, |kind| {
+        self.kind.as_ref().is_none_or(|kind| {
             let expected_kind = if is_dir {
                 FileOperationPatternKind::Folder
             } else {
diff --git a/crates/project/src/manifest_tree.rs b/crates/project/src/manifest_tree.rs
index f68905d14c..750815c477 100644
--- a/crates/project/src/manifest_tree.rs
+++ b/crates/project/src/manifest_tree.rs
@@ -218,10 +218,8 @@ impl ManifestQueryDelegate {
 
 impl ManifestDelegate for ManifestQueryDelegate {
     fn exists(&self, path: &Path, is_dir: Option<bool>) -> bool {
-        self.worktree.entry_for_path(path).map_or(false, |entry| {
-            is_dir.map_or(true, |is_required_to_be_dir| {
-                is_required_to_be_dir == entry.is_dir()
-            })
+        self.worktree.entry_for_path(path).is_some_and(|entry| {
+            is_dir.is_none_or(|is_required_to_be_dir| is_required_to_be_dir == entry.is_dir())
         })
     }
 
diff --git a/crates/project/src/manifest_tree/server_tree.rs b/crates/project/src/manifest_tree/server_tree.rs
index 7da43feeef..f5fd481324 100644
--- a/crates/project/src/manifest_tree/server_tree.rs
+++ b/crates/project/src/manifest_tree/server_tree.rs
@@ -314,7 +314,7 @@ impl LanguageServerTree {
     pub(crate) fn remove_nodes(&mut self, ids: &BTreeSet<LanguageServerId>) {
         for (_, servers) in &mut self.instances {
             for (_, nodes) in &mut servers.roots {
-                nodes.retain(|_, (node, _)| node.id.get().map_or(true, |id| !ids.contains(id)));
+                nodes.retain(|_, (node, _)| node.id.get().is_none_or(|id| !ids.contains(id)));
             }
         }
     }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index f825cd8c47..f9ad7b96d3 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1897,7 +1897,7 @@ impl Project {
             return true;
         }
 
-        return false;
+        false
     }
 
     pub fn ssh_connection_string(&self, cx: &App) -> Option<SharedString> {
@@ -1905,7 +1905,7 @@ impl Project {
             return Some(ssh_state.read(cx).connection_string().into());
         }
 
-        return None;
+        None
     }
 
     pub fn ssh_connection_state(&self, cx: &App) -> Option<remote::ConnectionState> {
@@ -4134,7 +4134,7 @@ impl Project {
                 }
             })
         } else {
-            return Task::ready(None);
+            Task::ready(None)
         }
     }
 
@@ -5187,7 +5187,7 @@ impl<'a> fuzzy::PathMatchCandidateSet<'a> for PathMatchCandidateSet {
     }
 
     fn prefix(&self) -> Arc<str> {
-        if self.snapshot.root_entry().map_or(false, |e| e.is_file()) {
+        if self.snapshot.root_entry().is_some_and(|e| e.is_file()) {
             self.snapshot.root_name().into()
         } else if self.include_root_name {
             format!("{}{}", self.snapshot.root_name(), std::path::MAIN_SEPARATOR).into()
@@ -5397,7 +5397,7 @@ impl Completion {
         self.source
             // `lsp::CompletionListItemDefaults` has `insert_text_format` field
             .lsp_completion(true)
-            .map_or(false, |lsp_completion| {
+            .is_some_and(|lsp_completion| {
                 lsp_completion.insert_text_format == Some(lsp::InsertTextFormat::SNIPPET)
             })
     }
@@ -5453,9 +5453,10 @@ fn provide_inline_values(
                     .collect::<String>();
                 let point = snapshot.offset_to_point(capture_range.end);
 
-                while scopes.last().map_or(false, |scope: &Range<_>| {
-                    !scope.contains(&capture_range.start)
-                }) {
+                while scopes
+                    .last()
+                    .is_some_and(|scope: &Range<_>| !scope.contains(&capture_range.start))
+                {
                     scopes.pop();
                 }
 
@@ -5465,7 +5466,7 @@ fn provide_inline_values(
 
                 let scope = if scopes
                     .last()
-                    .map_or(true, |scope| !scope.contains(&active_debug_line_offset))
+                    .is_none_or(|scope| !scope.contains(&active_debug_line_offset))
                 {
                     VariableScope::Global
                 } else {
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 050ca60e7a..a6fea4059c 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -188,9 +188,9 @@ pub struct DiagnosticsSettings {
 
 impl DiagnosticsSettings {
     pub fn fetch_cargo_diagnostics(&self) -> bool {
-        self.cargo.as_ref().map_or(false, |cargo_diagnostics| {
-            cargo_diagnostics.fetch_cargo_diagnostics
-        })
+        self.cargo
+            .as_ref()
+            .is_some_and(|cargo_diagnostics| cargo_diagnostics.fetch_cargo_diagnostics)
     }
 }
 
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 5b3827b42b..5137d64fab 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -2947,9 +2947,10 @@ fn chunks_with_diagnostics<T: ToOffset + ToPoint>(
 ) -> Vec<(String, Option<DiagnosticSeverity>)> {
     let mut chunks: Vec<(String, Option<DiagnosticSeverity>)> = Vec::new();
     for chunk in buffer.snapshot().chunks(range, true) {
-        if chunks.last().map_or(false, |prev_chunk| {
-            prev_chunk.1 == chunk.diagnostic_severity
-        }) {
+        if chunks
+            .last()
+            .is_some_and(|prev_chunk| prev_chunk.1 == chunk.diagnostic_severity)
+        {
             chunks.last_mut().unwrap().0.push_str(chunk.text);
         } else {
             chunks.push((chunk.text.to_string(), chunk.diagnostic_severity));
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 5f98a10c75..212d2dd2d9 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -99,7 +99,7 @@ impl Project {
             }
         }
 
-        return None;
+        None
     }
 
     pub fn create_terminal(
@@ -518,7 +518,7 @@ impl Project {
                 smol::block_on(fs.metadata(&bin_path))
                     .ok()
                     .flatten()
-                    .map_or(false, |meta| meta.is_dir)
+                    .is_some_and(|meta| meta.is_dir)
             })
     }
 
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index dd6b081e98..9a87874ed8 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -563,7 +563,7 @@ impl ProjectPanel {
                         if project_panel
                             .edit_state
                             .as_ref()
-                            .map_or(false, |state| state.processing_filename.is_none())
+                            .is_some_and(|state| state.processing_filename.is_none())
                         {
                             project_panel.edit_state = None;
                             project_panel.update_visible_entries(None, cx);
@@ -3091,7 +3091,7 @@ impl ProjectPanel {
                     entry.id == new_entry_id || {
                         self.ancestors
                             .get(&entry.id)
-                            .map_or(false, |entries| entries.ancestors.contains(&new_entry_id))
+                            .is_some_and(|entries| entries.ancestors.contains(&new_entry_id))
                     }
                 } else {
                     false
@@ -3974,7 +3974,7 @@ impl ProjectPanel {
         let is_marked = self.marked_entries.contains(&selection);
         let is_active = self
             .selection
-            .map_or(false, |selection| selection.entry_id == entry_id);
+            .is_some_and(|selection| selection.entry_id == entry_id);
 
         let file_name = details.filename.clone();
 
@@ -4181,7 +4181,7 @@ impl ProjectPanel {
                             || this
                                 .expanded_dir_ids
                                 .get(&details.worktree_id)
-                                .map_or(false, |ids| ids.binary_search(&entry_id).is_ok())
+                                .is_some_and(|ids| ids.binary_search(&entry_id).is_ok())
                         {
                             return;
                         }
@@ -4401,19 +4401,17 @@ impl ProjectPanel {
                         } else {
                             h_flex().child(Icon::from_path(icon.to_string()).color(Color::Muted))
                         }
+                    } else if let Some((icon_name, color)) =
+                        entry_diagnostic_aware_icon_name_and_color(diagnostic_severity)
+                    {
+                        h_flex()
+                            .size(IconSize::default().rems())
+                            .child(Icon::new(icon_name).color(color).size(IconSize::Small))
                     } else {
-                        if let Some((icon_name, color)) =
-                            entry_diagnostic_aware_icon_name_and_color(diagnostic_severity)
-                        {
-                            h_flex()
-                                .size(IconSize::default().rems())
-                                .child(Icon::new(icon_name).color(color).size(IconSize::Small))
-                        } else {
-                            h_flex()
-                                .size(IconSize::default().rems())
-                                .invisible()
-                                .flex_none()
-                        }
+                        h_flex()
+                            .size(IconSize::default().rems())
+                            .invisible()
+                            .flex_none()
                     })
                     .child(
                         if let (Some(editor), true) = (Some(&self.filename_editor), show_editor) {
@@ -4465,7 +4463,7 @@ impl ProjectPanel {
                                                                     );
                                                                 } else {
                                                                     let is_current_target = this.folded_directory_drag_target
-                                                                        .map_or(false, |target|
+                                                                        .is_some_and(|target|
                                                                             target.entry_id == entry_id &&
                                                                             target.index == delimiter_target_index &&
                                                                             target.is_delimiter_target
@@ -4509,7 +4507,7 @@ impl ProjectPanel {
                                                             } else {
                                                                 let is_current_target = this.folded_directory_drag_target
                                                                     .as_ref()
-                                                                    .map_or(false, |target|
+                                                                    .is_some_and(|target|
                                                                         target.entry_id == entry_id &&
                                                                         target.index == index &&
                                                                         !target.is_delimiter_target
@@ -4528,7 +4526,7 @@ impl ProjectPanel {
                                                             this.drag_onto(selections, target_entry_id, kind.is_file(), window, cx);
                                                         }
                                                     }))
-                                                    .when(folded_directory_drag_target.map_or(false, |target|
+                                                    .when(folded_directory_drag_target.is_some_and(|target|
                                                         target.entry_id == entry_id &&
                                                         target.index == index
                                                     ), |this| {
@@ -4694,7 +4692,7 @@ impl ProjectPanel {
         let is_cut = self
             .clipboard
             .as_ref()
-            .map_or(false, |e| e.is_cut() && e.items().contains(&selection));
+            .is_some_and(|e| e.is_cut() && e.items().contains(&selection));
 
         EntryDetails {
             filename,
@@ -4892,7 +4890,7 @@ impl ProjectPanel {
         if skip_ignored
             && worktree
                 .entry_for_id(entry_id)
-                .map_or(true, |entry| entry.is_ignored && !entry.is_always_included)
+                .is_none_or(|entry| entry.is_ignored && !entry.is_always_included)
         {
             anyhow::bail!("can't reveal an ignored entry in the project panel");
         }
@@ -5687,7 +5685,7 @@ impl Panel for ProjectPanel {
         project.visible_worktrees(cx).any(|tree| {
             tree.read(cx)
                 .root_entry()
-                .map_or(false, |entry| entry.is_dir())
+                .is_some_and(|entry| entry.is_dir())
         })
     }
 
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 9fffbde5f7..9d0f54bc01 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -196,7 +196,7 @@ impl PickerDelegate for ProjectSymbolsDelegate {
                         .partition(|candidate| {
                             project
                                 .entry_for_path(&symbols[candidate.id].path, cx)
-                                .map_or(false, |e| !e.is_ignored)
+                                .is_some_and(|e| !e.is_ignored)
                         });
 
                     delegate.visible_match_candidates = visible_match_candidates;
diff --git a/crates/prompt_store/src/prompt_store.rs b/crates/prompt_store/src/prompt_store.rs
index 06a65b97cd..fb087ce34d 100644
--- a/crates/prompt_store/src/prompt_store.rs
+++ b/crates/prompt_store/src/prompt_store.rs
@@ -247,9 +247,7 @@ impl PromptStore {
 
             if metadata_db
                 .get(&txn, &prompt_id_v2)?
-                .map_or(true, |metadata_v2| {
-                    metadata_v1.saved_at > metadata_v2.saved_at
-                })
+                .is_none_or(|metadata_v2| metadata_v1.saved_at > metadata_v2.saved_at)
             {
                 metadata_db.put(
                     &mut txn,
diff --git a/crates/prompt_store/src/prompts.rs b/crates/prompt_store/src/prompts.rs
index 526d2c6a34..cd34bafb20 100644
--- a/crates/prompt_store/src/prompts.rs
+++ b/crates/prompt_store/src/prompts.rs
@@ -286,7 +286,7 @@ impl PromptBuilder {
                             break;
                         }
                     for event in changed_paths {
-                        if event.path.starts_with(&templates_dir) && event.path.extension().map_or(false, |ext| ext == "hbs") {
+                        if event.path.starts_with(&templates_dir) && event.path.extension().is_some_and(|ext| ext == "hbs") {
                             log::info!("Reloading prompt template override: {}", event.path.display());
                             if let Some(content) = params.fs.load(&event.path).await.log_err() {
                                 let file_name = event.path.file_stem().unwrap().to_string_lossy();
diff --git a/crates/recent_projects/src/disconnected_overlay.rs b/crates/recent_projects/src/disconnected_overlay.rs
index a6cd26355c..9b79d3ce9c 100644
--- a/crates/recent_projects/src/disconnected_overlay.rs
+++ b/crates/recent_projects/src/disconnected_overlay.rs
@@ -37,7 +37,7 @@ impl ModalView for DisconnectedOverlay {
         _window: &mut Window,
         _: &mut Context<Self>,
     ) -> workspace::DismissDecision {
-        return workspace::DismissDecision::Dismiss(self.finished);
+        workspace::DismissDecision::Dismiss(self.finished)
     }
     fn fade_out_background(&self) -> bool {
         true
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 0fd6d5af8c..0f43d83d86 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1410,7 +1410,7 @@ impl RemoteServerProjects {
         if ssh_settings
             .ssh_connections
             .as_ref()
-            .map_or(false, |connections| {
+            .is_some_and(|connections| {
                 state
                     .servers
                     .iter()
diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/ssh_connections.rs
index 7b58792178..670fcb4800 100644
--- a/crates/recent_projects/src/ssh_connections.rs
+++ b/crates/recent_projects/src/ssh_connections.rs
@@ -436,7 +436,7 @@ impl ModalView for SshConnectionModal {
         _window: &mut Window,
         _: &mut Context<Self>,
     ) -> workspace::DismissDecision {
-        return workspace::DismissDecision::Dismiss(self.finished);
+        workspace::DismissDecision::Dismiss(self.finished)
     }
 
     fn fade_out_background(&self) -> bool {
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 2180fbb5ee..abde2d7568 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -1119,7 +1119,7 @@ impl SshRemoteClient {
     }
 
     fn state_is(&self, check: impl FnOnce(&State) -> bool) -> bool {
-        self.state.lock().as_ref().map_or(false, check)
+        self.state.lock().as_ref().is_some_and(check)
     }
 
     fn try_set_state(&self, cx: &mut Context<Self>, map: impl FnOnce(&State) -> Option<State>) {
@@ -1870,7 +1870,7 @@ impl SshRemoteConnection {
             .await?;
         self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
             .await?;
-        return Ok(dst_path);
+        Ok(dst_path)
     }
 
     async fn download_binary_on_server(
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
index cd73783b4c..b8fd2e57f2 100644
--- a/crates/repl/src/components/kernel_options.rs
+++ b/crates/repl/src/components/kernel_options.rs
@@ -126,7 +126,7 @@ impl PickerDelegate for KernelPickerDelegate {
                 .collect()
         };
 
-        return Task::ready(());
+        Task::ready(())
     }
 
     fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
diff --git a/crates/repl/src/repl_editor.rs b/crates/repl/src/repl_editor.rs
index f5dd659597..e97223ceb9 100644
--- a/crates/repl/src/repl_editor.rs
+++ b/crates/repl/src/repl_editor.rs
@@ -434,7 +434,7 @@ fn runnable_ranges(
 
     if start_language
         .zip(end_language)
-        .map_or(false, |(start, end)| start == end)
+        .is_some_and(|(start, end)| start == end)
     {
         (vec![snippet_range], None)
     } else {
diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
index 78ce6f78a2..0d3f5abbde 100644
--- a/crates/rope/src/rope.rs
+++ b/crates/rope/src/rope.rs
@@ -35,7 +35,7 @@ impl Rope {
             && (self
                 .chunks
                 .last()
-                .map_or(false, |c| c.text.len() < chunk::MIN_BASE)
+                .is_some_and(|c| c.text.len() < chunk::MIN_BASE)
                 || chunk.text.len() < chunk::MIN_BASE)
         {
             self.push_chunk(chunk.as_slice());
@@ -816,7 +816,7 @@ impl<'a> Chunks<'a> {
             }
         }
 
-        return true;
+        true
     }
 }
 
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
index ec83993e5f..355deb5d20 100644
--- a/crates/rules_library/src/rules_library.rs
+++ b/crates/rules_library/src/rules_library.rs
@@ -703,9 +703,7 @@ impl RulesLibrary {
                     .delegate
                     .matches
                     .get(picker.delegate.selected_index())
-                    .map_or(true, |old_selected_prompt| {
-                        old_selected_prompt.id != prompt_id
-                    })
+                    .is_none_or(|old_selected_prompt| old_selected_prompt.id != prompt_id)
                     && let Some(ix) = picker
                         .delegate
                         .matches
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index e95617512d..ae3f42853a 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -653,7 +653,7 @@ impl KeymapFile {
             let is_only_binding = keymap.0[index]
                 .bindings
                 .as_ref()
-                .map_or(true, |bindings| bindings.len() == 1);
+                .is_none_or(|bindings| bindings.len() == 1);
             let key_path: &[&str] = if is_only_binding {
                 &[]
             } else {
@@ -703,7 +703,7 @@ impl KeymapFile {
                 } else if keymap.0[index]
                     .bindings
                     .as_ref()
-                    .map_or(true, |bindings| bindings.len() == 1)
+                    .is_none_or(|bindings| bindings.len() == 1)
                 {
                     // if we are replacing the only binding in the section,
                     // just update the section in place, updating the context
@@ -1056,10 +1056,10 @@ mod tests {
 
     #[track_caller]
     fn parse_keystrokes(keystrokes: &str) -> Vec<Keystroke> {
-        return keystrokes
+        keystrokes
             .split(' ')
             .map(|s| Keystroke::parse(s).expect("Keystrokes valid"))
-            .collect();
+            .collect()
     }
 
     #[test]
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index 8e7e11dc82..c102b303c1 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -72,7 +72,7 @@ pub fn update_value_in_json_text<'a>(
         }
     } else if key_path
         .last()
-        .map_or(false, |key| preserved_keys.contains(key))
+        .is_some_and(|key| preserved_keys.contains(key))
         || old_value != new_value
     {
         let mut new_value = new_value.clone();
@@ -384,7 +384,7 @@ pub fn replace_top_level_array_value_in_json_text(
                 remove_range.start = cursor.node().range().start_byte;
             }
         }
-        return Ok((remove_range, String::new()));
+        Ok((remove_range, String::new()))
     } else {
         let (mut replace_range, mut replace_value) =
             replace_value_in_json_text(value_str, key_path, tab_size, new_value, replace_key);
@@ -405,7 +405,7 @@ pub fn replace_top_level_array_value_in_json_text(
             }
         }
 
-        return Ok((replace_range, replace_value));
+        Ok((replace_range, replace_value))
     }
 }
 
@@ -527,7 +527,7 @@ pub fn append_top_level_array_value_in_json_text(
         let descendant_index = cursor.descendant_index();
         let res = cursor.goto_first_child() && cursor.node().kind() == kind;
         cursor.goto_descendant(descendant_index);
-        return res;
+        res
     }
 }
 
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 23f495d850..211db46c6c 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -1233,8 +1233,7 @@ impl SettingsStore {
 
                         // If a local settings file changed, then avoid recomputing local
                         // settings for any path outside of that directory.
-                        if changed_local_path.map_or(
-                            false,
+                        if changed_local_path.is_some_and(
                             |(changed_root_id, changed_local_path)| {
                                 *root_id != changed_root_id
                                     || !directory_path.starts_with(changed_local_path)
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
index 8a34c12051..25be67bfd7 100644
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ b/crates/settings_profile_selector/src/settings_profile_selector.rs
@@ -126,7 +126,7 @@ impl SettingsProfileSelectorDelegate {
     ) -> Option<String> {
         let mat = self.matches.get(self.selected_index)?;
         let profile_name = self.profile_names.get(mat.candidate_id)?;
-        return Self::update_active_profile_name_global(profile_name.clone(), cx);
+        Self::update_active_profile_name_global(profile_name.clone(), cx)
     }
 
     fn update_active_profile_name_global(
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index b8c52602a6..457d58e5a7 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -553,7 +553,7 @@ impl KeymapEditor {
                                 if exact_match {
                                     keystrokes_match_exactly(&keystroke_query, keystrokes)
                                 } else if keystroke_query.len() > keystrokes.len() {
-                                    return false;
+                                    false
                                 } else {
                                     for keystroke_offset in 0..keystrokes.len() {
                                         let mut found_count = 0;
@@ -568,12 +568,9 @@ impl KeymapEditor {
                                                 query.modifiers.is_subset_of(&keystroke.modifiers)
                                                     && ((query.key.is_empty()
                                                         || query.key == keystroke.key)
-                                                        && query
-                                                            .key_char
-                                                            .as_ref()
-                                                            .map_or(true, |q_kc| {
-                                                                q_kc == &keystroke.key
-                                                            }));
+                                                        && query.key_char.as_ref().is_none_or(
+                                                            |q_kc| q_kc == &keystroke.key,
+                                                        ));
                                             if matches {
                                                 found_count += 1;
                                                 query_cursor += 1;
@@ -585,7 +582,7 @@ impl KeymapEditor {
                                             return true;
                                         }
                                     }
-                                    return false;
+                                    false
                                 }
                             })
                     });
@@ -2715,7 +2712,7 @@ impl ActionArgumentsEditor {
                 })
                 .ok();
             }
-            return result;
+            result
         })
         .detach_and_log_err(cx);
         Self {
@@ -2818,7 +2815,7 @@ impl Render for ActionArgumentsEditor {
         self.editor
             .update(cx, |editor, _| editor.set_text_style_refinement(text_style));
 
-        return v_flex().w_full().child(
+        v_flex().w_full().child(
             h_flex()
                 .min_h_8()
                 .min_w_48()
@@ -2831,7 +2828,7 @@ impl Render for ActionArgumentsEditor {
                 .border_color(border_color)
                 .track_focus(&self.focus_handle)
                 .child(self.editor.clone()),
-        );
+        )
     }
 }
 
@@ -2889,9 +2886,9 @@ impl CompletionProvider for KeyContextCompletionProvider {
         _menu_is_open: bool,
         _cx: &mut Context<Editor>,
     ) -> bool {
-        text.chars().last().map_or(false, |last_char| {
-            last_char.is_ascii_alphanumeric() || last_char == '_'
-        })
+        text.chars()
+            .last()
+            .is_some_and(|last_char| last_char.is_ascii_alphanumeric() || last_char == '_')
     }
 }
 
@@ -2910,7 +2907,7 @@ async fn load_json_language(workspace: WeakEntity<Workspace>, cx: &mut AsyncApp)
         Some(task) => task.await.context("Failed to load JSON language").log_err(),
         None => None,
     };
-    return json_language.unwrap_or_else(|| {
+    json_language.unwrap_or_else(|| {
         Arc::new(Language::new(
             LanguageConfig {
                 name: "JSON".into(),
@@ -2918,7 +2915,7 @@ async fn load_json_language(workspace: WeakEntity<Workspace>, cx: &mut AsyncApp)
             },
             Some(tree_sitter_json::LANGUAGE.into()),
         ))
-    });
+    })
 }
 
 async fn load_keybind_context_language(
@@ -2942,7 +2939,7 @@ async fn load_keybind_context_language(
             .log_err(),
         None => None,
     };
-    return language.unwrap_or_else(|| {
+    language.unwrap_or_else(|| {
         Arc::new(Language::new(
             LanguageConfig {
                 name: "Zed Keybind Context".into(),
@@ -2950,7 +2947,7 @@ async fn load_keybind_context_language(
             },
             Some(tree_sitter_rust::LANGUAGE.into()),
         ))
-    });
+    })
 }
 
 async fn save_keybinding_update(
@@ -3130,7 +3127,7 @@ fn collect_contexts_from_assets() -> Vec<SharedString> {
     let mut contexts = contexts.into_iter().collect::<Vec<_>>();
     contexts.sort();
 
-    return contexts;
+    contexts
 }
 
 impl SerializableItem for KeymapEditor {
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/settings_ui/src/ui_components/keystroke_input.rs
index de133d406b..66593524a3 100644
--- a/crates/settings_ui/src/ui_components/keystroke_input.rs
+++ b/crates/settings_ui/src/ui_components/keystroke_input.rs
@@ -116,19 +116,19 @@ impl KeystrokeInput {
             && self
                 .keystrokes
                 .last()
-                .map_or(false, |last| last.key.is_empty())
+                .is_some_and(|last| last.key.is_empty())
         {
             return &self.keystrokes[..self.keystrokes.len() - 1];
         }
-        return &self.keystrokes;
+        &self.keystrokes
     }
 
     fn dummy(modifiers: Modifiers) -> Keystroke {
-        return Keystroke {
+        Keystroke {
             modifiers,
             key: "".to_string(),
             key_char: None,
-        };
+        }
     }
 
     fn keystrokes_changed(&self, cx: &mut Context<Self>) {
@@ -182,7 +182,7 @@ impl KeystrokeInput {
     fn end_close_keystrokes_capture(&mut self) -> Option<usize> {
         self.close_keystrokes.take();
         self.clear_close_keystrokes_timer.take();
-        return self.close_keystrokes_start.take();
+        self.close_keystrokes_start.take()
     }
 
     fn handle_possible_close_keystroke(
@@ -233,7 +233,7 @@ impl KeystrokeInput {
             return CloseKeystrokeResult::Partial;
         }
         self.end_close_keystrokes_capture();
-        return CloseKeystrokeResult::None;
+        CloseKeystrokeResult::None
     }
 
     fn on_modifiers_changed(
@@ -437,7 +437,7 @@ impl KeystrokeInput {
         // is a much more reliable check, as the intercept keystroke handlers are installed
         // on focus of the inner focus handle, thereby ensuring our recording state does
         // not get de-synced
-        return self.inner_focus_handle.is_focused(window);
+        self.inner_focus_handle.is_focused(window)
     }
 }
 
@@ -934,7 +934,7 @@ mod tests {
             let change_tracker = KeystrokeUpdateTracker::new(self.input.clone(), &mut self.cx);
             let result = self.input.update_in(&mut self.cx, cb);
             KeystrokeUpdateTracker::finish(change_tracker, &self.cx);
-            return result;
+            result
         }
     }
 
diff --git a/crates/settings_ui/src/ui_components/table.rs b/crates/settings_ui/src/ui_components/table.rs
index 66dd636d21..a91d497572 100644
--- a/crates/settings_ui/src/ui_components/table.rs
+++ b/crates/settings_ui/src/ui_components/table.rs
@@ -731,7 +731,7 @@ impl<const COLS: usize> ColumnWidths<COLS> {
         }
         widths[col_idx] = widths[col_idx] + (diff - diff_remaining);
 
-        return diff_remaining;
+        diff_remaining
     }
 }
 
diff --git a/crates/snippet/src/snippet.rs b/crates/snippet/src/snippet.rs
index 6a673fe08b..4be4281d9a 100644
--- a/crates/snippet/src/snippet.rs
+++ b/crates/snippet/src/snippet.rs
@@ -33,7 +33,7 @@ impl Snippet {
                 choices: None,
             };
 
-            if !tabstops.last().map_or(false, |t| *t == end_tabstop) {
+            if !tabstops.last().is_some_and(|t| *t == end_tabstop) {
                 tabstops.push(end_tabstop);
             }
         }
diff --git a/crates/snippet_provider/src/lib.rs b/crates/snippet_provider/src/lib.rs
index c8d2555df2..eac06924a7 100644
--- a/crates/snippet_provider/src/lib.rs
+++ b/crates/snippet_provider/src/lib.rs
@@ -71,16 +71,16 @@ async fn process_updates(
 ) -> Result<()> {
     let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
     for entry_path in entries {
-        if !entry_path
+        if entry_path
             .extension()
-            .map_or(false, |extension| extension == "json")
+            .is_none_or(|extension| extension != "json")
         {
             continue;
         }
         let entry_metadata = fs.metadata(&entry_path).await;
         // Entry could have been removed, in which case we should no longer show completions for it.
         let entry_exists = entry_metadata.is_ok();
-        if entry_metadata.map_or(false, |entry| entry.map_or(false, |e| e.is_dir)) {
+        if entry_metadata.is_ok_and(|entry| entry.is_some_and(|e| e.is_dir)) {
             // Don't process dirs.
             continue;
         }
diff --git a/crates/sum_tree/src/sum_tree.rs b/crates/sum_tree/src/sum_tree.rs
index f551bb32e6..710fdd4fbf 100644
--- a/crates/sum_tree/src/sum_tree.rs
+++ b/crates/sum_tree/src/sum_tree.rs
@@ -94,9 +94,7 @@ impl<'a, S: Summary, D: Dimension<'a, S> + Ord> SeekTarget<'a, S, D> for D {
 }
 
 impl<'a, T: Summary> Dimension<'a, T> for () {
-    fn zero(_: &T::Context) -> Self {
-        ()
-    }
+    fn zero(_: &T::Context) -> Self {}
 
     fn add_summary(&mut self, _: &'a T, _: &T::Context) {}
 }
@@ -728,7 +726,7 @@ impl<T: KeyedItem> SumTree<T> {
 
                 if old_item
                     .as_ref()
-                    .map_or(false, |old_item| old_item.key() < new_key)
+                    .is_some_and(|old_item| old_item.key() < new_key)
                 {
                     new_tree.extend(buffered_items.drain(..), cx);
                     let slice = cursor.slice(&new_key, Bias::Left);
diff --git a/crates/supermaven/src/supermaven.rs b/crates/supermaven/src/supermaven.rs
index a31b96d882..743c0d4c7d 100644
--- a/crates/supermaven/src/supermaven.rs
+++ b/crates/supermaven/src/supermaven.rs
@@ -243,7 +243,7 @@ fn find_relevant_completion<'a>(
                 None => continue 'completions,
             };
 
-        if best_completion.map_or(false, |best| best.len() > trimmed_completion.len()) {
+        if best_completion.is_some_and(|best| best.len() > trimmed_completion.len()) {
             continue;
         }
 
diff --git a/crates/supermaven_api/src/supermaven_api.rs b/crates/supermaven_api/src/supermaven_api.rs
index 61d14d5dc7..c4b1409d64 100644
--- a/crates/supermaven_api/src/supermaven_api.rs
+++ b/crates/supermaven_api/src/supermaven_api.rs
@@ -221,9 +221,7 @@ pub fn version_path(version: u64) -> PathBuf {
 }
 
 pub async fn has_version(version_path: &Path) -> bool {
-    fs::metadata(version_path)
-        .await
-        .map_or(false, |m| m.is_file())
+    fs::metadata(version_path).await.is_ok_and(|m| m.is_file())
 }
 
 pub async fn get_supermaven_agent_path(client: Arc<dyn HttpClient>) -> Result<PathBuf> {
diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs
index 90e6ea8878..dae366a979 100644
--- a/crates/tasks_ui/src/tasks_ui.rs
+++ b/crates/tasks_ui/src/tasks_ui.rs
@@ -283,7 +283,7 @@ pub fn task_contexts(
                 .project()
                 .read(cx)
                 .worktree_for_id(*worktree_id, cx)
-                .map_or(false, |worktree| is_visible_directory(&worktree, cx))
+                .is_some_and(|worktree| is_visible_directory(&worktree, cx))
         })
         .or_else(|| {
             workspace
@@ -372,7 +372,7 @@ pub fn task_contexts(
 
 fn is_visible_directory(worktree: &Entity<Worktree>, cx: &App) -> bool {
     let worktree = worktree.read(cx);
-    worktree.is_visible() && worktree.root_entry().map_or(false, |entry| entry.is_dir())
+    worktree.is_visible() && worktree.root_entry().is_some_and(|entry| entry.is_dir())
 }
 
 fn worktree_context(worktree_abs_path: &Path) -> TaskContext {
diff --git a/crates/telemetry/src/telemetry.rs b/crates/telemetry/src/telemetry.rs
index f8f7d5851e..ac43457c33 100644
--- a/crates/telemetry/src/telemetry.rs
+++ b/crates/telemetry/src/telemetry.rs
@@ -55,7 +55,6 @@ macro_rules! serialize_property {
 pub fn send_event(event: Event) {
     if let Some(queue) = TELEMETRY_QUEUE.get() {
         queue.unbounded_send(event).ok();
-        return;
     }
 }
 
diff --git a/crates/terminal/src/pty_info.rs b/crates/terminal/src/pty_info.rs
index 802470493c..a1a559051a 100644
--- a/crates/terminal/src/pty_info.rs
+++ b/crates/terminal/src/pty_info.rs
@@ -122,7 +122,7 @@ impl PtyProcessInfo {
     }
 
     pub(crate) fn kill_current_process(&mut self) -> bool {
-        self.refresh().map_or(false, |process| process.kill())
+        self.refresh().is_some_and(|process| process.kill())
     }
 
     fn load(&mut self) -> Option<ProcessInfo> {
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 42b3694789..16c1efabba 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -1299,23 +1299,19 @@ impl Terminal {
                 let selection = Selection::new(selection_type, point, side);
                 self.events
                     .push_back(InternalEvent::SetSelection(Some((selection, point))));
-                return;
             }
 
             "escape" => {
                 self.events.push_back(InternalEvent::SetSelection(None));
-                return;
             }
 
             "y" => {
                 self.copy(Some(false));
-                return;
             }
 
             "i" => {
                 self.scroll_to_bottom();
                 self.toggle_vi_mode();
-                return;
             }
             _ => {}
         }
@@ -1891,11 +1887,11 @@ impl Terminal {
         let e: Option<ExitStatus> = error_code.map(|code| {
             #[cfg(unix)]
             {
-                return std::os::unix::process::ExitStatusExt::from_raw(code);
+                std::os::unix::process::ExitStatusExt::from_raw(code)
             }
             #[cfg(windows)]
             {
-                return std::os::windows::process::ExitStatusExt::from_raw(code as u32);
+                std::os::windows::process::ExitStatusExt::from_raw(code as u32)
             }
         });
 
diff --git a/crates/terminal/src/terminal_hyperlinks.rs b/crates/terminal/src/terminal_hyperlinks.rs
index e318ae21bd..9f565bd306 100644
--- a/crates/terminal/src/terminal_hyperlinks.rs
+++ b/crates/terminal/src/terminal_hyperlinks.rs
@@ -124,12 +124,12 @@ pub(super) fn find_from_grid_point<T: EventListener>(
                     && file_path
                         .chars()
                         .nth(last_index - 1)
-                        .map_or(false, |c| c.is_ascii_digit());
+                        .is_some_and(|c| c.is_ascii_digit());
                 let next_is_digit = last_index < file_path.len() - 1
                     && file_path
                         .chars()
                         .nth(last_index + 1)
-                        .map_or(true, |c| c.is_ascii_digit());
+                        .is_none_or(|c| c.is_ascii_digit());
                 if prev_is_digit && !next_is_digit {
                     let stripped_len = file_path.len() - last_index;
                     word_match = Match::new(
diff --git a/crates/terminal_view/src/color_contrast.rs b/crates/terminal_view/src/color_contrast.rs
index fe4a881cea..522dca3e91 100644
--- a/crates/terminal_view/src/color_contrast.rs
+++ b/crates/terminal_view/src/color_contrast.rs
@@ -235,12 +235,10 @@ fn adjust_lightness_for_contrast(
             } else {
                 high = mid;
             }
+        } else if should_go_darker {
+            high = mid;
         } else {
-            if should_go_darker {
-                high = mid;
-            } else {
-                low = mid;
-            }
+            low = mid;
         }
 
         // If we're close enough to the target, stop
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 7575706db0..1c38dbc877 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1478,7 +1478,7 @@ pub fn is_blank(cell: &IndexedCell) -> bool {
         return false;
     }
 
-    return true;
+    true
 }
 
 fn to_highlighted_range_lines(
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index b161a8ea89..c50e2bd3a7 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -350,12 +350,10 @@ impl TerminalPanel {
                         pane.set_zoomed(false, cx);
                     });
                     cx.emit(PanelEvent::Close);
-                } else {
-                    if let Some(focus_on_pane) =
-                        focus_on_pane.as_ref().or_else(|| self.center.panes().pop())
-                    {
-                        focus_on_pane.focus_handle(cx).focus(window);
-                    }
+                } else if let Some(focus_on_pane) =
+                    focus_on_pane.as_ref().or_else(|| self.center.panes().pop())
+                {
+                    focus_on_pane.focus_handle(cx).focus(window);
                 }
             }
             pane::Event::ZoomIn => {
@@ -896,9 +894,9 @@ impl TerminalPanel {
     }
 
     fn is_enabled(&self, cx: &App) -> bool {
-        self.workspace.upgrade().map_or(false, |workspace| {
-            is_enabled_in_workspace(workspace.read(cx), cx)
-        })
+        self.workspace
+            .upgrade()
+            .is_some_and(|workspace| is_enabled_in_workspace(workspace.read(cx), cx))
     }
 
     fn activate_pane_in_direction(
@@ -1242,20 +1240,18 @@ impl Render for TerminalPanel {
                         let panes = terminal_panel.center.panes();
                         if let Some(&pane) = panes.get(action.0) {
                             window.focus(&pane.read(cx).focus_handle(cx));
-                        } else {
-                            if let Some(new_pane) =
-                                terminal_panel.new_pane_with_cloned_active_terminal(window, cx)
-                            {
-                                terminal_panel
-                                    .center
-                                    .split(
-                                        &terminal_panel.active_pane,
-                                        &new_pane,
-                                        SplitDirection::Right,
-                                    )
-                                    .log_err();
-                                window.focus(&new_pane.focus_handle(cx));
-                            }
+                        } else if let Some(new_pane) =
+                            terminal_panel.new_pane_with_cloned_active_terminal(window, cx)
+                        {
+                            terminal_panel
+                                .center
+                                .split(
+                                    &terminal_panel.active_pane,
+                                    &new_pane,
+                                    SplitDirection::Right,
+                                )
+                                .log_err();
+                            window.focus(&new_pane.focus_handle(cx));
                         }
                     }),
                 )
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 14b642bc12..f434e46159 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -385,9 +385,7 @@ impl TerminalView {
             .workspace
             .upgrade()
             .and_then(|workspace| workspace.read(cx).panel::<TerminalPanel>(cx))
-            .map_or(false, |terminal_panel| {
-                terminal_panel.read(cx).assistant_enabled()
-            });
+            .is_some_and(|terminal_panel| terminal_panel.read(cx).assistant_enabled());
         let context_menu = ContextMenu::build(window, cx, |menu, _, _| {
             menu.context(self.focus_handle.clone())
                 .action("New Terminal", Box::new(NewTerminal))
diff --git a/crates/text/src/anchor.rs b/crates/text/src/anchor.rs
index c4778216e0..becc5d9c0a 100644
--- a/crates/text/src/anchor.rs
+++ b/crates/text/src/anchor.rs
@@ -108,7 +108,7 @@ impl Anchor {
             fragment_cursor.seek(&Some(fragment_id), Bias::Left);
             fragment_cursor
                 .item()
-                .map_or(false, |fragment| fragment.visible)
+                .is_some_and(|fragment| fragment.visible)
         }
     }
 }
diff --git a/crates/text/src/patch.rs b/crates/text/src/patch.rs
index 96fed17571..dcb35e9a92 100644
--- a/crates/text/src/patch.rs
+++ b/crates/text/src/patch.rs
@@ -57,7 +57,7 @@ where
             // Push the old edit if its new end is before the new edit's old start.
             if let Some(old_edit) = old_edit.as_ref() {
                 let new_edit = new_edit.as_ref();
-                if new_edit.map_or(true, |new_edit| old_edit.new.end < new_edit.old.start) {
+                if new_edit.is_none_or(|new_edit| old_edit.new.end < new_edit.old.start) {
                     let catchup = old_edit.old.start - old_start;
                     old_start += catchup;
                     new_start += catchup;
@@ -78,7 +78,7 @@ where
             // Push the new edit if its old end is before the old edit's new start.
             if let Some(new_edit) = new_edit.as_ref() {
                 let old_edit = old_edit.as_ref();
-                if old_edit.map_or(true, |old_edit| new_edit.old.end < old_edit.new.start) {
+                if old_edit.is_none_or(|old_edit| new_edit.old.end < old_edit.new.start) {
                     let catchup = new_edit.new.start - new_start;
                     old_start += catchup;
                     new_start += catchup;
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index 8e37567738..705d3f1788 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -1149,7 +1149,7 @@ impl Buffer {
             // Insert the new text before any existing fragments within the range.
             if !new_text.is_empty() {
                 let mut old_start = old_fragments.start().1;
-                if old_fragments.item().map_or(false, |f| f.visible) {
+                if old_fragments.item().is_some_and(|f| f.visible) {
                     old_start += fragment_start.0 - old_fragments.start().0.full_offset().0;
                 }
                 let new_start = new_fragments.summary().text.visible;
@@ -1834,7 +1834,7 @@ impl Buffer {
         let mut edits: Vec<(Range<usize>, Arc<str>)> = Vec::new();
         let mut last_end = None;
         for _ in 0..edit_count {
-            if last_end.map_or(false, |last_end| last_end >= self.len()) {
+            if last_end.is_some_and(|last_end| last_end >= self.len()) {
                 break;
             }
             let new_start = last_end.map_or(0, |last_end| last_end + 1);
@@ -2671,7 +2671,7 @@ impl<D: TextDimension + Ord, F: FnMut(&FragmentSummary) -> bool> Iterator for Ed
 
             if pending_edit
                 .as_ref()
-                .map_or(false, |(change, _)| change.new.end < self.new_end)
+                .is_some_and(|(change, _)| change.new.end < self.new_end)
             {
                 break;
             }
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index c2171d3899..275f47912a 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -189,7 +189,7 @@ impl TitleBar {
                             .as_ref()?
                             .read(cx)
                             .is_being_followed(collaborator.peer_id);
-                        let is_present = project_id.map_or(false, |project_id| {
+                        let is_present = project_id.is_some_and(|project_id| {
                             collaborator.location
                                 == ParticipantLocation::SharedProject { project_id }
                         });
diff --git a/crates/title_bar/src/onboarding_banner.rs b/crates/title_bar/src/onboarding_banner.rs
index e7cf0cd2d9..ed43c5277a 100644
--- a/crates/title_bar/src/onboarding_banner.rs
+++ b/crates/title_bar/src/onboarding_banner.rs
@@ -73,7 +73,7 @@ fn get_dismissed(source: &str) -> bool {
     db::kvp::KEY_VALUE_STORE
         .read_kvp(&dismissed_at)
         .log_err()
-        .map_or(false, |dismissed| dismissed.is_some())
+        .is_some_and(|dismissed| dismissed.is_some())
 }
 
 fn persist_dismissed(source: &str, cx: &mut App) {
diff --git a/crates/ui/src/components/popover_menu.rs b/crates/ui/src/components/popover_menu.rs
index f77eea4bdc..439b53f038 100644
--- a/crates/ui/src/components/popover_menu.rs
+++ b/crates/ui/src/components/popover_menu.rs
@@ -93,16 +93,16 @@ impl<M: ManagedView> PopoverMenuHandle<M> {
         self.0
             .borrow()
             .as_ref()
-            .map_or(false, |state| state.menu.borrow().as_ref().is_some())
+            .is_some_and(|state| state.menu.borrow().as_ref().is_some())
     }
 
     pub fn is_focused(&self, window: &Window, cx: &App) -> bool {
-        self.0.borrow().as_ref().map_or(false, |state| {
+        self.0.borrow().as_ref().is_some_and(|state| {
             state
                 .menu
                 .borrow()
                 .as_ref()
-                .map_or(false, |model| model.focus_handle(cx).is_focused(window))
+                .is_some_and(|model| model.focus_handle(cx).is_focused(window))
         })
     }
 
diff --git a/crates/ui/src/components/sticky_items.rs b/crates/ui/src/components/sticky_items.rs
index ca8b336a5a..c3e0886404 100644
--- a/crates/ui/src/components/sticky_items.rs
+++ b/crates/ui/src/components/sticky_items.rs
@@ -105,7 +105,6 @@ impl Element for StickyItemsElement {
         _window: &mut Window,
         _cx: &mut App,
     ) -> Self::PrepaintState {
-        ()
     }
 
     fn paint(
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 211831125d..292ec4874c 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -1215,11 +1215,11 @@ mod tests {
 
             // Verify iterators advanced correctly
             assert!(
-                !a_iter.next().map_or(false, |c| c.is_ascii_digit()),
+                !a_iter.next().is_some_and(|c| c.is_ascii_digit()),
                 "Iterator a should have consumed all digits"
             );
             assert!(
-                !b_iter.next().map_or(false, |c| c.is_ascii_digit()),
+                !b_iter.next().is_some_and(|c| c.is_ascii_digit()),
                 "Iterator b should have consumed all digits"
             );
 
diff --git a/crates/util/src/size.rs b/crates/util/src/size.rs
index 084a0e5a56..c6ecebd548 100644
--- a/crates/util/src/size.rs
+++ b/crates/util/src/size.rs
@@ -7,14 +7,12 @@ pub fn format_file_size(size: u64, use_decimal: bool) -> String {
         } else {
             format!("{:.1}MB", size as f64 / (1000.0 * 1000.0))
         }
+    } else if size < 1024 {
+        format!("{size}B")
+    } else if size < 1024 * 1024 {
+        format!("{:.1}KiB", size as f64 / 1024.0)
     } else {
-        if size < 1024 {
-            format!("{size}B")
-        } else if size < 1024 * 1024 {
-            format!("{:.1}KiB", size as f64 / 1024.0)
-        } else {
-            format!("{:.1}MiB", size as f64 / (1024.0 * 1024.0))
-        }
+        format!("{:.1}MiB", size as f64 / (1024.0 * 1024.0))
     }
 }
 
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 187678f8af..69a2c88706 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -301,7 +301,7 @@ pub fn get_shell_safe_zed_path() -> anyhow::Result<String> {
     let zed_path_escaped =
         shlex::try_quote(&zed_path).context("Failed to shell-escape Zed executable path.")?;
 
-    return Ok(zed_path_escaped.to_string());
+    Ok(zed_path_escaped.to_string())
 }
 
 #[cfg(unix)]
@@ -825,7 +825,7 @@ mod rng {
         pub fn new(rng: T) -> Self {
             Self {
                 rng,
-                simple_text: std::env::var("SIMPLE_TEXT").map_or(false, |v| !v.is_empty()),
+                simple_text: std::env::var("SIMPLE_TEXT").is_ok_and(|v| !v.is_empty()),
             }
         }
 
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 00d3bde750..7269fc8bec 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -566,7 +566,6 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
             workspace.update(cx, |workspace, cx| {
                 e.notify_err(workspace, cx);
             });
-            return;
         }
     });
 
@@ -1444,7 +1443,7 @@ pub fn command_interceptor(mut input: &str, cx: &App) -> Vec<CommandInterceptRes
             }];
         }
     }
-    return Vec::default();
+    Vec::default()
 }
 
 fn generate_positions(string: &str, query: &str) -> Vec<usize> {
diff --git a/crates/vim/src/digraph.rs b/crates/vim/src/digraph.rs
index beb3bd54ba..248047bb55 100644
--- a/crates/vim/src/digraph.rs
+++ b/crates/vim/src/digraph.rs
@@ -103,7 +103,6 @@ impl Vim {
                 window.dispatch_keystroke(keystroke, cx);
             });
         }
-        return;
     }
 
     pub fn handle_literal_input(
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 3cc9772d42..e2ce54b994 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -47,7 +47,6 @@ impl Vim {
         }
         self.stop_recording_immediately(action.boxed_clone(), cx);
         self.switch_mode(Mode::HelixNormal, false, window, cx);
-        return;
     }
 
     pub fn helix_normal_motion(
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index e703b18117..92e3c97265 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -2375,7 +2375,7 @@ fn matching_tag(map: &DisplaySnapshot, head: DisplayPoint) -> Option<DisplayPoin
         }
     }
 
-    return None;
+    None
 }
 
 fn matching(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
@@ -2517,7 +2517,7 @@ fn unmatched_forward(
         }
         display_point = new_point;
     }
-    return display_point;
+    display_point
 }
 
 fn unmatched_backward(
diff --git a/crates/vim/src/normal/mark.rs b/crates/vim/src/normal/mark.rs
index 80d94def05..619769d41a 100644
--- a/crates/vim/src/normal/mark.rs
+++ b/crates/vim/src/normal/mark.rs
@@ -120,7 +120,6 @@ impl Vim {
                 });
             })
         });
-        return;
     }
 
     fn open_path_mark(
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index 4054c552ae..4fbeec7236 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -224,7 +224,7 @@ impl Vim {
                     .search
                     .prior_selections
                     .last()
-                    .map_or(true, |range| range.start != new_head);
+                    .is_none_or(|range| range.start != new_head);
 
                 if is_different_head {
                     count = count.saturating_sub(1)
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index db19562f02..81efcef17a 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -606,11 +606,11 @@ impl MarksState {
         match target? {
             MarkLocation::Buffer(entity_id) => {
                 let anchors = self.multibuffer_marks.get(entity_id)?;
-                return Some(Mark::Buffer(*entity_id, anchors.get(name)?.clone()));
+                Some(Mark::Buffer(*entity_id, anchors.get(name)?.clone()))
             }
             MarkLocation::Path(path) => {
                 let points = self.serialized_marks.get(path)?;
-                return Some(Mark::Path(path.clone(), points.get(name)?.clone()));
+                Some(Mark::Path(path.clone(), points.get(name)?.clone()))
             }
         }
     }
diff --git a/crates/web_search_providers/src/web_search_providers.rs b/crates/web_search_providers/src/web_search_providers.rs
index 2248cb7eb3..7f8a5f3fa4 100644
--- a/crates/web_search_providers/src/web_search_providers.rs
+++ b/crates/web_search_providers/src/web_search_providers.rs
@@ -46,7 +46,7 @@ fn register_zed_web_search_provider(
     let using_zed_provider = language_model_registry
         .read(cx)
         .default_model()
-        .map_or(false, |default| default.is_provided_by_zed());
+        .is_some_and(|default| default.is_provided_by_zed());
     if using_zed_provider {
         registry.register_provider(cloud::CloudWebSearchProvider::new(client, cx), cx)
     } else {
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 079f66ae9d..1d9170684e 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -460,7 +460,7 @@ impl Dock {
                     };
 
                     let was_visible = this.is_open()
-                        && this.visible_panel().map_or(false, |active_panel| {
+                        && this.visible_panel().is_some_and(|active_panel| {
                             active_panel.panel_id() == Entity::entity_id(&panel)
                         });
 
@@ -523,7 +523,7 @@ impl Dock {
                     PanelEvent::Close => {
                         if this
                             .visible_panel()
-                            .map_or(false, |p| p.panel_id() == Entity::entity_id(panel))
+                            .is_some_and(|p| p.panel_id() == Entity::entity_id(panel))
                         {
                             this.set_open(false, window, cx);
                         }
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 014af7b0bc..5a497398f9 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -489,7 +489,7 @@ where
     fn should_serialize(&self, event: &dyn Any, cx: &App) -> bool {
         event
             .downcast_ref::<T::Event>()
-            .map_or(false, |event| self.read(cx).should_serialize(event))
+            .is_some_and(|event| self.read(cx).should_serialize(event))
     }
 }
 
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index a1affc5362..d42b59f08e 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -552,9 +552,9 @@ impl Pane {
         // to the item, and `focus_handle.contains_focus` returns false because the `active_item`
         // is not hooked up to us in the dispatch tree.
         self.focus_handle.contains_focused(window, cx)
-            || self.active_item().map_or(false, |item| {
-                item.item_focus_handle(cx).contains_focused(window, cx)
-            })
+            || self
+                .active_item()
+                .is_some_and(|item| item.item_focus_handle(cx).contains_focused(window, cx))
     }
 
     fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -1021,7 +1021,7 @@ impl Pane {
                 existing_item
                     .project_entry_ids(cx)
                     .first()
-                    .map_or(false, |existing_entry_id| {
+                    .is_some_and(|existing_entry_id| {
                         Some(existing_entry_id) == project_entry_id.as_ref()
                     })
             } else {
@@ -1558,7 +1558,7 @@ impl Pane {
             let other_project_item_ids = open_item.project_item_model_ids(cx);
             dirty_project_item_ids.retain(|id| !other_project_item_ids.contains(id));
         }
-        return dirty_project_item_ids.is_empty();
+        dirty_project_item_ids.is_empty()
     }
 
     pub(super) fn file_names_for_prompt(
@@ -2745,7 +2745,7 @@ impl Pane {
                                 worktree
                                     .read(cx)
                                     .root_entry()
-                                    .map_or(false, |entry| entry.is_dir())
+                                    .is_some_and(|entry| entry.is_dir())
                             });
 
                             let entry_abs_path = pane.read(cx).entry_abs_path(entry, cx);
@@ -3210,8 +3210,7 @@ impl Pane {
                                             return;
                                         };
 
-                                        if target.map_or(false, |target| this.is_tab_pinned(target))
-                                        {
+                                        if target.is_some_and(|target| this.is_tab_pinned(target)) {
                                             this.pin_tab_at(index, window, cx);
                                         }
                                     })
@@ -3615,7 +3614,6 @@ impl Render for Pane {
             )
             .on_action(cx.listener(|_, _: &menu::Cancel, window, cx| {
                 if cx.stop_active_drag(window) {
-                    return;
                 } else {
                     cx.propagate();
                 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 4a22107c42..9dac340b5c 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1804,7 +1804,7 @@ impl Workspace {
                             .max_by(|b1, b2| b1.worktree_id.cmp(&b2.worktree_id))
                     });
 
-                latest_project_path_opened.map_or(true, |path| path == history_path)
+                latest_project_path_opened.is_none_or(|path| path == history_path)
             })
     }
 
@@ -2284,7 +2284,7 @@ impl Workspace {
             // the current session.
             if close_intent != CloseIntent::Quit
                 && !save_last_workspace
-                && save_result.as_ref().map_or(false, |&res| res)
+                && save_result.as_ref().is_ok_and(|&res| res)
             {
                 this.update_in(cx, |this, window, cx| this.remove_from_session(window, cx))?
                     .await;
@@ -5133,13 +5133,11 @@ impl Workspace {
         self.panes.retain(|p| p != pane);
         if let Some(focus_on) = focus_on {
             focus_on.update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)));
-        } else {
-            if self.active_pane() == pane {
-                self.panes
-                    .last()
-                    .unwrap()
-                    .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)));
-            }
+        } else if self.active_pane() == pane {
+            self.panes
+                .last()
+                .unwrap()
+                .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)));
         }
         if self.last_active_center_pane == Some(pane.downgrade()) {
             self.last_active_center_pane = None;
@@ -5893,7 +5891,6 @@ impl Workspace {
 
     pub fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
         if cx.stop_active_drag(window) {
-            return;
         } else if let Some((notification_id, _)) = self.notifications.pop() {
             dismiss_app_notification(&notification_id, cx);
         } else {
@@ -6100,7 +6097,7 @@ fn open_items(
                         // here is a directory, it was already opened further above
                         // with a `find_or_create_worktree`.
                         if let Ok(task) = abs_path_task
-                            && task.await.map_or(true, |p| p.is_file())
+                            && task.await.is_none_or(|p| p.is_file())
                         {
                             return Some((
                                 ix,
@@ -6970,7 +6967,7 @@ async fn join_channel_internal(
                     && project.visible_worktrees(cx).any(|tree| {
                         tree.read(cx)
                             .root_entry()
-                            .map_or(false, |entry| entry.is_dir())
+                            .is_some_and(|entry| entry.is_dir())
                     })
                 {
                     Some(workspace.project.clone())
@@ -7900,7 +7897,6 @@ fn join_pane_into_active(
     cx: &mut App,
 ) {
     if pane == active_pane {
-        return;
     } else if pane.read(cx).items_len() == 0 {
         pane.update(cx, |_, cx| {
             cx.emit(pane::Event::Remove {
@@ -9149,11 +9145,11 @@ mod tests {
         workspace.update_in(cx, |workspace, window, cx| {
             workspace.add_item_to_active_pane(Box::new(item.clone()), None, false, window, cx);
         });
-        return item;
+        item
     }
 
     fn split_pane(cx: &mut VisualTestContext, workspace: &Entity<Workspace>) -> Entity<Pane> {
-        return workspace.update_in(cx, |workspace, window, cx| {
+        workspace.update_in(cx, |workspace, window, cx| {
             let new_pane = workspace.split_pane(
                 workspace.active_pane().clone(),
                 SplitDirection::Right,
@@ -9161,7 +9157,7 @@ mod tests {
                 cx,
             );
             new_pane
-        });
+        })
     }
 
     #[gpui::test]
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 9e1832721f..d38f3cac3d 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -3393,12 +3393,10 @@ impl File {
 
         let disk_state = if proto.is_deleted {
             DiskState::Deleted
+        } else if let Some(mtime) = proto.mtime.map(&Into::into) {
+            DiskState::Present { mtime }
         } else {
-            if let Some(mtime) = proto.mtime.map(&Into::into) {
-                DiskState::Present { mtime }
-            } else {
-                DiskState::New
-            }
+            DiskState::New
         };
 
         Ok(Self {
@@ -4074,10 +4072,10 @@ impl BackgroundScanner {
                     }
                 }
 
-                let parent_dir_is_loaded = relative_path.parent().map_or(true, |parent| {
+                let parent_dir_is_loaded = relative_path.parent().is_none_or(|parent| {
                     snapshot
                         .entry_for_path(parent)
-                        .map_or(false, |entry| entry.kind == EntryKind::Dir)
+                        .is_some_and(|entry| entry.kind == EntryKind::Dir)
                 });
                 if !parent_dir_is_loaded {
                     log::debug!("ignoring event {relative_path:?} within unloaded directory");
@@ -4630,7 +4628,7 @@ impl BackgroundScanner {
             while let Some(parent_abs_path) = ignores_to_update.next() {
                 while ignores_to_update
                     .peek()
-                    .map_or(false, |p| p.starts_with(&parent_abs_path))
+                    .is_some_and(|p| p.starts_with(&parent_abs_path))
                 {
                     ignores_to_update.next().unwrap();
                 }
@@ -4797,9 +4795,7 @@ impl BackgroundScanner {
         for (&work_directory_id, entry) in snapshot.git_repositories.iter() {
             let exists_in_snapshot = snapshot
                 .entry_for_id(work_directory_id)
-                .map_or(false, |entry| {
-                    snapshot.entry_for_path(entry.path.join(*DOT_GIT)).is_some()
-                });
+                .is_some_and(|entry| snapshot.entry_for_path(entry.path.join(*DOT_GIT)).is_some());
 
             if exists_in_snapshot
                 || matches!(
@@ -4924,10 +4920,10 @@ fn build_diff(
     new_paths.next();
     for path in event_paths {
         let path = PathKey(path.clone());
-        if old_paths.item().map_or(false, |e| e.path < path.0) {
+        if old_paths.item().is_some_and(|e| e.path < path.0) {
             old_paths.seek_forward(&path, Bias::Left);
         }
-        if new_paths.item().map_or(false, |e| e.path < path.0) {
+        if new_paths.item().is_some_and(|e| e.path < path.0) {
             new_paths.seek_forward(&path, Bias::Left);
         }
         loop {
@@ -4977,7 +4973,7 @@ fn build_diff(
                             let is_newly_loaded = phase == InitialScan
                                 || last_newly_loaded_dir_path
                                     .as_ref()
-                                    .map_or(false, |dir| new_entry.path.starts_with(dir));
+                                    .is_some_and(|dir| new_entry.path.starts_with(dir));
                             changes.push((
                                 new_entry.path.clone(),
                                 new_entry.id,
@@ -4995,7 +4991,7 @@ fn build_diff(
                     let is_newly_loaded = phase == InitialScan
                         || last_newly_loaded_dir_path
                             .as_ref()
-                            .map_or(false, |dir| new_entry.path.starts_with(dir));
+                            .is_some_and(|dir| new_entry.path.starts_with(dir));
                     changes.push((
                         new_entry.path.clone(),
                         new_entry.id,
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
index 26cf16e8f6..b18d3509be 100644
--- a/crates/worktree/src/worktree_settings.rs
+++ b/crates/worktree/src/worktree_settings.rs
@@ -82,7 +82,7 @@ impl Settings for WorktreeSettings {
                     .ancestors()
                     .map(|a| a.to_string_lossy().into())
             })
-            .filter(|p| p != "")
+            .filter(|p: &String| !p.is_empty())
             .collect();
         file_scan_exclusions.sort();
         private_files.sort();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 93a62afc6f..d3a503f172 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1625,7 +1625,7 @@ fn open_local_file(
                     .await
                     .ok()
                     .flatten()
-                    .map_or(false, |metadata| !metadata.is_dir && !metadata.is_fifo);
+                    .is_some_and(|metadata| !metadata.is_dir && !metadata.is_fifo);
                 file_exists
             };
 
diff --git a/crates/zed/src/zed/migrate.rs b/crates/zed/src/zed/migrate.rs
index 48bffb4114..2452f17d04 100644
--- a/crates/zed/src/zed/migrate.rs
+++ b/crates/zed/src/zed/migrate.rs
@@ -177,7 +177,7 @@ impl ToolbarItemView for MigrationBanner {
             }));
         }
 
-        return ToolbarItemLocation::Hidden;
+        ToolbarItemLocation::Hidden
     }
 }
 
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index d65053c05f..10d60fcd9d 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -175,9 +175,9 @@ impl Render for QuickActionBar {
                 let code_action_menu = menu_ref
                     .as_ref()
                     .filter(|menu| matches!(menu, CodeContextMenu::CodeActions(..)));
-                code_action_menu.as_ref().map_or(false, |menu| {
-                    matches!(menu.origin(), ContextMenuOrigin::QuickActionBar)
-                })
+                code_action_menu
+                    .as_ref()
+                    .is_some_and(|menu| matches!(menu.origin(), ContextMenuOrigin::QuickActionBar))
             };
             let code_action_element = if is_deployed {
                 editor.update(cx, |editor, cx| {
diff --git a/crates/zeta/src/init.rs b/crates/zeta/src/init.rs
index a01e3a89a2..6e5b31f99a 100644
--- a/crates/zeta/src/init.rs
+++ b/crates/zeta/src/init.rs
@@ -85,12 +85,10 @@ fn feature_gate_predict_edits_actions(cx: &mut App) {
         CommandPaletteFilter::update_global(cx, |filter, _cx| {
             if is_ai_disabled {
                 filter.hide_action_types(&zeta_all_action_types);
+            } else if has_feature_flag {
+                filter.show_action_types(rate_completion_action_types.iter());
             } else {
-                if has_feature_flag {
-                    filter.show_action_types(rate_completion_action_types.iter());
-                } else {
-                    filter.hide_action_types(&rate_completion_action_types);
-                }
+                filter.hide_action_types(&rate_completion_action_types);
             }
         });
     })
diff --git a/crates/zeta/src/onboarding_modal.rs b/crates/zeta/src/onboarding_modal.rs
index c2886f2864..3a58c8c7b8 100644
--- a/crates/zeta/src/onboarding_modal.rs
+++ b/crates/zeta/src/onboarding_modal.rs
@@ -46,7 +46,7 @@ impl ZedPredictModal {
                         user_store.clone(),
                         client.clone(),
                         copilot::Copilot::global(cx)
-                            .map_or(false, |copilot| copilot.read(cx).status().is_configured()),
+                            .is_some_and(|copilot| copilot.read(cx).status().is_configured()),
                         Arc::new({
                             let this = weak_entity.clone();
                             move |_window, cx| {
diff --git a/crates/zeta/src/rate_completion_modal.rs b/crates/zeta/src/rate_completion_modal.rs
index 313e4c3779..0cd814388a 100644
--- a/crates/zeta/src/rate_completion_modal.rs
+++ b/crates/zeta/src/rate_completion_modal.rs
@@ -607,7 +607,7 @@ impl Render for RateCompletionModal {
                                     .children(self.zeta.read(cx).shown_completions().cloned().enumerate().map(
                                         |(index, completion)| {
                                             let selected =
-                                                self.active_completion.as_ref().map_or(false, |selected| {
+                                                self.active_completion.as_ref().is_some_and(|selected| {
                                                     selected.completion.id == completion.id
                                                 });
                                             let rated =
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 2a121c407c..640f408dd3 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -106,7 +106,7 @@ impl Dismissable for ZedPredictUpsell {
         if KEY_VALUE_STORE
             .read_kvp(ZED_PREDICT_DATA_COLLECTION_CHOICE)
             .log_err()
-            .map_or(false, |s| s.is_some())
+            .is_some_and(|s| s.is_some())
         {
             return true;
         }
@@ -114,7 +114,7 @@ impl Dismissable for ZedPredictUpsell {
         KEY_VALUE_STORE
             .read_kvp(Self::KEY)
             .log_err()
-            .map_or(false, |s| s.is_some())
+            .is_some_and(|s| s.is_some())
     }
 }
 
diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
index cf1604bd9f..27a5314e28 100644
--- a/crates/zlog/src/filter.rs
+++ b/crates/zlog/src/filter.rs
@@ -55,7 +55,7 @@ pub fn init_env_filter(filter: env_config::EnvFilter) {
 }
 
 pub fn is_possibly_enabled_level(level: log::Level) -> bool {
-    return level as u8 <= LEVEL_ENABLED_MAX_CONFIG.load(Ordering::Relaxed);
+    level as u8 <= LEVEL_ENABLED_MAX_CONFIG.load(Ordering::Relaxed)
 }
 
 pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Level) -> bool {
@@ -70,7 +70,7 @@ pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Le
     let is_enabled_by_default = level <= unsafe { LEVEL_ENABLED_MAX_STATIC };
     let global_scope_map = SCOPE_MAP.read().unwrap_or_else(|err| {
         SCOPE_MAP.clear_poison();
-        return err.into_inner();
+        err.into_inner()
     });
 
     let Some(map) = global_scope_map.as_ref() else {
@@ -83,11 +83,11 @@ pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Le
         return is_enabled_by_default;
     }
     let enabled_status = map.is_enabled(scope, module_path, level);
-    return match enabled_status {
+    match enabled_status {
         EnabledStatus::NotConfigured => is_enabled_by_default,
         EnabledStatus::Enabled => true,
         EnabledStatus::Disabled => false,
-    };
+    }
 }
 
 pub fn refresh_from_settings(settings: &HashMap<String, String>) {
@@ -132,7 +132,7 @@ fn level_filter_from_str(level_str: &str) -> Option<log::LevelFilter> {
             return None;
         }
     };
-    return Some(level);
+    Some(level)
 }
 
 fn scope_alloc_from_scope_str(scope_str: &str) -> Option<ScopeAlloc> {
@@ -143,7 +143,7 @@ fn scope_alloc_from_scope_str(scope_str: &str) -> Option<ScopeAlloc> {
         let Some(scope) = scope_iter.next() else {
             break;
         };
-        if scope == "" {
+        if scope.is_empty() {
             continue;
         }
         scope_buf[index] = scope;
@@ -159,7 +159,7 @@ fn scope_alloc_from_scope_str(scope_str: &str) -> Option<ScopeAlloc> {
         return None;
     }
     let scope = scope_buf.map(|s| s.to_string());
-    return Some(scope);
+    Some(scope)
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -280,7 +280,7 @@ impl ScopeMap {
                     cursor += 1;
                 }
                 let sub_items_end = cursor;
-                if scope_name == "" {
+                if scope_name.is_empty() {
                     assert_eq!(sub_items_start + 1, sub_items_end);
                     assert_ne!(depth, 0);
                     assert_ne!(parent_index, usize::MAX);
@@ -288,7 +288,7 @@ impl ScopeMap {
                     this.entries[parent_index].enabled = Some(items[sub_items_start].1);
                     continue;
                 }
-                let is_valid_scope = scope_name != "";
+                let is_valid_scope = !scope_name.is_empty();
                 let is_last = depth + 1 == SCOPE_DEPTH_MAX || !is_valid_scope;
                 let mut enabled = None;
                 if is_last {
@@ -321,7 +321,7 @@ impl ScopeMap {
             }
         }
 
-        return this;
+        this
     }
 
     pub fn is_empty(&self) -> bool {
@@ -358,7 +358,7 @@ impl ScopeMap {
                 }
                 break 'search;
             }
-            return enabled;
+            enabled
         }
 
         let mut enabled = search(self, scope);
@@ -394,7 +394,7 @@ impl ScopeMap {
             }
             return EnabledStatus::Disabled;
         }
-        return EnabledStatus::NotConfigured;
+        EnabledStatus::NotConfigured
     }
 }
 
@@ -456,7 +456,7 @@ mod tests {
             let Some(scope) = scope_iter.next() else {
                 break;
             };
-            if scope == "" {
+            if scope.is_empty() {
                 continue;
             }
             scope_buf[index] = scope;
@@ -464,7 +464,7 @@ mod tests {
         }
         assert_ne!(index, 0);
         assert!(scope_iter.next().is_none());
-        return scope_buf;
+        scope_buf
     }
 
     #[test]
diff --git a/crates/zlog/src/zlog.rs b/crates/zlog/src/zlog.rs
index df3a210231..d1c6cd4747 100644
--- a/crates/zlog/src/zlog.rs
+++ b/crates/zlog/src/zlog.rs
@@ -240,7 +240,7 @@ pub mod private {
         let Some((crate_name, _)) = module_path.split_at_checked(index) else {
             return module_path;
         };
-        return crate_name;
+        crate_name
     }
 
     pub const fn scope_new(scopes: &[&'static str]) -> Scope {
@@ -262,7 +262,7 @@ pub mod private {
     }
 
     pub fn scope_to_alloc(scope: &Scope) -> ScopeAlloc {
-        return scope.map(|s| s.to_string());
+        scope.map(|s| s.to_string())
     }
 }
 
@@ -319,18 +319,18 @@ impl Drop for Timer {
 impl Timer {
     #[must_use = "Timer will stop when dropped, the result of this function should be saved in a variable prefixed with `_` if it should stop when dropped"]
     pub fn new(logger: Logger, name: &'static str) -> Self {
-        return Self {
+        Self {
             logger,
             name,
             start_time: std::time::Instant::now(),
             warn_if_longer_than: None,
             done: false,
-        };
+        }
     }
 
     pub fn warn_if_gt(mut self, warn_limit: std::time::Duration) -> Self {
         self.warn_if_longer_than = Some(warn_limit);
-        return self;
+        self
     }
 
     pub fn end(mut self) {
diff --git a/extensions/glsl/src/glsl.rs b/extensions/glsl/src/glsl.rs
index ba506d2b11..695fd7a053 100644
--- a/extensions/glsl/src/glsl.rs
+++ b/extensions/glsl/src/glsl.rs
@@ -17,7 +17,7 @@ impl GlslExtension {
         }
 
         if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
         {
             return Ok(path.clone());
         }
@@ -60,7 +60,7 @@ impl GlslExtension {
             .map_err(|err| format!("failed to create directory '{version_dir}': {err}"))?;
         let binary_path = format!("{version_dir}/bin/glsl_analyzer");
 
-        if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
+        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
             zed::set_language_server_installation_status(
                 language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
diff --git a/extensions/html/src/html.rs b/extensions/html/src/html.rs
index 44ec4fe4b9..07d4642ff4 100644
--- a/extensions/html/src/html.rs
+++ b/extensions/html/src/html.rs
@@ -13,7 +13,7 @@ struct HtmlExtension {
 
 impl HtmlExtension {
     fn server_exists(&self) -> bool {
-        fs::metadata(SERVER_PATH).map_or(false, |stat| stat.is_file())
+        fs::metadata(SERVER_PATH).is_ok_and(|stat| stat.is_file())
     }
 
     fn server_script_path(&mut self, language_server_id: &LanguageServerId) -> Result<String> {
diff --git a/extensions/ruff/src/ruff.rs b/extensions/ruff/src/ruff.rs
index 7b811db212..b918c52686 100644
--- a/extensions/ruff/src/ruff.rs
+++ b/extensions/ruff/src/ruff.rs
@@ -39,7 +39,7 @@ impl RuffExtension {
         }
 
         if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
         {
             return Ok(RuffBinary {
                 path: path.clone(),
@@ -94,7 +94,7 @@ impl RuffExtension {
             _ => format!("{version_dir}/{asset_stem}/ruff"),
         };
 
-        if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
+        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
             zed::set_language_server_installation_status(
                 language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
diff --git a/extensions/snippets/src/snippets.rs b/extensions/snippets/src/snippets.rs
index 682709a28a..b2d68b6e1a 100644
--- a/extensions/snippets/src/snippets.rs
+++ b/extensions/snippets/src/snippets.rs
@@ -18,7 +18,7 @@ impl SnippetExtension {
         }
 
         if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
         {
             return Ok(path.clone());
         }
@@ -59,7 +59,7 @@ impl SnippetExtension {
         let version_dir = format!("simple-completion-language-server-{}", release.version);
         let binary_path = format!("{version_dir}/simple-completion-language-server");
 
-        if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
+        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
             zed::set_language_server_installation_status(
                 language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
diff --git a/extensions/test-extension/src/test_extension.rs b/extensions/test-extension/src/test_extension.rs
index 0ef522bd51..ee0b1b36a1 100644
--- a/extensions/test-extension/src/test_extension.rs
+++ b/extensions/test-extension/src/test_extension.rs
@@ -19,7 +19,7 @@ impl TestExtension {
         println!("{}", String::from_utf8_lossy(&echo_output.stdout));
 
         if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
         {
             return Ok(path.clone());
         }
@@ -61,7 +61,7 @@ impl TestExtension {
         let version_dir = format!("gleam-{}", release.version);
         let binary_path = format!("{version_dir}/gleam");
 
-        if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
+        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
             zed::set_language_server_installation_status(
                 language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
diff --git a/extensions/toml/src/toml.rs b/extensions/toml/src/toml.rs
index 30a2cd6ce3..c9b96aecac 100644
--- a/extensions/toml/src/toml.rs
+++ b/extensions/toml/src/toml.rs
@@ -40,7 +40,7 @@ impl TomlExtension {
         }
 
         if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).map_or(false, |stat| stat.is_file())
+            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
         {
             return Ok(TaploBinary {
                 path: path.clone(),
@@ -93,7 +93,7 @@ impl TomlExtension {
             }
         );
 
-        if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
+        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
             zed::set_language_server_installation_status(
                 language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
diff --git a/tooling/xtask/src/tasks/package_conformity.rs b/tooling/xtask/src/tasks/package_conformity.rs
index c82b9cdf84..c8bed4bb35 100644
--- a/tooling/xtask/src/tasks/package_conformity.rs
+++ b/tooling/xtask/src/tasks/package_conformity.rs
@@ -21,13 +21,11 @@ pub fn run_package_conformity(_args: PackageConformityArgs) -> Result<()> {
             .manifest_path
             .parent()
             .and_then(|parent| parent.parent())
-            .map_or(false, |grandparent_dir| {
-                grandparent_dir.ends_with("extensions")
-            });
+            .is_some_and(|grandparent_dir| grandparent_dir.ends_with("extensions"));
 
         let cargo_toml = read_cargo_toml(&package.manifest_path)?;
 
-        let is_using_workspace_lints = cargo_toml.lints.map_or(false, |lints| lints.workspace);
+        let is_using_workspace_lints = cargo_toml.lints.is_some_and(|lints| lints.workspace);
         if !is_using_workspace_lints {
             eprintln!(
                 "{package:?} is not using workspace lints",

From 69b1c6d6f56e8ebc4c6b0ce6aaed06986521a47d Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 19 Aug 2025 15:26:40 -0400
Subject: [PATCH 176/823] Fix `workspace::SendKeystrokes` example in docs
 (#36515)

Closes: https://github.com/zed-industries/zed/issues/25683

Remove two bad examples from the key binding docs.
`cmd-shift-p` (command palette) and `cmd-p` (file finder) are async
operations and thus do not work properly with
`workspace::SendKeystrokes`.

Originally reported in
https://github.com/zed-industries/zed/issues/25683#issuecomment-3145830534

Release Notes:

- N/A
---
 docs/src/key-bindings.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/src/key-bindings.md b/docs/src/key-bindings.md
index 9fc94840b7..838dceaa86 100644
--- a/docs/src/key-bindings.md
+++ b/docs/src/key-bindings.md
@@ -225,12 +225,14 @@ A common request is to be able to map from a single keystroke to a sequence. You
 [
   {
     "bindings": {
+      // Move down four times
       "alt-down": ["workspace::SendKeystrokes", "down down down down"],
+      // Expand the selection (editor::SelectLargerSyntaxNode);
+      // copy to the clipboard; and then undo the selection expansion.
       "cmd-alt-c": [
         "workspace::SendKeystrokes",
-        "cmd-shift-p copy relative path enter"
-      ],
-      "cmd-alt-r": ["workspace::SendKeystrokes", "cmd-p README enter"]
+        "ctrl-shift-right ctrl-shift-right ctrl-shift-right cmd-c ctrl-shift-left ctrl-shift-left ctrl-shift-left"
+      ]
     }
   },
   {

From 68257155037fa0f5c2093964eddb9a4c288741d9 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 19 Aug 2025 22:33:44 +0200
Subject: [PATCH 177/823] Another batch of lint fixes (#36521)

- **Enable a bunch of extra lints**
- **First batch of fixes**
- **More fixes**

Release Notes:

- N/A
---
 Cargo.toml                                    |  10 ++
 crates/action_log/src/action_log.rs           |   5 +-
 .../src/activity_indicator.rs                 |  29 ++--
 crates/agent/src/thread.rs                    |   6 +-
 crates/agent/src/thread_store.rs              |   2 +-
 crates/agent2/src/agent.rs                    |   2 +-
 crates/agent2/src/tools/edit_file_tool.rs     |   3 +-
 crates/agent_servers/src/acp/v0.rs            |   4 +-
 crates/agent_servers/src/claude/mcp_server.rs |   6 +-
 crates/agent_servers/src/e2e_tests.rs         |   7 +-
 crates/agent_ui/src/acp/message_editor.rs     |   5 +-
 crates/agent_ui/src/acp/thread_view.rs        |   4 +-
 crates/agent_ui/src/active_thread.rs          |  12 +-
 crates/agent_ui/src/agent_configuration.rs    |   2 +-
 .../configure_context_server_modal.rs         |   2 +-
 crates/agent_ui/src/agent_diff.rs             |  24 +--
 crates/agent_ui/src/agent_panel.rs            |  55 +++---
 crates/agent_ui/src/context_picker.rs         |   9 +-
 crates/agent_ui/src/message_editor.rs         |  17 +-
 crates/agent_ui/src/slash_command_picker.rs   |   4 +-
 crates/agent_ui/src/text_thread_editor.rs     |  15 +-
 crates/agent_ui/src/tool_compatibility.rs     |  12 +-
 .../src/assistant_context.rs                  |  20 +--
 .../src/file_command.rs                       |   6 +-
 crates/assistant_tool/src/tool_working_set.rs |   4 +-
 crates/assistant_tools/src/assistant_tools.rs |   5 +-
 crates/assistant_tools/src/edit_file_tool.rs  |   3 +-
 crates/assistant_tools/src/terminal_tool.rs   |   6 +-
 crates/cli/src/main.rs                        |   8 +-
 crates/collab/src/tests/integration_tests.rs  |   2 +-
 .../src/chat_panel/message_editor.rs          |   5 +-
 crates/context_server/src/listener.rs         |   2 +-
 crates/dap_adapters/src/python.rs             |   2 +-
 crates/debugger_ui/src/debugger_panel.rs      |   2 +-
 crates/debugger_ui/src/session.rs             |   6 +-
 crates/debugger_ui/src/session/running.rs     |   6 +-
 .../src/session/running/breakpoint_list.rs    |  36 ++--
 .../src/session/running/variable_list.rs      |   2 +-
 crates/debugger_ui/src/tests/variable_list.rs |   7 +-
 crates/docs_preprocessor/src/main.rs          |  19 +-
 crates/editor/src/display_map/invisibles.rs   |  10 +-
 crates/editor/src/editor.rs                   | 162 ++++++++----------
 crates/editor/src/editor_tests.rs             |   4 +-
 crates/editor/src/element.rs                  |  29 ++--
 crates/editor/src/git/blame.rs                |   7 +-
 crates/editor/src/hover_popover.rs            |  21 +--
 crates/editor/src/items.rs                    |  16 +-
 crates/editor/src/jsx_tag_auto_close.rs       |   5 +-
 crates/editor/src/proposed_changes_editor.rs  |  25 +--
 crates/editor/src/selections_collection.rs    |  22 +--
 crates/eval/src/instance.rs                   |  10 +-
 crates/extension/src/extension_builder.rs     |  12 +-
 crates/extension_host/src/extension_host.rs   |   5 +-
 crates/extension_host/src/wasm_host.rs        |   2 +-
 crates/extensions_ui/src/extensions_ui.rs     |   6 +-
 crates/file_finder/src/open_path_prompt.rs    |   2 +-
 crates/fs/src/fs.rs                           |   5 +-
 crates/git/src/repository.rs                  |   2 +-
 crates/git_ui/src/file_diff_view.rs           |   2 +-
 crates/git_ui/src/git_panel.rs                |  11 +-
 crates/git_ui/src/project_diff.rs             |  31 ++--
 crates/git_ui/src/text_diff_view.rs           |   2 +-
 crates/gpui/src/app.rs                        |   4 +-
 crates/gpui/src/elements/text.rs              |   6 +-
 .../gpui/src/platform/linux/wayland/client.rs |  51 +++---
 .../gpui/src/platform/linux/wayland/window.rs | 147 ++++++++--------
 crates/gpui/src/platform/linux/x11/client.rs  |  44 ++---
 crates/gpui/src/platform/mac/events.rs        |   6 +-
 crates/gpui/src/platform/mac/window.rs        |   4 +-
 .../gpui/src/platform/scap_screen_capture.rs  |   2 +-
 crates/gpui/src/platform/windows/events.rs    |  29 ++--
 crates/gpui/src/taffy.rs                      |  18 +-
 crates/gpui/src/text_system/line_wrapper.rs   |   2 +-
 crates/gpui/src/util.rs                       |   8 +-
 crates/gpui_macros/src/test.rs                |   2 +-
 crates/http_client/src/http_client.rs         |   3 +-
 crates/jj/src/jj_repository.rs                |   7 +-
 crates/journal/src/journal.rs                 |   6 +-
 crates/language/src/buffer.rs                 |  13 +-
 crates/language/src/language.rs               |   5 +-
 crates/language_model/src/language_model.rs   |   2 +-
 .../language_models/src/provider/open_ai.rs   |   2 +-
 crates/languages/src/json.rs                  |   2 +-
 crates/languages/src/python.rs                |   2 +-
 crates/multi_buffer/src/multi_buffer.rs       |   8 +-
 crates/node_runtime/src/node_runtime.rs       |   5 +-
 crates/onboarding/src/ai_setup_page.rs        |   4 +-
 crates/onboarding/src/basics_page.rs          |  10 +-
 crates/onboarding/src/editing_page.rs         |   2 +-
 crates/outline_panel/src/outline_panel.rs     |  20 +--
 crates/project/src/buffer_store.rs            |  18 +-
 crates/project/src/color_extractor.rs         |   6 +-
 crates/project/src/context_server_store.rs    |  16 +-
 crates/project/src/debugger/dap_store.rs      |   3 +-
 crates/project/src/debugger/locators/go.rs    |   6 +-
 crates/project/src/debugger/session.rs        |  13 +-
 crates/project/src/image_store.rs             |  26 ++-
 crates/project/src/lsp_command.rs             |   4 +-
 crates/project/src/lsp_store.rs               |  46 ++---
 crates/project/src/manifest_tree.rs           |  16 +-
 crates/project/src/project.rs                 |  26 ++-
 crates/project/src/project_tests.rs           |   6 +-
 crates/project/src/task_inventory.rs          |   2 +-
 crates/project/src/terminals.rs               |   6 +-
 crates/project_panel/src/project_panel.rs     |   6 +-
 .../src/disconnected_overlay.rs               |   7 +-
 crates/remote/src/protocol.rs                 |   4 +-
 crates/remote_server/src/headless_project.rs  |  37 ++--
 crates/remote_server/src/unix.rs              |   8 +-
 crates/repl/src/components/kernel_options.rs  |   5 +-
 crates/repl/src/notebook/cell.rs              |   2 +-
 crates/repl/src/notebook/notebook_ui.rs       |   4 +-
 crates/repl/src/outputs/plain.rs              |   6 +-
 crates/rope/src/chunk.rs                      |   2 +-
 crates/rules_library/src/rules_library.rs     |   2 +-
 crates/search/src/project_search.rs           |   4 +-
 crates/settings/src/key_equivalents.rs        |   2 +-
 crates/settings/src/settings_json.rs          |   6 +-
 crates/settings_ui/src/keybindings.rs         |  26 ++-
 .../src/ui_components/keystroke_input.rs      |   2 +-
 crates/settings_ui/src/ui_components/table.rs |   4 +-
 crates/storybook/src/story_selector.rs        |   6 +-
 crates/svg_preview/src/svg_preview_view.rs    |  43 ++---
 crates/task/src/shell_builder.rs              |  12 +-
 crates/tasks_ui/src/modal.rs                  |   5 +-
 crates/terminal_view/src/terminal_panel.rs    |  53 +++---
 crates/terminal_view/src/terminal_view.rs     |   7 +-
 crates/theme/src/icon_theme.rs                |   2 +-
 crates/title_bar/src/collab.rs                |   6 +-
 crates/ui/src/components/facepile.rs          |   2 +-
 crates/ui/src/components/toggle.rs            |   2 +-
 crates/ui/src/components/tooltip.rs           |   2 +-
 crates/vim/src/helix.rs                       |  20 +--
 crates/vim/src/normal/change.rs               |   7 +-
 crates/vim/src/state.rs                       |  56 +++---
 crates/vim/src/test/neovim_connection.rs      |   2 +-
 crates/web_search_providers/src/cloud.rs      |   2 +-
 .../src/web_search_providers.rs               |   5 +-
 crates/workspace/src/shared_screen.rs         |  11 +-
 crates/workspace/src/workspace.rs             |  13 +-
 crates/zed/src/main.rs                        |   9 +-
 crates/zed/src/zed.rs                         |   7 +-
 .../zed/src/zed/edit_prediction_registry.rs   |   5 +-
 crates/zeta/src/zeta.rs                       |  12 +-
 crates/zeta_cli/src/main.rs                   |  15 +-
 crates/zlog/src/filter.rs                     |  13 +-
 crates/zlog/src/zlog.rs                       |  11 +-
 147 files changed, 788 insertions(+), 1042 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 46c5646c90..ad45def2d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -822,14 +822,20 @@ style = { level = "allow", priority = -1 }
 
 # Temporary list of style lints that we've fixed so far.
 comparison_to_empty = "warn"
+into_iter_on_ref = "warn"
 iter_cloned_collect = "warn"
 iter_next_slice = "warn"
 iter_nth = "warn"
 iter_nth_zero = "warn"
 iter_skip_next = "warn"
+let_and_return = "warn"
 module_inception = { level = "deny" }
 question_mark = { level = "deny" }
+single_match = "warn"
 redundant_closure = { level = "deny" }
+redundant_static_lifetimes = { level = "warn" }
+redundant_pattern_matching = "warn"
+redundant_field_names = "warn"
 declare_interior_mutable_const = { level = "deny" }
 collapsible_if = { level = "warn"}
 collapsible_else_if = { level = "warn" }
@@ -857,6 +863,10 @@ too_many_arguments = "allow"
 # We often have large enum variants yet we rarely actually bother with splitting them up.
 large_enum_variant = "allow"
 
+# `enum_variant_names` fires for all enums, even when they derive serde traits.
+# Adhering to this lint would be a breaking change.
+enum_variant_names = "allow"
+
 [workspace.metadata.cargo-machete]
 ignored = [
     "bindgen",
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index 602357ed2b..1c3cad386d 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -264,15 +264,14 @@ impl ActionLog {
             if let Some((git_diff, (buffer_repo, _))) = git_diff.as_ref().zip(buffer_repo) {
                 cx.update(|cx| {
                     let mut old_head = buffer_repo.read(cx).head_commit.clone();
-                    Some(cx.subscribe(git_diff, move |_, event, cx| match event {
-                        buffer_diff::BufferDiffEvent::DiffChanged { .. } => {
+                    Some(cx.subscribe(git_diff, move |_, event, cx| {
+                        if let buffer_diff::BufferDiffEvent::DiffChanged { .. } = event {
                             let new_head = buffer_repo.read(cx).head_commit.clone();
                             if new_head != old_head {
                                 old_head = new_head;
                                 git_diff_updates_tx.send(()).ok();
                             }
                         }
-                        _ => {}
                     }))
                 })?
             } else {
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 8faf74736a..324480f5b4 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -103,26 +103,21 @@ impl ActivityIndicator {
             cx.subscribe_in(
                 &workspace_handle,
                 window,
-                |activity_indicator, _, event, window, cx| match event {
-                    workspace::Event::ClearActivityIndicator { .. } => {
-                        if activity_indicator.statuses.pop().is_some() {
-                            activity_indicator.dismiss_error_message(
-                                &DismissErrorMessage,
-                                window,
-                                cx,
-                            );
-                            cx.notify();
-                        }
+                |activity_indicator, _, event, window, cx| {
+                    if let workspace::Event::ClearActivityIndicator { .. } = event
+                        && activity_indicator.statuses.pop().is_some()
+                    {
+                        activity_indicator.dismiss_error_message(&DismissErrorMessage, window, cx);
+                        cx.notify();
                     }
-                    _ => {}
                 },
             )
             .detach();
 
             cx.subscribe(
                 &project.read(cx).lsp_store(),
-                |activity_indicator, _, event, cx| match event {
-                    LspStoreEvent::LanguageServerUpdate { name, message, .. } => {
+                |activity_indicator, _, event, cx| {
+                    if let LspStoreEvent::LanguageServerUpdate { name, message, .. } = event {
                         if let proto::update_language_server::Variant::StatusUpdate(status_update) =
                             message
                         {
@@ -191,7 +186,6 @@ impl ActivityIndicator {
                         }
                         cx.notify()
                     }
-                    _ => {}
                 },
             )
             .detach();
@@ -206,9 +200,10 @@ impl ActivityIndicator {
 
             cx.subscribe(
                 &project.read(cx).git_store().clone(),
-                |_, _, event: &GitStoreEvent, cx| match event {
-                    project::git_store::GitStoreEvent::JobsUpdated => cx.notify(),
-                    _ => {}
+                |_, _, event: &GitStoreEvent, cx| {
+                    if let project::git_store::GitStoreEvent::JobsUpdated = event {
+                        cx.notify()
+                    }
                 },
             )
             .detach();
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 5c4b2b8ebf..80ed277f10 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1645,15 +1645,13 @@ impl Thread {
         self.tool_use
             .request_tool_use(tool_message_id, tool_use, tool_use_metadata.clone(), cx);
 
-        let pending_tool_use = self.tool_use.insert_tool_output(
+        self.tool_use.insert_tool_output(
             tool_use_id.clone(),
             tool_name,
             tool_output,
             self.configured_model.as_ref(),
             self.completion_mode,
-        );
-
-        pending_tool_use
+        )
     }
 
     pub fn stream_completion(
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index 63d0f72e00..45e551dbdf 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -74,7 +74,7 @@ impl Column for DataType {
     }
 }
 
-const RULES_FILE_NAMES: [&'static str; 9] = [
+const RULES_FILE_NAMES: [&str; 9] = [
     ".rules",
     ".cursorrules",
     ".windsurfrules",
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index bc46ad1657..48f46a52fc 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -28,7 +28,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 use util::ResultExt;
 
-const RULES_FILE_NAMES: [&'static str; 9] = [
+const RULES_FILE_NAMES: [&str; 9] = [
     ".rules",
     ".cursorrules",
     ".windsurfrules",
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 21eb282110..a87699bd12 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -655,8 +655,7 @@ mod tests {
             mode: mode.clone(),
         };
 
-        let result = cx.update(|cx| resolve_path(&input, project, cx));
-        result
+        cx.update(|cx| resolve_path(&input, project, cx))
     }
 
     fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &str) {
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index aa80f01c15..30643dd005 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -149,7 +149,7 @@ impl acp_old::Client for OldAcpClientDelegate {
 
         Ok(acp_old::RequestToolCallConfirmationResponse {
             id: acp_old::ToolCallId(old_acp_id),
-            outcome: outcome,
+            outcome,
         })
     }
 
@@ -266,7 +266,7 @@ impl acp_old::Client for OldAcpClientDelegate {
 
 fn into_new_tool_call(id: acp::ToolCallId, request: acp_old::PushToolCallParams) -> acp::ToolCall {
     acp::ToolCall {
-        id: id,
+        id,
         title: request.label,
         kind: acp_kind_from_old_icon(request.icon),
         status: acp::ToolCallStatus::InProgress,
diff --git a/crates/agent_servers/src/claude/mcp_server.rs b/crates/agent_servers/src/claude/mcp_server.rs
index 38587574db..3086752850 100644
--- a/crates/agent_servers/src/claude/mcp_server.rs
+++ b/crates/agent_servers/src/claude/mcp_server.rs
@@ -175,9 +175,9 @@ impl McpServerTool for PermissionTool {
         let claude_tool = ClaudeTool::infer(&input.tool_name, input.input.clone());
         let tool_call_id = acp::ToolCallId(input.tool_use_id.context("Tool ID required")?.into());
 
-        const ALWAYS_ALLOW: &'static str = "always_allow";
-        const ALLOW: &'static str = "allow";
-        const REJECT: &'static str = "reject";
+        const ALWAYS_ALLOW: &str = "always_allow";
+        const ALLOW: &str = "allow";
+        const REJECT: &str = "reject";
 
         let chosen_option = thread
             .update(cx, |thread, cx| {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index fef80b4d42..8b2703575d 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -428,12 +428,9 @@ pub async fn new_test_thread(
         .await
         .unwrap();
 
-    let thread = cx
-        .update(|cx| connection.new_thread(project.clone(), current_dir.as_ref(), cx))
+    cx.update(|cx| connection.new_thread(project.clone(), current_dir.as_ref(), cx))
         .await
-        .unwrap();
-
-    thread
+        .unwrap()
 }
 
 pub async fn run_until_first_tool_call(
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index e7f0d4f88f..311fe258de 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -134,8 +134,8 @@ impl MessageEditor {
         if prevent_slash_commands {
             subscriptions.push(cx.subscribe_in(&editor, window, {
                 let semantics_provider = semantics_provider.clone();
-                move |this, editor, event, window, cx| match event {
-                    EditorEvent::Edited { .. } => {
+                move |this, editor, event, window, cx| {
+                    if let EditorEvent::Edited { .. } = event {
                         this.highlight_slash_command(
                             semantics_provider.clone(),
                             editor.clone(),
@@ -143,7 +143,6 @@ impl MessageEditor {
                             cx,
                         );
                     }
-                    _ => {}
                 }
             }));
         }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 7b38ba9301..9f1e8d857f 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2124,7 +2124,7 @@ impl AcpThreadView {
                     .map(|view| div().px_4().w_full().max_w_128().child(view)),
             )
             .child(h_flex().mt_1p5().justify_center().children(
-                connection.auth_methods().into_iter().map(|method| {
+                connection.auth_methods().iter().map(|method| {
                     Button::new(SharedString::from(method.id.0.clone()), method.name.clone())
                         .on_click({
                             let method_id = method.id.clone();
@@ -2574,7 +2574,7 @@ impl AcpThreadView {
     ) -> Div {
         let editor_bg_color = cx.theme().colors().editor_background;
 
-        v_flex().children(changed_buffers.into_iter().enumerate().flat_map(
+        v_flex().children(changed_buffers.iter().enumerate().flat_map(
             |(index, (buffer, _diff))| {
                 let file = buffer.read(cx).file()?;
                 let path = file.path();
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index a1e51f883a..e595b94ebb 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1373,12 +1373,12 @@ impl ActiveThread {
             editor.focus_handle(cx).focus(window);
             editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
         });
-        let buffer_edited_subscription = cx.subscribe(&editor, |this, _, event, cx| match event {
-            EditorEvent::BufferEdited => {
-                this.update_editing_message_token_count(true, cx);
-            }
-            _ => {}
-        });
+        let buffer_edited_subscription =
+            cx.subscribe(&editor, |this, _, event: &EditorEvent, cx| {
+                if event == &EditorEvent::BufferEdited {
+                    this.update_editing_message_token_count(true, cx);
+                }
+            });
 
         let context_picker_menu_handle = PopoverMenuHandle::default();
         let context_strip = cx.new(|cx| {
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index b032201d8c..ecb0bca4a1 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -958,7 +958,7 @@ impl AgentConfiguration {
                 }
 
                 parent.child(v_flex().py_1p5().px_1().gap_1().children(
-                    tools.into_iter().enumerate().map(|(ix, tool)| {
+                    tools.iter().enumerate().map(|(ix, tool)| {
                         h_flex()
                             .id(("tool-item", ix))
                             .px_1()
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index 311f75af3b..6159b9be80 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -487,7 +487,7 @@ impl ConfigureContextServerModal {
     }
 
     fn render_modal_description(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        const MODAL_DESCRIPTION: &'static str = "Visit the MCP server configuration docs to find all necessary arguments and environment variables.";
+        const MODAL_DESCRIPTION: &str = "Visit the MCP server configuration docs to find all necessary arguments and environment variables.";
 
         if let ConfigurationSource::Extension {
             installation_instructions: Some(installation_instructions),
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index e80cd20846..9d2ee0bf89 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -322,16 +322,14 @@ impl AgentDiffPane {
     }
 
     fn handle_native_thread_event(&mut self, event: &ThreadEvent, cx: &mut Context<Self>) {
-        match event {
-            ThreadEvent::SummaryGenerated => self.update_title(cx),
-            _ => {}
+        if let ThreadEvent::SummaryGenerated = event {
+            self.update_title(cx)
         }
     }
 
     fn handle_acp_thread_event(&mut self, event: &AcpThreadEvent, cx: &mut Context<Self>) {
-        match event {
-            AcpThreadEvent::TitleUpdated => self.update_title(cx),
-            _ => {}
+        if let AcpThreadEvent::TitleUpdated = event {
+            self.update_title(cx)
         }
     }
 
@@ -1541,15 +1539,11 @@ impl AgentDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        match event {
-            workspace::Event::ItemAdded { item } => {
-                if let Some(editor) = item.downcast::<Editor>()
-                    && let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx)
-                {
-                    self.register_editor(workspace.downgrade(), buffer.clone(), editor, window, cx);
-                }
-            }
-            _ => {}
+        if let workspace::Event::ItemAdded { item } = event
+            && let Some(editor) = item.downcast::<Editor>()
+            && let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx)
+        {
+            self.register_editor(workspace.downgrade(), buffer.clone(), editor, window, cx);
         }
     }
 
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index c79349e3a9..c5cab34030 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -354,7 +354,7 @@ impl ActiveView {
         Self::Thread {
             change_title_editor: editor,
             thread: active_thread,
-            message_editor: message_editor,
+            message_editor,
             _subscriptions: subscriptions,
         }
     }
@@ -756,25 +756,25 @@ impl AgentPanel {
                 .ok();
         });
 
-        let _default_model_subscription = cx.subscribe(
-            &LanguageModelRegistry::global(cx),
-            |this, _, event: &language_model::Event, cx| match event {
-                language_model::Event::DefaultModelChanged => match &this.active_view {
-                    ActiveView::Thread { thread, .. } => {
-                        thread
-                            .read(cx)
-                            .thread()
-                            .clone()
-                            .update(cx, |thread, cx| thread.get_or_init_configured_model(cx));
+        let _default_model_subscription =
+            cx.subscribe(
+                &LanguageModelRegistry::global(cx),
+                |this, _, event: &language_model::Event, cx| {
+                    if let language_model::Event::DefaultModelChanged = event {
+                        match &this.active_view {
+                            ActiveView::Thread { thread, .. } => {
+                                thread.read(cx).thread().clone().update(cx, |thread, cx| {
+                                    thread.get_or_init_configured_model(cx)
+                                });
+                            }
+                            ActiveView::ExternalAgentThread { .. }
+                            | ActiveView::TextThread { .. }
+                            | ActiveView::History
+                            | ActiveView::Configuration => {}
+                        }
                     }
-                    ActiveView::ExternalAgentThread { .. }
-                    | ActiveView::TextThread { .. }
-                    | ActiveView::History
-                    | ActiveView::Configuration => {}
                 },
-                _ => {}
-            },
-        );
+            );
 
         let onboarding = cx.new(|cx| {
             AgentPanelOnboarding::new(
@@ -1589,17 +1589,14 @@ impl AgentPanel {
         let current_is_special = current_is_history || current_is_config;
         let new_is_special = new_is_history || new_is_config;
 
-        match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
-                let thread = thread.read(cx);
-                if thread.is_empty() {
-                    let id = thread.thread().read(cx).id().clone();
-                    self.history_store.update(cx, |store, cx| {
-                        store.remove_recently_opened_thread(id, cx);
-                    });
-                }
+        if let ActiveView::Thread { thread, .. } = &self.active_view {
+            let thread = thread.read(cx);
+            if thread.is_empty() {
+                let id = thread.thread().read(cx).id().clone();
+                self.history_store.update(cx, |store, cx| {
+                    store.remove_recently_opened_thread(id, cx);
+                });
             }
-            _ => {}
         }
 
         match &new_view {
@@ -3465,7 +3462,7 @@ impl AgentPanel {
             .on_drop(cx.listener(move |this, paths: &ExternalPaths, window, cx| {
                 let tasks = paths
                     .paths()
-                    .into_iter()
+                    .iter()
                     .map(|path| {
                         Workspace::project_path_for_path(this.project.clone(), path, false, cx)
                     })
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 697f704991..0b4568dc87 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -385,12 +385,11 @@ impl ContextPicker {
     }
 
     pub fn select_first(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            ContextPickerState::Default(entity) => entity.update(cx, |entity, cx| {
+        // Other variants already select their first entry on open automatically
+        if let ContextPickerState::Default(entity) = &self.mode {
+            entity.update(cx, |entity, cx| {
                 entity.select_first(&Default::default(), window, cx)
-            }),
-            // Other variants already select their first entry on open automatically
-            _ => {}
+            })
         }
     }
 
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 6e4d2638c1..f70d10c1ae 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -117,7 +117,7 @@ pub(crate) fn create_editor(
         let mut editor = Editor::new(
             editor::EditorMode::AutoHeight {
                 min_lines,
-                max_lines: max_lines,
+                max_lines,
             },
             buffer,
             None,
@@ -215,9 +215,10 @@ impl MessageEditor {
 
         let subscriptions = vec![
             cx.subscribe_in(&context_strip, window, Self::handle_context_strip_event),
-            cx.subscribe(&editor, |this, _, event, cx| match event {
-                EditorEvent::BufferEdited => this.handle_message_changed(cx),
-                _ => {}
+            cx.subscribe(&editor, |this, _, event: &EditorEvent, cx| {
+                if event == &EditorEvent::BufferEdited {
+                    this.handle_message_changed(cx)
+                }
             }),
             cx.observe(&context_store, |this, _, cx| {
                 // When context changes, reload it for token counting.
@@ -1132,7 +1133,7 @@ impl MessageEditor {
             )
             .when(is_edit_changes_expanded, |parent| {
                 parent.child(
-                    v_flex().children(changed_buffers.into_iter().enumerate().flat_map(
+                    v_flex().children(changed_buffers.iter().enumerate().flat_map(
                         |(index, (buffer, _diff))| {
                             let file = buffer.read(cx).file()?;
                             let path = file.path();
@@ -1605,7 +1606,8 @@ pub fn extract_message_creases(
         .collect::<HashMap<_, _>>();
     // Filter the addon's list of creases based on what the editor reports,
     // since the addon might have removed creases in it.
-    let creases = editor.display_map.update(cx, |display_map, cx| {
+
+    editor.display_map.update(cx, |display_map, cx| {
         display_map
             .snapshot(cx)
             .crease_snapshot
@@ -1629,8 +1631,7 @@ pub fn extract_message_creases(
                 }
             })
             .collect()
-    });
-    creases
+    })
 }
 
 impl EventEmitter<MessageEditorEvent> for MessageEditor {}
diff --git a/crates/agent_ui/src/slash_command_picker.rs b/crates/agent_ui/src/slash_command_picker.rs
index 03f2c97887..a6bb61510c 100644
--- a/crates/agent_ui/src/slash_command_picker.rs
+++ b/crates/agent_ui/src/slash_command_picker.rs
@@ -327,9 +327,7 @@ where
         };
 
         let picker_view = cx.new(|cx| {
-            let picker =
-                Picker::uniform_list(delegate, window, cx).max_height(Some(rems(20.).into()));
-            picker
+            Picker::uniform_list(delegate, window, cx).max_height(Some(rems(20.).into()))
         });
 
         let handle = self
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index b7e5d83d6d..b3f55ffc43 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -540,7 +540,7 @@ impl TextThreadEditor {
             let context = self.context.read(cx);
             let sections = context
                 .slash_command_output_sections()
-                .into_iter()
+                .iter()
                 .filter(|section| section.is_valid(context.buffer().read(cx)))
                 .cloned()
                 .collect::<Vec<_>>();
@@ -1237,7 +1237,7 @@ impl TextThreadEditor {
             let mut new_blocks = vec![];
             let mut block_index_to_message = vec![];
             for message in self.context.read(cx).messages(cx) {
-                if let Some(_) = blocks_to_remove.remove(&message.id) {
+                if blocks_to_remove.remove(&message.id).is_some() {
                     // This is an old message that we might modify.
                     let Some((meta, block_id)) = old_blocks.get_mut(&message.id) else {
                         debug_assert!(
@@ -1275,7 +1275,7 @@ impl TextThreadEditor {
         context_editor_view: &Entity<TextThreadEditor>,
         cx: &mut Context<Workspace>,
     ) -> Option<(String, bool)> {
-        const CODE_FENCE_DELIMITER: &'static str = "```";
+        const CODE_FENCE_DELIMITER: &str = "```";
 
         let context_editor = context_editor_view.read(cx).editor.clone();
         context_editor.update(cx, |context_editor, cx| {
@@ -2161,8 +2161,8 @@ impl TextThreadEditor {
 
 /// Returns the contents of the *outermost* fenced code block that contains the given offset.
 fn find_surrounding_code_block(snapshot: &BufferSnapshot, offset: usize) -> Option<Range<usize>> {
-    const CODE_BLOCK_NODE: &'static str = "fenced_code_block";
-    const CODE_BLOCK_CONTENT: &'static str = "code_fence_content";
+    const CODE_BLOCK_NODE: &str = "fenced_code_block";
+    const CODE_BLOCK_CONTENT: &str = "code_fence_content";
 
     let layer = snapshot.syntax_layers().next()?;
 
@@ -3129,7 +3129,7 @@ mod tests {
         let context_editor = window
             .update(&mut cx, |_, window, cx| {
                 cx.new(|cx| {
-                    let editor = TextThreadEditor::for_context(
+                    TextThreadEditor::for_context(
                         context.clone(),
                         fs,
                         workspace.downgrade(),
@@ -3137,8 +3137,7 @@ mod tests {
                         None,
                         window,
                         cx,
-                    );
-                    editor
+                    )
                 })
             })
             .unwrap();
diff --git a/crates/agent_ui/src/tool_compatibility.rs b/crates/agent_ui/src/tool_compatibility.rs
index d4e1da5bb0..046c0a4abc 100644
--- a/crates/agent_ui/src/tool_compatibility.rs
+++ b/crates/agent_ui/src/tool_compatibility.rs
@@ -14,13 +14,11 @@ pub struct IncompatibleToolsState {
 
 impl IncompatibleToolsState {
     pub fn new(thread: Entity<Thread>, cx: &mut Context<Self>) -> Self {
-        let _tool_working_set_subscription =
-            cx.subscribe(&thread, |this, _, event, _| match event {
-                ThreadEvent::ProfileChanged => {
-                    this.cache.clear();
-                }
-                _ => {}
-            });
+        let _tool_working_set_subscription = cx.subscribe(&thread, |this, _, event, _| {
+            if let ThreadEvent::ProfileChanged = event {
+                this.cache.clear();
+            }
+        });
 
         Self {
             cache: HashMap::default(),
diff --git a/crates/assistant_context/src/assistant_context.rs b/crates/assistant_context/src/assistant_context.rs
index 2d71a1c08a..4d0bfae444 100644
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -590,7 +590,7 @@ impl From<&Message> for MessageMetadata {
 
 impl MessageMetadata {
     pub fn is_cache_valid(&self, buffer: &BufferSnapshot, range: &Range<usize>) -> bool {
-        let result = match &self.cache {
+        match &self.cache {
             Some(MessageCacheMetadata { cached_at, .. }) => !buffer.has_edits_since_in_range(
                 cached_at,
                 Range {
@@ -599,8 +599,7 @@ impl MessageMetadata {
                 },
             ),
             _ => false,
-        };
-        result
+        }
     }
 }
 
@@ -2081,15 +2080,12 @@ impl AssistantContext {
 
                                 match event {
                                     LanguageModelCompletionEvent::StatusUpdate(status_update) => {
-                                        match status_update {
-                                            CompletionRequestStatus::UsageUpdated { amount, limit } => {
-                                                this.update_model_request_usage(
-                                                    amount as u32,
-                                                    limit,
-                                                    cx,
-                                                );
-                                            }
-                                            _ => {}
+                                        if let CompletionRequestStatus::UsageUpdated { amount, limit } = status_update {
+                                            this.update_model_request_usage(
+                                                amount as u32,
+                                                limit,
+                                                cx,
+                                            );
                                         }
                                     }
                                     LanguageModelCompletionEvent::StartMessage { .. } => {}
diff --git a/crates/assistant_slash_commands/src/file_command.rs b/crates/assistant_slash_commands/src/file_command.rs
index 6875189927..894aa94a27 100644
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -223,7 +223,7 @@ fn collect_files(
     cx: &mut App,
 ) -> impl Stream<Item = Result<SlashCommandEvent>> + use<> {
     let Ok(matchers) = glob_inputs
-        .into_iter()
+        .iter()
         .map(|glob_input| {
             custom_path_matcher::PathMatcher::new(&[glob_input.to_owned()])
                 .with_context(|| format!("invalid path {glob_input}"))
@@ -379,7 +379,7 @@ fn collect_files(
                 }
             }
 
-            while let Some(_) = directory_stack.pop() {
+            while directory_stack.pop().is_some() {
                 events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
             }
         }
@@ -491,7 +491,7 @@ mod custom_path_matcher {
     impl PathMatcher {
         pub fn new(globs: &[String]) -> Result<Self, globset::Error> {
             let globs = globs
-                .into_iter()
+                .iter()
                 .map(|glob| Glob::new(&SanitizedPath::from(glob).to_glob_string()))
                 .collect::<Result<Vec<_>, _>>()?;
             let sources = globs.iter().map(|glob| glob.glob().to_owned()).collect();
diff --git a/crates/assistant_tool/src/tool_working_set.rs b/crates/assistant_tool/src/tool_working_set.rs
index c0a358917b..61f57affc7 100644
--- a/crates/assistant_tool/src/tool_working_set.rs
+++ b/crates/assistant_tool/src/tool_working_set.rs
@@ -156,13 +156,13 @@ fn resolve_context_server_tool_name_conflicts(
 
     if duplicated_tool_names.is_empty() {
         return context_server_tools
-            .into_iter()
+            .iter()
             .map(|tool| (resolve_tool_name(tool).into(), tool.clone()))
             .collect();
     }
 
     context_server_tools
-        .into_iter()
+        .iter()
         .filter_map(|tool| {
             let mut tool_name = resolve_tool_name(tool);
             if !duplicated_tool_names.contains(&tool_name) {
diff --git a/crates/assistant_tools/src/assistant_tools.rs b/crates/assistant_tools/src/assistant_tools.rs
index f381103c27..ce3b639cb2 100644
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -72,11 +72,10 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
     register_web_search_tool(&LanguageModelRegistry::global(cx), cx);
     cx.subscribe(
         &LanguageModelRegistry::global(cx),
-        move |registry, event, cx| match event {
-            language_model::Event::DefaultModelChanged => {
+        move |registry, event, cx| {
+            if let language_model::Event::DefaultModelChanged = event {
                 register_web_search_tool(&registry, cx);
             }
-            _ => {}
         },
     )
     .detach();
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index 2d6b5ce924..33d08b4f88 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -1356,8 +1356,7 @@ mod tests {
             mode: mode.clone(),
         };
 
-        let result = cx.update(|cx| resolve_path(&input, project, cx));
-        result
+        cx.update(|cx| resolve_path(&input, project, cx))
     }
 
     fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &str) {
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index dd0a0c8e4c..14bbcef8b4 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -216,7 +216,8 @@ impl Tool for TerminalTool {
             async move |cx| {
                 let program = program.await;
                 let env = env.await;
-                let terminal = project
+
+                project
                     .update(cx, |project, cx| {
                         project.create_terminal(
                             TerminalKind::Task(task::SpawnInTerminal {
@@ -229,8 +230,7 @@ impl Tool for TerminalTool {
                             cx,
                         )
                     })?
-                    .await;
-                terminal
+                    .await
             }
         });
 
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 57890628f2..925d5ddefb 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -494,11 +494,11 @@ mod linux {
                 Ok(Fork::Parent(_)) => Ok(()),
                 Ok(Fork::Child) => {
                     unsafe { std::env::set_var(FORCE_CLI_MODE_ENV_VAR_NAME, "") };
-                    if let Err(_) = fork::setsid() {
+                    if fork::setsid().is_err() {
                         eprintln!("failed to setsid: {}", std::io::Error::last_os_error());
                         process::exit(1);
                     }
-                    if let Err(_) = fork::close_fd() {
+                    if fork::close_fd().is_err() {
                         eprintln!("failed to close_fd: {}", std::io::Error::last_os_error());
                     }
                     let error =
@@ -534,8 +534,8 @@ mod flatpak {
     use std::process::Command;
     use std::{env, process};
 
-    const EXTRA_LIB_ENV_NAME: &'static str = "ZED_FLATPAK_LIB_PATH";
-    const NO_ESCAPE_ENV_NAME: &'static str = "ZED_FLATPAK_NO_ESCAPE";
+    const EXTRA_LIB_ENV_NAME: &str = "ZED_FLATPAK_LIB_PATH";
+    const NO_ESCAPE_ENV_NAME: &str = "ZED_FLATPAK_NO_ESCAPE";
 
     /// Adds bundled libraries to LD_LIBRARY_PATH if running under flatpak
     pub fn ld_extra_libs() {
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 5a2c40b890..930e635dd8 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -4970,7 +4970,7 @@ async fn test_references(
         "Rust",
         FakeLspAdapter {
             name: "my-fake-lsp-adapter",
-            capabilities: capabilities,
+            capabilities,
             ..FakeLspAdapter::default()
         },
     );
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 57f6341297..5fead5bcf1 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -397,11 +397,10 @@ impl MessageEditor {
     ) -> Option<(Anchor, String, &'static [StringMatchCandidate])> {
         static EMOJI_FUZZY_MATCH_CANDIDATES: LazyLock<Vec<StringMatchCandidate>> =
             LazyLock::new(|| {
-                let emojis = emojis::iter()
+                emojis::iter()
                     .flat_map(|s| s.shortcodes())
                     .map(|emoji| StringMatchCandidate::new(0, emoji))
-                    .collect::<Vec<_>>();
-                emojis
+                    .collect::<Vec<_>>()
             });
 
         let end_offset = end_anchor.to_offset(buffer.read(cx));
diff --git a/crates/context_server/src/listener.rs b/crates/context_server/src/listener.rs
index f3c199a14e..6f4b5c1369 100644
--- a/crates/context_server/src/listener.rs
+++ b/crates/context_server/src/listener.rs
@@ -77,7 +77,7 @@ impl McpServer {
                 socket_path,
                 _server_task: server_task,
                 tools,
-                handlers: handlers,
+                handlers,
             })
         })
     }
diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
index 6e80ec484c..614cd0e05d 100644
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -238,7 +238,7 @@ impl PythonDebugAdapter {
                     return Err("Failed to create base virtual environment".into());
                 }
 
-                const DIR: &'static str = if cfg!(target_os = "windows") {
+                const DIR: &str = if cfg!(target_os = "windows") {
                     "Scripts"
                 } else {
                     "bin"
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index 4e1b0d19e2..6c70a935e0 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -257,7 +257,7 @@ impl DebugPanel {
                                         .as_ref()
                                         .map(|entity| entity.downgrade()),
                                     task_context: task_context.clone(),
-                                    worktree_id: worktree_id,
+                                    worktree_id,
                                 });
                             };
                             running.resolve_scenario(
diff --git a/crates/debugger_ui/src/session.rs b/crates/debugger_ui/src/session.rs
index 73cfef78cc..0fc003a14d 100644
--- a/crates/debugger_ui/src/session.rs
+++ b/crates/debugger_ui/src/session.rs
@@ -87,7 +87,7 @@ impl DebugSession {
         self.stack_trace_view.get_or_init(|| {
             let stackframe_list = running_state.read(cx).stack_frame_list().clone();
 
-            let stack_frame_view = cx.new(|cx| {
+            cx.new(|cx| {
                 StackTraceView::new(
                     workspace.clone(),
                     project.clone(),
@@ -95,9 +95,7 @@ impl DebugSession {
                     window,
                     cx,
                 )
-            });
-
-            stack_frame_view
+            })
         })
     }
 
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 449deb4ddb..e3682ac991 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -358,7 +358,7 @@ pub(crate) fn new_debugger_pane(
         }
     };
 
-    let ret = cx.new(move |cx| {
+    cx.new(move |cx| {
         let mut pane = Pane::new(
             workspace.clone(),
             project.clone(),
@@ -562,9 +562,7 @@ pub(crate) fn new_debugger_pane(
             }
         });
         pane
-    });
-
-    ret
+    })
 }
 
 pub struct DebugTerminal {
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index 26a26c7bef..c17fffc42c 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -329,8 +329,8 @@ impl BreakpointList {
                 let text = self.input.read(cx).text(cx);
 
                 match mode {
-                    ActiveBreakpointStripMode::Log => match &entry.kind {
-                        BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
+                    ActiveBreakpointStripMode::Log => {
+                        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &entry.kind {
                             Self::edit_line_breakpoint_inner(
                                 &self.breakpoint_store,
                                 line_breakpoint.breakpoint.path.clone(),
@@ -339,10 +339,9 @@ impl BreakpointList {
                                 cx,
                             );
                         }
-                        _ => {}
-                    },
-                    ActiveBreakpointStripMode::Condition => match &entry.kind {
-                        BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
+                    }
+                    ActiveBreakpointStripMode::Condition => {
+                        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &entry.kind {
                             Self::edit_line_breakpoint_inner(
                                 &self.breakpoint_store,
                                 line_breakpoint.breakpoint.path.clone(),
@@ -351,10 +350,9 @@ impl BreakpointList {
                                 cx,
                             );
                         }
-                        _ => {}
-                    },
-                    ActiveBreakpointStripMode::HitCondition => match &entry.kind {
-                        BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
+                    }
+                    ActiveBreakpointStripMode::HitCondition => {
+                        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &entry.kind {
                             Self::edit_line_breakpoint_inner(
                                 &self.breakpoint_store,
                                 line_breakpoint.breakpoint.path.clone(),
@@ -363,8 +361,7 @@ impl BreakpointList {
                                 cx,
                             );
                         }
-                        _ => {}
-                    },
+                    }
                 }
                 self.focus_handle.focus(window);
             } else {
@@ -426,13 +423,10 @@ impl BreakpointList {
             return;
         };
 
-        match &mut entry.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                let path = line_breakpoint.breakpoint.path.clone();
-                let row = line_breakpoint.breakpoint.row;
-                self.edit_line_breakpoint(path, row, BreakpointEditAction::Toggle, cx);
-            }
-            _ => {}
+        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &mut entry.kind {
+            let path = line_breakpoint.breakpoint.path.clone();
+            let row = line_breakpoint.breakpoint.row;
+            self.edit_line_breakpoint(path, row, BreakpointEditAction::Toggle, cx);
         }
         cx.notify();
     }
@@ -967,7 +961,7 @@ impl LineBreakpoint {
                     props,
                     breakpoint: BreakpointEntry {
                         kind: BreakpointEntryKind::LineBreakpoint(self.clone()),
-                        weak: weak,
+                        weak,
                     },
                     is_selected,
                     focus_handle,
@@ -1179,7 +1173,7 @@ impl ExceptionBreakpoint {
                     props,
                     breakpoint: BreakpointEntry {
                         kind: BreakpointEntryKind::ExceptionBreakpoint(self.clone()),
-                        weak: weak,
+                        weak,
                     },
                     is_selected,
                     focus_handle,
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index 3cc5fbc272..7461bffdf9 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -947,7 +947,7 @@ impl VariableList {
     #[track_caller]
     #[cfg(test)]
     pub(crate) fn assert_visual_entries(&self, expected: Vec<&str>) {
-        const INDENT: &'static str = "    ";
+        const INDENT: &str = "    ";
 
         let entries = &self.entries;
         let mut visual_entries = Vec::with_capacity(entries.len());
diff --git a/crates/debugger_ui/src/tests/variable_list.rs b/crates/debugger_ui/src/tests/variable_list.rs
index fbbd529641..4cfdae093f 100644
--- a/crates/debugger_ui/src/tests/variable_list.rs
+++ b/crates/debugger_ui/src/tests/variable_list.rs
@@ -1445,11 +1445,8 @@ async fn test_variable_list_only_sends_requests_when_rendering(
 
     cx.run_until_parked();
 
-    let running_state = active_debug_session_panel(workspace, cx).update_in(cx, |item, _, _| {
-        let state = item.running_state().clone();
-
-        state
-    });
+    let running_state = active_debug_session_panel(workspace, cx)
+        .update_in(cx, |item, _, _| item.running_state().clone());
 
     client
         .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index 6ac0f49fad..99e588ada9 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -21,7 +21,7 @@ static KEYMAP_LINUX: LazyLock<KeymapFile> = LazyLock::new(|| {
 
 static ALL_ACTIONS: LazyLock<Vec<ActionDef>> = LazyLock::new(dump_all_gpui_actions);
 
-const FRONT_MATTER_COMMENT: &'static str = "<!-- ZED_META {} -->";
+const FRONT_MATTER_COMMENT: &str = "<!-- ZED_META {} -->";
 
 fn main() -> Result<()> {
     zlog::init();
@@ -105,8 +105,8 @@ fn handle_preprocessing() -> Result<()> {
     template_and_validate_actions(&mut book, &mut errors);
 
     if !errors.is_empty() {
-        const ANSI_RED: &'static str = "\x1b[31m";
-        const ANSI_RESET: &'static str = "\x1b[0m";
+        const ANSI_RED: &str = "\x1b[31m";
+        const ANSI_RESET: &str = "\x1b[0m";
         for error in &errors {
             eprintln!("{ANSI_RED}ERROR{ANSI_RESET}: {}", error);
         }
@@ -143,11 +143,8 @@ fn handle_frontmatter(book: &mut Book, errors: &mut HashSet<PreprocessorError>)
                 &serde_json::to_string(&metadata).expect("Failed to serialize metadata"),
             )
         });
-        match new_content {
-            Cow::Owned(content) => {
-                chapter.content = content;
-            }
-            Cow::Borrowed(_) => {}
+        if let Cow::Owned(content) = new_content {
+            chapter.content = content;
         }
     });
 }
@@ -409,13 +406,13 @@ fn handle_postprocessing() -> Result<()> {
             .captures(contents)
             .with_context(|| format!("Failed to find title in {:?}", pretty_path))
             .expect("Page has <title> element")[1];
-        let title = title_tag_contents
+
+        title_tag_contents
             .trim()
             .strip_suffix("- Zed")
             .unwrap_or(title_tag_contents)
             .trim()
-            .to_string();
-        title
+            .to_string()
     }
 }
 
diff --git a/crates/editor/src/display_map/invisibles.rs b/crates/editor/src/display_map/invisibles.rs
index 19e4c2b42a..0712ddf9e2 100644
--- a/crates/editor/src/display_map/invisibles.rs
+++ b/crates/editor/src/display_map/invisibles.rs
@@ -61,14 +61,14 @@ pub fn replacement(c: char) -> Option<&'static str> {
 // but could if we tracked state in the classifier.
 const IDEOGRAPHIC_SPACE: char = '\u{3000}';
 
-const C0_SYMBOLS: &'static [&'static str] = &[
+const C0_SYMBOLS: &[&str] = &[
     "␀", "␁", "␂", "␃", "␄", "␅", "␆", "␇", "␈", "␉", "␊", "␋", "␌", "␍", "␎", "␏", "␐", "␑", "␒",
     "␓", "␔", "␕", "␖", "␗", "␘", "␙", "␚", "␛", "␜", "␝", "␞", "␟",
 ];
-const DEL: &'static str = "␡";
+const DEL: &str = "␡";
 
 // generated using ucd-generate: ucd-generate general-category --include Format --chars ucd-16.0.0
-pub const FORMAT: &'static [(char, char)] = &[
+pub const FORMAT: &[(char, char)] = &[
     ('\u{ad}', '\u{ad}'),
     ('\u{600}', '\u{605}'),
     ('\u{61c}', '\u{61c}'),
@@ -93,7 +93,7 @@ pub const FORMAT: &'static [(char, char)] = &[
 ];
 
 // hand-made base on https://invisible-characters.com (Excluding Cf)
-pub const OTHER: &'static [(char, char)] = &[
+pub const OTHER: &[(char, char)] = &[
     ('\u{034f}', '\u{034f}'),
     ('\u{115F}', '\u{1160}'),
     ('\u{17b4}', '\u{17b5}'),
@@ -107,7 +107,7 @@ pub const OTHER: &'static [(char, char)] = &[
 ];
 
 // a subset of FORMAT/OTHER that may appear within glyphs
-const PRESERVE: &'static [(char, char)] = &[
+const PRESERVE: &[(char, char)] = &[
     ('\u{034f}', '\u{034f}'),
     ('\u{200d}', '\u{200d}'),
     ('\u{17b4}', '\u{17b5}'),
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 7c36a41046..3805904243 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1943,26 +1943,24 @@ impl Editor {
             let git_store = project.read(cx).git_store().clone();
             let project = project.clone();
             project_subscriptions.push(cx.subscribe(&git_store, move |this, _, event, cx| {
-                match event {
-                    GitStoreEvent::RepositoryUpdated(
-                        _,
-                        RepositoryEvent::Updated {
-                            new_instance: true, ..
-                        },
-                        _,
-                    ) => {
-                        this.load_diff_task = Some(
-                            update_uncommitted_diff_for_buffer(
-                                cx.entity(),
-                                &project,
-                                this.buffer.read(cx).all_buffers(),
-                                this.buffer.clone(),
-                                cx,
-                            )
-                            .shared(),
-                        );
-                    }
-                    _ => {}
+                if let GitStoreEvent::RepositoryUpdated(
+                    _,
+                    RepositoryEvent::Updated {
+                        new_instance: true, ..
+                    },
+                    _,
+                ) = event
+                {
+                    this.load_diff_task = Some(
+                        update_uncommitted_diff_for_buffer(
+                            cx.entity(),
+                            &project,
+                            this.buffer.read(cx).all_buffers(),
+                            this.buffer.clone(),
+                            cx,
+                        )
+                        .shared(),
+                    );
                 }
             }));
         }
@@ -3221,35 +3219,31 @@ impl Editor {
             selections.select_anchors(other_selections);
         });
 
-        let other_subscription =
-            cx.subscribe(&other, |this, other, other_evt, cx| match other_evt {
-                EditorEvent::SelectionsChanged { local: true } => {
-                    let other_selections = other.read(cx).selections.disjoint.to_vec();
-                    if other_selections.is_empty() {
-                        return;
-                    }
-                    this.selections.change_with(cx, |selections| {
-                        selections.select_anchors(other_selections);
-                    });
+        let other_subscription = cx.subscribe(&other, |this, other, other_evt, cx| {
+            if let EditorEvent::SelectionsChanged { local: true } = other_evt {
+                let other_selections = other.read(cx).selections.disjoint.to_vec();
+                if other_selections.is_empty() {
+                    return;
                 }
-                _ => {}
-            });
+                this.selections.change_with(cx, |selections| {
+                    selections.select_anchors(other_selections);
+                });
+            }
+        });
 
-        let this_subscription =
-            cx.subscribe_self::<EditorEvent>(move |this, this_evt, cx| match this_evt {
-                EditorEvent::SelectionsChanged { local: true } => {
-                    let these_selections = this.selections.disjoint.to_vec();
-                    if these_selections.is_empty() {
-                        return;
-                    }
-                    other.update(cx, |other_editor, cx| {
-                        other_editor.selections.change_with(cx, |selections| {
-                            selections.select_anchors(these_selections);
-                        })
-                    });
+        let this_subscription = cx.subscribe_self::<EditorEvent>(move |this, this_evt, cx| {
+            if let EditorEvent::SelectionsChanged { local: true } = this_evt {
+                let these_selections = this.selections.disjoint.to_vec();
+                if these_selections.is_empty() {
+                    return;
                 }
-                _ => {}
-            });
+                other.update(cx, |other_editor, cx| {
+                    other_editor.selections.change_with(cx, |selections| {
+                        selections.select_anchors(these_selections);
+                    })
+                });
+            }
+        });
 
         Subscription::join(other_subscription, this_subscription)
     }
@@ -5661,34 +5655,31 @@ impl Editor {
 
                 let Ok(()) = editor.update_in(cx, |editor, window, cx| {
                     // Newer menu already set, so exit.
-                    match editor.context_menu.borrow().as_ref() {
-                        Some(CodeContextMenu::Completions(prev_menu)) => {
-                            if prev_menu.id > id {
-                                return;
-                            }
-                        }
-                        _ => {}
+                    if let Some(CodeContextMenu::Completions(prev_menu)) =
+                        editor.context_menu.borrow().as_ref()
+                        && prev_menu.id > id
+                    {
+                        return;
                     };
 
                     // Only valid to take prev_menu because it the new menu is immediately set
                     // below, or the menu is hidden.
-                    match editor.context_menu.borrow_mut().take() {
-                        Some(CodeContextMenu::Completions(prev_menu)) => {
-                            let position_matches =
-                                if prev_menu.initial_position == menu.initial_position {
-                                    true
-                                } else {
-                                    let snapshot = editor.buffer.read(cx).read(cx);
-                                    prev_menu.initial_position.to_offset(&snapshot)
-                                        == menu.initial_position.to_offset(&snapshot)
-                                };
-                            if position_matches {
-                                // Preserve markdown cache before `set_filter_results` because it will
-                                // try to populate the documentation cache.
-                                menu.preserve_markdown_cache(prev_menu);
-                            }
+                    if let Some(CodeContextMenu::Completions(prev_menu)) =
+                        editor.context_menu.borrow_mut().take()
+                    {
+                        let position_matches =
+                            if prev_menu.initial_position == menu.initial_position {
+                                true
+                            } else {
+                                let snapshot = editor.buffer.read(cx).read(cx);
+                                prev_menu.initial_position.to_offset(&snapshot)
+                                    == menu.initial_position.to_offset(&snapshot)
+                            };
+                        if position_matches {
+                            // Preserve markdown cache before `set_filter_results` because it will
+                            // try to populate the documentation cache.
+                            menu.preserve_markdown_cache(prev_menu);
                         }
-                        _ => {}
                     };
 
                     menu.set_filter_results(matches, provider, window, cx);
@@ -6179,12 +6170,11 @@ impl Editor {
                 }
             });
             Some(cx.background_spawn(async move {
-                let scenarios = futures::future::join_all(scenarios)
+                futures::future::join_all(scenarios)
                     .await
                     .into_iter()
                     .flatten()
-                    .collect::<Vec<_>>();
-                scenarios
+                    .collect::<Vec<_>>()
             }))
         })
         .unwrap_or_else(|| Task::ready(vec![]))
@@ -7740,12 +7730,9 @@ impl Editor {
         self.edit_prediction_settings =
             self.edit_prediction_settings_at_position(&buffer, cursor_buffer_position, cx);
 
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => {
-                self.discard_edit_prediction(false, cx);
-                return None;
-            }
-            _ => {}
+        if let EditPredictionSettings::Disabled = self.edit_prediction_settings {
+            self.discard_edit_prediction(false, cx);
+            return None;
         };
 
         self.edit_prediction_indent_conflict = multibuffer.is_line_whitespace_upto(cursor);
@@ -10638,8 +10625,7 @@ impl Editor {
             .buffer_snapshot
             .anchor_after(Point::new(row, line_len));
 
-        let bp = self
-            .breakpoint_store
+        self.breakpoint_store
             .as_ref()?
             .read_with(cx, |breakpoint_store, cx| {
                 breakpoint_store
@@ -10664,8 +10650,7 @@ impl Editor {
                             None
                         }
                     })
-            });
-        bp
+            })
     }
 
     pub fn edit_log_breakpoint(
@@ -10701,7 +10686,7 @@ impl Editor {
         let cursors = self
             .selections
             .disjoint_anchors()
-            .into_iter()
+            .iter()
             .map(|selection| {
                 let cursor_position: Point = selection.head().to_point(&snapshot.buffer_snapshot);
 
@@ -14878,7 +14863,7 @@ impl Editor {
                     let start = parent.start - offset;
                     offset += parent.len() - text.len();
                     selections.push(Selection {
-                        id: id,
+                        id,
                         start,
                         end: start + text.len(),
                         reversed: false,
@@ -19202,7 +19187,7 @@ impl Editor {
         let locations = self
             .selections
             .all_anchors(cx)
-            .into_iter()
+            .iter()
             .map(|selection| Location {
                 buffer: buffer.clone(),
                 range: selection.start.text_anchor..selection.end.text_anchor,
@@ -19914,11 +19899,8 @@ impl Editor {
         event: &SessionEvent,
         cx: &mut Context<Self>,
     ) {
-        match event {
-            SessionEvent::InvalidateInlineValue => {
-                self.refresh_inline_values(cx);
-            }
-            _ => {}
+        if let SessionEvent::InvalidateInlineValue = event {
+            self.refresh_inline_values(cx);
         }
     }
 
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 685cc47cdb..1f1239ba0a 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -21037,7 +21037,7 @@ fn assert_breakpoint(
         let mut breakpoint = breakpoints
             .get(path)
             .unwrap()
-            .into_iter()
+            .iter()
             .map(|breakpoint| {
                 (
                     breakpoint.row,
@@ -23622,7 +23622,7 @@ pub fn handle_completion_request(
                     complete_from_position
                 );
                 Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                    is_incomplete: is_incomplete,
+                    is_incomplete,
                     item_defaults: None,
                     items: completions
                         .iter()
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index c14e49fc1d..f1ebd2c3df 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -724,7 +724,7 @@ impl EditorElement {
                         ColumnarMode::FromMouse => true,
                         ColumnarMode::FromSelection => false,
                     },
-                    mode: mode,
+                    mode,
                     goal_column: point_for_position.exact_unclipped.column(),
                 },
                 window,
@@ -2437,14 +2437,13 @@ impl EditorElement {
                 .unwrap_or_default()
                 .padding as f32;
 
-            if let Some(edit_prediction) = editor.active_edit_prediction.as_ref() {
-                match &edit_prediction.completion {
-                    EditPrediction::Edit {
-                        display_mode: EditDisplayMode::TabAccept,
-                        ..
-                    } => padding += INLINE_ACCEPT_SUGGESTION_EM_WIDTHS,
-                    _ => {}
-                }
+            if let Some(edit_prediction) = editor.active_edit_prediction.as_ref()
+                && let EditPrediction::Edit {
+                    display_mode: EditDisplayMode::TabAccept,
+                    ..
+                } = &edit_prediction.completion
+            {
+                padding += INLINE_ACCEPT_SUGGESTION_EM_WIDTHS
             }
 
             padding * em_width
@@ -2978,8 +2977,8 @@ impl EditorElement {
             .ilog10()
             + 1;
 
-        let elements = buffer_rows
-            .into_iter()
+        buffer_rows
+            .iter()
             .enumerate()
             .map(|(ix, row_info)| {
                 let ExpandInfo {
@@ -3034,9 +3033,7 @@ impl EditorElement {
 
                 Some((toggle, origin))
             })
-            .collect();
-
-        elements
+            .collect()
     }
 
     fn calculate_relative_line_numbers(
@@ -3136,7 +3133,7 @@ impl EditorElement {
         let relative_rows = self.calculate_relative_line_numbers(snapshot, &rows, relative_to);
         let mut line_number = String::new();
         let line_numbers = buffer_rows
-            .into_iter()
+            .iter()
             .enumerate()
             .flat_map(|(ix, row_info)| {
                 let display_row = DisplayRow(rows.start.0 + ix as u32);
@@ -3213,7 +3210,7 @@ impl EditorElement {
             && self.editor.read(cx).is_singleton(cx);
         if include_fold_statuses {
             row_infos
-                .into_iter()
+                .iter()
                 .enumerate()
                 .map(|(ix, info)| {
                     if info.expand_info.is_some() {
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index 2f6106c86c..b11617ccec 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -213,8 +213,8 @@ impl GitBlame {
         let project_subscription = cx.subscribe(&project, {
             let buffer = buffer.clone();
 
-            move |this, _, event, cx| match event {
-                project::Event::WorktreeUpdatedEntries(_, updated) => {
+            move |this, _, event, cx| {
+                if let project::Event::WorktreeUpdatedEntries(_, updated) = event {
                     let project_entry_id = buffer.read(cx).entry_id(cx);
                     if updated
                         .iter()
@@ -224,7 +224,6 @@ impl GitBlame {
                         this.generate(cx);
                     }
                 }
-                _ => {}
             }
         });
 
@@ -292,7 +291,7 @@ impl GitBlame {
 
         let buffer_id = self.buffer_snapshot.remote_id();
         let mut cursor = self.entries.cursor::<u32>(&());
-        rows.into_iter().map(move |info| {
+        rows.iter().map(move |info| {
             let row = info
                 .buffer_row
                 .filter(|_| info.buffer_id == Some(buffer_id))?;
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index a8cdfa99df..bb3fd2830d 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -603,18 +603,15 @@ async fn parse_blocks(
         })
         .join("\n\n");
 
-    let rendered_block = cx
-        .new_window_entity(|_window, cx| {
-            Markdown::new(
-                combined_text.into(),
-                language_registry.cloned(),
-                language.map(|language| language.name()),
-                cx,
-            )
-        })
-        .ok();
-
-    rendered_block
+    cx.new_window_entity(|_window, cx| {
+        Markdown::new(
+            combined_text.into(),
+            language_registry.cloned(),
+            language.map(|language| language.name()),
+            cx,
+        )
+    })
+    .ok()
 }
 
 pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index e3d2f92c55..8957e0e99c 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1009,16 +1009,12 @@ impl Item for Editor {
     ) {
         self.workspace = Some((workspace.weak_handle(), workspace.database_id()));
         if let Some(workspace) = &workspace.weak_handle().upgrade() {
-            cx.subscribe(
-                workspace,
-                |editor, _, event: &workspace::Event, _cx| match event {
-                    workspace::Event::ModalOpened => {
-                        editor.mouse_context_menu.take();
-                        editor.inline_blame_popover.take();
-                    }
-                    _ => {}
-                },
-            )
+            cx.subscribe(workspace, |editor, _, event: &workspace::Event, _cx| {
+                if let workspace::Event::ModalOpened = event {
+                    editor.mouse_context_menu.take();
+                    editor.inline_blame_popover.take();
+                }
+            })
             .detach();
         }
     }
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
index 13e5d0a8c7..a3fc41228f 100644
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -808,10 +808,7 @@ mod jsx_tag_autoclose_tests {
             );
             buf
         });
-        let buffer_c = cx.new(|cx| {
-            let buf = language::Buffer::local("<span", cx);
-            buf
-        });
+        let buffer_c = cx.new(|cx| language::Buffer::local("<span", cx));
         let buffer = cx.new(|cx| {
             let mut buf = MultiBuffer::new(language::Capability::ReadWrite);
             buf.push_excerpts(
diff --git a/crates/editor/src/proposed_changes_editor.rs b/crates/editor/src/proposed_changes_editor.rs
index e549f64758..c79feccb4b 100644
--- a/crates/editor/src/proposed_changes_editor.rs
+++ b/crates/editor/src/proposed_changes_editor.rs
@@ -241,24 +241,13 @@ impl ProposedChangesEditor {
         event: &BufferEvent,
         _cx: &mut Context<Self>,
     ) {
-        match event {
-            BufferEvent::Operation { .. } => {
-                self.recalculate_diffs_tx
-                    .unbounded_send(RecalculateDiff {
-                        buffer,
-                        debounce: true,
-                    })
-                    .ok();
-            }
-            // BufferEvent::DiffBaseChanged => {
-            //     self.recalculate_diffs_tx
-            //         .unbounded_send(RecalculateDiff {
-            //             buffer,
-            //             debounce: false,
-            //         })
-            //         .ok();
-            // }
-            _ => (),
+        if let BufferEvent::Operation { .. } = event {
+            self.recalculate_diffs_tx
+                .unbounded_send(RecalculateDiff {
+                    buffer,
+                    debounce: true,
+                })
+                .ok();
         }
     }
 }
diff --git a/crates/editor/src/selections_collection.rs b/crates/editor/src/selections_collection.rs
index 73c5f1c076..0a02390b64 100644
--- a/crates/editor/src/selections_collection.rs
+++ b/crates/editor/src/selections_collection.rs
@@ -119,8 +119,8 @@ impl SelectionsCollection {
         cx: &mut App,
     ) -> Option<Selection<D>> {
         let map = self.display_map(cx);
-        let selection = resolve_selections(self.pending_anchor().as_ref(), &map).next();
-        selection
+
+        resolve_selections(self.pending_anchor().as_ref(), &map).next()
     }
 
     pub(crate) fn pending_mode(&self) -> Option<SelectMode> {
@@ -276,18 +276,18 @@ impl SelectionsCollection {
         cx: &mut App,
     ) -> Selection<D> {
         let map = self.display_map(cx);
-        let selection = resolve_selections([self.newest_anchor()], &map)
+
+        resolve_selections([self.newest_anchor()], &map)
             .next()
-            .unwrap();
-        selection
+            .unwrap()
     }
 
     pub fn newest_display(&self, cx: &mut App) -> Selection<DisplayPoint> {
         let map = self.display_map(cx);
-        let selection = resolve_selections_display([self.newest_anchor()], &map)
+
+        resolve_selections_display([self.newest_anchor()], &map)
             .next()
-            .unwrap();
-        selection
+            .unwrap()
     }
 
     pub fn oldest_anchor(&self) -> &Selection<Anchor> {
@@ -303,10 +303,10 @@ impl SelectionsCollection {
         cx: &mut App,
     ) -> Selection<D> {
         let map = self.display_map(cx);
-        let selection = resolve_selections([self.oldest_anchor()], &map)
+
+        resolve_selections([self.oldest_anchor()], &map)
             .next()
-            .unwrap();
-        selection
+            .unwrap()
     }
 
     pub fn first_anchor(&self) -> Selection<Anchor> {
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
index dd9b4f8bba..bbbe54b43f 100644
--- a/crates/eval/src/instance.rs
+++ b/crates/eval/src/instance.rs
@@ -678,8 +678,8 @@ pub fn wait_for_lang_server(
         [
             cx.subscribe(&lsp_store, {
                 let log_prefix = log_prefix.clone();
-                move |_, event, _| match event {
-                    project::LspStoreEvent::LanguageServerUpdate {
+                move |_, event, _| {
+                    if let project::LspStoreEvent::LanguageServerUpdate {
                         message:
                             client::proto::update_language_server::Variant::WorkProgress(
                                 LspWorkProgress {
@@ -688,8 +688,10 @@ pub fn wait_for_lang_server(
                                 },
                             ),
                         ..
-                    } => println!("{}⟲ {message}", log_prefix),
-                    _ => {}
+                    } = event
+                    {
+                        println!("{}⟲ {message}", log_prefix)
+                    }
                 }
             }),
             cx.subscribe(project, {
diff --git a/crates/extension/src/extension_builder.rs b/crates/extension/src/extension_builder.rs
index 432adaf4bc..3a3026f19c 100644
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -484,14 +484,10 @@ impl ExtensionBuilder {
                 _ => {}
             }
 
-            match &payload {
-                CustomSection(c) => {
-                    if strip_custom_section(c.name()) {
-                        continue;
-                    }
-                }
-
-                _ => {}
+            if let CustomSection(c) = &payload
+                && strip_custom_section(c.name())
+            {
+                continue;
             }
             if let Some((id, range)) = payload.as_section() {
                 RawSection {
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 1a05dbc570..4c3ab8d242 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -1675,9 +1675,8 @@ impl ExtensionStore {
                 let schema_path = &extension::build_debug_adapter_schema_path(adapter_name, meta);
 
                 if fs.is_file(&src_dir.join(schema_path)).await {
-                    match schema_path.parent() {
-                        Some(parent) => fs.create_dir(&tmp_dir.join(parent)).await?,
-                        None => {}
+                    if let Some(parent) = schema_path.parent() {
+                        fs.create_dir(&tmp_dir.join(parent)).await?
                     }
                     fs.copy_file(
                         &src_dir.join(schema_path),
diff --git a/crates/extension_host/src/wasm_host.rs b/crates/extension_host/src/wasm_host.rs
index 4fe27aedc9..c5bc21fc1c 100644
--- a/crates/extension_host/src/wasm_host.rs
+++ b/crates/extension_host/src/wasm_host.rs
@@ -532,7 +532,7 @@ fn wasm_engine(executor: &BackgroundExecutor) -> wasmtime::Engine {
                     // `Future::poll`.
                     const EPOCH_INTERVAL: Duration = Duration::from_millis(100);
                     let mut timer = Timer::interval(EPOCH_INTERVAL);
-                    while let Some(_) = timer.next().await {
+                    while (timer.next().await).is_some() {
                         // Exit the loop and thread once the engine is dropped.
                         let Some(engine) = engine_ref.upgrade() else {
                             break;
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 7f0e8171f6..a6ee84eb60 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -863,7 +863,7 @@ impl ExtensionsPage {
         window: &mut Window,
         cx: &mut App,
     ) -> Entity<ContextMenu> {
-        let context_menu = ContextMenu::build(window, cx, |context_menu, window, _| {
+        ContextMenu::build(window, cx, |context_menu, window, _| {
             context_menu
                 .entry(
                     "Install Another Version...",
@@ -887,9 +887,7 @@ impl ExtensionsPage {
                         cx.write_to_clipboard(ClipboardItem::new_string(authors.join(", ")));
                     }
                 })
-        });
-
-        context_menu
+        })
     }
 
     fn show_extension_version_list(
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index 77acdf8097..ffe3d42a27 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -112,7 +112,7 @@ impl OpenPathDelegate {
                 entries,
                 ..
             } => user_input
-                .into_iter()
+                .iter()
                 .filter(|user_input| !user_input.exists || !user_input.is_dir)
                 .map(|user_input| user_input.file.string.clone())
                 .chain(self.string_matches.iter().filter_map(|string_match| {
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index d17cbdcf51..11177512c3 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -2419,12 +2419,11 @@ impl Fs for FakeFs {
                 let watcher = watcher.clone();
                 move |events| {
                     let result = events.iter().any(|evt_path| {
-                        let result = watcher
+                        watcher
                             .prefixes
                             .lock()
                             .iter()
-                            .any(|prefix| evt_path.path.starts_with(prefix));
-                        result
+                            .any(|prefix| evt_path.path.starts_with(prefix))
                     });
                     let executor = executor.clone();
                     async move {
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index edcad514bb..9c125d2c47 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -2028,7 +2028,7 @@ fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
 
         branches.push(Branch {
             is_head: is_current_branch,
-            ref_name: ref_name,
+            ref_name,
             most_recent_commit: Some(CommitSummary {
                 sha: head_sha,
                 subject,
diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index f7d29cdfa7..a320888b3b 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -123,7 +123,7 @@ impl FileDiffView {
             old_buffer,
             new_buffer,
             _recalculate_diff_task: cx.spawn(async move |this, cx| {
-                while let Ok(_) = buffer_changes_rx.recv().await {
+                while buffer_changes_rx.recv().await.is_ok() {
                     loop {
                         let mut timer = cx
                             .background_executor()
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index ace3a8eb15..3eae1acb04 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -426,7 +426,7 @@ impl GitPanel {
         let git_store = project.read(cx).git_store().clone();
         let active_repository = project.read(cx).active_repository(cx);
 
-        let git_panel = cx.new(|cx| {
+        cx.new(|cx| {
             let focus_handle = cx.focus_handle();
             cx.on_focus(&focus_handle, window, Self::focus_in).detach();
             cx.on_focus_out(&focus_handle, window, |this, _, window, cx| {
@@ -563,9 +563,7 @@ impl GitPanel {
 
             this.schedule_update(false, window, cx);
             this
-        });
-
-        git_panel
+        })
     }
 
     fn hide_scrollbars(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -1198,14 +1196,13 @@ impl GitPanel {
             window,
             cx,
         );
-        cx.spawn(async move |this, cx| match prompt.await {
-            Ok(RestoreCancel::RestoreTrackedFiles) => {
+        cx.spawn(async move |this, cx| {
+            if let Ok(RestoreCancel::RestoreTrackedFiles) = prompt.await {
                 this.update(cx, |this, cx| {
                     this.perform_checkout(entries, cx);
                 })
                 .ok();
             }
-            _ => {}
         })
         .detach();
     }
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index c12ef58ce2..cc1535b7c3 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -346,22 +346,19 @@ impl ProjectDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        match event {
-            EditorEvent::SelectionsChanged { local: true } => {
-                let Some(project_path) = self.active_path(cx) else {
-                    return;
-                };
-                self.workspace
-                    .update(cx, |workspace, cx| {
-                        if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
-                            git_panel.update(cx, |git_panel, cx| {
-                                git_panel.select_entry_by_path(project_path, window, cx)
-                            })
-                        }
-                    })
-                    .ok();
-            }
-            _ => {}
+        if let EditorEvent::SelectionsChanged { local: true } = event {
+            let Some(project_path) = self.active_path(cx) else {
+                return;
+            };
+            self.workspace
+                .update(cx, |workspace, cx| {
+                    if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
+                        git_panel.update(cx, |git_panel, cx| {
+                            git_panel.select_entry_by_path(project_path, window, cx)
+                        })
+                    }
+                })
+                .ok();
         }
         if editor.focus_handle(cx).contains_focused(window, cx)
             && self.multibuffer.read(cx).is_empty()
@@ -513,7 +510,7 @@ impl ProjectDiff {
         mut recv: postage::watch::Receiver<()>,
         cx: &mut AsyncWindowContext,
     ) -> Result<()> {
-        while let Some(_) = recv.next().await {
+        while (recv.next().await).is_some() {
             let buffers_to_load = this.update(cx, |this, cx| this.load_buffers(cx))?;
             for buffer_to_load in buffers_to_load {
                 if let Some(buffer) = buffer_to_load.await.log_err() {
diff --git a/crates/git_ui/src/text_diff_view.rs b/crates/git_ui/src/text_diff_view.rs
index d07868c3e1..e38e3698d5 100644
--- a/crates/git_ui/src/text_diff_view.rs
+++ b/crates/git_ui/src/text_diff_view.rs
@@ -207,7 +207,7 @@ impl TextDiffView {
             path: Some(format!("Clipboard ↔ {selection_location_path}").into()),
             buffer_changes_tx,
             _recalculate_diff_task: cx.spawn(async move |_, cx| {
-                while let Ok(_) = buffer_changes_rx.recv().await {
+                while buffer_changes_rx.recv().await.is_ok() {
                     loop {
                         let mut timer = cx
                             .background_executor()
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 2be1a34e49..bbd59fa7bc 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1707,8 +1707,8 @@ impl App {
             .unwrap_or_else(|| {
                 is_first = true;
                 let future = A::load(source.clone(), self);
-                let task = self.background_executor().spawn(future).shared();
-                task
+
+                self.background_executor().spawn(future).shared()
             });
 
         self.loading_assets.insert(asset_id, Box::new(task.clone()));
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index c58f72267c..b5e0712796 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -326,7 +326,7 @@ impl TextLayout {
             vec![text_style.to_run(text.len())]
         };
 
-        let layout_id = window.request_measured_layout(Default::default(), {
+        window.request_measured_layout(Default::default(), {
             let element_state = self.clone();
 
             move |known_dimensions, available_space, window, cx| {
@@ -416,9 +416,7 @@ impl TextLayout {
 
                 size
             }
-        });
-
-        layout_id
+        })
     }
 
     fn prepaint(&self, bounds: Bounds<Pixels>, text: &str) {
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 3278dfbe38..4d31428094 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -949,11 +949,8 @@ impl Dispatch<WlCallback, ObjectId> for WaylandClientStatePtr {
         };
         drop(state);
 
-        match event {
-            wl_callback::Event::Done { .. } => {
-                window.frame();
-            }
-            _ => {}
+        if let wl_callback::Event::Done { .. } = event {
+            window.frame();
         }
     }
 }
@@ -2014,25 +2011,22 @@ impl Dispatch<wl_data_offer::WlDataOffer, ()> for WaylandClientStatePtr {
         let client = this.get_client();
         let mut state = client.borrow_mut();
 
-        match event {
-            wl_data_offer::Event::Offer { mime_type } => {
-                // Drag and drop
-                if mime_type == FILE_LIST_MIME_TYPE {
-                    let serial = state.serial_tracker.get(SerialKind::DataDevice);
-                    let mime_type = mime_type.clone();
-                    data_offer.accept(serial, Some(mime_type));
-                }
-
-                // Clipboard
-                if let Some(offer) = state
-                    .data_offers
-                    .iter_mut()
-                    .find(|wrapper| wrapper.inner.id() == data_offer.id())
-                {
-                    offer.add_mime_type(mime_type);
-                }
+        if let wl_data_offer::Event::Offer { mime_type } = event {
+            // Drag and drop
+            if mime_type == FILE_LIST_MIME_TYPE {
+                let serial = state.serial_tracker.get(SerialKind::DataDevice);
+                let mime_type = mime_type.clone();
+                data_offer.accept(serial, Some(mime_type));
+            }
+
+            // Clipboard
+            if let Some(offer) = state
+                .data_offers
+                .iter_mut()
+                .find(|wrapper| wrapper.inner.id() == data_offer.id())
+            {
+                offer.add_mime_type(mime_type);
             }
-            _ => {}
         }
     }
 }
@@ -2113,13 +2107,10 @@ impl Dispatch<zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1, ()>
         let client = this.get_client();
         let mut state = client.borrow_mut();
 
-        match event {
-            zwp_primary_selection_offer_v1::Event::Offer { mime_type } => {
-                if let Some(offer) = state.primary_data_offer.as_mut() {
-                    offer.add_mime_type(mime_type);
-                }
-            }
-            _ => {}
+        if let zwp_primary_selection_offer_v1::Event::Offer { mime_type } = event
+            && let Some(offer) = state.primary_data_offer.as_mut()
+        {
+            offer.add_mime_type(mime_type);
         }
     }
 }
diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs
index 1d1166a56c..ce1468335d 100644
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -355,85 +355,82 @@ impl WaylandWindowStatePtr {
     }
 
     pub fn handle_xdg_surface_event(&self, event: xdg_surface::Event) {
-        match event {
-            xdg_surface::Event::Configure { serial } => {
-                {
-                    let mut state = self.state.borrow_mut();
-                    if let Some(window_controls) = state.in_progress_window_controls.take() {
-                        state.window_controls = window_controls;
-
-                        drop(state);
-                        let mut callbacks = self.callbacks.borrow_mut();
-                        if let Some(appearance_changed) = callbacks.appearance_changed.as_mut() {
-                            appearance_changed();
-                        }
-                    }
-                }
-                {
-                    let mut state = self.state.borrow_mut();
-
-                    if let Some(mut configure) = state.in_progress_configure.take() {
-                        let got_unmaximized = state.maximized && !configure.maximized;
-                        state.fullscreen = configure.fullscreen;
-                        state.maximized = configure.maximized;
-                        state.tiling = configure.tiling;
-                        // Limit interactive resizes to once per vblank
-                        if configure.resizing && state.resize_throttle {
-                            return;
-                        } else if configure.resizing {
-                            state.resize_throttle = true;
-                        }
-                        if !configure.fullscreen && !configure.maximized {
-                            configure.size = if got_unmaximized {
-                                Some(state.window_bounds.size)
-                            } else {
-                                compute_outer_size(state.inset(), configure.size, state.tiling)
-                            };
-                            if let Some(size) = configure.size {
-                                state.window_bounds = Bounds {
-                                    origin: Point::default(),
-                                    size,
-                                };
-                            }
-                        }
-                        drop(state);
-                        if let Some(size) = configure.size {
-                            self.resize(size);
-                        }
-                    }
-                }
+        if let xdg_surface::Event::Configure { serial } = event {
+            {
                 let mut state = self.state.borrow_mut();
-                state.xdg_surface.ack_configure(serial);
+                if let Some(window_controls) = state.in_progress_window_controls.take() {
+                    state.window_controls = window_controls;
 
-                let window_geometry = inset_by_tiling(
-                    state.bounds.map_origin(|_| px(0.0)),
-                    state.inset(),
-                    state.tiling,
-                )
-                .map(|v| v.0 as i32)
-                .map_size(|v| if v <= 0 { 1 } else { v });
-
-                state.xdg_surface.set_window_geometry(
-                    window_geometry.origin.x,
-                    window_geometry.origin.y,
-                    window_geometry.size.width,
-                    window_geometry.size.height,
-                );
-
-                let request_frame_callback = !state.acknowledged_first_configure;
-                if request_frame_callback {
-                    state.acknowledged_first_configure = true;
                     drop(state);
-                    self.frame();
+                    let mut callbacks = self.callbacks.borrow_mut();
+                    if let Some(appearance_changed) = callbacks.appearance_changed.as_mut() {
+                        appearance_changed();
+                    }
                 }
             }
-            _ => {}
+            {
+                let mut state = self.state.borrow_mut();
+
+                if let Some(mut configure) = state.in_progress_configure.take() {
+                    let got_unmaximized = state.maximized && !configure.maximized;
+                    state.fullscreen = configure.fullscreen;
+                    state.maximized = configure.maximized;
+                    state.tiling = configure.tiling;
+                    // Limit interactive resizes to once per vblank
+                    if configure.resizing && state.resize_throttle {
+                        return;
+                    } else if configure.resizing {
+                        state.resize_throttle = true;
+                    }
+                    if !configure.fullscreen && !configure.maximized {
+                        configure.size = if got_unmaximized {
+                            Some(state.window_bounds.size)
+                        } else {
+                            compute_outer_size(state.inset(), configure.size, state.tiling)
+                        };
+                        if let Some(size) = configure.size {
+                            state.window_bounds = Bounds {
+                                origin: Point::default(),
+                                size,
+                            };
+                        }
+                    }
+                    drop(state);
+                    if let Some(size) = configure.size {
+                        self.resize(size);
+                    }
+                }
+            }
+            let mut state = self.state.borrow_mut();
+            state.xdg_surface.ack_configure(serial);
+
+            let window_geometry = inset_by_tiling(
+                state.bounds.map_origin(|_| px(0.0)),
+                state.inset(),
+                state.tiling,
+            )
+            .map(|v| v.0 as i32)
+            .map_size(|v| if v <= 0 { 1 } else { v });
+
+            state.xdg_surface.set_window_geometry(
+                window_geometry.origin.x,
+                window_geometry.origin.y,
+                window_geometry.size.width,
+                window_geometry.size.height,
+            );
+
+            let request_frame_callback = !state.acknowledged_first_configure;
+            if request_frame_callback {
+                state.acknowledged_first_configure = true;
+                drop(state);
+                self.frame();
+            }
         }
     }
 
     pub fn handle_toplevel_decoration_event(&self, event: zxdg_toplevel_decoration_v1::Event) {
-        match event {
-            zxdg_toplevel_decoration_v1::Event::Configure { mode } => match mode {
+        if let zxdg_toplevel_decoration_v1::Event::Configure { mode } = event {
+            match mode {
                 WEnum::Value(zxdg_toplevel_decoration_v1::Mode::ServerSide) => {
                     self.state.borrow_mut().decorations = WindowDecorations::Server;
                     if let Some(mut appearance_changed) =
@@ -457,17 +454,13 @@ impl WaylandWindowStatePtr {
                 WEnum::Unknown(v) => {
                     log::warn!("Unknown decoration mode: {}", v);
                 }
-            },
-            _ => {}
+            }
         }
     }
 
     pub fn handle_fractional_scale_event(&self, event: wp_fractional_scale_v1::Event) {
-        match event {
-            wp_fractional_scale_v1::Event::PreferredScale { scale } => {
-                self.rescale(scale as f32 / 120.0);
-            }
-            _ => {}
+        if let wp_fractional_scale_v1::Event::PreferredScale { scale } = event {
+            self.rescale(scale as f32 / 120.0);
         }
     }
 
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index e422af961f..346ba8718b 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -232,15 +232,12 @@ impl X11ClientStatePtr {
         };
         let mut state = client.0.borrow_mut();
 
-        if let Some(window_ref) = state.windows.remove(&x_window) {
-            match window_ref.refresh_state {
-                Some(RefreshState::PeriodicRefresh {
-                    event_loop_token, ..
-                }) => {
-                    state.loop_handle.remove(event_loop_token);
-                }
-                _ => {}
-            }
+        if let Some(window_ref) = state.windows.remove(&x_window)
+            && let Some(RefreshState::PeriodicRefresh {
+                event_loop_token, ..
+            }) = window_ref.refresh_state
+        {
+            state.loop_handle.remove(event_loop_token);
         }
         if state.mouse_focused_window == Some(x_window) {
             state.mouse_focused_window = None;
@@ -876,22 +873,19 @@ impl X11Client {
                 let Some(reply) = reply else {
                     return Some(());
                 };
-                match str::from_utf8(&reply.value) {
-                    Ok(file_list) => {
-                        let paths: SmallVec<[_; 2]> = file_list
-                            .lines()
-                            .filter_map(|path| Url::parse(path).log_err())
-                            .filter_map(|url| url.to_file_path().log_err())
-                            .collect();
-                        let input = PlatformInput::FileDrop(FileDropEvent::Entered {
-                            position: state.xdnd_state.position,
-                            paths: crate::ExternalPaths(paths),
-                        });
-                        drop(state);
-                        window.handle_input(input);
-                        self.0.borrow_mut().xdnd_state.retrieved = true;
-                    }
-                    Err(_) => {}
+                if let Ok(file_list) = str::from_utf8(&reply.value) {
+                    let paths: SmallVec<[_; 2]> = file_list
+                        .lines()
+                        .filter_map(|path| Url::parse(path).log_err())
+                        .filter_map(|url| url.to_file_path().log_err())
+                        .collect();
+                    let input = PlatformInput::FileDrop(FileDropEvent::Entered {
+                        position: state.xdnd_state.position,
+                        paths: crate::ExternalPaths(paths),
+                    });
+                    drop(state);
+                    window.handle_input(input);
+                    self.0.borrow_mut().xdnd_state.retrieved = true;
                 }
             }
             Event::ConfigureNotify(event) => {
diff --git a/crates/gpui/src/platform/mac/events.rs b/crates/gpui/src/platform/mac/events.rs
index 50a516cb38..938db4b762 100644
--- a/crates/gpui/src/platform/mac/events.rs
+++ b/crates/gpui/src/platform/mac/events.rs
@@ -426,7 +426,7 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
                     key_char = Some(chars_for_modified_key(native_event.keyCode(), mods));
                 }
 
-                let mut key = if shift
+                if shift
                     && chars_ignoring_modifiers
                         .chars()
                         .all(|c| c.is_ascii_lowercase())
@@ -437,9 +437,7 @@ unsafe fn parse_keystroke(native_event: id) -> Keystroke {
                     chars_with_shift
                 } else {
                     chars_ignoring_modifiers
-                };
-
-                key
+                }
             }
         };
 
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index bc60e13a59..cd923a1859 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -2063,8 +2063,8 @@ fn screen_point_to_gpui_point(this: &Object, position: NSPoint) -> Point<Pixels>
     let frame = get_frame(this);
     let window_x = position.x - frame.origin.x;
     let window_y = frame.size.height - (position.y - frame.origin.y);
-    let position = point(px(window_x as f32), px(window_y as f32));
-    position
+
+    point(px(window_x as f32), px(window_y as f32))
 }
 
 extern "C" fn dragging_entered(this: &Object, _: Sel, dragging_info: id) -> NSDragOperation {
diff --git a/crates/gpui/src/platform/scap_screen_capture.rs b/crates/gpui/src/platform/scap_screen_capture.rs
index 32041b655f..d6d19cd810 100644
--- a/crates/gpui/src/platform/scap_screen_capture.rs
+++ b/crates/gpui/src/platform/scap_screen_capture.rs
@@ -228,7 +228,7 @@ fn run_capture(
         display,
         size,
     }));
-    if let Err(_) = stream_send_result {
+    if stream_send_result.is_err() {
         return;
     }
     while !cancel_stream.load(std::sync::atomic::Ordering::SeqCst) {
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index c3bb8bb22b..607163b577 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -1128,22 +1128,19 @@ impl WindowsWindowInner {
             && let Some(parameter_string) = unsafe { parameter.to_string() }.log_err()
         {
             log::info!("System settings changed: {}", parameter_string);
-            match parameter_string.as_str() {
-                "ImmersiveColorSet" => {
-                    let new_appearance = system_appearance()
-                        .context("unable to get system appearance when handling ImmersiveColorSet")
-                        .log_err()?;
-                    let mut lock = self.state.borrow_mut();
-                    if new_appearance != lock.appearance {
-                        lock.appearance = new_appearance;
-                        let mut callback = lock.callbacks.appearance_changed.take()?;
-                        drop(lock);
-                        callback();
-                        self.state.borrow_mut().callbacks.appearance_changed = Some(callback);
-                        configure_dwm_dark_mode(handle, new_appearance);
-                    }
+            if parameter_string.as_str() == "ImmersiveColorSet" {
+                let new_appearance = system_appearance()
+                    .context("unable to get system appearance when handling ImmersiveColorSet")
+                    .log_err()?;
+                let mut lock = self.state.borrow_mut();
+                if new_appearance != lock.appearance {
+                    lock.appearance = new_appearance;
+                    let mut callback = lock.callbacks.appearance_changed.take()?;
+                    drop(lock);
+                    callback();
+                    self.state.borrow_mut().callbacks.appearance_changed = Some(callback);
+                    configure_dwm_dark_mode(handle, new_appearance);
                 }
-                _ => {}
             }
         }
         Some(0)
@@ -1469,7 +1466,7 @@ pub(crate) fn current_modifiers() -> Modifiers {
 #[inline]
 pub(crate) fn current_capslock() -> Capslock {
     let on = unsafe { GetKeyState(VK_CAPITAL.0 as i32) & 1 } > 0;
-    Capslock { on: on }
+    Capslock { on }
 }
 
 fn get_client_area_insets(
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index f78d6b30c7..f198bb7718 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -58,23 +58,21 @@ impl TaffyLayoutEngine {
         children: &[LayoutId],
     ) -> LayoutId {
         let taffy_style = style.to_taffy(rem_size);
-        let layout_id = if children.is_empty() {
+
+        if children.is_empty() {
             self.taffy
                 .new_leaf(taffy_style)
                 .expect(EXPECT_MESSAGE)
                 .into()
         } else {
-            let parent_id = self
-                .taffy
+            self.taffy
                 // This is safe because LayoutId is repr(transparent) to taffy::tree::NodeId.
                 .new_with_children(taffy_style, unsafe {
                     std::mem::transmute::<&[LayoutId], &[taffy::NodeId]>(children)
                 })
                 .expect(EXPECT_MESSAGE)
-                .into();
-            parent_id
-        };
-        layout_id
+                .into()
+        }
     }
 
     pub fn request_measured_layout(
@@ -91,8 +89,7 @@ impl TaffyLayoutEngine {
     ) -> LayoutId {
         let taffy_style = style.to_taffy(rem_size);
 
-        let layout_id = self
-            .taffy
+        self.taffy
             .new_leaf_with_context(
                 taffy_style,
                 NodeContext {
@@ -100,8 +97,7 @@ impl TaffyLayoutEngine {
                 },
             )
             .expect(EXPECT_MESSAGE)
-            .into();
-        layout_id
+            .into()
     }
 
     // Used to understand performance
diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index 648d714c89..93ec6c854c 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -44,7 +44,7 @@ impl LineWrapper {
         let mut prev_c = '\0';
         let mut index = 0;
         let mut candidates = fragments
-            .into_iter()
+            .iter()
             .flat_map(move |fragment| fragment.wrap_boundary_candidates())
             .peekable();
         iter::from_fn(move || {
diff --git a/crates/gpui/src/util.rs b/crates/gpui/src/util.rs
index f357034fbf..3d7fa06e6c 100644
--- a/crates/gpui/src/util.rs
+++ b/crates/gpui/src/util.rs
@@ -58,13 +58,7 @@ pub trait FluentBuilder {
     where
         Self: Sized,
     {
-        self.map(|this| {
-            if let Some(_) = option {
-                this
-            } else {
-                then(this)
-            }
-        })
+        self.map(|this| if option.is_some() { this } else { then(this) })
     }
 }
 
diff --git a/crates/gpui_macros/src/test.rs b/crates/gpui_macros/src/test.rs
index 0153c5889a..648d3499ed 100644
--- a/crates/gpui_macros/src/test.rs
+++ b/crates/gpui_macros/src/test.rs
@@ -86,7 +86,7 @@ impl Parse for Args {
         Ok(Args {
             seeds,
             max_retries,
-            max_iterations: max_iterations,
+            max_iterations,
             on_failure_fn_name,
         })
     }
diff --git a/crates/http_client/src/http_client.rs b/crates/http_client/src/http_client.rs
index a7f75b0962..62468573ed 100644
--- a/crates/http_client/src/http_client.rs
+++ b/crates/http_client/src/http_client.rs
@@ -435,8 +435,7 @@ impl HttpClient for FakeHttpClient {
         &self,
         req: Request<AsyncBody>,
     ) -> BoxFuture<'static, anyhow::Result<Response<AsyncBody>>> {
-        let future = (self.handler.lock().as_ref().unwrap())(req);
-        future
+        ((self.handler.lock().as_ref().unwrap())(req)) as _
     }
 
     fn user_agent(&self) -> Option<&HeaderValue> {
diff --git a/crates/jj/src/jj_repository.rs b/crates/jj/src/jj_repository.rs
index 93ae79eb90..afbe54c99d 100644
--- a/crates/jj/src/jj_repository.rs
+++ b/crates/jj/src/jj_repository.rs
@@ -50,16 +50,13 @@ impl RealJujutsuRepository {
 
 impl JujutsuRepository for RealJujutsuRepository {
     fn list_bookmarks(&self) -> Vec<Bookmark> {
-        let bookmarks = self
-            .repository
+        self.repository
             .view()
             .bookmarks()
             .map(|(ref_name, _target)| Bookmark {
                 ref_name: ref_name.as_str().to_string().into(),
             })
-            .collect();
-
-        bookmarks
+            .collect()
     }
 }
 
diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs
index 53887eb736..81dc36093b 100644
--- a/crates/journal/src/journal.rs
+++ b/crates/journal/src/journal.rs
@@ -195,11 +195,9 @@ pub fn new_journal_entry(workspace: &Workspace, window: &mut Window, cx: &mut Ap
 }
 
 fn journal_dir(path: &str) -> Option<PathBuf> {
-    let expanded_journal_dir = shellexpand::full(path) //TODO handle this better
+    shellexpand::full(path) //TODO handle this better
         .ok()
-        .map(|dir| Path::new(&dir.to_string()).to_path_buf().join("journal"));
-
-    expanded_journal_dir
+        .map(|dir| Path::new(&dir.to_string()).to_path_buf().join("journal"))
 }
 
 fn heading_entry(now: NaiveTime, hour_format: &Option<HourFormat>) -> String {
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 972a90ddab..cc96022e63 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1128,7 +1128,7 @@ impl Buffer {
         } else {
             ranges.as_slice()
         }
-        .into_iter()
+        .iter()
         .peekable();
 
         let mut edits = Vec::new();
@@ -1395,7 +1395,8 @@ impl Buffer {
                     is_first = false;
                     return true;
                 }
-                let any_sub_ranges_contain_range = layer
+
+                layer
                     .included_sub_ranges
                     .map(|sub_ranges| {
                         sub_ranges.iter().any(|sub_range| {
@@ -1404,9 +1405,7 @@ impl Buffer {
                             !is_before_start && !is_after_end
                         })
                     })
-                    .unwrap_or(true);
-                let result = any_sub_ranges_contain_range;
-                result
+                    .unwrap_or(true)
             })
             .last()
             .map(|info| info.language.clone())
@@ -2616,7 +2615,7 @@ impl Buffer {
                     self.completion_triggers = self
                         .completion_triggers_per_language_server
                         .values()
-                        .flat_map(|triggers| triggers.into_iter().cloned())
+                        .flat_map(|triggers| triggers.iter().cloned())
                         .collect();
                 } else {
                     self.completion_triggers_per_language_server
@@ -2776,7 +2775,7 @@ impl Buffer {
             self.completion_triggers = self
                 .completion_triggers_per_language_server
                 .values()
-                .flat_map(|triggers| triggers.into_iter().cloned())
+                .flat_map(|triggers| triggers.iter().cloned())
                 .collect();
         } else {
             self.completion_triggers_per_language_server
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 68addc804e..b70e466246 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1513,9 +1513,8 @@ impl Language {
             .map(|ix| {
                 let mut config = BracketsPatternConfig::default();
                 for setting in query.property_settings(ix) {
-                    match setting.key.as_ref() {
-                        "newline.only" => config.newline_only = true,
-                        _ => {}
+                    if setting.key.as_ref() == "newline.only" {
+                        config.newline_only = true
                     }
                 }
                 config
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index 70e42cb02d..b10529c3d9 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -300,7 +300,7 @@ impl From<AnthropicError> for LanguageModelCompletionError {
             },
             AnthropicError::ServerOverloaded { retry_after } => Self::ServerOverloaded {
                 provider,
-                retry_after: retry_after,
+                retry_after,
             },
             AnthropicError::ApiError(api_error) => api_error.into(),
         }
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index 1a5c09cdc4..4348fd4211 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -404,7 +404,7 @@ pub fn into_open_ai(
             match content {
                 MessageContent::Text(text) | MessageContent::Thinking { text, .. } => {
                     add_message_content_part(
-                        open_ai::MessagePart::Text { text: text },
+                        open_ai::MessagePart::Text { text },
                         message.role,
                         &mut messages,
                     )
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 2c490b45cf..ac653d5b2e 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -234,7 +234,7 @@ impl JsonLspAdapter {
         schemas
             .as_array_mut()
             .unwrap()
-            .extend(cx.all_action_names().into_iter().map(|&name| {
+            .extend(cx.all_action_names().iter().map(|&name| {
                 project::lsp_store::json_language_server_ext::url_schema_for_action(name)
             }));
 
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 906e45bb3a..6c92d78525 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -711,7 +711,7 @@ impl Default for PythonToolchainProvider {
     }
 }
 
-static ENV_PRIORITY_LIST: &'static [PythonEnvironmentKind] = &[
+static ENV_PRIORITY_LIST: &[PythonEnvironmentKind] = &[
     // Prioritize non-Conda environments.
     PythonEnvironmentKind::Poetry,
     PythonEnvironmentKind::Pipenv,
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 7f65ccf5ea..162e3bea78 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -5205,13 +5205,9 @@ impl MultiBufferSnapshot {
         if offset == diff_transforms.start().0
             && bias == Bias::Left
             && let Some(prev_item) = diff_transforms.prev_item()
+            && let DiffTransform::DeletedHunk { .. } = prev_item
         {
-            match prev_item {
-                DiffTransform::DeletedHunk { .. } => {
-                    diff_transforms.prev();
-                }
-                _ => {}
-            }
+            diff_transforms.prev();
         }
         let offset_in_transform = offset - diff_transforms.start().0;
         let mut excerpt_offset = diff_transforms.start().1;
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index 871c72ea0b..9d41eb1562 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -76,9 +76,8 @@ impl NodeRuntime {
         let mut state = self.0.lock().await;
 
         let options = loop {
-            match state.options.borrow().as_ref() {
-                Some(options) => break options.clone(),
-                None => {}
+            if let Some(options) = state.options.borrow().as_ref() {
+                break options.clone();
             }
             match state.options.changed().await {
                 Ok(()) => {}
diff --git a/crates/onboarding/src/ai_setup_page.rs b/crates/onboarding/src/ai_setup_page.rs
index d700fa08bd..672bcf1cd9 100644
--- a/crates/onboarding/src/ai_setup_page.rs
+++ b/crates/onboarding/src/ai_setup_page.rs
@@ -19,7 +19,7 @@ use util::ResultExt;
 use workspace::{ModalView, Workspace};
 use zed_actions::agent::OpenSettings;
 
-const FEATURED_PROVIDERS: [&'static str; 4] = ["anthropic", "google", "openai", "ollama"];
+const FEATURED_PROVIDERS: [&str; 4] = ["anthropic", "google", "openai", "ollama"];
 
 fn render_llm_provider_section(
     tab_index: &mut isize,
@@ -410,7 +410,7 @@ impl AiPrivacyTooltip {
 
 impl Render for AiPrivacyTooltip {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        const DESCRIPTION: &'static str = "We believe in opt-in data sharing as the default for building AI products, rather than opt-out. We'll only use or store your data if you affirmatively send it to us. ";
+        const DESCRIPTION: &str = "We believe in opt-in data sharing as the default for building AI products, rather than opt-out. We'll only use or store your data if you affirmatively send it to us. ";
 
         tooltip_container(window, cx, move |this, _, _| {
             this.child(
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 8d89c6662e..77a70dfc8d 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -16,8 +16,8 @@ use vim_mode_setting::VimModeSetting;
 
 use crate::theme_preview::{ThemePreviewStyle, ThemePreviewTile};
 
-const LIGHT_THEMES: [&'static str; 3] = ["One Light", "Ayu Light", "Gruvbox Light"];
-const DARK_THEMES: [&'static str; 3] = ["One Dark", "Ayu Dark", "Gruvbox Dark"];
+const LIGHT_THEMES: [&str; 3] = ["One Light", "Ayu Light", "Gruvbox Light"];
+const DARK_THEMES: [&str; 3] = ["One Dark", "Ayu Dark", "Gruvbox Dark"];
 const FAMILY_NAMES: [SharedString; 3] = [
     SharedString::new_static("One"),
     SharedString::new_static("Ayu"),
@@ -114,7 +114,7 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
 
         let themes = theme_names.map(|theme| theme_registry.get(theme).unwrap());
 
-        let theme_previews = [0, 1, 2].map(|index| {
+        [0, 1, 2].map(|index| {
             let theme = &themes[index];
             let is_selected = theme.name == current_theme_name;
             let name = theme.name.clone();
@@ -176,9 +176,7 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
                         .color(Color::Muted)
                         .size(LabelSize::Small),
                 )
-        });
-
-        theme_previews
+        })
     }
 
     fn write_mode_change(mode: ThemeMode, cx: &mut App) {
diff --git a/crates/onboarding/src/editing_page.rs b/crates/onboarding/src/editing_page.rs
index d941a0315a..60a9856abe 100644
--- a/crates/onboarding/src/editing_page.rs
+++ b/crates/onboarding/src/editing_page.rs
@@ -605,7 +605,7 @@ fn render_popular_settings_section(
     window: &mut Window,
     cx: &mut App,
 ) -> impl IntoElement {
-    const LIGATURE_TOOLTIP: &'static str =
+    const LIGATURE_TOOLTIP: &str =
         "Font ligatures combine two characters into one. For example, turning =/= into ≠.";
 
     v_flex()
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 78f512f7f3..891ae1595d 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -733,7 +733,8 @@ impl OutlinePanel {
     ) -> Entity<Self> {
         let project = workspace.project().clone();
         let workspace_handle = cx.entity().downgrade();
-        let outline_panel = cx.new(|cx| {
+
+        cx.new(|cx| {
             let filter_editor = cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
                 editor.set_placeholder_text("Filter...", cx);
@@ -912,9 +913,7 @@ impl OutlinePanel {
                 outline_panel.replace_active_editor(item, editor, window, cx);
             }
             outline_panel
-        });
-
-        outline_panel
+        })
     }
 
     fn serialization_key(workspace: &Workspace) -> Option<String> {
@@ -2624,7 +2623,7 @@ impl OutlinePanel {
     }
 
     fn entry_name(&self, worktree_id: &WorktreeId, entry: &Entry, cx: &App) -> String {
-        let name = match self.project.read(cx).worktree_for_id(*worktree_id, cx) {
+        match self.project.read(cx).worktree_for_id(*worktree_id, cx) {
             Some(worktree) => {
                 let worktree = worktree.read(cx);
                 match worktree.snapshot().root_entry() {
@@ -2645,8 +2644,7 @@ impl OutlinePanel {
                 }
             }
             None => file_name(entry.path.as_ref()),
-        };
-        name
+        }
     }
 
     fn update_fs_entries(
@@ -2681,7 +2679,8 @@ impl OutlinePanel {
                 new_collapsed_entries = outline_panel.collapsed_entries.clone();
                 new_unfolded_dirs = outline_panel.unfolded_dirs.clone();
                 let multi_buffer_snapshot = active_multi_buffer.read(cx).snapshot(cx);
-                let buffer_excerpts = multi_buffer_snapshot.excerpts().fold(
+
+                multi_buffer_snapshot.excerpts().fold(
                     HashMap::default(),
                     |mut buffer_excerpts, (excerpt_id, buffer_snapshot, excerpt_range)| {
                         let buffer_id = buffer_snapshot.remote_id();
@@ -2728,8 +2727,7 @@ impl OutlinePanel {
                         );
                         buffer_excerpts
                     },
-                );
-                buffer_excerpts
+                )
             }) else {
                 return;
             };
@@ -4807,7 +4805,7 @@ impl OutlinePanel {
                             .with_compute_indents_fn(cx.entity(), |outline_panel, range, _, _| {
                                 let entries = outline_panel.cached_entries.get(range);
                                 if let Some(entries) = entries {
-                                    entries.into_iter().map(|item| item.depth).collect()
+                                    entries.iter().map(|item| item.depth).collect()
                                 } else {
                                     smallvec::SmallVec::new()
                                 }
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index 296749c14e..d365089377 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -413,13 +413,10 @@ impl LocalBufferStore {
         cx: &mut Context<BufferStore>,
     ) {
         cx.subscribe(worktree, |this, worktree, event, cx| {
-            if worktree.read(cx).is_local() {
-                match event {
-                    worktree::Event::UpdatedEntries(changes) => {
-                        Self::local_worktree_entries_changed(this, &worktree, changes, cx);
-                    }
-                    _ => {}
-                }
+            if worktree.read(cx).is_local()
+                && let worktree::Event::UpdatedEntries(changes) = event
+            {
+                Self::local_worktree_entries_changed(this, &worktree, changes, cx);
             }
         })
         .detach();
@@ -947,10 +944,9 @@ impl BufferStore {
     }
 
     pub fn get_by_path(&self, path: &ProjectPath) -> Option<Entity<Buffer>> {
-        self.path_to_buffer_id.get(path).and_then(|buffer_id| {
-            let buffer = self.get(*buffer_id);
-            buffer
-        })
+        self.path_to_buffer_id
+            .get(path)
+            .and_then(|buffer_id| self.get(*buffer_id))
     }
 
     pub fn get(&self, buffer_id: BufferId) -> Option<Entity<Buffer>> {
diff --git a/crates/project/src/color_extractor.rs b/crates/project/src/color_extractor.rs
index dbbd3d7b99..6e9907e30b 100644
--- a/crates/project/src/color_extractor.rs
+++ b/crates/project/src/color_extractor.rs
@@ -4,8 +4,8 @@ use gpui::{Hsla, Rgba};
 use lsp::{CompletionItem, Documentation};
 use regex::{Regex, RegexBuilder};
 
-const HEX: &'static str = r#"(#(?:[\da-fA-F]{3}){1,2})"#;
-const RGB_OR_HSL: &'static str = r#"(rgba?|hsla?)\(\s*(\d{1,3}%?)\s*,\s*(\d{1,3}%?)\s*,\s*(\d{1,3}%?)\s*(?:,\s*(1|0?\.\d+))?\s*\)"#;
+const HEX: &str = r#"(#(?:[\da-fA-F]{3}){1,2})"#;
+const RGB_OR_HSL: &str = r#"(rgba?|hsla?)\(\s*(\d{1,3}%?)\s*,\s*(\d{1,3}%?)\s*,\s*(\d{1,3}%?)\s*(?:,\s*(1|0?\.\d+))?\s*\)"#;
 
 static RELAXED_HEX_REGEX: LazyLock<Regex> = LazyLock::new(|| {
     RegexBuilder::new(HEX)
@@ -141,7 +141,7 @@ mod tests {
     use gpui::rgba;
     use lsp::{CompletionItem, CompletionItemKind};
 
-    pub const COLOR_TABLE: &[(&'static str, Option<u32>)] = &[
+    pub const COLOR_TABLE: &[(&str, Option<u32>)] = &[
         // -- Invalid --
         // Invalid hex
         ("f0f", None),
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index f80f24bb71..16625caeb4 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -642,8 +642,8 @@ mod tests {
 
     #[gpui::test]
     async fn test_context_server_status(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &'static str = "mcp-1";
-        const SERVER_2_ID: &'static str = "mcp-2";
+        const SERVER_1_ID: &str = "mcp-1";
+        const SERVER_2_ID: &str = "mcp-2";
 
         let (_fs, project) = setup_context_server_test(
             cx,
@@ -722,8 +722,8 @@ mod tests {
 
     #[gpui::test]
     async fn test_context_server_status_events(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &'static str = "mcp-1";
-        const SERVER_2_ID: &'static str = "mcp-2";
+        const SERVER_1_ID: &str = "mcp-1";
+        const SERVER_2_ID: &str = "mcp-2";
 
         let (_fs, project) = setup_context_server_test(
             cx,
@@ -784,7 +784,7 @@ mod tests {
 
     #[gpui::test(iterations = 25)]
     async fn test_context_server_concurrent_starts(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &'static str = "mcp-1";
+        const SERVER_1_ID: &str = "mcp-1";
 
         let (_fs, project) = setup_context_server_test(
             cx,
@@ -845,8 +845,8 @@ mod tests {
 
     #[gpui::test]
     async fn test_context_server_maintain_servers_loop(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &'static str = "mcp-1";
-        const SERVER_2_ID: &'static str = "mcp-2";
+        const SERVER_1_ID: &str = "mcp-1";
+        const SERVER_2_ID: &str = "mcp-2";
 
         let server_1_id = ContextServerId(SERVER_1_ID.into());
         let server_2_id = ContextServerId(SERVER_2_ID.into());
@@ -1084,7 +1084,7 @@ mod tests {
 
     #[gpui::test]
     async fn test_context_server_enabled_disabled(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &'static str = "mcp-1";
+        const SERVER_1_ID: &str = "mcp-1";
 
         let server_1_id = ContextServerId(SERVER_1_ID.into());
 
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index ccda64fba8..382e83587a 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -470,9 +470,8 @@ impl DapStore {
         session_id: impl Borrow<SessionId>,
     ) -> Option<Entity<session::Session>> {
         let session_id = session_id.borrow();
-        let client = self.sessions.get(session_id).cloned();
 
-        client
+        self.sessions.get(session_id).cloned()
     }
     pub fn sessions(&self) -> impl Iterator<Item = &Entity<Session>> {
         self.sessions.values()
diff --git a/crates/project/src/debugger/locators/go.rs b/crates/project/src/debugger/locators/go.rs
index 61436fce8f..eec06084ec 100644
--- a/crates/project/src/debugger/locators/go.rs
+++ b/crates/project/src/debugger/locators/go.rs
@@ -174,7 +174,7 @@ impl DapLocator for GoLocator {
                     request: "launch".to_string(),
                     mode: "test".to_string(),
                     program,
-                    args: args,
+                    args,
                     build_flags,
                     cwd: build_config.cwd.clone(),
                     env: build_config.env.clone(),
@@ -185,7 +185,7 @@ impl DapLocator for GoLocator {
                     label: resolved_label.to_string().into(),
                     adapter: adapter.0.clone(),
                     build: None,
-                    config: config,
+                    config,
                     tcp_connection: None,
                 })
             }
@@ -220,7 +220,7 @@ impl DapLocator for GoLocator {
                     request: "launch".to_string(),
                     mode: "debug".to_string(),
                     program,
-                    args: args,
+                    args,
                     build_flags,
                 })
                 .unwrap();
diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs
index ee5baf1d3b..cd792877b6 100644
--- a/crates/project/src/debugger/session.rs
+++ b/crates/project/src/debugger/session.rs
@@ -226,7 +226,7 @@ impl RunningMode {
 
     fn unset_breakpoints_from_paths(&self, paths: &Vec<Arc<Path>>, cx: &mut App) -> Task<()> {
         let tasks: Vec<_> = paths
-            .into_iter()
+            .iter()
             .map(|path| {
                 self.request(dap_command::SetBreakpoints {
                     source: client_source(path),
@@ -508,13 +508,12 @@ impl RunningMode {
                         .ok();
                 }
 
-                let ret = if configuration_done_supported {
+                if configuration_done_supported {
                     this.request(ConfigurationDone {})
                 } else {
                     Task::ready(Ok(()))
                 }
-                .await;
-                ret
+                .await
             }
         });
 
@@ -839,7 +838,7 @@ impl Session {
             })
             .detach();
 
-            let this = Self {
+            Self {
                 mode: SessionState::Booting(None),
                 id: session_id,
                 child_session_ids: HashSet::default(),
@@ -868,9 +867,7 @@ impl Session {
                 task_context,
                 memory: memory::Memory::new(),
                 quirks,
-            };
-
-            this
+            }
         })
     }
 
diff --git a/crates/project/src/image_store.rs b/crates/project/src/image_store.rs
index 54d87d230c..c5a198954e 100644
--- a/crates/project/src/image_store.rs
+++ b/crates/project/src/image_store.rs
@@ -446,15 +446,12 @@ impl ImageStore {
         event: &ImageItemEvent,
         cx: &mut Context<Self>,
     ) {
-        match event {
-            ImageItemEvent::FileHandleChanged => {
-                if let Some(local) = self.state.as_local() {
-                    local.update(cx, |local, cx| {
-                        local.image_changed_file(image, cx);
-                    })
-                }
-            }
-            _ => {}
+        if let ImageItemEvent::FileHandleChanged = event
+            && let Some(local) = self.state.as_local()
+        {
+            local.update(cx, |local, cx| {
+                local.image_changed_file(image, cx);
+            })
         }
     }
 }
@@ -531,13 +528,10 @@ impl ImageStoreImpl for Entity<LocalImageStore> {
 impl LocalImageStore {
     fn subscribe_to_worktree(&mut self, worktree: &Entity<Worktree>, cx: &mut Context<Self>) {
         cx.subscribe(worktree, |this, worktree, event, cx| {
-            if worktree.read(cx).is_local() {
-                match event {
-                    worktree::Event::UpdatedEntries(changes) => {
-                        this.local_worktree_entries_changed(&worktree, changes, cx);
-                    }
-                    _ => {}
-                }
+            if worktree.read(cx).is_local()
+                && let worktree::Event::UpdatedEntries(changes) = event
+            {
+                this.local_worktree_entries_changed(&worktree, changes, cx);
             }
         })
         .detach();
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index 217e00ee96..de6848701f 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -2501,8 +2501,8 @@ pub(crate) fn parse_completion_text_edit(
     };
 
     Some(ParsedCompletionEdit {
-        insert_range: insert_range,
-        replace_range: replace_range,
+        insert_range,
+        replace_range,
         new_text: new_text.clone(),
     })
 }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e6ea01ff9a..a8c6ffd878 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -550,7 +550,7 @@ impl LocalLspStore {
 
             if let Some(settings) = settings.binary.as_ref() {
                 if let Some(arguments) = &settings.arguments {
-                    binary.arguments = arguments.into_iter().map(Into::into).collect();
+                    binary.arguments = arguments.iter().map(Into::into).collect();
                 }
                 if let Some(env) = &settings.env {
                     shell_env.extend(env.iter().map(|(k, v)| (k.clone(), v.clone())));
@@ -1060,8 +1060,8 @@ impl LocalLspStore {
         };
         let delegate: Arc<dyn ManifestDelegate> =
             Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
-        let root = self
-            .lsp_tree
+
+        self.lsp_tree
             .get(
                 project_path,
                 language.name(),
@@ -1069,9 +1069,7 @@ impl LocalLspStore {
                 &delegate,
                 cx,
             )
-            .collect::<Vec<_>>();
-
-        root
+            .collect::<Vec<_>>()
     }
 
     fn language_server_ids_for_buffer(
@@ -2397,7 +2395,8 @@ impl LocalLspStore {
 
                 let server_id = server_node.server_id_or_init(|disposition| {
                     let path = &disposition.path;
-                    let server_id = {
+
+                    {
                         let uri =
                             Url::from_file_path(worktree.read(cx).abs_path().join(&path.path));
 
@@ -2415,9 +2414,7 @@ impl LocalLspStore {
                             state.add_workspace_folder(uri);
                         };
                         server_id
-                    };
-
-                    server_id
+                    }
                 })?;
                 let server_state = self.language_servers.get(&server_id)?;
                 if let LanguageServerState::Running {
@@ -3047,16 +3044,14 @@ impl LocalLspStore {
                             buffer.edit([(range, text)], None, cx);
                         }
 
-                        let transaction = buffer.end_transaction(cx).and_then(|transaction_id| {
+                        buffer.end_transaction(cx).and_then(|transaction_id| {
                             if push_to_history {
                                 buffer.finalize_last_transaction();
                                 buffer.get_transaction(transaction_id).cloned()
                             } else {
                                 buffer.forget_transaction(transaction_id)
                             }
-                        });
-
-                        transaction
+                        })
                     })?;
                     if let Some(transaction) = transaction {
                         project_transaction.0.insert(buffer_to_edit, transaction);
@@ -4370,13 +4365,11 @@ impl LspStore {
         if let Some((client, downstream_project_id)) = self.downstream_client.clone()
             && let Some(diangostic_summaries) = self.diagnostic_summaries.get(&worktree.id())
         {
-            let mut summaries = diangostic_summaries
-                .into_iter()
-                .flat_map(|(path, summaries)| {
-                    summaries
-                        .into_iter()
-                        .map(|(server_id, summary)| summary.to_proto(*server_id, path))
-                });
+            let mut summaries = diangostic_summaries.iter().flat_map(|(path, summaries)| {
+                summaries
+                    .iter()
+                    .map(|(server_id, summary)| summary.to_proto(*server_id, path))
+            });
             if let Some(summary) = summaries.next() {
                 client
                     .send(proto::UpdateDiagnosticSummary {
@@ -4564,7 +4557,7 @@ impl LspStore {
                 anyhow::anyhow!(message)
             })?;
 
-            let response = request
+            request
                 .response_from_lsp(
                     response,
                     this.upgrade().context("no app context")?,
@@ -4572,8 +4565,7 @@ impl LspStore {
                     language_server.server_id(),
                     cx.clone(),
                 )
-                .await;
-            response
+                .await
         })
     }
 
@@ -4853,7 +4845,7 @@ impl LspStore {
         push_to_history: bool,
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<ProjectTransaction>> {
-        if let Some(_) = self.as_local() {
+        if self.as_local().is_some() {
             cx.spawn(async move |lsp_store, cx| {
                 let buffers = buffers.into_iter().collect::<Vec<_>>();
                 let result = LocalLspStore::execute_code_action_kind_locally(
@@ -7804,7 +7796,7 @@ impl LspStore {
                             }
                             None => {
                                 diagnostics_summary = Some(proto::UpdateDiagnosticSummary {
-                                    project_id: project_id,
+                                    project_id,
                                     worktree_id: worktree_id.to_proto(),
                                     summary: Some(proto::DiagnosticSummary {
                                         path: project_path.path.as_ref().to_proto(),
@@ -10054,7 +10046,7 @@ impl LspStore {
         cx: &mut Context<Self>,
     ) -> Task<anyhow::Result<ProjectTransaction>> {
         let logger = zlog::scoped!("format");
-        if let Some(_) = self.as_local() {
+        if self.as_local().is_some() {
             zlog::trace!(logger => "Formatting locally");
             let logger = zlog::scoped!(logger => "local");
             let buffers = buffers
diff --git a/crates/project/src/manifest_tree.rs b/crates/project/src/manifest_tree.rs
index 750815c477..ced9b34d93 100644
--- a/crates/project/src/manifest_tree.rs
+++ b/crates/project/src/manifest_tree.rs
@@ -43,12 +43,9 @@ impl WorktreeRoots {
                 match event {
                     WorktreeEvent::UpdatedEntries(changes) => {
                         for (path, _, kind) in changes.iter() {
-                            match kind {
-                                worktree::PathChange::Removed => {
-                                    let path = TriePath::from(path.as_ref());
-                                    this.roots.remove(&path);
-                                }
-                                _ => {}
+                            if kind == &worktree::PathChange::Removed {
+                                let path = TriePath::from(path.as_ref());
+                                this.roots.remove(&path);
                             }
                         }
                     }
@@ -197,11 +194,8 @@ impl ManifestTree {
         evt: &WorktreeStoreEvent,
         _: &mut Context<Self>,
     ) {
-        match evt {
-            WorktreeStoreEvent::WorktreeRemoved(_, worktree_id) => {
-                self.root_points.remove(worktree_id);
-            }
-            _ => {}
+        if let WorktreeStoreEvent::WorktreeRemoved(_, worktree_id) = evt {
+            self.root_points.remove(worktree_id);
         }
     }
 }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index f9ad7b96d3..6712b3fab0 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2885,14 +2885,11 @@ impl Project {
         event: &DapStoreEvent,
         cx: &mut Context<Self>,
     ) {
-        match event {
-            DapStoreEvent::Notification(message) => {
-                cx.emit(Event::Toast {
-                    notification_id: "dap".into(),
-                    message: message.clone(),
-                });
-            }
-            _ => {}
+        if let DapStoreEvent::Notification(message) = event {
+            cx.emit(Event::Toast {
+                notification_id: "dap".into(),
+                message: message.clone(),
+            });
         }
     }
 
@@ -3179,14 +3176,11 @@ impl Project {
         event: &ImageItemEvent,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        match event {
-            ImageItemEvent::ReloadNeeded => {
-                if !self.is_via_collab() {
-                    self.reload_images([image.clone()].into_iter().collect(), cx)
-                        .detach_and_log_err(cx);
-                }
-            }
-            _ => {}
+        if let ImageItemEvent::ReloadNeeded = event
+            && !self.is_via_collab()
+        {
+            self.reload_images([image.clone()].into_iter().collect(), cx)
+                .detach_and_log_err(cx);
         }
 
         None
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 5137d64fab..eb1e3828e9 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -695,7 +695,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
         assert_eq!(
             buffer
                 .completion_triggers()
-                .into_iter()
+                .iter()
                 .cloned()
                 .collect::<Vec<_>>(),
             &[".".to_string(), "::".to_string()]
@@ -747,7 +747,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
         assert_eq!(
             buffer
                 .completion_triggers()
-                .into_iter()
+                .iter()
                 .cloned()
                 .collect::<Vec<_>>(),
             &[":".to_string()]
@@ -766,7 +766,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
         assert_eq!(
             buffer
                 .completion_triggers()
-                .into_iter()
+                .iter()
                 .cloned()
                 .collect::<Vec<_>>(),
             &[".".to_string(), "::".to_string()]
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
index 8d8a1bd008..e51f8e0b3b 100644
--- a/crates/project/src/task_inventory.rs
+++ b/crates/project/src/task_inventory.rs
@@ -110,7 +110,7 @@ impl<T: InventoryContents> InventoryFor<T> {
 
     fn global_scenarios(&self) -> impl '_ + Iterator<Item = (TaskSourceKind, T)> {
         self.global.iter().flat_map(|(file_path, templates)| {
-            templates.into_iter().map(|template| {
+            templates.iter().map(|template| {
                 (
                     TaskSourceKind::AbsPath {
                         id_base: Cow::Owned(format!("global {}", T::GLOBAL_SOURCE_FILE)),
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 212d2dd2d9..b2556d7584 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -67,13 +67,11 @@ pub struct SshDetails {
 
 impl Project {
     pub fn active_project_directory(&self, cx: &App) -> Option<Arc<Path>> {
-        let worktree = self
-            .active_entry()
+        self.active_entry()
             .and_then(|entry_id| self.worktree_for_entry(entry_id, cx))
             .into_iter()
             .chain(self.worktrees(cx))
-            .find_map(|tree| tree.read(cx).root_dir());
-        worktree
+            .find_map(|tree| tree.read(cx).root_dir())
     }
 
     pub fn first_project_directory(&self, cx: &App) -> Option<PathBuf> {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 9a87874ed8..dc92ee8c70 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -3589,7 +3589,7 @@ impl ProjectPanel {
                                         previous_components.next();
                                     }
 
-                                    if let Some(_) = suffix_components {
+                                    if suffix_components.is_some() {
                                         new_path.push(previous_components);
                                     }
                                     if let Some(str) = new_path.to_str() {
@@ -4422,9 +4422,7 @@ impl ProjectPanel {
                                     let components = Path::new(&file_name)
                                         .components()
                                         .map(|comp| {
-                                            let comp_str =
-                                                comp.as_os_str().to_string_lossy().into_owned();
-                                            comp_str
+                                            comp.as_os_str().to_string_lossy().into_owned()
                                         })
                                         .collect::<Vec<_>>();
 
diff --git a/crates/recent_projects/src/disconnected_overlay.rs b/crates/recent_projects/src/disconnected_overlay.rs
index 9b79d3ce9c..dd4d788cfd 100644
--- a/crates/recent_projects/src/disconnected_overlay.rs
+++ b/crates/recent_projects/src/disconnected_overlay.rs
@@ -88,11 +88,8 @@ impl DisconnectedOverlay {
         self.finished = true;
         cx.emit(DismissEvent);
 
-        match &self.host {
-            Host::SshRemoteProject(ssh_connection_options) => {
-                self.reconnect_to_ssh_remote(ssh_connection_options.clone(), window, cx);
-            }
-            _ => {}
+        if let Host::SshRemoteProject(ssh_connection_options) = &self.host {
+            self.reconnect_to_ssh_remote(ssh_connection_options.clone(), window, cx);
         }
     }
 
diff --git a/crates/remote/src/protocol.rs b/crates/remote/src/protocol.rs
index 787094781d..e5a9c5b7a5 100644
--- a/crates/remote/src/protocol.rs
+++ b/crates/remote/src/protocol.rs
@@ -31,8 +31,8 @@ pub async fn read_message<S: AsyncRead + Unpin>(
     stream.read_exact(buffer).await?;
 
     let len = message_len_from_buffer(buffer);
-    let result = read_message_with_len(stream, buffer, len).await;
-    result
+
+    read_message_with_len(stream, buffer, len).await
 }
 
 pub async fn write_message<S: AsyncWrite + Unpin>(
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 85150f629e..6fc327ac1c 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -194,15 +194,11 @@ impl HeadlessProject {
             languages.clone(),
         );
 
-        cx.subscribe(
-            &buffer_store,
-            |_this, _buffer_store, event, cx| match event {
-                BufferStoreEvent::BufferAdded(buffer) => {
-                    cx.subscribe(buffer, Self::on_buffer_event).detach();
-                }
-                _ => {}
-            },
-        )
+        cx.subscribe(&buffer_store, |_this, _buffer_store, event, cx| {
+            if let BufferStoreEvent::BufferAdded(buffer) = event {
+                cx.subscribe(buffer, Self::on_buffer_event).detach();
+            }
+        })
         .detach();
 
         let extensions = HeadlessExtensionStore::new(
@@ -285,18 +281,17 @@ impl HeadlessProject {
         event: &BufferEvent,
         cx: &mut Context<Self>,
     ) {
-        match event {
-            BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } => cx
-                .background_spawn(self.session.request(proto::UpdateBuffer {
-                    project_id: SSH_PROJECT_ID,
-                    buffer_id: buffer.read(cx).remote_id().to_proto(),
-                    operations: vec![serialize_operation(operation)],
-                }))
-                .detach(),
-            _ => {}
+        if let BufferEvent::Operation {
+            operation,
+            is_local: true,
+        } = event
+        {
+            cx.background_spawn(self.session.request(proto::UpdateBuffer {
+                project_id: SSH_PROJECT_ID,
+                buffer_id: buffer.read(cx).remote_id().to_proto(),
+                operations: vec![serialize_operation(operation)],
+            }))
+            .detach()
         }
     }
 
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 9315536e6b..15a465a880 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -334,7 +334,7 @@ fn start_server(
             let (mut stdin_msg_tx, mut stdin_msg_rx) = mpsc::unbounded::<Envelope>();
             cx.background_spawn(async move {
                 while let Ok(msg) = read_message(&mut stdin_stream, &mut input_buffer).await {
-                    if let Err(_) = stdin_msg_tx.send(msg).await {
+                    if (stdin_msg_tx.send(msg).await).is_err() {
                         break;
                     }
                 }
@@ -891,7 +891,8 @@ pub fn handle_settings_file_changes(
 
 fn read_proxy_settings(cx: &mut Context<HeadlessProject>) -> Option<Url> {
     let proxy_str = ProxySettings::get_global(cx).proxy.to_owned();
-    let proxy_url = proxy_str
+
+    proxy_str
         .as_ref()
         .and_then(|input: &String| {
             input
@@ -899,8 +900,7 @@ fn read_proxy_settings(cx: &mut Context<HeadlessProject>) -> Option<Url> {
                 .inspect_err(|e| log::error!("Error parsing proxy settings: {}", e))
                 .ok()
         })
-        .or_else(read_proxy_from_env);
-    proxy_url
+        .or_else(read_proxy_from_env)
 }
 
 fn daemonize() -> Result<ControlFlow<()>> {
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
index b8fd2e57f2..714cb3aed3 100644
--- a/crates/repl/src/components/kernel_options.rs
+++ b/crates/repl/src/components/kernel_options.rs
@@ -269,10 +269,9 @@ where
         };
 
         let picker_view = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx)
+            Picker::uniform_list(delegate, window, cx)
                 .width(rems(30.))
-                .max_height(Some(rems(20.).into()));
-            picker
+                .max_height(Some(rems(20.).into()))
         });
 
         PopoverMenu::new("kernel-switcher")
diff --git a/crates/repl/src/notebook/cell.rs b/crates/repl/src/notebook/cell.rs
index 15179a632c..87b8e1d55a 100644
--- a/crates/repl/src/notebook/cell.rs
+++ b/crates/repl/src/notebook/cell.rs
@@ -91,7 +91,7 @@ fn convert_outputs(
     cx: &mut App,
 ) -> Vec<Output> {
     outputs
-        .into_iter()
+        .iter()
         .map(|output| match output {
             nbformat::v4::Output::Stream { text, .. } => Output::Stream {
                 content: cx.new(|cx| TerminalOutput::from(&text.0, window, cx)),
diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rs
index a84f147dd2..325d262d9e 100644
--- a/crates/repl/src/notebook/notebook_ui.rs
+++ b/crates/repl/src/notebook/notebook_ui.rs
@@ -584,8 +584,8 @@ impl project::ProjectItem for NotebookItem {
                     Ok(nbformat::Notebook::Legacy(legacy_notebook)) => {
                         // TODO: Decide if we want to mutate the notebook by including Cell IDs
                         // and any other conversions
-                        let notebook = nbformat::upgrade_legacy_notebook(legacy_notebook)?;
-                        notebook
+
+                        nbformat::upgrade_legacy_notebook(legacy_notebook)?
                     }
                     // Bad notebooks and notebooks v4.0 and below are not supported
                     Err(e) => {
diff --git a/crates/repl/src/outputs/plain.rs b/crates/repl/src/outputs/plain.rs
index 74c7bfa3c3..ae3c728c8a 100644
--- a/crates/repl/src/outputs/plain.rs
+++ b/crates/repl/src/outputs/plain.rs
@@ -68,7 +68,7 @@ pub fn text_style(window: &mut Window, cx: &mut App) -> TextStyle {
 
     let theme = cx.theme();
 
-    let text_style = TextStyle {
+    TextStyle {
         font_family,
         font_features,
         font_weight,
@@ -81,9 +81,7 @@ pub fn text_style(window: &mut Window, cx: &mut App) -> TextStyle {
         // These are going to be overridden per-cell
         color: theme.colors().terminal_foreground,
         ..Default::default()
-    };
-
-    text_style
+    }
 }
 
 /// Returns the default terminal size for the terminal output.
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
index 96f7d1db11..e3c7d6f750 100644
--- a/crates/rope/src/chunk.rs
+++ b/crates/rope/src/chunk.rs
@@ -543,7 +543,7 @@ impl Iterator for Tabs {
         // Since tabs are 1 byte the tab offset is the same as the byte offset
         let position = TabPosition {
             byte_offset: tab_offset,
-            char_offset: char_offset,
+            char_offset,
         };
         // Remove the tab we've just seen
         self.tabs ^= 1 << tab_offset;
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
index 355deb5d20..bebe4315e4 100644
--- a/crates/rules_library/src/rules_library.rs
+++ b/crates/rules_library/src/rules_library.rs
@@ -49,7 +49,7 @@ actions!(
     ]
 );
 
-const BUILT_IN_TOOLTIP_TEXT: &'static str = concat!(
+const BUILT_IN_TOOLTIP_TEXT: &str = concat!(
     "This rule supports special functionality.\n",
     "It's read-only, but you can remove it from your default rules."
 );
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index b6836324db..0886654d62 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1113,8 +1113,8 @@ impl ProjectSearchView {
                     .await
                     .log_err();
                 }
-                let should_search = result != 2;
-                should_search
+
+                result != 2
             } else {
                 true
             };
diff --git a/crates/settings/src/key_equivalents.rs b/crates/settings/src/key_equivalents.rs
index bf08de97ae..6580137535 100644
--- a/crates/settings/src/key_equivalents.rs
+++ b/crates/settings/src/key_equivalents.rs
@@ -1415,7 +1415,7 @@ pub fn get_key_equivalents(layout: &str) -> Option<HashMap<char, char>> {
         _ => return None,
     };
 
-    Some(HashMap::from_iter(mappings.into_iter().cloned()))
+    Some(HashMap::from_iter(mappings.iter().cloned()))
 }
 
 #[cfg(not(target_os = "macos"))]
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index c102b303c1..a472c50e6c 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -295,9 +295,9 @@ fn replace_value_in_json_text(
     }
 }
 
-const TS_DOCUMENT_KIND: &'static str = "document";
-const TS_ARRAY_KIND: &'static str = "array";
-const TS_COMMENT_KIND: &'static str = "comment";
+const TS_DOCUMENT_KIND: &str = "document";
+const TS_ARRAY_KIND: &str = "array";
+const TS_COMMENT_KIND: &str = "comment";
 
 pub fn replace_top_level_array_value_in_json_text(
     text: &str,
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 457d58e5a7..12e3c0c274 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -621,8 +621,7 @@ impl KeymapEditor {
         let key_bindings_ptr = cx.key_bindings();
         let lock = key_bindings_ptr.borrow();
         let key_bindings = lock.bindings();
-        let mut unmapped_action_names =
-            HashSet::from_iter(cx.all_action_names().into_iter().copied());
+        let mut unmapped_action_names = HashSet::from_iter(cx.all_action_names().iter().copied());
         let action_documentation = cx.action_documentation();
         let mut generator = KeymapFile::action_schema_generator();
         let actions_with_schemas = HashSet::from_iter(
@@ -1289,7 +1288,7 @@ struct HumanizedActionNameCache {
 
 impl HumanizedActionNameCache {
     fn new(cx: &App) -> Self {
-        let cache = HashMap::from_iter(cx.all_action_names().into_iter().map(|&action_name| {
+        let cache = HashMap::from_iter(cx.all_action_names().iter().map(|&action_name| {
             (
                 action_name,
                 command_palette::humanize_action_name(action_name).into(),
@@ -1857,18 +1856,15 @@ impl Render for KeymapEditor {
                                                   mouse_down_event: &gpui::MouseDownEvent,
                                                   window,
                                                   cx| {
-                                                match mouse_down_event.button {
-                                                    MouseButton::Right => {
-                                                        this.select_index(
-                                                            row_index, None, window, cx,
-                                                        );
-                                                        this.create_context_menu(
-                                                            mouse_down_event.position,
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    }
-                                                    _ => {}
+                                                if mouse_down_event.button == MouseButton::Right {
+                                                    this.select_index(
+                                                        row_index, None, window, cx,
+                                                    );
+                                                    this.create_context_menu(
+                                                        mouse_down_event.position,
+                                                        window,
+                                                        cx,
+                                                    );
                                                 }
                                             },
                                         ))
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/settings_ui/src/ui_components/keystroke_input.rs
index 66593524a3..1b8010853e 100644
--- a/crates/settings_ui/src/ui_components/keystroke_input.rs
+++ b/crates/settings_ui/src/ui_components/keystroke_input.rs
@@ -19,7 +19,7 @@ actions!(
     ]
 );
 
-const KEY_CONTEXT_VALUE: &'static str = "KeystrokeInput";
+const KEY_CONTEXT_VALUE: &str = "KeystrokeInput";
 
 const CLOSE_KEYSTROKE_CAPTURE_END_TIMEOUT: std::time::Duration =
     std::time::Duration::from_millis(300);
diff --git a/crates/settings_ui/src/ui_components/table.rs b/crates/settings_ui/src/ui_components/table.rs
index a91d497572..9d7bb07360 100644
--- a/crates/settings_ui/src/ui_components/table.rs
+++ b/crates/settings_ui/src/ui_components/table.rs
@@ -213,7 +213,7 @@ impl TableInteractionState {
 
         let mut column_ix = 0;
         let resizable_columns_slice = *resizable_columns;
-        let mut resizable_columns = resizable_columns.into_iter();
+        let mut resizable_columns = resizable_columns.iter();
 
         let dividers = intersperse_with(spacers, || {
             window.with_id(column_ix, |window| {
@@ -801,7 +801,7 @@ impl<const COLS: usize> Table<COLS> {
     ) -> Self {
         self.rows = TableContents::UniformList(UniformListData {
             element_id: id.into(),
-            row_count: row_count,
+            row_count,
             render_item_fn: Box::new(render_item_fn),
         });
         self
diff --git a/crates/storybook/src/story_selector.rs b/crates/storybook/src/story_selector.rs
index fd0be97ff6..aad3875410 100644
--- a/crates/storybook/src/story_selector.rs
+++ b/crates/storybook/src/story_selector.rs
@@ -109,15 +109,13 @@ static ALL_STORY_SELECTORS: OnceLock<Vec<StorySelector>> = OnceLock::new();
 
 impl ValueEnum for StorySelector {
     fn value_variants<'a>() -> &'a [Self] {
-        let stories = ALL_STORY_SELECTORS.get_or_init(|| {
+        (ALL_STORY_SELECTORS.get_or_init(|| {
             let component_stories = ComponentStory::iter().map(StorySelector::Component);
 
             component_stories
                 .chain(std::iter::once(StorySelector::KitchenSink))
                 .collect::<Vec<_>>()
-        });
-
-        stories
+        })) as _
     }
 
     fn to_possible_value(&self) -> Option<clap::builder::PossibleValue> {
diff --git a/crates/svg_preview/src/svg_preview_view.rs b/crates/svg_preview/src/svg_preview_view.rs
index 4e4c83c8de..12dd97f0c8 100644
--- a/crates/svg_preview/src/svg_preview_view.rs
+++ b/crates/svg_preview/src/svg_preview_view.rs
@@ -157,18 +157,15 @@ impl SvgPreviewView {
                 &active_editor,
                 window,
                 |this: &mut SvgPreviewView, _editor, event: &EditorEvent, window, cx| {
-                    match event {
-                        EditorEvent::Saved => {
-                            // Remove cached image to force reload
-                            if let Some(svg_path) = &this.svg_path {
-                                let resource = Resource::Path(svg_path.clone().into());
-                                this.image_cache.update(cx, |cache, cx| {
-                                    cache.remove(&resource, window, cx);
-                                });
-                            }
-                            cx.notify();
+                    if event == &EditorEvent::Saved {
+                        // Remove cached image to force reload
+                        if let Some(svg_path) = &this.svg_path {
+                            let resource = Resource::Path(svg_path.clone().into());
+                            this.image_cache.update(cx, |cache, cx| {
+                                cache.remove(&resource, window, cx);
+                            });
                         }
-                        _ => {}
+                        cx.notify();
                     }
                 },
             );
@@ -184,22 +181,18 @@ impl SvgPreviewView {
                          event: &workspace::Event,
                          _window,
                          cx| {
-                            match event {
-                                workspace::Event::ActiveItemChanged => {
-                                    let workspace_read = workspace.read(cx);
-                                    if let Some(active_item) = workspace_read.active_item(cx)
-                                        && let Some(editor_entity) =
-                                            active_item.downcast::<Editor>()
-                                        && Self::is_svg_file(&editor_entity, cx)
-                                    {
-                                        let new_path = Self::get_svg_path(&editor_entity, cx);
-                                        if this.svg_path != new_path {
-                                            this.svg_path = new_path;
-                                            cx.notify();
-                                        }
+                            if let workspace::Event::ActiveItemChanged = event {
+                                let workspace_read = workspace.read(cx);
+                                if let Some(active_item) = workspace_read.active_item(cx)
+                                    && let Some(editor_entity) = active_item.downcast::<Editor>()
+                                    && Self::is_svg_file(&editor_entity, cx)
+                                {
+                                    let new_path = Self::get_svg_path(&editor_entity, cx);
+                                    if this.svg_path != new_path {
+                                        this.svg_path = new_path;
+                                        cx.notify();
                                     }
                                 }
-                                _ => {}
                             }
                         },
                     )
diff --git a/crates/task/src/shell_builder.rs b/crates/task/src/shell_builder.rs
index b8c49d4230..5ed29fd733 100644
--- a/crates/task/src/shell_builder.rs
+++ b/crates/task/src/shell_builder.rs
@@ -237,13 +237,11 @@ impl ShellBuilder {
         task_args: &Vec<String>,
     ) -> (String, Vec<String>) {
         if let Some(task_command) = task_command {
-            let combined_command = task_args
-                .into_iter()
-                .fold(task_command, |mut command, arg| {
-                    command.push(' ');
-                    command.push_str(&self.kind.to_shell_variable(arg));
-                    command
-                });
+            let combined_command = task_args.iter().fold(task_command, |mut command, arg| {
+                command.push(' ');
+                command.push_str(&self.kind.to_shell_variable(arg));
+                command
+            });
 
             self.args
                 .extend(self.kind.args_for_shell(self.interactive, combined_command));
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index c4b0931c35..9fbdc152f3 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -550,7 +550,7 @@ impl PickerDelegate for TasksModalDelegate {
                     list_item.tooltip(move |_, _| item_label.clone())
                 })
                 .map(|item| {
-                    let item = if matches!(source_kind, TaskSourceKind::UserInput)
+                    if matches!(source_kind, TaskSourceKind::UserInput)
                         || Some(ix) <= self.divider_index
                     {
                         let task_index = hit.candidate_id;
@@ -579,8 +579,7 @@ impl PickerDelegate for TasksModalDelegate {
                         item.end_hover_slot(delete_button)
                     } else {
                         item
-                    };
-                    item
+                    }
                 })
                 .toggle_state(selected)
                 .child(highlighted_location.render(window, cx)),
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index c50e2bd3a7..1d76f70152 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -236,7 +236,7 @@ impl TerminalPanel {
     ) -> Result<Entity<Self>> {
         let mut terminal_panel = None;
 
-        match workspace
+        if let Some((database_id, serialization_key)) = workspace
             .read_with(&cx, |workspace, _| {
                 workspace
                     .database_id()
@@ -244,34 +244,29 @@ impl TerminalPanel {
             })
             .ok()
             .flatten()
+            && let Some(serialized_panel) = cx
+                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
+                .await
+                .log_err()
+                .flatten()
+                .map(|panel| serde_json::from_str::<SerializedTerminalPanel>(&panel))
+                .transpose()
+                .log_err()
+                .flatten()
+            && let Ok(serialized) = workspace
+                .update_in(&mut cx, |workspace, window, cx| {
+                    deserialize_terminal_panel(
+                        workspace.weak_handle(),
+                        workspace.project().clone(),
+                        database_id,
+                        serialized_panel,
+                        window,
+                        cx,
+                    )
+                })?
+                .await
         {
-            Some((database_id, serialization_key)) => {
-                if let Some(serialized_panel) = cx
-                    .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
-                    .await
-                    .log_err()
-                    .flatten()
-                    .map(|panel| serde_json::from_str::<SerializedTerminalPanel>(&panel))
-                    .transpose()
-                    .log_err()
-                    .flatten()
-                    && let Ok(serialized) = workspace
-                        .update_in(&mut cx, |workspace, window, cx| {
-                            deserialize_terminal_panel(
-                                workspace.weak_handle(),
-                                workspace.project().clone(),
-                                database_id,
-                                serialized_panel,
-                                window,
-                                cx,
-                            )
-                        })?
-                        .await
-                {
-                    terminal_panel = Some(serialized);
-                }
-            }
-            _ => {}
+            terminal_panel = Some(serialized);
         }
 
         let terminal_panel = if let Some(panel) = terminal_panel {
@@ -629,7 +624,7 @@ impl TerminalPanel {
                 workspace
                     .read(cx)
                     .panes()
-                    .into_iter()
+                    .iter()
                     .cloned()
                     .flat_map(pane_terminal_views),
             )
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index f434e46159..956bcebfd0 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1937,7 +1937,8 @@ impl SearchableItem for TerminalView {
         // Selection head might have a value if there's a selection that isn't
         // associated with a match. Therefore, if there are no matches, we should
         // report None, no matter the state of the terminal
-        let res = if !matches.is_empty() {
+
+        if !matches.is_empty() {
             if let Some(selection_head) = self.terminal().read(cx).selection_head {
                 // If selection head is contained in a match. Return that match
                 match direction {
@@ -1977,9 +1978,7 @@ impl SearchableItem for TerminalView {
             }
         } else {
             None
-        };
-
-        res
+        }
     }
     fn replace(
         &mut self,
diff --git a/crates/theme/src/icon_theme.rs b/crates/theme/src/icon_theme.rs
index 5bd69c1733..c21709559a 100644
--- a/crates/theme/src/icon_theme.rs
+++ b/crates/theme/src/icon_theme.rs
@@ -398,7 +398,7 @@ static DEFAULT_ICON_THEME: LazyLock<Arc<IconTheme>> = LazyLock::new(|| {
         },
         file_stems: icon_keys_by_association(FILE_STEMS_BY_ICON_KEY),
         file_suffixes: icon_keys_by_association(FILE_SUFFIXES_BY_ICON_KEY),
-        file_icons: HashMap::from_iter(FILE_ICONS.into_iter().map(|(ty, path)| {
+        file_icons: HashMap::from_iter(FILE_ICONS.iter().map(|(ty, path)| {
             (
                 ty.to_string(),
                 IconDefinition {
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index 275f47912a..5be68afeb4 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -41,7 +41,8 @@ fn toggle_screen_sharing(
             let Some(room) = call.room().cloned() else {
                 return;
             };
-            let toggle_screen_sharing = room.update(cx, |room, cx| {
+
+            room.update(cx, |room, cx| {
                 let clicked_on_currently_shared_screen =
                     room.shared_screen_id().is_some_and(|screen_id| {
                         Some(screen_id)
@@ -78,8 +79,7 @@ fn toggle_screen_sharing(
                 } else {
                     Task::ready(Ok(()))
                 }
-            });
-            toggle_screen_sharing
+            })
         }
         Err(e) => Task::ready(Err(e)),
     };
diff --git a/crates/ui/src/components/facepile.rs b/crates/ui/src/components/facepile.rs
index 879bfce041..83e99df7c2 100644
--- a/crates/ui/src/components/facepile.rs
+++ b/crates/ui/src/components/facepile.rs
@@ -78,7 +78,7 @@ impl RenderOnce for Facepile {
     }
 }
 
-pub const EXAMPLE_FACES: [&'static str; 6] = [
+pub const EXAMPLE_FACES: [&str; 6] = [
     "https://avatars.githubusercontent.com/u/326587?s=60&v=4",
     "https://avatars.githubusercontent.com/u/2280405?s=60&v=4",
     "https://avatars.githubusercontent.com/u/1789?s=60&v=4",
diff --git a/crates/ui/src/components/toggle.rs b/crates/ui/src/components/toggle.rs
index e5f28e3b25..2ca635c05b 100644
--- a/crates/ui/src/components/toggle.rs
+++ b/crates/ui/src/components/toggle.rs
@@ -616,7 +616,7 @@ impl SwitchField {
         Self {
             id: id.into(),
             label: label.into(),
-            description: description,
+            description,
             toggle_state: toggle_state.into(),
             on_click: Arc::new(on_click),
             disabled: false,
diff --git a/crates/ui/src/components/tooltip.rs b/crates/ui/src/components/tooltip.rs
index ed0fdd0114..65ed2f2b68 100644
--- a/crates/ui/src/components/tooltip.rs
+++ b/crates/ui/src/components/tooltip.rs
@@ -175,7 +175,7 @@ impl Tooltip {
         move |_, cx| {
             let title = title.clone();
             cx.new(|_| Self {
-                title: title,
+                title,
                 meta: None,
                 key_binding: None,
             })
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index e2ce54b994..2bc531268d 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -201,10 +201,7 @@ impl Vim {
                     let right_kind = classifier.kind_with(right, ignore_punctuation);
                     let at_newline = (left == '\n') ^ (right == '\n');
 
-                    let found = (left_kind != right_kind && right_kind != CharKind::Whitespace)
-                        || at_newline;
-
-                    found
+                    (left_kind != right_kind && right_kind != CharKind::Whitespace) || at_newline
                 })
             }
             Motion::NextWordEnd { ignore_punctuation } => {
@@ -213,10 +210,7 @@ impl Vim {
                     let right_kind = classifier.kind_with(right, ignore_punctuation);
                     let at_newline = (left == '\n') ^ (right == '\n');
 
-                    let found = (left_kind != right_kind && left_kind != CharKind::Whitespace)
-                        || at_newline;
-
-                    found
+                    (left_kind != right_kind && left_kind != CharKind::Whitespace) || at_newline
                 })
             }
             Motion::PreviousWordStart { ignore_punctuation } => {
@@ -225,10 +219,7 @@ impl Vim {
                     let right_kind = classifier.kind_with(right, ignore_punctuation);
                     let at_newline = (left == '\n') ^ (right == '\n');
 
-                    let found = (left_kind != right_kind && left_kind != CharKind::Whitespace)
-                        || at_newline;
-
-                    found
+                    (left_kind != right_kind && left_kind != CharKind::Whitespace) || at_newline
                 })
             }
             Motion::PreviousWordEnd { ignore_punctuation } => {
@@ -237,10 +228,7 @@ impl Vim {
                     let right_kind = classifier.kind_with(right, ignore_punctuation);
                     let at_newline = (left == '\n') ^ (right == '\n');
 
-                    let found = (left_kind != right_kind && right_kind != CharKind::Whitespace)
-                        || at_newline;
-
-                    found
+                    (left_kind != right_kind && right_kind != CharKind::Whitespace) || at_newline
                 })
             }
             Motion::FindForward {
diff --git a/crates/vim/src/normal/change.rs b/crates/vim/src/normal/change.rs
index fcd36dd7ee..2af22bf050 100644
--- a/crates/vim/src/normal/change.rs
+++ b/crates/vim/src/normal/change.rs
@@ -155,12 +155,11 @@ fn expand_changed_word_selection(
         let classifier = map
             .buffer_snapshot
             .char_classifier_at(selection.start.to_point(map));
-        let in_word = map
-            .buffer_chars_at(selection.head().to_offset(map, Bias::Left))
+
+        map.buffer_chars_at(selection.head().to_offset(map, Bias::Left))
             .next()
             .map(|(c, _)| !classifier.is_whitespace(c))
-            .unwrap_or_default();
-        in_word
+            .unwrap_or_default()
     };
     if (times.is_none() || times.unwrap() == 1) && is_in_word() {
         let next_char = map
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 81efcef17a..23efd39139 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -255,16 +255,11 @@ impl MarksState {
     pub fn new(workspace: &Workspace, cx: &mut App) -> Entity<MarksState> {
         cx.new(|cx| {
             let buffer_store = workspace.project().read(cx).buffer_store().clone();
-            let subscription =
-                cx.subscribe(
-                    &buffer_store,
-                    move |this: &mut Self, _, event, cx| match event {
-                        project::buffer_store::BufferStoreEvent::BufferAdded(buffer) => {
-                            this.on_buffer_loaded(buffer, cx);
-                        }
-                        _ => {}
-                    },
-                );
+            let subscription = cx.subscribe(&buffer_store, move |this: &mut Self, _, event, cx| {
+                if let project::buffer_store::BufferStoreEvent::BufferAdded(buffer) = event {
+                    this.on_buffer_loaded(buffer, cx);
+                }
+            });
 
             let mut this = Self {
                 workspace: workspace.weak_handle(),
@@ -596,7 +591,7 @@ impl MarksState {
             if let Some(anchors) = self.buffer_marks.get(&buffer_id) {
                 let text_anchors = anchors.get(name)?;
                 let anchors = text_anchors
-                    .into_iter()
+                    .iter()
                     .map(|anchor| Anchor::in_buffer(excerpt_id, buffer_id, *anchor))
                     .collect();
                 return Some(Mark::Local(anchors));
@@ -1710,26 +1705,25 @@ impl VimDb {
         marks: HashMap<String, Vec<Point>>,
     ) -> Result<()> {
         log::debug!("Setting path {path:?} for {} marks", marks.len());
-        let result = self
-            .write(move |conn| {
-                let mut query = conn.exec_bound(sql!(
-                    INSERT OR REPLACE INTO vim_marks
-                        (workspace_id, mark_name, path, value)
-                    VALUES
-                        (?, ?, ?, ?)
-                ))?;
-                for (mark_name, value) in marks {
-                    let pairs: Vec<(u32, u32)> = value
-                        .into_iter()
-                        .map(|point| (point.row, point.column))
-                        .collect();
-                    let serialized = serde_json::to_string(&pairs)?;
-                    query((workspace_id, mark_name, path.clone(), serialized))?;
-                }
-                Ok(())
-            })
-            .await;
-        result
+
+        self.write(move |conn| {
+            let mut query = conn.exec_bound(sql!(
+                INSERT OR REPLACE INTO vim_marks
+                    (workspace_id, mark_name, path, value)
+                VALUES
+                    (?, ?, ?, ?)
+            ))?;
+            for (mark_name, value) in marks {
+                let pairs: Vec<(u32, u32)> = value
+                    .into_iter()
+                    .map(|point| (point.row, point.column))
+                    .collect();
+                let serialized = serde_json::to_string(&pairs)?;
+                query((workspace_id, mark_name, path.clone(), serialized))?;
+            }
+            Ok(())
+        })
+        .await
     }
 
     fn get_marks(&self, workspace_id: WorkspaceId) -> Result<Vec<SerializedMark>> {
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
index 98dabb8316..c2f7414f44 100644
--- a/crates/vim/src/test/neovim_connection.rs
+++ b/crates/vim/src/test/neovim_connection.rs
@@ -590,7 +590,7 @@ fn parse_state(marked_text: &str) -> (String, Vec<Range<Point>>) {
 #[cfg(feature = "neovim")]
 fn encode_ranges(text: &str, point_ranges: &Vec<Range<Point>>) -> String {
     let byte_ranges = point_ranges
-        .into_iter()
+        .iter()
         .map(|range| {
             let mut byte_range = 0..0;
             let mut ix = 0;
diff --git a/crates/web_search_providers/src/cloud.rs b/crates/web_search_providers/src/cloud.rs
index 52ee0da0d4..75ffb1da63 100644
--- a/crates/web_search_providers/src/cloud.rs
+++ b/crates/web_search_providers/src/cloud.rs
@@ -50,7 +50,7 @@ impl State {
     }
 }
 
-pub const ZED_WEB_SEARCH_PROVIDER_ID: &'static str = "zed.dev";
+pub const ZED_WEB_SEARCH_PROVIDER_ID: &str = "zed.dev";
 
 impl WebSearchProvider for CloudWebSearchProvider {
     fn id(&self) -> WebSearchProviderId {
diff --git a/crates/web_search_providers/src/web_search_providers.rs b/crates/web_search_providers/src/web_search_providers.rs
index 7f8a5f3fa4..8ab0aee47a 100644
--- a/crates/web_search_providers/src/web_search_providers.rs
+++ b/crates/web_search_providers/src/web_search_providers.rs
@@ -27,11 +27,10 @@ fn register_web_search_providers(
 
     cx.subscribe(
         &LanguageModelRegistry::global(cx),
-        move |this, registry, event, cx| match event {
-            language_model::Event::DefaultModelChanged => {
+        move |this, registry, event, cx| {
+            if let language_model::Event::DefaultModelChanged = event {
                 register_zed_web_search_provider(this, client.clone(), &registry, cx)
             }
-            _ => {}
         },
     )
     .detach();
diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs
index febb83d683..d77be8ed76 100644
--- a/crates/workspace/src/shared_screen.rs
+++ b/crates/workspace/src/shared_screen.rs
@@ -33,13 +33,12 @@ impl SharedScreen {
         cx: &mut Context<Self>,
     ) -> Self {
         let my_sid = track.sid();
-        cx.subscribe(&room, move |_, _, ev, cx| match ev {
-            call::room::Event::RemoteVideoTrackUnsubscribed { sid } => {
-                if sid == &my_sid {
-                    cx.emit(Event::Close)
-                }
+        cx.subscribe(&room, move |_, _, ev, cx| {
+            if let call::room::Event::RemoteVideoTrackUnsubscribed { sid } = ev
+                && sid == &my_sid
+            {
+                cx.emit(Event::Close)
             }
-            _ => {}
         })
         .detach();
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 9dac340b5c..8c1be61abf 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3283,7 +3283,8 @@ impl Workspace {
         let task = self.load_path(project_path.clone(), window, cx);
         window.spawn(cx, async move |cx| {
             let (project_entry_id, build_item) = task.await?;
-            let result = pane.update_in(cx, |pane, window, cx| {
+
+            pane.update_in(cx, |pane, window, cx| {
                 pane.open_item(
                     project_entry_id,
                     project_path,
@@ -3295,8 +3296,7 @@ impl Workspace {
                     cx,
                     build_item,
                 )
-            });
-            result
+            })
         })
     }
 
@@ -9150,13 +9150,12 @@ mod tests {
 
     fn split_pane(cx: &mut VisualTestContext, workspace: &Entity<Workspace>) -> Entity<Pane> {
         workspace.update_in(cx, |workspace, window, cx| {
-            let new_pane = workspace.split_pane(
+            workspace.split_pane(
                 workspace.active_pane().clone(),
                 SplitDirection::Right,
                 window,
                 cx,
-            );
-            new_pane
+            )
         })
     }
 
@@ -9413,7 +9412,7 @@ mod tests {
             let workspace = workspace.clone();
             move |cx: &mut VisualTestContext| {
                 workspace.update_in(cx, |workspace, window, cx| {
-                    if let Some(_) = workspace.active_modal::<TestModal>(cx) {
+                    if workspace.active_modal::<TestModal>(cx).is_some() {
                         workspace.toggle_modal(window, cx, TestModal::new);
                         workspace.toggle_modal(window, cx, TestModal::new);
                     } else {
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index df30d4dd7b..851c4e79f1 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -80,12 +80,9 @@ fn files_not_created_on_launch(errors: HashMap<io::ErrorKind, Vec<&Path>>) {
 
             #[cfg(unix)]
             {
-                match kind {
-                    io::ErrorKind::PermissionDenied => {
-                        error_kind_details.push_str("\n\nConsider using chown and chmod tools for altering the directories permissions if your user has corresponding rights.\
-                            \nFor example, `sudo chown $(whoami):staff ~/.config` and `chmod +uwrx ~/.config`");
-                    }
-                    _ => {}
+                if kind == io::ErrorKind::PermissionDenied {
+                    error_kind_details.push_str("\n\nConsider using chown and chmod tools for altering the directories permissions if your user has corresponding rights.\
+                        \nFor example, `sudo chown $(whoami):staff ~/.config` and `chmod +uwrx ~/.config`");
                 }
             }
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index d3a503f172..232dfc42a3 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1620,13 +1620,12 @@ fn open_local_file(
                     .read_with(cx, |tree, _| tree.abs_path().join(settings_relative_path))?;
 
                 let fs = project.read_with(cx, |project, _| project.fs().clone())?;
-                let file_exists = fs
-                    .metadata(&full_path)
+
+                fs.metadata(&full_path)
                     .await
                     .ok()
                     .flatten()
-                    .is_some_and(|metadata| !metadata.is_dir && !metadata.is_fifo);
-                file_exists
+                    .is_some_and(|metadata| !metadata.is_dir && !metadata.is_fifo)
             };
 
             if !file_exists {
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index 8d12a5bfad..1123e53ddd 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -60,8 +60,8 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
     cx.subscribe(&user_store, {
         let editors = editors.clone();
         let client = client.clone();
-        move |user_store, event, cx| match event {
-            client::user::Event::PrivateUserInfoUpdated => {
+        move |user_store, event, cx| {
+            if let client::user::Event::PrivateUserInfoUpdated = event {
                 assign_edit_prediction_providers(
                     &editors,
                     provider,
@@ -70,7 +70,6 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
                     cx,
                 );
             }
-            _ => {}
         }
     })
     .detach();
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 640f408dd3..916699d29b 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -55,10 +55,10 @@ use workspace::Workspace;
 use workspace::notifications::{ErrorMessagePrompt, NotificationId};
 use worktree::Worktree;
 
-const CURSOR_MARKER: &'static str = "<|user_cursor_is_here|>";
-const START_OF_FILE_MARKER: &'static str = "<|start_of_file|>";
-const EDITABLE_REGION_START_MARKER: &'static str = "<|editable_region_start|>";
-const EDITABLE_REGION_END_MARKER: &'static str = "<|editable_region_end|>";
+const CURSOR_MARKER: &str = "<|user_cursor_is_here|>";
+const START_OF_FILE_MARKER: &str = "<|start_of_file|>";
+const EDITABLE_REGION_START_MARKER: &str = "<|editable_region_start|>";
+const EDITABLE_REGION_END_MARKER: &str = "<|editable_region_end|>";
 const BUFFER_CHANGE_GROUPING_INTERVAL: Duration = Duration::from_secs(1);
 const ZED_PREDICT_DATA_COLLECTION_CHOICE: &str = "zed_predict_data_collection_choice";
 
@@ -166,7 +166,7 @@ fn interpolate(
 ) -> Option<Vec<(Range<Anchor>, String)>> {
     let mut edits = Vec::new();
 
-    let mut model_edits = current_edits.into_iter().peekable();
+    let mut model_edits = current_edits.iter().peekable();
     for user_edit in new_snapshot.edits_since::<usize>(&old_snapshot.version) {
         while let Some((model_old_range, _)) = model_edits.peek() {
             let model_old_range = model_old_range.to_offset(old_snapshot);
@@ -2123,7 +2123,7 @@ mod tests {
         let completion = completion_task.await.unwrap().unwrap();
         completion
             .edits
-            .into_iter()
+            .iter()
             .map(|(old_range, new_text)| (old_range.to_point(&snapshot), new_text.clone()))
             .collect::<Vec<_>>()
     }
diff --git a/crates/zeta_cli/src/main.rs b/crates/zeta_cli/src/main.rs
index ba854b8732..5b2d4cf615 100644
--- a/crates/zeta_cli/src/main.rs
+++ b/crates/zeta_cli/src/main.rs
@@ -190,9 +190,8 @@ async fn get_context(
         .await;
 
     // Disable data collection for these requests, as this is currently just used for evals
-    match gather_context_output.as_mut() {
-        Ok(gather_context_output) => gather_context_output.body.can_collect_data = false,
-        Err(_) => {}
+    if let Ok(gather_context_output) = gather_context_output.as_mut() {
+        gather_context_output.body.can_collect_data = false
     }
 
     gather_context_output
@@ -277,8 +276,8 @@ pub fn wait_for_lang_server(
     let subscriptions = [
         cx.subscribe(&lsp_store, {
             let log_prefix = log_prefix.clone();
-            move |_, event, _| match event {
-                project::LspStoreEvent::LanguageServerUpdate {
+            move |_, event, _| {
+                if let project::LspStoreEvent::LanguageServerUpdate {
                     message:
                         client::proto::update_language_server::Variant::WorkProgress(
                             client::proto::LspWorkProgress {
@@ -287,8 +286,10 @@ pub fn wait_for_lang_server(
                             },
                         ),
                     ..
-                } => println!("{}⟲ {message}", log_prefix),
-                _ => {}
+                } = event
+                {
+                    println!("{}⟲ {message}", log_prefix)
+                }
             }
         }),
         cx.subscribe(project, {
diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
index 27a5314e28..36a77e37bd 100644
--- a/crates/zlog/src/filter.rs
+++ b/crates/zlog/src/filter.rs
@@ -4,7 +4,6 @@ use std::{
         OnceLock, RwLock,
         atomic::{AtomicU8, Ordering},
     },
-    usize,
 };
 
 use crate::{SCOPE_DEPTH_MAX, SCOPE_STRING_SEP_STR, Scope, ScopeAlloc, env_config, private};
@@ -152,7 +151,7 @@ fn scope_alloc_from_scope_str(scope_str: &str) -> Option<ScopeAlloc> {
     if index == 0 {
         return None;
     }
-    if let Some(_) = scope_iter.next() {
+    if scope_iter.next().is_some() {
         crate::warn!(
             "Invalid scope key, too many nested scopes: '{scope_str}'. Max depth is {SCOPE_DEPTH_MAX}",
         );
@@ -204,12 +203,10 @@ impl ScopeMap {
                 .map(|(scope_str, level_filter)| (scope_str.as_str(), *level_filter))
         });
 
-        let new_filters = items_input_map
-            .into_iter()
-            .filter_map(|(scope_str, level_str)| {
-                let level_filter = level_filter_from_str(level_str)?;
-                Some((scope_str.as_str(), level_filter))
-            });
+        let new_filters = items_input_map.iter().filter_map(|(scope_str, level_str)| {
+            let level_filter = level_filter_from_str(level_str)?;
+            Some((scope_str.as_str(), level_filter))
+        });
 
         let all_filters = default_filters
             .iter()
diff --git a/crates/zlog/src/zlog.rs b/crates/zlog/src/zlog.rs
index d1c6cd4747..d0e8958df5 100644
--- a/crates/zlog/src/zlog.rs
+++ b/crates/zlog/src/zlog.rs
@@ -10,12 +10,9 @@ pub use sink::{flush, init_output_file, init_output_stderr, init_output_stdout};
 pub const SCOPE_DEPTH_MAX: usize = 4;
 
 pub fn init() {
-    match try_init() {
-        Err(err) => {
-            log::error!("{err}");
-            eprintln!("{err}");
-        }
-        Ok(()) => {}
+    if let Err(err) = try_init() {
+        log::error!("{err}");
+        eprintln!("{err}");
     }
 }
 
@@ -268,7 +265,7 @@ pub mod private {
 
 pub type Scope = [&'static str; SCOPE_DEPTH_MAX];
 pub type ScopeAlloc = [String; SCOPE_DEPTH_MAX];
-const SCOPE_STRING_SEP_STR: &'static str = ".";
+const SCOPE_STRING_SEP_STR: &str = ".";
 const SCOPE_STRING_SEP_CHAR: char = '.';
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]

From 5fb68cb8bef6a18c48a21ca7357dc7b049d3021f Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 22:40:31 +0200
Subject: [PATCH 178/823] agent2: Token count (#36496)

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 crates/acp_thread/src/acp_thread.rs    |  19 ++++
 crates/acp_thread/src/connection.rs    |   2 +-
 crates/agent2/Cargo.toml               |   1 +
 crates/agent2/src/agent.rs             |  44 +++++---
 crates/agent2/src/db.rs                |  21 +++-
 crates/agent2/src/tests/mod.rs         | 144 ++++++++++++++++++++++++-
 crates/agent2/src/thread.rs            |  74 +++++++++++--
 crates/agent_ui/src/acp/thread_view.rs |  41 ++++++-
 crates/agent_ui/src/agent_diff.rs      |   1 +
 9 files changed, 321 insertions(+), 26 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index d4d73e1edd..793ef35be2 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -6,6 +6,7 @@ mod terminal;
 pub use connection::*;
 pub use diff::*;
 pub use mention::*;
+use serde::{Deserialize, Serialize};
 pub use terminal::*;
 
 use action_log::ActionLog;
@@ -664,6 +665,12 @@ impl PlanEntry {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct TokenUsage {
+    pub max_tokens: u64,
+    pub used_tokens: u64,
+}
+
 #[derive(Debug, Clone)]
 pub struct RetryStatus {
     pub last_error: SharedString,
@@ -683,12 +690,14 @@ pub struct AcpThread {
     send_task: Option<Task<()>>,
     connection: Rc<dyn AgentConnection>,
     session_id: acp::SessionId,
+    token_usage: Option<TokenUsage>,
 }
 
 #[derive(Debug)]
 pub enum AcpThreadEvent {
     NewEntry,
     TitleUpdated,
+    TokenUsageUpdated,
     EntryUpdated(usize),
     EntriesRemoved(Range<usize>),
     ToolAuthorizationRequired,
@@ -748,6 +757,7 @@ impl AcpThread {
             send_task: None,
             connection,
             session_id,
+            token_usage: None,
         }
     }
 
@@ -787,6 +797,10 @@ impl AcpThread {
         }
     }
 
+    pub fn token_usage(&self) -> Option<&TokenUsage> {
+        self.token_usage.as_ref()
+    }
+
     pub fn has_pending_edit_tool_calls(&self) -> bool {
         for entry in self.entries.iter().rev() {
             match entry {
@@ -937,6 +951,11 @@ impl AcpThread {
         Ok(())
     }
 
+    pub fn update_token_usage(&mut self, usage: Option<TokenUsage>, cx: &mut Context<Self>) {
+        self.token_usage = usage;
+        cx.emit(AcpThreadEvent::TokenUsageUpdated);
+    }
+
     pub fn update_retry_status(&mut self, status: RetryStatus, cx: &mut Context<Self>) {
         cx.emit(AcpThreadEvent::Retry(status));
     }
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index b09f383029..8cae975ce5 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -10,7 +10,7 @@ use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
 use ui::{App, IconName};
 use uuid::Uuid;
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 pub struct UserMessageId(Arc<str>);
 
 impl UserMessageId {
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 890f7e774b..d18773ff7b 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -66,6 +66,7 @@ zstd.workspace = true
 
 [dev-dependencies]
 agent = { workspace = true, "features" = ["test-support"] }
+assistant_context = { workspace = true, "features" = ["test-support"] }
 ctor.workspace = true
 client = { workspace = true, "features" = ["test-support"] }
 clock = { workspace = true, "features" = ["test-support"] }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 48f46a52fc..6303144d96 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1,8 +1,8 @@
+use crate::HistoryStore;
 use crate::{
-    ContextServerRegistry, Thread, ThreadEvent, ToolCallAuthorization, UserMessageContent,
-    templates::Templates,
+    ContextServerRegistry, Thread, ThreadEvent, ThreadsDatabase, ToolCallAuthorization,
+    UserMessageContent, templates::Templates,
 };
-use crate::{HistoryStore, ThreadsDatabase};
 use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
@@ -673,6 +673,11 @@ impl NativeAgentConnection {
                                     thread.update_tool_call(update, cx)
                                 })??;
                             }
+                            ThreadEvent::TokenUsageUpdate(usage) => {
+                                acp_thread.update(cx, |thread, cx| {
+                                    thread.update_token_usage(Some(usage), cx)
+                                })?;
+                            }
                             ThreadEvent::TitleUpdate(title) => {
                                 acp_thread
                                     .update(cx, |thread, cx| thread.update_title(title, cx))??;
@@ -895,10 +900,12 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         cx: &mut App,
     ) -> Option<Rc<dyn acp_thread::AgentSessionEditor>> {
         self.0.update(cx, |agent, _cx| {
-            agent
-                .sessions
-                .get(session_id)
-                .map(|session| Rc::new(NativeAgentSessionEditor(session.thread.clone())) as _)
+            agent.sessions.get(session_id).map(|session| {
+                Rc::new(NativeAgentSessionEditor {
+                    thread: session.thread.clone(),
+                    acp_thread: session.acp_thread.clone(),
+                }) as _
+            })
         })
     }
 
@@ -907,14 +914,27 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
     }
 }
 
-struct NativeAgentSessionEditor(Entity<Thread>);
+struct NativeAgentSessionEditor {
+    thread: Entity<Thread>,
+    acp_thread: WeakEntity<AcpThread>,
+}
 
 impl acp_thread::AgentSessionEditor for NativeAgentSessionEditor {
     fn truncate(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
-        Task::ready(
-            self.0
-                .update(cx, |thread, cx| thread.truncate(message_id, cx)),
-        )
+        match self.thread.update(cx, |thread, cx| {
+            thread.truncate(message_id.clone(), cx)?;
+            Ok(thread.latest_token_usage())
+        }) {
+            Ok(usage) => {
+                self.acp_thread
+                    .update(cx, |thread, cx| {
+                        thread.update_token_usage(usage, cx);
+                    })
+                    .ok();
+                Task::ready(Ok(()))
+            }
+            Err(error) => Task::ready(Err(error)),
+        }
     }
 }
 
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index 27a109c573..610a2575c4 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -1,4 +1,5 @@
 use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
+use acp_thread::UserMessageId;
 use agent::thread_store;
 use agent_client_protocol as acp;
 use agent_settings::{AgentProfileId, CompletionMode};
@@ -42,7 +43,7 @@ pub struct DbThread {
     #[serde(default)]
     pub cumulative_token_usage: language_model::TokenUsage,
     #[serde(default)]
-    pub request_token_usage: Vec<language_model::TokenUsage>,
+    pub request_token_usage: HashMap<acp_thread::UserMessageId, language_model::TokenUsage>,
     #[serde(default)]
     pub model: Option<DbLanguageModel>,
     #[serde(default)]
@@ -67,7 +68,10 @@ impl DbThread {
 
     fn upgrade_from_agent_1(thread: agent::SerializedThread) -> Result<Self> {
         let mut messages = Vec::new();
-        for msg in thread.messages {
+        let mut request_token_usage = HashMap::default();
+
+        let mut last_user_message_id = None;
+        for (ix, msg) in thread.messages.into_iter().enumerate() {
             let message = match msg.role {
                 language_model::Role::User => {
                     let mut content = Vec::new();
@@ -93,9 +97,12 @@ impl DbThread {
                         content.push(UserMessageContent::Text(msg.context));
                     }
 
+                    let id = UserMessageId::new();
+                    last_user_message_id = Some(id.clone());
+
                     crate::Message::User(UserMessage {
                         // MessageId from old format can't be meaningfully converted, so generate a new one
-                        id: acp_thread::UserMessageId::new(),
+                        id,
                         content,
                     })
                 }
@@ -154,6 +161,12 @@ impl DbThread {
                         );
                     }
 
+                    if let Some(last_user_message_id) = &last_user_message_id
+                        && let Some(token_usage) = thread.request_token_usage.get(ix).copied()
+                    {
+                        request_token_usage.insert(last_user_message_id.clone(), token_usage);
+                    }
+
                     crate::Message::Agent(AgentMessage {
                         content,
                         tool_results,
@@ -175,7 +188,7 @@ impl DbThread {
             summary: thread.detailed_summary_state,
             initial_project_snapshot: thread.initial_project_snapshot,
             cumulative_token_usage: thread.cumulative_token_usage,
-            request_token_usage: thread.request_token_usage,
+            request_token_usage,
             model: thread.model,
             completion_mode: thread.completion_mode,
             profile: thread.profile,
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 7fa12e5711..d07ca42d3b 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1117,7 +1117,7 @@ async fn test_refusal(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-async fn test_truncate(cx: &mut TestAppContext) {
+async fn test_truncate_first_message(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
 
@@ -1137,9 +1137,18 @@ async fn test_truncate(cx: &mut TestAppContext) {
                 Hello
             "}
         );
+        assert_eq!(thread.latest_token_usage(), None);
     });
 
     fake_model.send_last_completion_stream_text_chunk("Hey!");
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+        language_model::TokenUsage {
+            input_tokens: 32_000,
+            output_tokens: 16_000,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+        },
+    ));
     cx.run_until_parked();
     thread.read_with(cx, |thread, _| {
         assert_eq!(
@@ -1154,6 +1163,13 @@ async fn test_truncate(cx: &mut TestAppContext) {
                 Hey!
             "}
         );
+        assert_eq!(
+            thread.latest_token_usage(),
+            Some(acp_thread::TokenUsage {
+                used_tokens: 32_000 + 16_000,
+                max_tokens: 1_000_000,
+            })
+        );
     });
 
     thread
@@ -1162,6 +1178,7 @@ async fn test_truncate(cx: &mut TestAppContext) {
     cx.run_until_parked();
     thread.read_with(cx, |thread, _| {
         assert_eq!(thread.to_markdown(), "");
+        assert_eq!(thread.latest_token_usage(), None);
     });
 
     // Ensure we can still send a new message after truncation.
@@ -1182,6 +1199,14 @@ async fn test_truncate(cx: &mut TestAppContext) {
     });
     cx.run_until_parked();
     fake_model.send_last_completion_stream_text_chunk("Ahoy!");
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+        language_model::TokenUsage {
+            input_tokens: 40_000,
+            output_tokens: 20_000,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+        },
+    ));
     cx.run_until_parked();
     thread.read_with(cx, |thread, _| {
         assert_eq!(
@@ -1196,9 +1221,126 @@ async fn test_truncate(cx: &mut TestAppContext) {
                 Ahoy!
             "}
         );
+
+        assert_eq!(
+            thread.latest_token_usage(),
+            Some(acp_thread::TokenUsage {
+                used_tokens: 40_000 + 20_000,
+                max_tokens: 1_000_000,
+            })
+        );
     });
 }
 
+#[gpui::test]
+async fn test_truncate_second_message(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Message 1"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Message 1 response");
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+        language_model::TokenUsage {
+            input_tokens: 32_000,
+            output_tokens: 16_000,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    let assert_first_message_state = |cx: &mut TestAppContext| {
+        thread.clone().read_with(cx, |thread, _| {
+            assert_eq!(
+                thread.to_markdown(),
+                indoc! {"
+                    ## User
+
+                    Message 1
+
+                    ## Assistant
+
+                    Message 1 response
+                "}
+            );
+
+            assert_eq!(
+                thread.latest_token_usage(),
+                Some(acp_thread::TokenUsage {
+                    used_tokens: 32_000 + 16_000,
+                    max_tokens: 1_000_000,
+                })
+            );
+        });
+    };
+
+    assert_first_message_state(cx);
+
+    let second_message_id = UserMessageId::new();
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(second_message_id.clone(), ["Message 2"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    fake_model.send_last_completion_stream_text_chunk("Message 2 response");
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+        language_model::TokenUsage {
+            input_tokens: 40_000,
+            output_tokens: 20_000,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    thread.read_with(cx, |thread, _| {
+        assert_eq!(
+            thread.to_markdown(),
+            indoc! {"
+                ## User
+
+                Message 1
+
+                ## Assistant
+
+                Message 1 response
+
+                ## User
+
+                Message 2
+
+                ## Assistant
+
+                Message 2 response
+            "}
+        );
+
+        assert_eq!(
+            thread.latest_token_usage(),
+            Some(acp_thread::TokenUsage {
+                used_tokens: 40_000 + 20_000,
+                max_tokens: 1_000_000,
+            })
+        );
+    });
+
+    thread
+        .update(cx, |thread, cx| thread.truncate(second_message_id, cx))
+        .unwrap();
+    cx.run_until_parked();
+
+    assert_first_message_state(cx);
+}
+
 #[gpui::test]
 async fn test_title_generation(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index ba5cd1f477..4bc45f1544 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -13,7 +13,7 @@ use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
 use chrono::{DateTime, Utc};
 use cloud_llm_client::{CompletionIntent, CompletionRequestStatus};
-use collections::IndexMap;
+use collections::{HashMap, IndexMap};
 use fs::Fs;
 use futures::{
     FutureExt,
@@ -24,8 +24,8 @@ use futures::{
 use git::repository::DiffType;
 use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
 use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelImage,
-    LanguageModelProviderId, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelExt,
+    LanguageModelImage, LanguageModelProviderId, LanguageModelRegistry, LanguageModelRequest,
     LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
     LanguageModelToolResultContent, LanguageModelToolSchemaFormat, LanguageModelToolUse,
     LanguageModelToolUseId, Role, SelectedModel, StopReason, TokenUsage,
@@ -481,6 +481,7 @@ pub enum ThreadEvent {
     ToolCall(acp::ToolCall),
     ToolCallUpdate(acp_thread::ToolCallUpdate),
     ToolCallAuthorization(ToolCallAuthorization),
+    TokenUsageUpdate(acp_thread::TokenUsage),
     TitleUpdate(SharedString),
     Retry(acp_thread::RetryStatus),
     Stop(acp::StopReason),
@@ -509,8 +510,7 @@ pub struct Thread {
     pending_message: Option<AgentMessage>,
     tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
     tool_use_limit_reached: bool,
-    #[allow(unused)]
-    request_token_usage: Vec<TokenUsage>,
+    request_token_usage: HashMap<UserMessageId, language_model::TokenUsage>,
     #[allow(unused)]
     cumulative_token_usage: TokenUsage,
     #[allow(unused)]
@@ -548,7 +548,7 @@ impl Thread {
             pending_message: None,
             tools: BTreeMap::default(),
             tool_use_limit_reached: false,
-            request_token_usage: Vec::new(),
+            request_token_usage: HashMap::default(),
             cumulative_token_usage: TokenUsage::default(),
             initial_project_snapshot: {
                 let project_snapshot = Self::project_snapshot(project.clone(), cx);
@@ -951,6 +951,15 @@ impl Thread {
         self.flush_pending_message(cx);
     }
 
+    pub fn update_token_usage(&mut self, update: language_model::TokenUsage) {
+        let Some(last_user_message) = self.last_user_message() else {
+            return;
+        };
+
+        self.request_token_usage
+            .insert(last_user_message.id.clone(), update);
+    }
+
     pub fn truncate(&mut self, message_id: UserMessageId, cx: &mut Context<Self>) -> Result<()> {
         self.cancel(cx);
         let Some(position) = self.messages.iter().position(
@@ -958,11 +967,31 @@ impl Thread {
         ) else {
             return Err(anyhow!("Message not found"));
         };
-        self.messages.truncate(position);
+
+        for message in self.messages.drain(position..) {
+            match message {
+                Message::User(message) => {
+                    self.request_token_usage.remove(&message.id);
+                }
+                Message::Agent(_) | Message::Resume => {}
+            }
+        }
+
         cx.notify();
         Ok(())
     }
 
+    pub fn latest_token_usage(&self) -> Option<acp_thread::TokenUsage> {
+        let last_user_message = self.last_user_message()?;
+        let tokens = self.request_token_usage.get(&last_user_message.id)?;
+        let model = self.model.clone()?;
+
+        Some(acp_thread::TokenUsage {
+            max_tokens: model.max_token_count_for_mode(self.completion_mode.into()),
+            used_tokens: tokens.total_tokens(),
+        })
+    }
+
     pub fn resume(
         &mut self,
         cx: &mut Context<Self>,
@@ -1148,6 +1177,21 @@ impl Thread {
                     )) => {
                         *tool_use_limit_reached = true;
                     }
+                    Ok(LanguageModelCompletionEvent::UsageUpdate(token_usage)) => {
+                        let usage = acp_thread::TokenUsage {
+                            max_tokens: model.max_token_count_for_mode(
+                                request
+                                    .mode
+                                    .unwrap_or(cloud_llm_client::CompletionMode::Normal),
+                            ),
+                            used_tokens: token_usage.total_tokens(),
+                        };
+
+                        this.update(cx, |this, _cx| this.update_token_usage(token_usage))
+                            .ok();
+
+                        event_stream.send_token_usage_update(usage);
+                    }
                     Ok(LanguageModelCompletionEvent::Stop(StopReason::Refusal)) => {
                         *refusal = true;
                         return Ok(FuturesUnordered::default());
@@ -1532,6 +1576,16 @@ impl Thread {
             })
         }))
     }
+    fn last_user_message(&self) -> Option<&UserMessage> {
+        self.messages
+            .iter()
+            .rev()
+            .find_map(|message| match message {
+                Message::User(user_message) => Some(user_message),
+                Message::Agent(_) => None,
+                Message::Resume => None,
+            })
+    }
 
     fn pending_message(&mut self) -> &mut AgentMessage {
         self.pending_message.get_or_insert_default()
@@ -2051,6 +2105,12 @@ impl ThreadEventStream {
             .ok();
     }
 
+    fn send_token_usage_update(&self, usage: acp_thread::TokenUsage) {
+        self.0
+            .unbounded_send(Ok(ThreadEvent::TokenUsageUpdate(usage)))
+            .ok();
+    }
+
     fn send_retry(&self, status: acp_thread::RetryStatus) {
         self.0.unbounded_send(Ok(ThreadEvent::Retry(status))).ok();
     }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 9f1e8d857f..878891c6f1 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -816,7 +816,7 @@ impl AcpThreadView {
                 self.thread_retry_status.take();
                 self.thread_state = ThreadState::ServerExited { status: *status };
             }
-            AcpThreadEvent::TitleUpdated => {}
+            AcpThreadEvent::TitleUpdated | AcpThreadEvent::TokenUsageUpdated => {}
         }
         cx.notify();
     }
@@ -2794,6 +2794,7 @@ impl AcpThreadView {
                     .child(
                         h_flex()
                             .gap_1()
+                            .children(self.render_token_usage(cx))
                             .children(self.profile_selector.clone())
                             .children(self.model_selector.clone())
                             .child(self.render_send_button(cx)),
@@ -2816,6 +2817,44 @@ impl AcpThreadView {
             .thread(acp_thread.session_id(), cx)
     }
 
+    fn render_token_usage(&self, cx: &mut Context<Self>) -> Option<Div> {
+        let thread = self.thread()?.read(cx);
+        let usage = thread.token_usage()?;
+        let is_generating = thread.status() != ThreadStatus::Idle;
+
+        let used = crate::text_thread_editor::humanize_token_count(usage.used_tokens);
+        let max = crate::text_thread_editor::humanize_token_count(usage.max_tokens);
+
+        Some(
+            h_flex()
+                .flex_shrink_0()
+                .gap_0p5()
+                .mr_1()
+                .child(
+                    Label::new(used)
+                        .size(LabelSize::Small)
+                        .color(Color::Muted)
+                        .map(|label| {
+                            if is_generating {
+                                label
+                                    .with_animation(
+                                        "used-tokens-label",
+                                        Animation::new(Duration::from_secs(2))
+                                            .repeat()
+                                            .with_easing(pulsating_between(0.6, 1.)),
+                                        |label, delta| label.alpha(delta),
+                                    )
+                                    .into_any()
+                            } else {
+                                label.into_any_element()
+                            }
+                        }),
+                )
+                .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
+                .child(Label::new(max).size(LabelSize::Small).color(Color::Muted)),
+        )
+    }
+
     fn toggle_burn_mode(
         &mut self,
         _: &ToggleBurnMode,
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 9d2ee0bf89..a695136562 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1526,6 +1526,7 @@ impl AgentDiff {
                 self.update_reviewing_editors(workspace, window, cx);
             }
             AcpThreadEvent::TitleUpdated
+            | AcpThreadEvent::TokenUsageUpdated
             | AcpThreadEvent::EntriesRemoved(_)
             | AcpThreadEvent::ToolAuthorizationRequired
             | AcpThreadEvent::Retry(_) => {}

From 88c4a5ca49799637b7cc790771de65bd9b4b5253 Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Tue, 19 Aug 2025 16:31:13 -0500
Subject: [PATCH 179/823] Suspend macOS threads during crashes (#36520)

This should improve our detection of which thread crashed since they
wont be able to resume while the minidump is being generated.

Release Notes:

- N/A
---
 Cargo.lock                    | 20 +++++++++++++++-----
 Cargo.toml                    |  1 +
 crates/crashes/Cargo.toml     |  3 +++
 crates/crashes/src/crashes.rs | 20 ++++++++++++++++++++
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4a5dec4734..d1f4b22e9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3872,7 +3872,7 @@ dependencies = [
  "jni",
  "js-sys",
  "libc",
- "mach2",
+ "mach2 0.4.2",
  "ndk",
  "ndk-context",
  "num-derive",
@@ -4022,7 +4022,7 @@ checksum = "031ed29858d90cfdf27fe49fae28028a1f20466db97962fa2f4ea34809aeebf3"
 dependencies = [
  "cfg-if",
  "libc",
- "mach2",
+ "mach2 0.4.2",
 ]
 
 [[package]]
@@ -4034,7 +4034,7 @@ dependencies = [
  "cfg-if",
  "crash-context",
  "libc",
- "mach2",
+ "mach2 0.4.2",
  "parking_lot",
 ]
 
@@ -4044,6 +4044,7 @@ version = "0.1.0"
 dependencies = [
  "crash-handler",
  "log",
+ "mach2 0.5.0",
  "minidumper",
  "paths",
  "release_channel",
@@ -9866,6 +9867,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -10202,7 +10212,7 @@ dependencies = [
  "goblin",
  "libc",
  "log",
- "mach2",
+ "mach2 0.4.2",
  "memmap2",
  "memoffset",
  "minidump-common",
@@ -18292,7 +18302,7 @@ dependencies = [
  "indexmap",
  "libc",
  "log",
- "mach2",
+ "mach2 0.4.2",
  "memfd",
  "object",
  "once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index ad45def2d4..dc14c8ebd9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -515,6 +515,7 @@ libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "39f629bdd03d59abd786ed9fc27e8bca02c0c0ec" }
+mach2 = "0.5"
 markup5ever_rcdom = "0.3.0"
 metal = "0.29"
 minidumper = "0.8"
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index 2420b499f8..f12913d1cb 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -16,6 +16,9 @@ serde.workspace = true
 serde_json.workspace = true
 workspace-hack.workspace = true
 
+[target.'cfg(target_os = "macos")'.dependencies]
+mach2.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index ddf6468be8..12997f51a3 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -74,6 +74,9 @@ pub async fn init(crash_init: InitCrashHandler) {
                 .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
                 .is_ok()
             {
+                #[cfg(target_os = "macos")]
+                suspend_all_other_threads();
+
                 client.ping().unwrap();
                 client.request_dump(crash_context).is_ok()
             } else {
@@ -98,6 +101,23 @@ pub async fn init(crash_init: InitCrashHandler) {
     }
 }
 
+#[cfg(target_os = "macos")]
+unsafe fn suspend_all_other_threads() {
+    let task = unsafe { mach2::traps::current_task() };
+    let mut threads: mach2::mach_types::thread_act_array_t = std::ptr::null_mut();
+    let mut count = 0;
+    unsafe {
+        mach2::task::task_threads(task, &raw mut threads, &raw mut count);
+    }
+    let current = unsafe { mach2::mach_init::mach_thread_self() };
+    for i in 0..count {
+        let t = unsafe { *threads.add(i as usize) };
+        if t != current {
+            unsafe { mach2::thread_act::thread_suspend(t) };
+        }
+    }
+}
+
 pub struct CrashServer {
     initialization_params: OnceLock<InitCrashHandler>,
     panic_info: OnceLock<CrashPanic>,

From 88754a70f7f2a566daf26980ed177d8c0e3b3240 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 19 Aug 2025 16:26:30 -0600
Subject: [PATCH 180/823] Rebuild recently opened threads for ACP (#36531)

Closes #ISSUE

Release Notes:

- N/A
---
 Cargo.lock                             |   1 +
 crates/agent2/Cargo.toml               |   1 +
 crates/agent2/src/agent.rs             |   6 +-
 crates/agent2/src/history_store.rs     | 102 +++++++++++++------------
 crates/agent2/src/tests/mod.rs         |   2 +-
 crates/agent_ui/src/acp/thread_view.rs |  39 ++++++++--
 crates/agent_ui/src/agent_panel.rs     |  21 +++--
 7 files changed, 109 insertions(+), 63 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1f4b22e9d..34a8ceac49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -206,6 +206,7 @@ dependencies = [
  "collections",
  "context_server",
  "ctor",
+ "db",
  "editor",
  "env_logger 0.11.8",
  "fs",
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index d18773ff7b..849ea041e9 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -26,6 +26,7 @@ chrono.workspace = true
 cloud_llm_client.workspace = true
 collections.workspace = true
 context_server.workspace = true
+db.workspace = true
 fs.workspace = true
 futures.workspace = true
 git.workspace = true
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 6303144d96..212460d690 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -974,7 +974,7 @@ mod tests {
         .await;
         let project = Project::test(fs.clone(), [], cx).await;
         let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
         let agent = NativeAgent::new(
             project.clone(),
             history_store,
@@ -1032,7 +1032,7 @@ mod tests {
         fs.insert_tree("/", json!({ "a": {}  })).await;
         let project = Project::test(fs.clone(), [], cx).await;
         let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
         let connection = NativeAgentConnection(
             NativeAgent::new(
                 project.clone(),
@@ -1088,7 +1088,7 @@ mod tests {
         let project = Project::test(fs.clone(), [], cx).await;
 
         let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
 
         // Create the agent and connection
         let agent = NativeAgent::new(
diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 34a5e7b4ef..4ce304ae5f 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -3,6 +3,7 @@ use agent_client_protocol as acp;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_context::SavedContextMetadata;
 use chrono::{DateTime, Utc};
+use db::kvp::KEY_VALUE_STORE;
 use gpui::{App, AsyncApp, Entity, SharedString, Task, prelude::*};
 use itertools::Itertools;
 use paths::contexts_dir;
@@ -11,7 +12,7 @@ use std::{collections::VecDeque, path::Path, sync::Arc, time::Duration};
 use util::ResultExt as _;
 
 const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
-const NAVIGATION_HISTORY_PATH: &str = "agent-navigation-history.json";
+const RECENTLY_OPENED_THREADS_KEY: &str = "recent-agent-threads";
 const SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE: Duration = Duration::from_millis(50);
 
 const DEFAULT_TITLE: &SharedString = &SharedString::new_static("New Thread");
@@ -53,12 +54,10 @@ pub enum HistoryEntryId {
     TextThread(Arc<Path>),
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 enum SerializedRecentOpen {
-    Thread(String),
-    ContextName(String),
-    /// Old format which stores the full path
-    Context(String),
+    AcpThread(String),
+    TextThread(String),
 }
 
 pub struct HistoryStore {
@@ -72,29 +71,26 @@ pub struct HistoryStore {
 impl HistoryStore {
     pub fn new(
         context_store: Entity<assistant_context::ContextStore>,
-        initial_recent_entries: impl IntoIterator<Item = HistoryEntryId>,
         cx: &mut Context<Self>,
     ) -> Self {
         let subscriptions = vec![cx.observe(&context_store, |_, _, cx| cx.notify())];
 
         cx.spawn(async move |this, cx| {
-            let entries = Self::load_recently_opened_entries(cx).await.log_err()?;
-            this.update(cx, |this, _| {
-                this.recently_opened_entries
-                    .extend(
-                        entries.into_iter().take(
-                            MAX_RECENTLY_OPENED_ENTRIES
-                                .saturating_sub(this.recently_opened_entries.len()),
-                        ),
-                    );
+            let entries = Self::load_recently_opened_entries(cx).await;
+            this.update(cx, |this, cx| {
+                if let Some(entries) = entries.log_err() {
+                    this.recently_opened_entries = entries;
+                }
+
+                this.reload(cx);
             })
-            .ok()
+            .ok();
         })
         .detach();
 
         Self {
             context_store,
-            recently_opened_entries: initial_recent_entries.into_iter().collect(),
+            recently_opened_entries: VecDeque::default(),
             threads: Vec::default(),
             _subscriptions: subscriptions,
             _save_recently_opened_entries_task: Task::ready(()),
@@ -134,6 +130,18 @@ impl HistoryStore {
                 .await?;
 
             this.update(cx, |this, cx| {
+                if this.recently_opened_entries.len() < MAX_RECENTLY_OPENED_ENTRIES {
+                    for thread in threads
+                        .iter()
+                        .take(MAX_RECENTLY_OPENED_ENTRIES - this.recently_opened_entries.len())
+                        .rev()
+                    {
+                        this.push_recently_opened_entry(
+                            HistoryEntryId::AcpThread(thread.id.clone()),
+                            cx,
+                        )
+                    }
+                }
                 this.threads = threads;
                 cx.notify();
             })
@@ -162,6 +170,16 @@ impl HistoryStore {
         history_entries
     }
 
+    pub fn is_empty(&self, cx: &App) -> bool {
+        self.threads.is_empty()
+            && self
+                .context_store
+                .read(cx)
+                .unordered_contexts()
+                .next()
+                .is_none()
+    }
+
     pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
         self.entries(cx).into_iter().take(limit).collect()
     }
@@ -215,58 +233,44 @@ impl HistoryStore {
             .iter()
             .filter_map(|entry| match entry {
                 HistoryEntryId::TextThread(path) => path.file_name().map(|file| {
-                    SerializedRecentOpen::ContextName(file.to_string_lossy().to_string())
+                    SerializedRecentOpen::TextThread(file.to_string_lossy().to_string())
                 }),
-                HistoryEntryId::AcpThread(id) => Some(SerializedRecentOpen::Thread(id.to_string())),
+                HistoryEntryId::AcpThread(id) => {
+                    Some(SerializedRecentOpen::AcpThread(id.to_string()))
+                }
             })
             .collect::<Vec<_>>();
 
         self._save_recently_opened_entries_task = cx.spawn(async move |_, cx| {
+            let content = serde_json::to_string(&serialized_entries).unwrap();
             cx.background_executor()
                 .timer(SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE)
                 .await;
-            cx.background_spawn(async move {
-                let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
-                let content = serde_json::to_string(&serialized_entries)?;
-                std::fs::write(path, content)?;
-                anyhow::Ok(())
-            })
-            .await
-            .log_err();
+            KEY_VALUE_STORE
+                .write_kvp(RECENTLY_OPENED_THREADS_KEY.to_owned(), content)
+                .await
+                .log_err();
         });
     }
 
-    fn load_recently_opened_entries(cx: &AsyncApp) -> Task<Result<Vec<HistoryEntryId>>> {
+    fn load_recently_opened_entries(cx: &AsyncApp) -> Task<Result<VecDeque<HistoryEntryId>>> {
         cx.background_spawn(async move {
-            let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
-            let contents = match smol::fs::read_to_string(path).await {
-                Ok(it) => it,
-                Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
-                    return Ok(Vec::new());
-                }
-                Err(e) => {
-                    return Err(e)
-                        .context("deserializing persisted agent panel navigation history");
-                }
-            };
-            let entries = serde_json::from_str::<Vec<SerializedRecentOpen>>(&contents)
+            let json = KEY_VALUE_STORE
+                .read_kvp(RECENTLY_OPENED_THREADS_KEY)?
+                .unwrap_or("[]".to_string());
+            let entries = serde_json::from_str::<Vec<SerializedRecentOpen>>(&json)
                 .context("deserializing persisted agent panel navigation history")?
                 .into_iter()
                 .take(MAX_RECENTLY_OPENED_ENTRIES)
                 .flat_map(|entry| match entry {
-                    SerializedRecentOpen::Thread(id) => Some(HistoryEntryId::AcpThread(
+                    SerializedRecentOpen::AcpThread(id) => Some(HistoryEntryId::AcpThread(
                         acp::SessionId(id.as_str().into()),
                     )),
-                    SerializedRecentOpen::ContextName(file_name) => Some(
+                    SerializedRecentOpen::TextThread(file_name) => Some(
                         HistoryEntryId::TextThread(contexts_dir().join(file_name).into()),
                     ),
-                    SerializedRecentOpen::Context(path) => {
-                        Path::new(&path).file_name().map(|file_name| {
-                            HistoryEntryId::TextThread(contexts_dir().join(file_name).into())
-                        })
-                    }
                 })
-                .collect::<Vec<_>>();
+                .collect();
             Ok(entries)
         })
     }
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index d07ca42d3b..55bfa6f0b5 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1414,7 +1414,7 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
     let project = Project::test(fake_fs.clone(), [Path::new("/test")], cx).await;
     let cwd = Path::new("/test");
     let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
-    let history_store = cx.new(|cx| HistoryStore::new(context_store, [], cx));
+    let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
 
     // Create agent and connection
     let agent = NativeAgent::new(
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 878891c6f1..5e5d4bb83c 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -9,7 +9,7 @@ use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol::{self as acp};
 use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
-use agent2::DbThreadMetadata;
+use agent2::{DbThreadMetadata, HistoryEntryId, HistoryStore};
 use anyhow::bail;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -111,6 +111,7 @@ pub struct AcpThreadView {
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
     thread_state: ThreadState,
+    history_store: Entity<HistoryStore>,
     entry_view_state: Entity<EntryViewState>,
     message_editor: Entity<MessageEditor>,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
@@ -159,6 +160,7 @@ impl AcpThreadView {
         resume_thread: Option<DbThreadMetadata>,
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
+        history_store: Entity<HistoryStore>,
         thread_store: Entity<ThreadStore>,
         text_thread_store: Entity<TextThreadStore>,
         window: &mut Window,
@@ -223,6 +225,7 @@ impl AcpThreadView {
             plan_expanded: false,
             editor_expanded: false,
             terminal_expanded: true,
+            history_store,
             _subscriptions: subscriptions,
             _cancel_task: None,
         }
@@ -260,7 +263,7 @@ impl AcpThreadView {
             let result = if let Some(native_agent) = connection
                 .clone()
                 .downcast::<agent2::NativeAgentConnection>()
-                && let Some(resume) = resume_thread
+                && let Some(resume) = resume_thread.clone()
             {
                 cx.update(|_, cx| {
                     native_agent
@@ -313,6 +316,15 @@ impl AcpThreadView {
                             }
                         });
 
+                        if let Some(resume) = resume_thread {
+                            this.history_store.update(cx, |history, cx| {
+                                history.push_recently_opened_entry(
+                                    HistoryEntryId::AcpThread(resume.id),
+                                    cx,
+                                );
+                            });
+                        }
+
                         AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
 
                         this.model_selector =
@@ -555,9 +567,15 @@ impl AcpThreadView {
     }
 
     fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(thread) = self.thread()
-            && thread.read(cx).status() != ThreadStatus::Idle
-        {
+        let Some(thread) = self.thread() else { return };
+        self.history_store.update(cx, |history, cx| {
+            history.push_recently_opened_entry(
+                HistoryEntryId::AcpThread(thread.read(cx).session_id().clone()),
+                cx,
+            );
+        });
+
+        if thread.read(cx).status() != ThreadStatus::Idle {
             self.stop_current_and_send_new_message(window, cx);
             return;
         }
@@ -3942,6 +3960,7 @@ pub(crate) mod tests {
     use acp_thread::StubAgentConnection;
     use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol::SessionId;
+    use assistant_context::ContextStore;
     use editor::EditorSettings;
     use fs::FakeFs;
     use gpui::{EventEmitter, SemanticVersion, TestAppContext, VisualTestContext};
@@ -4079,6 +4098,10 @@ pub(crate) mod tests {
             cx.update(|_window, cx| cx.new(|cx| ThreadStore::fake(project.clone(), cx)));
         let text_thread_store =
             cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
+        let context_store =
+            cx.update(|_window, cx| cx.new(|cx| ContextStore::fake(project.clone(), cx)));
+        let history_store =
+            cx.update(|_window, cx| cx.new(|cx| HistoryStore::new(context_store, cx)));
 
         let thread_view = cx.update(|window, cx| {
             cx.new(|cx| {
@@ -4087,6 +4110,7 @@ pub(crate) mod tests {
                     None,
                     workspace.downgrade(),
                     project,
+                    history_store,
                     thread_store.clone(),
                     text_thread_store.clone(),
                     window,
@@ -4283,6 +4307,10 @@ pub(crate) mod tests {
             cx.update(|_window, cx| cx.new(|cx| ThreadStore::fake(project.clone(), cx)));
         let text_thread_store =
             cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
+        let context_store =
+            cx.update(|_window, cx| cx.new(|cx| ContextStore::fake(project.clone(), cx)));
+        let history_store =
+            cx.update(|_window, cx| cx.new(|cx| HistoryStore::new(context_store, cx)));
 
         let connection = Rc::new(StubAgentConnection::new());
         let thread_view = cx.update(|window, cx| {
@@ -4292,6 +4320,7 @@ pub(crate) mod tests {
                     None,
                     workspace.downgrade(),
                     project.clone(),
+                    history_store.clone(),
                     thread_store.clone(),
                     text_thread_store.clone(),
                     window,
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index c5cab34030..0310ae7c80 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -648,8 +648,7 @@ impl AgentPanel {
             )
         });
 
-        let acp_history_store =
-            cx.new(|cx| agent2::HistoryStore::new(context_store.clone(), [], cx));
+        let acp_history_store = cx.new(|cx| agent2::HistoryStore::new(context_store.clone(), cx));
         let acp_history = cx.new(|cx| AcpThreadHistory::new(acp_history_store.clone(), window, cx));
         cx.subscribe_in(
             &acp_history,
@@ -1073,6 +1072,7 @@ impl AgentPanel {
                         resume_thread,
                         workspace.clone(),
                         project,
+                        this.acp_history_store.clone(),
                         thread_store.clone(),
                         text_thread_store.clone(),
                         window,
@@ -1609,6 +1609,14 @@ impl AgentPanel {
                     if let Some(path) = context_editor.read(cx).context().read(cx).path() {
                         store.push_recently_opened_entry(HistoryEntryId::Context(path.clone()), cx)
                     }
+                });
+                self.acp_history_store.update(cx, |store, cx| {
+                    if let Some(path) = context_editor.read(cx).context().read(cx).path() {
+                        store.push_recently_opened_entry(
+                            agent2::HistoryEntryId::TextThread(path.clone()),
+                            cx,
+                        )
+                    }
                 })
             }
             ActiveView::ExternalAgentThread { .. } => {}
@@ -2763,9 +2771,12 @@ impl AgentPanel {
                 false
             }
             _ => {
-                let history_is_empty = self
-                    .history_store
-                    .update(cx, |store, cx| store.recent_entries(1, cx).is_empty());
+                let history_is_empty = if cx.has_flag::<AcpFeatureFlag>() {
+                    self.acp_history_store.read(cx).is_empty(cx)
+                } else {
+                    self.history_store
+                        .update(cx, |store, cx| store.recent_entries(1, cx).is_empty())
+                };
 
                 let has_configured_non_zed_providers = LanguageModelRegistry::read_global(cx)
                     .providers()

From ecee6746ecada543ae89d37ff3882a38dd555cae Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Tue, 19 Aug 2025 17:37:39 -0500
Subject: [PATCH 181/823] Attach minidump errors to uploaded crash events
 (#36527)

We see a bunch of crash events with truncated minidumps where they have
a valid header but no events. We think this is due to an issue
generating them, so we're attaching the relevant result to the uploaded
tags.

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
---
 crates/crashes/src/crashes.rs | 12 ++++++------
 crates/zed/src/reliability.rs |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index 12997f51a3..4e4b69f639 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -128,6 +128,7 @@ pub struct CrashServer {
 pub struct CrashInfo {
     pub init: InitCrashHandler,
     pub panic: Option<CrashPanic>,
+    pub minidump_error: Option<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
@@ -162,16 +163,14 @@ impl minidumper::ServerHandler for CrashServer {
     }
 
     fn on_minidump_created(&self, result: Result<MinidumpBinary, minidumper::Error>) -> LoopAction {
-        match result {
+        let minidump_error = match result {
             Ok(mut md_bin) => {
                 use io::Write;
                 let _ = md_bin.file.flush();
-                info!("wrote minidump to disk {:?}", md_bin.path);
+                None
             }
-            Err(e) => {
-                info!("failed to write minidump: {:#}", e);
-            }
-        }
+            Err(e) => Some(format!("{e:?}")),
+        };
 
         let crash_info = CrashInfo {
             init: self
@@ -180,6 +179,7 @@ impl minidumper::ServerHandler for CrashServer {
                 .expect("not initialized")
                 .clone(),
             panic: self.panic_info.get().cloned(),
+            minidump_error,
         };
 
         let crash_data_path = paths::logs_dir()
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index cbd31c2e26..f55468280c 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -607,6 +607,9 @@ async fn upload_minidump(
         // TODO: add gpu-context, feature-flag-context, and more of device-context like gpu
         // name, screen resolution, available ram, device model, etc
     }
+    if let Some(minidump_error) = metadata.minidump_error.clone() {
+        form = form.text("minidump_error", minidump_error);
+    }
 
     let mut response_text = String::new();
     let mut response = http.send_multipart_form(endpoint, form).await?;

From 757b37fd41b459988c0741f2d51b1e77d02b9d3f Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 19 Aug 2025 16:42:52 -0600
Subject: [PATCH 182/823] Hide old Agent UI when ACP flag set (#36533)

- **Use key value store instead of JSON**
- **Default NewThread to the native agent when flagged**

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/agent_ui/src/agent_panel.rs | 34 ++++++------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 0310ae7c80..93e9f619af 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -881,6 +881,9 @@ impl AgentPanel {
     }
 
     fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
+        if cx.has_flag::<AcpFeatureFlag>() {
+            return self.new_agent_thread(AgentType::NativeAgent, window, cx);
+        }
         // Preserve chat box text when using creating new thread
         let preserved_text = self
             .active_message_editor()
@@ -2386,9 +2389,9 @@ impl AgentPanel {
                             })
                             .item(
                                 ContextMenuEntry::new("New Thread")
-                                    .icon(IconName::Thread)
-                                    .icon_color(Color::Muted)
                                     .action(NewThread::default().boxed_clone())
+                                    .icon(IconName::ZedAssistant)
+                                    .icon_color(Color::Muted)
                                     .handler({
                                         let workspace = workspace.clone();
                                         move |window, cx| {
@@ -2399,7 +2402,7 @@ impl AgentPanel {
                                                     {
                                                         panel.update(cx, |panel, cx| {
                                                             panel.set_selected_agent(
-                                                                AgentType::Zed,
+                                                                AgentType::NativeAgent,
                                                                 window,
                                                                 cx,
                                                             );
@@ -2436,31 +2439,6 @@ impl AgentPanel {
                                         }
                                     }),
                             )
-                            .item(
-                                ContextMenuEntry::new("New Native Agent Thread")
-                                    .icon(IconName::ZedAssistant)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.set_selected_agent(
-                                                                AgentType::NativeAgent,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
                             .separator()
                             .header("External Agents")
                             .when(cx.has_flag::<AcpFeatureFlag>(), |menu| {

From 82ac8a8aaaac089a9e2d1333108686cf2f11636f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Tue, 19 Aug 2025 20:25:07 -0400
Subject: [PATCH 183/823] collab: Make `stripe_subscription_id` and
 `stripe_subscription_status` nullable on `billing_subscriptions` (#36536)

This PR makes the `stripe_subscription_id` and
`stripe_subscription_status` columns nullable on the
`billing_subscriptions` table.

Release Notes:

- N/A
---
 ...916_make_stripe_fields_optional_on_billing_subscription.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 crates/collab/migrations/20250819225916_make_stripe_fields_optional_on_billing_subscription.sql

diff --git a/crates/collab/migrations/20250819225916_make_stripe_fields_optional_on_billing_subscription.sql b/crates/collab/migrations/20250819225916_make_stripe_fields_optional_on_billing_subscription.sql
new file mode 100644
index 0000000000..cf3b79da60
--- /dev/null
+++ b/crates/collab/migrations/20250819225916_make_stripe_fields_optional_on_billing_subscription.sql
@@ -0,0 +1,3 @@
+alter table billing_subscriptions
+    alter column stripe_subscription_id drop not null,
+    alter column stripe_subscription_status drop not null;

From ce216432be5a967feb0d30ee9878d0cf4fb07cb7 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 19 Aug 2025 17:33:56 -0700
Subject: [PATCH 184/823] Refactor ssh remoting - make ChannelClient type
 private (#36514)

This PR is one step in a series of refactors to prepare for having
"remote" projects that do not use SSH. The main use cases for this are
WSL and dev containers.

Release Notes:

- N/A
---
 crates/editor/src/editor.rs                  |   5 +-
 crates/project/src/project.rs                |  23 +--
 crates/remote/src/ssh_session.rs             | 146 +++++++++----------
 crates/remote_server/src/headless_project.rs |  67 ++++-----
 crates/remote_server/src/unix.rs             |  13 +-
 crates/rpc/src/proto_client.rs               |  19 +++
 crates/tasks_ui/src/tasks_ui.rs              |   6 +-
 7 files changed, 133 insertions(+), 146 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 3805904243..f943e64923 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -14895,10 +14895,7 @@ impl Editor {
             };
 
             let hide_runnables = project
-                .update(cx, |project, cx| {
-                    // Do not display any test indicators in non-dev server remote projects.
-                    project.is_via_collab() && project.ssh_connection_string(cx).is_none()
-                })
+                .update(cx, |project, _| project.is_via_collab())
                 .unwrap_or(true);
             if hide_runnables {
                 return;
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 6712b3fab0..f07ee13866 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1346,14 +1346,13 @@ impl Project {
             };
 
             // ssh -> local machine handlers
-            let ssh = ssh.read(cx);
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &cx.entity());
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &this.buffer_store);
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &this.worktree_store);
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &this.lsp_store);
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &this.dap_store);
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &this.settings_observer);
-            ssh.subscribe_to_entity(SSH_PROJECT_ID, &this.git_store);
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &cx.entity());
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.buffer_store);
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.worktree_store);
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.lsp_store);
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.dap_store);
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.settings_observer);
+            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.git_store);
 
             ssh_proto.add_entity_message_handler(Self::handle_create_buffer_for_peer);
             ssh_proto.add_entity_message_handler(Self::handle_update_worktree);
@@ -1900,14 +1899,6 @@ impl Project {
         false
     }
 
-    pub fn ssh_connection_string(&self, cx: &App) -> Option<SharedString> {
-        if let Some(ssh_state) = &self.ssh_client {
-            return Some(ssh_state.read(cx).connection_string().into());
-        }
-
-        None
-    }
-
     pub fn ssh_connection_state(&self, cx: &App) -> Option<remote::ConnectionState> {
         self.ssh_client
             .as_ref()
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index abde2d7568..ffd0cac310 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -26,8 +26,7 @@ use parking_lot::Mutex;
 
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use rpc::{
-    AnyProtoClient, EntityMessageSubscriber, ErrorExt, ProtoClient, ProtoMessageHandlerSet,
-    RpcError,
+    AnyProtoClient, ErrorExt, ProtoClient, ProtoMessageHandlerSet, RpcError,
     proto::{self, Envelope, EnvelopedMessage, PeerId, RequestMessage, build_typed_envelope},
 };
 use schemars::JsonSchema;
@@ -37,7 +36,6 @@ use smol::{
     process::{self, Child, Stdio},
 };
 use std::{
-    any::TypeId,
     collections::VecDeque,
     fmt, iter,
     ops::ControlFlow,
@@ -664,6 +662,7 @@ impl ConnectionIdentifier {
     pub fn setup() -> Self {
         Self::Setup(NEXT_ID.fetch_add(1, SeqCst))
     }
+
     // This string gets used in a socket name, and so must be relatively short.
     // The total length of:
     //   /home/{username}/.local/share/zed/server_state/{name}/stdout.sock
@@ -760,6 +759,15 @@ impl SshRemoteClient {
         })
     }
 
+    pub fn proto_client_from_channels(
+        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
+        outgoing_tx: mpsc::UnboundedSender<Envelope>,
+        cx: &App,
+        name: &'static str,
+    ) -> AnyProtoClient {
+        ChannelClient::new(incoming_rx, outgoing_tx, cx, name).into()
+    }
+
     pub fn shutdown_processes<T: RequestMessage>(
         &self,
         shutdown_request: Option<T>,
@@ -990,64 +998,63 @@ impl SshRemoteClient {
         };
 
         cx.spawn(async move |cx| {
-                let mut missed_heartbeats = 0;
+            let mut missed_heartbeats = 0;
 
-                let keepalive_timer = cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse();
-                futures::pin_mut!(keepalive_timer);
+            let keepalive_timer = cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse();
+            futures::pin_mut!(keepalive_timer);
 
-                loop {
-                    select_biased! {
-                        result = connection_activity_rx.next().fuse() => {
-                            if result.is_none() {
-                                log::warn!("ssh heartbeat: connection activity channel has been dropped. stopping.");
-                                return Ok(());
-                            }
-
-                            if missed_heartbeats != 0 {
-                                missed_heartbeats = 0;
-                                let _ =this.update(cx, |this, cx| {
-                                    this.handle_heartbeat_result(missed_heartbeats, cx)
-                                })?;
-                            }
+            loop {
+                select_biased! {
+                    result = connection_activity_rx.next().fuse() => {
+                        if result.is_none() {
+                            log::warn!("ssh heartbeat: connection activity channel has been dropped. stopping.");
+                            return Ok(());
                         }
-                        _ = keepalive_timer => {
-                            log::debug!("Sending heartbeat to server...");
 
-                            let result = select_biased! {
-                                _ = connection_activity_rx.next().fuse() => {
-                                    Ok(())
-                                }
-                                ping_result = client.ping(HEARTBEAT_TIMEOUT).fuse() => {
-                                    ping_result
-                                }
-                            };
-
-                            if result.is_err() {
-                                missed_heartbeats += 1;
-                                log::warn!(
-                                    "No heartbeat from server after {:?}. Missed heartbeat {} out of {}.",
-                                    HEARTBEAT_TIMEOUT,
-                                    missed_heartbeats,
-                                    MAX_MISSED_HEARTBEATS
-                                );
-                            } else if missed_heartbeats != 0 {
-                                missed_heartbeats = 0;
-                            } else {
-                                continue;
-                            }
-
-                            let result = this.update(cx, |this, cx| {
+                        if missed_heartbeats != 0 {
+                            missed_heartbeats = 0;
+                            let _ =this.update(cx, |this, cx| {
                                 this.handle_heartbeat_result(missed_heartbeats, cx)
                             })?;
-                            if result.is_break() {
-                                return Ok(());
-                            }
                         }
                     }
+                    _ = keepalive_timer => {
+                        log::debug!("Sending heartbeat to server...");
 
-                    keepalive_timer.set(cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse());
+                        let result = select_biased! {
+                            _ = connection_activity_rx.next().fuse() => {
+                                Ok(())
+                            }
+                            ping_result = client.ping(HEARTBEAT_TIMEOUT).fuse() => {
+                                ping_result
+                            }
+                        };
+
+                        if result.is_err() {
+                            missed_heartbeats += 1;
+                            log::warn!(
+                                "No heartbeat from server after {:?}. Missed heartbeat {} out of {}.",
+                                HEARTBEAT_TIMEOUT,
+                                missed_heartbeats,
+                                MAX_MISSED_HEARTBEATS
+                            );
+                        } else if missed_heartbeats != 0 {
+                            missed_heartbeats = 0;
+                        } else {
+                            continue;
+                        }
+
+                        let result = this.update(cx, |this, cx| {
+                            this.handle_heartbeat_result(missed_heartbeats, cx)
+                        })?;
+                        if result.is_break() {
+                            return Ok(());
+                        }
+                    }
                 }
 
+                keepalive_timer.set(cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse());
+            }
         })
     }
 
@@ -1145,10 +1152,6 @@ impl SshRemoteClient {
         cx.notify();
     }
 
-    pub fn subscribe_to_entity<E: 'static>(&self, remote_id: u64, entity: &Entity<E>) {
-        self.client.subscribe_to_entity(remote_id, entity);
-    }
-
     pub fn ssh_info(&self) -> Option<(SshArgs, PathStyle)> {
         self.state
             .lock()
@@ -1222,7 +1225,7 @@ impl SshRemoteClient {
     pub fn fake_server(
         client_cx: &mut gpui::TestAppContext,
         server_cx: &mut gpui::TestAppContext,
-    ) -> (SshConnectionOptions, Arc<ChannelClient>) {
+    ) -> (SshConnectionOptions, AnyProtoClient) {
         let port = client_cx
             .update(|cx| cx.default_global::<ConnectionPool>().connections.len() as u16 + 1);
         let opts = SshConnectionOptions {
@@ -1255,7 +1258,7 @@ impl SshRemoteClient {
             })
         });
 
-        (opts, server_client)
+        (opts, server_client.into())
     }
 
     #[cfg(any(test, feature = "test-support"))]
@@ -2269,7 +2272,7 @@ impl SshRemoteConnection {
 
 type ResponseChannels = Mutex<HashMap<MessageId, oneshot::Sender<(Envelope, oneshot::Sender<()>)>>>;
 
-pub struct ChannelClient {
+struct ChannelClient {
     next_message_id: AtomicU32,
     outgoing_tx: Mutex<mpsc::UnboundedSender<Envelope>>,
     buffer: Mutex<VecDeque<Envelope>>,
@@ -2281,7 +2284,7 @@ pub struct ChannelClient {
 }
 
 impl ChannelClient {
-    pub fn new(
+    fn new(
         incoming_rx: mpsc::UnboundedReceiver<Envelope>,
         outgoing_tx: mpsc::UnboundedSender<Envelope>,
         cx: &App,
@@ -2402,7 +2405,7 @@ impl ChannelClient {
         })
     }
 
-    pub fn reconnect(
+    fn reconnect(
         self: &Arc<Self>,
         incoming_rx: UnboundedReceiver<Envelope>,
         outgoing_tx: UnboundedSender<Envelope>,
@@ -2412,26 +2415,7 @@ impl ChannelClient {
         *self.task.lock() = Self::start_handling_messages(Arc::downgrade(self), incoming_rx, cx);
     }
 
-    pub fn subscribe_to_entity<E: 'static>(&self, remote_id: u64, entity: &Entity<E>) {
-        let id = (TypeId::of::<E>(), remote_id);
-
-        let mut message_handlers = self.message_handlers.lock();
-        if message_handlers
-            .entities_by_type_and_remote_id
-            .contains_key(&id)
-        {
-            panic!("already subscribed to entity");
-        }
-
-        message_handlers.entities_by_type_and_remote_id.insert(
-            id,
-            EntityMessageSubscriber::Entity {
-                handle: entity.downgrade().into(),
-            },
-        );
-    }
-
-    pub fn request<T: RequestMessage>(
+    fn request<T: RequestMessage>(
         &self,
         payload: T,
     ) -> impl 'static + Future<Output = Result<T::Response>> {
@@ -2453,7 +2437,7 @@ impl ChannelClient {
         }
     }
 
-    pub async fn resync(&self, timeout: Duration) -> Result<()> {
+    async fn resync(&self, timeout: Duration) -> Result<()> {
         smol::future::or(
             async {
                 self.request_internal(proto::FlushBufferedMessages {}, false)
@@ -2475,7 +2459,7 @@ impl ChannelClient {
         .await
     }
 
-    pub async fn ping(&self, timeout: Duration) -> Result<()> {
+    async fn ping(&self, timeout: Duration) -> Result<()> {
         smol::future::or(
             async {
                 self.request(proto::Ping {}).await?;
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 6fc327ac1c..3bcdcbd73c 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -19,7 +19,6 @@ use project::{
     task_store::TaskStore,
     worktree_store::WorktreeStore,
 };
-use remote::ssh_session::ChannelClient;
 use rpc::{
     AnyProtoClient, TypedEnvelope,
     proto::{self, SSH_PEER_ID, SSH_PROJECT_ID},
@@ -50,7 +49,7 @@ pub struct HeadlessProject {
 }
 
 pub struct HeadlessAppState {
-    pub session: Arc<ChannelClient>,
+    pub session: AnyProtoClient,
     pub fs: Arc<dyn Fs>,
     pub http_client: Arc<dyn HttpClient>,
     pub node_runtime: NodeRuntime,
@@ -81,7 +80,7 @@ impl HeadlessProject {
 
         let worktree_store = cx.new(|cx| {
             let mut store = WorktreeStore::local(true, fs.clone());
-            store.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            store.shared(SSH_PROJECT_ID, session.clone(), cx);
             store
         });
 
@@ -99,7 +98,7 @@ impl HeadlessProject {
 
         let buffer_store = cx.new(|cx| {
             let mut buffer_store = BufferStore::local(worktree_store.clone(), cx);
-            buffer_store.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            buffer_store.shared(SSH_PROJECT_ID, session.clone(), cx);
             buffer_store
         });
 
@@ -117,7 +116,7 @@ impl HeadlessProject {
                 breakpoint_store.clone(),
                 cx,
             );
-            dap_store.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            dap_store.shared(SSH_PROJECT_ID, session.clone(), cx);
             dap_store
         });
 
@@ -129,7 +128,7 @@ impl HeadlessProject {
                 fs.clone(),
                 cx,
             );
-            store.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            store.shared(SSH_PROJECT_ID, session.clone(), cx);
             store
         });
 
@@ -152,7 +151,7 @@ impl HeadlessProject {
                 environment.clone(),
                 cx,
             );
-            task_store.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            task_store.shared(SSH_PROJECT_ID, session.clone(), cx);
             task_store
         });
         let settings_observer = cx.new(|cx| {
@@ -162,7 +161,7 @@ impl HeadlessProject {
                 task_store.clone(),
                 cx,
             );
-            observer.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            observer.shared(SSH_PROJECT_ID, session.clone(), cx);
             observer
         });
 
@@ -183,7 +182,7 @@ impl HeadlessProject {
                 fs.clone(),
                 cx,
             );
-            lsp_store.shared(SSH_PROJECT_ID, session.clone().into(), cx);
+            lsp_store.shared(SSH_PROJECT_ID, session.clone(), cx);
             lsp_store
         });
 
@@ -210,8 +209,6 @@ impl HeadlessProject {
             cx,
         );
 
-        let client: AnyProtoClient = session.clone().into();
-
         // local_machine -> ssh handlers
         session.subscribe_to_entity(SSH_PROJECT_ID, &worktree_store);
         session.subscribe_to_entity(SSH_PROJECT_ID, &buffer_store);
@@ -223,44 +220,45 @@ impl HeadlessProject {
         session.subscribe_to_entity(SSH_PROJECT_ID, &settings_observer);
         session.subscribe_to_entity(SSH_PROJECT_ID, &git_store);
 
-        client.add_request_handler(cx.weak_entity(), Self::handle_list_remote_directory);
-        client.add_request_handler(cx.weak_entity(), Self::handle_get_path_metadata);
-        client.add_request_handler(cx.weak_entity(), Self::handle_shutdown_remote_server);
-        client.add_request_handler(cx.weak_entity(), Self::handle_ping);
+        session.add_request_handler(cx.weak_entity(), Self::handle_list_remote_directory);
+        session.add_request_handler(cx.weak_entity(), Self::handle_get_path_metadata);
+        session.add_request_handler(cx.weak_entity(), Self::handle_shutdown_remote_server);
+        session.add_request_handler(cx.weak_entity(), Self::handle_ping);
 
-        client.add_entity_request_handler(Self::handle_add_worktree);
-        client.add_request_handler(cx.weak_entity(), Self::handle_remove_worktree);
+        session.add_entity_request_handler(Self::handle_add_worktree);
+        session.add_request_handler(cx.weak_entity(), Self::handle_remove_worktree);
 
-        client.add_entity_request_handler(Self::handle_open_buffer_by_path);
-        client.add_entity_request_handler(Self::handle_open_new_buffer);
-        client.add_entity_request_handler(Self::handle_find_search_candidates);
-        client.add_entity_request_handler(Self::handle_open_server_settings);
+        session.add_entity_request_handler(Self::handle_open_buffer_by_path);
+        session.add_entity_request_handler(Self::handle_open_new_buffer);
+        session.add_entity_request_handler(Self::handle_find_search_candidates);
+        session.add_entity_request_handler(Self::handle_open_server_settings);
 
-        client.add_entity_request_handler(BufferStore::handle_update_buffer);
-        client.add_entity_message_handler(BufferStore::handle_close_buffer);
+        session.add_entity_request_handler(BufferStore::handle_update_buffer);
+        session.add_entity_message_handler(BufferStore::handle_close_buffer);
 
-        client.add_request_handler(
+        session.add_request_handler(
             extensions.clone().downgrade(),
             HeadlessExtensionStore::handle_sync_extensions,
         );
-        client.add_request_handler(
+        session.add_request_handler(
             extensions.clone().downgrade(),
             HeadlessExtensionStore::handle_install_extension,
         );
 
-        BufferStore::init(&client);
-        WorktreeStore::init(&client);
-        SettingsObserver::init(&client);
-        LspStore::init(&client);
-        TaskStore::init(Some(&client));
-        ToolchainStore::init(&client);
-        DapStore::init(&client, cx);
+        BufferStore::init(&session);
+        WorktreeStore::init(&session);
+        SettingsObserver::init(&session);
+        LspStore::init(&session);
+        TaskStore::init(Some(&session));
+        ToolchainStore::init(&session);
+        DapStore::init(&session, cx);
         // todo(debugger): Re init breakpoint store when we set it up for collab
         // BreakpointStore::init(&client);
-        GitStore::init(&client);
+        GitStore::init(&session);
 
         HeadlessProject {
-            session: client,
+            next_entry_id: Default::default(),
+            session,
             settings_observer,
             fs,
             worktree_store,
@@ -268,7 +266,6 @@ impl HeadlessProject {
             lsp_store,
             task_store,
             dap_store,
-            next_entry_id: Default::default(),
             languages,
             extensions,
             git_store,
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 15a465a880..3352b317cb 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -19,11 +19,11 @@ use project::project_settings::ProjectSettings;
 
 use proto::CrashReport;
 use release_channel::{AppVersion, RELEASE_CHANNEL, ReleaseChannel};
-use remote::proxy::ProxyLaunchError;
-use remote::ssh_session::ChannelClient;
+use remote::SshRemoteClient;
 use remote::{
     json_log::LogRecord,
     protocol::{read_message, write_message},
+    proxy::ProxyLaunchError,
 };
 use reqwest_client::ReqwestClient;
 use rpc::proto::{self, Envelope, SSH_PROJECT_ID};
@@ -199,8 +199,7 @@ fn init_panic_hook(session_id: String) {
     }));
 }
 
-fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &Arc<ChannelClient>) {
-    let client: AnyProtoClient = client.clone().into();
+fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &AnyProtoClient) {
     client.add_request_handler(
         project.downgrade(),
         |_, _: TypedEnvelope<proto::GetCrashFiles>, _cx| async move {
@@ -276,7 +275,7 @@ fn start_server(
     listeners: ServerListeners,
     log_rx: Receiver<Vec<u8>>,
     cx: &mut App,
-) -> Arc<ChannelClient> {
+) -> AnyProtoClient {
     // This is the server idle timeout. If no connection comes in this timeout, the server will shut down.
     const IDLE_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10 * 60);
 
@@ -395,7 +394,7 @@ fn start_server(
     })
     .detach();
 
-    ChannelClient::new(incoming_rx, outgoing_tx, cx, "server")
+    SshRemoteClient::proto_client_from_channels(incoming_rx, outgoing_tx, cx, "server")
 }
 
 fn init_paths() -> anyhow::Result<()> {
@@ -792,7 +791,7 @@ async fn write_size_prefixed_buffer<S: AsyncWrite + Unpin>(
 }
 
 fn initialize_settings(
-    session: Arc<ChannelClient>,
+    session: AnyProtoClient,
     fs: Arc<dyn Fs>,
     cx: &mut App,
 ) -> watch::Receiver<Option<NodeBinaryOptions>> {
diff --git a/crates/rpc/src/proto_client.rs b/crates/rpc/src/proto_client.rs
index eb570b96a3..05b6bd1439 100644
--- a/crates/rpc/src/proto_client.rs
+++ b/crates/rpc/src/proto_client.rs
@@ -315,4 +315,23 @@ impl AnyProtoClient {
                 }),
             );
     }
+
+    pub fn subscribe_to_entity<E: 'static>(&self, remote_id: u64, entity: &Entity<E>) {
+        let id = (TypeId::of::<E>(), remote_id);
+
+        let mut message_handlers = self.0.message_handler_set().lock();
+        if message_handlers
+            .entities_by_type_and_remote_id
+            .contains_key(&id)
+        {
+            panic!("already subscribed to entity");
+        }
+
+        message_handlers.entities_by_type_and_remote_id.insert(
+            id,
+            EntityMessageSubscriber::Entity {
+                handle: entity.downgrade().into(),
+            },
+        );
+    }
 }
diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs
index dae366a979..a4fdc24e17 100644
--- a/crates/tasks_ui/src/tasks_ui.rs
+++ b/crates/tasks_ui/src/tasks_ui.rs
@@ -148,9 +148,9 @@ pub fn toggle_modal(
 ) -> Task<()> {
     let task_store = workspace.project().read(cx).task_store().clone();
     let workspace_handle = workspace.weak_handle();
-    let can_open_modal = workspace.project().update(cx, |project, cx| {
-        project.is_local() || project.ssh_connection_string(cx).is_some() || project.is_via_ssh()
-    });
+    let can_open_modal = workspace
+        .project()
+        .read_with(cx, |project, _| !project.is_via_collab());
     if can_open_modal {
         let task_contexts = task_contexts(workspace, window, cx);
         cx.spawn_in(window, async move |workspace, cx| {

From 714c36fa7b196c398c03c536a973811a8cb5851d Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 19 Aug 2025 22:30:26 -0300
Subject: [PATCH 185/823] claude: Include all mentions and images in user
 message (#36539)

User messages sent to Claude Code will now include the content of all
mentions, and any images included.

Release Notes:

- N/A
---
 crates/agent_servers/src/claude.rs | 242 ++++++++++++++++++++++++++---
 1 file changed, 218 insertions(+), 24 deletions(-)

diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index f27c973ad6..e214ee875c 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -32,7 +32,7 @@ use util::{ResultExt, debug_panic};
 use crate::claude::mcp_server::{ClaudeZedMcpServer, McpConfig};
 use crate::claude::tools::ClaudeTool;
 use crate::{AgentServer, AgentServerCommand, AllAgentServersSettings};
-use acp_thread::{AcpThread, AgentConnection, AuthRequired};
+use acp_thread::{AcpThread, AgentConnection, AuthRequired, MentionUri};
 
 #[derive(Clone)]
 pub struct ClaudeCode;
@@ -267,27 +267,12 @@ impl AgentConnection for ClaudeAgentConnection {
         let (end_tx, end_rx) = oneshot::channel();
         session.turn_state.replace(TurnState::InProgress { end_tx });
 
-        let mut content = String::new();
-        for chunk in params.prompt {
-            match chunk {
-                acp::ContentBlock::Text(text_content) => {
-                    content.push_str(&text_content.text);
-                }
-                acp::ContentBlock::ResourceLink(resource_link) => {
-                    content.push_str(&format!("@{}", resource_link.uri));
-                }
-                acp::ContentBlock::Audio(_)
-                | acp::ContentBlock::Image(_)
-                | acp::ContentBlock::Resource(_) => {
-                    // TODO
-                }
-            }
-        }
+        let content = acp_content_to_claude(params.prompt);
 
         if let Err(err) = session.outgoing_tx.unbounded_send(SdkMessage::User {
             message: Message {
                 role: Role::User,
-                content: Content::UntaggedText(content),
+                content: Content::Chunks(content),
                 id: None,
                 model: None,
                 stop_reason: None,
@@ -513,10 +498,17 @@ impl ClaudeAgentSession {
                                 chunk
                             );
                         }
+                        ContentChunk::Image { source } => {
+                            if !turn_state.borrow().is_canceled() {
+                                thread
+                                    .update(cx, |thread, cx| {
+                                        thread.push_user_content_block(None, source.into(), cx)
+                                    })
+                                    .log_err();
+                            }
+                        }
 
-                        ContentChunk::Image
-                        | ContentChunk::Document
-                        | ContentChunk::WebSearchToolResult => {
+                        ContentChunk::Document | ContentChunk::WebSearchToolResult => {
                             thread
                                 .update(cx, |thread, cx| {
                                     thread.push_assistant_content_block(
@@ -602,7 +594,14 @@ impl ClaudeAgentSession {
                                 "Should not get tool results with role: assistant. should we handle this?"
                             );
                         }
-                        ContentChunk::Image | ContentChunk::Document => {
+                        ContentChunk::Image { source } => {
+                            thread
+                                .update(cx, |thread, cx| {
+                                    thread.push_assistant_content_block(source.into(), false, cx)
+                                })
+                                .log_err();
+                        }
+                        ContentChunk::Document => {
                             thread
                                 .update(cx, |thread, cx| {
                                     thread.push_assistant_content_block(
@@ -768,14 +767,44 @@ enum ContentChunk {
         thinking: String,
     },
     RedactedThinking,
+    Image {
+        source: ImageSource,
+    },
     // TODO
-    Image,
     Document,
     WebSearchToolResult,
     #[serde(untagged)]
     UntaggedText(String),
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "snake_case")]
+enum ImageSource {
+    Base64 { data: String, media_type: String },
+    Url { url: String },
+}
+
+impl Into<acp::ContentBlock> for ImageSource {
+    fn into(self) -> acp::ContentBlock {
+        match self {
+            ImageSource::Base64 { data, media_type } => {
+                acp::ContentBlock::Image(acp::ImageContent {
+                    annotations: None,
+                    data,
+                    mime_type: media_type,
+                    uri: None,
+                })
+            }
+            ImageSource::Url { url } => acp::ContentBlock::Image(acp::ImageContent {
+                annotations: None,
+                data: "".to_string(),
+                mime_type: "".to_string(),
+                uri: Some(url),
+            }),
+        }
+    }
+}
+
 impl Display for ContentChunk {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -784,7 +813,7 @@ impl Display for ContentChunk {
             ContentChunk::RedactedThinking => write!(f, "Thinking: [REDACTED]"),
             ContentChunk::UntaggedText(text) => write!(f, "{}", text),
             ContentChunk::ToolResult { content, .. } => write!(f, "{}", content),
-            ContentChunk::Image
+            ContentChunk::Image { .. }
             | ContentChunk::Document
             | ContentChunk::ToolUse { .. }
             | ContentChunk::WebSearchToolResult => {
@@ -896,6 +925,75 @@ impl Display for ResultErrorType {
     }
 }
 
+fn acp_content_to_claude(prompt: Vec<acp::ContentBlock>) -> Vec<ContentChunk> {
+    let mut content = Vec::with_capacity(prompt.len());
+    let mut context = Vec::with_capacity(prompt.len());
+
+    for chunk in prompt {
+        match chunk {
+            acp::ContentBlock::Text(text_content) => {
+                content.push(ContentChunk::Text {
+                    text: text_content.text,
+                });
+            }
+            acp::ContentBlock::ResourceLink(resource_link) => {
+                match MentionUri::parse(&resource_link.uri) {
+                    Ok(uri) => {
+                        content.push(ContentChunk::Text {
+                            text: format!("{}", uri.as_link()),
+                        });
+                    }
+                    Err(_) => {
+                        content.push(ContentChunk::Text {
+                            text: resource_link.uri,
+                        });
+                    }
+                }
+            }
+            acp::ContentBlock::Resource(resource) => match resource.resource {
+                acp::EmbeddedResourceResource::TextResourceContents(resource) => {
+                    match MentionUri::parse(&resource.uri) {
+                        Ok(uri) => {
+                            content.push(ContentChunk::Text {
+                                text: format!("{}", uri.as_link()),
+                            });
+                        }
+                        Err(_) => {
+                            content.push(ContentChunk::Text {
+                                text: resource.uri.clone(),
+                            });
+                        }
+                    }
+
+                    context.push(ContentChunk::Text {
+                        text: format!(
+                            "\n<context ref=\"{}\">\n{}\n</context>",
+                            resource.uri, resource.text
+                        ),
+                    });
+                }
+                acp::EmbeddedResourceResource::BlobResourceContents(_) => {
+                    // Unsupported by SDK
+                }
+            },
+            acp::ContentBlock::Image(acp::ImageContent {
+                data, mime_type, ..
+            }) => content.push(ContentChunk::Image {
+                source: ImageSource::Base64 {
+                    data,
+                    media_type: mime_type,
+                },
+            }),
+            acp::ContentBlock::Audio(_) => {
+                // Unsupported by SDK
+            }
+        }
+    }
+
+    content.extend(context);
+    content
+}
+
 fn new_request_id() -> String {
     use rand::Rng;
     // In the Claude Code TS SDK they just generate a random 12 character string,
@@ -1112,4 +1210,100 @@ pub(crate) mod tests {
             _ => panic!("Expected ToolResult variant"),
         }
     }
+
+    #[test]
+    fn test_acp_content_to_claude() {
+        let acp_content = vec![
+            acp::ContentBlock::Text(acp::TextContent {
+                text: "Hello world".to_string(),
+                annotations: None,
+            }),
+            acp::ContentBlock::Image(acp::ImageContent {
+                data: "base64data".to_string(),
+                mime_type: "image/png".to_string(),
+                annotations: None,
+                uri: None,
+            }),
+            acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                uri: "file:///path/to/example.rs".to_string(),
+                name: "example.rs".to_string(),
+                annotations: None,
+                description: None,
+                mime_type: None,
+                size: None,
+                title: None,
+            }),
+            acp::ContentBlock::Resource(acp::EmbeddedResource {
+                annotations: None,
+                resource: acp::EmbeddedResourceResource::TextResourceContents(
+                    acp::TextResourceContents {
+                        mime_type: None,
+                        text: "fn main() { println!(\"Hello!\"); }".to_string(),
+                        uri: "file:///path/to/code.rs".to_string(),
+                    },
+                ),
+            }),
+            acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                uri: "invalid_uri_format".to_string(),
+                name: "invalid.txt".to_string(),
+                annotations: None,
+                description: None,
+                mime_type: None,
+                size: None,
+                title: None,
+            }),
+        ];
+
+        let claude_content = acp_content_to_claude(acp_content);
+
+        assert_eq!(claude_content.len(), 6);
+
+        match &claude_content[0] {
+            ContentChunk::Text { text } => assert_eq!(text, "Hello world"),
+            _ => panic!("Expected Text chunk"),
+        }
+
+        match &claude_content[1] {
+            ContentChunk::Image { source } => match source {
+                ImageSource::Base64 { data, media_type } => {
+                    assert_eq!(data, "base64data");
+                    assert_eq!(media_type, "image/png");
+                }
+                _ => panic!("Expected Base64 image source"),
+            },
+            _ => panic!("Expected Image chunk"),
+        }
+
+        match &claude_content[2] {
+            ContentChunk::Text { text } => {
+                assert!(text.contains("example.rs"));
+                assert!(text.contains("file:///path/to/example.rs"));
+            }
+            _ => panic!("Expected Text chunk for ResourceLink"),
+        }
+
+        match &claude_content[3] {
+            ContentChunk::Text { text } => {
+                assert!(text.contains("code.rs"));
+                assert!(text.contains("file:///path/to/code.rs"));
+            }
+            _ => panic!("Expected Text chunk for Resource"),
+        }
+
+        match &claude_content[4] {
+            ContentChunk::Text { text } => {
+                assert_eq!(text, "invalid_uri_format");
+            }
+            _ => panic!("Expected Text chunk for invalid URI"),
+        }
+
+        match &claude_content[5] {
+            ContentChunk::Text { text } => {
+                assert!(text.contains("<context ref=\"file:///path/to/code.rs\">"));
+                assert!(text.contains("fn main() { println!(\"Hello!\"); }"));
+                assert!(text.contains("</context>"));
+            }
+            _ => panic!("Expected Text chunk for context"),
+        }
+    }
 }

From 7c7043947b1551470a55063ad13e0ea3b6745171 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 19 Aug 2025 22:42:11 -0300
Subject: [PATCH 186/823] Improve claude tools (#36538)

- Return unified diff from `Edit` tool so model can see the final state
- Format on save if enabled
- Provide `Write` tool
- Disable `MultiEdit` tool
- Better prompting

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs           |  76 ++++-
 crates/agent_servers/Cargo.toml               |   1 +
 crates/agent_servers/src/claude.rs            |  25 +-
 crates/agent_servers/src/claude/edit_tool.rs  | 178 +++++++++++
 crates/agent_servers/src/claude/mcp_server.rs | 279 +-----------------
 .../src/claude/permission_tool.rs             | 158 ++++++++++
 crates/agent_servers/src/claude/read_tool.rs  |  59 ++++
 crates/agent_servers/src/claude/tools.rs      |  39 ++-
 crates/agent_servers/src/claude/write_tool.rs |  59 ++++
 crates/context_server/src/listener.rs         |  24 +-
 crates/context_server/src/types.rs            |  10 +
 11 files changed, 606 insertions(+), 302 deletions(-)
 create mode 100644 crates/agent_servers/src/claude/edit_tool.rs
 create mode 100644 crates/agent_servers/src/claude/permission_tool.rs
 create mode 100644 crates/agent_servers/src/claude/read_tool.rs
 create mode 100644 crates/agent_servers/src/claude/write_tool.rs

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 793ef35be2..2be7ea7a12 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3,9 +3,12 @@ mod diff;
 mod mention;
 mod terminal;
 
+use collections::HashSet;
 pub use connection::*;
 pub use diff::*;
+use language::language_settings::FormatOnSave;
 pub use mention::*;
+use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use serde::{Deserialize, Serialize};
 pub use terminal::*;
 
@@ -1051,6 +1054,22 @@ impl AcpThread {
             })
     }
 
+    pub fn tool_call(&mut self, id: &acp::ToolCallId) -> Option<(usize, &ToolCall)> {
+        self.entries
+            .iter()
+            .enumerate()
+            .rev()
+            .find_map(|(index, tool_call)| {
+                if let AgentThreadEntry::ToolCall(tool_call) = tool_call
+                    && &tool_call.id == id
+                {
+                    Some((index, tool_call))
+                } else {
+                    None
+                }
+            })
+    }
+
     pub fn resolve_locations(&mut self, id: acp::ToolCallId, cx: &mut Context<Self>) {
         let project = self.project.clone();
         let Some((_, tool_call)) = self.tool_call_mut(&id) else {
@@ -1601,30 +1620,59 @@ impl AcpThread {
                         .collect::<Vec<_>>()
                 })
                 .await;
-            cx.update(|cx| {
-                project.update(cx, |project, cx| {
-                    project.set_agent_location(
-                        Some(AgentLocation {
-                            buffer: buffer.downgrade(),
-                            position: edits
-                                .last()
-                                .map(|(range, _)| range.end)
-                                .unwrap_or(Anchor::MIN),
-                        }),
-                        cx,
-                    );
-                });
 
+            project.update(cx, |project, cx| {
+                project.set_agent_location(
+                    Some(AgentLocation {
+                        buffer: buffer.downgrade(),
+                        position: edits
+                            .last()
+                            .map(|(range, _)| range.end)
+                            .unwrap_or(Anchor::MIN),
+                    }),
+                    cx,
+                );
+            })?;
+
+            let format_on_save = cx.update(|cx| {
                 action_log.update(cx, |action_log, cx| {
                     action_log.buffer_read(buffer.clone(), cx);
                 });
-                buffer.update(cx, |buffer, cx| {
+
+                let format_on_save = buffer.update(cx, |buffer, cx| {
                     buffer.edit(edits, None, cx);
+
+                    let settings = language::language_settings::language_settings(
+                        buffer.language().map(|l| l.name()),
+                        buffer.file(),
+                        cx,
+                    );
+
+                    settings.format_on_save != FormatOnSave::Off
                 });
                 action_log.update(cx, |action_log, cx| {
                     action_log.buffer_edited(buffer.clone(), cx);
                 });
+                format_on_save
             })?;
+
+            if format_on_save {
+                let format_task = project.update(cx, |project, cx| {
+                    project.format(
+                        HashSet::from_iter([buffer.clone()]),
+                        LspFormatTarget::Buffers,
+                        false,
+                        FormatTrigger::Save,
+                        cx,
+                    )
+                })?;
+                format_task.await.log_err();
+
+                action_log.update(cx, |action_log, cx| {
+                    action_log.buffer_edited(buffer.clone(), cx);
+                })?;
+            }
+
             project
                 .update(cx, |project, cx| project.save_buffer(buffer, cx))?
                 .await
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index cbc874057a..8cd6980ae1 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -29,6 +29,7 @@ futures.workspace = true
 gpui.workspace = true
 indoc.workspace = true
 itertools.workspace = true
+language.workspace = true
 language_model.workspace = true
 language_models.workspace = true
 log.workspace = true
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index e214ee875c..a53c81d4c4 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,5 +1,9 @@
+mod edit_tool;
 mod mcp_server;
+mod permission_tool;
+mod read_tool;
 pub mod tools;
+mod write_tool;
 
 use action_log::ActionLog;
 use collections::HashMap;
@@ -351,18 +355,16 @@ fn spawn_claude(
             &format!(
                 "mcp__{}__{}",
                 mcp_server::SERVER_NAME,
-                mcp_server::PermissionTool::NAME,
+                permission_tool::PermissionTool::NAME,
             ),
             "--allowedTools",
             &format!(
-                "mcp__{}__{},mcp__{}__{}",
+                "mcp__{}__{}",
                 mcp_server::SERVER_NAME,
-                mcp_server::EditTool::NAME,
-                mcp_server::SERVER_NAME,
-                mcp_server::ReadTool::NAME
+                read_tool::ReadTool::NAME
             ),
             "--disallowedTools",
-            "Read,Edit",
+            "Read,Write,Edit,MultiEdit",
         ])
         .args(match mode {
             ClaudeSessionMode::Start => ["--session-id".to_string(), session_id.to_string()],
@@ -470,9 +472,16 @@ impl ClaudeAgentSession {
                             let content = content.to_string();
                             thread
                                 .update(cx, |thread, cx| {
+                                    let id = acp::ToolCallId(tool_use_id.into());
+                                    let set_new_content = !content.is_empty()
+                                        && thread.tool_call(&id).is_none_or(|(_, tool_call)| {
+                                            // preserve rich diff if we have one
+                                            tool_call.diffs().next().is_none()
+                                        });
+
                                     thread.update_tool_call(
                                         acp::ToolCallUpdate {
-                                            id: acp::ToolCallId(tool_use_id.into()),
+                                            id,
                                             fields: acp::ToolCallUpdateFields {
                                                 status: if turn_state.borrow().is_canceled() {
                                                     // Do not set to completed if turn was canceled
@@ -480,7 +489,7 @@ impl ClaudeAgentSession {
                                                 } else {
                                                     Some(acp::ToolCallStatus::Completed)
                                                 },
-                                                content: (!content.is_empty())
+                                                content: set_new_content
                                                     .then(|| vec![content.into()]),
                                                 ..Default::default()
                                             },
diff --git a/crates/agent_servers/src/claude/edit_tool.rs b/crates/agent_servers/src/claude/edit_tool.rs
new file mode 100644
index 0000000000..a8d93c3f3d
--- /dev/null
+++ b/crates/agent_servers/src/claude/edit_tool.rs
@@ -0,0 +1,178 @@
+use acp_thread::AcpThread;
+use anyhow::Result;
+use context_server::{
+    listener::{McpServerTool, ToolResponse},
+    types::{ToolAnnotations, ToolResponseContent},
+};
+use gpui::{AsyncApp, WeakEntity};
+use language::unified_diff;
+use util::markdown::MarkdownCodeBlock;
+
+use crate::tools::EditToolParams;
+
+#[derive(Clone)]
+pub struct EditTool {
+    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
+}
+
+impl EditTool {
+    pub fn new(thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
+        Self { thread_rx }
+    }
+}
+
+impl McpServerTool for EditTool {
+    type Input = EditToolParams;
+    type Output = ();
+
+    const NAME: &'static str = "Edit";
+
+    fn annotations(&self) -> ToolAnnotations {
+        ToolAnnotations {
+            title: Some("Edit file".to_string()),
+            read_only_hint: Some(false),
+            destructive_hint: Some(false),
+            open_world_hint: Some(false),
+            idempotent_hint: Some(false),
+        }
+    }
+
+    async fn run(
+        &self,
+        input: Self::Input,
+        cx: &mut AsyncApp,
+    ) -> Result<ToolResponse<Self::Output>> {
+        let mut thread_rx = self.thread_rx.clone();
+        let Some(thread) = thread_rx.recv().await?.upgrade() else {
+            anyhow::bail!("Thread closed");
+        };
+
+        let content = thread
+            .update(cx, |thread, cx| {
+                thread.read_text_file(input.abs_path.clone(), None, None, true, cx)
+            })?
+            .await?;
+
+        let (new_content, diff) = cx
+            .background_executor()
+            .spawn(async move {
+                let new_content = content.replace(&input.old_text, &input.new_text);
+                if new_content == content {
+                    return Err(anyhow::anyhow!("Failed to find `old_text`",));
+                }
+                let diff = unified_diff(&content, &new_content);
+
+                Ok((new_content, diff))
+            })
+            .await?;
+
+        thread
+            .update(cx, |thread, cx| {
+                thread.write_text_file(input.abs_path, new_content, cx)
+            })?
+            .await?;
+
+        Ok(ToolResponse {
+            content: vec![ToolResponseContent::Text {
+                text: MarkdownCodeBlock {
+                    tag: "diff",
+                    text: diff.as_str().trim_end_matches('\n'),
+                }
+                .to_string(),
+            }],
+            structured_content: (),
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::rc::Rc;
+
+    use acp_thread::{AgentConnection, StubAgentConnection};
+    use gpui::{Entity, TestAppContext};
+    use indoc::indoc;
+    use project::{FakeFs, Project};
+    use serde_json::json;
+    use settings::SettingsStore;
+    use util::path;
+
+    use super::*;
+
+    #[gpui::test]
+    async fn old_text_not_found(cx: &mut TestAppContext) {
+        let (_thread, tool) = init_test(cx).await;
+
+        let result = tool
+            .run(
+                EditToolParams {
+                    abs_path: path!("/root/file.txt").into(),
+                    old_text: "hi".into(),
+                    new_text: "bye".into(),
+                },
+                &mut cx.to_async(),
+            )
+            .await;
+
+        assert_eq!(result.unwrap_err().to_string(), "Failed to find `old_text`");
+    }
+
+    #[gpui::test]
+    async fn found_and_replaced(cx: &mut TestAppContext) {
+        let (_thread, tool) = init_test(cx).await;
+
+        let result = tool
+            .run(
+                EditToolParams {
+                    abs_path: path!("/root/file.txt").into(),
+                    old_text: "hello".into(),
+                    new_text: "hi".into(),
+                },
+                &mut cx.to_async(),
+            )
+            .await;
+
+        assert_eq!(
+            result.unwrap().content[0].text().unwrap(),
+            indoc! {
+                r"
+                ```diff
+                @@ -1,1 +1,1 @@
+                -hello
+                +hi
+                ```
+                "
+            }
+        );
+    }
+
+    async fn init_test(cx: &mut TestAppContext) -> (Entity<AcpThread>, EditTool) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            language::init(cx);
+            Project::init_settings(cx);
+        });
+
+        let connection = Rc::new(StubAgentConnection::new());
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/root"),
+            json!({
+                "file.txt": "hello"
+            }),
+        )
+        .await;
+        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
+        let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
+
+        let thread = cx
+            .update(|cx| connection.new_thread(project, path!("/test").as_ref(), cx))
+            .await
+            .unwrap();
+
+        thread_tx.send(thread.downgrade()).unwrap();
+
+        (thread, EditTool::new(thread_rx))
+    }
+}
diff --git a/crates/agent_servers/src/claude/mcp_server.rs b/crates/agent_servers/src/claude/mcp_server.rs
index 3086752850..6442c784b5 100644
--- a/crates/agent_servers/src/claude/mcp_server.rs
+++ b/crates/agent_servers/src/claude/mcp_server.rs
@@ -1,23 +1,22 @@
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use crate::claude::tools::{ClaudeTool, EditToolParams, ReadToolParams};
+use crate::claude::edit_tool::EditTool;
+use crate::claude::permission_tool::PermissionTool;
+use crate::claude::read_tool::ReadTool;
+use crate::claude::write_tool::WriteTool;
 use acp_thread::AcpThread;
-use agent_client_protocol as acp;
-use agent_settings::AgentSettings;
-use anyhow::{Context, Result};
+#[cfg(not(test))]
+use anyhow::Context as _;
+use anyhow::Result;
 use collections::HashMap;
-use context_server::listener::{McpServerTool, ToolResponse};
 use context_server::types::{
     Implementation, InitializeParams, InitializeResponse, ProtocolVersion, ServerCapabilities,
-    ToolAnnotations, ToolResponseContent, ToolsCapabilities, requests,
+    ToolsCapabilities, requests,
 };
 use gpui::{App, AsyncApp, Task, WeakEntity};
 use project::Fs;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{Settings as _, update_settings_file};
-use util::debug_panic;
+use serde::Serialize;
 
 pub struct ClaudeZedMcpServer {
     server: context_server::listener::McpServer,
@@ -34,16 +33,10 @@ impl ClaudeZedMcpServer {
         let mut mcp_server = context_server::listener::McpServer::new(cx).await?;
         mcp_server.handle_request::<requests::Initialize>(Self::handle_initialize);
 
-        mcp_server.add_tool(PermissionTool {
-            thread_rx: thread_rx.clone(),
-            fs: fs.clone(),
-        });
-        mcp_server.add_tool(ReadTool {
-            thread_rx: thread_rx.clone(),
-        });
-        mcp_server.add_tool(EditTool {
-            thread_rx: thread_rx.clone(),
-        });
+        mcp_server.add_tool(PermissionTool::new(fs.clone(), thread_rx.clone()));
+        mcp_server.add_tool(ReadTool::new(thread_rx.clone()));
+        mcp_server.add_tool(EditTool::new(thread_rx.clone()));
+        mcp_server.add_tool(WriteTool::new(thread_rx.clone()));
 
         Ok(Self { server: mcp_server })
     }
@@ -104,249 +97,3 @@ pub struct McpServerConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub env: Option<HashMap<String, String>>,
 }
-
-// Tools
-
-#[derive(Clone)]
-pub struct PermissionTool {
-    fs: Arc<dyn Fs>,
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct PermissionToolParams {
-    tool_name: String,
-    input: serde_json::Value,
-    tool_use_id: Option<String>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PermissionToolResponse {
-    behavior: PermissionToolBehavior,
-    updated_input: serde_json::Value,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-enum PermissionToolBehavior {
-    Allow,
-    Deny,
-}
-
-impl McpServerTool for PermissionTool {
-    type Input = PermissionToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Confirmation";
-
-    fn description(&self) -> &'static str {
-        "Request permission for tool calls"
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        if agent_settings::AgentSettings::try_read_global(cx, |settings| {
-            settings.always_allow_tool_actions
-        })
-        .unwrap_or(false)
-        {
-            let response = PermissionToolResponse {
-                behavior: PermissionToolBehavior::Allow,
-                updated_input: input.input,
-            };
-
-            return Ok(ToolResponse {
-                content: vec![ToolResponseContent::Text {
-                    text: serde_json::to_string(&response)?,
-                }],
-                structured_content: (),
-            });
-        }
-
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let claude_tool = ClaudeTool::infer(&input.tool_name, input.input.clone());
-        let tool_call_id = acp::ToolCallId(input.tool_use_id.context("Tool ID required")?.into());
-
-        const ALWAYS_ALLOW: &str = "always_allow";
-        const ALLOW: &str = "allow";
-        const REJECT: &str = "reject";
-
-        let chosen_option = thread
-            .update(cx, |thread, cx| {
-                thread.request_tool_call_authorization(
-                    claude_tool.as_acp(tool_call_id).into(),
-                    vec![
-                        acp::PermissionOption {
-                            id: acp::PermissionOptionId(ALWAYS_ALLOW.into()),
-                            name: "Always Allow".into(),
-                            kind: acp::PermissionOptionKind::AllowAlways,
-                        },
-                        acp::PermissionOption {
-                            id: acp::PermissionOptionId(ALLOW.into()),
-                            name: "Allow".into(),
-                            kind: acp::PermissionOptionKind::AllowOnce,
-                        },
-                        acp::PermissionOption {
-                            id: acp::PermissionOptionId(REJECT.into()),
-                            name: "Reject".into(),
-                            kind: acp::PermissionOptionKind::RejectOnce,
-                        },
-                    ],
-                    cx,
-                )
-            })??
-            .await?;
-
-        let response = match chosen_option.0.as_ref() {
-            ALWAYS_ALLOW => {
-                cx.update(|cx| {
-                    update_settings_file::<AgentSettings>(self.fs.clone(), cx, |settings, _| {
-                        settings.set_always_allow_tool_actions(true);
-                    });
-                })?;
-
-                PermissionToolResponse {
-                    behavior: PermissionToolBehavior::Allow,
-                    updated_input: input.input,
-                }
-            }
-            ALLOW => PermissionToolResponse {
-                behavior: PermissionToolBehavior::Allow,
-                updated_input: input.input,
-            },
-            REJECT => PermissionToolResponse {
-                behavior: PermissionToolBehavior::Deny,
-                updated_input: input.input,
-            },
-            opt => {
-                debug_panic!("Unexpected option: {}", opt);
-                PermissionToolResponse {
-                    behavior: PermissionToolBehavior::Deny,
-                    updated_input: input.input,
-                }
-            }
-        };
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text {
-                text: serde_json::to_string(&response)?,
-            }],
-            structured_content: (),
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct ReadTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for ReadTool {
-    type Input = ReadToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Read";
-
-    fn description(&self) -> &'static str {
-        "Read the contents of a file. In sessions with mcp__zed__Read always use it instead of Read as it contains the most up-to-date contents."
-    }
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Read file".to_string()),
-            read_only_hint: Some(true),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: None,
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.abs_path, input.offset, input.limit, false, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text { text: content }],
-            structured_content: (),
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct EditTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for EditTool {
-    type Input = EditToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Edit";
-
-    fn description(&self) -> &'static str {
-        "Edits a file. In sessions with mcp__zed__Edit always use it instead of Edit as it will show the diff to the user better."
-    }
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Edit file".to_string()),
-            read_only_hint: Some(false),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: Some(false),
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.abs_path.clone(), None, None, true, cx)
-            })?
-            .await?;
-
-        let new_content = content.replace(&input.old_text, &input.new_text);
-        if new_content == content {
-            return Err(anyhow::anyhow!("The old_text was not found in the content"));
-        }
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.write_text_file(input.abs_path, new_content, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![],
-            structured_content: (),
-        })
-    }
-}
diff --git a/crates/agent_servers/src/claude/permission_tool.rs b/crates/agent_servers/src/claude/permission_tool.rs
new file mode 100644
index 0000000000..96a24105e8
--- /dev/null
+++ b/crates/agent_servers/src/claude/permission_tool.rs
@@ -0,0 +1,158 @@
+use std::sync::Arc;
+
+use acp_thread::AcpThread;
+use agent_client_protocol as acp;
+use agent_settings::AgentSettings;
+use anyhow::{Context as _, Result};
+use context_server::{
+    listener::{McpServerTool, ToolResponse},
+    types::ToolResponseContent,
+};
+use gpui::{AsyncApp, WeakEntity};
+use project::Fs;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings as _, update_settings_file};
+use util::debug_panic;
+
+use crate::tools::ClaudeTool;
+
+#[derive(Clone)]
+pub struct PermissionTool {
+    fs: Arc<dyn Fs>,
+    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
+}
+
+/// Request permission for tool calls
+#[derive(Deserialize, JsonSchema, Debug)]
+pub struct PermissionToolParams {
+    tool_name: String,
+    input: serde_json::Value,
+    tool_use_id: Option<String>,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PermissionToolResponse {
+    behavior: PermissionToolBehavior,
+    updated_input: serde_json::Value,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "snake_case")]
+enum PermissionToolBehavior {
+    Allow,
+    Deny,
+}
+
+impl PermissionTool {
+    pub fn new(fs: Arc<dyn Fs>, thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
+        Self { fs, thread_rx }
+    }
+}
+
+impl McpServerTool for PermissionTool {
+    type Input = PermissionToolParams;
+    type Output = ();
+
+    const NAME: &'static str = "Confirmation";
+
+    async fn run(
+        &self,
+        input: Self::Input,
+        cx: &mut AsyncApp,
+    ) -> Result<ToolResponse<Self::Output>> {
+        if agent_settings::AgentSettings::try_read_global(cx, |settings| {
+            settings.always_allow_tool_actions
+        })
+        .unwrap_or(false)
+        {
+            let response = PermissionToolResponse {
+                behavior: PermissionToolBehavior::Allow,
+                updated_input: input.input,
+            };
+
+            return Ok(ToolResponse {
+                content: vec![ToolResponseContent::Text {
+                    text: serde_json::to_string(&response)?,
+                }],
+                structured_content: (),
+            });
+        }
+
+        let mut thread_rx = self.thread_rx.clone();
+        let Some(thread) = thread_rx.recv().await?.upgrade() else {
+            anyhow::bail!("Thread closed");
+        };
+
+        let claude_tool = ClaudeTool::infer(&input.tool_name, input.input.clone());
+        let tool_call_id = acp::ToolCallId(input.tool_use_id.context("Tool ID required")?.into());
+
+        const ALWAYS_ALLOW: &str = "always_allow";
+        const ALLOW: &str = "allow";
+        const REJECT: &str = "reject";
+
+        let chosen_option = thread
+            .update(cx, |thread, cx| {
+                thread.request_tool_call_authorization(
+                    claude_tool.as_acp(tool_call_id).into(),
+                    vec![
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId(ALWAYS_ALLOW.into()),
+                            name: "Always Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowAlways,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId(ALLOW.into()),
+                            name: "Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowOnce,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId(REJECT.into()),
+                            name: "Reject".into(),
+                            kind: acp::PermissionOptionKind::RejectOnce,
+                        },
+                    ],
+                    cx,
+                )
+            })??
+            .await?;
+
+        let response = match chosen_option.0.as_ref() {
+            ALWAYS_ALLOW => {
+                cx.update(|cx| {
+                    update_settings_file::<AgentSettings>(self.fs.clone(), cx, |settings, _| {
+                        settings.set_always_allow_tool_actions(true);
+                    });
+                })?;
+
+                PermissionToolResponse {
+                    behavior: PermissionToolBehavior::Allow,
+                    updated_input: input.input,
+                }
+            }
+            ALLOW => PermissionToolResponse {
+                behavior: PermissionToolBehavior::Allow,
+                updated_input: input.input,
+            },
+            REJECT => PermissionToolResponse {
+                behavior: PermissionToolBehavior::Deny,
+                updated_input: input.input,
+            },
+            opt => {
+                debug_panic!("Unexpected option: {}", opt);
+                PermissionToolResponse {
+                    behavior: PermissionToolBehavior::Deny,
+                    updated_input: input.input,
+                }
+            }
+        };
+
+        Ok(ToolResponse {
+            content: vec![ToolResponseContent::Text {
+                text: serde_json::to_string(&response)?,
+            }],
+            structured_content: (),
+        })
+    }
+}
diff --git a/crates/agent_servers/src/claude/read_tool.rs b/crates/agent_servers/src/claude/read_tool.rs
new file mode 100644
index 0000000000..cbe25876b3
--- /dev/null
+++ b/crates/agent_servers/src/claude/read_tool.rs
@@ -0,0 +1,59 @@
+use acp_thread::AcpThread;
+use anyhow::Result;
+use context_server::{
+    listener::{McpServerTool, ToolResponse},
+    types::{ToolAnnotations, ToolResponseContent},
+};
+use gpui::{AsyncApp, WeakEntity};
+
+use crate::tools::ReadToolParams;
+
+#[derive(Clone)]
+pub struct ReadTool {
+    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
+}
+
+impl ReadTool {
+    pub fn new(thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
+        Self { thread_rx }
+    }
+}
+
+impl McpServerTool for ReadTool {
+    type Input = ReadToolParams;
+    type Output = ();
+
+    const NAME: &'static str = "Read";
+
+    fn annotations(&self) -> ToolAnnotations {
+        ToolAnnotations {
+            title: Some("Read file".to_string()),
+            read_only_hint: Some(true),
+            destructive_hint: Some(false),
+            open_world_hint: Some(false),
+            idempotent_hint: None,
+        }
+    }
+
+    async fn run(
+        &self,
+        input: Self::Input,
+        cx: &mut AsyncApp,
+    ) -> Result<ToolResponse<Self::Output>> {
+        let mut thread_rx = self.thread_rx.clone();
+        let Some(thread) = thread_rx.recv().await?.upgrade() else {
+            anyhow::bail!("Thread closed");
+        };
+
+        let content = thread
+            .update(cx, |thread, cx| {
+                thread.read_text_file(input.abs_path, input.offset, input.limit, false, cx)
+            })?
+            .await?;
+
+        Ok(ToolResponse {
+            content: vec![ToolResponseContent::Text { text: content }],
+            structured_content: (),
+        })
+    }
+}
diff --git a/crates/agent_servers/src/claude/tools.rs b/crates/agent_servers/src/claude/tools.rs
index 7ca150c0bd..3be10ed94c 100644
--- a/crates/agent_servers/src/claude/tools.rs
+++ b/crates/agent_servers/src/claude/tools.rs
@@ -34,6 +34,7 @@ impl ClaudeTool {
             // Known tools
             "mcp__zed__Read" => Self::ReadFile(serde_json::from_value(input).log_err()),
             "mcp__zed__Edit" => Self::Edit(serde_json::from_value(input).log_err()),
+            "mcp__zed__Write" => Self::Write(serde_json::from_value(input).log_err()),
             "MultiEdit" => Self::MultiEdit(serde_json::from_value(input).log_err()),
             "Write" => Self::Write(serde_json::from_value(input).log_err()),
             "LS" => Self::Ls(serde_json::from_value(input).log_err()),
@@ -93,7 +94,7 @@ impl ClaudeTool {
             }
             Self::MultiEdit(None) => "Multi Edit".into(),
             Self::Write(Some(params)) => {
-                format!("Write {}", params.file_path.display())
+                format!("Write {}", params.abs_path.display())
             }
             Self::Write(None) => "Write".into(),
             Self::Glob(Some(params)) => {
@@ -153,7 +154,7 @@ impl ClaudeTool {
             }],
             Self::Write(Some(params)) => vec![acp::ToolCallContent::Diff {
                 diff: acp::Diff {
-                    path: params.file_path.clone(),
+                    path: params.abs_path.clone(),
                     old_text: None,
                     new_text: params.content.clone(),
                 },
@@ -229,7 +230,10 @@ impl ClaudeTool {
                     line: None,
                 }]
             }
-            Self::Write(Some(WriteToolParams { file_path, .. })) => {
+            Self::Write(Some(WriteToolParams {
+                abs_path: file_path,
+                ..
+            })) => {
                 vec![acp::ToolCallLocation {
                     path: file_path.clone(),
                     line: None,
@@ -302,6 +306,20 @@ impl ClaudeTool {
     }
 }
 
+/// Edit a file.
+///
+/// In sessions with mcp__zed__Edit always use it instead of Edit as it will
+/// allow the user to conveniently review changes.
+///
+/// File editing instructions:
+/// - The `old_text` param must match existing file content, including indentation.
+/// - The `old_text` param must come from the actual file, not an outline.
+/// - The `old_text` section must not be empty.
+/// - Be minimal with replacements:
+///     - For unique lines, include only those lines.
+///     - For non-unique lines, include enough context to identify them.
+/// - Do not escape quotes, newlines, or other characters.
+/// - Only edit the specified file.
 #[derive(Deserialize, JsonSchema, Debug)]
 pub struct EditToolParams {
     /// The absolute path to the file to read.
@@ -312,6 +330,11 @@ pub struct EditToolParams {
     pub new_text: String,
 }
 
+/// Reads the content of the given file in the project.
+///
+/// Never attempt to read a path that hasn't been previously mentioned.
+///
+/// In sessions with mcp__zed__Read always use it instead of Read as it contains the most up-to-date contents.
 #[derive(Deserialize, JsonSchema, Debug)]
 pub struct ReadToolParams {
     /// The absolute path to the file to read.
@@ -324,11 +347,15 @@ pub struct ReadToolParams {
     pub limit: Option<u32>,
 }
 
+/// Writes content to the specified file in the project.
+///
+/// In sessions with mcp__zed__Write always use it instead of Write as it will
+/// allow the user to conveniently review changes.
 #[derive(Deserialize, JsonSchema, Debug)]
 pub struct WriteToolParams {
-    /// Absolute path for new file
-    pub file_path: PathBuf,
-    /// File content
+    /// The absolute path of the file to write.
+    pub abs_path: PathBuf,
+    /// The full content to write.
     pub content: String,
 }
 
diff --git a/crates/agent_servers/src/claude/write_tool.rs b/crates/agent_servers/src/claude/write_tool.rs
new file mode 100644
index 0000000000..39479a9c38
--- /dev/null
+++ b/crates/agent_servers/src/claude/write_tool.rs
@@ -0,0 +1,59 @@
+use acp_thread::AcpThread;
+use anyhow::Result;
+use context_server::{
+    listener::{McpServerTool, ToolResponse},
+    types::ToolAnnotations,
+};
+use gpui::{AsyncApp, WeakEntity};
+
+use crate::tools::WriteToolParams;
+
+#[derive(Clone)]
+pub struct WriteTool {
+    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
+}
+
+impl WriteTool {
+    pub fn new(thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
+        Self { thread_rx }
+    }
+}
+
+impl McpServerTool for WriteTool {
+    type Input = WriteToolParams;
+    type Output = ();
+
+    const NAME: &'static str = "Write";
+
+    fn annotations(&self) -> ToolAnnotations {
+        ToolAnnotations {
+            title: Some("Write file".to_string()),
+            read_only_hint: Some(false),
+            destructive_hint: Some(false),
+            open_world_hint: Some(false),
+            idempotent_hint: Some(false),
+        }
+    }
+
+    async fn run(
+        &self,
+        input: Self::Input,
+        cx: &mut AsyncApp,
+    ) -> Result<ToolResponse<Self::Output>> {
+        let mut thread_rx = self.thread_rx.clone();
+        let Some(thread) = thread_rx.recv().await?.upgrade() else {
+            anyhow::bail!("Thread closed");
+        };
+
+        thread
+            .update(cx, |thread, cx| {
+                thread.write_text_file(input.abs_path, input.content, cx)
+            })?
+            .await?;
+
+        Ok(ToolResponse {
+            content: vec![],
+            structured_content: (),
+        })
+    }
+}
diff --git a/crates/context_server/src/listener.rs b/crates/context_server/src/listener.rs
index 6f4b5c1369..1b44cefbd2 100644
--- a/crates/context_server/src/listener.rs
+++ b/crates/context_server/src/listener.rs
@@ -14,6 +14,7 @@ use serde::de::DeserializeOwned;
 use serde_json::{json, value::RawValue};
 use smol::stream::StreamExt;
 use std::{
+    any::TypeId,
     cell::RefCell,
     path::{Path, PathBuf},
     rc::Rc,
@@ -87,18 +88,26 @@ impl McpServer {
         settings.inline_subschemas = true;
         let mut generator = settings.into_generator();
 
-        let output_schema = generator.root_schema_for::<T::Output>();
-        let unit_schema = generator.root_schema_for::<T::Output>();
+        let input_schema = generator.root_schema_for::<T::Input>();
+
+        let description = input_schema
+            .get("description")
+            .and_then(|desc| desc.as_str())
+            .map(|desc| desc.to_string());
+        debug_assert!(
+            description.is_some(),
+            "Input schema struct must include a doc comment for the tool description"
+        );
 
         let registered_tool = RegisteredTool {
             tool: Tool {
                 name: T::NAME.into(),
-                description: Some(tool.description().into()),
-                input_schema: generator.root_schema_for::<T::Input>().into(),
-                output_schema: if output_schema == unit_schema {
+                description,
+                input_schema: input_schema.into(),
+                output_schema: if TypeId::of::<T::Output>() == TypeId::of::<()>() {
                     None
                 } else {
-                    Some(output_schema.into())
+                    Some(generator.root_schema_for::<T::Output>().into())
                 },
                 annotations: Some(tool.annotations()),
             },
@@ -399,8 +408,6 @@ pub trait McpServerTool {
 
     const NAME: &'static str;
 
-    fn description(&self) -> &'static str;
-
     fn annotations(&self) -> ToolAnnotations {
         ToolAnnotations {
             title: None,
@@ -418,6 +425,7 @@ pub trait McpServerTool {
     ) -> impl Future<Output = Result<ToolResponse<Self::Output>>>;
 }
 
+#[derive(Debug)]
 pub struct ToolResponse<T> {
     pub content: Vec<ToolResponseContent>,
     pub structured_content: T,
diff --git a/crates/context_server/src/types.rs b/crates/context_server/src/types.rs
index e92a18c763..03aca4f3ca 100644
--- a/crates/context_server/src/types.rs
+++ b/crates/context_server/src/types.rs
@@ -711,6 +711,16 @@ pub enum ToolResponseContent {
     Resource { resource: ResourceContents },
 }
 
+impl ToolResponseContent {
+    pub fn text(&self) -> Option<&str> {
+        if let ToolResponseContent::Text { text } = self {
+            Some(text)
+        } else {
+            None
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ListToolsResponse {

From 3996587c0b05ec30c54491f6911edb24c01996a5 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 19 Aug 2025 21:59:14 -0400
Subject: [PATCH 187/823] Add version detection for CC (#36502)

- Render a helpful message when the installed CC version is too old
- Show the full path for agent binaries when the version is not recent
enough (helps in cases where multiple binaries are installed in
different places)
- Add UI for the case where a server binary is not installed at all
- Refresh thread view after installing/updating server binary

Release Notes:

- N/A
---
 Cargo.lock                             |   1 +
 crates/acp_thread/src/acp_thread.rs    |  22 ++-
 crates/agent_servers/Cargo.toml        |   1 +
 crates/agent_servers/src/acp/v1.rs     |   6 +-
 crates/agent_servers/src/claude.rs     |  57 +++++++-
 crates/agent_servers/src/gemini.rs     |  11 +-
 crates/agent_ui/src/acp/thread_view.rs | 180 +++++++++++++++----------
 crates/agent_ui/src/agent_diff.rs      |   2 +-
 8 files changed, 195 insertions(+), 85 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 34a8ceac49..5dced73fb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -285,6 +285,7 @@ dependencies = [
  "project",
  "rand 0.8.5",
  "schemars",
+ "semver",
  "serde",
  "serde_json",
  "settings",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 2be7ea7a12..5d3b35d018 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -707,7 +707,7 @@ pub enum AcpThreadEvent {
     Retry(RetryStatus),
     Stopped,
     Error,
-    ServerExited(ExitStatus),
+    LoadError(LoadError),
 }
 
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -721,20 +721,30 @@ pub enum ThreadStatus {
 
 #[derive(Debug, Clone)]
 pub enum LoadError {
+    NotInstalled {
+        error_message: SharedString,
+        install_message: SharedString,
+        install_command: String,
+    },
     Unsupported {
         error_message: SharedString,
         upgrade_message: SharedString,
         upgrade_command: String,
     },
-    Exited(i32),
+    Exited {
+        status: ExitStatus,
+    },
     Other(SharedString),
 }
 
 impl Display for LoadError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            LoadError::Unsupported { error_message, .. } => write!(f, "{}", error_message),
-            LoadError::Exited(status) => write!(f, "Server exited with status {}", status),
+            LoadError::NotInstalled { error_message, .. }
+            | LoadError::Unsupported { error_message, .. } => {
+                write!(f, "{error_message}")
+            }
+            LoadError::Exited { status } => write!(f, "Server exited with status {status}"),
             LoadError::Other(msg) => write!(f, "{}", msg),
         }
     }
@@ -1683,8 +1693,8 @@ impl AcpThread {
         self.entries.iter().map(|e| e.to_markdown(cx)).collect()
     }
 
-    pub fn emit_server_exited(&mut self, status: ExitStatus, cx: &mut Context<Self>) {
-        cx.emit(AcpThreadEvent::ServerExited(status));
+    pub fn emit_load_error(&mut self, error: LoadError, cx: &mut Context<Self>) {
+        cx.emit(AcpThreadEvent::LoadError(error));
     }
 }
 
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 8cd6980ae1..b654486cb6 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -37,6 +37,7 @@ paths.workspace = true
 project.workspace = true
 rand.workspace = true
 schemars.workspace = true
+semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index d749537c4c..e0e92f29ba 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -14,7 +14,7 @@ use anyhow::{Context as _, Result};
 use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
 
 use crate::{AgentServerCommand, acp::UnsupportedVersion};
-use acp_thread::{AcpThread, AgentConnection, AuthRequired};
+use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError};
 
 pub struct AcpConnection {
     server_name: &'static str,
@@ -87,7 +87,9 @@ impl AcpConnection {
                 for session in sessions.borrow().values() {
                     session
                         .thread
-                        .update(cx, |thread, cx| thread.emit_server_exited(status, cx))
+                        .update(cx, |thread, cx| {
+                            thread.emit_load_error(LoadError::Exited { status }, cx)
+                        })
                         .ok();
                 }
 
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index a53c81d4c4..3008edebeb 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -15,8 +15,9 @@ use smol::process::Child;
 use std::any::Any;
 use std::cell::RefCell;
 use std::fmt::Display;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::rc::Rc;
+use util::command::new_smol_command;
 use uuid::Uuid;
 
 use agent_client_protocol as acp;
@@ -36,7 +37,7 @@ use util::{ResultExt, debug_panic};
 use crate::claude::mcp_server::{ClaudeZedMcpServer, McpConfig};
 use crate::claude::tools::ClaudeTool;
 use crate::{AgentServer, AgentServerCommand, AllAgentServersSettings};
-use acp_thread::{AcpThread, AgentConnection, AuthRequired, MentionUri};
+use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri};
 
 #[derive(Clone)]
 pub struct ClaudeCode;
@@ -103,7 +104,11 @@ impl AgentConnection for ClaudeAgentConnection {
             )
             .await
             else {
-                anyhow::bail!("Failed to find claude binary");
+                return Err(LoadError::NotInstalled {
+                    error_message: "Failed to find Claude Code binary".into(),
+                    install_message: "Install Claude Code".into(),
+                    install_command: "npm install -g @anthropic-ai/claude-code@latest".into(),
+                }.into());
             };
 
             let api_key =
@@ -211,9 +216,32 @@ impl AgentConnection for ClaudeAgentConnection {
                     if let Some(status) = child.status().await.log_err()
                         && let Some(thread) = thread_rx.recv().await.ok()
                     {
+                        let version = claude_version(command.path.clone(), cx).await.log_err();
+                        let help = claude_help(command.path.clone(), cx).await.log_err();
                         thread
                             .update(cx, |thread, cx| {
-                                thread.emit_server_exited(status, cx);
+                                let error = if let Some(version) = version
+                                    && let Some(help) = help
+                                    && (!help.contains("--input-format")
+                                        || !help.contains("--session-id"))
+                                {
+                                    LoadError::Unsupported {
+                                    error_message: format!(
+                                            "Your installed version of Claude Code ({}, version {}) does not have required features for use with Zed.",
+                                            command.path.to_string_lossy(),
+                                            version,
+                                        )
+                                        .into(),
+                                        upgrade_message: "Upgrade Claude Code to latest".into(),
+                                        upgrade_command: format!(
+                                            "{} update",
+                                            command.path.to_string_lossy()
+                                        ),
+                                    }
+                                } else {
+                                    LoadError::Exited { status }
+                                };
+                                thread.emit_load_error(error, cx);
                             })
                             .ok();
                     }
@@ -383,6 +411,27 @@ fn spawn_claude(
     Ok(child)
 }
 
+fn claude_version(path: PathBuf, cx: &mut AsyncApp) -> Task<Result<semver::Version>> {
+    cx.background_spawn(async move {
+        let output = new_smol_command(path).arg("--version").output().await?;
+        let output = String::from_utf8(output.stdout)?;
+        let version = output
+            .trim()
+            .strip_suffix(" (Claude Code)")
+            .context("parsing Claude version")?;
+        let version = semver::Version::parse(version)?;
+        anyhow::Ok(version)
+    })
+}
+
+fn claude_help(path: PathBuf, cx: &mut AsyncApp) -> Task<Result<String>> {
+    cx.background_spawn(async move {
+        let output = new_smol_command(path).arg("--help").output().await?;
+        let output = String::from_utf8(output.stdout)?;
+        anyhow::Ok(output)
+    })
+}
+
 struct ClaudeAgentSession {
     outgoing_tx: UnboundedSender<SdkMessage>,
     turn_state: Rc<RefCell<TurnState>>,
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 167e632d79..e1ecaf0bb5 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -50,7 +50,11 @@ impl AgentServer for Gemini {
             let Some(command) =
                 AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx).await
             else {
-                anyhow::bail!("Failed to find gemini binary");
+                return Err(LoadError::NotInstalled {
+                    error_message: "Failed to find Gemini CLI binary".into(),
+                    install_message: "Install Gemini CLI".into(),
+                    install_command: "npm install -g @google/gemini-cli@latest".into()
+                }.into());
             };
 
             let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
@@ -75,10 +79,11 @@ impl AgentServer for Gemini {
                 if !supported {
                     return Err(LoadError::Unsupported {
                         error_message: format!(
-                            "Your installed version of Gemini {} doesn't support the Agentic Coding Protocol (ACP).",
+                            "Your installed version of Gemini CLI ({}, version {}) doesn't support the Agentic Coding Protocol (ACP).",
+                            command.path.to_string_lossy(),
                             current_version
                         ).into(),
-                        upgrade_message: "Upgrade Gemini to Latest".into(),
+                        upgrade_message: "Upgrade Gemini CLI to latest".into(),
                         upgrade_command: "npm install -g @google/gemini-cli@latest".into(),
                     }.into())
                 }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 5e5d4bb83c..4a9001b9f4 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -37,7 +37,7 @@ use rope::Point;
 use settings::{Settings as _, SettingsStore};
 use std::sync::Arc;
 use std::time::Instant;
-use std::{collections::BTreeMap, process::ExitStatus, rc::Rc, time::Duration};
+use std::{collections::BTreeMap, rc::Rc, time::Duration};
 use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
@@ -149,9 +149,6 @@ enum ThreadState {
         configuration_view: Option<AnyView>,
         _subscription: Option<Subscription>,
     },
-    ServerExited {
-        status: ExitStatus,
-    },
 }
 
 impl AcpThreadView {
@@ -451,8 +448,7 @@ impl AcpThreadView {
             ThreadState::Ready { thread, .. } => Some(thread),
             ThreadState::Unauthenticated { .. }
             | ThreadState::Loading { .. }
-            | ThreadState::LoadError(..)
-            | ThreadState::ServerExited { .. } => None,
+            | ThreadState::LoadError { .. } => None,
         }
     }
 
@@ -462,7 +458,6 @@ impl AcpThreadView {
             ThreadState::Loading { .. } => "Loading…".into(),
             ThreadState::LoadError(_) => "Failed to load".into(),
             ThreadState::Unauthenticated { .. } => "Authentication Required".into(),
-            ThreadState::ServerExited { .. } => "Server exited unexpectedly".into(),
         }
     }
 
@@ -830,9 +825,9 @@ impl AcpThreadView {
                     cx,
                 );
             }
-            AcpThreadEvent::ServerExited(status) => {
+            AcpThreadEvent::LoadError(error) => {
                 self.thread_retry_status.take();
-                self.thread_state = ThreadState::ServerExited { status: *status };
+                self.thread_state = ThreadState::LoadError(error.clone());
             }
             AcpThreadEvent::TitleUpdated | AcpThreadEvent::TokenUsageUpdated => {}
         }
@@ -2154,28 +2149,6 @@ impl AcpThreadView {
             ))
     }
 
-    fn render_server_exited(&self, status: ExitStatus, _cx: &Context<Self>) -> AnyElement {
-        v_flex()
-            .items_center()
-            .justify_center()
-            .child(self.render_error_agent_logo())
-            .child(
-                v_flex()
-                    .mt_4()
-                    .mb_2()
-                    .gap_0p5()
-                    .text_center()
-                    .items_center()
-                    .child(Headline::new("Server exited unexpectedly").size(HeadlineSize::Medium))
-                    .child(
-                        Label::new(format!("Exit status: {}", status.code().unwrap_or(-127)))
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    ),
-            )
-            .into_any_element()
-    }
-
     fn render_load_error(&self, e: &LoadError, cx: &Context<Self>) -> AnyElement {
         let mut container = v_flex()
             .items_center()
@@ -2204,39 +2177,102 @@ impl AcpThreadView {
         {
             let upgrade_message = upgrade_message.clone();
             let upgrade_command = upgrade_command.clone();
-            container = container.child(Button::new("upgrade", upgrade_message).on_click(
-                cx.listener(move |this, _, window, cx| {
-                    this.workspace
-                        .update(cx, |workspace, cx| {
-                            let project = workspace.project().read(cx);
-                            let cwd = project.first_project_directory(cx);
-                            let shell = project.terminal_settings(&cwd, cx).shell.clone();
-                            let spawn_in_terminal = task::SpawnInTerminal {
-                                id: task::TaskId("install".to_string()),
-                                full_label: upgrade_command.clone(),
-                                label: upgrade_command.clone(),
-                                command: Some(upgrade_command.clone()),
-                                args: Vec::new(),
-                                command_label: upgrade_command.clone(),
-                                cwd,
-                                env: Default::default(),
-                                use_new_terminal: true,
-                                allow_concurrent_runs: true,
-                                reveal: Default::default(),
-                                reveal_target: Default::default(),
-                                hide: Default::default(),
-                                shell,
-                                show_summary: true,
-                                show_command: true,
-                                show_rerun: false,
-                            };
-                            workspace
-                                .spawn_in_terminal(spawn_in_terminal, window, cx)
-                                .detach();
+            container = container.child(
+                Button::new("upgrade", upgrade_message)
+                    .tooltip(Tooltip::text(upgrade_command.clone()))
+                    .on_click(cx.listener(move |this, _, window, cx| {
+                        let task = this
+                            .workspace
+                            .update(cx, |workspace, cx| {
+                                let project = workspace.project().read(cx);
+                                let cwd = project.first_project_directory(cx);
+                                let shell = project.terminal_settings(&cwd, cx).shell.clone();
+                                let spawn_in_terminal = task::SpawnInTerminal {
+                                    id: task::TaskId("upgrade".to_string()),
+                                    full_label: upgrade_command.clone(),
+                                    label: upgrade_command.clone(),
+                                    command: Some(upgrade_command.clone()),
+                                    args: Vec::new(),
+                                    command_label: upgrade_command.clone(),
+                                    cwd,
+                                    env: Default::default(),
+                                    use_new_terminal: true,
+                                    allow_concurrent_runs: true,
+                                    reveal: Default::default(),
+                                    reveal_target: Default::default(),
+                                    hide: Default::default(),
+                                    shell,
+                                    show_summary: true,
+                                    show_command: true,
+                                    show_rerun: false,
+                                };
+                                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
+                            })
+                            .ok();
+                        let Some(task) = task else { return };
+                        cx.spawn_in(window, async move |this, cx| {
+                            if let Some(Ok(_)) = task.await {
+                                this.update_in(cx, |this, window, cx| {
+                                    this.reset(window, cx);
+                                })
+                                .ok();
+                            }
                         })
-                        .ok();
-                }),
-            ));
+                        .detach()
+                    })),
+            );
+        } else if let LoadError::NotInstalled {
+            install_message,
+            install_command,
+            ..
+        } = e
+        {
+            let install_message = install_message.clone();
+            let install_command = install_command.clone();
+            container = container.child(
+                Button::new("install", install_message)
+                    .tooltip(Tooltip::text(install_command.clone()))
+                    .on_click(cx.listener(move |this, _, window, cx| {
+                        let task = this
+                            .workspace
+                            .update(cx, |workspace, cx| {
+                                let project = workspace.project().read(cx);
+                                let cwd = project.first_project_directory(cx);
+                                let shell = project.terminal_settings(&cwd, cx).shell.clone();
+                                let spawn_in_terminal = task::SpawnInTerminal {
+                                    id: task::TaskId("install".to_string()),
+                                    full_label: install_command.clone(),
+                                    label: install_command.clone(),
+                                    command: Some(install_command.clone()),
+                                    args: Vec::new(),
+                                    command_label: install_command.clone(),
+                                    cwd,
+                                    env: Default::default(),
+                                    use_new_terminal: true,
+                                    allow_concurrent_runs: true,
+                                    reveal: Default::default(),
+                                    reveal_target: Default::default(),
+                                    hide: Default::default(),
+                                    shell,
+                                    show_summary: true,
+                                    show_command: true,
+                                    show_rerun: false,
+                                };
+                                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
+                            })
+                            .ok();
+                        let Some(task) = task else { return };
+                        cx.spawn_in(window, async move |this, cx| {
+                            if let Some(Ok(_)) = task.await {
+                                this.update_in(cx, |this, window, cx| {
+                                    this.reset(window, cx);
+                                })
+                                .ok();
+                            }
+                        })
+                        .detach()
+                    })),
+            );
         }
 
         container.into_any()
@@ -3705,6 +3741,18 @@ impl AcpThreadView {
                 }
             }))
     }
+
+    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.thread_state = Self::initial_state(
+            self.agent.clone(),
+            None,
+            self.workspace.clone(),
+            self.project.clone(),
+            window,
+            cx,
+        );
+        cx.notify();
+    }
 }
 
 impl Focusable for AcpThreadView {
@@ -3743,12 +3791,6 @@ impl Render for AcpThreadView {
                     .items_center()
                     .justify_center()
                     .child(self.render_load_error(e, cx)),
-                ThreadState::ServerExited { status } => v_flex()
-                    .p_2()
-                    .flex_1()
-                    .items_center()
-                    .justify_center()
-                    .child(self.render_server_exited(*status, cx)),
                 ThreadState::Ready { thread, .. } => {
                     let thread_clone = thread.clone();
 
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index a695136562..b20b126d9b 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1522,7 +1522,7 @@ impl AgentDiff {
                     self.update_reviewing_editors(workspace, window, cx);
                 }
             }
-            AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::ServerExited(_) => {
+            AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::LoadError(_) => {
                 self.update_reviewing_editors(workspace, window, cx);
             }
             AcpThreadEvent::TitleUpdated

From b12d862236d9872a31868746c4ed7423535137d6 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 19 Aug 2025 23:11:17 -0300
Subject: [PATCH 188/823] Rename acp flag (#36541)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs        | 18 +++++++++---------
 crates/feature_flags/src/feature_flags.rs | 11 ++++++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 93e9f619af..297bb5f3e8 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -45,7 +45,7 @@ use assistant_tool::ToolWorkingSet;
 use client::{UserStore, zed_urls};
 use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
-use feature_flags::{self, AcpFeatureFlag, ClaudeCodeFeatureFlag, FeatureFlagAppExt};
+use feature_flags::{self, ClaudeCodeFeatureFlag, FeatureFlagAppExt, GeminiAndNativeFeatureFlag};
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem,
@@ -725,7 +725,7 @@ impl AgentPanel {
             let assistant_navigation_menu =
                 ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| {
                     if let Some(panel) = panel.upgrade() {
-                        if cx.has_flag::<AcpFeatureFlag>() {
+                        if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                             menu = Self::populate_recently_opened_menu_section_new(menu, panel, cx);
                         } else {
                             menu = Self::populate_recently_opened_menu_section_old(menu, panel, cx);
@@ -881,7 +881,7 @@ impl AgentPanel {
     }
 
     fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.has_flag::<AcpFeatureFlag>() {
+        if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
             return self.new_agent_thread(AgentType::NativeAgent, window, cx);
         }
         // Preserve chat box text when using creating new thread
@@ -1058,7 +1058,7 @@ impl AgentPanel {
             this.update_in(cx, |this, window, cx| {
                 match ext_agent {
                     crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => {
-                        if !cx.has_flag::<AcpFeatureFlag>() {
+                        if !cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                             return;
                         }
                     }
@@ -1825,7 +1825,7 @@ impl Focusable for AgentPanel {
             ActiveView::Thread { message_editor, .. } => message_editor.focus_handle(cx),
             ActiveView::ExternalAgentThread { thread_view, .. } => thread_view.focus_handle(cx),
             ActiveView::History => {
-                if cx.has_flag::<feature_flags::AcpFeatureFlag>() {
+                if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>() {
                     self.acp_history.focus_handle(cx)
                 } else {
                     self.history.focus_handle(cx)
@@ -2441,7 +2441,7 @@ impl AgentPanel {
                             )
                             .separator()
                             .header("External Agents")
-                            .when(cx.has_flag::<AcpFeatureFlag>(), |menu| {
+                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
                                 menu.item(
                                     ContextMenuEntry::new("New Gemini Thread")
                                         .icon(IconName::AiGemini)
@@ -2564,7 +2564,7 @@ impl AgentPanel {
     }
 
     fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if cx.has_flag::<feature_flags::AcpFeatureFlag>()
+        if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>()
             || cx.has_flag::<feature_flags::ClaudeCodeFeatureFlag>()
         {
             self.render_toolbar_new(window, cx).into_any_element()
@@ -2749,7 +2749,7 @@ impl AgentPanel {
                 false
             }
             _ => {
-                let history_is_empty = if cx.has_flag::<AcpFeatureFlag>() {
+                let history_is_empty = if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                     self.acp_history_store.read(cx).is_empty(cx)
                 } else {
                     self.history_store
@@ -3641,7 +3641,7 @@ impl Render for AgentPanel {
                     .child(thread_view.clone())
                     .child(self.render_drag_target(cx)),
                 ActiveView::History => {
-                    if cx.has_flag::<feature_flags::AcpFeatureFlag>() {
+                    if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>() {
                         parent.child(self.acp_history.clone())
                     } else {
                         parent.child(self.history.clone())
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 49ccfcc85c..422979c429 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -89,10 +89,15 @@ impl FeatureFlag for JjUiFeatureFlag {
     const NAME: &'static str = "jj-ui";
 }
 
-pub struct AcpFeatureFlag;
+pub struct GeminiAndNativeFeatureFlag;
 
-impl FeatureFlag for AcpFeatureFlag {
-    const NAME: &'static str = "acp";
+impl FeatureFlag for GeminiAndNativeFeatureFlag {
+    // This was previously called "acp".
+    //
+    // We renamed it because existing builds used it to enable the Claude Code
+    // integration too, and we'd like to turn Gemini/Native on in new builds
+    // without enabling Claude Code in old builds.
+    const NAME: &'static str = "gemini-and-native";
 }
 
 pub struct ClaudeCodeFeatureFlag;

From cac80e2ebde41fb66de4e47cc9f8e9a8398cb7a6 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 19 Aug 2025 20:26:56 -0600
Subject: [PATCH 189/823] Silence a bucketload of logs (#36534)

Closes #ISSUE

Release Notes:

- Silenced a bunch of logs that were on by default
---
 crates/agent2/src/tools/terminal_tool.rs             | 5 +----
 crates/assistant_context/src/context_store.rs        | 2 +-
 crates/assistant_tools/src/terminal_tool.rs          | 5 +----
 crates/context_server/src/client.rs                  | 4 ++--
 crates/context_server/src/context_server.rs          | 2 +-
 crates/db/src/db.rs                                  | 2 +-
 crates/editor/src/editor.rs                          | 5 +----
 crates/gpui/src/arena.rs                             | 2 +-
 crates/language/src/language.rs                      | 6 +++---
 crates/project/src/context_server_store.rs           | 1 -
 crates/project/src/context_server_store/extension.rs | 2 +-
 crates/project/src/debugger/breakpoint_store.rs      | 1 -
 crates/project/src/lsp_store.rs                      | 4 ++--
 crates/prompt_store/src/prompts.rs                   | 8 ++++----
 crates/rpc/src/peer.rs                               | 2 --
 crates/workspace/src/workspace.rs                    | 2 --
 crates/zeta/src/license_detection.rs                 | 8 ++++----
 17 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index d8f0282f4b..17e671fba3 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -47,12 +47,9 @@ impl TerminalTool {
             }
 
             if which::which("bash").is_ok() {
-                log::info!("agent selected bash for terminal tool");
                 "bash".into()
             } else {
-                let shell = get_system_shell();
-                log::info!("agent selected {shell} for terminal tool");
-                shell
+                get_system_shell()
             }
         });
         Self {
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index 6d13531a57..c5b5e99a52 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -905,7 +905,7 @@ impl ContextStore {
                     .into_iter()
                     .filter(assistant_slash_commands::acceptable_prompt)
                     .map(|prompt| {
-                        log::info!("registering context server command: {:?}", prompt.name);
+                        log::debug!("registering context server command: {:?}", prompt.name);
                         slash_command_working_set.insert(Arc::new(
                             assistant_slash_commands::ContextServerSlashCommand::new(
                                 context_server_store.clone(),
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index 14bbcef8b4..358d62ee1a 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -59,12 +59,9 @@ impl TerminalTool {
             }
 
             if which::which("bash").is_ok() {
-                log::info!("agent selected bash for terminal tool");
                 "bash".into()
             } else {
-                let shell = get_system_shell();
-                log::info!("agent selected {shell} for terminal tool");
-                shell
+                get_system_shell()
             }
         });
         Self {
diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs
index 609d2c43e3..ccf7622d82 100644
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -161,7 +161,7 @@ impl Client {
         working_directory: &Option<PathBuf>,
         cx: AsyncApp,
     ) -> Result<Self> {
-        log::info!(
+        log::debug!(
             "starting context server (executable={:?}, args={:?})",
             binary.executable,
             &binary.args
@@ -295,7 +295,7 @@ impl Client {
     /// Continuously reads and logs any error messages from the server.
     async fn handle_err(transport: Arc<dyn Transport>) -> anyhow::Result<()> {
         while let Some(err) = transport.receive_err().next().await {
-            log::warn!("context server stderr: {}", err.trim());
+            log::debug!("context server stderr: {}", err.trim());
         }
 
         Ok(())
diff --git a/crates/context_server/src/context_server.rs b/crates/context_server/src/context_server.rs
index 34fa29678d..9ca78138db 100644
--- a/crates/context_server/src/context_server.rs
+++ b/crates/context_server/src/context_server.rs
@@ -137,7 +137,7 @@ impl ContextServer {
     }
 
     async fn initialize(&self, client: Client) -> Result<()> {
-        log::info!("starting context server {}", self.id);
+        log::debug!("starting context server {}", self.id);
         let protocol = crate::protocol::ModelContextProtocol::new(client);
         let client_info = types::Implementation {
             name: "Zed".to_string(),
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
index 37e347282d..8b790cbec8 100644
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -74,7 +74,7 @@ pub async fn open_db<M: Migrator + 'static>(db_dir: &Path, scope: &str) -> Threa
 }
 
 async fn open_main_db<M: Migrator>(db_path: &Path) -> Option<ThreadSafeConnection> {
-    log::info!("Opening database {}", db_path.display());
+    log::trace!("Opening database {}", db_path.display());
     ThreadSafeConnection::builder::<M>(db_path.to_string_lossy().as_ref(), true)
         .with_db_initialization_query(DB_INITIALIZE_QUERY)
         .with_connection_initialize_query(CONNECTION_INITIALIZE_QUERY)
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f943e64923..575631b517 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -16606,10 +16606,7 @@ impl Editor {
                     .transaction(transaction_id_prev)
                     .map(|t| t.0.clone())
             })
-            .unwrap_or_else(|| {
-                log::info!("Failed to determine selections from before format. Falling back to selections when format was initiated");
-                self.selections.disjoint_anchors()
-            });
+            .unwrap_or_else(|| self.selections.disjoint_anchors());
 
         let mut timeout = cx.background_executor().timer(FORMAT_TIMEOUT).fuse();
         let format = project.update(cx, |project, cx| {
diff --git a/crates/gpui/src/arena.rs b/crates/gpui/src/arena.rs
index ee72d0e964..0983bd2345 100644
--- a/crates/gpui/src/arena.rs
+++ b/crates/gpui/src/arena.rs
@@ -142,7 +142,7 @@ impl Arena {
                 if self.current_chunk_index >= self.chunks.len() {
                     self.chunks.push(Chunk::new(self.chunk_size));
                     assert_eq!(self.current_chunk_index, self.chunks.len() - 1);
-                    log::info!(
+                    log::trace!(
                         "increased element arena capacity to {}kb",
                         self.capacity() / 1024,
                     );
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index b70e466246..87fc846a53 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -331,7 +331,7 @@ pub trait LspAdapter: 'static + Send + Sync {
             // for each worktree we might have open.
             if binary_options.allow_path_lookup
                 && let Some(binary) = self.check_if_user_installed(delegate.as_ref(), toolchains, cx).await {
-                    log::info!(
+                    log::debug!(
                         "found user-installed language server for {}. path: {:?}, arguments: {:?}",
                         self.name().0,
                         binary.path,
@@ -601,7 +601,7 @@ async fn try_fetch_server_binary<L: LspAdapter + 'static + Send + Sync + ?Sized>
     }
 
     let name = adapter.name();
-    log::info!("fetching latest version of language server {:?}", name.0);
+    log::debug!("fetching latest version of language server {:?}", name.0);
     delegate.update_status(name.clone(), BinaryStatus::CheckingForUpdate);
 
     let latest_version = adapter
@@ -612,7 +612,7 @@ async fn try_fetch_server_binary<L: LspAdapter + 'static + Send + Sync + ?Sized>
         .check_if_version_installed(latest_version.as_ref(), &container_dir, delegate.as_ref())
         .await
     {
-        log::info!("language server {:?} is already installed", name.0);
+        log::debug!("language server {:?} is already installed", name.0);
         delegate.update_status(name.clone(), BinaryStatus::None);
         Ok(binary)
     } else {
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index 16625caeb4..e826f44b7b 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -399,7 +399,6 @@ impl ContextServerStore {
             async move |this, cx| {
                 match server.clone().start(cx).await {
                     Ok(_) => {
-                        log::info!("Started {} context server", id);
                         debug_assert!(server.client().is_some());
 
                         this.update(cx, |this, cx| {
diff --git a/crates/project/src/context_server_store/extension.rs b/crates/project/src/context_server_store/extension.rs
index 1eb0fe7da1..2a3a0c2e4b 100644
--- a/crates/project/src/context_server_store/extension.rs
+++ b/crates/project/src/context_server_store/extension.rs
@@ -63,7 +63,7 @@ impl registry::ContextServerDescriptor for ContextServerDescriptor {
                 .await?;
             command.command = extension.path_from_extension(&command.command);
 
-            log::info!("loaded command for context server {id}: {command:?}");
+            log::debug!("loaded command for context server {id}: {command:?}");
 
             Ok(ContextServerCommand {
                 path: command.command,
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
index 38d8b4cfc6..00fcc7e69f 100644
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ b/crates/project/src/debugger/breakpoint_store.rs
@@ -831,7 +831,6 @@ impl BreakpointStore {
                     new_breakpoints.insert(path, breakpoints_for_file);
                 }
                 this.update(cx, |this, cx| {
-                    log::info!("Finish deserializing breakpoints & initializing breakpoint store");
                     for (path, count) in new_breakpoints.iter().map(|(path, bp_in_file)| {
                         (path.to_string_lossy(), bp_in_file.breakpoints.len())
                     }) {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index a8c6ffd878..d2fb12ee37 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -296,7 +296,7 @@ impl LocalLspStore {
         let stderr_capture = Arc::new(Mutex::new(Some(String::new())));
 
         let server_id = self.languages.next_language_server_id();
-        log::info!(
+        log::trace!(
             "attempting to start language server {:?}, path: {root_path:?}, id: {server_id}",
             adapter.name.0
         );
@@ -7529,7 +7529,7 @@ impl LspStore {
                 .ok()
                 .flatten()?;
 
-            log::info!("Refreshing workspace configurations for servers {refreshed_servers:?}");
+            log::debug!("Refreshing workspace configurations for servers {refreshed_servers:?}");
             // TODO this asynchronous job runs concurrently with extension (de)registration and may take enough time for a certain extension
             // to stop and unregister its language server wrapper.
             // This is racy : an extension might have already removed all `local.language_servers` state, but here we `.clone()` and hold onto it anyway.
diff --git a/crates/prompt_store/src/prompts.rs b/crates/prompt_store/src/prompts.rs
index cd34bafb20..4ab867ab64 100644
--- a/crates/prompt_store/src/prompts.rs
+++ b/crates/prompt_store/src/prompts.rs
@@ -229,12 +229,12 @@ impl PromptBuilder {
                         log_message.push_str(" -> ");
                         log_message.push_str(&target.display().to_string());
                     }
-                    log::info!("{}.", log_message);
+                    log::trace!("{}.", log_message);
                 } else {
                     if !found_dir_once {
-                        log::info!("No prompt template overrides directory found at {}. Using built-in prompts.", templates_dir.display());
+                        log::trace!("No prompt template overrides directory found at {}. Using built-in prompts.", templates_dir.display());
                         if let Some(target) = symlink_status {
-                            log::info!("Symlink found pointing to {}, but target is invalid.", target.display());
+                            log::trace!("Symlink found pointing to {}, but target is invalid.", target.display());
                         }
                     }
 
@@ -247,7 +247,7 @@ impl PromptBuilder {
                                     log_message.push_str(" -> ");
                                     log_message.push_str(&target.display().to_string());
                                 }
-                                log::info!("{}.", log_message);
+                                log::trace!("{}.", log_message);
                                 break;
                             }
                         }
diff --git a/crates/rpc/src/peer.rs b/crates/rpc/src/peer.rs
index 8b77788d22..98f5fa40e9 100644
--- a/crates/rpc/src/peer.rs
+++ b/crates/rpc/src/peer.rs
@@ -26,7 +26,6 @@ use std::{
     time::Duration,
     time::Instant,
 };
-use tracing::instrument;
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
 pub struct ConnectionId {
@@ -109,7 +108,6 @@ impl Peer {
         self.epoch.load(SeqCst)
     }
 
-    #[instrument(skip_all)]
     pub fn add_connection<F, Fut, Out>(
         self: &Arc<Self>,
         connection: Connection,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 8c1be61abf..d64a4472a0 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2503,8 +2503,6 @@ impl Workspace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Vec<Option<anyhow::Result<Box<dyn ItemHandle>>>>> {
-        log::info!("open paths {abs_paths:?}");
-
         let fs = self.app_state.fs.clone();
 
         // Sort the paths to ensure we add worktrees for parents before their children.
diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index 3dd025c1e1..022b2d19de 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -143,10 +143,10 @@ impl LicenseDetectionWatcher {
     }
 
     async fn is_path_eligible(fs: &Arc<dyn Fs>, abs_path: PathBuf) -> Option<bool> {
-        log::info!("checking if `{abs_path:?}` is an open source license");
+        log::debug!("checking if `{abs_path:?}` is an open source license");
         // Resolve symlinks so that the file size from metadata is correct.
         let Some(abs_path) = fs.canonicalize(&abs_path).await.ok() else {
-            log::info!(
+            log::debug!(
                 "`{abs_path:?}` license file probably deleted (error canonicalizing the path)"
             );
             return None;
@@ -159,11 +159,11 @@ impl LicenseDetectionWatcher {
         let text = fs.load(&abs_path).await.log_err()?;
         let is_eligible = is_license_eligible_for_data_collection(&text);
         if is_eligible {
-            log::info!(
+            log::debug!(
                 "`{abs_path:?}` matches a license that is eligible for data collection (if enabled)"
             );
         } else {
-            log::info!(
+            log::debug!(
                 "`{abs_path:?}` does not match a license that is eligible for data collection"
             );
         }

From ceec258bf32cf86ef6a3948d60385aeb8a639390 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 20 Aug 2025 05:40:39 +0200
Subject: [PATCH 190/823] Some clippy fixes (#36544)

These showed up today, so just applied the simplifications, which were
mostly switching matches to if let

Release Notes:

- N/A
---
 crates/inspector_ui/src/div_inspector.rs |  42 +++--
 crates/remote/src/ssh_session.rs         | 193 +++++++++++------------
 crates/vim/src/test/neovim_connection.rs |   8 +-
 3 files changed, 117 insertions(+), 126 deletions(-)

diff --git a/crates/inspector_ui/src/div_inspector.rs b/crates/inspector_ui/src/div_inspector.rs
index e9460cc9cc..0c2b16b9f4 100644
--- a/crates/inspector_ui/src/div_inspector.rs
+++ b/crates/inspector_ui/src/div_inspector.rs
@@ -93,8 +93,8 @@ impl DivInspector {
                     Ok((json_style_buffer, rust_style_buffer)) => {
                         this.update_in(cx, |this, window, cx| {
                             this.state = State::BuffersLoaded {
-                                json_style_buffer: json_style_buffer,
-                                rust_style_buffer: rust_style_buffer,
+                                json_style_buffer,
+                                rust_style_buffer,
                             };
 
                             // Initialize editors immediately instead of waiting for
@@ -200,8 +200,8 @@ impl DivInspector {
         cx.subscribe_in(&json_style_editor, window, {
             let id = id.clone();
             let rust_style_buffer = rust_style_buffer.clone();
-            move |this, editor, event: &EditorEvent, window, cx| match event {
-                EditorEvent::BufferEdited => {
+            move |this, editor, event: &EditorEvent, window, cx| {
+                if event == &EditorEvent::BufferEdited {
                     let style_json = editor.read(cx).text(cx);
                     match serde_json_lenient::from_str_lenient::<StyleRefinement>(&style_json) {
                         Ok(new_style) => {
@@ -243,7 +243,6 @@ impl DivInspector {
                         Err(err) => this.json_style_error = Some(err.to_string().into()),
                     }
                 }
-                _ => {}
             }
         })
         .detach();
@@ -251,11 +250,10 @@ impl DivInspector {
         cx.subscribe(&rust_style_editor, {
             let json_style_buffer = json_style_buffer.clone();
             let rust_style_buffer = rust_style_buffer.clone();
-            move |this, _editor, event: &EditorEvent, cx| match event {
-                EditorEvent::BufferEdited => {
+            move |this, _editor, event: &EditorEvent, cx| {
+                if let EditorEvent::BufferEdited = event {
                     this.update_json_style_from_rust(&json_style_buffer, &rust_style_buffer, cx);
                 }
-                _ => {}
             }
         })
         .detach();
@@ -271,23 +269,19 @@ impl DivInspector {
     }
 
     fn reset_style(&mut self, cx: &mut App) {
-        match &self.state {
-            State::Ready {
-                rust_style_buffer,
-                json_style_buffer,
-                ..
-            } => {
-                if let Err(err) = self.reset_style_editors(
-                    &rust_style_buffer.clone(),
-                    &json_style_buffer.clone(),
-                    cx,
-                ) {
-                    self.json_style_error = Some(format!("{err}").into());
-                } else {
-                    self.json_style_error = None;
-                }
+        if let State::Ready {
+            rust_style_buffer,
+            json_style_buffer,
+            ..
+        } = &self.state
+        {
+            if let Err(err) =
+                self.reset_style_editors(&rust_style_buffer.clone(), &json_style_buffer.clone(), cx)
+            {
+                self.json_style_error = Some(format!("{err}").into());
+            } else {
+                self.json_style_error = None;
             }
-            _ => {}
         }
     }
 
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index ffd0cac310..7173bc9b3b 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -2125,109 +2125,106 @@ impl SshRemoteConnection {
                     .env("RUSTFLAGS", &rust_flags),
             )
             .await?;
+        } else if build_remote_server.contains("cross") {
+            #[cfg(target_os = "windows")]
+            use util::paths::SanitizedPath;
+
+            delegate.set_status(Some("Installing cross.rs for cross-compilation"), cx);
+            log::info!("installing cross");
+            run_cmd(Command::new("cargo").args([
+                "install",
+                "cross",
+                "--git",
+                "https://github.com/cross-rs/cross",
+            ]))
+            .await?;
+
+            delegate.set_status(
+                Some(&format!(
+                    "Building remote server binary from source for {} with Docker",
+                    &triple
+                )),
+                cx,
+            );
+            log::info!("building remote server binary from source for {}", &triple);
+
+            // On Windows, the binding needs to be set to the canonical path
+            #[cfg(target_os = "windows")]
+            let src =
+                SanitizedPath::from(smol::fs::canonicalize("./target").await?).to_glob_string();
+            #[cfg(not(target_os = "windows"))]
+            let src = "./target";
+            run_cmd(
+                Command::new("cross")
+                    .args([
+                        "build",
+                        "--package",
+                        "remote_server",
+                        "--features",
+                        "debug-embed",
+                        "--target-dir",
+                        "target/remote_server",
+                        "--target",
+                        &triple,
+                    ])
+                    .env(
+                        "CROSS_CONTAINER_OPTS",
+                        format!("--mount type=bind,src={src},dst=/app/target"),
+                    )
+                    .env("RUSTFLAGS", &rust_flags),
+            )
+            .await?;
         } else {
-            if build_remote_server.contains("cross") {
-                #[cfg(target_os = "windows")]
-                use util::paths::SanitizedPath;
+            let which = cx
+                .background_spawn(async move { which::which("zig") })
+                .await;
 
-                delegate.set_status(Some("Installing cross.rs for cross-compilation"), cx);
-                log::info!("installing cross");
-                run_cmd(Command::new("cargo").args([
-                    "install",
-                    "cross",
-                    "--git",
-                    "https://github.com/cross-rs/cross",
-                ]))
-                .await?;
-
-                delegate.set_status(
-                    Some(&format!(
-                        "Building remote server binary from source for {} with Docker",
-                        &triple
-                    )),
-                    cx,
-                );
-                log::info!("building remote server binary from source for {}", &triple);
-
-                // On Windows, the binding needs to be set to the canonical path
-                #[cfg(target_os = "windows")]
-                let src =
-                    SanitizedPath::from(smol::fs::canonicalize("./target").await?).to_glob_string();
+            if which.is_err() {
                 #[cfg(not(target_os = "windows"))]
-                let src = "./target";
-                run_cmd(
-                    Command::new("cross")
-                        .args([
-                            "build",
-                            "--package",
-                            "remote_server",
-                            "--features",
-                            "debug-embed",
-                            "--target-dir",
-                            "target/remote_server",
-                            "--target",
-                            &triple,
-                        ])
-                        .env(
-                            "CROSS_CONTAINER_OPTS",
-                            format!("--mount type=bind,src={src},dst=/app/target"),
-                        )
-                        .env("RUSTFLAGS", &rust_flags),
-                )
-                .await?;
-            } else {
-                let which = cx
-                    .background_spawn(async move { which::which("zig") })
-                    .await;
-
-                if which.is_err() {
-                    #[cfg(not(target_os = "windows"))]
-                    {
-                        anyhow::bail!(
-                            "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
-                        )
-                    }
-                    #[cfg(target_os = "windows")]
-                    {
-                        anyhow::bail!(
-                            "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
-                        )
-                    }
+                {
+                    anyhow::bail!(
+                        "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
+                    )
+                }
+                #[cfg(target_os = "windows")]
+                {
+                    anyhow::bail!(
+                        "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
+                    )
                 }
-
-                delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
-                log::info!("adding rustup target");
-                run_cmd(Command::new("rustup").args(["target", "add"]).arg(&triple)).await?;
-
-                delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
-                log::info!("installing cargo-zigbuild");
-                run_cmd(Command::new("cargo").args(["install", "--locked", "cargo-zigbuild"]))
-                    .await?;
-
-                delegate.set_status(
-                    Some(&format!(
-                        "Building remote binary from source for {triple} with Zig"
-                    )),
-                    cx,
-                );
-                log::info!("building remote binary from source for {triple} with Zig");
-                run_cmd(
-                    Command::new("cargo")
-                        .args([
-                            "zigbuild",
-                            "--package",
-                            "remote_server",
-                            "--features",
-                            "debug-embed",
-                            "--target-dir",
-                            "target/remote_server",
-                            "--target",
-                            &triple,
-                        ])
-                        .env("RUSTFLAGS", &rust_flags),
-                )
-                .await?;
             }
+
+            delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
+            log::info!("adding rustup target");
+            run_cmd(Command::new("rustup").args(["target", "add"]).arg(&triple)).await?;
+
+            delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
+            log::info!("installing cargo-zigbuild");
+            run_cmd(Command::new("cargo").args(["install", "--locked", "cargo-zigbuild"])).await?;
+
+            delegate.set_status(
+                Some(&format!(
+                    "Building remote binary from source for {triple} with Zig"
+                )),
+                cx,
+            );
+            log::info!("building remote binary from source for {triple} with Zig");
+            run_cmd(
+                Command::new("cargo")
+                    .args([
+                        "zigbuild",
+                        "--package",
+                        "remote_server",
+                        "--features",
+                        "debug-embed",
+                        "--target-dir",
+                        "target/remote_server",
+                        "--target",
+                        &triple,
+                    ])
+                    .env("RUSTFLAGS", &rust_flags),
+            )
+            .await?;
         };
         let bin_path = Path::new("target")
             .join("remote_server")
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
index c2f7414f44..f87ccc283f 100644
--- a/crates/vim/src/test/neovim_connection.rs
+++ b/crates/vim/src/test/neovim_connection.rs
@@ -299,10 +299,10 @@ impl NeovimConnection {
         if let Some(NeovimData::Get { .. }) = self.data.front() {
             self.data.pop_front();
         };
-        if let Some(NeovimData::ReadRegister { name, value }) = self.data.pop_front() {
-            if name == register {
-                return value;
-            }
+        if let Some(NeovimData::ReadRegister { name, value }) = self.data.pop_front()
+            && name == register
+        {
+            return value;
         }
 
         panic!("operation does not match recorded script. re-record with --features=neovim")

From d273aca1c1f3abc5159457b8af977fd40fbedb7c Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 20 Aug 2025 06:06:24 +0200
Subject: [PATCH 191/823] agent_ui: Add check to prevent sending empty messages
 in MessageEditor (#36545)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/message_editor.rs |  5 ++++-
 crates/agent_ui/src/acp/thread_view.rs    | 26 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 311fe258de..cb20740f3c 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -66,7 +66,7 @@ pub struct MessageEditor {
     _parse_slash_command_task: Task<()>,
 }
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub enum MessageEditorEvent {
     Send,
     Cancel,
@@ -728,6 +728,9 @@ impl MessageEditor {
     }
 
     fn send(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
+        if self.is_empty(cx) {
+            return;
+        }
         cx.emit(MessageEditorEvent::Send)
     }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 4a9001b9f4..05f626d48e 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4564,6 +4564,32 @@ pub(crate) mod tests {
         });
     }
 
+    #[gpui::test]
+    async fn test_message_doesnt_send_if_empty(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let connection = StubAgentConnection::new();
+
+        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
+        add_to_workspace(thread_view.clone(), cx);
+
+        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+        let mut events = cx.events(&message_editor);
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("", window, cx);
+        });
+
+        message_editor.update_in(cx, |_editor, window, cx| {
+            window.dispatch_action(Box::new(Chat), cx);
+        });
+        cx.run_until_parked();
+        // We shouldn't have received any messages
+        assert!(matches!(
+            events.try_next(),
+            Err(futures::channel::mpsc::TryRecvError { .. })
+        ));
+    }
+
     #[gpui::test]
     async fn test_message_editing_regenerate(cx: &mut TestAppContext) {
         init_test(cx);

From fbba6addfd1f1539408af582e65b356a308ba2f7 Mon Sep 17 00:00:00 2001
From: zumbalogy <zumbalogy@users.noreply.github.com>
Date: Wed, 20 Aug 2025 06:39:51 +0200
Subject: [PATCH 192/823] docs: Document `global_lsp_settings.button` and
 remove duplicate docs for `lsp_highlight_debounce` (#36547)

Follow up to this discussion:
https://github.com/zed-industries/zed/pull/36337

Release Notes:

- N/A

This will (gracefully) break links to
https://zed.dev/docs/configuring-zed#lsp-highlight-debounce-1 I don't
see anything show up for that on google or github search and I don't
think its load bearing.

---------

Co-authored-by: zumbalogy <3770982+zumbalogy@users.noreply.github.com>
---
 docs/src/configuring-zed.md      | 18 ++++++++++++------
 docs/src/visual-customization.md |  6 ++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 9d56130256..39d172ea5f 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -539,12 +539,6 @@ List of `string` values
 - Setting: `selection_highlight`
 - Default: `true`
 
-## LSP Highlight Debounce
-
-- Description: The debounce delay before querying highlights from the language server based on the current cursor location.
-- Setting: `lsp_highlight_debounce`
-- Default: `75`
-
 ## Cursor Blink
 
 - Description: Whether or not the cursor blinks.
@@ -1339,6 +1333,18 @@ While other options may be changed at a runtime and should be placed under `sett
 - Setting: `lsp_highlight_debounce`
 - Default: `75`
 
+## Global LSP Settings
+
+- Description: Common language server settings.
+- Setting: `global_lsp_settings`
+- Default:
+
+```json
+"global_lsp_settings": {
+  "button": true
+}
+```
+
 **Options**
 
 `integer` values representing milliseconds
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 6e598f4436..3ad1e381d9 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -321,6 +321,12 @@ TBD: Centered layout related settings
     // Defaults to true.
     "cursor_position_button": true,
   },
+  "global_lsp_settings": {
+    // Show/hide the LSP button in the status bar.
+    // Activity from the LSP is still shown.
+    // Button is not shown if "enable_language_server" if false.
+    "button": true
+  },
 ```
 
 ### Multibuffer

From 60960409f7a22ff0f66db53d74b0b45f574881d6 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 20 Aug 2025 01:47:28 -0300
Subject: [PATCH 193/823] thread view: Refine the UI a bit (#36504)

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 assets/icons/menu_alt.svg                   |   4 +-
 assets/icons/menu_alt_temp.svg              |   3 +
 assets/icons/x_circle_filled.svg            |   3 +
 assets/icons/zed_agent.svg                  |  27 ++
 crates/agent2/src/native_agent_server.rs    |   7 +-
 crates/agent_servers/src/gemini.rs          |   2 +-
 crates/agent_ui/src/acp/entry_view_state.rs |   1 +
 crates/agent_ui/src/acp/thread_view.rs      | 261 +++++++++++++-------
 crates/agent_ui/src/agent_panel.rs          |  88 +++----
 crates/icons/src/icons.rs                   |   3 +
 crates/markdown/src/markdown.rs             |   8 +-
 11 files changed, 262 insertions(+), 145 deletions(-)
 create mode 100644 assets/icons/menu_alt_temp.svg
 create mode 100644 assets/icons/x_circle_filled.svg
 create mode 100644 assets/icons/zed_agent.svg

diff --git a/assets/icons/menu_alt.svg b/assets/icons/menu_alt.svg
index f73102e286..87add13216 100644
--- a/assets/icons/menu_alt.svg
+++ b/assets/icons/menu_alt.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.667 8h8M2.667 4h10.666M2.667 12H8"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.333 10H8M13.333 6H2.66701" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/menu_alt_temp.svg b/assets/icons/menu_alt_temp.svg
new file mode 100644
index 0000000000..87add13216
--- /dev/null
+++ b/assets/icons/menu_alt_temp.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.333 10H8M13.333 6H2.66701" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/x_circle_filled.svg b/assets/icons/x_circle_filled.svg
new file mode 100644
index 0000000000..52215acda8
--- /dev/null
+++ b/assets/icons/x_circle_filled.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2ZM10.4238 5.57617C10.1895 5.34187 9.81049 5.3419 9.57617 5.57617L8 7.15234L6.42383 5.57617C6.18953 5.34187 5.81049 5.3419 5.57617 5.57617C5.34186 5.81049 5.34186 6.18951 5.57617 6.42383L7.15234 8L5.57617 9.57617C5.34186 9.81049 5.34186 10.1895 5.57617 10.4238C5.81049 10.6581 6.18954 10.6581 6.42383 10.4238L8 8.84766L9.57617 10.4238C9.81049 10.6581 10.1895 10.6581 10.4238 10.4238C10.6581 10.1895 10.658 9.81048 10.4238 9.57617L8.84766 8L10.4238 6.42383C10.6581 6.18954 10.658 5.81048 10.4238 5.57617Z" fill="black"/>
+</svg>
diff --git a/assets/icons/zed_agent.svg b/assets/icons/zed_agent.svg
new file mode 100644
index 0000000000..b6e120a0b6
--- /dev/null
+++ b/assets/icons/zed_agent.svg
@@ -0,0 +1,27 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 8.75V10.5C8.93097 10.5 8.06903 10.5 6 10.5V10L11 6V5.5H6V7.25" stroke="black" stroke-width="1.2"/>
+<path d="M2 8.5C2.27614 8.5 2.5 8.27614 2.5 8C2.5 7.72386 2.27614 7.5 2 7.5C1.72386 7.5 1.5 7.72386 1.5 8C1.5 8.27614 1.72386 8.5 2 8.5Z" fill="black"/>
+<path d="M2.99976 6.33002C3.2759 6.33002 3.49976 6.10616 3.49976 5.83002C3.49976 5.55387 3.2759 5.33002 2.99976 5.33002C2.72361 5.33002 2.49976 5.55387 2.49976 5.83002C2.49976 6.10616 2.72361 6.33002 2.99976 6.33002Z" fill="black"/>
+<path d="M2.99976 10.66C3.2759 10.66 3.49976 10.4361 3.49976 10.16C3.49976 9.88383 3.2759 9.65997 2.99976 9.65997C2.72361 9.65997 2.49976 9.88383 2.49976 10.16C2.49976 10.4361 2.72361 10.66 2.99976 10.66Z" fill="black"/>
+<path d="M15 8.5C15.2761 8.5 15.5 8.27614 15.5 8C15.5 7.72386 15.2761 7.5 15 7.5C14.7239 7.5 14.5 7.72386 14.5 8C14.5 8.27614 14.7239 8.5 15 8.5Z" fill="black"/>
+<path d="M14 6.33002C14.2761 6.33002 14.5 6.10616 14.5 5.83002C14.5 5.55387 14.2761 5.33002 14 5.33002C13.7239 5.33002 13.5 5.55387 13.5 5.83002C13.5 6.10616 13.7239 6.33002 14 6.33002Z" fill="black"/>
+<path d="M14 10.66C14.2761 10.66 14.5 10.4361 14.5 10.16C14.5 9.88383 14.2761 9.65997 14 9.65997C13.7239 9.65997 13.5 9.88383 13.5 10.16C13.5 10.4361 13.7239 10.66 14 10.66Z" fill="black"/>
+<path d="M8.49219 2C8.76833 2 8.99219 1.77614 8.99219 1.5C8.99219 1.22386 8.76833 1 8.49219 1C8.21605 1 7.99219 1.22386 7.99219 1.5C7.99219 1.77614 8.21605 2 8.49219 2Z" fill="black"/>
+<path d="M6 3C6.27614 3 6.5 2.77614 6.5 2.5C6.5 2.22386 6.27614 2 6 2C5.72386 2 5.5 2.22386 5.5 2.5C5.5 2.77614 5.72386 3 6 3Z" fill="black"/>
+<path d="M4 4C4.27614 4 4.5 3.77614 4.5 3.5C4.5 3.22386 4.27614 3 4 3C3.72386 3 3.5 3.22386 3.5 3.5C3.5 3.77614 3.72386 4 4 4Z" fill="black"/>
+<path d="M3.99976 13C4.2759 13 4.49976 12.7761 4.49976 12.5C4.49976 12.2239 4.2759 12 3.99976 12C3.72361 12 3.49976 12.2239 3.49976 12.5C3.49976 12.7761 3.72361 13 3.99976 13Z" fill="black"/>
+<path d="M2 12.5C2.27614 12.5 2.5 12.2761 2.5 12C2.5 11.7239 2.27614 11.5 2 11.5C1.72386 11.5 1.5 11.7239 1.5 12C1.5 12.2761 1.72386 12.5 2 12.5Z" fill="black"/>
+<path d="M2 4.5C2.27614 4.5 2.5 4.27614 2.5 4C2.5 3.72386 2.27614 3.5 2 3.5C1.72386 3.5 1.5 3.72386 1.5 4C1.5 4.27614 1.72386 4.5 2 4.5Z" fill="black"/>
+<path d="M15 12.5C15.2761 12.5 15.5 12.2761 15.5 12C15.5 11.7239 15.2761 11.5 15 11.5C14.7239 11.5 14.5 11.7239 14.5 12C14.5 12.2761 14.7239 12.5 15 12.5Z" fill="black"/>
+<path d="M15 4.5C15.2761 4.5 15.5 4.27614 15.5 4C15.5 3.72386 15.2761 3.5 15 3.5C14.7239 3.5 14.5 3.72386 14.5 4C14.5 4.27614 14.7239 4.5 15 4.5Z" fill="black"/>
+<path d="M3.99976 15C4.2759 15 4.49976 14.7761 4.49976 14.5C4.49976 14.2239 4.2759 14 3.99976 14C3.72361 14 3.49976 14.2239 3.49976 14.5C3.49976 14.7761 3.72361 15 3.99976 15Z" fill="black"/>
+<path d="M4 2C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1C3.72386 1 3.5 1.22386 3.5 1.5C3.5 1.77614 3.72386 2 4 2Z" fill="black"/>
+<path d="M13 15C13.2761 15 13.5 14.7761 13.5 14.5C13.5 14.2239 13.2761 14 13 14C12.7239 14 12.5 14.2239 12.5 14.5C12.5 14.7761 12.7239 15 13 15Z" fill="black"/>
+<path d="M13 2C13.2761 2 13.5 1.77614 13.5 1.5C13.5 1.22386 13.2761 1 13 1C12.7239 1 12.5 1.22386 12.5 1.5C12.5 1.77614 12.7239 2 13 2Z" fill="black"/>
+<path d="M13 4C13.2761 4 13.5 3.77614 13.5 3.5C13.5 3.22386 13.2761 3 13 3C12.7239 3 12.5 3.22386 12.5 3.5C12.5 3.77614 12.7239 4 13 4Z" fill="black"/>
+<path d="M13 13C13.2761 13 13.5 12.7761 13.5 12.5C13.5 12.2239 13.2761 12 13 12C12.7239 12 12.5 12.2239 12.5 12.5C12.5 12.7761 12.7239 13 13 13Z" fill="black"/>
+<path d="M11 3C11.2761 3 11.5 2.77614 11.5 2.5C11.5 2.22386 11.2761 2 11 2C10.7239 2 10.5 2.22386 10.5 2.5C10.5 2.77614 10.7239 3 11 3Z" fill="black"/>
+<path d="M8.5 15C8.77614 15 9 14.7761 9 14.5C9 14.2239 8.77614 14 8.5 14C8.22386 14 8 14.2239 8 14.5C8 14.7761 8.22386 15 8.5 15Z" fill="black"/>
+<path d="M6 14C6.27614 14 6.5 13.7761 6.5 13.5C6.5 13.2239 6.27614 13 6 13C5.72386 13 5.5 13.2239 5.5 13.5C5.5 13.7761 5.72386 14 6 14Z" fill="black"/>
+<path d="M11 14C11.2761 14 11.5 13.7761 11.5 13.5C11.5 13.2239 11.2761 13 11 13C10.7239 13 10.5 13.2239 10.5 13.5C10.5 13.7761 10.7239 14 11 14Z" fill="black"/>
+</svg>
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index f8cf3dd602..74d24efb13 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -27,16 +27,15 @@ impl AgentServer for NativeAgentServer {
     }
 
     fn empty_state_headline(&self) -> &'static str {
-        "Native Agent"
+        ""
     }
 
     fn empty_state_message(&self) -> &'static str {
-        "How can I help you today?"
+        ""
     }
 
     fn logo(&self) -> ui::IconName {
-        // Using the ZedAssistant icon as it's the native built-in agent
-        ui::IconName::ZedAssistant
+        ui::IconName::ZedAgent
     }
 
     fn connect(
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index e1ecaf0bb5..813f8b1fe0 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -26,7 +26,7 @@ impl AgentServer for Gemini {
     }
 
     fn empty_state_message(&self) -> &'static str {
-        "Ask questions, edit files, run commands.\nBe specific for the best results."
+        "Ask questions, edit files, run commands"
     }
 
     fn logo(&self) -> ui::IconName {
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 0b0b8471a7..98af9bf838 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -189,6 +189,7 @@ pub enum ViewEvent {
     MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }
 
+#[derive(Debug)]
 pub enum Entry {
     UserMessage(Entity<MessageEditor>),
     Content(HashMap<EntityId, AnyEntity>),
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 05f626d48e..4862bb0aa6 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -21,11 +21,11 @@ use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
-    EdgesRefinement, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState,
-    MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task,
-    TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
-    WindowHandle, div, linear_color_stop, linear_gradient, list, percentage, point, prelude::*,
-    pulsating_between,
+    EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset,
+    ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription,
+    Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
+    WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage, point,
+    prelude::*, pulsating_between,
 };
 use language::Buffer;
 
@@ -170,7 +170,7 @@ impl AcpThreadView {
                 project.clone(),
                 thread_store.clone(),
                 text_thread_store.clone(),
-                "Message the agent － @ to include context",
+                "Message the agent — @ to include context",
                 prevent_slash_commands,
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
@@ -928,29 +928,41 @@ impl AcpThreadView {
                     None
                 };
 
-                div()
+                v_flex()
                     .id(("user_message", entry_ix))
-                    .py_4()
+                    .pt_2()
+                    .pb_4()
                     .px_2()
+                    .gap_1p5()
+                    .w_full()
+                    .children(rules_item)
                     .children(message.id.clone().and_then(|message_id| {
                         message.checkpoint.as_ref()?.show.then(|| {
-                            Button::new("restore-checkpoint", "Restore Checkpoint")
-                                .icon(IconName::Undo)
-                                .icon_size(IconSize::XSmall)
-                                .icon_position(IconPosition::Start)
-                                .label_size(LabelSize::XSmall)
-                                .on_click(cx.listener(move |this, _, _window, cx| {
-                                    this.rewind(&message_id, cx);
-                                }))
+                            h_flex()
+                                .gap_2()
+                                .child(Divider::horizontal())
+                                .child(
+                                    Button::new("restore-checkpoint", "Restore Checkpoint")
+                                        .icon(IconName::Undo)
+                                        .icon_size(IconSize::XSmall)
+                                        .icon_position(IconPosition::Start)
+                                        .label_size(LabelSize::XSmall)
+                                        .icon_color(Color::Muted)
+                                        .color(Color::Muted)
+                                        .on_click(cx.listener(move |this, _, _window, cx| {
+                                            this.rewind(&message_id, cx);
+                                        }))
+                                )
+                                .child(Divider::horizontal())
                         })
                     }))
-                    .children(rules_item)
                     .child(
                         div()
                             .relative()
                             .child(
                                 div()
-                                    .p_3()
+                                    .py_3()
+                                    .px_2()
                                     .rounded_lg()
                                     .shadow_md()
                                     .bg(cx.theme().colors().editor_background)
@@ -1080,12 +1092,20 @@ impl AcpThreadView {
         if let Some(editing_index) = self.editing_message.as_ref()
             && *editing_index < entry_ix
         {
-            div()
-                .child(primary)
-                .opacity(0.2)
+            let backdrop = div()
+                .id(("backdrop", entry_ix))
+                .size_full()
+                .absolute()
+                .inset_0()
+                .bg(cx.theme().colors().panel_background)
+                .opacity(0.8)
                 .block_mouse_except_scroll()
-                .id("overlay")
-                .on_click(cx.listener(Self::cancel_editing))
+                .on_click(cx.listener(Self::cancel_editing));
+
+            div()
+                .relative()
+                .child(primary)
+                .child(backdrop)
                 .into_any_element()
         } else {
             primary
@@ -1100,7 +1120,7 @@ impl AcpThreadView {
     }
 
     fn tool_card_border_color(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme().colors().border.opacity(0.6)
+        cx.theme().colors().border.opacity(0.8)
     }
 
     fn tool_name_font_size(&self) -> Rems {
@@ -1299,23 +1319,14 @@ impl AcpThreadView {
             tool_call.status,
             ToolCallStatus::WaitingForConfirmation { .. }
         );
-        let is_edit = matches!(tool_call.kind, acp::ToolKind::Edit);
-        let has_diff = tool_call
-            .content
-            .iter()
-            .any(|content| matches!(content, ToolCallContent::Diff { .. }));
-        let has_nonempty_diff = tool_call.content.iter().any(|content| match content {
-            ToolCallContent::Diff(diff) => diff.read(cx).has_revealed_range(cx),
-            _ => false,
-        });
-        let use_card_layout = needs_confirmation || is_edit || has_diff;
+        let is_edit =
+            matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
+        let use_card_layout = needs_confirmation || is_edit;
 
         let is_collapsible = !tool_call.content.is_empty() && !use_card_layout;
 
-        let is_open = tool_call.content.is_empty()
-            || needs_confirmation
-            || has_nonempty_diff
-            || self.expanded_tool_calls.contains(&tool_call.id);
+        let is_open =
+            needs_confirmation || is_edit || self.expanded_tool_calls.contains(&tool_call.id);
 
         let gradient_overlay = |color: Hsla| {
             div()
@@ -1336,41 +1347,49 @@ impl AcpThreadView {
             cx.theme().colors().panel_background
         };
 
-        let tool_output_display = match &tool_call.status {
-            ToolCallStatus::WaitingForConfirmation { options, .. } => v_flex()
-                .w_full()
-                .children(tool_call.content.iter().map(|content| {
-                    div()
-                        .child(
-                            self.render_tool_call_content(entry_ix, content, tool_call, window, cx),
-                        )
-                        .into_any_element()
-                }))
-                .child(self.render_permission_buttons(
-                    options,
-                    entry_ix,
-                    tool_call.id.clone(),
-                    tool_call.content.is_empty(),
-                    cx,
-                )),
-            ToolCallStatus::Pending
-            | ToolCallStatus::InProgress
-            | ToolCallStatus::Completed
-            | ToolCallStatus::Failed
-            | ToolCallStatus::Canceled => {
-                v_flex()
+        let tool_output_display = if is_open {
+            match &tool_call.status {
+                ToolCallStatus::WaitingForConfirmation { options, .. } => {
+                    v_flex()
+                        .w_full()
+                        .children(tool_call.content.iter().map(|content| {
+                            div()
+                                .child(self.render_tool_call_content(
+                                    entry_ix, content, tool_call, window, cx,
+                                ))
+                                .into_any_element()
+                        }))
+                        .child(self.render_permission_buttons(
+                            options,
+                            entry_ix,
+                            tool_call.id.clone(),
+                            tool_call.content.is_empty(),
+                            cx,
+                        ))
+                        .into_any()
+                }
+                ToolCallStatus::Pending | ToolCallStatus::InProgress
+                    if is_edit && tool_call.content.is_empty() =>
+                {
+                    self.render_diff_loading(cx).into_any()
+                }
+                ToolCallStatus::Pending
+                | ToolCallStatus::InProgress
+                | ToolCallStatus::Completed
+                | ToolCallStatus::Failed
+                | ToolCallStatus::Canceled => v_flex()
                     .w_full()
                     .children(tool_call.content.iter().map(|content| {
-                        div()
-                            .child(
-                                self.render_tool_call_content(
-                                    entry_ix, content, tool_call, window, cx,
-                                ),
-                            )
-                            .into_any_element()
+                        div().child(
+                            self.render_tool_call_content(entry_ix, content, tool_call, window, cx),
+                        )
                     }))
+                    .into_any(),
+                ToolCallStatus::Rejected => Empty.into_any(),
             }
-            ToolCallStatus::Rejected => v_flex().size_0(),
+            .into()
+        } else {
+            None
         };
 
         v_flex()
@@ -1390,9 +1409,13 @@ impl AcpThreadView {
                     .map(|this| {
                         if use_card_layout {
                             this.pl_2()
-                                .pr_1()
+                                .pr_1p5()
                                 .py_1()
                                 .rounded_t_md()
+                                .when(is_open, |this| {
+                                    this.border_b_1()
+                                        .border_color(self.tool_card_border_color(cx))
+                                })
                                 .bg(self.tool_card_header_bg(cx))
                         } else {
                             this.opacity(0.8).hover(|style| style.opacity(1.))
@@ -1403,6 +1426,7 @@ impl AcpThreadView {
                             .group(&card_header_id)
                             .relative()
                             .w_full()
+                            .min_h_6()
                             .text_size(self.tool_name_font_size())
                             .child(self.render_tool_call_icon(
                                 card_header_id,
@@ -1456,11 +1480,7 @@ impl AcpThreadView {
                                             .overflow_x_scroll()
                                             .child(self.render_markdown(
                                                 tool_call.label.clone(),
-                                                default_markdown_style(
-                                                    needs_confirmation || is_edit || has_diff,
-                                                    window,
-                                                    cx,
-                                                ),
+                                                default_markdown_style(false, window, cx),
                                             )),
                                     )
                                     .child(gradient_overlay(gradient_color))
@@ -1480,7 +1500,7 @@ impl AcpThreadView {
                     )
                     .children(status_icon),
             )
-            .when(is_open, |this| this.child(tool_output_display))
+            .children(tool_output_display)
     }
 
     fn render_tool_call_content(
@@ -1501,7 +1521,7 @@ impl AcpThreadView {
                     Empty.into_any_element()
                 }
             }
-            ToolCallContent::Diff(diff) => self.render_diff_editor(entry_ix, diff, cx),
+            ToolCallContent::Diff(diff) => self.render_diff_editor(entry_ix, diff, tool_call, cx),
             ToolCallContent::Terminal(terminal) => {
                 self.render_terminal_tool_call(entry_ix, terminal, tool_call, window, cx)
             }
@@ -1645,21 +1665,69 @@ impl AcpThreadView {
             })))
     }
 
+    fn render_diff_loading(&self, cx: &Context<Self>) -> AnyElement {
+        let bar = |n: u64, width_class: &str| {
+            let bg_color = cx.theme().colors().element_active;
+            let base = h_flex().h_1().rounded_full();
+
+            let modified = match width_class {
+                "w_4_5" => base.w_3_4(),
+                "w_1_4" => base.w_1_4(),
+                "w_2_4" => base.w_2_4(),
+                "w_3_5" => base.w_3_5(),
+                "w_2_5" => base.w_2_5(),
+                _ => base.w_1_2(),
+            };
+
+            modified.with_animation(
+                ElementId::Integer(n),
+                Animation::new(Duration::from_secs(2)).repeat(),
+                move |tab, delta| {
+                    let delta = (delta - 0.15 * n as f32) / 0.7;
+                    let delta = 1.0 - (0.5 - delta).abs() * 2.;
+                    let delta = ease_in_out(delta.clamp(0., 1.));
+                    let delta = 0.1 + 0.9 * delta;
+
+                    tab.bg(bg_color.opacity(delta))
+                },
+            )
+        };
+
+        v_flex()
+            .p_3()
+            .gap_1()
+            .rounded_b_md()
+            .bg(cx.theme().colors().editor_background)
+            .child(bar(0, "w_4_5"))
+            .child(bar(1, "w_1_4"))
+            .child(bar(2, "w_2_4"))
+            .child(bar(3, "w_3_5"))
+            .child(bar(4, "w_2_5"))
+            .into_any_element()
+    }
+
     fn render_diff_editor(
         &self,
         entry_ix: usize,
         diff: &Entity<acp_thread::Diff>,
+        tool_call: &ToolCall,
         cx: &Context<Self>,
     ) -> AnyElement {
+        let tool_progress = matches!(
+            &tool_call.status,
+            ToolCallStatus::InProgress | ToolCallStatus::Pending
+        );
+
         v_flex()
             .h_full()
-            .border_t_1()
-            .border_color(self.tool_card_border_color(cx))
             .child(
                 if let Some(entry) = self.entry_view_state.read(cx).entry(entry_ix)
                     && let Some(editor) = entry.editor_for_diff(diff)
+                    && diff.read(cx).has_revealed_range(cx)
                 {
                     editor.clone().into_any_element()
+                } else if tool_progress {
+                    self.render_diff_loading(cx)
                 } else {
                     Empty.into_any()
                 },
@@ -1924,11 +1992,11 @@ impl AcpThreadView {
             .justify_center()
             .child(div().opacity(0.3).child(logo))
             .child(
-                h_flex().absolute().right_1().bottom_0().child(
-                    Icon::new(IconName::XCircle)
-                        .color(Color::Error)
-                        .size(IconSize::Small),
-                ),
+                h_flex()
+                    .absolute()
+                    .right_1()
+                    .bottom_0()
+                    .child(Icon::new(IconName::XCircleFilled).color(Color::Error)),
             )
             .into_any_element()
     }
@@ -1982,12 +2050,12 @@ impl AcpThreadView {
 
         Some(
             v_flex()
-                .pt_2()
                 .px_2p5()
                 .gap_1()
                 .when_some(user_rules_text, |parent, user_rules_text| {
                     parent.child(
                         h_flex()
+                            .group("user-rules")
                             .w_full()
                             .child(
                                 Icon::new(IconName::Reader)
@@ -2008,6 +2076,7 @@ impl AcpThreadView {
                                     .shape(ui::IconButtonShape::Square)
                                     .icon_size(IconSize::XSmall)
                                     .icon_color(Color::Ignored)
+                                    .visible_on_hover("user-rules")
                                     // TODO: Figure out a way to pass focus handle here so we can display the `OpenRulesLibrary`  keybinding
                                     .tooltip(Tooltip::text("View User Rules"))
                                     .on_click(move |_event, window, cx| {
@@ -2024,6 +2093,7 @@ impl AcpThreadView {
                 .when_some(rules_file_text, |parent, rules_file_text| {
                     parent.child(
                         h_flex()
+                            .group("project-rules")
                             .w_full()
                             .child(
                                 Icon::new(IconName::File)
@@ -2044,7 +2114,8 @@ impl AcpThreadView {
                                     .icon_size(IconSize::XSmall)
                                     .icon_color(Color::Ignored)
                                     .on_click(cx.listener(Self::handle_open_rules))
-                                    .tooltip(Tooltip::text("View Rules")),
+                                    .visible_on_hover("project-rules")
+                                    .tooltip(Tooltip::text("View Project Rules")),
                             ),
                     )
                 })
@@ -2119,11 +2190,9 @@ impl AcpThreadView {
                     .items_center()
                     .justify_center()
                     .child(self.render_error_agent_logo())
-                    .child(
-                        h_flex().mt_4().mb_1().justify_center().child(
-                            Headline::new("Authentication Required").size(HeadlineSize::Medium),
-                        ),
-                    )
+                    .child(h_flex().mt_4().mb_1().justify_center().child(
+                        Headline::new(self.agent.empty_state_headline()).size(HeadlineSize::Medium),
+                    ))
                     .into_any(),
             )
             .children(description.map(|desc| {
@@ -2838,10 +2907,10 @@ impl AcpThreadView {
             .child(
                 h_flex()
                     .flex_none()
+                    .flex_wrap()
                     .justify_between()
                     .child(
                         h_flex()
-                            .gap_1()
                             .child(self.render_follow_toggle(cx))
                             .children(self.render_burn_mode_toggle(cx)),
                     )
@@ -2883,7 +2952,7 @@ impl AcpThreadView {
             h_flex()
                 .flex_shrink_0()
                 .gap_0p5()
-                .mr_1()
+                .mr_1p5()
                 .child(
                     Label::new(used)
                         .size(LabelSize::Small)
@@ -2904,7 +2973,11 @@ impl AcpThreadView {
                             }
                         }),
                 )
-                .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
+                .child(
+                    Label::new("/")
+                        .size(LabelSize::Small)
+                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.5))),
+                )
                 .child(Label::new(max).size(LabelSize::Small).color(Color::Muted)),
         )
     }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 297bb5f3e8..c89dc56795 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -65,8 +65,8 @@ use theme::ThemeSettings;
 use time::UtcOffset;
 use ui::utils::WithRemSize;
 use ui::{
-    Banner, Callout, ContextMenu, ContextMenuEntry, Divider, ElevationIndex, KeyBinding,
-    PopoverMenu, PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
+    Banner, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding, PopoverMenu,
+    PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -245,17 +245,16 @@ impl AgentType {
         match self {
             Self::Zed | Self::TextThread => "Zed Agent",
             Self::NativeAgent => "Agent 2",
-            Self::Gemini => "Google Gemini",
+            Self::Gemini => "Gemini CLI",
             Self::ClaudeCode => "Claude Code",
         }
     }
 
-    fn icon(self) -> IconName {
+    fn icon(self) -> Option<IconName> {
         match self {
-            Self::Zed | Self::TextThread => IconName::AiZed,
-            Self::NativeAgent => IconName::ZedAssistant,
-            Self::Gemini => IconName::AiGemini,
-            Self::ClaudeCode => IconName::AiClaude,
+            Self::Zed | Self::NativeAgent | Self::TextThread => None,
+            Self::Gemini => Some(IconName::AiGemini),
+            Self::ClaudeCode => Some(IconName::AiClaude),
         }
     }
 }
@@ -2158,12 +2157,17 @@ impl AgentPanel {
             })
     }
 
-    fn render_recent_entries_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_recent_entries_menu(
+        &self,
+        icon: IconName,
+        corner: Corner,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
 
         PopoverMenu::new("agent-nav-menu")
             .trigger_with_tooltip(
-                IconButton::new("agent-nav-menu", IconName::MenuAlt).icon_size(IconSize::Small),
+                IconButton::new("agent-nav-menu", icon).icon_size(IconSize::Small),
                 {
                     let focus_handle = focus_handle.clone();
                     move |window, cx| {
@@ -2177,7 +2181,7 @@ impl AgentPanel {
                     }
                 },
             )
-            .anchor(Corner::TopLeft)
+            .anchor(corner)
             .with_handle(self.assistant_navigation_menu_handle.clone())
             .menu({
                 let menu = self.assistant_navigation_menu.clone();
@@ -2304,7 +2308,9 @@ impl AgentPanel {
                             .pl(DynamicSpacing::Base04.rems(cx))
                             .child(self.render_toolbar_back_button(cx))
                             .into_any_element(),
-                        _ => self.render_recent_entries_menu(cx).into_any_element(),
+                        _ => self
+                            .render_recent_entries_menu(IconName::MenuAlt, Corner::TopLeft, cx)
+                            .into_any_element(),
                     })
                     .child(self.render_title_view(window, cx)),
             )
@@ -2390,7 +2396,7 @@ impl AgentPanel {
                             .item(
                                 ContextMenuEntry::new("New Thread")
                                     .action(NewThread::default().boxed_clone())
-                                    .icon(IconName::ZedAssistant)
+                                    .icon(IconName::Thread)
                                     .icon_color(Color::Muted)
                                     .handler({
                                         let workspace = workspace.clone();
@@ -2443,7 +2449,7 @@ impl AgentPanel {
                             .header("External Agents")
                             .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
                                 menu.item(
-                                    ContextMenuEntry::new("New Gemini Thread")
+                                    ContextMenuEntry::new("New Gemini CLI Thread")
                                         .icon(IconName::AiGemini)
                                         .icon_color(Color::Muted)
                                         .handler({
@@ -2503,16 +2509,18 @@ impl AgentPanel {
         let selected_agent_label = self.selected_agent.label().into();
         let selected_agent = div()
             .id("selected_agent_icon")
-            .px(DynamicSpacing::Base02.rems(cx))
-            .child(Icon::new(self.selected_agent.icon()).color(Color::Muted))
-            .tooltip(move |window, cx| {
-                Tooltip::with_meta(
-                    selected_agent_label.clone(),
-                    None,
-                    "Selected Agent",
-                    window,
-                    cx,
-                )
+            .when_some(self.selected_agent.icon(), |this, icon| {
+                this.px(DynamicSpacing::Base02.rems(cx))
+                    .child(Icon::new(icon).color(Color::Muted))
+                    .tooltip(move |window, cx| {
+                        Tooltip::with_meta(
+                            selected_agent_label.clone(),
+                            None,
+                            "Selected Agent",
+                            window,
+                            cx,
+                        )
+                    })
             })
             .into_any_element();
 
@@ -2535,31 +2543,23 @@ impl AgentPanel {
                         ActiveView::History | ActiveView::Configuration => {
                             self.render_toolbar_back_button(cx).into_any_element()
                         }
-                        _ => h_flex()
-                            .gap_1()
-                            .child(self.render_recent_entries_menu(cx))
-                            .child(Divider::vertical())
-                            .child(selected_agent)
-                            .into_any_element(),
+                        _ => selected_agent.into_any_element(),
                     })
                     .child(self.render_title_view(window, cx)),
             )
             .child(
                 h_flex()
-                    .h_full()
-                    .gap_2()
-                    .children(self.render_token_count(cx))
-                    .child(
-                        h_flex()
-                            .h_full()
-                            .gap(DynamicSpacing::Base02.rems(cx))
-                            .pl(DynamicSpacing::Base04.rems(cx))
-                            .pr(DynamicSpacing::Base06.rems(cx))
-                            .border_l_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(new_thread_menu)
-                            .child(self.render_panel_options_menu(window, cx)),
-                    ),
+                    .flex_none()
+                    .gap(DynamicSpacing::Base02.rems(cx))
+                    .pl(DynamicSpacing::Base04.rems(cx))
+                    .pr(DynamicSpacing::Base06.rems(cx))
+                    .child(new_thread_menu)
+                    .child(self.render_recent_entries_menu(
+                        IconName::MenuAltTemp,
+                        Corner::TopRight,
+                        cx,
+                    ))
+                    .child(self.render_panel_options_menu(window, cx)),
             )
     }
 
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 8bd76cbecf..38f02c2206 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -155,6 +155,7 @@ pub enum IconName {
     Maximize,
     Menu,
     MenuAlt,
+    MenuAltTemp,
     Mic,
     MicMute,
     Minimize,
@@ -245,6 +246,8 @@ pub enum IconName {
     Warning,
     WholeWord,
     XCircle,
+    XCircleFilled,
+    ZedAgent,
     ZedAssistant,
     ZedBurnMode,
     ZedBurnModeOn,
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 7939e97e48..a161ddd074 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -1084,7 +1084,13 @@ impl Element for MarkdownElement {
                                     cx,
                                 );
                                 el.child(
-                                    div().absolute().top_1().right_0p5().w_5().child(codeblock),
+                                    h_flex()
+                                        .w_5()
+                                        .absolute()
+                                        .top_1()
+                                        .right_1()
+                                        .justify_center()
+                                        .child(codeblock),
                                 )
                             });
                         }

From 1e1110ee8c8616cf2a35bbf021b127f6f08392ae Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 20 Aug 2025 02:20:58 -0300
Subject: [PATCH 194/823] thread_view: Increase click area of the user rules
 links (#36549)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 4862bb0aa6..ee033bf1f6 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2056,6 +2056,7 @@ impl AcpThreadView {
                     parent.child(
                         h_flex()
                             .group("user-rules")
+                            .id("user-rules")
                             .w_full()
                             .child(
                                 Icon::new(IconName::Reader)
@@ -2078,25 +2079,26 @@ impl AcpThreadView {
                                     .icon_color(Color::Ignored)
                                     .visible_on_hover("user-rules")
                                     // TODO: Figure out a way to pass focus handle here so we can display the `OpenRulesLibrary`  keybinding
-                                    .tooltip(Tooltip::text("View User Rules"))
-                                    .on_click(move |_event, window, cx| {
-                                        window.dispatch_action(
-                                            Box::new(OpenRulesLibrary {
-                                                prompt_to_select: first_user_rules_id,
-                                            }),
-                                            cx,
-                                        )
+                                    .tooltip(Tooltip::text("View User Rules")),
+                            )
+                            .on_click(move |_event, window, cx| {
+                                window.dispatch_action(
+                                    Box::new(OpenRulesLibrary {
+                                        prompt_to_select: first_user_rules_id,
                                     }),
-                            ),
+                                    cx,
+                                )
+                            }),
                     )
                 })
                 .when_some(rules_file_text, |parent, rules_file_text| {
                     parent.child(
                         h_flex()
                             .group("project-rules")
+                            .id("project-rules")
                             .w_full()
                             .child(
-                                Icon::new(IconName::File)
+                                Icon::new(IconName::Reader)
                                     .size(IconSize::XSmall)
                                     .color(Color::Disabled),
                             )
@@ -2113,10 +2115,10 @@ impl AcpThreadView {
                                     .shape(ui::IconButtonShape::Square)
                                     .icon_size(IconSize::XSmall)
                                     .icon_color(Color::Ignored)
-                                    .on_click(cx.listener(Self::handle_open_rules))
                                     .visible_on_hover("project-rules")
                                     .tooltip(Tooltip::text("View Project Rules")),
-                            ),
+                            )
+                            .on_click(cx.listener(Self::handle_open_rules)),
                     )
                 })
                 .into_any(),

From 159b5e9fb5a74840fda1f2810af4c423522bcc96 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 20 Aug 2025 02:30:43 -0300
Subject: [PATCH 195/823] agent2: Port `user_modifier_to_send` setting (#36550)

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json         | 12 ++++++++-
 assets/keymaps/default-macos.json         | 12 ++++++++-
 crates/agent_ui/src/acp/message_editor.rs | 32 ++++++++++++++++++++---
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 01c0b4e969..b4efa70572 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -327,7 +327,7 @@
     }
   },
   {
-    "context": "AcpThread > Editor",
+    "context": "AcpThread > Editor && !use_modifier_to_send",
     "use_key_equivalents": true,
     "bindings": {
       "enter": "agent::Chat",
@@ -336,6 +336,16 @@
       "ctrl-shift-n": "agent::RejectAll"
     }
   },
+  {
+    "context": "AcpThread > Editor && use_modifier_to_send",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "agent::Chat",
+      "shift-ctrl-r": "agent::OpenAgentDiff",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
+    }
+  },
   {
     "context": "ThreadHistory",
     "bindings": {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index e5b7fff9e1..ad2ab2ba89 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -379,7 +379,7 @@
     }
   },
   {
-    "context": "AcpThread > Editor",
+    "context": "AcpThread > Editor && !use_modifier_to_send",
     "use_key_equivalents": true,
     "bindings": {
       "enter": "agent::Chat",
@@ -388,6 +388,16 @@
       "cmd-shift-n": "agent::RejectAll"
     }
   },
+  {
+    "context": "AcpThread > Editor && use_modifier_to_send",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-enter": "agent::Chat",
+      "shift-ctrl-r": "agent::OpenAgentDiff",
+      "cmd-shift-y": "agent::KeepAll",
+      "cmd-shift-n": "agent::RejectAll"
+    }
+  },
   {
     "context": "ThreadHistory",
     "bindings": {
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index cb20740f3c..01a81c8cce 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -9,7 +9,7 @@ use anyhow::{Context as _, Result, anyhow};
 use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
 use editor::{
-    Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
+    Addon, Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
     EditorEvent, EditorMode, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer,
     SemanticsProvider, ToOffset,
     actions::Paste,
@@ -21,8 +21,8 @@ use futures::{
 };
 use gpui::{
     AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    HighlightStyle, Image, ImageFormat, Img, Subscription, Task, TextStyle, UnderlineStyle,
-    WeakEntity,
+    HighlightStyle, Image, ImageFormat, Img, KeyContext, Subscription, Task, TextStyle,
+    UnderlineStyle, WeakEntity,
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
@@ -122,6 +122,7 @@ impl MessageEditor {
             if prevent_slash_commands {
                 editor.set_semantics_provider(Some(semantics_provider.clone()));
             }
+            editor.register_addon(MessageEditorAddon::new());
             editor
         });
 
@@ -1648,6 +1649,31 @@ fn parse_slash_command(text: &str) -> Option<(usize, usize)> {
     None
 }
 
+pub struct MessageEditorAddon {}
+
+impl MessageEditorAddon {
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+impl Addon for MessageEditorAddon {
+    fn to_any(&self) -> &dyn std::any::Any {
+        self
+    }
+
+    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
+        Some(self)
+    }
+
+    fn extend_key_context(&self, key_context: &mut KeyContext, cx: &App) {
+        let settings = agent_settings::AgentSettings::get_global(cx);
+        if settings.use_modifier_to_send {
+            key_context.add("use_modifier_to_send");
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::{ops::Range, path::Path, sync::Arc};

From 5d2bb2466e4dc6d98063737a012b638c9deb2284 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 20 Aug 2025 00:25:07 -0600
Subject: [PATCH 196/823] ACP history mentions (#36551)

- **TEMP**
- **Update @-mentions to use new history**

Closes #ISSUE

Release Notes:

- N/A
---
 Cargo.lock                                    |   1 -
 crates/acp_thread/Cargo.toml                  |   1 -
 crates/acp_thread/src/mention.rs              |   8 +-
 crates/agent/src/thread.rs                    |  11 +-
 crates/agent2/Cargo.toml                      |   4 +
 crates/agent2/src/agent.rs                    |  22 +
 crates/agent2/src/db.rs                       |  13 +-
 crates/agent2/src/history_store.rs            |  41 +-
 crates/agent2/src/thread.rs                   |  77 ++-
 crates/agent_settings/src/agent_settings.rs   |   2 +
 crates/agent_ui/Cargo.toml                    |   2 +
 .../agent_ui/src/acp/completion_provider.rs   | 559 ++++++++++--------
 crates/agent_ui/src/acp/entry_view_state.rs   |  30 +-
 crates/agent_ui/src/acp/message_editor.rs     | 133 ++---
 crates/agent_ui/src/acp/thread_view.rs        |  44 +-
 crates/agent_ui/src/agent_panel.rs            |  23 +-
 crates/assistant_context/src/context_store.rs |   2 +-
 17 files changed, 581 insertions(+), 392 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5dced73fb9..fdc858ef50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,7 +7,6 @@ name = "acp_thread"
 version = "0.1.0"
 dependencies = [
  "action_log",
- "agent",
  "agent-client-protocol",
  "anyhow",
  "buffer_diff",
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 173f4c4208..eab756db51 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -18,7 +18,6 @@ test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot"]
 [dependencies]
 action_log.workspace = true
 agent-client-protocol.workspace = true
-agent.workspace = true
 anyhow.workspace = true
 buffer_diff.workspace = true
 collections.workspace = true
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index 4615e9a551..a1e713cffa 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -1,4 +1,4 @@
-use agent::ThreadId;
+use agent_client_protocol as acp;
 use anyhow::{Context as _, Result, bail};
 use file_icons::FileIcons;
 use prompt_store::{PromptId, UserPromptId};
@@ -12,7 +12,7 @@ use std::{
 use ui::{App, IconName, SharedString};
 use url::Url;
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
 pub enum MentionUri {
     File {
         abs_path: PathBuf,
@@ -26,7 +26,7 @@ pub enum MentionUri {
         line_range: Range<u32>,
     },
     Thread {
-        id: ThreadId,
+        id: acp::SessionId,
         name: String,
     },
     TextThread {
@@ -89,7 +89,7 @@ impl MentionUri {
                 if let Some(thread_id) = path.strip_prefix("/agent/thread/") {
                     let name = single_query_param(&url, "name")?.context("Missing thread name")?;
                     Ok(Self::Thread {
-                        id: thread_id.into(),
+                        id: acp::SessionId(thread_id.into()),
                         name,
                     })
                 } else if let Some(path) = path.strip_prefix("/agent/text-thread/") {
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 80ed277f10..fc91e1bb62 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -9,7 +9,10 @@ use crate::{
     tool_use::{PendingToolUse, ToolUse, ToolUseMetadata, ToolUseState},
 };
 use action_log::ActionLog;
-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, SUMMARIZE_THREAD_PROMPT};
+use agent_settings::{
+    AgentProfileId, AgentSettings, CompletionMode, SUMMARIZE_THREAD_DETAILED_PROMPT,
+    SUMMARIZE_THREAD_PROMPT,
+};
 use anyhow::{Result, anyhow};
 use assistant_tool::{AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
@@ -107,7 +110,7 @@ impl std::fmt::Display for PromptId {
 }
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-pub struct MessageId(pub(crate) usize);
+pub struct MessageId(pub usize);
 
 impl MessageId {
     fn post_inc(&mut self) -> Self {
@@ -2425,12 +2428,10 @@ impl Thread {
             return;
         }
 
-        let added_user_message = include_str!("./prompts/summarize_thread_detailed_prompt.txt");
-
         let request = self.to_summarize_request(
             &model,
             CompletionIntent::ThreadContextSummarization,
-            added_user_message.into(),
+            SUMMARIZE_THREAD_DETAILED_PROMPT.into(),
             cx,
         );
 
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 849ea041e9..2a39440af8 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -8,6 +8,9 @@ license = "GPL-3.0-or-later"
 [lib]
 path = "src/agent2.rs"
 
+[features]
+test-support = ["db/test-support"]
+
 [lints]
 workspace = true
 
@@ -72,6 +75,7 @@ ctor.workspace = true
 client = { workspace = true, "features" = ["test-support"] }
 clock = { workspace = true, "features" = ["test-support"] }
 context_server = { workspace = true, "features" = ["test-support"] }
+db = { workspace = true, "features" = ["test-support"] }
 editor = { workspace = true, "features" = ["test-support"] }
 env_logger.workspace = true
 fs = { workspace = true, "features" = ["test-support"] }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 212460d690..3c605de803 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -536,6 +536,28 @@ impl NativeAgent {
         })
     }
 
+    pub fn thread_summary(
+        &mut self,
+        id: acp::SessionId,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<SharedString>> {
+        let thread = self.open_thread(id.clone(), cx);
+        cx.spawn(async move |this, cx| {
+            let acp_thread = thread.await?;
+            let result = this
+                .update(cx, |this, cx| {
+                    this.sessions
+                        .get(&id)
+                        .unwrap()
+                        .thread
+                        .update(cx, |thread, cx| thread.summary(cx))
+                })?
+                .await?;
+            drop(acp_thread);
+            Ok(result)
+        })
+    }
+
     fn save_thread(&mut self, thread: Entity<Thread>, cx: &mut Context<Self>) {
         let database_future = ThreadsDatabase::connect(cx);
         let (id, db_thread) =
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index 610a2575c4..c6a6c38201 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -1,6 +1,6 @@
 use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
 use acp_thread::UserMessageId;
-use agent::thread_store;
+use agent::{thread::DetailedSummaryState, thread_store};
 use agent_client_protocol as acp;
 use agent_settings::{AgentProfileId, CompletionMode};
 use anyhow::{Result, anyhow};
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use ui::{App, SharedString};
 
 pub type DbMessage = crate::Message;
-pub type DbSummary = agent::thread::DetailedSummaryState;
+pub type DbSummary = DetailedSummaryState;
 pub type DbLanguageModel = thread_store::SerializedLanguageModel;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -37,7 +37,7 @@ pub struct DbThread {
     pub messages: Vec<DbMessage>,
     pub updated_at: DateTime<Utc>,
     #[serde(default)]
-    pub summary: DbSummary,
+    pub detailed_summary: Option<SharedString>,
     #[serde(default)]
     pub initial_project_snapshot: Option<Arc<agent::thread::ProjectSnapshot>>,
     #[serde(default)]
@@ -185,7 +185,12 @@ impl DbThread {
             title: thread.summary,
             messages,
             updated_at: thread.updated_at,
-            summary: thread.detailed_summary_state,
+            detailed_summary: match thread.detailed_summary_state {
+                DetailedSummaryState::NotGenerated | DetailedSummaryState::Generating { .. } => {
+                    None
+                }
+                DetailedSummaryState::Generated { text, .. } => Some(text),
+            },
             initial_project_snapshot: thread.initial_project_snapshot,
             cumulative_token_usage: thread.cumulative_token_usage,
             request_token_usage,
diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 4ce304ae5f..7eb7da94ba 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -1,7 +1,8 @@
 use crate::{DbThreadMetadata, ThreadsDatabase};
+use acp_thread::MentionUri;
 use agent_client_protocol as acp;
 use anyhow::{Context as _, Result, anyhow};
-use assistant_context::SavedContextMetadata;
+use assistant_context::{AssistantContext, SavedContextMetadata};
 use chrono::{DateTime, Utc};
 use db::kvp::KEY_VALUE_STORE;
 use gpui::{App, AsyncApp, Entity, SharedString, Task, prelude::*};
@@ -38,6 +39,19 @@ impl HistoryEntry {
         }
     }
 
+    pub fn mention_uri(&self) -> MentionUri {
+        match self {
+            HistoryEntry::AcpThread(thread) => MentionUri::Thread {
+                id: thread.id.clone(),
+                name: thread.title.to_string(),
+            },
+            HistoryEntry::TextThread(context) => MentionUri::TextThread {
+                path: context.path.as_ref().to_owned(),
+                name: context.title.to_string(),
+            },
+        }
+    }
+
     pub fn title(&self) -> &SharedString {
         match self {
             HistoryEntry::AcpThread(thread) if thread.title.is_empty() => DEFAULT_TITLE,
@@ -48,7 +62,7 @@ impl HistoryEntry {
 }
 
 /// Generic identifier for a history entry.
-#[derive(Clone, PartialEq, Eq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub enum HistoryEntryId {
     AcpThread(acp::SessionId),
     TextThread(Arc<Path>),
@@ -120,6 +134,16 @@ impl HistoryStore {
         })
     }
 
+    pub fn load_text_thread(
+        &self,
+        path: Arc<Path>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Entity<AssistantContext>>> {
+        self.context_store.update(cx, |context_store, cx| {
+            context_store.open_local_context(path, cx)
+        })
+    }
+
     pub fn reload(&self, cx: &mut Context<Self>) {
         let database_future = ThreadsDatabase::connect(cx);
         cx.spawn(async move |this, cx| {
@@ -149,7 +173,7 @@ impl HistoryStore {
         .detach_and_log_err(cx);
     }
 
-    pub fn entries(&self, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
+    pub fn entries(&self, cx: &App) -> Vec<HistoryEntry> {
         let mut history_entries = Vec::new();
 
         #[cfg(debug_assertions)]
@@ -180,10 +204,6 @@ impl HistoryStore {
                 .is_none()
     }
 
-    pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
-        self.entries(cx).into_iter().take(limit).collect()
-    }
-
     pub fn recently_opened_entries(&self, cx: &App) -> Vec<HistoryEntry> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
@@ -246,6 +266,10 @@ impl HistoryStore {
             cx.background_executor()
                 .timer(SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE)
                 .await;
+
+            if cfg!(any(feature = "test-support", test)) {
+                return;
+            }
             KEY_VALUE_STORE
                 .write_kvp(RECENTLY_OPENED_THREADS_KEY.to_owned(), content)
                 .await
@@ -255,6 +279,9 @@ impl HistoryStore {
 
     fn load_recently_opened_entries(cx: &AsyncApp) -> Task<Result<VecDeque<HistoryEntryId>>> {
         cx.background_spawn(async move {
+            if cfg!(any(feature = "test-support", test)) {
+                anyhow::bail!("history store does not persist in tests");
+            }
             let json = KEY_VALUE_STORE
                 .read_kvp(RECENTLY_OPENED_THREADS_KEY)?
                 .unwrap_or("[]".to_string());
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 4bc45f1544..c1778bf38b 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -6,9 +6,12 @@ use crate::{
 };
 use acp_thread::{MentionUri, UserMessageId};
 use action_log::ActionLog;
-use agent::thread::{DetailedSummaryState, GitState, ProjectSnapshot, WorktreeSnapshot};
+use agent::thread::{GitState, ProjectSnapshot, WorktreeSnapshot};
 use agent_client_protocol as acp;
-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, SUMMARIZE_THREAD_PROMPT};
+use agent_settings::{
+    AgentProfileId, AgentSettings, CompletionMode, SUMMARIZE_THREAD_DETAILED_PROMPT,
+    SUMMARIZE_THREAD_PROMPT,
+};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
 use chrono::{DateTime, Utc};
@@ -499,8 +502,7 @@ pub struct Thread {
     prompt_id: PromptId,
     updated_at: DateTime<Utc>,
     title: Option<SharedString>,
-    #[allow(unused)]
-    summary: DetailedSummaryState,
+    summary: Option<SharedString>,
     messages: Vec<Message>,
     completion_mode: CompletionMode,
     /// Holds the task that handles agent interaction until the end of the turn.
@@ -541,7 +543,7 @@ impl Thread {
             prompt_id: PromptId::new(),
             updated_at: Utc::now(),
             title: None,
-            summary: DetailedSummaryState::default(),
+            summary: None,
             messages: Vec::new(),
             completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
             running_turn: None,
@@ -691,7 +693,7 @@ impl Thread {
             } else {
                 Some(db_thread.title.clone())
             },
-            summary: db_thread.summary,
+            summary: db_thread.detailed_summary,
             messages: db_thread.messages,
             completion_mode: db_thread.completion_mode.unwrap_or_default(),
             running_turn: None,
@@ -719,7 +721,7 @@ impl Thread {
             title: self.title.clone().unwrap_or_default(),
             messages: self.messages.clone(),
             updated_at: self.updated_at,
-            summary: self.summary.clone(),
+            detailed_summary: self.summary.clone(),
             initial_project_snapshot: None,
             cumulative_token_usage: self.cumulative_token_usage,
             request_token_usage: self.request_token_usage.clone(),
@@ -976,7 +978,7 @@ impl Thread {
                 Message::Agent(_) | Message::Resume => {}
             }
         }
-
+        self.summary = None;
         cx.notify();
         Ok(())
     }
@@ -1047,6 +1049,7 @@ impl Thread {
         let event_stream = ThreadEventStream(events_tx);
         let message_ix = self.messages.len().saturating_sub(1);
         self.tool_use_limit_reached = false;
+        self.summary = None;
         self.running_turn = Some(RunningTurn {
             event_stream: event_stream.clone(),
             _task: cx.spawn(async move |this, cx| {
@@ -1507,6 +1510,63 @@ impl Thread {
         self.title.clone().unwrap_or("New Thread".into())
     }
 
+    pub fn summary(&mut self, cx: &mut Context<Self>) -> Task<Result<SharedString>> {
+        if let Some(summary) = self.summary.as_ref() {
+            return Task::ready(Ok(summary.clone()));
+        }
+        let Some(model) = self.summarization_model.clone() else {
+            return Task::ready(Err(anyhow!("No summarization model available")));
+        };
+        let mut request = LanguageModelRequest {
+            intent: Some(CompletionIntent::ThreadSummarization),
+            temperature: AgentSettings::temperature_for_model(&model, cx),
+            ..Default::default()
+        };
+
+        for message in &self.messages {
+            request.messages.extend(message.to_request());
+        }
+
+        request.messages.push(LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec![SUMMARIZE_THREAD_DETAILED_PROMPT.into()],
+            cache: false,
+        });
+        cx.spawn(async move |this, cx| {
+            let mut summary = String::new();
+            let mut messages = model.stream_completion(request, cx).await?;
+            while let Some(event) = messages.next().await {
+                let event = event?;
+                let text = match event {
+                    LanguageModelCompletionEvent::Text(text) => text,
+                    LanguageModelCompletionEvent::StatusUpdate(
+                        CompletionRequestStatus::UsageUpdated { .. },
+                    ) => {
+                        // this.update(cx, |thread, cx| {
+                        //     thread.update_model_request_usage(amount as u32, limit, cx);
+                        // })?;
+                        // TODO: handle usage update
+                        continue;
+                    }
+                    _ => continue,
+                };
+
+                let mut lines = text.lines();
+                summary.extend(lines.next());
+            }
+
+            log::info!("Setting summary: {}", summary);
+            let summary = SharedString::from(summary);
+
+            this.update(cx, |this, cx| {
+                this.summary = Some(summary.clone());
+                cx.notify()
+            })?;
+
+            Ok(summary)
+        })
+    }
+
     fn update_title(
         &mut self,
         event_stream: &ThreadEventStream,
@@ -1617,6 +1677,7 @@ impl Thread {
 
         self.messages.push(Message::Agent(message));
         self.updated_at = Utc::now();
+        self.summary = None;
         cx.notify()
     }
 
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index afc834cdd8..1fe41d002c 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -15,6 +15,8 @@ pub use crate::agent_profile::*;
 
 pub const SUMMARIZE_THREAD_PROMPT: &str =
     include_str!("../../agent/src/prompts/summarize_thread_prompt.txt");
+pub const SUMMARIZE_THREAD_DETAILED_PROMPT: &str =
+    include_str!("../../agent/src/prompts/summarize_thread_detailed_prompt.txt");
 
 pub fn init(cx: &mut App) {
     AgentSettings::register(cx);
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index fbf8590e68..43e3b25124 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -104,9 +104,11 @@ zed_actions.workspace = true
 [dev-dependencies]
 acp_thread = { workspace = true, features = ["test-support"] }
 agent = { workspace = true, features = ["test-support"] }
+agent2 = { workspace = true, features = ["test-support"] }
 assistant_context = { workspace = true, features = ["test-support"] }
 assistant_tools.workspace = true
 buffer_diff = { workspace = true, features = ["test-support"] }
+db = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, "features" = ["test-support"] }
 indoc.workspace = true
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 1a5e9c7d81..999e469d30 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
 use acp_thread::MentionUri;
+use agent2::{HistoryEntry, HistoryStore};
 use anyhow::Result;
 use editor::{CompletionProvider, Editor, ExcerptId};
 use fuzzy::{StringMatch, StringMatchCandidate};
@@ -18,25 +19,21 @@ use text::{Anchor, ToPoint as _};
 use ui::prelude::*;
 use workspace::Workspace;
 
-use agent::thread_store::{TextThreadStore, ThreadStore};
-
+use crate::AgentPanel;
 use crate::acp::message_editor::MessageEditor;
 use crate::context_picker::file_context_picker::{FileMatch, search_files};
 use crate::context_picker::rules_context_picker::{RulesContextEntry, search_rules};
 use crate::context_picker::symbol_context_picker::SymbolMatch;
 use crate::context_picker::symbol_context_picker::search_symbols;
-use crate::context_picker::thread_context_picker::{
-    ThreadContextEntry, ThreadMatch, search_threads,
-};
 use crate::context_picker::{
-    ContextPickerAction, ContextPickerEntry, ContextPickerMode, RecentEntry,
-    available_context_picker_entries, recent_context_picker_entries, selection_ranges,
+    ContextPickerAction, ContextPickerEntry, ContextPickerMode, selection_ranges,
 };
 
 pub(crate) enum Match {
     File(FileMatch),
     Symbol(SymbolMatch),
-    Thread(ThreadMatch),
+    Thread(HistoryEntry),
+    RecentThread(HistoryEntry),
     Fetch(SharedString),
     Rules(RulesContextEntry),
     Entry(EntryMatch),
@@ -53,6 +50,7 @@ impl Match {
             Match::File(file) => file.mat.score,
             Match::Entry(mode) => mode.mat.as_ref().map(|mat| mat.score).unwrap_or(1.),
             Match::Thread(_) => 1.,
+            Match::RecentThread(_) => 1.,
             Match::Symbol(_) => 1.,
             Match::Rules(_) => 1.,
             Match::Fetch(_) => 1.,
@@ -60,209 +58,25 @@ impl Match {
     }
 }
 
-fn search(
-    mode: Option<ContextPickerMode>,
-    query: String,
-    cancellation_flag: Arc<AtomicBool>,
-    recent_entries: Vec<RecentEntry>,
-    prompt_store: Option<Entity<PromptStore>>,
-    thread_store: WeakEntity<ThreadStore>,
-    text_thread_context_store: WeakEntity<assistant_context::ContextStore>,
-    workspace: Entity<Workspace>,
-    cx: &mut App,
-) -> Task<Vec<Match>> {
-    match mode {
-        Some(ContextPickerMode::File) => {
-            let search_files_task =
-                search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
-            cx.background_spawn(async move {
-                search_files_task
-                    .await
-                    .into_iter()
-                    .map(Match::File)
-                    .collect()
-            })
-        }
-
-        Some(ContextPickerMode::Symbol) => {
-            let search_symbols_task =
-                search_symbols(query.clone(), cancellation_flag.clone(), &workspace, cx);
-            cx.background_spawn(async move {
-                search_symbols_task
-                    .await
-                    .into_iter()
-                    .map(Match::Symbol)
-                    .collect()
-            })
-        }
-
-        Some(ContextPickerMode::Thread) => {
-            if let Some((thread_store, context_store)) = thread_store
-                .upgrade()
-                .zip(text_thread_context_store.upgrade())
-            {
-                let search_threads_task = search_threads(
-                    query.clone(),
-                    cancellation_flag.clone(),
-                    thread_store,
-                    context_store,
-                    cx,
-                );
-                cx.background_spawn(async move {
-                    search_threads_task
-                        .await
-                        .into_iter()
-                        .map(Match::Thread)
-                        .collect()
-                })
-            } else {
-                Task::ready(Vec::new())
-            }
-        }
-
-        Some(ContextPickerMode::Fetch) => {
-            if !query.is_empty() {
-                Task::ready(vec![Match::Fetch(query.into())])
-            } else {
-                Task::ready(Vec::new())
-            }
-        }
-
-        Some(ContextPickerMode::Rules) => {
-            if let Some(prompt_store) = prompt_store.as_ref() {
-                let search_rules_task =
-                    search_rules(query.clone(), cancellation_flag.clone(), prompt_store, cx);
-                cx.background_spawn(async move {
-                    search_rules_task
-                        .await
-                        .into_iter()
-                        .map(Match::Rules)
-                        .collect::<Vec<_>>()
-                })
-            } else {
-                Task::ready(Vec::new())
-            }
-        }
-
-        None => {
-            if query.is_empty() {
-                let mut matches = recent_entries
-                    .into_iter()
-                    .map(|entry| match entry {
-                        RecentEntry::File {
-                            project_path,
-                            path_prefix,
-                        } => Match::File(FileMatch {
-                            mat: fuzzy::PathMatch {
-                                score: 1.,
-                                positions: Vec::new(),
-                                worktree_id: project_path.worktree_id.to_usize(),
-                                path: project_path.path,
-                                path_prefix,
-                                is_dir: false,
-                                distance_to_relative_ancestor: 0,
-                            },
-                            is_recent: true,
-                        }),
-                        RecentEntry::Thread(thread_context_entry) => Match::Thread(ThreadMatch {
-                            thread: thread_context_entry,
-                            is_recent: true,
-                        }),
-                    })
-                    .collect::<Vec<_>>();
-
-                matches.extend(
-                    available_context_picker_entries(
-                        &prompt_store,
-                        &Some(thread_store.clone()),
-                        &workspace,
-                        cx,
-                    )
-                    .into_iter()
-                    .map(|mode| {
-                        Match::Entry(EntryMatch {
-                            entry: mode,
-                            mat: None,
-                        })
-                    }),
-                );
-
-                Task::ready(matches)
-            } else {
-                let executor = cx.background_executor().clone();
-
-                let search_files_task =
-                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
-
-                let entries = available_context_picker_entries(
-                    &prompt_store,
-                    &Some(thread_store.clone()),
-                    &workspace,
-                    cx,
-                );
-                let entry_candidates = entries
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, entry)| StringMatchCandidate::new(ix, entry.keyword()))
-                    .collect::<Vec<_>>();
-
-                cx.background_spawn(async move {
-                    let mut matches = search_files_task
-                        .await
-                        .into_iter()
-                        .map(Match::File)
-                        .collect::<Vec<_>>();
-
-                    let entry_matches = fuzzy::match_strings(
-                        &entry_candidates,
-                        &query,
-                        false,
-                        true,
-                        100,
-                        &Arc::new(AtomicBool::default()),
-                        executor,
-                    )
-                    .await;
-
-                    matches.extend(entry_matches.into_iter().map(|mat| {
-                        Match::Entry(EntryMatch {
-                            entry: entries[mat.candidate_id],
-                            mat: Some(mat),
-                        })
-                    }));
-
-                    matches.sort_by(|a, b| {
-                        b.score()
-                            .partial_cmp(&a.score())
-                            .unwrap_or(std::cmp::Ordering::Equal)
-                    });
-
-                    matches
-                })
-            }
-        }
-    }
-}
-
 pub struct ContextPickerCompletionProvider {
-    workspace: WeakEntity<Workspace>,
-    thread_store: WeakEntity<ThreadStore>,
-    text_thread_store: WeakEntity<TextThreadStore>,
     message_editor: WeakEntity<MessageEditor>,
+    workspace: WeakEntity<Workspace>,
+    history_store: Entity<HistoryStore>,
+    prompt_store: Option<Entity<PromptStore>>,
 }
 
 impl ContextPickerCompletionProvider {
     pub fn new(
-        workspace: WeakEntity<Workspace>,
-        thread_store: WeakEntity<ThreadStore>,
-        text_thread_store: WeakEntity<TextThreadStore>,
         message_editor: WeakEntity<MessageEditor>,
+        workspace: WeakEntity<Workspace>,
+        history_store: Entity<HistoryStore>,
+        prompt_store: Option<Entity<PromptStore>>,
     ) -> Self {
         Self {
-            workspace,
-            thread_store,
-            text_thread_store,
             message_editor,
+            workspace,
+            history_store,
+            prompt_store,
         }
     }
 
@@ -349,22 +163,13 @@ impl ContextPickerCompletionProvider {
     }
 
     fn completion_for_thread(
-        thread_entry: ThreadContextEntry,
+        thread_entry: HistoryEntry,
         source_range: Range<Anchor>,
         recent: bool,
         editor: WeakEntity<MessageEditor>,
         cx: &mut App,
     ) -> Completion {
-        let uri = match &thread_entry {
-            ThreadContextEntry::Thread { id, title } => MentionUri::Thread {
-                id: id.clone(),
-                name: title.to_string(),
-            },
-            ThreadContextEntry::Context { path, title } => MentionUri::TextThread {
-                path: path.to_path_buf(),
-                name: title.to_string(),
-            },
-        };
+        let uri = thread_entry.mention_uri();
 
         let icon_for_completion = if recent {
             IconName::HistoryRerun.path().into()
@@ -547,6 +352,251 @@ impl ContextPickerCompletionProvider {
             )),
         })
     }
+
+    fn search(
+        &self,
+        mode: Option<ContextPickerMode>,
+        query: String,
+        cancellation_flag: Arc<AtomicBool>,
+        cx: &mut App,
+    ) -> Task<Vec<Match>> {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return Task::ready(Vec::default());
+        };
+        match mode {
+            Some(ContextPickerMode::File) => {
+                let search_files_task =
+                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+                cx.background_spawn(async move {
+                    search_files_task
+                        .await
+                        .into_iter()
+                        .map(Match::File)
+                        .collect()
+                })
+            }
+
+            Some(ContextPickerMode::Symbol) => {
+                let search_symbols_task =
+                    search_symbols(query.clone(), cancellation_flag.clone(), &workspace, cx);
+                cx.background_spawn(async move {
+                    search_symbols_task
+                        .await
+                        .into_iter()
+                        .map(Match::Symbol)
+                        .collect()
+                })
+            }
+
+            Some(ContextPickerMode::Thread) => {
+                let search_threads_task = search_threads(
+                    query.clone(),
+                    cancellation_flag.clone(),
+                    &self.history_store,
+                    cx,
+                );
+                cx.background_spawn(async move {
+                    search_threads_task
+                        .await
+                        .into_iter()
+                        .map(Match::Thread)
+                        .collect()
+                })
+            }
+
+            Some(ContextPickerMode::Fetch) => {
+                if !query.is_empty() {
+                    Task::ready(vec![Match::Fetch(query.into())])
+                } else {
+                    Task::ready(Vec::new())
+                }
+            }
+
+            Some(ContextPickerMode::Rules) => {
+                if let Some(prompt_store) = self.prompt_store.as_ref() {
+                    let search_rules_task =
+                        search_rules(query.clone(), cancellation_flag.clone(), prompt_store, cx);
+                    cx.background_spawn(async move {
+                        search_rules_task
+                            .await
+                            .into_iter()
+                            .map(Match::Rules)
+                            .collect::<Vec<_>>()
+                    })
+                } else {
+                    Task::ready(Vec::new())
+                }
+            }
+
+            None if query.is_empty() => {
+                let mut matches = self.recent_context_picker_entries(&workspace, cx);
+
+                matches.extend(
+                    self.available_context_picker_entries(&workspace, cx)
+                        .into_iter()
+                        .map(|mode| {
+                            Match::Entry(EntryMatch {
+                                entry: mode,
+                                mat: None,
+                            })
+                        }),
+                );
+
+                Task::ready(matches)
+            }
+            None => {
+                let executor = cx.background_executor().clone();
+
+                let search_files_task =
+                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+
+                let entries = self.available_context_picker_entries(&workspace, cx);
+                let entry_candidates = entries
+                    .iter()
+                    .enumerate()
+                    .map(|(ix, entry)| StringMatchCandidate::new(ix, entry.keyword()))
+                    .collect::<Vec<_>>();
+
+                cx.background_spawn(async move {
+                    let mut matches = search_files_task
+                        .await
+                        .into_iter()
+                        .map(Match::File)
+                        .collect::<Vec<_>>();
+
+                    let entry_matches = fuzzy::match_strings(
+                        &entry_candidates,
+                        &query,
+                        false,
+                        true,
+                        100,
+                        &Arc::new(AtomicBool::default()),
+                        executor,
+                    )
+                    .await;
+
+                    matches.extend(entry_matches.into_iter().map(|mat| {
+                        Match::Entry(EntryMatch {
+                            entry: entries[mat.candidate_id],
+                            mat: Some(mat),
+                        })
+                    }));
+
+                    matches.sort_by(|a, b| {
+                        b.score()
+                            .partial_cmp(&a.score())
+                            .unwrap_or(std::cmp::Ordering::Equal)
+                    });
+
+                    matches
+                })
+            }
+        }
+    }
+
+    fn recent_context_picker_entries(
+        &self,
+        workspace: &Entity<Workspace>,
+        cx: &mut App,
+    ) -> Vec<Match> {
+        let mut recent = Vec::with_capacity(6);
+
+        let mut mentions = self
+            .message_editor
+            .read_with(cx, |message_editor, _cx| message_editor.mentions())
+            .unwrap_or_default();
+        let workspace = workspace.read(cx);
+        let project = workspace.project().read(cx);
+
+        if let Some(agent_panel) = workspace.panel::<AgentPanel>(cx)
+            && let Some(thread) = agent_panel.read(cx).active_agent_thread(cx)
+        {
+            let thread = thread.read(cx);
+            mentions.insert(MentionUri::Thread {
+                id: thread.session_id().clone(),
+                name: thread.title().into(),
+            });
+        }
+
+        recent.extend(
+            workspace
+                .recent_navigation_history_iter(cx)
+                .filter(|(_, abs_path)| {
+                    abs_path.as_ref().is_none_or(|path| {
+                        !mentions.contains(&MentionUri::File {
+                            abs_path: path.clone(),
+                        })
+                    })
+                })
+                .take(4)
+                .filter_map(|(project_path, _)| {
+                    project
+                        .worktree_for_id(project_path.worktree_id, cx)
+                        .map(|worktree| {
+                            let path_prefix = worktree.read(cx).root_name().into();
+                            Match::File(FileMatch {
+                                mat: fuzzy::PathMatch {
+                                    score: 1.,
+                                    positions: Vec::new(),
+                                    worktree_id: project_path.worktree_id.to_usize(),
+                                    path: project_path.path,
+                                    path_prefix,
+                                    is_dir: false,
+                                    distance_to_relative_ancestor: 0,
+                                },
+                                is_recent: true,
+                            })
+                        })
+                }),
+        );
+
+        const RECENT_COUNT: usize = 2;
+        let threads = self
+            .history_store
+            .read(cx)
+            .recently_opened_entries(cx)
+            .into_iter()
+            .filter(|thread| !mentions.contains(&thread.mention_uri()))
+            .take(RECENT_COUNT)
+            .collect::<Vec<_>>();
+
+        recent.extend(threads.into_iter().map(Match::RecentThread));
+
+        recent
+    }
+
+    fn available_context_picker_entries(
+        &self,
+        workspace: &Entity<Workspace>,
+        cx: &mut App,
+    ) -> Vec<ContextPickerEntry> {
+        let mut entries = vec![
+            ContextPickerEntry::Mode(ContextPickerMode::File),
+            ContextPickerEntry::Mode(ContextPickerMode::Symbol),
+            ContextPickerEntry::Mode(ContextPickerMode::Thread),
+        ];
+
+        let has_selection = workspace
+            .read(cx)
+            .active_item(cx)
+            .and_then(|item| item.downcast::<Editor>())
+            .is_some_and(|editor| {
+                editor.update(cx, |editor, cx| editor.has_non_empty_selection(cx))
+            });
+        if has_selection {
+            entries.push(ContextPickerEntry::Action(
+                ContextPickerAction::AddSelections,
+            ));
+        }
+
+        if self.prompt_store.is_some() {
+            entries.push(ContextPickerEntry::Mode(ContextPickerMode::Rules));
+        }
+
+        entries.push(ContextPickerEntry::Mode(ContextPickerMode::Fetch));
+
+        entries
+    }
 }
 
 fn build_code_label_for_full_path(file_name: &str, directory: Option<&str>, cx: &App) -> CodeLabel {
@@ -596,45 +646,12 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         let source_range = snapshot.anchor_before(state.source_range.start)
             ..snapshot.anchor_after(state.source_range.end);
 
-        let thread_store = self.thread_store.clone();
-        let text_thread_store = self.text_thread_store.clone();
         let editor = self.message_editor.clone();
-        let Ok((exclude_paths, exclude_threads)) =
-            self.message_editor.update(cx, |message_editor, _cx| {
-                message_editor.mentioned_path_and_threads()
-            })
-        else {
-            return Task::ready(Ok(Vec::new()));
-        };
 
         let MentionCompletion { mode, argument, .. } = state;
         let query = argument.unwrap_or_else(|| "".to_string());
 
-        let recent_entries = recent_context_picker_entries(
-            Some(thread_store.clone()),
-            Some(text_thread_store.clone()),
-            workspace.clone(),
-            &exclude_paths,
-            &exclude_threads,
-            cx,
-        );
-
-        let prompt_store = thread_store
-            .read_with(cx, |thread_store, _cx| thread_store.prompt_store().clone())
-            .ok()
-            .flatten();
-
-        let search_task = search(
-            mode,
-            query,
-            Arc::<AtomicBool>::default(),
-            recent_entries,
-            prompt_store,
-            thread_store.clone(),
-            text_thread_store.clone(),
-            workspace.clone(),
-            cx,
-        );
+        let search_task = self.search(mode, query, Arc::<AtomicBool>::default(), cx);
 
         cx.spawn(async move |_, cx| {
             let matches = search_task.await;
@@ -669,12 +686,18 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                             cx,
                         ),
 
-                        Match::Thread(ThreadMatch {
-                            thread, is_recent, ..
-                        }) => Some(Self::completion_for_thread(
+                        Match::Thread(thread) => Some(Self::completion_for_thread(
                             thread,
                             source_range.clone(),
-                            is_recent,
+                            false,
+                            editor.clone(),
+                            cx,
+                        )),
+
+                        Match::RecentThread(thread) => Some(Self::completion_for_thread(
+                            thread,
+                            source_range.clone(),
+                            true,
                             editor.clone(),
                             cx,
                         )),
@@ -748,6 +771,42 @@ impl CompletionProvider for ContextPickerCompletionProvider {
     }
 }
 
+pub(crate) fn search_threads(
+    query: String,
+    cancellation_flag: Arc<AtomicBool>,
+    history_store: &Entity<HistoryStore>,
+    cx: &mut App,
+) -> Task<Vec<HistoryEntry>> {
+    let threads = history_store.read(cx).entries(cx);
+    if query.is_empty() {
+        return Task::ready(threads);
+    }
+
+    let executor = cx.background_executor().clone();
+    cx.background_spawn(async move {
+        let candidates = threads
+            .iter()
+            .enumerate()
+            .map(|(id, thread)| StringMatchCandidate::new(id, thread.title()))
+            .collect::<Vec<_>>();
+        let matches = fuzzy::match_strings(
+            &candidates,
+            &query,
+            false,
+            true,
+            100,
+            &cancellation_flag,
+            executor,
+        )
+        .await;
+
+        matches
+            .into_iter()
+            .map(|mat| threads[mat.candidate_id].clone())
+            .collect()
+    })
+}
+
 fn confirm_completion_callback(
     crease_text: SharedString,
     start: Anchor,
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 98af9bf838..67acbb8b5b 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,7 +1,7 @@
 use std::ops::Range;
 
 use acp_thread::{AcpThread, AgentThreadEntry};
-use agent::{TextThreadStore, ThreadStore};
+use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
@@ -10,6 +10,7 @@ use gpui::{
 };
 use language::language_settings::SoftWrap;
 use project::Project;
+use prompt_store::PromptStore;
 use settings::Settings as _;
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
@@ -21,8 +22,8 @@ use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 pub struct EntryViewState {
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
-    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
+    history_store: Entity<HistoryStore>,
+    prompt_store: Option<Entity<PromptStore>>,
     entries: Vec<Entry>,
     prevent_slash_commands: bool,
 }
@@ -31,15 +32,15 @@ impl EntryViewState {
     pub fn new(
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
-        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
+        history_store: Entity<HistoryStore>,
+        prompt_store: Option<Entity<PromptStore>>,
         prevent_slash_commands: bool,
     ) -> Self {
         Self {
             workspace,
             project,
-            thread_store,
-            text_thread_store,
+            history_store,
+            prompt_store,
             entries: Vec::new(),
             prevent_slash_commands,
         }
@@ -77,8 +78,8 @@ impl EntryViewState {
                         let mut editor = MessageEditor::new(
                             self.workspace.clone(),
                             self.project.clone(),
-                            self.thread_store.clone(),
-                            self.text_thread_store.clone(),
+                            self.history_store.clone(),
+                            self.prompt_store.clone(),
                             "Edit message － @ to include context",
                             self.prevent_slash_commands,
                             editor::EditorMode::AutoHeight {
@@ -313,9 +314,10 @@ mod tests {
     use std::{path::Path, rc::Rc};
 
     use acp_thread::{AgentConnection, StubAgentConnection};
-    use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol as acp;
     use agent_settings::AgentSettings;
+    use agent2::HistoryStore;
+    use assistant_context::ContextStore;
     use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
     use editor::{EditorSettings, RowInfo};
     use fs::FakeFs;
@@ -378,15 +380,15 @@ mod tests {
             connection.send_update(session_id, acp::SessionUpdate::ToolCall(tool_call), cx)
         });
 
-        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+        let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
 
         let view_state = cx.new(|_cx| {
             EntryViewState::new(
                 workspace.downgrade(),
                 project.clone(),
-                thread_store,
-                text_thread_store,
+                history_store,
+                None,
                 false,
             )
         });
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 01a81c8cce..c87c824015 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -3,8 +3,9 @@ use crate::{
     context_picker::fetch_context_picker::fetch_url_content,
 };
 use acp_thread::{MentionUri, selection_name};
-use agent::{TextThreadStore, ThreadId, ThreadStore};
 use agent_client_protocol as acp;
+use agent_servers::AgentServer;
+use agent2::HistoryStore;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
@@ -27,6 +28,7 @@ use gpui::{
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
 use project::{Project, ProjectPath, Worktree};
+use prompt_store::PromptStore;
 use rope::Point;
 use settings::Settings;
 use std::{
@@ -59,8 +61,8 @@ pub struct MessageEditor {
     editor: Entity<Editor>,
     project: Entity<Project>,
     workspace: WeakEntity<Workspace>,
-    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
+    history_store: Entity<HistoryStore>,
+    prompt_store: Option<Entity<PromptStore>>,
     prevent_slash_commands: bool,
     _subscriptions: Vec<Subscription>,
     _parse_slash_command_task: Task<()>,
@@ -79,8 +81,8 @@ impl MessageEditor {
     pub fn new(
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
-        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
+        history_store: Entity<HistoryStore>,
+        prompt_store: Option<Entity<PromptStore>>,
         placeholder: impl Into<Arc<str>>,
         prevent_slash_commands: bool,
         mode: EditorMode,
@@ -95,10 +97,10 @@ impl MessageEditor {
             None,
         );
         let completion_provider = ContextPickerCompletionProvider::new(
-            workspace.clone(),
-            thread_store.downgrade(),
-            text_thread_store.downgrade(),
             cx.weak_entity(),
+            workspace.clone(),
+            history_store.clone(),
+            prompt_store.clone(),
         );
         let semantics_provider = Rc::new(SlashCommandSemanticsProvider {
             range: Cell::new(None),
@@ -152,9 +154,9 @@ impl MessageEditor {
             editor,
             project,
             mention_set,
-            thread_store,
-            text_thread_store,
             workspace,
+            history_store,
+            prompt_store,
             prevent_slash_commands,
             _subscriptions: subscriptions,
             _parse_slash_command_task: Task::ready(()),
@@ -175,23 +177,12 @@ impl MessageEditor {
         self.editor.read(cx).is_empty(cx)
     }
 
-    pub fn mentioned_path_and_threads(&self) -> (HashSet<PathBuf>, HashSet<ThreadId>) {
-        let mut excluded_paths = HashSet::default();
-        let mut excluded_threads = HashSet::default();
-
-        for uri in self.mention_set.uri_by_crease_id.values() {
-            match uri {
-                MentionUri::File { abs_path, .. } => {
-                    excluded_paths.insert(abs_path.clone());
-                }
-                MentionUri::Thread { id, .. } => {
-                    excluded_threads.insert(id.clone());
-                }
-                _ => {}
-            }
-        }
-
-        (excluded_paths, excluded_threads)
+    pub fn mentions(&self) -> HashSet<MentionUri> {
+        self.mention_set
+            .uri_by_crease_id
+            .values()
+            .cloned()
+            .collect()
     }
 
     pub fn confirm_completion(
@@ -529,7 +520,7 @@ impl MessageEditor {
         &mut self,
         crease_id: CreaseId,
         anchor: Anchor,
-        id: ThreadId,
+        id: acp::SessionId,
         name: String,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -538,17 +529,25 @@ impl MessageEditor {
             id: id.clone(),
             name,
         };
-        let open_task = self.thread_store.update(cx, |thread_store, cx| {
-            thread_store.open_thread(&id, window, cx)
+        let server = Rc::new(agent2::NativeAgentServer::new(
+            self.project.read(cx).fs().clone(),
+            self.history_store.clone(),
+        ));
+        let connection = server.connect(Path::new(""), &self.project, cx);
+        let load_summary = cx.spawn({
+            let id = id.clone();
+            async move |_, cx| {
+                let agent = connection.await?;
+                let agent = agent.downcast::<agent2::NativeAgentConnection>().unwrap();
+                let summary = agent
+                    .0
+                    .update(cx, |agent, cx| agent.thread_summary(id, cx))?
+                    .await?;
+                anyhow::Ok(summary)
+            }
         });
         let task = cx
-            .spawn(async move |_, cx| {
-                let thread = open_task.await.map_err(|e| e.to_string())?;
-                let content = thread
-                    .read_with(cx, |thread, _cx| thread.latest_detailed_summary_or_text())
-                    .map_err(|e| e.to_string())?;
-                Ok(content)
-            })
+            .spawn(async move |_, _| load_summary.await.map_err(|e| format!("{e}")))
             .shared();
 
         self.mention_set.insert_thread(id.clone(), task.clone());
@@ -590,8 +589,8 @@ impl MessageEditor {
             path: path.clone(),
             name,
         };
-        let context = self.text_thread_store.update(cx, |text_thread_store, cx| {
-            text_thread_store.open_local_context(path.as_path().into(), cx)
+        let context = self.history_store.update(cx, |text_thread_store, cx| {
+            text_thread_store.load_text_thread(path.as_path().into(), cx)
         });
         let task = cx
             .spawn(async move |_, cx| {
@@ -637,7 +636,7 @@ impl MessageEditor {
     ) -> Task<Result<Vec<acp::ContentBlock>>> {
         let contents =
             self.mention_set
-                .contents(self.project.clone(), self.thread_store.clone(), window, cx);
+                .contents(&self.project, self.prompt_store.as_ref(), window, cx);
         let editor = self.editor.clone();
         let prevent_slash_commands = self.prevent_slash_commands;
 
@@ -1316,7 +1315,7 @@ pub struct MentionSet {
     uri_by_crease_id: HashMap<CreaseId, MentionUri>,
     fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
     images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
-    thread_summaries: HashMap<ThreadId, Shared<Task<Result<SharedString, String>>>>,
+    thread_summaries: HashMap<acp::SessionId, Shared<Task<Result<SharedString, String>>>>,
     text_thread_summaries: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
     directories: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
 }
@@ -1338,7 +1337,11 @@ impl MentionSet {
         self.images.insert(crease_id, task);
     }
 
-    fn insert_thread(&mut self, id: ThreadId, task: Shared<Task<Result<SharedString, String>>>) {
+    fn insert_thread(
+        &mut self,
+        id: acp::SessionId,
+        task: Shared<Task<Result<SharedString, String>>>,
+    ) {
         self.thread_summaries.insert(id, task);
     }
 
@@ -1358,8 +1361,8 @@ impl MentionSet {
 
     pub fn contents(
         &self,
-        project: Entity<Project>,
-        thread_store: Entity<ThreadStore>,
+        project: &Entity<Project>,
+        prompt_store: Option<&Entity<PromptStore>>,
         _window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, Mention>>> {
@@ -1484,8 +1487,7 @@ impl MentionSet {
                         })
                     }
                     MentionUri::Rule { id: prompt_id, .. } => {
-                        let Some(prompt_store) = thread_store.read(cx).prompt_store().clone()
-                        else {
+                        let Some(prompt_store) = prompt_store else {
                             return Task::ready(Err(anyhow!("missing prompt store")));
                         };
                         let text_task = prompt_store.read(cx).load(*prompt_id, cx);
@@ -1678,8 +1680,9 @@ impl Addon for MessageEditorAddon {
 mod tests {
     use std::{ops::Range, path::Path, sync::Arc};
 
-    use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol as acp;
+    use agent2::HistoryStore;
+    use assistant_context::ContextStore;
     use editor::{AnchorRangeExt as _, Editor, EditorMode};
     use fs::FakeFs;
     use futures::StreamExt as _;
@@ -1710,16 +1713,16 @@ mod tests {
         let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
-        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+        let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
 
         let message_editor = cx.update(|window, cx| {
             cx.new(|cx| {
                 MessageEditor::new(
                     workspace.downgrade(),
                     project.clone(),
-                    thread_store.clone(),
-                    text_thread_store.clone(),
+                    history_store.clone(),
+                    None,
                     "Test",
                     false,
                     EditorMode::AutoHeight {
@@ -1908,8 +1911,8 @@ mod tests {
             opened_editors.push(buffer);
         }
 
-        let thread_store = cx.new(|cx| ThreadStore::fake(project.clone(), cx));
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
+        let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
 
         let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
             let workspace_handle = cx.weak_entity();
@@ -1917,8 +1920,8 @@ mod tests {
                 MessageEditor::new(
                     workspace_handle,
                     project.clone(),
-                    thread_store.clone(),
-                    text_thread_store.clone(),
+                    history_store.clone(),
+                    None,
                     "Test",
                     false,
                     EditorMode::AutoHeight {
@@ -2011,12 +2014,9 @@ mod tests {
 
         let contents = message_editor
             .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    project.clone(),
-                    thread_store.clone(),
-                    window,
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&project, None, window, cx)
             })
             .await
             .unwrap()
@@ -2066,12 +2066,9 @@ mod tests {
 
         let contents = message_editor
             .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    project.clone(),
-                    thread_store.clone(),
-                    window,
-                    cx,
-                )
+                message_editor
+                    .mention_set()
+                    .contents(&project, None, window, cx)
             })
             .await
             .unwrap()
@@ -2181,7 +2178,7 @@ mod tests {
             .update_in(&mut cx, |message_editor, window, cx| {
                 message_editor
                     .mention_set()
-                    .contents(project.clone(), thread_store, window, cx)
+                    .contents(&project, None, window, cx)
             })
             .await
             .unwrap()
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index ee033bf1f6..3be88ee3c3 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -5,7 +5,6 @@ use acp_thread::{
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
-use agent::{TextThreadStore, ThreadStore};
 use agent_client_protocol::{self as acp};
 use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
@@ -32,7 +31,7 @@ use language::Buffer;
 use language_model::LanguageModelRegistry;
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use project::{Project, ProjectEntryId};
-use prompt_store::PromptId;
+use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
 use std::sync::Arc;
@@ -158,8 +157,7 @@ impl AcpThreadView {
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
-        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
+        prompt_store: Option<Entity<PromptStore>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -168,8 +166,8 @@ impl AcpThreadView {
             MessageEditor::new(
                 workspace.clone(),
                 project.clone(),
-                thread_store.clone(),
-                text_thread_store.clone(),
+                history_store.clone(),
+                prompt_store.clone(),
                 "Message the agent — @ to include context",
                 prevent_slash_commands,
                 editor::EditorMode::AutoHeight {
@@ -187,8 +185,8 @@ impl AcpThreadView {
             EntryViewState::new(
                 workspace.clone(),
                 project.clone(),
-                thread_store.clone(),
-                text_thread_store.clone(),
+                history_store.clone(),
+                prompt_store.clone(),
                 prevent_slash_commands,
             )
         });
@@ -3201,12 +3199,18 @@ impl AcpThreadView {
                         })
                         .detach_and_log_err(cx);
                 }
-                MentionUri::Thread { id, .. } => {
+                MentionUri::Thread { id, name } => {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         panel.update(cx, |panel, cx| {
-                            panel
-                                .open_thread_by_id(&id, window, cx)
-                                .detach_and_log_err(cx)
+                            panel.load_agent_thread(
+                                DbThreadMetadata {
+                                    id,
+                                    title: name.into(),
+                                    updated_at: Default::default(),
+                                },
+                                window,
+                                cx,
+                            )
                         });
                     }
                 }
@@ -4075,7 +4079,6 @@ fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 #[cfg(test)]
 pub(crate) mod tests {
     use acp_thread::StubAgentConnection;
-    use agent::{TextThreadStore, ThreadStore};
     use agent_client_protocol::SessionId;
     use assistant_context::ContextStore;
     use editor::EditorSettings;
@@ -4211,10 +4214,6 @@ pub(crate) mod tests {
         let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
-        let thread_store =
-            cx.update(|_window, cx| cx.new(|cx| ThreadStore::fake(project.clone(), cx)));
-        let text_thread_store =
-            cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
         let context_store =
             cx.update(|_window, cx| cx.new(|cx| ContextStore::fake(project.clone(), cx)));
         let history_store =
@@ -4228,8 +4227,7 @@ pub(crate) mod tests {
                     workspace.downgrade(),
                     project,
                     history_store,
-                    thread_store.clone(),
-                    text_thread_store.clone(),
+                    None,
                     window,
                     cx,
                 )
@@ -4400,6 +4398,7 @@ pub(crate) mod tests {
             ThemeSettings::register(cx);
             release_channel::init(SemanticVersion::default(), cx);
             EditorSettings::register(cx);
+            prompt_store::init(cx)
         });
     }
 
@@ -4420,10 +4419,6 @@ pub(crate) mod tests {
         let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
-        let thread_store =
-            cx.update(|_window, cx| cx.new(|cx| ThreadStore::fake(project.clone(), cx)));
-        let text_thread_store =
-            cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
         let context_store =
             cx.update(|_window, cx| cx.new(|cx| ContextStore::fake(project.clone(), cx)));
         let history_store =
@@ -4438,8 +4433,7 @@ pub(crate) mod tests {
                     workspace.downgrade(),
                     project.clone(),
                     history_store.clone(),
-                    thread_store.clone(),
-                    text_thread_store.clone(),
+                    None,
                     window,
                     cx,
                 )
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index c89dc56795..b857052d69 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -4,6 +4,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::time::Duration;
 
+use acp_thread::AcpThread;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
@@ -1016,8 +1017,6 @@ impl AgentPanel {
             agent: crate::ExternalAgent,
         }
 
-        let thread_store = self.thread_store.clone();
-        let text_thread_store = self.context_store.clone();
         let history = self.acp_history_store.clone();
 
         cx.spawn_in(window, async move |this, cx| {
@@ -1075,8 +1074,7 @@ impl AgentPanel {
                         workspace.clone(),
                         project,
                         this.acp_history_store.clone(),
-                        thread_store.clone(),
-                        text_thread_store.clone(),
+                        this.prompt_store.clone(),
                         window,
                         cx,
                     )
@@ -1499,6 +1497,14 @@ impl AgentPanel {
             _ => None,
         }
     }
+    pub(crate) fn active_agent_thread(&self, cx: &App) -> Option<Entity<AcpThread>> {
+        match &self.active_view {
+            ActiveView::ExternalAgentThread { thread_view, .. } => {
+                thread_view.read(cx).thread().cloned()
+            }
+            _ => None,
+        }
+    }
 
     pub(crate) fn delete_thread(
         &mut self,
@@ -1816,6 +1822,15 @@ impl AgentPanel {
             }
         }
     }
+
+    pub fn load_agent_thread(
+        &mut self,
+        thread: DbThreadMetadata,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.external_thread(Some(ExternalAgent::NativeAgent), Some(thread), window, cx);
+    }
 }
 
 impl Focusable for AgentPanel {
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index c5b5e99a52..6d13531a57 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -905,7 +905,7 @@ impl ContextStore {
                     .into_iter()
                     .filter(assistant_slash_commands::acceptable_prompt)
                     .map(|prompt| {
-                        log::debug!("registering context server command: {:?}", prompt.name);
+                        log::info!("registering context server command: {:?}", prompt.name);
                         slash_command_working_set.insert(Arc::new(
                             assistant_slash_commands::ContextServerSlashCommand::new(
                                 context_server_store.clone(),

From 4c85a0dc71c8f48ebd8acc090d0c8025b465cc14 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 20 Aug 2025 12:20:09 +0530
Subject: [PATCH 197/823] project: Register dynamic capabilities even when
 registerOptions doesn't exist (#36554)

Closes #36482

Looks like we accidentally referenced
[common/formatting.ts#L67-L70](https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/formatting.ts#L67-L70)
instead of
[common/client.ts#L2133](https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/client.ts#L2133).

Release Notes:

- Fixed code not formatting on save in language servers like Biome.
(Preview Only)
---
 crates/project/src/lsp_store.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index d2fb12ee37..12505a6a03 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -12032,16 +12032,15 @@ impl LspStore {
     }
 }
 
-// Registration with empty capabilities should be ignored.
-// https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/formatting.ts#L67-L70
+// Registration with registerOptions as null, should fallback to true.
+// https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/client.ts#L2133
 fn parse_register_capabilities<T: serde::de::DeserializeOwned>(
     reg: lsp::Registration,
 ) -> anyhow::Result<Option<OneOf<bool, T>>> {
-    Ok(reg
-        .register_options
-        .map(|options| serde_json::from_value::<T>(options))
-        .transpose()?
-        .map(OneOf::Right))
+    Ok(match reg.register_options {
+        Some(options) => Some(OneOf::Right(serde_json::from_value::<T>(options)?)),
+        None => Some(OneOf::Left(true)),
+    })
 }
 
 fn subscribe_to_binary_statuses(

From d4d049d7b91b3e8c846a13a35eedaa070e73a303 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 20 Aug 2025 10:45:03 +0200
Subject: [PATCH 198/823] agent2: Port more Zed AI features (#36559)

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/acp_thread/src/acp_thread.rs    |  31 ++++++++
 crates/agent_ui/src/acp/thread_view.rs | 101 +++++++++++++++++++++++++
 crates/ui/src/components/callout.rs    |   3 +-
 3 files changed, 134 insertions(+), 1 deletion(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 5d3b35d018..e58f0a291f 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -674,6 +674,37 @@ pub struct TokenUsage {
     pub used_tokens: u64,
 }
 
+impl TokenUsage {
+    pub fn ratio(&self) -> TokenUsageRatio {
+        #[cfg(debug_assertions)]
+        let warning_threshold: f32 = std::env::var("ZED_THREAD_WARNING_THRESHOLD")
+            .unwrap_or("0.8".to_string())
+            .parse()
+            .unwrap();
+        #[cfg(not(debug_assertions))]
+        let warning_threshold: f32 = 0.8;
+
+        // When the maximum is unknown because there is no selected model,
+        // avoid showing the token limit warning.
+        if self.max_tokens == 0 {
+            TokenUsageRatio::Normal
+        } else if self.used_tokens >= self.max_tokens {
+            TokenUsageRatio::Exceeded
+        } else if self.used_tokens as f32 / self.max_tokens as f32 >= warning_threshold {
+            TokenUsageRatio::Warning
+        } else {
+            TokenUsageRatio::Normal
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TokenUsageRatio {
+    Normal,
+    Warning,
+    Exceeded,
+}
+
 #[derive(Debug, Clone)]
 pub struct RetryStatus {
     pub last_error: SharedString,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 3be88ee3c3..b93df3a5db 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -54,6 +54,7 @@ use crate::acp::entry_view_state::{EntryViewEvent, ViewEvent};
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
 use crate::profile_selector::{ProfileProvider, ProfileSelector};
+use crate::ui::preview::UsageCallout;
 use crate::ui::{AgentNotification, AgentNotificationEvent, BurnModeTooltip};
 use crate::{
     AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, ExpandMessageEditor, Follow,
@@ -2940,6 +2941,12 @@ impl AcpThreadView {
             .thread(acp_thread.session_id(), cx)
     }
 
+    fn is_using_zed_ai_models(&self, cx: &App) -> bool {
+        self.as_native_thread(cx)
+            .and_then(|thread| thread.read(cx).model())
+            .is_some_and(|model| model.provider_id() == language_model::ZED_CLOUD_PROVIDER_ID)
+    }
+
     fn render_token_usage(&self, cx: &mut Context<Self>) -> Option<Div> {
         let thread = self.thread()?.read(cx);
         let usage = thread.token_usage()?;
@@ -3587,6 +3594,88 @@ impl AcpThreadView {
             .children(Scrollbar::vertical(self.scrollbar_state.clone()).map(|s| s.auto_hide(cx)))
     }
 
+    fn render_token_limit_callout(
+        &self,
+        line_height: Pixels,
+        cx: &mut Context<Self>,
+    ) -> Option<Callout> {
+        let token_usage = self.thread()?.read(cx).token_usage()?;
+        let ratio = token_usage.ratio();
+
+        let (severity, title) = match ratio {
+            acp_thread::TokenUsageRatio::Normal => return None,
+            acp_thread::TokenUsageRatio::Warning => {
+                (Severity::Warning, "Thread reaching the token limit soon")
+            }
+            acp_thread::TokenUsageRatio::Exceeded => {
+                (Severity::Error, "Thread reached the token limit")
+            }
+        };
+
+        let burn_mode_available = self.as_native_thread(cx).is_some_and(|thread| {
+            thread.read(cx).completion_mode() == CompletionMode::Normal
+                && thread
+                    .read(cx)
+                    .model()
+                    .is_some_and(|model| model.supports_burn_mode())
+        });
+
+        let description = if burn_mode_available {
+            "To continue, start a new thread from a summary or turn Burn Mode on."
+        } else {
+            "To continue, start a new thread from a summary."
+        };
+
+        Some(
+            Callout::new()
+                .severity(severity)
+                .line_height(line_height)
+                .title(title)
+                .description(description)
+                .actions_slot(
+                    h_flex()
+                        .gap_0p5()
+                        .child(
+                            Button::new("start-new-thread", "Start New Thread")
+                                .label_size(LabelSize::Small)
+                                .on_click(cx.listener(|_this, _, _window, _cx| {
+                                    // todo: Once thread summarization is implemented, start a new thread from a summary.
+                                })),
+                        )
+                        .when(burn_mode_available, |this| {
+                            this.child(
+                                IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
+                                    .icon_size(IconSize::XSmall)
+                                    .on_click(cx.listener(|this, _event, window, cx| {
+                                        this.toggle_burn_mode(&ToggleBurnMode, window, cx);
+                                    })),
+                            )
+                        }),
+                ),
+        )
+    }
+
+    fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
+        if !self.is_using_zed_ai_models(cx) {
+            return None;
+        }
+
+        let user_store = self.project.read(cx).user_store().read(cx);
+        if user_store.is_usage_based_billing_enabled() {
+            return None;
+        }
+
+        let plan = user_store.plan().unwrap_or(cloud_llm_client::Plan::ZedFree);
+
+        let usage = user_store.model_request_usage()?;
+
+        Some(
+            div()
+                .child(UsageCallout::new(plan, usage))
+                .line_height(line_height),
+        )
+    }
+
     fn settings_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
         self.entry_view_state.update(cx, |entry_view_state, cx| {
             entry_view_state.settings_changed(cx);
@@ -3843,6 +3932,7 @@ impl Focusable for AcpThreadView {
 impl Render for AcpThreadView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let has_messages = self.list_state.item_count() > 0;
+        let line_height = TextSize::Small.rems(cx).to_pixels(window.rem_size()) * 1.5;
 
         v_flex()
             .size_full()
@@ -3921,6 +4011,17 @@ impl Render for AcpThreadView {
             })
             .children(self.render_thread_retry_status_callout(window, cx))
             .children(self.render_thread_error(window, cx))
+            .children(
+                if let Some(usage_callout) = self.render_usage_callout(line_height, cx) {
+                    Some(usage_callout.into_any_element())
+                } else if let Some(token_limit_callout) =
+                    self.render_token_limit_callout(line_height, cx)
+                {
+                    Some(token_limit_callout.into_any_element())
+                } else {
+                    None
+                },
+            )
             .child(self.render_message_editor(window, cx))
     }
 }
diff --git a/crates/ui/src/components/callout.rs b/crates/ui/src/components/callout.rs
index 22ba0468cd..7ffeda881c 100644
--- a/crates/ui/src/components/callout.rs
+++ b/crates/ui/src/components/callout.rs
@@ -81,7 +81,8 @@ impl Callout {
         self
     }
 
-    /// Sets an optional tertiary call-to-action button.
+    /// Sets an optional dismiss button, which is usually an icon button with a close icon.
+    /// This button is always rendered as the last one to the far right.
     pub fn dismiss_action(mut self, action: impl IntoElement) -> Self {
         self.dismiss_action = Some(action.into_any_element());
         self

From 44941b5dfe5a6ce4fbb45fb3aaba8dcecee481b6 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:22:19 +0300
Subject: [PATCH 199/823] Fix `clippy::for_kv_map` lint violations (#36493)

Release Notes:

- N/A
---
 Cargo.toml                                       |  1 +
 crates/agent_ui/src/agent_diff.rs                |  2 +-
 crates/channel/src/channel_buffer.rs             |  2 +-
 crates/channel/src/channel_store.rs              |  2 +-
 crates/extension_host/src/extension_host.rs      | 10 +++++-----
 crates/gpui/src/platform/linux/wayland/client.rs |  2 +-
 crates/gpui/src/platform/linux/x11/client.rs     |  2 +-
 crates/outline_panel/src/outline_panel.rs        |  2 +-
 crates/project/src/lsp_store.rs                  |  2 +-
 crates/project/src/manifest_tree.rs              |  2 +-
 crates/project/src/manifest_tree/server_tree.rs  |  4 ++--
 11 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index dc14c8ebd9..1ed8edf836 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -823,6 +823,7 @@ style = { level = "allow", priority = -1 }
 
 # Temporary list of style lints that we've fixed so far.
 comparison_to_empty = "warn"
+for_kv_map = "warn"
 into_iter_on_ref = "warn"
 iter_cloned_collect = "warn"
 iter_next_slice = "warn"
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index b20b126d9b..61a3ddd906 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1643,7 +1643,7 @@ impl AgentDiff {
                 continue;
             };
 
-            for (weak_editor, _) in buffer_editors {
+            for weak_editor in buffer_editors.keys() {
                 let Some(editor) = weak_editor.upgrade() else {
                     continue;
                 };
diff --git a/crates/channel/src/channel_buffer.rs b/crates/channel/src/channel_buffer.rs
index 943e819ad6..828248b330 100644
--- a/crates/channel/src/channel_buffer.rs
+++ b/crates/channel/src/channel_buffer.rs
@@ -135,7 +135,7 @@ impl ChannelBuffer {
             }
         }
 
-        for (_, old_collaborator) in &self.collaborators {
+        for old_collaborator in self.collaborators.values() {
             if !new_collaborators.contains_key(&old_collaborator.peer_id) {
                 self.buffer.update(cx, |buffer, cx| {
                     buffer.remove_peer(old_collaborator.replica_id, cx)
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 850a494613..daa8a91c7c 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -1073,7 +1073,7 @@ impl ChannelStore {
 
                 if let Some(this) = this.upgrade() {
                     this.update(cx, |this, cx| {
-                        for (_, buffer) in &this.opened_buffers {
+                        for buffer in this.opened_buffers.values() {
                             if let OpenEntityHandle::Open(buffer) = &buffer
                                 && let Some(buffer) = buffer.upgrade()
                             {
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 4c3ab8d242..fde0aeac94 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -1175,16 +1175,16 @@ impl ExtensionStore {
                 }
             }
 
-            for (server_id, _) in &extension.manifest.context_servers {
+            for server_id in extension.manifest.context_servers.keys() {
                 self.proxy.unregister_context_server(server_id.clone(), cx);
             }
-            for (adapter, _) in &extension.manifest.debug_adapters {
+            for adapter in extension.manifest.debug_adapters.keys() {
                 self.proxy.unregister_debug_adapter(adapter.clone());
             }
-            for (locator, _) in &extension.manifest.debug_locators {
+            for locator in extension.manifest.debug_locators.keys() {
                 self.proxy.unregister_debug_locator(locator.clone());
             }
-            for (command_name, _) in &extension.manifest.slash_commands {
+            for command_name in extension.manifest.slash_commands.keys() {
                 self.proxy.unregister_slash_command(command_name.clone());
             }
         }
@@ -1386,7 +1386,7 @@ impl ExtensionStore {
                         );
                     }
 
-                    for (id, _context_server_entry) in &manifest.context_servers {
+                    for id in manifest.context_servers.keys() {
                         this.proxy
                             .register_context_server(extension.clone(), id.clone(), cx);
                     }
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 4d31428094..2fe1da067b 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -528,7 +528,7 @@ impl WaylandClient {
 
                             client.common.appearance = appearance;
 
-                            for (_, window) in &mut client.windows {
+                            for window in client.windows.values_mut() {
                                 window.set_appearance(appearance);
                             }
                         }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 346ba8718b..68198a285f 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -456,7 +456,7 @@ impl X11Client {
                 move |event, _, client| match event {
                     XDPEvent::WindowAppearance(appearance) => {
                         client.with_common(|common| common.appearance = appearance);
-                        for (_, window) in &mut client.0.borrow_mut().windows {
+                        for window in client.0.borrow_mut().windows.values_mut() {
                             window.window.set_appearance(appearance);
                         }
                     }
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 891ae1595d..832b7f09d1 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -5338,7 +5338,7 @@ fn subscribe_for_editor_events(
                 }
                 EditorEvent::Reparsed(buffer_id) => {
                     if let Some(excerpts) = outline_panel.excerpts.get_mut(buffer_id) {
-                        for (_, excerpt) in excerpts {
+                        for excerpt in excerpts.values_mut() {
                             excerpt.invalidate_outlines();
                         }
                     }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 12505a6a03..04b14ae06e 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -10883,7 +10883,7 @@ impl LspStore {
             // Find all worktrees that have this server in their language server tree
             for (worktree_id, servers) in &local.lsp_tree.instances {
                 if *worktree_id != key.worktree_id {
-                    for (_, server_map) in &servers.roots {
+                    for server_map in servers.roots.values() {
                         if server_map.contains_key(&key.name) {
                             worktrees_using_server.push(*worktree_id);
                         }
diff --git a/crates/project/src/manifest_tree.rs b/crates/project/src/manifest_tree.rs
index ced9b34d93..5a3c7bd40f 100644
--- a/crates/project/src/manifest_tree.rs
+++ b/crates/project/src/manifest_tree.rs
@@ -77,7 +77,7 @@ impl ManifestTree {
             _subscriptions: [
                 cx.subscribe(&worktree_store, Self::on_worktree_store_event),
                 cx.observe_global::<SettingsStore>(|this, cx| {
-                    for (_, roots) in &mut this.root_points {
+                    for roots in this.root_points.values_mut() {
                         roots.update(cx, |worktree_roots, _| {
                             worktree_roots.roots = RootPathTrie::new();
                         })
diff --git a/crates/project/src/manifest_tree/server_tree.rs b/crates/project/src/manifest_tree/server_tree.rs
index f5fd481324..5e5f4bab49 100644
--- a/crates/project/src/manifest_tree/server_tree.rs
+++ b/crates/project/src/manifest_tree/server_tree.rs
@@ -312,8 +312,8 @@ impl LanguageServerTree {
 
     /// Remove nodes with a given ID from the tree.
     pub(crate) fn remove_nodes(&mut self, ids: &BTreeSet<LanguageServerId>) {
-        for (_, servers) in &mut self.instances {
-            for (_, nodes) in &mut servers.roots {
+        for servers in self.instances.values_mut() {
+            for nodes in &mut servers.roots.values_mut() {
                 nodes.retain(|_, (node, _)| node.id.get().is_none_or(|id| !ids.contains(id)));
             }
         }

From 4290f043cdb33c1f9ae5e296f95bd0509bb88b5b Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 20 Aug 2025 11:29:05 +0200
Subject: [PATCH 200/823] agent2: Fix token count not updating when changing
 model/toggling burn mode (#36562)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent2/Cargo.toml    |  1 +
 crates/agent2/src/agent.rs  | 25 +++++++++---
 crates/agent2/src/thread.rs | 76 ++++++++++++++++++++++++-------------
 3 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 2a39440af8..bc32a79622 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -26,6 +26,7 @@ assistant_context.workspace = true
 assistant_tool.workspace = true
 assistant_tools.workspace = true
 chrono.workspace = true
+client.workspace = true
 cloud_llm_client.workspace = true
 collections.workspace = true
 context_server.workspace = true
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 3c605de803..ab5716d8ad 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1,8 +1,8 @@
-use crate::HistoryStore;
 use crate::{
     ContextServerRegistry, Thread, ThreadEvent, ThreadsDatabase, ToolCallAuthorization,
     UserMessageContent, templates::Templates,
 };
+use crate::{HistoryStore, TokenUsageUpdated};
 use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
@@ -253,6 +253,7 @@ impl NativeAgent {
             cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
                 this.sessions.remove(acp_thread.session_id());
             }),
+            cx.subscribe(&thread_handle, Self::handle_thread_token_usage_updated),
             cx.observe(&thread_handle, move |this, thread, cx| {
                 this.save_thread(thread.clone(), cx)
             }),
@@ -440,6 +441,23 @@ impl NativeAgent {
         })
     }
 
+    fn handle_thread_token_usage_updated(
+        &mut self,
+        thread: Entity<Thread>,
+        usage: &TokenUsageUpdated,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(session) = self.sessions.get(thread.read(cx).id()) else {
+            return;
+        };
+        session
+            .acp_thread
+            .update(cx, |acp_thread, cx| {
+                acp_thread.update_token_usage(usage.0.clone(), cx);
+            })
+            .ok();
+    }
+
     fn handle_project_event(
         &mut self,
         _project: Entity<Project>,
@@ -695,11 +713,6 @@ impl NativeAgentConnection {
                                     thread.update_tool_call(update, cx)
                                 })??;
                             }
-                            ThreadEvent::TokenUsageUpdate(usage) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.update_token_usage(Some(usage), cx)
-                                })?;
-                            }
                             ThreadEvent::TitleUpdate(title) => {
                                 acp_thread
                                     .update(cx, |thread, cx| thread.update_title(title, cx))??;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index c1778bf38b..b6405dbcbd 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -15,7 +15,8 @@ use agent_settings::{
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
 use chrono::{DateTime, Utc};
-use cloud_llm_client::{CompletionIntent, CompletionRequestStatus};
+use client::{ModelRequestUsage, RequestUsage};
+use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};
 use collections::{HashMap, IndexMap};
 use fs::Fs;
 use futures::{
@@ -25,7 +26,9 @@ use futures::{
     stream::FuturesUnordered,
 };
 use git::repository::DiffType;
-use gpui::{App, AppContext, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
+use gpui::{
+    App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity,
+};
 use language_model::{
     LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelExt,
     LanguageModelImage, LanguageModelProviderId, LanguageModelRegistry, LanguageModelRequest,
@@ -484,7 +487,6 @@ pub enum ThreadEvent {
     ToolCall(acp::ToolCall),
     ToolCallUpdate(acp_thread::ToolCallUpdate),
     ToolCallAuthorization(ToolCallAuthorization),
-    TokenUsageUpdate(acp_thread::TokenUsage),
     TitleUpdate(SharedString),
     Retry(acp_thread::RetryStatus),
     Stop(acp::StopReason),
@@ -873,7 +875,12 @@ impl Thread {
     }
 
     pub fn set_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
+        let old_usage = self.latest_token_usage();
         self.model = Some(model);
+        let new_usage = self.latest_token_usage();
+        if old_usage != new_usage {
+            cx.emit(TokenUsageUpdated(new_usage));
+        }
         cx.notify()
     }
 
@@ -891,7 +898,12 @@ impl Thread {
     }
 
     pub fn set_completion_mode(&mut self, mode: CompletionMode, cx: &mut Context<Self>) {
+        let old_usage = self.latest_token_usage();
         self.completion_mode = mode;
+        let new_usage = self.latest_token_usage();
+        if old_usage != new_usage {
+            cx.emit(TokenUsageUpdated(new_usage));
+        }
         cx.notify()
     }
 
@@ -953,13 +965,15 @@ impl Thread {
         self.flush_pending_message(cx);
     }
 
-    pub fn update_token_usage(&mut self, update: language_model::TokenUsage) {
+    fn update_token_usage(&mut self, update: language_model::TokenUsage, cx: &mut Context<Self>) {
         let Some(last_user_message) = self.last_user_message() else {
             return;
         };
 
         self.request_token_usage
             .insert(last_user_message.id.clone(), update);
+        cx.emit(TokenUsageUpdated(self.latest_token_usage()));
+        cx.notify();
     }
 
     pub fn truncate(&mut self, message_id: UserMessageId, cx: &mut Context<Self>) -> Result<()> {
@@ -1180,20 +1194,15 @@ impl Thread {
                     )) => {
                         *tool_use_limit_reached = true;
                     }
+                    Ok(LanguageModelCompletionEvent::StatusUpdate(
+                        CompletionRequestStatus::UsageUpdated { amount, limit },
+                    )) => {
+                        this.update(cx, |this, cx| {
+                            this.update_model_request_usage(amount, limit, cx)
+                        })?;
+                    }
                     Ok(LanguageModelCompletionEvent::UsageUpdate(token_usage)) => {
-                        let usage = acp_thread::TokenUsage {
-                            max_tokens: model.max_token_count_for_mode(
-                                request
-                                    .mode
-                                    .unwrap_or(cloud_llm_client::CompletionMode::Normal),
-                            ),
-                            used_tokens: token_usage.total_tokens(),
-                        };
-
-                        this.update(cx, |this, _cx| this.update_token_usage(token_usage))
-                            .ok();
-
-                        event_stream.send_token_usage_update(usage);
+                        this.update(cx, |this, cx| this.update_token_usage(token_usage, cx))?;
                     }
                     Ok(LanguageModelCompletionEvent::Stop(StopReason::Refusal)) => {
                         *refusal = true;
@@ -1214,8 +1223,7 @@ impl Thread {
                                 event_stream,
                                 cx,
                             ));
-                        })
-                        .ok();
+                        })?;
                     }
                     Err(error) => {
                         let completion_mode =
@@ -1325,8 +1333,8 @@ impl Thread {
                     json_parse_error,
                 )));
             }
-            UsageUpdate(_) | StatusUpdate(_) => {}
-            Stop(_) => unreachable!(),
+            StatusUpdate(_) => {}
+            UsageUpdate(_) | Stop(_) => unreachable!(),
         }
 
         None
@@ -1506,6 +1514,21 @@ impl Thread {
         }
     }
 
+    fn update_model_request_usage(&self, amount: usize, limit: UsageLimit, cx: &mut Context<Self>) {
+        self.project
+            .read(cx)
+            .user_store()
+            .update(cx, |user_store, cx| {
+                user_store.update_model_request_usage(
+                    ModelRequestUsage(RequestUsage {
+                        amount: amount as i32,
+                        limit,
+                    }),
+                    cx,
+                )
+            });
+    }
+
     pub fn title(&self) -> SharedString {
         self.title.clone().unwrap_or("New Thread".into())
     }
@@ -1636,6 +1659,7 @@ impl Thread {
             })
         }))
     }
+
     fn last_user_message(&self) -> Option<&UserMessage> {
         self.messages
             .iter()
@@ -1934,6 +1958,10 @@ impl RunningTurn {
     }
 }
 
+pub struct TokenUsageUpdated(pub Option<acp_thread::TokenUsage>);
+
+impl EventEmitter<TokenUsageUpdated> for Thread {}
+
 pub trait AgentTool
 where
     Self: 'static + Sized,
@@ -2166,12 +2194,6 @@ impl ThreadEventStream {
             .ok();
     }
 
-    fn send_token_usage_update(&self, usage: acp_thread::TokenUsage) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::TokenUsageUpdate(usage)))
-            .ok();
-    }
-
     fn send_retry(&self, status: acp_thread::RetryStatus) {
         self.0.unbounded_send(Ok(ThreadEvent::Retry(status))).ok();
     }

From 83d361ba694fac74a131fde835ecae26b043100f Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 20 Aug 2025 11:29:53 +0200
Subject: [PATCH 201/823] Add more string and comment overrides (#36566)

Follow-up to #36469

Part of the issue was that we hadn't defined comment and string
overrides for some languages. Hence, even after the fix edit predictions
would show up in comments for me in e.g. JSONC files.

This PR adds some more overrides where possible for this repo to ensure
this happens less frequently.

Release Notes:

- N/A
---
 crates/languages/src/bash/overrides.scm  | 2 ++
 crates/languages/src/jsonc/overrides.scm | 1 +
 crates/languages/src/yaml/overrides.scm  | 5 +++++
 3 files changed, 8 insertions(+)
 create mode 100644 crates/languages/src/bash/overrides.scm
 create mode 100644 crates/languages/src/yaml/overrides.scm

diff --git a/crates/languages/src/bash/overrides.scm b/crates/languages/src/bash/overrides.scm
new file mode 100644
index 0000000000..81fec9a5f5
--- /dev/null
+++ b/crates/languages/src/bash/overrides.scm
@@ -0,0 +1,2 @@
+(comment) @comment.inclusive
+(string) @string
diff --git a/crates/languages/src/jsonc/overrides.scm b/crates/languages/src/jsonc/overrides.scm
index cc966ad4c1..81fec9a5f5 100644
--- a/crates/languages/src/jsonc/overrides.scm
+++ b/crates/languages/src/jsonc/overrides.scm
@@ -1 +1,2 @@
+(comment) @comment.inclusive
 (string) @string
diff --git a/crates/languages/src/yaml/overrides.scm b/crates/languages/src/yaml/overrides.scm
new file mode 100644
index 0000000000..9503051a62
--- /dev/null
+++ b/crates/languages/src/yaml/overrides.scm
@@ -0,0 +1,5 @@
+(comment) @comment.inclusive
+[
+  (single_quote_scalar)
+  (double_quote_scalar)
+] @string

From 0a80209c5e4f268f9ccdda0460ede2cd874f3c7b Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 20 Aug 2025 11:54:26 +0200
Subject: [PATCH 202/823] agent2: Fix remaining update_model_request_usage
 todos (#36570)

Release Notes:

- N/A
---
 crates/agent2/src/thread.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index b6405dbcbd..73a86d53ea 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1563,12 +1563,11 @@ impl Thread {
                 let text = match event {
                     LanguageModelCompletionEvent::Text(text) => text,
                     LanguageModelCompletionEvent::StatusUpdate(
-                        CompletionRequestStatus::UsageUpdated { .. },
+                        CompletionRequestStatus::UsageUpdated { amount, limit },
                     ) => {
-                        // this.update(cx, |thread, cx| {
-                        //     thread.update_model_request_usage(amount as u32, limit, cx);
-                        // })?;
-                        // TODO: handle usage update
+                        this.update(cx, |thread, cx| {
+                            thread.update_model_request_usage(amount, limit, cx);
+                        })?;
                         continue;
                     }
                     _ => continue,
@@ -1629,12 +1628,11 @@ impl Thread {
                 let text = match event {
                     LanguageModelCompletionEvent::Text(text) => text,
                     LanguageModelCompletionEvent::StatusUpdate(
-                        CompletionRequestStatus::UsageUpdated { .. },
+                        CompletionRequestStatus::UsageUpdated { amount, limit },
                     ) => {
-                        // this.update(cx, |thread, cx| {
-                        //     thread.update_model_request_usage(amount as u32, limit, cx);
-                        // })?;
-                        // TODO: handle usage update
+                        this.update(cx, |thread, cx| {
+                            thread.update_model_request_usage(amount, limit, cx);
+                        })?;
                         continue;
                     }
                     _ => continue,

From a32a264508cf1142c8cb943c68615771474c7183 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 20 Aug 2025 12:03:35 +0200
Subject: [PATCH 203/823] agent2: Use correct completion intent when generating
 summary (#36573)

Release Notes:

- N/A
---
 crates/agent2/src/thread.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 73a86d53ea..0e1287a920 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1541,7 +1541,7 @@ impl Thread {
             return Task::ready(Err(anyhow!("No summarization model available")));
         };
         let mut request = LanguageModelRequest {
-            intent: Some(CompletionIntent::ThreadSummarization),
+            intent: Some(CompletionIntent::ThreadContextSummarization),
             temperature: AgentSettings::temperature_for_model(&model, cx),
             ..Default::default()
         };

From cf7c64d77f1806cdd34b3812bbf27681fb3cb905 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:05:58 +0200
Subject: [PATCH 204/823] lints: A bunch of extra style lint fixes (#36568)

- **lints: Fix 'doc_lazy_continuation'**
- **lints: Fix 'doc_overindented_list_items'**
- **inherent_to_string and io_other_error**
- **Some more lint fixes**
- **lints: enable bool_assert_comparison, match_like_matches_macro and
wrong_self_convention**


Release Notes:

- N/A
---
 Cargo.toml                                    |  7 ++++
 crates/agent/src/history_store.rs             |  7 ++--
 crates/agent/src/thread.rs                    |  4 +-
 crates/agent2/src/history_store.rs            |  7 ++--
 crates/agent_settings/src/agent_settings.rs   |  5 +--
 crates/agent_ui/src/active_thread.rs          |  2 +-
 .../add_llm_provider_modal.rs                 | 24 ++++++------
 .../src/assistant_context_tests.rs            |  2 +-
 .../src/assistant_slash_command.rs            | 14 +++----
 .../src/extension_slash_command.rs            |  2 +-
 .../src/cargo_workspace_command.rs            |  2 +-
 .../src/context_server_command.rs             |  2 +-
 .../src/default_command.rs                    |  2 +-
 .../src/delta_command.rs                      |  2 +-
 .../src/diagnostics_command.rs                |  2 +-
 .../src/fetch_command.rs                      |  2 +-
 .../src/file_command.rs                       |  2 +-
 .../src/now_command.rs                        |  2 +-
 .../src/prompt_command.rs                     |  2 +-
 .../src/symbols_command.rs                    |  2 +-
 .../src/tab_command.rs                        |  2 +-
 .../src/auto_update_helper.rs                 | 19 ++++-----
 crates/auto_update_helper/src/updater.rs      | 12 +-----
 crates/client/src/user.rs                     |  2 +-
 crates/collab/src/db.rs                       |  2 +-
 crates/collab/src/tests/integration_tests.rs  | 12 +++---
 crates/collab/src/tests/test_server.rs        |  2 +-
 crates/collab_ui/src/collab_panel.rs          |  8 ++--
 crates/context_server/src/client.rs           |  6 +--
 crates/dap/src/client.rs                      |  2 +-
 crates/editor/src/display_map/block_map.rs    |  7 +---
 crates/editor/src/editor.rs                   |  5 +--
 crates/editor/src/items.rs                    |  2 +-
 crates/editor/src/scroll/scroll_amount.rs     |  5 +--
 .../src/test/editor_lsp_test_context.rs       |  2 +
 crates/eval/src/example.rs                    |  2 +-
 crates/eval/src/instance.rs                   |  4 +-
 crates/extension_api/src/extension_api.rs     |  6 +--
 crates/git/src/status.rs                      | 39 ++++++-------------
 crates/git_ui/src/project_diff.rs             |  7 +---
 crates/gpui/src/action.rs                     | 12 +++---
 crates/gpui/src/app/test_context.rs           |  7 ++--
 crates/gpui/src/color.rs                      |  8 ++--
 crates/gpui/src/geometry.rs                   | 28 ++++++-------
 crates/gpui/src/gpui.rs                       |  4 ++
 crates/gpui/src/keymap.rs                     | 28 ++++++-------
 crates/gpui/src/keymap/binding.rs             |  7 +---
 crates/gpui/src/platform.rs                   |  2 +-
 crates/gpui/src/platform/linux/platform.rs    | 31 +++++++--------
 crates/gpui/src/platform/linux/wayland.rs     |  2 +-
 .../gpui/src/platform/linux/wayland/window.rs |  4 +-
 crates/gpui/src/platform/linux/x11/window.rs  |  2 +-
 crates/gpui/src/platform/mac/window.rs        |  2 +-
 crates/gpui/src/tab_stop.rs                   | 21 +++-------
 crates/gpui_macros/src/gpui_macros.rs         |  2 +-
 crates/language/src/language_registry.rs      |  2 +-
 crates/language_model/src/role.rs             |  2 +-
 crates/migrator/src/migrator.rs               |  2 +-
 crates/multi_buffer/src/multi_buffer.rs       |  2 +-
 crates/paths/src/paths.rs                     |  2 +-
 crates/project/src/debugger.rs                |  4 +-
 .../project/src/debugger/breakpoint_store.rs  |  2 +-
 crates/project/src/debugger/memory.rs         |  3 +-
 crates/project/src/git_store/conflict_set.rs  |  2 +-
 crates/project/src/git_store/git_traversal.rs |  2 +-
 crates/project/src/lsp_store.rs               |  4 +-
 crates/project/src/manifest_tree/path_trie.rs |  6 +--
 crates/project/src/project.rs                 | 30 ++++++--------
 crates/project/src/project_tests.rs           |  4 +-
 crates/project_panel/src/project_panel.rs     |  4 +-
 crates/remote/src/ssh_session.rs              | 10 ++---
 .../remote_server/src/remote_editing_tests.rs |  2 +-
 crates/remote_server/src/unix.rs              |  2 +-
 crates/repl/src/kernels/mod.rs                |  5 +--
 crates/reqwest_client/src/reqwest_client.rs   |  2 +-
 crates/rope/src/chunk.rs                      |  2 +-
 crates/rpc/src/conn.rs                        |  4 +-
 crates/search/src/search.rs                   |  4 +-
 crates/settings/src/settings.rs               |  4 +-
 crates/task/src/shell_builder.rs              |  2 +-
 .../src/terminal_slash_command.rs             |  2 +-
 crates/terminal_view/src/terminal_view.rs     |  2 +-
 .../ui/src/components/button/button_like.rs   | 10 ++---
 crates/ui/src/utils/format_distance.rs        |  4 +-
 crates/util/src/archive.rs                    |  2 +-
 crates/util/src/markdown.rs                   |  2 +-
 crates/util/src/paths.rs                      | 25 +++++++-----
 crates/vim/src/motion.rs                      | 39 +++++++++----------
 crates/vim/src/vim.rs                         |  5 +--
 crates/worktree/src/worktree.rs               |  6 +--
 crates/worktree/src/worktree_tests.rs         | 12 +++---
 crates/x_ai/src/x_ai.rs                       |  5 +--
 92 files changed, 277 insertions(+), 345 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ed8edf836..3610808984 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -822,15 +822,21 @@ single_range_in_vec_init = "allow"
 style = { level = "allow", priority = -1 }
 
 # Temporary list of style lints that we've fixed so far.
+bool_assert_comparison = "warn"
 comparison_to_empty = "warn"
+doc_lazy_continuation = "warn"
+doc_overindented_list_items = "warn"
+inherent_to_string = "warn"
 for_kv_map = "warn"
 into_iter_on_ref = "warn"
+io_other_error = "warn"
 iter_cloned_collect = "warn"
 iter_next_slice = "warn"
 iter_nth = "warn"
 iter_nth_zero = "warn"
 iter_skip_next = "warn"
 let_and_return = "warn"
+match_like_matches_macro = "warn"
 module_inception = { level = "deny" }
 question_mark = { level = "deny" }
 single_match = "warn"
@@ -846,6 +852,7 @@ needless_return = { level = "warn" }
 unnecessary_mut_passed = {level = "warn"}
 unnecessary_map_or = { level = "warn" }
 unused_unit = "warn"
+wrong_self_convention = "warn"
 
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
diff --git a/crates/agent/src/history_store.rs b/crates/agent/src/history_store.rs
index eb39c3e454..8f4c1a1e2e 100644
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -254,10 +254,9 @@ impl HistoryStore {
     }
 
     pub fn remove_recently_opened_thread(&mut self, id: ThreadId, cx: &mut Context<Self>) {
-        self.recently_opened_entries.retain(|entry| match entry {
-            HistoryEntryId::Thread(thread_id) if thread_id == &id => false,
-            _ => true,
-        });
+        self.recently_opened_entries.retain(
+            |entry| !matches!(entry, HistoryEntryId::Thread(thread_id) if thread_id == &id),
+        );
         self.save_recently_opened_entries(cx);
     }
 
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index fc91e1bb62..88f82701a4 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -181,7 +181,7 @@ impl Message {
         }
     }
 
-    pub fn to_string(&self) -> String {
+    pub fn to_message_content(&self) -> String {
         let mut result = String::new();
 
         if !self.loaded_context.text.is_empty() {
@@ -2823,7 +2823,7 @@ impl Thread {
 
         let message_content = self
             .message(message_id)
-            .map(|msg| msg.to_string())
+            .map(|msg| msg.to_message_content())
             .unwrap_or_default();
 
         cx.background_spawn(async move {
diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 7eb7da94ba..3df4eddde4 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -312,10 +312,9 @@ impl HistoryStore {
     }
 
     pub fn remove_recently_opened_thread(&mut self, id: acp::SessionId, cx: &mut Context<Self>) {
-        self.recently_opened_entries.retain(|entry| match entry {
-            HistoryEntryId::AcpThread(thread_id) if thread_id == &id => false,
-            _ => true,
-        });
+        self.recently_opened_entries.retain(
+            |entry| !matches!(entry, HistoryEntryId::AcpThread(thread_id) if thread_id == &id),
+        );
         self.save_recently_opened_entries(cx);
     }
 
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 1fe41d002c..ed1ed2b898 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -505,9 +505,8 @@ impl Settings for AgentSettings {
             }
         }
 
-        debug_assert_eq!(
-            sources.default.always_allow_tool_actions.unwrap_or(false),
-            false,
+        debug_assert!(
+            !sources.default.always_allow_tool_actions.unwrap_or(false),
             "For security, agent.always_allow_tool_actions should always be false in default.json. If it's true, that is a bug that should be fixed!"
         );
 
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index e595b94ebb..92588cf213 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1765,7 +1765,7 @@ impl ActiveThread {
                 .thread
                 .read(cx)
                 .message(message_id)
-                .map(|msg| msg.to_string())
+                .map(|msg| msg.to_message_content())
                 .unwrap_or_default();
 
             telemetry::event!(
diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
index 998641bf01..182831f488 100644
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
@@ -668,10 +668,10 @@ mod tests {
             );
 
             let parsed_model = model_input.parse(cx).unwrap();
-            assert_eq!(parsed_model.capabilities.tools, true);
-            assert_eq!(parsed_model.capabilities.images, false);
-            assert_eq!(parsed_model.capabilities.parallel_tool_calls, false);
-            assert_eq!(parsed_model.capabilities.prompt_cache_key, false);
+            assert!(parsed_model.capabilities.tools);
+            assert!(!parsed_model.capabilities.images);
+            assert!(!parsed_model.capabilities.parallel_tool_calls);
+            assert!(!parsed_model.capabilities.prompt_cache_key);
         });
     }
 
@@ -693,10 +693,10 @@ mod tests {
             model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
 
             let parsed_model = model_input.parse(cx).unwrap();
-            assert_eq!(parsed_model.capabilities.tools, false);
-            assert_eq!(parsed_model.capabilities.images, false);
-            assert_eq!(parsed_model.capabilities.parallel_tool_calls, false);
-            assert_eq!(parsed_model.capabilities.prompt_cache_key, false);
+            assert!(!parsed_model.capabilities.tools);
+            assert!(!parsed_model.capabilities.images);
+            assert!(!parsed_model.capabilities.parallel_tool_calls);
+            assert!(!parsed_model.capabilities.prompt_cache_key);
         });
     }
 
@@ -719,10 +719,10 @@ mod tests {
 
             let parsed_model = model_input.parse(cx).unwrap();
             assert_eq!(parsed_model.name, "somemodel");
-            assert_eq!(parsed_model.capabilities.tools, true);
-            assert_eq!(parsed_model.capabilities.images, false);
-            assert_eq!(parsed_model.capabilities.parallel_tool_calls, true);
-            assert_eq!(parsed_model.capabilities.prompt_cache_key, false);
+            assert!(parsed_model.capabilities.tools);
+            assert!(!parsed_model.capabilities.images);
+            assert!(parsed_model.capabilities.parallel_tool_calls);
+            assert!(!parsed_model.capabilities.prompt_cache_key);
         });
     }
 
diff --git a/crates/assistant_context/src/assistant_context_tests.rs b/crates/assistant_context/src/assistant_context_tests.rs
index 28cc8ef8f0..3db4a33b19 100644
--- a/crates/assistant_context/src/assistant_context_tests.rs
+++ b/crates/assistant_context/src/assistant_context_tests.rs
@@ -1436,6 +1436,6 @@ impl SlashCommand for FakeSlashCommand {
             sections: vec![],
             run_commands_in_text: false,
         }
-        .to_event_stream()))
+        .into_event_stream()))
     }
 }
diff --git a/crates/assistant_slash_command/src/assistant_slash_command.rs b/crates/assistant_slash_command/src/assistant_slash_command.rs
index 828f115bf5..4b85fa2edf 100644
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -161,7 +161,7 @@ impl SlashCommandOutput {
     }
 
     /// Returns this [`SlashCommandOutput`] as a stream of [`SlashCommandEvent`]s.
-    pub fn to_event_stream(mut self) -> BoxStream<'static, Result<SlashCommandEvent>> {
+    pub fn into_event_stream(mut self) -> BoxStream<'static, Result<SlashCommandEvent>> {
         self.ensure_valid_section_ranges();
 
         let mut events = Vec::new();
@@ -363,7 +363,7 @@ mod tests {
                 run_commands_in_text: false,
             };
 
-            let events = output.clone().to_event_stream().collect::<Vec<_>>().await;
+            let events = output.clone().into_event_stream().collect::<Vec<_>>().await;
             let events = events
                 .into_iter()
                 .filter_map(|event| event.ok())
@@ -386,7 +386,7 @@ mod tests {
             );
 
             let new_output =
-                SlashCommandOutput::from_event_stream(output.clone().to_event_stream())
+                SlashCommandOutput::from_event_stream(output.clone().into_event_stream())
                     .await
                     .unwrap();
 
@@ -415,7 +415,7 @@ mod tests {
                 run_commands_in_text: false,
             };
 
-            let events = output.clone().to_event_stream().collect::<Vec<_>>().await;
+            let events = output.clone().into_event_stream().collect::<Vec<_>>().await;
             let events = events
                 .into_iter()
                 .filter_map(|event| event.ok())
@@ -452,7 +452,7 @@ mod tests {
             );
 
             let new_output =
-                SlashCommandOutput::from_event_stream(output.clone().to_event_stream())
+                SlashCommandOutput::from_event_stream(output.clone().into_event_stream())
                     .await
                     .unwrap();
 
@@ -493,7 +493,7 @@ mod tests {
                 run_commands_in_text: false,
             };
 
-            let events = output.clone().to_event_stream().collect::<Vec<_>>().await;
+            let events = output.clone().into_event_stream().collect::<Vec<_>>().await;
             let events = events
                 .into_iter()
                 .filter_map(|event| event.ok())
@@ -562,7 +562,7 @@ mod tests {
             );
 
             let new_output =
-                SlashCommandOutput::from_event_stream(output.clone().to_event_stream())
+                SlashCommandOutput::from_event_stream(output.clone().into_event_stream())
                     .await
                     .unwrap();
 
diff --git a/crates/assistant_slash_command/src/extension_slash_command.rs b/crates/assistant_slash_command/src/extension_slash_command.rs
index 74c46ffb5f..e47ae52c98 100644
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ b/crates/assistant_slash_command/src/extension_slash_command.rs
@@ -166,7 +166,7 @@ impl SlashCommand for ExtensionSlashCommand {
                     .collect(),
                 run_commands_in_text: false,
             }
-            .to_event_stream())
+            .into_event_stream())
         })
     }
 }
diff --git a/crates/assistant_slash_commands/src/cargo_workspace_command.rs b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
index 8b088ea012..d58b2edc4c 100644
--- a/crates/assistant_slash_commands/src/cargo_workspace_command.rs
+++ b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
@@ -150,7 +150,7 @@ impl SlashCommand for CargoWorkspaceSlashCommand {
                     }],
                     run_commands_in_text: false,
                 }
-                .to_event_stream())
+                .into_event_stream())
             })
         });
         output.unwrap_or_else(|error| Task::ready(Err(error)))
diff --git a/crates/assistant_slash_commands/src/context_server_command.rs b/crates/assistant_slash_commands/src/context_server_command.rs
index 6caa1beb3b..ee0cbf54c2 100644
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -191,7 +191,7 @@ impl SlashCommand for ContextServerSlashCommand {
                     text: prompt,
                     run_commands_in_text: false,
                 }
-                .to_event_stream())
+                .into_event_stream())
             })
         } else {
             Task::ready(Err(anyhow!("Context server not found")))
diff --git a/crates/assistant_slash_commands/src/default_command.rs b/crates/assistant_slash_commands/src/default_command.rs
index 6fce7f07a4..01eff881cf 100644
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ b/crates/assistant_slash_commands/src/default_command.rs
@@ -85,7 +85,7 @@ impl SlashCommand for DefaultSlashCommand {
                 text,
                 run_commands_in_text: true,
             }
-            .to_event_stream())
+            .into_event_stream())
         })
     }
 }
diff --git a/crates/assistant_slash_commands/src/delta_command.rs b/crates/assistant_slash_commands/src/delta_command.rs
index 2cc4591386..ea05fca588 100644
--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -118,7 +118,7 @@ impl SlashCommand for DeltaSlashCommand {
             }
 
             anyhow::ensure!(changes_detected, "no new changes detected");
-            Ok(output.to_event_stream())
+            Ok(output.into_event_stream())
         })
     }
 }
diff --git a/crates/assistant_slash_commands/src/diagnostics_command.rs b/crates/assistant_slash_commands/src/diagnostics_command.rs
index 536fe9f0ef..10f950c866 100644
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -189,7 +189,7 @@ impl SlashCommand for DiagnosticsSlashCommand {
 
         window.spawn(cx, async move |_| {
             task.await?
-                .map(|output| output.to_event_stream())
+                .map(|output| output.into_event_stream())
                 .context("No diagnostics found")
         })
     }
diff --git a/crates/assistant_slash_commands/src/fetch_command.rs b/crates/assistant_slash_commands/src/fetch_command.rs
index 4e0bb3d05a..6d3f66c9a2 100644
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ b/crates/assistant_slash_commands/src/fetch_command.rs
@@ -177,7 +177,7 @@ impl SlashCommand for FetchSlashCommand {
                 }],
                 run_commands_in_text: false,
             }
-            .to_event_stream())
+            .into_event_stream())
         })
     }
 }
diff --git a/crates/assistant_slash_commands/src/file_command.rs b/crates/assistant_slash_commands/src/file_command.rs
index 894aa94a27..a973d653e4 100644
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -371,7 +371,7 @@ fn collect_files(
                             &mut output,
                         )
                         .log_err();
-                        let mut buffer_events = output.to_event_stream();
+                        let mut buffer_events = output.into_event_stream();
                         while let Some(event) = buffer_events.next().await {
                             events_tx.unbounded_send(event)?;
                         }
diff --git a/crates/assistant_slash_commands/src/now_command.rs b/crates/assistant_slash_commands/src/now_command.rs
index e4abef2a7c..aec21e7173 100644
--- a/crates/assistant_slash_commands/src/now_command.rs
+++ b/crates/assistant_slash_commands/src/now_command.rs
@@ -66,6 +66,6 @@ impl SlashCommand for NowSlashCommand {
             }],
             run_commands_in_text: false,
         }
-        .to_event_stream()))
+        .into_event_stream()))
     }
 }
diff --git a/crates/assistant_slash_commands/src/prompt_command.rs b/crates/assistant_slash_commands/src/prompt_command.rs
index c177f9f359..27029ac156 100644
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -117,7 +117,7 @@ impl SlashCommand for PromptSlashCommand {
                 }],
                 run_commands_in_text: true,
             }
-            .to_event_stream())
+            .into_event_stream())
         })
     }
 }
diff --git a/crates/assistant_slash_commands/src/symbols_command.rs b/crates/assistant_slash_commands/src/symbols_command.rs
index ef93146431..3028709144 100644
--- a/crates/assistant_slash_commands/src/symbols_command.rs
+++ b/crates/assistant_slash_commands/src/symbols_command.rs
@@ -92,7 +92,7 @@ impl SlashCommand for OutlineSlashCommand {
                     text: outline_text,
                     run_commands_in_text: false,
                 }
-                .to_event_stream())
+                .into_event_stream())
             })
         });
 
diff --git a/crates/assistant_slash_commands/src/tab_command.rs b/crates/assistant_slash_commands/src/tab_command.rs
index e4ae391a9c..a124beed63 100644
--- a/crates/assistant_slash_commands/src/tab_command.rs
+++ b/crates/assistant_slash_commands/src/tab_command.rs
@@ -157,7 +157,7 @@ impl SlashCommand for TabSlashCommand {
             for (full_path, buffer, _) in tab_items_search.await? {
                 append_buffer_to_output(&buffer, full_path.as_deref(), &mut output).log_err();
             }
-            Ok(output.to_event_stream())
+            Ok(output.into_event_stream())
         })
     }
 }
diff --git a/crates/auto_update_helper/src/auto_update_helper.rs b/crates/auto_update_helper/src/auto_update_helper.rs
index 3aa57094d3..21ead701b2 100644
--- a/crates/auto_update_helper/src/auto_update_helper.rs
+++ b/crates/auto_update_helper/src/auto_update_helper.rs
@@ -128,23 +128,20 @@ mod windows_impl {
         #[test]
         fn test_parse_args() {
             // launch can be specified via two separate arguments
-            assert_eq!(parse_args(["--launch".into(), "true".into()]).launch, true);
-            assert_eq!(
-                parse_args(["--launch".into(), "false".into()]).launch,
-                false
-            );
+            assert!(parse_args(["--launch".into(), "true".into()]).launch);
+            assert!(!parse_args(["--launch".into(), "false".into()]).launch);
 
             // launch can be specified via one single argument
-            assert_eq!(parse_args(["--launch=true".into()]).launch, true);
-            assert_eq!(parse_args(["--launch=false".into()]).launch, false);
+            assert!(parse_args(["--launch=true".into()]).launch);
+            assert!(!parse_args(["--launch=false".into()]).launch);
 
             // launch defaults to true on no arguments
-            assert_eq!(parse_args([]).launch, true);
+            assert!(parse_args([]).launch);
 
             // launch defaults to true on invalid arguments
-            assert_eq!(parse_args(["--launch".into()]).launch, true);
-            assert_eq!(parse_args(["--launch=".into()]).launch, true);
-            assert_eq!(parse_args(["--launch=invalid".into()]).launch, true);
+            assert!(parse_args(["--launch".into()]).launch);
+            assert!(parse_args(["--launch=".into()]).launch);
+            assert!(parse_args(["--launch=invalid".into()]).launch);
         }
     }
 }
diff --git a/crates/auto_update_helper/src/updater.rs b/crates/auto_update_helper/src/updater.rs
index 920f8d5fcf..7627716176 100644
--- a/crates/auto_update_helper/src/updater.rs
+++ b/crates/auto_update_helper/src/updater.rs
@@ -90,11 +90,7 @@ pub(crate) const JOBS: [Job; 2] = [
         std::thread::sleep(Duration::from_millis(1000));
         if let Ok(config) = std::env::var("ZED_AUTO_UPDATE") {
             match config.as_str() {
-                "err" => Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    "Simulated error",
-                ))
-                .context("Anyhow!"),
+                "err" => Err(std::io::Error::other("Simulated error")).context("Anyhow!"),
                 _ => panic!("Unknown ZED_AUTO_UPDATE value: {}", config),
             }
         } else {
@@ -105,11 +101,7 @@ pub(crate) const JOBS: [Job; 2] = [
         std::thread::sleep(Duration::from_millis(1000));
         if let Ok(config) = std::env::var("ZED_AUTO_UPDATE") {
             match config.as_str() {
-                "err" => Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    "Simulated error",
-                ))
-                .context("Anyhow!"),
+                "err" => Err(std::io::Error::other("Simulated error")).context("Anyhow!"),
                 _ => panic!("Unknown ZED_AUTO_UPDATE value: {}", config),
             }
         } else {
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 2599be9b16..20f99e3944 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -41,7 +41,7 @@ impl std::fmt::Display for ChannelId {
 pub struct ProjectId(pub u64);
 
 impl ProjectId {
-    pub fn to_proto(&self) -> u64 {
+    pub fn to_proto(self) -> u64 {
         self.0
     }
 }
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 774eec5d2c..95a485305c 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -685,7 +685,7 @@ impl LocalSettingsKind {
         }
     }
 
-    pub fn to_proto(&self) -> proto::LocalSettingsKind {
+    pub fn to_proto(self) -> proto::LocalSettingsKind {
         match self {
             Self::Settings => proto::LocalSettingsKind::Settings,
             Self::Tasks => proto::LocalSettingsKind::Tasks,
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 930e635dd8..e01736f0ef 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -3208,7 +3208,7 @@ async fn test_fs_operations(
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     worktree_a.read_with(cx_a, |worktree, _| {
@@ -3237,7 +3237,7 @@ async fn test_fs_operations(
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     worktree_a.read_with(cx_a, |worktree, _| {
@@ -3266,7 +3266,7 @@ async fn test_fs_operations(
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     worktree_a.read_with(cx_a, |worktree, _| {
@@ -3295,7 +3295,7 @@ async fn test_fs_operations(
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     project_b
@@ -3304,7 +3304,7 @@ async fn test_fs_operations(
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     project_b
@@ -3313,7 +3313,7 @@ async fn test_fs_operations(
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     worktree_a.read_with(cx_a, |worktree, _| {
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index 07ea1efc9d..f1c0b2d182 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -897,7 +897,7 @@ impl TestClient {
         let window = cx.update(|cx| cx.active_window().unwrap().downcast::<Workspace>().unwrap());
 
         let entity = window.root(cx).unwrap();
-        let cx = VisualTestContext::from_window(*window.deref(), cx).as_mut();
+        let cx = VisualTestContext::from_window(*window.deref(), cx).into_mut();
         // it might be nice to try and cleanup these at the end of each test.
         (entity, cx)
     }
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 0f785c1f90..b756984a09 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -1821,10 +1821,10 @@ impl CollabPanel {
     }
 
     fn select_channel_editor(&mut self) {
-        self.selection = self.entries.iter().position(|entry| match entry {
-            ListEntry::ChannelEditor { .. } => true,
-            _ => false,
-        });
+        self.selection = self
+            .entries
+            .iter()
+            .position(|entry| matches!(entry, ListEntry::ChannelEditor { .. }));
     }
 
     fn new_subchannel(
diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs
index ccf7622d82..03cf047ac5 100644
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -67,11 +67,7 @@ pub(crate) struct Client {
 pub(crate) struct ContextServerId(pub Arc<str>);
 
 fn is_null_value<T: Serialize>(value: &T) -> bool {
-    if let Ok(Value::Null) = serde_json::to_value(value) {
-        true
-    } else {
-        false
-    }
+    matches!(serde_json::to_value(value), Ok(Value::Null))
 }
 
 #[derive(Serialize, Deserialize)]
diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs
index 7b791450ec..2590bf5c8b 100644
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -23,7 +23,7 @@ impl SessionId {
         Self(client_id as u32)
     }
 
-    pub fn to_proto(&self) -> u64 {
+    pub fn to_proto(self) -> u64 {
         self.0 as u64
     }
 }
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 5d5c9500eb..0d31398a54 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -2868,12 +2868,7 @@ mod tests {
             1,
             blocks
                 .iter()
-                .filter(|(_, block)| {
-                    match block {
-                        Block::FoldedBuffer { .. } => true,
-                        _ => false,
-                    }
-                })
+                .filter(|(_, block)| { matches!(block, Block::FoldedBuffer { .. }) })
                 .count(),
             "Should have one folded block, producing a header of the second buffer"
         );
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 575631b517..2f3ced65dc 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -782,10 +782,7 @@ impl MinimapVisibility {
     }
 
     fn disabled(&self) -> bool {
-        match *self {
-            Self::Disabled => true,
-            _ => false,
-        }
+        matches!(*self, Self::Disabled)
     }
 
     fn settings_visibility(&self) -> bool {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 8957e0e99c..62889c638f 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -293,7 +293,7 @@ impl FollowableItem for Editor {
                 EditorEvent::ExcerptsRemoved { ids, .. } => {
                     update
                         .deleted_excerpts
-                        .extend(ids.iter().map(ExcerptId::to_proto));
+                        .extend(ids.iter().copied().map(ExcerptId::to_proto));
                     true
                 }
                 EditorEvent::ScrollPositionChanged { autoscroll, .. } if !autoscroll => {
diff --git a/crates/editor/src/scroll/scroll_amount.rs b/crates/editor/src/scroll/scroll_amount.rs
index b2af4f8e4f..5992c9023c 100644
--- a/crates/editor/src/scroll/scroll_amount.rs
+++ b/crates/editor/src/scroll/scroll_amount.rs
@@ -67,10 +67,7 @@ impl ScrollAmount {
     }
 
     pub fn is_full_page(&self) -> bool {
-        match self {
-            ScrollAmount::Page(count) if count.abs() == 1.0 => true,
-            _ => false,
-        }
+        matches!(self, ScrollAmount::Page(count) if count.abs() == 1.0)
     }
 
     pub fn direction(&self) -> ScrollDirection {
diff --git a/crates/editor/src/test/editor_lsp_test_context.rs b/crates/editor/src/test/editor_lsp_test_context.rs
index c59786b1eb..3f78fa2f3e 100644
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -300,6 +300,7 @@ impl EditorLspTestContext {
         self.to_lsp_range(ranges[0].clone())
     }
 
+    #[expect(clippy::wrong_self_convention, reason = "This is test code")]
     pub fn to_lsp_range(&mut self, range: Range<usize>) -> lsp::Range {
         let snapshot = self.update_editor(|editor, window, cx| editor.snapshot(window, cx));
         let start_point = range.start.to_point(&snapshot.buffer_snapshot);
@@ -326,6 +327,7 @@ impl EditorLspTestContext {
         })
     }
 
+    #[expect(clippy::wrong_self_convention, reason = "This is test code")]
     pub fn to_lsp(&mut self, offset: usize) -> lsp::Position {
         let snapshot = self.update_editor(|editor, window, cx| editor.snapshot(window, cx));
         let point = offset.to_point(&snapshot.buffer_snapshot);
diff --git a/crates/eval/src/example.rs b/crates/eval/src/example.rs
index 82e95728a1..457b62e98c 100644
--- a/crates/eval/src/example.rs
+++ b/crates/eval/src/example.rs
@@ -335,7 +335,7 @@ impl ExampleContext {
             for message in thread.messages().skip(message_count_before) {
                 messages.push(Message {
                     _role: message.role,
-                    text: message.to_string(),
+                    text: message.to_message_content(),
                     tool_use: thread
                         .tool_uses_for_message(message.id, cx)
                         .into_iter()
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
index bbbe54b43f..53ce6088c0 100644
--- a/crates/eval/src/instance.rs
+++ b/crates/eval/src/instance.rs
@@ -1192,7 +1192,7 @@ mod test {
             output.analysis,
             Some("The model did a good job but there were still compilations errors.".into())
         );
-        assert_eq!(output.passed, true);
+        assert!(output.passed);
 
         let response = r#"
             Text around ignored
@@ -1212,6 +1212,6 @@ mod test {
             output.analysis,
             Some("Failed to compile:\n- Error 1\n- Error 2".into())
         );
-        assert_eq!(output.passed, false);
+        assert!(!output.passed);
     }
 }
diff --git a/crates/extension_api/src/extension_api.rs b/crates/extension_api/src/extension_api.rs
index aacc5d8795..72327179ee 100644
--- a/crates/extension_api/src/extension_api.rs
+++ b/crates/extension_api/src/extension_api.rs
@@ -232,10 +232,10 @@ pub trait Extension: Send + Sync {
     ///
     /// To work through a real-world example, take a `cargo run` task and a hypothetical `cargo` locator:
     /// 1. We may need to modify the task; in this case, it is problematic that `cargo run` spawns a binary. We should turn `cargo run` into a debug scenario with
-    /// `cargo build` task. This is the decision we make at `dap_locator_create_scenario` scope.
+    ///    `cargo build` task. This is the decision we make at `dap_locator_create_scenario` scope.
     /// 2. Then, after the build task finishes, we will run `run_dap_locator` of the locator that produced the build task to find the program to be debugged. This function
-    /// should give us a debugger-agnostic configuration for launching a debug target (that we end up resolving with [`Extension::dap_config_to_scenario`]). It's almost as if the user
-    /// found the artifact path by themselves.
+    ///    should give us a debugger-agnostic configuration for launching a debug target (that we end up resolving with [`Extension::dap_config_to_scenario`]). It's almost as if the user
+    ///    found the artifact path by themselves.
     ///
     /// Note that you're not obliged to use build tasks with locators. Specifically, it is sufficient to provide a debug configuration directly in the return value of
     /// `dap_locator_create_scenario` if you're able to do that. Make sure to not fill out `build` field in that case, as that will prevent Zed from running second phase of resolution in such case.
diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs
index 92836042f2..71ca14c5b2 100644
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -153,17 +153,11 @@ impl FileStatus {
     }
 
     pub fn is_conflicted(self) -> bool {
-        match self {
-            FileStatus::Unmerged { .. } => true,
-            _ => false,
-        }
+        matches!(self, FileStatus::Unmerged { .. })
     }
 
     pub fn is_ignored(self) -> bool {
-        match self {
-            FileStatus::Ignored => true,
-            _ => false,
-        }
+        matches!(self, FileStatus::Ignored)
     }
 
     pub fn has_changes(&self) -> bool {
@@ -176,40 +170,31 @@ impl FileStatus {
 
     pub fn is_modified(self) -> bool {
         match self {
-            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Modified, _) | (_, StatusCode::Modified) => true,
-                _ => false,
-            },
+            FileStatus::Tracked(tracked) => matches!(
+                (tracked.index_status, tracked.worktree_status),
+                (StatusCode::Modified, _) | (_, StatusCode::Modified)
+            ),
             _ => false,
         }
     }
 
     pub fn is_created(self) -> bool {
         match self {
-            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Added, _) | (_, StatusCode::Added) => true,
-                _ => false,
-            },
+            FileStatus::Tracked(tracked) => matches!(
+                (tracked.index_status, tracked.worktree_status),
+                (StatusCode::Added, _) | (_, StatusCode::Added)
+            ),
             FileStatus::Untracked => true,
             _ => false,
         }
     }
 
     pub fn is_deleted(self) -> bool {
-        match self {
-            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Deleted, _) | (_, StatusCode::Deleted) => true,
-                _ => false,
-            },
-            _ => false,
-        }
+        matches!(self, FileStatus::Tracked(tracked) if matches!((tracked.index_status, tracked.worktree_status), (StatusCode::Deleted, _) | (_, StatusCode::Deleted)))
     }
 
     pub fn is_untracked(self) -> bool {
-        match self {
-            FileStatus::Untracked => true,
-            _ => false,
-        }
+        matches!(self, FileStatus::Untracked)
     }
 
     pub fn summary(self) -> GitSummary {
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index cc1535b7c3..c1521004a2 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -1070,8 +1070,7 @@ pub struct ProjectDiffEmptyState {
 impl RenderOnce for ProjectDiffEmptyState {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
         let status_against_remote = |ahead_by: usize, behind_by: usize| -> bool {
-            match self.current_branch {
-                Some(Branch {
+            matches!(self.current_branch, Some(Branch {
                     upstream:
                         Some(Upstream {
                             tracking:
@@ -1081,9 +1080,7 @@ impl RenderOnce for ProjectDiffEmptyState {
                             ..
                         }),
                     ..
-                }) if (ahead > 0) == (ahead_by > 0) && (behind > 0) == (behind_by > 0) => true,
-                _ => false,
-            }
+                }) if (ahead > 0) == (ahead_by > 0) && (behind > 0) == (behind_by > 0))
         };
 
         let change_count = |current_branch: &Branch| -> (usize, usize) {
diff --git a/crates/gpui/src/action.rs b/crates/gpui/src/action.rs
index b179076cd5..0b824fec34 100644
--- a/crates/gpui/src/action.rs
+++ b/crates/gpui/src/action.rs
@@ -73,18 +73,18 @@ macro_rules! actions {
 /// - `name = "ActionName"` overrides the action's name. This must not contain `::`.
 ///
 /// - `no_json` causes the `build` method to always error and `action_json_schema` to return `None`,
-/// and allows actions not implement `serde::Serialize` and `schemars::JsonSchema`.
+///   and allows actions not implement `serde::Serialize` and `schemars::JsonSchema`.
 ///
 /// - `no_register` skips registering the action. This is useful for implementing the `Action` trait
-/// while not supporting invocation by name or JSON deserialization.
+///   while not supporting invocation by name or JSON deserialization.
 ///
 /// - `deprecated_aliases = ["editor::SomeAction"]` specifies deprecated old names for the action.
-/// These action names should *not* correspond to any actions that are registered. These old names
-/// can then still be used to refer to invoke this action. In Zed, the keymap JSON schema will
-/// accept these old names and provide warnings.
+///   These action names should *not* correspond to any actions that are registered. These old names
+///   can then still be used to refer to invoke this action. In Zed, the keymap JSON schema will
+///   accept these old names and provide warnings.
 ///
 /// - `deprecated = "Message about why this action is deprecation"` specifies a deprecation message.
-/// In Zed, the keymap JSON schema will cause this to be displayed as a warning.
+///   In Zed, the keymap JSON schema will cause this to be displayed as a warning.
 ///
 /// # Manual Implementation
 ///
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index 43adacf7dd..a69d9d1e26 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -192,6 +192,7 @@ impl TestAppContext {
         &self.foreground_executor
     }
 
+    #[expect(clippy::wrong_self_convention)]
     fn new<T: 'static>(&mut self, build_entity: impl FnOnce(&mut Context<T>) -> T) -> Entity<T> {
         let mut cx = self.app.borrow_mut();
         cx.new(build_entity)
@@ -244,7 +245,7 @@ impl TestAppContext {
             )
             .unwrap();
         drop(cx);
-        let cx = VisualTestContext::from_window(*window.deref(), self).as_mut();
+        let cx = VisualTestContext::from_window(*window.deref(), self).into_mut();
         cx.run_until_parked();
         cx
     }
@@ -273,7 +274,7 @@ impl TestAppContext {
             .unwrap();
         drop(cx);
         let view = window.root(self).unwrap();
-        let cx = VisualTestContext::from_window(*window.deref(), self).as_mut();
+        let cx = VisualTestContext::from_window(*window.deref(), self).into_mut();
         cx.run_until_parked();
 
         // it might be nice to try and cleanup these at the end of each test.
@@ -882,7 +883,7 @@ impl VisualTestContext {
 
     /// Get an &mut VisualTestContext (which is mostly what you need to pass to other methods).
     /// This method internally retains the VisualTestContext until the end of the test.
-    pub fn as_mut(self) -> &'static mut Self {
+    pub fn into_mut(self) -> &'static mut Self {
         let ptr = Box::into_raw(Box::new(self));
         // safety: on_quit will be called after the test has finished.
         // the executor will ensure that all tasks related to the test have stopped.
diff --git a/crates/gpui/src/color.rs b/crates/gpui/src/color.rs
index 639c84c101..cb7329c03f 100644
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -905,9 +905,9 @@ mod tests {
         assert_eq!(background.solid, color);
 
         assert_eq!(background.opacity(0.5).solid, color.opacity(0.5));
-        assert_eq!(background.is_transparent(), false);
+        assert!(!background.is_transparent());
         background.solid = hsla(0.0, 0.0, 0.0, 0.0);
-        assert_eq!(background.is_transparent(), true);
+        assert!(background.is_transparent());
     }
 
     #[test]
@@ -921,7 +921,7 @@ mod tests {
 
         assert_eq!(background.opacity(0.5).colors[0], from.opacity(0.5));
         assert_eq!(background.opacity(0.5).colors[1], to.opacity(0.5));
-        assert_eq!(background.is_transparent(), false);
-        assert_eq!(background.opacity(0.0).is_transparent(), true);
+        assert!(!background.is_transparent());
+        assert!(background.opacity(0.0).is_transparent());
     }
 }
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index 2de3e23ff7..ef446a073e 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -1641,7 +1641,7 @@ impl Bounds<Pixels> {
     }
 
     /// Convert the bounds from logical pixels to physical pixels
-    pub fn to_device_pixels(&self, factor: f32) -> Bounds<DevicePixels> {
+    pub fn to_device_pixels(self, factor: f32) -> Bounds<DevicePixels> {
         Bounds {
             origin: point(
                 DevicePixels((self.origin.x.0 * factor).round() as i32),
@@ -1957,7 +1957,7 @@ impl Edges<DefiniteLength> {
     /// assert_eq!(edges_in_pixels.bottom, px(32.0)); // 2 rems
     /// assert_eq!(edges_in_pixels.left, px(50.0)); // 25% of parent width
     /// ```
-    pub fn to_pixels(&self, parent_size: Size<AbsoluteLength>, rem_size: Pixels) -> Edges<Pixels> {
+    pub fn to_pixels(self, parent_size: Size<AbsoluteLength>, rem_size: Pixels) -> Edges<Pixels> {
         Edges {
             top: self.top.to_pixels(parent_size.height, rem_size),
             right: self.right.to_pixels(parent_size.width, rem_size),
@@ -2027,7 +2027,7 @@ impl Edges<AbsoluteLength> {
     /// assert_eq!(edges_in_pixels.bottom, px(20.0)); // Already in pixels
     /// assert_eq!(edges_in_pixels.left, px(32.0)); // 2 rems converted to pixels
     /// ```
-    pub fn to_pixels(&self, rem_size: Pixels) -> Edges<Pixels> {
+    pub fn to_pixels(self, rem_size: Pixels) -> Edges<Pixels> {
         Edges {
             top: self.top.to_pixels(rem_size),
             right: self.right.to_pixels(rem_size),
@@ -2272,7 +2272,7 @@ impl Corners<AbsoluteLength> {
     /// assert_eq!(corners_in_pixels.bottom_right, Pixels(30.0));
     /// assert_eq!(corners_in_pixels.bottom_left, Pixels(32.0)); // 2 rems converted to pixels
     /// ```
-    pub fn to_pixels(&self, rem_size: Pixels) -> Corners<Pixels> {
+    pub fn to_pixels(self, rem_size: Pixels) -> Corners<Pixels> {
         Corners {
             top_left: self.top_left.to_pixels(rem_size),
             top_right: self.top_right.to_pixels(rem_size),
@@ -2858,7 +2858,7 @@ impl DevicePixels {
     /// let total_bytes = pixels.to_bytes(bytes_per_pixel);
     /// assert_eq!(total_bytes, 40); // 10 pixels * 4 bytes/pixel = 40 bytes
     /// ```
-    pub fn to_bytes(&self, bytes_per_pixel: u8) -> u32 {
+    pub fn to_bytes(self, bytes_per_pixel: u8) -> u32 {
         self.0 as u32 * bytes_per_pixel as u32
     }
 }
@@ -3073,8 +3073,8 @@ pub struct Rems(pub f32);
 
 impl Rems {
     /// Convert this Rem value to pixels.
-    pub fn to_pixels(&self, rem_size: Pixels) -> Pixels {
-        *self * rem_size
+    pub fn to_pixels(self, rem_size: Pixels) -> Pixels {
+        self * rem_size
     }
 }
 
@@ -3168,9 +3168,9 @@ impl AbsoluteLength {
     /// assert_eq!(length_in_pixels.to_pixels(rem_size), Pixels(42.0));
     /// assert_eq!(length_in_rems.to_pixels(rem_size), Pixels(32.0));
     /// ```
-    pub fn to_pixels(&self, rem_size: Pixels) -> Pixels {
+    pub fn to_pixels(self, rem_size: Pixels) -> Pixels {
         match self {
-            AbsoluteLength::Pixels(pixels) => *pixels,
+            AbsoluteLength::Pixels(pixels) => pixels,
             AbsoluteLength::Rems(rems) => rems.to_pixels(rem_size),
         }
     }
@@ -3184,10 +3184,10 @@ impl AbsoluteLength {
     /// # Returns
     ///
     /// Returns the `AbsoluteLength` as `Pixels`.
-    pub fn to_rems(&self, rem_size: Pixels) -> Rems {
+    pub fn to_rems(self, rem_size: Pixels) -> Rems {
         match self {
             AbsoluteLength::Pixels(pixels) => Rems(pixels.0 / rem_size.0),
-            AbsoluteLength::Rems(rems) => *rems,
+            AbsoluteLength::Rems(rems) => rems,
         }
     }
 }
@@ -3315,12 +3315,12 @@ impl DefiniteLength {
     /// assert_eq!(length_in_rems.to_pixels(base_size, rem_size), Pixels(32.0));
     /// assert_eq!(length_as_fraction.to_pixels(base_size, rem_size), Pixels(50.0));
     /// ```
-    pub fn to_pixels(&self, base_size: AbsoluteLength, rem_size: Pixels) -> Pixels {
+    pub fn to_pixels(self, base_size: AbsoluteLength, rem_size: Pixels) -> Pixels {
         match self {
             DefiniteLength::Absolute(size) => size.to_pixels(rem_size),
             DefiniteLength::Fraction(fraction) => match base_size {
-                AbsoluteLength::Pixels(px) => px * *fraction,
-                AbsoluteLength::Rems(rems) => rems * rem_size * *fraction,
+                AbsoluteLength::Pixels(px) => px * fraction,
+                AbsoluteLength::Rems(rems) => rems * rem_size * fraction,
             },
         }
     }
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index f0ce04a915..5e4b5fe6e9 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -172,6 +172,10 @@ pub trait AppContext {
     type Result<T>;
 
     /// Create a new entity in the app context.
+    #[expect(
+        clippy::wrong_self_convention,
+        reason = "`App::new` is an ubiquitous function for creating entities"
+    )]
     fn new<T: 'static>(
         &mut self,
         build_entity: impl FnOnce(&mut Context<T>) -> T,
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index 66f191ca5d..d007876590 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -364,29 +364,29 @@ mod tests {
         // Ensure `space` results in pending input on the workspace, but not editor
         let space_workspace = keymap.bindings_for_input(&[space()], &workspace_context());
         assert!(space_workspace.0.is_empty());
-        assert_eq!(space_workspace.1, true);
+        assert!(space_workspace.1);
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
-        assert_eq!(space_editor.1, false);
+        assert!(!space_editor.1);
 
         // Ensure `space w` results in pending input on the workspace, but not editor
         let space_w_workspace = keymap.bindings_for_input(&space_w, &workspace_context());
         assert!(space_w_workspace.0.is_empty());
-        assert_eq!(space_w_workspace.1, true);
+        assert!(space_w_workspace.1);
 
         let space_w_editor = keymap.bindings_for_input(&space_w, &editor_workspace_context());
         assert!(space_w_editor.0.is_empty());
-        assert_eq!(space_w_editor.1, false);
+        assert!(!space_w_editor.1);
 
         // Ensure `space w w` results in the binding in the workspace, but not in the editor
         let space_w_w_workspace = keymap.bindings_for_input(&space_w_w, &workspace_context());
         assert!(!space_w_w_workspace.0.is_empty());
-        assert_eq!(space_w_w_workspace.1, false);
+        assert!(!space_w_w_workspace.1);
 
         let space_w_w_editor = keymap.bindings_for_input(&space_w_w, &editor_workspace_context());
         assert!(space_w_w_editor.0.is_empty());
-        assert_eq!(space_w_w_editor.1, false);
+        assert!(!space_w_w_editor.1);
 
         // Now test what happens if we have another binding defined AFTER the NoAction
         // that should result in pending
@@ -400,7 +400,7 @@ mod tests {
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
-        assert_eq!(space_editor.1, true);
+        assert!(space_editor.1);
 
         // Now test what happens if we have another binding defined BEFORE the NoAction
         // that should result in pending
@@ -414,7 +414,7 @@ mod tests {
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
-        assert_eq!(space_editor.1, true);
+        assert!(space_editor.1);
 
         // Now test what happens if we have another binding defined at a higher context
         // that should result in pending
@@ -428,7 +428,7 @@ mod tests {
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
-        assert_eq!(space_editor.1, true);
+        assert!(space_editor.1);
     }
 
     #[test]
@@ -447,7 +447,7 @@ mod tests {
             &[KeyContext::parse("editor").unwrap()],
         );
         assert!(result.is_empty());
-        assert_eq!(pending, true);
+        assert!(pending);
 
         let bindings = [
             KeyBinding::new("ctrl-w left", ActionAlpha {}, Some("editor")),
@@ -463,7 +463,7 @@ mod tests {
             &[KeyContext::parse("editor").unwrap()],
         );
         assert_eq!(result.len(), 1);
-        assert_eq!(pending, false);
+        assert!(!pending);
     }
 
     #[test]
@@ -482,7 +482,7 @@ mod tests {
             &[KeyContext::parse("editor").unwrap()],
         );
         assert!(result.is_empty());
-        assert_eq!(pending, false);
+        assert!(!pending);
     }
 
     #[test]
@@ -505,7 +505,7 @@ mod tests {
             ],
         );
         assert_eq!(result.len(), 1);
-        assert_eq!(pending, false);
+        assert!(!pending);
     }
 
     #[test]
@@ -527,7 +527,7 @@ mod tests {
             ],
         );
         assert_eq!(result.len(), 0);
-        assert_eq!(pending, false);
+        assert!(!pending);
     }
 
     #[test]
diff --git a/crates/gpui/src/keymap/binding.rs b/crates/gpui/src/keymap/binding.rs
index 6d36cbb4e0..729498d153 100644
--- a/crates/gpui/src/keymap/binding.rs
+++ b/crates/gpui/src/keymap/binding.rs
@@ -30,11 +30,8 @@ impl Clone for KeyBinding {
 impl KeyBinding {
     /// Construct a new keybinding from the given data. Panics on parse error.
     pub fn new<A: Action>(keystrokes: &str, action: A, context: Option<&str>) -> Self {
-        let context_predicate = if let Some(context) = context {
-            Some(KeyBindingContextPredicate::parse(context).unwrap().into())
-        } else {
-            None
-        };
+        let context_predicate =
+            context.map(|context| KeyBindingContextPredicate::parse(context).unwrap().into());
         Self::load(keystrokes, Box::new(action), context_predicate, None, None).unwrap()
     }
 
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 1df8a608f4..4d2feeaf1d 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -673,7 +673,7 @@ impl PlatformTextSystem for NoopTextSystem {
             }
         }
         let mut runs = Vec::default();
-        if glyphs.len() > 0 {
+        if !glyphs.is_empty() {
             runs.push(ShapedRun {
                 font_id: FontId(0),
                 glyphs,
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index ed824744a9..399411843b 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -667,7 +667,7 @@ pub(super) const DEFAULT_CURSOR_ICON_NAME: &str = "left_ptr";
 
 impl CursorStyle {
     #[cfg(any(feature = "wayland", feature = "x11"))]
-    pub(super) fn to_icon_names(&self) -> &'static [&'static str] {
+    pub(super) fn to_icon_names(self) -> &'static [&'static str] {
         // Based on cursor names from chromium:
         // https://github.com/chromium/chromium/blob/d3069cf9c973dc3627fa75f64085c6a86c8f41bf/ui/base/cursor/cursor_factory.cc#L113
         match self {
@@ -990,21 +990,18 @@ mod tests {
     #[test]
     fn test_is_within_click_distance() {
         let zero = Point::new(px(0.0), px(0.0));
-        assert_eq!(
-            is_within_click_distance(zero, Point::new(px(5.0), px(5.0))),
-            true
-        );
-        assert_eq!(
-            is_within_click_distance(zero, Point::new(px(-4.9), px(5.0))),
-            true
-        );
-        assert_eq!(
-            is_within_click_distance(Point::new(px(3.0), px(2.0)), Point::new(px(-2.0), px(-2.0))),
-            true
-        );
-        assert_eq!(
-            is_within_click_distance(zero, Point::new(px(5.0), px(5.1))),
-            false
-        );
+        assert!(is_within_click_distance(zero, Point::new(px(5.0), px(5.0))));
+        assert!(is_within_click_distance(
+            zero,
+            Point::new(px(-4.9), px(5.0))
+        ));
+        assert!(is_within_click_distance(
+            Point::new(px(3.0), px(2.0)),
+            Point::new(px(-2.0), px(-2.0))
+        ));
+        assert!(!is_within_click_distance(
+            zero,
+            Point::new(px(5.0), px(5.1))
+        ),);
     }
 }
diff --git a/crates/gpui/src/platform/linux/wayland.rs b/crates/gpui/src/platform/linux/wayland.rs
index cf73832b11..487bc9f38c 100644
--- a/crates/gpui/src/platform/linux/wayland.rs
+++ b/crates/gpui/src/platform/linux/wayland.rs
@@ -12,7 +12,7 @@ use wayland_protocols::wp::cursor_shape::v1::client::wp_cursor_shape_device_v1::
 use crate::CursorStyle;
 
 impl CursorStyle {
-    pub(super) fn to_shape(&self) -> Shape {
+    pub(super) fn to_shape(self) -> Shape {
         match self {
             CursorStyle::Arrow => Shape::Default,
             CursorStyle::IBeam => Shape::Text,
diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs
index ce1468335d..7570c58c09 100644
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -1139,7 +1139,7 @@ fn update_window(mut state: RefMut<WaylandWindowState>) {
 }
 
 impl WindowDecorations {
-    fn to_xdg(&self) -> zxdg_toplevel_decoration_v1::Mode {
+    fn to_xdg(self) -> zxdg_toplevel_decoration_v1::Mode {
         match self {
             WindowDecorations::Client => zxdg_toplevel_decoration_v1::Mode::ClientSide,
             WindowDecorations::Server => zxdg_toplevel_decoration_v1::Mode::ServerSide,
@@ -1148,7 +1148,7 @@ impl WindowDecorations {
 }
 
 impl ResizeEdge {
-    fn to_xdg(&self) -> xdg_toplevel::ResizeEdge {
+    fn to_xdg(self) -> xdg_toplevel::ResizeEdge {
         match self {
             ResizeEdge::Top => xdg_toplevel::ResizeEdge::Top,
             ResizeEdge::TopRight => xdg_toplevel::ResizeEdge::TopRight,
diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs
index c33d6fa462..6af943b317 100644
--- a/crates/gpui/src/platform/linux/x11/window.rs
+++ b/crates/gpui/src/platform/linux/x11/window.rs
@@ -95,7 +95,7 @@ fn query_render_extent(
 }
 
 impl ResizeEdge {
-    fn to_moveresize(&self) -> u32 {
+    fn to_moveresize(self) -> u32 {
         match self {
             ResizeEdge::TopLeft => 0,
             ResizeEdge::Top => 1,
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index cd923a1859..4425d4fe24 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1090,7 +1090,7 @@ impl PlatformWindow for MacWindow {
                         NSView::removeFromSuperview(blur_view);
                         this.blurred_view = None;
                     }
-                } else if this.blurred_view == None {
+                } else if this.blurred_view.is_none() {
                     let content_view = this.native_window.contentView();
                     let frame = NSView::bounds(content_view);
                     let mut blur_view: id = msg_send![BLURRED_VIEW_CLASS, alloc];
diff --git a/crates/gpui/src/tab_stop.rs b/crates/gpui/src/tab_stop.rs
index 30d24e85e7..c4d2fda6e9 100644
--- a/crates/gpui/src/tab_stop.rs
+++ b/crates/gpui/src/tab_stop.rs
@@ -45,27 +45,18 @@ impl TabHandles {
             })
             .unwrap_or_default();
 
-        if let Some(next_handle) = self.handles.get(next_ix) {
-            Some(next_handle.clone())
-        } else {
-            None
-        }
+        self.handles.get(next_ix).cloned()
     }
 
     pub(crate) fn prev(&self, focused_id: Option<&FocusId>) -> Option<FocusHandle> {
         let ix = self.current_index(focused_id).unwrap_or_default();
-        let prev_ix;
-        if ix == 0 {
-            prev_ix = self.handles.len().saturating_sub(1);
+        let prev_ix = if ix == 0 {
+            self.handles.len().saturating_sub(1)
         } else {
-            prev_ix = ix.saturating_sub(1);
-        }
+            ix.saturating_sub(1)
+        };
 
-        if let Some(prev_handle) = self.handles.get(prev_ix) {
-            Some(prev_handle.clone())
-        } else {
-            None
-        }
+        self.handles.get(prev_ix).cloned()
     }
 }
 
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index 3a58af6705..0f1365be77 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -172,7 +172,7 @@ pub fn box_shadow_style_methods(input: TokenStream) -> TokenStream {
 /// - `#[gpui::test(iterations = 5)]` runs five times, providing as seed the values in the range `0..5`.
 /// - `#[gpui::test(retries = 3)]` runs up to four times if it fails to try and make it pass.
 /// - `#[gpui::test(on_failure = "crate::test::report_failure")]` will call the specified function after the
-///    tests fail so that you can write out more detail about the failure.
+///   tests fail so that you can write out more detail about the failure.
 ///
 /// You can combine `iterations = ...` with `seeds(...)`:
 /// - `#[gpui::test(iterations = 5, seed = 10)]` is equivalent to `#[gpui::test(seeds(0, 1, 2, 3, 4, 10))]`.
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index 589fc68e99..be68dc1e9f 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -49,7 +49,7 @@ impl LanguageName {
     pub fn from_proto(s: String) -> Self {
         Self(SharedString::from(s))
     }
-    pub fn to_proto(self) -> String {
+    pub fn to_proto(&self) -> String {
         self.0.to_string()
     }
     pub fn lsp_id(&self) -> String {
diff --git a/crates/language_model/src/role.rs b/crates/language_model/src/role.rs
index 953dfa6fdf..4b47ef36dd 100644
--- a/crates/language_model/src/role.rs
+++ b/crates/language_model/src/role.rs
@@ -19,7 +19,7 @@ impl Role {
         }
     }
 
-    pub fn to_proto(&self) -> proto::LanguageModelRole {
+    pub fn to_proto(self) -> proto::LanguageModelRole {
         match self {
             Role::User => proto::LanguageModelRole::LanguageModelUser,
             Role::Assistant => proto::LanguageModelRole::LanguageModelAssistant,
diff --git a/crates/migrator/src/migrator.rs b/crates/migrator/src/migrator.rs
index 88e3e12f02..2180a049d0 100644
--- a/crates/migrator/src/migrator.rs
+++ b/crates/migrator/src/migrator.rs
@@ -28,7 +28,7 @@ fn migrate(text: &str, patterns: MigrationPatterns, query: &Query) -> Result<Opt
     let mut parser = tree_sitter::Parser::new();
     parser.set_language(&tree_sitter_json::LANGUAGE.into())?;
     let syntax_tree = parser
-        .parse(&text, None)
+        .parse(text, None)
         .context("failed to parse settings")?;
 
     let mut cursor = tree_sitter::QueryCursor::new();
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 162e3bea78..0cc2f654ea 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -7149,7 +7149,7 @@ impl ExcerptId {
         Self(usize::MAX)
     }
 
-    pub fn to_proto(&self) -> u64 {
+    pub fn to_proto(self) -> u64 {
         self.0 as _
     }
 
diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs
index 47a0f12c06..aab0354c96 100644
--- a/crates/paths/src/paths.rs
+++ b/crates/paths/src/paths.rs
@@ -41,7 +41,7 @@ pub fn remote_server_dir_relative() -> &'static Path {
 /// # Arguments
 ///
 /// * `dir` - The path to use as the custom data directory. This will be used as the base
-///           directory for all user data, including databases, extensions, and logs.
+///   directory for all user data, including databases, extensions, and logs.
 ///
 /// # Returns
 ///
diff --git a/crates/project/src/debugger.rs b/crates/project/src/debugger.rs
index 6c22468040..0bf6a0d61b 100644
--- a/crates/project/src/debugger.rs
+++ b/crates/project/src/debugger.rs
@@ -6,9 +6,9 @@
 //!
 //! There are few reasons for this divide:
 //! - Breakpoints persist across debug sessions and they're not really specific to any particular session. Sure, we have to send protocol messages for them
-//! (so they're a "thing" in the protocol), but we also want to set them before any session starts up.
+//!   (so they're a "thing" in the protocol), but we also want to set them before any session starts up.
 //! - Debug clients are doing the heavy lifting, and this is where UI grabs all of it's data from. They also rely on breakpoint store during initialization to obtain
-//! current set of breakpoints.
+//!   current set of breakpoints.
 //! - Since DAP store knows about all of the available debug sessions, it is responsible for routing RPC requests to sessions. It also knows how to find adapters for particular kind of session.
 
 pub mod breakpoint_store;
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
index 00fcc7e69f..343ee83ccb 100644
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ b/crates/project/src/debugger/breakpoint_store.rs
@@ -904,7 +904,7 @@ impl BreakpointState {
     }
 
     #[inline]
-    pub fn to_int(&self) -> i32 {
+    pub fn to_int(self) -> i32 {
         match self {
             BreakpointState::Enabled => 0,
             BreakpointState::Disabled => 1,
diff --git a/crates/project/src/debugger/memory.rs b/crates/project/src/debugger/memory.rs
index a8729a8ff4..42ad64e688 100644
--- a/crates/project/src/debugger/memory.rs
+++ b/crates/project/src/debugger/memory.rs
@@ -3,6 +3,7 @@
 //! Each byte in memory can either be mapped or unmapped. We try to mimic that twofold:
 //! - We assume that the memory is divided into pages of a fixed size.
 //! - We assume that each page can be either mapped or unmapped.
+//!
 //! These two assumptions drive the shape of the memory representation.
 //! In particular, we want the unmapped pages to be represented without allocating any memory, as *most*
 //! of the memory in a program space is usually unmapped.
@@ -165,8 +166,8 @@ impl Memory {
 /// - If it succeeds/fails wholesale, cool; we have no unknown memory regions in this page.
 /// - If it succeeds partially, we know # of mapped bytes.
 ///   We might also know the # of unmapped bytes.
-/// However, we're still unsure about what's *after* the unreadable region.
 ///
+/// However, we're still unsure about what's *after* the unreadable region.
 /// This is where this builder comes in. It lets us track the state of figuring out contents of a single page.
 pub(super) struct MemoryPageBuilder {
     chunks: MappedPageContents,
diff --git a/crates/project/src/git_store/conflict_set.rs b/crates/project/src/git_store/conflict_set.rs
index 27b191f65f..9d7bd26a92 100644
--- a/crates/project/src/git_store/conflict_set.rs
+++ b/crates/project/src/git_store/conflict_set.rs
@@ -653,7 +653,7 @@ mod tests {
 
         cx.run_until_parked();
         conflict_set.update(cx, |conflict_set, _| {
-            assert_eq!(conflict_set.has_conflict, false);
+            assert!(!conflict_set.has_conflict);
             assert_eq!(conflict_set.snapshot.conflicts.len(), 0);
         });
 
diff --git a/crates/project/src/git_store/git_traversal.rs b/crates/project/src/git_store/git_traversal.rs
index 4594e8d140..9eadaeac82 100644
--- a/crates/project/src/git_store/git_traversal.rs
+++ b/crates/project/src/git_store/git_traversal.rs
@@ -199,7 +199,7 @@ pub struct GitEntryRef<'a> {
 }
 
 impl GitEntryRef<'_> {
-    pub fn to_owned(&self) -> GitEntry {
+    pub fn to_owned(self) -> GitEntry {
         GitEntry {
             entry: self.entry.clone(),
             git_summary: self.git_summary,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 04b14ae06e..aa2398e29b 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -5,7 +5,7 @@
 //! This module is split up into three distinct parts:
 //! - [`LocalLspStore`], which is ran on the host machine (either project host or SSH host), that manages the lifecycle of language servers.
 //! - [`RemoteLspStore`], which is ran on the remote machine (project guests) which is mostly about passing through the requests via RPC.
-//!     The remote stores don't really care about which language server they're running against - they don't usually get to decide which language server is going to responsible for handling their request.
+//!   The remote stores don't really care about which language server they're running against - they don't usually get to decide which language server is going to responsible for handling their request.
 //! - [`LspStore`], which unifies the two under one consistent interface for interacting with language servers.
 //!
 //! Most of the interesting work happens at the local layer, as bulk of the complexity is with managing the lifecycle of language servers. The actual implementation of the LSP protocol is handled by [`lsp`] crate.
@@ -12691,7 +12691,7 @@ impl DiagnosticSummary {
     }
 
     pub fn to_proto(
-        &self,
+        self,
         language_server_id: LanguageServerId,
         path: &Path,
     ) -> proto::DiagnosticSummary {
diff --git a/crates/project/src/manifest_tree/path_trie.rs b/crates/project/src/manifest_tree/path_trie.rs
index 16110463ac..9cebfda25c 100644
--- a/crates/project/src/manifest_tree/path_trie.rs
+++ b/crates/project/src/manifest_tree/path_trie.rs
@@ -22,9 +22,9 @@ pub(super) struct RootPathTrie<Label> {
 /// Label presence is a marker that allows to optimize searches within [RootPathTrie]; node label can be:
 /// - Present; we know there's definitely a project root at this node.
 /// - Known Absent - we know there's definitely no project root at this node and none of it's ancestors are Present (descendants can be present though!).
-/// The distinction is there to optimize searching; when we encounter a node with unknown status, we don't need to look at it's full path
-/// to the root of the worktree; it's sufficient to explore only the path between last node with a KnownAbsent state and the directory of a path, since we run searches
-/// from the leaf up to the root of the worktree.
+///   The distinction is there to optimize searching; when we encounter a node with unknown status, we don't need to look at it's full path
+///   to the root of the worktree; it's sufficient to explore only the path between last node with a KnownAbsent state and the directory of a path, since we run searches
+///   from the leaf up to the root of the worktree.
 ///
 /// In practical terms, it means that by storing label presence we don't need to do a project discovery on a given folder more than once
 /// (unless the node is invalidated, which can happen when FS entries are renamed/removed).
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index f07ee13866..9cd83647ac 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -4329,7 +4329,7 @@ impl Project {
     /// # Arguments
     ///
     /// * `path` - A full path that starts with a worktree root name, or alternatively a
-    ///            relative path within a visible worktree.
+    ///   relative path within a visible worktree.
     /// * `cx` - A reference to the `AppContext`.
     ///
     /// # Returns
@@ -5508,7 +5508,7 @@ mod disable_ai_settings_tests {
                 project: &[],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(settings.disable_ai, false, "Default should allow AI");
+            assert!(!settings.disable_ai, "Default should allow AI");
 
             // Test 2: Global true, local false -> still disabled (local cannot re-enable)
             let global_true = Some(true);
@@ -5525,8 +5525,8 @@ mod disable_ai_settings_tests {
                 project: &[&local_false],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(
-                settings.disable_ai, true,
+            assert!(
+                settings.disable_ai,
                 "Local false cannot override global true"
             );
 
@@ -5545,10 +5545,7 @@ mod disable_ai_settings_tests {
                 project: &[&local_true],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(
-                settings.disable_ai, true,
-                "Local true can override global false"
-            );
+            assert!(settings.disable_ai, "Local true can override global false");
 
             // Test 4: Server can only make more restrictive (set to true)
             let user_false = Some(false);
@@ -5565,8 +5562,8 @@ mod disable_ai_settings_tests {
                 project: &[],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(
-                settings.disable_ai, true,
+            assert!(
+                settings.disable_ai,
                 "Server can set to true even if user is false"
             );
 
@@ -5585,8 +5582,8 @@ mod disable_ai_settings_tests {
                 project: &[],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(
-                settings.disable_ai, true,
+            assert!(
+                settings.disable_ai,
                 "Server false cannot override user true"
             );
 
@@ -5607,10 +5604,7 @@ mod disable_ai_settings_tests {
                 project: &[&local_false3, &local_true2, &local_false4],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(
-                settings.disable_ai, true,
-                "Any local true should disable AI"
-            );
+            assert!(settings.disable_ai, "Any local true should disable AI");
 
             // Test 7: All three sources can independently disable AI
             let user_false2 = Some(false);
@@ -5628,8 +5622,8 @@ mod disable_ai_settings_tests {
                 project: &[&local_true3],
             };
             let settings = DisableAiSettings::load(sources, cx).unwrap();
-            assert_eq!(
-                settings.disable_ai, true,
+            assert!(
+                settings.disable_ai,
                 "Local can disable even if user and server are false"
             );
         });
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index eb1e3828e9..70eb6d34f8 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -4123,7 +4123,7 @@ async fn test_buffer_identity_across_renames(cx: &mut gpui::TestAppContext) {
         })
         .unwrap()
         .await
-        .to_included()
+        .into_included()
         .unwrap();
     cx.executor().run_until_parked();
 
@@ -5918,7 +5918,7 @@ async fn test_create_entry(cx: &mut gpui::TestAppContext) {
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     // Can't create paths outside the project
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index dc92ee8c70..bb612ac475 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -2515,7 +2515,7 @@ impl ProjectPanel {
 
             if clip_is_cut {
                 // Convert the clipboard cut entry to a copy entry after the first paste.
-                self.clipboard = self.clipboard.take().map(ClipboardEntry::to_copy_entry);
+                self.clipboard = self.clipboard.take().map(ClipboardEntry::into_copy_entry);
             }
 
             self.expand_entry(worktree_id, entry.id, cx);
@@ -5709,7 +5709,7 @@ impl ClipboardEntry {
         }
     }
 
-    fn to_copy_entry(self) -> Self {
+    fn into_copy_entry(self) -> Self {
         match self {
             ClipboardEntry::Copied(_) => self,
             ClipboardEntry::Cut(entries) => ClipboardEntry::Copied(entries),
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 7173bc9b3b..fddf47660d 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -1452,7 +1452,7 @@ impl RemoteConnection for SshRemoteConnection {
             .arg(format!(
                 "{}:{}",
                 self.socket.connection_options.scp_url(),
-                dest_path.to_string()
+                dest_path
             ))
             .output();
 
@@ -1836,11 +1836,7 @@ impl SshRemoteConnection {
         })??;
 
         let tmp_path_gz = RemotePathBuf::new(
-            PathBuf::from(format!(
-                "{}-download-{}.gz",
-                dst_path.to_string(),
-                std::process::id()
-            )),
+            PathBuf::from(format!("{}-download-{}.gz", dst_path, std::process::id())),
             self.ssh_path_style,
         );
         if !self.socket.connection_options.upload_binary_over_ssh
@@ -2036,7 +2032,7 @@ impl SshRemoteConnection {
             .arg(format!(
                 "{}:{}",
                 self.socket.connection_options.scp_url(),
-                dest_path.to_string()
+                dest_path
             ))
             .output()
             .await?;
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 514e5ce4c0..69fae7f399 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -1207,7 +1207,7 @@ async fn test_remote_rename_entry(cx: &mut TestAppContext, server_cx: &mut TestA
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
 
     cx.run_until_parked();
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 3352b317cb..4ce133cbb1 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -84,7 +84,7 @@ fn init_logging_server(log_file_path: PathBuf) -> Result<Receiver<Vec<u8>>> {
         fn flush(&mut self) -> std::io::Result<()> {
             self.channel
                 .send_blocking(self.buffer.clone())
-                .map_err(|error| std::io::Error::new(std::io::ErrorKind::Other, error))?;
+                .map_err(std::io::Error::other)?;
             self.buffer.clear();
             self.file.flush()
         }
diff --git a/crates/repl/src/kernels/mod.rs b/crates/repl/src/kernels/mod.rs
index 3c3b766612..52188a39c4 100644
--- a/crates/repl/src/kernels/mod.rs
+++ b/crates/repl/src/kernels/mod.rs
@@ -169,10 +169,7 @@ pub enum KernelStatus {
 
 impl KernelStatus {
     pub fn is_connected(&self) -> bool {
-        match self {
-            KernelStatus::Idle | KernelStatus::Busy => true,
-            _ => false,
-        }
+        matches!(self, KernelStatus::Idle | KernelStatus::Busy)
     }
 }
 
diff --git a/crates/reqwest_client/src/reqwest_client.rs b/crates/reqwest_client/src/reqwest_client.rs
index 9053f4e452..d0d25bdf25 100644
--- a/crates/reqwest_client/src/reqwest_client.rs
+++ b/crates/reqwest_client/src/reqwest_client.rs
@@ -264,7 +264,7 @@ impl http_client::HttpClient for ReqwestClient {
 
             let bytes = response
                 .bytes_stream()
-                .map_err(|e| futures::io::Error::new(futures::io::ErrorKind::Other, e))
+                .map_err(futures::io::Error::other)
                 .into_async_read();
             let body = http_client::AsyncBody::from_reader(bytes);
 
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
index e3c7d6f750..379daa4224 100644
--- a/crates/rope/src/chunk.rs
+++ b/crates/rope/src/chunk.rs
@@ -92,7 +92,7 @@ impl Into<Chunk> for ChunkSlice<'_> {
 
 impl<'a> ChunkSlice<'a> {
     #[inline(always)]
-    pub fn is_empty(self) -> bool {
+    pub fn is_empty(&self) -> bool {
         self.text.is_empty()
     }
 
diff --git a/crates/rpc/src/conn.rs b/crates/rpc/src/conn.rs
index 0a41570fcc..78db80e398 100644
--- a/crates/rpc/src/conn.rs
+++ b/crates/rpc/src/conn.rs
@@ -56,7 +56,7 @@ impl Connection {
         ) {
             use anyhow::anyhow;
             use futures::channel::mpsc;
-            use std::io::{Error, ErrorKind};
+            use std::io::Error;
 
             let (tx, rx) = mpsc::unbounded::<WebSocketMessage>();
 
@@ -71,7 +71,7 @@ impl Connection {
 
                         // Writes to a half-open TCP connection will error.
                         if killed.load(SeqCst) {
-                            std::io::Result::Err(Error::new(ErrorKind::Other, "connection lost"))?;
+                            std::io::Result::Err(Error::other("connection lost"))?;
                         }
 
                         Ok(msg)
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index 1afbc2c23b..65e59fd5de 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -116,8 +116,8 @@ impl SearchOption {
         }
     }
 
-    pub fn to_toggle_action(&self) -> &'static dyn Action {
-        match *self {
+    pub fn to_toggle_action(self) -> &'static dyn Action {
+        match self {
             SearchOption::WholeWord => &ToggleWholeWord,
             SearchOption::CaseSensitive => &ToggleCaseSensitive,
             SearchOption::IncludeIgnored => &ToggleIncludeIgnored,
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index afd4ea0890..b73ab9ae95 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -50,11 +50,11 @@ impl WorktreeId {
         Self(id as usize)
     }
 
-    pub fn to_proto(&self) -> u64 {
+    pub fn to_proto(self) -> u64 {
         self.0 as u64
     }
 
-    pub fn to_usize(&self) -> usize {
+    pub fn to_usize(self) -> usize {
         self.0
     }
 }
diff --git a/crates/task/src/shell_builder.rs b/crates/task/src/shell_builder.rs
index 5ed29fd733..770312bafc 100644
--- a/crates/task/src/shell_builder.rs
+++ b/crates/task/src/shell_builder.rs
@@ -28,7 +28,7 @@ impl ShellKind {
         }
     }
 
-    fn to_shell_variable(&self, input: &str) -> String {
+    fn to_shell_variable(self, input: &str) -> String {
         match self {
             Self::Powershell => Self::to_powershell_variable(input),
             Self::Cmd => Self::to_cmd_variable(input),
diff --git a/crates/terminal_view/src/terminal_slash_command.rs b/crates/terminal_view/src/terminal_slash_command.rs
index ac86eef2bc..13c2cef48c 100644
--- a/crates/terminal_view/src/terminal_slash_command.rs
+++ b/crates/terminal_view/src/terminal_slash_command.rs
@@ -104,7 +104,7 @@ impl SlashCommand for TerminalSlashCommand {
             }],
             run_commands_in_text: false,
         }
-        .to_event_stream()))
+        .into_event_stream()))
     }
 }
 
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 956bcebfd0..0c16e3fb9d 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -2192,7 +2192,7 @@ mod tests {
             })
             .await
             .unwrap()
-            .to_included()
+            .into_included()
             .unwrap();
 
         (wt, entry)
diff --git a/crates/ui/src/components/button/button_like.rs b/crates/ui/src/components/button/button_like.rs
index 31bf76e843..477fc57b22 100644
--- a/crates/ui/src/components/button/button_like.rs
+++ b/crates/ui/src/components/button/button_like.rs
@@ -582,13 +582,9 @@ impl RenderOnce for ButtonLike {
             .when_some(self.width, |this, width| {
                 this.w(width).justify_center().text_center()
             })
-            .when(
-                match self.style {
-                    ButtonStyle::Outlined => true,
-                    _ => false,
-                },
-                |this| this.border_1(),
-            )
+            .when(matches!(self.style, ButtonStyle::Outlined), |this| {
+                this.border_1()
+            })
             .when_some(self.rounding, |this, rounding| match rounding {
                 ButtonLikeRounding::All => this.rounded_sm(),
                 ButtonLikeRounding::Left => this.rounded_l_sm(),
diff --git a/crates/ui/src/utils/format_distance.rs b/crates/ui/src/utils/format_distance.rs
index 213d9c8b4c..a8f27f01da 100644
--- a/crates/ui/src/utils/format_distance.rs
+++ b/crates/ui/src/utils/format_distance.rs
@@ -13,9 +13,9 @@ impl DateTimeType {
     ///
     /// If the [`DateTimeType`] is already a [`NaiveDateTime`], it will be returned as is.
     /// If the [`DateTimeType`] is a [`DateTime<Local>`], it will be converted to a [`NaiveDateTime`].
-    pub fn to_naive(&self) -> NaiveDateTime {
+    pub fn to_naive(self) -> NaiveDateTime {
         match self {
-            DateTimeType::Naive(naive) => *naive,
+            DateTimeType::Naive(naive) => naive,
             DateTimeType::Local(local) => local.naive_local(),
         }
     }
diff --git a/crates/util/src/archive.rs b/crates/util/src/archive.rs
index 3e4d281c29..9b58b16bed 100644
--- a/crates/util/src/archive.rs
+++ b/crates/util/src/archive.rs
@@ -154,7 +154,7 @@ mod tests {
                 let mut builder =
                     ZipEntryBuilder::new(filename.into(), async_zip::Compression::Deflate);
                 use std::os::unix::fs::PermissionsExt;
-                let metadata = std::fs::metadata(&path)?;
+                let metadata = std::fs::metadata(path)?;
                 let perms = metadata.permissions().mode() as u16;
                 builder = builder.unix_permissions(perms);
                 writer.write_entry_whole(builder, &data).await?;
diff --git a/crates/util/src/markdown.rs b/crates/util/src/markdown.rs
index 7e66ed7bae..303dbe0cf5 100644
--- a/crates/util/src/markdown.rs
+++ b/crates/util/src/markdown.rs
@@ -23,7 +23,7 @@ impl Display for MarkdownString {
 /// the other characters involved are escaped:
 ///
 /// * `!`, `]`, `(`, and `)` are used in link syntax, but `[` is escaped so these are parsed as
-/// plaintext.
+///   plaintext.
 ///
 /// * `;` is used in HTML entity syntax, but `&` is escaped, so they are parsed as plaintext.
 ///
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 292ec4874c..b430120314 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -2,6 +2,7 @@ use globset::{Glob, GlobSet, GlobSetBuilder};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
+use std::fmt::{Display, Formatter};
 use std::path::StripPrefixError;
 use std::sync::{Arc, OnceLock};
 use std::{
@@ -113,10 +114,6 @@ impl SanitizedPath {
         &self.0
     }
 
-    pub fn to_string(&self) -> String {
-        self.0.to_string_lossy().to_string()
-    }
-
     pub fn to_glob_string(&self) -> String {
         #[cfg(target_os = "windows")]
         {
@@ -137,6 +134,12 @@ impl SanitizedPath {
     }
 }
 
+impl Display for SanitizedPath {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0.display())
+    }
+}
+
 impl From<SanitizedPath> for Arc<Path> {
     fn from(sanitized_path: SanitizedPath) -> Self {
         sanitized_path.0
@@ -220,12 +223,8 @@ impl RemotePathBuf {
         Self::new(path_buf, style)
     }
 
-    pub fn to_string(&self) -> String {
-        self.string.clone()
-    }
-
     #[cfg(target_os = "windows")]
-    pub fn to_proto(self) -> String {
+    pub fn to_proto(&self) -> String {
         match self.path_style() {
             PathStyle::Posix => self.to_string(),
             PathStyle::Windows => self.inner.to_string_lossy().replace('\\', "/"),
@@ -233,7 +232,7 @@ impl RemotePathBuf {
     }
 
     #[cfg(not(target_os = "windows"))]
-    pub fn to_proto(self) -> String {
+    pub fn to_proto(&self) -> String {
         match self.path_style() {
             PathStyle::Posix => self.inner.to_string_lossy().to_string(),
             PathStyle::Windows => self.to_string(),
@@ -255,6 +254,12 @@ impl RemotePathBuf {
     }
 }
 
+impl Display for RemotePathBuf {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.string)
+    }
+}
+
 /// A delimiter to use in `path_query:row_number:column_number` strings parsing.
 pub const FILE_ROW_COLUMN_DELIMITER: char = ':';
 
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 92e3c97265..350ffd666b 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -816,10 +816,7 @@ impl Motion {
     }
 
     fn skip_exclusive_special_case(&self) -> bool {
-        match self {
-            Motion::WrappingLeft | Motion::WrappingRight => true,
-            _ => false,
-        }
+        matches!(self, Motion::WrappingLeft | Motion::WrappingRight)
     }
 
     pub(crate) fn push_to_jump_list(&self) -> bool {
@@ -4099,7 +4096,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
              ˇhe quick brown fox
              jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
             the quick bˇrown fox
@@ -4109,7 +4106,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
             ˇown fox
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
             the quick brown foˇx
@@ -4119,7 +4116,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
             ˇ
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
     }
 
     #[gpui::test]
@@ -4134,7 +4131,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
              ˇbrown fox
              jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
             the quick bˇrown fox
@@ -4144,7 +4141,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
             the quickˇown fox
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
             the quick brown foˇx
@@ -4154,7 +4151,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
             the quicˇk
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
             ˇthe quick brown fox
@@ -4164,7 +4161,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
             ˇ fox
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
             ˇthe quick brown fox
@@ -4174,7 +4171,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
             ˇuick brown fox
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
     }
 
     #[gpui::test]
@@ -4189,7 +4186,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
              the quick brown foˇx
              jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
              ˇthe quick brown fox
@@ -4199,7 +4196,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
              ˇx
              jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
     }
 
     #[gpui::test]
@@ -4215,7 +4212,7 @@ mod test {
                the quick brown fox
                ˇthe quick brown fox
                jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
               the quick bˇrown fox
@@ -4226,7 +4223,7 @@ mod test {
               the quick brˇrown fox
               jumped overown fox
               jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
              the quick brown foˇx
@@ -4237,7 +4234,7 @@ mod test {
              the quick brown foxˇx
              jumped over the la
              jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
              the quick brown fox
@@ -4248,7 +4245,7 @@ mod test {
             thˇhe quick brown fox
             je quick brown fox
             jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
     }
 
     #[gpui::test]
@@ -4263,7 +4260,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
               ˇe quick brown fox
               jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
               the quick bˇrown fox
@@ -4273,7 +4270,7 @@ mod test {
         cx.shared_state().await.assert_eq(indoc! {"
               the quick bˇn fox
               jumped over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
 
         cx.set_shared_state(indoc! {"
              the quick brown foˇx
@@ -4282,6 +4279,6 @@ mod test {
         cx.simulate_shared_keystrokes("d v e").await;
         cx.shared_state().await.assert_eq(indoc! {"
         the quick brown foˇd over the lazy dog"});
-        assert_eq!(cx.cx.forced_motion(), false);
+        assert!(!cx.cx.forced_motion());
     }
 }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 81c1a6b0b3..11d6d89bac 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -1734,10 +1734,7 @@ impl Vim {
             editor.set_autoindent(vim.should_autoindent());
             editor.selections.line_mode = matches!(vim.mode, Mode::VisualLine);
 
-            let hide_edit_predictions = match vim.mode {
-                Mode::Insert | Mode::Replace => false,
-                _ => true,
-            };
+            let hide_edit_predictions = !matches!(vim.mode, Mode::Insert | Mode::Replace);
             editor.set_edit_predictions_hidden_for_vim_mode(hide_edit_predictions, window, cx);
         });
         cx.notify()
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index d38f3cac3d..b12fd13767 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -5509,7 +5509,7 @@ impl ProjectEntryId {
         Self(id as usize)
     }
 
-    pub fn to_proto(&self) -> u64 {
+    pub fn to_proto(self) -> u64 {
         self.0 as u64
     }
 
@@ -5517,14 +5517,14 @@ impl ProjectEntryId {
         ProjectEntryId(id)
     }
 
-    pub fn to_usize(&self) -> usize {
+    pub fn to_usize(self) -> usize {
         self.0
     }
 }
 
 #[cfg(any(test, feature = "test-support"))]
 impl CreatedEntry {
-    pub fn to_included(self) -> Option<Entry> {
+    pub fn into_included(self) -> Option<Entry> {
         match self {
             CreatedEntry::Included(entry) => Some(entry),
             CreatedEntry::Excluded { .. } => None,
diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs
index d4c309e5bc..ca9debb647 100644
--- a/crates/worktree/src/worktree_tests.rs
+++ b/crates/worktree/src/worktree_tests.rs
@@ -1274,7 +1274,7 @@ async fn test_create_directory_during_initial_scan(cx: &mut TestAppContext) {
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
     assert!(entry.is_dir());
 
@@ -1323,7 +1323,7 @@ async fn test_create_dir_all_on_create_entry(cx: &mut TestAppContext) {
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
     assert!(entry.is_file());
 
@@ -1357,7 +1357,7 @@ async fn test_create_dir_all_on_create_entry(cx: &mut TestAppContext) {
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
     assert!(entry.is_file());
 
@@ -1377,7 +1377,7 @@ async fn test_create_dir_all_on_create_entry(cx: &mut TestAppContext) {
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
     assert!(entry.is_file());
 
@@ -1395,7 +1395,7 @@ async fn test_create_dir_all_on_create_entry(cx: &mut TestAppContext) {
         })
         .await
         .unwrap()
-        .to_included()
+        .into_included()
         .unwrap();
     assert!(entry.is_file());
 
@@ -1726,7 +1726,7 @@ fn randomly_mutate_worktree(
             );
             let task = worktree.rename_entry(entry.id, new_path, cx);
             cx.background_spawn(async move {
-                task.await?.to_included().unwrap();
+                task.await?.into_included().unwrap();
                 Ok(())
             })
         }
diff --git a/crates/x_ai/src/x_ai.rs b/crates/x_ai/src/x_ai.rs
index 23cd5b9320..569503784c 100644
--- a/crates/x_ai/src/x_ai.rs
+++ b/crates/x_ai/src/x_ai.rs
@@ -122,9 +122,6 @@ impl Model {
     }
 
     pub fn supports_images(&self) -> bool {
-        match self {
-            Self::Grok2Vision => true,
-            _ => false,
-        }
+        matches!(self, Self::Grok2Vision)
     }
 }

From 7bdc99abc15327db75baab28957cba7e7e9fa122 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Wed, 20 Aug 2025 13:20:13 +0300
Subject: [PATCH 205/823] Fix `clippy::redundant_clone` lint violations
 (#36558)

This removes around 900 unnecessary clones, ranging from cloning a few
ints all the way to large data structures and images.

A lot of these were fixed using `cargo clippy --fix --workspace
--all-targets`, however it often breaks other lints and needs to be run
again. This was then followed up with some manual fixing.

I understand this is a large diff, but all the changes are pretty
trivial. Rust is doing some heavy lifting here for us. Once I get it up
to speed with main, I'd appreciate this getting merged rather sooner
than later.

Release Notes:

- N/A
---
 Cargo.toml                                    |  1 +
 crates/acp_thread/src/acp_thread.rs           |  4 +-
 crates/acp_thread/src/diff.rs                 |  3 +-
 crates/action_log/src/action_log.rs           | 10 +--
 crates/agent/src/agent_profile.rs             |  6 +-
 crates/agent/src/context_server_tool.rs       |  6 +-
 crates/agent/src/thread.rs                    | 16 ++--
 crates/agent2/src/agent.rs                    |  6 +-
 crates/agent2/src/db.rs                       |  6 +-
 crates/agent2/src/tests/mod.rs                |  4 +-
 crates/agent2/src/thread.rs                   |  2 +-
 .../src/tools/context_server_registry.rs      |  6 +-
 crates/agent2/src/tools/edit_file_tool.rs     |  2 +-
 crates/agent2/src/tools/grep_tool.rs          |  8 +-
 crates/agent2/src/tools/terminal_tool.rs      |  2 +-
 crates/agent_servers/src/claude.rs            |  2 +-
 crates/agent_servers/src/claude/tools.rs      |  2 +-
 .../agent_ui/src/acp/completion_provider.rs   | 38 ++++----
 crates/agent_ui/src/acp/message_editor.rs     | 19 ++--
 crates/agent_ui/src/acp/thread_view.rs        | 12 ++-
 crates/agent_ui/src/active_thread.rs          | 12 ++-
 crates/agent_ui/src/agent_configuration.rs    | 10 +--
 .../configure_context_server_modal.rs         |  1 -
 .../manage_profiles_modal.rs                  |  2 +-
 crates/agent_ui/src/agent_diff.rs             | 10 +--
 crates/agent_ui/src/agent_model_selector.rs   |  6 +-
 crates/agent_ui/src/agent_panel.rs            | 24 ++---
 crates/agent_ui/src/agent_ui.rs               |  8 +-
 crates/agent_ui/src/buffer_codegen.rs         | 12 +--
 crates/agent_ui/src/context_picker.rs         |  9 +-
 .../src/context_picker/completion_provider.rs | 41 ++++-----
 crates/agent_ui/src/inline_assistant.rs       |  2 +-
 .../agent_ui/src/language_model_selector.rs   |  4 +-
 crates/agent_ui/src/message_editor.rs         |  5 +-
 crates/agent_ui/src/profile_selector.rs       |  4 +-
 crates/agent_ui/src/slash_command.rs          |  4 +-
 .../agent_ui/src/terminal_inline_assistant.rs |  2 +-
 crates/agent_ui/src/text_thread_editor.rs     |  8 +-
 crates/agent_ui/src/ui/context_pill.rs        |  4 +-
 .../src/agent_api_keys_onboarding.rs          |  2 +-
 .../src/agent_panel_onboarding_content.rs     |  2 +-
 .../src/assistant_context.rs                  |  2 +-
 .../src/assistant_context_tests.rs            |  4 +-
 crates/assistant_context/src/context_store.rs |  2 +-
 .../src/diagnostics_command.rs                |  2 +-
 .../src/prompt_command.rs                     |  2 +-
 .../assistant_tools/src/edit_agent/evals.rs   |  7 +-
 .../src/edit_agent/streaming_fuzzy_matcher.rs | 16 ++--
 crates/assistant_tools/src/edit_file_tool.rs  |  6 +-
 crates/assistant_tools/src/grep_tool.rs       |  6 +-
 crates/assistant_tools/src/terminal_tool.rs   |  2 +-
 .../src/ui/tool_call_card_header.rs           |  9 +-
 crates/assistant_tools/src/web_search_tool.rs |  5 +-
 crates/auto_update_ui/src/auto_update_ui.rs   |  2 +-
 crates/buffer_diff/src/buffer_diff.rs         | 12 +--
 crates/channel/src/channel_store_tests.rs     |  2 +-
 crates/cli/src/main.rs                        |  2 +-
 crates/client/src/client.rs                   |  9 +-
 crates/client/src/telemetry.rs                |  8 +-
 crates/collab/src/api/events.rs               |  2 +-
 crates/collab/src/auth.rs                     |  2 +-
 crates/collab/src/db/tests/embedding_tests.rs |  4 +-
 crates/collab/src/rpc.rs                      | 10 +--
 crates/collab/src/tests/editor_tests.rs       | 18 +---
 .../src/tests/random_channel_buffer_tests.rs  |  2 +-
 .../random_project_collaboration_tests.rs     |  2 +-
 crates/collab/src/tests/test_server.rs        |  4 +-
 crates/collab_ui/src/channel_view.rs          |  2 +-
 crates/collab_ui/src/chat_panel.rs            |  2 +-
 crates/collab_ui/src/collab_panel.rs          |  6 +-
 crates/collab_ui/src/notification_panel.rs    |  2 +-
 crates/command_palette/src/command_palette.rs |  2 +-
 crates/component/src/component_layout.rs      |  2 +-
 crates/context_server/src/listener.rs         |  1 -
 crates/copilot/src/copilot.rs                 |  5 +-
 .../src/copilot_completion_provider.rs        |  2 +-
 crates/debugger_tools/src/dap_log.rs          |  2 +-
 crates/debugger_ui/src/debugger_panel.rs      | 10 +--
 crates/debugger_ui/src/debugger_ui.rs         |  6 +-
 crates/debugger_ui/src/dropdown_menus.rs      |  3 +-
 crates/debugger_ui/src/new_process_modal.rs   |  2 +-
 crates/debugger_ui/src/persistence.rs         |  2 +-
 crates/debugger_ui/src/session/running.rs     |  8 +-
 .../src/session/running/breakpoint_list.rs    |  2 -
 .../src/session/running/console.rs            |  2 +-
 .../src/session/running/loaded_source_list.rs |  2 +-
 .../src/session/running/memory_view.rs        |  2 +-
 .../src/session/running/module_list.rs        |  2 +-
 .../src/session/running/stack_frame_list.rs   |  6 +-
 .../src/session/running/variable_list.rs      |  5 +-
 .../debugger_ui/src/tests/debugger_panel.rs   |  5 +-
 .../src/tests/new_process_modal.rs            |  4 +-
 crates/docs_preprocessor/src/main.rs          |  6 +-
 .../src/edit_prediction_button.rs             |  2 +-
 crates/editor/src/code_context_menus.rs       |  2 +-
 crates/editor/src/display_map/block_map.rs    | 22 +++--
 crates/editor/src/display_map/fold_map.rs     | 12 +--
 crates/editor/src/display_map/tab_map.rs      | 14 +--
 crates/editor/src/editor.rs                   | 29 +++---
 crates/editor/src/editor_settings_controls.rs |  2 +-
 crates/editor/src/editor_tests.rs             | 81 +++++++----------
 crates/editor/src/element.rs                  |  6 +-
 crates/editor/src/hover_popover.rs            |  4 +-
 crates/editor/src/jsx_tag_auto_close.rs       |  2 +-
 crates/editor/src/test/editor_test_context.rs |  8 +-
 crates/eval/src/eval.rs                       | 10 +--
 crates/eval/src/instance.rs                   |  9 +-
 .../extension_host/src/capability_granter.rs  |  2 +-
 .../src/components/feature_upsell.rs          |  1 -
 crates/extensions_ui/src/extensions_ui.rs     |  4 +-
 crates/feedback/src/system_specs.rs           |  2 +-
 crates/file_finder/src/file_finder.rs         |  2 +-
 crates/file_finder/src/open_path_prompt.rs    |  6 +-
 crates/fs/src/fake_git_repo.rs                |  2 +-
 crates/fs/src/fs.rs                           |  6 +-
 crates/fs/src/fs_watcher.rs                   |  2 +-
 crates/git_ui/src/blame_ui.rs                 |  6 +-
 crates/git_ui/src/branch_picker.rs            |  4 +-
 crates/git_ui/src/commit_modal.rs             |  8 +-
 crates/git_ui/src/commit_tooltip.rs           |  2 +-
 crates/git_ui/src/conflict_view.rs            |  5 +-
 crates/git_ui/src/git_panel.rs                | 36 ++++----
 crates/git_ui/src/git_ui.rs                   | 17 ++--
 crates/git_ui/src/project_diff.rs             |  8 +-
 crates/git_ui/src/text_diff_view.rs           |  4 +-
 crates/go_to_line/src/go_to_line.rs           |  2 +-
 crates/gpui/examples/input.rs                 |  4 +-
 crates/gpui/examples/text.rs                  |  2 +-
 crates/gpui/src/app/async_context.rs          |  2 +-
 crates/gpui/src/app/entity_map.rs             |  3 +-
 crates/gpui/src/app/test_context.rs           |  8 +-
 crates/gpui/src/elements/img.rs               |  2 +-
 crates/gpui/src/geometry.rs                   | 14 +--
 crates/gpui/src/keymap.rs                     | 32 +++----
 crates/gpui/src/keymap/context.rs             | 10 +--
 crates/gpui/src/platform/linux/platform.rs    |  4 +-
 .../gpui/src/platform/linux/wayland/client.rs |  1 -
 .../gpui/src/platform/linux/wayland/cursor.rs |  2 +-
 crates/gpui/src/platform/linux/x11/client.rs  |  2 +-
 .../gpui/src/platform/mac/metal_renderer.rs   |  2 +-
 crates/gpui/src/platform/test/platform.rs     |  4 +-
 crates/gpui/src/platform/windows/events.rs    |  2 +-
 crates/gpui/src/shared_string.rs              |  2 +-
 crates/gpui/src/window.rs                     | 10 +--
 .../tests/derive_inspector_reflection.rs      |  4 +-
 crates/http_client/src/async_body.rs          |  2 +-
 crates/journal/src/journal.rs                 |  2 +-
 crates/language/src/buffer.rs                 | 17 ++--
 crates/language/src/buffer_tests.rs           | 10 +--
 crates/language/src/language.rs               |  2 +-
 crates/language/src/language_registry.rs      |  7 +-
 crates/language/src/language_settings.rs      |  4 +-
 crates/language/src/syntax_map.rs             |  2 +-
 .../src/syntax_map/syntax_map_tests.rs        | 15 ++--
 crates/language/src/text_diff.rs              | 10 +--
 crates/language_model/src/language_model.rs   |  4 +-
 .../language_model/src/model/cloud_model.rs   |  2 +-
 crates/language_models/src/language_models.rs |  2 +-
 .../language_models/src/provider/bedrock.rs   | 15 +---
 crates/language_models/src/provider/cloud.rs  |  6 +-
 crates/language_models/src/provider/google.rs |  2 +-
 .../language_models/src/provider/lmstudio.rs  |  2 +-
 crates/language_models/src/provider/ollama.rs |  2 +-
 .../src/ui/instruction_list_item.rs           |  2 +-
 crates/language_tools/src/lsp_log.rs          | 11 +--
 crates/language_tools/src/syntax_tree_view.rs |  2 +-
 crates/languages/src/c.rs                     | 10 +--
 crates/languages/src/go.rs                    |  8 +-
 crates/languages/src/json.rs                  |  2 +-
 crates/languages/src/lib.rs                   | 24 ++---
 crates/languages/src/python.rs                |  6 +-
 crates/languages/src/rust.rs                  |  8 +-
 crates/languages/src/tailwind.rs              |  2 +-
 crates/languages/src/typescript.rs            |  4 +-
 crates/languages/src/vtsls.rs                 |  2 +-
 crates/languages/src/yaml.rs                  |  2 +-
 crates/livekit_client/examples/test_app.rs    |  2 +-
 .../src/livekit_client/playback.rs            |  5 +-
 crates/markdown/examples/markdown_as_child.rs |  2 +-
 crates/markdown/src/markdown.rs               |  3 +-
 .../markdown_preview/src/markdown_parser.rs   |  5 +-
 .../src/markdown_preview_view.rs              |  3 +-
 .../src/migrations/m_2025_01_02/settings.rs   |  4 +-
 .../src/migrations/m_2025_01_29/keymap.rs     |  2 +-
 .../src/migrations/m_2025_01_29/settings.rs   |  2 +-
 .../src/migrations/m_2025_01_30/settings.rs   |  6 +-
 .../src/migrations/m_2025_03_29/settings.rs   |  2 +-
 .../src/migrations/m_2025_05_29/settings.rs   |  4 +-
 crates/multi_buffer/src/multi_buffer.rs       |  6 +-
 crates/onboarding/src/basics_page.rs          |  4 +-
 crates/onboarding/src/editing_page.rs         |  8 +-
 crates/onboarding/src/theme_preview.rs        | 12 +--
 crates/outline_panel/src/outline_panel.rs     |  2 +-
 crates/panel/src/panel.rs                     |  2 +-
 crates/picker/src/popover_menu.rs             |  2 +-
 crates/project/src/buffer_store.rs            |  8 +-
 crates/project/src/context_server_store.rs    |  2 +-
 .../project/src/debugger/breakpoint_store.rs  | 16 ++--
 crates/project/src/debugger/dap_command.rs    |  2 +-
 crates/project/src/debugger/dap_store.rs      |  2 +-
 crates/project/src/debugger/session.rs        |  9 +-
 crates/project/src/git_store.rs               | 19 ++--
 crates/project/src/git_store/conflict_set.rs  |  4 +-
 crates/project/src/image_store.rs             |  3 +-
 crates/project/src/lsp_command.rs             |  9 +-
 crates/project/src/lsp_store.rs               | 13 ++-
 crates/project/src/lsp_store/clangd_ext.rs    |  2 +-
 .../src/lsp_store/rust_analyzer_ext.rs        |  1 -
 crates/project/src/project.rs                 |  6 +-
 crates/project/src/project_tests.rs           | 10 +--
 crates/project/src/task_inventory.rs          |  4 +-
 crates/project/src/terminals.rs               |  2 +-
 crates/project/src/worktree_store.rs          |  2 +-
 crates/project_panel/src/project_panel.rs     | 17 ++--
 .../project_panel/src/project_panel_tests.rs  | 90 +++++++++----------
 crates/project_symbols/src/project_symbols.rs |  8 +-
 crates/prompt_store/src/prompts.rs            |  2 +-
 crates/recent_projects/src/remote_servers.rs  | 10 +--
 crates/recent_projects/src/ssh_connections.rs |  2 +-
 crates/remote/src/ssh_session.rs              |  6 +-
 crates/remote_server/src/headless_project.rs  |  4 +-
 crates/remote_server/src/unix.rs              |  3 +-
 crates/repl/src/components/kernel_options.rs  |  2 +-
 crates/repl/src/kernels/remote_kernels.rs     |  4 +-
 crates/repl/src/outputs.rs                    | 19 ++--
 crates/repl/src/outputs/markdown.rs           |  2 +-
 crates/repl/src/repl_editor.rs                | 12 +--
 crates/repl/src/repl_sessions_ui.rs           |  1 -
 crates/repl/src/session.rs                    |  5 +-
 crates/rope/src/chunk.rs                      |  2 +-
 crates/rpc/src/conn.rs                        |  1 -
 crates/rpc/src/peer.rs                        |  1 -
 crates/rules_library/src/rules_library.rs     |  4 +-
 crates/search/src/buffer_search.rs            |  4 +-
 crates/search/src/buffer_search/registrar.rs  |  1 -
 crates/search/src/project_search.rs           |  3 +-
 crates/semantic_index/examples/index.rs       |  4 +-
 crates/semantic_index/src/embedding_index.rs  |  7 +-
 crates/semantic_index/src/semantic_index.rs   |  2 +-
 crates/semantic_index/src/summary_index.rs    |  2 +-
 crates/settings/src/settings_json.rs          |  4 +-
 .../src/settings_profile_selector.rs          |  2 +-
 .../src/appearance_settings_controls.rs       |  4 +-
 crates/settings_ui/src/keybindings.rs         | 12 +--
 crates/story/src/story.rs                     |  2 +-
 crates/supermaven/src/supermaven.rs           |  4 +-
 .../src/supermaven_completion_provider.rs     |  4 +-
 crates/task/src/static_source.rs              |  1 -
 crates/task/src/task.rs                       |  2 +-
 crates/task/src/task_template.rs              | 12 ++-
 crates/tasks_ui/src/tasks_ui.rs               |  2 +-
 crates/terminal/src/terminal.rs               |  4 +-
 crates/terminal_view/src/terminal_element.rs  |  5 +-
 crates/terminal_view/src/terminal_panel.rs    |  1 -
 crates/theme/src/theme.rs                     |  6 +-
 crates/theme_importer/src/vscode/converter.rs | 12 ++-
 crates/title_bar/src/application_menu.rs      |  2 +-
 crates/title_bar/src/collab.rs                |  2 +-
 crates/title_bar/src/title_bar.rs             |  7 +-
 .../src/toolchain_selector.rs                 |  1 -
 crates/ui/src/components/dropdown_menu.rs     |  4 +-
 crates/ui/src/components/indent_guides.rs     |  3 +-
 crates/ui/src/components/keybinding.rs        |  2 +-
 crates/ui/src/components/keybinding_hint.rs   |  2 +-
 .../components/notification/alert_modal.rs    |  2 +-
 crates/ui/src/components/sticky_items.rs      |  2 +-
 crates/ui/src/utils/format_distance.rs        | 12 +--
 crates/ui_input/src/ui_input.rs               |  4 +-
 crates/vim/src/command.rs                     |  2 +-
 crates/vim/src/mode_indicator.rs              |  6 +-
 crates/vim/src/motion.rs                      | 20 ++---
 crates/vim/src/normal/paste.rs                |  6 +-
 crates/vim/src/object.rs                      |  4 +-
 crates/vim/src/state.rs                       | 14 +--
 .../src/test/neovim_backed_test_context.rs    |  7 +-
 crates/vim/src/test/neovim_connection.rs      |  2 +-
 crates/vim/src/test/vim_test_context.rs       |  2 +-
 crates/vim/src/vim.rs                         |  2 +-
 crates/vim/src/visual.rs                      |  2 +-
 crates/watch/src/watch.rs                     |  2 +-
 crates/web_search/src/web_search.rs           |  2 +-
 crates/workspace/src/dock.rs                  |  4 +-
 crates/workspace/src/notifications.rs         |  1 -
 crates/workspace/src/pane.rs                  |  4 +-
 crates/workspace/src/pane_group.rs            |  2 +-
 crates/workspace/src/persistence/model.rs     |  2 +-
 crates/workspace/src/searchable.rs            |  4 +-
 crates/workspace/src/status_bar.rs            |  4 +-
 crates/workspace/src/theme_preview.rs         |  1 -
 crates/workspace/src/workspace.rs             |  6 +-
 crates/worktree/src/worktree.rs               |  4 +-
 crates/worktree/src/worktree_tests.rs         |  2 +-
 crates/zed/src/main.rs                        | 18 ++--
 crates/zed/src/zed.rs                         |  8 +-
 crates/zed/src/zed/component_preview.rs       | 18 ++--
 .../zed/src/zed/edit_prediction_registry.rs   | 11 +--
 crates/zed/src/zed/open_listener.rs           |  7 +-
 crates/zed/src/zed/quick_action_bar.rs        |  4 +-
 .../zed/src/zed/quick_action_bar/repl_menu.rs |  5 +-
 crates/zeta/src/input_excerpt.rs              |  2 +-
 crates/zeta_cli/src/headless.rs               |  6 +-
 crates/zlog/src/filter.rs                     |  2 +-
 extensions/glsl/src/glsl.rs                   |  2 +-
 extensions/html/src/html.rs                   |  2 +-
 extensions/ruff/src/ruff.rs                   |  4 +-
 extensions/snippets/src/snippets.rs           |  2 +-
 306 files changed, 805 insertions(+), 1102 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3610808984..c3c7091279 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -840,6 +840,7 @@ match_like_matches_macro = "warn"
 module_inception = { level = "deny" }
 question_mark = { level = "deny" }
 single_match = "warn"
+redundant_clone = "warn"
 redundant_closure = { level = "deny" }
 redundant_static_lifetimes = { level = "warn" }
 redundant_pattern_matching = "warn"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index e58f0a291f..4f20dbd587 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -471,7 +471,7 @@ impl ContentBlock {
 
     fn block_string_contents(&self, block: acp::ContentBlock) -> String {
         match block {
-            acp::ContentBlock::Text(text_content) => text_content.text.clone(),
+            acp::ContentBlock::Text(text_content) => text_content.text,
             acp::ContentBlock::ResourceLink(resource_link) => {
                 Self::resource_link_md(&resource_link.uri)
             }
@@ -1020,7 +1020,7 @@ impl AcpThread {
                 let location_updated = update.fields.locations.is_some();
                 current_call.update_fields(update.fields, languages, cx);
                 if location_updated {
-                    self.resolve_locations(update.id.clone(), cx);
+                    self.resolve_locations(update.id, cx);
                 }
             }
             ToolCallUpdate::UpdateDiff(update) => {
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index 4b779931c5..70367e340a 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -222,7 +222,7 @@ impl PendingDiff {
     fn finalize(&self, cx: &mut Context<Diff>) -> FinalizedDiff {
         let ranges = self.excerpt_ranges(cx);
         let base_text = self.base_text.clone();
-        let language_registry = self.buffer.read(cx).language_registry().clone();
+        let language_registry = self.buffer.read(cx).language_registry();
 
         let path = self
             .buffer
@@ -248,7 +248,6 @@ impl PendingDiff {
 
         let buffer_diff = cx.spawn({
             let buffer = buffer.clone();
-            let language_registry = language_registry.clone();
             async move |_this, cx| {
                 build_buffer_diff(base_text, &buffer, language_registry, cx).await
             }
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index 1c3cad386d..a1f332fc7c 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -161,7 +161,7 @@ impl ActionLog {
                     diff_base,
                     last_seen_base,
                     unreviewed_edits,
-                    snapshot: text_snapshot.clone(),
+                    snapshot: text_snapshot,
                     status,
                     version: buffer.read(cx).version(),
                     diff,
@@ -461,7 +461,7 @@ impl ActionLog {
             anyhow::Ok((
                 tracked_buffer.diff.clone(),
                 buffer.read(cx).language().cloned(),
-                buffer.read(cx).language_registry().clone(),
+                buffer.read(cx).language_registry(),
             ))
         })??;
         let diff_snapshot = BufferDiff::update_diff(
@@ -529,12 +529,12 @@ impl ActionLog {
 
     /// Mark a buffer as created by agent, so we can refresh it in the context
     pub fn buffer_created(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.track_buffer_internal(buffer.clone(), true, cx);
+        self.track_buffer_internal(buffer, true, cx);
     }
 
     /// Mark a buffer as edited by agent, so we can refresh it in the context
     pub fn buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
+        let tracked_buffer = self.track_buffer_internal(buffer, false, cx);
         if let TrackedBufferStatus::Deleted = tracked_buffer.status {
             tracked_buffer.status = TrackedBufferStatus::Modified;
         }
@@ -2425,7 +2425,7 @@ mod tests {
         assert_eq!(
             unreviewed_hunks(&action_log, cx),
             vec![(
-                buffer.clone(),
+                buffer,
                 vec![
                     HunkStatus {
                         range: Point::new(6, 0)..Point::new(7, 0),
diff --git a/crates/agent/src/agent_profile.rs b/crates/agent/src/agent_profile.rs
index 1636508df6..c9e73372f6 100644
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -132,7 +132,7 @@ mod tests {
         });
         let tool_set = default_tool_set(cx);
 
-        let profile = AgentProfile::new(id.clone(), tool_set);
+        let profile = AgentProfile::new(id, tool_set);
 
         let mut enabled_tools = cx
             .read(|cx| profile.enabled_tools(cx))
@@ -169,7 +169,7 @@ mod tests {
         });
         let tool_set = default_tool_set(cx);
 
-        let profile = AgentProfile::new(id.clone(), tool_set);
+        let profile = AgentProfile::new(id, tool_set);
 
         let mut enabled_tools = cx
             .read(|cx| profile.enabled_tools(cx))
@@ -202,7 +202,7 @@ mod tests {
         });
         let tool_set = default_tool_set(cx);
 
-        let profile = AgentProfile::new(id.clone(), tool_set);
+        let profile = AgentProfile::new(id, tool_set);
 
         let mut enabled_tools = cx
             .read(|cx| profile.enabled_tools(cx))
diff --git a/crates/agent/src/context_server_tool.rs b/crates/agent/src/context_server_tool.rs
index 22d1a72bf5..696c569356 100644
--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -86,15 +86,13 @@ impl Tool for ContextServerTool {
     ) -> ToolResult {
         if let Some(server) = self.store.read(cx).get_running_server(&self.server_id) {
             let tool_name = self.tool.name.clone();
-            let server_clone = server.clone();
-            let input_clone = input.clone();
 
             cx.spawn(async move |_cx| {
-                let Some(protocol) = server_clone.client() else {
+                let Some(protocol) = server.client() else {
                     bail!("Context server not initialized");
                 };
 
-                let arguments = if let serde_json::Value::Object(map) = input_clone {
+                let arguments = if let serde_json::Value::Object(map) = input {
                     Some(map.into_iter().collect())
                 } else {
                     None
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 88f82701a4..a584fba881 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -494,7 +494,7 @@ impl Thread {
             last_received_chunk_at: None,
             request_callback: None,
             remaining_turns: u32::MAX,
-            configured_model: configured_model.clone(),
+            configured_model,
             profile: AgentProfile::new(profile_id, tools),
         }
     }
@@ -532,7 +532,7 @@ impl Thread {
                 .and_then(|model| {
                     let model = SelectedModel {
                         provider: model.provider.clone().into(),
-                        model: model.model.clone().into(),
+                        model: model.model.into(),
                     };
                     registry.select_model(&model, cx)
                 })
@@ -1646,10 +1646,10 @@ impl Thread {
         };
 
         self.tool_use
-            .request_tool_use(tool_message_id, tool_use, tool_use_metadata.clone(), cx);
+            .request_tool_use(tool_message_id, tool_use, tool_use_metadata, cx);
 
         self.tool_use.insert_tool_output(
-            tool_use_id.clone(),
+            tool_use_id,
             tool_name,
             tool_output,
             self.configured_model.as_ref(),
@@ -3241,7 +3241,7 @@ impl Thread {
             self.configured_model.as_ref(),
             self.completion_mode,
         );
-        self.tool_finished(tool_use_id.clone(), None, true, window, cx);
+        self.tool_finished(tool_use_id, None, true, window, cx);
     }
 }
 
@@ -3873,7 +3873,7 @@ fn main() {{
                 AgentSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: Some(model.provider_id().0.to_string().into()),
-                        model: Some(model.id().0.clone()),
+                        model: Some(model.id().0),
                         temperature: Some(0.66),
                     }],
                     ..AgentSettings::get_global(cx).clone()
@@ -3893,7 +3893,7 @@ fn main() {{
                 AgentSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: None,
-                        model: Some(model.id().0.clone()),
+                        model: Some(model.id().0),
                         temperature: Some(0.66),
                     }],
                     ..AgentSettings::get_global(cx).clone()
@@ -3933,7 +3933,7 @@ fn main() {{
                 AgentSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: Some("anthropic".into()),
-                        model: Some(model.id().0.clone()),
+                        model: Some(model.id().0),
                         temperature: Some(0.66),
                     }],
                     ..AgentSettings::get_global(cx).clone()
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index ab5716d8ad..5496ecea7b 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -255,7 +255,7 @@ impl NativeAgent {
             }),
             cx.subscribe(&thread_handle, Self::handle_thread_token_usage_updated),
             cx.observe(&thread_handle, move |this, thread, cx| {
-                this.save_thread(thread.clone(), cx)
+                this.save_thread(thread, cx)
             }),
         ];
 
@@ -499,8 +499,8 @@ impl NativeAgent {
         self.models.refresh_list(cx);
 
         let registry = LanguageModelRegistry::read_global(cx);
-        let default_model = registry.default_model().map(|m| m.model.clone());
-        let summarization_model = registry.thread_summary_model().map(|m| m.model.clone());
+        let default_model = registry.default_model().map(|m| m.model);
+        let summarization_model = registry.thread_summary_model().map(|m| m.model);
 
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, cx| {
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index c6a6c38201..1b88955a24 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -287,7 +287,7 @@ impl ThreadsDatabase {
         .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
 
         let db = Self {
-            executor: executor.clone(),
+            executor,
             connection: Arc::new(Mutex::new(connection)),
         };
 
@@ -325,7 +325,7 @@ impl ThreadsDatabase {
             INSERT OR REPLACE INTO threads (id, summary, updated_at, data_type, data) VALUES (?, ?, ?, ?, ?)
         "})?;
 
-        insert((id.0.clone(), title, updated_at, data_type, data))?;
+        insert((id.0, title, updated_at, data_type, data))?;
 
         Ok(())
     }
@@ -434,7 +434,7 @@ mod tests {
             let client = Client::new(clock, http_client, cx);
             agent::init(cx);
             agent_settings::init(cx);
-            language_model::init(client.clone(), cx);
+            language_model::init(client, cx);
         });
     }
 
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 55bfa6f0b5..478604b14a 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1401,7 +1401,7 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
         let client = Client::new(clock, http_client, cx);
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
         language_model::init(client.clone(), cx);
-        language_models::init(user_store.clone(), client.clone(), cx);
+        language_models::init(user_store, client.clone(), cx);
         Project::init_settings(cx);
         LanguageModelRegistry::test(cx);
         agent_settings::init(cx);
@@ -1854,7 +1854,7 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
         let client = Client::production(cx);
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
         language_model::init(client.clone(), cx);
-        language_models::init(user_store.clone(), client.clone(), cx);
+        language_models::init(user_store, client.clone(), cx);
 
         watch_settings(fs.clone(), cx);
     });
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 0e1287a920..cd97fa2060 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -679,7 +679,7 @@ impl Thread {
                 .and_then(|model| {
                     let model = SelectedModel {
                         provider: model.provider.clone().into(),
-                        model: model.model.clone().into(),
+                        model: model.model.into(),
                     };
                     registry.select_model(&model, cx)
                 })
diff --git a/crates/agent2/src/tools/context_server_registry.rs b/crates/agent2/src/tools/context_server_registry.rs
index 69c4221a81..c7963fa6e6 100644
--- a/crates/agent2/src/tools/context_server_registry.rs
+++ b/crates/agent2/src/tools/context_server_registry.rs
@@ -176,15 +176,13 @@ impl AnyAgentTool for ContextServerTool {
             return Task::ready(Err(anyhow!("Context server not found")));
         };
         let tool_name = self.tool.name.clone();
-        let server_clone = server.clone();
-        let input_clone = input.clone();
 
         cx.spawn(async move |_cx| {
-            let Some(protocol) = server_clone.client() else {
+            let Some(protocol) = server.client() else {
                 bail!("Context server not initialized");
             };
 
-            let arguments = if let serde_json::Value::Object(map) = input_clone {
+            let arguments = if let serde_json::Value::Object(map) = input {
                 Some(map.into_iter().collect())
             } else {
                 None
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index a87699bd12..24fedda4eb 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -427,7 +427,7 @@ impl AgentTool for EditFileTool {
 
             Ok(EditFileToolOutput {
                 input_path: input.path,
-                new_text: new_text.clone(),
+                new_text,
                 old_text,
                 diff: unified_diff,
                 edit_agent_output,
diff --git a/crates/agent2/src/tools/grep_tool.rs b/crates/agent2/src/tools/grep_tool.rs
index 6d7c05d211..265c26926d 100644
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -318,7 +318,7 @@ mod tests {
         init_test(cx);
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/root"),
             serde_json::json!({
@@ -403,7 +403,7 @@ mod tests {
         init_test(cx);
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/root"),
             serde_json::json!({
@@ -478,7 +478,7 @@ mod tests {
         init_test(cx);
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
 
         // Create test file with syntax structures
         fs.insert_tree(
@@ -763,7 +763,7 @@ mod tests {
                 if cfg!(windows) {
                     result.replace("root\\", "root/")
                 } else {
-                    result.to_string()
+                    result
                 }
             }
             Err(e) => panic!("Failed to run grep tool: {}", e),
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index 17e671fba3..3d4faf2e03 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -234,7 +234,7 @@ fn process_content(
             if is_empty {
                 "Command executed successfully.".to_string()
             } else {
-                content.to_string()
+                content
             }
         }
         Some(exit_status) => {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 3008edebeb..df2a24e698 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -787,7 +787,7 @@ impl Content {
     pub fn chunks(self) -> impl Iterator<Item = ContentChunk> {
         match self {
             Self::Chunks(chunks) => chunks.into_iter(),
-            Self::UntaggedText(text) => vec![ContentChunk::Text { text: text.clone() }].into_iter(),
+            Self::UntaggedText(text) => vec![ContentChunk::Text { text }].into_iter(),
         }
     }
 }
diff --git a/crates/agent_servers/src/claude/tools.rs b/crates/agent_servers/src/claude/tools.rs
index 3be10ed94c..3231903001 100644
--- a/crates/agent_servers/src/claude/tools.rs
+++ b/crates/agent_servers/src/claude/tools.rs
@@ -58,7 +58,7 @@ impl ClaudeTool {
                     Self::Terminal(None)
                 } else {
                     Self::Other {
-                        name: tool_name.to_string(),
+                        name: tool_name,
                         input,
                     }
                 }
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 999e469d30..d90520d26a 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -89,7 +89,7 @@ impl ContextPickerCompletionProvider {
     ) -> Option<Completion> {
         match entry {
             ContextPickerEntry::Mode(mode) => Some(Completion {
-                replace_range: source_range.clone(),
+                replace_range: source_range,
                 new_text: format!("@{} ", mode.keyword()),
                 label: CodeLabel::plain(mode.label().to_string(), None),
                 icon_path: Some(mode.icon().path().into()),
@@ -146,7 +146,7 @@ impl ContextPickerCompletionProvider {
                 };
 
                 Some(Completion {
-                    replace_range: source_range.clone(),
+                    replace_range: source_range,
                     new_text,
                     label: CodeLabel::plain(action.label().to_string(), None),
                     icon_path: Some(action.icon().path().into()),
@@ -187,7 +187,7 @@ impl ContextPickerCompletionProvider {
             documentation: None,
             insert_text_mode: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(icon_for_completion.clone()),
+            icon_path: Some(icon_for_completion),
             confirm: Some(confirm_completion_callback(
                 thread_entry.title().clone(),
                 source_range.start,
@@ -218,9 +218,9 @@ impl ContextPickerCompletionProvider {
             documentation: None,
             insert_text_mode: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(icon_path.clone()),
+            icon_path: Some(icon_path),
             confirm: Some(confirm_completion_callback(
-                rule.title.clone(),
+                rule.title,
                 source_range.start,
                 new_text_len - 1,
                 editor,
@@ -260,7 +260,7 @@ impl ContextPickerCompletionProvider {
         let completion_icon_path = if is_recent {
             IconName::HistoryRerun.path().into()
         } else {
-            crease_icon_path.clone()
+            crease_icon_path
         };
 
         let new_text = format!("{} ", uri.as_link());
@@ -309,10 +309,10 @@ impl ContextPickerCompletionProvider {
             label,
             documentation: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(icon_path.clone()),
+            icon_path: Some(icon_path),
             insert_text_mode: None,
             confirm: Some(confirm_completion_callback(
-                symbol.name.clone().into(),
+                symbol.name.into(),
                 source_range.start,
                 new_text_len - 1,
                 message_editor,
@@ -327,7 +327,7 @@ impl ContextPickerCompletionProvider {
         message_editor: WeakEntity<MessageEditor>,
         cx: &mut App,
     ) -> Option<Completion> {
-        let new_text = format!("@fetch {} ", url_to_fetch.clone());
+        let new_text = format!("@fetch {} ", url_to_fetch);
         let url_to_fetch = url::Url::parse(url_to_fetch.as_ref())
             .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
             .ok()?;
@@ -341,7 +341,7 @@ impl ContextPickerCompletionProvider {
             label: CodeLabel::plain(url_to_fetch.to_string(), None),
             documentation: None,
             source: project::CompletionSource::Custom,
-            icon_path: Some(icon_path.clone()),
+            icon_path: Some(icon_path),
             insert_text_mode: None,
             confirm: Some(confirm_completion_callback(
                 url_to_fetch.to_string().into(),
@@ -365,8 +365,7 @@ impl ContextPickerCompletionProvider {
         };
         match mode {
             Some(ContextPickerMode::File) => {
-                let search_files_task =
-                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+                let search_files_task = search_files(query, cancellation_flag, &workspace, cx);
                 cx.background_spawn(async move {
                     search_files_task
                         .await
@@ -377,8 +376,7 @@ impl ContextPickerCompletionProvider {
             }
 
             Some(ContextPickerMode::Symbol) => {
-                let search_symbols_task =
-                    search_symbols(query.clone(), cancellation_flag.clone(), &workspace, cx);
+                let search_symbols_task = search_symbols(query, cancellation_flag, &workspace, cx);
                 cx.background_spawn(async move {
                     search_symbols_task
                         .await
@@ -389,12 +387,8 @@ impl ContextPickerCompletionProvider {
             }
 
             Some(ContextPickerMode::Thread) => {
-                let search_threads_task = search_threads(
-                    query.clone(),
-                    cancellation_flag.clone(),
-                    &self.history_store,
-                    cx,
-                );
+                let search_threads_task =
+                    search_threads(query, cancellation_flag, &self.history_store, cx);
                 cx.background_spawn(async move {
                     search_threads_task
                         .await
@@ -415,7 +409,7 @@ impl ContextPickerCompletionProvider {
             Some(ContextPickerMode::Rules) => {
                 if let Some(prompt_store) = self.prompt_store.as_ref() {
                     let search_rules_task =
-                        search_rules(query.clone(), cancellation_flag.clone(), prompt_store, cx);
+                        search_rules(query, cancellation_flag, prompt_store, cx);
                     cx.background_spawn(async move {
                         search_rules_task
                             .await
@@ -448,7 +442,7 @@ impl ContextPickerCompletionProvider {
                 let executor = cx.background_executor().clone();
 
                 let search_files_task =
-                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+                    search_files(query.clone(), cancellation_flag, &workspace, cx);
 
                 let entries = self.available_context_picker_entries(&workspace, cx);
                 let entry_candidates = entries
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index c87c824015..b5282bf891 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -260,7 +260,7 @@ impl MessageEditor {
             *excerpt_id,
             start,
             content_len,
-            crease_text.clone(),
+            crease_text,
             mention_uri.icon_path(cx),
             self.editor.clone(),
             window,
@@ -883,7 +883,7 @@ impl MessageEditor {
             .spawn_in(window, {
                 let abs_path = abs_path.clone();
                 async move |_, cx| {
-                    let image = image.await.map_err(|e| e.to_string())?;
+                    let image = image.await?;
                     let format = image.format;
                     let image = cx
                         .update(|_, cx| LanguageModelImage::from_image(image, cx))
@@ -1231,7 +1231,6 @@ fn render_image_fold_icon_button(
     editor: WeakEntity<Editor>,
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
     Arc::new({
-        let image_task = image_task.clone();
         move |fold_id, fold_range, cx| {
             let is_in_text_selection = editor
                 .update(cx, |editor, cx| editor.is_range_selected(&fold_range, cx))
@@ -1408,10 +1407,7 @@ impl MentionSet {
                                 crease_id,
                                 Mention::Text {
                                     uri,
-                                    content: content
-                                        .await
-                                        .map_err(|e| anyhow::anyhow!("{e}"))?
-                                        .to_string(),
+                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
                                 },
                             ))
                         })
@@ -1478,10 +1474,7 @@ impl MentionSet {
                                 crease_id,
                                 Mention::Text {
                                     uri,
-                                    content: content
-                                        .await
-                                        .map_err(|e| anyhow::anyhow!("{e}"))?
-                                        .to_string(),
+                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
                                 },
                             ))
                         })
@@ -1821,7 +1814,7 @@ mod tests {
 
     impl Focusable for MessageEditorItem {
         fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx).clone()
+            self.0.read(cx).focus_handle(cx)
         }
     }
 
@@ -2219,7 +2212,7 @@ mod tests {
         let completions = editor.current_completions().expect("Missing completions");
         completions
             .into_iter()
-            .map(|completion| completion.label.text.to_string())
+            .map(|completion| completion.label.text)
             .collect::<Vec<_>>()
     }
 }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index b93df3a5db..b527775850 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1534,7 +1534,7 @@ impl AcpThreadView {
         window: &Window,
         cx: &Context<Self>,
     ) -> AnyElement {
-        let button_id = SharedString::from(format!("tool_output-{:?}", tool_call_id.clone()));
+        let button_id = SharedString::from(format!("tool_output-{:?}", tool_call_id));
 
         v_flex()
             .mt_1p5()
@@ -1555,9 +1555,8 @@ impl AcpThreadView {
                     .icon_color(Color::Muted)
                     .icon_position(IconPosition::Start)
                     .on_click(cx.listener({
-                        let id = tool_call_id.clone();
                         move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                            this.expanded_tool_calls.remove(&id);
+                            this.expanded_tool_calls.remove(&tool_call_id);
                             cx.notify();
                         }
                     })),
@@ -1578,7 +1577,7 @@ impl AcpThreadView {
             uri.clone()
         };
 
-        let button_id = SharedString::from(format!("item-{}", uri.clone()));
+        let button_id = SharedString::from(format!("item-{}", uri));
 
         div()
             .ml(px(7.))
@@ -1724,7 +1723,7 @@ impl AcpThreadView {
                     && let Some(editor) = entry.editor_for_diff(diff)
                     && diff.read(cx).has_revealed_range(cx)
                 {
-                    editor.clone().into_any_element()
+                    editor.into_any_element()
                 } else if tool_progress {
                     self.render_diff_loading(cx)
                 } else {
@@ -2888,7 +2887,6 @@ impl AcpThreadView {
                                     .icon_size(IconSize::Small)
                                     .icon_color(Color::Muted)
                                     .tooltip({
-                                        let focus_handle = focus_handle.clone();
                                         move |window, cx| {
                                             Tooltip::for_action_in(
                                                 expand_tooltip,
@@ -4372,7 +4370,7 @@ pub(crate) mod tests {
 
     impl Focusable for ThreadViewItem {
         fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx).clone()
+            self.0.read(cx).focus_handle(cx)
         }
     }
 
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 92588cf213..bb5b47f0d6 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -491,7 +491,7 @@ fn render_markdown_code_block(
             .on_click({
                 let active_thread = active_thread.clone();
                 let parsed_markdown = parsed_markdown.clone();
-                let code_block_range = metadata.content_range.clone();
+                let code_block_range = metadata.content_range;
                 move |_event, _window, cx| {
                     active_thread.update(cx, |this, cx| {
                         this.copied_code_block_ids.insert((message_id, ix));
@@ -532,7 +532,6 @@ fn render_markdown_code_block(
                 "Expand Code"
             }))
             .on_click({
-                let active_thread = active_thread.clone();
                 move |_event, _window, cx| {
                     active_thread.update(cx, |this, cx| {
                         this.toggle_codeblock_expanded(message_id, ix);
@@ -916,7 +915,7 @@ impl ActiveThread {
     ) {
         let rendered = self
             .rendered_tool_uses
-            .entry(tool_use_id.clone())
+            .entry(tool_use_id)
             .or_insert_with(|| RenderedToolUse {
                 label: cx.new(|cx| {
                     Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
@@ -1218,7 +1217,7 @@ impl ActiveThread {
         match AgentSettings::get_global(cx).notify_when_agent_waiting {
             NotifyWhenAgentWaiting::PrimaryScreen => {
                 if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title.clone(), window, primary, cx);
+                    self.pop_up(icon, caption.into(), title, window, primary, cx);
                 }
             }
             NotifyWhenAgentWaiting::AllScreens => {
@@ -2112,7 +2111,7 @@ impl ActiveThread {
                                         .gap_1()
                                         .children(message_content)
                                         .when_some(editing_message_state, |this, state| {
-                                            let focus_handle = state.editor.focus_handle(cx).clone();
+                                            let focus_handle = state.editor.focus_handle(cx);
 
                                             this.child(
                                                 h_flex()
@@ -2173,7 +2172,6 @@ impl ActiveThread {
                                                                 .icon_color(Color::Muted)
                                                                 .icon_size(IconSize::Small)
                                                                 .tooltip({
-                                                                    let focus_handle = focus_handle.clone();
                                                                     move |window, cx| {
                                                                         Tooltip::for_action_in(
                                                                             "Regenerate",
@@ -2312,7 +2310,7 @@ impl ActiveThread {
                             .into_any_element()
                     } else if let Some(error) = error {
                         restore_checkpoint_button
-                            .tooltip(Tooltip::text(error.to_string()))
+                            .tooltip(Tooltip::text(error))
                             .into_any_element()
                     } else {
                         restore_checkpoint_button.into_any_element()
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index ecb0bca4a1..6da84758ee 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -165,8 +165,8 @@ impl AgentConfiguration {
         provider: &Arc<dyn LanguageModelProvider>,
         cx: &mut Context<Self>,
     ) -> impl IntoElement + use<> {
-        let provider_id = provider.id().0.clone();
-        let provider_name = provider.name().0.clone();
+        let provider_id = provider.id().0;
+        let provider_name = provider.name().0;
         let provider_id_string = SharedString::from(format!("provider-disclosure-{provider_id}"));
 
         let configuration_view = self
@@ -269,7 +269,7 @@ impl AgentConfiguration {
                                     .closed_icon(IconName::ChevronDown),
                             )
                             .on_click(cx.listener({
-                                let provider_id = provider.id().clone();
+                                let provider_id = provider.id();
                                 move |this, _event, _window, _cx| {
                                     let is_expanded = this
                                         .expanded_provider_configurations
@@ -665,7 +665,7 @@ impl AgentConfiguration {
                     .size(IconSize::XSmall)
                     .color(Color::Accent)
                     .with_animation(
-                        SharedString::from(format!("{}-starting", context_server_id.0.clone(),)),
+                        SharedString::from(format!("{}-starting", context_server_id.0,)),
                         Animation::new(Duration::from_secs(3)).repeat(),
                         |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
                     )
@@ -865,7 +865,6 @@ impl AgentConfiguration {
                                     .on_click({
                                         let context_server_manager =
                                             self.context_server_store.clone();
-                                        let context_server_id = context_server_id.clone();
                                         let fs = self.fs.clone();
 
                                         move |state, _window, cx| {
@@ -1075,7 +1074,6 @@ fn show_unable_to_uninstall_extension_with_context_server(
         cx,
         move |this, _cx| {
             let workspace_handle = workspace_handle.clone();
-            let context_server_id = context_server_id.clone();
 
             this.icon(ToastIcon::new(IconName::Warning).color(Color::Warning))
                 .dismiss_button(true)
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index 6159b9be80..c898a5acb5 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -261,7 +261,6 @@ impl ConfigureContextServerModal {
         _cx: &mut Context<Workspace>,
     ) {
         workspace.register_action({
-            let language_registry = language_registry.clone();
             move |_workspace, _: &AddContextServer, window, cx| {
                 let workspace_handle = cx.weak_entity();
                 let language_registry = language_registry.clone();
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
index 09ad013d1c..7fcf76d1cb 100644
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -464,7 +464,7 @@ impl ManageProfilesModal {
                 },
             ))
             .child(ListSeparator)
-            .child(h_flex().p_2().child(mode.name_editor.clone()))
+            .child(h_flex().p_2().child(mode.name_editor))
     }
 
     fn render_view_profile(
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 61a3ddd906..e07424987c 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -185,7 +185,7 @@ impl AgentDiffPane {
         let focus_handle = cx.focus_handle();
         let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
 
-        let project = thread.project(cx).clone();
+        let project = thread.project(cx);
         let editor = cx.new(|cx| {
             let mut editor =
                 Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
@@ -196,7 +196,7 @@ impl AgentDiffPane {
             editor
         });
 
-        let action_log = thread.action_log(cx).clone();
+        let action_log = thread.action_log(cx);
 
         let mut this = Self {
             _subscriptions: vec![
@@ -1312,7 +1312,7 @@ impl AgentDiff {
                 let entity = cx.new(|_cx| Self::default());
                 let global = AgentDiffGlobal(entity.clone());
                 cx.set_global(global);
-                entity.clone()
+                entity
             })
     }
 
@@ -1334,7 +1334,7 @@ impl AgentDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let action_log = thread.action_log(cx).clone();
+        let action_log = thread.action_log(cx);
 
         let action_log_subscription = cx.observe_in(&action_log, window, {
             let workspace = workspace.clone();
@@ -1544,7 +1544,7 @@ impl AgentDiff {
             && let Some(editor) = item.downcast::<Editor>()
             && let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx)
         {
-            self.register_editor(workspace.downgrade(), buffer.clone(), editor, window, cx);
+            self.register_editor(workspace.downgrade(), buffer, editor, window, cx);
         }
     }
 
diff --git a/crates/agent_ui/src/agent_model_selector.rs b/crates/agent_ui/src/agent_model_selector.rs
index b989e7bf1e..3de1027d91 100644
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -66,10 +66,8 @@ impl AgentModelSelector {
                                     fs.clone(),
                                     cx,
                                     move |settings, _cx| {
-                                        settings.set_inline_assistant_model(
-                                            provider.clone(),
-                                            model_id.clone(),
-                                        );
+                                        settings
+                                            .set_inline_assistant_model(provider.clone(), model_id);
                                     },
                                 );
                             }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index b857052d69..3c4c403a77 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -956,7 +956,7 @@ impl AgentPanel {
 
         message_editor.focus_handle(cx).focus(window);
 
-        let thread_view = ActiveView::thread(active_thread.clone(), message_editor, window, cx);
+        let thread_view = ActiveView::thread(active_thread, message_editor, window, cx);
         self.set_active_view(thread_view, window, cx);
 
         AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
@@ -1163,7 +1163,7 @@ impl AgentPanel {
         });
         self.set_active_view(
             ActiveView::prompt_editor(
-                editor.clone(),
+                editor,
                 self.history_store.clone(),
                 self.acp_history_store.clone(),
                 self.language_registry.clone(),
@@ -1236,7 +1236,7 @@ impl AgentPanel {
         });
         message_editor.focus_handle(cx).focus(window);
 
-        let thread_view = ActiveView::thread(active_thread.clone(), message_editor, window, cx);
+        let thread_view = ActiveView::thread(active_thread, message_editor, window, cx);
         self.set_active_view(thread_view, window, cx);
         AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
     }
@@ -1525,7 +1525,7 @@ impl AgentPanel {
             return;
         }
 
-        let model = thread_state.configured_model().map(|cm| cm.model.clone());
+        let model = thread_state.configured_model().map(|cm| cm.model);
         if let Some(model) = model {
             thread.update(cx, |active_thread, cx| {
                 active_thread.thread().update(cx, |thread, cx| {
@@ -1680,7 +1680,7 @@ impl AgentPanel {
                                     .open_thread_by_id(&id, window, cx)
                                     .detach_and_log_err(cx),
                                 HistoryEntryId::Context(path) => this
-                                    .open_saved_prompt_editor(path.clone(), window, cx)
+                                    .open_saved_prompt_editor(path, window, cx)
                                     .detach_and_log_err(cx),
                             })
                             .ok();
@@ -1966,7 +1966,7 @@ impl AgentPanel {
                 };
 
                 match state {
-                    ThreadSummary::Pending => Label::new(ThreadSummary::DEFAULT.clone())
+                    ThreadSummary::Pending => Label::new(ThreadSummary::DEFAULT)
                         .truncate()
                         .into_any_element(),
                     ThreadSummary::Generating => Label::new(LOADING_SUMMARY_PLACEHOLDER)
@@ -2106,7 +2106,6 @@ impl AgentPanel {
             .anchor(Corner::TopRight)
             .with_handle(self.agent_panel_menu_handle.clone())
             .menu({
-                let focus_handle = focus_handle.clone();
                 move |window, cx| {
                     Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
                         menu = menu.context(focus_handle.clone());
@@ -2184,7 +2183,6 @@ impl AgentPanel {
             .trigger_with_tooltip(
                 IconButton::new("agent-nav-menu", icon).icon_size(IconSize::Small),
                 {
-                    let focus_handle = focus_handle.clone();
                     move |window, cx| {
                         Tooltip::for_action_in(
                             "Toggle Recent Threads",
@@ -2222,8 +2220,6 @@ impl AgentPanel {
                 this.go_back(&workspace::GoBack, window, cx);
             }))
             .tooltip({
-                let focus_handle = focus_handle.clone();
-
                 move |window, cx| {
                     Tooltip::for_action_in("Go Back", &workspace::GoBack, &focus_handle, window, cx)
                 }
@@ -2249,7 +2245,6 @@ impl AgentPanel {
             .anchor(Corner::TopRight)
             .with_handle(self.new_thread_menu_handle.clone())
             .menu({
-                let focus_handle = focus_handle.clone();
                 move |window, cx| {
                     let active_thread = active_thread.clone();
                     Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
@@ -2377,7 +2372,6 @@ impl AgentPanel {
             .anchor(Corner::TopLeft)
             .with_handle(self.new_thread_menu_handle.clone())
             .menu({
-                let focus_handle = focus_handle.clone();
                 let workspace = self.workspace.clone();
 
                 move |window, cx| {
@@ -3015,7 +3009,7 @@ impl AgentPanel {
                                     // TODO: Add keyboard navigation.
                                     let is_hovered =
                                         self.hovered_recent_history_item == Some(index);
-                                    HistoryEntryElement::new(entry.clone(), cx.entity().downgrade())
+                                    HistoryEntryElement::new(entry, cx.entity().downgrade())
                                         .hovered(is_hovered)
                                         .on_hover(cx.listener(
                                             move |this, is_hovered, _window, cx| {
@@ -3339,7 +3333,7 @@ impl AgentPanel {
             .severity(Severity::Error)
             .icon(IconName::XCircle)
             .title(header)
-            .description(message.clone())
+            .description(message)
             .actions_slot(
                 h_flex()
                     .gap_0p5()
@@ -3359,7 +3353,7 @@ impl AgentPanel {
         Callout::new()
             .severity(Severity::Error)
             .title("Error")
-            .description(message.clone())
+            .description(message)
             .actions_slot(
                 h_flex()
                     .gap_0p5()
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index a1dbc77084..01a248994d 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -240,12 +240,7 @@ pub fn init(
         client.telemetry().clone(),
         cx,
     );
-    terminal_inline_assistant::init(
-        fs.clone(),
-        prompt_builder.clone(),
-        client.telemetry().clone(),
-        cx,
-    );
+    terminal_inline_assistant::init(fs.clone(), prompt_builder, client.telemetry().clone(), cx);
     cx.observe_new(move |workspace, window, cx| {
         ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
     })
@@ -391,7 +386,6 @@ fn register_slash_commands(cx: &mut App) {
     slash_command_registry.register_command(assistant_slash_commands::FetchSlashCommand, true);
 
     cx.observe_flag::<assistant_slash_commands::StreamingExampleSlashCommandFeatureFlag, _>({
-        let slash_command_registry = slash_command_registry.clone();
         move |is_enabled, _cx| {
             if is_enabled {
                 slash_command_registry.register_command(
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index ff5e9362dd..04eb41793f 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1129,7 +1129,7 @@ mod tests {
             )
         });
 
-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let chunks_tx = simulate_response_stream(&codegen, cx);
 
         let mut new_text = concat!(
             "       let mut x = 0;\n",
@@ -1196,7 +1196,7 @@ mod tests {
             )
         });
 
-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let chunks_tx = simulate_response_stream(&codegen, cx);
 
         cx.background_executor.run_until_parked();
 
@@ -1265,7 +1265,7 @@ mod tests {
             )
         });
 
-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let chunks_tx = simulate_response_stream(&codegen, cx);
 
         cx.background_executor.run_until_parked();
 
@@ -1334,7 +1334,7 @@ mod tests {
             )
         });
 
-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let chunks_tx = simulate_response_stream(&codegen, cx);
         let new_text = concat!(
             "func main() {\n",
             "\tx := 0\n",
@@ -1391,7 +1391,7 @@ mod tests {
             )
         });
 
-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let chunks_tx = simulate_response_stream(&codegen, cx);
         chunks_tx
             .unbounded_send("let mut x = 0;\nx += 1;".to_string())
             .unwrap();
@@ -1473,7 +1473,7 @@ mod tests {
     }
 
     fn simulate_response_stream(
-        codegen: Entity<CodegenAlternative>,
+        codegen: &Entity<CodegenAlternative>,
         cx: &mut TestAppContext,
     ) -> mpsc::UnboundedSender<String> {
         let (chunks_tx, chunks_rx) = mpsc::unbounded();
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 0b4568dc87..405b5ed90b 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -818,13 +818,8 @@ pub fn crease_for_mention(
 
     let render_trailer = move |_row, _unfold, _window: &mut Window, _cx: &mut App| Empty.into_any();
 
-    Crease::inline(
-        range,
-        placeholder.clone(),
-        fold_toggle("mention"),
-        render_trailer,
-    )
-    .with_metadata(CreaseMetadata { icon_path, label })
+    Crease::inline(range, placeholder, fold_toggle("mention"), render_trailer)
+        .with_metadata(CreaseMetadata { icon_path, label })
 }
 
 fn render_fold_icon_button(
diff --git a/crates/agent_ui/src/context_picker/completion_provider.rs b/crates/agent_ui/src/context_picker/completion_provider.rs
index 747ec46e0a..020d799c79 100644
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -79,8 +79,7 @@ fn search(
 ) -> Task<Vec<Match>> {
     match mode {
         Some(ContextPickerMode::File) => {
-            let search_files_task =
-                search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+            let search_files_task = search_files(query, cancellation_flag, &workspace, cx);
             cx.background_spawn(async move {
                 search_files_task
                     .await
@@ -91,8 +90,7 @@ fn search(
         }
 
         Some(ContextPickerMode::Symbol) => {
-            let search_symbols_task =
-                search_symbols(query.clone(), cancellation_flag.clone(), &workspace, cx);
+            let search_symbols_task = search_symbols(query, cancellation_flag, &workspace, cx);
             cx.background_spawn(async move {
                 search_symbols_task
                     .await
@@ -108,13 +106,8 @@ fn search(
                 .and_then(|t| t.upgrade())
                 .zip(text_thread_context_store.as_ref().and_then(|t| t.upgrade()))
             {
-                let search_threads_task = search_threads(
-                    query.clone(),
-                    cancellation_flag.clone(),
-                    thread_store,
-                    context_store,
-                    cx,
-                );
+                let search_threads_task =
+                    search_threads(query, cancellation_flag, thread_store, context_store, cx);
                 cx.background_spawn(async move {
                     search_threads_task
                         .await
@@ -137,8 +130,7 @@ fn search(
 
         Some(ContextPickerMode::Rules) => {
             if let Some(prompt_store) = prompt_store.as_ref() {
-                let search_rules_task =
-                    search_rules(query.clone(), cancellation_flag.clone(), prompt_store, cx);
+                let search_rules_task = search_rules(query, cancellation_flag, prompt_store, cx);
                 cx.background_spawn(async move {
                     search_rules_task
                         .await
@@ -196,7 +188,7 @@ fn search(
                 let executor = cx.background_executor().clone();
 
                 let search_files_task =
-                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);
+                    search_files(query.clone(), cancellation_flag, &workspace, cx);
 
                 let entries =
                     available_context_picker_entries(&prompt_store, &thread_store, &workspace, cx);
@@ -283,7 +275,7 @@ impl ContextPickerCompletionProvider {
     ) -> Option<Completion> {
         match entry {
             ContextPickerEntry::Mode(mode) => Some(Completion {
-                replace_range: source_range.clone(),
+                replace_range: source_range,
                 new_text: format!("@{} ", mode.keyword()),
                 label: CodeLabel::plain(mode.label().to_string(), None),
                 icon_path: Some(mode.icon().path().into()),
@@ -330,9 +322,6 @@ impl ContextPickerCompletionProvider {
                         );
 
                         let callback = Arc::new({
-                            let context_store = context_store.clone();
-                            let selections = selections.clone();
-                            let selection_infos = selection_infos.clone();
                             move |_, window: &mut Window, cx: &mut App| {
                                 context_store.update(cx, |context_store, cx| {
                                     for (buffer, range) in &selections {
@@ -441,7 +430,7 @@ impl ContextPickerCompletionProvider {
                 excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
+                editor,
                 context_store.clone(),
                 move |window, cx| match &thread_entry {
                     ThreadContextEntry::Thread { id, .. } => {
@@ -510,7 +499,7 @@ impl ContextPickerCompletionProvider {
                 excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
+                editor,
                 context_store.clone(),
                 move |_, cx| {
                     let user_prompt_id = rules.prompt_id;
@@ -547,7 +536,7 @@ impl ContextPickerCompletionProvider {
                 excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
+                editor,
                 context_store.clone(),
                 move |_, cx| {
                     let context_store = context_store.clone();
@@ -704,16 +693,16 @@ impl ContextPickerCompletionProvider {
                 excerpt_id,
                 source_range.start,
                 new_text_len - 1,
-                editor.clone(),
+                editor,
                 context_store.clone(),
                 move |_, cx| {
                     let symbol = symbol.clone();
                     let context_store = context_store.clone();
                     let workspace = workspace.clone();
                     let result = super::symbol_context_picker::add_symbol(
-                        symbol.clone(),
+                        symbol,
                         false,
-                        workspace.clone(),
+                        workspace,
                         context_store.downgrade(),
                         cx,
                     );
@@ -1162,7 +1151,7 @@ mod tests {
 
     impl Focusable for AtMentionEditor {
         fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx).clone()
+            self.0.read(cx).focus_handle(cx)
         }
     }
 
@@ -1480,7 +1469,7 @@ mod tests {
         let completions = editor.current_completions().expect("Missing completions");
         completions
             .into_iter()
-            .map(|completion| completion.label.text.to_string())
+            .map(|completion| completion.label.text)
             .collect::<Vec<_>>()
     }
 
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 90302236fb..2111553340 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1693,7 +1693,7 @@ impl InlineAssist {
             }),
             range,
             codegen: codegen.clone(),
-            workspace: workspace.clone(),
+            workspace,
             _subscriptions: vec![
                 window.on_focus_in(&prompt_editor_focus_handle, cx, move |_, cx| {
                     InlineAssistant::update_global(cx, |this, cx| {
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 845540979a..3633e533da 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -93,7 +93,7 @@ impl LanguageModelPickerDelegate {
         let entries = models.entries();
 
         Self {
-            on_model_changed: on_model_changed.clone(),
+            on_model_changed,
             all_models: Arc::new(models),
             selected_index: Self::get_active_model_index(&entries, get_active_model(cx)),
             filtered_entries: entries,
@@ -514,7 +514,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
                                 .pl_0p5()
                                 .gap_1p5()
                                 .w(px(240.))
-                                .child(Label::new(model_info.model.name().0.clone()).truncate()),
+                                .child(Label::new(model_info.model.name().0).truncate()),
                         )
                         .end_slot(div().pr_3().when(is_selected, |this| {
                             this.child(
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index f70d10c1ae..fdbce14415 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -248,7 +248,7 @@ impl MessageEditor {
             editor: editor.clone(),
             project: thread.read(cx).project().clone(),
             thread,
-            incompatible_tools_state: incompatible_tools.clone(),
+            incompatible_tools_state: incompatible_tools,
             workspace,
             context_store,
             prompt_store,
@@ -839,7 +839,6 @@ impl MessageEditor {
                                     .child(self.profile_selector.clone())
                                     .child(self.model_selector.clone())
                                     .map({
-                                        let focus_handle = focus_handle.clone();
                                         move |parent| {
                                             if is_generating {
                                                 parent
@@ -1801,7 +1800,7 @@ impl AgentPreview for MessageEditor {
                             .bg(cx.theme().colors().panel_background)
                             .border_1()
                             .border_color(cx.theme().colors().border)
-                            .child(default_message_editor.clone())
+                            .child(default_message_editor)
                             .into_any_element(),
                     )])
                     .into_any_element(),
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index ce25f531e2..f0f53b96b2 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -137,12 +137,11 @@ impl ProfileSelector {
         entry.handler({
             let fs = self.fs.clone();
             let provider = self.provider.clone();
-            let profile_id = profile_id.clone();
             move |_window, cx| {
                 update_settings_file::<AgentSettings>(fs.clone(), cx, {
                     let profile_id = profile_id.clone();
                     move |settings, _cx| {
-                        settings.set_profile(profile_id.clone());
+                        settings.set_profile(profile_id);
                     }
                 });
 
@@ -175,7 +174,6 @@ impl Render for ProfileSelector {
 
             PopoverMenu::new("profile-selector")
                 .trigger_with_tooltip(trigger_button, {
-                    let focus_handle = focus_handle.clone();
                     move |window, cx| {
                         Tooltip::for_action_in(
                             "Toggle Profile Menu",
diff --git a/crates/agent_ui/src/slash_command.rs b/crates/agent_ui/src/slash_command.rs
index 6b37c5a2d7..87e5d45fe8 100644
--- a/crates/agent_ui/src/slash_command.rs
+++ b/crates/agent_ui/src/slash_command.rs
@@ -88,8 +88,6 @@ impl SlashCommandCompletionProvider {
                                 .map(|(editor, workspace)| {
                                     let command_name = mat.string.clone();
                                     let command_range = command_range.clone();
-                                    let editor = editor.clone();
-                                    let workspace = workspace.clone();
                                     Arc::new(
                                             move |intent: CompletionIntent,
                                             window: &mut Window,
@@ -158,7 +156,7 @@ impl SlashCommandCompletionProvider {
         if let Some(command) = self.slash_commands.command(command_name, cx) {
             let completions = command.complete_argument(
                 arguments,
-                new_cancel_flag.clone(),
+                new_cancel_flag,
                 self.workspace.clone(),
                 window,
                 cx,
diff --git a/crates/agent_ui/src/terminal_inline_assistant.rs b/crates/agent_ui/src/terminal_inline_assistant.rs
index 3859863ebe..e7070c0d7f 100644
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -432,7 +432,7 @@ impl TerminalInlineAssist {
             terminal: terminal.downgrade(),
             prompt_editor: Some(prompt_editor.clone()),
             codegen: codegen.clone(),
-            workspace: workspace.clone(),
+            workspace,
             context_store,
             prompt_store,
             _subscriptions: vec![
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index b3f55ffc43..a928f7af54 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1739,7 +1739,7 @@ impl TextThreadEditor {
                                 render_slash_command_output_toggle,
                                 |_, _, _, _| Empty.into_any(),
                             )
-                            .with_metadata(metadata.crease.clone())
+                            .with_metadata(metadata.crease)
                         }),
                         cx,
                     );
@@ -1810,7 +1810,7 @@ impl TextThreadEditor {
                 .filter_map(|(anchor, render_image)| {
                     const MAX_HEIGHT_IN_LINES: u32 = 8;
                     let anchor = buffer.anchor_in_excerpt(excerpt_id, anchor).unwrap();
-                    let image = render_image.clone();
+                    let image = render_image;
                     anchor.is_valid(&buffer).then(|| BlockProperties {
                         placement: BlockPlacement::Above(anchor),
                         height: Some(MAX_HEIGHT_IN_LINES),
@@ -1873,7 +1873,7 @@ impl TextThreadEditor {
     }
 
     fn render_send_button(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx).clone();
+        let focus_handle = self.focus_handle(cx);
 
         let (style, tooltip) = match token_state(&self.context, cx) {
             Some(TokenState::NoTokensLeft { .. }) => (
@@ -2015,7 +2015,7 @@ impl TextThreadEditor {
             None => IconName::Ai,
         };
 
-        let focus_handle = self.editor().focus_handle(cx).clone();
+        let focus_handle = self.editor().focus_handle(cx);
 
         PickerPopoverMenu::new(
             self.language_model_selector.clone(),
diff --git a/crates/agent_ui/src/ui/context_pill.rs b/crates/agent_ui/src/ui/context_pill.rs
index 4e33e151cd..7c7fbd27f0 100644
--- a/crates/agent_ui/src/ui/context_pill.rs
+++ b/crates/agent_ui/src/ui/context_pill.rs
@@ -499,7 +499,7 @@ impl AddedContext {
                 let thread = handle.thread.clone();
                 Some(Rc::new(move |_, cx| {
                     let text = thread.read(cx).latest_detailed_summary_or_text();
-                    ContextPillHover::new_text(text.clone(), cx).into()
+                    ContextPillHover::new_text(text, cx).into()
                 }))
             },
             handle: AgentContextHandle::Thread(handle),
@@ -574,7 +574,7 @@ impl AddedContext {
             .unwrap_or_else(|| "Unnamed Rule".into());
         Some(AddedContext {
             kind: ContextKind::Rules,
-            name: title.clone(),
+            name: title,
             parent: None,
             tooltip: None,
             icon_path: None,
diff --git a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
index 0a34a29068..fadc4222ae 100644
--- a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
+++ b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
@@ -33,7 +33,7 @@ impl ApiKeysWithProviders {
             .filter(|provider| {
                 provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
             })
-            .map(|provider| (provider.icon(), provider.name().0.clone()))
+            .map(|provider| (provider.icon(), provider.name().0))
             .collect()
     }
 }
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
index 23810b74f3..1a44fa3c17 100644
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -50,7 +50,7 @@ impl AgentPanelOnboarding {
             .filter(|provider| {
                 provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
             })
-            .map(|provider| (provider.icon(), provider.name().0.clone()))
+            .map(|provider| (provider.icon(), provider.name().0))
             .collect()
     }
 }
diff --git a/crates/assistant_context/src/assistant_context.rs b/crates/assistant_context/src/assistant_context.rs
index 4d0bfae444..12eda0954a 100644
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -2282,7 +2282,7 @@ impl AssistantContext {
         let mut contents = self.contents(cx).peekable();
 
         fn collect_text_content(buffer: &Buffer, range: Range<usize>) -> Option<String> {
-            let text: String = buffer.text_for_range(range.clone()).collect();
+            let text: String = buffer.text_for_range(range).collect();
             if text.trim().is_empty() {
                 None
             } else {
diff --git a/crates/assistant_context/src/assistant_context_tests.rs b/crates/assistant_context/src/assistant_context_tests.rs
index 3db4a33b19..61d748cbdd 100644
--- a/crates/assistant_context/src/assistant_context_tests.rs
+++ b/crates/assistant_context/src/assistant_context_tests.rs
@@ -1321,7 +1321,7 @@ fn test_summarize_error(
 fn setup_context_editor_with_fake_model(
     cx: &mut TestAppContext,
 ) -> (Entity<AssistantContext>, Arc<FakeLanguageModel>) {
-    let registry = Arc::new(LanguageRegistry::test(cx.executor().clone()));
+    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
 
     let fake_provider = Arc::new(FakeLanguageModelProvider::default());
     let fake_model = Arc::new(fake_provider.test_model());
@@ -1376,7 +1376,7 @@ fn messages_cache(
     context
         .read(cx)
         .messages(cx)
-        .map(|message| (message.id, message.cache.clone()))
+        .map(|message| (message.id, message.cache))
         .collect()
 }
 
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index 6d13531a57..6960d9db79 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -862,7 +862,7 @@ impl ContextStore {
                     ContextServerStatus::Running => {
                         self.load_context_server_slash_commands(
                             server_id.clone(),
-                            context_server_store.clone(),
+                            context_server_store,
                             cx,
                         );
                     }
diff --git a/crates/assistant_slash_commands/src/diagnostics_command.rs b/crates/assistant_slash_commands/src/diagnostics_command.rs
index 10f950c866..8b1dbd515c 100644
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -44,7 +44,7 @@ impl DiagnosticsSlashCommand {
                         score: 0.,
                         positions: Vec::new(),
                         worktree_id: entry.worktree_id.to_usize(),
-                        path: entry.path.clone(),
+                        path: entry.path,
                         path_prefix: path_prefix.clone(),
                         is_dir: false, // Diagnostics can't be produced for directories
                         distance_to_relative_ancestor: 0,
diff --git a/crates/assistant_slash_commands/src/prompt_command.rs b/crates/assistant_slash_commands/src/prompt_command.rs
index 27029ac156..bbd6d3e3ad 100644
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -80,7 +80,7 @@ impl SlashCommand for PromptSlashCommand {
         };
 
         let store = PromptStore::global(cx);
-        let title = SharedString::from(title.clone());
+        let title = SharedString::from(title);
         let prompt = cx.spawn({
             let title = title.clone();
             async move |cx| {
diff --git a/crates/assistant_tools/src/edit_agent/evals.rs b/crates/assistant_tools/src/edit_agent/evals.rs
index ea2fa02663..4f182b3148 100644
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1153,8 +1153,7 @@ impl EvalInput {
             .expect("Conversation must end with an edit_file tool use")
             .clone();
 
-        let edit_file_input: EditFileToolInput =
-            serde_json::from_value(tool_use.input.clone()).unwrap();
+        let edit_file_input: EditFileToolInput = serde_json::from_value(tool_use.input).unwrap();
 
         EvalInput {
             conversation,
@@ -1460,7 +1459,7 @@ impl EditAgentTest {
     async fn new(cx: &mut TestAppContext) -> Self {
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
         cx.update(|cx| {
             settings::init(cx);
             gpui_tokio::init(cx);
@@ -1475,7 +1474,7 @@ impl EditAgentTest {
             Project::init_settings(cx);
             language::init(cx);
             language_model::init(client.clone(), cx);
-            language_models::init(user_store.clone(), client.clone(), cx);
+            language_models::init(user_store, client.clone(), cx);
             crate::init(client.http_client(), cx);
         });
 
diff --git a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
index 092bdce8b3..2dba8a2b6d 100644
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -319,7 +319,7 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        let mut finder = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut finder = StreamingFuzzyMatcher::new(snapshot);
         assert_eq!(push(&mut finder, ""), None);
         assert_eq!(finish(finder), None);
     }
@@ -333,7 +333,7 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        let mut finder = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut finder = StreamingFuzzyMatcher::new(snapshot);
 
         // Push partial query
         assert_eq!(push(&mut finder, "This"), None);
@@ -365,7 +365,7 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        let mut finder = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut finder = StreamingFuzzyMatcher::new(snapshot);
 
         // Push a fuzzy query that should match the first function
         assert_eq!(
@@ -391,7 +391,7 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        let mut finder = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut finder = StreamingFuzzyMatcher::new(snapshot);
 
         // No match initially
         assert_eq!(push(&mut finder, "Lin"), None);
@@ -420,7 +420,7 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        let mut finder = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut finder = StreamingFuzzyMatcher::new(snapshot);
 
         // Push text in small chunks across line boundaries
         assert_eq!(push(&mut finder, "jumps "), None); // No newline yet
@@ -458,7 +458,7 @@ mod tests {
         );
         let snapshot = buffer.snapshot();
 
-        let mut finder = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut finder = StreamingFuzzyMatcher::new(snapshot);
 
         assert_eq!(
             push(&mut finder, "impl Debug for User {\n"),
@@ -711,7 +711,7 @@ mod tests {
             "Expected to match `second_function` based on the line hint"
         );
 
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut matcher = StreamingFuzzyMatcher::new(snapshot);
         matcher.push(query, None);
         matcher.finish();
         let best_match = matcher.select_best_match();
@@ -727,7 +727,7 @@ mod tests {
         let buffer = TextBuffer::new(0, BufferId::new(1).unwrap(), text.clone());
         let snapshot = buffer.snapshot();
 
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
+        let mut matcher = StreamingFuzzyMatcher::new(snapshot);
 
         // Split query into random chunks
         let chunks = to_random_chunks(rng, query);
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index 33d08b4f88..95b01c40eb 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -376,7 +376,7 @@ impl Tool for EditFileTool {
 
             let output = EditFileToolOutput {
                 original_path: project_path.path.to_path_buf(),
-                new_text: new_text.clone(),
+                new_text,
                 old_text,
                 raw_output: Some(agent_output),
             };
@@ -643,7 +643,7 @@ impl EditFileToolCard {
             diff
         });
 
-        self.buffer = Some(buffer.clone());
+        self.buffer = Some(buffer);
         self.base_text = Some(base_text.into());
         self.buffer_diff = Some(buffer_diff.clone());
 
@@ -776,7 +776,6 @@ impl EditFileToolCard {
 
         let buffer_diff = cx.spawn({
             let buffer = buffer.clone();
-            let language_registry = language_registry.clone();
             async move |_this, cx| {
                 build_buffer_diff(base_text, &buffer, &language_registry, cx).await
             }
@@ -863,7 +862,6 @@ impl ToolCard for EditFileToolCard {
             )
             .on_click({
                 let path = self.path.clone();
-                let workspace = workspace.clone();
                 move |_, window, cx| {
                     workspace
                         .update(cx, {
diff --git a/crates/assistant_tools/src/grep_tool.rs b/crates/assistant_tools/src/grep_tool.rs
index 1dd74b99e7..41dde5bbfe 100644
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -327,7 +327,7 @@ mod tests {
         init_test(cx);
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/root"),
             serde_json::json!({
@@ -415,7 +415,7 @@ mod tests {
         init_test(cx);
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/root"),
             serde_json::json!({
@@ -494,7 +494,7 @@ mod tests {
         init_test(cx);
         cx.executor().allow_parking();
 
-        let fs = FakeFs::new(cx.executor().clone());
+        let fs = FakeFs::new(cx.executor());
 
         // Create test file with syntax structures
         fs.insert_tree(
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index 358d62ee1a..b28e55e78a 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -350,7 +350,7 @@ fn process_content(
             if is_empty {
                 "Command executed successfully.".to_string()
             } else {
-                content.to_string()
+                content
             }
         }
         Some(exit_status) => {
diff --git a/crates/assistant_tools/src/ui/tool_call_card_header.rs b/crates/assistant_tools/src/ui/tool_call_card_header.rs
index b71453373f..b41f19432f 100644
--- a/crates/assistant_tools/src/ui/tool_call_card_header.rs
+++ b/crates/assistant_tools/src/ui/tool_call_card_header.rs
@@ -101,14 +101,11 @@ impl RenderOnce for ToolCallCardHeader {
                     })
                     .when_some(secondary_text, |this, secondary_text| {
                         this.child(bullet_divider())
-                            .child(div().text_size(font_size).child(secondary_text.clone()))
+                            .child(div().text_size(font_size).child(secondary_text))
                     })
                     .when_some(code_path, |this, code_path| {
-                        this.child(bullet_divider()).child(
-                            Label::new(code_path.clone())
-                                .size(LabelSize::Small)
-                                .inline_code(cx),
-                        )
+                        this.child(bullet_divider())
+                            .child(Label::new(code_path).size(LabelSize::Small).inline_code(cx))
                     })
                     .with_animation(
                         "loading-label",
diff --git a/crates/assistant_tools/src/web_search_tool.rs b/crates/assistant_tools/src/web_search_tool.rs
index 47a6958b7a..dbcca0a1f6 100644
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -193,10 +193,7 @@ impl ToolCard for WebSearchToolCard {
                                     )
                                 }
                             })
-                            .on_click({
-                                let url = url.clone();
-                                move |_, _, cx| cx.open_url(&url)
-                            })
+                            .on_click(move |_, _, cx| cx.open_url(&url))
                     }))
                     .into_any(),
             ),
diff --git a/crates/auto_update_ui/src/auto_update_ui.rs b/crates/auto_update_ui/src/auto_update_ui.rs
index 63baef1f7d..7063dffd6d 100644
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -114,7 +114,7 @@ fn view_release_notes_locally(
                                     cx,
                                 );
                             workspace.add_item_to_active_pane(
-                                Box::new(markdown_preview.clone()),
+                                Box::new(markdown_preview),
                                 None,
                                 true,
                                 window,
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index 6b38fe5576..6a9ca026e7 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -175,12 +175,8 @@ impl BufferDiffSnapshot {
         if let Some(text) = &base_text {
             let base_text_rope = Rope::from(text.as_str());
             base_text_pair = Some((text.clone(), base_text_rope.clone()));
-            let snapshot = language::Buffer::build_snapshot(
-                base_text_rope,
-                language.clone(),
-                language_registry.clone(),
-                cx,
-            );
+            let snapshot =
+                language::Buffer::build_snapshot(base_text_rope, language, language_registry, cx);
             base_text_snapshot = cx.background_spawn(snapshot);
             base_text_exists = true;
         } else {
@@ -957,7 +953,7 @@ impl BufferDiff {
             .buffer_range
             .start;
         let end = self
-            .hunks_intersecting_range_rev(range.clone(), buffer)
+            .hunks_intersecting_range_rev(range, buffer)
             .next()?
             .buffer_range
             .end;
@@ -1441,7 +1437,7 @@ mod tests {
         .unindent();
 
         let buffer = Buffer::new(0, BufferId::new(1).unwrap(), buffer_text);
-        let unstaged_diff = BufferDiffSnapshot::new_sync(buffer.clone(), index_text.clone(), cx);
+        let unstaged_diff = BufferDiffSnapshot::new_sync(buffer.clone(), index_text, cx);
         let mut uncommitted_diff =
             BufferDiffSnapshot::new_sync(buffer.clone(), head_text.clone(), cx);
         uncommitted_diff.secondary_diff = Some(Box::new(unstaged_diff));
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
index c92226eeeb..2a91433084 100644
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -438,7 +438,7 @@ fn init_test(cx: &mut App) -> Entity<ChannelStore> {
 
     let clock = Arc::new(FakeSystemClock::new());
     let http = FakeHttpClient::with_404_response();
-    let client = Client::new(clock, http.clone(), cx);
+    let client = Client::new(clock, http, cx);
     let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
 
     client::init(&client, cx);
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 925d5ddefb..b84e7a9f7a 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -926,7 +926,7 @@ mod mac_os {
 
         fn path(&self) -> PathBuf {
             match self {
-                Bundle::App { app_bundle, .. } => app_bundle.join("Contents/MacOS/zed").clone(),
+                Bundle::App { app_bundle, .. } => app_bundle.join("Contents/MacOS/zed"),
                 Bundle::LocalPath { executable, .. } => executable.clone(),
             }
         }
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 058a12417a..b6ce9d24e9 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -181,7 +181,7 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
     });
 
     cx.on_action({
-        let client = client.clone();
+        let client = client;
         move |_: &Reconnect, cx| {
             if let Some(client) = client.upgrade() {
                 cx.spawn(async move |cx| {
@@ -791,7 +791,7 @@ impl Client {
             Arc::new(move |subscriber, envelope, client, cx| {
                 let subscriber = subscriber.downcast::<E>().unwrap();
                 let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                handler(subscriber, *envelope, client.clone(), cx).boxed_local()
+                handler(subscriber, *envelope, client, cx).boxed_local()
             }),
         );
         if prev_handler.is_some() {
@@ -2048,10 +2048,7 @@ mod tests {
         assert_eq!(*auth_count.lock(), 1);
         assert_eq!(*dropped_auth_count.lock(), 0);
 
-        let _authenticate = cx.spawn({
-            let client = client.clone();
-            |cx| async move { client.connect(false, &cx).await }
-        });
+        let _authenticate = cx.spawn(|cx| async move { client.connect(false, &cx).await });
         executor.run_until_parked();
         assert_eq!(*auth_count.lock(), 2);
         assert_eq!(*dropped_auth_count.lock(), 1);
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 54b3d3f801..f3142a0af6 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -739,7 +739,7 @@ mod tests {
         );
 
         // Third scan of worktree does not double report, as we already reported
-        test_project_discovery_helper(telemetry.clone(), vec!["package.json"], None, worktree_id);
+        test_project_discovery_helper(telemetry, vec!["package.json"], None, worktree_id);
     }
 
     #[gpui::test]
@@ -751,7 +751,7 @@ mod tests {
         let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
 
         test_project_discovery_helper(
-            telemetry.clone(),
+            telemetry,
             vec!["package.json", "pnpm-lock.yaml"],
             Some(vec!["node", "pnpm"]),
             1,
@@ -767,7 +767,7 @@ mod tests {
         let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
 
         test_project_discovery_helper(
-            telemetry.clone(),
+            telemetry,
             vec!["package.json", "yarn.lock"],
             Some(vec!["node", "yarn"]),
             1,
@@ -786,7 +786,7 @@ mod tests {
         // project type for the same worktree multiple times
 
         test_project_discovery_helper(
-            telemetry.clone().clone(),
+            telemetry.clone(),
             vec!["global.json"],
             Some(vec!["dotnet"]),
             1,
diff --git a/crates/collab/src/api/events.rs b/crates/collab/src/api/events.rs
index c500872fd7..da78a98069 100644
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -280,7 +280,7 @@ pub async fn post_hang(
         service = "client",
         version = %report.app_version.unwrap_or_default().to_string(),
         os_name = %report.os_name,
-        os_version = report.os_version.unwrap_or_default().to_string(),
+        os_version = report.os_version.unwrap_or_default(),
         incident_id = %incident_id,
         installation_id = %report.installation_id.unwrap_or_default(),
         backtrace = %backtrace,
diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs
index 5a2a1329bb..e484d6b510 100644
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -236,7 +236,7 @@ mod test {
 
     #[gpui::test]
     async fn test_verify_access_token(cx: &mut gpui::TestAppContext) {
-        let test_db = crate::db::TestDb::sqlite(cx.executor().clone());
+        let test_db = crate::db::TestDb::sqlite(cx.executor());
         let db = test_db.db();
 
         let user = db
diff --git a/crates/collab/src/db/tests/embedding_tests.rs b/crates/collab/src/db/tests/embedding_tests.rs
index 367e89f87b..5d8d69c030 100644
--- a/crates/collab/src/db/tests/embedding_tests.rs
+++ b/crates/collab/src/db/tests/embedding_tests.rs
@@ -8,7 +8,7 @@ use time::{Duration, OffsetDateTime, PrimitiveDateTime};
 // SQLite does not support array arguments, so we only test this against a real postgres instance
 #[gpui::test]
 async fn test_get_embeddings_postgres(cx: &mut gpui::TestAppContext) {
-    let test_db = TestDb::postgres(cx.executor().clone());
+    let test_db = TestDb::postgres(cx.executor());
     let db = test_db.db();
 
     let provider = "test_model";
@@ -38,7 +38,7 @@ async fn test_get_embeddings_postgres(cx: &mut gpui::TestAppContext) {
 
 #[gpui::test]
 async fn test_purge_old_embeddings(cx: &mut gpui::TestAppContext) {
-    let test_db = TestDb::postgres(cx.executor().clone());
+    let test_db = TestDb::postgres(cx.executor());
     let db = test_db.db();
 
     let model = "test_model";
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 01f553edf2..06eb68610f 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -310,7 +310,7 @@ impl Server {
         let mut server = Self {
             id: parking_lot::Mutex::new(id),
             peer: Peer::new(id.0 as u32),
-            app_state: app_state.clone(),
+            app_state,
             connection_pool: Default::default(),
             handlers: Default::default(),
             teardown: watch::channel(false).0,
@@ -1386,9 +1386,7 @@ async fn create_room(
         let live_kit = live_kit?;
         let user_id = session.user_id().to_string();
 
-        let token = live_kit
-            .room_token(&livekit_room, &user_id.to_string())
-            .trace_err()?;
+        let token = live_kit.room_token(&livekit_room, &user_id).trace_err()?;
 
         Some(proto::LiveKitConnectionInfo {
             server_url: live_kit.url().into(),
@@ -2015,9 +2013,9 @@ async fn join_project(
         .unzip();
     response.send(proto::JoinProjectResponse {
         project_id: project.id.0 as u64,
-        worktrees: worktrees.clone(),
+        worktrees,
         replica_id: replica_id.0 as u32,
-        collaborators: collaborators.clone(),
+        collaborators,
         language_servers,
         language_server_capabilities,
         role: project.role.into(),
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index 7b95fdd458..4e7996ce3b 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -3593,7 +3593,7 @@ async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
     let abs_path = project_a.read_with(cx_a, |project, cx| {
         project
             .absolute_path(&project_path, cx)
-            .map(|path_buf| Arc::from(path_buf.to_owned()))
+            .map(Arc::from)
             .unwrap()
     });
 
@@ -3647,20 +3647,16 @@ async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
     let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
     let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints_a.len());
@@ -3680,20 +3676,16 @@ async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
     let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
     let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints_a.len());
@@ -3713,20 +3705,16 @@ async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
     let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
     let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints_a.len());
@@ -3746,20 +3734,16 @@ async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
     let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
     let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
         editor
             .breakpoint_store()
-            .clone()
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(0, breakpoints_a.len());
diff --git a/crates/collab/src/tests/random_channel_buffer_tests.rs b/crates/collab/src/tests/random_channel_buffer_tests.rs
index c283a9fcd1..6fcd6d75cd 100644
--- a/crates/collab/src/tests/random_channel_buffer_tests.rs
+++ b/crates/collab/src/tests/random_channel_buffer_tests.rs
@@ -266,7 +266,7 @@ impl RandomizedTest for RandomChannelBufferTest {
                                 "client {user_id} has different text than client {prev_user_id} for channel {channel_name}",
                             );
                         } else {
-                            prev_text = Some((user_id, text.clone()));
+                            prev_text = Some((user_id, text));
                         }
 
                         // Assert that all clients and the server agree about who is present in the
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
index cd4cf69f60..ac5c4c54ca 100644
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -643,7 +643,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                 );
 
                 let project = project.await?;
-                client.dev_server_projects_mut().push(project.clone());
+                client.dev_server_projects_mut().push(project);
             }
 
             ClientOperation::CreateWorktreeEntry {
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index f1c0b2d182..fd5e3eefc1 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -370,8 +370,8 @@ impl TestServer {
         let client = TestClient {
             app_state,
             username: name.to_string(),
-            channel_store: cx.read(ChannelStore::global).clone(),
-            notification_store: cx.read(NotificationStore::global).clone(),
+            channel_store: cx.read(ChannelStore::global),
+            notification_store: cx.read(NotificationStore::global),
             state: Default::default(),
         };
         client.wait_for_current_user(cx).await;
diff --git a/crates/collab_ui/src/channel_view.rs b/crates/collab_ui/src/channel_view.rs
index 9993c0841c..61b3e05e48 100644
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -66,7 +66,7 @@ impl ChannelView {
             channel_id,
             link_position,
             pane.clone(),
-            workspace.clone(),
+            workspace,
             window,
             cx,
         );
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 5ed3907f6c..8aaf6c0aa2 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -1038,7 +1038,7 @@ impl Render for ChatPanel {
                     .cloned();
 
                 el.when_some(reply_message, |el, reply_message| {
-                    let user_being_replied_to = reply_message.sender.clone();
+                    let user_being_replied_to = reply_message.sender;
 
                     el.child(
                         h_flex()
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index b756984a09..cd37549783 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2507,7 +2507,7 @@ impl CollabPanel {
 
         let button = match section {
             Section::ActiveCall => channel_link.map(|channel_link| {
-                let channel_link_copy = channel_link.clone();
+                let channel_link_copy = channel_link;
                 IconButton::new("channel-link", IconName::Copy)
                     .icon_size(IconSize::Small)
                     .size(ButtonSize::None)
@@ -2691,7 +2691,7 @@ impl CollabPanel {
                 h_flex()
                     .w_full()
                     .justify_between()
-                    .child(Label::new(github_login.clone()))
+                    .child(Label::new(github_login))
                     .child(h_flex().children(controls)),
             )
             .start_slot(Avatar::new(user.avatar_uri.clone()))
@@ -3125,7 +3125,7 @@ impl Panel for CollabPanel {
 
 impl Focusable for CollabPanel {
     fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.filter_editor.focus_handle(cx).clone()
+        self.filter_editor.focus_handle(cx)
     }
 }
 
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index a900d585f8..bf6fc3b224 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -289,7 +289,7 @@ impl NotificationPanel {
                         .gap_1()
                         .size_full()
                         .overflow_hidden()
-                        .child(Label::new(text.clone()))
+                        .child(Label::new(text))
                         .child(
                             h_flex()
                                 .child(
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index b8800ff912..227d246f04 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -206,7 +206,7 @@ impl CommandPaletteDelegate {
         if parse_zed_link(&query, cx).is_some() {
             intercept_results = vec![CommandInterceptResult {
                 action: OpenZedUrl { url: query.clone() }.boxed_clone(),
-                string: query.clone(),
+                string: query,
                 positions: vec![],
             }]
         }
diff --git a/crates/component/src/component_layout.rs b/crates/component/src/component_layout.rs
index 58bf1d8f0c..a840d520a6 100644
--- a/crates/component/src/component_layout.rs
+++ b/crates/component/src/component_layout.rs
@@ -42,7 +42,7 @@ impl RenderOnce for ComponentExample {
                             div()
                                 .text_size(rems(0.875))
                                 .text_color(cx.theme().colors().text_muted)
-                                .child(description.clone()),
+                                .child(description),
                         )
                     }),
             )
diff --git a/crates/context_server/src/listener.rs b/crates/context_server/src/listener.rs
index 1b44cefbd2..4e5da2566e 100644
--- a/crates/context_server/src/listener.rs
+++ b/crates/context_server/src/listener.rs
@@ -112,7 +112,6 @@ impl McpServer {
                 annotations: Some(tool.annotations()),
             },
             handler: Box::new({
-                let tool = tool.clone();
                 move |input_value, cx| {
                     let input = match input_value {
                         Some(input) => serde_json::from_value(input),
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 1916853a69..33455f5e52 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -81,10 +81,7 @@ pub fn init(
     };
     copilot_chat::init(fs.clone(), http.clone(), configuration, cx);
 
-    let copilot = cx.new({
-        let node_runtime = node_runtime.clone();
-        move |cx| Copilot::start(new_server_id, fs, node_runtime, cx)
-    });
+    let copilot = cx.new(move |cx| Copilot::start(new_server_id, fs, node_runtime, cx));
     Copilot::set_global(copilot.clone(), cx);
     cx.observe(&copilot, |copilot, cx| {
         copilot.update(cx, |copilot, cx| copilot.update_action_visibilities(cx));
diff --git a/crates/copilot/src/copilot_completion_provider.rs b/crates/copilot/src/copilot_completion_provider.rs
index 2fd6df27b9..9308500ed4 100644
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -1083,7 +1083,7 @@ mod tests {
         let replace_range_marker: TextRangeMarker = ('<', '>').into();
         let (_, mut marked_ranges) = marked_text_ranges_by(
             marked_string,
-            vec![complete_from_marker.clone(), replace_range_marker.clone()],
+            vec![complete_from_marker, replace_range_marker.clone()],
         );
 
         let replace_range =
diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rs
index 131272da6b..c4338c6d00 100644
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -664,7 +664,7 @@ impl ToolbarItemView for DapLogToolbarItemView {
         if let Some(item) = active_pane_item
             && let Some(log_view) = item.downcast::<DapLogView>()
         {
-            self.log_view = Some(log_view.clone());
+            self.log_view = Some(log_view);
             return workspace::ToolbarItemLocation::PrimaryLeft;
         }
         self.log_view = None;
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index 6c70a935e0..f81c1fff89 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -386,10 +386,10 @@ impl DebugPanel {
             return;
         };
 
-        let dap_store_handle = self.project.read(cx).dap_store().clone();
+        let dap_store_handle = self.project.read(cx).dap_store();
         let label = curr_session.read(cx).label();
         let quirks = curr_session.read(cx).quirks();
-        let adapter = curr_session.read(cx).adapter().clone();
+        let adapter = curr_session.read(cx).adapter();
         let binary = curr_session.read(cx).binary().cloned().unwrap();
         let task_context = curr_session.read(cx).task_context().clone();
 
@@ -447,9 +447,9 @@ impl DebugPanel {
             return;
         };
 
-        let dap_store_handle = self.project.read(cx).dap_store().clone();
+        let dap_store_handle = self.project.read(cx).dap_store();
         let label = self.label_for_child_session(&parent_session, request, cx);
-        let adapter = parent_session.read(cx).adapter().clone();
+        let adapter = parent_session.read(cx).adapter();
         let quirks = parent_session.read(cx).quirks();
         let Some(mut binary) = parent_session.read(cx).binary().cloned() else {
             log::error!("Attempted to start a child-session without a binary");
@@ -932,7 +932,6 @@ impl DebugPanel {
                                     .cloned(),
                                 |this, running_state| {
                                     this.children({
-                                        let running_state = running_state.clone();
                                         let threads =
                                             running_state.update(cx, |running_state, cx| {
                                                 let session = running_state.session();
@@ -1645,7 +1644,6 @@ impl Render for DebugPanel {
                 }
             })
             .on_action({
-                let this = this.clone();
                 move |_: &ToggleSessionPicker, window, cx| {
                     this.update(cx, |this, cx| {
                         this.toggle_session_picker(window, cx);
diff --git a/crates/debugger_ui/src/debugger_ui.rs b/crates/debugger_ui/src/debugger_ui.rs
index 5f5dfd1a1e..581cc16ff4 100644
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ b/crates/debugger_ui/src/debugger_ui.rs
@@ -272,7 +272,6 @@ pub fn init(cx: &mut App) {
                     }
                 })
                 .on_action({
-                    let active_item = active_item.clone();
                     move |_: &ToggleIgnoreBreakpoints, _, cx| {
                         active_item
                             .update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
@@ -293,9 +292,8 @@ pub fn init(cx: &mut App) {
                     let Some(debug_panel) = workspace.read(cx).panel::<DebugPanel>(cx) else {
                         return;
                     };
-                    let Some(active_session) = debug_panel
-                        .clone()
-                        .update(cx, |panel, _| panel.active_session())
+                    let Some(active_session) =
+                        debug_panel.update(cx, |panel, _| panel.active_session())
                     else {
                         return;
                     };
diff --git a/crates/debugger_ui/src/dropdown_menus.rs b/crates/debugger_ui/src/dropdown_menus.rs
index dca15eb052..c5399f6f69 100644
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ b/crates/debugger_ui/src/dropdown_menus.rs
@@ -272,10 +272,9 @@ impl DebugPanel {
             .child(session_entry.label_element(self_depth, cx))
             .child(
                 IconButton::new("close-debug-session", IconName::Close)
-                    .visible_on_hover(id.clone())
+                    .visible_on_hover(id)
                     .icon_size(IconSize::Small)
                     .on_click({
-                        let weak = weak.clone();
                         move |_, window, cx| {
                             weak.update(cx, |panel, cx| {
                                 panel.close_session(session_entity_id, window, cx);
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index eb0ad92dcc..b30e3995ff 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -785,7 +785,7 @@ impl RenderOnce for AttachMode {
         v_flex()
             .w_full()
             .track_focus(&self.attach_picker.focus_handle(cx))
-            .child(self.attach_picker.clone())
+            .child(self.attach_picker)
     }
 }
 
diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rs
index f0d7fd6fdd..cff2ba8335 100644
--- a/crates/debugger_ui/src/persistence.rs
+++ b/crates/debugger_ui/src/persistence.rs
@@ -256,7 +256,7 @@ pub(crate) fn deserialize_pane_layout(
             Some(Member::Axis(PaneAxis::load(
                 if should_invert { axis.invert() } else { axis },
                 members,
-                flexes.clone(),
+                flexes,
             )))
         }
         SerializedPaneLayout::Pane(serialized_pane) => {
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index e3682ac991..4306104877 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -180,7 +180,7 @@ impl SubView {
         let weak_list = list.downgrade();
         let focus_handle = list.focus_handle(cx);
         let this = Self::new(
-            focus_handle.clone(),
+            focus_handle,
             list.into(),
             DebuggerPaneItem::BreakpointList,
             cx,
@@ -1167,9 +1167,9 @@ impl RunningState {
             id: task::TaskId("debug".to_string()),
             full_label: title.clone(),
             label: title.clone(),
-            command: command.clone(),
+            command,
             args,
-            command_label: title.clone(),
+            command_label: title,
             cwd,
             env: envs,
             use_new_terminal: true,
@@ -1756,7 +1756,7 @@ impl RunningState {
             this.activate_item(0, false, false, window, cx);
         });
 
-        let rightmost_pane = new_debugger_pane(workspace.clone(), project.clone(), window, cx);
+        let rightmost_pane = new_debugger_pane(workspace.clone(), project, window, cx);
         rightmost_pane.update(cx, |this, cx| {
             this.add_item(
                 Box::new(SubView::new(
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index c17fffc42c..d04443e201 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -685,7 +685,6 @@ impl BreakpointList {
                         selection_kind.map(|kind| kind.0) != Some(SelectedBreakpointKind::Source),
                     )
                     .on_click({
-                        let focus_handle = focus_handle.clone();
                         move |_, window, cx| {
                             focus_handle.focus(window);
                             window.dispatch_action(UnsetBreakpoint.boxed_clone(), cx)
@@ -1139,7 +1138,6 @@ impl ExceptionBreakpoint {
                     }
                 })
                 .on_click({
-                    let list = list.clone();
                     move |_, _, cx| {
                         list.update(cx, |this, cx| {
                             this.toggle_exception_breakpoint(&id, cx);
diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs
index 05d2231da4..a801cedd26 100644
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -365,7 +365,7 @@ impl Console {
                         Some(ContextMenu::build(window, cx, |context_menu, _, _| {
                             context_menu
                                 .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                                    el.context(keybinding_target.clone())
+                                    el.context(keybinding_target)
                                 })
                                 .action("Watch Expression", WatchExpression.boxed_clone())
                         }))
diff --git a/crates/debugger_ui/src/session/running/loaded_source_list.rs b/crates/debugger_ui/src/session/running/loaded_source_list.rs
index 6b376bb892..921ebd8b5f 100644
--- a/crates/debugger_ui/src/session/running/loaded_source_list.rs
+++ b/crates/debugger_ui/src/session/running/loaded_source_list.rs
@@ -57,7 +57,7 @@ impl LoadedSourceList {
                 h_flex()
                     .text_ui_xs(cx)
                     .text_color(cx.theme().colors().text_muted)
-                    .when_some(source.path.clone(), |this, path| this.child(path)),
+                    .when_some(source.path, |this, path| this.child(path)),
             )
             .into_any()
     }
diff --git a/crates/debugger_ui/src/session/running/memory_view.rs b/crates/debugger_ui/src/session/running/memory_view.rs
index a09df6e728..e7b7963d3f 100644
--- a/crates/debugger_ui/src/session/running/memory_view.rs
+++ b/crates/debugger_ui/src/session/running/memory_view.rs
@@ -461,7 +461,7 @@ impl MemoryView {
             let data_breakpoint_info = this.data_breakpoint_info(context.clone(), None, cx);
             cx.spawn(async move |this, cx| {
                 if let Some(info) = data_breakpoint_info.await {
-                    let Some(data_id) = info.data_id.clone() else {
+                    let Some(data_id) = info.data_id else {
                         return;
                     };
                     _ = this.update(cx, |this, cx| {
diff --git a/crates/debugger_ui/src/session/running/module_list.rs b/crates/debugger_ui/src/session/running/module_list.rs
index 74a9fb457a..1c1e0f3efc 100644
--- a/crates/debugger_ui/src/session/running/module_list.rs
+++ b/crates/debugger_ui/src/session/running/module_list.rs
@@ -157,7 +157,7 @@ impl ModuleList {
                 h_flex()
                     .text_ui_xs(cx)
                     .text_color(cx.theme().colors().text_muted)
-                    .when_some(module.path.clone(), |this, path| this.child(path)),
+                    .when_some(module.path, |this, path| this.child(path)),
             )
             .into_any()
     }
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index 8b44c231c3..f9b5ed5e3f 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -126,7 +126,7 @@ impl StackFrameList {
         self.stack_frames(cx)
             .unwrap_or_default()
             .into_iter()
-            .map(|stack_frame| stack_frame.dap.clone())
+            .map(|stack_frame| stack_frame.dap)
             .collect()
     }
 
@@ -224,7 +224,7 @@ impl StackFrameList {
 
         let collapsed_entries = std::mem::take(&mut collapsed_entries);
         if !collapsed_entries.is_empty() {
-            entries.push(StackFrameEntry::Collapsed(collapsed_entries.clone()));
+            entries.push(StackFrameEntry::Collapsed(collapsed_entries));
         }
         self.entries = entries;
 
@@ -418,7 +418,7 @@ impl StackFrameList {
         let source = stack_frame.source.clone();
         let is_selected_frame = Some(ix) == self.selected_ix;
 
-        let path = source.clone().and_then(|s| s.path.or(s.name));
+        let path = source.and_then(|s| s.path.or(s.name));
         let formatted_path = path.map(|path| format!("{}:{}", path, stack_frame.line,));
         let formatted_path = formatted_path.map(|path| {
             Label::new(path)
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index 7461bffdf9..18f574389e 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -313,7 +313,7 @@ impl VariableList {
                         watcher.variables_reference,
                         watcher.variables_reference,
                         EntryPath::for_watcher(watcher.expression.clone()),
-                        DapEntry::Watcher(watcher.clone()),
+                        DapEntry::Watcher(watcher),
                     )
                 })
                 .collect::<Vec<_>>(),
@@ -1301,8 +1301,6 @@ impl VariableList {
                         IconName::Close,
                     )
                     .on_click({
-                        let weak = weak.clone();
-                        let path = path.clone();
                         move |_, window, cx| {
                             weak.update(cx, |variable_list, cx| {
                                 variable_list.selection = Some(path.clone());
@@ -1470,7 +1468,6 @@ impl VariableList {
                     }))
                 })
                 .on_secondary_mouse_down(cx.listener({
-                    let path = path.clone();
                     let entry = variable.clone();
                     move |this, event: &MouseDownEvent, window, cx| {
                         this.selection = Some(path.clone());
diff --git a/crates/debugger_ui/src/tests/debugger_panel.rs b/crates/debugger_ui/src/tests/debugger_panel.rs
index 6180831ea9..ab6d5cb960 100644
--- a/crates/debugger_ui/src/tests/debugger_panel.rs
+++ b/crates/debugger_ui/src/tests/debugger_panel.rs
@@ -1330,7 +1330,6 @@ async fn test_unsetting_breakpoints_on_clear_breakpoint_action(
     let called_set_breakpoints = Arc::new(AtomicBool::new(false));
 
     client.on_request::<SetBreakpoints, _>({
-        let called_set_breakpoints = called_set_breakpoints.clone();
         move |_, args| {
             assert!(
                 args.breakpoints.is_none_or(|bps| bps.is_empty()),
@@ -1445,7 +1444,6 @@ async fn test_we_send_arguments_from_user_config(
     let launch_handler_called = Arc::new(AtomicBool::new(false));
 
     start_debug_session_with(&workspace, cx, debug_definition.clone(), {
-        let debug_definition = debug_definition.clone();
         let launch_handler_called = launch_handler_called.clone();
 
         move |client| {
@@ -1783,9 +1781,8 @@ async fn test_debug_adapters_shutdown_on_app_quit(
     let disconnect_request_received = Arc::new(AtomicBool::new(false));
     let disconnect_clone = disconnect_request_received.clone();
 
-    let disconnect_clone_for_handler = disconnect_clone.clone();
     client.on_request::<Disconnect, _>(move |_, _| {
-        disconnect_clone_for_handler.store(true, Ordering::SeqCst);
+        disconnect_clone.store(true, Ordering::SeqCst);
         Ok(())
     });
 
diff --git a/crates/debugger_ui/src/tests/new_process_modal.rs b/crates/debugger_ui/src/tests/new_process_modal.rs
index 5ac6af389d..bfc445cf67 100644
--- a/crates/debugger_ui/src/tests/new_process_modal.rs
+++ b/crates/debugger_ui/src/tests/new_process_modal.rs
@@ -106,9 +106,7 @@ async fn test_debug_session_substitutes_variables_and_relativizes_paths(
                         );
 
                         let expected_other_field = if input_path.contains("$ZED_WORKTREE_ROOT") {
-                            input_path
-                                .replace("$ZED_WORKTREE_ROOT", path!("/test/worktree/path"))
-                                .to_owned()
+                            input_path.replace("$ZED_WORKTREE_ROOT", path!("/test/worktree/path"))
                         } else {
                             input_path.to_string()
                         };
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index 99e588ada9..33158577c4 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -61,15 +61,13 @@ impl PreprocessorError {
             for alias in action.deprecated_aliases {
                 if alias == &action_name {
                     return PreprocessorError::DeprecatedActionUsed {
-                        used: action_name.clone(),
+                        used: action_name,
                         should_be: action.name.to_string(),
                     };
                 }
             }
         }
-        PreprocessorError::ActionNotFound {
-            action_name: action_name.to_string(),
-        }
+        PreprocessorError::ActionNotFound { action_name }
     }
 }
 
diff --git a/crates/edit_prediction_button/src/edit_prediction_button.rs b/crates/edit_prediction_button/src/edit_prediction_button.rs
index 21c934fefa..4f69af7ee4 100644
--- a/crates/edit_prediction_button/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_button/src/edit_prediction_button.rs
@@ -168,7 +168,7 @@ impl Render for EditPredictionButton {
                         let account_status = agent.account_status.clone();
                         match account_status {
                             AccountStatus::NeedsActivation { activate_url } => {
-                                SupermavenButtonStatus::NeedsActivation(activate_url.clone())
+                                SupermavenButtonStatus::NeedsActivation(activate_url)
                             }
                             AccountStatus::Unknown => SupermavenButtonStatus::Initializing,
                             AccountStatus::Ready => SupermavenButtonStatus::Ready,
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 4847bc2565..96809d6877 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -514,7 +514,7 @@ impl CompletionsMenu {
         // Expand the range to resolve more completions than are predicted to be visible, to reduce
         // jank on navigation.
         let entry_indices = util::expanded_and_wrapped_usize_range(
-            entry_range.clone(),
+            entry_range,
             RESOLVE_BEFORE_ITEMS,
             RESOLVE_AFTER_ITEMS,
             entries.len(),
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 0d31398a54..1e0cdc34ac 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -2156,7 +2156,7 @@ mod tests {
         }
 
         let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(multi_buffer_snapshot.clone());
+        let (_, inlay_snapshot) = InlayMap::new(multi_buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
         let (_, wraps_snapshot) = WrapMap::new(tab_snapshot, font, font_size, Some(wrap_width), cx);
@@ -2275,7 +2275,7 @@ mod tests {
             new_heights.insert(block_ids[0], 3);
             block_map_writer.resize(new_heights);
 
-            let snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
+            let snapshot = block_map.read(wraps_snapshot, Default::default());
             // Same height as before, should remain the same
             assert_eq!(snapshot.text(), "aaa\n\n\n\n\n\nbbb\nccc\nddd\n\n\n");
         }
@@ -2360,16 +2360,14 @@ mod tests {
             buffer.edit([(Point::new(2, 0)..Point::new(3, 0), "")], None, cx);
             buffer.snapshot(cx)
         });
-        let (inlay_snapshot, inlay_edits) = inlay_map.sync(
-            buffer_snapshot.clone(),
-            buffer_subscription.consume().into_inner(),
-        );
+        let (inlay_snapshot, inlay_edits) =
+            inlay_map.sync(buffer_snapshot, buffer_subscription.consume().into_inner());
         let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
         let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
         let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
             wrap_map.sync(tab_snapshot, tab_edits, cx)
         });
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), wrap_edits);
+        let blocks_snapshot = block_map.read(wraps_snapshot, wrap_edits);
         assert_eq!(blocks_snapshot.text(), "line1\n\n\n\n\nline5");
 
         let buffer_snapshot = buffer.update(cx, |buffer, cx| {
@@ -2454,7 +2452,7 @@ mod tests {
         // Removing the replace block shows all the hidden blocks again.
         let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
         writer.remove(HashSet::from_iter([replace_block_id]));
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
+        let blocks_snapshot = block_map.read(wraps_snapshot, Default::default());
         assert_eq!(
             blocks_snapshot.text(),
             "\nline1\n\nline2\n\n\nline 2.1\nline2.2\nline 2.3\nline 2.4\n\nline4\n\nline5"
@@ -2793,7 +2791,7 @@ mod tests {
         buffer.read_with(cx, |buffer, cx| {
             writer.fold_buffers([buffer_id_3], buffer, cx);
         });
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
+        let blocks_snapshot = block_map.read(wrap_snapshot, Patch::default());
         let blocks = blocks_snapshot
             .blocks_in_range(0..u32::MAX)
             .collect::<Vec<_>>();
@@ -2846,7 +2844,7 @@ mod tests {
         assert_eq!(buffer_ids.len(), 1);
         let buffer_id = buffer_ids[0];
 
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
         let (_, wrap_snapshot) =
@@ -2860,7 +2858,7 @@ mod tests {
         buffer.read_with(cx, |buffer, cx| {
             writer.fold_buffers([buffer_id], buffer, cx);
         });
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
+        let blocks_snapshot = block_map.read(wrap_snapshot, Patch::default());
         let blocks = blocks_snapshot
             .blocks_in_range(0..u32::MAX)
             .collect::<Vec<_>>();
@@ -3527,7 +3525,7 @@ mod tests {
                 ..buffer_snapshot.anchor_after(Point::new(1, 0))],
             false,
         );
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
+        let blocks_snapshot = block_map.read(wraps_snapshot, Default::default());
         assert_eq!(blocks_snapshot.text(), "abc\n\ndef\nghi\njkl\nmno");
     }
 
diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs
index 3dcd172c3c..42f46fb749 100644
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -1557,7 +1557,7 @@ mod tests {
         let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
         let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let mut map = FoldMap::new(inlay_snapshot.clone()).0;
 
         let (mut writer, _, _) = map.write(inlay_snapshot, vec![]);
@@ -1636,7 +1636,7 @@ mod tests {
         let buffer = MultiBuffer::build_simple("abcdefghijkl", cx);
         let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
 
         {
             let mut map = FoldMap::new(inlay_snapshot.clone()).0;
@@ -1712,7 +1712,7 @@ mod tests {
         let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
         let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let mut map = FoldMap::new(inlay_snapshot.clone()).0;
 
         let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
@@ -1720,7 +1720,7 @@ mod tests {
             (Point::new(0, 2)..Point::new(2, 2), FoldPlaceholder::test()),
             (Point::new(3, 1)..Point::new(4, 1), FoldPlaceholder::test()),
         ]);
-        let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
+        let (snapshot, _) = map.read(inlay_snapshot, vec![]);
         assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee");
 
         let buffer_snapshot = buffer.update(cx, |buffer, cx| {
@@ -1747,7 +1747,7 @@ mod tests {
             (Point::new(1, 2)..Point::new(3, 2), FoldPlaceholder::test()),
             (Point::new(3, 1)..Point::new(4, 1), FoldPlaceholder::test()),
         ]);
-        let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
+        let (snapshot, _) = map.read(inlay_snapshot, vec![]);
         let fold_ranges = snapshot
             .folds_in_range(Point::new(1, 0)..Point::new(1, 3))
             .map(|fold| {
@@ -1782,7 +1782,7 @@ mod tests {
         let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
         let mut map = FoldMap::new(inlay_snapshot.clone()).0;
 
-        let (mut initial_snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
+        let (mut initial_snapshot, _) = map.read(inlay_snapshot, vec![]);
         let mut snapshot_edits = Vec::new();
 
         let mut next_inlay_id = 0;
diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs
index eb5d57d484..6f5df9bb8e 100644
--- a/crates/editor/src/display_map/tab_map.rs
+++ b/crates/editor/src/display_map/tab_map.rs
@@ -116,7 +116,7 @@ impl TabMap {
                             state.new.end = edit.new.end;
                             Some(None) // Skip this edit, it's merged
                         } else {
-                            let new_state = edit.clone();
+                            let new_state = edit;
                             let result = Some(Some(state.clone())); // Yield the previous edit
                             **state = new_state;
                             result
@@ -611,7 +611,7 @@ mod tests {
     fn test_expand_tabs(cx: &mut gpui::App) {
         let buffer = MultiBuffer::build_simple("", cx);
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
 
@@ -628,7 +628,7 @@ mod tests {
 
         let buffer = MultiBuffer::build_simple(input, cx);
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
 
@@ -675,7 +675,7 @@ mod tests {
 
         let buffer = MultiBuffer::build_simple(input, cx);
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
 
@@ -689,7 +689,7 @@ mod tests {
 
         let buffer = MultiBuffer::build_simple(input, cx);
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
 
@@ -749,7 +749,7 @@ mod tests {
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
         log::info!("Buffer text: {:?}", buffer_snapshot.text());
 
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         log::info!("InlayMap text: {:?}", inlay_snapshot.text());
         let (mut fold_map, _) = FoldMap::new(inlay_snapshot.clone());
         fold_map.randomly_mutate(&mut rng);
@@ -758,7 +758,7 @@ mod tests {
         let (inlay_snapshot, _) = inlay_map.randomly_mutate(&mut 0, &mut rng);
         log::info!("InlayMap text: {:?}", inlay_snapshot.text());
 
-        let (mut tab_map, _) = TabMap::new(fold_snapshot.clone(), tab_size);
+        let (mut tab_map, _) = TabMap::new(fold_snapshot, tab_size);
         let tabs_snapshot = tab_map.set_max_expansion_column(32);
 
         let text = text::Rope::from(tabs_snapshot.text().as_str());
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2f3ced65dc..5fc017dcfc 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4528,7 +4528,7 @@ impl Editor {
                                     let mut char_position = 0u32;
                                     let mut end_tag_offset = None;
 
-                                    'outer: for chunk in snapshot.text_for_range(range.clone()) {
+                                    'outer: for chunk in snapshot.text_for_range(range) {
                                         if let Some(byte_pos) = chunk.find(&**end_tag) {
                                             let chars_before_match =
                                                 chunk[..byte_pos].chars().count() as u32;
@@ -4881,7 +4881,7 @@ impl Editor {
         let multibuffer = self.buffer.read(cx);
         let Some(buffer) = position
             .buffer_id
-            .and_then(|buffer_id| multibuffer.buffer(buffer_id).clone())
+            .and_then(|buffer_id| multibuffer.buffer(buffer_id))
         else {
             return false;
         };
@@ -6269,7 +6269,7 @@ impl Editor {
                 }))
             }
             CodeActionsItem::DebugScenario(scenario) => {
-                let context = actions_menu.actions.context.clone();
+                let context = actions_menu.actions.context;
 
                 workspace.update(cx, |workspace, cx| {
                     dap::send_telemetry(&scenario, TelemetrySpawnLocation::Gutter, cx);
@@ -6469,7 +6469,7 @@ impl Editor {
 
     fn refresh_code_actions(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<()> {
         let newest_selection = self.selections.newest_anchor().clone();
-        let newest_selection_adjusted = self.selections.newest_adjusted(cx).clone();
+        let newest_selection_adjusted = self.selections.newest_adjusted(cx);
         let buffer = self.buffer.read(cx);
         if newest_selection.head().diff_base_anchor.is_some() {
             return None;
@@ -8188,8 +8188,6 @@ impl Editor {
             .icon_color(color)
             .style(ButtonStyle::Transparent)
             .on_click(cx.listener({
-                let breakpoint = breakpoint.clone();
-
                 move |editor, event: &ClickEvent, window, cx| {
                     let edit_action = if event.modifiers().platform || breakpoint.is_disabled() {
                         BreakpointEditAction::InvertState
@@ -14837,7 +14835,7 @@ impl Editor {
                 if parent == child {
                     return None;
                 }
-                let text = buffer.text_for_range(child.clone()).collect::<String>();
+                let text = buffer.text_for_range(child).collect::<String>();
                 Some((selection.id, parent, text))
             })
             .collect::<Vec<_>>();
@@ -15940,7 +15938,7 @@ impl Editor {
                     if !split
                         && Some(&target.buffer) == editor.buffer.read(cx).as_singleton().as_ref()
                     {
-                        editor.go_to_singleton_buffer_range(range.clone(), window, cx);
+                        editor.go_to_singleton_buffer_range(range, window, cx);
                     } else {
                         window.defer(cx, move |window, cx| {
                             let target_editor: Entity<Self> =
@@ -16198,14 +16196,14 @@ impl Editor {
         let item_id = item.item_id();
 
         if split {
-            workspace.split_item(SplitDirection::Right, item.clone(), window, cx);
+            workspace.split_item(SplitDirection::Right, item, window, cx);
         } else if PreviewTabsSettings::get_global(cx).enable_preview_from_code_navigation {
             let (preview_item_id, preview_item_idx) =
                 workspace.active_pane().read_with(cx, |pane, _| {
                     (pane.preview_item_id(), pane.preview_item_idx())
                 });
 
-            workspace.add_item_to_active_pane(item.clone(), preview_item_idx, true, window, cx);
+            workspace.add_item_to_active_pane(item, preview_item_idx, true, window, cx);
 
             if let Some(preview_item_id) = preview_item_id {
                 workspace.active_pane().update(cx, |pane, cx| {
@@ -16213,7 +16211,7 @@ impl Editor {
                 });
             }
         } else {
-            workspace.add_item_to_active_pane(item.clone(), None, true, window, cx);
+            workspace.add_item_to_active_pane(item, None, true, window, cx);
         }
         workspace.active_pane().update(cx, |pane, cx| {
             pane.set_preview_item_id(Some(item_id), cx);
@@ -19004,10 +19002,7 @@ impl Editor {
 
             let selection = text::ToPoint::to_point(&range.start, buffer).row
                 ..text::ToPoint::to_point(&range.end, buffer).row;
-            Some((
-                multi_buffer.buffer(buffer.remote_id()).unwrap().clone(),
-                selection,
-            ))
+            Some((multi_buffer.buffer(buffer.remote_id()).unwrap(), selection))
         });
 
         let Some((buffer, selection)) = buffer_and_selection else {
@@ -19249,7 +19244,7 @@ impl Editor {
                 row_highlights.insert(
                     ix,
                     RowHighlight {
-                        range: range.clone(),
+                        range,
                         index,
                         color,
                         options,
@@ -21676,7 +21671,7 @@ fn wrap_with_prefix(
     let subsequent_lines_prefix_len =
         char_len_with_expanded_tabs(0, &subsequent_lines_prefix, tab_size);
     let mut wrapped_text = String::new();
-    let mut current_line = first_line_prefix.clone();
+    let mut current_line = first_line_prefix;
     let mut is_first_line = true;
 
     let tokenizer = WordBreakingTokenizer::new(&unwrapped_text);
diff --git a/crates/editor/src/editor_settings_controls.rs b/crates/editor/src/editor_settings_controls.rs
index dc5557b052..91022d94a8 100644
--- a/crates/editor/src/editor_settings_controls.rs
+++ b/crates/editor/src/editor_settings_controls.rs
@@ -88,7 +88,7 @@ impl RenderOnce for BufferFontFamilyControl {
             .child(Icon::new(IconName::Font))
             .child(DropdownMenu::new(
                 "buffer-font-family",
-                value.clone(),
+                value,
                 ContextMenu::build(window, cx, |mut menu, _, cx| {
                     let font_family_cache = FontFamilyCache::global(cx);
 
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 1f1239ba0a..955ade04cd 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -708,7 +708,7 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
     _ = workspace.update(cx, |_v, window, cx| {
         cx.new(|cx| {
             let buffer = MultiBuffer::build_simple(&sample_text(300, 5, 'a'), cx);
-            let mut editor = build_editor(buffer.clone(), window, cx);
+            let mut editor = build_editor(buffer, window, cx);
             let handle = cx.entity();
             editor.set_nav_history(Some(pane.read(cx).nav_history_for_item(&handle)));
 
@@ -898,7 +898,7 @@ fn test_fold_action(cx: &mut TestAppContext) {
             .unindent(),
             cx,
         );
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -989,7 +989,7 @@ fn test_fold_action_whitespace_sensitive_language(cx: &mut TestAppContext) {
             .unindent(),
             cx,
         );
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -1074,7 +1074,7 @@ fn test_fold_action_multiple_line_breaks(cx: &mut TestAppContext) {
             .unindent(),
             cx,
         );
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -1173,7 +1173,7 @@ fn test_fold_at_level(cx: &mut TestAppContext) {
             .unindent(),
             cx,
         );
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -1335,7 +1335,7 @@ fn test_move_cursor_multibyte(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("🟥🟧🟨🟩🟦🟪\nabcde\nαβγδε", cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     assert_eq!('🟥'.len_utf8(), 4);
@@ -1452,7 +1452,7 @@ fn test_move_cursor_different_line_lengths(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("ⓐⓑⓒⓓⓔ\nabcd\nαβγ\nabcd\nⓐⓑⓒⓓⓔ\n", cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
     _ = editor.update(cx, |editor, window, cx| {
         editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
@@ -2479,7 +2479,7 @@ fn test_delete_to_word_boundary(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("one two three four", cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -2527,7 +2527,7 @@ fn test_delete_to_previous_word_start_or_newline(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("one\n2\nthree\n4", cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
     let del_to_prev_word_start = DeleteToPreviousWordStart {
         ignore_newlines: false,
@@ -2563,7 +2563,7 @@ fn test_delete_to_next_word_end_or_newline(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("\none\n   two\nthree\n   four", cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
     let del_to_next_word_end = DeleteToNextWordEnd {
         ignore_newlines: false,
@@ -2608,7 +2608,7 @@ fn test_newline(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("aaaa\n    bbbb\n", cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -2644,7 +2644,7 @@ fn test_newline_with_old_selections(cx: &mut TestAppContext) {
             .as_str(),
             cx,
         );
-        let mut editor = build_editor(buffer.clone(), window, cx);
+        let mut editor = build_editor(buffer, window, cx);
         editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
             s.select_ranges([
                 Point::new(2, 4)..Point::new(2, 5),
@@ -3175,7 +3175,7 @@ fn test_insert_with_old_selections(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple("a( X ), b( Y ), c( Z )", cx);
-        let mut editor = build_editor(buffer.clone(), window, cx);
+        let mut editor = build_editor(buffer, window, cx);
         editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
             s.select_ranges([3..4, 11..12, 19..20])
         });
@@ -5562,7 +5562,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             # ˇThis is a long comment using a pound
             # sign.
         "},
-        python_language.clone(),
+        python_language,
         &mut cx,
     );
 
@@ -5669,7 +5669,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
               also very long and should not merge
               with the numbered item.ˇ»
         "},
-        markdown_language.clone(),
+        markdown_language,
         &mut cx,
     );
 
@@ -5700,7 +5700,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
                // This is the second long comment block
                // to be wrapped.ˇ»
            "},
-        rust_language.clone(),
+        rust_language,
         &mut cx,
     );
 
@@ -5723,7 +5723,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             «\tThis is a very long indented line
             \tthat will be wrapped.ˇ»
          "},
-        plaintext_language.clone(),
+        plaintext_language,
         &mut cx,
     );
 
@@ -8889,7 +8889,7 @@ async fn test_autoclose_with_embedded_language(cx: &mut TestAppContext) {
     ));
 
     cx.language_registry().add(html_language.clone());
-    cx.language_registry().add(javascript_language.clone());
+    cx.language_registry().add(javascript_language);
     cx.executor().run_until_parked();
 
     cx.update_buffer(|buffer, cx| {
@@ -9633,7 +9633,7 @@ async fn test_snippets(cx: &mut TestAppContext) {
             .selections
             .all(cx)
             .iter()
-            .map(|s| s.range().clone())
+            .map(|s| s.range())
             .collect::<Vec<_>>();
         editor
             .insert_snippet(&insertion_ranges, snippet, window, cx)
@@ -9713,7 +9713,7 @@ async fn test_snippet_indentation(cx: &mut TestAppContext) {
             .selections
             .all(cx)
             .iter()
-            .map(|s| s.range().clone())
+            .map(|s| s.range())
             .collect::<Vec<_>>();
         editor
             .insert_snippet(&insertion_ranges, snippet, window, cx)
@@ -10782,7 +10782,7 @@ async fn test_multiple_formatters(cx: &mut TestAppContext) {
                     kind: Some("code-action-2".into()),
                     edit: Some(lsp::WorkspaceEdit::new(
                         [(
-                            uri.clone(),
+                            uri,
                             vec![lsp::TextEdit::new(
                                 lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
                                 "applied-code-action-2-edit\n".to_string(),
@@ -14366,7 +14366,7 @@ async fn test_toggle_block_comment(cx: &mut TestAppContext) {
     ));
 
     cx.language_registry().add(html_language.clone());
-    cx.language_registry().add(javascript_language.clone());
+    cx.language_registry().add(javascript_language);
     cx.update_buffer(|buffer, cx| {
         buffer.set_language(Some(html_language), cx);
     });
@@ -14543,7 +14543,7 @@ fn test_editing_overlapping_excerpts(cx: &mut TestAppContext) {
     );
     let excerpt_ranges = markers.into_iter().map(|marker| {
         let context = excerpt_ranges.remove(&marker).unwrap()[0].clone();
-        ExcerptRange::new(context.clone())
+        ExcerptRange::new(context)
     });
     let buffer = cx.new(|cx| Buffer::local(initial_text, cx));
     let multibuffer = cx.new(|cx| {
@@ -14828,7 +14828,7 @@ fn test_highlighted_ranges(cx: &mut TestAppContext) {
 
     let editor = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple(&sample_text(16, 8, 'a'), cx);
-        build_editor(buffer.clone(), window, cx)
+        build_editor(buffer, window, cx)
     });
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -15750,8 +15750,7 @@ async fn test_on_type_formatting_is_applied_after_autoindent(cx: &mut TestAppCon
     cx.simulate_keystroke("\n");
     cx.run_until_parked();
 
-    let buffer_cloned =
-        cx.multibuffer(|multi_buffer, _| multi_buffer.as_singleton().unwrap().clone());
+    let buffer_cloned = cx.multibuffer(|multi_buffer, _| multi_buffer.as_singleton().unwrap());
     let mut request =
         cx.set_request_handler::<lsp::request::OnTypeFormatting, _, _>(move |_, _, mut cx| {
             let buffer_cloned = buffer_cloned.clone();
@@ -19455,7 +19454,7 @@ async fn test_adjacent_diff_hunks(executor: BackgroundExecutor, cx: &mut TestApp
         let buffer_id = hunks[0].buffer_id;
         hunks
             .into_iter()
-            .map(|hunk| Anchor::range_in_buffer(excerpt_id, buffer_id, hunk.buffer_range.clone()))
+            .map(|hunk| Anchor::range_in_buffer(excerpt_id, buffer_id, hunk.buffer_range))
             .collect::<Vec<_>>()
     });
     assert_eq!(hunk_ranges.len(), 2);
@@ -19546,7 +19545,7 @@ async fn test_adjacent_diff_hunks(executor: BackgroundExecutor, cx: &mut TestApp
         let buffer_id = hunks[0].buffer_id;
         hunks
             .into_iter()
-            .map(|hunk| Anchor::range_in_buffer(excerpt_id, buffer_id, hunk.buffer_range.clone()))
+            .map(|hunk| Anchor::range_in_buffer(excerpt_id, buffer_id, hunk.buffer_range))
             .collect::<Vec<_>>()
     });
     assert_eq!(hunk_ranges.len(), 2);
@@ -19612,7 +19611,7 @@ async fn test_toggle_deletion_hunk_at_start_of_file(
         let buffer_id = hunks[0].buffer_id;
         hunks
             .into_iter()
-            .map(|hunk| Anchor::range_in_buffer(excerpt_id, buffer_id, hunk.buffer_range.clone()))
+            .map(|hunk| Anchor::range_in_buffer(excerpt_id, buffer_id, hunk.buffer_range))
             .collect::<Vec<_>>()
     });
     assert_eq!(hunk_ranges.len(), 1);
@@ -19635,7 +19634,7 @@ async fn test_toggle_deletion_hunk_at_start_of_file(
     });
     executor.run_until_parked();
 
-    cx.assert_state_with_diff(hunk_expanded.clone());
+    cx.assert_state_with_diff(hunk_expanded);
 }
 
 #[gpui::test]
@@ -21150,7 +21149,7 @@ async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
     let abs_path = project.read_with(cx, |project, cx| {
         project
             .absolute_path(&project_path, cx)
-            .map(|path_buf| Arc::from(path_buf.to_owned()))
+            .map(Arc::from)
             .unwrap()
     });
 
@@ -21168,7 +21167,6 @@ async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints.len());
@@ -21193,7 +21191,6 @@ async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints.len());
@@ -21215,7 +21212,6 @@ async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(0, breakpoints.len());
@@ -21267,7 +21263,7 @@ async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
     let abs_path = project.read_with(cx, |project, cx| {
         project
             .absolute_path(&project_path, cx)
-            .map(|path_buf| Arc::from(path_buf.to_owned()))
+            .map(Arc::from)
             .unwrap()
     });
 
@@ -21282,7 +21278,6 @@ async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_breakpoint(
@@ -21303,7 +21298,6 @@ async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_breakpoint(&breakpoints, &abs_path, vec![]);
@@ -21323,7 +21317,6 @@ async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_breakpoint(
@@ -21346,7 +21339,6 @@ async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_breakpoint(
@@ -21369,7 +21361,6 @@ async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_breakpoint(
@@ -21442,7 +21433,7 @@ async fn test_breakpoint_enabling_and_disabling(cx: &mut TestAppContext) {
     let abs_path = project.read_with(cx, |project, cx| {
         project
             .absolute_path(&project_path, cx)
-            .map(|path_buf| Arc::from(path_buf.to_owned()))
+            .map(Arc::from)
             .unwrap()
     });
 
@@ -21462,7 +21453,6 @@ async fn test_breakpoint_enabling_and_disabling(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints.len());
@@ -21494,7 +21484,6 @@ async fn test_breakpoint_enabling_and_disabling(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     let disable_breakpoint = {
@@ -21530,7 +21519,6 @@ async fn test_breakpoint_enabling_and_disabling(cx: &mut TestAppContext) {
             .unwrap()
             .read(cx)
             .all_source_breakpoints(cx)
-            .clone()
     });
 
     assert_eq!(1, breakpoints.len());
@@ -22509,10 +22497,7 @@ async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) {
         let closing_range =
             buffer.anchor_before(Point::new(0, 6))..buffer.anchor_after(Point::new(0, 8));
         let mut linked_ranges = HashMap::default();
-        linked_ranges.insert(
-            buffer_id,
-            vec![(opening_range.clone(), vec![closing_range.clone()])],
-        );
+        linked_ranges.insert(buffer_id, vec![(opening_range, vec![closing_range])]);
         editor.linked_edit_ranges = LinkedEditingRanges(linked_ranges);
     });
     let mut completion_handle =
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index f1ebd2c3df..b18d1ceae1 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -7209,7 +7209,7 @@ fn render_blame_entry_popover(
 ) -> Option<AnyElement> {
     let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
     let blame = blame.read(cx);
-    let repository = blame.repository(cx)?.clone();
+    let repository = blame.repository(cx)?;
     renderer.render_blame_entry_popover(
         blame_entry,
         scroll_handle,
@@ -9009,7 +9009,7 @@ impl Element for EditorElement {
                             .as_ref()
                             .map(|layout| (layout.bounds, layout.entry.clone())),
                         display_hunks: display_hunks.clone(),
-                        diff_hunk_control_bounds: diff_hunk_control_bounds.clone(),
+                        diff_hunk_control_bounds,
                     });
 
                     self.editor.update(cx, |editor, _| {
@@ -9894,7 +9894,7 @@ impl CursorLayout {
                 .px_0p5()
                 .line_height(text_size + px(2.))
                 .text_color(cursor_name.color)
-                .child(cursor_name.string.clone())
+                .child(cursor_name.string)
                 .into_any_element();
 
             name_element.prepaint_as_root(name_origin, AvailableSpace::min_size(), window, cx);
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index bb3fd2830d..497f193cb4 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -623,7 +623,7 @@ pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 
     let mut base_text_style = window.text_style();
     base_text_style.refine(&TextStyleRefinement {
-        font_family: Some(ui_font_family.clone()),
+        font_family: Some(ui_font_family),
         font_fallbacks: ui_font_fallbacks,
         color: Some(cx.theme().colors().editor_foreground),
         ..Default::default()
@@ -672,7 +672,7 @@ pub fn diagnostics_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
 
     let mut base_text_style = window.text_style();
     base_text_style.refine(&TextStyleRefinement {
-        font_family: Some(ui_font_family.clone()),
+        font_family: Some(ui_font_family),
         font_fallbacks: ui_font_fallbacks,
         color: Some(cx.theme().colors().editor_foreground),
         ..Default::default()
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
index a3fc41228f..83ab02814f 100644
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -507,7 +507,7 @@ pub(crate) fn handle_from(
 
             {
                 let selections = this
-                    .read_with(cx, |this, _| this.selections.disjoint_anchors().clone())
+                    .read_with(cx, |this, _| this.selections.disjoint_anchors())
                     .ok()?;
                 for selection in selections.iter() {
                     let Some(selection_buffer_offset_head) =
diff --git a/crates/editor/src/test/editor_test_context.rs b/crates/editor/src/test/editor_test_context.rs
index dbb519c40e..88721c59e7 100644
--- a/crates/editor/src/test/editor_test_context.rs
+++ b/crates/editor/src/test/editor_test_context.rs
@@ -119,13 +119,7 @@ impl EditorTestContext {
             for excerpt in excerpts.into_iter() {
                 let (text, ranges) = marked_text_ranges(excerpt, false);
                 let buffer = cx.new(|cx| Buffer::local(text, cx));
-                multibuffer.push_excerpts(
-                    buffer,
-                    ranges
-                        .into_iter()
-                        .map(|range| ExcerptRange::new(range.clone())),
-                    cx,
-                );
+                multibuffer.push_excerpts(buffer, ranges.into_iter().map(ExcerptRange::new), cx);
             }
             multibuffer
         });
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index 1d2bece5cc..c5a072eea1 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -103,7 +103,7 @@ fn main() {
     let languages: HashSet<String> = args.languages.into_iter().collect();
 
     let http_client = Arc::new(ReqwestClient::new());
-    let app = Application::headless().with_http_client(http_client.clone());
+    let app = Application::headless().with_http_client(http_client);
     let all_threads = examples::all(&examples_dir);
 
     app.run(move |cx| {
@@ -416,11 +416,7 @@ pub fn init(cx: &mut App) -> Arc<AgentAppState> {
 
     language::init(cx);
     debug_adapter_extension::init(extension_host_proxy.clone(), cx);
-    language_extension::init(
-        LspAccess::Noop,
-        extension_host_proxy.clone(),
-        languages.clone(),
-    );
+    language_extension::init(LspAccess::Noop, extension_host_proxy, languages.clone());
     language_model::init(client.clone(), cx);
     language_models::init(user_store.clone(), client.clone(), cx);
     languages::init(languages.clone(), node_runtime.clone(), cx);
@@ -530,7 +526,7 @@ async fn judge_example(
             example_name = example.name.clone(),
             example_repetition = example.repetition,
             diff_evaluation = judge_output.diff.clone(),
-            thread_evaluation = judge_output.thread.clone(),
+            thread_evaluation = judge_output.thread,
             tool_metrics = run_output.tool_metrics,
             response_count = run_output.response_count,
             token_usage = run_output.token_usage,
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
index 53ce6088c0..074cb121d3 100644
--- a/crates/eval/src/instance.rs
+++ b/crates/eval/src/instance.rs
@@ -90,11 +90,8 @@ impl ExampleInstance {
         worktrees_dir: &Path,
         repetition: usize,
     ) -> Self {
-        let name = thread.meta().name.to_string();
-        let run_directory = run_dir
-            .join(&name)
-            .join(repetition.to_string())
-            .to_path_buf();
+        let name = thread.meta().name;
+        let run_directory = run_dir.join(&name).join(repetition.to_string());
 
         let repo_path = repo_path_for_url(repos_dir, &thread.meta().url);
 
@@ -772,7 +769,7 @@ pub async fn query_lsp_diagnostics(
 }
 
 fn parse_assertion_result(response: &str) -> Result<RanAssertionResult> {
-    let analysis = get_tag("analysis", response)?.to_string();
+    let analysis = get_tag("analysis", response)?;
     let passed = match get_tag("passed", response)?.to_lowercase().as_str() {
         "true" => true,
         "false" => false,
diff --git a/crates/extension_host/src/capability_granter.rs b/crates/extension_host/src/capability_granter.rs
index 5a2093c1dd..5491967e08 100644
--- a/crates/extension_host/src/capability_granter.rs
+++ b/crates/extension_host/src/capability_granter.rs
@@ -145,7 +145,7 @@ mod tests {
                 command: "*".to_string(),
                 args: vec!["**".to_string()],
             })],
-            manifest.clone(),
+            manifest,
         );
         assert!(granter.grant_exec("ls", &["-la"]).is_ok());
     }
diff --git a/crates/extensions_ui/src/components/feature_upsell.rs b/crates/extensions_ui/src/components/feature_upsell.rs
index 573b0b992d..0515dd46d3 100644
--- a/crates/extensions_ui/src/components/feature_upsell.rs
+++ b/crates/extensions_ui/src/components/feature_upsell.rs
@@ -61,7 +61,6 @@ impl RenderOnce for FeatureUpsell {
                             .icon_size(IconSize::Small)
                             .icon_position(IconPosition::End)
                             .on_click({
-                                let docs_url = docs_url.clone();
                                 move |_event, _window, cx| {
                                     telemetry::event!(
                                         "Documentation Viewed",
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index a6ee84eb60..fd504764b6 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -694,7 +694,7 @@ impl ExtensionsPage {
                                 cx.open_url(&repository_url);
                             }
                         }))
-                        .tooltip(Tooltip::text(repository_url.clone()))
+                        .tooltip(Tooltip::text(repository_url))
                     })),
             )
     }
@@ -827,7 +827,7 @@ impl ExtensionsPage {
                                         cx.open_url(&repository_url);
                                     }
                                 }))
-                                .tooltip(Tooltip::text(repository_url.clone())),
+                                .tooltip(Tooltip::text(repository_url)),
                             )
                             .child(
                                 PopoverMenu::new(SharedString::from(format!(
diff --git a/crates/feedback/src/system_specs.rs b/crates/feedback/src/system_specs.rs
index b5ccaca689..87642ab929 100644
--- a/crates/feedback/src/system_specs.rs
+++ b/crates/feedback/src/system_specs.rs
@@ -31,7 +31,7 @@ impl SystemSpecs {
         let architecture = env::consts::ARCH;
         let commit_sha = match release_channel {
             ReleaseChannel::Dev | ReleaseChannel::Nightly => {
-                AppCommitSha::try_global(cx).map(|sha| sha.full().clone())
+                AppCommitSha::try_global(cx).map(|sha| sha.full())
             }
             _ => None,
         };
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 3a08ec08e0..40acf012c9 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1750,7 +1750,7 @@ impl PickerDelegate for FileFinderDelegate {
                                         Some(ContextMenu::build(window, cx, {
                                             let focus_handle = focus_handle.clone();
                                             move |menu, _, _| {
-                                                menu.context(focus_handle.clone())
+                                                menu.context(focus_handle)
                                                     .action(
                                                         "Split Left",
                                                         pane::SplitLeft.boxed_clone(),
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index ffe3d42a27..4625872e46 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -653,7 +653,7 @@ impl PickerDelegate for OpenPathDelegate {
                         if parent_path == &self.prompt_root {
                             format!("{}{}", self.prompt_root, candidate.path.string)
                         } else {
-                            candidate.path.string.clone()
+                            candidate.path.string
                         },
                         match_positions,
                     )),
@@ -684,7 +684,7 @@ impl PickerDelegate for OpenPathDelegate {
                                 };
                                 StyledText::new(label)
                                     .with_default_highlights(
-                                        &window.text_style().clone(),
+                                        &window.text_style(),
                                         vec![(
                                             delta..delta + label_len,
                                             HighlightStyle::color(Color::Conflict.color(cx)),
@@ -694,7 +694,7 @@ impl PickerDelegate for OpenPathDelegate {
                             } else {
                                 StyledText::new(format!("{label} (create)"))
                                     .with_default_highlights(
-                                        &window.text_style().clone(),
+                                        &window.text_style(),
                                         vec![(
                                             delta..delta + label_len,
                                             HighlightStyle::color(Color::Created.color(cx)),
diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
index 5b093ac6a0..8a67eddcd7 100644
--- a/crates/fs/src/fake_git_repo.rs
+++ b/crates/fs/src/fake_git_repo.rs
@@ -345,7 +345,7 @@ impl GitRepository for FakeGitRepository {
 
     fn create_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
         self.with_state_async(true, move |state| {
-            state.branches.insert(name.to_owned());
+            state.branches.insert(name);
             Ok(())
         })
     }
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 11177512c3..75312c5c0c 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1960,7 +1960,7 @@ impl FileHandle for FakeHandle {
         };
 
         if state.try_entry(&target, false).is_some() {
-            return Ok(target.clone());
+            return Ok(target);
         }
         anyhow::bail!("fake fd target not found")
     }
@@ -2256,7 +2256,7 @@ impl Fs for FakeFs {
 
     async fn load(&self, path: &Path) -> Result<String> {
         let content = self.load_internal(path).await?;
-        Ok(String::from_utf8(content.clone())?)
+        Ok(String::from_utf8(content)?)
     }
 
     async fn load_bytes(&self, path: &Path) -> Result<Vec<u8>> {
@@ -2412,7 +2412,7 @@ impl Fs for FakeFs {
             tx,
             original_path: path.to_owned(),
             fs_state: self.state.clone(),
-            prefixes: Mutex::new(vec![path.to_owned()]),
+            prefixes: Mutex::new(vec![path]),
         });
         (
             Box::pin(futures::StreamExt::filter(rx, {
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index a5ce21294f..6ad03ba6df 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -159,7 +159,7 @@ impl GlobalWatcher {
             path: path.clone(),
         };
         state.watchers.insert(id, registration_state);
-        *state.path_registrations.entry(path.clone()).or_insert(0) += 1;
+        *state.path_registrations.entry(path).or_insert(0) += 1;
 
         Ok(id)
     }
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
index f910de7bbe..2768e3dc68 100644
--- a/crates/git_ui/src/blame_ui.rs
+++ b/crates/git_ui/src/blame_ui.rs
@@ -172,7 +172,7 @@ impl BlameRenderer for GitBlameRenderer {
                 .clone()
                 .unwrap_or("<no name>".to_string())
                 .into(),
-            author_email: blame.author_mail.clone().unwrap_or("".to_string()).into(),
+            author_email: blame.author_mail.unwrap_or("".to_string()).into(),
             message: details,
         };
 
@@ -186,7 +186,7 @@ impl BlameRenderer for GitBlameRenderer {
             .get(0..8)
             .map(|sha| sha.to_string().into())
             .unwrap_or_else(|| commit_details.sha.clone());
-        let full_sha = commit_details.sha.to_string().clone();
+        let full_sha = commit_details.sha.to_string();
         let absolute_timestamp = format_local_timestamp(
             commit_details.commit_time,
             OffsetDateTime::now_utc(),
@@ -377,7 +377,7 @@ impl BlameRenderer for GitBlameRenderer {
                 has_parent: true,
             },
             repository.downgrade(),
-            workspace.clone(),
+            workspace,
             window,
             cx,
         )
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 6bb84db834..fb56cdcc5d 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -48,7 +48,7 @@ pub fn open(
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
-    let repository = workspace.project().read(cx).active_repository(cx).clone();
+    let repository = workspace.project().read(cx).active_repository(cx);
     let style = BranchListStyle::Modal;
     workspace.toggle_modal(window, cx, |window, cx| {
         BranchList::new(repository, style, rems(34.), window, cx)
@@ -144,7 +144,7 @@ impl BranchList {
         })
         .detach_and_log_err(cx);
 
-        let delegate = BranchListDelegate::new(repository.clone(), style);
+        let delegate = BranchListDelegate::new(repository, style);
         let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
 
         let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index 4303f53275..e1e6cee93c 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -35,7 +35,7 @@ impl ModalContainerProperties {
 
         // Calculate width based on character width
         let mut modal_width = 460.0;
-        let style = window.text_style().clone();
+        let style = window.text_style();
         let font_id = window.text_system().resolve_font(&style.font());
         let font_size = style.font_size.to_pixels(window.rem_size());
 
@@ -179,7 +179,7 @@ impl CommitModal {
 
         let commit_editor = git_panel.update(cx, |git_panel, cx| {
             git_panel.set_modal_open(true, cx);
-            let buffer = git_panel.commit_message_buffer(cx).clone();
+            let buffer = git_panel.commit_message_buffer(cx);
             let panel_editor = git_panel.commit_editor.clone();
             let project = git_panel.project.clone();
 
@@ -285,7 +285,7 @@ impl CommitModal {
                     Some(ContextMenu::build(window, cx, |context_menu, _, _| {
                         context_menu
                             .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                                el.context(keybinding_target.clone())
+                                el.context(keybinding_target)
                             })
                             .when(has_previous_commit, |this| {
                                 this.toggleable_entry(
@@ -482,7 +482,7 @@ impl CommitModal {
                         }),
                         self.render_git_commit_menu(
                             ElementId::Name(format!("split-button-right-{}", commit_label).into()),
-                            Some(focus_handle.clone()),
+                            Some(focus_handle),
                         )
                         .into_any_element(),
                     )),
diff --git a/crates/git_ui/src/commit_tooltip.rs b/crates/git_ui/src/commit_tooltip.rs
index 00ab911610..a470bc6925 100644
--- a/crates/git_ui/src/commit_tooltip.rs
+++ b/crates/git_ui/src/commit_tooltip.rs
@@ -181,7 +181,7 @@ impl Render for CommitTooltip {
             .get(0..8)
             .map(|sha| sha.to_string().into())
             .unwrap_or_else(|| self.commit.sha.clone());
-        let full_sha = self.commit.sha.to_string().clone();
+        let full_sha = self.commit.sha.to_string();
         let absolute_timestamp = format_local_timestamp(
             self.commit.commit_time,
             OffsetDateTime::now_utc(),
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
index 5c1b1325a5..ee1b82920d 100644
--- a/crates/git_ui/src/conflict_view.rs
+++ b/crates/git_ui/src/conflict_view.rs
@@ -55,7 +55,7 @@ pub fn register_editor(editor: &mut Editor, buffer: Entity<MultiBuffer>, cx: &mu
         buffers: Default::default(),
     });
 
-    let buffers = buffer.read(cx).all_buffers().clone();
+    let buffers = buffer.read(cx).all_buffers();
     for buffer in buffers {
         buffer_added(editor, buffer, cx);
     }
@@ -129,7 +129,7 @@ fn buffer_added(editor: &mut Editor, buffer: Entity<Buffer>, cx: &mut Context<Ed
             let subscription = cx.subscribe(&conflict_set, conflicts_updated);
             BufferConflicts {
                 block_ids: Vec::new(),
-                conflict_set: conflict_set.clone(),
+                conflict_set,
                 _subscription: subscription,
             }
         });
@@ -437,7 +437,6 @@ fn render_conflict_buttons(
             Button::new("both", "Use Both")
                 .label_size(LabelSize::Small)
                 .on_click({
-                    let editor = editor.clone();
                     let conflict = conflict.clone();
                     let ours = conflict.ours.clone();
                     let theirs = conflict.theirs.clone();
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 3eae1acb04..5a01514185 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1467,7 +1467,6 @@ impl GitPanel {
             .read(cx)
             .as_singleton()
             .unwrap()
-            .clone()
     }
 
     fn toggle_staged_for_selected(
@@ -3207,7 +3206,7 @@ impl GitPanel {
                     Some(ContextMenu::build(window, cx, |context_menu, _, _| {
                         context_menu
                             .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                                el.context(keybinding_target.clone())
+                                el.context(keybinding_target)
                             })
                             .when(has_previous_commit, |this| {
                                 this.toggleable_entry(
@@ -3387,7 +3386,7 @@ impl GitPanel {
         let enable_coauthors = self.render_co_authors(cx);
 
         let editor_focus_handle = self.commit_editor.focus_handle(cx);
-        let expand_tooltip_focus_handle = editor_focus_handle.clone();
+        let expand_tooltip_focus_handle = editor_focus_handle;
 
         let branch = active_repository.read(cx).branch.clone();
         let head_commit = active_repository.read(cx).head_commit.clone();
@@ -3416,7 +3415,7 @@ impl GitPanel {
                 display_name,
                 branch,
                 head_commit,
-                Some(git_panel.clone()),
+                Some(git_panel),
             ))
             .child(
                 panel_editor_container(window, cx)
@@ -3567,7 +3566,7 @@ impl GitPanel {
                 }),
                 self.render_git_commit_menu(
                     ElementId::Name(format!("split-button-right-{}", title).into()),
-                    Some(commit_tooltip_focus_handle.clone()),
+                    Some(commit_tooltip_focus_handle),
                     cx,
                 )
                 .into_any_element(),
@@ -3633,7 +3632,7 @@ impl GitPanel {
                                 CommitView::open(
                                     commit.clone(),
                                     repo.clone(),
-                                    workspace.clone().clone(),
+                                    workspace.clone(),
                                     window,
                                     cx,
                                 );
@@ -4341,7 +4340,7 @@ impl GitPanel {
                         }
                     })
                     .child(
-                        self.entry_label(display_name.clone(), label_color)
+                        self.entry_label(display_name, label_color)
                             .when(status.is_deleted(), |this| this.strikethrough()),
                     ),
             )
@@ -4690,7 +4689,7 @@ impl GitPanelMessageTooltip {
                     author_email: details.author_email.clone(),
                     commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
                     message: Some(ParsedCommitMessage {
-                        message: details.message.clone(),
+                        message: details.message,
                         ..Default::default()
                     }),
                 };
@@ -4823,7 +4822,7 @@ impl RenderOnce for PanelRepoFooter {
         };
 
         let truncated_branch_name = if branch_actual_len <= branch_display_len {
-            branch_name.to_string()
+            branch_name
         } else {
             util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
         };
@@ -4836,7 +4835,7 @@ impl RenderOnce for PanelRepoFooter {
 
         let repo_selector = PopoverMenu::new("repository-switcher")
             .menu({
-                let project = project.clone();
+                let project = project;
                 move |window, cx| {
                     let project = project.clone()?;
                     Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
@@ -5007,10 +5006,7 @@ impl Component for PanelRepoFooter {
                                 div()
                                     .w(example_width)
                                     .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(1).clone(),
-                                        None,
-                                    ))
+                                    .child(PanelRepoFooter::new_preview(active_repository(1), None))
                                     .into_any_element(),
                             ),
                             single_example(
@@ -5019,7 +5015,7 @@ impl Component for PanelRepoFooter {
                                     .w(example_width)
                                     .overflow_hidden()
                                     .child(PanelRepoFooter::new_preview(
-                                        active_repository(2).clone(),
+                                        active_repository(2),
                                         Some(branch(unknown_upstream)),
                                     ))
                                     .into_any_element(),
@@ -5030,7 +5026,7 @@ impl Component for PanelRepoFooter {
                                     .w(example_width)
                                     .overflow_hidden()
                                     .child(PanelRepoFooter::new_preview(
-                                        active_repository(3).clone(),
+                                        active_repository(3),
                                         Some(branch(no_remote_upstream)),
                                     ))
                                     .into_any_element(),
@@ -5041,7 +5037,7 @@ impl Component for PanelRepoFooter {
                                     .w(example_width)
                                     .overflow_hidden()
                                     .child(PanelRepoFooter::new_preview(
-                                        active_repository(4).clone(),
+                                        active_repository(4),
                                         Some(branch(not_ahead_or_behind_upstream)),
                                     ))
                                     .into_any_element(),
@@ -5052,7 +5048,7 @@ impl Component for PanelRepoFooter {
                                     .w(example_width)
                                     .overflow_hidden()
                                     .child(PanelRepoFooter::new_preview(
-                                        active_repository(5).clone(),
+                                        active_repository(5),
                                         Some(branch(behind_upstream)),
                                     ))
                                     .into_any_element(),
@@ -5063,7 +5059,7 @@ impl Component for PanelRepoFooter {
                                     .w(example_width)
                                     .overflow_hidden()
                                     .child(PanelRepoFooter::new_preview(
-                                        active_repository(6).clone(),
+                                        active_repository(6),
                                         Some(branch(ahead_of_upstream)),
                                     ))
                                     .into_any_element(),
@@ -5074,7 +5070,7 @@ impl Component for PanelRepoFooter {
                                     .w(example_width)
                                     .overflow_hidden()
                                     .child(PanelRepoFooter::new_preview(
-                                        active_repository(7).clone(),
+                                        active_repository(7),
                                         Some(branch(ahead_and_behind_upstream)),
                                     ))
                                     .into_any_element(),
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index 3b4196b8ec..5369b8b404 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -245,12 +245,12 @@ fn render_remote_button(
             }
             (0, 0) => None,
             (ahead, 0) => Some(remote_button::render_push_button(
-                keybinding_target.clone(),
+                keybinding_target,
                 id,
                 ahead,
             )),
             (ahead, behind) => Some(remote_button::render_pull_button(
-                keybinding_target.clone(),
+                keybinding_target,
                 id,
                 ahead,
                 behind,
@@ -425,16 +425,9 @@ mod remote_button {
         let command = command.into();
 
         if let Some(handle) = focus_handle {
-            Tooltip::with_meta_in(
-                label.clone(),
-                Some(action),
-                command.clone(),
-                &handle,
-                window,
-                cx,
-            )
+            Tooltip::with_meta_in(label, Some(action), command, &handle, window, cx)
         } else {
-            Tooltip::with_meta(label.clone(), Some(action), command.clone(), window, cx)
+            Tooltip::with_meta(label, Some(action), command, window, cx)
         }
     }
 
@@ -457,7 +450,7 @@ mod remote_button {
                 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
                     context_menu
                         .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                            el.context(keybinding_target.clone())
+                            el.context(keybinding_target)
                         })
                         .action("Fetch", git::Fetch.boxed_clone())
                         .action("Fetch From", git::FetchFrom.boxed_clone())
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index c1521004a2..524dbf13d3 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -242,7 +242,7 @@ impl ProjectDiff {
             TRACKED_NAMESPACE
         };
 
-        let path_key = PathKey::namespaced(namespace, entry.repo_path.0.clone());
+        let path_key = PathKey::namespaced(namespace, entry.repo_path.0);
 
         self.move_to_path(path_key, window, cx)
     }
@@ -448,10 +448,10 @@ impl ProjectDiff {
         let diff = diff.read(cx);
         let diff_hunk_ranges = diff
             .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx)
-            .map(|diff_hunk| diff_hunk.buffer_range.clone());
+            .map(|diff_hunk| diff_hunk.buffer_range);
         let conflicts = conflict_addon
             .conflict_set(snapshot.remote_id())
-            .map(|conflict_set| conflict_set.read(cx).snapshot().conflicts.clone())
+            .map(|conflict_set| conflict_set.read(cx).snapshot().conflicts)
             .unwrap_or_default();
         let conflicts = conflicts.iter().map(|conflict| conflict.range.clone());
 
@@ -737,7 +737,7 @@ impl Render for ProjectDiff {
                 } else {
                     None
                 };
-                let keybinding_focus_handle = self.focus_handle(cx).clone();
+                let keybinding_focus_handle = self.focus_handle(cx);
                 el.child(
                     v_flex()
                         .gap_1()
diff --git a/crates/git_ui/src/text_diff_view.rs b/crates/git_ui/src/text_diff_view.rs
index e38e3698d5..ebf32d1b99 100644
--- a/crates/git_ui/src/text_diff_view.rs
+++ b/crates/git_ui/src/text_diff_view.rs
@@ -48,7 +48,7 @@ impl TextDiffView {
 
         let selection_data = source_editor.update(cx, |editor, cx| {
             let multibuffer = editor.buffer().read(cx);
-            let source_buffer = multibuffer.as_singleton()?.clone();
+            let source_buffer = multibuffer.as_singleton()?;
             let selections = editor.selections.all::<Point>(cx);
             let buffer_snapshot = source_buffer.read(cx);
             let first_selection = selections.first()?;
@@ -259,7 +259,7 @@ async fn update_diff_buffer(
     let source_buffer_snapshot = source_buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
 
     let base_buffer_snapshot = clipboard_buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-    let base_text = base_buffer_snapshot.text().to_string();
+    let base_text = base_buffer_snapshot.text();
 
     let diff_snapshot = cx
         .update(|cx| {
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
index 908e61cac7..1913646aa1 100644
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -712,7 +712,7 @@ mod tests {
     ) -> Entity<GoToLine> {
         cx.dispatch_action(editor::actions::ToggleGoToLine);
         workspace.update(cx, |workspace, cx| {
-            workspace.active_modal::<GoToLine>(cx).unwrap().clone()
+            workspace.active_modal::<GoToLine>(cx).unwrap()
         })
     }
 
diff --git a/crates/gpui/examples/input.rs b/crates/gpui/examples/input.rs
index ae635c94b8..37115feaa5 100644
--- a/crates/gpui/examples/input.rs
+++ b/crates/gpui/examples/input.rs
@@ -446,7 +446,7 @@ impl Element for TextElement {
         let (display_text, text_color) = if content.is_empty() {
             (input.placeholder.clone(), hsla(0., 0., 0., 0.2))
         } else {
-            (content.clone(), style.color)
+            (content, style.color)
         };
 
         let run = TextRun {
@@ -474,7 +474,7 @@ impl Element for TextElement {
                 },
                 TextRun {
                     len: display_text.len() - marked_range.end,
-                    ..run.clone()
+                    ..run
                 },
             ]
             .into_iter()
diff --git a/crates/gpui/examples/text.rs b/crates/gpui/examples/text.rs
index 1166bb2795..66e9cff0aa 100644
--- a/crates/gpui/examples/text.rs
+++ b/crates/gpui/examples/text.rs
@@ -155,7 +155,7 @@ impl RenderOnce for Specimen {
             .text_size(px(font_size * scale))
             .line_height(relative(line_height))
             .p(px(10.0))
-            .child(self.string.clone())
+            .child(self.string)
     }
 }
 
diff --git a/crates/gpui/src/app/async_context.rs b/crates/gpui/src/app/async_context.rs
index d9d21c0244..5eb4362904 100644
--- a/crates/gpui/src/app/async_context.rs
+++ b/crates/gpui/src/app/async_context.rs
@@ -465,7 +465,7 @@ impl VisualContext for AsyncWindowContext {
         V: Focusable,
     {
         self.window.update(self, |_, window, cx| {
-            view.read(cx).focus_handle(cx).clone().focus(window);
+            view.read(cx).focus_handle(cx).focus(window);
         })
     }
 }
diff --git a/crates/gpui/src/app/entity_map.rs b/crates/gpui/src/app/entity_map.rs
index 6099ee5857..ea52b46d9f 100644
--- a/crates/gpui/src/app/entity_map.rs
+++ b/crates/gpui/src/app/entity_map.rs
@@ -231,14 +231,15 @@ impl AnyEntity {
         Self {
             entity_id: id,
             entity_type,
-            entity_map: entity_map.clone(),
             #[cfg(any(test, feature = "leak-detection"))]
             handle_id: entity_map
+                .clone()
                 .upgrade()
                 .unwrap()
                 .write()
                 .leak_detector
                 .handle_created(id),
+            entity_map,
         }
     }
 
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index a69d9d1e26..c65c045f6b 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -134,7 +134,7 @@ impl TestAppContext {
             app: App::new_app(platform.clone(), asset_source, http_client),
             background_executor,
             foreground_executor,
-            dispatcher: dispatcher.clone(),
+            dispatcher,
             test_platform: platform,
             text_system,
             fn_name,
@@ -339,7 +339,7 @@ impl TestAppContext {
 
     /// Returns all windows open in the test.
     pub fn windows(&self) -> Vec<AnyWindowHandle> {
-        self.app.borrow().windows().clone()
+        self.app.borrow().windows()
     }
 
     /// Run the given task on the main thread.
@@ -619,7 +619,7 @@ impl<V> Entity<V> {
                 }
             }),
             cx.subscribe(self, {
-                let mut tx = tx.clone();
+                let mut tx = tx;
                 move |_, _: &Evt, _| {
                     tx.blocking_send(()).ok();
                 }
@@ -1026,7 +1026,7 @@ impl VisualContext for VisualTestContext {
     fn focus<V: crate::Focusable>(&mut self, view: &Entity<V>) -> Self::Result<()> {
         self.window
             .update(&mut self.cx, |_, window, cx| {
-                view.read(cx).focus_handle(cx).clone().focus(window)
+                view.read(cx).focus_handle(cx).focus(window)
             })
             .unwrap()
     }
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index ae63819ca2..893860d7e1 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -475,7 +475,7 @@ impl Element for Img {
                         .paint_image(
                             new_bounds,
                             corner_radii,
-                            data.clone(),
+                            data,
                             layout_state.frame_index,
                             self.style.grayscale,
                         )
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index ef446a073e..87cabc8cd9 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -1046,7 +1046,7 @@ where
             size: self.size.clone()
                 + size(
                     amount.left.clone() + amount.right.clone(),
-                    amount.top.clone() + amount.bottom.clone(),
+                    amount.top.clone() + amount.bottom,
                 ),
         }
     }
@@ -1159,10 +1159,10 @@ where
     /// Computes the space available within outer bounds.
     pub fn space_within(&self, outer: &Self) -> Edges<T> {
         Edges {
-            top: self.top().clone() - outer.top().clone(),
-            right: outer.right().clone() - self.right().clone(),
-            bottom: outer.bottom().clone() - self.bottom().clone(),
-            left: self.left().clone() - outer.left().clone(),
+            top: self.top() - outer.top(),
+            right: outer.right() - self.right(),
+            bottom: outer.bottom() - self.bottom(),
+            left: self.left() - outer.left(),
         }
     }
 }
@@ -1712,7 +1712,7 @@ where
             top: self.top.clone() * rhs.top,
             right: self.right.clone() * rhs.right,
             bottom: self.bottom.clone() * rhs.bottom,
-            left: self.left.clone() * rhs.left,
+            left: self.left * rhs.left,
         }
     }
 }
@@ -2411,7 +2411,7 @@ where
             top_left: self.top_left.clone() * rhs.top_left,
             top_right: self.top_right.clone() * rhs.top_right,
             bottom_right: self.bottom_right.clone() * rhs.bottom_right,
-            bottom_left: self.bottom_left.clone() * rhs.bottom_left,
+            bottom_left: self.bottom_left * rhs.bottom_left,
         }
     }
 }
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index d007876590..757205fcc3 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -264,7 +264,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let (result, pending) = keymap.bindings_for_input(
             &[Keystroke::parse("ctrl-a").unwrap()],
@@ -290,7 +290,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         // binding is only enabled in a specific context
         assert!(
@@ -344,7 +344,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let space = || Keystroke::parse("space").unwrap();
         let w = || Keystroke::parse("w").unwrap();
@@ -396,7 +396,7 @@ mod tests {
             KeyBinding::new("space w x", ActionAlpha {}, Some("editor")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
@@ -410,7 +410,7 @@ mod tests {
             KeyBinding::new("space w w", NoAction {}, Some("editor")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
@@ -424,7 +424,7 @@ mod tests {
             KeyBinding::new("space w w", NoAction {}, Some("editor")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let space_editor = keymap.bindings_for_input(&[space()], &editor_workspace_context());
         assert!(space_editor.0.is_empty());
@@ -439,7 +439,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         // Ensure `space` results in pending input on the workspace, but not editor
         let (result, pending) = keymap.bindings_for_input(
@@ -455,7 +455,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         // Ensure `space` results in pending input on the workspace, but not editor
         let (result, pending) = keymap.bindings_for_input(
@@ -474,7 +474,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         // Ensure `space` results in pending input on the workspace, but not editor
         let (result, pending) = keymap.bindings_for_input(
@@ -494,7 +494,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         // Ensure `space` results in pending input on the workspace, but not editor
         let (result, pending) = keymap.bindings_for_input(
@@ -516,7 +516,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         // Ensure `space` results in pending input on the workspace, but not editor
         let (result, pending) = keymap.bindings_for_input(
@@ -537,7 +537,7 @@ mod tests {
             KeyBinding::new("ctrl-x 0", ActionAlpha, Some("Workspace")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let matched = keymap.bindings_for_input(
             &[Keystroke::parse("ctrl-x")].map(Result::unwrap),
@@ -560,7 +560,7 @@ mod tests {
             KeyBinding::new("ctrl-x 0", NoAction, Some("Workspace")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let matched = keymap.bindings_for_input(
             &[Keystroke::parse("ctrl-x")].map(Result::unwrap),
@@ -579,7 +579,7 @@ mod tests {
             KeyBinding::new("ctrl-x 0", NoAction, Some("vim_mode == normal")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let matched = keymap.bindings_for_input(
             &[Keystroke::parse("ctrl-x")].map(Result::unwrap),
@@ -602,7 +602,7 @@ mod tests {
             KeyBinding::new("ctrl-x", ActionBeta, Some("vim_mode == normal")),
         ];
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         let matched = keymap.bindings_for_input(
             &[Keystroke::parse("ctrl-x")].map(Result::unwrap),
@@ -629,7 +629,7 @@ mod tests {
         ];
 
         let mut keymap = Keymap::default();
-        keymap.add_bindings(bindings.clone());
+        keymap.add_bindings(bindings);
 
         assert_bindings(&keymap, &ActionAlpha {}, &["ctrl-a"]);
         assert_bindings(&keymap, &ActionBeta {}, &[]);
diff --git a/crates/gpui/src/keymap/context.rs b/crates/gpui/src/keymap/context.rs
index 976f99c26e..960bd1752f 100644
--- a/crates/gpui/src/keymap/context.rs
+++ b/crates/gpui/src/keymap/context.rs
@@ -668,11 +668,7 @@ mod tests {
         let contexts = vec![other_context.clone(), child_context.clone()];
         assert!(!predicate.eval(&contexts));
 
-        let contexts = vec![
-            parent_context.clone(),
-            other_context.clone(),
-            child_context.clone(),
-        ];
+        let contexts = vec![parent_context.clone(), other_context, child_context.clone()];
         assert!(predicate.eval(&contexts));
 
         assert!(!predicate.eval(&[]));
@@ -681,7 +677,7 @@ mod tests {
 
         let zany_predicate = KeyBindingContextPredicate::parse("child > child").unwrap();
         assert!(!zany_predicate.eval(slice::from_ref(&child_context)));
-        assert!(zany_predicate.eval(&[child_context.clone(), child_context.clone()]));
+        assert!(zany_predicate.eval(&[child_context.clone(), child_context]));
     }
 
     #[test]
@@ -718,7 +714,7 @@ mod tests {
         let not_descendant = KeyBindingContextPredicate::parse("parent > !child").unwrap();
         assert!(!not_descendant.eval(slice::from_ref(&parent_context)));
         assert!(!not_descendant.eval(slice::from_ref(&child_context)));
-        assert!(!not_descendant.eval(&[parent_context.clone(), child_context.clone()]));
+        assert!(!not_descendant.eval(&[parent_context, child_context]));
 
         let double_not = KeyBindingContextPredicate::parse("!!editor").unwrap();
         assert!(double_not.eval(slice::from_ref(&editor_context)));
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 399411843b..3fb1ef4572 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -108,13 +108,13 @@ impl LinuxCommon {
 
         let callbacks = PlatformHandlers::default();
 
-        let dispatcher = Arc::new(LinuxDispatcher::new(main_sender.clone()));
+        let dispatcher = Arc::new(LinuxDispatcher::new(main_sender));
 
         let background_executor = BackgroundExecutor::new(dispatcher.clone());
 
         let common = LinuxCommon {
             background_executor,
-            foreground_executor: ForegroundExecutor::new(dispatcher.clone()),
+            foreground_executor: ForegroundExecutor::new(dispatcher),
             text_system,
             appearance: WindowAppearance::Light,
             auto_hide_scrollbars: false,
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 2fe1da067b..189cfa1954 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -1280,7 +1280,6 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                 let Some(focused_window) = focused_window else {
                     return;
                 };
-                let focused_window = focused_window.clone();
 
                 let keymap_state = state.keymap_state.as_ref().unwrap();
                 let keycode = Keycode::from(key + MIN_KEYCODE);
diff --git a/crates/gpui/src/platform/linux/wayland/cursor.rs b/crates/gpui/src/platform/linux/wayland/cursor.rs
index a21263ccfe..c7c9139dea 100644
--- a/crates/gpui/src/platform/linux/wayland/cursor.rs
+++ b/crates/gpui/src/platform/linux/wayland/cursor.rs
@@ -67,7 +67,7 @@ impl Cursor {
         {
             self.loaded_theme = Some(LoadedTheme {
                 theme,
-                name: theme_name.map(|name| name.to_string()),
+                name: theme_name,
                 scaled_size: self.scaled_size,
             });
         }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 68198a285f..d501170892 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -1329,7 +1329,7 @@ impl X11Client {
         state.composing = false;
         drop(state);
         if let Some(mut keystroke) = keystroke {
-            keystroke.key_char = Some(text.clone());
+            keystroke.key_char = Some(text);
             window.handle_input(PlatformInput::KeyDown(crate::KeyDownEvent {
                 keystroke,
                 is_held: false,
diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 49a5edceb2..9e5d6ec5ff 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -332,7 +332,7 @@ impl MetalRenderer {
         self.path_intermediate_texture = Some(self.device.new_texture(&texture_descriptor));
 
         if self.path_sample_count > 1 {
-            let mut msaa_descriptor = texture_descriptor.clone();
+            let mut msaa_descriptor = texture_descriptor;
             msaa_descriptor.set_texture_type(metal::MTLTextureType::D2Multisample);
             msaa_descriptor.set_storage_mode(metal::MTLStorageMode::Private);
             msaa_descriptor.set_sample_count(self.path_sample_count as _);
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 2b4914baed..00afcd81b5 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -187,14 +187,14 @@ impl TestPlatform {
             .push_back(TestPrompt {
                 msg: msg.to_string(),
                 detail: detail.map(|s| s.to_string()),
-                answers: answers.clone(),
+                answers,
                 tx,
             });
         rx
     }
 
     pub(crate) fn set_active_window(&self, window: Option<TestWindow>) {
-        let executor = self.foreground_executor().clone();
+        let executor = self.foreground_executor();
         let previous_window = self.active_window.borrow_mut().take();
         self.active_window.borrow_mut().clone_from(&window);
 
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index 607163b577..4def6a11a5 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -956,7 +956,7 @@ impl WindowsWindowInner {
                 click_count,
                 first_mouse: false,
             });
-            let result = func(input.clone());
+            let result = func(input);
             let handled = !result.propagate || result.default_prevented;
             self.state.borrow_mut().callbacks.input = Some(func);
 
diff --git a/crates/gpui/src/shared_string.rs b/crates/gpui/src/shared_string.rs
index a34b7502f0..350184d350 100644
--- a/crates/gpui/src/shared_string.rs
+++ b/crates/gpui/src/shared_string.rs
@@ -108,7 +108,7 @@ impl From<SharedString> for Arc<str> {
     fn from(val: SharedString) -> Self {
         match val.0 {
             ArcCow::Borrowed(borrowed) => Arc::from(borrowed),
-            ArcCow::Owned(owned) => owned.clone(),
+            ArcCow::Owned(owned) => owned,
         }
     }
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 89c1595a3f..0791dcc621 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2453,7 +2453,7 @@ impl Window {
     /// time.
     pub fn get_asset<A: Asset>(&mut self, source: &A::Source, cx: &mut App) -> Option<A::Output> {
         let (task, _) = cx.fetch_asset::<A>(source);
-        task.clone().now_or_never()
+        task.now_or_never()
     }
     /// Obtain the current element offset. This method should only be called during the
     /// prepaint phase of element drawing.
@@ -3044,7 +3044,7 @@ impl Window {
 
         let tile = self
             .sprite_atlas
-            .get_or_insert_with(&params.clone().into(), &mut || {
+            .get_or_insert_with(&params.into(), &mut || {
                 Ok(Some((
                     data.size(frame_index),
                     Cow::Borrowed(
@@ -3731,7 +3731,7 @@ impl Window {
                 self.dispatch_keystroke_observers(
                     event,
                     Some(binding.action),
-                    match_result.context_stack.clone(),
+                    match_result.context_stack,
                     cx,
                 );
                 self.pending_input_changed(cx);
@@ -4442,7 +4442,7 @@ impl Window {
                         if let Some((_, inspector_id)) =
                             self.hovered_inspector_hitbox(inspector, &self.rendered_frame)
                         {
-                            inspector.set_active_element_id(inspector_id.clone(), self);
+                            inspector.set_active_element_id(inspector_id, self);
                         }
                     }
                 });
@@ -4583,7 +4583,7 @@ impl<V: 'static + Render> WindowHandle<V> {
     where
         C: AppContext,
     {
-        cx.read_window(self, |root_view, _cx| root_view.clone())
+        cx.read_window(self, |root_view, _cx| root_view)
     }
 
     /// Check if this window is 'active'.
diff --git a/crates/gpui_macros/tests/derive_inspector_reflection.rs b/crates/gpui_macros/tests/derive_inspector_reflection.rs
index 522c0a62c4..aab44a70ce 100644
--- a/crates/gpui_macros/tests/derive_inspector_reflection.rs
+++ b/crates/gpui_macros/tests/derive_inspector_reflection.rs
@@ -106,9 +106,7 @@ fn test_derive_inspector_reflection() {
         .invoke(num.clone());
     assert_eq!(incremented, Number(6));
 
-    let quadrupled = find_method::<Number>("quadruple")
-        .unwrap()
-        .invoke(num.clone());
+    let quadrupled = find_method::<Number>("quadruple").unwrap().invoke(num);
     assert_eq!(quadrupled, Number(20));
 
     // Try to invoke a non-existent method
diff --git a/crates/http_client/src/async_body.rs b/crates/http_client/src/async_body.rs
index 473849f3cd..6b99a54a7d 100644
--- a/crates/http_client/src/async_body.rs
+++ b/crates/http_client/src/async_body.rs
@@ -40,7 +40,7 @@ impl AsyncBody {
     }
 
     pub fn from_bytes(bytes: Bytes) -> Self {
-        Self(Inner::Bytes(Cursor::new(bytes.clone())))
+        Self(Inner::Bytes(Cursor::new(bytes)))
     }
 }
 
diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs
index 81dc36093b..c09ab6f764 100644
--- a/crates/journal/src/journal.rs
+++ b/crates/journal/src/journal.rs
@@ -123,7 +123,7 @@ pub fn new_journal_entry(workspace: &Workspace, window: &mut Window, cx: &mut Ap
     }
 
     let app_state = workspace.app_state().clone();
-    let view_snapshot = workspace.weak_handle().clone();
+    let view_snapshot = workspace.weak_handle();
 
     window
         .spawn(cx, async move |cx| {
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index cc96022e63..b106110c33 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -974,8 +974,6 @@ impl Buffer {
                 TextBuffer::new_normalized(0, buffer_id, Default::default(), text).snapshot();
             let mut syntax = SyntaxMap::new(&text).snapshot();
             if let Some(language) = language.clone() {
-                let text = text.clone();
-                let language = language.clone();
                 let language_registry = language_registry.clone();
                 syntax.reparse(&text, language_registry, language);
             }
@@ -1020,9 +1018,6 @@ impl Buffer {
         let text = TextBuffer::new_normalized(0, buffer_id, Default::default(), text).snapshot();
         let mut syntax = SyntaxMap::new(&text).snapshot();
         if let Some(language) = language.clone() {
-            let text = text.clone();
-            let language = language.clone();
-            let language_registry = language_registry.clone();
             syntax.reparse(&text, language_registry, language);
         }
         BufferSnapshot {
@@ -2206,7 +2201,7 @@ impl Buffer {
         self.remote_selections.insert(
             AGENT_REPLICA_ID,
             SelectionSet {
-                selections: selections.clone(),
+                selections,
                 lamport_timestamp,
                 line_mode,
                 cursor_shape,
@@ -3006,9 +3001,9 @@ impl BufferSnapshot {
         }
 
         let mut error_ranges = Vec::<Range<Point>>::new();
-        let mut matches = self.syntax.matches(range.clone(), &self.text, |grammar| {
-            grammar.error_query.as_ref()
-        });
+        let mut matches = self
+            .syntax
+            .matches(range, &self.text, |grammar| grammar.error_query.as_ref());
         while let Some(mat) = matches.peek() {
             let node = mat.captures[0].node;
             let start = Point::from_ts_point(node.start_position());
@@ -4075,7 +4070,7 @@ impl BufferSnapshot {
         // Get the ranges of the innermost pair of brackets.
         let mut result: Option<(Range<usize>, Range<usize>)> = None;
 
-        for pair in self.enclosing_bracket_ranges(range.clone()) {
+        for pair in self.enclosing_bracket_ranges(range) {
             if let Some(range_filter) = range_filter
                 && !range_filter(pair.open_range.clone(), pair.close_range.clone())
             {
@@ -4248,7 +4243,7 @@ impl BufferSnapshot {
                         .map(|(range, name)| {
                             (
                                 name.to_string(),
-                                self.text_for_range(range.clone()).collect::<String>(),
+                                self.text_for_range(range).collect::<String>(),
                             )
                         })
                         .collect();
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 2e2df7e658..ce65afa628 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -1744,7 +1744,7 @@ fn test_autoindent_block_mode(cx: &mut App) {
         buffer.edit(
             [(Point::new(2, 8)..Point::new(2, 8), inserted_text)],
             Some(AutoindentMode::Block {
-                original_indent_columns: original_indent_columns.clone(),
+                original_indent_columns,
             }),
             cx,
         );
@@ -1790,9 +1790,9 @@ fn test_autoindent_block_mode_with_newline(cx: &mut App) {
         "#
         .unindent();
         buffer.edit(
-            [(Point::new(2, 0)..Point::new(2, 0), inserted_text.clone())],
+            [(Point::new(2, 0)..Point::new(2, 0), inserted_text)],
             Some(AutoindentMode::Block {
-                original_indent_columns: original_indent_columns.clone(),
+                original_indent_columns,
             }),
             cx,
         );
@@ -1843,7 +1843,7 @@ fn test_autoindent_block_mode_without_original_indent_columns(cx: &mut App) {
         buffer.edit(
             [(Point::new(2, 0)..Point::new(2, 0), inserted_text)],
             Some(AutoindentMode::Block {
-                original_indent_columns: original_indent_columns.clone(),
+                original_indent_columns,
             }),
             cx,
         );
@@ -2030,7 +2030,7 @@ fn test_autoindent_with_injected_languages(cx: &mut App) {
 
     let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
     language_registry.add(html_language.clone());
-    language_registry.add(javascript_language.clone());
+    language_registry.add(javascript_language);
 
     cx.new(|cx| {
         let (text, ranges) = marked_text_ranges(
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 87fc846a53..7ae77c9141 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -206,7 +206,7 @@ impl CachedLspAdapter {
     }
 
     pub fn name(&self) -> LanguageServerName {
-        self.adapter.name().clone()
+        self.adapter.name()
     }
 
     pub async fn get_language_server_command(
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index be68dc1e9f..4f07240e44 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -432,7 +432,7 @@ impl LanguageRegistry {
             let mut state = self.state.write();
             state
                 .lsp_adapters
-                .entry(language_name.clone())
+                .entry(language_name)
                 .or_default()
                 .push(adapter.clone());
             state.all_lsp_adapters.insert(adapter.name(), adapter);
@@ -454,7 +454,7 @@ impl LanguageRegistry {
         let cached_adapter = CachedLspAdapter::new(Arc::new(adapter));
         state
             .lsp_adapters
-            .entry(language_name.clone())
+            .entry(language_name)
             .or_default()
             .push(cached_adapter.clone());
         state
@@ -1167,8 +1167,7 @@ impl LanguageRegistryState {
                 soft_wrap: language.config.soft_wrap,
                 auto_indent_on_paste: language.config.auto_indent_on_paste,
                 ..Default::default()
-            }
-            .clone(),
+            },
         );
         self.languages.push(language);
         self.version += 1;
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index fbb67a9818..90a59ce066 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -199,7 +199,7 @@ impl LanguageSettings {
                 if language_server.0.as_ref() == Self::REST_OF_LANGUAGE_SERVERS {
                     rest.clone()
                 } else {
-                    vec![language_server.clone()]
+                    vec![language_server]
                 }
             })
             .collect::<Vec<_>>()
@@ -1793,7 +1793,7 @@ mod tests {
         assert!(!settings.enabled_for_file(&dot_env_file, &cx));
 
         // Test tilde expansion
-        let home = shellexpand::tilde("~").into_owned().to_string();
+        let home = shellexpand::tilde("~").into_owned();
         let home_file = make_test_file(&[&home, "test.rs"]);
         let settings = build_settings(&["~/test.rs"]);
         assert!(!settings.enabled_for_file(&home_file, &cx));
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
index f10056af13..38aad007fe 100644
--- a/crates/language/src/syntax_map.rs
+++ b/crates/language/src/syntax_map.rs
@@ -832,7 +832,7 @@ impl SyntaxSnapshot {
         query: fn(&Grammar) -> Option<&Query>,
     ) -> SyntaxMapCaptures<'a> {
         SyntaxMapCaptures::new(
-            range.clone(),
+            range,
             text,
             [SyntaxLayer {
                 language,
diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs
index d576c95cd5..622731b781 100644
--- a/crates/language/src/syntax_map/syntax_map_tests.rs
+++ b/crates/language/src/syntax_map/syntax_map_tests.rs
@@ -58,8 +58,7 @@ fn test_splice_included_ranges() {
     assert_eq!(change, 0..1);
 
     // does not create overlapping ranges
-    let (new_ranges, change) =
-        splice_included_ranges(ranges.clone(), &[0..18], &[ts_range(20..32)]);
+    let (new_ranges, change) = splice_included_ranges(ranges, &[0..18], &[ts_range(20..32)]);
     assert_eq!(
         new_ranges,
         &[ts_range(20..32), ts_range(50..60), ts_range(80..90)]
@@ -104,7 +103,7 @@ fn test_syntax_map_layers_for_range(cx: &mut App) {
     );
 
     let mut syntax_map = SyntaxMap::new(&buffer);
-    syntax_map.set_language_registry(registry.clone());
+    syntax_map.set_language_registry(registry);
     syntax_map.reparse(language.clone(), &buffer);
 
     assert_layers_for_range(
@@ -165,7 +164,7 @@ fn test_syntax_map_layers_for_range(cx: &mut App) {
     // Put the vec! macro back, adding back the syntactic layer.
     buffer.undo();
     syntax_map.interpolate(&buffer);
-    syntax_map.reparse(language.clone(), &buffer);
+    syntax_map.reparse(language, &buffer);
 
     assert_layers_for_range(
         &syntax_map,
@@ -252,8 +251,8 @@ fn test_dynamic_language_injection(cx: &mut App) {
     assert!(syntax_map.contains_unknown_injections());
 
     registry.add(Arc::new(html_lang()));
-    syntax_map.reparse(markdown.clone(), &buffer);
-    syntax_map.reparse(markdown_inline.clone(), &buffer);
+    syntax_map.reparse(markdown, &buffer);
+    syntax_map.reparse(markdown_inline, &buffer);
     assert_layers_for_range(
         &syntax_map,
         &buffer,
@@ -862,7 +861,7 @@ fn test_syntax_map_languages_loading_with_erb(cx: &mut App) {
     log::info!("editing");
     buffer.edit_via_marked_text(&text);
     syntax_map.interpolate(&buffer);
-    syntax_map.reparse(language.clone(), &buffer);
+    syntax_map.reparse(language, &buffer);
 
     assert_capture_ranges(
         &syntax_map,
@@ -986,7 +985,7 @@ fn test_random_edits(
     syntax_map.reparse(language.clone(), &buffer);
 
     let mut reference_syntax_map = SyntaxMap::new(&buffer);
-    reference_syntax_map.set_language_registry(registry.clone());
+    reference_syntax_map.set_language_registry(registry);
 
     log::info!("initial text:\n{}", buffer.text());
 
diff --git a/crates/language/src/text_diff.rs b/crates/language/src/text_diff.rs
index 1e3e12758d..cb2242a6b1 100644
--- a/crates/language/src/text_diff.rs
+++ b/crates/language/src/text_diff.rs
@@ -88,11 +88,11 @@ pub fn text_diff_with_options(
                 let new_offset = new_byte_range.start;
                 hunk_input.clear();
                 hunk_input.update_before(tokenize(
-                    &old_text[old_byte_range.clone()],
+                    &old_text[old_byte_range],
                     options.language_scope.clone(),
                 ));
                 hunk_input.update_after(tokenize(
-                    &new_text[new_byte_range.clone()],
+                    &new_text[new_byte_range],
                     options.language_scope.clone(),
                 ));
                 diff_internal(&hunk_input, |old_byte_range, new_byte_range, _, _| {
@@ -103,7 +103,7 @@ pub fn text_diff_with_options(
                     let replacement_text = if new_byte_range.is_empty() {
                         empty.clone()
                     } else {
-                        new_text[new_byte_range.clone()].into()
+                        new_text[new_byte_range].into()
                     };
                     edits.push((old_byte_range, replacement_text));
                 });
@@ -111,9 +111,9 @@ pub fn text_diff_with_options(
                 let replacement_text = if new_byte_range.is_empty() {
                     empty.clone()
                 } else {
-                    new_text[new_byte_range.clone()].into()
+                    new_text[new_byte_range].into()
                 };
-                edits.push((old_byte_range.clone(), replacement_text));
+                edits.push((old_byte_range, replacement_text));
             }
         },
     );
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index b10529c3d9..158bebcbbf 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -54,7 +54,7 @@ pub const ZED_CLOUD_PROVIDER_NAME: LanguageModelProviderName =
 
 pub fn init(client: Arc<Client>, cx: &mut App) {
     init_settings(cx);
-    RefreshLlmTokenListener::register(client.clone(), cx);
+    RefreshLlmTokenListener::register(client, cx);
 }
 
 pub fn init_settings(cx: &mut App) {
@@ -538,7 +538,7 @@ pub trait LanguageModel: Send + Sync {
             if let Some(first_event) = events.next().await {
                 match first_event {
                     Ok(LanguageModelCompletionEvent::StartMessage { message_id: id }) => {
-                        message_id = Some(id.clone());
+                        message_id = Some(id);
                     }
                     Ok(LanguageModelCompletionEvent::Text(text)) => {
                         first_item_text = Some(text);
diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs
index 0e10050dae..8a7f3456fb 100644
--- a/crates/language_model/src/model/cloud_model.rs
+++ b/crates/language_model/src/model/cloud_model.rs
@@ -82,7 +82,7 @@ impl LlmApiToken {
 
         let response = client.cloud_client().create_llm_token(system_id).await?;
         *lock = Some(response.token.0.clone());
-        Ok(response.token.0.clone())
+        Ok(response.token.0)
     }
 }
 
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
index 18e6f47ed0..738b72b0c9 100644
--- a/crates/language_models/src/language_models.rs
+++ b/crates/language_models/src/language_models.rs
@@ -104,7 +104,7 @@ fn register_language_model_providers(
     cx: &mut Context<LanguageModelRegistry>,
 ) {
     registry.register_provider(
-        CloudLanguageModelProvider::new(user_store.clone(), client.clone(), cx),
+        CloudLanguageModelProvider::new(user_store, client.clone(), cx),
         cx,
     );
 
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 193d218094..178c767950 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -917,7 +917,7 @@ pub fn map_to_language_model_completion_events(
                             Some(ContentBlockDelta::ReasoningContent(thinking)) => match thinking {
                                 ReasoningContentBlockDelta::Text(thoughts) => {
                                     Some(Ok(LanguageModelCompletionEvent::Thinking {
-                                        text: thoughts.clone(),
+                                        text: thoughts,
                                         signature: None,
                                     }))
                                 }
@@ -968,7 +968,7 @@ pub fn map_to_language_model_completion_events(
                                         id: tool_use.id.into(),
                                         name: tool_use.name.into(),
                                         is_input_complete: true,
-                                        raw_input: tool_use.input_json.clone(),
+                                        raw_input: tool_use.input_json,
                                         input,
                                     },
                                 ))
@@ -1086,21 +1086,18 @@ impl ConfigurationView {
             .access_key_id_editor
             .read(cx)
             .text(cx)
-            .to_string()
             .trim()
             .to_string();
         let secret_access_key = self
             .secret_access_key_editor
             .read(cx)
             .text(cx)
-            .to_string()
             .trim()
             .to_string();
         let session_token = self
             .session_token_editor
             .read(cx)
             .text(cx)
-            .to_string()
             .trim()
             .to_string();
         let session_token = if session_token.is_empty() {
@@ -1108,13 +1105,7 @@ impl ConfigurationView {
         } else {
             Some(session_token)
         };
-        let region = self
-            .region_editor
-            .read(cx)
-            .text(cx)
-            .to_string()
-            .trim()
-            .to_string();
+        let region = self.region_editor.read(cx).text(cx).trim().to_string();
         let region = if region.is_empty() {
             "us-east-1".to_string()
         } else {
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index d3fee7b63b..b1b5ff3eb3 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -140,7 +140,7 @@ impl State {
         Self {
             client: client.clone(),
             llm_api_token: LlmApiToken::default(),
-            user_store: user_store.clone(),
+            user_store,
             status,
             accept_terms_of_service_task: None,
             models: Vec::new(),
@@ -307,7 +307,7 @@ impl CloudLanguageModelProvider {
 
         Self {
             client,
-            state: state.clone(),
+            state,
             _maintain_client_status: maintain_client_status,
         }
     }
@@ -320,7 +320,7 @@ impl CloudLanguageModelProvider {
         Arc::new(CloudLanguageModel {
             id: LanguageModelId(SharedString::from(model.id.0.clone())),
             model,
-            llm_api_token: llm_api_token.clone(),
+            llm_api_token,
             client: self.client.clone(),
             request_limiter: RateLimiter::new(4),
         })
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index a36ce949b1..c8d4151e8b 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -387,7 +387,7 @@ impl LanguageModel for GoogleLanguageModel {
         cx: &App,
     ) -> BoxFuture<'static, Result<u64>> {
         let model_id = self.model.request_id().to_string();
-        let request = into_google(request, model_id.clone(), self.model.mode());
+        let request = into_google(request, model_id, self.model.mode());
         let http_client = self.http_client.clone();
         let api_key = self.state.read(cx).api_key.clone();
 
diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
index 7ac08f2c15..80b28a396b 100644
--- a/crates/language_models/src/provider/lmstudio.rs
+++ b/crates/language_models/src/provider/lmstudio.rs
@@ -210,7 +210,7 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
             .map(|model| {
                 Arc::new(LmStudioLanguageModel {
                     id: LanguageModelId::from(model.name.clone()),
-                    model: model.clone(),
+                    model,
                     http_client: self.http_client.clone(),
                     request_limiter: RateLimiter::new(4),
                 }) as Arc<dyn LanguageModel>
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 93844542ea..3f2d47fba3 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -237,7 +237,7 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
             .map(|model| {
                 Arc::new(OllamaLanguageModel {
                     id: LanguageModelId::from(model.name.clone()),
-                    model: model.clone(),
+                    model,
                     http_client: self.http_client.clone(),
                     request_limiter: RateLimiter::new(4),
                 }) as Arc<dyn LanguageModel>
diff --git a/crates/language_models/src/ui/instruction_list_item.rs b/crates/language_models/src/ui/instruction_list_item.rs
index 3dee97aff6..bdb5fbe242 100644
--- a/crates/language_models/src/ui/instruction_list_item.rs
+++ b/crates/language_models/src/ui/instruction_list_item.rs
@@ -37,7 +37,7 @@ impl IntoElement for InstructionListItem {
         let item_content = if let (Some(button_label), Some(button_link)) =
             (self.button_label, self.button_link)
         {
-            let link = button_link.clone();
+            let link = button_link;
             let unique_id = SharedString::from(format!("{}-button", self.label));
 
             h_flex()
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index 3285efaaef..43c0365291 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -406,10 +406,7 @@ impl LogStore {
             server_state.worktree_id = Some(worktree_id);
         }
 
-        if let Some(server) = server
-            .clone()
-            .filter(|_| server_state.io_logs_subscription.is_none())
-        {
+        if let Some(server) = server.filter(|_| server_state.io_logs_subscription.is_none()) {
             let io_tx = self.io_tx.clone();
             let server_id = server.server_id();
             server_state.io_logs_subscription = Some(server.on_io(move |io_kind, message| {
@@ -930,7 +927,7 @@ impl LspLogView {
                         let state = log_store.language_servers.get(&server_id)?;
                         Some(LogMenuItem {
                             server_id,
-                            server_name: name.clone(),
+                            server_name: name,
                             server_kind: state.kind.clone(),
                             worktree_root_name: "supplementary".to_string(),
                             rpc_trace_enabled: state.rpc_state.is_some(),
@@ -1527,7 +1524,7 @@ impl Render for LspLogToolbarItemView {
                                             .icon_color(Color::Muted),
                                         )
                                         .menu({
-                                            let log_view = log_view.clone();
+                                            let log_view = log_view;
 
                                             move |window, cx| {
                                                 let id = log_view.read(cx).current_server_id?;
@@ -1595,7 +1592,7 @@ impl Render for LspLogToolbarItemView {
                                             .icon_color(Color::Muted),
                                         )
                                         .menu({
-                                            let log_view = log_view.clone();
+                                            let log_view = log_view;
 
                                             move |window, cx| {
                                                 let id = log_view.read(cx).current_server_id?;
diff --git a/crates/language_tools/src/syntax_tree_view.rs b/crates/language_tools/src/syntax_tree_view.rs
index 4fe8e11f94..cf84ac34c4 100644
--- a/crates/language_tools/src/syntax_tree_view.rs
+++ b/crates/language_tools/src/syntax_tree_view.rs
@@ -156,7 +156,7 @@ impl SyntaxTreeView {
                 .buffer_snapshot
                 .range_to_buffer_ranges(selection_range)
                 .pop()?;
-            let buffer = multi_buffer.buffer(buffer.remote_id()).unwrap().clone();
+            let buffer = multi_buffer.buffer(buffer.remote_id()).unwrap();
             Some((buffer, range, excerpt_id))
         })?;
 
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index 999d4a74c3..2820f55a49 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -22,7 +22,7 @@ impl CLspAdapter {
 #[async_trait(?Send)]
 impl super::LspAdapter for CLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn check_if_user_installed(
@@ -253,8 +253,7 @@ impl super::LspAdapter for CLspAdapter {
                     .grammar()
                     .and_then(|g| g.highlight_id_for_name(highlight_name?))
                 {
-                    let mut label =
-                        CodeLabel::plain(label.to_string(), completion.filter_text.as_deref());
+                    let mut label = CodeLabel::plain(label, completion.filter_text.as_deref());
                     label.runs.push((
                         0..label.text.rfind('(').unwrap_or(label.text.len()),
                         highlight_id,
@@ -264,10 +263,7 @@ impl super::LspAdapter for CLspAdapter {
             }
             _ => {}
         }
-        Some(CodeLabel::plain(
-            label.to_string(),
-            completion.filter_text.as_deref(),
-        ))
+        Some(CodeLabel::plain(label, completion.filter_text.as_deref()))
     }
 
     async fn label_for_symbol(
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index d6f9538ee4..24e2ca2f56 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -53,7 +53,7 @@ const BINARY: &str = if cfg!(target_os = "windows") {
 #[async_trait(?Send)]
 impl super::LspAdapter for GoLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn fetch_latest_server_version(
@@ -525,7 +525,7 @@ impl ContextProvider for GoContextProvider {
                     })
                     .unwrap_or_else(|| format!("{}", buffer_dir.to_string_lossy()));
 
-                (GO_PACKAGE_TASK_VARIABLE.clone(), package_name.to_string())
+                (GO_PACKAGE_TASK_VARIABLE.clone(), package_name)
             });
 
         let go_module_root_variable = local_abs_path
@@ -702,7 +702,7 @@ impl ContextProvider for GoContextProvider {
                 label: format!("go generate {}", GO_PACKAGE_TASK_VARIABLE.template_value()),
                 command: "go".into(),
                 args: vec!["generate".into()],
-                cwd: package_cwd.clone(),
+                cwd: package_cwd,
                 tags: vec!["go-generate".to_owned()],
                 ..TaskTemplate::default()
             },
@@ -710,7 +710,7 @@ impl ContextProvider for GoContextProvider {
                 label: "go generate ./...".into(),
                 command: "go".into(),
                 args: vec!["generate".into(), "./...".into()],
-                cwd: module_cwd.clone(),
+                cwd: module_cwd,
                 ..TaskTemplate::default()
             },
         ])))
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index ac653d5b2e..4fcf865568 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -488,7 +488,7 @@ impl NodeVersionAdapter {
 #[async_trait(?Send)]
 impl LspAdapter for NodeVersionAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn fetch_latest_server_version(
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 75289dd59d..d391e67d33 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -104,7 +104,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
     let typescript_context = Arc::new(typescript::TypeScriptContextProvider::new());
     let typescript_lsp_adapter = Arc::new(typescript::TypeScriptLspAdapter::new(node.clone()));
     let vtsls_adapter = Arc::new(vtsls::VtslsLspAdapter::new(node.clone()));
-    let yaml_lsp_adapter = Arc::new(yaml::YamlLspAdapter::new(node.clone()));
+    let yaml_lsp_adapter = Arc::new(yaml::YamlLspAdapter::new(node));
 
     let built_in_languages = [
         LanguageInfo {
@@ -119,12 +119,12 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         },
         LanguageInfo {
             name: "cpp",
-            adapters: vec![c_lsp_adapter.clone()],
+            adapters: vec![c_lsp_adapter],
             ..Default::default()
         },
         LanguageInfo {
             name: "css",
-            adapters: vec![css_lsp_adapter.clone()],
+            adapters: vec![css_lsp_adapter],
             ..Default::default()
         },
         LanguageInfo {
@@ -146,20 +146,20 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         },
         LanguageInfo {
             name: "gowork",
-            adapters: vec![go_lsp_adapter.clone()],
-            context: Some(go_context_provider.clone()),
+            adapters: vec![go_lsp_adapter],
+            context: Some(go_context_provider),
             ..Default::default()
         },
         LanguageInfo {
             name: "json",
-            adapters: vec![json_lsp_adapter.clone(), node_version_lsp_adapter.clone()],
+            adapters: vec![json_lsp_adapter.clone(), node_version_lsp_adapter],
             context: Some(json_context_provider.clone()),
             ..Default::default()
         },
         LanguageInfo {
             name: "jsonc",
-            adapters: vec![json_lsp_adapter.clone()],
-            context: Some(json_context_provider.clone()),
+            adapters: vec![json_lsp_adapter],
+            context: Some(json_context_provider),
             ..Default::default()
         },
         LanguageInfo {
@@ -174,7 +174,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         },
         LanguageInfo {
             name: "python",
-            adapters: vec![python_lsp_adapter.clone(), py_lsp_adapter.clone()],
+            adapters: vec![python_lsp_adapter, py_lsp_adapter],
             context: Some(python_context_provider),
             toolchain: Some(python_toolchain_provider),
             manifest_name: Some(SharedString::new_static("pyproject.toml").into()),
@@ -201,7 +201,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         LanguageInfo {
             name: "javascript",
             adapters: vec![typescript_lsp_adapter.clone(), vtsls_adapter.clone()],
-            context: Some(typescript_context.clone()),
+            context: Some(typescript_context),
             ..Default::default()
         },
         LanguageInfo {
@@ -277,13 +277,13 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         move || adapter.clone()
     });
     languages.register_available_lsp_adapter(LanguageServerName("vtsls".into()), {
-        let adapter = vtsls_adapter.clone();
+        let adapter = vtsls_adapter;
         move || adapter.clone()
     });
     languages.register_available_lsp_adapter(
         LanguageServerName("typescript-language-server".into()),
         {
-            let adapter = typescript_lsp_adapter.clone();
+            let adapter = typescript_lsp_adapter;
             move || adapter.clone()
         },
     );
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 6c92d78525..d21b5dabd3 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -103,7 +103,7 @@ impl PythonLspAdapter {
 #[async_trait(?Send)]
 impl LspAdapter for PythonLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn initialization_options(
@@ -1026,7 +1026,7 @@ const BINARY_DIR: &str = if cfg!(target_os = "windows") {
 #[async_trait(?Send)]
 impl LspAdapter for PyLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn check_if_user_installed(
@@ -1318,7 +1318,7 @@ impl BasedPyrightLspAdapter {
 #[async_trait(?Send)]
 impl LspAdapter for BasedPyrightLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn initialization_options(
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index eb5e0cee7c..c6c7357148 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -106,7 +106,7 @@ impl ManifestProvider for CargoManifestProvider {
 #[async_trait(?Send)]
 impl LspAdapter for RustLspAdapter {
     fn name(&self) -> LanguageServerName {
-        SERVER_NAME.clone()
+        SERVER_NAME
     }
 
     async fn check_if_user_installed(
@@ -659,7 +659,7 @@ impl ContextProvider for RustContextProvider {
             .variables
             .get(CUSTOM_TARGET_DIR)
             .cloned();
-        let run_task_args = if let Some(package_to_run) = package_to_run.clone() {
+        let run_task_args = if let Some(package_to_run) = package_to_run {
             vec!["run".into(), "-p".into(), package_to_run]
         } else {
             vec!["run".into()]
@@ -1019,8 +1019,8 @@ async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServ
 
         let path = last.context("no cached binary")?;
         let path = match RustLspAdapter::GITHUB_ASSET_KIND {
-            AssetKind::TarGz | AssetKind::Gz => path.clone(), // Tar and gzip extract in place.
-            AssetKind::Zip => path.clone().join("rust-analyzer.exe"), // zip contains a .exe
+            AssetKind::TarGz | AssetKind::Gz => path, // Tar and gzip extract in place.
+            AssetKind::Zip => path.join("rust-analyzer.exe"), // zip contains a .exe
         };
 
         anyhow::Ok(LanguageServerBinary {
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 29a96d9515..47eb254053 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -44,7 +44,7 @@ impl TailwindLspAdapter {
 #[async_trait(?Send)]
 impl LspAdapter for TailwindLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn check_if_user_installed(
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index afc84c3aff..77cf1a64f1 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -557,7 +557,7 @@ struct TypeScriptVersions {
 #[async_trait(?Send)]
 impl LspAdapter for TypeScriptLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn fetch_latest_server_version(
@@ -879,7 +879,7 @@ impl LspAdapter for EsLintLspAdapter {
     }
 
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn fetch_latest_server_version(
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index fd227e267d..f7152b0b5d 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -67,7 +67,7 @@ const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("vtsls");
 #[async_trait(?Send)]
 impl LspAdapter for VtslsLspAdapter {
     fn name(&self) -> LanguageServerName {
-        SERVER_NAME.clone()
+        SERVER_NAME
     }
 
     async fn fetch_latest_server_version(
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index 6ac92e0b2b..b9197b12ae 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -38,7 +38,7 @@ impl YamlLspAdapter {
 #[async_trait(?Send)]
 impl LspAdapter for YamlLspAdapter {
     fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME.clone()
+        Self::SERVER_NAME
     }
 
     async fn fetch_latest_server_version(
diff --git a/crates/livekit_client/examples/test_app.rs b/crates/livekit_client/examples/test_app.rs
index 51f335c2db..7580642990 100644
--- a/crates/livekit_client/examples/test_app.rs
+++ b/crates/livekit_client/examples/test_app.rs
@@ -183,7 +183,7 @@ impl LivekitWindow {
                 match track {
                     livekit_client::RemoteTrack::Audio(track) => {
                         output.audio_output_stream = Some((
-                            publication.clone(),
+                            publication,
                             room.play_remote_audio_track(&track, cx).unwrap(),
                         ));
                     }
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
index d1eec42f8f..e13fb7bd81 100644
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ b/crates/livekit_client/src/livekit_client/playback.rs
@@ -117,7 +117,6 @@ impl AudioStack {
 
         let (frame_tx, mut frame_rx) = futures::channel::mpsc::unbounded();
         let transmit_task = self.executor.spawn({
-            let source = source.clone();
             async move {
                 while let Some(frame) = frame_rx.next().await {
                     source.capture_frame(&frame).await.log_err();
@@ -132,12 +131,12 @@ impl AudioStack {
             drop(transmit_task);
             drop(capture_task);
         });
-        return Ok((
+        Ok((
             super::LocalAudioTrack(track),
             AudioStream::Output {
                 _drop: Box::new(on_drop),
             },
-        ));
+        ))
     }
 
     fn start_output(&self) -> Arc<Task<()>> {
diff --git a/crates/markdown/examples/markdown_as_child.rs b/crates/markdown/examples/markdown_as_child.rs
index 862b657c8c..16c198601a 100644
--- a/crates/markdown/examples/markdown_as_child.rs
+++ b/crates/markdown/examples/markdown_as_child.rs
@@ -30,7 +30,7 @@ pub fn main() {
 
         let node_runtime = NodeRuntime::unavailable();
         let language_registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-        languages::init(language_registry.clone(), node_runtime, cx);
+        languages::init(language_registry, node_runtime, cx);
         theme::init(LoadThemes::JustBase, cx);
         Assets.load_fonts(cx).unwrap();
 
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index a161ddd074..755506bd12 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -1323,8 +1323,7 @@ fn render_copy_code_block_button(
     .shape(ui::IconButtonShape::Square)
     .tooltip(Tooltip::text("Copy Code"))
     .on_click({
-        let id = id.clone();
-        let markdown = markdown.clone();
+        let markdown = markdown;
         move |_event, _window, cx| {
             let id = id.clone();
             markdown.update(cx, |this, cx| {
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
index 8c8d9e177f..b51b98a2ed 100644
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -178,7 +178,6 @@ impl<'a> MarkdownParser<'a> {
                 _ => None,
             },
             Event::Rule => {
-                let source_range = source_range.clone();
                 self.cursor += 1;
                 Some(vec![ParsedMarkdownElement::HorizontalRule(source_range)])
             }
@@ -401,7 +400,7 @@ impl<'a> MarkdownParser<'a> {
         }
         if !text.is_empty() {
             markdown_text_like.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                source_range: source_range.clone(),
+                source_range,
                 contents: text,
                 highlights,
                 regions,
@@ -420,7 +419,7 @@ impl<'a> MarkdownParser<'a> {
         self.cursor += 1;
 
         ParsedMarkdownHeading {
-            source_range: source_range.clone(),
+            source_range,
             level: match level {
                 pulldown_cmark::HeadingLevel::H1 => HeadingLevel::H1,
                 pulldown_cmark::HeadingLevel::H2 => HeadingLevel::H2,
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index c2b98f69c8..1121d64655 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -115,8 +115,7 @@ impl MarkdownPreviewView {
                         pane.activate_item(existing_follow_view_idx, true, true, window, cx);
                     });
                 } else {
-                    let view =
-                        Self::create_following_markdown_view(workspace, editor.clone(), window, cx);
+                    let view = Self::create_following_markdown_view(workspace, editor, window, cx);
                     workspace.active_pane().update(cx, |pane, cx| {
                         pane.add_item(Box::new(view.clone()), true, true, None, window, cx)
                     });
diff --git a/crates/migrator/src/migrations/m_2025_01_02/settings.rs b/crates/migrator/src/migrations/m_2025_01_02/settings.rs
index 3ce85e6b26..a35b1ebd2e 100644
--- a/crates/migrator/src/migrations/m_2025_01_02/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_01_02/settings.rs
@@ -20,14 +20,14 @@ fn replace_deprecated_settings_values(
         .nodes_for_capture_index(parent_object_capture_ix)
         .next()?
         .byte_range();
-    let parent_object_name = contents.get(parent_object_range.clone())?;
+    let parent_object_name = contents.get(parent_object_range)?;
 
     let setting_name_ix = query.capture_index_for_name("setting_name")?;
     let setting_name_range = mat
         .nodes_for_capture_index(setting_name_ix)
         .next()?
         .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
+    let setting_name = contents.get(setting_name_range)?;
 
     let setting_value_ix = query.capture_index_for_name("setting_value")?;
     let setting_value_range = mat
diff --git a/crates/migrator/src/migrations/m_2025_01_29/keymap.rs b/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
index c32da88229..eed2c46e08 100644
--- a/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
+++ b/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
@@ -279,7 +279,7 @@ fn rename_context_key(
         new_predicate = new_predicate.replace(old_key, new_key);
     }
     if new_predicate != old_predicate {
-        Some((context_predicate_range, new_predicate.to_string()))
+        Some((context_predicate_range, new_predicate))
     } else {
         None
     }
diff --git a/crates/migrator/src/migrations/m_2025_01_29/settings.rs b/crates/migrator/src/migrations/m_2025_01_29/settings.rs
index 8d3261676b..46cfe2f178 100644
--- a/crates/migrator/src/migrations/m_2025_01_29/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_01_29/settings.rs
@@ -57,7 +57,7 @@ pub fn replace_edit_prediction_provider_setting(
         .nodes_for_capture_index(parent_object_capture_ix)
         .next()?
         .byte_range();
-    let parent_object_name = contents.get(parent_object_range.clone())?;
+    let parent_object_name = contents.get(parent_object_range)?;
 
     let setting_name_ix = query.capture_index_for_name("setting_name")?;
     let setting_range = mat
diff --git a/crates/migrator/src/migrations/m_2025_01_30/settings.rs b/crates/migrator/src/migrations/m_2025_01_30/settings.rs
index 23a3243b82..2d763e4722 100644
--- a/crates/migrator/src/migrations/m_2025_01_30/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_01_30/settings.rs
@@ -25,7 +25,7 @@ fn replace_tab_close_button_setting_key(
         .nodes_for_capture_index(parent_object_capture_ix)
         .next()?
         .byte_range();
-    let parent_object_name = contents.get(parent_object_range.clone())?;
+    let parent_object_name = contents.get(parent_object_range)?;
 
     let setting_name_ix = query.capture_index_for_name("setting_name")?;
     let setting_range = mat
@@ -51,14 +51,14 @@ fn replace_tab_close_button_setting_value(
         .nodes_for_capture_index(parent_object_capture_ix)
         .next()?
         .byte_range();
-    let parent_object_name = contents.get(parent_object_range.clone())?;
+    let parent_object_name = contents.get(parent_object_range)?;
 
     let setting_name_ix = query.capture_index_for_name("setting_name")?;
     let setting_name_range = mat
         .nodes_for_capture_index(setting_name_ix)
         .next()?
         .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
+    let setting_name = contents.get(setting_name_range)?;
 
     let setting_value_ix = query.capture_index_for_name("setting_value")?;
     let setting_value_range = mat
diff --git a/crates/migrator/src/migrations/m_2025_03_29/settings.rs b/crates/migrator/src/migrations/m_2025_03_29/settings.rs
index 47f65b407d..8f83d8e39e 100644
--- a/crates/migrator/src/migrations/m_2025_03_29/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_03_29/settings.rs
@@ -19,7 +19,7 @@ fn replace_setting_value(
         .nodes_for_capture_index(setting_capture_ix)
         .next()?
         .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
+    let setting_name = contents.get(setting_name_range)?;
 
     if setting_name != "hide_mouse_while_typing" {
         return None;
diff --git a/crates/migrator/src/migrations/m_2025_05_29/settings.rs b/crates/migrator/src/migrations/m_2025_05_29/settings.rs
index 56d72836fa..37ef0e45cc 100644
--- a/crates/migrator/src/migrations/m_2025_05_29/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_05_29/settings.rs
@@ -19,7 +19,7 @@ fn replace_preferred_completion_mode_value(
         .nodes_for_capture_index(parent_object_capture_ix)
         .next()?
         .byte_range();
-    let parent_object_name = contents.get(parent_object_range.clone())?;
+    let parent_object_name = contents.get(parent_object_range)?;
 
     if parent_object_name != "agent" {
         return None;
@@ -30,7 +30,7 @@ fn replace_preferred_completion_mode_value(
         .nodes_for_capture_index(setting_name_capture_ix)
         .next()?
         .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
+    let setting_name = contents.get(setting_name_range)?;
 
     if setting_name != "preferred_completion_mode" {
         return None;
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 0cc2f654ea..6b6d17a246 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2427,7 +2427,7 @@ impl MultiBuffer {
         cx.emit(match event {
             language::BufferEvent::Edited => Event::Edited {
                 singleton_buffer_edited: true,
-                edited_buffer: Some(buffer.clone()),
+                edited_buffer: Some(buffer),
             },
             language::BufferEvent::DirtyChanged => Event::DirtyChanged,
             language::BufferEvent::Saved => Event::Saved,
@@ -3560,9 +3560,7 @@ impl MultiBuffer {
         let multi = cx.new(|_| Self::new(Capability::ReadWrite));
         for (text, ranges) in excerpts {
             let buffer = cx.new(|cx| Buffer::local(text, cx));
-            let excerpt_ranges = ranges
-                .into_iter()
-                .map(|range| ExcerptRange::new(range.clone()));
+            let excerpt_ranges = ranges.into_iter().map(ExcerptRange::new);
             multi.update(cx, |multi, cx| {
                 multi.push_excerpts(buffer, excerpt_ranges, cx)
             });
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 77a70dfc8d..441d2ca4b7 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -126,7 +126,7 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
                 .gap_1()
                 .child(
                     h_flex()
-                        .id(name.clone())
+                        .id(name)
                         .relative()
                         .w_full()
                         .border_2()
@@ -201,7 +201,7 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
                 });
             } else {
                 let appearance = *SystemAppearance::global(cx);
-                settings.set_theme(theme.clone(), appearance);
+                settings.set_theme(theme, appearance);
             }
         });
     }
diff --git a/crates/onboarding/src/editing_page.rs b/crates/onboarding/src/editing_page.rs
index 60a9856abe..8fae695854 100644
--- a/crates/onboarding/src/editing_page.rs
+++ b/crates/onboarding/src/editing_page.rs
@@ -104,7 +104,7 @@ fn write_ui_font_family(font: SharedString, cx: &mut App) {
             "Welcome Font Changed",
             type = "ui font",
             old = theme_settings.ui_font_family,
-            new = font.clone()
+            new = font
         );
         theme_settings.ui_font_family = Some(FontFamilyName(font.into()));
     });
@@ -134,7 +134,7 @@ fn write_buffer_font_family(font_family: SharedString, cx: &mut App) {
             "Welcome Font Changed",
             type = "editor font",
             old = theme_settings.buffer_font_family,
-            new = font_family.clone()
+            new = font_family
         );
 
         theme_settings.buffer_font_family = Some(FontFamilyName(font_family.into()));
@@ -314,7 +314,7 @@ fn render_font_customization_section(
                         .child(
                             PopoverMenu::new("ui-font-picker")
                                 .menu({
-                                    let ui_font_picker = ui_font_picker.clone();
+                                    let ui_font_picker = ui_font_picker;
                                     move |_window, _cx| Some(ui_font_picker.clone())
                                 })
                                 .trigger(
@@ -378,7 +378,7 @@ fn render_font_customization_section(
                         .child(
                             PopoverMenu::new("buffer-font-picker")
                                 .menu({
-                                    let buffer_font_picker = buffer_font_picker.clone();
+                                    let buffer_font_picker = buffer_font_picker;
                                     move |_window, _cx| Some(buffer_font_picker.clone())
                                 })
                                 .trigger(
diff --git a/crates/onboarding/src/theme_preview.rs b/crates/onboarding/src/theme_preview.rs
index 6a072b00e9..d84bc9b0e5 100644
--- a/crates/onboarding/src/theme_preview.rs
+++ b/crates/onboarding/src/theme_preview.rs
@@ -206,7 +206,7 @@ impl ThemePreviewTile {
                 sidebar_width,
                 skeleton_height.clone(),
             ))
-            .child(Self::render_pane(seed, theme, skeleton_height.clone()))
+            .child(Self::render_pane(seed, theme, skeleton_height))
     }
 
     fn render_borderless(seed: f32, theme: Arc<Theme>) -> impl IntoElement {
@@ -260,7 +260,7 @@ impl ThemePreviewTile {
                     .overflow_hidden()
                     .child(div().size_full().child(Self::render_editor(
                         seed,
-                        theme.clone(),
+                        theme,
                         sidebar_width,
                         Self::SKELETON_HEIGHT_DEFAULT,
                     )))
@@ -329,9 +329,9 @@ impl Component for ThemePreviewTile {
 
         let themes_to_preview = vec![
             one_dark.clone().ok(),
-            one_light.clone().ok(),
-            gruvbox_dark.clone().ok(),
-            gruvbox_light.clone().ok(),
+            one_light.ok(),
+            gruvbox_dark.ok(),
+            gruvbox_light.ok(),
         ]
         .into_iter()
         .flatten()
@@ -348,7 +348,7 @@ impl Component for ThemePreviewTile {
                             div()
                                 .w(px(240.))
                                 .h(px(180.))
-                                .child(ThemePreviewTile::new(one_dark.clone(), 0.42))
+                                .child(ThemePreviewTile::new(one_dark, 0.42))
                                 .into_any_element(),
                         )])]
                     } else {
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 832b7f09d1..59c43f945f 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -5091,7 +5091,7 @@ impl Panel for OutlinePanel {
 
 impl Focusable for OutlinePanel {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.filter_editor.focus_handle(cx).clone()
+        self.filter_editor.focus_handle(cx)
     }
 }
 
diff --git a/crates/panel/src/panel.rs b/crates/panel/src/panel.rs
index 658a51167b..1930f654e9 100644
--- a/crates/panel/src/panel.rs
+++ b/crates/panel/src/panel.rs
@@ -52,7 +52,7 @@ impl RenderOnce for PanelTab {
 
 pub fn panel_button(label: impl Into<SharedString>) -> ui::Button {
     let label = label.into();
-    let id = ElementId::Name(label.clone().to_lowercase().replace(' ', "_").into());
+    let id = ElementId::Name(label.to_lowercase().replace(' ', "_").into());
     ui::Button::new(id, label)
         .label_size(ui::LabelSize::Small)
         .icon_size(ui::IconSize::Small)
diff --git a/crates/picker/src/popover_menu.rs b/crates/picker/src/popover_menu.rs
index d05308ee71..baf0918fd6 100644
--- a/crates/picker/src/popover_menu.rs
+++ b/crates/picker/src/popover_menu.rs
@@ -85,7 +85,7 @@ where
             .menu(move |_window, _cx| Some(picker.clone()))
             .trigger_with_tooltip(self.trigger, self.tooltip)
             .anchor(self.anchor)
-            .when_some(self.handle.clone(), |menu, handle| menu.with_handle(handle))
+            .when_some(self.handle, |menu, handle| menu.with_handle(handle))
             .offset(gpui::Point {
                 x: px(0.0),
                 y: px(-2.0),
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index d365089377..a171b193d0 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -168,7 +168,7 @@ impl RemoteBufferStore {
                             .with_context(|| {
                                 format!("no worktree found for id {}", file.worktree_id)
                             })?;
-                        buffer_file = Some(Arc::new(File::from_proto(file, worktree.clone(), cx)?)
+                        buffer_file = Some(Arc::new(File::from_proto(file, worktree, cx)?)
                             as Arc<dyn language::File>);
                     }
                     Buffer::from_proto(replica_id, capability, state, buffer_file)
@@ -591,7 +591,7 @@ impl LocalBufferStore {
         else {
             return Task::ready(Err(anyhow!("no such worktree")));
         };
-        self.save_local_buffer(buffer, worktree, path.path.clone(), true, cx)
+        self.save_local_buffer(buffer, worktree, path.path, true, cx)
     }
 
     fn open_buffer(
@@ -845,7 +845,7 @@ impl BufferStore {
     ) -> Task<Result<()>> {
         match &mut self.state {
             BufferStoreState::Local(this) => this.save_buffer(buffer, cx),
-            BufferStoreState::Remote(this) => this.save_remote_buffer(buffer.clone(), None, cx),
+            BufferStoreState::Remote(this) => this.save_remote_buffer(buffer, None, cx),
         }
     }
 
@@ -1138,7 +1138,7 @@ impl BufferStore {
         envelope: TypedEnvelope<proto::UpdateBuffer>,
         mut cx: AsyncApp,
     ) -> Result<proto::Ack> {
-        let payload = envelope.payload.clone();
+        let payload = envelope.payload;
         let buffer_id = BufferId::new(payload.buffer_id)?;
         let ops = payload
             .operations
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index e826f44b7b..49a430c261 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -760,7 +760,7 @@ mod tests {
             &store,
             vec![
                 (server_1_id.clone(), ContextServerStatus::Starting),
-                (server_1_id.clone(), ContextServerStatus::Running),
+                (server_1_id, ContextServerStatus::Running),
                 (server_2_id.clone(), ContextServerStatus::Starting),
                 (server_2_id.clone(), ContextServerStatus::Running),
                 (server_2_id.clone(), ContextServerStatus::Stopped),
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
index 343ee83ccb..c47e5d35d5 100644
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ b/crates/project/src/debugger/breakpoint_store.rs
@@ -192,7 +192,7 @@ impl BreakpointStore {
     }
 
     pub(crate) fn shared(&mut self, project_id: u64, downstream_client: AnyProtoClient) {
-        self.downstream_client = Some((downstream_client.clone(), project_id));
+        self.downstream_client = Some((downstream_client, project_id));
     }
 
     pub(crate) fn unshared(&mut self, cx: &mut Context<Self>) {
@@ -450,9 +450,9 @@ impl BreakpointStore {
                     });
 
                     if let Some(found_bp) = found_bp {
-                        found_bp.message = Some(log_message.clone());
+                        found_bp.message = Some(log_message);
                     } else {
-                        breakpoint.bp.message = Some(log_message.clone());
+                        breakpoint.bp.message = Some(log_message);
                         // We did not remove any breakpoint, hence let's toggle one.
                         breakpoint_set
                             .breakpoints
@@ -482,9 +482,9 @@ impl BreakpointStore {
                     });
 
                     if let Some(found_bp) = found_bp {
-                        found_bp.hit_condition = Some(hit_condition.clone());
+                        found_bp.hit_condition = Some(hit_condition);
                     } else {
-                        breakpoint.bp.hit_condition = Some(hit_condition.clone());
+                        breakpoint.bp.hit_condition = Some(hit_condition);
                         // We did not remove any breakpoint, hence let's toggle one.
                         breakpoint_set
                             .breakpoints
@@ -514,9 +514,9 @@ impl BreakpointStore {
                     });
 
                     if let Some(found_bp) = found_bp {
-                        found_bp.condition = Some(condition.clone());
+                        found_bp.condition = Some(condition);
                     } else {
-                        breakpoint.bp.condition = Some(condition.clone());
+                        breakpoint.bp.condition = Some(condition);
                         // We did not remove any breakpoint, hence let's toggle one.
                         breakpoint_set
                             .breakpoints
@@ -591,7 +591,7 @@ impl BreakpointStore {
         cx: &mut Context<Self>,
     ) {
         if let Some(breakpoints) = self.breakpoints.remove(&old_path) {
-            self.breakpoints.insert(new_path.clone(), breakpoints);
+            self.breakpoints.insert(new_path, breakpoints);
 
             cx.notify();
         }
diff --git a/crates/project/src/debugger/dap_command.rs b/crates/project/src/debugger/dap_command.rs
index 3be3192369..772ff2dcfe 100644
--- a/crates/project/src/debugger/dap_command.rs
+++ b/crates/project/src/debugger/dap_command.rs
@@ -1454,7 +1454,7 @@ impl DapCommand for EvaluateCommand {
             variables_reference: message.variable_reference,
             named_variables: message.named_variables,
             indexed_variables: message.indexed_variables,
-            memory_reference: message.memory_reference.clone(),
+            memory_reference: message.memory_reference,
             value_location_reference: None, //TODO
         })
     }
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index 382e83587a..45e1c7f291 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -721,7 +721,7 @@ impl DapStore {
         downstream_client: AnyProtoClient,
         _: &mut Context<Self>,
     ) {
-        self.downstream_client = Some((downstream_client.clone(), project_id));
+        self.downstream_client = Some((downstream_client, project_id));
     }
 
     pub fn unshared(&mut self, cx: &mut Context<Self>) {
diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs
index cd792877b6..81cb3ade2e 100644
--- a/crates/project/src/debugger/session.rs
+++ b/crates/project/src/debugger/session.rs
@@ -1394,7 +1394,7 @@ impl Session {
         let breakpoint_store = self.breakpoint_store.clone();
         if let Some((local, path)) = self.as_running_mut().and_then(|local| {
             let breakpoint = local.tmp_breakpoint.take()?;
-            let path = breakpoint.path.clone();
+            let path = breakpoint.path;
             Some((local, path))
         }) {
             local
@@ -1710,7 +1710,7 @@ impl Session {
 
                 this.threads = result
                     .into_iter()
-                    .map(|thread| (ThreadId(thread.id), Thread::from(thread.clone())))
+                    .map(|thread| (ThreadId(thread.id), Thread::from(thread)))
                     .collect();
 
                 this.invalidate_command_type::<StackTraceCommand>();
@@ -2553,10 +2553,7 @@ impl Session {
         mode: Option<String>,
         cx: &mut Context<Self>,
     ) -> Task<Option<dap::DataBreakpointInfoResponse>> {
-        let command = DataBreakpointInfoCommand {
-            context: context.clone(),
-            mode,
-        };
+        let command = DataBreakpointInfoCommand { context, mode };
 
         self.request(command, |_, response, _| response.ok(), cx)
     }
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index edc6b00a7b..5cf298a8bf 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -769,7 +769,7 @@ impl GitStore {
                 .as_ref()
                 .and_then(|weak| weak.upgrade())
         {
-            let conflict_set = conflict_set.clone();
+            let conflict_set = conflict_set;
             let buffer_snapshot = buffer.read(cx).text_snapshot();
 
             git_state.update(cx, |state, cx| {
@@ -912,7 +912,7 @@ impl GitStore {
             return Task::ready(Err(anyhow!("failed to find a git repository for buffer")));
         };
         let content = match &version {
-            Some(version) => buffer.rope_for_version(version).clone(),
+            Some(version) => buffer.rope_for_version(version),
             None => buffer.as_rope().clone(),
         };
         let version = version.unwrap_or(buffer.version());
@@ -1506,10 +1506,7 @@ impl GitStore {
             let mut update = envelope.payload;
 
             let id = RepositoryId::from_proto(update.id);
-            let client = this
-                .upstream_client()
-                .context("no upstream client")?
-                .clone();
+            let client = this.upstream_client().context("no upstream client")?;
 
             let mut is_new = false;
             let repo = this.repositories.entry(id).or_insert_with(|| {
@@ -3418,7 +3415,6 @@ impl Repository {
         reset_mode: ResetMode,
         _cx: &mut App,
     ) -> oneshot::Receiver<Result<()>> {
-        let commit = commit.to_string();
         let id = self.id;
 
         self.send_job(None, move |git_repo, _| async move {
@@ -3644,7 +3640,7 @@ impl Repository {
         let to_stage = self
             .cached_status()
             .filter(|entry| !entry.status.staging().is_fully_staged())
-            .map(|entry| entry.repo_path.clone())
+            .map(|entry| entry.repo_path)
             .collect();
         self.stage_entries(to_stage, cx)
     }
@@ -3653,16 +3649,13 @@ impl Repository {
         let to_unstage = self
             .cached_status()
             .filter(|entry| entry.status.staging().has_staged())
-            .map(|entry| entry.repo_path.clone())
+            .map(|entry| entry.repo_path)
             .collect();
         self.unstage_entries(to_unstage, cx)
     }
 
     pub fn stash_all(&mut self, cx: &mut Context<Self>) -> Task<anyhow::Result<()>> {
-        let to_stash = self
-            .cached_status()
-            .map(|entry| entry.repo_path.clone())
-            .collect();
+        let to_stash = self.cached_status().map(|entry| entry.repo_path).collect();
 
         self.stash_entries(to_stash, cx)
     }
diff --git a/crates/project/src/git_store/conflict_set.rs b/crates/project/src/git_store/conflict_set.rs
index 9d7bd26a92..313a1e90ad 100644
--- a/crates/project/src/git_store/conflict_set.rs
+++ b/crates/project/src/git_store/conflict_set.rs
@@ -369,7 +369,7 @@ mod tests {
         .unindent();
 
         let buffer_id = BufferId::new(1).unwrap();
-        let buffer = Buffer::new(0, buffer_id, test_content.to_string());
+        let buffer = Buffer::new(0, buffer_id, test_content);
         let snapshot = buffer.snapshot();
 
         let conflict_snapshot = ConflictSet::parse(&snapshot);
@@ -400,7 +400,7 @@ mod tests {
             >>>>>>> "#
             .unindent();
         let buffer_id = BufferId::new(1).unwrap();
-        let buffer = Buffer::new(0, buffer_id, test_content.to_string());
+        let buffer = Buffer::new(0, buffer_id, test_content);
         let snapshot = buffer.snapshot();
 
         let conflict_snapshot = ConflictSet::parse(&snapshot);
diff --git a/crates/project/src/image_store.rs b/crates/project/src/image_store.rs
index c5a198954e..e499d4e026 100644
--- a/crates/project/src/image_store.rs
+++ b/crates/project/src/image_store.rs
@@ -244,7 +244,7 @@ impl ProjectItem for ImageItem {
     }
 
     fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        Some(self.project_path(cx).clone())
+        Some(self.project_path(cx))
     }
 
     fn is_dirty(&self) -> bool {
@@ -375,7 +375,6 @@ impl ImageStore {
                 let (mut tx, rx) = postage::watch::channel();
                 entry.insert(rx.clone());
 
-                let project_path = project_path.clone();
                 let load_image = self
                     .state
                     .open_image(project_path.path.clone(), worktree, cx);
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index de6848701f..a91e3fb402 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -2739,7 +2739,7 @@ impl GetCodeActions {
             Some(lsp::CodeActionProviderCapability::Options(CodeActionOptions {
                 code_action_kinds: Some(supported_action_kinds),
                 ..
-            })) => Some(supported_action_kinds.clone()),
+            })) => Some(supported_action_kinds),
             _ => capabilities.code_action_kinds,
         }
     }
@@ -3793,7 +3793,7 @@ impl GetDocumentDiagnostics {
                         },
                         uri: lsp::Url::parse(&info.location_url.unwrap()).unwrap(),
                     },
-                    message: info.message.clone(),
+                    message: info.message,
                 }
             })
             .collect::<Vec<_>>();
@@ -4491,9 +4491,8 @@ mod tests {
             data: Some(json!({"detail": "test detail"})),
         };
 
-        let proto_diagnostic =
-            GetDocumentDiagnostics::serialize_lsp_diagnostic(lsp_diagnostic.clone())
-                .expect("Failed to serialize diagnostic");
+        let proto_diagnostic = GetDocumentDiagnostics::serialize_lsp_diagnostic(lsp_diagnostic)
+            .expect("Failed to serialize diagnostic");
 
         let start = proto_diagnostic.start.unwrap();
         let end = proto_diagnostic.end.unwrap();
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index aa2398e29b..7a44ad3f87 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -917,7 +917,7 @@ impl LocalLspStore {
                         message: params.message,
                         actions: vec![],
                         response_channel: tx,
-                        lsp_name: name.clone(),
+                        lsp_name: name,
                     };
 
                     let _ = this.update(&mut cx, |_, cx| {
@@ -2954,7 +2954,7 @@ impl LocalLspStore {
                         .update(cx, |this, cx| {
                             let path = buffer_to_edit.read(cx).project_path(cx);
                             let active_entry = this.active_entry;
-                            let is_active_entry = path.clone().is_some_and(|project_path| {
+                            let is_active_entry = path.is_some_and(|project_path| {
                                 this.worktree_store
                                     .read(cx)
                                     .entry_for_path(&project_path, cx)
@@ -5688,10 +5688,7 @@ impl LspStore {
             let all_actions_task = self.request_multiple_lsp_locally(
                 buffer,
                 Some(range.start),
-                GetCodeActions {
-                    range: range.clone(),
-                    kinds: kinds.clone(),
-                },
+                GetCodeActions { range, kinds },
                 cx,
             );
             cx.background_spawn(async move {
@@ -7221,7 +7218,7 @@ impl LspStore {
                                     worktree = tree;
                                     path = rel_path;
                                 } else {
-                                    worktree = source_worktree.clone();
+                                    worktree = source_worktree;
                                     path = relativize_path(&result.worktree_abs_path, &abs_path);
                                 }
 
@@ -10338,7 +10335,7 @@ impl LspStore {
         let name = self
             .language_server_statuses
             .remove(&server_id)
-            .map(|status| status.name.clone())
+            .map(|status| status.name)
             .or_else(|| {
                 if let Some(LanguageServerState::Running { adapter, .. }) = server_state.as_ref() {
                     Some(adapter.name())
diff --git a/crates/project/src/lsp_store/clangd_ext.rs b/crates/project/src/lsp_store/clangd_ext.rs
index 274b1b8980..b02f68dd4d 100644
--- a/crates/project/src/lsp_store/clangd_ext.rs
+++ b/crates/project/src/lsp_store/clangd_ext.rs
@@ -58,7 +58,7 @@ pub fn register_notifications(
 
     language_server
         .on_notification::<InactiveRegions, _>({
-            let adapter = adapter.clone();
+            let adapter = adapter;
             let this = lsp_store;
 
             move |params: InactiveRegionsParams, cx| {
diff --git a/crates/project/src/lsp_store/rust_analyzer_ext.rs b/crates/project/src/lsp_store/rust_analyzer_ext.rs
index 6c425717a8..e5e6338d3c 100644
--- a/crates/project/src/lsp_store/rust_analyzer_ext.rs
+++ b/crates/project/src/lsp_store/rust_analyzer_ext.rs
@@ -34,7 +34,6 @@ pub fn register_notifications(lsp_store: WeakEntity<LspStore>, language_server:
 
     language_server
         .on_notification::<ServerStatus, _>({
-            let name = name.clone();
             move |params, cx| {
                 let message = params.message;
                 let log_message = message.as_ref().map(|message| {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 9cd83647ac..af5fd0d675 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2502,7 +2502,7 @@ impl Project {
         path: ProjectPath,
         cx: &mut Context<Self>,
     ) -> Task<Result<(Option<ProjectEntryId>, Entity<Buffer>)>> {
-        let task = self.open_buffer(path.clone(), cx);
+        let task = self.open_buffer(path, cx);
         cx.spawn(async move |_project, cx| {
             let buffer = task.await?;
             let project_entry_id = buffer.read_with(cx, |buffer, cx| {
@@ -3170,7 +3170,7 @@ impl Project {
         if let ImageItemEvent::ReloadNeeded = event
             && !self.is_via_collab()
         {
-            self.reload_images([image.clone()].into_iter().collect(), cx)
+            self.reload_images([image].into_iter().collect(), cx)
                 .detach_and_log_err(cx);
         }
 
@@ -3652,7 +3652,7 @@ impl Project {
         cx: &mut Context<Self>,
     ) -> Task<Result<Vec<CodeAction>>> {
         let snapshot = buffer.read(cx).snapshot();
-        let range = range.clone().to_owned().to_point(&snapshot);
+        let range = range.to_point(&snapshot);
         let range_start = snapshot.anchor_before(range.start);
         let range_end = if range.start == range.end {
             range_start
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 70eb6d34f8..8b0b21fcd6 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1818,7 +1818,7 @@ async fn test_restarting_server_with_diagnostics_published(cx: &mut gpui::TestAp
             buffer
                 .snapshot()
                 .diagnostics_in_range::<_, usize>(0..1, false)
-                .map(|entry| entry.diagnostic.message.clone())
+                .map(|entry| entry.diagnostic.message)
                 .collect::<Vec<_>>(),
             ["the message".to_string()]
         );
@@ -1844,7 +1844,7 @@ async fn test_restarting_server_with_diagnostics_published(cx: &mut gpui::TestAp
             buffer
                 .snapshot()
                 .diagnostics_in_range::<_, usize>(0..1, false)
-                .map(|entry| entry.diagnostic.message.clone())
+                .map(|entry| entry.diagnostic.message)
                 .collect::<Vec<_>>(),
             Vec::<String>::new(),
         );
@@ -3712,7 +3712,7 @@ async fn test_save_file_spawns_language_server(cx: &mut gpui::TestAppContext) {
 async fn test_file_changes_multiple_times_on_disk(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/dir"),
         json!({
@@ -3767,7 +3767,7 @@ async fn test_file_changes_multiple_times_on_disk(cx: &mut gpui::TestAppContext)
 async fn test_edit_buffer_while_it_reloads(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/dir"),
         json!({
@@ -5897,7 +5897,7 @@ async fn test_search_with_unicode(cx: &mut gpui::TestAppContext) {
 async fn test_create_entry(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/one/two",
         json!({
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
index e51f8e0b3b..15e6024808 100644
--- a/crates/project/src/task_inventory.rs
+++ b/crates/project/src/task_inventory.rs
@@ -760,7 +760,7 @@ impl Inventory {
             TaskSettingsLocation::Global(path) => {
                 previously_existing_scenarios = parsed_scenarios
                     .global_scenarios()
-                    .map(|(_, scenario)| scenario.label.clone())
+                    .map(|(_, scenario)| scenario.label)
                     .collect::<HashSet<_>>();
                 parsed_scenarios
                     .global
@@ -770,7 +770,7 @@ impl Inventory {
             TaskSettingsLocation::Worktree(location) => {
                 previously_existing_scenarios = parsed_scenarios
                     .worktree_scenarios(location.worktree_id)
-                    .map(|(_, scenario)| scenario.label.clone())
+                    .map(|(_, scenario)| scenario.label)
                     .collect::<HashSet<_>>();
 
                 if new_templates.is_empty() {
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index b2556d7584..e9582e73fd 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -89,7 +89,7 @@ impl Project {
             let ssh_client = ssh_client.read(cx);
             if let Some((SshArgs { arguments, envs }, path_style)) = ssh_client.ssh_info() {
                 return Some(SshDetails {
-                    host: ssh_client.connection_options().host.clone(),
+                    host: ssh_client.connection_options().host,
                     ssh_command: SshCommand { arguments },
                     envs,
                     path_style,
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index 16e42e90cb..b8905c73bc 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -457,7 +457,7 @@ impl WorktreeStore {
             })
             .collect::<HashMap<_, _>>();
 
-        let (client, project_id) = self.upstream_client().clone().context("invalid project")?;
+        let (client, project_id) = self.upstream_client().context("invalid project")?;
 
         for worktree in worktrees {
             if let Some(old_worktree) =
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index bb612ac475..a5bfa883d5 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -447,7 +447,7 @@ impl ProjectPanel {
             cx.subscribe(&project, |this, project, event, cx| match event {
                 project::Event::ActiveEntryChanged(Some(entry_id)) => {
                     if ProjectPanelSettings::get_global(cx).auto_reveal_entries {
-                        this.reveal_entry(project.clone(), *entry_id, true, cx).ok();
+                        this.reveal_entry(project, *entry_id, true, cx).ok();
                     }
                 }
                 project::Event::ActiveEntryChanged(None) => {
@@ -462,10 +462,7 @@ impl ProjectPanel {
                     }
                 }
                 project::Event::RevealInProjectPanel(entry_id) => {
-                    if let Some(()) = this
-                        .reveal_entry(project.clone(), *entry_id, false, cx)
-                        .log_err()
-                    {
+                    if let Some(()) = this.reveal_entry(project, *entry_id, false, cx).log_err() {
                         cx.emit(PanelEvent::Activate);
                     }
                 }
@@ -813,7 +810,7 @@ impl ProjectPanel {
         diagnostic_severity: DiagnosticSeverity,
     ) {
         diagnostics
-            .entry((project_path.worktree_id, path_buffer.clone()))
+            .entry((project_path.worktree_id, path_buffer))
             .and_modify(|strongest_diagnostic_severity| {
                 *strongest_diagnostic_severity =
                     cmp::min(*strongest_diagnostic_severity, diagnostic_severity);
@@ -2780,7 +2777,7 @@ impl ProjectPanel {
 
         let destination_worktree = self.project.update(cx, |project, cx| {
             let entry_path = project.path_for_entry(entry_to_move, cx)?;
-            let destination_entry_path = project.path_for_entry(destination, cx)?.path.clone();
+            let destination_entry_path = project.path_for_entry(destination, cx)?.path;
 
             let mut destination_path = destination_entry_path.as_ref();
             if destination_is_file {
@@ -4023,8 +4020,8 @@ impl ProjectPanel {
                 .as_ref()
                 .map_or(ValidationState::None, |e| e.validation_state.clone())
             {
-                ValidationState::Error(msg) => Some((Color::Error.color(cx), msg.clone())),
-                ValidationState::Warning(msg) => Some((Color::Warning.color(cx), msg.clone())),
+                ValidationState::Error(msg) => Some((Color::Error.color(cx), msg)),
+                ValidationState::Warning(msg) => Some((Color::Warning.color(cx), msg)),
                 ValidationState::None => None,
             }
         } else {
@@ -5505,7 +5502,7 @@ impl Render for ProjectPanel {
                     .with_priority(3)
                 }))
         } else {
-            let focus_handle = self.focus_handle(cx).clone();
+            let focus_handle = self.focus_handle(cx);
 
             v_flex()
                 .id("empty-project_panel")
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index de3316e357..49b482e02c 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -17,7 +17,7 @@ use workspace::{
 async fn test_visible_list(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -106,7 +106,7 @@ async fn test_visible_list(cx: &mut gpui::TestAppContext) {
 async fn test_opening_file(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/src"),
         json!({
@@ -276,7 +276,7 @@ async fn test_exclusions_in_visible_list(cx: &mut gpui::TestAppContext) {
 async fn test_auto_collapse_dir_paths(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root1"),
         json!({
@@ -459,7 +459,7 @@ async fn test_auto_collapse_dir_paths(cx: &mut gpui::TestAppContext) {
 async fn test_editing_files(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -877,7 +877,7 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) {
 async fn test_adding_directories_via_file(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -1010,7 +1010,7 @@ async fn test_adding_directories_via_file(cx: &mut gpui::TestAppContext) {
 async fn test_adding_directory_via_file(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root1"),
         json!({
@@ -1137,7 +1137,7 @@ async fn test_adding_directory_via_file(cx: &mut gpui::TestAppContext) {
 async fn test_copy_paste(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -1235,7 +1235,7 @@ async fn test_copy_paste(cx: &mut gpui::TestAppContext) {
 async fn test_cut_paste(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -1320,7 +1320,7 @@ async fn test_cut_paste(cx: &mut gpui::TestAppContext) {
 async fn test_cut_paste_between_different_worktrees(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -1416,7 +1416,7 @@ async fn test_cut_paste_between_different_worktrees(cx: &mut gpui::TestAppContex
 async fn test_copy_paste_between_different_worktrees(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -1551,7 +1551,7 @@ async fn test_copy_paste_between_different_worktrees(cx: &mut gpui::TestAppConte
 async fn test_copy_paste_directory(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -1692,7 +1692,7 @@ async fn test_copy_paste_directory(cx: &mut gpui::TestAppContext) {
 async fn test_copy_paste_directory_with_sibling_file(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/test",
         json!({
@@ -1797,7 +1797,7 @@ async fn test_copy_paste_directory_with_sibling_file(cx: &mut gpui::TestAppConte
 async fn test_copy_paste_nested_and_root_entries(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/test",
         json!({
@@ -1876,7 +1876,7 @@ async fn test_copy_paste_nested_and_root_entries(cx: &mut gpui::TestAppContext)
 async fn test_remove_opened_file(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/src"),
         json!({
@@ -1968,7 +1968,7 @@ async fn test_remove_opened_file(cx: &mut gpui::TestAppContext) {
 async fn test_create_duplicate_items(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/src",
         json!({
@@ -2161,7 +2161,7 @@ async fn test_create_duplicate_items(cx: &mut gpui::TestAppContext) {
 async fn test_select_git_entry(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -2440,7 +2440,7 @@ async fn test_select_git_entry(cx: &mut gpui::TestAppContext) {
 async fn test_select_directory(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/project_root",
         json!({
@@ -2541,7 +2541,7 @@ async fn test_select_directory(cx: &mut gpui::TestAppContext) {
 async fn test_select_first_last(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/project_root",
         json!({
@@ -2651,7 +2651,7 @@ async fn test_select_first_last(cx: &mut gpui::TestAppContext) {
 async fn test_dir_toggle_collapse(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/project_root",
         json!({
@@ -2693,7 +2693,7 @@ async fn test_dir_toggle_collapse(cx: &mut gpui::TestAppContext) {
 async fn test_collapse_all_entries(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/project_root",
         json!({
@@ -2751,7 +2751,7 @@ async fn test_collapse_all_entries(cx: &mut gpui::TestAppContext) {
 async fn test_new_file_move(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.as_fake().insert_tree(path!("/root"), json!({})).await;
     let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
     let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
@@ -2819,7 +2819,7 @@ async fn test_new_file_move(cx: &mut gpui::TestAppContext) {
 async fn test_rename_root_of_worktree(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -2895,7 +2895,7 @@ async fn test_rename_root_of_worktree(cx: &mut gpui::TestAppContext) {
 async fn test_rename_with_hide_root(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -2989,7 +2989,7 @@ async fn test_rename_with_hide_root(cx: &mut gpui::TestAppContext) {
 #[gpui::test]
 async fn test_multiple_marked_entries(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/project_root",
         json!({
@@ -3731,7 +3731,7 @@ async fn test_creating_excluded_entries(cx: &mut gpui::TestAppContext) {
         register_project_item::<TestProjectItemView>(cx);
     });
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -3914,7 +3914,7 @@ async fn test_creating_excluded_entries(cx: &mut gpui::TestAppContext) {
 async fn test_selection_restored_when_creation_cancelled(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/src",
         json!({
@@ -3982,7 +3982,7 @@ async fn test_selection_restored_when_creation_cancelled(cx: &mut gpui::TestAppC
 async fn test_basic_file_deletion_scenarios(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -4105,7 +4105,7 @@ async fn test_basic_file_deletion_scenarios(cx: &mut gpui::TestAppContext) {
 async fn test_deletion_gitignored(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -4206,7 +4206,7 @@ async fn test_deletion_gitignored(cx: &mut gpui::TestAppContext) {
 async fn test_nested_deletion_gitignore(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -4271,7 +4271,7 @@ async fn test_nested_deletion_gitignore(cx: &mut gpui::TestAppContext) {
 async fn test_complex_selection_scenarios(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -4382,7 +4382,7 @@ async fn test_complex_selection_scenarios(cx: &mut gpui::TestAppContext) {
 async fn test_delete_all_files_and_directories(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -4457,7 +4457,7 @@ async fn test_delete_all_files_and_directories(cx: &mut gpui::TestAppContext) {
 async fn test_nested_selection_deletion(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -4523,7 +4523,7 @@ async fn test_nested_selection_deletion(cx: &mut gpui::TestAppContext) {
 async fn test_multiple_worktrees_deletion(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     // First worktree
     fs.insert_tree(
         "/root1",
@@ -4666,7 +4666,7 @@ async fn test_multiple_worktrees_deletion(cx: &mut gpui::TestAppContext) {
 async fn test_selection_vs_marked_entries_priority(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -4766,7 +4766,7 @@ async fn test_selection_vs_marked_entries_priority(cx: &mut gpui::TestAppContext
 async fn test_selection_fallback_to_next_highest_worktree(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root_b",
         json!({
@@ -4859,7 +4859,7 @@ fn toggle_expand_dir(
 async fn test_expand_all_for_entry(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -5050,7 +5050,7 @@ async fn test_expand_all_for_entry(cx: &mut gpui::TestAppContext) {
 async fn test_collapse_all_for_entry(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -5234,7 +5234,7 @@ async fn test_collapse_all_for_entry(cx: &mut gpui::TestAppContext) {
 async fn test_create_entries_without_selection(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -5299,7 +5299,7 @@ async fn test_create_entries_without_selection(cx: &mut gpui::TestAppContext) {
 async fn test_create_entries_without_selection_hide_root(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         path!("/root"),
         json!({
@@ -5448,7 +5448,7 @@ async fn test_create_entries_without_selection_hide_root(cx: &mut gpui::TestAppC
 async fn test_highlight_entry_for_external_drag(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -5516,7 +5516,7 @@ async fn test_highlight_entry_for_external_drag(cx: &mut gpui::TestAppContext) {
 async fn test_highlight_entry_for_selection_drag(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -5647,7 +5647,7 @@ async fn test_highlight_entry_for_selection_drag(cx: &mut gpui::TestAppContext)
 async fn test_hide_root(cx: &mut gpui::TestAppContext) {
     init_test(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root1",
         json!({
@@ -5825,7 +5825,7 @@ async fn test_hide_root(cx: &mut gpui::TestAppContext) {
 async fn test_compare_selected_files(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -5923,7 +5923,7 @@ async fn test_compare_selected_files(cx: &mut gpui::TestAppContext) {
 async fn test_compare_files_context_menu(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);
 
-    let fs = FakeFs::new(cx.executor().clone());
+    let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
         "/root",
         json!({
@@ -6152,7 +6152,7 @@ fn init_test_with_editor(cx: &mut TestAppContext) {
         language::init(cx);
         editor::init(cx);
         crate::init(cx);
-        workspace::init(app_state.clone(), cx);
+        workspace::init(app_state, cx);
         Project::init_settings(cx);
 
         cx.update_global::<SettingsStore, _>(|store, cx| {
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 9d0f54bc01..72029e55a0 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -233,7 +233,7 @@ impl PickerDelegate for ProjectSymbolsDelegate {
             }
         }
         let label = symbol.label.text.clone();
-        let path = path.to_string().clone();
+        let path = path.to_string();
 
         let highlights = gpui::combine_highlights(
             string_match
@@ -257,10 +257,8 @@ impl PickerDelegate for ProjectSymbolsDelegate {
                     v_flex()
                         .child(
                             LabelLike::new().child(
-                                StyledText::new(label).with_default_highlights(
-                                    &window.text_style().clone(),
-                                    highlights,
-                                ),
+                                StyledText::new(label)
+                                    .with_default_highlights(&window.text_style(), highlights),
                             ),
                         )
                         .child(Label::new(path).color(Color::Muted)),
diff --git a/crates/prompt_store/src/prompts.rs b/crates/prompt_store/src/prompts.rs
index 4ab867ab64..9a9b2fc3de 100644
--- a/crates/prompt_store/src/prompts.rs
+++ b/crates/prompt_store/src/prompts.rs
@@ -403,7 +403,7 @@ impl PromptBuilder {
                 ContentPromptDiagnosticContext {
                     line_number: (start.row + 1) as usize,
                     error_message: entry.diagnostic.message.clone(),
-                    code_content: buffer.text_for_range(entry.range.clone()).collect(),
+                    code_content: buffer.text_for_range(entry.range).collect(),
                 }
             })
             .collect();
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 0f43d83d86..a9c3284d0b 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -119,7 +119,7 @@ impl EditNicknameState {
         let starting_text = SshSettings::get_global(cx)
             .ssh_connections()
             .nth(index)
-            .and_then(|state| state.nickname.clone())
+            .and_then(|state| state.nickname)
             .filter(|text| !text.is_empty());
         this.editor.update(cx, |this, cx| {
             this.set_placeholder_text("Add a nickname for this server", cx);
@@ -165,7 +165,7 @@ impl ProjectPicker {
         let nickname = connection.nickname.clone().map(|nick| nick.into());
         let _path_task = cx
             .spawn_in(window, {
-                let workspace = workspace.clone();
+                let workspace = workspace;
                 async move |this, cx| {
                     let Ok(Some(paths)) = rx.await else {
                         workspace
@@ -520,7 +520,7 @@ impl RemoteServerProjects {
         self.mode = Mode::CreateRemoteServer(CreateRemoteServer {
             address_editor: editor,
             address_error: None,
-            ssh_prompt: Some(ssh_prompt.clone()),
+            ssh_prompt: Some(ssh_prompt),
             _creating: Some(creating),
         });
     }
@@ -843,7 +843,7 @@ impl RemoteServerProjects {
                                 .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
                                 .child(Label::new("Open Folder"))
                                 .on_click(cx.listener({
-                                    let ssh_connection = connection.clone();
+                                    let ssh_connection = connection;
                                     let host = host.clone();
                                     move |this, _, window, cx| {
                                         let new_ix = this.create_host_from_ssh_config(&host, cx);
@@ -1376,7 +1376,7 @@ impl RemoteServerProjects {
         };
 
         let connection_string = connection.host.clone();
-        let nickname = connection.nickname.clone().map(|s| s.into());
+        let nickname = connection.nickname.map(|s| s.into());
 
         v_flex()
             .id("ssh-edit-nickname")
diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/ssh_connections.rs
index 670fcb4800..d07ea48c7e 100644
--- a/crates/recent_projects/src/ssh_connections.rs
+++ b/crates/recent_projects/src/ssh_connections.rs
@@ -681,7 +681,7 @@ pub async fn open_ssh_project(
 
         window
             .update(cx, |workspace, _, cx| {
-                if let Some(client) = workspace.project().read(cx).ssh_client().clone() {
+                if let Some(client) = workspace.project().read(cx).ssh_client() {
                     ExtensionStore::global(cx)
                         .update(cx, |store, cx| store.register_ssh_client(client, cx));
                 }
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index fddf47660d..5fa3a5f715 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -233,8 +233,8 @@ impl SshConnectionOptions {
         };
 
         Ok(Self {
-            host: hostname.to_string(),
-            username: username.clone(),
+            host: hostname,
+            username,
             port,
             port_forwards,
             args: Some(args),
@@ -1363,7 +1363,7 @@ impl ConnectionPool {
 
 impl From<SshRemoteClient> for AnyProtoClient {
     fn from(client: SshRemoteClient) -> Self {
-        AnyProtoClient::new(client.client.clone())
+        AnyProtoClient::new(client.client)
     }
 }
 
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 3bcdcbd73c..83caebe62f 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -237,11 +237,11 @@ impl HeadlessProject {
         session.add_entity_message_handler(BufferStore::handle_close_buffer);
 
         session.add_request_handler(
-            extensions.clone().downgrade(),
+            extensions.downgrade(),
             HeadlessExtensionStore::handle_sync_extensions,
         );
         session.add_request_handler(
-            extensions.clone().downgrade(),
+            extensions.downgrade(),
             HeadlessExtensionStore::handle_install_extension,
         );
 
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 4ce133cbb1..b8a7351552 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -160,7 +160,7 @@ fn init_panic_hook(session_id: String) {
 
         let panic_data = telemetry_events::Panic {
             thread: thread_name.into(),
-            payload: payload.clone(),
+            payload,
             location_data: info.location().map(|location| LocationData {
                 file: location.file().into(),
                 line: location.line(),
@@ -799,7 +799,6 @@ fn initialize_settings(
         watch_config_file(cx.background_executor(), fs, paths::settings_file().clone());
 
     handle_settings_file_changes(user_settings_file_rx, cx, {
-        let session = session.clone();
         move |err, _cx| {
             if let Some(e) = err {
                 log::info!("Server settings failed to change: {}", e);
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
index 714cb3aed3..bceefd08cc 100644
--- a/crates/repl/src/components/kernel_options.rs
+++ b/crates/repl/src/components/kernel_options.rs
@@ -187,7 +187,7 @@ impl PickerDelegate for KernelPickerDelegate {
                                                     .size(LabelSize::Default),
                                             ),
                                         )
-                                        .when_some(path_or_url.clone(), |flex, path| {
+                                        .when_some(path_or_url, |flex, path| {
                                             flex.text_ellipsis().child(
                                                 Label::new(path)
                                                     .size(LabelSize::Small)
diff --git a/crates/repl/src/kernels/remote_kernels.rs b/crates/repl/src/kernels/remote_kernels.rs
index 1bef6c24db..6bc8b0d1b1 100644
--- a/crates/repl/src/kernels/remote_kernels.rs
+++ b/crates/repl/src/kernels/remote_kernels.rs
@@ -95,7 +95,7 @@ pub async fn list_remote_kernelspecs(
         .kernelspecs
         .into_iter()
         .map(|(name, spec)| RemoteKernelSpecification {
-            name: name.clone(),
+            name,
             url: remote_server.base_url.clone(),
             token: remote_server.token.clone(),
             kernelspec: spec.spec,
@@ -103,7 +103,7 @@ pub async fn list_remote_kernelspecs(
         .collect::<Vec<RemoteKernelSpecification>>();
 
     anyhow::ensure!(!remote_kernelspecs.is_empty(), "No kernel specs found");
-    Ok(remote_kernelspecs.clone())
+    Ok(remote_kernelspecs)
 }
 
 impl PartialEq for RemoteKernelSpecification {
diff --git a/crates/repl/src/outputs.rs b/crates/repl/src/outputs.rs
index 1508c2b531..767b103435 100644
--- a/crates/repl/src/outputs.rs
+++ b/crates/repl/src/outputs.rs
@@ -228,26 +228,23 @@ impl Output {
             .child(div().flex_1().children(content))
             .children(match self {
                 Self::Plain { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace.clone(), window, cx)
+                    Self::render_output_controls(content.clone(), workspace, window, cx)
                 }
                 Self::Markdown { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace.clone(), window, cx)
+                    Self::render_output_controls(content.clone(), workspace, window, cx)
                 }
                 Self::Stream { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace.clone(), window, cx)
+                    Self::render_output_controls(content.clone(), workspace, window, cx)
                 }
                 Self::Image { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace.clone(), window, cx)
+                    Self::render_output_controls(content.clone(), workspace, window, cx)
+                }
+                Self::ErrorOutput(err) => {
+                    Self::render_output_controls(err.traceback.clone(), workspace, window, cx)
                 }
-                Self::ErrorOutput(err) => Self::render_output_controls(
-                    err.traceback.clone(),
-                    workspace.clone(),
-                    window,
-                    cx,
-                ),
                 Self::Message(_) => None,
                 Self::Table { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace.clone(), window, cx)
+                    Self::render_output_controls(content.clone(), workspace, window, cx)
                 }
                 Self::ClearOutputWaitMarker => None,
             })
diff --git a/crates/repl/src/outputs/markdown.rs b/crates/repl/src/outputs/markdown.rs
index 118260ae94..bd88f4e159 100644
--- a/crates/repl/src/outputs/markdown.rs
+++ b/crates/repl/src/outputs/markdown.rs
@@ -35,7 +35,7 @@ impl MarkdownView {
         });
 
         Self {
-            raw_text: text.clone(),
+            raw_text: text,
             image_cache: RetainAllImageCache::new(cx),
             contents: None,
             parsing_markdown_task: Some(task),
diff --git a/crates/repl/src/repl_editor.rs b/crates/repl/src/repl_editor.rs
index e97223ceb9..b4c928c33e 100644
--- a/crates/repl/src/repl_editor.rs
+++ b/crates/repl/src/repl_editor.rs
@@ -202,7 +202,7 @@ pub fn session(editor: WeakEntity<Editor>, cx: &mut App) -> SessionSupport {
         return SessionSupport::Unsupported;
     };
 
-    let worktree_id = worktree_id_for_editor(editor.clone(), cx);
+    let worktree_id = worktree_id_for_editor(editor, cx);
 
     let Some(worktree_id) = worktree_id else {
         return SessionSupport::Unsupported;
@@ -216,7 +216,7 @@ pub fn session(editor: WeakEntity<Editor>, cx: &mut App) -> SessionSupport {
         Some(kernelspec) => SessionSupport::Inactive(kernelspec),
         None => {
             // For language_supported, need to check available kernels for language
-            if language_supported(&language.clone(), cx) {
+            if language_supported(&language, cx) {
                 SessionSupport::RequiresSetup(language.name())
             } else {
                 SessionSupport::Unsupported
@@ -326,7 +326,7 @@ pub fn setup_editor_session_actions(editor: &mut Editor, editor_handle: WeakEnti
 
     editor
         .register_action({
-            let editor_handle = editor_handle.clone();
+            let editor_handle = editor_handle;
             move |_: &Restart, window, cx| {
                 if !JupyterSettings::enabled(cx) {
                     return;
@@ -420,7 +420,7 @@ fn runnable_ranges(
     if let Some(language) = buffer.language()
         && language.name() == "Markdown".into()
     {
-        return (markdown_code_blocks(buffer, range.clone(), cx), None);
+        return (markdown_code_blocks(buffer, range, cx), None);
     }
 
     let (jupytext_snippets, next_cursor) = jupytext_cells(buffer, range.clone());
@@ -685,8 +685,8 @@ mod tests {
         let python = languages::language("python", tree_sitter_python::LANGUAGE.into());
         let language_registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
         language_registry.add(markdown.clone());
-        language_registry.add(typescript.clone());
-        language_registry.add(python.clone());
+        language_registry.add(typescript);
+        language_registry.add(python);
 
         // Two code blocks intersecting with selection
         let buffer = cx.new(|cx| {
diff --git a/crates/repl/src/repl_sessions_ui.rs b/crates/repl/src/repl_sessions_ui.rs
index f57dd64770..493b8aa950 100644
--- a/crates/repl/src/repl_sessions_ui.rs
+++ b/crates/repl/src/repl_sessions_ui.rs
@@ -129,7 +129,6 @@ pub fn init(cx: &mut App) {
 
                 editor
                     .register_action({
-                        let editor_handle = editor_handle.clone();
                         move |_: &RunInPlace, window, cx| {
                             if !JupyterSettings::enabled(cx) {
                                 return;
diff --git a/crates/repl/src/session.rs b/crates/repl/src/session.rs
index f945e5ed9f..674639c402 100644
--- a/crates/repl/src/session.rs
+++ b/crates/repl/src/session.rs
@@ -460,7 +460,6 @@ impl Session {
             Kernel::StartingKernel(task) => {
                 // Queue up the execution as a task to run after the kernel starts
                 let task = task.clone();
-                let message = message.clone();
 
                 cx.spawn(async move |this, cx| {
                     task.await;
@@ -568,7 +567,7 @@ impl Session {
 
         match kernel {
             Kernel::RunningKernel(mut kernel) => {
-                let mut request_tx = kernel.request_tx().clone();
+                let mut request_tx = kernel.request_tx();
 
                 let forced = kernel.force_shutdown(window, cx);
 
@@ -605,7 +604,7 @@ impl Session {
                 // Do nothing if already restarting
             }
             Kernel::RunningKernel(mut kernel) => {
-                let mut request_tx = kernel.request_tx().clone();
+                let mut request_tx = kernel.request_tx();
 
                 let forced = kernel.force_shutdown(window, cx);
 
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
index 379daa4224..00679d8cf5 100644
--- a/crates/rope/src/chunk.rs
+++ b/crates/rope/src/chunk.rs
@@ -408,7 +408,7 @@ impl<'a> ChunkSlice<'a> {
         }
 
         let row_offset_range = self.offset_range_for_row(point.0.row);
-        let line = self.slice(row_offset_range.clone());
+        let line = self.slice(row_offset_range);
         if point.0.column == 0 {
             Point::new(point.0.row, 0)
         } else if point.0.column >= line.len_utf16().0 as u32 {
diff --git a/crates/rpc/src/conn.rs b/crates/rpc/src/conn.rs
index 78db80e398..e598e5f7bc 100644
--- a/crates/rpc/src/conn.rs
+++ b/crates/rpc/src/conn.rs
@@ -80,7 +80,6 @@ impl Connection {
             });
 
             let rx = rx.then({
-                let executor = executor.clone();
                 move |msg| {
                     let killed = killed.clone();
                     let executor = executor.clone();
diff --git a/crates/rpc/src/peer.rs b/crates/rpc/src/peer.rs
index 98f5fa40e9..73be0f19fe 100644
--- a/crates/rpc/src/peer.rs
+++ b/crates/rpc/src/peer.rs
@@ -378,7 +378,6 @@ impl Peer {
         impl Future<Output = anyhow::Result<()>> + Send + use<>,
         BoxStream<'static, Box<dyn AnyTypedEnvelope>>,
     ) {
-        let executor = executor.clone();
         self.add_connection(connection, move |duration| executor.timer(duration))
     }
 
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
index bebe4315e4..5ad3996e78 100644
--- a/crates/rules_library/src/rules_library.rs
+++ b/crates/rules_library/src/rules_library.rs
@@ -418,7 +418,7 @@ impl RulesLibrary {
             } else {
                 None
             },
-            store: store.clone(),
+            store,
             language_registry,
             rule_editors: HashMap::default(),
             active_rule_id: None,
@@ -1136,7 +1136,7 @@ impl RulesLibrary {
                                                 .child(
                                                     Label::new(format!(
                                                         "{} tokens",
-                                                        label_token_count.clone()
+                                                        label_token_count
                                                     ))
                                                     .color(Color::Muted),
                                                 )
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 75042f184f..a38dc8c35b 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -716,10 +716,10 @@ impl BufferSearchBar {
             self.replace_enabled = deploy.replace_enabled;
             self.selection_search_enabled = deploy.selection_search_enabled;
             if deploy.focus {
-                let mut handle = self.query_editor.focus_handle(cx).clone();
+                let mut handle = self.query_editor.focus_handle(cx);
                 let mut select_query = true;
                 if deploy.replace_enabled && handle.is_focused(window) {
-                    handle = self.replacement_editor.focus_handle(cx).clone();
+                    handle = self.replacement_editor.focus_handle(cx);
                     select_query = false;
                 };
 
diff --git a/crates/search/src/buffer_search/registrar.rs b/crates/search/src/buffer_search/registrar.rs
index 4351e38618..0e227cbb7c 100644
--- a/crates/search/src/buffer_search/registrar.rs
+++ b/crates/search/src/buffer_search/registrar.rs
@@ -42,7 +42,6 @@ impl<T: 'static> SearchActionsRegistrar for DivRegistrar<'_, '_, T> {
         self.div = self.div.take().map(|div| {
             div.on_action(self.cx.listener(move |this, action, window, cx| {
                 let should_notify = (getter)(this, window, cx)
-                    .clone()
                     .map(|search_bar| {
                         search_bar.update(cx, |search_bar, cx| {
                             callback.execute(search_bar, action, window, cx)
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 0886654d62..c4ba9b5154 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -3716,7 +3716,7 @@ pub mod tests {
                 window
                     .update(cx, |_, _, cx| {
                         search_view.update(cx, |search_view, cx| {
-                            search_view.query_editor.read(cx).text(cx).to_string()
+                            search_view.query_editor.read(cx).text(cx)
                         })
                     })
                     .unwrap()
@@ -3883,7 +3883,6 @@ pub mod tests {
         // Add a project search item to the second pane
         window
             .update(cx, {
-                let search_bar = search_bar.clone();
                 |workspace, window, cx| {
                     assert_eq!(workspace.panes().len(), 2);
                     second_pane.update(cx, |pane, cx| {
diff --git a/crates/semantic_index/examples/index.rs b/crates/semantic_index/examples/index.rs
index da27b8ad22..86f1e53a60 100644
--- a/crates/semantic_index/examples/index.rs
+++ b/crates/semantic_index/examples/index.rs
@@ -35,7 +35,7 @@ fn main() {
             None,
         ));
         let client = client::Client::new(clock, http.clone(), cx);
-        Client::set_global(client.clone(), cx);
+        Client::set_global(client, cx);
 
         let args: Vec<String> = std::env::args().collect();
         if args.len() < 2 {
@@ -49,7 +49,7 @@ fn main() {
         let api_key = std::env::var("OPENAI_API_KEY").expect("OPENAI_API_KEY not set");
 
         let embedding_provider = Arc::new(OpenAiEmbeddingProvider::new(
-            http.clone(),
+            http,
             OpenAiEmbeddingModel::TextEmbedding3Small,
             open_ai::OPEN_AI_API_URL.to_string(),
             api_key,
diff --git a/crates/semantic_index/src/embedding_index.rs b/crates/semantic_index/src/embedding_index.rs
index eeb3c91fcd..c54cd9d3c3 100644
--- a/crates/semantic_index/src/embedding_index.rs
+++ b/crates/semantic_index/src/embedding_index.rs
@@ -88,7 +88,7 @@ impl EmbeddingIndex {
 
         let worktree = self.worktree.read(cx).snapshot();
         let worktree_abs_path = worktree.abs_path().clone();
-        let scan = self.scan_updated_entries(worktree, updated_entries.clone(), cx);
+        let scan = self.scan_updated_entries(worktree, updated_entries, cx);
         let chunk = self.chunk_files(worktree_abs_path, scan.updated_entries, cx);
         let embed = Self::embed_files(self.embedding_provider.clone(), chunk.files, cx);
         let persist = self.persist_embeddings(scan.deleted_entry_ranges, embed.files, cx);
@@ -406,7 +406,7 @@ impl EmbeddingIndex {
                 .context("failed to create read transaction")?;
             let result = db
                 .iter(&tx)?
-                .map(|entry| Ok(entry?.1.path.clone()))
+                .map(|entry| Ok(entry?.1.path))
                 .collect::<Result<Vec<Arc<Path>>>>();
             drop(tx);
             result
@@ -423,8 +423,7 @@ impl EmbeddingIndex {
             Ok(db
                 .get(&tx, &db_key_for_path(&path))?
                 .context("no such path")?
-                .chunks
-                .clone())
+                .chunks)
         })
     }
 }
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index 1dafeb072f..439791047a 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -434,7 +434,7 @@ mod tests {
             .await;
 
         let range = search_result.range.clone();
-        let content = content[range.clone()].to_owned();
+        let content = content[range].to_owned();
 
         assert!(content.contains("garbage in, garbage out"));
     }
diff --git a/crates/semantic_index/src/summary_index.rs b/crates/semantic_index/src/summary_index.rs
index d1c9a3abac..9a3eb302ed 100644
--- a/crates/semantic_index/src/summary_index.rs
+++ b/crates/semantic_index/src/summary_index.rs
@@ -205,7 +205,7 @@ impl SummaryIndex {
             let worktree = self.worktree.read(cx).snapshot();
             let worktree_abs_path = worktree.abs_path().clone();
 
-            backlogged = self.scan_updated_entries(worktree, updated_entries.clone(), cx);
+            backlogged = self.scan_updated_entries(worktree, updated_entries, cx);
             digest = self.digest_files(backlogged.paths_to_digest, worktree_abs_path, cx);
             needs_summary = self.check_summary_cache(digest.files, cx);
             summaries = self.summarize_files(needs_summary.files, cx);
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index a472c50e6c..8080ec8d5f 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -361,7 +361,7 @@ pub fn replace_top_level_array_value_in_json_text(
     let needs_indent = range.start_point.row > 0;
 
     if new_value.is_none() && key_path.is_empty() {
-        let mut remove_range = text_range.clone();
+        let mut remove_range = text_range;
         if index == 0 {
             while cursor.goto_next_sibling()
                 && (cursor.node().is_extra() || cursor.node().is_missing())
@@ -582,7 +582,7 @@ mod tests {
             expected: String,
         ) {
             let result = replace_value_in_json_text(&input, key_path, 4, value.as_ref(), None);
-            let mut result_str = input.to_string();
+            let mut result_str = input;
             result_str.replace_range(result.0, &result.1);
             pretty_assertions::assert_eq!(expected, result_str);
         }
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
index 25be67bfd7..d7ebd6488d 100644
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ b/crates/settings_profile_selector/src/settings_profile_selector.rs
@@ -135,7 +135,7 @@ impl SettingsProfileSelectorDelegate {
     ) -> Option<String> {
         if let Some(profile_name) = profile_name {
             cx.set_global(ActiveSettingsProfileName(profile_name.clone()));
-            return Some(profile_name.clone());
+            return Some(profile_name);
         }
 
         if cx.has_global::<ActiveSettingsProfileName>() {
diff --git a/crates/settings_ui/src/appearance_settings_controls.rs b/crates/settings_ui/src/appearance_settings_controls.rs
index 141ae13182..255f5a36b5 100644
--- a/crates/settings_ui/src/appearance_settings_controls.rs
+++ b/crates/settings_ui/src/appearance_settings_controls.rs
@@ -83,7 +83,7 @@ impl RenderOnce for ThemeControl {
 
         DropdownMenu::new(
             "theme",
-            value.clone(),
+            value,
             ContextMenu::build(window, cx, |mut menu, _, cx| {
                 let theme_registry = ThemeRegistry::global(cx);
 
@@ -204,7 +204,7 @@ impl RenderOnce for UiFontFamilyControl {
             .child(Icon::new(IconName::Font))
             .child(DropdownMenu::new(
                 "ui-font-family",
-                value.clone(),
+                value,
                 ContextMenu::build(window, cx, |mut menu, _, cx| {
                     let font_family_cache = FontFamilyCache::global(cx);
 
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 12e3c0c274..9a2d33ef7c 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -1182,8 +1182,8 @@ impl KeymapEditor {
             return;
         };
 
-        telemetry::event!("Keybinding Context Copied", context = context.clone());
-        cx.write_to_clipboard(gpui::ClipboardItem::new_string(context.clone()));
+        telemetry::event!("Keybinding Context Copied", context = context);
+        cx.write_to_clipboard(gpui::ClipboardItem::new_string(context));
     }
 
     fn copy_action_to_clipboard(
@@ -1199,8 +1199,8 @@ impl KeymapEditor {
             return;
         };
 
-        telemetry::event!("Keybinding Action Copied", action = action.clone());
-        cx.write_to_clipboard(gpui::ClipboardItem::new_string(action.clone()));
+        telemetry::event!("Keybinding Action Copied", action = action);
+        cx.write_to_clipboard(gpui::ClipboardItem::new_string(action));
     }
 
     fn toggle_conflict_filter(
@@ -1464,7 +1464,7 @@ impl RenderOnce for KeybindContextString {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
         match self {
             KeybindContextString::Global => {
-                muted_styled_text(KeybindContextString::GLOBAL.clone(), cx).into_any_element()
+                muted_styled_text(KeybindContextString::GLOBAL, cx).into_any_element()
             }
             KeybindContextString::Local(name, language) => {
                 SyntaxHighlightedText::new(name, language).into_any_element()
@@ -1748,7 +1748,7 @@ impl Render for KeymapEditor {
                                             } else {
                                                 const NULL: SharedString =
                                                     SharedString::new_static("<null>");
-                                                muted_styled_text(NULL.clone(), cx)
+                                                muted_styled_text(NULL, cx)
                                                     .into_any_element()
                                             }
                                         })
diff --git a/crates/story/src/story.rs b/crates/story/src/story.rs
index 6fed0ab12d..b59cb6fb99 100644
--- a/crates/story/src/story.rs
+++ b/crates/story/src/story.rs
@@ -194,7 +194,7 @@ impl RenderOnce for StorySection {
             // Section title
             .py_2()
             // Section description
-            .when_some(self.description.clone(), |section, description| {
+            .when_some(self.description, |section, description| {
                 section.child(Story::description(description, cx))
             })
             .child(div().flex().flex_col().gap_2().children(children))
diff --git a/crates/supermaven/src/supermaven.rs b/crates/supermaven/src/supermaven.rs
index 743c0d4c7d..7a9963dbc4 100644
--- a/crates/supermaven/src/supermaven.rs
+++ b/crates/supermaven/src/supermaven.rs
@@ -384,9 +384,7 @@ impl SupermavenAgent {
         match message {
             SupermavenMessage::ActivationRequest(request) => {
                 self.account_status = match request.activate_url {
-                    Some(activate_url) => AccountStatus::NeedsActivation {
-                        activate_url: activate_url.clone(),
-                    },
+                    Some(activate_url) => AccountStatus::NeedsActivation { activate_url },
                     None => AccountStatus::Ready,
                 };
             }
diff --git a/crates/supermaven/src/supermaven_completion_provider.rs b/crates/supermaven/src/supermaven_completion_provider.rs
index 1b1fc54a7a..eb54c83f81 100644
--- a/crates/supermaven/src/supermaven_completion_provider.rs
+++ b/crates/supermaven/src/supermaven_completion_provider.rs
@@ -45,9 +45,7 @@ fn completion_from_diff(
     position: Anchor,
     delete_range: Range<Anchor>,
 ) -> EditPrediction {
-    let buffer_text = snapshot
-        .text_for_range(delete_range.clone())
-        .collect::<String>();
+    let buffer_text = snapshot.text_for_range(delete_range).collect::<String>();
 
     let mut edits: Vec<(Range<language::Anchor>, String)> = Vec::new();
 
diff --git a/crates/task/src/static_source.rs b/crates/task/src/static_source.rs
index 0e7a021b06..9e4051ef97 100644
--- a/crates/task/src/static_source.rs
+++ b/crates/task/src/static_source.rs
@@ -75,7 +75,6 @@ impl<T: PartialEq + 'static + Sync> TrackedFile<T> {
     {
         let parsed_contents: Arc<RwLock<T>> = Arc::default();
         cx.background_spawn({
-            let parsed_contents = parsed_contents.clone();
             async move {
                 while let Some(new_contents) = tracker.next().await {
                     if Arc::strong_count(&parsed_contents) == 1 {
diff --git a/crates/task/src/task.rs b/crates/task/src/task.rs
index aae28ab874..85e654eff4 100644
--- a/crates/task/src/task.rs
+++ b/crates/task/src/task.rs
@@ -100,7 +100,7 @@ impl SpawnInTerminal {
             command: proto.command.clone(),
             args: proto.args.clone(),
             env: proto.env.into_iter().collect(),
-            cwd: proto.cwd.map(PathBuf::from).clone(),
+            cwd: proto.cwd.map(PathBuf::from),
             ..Default::default()
         }
     }
diff --git a/crates/task/src/task_template.rs b/crates/task/src/task_template.rs
index 24e11d7715..3d1d180557 100644
--- a/crates/task/src/task_template.rs
+++ b/crates/task/src/task_template.rs
@@ -183,6 +183,10 @@ impl TaskTemplate {
                 &mut substituted_variables,
             )?
         } else {
+            #[allow(
+                clippy::redundant_clone,
+                reason = "We want to clone the full_label to avoid borrowing it in the fold closure"
+            )]
             full_label.clone()
         }
         .lines()
@@ -453,7 +457,7 @@ mod tests {
             TaskTemplate {
                 label: "".to_string(),
                 command: "".to_string(),
-                ..task_with_all_properties.clone()
+                ..task_with_all_properties
             },
         ] {
             assert_eq!(
@@ -521,7 +525,7 @@ mod tests {
         );
 
         let cx = TaskContext {
-            cwd: Some(context_cwd.clone()),
+            cwd: Some(context_cwd),
             task_variables: TaskVariables::default(),
             project_env: HashMap::default(),
         };
@@ -768,7 +772,7 @@ mod tests {
                     "test_env_key".to_string(),
                     format!("test_env_var_{}", VariableName::Symbol.template_value()),
                 )]),
-                ..task_with_all_properties.clone()
+                ..task_with_all_properties
             },
         ]
         .into_iter()
@@ -871,7 +875,7 @@ mod tests {
 
         let context = TaskContext {
             cwd: None,
-            task_variables: TaskVariables::from_iter(all_variables.clone()),
+            task_variables: TaskVariables::from_iter(all_variables),
             project_env,
         };
 
diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs
index a4fdc24e17..3f3a4cc116 100644
--- a/crates/tasks_ui/src/tasks_ui.rs
+++ b/crates/tasks_ui/src/tasks_ui.rs
@@ -434,7 +434,7 @@ mod tests {
         )
         .await;
         let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let worktree_store = project.read_with(cx, |project, _| project.worktree_store().clone());
+        let worktree_store = project.read_with(cx, |project, _| project.worktree_store());
         let rust_language = Arc::new(
             Language::new(
                 LanguageConfig::default(),
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 16c1efabba..b38a69f095 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -486,7 +486,7 @@ impl TerminalBuilder {
         //And connect them together
         let event_loop = EventLoop::new(
             term.clone(),
-            ZedListener(events_tx.clone()),
+            ZedListener(events_tx),
             pty,
             pty_options.drain_on_exit,
             false,
@@ -1661,7 +1661,7 @@ impl Terminal {
                 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
                 MouseButton::Middle => {
                     if let Some(item) = _cx.read_from_primary() {
-                        let text = item.text().unwrap_or_default().to_string();
+                        let text = item.text().unwrap_or_default();
                         self.input(text.into_bytes());
                     }
                 }
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 1c38dbc877..c2fbeb7ee6 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -653,7 +653,7 @@ impl TerminalElement {
             let terminal = self.terminal.clone();
             let hitbox = hitbox.clone();
             let focus = focus.clone();
-            let terminal_view = terminal_view.clone();
+            let terminal_view = terminal_view;
             move |e: &MouseMoveEvent, phase, window, cx| {
                 if phase != DispatchPhase::Bubble {
                     return;
@@ -1838,8 +1838,7 @@ mod tests {
         };
 
         let font_size = AbsoluteLength::Pixels(px(12.0));
-        let batch =
-            BatchedTextRun::new_from_char(AlacPoint::new(0, 0), 'a', style1.clone(), font_size);
+        let batch = BatchedTextRun::new_from_char(AlacPoint::new(0, 0), 'a', style1, font_size);
 
         // Should be able to append same style
         assert!(batch.can_append(&style2));
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 1d76f70152..f40c4870f1 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -181,7 +181,6 @@ impl TerminalPanel {
                             .anchor(Corner::TopRight)
                             .with_handle(pane.split_item_context_menu_handle.clone())
                             .menu({
-                                let split_context = split_context.clone();
                                 move |window, cx| {
                                     ContextMenu::build(window, cx, |menu, _, _| {
                                         menu.when_some(
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index e02324a142..c54010b4b0 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -257,9 +257,9 @@ pub fn refine_theme_family(theme_family_content: ThemeFamilyContent) -> ThemeFam
     let author = theme_family_content.author.clone();
 
     let mut theme_family = ThemeFamily {
-        id: id.clone(),
-        name: name.clone().into(),
-        author: author.clone().into(),
+        id,
+        name: name.into(),
+        author: author.into(),
         themes: vec![],
         scales: default_color_scales(),
     };
diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs
index 0249bdc7c9..b3b846d91d 100644
--- a/crates/theme_importer/src/vscode/converter.rs
+++ b/crates/theme_importer/src/vscode/converter.rs
@@ -158,7 +158,7 @@ impl VsCodeThemeConverter {
                 .tab
                 .active_background
                 .clone()
-                .or(vscode_tab_inactive_background.clone()),
+                .or(vscode_tab_inactive_background),
             search_match_background: vscode_colors.editor.find_match_background.clone(),
             panel_background: vscode_colors.panel.background.clone(),
             pane_group_border: vscode_colors.editor_group.border.clone(),
@@ -171,22 +171,20 @@ impl VsCodeThemeConverter {
                 .scrollbar_slider
                 .active_background
                 .clone(),
-            scrollbar_thumb_border: vscode_scrollbar_slider_background.clone(),
+            scrollbar_thumb_border: vscode_scrollbar_slider_background,
             scrollbar_track_background: vscode_editor_background.clone(),
             scrollbar_track_border: vscode_colors.editor_overview_ruler.border.clone(),
             minimap_thumb_background: vscode_colors.minimap_slider.background.clone(),
             minimap_thumb_hover_background: vscode_colors.minimap_slider.hover_background.clone(),
             minimap_thumb_active_background: vscode_colors.minimap_slider.active_background.clone(),
-            editor_foreground: vscode_editor_foreground
-                .clone()
-                .or(vscode_token_colors_foreground.clone()),
+            editor_foreground: vscode_editor_foreground.or(vscode_token_colors_foreground),
             editor_background: vscode_editor_background.clone(),
-            editor_gutter_background: vscode_editor_background.clone(),
+            editor_gutter_background: vscode_editor_background,
             editor_active_line_background: vscode_colors.editor.line_highlight_background.clone(),
             editor_line_number: vscode_colors.editor_line_number.foreground.clone(),
             editor_active_line_number: vscode_colors.editor.foreground.clone(),
             editor_wrap_guide: vscode_panel_border.clone(),
-            editor_active_wrap_guide: vscode_panel_border.clone(),
+            editor_active_wrap_guide: vscode_panel_border,
             editor_document_highlight_bracket_background: vscode_colors
                 .editor_bracket_match
                 .background
diff --git a/crates/title_bar/src/application_menu.rs b/crates/title_bar/src/application_menu.rs
index d8b0b8dc6b..4a8cac2435 100644
--- a/crates/title_bar/src/application_menu.rs
+++ b/crates/title_bar/src/application_menu.rs
@@ -186,7 +186,7 @@ impl ApplicationMenu {
                     .trigger(
                         Button::new(
                             SharedString::from(format!("{}-menu-trigger", menu_name)),
-                            menu_name.clone(),
+                            menu_name,
                         )
                         .style(ButtonStyle::Subtle)
                         .label_size(LabelSize::Small),
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index 5be68afeb4..c667edb509 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -155,7 +155,7 @@ impl TitleBar {
             .gap_1()
             .overflow_x_scroll()
             .when_some(
-                current_user.clone().zip(client.peer_id()).zip(room.clone()),
+                current_user.zip(client.peer_id()).zip(room),
                 |this, ((current_user, peer_id), room)| {
                     let player_colors = cx.theme().players();
                     let room = room.read(cx);
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 5bd6a17e4b..35b33f39be 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -305,7 +305,6 @@ impl TitleBar {
 
         let nickname = options
             .nickname
-            .clone()
             .map(|nick| nick.into())
             .unwrap_or_else(|| host.clone());
 
@@ -351,11 +350,7 @@ impl TitleBar {
                             .indicator_border_color(Some(cx.theme().colors().title_bar_background))
                             .into_any_element(),
                         )
-                        .child(
-                            Label::new(nickname.clone())
-                                .size(LabelSize::Small)
-                                .truncate(),
-                        ),
+                        .child(Label::new(nickname).size(LabelSize::Small).truncate()),
                 )
                 .tooltip(move |window, cx| {
                     Tooltip::with_meta(
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index cdd3db99e0..feeca8cf52 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -167,7 +167,6 @@ impl ToolchainSelectorDelegate {
         cx: &mut Context<Picker<Self>>,
     ) -> Self {
         let _fetch_candidates_task = cx.spawn_in(window, {
-            let project = project.clone();
             async move |this, cx| {
                 let term = project
                     .read_with(cx, |this, _| {
diff --git a/crates/ui/src/components/dropdown_menu.rs b/crates/ui/src/components/dropdown_menu.rs
index 7ad9400f0d..f276d483a6 100644
--- a/crates/ui/src/components/dropdown_menu.rs
+++ b/crates/ui/src/components/dropdown_menu.rs
@@ -96,7 +96,7 @@ impl RenderOnce for DropdownMenu {
                     .style(self.style),
             )
             .attach(Corner::BottomLeft)
-            .when_some(self.handle.clone(), |el, handle| el.with_handle(handle))
+            .when_some(self.handle, |el, handle| el.with_handle(handle))
     }
 }
 
@@ -169,7 +169,7 @@ impl Component for DropdownMenu {
                         "States",
                         vec![single_example(
                             "Disabled",
-                            DropdownMenu::new("disabled", "Disabled Dropdown", menu.clone())
+                            DropdownMenu::new("disabled", "Disabled Dropdown", menu)
                                 .disabled(true)
                                 .into_any_element(),
                         )],
diff --git a/crates/ui/src/components/indent_guides.rs b/crates/ui/src/components/indent_guides.rs
index 5e6f4ee8ba..60aa23b44c 100644
--- a/crates/ui/src/components/indent_guides.rs
+++ b/crates/ui/src/components/indent_guides.rs
@@ -195,7 +195,7 @@ mod uniform_list {
     impl UniformListDecoration for IndentGuides {
         fn compute(
             &self,
-            visible_range: Range<usize>,
+            mut visible_range: Range<usize>,
             bounds: Bounds<Pixels>,
             _scroll_offset: Point<Pixels>,
             item_height: Pixels,
@@ -203,7 +203,6 @@ mod uniform_list {
             window: &mut Window,
             cx: &mut App,
         ) -> AnyElement {
-            let mut visible_range = visible_range.clone();
             let includes_trailing_indent = visible_range.end < item_count;
             // Check if we have entries after the visible range,
             // if so extend the visible range so we can fetch a trailing indent,
diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs
index bbce6101f4..1e7bb40c40 100644
--- a/crates/ui/src/components/keybinding.rs
+++ b/crates/ui/src/components/keybinding.rs
@@ -325,7 +325,7 @@ impl RenderOnce for Key {
             .text_size(size)
             .line_height(relative(1.))
             .text_color(self.color.unwrap_or(Color::Muted).color(cx))
-            .child(self.key.clone())
+            .child(self.key)
     }
 }
 
diff --git a/crates/ui/src/components/keybinding_hint.rs b/crates/ui/src/components/keybinding_hint.rs
index a34ca40ed8..d7491b27b1 100644
--- a/crates/ui/src/components/keybinding_hint.rs
+++ b/crates/ui/src/components/keybinding_hint.rs
@@ -269,7 +269,7 @@ impl Component for KeybindingHint {
                             ),
                             single_example(
                                 "Large",
-                                KeybindingHint::new(enter.clone(), bg_color)
+                                KeybindingHint::new(enter, bg_color)
                                     .size(Pixels::from(20.0))
                                     .prefix("Large:")
                                     .suffix("Size")
diff --git a/crates/ui/src/components/notification/alert_modal.rs b/crates/ui/src/components/notification/alert_modal.rs
index acba0c7e9a..9990dc1ce5 100644
--- a/crates/ui/src/components/notification/alert_modal.rs
+++ b/crates/ui/src/components/notification/alert_modal.rs
@@ -64,7 +64,7 @@ impl RenderOnce for AlertModal {
                             )
                             .child(Button::new(
                                 self.primary_action.clone(),
-                                self.primary_action.clone(),
+                                self.primary_action,
                             )),
                     ),
             )
diff --git a/crates/ui/src/components/sticky_items.rs b/crates/ui/src/components/sticky_items.rs
index c3e0886404..bf64622b29 100644
--- a/crates/ui/src/components/sticky_items.rs
+++ b/crates/ui/src/components/sticky_items.rs
@@ -28,7 +28,7 @@ where
     T: StickyCandidate + Clone + 'static,
 {
     let entity_compute = entity.clone();
-    let entity_render = entity.clone();
+    let entity_render = entity;
 
     let compute_fn = Rc::new(
         move |range: Range<usize>, window: &mut Window, cx: &mut App| -> SmallVec<[T; 8]> {
diff --git a/crates/ui/src/utils/format_distance.rs b/crates/ui/src/utils/format_distance.rs
index a8f27f01da..6ec497edee 100644
--- a/crates/ui/src/utils/format_distance.rs
+++ b/crates/ui/src/utils/format_distance.rs
@@ -159,7 +159,6 @@ fn distance_string(
         } else {
             format!("about {} hours", hours)
         }
-        .to_string()
     } else if distance < 172_800 {
         "1 day".to_string()
     } else if distance < 2_592_000 {
@@ -206,21 +205,16 @@ fn distance_string(
             } else {
                 format!("about {} years", years)
             }
-            .to_string()
         } else if remaining_months < 9 {
             if hide_prefix {
                 format!("{} years", years)
             } else {
                 format!("over {} years", years)
             }
-            .to_string()
+        } else if hide_prefix {
+            format!("{} years", years + 1)
         } else {
-            if hide_prefix {
-                format!("{} years", years + 1)
-            } else {
-                format!("almost {} years", years + 1)
-            }
-            .to_string()
+            format!("almost {} years", years + 1)
         }
     };
 
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index 1a5bebaf1e..02f8ef89f3 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -202,11 +202,11 @@ impl Component for SingleLineInput {
                 .children(vec![example_group(vec![
                     single_example(
                         "Small Label (Default)",
-                        div().child(input_small.clone()).into_any_element(),
+                        div().child(input_small).into_any_element(),
                     ),
                     single_example(
                         "Regular Label",
-                        div().child(input_regular.clone()).into_any_element(),
+                        div().child(input_regular).into_any_element(),
                     ),
                 ])])
                 .into_any_element(),
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 7269fc8bec..680c87f9e5 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1648,7 +1648,7 @@ impl OnMatchingLines {
                         });
                         window.dispatch_action(action, cx);
                         cx.defer_in(window, move |editor, window, cx| {
-                            let newest = editor.selections.newest::<Point>(cx).clone();
+                            let newest = editor.selections.newest::<Point>(cx);
                             editor.change_selections(
                                 SelectionEffects::no_scroll(),
                                 window,
diff --git a/crates/vim/src/mode_indicator.rs b/crates/vim/src/mode_indicator.rs
index 714b74f239..da25919342 100644
--- a/crates/vim/src/mode_indicator.rs
+++ b/crates/vim/src/mode_indicator.rs
@@ -74,11 +74,7 @@ impl ModeIndicator {
                     .map(|count| format!("{}", count)),
             )
             .chain(vim.selected_register.map(|reg| format!("\"{reg}")))
-            .chain(
-                vim.operator_stack
-                    .iter()
-                    .map(|item| item.status().to_string()),
-            )
+            .chain(vim.operator_stack.iter().map(|item| item.status()))
             .chain(
                 cx.global::<VimGlobals>()
                     .post_count
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 350ffd666b..a2f165e9fe 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -719,21 +719,14 @@ impl Vim {
                         target: Some(SurroundsType::Motion(motion)),
                     });
                 } else {
-                    self.normal_motion(
-                        motion.clone(),
-                        active_operator.clone(),
-                        count,
-                        forced_motion,
-                        window,
-                        cx,
-                    )
+                    self.normal_motion(motion, active_operator, count, forced_motion, window, cx)
                 }
             }
             Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                self.visual_motion(motion.clone(), count, window, cx)
+                self.visual_motion(motion, count, window, cx)
             }
 
-            Mode::HelixNormal => self.helix_normal_motion(motion.clone(), count, window, cx),
+            Mode::HelixNormal => self.helix_normal_motion(motion, count, window, cx),
         }
         self.clear_operator(window, cx);
         if let Some(operator) = waiting_operator {
@@ -1327,7 +1320,7 @@ impl Motion {
     pub fn range(
         &self,
         map: &DisplaySnapshot,
-        selection: Selection<DisplayPoint>,
+        mut selection: Selection<DisplayPoint>,
         times: Option<usize>,
         text_layout_details: &TextLayoutDetails,
         forced_motion: bool,
@@ -1372,7 +1365,6 @@ impl Motion {
             (None, true) => Some((selection.head(), selection.goal)),
         }?;
 
-        let mut selection = selection.clone();
         selection.set_head(new_head, goal);
 
         let mut kind = match (self.default_kind(), forced_motion) {
@@ -2401,9 +2393,7 @@ fn matching(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint
     let line_range = map.prev_line_boundary(point).0..line_end;
     let visible_line_range =
         line_range.start..Point::new(line_range.end.row, line_range.end.column.saturating_sub(1));
-    let ranges = map
-        .buffer_snapshot
-        .bracket_ranges(visible_line_range.clone());
+    let ranges = map.buffer_snapshot.bracket_ranges(visible_line_range);
     if let Some(ranges) = ranges {
         let line_range = line_range.start.to_offset(&map.buffer_snapshot)
             ..line_range.end.to_offset(&map.buffer_snapshot);
diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs
index 0fd17f310e..933b119d37 100644
--- a/crates/vim/src/normal/paste.rs
+++ b/crates/vim/src/normal/paste.rs
@@ -474,8 +474,7 @@ mod test {
             Mode::Normal,
         );
         assert_eq!(
-            cx.read_from_clipboard()
-                .map(|item| item.text().unwrap().to_string()),
+            cx.read_from_clipboard().map(|item| item.text().unwrap()),
             Some("jumps".into())
         );
         cx.simulate_keystrokes("d d p");
@@ -487,8 +486,7 @@ mod test {
             Mode::Normal,
         );
         assert_eq!(
-            cx.read_from_clipboard()
-                .map(|item| item.text().unwrap().to_string()),
+            cx.read_from_clipboard().map(|item| item.text().unwrap()),
             Some("jumps".into())
         );
         cx.write_to_clipboard(ClipboardItem::new_string("test-copy".to_string()));
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
index c65da4f90b..693de9f697 100644
--- a/crates/vim/src/object.rs
+++ b/crates/vim/src/object.rs
@@ -187,9 +187,7 @@ fn find_mini_delimiters(
     };
 
     // Try to find delimiters in visible range first
-    let ranges = map
-        .buffer_snapshot
-        .bracket_ranges(visible_line_range.clone());
+    let ranges = map.buffer_snapshot.bracket_ranges(visible_line_range);
     if let Some(candidate) = cover_or_next(ranges, display_point, map, Some(&bracket_filter)) {
         return Some(
             DelimiterRange {
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 23efd39139..c0176cb12c 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -400,7 +400,7 @@ impl MarksState {
             } else {
                 HashMap::default()
             };
-        let old_points = self.serialized_marks.get(&path.clone());
+        let old_points = self.serialized_marks.get(&path);
         if old_points == Some(&new_points) {
             return;
         }
@@ -543,7 +543,7 @@ impl MarksState {
                 .insert(name.clone(), anchors);
             if self.is_global_mark(&name) {
                 self.global_marks
-                    .insert(name.clone(), MarkLocation::Buffer(multibuffer.entity_id()));
+                    .insert(name, MarkLocation::Buffer(multibuffer.entity_id()));
             }
             if let Some(buffer) = buffer {
                 let buffer_id = buffer.read(cx).remote_id();
@@ -559,7 +559,7 @@ impl MarksState {
 
         let buffer_id = buffer.read(cx).remote_id();
         self.buffer_marks.entry(buffer_id).or_default().insert(
-            name.clone(),
+            name,
             anchors
                 .into_iter()
                 .map(|anchor| anchor.text_anchor)
@@ -654,9 +654,9 @@ impl MarksState {
                 return;
             }
         };
-        self.global_marks.remove(&mark_name.clone());
+        self.global_marks.remove(&mark_name);
         self.serialized_marks
-            .get_mut(&path.clone())
+            .get_mut(&path)
             .map(|m| m.remove(&mark_name.clone()));
         if let Some(workspace_id) = self.workspace_id(cx) {
             cx.background_spawn(async move { DB.delete_mark(workspace_id, path, mark_name).await })
@@ -1282,7 +1282,7 @@ impl RegistersView {
                 if let Some(register) = register {
                     matches.push(RegisterMatch {
                         name: '%',
-                        contents: register.text.clone(),
+                        contents: register.text,
                     })
                 }
             }
@@ -1374,7 +1374,7 @@ impl PickerDelegate for MarksViewDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> gpui::Task<()> {
-        let Some(workspace) = self.workspace.upgrade().clone() else {
+        let Some(workspace) = self.workspace.upgrade() else {
             return Task::ready(());
         };
         cx.spawn(async move |picker, cx| {
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
index 505cdaa910..6c9df164e0 100644
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ b/crates/vim/src/test/neovim_backed_test_context.rs
@@ -292,12 +292,7 @@ impl NeovimBackedTestContext {
             register: '"',
             state: self.shared_state().await,
             neovim: self.neovim.read_register('"').await,
-            editor: self
-                .read_from_clipboard()
-                .unwrap()
-                .text()
-                .unwrap()
-                .to_owned(),
+            editor: self.read_from_clipboard().unwrap().text().unwrap(),
         }
     }
 
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
index f87ccc283f..13b3e8b58d 100644
--- a/crates/vim/src/test/neovim_connection.rs
+++ b/crates/vim/src/test/neovim_connection.rs
@@ -453,7 +453,7 @@ impl NeovimConnection {
         };
 
         if self.data.back() != Some(&state) {
-            self.data.push_back(state.clone());
+            self.data.push_back(state);
         }
 
         (mode, ranges)
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index 5b6cb55e8c..e7ac692df1 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -225,7 +225,7 @@ impl VimTestContext {
         VimClipboard {
             editor: self
                 .read_from_clipboard()
-                .map(|item| item.text().unwrap().to_string())
+                .map(|item| item.text().unwrap())
                 .unwrap_or_default(),
         }
     }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 11d6d89bac..9da01e6f44 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -1693,7 +1693,7 @@ impl Vim {
                         }) {
                             editor.do_paste(
                                 &register.text.to_string(),
-                                register.clipboard_selections.clone(),
+                                register.clipboard_selections,
                                 false,
                                 window,
                                 cx,
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index ffbae3ff76..fcce00f0c0 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -1203,7 +1203,7 @@ mod test {
                     the lazy dog"});
         assert_eq!(
             cx.read_from_clipboard()
-                .map(|item| item.text().unwrap().to_string())
+                .map(|item| item.text().unwrap())
                 .unwrap(),
             "The q"
         );
diff --git a/crates/watch/src/watch.rs b/crates/watch/src/watch.rs
index c0741e4a20..f0ed5b4a18 100644
--- a/crates/watch/src/watch.rs
+++ b/crates/watch/src/watch.rs
@@ -218,7 +218,7 @@ mod tests {
         let mut tasks = Vec::new();
 
         tasks.push(cx.background_spawn({
-            let executor = cx.executor().clone();
+            let executor = cx.executor();
             let next_id = next_id.clone();
             let closed = closed.clone();
             async move {
diff --git a/crates/web_search/src/web_search.rs b/crates/web_search/src/web_search.rs
index 8578cfe4aa..c381b91f39 100644
--- a/crates/web_search/src/web_search.rs
+++ b/crates/web_search/src/web_search.rs
@@ -57,7 +57,7 @@ impl WebSearchRegistry {
     ) {
         let id = provider.id();
         let provider = Arc::new(provider);
-        self.providers.insert(id.clone(), provider.clone());
+        self.providers.insert(id, provider.clone());
         if self.active_provider.is_none() {
             self.active_provider = Some(provider);
         }
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 1d9170684e..7a8de6e910 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -171,7 +171,7 @@ where
     }
 
     fn panel_focus_handle(&self, cx: &App) -> FocusHandle {
-        self.read(cx).focus_handle(cx).clone()
+        self.read(cx).focus_handle(cx)
     }
 
     fn activation_priority(&self, cx: &App) -> u32 {
@@ -340,7 +340,7 @@ impl Dock {
     pub fn panel<T: Panel>(&self) -> Option<Entity<T>> {
         self.panel_entries
             .iter()
-            .find_map(|entry| entry.panel.to_any().clone().downcast().ok())
+            .find_map(|entry| entry.panel.to_any().downcast().ok())
     }
 
     pub fn panel_index_for_type<T: Panel>(&self) -> Option<usize> {
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 8af39be3e7..039aec5199 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -1012,7 +1012,6 @@ where
                 let message: SharedString = format!("Error: {err}").into();
                 log::error!("Showing error notification in app: {message}");
                 show_app_notification(workspace_error_notification_id(), cx, {
-                    let message = message.clone();
                     move |cx| {
                         cx.new({
                             let message = message.clone();
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index d42b59f08e..e49eb0a345 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -480,7 +480,7 @@ impl Pane {
                 forward_stack: Default::default(),
                 closed_stack: Default::default(),
                 paths_by_item: Default::default(),
-                pane: handle.clone(),
+                pane: handle,
                 next_timestamp,
             }))),
             toolbar: cx.new(|_| Toolbar::new()),
@@ -2516,7 +2516,7 @@ impl Pane {
                 this.handle_external_paths_drop(paths, window, cx)
             }))
             .when_some(item.tab_tooltip_content(cx), |tab, content| match content {
-                TabTooltipContent::Text(text) => tab.tooltip(Tooltip::text(text.clone())),
+                TabTooltipContent::Text(text) => tab.tooltip(Tooltip::text(text)),
                 TabTooltipContent::Custom(element_fn) => {
                     tab.tooltip(move |window, cx| element_fn(window, cx))
                 }
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index bd2aafb7f4..9c2d09fd26 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -1175,7 +1175,7 @@ mod element {
             bounding_boxes.clear();
 
             let mut layout = PaneAxisLayout {
-                dragged_handle: dragged_handle.clone(),
+                dragged_handle,
                 children: Vec::new(),
             };
             for (ix, mut child) in mem::take(&mut self.children).into_iter().enumerate() {
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index 4a6b9ccdf4..da8a3070fc 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -620,7 +620,7 @@ mod tests {
         ]);
         let order = vec![2, 0, 1];
         let serialized =
-            SerializedWorkspaceLocation::Local(LocalPaths(paths.clone()), LocalPathsOrder(order));
+            SerializedWorkspaceLocation::Local(LocalPaths(paths), LocalPathsOrder(order));
         assert_eq!(
             serialized.sorted_paths(),
             Arc::new(vec![
diff --git a/crates/workspace/src/searchable.rs b/crates/workspace/src/searchable.rs
index e89e949f16..b21ba7a4b1 100644
--- a/crates/workspace/src/searchable.rs
+++ b/crates/workspace/src/searchable.rs
@@ -371,13 +371,13 @@ impl<T: SearchableItem> SearchableItemHandle for Entity<T> {
 
 impl From<Box<dyn SearchableItemHandle>> for AnyView {
     fn from(this: Box<dyn SearchableItemHandle>) -> Self {
-        this.to_any().clone()
+        this.to_any()
     }
 }
 
 impl From<&Box<dyn SearchableItemHandle>> for AnyView {
     fn from(this: &Box<dyn SearchableItemHandle>) -> Self {
-        this.to_any().clone()
+        this.to_any()
     }
 }
 
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index edeb382de7..187e720d9c 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -108,7 +108,7 @@ impl StatusBar {
         self.left_items
             .iter()
             .chain(self.right_items.iter())
-            .find_map(|item| item.to_any().clone().downcast().log_err())
+            .find_map(|item| item.to_any().downcast().log_err())
     }
 
     pub fn position_of_item<T>(&self) -> Option<usize>
@@ -217,6 +217,6 @@ impl<T: StatusItemView> StatusItemViewHandle for Entity<T> {
 
 impl From<&dyn StatusItemViewHandle> for AnyView {
     fn from(val: &dyn StatusItemViewHandle) -> Self {
-        val.to_any().clone()
+        val.to_any()
     }
 }
diff --git a/crates/workspace/src/theme_preview.rs b/crates/workspace/src/theme_preview.rs
index 03164e0a64..09a5415ca0 100644
--- a/crates/workspace/src/theme_preview.rs
+++ b/crates/workspace/src/theme_preview.rs
@@ -303,7 +303,6 @@ impl ThemePreview {
                     .gap_1()
                     .children(all_colors.into_iter().map(|(color, name)| {
                         let id = ElementId::Name(format!("{:?}-preview", color).into());
-                        let name = name.clone();
                         div().size_8().flex_none().child(
                             ButtonLike::new(id)
                                 .child(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index d64a4472a0..64cf77a4fd 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -903,7 +903,7 @@ impl AppState {
         let languages = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
         let clock = Arc::new(clock::FakeSystemClock::new());
         let http_client = http_client::FakeHttpClient::with_404_response();
-        let client = Client::new(clock, http_client.clone(), cx);
+        let client = Client::new(clock, http_client, cx);
         let session = cx.new(|cx| AppSession::new(Session::test(), cx));
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
         let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
@@ -1323,7 +1323,6 @@ impl Workspace {
 
         let mut active_call = None;
         if let Some(call) = ActiveCall::try_global(cx) {
-            let call = call.clone();
             let subscriptions = vec![cx.subscribe_in(&call, window, Self::on_active_call_event)];
             active_call = Some((call, subscriptions));
         }
@@ -4116,7 +4115,6 @@ impl Workspace {
             .unwrap_or_else(|| {
                 self.split_pane(self.active_pane.clone(), SplitDirection::Right, window, cx)
             })
-            .clone()
     }
 
     pub fn pane_for(&self, handle: &dyn ItemHandle) -> Option<Entity<Pane>> {
@@ -6713,7 +6711,7 @@ impl WorkspaceStore {
                     .update(cx, |workspace, window, cx| {
                         let handler_response =
                             workspace.handle_follow(follower.project_id, window, cx);
-                        if let Some(active_view) = handler_response.active_view.clone()
+                        if let Some(active_view) = handler_response.active_view
                             && workspace.project.read(cx).remote_id() == follower.project_id
                         {
                             response.active_view = Some(active_view)
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index b12fd13767..cf61ee2669 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -1968,7 +1968,7 @@ impl LocalWorktree {
         cx: &Context<Worktree>,
     ) -> Option<Task<Result<()>>> {
         let path = self.entry_for_id(entry_id).unwrap().path.clone();
-        let mut rx = self.add_path_prefix_to_scan(path.clone());
+        let mut rx = self.add_path_prefix_to_scan(path);
         Some(cx.background_spawn(async move {
             rx.next().await;
             Ok(())
@@ -3952,7 +3952,7 @@ impl BackgroundScanner {
             .iter()
             .map(|path| {
                 if path.file_name().is_some() {
-                    root_canonical_path.as_path().join(path).to_path_buf()
+                    root_canonical_path.as_path().join(path)
                 } else {
                     root_canonical_path.as_path().to_path_buf()
                 }
diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs
index ca9debb647..c46e14f077 100644
--- a/crates/worktree/src/worktree_tests.rs
+++ b/crates/worktree/src/worktree_tests.rs
@@ -1254,7 +1254,7 @@ async fn test_create_directory_during_initial_scan(cx: &mut TestAppContext) {
         let snapshot = Arc::new(Mutex::new(tree.snapshot()));
         tree.observe_updates(0, cx, {
             let snapshot = snapshot.clone();
-            let settings = tree.settings().clone();
+            let settings = tree.settings();
             move |update| {
                 snapshot
                     .lock()
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 851c4e79f1..45c67153eb 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -242,7 +242,7 @@ pub fn main() {
     if args.system_specs {
         let system_specs = feedback::system_specs::SystemSpecs::new_stateless(
             app_version,
-            app_commit_sha.clone(),
+            app_commit_sha,
             *release_channel::RELEASE_CHANNEL,
         );
         println!("Zed System Specs (from CLI):\n{}", system_specs);
@@ -367,7 +367,7 @@ pub fn main() {
         if let Some(app_state) = AppState::try_global(cx).and_then(|app_state| app_state.upgrade())
         {
             cx.spawn({
-                let app_state = app_state.clone();
+                let app_state = app_state;
                 async move |cx| {
                     if let Err(e) = restore_or_create_workspace(app_state, cx).await {
                         fail_to_open_window_async(e, cx)
@@ -523,13 +523,13 @@ pub fn main() {
         let app_session = cx.new(|cx| AppSession::new(session, cx));
 
         let app_state = Arc::new(AppState {
-            languages: languages.clone(),
+            languages,
             client: client.clone(),
-            user_store: user_store.clone(),
+            user_store,
             fs: fs.clone(),
             build_window_options,
             workspace_store,
-            node_runtime: node_runtime.clone(),
+            node_runtime,
             session: app_session,
         });
         AppState::set_global(Arc::downgrade(&app_state), cx);
@@ -751,7 +751,6 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
     if let Some(kind) = request.kind {
         match kind {
             OpenRequestKind::CliConnection(connection) => {
-                let app_state = app_state.clone();
                 cx.spawn(async move |cx| handle_cli_connection(connection, app_state, cx).await)
                     .detach();
             }
@@ -1313,7 +1312,6 @@ fn eager_load_active_theme_and_icon_theme(fs: Arc<dyn Fs>, cx: &App) {
             .path_to_extension_icon_theme(icon_theme_name)
         {
             cx.spawn({
-                let theme_registry = theme_registry.clone();
                 let fs = fs.clone();
                 async move |cx| {
                     theme_registry
@@ -1335,9 +1333,7 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut App) {
     cx.spawn({
         let fs = fs.clone();
         async move |cx| {
-            if let Some(theme_registry) =
-                cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
-            {
+            if let Some(theme_registry) = cx.update(|cx| ThemeRegistry::global(cx)).log_err() {
                 let themes_dir = paths::themes_dir().as_ref();
                 match fs
                     .metadata(themes_dir)
@@ -1376,7 +1372,7 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut App) {
             for event in paths {
                 if fs.metadata(&event.path).await.ok().flatten().is_some()
                     && let Some(theme_registry) =
-                        cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
+                        cx.update(|cx| ThemeRegistry::global(cx)).log_err()
                     && let Some(()) = theme_registry
                         .load_user_theme(&event.path, fs.clone())
                         .await
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 232dfc42a3..0972973b89 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -526,8 +526,6 @@ fn initialize_panels(
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
-    let prompt_builder = prompt_builder.clone();
-
     cx.spawn_in(window, async move |workspace_handle, cx| {
         let project_panel = ProjectPanel::load(workspace_handle.clone(), cx.clone());
         let outline_panel = OutlinePanel::load(workspace_handle.clone(), cx.clone());
@@ -1394,7 +1392,7 @@ fn show_keymap_file_load_error(
     cx: &mut App,
 ) {
     show_markdown_app_notification(
-        notification_id.clone(),
+        notification_id,
         error_message,
         "Open Keymap File".into(),
         |window, cx| {
@@ -4786,7 +4784,7 @@ mod tests {
         cx.background_executor.run_until_parked();
 
         // 5. Critical: Verify .zed is actually excluded from worktree
-        let worktree = cx.update(|cx| project.read(cx).worktrees(cx).next().unwrap().clone());
+        let worktree = cx.update(|cx| project.read(cx).worktrees(cx).next().unwrap());
 
         let has_zed_entry = cx.update(|cx| worktree.read(cx).entry_for_path(".zed").is_some());
 
@@ -4822,7 +4820,7 @@ mod tests {
             .await
             .unwrap();
 
-        let new_content_str = new_content.clone();
+        let new_content_str = new_content;
         eprintln!("New settings content: {}", new_content_str);
 
         // The bug causes the settings to be overwritten with empty settings
diff --git a/crates/zed/src/zed/component_preview.rs b/crates/zed/src/zed/component_preview.rs
index d855fc3af7..5b3a951d43 100644
--- a/crates/zed/src/zed/component_preview.rs
+++ b/crates/zed/src/zed/component_preview.rs
@@ -33,8 +33,6 @@ use workspace::{
 pub fn init(app_state: Arc<AppState>, cx: &mut App) {
     workspace::register_serializable_item::<ComponentPreview>(cx);
 
-    let app_state = app_state.clone();
-
     cx.observe_new(move |workspace: &mut Workspace, _window, cx| {
         let app_state = app_state.clone();
         let project = workspace.project().clone();
@@ -462,12 +460,12 @@ impl ComponentPreview {
                             Vec::new()
                         };
                         if valid_positions.is_empty() {
-                            Label::new(name.clone()).into_any_element()
+                            Label::new(name).into_any_element()
                         } else {
-                            HighlightedLabel::new(name.clone(), valid_positions).into_any_element()
+                            HighlightedLabel::new(name, valid_positions).into_any_element()
                         }
                     } else {
-                        Label::new(name.clone()).into_any_element()
+                        Label::new(name).into_any_element()
                     })
                     .selectable(true)
                     .toggle_state(selected)
@@ -685,7 +683,7 @@ impl ComponentPreview {
                     .h_full()
                     .py_8()
                     .bg(cx.theme().colors().panel_background)
-                    .children(self.active_thread.clone().map(|thread| thread.clone()))
+                    .children(self.active_thread.clone())
                     .when_none(&self.active_thread.clone(), |this| {
                         this.child("No active thread")
                     }),
@@ -716,7 +714,7 @@ impl Render for ComponentPreview {
             if input.is_empty(cx) {
                 String::new()
             } else {
-                input.editor().read(cx).text(cx).to_string()
+                input.editor().read(cx).text(cx)
             }
         });
 
@@ -929,7 +927,7 @@ impl SerializableItem for ComponentPreview {
                 Err(_) => ActivePageId::default(),
             };
 
-        let user_store = project.read(cx).user_store().clone();
+        let user_store = project.read(cx).user_store();
         let language_registry = project.read(cx).languages().clone();
         let preview_page = if deserialized_active_page.0 == ActivePageId::default().0 {
             Some(PreviewPage::default())
@@ -940,7 +938,7 @@ impl SerializableItem for ComponentPreview {
             let found_component = all_components.iter().find(|c| c.id().0 == component_str);
 
             if let Some(component) = found_component {
-                Some(PreviewPage::Component(component.id().clone()))
+                Some(PreviewPage::Component(component.id()))
             } else {
                 Some(PreviewPage::default())
             }
@@ -1057,7 +1055,7 @@ impl ComponentPreviewPage {
                             .rounded_sm()
                             .bg(color.color(cx).alpha(0.12))
                             .child(
-                                Label::new(status.clone().to_string())
+                                Label::new(status.to_string())
                                     .size(LabelSize::Small)
                                     .color(color),
                             ),
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index 1123e53ddd..a9abd9bc74 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -60,23 +60,16 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
     cx.subscribe(&user_store, {
         let editors = editors.clone();
         let client = client.clone();
+
         move |user_store, event, cx| {
             if let client::user::Event::PrivateUserInfoUpdated = event {
-                assign_edit_prediction_providers(
-                    &editors,
-                    provider,
-                    &client,
-                    user_store.clone(),
-                    cx,
-                );
+                assign_edit_prediction_providers(&editors, provider, &client, user_store, cx);
             }
         }
     })
     .detach();
 
     cx.observe_global::<SettingsStore>({
-        let editors = editors.clone();
-        let client = client.clone();
         let user_store = user_store.clone();
         move |cx| {
             let new_provider = all_language_settings(None, cx).edit_predictions.provider;
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index 5baf76b64c..827c7754fa 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -102,11 +102,8 @@ impl OpenRequest {
             self.open_paths.is_empty(),
             "cannot open both local and ssh paths"
         );
-        let mut connection_options = SshSettings::get_global(cx).connection_options_for(
-            host.clone(),
-            port,
-            username.clone(),
-        );
+        let mut connection_options =
+            SshSettings::get_global(cx).connection_options_for(host, port, username);
         if let Some(password) = url.password() {
             connection_options.password = Some(password.to_string());
         }
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index 10d60fcd9d..e57d5d3889 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -161,7 +161,7 @@ impl Render for QuickActionBar {
             IconName::ZedAssistant,
             false,
             Box::new(InlineAssist::default()),
-            focus_handle.clone(),
+            focus_handle,
             "Inline Assist",
             move |_, window, cx| {
                 window.dispatch_action(Box::new(InlineAssist::default()), cx);
@@ -215,7 +215,7 @@ impl Render for QuickActionBar {
                             )
                         })
                         .on_click({
-                            let focus = focus.clone();
+                            let focus = focus;
                             move |_, window, cx| {
                                 focus.dispatch_action(
                                     &ToggleCodeActions {
diff --git a/crates/zed/src/zed/quick_action_bar/repl_menu.rs b/crates/zed/src/zed/quick_action_bar/repl_menu.rs
index ca180dccdd..eaa989f88d 100644
--- a/crates/zed/src/zed/quick_action_bar/repl_menu.rs
+++ b/crates/zed/src/zed/quick_action_bar/repl_menu.rs
@@ -196,7 +196,6 @@ impl QuickActionBar {
                                 .into_any_element()
                         },
                         {
-                            let editor = editor.clone();
                             move |window, cx| {
                                 repl::restart(editor.clone(), window, cx);
                             }
@@ -346,7 +345,7 @@ impl QuickActionBar {
                 ),
             Tooltip::text("Select Kernel"),
         )
-        .with_handle(menu_handle.clone())
+        .with_handle(menu_handle)
         .into_any_element()
     }
 
@@ -362,7 +361,7 @@ impl QuickActionBar {
                         .shape(ui::IconButtonShape::Square)
                         .icon_size(ui::IconSize::Small)
                         .icon_color(Color::Muted)
-                        .tooltip(Tooltip::text(tooltip.clone()))
+                        .tooltip(Tooltip::text(tooltip))
                         .on_click(|_, _window, cx| {
                             cx.open_url(&format!("{}#installation", ZED_REPL_DOCUMENTATION))
                         }),
diff --git a/crates/zeta/src/input_excerpt.rs b/crates/zeta/src/input_excerpt.rs
index 8ca6d39407..f4add6593e 100644
--- a/crates/zeta/src/input_excerpt.rs
+++ b/crates/zeta/src/input_excerpt.rs
@@ -90,7 +90,7 @@ fn expand_range(
     range: Range<Point>,
     mut remaining_tokens: usize,
 ) -> Range<Point> {
-    let mut expanded_range = range.clone();
+    let mut expanded_range = range;
     expanded_range.start.column = 0;
     expanded_range.end.column = snapshot.line_len(expanded_range.end.row);
     loop {
diff --git a/crates/zeta_cli/src/headless.rs b/crates/zeta_cli/src/headless.rs
index d6ee085d18..cfa7d606ba 100644
--- a/crates/zeta_cli/src/headless.rs
+++ b/crates/zeta_cli/src/headless.rs
@@ -107,11 +107,7 @@ pub fn init(cx: &mut App) -> ZetaCliAppState {
 
     language::init(cx);
     debug_adapter_extension::init(extension_host_proxy.clone(), cx);
-    language_extension::init(
-        LspAccess::Noop,
-        extension_host_proxy.clone(),
-        languages.clone(),
-    );
+    language_extension::init(LspAccess::Noop, extension_host_proxy, languages.clone());
     language_model::init(client.clone(), cx);
     language_models::init(user_store.clone(), client.clone(), cx);
     languages::init(languages.clone(), node_runtime.clone(), cx);
diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
index 36a77e37bd..ee3c241079 100644
--- a/crates/zlog/src/filter.rs
+++ b/crates/zlog/src/filter.rs
@@ -293,7 +293,7 @@ impl ScopeMap {
                         sub_items_start + 1,
                         sub_items_end,
                         "Expected one item: got: {:?}",
-                        &items[items_range.clone()]
+                        &items[items_range]
                     );
                     enabled = Some(items[sub_items_start].1);
                 } else {
diff --git a/extensions/glsl/src/glsl.rs b/extensions/glsl/src/glsl.rs
index 695fd7a053..77865564cc 100644
--- a/extensions/glsl/src/glsl.rs
+++ b/extensions/glsl/src/glsl.rs
@@ -119,7 +119,7 @@ impl zed::Extension for GlslExtension {
     ) -> Result<Option<serde_json::Value>> {
         let settings = LspSettings::for_worktree("glsl_analyzer", worktree)
             .ok()
-            .and_then(|lsp_settings| lsp_settings.settings.clone())
+            .and_then(|lsp_settings| lsp_settings.settings)
             .unwrap_or_default();
 
         Ok(Some(serde_json::json!({
diff --git a/extensions/html/src/html.rs b/extensions/html/src/html.rs
index 07d4642ff4..371824c830 100644
--- a/extensions/html/src/html.rs
+++ b/extensions/html/src/html.rs
@@ -94,7 +94,7 @@ impl zed::Extension for HtmlExtension {
     ) -> Result<Option<zed::serde_json::Value>> {
         let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
             .ok()
-            .and_then(|lsp_settings| lsp_settings.settings.clone())
+            .and_then(|lsp_settings| lsp_settings.settings)
             .unwrap_or_default();
         Ok(Some(settings))
     }
diff --git a/extensions/ruff/src/ruff.rs b/extensions/ruff/src/ruff.rs
index b918c52686..cc3c3f6550 100644
--- a/extensions/ruff/src/ruff.rs
+++ b/extensions/ruff/src/ruff.rs
@@ -151,7 +151,7 @@ impl zed::Extension for RuffExtension {
     ) -> Result<Option<zed_extension_api::serde_json::Value>> {
         let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
             .ok()
-            .and_then(|lsp_settings| lsp_settings.initialization_options.clone())
+            .and_then(|lsp_settings| lsp_settings.initialization_options)
             .unwrap_or_default();
         Ok(Some(settings))
     }
@@ -163,7 +163,7 @@ impl zed::Extension for RuffExtension {
     ) -> Result<Option<zed_extension_api::serde_json::Value>> {
         let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
             .ok()
-            .and_then(|lsp_settings| lsp_settings.settings.clone())
+            .and_then(|lsp_settings| lsp_settings.settings)
             .unwrap_or_default();
         Ok(Some(settings))
     }
diff --git a/extensions/snippets/src/snippets.rs b/extensions/snippets/src/snippets.rs
index b2d68b6e1a..05e1ebca38 100644
--- a/extensions/snippets/src/snippets.rs
+++ b/extensions/snippets/src/snippets.rs
@@ -113,7 +113,7 @@ impl zed::Extension for SnippetExtension {
     ) -> Result<Option<zed_extension_api::serde_json::Value>> {
         let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
             .ok()
-            .and_then(|lsp_settings| lsp_settings.settings.clone())
+            .and_then(|lsp_settings| lsp_settings.settings)
             .unwrap_or_else(|| {
                 json!({
                     "max_completion_items": 20,

From f80a0ba056a0e674ef4f5ff1fe0be096bc9787b1 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Wed, 20 Aug 2025 14:26:45 +0300
Subject: [PATCH 206/823] Move clippy lints which aren't apart of the style
 category (#36579)

Move lints which aren't apart of the style category.

Motivation: They might get accidentally get reverted when we turn the
style category on again and remove the manual lint enforcements.

Release Notes:

- N/A
---
 Cargo.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c3c7091279..c259a96912 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -806,6 +806,9 @@ todo = "deny"
 # warning on this rule produces a lot of noise.
 single_range_in_vec_init = "allow"
 
+redundant_clone = "warn"
+declare_interior_mutable_const = "deny"
+
 # These are all of the rules that currently have violations in the Zed
 # codebase.
 #
@@ -840,12 +843,10 @@ match_like_matches_macro = "warn"
 module_inception = { level = "deny" }
 question_mark = { level = "deny" }
 single_match = "warn"
-redundant_clone = "warn"
 redundant_closure = { level = "deny" }
 redundant_static_lifetimes = { level = "warn" }
 redundant_pattern_matching = "warn"
 redundant_field_names = "warn"
-declare_interior_mutable_const = { level = "deny" }
 collapsible_if = { level = "warn"}
 collapsible_else_if = { level = "warn" }
 needless_borrow = { level = "warn"}

From 4ee565cd392b0563206eb2d2e61be214fa57ba03 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 20 Aug 2025 14:03:20 +0200
Subject: [PATCH 207/823] Fix mentions roundtrip from/to database and other
 history bugs (#36575)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs  | 170 +++++++++++++++++++++++++++++++++++-
 crates/agent2/src/thread.rs |  58 ++++++------
 2 files changed, 200 insertions(+), 28 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 5496ecea7b..1fa307511f 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -577,6 +577,10 @@ impl NativeAgent {
     }
 
     fn save_thread(&mut self, thread: Entity<Thread>, cx: &mut Context<Self>) {
+        if thread.read(cx).is_empty() {
+            return;
+        }
+
         let database_future = ThreadsDatabase::connect(cx);
         let (id, db_thread) =
             thread.update(cx, |thread, cx| (thread.id().clone(), thread.to_db(cx)));
@@ -989,12 +993,19 @@ impl acp_thread::AgentSessionResume for NativeAgentSessionResume {
 
 #[cfg(test)]
 mod tests {
+    use crate::HistoryEntryId;
+
     use super::*;
-    use acp_thread::{AgentConnection, AgentModelGroupName, AgentModelId, AgentModelInfo};
+    use acp_thread::{
+        AgentConnection, AgentModelGroupName, AgentModelId, AgentModelInfo, MentionUri,
+    };
     use fs::FakeFs;
     use gpui::TestAppContext;
+    use indoc::indoc;
+    use language_model::fake_provider::FakeLanguageModel;
     use serde_json::json;
     use settings::SettingsStore;
+    use util::path;
 
     #[gpui::test]
     async fn test_maintaining_project_context(cx: &mut TestAppContext) {
@@ -1179,6 +1190,163 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    #[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
+    async fn test_save_load_thread(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/",
+            json!({
+                "a": {
+                    "b.md": "Lorem"
+                }
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/a").as_ref()], cx).await;
+        let context_store = cx.new(|cx| assistant_context::ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
+        let agent = NativeAgent::new(
+            project.clone(),
+            history_store.clone(),
+            Templates::new(),
+            None,
+            fs.clone(),
+            &mut cx.to_async(),
+        )
+        .await
+        .unwrap();
+        let connection = Rc::new(NativeAgentConnection(agent.clone()));
+
+        let acp_thread = cx
+            .update(|cx| {
+                connection
+                    .clone()
+                    .new_thread(project.clone(), Path::new(""), cx)
+            })
+            .await
+            .unwrap();
+        let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
+        let thread = agent.read_with(cx, |agent, _| {
+            agent.sessions.get(&session_id).unwrap().thread.clone()
+        });
+
+        // Ensure empty threads are not saved, even if they get mutated.
+        let model = Arc::new(FakeLanguageModel::default());
+        let summary_model = Arc::new(FakeLanguageModel::default());
+        thread.update(cx, |thread, cx| {
+            thread.set_model(model, cx);
+            thread.set_summarization_model(Some(summary_model), cx);
+        });
+        cx.run_until_parked();
+        assert_eq!(history_entries(&history_store, cx), vec![]);
+
+        let model = thread.read_with(cx, |thread, _| thread.model().unwrap().clone());
+        let model = model.as_fake();
+        let summary_model = thread.read_with(cx, |thread, _| {
+            thread.summarization_model().unwrap().clone()
+        });
+        let summary_model = summary_model.as_fake();
+        let send = acp_thread.update(cx, |thread, cx| {
+            thread.send(
+                vec![
+                    "What does ".into(),
+                    acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        name: "b.md".into(),
+                        uri: MentionUri::File {
+                            abs_path: path!("/a/b.md").into(),
+                        }
+                        .to_uri()
+                        .to_string(),
+                        annotations: None,
+                        description: None,
+                        mime_type: None,
+                        size: None,
+                        title: None,
+                    }),
+                    " mean?".into(),
+                ],
+                cx,
+            )
+        });
+        let send = cx.foreground_executor().spawn(send);
+        cx.run_until_parked();
+
+        model.send_last_completion_stream_text_chunk("Lorem.");
+        model.end_last_completion_stream();
+        cx.run_until_parked();
+        summary_model.send_last_completion_stream_text_chunk("Explaining /a/b.md");
+        summary_model.end_last_completion_stream();
+
+        send.await.unwrap();
+        acp_thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc! {"
+                    ## User
+
+                    What does [@b.md](file:///a/b.md) mean?
+
+                    ## Assistant
+
+                    Lorem.
+
+                "}
+            )
+        });
+
+        // Drop the ACP thread, which should cause the session to be dropped as well.
+        cx.update(|_| {
+            drop(thread);
+            drop(acp_thread);
+        });
+        agent.read_with(cx, |agent, _| {
+            assert_eq!(agent.sessions.keys().cloned().collect::<Vec<_>>(), []);
+        });
+
+        // Ensure the thread can be reloaded from disk.
+        assert_eq!(
+            history_entries(&history_store, cx),
+            vec![(
+                HistoryEntryId::AcpThread(session_id.clone()),
+                "Explaining /a/b.md".into()
+            )]
+        );
+        let acp_thread = agent
+            .update(cx, |agent, cx| agent.open_thread(session_id.clone(), cx))
+            .await
+            .unwrap();
+        acp_thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc! {"
+                    ## User
+
+                    What does [@b.md](file:///a/b.md) mean?
+
+                    ## Assistant
+
+                    Lorem.
+
+                "}
+            )
+        });
+    }
+
+    fn history_entries(
+        history: &Entity<HistoryStore>,
+        cx: &mut TestAppContext,
+    ) -> Vec<(HistoryEntryId, String)> {
+        history.read_with(cx, |history, cx| {
+            history
+                .entries(cx)
+                .iter()
+                .map(|e| (e.id(), e.title().to_string()))
+                .collect::<Vec<_>>()
+        })
+    }
+
     fn init_test(cx: &mut TestAppContext) {
         env_logger::try_init().ok();
         cx.update(|cx| {
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index cd97fa2060..c7b1a08b92 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -720,7 +720,7 @@ impl Thread {
     pub fn to_db(&self, cx: &App) -> Task<DbThread> {
         let initial_project_snapshot = self.initial_project_snapshot.clone();
         let mut thread = DbThread {
-            title: self.title.clone().unwrap_or_default(),
+            title: self.title(),
             messages: self.messages.clone(),
             updated_at: self.updated_at,
             detailed_summary: self.summary.clone(),
@@ -870,6 +870,10 @@ impl Thread {
         &self.action_log
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.messages.is_empty() && self.title.is_none()
+    }
+
     pub fn model(&self) -> Option<&Arc<dyn LanguageModel>> {
         self.model.as_ref()
     }
@@ -884,6 +888,10 @@ impl Thread {
         cx.notify()
     }
 
+    pub fn summarization_model(&self) -> Option<&Arc<dyn LanguageModel>> {
+        self.summarization_model.as_ref()
+    }
+
     pub fn set_summarization_model(
         &mut self,
         model: Option<Arc<dyn LanguageModel>>,
@@ -1068,6 +1076,7 @@ impl Thread {
             event_stream: event_stream.clone(),
             _task: cx.spawn(async move |this, cx| {
                 log::info!("Starting agent turn execution");
+                let mut update_title = None;
                 let turn_result: Result<StopReason> = async {
                     let mut completion_intent = CompletionIntent::UserPrompt;
                     loop {
@@ -1122,10 +1131,15 @@ impl Thread {
                                 this.pending_message()
                                     .tool_results
                                     .insert(tool_result.tool_use_id.clone(), tool_result);
-                            })
-                            .ok();
+                            })?;
                         }
 
+                        this.update(cx, |this, cx| {
+                            if this.title.is_none() && update_title.is_none() {
+                                update_title = Some(this.update_title(&event_stream, cx));
+                            }
+                        })?;
+
                         if tool_use_limit_reached {
                             log::info!("Tool use limit reached, completing turn");
                             this.update(cx, |this, _cx| this.tool_use_limit_reached = true)?;
@@ -1146,10 +1160,6 @@ impl Thread {
                     Ok(reason) => {
                         log::info!("Turn execution completed: {:?}", reason);
 
-                        let update_title = this
-                            .update(cx, |this, cx| this.update_title(&event_stream, cx))
-                            .ok()
-                            .flatten();
                         if let Some(update_title) = update_title {
                             update_title.await.context("update title failed").log_err();
                         }
@@ -1593,17 +1603,14 @@ impl Thread {
         &mut self,
         event_stream: &ThreadEventStream,
         cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        if self.title.is_some() {
-            log::debug!("Skipping title generation because we already have one.");
-            return None;
-        }
-
+    ) -> Task<Result<()>> {
         log::info!(
             "Generating title with model: {:?}",
             self.summarization_model.as_ref().map(|model| model.name())
         );
-        let model = self.summarization_model.clone()?;
+        let Some(model) = self.summarization_model.clone() else {
+            return Task::ready(Ok(()));
+        };
         let event_stream = event_stream.clone();
         let mut request = LanguageModelRequest {
             intent: Some(CompletionIntent::ThreadSummarization),
@@ -1620,7 +1627,7 @@ impl Thread {
             content: vec![SUMMARIZE_THREAD_PROMPT.into()],
             cache: false,
         });
-        Some(cx.spawn(async move |this, cx| {
+        cx.spawn(async move |this, cx| {
             let mut title = String::new();
             let mut messages = model.stream_completion(request, cx).await?;
             while let Some(event) = messages.next().await {
@@ -1655,7 +1662,7 @@ impl Thread {
                 this.title = Some(title);
                 cx.notify();
             })
-        }))
+        })
     }
 
     fn last_user_message(&self) -> Option<&UserMessage> {
@@ -2457,18 +2464,15 @@ impl From<UserMessageContent> for acp::ContentBlock {
                 uri: None,
             }),
             UserMessageContent::Mention { uri, content } => {
-                acp::ContentBlock::ResourceLink(acp::ResourceLink {
-                    uri: uri.to_uri().to_string(),
-                    name: uri.name(),
+                acp::ContentBlock::Resource(acp::EmbeddedResource {
+                    resource: acp::EmbeddedResourceResource::TextResourceContents(
+                        acp::TextResourceContents {
+                            mime_type: None,
+                            text: content,
+                            uri: uri.to_uri().to_string(),
+                        },
+                    ),
                     annotations: None,
-                    description: if content.is_empty() {
-                        None
-                    } else {
-                        Some(content)
-                    },
-                    mime_type: None,
-                    size: None,
-                    title: None,
                 })
             }
         }

From 6ed29fbc34b0ade21decea68c93ecd88420810a0 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Wed, 20 Aug 2025 15:07:37 +0300
Subject: [PATCH 208/823] Enforce style lints which do not have violations
 (#36580)

Release Notes:

- N/A
---
 Cargo.toml                                    | 96 ++++++++++++++++---
 crates/action_log/src/action_log.rs           |  2 +-
 .../src/activity_indicator.rs                 |  2 +-
 crates/agent_ui/src/inline_prompt_editor.rs   |  8 +-
 crates/client/src/client.rs                   | 16 +---
 crates/copilot/src/copilot.rs                 | 12 +--
 crates/edit_prediction/src/edit_prediction.rs |  2 +-
 crates/editor/src/editor.rs                   | 62 ++++++------
 crates/editor/src/element.rs                  |  2 +-
 crates/editor/src/scroll.rs                   |  2 +-
 crates/editor/src/scroll/actions.rs           |  2 +-
 crates/git_ui/src/git_panel.rs                |  4 +-
 crates/go_to_line/src/cursor_position.rs      |  2 +-
 crates/go_to_line/src/go_to_line.rs           |  2 +-
 crates/onboarding/src/theme_preview.rs        |  7 +-
 crates/project/src/lsp_store.rs               |  4 +-
 crates/project/src/project.rs                 |  2 +-
 crates/remote/src/ssh_session.rs              |  2 +-
 crates/title_bar/src/title_bar.rs             |  4 +-
 crates/workspace/src/workspace.rs             |  2 +-
 20 files changed, 146 insertions(+), 89 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c259a96912..d69e87fd6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -825,36 +825,106 @@ declare_interior_mutable_const = "deny"
 style = { level = "allow", priority = -1 }
 
 # Temporary list of style lints that we've fixed so far.
+# Progress is being tracked in #36577
+blocks_in_conditions = "warn"
 bool_assert_comparison = "warn"
+borrow_interior_mutable_const = "warn"
+box_default = "warn"
+builtin_type_shadow = "warn"
+bytes_nth = "warn"
+chars_next_cmp = "warn"
+cmp_null = "warn"
+collapsible_else_if = "warn"
+collapsible_if = "warn"
 comparison_to_empty = "warn"
+default_instead_of_iter_empty = "warn"
+disallowed_macros = "warn"
+disallowed_methods = "warn"
+disallowed_names = "warn"
+disallowed_types = "warn"
 doc_lazy_continuation = "warn"
 doc_overindented_list_items = "warn"
-inherent_to_string = "warn"
+duplicate_underscore_argument = "warn"
+err_expect = "warn"
+fn_to_numeric_cast = "warn"
+fn_to_numeric_cast_with_truncation = "warn"
 for_kv_map = "warn"
+implicit_saturating_add = "warn"
+implicit_saturating_sub = "warn"
+inconsistent_digit_grouping = "warn"
+infallible_destructuring_match = "warn"
+inherent_to_string = "warn"
+init_numbered_fields = "warn"
 into_iter_on_ref = "warn"
 io_other_error = "warn"
+items_after_test_module = "warn"
 iter_cloned_collect = "warn"
 iter_next_slice = "warn"
 iter_nth = "warn"
 iter_nth_zero = "warn"
 iter_skip_next = "warn"
+just_underscores_and_digits = "warn"
 let_and_return = "warn"
+main_recursion = "warn"
+manual_bits = "warn"
+manual_dangling_ptr = "warn"
+manual_is_ascii_check = "warn"
+manual_is_finite = "warn"
+manual_is_infinite = "warn"
+manual_next_back = "warn"
+manual_non_exhaustive = "warn"
+manual_ok_or = "warn"
+manual_pattern_char_comparison = "warn"
+manual_rotate = "warn"
+manual_slice_fill = "warn"
+manual_while_let_some = "warn"
+map_collect_result_unit = "warn"
 match_like_matches_macro = "warn"
-module_inception = { level = "deny" }
-question_mark = { level = "deny" }
-single_match = "warn"
-redundant_closure = { level = "deny" }
-redundant_static_lifetimes = { level = "warn" }
-redundant_pattern_matching = "warn"
+match_overlapping_arm = "warn"
+mem_replace_option_with_none = "warn"
+mem_replace_option_with_some = "warn"
+missing_enforced_import_renames = "warn"
+missing_safety_doc = "warn"
+mixed_attributes_style = "warn"
+mixed_case_hex_literals = "warn"
+module_inception = "warn"
+must_use_unit = "warn"
+mut_mutex_lock = "warn"
+needless_borrow = "warn"
+needless_doctest_main = "warn"
+needless_else = "warn"
+needless_parens_on_range_literals = "warn"
+needless_pub_self = "warn"
+needless_return = "warn"
+needless_return_with_question_mark = "warn"
+ok_expect = "warn"
+owned_cow = "warn"
+print_literal = "warn"
+print_with_newline = "warn"
+ptr_eq = "warn"
+question_mark = "warn"
+redundant_closure = "warn"
 redundant_field_names = "warn"
-collapsible_if = { level = "warn"}
-collapsible_else_if = { level = "warn" }
-needless_borrow = { level = "warn"}
-needless_return = { level = "warn" }
-unnecessary_mut_passed = {level = "warn"}
-unnecessary_map_or = { level = "warn" }
+redundant_pattern_matching = "warn"
+redundant_static_lifetimes = "warn"
+result_map_or_into_option = "warn"
+self_named_constructors = "warn"
+single_match = "warn"
+tabs_in_doc_comments = "warn"
+to_digit_is_some = "warn"
+toplevel_ref_arg = "warn"
+unnecessary_fold = "warn"
+unnecessary_map_or = "warn"
+unnecessary_mut_passed = "warn"
+unnecessary_owned_empty_strings = "warn"
+unneeded_struct_pattern = "warn"
+unsafe_removed_from_name = "warn"
 unused_unit = "warn"
+unusual_byte_groupings = "warn"
+write_literal = "warn"
+writeln_empty_string = "warn"
 wrong_self_convention = "warn"
+zero_ptr = "warn"
 
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index a1f332fc7c..9ec10f4dbb 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -190,7 +190,7 @@ impl ActionLog {
         cx: &mut Context<Self>,
     ) {
         match event {
-            BufferEvent::Edited { .. } => self.handle_buffer_edited(buffer, cx),
+            BufferEvent::Edited => self.handle_buffer_edited(buffer, cx),
             BufferEvent::FileHandleChanged => {
                 self.handle_buffer_file_changed(buffer, cx);
             }
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 324480f5b4..6641db0805 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -104,7 +104,7 @@ impl ActivityIndicator {
                 &workspace_handle,
                 window,
                 |activity_indicator, _, event, window, cx| {
-                    if let workspace::Event::ClearActivityIndicator { .. } = event
+                    if let workspace::Event::ClearActivityIndicator = event
                         && activity_indicator.statuses.pop().is_some()
                     {
                         activity_indicator.dismiss_error_message(&DismissErrorMessage, window, cx);
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index 5608143464..a626122769 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -1229,27 +1229,27 @@ pub enum GenerationMode {
 impl GenerationMode {
     fn start_label(self) -> &'static str {
         match self {
-            GenerationMode::Generate { .. } => "Generate",
+            GenerationMode::Generate => "Generate",
             GenerationMode::Transform => "Transform",
         }
     }
     fn tooltip_interrupt(self) -> &'static str {
         match self {
-            GenerationMode::Generate { .. } => "Interrupt Generation",
+            GenerationMode::Generate => "Interrupt Generation",
             GenerationMode::Transform => "Interrupt Transform",
         }
     }
 
     fn tooltip_restart(self) -> &'static str {
         match self {
-            GenerationMode::Generate { .. } => "Restart Generation",
+            GenerationMode::Generate => "Restart Generation",
             GenerationMode::Transform => "Restart Transform",
         }
     }
 
     fn tooltip_accept(self) -> &'static str {
         match self {
-            GenerationMode::Generate { .. } => "Accept Generation",
+            GenerationMode::Generate => "Accept Generation",
             GenerationMode::Transform => "Accept Transform",
         }
     }
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index b6ce9d24e9..ed3f114943 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1029,11 +1029,11 @@ impl Client {
             Status::SignedOut | Status::Authenticated => true,
             Status::ConnectionError
             | Status::ConnectionLost
-            | Status::Authenticating { .. }
+            | Status::Authenticating
             | Status::AuthenticationError
-            | Status::Reauthenticating { .. }
+            | Status::Reauthenticating
             | Status::ReconnectionError { .. } => false,
-            Status::Connected { .. } | Status::Connecting { .. } | Status::Reconnecting { .. } => {
+            Status::Connected { .. } | Status::Connecting | Status::Reconnecting => {
                 return ConnectionResult::Result(Ok(()));
             }
             Status::UpgradeRequired => {
@@ -1902,10 +1902,7 @@ mod tests {
         assert!(matches!(status.next().await, Some(Status::Connecting)));
 
         executor.advance_clock(CONNECTION_TIMEOUT);
-        assert!(matches!(
-            status.next().await,
-            Some(Status::ConnectionError { .. })
-        ));
+        assert!(matches!(status.next().await, Some(Status::ConnectionError)));
         auth_and_connect.await.into_response().unwrap_err();
 
         // Allow the connection to be established.
@@ -1929,10 +1926,7 @@ mod tests {
             })
         });
         executor.advance_clock(2 * INITIAL_RECONNECTION_DELAY);
-        assert!(matches!(
-            status.next().await,
-            Some(Status::Reconnecting { .. })
-        ));
+        assert!(matches!(status.next().await, Some(Status::Reconnecting)));
 
         executor.advance_clock(CONNECTION_TIMEOUT);
         assert!(matches!(
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 33455f5e52..b7d8423fd7 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -126,7 +126,7 @@ impl CopilotServer {
     fn as_authenticated(&mut self) -> Result<&mut RunningCopilotServer> {
         let server = self.as_running()?;
         anyhow::ensure!(
-            matches!(server.sign_in_status, SignInStatus::Authorized { .. }),
+            matches!(server.sign_in_status, SignInStatus::Authorized),
             "must sign in before using copilot"
         );
         Ok(server)
@@ -578,12 +578,12 @@ impl Copilot {
     pub(crate) fn sign_in(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
         if let CopilotServer::Running(server) = &mut self.server {
             let task = match &server.sign_in_status {
-                SignInStatus::Authorized { .. } => Task::ready(Ok(())).shared(),
+                SignInStatus::Authorized => Task::ready(Ok(())).shared(),
                 SignInStatus::SigningIn { task, .. } => {
                     cx.notify();
                     task.clone()
                 }
-                SignInStatus::SignedOut { .. } | SignInStatus::Unauthorized { .. } => {
+                SignInStatus::SignedOut { .. } | SignInStatus::Unauthorized => {
                     let lsp = server.lsp.clone();
                     let task = cx
                         .spawn(async move |this, cx| {
@@ -727,7 +727,7 @@ impl Copilot {
             ..
         }) = &mut self.server
         {
-            if !matches!(status, SignInStatus::Authorized { .. }) {
+            if !matches!(status, SignInStatus::Authorized) {
                 return;
             }
 
@@ -1009,8 +1009,8 @@ impl Copilot {
             CopilotServer::Error(error) => Status::Error(error.clone()),
             CopilotServer::Running(RunningCopilotServer { sign_in_status, .. }) => {
                 match sign_in_status {
-                    SignInStatus::Authorized { .. } => Status::Authorized,
-                    SignInStatus::Unauthorized { .. } => Status::Unauthorized,
+                    SignInStatus::Authorized => Status::Authorized,
+                    SignInStatus::Unauthorized => Status::Unauthorized,
                     SignInStatus::SigningIn { prompt, .. } => Status::SigningIn {
                         prompt: prompt.clone(),
                     },
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index c8502f75de..964f202934 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -34,7 +34,7 @@ pub enum DataCollectionState {
 
 impl DataCollectionState {
     pub fn is_supported(&self) -> bool {
-        !matches!(self, DataCollectionState::Unsupported { .. })
+        !matches!(self, DataCollectionState::Unsupported)
     }
 
     pub fn is_enabled(&self) -> bool {
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 5fc017dcfc..2136d5f4b3 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1854,8 +1854,8 @@ impl Editor {
             blink_manager
         });
 
-        let soft_wrap_mode_override = matches!(mode, EditorMode::SingleLine { .. })
-            .then(|| language_settings::SoftWrap::None);
+        let soft_wrap_mode_override =
+            matches!(mode, EditorMode::SingleLine).then(|| language_settings::SoftWrap::None);
 
         let mut project_subscriptions = Vec::new();
         if full_mode && let Some(project) = project.as_ref() {
@@ -1980,14 +1980,12 @@ impl Editor {
                 .detach();
         }
 
-        let show_indent_guides = if matches!(
-            mode,
-            EditorMode::SingleLine { .. } | EditorMode::Minimap { .. }
-        ) {
-            Some(false)
-        } else {
-            None
-        };
+        let show_indent_guides =
+            if matches!(mode, EditorMode::SingleLine | EditorMode::Minimap { .. }) {
+                Some(false)
+            } else {
+                None
+            };
 
         let breakpoint_store = match (&mode, project.as_ref()) {
             (EditorMode::Full { .. }, Some(project)) => Some(project.read(cx).breakpoint_store()),
@@ -2047,7 +2045,7 @@ impl Editor {
                 vertical: full_mode,
             },
             minimap_visibility: MinimapVisibility::for_mode(&mode, cx),
-            offset_content: !matches!(mode, EditorMode::SingleLine { .. }),
+            offset_content: !matches!(mode, EditorMode::SingleLine),
             show_breadcrumbs: EditorSettings::get_global(cx).toolbar.breadcrumbs,
             show_gutter: full_mode,
             show_line_numbers: (!full_mode).then_some(false),
@@ -2401,7 +2399,7 @@ impl Editor {
         let mut key_context = KeyContext::new_with_defaults();
         key_context.add("Editor");
         let mode = match self.mode {
-            EditorMode::SingleLine { .. } => "single_line",
+            EditorMode::SingleLine => "single_line",
             EditorMode::AutoHeight { .. } => "auto_height",
             EditorMode::Minimap { .. } => "minimap",
             EditorMode::Full { .. } => "full",
@@ -6772,7 +6770,7 @@ impl Editor {
         &mut self,
         cx: &mut Context<Editor>,
     ) -> Option<(String, Range<Anchor>)> {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             return None;
         }
         if !EditorSettings::get_global(cx).selection_highlight {
@@ -12601,7 +12599,7 @@ impl Editor {
             return;
         }
 
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -12725,7 +12723,7 @@ impl Editor {
             return;
         }
 
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13209,7 +13207,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13230,7 +13228,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13251,7 +13249,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13272,7 +13270,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13293,7 +13291,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13318,7 +13316,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13343,7 +13341,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13368,7 +13366,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13393,7 +13391,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13414,7 +13412,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13435,7 +13433,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13456,7 +13454,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13477,7 +13475,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -13502,7 +13500,7 @@ impl Editor {
     }
 
     pub fn move_to_end(&mut self, _: &MoveToEnd, window: &mut Window, cx: &mut Context<Self>) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
@@ -14551,7 +14549,7 @@ impl Editor {
             let advance_downwards = action.advance_downwards
                 && selections_on_single_row
                 && !selections_selecting
-                && !matches!(this.mode, EditorMode::SingleLine { .. });
+                && !matches!(this.mode, EditorMode::SingleLine);
 
             if advance_downwards {
                 let snapshot = this.buffer.read(cx).snapshot(cx);
@@ -22867,7 +22865,7 @@ impl Render for Editor {
         let settings = ThemeSettings::get_global(cx);
 
         let mut text_style = match self.mode {
-            EditorMode::SingleLine { .. } | EditorMode::AutoHeight { .. } => TextStyle {
+            EditorMode::SingleLine | EditorMode::AutoHeight { .. } => TextStyle {
                 color: cx.theme().colors().editor_foreground,
                 font_family: settings.ui_font.family.clone(),
                 font_features: settings.ui_font.features.clone(),
@@ -22893,7 +22891,7 @@ impl Render for Editor {
         }
 
         let background = match self.mode {
-            EditorMode::SingleLine { .. } => cx.theme().system().transparent,
+            EditorMode::SingleLine => cx.theme().system().transparent,
             EditorMode::AutoHeight { .. } => cx.theme().system().transparent,
             EditorMode::Full { .. } => cx.theme().colors().editor_background,
             EditorMode::Minimap { .. } => cx.theme().colors().editor_background.opacity(0.7),
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index b18d1ceae1..416f35d7a7 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -8105,7 +8105,7 @@ impl Element for EditorElement {
                     // The max scroll position for the top of the window
                     let max_scroll_top = if matches!(
                         snapshot.mode,
-                        EditorMode::SingleLine { .. }
+                        EditorMode::SingleLine
                             | EditorMode::AutoHeight { .. }
                             | EditorMode::Full {
                                 sized_by_content: true,
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index b47f1cd711..8231448618 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -675,7 +675,7 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
diff --git a/crates/editor/src/scroll/actions.rs b/crates/editor/src/scroll/actions.rs
index 72827b2fee..f8104665f9 100644
--- a/crates/editor/src/scroll/actions.rs
+++ b/crates/editor/src/scroll/actions.rs
@@ -16,7 +16,7 @@ impl Editor {
             return;
         }
 
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
+        if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate();
             return;
         }
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 5a01514185..79d182eb22 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2983,9 +2983,7 @@ impl GitPanel {
             let status_toast = StatusToast::new(message, cx, move |this, _cx| {
                 use remote_output::SuccessStyle::*;
                 match style {
-                    Toast { .. } => {
-                        this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
-                    }
+                    Toast => this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted)),
                     ToastWithLog { output } => this
                         .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
                         .action("View Log", move |window, cx| {
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index 23729be062..e60a3651aa 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -106,7 +106,7 @@ impl CursorPosition {
                         cursor_position.selected_count.selections = editor.selections.count();
                         match editor.mode() {
                             editor::EditorMode::AutoHeight { .. }
-                            | editor::EditorMode::SingleLine { .. }
+                            | editor::EditorMode::SingleLine
                             | editor::EditorMode::Minimap { .. } => {
                                 cursor_position.position = None;
                                 cursor_position.context = None;
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
index 1913646aa1..2afc72e989 100644
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -157,7 +157,7 @@ impl GoToLine {
                 self.prev_scroll_position.take();
                 cx.emit(DismissEvent)
             }
-            editor::EditorEvent::BufferEdited { .. } => self.highlight_current_line(cx),
+            editor::EditorEvent::BufferEdited => self.highlight_current_line(cx),
             _ => {}
         }
     }
diff --git a/crates/onboarding/src/theme_preview.rs b/crates/onboarding/src/theme_preview.rs
index d84bc9b0e5..8bd65d8a27 100644
--- a/crates/onboarding/src/theme_preview.rs
+++ b/crates/onboarding/src/theme_preview.rs
@@ -362,13 +362,12 @@ impl Component for ThemePreviewTile {
                             .gap_4()
                             .children(
                                 themes_to_preview
-                                    .iter()
-                                    .enumerate()
-                                    .map(|(_, theme)| {
+                                    .into_iter()
+                                    .map(|theme| {
                                         div()
                                             .w(px(200.))
                                             .h(px(140.))
-                                            .child(ThemePreviewTile::new(theme.clone(), 0.42))
+                                            .child(ThemePreviewTile::new(theme, 0.42))
                                     })
                                     .collect::<Vec<_>>(),
                             )
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 7a44ad3f87..e989b974e1 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3924,9 +3924,7 @@ impl LspStore {
         _: &mut Context<Self>,
     ) {
         match event {
-            ToolchainStoreEvent::ToolchainActivated { .. } => {
-                self.request_workspace_config_refresh()
-            }
+            ToolchainStoreEvent::ToolchainActivated => self.request_workspace_config_refresh(),
         }
     }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index af5fd0d675..e47c020a42 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -3119,7 +3119,7 @@ impl Project {
         event: &BufferEvent,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        if matches!(event, BufferEvent::Edited { .. } | BufferEvent::Reloaded) {
+        if matches!(event, BufferEvent::Edited | BufferEvent::Reloaded) {
             self.request_buffer_diff_recalculation(&buffer, cx);
         }
 
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 5fa3a5f715..1c4409aec3 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -948,7 +948,7 @@ impl SshRemoteClient {
                     if old_state.is_reconnecting() {
                         match &new_state {
                             State::Connecting
-                            | State::Reconnecting { .. }
+                            | State::Reconnecting
                             | State::HeartbeatMissed { .. }
                             | State::ServerNotRunning => {}
                             State::Connected { .. } => {
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 35b33f39be..b84a2800b6 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -563,8 +563,8 @@ impl TitleBar {
         match status {
             client::Status::ConnectionError
             | client::Status::ConnectionLost
-            | client::Status::Reauthenticating { .. }
-            | client::Status::Reconnecting { .. }
+            | client::Status::Reauthenticating
+            | client::Status::Reconnecting
             | client::Status::ReconnectionError { .. } => Some(
                 div()
                     .id("disconnected")
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 64cf77a4fd..b52687f335 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -7670,7 +7670,7 @@ pub fn client_side_decorations(
 
     match decorations {
         Decorations::Client { .. } => window.set_client_inset(theme::CLIENT_SIDE_DECORATION_SHADOW),
-        Decorations::Server { .. } => window.set_client_inset(px(0.0)),
+        Decorations::Server => window.set_client_inset(px(0.0)),
     }
 
     struct GlobalResizeEdge(ResizeEdge);

From de12633591a79af3bac5fc030ee3d54bb4270920 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 20 Aug 2025 15:02:40 +0200
Subject: [PATCH 209/823] Wait for agent2 feature flag before loading panel
 (#36583)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 3c4c403a77..286d3b1c26 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -523,6 +523,7 @@ impl AgentPanel {
             anyhow::Ok(())
         }));
     }
+
     pub fn load(
         workspace: WeakEntity<Workspace>,
         prompt_builder: Arc<PromptBuilder>,
@@ -572,6 +573,17 @@ impl AgentPanel {
                 None
             };
 
+            // Wait for the Gemini/Native feature flag to be available.
+            let client = workspace.read_with(cx, |workspace, _| workspace.client().clone())?;
+            if !client.status().borrow().is_signed_out() {
+                cx.update(|_, cx| {
+                    cx.wait_for_flag_or_timeout::<feature_flags::GeminiAndNativeFeatureFlag>(
+                        Duration::from_secs(2),
+                    )
+                })?
+                .await;
+            }
+
             let panel = workspace.update_in(cx, |workspace, window, cx| {
                 let panel = cx.new(|cx| {
                     Self::new(

From bc79076ad3767e004bc6c5ff7efa9673400329d2 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:17:28 +0300
Subject: [PATCH 210/823] Fix `clippy::manual_map` lint violations (#36584)

#36577

Release Notes:

- N/A
---
 Cargo.toml                                    |  1 +
 crates/acp_thread/src/acp_thread.rs           |  8 +++----
 crates/agent_ui/src/acp/thread_view.rs        |  7 ++----
 crates/agent_ui/src/active_thread.rs          | 10 ++++----
 crates/agent_ui/src/inline_assistant.rs       | 10 ++++----
 .../src/edit_agent/streaming_fuzzy_matcher.rs |  8 +++----
 crates/editor/src/editor_tests.rs             |  8 +------
 crates/editor/src/hover_popover.rs            | 24 +++++++------------
 crates/file_finder/src/file_finder.rs         |  7 +++---
 crates/git_ui/src/commit_modal.rs             | 12 +++-------
 crates/gpui/src/platform/windows/window.rs    |  5 +---
 crates/multi_buffer/src/multi_buffer.rs       | 10 +++-----
 crates/project/src/lsp_command.rs             | 15 +++++-------
 crates/project/src/lsp_store.rs               | 15 ++++--------
 crates/project_panel/src/project_panel.rs     | 20 +++++++---------
 crates/vim/src/command.rs                     |  6 +----
 crates/workspace/src/pane.rs                  |  4 +---
 crates/workspace/src/workspace.rs             | 10 ++++----
 18 files changed, 62 insertions(+), 118 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d69e87fd6b..9cd206cebf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -871,6 +871,7 @@ manual_dangling_ptr = "warn"
 manual_is_ascii_check = "warn"
 manual_is_finite = "warn"
 manual_is_infinite = "warn"
+manual_map = "warn"
 manual_next_back = "warn"
 manual_non_exhaustive = "warn"
 manual_ok_or = "warn"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 4f20dbd587..b8908fa0da 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -301,11 +301,9 @@ impl ToolCall {
     ) -> Option<AgentLocation> {
         let buffer = project
             .update(cx, |project, cx| {
-                if let Some(path) = project.project_path_for_absolute_path(&location.path, cx) {
-                    Some(project.open_buffer(path, cx))
-                } else {
-                    None
-                }
+                project
+                    .project_path_for_absolute_path(&location.path, cx)
+                    .map(|path| project.open_buffer(path, cx))
             })
             .ok()??;
         let buffer = buffer.await.log_err()?;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index b527775850..f89198c84b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4012,12 +4012,9 @@ impl Render for AcpThreadView {
             .children(
                 if let Some(usage_callout) = self.render_usage_callout(line_height, cx) {
                     Some(usage_callout.into_any_element())
-                } else if let Some(token_limit_callout) =
-                    self.render_token_limit_callout(line_height, cx)
-                {
-                    Some(token_limit_callout.into_any_element())
                 } else {
-                    None
+                    self.render_token_limit_callout(line_height, cx)
+                        .map(|token_limit_callout| token_limit_callout.into_any_element())
                 },
             )
             .child(self.render_message_editor(window, cx))
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index bb5b47f0d6..e214986b82 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -779,13 +779,11 @@ impl ActiveThread {
 
         let list_state = ListState::new(0, ListAlignment::Bottom, px(2048.));
 
-        let workspace_subscription = if let Some(workspace) = workspace.upgrade() {
-            Some(cx.observe_release(&workspace, |this, _, cx| {
+        let workspace_subscription = workspace.upgrade().map(|workspace| {
+            cx.observe_release(&workspace, |this, _, cx| {
                 this.dismiss_notifications(cx);
-            }))
-        } else {
-            None
-        };
+            })
+        });
 
         let mut this = Self {
             language_registry,
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 2111553340..13f1234b4d 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1532,13 +1532,11 @@ impl InlineAssistant {
             .and_then(|item| item.act_as::<Editor>(cx))
         {
             Some(InlineAssistTarget::Editor(workspace_editor))
-        } else if let Some(terminal_view) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<TerminalView>(cx))
-        {
-            Some(InlineAssistTarget::Terminal(terminal_view))
         } else {
-            None
+            workspace
+                .active_item(cx)
+                .and_then(|item| item.act_as::<TerminalView>(cx))
+                .map(InlineAssistTarget::Terminal)
         }
     }
 }
diff --git a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
index 2dba8a2b6d..33b37679f0 100644
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -794,10 +794,8 @@ mod tests {
     fn finish(mut finder: StreamingFuzzyMatcher) -> Option<String> {
         let snapshot = finder.snapshot.clone();
         let matches = finder.finish();
-        if let Some(range) = matches.first() {
-            Some(snapshot.text_for_range(range.clone()).collect::<String>())
-        } else {
-            None
-        }
+        matches
+            .first()
+            .map(|range| snapshot.text_for_range(range.clone()).collect::<String>())
     }
 }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 955ade04cd..44c05dbc14 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -21065,13 +21065,7 @@ fn add_log_breakpoint_at_cursor(
     let (anchor, bp) = editor
         .breakpoints_at_cursors(window, cx)
         .first()
-        .and_then(|(anchor, bp)| {
-            if let Some(bp) = bp {
-                Some((*anchor, bp.clone()))
-            } else {
-                None
-            }
-        })
+        .and_then(|(anchor, bp)| bp.as_ref().map(|bp| (*anchor, bp.clone())))
         .unwrap_or_else(|| {
             let cursor_position: Point = editor.selections.newest(cx).head();
 
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 497f193cb4..28a09e947f 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -174,11 +174,9 @@ pub fn hover_at_inlay(
 
                 let subscription = this
                     .update(cx, |_, cx| {
-                        if let Some(parsed_content) = &parsed_content {
-                            Some(cx.observe(parsed_content, |_, _, cx| cx.notify()))
-                        } else {
-                            None
-                        }
+                        parsed_content.as_ref().map(|parsed_content| {
+                            cx.observe(parsed_content, |_, _, cx| cx.notify())
+                        })
                     })
                     .ok()
                     .flatten();
@@ -450,11 +448,9 @@ fn show_hover(
                 let scroll_handle = ScrollHandle::new();
                 let subscription = this
                     .update(cx, |_, cx| {
-                        if let Some(parsed_content) = &parsed_content {
-                            Some(cx.observe(parsed_content, |_, _, cx| cx.notify()))
-                        } else {
-                            None
-                        }
+                        parsed_content.as_ref().map(|parsed_content| {
+                            cx.observe(parsed_content, |_, _, cx| cx.notify())
+                        })
                     })
                     .ok()
                     .flatten();
@@ -502,11 +498,9 @@ fn show_hover(
                 hover_highlights.push(range.clone());
                 let subscription = this
                     .update(cx, |_, cx| {
-                        if let Some(parsed_content) = &parsed_content {
-                            Some(cx.observe(parsed_content, |_, _, cx| cx.notify()))
-                        } else {
-                            None
-                        }
+                        parsed_content.as_ref().map(|parsed_content| {
+                            cx.observe(parsed_content, |_, _, cx| cx.notify())
+                        })
                     })
                     .ok()
                     .flatten();
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 40acf012c9..8aaaa04729 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -267,10 +267,9 @@ impl FileFinder {
     ) {
         self.picker.update(cx, |picker, cx| {
             picker.delegate.include_ignored = match picker.delegate.include_ignored {
-                Some(true) => match FileFinderSettings::get_global(cx).include_ignored {
-                    Some(_) => Some(false),
-                    None => None,
-                },
+                Some(true) => FileFinderSettings::get_global(cx)
+                    .include_ignored
+                    .map(|_| false),
                 Some(false) => Some(true),
                 None => Some(true),
             };
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index e1e6cee93c..cae4d28a83 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -391,15 +391,9 @@ impl CommitModal {
             });
         let focus_handle = self.focus_handle(cx);
 
-        let close_kb_hint =
-            if let Some(close_kb) = ui::KeyBinding::for_action(&menu::Cancel, window, cx) {
-                Some(
-                    KeybindingHint::new(close_kb, cx.theme().colors().editor_background)
-                        .suffix("Cancel"),
-                )
-            } else {
-                None
-            };
+        let close_kb_hint = ui::KeyBinding::for_action(&menu::Cancel, window, cx).map(|close_kb| {
+            KeybindingHint::new(close_kb, cx.theme().colors().editor_background).suffix("Cancel")
+        });
 
         h_flex()
             .group("commit_editor_footer")
diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs
index 32a6da2391..99e5073371 100644
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -592,10 +592,7 @@ impl PlatformWindow for WindowsWindow {
     ) -> Option<Receiver<usize>> {
         let (done_tx, done_rx) = oneshot::channel();
         let msg = msg.to_string();
-        let detail_string = match detail {
-            Some(info) => Some(info.to_string()),
-            None => None,
-        };
+        let detail_string = detail.map(|detail| detail.to_string());
         let handle = self.0.hwnd;
         let answers = answers.to_vec();
         self.0
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 6b6d17a246..60e9c14c34 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -4069,13 +4069,9 @@ impl MultiBufferSnapshot {
                         buffer_end = buffer_end.min(end_buffer_offset);
                     }
 
-                    if let Some(iterator) =
-                        get_buffer_metadata(&excerpt.buffer, buffer_start..buffer_end)
-                    {
-                        Some(&mut current_excerpt_metadata.insert((excerpt.id, iterator)).1)
-                    } else {
-                        None
-                    }
+                    get_buffer_metadata(&excerpt.buffer, buffer_start..buffer_end).map(|iterator| {
+                        &mut current_excerpt_metadata.insert((excerpt.id, iterator)).1
+                    })
                 };
 
                 // Visit each metadata item.
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index a91e3fb402..c90d85358a 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -2595,11 +2595,9 @@ impl LspCommand for GetCodeActions {
         server_id: LanguageServerId,
         cx: AsyncApp,
     ) -> Result<Vec<CodeAction>> {
-        let requested_kinds_set = if let Some(kinds) = self.kinds {
-            Some(kinds.into_iter().collect::<HashSet<_>>())
-        } else {
-            None
-        };
+        let requested_kinds_set = self
+            .kinds
+            .map(|kinds| kinds.into_iter().collect::<HashSet<_>>());
 
         let language_server = cx.update(|cx| {
             lsp_store
@@ -3821,12 +3819,11 @@ impl GetDocumentDiagnostics {
                 _ => None,
             },
             code,
-            code_description: match diagnostic.code_description {
-                Some(code_description) => Some(CodeDescription {
+            code_description: diagnostic
+                .code_description
+                .map(|code_description| CodeDescription {
                     href: Some(lsp::Url::parse(&code_description).unwrap()),
                 }),
-                None => None,
-            },
             related_information: Some(related_information),
             tags: Some(tags),
             source: diagnostic.source.clone(),
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e989b974e1..1b46117897 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -12270,11 +12270,10 @@ async fn populate_labels_for_completions(
     let lsp_completions = new_completions
         .iter()
         .filter_map(|new_completion| {
-            if let Some(lsp_completion) = new_completion.source.lsp_completion(true) {
-                Some(lsp_completion.into_owned())
-            } else {
-                None
-            }
+            new_completion
+                .source
+                .lsp_completion(true)
+                .map(|lsp_completion| lsp_completion.into_owned())
         })
         .collect::<Vec<_>>();
 
@@ -12294,11 +12293,7 @@ async fn populate_labels_for_completions(
     for completion in new_completions {
         match completion.source.lsp_completion(true) {
             Some(lsp_completion) => {
-                let documentation = if let Some(docs) = lsp_completion.documentation.clone() {
-                    Some(docs.into())
-                } else {
-                    None
-                };
+                let documentation = lsp_completion.documentation.clone().map(|docs| docs.into());
 
                 let mut label = labels.next().flatten().unwrap_or_else(|| {
                     CodeLabel::fallback_for_completion(&lsp_completion, language.as_deref())
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index a5bfa883d5..52ec7a9880 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -3895,14 +3895,12 @@ impl ProjectPanel {
         // Always highlight directory or parent directory if it's file
         if target_entry.is_dir() {
             Some(target_entry.id)
-        } else if let Some(parent_entry) = target_entry
-            .path
-            .parent()
-            .and_then(|parent_path| target_worktree.entry_for_path(parent_path))
-        {
-            Some(parent_entry.id)
         } else {
-            None
+            target_entry
+                .path
+                .parent()
+                .and_then(|parent_path| target_worktree.entry_for_path(parent_path))
+                .map(|parent_entry| parent_entry.id)
         }
     }
 
@@ -3939,12 +3937,10 @@ impl ProjectPanel {
         // Always highlight directory or parent directory if it's file
         if target_entry.is_dir() {
             Some(target_entry.id)
-        } else if let Some(parent_entry) =
-            target_parent_path.and_then(|parent_path| target_worktree.entry_for_path(parent_path))
-        {
-            Some(parent_entry.id)
         } else {
-            None
+            target_parent_path
+                .and_then(|parent_path| target_worktree.entry_for_path(parent_path))
+                .map(|parent_entry| parent_entry.id)
         }
     }
 
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 680c87f9e5..79d18a85e9 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1408,11 +1408,7 @@ pub fn command_interceptor(mut input: &str, cx: &App) -> Vec<CommandInterceptRes
             start: Position::Line { row: 0, offset: 0 },
             end: Some(Position::LastLine { offset: 0 }),
         });
-        if let Some(action) = OnMatchingLines::parse(query, invert, range, cx) {
-            Some(action.boxed_clone())
-        } else {
-            None
-        }
+        OnMatchingLines::parse(query, invert, range, cx).map(|action| action.boxed_clone())
     } else if query.contains('!') {
         ShellExec::parse(query, range.clone())
     } else {
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index e49eb0a345..dea18ddbe2 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2583,10 +2583,8 @@ impl Pane {
                     .children(
                         std::iter::once(if let Some(decorated_icon) = decorated_icon {
                             Some(div().child(decorated_icon.into_any_element()))
-                        } else if let Some(icon) = icon {
-                            Some(div().child(icon.into_any_element()))
                         } else {
-                            None
+                            icon.map(|icon| div().child(icon.into_any_element()))
                         })
                         .flatten(),
                     )
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index b52687f335..499e4f4619 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -4732,14 +4732,12 @@ impl Workspace {
                         })
                     });
 
-                    if let Some(view) = view {
-                        Some(entry.insert(FollowerView {
+                    view.map(|view| {
+                        entry.insert(FollowerView {
                             view,
                             location: None,
-                        }))
-                    } else {
-                        None
-                    }
+                        })
+                    })
                 }
             };
 

From c5040bd0a43f5835b3bb93d33ce26139c1dd0e51 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 20 Aug 2025 15:41:58 +0200
Subject: [PATCH 211/823] remote: Do not leave client hanging on unhandled
 proto message (#36590)

Otherwise the client will wait for a response that never arrives,
causing the task to lock up

Release Notes:

- N/A
---
 crates/remote/src/ssh_session.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index 1c4409aec3..a26f4be661 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -2353,6 +2353,7 @@ impl ChannelClient {
                     build_typed_envelope(peer_id, Instant::now(), incoming)
                 {
                     let type_name = envelope.payload_type_name();
+                    let message_id = envelope.message_id();
                     if let Some(future) = ProtoMessageHandlerSet::handle_message(
                         &this.message_handlers,
                         envelope,
@@ -2391,6 +2392,15 @@ impl ChannelClient {
                             .detach()
                     } else {
                         log::error!("{}:unhandled ssh message name:{type_name}", this.name);
+                        if let Err(e) = AnyProtoClient::from(this.clone()).send_response(
+                            message_id,
+                            anyhow::anyhow!("no handler registered for {type_name}").to_proto(),
+                        ) {
+                            log::error!(
+                                "{}:error sending error response for {type_name}:{e:#}",
+                                this.name
+                            );
+                        }
                     }
                 }
             }

From 85865fc9509d7c336325a0825f990a2c6d3267ca Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 20 Aug 2025 15:54:00 +0200
Subject: [PATCH 212/823] agent2: New thread from summary (#36578)

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/agent2/src/history_store.rs        |  4 ++
 crates/agent_ui/src/acp/message_editor.rs | 30 ++++++++
 crates/agent_ui/src/acp/thread_view.rs    | 25 +++++--
 crates/agent_ui/src/agent_panel.rs        | 83 +++++++++++++++++++----
 crates/agent_ui/src/agent_ui.rs           |  7 ++
 crates/zed/src/zed.rs                     |  1 +
 6 files changed, 131 insertions(+), 19 deletions(-)

diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 3df4eddde4..870c2607c4 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -111,6 +111,10 @@ impl HistoryStore {
         }
     }
 
+    pub fn thread_from_session_id(&self, session_id: &acp::SessionId) -> Option<&DbThreadMetadata> {
+        self.threads.iter().find(|thread| &thread.id == session_id)
+    }
+
     pub fn delete_thread(
         &mut self,
         id: acp::SessionId,
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index b5282bf891..a50e33dc31 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -163,6 +163,36 @@ impl MessageEditor {
         }
     }
 
+    pub fn insert_thread_summary(
+        &mut self,
+        thread: agent2::DbThreadMetadata,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let start = self.editor.update(cx, |editor, cx| {
+            editor.set_text(format!("{}\n", thread.title), window, cx);
+            editor
+                .buffer()
+                .read(cx)
+                .snapshot(cx)
+                .anchor_before(Point::zero())
+                .text_anchor
+        });
+
+        self.confirm_completion(
+            thread.title.clone(),
+            start,
+            thread.title.len(),
+            MentionUri::Thread {
+                id: thread.id.clone(),
+                name: thread.title.to_string(),
+            },
+            window,
+            cx,
+        )
+        .detach();
+    }
+
     #[cfg(test)]
     pub(crate) fn editor(&self) -> &Entity<Editor> {
         &self.editor
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f89198c84b..8d7f9c53ca 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -155,6 +155,7 @@ impl AcpThreadView {
     pub fn new(
         agent: Rc<dyn AgentServer>,
         resume_thread: Option<DbThreadMetadata>,
+        summarize_thread: Option<DbThreadMetadata>,
         workspace: WeakEntity<Workspace>,
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
@@ -164,7 +165,7 @@ impl AcpThreadView {
     ) -> Self {
         let prevent_slash_commands = agent.clone().downcast::<ClaudeCode>().is_some();
         let message_editor = cx.new(|cx| {
-            MessageEditor::new(
+            let mut editor = MessageEditor::new(
                 workspace.clone(),
                 project.clone(),
                 history_store.clone(),
@@ -177,7 +178,11 @@ impl AcpThreadView {
                 },
                 window,
                 cx,
-            )
+            );
+            if let Some(entry) = summarize_thread {
+                editor.insert_thread_summary(entry, window, cx);
+            }
+            editor
         });
 
         let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0));
@@ -3636,8 +3641,18 @@ impl AcpThreadView {
                         .child(
                             Button::new("start-new-thread", "Start New Thread")
                                 .label_size(LabelSize::Small)
-                                .on_click(cx.listener(|_this, _, _window, _cx| {
-                                    // todo: Once thread summarization is implemented, start a new thread from a summary.
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    let Some(thread) = this.thread() else {
+                                        return;
+                                    };
+                                    let session_id = thread.read(cx).session_id().clone();
+                                    window.dispatch_action(
+                                        crate::NewNativeAgentThreadFromSummary {
+                                            from_session_id: session_id,
+                                        }
+                                        .boxed_clone(),
+                                        cx,
+                                    );
                                 })),
                         )
                         .when(burn_mode_available, |this| {
@@ -4320,6 +4335,7 @@ pub(crate) mod tests {
                 AcpThreadView::new(
                     Rc::new(agent),
                     None,
+                    None,
                     workspace.downgrade(),
                     project,
                     history_store,
@@ -4526,6 +4542,7 @@ pub(crate) mod tests {
                 AcpThreadView::new(
                     Rc::new(StubAgentServer::new(connection.as_ref().clone())),
                     None,
+                    None,
                     workspace.downgrade(),
                     project.clone(),
                     history_store.clone(),
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 286d3b1c26..e2c4acb1ce 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -30,7 +30,7 @@ use crate::{
     thread_history::{HistoryEntryElement, ThreadHistory},
     ui::{AgentOnboardingModal, EndTrialUpsell},
 };
-use crate::{ExternalAgent, NewExternalAgentThread};
+use crate::{ExternalAgent, NewExternalAgentThread, NewNativeAgentThreadFromSummary};
 use agent::{
     Thread, ThreadError, ThreadEvent, ThreadId, ThreadSummary, TokenUsageRatio,
     context_store::ContextStore,
@@ -98,6 +98,16 @@ pub fn init(cx: &mut App) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
                     }
                 })
+                .register_action(
+                    |workspace, action: &NewNativeAgentThreadFromSummary, window, cx| {
+                        if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                            panel.update(cx, |panel, cx| {
+                                panel.new_native_agent_thread_from_summary(action, window, cx)
+                            });
+                            workspace.focus_panel::<AgentPanel>(window, cx);
+                        }
+                    },
+                )
                 .register_action(|workspace, _: &OpenHistory, window, cx| {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
@@ -120,7 +130,7 @@ pub fn init(cx: &mut App) {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
                         panel.update(cx, |panel, cx| {
-                            panel.external_thread(action.agent, None, window, cx)
+                            panel.external_thread(action.agent, None, None, window, cx)
                         });
                     }
                 })
@@ -670,6 +680,7 @@ impl AgentPanel {
                     this.external_thread(
                         Some(crate::ExternalAgent::NativeAgent),
                         Some(thread.clone()),
+                        None,
                         window,
                         cx,
                     );
@@ -974,6 +985,29 @@ impl AgentPanel {
         AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
     }
 
+    fn new_native_agent_thread_from_summary(
+        &mut self,
+        action: &NewNativeAgentThreadFromSummary,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(thread) = self
+            .acp_history_store
+            .read(cx)
+            .thread_from_session_id(&action.from_session_id)
+        else {
+            return;
+        };
+
+        self.external_thread(
+            Some(ExternalAgent::NativeAgent),
+            None,
+            Some(thread.clone()),
+            window,
+            cx,
+        );
+    }
+
     fn new_prompt_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let context = self
             .context_store
@@ -1015,6 +1049,7 @@ impl AgentPanel {
         &mut self,
         agent_choice: Option<crate::ExternalAgent>,
         resume_thread: Option<DbThreadMetadata>,
+        summarize_thread: Option<DbThreadMetadata>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1083,6 +1118,7 @@ impl AgentPanel {
                     crate::acp::AcpThreadView::new(
                         server,
                         resume_thread,
+                        summarize_thread,
                         workspace.clone(),
                         project,
                         this.acp_history_store.clone(),
@@ -1754,6 +1790,7 @@ impl AgentPanel {
                                 agent2::HistoryEntry::AcpThread(entry) => this.external_thread(
                                     Some(ExternalAgent::NativeAgent),
                                     Some(entry.clone()),
+                                    None,
                                     window,
                                     cx,
                                 ),
@@ -1823,15 +1860,23 @@ impl AgentPanel {
             AgentType::TextThread => {
                 window.dispatch_action(NewTextThread.boxed_clone(), cx);
             }
-            AgentType::NativeAgent => {
-                self.external_thread(Some(crate::ExternalAgent::NativeAgent), None, window, cx)
-            }
+            AgentType::NativeAgent => self.external_thread(
+                Some(crate::ExternalAgent::NativeAgent),
+                None,
+                None,
+                window,
+                cx,
+            ),
             AgentType::Gemini => {
-                self.external_thread(Some(crate::ExternalAgent::Gemini), None, window, cx)
-            }
-            AgentType::ClaudeCode => {
-                self.external_thread(Some(crate::ExternalAgent::ClaudeCode), None, window, cx)
+                self.external_thread(Some(crate::ExternalAgent::Gemini), None, None, window, cx)
             }
+            AgentType::ClaudeCode => self.external_thread(
+                Some(crate::ExternalAgent::ClaudeCode),
+                None,
+                None,
+                window,
+                cx,
+            ),
         }
     }
 
@@ -1841,7 +1886,13 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.external_thread(Some(ExternalAgent::NativeAgent), Some(thread), window, cx);
+        self.external_thread(
+            Some(ExternalAgent::NativeAgent),
+            Some(thread),
+            None,
+            window,
+            cx,
+        );
     }
 }
 
@@ -2358,8 +2409,10 @@ impl AgentPanel {
         let focus_handle = self.focus_handle(cx);
 
         let active_thread = match &self.active_view {
-            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
-            ActiveView::ExternalAgentThread { .. }
+            ActiveView::ExternalAgentThread { thread_view } => {
+                thread_view.read(cx).as_native_thread(cx)
+            }
+            ActiveView::Thread { .. }
             | ActiveView::TextThread { .. }
             | ActiveView::History
             | ActiveView::Configuration => None,
@@ -2396,15 +2449,15 @@ impl AgentPanel {
                                 let thread = active_thread.read(cx);
 
                                 if !thread.is_empty() {
-                                    let thread_id = thread.id().clone();
+                                    let session_id = thread.id().clone();
                                     this.item(
                                         ContextMenuEntry::new("New From Summary")
                                             .icon(IconName::ThreadFromSummary)
                                             .icon_color(Color::Muted)
                                             .handler(move |window, cx| {
                                                 window.dispatch_action(
-                                                    Box::new(NewThread {
-                                                        from_thread_id: Some(thread_id.clone()),
+                                                    Box::new(NewNativeAgentThreadFromSummary {
+                                                        from_session_id: session_id.clone(),
                                                     }),
                                                     cx,
                                                 );
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 01a248994d..7b6557245f 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -146,6 +146,13 @@ pub struct NewExternalAgentThread {
     agent: Option<ExternalAgent>,
 }
 
+#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
+#[action(namespace = agent)]
+#[serde(deny_unknown_fields)]
+pub struct NewNativeAgentThreadFromSummary {
+    from_session_id: agent_client_protocol::SessionId,
+}
+
 #[derive(Default, Debug, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 enum ExternalAgent {
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 0972973b89..0f6d236c65 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4362,6 +4362,7 @@ mod tests {
                     | "workspace::MoveItemToPaneInDirection"
                     | "workspace::OpenTerminal"
                     | "workspace::SendKeystrokes"
+                    | "agent::NewNativeAgentThreadFromSummary"
                     | "zed::OpenBrowser"
                     | "zed::OpenZedUrl" => {}
                     _ => {

From eaf6b56163c2b987e06981e332e06d68aed5608b Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 20 Aug 2025 15:56:39 +0200
Subject: [PATCH 213/823] Miscellaneous UX fixes for agent2 (#36591)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs    | 97 ++++++++++++++++++++++++++
 crates/agent_ui/src/acp/thread_view.rs | 44 +++++++-----
 2 files changed, 123 insertions(+), 18 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index b8908fa0da..a1f9b32eba 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1394,6 +1394,17 @@ impl AcpThread {
                             this.send_task.take();
                         }
 
+                        // Truncate entries if the last prompt was refused.
+                        if let Ok(Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                        })) = result
+                            && let Some((ix, _)) = this.last_user_message()
+                        {
+                            let range = ix..this.entries.len();
+                            this.entries.truncate(ix);
+                            cx.emit(AcpThreadEvent::EntriesRemoved(range));
+                        }
+
                         cx.emit(AcpThreadEvent::Stopped);
                         Ok(())
                     }
@@ -2369,6 +2380,92 @@ mod tests {
         assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
     }
 
+    #[gpui::test]
+    async fn test_refusal(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(path!("/"), json!({})).await;
+        let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
+
+        let refuse_next = Arc::new(AtomicBool::new(false));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
+            let refuse_next = refuse_next.clone();
+            move |request, thread, mut cx| {
+                let refuse_next = refuse_next.clone();
+                async move {
+                    if refuse_next.load(SeqCst) {
+                        return Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                        });
+                    }
+
+                    let acp::ContentBlock::Text(content) = &request.prompt[0] else {
+                        panic!("expected text content block");
+                    };
+                    thread.update(&mut cx, |thread, cx| {
+                        thread
+                            .handle_session_update(
+                                acp::SessionUpdate::AgentMessageChunk {
+                                    content: content.text.to_uppercase().into(),
+                                },
+                                cx,
+                            )
+                            .unwrap();
+                    })?;
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                    })
+                }
+                .boxed_local()
+            }
+        }));
+        let thread = cx
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
+            .await
+            .unwrap();
+
+        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
+            .await
+            .unwrap();
+        thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc! {"
+                    ## User
+
+                    hello
+
+                    ## Assistant
+
+                    HELLO
+
+                "}
+            );
+        });
+
+        // Simulate refusing the second message, ensuring the conversation gets
+        // truncated to before sending it.
+        refuse_next.store(true, SeqCst);
+        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["world".into()], cx)))
+            .await
+            .unwrap();
+        thread.read_with(cx, |thread, cx| {
+            assert_eq!(
+                thread.to_markdown(cx),
+                indoc! {"
+                    ## User
+
+                    hello
+
+                    ## Assistant
+
+                    HELLO
+
+                "}
+            );
+        });
+    }
+
     async fn run_until_first_tool_call(
         thread: &Entity<AcpThread>,
         cx: &mut TestAppContext,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 8d7f9c53ca..9bb5953eaf 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2398,7 +2398,6 @@ impl AcpThreadView {
             })
             .when(!changed_buffers.is_empty(), |this| {
                 this.child(self.render_edits_summary(
-                    action_log,
                     &changed_buffers,
                     self.edits_expanded,
                     pending_edits,
@@ -2550,7 +2549,6 @@ impl AcpThreadView {
 
     fn render_edits_summary(
         &self,
-        action_log: &Entity<ActionLog>,
         changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
         expanded: bool,
         pending_edits: bool,
@@ -2661,14 +2659,9 @@ impl AcpThreadView {
                                 )
                                 .map(|kb| kb.size(rems_from_px(10.))),
                             )
-                            .on_click({
-                                let action_log = action_log.clone();
-                                cx.listener(move |_, _, _, cx| {
-                                    action_log.update(cx, |action_log, cx| {
-                                        action_log.reject_all_edits(cx).detach();
-                                    })
-                                })
-                            }),
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.reject_all(&RejectAll, window, cx);
+                            })),
                     )
                     .child(
                         Button::new("keep-all-changes", "Keep All")
@@ -2681,14 +2674,9 @@ impl AcpThreadView {
                                 KeyBinding::for_action_in(&KeepAll, &focus_handle, window, cx)
                                     .map(|kb| kb.size(rems_from_px(10.))),
                             )
-                            .on_click({
-                                let action_log = action_log.clone();
-                                cx.listener(move |_, _, _, cx| {
-                                    action_log.update(cx, |action_log, cx| {
-                                        action_log.keep_all_edits(cx);
-                                    })
-                                })
-                            }),
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.keep_all(&KeepAll, window, cx);
+                            })),
                     ),
             )
     }
@@ -3014,6 +3002,24 @@ impl AcpThreadView {
         });
     }
 
+    fn keep_all(&mut self, _: &KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
+        let Some(thread) = self.thread() else {
+            return;
+        };
+        let action_log = thread.read(cx).action_log().clone();
+        action_log.update(cx, |action_log, cx| action_log.keep_all_edits(cx));
+    }
+
+    fn reject_all(&mut self, _: &RejectAll, _window: &mut Window, cx: &mut Context<Self>) {
+        let Some(thread) = self.thread() else {
+            return;
+        };
+        let action_log = thread.read(cx).action_log().clone();
+        action_log
+            .update(cx, |action_log, cx| action_log.reject_all_edits(cx))
+            .detach();
+    }
+
     fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let thread = self.as_native_thread(cx)?.read(cx);
 
@@ -3952,6 +3958,8 @@ impl Render for AcpThreadView {
             .key_context("AcpThread")
             .on_action(cx.listener(Self::open_agent_diff))
             .on_action(cx.listener(Self::toggle_burn_mode))
+            .on_action(cx.listener(Self::keep_all))
+            .on_action(cx.listener(Self::reject_all))
             .bg(cx.theme().colors().panel_background)
             .child(match &self.thread_state {
                 ThreadState::Unauthenticated {

From 92352f97ad966df29cbac117b9c9ca6a697676f4 Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Wed, 20 Aug 2025 17:34:52 +0300
Subject: [PATCH 214/823] Fix `clippy::map_clone` lint violations (#36585)

#36577

Release Notes:

- N/A
---
 Cargo.toml                                   | 1 +
 crates/git_ui/src/git_panel.rs               | 2 +-
 crates/gpui/src/platform/linux/x11/client.rs | 2 +-
 crates/workspace/src/pane.rs                 | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9cd206cebf..a049940772 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -879,6 +879,7 @@ manual_pattern_char_comparison = "warn"
 manual_rotate = "warn"
 manual_slice_fill = "warn"
 manual_while_let_some = "warn"
+map_clone = "warn"
 map_collect_result_unit = "warn"
 match_like_matches_macro = "warn"
 match_overlapping_arm = "warn"
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 79d182eb22..cc947bcb72 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1335,7 +1335,7 @@ impl GitPanel {
                         section.contains(status_entry, repository)
                             && status_entry.staging.as_bool() != Some(goal_staged_state)
                     })
-                    .map(|status_entry| status_entry.clone())
+                    .cloned()
                     .collect::<Vec<_>>();
 
                 (goal_staged_state, entries)
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index d501170892..9a43bd6470 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -2108,7 +2108,7 @@ fn current_pointer_device_states(
                     .classes
                     .iter()
                     .filter_map(|class| class.data.as_scroll())
-                    .map(|class| *class)
+                    .copied()
                     .rev()
                     .collect::<Vec<_>>();
                 let old_state = scroll_values_to_preserve.get(&info.deviceid);
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index dea18ddbe2..23c8c0b185 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -3082,7 +3082,7 @@ impl Pane {
                             .read(cx)
                             .items()
                             .find(|item| item.item_id() == item_id)
-                            .map(|item| item.clone())
+                            .cloned()
                         else {
                             return;
                         };

From 1e6cefaa56dc3dd62efd29ffc58262e710d6dbc1 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 20 Aug 2025 20:05:59 +0530
Subject: [PATCH 215/823] Fix `clippy::len_zero` lint style violations (#36589)

Related: #36577

Release Notes:

- N/A

---------

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 Cargo.toml                                       |  1 +
 crates/agent2/src/tools/find_path_tool.rs        |  2 +-
 crates/agent_servers/src/claude.rs               |  2 +-
 crates/agent_ui/src/message_editor.rs            |  4 ++--
 .../src/agent_panel_onboarding_content.rs        |  2 +-
 crates/assistant_tools/src/find_path_tool.rs     |  2 +-
 crates/buffer_diff/src/buffer_diff.rs            |  2 +-
 crates/collab/src/tests/editor_tests.rs          |  2 +-
 crates/debugger_ui/src/session/running.rs        |  7 +++----
 .../src/session/running/breakpoint_list.rs       |  8 ++++----
 .../src/session/running/module_list.rs           |  8 ++++----
 .../src/session/running/stack_frame_list.rs      |  8 ++++----
 .../src/session/running/variable_list.rs         |  4 ++--
 crates/diagnostics/src/diagnostics_tests.rs      |  2 +-
 crates/editor/src/editor_tests.rs                |  2 +-
 crates/editor/src/jsx_tag_auto_close.rs          |  4 ++--
 crates/editor/src/test/editor_test_context.rs    |  2 +-
 crates/git_ui/src/git_panel.rs                   | 16 ++++++++--------
 crates/language_models/src/provider/google.rs    |  2 +-
 crates/project/src/debugger/dap_store.rs         |  4 ++--
 crates/tasks_ui/src/modal.rs                     |  2 +-
 crates/vim/src/digraph.rs                        |  2 +-
 crates/workspace/src/persistence/model.rs        |  2 +-
 crates/zed/src/zed.rs                            |  2 +-
 24 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a049940772..a2de4aaaed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -864,6 +864,7 @@ iter_nth = "warn"
 iter_nth_zero = "warn"
 iter_skip_next = "warn"
 just_underscores_and_digits = "warn"
+len_zero = "warn"
 let_and_return = "warn"
 main_recursion = "warn"
 manual_bits = "warn"
diff --git a/crates/agent2/src/tools/find_path_tool.rs b/crates/agent2/src/tools/find_path_tool.rs
index 552de144a7..deccf37ab7 100644
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -116,7 +116,7 @@ impl AgentTool for FindPathTool {
                 ..cmp::min(input.offset + RESULTS_PER_PAGE, matches.len())];
 
             event_stream.update_fields(acp::ToolCallUpdateFields {
-                title: Some(if paginated_matches.len() == 0 {
+                title: Some(if paginated_matches.is_empty() {
                     "No matches".into()
                 } else if paginated_matches.len() == 1 {
                     "1 match".into()
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index df2a24e698..6b9732b468 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1117,7 +1117,7 @@ pub(crate) mod tests {
 
         thread.read_with(cx, |thread, _| {
             entries_len = thread.plan().entries.len();
-            assert!(thread.plan().entries.len() > 0, "Empty plan");
+            assert!(!thread.plan().entries.is_empty(), "Empty plan");
         });
 
         thread
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index fdbce14415..bed10e90a7 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1682,7 +1682,7 @@ impl Render for MessageEditor {
         let has_history = self
             .history_store
             .as_ref()
-            .and_then(|hs| hs.update(cx, |hs, cx| hs.entries(cx).len() > 0).ok())
+            .and_then(|hs| hs.update(cx, |hs, cx| !hs.entries(cx).is_empty()).ok())
             .unwrap_or(false)
             || self
                 .thread
@@ -1695,7 +1695,7 @@ impl Render for MessageEditor {
                 !has_history && is_signed_out && has_configured_providers,
                 |this| this.child(cx.new(ApiKeysWithProviders::new)),
             )
-            .when(changed_buffers.len() > 0, |parent| {
+            .when(!changed_buffers.is_empty(), |parent| {
                 parent.child(self.render_edits_bar(&changed_buffers, window, cx))
             })
             .child(self.render_editor(window, cx))
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
index 1a44fa3c17..77f41d1a73 100644
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -74,7 +74,7 @@ impl Render for AgentPanelOnboarding {
                 }),
             )
             .map(|this| {
-                if enrolled_in_trial || is_pro_user || self.configured_providers.len() >= 1 {
+                if enrolled_in_trial || is_pro_user || !self.configured_providers.is_empty() {
                     this
                 } else {
                     this.child(ApiKeysWithoutProviders::new())
diff --git a/crates/assistant_tools/src/find_path_tool.rs b/crates/assistant_tools/src/find_path_tool.rs
index 6b62638a4c..ac2c7a32ab 100644
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -234,7 +234,7 @@ impl ToolCard for FindPathToolCard {
         workspace: WeakEntity<Workspace>,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let matches_label: SharedString = if self.paths.len() == 0 {
+        let matches_label: SharedString = if self.paths.is_empty() {
             "No matches".into()
         } else if self.paths.len() == 1 {
             "1 match".into()
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index 6a9ca026e7..bef0c5cfc3 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -2129,7 +2129,7 @@ mod tests {
             diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &working_copy, cx)
                 .collect::<Vec<_>>()
         });
-        if hunks.len() == 0 {
+        if hunks.is_empty() {
             return;
         }
 
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index 4e7996ce3b..1b0c581983 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -2908,7 +2908,7 @@ async fn test_lsp_pull_diagnostics(
 
     {
         assert!(
-            diagnostics_pulls_result_ids.lock().await.len() > 0,
+            !diagnostics_pulls_result_ids.lock().await.is_empty(),
             "Initial diagnostics pulls should report None at least"
         );
         assert_eq!(
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 4306104877..0574091851 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -1113,9 +1113,8 @@ impl RunningState {
         };
         let session = self.session.read(cx);
 
-        let cwd = Some(&request.cwd)
-            .filter(|cwd| cwd.len() > 0)
-            .map(PathBuf::from)
+        let cwd = (!request.cwd.is_empty())
+            .then(|| PathBuf::from(&request.cwd))
             .or_else(|| session.binary().unwrap().cwd.clone());
 
         let mut envs: HashMap<String, String> =
@@ -1150,7 +1149,7 @@ impl RunningState {
             } else {
                 None
             }
-        } else if args.len() > 0 {
+        } else if !args.is_empty() {
             Some(args.remove(0))
         } else {
             None
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index d04443e201..233dba4c52 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -244,7 +244,7 @@ impl BreakpointList {
             return;
         }
         let ix = match self.selected_ix {
-            _ if self.breakpoints.len() == 0 => None,
+            _ if self.breakpoints.is_empty() => None,
             None => Some(0),
             Some(ix) => {
                 if ix == self.breakpoints.len() - 1 {
@@ -268,7 +268,7 @@ impl BreakpointList {
             return;
         }
         let ix = match self.selected_ix {
-            _ if self.breakpoints.len() == 0 => None,
+            _ if self.breakpoints.is_empty() => None,
             None => Some(self.breakpoints.len() - 1),
             Some(ix) => {
                 if ix == 0 {
@@ -286,7 +286,7 @@ impl BreakpointList {
             cx.propagate();
             return;
         }
-        let ix = if self.breakpoints.len() > 0 {
+        let ix = if !self.breakpoints.is_empty() {
             Some(0)
         } else {
             None
@@ -299,7 +299,7 @@ impl BreakpointList {
             cx.propagate();
             return;
         }
-        let ix = if self.breakpoints.len() > 0 {
+        let ix = if !self.breakpoints.is_empty() {
             Some(self.breakpoints.len() - 1)
         } else {
             None
diff --git a/crates/debugger_ui/src/session/running/module_list.rs b/crates/debugger_ui/src/session/running/module_list.rs
index 1c1e0f3efc..7743cfbdee 100644
--- a/crates/debugger_ui/src/session/running/module_list.rs
+++ b/crates/debugger_ui/src/session/running/module_list.rs
@@ -223,7 +223,7 @@ impl ModuleList {
 
     fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
         let ix = match self.selected_ix {
-            _ if self.entries.len() == 0 => None,
+            _ if self.entries.is_empty() => None,
             None => Some(0),
             Some(ix) => {
                 if ix == self.entries.len() - 1 {
@@ -243,7 +243,7 @@ impl ModuleList {
         cx: &mut Context<Self>,
     ) {
         let ix = match self.selected_ix {
-            _ if self.entries.len() == 0 => None,
+            _ if self.entries.is_empty() => None,
             None => Some(self.entries.len() - 1),
             Some(ix) => {
                 if ix == 0 {
@@ -262,7 +262,7 @@ impl ModuleList {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let ix = if self.entries.len() > 0 {
+        let ix = if !self.entries.is_empty() {
             Some(0)
         } else {
             None
@@ -271,7 +271,7 @@ impl ModuleList {
     }
 
     fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let ix = if self.entries.len() > 0 {
+        let ix = if !self.entries.is_empty() {
             Some(self.entries.len() - 1)
         } else {
             None
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index f9b5ed5e3f..a4ea4ab654 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -621,7 +621,7 @@ impl StackFrameList {
 
     fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
         let ix = match self.selected_ix {
-            _ if self.entries.len() == 0 => None,
+            _ if self.entries.is_empty() => None,
             None => Some(0),
             Some(ix) => {
                 if ix == self.entries.len() - 1 {
@@ -641,7 +641,7 @@ impl StackFrameList {
         cx: &mut Context<Self>,
     ) {
         let ix = match self.selected_ix {
-            _ if self.entries.len() == 0 => None,
+            _ if self.entries.is_empty() => None,
             None => Some(self.entries.len() - 1),
             Some(ix) => {
                 if ix == 0 {
@@ -660,7 +660,7 @@ impl StackFrameList {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let ix = if self.entries.len() > 0 {
+        let ix = if !self.entries.is_empty() {
             Some(0)
         } else {
             None
@@ -669,7 +669,7 @@ impl StackFrameList {
     }
 
     fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let ix = if self.entries.len() > 0 {
+        let ix = if !self.entries.is_empty() {
             Some(self.entries.len() - 1)
         } else {
             None
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index 18f574389e..b396f0921e 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -291,7 +291,7 @@ impl VariableList {
                 }
 
                 self.session.update(cx, |session, cx| {
-                    session.variables(scope.variables_reference, cx).len() > 0
+                    !session.variables(scope.variables_reference, cx).is_empty()
                 })
             })
             .map(|scope| {
@@ -997,7 +997,7 @@ impl VariableList {
                 DapEntry::Watcher { .. } => continue,
                 DapEntry::Variable(dap) => scopes[idx].1.push(dap.clone()),
                 DapEntry::Scope(scope) => {
-                    if scopes.len() > 0 {
+                    if !scopes.is_empty() {
                         idx += 1;
                     }
 
diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index 5df1b13897..4a544f9ea7 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -862,7 +862,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
             21..=50 => mutated_diagnostics.update_in(cx, |diagnostics, window, cx| {
                 diagnostics.editor.update(cx, |editor, cx| {
                     let snapshot = editor.snapshot(window, cx);
-                    if snapshot.buffer_snapshot.len() > 0 {
+                    if !snapshot.buffer_snapshot.is_empty() {
                         let position = rng.gen_range(0..snapshot.buffer_snapshot.len());
                         let position = snapshot.buffer_snapshot.clip_offset(position, Bias::Left);
                         log::info!(
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 44c05dbc14..96261fdb2c 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -21030,7 +21030,7 @@ fn assert_breakpoint(
     path: &Arc<Path>,
     expected: Vec<(u32, Breakpoint)>,
 ) {
-    if expected.len() == 0usize {
+    if expected.is_empty() {
         assert!(!breakpoints.contains_key(path), "{}", path.display());
     } else {
         let mut breakpoint = breakpoints
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
index 83ab02814f..e6c518beae 100644
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -181,7 +181,7 @@ pub(crate) fn generate_auto_close_edits(
          */
         {
             let tag_node_name_equals = |node: &Node, name: &str| {
-                let is_empty = name.len() == 0;
+                let is_empty = name.is_empty();
                 if let Some(node_name) = node.named_child(TS_NODE_TAG_NAME_CHILD_INDEX) {
                     let range = node_name.byte_range();
                     return buffer.text_for_range(range).equals_str(name);
@@ -207,7 +207,7 @@ pub(crate) fn generate_auto_close_edits(
                     cur = descendant;
                 }
 
-                assert!(ancestors.len() > 0);
+                assert!(!ancestors.is_empty());
 
                 let mut tree_root_node = open_tag;
 
diff --git a/crates/editor/src/test/editor_test_context.rs b/crates/editor/src/test/editor_test_context.rs
index 88721c59e7..8c54c265ed 100644
--- a/crates/editor/src/test/editor_test_context.rs
+++ b/crates/editor/src/test/editor_test_context.rs
@@ -420,7 +420,7 @@ impl EditorTestContext {
             if expected_text == "[FOLDED]\n" {
                 assert!(is_folded, "excerpt {} should be folded", ix);
                 let is_selected = selections.iter().any(|s| s.head().excerpt_id == excerpt_id);
-                if expected_selections.len() > 0 {
+                if !expected_selections.is_empty() {
                     assert!(
                         is_selected,
                         "excerpt {ix} should be selected. got {:?}",
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index cc947bcb72..4ecb4a8829 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2175,7 +2175,7 @@ impl GitPanel {
 
         let worktree = if worktrees.len() == 1 {
             Task::ready(Some(worktrees.first().unwrap().clone()))
-        } else if worktrees.len() == 0 {
+        } else if worktrees.is_empty() {
             let result = window.prompt(
                 PromptLevel::Warning,
                 "Unable to initialize a git repository",
@@ -2758,22 +2758,22 @@ impl GitPanel {
             }
         }
 
-        if conflict_entries.len() == 0 && staged_count == 1 && pending_staged_count == 0 {
+        if conflict_entries.is_empty() && staged_count == 1 && pending_staged_count == 0 {
             match pending_status_for_single_staged {
                 Some(TargetStatus::Staged) | None => {
                     self.single_staged_entry = single_staged_entry;
                 }
                 _ => {}
             }
-        } else if conflict_entries.len() == 0 && pending_staged_count == 1 {
+        } else if conflict_entries.is_empty() && pending_staged_count == 1 {
             self.single_staged_entry = last_pending_staged;
         }
 
-        if conflict_entries.len() == 0 && changed_entries.len() == 1 {
+        if conflict_entries.is_empty() && changed_entries.len() == 1 {
             self.single_tracked_entry = changed_entries.first().cloned();
         }
 
-        if conflict_entries.len() > 0 {
+        if !conflict_entries.is_empty() {
             self.entries.push(GitListEntry::Header(GitHeaderEntry {
                 header: Section::Conflict,
             }));
@@ -2781,7 +2781,7 @@ impl GitPanel {
                 .extend(conflict_entries.into_iter().map(GitListEntry::Status));
         }
 
-        if changed_entries.len() > 0 {
+        if !changed_entries.is_empty() {
             if !sort_by_path {
                 self.entries.push(GitListEntry::Header(GitHeaderEntry {
                     header: Section::Tracked,
@@ -2790,7 +2790,7 @@ impl GitPanel {
             self.entries
                 .extend(changed_entries.into_iter().map(GitListEntry::Status));
         }
-        if new_entries.len() > 0 {
+        if !new_entries.is_empty() {
             self.entries.push(GitListEntry::Header(GitHeaderEntry {
                 header: Section::New,
             }));
@@ -4476,7 +4476,7 @@ fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn Language
 impl Render for GitPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let project = self.project.read(cx);
-        let has_entries = self.entries.len() > 0;
+        let has_entries = !self.entries.is_empty();
         let room = self
             .workspace
             .upgrade()
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index c8d4151e8b..1ac12b4cd4 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -577,7 +577,7 @@ pub fn into_google(
             top_k: None,
         }),
         safety_settings: None,
-        tools: (request.tools.len() > 0).then(|| {
+        tools: (!request.tools.is_empty()).then(|| {
             vec![google_ai::Tool {
                 function_declarations: request
                     .tools
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index 45e1c7f291..834bf2c2d2 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -684,7 +684,7 @@ impl DapStore {
             let shutdown_id = parent_session.update(cx, |parent_session, _| {
                 parent_session.remove_child_session_id(session_id);
 
-                if parent_session.child_session_ids().len() == 0 {
+                if parent_session.child_session_ids().is_empty() {
                     Some(parent_session.session_id())
                 } else {
                     None
@@ -701,7 +701,7 @@ impl DapStore {
         cx.emit(DapStoreEvent::DebugClientShutdown(session_id));
 
         cx.background_spawn(async move {
-            if shutdown_children.len() > 0 {
+            if !shutdown_children.is_empty() {
                 let _ = join_all(shutdown_children).await;
             }
 
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index 9fbdc152f3..423c28c710 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -461,7 +461,7 @@ impl PickerDelegate for TasksModalDelegate {
             tooltip_label_text.push_str(&resolved_task.resolved.command_label);
         }
 
-        if template.tags.len() > 0 {
+        if !template.tags.is_empty() {
             tooltip_label_text.push('\n');
             tooltip_label_text.push_str(
                 template
diff --git a/crates/vim/src/digraph.rs b/crates/vim/src/digraph.rs
index 248047bb55..796dad94c0 100644
--- a/crates/vim/src/digraph.rs
+++ b/crates/vim/src/digraph.rs
@@ -89,7 +89,7 @@ impl Vim {
             return;
         };
 
-        if prefix.len() > 0 {
+        if !prefix.is_empty() {
             self.handle_literal_input(prefix, "", window, cx);
         } else {
             self.pop_operator(window, cx);
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index da8a3070fc..15a54ac62f 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -235,7 +235,7 @@ impl SerializedWorkspaceLocation {
     pub fn sorted_paths(&self) -> Arc<Vec<PathBuf>> {
         match self {
             SerializedWorkspaceLocation::Local(paths, order) => {
-                if order.order().len() == 0 {
+                if order.order().is_empty() {
                     paths.paths().clone()
                 } else {
                     Arc::new(
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 0f6d236c65..958149825a 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4377,7 +4377,7 @@ mod tests {
                     }
                 }
             }
-            if errors.len() > 0 {
+            if !errors.is_empty() {
                 panic!(
                     "Failed to build actions using {{}} as input: {:?}. Errors:\n{}",
                     failing_names,

From 699f58aeba56b10e99f789f9fb492c76fbeea81b Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 20 Aug 2025 18:04:32 +0200
Subject: [PATCH 216/823] Capture telemetry when requesting completions in
 agent2 (#36600)

Release Notes:

- N/A
---
 Cargo.lock                  |  1 +
 crates/agent2/Cargo.toml    |  1 +
 crates/agent2/src/thread.rs | 26 ++++++++++++++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fdc858ef50..342bb1058f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -239,6 +239,7 @@ dependencies = [
  "smol",
  "sqlez",
  "task",
+ "telemetry",
  "tempfile",
  "terminal",
  "text",
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index bc32a79622..2a5d879e9e 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -58,6 +58,7 @@ settings.workspace = true
 smol.workspace = true
 sqlez.workspace = true
 task.workspace = true
+telemetry.workspace = true
 terminal.workspace = true
 text.workspace = true
 ui.workspace = true
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index c7b1a08b92..f407ee7de5 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1195,6 +1195,15 @@ impl Thread {
 
         let mut attempt = None;
         'retry: loop {
+            telemetry::event!(
+                "Agent Thread Completion",
+                thread_id = this.read_with(cx, |this, _| this.id.to_string())?,
+                prompt_id = this.read_with(cx, |this, _| this.prompt_id.to_string())?,
+                model = model.telemetry_id(),
+                model_provider = model.provider_id().to_string(),
+                attempt
+            );
+
             let mut events = model.stream_completion(request.clone(), cx).await?;
             let mut tool_uses = FuturesUnordered::new();
             while let Some(event) = events.next().await {
@@ -1211,8 +1220,21 @@ impl Thread {
                             this.update_model_request_usage(amount, limit, cx)
                         })?;
                     }
-                    Ok(LanguageModelCompletionEvent::UsageUpdate(token_usage)) => {
-                        this.update(cx, |this, cx| this.update_token_usage(token_usage, cx))?;
+                    Ok(LanguageModelCompletionEvent::UsageUpdate(usage)) => {
+                        telemetry::event!(
+                            "Agent Thread Completion Usage Updated",
+                            thread_id = this.read_with(cx, |this, _| this.id.to_string())?,
+                            prompt_id = this.read_with(cx, |this, _| this.prompt_id.to_string())?,
+                            model = model.telemetry_id(),
+                            model_provider = model.provider_id().to_string(),
+                            attempt,
+                            input_tokens = usage.input_tokens,
+                            output_tokens = usage.output_tokens,
+                            cache_creation_input_tokens = usage.cache_creation_input_tokens,
+                            cache_read_input_tokens = usage.cache_read_input_tokens,
+                        );
+
+                        this.update(cx, |this, cx| this.update_token_usage(usage, cx))?;
                     }
                     Ok(LanguageModelCompletionEvent::Stop(StopReason::Refusal)) => {
                         *refusal = true;

From d0fb6120d9583fd46b17aed9d2b9a5b08e302f7e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 20 Aug 2025 18:39:46 +0200
Subject: [PATCH 217/823] Fix scrollbar flicker when streaming agent2 response
 (#36606)

This was caused by calling `list_state.splice` on updated entries. We
don't need to splice the entry, as we'll recompute its measurements
automatically when we render it.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 9bb5953eaf..87fe133bba 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -793,7 +793,6 @@ impl AcpThreadView {
                 self.entry_view_state.update(cx, |view_state, cx| {
                     view_state.sync_entry(*index, thread, window, cx)
                 });
-                self.list_state.splice(*index..index + 1, 1);
             }
             AcpThreadEvent::EntriesRemoved(range) => {
                 self.entry_view_state

From 8334cdb35805ca00c574daa623f62dc1867adb67 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 20 Aug 2025 19:10:43 +0200
Subject: [PATCH 218/823] agent2: Port feedback (#36603)

Release Notes:

- N/A

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 crates/acp_thread/src/connection.rs    |  17 ++
 crates/agent/src/thread.rs             |  53 -----
 crates/agent2/src/agent.rs             |  25 +++
 crates/agent_ui/src/acp/thread_view.rs | 283 ++++++++++++++++++++++++-
 crates/agent_ui/src/active_thread.rs   |   1 -
 5 files changed, 321 insertions(+), 58 deletions(-)

diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 8cae975ce5..dc1a41c81e 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -64,6 +64,10 @@ pub trait AgentConnection {
         None
     }
 
+    fn telemetry(&self) -> Option<Rc<dyn AgentTelemetry>> {
+        None
+    }
+
     fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
 }
 
@@ -81,6 +85,19 @@ pub trait AgentSessionResume {
     fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>>;
 }
 
+pub trait AgentTelemetry {
+    /// The name of the agent used for telemetry.
+    fn agent_name(&self) -> String;
+
+    /// A representation of the current thread state that can be serialized for
+    /// storage with telemetry events.
+    fn thread_data(
+        &self,
+        session_id: &acp::SessionId,
+        cx: &mut App,
+    ) -> Task<Result<serde_json::Value>>;
+}
+
 #[derive(Debug)]
 pub struct AuthRequired {
     pub description: Option<String>,
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index a584fba881..7b70fde56a 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -387,7 +387,6 @@ pub struct Thread {
     cumulative_token_usage: TokenUsage,
     exceeded_window_error: Option<ExceededWindowError>,
     tool_use_limit_reached: bool,
-    feedback: Option<ThreadFeedback>,
     retry_state: Option<RetryState>,
     message_feedback: HashMap<MessageId, ThreadFeedback>,
     last_received_chunk_at: Option<Instant>,
@@ -487,7 +486,6 @@ impl Thread {
             cumulative_token_usage: TokenUsage::default(),
             exceeded_window_error: None,
             tool_use_limit_reached: false,
-            feedback: None,
             retry_state: None,
             message_feedback: HashMap::default(),
             last_error_context: None,
@@ -612,7 +610,6 @@ impl Thread {
             cumulative_token_usage: serialized.cumulative_token_usage,
             exceeded_window_error: None,
             tool_use_limit_reached: serialized.tool_use_limit_reached,
-            feedback: None,
             message_feedback: HashMap::default(),
             last_error_context: None,
             last_received_chunk_at: None,
@@ -2787,10 +2784,6 @@ impl Thread {
         cx.emit(ThreadEvent::CancelEditing);
     }
 
-    pub fn feedback(&self) -> Option<ThreadFeedback> {
-        self.feedback
-    }
-
     pub fn message_feedback(&self, message_id: MessageId) -> Option<ThreadFeedback> {
         self.message_feedback.get(&message_id).copied()
     }
@@ -2852,52 +2845,6 @@ impl Thread {
         })
     }
 
-    pub fn report_feedback(
-        &mut self,
-        feedback: ThreadFeedback,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let last_assistant_message_id = self
-            .messages
-            .iter()
-            .rev()
-            .find(|msg| msg.role == Role::Assistant)
-            .map(|msg| msg.id);
-
-        if let Some(message_id) = last_assistant_message_id {
-            self.report_message_feedback(message_id, feedback, cx)
-        } else {
-            let final_project_snapshot = Self::project_snapshot(self.project.clone(), cx);
-            let serialized_thread = self.serialize(cx);
-            let thread_id = self.id().clone();
-            let client = self.project.read(cx).client();
-            self.feedback = Some(feedback);
-            cx.notify();
-
-            cx.background_spawn(async move {
-                let final_project_snapshot = final_project_snapshot.await;
-                let serialized_thread = serialized_thread.await?;
-                let thread_data = serde_json::to_value(serialized_thread)
-                    .unwrap_or_else(|_| serde_json::Value::Null);
-
-                let rating = match feedback {
-                    ThreadFeedback::Positive => "positive",
-                    ThreadFeedback::Negative => "negative",
-                };
-                telemetry::event!(
-                    "Assistant Thread Rated",
-                    rating,
-                    thread_id,
-                    thread_data,
-                    final_project_snapshot
-                );
-                client.telemetry().flush_events().await;
-
-                Ok(())
-            })
-        }
-    }
-
     /// Create a snapshot of the current project state including git information and unsaved buffers.
     fn project_snapshot(
         project: Entity<Project>,
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 1fa307511f..2f5f15399e 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -948,11 +948,36 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         })
     }
 
+    fn telemetry(&self) -> Option<Rc<dyn acp_thread::AgentTelemetry>> {
+        Some(Rc::new(self.clone()) as Rc<dyn acp_thread::AgentTelemetry>)
+    }
+
     fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
         self
     }
 }
 
+impl acp_thread::AgentTelemetry for NativeAgentConnection {
+    fn agent_name(&self) -> String {
+        "Zed".into()
+    }
+
+    fn thread_data(
+        &self,
+        session_id: &acp::SessionId,
+        cx: &mut App,
+    ) -> Task<Result<serde_json::Value>> {
+        let Some(session) = self.0.read(cx).sessions.get(session_id) else {
+            return Task::ready(Err(anyhow!("Session not found")));
+        };
+
+        let task = session.thread.read(cx).to_db(cx);
+        cx.background_spawn(async move {
+            serde_json::to_value(task.await).context("Failed to serialize thread")
+        })
+    }
+}
+
 struct NativeAgentSessionEditor {
     thread: Entity<Thread>,
     acp_thread: WeakEntity<AcpThread>,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 87fe133bba..4ce55cce56 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -65,6 +65,12 @@ const RESPONSE_PADDING_X: Pixels = px(19.);
 pub const MIN_EDITOR_LINES: usize = 4;
 pub const MAX_EDITOR_LINES: usize = 8;
 
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+enum ThreadFeedback {
+    Positive,
+    Negative,
+}
+
 enum ThreadError {
     PaymentRequired,
     ModelRequestLimitReached(cloud_llm_client::Plan),
@@ -106,6 +112,128 @@ impl ProfileProvider for Entity<agent2::Thread> {
     }
 }
 
+#[derive(Default)]
+struct ThreadFeedbackState {
+    feedback: Option<ThreadFeedback>,
+    comments_editor: Option<Entity<Editor>>,
+}
+
+impl ThreadFeedbackState {
+    pub fn submit(
+        &mut self,
+        thread: Entity<AcpThread>,
+        feedback: ThreadFeedback,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        let Some(telemetry) = thread.read(cx).connection().telemetry() else {
+            return;
+        };
+
+        if self.feedback == Some(feedback) {
+            return;
+        }
+
+        self.feedback = Some(feedback);
+        match feedback {
+            ThreadFeedback::Positive => {
+                self.comments_editor = None;
+            }
+            ThreadFeedback::Negative => {
+                self.comments_editor = Some(Self::build_feedback_comments_editor(window, cx));
+            }
+        }
+        let session_id = thread.read(cx).session_id().clone();
+        let agent_name = telemetry.agent_name();
+        let task = telemetry.thread_data(&session_id, cx);
+        let rating = match feedback {
+            ThreadFeedback::Positive => "positive",
+            ThreadFeedback::Negative => "negative",
+        };
+        cx.background_spawn(async move {
+            let thread = task.await?;
+            telemetry::event!(
+                "Agent Thread Rated",
+                session_id = session_id,
+                rating = rating,
+                agent = agent_name,
+                thread = thread
+            );
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
+    pub fn submit_comments(&mut self, thread: Entity<AcpThread>, cx: &mut App) {
+        let Some(telemetry) = thread.read(cx).connection().telemetry() else {
+            return;
+        };
+
+        let Some(comments) = self
+            .comments_editor
+            .as_ref()
+            .map(|editor| editor.read(cx).text(cx))
+            .filter(|text| !text.trim().is_empty())
+        else {
+            return;
+        };
+
+        self.comments_editor.take();
+
+        let session_id = thread.read(cx).session_id().clone();
+        let agent_name = telemetry.agent_name();
+        let task = telemetry.thread_data(&session_id, cx);
+        cx.background_spawn(async move {
+            let thread = task.await?;
+            telemetry::event!(
+                "Agent Thread Feedback Comments",
+                session_id = session_id,
+                comments = comments,
+                agent = agent_name,
+                thread = thread
+            );
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
+    pub fn clear(&mut self) {
+        *self = Self::default()
+    }
+
+    pub fn dismiss_comments(&mut self) {
+        self.comments_editor.take();
+    }
+
+    fn build_feedback_comments_editor(window: &mut Window, cx: &mut App) -> Entity<Editor> {
+        let buffer = cx.new(|cx| {
+            let empty_string = String::new();
+            MultiBuffer::singleton(cx.new(|cx| Buffer::local(empty_string, cx)), cx)
+        });
+
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::new(
+                editor::EditorMode::AutoHeight {
+                    min_lines: 1,
+                    max_lines: Some(4),
+                },
+                buffer,
+                None,
+                window,
+                cx,
+            );
+            editor.set_placeholder_text(
+                "What went wrong? Share your feedback so we can improve.",
+                cx,
+            );
+            editor
+        });
+
+        editor.read(cx).focus_handle(cx).focus(window);
+        editor
+    }
+}
+
 pub struct AcpThreadView {
     agent: Rc<dyn AgentServer>,
     workspace: WeakEntity<Workspace>,
@@ -120,6 +248,7 @@ pub struct AcpThreadView {
     notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
     thread_retry_status: Option<RetryStatus>,
     thread_error: Option<ThreadError>,
+    thread_feedback: ThreadFeedbackState,
     list_state: ListState,
     scrollbar_state: ScrollbarState,
     auth_task: Option<Task<()>>,
@@ -218,6 +347,7 @@ impl AcpThreadView {
             scrollbar_state: ScrollbarState::new(list_state).parent_entity(&cx.entity()),
             thread_retry_status: None,
             thread_error: None,
+            thread_feedback: Default::default(),
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
             expanded_thinking_blocks: HashSet::default(),
@@ -615,6 +745,7 @@ impl AcpThreadView {
     ) {
         self.thread_error.take();
         self.editing_message.take();
+        self.thread_feedback.clear();
 
         let Some(thread) = self.thread().cloned() else {
             return;
@@ -1087,6 +1218,12 @@ impl AcpThreadView {
                 .w_full()
                 .child(primary)
                 .child(self.render_thread_controls(cx))
+                .when_some(
+                    self.thread_feedback.comments_editor.clone(),
+                    |this, editor| {
+                        this.child(Self::render_feedback_feedback_editor(editor, window, cx))
+                    },
+                )
                 .into_any_element()
         } else {
             primary
@@ -3556,7 +3693,9 @@ impl AcpThreadView {
                 this.scroll_to_top(cx);
             }));
 
-        h_flex()
+        let mut container = h_flex()
+            .id("thread-controls-container")
+            .group("thread-controls-container")
             .w_full()
             .mr_1()
             .pb_2()
@@ -3564,9 +3703,145 @@ impl AcpThreadView {
             .opacity(0.4)
             .hover(|style| style.opacity(1.))
             .flex_wrap()
-            .justify_end()
-            .child(open_as_markdown)
-            .child(scroll_to_top)
+            .justify_end();
+
+        if AgentSettings::get_global(cx).enable_feedback {
+            let feedback = self.thread_feedback.feedback;
+            container = container.child(
+                div().visible_on_hover("thread-controls-container").child(
+                    Label::new(
+                        match feedback {
+                            Some(ThreadFeedback::Positive) => "Thanks for your feedback!",
+                            Some(ThreadFeedback::Negative) => "We appreciate your feedback and will use it to improve.",
+                            None => "Rating the thread sends all of your current conversation to the Zed team.",
+                        }
+                    )
+                    .color(Color::Muted)
+                    .size(LabelSize::XSmall)
+                    .truncate(),
+                ),
+            ).child(
+                h_flex()
+                    .child(
+                        IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
+                            .shape(ui::IconButtonShape::Square)
+                            .icon_size(IconSize::Small)
+                            .icon_color(match feedback {
+                                Some(ThreadFeedback::Positive) => Color::Accent,
+                                _ => Color::Ignored,
+                            })
+                            .tooltip(Tooltip::text("Helpful Response"))
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.handle_feedback_click(
+                                    ThreadFeedback::Positive,
+                                    window,
+                                    cx,
+                                );
+                            })),
+                    )
+                    .child(
+                        IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
+                            .shape(ui::IconButtonShape::Square)
+                            .icon_size(IconSize::Small)
+                            .icon_color(match feedback {
+                                Some(ThreadFeedback::Negative) => Color::Accent,
+                                _ => Color::Ignored,
+                            })
+                            .tooltip(Tooltip::text("Not Helpful"))
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.handle_feedback_click(
+                                    ThreadFeedback::Negative,
+                                    window,
+                                    cx,
+                                );
+                            })),
+                    )
+            )
+        }
+
+        container.child(open_as_markdown).child(scroll_to_top)
+    }
+
+    fn render_feedback_feedback_editor(
+        editor: Entity<Editor>,
+        window: &mut Window,
+        cx: &Context<Self>,
+    ) -> Div {
+        let focus_handle = editor.focus_handle(cx);
+        v_flex()
+            .key_context("AgentFeedbackMessageEditor")
+            .on_action(cx.listener(move |this, _: &menu::Cancel, _, cx| {
+                this.thread_feedback.dismiss_comments();
+                cx.notify();
+            }))
+            .on_action(cx.listener(move |this, _: &menu::Confirm, _window, cx| {
+                this.submit_feedback_message(cx);
+            }))
+            .mb_2()
+            .mx_4()
+            .p_2()
+            .rounded_md()
+            .border_1()
+            .border_color(cx.theme().colors().border)
+            .bg(cx.theme().colors().editor_background)
+            .child(editor)
+            .child(
+                h_flex()
+                    .gap_1()
+                    .justify_end()
+                    .child(
+                        Button::new("dismiss-feedback-message", "Cancel")
+                            .label_size(LabelSize::Small)
+                            .key_binding(
+                                KeyBinding::for_action_in(&menu::Cancel, &focus_handle, window, cx)
+                                    .map(|kb| kb.size(rems_from_px(10.))),
+                            )
+                            .on_click(cx.listener(move |this, _, _window, cx| {
+                                this.thread_feedback.dismiss_comments();
+                                cx.notify();
+                            })),
+                    )
+                    .child(
+                        Button::new("submit-feedback-message", "Share Feedback")
+                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
+                            .label_size(LabelSize::Small)
+                            .key_binding(
+                                KeyBinding::for_action_in(
+                                    &menu::Confirm,
+                                    &focus_handle,
+                                    window,
+                                    cx,
+                                )
+                                .map(|kb| kb.size(rems_from_px(10.))),
+                            )
+                            .on_click(cx.listener(move |this, _, _window, cx| {
+                                this.submit_feedback_message(cx);
+                            })),
+                    ),
+            )
+    }
+
+    fn handle_feedback_click(
+        &mut self,
+        feedback: ThreadFeedback,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(thread) = self.thread().cloned() else {
+            return;
+        };
+
+        self.thread_feedback.submit(thread, feedback, window, cx);
+        cx.notify();
+    }
+
+    fn submit_feedback_message(&mut self, cx: &mut Context<Self>) {
+        let Some(thread) = self.thread().cloned() else {
+            return;
+        };
+
+        self.thread_feedback.submit_comments(thread, cx);
+        cx.notify();
     }
 
     fn render_vertical_scrollbar(&self, cx: &mut Context<Self>) -> Stateful<Div> {
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index e214986b82..2cad913295 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -2349,7 +2349,6 @@ impl ActiveThread {
                                     this.submit_feedback_message(message_id, cx);
                                     cx.notify();
                                 }))
-                                .on_action(cx.listener(Self::confirm_editing_message))
                                 .mb_2()
                                 .mx_4()
                                 .p_2()

From 41e28a71855c9e5595d3764423e56517e5315931 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 20 Aug 2025 14:01:18 -0400
Subject: [PATCH 219/823] Add tracked buffers for agent2 mentions (#36608)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/message_editor.rs | 151 ++++++++++++++--------
 crates/agent_ui/src/acp/thread_view.rs    |  13 +-
 2 files changed, 107 insertions(+), 57 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index a50e33dc31..ccd33c9247 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -34,7 +34,7 @@ use settings::Settings;
 use std::{
     cell::Cell,
     ffi::OsStr,
-    fmt::{Display, Write},
+    fmt::Write,
     ops::Range,
     path::{Path, PathBuf},
     rc::Rc,
@@ -391,30 +391,33 @@ impl MessageEditor {
                         let rope = buffer
                             .read_with(cx, |buffer, _cx| buffer.as_rope().clone())
                             .log_err()?;
-                        Some(rope)
+                        Some((rope, buffer))
                     });
 
                     cx.background_spawn(async move {
-                        let rope = rope_task.await?;
-                        Some((rel_path, full_path, rope.to_string()))
+                        let (rope, buffer) = rope_task.await?;
+                        Some((rel_path, full_path, rope.to_string(), buffer))
                     })
                 }))
             })?;
 
             let contents = cx
                 .background_spawn(async move {
-                    let contents = descendants_future.await.into_iter().flatten();
-                    contents.collect()
+                    let (contents, tracked_buffers) = descendants_future
+                        .await
+                        .into_iter()
+                        .flatten()
+                        .map(|(rel_path, full_path, rope, buffer)| {
+                            ((rel_path, full_path, rope), buffer)
+                        })
+                        .unzip();
+                    (render_directory_contents(contents), tracked_buffers)
                 })
                 .await;
             anyhow::Ok(contents)
         });
         let task = cx
-            .spawn(async move |_, _| {
-                task.await
-                    .map(|contents| DirectoryContents(contents).to_string())
-                    .map_err(|e| e.to_string())
-            })
+            .spawn(async move |_, _| task.await.map_err(|e| e.to_string()))
             .shared();
 
         self.mention_set
@@ -663,7 +666,7 @@ impl MessageEditor {
         &self,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<acp::ContentBlock>>> {
+    ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
         let contents =
             self.mention_set
                 .contents(&self.project, self.prompt_store.as_ref(), window, cx);
@@ -672,6 +675,7 @@ impl MessageEditor {
 
         cx.spawn(async move |_, cx| {
             let contents = contents.await?;
+            let mut all_tracked_buffers = Vec::new();
 
             editor.update(cx, |editor, cx| {
                 let mut ix = 0;
@@ -702,7 +706,12 @@ impl MessageEditor {
                             chunks.push(chunk);
                         }
                         let chunk = match mention {
-                            Mention::Text { uri, content } => {
+                            Mention::Text {
+                                uri,
+                                content,
+                                tracked_buffers,
+                            } => {
+                                all_tracked_buffers.extend(tracked_buffers.iter().cloned());
                                 acp::ContentBlock::Resource(acp::EmbeddedResource {
                                     annotations: None,
                                     resource: acp::EmbeddedResourceResource::TextResourceContents(
@@ -745,7 +754,7 @@ impl MessageEditor {
                     }
                 });
 
-                chunks
+                (chunks, all_tracked_buffers)
             })
         })
     }
@@ -1043,7 +1052,7 @@ impl MessageEditor {
                         .add_fetch_result(url, Task::ready(Ok(text)).shared());
                 }
                 MentionUri::Directory { abs_path } => {
-                    let task = Task::ready(Ok(text)).shared();
+                    let task = Task::ready(Ok((text, Vec::new()))).shared();
                     self.mention_set.directories.insert(abs_path, task);
                 }
                 MentionUri::File { .. }
@@ -1153,16 +1162,13 @@ impl MessageEditor {
     }
 }
 
-struct DirectoryContents(Arc<[(Arc<Path>, PathBuf, String)]>);
-
-impl Display for DirectoryContents {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for (_relative_path, full_path, content) in self.0.iter() {
-            let fence = codeblock_fence_for_path(Some(full_path), None);
-            write!(f, "\n{fence}\n{content}\n```")?;
-        }
-        Ok(())
+fn render_directory_contents(entries: Vec<(Arc<Path>, PathBuf, String)>) -> String {
+    let mut output = String::new();
+    for (_relative_path, full_path, content) in entries {
+        let fence = codeblock_fence_for_path(Some(&full_path), None);
+        write!(output, "\n{fence}\n{content}\n```").unwrap();
     }
+    output
 }
 
 impl Focusable for MessageEditor {
@@ -1328,7 +1334,11 @@ impl Render for ImageHover {
 
 #[derive(Debug, Eq, PartialEq)]
 pub enum Mention {
-    Text { uri: MentionUri, content: String },
+    Text {
+        uri: MentionUri,
+        content: String,
+        tracked_buffers: Vec<Entity<Buffer>>,
+    },
     Image(MentionImage),
 }
 
@@ -1346,7 +1356,7 @@ pub struct MentionSet {
     images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
     thread_summaries: HashMap<acp::SessionId, Shared<Task<Result<SharedString, String>>>>,
     text_thread_summaries: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
-    directories: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
+    directories: HashMap<PathBuf, Shared<Task<Result<(String, Vec<Entity<Buffer>>), String>>>>,
 }
 
 impl MentionSet {
@@ -1382,6 +1392,7 @@ impl MentionSet {
         self.fetch_results.clear();
         self.thread_summaries.clear();
         self.text_thread_summaries.clear();
+        self.directories.clear();
         self.uri_by_crease_id
             .drain()
             .map(|(id, _)| id)
@@ -1424,7 +1435,14 @@ impl MentionSet {
                             let buffer = buffer_task?.await?;
                             let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
 
-                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                            anyhow::Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content,
+                                    tracked_buffers: vec![buffer],
+                                },
+                            ))
                         })
                     }
                     MentionUri::Directory { abs_path } => {
@@ -1433,11 +1451,14 @@ impl MentionSet {
                         };
                         let uri = uri.clone();
                         cx.spawn(async move |_| {
+                            let (content, tracked_buffers) =
+                                content.await.map_err(|e| anyhow::anyhow!("{e}"))?;
                             Ok((
                                 crease_id,
                                 Mention::Text {
                                     uri,
-                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
+                                    content,
+                                    tracked_buffers,
                                 },
                             ))
                         })
@@ -1473,7 +1494,14 @@ impl MentionSet {
                                     .collect()
                             })?;
 
-                            anyhow::Ok((crease_id, Mention::Text { uri, content }))
+                            anyhow::Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content,
+                                    tracked_buffers: vec![buffer],
+                                },
+                            ))
                         })
                     }
                     MentionUri::Thread { id, .. } => {
@@ -1490,6 +1518,7 @@ impl MentionSet {
                                         .await
                                         .map_err(|e| anyhow::anyhow!("{e}"))?
                                         .to_string(),
+                                    tracked_buffers: Vec::new(),
                                 },
                             ))
                         })
@@ -1505,6 +1534,7 @@ impl MentionSet {
                                 Mention::Text {
                                     uri,
                                     content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
+                                    tracked_buffers: Vec::new(),
                                 },
                             ))
                         })
@@ -1518,7 +1548,14 @@ impl MentionSet {
                         cx.spawn(async move |_| {
                             // TODO: report load errors instead of just logging
                             let text = text_task.await?;
-                            anyhow::Ok((crease_id, Mention::Text { uri, content: text }))
+                            anyhow::Ok((
+                                crease_id,
+                                Mention::Text {
+                                    uri,
+                                    content: text,
+                                    tracked_buffers: Vec::new(),
+                                },
+                            ))
                         })
                     }
                     MentionUri::Fetch { url } => {
@@ -1532,6 +1569,7 @@ impl MentionSet {
                                 Mention::Text {
                                     uri,
                                     content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
+                                    tracked_buffers: Vec::new(),
                                 },
                             ))
                         })
@@ -1703,6 +1741,7 @@ impl Addon for MessageEditorAddon {
 mod tests {
     use std::{ops::Range, path::Path, sync::Arc};
 
+    use acp_thread::MentionUri;
     use agent_client_protocol as acp;
     use agent2::HistoryStore;
     use assistant_context::ContextStore;
@@ -1815,7 +1854,7 @@ mod tests {
             editor.backspace(&Default::default(), window, cx);
         });
 
-        let content = message_editor
+        let (content, _) = message_editor
             .update_in(cx, |message_editor, window, cx| {
                 message_editor.contents(window, cx)
             })
@@ -2046,13 +2085,13 @@ mod tests {
             .into_values()
             .collect::<Vec<_>>();
 
-        pretty_assertions::assert_eq!(
-            contents,
-            [Mention::Text {
-                content: "1".into(),
-                uri: url_one.parse().unwrap()
-            }]
-        );
+        {
+            let [Mention::Text { content, uri, .. }] = contents.as_slice() else {
+                panic!("Unexpected mentions");
+            };
+            pretty_assertions::assert_eq!(content, "1");
+            pretty_assertions::assert_eq!(uri, &url_one.parse::<MentionUri>().unwrap());
+        }
 
         cx.simulate_input(" ");
 
@@ -2098,15 +2137,15 @@ mod tests {
             .into_values()
             .collect::<Vec<_>>();
 
-        assert_eq!(contents.len(), 2);
         let url_eight = uri!("file:///dir/b/eight.txt");
-        pretty_assertions::assert_eq!(
-            contents[1],
-            Mention::Text {
-                content: "8".to_string(),
-                uri: url_eight.parse().unwrap(),
-            }
-        );
+
+        {
+            let [_, Mention::Text { content, uri, .. }] = contents.as_slice() else {
+                panic!("Unexpected mentions");
+            };
+            pretty_assertions::assert_eq!(content, "8");
+            pretty_assertions::assert_eq!(uri, &url_eight.parse::<MentionUri>().unwrap());
+        }
 
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
@@ -2208,14 +2247,18 @@ mod tests {
             .into_values()
             .collect::<Vec<_>>();
 
-        assert_eq!(contents.len(), 3);
-        pretty_assertions::assert_eq!(
-            contents[2],
-            Mention::Text {
-                content: "1".into(),
-                uri: format!("{url_one}?symbol=MySymbol#L1:1").parse().unwrap(),
-            }
-        );
+        {
+            let [_, _, Mention::Text { content, uri, .. }] = contents.as_slice() else {
+                panic!("Unexpected mentions");
+            };
+            pretty_assertions::assert_eq!(content, "1");
+            pretty_assertions::assert_eq!(
+                uri,
+                &format!("{url_one}?symbol=MySymbol#L1:1")
+                    .parse::<MentionUri>()
+                    .unwrap()
+            );
+        }
 
         cx.run_until_parked();
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 4ce55cce56..14f9cacd15 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -739,7 +739,7 @@ impl AcpThreadView {
 
     fn send_impl(
         &mut self,
-        contents: Task<anyhow::Result<Vec<acp::ContentBlock>>>,
+        contents: Task<anyhow::Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -751,7 +751,7 @@ impl AcpThreadView {
             return;
         };
         let task = cx.spawn_in(window, async move |this, cx| {
-            let contents = contents.await?;
+            let (contents, tracked_buffers) = contents.await?;
 
             if contents.is_empty() {
                 return Ok(());
@@ -764,7 +764,14 @@ impl AcpThreadView {
                     message_editor.clear(window, cx);
                 });
             })?;
-            let send = thread.update(cx, |thread, cx| thread.send(contents, cx))?;
+            let send = thread.update(cx, |thread, cx| {
+                thread.action_log().update(cx, |action_log, cx| {
+                    for buffer in tracked_buffers {
+                        action_log.buffer_read(buffer, cx)
+                    }
+                });
+                thread.send(contents, cx)
+            })?;
             send.await
         });
 

From ec8106d1dbe8937a0b0cf7c9250b1491c22c1338 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 20 Aug 2025 23:44:30 +0530
Subject: [PATCH 220/823] Fix `clippy::println_empty_string`,
 `clippy::while_let_on_iterator`, `clippy::while_let_on_iterator` lint style
 violations (#36613)

Related: #36577

Release Notes:

- N/A
---
 Cargo.toml                                    | 3 +++
 crates/agent/src/context.rs                   | 6 +++---
 crates/agent2/src/thread.rs                   | 2 +-
 crates/buffer_diff/src/buffer_diff.rs         | 4 ++--
 crates/editor/src/display_map/block_map.rs    | 4 ++--
 crates/editor/src/editor.rs                   | 4 ++--
 crates/editor/src/indent_guides.rs            | 4 ++--
 crates/editor/src/items.rs                    | 4 ++--
 crates/eval/src/eval.rs                       | 2 +-
 crates/eval/src/instance.rs                   | 4 ++--
 crates/git/src/repository.rs                  | 2 +-
 crates/language/src/text_diff.rs              | 2 +-
 crates/multi_buffer/src/multi_buffer_tests.rs | 4 ++--
 crates/project/src/git_store/git_traversal.rs | 4 ++--
 crates/project/src/lsp_store.rs               | 4 ++--
 crates/settings/src/settings_json.rs          | 2 +-
 crates/tab_switcher/src/tab_switcher.rs       | 2 +-
 crates/terminal_view/src/terminal_view.rs     | 4 ++--
 crates/vim/src/command.rs                     | 2 +-
 crates/vim/src/normal/increment.rs            | 4 ++--
 20 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a2de4aaaed..6218e8dbb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -904,6 +904,7 @@ ok_expect = "warn"
 owned_cow = "warn"
 print_literal = "warn"
 print_with_newline = "warn"
+println_empty_string = "warn"
 ptr_eq = "warn"
 question_mark = "warn"
 redundant_closure = "warn"
@@ -924,7 +925,9 @@ unneeded_struct_pattern = "warn"
 unsafe_removed_from_name = "warn"
 unused_unit = "warn"
 unusual_byte_groupings = "warn"
+while_let_on_iterator = "warn"
 write_literal = "warn"
+write_with_newline = "warn"
 writeln_empty_string = "warn"
 wrong_self_convention = "warn"
 zero_ptr = "warn"
diff --git a/crates/agent/src/context.rs b/crates/agent/src/context.rs
index 9bb8fc0eae..a94a933d86 100644
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -362,7 +362,7 @@ impl Display for DirectoryContext {
         let mut is_first = true;
         for descendant in &self.descendants {
             if !is_first {
-                write!(f, "\n")?;
+                writeln!(f)?;
             } else {
                 is_first = false;
             }
@@ -650,7 +650,7 @@ impl TextThreadContextHandle {
 impl Display for TextThreadContext {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         // TODO: escape title?
-        write!(f, "<text_thread title=\"{}\">\n", self.title)?;
+        writeln!(f, "<text_thread title=\"{}\">", self.title)?;
         write!(f, "{}", self.text.trim())?;
         write!(f, "\n</text_thread>")
     }
@@ -716,7 +716,7 @@ impl RulesContextHandle {
 impl Display for RulesContext {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if let Some(title) = &self.title {
-            write!(f, "Rules title: {}\n", title)?;
+            writeln!(f, "Rules title: {}", title)?;
         }
         let code_block = MarkdownCodeBlock {
             tag: "",
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index f407ee7de5..01c9ab03ba 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -163,7 +163,7 @@ impl UserMessage {
                     if !content.is_empty() {
                         let _ = write!(&mut markdown, "{}\n\n{}\n", uri.as_link(), content);
                     } else {
-                        let _ = write!(&mut markdown, "{}\n", uri.as_link());
+                        let _ = writeln!(&mut markdown, "{}", uri.as_link());
                     }
                 }
             }
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index bef0c5cfc3..10b59d0ba2 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -2024,8 +2024,8 @@ mod tests {
         fn gen_working_copy(rng: &mut StdRng, head: &str) -> String {
             let mut old_lines = {
                 let mut old_lines = Vec::new();
-                let mut old_lines_iter = head.lines();
-                while let Some(line) = old_lines_iter.next() {
+                let old_lines_iter = head.lines();
+                for line in old_lines_iter {
                     assert!(!line.ends_with("\n"));
                     old_lines.push(line.to_owned());
                 }
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 1e0cdc34ac..e32a4e45db 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -3183,9 +3183,9 @@ mod tests {
             // so we special case row 0 to assume a leading '\n'.
             //
             // Linehood is the birthright of strings.
-            let mut input_text_lines = input_text.split('\n').enumerate().peekable();
+            let input_text_lines = input_text.split('\n').enumerate().peekable();
             let mut block_row = 0;
-            while let Some((wrap_row, input_line)) = input_text_lines.next() {
+            for (wrap_row, input_line) in input_text_lines {
                 let wrap_row = wrap_row as u32;
                 let multibuffer_row = wraps_snapshot
                     .to_point(WrapPoint::new(wrap_row, 0), Bias::Left)
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2136d5f4b3..45a90b843b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11021,7 +11021,7 @@ impl Editor {
                 let mut col = 0;
                 let mut changed = false;
 
-                while let Some(ch) = chars.next() {
+                for ch in chars.by_ref() {
                     match ch {
                         ' ' => {
                             reindented_line.push(' ');
@@ -11077,7 +11077,7 @@ impl Editor {
                 let mut first_non_indent_char = None;
                 let mut changed = false;
 
-                while let Some(ch) = chars.next() {
+                for ch in chars.by_ref() {
                     match ch {
                         ' ' => {
                             // Keep track of spaces. Append \t when we reach tab_size
diff --git a/crates/editor/src/indent_guides.rs b/crates/editor/src/indent_guides.rs
index a1de2b604b..23717eeb15 100644
--- a/crates/editor/src/indent_guides.rs
+++ b/crates/editor/src/indent_guides.rs
@@ -164,8 +164,8 @@ pub fn indent_guides_in_range(
     let end_anchor = snapshot.buffer_snapshot.anchor_after(end_offset);
 
     let mut fold_ranges = Vec::<Range<Point>>::new();
-    let mut folds = snapshot.folds_in_range(start_offset..end_offset).peekable();
-    while let Some(fold) = folds.next() {
+    let folds = snapshot.folds_in_range(start_offset..end_offset).peekable();
+    for fold in folds {
         let start = fold.range.start.to_point(&snapshot.buffer_snapshot);
         let end = fold.range.end.to_point(&snapshot.buffer_snapshot);
         if let Some(last_range) = fold_ranges.last_mut()
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 62889c638f..afc5767de0 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -103,9 +103,9 @@ impl FollowableItem for Editor {
                         multibuffer = MultiBuffer::new(project.read(cx).capability());
                         let mut sorted_excerpts = state.excerpts.clone();
                         sorted_excerpts.sort_by_key(|e| e.id);
-                        let mut sorted_excerpts = sorted_excerpts.into_iter().peekable();
+                        let sorted_excerpts = sorted_excerpts.into_iter().peekable();
 
-                        while let Some(excerpt) = sorted_excerpts.next() {
+                        for excerpt in sorted_excerpts {
                             let Ok(buffer_id) = BufferId::new(excerpt.buffer_id) else {
                                 continue;
                             };
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index c5a072eea1..9e0504abca 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -706,7 +706,7 @@ fn print_report(
             println!("Average thread score: {average_thread_score}%");
         }
 
-        println!("");
+        println!();
 
         print_h2("CUMULATIVE TOOL METRICS");
         println!("{}", cumulative_tool_metrics);
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
index 074cb121d3..c6e4e0b6ec 100644
--- a/crates/eval/src/instance.rs
+++ b/crates/eval/src/instance.rs
@@ -913,9 +913,9 @@ impl RequestMarkdown {
             for tool in &request.tools {
                 write!(&mut tools, "# {}\n\n", tool.name).unwrap();
                 write!(&mut tools, "{}\n\n", tool.description).unwrap();
-                write!(
+                writeln!(
                     &mut tools,
-                    "{}\n",
+                    "{}",
                     MarkdownCodeBlock {
                         tag: "json",
                         text: &format!("{:#}", tool.input_schema)
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 9c125d2c47..fd12dafa98 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -916,7 +916,7 @@ impl GitRepository for RealGitRepository {
                     .context("no stdin for git cat-file subprocess")?;
                 let mut stdin = BufWriter::new(stdin);
                 for rev in &revs {
-                    write!(&mut stdin, "{rev}\n")?;
+                    writeln!(&mut stdin, "{rev}")?;
                 }
                 stdin.flush()?;
                 drop(stdin);
diff --git a/crates/language/src/text_diff.rs b/crates/language/src/text_diff.rs
index cb2242a6b1..11d8a070d2 100644
--- a/crates/language/src/text_diff.rs
+++ b/crates/language/src/text_diff.rs
@@ -186,7 +186,7 @@ fn tokenize(text: &str, language_scope: Option<LanguageScope>) -> impl Iterator<
     let mut prev = None;
     let mut start_ix = 0;
     iter::from_fn(move || {
-        while let Some((ix, c)) = chars.next() {
+        for (ix, c) in chars.by_ref() {
             let mut token = None;
             let kind = classifier.kind(c);
             if let Some((prev_char, prev_kind)) = prev
diff --git a/crates/multi_buffer/src/multi_buffer_tests.rs b/crates/multi_buffer/src/multi_buffer_tests.rs
index 598ee0f9cb..61b4b0520f 100644
--- a/crates/multi_buffer/src/multi_buffer_tests.rs
+++ b/crates/multi_buffer/src/multi_buffer_tests.rs
@@ -2250,11 +2250,11 @@ impl ReferenceMultibuffer {
             let base_buffer = diff.base_text();
 
             let mut offset = buffer_range.start;
-            let mut hunks = diff
+            let hunks = diff
                 .hunks_intersecting_range(excerpt.range.clone(), buffer, cx)
                 .peekable();
 
-            while let Some(hunk) = hunks.next() {
+            for hunk in hunks {
                 // Ignore hunks that are outside the excerpt range.
                 let mut hunk_range = hunk.buffer_range.to_offset(buffer);
 
diff --git a/crates/project/src/git_store/git_traversal.rs b/crates/project/src/git_store/git_traversal.rs
index 9eadaeac82..eee492e482 100644
--- a/crates/project/src/git_store/git_traversal.rs
+++ b/crates/project/src/git_store/git_traversal.rs
@@ -42,8 +42,8 @@ impl<'a> GitTraversal<'a> {
         //   other_repo/
         //     .git/
         //   our_query.txt
-        let mut query = path.ancestors();
-        while let Some(query) = query.next() {
+        let query = path.ancestors();
+        for query in query {
             let (_, snapshot) = self
                 .repo_root_to_snapshot
                 .range(Path::new("")..=query)
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 1b46117897..0b58009f37 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -13149,10 +13149,10 @@ fn ensure_uniform_list_compatible_label(label: &mut CodeLabel) {
     let mut offset_map = vec![0; label.text.len() + 1];
     let mut last_char_was_space = false;
     let mut new_idx = 0;
-    let mut chars = label.text.char_indices().fuse();
+    let chars = label.text.char_indices().fuse();
     let mut newlines_removed = false;
 
-    while let Some((idx, c)) = chars.next() {
+    for (idx, c) in chars {
         offset_map[idx] = new_idx;
 
         match c {
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index 8080ec8d5f..f112ec811d 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -209,7 +209,7 @@ fn replace_value_in_json_text(
                     if ch == ',' {
                         removal_end = existing_value_range.end + offset + 1;
                         // Also consume whitespace after the comma
-                        while let Some((_, next_ch)) = chars.next() {
+                        for (_, next_ch) in chars.by_ref() {
                             if next_ch.is_whitespace() {
                                 removal_end += next_ch.len_utf8();
                             } else {
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 12af124ec7..655b8a2e8f 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -307,7 +307,7 @@ impl TabSwitcherDelegate {
                     (Reverse(history.get(&item.item.item_id())), item.item_index)
                 )
             }
-            eprintln!("");
+            eprintln!();
             all_items
                 .sort_by_key(|tab| (Reverse(history.get(&tab.item.item_id())), tab.item_index));
             all_items
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 0c16e3fb9d..5b4d327140 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1397,8 +1397,8 @@ fn possible_open_target(
             let found_entry = worktree
                 .update(cx, |worktree, _| {
                     let worktree_root = worktree.abs_path();
-                    let mut traversal = worktree.traverse_from_path(true, true, false, "".as_ref());
-                    while let Some(entry) = traversal.next() {
+                    let traversal = worktree.traverse_from_path(true, true, false, "".as_ref());
+                    for entry in traversal {
                         if let Some(path_in_worktree) = worktree_paths_to_check
                             .iter()
                             .find(|path_to_check| entry.path.ends_with(&path_to_check.path))
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 79d18a85e9..b57c916db9 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1492,7 +1492,7 @@ impl OnMatchingLines {
         let mut search = String::new();
         let mut escaped = false;
 
-        while let Some(c) = chars.next() {
+        for c in chars.by_ref() {
             if escaped {
                 escaped = false;
                 // unescape escaped parens
diff --git a/crates/vim/src/normal/increment.rs b/crates/vim/src/normal/increment.rs
index 115aef1dab..1d2a4e9b61 100644
--- a/crates/vim/src/normal/increment.rs
+++ b/crates/vim/src/normal/increment.rs
@@ -274,9 +274,9 @@ fn find_boolean(snapshot: &MultiBufferSnapshot, start: Point) -> Option<(Range<P
     let mut end = None;
     let mut word = String::new();
 
-    let mut chars = snapshot.chars_at(offset);
+    let chars = snapshot.chars_at(offset);
 
-    while let Some(ch) = chars.next() {
+    for ch in chars {
         if ch.is_ascii_alphabetic() {
             if begin.is_none() {
                 begin = Some(offset);

From b6722ca3c8de3921f150e83294e84fbc9bdb9016 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 20 Aug 2025 14:43:29 -0400
Subject: [PATCH 221/823] Remove special case for singleton buffers from
 `MultiBufferSnapshot::anchor_at` (#36524)

This may be responsible for a panic that we've been seeing with
increased frequency in agent2 threads.

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/editor/src/editor.rs             |  8 +--
 crates/multi_buffer/src/multi_buffer.rs | 66 +++++++++++++++----------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 45a90b843b..25fddf5cf1 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4876,11 +4876,7 @@ impl Editor {
         cx: &mut Context<Self>,
     ) -> bool {
         let position = self.selections.newest_anchor().head();
-        let multibuffer = self.buffer.read(cx);
-        let Some(buffer) = position
-            .buffer_id
-            .and_then(|buffer_id| multibuffer.buffer(buffer_id))
-        else {
+        let Some(buffer) = self.buffer.read(cx).buffer_for_anchor(position, cx) else {
             return false;
         };
 
@@ -5844,7 +5840,7 @@ impl Editor {
             multibuffer_anchor.start.to_offset(&snapshot)
                 ..multibuffer_anchor.end.to_offset(&snapshot)
         };
-        if newest_anchor.head().buffer_id != Some(buffer.remote_id()) {
+        if snapshot.buffer_id_for_anchor(newest_anchor.head()) != Some(buffer.remote_id()) {
             return None;
         }
 
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 60e9c14c34..f73014a6ff 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2196,6 +2196,15 @@ impl MultiBuffer {
             })
     }
 
+    pub fn buffer_for_anchor(&self, anchor: Anchor, cx: &App) -> Option<Entity<Buffer>> {
+        if let Some(buffer_id) = anchor.buffer_id {
+            self.buffer(buffer_id)
+        } else {
+            let (_, buffer, _) = self.excerpt_containing(anchor, cx)?;
+            Some(buffer)
+        }
+    }
+
     // If point is at the end of the buffer, the last excerpt is returned
     pub fn point_to_buffer_offset<T: ToOffset>(
         &self,
@@ -5228,15 +5237,6 @@ impl MultiBufferSnapshot {
             excerpt_offset += ExcerptOffset::new(offset_in_transform);
         };
 
-        if let Some((excerpt_id, buffer_id, buffer)) = self.as_singleton() {
-            return Anchor {
-                buffer_id: Some(buffer_id),
-                excerpt_id: *excerpt_id,
-                text_anchor: buffer.anchor_at(excerpt_offset.value, bias),
-                diff_base_anchor,
-            };
-        }
-
         let mut excerpts = self
             .excerpts
             .cursor::<Dimensions<ExcerptOffset, Option<ExcerptId>>>(&());
@@ -5260,10 +5260,17 @@ impl MultiBufferSnapshot {
                 text_anchor,
                 diff_base_anchor,
             }
-        } else if excerpt_offset.is_zero() && bias == Bias::Left {
-            Anchor::min()
         } else {
-            Anchor::max()
+            let mut anchor = if excerpt_offset.is_zero() && bias == Bias::Left {
+                Anchor::min()
+            } else {
+                Anchor::max()
+            };
+            // TODO this is a hack, remove it
+            if let Some((excerpt_id, _, _)) = self.as_singleton() {
+                anchor.excerpt_id = *excerpt_id;
+            }
+            anchor
         }
     }
 
@@ -6305,6 +6312,14 @@ impl MultiBufferSnapshot {
         })
     }
 
+    pub fn buffer_id_for_anchor(&self, anchor: Anchor) -> Option<BufferId> {
+        if let Some(id) = anchor.buffer_id {
+            return Some(id);
+        }
+        let excerpt = self.excerpt_containing(anchor..anchor)?;
+        Some(excerpt.buffer_id())
+    }
+
     pub fn selections_in_range<'a>(
         &'a self,
         range: &'a Range<Anchor>,
@@ -6983,19 +6998,20 @@ impl Excerpt {
     }
 
     fn contains(&self, anchor: &Anchor) -> bool {
-        Some(self.buffer_id) == anchor.buffer_id
-            && self
-                .range
-                .context
-                .start
-                .cmp(&anchor.text_anchor, &self.buffer)
-                .is_le()
-            && self
-                .range
-                .context
-                .end
-                .cmp(&anchor.text_anchor, &self.buffer)
-                .is_ge()
+        anchor.buffer_id == None
+            || anchor.buffer_id == Some(self.buffer_id)
+                && self
+                    .range
+                    .context
+                    .start
+                    .cmp(&anchor.text_anchor, &self.buffer)
+                    .is_le()
+                && self
+                    .range
+                    .context
+                    .end
+                    .cmp(&anchor.text_anchor, &self.buffer)
+                    .is_ge()
     }
 
     /// The [`Excerpt`]'s start offset in its [`Buffer`]

From 74ce543d8b16c33fb418db668ae403909eed4c2e Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Wed, 20 Aug 2025 20:45:40 +0200
Subject: [PATCH 222/823] clippy: println_empty_string & non_minimal_cfg
 (#36614)

- **clippy: Fix println-empty-string**
- **clippy: non-minimal-cfg**

Related to #36577

Release Notes:
- N/A
---
 Cargo.toml                                         |  1 +
 crates/agent2/src/thread.rs                        |  2 +-
 crates/gpui/src/taffy.rs                           |  1 -
 .../tests/derive_inspector_reflection.rs           | 14 +-------------
 crates/tab_switcher/src/tab_switcher.rs            |  1 -
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6218e8dbb9..dcf07b7079 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -900,6 +900,7 @@ needless_parens_on_range_literals = "warn"
 needless_pub_self = "warn"
 needless_return = "warn"
 needless_return_with_question_mark = "warn"
+non_minimal_cfg = "warn"
 ok_expect = "warn"
 owned_cow = "warn"
 print_literal = "warn"
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 01c9ab03ba..62174fd3b4 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -161,7 +161,7 @@ impl UserMessage {
                 }
                 UserMessageContent::Mention { uri, content } => {
                     if !content.is_empty() {
-                        let _ = write!(&mut markdown, "{}\n\n{}\n", uri.as_link(), content);
+                        let _ = writeln!(&mut markdown, "{}\n\n{}", uri.as_link(), content);
                     } else {
                         let _ = writeln!(&mut markdown, "{}", uri.as_link());
                     }
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index f198bb7718..58386ad1f5 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -164,7 +164,6 @@ impl TaffyLayoutEngine {
         // for (a, b) in self.get_edges(id)? {
         //     println!("N{} --> N{}", u64::from(a), u64::from(b));
         // }
-        // println!("");
         //
 
         if !self.computed_layouts.insert(id) {
diff --git a/crates/gpui_macros/tests/derive_inspector_reflection.rs b/crates/gpui_macros/tests/derive_inspector_reflection.rs
index aab44a70ce..a0adcb7801 100644
--- a/crates/gpui_macros/tests/derive_inspector_reflection.rs
+++ b/crates/gpui_macros/tests/derive_inspector_reflection.rs
@@ -34,13 +34,6 @@ trait Transform: Clone {
 
     /// Adds one to the value
     fn add_one(self) -> Self;
-
-    /// cfg attributes are respected
-    #[cfg(all())]
-    fn cfg_included(self) -> Self;
-
-    #[cfg(any())]
-    fn cfg_omitted(self) -> Self;
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -70,10 +63,6 @@ impl Transform for Number {
     fn add_one(self) -> Self {
         Number(self.0 + 1)
     }
-
-    fn cfg_included(self) -> Self {
-        Number(self.0)
-    }
 }
 
 #[test]
@@ -83,14 +72,13 @@ fn test_derive_inspector_reflection() {
     // Get all methods that match the pattern fn(self) -> Self or fn(mut self) -> Self
     let methods = methods::<Number>();
 
-    assert_eq!(methods.len(), 6);
+    assert_eq!(methods.len(), 5);
     let method_names: Vec<_> = methods.iter().map(|m| m.name).collect();
     assert!(method_names.contains(&"double"));
     assert!(method_names.contains(&"triple"));
     assert!(method_names.contains(&"increment"));
     assert!(method_names.contains(&"quadruple"));
     assert!(method_names.contains(&"add_one"));
-    assert!(method_names.contains(&"cfg_included"));
 
     // Invoke methods by name
     let num = Number(5);
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 655b8a2e8f..11e32523b4 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -307,7 +307,6 @@ impl TabSwitcherDelegate {
                     (Reverse(history.get(&item.item.item_id())), item.item_index)
                 )
             }
-            eprintln!();
             all_items
                 .sort_by_key(|tab| (Reverse(history.get(&tab.item.item_id())), tab.item_index));
             all_items

From 2813073d7b642bc40c6a2f4188dec8445f9688ae Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 16:04:10 -0300
Subject: [PATCH 223/823] message editor: Only allow types of content the agent
 can handle (#36616)

Uses the new
[`acp::PromptCapabilities`](https://github.com/zed-industries/agent-client-protocol/blob/a39b7f635d67528f0a4e05e086ab283b9fc5cb93/rust/agent.rs#L194-L215)
to disable non-file mentions and images for agents that don't support
them.

Release Notes:

- N/A
---
 Cargo.lock                                    |   4 +-
 Cargo.toml                                    |   2 +-
 crates/acp_thread/src/acp_thread.rs           |   8 ++
 crates/acp_thread/src/connection.rs           |  10 ++
 crates/agent2/src/agent.rs                    |   8 ++
 crates/agent_servers/src/acp/v0.rs            |   8 ++
 crates/agent_servers/src/acp/v1.rs            |   6 +
 crates/agent_servers/src/claude.rs            |   8 ++
 .../agent_ui/src/acp/completion_provider.rs   | 122 ++++++++++++------
 crates/agent_ui/src/acp/message_editor.rs     |  93 +++++++++++--
 crates/agent_ui/src/acp/thread_view.rs        |  13 ++
 11 files changed, 233 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 342bb1058f..70b8f630f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.26"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "160971bb53ca0b2e70ebc857c21e24eb448745f1396371015f4c59e9a9e51ed0"
+checksum = "4c887e795097665ab95119580534e7cc1335b59e1a7fec296943e534b970f4ed"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
diff --git a/Cargo.toml b/Cargo.toml
index dcf07b7079..436d4a7f5c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -423,7 +423,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.26"
+agent-client-protocol = "0.0.28"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index a1f9b32eba..9833e1957c 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2598,6 +2598,14 @@ mod tests {
             }
         }
 
+        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+            acp::PromptCapabilities {
+                image: true,
+                audio: true,
+                embedded_context: true,
+            }
+        }
+
         fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
             let sessions = self.sessions.lock();
             let thread = sessions.get(session_id).unwrap().clone();
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index dc1a41c81e..791b161417 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -38,6 +38,8 @@ pub trait AgentConnection {
         cx: &mut App,
     ) -> Task<Result<acp::PromptResponse>>;
 
+    fn prompt_capabilities(&self) -> acp::PromptCapabilities;
+
     fn resume(
         &self,
         _session_id: &acp::SessionId,
@@ -334,6 +336,14 @@ mod test_support {
             Task::ready(Ok(thread))
         }
 
+        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+            acp::PromptCapabilities {
+                image: true,
+                audio: true,
+                embedded_context: true,
+            }
+        }
+
         fn authenticate(
             &self,
             _method_id: acp::AuthMethodId,
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 2f5f15399e..c15048ad8c 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -913,6 +913,14 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         })
     }
 
+    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        acp::PromptCapabilities {
+            image: true,
+            audio: false,
+            embedded_context: true,
+        }
+    }
+
     fn resume(
         &self,
         session_id: &acp::SessionId,
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
index 30643dd005..be96048929 100644
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@@ -498,6 +498,14 @@ impl AgentConnection for AcpConnection {
         })
     }
 
+    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        acp::PromptCapabilities {
+            image: false,
+            audio: false,
+            embedded_context: false,
+        }
+    }
+
     fn cancel(&self, _session_id: &acp::SessionId, cx: &mut App) {
         let task = self
             .connection
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index e0e92f29ba..2e70a5f37a 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -21,6 +21,7 @@ pub struct AcpConnection {
     connection: Rc<acp::ClientSideConnection>,
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
+    prompt_capabilities: acp::PromptCapabilities,
     _io_task: Task<Result<()>>,
 }
 
@@ -119,6 +120,7 @@ impl AcpConnection {
             connection: connection.into(),
             server_name,
             sessions,
+            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
             _io_task: io_task,
         })
     }
@@ -206,6 +208,10 @@ impl AgentConnection for AcpConnection {
         })
     }
 
+    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        self.prompt_capabilities
+    }
+
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
         let conn = self.connection.clone();
         let params = acp::CancelNotification {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 6b9732b468..8d93557e1c 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -319,6 +319,14 @@ impl AgentConnection for ClaudeAgentConnection {
         cx.foreground_executor().spawn(async move { end_rx.await? })
     }
 
+    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        acp::PromptCapabilities {
+            image: true,
+            audio: false,
+            embedded_context: true,
+        }
+    }
+
     fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
         let sessions = self.sessions.borrow();
         let Some(session) = sessions.get(session_id) else {
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index d90520d26a..bf0a3f7a5a 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,8 +1,11 @@
+use std::cell::Cell;
 use std::ops::Range;
+use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
 use acp_thread::MentionUri;
+use agent_client_protocol as acp;
 use agent2::{HistoryEntry, HistoryStore};
 use anyhow::Result;
 use editor::{CompletionProvider, Editor, ExcerptId};
@@ -63,6 +66,7 @@ pub struct ContextPickerCompletionProvider {
     workspace: WeakEntity<Workspace>,
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
+    prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
 }
 
 impl ContextPickerCompletionProvider {
@@ -71,12 +75,14 @@ impl ContextPickerCompletionProvider {
         workspace: WeakEntity<Workspace>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
+        prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
     ) -> Self {
         Self {
             message_editor,
             workspace,
             history_store,
             prompt_store,
+            prompt_capabilities,
         }
     }
 
@@ -544,17 +550,19 @@ impl ContextPickerCompletionProvider {
                 }),
         );
 
-        const RECENT_COUNT: usize = 2;
-        let threads = self
-            .history_store
-            .read(cx)
-            .recently_opened_entries(cx)
-            .into_iter()
-            .filter(|thread| !mentions.contains(&thread.mention_uri()))
-            .take(RECENT_COUNT)
-            .collect::<Vec<_>>();
+        if self.prompt_capabilities.get().embedded_context {
+            const RECENT_COUNT: usize = 2;
+            let threads = self
+                .history_store
+                .read(cx)
+                .recently_opened_entries(cx)
+                .into_iter()
+                .filter(|thread| !mentions.contains(&thread.mention_uri()))
+                .take(RECENT_COUNT)
+                .collect::<Vec<_>>();
 
-        recent.extend(threads.into_iter().map(Match::RecentThread));
+            recent.extend(threads.into_iter().map(Match::RecentThread));
+        }
 
         recent
     }
@@ -564,11 +572,17 @@ impl ContextPickerCompletionProvider {
         workspace: &Entity<Workspace>,
         cx: &mut App,
     ) -> Vec<ContextPickerEntry> {
-        let mut entries = vec![
-            ContextPickerEntry::Mode(ContextPickerMode::File),
-            ContextPickerEntry::Mode(ContextPickerMode::Symbol),
-            ContextPickerEntry::Mode(ContextPickerMode::Thread),
-        ];
+        let embedded_context = self.prompt_capabilities.get().embedded_context;
+        let mut entries = if embedded_context {
+            vec![
+                ContextPickerEntry::Mode(ContextPickerMode::File),
+                ContextPickerEntry::Mode(ContextPickerMode::Symbol),
+                ContextPickerEntry::Mode(ContextPickerMode::Thread),
+            ]
+        } else {
+            // File is always available, but we don't need a mode entry
+            vec![]
+        };
 
         let has_selection = workspace
             .read(cx)
@@ -583,11 +597,13 @@ impl ContextPickerCompletionProvider {
             ));
         }
 
-        if self.prompt_store.is_some() {
-            entries.push(ContextPickerEntry::Mode(ContextPickerMode::Rules));
-        }
+        if embedded_context {
+            if self.prompt_store.is_some() {
+                entries.push(ContextPickerEntry::Mode(ContextPickerMode::Rules));
+            }
 
-        entries.push(ContextPickerEntry::Mode(ContextPickerMode::Fetch));
+            entries.push(ContextPickerEntry::Mode(ContextPickerMode::Fetch));
+        }
 
         entries
     }
@@ -625,7 +641,11 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             let offset_to_line = buffer.point_to_offset(line_start);
             let mut lines = buffer.text_for_range(line_start..position).lines();
             let line = lines.next()?;
-            MentionCompletion::try_parse(line, offset_to_line)
+            MentionCompletion::try_parse(
+                self.prompt_capabilities.get().embedded_context,
+                line,
+                offset_to_line,
+            )
         });
         let Some(state) = state else {
             return Task::ready(Ok(Vec::new()));
@@ -745,12 +765,16 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         let offset_to_line = buffer.point_to_offset(line_start);
         let mut lines = buffer.text_for_range(line_start..position).lines();
         if let Some(line) = lines.next() {
-            MentionCompletion::try_parse(line, offset_to_line)
-                .map(|completion| {
-                    completion.source_range.start <= offset_to_line + position.column as usize
-                        && completion.source_range.end >= offset_to_line + position.column as usize
-                })
-                .unwrap_or(false)
+            MentionCompletion::try_parse(
+                self.prompt_capabilities.get().embedded_context,
+                line,
+                offset_to_line,
+            )
+            .map(|completion| {
+                completion.source_range.start <= offset_to_line + position.column as usize
+                    && completion.source_range.end >= offset_to_line + position.column as usize
+            })
+            .unwrap_or(false)
         } else {
             false
         }
@@ -841,7 +865,7 @@ struct MentionCompletion {
 }
 
 impl MentionCompletion {
-    fn try_parse(line: &str, offset_to_line: usize) -> Option<Self> {
+    fn try_parse(allow_non_file_mentions: bool, line: &str, offset_to_line: usize) -> Option<Self> {
         let last_mention_start = line.rfind('@')?;
         if last_mention_start >= line.len() {
             return Some(Self::default());
@@ -865,7 +889,9 @@ impl MentionCompletion {
         if let Some(mode_text) = parts.next() {
             end += mode_text.len();
 
-            if let Some(parsed_mode) = ContextPickerMode::try_from(mode_text).ok() {
+            if let Some(parsed_mode) = ContextPickerMode::try_from(mode_text).ok()
+                && (allow_non_file_mentions || matches!(parsed_mode, ContextPickerMode::File))
+            {
                 mode = Some(parsed_mode);
             } else {
                 argument = Some(mode_text.to_string());
@@ -898,10 +924,10 @@ mod tests {
 
     #[test]
     fn test_mention_completion_parse() {
-        assert_eq!(MentionCompletion::try_parse("Lorem Ipsum", 0), None);
+        assert_eq!(MentionCompletion::try_parse(true, "Lorem Ipsum", 0), None);
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @", 0),
+            MentionCompletion::try_parse(true, "Lorem @", 0),
             Some(MentionCompletion {
                 source_range: 6..7,
                 mode: None,
@@ -910,7 +936,7 @@ mod tests {
         );
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @file", 0),
+            MentionCompletion::try_parse(true, "Lorem @file", 0),
             Some(MentionCompletion {
                 source_range: 6..11,
                 mode: Some(ContextPickerMode::File),
@@ -919,7 +945,7 @@ mod tests {
         );
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @file ", 0),
+            MentionCompletion::try_parse(true, "Lorem @file ", 0),
             Some(MentionCompletion {
                 source_range: 6..12,
                 mode: Some(ContextPickerMode::File),
@@ -928,7 +954,7 @@ mod tests {
         );
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @file main.rs", 0),
+            MentionCompletion::try_parse(true, "Lorem @file main.rs", 0),
             Some(MentionCompletion {
                 source_range: 6..19,
                 mode: Some(ContextPickerMode::File),
@@ -937,7 +963,7 @@ mod tests {
         );
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @file main.rs ", 0),
+            MentionCompletion::try_parse(true, "Lorem @file main.rs ", 0),
             Some(MentionCompletion {
                 source_range: 6..19,
                 mode: Some(ContextPickerMode::File),
@@ -946,7 +972,7 @@ mod tests {
         );
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @file main.rs Ipsum", 0),
+            MentionCompletion::try_parse(true, "Lorem @file main.rs Ipsum", 0),
             Some(MentionCompletion {
                 source_range: 6..19,
                 mode: Some(ContextPickerMode::File),
@@ -955,7 +981,7 @@ mod tests {
         );
 
         assert_eq!(
-            MentionCompletion::try_parse("Lorem @main", 0),
+            MentionCompletion::try_parse(true, "Lorem @main", 0),
             Some(MentionCompletion {
                 source_range: 6..11,
                 mode: None,
@@ -963,6 +989,28 @@ mod tests {
             })
         );
 
-        assert_eq!(MentionCompletion::try_parse("test@", 0), None);
+        assert_eq!(MentionCompletion::try_parse(true, "test@", 0), None);
+
+        // Allowed non-file mentions
+
+        assert_eq!(
+            MentionCompletion::try_parse(true, "Lorem @symbol main", 0),
+            Some(MentionCompletion {
+                source_range: 6..18,
+                mode: Some(ContextPickerMode::Symbol),
+                argument: Some("main".to_string()),
+            })
+        );
+
+        // Disallowed non-file mentions
+
+        assert_eq!(
+            MentionCompletion::try_parse(false, "Lorem @symbol main", 0),
+            Some(MentionCompletion {
+                source_range: 6..18,
+                mode: None,
+                argument: Some("main".to_string()),
+            })
+        );
     }
 }
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index ccd33c9247..5eab1a4e2d 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -51,7 +51,10 @@ use ui::{
 };
 use url::Url;
 use util::ResultExt;
-use workspace::{Workspace, notifications::NotifyResultExt as _};
+use workspace::{
+    Toast, Workspace,
+    notifications::{NotificationId, NotifyResultExt as _},
+};
 use zed_actions::agent::Chat;
 
 const PARSE_SLASH_COMMAND_DEBOUNCE: Duration = Duration::from_millis(50);
@@ -64,6 +67,7 @@ pub struct MessageEditor {
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
     prevent_slash_commands: bool,
+    prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
     _subscriptions: Vec<Subscription>,
     _parse_slash_command_task: Task<()>,
 }
@@ -96,11 +100,13 @@ impl MessageEditor {
             },
             None,
         );
+        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
         let completion_provider = ContextPickerCompletionProvider::new(
             cx.weak_entity(),
             workspace.clone(),
             history_store.clone(),
             prompt_store.clone(),
+            prompt_capabilities.clone(),
         );
         let semantics_provider = Rc::new(SlashCommandSemanticsProvider {
             range: Cell::new(None),
@@ -158,6 +164,7 @@ impl MessageEditor {
             history_store,
             prompt_store,
             prevent_slash_commands,
+            prompt_capabilities,
             _subscriptions: subscriptions,
             _parse_slash_command_task: Task::ready(()),
         }
@@ -193,6 +200,10 @@ impl MessageEditor {
         .detach();
     }
 
+    pub fn set_prompt_capabilities(&mut self, capabilities: acp::PromptCapabilities) {
+        self.prompt_capabilities.set(capabilities);
+    }
+
     #[cfg(test)]
     pub(crate) fn editor(&self) -> &Entity<Editor> {
         &self.editor
@@ -230,7 +241,7 @@ impl MessageEditor {
         let Some((excerpt_id, _, _)) = snapshot.buffer_snapshot.as_singleton() else {
             return Task::ready(());
         };
-        let Some(anchor) = snapshot
+        let Some(start_anchor) = snapshot
             .buffer_snapshot
             .anchor_in_excerpt(*excerpt_id, start)
         else {
@@ -244,6 +255,33 @@ impl MessageEditor {
                 .unwrap_or_default();
 
             if Img::extensions().contains(&extension) && !extension.contains("svg") {
+                if !self.prompt_capabilities.get().image {
+                    struct ImagesNotAllowed;
+
+                    let end_anchor = snapshot.buffer_snapshot.anchor_before(
+                        start_anchor.to_offset(&snapshot.buffer_snapshot) + content_len + 1,
+                    );
+
+                    self.editor.update(cx, |editor, cx| {
+                        // Remove mention
+                        editor.edit([((start_anchor..end_anchor), "")], cx);
+                    });
+
+                    self.workspace
+                        .update(cx, |workspace, cx| {
+                            workspace.show_toast(
+                                Toast::new(
+                                    NotificationId::unique::<ImagesNotAllowed>(),
+                                    "This agent does not support images yet",
+                                )
+                                .autohide(),
+                                cx,
+                            );
+                        })
+                        .ok();
+                    return Task::ready(());
+                }
+
                 let project = self.project.clone();
                 let Some(project_path) = project
                     .read(cx)
@@ -277,7 +315,7 @@ impl MessageEditor {
                 };
                 return self.confirm_mention_for_image(
                     crease_id,
-                    anchor,
+                    start_anchor,
                     Some(abs_path.clone()),
                     image,
                     window,
@@ -301,17 +339,22 @@ impl MessageEditor {
 
         match mention_uri {
             MentionUri::Fetch { url } => {
-                self.confirm_mention_for_fetch(crease_id, anchor, url, window, cx)
+                self.confirm_mention_for_fetch(crease_id, start_anchor, url, window, cx)
             }
             MentionUri::Directory { abs_path } => {
-                self.confirm_mention_for_directory(crease_id, anchor, abs_path, window, cx)
+                self.confirm_mention_for_directory(crease_id, start_anchor, abs_path, window, cx)
             }
             MentionUri::Thread { id, name } => {
-                self.confirm_mention_for_thread(crease_id, anchor, id, name, window, cx)
-            }
-            MentionUri::TextThread { path, name } => {
-                self.confirm_mention_for_text_thread(crease_id, anchor, path, name, window, cx)
+                self.confirm_mention_for_thread(crease_id, start_anchor, id, name, window, cx)
             }
+            MentionUri::TextThread { path, name } => self.confirm_mention_for_text_thread(
+                crease_id,
+                start_anchor,
+                path,
+                name,
+                window,
+                cx,
+            ),
             MentionUri::File { .. }
             | MentionUri::Symbol { .. }
             | MentionUri::Rule { .. }
@@ -778,6 +821,10 @@ impl MessageEditor {
     }
 
     fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
+        if !self.prompt_capabilities.get().image {
+            return;
+        }
+
         let images = cx
             .read_from_clipboard()
             .map(|item| {
@@ -2009,6 +2056,34 @@ mod tests {
             (message_editor, editor)
         });
 
+        cx.simulate_input("Lorem @");
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert_eq!(editor.text(cx), "Lorem @");
+            assert!(editor.has_visible_completions_menu());
+
+            // Only files since we have default capabilities
+            assert_eq!(
+                current_completion_labels(editor),
+                &[
+                    "eight.txt dir/b/",
+                    "seven.txt dir/b/",
+                    "six.txt dir/b/",
+                    "five.txt dir/b/",
+                ]
+            );
+            editor.set_text("", window, cx);
+        });
+
+        message_editor.update(&mut cx, |editor, _cx| {
+            // Enable all prompt capabilities
+            editor.set_prompt_capabilities(acp::PromptCapabilities {
+                image: true,
+                audio: true,
+                embedded_context: true,
+            });
+        });
+
         cx.simulate_input("Lorem ");
 
         editor.update(&mut cx, |editor, cx| {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 14f9cacd15..81a56165c8 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -492,6 +492,11 @@ impl AcpThreadView {
                             })
                         });
 
+                        this.message_editor.update(cx, |message_editor, _cx| {
+                            message_editor
+                                .set_prompt_capabilities(connection.prompt_capabilities());
+                        });
+
                         cx.notify();
                     }
                     Err(err) => {
@@ -4762,6 +4767,14 @@ pub(crate) mod tests {
             &[]
         }
 
+        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+            acp::PromptCapabilities {
+                image: true,
+                audio: true,
+                embedded_context: true,
+            }
+        }
+
         fn authenticate(
             &self,
             _method_id: acp::AuthMethodId,

From b0bef3a9a279e98abc499d4e2f7850ff7f5959ea Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 20 Aug 2025 21:17:07 +0200
Subject: [PATCH 224/823] agent2: Clean up tool descriptions (#36619)

schemars was passing along the newlines from the doc comments. This
should make these closer to the markdown file versions we had in the old
agent.

Release Notes:

- N/A
---
 crates/agent2/src/tools/copy_path_tool.rs     | 15 ++++-----------
 .../agent2/src/tools/create_directory_tool.rs |  7 ++-----
 crates/agent2/src/tools/delete_path_tool.rs   |  3 +--
 crates/agent2/src/tools/edit_file_tool.rs     | 19 ++++++-------------
 crates/agent2/src/tools/find_path_tool.rs     |  1 -
 crates/agent2/src/tools/grep_tool.rs          |  3 +--
 .../agent2/src/tools/list_directory_tool.rs   |  6 ++----
 crates/agent2/src/tools/move_path_tool.rs     |  9 +++------
 crates/agent2/src/tools/open_tool.rs          | 10 +++-------
 crates/agent2/src/tools/read_file_tool.rs     |  5 +----
 crates/agent2/src/tools/thinking_tool.rs      |  3 +--
 crates/agent2/src/tools/web_search_tool.rs    |  2 +-
 12 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/crates/agent2/src/tools/copy_path_tool.rs b/crates/agent2/src/tools/copy_path_tool.rs
index f973b86990..4b40a9842f 100644
--- a/crates/agent2/src/tools/copy_path_tool.rs
+++ b/crates/agent2/src/tools/copy_path_tool.rs
@@ -8,16 +8,11 @@ use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use util::markdown::MarkdownInlineCode;
 
-/// Copies a file or directory in the project, and returns confirmation that the
-/// copy succeeded.
-///
+/// Copies a file or directory in the project, and returns confirmation that the copy succeeded.
 /// Directory contents will be copied recursively (like `cp -r`).
 ///
-/// This tool should be used when it's desirable to create a copy of a file or
-/// directory without modifying the original. It's much more efficient than
-/// doing this by separately reading and then writing the file or directory's
-/// contents, so this tool should be preferred over that approach whenever
-/// copying is the goal.
+/// This tool should be used when it's desirable to create a copy of a file or directory without modifying the original.
+/// It's much more efficient than doing this by separately reading and then writing the file or directory's contents, so this tool should be preferred over that approach whenever copying is the goal.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CopyPathToolInput {
     /// The source path of the file or directory to copy.
@@ -33,12 +28,10 @@ pub struct CopyPathToolInput {
     /// You can copy the first file by providing a source_path of "directory1/a/something.txt"
     /// </example>
     pub source_path: String,
-
     /// The destination path where the file or directory should be copied to.
     ///
     /// <example>
-    /// To copy "directory1/a/something.txt" to "directory2/b/copy.txt",
-    /// provide a destination_path of "directory2/b/copy.txt"
+    /// To copy "directory1/a/something.txt" to "directory2/b/copy.txt", provide a destination_path of "directory2/b/copy.txt"
     /// </example>
     pub destination_path: String,
 }
diff --git a/crates/agent2/src/tools/create_directory_tool.rs b/crates/agent2/src/tools/create_directory_tool.rs
index c173c5ae67..7720eb3595 100644
--- a/crates/agent2/src/tools/create_directory_tool.rs
+++ b/crates/agent2/src/tools/create_directory_tool.rs
@@ -9,12 +9,9 @@ use util::markdown::MarkdownInlineCode;
 
 use crate::{AgentTool, ToolCallEventStream};
 
-/// Creates a new directory at the specified path within the project. Returns
-/// confirmation that the directory was created.
+/// Creates a new directory at the specified path within the project. Returns confirmation that the directory was created.
 ///
-/// This tool creates a directory and all necessary parent directories (similar
-/// to `mkdir -p`). It should be used whenever you need to create new
-/// directories within the project.
+/// This tool creates a directory and all necessary parent directories (similar to `mkdir -p`). It should be used whenever you need to create new directories within the project.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CreateDirectoryToolInput {
     /// The path of the new directory.
diff --git a/crates/agent2/src/tools/delete_path_tool.rs b/crates/agent2/src/tools/delete_path_tool.rs
index e013b3a3e7..c281f1b5b6 100644
--- a/crates/agent2/src/tools/delete_path_tool.rs
+++ b/crates/agent2/src/tools/delete_path_tool.rs
@@ -9,8 +9,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
-/// Deletes the file or directory (and the directory's contents, recursively) at
-/// the specified path in the project, and returns confirmation of the deletion.
+/// Deletes the file or directory (and the directory's contents, recursively) at the specified path in the project, and returns confirmation of the deletion.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct DeletePathToolInput {
     /// The path of the file or directory to delete.
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 24fedda4eb..f89cace9a8 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -34,25 +34,21 @@ const DEFAULT_UI_TEXT: &str = "Editing file";
 ///    - Use the `list_directory` tool to verify the parent directory exists and is the correct location
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct EditFileToolInput {
-    /// A one-line, user-friendly markdown description of the edit. This will be
-    /// shown in the UI and also passed to another model to perform the edit.
+    /// A one-line, user-friendly markdown description of the edit. This will be shown in the UI and also passed to another model to perform the edit.
     ///
-    /// Be terse, but also descriptive in what you want to achieve with this
-    /// edit. Avoid generic instructions.
+    /// Be terse, but also descriptive in what you want to achieve with this edit. Avoid generic instructions.
     ///
     /// NEVER mention the file path in this description.
     ///
     /// <example>Fix API endpoint URLs</example>
     /// <example>Update copyright year in `page_footer`</example>
     ///
-    /// Make sure to include this field before all the others in the input object
-    /// so that we can display it immediately.
+    /// Make sure to include this field before all the others in the input object so that we can display it immediately.
     pub display_description: String,
 
     /// The full path of the file to create or modify in the project.
     ///
-    /// WARNING: When specifying which file path need changing, you MUST
-    /// start each path with one of the project's root directories.
+    /// WARNING: When specifying which file path need changing, you MUST start each path with one of the project's root directories.
     ///
     /// The following examples assume we have two root directories in the project:
     /// - /a/b/backend
@@ -61,22 +57,19 @@ pub struct EditFileToolInput {
     /// <example>
     /// `backend/src/main.rs`
     ///
-    /// Notice how the file path starts with `backend`. Without that, the path
-    /// would be ambiguous and the call would fail!
+    /// Notice how the file path starts with `backend`. Without that, the path would be ambiguous and the call would fail!
     /// </example>
     ///
     /// <example>
     /// `frontend/db.js`
     /// </example>
     pub path: PathBuf,
-
     /// The mode of operation on the file. Possible values:
     /// - 'edit': Make granular edits to an existing file.
     /// - 'create': Create a new file if it doesn't exist.
     /// - 'overwrite': Replace the entire contents of an existing file.
     ///
-    /// When a file already exists or you just created it, prefer editing
-    /// it as opposed to recreating it from scratch.
+    /// When a file already exists or you just created it, prefer editing it as opposed to recreating it from scratch.
     pub mode: EditFileMode,
 }
 
diff --git a/crates/agent2/src/tools/find_path_tool.rs b/crates/agent2/src/tools/find_path_tool.rs
index deccf37ab7..9e11ca6a37 100644
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -31,7 +31,6 @@ pub struct FindPathToolInput {
     /// You can get back the first two paths by providing a glob of "*thing*.txt"
     /// </example>
     pub glob: String,
-
     /// Optional starting position for paginated results (0-based).
     /// When not provided, starts from the beginning.
     #[serde(default)]
diff --git a/crates/agent2/src/tools/grep_tool.rs b/crates/agent2/src/tools/grep_tool.rs
index 265c26926d..955dae7235 100644
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -27,8 +27,7 @@ use util::paths::PathMatcher;
 /// - DO NOT use HTML entities solely to escape characters in the tool parameters.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct GrepToolInput {
-    /// A regex pattern to search for in the entire project. Note that the regex
-    /// will be parsed by the Rust `regex` crate.
+    /// A regex pattern to search for in the entire project. Note that the regex will be parsed by the Rust `regex` crate.
     ///
     /// Do NOT specify a path here! This will only be matched against the code **content**.
     pub regex: String,
diff --git a/crates/agent2/src/tools/list_directory_tool.rs b/crates/agent2/src/tools/list_directory_tool.rs
index 61f21d8f95..31575a92e4 100644
--- a/crates/agent2/src/tools/list_directory_tool.rs
+++ b/crates/agent2/src/tools/list_directory_tool.rs
@@ -10,14 +10,12 @@ use std::fmt::Write;
 use std::{path::Path, sync::Arc};
 use util::markdown::MarkdownInlineCode;
 
-/// Lists files and directories in a given path. Prefer the `grep` or
-/// `find_path` tools when searching the codebase.
+/// Lists files and directories in a given path. Prefer the `grep` or `find_path` tools when searching the codebase.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ListDirectoryToolInput {
     /// The fully-qualified path of the directory to list in the project.
     ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
+    /// This path should never be absolute, and the first component of the path should always be a root directory in a project.
     ///
     /// <example>
     /// If the project has the following root directories:
diff --git a/crates/agent2/src/tools/move_path_tool.rs b/crates/agent2/src/tools/move_path_tool.rs
index f8d5d0d176..2a173a4404 100644
--- a/crates/agent2/src/tools/move_path_tool.rs
+++ b/crates/agent2/src/tools/move_path_tool.rs
@@ -8,14 +8,11 @@ use serde::{Deserialize, Serialize};
 use std::{path::Path, sync::Arc};
 use util::markdown::MarkdownInlineCode;
 
-/// Moves or rename a file or directory in the project, and returns confirmation
-/// that the move succeeded.
+/// Moves or rename a file or directory in the project, and returns confirmation that the move succeeded.
 ///
-/// If the source and destination directories are the same, but the filename is
-/// different, this performs a rename. Otherwise, it performs a move.
+/// If the source and destination directories are the same, but the filename is different, this performs a rename. Otherwise, it performs a move.
 ///
-/// This tool should be used when it's desirable to move or rename a file or
-/// directory without changing its contents at all.
+/// This tool should be used when it's desirable to move or rename a file or directory without changing its contents at all.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct MovePathToolInput {
     /// The source path of the file or directory to move/rename.
diff --git a/crates/agent2/src/tools/open_tool.rs b/crates/agent2/src/tools/open_tool.rs
index 36420560c1..c20369c2d8 100644
--- a/crates/agent2/src/tools/open_tool.rs
+++ b/crates/agent2/src/tools/open_tool.rs
@@ -8,19 +8,15 @@ use serde::{Deserialize, Serialize};
 use std::{path::PathBuf, sync::Arc};
 use util::markdown::MarkdownEscaped;
 
-/// This tool opens a file or URL with the default application associated with
-/// it on the user's operating system:
+/// This tool opens a file or URL with the default application associated with it on the user's operating system:
 ///
 /// - On macOS, it's equivalent to the `open` command
 /// - On Windows, it's equivalent to `start`
 /// - On Linux, it uses something like `xdg-open`, `gio open`, `gnome-open`, `kde-open`, `wslview` as appropriate
 ///
-/// For example, it can open a web browser with a URL, open a PDF file with the
-/// default PDF viewer, etc.
+/// For example, it can open a web browser with a URL, open a PDF file with the default PDF viewer, etc.
 ///
-/// You MUST ONLY use this tool when the user has explicitly requested opening
-/// something. You MUST NEVER assume that the user would like for you to use
-/// this tool.
+/// You MUST ONLY use this tool when the user has explicitly requested opening something. You MUST NEVER assume that the user would like for you to use this tool.
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct OpenToolInput {
     /// The path or URL to open with the default application.
diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index f37dff4f47..11a57506fb 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -21,8 +21,7 @@ use crate::{AgentTool, ToolCallEventStream};
 pub struct ReadFileToolInput {
     /// The relative path of the file to read.
     ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
+    /// This path should never be absolute, and the first component of the path should always be a root directory in a project.
     ///
     /// <example>
     /// If the project has the following root directories:
@@ -34,11 +33,9 @@ pub struct ReadFileToolInput {
     /// If you want to access `file.txt` in `directory2`, you should use the path `directory2/file.txt`.
     /// </example>
     pub path: String,
-
     /// Optional line number to start reading on (1-based index)
     #[serde(default)]
     pub start_line: Option<u32>,
-
     /// Optional line number to end reading on (1-based index, inclusive)
     #[serde(default)]
     pub end_line: Option<u32>,
diff --git a/crates/agent2/src/tools/thinking_tool.rs b/crates/agent2/src/tools/thinking_tool.rs
index 43647bb468..c5e9451162 100644
--- a/crates/agent2/src/tools/thinking_tool.rs
+++ b/crates/agent2/src/tools/thinking_tool.rs
@@ -11,8 +11,7 @@ use crate::{AgentTool, ToolCallEventStream};
 /// Use this tool when you need to work through complex problems, develop strategies, or outline approaches before taking action.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ThinkingToolInput {
-    /// Content to think about. This should be a description of what to think about or
-    /// a problem to solve.
+    /// Content to think about. This should be a description of what to think about or a problem to solve.
     content: String,
 }
 
diff --git a/crates/agent2/src/tools/web_search_tool.rs b/crates/agent2/src/tools/web_search_tool.rs
index d71a128bfe..ffcd4ad3be 100644
--- a/crates/agent2/src/tools/web_search_tool.rs
+++ b/crates/agent2/src/tools/web_search_tool.rs
@@ -14,7 +14,7 @@ use ui::prelude::*;
 use web_search::WebSearchRegistry;
 
 /// Search the web for information using your query.
-/// Use this when you need real-time information, facts, or data that might not be in your training. \
+/// Use this when you need real-time information, facts, or data that might not be in your training.
 /// Results will include snippets and links from relevant web pages.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct WebSearchToolInput {

From 739e4551da857800cf5fb862e98d0e72e9779551 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 20 Aug 2025 15:30:11 -0400
Subject: [PATCH 225/823] Fix typo in `Excerpt::contains` (#36621)

Follow-up to #36524

Release Notes:

- N/A
---
 crates/multi_buffer/src/multi_buffer.rs | 27 ++++++++++++-------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index f73014a6ff..a54d38163d 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -6998,20 +6998,19 @@ impl Excerpt {
     }
 
     fn contains(&self, anchor: &Anchor) -> bool {
-        anchor.buffer_id == None
-            || anchor.buffer_id == Some(self.buffer_id)
-                && self
-                    .range
-                    .context
-                    .start
-                    .cmp(&anchor.text_anchor, &self.buffer)
-                    .is_le()
-                && self
-                    .range
-                    .context
-                    .end
-                    .cmp(&anchor.text_anchor, &self.buffer)
-                    .is_ge()
+        (anchor.buffer_id == None || anchor.buffer_id == Some(self.buffer_id))
+            && self
+                .range
+                .context
+                .start
+                .cmp(&anchor.text_anchor, &self.buffer)
+                .is_le()
+            && self
+                .range
+                .context
+                .end
+                .cmp(&anchor.text_anchor, &self.buffer)
+                .is_ge()
     }
 
     /// The [`Excerpt`]'s start offset in its [`Buffer`]

From fa8bef1496efa8047b600fc65fcd662797ea6fb1 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 20 Aug 2025 16:05:30 -0400
Subject: [PATCH 226/823] Bump Zed to v0.202 (#36622)

Release Notes:

-N/A
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 70b8f630f7..7df5304d92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20387,7 +20387,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.201.0"
+version = "0.202.0"
 dependencies = [
  "activity_indicator",
  "agent",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index d69efaf6c0..ac4cd72124 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "0.201.0"
+version = "0.202.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From 02dabbb9fa4a87721a76d3d6e498378f2965bd1e Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 17:05:53 -0300
Subject: [PATCH 227/823] acp thread view: Do not go into editing mode if
 unsupported (#36623)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 81a56165c8..2b87144fcd 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -669,8 +669,14 @@ impl AcpThreadView {
     ) {
         match &event.view_event {
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
-                self.editing_message = Some(event.entry_index);
-                cx.notify();
+                if let Some(thread) = self.thread()
+                    && let Some(AgentThreadEntry::UserMessage(user_message)) =
+                        thread.read(cx).entries().get(event.entry_index)
+                    && user_message.id.is_some()
+                {
+                    self.editing_message = Some(event.entry_index);
+                    cx.notify();
+                }
             }
             ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::Send) => {
                 self.regenerate(event.entry_index, editor, window, cx);
@@ -1116,16 +1122,18 @@ impl AcpThreadView {
                                     .when(editing && !editor_focus, |this| this.border_dashed())
                                     .border_color(cx.theme().colors().border)
                                     .map(|this|{
-                                        if editor_focus {
+                                        if editing && editor_focus {
                                             this.border_color(focus_border)
-                                        } else {
+                                        } else if message.id.is_some() {
                                             this.hover(|s| s.border_color(focus_border.opacity(0.8)))
+                                        } else {
+                                            this
                                         }
                                     })
                                     .text_xs()
                                     .child(editor.clone().into_any_element()),
                             )
-                            .when(editor_focus, |this|
+                            .when(editing && editor_focus, |this|
                                 this.child(
                                     h_flex()
                                         .absolute()

From fb7edbfb464eb4ae0e66008b8e681ed0360aa474 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 20 Aug 2025 18:01:22 -0300
Subject: [PATCH 228/823] thread_view: Add recent history entries & adjust
 empty state (#36625)

Release Notes:

- N/A
---
 assets/icons/menu_alt.svg                   |   2 +-
 assets/icons/zed_agent.svg                  |  34 ++--
 assets/icons/zed_assistant.svg              |   4 +-
 crates/agent2/src/history_store.rs          |   4 +
 crates/agent2/src/native_agent_server.rs    |   2 +-
 crates/agent_servers/src/gemini.rs          |   4 +-
 crates/agent_ui/src/acp/thread_history.rs   | 149 ++++++++++++++-
 crates/agent_ui/src/acp/thread_view.rs      | 198 +++++++++++++++-----
 crates/agent_ui/src/ui.rs                   |   2 -
 crates/agent_ui/src/ui/new_thread_button.rs |  75 --------
 10 files changed, 325 insertions(+), 149 deletions(-)
 delete mode 100644 crates/agent_ui/src/ui/new_thread_button.rs

diff --git a/assets/icons/menu_alt.svg b/assets/icons/menu_alt.svg
index 87add13216..b9cc19e22f 100644
--- a/assets/icons/menu_alt.svg
+++ b/assets/icons/menu_alt.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.333 10H8M13.333 6H2.66701" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.66699 8H10.667M2.66699 4H13.333M2.66699 12H7.99999" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/assets/icons/zed_agent.svg b/assets/icons/zed_agent.svg
index b6e120a0b6..0c80e22c51 100644
--- a/assets/icons/zed_agent.svg
+++ b/assets/icons/zed_agent.svg
@@ -1,27 +1,27 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 8.75V10.5C8.93097 10.5 8.06903 10.5 6 10.5V10L11 6V5.5H6V7.25" stroke="black" stroke-width="1.2"/>
+<path d="M11 8.75V10.5C8.93097 10.5 8.06903 10.5 6 10.5V10L11 6V5.5H6V7.25" stroke="black" stroke-width="1.5"/>
 <path d="M2 8.5C2.27614 8.5 2.5 8.27614 2.5 8C2.5 7.72386 2.27614 7.5 2 7.5C1.72386 7.5 1.5 7.72386 1.5 8C1.5 8.27614 1.72386 8.5 2 8.5Z" fill="black"/>
-<path d="M2.99976 6.33002C3.2759 6.33002 3.49976 6.10616 3.49976 5.83002C3.49976 5.55387 3.2759 5.33002 2.99976 5.33002C2.72361 5.33002 2.49976 5.55387 2.49976 5.83002C2.49976 6.10616 2.72361 6.33002 2.99976 6.33002Z" fill="black"/>
-<path d="M2.99976 10.66C3.2759 10.66 3.49976 10.4361 3.49976 10.16C3.49976 9.88383 3.2759 9.65997 2.99976 9.65997C2.72361 9.65997 2.49976 9.88383 2.49976 10.16C2.49976 10.4361 2.72361 10.66 2.99976 10.66Z" fill="black"/>
+<path opacity="0.6" d="M2.99976 6.33002C3.2759 6.33002 3.49976 6.10616 3.49976 5.83002C3.49976 5.55387 3.2759 5.33002 2.99976 5.33002C2.72361 5.33002 2.49976 5.55387 2.49976 5.83002C2.49976 6.10616 2.72361 6.33002 2.99976 6.33002Z" fill="black"/>
+<path opacity="0.6" d="M2.99976 10.66C3.2759 10.66 3.49976 10.4361 3.49976 10.16C3.49976 9.88383 3.2759 9.65997 2.99976 9.65997C2.72361 9.65997 2.49976 9.88383 2.49976 10.16C2.49976 10.4361 2.72361 10.66 2.99976 10.66Z" fill="black"/>
 <path d="M15 8.5C15.2761 8.5 15.5 8.27614 15.5 8C15.5 7.72386 15.2761 7.5 15 7.5C14.7239 7.5 14.5 7.72386 14.5 8C14.5 8.27614 14.7239 8.5 15 8.5Z" fill="black"/>
-<path d="M14 6.33002C14.2761 6.33002 14.5 6.10616 14.5 5.83002C14.5 5.55387 14.2761 5.33002 14 5.33002C13.7239 5.33002 13.5 5.55387 13.5 5.83002C13.5 6.10616 13.7239 6.33002 14 6.33002Z" fill="black"/>
-<path d="M14 10.66C14.2761 10.66 14.5 10.4361 14.5 10.16C14.5 9.88383 14.2761 9.65997 14 9.65997C13.7239 9.65997 13.5 9.88383 13.5 10.16C13.5 10.4361 13.7239 10.66 14 10.66Z" fill="black"/>
+<path opacity="0.6" d="M14 6.33002C14.2761 6.33002 14.5 6.10616 14.5 5.83002C14.5 5.55387 14.2761 5.33002 14 5.33002C13.7239 5.33002 13.5 5.55387 13.5 5.83002C13.5 6.10616 13.7239 6.33002 14 6.33002Z" fill="black"/>
+<path opacity="0.6" d="M14 10.66C14.2761 10.66 14.5 10.4361 14.5 10.16C14.5 9.88383 14.2761 9.65997 14 9.65997C13.7239 9.65997 13.5 9.88383 13.5 10.16C13.5 10.4361 13.7239 10.66 14 10.66Z" fill="black"/>
 <path d="M8.49219 2C8.76833 2 8.99219 1.77614 8.99219 1.5C8.99219 1.22386 8.76833 1 8.49219 1C8.21605 1 7.99219 1.22386 7.99219 1.5C7.99219 1.77614 8.21605 2 8.49219 2Z" fill="black"/>
-<path d="M6 3C6.27614 3 6.5 2.77614 6.5 2.5C6.5 2.22386 6.27614 2 6 2C5.72386 2 5.5 2.22386 5.5 2.5C5.5 2.77614 5.72386 3 6 3Z" fill="black"/>
+<path opacity="0.6" d="M6 3C6.27614 3 6.5 2.77614 6.5 2.5C6.5 2.22386 6.27614 2 6 2C5.72386 2 5.5 2.22386 5.5 2.5C5.5 2.77614 5.72386 3 6 3Z" fill="black"/>
 <path d="M4 4C4.27614 4 4.5 3.77614 4.5 3.5C4.5 3.22386 4.27614 3 4 3C3.72386 3 3.5 3.22386 3.5 3.5C3.5 3.77614 3.72386 4 4 4Z" fill="black"/>
 <path d="M3.99976 13C4.2759 13 4.49976 12.7761 4.49976 12.5C4.49976 12.2239 4.2759 12 3.99976 12C3.72361 12 3.49976 12.2239 3.49976 12.5C3.49976 12.7761 3.72361 13 3.99976 13Z" fill="black"/>
-<path d="M2 12.5C2.27614 12.5 2.5 12.2761 2.5 12C2.5 11.7239 2.27614 11.5 2 11.5C1.72386 11.5 1.5 11.7239 1.5 12C1.5 12.2761 1.72386 12.5 2 12.5Z" fill="black"/>
-<path d="M2 4.5C2.27614 4.5 2.5 4.27614 2.5 4C2.5 3.72386 2.27614 3.5 2 3.5C1.72386 3.5 1.5 3.72386 1.5 4C1.5 4.27614 1.72386 4.5 2 4.5Z" fill="black"/>
-<path d="M15 12.5C15.2761 12.5 15.5 12.2761 15.5 12C15.5 11.7239 15.2761 11.5 15 11.5C14.7239 11.5 14.5 11.7239 14.5 12C14.5 12.2761 14.7239 12.5 15 12.5Z" fill="black"/>
-<path d="M15 4.5C15.2761 4.5 15.5 4.27614 15.5 4C15.5 3.72386 15.2761 3.5 15 3.5C14.7239 3.5 14.5 3.72386 14.5 4C14.5 4.27614 14.7239 4.5 15 4.5Z" fill="black"/>
-<path d="M3.99976 15C4.2759 15 4.49976 14.7761 4.49976 14.5C4.49976 14.2239 4.2759 14 3.99976 14C3.72361 14 3.49976 14.2239 3.49976 14.5C3.49976 14.7761 3.72361 15 3.99976 15Z" fill="black"/>
-<path d="M4 2C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1C3.72386 1 3.5 1.22386 3.5 1.5C3.5 1.77614 3.72386 2 4 2Z" fill="black"/>
-<path d="M13 15C13.2761 15 13.5 14.7761 13.5 14.5C13.5 14.2239 13.2761 14 13 14C12.7239 14 12.5 14.2239 12.5 14.5C12.5 14.7761 12.7239 15 13 15Z" fill="black"/>
-<path d="M13 2C13.2761 2 13.5 1.77614 13.5 1.5C13.5 1.22386 13.2761 1 13 1C12.7239 1 12.5 1.22386 12.5 1.5C12.5 1.77614 12.7239 2 13 2Z" fill="black"/>
+<path opacity="0.2" d="M2 12.5C2.27614 12.5 2.5 12.2761 2.5 12C2.5 11.7239 2.27614 11.5 2 11.5C1.72386 11.5 1.5 11.7239 1.5 12C1.5 12.2761 1.72386 12.5 2 12.5Z" fill="black"/>
+<path opacity="0.2" d="M2 4.5C2.27614 4.5 2.5 4.27614 2.5 4C2.5 3.72386 2.27614 3.5 2 3.5C1.72386 3.5 1.5 3.72386 1.5 4C1.5 4.27614 1.72386 4.5 2 4.5Z" fill="black"/>
+<path opacity="0.2" d="M15 12.5C15.2761 12.5 15.5 12.2761 15.5 12C15.5 11.7239 15.2761 11.5 15 11.5C14.7239 11.5 14.5 11.7239 14.5 12C14.5 12.2761 14.7239 12.5 15 12.5Z" fill="black"/>
+<path opacity="0.2" d="M15 4.5C15.2761 4.5 15.5 4.27614 15.5 4C15.5 3.72386 15.2761 3.5 15 3.5C14.7239 3.5 14.5 3.72386 14.5 4C14.5 4.27614 14.7239 4.5 15 4.5Z" fill="black"/>
+<path opacity="0.5" d="M3.99976 15C4.2759 15 4.49976 14.7761 4.49976 14.5C4.49976 14.2239 4.2759 14 3.99976 14C3.72361 14 3.49976 14.2239 3.49976 14.5C3.49976 14.7761 3.72361 15 3.99976 15Z" fill="black"/>
+<path opacity="0.5" d="M4 2C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1C3.72386 1 3.5 1.22386 3.5 1.5C3.5 1.77614 3.72386 2 4 2Z" fill="black"/>
+<path opacity="0.5" d="M13 15C13.2761 15 13.5 14.7761 13.5 14.5C13.5 14.2239 13.2761 14 13 14C12.7239 14 12.5 14.2239 12.5 14.5C12.5 14.7761 12.7239 15 13 15Z" fill="black"/>
+<path opacity="0.5" d="M13 2C13.2761 2 13.5 1.77614 13.5 1.5C13.5 1.22386 13.2761 1 13 1C12.7239 1 12.5 1.22386 12.5 1.5C12.5 1.77614 12.7239 2 13 2Z" fill="black"/>
 <path d="M13 4C13.2761 4 13.5 3.77614 13.5 3.5C13.5 3.22386 13.2761 3 13 3C12.7239 3 12.5 3.22386 12.5 3.5C12.5 3.77614 12.7239 4 13 4Z" fill="black"/>
 <path d="M13 13C13.2761 13 13.5 12.7761 13.5 12.5C13.5 12.2239 13.2761 12 13 12C12.7239 12 12.5 12.2239 12.5 12.5C12.5 12.7761 12.7239 13 13 13Z" fill="black"/>
-<path d="M11 3C11.2761 3 11.5 2.77614 11.5 2.5C11.5 2.22386 11.2761 2 11 2C10.7239 2 10.5 2.22386 10.5 2.5C10.5 2.77614 10.7239 3 11 3Z" fill="black"/>
+<path opacity="0.6" d="M11 3C11.2761 3 11.5 2.77614 11.5 2.5C11.5 2.22386 11.2761 2 11 2C10.7239 2 10.5 2.22386 10.5 2.5C10.5 2.77614 10.7239 3 11 3Z" fill="black"/>
 <path d="M8.5 15C8.77614 15 9 14.7761 9 14.5C9 14.2239 8.77614 14 8.5 14C8.22386 14 8 14.2239 8 14.5C8 14.7761 8.22386 15 8.5 15Z" fill="black"/>
-<path d="M6 14C6.27614 14 6.5 13.7761 6.5 13.5C6.5 13.2239 6.27614 13 6 13C5.72386 13 5.5 13.2239 5.5 13.5C5.5 13.7761 5.72386 14 6 14Z" fill="black"/>
-<path d="M11 14C11.2761 14 11.5 13.7761 11.5 13.5C11.5 13.2239 11.2761 13 11 13C10.7239 13 10.5 13.2239 10.5 13.5C10.5 13.7761 10.7239 14 11 14Z" fill="black"/>
+<path opacity="0.6" d="M6 14C6.27614 14 6.5 13.7761 6.5 13.5C6.5 13.2239 6.27614 13 6 13C5.72386 13 5.5 13.2239 5.5 13.5C5.5 13.7761 5.72386 14 6 14Z" fill="black"/>
+<path opacity="0.6" d="M11 14C11.2761 14 11.5 13.7761 11.5 13.5C11.5 13.2239 11.2761 13 11 13C10.7239 13 10.5 13.2239 10.5 13.5C10.5 13.7761 10.7239 14 11 14Z" fill="black"/>
 </svg>
diff --git a/assets/icons/zed_assistant.svg b/assets/icons/zed_assistant.svg
index 470eb0fede..812277a100 100644
--- a/assets/icons/zed_assistant.svg
+++ b/assets/icons/zed_assistant.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 870c2607c4..2d70164a66 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -345,4 +345,8 @@ impl HistoryStore {
             .retain(|old_entry| old_entry != entry);
         self.save_recently_opened_entries(cx);
     }
+
+    pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
+        self.entries(cx).into_iter().take(limit).collect()
+    }
 }
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 74d24efb13..a1f935589a 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -27,7 +27,7 @@ impl AgentServer for NativeAgentServer {
     }
 
     fn empty_state_headline(&self) -> &'static str {
-        ""
+        "Welcome to the Agent Panel"
     }
 
     fn empty_state_message(&self) -> &'static str {
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 813f8b1fe0..dcbeaa1d63 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -18,11 +18,11 @@ const ACP_ARG: &str = "--experimental-acp";
 
 impl AgentServer for Gemini {
     fn name(&self) -> &'static str {
-        "Gemini"
+        "Gemini CLI"
     }
 
     fn empty_state_headline(&self) -> &'static str {
-        "Welcome to Gemini"
+        "Welcome to Gemini CLI"
     }
 
     fn empty_state_message(&self) -> &'static str {
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
index 8a05801139..68a41f31d0 100644
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -1,11 +1,12 @@
-use crate::RemoveSelectedThread;
+use crate::acp::AcpThreadView;
+use crate::{AgentPanel, RemoveSelectedThread};
 use agent2::{HistoryEntry, HistoryStore};
 use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
 use editor::{Editor, EditorEvent};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
     App, Empty, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
-    UniformListScrollHandle, Window, uniform_list,
+    UniformListScrollHandle, WeakEntity, Window, uniform_list,
 };
 use std::{fmt::Display, ops::Range, sync::Arc};
 use time::{OffsetDateTime, UtcOffset};
@@ -639,6 +640,150 @@ impl Render for AcpThreadHistory {
     }
 }
 
+#[derive(IntoElement)]
+pub struct AcpHistoryEntryElement {
+    entry: HistoryEntry,
+    thread_view: WeakEntity<AcpThreadView>,
+    selected: bool,
+    hovered: bool,
+    on_hover: Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
+}
+
+impl AcpHistoryEntryElement {
+    pub fn new(entry: HistoryEntry, thread_view: WeakEntity<AcpThreadView>) -> Self {
+        Self {
+            entry,
+            thread_view,
+            selected: false,
+            hovered: false,
+            on_hover: Box::new(|_, _, _| {}),
+        }
+    }
+
+    pub fn hovered(mut self, hovered: bool) -> Self {
+        self.hovered = hovered;
+        self
+    }
+
+    pub fn on_hover(mut self, on_hover: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
+        self.on_hover = Box::new(on_hover);
+        self
+    }
+}
+
+impl RenderOnce for AcpHistoryEntryElement {
+    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let (id, title, timestamp) = match &self.entry {
+            HistoryEntry::AcpThread(thread) => (
+                thread.id.to_string(),
+                thread.title.clone(),
+                thread.updated_at,
+            ),
+            HistoryEntry::TextThread(context) => (
+                context.path.to_string_lossy().to_string(),
+                context.title.clone(),
+                context.mtime.to_utc(),
+            ),
+        };
+
+        let formatted_time = {
+            let now = chrono::Utc::now();
+            let duration = now.signed_duration_since(timestamp);
+
+            if duration.num_days() > 0 {
+                format!("{}d", duration.num_days())
+            } else if duration.num_hours() > 0 {
+                format!("{}h ago", duration.num_hours())
+            } else if duration.num_minutes() > 0 {
+                format!("{}m ago", duration.num_minutes())
+            } else {
+                "Just now".to_string()
+            }
+        };
+
+        ListItem::new(SharedString::from(id))
+            .rounded()
+            .toggle_state(self.selected)
+            .spacing(ListItemSpacing::Sparse)
+            .start_slot(
+                h_flex()
+                    .w_full()
+                    .gap_2()
+                    .justify_between()
+                    .child(Label::new(title).size(LabelSize::Small).truncate())
+                    .child(
+                        Label::new(formatted_time)
+                            .color(Color::Muted)
+                            .size(LabelSize::XSmall),
+                    ),
+            )
+            .on_hover(self.on_hover)
+            .end_slot::<IconButton>(if self.hovered || self.selected {
+                Some(
+                    IconButton::new("delete", IconName::Trash)
+                        .shape(IconButtonShape::Square)
+                        .icon_size(IconSize::XSmall)
+                        .icon_color(Color::Muted)
+                        .tooltip(move |window, cx| {
+                            Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
+                        })
+                        .on_click({
+                            let thread_view = self.thread_view.clone();
+                            let entry = self.entry.clone();
+
+                            move |_event, _window, cx| {
+                                if let Some(thread_view) = thread_view.upgrade() {
+                                    thread_view.update(cx, |thread_view, cx| {
+                                        thread_view.delete_history_entry(entry.clone(), cx);
+                                    });
+                                }
+                            }
+                        }),
+                )
+            } else {
+                None
+            })
+            .on_click({
+                let thread_view = self.thread_view.clone();
+                let entry = self.entry;
+
+                move |_event, window, cx| {
+                    if let Some(workspace) = thread_view
+                        .upgrade()
+                        .and_then(|view| view.read(cx).workspace().upgrade())
+                    {
+                        match &entry {
+                            HistoryEntry::AcpThread(thread_metadata) => {
+                                if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
+                                    panel.update(cx, |panel, cx| {
+                                        panel.load_agent_thread(
+                                            thread_metadata.clone(),
+                                            window,
+                                            cx,
+                                        );
+                                    });
+                                }
+                            }
+                            HistoryEntry::TextThread(context) => {
+                                if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
+                                    panel.update(cx, |panel, cx| {
+                                        panel
+                                            .open_saved_prompt_editor(
+                                                context.path.clone(),
+                                                window,
+                                                cx,
+                                            )
+                                            .detach_and_log_err(cx);
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+            })
+    }
+}
+
 #[derive(Clone, Copy)]
 pub enum EntryTimeFormat {
     DateAndTime,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2b87144fcd..35da9b8c85 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -8,7 +8,7 @@ use action_log::ActionLog;
 use agent_client_protocol::{self as acp};
 use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
-use agent2::{DbThreadMetadata, HistoryEntryId, HistoryStore};
+use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore};
 use anyhow::bail;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -54,11 +54,12 @@ use crate::acp::entry_view_state::{EntryViewEvent, ViewEvent};
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
 use crate::profile_selector::{ProfileProvider, ProfileSelector};
+
 use crate::ui::preview::UsageCallout;
 use crate::ui::{AgentNotification, AgentNotificationEvent, BurnModeTooltip};
 use crate::{
     AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, ExpandMessageEditor, Follow,
-    KeepAll, OpenAgentDiff, RejectAll, ToggleBurnMode, ToggleProfileSelector,
+    KeepAll, OpenAgentDiff, OpenHistory, RejectAll, ToggleBurnMode, ToggleProfileSelector,
 };
 
 const RESPONSE_PADDING_X: Pixels = px(19.);
@@ -240,6 +241,7 @@ pub struct AcpThreadView {
     project: Entity<Project>,
     thread_state: ThreadState,
     history_store: Entity<HistoryStore>,
+    hovered_recent_history_item: Option<usize>,
     entry_view_state: Entity<EntryViewState>,
     message_editor: Entity<MessageEditor>,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
@@ -357,6 +359,7 @@ impl AcpThreadView {
             editor_expanded: false,
             terminal_expanded: true,
             history_store,
+            hovered_recent_history_item: None,
             _subscriptions: subscriptions,
             _cancel_task: None,
         }
@@ -582,6 +585,10 @@ impl AcpThreadView {
         cx.notify();
     }
 
+    pub fn workspace(&self) -> &WeakEntity<Workspace> {
+        &self.workspace
+    }
+
     pub fn thread(&self) -> Option<&Entity<AcpThread>> {
         match &self.thread_state {
             ThreadState::Ready { thread, .. } => Some(thread),
@@ -2284,51 +2291,132 @@ impl AcpThreadView {
         )
     }
 
-    fn render_empty_state(&self, cx: &App) -> AnyElement {
+    fn render_empty_state_section_header(
+        &self,
+        label: impl Into<SharedString>,
+        action_slot: Option<AnyElement>,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        div().pl_1().pr_1p5().child(
+            h_flex()
+                .mt_2()
+                .pl_1p5()
+                .pb_1()
+                .w_full()
+                .justify_between()
+                .border_b_1()
+                .border_color(cx.theme().colors().border_variant)
+                .child(
+                    Label::new(label.into())
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+                .children(action_slot),
+        )
+    }
+
+    fn render_empty_state(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
         let loading = matches!(&self.thread_state, ThreadState::Loading { .. });
+        let recent_history = self
+            .history_store
+            .update(cx, |history_store, cx| history_store.recent_entries(3, cx));
+        let no_history = self
+            .history_store
+            .update(cx, |history_store, cx| history_store.is_empty(cx));
 
         v_flex()
             .size_full()
-            .items_center()
-            .justify_center()
-            .child(if loading {
-                h_flex()
-                    .justify_center()
-                    .child(self.render_agent_logo())
-                    .with_animation(
-                        "pulsating_icon",
-                        Animation::new(Duration::from_secs(2))
-                            .repeat()
-                            .with_easing(pulsating_between(0.4, 1.0)),
-                        |icon, delta| icon.opacity(delta),
-                    )
-                    .into_any()
-            } else {
-                self.render_agent_logo().into_any_element()
-            })
-            .child(h_flex().mt_4().mb_1().justify_center().child(if loading {
-                div()
-                    .child(LoadingLabel::new("").size(LabelSize::Large))
-                    .into_any_element()
-            } else {
-                Headline::new(self.agent.empty_state_headline())
-                    .size(HeadlineSize::Medium)
-                    .into_any_element()
-            }))
-            .child(
-                div()
-                    .max_w_1_2()
-                    .text_sm()
-                    .text_center()
-                    .map(|this| {
-                        if loading {
-                            this.invisible()
+            .when(no_history, |this| {
+                this.child(
+                    v_flex()
+                        .size_full()
+                        .items_center()
+                        .justify_center()
+                        .child(if loading {
+                            h_flex()
+                                .justify_center()
+                                .child(self.render_agent_logo())
+                                .with_animation(
+                                    "pulsating_icon",
+                                    Animation::new(Duration::from_secs(2))
+                                        .repeat()
+                                        .with_easing(pulsating_between(0.4, 1.0)),
+                                    |icon, delta| icon.opacity(delta),
+                                )
+                                .into_any()
                         } else {
-                            this.text_color(cx.theme().colors().text_muted)
-                        }
-                    })
-                    .child(self.agent.empty_state_message()),
-            )
+                            self.render_agent_logo().into_any_element()
+                        })
+                        .child(h_flex().mt_4().mb_2().justify_center().child(if loading {
+                            div()
+                                .child(LoadingLabel::new("").size(LabelSize::Large))
+                                .into_any_element()
+                        } else {
+                            Headline::new(self.agent.empty_state_headline())
+                                .size(HeadlineSize::Medium)
+                                .into_any_element()
+                        })),
+                )
+            })
+            .when(!no_history, |this| {
+                this.justify_end().child(
+                    v_flex()
+                        .child(
+                            self.render_empty_state_section_header(
+                                "Recent",
+                                Some(
+                                    Button::new("view-history", "View All")
+                                        .style(ButtonStyle::Subtle)
+                                        .label_size(LabelSize::Small)
+                                        .key_binding(
+                                            KeyBinding::for_action_in(
+                                                &OpenHistory,
+                                                &self.focus_handle(cx),
+                                                window,
+                                                cx,
+                                            )
+                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                        )
+                                        .on_click(move |_event, window, cx| {
+                                            window.dispatch_action(OpenHistory.boxed_clone(), cx);
+                                        })
+                                        .into_any_element(),
+                                ),
+                                cx,
+                            ),
+                        )
+                        .child(
+                            v_flex().p_1().pr_1p5().gap_1().children(
+                                recent_history
+                                    .into_iter()
+                                    .enumerate()
+                                    .map(|(index, entry)| {
+                                        // TODO: Add keyboard navigation.
+                                        let is_hovered =
+                                            self.hovered_recent_history_item == Some(index);
+                                        crate::acp::thread_history::AcpHistoryEntryElement::new(
+                                            entry,
+                                            cx.entity().downgrade(),
+                                        )
+                                        .hovered(is_hovered)
+                                        .on_hover(cx.listener(
+                                            move |this, is_hovered, _window, cx| {
+                                                if *is_hovered {
+                                                    this.hovered_recent_history_item = Some(index);
+                                                } else if this.hovered_recent_history_item
+                                                    == Some(index)
+                                                {
+                                                    this.hovered_recent_history_item = None;
+                                                }
+                                                cx.notify();
+                                            },
+                                        ))
+                                        .into_any_element()
+                                    }),
+                            ),
+                        ),
+                )
+            })
             .into_any()
     }
 
@@ -2351,9 +2439,11 @@ impl AcpThreadView {
                     .items_center()
                     .justify_center()
                     .child(self.render_error_agent_logo())
-                    .child(h_flex().mt_4().mb_1().justify_center().child(
-                        Headline::new(self.agent.empty_state_headline()).size(HeadlineSize::Medium),
-                    ))
+                    .child(
+                        h_flex().mt_4().mb_1().justify_center().child(
+                            Headline::new("Authentication Required").size(HeadlineSize::Medium),
+                        ),
+                    )
                     .into_any(),
             )
             .children(description.map(|desc| {
@@ -4234,6 +4324,18 @@ impl AcpThreadView {
         );
         cx.notify();
     }
+
+    pub fn delete_history_entry(&mut self, entry: HistoryEntry, cx: &mut Context<Self>) {
+        let task = match entry {
+            HistoryEntry::AcpThread(thread) => self.history_store.update(cx, |history, cx| {
+                history.delete_thread(thread.id.clone(), cx)
+            }),
+            HistoryEntry::TextThread(context) => self.history_store.update(cx, |history, cx| {
+                history.delete_text_thread(context.path.clone(), cx)
+            }),
+        };
+        task.detach_and_log_err(cx);
+    }
 }
 
 impl Focusable for AcpThreadView {
@@ -4268,7 +4370,9 @@ impl Render for AcpThreadView {
                     window,
                     cx,
                 ),
-                ThreadState::Loading { .. } => v_flex().flex_1().child(self.render_empty_state(cx)),
+                ThreadState::Loading { .. } => {
+                    v_flex().flex_1().child(self.render_empty_state(window, cx))
+                }
                 ThreadState::LoadError(e) => v_flex()
                     .p_2()
                     .flex_1()
@@ -4310,7 +4414,7 @@ impl Render for AcpThreadView {
                                 },
                             )
                         } else {
-                            this.child(self.render_empty_state(cx))
+                            this.child(self.render_empty_state(window, cx))
                         }
                     })
                 }
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index beeaf0c43b..e27a224240 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -2,7 +2,6 @@ mod agent_notification;
 mod burn_mode_tooltip;
 mod context_pill;
 mod end_trial_upsell;
-// mod new_thread_button;
 mod onboarding_modal;
 pub mod preview;
 
@@ -10,5 +9,4 @@ pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
 pub use end_trial_upsell::*;
-// pub use new_thread_button::*;
 pub use onboarding_modal::*;
diff --git a/crates/agent_ui/src/ui/new_thread_button.rs b/crates/agent_ui/src/ui/new_thread_button.rs
deleted file mode 100644
index 347d6adcaf..0000000000
--- a/crates/agent_ui/src/ui/new_thread_button.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use gpui::{ClickEvent, ElementId, IntoElement, ParentElement, Styled};
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct NewThreadButton {
-    id: ElementId,
-    label: SharedString,
-    icon: IconName,
-    keybinding: Option<ui::KeyBinding>,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-}
-
-impl NewThreadButton {
-    fn new(id: impl Into<ElementId>, label: impl Into<SharedString>, icon: IconName) -> Self {
-        Self {
-            id: id.into(),
-            label: label.into(),
-            icon,
-            keybinding: None,
-            on_click: None,
-        }
-    }
-
-    fn keybinding(mut self, keybinding: Option<ui::KeyBinding>) -> Self {
-        self.keybinding = keybinding;
-        self
-    }
-
-    fn on_click<F>(mut self, handler: F) -> Self
-    where
-        F: Fn(&mut Window, &mut App) + 'static,
-    {
-        self.on_click = Some(Box::new(
-            move |_: &ClickEvent, window: &mut Window, cx: &mut App| handler(window, cx),
-        ));
-        self
-    }
-}
-
-impl RenderOnce for NewThreadButton {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id(self.id)
-            .w_full()
-            .py_1p5()
-            .px_2()
-            .gap_1()
-            .justify_between()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border.opacity(0.4))
-            .bg(cx.theme().colors().element_active.opacity(0.2))
-            .hover(|style| {
-                style
-                    .bg(cx.theme().colors().element_hover)
-                    .border_color(cx.theme().colors().border)
-            })
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .child(
-                        Icon::new(self.icon)
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .child(Label::new(self.label).size(LabelSize::Small)),
-            )
-            .when_some(self.keybinding, |this, keybinding| {
-                this.child(keybinding.size(rems_from_px(10.)))
-            })
-            .when_some(self.on_click, |this, on_click| {
-                this.on_click(move |event, window, cx| on_click(event, window, cx))
-            })
-    }
-}

From d1820b183a08549927164e9a0791d7e7053ab484 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 18:26:07 -0300
Subject: [PATCH 229/823] acp: Suggest installing gemini@preview instead of
 latest (#36629)

Release Notes:

- N/A
---
 crates/agent_servers/src/gemini.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index dcbeaa1d63..25c654db9b 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -53,7 +53,7 @@ impl AgentServer for Gemini {
                 return Err(LoadError::NotInstalled {
                     error_message: "Failed to find Gemini CLI binary".into(),
                     install_message: "Install Gemini CLI".into(),
-                    install_command: "npm install -g @google/gemini-cli@latest".into()
+                    install_command: "npm install -g @google/gemini-cli@preview".into()
                 }.into());
             };
 

From 595cf1c6c3ce6980c4937fbb7a17229c31ff398f Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 20 Aug 2025 17:31:25 -0400
Subject: [PATCH 230/823] acp: Rename `assistant::QuoteSelection` and support
 it in agent2 threads (#36628)

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json             |   4 +-
 assets/keymaps/default-macos.json             |   4 +-
 assets/keymaps/linux/cursor.json              |   4 +-
 assets/keymaps/macos/cursor.json              |   4 +-
 .../agent_ui/src/acp/completion_provider.rs   | 122 ++++++++++--------
 crates/agent_ui/src/acp/message_editor.rs     |  54 ++++++--
 crates/agent_ui/src/acp/thread_view.rs        |   6 +
 crates/agent_ui/src/agent_panel.rs            |  16 ++-
 crates/agent_ui/src/agent_ui.rs               |   6 +
 crates/agent_ui/src/text_thread_editor.rs     |   3 +-
 docs/src/ai/text-threads.md                   |   4 +-
 11 files changed, 148 insertions(+), 79 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index b4efa70572..955e68f5a9 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -138,7 +138,7 @@
       "find": "buffer_search::Deploy",
       "ctrl-f": "buffer_search::Deploy",
       "ctrl-h": "buffer_search::DeployReplace",
-      "ctrl->": "assistant::QuoteSelection",
+      "ctrl->": "agent::QuoteSelection",
       "ctrl-<": "assistant::InsertIntoEditor",
       "ctrl-alt-e": "editor::SelectEnclosingSymbol",
       "ctrl-shift-backspace": "editor::GoToPreviousChange",
@@ -241,7 +241,7 @@
       "ctrl-shift-i": "agent::ToggleOptionsMenu",
       "ctrl-alt-shift-n": "agent::ToggleNewThreadMenu",
       "shift-alt-escape": "agent::ExpandMessageEditor",
-      "ctrl->": "assistant::QuoteSelection",
+      "ctrl->": "agent::QuoteSelection",
       "ctrl-alt-e": "agent::RemoveAllContext",
       "ctrl-shift-e": "project_panel::ToggleFocus",
       "ctrl-shift-enter": "agent::ContinueThread",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index ad2ab2ba89..8b18299a91 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -162,7 +162,7 @@
       "cmd-alt-f": "buffer_search::DeployReplace",
       "cmd-alt-l": ["buffer_search::Deploy", { "selection_search_enabled": true }],
       "cmd-e": ["buffer_search::Deploy", { "focus": false }],
-      "cmd->": "assistant::QuoteSelection",
+      "cmd->": "agent::QuoteSelection",
       "cmd-<": "assistant::InsertIntoEditor",
       "cmd-alt-e": "editor::SelectEnclosingSymbol",
       "alt-enter": "editor::OpenSelectionsInMultibuffer"
@@ -281,7 +281,7 @@
       "cmd-shift-i": "agent::ToggleOptionsMenu",
       "cmd-alt-shift-n": "agent::ToggleNewThreadMenu",
       "shift-alt-escape": "agent::ExpandMessageEditor",
-      "cmd->": "assistant::QuoteSelection",
+      "cmd->": "agent::QuoteSelection",
       "cmd-alt-e": "agent::RemoveAllContext",
       "cmd-shift-e": "project_panel::ToggleFocus",
       "cmd-ctrl-b": "agent::ToggleBurnMode",
diff --git a/assets/keymaps/linux/cursor.json b/assets/keymaps/linux/cursor.json
index 1c381b0cf0..2e27158e11 100644
--- a/assets/keymaps/linux/cursor.json
+++ b/assets/keymaps/linux/cursor.json
@@ -17,8 +17,8 @@
     "bindings": {
       "ctrl-i": "agent::ToggleFocus",
       "ctrl-shift-i": "agent::ToggleFocus",
-      "ctrl-shift-l": "assistant::QuoteSelection", // In cursor uses "Ask" mode
-      "ctrl-l": "assistant::QuoteSelection", // In cursor uses "Agent" mode
+      "ctrl-shift-l": "agent::QuoteSelection", // In cursor uses "Ask" mode
+      "ctrl-l": "agent::QuoteSelection", // In cursor uses "Agent" mode
       "ctrl-k": "assistant::InlineAssist",
       "ctrl-shift-k": "assistant::InsertIntoEditor"
     }
diff --git a/assets/keymaps/macos/cursor.json b/assets/keymaps/macos/cursor.json
index fdf9c437cf..1d723bd75b 100644
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -17,8 +17,8 @@
     "bindings": {
       "cmd-i": "agent::ToggleFocus",
       "cmd-shift-i": "agent::ToggleFocus",
-      "cmd-shift-l": "assistant::QuoteSelection", // In cursor uses "Ask" mode
-      "cmd-l": "assistant::QuoteSelection", // In cursor uses "Agent" mode
+      "cmd-shift-l": "agent::QuoteSelection", // In cursor uses "Ask" mode
+      "cmd-l": "agent::QuoteSelection", // In cursor uses "Agent" mode
       "cmd-k": "assistant::InlineAssist",
       "cmd-shift-k": "assistant::InsertIntoEditor"
     }
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index bf0a3f7a5a..3587e5144e 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -108,62 +108,7 @@ impl ContextPickerCompletionProvider {
                 confirm: Some(Arc::new(|_, _, _| true)),
             }),
             ContextPickerEntry::Action(action) => {
-                let (new_text, on_action) = match action {
-                    ContextPickerAction::AddSelections => {
-                        const PLACEHOLDER: &str = "selection ";
-                        let selections = selection_ranges(workspace, cx)
-                            .into_iter()
-                            .enumerate()
-                            .map(|(ix, (buffer, range))| {
-                                (
-                                    buffer,
-                                    range,
-                                    (PLACEHOLDER.len() * ix)..(PLACEHOLDER.len() * (ix + 1) - 1),
-                                )
-                            })
-                            .collect::<Vec<_>>();
-
-                        let new_text: String = PLACEHOLDER.repeat(selections.len());
-
-                        let callback = Arc::new({
-                            let source_range = source_range.clone();
-                            move |_, window: &mut Window, cx: &mut App| {
-                                let selections = selections.clone();
-                                let message_editor = message_editor.clone();
-                                let source_range = source_range.clone();
-                                window.defer(cx, move |window, cx| {
-                                    message_editor
-                                        .update(cx, |message_editor, cx| {
-                                            message_editor.confirm_mention_for_selection(
-                                                source_range,
-                                                selections,
-                                                window,
-                                                cx,
-                                            )
-                                        })
-                                        .ok();
-                                });
-                                false
-                            }
-                        });
-
-                        (new_text, callback)
-                    }
-                };
-
-                Some(Completion {
-                    replace_range: source_range,
-                    new_text,
-                    label: CodeLabel::plain(action.label().to_string(), None),
-                    icon_path: Some(action.icon().path().into()),
-                    documentation: None,
-                    source: project::CompletionSource::Custom,
-                    insert_text_mode: None,
-                    // This ensures that when a user accepts this completion, the
-                    // completion menu will still be shown after "@category " is
-                    // inserted
-                    confirm: Some(on_action),
-                })
+                Self::completion_for_action(action, source_range, message_editor, workspace, cx)
             }
         }
     }
@@ -359,6 +304,71 @@ impl ContextPickerCompletionProvider {
         })
     }
 
+    pub(crate) fn completion_for_action(
+        action: ContextPickerAction,
+        source_range: Range<Anchor>,
+        message_editor: WeakEntity<MessageEditor>,
+        workspace: &Entity<Workspace>,
+        cx: &mut App,
+    ) -> Option<Completion> {
+        let (new_text, on_action) = match action {
+            ContextPickerAction::AddSelections => {
+                const PLACEHOLDER: &str = "selection ";
+                let selections = selection_ranges(workspace, cx)
+                    .into_iter()
+                    .enumerate()
+                    .map(|(ix, (buffer, range))| {
+                        (
+                            buffer,
+                            range,
+                            (PLACEHOLDER.len() * ix)..(PLACEHOLDER.len() * (ix + 1) - 1),
+                        )
+                    })
+                    .collect::<Vec<_>>();
+
+                let new_text: String = PLACEHOLDER.repeat(selections.len());
+
+                let callback = Arc::new({
+                    let source_range = source_range.clone();
+                    move |_, window: &mut Window, cx: &mut App| {
+                        let selections = selections.clone();
+                        let message_editor = message_editor.clone();
+                        let source_range = source_range.clone();
+                        window.defer(cx, move |window, cx| {
+                            message_editor
+                                .update(cx, |message_editor, cx| {
+                                    message_editor.confirm_mention_for_selection(
+                                        source_range,
+                                        selections,
+                                        window,
+                                        cx,
+                                    )
+                                })
+                                .ok();
+                        });
+                        false
+                    }
+                });
+
+                (new_text, callback)
+            }
+        };
+
+        Some(Completion {
+            replace_range: source_range,
+            new_text,
+            label: CodeLabel::plain(action.label().to_string(), None),
+            icon_path: Some(action.icon().path().into()),
+            documentation: None,
+            source: project::CompletionSource::Custom,
+            insert_text_mode: None,
+            // This ensures that when a user accepts this completion, the
+            // completion menu will still be shown after "@category " is
+            // inserted
+            confirm: Some(on_action),
+        })
+    }
+
     fn search(
         &self,
         mode: Option<ContextPickerMode>,
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 5eab1a4e2d..be133808b7 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1,6 +1,6 @@
 use crate::{
     acp::completion_provider::ContextPickerCompletionProvider,
-    context_picker::fetch_context_picker::fetch_url_content,
+    context_picker::{ContextPickerAction, fetch_context_picker::fetch_url_content},
 };
 use acp_thread::{MentionUri, selection_name};
 use agent_client_protocol as acp;
@@ -27,7 +27,7 @@ use gpui::{
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
-use project::{Project, ProjectPath, Worktree};
+use project::{CompletionIntent, Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::PromptStore;
 use rope::Point;
 use settings::Settings;
@@ -561,21 +561,24 @@ impl MessageEditor {
             let range = snapshot.anchor_after(offset + range_to_fold.start)
                 ..snapshot.anchor_after(offset + range_to_fold.end);
 
-            let path = buffer
-                .read(cx)
-                .file()
-                .map_or(PathBuf::from("untitled"), |file| file.path().to_path_buf());
+            // TODO support selections from buffers with no path
+            let Some(project_path) = buffer.read(cx).project_path(cx) else {
+                continue;
+            };
+            let Some(abs_path) = self.project.read(cx).absolute_path(&project_path, cx) else {
+                continue;
+            };
             let snapshot = buffer.read(cx).snapshot();
 
             let point_range = selection_range.to_point(&snapshot);
             let line_range = point_range.start.row..point_range.end.row;
 
             let uri = MentionUri::Selection {
-                path: path.clone(),
+                path: abs_path.clone(),
                 line_range: line_range.clone(),
             };
             let crease = crate::context_picker::crease_for_mention(
-                selection_name(&path, &line_range).into(),
+                selection_name(&abs_path, &line_range).into(),
                 uri.icon_path(cx),
                 range,
                 self.editor.downgrade(),
@@ -587,8 +590,7 @@ impl MessageEditor {
                 crease_ids.first().copied().unwrap()
             });
 
-            self.mention_set
-                .insert_uri(crease_id, MentionUri::Selection { path, line_range });
+            self.mention_set.insert_uri(crease_id, uri);
         }
     }
 
@@ -948,6 +950,38 @@ impl MessageEditor {
         .detach();
     }
 
+    pub fn insert_selections(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let buffer = self.editor.read(cx).buffer().clone();
+        let Some(buffer) = buffer.read(cx).as_singleton() else {
+            return;
+        };
+        let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
+        let Some(workspace) = self.workspace.upgrade() else {
+            return;
+        };
+        let Some(completion) = ContextPickerCompletionProvider::completion_for_action(
+            ContextPickerAction::AddSelections,
+            anchor..anchor,
+            cx.weak_entity(),
+            &workspace,
+            cx,
+        ) else {
+            return;
+        };
+        self.editor.update(cx, |message_editor, cx| {
+            message_editor.edit(
+                [(
+                    multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
+                    completion.new_text,
+                )],
+                cx,
+            );
+        });
+        if let Some(confirm) = completion.confirm {
+            confirm(CompletionIntent::Complete, window, cx);
+        }
+    }
+
     pub fn set_read_only(&mut self, read_only: bool, cx: &mut Context<Self>) {
         self.editor.update(cx, |message_editor, cx| {
             message_editor.set_read_only(read_only);
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 35da9b8c85..0dfa3d259e 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4097,6 +4097,12 @@ impl AcpThreadView {
         })
     }
 
+    pub(crate) fn insert_selections(&self, window: &mut Window, cx: &mut Context<Self>) {
+        self.message_editor.update(cx, |message_editor, cx| {
+            message_editor.insert_selections(window, cx);
+        })
+    }
+
     fn render_thread_retry_status_callout(
         &self,
         _window: &mut Window,
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index e2c4acb1ce..65a9da573a 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -903,6 +903,16 @@ impl AgentPanel {
         }
     }
 
+    fn active_thread_view(&self) -> Option<&Entity<AcpThreadView>> {
+        match &self.active_view {
+            ActiveView::ExternalAgentThread { thread_view } => Some(thread_view),
+            ActiveView::Thread { .. }
+            | ActiveView::TextThread { .. }
+            | ActiveView::History
+            | ActiveView::Configuration => None,
+        }
+    }
+
     fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
         if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
             return self.new_agent_thread(AgentType::NativeAgent, window, cx);
@@ -3882,7 +3892,11 @@ impl AgentPanelDelegate for ConcreteAssistantPanelDelegate {
             // Wait to create a new context until the workspace is no longer
             // being updated.
             cx.defer_in(window, move |panel, window, cx| {
-                if let Some(message_editor) = panel.active_message_editor() {
+                if let Some(thread_view) = panel.active_thread_view() {
+                    thread_view.update(cx, |thread_view, cx| {
+                        thread_view.insert_selections(window, cx);
+                    });
+                } else if let Some(message_editor) = panel.active_message_editor() {
                     message_editor.update(cx, |message_editor, cx| {
                         message_editor.context_store().update(cx, |store, cx| {
                             let buffer = buffer.read(cx);
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 7b6557245f..6084fd6423 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -128,6 +128,12 @@ actions!(
     ]
 );
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Action)]
+#[action(namespace = agent)]
+#[action(deprecated_aliases = ["assistant::QuoteSelection"])]
+/// Quotes the current selection in the agent panel's message editor.
+pub struct QuoteSelection;
+
 /// Creates a new conversation thread, optionally based on an existing thread.
 #[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index a928f7af54..9fbd90c4a6 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1,4 +1,5 @@
 use crate::{
+    QuoteSelection,
     language_model_selector::{LanguageModelSelector, language_model_selector},
     ui::BurnModeTooltip,
 };
@@ -89,8 +90,6 @@ actions!(
         CycleMessageRole,
         /// Inserts the selected text into the active editor.
         InsertIntoEditor,
-        /// Quotes the current selection in the assistant conversation.
-        QuoteSelection,
         /// Splits the conversation at the current cursor position.
         Split,
     ]
diff --git a/docs/src/ai/text-threads.md b/docs/src/ai/text-threads.md
index 65a5dcba03..ed439252b4 100644
--- a/docs/src/ai/text-threads.md
+++ b/docs/src/ai/text-threads.md
@@ -16,7 +16,7 @@ To begin, type a message in a `You` block.
 
 As you type, the remaining tokens count for the selected model is updated.
 
-Inserting text from an editor is as simple as highlighting the text and running `assistant: quote selection` ({#kb assistant::QuoteSelection}); Zed will wrap it in a fenced code block if it is code.
+Inserting text from an editor is as simple as highlighting the text and running `agent: quote selection` ({#kb agent::QuoteSelection}); Zed will wrap it in a fenced code block if it is code.
 
 ![Quoting a selection](https://zed.dev/img/assistant/quoting-a-selection.png)
 
@@ -148,7 +148,7 @@ Usage: `/terminal [<number>]`
 
 The `/selection` command inserts the selected text in the editor into the context. This is useful for referencing specific parts of your code.
 
-This is equivalent to the `assistant: quote selection` command ({#kb assistant::QuoteSelection}).
+This is equivalent to the `agent: quote selection` command ({#kb agent::QuoteSelection}).
 
 Usage: `/selection`
 

From 9e34bb3f058982f060face485186eba9a739afca Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 18:35:48 -0300
Subject: [PATCH 231/823] acp: Hide feedback buttons for external agents
 (#36630)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 0dfa3d259e..f4c0ce9784 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -3815,7 +3815,11 @@ impl AcpThreadView {
             .flex_wrap()
             .justify_end();
 
-        if AgentSettings::get_global(cx).enable_feedback {
+        if AgentSettings::get_global(cx).enable_feedback
+            && self
+                .thread()
+                .is_some_and(|thread| thread.read(cx).connection().telemetry().is_some())
+        {
             let feedback = self.thread_feedback.feedback;
             container = container.child(
                 div().visible_on_hover("thread-controls-container").child(

From c9c708ff08571ceab3d8aad7354042230d99750c Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Wed, 20 Aug 2025 16:43:53 -0500
Subject: [PATCH 232/823] nix: Re-enable nightly builds (#36632)

Release Notes:

- N/A
---
 .github/workflows/release_nightly.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 0cc6737a45..5d63c34edd 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -206,9 +206,6 @@ jobs:
     runs-on: github-8vcpu-ubuntu-2404
     needs: tests
     name: Build Zed on FreeBSD
-    # env:
-    #   MYTOKEN : ${{ secrets.MYTOKEN }}
-    #   MYTOKEN2: "value2"
     steps:
       - uses: actions/checkout@v4
       - name: Build FreeBSD remote-server
@@ -243,7 +240,6 @@ jobs:
 
   bundle-nix:
     name: Build and cache Nix package
-    if: false
     needs: tests
     secrets: inherit
     uses: ./.github/workflows/nix.yml

From 5120b6b7f9962daf0000618a06e4e1522c575334 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 20 Aug 2025 16:12:41 -0600
Subject: [PATCH 233/823] acp: Handle Gemini Auth Better (#36631)

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 crates/agent_servers/src/gemini.rs            |   7 +-
 crates/agent_ui/src/acp/thread_view.rs        | 154 ++++++++++++++++--
 crates/language_models/src/provider/google.rs |  53 +++++-
 3 files changed, 195 insertions(+), 19 deletions(-)

diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 25c654db9b..d30525328b 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -5,6 +5,7 @@ use crate::{AgentServer, AgentServerCommand};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
 use gpui::{Entity, Task};
+use language_models::provider::google::GoogleLanguageModelProvider;
 use project::Project;
 use settings::SettingsStore;
 use ui::App;
@@ -47,7 +48,7 @@ impl AgentServer for Gemini {
                 settings.get::<AllAgentServersSettings>(None).gemini.clone()
             })?;
 
-            let Some(command) =
+            let Some(mut command) =
                 AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx).await
             else {
                 return Err(LoadError::NotInstalled {
@@ -57,6 +58,10 @@ impl AgentServer for Gemini {
                 }.into());
             };
 
+            if let Some(api_key)= cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
+                command.env.get_or_insert_default().insert("GEMINI_API_KEY".to_owned(), api_key.key);
+            }
+
             let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
             if result.is_err() {
                 let version_fut = util::command::new_smol_command(&command.path)
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f4c0ce9784..12a33d022e 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -278,6 +278,7 @@ enum ThreadState {
         connection: Rc<dyn AgentConnection>,
         description: Option<Entity<Markdown>>,
         configuration_view: Option<AnyView>,
+        pending_auth_method: Option<acp::AuthMethodId>,
         _subscription: Option<Subscription>,
     },
 }
@@ -563,6 +564,7 @@ impl AcpThreadView {
 
         this.update(cx, |this, cx| {
             this.thread_state = ThreadState::Unauthenticated {
+                pending_auth_method: None,
                 connection,
                 configuration_view,
                 description: err
@@ -999,12 +1001,74 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let ThreadState::Unauthenticated { ref connection, .. } = self.thread_state else {
+        let ThreadState::Unauthenticated {
+            connection,
+            pending_auth_method,
+            configuration_view,
+            ..
+        } = &mut self.thread_state
+        else {
             return;
         };
 
+        if method.0.as_ref() == "gemini-api-key" {
+            let registry = LanguageModelRegistry::global(cx);
+            let provider = registry
+                .read(cx)
+                .provider(&language_model::GOOGLE_PROVIDER_ID)
+                .unwrap();
+            if !provider.is_authenticated(cx) {
+                let this = cx.weak_entity();
+                let agent = self.agent.clone();
+                let connection = connection.clone();
+                window.defer(cx, |window, cx| {
+                    Self::handle_auth_required(
+                        this,
+                        AuthRequired {
+                            description: Some("GEMINI_API_KEY must be set".to_owned()),
+                            provider_id: Some(language_model::GOOGLE_PROVIDER_ID),
+                        },
+                        agent,
+                        connection,
+                        window,
+                        cx,
+                    );
+                });
+                return;
+            }
+        } else if method.0.as_ref() == "vertex-ai"
+            && std::env::var("GOOGLE_API_KEY").is_err()
+            && (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()
+                || (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()))
+        {
+            let this = cx.weak_entity();
+            let agent = self.agent.clone();
+            let connection = connection.clone();
+
+            window.defer(cx, |window, cx| {
+                    Self::handle_auth_required(
+                        this,
+                        AuthRequired {
+                            description: Some(
+                                "GOOGLE_API_KEY must be set in the environment to use Vertex AI authentication for Gemini CLI. Please export it and restart Zed."
+                                    .to_owned(),
+                            ),
+                            provider_id: None,
+                        },
+                        agent,
+                        connection,
+                        window,
+                        cx,
+                    )
+                });
+            return;
+        }
+
         self.thread_error.take();
+        configuration_view.take();
+        pending_auth_method.replace(method.clone());
         let authenticate = connection.authenticate(method, cx);
+        cx.notify();
         self.auth_task = Some(cx.spawn_in(window, {
             let project = self.project.clone();
             let agent = self.agent.clone();
@@ -2425,6 +2489,7 @@ impl AcpThreadView {
         connection: &Rc<dyn AgentConnection>,
         description: Option<&Entity<Markdown>>,
         configuration_view: Option<&AnyView>,
+        pending_auth_method: Option<&acp::AuthMethodId>,
         window: &mut Window,
         cx: &Context<Self>,
     ) -> Div {
@@ -2456,17 +2521,80 @@ impl AcpThreadView {
                     .cloned()
                     .map(|view| div().px_4().w_full().max_w_128().child(view)),
             )
-            .child(h_flex().mt_1p5().justify_center().children(
-                connection.auth_methods().iter().map(|method| {
-                    Button::new(SharedString::from(method.id.0.clone()), method.name.clone())
-                        .on_click({
-                            let method_id = method.id.clone();
-                            cx.listener(move |this, _, window, cx| {
-                                this.authenticate(method_id.clone(), window, cx)
+            .when(
+                configuration_view.is_none()
+                    && description.is_none()
+                    && pending_auth_method.is_none(),
+                |el| {
+                    el.child(
+                        div()
+                            .text_ui(cx)
+                            .text_center()
+                            .px_4()
+                            .w_full()
+                            .max_w_128()
+                            .child(Label::new("Authentication required")),
+                    )
+                },
+            )
+            .when_some(pending_auth_method, |el, _| {
+                let spinner_icon = div()
+                    .px_0p5()
+                    .id("generating")
+                    .tooltip(Tooltip::text("Generating Changes…"))
+                    .child(
+                        Icon::new(IconName::ArrowCircle)
+                            .size(IconSize::Small)
+                            .with_animation(
+                                "arrow-circle",
+                                Animation::new(Duration::from_secs(2)).repeat(),
+                                |icon, delta| {
+                                    icon.transform(Transformation::rotate(percentage(delta)))
+                                },
+                            )
+                            .into_any_element(),
+                    )
+                    .into_any();
+                el.child(
+                    h_flex()
+                        .text_ui(cx)
+                        .text_center()
+                        .justify_center()
+                        .gap_2()
+                        .px_4()
+                        .w_full()
+                        .max_w_128()
+                        .child(Label::new("Authenticating..."))
+                        .child(spinner_icon),
+                )
+            })
+            .child(
+                h_flex()
+                    .mt_1p5()
+                    .gap_1()
+                    .flex_wrap()
+                    .justify_center()
+                    .children(connection.auth_methods().iter().enumerate().rev().map(
+                        |(ix, method)| {
+                            Button::new(
+                                SharedString::from(method.id.0.clone()),
+                                method.name.clone(),
+                            )
+                            .style(ButtonStyle::Outlined)
+                            .when(ix == 0, |el| {
+                                el.style(ButtonStyle::Tinted(ui::TintColor::Accent))
                             })
-                        })
-                }),
-            ))
+                            .size(ButtonSize::Medium)
+                            .label_size(LabelSize::Small)
+                            .on_click({
+                                let method_id = method.id.clone();
+                                cx.listener(move |this, _, window, cx| {
+                                    this.authenticate(method_id.clone(), window, cx)
+                                })
+                            })
+                        },
+                    )),
+            )
     }
 
     fn render_load_error(&self, e: &LoadError, cx: &Context<Self>) -> AnyElement {
@@ -2551,6 +2679,8 @@ impl AcpThreadView {
             let install_command = install_command.clone();
             container = container.child(
                 Button::new("install", install_message)
+                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
+                    .size(ButtonSize::Medium)
                     .tooltip(Tooltip::text(install_command.clone()))
                     .on_click(cx.listener(move |this, _, window, cx| {
                         let task = this
@@ -4372,11 +4502,13 @@ impl Render for AcpThreadView {
                     connection,
                     description,
                     configuration_view,
+                    pending_auth_method,
                     ..
                 } => self.render_auth_required_state(
                     connection,
                     description.as_ref(),
                     configuration_view.as_ref(),
+                    pending_auth_method.as_ref(),
                     window,
                     cx,
                 ),
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 1ac12b4cd4..566620675e 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -12,9 +12,9 @@ use gpui::{
 };
 use http_client::HttpClient;
 use language_model::{
-    AuthenticateError, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelToolChoice, LanguageModelToolSchemaFormat, LanguageModelToolUse,
-    LanguageModelToolUseId, MessageContent, StopReason,
+    AuthenticateError, ConfigurationViewTargetAgent, LanguageModelCompletionError,
+    LanguageModelCompletionEvent, LanguageModelToolChoice, LanguageModelToolSchemaFormat,
+    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, StopReason,
 };
 use language_model::{
     LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
@@ -37,6 +37,8 @@ use util::ResultExt;
 use crate::AllLanguageModelSettings;
 use crate::ui::InstructionListItem;
 
+use super::anthropic::ApiKey;
+
 const PROVIDER_ID: LanguageModelProviderId = language_model::GOOGLE_PROVIDER_ID;
 const PROVIDER_NAME: LanguageModelProviderName = language_model::GOOGLE_PROVIDER_NAME;
 
@@ -198,6 +200,33 @@ impl GoogleLanguageModelProvider {
             request_limiter: RateLimiter::new(4),
         })
     }
+
+    pub fn api_key(cx: &mut App) -> Task<Result<ApiKey>> {
+        let credentials_provider = <dyn CredentialsProvider>::global(cx);
+        let api_url = AllLanguageModelSettings::get_global(cx)
+            .google
+            .api_url
+            .clone();
+
+        if let Ok(key) = std::env::var(GEMINI_API_KEY_VAR) {
+            Task::ready(Ok(ApiKey {
+                key,
+                from_env: true,
+            }))
+        } else {
+            cx.spawn(async move |cx| {
+                let (_, api_key) = credentials_provider
+                    .read_credentials(&api_url, cx)
+                    .await?
+                    .ok_or(AuthenticateError::CredentialsNotFound)?;
+
+                Ok(ApiKey {
+                    key: String::from_utf8(api_key).context("invalid {PROVIDER_NAME} API key")?,
+                    from_env: false,
+                })
+            })
+        }
+    }
 }
 
 impl LanguageModelProviderState for GoogleLanguageModelProvider {
@@ -279,11 +308,11 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
 
     fn configuration_view(
         &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
+        target_agent: language_model::ConfigurationViewTargetAgent,
         window: &mut Window,
         cx: &mut App,
     ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
+        cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
             .into()
     }
 
@@ -776,11 +805,17 @@ fn convert_usage(usage: &UsageMetadata) -> language_model::TokenUsage {
 struct ConfigurationView {
     api_key_editor: Entity<Editor>,
     state: gpui::Entity<State>,
+    target_agent: language_model::ConfigurationViewTargetAgent,
     load_credentials_task: Option<Task<()>>,
 }
 
 impl ConfigurationView {
-    fn new(state: gpui::Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+    fn new(
+        state: gpui::Entity<State>,
+        target_agent: language_model::ConfigurationViewTargetAgent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
         cx.observe(&state, |_, _, cx| {
             cx.notify();
         })
@@ -810,6 +845,7 @@ impl ConfigurationView {
                 editor.set_placeholder_text("AIzaSy...", cx);
                 editor
             }),
+            target_agent,
             state,
             load_credentials_task,
         }
@@ -885,7 +921,10 @@ impl Render for ConfigurationView {
             v_flex()
                 .size_full()
                 .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with Google AI, you need to add an API key. Follow these steps:"))
+                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match self.target_agent {
+                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Google AI",
+                    ConfigurationViewTargetAgent::Other(agent) => agent,
+                })))
                 .child(
                     List::new()
                         .child(InstructionListItem::new(

From ffb995181ef0d1034f89108ce50be4a8c679f41f Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 19:30:25 -0300
Subject: [PATCH 234/823] acp: Supress gemini aborted errors (#36633)

This PR adds a temporary workaround to supress "Aborted" errors from
Gemini when cancelling generation. This won't be needed once
https://github.com/google-gemini/gemini-cli/pull/6656 is generally
available.

Release Notes:

- N/A
---
 Cargo.lock                         |  4 +-
 Cargo.toml                         |  2 +-
 crates/agent_servers/src/acp/v1.rs | 61 ++++++++++++++++++++++++++++--
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7df5304d92..bfb135d32c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c887e795097665ab95119580534e7cc1335b59e1a7fec296943e534b970f4ed"
+checksum = "89a2cd7e0bd2bb7ed27687cfcf6561b91542c1ce23e52fd54ee59b7568c9bd84"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
diff --git a/Cargo.toml b/Cargo.toml
index 436d4a7f5c..3f54745900 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -423,7 +423,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.28"
+agent-client-protocol = "0.0.29"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 2e70a5f37a..2cad1b5a87 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -1,11 +1,12 @@
 use action_log::ActionLog;
-use agent_client_protocol::{self as acp, Agent as _};
+use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
 use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
 use futures::channel::oneshot;
 use futures::io::BufReader;
 use project::Project;
+use serde::Deserialize;
 use std::path::Path;
 use std::rc::Rc;
 use std::{any::Any, cell::RefCell};
@@ -27,6 +28,7 @@ pub struct AcpConnection {
 
 pub struct AcpSession {
     thread: WeakEntity<AcpThread>,
+    pending_cancel: bool,
 }
 
 const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
@@ -171,6 +173,7 @@ impl AgentConnection for AcpConnection {
 
             let session = AcpSession {
                 thread: thread.downgrade(),
+                pending_cancel: false,
             };
             sessions.borrow_mut().insert(session_id, session);
 
@@ -202,9 +205,48 @@ impl AgentConnection for AcpConnection {
         cx: &mut App,
     ) -> Task<Result<acp::PromptResponse>> {
         let conn = self.connection.clone();
+        let sessions = self.sessions.clone();
+        let session_id = params.session_id.clone();
         cx.foreground_executor().spawn(async move {
-            let response = conn.prompt(params).await?;
-            Ok(response)
+            match conn.prompt(params).await {
+                Ok(response) => Ok(response),
+                Err(err) => {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
+                        anyhow::bail!(err)
+                    }
+
+                    let Some(data) = &err.data else {
+                        anyhow::bail!(err)
+                    };
+
+                    // Temporary workaround until the following PR is generally available:
+                    // https://github.com/google-gemini/gemini-cli/pull/6656
+
+                    #[derive(Deserialize)]
+                    #[serde(deny_unknown_fields)]
+                    struct ErrorDetails {
+                        details: Box<str>,
+                    }
+
+                    match serde_json::from_value(data.clone()) {
+                        Ok(ErrorDetails { details }) => {
+                            if sessions
+                                .borrow()
+                                .get(&session_id)
+                                .is_some_and(|session| session.pending_cancel)
+                                && details.contains("This operation was aborted")
+                            {
+                                Ok(acp::PromptResponse {
+                                    stop_reason: acp::StopReason::Canceled,
+                                })
+                            } else {
+                                Err(anyhow!(details))
+                            }
+                        }
+                        Err(_) => Err(anyhow!(err)),
+                    }
+                }
+            }
         })
     }
 
@@ -213,12 +255,23 @@ impl AgentConnection for AcpConnection {
     }
 
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
+        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
+            session.pending_cancel = true;
+        }
         let conn = self.connection.clone();
         let params = acp::CancelNotification {
             session_id: session_id.clone(),
         };
+        let sessions = self.sessions.clone();
+        let session_id = session_id.clone();
         cx.foreground_executor()
-            .spawn(async move { conn.cancel(params).await })
+            .spawn(async move {
+                let resp = conn.cancel(params).await;
+                if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
+                    session.pending_cancel = false;
+                }
+                resp
+            })
             .detach();
     }
 

From c20233e0b4fcaf0459ef0ff6b7ea3c3f72cce837 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Wed, 20 Aug 2025 19:09:09 -0400
Subject: [PATCH 235/823] agent_ui: Fix signed-in check in Zed provider
 configuration (#36639)

This PR fixes the check for if the user is signed in in the Agent panel
configuration.

Supersedes https://github.com/zed-industries/zed/pull/36634.

Release Notes:

- Fixed the user's plan badge near the Zed provider in the Agent panel
not showing despite being signed in.
---
 crates/agent_ui/src/agent_configuration.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 6da84758ee..00e48efdac 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -192,7 +192,7 @@ impl AgentConfiguration {
         let is_signed_in = self
             .workspace
             .read_with(cx, |workspace, _| {
-                workspace.client().status().borrow().is_connected()
+                !workspace.client().status().borrow().is_signed_out()
             })
             .unwrap_or(false);
 

From 74c0ba980b6a561e514fecd4c93fd8cbe7e045c2 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 20:32:17 -0300
Subject: [PATCH 236/823] acp: Reliably suppress gemini abort error (#36640)

https://github.com/zed-industries/zed/pull/36633 relied on the prompt
request responding before cancel, but that's not guaranteed


Release Notes:

- N/A
---
 crates/agent_servers/src/acp/v1.rs | 33 ++++++++++++++----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 2cad1b5a87..bc11a3748a 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -28,7 +28,7 @@ pub struct AcpConnection {
 
 pub struct AcpSession {
     thread: WeakEntity<AcpThread>,
-    pending_cancel: bool,
+    suppress_abort_err: bool,
 }
 
 const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
@@ -173,7 +173,7 @@ impl AgentConnection for AcpConnection {
 
             let session = AcpSession {
                 thread: thread.downgrade(),
-                pending_cancel: false,
+                suppress_abort_err: false,
             };
             sessions.borrow_mut().insert(session_id, session);
 
@@ -208,7 +208,16 @@ impl AgentConnection for AcpConnection {
         let sessions = self.sessions.clone();
         let session_id = params.session_id.clone();
         cx.foreground_executor().spawn(async move {
-            match conn.prompt(params).await {
+            let result = conn.prompt(params).await;
+
+            let mut suppress_abort_err = false;
+
+            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
+                suppress_abort_err = session.suppress_abort_err;
+                session.suppress_abort_err = false;
+            }
+
+            match result {
                 Ok(response) => Ok(response),
                 Err(err) => {
                     if err.code != ErrorCode::INTERNAL_ERROR.code {
@@ -230,11 +239,7 @@ impl AgentConnection for AcpConnection {
 
                     match serde_json::from_value(data.clone()) {
                         Ok(ErrorDetails { details }) => {
-                            if sessions
-                                .borrow()
-                                .get(&session_id)
-                                .is_some_and(|session| session.pending_cancel)
-                                && details.contains("This operation was aborted")
+                            if suppress_abort_err && details.contains("This operation was aborted")
                             {
                                 Ok(acp::PromptResponse {
                                     stop_reason: acp::StopReason::Canceled,
@@ -256,22 +261,14 @@ impl AgentConnection for AcpConnection {
 
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
         if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
-            session.pending_cancel = true;
+            session.suppress_abort_err = true;
         }
         let conn = self.connection.clone();
         let params = acp::CancelNotification {
             session_id: session_id.clone(),
         };
-        let sessions = self.sessions.clone();
-        let session_id = session_id.clone();
         cx.foreground_executor()
-            .spawn(async move {
-                let resp = conn.cancel(params).await;
-                if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
-                    session.pending_cancel = false;
-                }
-                resp
-            })
+            .spawn(async move { conn.cancel(params).await })
             .detach();
     }
 

From 3dd362978a2b5fa6c41da9368252491d1c638fab Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 20 Aug 2025 18:41:06 -0500
Subject: [PATCH 237/823] docs: Add table of all actions (#36642)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/docs_preprocessor/src/main.rs | 66 ++++++++++++++++++++++++++++
 docs/src/SUMMARY.md                  |  1 +
 docs/src/all-actions.md              |  3 ++
 3 files changed, 70 insertions(+)
 create mode 100644 docs/src/all-actions.md

diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index 33158577c4..c900eb692a 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -99,6 +99,7 @@ fn handle_preprocessing() -> Result<()> {
     let mut errors = HashSet::<PreprocessorError>::new();
 
     handle_frontmatter(&mut book, &mut errors);
+    template_big_table_of_actions(&mut book);
     template_and_validate_keybindings(&mut book, &mut errors);
     template_and_validate_actions(&mut book, &mut errors);
 
@@ -147,6 +148,18 @@ fn handle_frontmatter(book: &mut Book, errors: &mut HashSet<PreprocessorError>)
     });
 }
 
+fn template_big_table_of_actions(book: &mut Book) {
+    for_each_chapter_mut(book, |chapter| {
+        let needle = "{#ACTIONS_TABLE#}";
+        if let Some(start) = chapter.content.rfind(needle) {
+            chapter.content.replace_range(
+                start..start + needle.len(),
+                &generate_big_table_of_actions(),
+            );
+        }
+    });
+}
+
 fn template_and_validate_keybindings(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
     let regex = Regex::new(r"\{#kb (.*?)\}").unwrap();
 
@@ -277,6 +290,7 @@ struct ActionDef {
     name: &'static str,
     human_name: String,
     deprecated_aliases: &'static [&'static str],
+    docs: Option<&'static str>,
 }
 
 fn dump_all_gpui_actions() -> Vec<ActionDef> {
@@ -285,6 +299,7 @@ fn dump_all_gpui_actions() -> Vec<ActionDef> {
             name: action.name,
             human_name: command_palette::humanize_action_name(action.name),
             deprecated_aliases: action.deprecated_aliases,
+            docs: action.documentation,
         })
         .collect::<Vec<ActionDef>>();
 
@@ -418,3 +433,54 @@ fn title_regex() -> &'static Regex {
     static TITLE_REGEX: OnceLock<Regex> = OnceLock::new();
     TITLE_REGEX.get_or_init(|| Regex::new(r"<title>\s*(.*?)\s*</title>").unwrap())
 }
+
+fn generate_big_table_of_actions() -> String {
+    let actions = &*ALL_ACTIONS;
+    let mut output = String::new();
+
+    let mut actions_sorted = actions.iter().collect::<Vec<_>>();
+    actions_sorted.sort_by_key(|a| a.name);
+
+    // Start the definition list with custom styling for better spacing
+    output.push_str("<dl style=\"line-height: 1.8;\">\n");
+
+    for action in actions_sorted.into_iter() {
+        // Add the humanized action name as the term with margin
+        output.push_str(
+            "<dt style=\"margin-top: 1.5em; margin-bottom: 0.5em; font-weight: bold;\"><code>",
+        );
+        output.push_str(&action.human_name);
+        output.push_str("</code></dt>\n");
+
+        // Add the definition with keymap name and description
+        output.push_str("<dd style=\"margin-left: 2em; margin-bottom: 1em;\">\n");
+
+        // Add the description, escaping HTML if needed
+        if let Some(description) = action.docs {
+            output.push_str(
+                &description
+                    .replace("&", "&amp;")
+                    .replace("<", "&lt;")
+                    .replace(">", "&gt;"),
+            );
+            output.push_str("<br>\n");
+        }
+        output.push_str("Keymap Name: <code>");
+        output.push_str(action.name);
+        output.push_str("</code><br>\n");
+        if !action.deprecated_aliases.is_empty() {
+            output.push_str("Deprecated Aliases:");
+            for alias in action.deprecated_aliases.iter() {
+                output.push_str("<code>");
+                output.push_str(alias);
+                output.push_str("</code>, ");
+            }
+        }
+        output.push_str("\n</dd>\n");
+    }
+
+    // Close the definition list
+    output.push_str("</dl>\n");
+
+    output
+}
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index c7af36f431..251cad6234 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -16,6 +16,7 @@
 - [Configuring Zed](./configuring-zed.md)
 - [Configuring Languages](./configuring-languages.md)
 - [Key bindings](./key-bindings.md)
+  - [All Actions](./all-actions.md)
 - [Snippets](./snippets.md)
 - [Themes](./themes.md)
 - [Icon Themes](./icon-themes.md)
diff --git a/docs/src/all-actions.md b/docs/src/all-actions.md
new file mode 100644
index 0000000000..d20f7cfd63
--- /dev/null
+++ b/docs/src/all-actions.md
@@ -0,0 +1,3 @@
+## All Actions
+
+{#ACTIONS_TABLE#}

From 8ef9ecc91f6c6b2eaf65fd0d8a93e2f49af876de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Thu, 21 Aug 2025 08:08:54 +0800
Subject: [PATCH 238/823] windows: Fix `RevealInFileManager` (#36592)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #36314

This PR takes inspiration from [Electron’s
implementation](https://github.com/electron/electron/blob/dd54e84a58531b52680f7f736f593ee887eff6a7/shell/common/platform_util_win.cc#L268-L314).

Before and after:



https://github.com/user-attachments/assets/53eec5d3-23c7-4ee1-8477-e524b0538f60



Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/platform.rs | 111 +++++++++++--------
 1 file changed, 67 insertions(+), 44 deletions(-)

diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index b13b9915f1..6202e05fb3 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -1,5 +1,6 @@
 use std::{
     cell::RefCell,
+    ffi::OsStr,
     mem::ManuallyDrop,
     path::{Path, PathBuf},
     rc::Rc,
@@ -460,13 +461,15 @@ impl Platform for WindowsPlatform {
     }
 
     fn open_url(&self, url: &str) {
+        if url.is_empty() {
+            return;
+        }
         let url_string = url.to_string();
         self.background_executor()
             .spawn(async move {
-                if url_string.is_empty() {
-                    return;
-                }
-                open_target(url_string.as_str());
+                open_target(&url_string)
+                    .with_context(|| format!("Opening url: {}", url_string))
+                    .log_err();
             })
             .detach();
     }
@@ -514,37 +517,29 @@ impl Platform for WindowsPlatform {
     }
 
     fn reveal_path(&self, path: &Path) {
-        let Ok(file_full_path) = path.canonicalize() else {
-            log::error!("unable to parse file path");
+        if path.as_os_str().is_empty() {
             return;
-        };
+        }
+        let path = path.to_path_buf();
         self.background_executor()
             .spawn(async move {
-                let Some(path) = file_full_path.to_str() else {
-                    return;
-                };
-                if path.is_empty() {
-                    return;
-                }
-                open_target_in_explorer(path);
+                open_target_in_explorer(&path)
+                    .with_context(|| format!("Revealing path {} in explorer", path.display()))
+                    .log_err();
             })
             .detach();
     }
 
     fn open_with_system(&self, path: &Path) {
-        let Ok(full_path) = path.canonicalize() else {
-            log::error!("unable to parse file full path: {}", path.display());
+        if path.as_os_str().is_empty() {
             return;
-        };
+        }
+        let path = path.to_path_buf();
         self.background_executor()
             .spawn(async move {
-                let Some(full_path_str) = full_path.to_str() else {
-                    return;
-                };
-                if full_path_str.is_empty() {
-                    return;
-                };
-                open_target(full_path_str);
+                open_target(&path)
+                    .with_context(|| format!("Opening {} with system", path.display()))
+                    .log_err();
             })
             .detach();
     }
@@ -735,39 +730,67 @@ pub(crate) struct WindowCreationInfo {
     pub(crate) disable_direct_composition: bool,
 }
 
-fn open_target(target: &str) {
-    unsafe {
-        let ret = ShellExecuteW(
+fn open_target(target: impl AsRef<OsStr>) -> Result<()> {
+    let target = target.as_ref();
+    let ret = unsafe {
+        ShellExecuteW(
             None,
             windows::core::w!("open"),
             &HSTRING::from(target),
             None,
             None,
             SW_SHOWDEFAULT,
-        );
-        if ret.0 as isize <= 32 {
-            log::error!("Unable to open target: {}", std::io::Error::last_os_error());
-        }
+        )
+    };
+    if ret.0 as isize <= 32 {
+        Err(anyhow::anyhow!(
+            "Unable to open target: {}",
+            std::io::Error::last_os_error()
+        ))
+    } else {
+        Ok(())
     }
 }
 
-fn open_target_in_explorer(target: &str) {
+fn open_target_in_explorer(target: &Path) -> Result<()> {
+    let dir = target.parent().context("No parent folder found")?;
+    let desktop = unsafe { SHGetDesktopFolder()? };
+
+    let mut dir_item = std::ptr::null_mut();
     unsafe {
-        let ret = ShellExecuteW(
+        desktop.ParseDisplayName(
+            HWND::default(),
             None,
-            windows::core::w!("open"),
-            windows::core::w!("explorer.exe"),
-            &HSTRING::from(format!("/select,{}", target).as_str()),
+            &HSTRING::from(dir),
             None,
-            SW_SHOWDEFAULT,
-        );
-        if ret.0 as isize <= 32 {
-            log::error!(
-                "Unable to open target in explorer: {}",
-                std::io::Error::last_os_error()
-            );
-        }
+            &mut dir_item,
+            std::ptr::null_mut(),
+        )?;
     }
+
+    let mut file_item = std::ptr::null_mut();
+    unsafe {
+        desktop.ParseDisplayName(
+            HWND::default(),
+            None,
+            &HSTRING::from(target),
+            None,
+            &mut file_item,
+            std::ptr::null_mut(),
+        )?;
+    }
+
+    let highlight = [file_item as *const _];
+    unsafe { SHOpenFolderAndSelectItems(dir_item as _, Some(&highlight), 0) }.or_else(|err| {
+        if err.code().0 == ERROR_FILE_NOT_FOUND.0 as i32 {
+            // On some systems, the above call mysteriously fails with "file not
+            // found" even though the file is there.  In these cases, ShellExecute()
+            // seems to work as a fallback (although it won't select the file).
+            open_target(dir).context("Opening target parent folder")
+        } else {
+            Err(anyhow::anyhow!("Can not open target path: {}", err))
+        }
+    })
 }
 
 fn file_open_dialog(

From 6f242772cccaf3a8b2dc372cc1c2f94713faedf3 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 21:10:36 -0300
Subject: [PATCH 239/823] acp: Update to 0.0.30 (#36643)

See: https://github.com/zed-industries/agent-client-protocol/pull/20

Release Notes:

- N/A
---
 Cargo.lock                          | 4 ++--
 Cargo.toml                          | 2 +-
 crates/acp_thread/src/acp_thread.rs | 2 +-
 crates/acp_thread/src/connection.rs | 2 +-
 crates/agent2/src/tests/mod.rs      | 4 ++--
 crates/agent2/src/thread.rs         | 2 +-
 crates/agent_servers/src/acp/v1.rs  | 4 ++--
 crates/agent_servers/src/claude.rs  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bfb135d32c..f3e821fb5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.29"
+version = "0.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a2cd7e0bd2bb7ed27687cfcf6561b91542c1ce23e52fd54ee59b7568c9bd84"
+checksum = "5f792e009ba59b137ee1db560bc37e567887ad4b5af6f32181d381fff690e2d4"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
diff --git a/Cargo.toml b/Cargo.toml
index 3f54745900..d458a4752c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -423,7 +423,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.29"
+agent-client-protocol = "0.0.30"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 9833e1957c..61bc50576a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1381,7 +1381,7 @@ impl AcpThread {
                         let canceled = matches!(
                             result,
                             Ok(Ok(acp::PromptResponse {
-                                stop_reason: acp::StopReason::Canceled
+                                stop_reason: acp::StopReason::Cancelled
                             }))
                         );
 
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 791b161417..2bbd364873 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -420,7 +420,7 @@ mod test_support {
                 .response_tx
                 .take()
             {
-                end_turn_tx.send(acp::StopReason::Canceled).unwrap();
+                end_turn_tx.send(acp::StopReason::Cancelled).unwrap();
             }
         }
 
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 478604b14a..3bd1be497e 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -975,7 +975,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
     assert!(
         matches!(
             last_event,
-            Some(Ok(ThreadEvent::Stop(acp::StopReason::Canceled)))
+            Some(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
         ),
         "unexpected event {last_event:?}"
     );
@@ -1029,7 +1029,7 @@ async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
     fake_model.end_last_completion_stream();
 
     let events_1 = events_1.collect::<Vec<_>>().await;
-    assert_eq!(stop_events(events_1), vec![acp::StopReason::Canceled]);
+    assert_eq!(stop_events(events_1), vec![acp::StopReason::Cancelled]);
     let events_2 = events_2.collect::<Vec<_>>().await;
     assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
 }
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 62174fd3b4..d34c929152 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -2248,7 +2248,7 @@ impl ThreadEventStream {
 
     fn send_canceled(&self) {
         self.0
-            .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Canceled)))
+            .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
             .ok();
     }
 
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index bc11a3748a..29f389547d 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -242,7 +242,7 @@ impl AgentConnection for AcpConnection {
                             if suppress_abort_err && details.contains("This operation was aborted")
                             {
                                 Ok(acp::PromptResponse {
-                                    stop_reason: acp::StopReason::Canceled,
+                                    stop_reason: acp::StopReason::Cancelled,
                                 })
                             } else {
                                 Err(anyhow!(details))
@@ -302,7 +302,7 @@ impl acp::Client for ClientDelegate {
 
         let outcome = match result {
             Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
-            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Canceled,
+            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
         };
 
         Ok(acp::RequestPermissionResponse { outcome })
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 8d93557e1c..c9290e0ba5 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -705,7 +705,7 @@ impl ClaudeAgentSession {
                     let stop_reason = match subtype {
                         ResultErrorType::Success => acp::StopReason::EndTurn,
                         ResultErrorType::ErrorMaxTurns => acp::StopReason::MaxTurnRequests,
-                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Canceled,
+                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Cancelled,
                     };
                     end_turn_tx
                         .send(Ok(acp::PromptResponse { stop_reason }))

From 568e1d0a42a517b62ede343f31cee7779b09e9ea Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 21 Aug 2025 02:36:50 +0200
Subject: [PATCH 240/823] acp: Add e2e test support for NativeAgent (#36635)

Release Notes:

- N/A
---
 Cargo.lock                                |   4 +
 crates/agent2/Cargo.toml                  |   2 +
 crates/agent2/src/native_agent_server.rs  |  49 ++++++++
 crates/agent_servers/Cargo.toml           |  11 +-
 crates/agent_servers/src/agent_servers.rs |   4 +-
 crates/agent_servers/src/claude.rs        |   2 +-
 crates/agent_servers/src/e2e_tests.rs     | 134 +++++++++++++++++-----
 crates/agent_servers/src/gemini.rs        |   2 +-
 8 files changed, 172 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f3e821fb5f..76f8672d4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -268,11 +268,14 @@ dependencies = [
  "agent_settings",
  "agentic-coding-protocol",
  "anyhow",
+ "client",
  "collections",
  "context_server",
  "env_logger 0.11.8",
+ "fs",
  "futures 0.3.31",
  "gpui",
+ "gpui_tokio",
  "indoc",
  "itertools 0.14.0",
  "language",
@@ -284,6 +287,7 @@ dependencies = [
  "paths",
  "project",
  "rand 0.8.5",
+ "reqwest_client",
  "schemars",
  "semver",
  "serde",
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 2a5d879e9e..8dd79062f8 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/agent2.rs"
 
 [features]
 test-support = ["db/test-support"]
+e2e = []
 
 [lints]
 workspace = true
@@ -72,6 +73,7 @@ zstd.workspace = true
 
 [dev-dependencies]
 agent = { workspace = true, "features" = ["test-support"] }
+agent_servers = { workspace = true, "features" = ["test-support"] }
 assistant_context = { workspace = true, "features" = ["test-support"] }
 ctor.workspace = true
 client = { workspace = true, "features" = ["test-support"] }
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index a1f935589a..ac5aa95c04 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -73,3 +73,52 @@ impl AgentServer for NativeAgentServer {
         self
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use assistant_context::ContextStore;
+    use gpui::AppContext;
+
+    agent_servers::e2e_tests::common_e2e_tests!(
+        async |fs, project, cx| {
+            let auth = cx.update(|cx| {
+                prompt_store::init(cx);
+                terminal::init(cx);
+
+                let registry = language_model::LanguageModelRegistry::read_global(cx);
+                let auth = registry
+                    .provider(&language_model::ANTHROPIC_PROVIDER_ID)
+                    .unwrap()
+                    .authenticate(cx);
+
+                cx.spawn(async move |_| auth.await)
+            });
+
+            auth.await.unwrap();
+
+            cx.update(|cx| {
+                let registry = language_model::LanguageModelRegistry::global(cx);
+
+                registry.update(cx, |registry, cx| {
+                    registry.select_default_model(
+                        Some(&language_model::SelectedModel {
+                            provider: language_model::ANTHROPIC_PROVIDER_ID,
+                            model: language_model::LanguageModelId("claude-sonnet-4-latest".into()),
+                        }),
+                        cx,
+                    );
+                });
+            });
+
+            let history = cx.update(|cx| {
+                let context_store = cx.new(move |cx| ContextStore::fake(project.clone(), cx));
+                cx.new(move |cx| HistoryStore::new(context_store, cx))
+            });
+
+            NativeAgentServer::new(fs.clone(), history)
+        },
+        allow_option_id = "allow"
+    );
+}
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index b654486cb6..60dd796463 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -6,7 +6,7 @@ publish.workspace = true
 license = "GPL-3.0-or-later"
 
 [features]
-test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support"]
+test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support", "dep:env_logger", "fs", "client/test-support", "dep:gpui_tokio", "reqwest_client/test-support"]
 e2e = []
 
 [lints]
@@ -23,10 +23,14 @@ agent-client-protocol.workspace = true
 agent_settings.workspace = true
 agentic-coding-protocol.workspace = true
 anyhow.workspace = true
+client = { workspace = true, optional = true }
 collections.workspace = true
 context_server.workspace = true
+env_logger = { workspace = true, optional = true }
+fs = { workspace = true, optional = true }
 futures.workspace = true
 gpui.workspace = true
+gpui_tokio = { workspace = true, optional = true }
 indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
@@ -36,6 +40,7 @@ log.workspace = true
 paths.workspace = true
 project.workspace = true
 rand.workspace = true
+reqwest_client = { workspace = true, optional = true }
 schemars.workspace = true
 semver.workspace = true
 serde.workspace = true
@@ -57,8 +62,12 @@ libc.workspace = true
 nix.workspace = true
 
 [dev-dependencies]
+client = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
+fs.workspace = true
 language.workspace = true
 indoc.workspace = true
 acp_thread = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
+gpui_tokio.workspace = true
+reqwest_client = { workspace = true, features = ["test-support"] }
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index cebf82cddb..2f5ec478ae 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -3,8 +3,8 @@ mod claude;
 mod gemini;
 mod settings;
 
-#[cfg(test)]
-mod e2e_tests;
+#[cfg(any(test, feature = "test-support"))]
+pub mod e2e_tests;
 
 pub use claude::*;
 pub use gemini::*;
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index c9290e0ba5..ef666974f1 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1093,7 +1093,7 @@ pub(crate) mod tests {
     use gpui::TestAppContext;
     use serde_json::json;
 
-    crate::common_e2e_tests!(ClaudeCode, allow_option_id = "allow");
+    crate::common_e2e_tests!(async |_, _, _| ClaudeCode, allow_option_id = "allow");
 
     pub fn local_command() -> AgentServerCommand {
         AgentServerCommand {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 8b2703575d..c271079071 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -4,21 +4,30 @@ use std::{
     time::Duration,
 };
 
-use crate::{AgentServer, AgentServerSettings, AllAgentServersSettings};
+use crate::AgentServer;
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
 use agent_client_protocol as acp;
 
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
-use gpui::{Entity, TestAppContext};
+use gpui::{AppContext, Entity, TestAppContext};
 use indoc::indoc;
 use project::{FakeFs, Project};
-use settings::{Settings, SettingsStore};
 use util::path;
 
-pub async fn test_basic(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let fs = init_test(cx).await;
-    let project = Project::test(fs, [], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+pub async fn test_basic<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
+    let project = Project::test(fs.clone(), [], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
 
     thread
         .update(cx, |thread, cx| thread.send_raw("Hello from Zed!", cx))
@@ -42,8 +51,12 @@ pub async fn test_basic(server: impl AgentServer + 'static, cx: &mut TestAppCont
     });
 }
 
-pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let _fs = init_test(cx).await;
+pub async fn test_path_mentions<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as _;
 
     let tempdir = tempfile::tempdir().unwrap();
     std::fs::write(
@@ -56,7 +69,13 @@ pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut Tes
     )
     .expect("failed to write file");
     let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
-    let thread = new_test_thread(server, project.clone(), tempdir.path(), cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        tempdir.path(),
+        cx,
+    )
+    .await;
     thread
         .update(cx, |thread, cx| {
             thread.send(
@@ -110,15 +129,25 @@ pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut Tes
     drop(tempdir);
 }
 
-pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let _fs = init_test(cx).await;
+pub async fn test_tool_call<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as _;
 
     let tempdir = tempfile::tempdir().unwrap();
     let foo_path = tempdir.path().join("foo");
     std::fs::write(&foo_path, "Lorem ipsum dolor").expect("failed to write file");
 
     let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
 
     thread
         .update(cx, |thread, cx| {
@@ -152,14 +181,23 @@ pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestApp
     drop(tempdir);
 }
 
-pub async fn test_tool_call_with_permission(
-    server: impl AgentServer + 'static,
+pub async fn test_tool_call_with_permission<T, F>(
+    server: F,
     allow_option_id: acp::PermissionOptionId,
     cx: &mut TestAppContext,
-) {
-    let fs = init_test(cx).await;
-    let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+) where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
+    let project = Project::test(fs.clone(), [path!("/private/tmp").as_ref()], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
     let full_turn = thread.update(cx, |thread, cx| {
         thread.send_raw(
             r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
@@ -247,11 +285,21 @@ pub async fn test_tool_call_with_permission(
     });
 }
 
-pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let fs = init_test(cx).await;
+pub async fn test_cancel<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
 
-    let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+    let project = Project::test(fs.clone(), [path!("/private/tmp").as_ref()], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
     let _ = thread.update(cx, |thread, cx| {
         thread.send_raw(
             r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
@@ -316,10 +364,20 @@ pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppCon
     });
 }
 
-pub async fn test_thread_drop(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let fs = init_test(cx).await;
-    let project = Project::test(fs, [], cx).await;
-    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
+pub async fn test_thread_drop<T, F>(server: F, cx: &mut TestAppContext)
+where
+    T: AgentServer + 'static,
+    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
+{
+    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
+    let project = Project::test(fs.clone(), [], cx).await;
+    let thread = new_test_thread(
+        server(&fs, &project, cx).await,
+        project.clone(),
+        "/private/tmp",
+        cx,
+    )
+    .await;
 
     thread
         .update(cx, |thread, cx| thread.send_raw("Hello from test!", cx))
@@ -386,25 +444,39 @@ macro_rules! common_e2e_tests {
         }
     };
 }
+pub use common_e2e_tests;
 
 // Helpers
 
 pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
+    #[cfg(test)]
+    use settings::Settings;
+
     env_logger::try_init().ok();
 
     cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
+        let settings_store = settings::SettingsStore::test(cx);
         cx.set_global(settings_store);
         Project::init_settings(cx);
         language::init(cx);
+        gpui_tokio::init(cx);
+        let http_client = reqwest_client::ReqwestClient::user_agent("agent tests").unwrap();
+        cx.set_http_client(Arc::new(http_client));
+        client::init_settings(cx);
+        let client = client::Client::production(cx);
+        let user_store = cx.new(|cx| client::UserStore::new(client.clone(), cx));
+        language_model::init(client.clone(), cx);
+        language_models::init(user_store, client, cx);
+        agent_settings::init(cx);
         crate::settings::init(cx);
 
+        #[cfg(test)]
         crate::AllAgentServersSettings::override_global(
-            AllAgentServersSettings {
-                claude: Some(AgentServerSettings {
+            crate::AllAgentServersSettings {
+                claude: Some(crate::AgentServerSettings {
                     command: crate::claude::tests::local_command(),
                 }),
-                gemini: Some(AgentServerSettings {
+                gemini: Some(crate::AgentServerSettings {
                     command: crate::gemini::tests::local_command(),
                 }),
             },
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index d30525328b..1a63322fac 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -108,7 +108,7 @@ pub(crate) mod tests {
     use crate::AgentServerCommand;
     use std::path::Path;
 
-    crate::common_e2e_tests!(Gemini, allow_option_id = "proceed_once");
+    crate::common_e2e_tests!(async |_, _, _| Gemini, allow_option_id = "proceed_once");
 
     pub fn local_command() -> AgentServerCommand {
         let cli_path = Path::new(env!("CARGO_MANIFEST_DIR"))

From 9a3e4c47d03ab8579601ce55d066518a0e867c3a Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 20 Aug 2025 21:52:38 -0300
Subject: [PATCH 241/823] acp: Suggest upgrading to preview instead of latest
 (#36648)

A previous PR changed the install command from `@latest` to `@preview`,
but the upgrade command kept suggesting `@latest`.

Release Notes:

- N/A
---
 crates/agent_servers/src/gemini.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 1a63322fac..3b892e7931 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -89,7 +89,7 @@ impl AgentServer for Gemini {
                             current_version
                         ).into(),
                         upgrade_message: "Upgrade Gemini CLI to latest".into(),
-                        upgrade_command: "npm install -g @google/gemini-cli@latest".into(),
+                        upgrade_command: "npm install -g @google/gemini-cli@preview".into(),
                     }.into())
                 }
             }

From 4b03d791b5ed73d9dd28bf1279b807648d38b399 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 20 Aug 2025 20:38:30 -0600
Subject: [PATCH 242/823] Remove style lints for now (#36651)

Closes #36577

Release Notes:

- N/A
---
 Cargo.toml | 151 +++++------------------------------------------------
 1 file changed, 13 insertions(+), 138 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d458a4752c..b6104303b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -802,147 +802,26 @@ unexpected_cfgs = { level = "allow" }
 dbg_macro = "deny"
 todo = "deny"
 
-# Motivation: We use `vec![a..b]` a lot when dealing with ranges in text, so
-# warning on this rule produces a lot of noise.
-single_range_in_vec_init = "allow"
-
-redundant_clone = "warn"
-declare_interior_mutable_const = "deny"
-
-# These are all of the rules that currently have violations in the Zed
-# codebase.
+# We currently do not restrict any style rules
+# as it slows down shipping code to Zed.
 #
-# We'll want to drive this list down by either:
-# 1. fixing violations of the rule and begin enforcing it
-# 2. deciding we want to allow the rule permanently, at which point
-#    we should codify that separately above.
+# Running ./script/clippy can take several minutes, and so it's
+# common to skip that step and let CI do it. Any unexpected failures
+# (which also take minutes to discover) thus require switching back
+# to an old branch, manual fixing, and re-pushing.
 #
-# This list shouldn't be added to; it should only get shorter.
-# =============================================================================
-
-# There are a bunch of rules currently failing in the `style` group, so
-# allow all of those, for now.
+# In the future we could improve this by either making sure
+# Zed can surface clippy errors in diagnostics (in addition to the
+# rust-analyzer errors), or by having CI fix style nits automatically.
 style = { level = "allow", priority = -1 }
 
-# Temporary list of style lints that we've fixed so far.
-# Progress is being tracked in #36577
-blocks_in_conditions = "warn"
-bool_assert_comparison = "warn"
-borrow_interior_mutable_const = "warn"
-box_default = "warn"
-builtin_type_shadow = "warn"
-bytes_nth = "warn"
-chars_next_cmp = "warn"
-cmp_null = "warn"
-collapsible_else_if = "warn"
-collapsible_if = "warn"
-comparison_to_empty = "warn"
-default_instead_of_iter_empty = "warn"
-disallowed_macros = "warn"
-disallowed_methods = "warn"
-disallowed_names = "warn"
-disallowed_types = "warn"
-doc_lazy_continuation = "warn"
-doc_overindented_list_items = "warn"
-duplicate_underscore_argument = "warn"
-err_expect = "warn"
-fn_to_numeric_cast = "warn"
-fn_to_numeric_cast_with_truncation = "warn"
-for_kv_map = "warn"
-implicit_saturating_add = "warn"
-implicit_saturating_sub = "warn"
-inconsistent_digit_grouping = "warn"
-infallible_destructuring_match = "warn"
-inherent_to_string = "warn"
-init_numbered_fields = "warn"
-into_iter_on_ref = "warn"
-io_other_error = "warn"
-items_after_test_module = "warn"
-iter_cloned_collect = "warn"
-iter_next_slice = "warn"
-iter_nth = "warn"
-iter_nth_zero = "warn"
-iter_skip_next = "warn"
-just_underscores_and_digits = "warn"
-len_zero = "warn"
-let_and_return = "warn"
-main_recursion = "warn"
-manual_bits = "warn"
-manual_dangling_ptr = "warn"
-manual_is_ascii_check = "warn"
-manual_is_finite = "warn"
-manual_is_infinite = "warn"
-manual_map = "warn"
-manual_next_back = "warn"
-manual_non_exhaustive = "warn"
-manual_ok_or = "warn"
-manual_pattern_char_comparison = "warn"
-manual_rotate = "warn"
-manual_slice_fill = "warn"
-manual_while_let_some = "warn"
-map_clone = "warn"
-map_collect_result_unit = "warn"
-match_like_matches_macro = "warn"
-match_overlapping_arm = "warn"
-mem_replace_option_with_none = "warn"
-mem_replace_option_with_some = "warn"
-missing_enforced_import_renames = "warn"
-missing_safety_doc = "warn"
-mixed_attributes_style = "warn"
-mixed_case_hex_literals = "warn"
-module_inception = "warn"
-must_use_unit = "warn"
-mut_mutex_lock = "warn"
-needless_borrow = "warn"
-needless_doctest_main = "warn"
-needless_else = "warn"
-needless_parens_on_range_literals = "warn"
-needless_pub_self = "warn"
-needless_return = "warn"
-needless_return_with_question_mark = "warn"
-non_minimal_cfg = "warn"
-ok_expect = "warn"
-owned_cow = "warn"
-print_literal = "warn"
-print_with_newline = "warn"
-println_empty_string = "warn"
-ptr_eq = "warn"
-question_mark = "warn"
-redundant_closure = "warn"
-redundant_field_names = "warn"
-redundant_pattern_matching = "warn"
-redundant_static_lifetimes = "warn"
-result_map_or_into_option = "warn"
-self_named_constructors = "warn"
-single_match = "warn"
-tabs_in_doc_comments = "warn"
-to_digit_is_some = "warn"
-toplevel_ref_arg = "warn"
-unnecessary_fold = "warn"
-unnecessary_map_or = "warn"
-unnecessary_mut_passed = "warn"
-unnecessary_owned_empty_strings = "warn"
-unneeded_struct_pattern = "warn"
-unsafe_removed_from_name = "warn"
-unused_unit = "warn"
-unusual_byte_groupings = "warn"
-while_let_on_iterator = "warn"
-write_literal = "warn"
-write_with_newline = "warn"
-writeln_empty_string = "warn"
-wrong_self_convention = "warn"
-zero_ptr = "warn"
-
 # Individual rules that have violations in the codebase:
 type_complexity = "allow"
-# We often return trait objects from `new` functions.
-new_ret_no_self = { level = "allow" }
-# We have a few `next` functions that differ in lifetimes
-# compared to Iterator::next. Yet, clippy complains about those.
-should_implement_trait = { level = "allow" }
 let_underscore_future = "allow"
-# It doesn't make sense to implement `Default` unilaterally.
-new_without_default = "allow"
+
+# Motivation: We use `vec![a..b]` a lot when dealing with ranges in text, so
+# warning on this rule produces a lot of noise.
+single_range_in_vec_init = "allow"
 
 # in Rust it can be very tedious to reduce argument count without
 # running afoul of the borrow checker.
@@ -951,10 +830,6 @@ too_many_arguments = "allow"
 # We often have large enum variants yet we rarely actually bother with splitting them up.
 large_enum_variant = "allow"
 
-# `enum_variant_names` fires for all enums, even when they derive serde traits.
-# Adhering to this lint would be a breaking change.
-enum_variant_names = "allow"
-
 [workspace.metadata.cargo-machete]
 ignored = [
     "bindgen",

From c731bb6d91d0d8c1c0bf29d17c8cba8eed3b51a5 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 20 Aug 2025 21:08:49 -0600
Subject: [PATCH 243/823] Re-add redundant clone (#36652)

Although I said I'd do this, I actually didn't...

Updates #36651

Release Notes:

- N/A
---
 Cargo.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index b6104303b7..400ce791aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -802,6 +802,9 @@ unexpected_cfgs = { level = "allow" }
 dbg_macro = "deny"
 todo = "deny"
 
+# trying this out
+redundant_clone = "deny"
+
 # We currently do not restrict any style rules
 # as it slows down shipping code to Zed.
 #

From 5dcb90858effc47c7f2768b03ddb2a81b443ec8e Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 21 Aug 2025 09:24:34 +0300
Subject: [PATCH 244/823] Stop waiting for part of LSP responses on remote
 Collab clients' part (#36557)

Instead of holding a connection for potentially long LSP queries (e.g.
rust-analyzer might take minutes to look up a definition), disconnect
right after sending the initial request and handle the follow-up
responses later.

As a bonus, this allows to cancel previously sent request on the local
Collab clients' side due to this, as instead of holding and serving the
old connection, local clients now can stop previous requests, if needed.

Current PR does not convert all LSP requests to the new paradigm, but
the problematic ones, deprecating `MultiLspQuery` and moving all its
requests to the new paradigm.

Release Notes:

- Improved resource usage when querying LSP over Collab

---------

Co-authored-by: David Kleingeld <git@davidsk.dev>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-authored-by: David Kleingeld <davidsk@zed.dev>
---
 crates/agent_ui/src/acp/message_editor.rs    |    8 +-
 crates/collab/src/rpc.rs                     |   20 +
 crates/collab/src/tests/editor_tests.rs      |  208 ++-
 crates/collab/src/tests/integration_tests.rs |   12 +-
 crates/editor/src/editor.rs                  |   24 +-
 crates/editor/src/hover_links.rs             |    2 +-
 crates/editor/src/hover_popover.rs           |    2 +-
 crates/editor/src/proposed_changes_editor.rs |    4 +-
 crates/editor/src/signature_help.rs          |    4 +-
 crates/lsp/src/lsp.rs                        |    2 +-
 crates/project/src/lsp_command.rs            |    3 +-
 crates/project/src/lsp_store.rs              | 1202 ++++++++++--------
 crates/project/src/project.rs                |   49 +-
 crates/project/src/project_tests.rs          |    8 +-
 crates/proto/proto/lsp.proto                 |   91 +-
 crates/proto/proto/zed.proto                 |    5 +-
 crates/proto/src/macros.rs                   |   29 +
 crates/proto/src/proto.rs                    |   45 +
 crates/proto/src/typed_envelope.rs           |   52 +
 crates/rpc/src/proto_client.rs               |  306 ++++-
 20 files changed, 1395 insertions(+), 681 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index be133808b7..1155285d09 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1691,7 +1691,7 @@ impl SemanticsProvider for SlashCommandSemanticsProvider {
         buffer: &Entity<Buffer>,
         position: text::Anchor,
         cx: &mut App,
-    ) -> Option<Task<Vec<project::Hover>>> {
+    ) -> Option<Task<Option<Vec<project::Hover>>>> {
         let snapshot = buffer.read(cx).snapshot();
         let offset = position.to_offset(&snapshot);
         let (start, end) = self.range.get()?;
@@ -1699,14 +1699,14 @@ impl SemanticsProvider for SlashCommandSemanticsProvider {
             return None;
         }
         let range = snapshot.anchor_after(start)..snapshot.anchor_after(end);
-        Some(Task::ready(vec![project::Hover {
+        Some(Task::ready(Some(vec![project::Hover {
             contents: vec![project::HoverBlock {
                 text: "Slash commands are not supported".into(),
                 kind: project::HoverBlockKind::PlainText,
             }],
             range: Some(range),
             language: None,
-        }]))
+        }])))
     }
 
     fn inline_values(
@@ -1756,7 +1756,7 @@ impl SemanticsProvider for SlashCommandSemanticsProvider {
         _position: text::Anchor,
         _kind: editor::GotoDefinitionKind,
         _cx: &mut App,
-    ) -> Option<Task<Result<Vec<project::LocationLink>>>> {
+    ) -> Option<Task<Result<Option<Vec<project::LocationLink>>>>> {
         None
     }
 
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 06eb68610f..73f327166a 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -400,6 +400,8 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::SaveBuffer>)
             .add_request_handler(forward_mutating_project_request::<proto::BlameBuffer>)
             .add_request_handler(multi_lsp_query)
+            .add_request_handler(lsp_query)
+            .add_message_handler(broadcast_project_message_from_host::<proto::LspQueryResponse>)
             .add_request_handler(forward_mutating_project_request::<proto::RestartLanguageServers>)
             .add_request_handler(forward_mutating_project_request::<proto::StopLanguageServers>)
             .add_request_handler(forward_mutating_project_request::<proto::LinkedEditingRange>)
@@ -910,7 +912,9 @@ impl Server {
                                 user_id=field::Empty,
                                 login=field::Empty,
                                 impersonator=field::Empty,
+                                // todo(lsp) remove after Zed Stable hits v0.204.x
                                 multi_lsp_query_request=field::Empty,
+                                lsp_query_request=field::Empty,
                                 release_channel=field::Empty,
                                 { TOTAL_DURATION_MS }=field::Empty,
                                 { PROCESSING_DURATION_MS }=field::Empty,
@@ -2356,6 +2360,7 @@ where
     Ok(())
 }
 
+// todo(lsp) remove after Zed Stable hits v0.204.x
 async fn multi_lsp_query(
     request: MultiLspQuery,
     response: Response<MultiLspQuery>,
@@ -2366,6 +2371,21 @@ async fn multi_lsp_query(
     forward_mutating_project_request(request, response, session).await
 }
 
+async fn lsp_query(
+    request: proto::LspQuery,
+    response: Response<proto::LspQuery>,
+    session: MessageContext,
+) -> Result<()> {
+    let (name, should_write) = request.query_name_and_write_permissions();
+    tracing::Span::current().record("lsp_query_request", name);
+    tracing::info!("lsp_query message received");
+    if should_write {
+        forward_mutating_project_request(request, response, session).await
+    } else {
+        forward_read_only_project_request(request, response, session).await
+    }
+}
+
 /// Notify other participants that a new buffer has been created
 async fn create_buffer_for_peer(
     request: proto::CreateBufferForPeer,
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index 1b0c581983..59d66f1821 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -15,13 +15,14 @@ use editor::{
     },
 };
 use fs::Fs;
-use futures::{StreamExt, lock::Mutex};
+use futures::{SinkExt, StreamExt, channel::mpsc, lock::Mutex};
 use gpui::{App, Rgba, TestAppContext, UpdateGlobal, VisualContext, VisualTestContext};
 use indoc::indoc;
 use language::{
     FakeLspAdapter,
     language_settings::{AllLanguageSettings, InlayHintSettings},
 };
+use lsp::LSP_REQUEST_TIMEOUT;
 use project::{
     ProjectPath, SERVER_PROGRESS_THROTTLE_TIMEOUT,
     lsp_store::lsp_ext_command::{ExpandedMacro, LspExtExpandMacro},
@@ -1017,6 +1018,211 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
     })
 }
 
+#[gpui::test]
+async fn test_slow_lsp_server(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
+    let mut server = TestServer::start(cx_a.executor()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+    let active_call_a = cx_a.read(ActiveCall::global);
+    cx_b.update(editor::init);
+
+    let command_name = "test_command";
+    let capabilities = lsp::ServerCapabilities {
+        code_lens_provider: Some(lsp::CodeLensOptions {
+            resolve_provider: None,
+        }),
+        execute_command_provider: Some(lsp::ExecuteCommandOptions {
+            commands: vec![command_name.to_string()],
+            ..lsp::ExecuteCommandOptions::default()
+        }),
+        ..lsp::ServerCapabilities::default()
+    };
+    client_a.language_registry().add(rust_lang());
+    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
+        "Rust",
+        FakeLspAdapter {
+            capabilities: capabilities.clone(),
+            ..FakeLspAdapter::default()
+        },
+    );
+    client_b.language_registry().add(rust_lang());
+    client_b.language_registry().register_fake_lsp_adapter(
+        "Rust",
+        FakeLspAdapter {
+            capabilities,
+            ..FakeLspAdapter::default()
+        },
+    );
+
+    client_a
+        .fs()
+        .insert_tree(
+            path!("/dir"),
+            json!({
+                "one.rs": "const ONE: usize = 1;"
+            }),
+        )
+        .await;
+    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
+    let project_id = active_call_a
+        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
+        .await
+        .unwrap();
+    let project_b = client_b.join_remote_project(project_id, cx_b).await;
+
+    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
+    let editor_b = workspace_b
+        .update_in(cx_b, |workspace, window, cx| {
+            workspace.open_path((worktree_id, "one.rs"), None, true, window, cx)
+        })
+        .await
+        .unwrap()
+        .downcast::<Editor>()
+        .unwrap();
+    let (lsp_store_b, buffer_b) = editor_b.update(cx_b, |editor, cx| {
+        let lsp_store = editor.project().unwrap().read(cx).lsp_store();
+        let buffer = editor.buffer().read(cx).as_singleton().unwrap();
+        (lsp_store, buffer)
+    });
+    let fake_language_server = fake_language_servers.next().await.unwrap();
+    cx_a.run_until_parked();
+    cx_b.run_until_parked();
+
+    let long_request_time = LSP_REQUEST_TIMEOUT / 2;
+    let (request_started_tx, mut request_started_rx) = mpsc::unbounded();
+    let requests_started = Arc::new(AtomicUsize::new(0));
+    let requests_completed = Arc::new(AtomicUsize::new(0));
+    let _lens_requests = fake_language_server
+        .set_request_handler::<lsp::request::CodeLensRequest, _, _>({
+            let request_started_tx = request_started_tx.clone();
+            let requests_started = requests_started.clone();
+            let requests_completed = requests_completed.clone();
+            move |params, cx| {
+                let mut request_started_tx = request_started_tx.clone();
+                let requests_started = requests_started.clone();
+                let requests_completed = requests_completed.clone();
+                async move {
+                    assert_eq!(
+                        params.text_document.uri.as_str(),
+                        uri!("file:///dir/one.rs")
+                    );
+                    requests_started.fetch_add(1, atomic::Ordering::Release);
+                    request_started_tx.send(()).await.unwrap();
+                    cx.background_executor().timer(long_request_time).await;
+                    let i = requests_completed.fetch_add(1, atomic::Ordering::Release) + 1;
+                    Ok(Some(vec![lsp::CodeLens {
+                        range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 9)),
+                        command: Some(lsp::Command {
+                            title: format!("LSP Command {i}"),
+                            command: command_name.to_string(),
+                            arguments: None,
+                        }),
+                        data: None,
+                    }]))
+                }
+            }
+        });
+
+    // Move cursor to a location, this should trigger the code lens call.
+    editor_b.update_in(cx_b, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_ranges([7..7])
+        });
+    });
+    let () = request_started_rx.next().await.unwrap();
+    assert_eq!(
+        requests_started.load(atomic::Ordering::Acquire),
+        1,
+        "Selection change should have initiated the first request"
+    );
+    assert_eq!(
+        requests_completed.load(atomic::Ordering::Acquire),
+        0,
+        "Slow requests should be running still"
+    );
+    let _first_task = lsp_store_b.update(cx_b, |lsp_store, cx| {
+        lsp_store
+            .forget_code_lens_task(buffer_b.read(cx).remote_id())
+            .expect("Should have the fetch task started")
+    });
+
+    editor_b.update_in(cx_b, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_ranges([1..1])
+        });
+    });
+    let () = request_started_rx.next().await.unwrap();
+    assert_eq!(
+        requests_started.load(atomic::Ordering::Acquire),
+        2,
+        "Selection change should have initiated the second request"
+    );
+    assert_eq!(
+        requests_completed.load(atomic::Ordering::Acquire),
+        0,
+        "Slow requests should be running still"
+    );
+    let _second_task = lsp_store_b.update(cx_b, |lsp_store, cx| {
+        lsp_store
+            .forget_code_lens_task(buffer_b.read(cx).remote_id())
+            .expect("Should have the fetch task started for the 2nd time")
+    });
+
+    editor_b.update_in(cx_b, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_ranges([2..2])
+        });
+    });
+    let () = request_started_rx.next().await.unwrap();
+    assert_eq!(
+        requests_started.load(atomic::Ordering::Acquire),
+        3,
+        "Selection change should have initiated the third request"
+    );
+    assert_eq!(
+        requests_completed.load(atomic::Ordering::Acquire),
+        0,
+        "Slow requests should be running still"
+    );
+
+    _first_task.await.unwrap();
+    _second_task.await.unwrap();
+    cx_b.run_until_parked();
+    assert_eq!(
+        requests_started.load(atomic::Ordering::Acquire),
+        3,
+        "No selection changes should trigger no more code lens requests"
+    );
+    assert_eq!(
+        requests_completed.load(atomic::Ordering::Acquire),
+        3,
+        "After enough time, all 3 LSP requests should have been served by the language server"
+    );
+    let resulting_lens_actions = editor_b
+        .update(cx_b, |editor, cx| {
+            let lsp_store = editor.project().unwrap().read(cx).lsp_store();
+            lsp_store.update(cx, |lsp_store, cx| {
+                lsp_store.code_lens_actions(&buffer_b, cx)
+            })
+        })
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(
+        resulting_lens_actions.len(),
+        1,
+        "Should have fetched one code lens action, but got: {resulting_lens_actions:?}"
+    );
+    assert_eq!(
+        resulting_lens_actions.first().unwrap().lsp_action.title(),
+        "LSP Command 3",
+        "Only the final code lens action should be in the data"
+    )
+}
+
 #[gpui::test(iterations = 10)]
 async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
     let mut server = TestServer::start(cx_a.executor()).await;
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index e01736f0ef..5c73253048 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -4850,6 +4850,7 @@ async fn test_definition(
     let definitions_1 = project_b
         .update(cx_b, |p, cx| p.definitions(&buffer_b, 23, cx))
         .await
+        .unwrap()
         .unwrap();
     cx_b.read(|cx| {
         assert_eq!(
@@ -4885,6 +4886,7 @@ async fn test_definition(
     let definitions_2 = project_b
         .update(cx_b, |p, cx| p.definitions(&buffer_b, 33, cx))
         .await
+        .unwrap()
         .unwrap();
     cx_b.read(|cx| {
         assert_eq!(definitions_2.len(), 1);
@@ -4922,6 +4924,7 @@ async fn test_definition(
     let type_definitions = project_b
         .update(cx_b, |p, cx| p.type_definitions(&buffer_b, 7, cx))
         .await
+        .unwrap()
         .unwrap();
     cx_b.read(|cx| {
         assert_eq!(
@@ -5060,7 +5063,7 @@ async fn test_references(
         ])))
         .unwrap();
 
-    let references = references.await.unwrap();
+    let references = references.await.unwrap().unwrap();
     executor.run_until_parked();
     project_b.read_with(cx_b, |project, cx| {
         // User is informed that a request is no longer pending.
@@ -5104,7 +5107,7 @@ async fn test_references(
     lsp_response_tx
         .unbounded_send(Err(anyhow!("can't find references")))
         .unwrap();
-    assert_eq!(references.await.unwrap(), []);
+    assert_eq!(references.await.unwrap().unwrap(), []);
 
     // User is informed that the request is no longer pending.
     executor.run_until_parked();
@@ -5505,7 +5508,8 @@ async fn test_lsp_hover(
     // Request hover information as the guest.
     let mut hovers = project_b
         .update(cx_b, |p, cx| p.hover(&buffer_b, 22, cx))
-        .await;
+        .await
+        .unwrap();
     assert_eq!(
         hovers.len(),
         2,
@@ -5764,7 +5768,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
         definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
     }
 
-    let definitions = definitions.await.unwrap();
+    let definitions = definitions.await.unwrap().unwrap();
     assert_eq!(
         definitions.len(),
         1,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 25fddf5cf1..e32ea1cb3a 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -15710,7 +15710,9 @@ impl Editor {
         };
 
         cx.spawn_in(window, async move |editor, cx| {
-            let definitions = definitions.await?;
+            let Some(definitions) = definitions.await? else {
+                return Ok(Navigated::No);
+            };
             let navigated = editor
                 .update_in(cx, |editor, window, cx| {
                     editor.navigate_to_hover_links(
@@ -16052,7 +16054,9 @@ impl Editor {
                 }
             });
 
-            let locations = references.await?;
+            let Some(locations) = references.await? else {
+                return anyhow::Ok(Navigated::No);
+            };
             if locations.is_empty() {
                 return anyhow::Ok(Navigated::No);
             }
@@ -21837,7 +21841,7 @@ pub trait SemanticsProvider {
         buffer: &Entity<Buffer>,
         position: text::Anchor,
         cx: &mut App,
-    ) -> Option<Task<Vec<project::Hover>>>;
+    ) -> Option<Task<Option<Vec<project::Hover>>>>;
 
     fn inline_values(
         &self,
@@ -21876,7 +21880,7 @@ pub trait SemanticsProvider {
         position: text::Anchor,
         kind: GotoDefinitionKind,
         cx: &mut App,
-    ) -> Option<Task<Result<Vec<LocationLink>>>>;
+    ) -> Option<Task<Result<Option<Vec<LocationLink>>>>>;
 
     fn range_for_rename(
         &self,
@@ -21989,7 +21993,13 @@ impl CodeActionProvider for Entity<Project> {
                 Ok(code_lens_actions
                     .context("code lens fetch")?
                     .into_iter()
-                    .chain(code_actions.context("code action fetch")?)
+                    .flatten()
+                    .chain(
+                        code_actions
+                            .context("code action fetch")?
+                            .into_iter()
+                            .flatten(),
+                    )
                     .collect())
             })
         })
@@ -22284,7 +22294,7 @@ impl SemanticsProvider for Entity<Project> {
         buffer: &Entity<Buffer>,
         position: text::Anchor,
         cx: &mut App,
-    ) -> Option<Task<Vec<project::Hover>>> {
+    ) -> Option<Task<Option<Vec<project::Hover>>>> {
         Some(self.update(cx, |project, cx| project.hover(buffer, position, cx)))
     }
 
@@ -22305,7 +22315,7 @@ impl SemanticsProvider for Entity<Project> {
         position: text::Anchor,
         kind: GotoDefinitionKind,
         cx: &mut App,
-    ) -> Option<Task<Result<Vec<LocationLink>>>> {
+    ) -> Option<Task<Result<Option<Vec<LocationLink>>>>> {
         Some(self.update(cx, |project, cx| match kind {
             GotoDefinitionKind::Symbol => project.definitions(buffer, position, cx),
             GotoDefinitionKind::Declaration => project.declarations(buffer, position, cx),
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 04e66a234c..1d7d56e67d 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -559,7 +559,7 @@ pub fn show_link_definition(
                             provider.definitions(&buffer, buffer_position, preferred_kind, cx)
                         })?;
                         if let Some(task) = task {
-                            task.await.ok().map(|definition_result| {
+                            task.await.ok().flatten().map(|definition_result| {
                                 (
                                     definition_result.iter().find_map(|link| {
                                         link.origin.as_ref().and_then(|origin| {
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 28a09e947f..fab5345787 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -428,7 +428,7 @@ fn show_hover(
             };
 
             let hovers_response = if let Some(hover_request) = hover_request {
-                hover_request.await
+                hover_request.await.unwrap_or_default()
             } else {
                 Vec::new()
             };
diff --git a/crates/editor/src/proposed_changes_editor.rs b/crates/editor/src/proposed_changes_editor.rs
index c79feccb4b..2d4710a8d4 100644
--- a/crates/editor/src/proposed_changes_editor.rs
+++ b/crates/editor/src/proposed_changes_editor.rs
@@ -431,7 +431,7 @@ impl SemanticsProvider for BranchBufferSemanticsProvider {
         buffer: &Entity<Buffer>,
         position: text::Anchor,
         cx: &mut App,
-    ) -> Option<Task<Vec<project::Hover>>> {
+    ) -> Option<Task<Option<Vec<project::Hover>>>> {
         let buffer = self.to_base(buffer, &[position], cx)?;
         self.0.hover(&buffer, position, cx)
     }
@@ -490,7 +490,7 @@ impl SemanticsProvider for BranchBufferSemanticsProvider {
         position: text::Anchor,
         kind: crate::GotoDefinitionKind,
         cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<project::LocationLink>>>> {
+    ) -> Option<Task<anyhow::Result<Option<Vec<project::LocationLink>>>>> {
         let buffer = self.to_base(buffer, &[position], cx)?;
         self.0.definitions(&buffer, position, kind, cx)
     }
diff --git a/crates/editor/src/signature_help.rs b/crates/editor/src/signature_help.rs
index 5c9800ab55..cb21f35d7e 100644
--- a/crates/editor/src/signature_help.rs
+++ b/crates/editor/src/signature_help.rs
@@ -182,7 +182,9 @@ impl Editor {
                 let signature_help = task.await;
                 editor
                     .update(cx, |editor, cx| {
-                        let Some(mut signature_help) = signature_help.into_iter().next() else {
+                        let Some(mut signature_help) =
+                            signature_help.unwrap_or_default().into_iter().next()
+                        else {
                             editor
                                 .signature_help_state
                                 .hide(SignatureHelpHiddenBy::AutoClose);
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index ce9e2fe229..942225d098 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -45,7 +45,7 @@ use util::{ConnectionResult, ResultExt, TryFutureExt, redact};
 const JSON_RPC_VERSION: &str = "2.0";
 const CONTENT_LEN_HEADER: &str = "Content-Length: ";
 
-const LSP_REQUEST_TIMEOUT: Duration = Duration::from_secs(60 * 2);
+pub const LSP_REQUEST_TIMEOUT: Duration = Duration::from_secs(60 * 2);
 const SERVER_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
 
 type NotificationHandler = Box<dyn Send + FnMut(Option<RequestId>, Value, &mut AsyncApp)>;
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index c90d85358a..ce7a871d1a 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -3444,8 +3444,7 @@ impl LspCommand for GetCodeLens {
         capabilities
             .server_capabilities
             .code_lens_provider
-            .as_ref()
-            .is_some_and(|code_lens_options| code_lens_options.resolve_provider.unwrap_or(false))
+            .is_some()
     }
 
     fn to_lsp(
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 0b58009f37..bcfd9d386b 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -72,10 +72,11 @@ use lsp::{
     AdapterServerCapabilities, CodeActionKind, CompletionContext, DiagnosticSeverity,
     DiagnosticTag, DidChangeWatchedFilesRegistrationOptions, Edit, FileOperationFilter,
     FileOperationPatternKind, FileOperationRegistrationOptions, FileRename, FileSystemWatcher,
-    LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId,
-    LanguageServerName, LanguageServerSelector, LspRequestFuture, MessageActionItem, MessageType,
-    OneOf, RenameFilesParams, SymbolKind, TextDocumentSyncSaveOptions, TextEdit, WillRenameFiles,
-    WorkDoneProgressCancelParams, WorkspaceFolder, notification::DidRenameFiles,
+    LSP_REQUEST_TIMEOUT, LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions,
+    LanguageServerId, LanguageServerName, LanguageServerSelector, LspRequestFuture,
+    MessageActionItem, MessageType, OneOf, RenameFilesParams, SymbolKind,
+    TextDocumentSyncSaveOptions, TextEdit, WillRenameFiles, WorkDoneProgressCancelParams,
+    WorkspaceFolder, notification::DidRenameFiles,
 };
 use node_runtime::read_package_installed_version;
 use parking_lot::Mutex;
@@ -84,7 +85,7 @@ use rand::prelude::*;
 
 use rpc::{
     AnyProtoClient,
-    proto::{FromProto, ToProto},
+    proto::{FromProto, LspRequestId, LspRequestMessage as _, ToProto},
 };
 use serde::Serialize;
 use settings::{Settings, SettingsLocation, SettingsStore};
@@ -92,7 +93,7 @@ use sha2::{Digest, Sha256};
 use smol::channel::Sender;
 use snippet::Snippet;
 use std::{
-    any::Any,
+    any::{Any, TypeId},
     borrow::Cow,
     cell::RefCell,
     cmp::{Ordering, Reverse},
@@ -3490,6 +3491,7 @@ pub struct LspStore {
     pub(super) lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
     lsp_document_colors: HashMap<BufferId, DocumentColorData>,
     lsp_code_lens: HashMap<BufferId, CodeLensData>,
+    running_lsp_requests: HashMap<TypeId, (Global, HashMap<LspRequestId, Task<()>>)>,
 }
 
 #[derive(Debug, Default, Clone)]
@@ -3499,7 +3501,7 @@ pub struct DocumentColors {
 }
 
 type DocumentColorTask = Shared<Task<std::result::Result<DocumentColors, Arc<anyhow::Error>>>>;
-type CodeLensTask = Shared<Task<std::result::Result<Vec<CodeAction>, Arc<anyhow::Error>>>>;
+type CodeLensTask = Shared<Task<std::result::Result<Option<Vec<CodeAction>>, Arc<anyhow::Error>>>>;
 
 #[derive(Debug, Default)]
 struct DocumentColorData {
@@ -3579,6 +3581,8 @@ struct CoreSymbol {
 
 impl LspStore {
     pub fn init(client: &AnyProtoClient) {
+        client.add_entity_request_handler(Self::handle_lsp_query);
+        client.add_entity_message_handler(Self::handle_lsp_query_response);
         client.add_entity_request_handler(Self::handle_multi_lsp_query);
         client.add_entity_request_handler(Self::handle_restart_language_servers);
         client.add_entity_request_handler(Self::handle_stop_language_servers);
@@ -3758,6 +3762,7 @@ impl LspStore {
             lsp_server_capabilities: HashMap::default(),
             lsp_document_colors: HashMap::default(),
             lsp_code_lens: HashMap::default(),
+            running_lsp_requests: HashMap::default(),
             active_entry: None,
             _maintain_workspace_config,
             _maintain_buffer_languages: Self::maintain_buffer_languages(languages, cx),
@@ -3819,6 +3824,7 @@ impl LspStore {
             lsp_server_capabilities: HashMap::default(),
             lsp_document_colors: HashMap::default(),
             lsp_code_lens: HashMap::default(),
+            running_lsp_requests: HashMap::default(),
             active_entry: None,
 
             _maintain_workspace_config,
@@ -4381,8 +4387,6 @@ impl LspStore {
         }
     }
 
-    // TODO: remove MultiLspQuery: instead, the proto handler should pick appropriate server(s)
-    // Then, use `send_lsp_proto_request` or analogue for most of the LSP proto requests and inline this check inside
     fn is_capable_for_proto_request<R>(
         &self,
         buffer: &Entity<Buffer>,
@@ -5233,154 +5237,130 @@ impl LspStore {
 
     pub fn definitions(
         &mut self,
-        buffer_handle: &Entity<Buffer>,
+        buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetDefinitions { position };
-            if !self.is_capable_for_proto_request(buffer_handle, &request, cx) {
-                return Task::ready(Ok(Vec::new()));
+            if !self.is_capable_for_proto_request(buffer, &request, cx) {
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer_handle.read(cx).remote_id().into(),
-                version: serialize_version(&buffer_handle.read(cx).version()),
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetDefinition(
-                    request.to_proto(project_id, buffer_handle.read(cx)),
-                )),
-            });
-            let buffer = buffer_handle.clone();
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
+            let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
                 let Some(project) = weak_project.upgrade() else {
-                    return Ok(Vec::new());
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetDefinitionResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|definitions_response| {
-                            GetDefinitions { position }.response_from_proto(
-                                definitions_response,
-                                project.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            )
-                        }),
-                )
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
+                };
+                let actions = join_all(responses.payload.into_iter().map(|response| {
+                    GetDefinitions { position }.response_from_proto(
+                        response.response,
+                        project.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
                 .await;
 
-                Ok(actions
-                    .into_iter()
-                    .collect::<Result<Vec<Vec<_>>>>()?
-                    .into_iter()
-                    .flatten()
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    actions
+                        .into_iter()
+                        .collect::<Result<Vec<Vec<_>>>>()?
+                        .into_iter()
+                        .flatten()
+                        .dedup()
+                        .collect(),
+                ))
             })
         } else {
             let definitions_task = self.request_multiple_lsp_locally(
-                buffer_handle,
+                buffer,
                 Some(position),
                 GetDefinitions { position },
                 cx,
             );
             cx.background_spawn(async move {
-                Ok(definitions_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, definitions)| definitions)
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    definitions_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, definitions)| definitions)
+                        .dedup()
+                        .collect(),
+                ))
             })
         }
     }
 
     pub fn declarations(
         &mut self,
-        buffer_handle: &Entity<Buffer>,
+        buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetDeclarations { position };
-            if !self.is_capable_for_proto_request(buffer_handle, &request, cx) {
-                return Task::ready(Ok(Vec::new()));
+            if !self.is_capable_for_proto_request(buffer, &request, cx) {
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer_handle.read(cx).remote_id().into(),
-                version: serialize_version(&buffer_handle.read(cx).version()),
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetDeclaration(
-                    request.to_proto(project_id, buffer_handle.read(cx)),
-                )),
-            });
-            let buffer = buffer_handle.clone();
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
+            let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
                 let Some(project) = weak_project.upgrade() else {
-                    return Ok(Vec::new());
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetDeclarationResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|declarations_response| {
-                            GetDeclarations { position }.response_from_proto(
-                                declarations_response,
-                                project.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            )
-                        }),
-                )
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
+                };
+                let actions = join_all(responses.payload.into_iter().map(|response| {
+                    GetDeclarations { position }.response_from_proto(
+                        response.response,
+                        project.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
                 .await;
 
-                Ok(actions
-                    .into_iter()
-                    .collect::<Result<Vec<Vec<_>>>>()?
-                    .into_iter()
-                    .flatten()
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    actions
+                        .into_iter()
+                        .collect::<Result<Vec<Vec<_>>>>()?
+                        .into_iter()
+                        .flatten()
+                        .dedup()
+                        .collect(),
+                ))
             })
         } else {
             let declarations_task = self.request_multiple_lsp_locally(
-                buffer_handle,
+                buffer,
                 Some(position),
                 GetDeclarations { position },
                 cx,
             );
             cx.background_spawn(async move {
-                Ok(declarations_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, declarations)| declarations)
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    declarations_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, declarations)| declarations)
+                        .dedup()
+                        .collect(),
+                ))
             })
         }
     }
@@ -5390,59 +5370,45 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetTypeDefinitions { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(Vec::new()));
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetTypeDefinition(
-                    request.to_proto(project_id, buffer.read(cx)),
-                )),
-            });
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
                 let Some(project) = weak_project.upgrade() else {
-                    return Ok(Vec::new());
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetTypeDefinitionResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|type_definitions_response| {
-                            GetTypeDefinitions { position }.response_from_proto(
-                                type_definitions_response,
-                                project.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            )
-                        }),
-                )
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
+                };
+                let actions = join_all(responses.payload.into_iter().map(|response| {
+                    GetTypeDefinitions { position }.response_from_proto(
+                        response.response,
+                        project.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
                 .await;
 
-                Ok(actions
-                    .into_iter()
-                    .collect::<Result<Vec<Vec<_>>>>()?
-                    .into_iter()
-                    .flatten()
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    actions
+                        .into_iter()
+                        .collect::<Result<Vec<Vec<_>>>>()?
+                        .into_iter()
+                        .flatten()
+                        .dedup()
+                        .collect(),
+                ))
             })
         } else {
             let type_definitions_task = self.request_multiple_lsp_locally(
@@ -5452,12 +5418,14 @@ impl LspStore {
                 cx,
             );
             cx.background_spawn(async move {
-                Ok(type_definitions_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, type_definitions)| type_definitions)
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    type_definitions_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, type_definitions)| type_definitions)
+                        .dedup()
+                        .collect(),
+                ))
             })
         }
     }
@@ -5467,59 +5435,45 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetImplementations { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(Vec::new()));
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetImplementation(
-                    request.to_proto(project_id, buffer.read(cx)),
-                )),
-            });
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
                 let Some(project) = weak_project.upgrade() else {
-                    return Ok(Vec::new());
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetImplementationResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|implementations_response| {
-                            GetImplementations { position }.response_from_proto(
-                                implementations_response,
-                                project.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            )
-                        }),
-                )
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
+                };
+                let actions = join_all(responses.payload.into_iter().map(|response| {
+                    GetImplementations { position }.response_from_proto(
+                        response.response,
+                        project.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
                 .await;
 
-                Ok(actions
-                    .into_iter()
-                    .collect::<Result<Vec<Vec<_>>>>()?
-                    .into_iter()
-                    .flatten()
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    actions
+                        .into_iter()
+                        .collect::<Result<Vec<Vec<_>>>>()?
+                        .into_iter()
+                        .flatten()
+                        .dedup()
+                        .collect(),
+                ))
             })
         } else {
             let implementations_task = self.request_multiple_lsp_locally(
@@ -5529,12 +5483,14 @@ impl LspStore {
                 cx,
             );
             cx.background_spawn(async move {
-                Ok(implementations_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, implementations)| implementations)
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    implementations_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, implementations)| implementations)
+                        .dedup()
+                        .collect(),
+                ))
             })
         }
     }
@@ -5544,59 +5500,44 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Location>>> {
+    ) -> Task<Result<Option<Vec<Location>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetReferences { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(Vec::new()));
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
+
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetReferences(
-                    request.to_proto(project_id, buffer.read(cx)),
-                )),
-            });
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
                 let Some(project) = weak_project.upgrade() else {
-                    return Ok(Vec::new());
+                    return Ok(None);
+                };
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetReferencesResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|references_response| {
-                            GetReferences { position }.response_from_proto(
-                                references_response,
-                                project.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            )
-                        }),
-                )
-                .await;
 
-                Ok(actions
-                    .into_iter()
-                    .collect::<Result<Vec<Vec<_>>>>()?
-                    .into_iter()
-                    .flatten()
-                    .dedup()
-                    .collect())
+                let locations = join_all(responses.payload.into_iter().map(|lsp_response| {
+                    GetReferences { position }.response_from_proto(
+                        lsp_response.response,
+                        project.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
+                .await
+                .into_iter()
+                .collect::<Result<Vec<Vec<_>>>>()?
+                .into_iter()
+                .flatten()
+                .dedup()
+                .collect();
+                Ok(Some(locations))
             })
         } else {
             let references_task = self.request_multiple_lsp_locally(
@@ -5606,12 +5547,14 @@ impl LspStore {
                 cx,
             );
             cx.background_spawn(async move {
-                Ok(references_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, references)| references)
-                    .dedup()
-                    .collect())
+                Ok(Some(
+                    references_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, references)| references)
+                        .dedup()
+                        .collect(),
+                ))
             })
         }
     }
@@ -5622,65 +5565,51 @@ impl LspStore {
         range: Range<Anchor>,
         kinds: Option<Vec<CodeActionKind>>,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CodeAction>>> {
+    ) -> Task<Result<Option<Vec<CodeAction>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetCodeActions {
                 range: range.clone(),
                 kinds: kinds.clone(),
             };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(Vec::new()));
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetCodeActions(
-                    request.to_proto(project_id, buffer.read(cx)),
-                )),
-            });
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
                 let Some(project) = weak_project.upgrade() else {
-                    return Ok(Vec::new());
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetCodeActionsResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|code_actions_response| {
-                            GetCodeActions {
-                                range: range.clone(),
-                                kinds: kinds.clone(),
-                            }
-                            .response_from_proto(
-                                code_actions_response,
-                                project.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            )
-                        }),
-                )
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
+                };
+                let actions = join_all(responses.payload.into_iter().map(|response| {
+                    GetCodeActions {
+                        range: range.clone(),
+                        kinds: kinds.clone(),
+                    }
+                    .response_from_proto(
+                        response.response,
+                        project.clone(),
+                        buffer.clone(),
+                        cx.clone(),
+                    )
+                }))
                 .await;
 
-                Ok(actions
-                    .into_iter()
-                    .collect::<Result<Vec<Vec<_>>>>()?
-                    .into_iter()
-                    .flatten()
-                    .collect())
+                Ok(Some(
+                    actions
+                        .into_iter()
+                        .collect::<Result<Vec<Vec<_>>>>()?
+                        .into_iter()
+                        .flatten()
+                        .collect(),
+                ))
             })
         } else {
             let all_actions_task = self.request_multiple_lsp_locally(
@@ -5690,11 +5619,13 @@ impl LspStore {
                 cx,
             );
             cx.background_spawn(async move {
-                Ok(all_actions_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, actions)| actions)
-                    .collect())
+                Ok(Some(
+                    all_actions_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, actions)| actions)
+                        .collect(),
+                ))
             })
         }
     }
@@ -5719,8 +5650,10 @@ impl LspStore {
                     != cached_data.lens.keys().copied().collect()
             });
             if !has_different_servers {
-                return Task::ready(Ok(cached_data.lens.values().flatten().cloned().collect()))
-                    .shared();
+                return Task::ready(Ok(Some(
+                    cached_data.lens.values().flatten().cloned().collect(),
+                )))
+                .shared();
             }
         }
 
@@ -5758,17 +5691,19 @@ impl LspStore {
                 lsp_store
                     .update(cx, |lsp_store, _| {
                         let lsp_data = lsp_store.lsp_code_lens.entry(buffer_id).or_default();
-                        if lsp_data.lens_for_version == query_version_queried_for {
-                            lsp_data.lens.extend(fetched_lens.clone());
-                        } else if !lsp_data
-                            .lens_for_version
-                            .changed_since(&query_version_queried_for)
-                        {
-                            lsp_data.lens_for_version = query_version_queried_for;
-                            lsp_data.lens = fetched_lens.clone();
+                        if let Some(fetched_lens) = fetched_lens {
+                            if lsp_data.lens_for_version == query_version_queried_for {
+                                lsp_data.lens.extend(fetched_lens.clone());
+                            } else if !lsp_data
+                                .lens_for_version
+                                .changed_since(&query_version_queried_for)
+                            {
+                                lsp_data.lens_for_version = query_version_queried_for;
+                                lsp_data.lens = fetched_lens.clone();
+                            }
                         }
                         lsp_data.update = None;
-                        lsp_data.lens.values().flatten().cloned().collect()
+                        Some(lsp_data.lens.values().flatten().cloned().collect())
                     })
                     .map_err(Arc::new)
             })
@@ -5781,64 +5716,40 @@ impl LspStore {
         &mut self,
         buffer: &Entity<Buffer>,
         cx: &mut Context<Self>,
-    ) -> Task<Result<HashMap<LanguageServerId, Vec<CodeAction>>>> {
+    ) -> Task<Result<Option<HashMap<LanguageServerId, Vec<CodeAction>>>>> {
         if let Some((upstream_client, project_id)) = self.upstream_client() {
             let request = GetCodeLens;
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(HashMap::default()));
+                return Task::ready(Ok(None));
             }
-            let request_task = upstream_client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
+            let request_task = upstream_client.request_lsp(
                 project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetCodeLens(
-                    request.to_proto(project_id, buffer.read(cx)),
-                )),
-            });
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_lsp_store, cx| {
                 let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(HashMap::default());
+                    return Ok(None);
                 };
-                let responses = request_task.await?.responses;
-                let code_lens_actions = join_all(
-                    responses
-                        .into_iter()
-                        .filter_map(|lsp_response| {
-                            let response = match lsp_response.response? {
-                                proto::lsp_response::Response::GetCodeLensResponse(response) => {
-                                    Some(response)
-                                }
-                                unexpected => {
-                                    debug_panic!("Unexpected response: {unexpected:?}");
-                                    None
-                                }
-                            }?;
-                            let server_id = LanguageServerId::from_proto(lsp_response.server_id);
-                            Some((server_id, response))
-                        })
-                        .map(|(server_id, code_lens_response)| {
-                            let lsp_store = lsp_store.clone();
-                            let buffer = buffer.clone();
-                            let cx = cx.clone();
-                            async move {
-                                (
-                                    server_id,
-                                    GetCodeLens
-                                        .response_from_proto(
-                                            code_lens_response,
-                                            lsp_store,
-                                            buffer,
-                                            cx,
-                                        )
-                                        .await,
-                                )
-                            }
-                        }),
-                )
+                let Some(responses) = request_task.await? else {
+                    return Ok(None);
+                };
+
+                let code_lens_actions = join_all(responses.payload.into_iter().map(|response| {
+                    let lsp_store = lsp_store.clone();
+                    let buffer = buffer.clone();
+                    let cx = cx.clone();
+                    async move {
+                        (
+                            LanguageServerId::from_proto(response.server_id),
+                            GetCodeLens
+                                .response_from_proto(response.response, lsp_store, buffer, cx)
+                                .await,
+                        )
+                    }
+                }))
                 .await;
 
                 let mut has_errors = false;
@@ -5857,14 +5768,14 @@ impl LspStore {
                     !has_errors || !code_lens_actions.is_empty(),
                     "Failed to fetch code lens"
                 );
-                Ok(code_lens_actions)
+                Ok(Some(code_lens_actions))
             })
         } else {
             let code_lens_actions_task =
                 self.request_multiple_lsp_locally(buffer, None::<usize>, GetCodeLens, cx);
-            cx.background_spawn(
-                async move { Ok(code_lens_actions_task.await.into_iter().collect()) },
-            )
+            cx.background_spawn(async move {
+                Ok(Some(code_lens_actions_task.await.into_iter().collect()))
+            })
         }
     }
 
@@ -6480,48 +6391,23 @@ impl LspStore {
         let buffer_id = buffer.read(cx).remote_id();
 
         if let Some((client, upstream_project_id)) = self.upstream_client() {
-            if !self.is_capable_for_proto_request(
-                &buffer,
-                &GetDocumentDiagnostics {
-                    previous_result_id: None,
-                },
-                cx,
-            ) {
+            let request = GetDocumentDiagnostics {
+                previous_result_id: None,
+            };
+            if !self.is_capable_for_proto_request(&buffer, &request, cx) {
                 return Task::ready(Ok(None));
             }
-            let request_task = client.request(proto::MultiLspQuery {
-                buffer_id: buffer_id.to_proto(),
-                version: serialize_version(&buffer.read(cx).version()),
-                project_id: upstream_project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetDocumentDiagnostics(
-                    proto::GetDocumentDiagnostics {
-                        project_id: upstream_project_id,
-                        buffer_id: buffer_id.to_proto(),
-                        version: serialize_version(&buffer.read(cx).version()),
-                    },
-                )),
-            });
+            let request_task = client.request_lsp(
+                upstream_project_id,
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(upstream_project_id, buffer.read(cx)),
+            );
             cx.background_spawn(async move {
-                let _proto_responses = request_task
-                    .await?
-                    .responses
-                    .into_iter()
-                    .filter_map(|lsp_response| match lsp_response.response? {
-                        proto::lsp_response::Response::GetDocumentDiagnosticsResponse(response) => {
-                            Some(response)
-                        }
-                        unexpected => {
-                            debug_panic!("Unexpected response: {unexpected:?}");
-                            None
-                        }
-                    })
-                    .collect::<Vec<_>>();
                 // Proto requests cause the diagnostics to be pulled from language server(s) on the local side
                 // and then, buffer state updated with the diagnostics received, which will be later propagated to the client.
                 // Do not attempt to further process the dummy responses here.
+                let _response = request_task.await?;
                 Ok(None)
             })
         } else {
@@ -6806,16 +6692,18 @@ impl LspStore {
                     .update(cx, |lsp_store, _| {
                         let lsp_data = lsp_store.lsp_document_colors.entry(buffer_id).or_default();
 
-                        if lsp_data.colors_for_version == query_version_queried_for {
-                            lsp_data.colors.extend(fetched_colors.clone());
-                            lsp_data.cache_version += 1;
-                        } else if !lsp_data
-                            .colors_for_version
-                            .changed_since(&query_version_queried_for)
-                        {
-                            lsp_data.colors_for_version = query_version_queried_for;
-                            lsp_data.colors = fetched_colors.clone();
-                            lsp_data.cache_version += 1;
+                        if let Some(fetched_colors) = fetched_colors {
+                            if lsp_data.colors_for_version == query_version_queried_for {
+                                lsp_data.colors.extend(fetched_colors.clone());
+                                lsp_data.cache_version += 1;
+                            } else if !lsp_data
+                                .colors_for_version
+                                .changed_since(&query_version_queried_for)
+                            {
+                                lsp_data.colors_for_version = query_version_queried_for;
+                                lsp_data.colors = fetched_colors.clone();
+                                lsp_data.cache_version += 1;
+                            }
                         }
                         lsp_data.colors_update = None;
                         let colors = lsp_data
@@ -6840,56 +6728,45 @@ impl LspStore {
         &mut self,
         buffer: &Entity<Buffer>,
         cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<HashMap<LanguageServerId, HashSet<DocumentColor>>>> {
+    ) -> Task<anyhow::Result<Option<HashMap<LanguageServerId, HashSet<DocumentColor>>>>> {
         if let Some((client, project_id)) = self.upstream_client() {
             let request = GetDocumentColor {};
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(HashMap::default()));
+                return Task::ready(Ok(None));
             }
 
-            let request_task = client.request(proto::MultiLspQuery {
+            let request_task = client.request_lsp(
                 project_id,
-                buffer_id: buffer.read(cx).remote_id().to_proto(),
-                version: serialize_version(&buffer.read(cx).version()),
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetDocumentColor(
-                    request.to_proto(project_id, buffer.read(cx)),
-                )),
-            });
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
-            cx.spawn(async move |project, cx| {
-                let Some(project) = project.upgrade() else {
-                    return Ok(HashMap::default());
+            cx.spawn(async move |lsp_store, cx| {
+                let Some(project) = lsp_store.upgrade() else {
+                    return Ok(None);
                 };
                 let colors = join_all(
                     request_task
                         .await
                         .log_err()
-                        .map(|response| response.responses)
+                        .flatten()
+                        .map(|response| response.payload)
                         .unwrap_or_default()
                         .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetDocumentColorResponse(response) => {
-                                Some((
-                                    LanguageServerId::from_proto(lsp_response.server_id),
-                                    response,
-                                ))
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|(server_id, color_response)| {
+                        .map(|color_response| {
                             let response = request.response_from_proto(
-                                color_response,
+                                color_response.response,
                                 project.clone(),
                                 buffer.clone(),
                                 cx.clone(),
                             );
-                            async move { (server_id, response.await.log_err().unwrap_or_default()) }
+                            async move {
+                                (
+                                    LanguageServerId::from_proto(color_response.server_id),
+                                    response.await.log_err().unwrap_or_default(),
+                                )
+                            }
                         }),
                 )
                 .await
@@ -6900,23 +6777,25 @@ impl LspStore {
                         .extend(colors);
                     acc
                 });
-                Ok(colors)
+                Ok(Some(colors))
             })
         } else {
             let document_colors_task =
                 self.request_multiple_lsp_locally(buffer, None::<usize>, GetDocumentColor, cx);
             cx.background_spawn(async move {
-                Ok(document_colors_task
-                    .await
-                    .into_iter()
-                    .fold(HashMap::default(), |mut acc, (server_id, colors)| {
-                        acc.entry(server_id)
-                            .or_insert_with(HashSet::default)
-                            .extend(colors);
-                        acc
-                    })
-                    .into_iter()
-                    .collect())
+                Ok(Some(
+                    document_colors_task
+                        .await
+                        .into_iter()
+                        .fold(HashMap::default(), |mut acc, (server_id, colors)| {
+                            acc.entry(server_id)
+                                .or_insert_with(HashSet::default)
+                                .extend(colors);
+                            acc
+                        })
+                        .into_iter()
+                        .collect(),
+                ))
             })
         }
     }
@@ -6926,49 +6805,34 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Vec<SignatureHelp>> {
+    ) -> Task<Option<Vec<SignatureHelp>>> {
         let position = position.to_point_utf16(buffer.read(cx));
 
         if let Some((client, upstream_project_id)) = self.upstream_client() {
             let request = GetSignatureHelp { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Vec::new());
+                return Task::ready(None);
             }
-            let request_task = client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
-                project_id: upstream_project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetSignatureHelp(
-                    request.to_proto(upstream_project_id, buffer.read(cx)),
-                )),
-            });
+            let request_task = client.request_lsp(
+                upstream_project_id,
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(upstream_project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
-                let Some(project) = weak_project.upgrade() else {
-                    return Vec::new();
-                };
-                join_all(
+                let project = weak_project.upgrade()?;
+                let signatures = join_all(
                     request_task
                         .await
                         .log_err()
-                        .map(|response| response.responses)
+                        .flatten()
+                        .map(|response| response.payload)
                         .unwrap_or_default()
                         .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetSignatureHelpResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|signature_response| {
+                        .map(|response| {
                             let response = GetSignatureHelp { position }.response_from_proto(
-                                signature_response,
+                                response.response,
                                 project.clone(),
                                 buffer.clone(),
                                 cx.clone(),
@@ -6979,7 +6843,8 @@ impl LspStore {
                 .await
                 .into_iter()
                 .flatten()
-                .collect()
+                .collect();
+                Some(signatures)
             })
         } else {
             let all_actions_task = self.request_multiple_lsp_locally(
@@ -6989,11 +6854,13 @@ impl LspStore {
                 cx,
             );
             cx.background_spawn(async move {
-                all_actions_task
-                    .await
-                    .into_iter()
-                    .flat_map(|(_, actions)| actions)
-                    .collect::<Vec<_>>()
+                Some(
+                    all_actions_task
+                        .await
+                        .into_iter()
+                        .flat_map(|(_, actions)| actions)
+                        .collect::<Vec<_>>(),
+                )
             })
         }
     }
@@ -7003,47 +6870,32 @@ impl LspStore {
         buffer: &Entity<Buffer>,
         position: PointUtf16,
         cx: &mut Context<Self>,
-    ) -> Task<Vec<Hover>> {
+    ) -> Task<Option<Vec<Hover>>> {
         if let Some((client, upstream_project_id)) = self.upstream_client() {
             let request = GetHover { position };
             if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Vec::new());
+                return Task::ready(None);
             }
-            let request_task = client.request(proto::MultiLspQuery {
-                buffer_id: buffer.read(cx).remote_id().into(),
-                version: serialize_version(&buffer.read(cx).version()),
-                project_id: upstream_project_id,
-                strategy: Some(proto::multi_lsp_query::Strategy::All(
-                    proto::AllLanguageServers {},
-                )),
-                request: Some(proto::multi_lsp_query::Request::GetHover(
-                    request.to_proto(upstream_project_id, buffer.read(cx)),
-                )),
-            });
+            let request_task = client.request_lsp(
+                upstream_project_id,
+                LSP_REQUEST_TIMEOUT,
+                cx.background_executor().clone(),
+                request.to_proto(upstream_project_id, buffer.read(cx)),
+            );
             let buffer = buffer.clone();
             cx.spawn(async move |weak_project, cx| {
-                let Some(project) = weak_project.upgrade() else {
-                    return Vec::new();
-                };
-                join_all(
+                let project = weak_project.upgrade()?;
+                let hovers = join_all(
                     request_task
                         .await
                         .log_err()
-                        .map(|response| response.responses)
+                        .flatten()
+                        .map(|response| response.payload)
                         .unwrap_or_default()
                         .into_iter()
-                        .filter_map(|lsp_response| match lsp_response.response? {
-                            proto::lsp_response::Response::GetHoverResponse(response) => {
-                                Some(response)
-                            }
-                            unexpected => {
-                                debug_panic!("Unexpected response: {unexpected:?}");
-                                None
-                            }
-                        })
-                        .map(|hover_response| {
+                        .map(|response| {
                             let response = GetHover { position }.response_from_proto(
-                                hover_response,
+                                response.response,
                                 project.clone(),
                                 buffer.clone(),
                                 cx.clone(),
@@ -7060,7 +6912,8 @@ impl LspStore {
                 .await
                 .into_iter()
                 .flatten()
-                .collect()
+                .collect();
+                Some(hovers)
             })
         } else {
             let all_actions_task = self.request_multiple_lsp_locally(
@@ -7070,11 +6923,13 @@ impl LspStore {
                 cx,
             );
             cx.background_spawn(async move {
-                all_actions_task
-                    .await
-                    .into_iter()
-                    .filter_map(|(_, hover)| remove_empty_hover_blocks(hover?))
-                    .collect::<Vec<Hover>>()
+                Some(
+                    all_actions_task
+                        .await
+                        .into_iter()
+                        .filter_map(|(_, hover)| remove_empty_hover_blocks(hover?))
+                        .collect::<Vec<Hover>>(),
+                )
             })
         }
     }
@@ -8137,6 +7992,203 @@ impl LspStore {
         })?
     }
 
+    async fn handle_lsp_query(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::LspQuery>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::Ack> {
+        use proto::lsp_query::Request;
+        let sender_id = envelope.original_sender_id().unwrap_or_default();
+        let lsp_query = envelope.payload;
+        let lsp_request_id = LspRequestId(lsp_query.lsp_request_id);
+        match lsp_query.request.context("invalid LSP query request")? {
+            Request::GetReferences(get_references) => {
+                let position = get_references.position.clone().and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetReferences>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_references,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetDocumentColor(get_document_color) => {
+                Self::query_lsp_locally::<GetDocumentColor>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_document_color,
+                    None,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetHover(get_hover) => {
+                let position = get_hover.position.clone().and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetHover>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_hover,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetCodeActions(get_code_actions) => {
+                Self::query_lsp_locally::<GetCodeActions>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_code_actions,
+                    None,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetSignatureHelp(get_signature_help) => {
+                let position = get_signature_help
+                    .position
+                    .clone()
+                    .and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetSignatureHelp>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_signature_help,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetCodeLens(get_code_lens) => {
+                Self::query_lsp_locally::<GetCodeLens>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_code_lens,
+                    None,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetDefinition(get_definition) => {
+                let position = get_definition.position.clone().and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetDefinitions>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_definition,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetDeclaration(get_declaration) => {
+                let position = get_declaration
+                    .position
+                    .clone()
+                    .and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetDeclarations>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_declaration,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetTypeDefinition(get_type_definition) => {
+                let position = get_type_definition
+                    .position
+                    .clone()
+                    .and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetTypeDefinitions>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_type_definition,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            Request::GetImplementation(get_implementation) => {
+                let position = get_implementation
+                    .position
+                    .clone()
+                    .and_then(deserialize_anchor);
+                Self::query_lsp_locally::<GetImplementations>(
+                    lsp_store,
+                    sender_id,
+                    lsp_request_id,
+                    get_implementation,
+                    position,
+                    cx.clone(),
+                )
+                .await?;
+            }
+            // Diagnostics pull synchronizes internally via the buffer state, and cannot be handled generically as the other requests.
+            Request::GetDocumentDiagnostics(get_document_diagnostics) => {
+                let buffer_id = BufferId::new(get_document_diagnostics.buffer_id())?;
+                let version = deserialize_version(get_document_diagnostics.buffer_version());
+                let buffer = lsp_store.update(&mut cx, |this, cx| {
+                    this.buffer_store.read(cx).get_existing(buffer_id)
+                })??;
+                buffer
+                    .update(&mut cx, |buffer, _| {
+                        buffer.wait_for_version(version.clone())
+                    })?
+                    .await?;
+                lsp_store.update(&mut cx, |lsp_store, cx| {
+                    let existing_queries = lsp_store
+                        .running_lsp_requests
+                        .entry(TypeId::of::<GetDocumentDiagnostics>())
+                        .or_default();
+                    if <GetDocumentDiagnostics as LspCommand>::ProtoRequest::stop_previous_requests(
+                    ) || buffer.read(cx).version.changed_since(&existing_queries.0)
+                    {
+                        existing_queries.1.clear();
+                    }
+                    existing_queries.1.insert(
+                        lsp_request_id,
+                        cx.spawn(async move |lsp_store, cx| {
+                            let diagnostics_pull = lsp_store
+                                .update(cx, |lsp_store, cx| {
+                                    lsp_store.pull_diagnostics_for_buffer(buffer, cx)
+                                })
+                                .ok();
+                            if let Some(diagnostics_pull) = diagnostics_pull {
+                                match diagnostics_pull.await {
+                                    Ok(()) => {}
+                                    Err(e) => log::error!("Failed to pull diagnostics: {e:#}"),
+                                };
+                            }
+                        }),
+                    );
+                })?;
+            }
+        }
+        Ok(proto::Ack {})
+    }
+
+    async fn handle_lsp_query_response(
+        lsp_store: Entity<Self>,
+        envelope: TypedEnvelope<proto::LspQueryResponse>,
+        cx: AsyncApp,
+    ) -> Result<()> {
+        lsp_store.read_with(&cx, |lsp_store, _| {
+            if let Some((upstream_client, _)) = lsp_store.upstream_client() {
+                upstream_client.handle_lsp_response(envelope.clone());
+            }
+        })?;
+        Ok(())
+    }
+
+    // todo(lsp) remove after Zed Stable hits v0.204.x
     async fn handle_multi_lsp_query(
         lsp_store: Entity<Self>,
         envelope: TypedEnvelope<proto::MultiLspQuery>,
@@ -12012,6 +12064,88 @@ impl LspStore {
         Ok(())
     }
 
+    async fn query_lsp_locally<T>(
+        lsp_store: Entity<Self>,
+        sender_id: proto::PeerId,
+        lsp_request_id: LspRequestId,
+        proto_request: T::ProtoRequest,
+        position: Option<Anchor>,
+        mut cx: AsyncApp,
+    ) -> Result<()>
+    where
+        T: LspCommand + Clone,
+        T::ProtoRequest: proto::LspRequestMessage,
+        <T::ProtoRequest as proto::RequestMessage>::Response:
+            Into<<T::ProtoRequest as proto::LspRequestMessage>::Response>,
+    {
+        let buffer_id = BufferId::new(proto_request.buffer_id())?;
+        let version = deserialize_version(proto_request.buffer_version());
+        let buffer = lsp_store.update(&mut cx, |this, cx| {
+            this.buffer_store.read(cx).get_existing(buffer_id)
+        })??;
+        buffer
+            .update(&mut cx, |buffer, _| {
+                buffer.wait_for_version(version.clone())
+            })?
+            .await?;
+        let buffer_version = buffer.read_with(&cx, |buffer, _| buffer.version())?;
+        let request =
+            T::from_proto(proto_request, lsp_store.clone(), buffer.clone(), cx.clone()).await?;
+        lsp_store.update(&mut cx, |lsp_store, cx| {
+            let request_task =
+                lsp_store.request_multiple_lsp_locally(&buffer, position, request, cx);
+            let existing_queries = lsp_store
+                .running_lsp_requests
+                .entry(TypeId::of::<T>())
+                .or_default();
+            if T::ProtoRequest::stop_previous_requests()
+                || buffer_version.changed_since(&existing_queries.0)
+            {
+                existing_queries.1.clear();
+            }
+            existing_queries.1.insert(
+                lsp_request_id,
+                cx.spawn(async move |lsp_store, cx| {
+                    let response = request_task.await;
+                    lsp_store
+                        .update(cx, |lsp_store, cx| {
+                            if let Some((client, project_id)) = lsp_store.downstream_client.clone()
+                            {
+                                let response = response
+                                    .into_iter()
+                                    .map(|(server_id, response)| {
+                                        (
+                                            server_id.to_proto(),
+                                            T::response_to_proto(
+                                                response,
+                                                lsp_store,
+                                                sender_id,
+                                                &buffer_version,
+                                                cx,
+                                            )
+                                            .into(),
+                                        )
+                                    })
+                                    .collect::<HashMap<_, _>>();
+                                match client.send_lsp_response::<T::ProtoRequest>(
+                                    project_id,
+                                    lsp_request_id,
+                                    response,
+                                ) {
+                                    Ok(()) => {}
+                                    Err(e) => {
+                                        log::error!("Failed to send LSP response: {e:#}",)
+                                    }
+                                }
+                            }
+                        })
+                        .ok();
+                }),
+            );
+        })?;
+        Ok(())
+    }
+
     fn take_text_document_sync_options(
         capabilities: &mut lsp::ServerCapabilities,
     ) -> lsp::TextDocumentSyncOptions {
@@ -12025,6 +12159,12 @@ impl LspStore {
             None => lsp::TextDocumentSyncOptions::default(),
         }
     }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn forget_code_lens_task(&mut self, buffer_id: BufferId) -> Option<CodeLensTask> {
+        let data = self.lsp_code_lens.get_mut(&buffer_id)?;
+        Some(data.update.take()?.1)
+    }
 }
 
 // Registration with registerOptions as null, should fallback to true.
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index e47c020a42..ee4bfcb8cc 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -3415,7 +3415,7 @@ impl Project {
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         let position = position.to_point_utf16(buffer.read(cx));
         let guard = self.retain_remotely_created_models(cx);
         let task = self.lsp_store.update(cx, |lsp_store, cx| {
@@ -3433,7 +3433,7 @@ impl Project {
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         let position = position.to_point_utf16(buffer.read(cx));
         let guard = self.retain_remotely_created_models(cx);
         let task = self.lsp_store.update(cx, |lsp_store, cx| {
@@ -3451,7 +3451,7 @@ impl Project {
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         let position = position.to_point_utf16(buffer.read(cx));
         let guard = self.retain_remotely_created_models(cx);
         let task = self.lsp_store.update(cx, |lsp_store, cx| {
@@ -3469,7 +3469,7 @@ impl Project {
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<LocationLink>>> {
+    ) -> Task<Result<Option<Vec<LocationLink>>>> {
         let position = position.to_point_utf16(buffer.read(cx));
         let guard = self.retain_remotely_created_models(cx);
         let task = self.lsp_store.update(cx, |lsp_store, cx| {
@@ -3487,7 +3487,7 @@ impl Project {
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Location>>> {
+    ) -> Task<Result<Option<Vec<Location>>>> {
         let position = position.to_point_utf16(buffer.read(cx));
         let guard = self.retain_remotely_created_models(cx);
         let task = self.lsp_store.update(cx, |lsp_store, cx| {
@@ -3585,23 +3585,12 @@ impl Project {
         })
     }
 
-    pub fn signature_help<T: ToPointUtf16>(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<SignatureHelp>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.signature_help(buffer, position, cx)
-        })
-    }
-
     pub fn hover<T: ToPointUtf16>(
         &self,
         buffer: &Entity<Buffer>,
         position: T,
         cx: &mut Context<Self>,
-    ) -> Task<Vec<Hover>> {
+    ) -> Task<Option<Vec<Hover>>> {
         let position = position.to_point_utf16(buffer.read(cx));
         self.lsp_store
             .update(cx, |lsp_store, cx| lsp_store.hover(buffer, position, cx))
@@ -3637,7 +3626,7 @@ impl Project {
         range: Range<T>,
         kinds: Option<Vec<CodeActionKind>>,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CodeAction>>> {
+    ) -> Task<Result<Option<Vec<CodeAction>>>> {
         let buffer = buffer_handle.read(cx);
         let range = buffer.anchor_before(range.start)..buffer.anchor_before(range.end);
         self.lsp_store.update(cx, |lsp_store, cx| {
@@ -3650,7 +3639,7 @@ impl Project {
         buffer: &Entity<Buffer>,
         range: Range<T>,
         cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CodeAction>>> {
+    ) -> Task<Result<Option<Vec<CodeAction>>>> {
         let snapshot = buffer.read(cx).snapshot();
         let range = range.to_point(&snapshot);
         let range_start = snapshot.anchor_before(range.start);
@@ -3668,16 +3657,18 @@ impl Project {
             let mut code_lens_actions = code_lens_actions
                 .await
                 .map_err(|e| anyhow!("code lens fetch failed: {e:#}"))?;
-            code_lens_actions.retain(|code_lens_action| {
-                range
-                    .start
-                    .cmp(&code_lens_action.range.start, &snapshot)
-                    .is_ge()
-                    && range
-                        .end
-                        .cmp(&code_lens_action.range.end, &snapshot)
-                        .is_le()
-            });
+            if let Some(code_lens_actions) = &mut code_lens_actions {
+                code_lens_actions.retain(|code_lens_action| {
+                    range
+                        .start
+                        .cmp(&code_lens_action.range.start, &snapshot)
+                        .is_ge()
+                        && range
+                            .end
+                            .cmp(&code_lens_action.range.end, &snapshot)
+                            .is_le()
+                });
+            }
             Ok(code_lens_actions)
         })
     }
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 8b0b21fcd6..282f1facc2 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -3005,6 +3005,7 @@ async fn test_definition(cx: &mut gpui::TestAppContext) {
     let mut definitions = project
         .update(cx, |project, cx| project.definitions(&buffer, 22, cx))
         .await
+        .unwrap()
         .unwrap();
 
     // Assert no new language server started
@@ -3519,7 +3520,7 @@ async fn test_apply_code_actions_with_commands(cx: &mut gpui::TestAppContext) {
         .next()
         .await;
 
-    let action = actions.await.unwrap()[0].clone();
+    let action = actions.await.unwrap().unwrap()[0].clone();
     let apply = project.update(cx, |project, cx| {
         project.apply_code_action(buffer.clone(), action, true, cx)
     });
@@ -6110,6 +6111,7 @@ async fn test_multiple_language_server_hovers(cx: &mut gpui::TestAppContext) {
         hover_task
             .await
             .into_iter()
+            .flatten()
             .map(|hover| hover.contents.iter().map(|block| &block.text).join("|"))
             .sorted()
             .collect::<Vec<_>>(),
@@ -6183,6 +6185,7 @@ async fn test_hovers_with_empty_parts(cx: &mut gpui::TestAppContext) {
         hover_task
             .await
             .into_iter()
+            .flatten()
             .map(|hover| hover.contents.iter().map(|block| &block.text).join("|"))
             .sorted()
             .collect::<Vec<_>>(),
@@ -6261,7 +6264,7 @@ async fn test_code_actions_only_kinds(cx: &mut gpui::TestAppContext) {
         .await
         .expect("The code action request should have been triggered");
 
-    let code_actions = code_actions_task.await.unwrap();
+    let code_actions = code_actions_task.await.unwrap().unwrap();
     assert_eq!(code_actions.len(), 1);
     assert_eq!(
         code_actions[0].lsp_action.action_kind(),
@@ -6420,6 +6423,7 @@ async fn test_multiple_language_server_actions(cx: &mut gpui::TestAppContext) {
         code_actions_task
             .await
             .unwrap()
+            .unwrap()
             .into_iter()
             .map(|code_action| code_action.lsp_action.title().to_owned())
             .sorted()
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index ea9647feff..ac9c275aa2 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -753,28 +753,47 @@ message TextEdit {
     PointUtf16 lsp_range_end = 3;
 }
 
-message MultiLspQuery {
+message LspQuery {
     uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-    oneof strategy {
-        AllLanguageServers all = 4;
-    }
+    uint64 lsp_request_id = 2;
     oneof request {
+        GetReferences get_references = 3;
+        GetDocumentColor get_document_color = 4;
         GetHover get_hover = 5;
         GetCodeActions get_code_actions = 6;
         GetSignatureHelp get_signature_help = 7;
         GetCodeLens get_code_lens = 8;
         GetDocumentDiagnostics get_document_diagnostics = 9;
-        GetDocumentColor get_document_color = 10;
-        GetDefinition get_definition = 11;
-        GetDeclaration get_declaration = 12;
-        GetTypeDefinition get_type_definition = 13;
-        GetImplementation get_implementation = 14;
-        GetReferences get_references = 15;
+        GetDefinition get_definition = 10;
+        GetDeclaration get_declaration = 11;
+        GetTypeDefinition get_type_definition = 12;
+        GetImplementation get_implementation = 13;
     }
 }
 
+message LspQueryResponse {
+    uint64 project_id = 1;
+    uint64 lsp_request_id = 2;
+    repeated LspResponse responses = 3;
+}
+
+message LspResponse {
+    oneof response {
+        GetHoverResponse get_hover_response = 1;
+        GetCodeActionsResponse get_code_actions_response = 2;
+        GetSignatureHelpResponse get_signature_help_response = 3;
+        GetCodeLensResponse get_code_lens_response = 4;
+        GetDocumentDiagnosticsResponse get_document_diagnostics_response = 5;
+        GetDocumentColorResponse get_document_color_response = 6;
+        GetDefinitionResponse get_definition_response = 8;
+        GetDeclarationResponse get_declaration_response = 9;
+        GetTypeDefinitionResponse get_type_definition_response = 10;
+        GetImplementationResponse get_implementation_response = 11;
+        GetReferencesResponse get_references_response = 12;
+    }
+    uint64 server_id = 7;
+}
+
 message AllLanguageServers {}
 
 message LanguageServerSelector {
@@ -798,27 +817,6 @@ message StopLanguageServers {
     bool all = 4;
 }
 
-message MultiLspQueryResponse {
-    repeated LspResponse responses = 1;
-}
-
-message LspResponse {
-    oneof response {
-        GetHoverResponse get_hover_response = 1;
-        GetCodeActionsResponse get_code_actions_response = 2;
-        GetSignatureHelpResponse get_signature_help_response = 3;
-        GetCodeLensResponse get_code_lens_response = 4;
-        GetDocumentDiagnosticsResponse get_document_diagnostics_response = 5;
-        GetDocumentColorResponse get_document_color_response = 6;
-        GetDefinitionResponse get_definition_response = 8;
-        GetDeclarationResponse get_declaration_response = 9;
-        GetTypeDefinitionResponse get_type_definition_response = 10;
-        GetImplementationResponse get_implementation_response = 11;
-        GetReferencesResponse get_references_response = 12;
-    }
-    uint64 server_id = 7;
-}
-
 message LspExtRunnables {
     uint64 project_id = 1;
     uint64 buffer_id = 2;
@@ -909,3 +907,30 @@ message PullWorkspaceDiagnostics {
     uint64 project_id = 1;
     uint64 server_id = 2;
 }
+
+// todo(lsp) remove after Zed Stable hits v0.204.x
+message MultiLspQuery {
+    uint64 project_id = 1;
+    uint64 buffer_id = 2;
+    repeated VectorClockEntry version = 3;
+    oneof strategy {
+        AllLanguageServers all = 4;
+    }
+    oneof request {
+        GetHover get_hover = 5;
+        GetCodeActions get_code_actions = 6;
+        GetSignatureHelp get_signature_help = 7;
+        GetCodeLens get_code_lens = 8;
+        GetDocumentDiagnostics get_document_diagnostics = 9;
+        GetDocumentColor get_document_color = 10;
+        GetDefinition get_definition = 11;
+        GetDeclaration get_declaration = 12;
+        GetTypeDefinition get_type_definition = 13;
+        GetImplementation get_implementation = 14;
+        GetReferences get_references = 15;
+    }
+}
+
+message MultiLspQueryResponse {
+    repeated LspResponse responses = 1;
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 310fcf584e..70689bcd63 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -393,7 +393,10 @@ message Envelope {
         GetCrashFilesResponse get_crash_files_response = 362;
 
         GitClone git_clone = 363;
-        GitCloneResponse git_clone_response = 364; // current max
+        GitCloneResponse git_clone_response = 364;
+
+        LspQuery lsp_query = 365;
+        LspQueryResponse lsp_query_response = 366; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/macros.rs b/crates/proto/src/macros.rs
index 2ce0c0df25..59e984d7db 100644
--- a/crates/proto/src/macros.rs
+++ b/crates/proto/src/macros.rs
@@ -69,3 +69,32 @@ macro_rules! entity_messages {
         })*
     };
 }
+
+#[macro_export]
+macro_rules! lsp_messages {
+    ($(($request_name:ident, $response_name:ident, $stop_previous_requests:expr)),* $(,)?) => {
+        $(impl LspRequestMessage for $request_name {
+            type Response = $response_name;
+
+            fn to_proto_query(self) -> $crate::lsp_query::Request {
+                $crate::lsp_query::Request::$request_name(self)
+            }
+
+            fn response_to_proto_query(response: Self::Response) -> $crate::lsp_response::Response {
+                $crate::lsp_response::Response::$response_name(response)
+            }
+
+            fn buffer_id(&self) -> u64 {
+                self.buffer_id
+            }
+
+            fn buffer_version(&self) -> &[$crate::VectorClockEntry] {
+                &self.version
+            }
+
+            fn stop_previous_requests() -> bool {
+                $stop_previous_requests
+            }
+        })*
+    };
+}
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 802db09590..d38e54685f 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -169,6 +169,9 @@ messages!(
     (MarkNotificationRead, Foreground),
     (MoveChannel, Foreground),
     (ReorderChannel, Foreground),
+    (LspQuery, Background),
+    (LspQueryResponse, Background),
+    // todo(lsp) remove after Zed Stable hits v0.204.x
     (MultiLspQuery, Background),
     (MultiLspQueryResponse, Background),
     (OnTypeFormatting, Background),
@@ -426,7 +429,10 @@ request_messages!(
     (SetRoomParticipantRole, Ack),
     (BlameBuffer, BlameBufferResponse),
     (RejoinRemoteProjects, RejoinRemoteProjectsResponse),
+    // todo(lsp) remove after Zed Stable hits v0.204.x
     (MultiLspQuery, MultiLspQueryResponse),
+    (LspQuery, Ack),
+    (LspQueryResponse, Ack),
     (RestartLanguageServers, Ack),
     (StopLanguageServers, Ack),
     (OpenContext, OpenContextResponse),
@@ -478,6 +484,20 @@ request_messages!(
     (GitClone, GitCloneResponse)
 );
 
+lsp_messages!(
+    (GetReferences, GetReferencesResponse, true),
+    (GetDocumentColor, GetDocumentColorResponse, true),
+    (GetHover, GetHoverResponse, true),
+    (GetCodeActions, GetCodeActionsResponse, true),
+    (GetSignatureHelp, GetSignatureHelpResponse, true),
+    (GetCodeLens, GetCodeLensResponse, true),
+    (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse, true),
+    (GetDefinition, GetDefinitionResponse, true),
+    (GetDeclaration, GetDeclarationResponse, true),
+    (GetTypeDefinition, GetTypeDefinitionResponse, true),
+    (GetImplementation, GetImplementationResponse, true),
+);
+
 entity_messages!(
     {project_id, ShareProject},
     AddProjectCollaborator,
@@ -520,6 +540,9 @@ entity_messages!(
     LeaveProject,
     LinkedEditingRange,
     LoadCommitDiff,
+    LspQuery,
+    LspQueryResponse,
+    // todo(lsp) remove after Zed Stable hits v0.204.x
     MultiLspQuery,
     RestartLanguageServers,
     StopLanguageServers,
@@ -777,6 +800,28 @@ pub fn split_repository_update(
     }])
 }
 
+impl LspQuery {
+    pub fn query_name_and_write_permissions(&self) -> (&str, bool) {
+        match self.request {
+            Some(lsp_query::Request::GetHover(_)) => ("GetHover", false),
+            Some(lsp_query::Request::GetCodeActions(_)) => ("GetCodeActions", true),
+            Some(lsp_query::Request::GetSignatureHelp(_)) => ("GetSignatureHelp", false),
+            Some(lsp_query::Request::GetCodeLens(_)) => ("GetCodeLens", true),
+            Some(lsp_query::Request::GetDocumentDiagnostics(_)) => {
+                ("GetDocumentDiagnostics", false)
+            }
+            Some(lsp_query::Request::GetDefinition(_)) => ("GetDefinition", false),
+            Some(lsp_query::Request::GetDeclaration(_)) => ("GetDeclaration", false),
+            Some(lsp_query::Request::GetTypeDefinition(_)) => ("GetTypeDefinition", false),
+            Some(lsp_query::Request::GetImplementation(_)) => ("GetImplementation", false),
+            Some(lsp_query::Request::GetReferences(_)) => ("GetReferences", false),
+            Some(lsp_query::Request::GetDocumentColor(_)) => ("GetDocumentColor", false),
+            None => ("<unknown>", true),
+        }
+    }
+}
+
+// todo(lsp) remove after Zed Stable hits v0.204.x
 impl MultiLspQuery {
     pub fn request_str(&self) -> &str {
         match self.request {
diff --git a/crates/proto/src/typed_envelope.rs b/crates/proto/src/typed_envelope.rs
index 381a6379dc..f677a3b967 100644
--- a/crates/proto/src/typed_envelope.rs
+++ b/crates/proto/src/typed_envelope.rs
@@ -31,6 +31,58 @@ pub trait RequestMessage: EnvelopedMessage {
     type Response: EnvelopedMessage;
 }
 
+/// A trait to bind LSP request and responses for the proto layer.
+/// Should be used for every LSP request that has to traverse through the proto layer.
+///
+/// `lsp_messages` macro in the same crate provides a convenient way to implement this.
+pub trait LspRequestMessage: EnvelopedMessage {
+    type Response: EnvelopedMessage;
+
+    fn to_proto_query(self) -> crate::lsp_query::Request;
+
+    fn response_to_proto_query(response: Self::Response) -> crate::lsp_response::Response;
+
+    fn buffer_id(&self) -> u64;
+
+    fn buffer_version(&self) -> &[crate::VectorClockEntry];
+
+    /// Whether to deduplicate the requests, or keep the previous ones running when another
+    /// request of the same kind is processed.
+    fn stop_previous_requests() -> bool;
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct LspRequestId(pub u64);
+
+/// A response from a single language server.
+/// There could be multiple responses for a single LSP request,
+/// from different servers.
+pub struct ProtoLspResponse<R> {
+    pub server_id: u64,
+    pub response: R,
+}
+
+impl ProtoLspResponse<Box<dyn AnyTypedEnvelope>> {
+    pub fn into_response<T: LspRequestMessage>(self) -> Result<ProtoLspResponse<T::Response>> {
+        let envelope = self
+            .response
+            .into_any()
+            .downcast::<TypedEnvelope<T::Response>>()
+            .map_err(|_| {
+                anyhow::anyhow!(
+                    "cannot downcast LspResponse to {} for message {}",
+                    T::Response::NAME,
+                    T::NAME,
+                )
+            })?;
+
+        Ok(ProtoLspResponse {
+            server_id: self.server_id,
+            response: envelope.payload,
+        })
+    }
+}
+
 pub trait AnyTypedEnvelope: Any + Send + Sync {
     fn payload_type_id(&self) -> TypeId;
     fn payload_type_name(&self) -> &'static str;
diff --git a/crates/rpc/src/proto_client.rs b/crates/rpc/src/proto_client.rs
index 05b6bd1439..791b7db9c0 100644
--- a/crates/rpc/src/proto_client.rs
+++ b/crates/rpc/src/proto_client.rs
@@ -1,35 +1,48 @@
-use anyhow::Context;
+use anyhow::{Context, Result};
 use collections::HashMap;
 use futures::{
     Future, FutureExt as _,
+    channel::oneshot,
     future::{BoxFuture, LocalBoxFuture},
 };
-use gpui::{AnyEntity, AnyWeakEntity, AsyncApp, Entity};
+use gpui::{AnyEntity, AnyWeakEntity, AsyncApp, BackgroundExecutor, Entity, FutureExt as _};
+use parking_lot::Mutex;
 use proto::{
-    AnyTypedEnvelope, EntityMessage, Envelope, EnvelopedMessage, RequestMessage, TypedEnvelope,
-    error::ErrorExt as _,
+    AnyTypedEnvelope, EntityMessage, Envelope, EnvelopedMessage, LspRequestId, LspRequestMessage,
+    RequestMessage, TypedEnvelope, error::ErrorExt as _,
 };
 use std::{
     any::{Any, TypeId},
-    sync::{Arc, Weak},
+    sync::{
+        Arc, OnceLock,
+        atomic::{self, AtomicU64},
+    },
+    time::Duration,
 };
 
 #[derive(Clone)]
-pub struct AnyProtoClient(Arc<dyn ProtoClient>);
+pub struct AnyProtoClient(Arc<State>);
 
-impl AnyProtoClient {
-    pub fn downgrade(&self) -> AnyWeakProtoClient {
-        AnyWeakProtoClient(Arc::downgrade(&self.0))
-    }
-}
+type RequestIds = Arc<
+    Mutex<
+        HashMap<
+            LspRequestId,
+            oneshot::Sender<
+                Result<
+                    Option<TypedEnvelope<Vec<proto::ProtoLspResponse<Box<dyn AnyTypedEnvelope>>>>>,
+                >,
+            >,
+        >,
+    >,
+>;
 
-#[derive(Clone)]
-pub struct AnyWeakProtoClient(Weak<dyn ProtoClient>);
+static NEXT_LSP_REQUEST_ID: OnceLock<Arc<AtomicU64>> = OnceLock::new();
+static REQUEST_IDS: OnceLock<RequestIds> = OnceLock::new();
 
-impl AnyWeakProtoClient {
-    pub fn upgrade(&self) -> Option<AnyProtoClient> {
-        self.0.upgrade().map(AnyProtoClient)
-    }
+struct State {
+    client: Arc<dyn ProtoClient>,
+    next_lsp_request_id: Arc<AtomicU64>,
+    request_ids: RequestIds,
 }
 
 pub trait ProtoClient: Send + Sync {
@@ -37,11 +50,11 @@ pub trait ProtoClient: Send + Sync {
         &self,
         envelope: Envelope,
         request_type: &'static str,
-    ) -> BoxFuture<'static, anyhow::Result<Envelope>>;
+    ) -> BoxFuture<'static, Result<Envelope>>;
 
-    fn send(&self, envelope: Envelope, message_type: &'static str) -> anyhow::Result<()>;
+    fn send(&self, envelope: Envelope, message_type: &'static str) -> Result<()>;
 
-    fn send_response(&self, envelope: Envelope, message_type: &'static str) -> anyhow::Result<()>;
+    fn send_response(&self, envelope: Envelope, message_type: &'static str) -> Result<()>;
 
     fn message_handler_set(&self) -> &parking_lot::Mutex<ProtoMessageHandlerSet>;
 
@@ -65,7 +78,7 @@ pub type ProtoMessageHandler = Arc<
             Box<dyn AnyTypedEnvelope>,
             AnyProtoClient,
             AsyncApp,
-        ) -> LocalBoxFuture<'static, anyhow::Result<()>>,
+        ) -> LocalBoxFuture<'static, Result<()>>,
 >;
 
 impl ProtoMessageHandlerSet {
@@ -113,7 +126,7 @@ impl ProtoMessageHandlerSet {
         message: Box<dyn AnyTypedEnvelope>,
         client: AnyProtoClient,
         cx: AsyncApp,
-    ) -> Option<LocalBoxFuture<'static, anyhow::Result<()>>> {
+    ) -> Option<LocalBoxFuture<'static, Result<()>>> {
         let payload_type_id = message.payload_type_id();
         let mut this = this.lock();
         let handler = this.message_handlers.get(&payload_type_id)?.clone();
@@ -169,43 +182,195 @@ where
     T: ProtoClient + 'static,
 {
     fn from(client: Arc<T>) -> Self {
-        Self(client)
+        Self::new(client)
     }
 }
 
 impl AnyProtoClient {
     pub fn new<T: ProtoClient + 'static>(client: Arc<T>) -> Self {
-        Self(client)
+        Self(Arc::new(State {
+            client,
+            next_lsp_request_id: NEXT_LSP_REQUEST_ID
+                .get_or_init(|| Arc::new(AtomicU64::new(0)))
+                .clone(),
+            request_ids: REQUEST_IDS.get_or_init(RequestIds::default).clone(),
+        }))
     }
 
     pub fn is_via_collab(&self) -> bool {
-        self.0.is_via_collab()
+        self.0.client.is_via_collab()
     }
 
     pub fn request<T: RequestMessage>(
         &self,
         request: T,
-    ) -> impl Future<Output = anyhow::Result<T::Response>> + use<T> {
+    ) -> impl Future<Output = Result<T::Response>> + use<T> {
         let envelope = request.into_envelope(0, None, None);
-        let response = self.0.request(envelope, T::NAME);
+        let response = self.0.client.request(envelope, T::NAME);
         async move {
             T::Response::from_envelope(response.await?)
                 .context("received response of the wrong type")
         }
     }
 
-    pub fn send<T: EnvelopedMessage>(&self, request: T) -> anyhow::Result<()> {
+    pub fn send<T: EnvelopedMessage>(&self, request: T) -> Result<()> {
         let envelope = request.into_envelope(0, None, None);
-        self.0.send(envelope, T::NAME)
+        self.0.client.send(envelope, T::NAME)
     }
 
-    pub fn send_response<T: EnvelopedMessage>(
-        &self,
-        request_id: u32,
-        request: T,
-    ) -> anyhow::Result<()> {
+    pub fn send_response<T: EnvelopedMessage>(&self, request_id: u32, request: T) -> Result<()> {
         let envelope = request.into_envelope(0, Some(request_id), None);
-        self.0.send(envelope, T::NAME)
+        self.0.client.send(envelope, T::NAME)
+    }
+
+    pub fn request_lsp<T>(
+        &self,
+        project_id: u64,
+        timeout: Duration,
+        executor: BackgroundExecutor,
+        request: T,
+    ) -> impl Future<
+        Output = Result<Option<TypedEnvelope<Vec<proto::ProtoLspResponse<T::Response>>>>>,
+    > + use<T>
+    where
+        T: LspRequestMessage,
+    {
+        let new_id = LspRequestId(
+            self.0
+                .next_lsp_request_id
+                .fetch_add(1, atomic::Ordering::Acquire),
+        );
+        let (tx, rx) = oneshot::channel();
+        {
+            self.0.request_ids.lock().insert(new_id, tx);
+        }
+
+        let query = proto::LspQuery {
+            project_id,
+            lsp_request_id: new_id.0,
+            request: Some(request.clone().to_proto_query()),
+        };
+        let request = self.request(query);
+        let request_ids = self.0.request_ids.clone();
+        async move {
+            match request.await {
+                Ok(_request_enqueued) => {}
+                Err(e) => {
+                    request_ids.lock().remove(&new_id);
+                    return Err(e).context("sending LSP proto request");
+                }
+            }
+
+            let response = rx.with_timeout(timeout, &executor).await;
+            {
+                request_ids.lock().remove(&new_id);
+            }
+            match response {
+                Ok(Ok(response)) => {
+                    let response = response
+                        .context("waiting for LSP proto response")?
+                        .map(|response| {
+                            anyhow::Ok(TypedEnvelope {
+                                payload: response
+                                    .payload
+                                    .into_iter()
+                                    .map(|lsp_response| lsp_response.into_response::<T>())
+                                    .collect::<Result<Vec<_>>>()?,
+                                sender_id: response.sender_id,
+                                original_sender_id: response.original_sender_id,
+                                message_id: response.message_id,
+                                received_at: response.received_at,
+                            })
+                        })
+                        .transpose()
+                        .context("converting LSP proto response")?;
+                    Ok(response)
+                }
+                Err(_cancelled_due_timeout) => Ok(None),
+                Ok(Err(_channel_dropped)) => Ok(None),
+            }
+        }
+    }
+
+    pub fn send_lsp_response<T: LspRequestMessage>(
+        &self,
+        project_id: u64,
+        lsp_request_id: LspRequestId,
+        server_responses: HashMap<u64, T::Response>,
+    ) -> Result<()> {
+        self.send(proto::LspQueryResponse {
+            project_id,
+            lsp_request_id: lsp_request_id.0,
+            responses: server_responses
+                .into_iter()
+                .map(|(server_id, response)| proto::LspResponse {
+                    server_id,
+                    response: Some(T::response_to_proto_query(response)),
+                })
+                .collect(),
+        })
+    }
+
+    pub fn handle_lsp_response(&self, mut envelope: TypedEnvelope<proto::LspQueryResponse>) {
+        let request_id = LspRequestId(envelope.payload.lsp_request_id);
+        let mut response_senders = self.0.request_ids.lock();
+        if let Some(tx) = response_senders.remove(&request_id) {
+            let responses = envelope.payload.responses.drain(..).collect::<Vec<_>>();
+            tx.send(Ok(Some(proto::TypedEnvelope {
+                sender_id: envelope.sender_id,
+                original_sender_id: envelope.original_sender_id,
+                message_id: envelope.message_id,
+                received_at: envelope.received_at,
+                payload: responses
+                    .into_iter()
+                    .filter_map(|response| {
+                        use proto::lsp_response::Response;
+
+                        let server_id = response.server_id;
+                        let response = match response.response? {
+                            Response::GetReferencesResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetDocumentColorResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetHoverResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetCodeActionsResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetSignatureHelpResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetCodeLensResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetDocumentDiagnosticsResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetDefinitionResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetDeclarationResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetTypeDefinitionResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                            Response::GetImplementationResponse(response) => {
+                                to_any_envelope(&envelope, response)
+                            }
+                        };
+                        Some(proto::ProtoLspResponse {
+                            server_id,
+                            response,
+                        })
+                    })
+                    .collect(),
+            })))
+            .ok();
+        }
     }
 
     pub fn add_request_handler<M, E, H, F>(&self, entity: gpui::WeakEntity<E>, handler: H)
@@ -213,31 +378,35 @@ impl AnyProtoClient {
         M: RequestMessage,
         E: 'static,
         H: 'static + Sync + Fn(Entity<E>, TypedEnvelope<M>, AsyncApp) -> F + Send + Sync,
-        F: 'static + Future<Output = anyhow::Result<M::Response>>,
+        F: 'static + Future<Output = Result<M::Response>>,
     {
-        self.0.message_handler_set().lock().add_message_handler(
-            TypeId::of::<M>(),
-            entity.into(),
-            Arc::new(move |entity, envelope, client, cx| {
-                let entity = entity.downcast::<E>().unwrap();
-                let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                let request_id = envelope.message_id();
-                handler(entity, *envelope, cx)
-                    .then(move |result| async move {
-                        match result {
-                            Ok(response) => {
-                                client.send_response(request_id, response)?;
-                                Ok(())
+        self.0
+            .client
+            .message_handler_set()
+            .lock()
+            .add_message_handler(
+                TypeId::of::<M>(),
+                entity.into(),
+                Arc::new(move |entity, envelope, client, cx| {
+                    let entity = entity.downcast::<E>().unwrap();
+                    let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
+                    let request_id = envelope.message_id();
+                    handler(entity, *envelope, cx)
+                        .then(move |result| async move {
+                            match result {
+                                Ok(response) => {
+                                    client.send_response(request_id, response)?;
+                                    Ok(())
+                                }
+                                Err(error) => {
+                                    client.send_response(request_id, error.to_proto())?;
+                                    Err(error)
+                                }
                             }
-                            Err(error) => {
-                                client.send_response(request_id, error.to_proto())?;
-                                Err(error)
-                            }
-                        }
-                    })
-                    .boxed_local()
-            }),
-        )
+                        })
+                        .boxed_local()
+                }),
+            )
     }
 
     pub fn add_entity_request_handler<M, E, H, F>(&self, handler: H)
@@ -245,7 +414,7 @@ impl AnyProtoClient {
         M: EnvelopedMessage + RequestMessage + EntityMessage,
         E: 'static,
         H: 'static + Sync + Send + Fn(gpui::Entity<E>, TypedEnvelope<M>, AsyncApp) -> F,
-        F: 'static + Future<Output = anyhow::Result<M::Response>>,
+        F: 'static + Future<Output = Result<M::Response>>,
     {
         let message_type_id = TypeId::of::<M>();
         let entity_type_id = TypeId::of::<E>();
@@ -257,6 +426,7 @@ impl AnyProtoClient {
                 .remote_entity_id()
         };
         self.0
+            .client
             .message_handler_set()
             .lock()
             .add_entity_message_handler(
@@ -290,7 +460,7 @@ impl AnyProtoClient {
         M: EnvelopedMessage + EntityMessage,
         E: 'static,
         H: 'static + Sync + Send + Fn(gpui::Entity<E>, TypedEnvelope<M>, AsyncApp) -> F,
-        F: 'static + Future<Output = anyhow::Result<()>>,
+        F: 'static + Future<Output = Result<()>>,
     {
         let message_type_id = TypeId::of::<M>();
         let entity_type_id = TypeId::of::<E>();
@@ -302,6 +472,7 @@ impl AnyProtoClient {
                 .remote_entity_id()
         };
         self.0
+            .client
             .message_handler_set()
             .lock()
             .add_entity_message_handler(
@@ -319,7 +490,7 @@ impl AnyProtoClient {
     pub fn subscribe_to_entity<E: 'static>(&self, remote_id: u64, entity: &Entity<E>) {
         let id = (TypeId::of::<E>(), remote_id);
 
-        let mut message_handlers = self.0.message_handler_set().lock();
+        let mut message_handlers = self.0.client.message_handler_set().lock();
         if message_handlers
             .entities_by_type_and_remote_id
             .contains_key(&id)
@@ -335,3 +506,16 @@ impl AnyProtoClient {
         );
     }
 }
+
+fn to_any_envelope<T: EnvelopedMessage>(
+    envelope: &TypedEnvelope<proto::LspQueryResponse>,
+    response: T,
+) -> Box<dyn AnyTypedEnvelope> {
+    Box::new(proto::TypedEnvelope {
+        sender_id: envelope.sender_id,
+        original_sender_id: envelope.original_sender_id,
+        message_id: envelope.message_id,
+        received_at: envelope.received_at,
+        payload: response,
+    }) as Box<_>
+}

From 68f97d6069ad7f35929c2e0e2d7265bbc96c6e56 Mon Sep 17 00:00:00 2001
From: Sachith Shetty <shettysachith47@gmail.com>
Date: Wed, 20 Aug 2025 23:27:41 -0700
Subject: [PATCH 245/823] editor: Use `highlight_text` to highlight matching
 brackets, fix unnecessary inlay hint highlighting (#36540)

Closes #35981

Release Notes:

- Fixed bracket highlights overly including parts of inlays when
highlighting

Before -
<img width="1480" height="602" alt="Screenshot from 2025-08-19 17-15-06"
src="https://github.com/user-attachments/assets/8e6b5ed8-f133-4867-8352-ed93441fbd8b"
/>

After -
<img width="1480" height="602" alt="Screenshot from 2025-08-19 17-24-26"
src="https://github.com/user-attachments/assets/1314e54e-ecf9-4280-9d53-eed6e96e393f"
/>
---
 .../editor/src/highlight_matching_bracket.rs  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/crates/editor/src/highlight_matching_bracket.rs b/crates/editor/src/highlight_matching_bracket.rs
index e38197283d..aa4e616924 100644
--- a/crates/editor/src/highlight_matching_bracket.rs
+++ b/crates/editor/src/highlight_matching_bracket.rs
@@ -1,6 +1,7 @@
 use crate::{Editor, RangeToAnchorExt};
-use gpui::{Context, Window};
+use gpui::{Context, HighlightStyle, Window};
 use language::CursorShape;
+use theme::ActiveTheme;
 
 enum MatchingBracketHighlight {}
 
@@ -9,7 +10,7 @@ pub fn refresh_matching_bracket_highlights(
     window: &mut Window,
     cx: &mut Context<Editor>,
 ) {
-    editor.clear_background_highlights::<MatchingBracketHighlight>(cx);
+    editor.clear_highlights::<MatchingBracketHighlight>(cx);
 
     let newest_selection = editor.selections.newest::<usize>(cx);
     // Don't highlight brackets if the selection isn't empty
@@ -35,12 +36,19 @@ pub fn refresh_matching_bracket_highlights(
         .buffer_snapshot
         .innermost_enclosing_bracket_ranges(head..tail, None)
     {
-        editor.highlight_background::<MatchingBracketHighlight>(
-            &[
+        editor.highlight_text::<MatchingBracketHighlight>(
+            vec![
                 opening_range.to_anchors(&snapshot.buffer_snapshot),
                 closing_range.to_anchors(&snapshot.buffer_snapshot),
             ],
-            |theme| theme.colors().editor_document_highlight_bracket_background,
+            HighlightStyle {
+                background_color: Some(
+                    cx.theme()
+                        .colors()
+                        .editor_document_highlight_bracket_background,
+                ),
+                ..Default::default()
+            },
             cx,
         )
     }
@@ -104,7 +112,7 @@ mod tests {
                 another_test(1, 2, 3);
             }
         "#});
-        cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#"
+        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
             pub fn test«(»"Test argument"«)» {
                 another_test(1, 2, 3);
             }
@@ -115,7 +123,7 @@ mod tests {
                 another_test(1, ˇ2, 3);
             }
         "#});
-        cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#"
+        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
             pub fn test("Test argument") {
                 another_test«(»1, 2, 3«)»;
             }
@@ -126,7 +134,7 @@ mod tests {
                 anotherˇ_test(1, 2, 3);
             }
         "#});
-        cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#"
+        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
             pub fn test("Test argument") «{»
                 another_test(1, 2, 3);
             «}»
@@ -138,7 +146,7 @@ mod tests {
                 another_test(1, 2, 3);
             }
         "#});
-        cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#"
+        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
             pub fn test("Test argument") {
                 another_test(1, 2, 3);
             }
@@ -150,8 +158,8 @@ mod tests {
                 another_test(1, 2, 3);
             }
         "#});
-        cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#"
-            pub fn test("Test argument") {
+        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
+            pub fn test«("Test argument") {
                 another_test(1, 2, 3);
             }
         "#});

From cde0a5dd27c7f29e389cf8d518983d21f3376071 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 21 Aug 2025 09:36:57 +0300
Subject: [PATCH 246/823] Add a non-style lint exclusion (#36658)

Follow-up of https://github.com/zed-industries/zed/pull/36651
Restores https://github.com/zed-industries/zed/pull/35955 footgun guard.

Release Notes:

- N/A
---
 Cargo.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 400ce791aa..b13795e1e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -802,7 +802,10 @@ unexpected_cfgs = { level = "allow" }
 dbg_macro = "deny"
 todo = "deny"
 
-# trying this out
+# This is not a style lint, see https://github.com/rust-lang/rust-clippy/pull/15454
+# Remove when the lint gets promoted to `suspicious`.
+declare_interior_mutable_const = "deny"
+
 redundant_clone = "deny"
 
 # We currently do not restrict any style rules

From ed84767c9d1d597c8b81e8e927ad1be35bb59add Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 21 Aug 2025 09:48:04 +0300
Subject: [PATCH 247/823] Fix overlooked Clippy lints (#36659)

Follow-up of https://github.com/zed-industries/zed/pull/36557 that is
needed after https://github.com/zed-industries/zed/pull/36652

Release Notes:

- N/A
---
 crates/project/src/lsp_store.rs | 8 ++++----
 crates/rpc/src/proto_client.rs  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index bcfd9d386b..072f4396c1 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -5693,13 +5693,13 @@ impl LspStore {
                         let lsp_data = lsp_store.lsp_code_lens.entry(buffer_id).or_default();
                         if let Some(fetched_lens) = fetched_lens {
                             if lsp_data.lens_for_version == query_version_queried_for {
-                                lsp_data.lens.extend(fetched_lens.clone());
+                                lsp_data.lens.extend(fetched_lens);
                             } else if !lsp_data
                                 .lens_for_version
                                 .changed_since(&query_version_queried_for)
                             {
                                 lsp_data.lens_for_version = query_version_queried_for;
-                                lsp_data.lens = fetched_lens.clone();
+                                lsp_data.lens = fetched_lens;
                             }
                         }
                         lsp_data.update = None;
@@ -6694,14 +6694,14 @@ impl LspStore {
 
                         if let Some(fetched_colors) = fetched_colors {
                             if lsp_data.colors_for_version == query_version_queried_for {
-                                lsp_data.colors.extend(fetched_colors.clone());
+                                lsp_data.colors.extend(fetched_colors);
                                 lsp_data.cache_version += 1;
                             } else if !lsp_data
                                 .colors_for_version
                                 .changed_since(&query_version_queried_for)
                             {
                                 lsp_data.colors_for_version = query_version_queried_for;
-                                lsp_data.colors = fetched_colors.clone();
+                                lsp_data.colors = fetched_colors;
                                 lsp_data.cache_version += 1;
                             }
                         }
diff --git a/crates/rpc/src/proto_client.rs b/crates/rpc/src/proto_client.rs
index 791b7db9c0..a90797ff5d 100644
--- a/crates/rpc/src/proto_client.rs
+++ b/crates/rpc/src/proto_client.rs
@@ -248,7 +248,7 @@ impl AnyProtoClient {
         let query = proto::LspQuery {
             project_id,
             lsp_request_id: new_id.0,
-            request: Some(request.clone().to_proto_query()),
+            request: Some(request.to_proto_query()),
         };
         let request = self.request(query);
         let request_ids = self.0.request_ids.clone();

From fda6eda3c2abcbe90af48bd112ee560eb63706e7 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 21 Aug 2025 10:57:28 +0200
Subject: [PATCH 248/823] Fix @-mentioning threads when their summary isn't
 ready yet (#36664)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs                | 10 ++--------
 crates/agent_ui/src/acp/message_editor.rs |  9 +++------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index c15048ad8c..d5bc0fea63 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1269,18 +1269,12 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         let summary_model = Arc::new(FakeLanguageModel::default());
         thread.update(cx, |thread, cx| {
-            thread.set_model(model, cx);
-            thread.set_summarization_model(Some(summary_model), cx);
+            thread.set_model(model.clone(), cx);
+            thread.set_summarization_model(Some(summary_model.clone()), cx);
         });
         cx.run_until_parked();
         assert_eq!(history_entries(&history_store, cx), vec![]);
 
-        let model = thread.read_with(cx, |thread, _| thread.model().unwrap().clone());
-        let model = model.as_fake();
-        let summary_model = thread.read_with(cx, |thread, _| {
-            thread.summarization_model().unwrap().clone()
-        });
-        let summary_model = summary_model.as_fake();
         let send = acp_thread.update(cx, |thread, cx| {
             thread.send(
                 vec![
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 1155285d09..3116a40be5 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -629,15 +629,11 @@ impl MessageEditor {
             .shared();
 
         self.mention_set.insert_thread(id.clone(), task.clone());
+        self.mention_set.insert_uri(crease_id, uri);
 
         let editor = self.editor.clone();
         cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_some() {
-                this.update(cx, |this, _| {
-                    this.mention_set.insert_uri(crease_id, uri);
-                })
-                .ok();
-            } else {
+            if task.await.notify_async_err(cx).is_none() {
                 editor
                     .update(cx, |editor, cx| {
                         editor.display_map.update(cx, |display_map, cx| {
@@ -648,6 +644,7 @@ impl MessageEditor {
                     .ok();
                 this.update(cx, |this, _| {
                     this.mention_set.thread_summaries.remove(&id);
+                    this.mention_set.uri_by_crease_id.remove(&crease_id);
                 })
                 .ok();
             }

From 62f2ef86dca7e4d171050be9951585199a25aa32 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 21 Aug 2025 11:25:00 +0200
Subject: [PATCH 249/823] agent2: Allow expanding terminals individually
 (#36670)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/entry_view_state.rs | 10 ++++--
 crates/agent_ui/src/acp/thread_view.rs      | 36 ++++++++++++++-------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 67acbb8b5b..fb15d8bed8 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -121,14 +121,19 @@ impl EntryViewState {
 
                 for terminal in terminals {
                     views.entry(terminal.entity_id()).or_insert_with(|| {
-                        create_terminal(
+                        let element = create_terminal(
                             self.workspace.clone(),
                             self.project.clone(),
                             terminal.clone(),
                             window,
                             cx,
                         )
-                        .into_any()
+                        .into_any();
+                        cx.emit(EntryViewEvent {
+                            entry_index: index,
+                            view_event: ViewEvent::NewTerminal(terminal.entity_id()),
+                        });
+                        element
                     });
                 }
 
@@ -187,6 +192,7 @@ pub struct EntryViewEvent {
 }
 
 pub enum ViewEvent {
+    NewTerminal(EntityId),
     MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 12a33d022e..432ba4e0e8 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -20,11 +20,11 @@ use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
-    EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset,
-    ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription,
-    Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
-    WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage, point,
-    prelude::*, pulsating_between,
+    EdgesRefinement, ElementId, Empty, Entity, EntityId, FocusHandle, Focusable, Hsla, Length,
+    ListOffset, ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement,
+    Subscription, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity,
+    Window, WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage,
+    point, prelude::*, pulsating_between,
 };
 use language::Buffer;
 
@@ -256,10 +256,10 @@ pub struct AcpThreadView {
     auth_task: Option<Task<()>>,
     expanded_tool_calls: HashSet<acp::ToolCallId>,
     expanded_thinking_blocks: HashSet<(usize, usize)>,
+    expanded_terminals: HashSet<EntityId>,
     edits_expanded: bool,
     plan_expanded: bool,
     editor_expanded: bool,
-    terminal_expanded: bool,
     editing_message: Option<usize>,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
@@ -354,11 +354,11 @@ impl AcpThreadView {
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
             expanded_thinking_blocks: HashSet::default(),
+            expanded_terminals: HashSet::default(),
             editing_message: None,
             edits_expanded: false,
             plan_expanded: false,
             editor_expanded: false,
-            terminal_expanded: true,
             history_store,
             hovered_recent_history_item: None,
             _subscriptions: subscriptions,
@@ -677,6 +677,11 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) {
         match &event.view_event {
+            ViewEvent::NewTerminal(terminal_id) => {
+                if AgentSettings::get_global(cx).expand_terminal_card {
+                    self.expanded_terminals.insert(*terminal_id);
+                }
+            }
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
                 if let Some(thread) = self.thread()
                     && let Some(AgentThreadEntry::UserMessage(user_message)) =
@@ -2009,6 +2014,8 @@ impl AcpThreadView {
             .map(|path| format!("{}", path.display()))
             .unwrap_or_else(|| "current directory".to_string());
 
+        let is_expanded = self.expanded_terminals.contains(&terminal.entity_id());
+
         let header = h_flex()
             .id(SharedString::from(format!(
                 "terminal-tool-header-{}",
@@ -2142,12 +2149,19 @@ impl AcpThreadView {
                         "terminal-tool-disclosure-{}",
                         terminal.entity_id()
                     )),
-                    self.terminal_expanded,
+                    is_expanded,
                 )
                 .opened_icon(IconName::ChevronUp)
                 .closed_icon(IconName::ChevronDown)
-                .on_click(cx.listener(move |this, _event, _window, _cx| {
-                    this.terminal_expanded = !this.terminal_expanded;
+                .on_click(cx.listener({
+                    let terminal_id = terminal.entity_id();
+                    move |this, _event, _window, _cx| {
+                        if is_expanded {
+                            this.expanded_terminals.remove(&terminal_id);
+                        } else {
+                            this.expanded_terminals.insert(terminal_id);
+                        }
+                    }
                 })),
             );
 
@@ -2156,7 +2170,7 @@ impl AcpThreadView {
             .read(cx)
             .entry(entry_ix)
             .and_then(|entry| entry.terminal(terminal));
-        let show_output = self.terminal_expanded && terminal_view.is_some();
+        let show_output = is_expanded && terminal_view.is_some();
 
         v_flex()
             .mb_2()

From 7f1bd2f15eb6684c7c63c09f2520c9a6a344a6c8 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Thu, 21 Aug 2025 11:37:45 +0200
Subject: [PATCH 250/823] remote: Fix toolchain RPC messages not being handled
 because of the entity getting dropped (#36665)

Release Notes:

- N/A
---
 crates/project/src/toolchain_store.rs         | 73 ++++++++++++-------
 crates/remote_server/src/headless_project.rs  |  4 +
 .../src/active_toolchain.rs                   | 11 ---
 3 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
index 05531ebe9a..ac87e64248 100644
--- a/crates/project/src/toolchain_store.rs
+++ b/crates/project/src/toolchain_store.rs
@@ -34,7 +34,10 @@ enum ToolchainStoreInner {
         Entity<LocalToolchainStore>,
         #[allow(dead_code)] Subscription,
     ),
-    Remote(Entity<RemoteToolchainStore>),
+    Remote(
+        Entity<RemoteToolchainStore>,
+        #[allow(dead_code)] Subscription,
+    ),
 }
 
 impl EventEmitter<ToolchainStoreEvent> for ToolchainStore {}
@@ -65,10 +68,12 @@ impl ToolchainStore {
         Self(ToolchainStoreInner::Local(entity, subscription))
     }
 
-    pub(super) fn remote(project_id: u64, client: AnyProtoClient, cx: &mut App) -> Self {
-        Self(ToolchainStoreInner::Remote(
-            cx.new(|_| RemoteToolchainStore { client, project_id }),
-        ))
+    pub(super) fn remote(project_id: u64, client: AnyProtoClient, cx: &mut Context<Self>) -> Self {
+        let entity = cx.new(|_| RemoteToolchainStore { client, project_id });
+        let _subscription = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
+            cx.emit(e.clone())
+        });
+        Self(ToolchainStoreInner::Remote(entity, _subscription))
     }
     pub(crate) fn activate_toolchain(
         &self,
@@ -80,8 +85,8 @@ impl ToolchainStore {
             ToolchainStoreInner::Local(local, _) => {
                 local.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
             }
-            ToolchainStoreInner::Remote(remote) => {
-                remote.read(cx).activate_toolchain(path, toolchain, cx)
+            ToolchainStoreInner::Remote(remote, _) => {
+                remote.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
             }
         }
     }
@@ -95,7 +100,7 @@ impl ToolchainStore {
             ToolchainStoreInner::Local(local, _) => {
                 local.update(cx, |this, cx| this.list_toolchains(path, language_name, cx))
             }
-            ToolchainStoreInner::Remote(remote) => {
+            ToolchainStoreInner::Remote(remote, _) => {
                 remote.read(cx).list_toolchains(path, language_name, cx)
             }
         }
@@ -112,7 +117,7 @@ impl ToolchainStore {
                 &path.path,
                 language_name,
             )),
-            ToolchainStoreInner::Remote(remote) => {
+            ToolchainStoreInner::Remote(remote, _) => {
                 remote.read(cx).active_toolchain(path, language_name, cx)
             }
         }
@@ -234,13 +239,13 @@ impl ToolchainStore {
     pub fn as_language_toolchain_store(&self) -> Arc<dyn LanguageToolchainStore> {
         match &self.0 {
             ToolchainStoreInner::Local(local, _) => Arc::new(LocalStore(local.downgrade())),
-            ToolchainStoreInner::Remote(remote) => Arc::new(RemoteStore(remote.downgrade())),
+            ToolchainStoreInner::Remote(remote, _) => Arc::new(RemoteStore(remote.downgrade())),
         }
     }
     pub fn as_local_store(&self) -> Option<&Entity<LocalToolchainStore>> {
         match &self.0 {
             ToolchainStoreInner::Local(local, _) => Some(local),
-            ToolchainStoreInner::Remote(_) => None,
+            ToolchainStoreInner::Remote(_, _) => None,
         }
     }
 }
@@ -415,6 +420,8 @@ impl LocalToolchainStore {
             .cloned()
     }
 }
+
+impl EventEmitter<ToolchainStoreEvent> for RemoteToolchainStore {}
 struct RemoteToolchainStore {
     client: AnyProtoClient,
     project_id: u64,
@@ -425,27 +432,37 @@ impl RemoteToolchainStore {
         &self,
         project_path: ProjectPath,
         toolchain: Toolchain,
-        cx: &App,
+        cx: &mut Context<Self>,
     ) -> Task<Option<()>> {
         let project_id = self.project_id;
         let client = self.client.clone();
-        cx.background_spawn(async move {
-            let path = PathBuf::from(toolchain.path.to_string());
-            let _ = client
-                .request(proto::ActivateToolchain {
-                    project_id,
-                    worktree_id: project_path.worktree_id.to_proto(),
-                    language_name: toolchain.language_name.into(),
-                    toolchain: Some(proto::Toolchain {
-                        name: toolchain.name.into(),
-                        path: path.to_proto(),
-                        raw_json: toolchain.as_json.to_string(),
-                    }),
-                    path: Some(project_path.path.to_string_lossy().into_owned()),
+        cx.spawn(async move |this, cx| {
+            let did_activate = cx
+                .background_spawn(async move {
+                    let path = PathBuf::from(toolchain.path.to_string());
+                    let _ = client
+                        .request(proto::ActivateToolchain {
+                            project_id,
+                            worktree_id: project_path.worktree_id.to_proto(),
+                            language_name: toolchain.language_name.into(),
+                            toolchain: Some(proto::Toolchain {
+                                name: toolchain.name.into(),
+                                path: path.to_proto(),
+                                raw_json: toolchain.as_json.to_string(),
+                            }),
+                            path: Some(project_path.path.to_string_lossy().into_owned()),
+                        })
+                        .await
+                        .log_err()?;
+                    Some(())
                 })
-                .await
-                .log_err()?;
-            Some(())
+                .await;
+            did_activate.and_then(|_| {
+                this.update(cx, |_, cx| {
+                    cx.emit(ToolchainStoreEvent::ToolchainActivated);
+                })
+                .ok()
+            })
         })
     }
 
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 83caebe62f..6216ff7728 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -46,6 +46,9 @@ pub struct HeadlessProject {
     pub languages: Arc<LanguageRegistry>,
     pub extensions: Entity<HeadlessExtensionStore>,
     pub git_store: Entity<GitStore>,
+    // Used mostly to keep alive the toolchain store for RPC handlers.
+    // Local variant is used within LSP store, but that's a separate entity.
+    pub _toolchain_store: Entity<ToolchainStore>,
 }
 
 pub struct HeadlessAppState {
@@ -269,6 +272,7 @@ impl HeadlessProject {
             languages,
             extensions,
             git_store,
+            _toolchain_store: toolchain_store,
         }
     }
 
diff --git a/crates/toolchain_selector/src/active_toolchain.rs b/crates/toolchain_selector/src/active_toolchain.rs
index ea5dcc2a19..bf45bffea3 100644
--- a/crates/toolchain_selector/src/active_toolchain.rs
+++ b/crates/toolchain_selector/src/active_toolchain.rs
@@ -38,7 +38,6 @@ impl ActiveToolchain {
                         .ok()
                         .flatten();
                     if let Some(editor) = editor {
-                        this.active_toolchain.take();
                         this.update_lister(editor, window, cx);
                     }
                 },
@@ -124,16 +123,6 @@ impl ActiveToolchain {
         if let Some((_, buffer, _)) = editor.active_excerpt(cx)
             && let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx))
         {
-            if self
-                .active_buffer
-                .as_ref()
-                .is_some_and(|(old_worktree_id, old_buffer, _)| {
-                    (old_worktree_id, old_buffer.entity_id()) == (&worktree_id, buffer.entity_id())
-                })
-            {
-                return;
-            }
-
             let subscription = cx.subscribe_in(
                 &buffer,
                 window,

From c5ee3f3e2e51936910f9ad284d14a7974f064616 Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 21 Aug 2025 05:33:45 -0500
Subject: [PATCH 251/823] Avoid suspending panicking thread while crashing
 (#36645)

On the latest build @maxbrunsfeld got a panic that hung zed. It appeared
that the hang occured after the minidump had been successfully written,
so our theory on what happened is that the `suspend_all_other_threads`
call in the crash handler suspended the panicking thread (due to the
signal from simulate_exception being received on a different thread),
and then when the crash handler returned everything was suspended so the
panic hook never made it to the `process::abort`.

This change makes the crash handler avoid _both_ the current and the
panicking thread which should avoid that scenario.

Release Notes:

- N/A
---
 crates/crashes/src/crashes.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index 4e4b69f639..b1afc5ae45 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -4,6 +4,8 @@ use minidumper::{Client, LoopAction, MinidumpBinary};
 use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
 use serde::{Deserialize, Serialize};
 
+#[cfg(target_os = "macos")]
+use std::sync::atomic::AtomicU32;
 use std::{
     env,
     fs::{self, File},
@@ -26,6 +28,9 @@ pub static REQUESTED_MINIDUMP: AtomicBool = AtomicBool::new(false);
 const CRASH_HANDLER_PING_TIMEOUT: Duration = Duration::from_secs(60);
 const CRASH_HANDLER_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 
+#[cfg(target_os = "macos")]
+static PANIC_THREAD_ID: AtomicU32 = AtomicU32::new(0);
+
 pub async fn init(crash_init: InitCrashHandler) {
     if *RELEASE_CHANNEL == ReleaseChannel::Dev && env::var("ZED_GENERATE_MINIDUMPS").is_err() {
         return;
@@ -110,9 +115,10 @@ unsafe fn suspend_all_other_threads() {
         mach2::task::task_threads(task, &raw mut threads, &raw mut count);
     }
     let current = unsafe { mach2::mach_init::mach_thread_self() };
+    let panic_thread = PANIC_THREAD_ID.load(Ordering::SeqCst);
     for i in 0..count {
         let t = unsafe { *threads.add(i as usize) };
-        if t != current {
+        if t != current && t != panic_thread {
             unsafe { mach2::thread_act::thread_suspend(t) };
         }
     }
@@ -238,6 +244,13 @@ pub fn handle_panic(message: String, span: Option<&Location>) {
                 )
                 .ok();
             log::error!("triggering a crash to generate a minidump...");
+
+            #[cfg(target_os = "macos")]
+            PANIC_THREAD_ID.store(
+                unsafe { mach2::mach_init::mach_thread_self() },
+                Ordering::SeqCst,
+            );
+
             #[cfg(target_os = "linux")]
             CrashHandler.simulate_signal(crash_handler::Signal::Trap as u32);
             #[cfg(not(target_os = "linux"))]

From f435af2fdeeda60e24d08bcee56d3b6c5df07ca4 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 21 Aug 2025 12:59:51 +0200
Subject: [PATCH 252/823] acp: Use unstaged style for diffs (#36674)

Release Notes:

- N/A
---
 crates/acp_thread/src/diff.rs | 55 +++++++++++++++++------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index 70367e340a..130bc3ab6b 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -28,12 +28,7 @@ impl Diff {
         cx: &mut Context<Self>,
     ) -> Self {
         let multibuffer = cx.new(|_cx| MultiBuffer::without_headers(Capability::ReadOnly));
-
-        let new_buffer = cx.new(|cx| Buffer::local(new_text, cx));
-        let old_buffer = cx.new(|cx| Buffer::local(old_text.unwrap_or("".into()), cx));
-        let new_buffer_snapshot = new_buffer.read(cx).text_snapshot();
-        let buffer_diff = cx.new(|cx| BufferDiff::new(&new_buffer_snapshot, cx));
-
+        let buffer = cx.new(|cx| Buffer::local(new_text, cx));
         let task = cx.spawn({
             let multibuffer = multibuffer.clone();
             let path = path.clone();
@@ -43,42 +38,34 @@ impl Diff {
                     .await
                     .log_err();
 
-                new_buffer.update(cx, |buffer, cx| buffer.set_language(language.clone(), cx))?;
+                buffer.update(cx, |buffer, cx| buffer.set_language(language.clone(), cx))?;
 
-                let old_buffer_snapshot = old_buffer.update(cx, |buffer, cx| {
-                    buffer.set_language(language, cx);
-                    buffer.snapshot()
-                })?;
-
-                buffer_diff
-                    .update(cx, |diff, cx| {
-                        diff.set_base_text(
-                            old_buffer_snapshot,
-                            Some(language_registry),
-                            new_buffer_snapshot,
-                            cx,
-                        )
-                    })?
-                    .await?;
+                let diff = build_buffer_diff(
+                    old_text.unwrap_or("".into()).into(),
+                    &buffer,
+                    Some(language_registry.clone()),
+                    cx,
+                )
+                .await?;
 
                 multibuffer
                     .update(cx, |multibuffer, cx| {
                         let hunk_ranges = {
-                            let buffer = new_buffer.read(cx);
-                            let diff = buffer_diff.read(cx);
+                            let buffer = buffer.read(cx);
+                            let diff = diff.read(cx);
                             diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
                                 .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
                                 .collect::<Vec<_>>()
                         };
 
                         multibuffer.set_excerpts_for_path(
-                            PathKey::for_buffer(&new_buffer, cx),
-                            new_buffer.clone(),
+                            PathKey::for_buffer(&buffer, cx),
+                            buffer.clone(),
                             hunk_ranges,
                             editor::DEFAULT_MULTIBUFFER_CONTEXT,
                             cx,
                         );
-                        multibuffer.add_diff(buffer_diff, cx);
+                        multibuffer.add_diff(diff, cx);
                     })
                     .log_err();
 
@@ -106,6 +93,15 @@ impl Diff {
                 text_snapshot,
                 cx,
             );
+            let snapshot = diff.snapshot(cx);
+
+            let secondary_diff = cx.new(|cx| {
+                let mut diff = BufferDiff::new(&buffer_snapshot, cx);
+                diff.set_snapshot(snapshot, &buffer_snapshot, cx);
+                diff
+            });
+            diff.set_secondary_diff(secondary_diff);
+
             diff
         });
 
@@ -204,7 +200,10 @@ impl PendingDiff {
             )
             .await?;
             buffer_diff.update(cx, |diff, cx| {
-                diff.set_snapshot(diff_snapshot, &text_snapshot, cx)
+                diff.set_snapshot(diff_snapshot.clone(), &text_snapshot, cx);
+                diff.secondary_diff().unwrap().update(cx, |diff, cx| {
+                    diff.set_snapshot(diff_snapshot.clone(), &text_snapshot, cx);
+                });
             })?;
             diff.update(cx, |diff, cx| {
                 if let Diff::Pending(diff) = diff {

From ad64a71f04fb2b1a585e26dfa6825545728188a6 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 21 Aug 2025 13:05:41 +0200
Subject: [PATCH 253/823] acp: Allow collapsing edit file tool calls (#36675)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/entry_view_state.rs | 18 ++++++++---
 crates/agent_ui/src/acp/thread_view.rs      | 34 +++++++++++----------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index fb15d8bed8..c310473259 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,6 +1,7 @@
 use std::ops::Range;
 
 use acp_thread::{AcpThread, AgentThreadEntry};
+use agent_client_protocol::ToolCallId;
 use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
@@ -106,6 +107,7 @@ impl EntryViewState {
                 }
             }
             AgentThreadEntry::ToolCall(tool_call) => {
+                let id = tool_call.id.clone();
                 let terminals = tool_call.terminals().cloned().collect::<Vec<_>>();
                 let diffs = tool_call.diffs().cloned().collect::<Vec<_>>();
 
@@ -131,16 +133,21 @@ impl EntryViewState {
                         .into_any();
                         cx.emit(EntryViewEvent {
                             entry_index: index,
-                            view_event: ViewEvent::NewTerminal(terminal.entity_id()),
+                            view_event: ViewEvent::NewTerminal(id.clone()),
                         });
                         element
                     });
                 }
 
                 for diff in diffs {
-                    views
-                        .entry(diff.entity_id())
-                        .or_insert_with(|| create_editor_diff(diff.clone(), window, cx).into_any());
+                    views.entry(diff.entity_id()).or_insert_with(|| {
+                        let element = create_editor_diff(diff.clone(), window, cx).into_any();
+                        cx.emit(EntryViewEvent {
+                            entry_index: index,
+                            view_event: ViewEvent::NewDiff(id.clone()),
+                        });
+                        element
+                    });
                 }
             }
             AgentThreadEntry::AssistantMessage(_) => {
@@ -192,7 +199,8 @@ pub struct EntryViewEvent {
 }
 
 pub enum ViewEvent {
-    NewTerminal(EntityId),
+    NewDiff(ToolCallId),
+    NewTerminal(ToolCallId),
     MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 432ba4e0e8..9c9e2ee4dd 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -20,11 +20,11 @@ use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
-    EdgesRefinement, ElementId, Empty, Entity, EntityId, FocusHandle, Focusable, Hsla, Length,
-    ListOffset, ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement,
-    Subscription, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity,
-    Window, WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage,
-    point, prelude::*, pulsating_between,
+    EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset,
+    ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription,
+    Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
+    WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage, point,
+    prelude::*, pulsating_between,
 };
 use language::Buffer;
 
@@ -256,7 +256,6 @@ pub struct AcpThreadView {
     auth_task: Option<Task<()>>,
     expanded_tool_calls: HashSet<acp::ToolCallId>,
     expanded_thinking_blocks: HashSet<(usize, usize)>,
-    expanded_terminals: HashSet<EntityId>,
     edits_expanded: bool,
     plan_expanded: bool,
     editor_expanded: bool,
@@ -354,7 +353,6 @@ impl AcpThreadView {
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
             expanded_thinking_blocks: HashSet::default(),
-            expanded_terminals: HashSet::default(),
             editing_message: None,
             edits_expanded: false,
             plan_expanded: false,
@@ -677,9 +675,14 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) {
         match &event.view_event {
-            ViewEvent::NewTerminal(terminal_id) => {
+            ViewEvent::NewDiff(tool_call_id) => {
+                if AgentSettings::get_global(cx).expand_edit_card {
+                    self.expanded_tool_calls.insert(tool_call_id.clone());
+                }
+            }
+            ViewEvent::NewTerminal(tool_call_id) => {
                 if AgentSettings::get_global(cx).expand_terminal_card {
-                    self.expanded_terminals.insert(*terminal_id);
+                    self.expanded_tool_calls.insert(tool_call_id.clone());
                 }
             }
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
@@ -1559,10 +1562,9 @@ impl AcpThreadView {
             matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
         let use_card_layout = needs_confirmation || is_edit;
 
-        let is_collapsible = !tool_call.content.is_empty() && !use_card_layout;
+        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;
 
-        let is_open =
-            needs_confirmation || is_edit || self.expanded_tool_calls.contains(&tool_call.id);
+        let is_open = needs_confirmation || self.expanded_tool_calls.contains(&tool_call.id);
 
         let gradient_overlay = |color: Hsla| {
             div()
@@ -2014,7 +2016,7 @@ impl AcpThreadView {
             .map(|path| format!("{}", path.display()))
             .unwrap_or_else(|| "current directory".to_string());
 
-        let is_expanded = self.expanded_terminals.contains(&terminal.entity_id());
+        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
 
         let header = h_flex()
             .id(SharedString::from(format!(
@@ -2154,12 +2156,12 @@ impl AcpThreadView {
                 .opened_icon(IconName::ChevronUp)
                 .closed_icon(IconName::ChevronDown)
                 .on_click(cx.listener({
-                    let terminal_id = terminal.entity_id();
+                    let id = tool_call.id.clone();
                     move |this, _event, _window, _cx| {
                         if is_expanded {
-                            this.expanded_terminals.remove(&terminal_id);
+                            this.expanded_tool_calls.remove(&id);
                         } else {
-                            this.expanded_terminals.insert(terminal_id);
+                            this.expanded_tool_calls.insert(id.clone());
                         }
                     }
                 })),

From f63d8e4c538d69d3b76ed7ec93bdd88f57e6cee0 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 21 Aug 2025 09:23:56 -0400
Subject: [PATCH 254/823] Show excerpt dividers in `without_headers`
 multibuffers (#36647)

Release Notes:

- Fixed diff cards in agent threads not showing dividers between
disjoint edited regions.
---
 crates/editor/src/display_map/block_map.rs | 99 ++++++++++++++--------
 crates/editor/src/element.rs               | 72 +++++++++-------
 crates/editor/src/test.rs                  | 35 ++++----
 3 files changed, 122 insertions(+), 84 deletions(-)

diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index e32a4e45db..b073fe7be7 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -290,7 +290,10 @@ pub enum Block {
     ExcerptBoundary {
         excerpt: ExcerptInfo,
         height: u32,
-        starts_new_buffer: bool,
+    },
+    BufferHeader {
+        excerpt: ExcerptInfo,
+        height: u32,
     },
 }
 
@@ -303,27 +306,37 @@ impl Block {
                 ..
             } => BlockId::ExcerptBoundary(next_excerpt.id),
             Block::FoldedBuffer { first_excerpt, .. } => BlockId::FoldedBuffer(first_excerpt.id),
+            Block::BufferHeader {
+                excerpt: next_excerpt,
+                ..
+            } => BlockId::ExcerptBoundary(next_excerpt.id),
         }
     }
 
     pub fn has_height(&self) -> bool {
         match self {
             Block::Custom(block) => block.height.is_some(),
-            Block::ExcerptBoundary { .. } | Block::FoldedBuffer { .. } => true,
+            Block::ExcerptBoundary { .. }
+            | Block::FoldedBuffer { .. }
+            | Block::BufferHeader { .. } => true,
         }
     }
 
     pub fn height(&self) -> u32 {
         match self {
             Block::Custom(block) => block.height.unwrap_or(0),
-            Block::ExcerptBoundary { height, .. } | Block::FoldedBuffer { height, .. } => *height,
+            Block::ExcerptBoundary { height, .. }
+            | Block::FoldedBuffer { height, .. }
+            | Block::BufferHeader { height, .. } => *height,
         }
     }
 
     pub fn style(&self) -> BlockStyle {
         match self {
             Block::Custom(block) => block.style,
-            Block::ExcerptBoundary { .. } | Block::FoldedBuffer { .. } => BlockStyle::Sticky,
+            Block::ExcerptBoundary { .. }
+            | Block::FoldedBuffer { .. }
+            | Block::BufferHeader { .. } => BlockStyle::Sticky,
         }
     }
 
@@ -332,6 +345,7 @@ impl Block {
             Block::Custom(block) => matches!(block.placement, BlockPlacement::Above(_)),
             Block::FoldedBuffer { .. } => false,
             Block::ExcerptBoundary { .. } => true,
+            Block::BufferHeader { .. } => true,
         }
     }
 
@@ -340,6 +354,7 @@ impl Block {
             Block::Custom(block) => matches!(block.placement, BlockPlacement::Near(_)),
             Block::FoldedBuffer { .. } => false,
             Block::ExcerptBoundary { .. } => false,
+            Block::BufferHeader { .. } => false,
         }
     }
 
@@ -351,6 +366,7 @@ impl Block {
             ),
             Block::FoldedBuffer { .. } => false,
             Block::ExcerptBoundary { .. } => false,
+            Block::BufferHeader { .. } => false,
         }
     }
 
@@ -359,6 +375,7 @@ impl Block {
             Block::Custom(block) => matches!(block.placement, BlockPlacement::Replace(_)),
             Block::FoldedBuffer { .. } => true,
             Block::ExcerptBoundary { .. } => false,
+            Block::BufferHeader { .. } => false,
         }
     }
 
@@ -367,6 +384,7 @@ impl Block {
             Block::Custom(_) => false,
             Block::FoldedBuffer { .. } => true,
             Block::ExcerptBoundary { .. } => true,
+            Block::BufferHeader { .. } => true,
         }
     }
 
@@ -374,9 +392,8 @@ impl Block {
         match self {
             Block::Custom(_) => false,
             Block::FoldedBuffer { .. } => true,
-            Block::ExcerptBoundary {
-                starts_new_buffer, ..
-            } => *starts_new_buffer,
+            Block::ExcerptBoundary { .. } => false,
+            Block::BufferHeader { .. } => true,
         }
     }
 }
@@ -393,14 +410,14 @@ impl Debug for Block {
                 .field("first_excerpt", &first_excerpt)
                 .field("height", height)
                 .finish(),
-            Self::ExcerptBoundary {
-                starts_new_buffer,
-                excerpt,
-                height,
-            } => f
+            Self::ExcerptBoundary { excerpt, height } => f
                 .debug_struct("ExcerptBoundary")
                 .field("excerpt", excerpt)
-                .field("starts_new_buffer", starts_new_buffer)
+                .field("height", height)
+                .finish(),
+            Self::BufferHeader { excerpt, height } => f
+                .debug_struct("BufferHeader")
+                .field("excerpt", excerpt)
                 .field("height", height)
                 .finish(),
         }
@@ -662,13 +679,11 @@ impl BlockMap {
                     }),
             );
 
-            if buffer.show_headers() {
-                blocks_in_edit.extend(self.header_and_footer_blocks(
-                    buffer,
-                    (start_bound, end_bound),
-                    wrap_snapshot,
-                ));
-            }
+            blocks_in_edit.extend(self.header_and_footer_blocks(
+                buffer,
+                (start_bound, end_bound),
+                wrap_snapshot,
+            ));
 
             BlockMap::sort_blocks(&mut blocks_in_edit);
 
@@ -771,7 +786,7 @@ impl BlockMap {
                     if self.buffers_with_disabled_headers.contains(&new_buffer_id) {
                         continue;
                     }
-                    if self.folded_buffers.contains(&new_buffer_id) {
+                    if self.folded_buffers.contains(&new_buffer_id) && buffer.show_headers() {
                         let mut last_excerpt_end_row = first_excerpt.end_row;
 
                         while let Some(next_boundary) = boundaries.peek() {
@@ -804,20 +819,24 @@ impl BlockMap {
                     }
                 }
 
-                if new_buffer_id.is_some() {
+                let starts_new_buffer = new_buffer_id.is_some();
+                let block = if starts_new_buffer && buffer.show_headers() {
                     height += self.buffer_header_height;
-                } else {
+                    Block::BufferHeader {
+                        excerpt: excerpt_boundary.next,
+                        height,
+                    }
+                } else if excerpt_boundary.prev.is_some() {
                     height += self.excerpt_header_height;
-                }
-
-                return Some((
-                    BlockPlacement::Above(WrapRow(wrap_row)),
                     Block::ExcerptBoundary {
                         excerpt: excerpt_boundary.next,
                         height,
-                        starts_new_buffer: new_buffer_id.is_some(),
-                    },
-                ));
+                    }
+                } else {
+                    continue;
+                };
+
+                return Some((BlockPlacement::Above(WrapRow(wrap_row)), block));
             }
         })
     }
@@ -842,13 +861,25 @@ impl BlockMap {
                     (
                         Block::ExcerptBoundary {
                             excerpt: excerpt_a, ..
+                        }
+                        | Block::BufferHeader {
+                            excerpt: excerpt_a, ..
                         },
                         Block::ExcerptBoundary {
                             excerpt: excerpt_b, ..
+                        }
+                        | Block::BufferHeader {
+                            excerpt: excerpt_b, ..
                         },
                     ) => Some(excerpt_a.id).cmp(&Some(excerpt_b.id)),
-                    (Block::ExcerptBoundary { .. }, Block::Custom(_)) => Ordering::Less,
-                    (Block::Custom(_), Block::ExcerptBoundary { .. }) => Ordering::Greater,
+                    (
+                        Block::ExcerptBoundary { .. } | Block::BufferHeader { .. },
+                        Block::Custom(_),
+                    ) => Ordering::Less,
+                    (
+                        Block::Custom(_),
+                        Block::ExcerptBoundary { .. } | Block::BufferHeader { .. },
+                    ) => Ordering::Greater,
                     (Block::Custom(block_a), Block::Custom(block_b)) => block_a
                         .priority
                         .cmp(&block_b.priority)
@@ -1377,7 +1408,9 @@ impl BlockSnapshot {
 
         while let Some(transform) = cursor.item() {
             match &transform.block {
-                Some(Block::ExcerptBoundary { excerpt, .. }) => {
+                Some(
+                    Block::ExcerptBoundary { excerpt, .. } | Block::BufferHeader { excerpt, .. },
+                ) => {
                     return Some(StickyHeaderExcerpt { excerpt });
                 }
                 Some(block) if block.is_buffer_header() => return None,
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 416f35d7a7..797b0d6634 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -2749,7 +2749,10 @@ impl EditorElement {
         let mut block_offset = 0;
         let mut found_excerpt_header = false;
         for (_, block) in snapshot.blocks_in_range(prev_line..row_range.start) {
-            if matches!(block, Block::ExcerptBoundary { .. }) {
+            if matches!(
+                block,
+                Block::ExcerptBoundary { .. } | Block::BufferHeader { .. }
+            ) {
                 found_excerpt_header = true;
                 break;
             }
@@ -2766,7 +2769,10 @@ impl EditorElement {
         let mut block_height = 0;
         let mut found_excerpt_header = false;
         for (_, block) in snapshot.blocks_in_range(row_range.end..cons_line) {
-            if matches!(block, Block::ExcerptBoundary { .. }) {
+            if matches!(
+                block,
+                Block::ExcerptBoundary { .. } | Block::BufferHeader { .. }
+            ) {
                 found_excerpt_header = true;
             }
             block_height += block.height();
@@ -3452,42 +3458,41 @@ impl EditorElement {
                     .into_any_element()
             }
 
-            Block::ExcerptBoundary {
-                excerpt,
-                height,
-                starts_new_buffer,
-                ..
-            } => {
+            Block::ExcerptBoundary { .. } => {
                 let color = cx.theme().colors().clone();
                 let mut result = v_flex().id(block_id).w_full();
 
+                result = result.child(
+                    h_flex().relative().child(
+                        div()
+                            .top(line_height / 2.)
+                            .absolute()
+                            .w_full()
+                            .h_px()
+                            .bg(color.border_variant),
+                    ),
+                );
+
+                result.into_any()
+            }
+
+            Block::BufferHeader { excerpt, height } => {
+                let mut result = v_flex().id(block_id).w_full();
+
                 let jump_data = header_jump_data(snapshot, block_row_start, *height, excerpt);
 
-                if *starts_new_buffer {
-                    if sticky_header_excerpt_id != Some(excerpt.id) {
-                        let selected = selected_buffer_ids.contains(&excerpt.buffer_id);
+                if sticky_header_excerpt_id != Some(excerpt.id) {
+                    let selected = selected_buffer_ids.contains(&excerpt.buffer_id);
 
-                        result = result.child(div().pr(editor_margins.right).child(
-                            self.render_buffer_header(
-                                excerpt, false, selected, false, jump_data, window, cx,
-                            ),
-                        ));
-                    } else {
-                        result =
-                            result.child(div().h(FILE_HEADER_HEIGHT as f32 * window.line_height()));
-                    }
-                } else {
-                    result = result.child(
-                        h_flex().relative().child(
-                            div()
-                                .top(line_height / 2.)
-                                .absolute()
-                                .w_full()
-                                .h_px()
-                                .bg(color.border_variant),
+                    result = result.child(div().pr(editor_margins.right).child(
+                        self.render_buffer_header(
+                            excerpt, false, selected, false, jump_data, window, cx,
                         ),
-                    );
-                };
+                    ));
+                } else {
+                    result =
+                        result.child(div().h(FILE_HEADER_HEIGHT as f32 * window.line_height()));
+                }
 
                 result.into_any()
             }
@@ -5708,7 +5713,10 @@ impl EditorElement {
                     let end_row_in_current_excerpt = snapshot
                         .blocks_in_range(start_row..end_row)
                         .find_map(|(start_row, block)| {
-                            if matches!(block, Block::ExcerptBoundary { .. }) {
+                            if matches!(
+                                block,
+                                Block::ExcerptBoundary { .. } | Block::BufferHeader { .. }
+                            ) {
                                 Some(start_row)
                             } else {
                                 None
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index d388e8f3b7..960fecf59a 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -230,26 +230,23 @@ pub fn editor_content_with_blocks(editor: &Entity<Editor>, cx: &mut VisualTestCo
                     lines[row as usize].push_str("§ -----");
                 }
             }
-            Block::ExcerptBoundary {
-                excerpt,
-                height,
-                starts_new_buffer,
-            } => {
-                if starts_new_buffer {
-                    lines[row.0 as usize].push_str(&cx.update(|_, cx| {
-                        format!(
-                            "§ {}",
-                            excerpt
-                                .buffer
-                                .file()
-                                .unwrap()
-                                .file_name(cx)
-                                .to_string_lossy()
-                        )
-                    }));
-                } else {
-                    lines[row.0 as usize].push_str("§ -----")
+            Block::ExcerptBoundary { height, .. } => {
+                for row in row.0..row.0 + height {
+                    lines[row as usize].push_str("§ -----");
                 }
+            }
+            Block::BufferHeader { excerpt, height } => {
+                lines[row.0 as usize].push_str(&cx.update(|_, cx| {
+                    format!(
+                        "§ {}",
+                        excerpt
+                            .buffer
+                            .file()
+                            .unwrap()
+                            .file_name(cx)
+                            .to_string_lossy()
+                    )
+                }));
                 for row in row.0 + 1..row.0 + height {
                     lines[row as usize].push_str("§ -----");
                 }

From 1dd237139cfb4f12982f1db86c87ab8b85c9593f Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 21 Aug 2025 09:24:34 -0400
Subject: [PATCH 255/823] Fix more improper uses of the `buffer_id` field of
 `Anchor` (#36636)

Follow-up to #36524

Release Notes:

- N/A
---
 crates/editor/src/editor.rs                | 73 +++++++++-------------
 crates/editor/src/hover_links.rs           |  5 +-
 crates/editor/src/inlay_hint_cache.rs      |  5 +-
 crates/editor/src/linked_editing_ranges.rs |  2 +-
 crates/editor/src/mouse_context_menu.rs    | 18 +++---
 crates/outline_panel/src/outline_panel.rs  |  5 +-
 6 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index e32ea1cb3a..05ee295360 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -6697,7 +6697,6 @@ impl Editor {
                         return;
                     }
 
-                    let buffer_id = cursor_position.buffer_id;
                     let buffer = this.buffer.read(cx);
                     if buffer
                         .text_anchor_for_position(cursor_position, cx)
@@ -6710,8 +6709,8 @@ impl Editor {
                     let mut write_ranges = Vec::new();
                     let mut read_ranges = Vec::new();
                     for highlight in highlights {
-                        for (excerpt_id, excerpt_range) in
-                            buffer.excerpts_for_buffer(cursor_buffer.read(cx).remote_id(), cx)
+                        let buffer_id = cursor_buffer.read(cx).remote_id();
+                        for (excerpt_id, excerpt_range) in buffer.excerpts_for_buffer(buffer_id, cx)
                         {
                             let start = highlight
                                 .range
@@ -6726,12 +6725,12 @@ impl Editor {
                             }
 
                             let range = Anchor {
-                                buffer_id,
+                                buffer_id: Some(buffer_id),
                                 excerpt_id,
                                 text_anchor: start,
                                 diff_base_anchor: None,
                             }..Anchor {
-                                buffer_id,
+                                buffer_id: Some(buffer_id),
                                 excerpt_id,
                                 text_anchor: end,
                                 diff_base_anchor: None,
@@ -9496,17 +9495,21 @@ impl Editor {
         selection: Range<Anchor>,
         cx: &mut Context<Self>,
     ) {
-        let buffer_id = match (&selection.start.buffer_id, &selection.end.buffer_id) {
-            (Some(a), Some(b)) if a == b => a,
-            _ => {
-                log::error!("expected anchor range to have matching buffer IDs");
-                return;
-            }
-        };
-        let multi_buffer = self.buffer().read(cx);
-        let Some(buffer) = multi_buffer.buffer(*buffer_id) else {
+        let Some((_, buffer, _)) = self
+            .buffer()
+            .read(cx)
+            .excerpt_containing(selection.start, cx)
+        else {
             return;
         };
+        let Some((_, end_buffer, _)) = self.buffer().read(cx).excerpt_containing(selection.end, cx)
+        else {
+            return;
+        };
+        if buffer != end_buffer {
+            log::error!("expected anchor range to have matching buffer IDs");
+            return;
+        }
 
         let id = post_inc(&mut self.next_completion_id);
         let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
@@ -10593,16 +10596,12 @@ impl Editor {
         snapshot: &EditorSnapshot,
         cx: &mut Context<Self>,
     ) -> Option<(Anchor, Breakpoint)> {
-        let project = self.project.clone()?;
-
-        let buffer_id = breakpoint_position.buffer_id.or_else(|| {
-            snapshot
-                .buffer_snapshot
-                .buffer_id_for_excerpt(breakpoint_position.excerpt_id)
-        })?;
+        let buffer = self
+            .buffer
+            .read(cx)
+            .buffer_for_anchor(breakpoint_position, cx)?;
 
         let enclosing_excerpt = breakpoint_position.excerpt_id;
-        let buffer = project.read(cx).buffer_for_id(buffer_id, cx)?;
         let buffer_snapshot = buffer.read(cx).snapshot();
 
         let row = buffer_snapshot
@@ -10775,21 +10774,11 @@ impl Editor {
             return;
         };
 
-        let Some(buffer_id) = breakpoint_position.buffer_id.or_else(|| {
-            if breakpoint_position == Anchor::min() {
-                self.buffer()
-                    .read(cx)
-                    .excerpt_buffer_ids()
-                    .into_iter()
-                    .next()
-            } else {
-                None
-            }
-        }) else {
-            return;
-        };
-
-        let Some(buffer) = self.buffer().read(cx).buffer(buffer_id) else {
+        let Some(buffer) = self
+            .buffer
+            .read(cx)
+            .buffer_for_anchor(breakpoint_position, cx)
+        else {
             return;
         };
 
@@ -15432,7 +15421,8 @@ impl Editor {
             return;
         };
 
-        let Some(buffer_id) = buffer.anchor_after(next_diagnostic.range.start).buffer_id else {
+        let next_diagnostic_start = buffer.anchor_after(next_diagnostic.range.start);
+        let Some(buffer_id) = buffer.buffer_id_for_anchor(next_diagnostic_start) else {
             return;
         };
         self.change_selections(Default::default(), window, cx, |s| {
@@ -20425,11 +20415,8 @@ impl Editor {
                         .range_to_buffer_ranges_with_deleted_hunks(selection.range())
                     {
                         if let Some(anchor) = anchor {
-                            // selection is in a deleted hunk
-                            let Some(buffer_id) = anchor.buffer_id else {
-                                continue;
-                            };
-                            let Some(buffer_handle) = multi_buffer.buffer(buffer_id) else {
+                            let Some(buffer_handle) = multi_buffer.buffer_for_anchor(anchor, cx)
+                            else {
                                 continue;
                             };
                             let offset = text::ToOffset::to_offset(
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 1d7d56e67d..94f49f601a 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -321,7 +321,10 @@ pub fn update_inlay_link_and_hover_points(
             if let Some(cached_hint) = inlay_hint_cache.hint_by_id(excerpt_id, hovered_hint.id) {
                 match cached_hint.resolve_state {
                     ResolveState::CanResolve(_, _) => {
-                        if let Some(buffer_id) = previous_valid_anchor.buffer_id {
+                        if let Some(buffer_id) = snapshot
+                            .buffer_snapshot
+                            .buffer_id_for_anchor(previous_valid_anchor)
+                        {
                             inlay_hint_cache.spawn_hint_resolve(
                                 buffer_id,
                                 excerpt_id,
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index cea0e32d7f..dbf5ac95b7 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -475,10 +475,7 @@ impl InlayHintCache {
             let excerpt_cached_hints = excerpt_cached_hints.read();
             let mut excerpt_cache = excerpt_cached_hints.ordered_hints.iter().fuse().peekable();
             shown_excerpt_hints_to_remove.retain(|(shown_anchor, shown_hint_id)| {
-                let Some(buffer) = shown_anchor
-                    .buffer_id
-                    .and_then(|buffer_id| multi_buffer.buffer(buffer_id))
-                else {
+                let Some(buffer) = multi_buffer.buffer_for_anchor(*shown_anchor, cx) else {
                     return false;
                 };
                 let buffer_snapshot = buffer.read(cx).snapshot();
diff --git a/crates/editor/src/linked_editing_ranges.rs b/crates/editor/src/linked_editing_ranges.rs
index aaf9032b04..4f1313797f 100644
--- a/crates/editor/src/linked_editing_ranges.rs
+++ b/crates/editor/src/linked_editing_ranges.rs
@@ -72,7 +72,7 @@ pub(super) fn refresh_linked_ranges(
                         // Throw away selections spanning multiple buffers.
                         continue;
                     }
-                    if let Some(buffer) = end_position.buffer_id.and_then(|id| buffer.buffer(id)) {
+                    if let Some(buffer) = buffer.buffer_for_anchor(end_position, cx) {
                         applicable_selections.push((
                             buffer,
                             start_position.text_anchor,
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
index 5cf22de537..3bc334c54c 100644
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -190,14 +190,16 @@ pub fn deploy_context_menu(
             .all::<PointUtf16>(cx)
             .into_iter()
             .any(|s| !s.is_empty());
-        let has_git_repo = anchor.buffer_id.is_some_and(|buffer_id| {
-            project
-                .read(cx)
-                .git_store()
-                .read(cx)
-                .repository_and_path_for_buffer_id(buffer_id, cx)
-                .is_some()
-        });
+        let has_git_repo = buffer
+            .buffer_id_for_anchor(anchor)
+            .is_some_and(|buffer_id| {
+                project
+                    .read(cx)
+                    .git_store()
+                    .read(cx)
+                    .repository_and_path_for_buffer_id(buffer_id, cx)
+                    .is_some()
+            });
 
         let evaluate_selection = window.is_action_available(&EvaluateSelectedText, cx);
         let run_to_cursor = window.is_action_available(&RunToCursor, cx);
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 59c43f945f..10698cead8 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -4393,12 +4393,13 @@ impl OutlinePanel {
             })
             .filter(|(match_range, _)| {
                 let editor = active_editor.read(cx);
-                if let Some(buffer_id) = match_range.start.buffer_id
+                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                if let Some(buffer_id) = snapshot.buffer_id_for_anchor(match_range.start)
                     && editor.is_buffer_folded(buffer_id, cx)
                 {
                     return false;
                 }
-                if let Some(buffer_id) = match_range.start.buffer_id
+                if let Some(buffer_id) = snapshot.buffer_id_for_anchor(match_range.end)
                     && editor.is_buffer_folded(buffer_id, cx)
                 {
                     return false;

From e0613cbd0f203a845cc622d04f47d9a54931a160 Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Thu, 21 Aug 2025 15:56:16 +0200
Subject: [PATCH 256/823] Add Rodio audio pipeline as alternative to current
 LiveKit pipeline (#36607)

Rodio parts are well tested and need less configuration then the livekit
parts. I suspect there is a bug in the livekit configuration regarding
resampling. Rather then investigate that it seemed faster & easier to
swap in Rodio.

This opens the door to using other Rodio parts like:
 - Decibel based volume control
 - Limiter (prevents sound from becoming too loud)
 - Automatic gain control

To use this add to settings:
```
  "audio": {
    "experimental.rodio_audio": true
  }
```

Release Notes:

- N/A

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 Cargo.lock                                    |  7 +-
 crates/audio/Cargo.toml                       |  5 +-
 crates/audio/src/assets.rs                    | 54 -------------
 crates/audio/src/audio.rs                     | 76 ++++++++++++-------
 crates/audio/src/audio_settings.rs            | 33 ++++++++
 crates/livekit_client/Cargo.toml              |  2 +
 crates/livekit_client/src/lib.rs              |  7 +-
 crates/livekit_client/src/livekit_client.rs   | 14 +++-
 .../src/livekit_client/playback.rs            | 64 +++++++++++-----
 .../src/livekit_client/playback/source.rs     | 67 ++++++++++++++++
 crates/settings/src/settings_store.rs         |  5 ++
 crates/zed/src/main.rs                        |  2 +-
 crates/zed/src/zed.rs                         |  2 +-
 13 files changed, 226 insertions(+), 112 deletions(-)
 delete mode 100644 crates/audio/src/assets.rs
 create mode 100644 crates/audio/src/audio_settings.rs
 create mode 100644 crates/livekit_client/src/livekit_client/playback/source.rs

diff --git a/Cargo.lock b/Cargo.lock
index 76f8672d4d..ddeaebd0bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1379,10 +1379,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
- "derive_more 0.99.19",
  "gpui",
- "parking_lot",
  "rodio",
+ "schemars",
+ "serde",
+ "settings",
  "util",
  "workspace-hack",
 ]
@@ -9621,6 +9622,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "audio",
  "collections",
  "core-foundation 0.10.0",
  "core-video",
@@ -9643,6 +9645,7 @@ dependencies = [
  "scap",
  "serde",
  "serde_json",
+ "settings",
  "sha2",
  "simplelog",
  "smallvec",
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 5146396b92..ae7eb52fd3 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -15,9 +15,10 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 collections.workspace = true
-derive_more.workspace = true
 gpui.workspace = true
-parking_lot.workspace = true
+settings.workspace = true
+schemars.workspace = true
+serde.workspace = true
 rodio = { workspace = true, features = [ "wav", "playback", "tracing" ] }
 util.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/audio/src/assets.rs b/crates/audio/src/assets.rs
deleted file mode 100644
index fd5c935d87..0000000000
--- a/crates/audio/src/assets.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use std::{io::Cursor, sync::Arc};
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use gpui::{App, AssetSource, Global};
-use rodio::{Decoder, Source, source::Buffered};
-
-type Sound = Buffered<Decoder<Cursor<Vec<u8>>>>;
-
-pub struct SoundRegistry {
-    cache: Arc<parking_lot::Mutex<HashMap<String, Sound>>>,
-    assets: Box<dyn AssetSource>,
-}
-
-struct GlobalSoundRegistry(Arc<SoundRegistry>);
-
-impl Global for GlobalSoundRegistry {}
-
-impl SoundRegistry {
-    pub fn new(source: impl AssetSource) -> Arc<Self> {
-        Arc::new(Self {
-            cache: Default::default(),
-            assets: Box::new(source),
-        })
-    }
-
-    pub fn global(cx: &App) -> Arc<Self> {
-        cx.global::<GlobalSoundRegistry>().0.clone()
-    }
-
-    pub(crate) fn set_global(source: impl AssetSource, cx: &mut App) {
-        cx.set_global(GlobalSoundRegistry(SoundRegistry::new(source)));
-    }
-
-    pub fn get(&self, name: &str) -> Result<impl Source<Item = f32> + use<>> {
-        if let Some(wav) = self.cache.lock().get(name) {
-            return Ok(wav.clone());
-        }
-
-        let path = format!("sounds/{}.wav", name);
-        let bytes = self
-            .assets
-            .load(&path)?
-            .map(anyhow::Ok)
-            .with_context(|| format!("No asset available for path {path}"))??
-            .into_owned();
-        let cursor = Cursor::new(bytes);
-        let source = Decoder::new(cursor)?.buffered();
-
-        self.cache.lock().insert(name.to_string(), source.clone());
-
-        Ok(source)
-    }
-}
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index 44baa16aa2..b4f2c24fef 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,16 +1,19 @@
-use assets::SoundRegistry;
-use derive_more::{Deref, DerefMut};
-use gpui::{App, AssetSource, BorrowAppContext, Global};
-use rodio::{OutputStream, OutputStreamBuilder};
+use anyhow::{Context as _, Result, anyhow};
+use collections::HashMap;
+use gpui::{App, BorrowAppContext, Global};
+use rodio::{Decoder, OutputStream, OutputStreamBuilder, Source, source::Buffered};
+use settings::Settings;
+use std::io::Cursor;
 use util::ResultExt;
 
-mod assets;
+mod audio_settings;
+pub use audio_settings::AudioSettings;
 
-pub fn init(source: impl AssetSource, cx: &mut App) {
-    SoundRegistry::set_global(source, cx);
-    cx.set_global(GlobalAudio(Audio::new()));
+pub fn init(cx: &mut App) {
+    AudioSettings::register(cx);
 }
 
+#[derive(Copy, Clone, Eq, Hash, PartialEq)]
 pub enum Sound {
     Joined,
     Leave,
@@ -38,18 +41,12 @@ impl Sound {
 #[derive(Default)]
 pub struct Audio {
     output_handle: Option<OutputStream>,
+    source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
 }
 
-#[derive(Deref, DerefMut)]
-struct GlobalAudio(Audio);
-
-impl Global for GlobalAudio {}
+impl Global for Audio {}
 
 impl Audio {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
     fn ensure_output_exists(&mut self) -> Option<&OutputStream> {
         if self.output_handle.is_none() {
             self.output_handle = OutputStreamBuilder::open_default_stream().log_err();
@@ -58,26 +55,51 @@ impl Audio {
         self.output_handle.as_ref()
     }
 
-    pub fn play_sound(sound: Sound, cx: &mut App) {
-        if !cx.has_global::<GlobalAudio>() {
-            return;
-        }
+    pub fn play_source(
+        source: impl rodio::Source + Send + 'static,
+        cx: &mut App,
+    ) -> anyhow::Result<()> {
+        cx.update_default_global(|this: &mut Self, _cx| {
+            let output_handle = this
+                .ensure_output_exists()
+                .ok_or_else(|| anyhow!("Could not open audio output"))?;
+            output_handle.mixer().add(source);
+            Ok(())
+        })
+    }
 
-        cx.update_global::<GlobalAudio, _>(|this, cx| {
+    pub fn play_sound(sound: Sound, cx: &mut App) {
+        cx.update_default_global(|this: &mut Self, cx| {
+            let source = this.sound_source(sound, cx).log_err()?;
             let output_handle = this.ensure_output_exists()?;
-            let source = SoundRegistry::global(cx).get(sound.file()).log_err()?;
             output_handle.mixer().add(source);
             Some(())
         });
     }
 
     pub fn end_call(cx: &mut App) {
-        if !cx.has_global::<GlobalAudio>() {
-            return;
-        }
-
-        cx.update_global::<GlobalAudio, _>(|this, _| {
+        cx.update_default_global(|this: &mut Self, _cx| {
             this.output_handle.take();
         });
     }
+
+    fn sound_source(&mut self, sound: Sound, cx: &App) -> Result<impl Source + use<>> {
+        if let Some(wav) = self.source_cache.get(&sound) {
+            return Ok(wav.clone());
+        }
+
+        let path = format!("sounds/{}.wav", sound.file());
+        let bytes = cx
+            .asset_source()
+            .load(&path)?
+            .map(anyhow::Ok)
+            .with_context(|| format!("No asset available for path {path}"))??
+            .into_owned();
+        let cursor = Cursor::new(bytes);
+        let source = Decoder::new(cursor)?.buffered();
+
+        self.source_cache.insert(sound, source.clone());
+
+        Ok(source)
+    }
 }
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
new file mode 100644
index 0000000000..807179881c
--- /dev/null
+++ b/crates/audio/src/audio_settings.rs
@@ -0,0 +1,33 @@
+use anyhow::Result;
+use gpui::App;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsSources};
+
+#[derive(Deserialize, Debug)]
+pub struct AudioSettings {
+    /// Opt into the new audio system.
+    #[serde(rename = "experimental.rodio_audio", default)]
+    pub rodio_audio: bool, // default is false
+}
+
+/// Configuration of audio in Zed.
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[serde(default)]
+pub struct AudioSettingsContent {
+    /// Whether to use the experimental audio system
+    #[serde(rename = "experimental.rodio_audio", default)]
+    pub rodio_audio: bool,
+}
+
+impl Settings for AudioSettings {
+    const KEY: Option<&'static str> = Some("audio");
+
+    type FileContent = AudioSettingsContent;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
+        sources.json_merge()
+    }
+
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
+}
diff --git a/crates/livekit_client/Cargo.toml b/crates/livekit_client/Cargo.toml
index 58059967b7..3575325ac0 100644
--- a/crates/livekit_client/Cargo.toml
+++ b/crates/livekit_client/Cargo.toml
@@ -25,6 +25,7 @@ async-trait.workspace = true
 collections.workspace = true
 cpal.workspace = true
 futures.workspace = true
+audio.workspace = true
 gpui = { workspace = true, features = ["screen-capture", "x11", "wayland", "windows-manifest"] }
 gpui_tokio.workspace = true
 http_client_tls.workspace = true
@@ -35,6 +36,7 @@ nanoid.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 smallvec.workspace = true
+settings.workspace = true
 tokio-tungstenite.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/livekit_client/src/lib.rs b/crates/livekit_client/src/lib.rs
index e3934410e1..055aa3704e 100644
--- a/crates/livekit_client/src/lib.rs
+++ b/crates/livekit_client/src/lib.rs
@@ -24,8 +24,11 @@ mod livekit_client;
 )))]
 pub use livekit_client::*;
 
-// If you need proper LSP in livekit_client you've got to comment out
-// the mocks and test
+// If you need proper LSP in livekit_client you've got to comment
+// - the cfg blocks above
+// - the mods: mock_client & test and their conditional blocks
+// - the pub use mock_client::* and their conditional blocks
+
 #[cfg(any(
     test,
     feature = "test-support",
diff --git a/crates/livekit_client/src/livekit_client.rs b/crates/livekit_client/src/livekit_client.rs
index adeea4f512..0751b014f4 100644
--- a/crates/livekit_client/src/livekit_client.rs
+++ b/crates/livekit_client/src/livekit_client.rs
@@ -1,15 +1,16 @@
 use std::sync::Arc;
 
 use anyhow::{Context as _, Result};
+use audio::AudioSettings;
 use collections::HashMap;
 use futures::{SinkExt, channel::mpsc};
 use gpui::{App, AsyncApp, ScreenCaptureSource, ScreenCaptureStream, Task};
 use gpui_tokio::Tokio;
+use log::info;
 use playback::capture_local_video_track;
+use settings::Settings;
 
 mod playback;
-#[cfg(feature = "record-microphone")]
-mod record;
 
 use crate::{LocalTrack, Participant, RemoteTrack, RoomEvent, TrackPublication};
 pub use playback::AudioStream;
@@ -125,9 +126,14 @@ impl Room {
     pub fn play_remote_audio_track(
         &self,
         track: &RemoteAudioTrack,
-        _cx: &App,
+        cx: &mut App,
     ) -> Result<playback::AudioStream> {
-        Ok(self.playback.play_remote_audio_track(&track.0))
+        if AudioSettings::get_global(cx).rodio_audio {
+            info!("Using experimental.rodio_audio audio pipeline");
+            playback::play_remote_audio_track(&track.0, cx)
+        } else {
+            Ok(self.playback.play_remote_audio_track(&track.0))
+        }
     }
 }
 
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
index e13fb7bd81..d6b64dbaca 100644
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ b/crates/livekit_client/src/livekit_client/playback.rs
@@ -18,13 +18,16 @@ use livekit::webrtc::{
     video_stream::native::NativeVideoStream,
 };
 use parking_lot::Mutex;
+use rodio::Source;
 use std::cell::RefCell;
 use std::sync::Weak;
-use std::sync::atomic::{self, AtomicI32};
+use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
 use std::time::Duration;
 use std::{borrow::Cow, collections::VecDeque, sync::Arc, thread};
 use util::{ResultExt as _, maybe};
 
+mod source;
+
 pub(crate) struct AudioStack {
     executor: BackgroundExecutor,
     apm: Arc<Mutex<apm::AudioProcessingModule>>,
@@ -40,6 +43,29 @@ pub(crate) struct AudioStack {
 const SAMPLE_RATE: u32 = 48000;
 const NUM_CHANNELS: u32 = 2;
 
+pub(crate) fn play_remote_audio_track(
+    track: &livekit::track::RemoteAudioTrack,
+    cx: &mut gpui::App,
+) -> Result<AudioStream> {
+    let stop_handle = Arc::new(AtomicBool::new(false));
+    let stop_handle_clone = stop_handle.clone();
+    let stream = source::LiveKitStream::new(cx.background_executor(), track)
+        .stoppable()
+        .periodic_access(Duration::from_millis(50), move |s| {
+            if stop_handle.load(Ordering::Relaxed) {
+                s.stop();
+            }
+        });
+    audio::Audio::play_source(stream, cx).context("Could not play audio")?;
+
+    let on_drop = util::defer(move || {
+        stop_handle_clone.store(true, Ordering::Relaxed);
+    });
+    Ok(AudioStream::Output {
+        _drop: Box::new(on_drop),
+    })
+}
+
 impl AudioStack {
     pub(crate) fn new(executor: BackgroundExecutor) -> Self {
         let apm = Arc::new(Mutex::new(apm::AudioProcessingModule::new(
@@ -61,7 +87,7 @@ impl AudioStack {
     ) -> AudioStream {
         let output_task = self.start_output();
 
-        let next_ssrc = self.next_ssrc.fetch_add(1, atomic::Ordering::Relaxed);
+        let next_ssrc = self.next_ssrc.fetch_add(1, Ordering::Relaxed);
         let source = AudioMixerSource {
             ssrc: next_ssrc,
             sample_rate: SAMPLE_RATE,
@@ -97,6 +123,23 @@ impl AudioStack {
         }
     }
 
+    fn start_output(&self) -> Arc<Task<()>> {
+        if let Some(task) = self._output_task.borrow().upgrade() {
+            return task;
+        }
+        let task = Arc::new(self.executor.spawn({
+            let apm = self.apm.clone();
+            let mixer = self.mixer.clone();
+            async move {
+                Self::play_output(apm, mixer, SAMPLE_RATE, NUM_CHANNELS)
+                    .await
+                    .log_err();
+            }
+        }));
+        *self._output_task.borrow_mut() = Arc::downgrade(&task);
+        task
+    }
+
     pub(crate) fn capture_local_microphone_track(
         &self,
     ) -> Result<(crate::LocalAudioTrack, AudioStream)> {
@@ -139,23 +182,6 @@ impl AudioStack {
         ))
     }
 
-    fn start_output(&self) -> Arc<Task<()>> {
-        if let Some(task) = self._output_task.borrow().upgrade() {
-            return task;
-        }
-        let task = Arc::new(self.executor.spawn({
-            let apm = self.apm.clone();
-            let mixer = self.mixer.clone();
-            async move {
-                Self::play_output(apm, mixer, SAMPLE_RATE, NUM_CHANNELS)
-                    .await
-                    .log_err();
-            }
-        }));
-        *self._output_task.borrow_mut() = Arc::downgrade(&task);
-        task
-    }
-
     async fn play_output(
         apm: Arc<Mutex<apm::AudioProcessingModule>>,
         mixer: Arc<Mutex<audio_mixer::AudioMixer>>,
diff --git a/crates/livekit_client/src/livekit_client/playback/source.rs b/crates/livekit_client/src/livekit_client/playback/source.rs
new file mode 100644
index 0000000000..021640247d
--- /dev/null
+++ b/crates/livekit_client/src/livekit_client/playback/source.rs
@@ -0,0 +1,67 @@
+use futures::StreamExt;
+use libwebrtc::{audio_stream::native::NativeAudioStream, prelude::AudioFrame};
+use livekit::track::RemoteAudioTrack;
+use rodio::{Source, buffer::SamplesBuffer, conversions::SampleTypeConverter};
+
+use crate::livekit_client::playback::{NUM_CHANNELS, SAMPLE_RATE};
+
+fn frame_to_samplesbuffer(frame: AudioFrame) -> SamplesBuffer {
+    let samples = frame.data.iter().copied();
+    let samples = SampleTypeConverter::<_, _>::new(samples);
+    let samples: Vec<f32> = samples.collect();
+    SamplesBuffer::new(frame.num_channels as u16, frame.sample_rate, samples)
+}
+
+pub struct LiveKitStream {
+    // shared_buffer: SharedBuffer,
+    inner: rodio::queue::SourcesQueueOutput,
+    _receiver_task: gpui::Task<()>,
+}
+
+impl LiveKitStream {
+    pub fn new(executor: &gpui::BackgroundExecutor, track: &RemoteAudioTrack) -> Self {
+        let mut stream =
+            NativeAudioStream::new(track.rtc_track(), SAMPLE_RATE as i32, NUM_CHANNELS as i32);
+        let (queue_input, queue_output) = rodio::queue::queue(true);
+        // spawn rtc stream
+        let receiver_task = executor.spawn({
+            async move {
+                while let Some(frame) = stream.next().await {
+                    let samples = frame_to_samplesbuffer(frame);
+                    queue_input.append(samples);
+                }
+            }
+        });
+
+        LiveKitStream {
+            _receiver_task: receiver_task,
+            inner: queue_output,
+        }
+    }
+}
+
+impl Iterator for LiveKitStream {
+    type Item = rodio::Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.inner.next()
+    }
+}
+
+impl Source for LiveKitStream {
+    fn current_span_len(&self) -> Option<usize> {
+        self.inner.current_span_len()
+    }
+
+    fn channels(&self) -> rodio::ChannelCount {
+        self.inner.channels()
+    }
+
+    fn sample_rate(&self) -> rodio::SampleRate {
+        self.inner.sample_rate()
+    }
+
+    fn total_duration(&self) -> Option<std::time::Duration> {
+        self.inner.total_duration()
+    }
+}
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 211db46c6c..3deaed8b9d 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -60,6 +60,11 @@ pub trait Settings: 'static + Send + Sync {
 
     /// The logic for combining together values from one or more JSON files into the
     /// final value for this setting.
+    ///
+    /// # Warning
+    /// `Self::FileContent` deserialized field names should match with `Self` deserialized field names
+    /// otherwise the field won't be deserialized properly and you will get the error:
+    /// "A default setting must be added to the `default.json` file"
     fn load(sources: SettingsSources<Self::FileContent>, cx: &mut App) -> Result<Self>
     where
         Self: Sized;
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 45c67153eb..7ab76b71de 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -598,7 +598,7 @@ pub fn main() {
         repl::notebook::init(cx);
         diagnostics::init(cx);
 
-        audio::init(Assets, cx);
+        audio::init(cx);
         workspace::init(app_state.clone(), cx);
         ui_prompt::init(cx);
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 958149825a..3b5f99f9bd 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4614,7 +4614,7 @@ mod tests {
             gpui_tokio::init(cx);
             vim_mode_setting::init(cx);
             theme::init(theme::LoadThemes::JustBase, cx);
-            audio::init((), cx);
+            audio::init(cx);
             channel::init(&app_state.client, app_state.user_store.clone(), cx);
             call::init(app_state.client.clone(), app_state.user_store.clone(), cx);
             notifications::init(app_state.client.clone(), app_state.user_store.clone(), cx);

From 2781a3097161c7bd5447fe82a4d9f8490b42af68 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 21 Aug 2025 09:59:18 -0400
Subject: [PATCH 257/823] collab: Add Orb subscription status and period to
 `billing_subscriptions` table (#36682)

This PR adds the following new columns to the `billing_subscriptions`
table:

- `orb_subscription_status`
- `orb_current_billing_period_start_date`
- `orb_current_billing_period_end_date`

Release Notes:

- N/A
---
 ...ubscription_status_and_period_to_billing_subscriptions.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 crates/collab/migrations/20250821133754_add_orb_subscription_status_and_period_to_billing_subscriptions.sql

diff --git a/crates/collab/migrations/20250821133754_add_orb_subscription_status_and_period_to_billing_subscriptions.sql b/crates/collab/migrations/20250821133754_add_orb_subscription_status_and_period_to_billing_subscriptions.sql
new file mode 100644
index 0000000000..89a42ab82b
--- /dev/null
+++ b/crates/collab/migrations/20250821133754_add_orb_subscription_status_and_period_to_billing_subscriptions.sql
@@ -0,0 +1,4 @@
+alter table billing_subscriptions
+    add column orb_subscription_status text,
+    add column orb_current_billing_period_start_date timestamp without time zone,
+    add column orb_current_billing_period_end_date timestamp without time zone;

From 001ec97c0e0c13deda49c49ded89826fab514a7c Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 21 Aug 2025 16:18:22 +0200
Subject: [PATCH 258/823] acp: Use file icons for edit tool cards when
 ToolCallLocation is known (#36684)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 33 ++++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 9c9e2ee4dd..f8c616c9e0 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1469,19 +1469,26 @@ impl AcpThreadView {
         tool_call: &ToolCall,
         cx: &Context<Self>,
     ) -> Div {
-        let tool_icon = Icon::new(match tool_call.kind {
-            acp::ToolKind::Read => IconName::ToolRead,
-            acp::ToolKind::Edit => IconName::ToolPencil,
-            acp::ToolKind::Delete => IconName::ToolDeleteFile,
-            acp::ToolKind::Move => IconName::ArrowRightLeft,
-            acp::ToolKind::Search => IconName::ToolSearch,
-            acp::ToolKind::Execute => IconName::ToolTerminal,
-            acp::ToolKind::Think => IconName::ToolThink,
-            acp::ToolKind::Fetch => IconName::ToolWeb,
-            acp::ToolKind::Other => IconName::ToolHammer,
-        })
-        .size(IconSize::Small)
-        .color(Color::Muted);
+        let tool_icon =
+            if tool_call.kind == acp::ToolKind::Edit && tool_call.locations.len() == 1 {
+                FileIcons::get_icon(&tool_call.locations[0].path, cx)
+                    .map(Icon::from_path)
+                    .unwrap_or(Icon::new(IconName::ToolPencil))
+            } else {
+                Icon::new(match tool_call.kind {
+                    acp::ToolKind::Read => IconName::ToolRead,
+                    acp::ToolKind::Edit => IconName::ToolPencil,
+                    acp::ToolKind::Delete => IconName::ToolDeleteFile,
+                    acp::ToolKind::Move => IconName::ArrowRightLeft,
+                    acp::ToolKind::Search => IconName::ToolSearch,
+                    acp::ToolKind::Execute => IconName::ToolTerminal,
+                    acp::ToolKind::Think => IconName::ToolThink,
+                    acp::ToolKind::Fetch => IconName::ToolWeb,
+                    acp::ToolKind::Other => IconName::ToolHammer,
+                })
+            }
+            .size(IconSize::Small)
+            .color(Color::Muted);
 
         let base_container = h_flex().size_4().justify_center();
 

From d8fc779a6758f6cf3b375af65350e7166e22b0b8 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 21 Aug 2025 08:43:57 -0600
Subject: [PATCH 259/823] acp: Hide history unless in native agent (#36644)

Release Notes:

- N/A
---
 crates/agent2/src/history_store.rs        | 10 ++++++++++
 crates/agent_ui/src/acp/thread_history.rs | 17 ++++-------------
 crates/agent_ui/src/acp/thread_view.rs    | 21 +++++++++++++--------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 2d70164a66..78d83cc1d0 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -10,6 +10,7 @@ use itertools::Itertools;
 use paths::contexts_dir;
 use serde::{Deserialize, Serialize};
 use std::{collections::VecDeque, path::Path, sync::Arc, time::Duration};
+use ui::ElementId;
 use util::ResultExt as _;
 
 const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
@@ -68,6 +69,15 @@ pub enum HistoryEntryId {
     TextThread(Arc<Path>),
 }
 
+impl Into<ElementId> for HistoryEntryId {
+    fn into(self) -> ElementId {
+        match self {
+            HistoryEntryId::AcpThread(session_id) => ElementId::Name(session_id.0.into()),
+            HistoryEntryId::TextThread(path) => ElementId::Path(path),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 enum SerializedRecentOpen {
     AcpThread(String),
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
index 68a41f31d0..d76969378c 100644
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -673,18 +673,9 @@ impl AcpHistoryEntryElement {
 
 impl RenderOnce for AcpHistoryEntryElement {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let (id, title, timestamp) = match &self.entry {
-            HistoryEntry::AcpThread(thread) => (
-                thread.id.to_string(),
-                thread.title.clone(),
-                thread.updated_at,
-            ),
-            HistoryEntry::TextThread(context) => (
-                context.path.to_string_lossy().to_string(),
-                context.title.clone(),
-                context.mtime.to_utc(),
-            ),
-        };
+        let id = self.entry.id();
+        let title = self.entry.title();
+        let timestamp = self.entry.updated_at();
 
         let formatted_time = {
             let now = chrono::Utc::now();
@@ -701,7 +692,7 @@ impl RenderOnce for AcpHistoryEntryElement {
             }
         };
 
-        ListItem::new(SharedString::from(id))
+        ListItem::new(id)
             .rounded()
             .toggle_state(self.selected)
             .spacing(ListItemSpacing::Sparse)
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f8c616c9e0..090e224b4d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2404,16 +2404,18 @@ impl AcpThreadView {
 
     fn render_empty_state(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
         let loading = matches!(&self.thread_state, ThreadState::Loading { .. });
-        let recent_history = self
-            .history_store
-            .update(cx, |history_store, cx| history_store.recent_entries(3, cx));
-        let no_history = self
-            .history_store
-            .update(cx, |history_store, cx| history_store.is_empty(cx));
+        let render_history = self
+            .agent
+            .clone()
+            .downcast::<agent2::NativeAgentServer>()
+            .is_some()
+            && self
+                .history_store
+                .update(cx, |history_store, cx| !history_store.is_empty(cx));
 
         v_flex()
             .size_full()
-            .when(no_history, |this| {
+            .when(!render_history, |this| {
                 this.child(
                     v_flex()
                         .size_full()
@@ -2445,7 +2447,10 @@ impl AcpThreadView {
                         })),
                 )
             })
-            .when(!no_history, |this| {
+            .when(render_history, |this| {
+                let recent_history = self
+                    .history_store
+                    .update(cx, |history_store, cx| history_store.recent_entries(3, cx));
                 this.justify_end().child(
                     v_flex()
                         .child(

From d9ea97ee9cf1bec19741c597e482aa35eef2f816 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 21 Aug 2025 08:44:04 -0600
Subject: [PATCH 260/823] acp: Detect gemini auth errors and show a button
 (#36641)

Closes #ISSUE

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 63 ++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 090e224b4d..7e330b7e6f 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -76,11 +76,12 @@ enum ThreadError {
     PaymentRequired,
     ModelRequestLimitReached(cloud_llm_client::Plan),
     ToolUseLimitReached,
+    AuthenticationRequired(SharedString),
     Other(SharedString),
 }
 
 impl ThreadError {
-    fn from_err(error: anyhow::Error) -> Self {
+    fn from_err(error: anyhow::Error, agent: &Rc<dyn AgentServer>) -> Self {
         if error.is::<language_model::PaymentRequiredError>() {
             Self::PaymentRequired
         } else if error.is::<language_model::ToolUseLimitReachedError>() {
@@ -90,7 +91,17 @@ impl ThreadError {
         {
             Self::ModelRequestLimitReached(error.plan)
         } else {
-            Self::Other(error.to_string().into())
+            let string = error.to_string();
+            // TODO: we should have Gemini return better errors here.
+            if agent.clone().downcast::<agent_servers::Gemini>().is_some()
+                && string.contains("Could not load the default credentials")
+                || string.contains("API key not valid")
+                || string.contains("Request had invalid authentication credentials")
+            {
+                Self::AuthenticationRequired(string.into())
+            } else {
+                Self::Other(error.to_string().into())
+            }
         }
     }
 }
@@ -930,7 +941,7 @@ impl AcpThreadView {
     }
 
     fn handle_thread_error(&mut self, error: anyhow::Error, cx: &mut Context<Self>) {
-        self.thread_error = Some(ThreadError::from_err(error));
+        self.thread_error = Some(ThreadError::from_err(error, &self.agent));
         cx.notify();
     }
 
@@ -4310,6 +4321,9 @@ impl AcpThreadView {
     fn render_thread_error(&self, window: &mut Window, cx: &mut Context<Self>) -> Option<Div> {
         let content = match self.thread_error.as_ref()? {
             ThreadError::Other(error) => self.render_any_thread_error(error.clone(), cx),
+            ThreadError::AuthenticationRequired(error) => {
+                self.render_authentication_required_error(error.clone(), cx)
+            }
             ThreadError::PaymentRequired => self.render_payment_required_error(cx),
             ThreadError::ModelRequestLimitReached(plan) => {
                 self.render_model_request_limit_reached_error(*plan, cx)
@@ -4348,6 +4362,24 @@ impl AcpThreadView {
             .dismiss_action(self.dismiss_error_button(cx))
     }
 
+    fn render_authentication_required_error(
+        &self,
+        error: SharedString,
+        cx: &mut Context<Self>,
+    ) -> Callout {
+        Callout::new()
+            .severity(Severity::Error)
+            .title("Authentication Required")
+            .description(error.clone())
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .child(self.authenticate_button(cx))
+                    .child(self.create_copy_button(error)),
+            )
+            .dismiss_action(self.dismiss_error_button(cx))
+    }
+
     fn render_model_request_limit_reached_error(
         &self,
         plan: cloud_llm_client::Plan,
@@ -4469,6 +4501,31 @@ impl AcpThreadView {
             }))
     }
 
+    fn authenticate_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        Button::new("authenticate", "Authenticate")
+            .label_size(LabelSize::Small)
+            .style(ButtonStyle::Filled)
+            .on_click(cx.listener({
+                move |this, _, window, cx| {
+                    let agent = this.agent.clone();
+                    let ThreadState::Ready { thread, .. } = &this.thread_state else {
+                        return;
+                    };
+
+                    let connection = thread.read(cx).connection().clone();
+                    let err = AuthRequired {
+                        description: None,
+                        provider_id: None,
+                    };
+                    this.clear_thread_error(cx);
+                    let this = cx.weak_entity();
+                    window.defer(cx, |window, cx| {
+                        Self::handle_auth_required(this, err, agent, connection, window, cx);
+                    })
+                }
+            }))
+    }
+
     fn upgrade_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
         Button::new("upgrade", "Upgrade")
             .label_size(LabelSize::Small)

From 697a39c2511469e49e8af1974618d552410b1c38 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 21 Aug 2025 20:19:17 +0530
Subject: [PATCH 261/823] Fix issue where renaming a file would not update
 imports in related files if they are not open (#36681)

Closes #34445

Now we open a multi-buffer consisting of buffers that have updated,
renamed file imports.

Only local is handled, for now.

Release Notes:

- Fixed an issue where renaming a file would not update imports in
related files if they are not already open.
---
 crates/editor/src/editor.rs        | 58 ++++++++++++++++++++++++++++--
 crates/project/src/buffer_store.rs | 11 +++++-
 crates/project/src/lsp_store.rs    | 18 ++++++----
 crates/project/src/project.rs      | 11 ++++--
 4 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 05ee295360..2af8e6c0e4 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1900,6 +1900,60 @@ impl Editor {
                             editor.update_lsp_data(false, Some(*buffer_id), window, cx);
                         }
                     }
+
+                    project::Event::EntryRenamed(transaction) => {
+                        let Some(workspace) = editor.workspace() else {
+                            return;
+                        };
+                        let Some(active_editor) = workspace.read(cx).active_item_as::<Self>(cx)
+                        else {
+                            return;
+                        };
+                        if active_editor.entity_id() == cx.entity_id() {
+                            let edited_buffers_already_open = {
+                                let other_editors: Vec<Entity<Editor>> = workspace
+                                    .read(cx)
+                                    .panes()
+                                    .iter()
+                                    .flat_map(|pane| pane.read(cx).items_of_type::<Editor>())
+                                    .filter(|editor| editor.entity_id() != cx.entity_id())
+                                    .collect();
+
+                                transaction.0.keys().all(|buffer| {
+                                    other_editors.iter().any(|editor| {
+                                        let multi_buffer = editor.read(cx).buffer();
+                                        multi_buffer.read(cx).is_singleton()
+                                            && multi_buffer.read(cx).as_singleton().map_or(
+                                                false,
+                                                |singleton| {
+                                                    singleton.entity_id() == buffer.entity_id()
+                                                },
+                                            )
+                                    })
+                                })
+                            };
+
+                            if !edited_buffers_already_open {
+                                let workspace = workspace.downgrade();
+                                let transaction = transaction.clone();
+                                cx.defer_in(window, move |_, window, cx| {
+                                    cx.spawn_in(window, async move |editor, cx| {
+                                        Self::open_project_transaction(
+                                            &editor,
+                                            workspace,
+                                            transaction,
+                                            "Rename".to_string(),
+                                            cx,
+                                        )
+                                        .await
+                                        .ok()
+                                    })
+                                    .detach();
+                                });
+                            }
+                        }
+                    }
+
                     _ => {}
                 },
             ));
@@ -6282,7 +6336,7 @@ impl Editor {
     }
 
     pub async fn open_project_transaction(
-        this: &WeakEntity<Editor>,
+        editor: &WeakEntity<Editor>,
         workspace: WeakEntity<Workspace>,
         transaction: ProjectTransaction,
         title: String,
@@ -6300,7 +6354,7 @@ impl Editor {
 
         if let Some((buffer, transaction)) = entries.first() {
             if entries.len() == 1 {
-                let excerpt = this.update(cx, |editor, cx| {
+                let excerpt = editor.update(cx, |editor, cx| {
                     editor
                         .buffer()
                         .read(cx)
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index a171b193d0..295bad6e59 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -88,9 +88,18 @@ pub enum BufferStoreEvent {
     },
 }
 
-#[derive(Default, Debug)]
+#[derive(Default, Debug, Clone)]
 pub struct ProjectTransaction(pub HashMap<Entity<Buffer>, language::Transaction>);
 
+impl PartialEq for ProjectTransaction {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.len() == other.0.len()
+            && self.0.iter().all(|(buffer, transaction)| {
+                other.0.get(buffer).is_some_and(|t| t.id == transaction.id)
+            })
+    }
+}
+
 impl EventEmitter<BufferStoreEvent> for BufferStore {}
 
 impl RemoteBufferStore {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 072f4396c1..709bd10358 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -8762,7 +8762,7 @@ impl LspStore {
             (root_path.join(&old_path), root_path.join(&new_path))
         };
 
-        Self::will_rename_entry(
+        let _transaction = Self::will_rename_entry(
             this.downgrade(),
             worktree_id,
             &old_abs_path,
@@ -9224,7 +9224,7 @@ impl LspStore {
         new_path: &Path,
         is_dir: bool,
         cx: AsyncApp,
-    ) -> Task<()> {
+    ) -> Task<ProjectTransaction> {
         let old_uri = lsp::Url::from_file_path(old_path).ok().map(String::from);
         let new_uri = lsp::Url::from_file_path(new_path).ok().map(String::from);
         cx.spawn(async move |cx| {
@@ -9257,7 +9257,7 @@ impl LspStore {
                                     .log_err()
                                     .flatten()?;
 
-                                LocalLspStore::deserialize_workspace_edit(
+                                let transaction = LocalLspStore::deserialize_workspace_edit(
                                     this.upgrade()?,
                                     edit,
                                     false,
@@ -9265,8 +9265,8 @@ impl LspStore {
                                     cx,
                                 )
                                 .await
-                                .ok();
-                                Some(())
+                                .ok()?;
+                                Some(transaction)
                             }
                         });
                         tasks.push(apply_edit);
@@ -9276,11 +9276,17 @@ impl LspStore {
             })
             .ok()
             .flatten();
+            let mut merged_transaction = ProjectTransaction::default();
             for task in tasks {
                 // Await on tasks sequentially so that the order of application of edits is deterministic
                 // (at least with regards to the order of registration of language servers)
-                task.await;
+                if let Some(transaction) = task.await {
+                    for (buffer, buffer_transaction) in transaction.0 {
+                        merged_transaction.0.insert(buffer, buffer_transaction);
+                    }
+                }
             }
+            merged_transaction
         })
     }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index ee4bfcb8cc..9fd4eed641 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -327,6 +327,7 @@ pub enum Event {
     RevealInProjectPanel(ProjectEntryId),
     SnippetEdit(BufferId, Vec<(lsp::Range, Snippet)>),
     ExpandedAllForEntry(WorktreeId, ProjectEntryId),
+    EntryRenamed(ProjectTransaction),
     AgentLocationChanged,
 }
 
@@ -2119,7 +2120,7 @@ impl Project {
         let is_root_entry = self.entry_is_worktree_root(entry_id, cx);
 
         let lsp_store = self.lsp_store().downgrade();
-        cx.spawn(async move |_, cx| {
+        cx.spawn(async move |project, cx| {
             let (old_abs_path, new_abs_path) = {
                 let root_path = worktree.read_with(cx, |this, _| this.abs_path())?;
                 let new_abs_path = if is_root_entry {
@@ -2129,7 +2130,7 @@ impl Project {
                 };
                 (root_path.join(&old_path), new_abs_path)
             };
-            LspStore::will_rename_entry(
+            let transaction = LspStore::will_rename_entry(
                 lsp_store.clone(),
                 worktree_id,
                 &old_abs_path,
@@ -2145,6 +2146,12 @@ impl Project {
                 })?
                 .await?;
 
+            project
+                .update(cx, |_, cx| {
+                    cx.emit(Event::EntryRenamed(transaction));
+                })
+                .ok();
+
             lsp_store
                 .read_with(cx, |this, _| {
                     this.did_rename_entry(worktree_id, &old_abs_path, &new_abs_path, is_dir);

From f23314bef4514f3208c712d8604278262b310e37 Mon Sep 17 00:00:00 2001
From: Ryan Drew <git@ry4n.me>
Date: Thu, 21 Aug 2025 08:55:43 -0600
Subject: [PATCH 262/823] editor: Use editorconfig's max_line_length for hard
 wrap (#36426)

PR #20198, "Do not alter soft wrap based on .editorconfig contents"
removed support for setting line lengths for both soft and hard wrap,
not just soft wrap. This causes the `max_line_length` property within a
`.editorconfig` file to be ignored by Zed. This commit restores allowing
for hard wrap limits to be set using `max_line_length` without impacting
soft wrap limits. This is done by merging the `max_line_length` property
from an editorconfig file into Zed's `preferred_line_length` property.

Release Notes:

- Added support for .editorconfig's `max_line_length` property

Signed-off-by: Ryan Drew <git@ry4n.me>
---
 crates/language/src/language_settings.rs |  7 ++++++-
 crates/project/src/project_tests.rs      | 11 ++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 90a59ce066..386ad19747 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use collections::{FxHashMap, HashMap, HashSet};
 use ec4rs::{
     Properties as EditorconfigProperties,
-    property::{FinalNewline, IndentSize, IndentStyle, TabWidth, TrimTrailingWs},
+    property::{FinalNewline, IndentSize, IndentStyle, MaxLineLen, TabWidth, TrimTrailingWs},
 };
 use globset::{Glob, GlobMatcher, GlobSet, GlobSetBuilder};
 use gpui::{App, Modifiers};
@@ -1131,6 +1131,10 @@ impl AllLanguageSettings {
 }
 
 fn merge_with_editorconfig(settings: &mut LanguageSettings, cfg: &EditorconfigProperties) {
+    let preferred_line_length = cfg.get::<MaxLineLen>().ok().and_then(|v| match v {
+        MaxLineLen::Value(u) => Some(u as u32),
+        MaxLineLen::Off => None,
+    });
     let tab_size = cfg.get::<IndentSize>().ok().and_then(|v| match v {
         IndentSize::Value(u) => NonZeroU32::new(u as u32),
         IndentSize::UseTabWidth => cfg.get::<TabWidth>().ok().and_then(|w| match w {
@@ -1158,6 +1162,7 @@ fn merge_with_editorconfig(settings: &mut LanguageSettings, cfg: &EditorconfigPr
             *target = value;
         }
     }
+    merge(&mut settings.preferred_line_length, preferred_line_length);
     merge(&mut settings.tab_size, tab_size);
     merge(&mut settings.hard_tabs, hard_tabs);
     merge(
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 282f1facc2..7bb1537be8 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -140,8 +140,10 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
             end_of_line = lf
             insert_final_newline = true
             trim_trailing_whitespace = true
+            max_line_length = 120
         [*.js]
             tab_width = 10
+            max_line_length = off
         "#,
         ".zed": {
             "settings.json": r#"{
@@ -149,7 +151,8 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
                 "hard_tabs": false,
                 "ensure_final_newline_on_save": false,
                 "remove_trailing_whitespace_on_save": false,
-                "soft_wrap": "editor_width"
+                "preferred_line_length": 64,
+                "soft_wrap": "editor_width",
             }"#,
         },
         "a.rs": "fn a() {\n    A\n}",
@@ -157,6 +160,7 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
             ".editorconfig": r#"
             [*.rs]
                 indent_size = 2
+                max_line_length = off,
             "#,
             "b.rs": "fn b() {\n    B\n}",
         },
@@ -205,6 +209,7 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
         assert_eq!(settings_a.hard_tabs, true);
         assert_eq!(settings_a.ensure_final_newline_on_save, true);
         assert_eq!(settings_a.remove_trailing_whitespace_on_save, true);
+        assert_eq!(settings_a.preferred_line_length, 120);
 
         // .editorconfig in b/ overrides .editorconfig in root
         assert_eq!(Some(settings_b.tab_size), NonZeroU32::new(2));
@@ -212,6 +217,10 @@ async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
         // "indent_size" is not set, so "tab_width" is used
         assert_eq!(Some(settings_c.tab_size), NonZeroU32::new(10));
 
+        // When max_line_length is "off", default to .zed/settings.json
+        assert_eq!(settings_b.preferred_line_length, 64);
+        assert_eq!(settings_c.preferred_line_length, 64);
+
         // README.md should not be affected by .editorconfig's globe "*.rs"
         assert_eq!(Some(settings_readme.tab_size), NonZeroU32::new(8));
     });

From 4bee06e507516d4a72501cb4fc2b9d30612f21d4 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Thu, 21 Aug 2025 11:57:46 -0300
Subject: [PATCH 263/823] acp: Use `ResourceLink` for agents that don't support
 embedded context (#36687)

The completion provider was already limiting the mention kinds according
to `acp::PromptCapabilities`. However, it was still using
`ContentBlock::EmbeddedResource` when
`acp::PromptCapabilities::embedded_context` was `false`. We will now use
`ResourceLink` in that case making it more complaint with the
specification.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/message_editor.rs | 91 ++++++++++++++++++++---
 1 file changed, 79 insertions(+), 12 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 3116a40be5..dc31c5fe10 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -709,9 +709,13 @@ impl MessageEditor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
-        let contents =
-            self.mention_set
-                .contents(&self.project, self.prompt_store.as_ref(), window, cx);
+        let contents = self.mention_set.contents(
+            &self.project,
+            self.prompt_store.as_ref(),
+            &self.prompt_capabilities.get(),
+            window,
+            cx,
+        );
         let editor = self.editor.clone();
         let prevent_slash_commands = self.prevent_slash_commands;
 
@@ -776,6 +780,17 @@ impl MessageEditor {
                                         .map(|path| format!("file://{}", path.display())),
                                 })
                             }
+                            Mention::UriOnly(uri) => {
+                                acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                                    name: uri.name(),
+                                    uri: uri.to_uri().to_string(),
+                                    annotations: None,
+                                    description: None,
+                                    mime_type: None,
+                                    size: None,
+                                    title: None,
+                                })
+                            }
                         };
                         chunks.push(chunk);
                         ix = crease_range.end;
@@ -1418,6 +1433,7 @@ pub enum Mention {
         tracked_buffers: Vec<Entity<Buffer>>,
     },
     Image(MentionImage),
+    UriOnly(MentionUri),
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -1481,9 +1497,20 @@ impl MentionSet {
         &self,
         project: &Entity<Project>,
         prompt_store: Option<&Entity<PromptStore>>,
+        prompt_capabilities: &acp::PromptCapabilities,
         _window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<HashMap<CreaseId, Mention>>> {
+        if !prompt_capabilities.embedded_context {
+            let mentions = self
+                .uri_by_crease_id
+                .iter()
+                .map(|(crease_id, uri)| (*crease_id, Mention::UriOnly(uri.clone())))
+                .collect();
+
+            return Task::ready(Ok(mentions));
+        }
+
         let mut processed_image_creases = HashSet::default();
 
         let mut contents = self
@@ -2180,11 +2207,21 @@ mod tests {
             assert_eq!(fold_ranges(editor, cx).len(), 1);
         });
 
+        let all_prompt_capabilities = acp::PromptCapabilities {
+            image: true,
+            audio: true,
+            embedded_context: true,
+        };
+
         let contents = message_editor
             .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor
-                    .mention_set()
-                    .contents(&project, None, window, cx)
+                message_editor.mention_set().contents(
+                    &project,
+                    None,
+                    &all_prompt_capabilities,
+                    window,
+                    cx,
+                )
             })
             .await
             .unwrap()
@@ -2199,6 +2236,28 @@ mod tests {
             pretty_assertions::assert_eq!(uri, &url_one.parse::<MentionUri>().unwrap());
         }
 
+        let contents = message_editor
+            .update_in(&mut cx, |message_editor, window, cx| {
+                message_editor.mention_set().contents(
+                    &project,
+                    None,
+                    &acp::PromptCapabilities::default(),
+                    window,
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .into_values()
+            .collect::<Vec<_>>();
+
+        {
+            let [Mention::UriOnly(uri)] = contents.as_slice() else {
+                panic!("Unexpected mentions");
+            };
+            pretty_assertions::assert_eq!(uri, &url_one.parse::<MentionUri>().unwrap());
+        }
+
         cx.simulate_input(" ");
 
         editor.update(&mut cx, |editor, cx| {
@@ -2234,9 +2293,13 @@ mod tests {
 
         let contents = message_editor
             .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor
-                    .mention_set()
-                    .contents(&project, None, window, cx)
+                message_editor.mention_set().contents(
+                    &project,
+                    None,
+                    &all_prompt_capabilities,
+                    window,
+                    cx,
+                )
             })
             .await
             .unwrap()
@@ -2344,9 +2407,13 @@ mod tests {
 
         let contents = message_editor
             .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor
-                    .mention_set()
-                    .contents(&project, None, window, cx)
+                message_editor.mention_set().contents(
+                    &project,
+                    None,
+                    &all_prompt_capabilities,
+                    window,
+                    cx,
+                )
             })
             .await
             .unwrap()

From 132daef9f669c1ffc27ff7344649b27090ea2163 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:52:17 +0200
Subject: [PATCH 264/823] lsp: Add basic test for server tree toolchain use
 (#36692)

Closes #ISSUE

Release Notes:

- N/A
---
 crates/language/src/toolchain.rs              |   2 +-
 crates/project/src/lsp_store.rs               |   2 -
 .../project/src/manifest_tree/server_tree.rs  |   2 +
 crates/project/src/project_tests.rs           | 260 +++++++++++++++++-
 4 files changed, 262 insertions(+), 4 deletions(-)

diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
index 979513bc96..73c142c8ca 100644
--- a/crates/language/src/toolchain.rs
+++ b/crates/language/src/toolchain.rs
@@ -96,7 +96,7 @@ impl<T: LocalLanguageToolchainStore> LanguageToolchainStore for T {
 }
 
 type DefaultIndex = usize;
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Debug)]
 pub struct ToolchainList {
     pub toolchains: Vec<Toolchain>,
     pub default: Option<DefaultIndex>,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 709bd10358..cc3a0a05bb 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -4643,7 +4643,6 @@ impl LspStore {
                     Some((file, language, raw_buffer.remote_id()))
                 })
                 .sorted_by_key(|(file, _, _)| Reverse(file.worktree.read(cx).is_visible()));
-
             for (file, language, buffer_id) in buffers {
                 let worktree_id = file.worktree_id(cx);
                 let Some(worktree) = local
@@ -4685,7 +4684,6 @@ impl LspStore {
                             cx,
                         )
                         .collect::<Vec<_>>();
-
                     for node in nodes {
                         let server_id = node.server_id_or_init(|disposition| {
                             let path = &disposition.path;
diff --git a/crates/project/src/manifest_tree/server_tree.rs b/crates/project/src/manifest_tree/server_tree.rs
index 5e5f4bab49..48e2007d47 100644
--- a/crates/project/src/manifest_tree/server_tree.rs
+++ b/crates/project/src/manifest_tree/server_tree.rs
@@ -181,6 +181,7 @@ impl LanguageServerTree {
                     &root_path.path,
                     language_name.clone(),
                 );
+
                 (
                     Arc::new(InnerTreeNode::new(
                         adapter.name(),
@@ -408,6 +409,7 @@ impl ServerTreeRebase {
                 if live_node.id.get().is_some() {
                     return Some(node);
                 }
+
                 let disposition = &live_node.disposition;
                 let Some((existing_node, _)) = self
                     .old_contents
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 7bb1537be8..6dcd07482e 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -4,6 +4,7 @@ use crate::{
     Event, git_store::StatusEntry, task_inventory::TaskContexts, task_store::TaskSettingsLocation,
     *,
 };
+use async_trait::async_trait;
 use buffer_diff::{
     BufferDiffEvent, CALCULATE_DIFF_TASK, DiffHunkSecondaryStatus, DiffHunkStatus,
     DiffHunkStatusKind, assert_hunks,
@@ -21,7 +22,8 @@ use http_client::Url;
 use itertools::Itertools;
 use language::{
     Diagnostic, DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, DiskState, FakeLspAdapter,
-    LanguageConfig, LanguageMatcher, LanguageName, LineEnding, OffsetRangeExt, Point, ToPoint,
+    LanguageConfig, LanguageMatcher, LanguageName, LineEnding, ManifestName, ManifestProvider,
+    ManifestQuery, OffsetRangeExt, Point, ToPoint, ToolchainLister,
     language_settings::{AllLanguageSettings, LanguageSettingsContent, language_settings},
     tree_sitter_rust, tree_sitter_typescript,
 };
@@ -596,6 +598,203 @@ async fn test_fallback_to_single_worktree_tasks(cx: &mut gpui::TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_running_multiple_instances_of_a_single_server_in_one_worktree(
+    cx: &mut gpui::TestAppContext,
+) {
+    pub(crate) struct PyprojectTomlManifestProvider;
+
+    impl ManifestProvider for PyprojectTomlManifestProvider {
+        fn name(&self) -> ManifestName {
+            SharedString::new_static("pyproject.toml").into()
+        }
+
+        fn search(
+            &self,
+            ManifestQuery {
+                path,
+                depth,
+                delegate,
+            }: ManifestQuery,
+        ) -> Option<Arc<Path>> {
+            for path in path.ancestors().take(depth) {
+                let p = path.join("pyproject.toml");
+                if delegate.exists(&p, Some(false)) {
+                    return Some(path.into());
+                }
+            }
+
+            None
+        }
+    }
+
+    init_test(cx);
+    let fs = FakeFs::new(cx.executor());
+
+    fs.insert_tree(
+        path!("/the-root"),
+        json!({
+            ".zed": {
+                "settings.json": r#"
+                {
+                    "languages": {
+                        "Python": {
+                            "language_servers": ["ty"]
+                        }
+                    }
+                }"#
+            },
+            "project-a": {
+                ".venv": {},
+                "file.py": "",
+                "pyproject.toml": ""
+            },
+            "project-b": {
+                ".venv": {},
+                "source_file.py":"",
+                "another_file.py": "",
+                "pyproject.toml": ""
+            }
+        }),
+    )
+    .await;
+    cx.update(|cx| {
+        ManifestProvidersStore::global(cx).register(Arc::new(PyprojectTomlManifestProvider))
+    });
+
+    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
+    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
+    let _fake_python_server = language_registry.register_fake_lsp(
+        "Python",
+        FakeLspAdapter {
+            name: "ty",
+            capabilities: lsp::ServerCapabilities {
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+    );
+
+    language_registry.add(python_lang(fs.clone()));
+    let (first_buffer, _handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/project-a/file.py"), cx)
+        })
+        .await
+        .unwrap();
+    cx.executor().run_until_parked();
+    let servers = project.update(cx, |project, cx| {
+        project.lsp_store.update(cx, |this, cx| {
+            first_buffer.update(cx, |buffer, cx| {
+                this.language_servers_for_local_buffer(buffer, cx)
+                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
+                    .collect::<Vec<_>>()
+            })
+        })
+    });
+    cx.executor().run_until_parked();
+    assert_eq!(servers.len(), 1);
+    let (adapter, server) = servers.into_iter().next().unwrap();
+    assert_eq!(adapter.name(), LanguageServerName::new_static("ty"));
+    assert_eq!(server.server_id(), LanguageServerId(0));
+    // `workspace_folders` are set to the rooting point.
+    assert_eq!(
+        server.workspace_folders(),
+        BTreeSet::from_iter(
+            [Url::from_file_path(path!("/the-root/project-a")).unwrap()].into_iter()
+        )
+    );
+
+    let (second_project_buffer, _other_handle) = project
+        .update(cx, |project, cx| {
+            project.open_local_buffer_with_lsp(path!("/the-root/project-b/source_file.py"), cx)
+        })
+        .await
+        .unwrap();
+    cx.executor().run_until_parked();
+    let servers = project.update(cx, |project, cx| {
+        project.lsp_store.update(cx, |this, cx| {
+            second_project_buffer.update(cx, |buffer, cx| {
+                this.language_servers_for_local_buffer(buffer, cx)
+                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
+                    .collect::<Vec<_>>()
+            })
+        })
+    });
+    cx.executor().run_until_parked();
+    assert_eq!(servers.len(), 1);
+    let (adapter, server) = servers.into_iter().next().unwrap();
+    assert_eq!(adapter.name(), LanguageServerName::new_static("ty"));
+    // We're not using venvs at all here, so both folders should fall under the same root.
+    assert_eq!(server.server_id(), LanguageServerId(0));
+    // Now, let's select a different toolchain for one of subprojects.
+    let (available_toolchains_for_b, root_path) = project
+        .update(cx, |this, cx| {
+            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
+            this.available_toolchains(
+                ProjectPath {
+                    worktree_id,
+                    path: Arc::from("project-b/source_file.py".as_ref()),
+                },
+                LanguageName::new("Python"),
+                cx,
+            )
+        })
+        .await
+        .expect("A toolchain to be discovered");
+    assert_eq!(root_path.as_ref(), Path::new("project-b"));
+    assert_eq!(available_toolchains_for_b.toolchains().len(), 1);
+    let currently_active_toolchain = project
+        .update(cx, |this, cx| {
+            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
+            this.active_toolchain(
+                ProjectPath {
+                    worktree_id,
+                    path: Arc::from("project-b/source_file.py".as_ref()),
+                },
+                LanguageName::new("Python"),
+                cx,
+            )
+        })
+        .await;
+
+    assert!(currently_active_toolchain.is_none());
+    let _ = project
+        .update(cx, |this, cx| {
+            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
+            this.activate_toolchain(
+                ProjectPath {
+                    worktree_id,
+                    path: root_path,
+                },
+                available_toolchains_for_b
+                    .toolchains
+                    .into_iter()
+                    .next()
+                    .unwrap(),
+                cx,
+            )
+        })
+        .await
+        .unwrap();
+    cx.run_until_parked();
+    let servers = project.update(cx, |project, cx| {
+        project.lsp_store.update(cx, |this, cx| {
+            second_project_buffer.update(cx, |buffer, cx| {
+                this.language_servers_for_local_buffer(buffer, cx)
+                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
+                    .collect::<Vec<_>>()
+            })
+        })
+    });
+    cx.executor().run_until_parked();
+    assert_eq!(servers.len(), 1);
+    let (adapter, server) = servers.into_iter().next().unwrap();
+    assert_eq!(adapter.name(), LanguageServerName::new_static("ty"));
+    // There's a new language server in town.
+    assert_eq!(server.server_id(), LanguageServerId(1));
+}
+
 #[gpui::test]
 async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
     init_test(cx);
@@ -8982,6 +9181,65 @@ fn rust_lang() -> Arc<Language> {
     ))
 }
 
+fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
+    struct PythonMootToolchainLister(Arc<FakeFs>);
+    #[async_trait]
+    impl ToolchainLister for PythonMootToolchainLister {
+        async fn list(
+            &self,
+            worktree_root: PathBuf,
+            subroot_relative_path: Option<Arc<Path>>,
+            _: Option<HashMap<String, String>>,
+        ) -> ToolchainList {
+            // This lister will always return a path .venv directories within ancestors
+            let ancestors = subroot_relative_path
+                .into_iter()
+                .flat_map(|path| path.ancestors().map(ToOwned::to_owned).collect::<Vec<_>>());
+            let mut toolchains = vec![];
+            for ancestor in ancestors {
+                let venv_path = worktree_root.join(ancestor).join(".venv");
+                if self.0.is_dir(&venv_path).await {
+                    toolchains.push(Toolchain {
+                        name: SharedString::new("Python Venv"),
+                        path: venv_path.to_string_lossy().into_owned().into(),
+                        language_name: LanguageName(SharedString::new_static("Python")),
+                        as_json: serde_json::Value::Null,
+                    })
+                }
+            }
+            ToolchainList {
+                toolchains,
+                ..Default::default()
+            }
+        }
+        // Returns a term which we should use in UI to refer to a toolchain.
+        fn term(&self) -> SharedString {
+            SharedString::new_static("virtual environment")
+        }
+        /// Returns the name of the manifest file for this toolchain.
+        fn manifest_name(&self) -> ManifestName {
+            SharedString::new_static("pyproject.toml").into()
+        }
+    }
+    Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "Python".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["py".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            None, // We're not testing Python parsing with this language.
+        )
+        .with_manifest(Some(ManifestName::from(SharedString::new_static(
+            "pyproject.toml",
+        ))))
+        .with_toolchain_lister(Some(Arc::new(PythonMootToolchainLister(fs)))),
+    )
+}
+
 fn typescript_lang() -> Arc<Language> {
     Arc::new(Language::new(
         LanguageConfig {

From 190217a43bfc2384ec3cd86d82d0ffd3975b0901 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 21 Aug 2025 18:11:05 +0200
Subject: [PATCH 265/823] acp: Refactor agent2 `send` to have a clearer control
 flow (#36689)

Release Notes:

- N/A
---
 Cargo.lock                  |   1 +
 crates/agent2/Cargo.toml    |   1 +
 crates/agent2/src/thread.rs | 295 ++++++++++++++++--------------------
 3 files changed, 134 insertions(+), 163 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ddeaebd0bf..6063530e9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,6 +244,7 @@ dependencies = [
  "terminal",
  "text",
  "theme",
+ "thiserror 2.0.12",
  "tree-sitter-rust",
  "ui",
  "unindent",
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 8dd79062f8..68246a96b0 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -61,6 +61,7 @@ sqlez.workspace = true
 task.workspace = true
 telemetry.workspace = true
 terminal.workspace = true
+thiserror.workspace = true
 text.workspace = true
 ui.workspace = true
 util.workspace = true
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index d34c929152..6f560cd390 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -499,6 +499,16 @@ pub struct ToolCallAuthorization {
     pub response: oneshot::Sender<acp::PermissionOptionId>,
 }
 
+#[derive(Debug, thiserror::Error)]
+enum CompletionError {
+    #[error("max tokens")]
+    MaxTokens,
+    #[error("refusal")]
+    Refusal,
+    #[error(transparent)]
+    Other(#[from] anyhow::Error),
+}
+
 pub struct Thread {
     id: acp::SessionId,
     prompt_id: PromptId,
@@ -1077,101 +1087,62 @@ impl Thread {
             _task: cx.spawn(async move |this, cx| {
                 log::info!("Starting agent turn execution");
                 let mut update_title = None;
-                let turn_result: Result<StopReason> = async {
-                    let mut completion_intent = CompletionIntent::UserPrompt;
+                let turn_result: Result<()> = async {
+                    let mut intent = CompletionIntent::UserPrompt;
                     loop {
-                        log::debug!(
-                            "Building completion request with intent: {:?}",
-                            completion_intent
-                        );
-                        let request = this.update(cx, |this, cx| {
-                            this.build_completion_request(completion_intent, cx)
-                        })??;
-
-                        log::info!("Calling model.stream_completion");
-
-                        let mut tool_use_limit_reached = false;
-                        let mut refused = false;
-                        let mut reached_max_tokens = false;
-                        let mut tool_uses = Self::stream_completion_with_retries(
-                            this.clone(),
-                            model.clone(),
-                            request,
-                            &event_stream,
-                            &mut tool_use_limit_reached,
-                            &mut refused,
-                            &mut reached_max_tokens,
-                            cx,
-                        )
-                        .await?;
-
-                        if refused {
-                            return Ok(StopReason::Refusal);
-                        } else if reached_max_tokens {
-                            return Ok(StopReason::MaxTokens);
-                        }
-
-                        let end_turn = tool_uses.is_empty();
-                        while let Some(tool_result) = tool_uses.next().await {
-                            log::info!("Tool finished {:?}", tool_result);
-
-                            event_stream.update_tool_call_fields(
-                                &tool_result.tool_use_id,
-                                acp::ToolCallUpdateFields {
-                                    status: Some(if tool_result.is_error {
-                                        acp::ToolCallStatus::Failed
-                                    } else {
-                                        acp::ToolCallStatus::Completed
-                                    }),
-                                    raw_output: tool_result.output.clone(),
-                                    ..Default::default()
-                                },
-                            );
-                            this.update(cx, |this, _cx| {
-                                this.pending_message()
-                                    .tool_results
-                                    .insert(tool_result.tool_use_id.clone(), tool_result);
-                            })?;
-                        }
+                        Self::stream_completion(&this, &model, intent, &event_stream, cx).await?;
 
+                        let mut end_turn = true;
                         this.update(cx, |this, cx| {
+                            // Generate title if needed.
                             if this.title.is_none() && update_title.is_none() {
                                 update_title = Some(this.update_title(&event_stream, cx));
                             }
+
+                            // End the turn if the model didn't use tools.
+                            let message = this.pending_message.as_ref();
+                            end_turn =
+                                message.map_or(true, |message| message.tool_results.is_empty());
+                            this.flush_pending_message(cx);
                         })?;
 
-                        if tool_use_limit_reached {
+                        if this.read_with(cx, |this, _| this.tool_use_limit_reached)? {
                             log::info!("Tool use limit reached, completing turn");
-                            this.update(cx, |this, _cx| this.tool_use_limit_reached = true)?;
                             return Err(language_model::ToolUseLimitReachedError.into());
                         } else if end_turn {
                             log::info!("No tool uses found, completing turn");
-                            return Ok(StopReason::EndTurn);
+                            return Ok(());
                         } else {
-                            this.update(cx, |this, cx| this.flush_pending_message(cx))?;
-                            completion_intent = CompletionIntent::ToolResults;
+                            intent = CompletionIntent::ToolResults;
                         }
                     }
                 }
                 .await;
                 _ = this.update(cx, |this, cx| this.flush_pending_message(cx));
 
+                if let Some(update_title) = update_title {
+                    update_title.await.context("update title failed").log_err();
+                }
+
                 match turn_result {
-                    Ok(reason) => {
-                        log::info!("Turn execution completed: {:?}", reason);
-
-                        if let Some(update_title) = update_title {
-                            update_title.await.context("update title failed").log_err();
-                        }
-
-                        event_stream.send_stop(reason);
-                        if reason == StopReason::Refusal {
-                            _ = this.update(cx, |this, _| this.messages.truncate(message_ix));
-                        }
+                    Ok(()) => {
+                        log::info!("Turn execution completed");
+                        event_stream.send_stop(acp::StopReason::EndTurn);
                     }
                     Err(error) => {
                         log::error!("Turn execution failed: {:?}", error);
-                        event_stream.send_error(error);
+                        match error.downcast::<CompletionError>() {
+                            Ok(CompletionError::Refusal) => {
+                                event_stream.send_stop(acp::StopReason::Refusal);
+                                _ = this.update(cx, |this, _| this.messages.truncate(message_ix));
+                            }
+                            Ok(CompletionError::MaxTokens) => {
+                                event_stream.send_stop(acp::StopReason::MaxTokens);
+                            }
+                            Ok(CompletionError::Other(error)) | Err(error) => {
+                                event_stream.send_error(error);
+                            }
+                        }
                     }
                 }
 
@@ -1181,17 +1152,17 @@ impl Thread {
         Ok(events_rx)
     }
 
-    async fn stream_completion_with_retries(
-        this: WeakEntity<Self>,
-        model: Arc<dyn LanguageModel>,
-        request: LanguageModelRequest,
+    async fn stream_completion(
+        this: &WeakEntity<Self>,
+        model: &Arc<dyn LanguageModel>,
+        completion_intent: CompletionIntent,
         event_stream: &ThreadEventStream,
-        tool_use_limit_reached: &mut bool,
-        refusal: &mut bool,
-        max_tokens_reached: &mut bool,
         cx: &mut AsyncApp,
-    ) -> Result<FuturesUnordered<Task<LanguageModelToolResult>>> {
+    ) -> Result<()> {
         log::debug!("Stream completion started successfully");
+        let request = this.update(cx, |this, cx| {
+            this.build_completion_request(completion_intent, cx)
+        })??;
 
         let mut attempt = None;
         'retry: loop {
@@ -1204,68 +1175,33 @@ impl Thread {
                 attempt
             );
 
-            let mut events = model.stream_completion(request.clone(), cx).await?;
-            let mut tool_uses = FuturesUnordered::new();
+            log::info!(
+                "Calling model.stream_completion, attempt {}",
+                attempt.unwrap_or(0)
+            );
+            let mut events = model
+                .stream_completion(request.clone(), cx)
+                .await
+                .map_err(|error| anyhow!(error))?;
+            let mut tool_results = FuturesUnordered::new();
+
             while let Some(event) = events.next().await {
                 match event {
-                    Ok(LanguageModelCompletionEvent::StatusUpdate(
-                        CompletionRequestStatus::ToolUseLimitReached,
-                    )) => {
-                        *tool_use_limit_reached = true;
-                    }
-                    Ok(LanguageModelCompletionEvent::StatusUpdate(
-                        CompletionRequestStatus::UsageUpdated { amount, limit },
-                    )) => {
-                        this.update(cx, |this, cx| {
-                            this.update_model_request_usage(amount, limit, cx)
-                        })?;
-                    }
-                    Ok(LanguageModelCompletionEvent::UsageUpdate(usage)) => {
-                        telemetry::event!(
-                            "Agent Thread Completion Usage Updated",
-                            thread_id = this.read_with(cx, |this, _| this.id.to_string())?,
-                            prompt_id = this.read_with(cx, |this, _| this.prompt_id.to_string())?,
-                            model = model.telemetry_id(),
-                            model_provider = model.provider_id().to_string(),
-                            attempt,
-                            input_tokens = usage.input_tokens,
-                            output_tokens = usage.output_tokens,
-                            cache_creation_input_tokens = usage.cache_creation_input_tokens,
-                            cache_read_input_tokens = usage.cache_read_input_tokens,
-                        );
-
-                        this.update(cx, |this, cx| this.update_token_usage(usage, cx))?;
-                    }
-                    Ok(LanguageModelCompletionEvent::Stop(StopReason::Refusal)) => {
-                        *refusal = true;
-                        return Ok(FuturesUnordered::default());
-                    }
-                    Ok(LanguageModelCompletionEvent::Stop(StopReason::MaxTokens)) => {
-                        *max_tokens_reached = true;
-                        return Ok(FuturesUnordered::default());
-                    }
-                    Ok(LanguageModelCompletionEvent::Stop(
-                        StopReason::ToolUse | StopReason::EndTurn,
-                    )) => break,
                     Ok(event) => {
                         log::trace!("Received completion event: {:?}", event);
-                        this.update(cx, |this, cx| {
-                            tool_uses.extend(this.handle_streamed_completion_event(
-                                event,
-                                event_stream,
-                                cx,
-                            ));
-                        })?;
+                        tool_results.extend(this.update(cx, |this, cx| {
+                            this.handle_streamed_completion_event(event, event_stream, cx)
+                        })??);
                     }
                     Err(error) => {
                         let completion_mode =
                             this.read_with(cx, |thread, _cx| thread.completion_mode())?;
                         if completion_mode == CompletionMode::Normal {
-                            return Err(error.into());
+                            return Err(anyhow!(error))?;
                         }
 
                         let Some(strategy) = Self::retry_strategy_for(&error) else {
-                            return Err(error.into());
+                            return Err(anyhow!(error))?;
                         };
 
                         let max_attempts = match &strategy {
@@ -1279,7 +1215,7 @@ impl Thread {
 
                         let attempt = *attempt;
                         if attempt > max_attempts {
-                            return Err(error.into());
+                            return Err(anyhow!(error))?;
                         }
 
                         let delay = match &strategy {
@@ -1306,7 +1242,29 @@ impl Thread {
                 }
             }
 
-            return Ok(tool_uses);
+            while let Some(tool_result) = tool_results.next().await {
+                log::info!("Tool finished {:?}", tool_result);
+
+                event_stream.update_tool_call_fields(
+                    &tool_result.tool_use_id,
+                    acp::ToolCallUpdateFields {
+                        status: Some(if tool_result.is_error {
+                            acp::ToolCallStatus::Failed
+                        } else {
+                            acp::ToolCallStatus::Completed
+                        }),
+                        raw_output: tool_result.output.clone(),
+                        ..Default::default()
+                    },
+                );
+                this.update(cx, |this, _cx| {
+                    this.pending_message()
+                        .tool_results
+                        .insert(tool_result.tool_use_id.clone(), tool_result);
+                })?;
+            }
+
+            return Ok(());
         }
     }
 
@@ -1328,14 +1286,14 @@ impl Thread {
     }
 
     /// A helper method that's called on every streamed completion event.
-    /// Returns an optional tool result task, which the main agentic loop in
-    /// send will send back to the model when it resolves.
+    /// Returns an optional tool result task, which the main agentic loop will
+    /// send back to the model when it resolves.
     fn handle_streamed_completion_event(
         &mut self,
         event: LanguageModelCompletionEvent,
         event_stream: &ThreadEventStream,
         cx: &mut Context<Self>,
-    ) -> Option<Task<LanguageModelToolResult>> {
+    ) -> Result<Option<Task<LanguageModelToolResult>>> {
         log::trace!("Handling streamed completion event: {:?}", event);
         use LanguageModelCompletionEvent::*;
 
@@ -1350,7 +1308,7 @@ impl Thread {
             }
             RedactedThinking { data } => self.handle_redacted_thinking_event(data, cx),
             ToolUse(tool_use) => {
-                return self.handle_tool_use_event(tool_use, event_stream, cx);
+                return Ok(self.handle_tool_use_event(tool_use, event_stream, cx));
             }
             ToolUseJsonParseError {
                 id,
@@ -1358,18 +1316,46 @@ impl Thread {
                 raw_input,
                 json_parse_error,
             } => {
-                return Some(Task::ready(self.handle_tool_use_json_parse_error_event(
-                    id,
-                    tool_name,
-                    raw_input,
-                    json_parse_error,
+                return Ok(Some(Task::ready(
+                    self.handle_tool_use_json_parse_error_event(
+                        id,
+                        tool_name,
+                        raw_input,
+                        json_parse_error,
+                    ),
                 )));
             }
-            StatusUpdate(_) => {}
-            UsageUpdate(_) | Stop(_) => unreachable!(),
+            UsageUpdate(usage) => {
+                telemetry::event!(
+                    "Agent Thread Completion Usage Updated",
+                    thread_id = self.id.to_string(),
+                    prompt_id = self.prompt_id.to_string(),
+                    model = self.model.as_ref().map(|m| m.telemetry_id()),
+                    model_provider = self.model.as_ref().map(|m| m.provider_id().to_string()),
+                    input_tokens = usage.input_tokens,
+                    output_tokens = usage.output_tokens,
+                    cache_creation_input_tokens = usage.cache_creation_input_tokens,
+                    cache_read_input_tokens = usage.cache_read_input_tokens,
+                );
+                self.update_token_usage(usage, cx);
+            }
+            StatusUpdate(CompletionRequestStatus::UsageUpdated { amount, limit }) => {
+                self.update_model_request_usage(amount, limit, cx);
+            }
+            StatusUpdate(
+                CompletionRequestStatus::Started
+                | CompletionRequestStatus::Queued { .. }
+                | CompletionRequestStatus::Failed { .. },
+            ) => {}
+            StatusUpdate(CompletionRequestStatus::ToolUseLimitReached) => {
+                self.tool_use_limit_reached = true;
+            }
+            Stop(StopReason::Refusal) => return Err(CompletionError::Refusal.into()),
+            Stop(StopReason::MaxTokens) => return Err(CompletionError::MaxTokens.into()),
+            Stop(StopReason::ToolUse | StopReason::EndTurn) => {}
         }
 
-        None
+        Ok(None)
     }
 
     fn handle_text_event(
@@ -2225,25 +2211,8 @@ impl ThreadEventStream {
         self.0.unbounded_send(Ok(ThreadEvent::Retry(status))).ok();
     }
 
-    fn send_stop(&self, reason: StopReason) {
-        match reason {
-            StopReason::EndTurn => {
-                self.0
-                    .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::EndTurn)))
-                    .ok();
-            }
-            StopReason::MaxTokens => {
-                self.0
-                    .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::MaxTokens)))
-                    .ok();
-            }
-            StopReason::Refusal => {
-                self.0
-                    .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Refusal)))
-                    .ok();
-            }
-            StopReason::ToolUse => {}
-        }
+    fn send_stop(&self, reason: acp::StopReason) {
+        self.0.unbounded_send(Ok(ThreadEvent::Stop(reason))).ok();
     }
 
     fn send_canceled(&self) {

From 6f32d36ec95f973b6d7866f28d4c4310f4f9f4f9 Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 21 Aug 2025 12:03:30 -0500
Subject: [PATCH 266/823] Upload telemetry event on crashes (#36695)

This will let us track crashes-per-launch using the new minidump-based
crash reporting.

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
---
 crates/zed/src/reliability.rs | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index f55468280c..646a3af5bb 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -251,6 +251,7 @@ pub fn init(
                             endpoint,
                             minidump_contents,
                             &metadata,
+                            installation_id.clone(),
                         )
                         .await
                         .log_err();
@@ -478,7 +479,9 @@ fn upload_panics_and_crashes(
         return;
     }
     cx.background_spawn(async move {
-        upload_previous_minidumps(http.clone()).await.warn_on_err();
+        upload_previous_minidumps(http.clone(), installation_id.clone())
+            .await
+            .warn_on_err();
         let most_recent_panic = upload_previous_panics(http.clone(), &panic_report_url)
             .await
             .log_err()
@@ -546,7 +549,10 @@ async fn upload_previous_panics(
     Ok(most_recent_panic)
 }
 
-pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::Result<()> {
+pub async fn upload_previous_minidumps(
+    http: Arc<HttpClientWithUrl>,
+    installation_id: Option<String>,
+) -> anyhow::Result<()> {
     let Some(minidump_endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
         log::warn!("Minidump endpoint not set");
         return Ok(());
@@ -569,6 +575,7 @@ pub async fn upload_previous_minidumps(http: Arc<HttpClientWithUrl>) -> anyhow::
                     .await
                     .context("Failed to read minidump")?,
                 &metadata,
+                installation_id.clone(),
             )
             .await
             .log_err()
@@ -586,6 +593,7 @@ async fn upload_minidump(
     endpoint: &str,
     minidump: Vec<u8>,
     metadata: &crashes::CrashInfo,
+    installation_id: Option<String>,
 ) -> Result<()> {
     let mut form = Form::new()
         .part(
@@ -601,7 +609,9 @@ async fn upload_minidump(
         .text("sentry[tags][version]", metadata.init.zed_version.clone())
         .text("sentry[release]", metadata.init.commit_sha.clone())
         .text("platform", "rust");
+    let mut panic_message = "".to_owned();
     if let Some(panic_info) = metadata.panic.as_ref() {
+        panic_message = panic_info.message.clone();
         form = form.text("sentry[logentry][formatted]", panic_info.message.clone());
         form = form.text("span", panic_info.span.clone());
         // TODO: add gpu-context, feature-flag-context, and more of device-context like gpu
@@ -610,6 +620,16 @@ async fn upload_minidump(
     if let Some(minidump_error) = metadata.minidump_error.clone() {
         form = form.text("minidump_error", minidump_error);
     }
+    if let Some(id) = installation_id.clone() {
+        form = form.text("sentry[user][id]", id)
+    }
+
+    ::telemetry::event!(
+        "Minidump Uploaded",
+        panic_message = panic_message,
+        crashed_version = metadata.init.zed_version.clone(),
+        commit_sha = metadata.init.commit_sha.clone(),
+    );
 
     let mut response_text = String::new();
     let mut response = http.send_multipart_form(endpoint, form).await?;

From b284b1a0b86715d9ac945034f6923f2551ce630b Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 21 Aug 2025 19:08:26 +0200
Subject: [PATCH 267/823] remote: Fetch shell on ssh remote to use for
 preparing commands (#36690)

Prerequisite for https://github.com/zed-industries/zed/pull/36576 to
allow us to differentiate the shell in a remote.

Release Notes:

- N/A
---
 crates/debugger_ui/src/session/running.rs     |  7 ++-
 crates/project/src/debugger/dap_store.rs      | 13 +++--
 crates/project/src/debugger/locators/cargo.rs |  4 +-
 crates/project/src/terminals.rs               | 36 ++++++++-----
 crates/remote/src/remote.rs                   |  4 +-
 crates/remote/src/ssh_session.rs              | 38 ++++++++++++-
 crates/task/src/shell_builder.rs              | 54 +++++++++++--------
 crates/task/src/task.rs                       |  2 +-
 crates/terminal_view/src/terminal_panel.rs    | 13 +++--
 crates/util/src/paths.rs                      |  2 +-
 10 files changed, 121 insertions(+), 52 deletions(-)

diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 0574091851..9991395f35 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -916,7 +916,10 @@ impl RunningState {
         let task_store = project.read(cx).task_store().downgrade();
         let weak_project = project.downgrade();
         let weak_workspace = workspace.downgrade();
-        let is_local = project.read(cx).is_local();
+        let ssh_info = project
+            .read(cx)
+            .ssh_client()
+            .and_then(|it| it.read(cx).ssh_info());
 
         cx.spawn_in(window, async move |this, cx| {
             let DebugScenario {
@@ -1000,7 +1003,7 @@ impl RunningState {
                     None
                 };
 
-                let builder = ShellBuilder::new(is_local, &task.resolved.shell);
+                let builder = ShellBuilder::new(ssh_info.as_ref().map(|info| &*info.shell), &task.resolved.shell);
                 let command_label = builder.command_label(&task.resolved.command_label);
                 let (command, args) =
                     builder.build(task.resolved.command.clone(), &task.resolved.args);
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index 834bf2c2d2..2906c32ff4 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -34,7 +34,7 @@ use http_client::HttpClient;
 use language::{Buffer, LanguageToolchainStore, language_settings::InlayHintKind};
 use node_runtime::NodeRuntime;
 
-use remote::{SshRemoteClient, ssh_session::SshArgs};
+use remote::{SshInfo, SshRemoteClient, ssh_session::SshArgs};
 use rpc::{
     AnyProtoClient, TypedEnvelope,
     proto::{self},
@@ -254,14 +254,18 @@ impl DapStore {
                 cx.spawn(async move |_, cx| {
                     let response = request.await?;
                     let binary = DebugAdapterBinary::from_proto(response)?;
-                    let (mut ssh_command, envs, path_style) =
+                    let (mut ssh_command, envs, path_style, ssh_shell) =
                         ssh_client.read_with(cx, |ssh, _| {
-                            let (SshArgs { arguments, envs }, path_style) =
-                                ssh.ssh_info().context("SSH arguments not found")?;
+                            let SshInfo {
+                                args: SshArgs { arguments, envs },
+                                path_style,
+                                shell,
+                            } = ssh.ssh_info().context("SSH arguments not found")?;
                             anyhow::Ok((
                                 SshCommand { arguments },
                                 envs.unwrap_or_default(),
                                 path_style,
+                                shell,
                             ))
                         })??;
 
@@ -280,6 +284,7 @@ impl DapStore {
                     }
 
                     let (program, args) = wrap_for_ssh(
+                        &ssh_shell,
                         &ssh_command,
                         binary
                             .command
diff --git a/crates/project/src/debugger/locators/cargo.rs b/crates/project/src/debugger/locators/cargo.rs
index 3e28fac8af..b2f9580f9c 100644
--- a/crates/project/src/debugger/locators/cargo.rs
+++ b/crates/project/src/debugger/locators/cargo.rs
@@ -117,7 +117,7 @@ impl DapLocator for CargoLocator {
             .cwd
             .clone()
             .context("Couldn't get cwd from debug config which is needed for locators")?;
-        let builder = ShellBuilder::new(true, &build_config.shell).non_interactive();
+        let builder = ShellBuilder::new(None, &build_config.shell).non_interactive();
         let (program, args) = builder.build(
             Some("cargo".into()),
             &build_config
@@ -126,7 +126,7 @@ impl DapLocator for CargoLocator {
                 .cloned()
                 .take_while(|arg| arg != "--")
                 .chain(Some("--message-format=json".to_owned()))
-                .collect(),
+                .collect::<Vec<_>>(),
         );
         let mut child = util::command::new_smol_command(program)
             .args(args)
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index e9582e73fd..b009b357fe 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -4,7 +4,7 @@ use collections::HashMap;
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity};
 use itertools::Itertools;
 use language::LanguageName;
-use remote::ssh_session::SshArgs;
+use remote::{SshInfo, ssh_session::SshArgs};
 use settings::{Settings, SettingsLocation};
 use smol::channel::bounded;
 use std::{
@@ -13,7 +13,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use task::{DEFAULT_REMOTE_SHELL, Shell, ShellBuilder, SpawnInTerminal};
+use task::{Shell, ShellBuilder, SpawnInTerminal};
 use terminal::{
     TaskState, TaskStatus, Terminal, TerminalBuilder,
     terminal_settings::{self, ActivateScript, TerminalSettings, VenvSettings},
@@ -58,11 +58,13 @@ impl SshCommand {
     }
 }
 
+#[derive(Debug)]
 pub struct SshDetails {
     pub host: String,
     pub ssh_command: SshCommand,
     pub envs: Option<HashMap<String, String>>,
     pub path_style: PathStyle,
+    pub shell: String,
 }
 
 impl Project {
@@ -87,12 +89,18 @@ impl Project {
     pub fn ssh_details(&self, cx: &App) -> Option<SshDetails> {
         if let Some(ssh_client) = &self.ssh_client {
             let ssh_client = ssh_client.read(cx);
-            if let Some((SshArgs { arguments, envs }, path_style)) = ssh_client.ssh_info() {
+            if let Some(SshInfo {
+                args: SshArgs { arguments, envs },
+                path_style,
+                shell,
+            }) = ssh_client.ssh_info()
+            {
                 return Some(SshDetails {
                     host: ssh_client.connection_options().host,
                     ssh_command: SshCommand { arguments },
                     envs,
                     path_style,
+                    shell,
                 });
             }
         }
@@ -165,7 +173,9 @@ impl Project {
         let ssh_details = self.ssh_details(cx);
         let settings = self.terminal_settings(&path, cx).clone();
 
-        let builder = ShellBuilder::new(ssh_details.is_none(), &settings.shell).non_interactive();
+        let builder =
+            ShellBuilder::new(ssh_details.as_ref().map(|ssh| &*ssh.shell), &settings.shell)
+                .non_interactive();
         let (command, args) = builder.build(Some(command), &Vec::new());
 
         let mut env = self
@@ -180,9 +190,11 @@ impl Project {
                 ssh_command,
                 envs,
                 path_style,
+                shell,
                 ..
             }) => {
                 let (command, args) = wrap_for_ssh(
+                    &shell,
                     &ssh_command,
                     Some((&command, &args)),
                     path.as_deref(),
@@ -280,6 +292,7 @@ impl Project {
                         ssh_command,
                         envs,
                         path_style,
+                        shell,
                     }) => {
                         log::debug!("Connecting to a remote server: {ssh_command:?}");
 
@@ -291,6 +304,7 @@ impl Project {
                             .or_insert_with(|| "xterm-256color".to_string());
 
                         let (program, args) = wrap_for_ssh(
+                            &shell,
                             &ssh_command,
                             None,
                             path.as_deref(),
@@ -343,11 +357,13 @@ impl Project {
                         ssh_command,
                         envs,
                         path_style,
+                        shell,
                     }) => {
                         log::debug!("Connecting to a remote server: {ssh_command:?}");
                         env.entry("TERM".to_string())
                             .or_insert_with(|| "xterm-256color".to_string());
                         let (program, args) = wrap_for_ssh(
+                            &shell,
                             &ssh_command,
                             spawn_task
                                 .command
@@ -637,6 +653,7 @@ impl Project {
 }
 
 pub fn wrap_for_ssh(
+    shell: &str,
     ssh_command: &SshCommand,
     command: Option<(&String, &Vec<String>)>,
     path: Option<&Path>,
@@ -645,16 +662,11 @@ pub fn wrap_for_ssh(
     path_style: PathStyle,
 ) -> (String, Vec<String>) {
     let to_run = if let Some((command, args)) = command {
-        // DEFAULT_REMOTE_SHELL is '"${SHELL:-sh}"' so must not be escaped
-        let command: Option<Cow<str>> = if command == DEFAULT_REMOTE_SHELL {
-            Some(command.into())
-        } else {
-            shlex::try_quote(command).ok()
-        };
+        let command: Option<Cow<str>> = shlex::try_quote(command).ok();
         let args = args.iter().filter_map(|arg| shlex::try_quote(arg).ok());
         command.into_iter().chain(args).join(" ")
     } else {
-        "exec ${SHELL:-sh} -l".to_string()
+        format!("exec {shell} -l")
     };
 
     let mut env_changes = String::new();
@@ -688,7 +700,7 @@ pub fn wrap_for_ssh(
     } else {
         format!("cd; {env_changes} {to_run}")
     };
-    let shell_invocation = format!("sh -c {}", shlex::try_quote(&commands).unwrap());
+    let shell_invocation = format!("{shell} -c {}", shlex::try_quote(&commands).unwrap());
 
     let program = "ssh".to_string();
     let mut args = ssh_command.arguments.clone();
diff --git a/crates/remote/src/remote.rs b/crates/remote/src/remote.rs
index 43eb59c0ae..71895f1678 100644
--- a/crates/remote/src/remote.rs
+++ b/crates/remote/src/remote.rs
@@ -4,6 +4,6 @@ pub mod proxy;
 pub mod ssh_session;
 
 pub use ssh_session::{
-    ConnectionState, SshClientDelegate, SshConnectionOptions, SshPlatform, SshRemoteClient,
-    SshRemoteEvent,
+    ConnectionState, SshClientDelegate, SshConnectionOptions, SshInfo, SshPlatform,
+    SshRemoteClient, SshRemoteEvent,
 };
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index a26f4be661..c02d0ad7e7 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -89,11 +89,19 @@ pub struct SshConnectionOptions {
     pub upload_binary_over_ssh: bool,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SshArgs {
     pub arguments: Vec<String>,
     pub envs: Option<HashMap<String, String>>,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SshInfo {
+    pub args: SshArgs,
+    pub path_style: PathStyle,
+    pub shell: String,
+}
+
 #[macro_export]
 macro_rules! shell_script {
     ($fmt:expr, $($name:ident = $arg:expr),+ $(,)?) => {{
@@ -471,6 +479,16 @@ impl SshSocket {
 
         Ok(SshPlatform { os, arch })
     }
+
+    async fn shell(&self) -> String {
+        match self.run_command("sh", &["-c", "echo $SHELL"]).await {
+            Ok(shell) => shell.trim().to_owned(),
+            Err(e) => {
+                log::error!("Failed to get shell: {e}");
+                "sh".to_owned()
+            }
+        }
+    }
 }
 
 const MAX_MISSED_HEARTBEATS: usize = 5;
@@ -1152,12 +1170,16 @@ impl SshRemoteClient {
         cx.notify();
     }
 
-    pub fn ssh_info(&self) -> Option<(SshArgs, PathStyle)> {
+    pub fn ssh_info(&self) -> Option<SshInfo> {
         self.state
             .lock()
             .as_ref()
             .and_then(|state| state.ssh_connection())
-            .map(|ssh_connection| (ssh_connection.ssh_args(), ssh_connection.path_style()))
+            .map(|ssh_connection| SshInfo {
+                args: ssh_connection.ssh_args(),
+                path_style: ssh_connection.path_style(),
+                shell: ssh_connection.shell(),
+            })
     }
 
     pub fn upload_directory(
@@ -1392,6 +1414,7 @@ trait RemoteConnection: Send + Sync {
     fn ssh_args(&self) -> SshArgs;
     fn connection_options(&self) -> SshConnectionOptions;
     fn path_style(&self) -> PathStyle;
+    fn shell(&self) -> String;
 
     #[cfg(any(test, feature = "test-support"))]
     fn simulate_disconnect(&self, _: &AsyncApp) {}
@@ -1403,6 +1426,7 @@ struct SshRemoteConnection {
     remote_binary_path: Option<RemotePathBuf>,
     ssh_platform: SshPlatform,
     ssh_path_style: PathStyle,
+    ssh_shell: String,
     _temp_dir: TempDir,
 }
 
@@ -1429,6 +1453,10 @@ impl RemoteConnection for SshRemoteConnection {
         self.socket.connection_options.clone()
     }
 
+    fn shell(&self) -> String {
+        self.ssh_shell.clone()
+    }
+
     fn upload_directory(
         &self,
         src_path: PathBuf,
@@ -1642,6 +1670,7 @@ impl SshRemoteConnection {
             "windows" => PathStyle::Windows,
             _ => PathStyle::Posix,
         };
+        let ssh_shell = socket.shell().await;
 
         let mut this = Self {
             socket,
@@ -1650,6 +1679,7 @@ impl SshRemoteConnection {
             remote_binary_path: None,
             ssh_path_style,
             ssh_platform,
+            ssh_shell,
         };
 
         let (release_channel, version, commit) = cx.update(|cx| {
@@ -2686,6 +2716,10 @@ mod fake {
         fn path_style(&self) -> PathStyle {
             PathStyle::current()
         }
+
+        fn shell(&self) -> String {
+            "sh".to_owned()
+        }
     }
 
     pub(super) struct Delegate;
diff --git a/crates/task/src/shell_builder.rs b/crates/task/src/shell_builder.rs
index 770312bafc..de4ddc00f4 100644
--- a/crates/task/src/shell_builder.rs
+++ b/crates/task/src/shell_builder.rs
@@ -1,26 +1,40 @@
 use crate::Shell;
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
-enum ShellKind {
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum ShellKind {
     #[default]
     Posix,
+    Csh,
+    Fish,
     Powershell,
     Nushell,
     Cmd,
 }
 
 impl ShellKind {
-    fn new(program: &str) -> Self {
+    pub fn system() -> Self {
+        Self::new(&system_shell())
+    }
+
+    pub fn new(program: &str) -> Self {
+        #[cfg(windows)]
+        let (_, program) = program.rsplit_once('\\').unwrap_or(("", program));
+        #[cfg(not(windows))]
+        let (_, program) = program.rsplit_once('/').unwrap_or(("", program));
         if program == "powershell"
-            || program.ends_with("powershell.exe")
+            || program == "powershell.exe"
             || program == "pwsh"
-            || program.ends_with("pwsh.exe")
+            || program == "pwsh.exe"
         {
             ShellKind::Powershell
-        } else if program == "cmd" || program.ends_with("cmd.exe") {
+        } else if program == "cmd" || program == "cmd.exe" {
             ShellKind::Cmd
         } else if program == "nu" {
             ShellKind::Nushell
+        } else if program == "fish" {
+            ShellKind::Fish
+        } else if program == "csh" {
+            ShellKind::Csh
         } else {
             // Someother shell detected, the user might install and use a
             // unix-like shell.
@@ -33,6 +47,8 @@ impl ShellKind {
             Self::Powershell => Self::to_powershell_variable(input),
             Self::Cmd => Self::to_cmd_variable(input),
             Self::Posix => input.to_owned(),
+            Self::Fish => input.to_owned(),
+            Self::Csh => input.to_owned(),
             Self::Nushell => Self::to_nushell_variable(input),
         }
     }
@@ -153,7 +169,7 @@ impl ShellKind {
         match self {
             ShellKind::Powershell => vec!["-C".to_owned(), combined_command],
             ShellKind::Cmd => vec!["/C".to_owned(), combined_command],
-            ShellKind::Posix | ShellKind::Nushell => interactive
+            ShellKind::Posix | ShellKind::Nushell | ShellKind::Fish | ShellKind::Csh => interactive
                 .then(|| "-i".to_owned())
                 .into_iter()
                 .chain(["-c".to_owned(), combined_command])
@@ -184,19 +200,14 @@ pub struct ShellBuilder {
     kind: ShellKind,
 }
 
-pub static DEFAULT_REMOTE_SHELL: &str = "\"${SHELL:-sh}\"";
-
 impl ShellBuilder {
     /// Create a new ShellBuilder as configured.
-    pub fn new(is_local: bool, shell: &Shell) -> Self {
+    pub fn new(remote_system_shell: Option<&str>, shell: &Shell) -> Self {
         let (program, args) = match shell {
-            Shell::System => {
-                if is_local {
-                    (system_shell(), Vec::new())
-                } else {
-                    (DEFAULT_REMOTE_SHELL.to_string(), Vec::new())
-                }
-            }
+            Shell::System => match remote_system_shell {
+                Some(remote_shell) => (remote_shell.to_string(), Vec::new()),
+                None => (system_shell(), Vec::new()),
+            },
             Shell::Program(shell) => (shell.clone(), Vec::new()),
             Shell::WithArguments { program, args, .. } => (program.clone(), args.clone()),
         };
@@ -212,6 +223,7 @@ impl ShellBuilder {
         self.interactive = false;
         self
     }
+
     /// Returns the label to show in the terminal tab
     pub fn command_label(&self, command_label: &str) -> String {
         match self.kind {
@@ -221,7 +233,7 @@ impl ShellBuilder {
             ShellKind::Cmd => {
                 format!("{} /C '{}'", self.program, command_label)
             }
-            ShellKind::Posix | ShellKind::Nushell => {
+            ShellKind::Posix | ShellKind::Nushell | ShellKind::Fish | ShellKind::Csh => {
                 let interactivity = self.interactive.then_some("-i ").unwrap_or_default();
                 format!(
                     "{} {interactivity}-c '$\"{}\"'",
@@ -234,7 +246,7 @@ impl ShellBuilder {
     pub fn build(
         mut self,
         task_command: Option<String>,
-        task_args: &Vec<String>,
+        task_args: &[String],
     ) -> (String, Vec<String>) {
         if let Some(task_command) = task_command {
             let combined_command = task_args.iter().fold(task_command, |mut command, arg| {
@@ -258,11 +270,11 @@ mod test {
     #[test]
     fn test_nu_shell_variable_substitution() {
         let shell = Shell::Program("nu".to_owned());
-        let shell_builder = ShellBuilder::new(true, &shell);
+        let shell_builder = ShellBuilder::new(None, &shell);
 
         let (program, args) = shell_builder.build(
             Some("echo".into()),
-            &vec![
+            &[
                 "${hello}".to_string(),
                 "$world".to_string(),
                 "nothing".to_string(),
diff --git a/crates/task/src/task.rs b/crates/task/src/task.rs
index 85e654eff4..eb9e59f087 100644
--- a/crates/task/src/task.rs
+++ b/crates/task/src/task.rs
@@ -22,7 +22,7 @@ pub use debug_format::{
     AttachRequest, BuildTaskDefinition, DebugRequest, DebugScenario, DebugTaskFile, LaunchRequest,
     Request, TcpArgumentsTemplate, ZedDebugConfig,
 };
-pub use shell_builder::{DEFAULT_REMOTE_SHELL, ShellBuilder};
+pub use shell_builder::{ShellBuilder, ShellKind};
 pub use task_template::{
     DebugArgsRequest, HideStrategy, RevealStrategy, TaskTemplate, TaskTemplates,
     substitute_variables_in_map, substitute_variables_in_str,
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index f40c4870f1..6b17911487 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -481,14 +481,17 @@ impl TerminalPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<WeakEntity<Terminal>>> {
-        let Ok(is_local) = self
-            .workspace
-            .update(cx, |workspace, cx| workspace.project().read(cx).is_local())
-        else {
+        let Ok((ssh_client, false)) = self.workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().read(cx);
+            (
+                project.ssh_client().and_then(|it| it.read(cx).ssh_info()),
+                project.is_via_collab(),
+            )
+        }) else {
             return Task::ready(Err(anyhow!("Project is not local")));
         };
 
-        let builder = ShellBuilder::new(is_local, &task.shell);
+        let builder = ShellBuilder::new(ssh_client.as_ref().map(|info| &*info.shell), &task.shell);
         let command_label = builder.command_label(&task.command_label);
         let (command, args) = builder.build(task.command.clone(), &task.args);
 
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index b430120314..1192b14812 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -166,7 +166,7 @@ impl<T: AsRef<Path>> From<T> for SanitizedPath {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PathStyle {
     Posix,
     Windows,

From d166ab95a1bca5a4b4351b50ce96faaa585b1784 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Thu, 21 Aug 2025 13:09:14 -0400
Subject: [PATCH 268/823] ci: Switch Windows jobs to target explicit tag
 (#36693)

The previous tags are non-customizable (added by default).
This will enable us to pull specific runs out of the pool for
maintenance.

Also disable actionlint invoking shellcheck because it chokes on
PowerShell.

Release Notes:

- N/A

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 .github/actionlint.yml                | 12 ++++++++++++
 .github/workflows/ci.yml              |  4 ++--
 .github/workflows/release_nightly.yml |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index 0ee6af8a1d..bc02d312f8 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -30,3 +30,15 @@ self-hosted-runner:
     # Self Hosted Runners
     - self-mini-macos
     - self-32vcpu-windows-2022
+
+# Disable shellcheck because it doesn't like powershell
+# This should have been triggered with initial rollout of actionlint
+# but https://github.com/zed-industries/zed/pull/36693
+# somehow caused actionlint to actually check those windows jobs
+# where previously they were being skipped. Likely caused by an
+# unknown bug in actionlint where parsing of `runs-on: [ ]`
+# breaks something else. (yuck)
+paths:
+  .github/workflows/{ci,release_nightly}.yml:
+    ignore:
+      - "shellcheck"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4ba227168..a45c0a14f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -418,7 +418,7 @@ jobs:
     if: |
       github.repository_owner == 'zed-industries' &&
       needs.job_spec.outputs.run_tests == 'true'
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
     steps:
       - name: Environment Setup
         run: |
@@ -784,7 +784,7 @@ jobs:
   bundle-windows-x64:
     timeout-minutes: 120
     name: Create a Windows installer
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
     if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
     # if: (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     needs: [windows_tests]
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 5d63c34edd..d646c68cfa 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -59,7 +59,7 @@ jobs:
     timeout-minutes: 60
     name: Run tests on Windows
     if: github.repository_owner == 'zed-industries'
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -248,7 +248,7 @@ jobs:
     timeout-minutes: 60
     name: Create a Windows installer
     if: github.repository_owner == 'zed-industries'
-    runs-on: [self-hosted, Windows, X64]
+    runs-on: [self-32vcpu-windows-2022]
     needs: windows-tests
     env:
       AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}

From 1b2ceae7efb2b871d19025582cabc4619eee1bdc Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 21 Aug 2025 12:19:57 -0500
Subject: [PATCH 269/823] Use Tokio::spawn instead of getting an executor
 handle (#36701)

This was causing panics due to the handles being dropped out of order.
It doesn't seem possible to guarantee the correct drop ordering given
that we're holding them over await points, so lets just spawn on the
tokio executor itself which gives us access to the state we needed those
handles for in the first place.

Fixes: ZED-1R

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
---
 Cargo.lock                                    |  1 +
 crates/client/src/client.rs                   | 24 ++++++++++---------
 .../cloud_api_client/src/cloud_api_client.rs  |  8 +------
 crates/gpui_tokio/Cargo.toml                  |  1 +
 crates/gpui_tokio/src/gpui_tokio.rs           | 22 +++++++++++++++++
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6063530e9f..61f6f42498 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7539,6 +7539,7 @@ dependencies = [
 name = "gpui_tokio"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "gpui",
  "tokio",
  "util",
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index ed3f114943..f9b8a10610 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1290,19 +1290,21 @@ impl Client {
                 "http" => Http,
                 _ => Err(anyhow!("invalid rpc url: {}", rpc_url))?,
             };
-            let rpc_host = rpc_url
-                .host_str()
-                .zip(rpc_url.port_or_known_default())
-                .context("missing host in rpc url")?;
 
-            let stream = {
-                let handle = cx.update(|cx| gpui_tokio::Tokio::handle(cx)).ok().unwrap();
-                let _guard = handle.enter();
-                match proxy {
-                    Some(proxy) => connect_proxy_stream(&proxy, rpc_host).await?,
-                    None => Box::new(TcpStream::connect(rpc_host).await?),
+            let stream = gpui_tokio::Tokio::spawn_result(cx, {
+                let rpc_url = rpc_url.clone();
+                async move {
+                    let rpc_host = rpc_url
+                        .host_str()
+                        .zip(rpc_url.port_or_known_default())
+                        .context("missing host in rpc url")?;
+                    Ok(match proxy {
+                        Some(proxy) => connect_proxy_stream(&proxy, rpc_host).await?,
+                        None => Box::new(TcpStream::connect(rpc_host).await?),
+                    })
                 }
-            };
+            })?
+            .await?;
 
             log::info!("connected to rpc endpoint {}", rpc_url);
 
diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
index 92417d8319..205f3e2432 100644
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -102,13 +102,7 @@ impl CloudApiClient {
         let credentials = credentials.as_ref().context("no credentials provided")?;
         let authorization_header = format!("{} {}", credentials.user_id, credentials.access_token);
 
-        Ok(cx.spawn(async move |cx| {
-            let handle = cx
-                .update(|cx| Tokio::handle(cx))
-                .ok()
-                .context("failed to get Tokio handle")?;
-            let _guard = handle.enter();
-
+        Ok(Tokio::spawn_result(cx, async move {
             let ws = WebSocket::connect(connect_url)
                 .with_request(
                     request::Builder::new()
diff --git a/crates/gpui_tokio/Cargo.toml b/crates/gpui_tokio/Cargo.toml
index 46d5eafd5a..2d4abf4063 100644
--- a/crates/gpui_tokio/Cargo.toml
+++ b/crates/gpui_tokio/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/gpui_tokio.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 util.workspace = true
 gpui.workspace = true
 tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
diff --git a/crates/gpui_tokio/src/gpui_tokio.rs b/crates/gpui_tokio/src/gpui_tokio.rs
index fffe18a616..8384f2a88e 100644
--- a/crates/gpui_tokio/src/gpui_tokio.rs
+++ b/crates/gpui_tokio/src/gpui_tokio.rs
@@ -52,6 +52,28 @@ impl Tokio {
         })
     }
 
+    /// Spawns the given future on Tokio's thread pool, and returns it via a GPUI task
+    /// Note that the Tokio task will be cancelled if the GPUI task is dropped
+    pub fn spawn_result<C, Fut, R>(cx: &C, f: Fut) -> C::Result<Task<anyhow::Result<R>>>
+    where
+        C: AppContext,
+        Fut: Future<Output = anyhow::Result<R>> + Send + 'static,
+        R: Send + 'static,
+    {
+        cx.read_global(|tokio: &GlobalTokio, cx| {
+            let join_handle = tokio.runtime.spawn(f);
+            let abort_handle = join_handle.abort_handle();
+            let cancel = defer(move || {
+                abort_handle.abort();
+            });
+            cx.background_spawn(async move {
+                let result = join_handle.await?;
+                drop(cancel);
+                result
+            })
+        })
+    }
+
     pub fn handle(cx: &App) -> tokio::runtime::Handle {
         GlobalTokio::global(cx).runtime.handle().clone()
     }

From f2899bf34b136ce9dfc14fe1d3531a99b4899a27 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Thu, 21 Aug 2025 13:21:37 -0400
Subject: [PATCH 270/823] ci: Switch from ubuntu-latest to namespace (2)
 (#36702)

In response to ongoing [github actions
incident](https://www.githubstatus.com/incidents/c7kq3ctclddp)

Supercedes: https://github.com/zed-industries/zed/pull/36698

Release Notes:

- N/A
---
 .github/actionlint.yml                    | 3 ++-
 .github/workflows/bump_collab_staging.yml | 2 +-
 .github/workflows/ci.yml                  | 6 +++---
 .github/workflows/danger.yml              | 2 +-
 .github/workflows/release_nightly.yml     | 2 +-
 .github/workflows/script_checks.yml       | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index bc02d312f8..6d8e0107e9 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -19,11 +19,12 @@ self-hosted-runner:
     - namespace-profile-16x32-ubuntu-2004-arm
     - namespace-profile-32x64-ubuntu-2004-arm
     # Namespace Ubuntu 22.04 (Everything else)
-    - namespace-profile-2x4-ubuntu-2204
     - namespace-profile-4x8-ubuntu-2204
     - namespace-profile-8x16-ubuntu-2204
     - namespace-profile-16x32-ubuntu-2204
     - namespace-profile-32x64-ubuntu-2204
+    # Namespace Ubuntu 24.04 (like ubuntu-latest)
+    - namespace-profile-2x4-ubuntu-2404
     # Namespace Limited Preview
     - namespace-profile-8x16-ubuntu-2004-arm-m4
     - namespace-profile-8x32-ubuntu-2004-arm-m4
diff --git a/.github/workflows/bump_collab_staging.yml b/.github/workflows/bump_collab_staging.yml
index d8eaa6019e..d400905b4d 100644
--- a/.github/workflows/bump_collab_staging.yml
+++ b/.github/workflows/bump_collab_staging.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   update-collab-staging-tag:
     if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a45c0a14f1..a34833d0fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
       run_nix: ${{ steps.filter.outputs.run_nix }}
       run_actionlint: ${{ steps.filter.outputs.run_actionlint }}
     runs-on:
-      - ubuntu-latest
+      - namespace-profile-2x4-ubuntu-2404
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -237,7 +237,7 @@ jobs:
         uses: ./.github/actions/build_docs
 
   actionlint:
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
     if: github.repository_owner == 'zed-industries' && needs.job_spec.outputs.run_actionlint == 'true'
     needs: [job_spec]
     steps:
@@ -458,7 +458,7 @@ jobs:
 
   tests_pass:
     name: Tests Pass
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
     needs:
       - job_spec
       - style
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 15c82643ae..3f84179278 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   danger:
     if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index d646c68cfa..2026ee7b73 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -290,7 +290,7 @@ jobs:
   update-nightly-tag:
     name: Update nightly tag
     if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
     needs:
       - bundle-mac
       - bundle-linux-x86
diff --git a/.github/workflows/script_checks.yml b/.github/workflows/script_checks.yml
index c32a433e46..5dbfc9cb7f 100644
--- a/.github/workflows/script_checks.yml
+++ b/.github/workflows/script_checks.yml
@@ -12,7 +12,7 @@ jobs:
   shellcheck:
     name: "ShellCheck Scripts"
     if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-2x4-ubuntu-2404
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

From 81cb24810b88080b8cffcb0f75ae6500ef1e654e Mon Sep 17 00:00:00 2001
From: Vitaly Slobodin <vitaliy.slobodin@gmail.com>
Date: Thu, 21 Aug 2025 19:23:41 +0200
Subject: [PATCH 271/823] ruby: Improve Ruby test and debug task configurations
 (#36691)

Hi! This pull request adds missing `cwd` field to all Ruby test tasks
otherwise `rdbg` will be broken when the user tries to debug a test.
Thanks!

Release Notes:

- N/A
---
 docs/src/languages/ruby.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/src/languages/ruby.md b/docs/src/languages/ruby.md
index 6f530433bd..ef4b026db1 100644
--- a/docs/src/languages/ruby.md
+++ b/docs/src/languages/ruby.md
@@ -299,6 +299,7 @@ To run tests in your Ruby project, you can set up custom tasks in your local `.z
       "-n",
       "\"$ZED_CUSTOM_RUBY_TEST_NAME\""
     ],
+    "cwd": "$ZED_WORKTREE_ROOT",
     "tags": ["ruby-test"]
   }
 ]
@@ -321,6 +322,7 @@ Plain minitest does not support running tests by line number, only by name, so w
       "-n",
       "\"$ZED_CUSTOM_RUBY_TEST_NAME\""
     ],
+    "cwd": "$ZED_WORKTREE_ROOT",
     "tags": ["ruby-test"]
   }
 ]
@@ -334,6 +336,7 @@ Plain minitest does not support running tests by line number, only by name, so w
     "label": "test $ZED_RELATIVE_FILE:$ZED_ROW",
     "command": "bundle",
     "args": ["exec", "rspec", "\"$ZED_RELATIVE_FILE:$ZED_ROW\""],
+    "cwd": "$ZED_WORKTREE_ROOT",
     "tags": ["ruby-test"]
   }
 ]
@@ -369,7 +372,7 @@ The Ruby extension provides a debug adapter for debugging Ruby code. Zed's name
     "label": "Debug Rails server",
     "adapter": "rdbg",
     "request": "launch",
-    "command": "$ZED_WORKTREE_ROOT/bin/rails",
+    "command": "./bin/rails",
     "args": ["server"],
     "cwd": "$ZED_WORKTREE_ROOT",
     "env": {

From c1e749906febe241a3138280fafcc3ff3fca7416 Mon Sep 17 00:00:00 2001
From: Dave Waggoner <waggoner.dave@gmail.com>
Date: Thu, 21 Aug 2025 11:41:32 -0700
Subject: [PATCH 272/823] Add terminal view path like target tests (#35422)

Part of
- #28238

This PR refactors `Event::NewNavigationTarget` and `Event::Open`
handling of `PathLikeTarget` and associated code in `terminal_view.rs`
into its own file, `terminal_path_like_target.rs` for improved
testability, and adds tests which cover cases from:
  - #28339
  - #28407
  - #33498
  - #34027
  - #34078

Release Notes:

- N/A
---
 .../src/terminal_path_like_target.rs          | 825 ++++++++++++++++++
 crates/terminal_view/src/terminal_view.rs     | 370 +-------
 2 files changed, 844 insertions(+), 351 deletions(-)
 create mode 100644 crates/terminal_view/src/terminal_path_like_target.rs

diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
new file mode 100644
index 0000000000..e20df7f001
--- /dev/null
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -0,0 +1,825 @@
+use super::{HoverTarget, HoveredWord, TerminalView};
+use anyhow::{Context as _, Result};
+use editor::Editor;
+use gpui::{App, AppContext, Context, Task, WeakEntity, Window};
+use itertools::Itertools;
+use project::{Entry, Metadata};
+use std::path::PathBuf;
+use terminal::PathLikeTarget;
+use util::{ResultExt, debug_panic, paths::PathWithPosition};
+use workspace::{OpenOptions, OpenVisible, Workspace};
+
+#[derive(Debug, Clone)]
+enum OpenTarget {
+    Worktree(PathWithPosition, Entry),
+    File(PathWithPosition, Metadata),
+}
+
+impl OpenTarget {
+    fn is_file(&self) -> bool {
+        match self {
+            OpenTarget::Worktree(_, entry) => entry.is_file(),
+            OpenTarget::File(_, metadata) => !metadata.is_dir,
+        }
+    }
+
+    fn is_dir(&self) -> bool {
+        match self {
+            OpenTarget::Worktree(_, entry) => entry.is_dir(),
+            OpenTarget::File(_, metadata) => metadata.is_dir,
+        }
+    }
+
+    fn path(&self) -> &PathWithPosition {
+        match self {
+            OpenTarget::Worktree(path, _) => path,
+            OpenTarget::File(path, _) => path,
+        }
+    }
+}
+
+pub(super) fn hover_path_like_target(
+    workspace: &WeakEntity<Workspace>,
+    hovered_word: HoveredWord,
+    path_like_target: &PathLikeTarget,
+    cx: &mut Context<TerminalView>,
+) -> Task<()> {
+    let file_to_open_task = possible_open_target(workspace, path_like_target, cx);
+    cx.spawn(async move |terminal_view, cx| {
+        let file_to_open = file_to_open_task.await;
+        terminal_view
+            .update(cx, |terminal_view, _| match file_to_open {
+                Some(OpenTarget::File(path, _) | OpenTarget::Worktree(path, _)) => {
+                    terminal_view.hover = Some(HoverTarget {
+                        tooltip: path.to_string(|path| path.to_string_lossy().to_string()),
+                        hovered_word,
+                    });
+                }
+                None => {
+                    terminal_view.hover = None;
+                }
+            })
+            .ok();
+    })
+}
+
+fn possible_open_target(
+    workspace: &WeakEntity<Workspace>,
+    path_like_target: &PathLikeTarget,
+    cx: &App,
+) -> Task<Option<OpenTarget>> {
+    let Some(workspace) = workspace.upgrade() else {
+        return Task::ready(None);
+    };
+    // We have to check for both paths, as on Unix, certain paths with positions are valid file paths too.
+    // We can be on FS remote part, without real FS, so cannot canonicalize or check for existence the path right away.
+    let mut potential_paths = Vec::new();
+    let cwd = path_like_target.terminal_dir.as_ref();
+    let maybe_path = &path_like_target.maybe_path;
+    let original_path = PathWithPosition::from_path(PathBuf::from(maybe_path));
+    let path_with_position = PathWithPosition::parse_str(maybe_path);
+    let worktree_candidates = workspace
+        .read(cx)
+        .worktrees(cx)
+        .sorted_by_key(|worktree| {
+            let worktree_root = worktree.read(cx).abs_path();
+            match cwd.and_then(|cwd| worktree_root.strip_prefix(cwd).ok()) {
+                Some(cwd_child) => cwd_child.components().count(),
+                None => usize::MAX,
+            }
+        })
+        .collect::<Vec<_>>();
+    // Since we do not check paths via FS and joining, we need to strip off potential `./`, `a/`, `b/` prefixes out of it.
+    const GIT_DIFF_PATH_PREFIXES: &[&str] = &["a", "b"];
+    for prefix_str in GIT_DIFF_PATH_PREFIXES.iter().chain(std::iter::once(&".")) {
+        if let Some(stripped) = original_path.path.strip_prefix(prefix_str).ok() {
+            potential_paths.push(PathWithPosition {
+                path: stripped.to_owned(),
+                row: original_path.row,
+                column: original_path.column,
+            });
+        }
+        if let Some(stripped) = path_with_position.path.strip_prefix(prefix_str).ok() {
+            potential_paths.push(PathWithPosition {
+                path: stripped.to_owned(),
+                row: path_with_position.row,
+                column: path_with_position.column,
+            });
+        }
+    }
+
+    let insert_both_paths = original_path != path_with_position;
+    potential_paths.insert(0, original_path);
+    if insert_both_paths {
+        potential_paths.insert(1, path_with_position);
+    }
+
+    // If we won't find paths "easily", we can traverse the entire worktree to look what ends with the potential path suffix.
+    // That will be slow, though, so do the fast checks first.
+    let mut worktree_paths_to_check = Vec::new();
+    for worktree in &worktree_candidates {
+        let worktree_root = worktree.read(cx).abs_path();
+        let mut paths_to_check = Vec::with_capacity(potential_paths.len());
+
+        for path_with_position in &potential_paths {
+            let path_to_check = if worktree_root.ends_with(&path_with_position.path) {
+                let root_path_with_position = PathWithPosition {
+                    path: worktree_root.to_path_buf(),
+                    row: path_with_position.row,
+                    column: path_with_position.column,
+                };
+                match worktree.read(cx).root_entry() {
+                    Some(root_entry) => {
+                        return Task::ready(Some(OpenTarget::Worktree(
+                            root_path_with_position,
+                            root_entry.clone(),
+                        )));
+                    }
+                    None => root_path_with_position,
+                }
+            } else {
+                PathWithPosition {
+                    path: path_with_position
+                        .path
+                        .strip_prefix(&worktree_root)
+                        .unwrap_or(&path_with_position.path)
+                        .to_owned(),
+                    row: path_with_position.row,
+                    column: path_with_position.column,
+                }
+            };
+
+            if path_to_check.path.is_relative()
+                && let Some(entry) = worktree.read(cx).entry_for_path(&path_to_check.path)
+            {
+                return Task::ready(Some(OpenTarget::Worktree(
+                    PathWithPosition {
+                        path: worktree_root.join(&entry.path),
+                        row: path_to_check.row,
+                        column: path_to_check.column,
+                    },
+                    entry.clone(),
+                )));
+            }
+
+            paths_to_check.push(path_to_check);
+        }
+
+        if !paths_to_check.is_empty() {
+            worktree_paths_to_check.push((worktree.clone(), paths_to_check));
+        }
+    }
+
+    // Before entire worktree traversal(s), make an attempt to do FS checks if available.
+    let fs_paths_to_check = if workspace.read(cx).project().read(cx).is_local() {
+        potential_paths
+            .into_iter()
+            .flat_map(|path_to_check| {
+                let mut paths_to_check = Vec::new();
+                let maybe_path = &path_to_check.path;
+                if maybe_path.starts_with("~") {
+                    if let Some(home_path) =
+                        maybe_path
+                            .strip_prefix("~")
+                            .ok()
+                            .and_then(|stripped_maybe_path| {
+                                Some(dirs::home_dir()?.join(stripped_maybe_path))
+                            })
+                    {
+                        paths_to_check.push(PathWithPosition {
+                            path: home_path,
+                            row: path_to_check.row,
+                            column: path_to_check.column,
+                        });
+                    }
+                } else {
+                    paths_to_check.push(PathWithPosition {
+                        path: maybe_path.clone(),
+                        row: path_to_check.row,
+                        column: path_to_check.column,
+                    });
+                    if maybe_path.is_relative() {
+                        if let Some(cwd) = &cwd {
+                            paths_to_check.push(PathWithPosition {
+                                path: cwd.join(maybe_path),
+                                row: path_to_check.row,
+                                column: path_to_check.column,
+                            });
+                        }
+                        for worktree in &worktree_candidates {
+                            paths_to_check.push(PathWithPosition {
+                                path: worktree.read(cx).abs_path().join(maybe_path),
+                                row: path_to_check.row,
+                                column: path_to_check.column,
+                            });
+                        }
+                    }
+                }
+                paths_to_check
+            })
+            .collect()
+    } else {
+        Vec::new()
+    };
+
+    let worktree_check_task = cx.spawn(async move |cx| {
+        for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
+            let found_entry = worktree
+                .update(cx, |worktree, _| {
+                    let worktree_root = worktree.abs_path();
+                    let traversal = worktree.traverse_from_path(true, true, false, "".as_ref());
+                    for entry in traversal {
+                        if let Some(path_in_worktree) = worktree_paths_to_check
+                            .iter()
+                            .find(|path_to_check| entry.path.ends_with(&path_to_check.path))
+                        {
+                            return Some(OpenTarget::Worktree(
+                                PathWithPosition {
+                                    path: worktree_root.join(&entry.path),
+                                    row: path_in_worktree.row,
+                                    column: path_in_worktree.column,
+                                },
+                                entry.clone(),
+                            ));
+                        }
+                    }
+                    None
+                })
+                .ok()?;
+            if let Some(found_entry) = found_entry {
+                return Some(found_entry);
+            }
+        }
+        None
+    });
+
+    let fs = workspace.read(cx).project().read(cx).fs().clone();
+    cx.background_spawn(async move {
+        for mut path_to_check in fs_paths_to_check {
+            if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
+                && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
+            {
+                path_to_check.path = fs_path_to_check;
+                return Some(OpenTarget::File(path_to_check, metadata));
+            }
+        }
+
+        worktree_check_task.await
+    })
+}
+
+pub(super) fn open_path_like_target(
+    workspace: &WeakEntity<Workspace>,
+    terminal_view: &mut TerminalView,
+    path_like_target: &PathLikeTarget,
+    window: &mut Window,
+    cx: &mut Context<TerminalView>,
+) {
+    possibly_open_target(workspace, terminal_view, path_like_target, window, cx)
+        .detach_and_log_err(cx)
+}
+
+fn possibly_open_target(
+    workspace: &WeakEntity<Workspace>,
+    terminal_view: &mut TerminalView,
+    path_like_target: &PathLikeTarget,
+    window: &mut Window,
+    cx: &mut Context<TerminalView>,
+) -> Task<Result<Option<OpenTarget>>> {
+    if terminal_view.hover.is_none() {
+        return Task::ready(Ok(None));
+    }
+    let workspace = workspace.clone();
+    let path_like_target = path_like_target.clone();
+    cx.spawn_in(window, async move |terminal_view, cx| {
+        let Some(open_target) = terminal_view
+            .update(cx, |_, cx| {
+                possible_open_target(&workspace, &path_like_target, cx)
+            })?
+            .await
+        else {
+            return Ok(None);
+        };
+
+        let path_to_open = open_target.path();
+        let opened_items = workspace
+            .update_in(cx, |workspace, window, cx| {
+                workspace.open_paths(
+                    vec![path_to_open.path.clone()],
+                    OpenOptions {
+                        visible: Some(OpenVisible::OnlyDirectories),
+                        ..Default::default()
+                    },
+                    None,
+                    window,
+                    cx,
+                )
+            })
+            .context("workspace update")?
+            .await;
+        if opened_items.len() != 1 {
+            debug_panic!(
+                "Received {} items for one path {path_to_open:?}",
+                opened_items.len(),
+            );
+        }
+
+        if let Some(opened_item) = opened_items.first() {
+            if open_target.is_file() {
+                if let Some(Ok(opened_item)) = opened_item {
+                    if let Some(row) = path_to_open.row {
+                        let col = path_to_open.column.unwrap_or(0);
+                        if let Some(active_editor) = opened_item.downcast::<Editor>() {
+                            active_editor
+                                .downgrade()
+                                .update_in(cx, |editor, window, cx| {
+                                    editor.go_to_singleton_buffer_point(
+                                        language::Point::new(
+                                            row.saturating_sub(1),
+                                            col.saturating_sub(1),
+                                        ),
+                                        window,
+                                        cx,
+                                    )
+                                })
+                                .log_err();
+                        }
+                    }
+                    return Ok(Some(open_target));
+                }
+            } else if open_target.is_dir() {
+                workspace.update(cx, |workspace, cx| {
+                    workspace.project().update(cx, |_, cx| {
+                        cx.emit(project::Event::ActivateProjectPanel);
+                    })
+                })?;
+                return Ok(Some(open_target));
+            }
+        }
+        Ok(None)
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::TestAppContext;
+    use project::{Project, terminals::TerminalKind};
+    use serde_json::json;
+    use std::path::{Path, PathBuf};
+    use terminal::{HoveredWord, alacritty_terminal::index::Point as AlacPoint};
+    use util::path;
+    use workspace::AppState;
+
+    async fn init_test(
+        app_cx: &mut TestAppContext,
+        trees: impl IntoIterator<Item = (&str, serde_json::Value)>,
+        worktree_roots: impl IntoIterator<Item = &str>,
+    ) -> impl AsyncFnMut(HoveredWord, PathLikeTarget) -> (Option<HoverTarget>, Option<OpenTarget>)
+    {
+        let fs = app_cx.update(AppState::test).fs.as_fake().clone();
+
+        app_cx.update(|cx| {
+            terminal::init(cx);
+            theme::init(theme::LoadThemes::JustBase, cx);
+            Project::init_settings(cx);
+            language::init(cx);
+            editor::init(cx);
+        });
+
+        for (path, tree) in trees {
+            fs.insert_tree(path, tree).await;
+        }
+
+        let project = Project::test(
+            fs.clone(),
+            worktree_roots
+                .into_iter()
+                .map(Path::new)
+                .collect::<Vec<_>>(),
+            app_cx,
+        )
+        .await;
+
+        let (workspace, cx) =
+            app_cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+        let terminal = project
+            .update(cx, |project, cx| {
+                project.create_terminal(TerminalKind::Shell(None), cx)
+            })
+            .await
+            .expect("Failed to create a terminal");
+
+        let workspace_a = workspace.clone();
+        let (terminal_view, cx) = app_cx.add_window_view(|window, cx| {
+            TerminalView::new(
+                terminal,
+                workspace_a.downgrade(),
+                None,
+                project.downgrade(),
+                window,
+                cx,
+            )
+        });
+
+        async move |hovered_word: HoveredWord,
+                    path_like_target: PathLikeTarget|
+                    -> (Option<HoverTarget>, Option<OpenTarget>) {
+            let workspace_a = workspace.clone();
+            terminal_view
+                .update(cx, |_, cx| {
+                    hover_path_like_target(
+                        &workspace_a.downgrade(),
+                        hovered_word,
+                        &path_like_target,
+                        cx,
+                    )
+                })
+                .await;
+
+            let hover_target =
+                terminal_view.read_with(cx, |terminal_view, _| terminal_view.hover.clone());
+
+            let open_target = terminal_view
+                .update_in(cx, |terminal_view, window, cx| {
+                    possibly_open_target(
+                        &workspace.downgrade(),
+                        terminal_view,
+                        &path_like_target,
+                        window,
+                        cx,
+                    )
+                })
+                .await
+                .expect("Failed to possibly open target");
+
+            (hover_target, open_target)
+        }
+    }
+
+    async fn test_path_like_simple(
+        test_path_like: &mut impl AsyncFnMut(
+            HoveredWord,
+            PathLikeTarget,
+        ) -> (Option<HoverTarget>, Option<OpenTarget>),
+        maybe_path: &str,
+        tooltip: &str,
+        terminal_dir: Option<PathBuf>,
+        file: &str,
+        line: u32,
+    ) {
+        let (hover_target, open_target) = test_path_like(
+            HoveredWord {
+                word: maybe_path.to_string(),
+                word_match: AlacPoint::default()..=AlacPoint::default(),
+                id: 0,
+            },
+            PathLikeTarget {
+                maybe_path: maybe_path.to_string(),
+                terminal_dir,
+            },
+        )
+        .await;
+
+        let Some(hover_target) = hover_target else {
+            assert!(
+                hover_target.is_some(),
+                "Hover target should not be `None` at {file}:{line}:"
+            );
+            return;
+        };
+
+        assert_eq!(
+            hover_target.tooltip, tooltip,
+            "Tooltip mismatch at {file}:{line}:"
+        );
+        assert_eq!(
+            hover_target.hovered_word.word, maybe_path,
+            "Hovered word mismatch at {file}:{line}:"
+        );
+
+        let Some(open_target) = open_target else {
+            assert!(
+                open_target.is_some(),
+                "Open target should not be `None` at {file}:{line}:"
+            );
+            return;
+        };
+
+        assert_eq!(
+            open_target.path().path,
+            Path::new(tooltip),
+            "Open target path mismatch at {file}:{line}:"
+        );
+    }
+
+    macro_rules! none_or_some {
+        () => {
+            None
+        };
+        ($some:expr) => {
+            Some($some)
+        };
+    }
+
+    macro_rules! test_path_like {
+        ($test_path_like:expr, $maybe_path:literal, $tooltip:literal $(, $cwd:literal)?) => {
+            test_path_like_simple(
+                &mut $test_path_like,
+                path!($maybe_path),
+                path!($tooltip),
+                none_or_some!($($crate::PathBuf::from(path!($cwd)))?),
+                std::file!(),
+                std::line!(),
+            )
+            .await
+        };
+    }
+
+    #[doc = "test_path_likes!(<cx>, <trees>, <worktrees>, { $(<tests>;)+ })"]
+    macro_rules! test_path_likes {
+        ($cx:expr, $trees:expr, $worktrees:expr, { $($tests:expr;)+ }) => { {
+            let mut test_path_like = init_test($cx, $trees, $worktrees).await;
+            #[doc ="test!(<hovered maybe_path>, <expected tooltip>, <terminal cwd>)"]
+            macro_rules! test {
+                ($maybe_path:literal, $tooltip:literal) => {
+                    test_path_like!(test_path_like, $maybe_path, $tooltip)
+                };
+                ($maybe_path:literal, $tooltip:literal, $cwd:literal) => {
+                    test_path_like!(test_path_like, $maybe_path, $tooltip, $cwd)
+                }
+            }
+            $($tests);+
+        } }
+    }
+
+    #[gpui::test]
+    async fn one_folder_worktree(cx: &mut TestAppContext) {
+        test_path_likes!(
+            cx,
+            vec![(
+                path!("/test"),
+                json!({
+                    "lib.rs": "",
+                    "test.rs": "",
+                }),
+            )],
+            vec![path!("/test")],
+            {
+                test!("lib.rs", "/test/lib.rs");
+                test!("test.rs", "/test/test.rs");
+            }
+        )
+    }
+
+    #[gpui::test]
+    async fn mixed_worktrees(cx: &mut TestAppContext) {
+        test_path_likes!(
+            cx,
+            vec![
+                (
+                    path!("/"),
+                    json!({
+                        "file.txt": "",
+                    }),
+                ),
+                (
+                    path!("/test"),
+                    json!({
+                        "lib.rs": "",
+                        "test.rs": "",
+                        "file.txt": "",
+                    }),
+                ),
+            ],
+            vec![path!("/file.txt"), path!("/test")],
+            {
+                test!("file.txt", "/file.txt", "/");
+                test!("lib.rs", "/test/lib.rs", "/test");
+                test!("test.rs", "/test/test.rs", "/test");
+                test!("file.txt", "/test/file.txt", "/test");
+            }
+        )
+    }
+
+    #[gpui::test]
+    async fn worktree_file_preferred(cx: &mut TestAppContext) {
+        test_path_likes!(
+            cx,
+            vec![
+                (
+                    path!("/"),
+                    json!({
+                        "file.txt": "",
+                    }),
+                ),
+                (
+                    path!("/test"),
+                    json!({
+                        "file.txt": "",
+                    }),
+                ),
+            ],
+            vec![path!("/test")],
+            {
+                test!("file.txt", "/test/file.txt", "/test");
+            }
+        )
+    }
+
+    mod issues {
+        use super::*;
+
+        // https://github.com/zed-industries/zed/issues/28407
+        #[gpui::test]
+        async fn issue_28407_siblings(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/dir1"),
+                    json!({
+                        "dir 2": {
+                            "C.py": ""
+                        },
+                        "dir 3": {
+                            "C.py": ""
+                        },
+                    }),
+                )],
+                vec![path!("/dir1")],
+                {
+                    test!("C.py", "/dir1/dir 2/C.py", "/dir1");
+                    test!("C.py", "/dir1/dir 2/C.py", "/dir1/dir 2");
+                    test!("C.py", "/dir1/dir 3/C.py", "/dir1/dir 3");
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/28407
+        // See https://github.com/zed-industries/zed/issues/34027
+        // See https://github.com/zed-industries/zed/issues/33498
+        #[gpui::test]
+        #[should_panic(expected = "Tooltip mismatch")]
+        async fn issue_28407_nesting(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/project"),
+                    json!({
+                        "lib": {
+                            "src": {
+                                "main.rs": ""
+                            },
+                        },
+                        "src": {
+                            "main.rs": ""
+                        },
+                    }),
+                )],
+                vec![path!("/project")],
+                {
+                    // Failing currently
+                    test!("main.rs", "/project/src/main.rs", "/project");
+                    test!("main.rs", "/project/src/main.rs", "/project/src");
+                    test!("main.rs", "/project/lib/src/main.rs", "/project/lib");
+                    test!("main.rs", "/project/lib/src/main.rs", "/project/lib/src");
+
+                    test!("src/main.rs", "/project/src/main.rs", "/project");
+                    test!("src/main.rs", "/project/src/main.rs", "/project/src");
+                    // Failing currently
+                    test!("src/main.rs", "/project/lib/src/main.rs", "/project/lib");
+                    // Failing currently
+                    test!(
+                        "src/main.rs",
+                        "/project/lib/src/main.rs",
+                        "/project/lib/src"
+                    );
+
+                    test!("lib/src/main.rs", "/project/lib/src/main.rs", "/project");
+                    test!(
+                        "lib/src/main.rs",
+                        "/project/lib/src/main.rs",
+                        "/project/src"
+                    );
+                    test!(
+                        "lib/src/main.rs",
+                        "/project/lib/src/main.rs",
+                        "/project/lib"
+                    );
+                    test!(
+                        "lib/src/main.rs",
+                        "/project/lib/src/main.rs",
+                        "/project/lib/src"
+                    );
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/28339
+        #[gpui::test]
+        async fn issue_28339(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/tmp"),
+                    json!({
+                        "issue28339": {
+                            "foo": {
+                                "bar.txt": ""
+                            },
+                        },
+                    }),
+                )],
+                vec![path!("/tmp")],
+                {
+                    test!(
+                        "foo/./bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test!(
+                        "foo/../foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test!(
+                        "foo/..///foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test!(
+                        "issue28339/../issue28339/foo/../foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test!(
+                        "./bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339/foo"
+                    );
+                    test!(
+                        "../foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339/foo"
+                    );
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        #[should_panic(expected = "Tooltip mismatch")]
+        async fn issue_34027(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/tmp/issue34027"),
+                    json!({
+                        "test.txt": "",
+                        "foo": {
+                            "test.txt": "",
+                        }
+                    }),
+                ),],
+                vec![path!("/tmp/issue34027")],
+                {
+                    test!("test.txt", "/tmp/issue34027/test.txt", "/tmp/issue34027");
+                    test!(
+                        "test.txt",
+                        "/tmp/issue34027/foo/test.txt",
+                        "/tmp/issue34027/foo"
+                    );
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        #[should_panic(expected = "Tooltip mismatch")]
+        async fn issue_34027_non_worktree_file(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![
+                    (
+                        path!("/"),
+                        json!({
+                            "file.txt": "",
+                        }),
+                    ),
+                    (
+                        path!("/test"),
+                        json!({
+                            "file.txt": "",
+                        }),
+                    ),
+                ],
+                vec![path!("/test")],
+                {
+                    test!("file.txt", "/file.txt", "/");
+                    test!("file.txt", "/test/file.txt", "/test");
+                }
+            )
+        }
+    }
+}
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 5b4d327140..e2f9ba818d 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -2,21 +2,21 @@ mod color_contrast;
 mod persistence;
 pub mod terminal_element;
 pub mod terminal_panel;
+mod terminal_path_like_target;
 pub mod terminal_scrollbar;
 mod terminal_slash_command;
 pub mod terminal_tab_tooltip;
 
 use assistant_slash_command::SlashCommandRegistry;
-use editor::{Editor, EditorSettings, actions::SelectAll, scroll::ScrollbarAutoHide};
+use editor::{EditorSettings, actions::SelectAll, scroll::ScrollbarAutoHide};
 use gpui::{
     Action, AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     KeyContext, KeyDownEvent, Keystroke, MouseButton, MouseDownEvent, Pixels, Render,
     ScrollWheelEvent, Stateful, Styled, Subscription, Task, WeakEntity, actions, anchored,
     deferred, div,
 };
-use itertools::Itertools;
 use persistence::TERMINAL_DB;
-use project::{Entry, Metadata, Project, search::SearchQuery, terminals::TerminalKind};
+use project::{Project, search::SearchQuery, terminals::TerminalKind};
 use schemars::JsonSchema;
 use task::TaskId;
 use terminal::{
@@ -31,16 +31,17 @@ use terminal::{
 };
 use terminal_element::TerminalElement;
 use terminal_panel::TerminalPanel;
+use terminal_path_like_target::{hover_path_like_target, open_path_like_target};
 use terminal_scrollbar::TerminalScrollHandle;
 use terminal_slash_command::TerminalSlashCommand;
 use terminal_tab_tooltip::TerminalTooltip;
 use ui::{
     ContextMenu, Icon, IconName, Label, Scrollbar, ScrollbarState, Tooltip, h_flex, prelude::*,
 };
-use util::{ResultExt, debug_panic, paths::PathWithPosition};
+use util::ResultExt;
 use workspace::{
-    CloseActiveItem, NewCenterTerminal, NewTerminal, OpenOptions, OpenVisible, ToolbarItemLocation,
-    Workspace, WorkspaceId, delete_unloaded_items,
+    CloseActiveItem, NewCenterTerminal, NewTerminal, ToolbarItemLocation, Workspace, WorkspaceId,
+    delete_unloaded_items,
     item::{
         BreadcrumbText, Item, ItemEvent, SerializableItem, TabContentParams, TabTooltipContent,
     },
@@ -48,7 +49,6 @@ use workspace::{
     searchable::{Direction, SearchEvent, SearchOptions, SearchableItem, SearchableItemHandle},
 };
 
-use anyhow::Context as _;
 use serde::Deserialize;
 use settings::{Settings, SettingsStore};
 use smol::Timer;
@@ -64,7 +64,6 @@ use std::{
 };
 
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
-const GIT_DIFF_PATH_PREFIXES: &[&str] = &["a", "b"];
 const TERMINAL_SCROLLBAR_WIDTH: Pixels = px(12.);
 
 /// Event to transmit the scroll from the element to the view
@@ -181,6 +180,7 @@ impl ContentMode {
 }
 
 #[derive(Debug)]
+#[cfg_attr(test, derive(Clone, Eq, PartialEq))]
 struct HoverTarget {
     tooltip: String,
     hovered_word: HoveredWord,
@@ -1066,37 +1066,13 @@ fn subscribe_for_terminal_events(
                                     .as_ref()
                                     .map(|hover| &hover.hovered_word)
                             {
-                                let valid_files_to_open_task = possible_open_target(
+                                terminal_view.hover = None;
+                                terminal_view.hover_tooltip_update = hover_path_like_target(
                                     &workspace,
-                                    &path_like_target.terminal_dir,
-                                    &path_like_target.maybe_path,
+                                    hovered_word.clone(),
+                                    path_like_target,
                                     cx,
                                 );
-                                let hovered_word = hovered_word.clone();
-
-                                terminal_view.hover = None;
-                                terminal_view.hover_tooltip_update =
-                                    cx.spawn(async move |terminal_view, cx| {
-                                        let file_to_open = valid_files_to_open_task.await;
-                                        terminal_view
-                                            .update(cx, |terminal_view, _| match file_to_open {
-                                                Some(
-                                                    OpenTarget::File(path, _)
-                                                    | OpenTarget::Worktree(path, _),
-                                                ) => {
-                                                    terminal_view.hover = Some(HoverTarget {
-                                                        tooltip: path.to_string(|path| {
-                                                            path.to_string_lossy().to_string()
-                                                        }),
-                                                        hovered_word,
-                                                    });
-                                                }
-                                                None => {
-                                                    terminal_view.hover = None;
-                                                }
-                                            })
-                                            .ok();
-                                    });
                                 cx.notify();
                             }
                         }
@@ -1110,86 +1086,13 @@ fn subscribe_for_terminal_events(
 
                 Event::Open(maybe_navigation_target) => match maybe_navigation_target {
                     MaybeNavigationTarget::Url(url) => cx.open_url(url),
-
-                    MaybeNavigationTarget::PathLike(path_like_target) => {
-                        if terminal_view.hover.is_none() {
-                            return;
-                        }
-                        let task_workspace = workspace.clone();
-                        let path_like_target = path_like_target.clone();
-                        cx.spawn_in(window, async move |terminal_view, cx| {
-                            let open_target = terminal_view
-                                .update(cx, |_, cx| {
-                                    possible_open_target(
-                                        &task_workspace,
-                                        &path_like_target.terminal_dir,
-                                        &path_like_target.maybe_path,
-                                        cx,
-                                    )
-                                })?
-                                .await;
-                            if let Some(open_target) = open_target {
-                                let path_to_open = open_target.path();
-                                let opened_items = task_workspace
-                                    .update_in(cx, |workspace, window, cx| {
-                                        workspace.open_paths(
-                                            vec![path_to_open.path.clone()],
-                                            OpenOptions {
-                                                visible: Some(OpenVisible::OnlyDirectories),
-                                                ..Default::default()
-                                            },
-                                            None,
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .context("workspace update")?
-                                    .await;
-                                if opened_items.len() != 1 {
-                                    debug_panic!(
-                                        "Received {} items for one path {path_to_open:?}",
-                                        opened_items.len(),
-                                    );
-                                }
-
-                                if let Some(opened_item) = opened_items.first() {
-                                    if open_target.is_file() {
-                                        if let Some(Ok(opened_item)) = opened_item
-                                            && let Some(row) = path_to_open.row
-                                        {
-                                            let col = path_to_open.column.unwrap_or(0);
-                                            if let Some(active_editor) =
-                                                opened_item.downcast::<Editor>()
-                                            {
-                                                active_editor
-                                                    .downgrade()
-                                                    .update_in(cx, |editor, window, cx| {
-                                                        editor.go_to_singleton_buffer_point(
-                                                            language::Point::new(
-                                                                row.saturating_sub(1),
-                                                                col.saturating_sub(1),
-                                                            ),
-                                                            window,
-                                                            cx,
-                                                        )
-                                                    })
-                                                    .log_err();
-                                            }
-                                        }
-                                    } else if open_target.is_dir() {
-                                        task_workspace.update(cx, |workspace, cx| {
-                                            workspace.project().update(cx, |_, cx| {
-                                                cx.emit(project::Event::ActivateProjectPanel);
-                                            })
-                                        })?;
-                                    }
-                                }
-                            }
-
-                            anyhow::Ok(())
-                        })
-                        .detach_and_log_err(cx)
-                    }
+                    MaybeNavigationTarget::PathLike(path_like_target) => open_path_like_target(
+                        &workspace,
+                        terminal_view,
+                        path_like_target,
+                        window,
+                        cx,
+                    ),
                 },
                 Event::BreadcrumbsChanged => cx.emit(ItemEvent::UpdateBreadcrumbs),
                 Event::CloseTerminal => cx.emit(ItemEvent::CloseItem),
@@ -1203,241 +1106,6 @@ fn subscribe_for_terminal_events(
     vec![terminal_subscription, terminal_events_subscription]
 }
 
-#[derive(Debug, Clone)]
-enum OpenTarget {
-    Worktree(PathWithPosition, Entry),
-    File(PathWithPosition, Metadata),
-}
-
-impl OpenTarget {
-    fn is_file(&self) -> bool {
-        match self {
-            OpenTarget::Worktree(_, entry) => entry.is_file(),
-            OpenTarget::File(_, metadata) => !metadata.is_dir,
-        }
-    }
-
-    fn is_dir(&self) -> bool {
-        match self {
-            OpenTarget::Worktree(_, entry) => entry.is_dir(),
-            OpenTarget::File(_, metadata) => metadata.is_dir,
-        }
-    }
-
-    fn path(&self) -> &PathWithPosition {
-        match self {
-            OpenTarget::Worktree(path, _) => path,
-            OpenTarget::File(path, _) => path,
-        }
-    }
-}
-
-fn possible_open_target(
-    workspace: &WeakEntity<Workspace>,
-    cwd: &Option<PathBuf>,
-    maybe_path: &str,
-    cx: &App,
-) -> Task<Option<OpenTarget>> {
-    let Some(workspace) = workspace.upgrade() else {
-        return Task::ready(None);
-    };
-    // We have to check for both paths, as on Unix, certain paths with positions are valid file paths too.
-    // We can be on FS remote part, without real FS, so cannot canonicalize or check for existence the path right away.
-    let mut potential_paths = Vec::new();
-    let original_path = PathWithPosition::from_path(PathBuf::from(maybe_path));
-    let path_with_position = PathWithPosition::parse_str(maybe_path);
-    let worktree_candidates = workspace
-        .read(cx)
-        .worktrees(cx)
-        .sorted_by_key(|worktree| {
-            let worktree_root = worktree.read(cx).abs_path();
-            match cwd
-                .as_ref()
-                .and_then(|cwd| worktree_root.strip_prefix(cwd).ok())
-            {
-                Some(cwd_child) => cwd_child.components().count(),
-                None => usize::MAX,
-            }
-        })
-        .collect::<Vec<_>>();
-    // Since we do not check paths via FS and joining, we need to strip off potential `./`, `a/`, `b/` prefixes out of it.
-    for prefix_str in GIT_DIFF_PATH_PREFIXES.iter().chain(std::iter::once(&".")) {
-        if let Some(stripped) = original_path.path.strip_prefix(prefix_str).ok() {
-            potential_paths.push(PathWithPosition {
-                path: stripped.to_owned(),
-                row: original_path.row,
-                column: original_path.column,
-            });
-        }
-        if let Some(stripped) = path_with_position.path.strip_prefix(prefix_str).ok() {
-            potential_paths.push(PathWithPosition {
-                path: stripped.to_owned(),
-                row: path_with_position.row,
-                column: path_with_position.column,
-            });
-        }
-    }
-
-    let insert_both_paths = original_path != path_with_position;
-    potential_paths.insert(0, original_path);
-    if insert_both_paths {
-        potential_paths.insert(1, path_with_position);
-    }
-
-    // If we won't find paths "easily", we can traverse the entire worktree to look what ends with the potential path suffix.
-    // That will be slow, though, so do the fast checks first.
-    let mut worktree_paths_to_check = Vec::new();
-    for worktree in &worktree_candidates {
-        let worktree_root = worktree.read(cx).abs_path();
-        let mut paths_to_check = Vec::with_capacity(potential_paths.len());
-
-        for path_with_position in &potential_paths {
-            let path_to_check = if worktree_root.ends_with(&path_with_position.path) {
-                let root_path_with_position = PathWithPosition {
-                    path: worktree_root.to_path_buf(),
-                    row: path_with_position.row,
-                    column: path_with_position.column,
-                };
-                match worktree.read(cx).root_entry() {
-                    Some(root_entry) => {
-                        return Task::ready(Some(OpenTarget::Worktree(
-                            root_path_with_position,
-                            root_entry.clone(),
-                        )));
-                    }
-                    None => root_path_with_position,
-                }
-            } else {
-                PathWithPosition {
-                    path: path_with_position
-                        .path
-                        .strip_prefix(&worktree_root)
-                        .unwrap_or(&path_with_position.path)
-                        .to_owned(),
-                    row: path_with_position.row,
-                    column: path_with_position.column,
-                }
-            };
-
-            if path_to_check.path.is_relative()
-                && let Some(entry) = worktree.read(cx).entry_for_path(&path_to_check.path)
-            {
-                return Task::ready(Some(OpenTarget::Worktree(
-                    PathWithPosition {
-                        path: worktree_root.join(&entry.path),
-                        row: path_to_check.row,
-                        column: path_to_check.column,
-                    },
-                    entry.clone(),
-                )));
-            }
-
-            paths_to_check.push(path_to_check);
-        }
-
-        if !paths_to_check.is_empty() {
-            worktree_paths_to_check.push((worktree.clone(), paths_to_check));
-        }
-    }
-
-    // Before entire worktree traversal(s), make an attempt to do FS checks if available.
-    let fs_paths_to_check = if workspace.read(cx).project().read(cx).is_local() {
-        potential_paths
-            .into_iter()
-            .flat_map(|path_to_check| {
-                let mut paths_to_check = Vec::new();
-                let maybe_path = &path_to_check.path;
-                if maybe_path.starts_with("~") {
-                    if let Some(home_path) =
-                        maybe_path
-                            .strip_prefix("~")
-                            .ok()
-                            .and_then(|stripped_maybe_path| {
-                                Some(dirs::home_dir()?.join(stripped_maybe_path))
-                            })
-                    {
-                        paths_to_check.push(PathWithPosition {
-                            path: home_path,
-                            row: path_to_check.row,
-                            column: path_to_check.column,
-                        });
-                    }
-                } else {
-                    paths_to_check.push(PathWithPosition {
-                        path: maybe_path.clone(),
-                        row: path_to_check.row,
-                        column: path_to_check.column,
-                    });
-                    if maybe_path.is_relative() {
-                        if let Some(cwd) = &cwd {
-                            paths_to_check.push(PathWithPosition {
-                                path: cwd.join(maybe_path),
-                                row: path_to_check.row,
-                                column: path_to_check.column,
-                            });
-                        }
-                        for worktree in &worktree_candidates {
-                            paths_to_check.push(PathWithPosition {
-                                path: worktree.read(cx).abs_path().join(maybe_path),
-                                row: path_to_check.row,
-                                column: path_to_check.column,
-                            });
-                        }
-                    }
-                }
-                paths_to_check
-            })
-            .collect()
-    } else {
-        Vec::new()
-    };
-
-    let worktree_check_task = cx.spawn(async move |cx| {
-        for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
-            let found_entry = worktree
-                .update(cx, |worktree, _| {
-                    let worktree_root = worktree.abs_path();
-                    let traversal = worktree.traverse_from_path(true, true, false, "".as_ref());
-                    for entry in traversal {
-                        if let Some(path_in_worktree) = worktree_paths_to_check
-                            .iter()
-                            .find(|path_to_check| entry.path.ends_with(&path_to_check.path))
-                        {
-                            return Some(OpenTarget::Worktree(
-                                PathWithPosition {
-                                    path: worktree_root.join(&entry.path),
-                                    row: path_in_worktree.row,
-                                    column: path_in_worktree.column,
-                                },
-                                entry.clone(),
-                            ));
-                        }
-                    }
-                    None
-                })
-                .ok()?;
-            if let Some(found_entry) = found_entry {
-                return Some(found_entry);
-            }
-        }
-        None
-    });
-
-    let fs = workspace.read(cx).project().read(cx).fs().clone();
-    cx.background_spawn(async move {
-        for mut path_to_check in fs_paths_to_check {
-            if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
-                && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
-            {
-                path_to_check.path = fs_path_to_check;
-                return Some(OpenTarget::File(path_to_check, metadata));
-            }
-        }
-
-        worktree_check_task.await
-    })
-}
-
 fn regex_search_for_query(query: &project::search::SearchQuery) -> Option<RegexSearch> {
     let str = query.as_str();
     if query.is_regex() {

From 33e05f15b254b9d25aa0ddb03cdcc5a191afb7d7 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 21 Aug 2025 20:50:06 +0200
Subject: [PATCH 273/823] collab_ui: Fix channel text bleeding through buttons
 on hover (#36710)

Release Notes:

- N/A
---
 crates/collab_ui/src/collab_panel.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index cd37549783..d85a6610a5 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2905,6 +2905,8 @@ impl CollabPanel {
                 h_flex().absolute().right(rems(0.)).h_full().child(
                     h_flex()
                         .h_full()
+                        .bg(cx.theme().colors().background)
+                        .rounded_l_sm()
                         .gap_1()
                         .px_1()
                         .child(
@@ -2920,8 +2922,7 @@ impl CollabPanel {
                                 .on_click(cx.listener(move |this, _, window, cx| {
                                     this.join_channel_chat(channel_id, window, cx)
                                 }))
-                                .tooltip(Tooltip::text("Open channel chat"))
-                                .visible_on_hover(""),
+                                .tooltip(Tooltip::text("Open channel chat")),
                         )
                         .child(
                             IconButton::new("channel_notes", IconName::Reader)
@@ -2936,9 +2937,9 @@ impl CollabPanel {
                                 .on_click(cx.listener(move |this, _, window, cx| {
                                     this.open_channel_notes(channel_id, window, cx)
                                 }))
-                                .tooltip(Tooltip::text("Open channel notes"))
-                                .visible_on_hover(""),
-                        ),
+                                .tooltip(Tooltip::text("Open channel notes")),
+                        )
+                        .visible_on_hover(""),
                 ),
             )
             .tooltip({

From d0583ede48fb1918da41beca68dd3aacd7174cb6 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 21 Aug 2025 12:06:27 -0700
Subject: [PATCH 274/823] acp: Move ignored integration tests behind e2e flag
 (#36711)

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs | 44 +++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 3bd1be497e..edba227da7 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -32,17 +32,22 @@ mod test_tools;
 use test_tools::*;
 
 #[gpui::test]
-#[ignore = "can't run on CI yet"]
 async fn test_echo(cx: &mut TestAppContext) {
-    let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
 
     let events = thread
         .update(cx, |thread, cx| {
             thread.send(UserMessageId::new(), ["Testing: Reply with 'Hello'"], cx)
         })
-        .unwrap()
-        .collect()
-        .await;
+        .unwrap();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_text_chunk("Hello");
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+
+    let events = events.collect().await;
     thread.update(cx, |thread, _cx| {
         assert_eq!(
             thread.last_message().unwrap().to_markdown(),
@@ -57,9 +62,9 @@ async fn test_echo(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[ignore = "can't run on CI yet"]
 async fn test_thinking(cx: &mut TestAppContext) {
-    let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4Thinking).await;
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
 
     let events = thread
         .update(cx, |thread, cx| {
@@ -74,9 +79,18 @@ async fn test_thinking(cx: &mut TestAppContext) {
                 cx,
             )
         })
-        .unwrap()
-        .collect()
-        .await;
+        .unwrap();
+    cx.run_until_parked();
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Thinking {
+        text: "Think".to_string(),
+        signature: None,
+    });
+    fake_model.send_last_completion_stream_text_chunk("Hello");
+    fake_model
+        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
+    fake_model.end_last_completion_stream();
+
+    let events = events.collect().await;
     thread.update(cx, |thread, _cx| {
         assert_eq!(
             thread.last_message().unwrap().to_markdown(),
@@ -271,7 +285,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[ignore = "can't run on CI yet"]
+#[cfg_attr(not(feature = "e2e"), ignore)]
 async fn test_basic_tool_calls(cx: &mut TestAppContext) {
     let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
 
@@ -331,7 +345,7 @@ async fn test_basic_tool_calls(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[ignore = "can't run on CI yet"]
+#[cfg_attr(not(feature = "e2e"), ignore)]
 async fn test_streaming_tool_calls(cx: &mut TestAppContext) {
     let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
 
@@ -794,7 +808,7 @@ async fn next_tool_call_authorization(
 }
 
 #[gpui::test]
-#[ignore = "can't run on CI yet"]
+#[cfg_attr(not(feature = "e2e"), ignore)]
 async fn test_concurrent_tool_calls(cx: &mut TestAppContext) {
     let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
 
@@ -919,7 +933,7 @@ async fn test_profiles(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[ignore = "can't run on CI yet"]
+#[cfg_attr(not(feature = "e2e"), ignore)]
 async fn test_cancellation(cx: &mut TestAppContext) {
     let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
 
@@ -1797,7 +1811,6 @@ struct ThreadTest {
 
 enum TestModel {
     Sonnet4,
-    Sonnet4Thinking,
     Fake,
 }
 
@@ -1805,7 +1818,6 @@ impl TestModel {
     fn id(&self) -> LanguageModelId {
         match self {
             TestModel::Sonnet4 => LanguageModelId("claude-sonnet-4-latest".into()),
-            TestModel::Sonnet4Thinking => LanguageModelId("claude-sonnet-4-thinking-latest".into()),
             TestModel::Fake => unreachable!(),
         }
     }

From 725ed5dd01f18d6b2994435152d7fad37ed9765b Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Thu, 21 Aug 2025 16:56:15 -0300
Subject: [PATCH 275/823] acp: Hide loading diff animation for external agents
 and update in place (#36699)

The loading diff animation can be jarring for external agents because
they stream the diff at the same time the tool call is pushed, so it's
only displayed while we're asynchronously calculating the diff. We'll
now only show it for the native agent.

Also, we'll now only update the diff when it changes, which avoids
unnecessarily hiding it for a few frames.

Release Notes:

- N/A

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/acp_thread/src/acp_thread.rs    | 41 ++++++++++++++++--
 crates/acp_thread/src/diff.rs          | 59 +++++++++++++++++++-------
 crates/agent_ui/src/acp/thread_view.rs |  6 ++-
 3 files changed, 85 insertions(+), 21 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 61bc50576a..a45787f039 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -238,10 +238,21 @@ impl ToolCall {
         }
 
         if let Some(content) = content {
-            self.content = content
-                .into_iter()
-                .map(|chunk| ToolCallContent::from_acp(chunk, language_registry.clone(), cx))
-                .collect();
+            let new_content_len = content.len();
+            let mut content = content.into_iter();
+
+            // Reuse existing content if we can
+            for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
+                old.update_from_acp(new, language_registry.clone(), cx);
+            }
+            for new in content {
+                self.content.push(ToolCallContent::from_acp(
+                    new,
+                    language_registry.clone(),
+                    cx,
+                ))
+            }
+            self.content.truncate(new_content_len);
         }
 
         if let Some(locations) = locations {
@@ -551,6 +562,28 @@ impl ToolCallContent {
         }
     }
 
+    pub fn update_from_acp(
+        &mut self,
+        new: acp::ToolCallContent,
+        language_registry: Arc<LanguageRegistry>,
+        cx: &mut App,
+    ) {
+        let needs_update = match (&self, &new) {
+            (Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
+                old_diff.read(cx).needs_update(
+                    new_diff.old_text.as_deref().unwrap_or(""),
+                    &new_diff.new_text,
+                    cx,
+                )
+            }
+            _ => true,
+        };
+
+        if needs_update {
+            *self = Self::from_acp(new, language_registry, cx);
+        }
+    }
+
     pub fn to_markdown(&self, cx: &App) -> String {
         match self {
             Self::ContentBlock(content) => content.to_markdown(cx).to_string(),
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index 130bc3ab6b..59f907dcc4 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -28,10 +28,12 @@ impl Diff {
         cx: &mut Context<Self>,
     ) -> Self {
         let multibuffer = cx.new(|_cx| MultiBuffer::without_headers(Capability::ReadOnly));
-        let buffer = cx.new(|cx| Buffer::local(new_text, cx));
+        let new_buffer = cx.new(|cx| Buffer::local(new_text, cx));
+        let base_text = old_text.clone().unwrap_or(String::new()).into();
         let task = cx.spawn({
             let multibuffer = multibuffer.clone();
             let path = path.clone();
+            let buffer = new_buffer.clone();
             async move |_, cx| {
                 let language = language_registry
                     .language_for_file_path(&path)
@@ -76,6 +78,8 @@ impl Diff {
         Self::Finalized(FinalizedDiff {
             multibuffer,
             path,
+            base_text,
+            new_buffer,
             _update_diff: task,
         })
     }
@@ -119,7 +123,7 @@ impl Diff {
                     diff.update(cx);
                 }
             }),
-            buffer,
+            new_buffer: buffer,
             diff: buffer_diff,
             revealed_ranges: Vec::new(),
             update_diff: Task::ready(Ok(())),
@@ -154,9 +158,9 @@ impl Diff {
             .map(|buffer| buffer.read(cx).text())
             .join("\n");
         let path = match self {
-            Diff::Pending(PendingDiff { buffer, .. }) => {
-                buffer.read(cx).file().map(|file| file.path().as_ref())
-            }
+            Diff::Pending(PendingDiff {
+                new_buffer: buffer, ..
+            }) => buffer.read(cx).file().map(|file| file.path().as_ref()),
             Diff::Finalized(FinalizedDiff { path, .. }) => Some(path.as_path()),
         };
         format!(
@@ -169,12 +173,33 @@ impl Diff {
     pub fn has_revealed_range(&self, cx: &App) -> bool {
         self.multibuffer().read(cx).excerpt_paths().next().is_some()
     }
+
+    pub fn needs_update(&self, old_text: &str, new_text: &str, cx: &App) -> bool {
+        match self {
+            Diff::Pending(PendingDiff {
+                base_text,
+                new_buffer,
+                ..
+            }) => {
+                base_text.as_str() != old_text
+                    || !new_buffer.read(cx).as_rope().chunks().equals_str(new_text)
+            }
+            Diff::Finalized(FinalizedDiff {
+                base_text,
+                new_buffer,
+                ..
+            }) => {
+                base_text.as_str() != old_text
+                    || !new_buffer.read(cx).as_rope().chunks().equals_str(new_text)
+            }
+        }
+    }
 }
 
 pub struct PendingDiff {
     multibuffer: Entity<MultiBuffer>,
     base_text: Arc<String>,
-    buffer: Entity<Buffer>,
+    new_buffer: Entity<Buffer>,
     diff: Entity<BufferDiff>,
     revealed_ranges: Vec<Range<Anchor>>,
     _subscription: Subscription,
@@ -183,7 +208,7 @@ pub struct PendingDiff {
 
 impl PendingDiff {
     pub fn update(&mut self, cx: &mut Context<Diff>) {
-        let buffer = self.buffer.clone();
+        let buffer = self.new_buffer.clone();
         let buffer_diff = self.diff.clone();
         let base_text = self.base_text.clone();
         self.update_diff = cx.spawn(async move |diff, cx| {
@@ -221,10 +246,10 @@ impl PendingDiff {
     fn finalize(&self, cx: &mut Context<Diff>) -> FinalizedDiff {
         let ranges = self.excerpt_ranges(cx);
         let base_text = self.base_text.clone();
-        let language_registry = self.buffer.read(cx).language_registry();
+        let language_registry = self.new_buffer.read(cx).language_registry();
 
         let path = self
-            .buffer
+            .new_buffer
             .read(cx)
             .file()
             .map(|file| file.path().as_ref())
@@ -233,12 +258,12 @@ impl PendingDiff {
 
         // Replace the buffer in the multibuffer with the snapshot
         let buffer = cx.new(|cx| {
-            let language = self.buffer.read(cx).language().cloned();
+            let language = self.new_buffer.read(cx).language().cloned();
             let buffer = TextBuffer::new_normalized(
                 0,
                 cx.entity_id().as_non_zero_u64().into(),
-                self.buffer.read(cx).line_ending(),
-                self.buffer.read(cx).as_rope().clone(),
+                self.new_buffer.read(cx).line_ending(),
+                self.new_buffer.read(cx).as_rope().clone(),
             );
             let mut buffer = Buffer::build(buffer, None, Capability::ReadWrite);
             buffer.set_language(language, cx);
@@ -274,7 +299,9 @@ impl PendingDiff {
 
         FinalizedDiff {
             path,
+            base_text: self.base_text.clone(),
             multibuffer: self.multibuffer.clone(),
+            new_buffer: self.new_buffer.clone(),
             _update_diff: update_diff,
         }
     }
@@ -283,8 +310,8 @@ impl PendingDiff {
         let ranges = self.excerpt_ranges(cx);
         self.multibuffer.update(cx, |multibuffer, cx| {
             multibuffer.set_excerpts_for_path(
-                PathKey::for_buffer(&self.buffer, cx),
-                self.buffer.clone(),
+                PathKey::for_buffer(&self.new_buffer, cx),
+                self.new_buffer.clone(),
                 ranges,
                 editor::DEFAULT_MULTIBUFFER_CONTEXT,
                 cx,
@@ -296,7 +323,7 @@ impl PendingDiff {
     }
 
     fn excerpt_ranges(&self, cx: &App) -> Vec<Range<Point>> {
-        let buffer = self.buffer.read(cx);
+        let buffer = self.new_buffer.read(cx);
         let diff = self.diff.read(cx);
         let mut ranges = diff
             .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
@@ -330,6 +357,8 @@ impl PendingDiff {
 
 pub struct FinalizedDiff {
     path: PathBuf,
+    base_text: Arc<String>,
+    new_buffer: Entity<Buffer>,
     multibuffer: Entity<MultiBuffer>,
     _update_diff: Task<Result<()>>,
 }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 7e330b7e6f..a15f764375 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1625,7 +1625,9 @@ impl AcpThreadView {
                         .into_any()
                 }
                 ToolCallStatus::Pending | ToolCallStatus::InProgress
-                    if is_edit && tool_call.content.is_empty() =>
+                    if is_edit
+                        && tool_call.content.is_empty()
+                        && self.as_native_connection(cx).is_some() =>
                 {
                     self.render_diff_loading(cx).into_any()
                 }
@@ -1981,7 +1983,7 @@ impl AcpThreadView {
                     && diff.read(cx).has_revealed_range(cx)
                 {
                     editor.into_any_element()
-                } else if tool_progress {
+                } else if tool_progress && self.as_native_connection(cx).is_some() {
                     self.render_diff_loading(cx)
                 } else {
                     Empty.into_any()

From 2234f91b7b335f43105a3f323b94db85c11eb126 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Thu, 21 Aug 2025 16:56:40 -0300
Subject: [PATCH 276/823] acp: Remove invalid creases on edit (#36708)

Release Notes:

- N/A

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/agent_ui/src/acp/message_editor.rs | 54 +++++++++++++----------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index dc31c5fe10..8f5044cb21 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -11,7 +11,7 @@ use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
 use editor::{
     Addon, Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorEvent, EditorMode, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer,
+    EditorEvent, EditorMode, EditorSnapshot, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer,
     SemanticsProvider, ToOffset,
     actions::Paste,
     display_map::{Crease, CreaseId, FoldId},
@@ -140,11 +140,11 @@ impl MessageEditor {
         .detach();
 
         let mut subscriptions = Vec::new();
-        if prevent_slash_commands {
-            subscriptions.push(cx.subscribe_in(&editor, window, {
-                let semantics_provider = semantics_provider.clone();
-                move |this, editor, event, window, cx| {
-                    if let EditorEvent::Edited { .. } = event {
+        subscriptions.push(cx.subscribe_in(&editor, window, {
+            let semantics_provider = semantics_provider.clone();
+            move |this, editor, event, window, cx| {
+                if let EditorEvent::Edited { .. } = event {
+                    if prevent_slash_commands {
                         this.highlight_slash_command(
                             semantics_provider.clone(),
                             editor.clone(),
@@ -152,9 +152,12 @@ impl MessageEditor {
                             cx,
                         );
                     }
+                    let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
+                    this.mention_set.remove_invalid(snapshot);
+                    cx.notify();
                 }
-            }));
-        }
+            }
+        }));
 
         Self {
             editor,
@@ -730,11 +733,6 @@ impl MessageEditor {
                 editor.display_map.update(cx, |map, cx| {
                     let snapshot = map.snapshot(cx);
                     for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-                        // Skip creases that have been edited out of the message buffer.
-                        if !crease.range().start.is_valid(&snapshot.buffer_snapshot) {
-                            continue;
-                        }
-
                         let Some(mention) = contents.get(&crease_id) else {
                             continue;
                         };
@@ -1482,17 +1480,6 @@ impl MentionSet {
         self.text_thread_summaries.insert(path, task);
     }
 
-    pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
-        self.fetch_results.clear();
-        self.thread_summaries.clear();
-        self.text_thread_summaries.clear();
-        self.directories.clear();
-        self.uri_by_crease_id
-            .drain()
-            .map(|(id, _)| id)
-            .chain(self.images.drain().map(|(id, _)| id))
-    }
-
     pub fn contents(
         &self,
         project: &Entity<Project>,
@@ -1703,6 +1690,25 @@ impl MentionSet {
             anyhow::Ok(contents)
         })
     }
+
+    pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
+        self.fetch_results.clear();
+        self.thread_summaries.clear();
+        self.text_thread_summaries.clear();
+        self.directories.clear();
+        self.uri_by_crease_id
+            .drain()
+            .map(|(id, _)| id)
+            .chain(self.images.drain().map(|(id, _)| id))
+    }
+
+    pub fn remove_invalid(&mut self, snapshot: EditorSnapshot) {
+        for (crease_id, crease) in snapshot.crease_snapshot.creases() {
+            if !crease.range().start.is_valid(&snapshot.buffer_snapshot) {
+                self.uri_by_crease_id.remove(&crease_id);
+            }
+        }
+    }
 }
 
 struct SlashCommandSemanticsProvider {

From 555692fac6b8e2002296f661ebea8ac50cd42a87 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:05:29 -0300
Subject: [PATCH 277/823] thread view: Add improvements to the UI (#36680)

Release Notes:

- N/A
---
 crates/agent_servers/src/claude.rs            |   2 +-
 crates/agent_ui/src/acp/thread_view.rs        | 108 +++++-----
 crates/ui/src/components/disclosure.rs        |  14 +-
 crates/ui/src/components/label.rs             |   2 +
 .../ui/src/components/label/spinner_label.rs  | 192 ++++++++++++++++++
 5 files changed, 269 insertions(+), 49 deletions(-)
 create mode 100644 crates/ui/src/components/label/spinner_label.rs

diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index ef666974f1..d6ccabb130 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -44,7 +44,7 @@ pub struct ClaudeCode;
 
 impl AgentServer for ClaudeCode {
     fn name(&self) -> &'static str {
-        "Claude Code"
+        "Welcome to Claude Code"
     }
 
     fn empty_state_headline(&self) -> &'static str {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index a15f764375..05d31051b2 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -41,7 +41,7 @@ use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
     Callout, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding, PopoverMenuHandle,
-    Scrollbar, ScrollbarState, Tooltip, prelude::*,
+    Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -1205,7 +1205,7 @@ impl AcpThreadView {
                                 div()
                                     .py_3()
                                     .px_2()
-                                    .rounded_lg()
+                                    .rounded_md()
                                     .shadow_md()
                                     .bg(cx.theme().colors().editor_background)
                                     .border_1()
@@ -1263,7 +1263,7 @@ impl AcpThreadView {
                     .into_any()
             }
             AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) => {
-                let style = default_markdown_style(false, window, cx);
+                let style = default_markdown_style(false, false, window, cx);
                 let message_body = v_flex()
                     .w_full()
                     .gap_2p5()
@@ -1398,8 +1398,6 @@ impl AcpThreadView {
                     .relative()
                     .w_full()
                     .gap_1p5()
-                    .opacity(0.8)
-                    .hover(|style| style.opacity(1.))
                     .child(
                         h_flex()
                             .size_4()
@@ -1440,6 +1438,7 @@ impl AcpThreadView {
                     .child(
                         div()
                             .text_size(self.tool_name_font_size())
+                            .text_color(cx.theme().colors().text_muted)
                             .child("Thinking"),
                     )
                     .on_click(cx.listener({
@@ -1463,9 +1462,10 @@ impl AcpThreadView {
                         .border_l_1()
                         .border_color(self.tool_card_border_color(cx))
                         .text_ui_sm(cx)
-                        .child(
-                            self.render_markdown(chunk, default_markdown_style(false, window, cx)),
-                        ),
+                        .child(self.render_markdown(
+                            chunk,
+                            default_markdown_style(false, false, window, cx),
+                        )),
                 )
             })
             .into_any_element()
@@ -1555,11 +1555,11 @@ impl AcpThreadView {
             | ToolCallStatus::Completed => None,
             ToolCallStatus::InProgress => Some(
                 Icon::new(IconName::ArrowCircle)
-                    .color(Color::Accent)
+                    .color(Color::Muted)
                     .size(IconSize::Small)
                     .with_animation(
                         "running",
-                        Animation::new(Duration::from_secs(2)).repeat(),
+                        Animation::new(Duration::from_secs(3)).repeat(),
                         |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
                     )
                     .into_any(),
@@ -1572,6 +1572,10 @@ impl AcpThreadView {
             ),
         };
 
+        let failed_tool_call = matches!(
+            tool_call.status,
+            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed
+        );
         let needs_confirmation = matches!(
             tool_call.status,
             ToolCallStatus::WaitingForConfirmation { .. }
@@ -1652,7 +1656,7 @@ impl AcpThreadView {
 
         v_flex()
             .when(use_card_layout, |this| {
-                this.rounded_lg()
+                this.rounded_md()
                     .border_1()
                     .border_color(self.tool_card_border_color(cx))
                     .bg(cx.theme().colors().editor_background)
@@ -1664,20 +1668,16 @@ impl AcpThreadView {
                     .w_full()
                     .gap_1()
                     .justify_between()
-                    .map(|this| {
-                        if use_card_layout {
-                            this.pl_2()
-                                .pr_1p5()
-                                .py_1()
-                                .rounded_t_md()
-                                .when(is_open, |this| {
-                                    this.border_b_1()
-                                        .border_color(self.tool_card_border_color(cx))
-                                })
-                                .bg(self.tool_card_header_bg(cx))
-                        } else {
-                            this.opacity(0.8).hover(|style| style.opacity(1.))
-                        }
+                    .when(use_card_layout, |this| {
+                        this.pl_2()
+                            .pr_1p5()
+                            .py_1()
+                            .rounded_t_md()
+                            .when(is_open && !failed_tool_call, |this| {
+                                this.border_b_1()
+                                    .border_color(self.tool_card_border_color(cx))
+                            })
+                            .bg(self.tool_card_header_bg(cx))
                     })
                     .child(
                         h_flex()
@@ -1709,13 +1709,15 @@ impl AcpThreadView {
                                     .px_1p5()
                                     .rounded_sm()
                                     .overflow_x_scroll()
-                                    .opacity(0.8)
                                     .hover(|label| {
-                                        label.opacity(1.).bg(cx
-                                            .theme()
-                                            .colors()
-                                            .element_hover
-                                            .opacity(0.5))
+                                        label.bg(cx.theme().colors().element_hover.opacity(0.5))
+                                    })
+                                    .map(|this| {
+                                        if use_card_layout {
+                                            this.text_color(cx.theme().colors().text)
+                                        } else {
+                                            this.text_color(cx.theme().colors().text_muted)
+                                        }
                                     })
                                     .child(name)
                                     .tooltip(Tooltip::text("Jump to File"))
@@ -1738,7 +1740,7 @@ impl AcpThreadView {
                                             .overflow_x_scroll()
                                             .child(self.render_markdown(
                                                 tool_call.label.clone(),
-                                                default_markdown_style(false, window, cx),
+                                                default_markdown_style(false, true, window, cx),
                                             )),
                                     )
                                     .child(gradient_overlay(gradient_color))
@@ -1804,9 +1806,9 @@ impl AcpThreadView {
             .border_color(self.tool_card_border_color(cx))
             .text_sm()
             .text_color(cx.theme().colors().text_muted)
-            .child(self.render_markdown(markdown, default_markdown_style(false, window, cx)))
+            .child(self.render_markdown(markdown, default_markdown_style(false, false, window, cx)))
             .child(
-                Button::new(button_id, "Collapse Output")
+                Button::new(button_id, "Collapse")
                     .full_width()
                     .style(ButtonStyle::Outlined)
                     .label_size(LabelSize::Small)
@@ -2131,7 +2133,7 @@ impl AcpThreadView {
                             .to_string()
                     } else {
                         format!(
-                            "Output is {} long—to avoid unexpected token usage, \
+                            "Output is {} long, and to avoid unexpected token usage, \
                                 only 16 KB was sent back to the model.",
                             format_file_size(output.original_content_len as u64, true),
                         )
@@ -2199,7 +2201,7 @@ impl AcpThreadView {
             .border_1()
             .when(tool_failed || command_failed, |card| card.border_dashed())
             .border_color(border_color)
-            .rounded_lg()
+            .rounded_md()
             .overflow_hidden()
             .child(
                 v_flex()
@@ -2553,9 +2555,10 @@ impl AcpThreadView {
                     .into_any(),
             )
             .children(description.map(|desc| {
-                div().text_ui(cx).text_center().child(
-                    self.render_markdown(desc.clone(), default_markdown_style(false, window, cx)),
-                )
+                div().text_ui(cx).text_center().child(self.render_markdown(
+                    desc.clone(),
+                    default_markdown_style(false, false, window, cx),
+                ))
             }))
             .children(
                 configuration_view
@@ -3379,7 +3382,7 @@ impl AcpThreadView {
                                         "used-tokens-label",
                                         Animation::new(Duration::from_secs(2))
                                             .repeat()
-                                            .with_easing(pulsating_between(0.6, 1.)),
+                                            .with_easing(pulsating_between(0.3, 0.8)),
                                         |label, delta| label.alpha(delta),
                                     )
                                     .into_any()
@@ -4636,9 +4639,9 @@ impl Render for AcpThreadView {
                                     ThreadStatus::Idle
                                     | ThreadStatus::WaitingForToolConfirmation => None,
                                     ThreadStatus::Generating => div()
-                                        .px_5()
                                         .py_2()
-                                        .child(LoadingLabel::new("").size(LabelSize::Small))
+                                        .px(rems_from_px(22.))
+                                        .child(SpinnerLabel::new().size(LabelSize::Small))
                                         .into(),
                                 },
                             )
@@ -4671,7 +4674,12 @@ impl Render for AcpThreadView {
     }
 }
 
-fn default_markdown_style(buffer_font: bool, window: &Window, cx: &App) -> MarkdownStyle {
+fn default_markdown_style(
+    buffer_font: bool,
+    muted_text: bool,
+    window: &Window,
+    cx: &App,
+) -> MarkdownStyle {
     let theme_settings = ThemeSettings::get_global(cx);
     let colors = cx.theme().colors();
 
@@ -4692,20 +4700,26 @@ fn default_markdown_style(buffer_font: bool, window: &Window, cx: &App) -> Markd
         TextSize::Default.rems(cx)
     };
 
+    let text_color = if muted_text {
+        colors.text_muted
+    } else {
+        colors.text
+    };
+
     text_style.refine(&TextStyleRefinement {
         font_family: Some(font_family),
         font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
         font_features: Some(theme_settings.ui_font.features.clone()),
         font_size: Some(font_size.into()),
         line_height: Some(line_height.into()),
-        color: Some(cx.theme().colors().text),
+        color: Some(text_color),
         ..Default::default()
     });
 
     MarkdownStyle {
         base_text_style: text_style.clone(),
         syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: colors.element_selection_background,
         code_block_overflow_x_scroll: true,
         table_overflow_x_scroll: true,
         heading_level_styles: Some(HeadingLevelStyles {
@@ -4791,7 +4805,7 @@ fn plan_label_markdown_style(
     window: &Window,
     cx: &App,
 ) -> MarkdownStyle {
-    let default_md_style = default_markdown_style(false, window, cx);
+    let default_md_style = default_markdown_style(false, false, window, cx);
 
     MarkdownStyle {
         base_text_style: TextStyle {
@@ -4811,7 +4825,7 @@ fn plan_label_markdown_style(
 }
 
 fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let default_md_style = default_markdown_style(true, window, cx);
+    let default_md_style = default_markdown_style(true, false, window, cx);
 
     MarkdownStyle {
         base_text_style: TextStyle {
diff --git a/crates/ui/src/components/disclosure.rs b/crates/ui/src/components/disclosure.rs
index 98406cd1e2..4bb3419176 100644
--- a/crates/ui/src/components/disclosure.rs
+++ b/crates/ui/src/components/disclosure.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use gpui::{ClickEvent, CursorStyle};
+use gpui::{ClickEvent, CursorStyle, SharedString};
 
 use crate::{Color, IconButton, IconButtonShape, IconName, IconSize, prelude::*};
 
@@ -14,6 +14,7 @@ pub struct Disclosure {
     cursor_style: CursorStyle,
     opened_icon: IconName,
     closed_icon: IconName,
+    visible_on_hover: Option<SharedString>,
 }
 
 impl Disclosure {
@@ -27,6 +28,7 @@ impl Disclosure {
             cursor_style: CursorStyle::PointingHand,
             opened_icon: IconName::ChevronDown,
             closed_icon: IconName::ChevronRight,
+            visible_on_hover: None,
         }
     }
 
@@ -73,6 +75,13 @@ impl Clickable for Disclosure {
     }
 }
 
+impl VisibleOnHover for Disclosure {
+    fn visible_on_hover(mut self, group_name: impl Into<SharedString>) -> Self {
+        self.visible_on_hover = Some(group_name.into());
+        self
+    }
+}
+
 impl RenderOnce for Disclosure {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
         IconButton::new(
@@ -87,6 +96,9 @@ impl RenderOnce for Disclosure {
         .icon_size(IconSize::Small)
         .disabled(self.disabled)
         .toggle_state(self.selected)
+        .when_some(self.visible_on_hover.clone(), |this, group_name| {
+            this.visible_on_hover(group_name)
+        })
         .when_some(self.on_toggle, move |this, on_toggle| {
             this.on_click(move |event, window, cx| on_toggle(event, window, cx))
         })
diff --git a/crates/ui/src/components/label.rs b/crates/ui/src/components/label.rs
index 8c9ea62424..dc830559ca 100644
--- a/crates/ui/src/components/label.rs
+++ b/crates/ui/src/components/label.rs
@@ -2,8 +2,10 @@ mod highlighted_label;
 mod label;
 mod label_like;
 mod loading_label;
+mod spinner_label;
 
 pub use highlighted_label::*;
 pub use label::*;
 pub use label_like::*;
 pub use loading_label::*;
+pub use spinner_label::*;
diff --git a/crates/ui/src/components/label/spinner_label.rs b/crates/ui/src/components/label/spinner_label.rs
new file mode 100644
index 0000000000..b7b65fbcc9
--- /dev/null
+++ b/crates/ui/src/components/label/spinner_label.rs
@@ -0,0 +1,192 @@
+use crate::prelude::*;
+use gpui::{Animation, AnimationExt, FontWeight};
+use std::time::Duration;
+
+/// Different types of spinner animations
+#[derive(Debug, Default, Clone, Copy, PartialEq)]
+pub enum SpinnerVariant {
+    #[default]
+    Dots,
+    DotsVariant,
+}
+
+/// A spinner indication, based on the label component, that loops through
+/// frames of the specified animation. It implements `LabelCommon` as well.
+///
+/// # Default Example
+///
+/// ```
+/// use ui::{SpinnerLabel};
+///
+/// SpinnerLabel::new();
+/// ```
+///
+/// # Variant Example
+///
+/// ```
+/// use ui::{SpinnerLabel};
+///
+/// SpinnerLabel::dots_variant();
+/// ```
+#[derive(IntoElement, RegisterComponent)]
+pub struct SpinnerLabel {
+    base: Label,
+    variant: SpinnerVariant,
+    frames: Vec<&'static str>,
+    duration: Duration,
+}
+
+impl SpinnerVariant {
+    fn frames(&self) -> Vec<&'static str> {
+        match self {
+            SpinnerVariant::Dots => vec!["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
+            SpinnerVariant::DotsVariant => vec!["⣼", "⣹", "⢻", "⠿", "⡟", "⣏", "⣧", "⣶"],
+        }
+    }
+
+    fn duration(&self) -> Duration {
+        match self {
+            SpinnerVariant::Dots => Duration::from_millis(1000),
+            SpinnerVariant::DotsVariant => Duration::from_millis(1000),
+        }
+    }
+
+    fn animation_id(&self) -> &'static str {
+        match self {
+            SpinnerVariant::Dots => "spinner_label_dots",
+            SpinnerVariant::DotsVariant => "spinner_label_dots_variant",
+        }
+    }
+}
+
+impl SpinnerLabel {
+    pub fn new() -> Self {
+        Self::with_variant(SpinnerVariant::default())
+    }
+
+    pub fn with_variant(variant: SpinnerVariant) -> Self {
+        let frames = variant.frames();
+        let duration = variant.duration();
+
+        SpinnerLabel {
+            base: Label::new(frames[0]),
+            variant,
+            frames,
+            duration,
+        }
+    }
+
+    pub fn dots() -> Self {
+        Self::with_variant(SpinnerVariant::Dots)
+    }
+
+    pub fn dots_variant() -> Self {
+        Self::with_variant(SpinnerVariant::DotsVariant)
+    }
+}
+
+impl LabelCommon for SpinnerLabel {
+    fn size(mut self, size: LabelSize) -> Self {
+        self.base = self.base.size(size);
+        self
+    }
+
+    fn weight(mut self, weight: FontWeight) -> Self {
+        self.base = self.base.weight(weight);
+        self
+    }
+
+    fn line_height_style(mut self, line_height_style: LineHeightStyle) -> Self {
+        self.base = self.base.line_height_style(line_height_style);
+        self
+    }
+
+    fn color(mut self, color: Color) -> Self {
+        self.base = self.base.color(color);
+        self
+    }
+
+    fn strikethrough(mut self) -> Self {
+        self.base = self.base.strikethrough();
+        self
+    }
+
+    fn italic(mut self) -> Self {
+        self.base = self.base.italic();
+        self
+    }
+
+    fn alpha(mut self, alpha: f32) -> Self {
+        self.base = self.base.alpha(alpha);
+        self
+    }
+
+    fn underline(mut self) -> Self {
+        self.base = self.base.underline();
+        self
+    }
+
+    fn truncate(mut self) -> Self {
+        self.base = self.base.truncate();
+        self
+    }
+
+    fn single_line(mut self) -> Self {
+        self.base = self.base.single_line();
+        self
+    }
+
+    fn buffer_font(mut self, cx: &App) -> Self {
+        self.base = self.base.buffer_font(cx);
+        self
+    }
+
+    fn inline_code(mut self, cx: &App) -> Self {
+        self.base = self.base.inline_code(cx);
+        self
+    }
+}
+
+impl RenderOnce for SpinnerLabel {
+    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let frames = self.frames.clone();
+        let duration = self.duration;
+
+        self.base.color(Color::Muted).with_animation(
+            self.variant.animation_id(),
+            Animation::new(duration).repeat(),
+            move |mut label, delta| {
+                let frame_index = (delta * frames.len() as f32) as usize % frames.len();
+
+                label.set_text(frames[frame_index]);
+                label
+            },
+        )
+    }
+}
+
+impl Component for SpinnerLabel {
+    fn scope() -> ComponentScope {
+        ComponentScope::Loading
+    }
+
+    fn name() -> &'static str {
+        "Spinner Label"
+    }
+
+    fn sort_name() -> &'static str {
+        "Spinner Label"
+    }
+
+    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
+        let examples = vec![
+            single_example("Default", SpinnerLabel::new().into_any_element()),
+            single_example(
+                "Dots Variant",
+                SpinnerLabel::dots_variant().into_any_element(),
+            ),
+        ];
+
+        Some(example_group(examples).vertical().into_any_element())
+    }
+}

From 731b5d0def52d39a2a4fa6a31b9e21160d71fb13 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 21 Aug 2025 22:24:13 +0200
Subject: [PATCH 278/823] acp: Allow editing of thread titles in agent2
 (#36706)

Release Notes:

- N/A

---------

Co-authored-by: Richard Feldman <oss@rtfeldman.com>
---
 crates/acp_thread/src/acp_thread.rs    |  36 ++++----
 crates/acp_thread/src/connection.rs    |  28 +++++--
 crates/agent2/src/agent.rs             |  71 ++++++++++++----
 crates/agent2/src/tests/mod.rs         |   1 +
 crates/agent2/src/thread.rs            | 109 +++++++++++++------------
 crates/agent_ui/src/acp/thread_view.rs |  83 +++++++++++++++++--
 crates/agent_ui/src/agent_panel.rs     |  31 ++++++-
 7 files changed, 254 insertions(+), 105 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index a45787f039..c748f22275 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1020,10 +1020,19 @@ impl AcpThread {
         cx.emit(AcpThreadEvent::NewEntry);
     }
 
-    pub fn update_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Result<()> {
-        self.title = title;
-        cx.emit(AcpThreadEvent::TitleUpdated);
-        Ok(())
+    pub fn can_set_title(&mut self, cx: &mut Context<Self>) -> bool {
+        self.connection.set_title(&self.session_id, cx).is_some()
+    }
+
+    pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Task<Result<()>> {
+        if title != self.title {
+            self.title = title.clone();
+            cx.emit(AcpThreadEvent::TitleUpdated);
+            if let Some(set_title) = self.connection.set_title(&self.session_id, cx) {
+                return set_title.run(title, cx);
+            }
+        }
+        Task::ready(Ok(()))
     }
 
     pub fn update_token_usage(&mut self, usage: Option<TokenUsage>, cx: &mut Context<Self>) {
@@ -1326,11 +1335,7 @@ impl AcpThread {
         };
         let git_store = self.project.read(cx).git_store().clone();
 
-        let message_id = if self
-            .connection
-            .session_editor(&self.session_id, cx)
-            .is_some()
-        {
+        let message_id = if self.connection.truncate(&self.session_id, cx).is_some() {
             Some(UserMessageId::new())
         } else {
             None
@@ -1476,7 +1481,7 @@ impl AcpThread {
     /// Rewinds this thread to before the entry at `index`, removing it and all
     /// subsequent entries while reverting any changes made from that point.
     pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let Some(session_editor) = self.connection.session_editor(&self.session_id, cx) else {
+        let Some(truncate) = self.connection.truncate(&self.session_id, cx) else {
             return Task::ready(Err(anyhow!("not supported")));
         };
         let Some(message) = self.user_message(&id) else {
@@ -1496,8 +1501,7 @@ impl AcpThread {
                     .await?;
             }
 
-            cx.update(|cx| session_editor.truncate(id.clone(), cx))?
-                .await?;
+            cx.update(|cx| truncate.run(id.clone(), cx))?.await?;
             this.update(cx, |this, cx| {
                 if let Some((ix, _)) = this.user_message_mut(&id) {
                     let range = ix..this.entries.len();
@@ -2652,11 +2656,11 @@ mod tests {
             .detach();
         }
 
-        fn session_editor(
+        fn truncate(
             &self,
             session_id: &acp::SessionId,
             _cx: &mut App,
-        ) -> Option<Rc<dyn AgentSessionEditor>> {
+        ) -> Option<Rc<dyn AgentSessionTruncate>> {
             Some(Rc::new(FakeAgentSessionEditor {
                 _session_id: session_id.clone(),
             }))
@@ -2671,8 +2675,8 @@ mod tests {
         _session_id: acp::SessionId,
     }
 
-    impl AgentSessionEditor for FakeAgentSessionEditor {
-        fn truncate(&self, _message_id: UserMessageId, _cx: &mut App) -> Task<Result<()>> {
+    impl AgentSessionTruncate for FakeAgentSessionEditor {
+        fn run(&self, _message_id: UserMessageId, _cx: &mut App) -> Task<Result<()>> {
             Task::ready(Ok(()))
         }
     }
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 2bbd364873..91e46dbac1 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -50,11 +50,19 @@ pub trait AgentConnection {
 
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);
 
-    fn session_editor(
+    fn truncate(
         &self,
         _session_id: &acp::SessionId,
         _cx: &mut App,
-    ) -> Option<Rc<dyn AgentSessionEditor>> {
+    ) -> Option<Rc<dyn AgentSessionTruncate>> {
+        None
+    }
+
+    fn set_title(
+        &self,
+        _session_id: &acp::SessionId,
+        _cx: &mut App,
+    ) -> Option<Rc<dyn AgentSessionSetTitle>> {
         None
     }
 
@@ -79,14 +87,18 @@ impl dyn AgentConnection {
     }
 }
 
-pub trait AgentSessionEditor {
-    fn truncate(&self, message_id: UserMessageId, cx: &mut App) -> Task<Result<()>>;
+pub trait AgentSessionTruncate {
+    fn run(&self, message_id: UserMessageId, cx: &mut App) -> Task<Result<()>>;
 }
 
 pub trait AgentSessionResume {
     fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>>;
 }
 
+pub trait AgentSessionSetTitle {
+    fn run(&self, title: SharedString, cx: &mut App) -> Task<Result<()>>;
+}
+
 pub trait AgentTelemetry {
     /// The name of the agent used for telemetry.
     fn agent_name(&self) -> String;
@@ -424,11 +436,11 @@ mod test_support {
             }
         }
 
-        fn session_editor(
+        fn truncate(
             &self,
             _session_id: &agent_client_protocol::SessionId,
             _cx: &mut App,
-        ) -> Option<Rc<dyn AgentSessionEditor>> {
+        ) -> Option<Rc<dyn AgentSessionTruncate>> {
             Some(Rc::new(StubAgentSessionEditor))
         }
 
@@ -439,8 +451,8 @@ mod test_support {
 
     struct StubAgentSessionEditor;
 
-    impl AgentSessionEditor for StubAgentSessionEditor {
-        fn truncate(&self, _: UserMessageId, _: &mut App) -> Task<Result<()>> {
+    impl AgentSessionTruncate for StubAgentSessionEditor {
+        fn run(&self, _: UserMessageId, _: &mut App) -> Task<Result<()>> {
             Task::ready(Ok(()))
         }
     }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index d5bc0fea63..bbc30b74bc 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -2,7 +2,7 @@ use crate::{
     ContextServerRegistry, Thread, ThreadEvent, ThreadsDatabase, ToolCallAuthorization,
     UserMessageContent, templates::Templates,
 };
-use crate::{HistoryStore, TokenUsageUpdated};
+use crate::{HistoryStore, TitleUpdated, TokenUsageUpdated};
 use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
@@ -253,6 +253,7 @@ impl NativeAgent {
             cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
                 this.sessions.remove(acp_thread.session_id());
             }),
+            cx.subscribe(&thread_handle, Self::handle_thread_title_updated),
             cx.subscribe(&thread_handle, Self::handle_thread_token_usage_updated),
             cx.observe(&thread_handle, move |this, thread, cx| {
                 this.save_thread(thread, cx)
@@ -441,6 +442,26 @@ impl NativeAgent {
         })
     }
 
+    fn handle_thread_title_updated(
+        &mut self,
+        thread: Entity<Thread>,
+        _: &TitleUpdated,
+        cx: &mut Context<Self>,
+    ) {
+        let session_id = thread.read(cx).id();
+        let Some(session) = self.sessions.get(session_id) else {
+            return;
+        };
+        let thread = thread.downgrade();
+        let acp_thread = session.acp_thread.clone();
+        cx.spawn(async move |_, cx| {
+            let title = thread.read_with(cx, |thread, _| thread.title())?;
+            let task = acp_thread.update(cx, |acp_thread, cx| acp_thread.set_title(title, cx))?;
+            task.await
+        })
+        .detach_and_log_err(cx);
+    }
+
     fn handle_thread_token_usage_updated(
         &mut self,
         thread: Entity<Thread>,
@@ -717,10 +738,6 @@ impl NativeAgentConnection {
                                     thread.update_tool_call(update, cx)
                                 })??;
                             }
-                            ThreadEvent::TitleUpdate(title) => {
-                                acp_thread
-                                    .update(cx, |thread, cx| thread.update_title(title, cx))??;
-                            }
                             ThreadEvent::Retry(status) => {
                                 acp_thread.update(cx, |thread, cx| {
                                     thread.update_retry_status(status, cx)
@@ -856,8 +873,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             .models
                             .model_from_id(&LanguageModels::model_id(&default_model.model))
                     });
-
-                    let thread = cx.new(|cx| {
+                    Ok(cx.new(|cx| {
                         Thread::new(
                             project.clone(),
                             agent.project_context.clone(),
@@ -867,9 +883,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             default_model,
                             cx,
                         )
-                    });
-
-                    Ok(thread)
+                    }))
                 },
             )??;
             agent.update(cx, |agent, cx| agent.register_session(thread, cx))
@@ -941,11 +955,11 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         });
     }
 
-    fn session_editor(
+    fn truncate(
         &self,
         session_id: &agent_client_protocol::SessionId,
         cx: &mut App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionEditor>> {
+    ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
         self.0.update(cx, |agent, _cx| {
             agent.sessions.get(session_id).map(|session| {
                 Rc::new(NativeAgentSessionEditor {
@@ -956,6 +970,17 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         })
     }
 
+    fn set_title(
+        &self,
+        session_id: &acp::SessionId,
+        _cx: &mut App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
+        Some(Rc::new(NativeAgentSessionSetTitle {
+            connection: self.clone(),
+            session_id: session_id.clone(),
+        }) as _)
+    }
+
     fn telemetry(&self) -> Option<Rc<dyn acp_thread::AgentTelemetry>> {
         Some(Rc::new(self.clone()) as Rc<dyn acp_thread::AgentTelemetry>)
     }
@@ -991,8 +1016,8 @@ struct NativeAgentSessionEditor {
     acp_thread: WeakEntity<AcpThread>,
 }
 
-impl acp_thread::AgentSessionEditor for NativeAgentSessionEditor {
-    fn truncate(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
+impl acp_thread::AgentSessionTruncate for NativeAgentSessionEditor {
+    fn run(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
         match self.thread.update(cx, |thread, cx| {
             thread.truncate(message_id.clone(), cx)?;
             Ok(thread.latest_token_usage())
@@ -1024,6 +1049,22 @@ impl acp_thread::AgentSessionResume for NativeAgentSessionResume {
     }
 }
 
+struct NativeAgentSessionSetTitle {
+    connection: NativeAgentConnection,
+    session_id: acp::SessionId,
+}
+
+impl acp_thread::AgentSessionSetTitle for NativeAgentSessionSetTitle {
+    fn run(&self, title: SharedString, cx: &mut App) -> Task<Result<()>> {
+        let Some(session) = self.connection.0.read(cx).sessions.get(&self.session_id) else {
+            return Task::ready(Err(anyhow!("session not found")));
+        };
+        let thread = session.thread.clone();
+        thread.update(cx, |thread, cx| thread.set_title(title, cx));
+        Task::ready(Ok(()))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::HistoryEntryId;
@@ -1323,6 +1364,8 @@ mod tests {
             )
         });
 
+        cx.run_until_parked();
+
         // Drop the ACP thread, which should cause the session to be dropped as well.
         cx.update(|_| {
             drop(thread);
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index edba227da7..e7e28f495e 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1383,6 +1383,7 @@ async fn test_title_generation(cx: &mut TestAppContext) {
     summary_model.send_last_completion_stream_text_chunk("oodnight Moon");
     summary_model.end_last_completion_stream();
     send.collect::<Vec<_>>().await;
+    cx.run_until_parked();
     thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
 
     // Send another message, ensuring no title is generated this time.
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 6f560cd390..f6ef11c20b 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -487,7 +487,6 @@ pub enum ThreadEvent {
     ToolCall(acp::ToolCall),
     ToolCallUpdate(acp_thread::ToolCallUpdate),
     ToolCallAuthorization(ToolCallAuthorization),
-    TitleUpdate(SharedString),
     Retry(acp_thread::RetryStatus),
     Stop(acp::StopReason),
 }
@@ -514,6 +513,7 @@ pub struct Thread {
     prompt_id: PromptId,
     updated_at: DateTime<Utc>,
     title: Option<SharedString>,
+    pending_title_generation: Option<Task<()>>,
     summary: Option<SharedString>,
     messages: Vec<Message>,
     completion_mode: CompletionMode,
@@ -555,6 +555,7 @@ impl Thread {
             prompt_id: PromptId::new(),
             updated_at: Utc::now(),
             title: None,
+            pending_title_generation: None,
             summary: None,
             messages: Vec::new(),
             completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
@@ -705,6 +706,7 @@ impl Thread {
             } else {
                 Some(db_thread.title.clone())
             },
+            pending_title_generation: None,
             summary: db_thread.detailed_summary,
             messages: db_thread.messages,
             completion_mode: db_thread.completion_mode.unwrap_or_default(),
@@ -1086,7 +1088,7 @@ impl Thread {
             event_stream: event_stream.clone(),
             _task: cx.spawn(async move |this, cx| {
                 log::info!("Starting agent turn execution");
-                let mut update_title = None;
+
                 let turn_result: Result<()> = async {
                     let mut intent = CompletionIntent::UserPrompt;
                     loop {
@@ -1095,8 +1097,8 @@ impl Thread {
                         let mut end_turn = true;
                         this.update(cx, |this, cx| {
                             // Generate title if needed.
-                            if this.title.is_none() && update_title.is_none() {
-                                update_title = Some(this.update_title(&event_stream, cx));
+                            if this.title.is_none() && this.pending_title_generation.is_none() {
+                                this.generate_title(cx);
                             }
 
                             // End the turn if the model didn't use tools.
@@ -1120,10 +1122,6 @@ impl Thread {
                 .await;
                 _ = this.update(cx, |this, cx| this.flush_pending_message(cx));
 
-                if let Some(update_title) = update_title {
-                    update_title.await.context("update title failed").log_err();
-                }
-
                 match turn_result {
                     Ok(()) => {
                         log::info!("Turn execution completed");
@@ -1607,19 +1605,15 @@ impl Thread {
         })
     }
 
-    fn update_title(
-        &mut self,
-        event_stream: &ThreadEventStream,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
+    fn generate_title(&mut self, cx: &mut Context<Self>) {
+        let Some(model) = self.summarization_model.clone() else {
+            return;
+        };
+
         log::info!(
             "Generating title with model: {:?}",
             self.summarization_model.as_ref().map(|model| model.name())
         );
-        let Some(model) = self.summarization_model.clone() else {
-            return Task::ready(Ok(()));
-        };
-        let event_stream = event_stream.clone();
         let mut request = LanguageModelRequest {
             intent: Some(CompletionIntent::ThreadSummarization),
             temperature: AgentSettings::temperature_for_model(&model, cx),
@@ -1635,42 +1629,51 @@ impl Thread {
             content: vec![SUMMARIZE_THREAD_PROMPT.into()],
             cache: false,
         });
-        cx.spawn(async move |this, cx| {
+        self.pending_title_generation = Some(cx.spawn(async move |this, cx| {
             let mut title = String::new();
-            let mut messages = model.stream_completion(request, cx).await?;
-            while let Some(event) = messages.next().await {
-                let event = event?;
-                let text = match event {
-                    LanguageModelCompletionEvent::Text(text) => text,
-                    LanguageModelCompletionEvent::StatusUpdate(
-                        CompletionRequestStatus::UsageUpdated { amount, limit },
-                    ) => {
-                        this.update(cx, |thread, cx| {
-                            thread.update_model_request_usage(amount, limit, cx);
-                        })?;
-                        continue;
+
+            let generate = async {
+                let mut messages = model.stream_completion(request, cx).await?;
+                while let Some(event) = messages.next().await {
+                    let event = event?;
+                    let text = match event {
+                        LanguageModelCompletionEvent::Text(text) => text,
+                        LanguageModelCompletionEvent::StatusUpdate(
+                            CompletionRequestStatus::UsageUpdated { amount, limit },
+                        ) => {
+                            this.update(cx, |thread, cx| {
+                                thread.update_model_request_usage(amount, limit, cx);
+                            })?;
+                            continue;
+                        }
+                        _ => continue,
+                    };
+
+                    let mut lines = text.lines();
+                    title.extend(lines.next());
+
+                    // Stop if the LLM generated multiple lines.
+                    if lines.next().is_some() {
+                        break;
                     }
-                    _ => continue,
-                };
-
-                let mut lines = text.lines();
-                title.extend(lines.next());
-
-                // Stop if the LLM generated multiple lines.
-                if lines.next().is_some() {
-                    break;
                 }
+                anyhow::Ok(())
+            };
+
+            if generate.await.context("failed to generate title").is_ok() {
+                _ = this.update(cx, |this, cx| this.set_title(title.into(), cx));
             }
+            _ = this.update(cx, |this, _| this.pending_title_generation = None);
+        }));
+    }
 
-            log::info!("Setting title: {}", title);
-
-            this.update(cx, |this, cx| {
-                let title = SharedString::from(title);
-                event_stream.send_title_update(title.clone());
-                this.title = Some(title);
-                cx.notify();
-            })
-        })
+    pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) {
+        self.pending_title_generation = None;
+        if Some(&title) != self.title.as_ref() {
+            self.title = Some(title);
+            cx.emit(TitleUpdated);
+            cx.notify();
+        }
     }
 
     fn last_user_message(&self) -> Option<&UserMessage> {
@@ -1975,6 +1978,10 @@ pub struct TokenUsageUpdated(pub Option<acp_thread::TokenUsage>);
 
 impl EventEmitter<TokenUsageUpdated> for Thread {}
 
+pub struct TitleUpdated;
+
+impl EventEmitter<TitleUpdated> for Thread {}
+
 pub trait AgentTool
 where
     Self: 'static + Sized,
@@ -2132,12 +2139,6 @@ where
 struct ThreadEventStream(mpsc::UnboundedSender<Result<ThreadEvent>>);
 
 impl ThreadEventStream {
-    fn send_title_update(&self, text: SharedString) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::TitleUpdate(text)))
-            .ok();
-    }
-
     fn send_user_message(&self, message: &UserMessage) {
         self.0
             .unbounded_send(Ok(ThreadEvent::UserMessage(message.clone())))
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 05d31051b2..936f987864 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -15,7 +15,7 @@ use buffer_diff::BufferDiff;
 use client::zed_urls;
 use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
-use editor::{Editor, EditorMode, MultiBuffer, PathKey, SelectionEffects};
+use editor::{Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
@@ -281,7 +281,8 @@ enum ThreadState {
     },
     Ready {
         thread: Entity<AcpThread>,
-        _subscription: [Subscription; 2],
+        title_editor: Option<Entity<Editor>>,
+        _subscriptions: Vec<Subscription>,
     },
     LoadError(LoadError),
     Unauthenticated {
@@ -445,12 +446,7 @@ impl AcpThreadView {
             this.update_in(cx, |this, window, cx| {
                 match result {
                     Ok(thread) => {
-                        let thread_subscription =
-                            cx.subscribe_in(&thread, window, Self::handle_thread_event);
-
                         let action_log = thread.read(cx).action_log().clone();
-                        let action_log_subscription =
-                            cx.observe(&action_log, |_, _, cx| cx.notify());
 
                         let count = thread.read(cx).entries().len();
                         this.list_state.splice(0..0, count);
@@ -489,9 +485,31 @@ impl AcpThreadView {
                                     })
                                 });
 
+                        let mut subscriptions = vec![
+                            cx.subscribe_in(&thread, window, Self::handle_thread_event),
+                            cx.observe(&action_log, |_, _, cx| cx.notify()),
+                        ];
+
+                        let title_editor =
+                            if thread.update(cx, |thread, cx| thread.can_set_title(cx)) {
+                                let editor = cx.new(|cx| {
+                                    let mut editor = Editor::single_line(window, cx);
+                                    editor.set_text(thread.read(cx).title(), window, cx);
+                                    editor
+                                });
+                                subscriptions.push(cx.subscribe_in(
+                                    &editor,
+                                    window,
+                                    Self::handle_title_editor_event,
+                                ));
+                                Some(editor)
+                            } else {
+                                None
+                            };
                         this.thread_state = ThreadState::Ready {
                             thread,
-                            _subscription: [thread_subscription, action_log_subscription],
+                            title_editor,
+                            _subscriptions: subscriptions,
                         };
 
                         this.profile_selector = this.as_native_thread(cx).map(|thread| {
@@ -618,6 +636,14 @@ impl AcpThreadView {
         }
     }
 
+    pub fn title_editor(&self) -> Option<Entity<Editor>> {
+        if let ThreadState::Ready { title_editor, .. } = &self.thread_state {
+            title_editor.clone()
+        } else {
+            None
+        }
+    }
+
     pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
         self.thread_error.take();
         self.thread_retry_status.take();
@@ -662,6 +688,35 @@ impl AcpThreadView {
         cx.notify();
     }
 
+    pub fn handle_title_editor_event(
+        &mut self,
+        title_editor: &Entity<Editor>,
+        event: &EditorEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(thread) = self.thread() else { return };
+
+        match event {
+            EditorEvent::BufferEdited => {
+                let new_title = title_editor.read(cx).text(cx);
+                thread.update(cx, |thread, cx| {
+                    thread
+                        .set_title(new_title.into(), cx)
+                        .detach_and_log_err(cx);
+                })
+            }
+            EditorEvent::Blurred => {
+                if title_editor.read(cx).text(cx).is_empty() {
+                    title_editor.update(cx, |editor, cx| {
+                        editor.set_text("New Thread", window, cx);
+                    });
+                }
+            }
+            _ => {}
+        }
+    }
+
     pub fn handle_message_editor_event(
         &mut self,
         _: &Entity<MessageEditor>,
@@ -1009,7 +1064,17 @@ impl AcpThreadView {
                 self.thread_retry_status.take();
                 self.thread_state = ThreadState::LoadError(error.clone());
             }
-            AcpThreadEvent::TitleUpdated | AcpThreadEvent::TokenUsageUpdated => {}
+            AcpThreadEvent::TitleUpdated => {
+                let title = thread.read(cx).title();
+                if let Some(title_editor) = self.title_editor() {
+                    title_editor.update(cx, |editor, cx| {
+                        if editor.text(cx) != title {
+                            editor.set_text(title, window, cx);
+                        }
+                    });
+                }
+            }
+            AcpThreadEvent::TokenUsageUpdated => {}
         }
         cx.notify();
     }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 65a9da573a..d2ff6aa4f3 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -905,7 +905,7 @@ impl AgentPanel {
 
     fn active_thread_view(&self) -> Option<&Entity<AcpThreadView>> {
         match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view } => Some(thread_view),
+            ActiveView::ExternalAgentThread { thread_view, .. } => Some(thread_view),
             ActiveView::Thread { .. }
             | ActiveView::TextThread { .. }
             | ActiveView::History
@@ -2075,9 +2075,32 @@ impl AgentPanel {
                 }
             }
             ActiveView::ExternalAgentThread { thread_view } => {
-                Label::new(thread_view.read(cx).title(cx))
-                    .truncate()
-                    .into_any_element()
+                if let Some(title_editor) = thread_view.read(cx).title_editor() {
+                    div()
+                        .w_full()
+                        .on_action({
+                            let thread_view = thread_view.downgrade();
+                            move |_: &menu::Confirm, window, cx| {
+                                if let Some(thread_view) = thread_view.upgrade() {
+                                    thread_view.focus_handle(cx).focus(window);
+                                }
+                            }
+                        })
+                        .on_action({
+                            let thread_view = thread_view.downgrade();
+                            move |_: &editor::actions::Cancel, window, cx| {
+                                if let Some(thread_view) = thread_view.upgrade() {
+                                    thread_view.focus_handle(cx).focus(window);
+                                }
+                            }
+                        })
+                        .child(title_editor)
+                        .into_any_element()
+                } else {
+                    Label::new(thread_view.read(cx).title(cx))
+                        .truncate()
+                        .into_any_element()
+                }
             }
             ActiveView::TextThread {
                 title_editor,

From 20a0c3e92050c417f242d5e909d4f9ea548494dc Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 21 Aug 2025 15:27:09 -0500
Subject: [PATCH 279/823] Disable minidump generation on dev builds (again)
 (#36716)

We accidentally deleted this in #36267

Release Notes:

- N/A
---
 crates/zed/src/reliability.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index 646a3af5bb..e9acaa588d 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -60,7 +60,9 @@ pub fn init_panic_hook(
             .or_else(|| info.payload().downcast_ref::<String>().cloned())
             .unwrap_or_else(|| "Box<Any>".to_string());
 
-        crashes::handle_panic(payload.clone(), info.location());
+        if *release_channel::RELEASE_CHANNEL != ReleaseChannel::Dev {
+            crashes::handle_panic(payload.clone(), info.location());
+        }
 
         let thread = thread::current();
         let thread_name = thread.name().unwrap_or("<unnamed>");

From 0beb919bbb8c662ee7ff3302bfb5e49bec1e3fba Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Thu, 21 Aug 2025 17:29:53 -0300
Subject: [PATCH 280/823] acp: Fix `MessageEditor::set_message` for sent
 messages (#36715)

The `PromptCapabilities` introduced in previous PRs were only getting
set on the main message editor and not for the editors in user messages.
This caused a bug where mentions would disappear after resending the
message, and for the completion provider to be limited to files.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/entry_view_state.rs |  9 ++++--
 crates/agent_ui/src/acp/message_editor.rs   | 34 +++++++++++----------
 crates/agent_ui/src/acp/thread_view.rs      | 16 ++++++----
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index c310473259..0e4080d689 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,7 +1,7 @@
-use std::ops::Range;
+use std::{cell::Cell, ops::Range, rc::Rc};
 
 use acp_thread::{AcpThread, AgentThreadEntry};
-use agent_client_protocol::ToolCallId;
+use agent_client_protocol::{PromptCapabilities, ToolCallId};
 use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
@@ -27,6 +27,7 @@ pub struct EntryViewState {
     prompt_store: Option<Entity<PromptStore>>,
     entries: Vec<Entry>,
     prevent_slash_commands: bool,
+    prompt_capabilities: Rc<Cell<PromptCapabilities>>,
 }
 
 impl EntryViewState {
@@ -35,6 +36,7 @@ impl EntryViewState {
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
+        prompt_capabilities: Rc<Cell<PromptCapabilities>>,
         prevent_slash_commands: bool,
     ) -> Self {
         Self {
@@ -44,6 +46,7 @@ impl EntryViewState {
             prompt_store,
             entries: Vec::new(),
             prevent_slash_commands,
+            prompt_capabilities,
         }
     }
 
@@ -81,6 +84,7 @@ impl EntryViewState {
                             self.project.clone(),
                             self.history_store.clone(),
                             self.prompt_store.clone(),
+                            self.prompt_capabilities.clone(),
                             "Edit message － @ to include context",
                             self.prevent_slash_commands,
                             editor::EditorMode::AutoHeight {
@@ -403,6 +407,7 @@ mod tests {
                 project.clone(),
                 history_store,
                 None,
+                Default::default(),
                 false,
             )
         });
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 8f5044cb21..7d73ebeb19 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -87,6 +87,7 @@ impl MessageEditor {
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
+        prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
         placeholder: impl Into<Arc<str>>,
         prevent_slash_commands: bool,
         mode: EditorMode,
@@ -100,7 +101,6 @@ impl MessageEditor {
             },
             None,
         );
-        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
         let completion_provider = ContextPickerCompletionProvider::new(
             cx.weak_entity(),
             workspace.clone(),
@@ -203,10 +203,6 @@ impl MessageEditor {
         .detach();
     }
 
-    pub fn set_prompt_capabilities(&mut self, capabilities: acp::PromptCapabilities) {
-        self.prompt_capabilities.set(capabilities);
-    }
-
     #[cfg(test)]
     pub(crate) fn editor(&self) -> &Entity<Editor> {
         &self.editor
@@ -1095,15 +1091,21 @@ impl MessageEditor {
                         mentions.push((start..end, mention_uri, resource.text));
                     }
                 }
+                acp::ContentBlock::ResourceLink(resource) => {
+                    if let Some(mention_uri) = MentionUri::parse(&resource.uri).log_err() {
+                        let start = text.len();
+                        write!(&mut text, "{}", mention_uri.as_link()).ok();
+                        let end = text.len();
+                        mentions.push((start..end, mention_uri, resource.uri));
+                    }
+                }
                 acp::ContentBlock::Image(content) => {
                     let start = text.len();
                     text.push_str("image");
                     let end = text.len();
                     images.push((start..end, content));
                 }
-                acp::ContentBlock::Audio(_)
-                | acp::ContentBlock::Resource(_)
-                | acp::ContentBlock::ResourceLink(_) => {}
+                acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => {}
             }
         }
 
@@ -1850,7 +1852,7 @@ impl Addon for MessageEditorAddon {
 
 #[cfg(test)]
 mod tests {
-    use std::{ops::Range, path::Path, sync::Arc};
+    use std::{cell::Cell, ops::Range, path::Path, rc::Rc, sync::Arc};
 
     use acp_thread::MentionUri;
     use agent_client_protocol as acp;
@@ -1896,6 +1898,7 @@ mod tests {
                     project.clone(),
                     history_store.clone(),
                     None,
+                    Default::default(),
                     "Test",
                     false,
                     EditorMode::AutoHeight {
@@ -2086,6 +2089,7 @@ mod tests {
 
         let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
         let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
+        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
 
         let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
             let workspace_handle = cx.weak_entity();
@@ -2095,6 +2099,7 @@ mod tests {
                     project.clone(),
                     history_store.clone(),
                     None,
+                    prompt_capabilities.clone(),
                     "Test",
                     false,
                     EditorMode::AutoHeight {
@@ -2139,13 +2144,10 @@ mod tests {
             editor.set_text("", window, cx);
         });
 
-        message_editor.update(&mut cx, |editor, _cx| {
-            // Enable all prompt capabilities
-            editor.set_prompt_capabilities(acp::PromptCapabilities {
-                image: true,
-                audio: true,
-                embedded_context: true,
-            });
+        prompt_capabilities.set(acp::PromptCapabilities {
+            image: true,
+            audio: true,
+            embedded_context: true,
         });
 
         cx.simulate_input("Lorem ");
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 936f987864..c7d6bb439f 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -5,7 +5,7 @@ use acp_thread::{
 };
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
-use agent_client_protocol::{self as acp};
+use agent_client_protocol::{self as acp, PromptCapabilities};
 use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore};
@@ -34,6 +34,7 @@ use project::{Project, ProjectEntryId};
 use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
+use std::cell::Cell;
 use std::sync::Arc;
 use std::time::Instant;
 use std::{collections::BTreeMap, rc::Rc, time::Duration};
@@ -271,6 +272,7 @@ pub struct AcpThreadView {
     plan_expanded: bool,
     editor_expanded: bool,
     editing_message: Option<usize>,
+    prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
 }
@@ -306,6 +308,7 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
+        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
         let prevent_slash_commands = agent.clone().downcast::<ClaudeCode>().is_some();
         let message_editor = cx.new(|cx| {
             let mut editor = MessageEditor::new(
@@ -313,6 +316,7 @@ impl AcpThreadView {
                 project.clone(),
                 history_store.clone(),
                 prompt_store.clone(),
+                prompt_capabilities.clone(),
                 "Message the agent — @ to include context",
                 prevent_slash_commands,
                 editor::EditorMode::AutoHeight {
@@ -336,6 +340,7 @@ impl AcpThreadView {
                 project.clone(),
                 history_store.clone(),
                 prompt_store.clone(),
+                prompt_capabilities.clone(),
                 prevent_slash_commands,
             )
         });
@@ -371,6 +376,7 @@ impl AcpThreadView {
             editor_expanded: false,
             history_store,
             hovered_recent_history_item: None,
+            prompt_capabilities,
             _subscriptions: subscriptions,
             _cancel_task: None,
         }
@@ -448,6 +454,9 @@ impl AcpThreadView {
                     Ok(thread) => {
                         let action_log = thread.read(cx).action_log().clone();
 
+                        this.prompt_capabilities
+                            .set(connection.prompt_capabilities());
+
                         let count = thread.read(cx).entries().len();
                         this.list_state.splice(0..0, count);
                         this.entry_view_state.update(cx, |view_state, cx| {
@@ -523,11 +532,6 @@ impl AcpThreadView {
                             })
                         });
 
-                        this.message_editor.update(cx, |message_editor, _cx| {
-                            message_editor
-                                .set_prompt_capabilities(connection.prompt_capabilities());
-                        });
-
                         cx.notify();
                     }
                     Err(err) => {

From 06c0e593790d7fae184c31b02423a9d3bb0ccfee Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Fri, 22 Aug 2025 00:21:36 +0200
Subject: [PATCH 281/823] Make tab switcher show preview of selected tab
 (#36718)

Similar to nvim's telescope this makes it easier to find the right tab
in the list.

The preview takes place in the pane where the tab resides.
- on dismiss: We restore all panes.
- on confirm: We restore all panes except the one where the selected tab
resides. For this reason we collect the active item for each pane before
the tabswither starts.

Release Notes:

- Improved tab switcher, it now shows a preview of the selected tab

Co-authored-by: Julia Ryan <juliaryan3.14@gmail.com>
---
 crates/tab_switcher/src/tab_switcher.rs | 55 +++++++++++++++++++++----
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 11e32523b4..7c70bcd5b5 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -113,7 +113,13 @@ impl TabSwitcher {
         }
 
         let weak_workspace = workspace.weak_handle();
+
         let project = workspace.project().clone();
+        let original_items: Vec<_> = workspace
+            .panes()
+            .iter()
+            .map(|p| (p.clone(), p.read(cx).active_item_index()))
+            .collect();
         workspace.toggle_modal(window, cx, |window, cx| {
             let delegate = TabSwitcherDelegate::new(
                 project,
@@ -124,6 +130,7 @@ impl TabSwitcher {
                 is_global,
                 window,
                 cx,
+                original_items,
             );
             TabSwitcher::new(delegate, window, is_global, cx)
         });
@@ -221,7 +228,9 @@ pub struct TabSwitcherDelegate {
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
     matches: Vec<TabMatch>,
+    original_items: Vec<(Entity<Pane>, usize)>,
     is_all_panes: bool,
+    restored_items: bool,
 }
 
 impl TabSwitcherDelegate {
@@ -235,6 +244,7 @@ impl TabSwitcherDelegate {
         is_all_panes: bool,
         window: &mut Window,
         cx: &mut Context<TabSwitcher>,
+        original_items: Vec<(Entity<Pane>, usize)>,
     ) -> Self {
         Self::subscribe_to_updates(&pane, window, cx);
         Self {
@@ -246,6 +256,8 @@ impl TabSwitcherDelegate {
             project,
             matches: Vec::new(),
             is_all_panes,
+            original_items,
+            restored_items: false,
         }
     }
 
@@ -300,13 +312,6 @@ impl TabSwitcherDelegate {
 
         let matches = if query.is_empty() {
             let history = workspace.read(cx).recently_activated_items(cx);
-            for item in &all_items {
-                eprintln!(
-                    "{:?} {:?}",
-                    item.item.tab_content_text(0, cx),
-                    (Reverse(history.get(&item.item.item_id())), item.item_index)
-                )
-            }
             all_items
                 .sort_by_key(|tab| (Reverse(history.get(&tab.item.item_id())), tab.item_index));
             all_items
@@ -473,8 +478,25 @@ impl PickerDelegate for TabSwitcherDelegate {
         self.selected_index
     }
 
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
         self.selected_index = ix;
+
+        let Some(selected_match) = self.matches.get(self.selected_index()) else {
+            return;
+        };
+        selected_match
+            .pane
+            .update(cx, |pane, cx| {
+                if let Some(index) = pane.index_for_item(selected_match.item.as_ref()) {
+                    pane.activate_item(index, false, false, window, cx);
+                }
+            })
+            .ok();
         cx.notify();
     }
 
@@ -501,6 +523,13 @@ impl PickerDelegate for TabSwitcherDelegate {
         let Some(selected_match) = self.matches.get(self.selected_index()) else {
             return;
         };
+
+        self.restored_items = true;
+        for (pane, index) in self.original_items.iter() {
+            pane.update(cx, |this, cx| {
+                this.activate_item(*index, false, false, window, cx);
+            })
+        }
         selected_match
             .pane
             .update(cx, |pane, cx| {
@@ -511,7 +540,15 @@ impl PickerDelegate for TabSwitcherDelegate {
             .ok();
     }
 
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<TabSwitcherDelegate>>) {
+    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<TabSwitcherDelegate>>) {
+        if !self.restored_items {
+            for (pane, index) in self.original_items.iter() {
+                pane.update(cx, |this, cx| {
+                    this.activate_item(*index, false, false, window, cx);
+                })
+            }
+        }
+
         self.tab_switcher
             .update(cx, |_, cx| cx.emit(DismissEvent))
             .log_err();

From a977fbc5b09e3fc23181fe9c30246de6c6e9c9bc Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Thu, 21 Aug 2025 18:40:07 -0400
Subject: [PATCH 282/823] Document project_panel.sticky_scroll (#36721)

Hat tip to: @watercubz in
https://github.com/zed-industries/zed/issues/22869#issuecomment-3183850576

Release Notes:

- N/A
---
 docs/src/configuring-zed.md      | 1 +
 docs/src/visual-customization.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 39d172ea5f..696370e310 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -3234,6 +3234,7 @@ Run the `theme selector: toggle` action in the command palette to see a current
     "scrollbar": {
       "show": null
     },
+    "sticky_scroll": true,
     "show_diagnostics": "all",
     "indent_guides": {
       "show": "always"
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 3ad1e381d9..24b2a9d769 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -430,6 +430,7 @@ Project panel can be shown/hidden with {#action project_panel::ToggleFocus} ({#k
     "indent_size": 20,              // Pixels for each successive indent
     "auto_reveal_entries": true,    // Show file in panel when activating its buffer
     "auto_fold_dirs": true,         // Fold dirs with single subdir
+    "sticky_scroll": true,          // Stick parent directories at top of the project panel.
     "scrollbar": {                  // Project panel scrollbar settings
       "show": null                  // Show/hide: (auto, system, always, never)
     },

From 18fe68d991b8f63ef7f5d276eb052e055feea70a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Thu, 21 Aug 2025 20:51:36 -0300
Subject: [PATCH 283/823] thread view: Add small refinements to tool call UI
 (#36723)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 66 ++++++++++++++------------
 crates/markdown/src/markdown.rs        |  3 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c7d6bb439f..4d89a55139 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1372,7 +1372,7 @@ impl AcpThreadView {
             AgentThreadEntry::ToolCall(tool_call) => {
                 let has_terminals = tool_call.terminals().next().is_some();
 
-                div().w_full().py_1p5().px_5().map(|this| {
+                div().w_full().py_1().px_5().map(|this| {
                     if has_terminals {
                         this.children(tool_call.terminals().map(|terminal| {
                             self.render_terminal_tool_call(
@@ -1570,7 +1570,7 @@ impl AcpThreadView {
             .size(IconSize::Small)
             .color(Color::Muted);
 
-        let base_container = h_flex().size_4().justify_center();
+        let base_container = h_flex().flex_shrink_0().size_4().justify_center();
 
         if is_collapsible {
             base_container
@@ -1623,20 +1623,32 @@ impl AcpThreadView {
             | ToolCallStatus::WaitingForConfirmation { .. }
             | ToolCallStatus::Completed => None,
             ToolCallStatus::InProgress => Some(
-                Icon::new(IconName::ArrowCircle)
-                    .color(Color::Muted)
-                    .size(IconSize::Small)
-                    .with_animation(
-                        "running",
-                        Animation::new(Duration::from_secs(3)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                div()
+                    .absolute()
+                    .right_2()
+                    .child(
+                        Icon::new(IconName::ArrowCircle)
+                            .color(Color::Muted)
+                            .size(IconSize::Small)
+                            .with_animation(
+                                "running",
+                                Animation::new(Duration::from_secs(3)).repeat(),
+                                |icon, delta| {
+                                    icon.transform(Transformation::rotate(percentage(delta)))
+                                },
+                            ),
                     )
                     .into_any(),
             ),
             ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => Some(
-                Icon::new(IconName::Close)
-                    .color(Color::Error)
-                    .size(IconSize::Small)
+                div()
+                    .absolute()
+                    .right_2()
+                    .child(
+                        Icon::new(IconName::Close)
+                            .color(Color::Error)
+                            .size(IconSize::Small),
+                    )
                     .into_any_element(),
             ),
         };
@@ -1734,13 +1746,14 @@ impl AcpThreadView {
             .child(
                 h_flex()
                     .id(header_id)
+                    .relative()
                     .w_full()
+                    .max_w_full()
                     .gap_1()
-                    .justify_between()
                     .when(use_card_layout, |this| {
-                        this.pl_2()
-                            .pr_1p5()
-                            .py_1()
+                        this.pl_1p5()
+                            .pr_1()
+                            .py_0p5()
                             .rounded_t_md()
                             .when(is_open && !failed_tool_call, |this| {
                                 this.border_b_1()
@@ -1753,7 +1766,7 @@ impl AcpThreadView {
                             .group(&card_header_id)
                             .relative()
                             .w_full()
-                            .min_h_6()
+                            .h(window.line_height() - px(2.))
                             .text_size(self.tool_name_font_size())
                             .child(self.render_tool_call_icon(
                                 card_header_id,
@@ -1797,21 +1810,14 @@ impl AcpThreadView {
                             } else {
                                 h_flex()
                                     .id("non-card-label-container")
-                                    .w_full()
                                     .relative()
+                                    .w_full()
+                                    .max_w_full()
                                     .ml_1p5()
-                                    .overflow_hidden()
-                                    .child(
-                                        h_flex()
-                                            .id("non-card-label")
-                                            .pr_8()
-                                            .w_full()
-                                            .overflow_x_scroll()
-                                            .child(self.render_markdown(
-                                                tool_call.label.clone(),
-                                                default_markdown_style(false, true, window, cx),
-                                            )),
-                                    )
+                                    .child(h_flex().pr_8().child(self.render_markdown(
+                                        tool_call.label.clone(),
+                                        default_markdown_style(false, true, window, cx),
+                                    )))
                                     .child(gradient_overlay(gradient_color))
                                     .on_click(cx.listener({
                                         let id = tool_call.id.clone();
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 755506bd12..39a438c512 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -1089,7 +1089,7 @@ impl Element for MarkdownElement {
                                         .absolute()
                                         .top_1()
                                         .right_1()
-                                        .justify_center()
+                                        .justify_end()
                                         .child(codeblock),
                                 )
                             });
@@ -1320,6 +1320,7 @@ fn render_copy_code_block_button(
     )
     .icon_color(Color::Muted)
     .icon_size(IconSize::Small)
+    .style(ButtonStyle::Filled)
     .shape(ui::IconButtonShape::Square)
     .tooltip(Tooltip::text("Copy Code"))
     .on_click({

From eeaadc098f189121d840849d4833dec4398364cb Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 21 Aug 2025 18:59:42 -0500
Subject: [PATCH 284/823] Add GPU info to Sentry crashes (#36624)

Closes #ISSUE

Adds system GPU collection to crash reporting. Currently this is Linux
only.

The system GPUs are determined by reading the `/sys/class/drm` directory
structure, rather than using the exisiting `gpui::Window::gpu_specs()`
method in order to gather more information, and so that the GPU context
is not dependent on Vulkan context initialization (i.e. we still get GPU
info when Zed fails to start because Vulkan failed to initialize).

Unfortunately, the `blade` APIs do not support querying which GPU _will_
be used, so we do not know which GPU was attempted to be used when
Vulkan context initialization fails, however, when Vulkan initialization
succeeds, we send a message to the crash handler containing the result
of `gpui::Window::gpu_specs()` to include the "Active" gpu in any crash
report that may occur

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 Cargo.lock                                    |  31 ++++-
 Cargo.toml                                    |   5 +
 crates/client/src/telemetry.rs                |   2 +-
 crates/crashes/Cargo.toml                     |   2 +
 crates/crashes/src/crashes.rs                 |  26 +++-
 crates/feedback/Cargo.toml                    |   6 +-
 crates/feedback/src/feedback.rs               |   6 +-
 crates/gpui/src/gpui.rs                       |   2 +-
 crates/system_specs/Cargo.toml                |  28 ++++
 crates/system_specs/LICENSE-GPL               |   1 +
 .../src/system_specs.rs                       | 122 +++++++++++++++++-
 crates/workspace/Cargo.toml                   |   2 +-
 crates/zed/Cargo.toml                         |   2 +
 crates/zed/src/main.rs                        |   4 +-
 crates/zed/src/reliability.rs                 |  93 ++++++++++++-
 crates/zed/src/zed.rs                         |  12 +-
 16 files changed, 315 insertions(+), 29 deletions(-)
 create mode 100644 crates/system_specs/Cargo.toml
 create mode 120000 crates/system_specs/LICENSE-GPL
 rename crates/{feedback => system_specs}/src/system_specs.rs (59%)

diff --git a/Cargo.lock b/Cargo.lock
index 61f6f42498..2b3d7b2691 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4050,6 +4050,7 @@ dependencies = [
 name = "crashes"
 version = "0.1.0"
 dependencies = [
+ "bincode",
  "crash-handler",
  "log",
  "mach2 0.5.0",
@@ -4059,6 +4060,7 @@ dependencies = [
  "serde",
  "serde_json",
  "smol",
+ "system_specs",
  "workspace-hack",
 ]
 
@@ -5738,14 +5740,10 @@ dependencies = [
 name = "feedback"
 version = "0.1.0"
 dependencies = [
- "client",
  "editor",
  "gpui",
- "human_bytes",
  "menu",
- "release_channel",
- "serde",
- "sysinfo",
+ "system_specs",
  "ui",
  "urlencoding",
  "util",
@@ -11634,6 +11632,12 @@ dependencies = [
  "hmac",
 ]
 
+[[package]]
+name = "pciid-parser"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0008e816fcdaf229cdd540e9b6ca2dc4a10d65c31624abb546c6420a02846e61"
+
 [[package]]
 name = "pem"
 version = "3.0.5"
@@ -16154,6 +16158,21 @@ dependencies = [
  "winx",
 ]
 
+[[package]]
+name = "system_specs"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "client",
+ "gpui",
+ "human_bytes",
+ "pciid-parser",
+ "release_channel",
+ "serde",
+ "sysinfo",
+ "workspace-hack",
+]
+
 [[package]]
 name = "tab_switcher"
 version = "0.1.0"
@@ -20413,6 +20432,7 @@ dependencies = [
  "auto_update",
  "auto_update_ui",
  "backtrace",
+ "bincode",
  "breadcrumbs",
  "call",
  "channel",
@@ -20511,6 +20531,7 @@ dependencies = [
  "supermaven",
  "svg_preview",
  "sysinfo",
+ "system_specs",
  "tab_switcher",
  "task",
  "tasks_ui",
diff --git a/Cargo.toml b/Cargo.toml
index b13795e1e1..84de9b30ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -155,6 +155,7 @@ members = [
     "crates/streaming_diff",
     "crates/sum_tree",
     "crates/supermaven",
+    "crates/system_specs",
     "crates/supermaven_api",
     "crates/svg_preview",
     "crates/tab_switcher",
@@ -381,6 +382,7 @@ streaming_diff = { path = "crates/streaming_diff" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
+system_specs = { path = "crates/system_specs" }
 tab_switcher = { path = "crates/tab_switcher" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
@@ -450,6 +452,7 @@ aws-sdk-bedrockruntime = { version = "1.80.0", features = [
 aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
+bincode = "1.2.1"
 bitflags = "2.6.0"
 blade-graphics = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
 blade-macros = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
@@ -493,6 +496,7 @@ handlebars = "4.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
+human_bytes = "0.4.1"
 html5ever = "0.27.0"
 http = "1.1"
 http-body = "1.0"
@@ -532,6 +536,7 @@ palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
+pciid-parser = "0.8.0"
 pathdiff = "0.2"
 pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index f3142a0af6..a5c1532c75 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -76,7 +76,7 @@ static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {
 
 pub static MINIDUMP_ENDPOINT: LazyLock<Option<String>> = LazyLock::new(|| {
     option_env!("ZED_MINIDUMP_ENDPOINT")
-        .map(|s| s.to_owned())
+        .map(str::to_string)
         .or_else(|| env::var("ZED_MINIDUMP_ENDPOINT").ok())
 });
 
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index f12913d1cb..370f0bb5f6 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -6,6 +6,7 @@ edition.workspace = true
 license = "GPL-3.0-or-later"
 
 [dependencies]
+bincode.workspace = true
 crash-handler.workspace = true
 log.workspace = true
 minidumper.workspace = true
@@ -14,6 +15,7 @@ release_channel.workspace = true
 smol.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+system_specs.workspace = true
 workspace-hack.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index b1afc5ae45..f7bc96bff9 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -127,6 +127,7 @@ unsafe fn suspend_all_other_threads() {
 pub struct CrashServer {
     initialization_params: OnceLock<InitCrashHandler>,
     panic_info: OnceLock<CrashPanic>,
+    active_gpu: OnceLock<system_specs::GpuSpecs>,
     has_connection: Arc<AtomicBool>,
 }
 
@@ -135,6 +136,8 @@ pub struct CrashInfo {
     pub init: InitCrashHandler,
     pub panic: Option<CrashPanic>,
     pub minidump_error: Option<String>,
+    pub gpus: Vec<system_specs::GpuInfo>,
+    pub active_gpu: Option<system_specs::GpuSpecs>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
@@ -143,7 +146,6 @@ pub struct InitCrashHandler {
     pub zed_version: String,
     pub release_channel: String,
     pub commit_sha: String,
-    // pub gpu: String,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
@@ -178,6 +180,18 @@ impl minidumper::ServerHandler for CrashServer {
             Err(e) => Some(format!("{e:?}")),
         };
 
+        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
+        let gpus = vec![];
+
+        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+        let gpus = match system_specs::read_gpu_info_from_sys_class_drm() {
+            Ok(gpus) => gpus,
+            Err(err) => {
+                log::warn!("Failed to collect GPU information for crash report: {err}");
+                vec![]
+            }
+        };
+
         let crash_info = CrashInfo {
             init: self
                 .initialization_params
@@ -186,6 +200,8 @@ impl minidumper::ServerHandler for CrashServer {
                 .clone(),
             panic: self.panic_info.get().cloned(),
             minidump_error,
+            active_gpu: self.active_gpu.get().cloned(),
+            gpus,
         };
 
         let crash_data_path = paths::logs_dir()
@@ -211,6 +227,13 @@ impl minidumper::ServerHandler for CrashServer {
                     serde_json::from_slice::<CrashPanic>(&buffer).expect("invalid panic data");
                 self.panic_info.set(panic_data).expect("already panicked");
             }
+            3 => {
+                let gpu_specs: system_specs::GpuSpecs =
+                    bincode::deserialize(&buffer).expect("gpu specs");
+                self.active_gpu
+                    .set(gpu_specs)
+                    .expect("already set active gpu");
+            }
             _ => {
                 panic!("invalid message kind");
             }
@@ -287,6 +310,7 @@ pub fn crash_server(socket: &Path) {
                 initialization_params: OnceLock::new(),
                 panic_info: OnceLock::new(),
                 has_connection,
+                active_gpu: OnceLock::new(),
             }),
             &shutdown,
             Some(CRASH_HANDLER_PING_TIMEOUT),
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index 3a2c1fd713..db872f7a15 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -15,13 +15,9 @@ path = "src/feedback.rs"
 test-support = []
 
 [dependencies]
-client.workspace = true
 gpui.workspace = true
-human_bytes = "0.4.1"
 menu.workspace = true
-release_channel.workspace = true
-serde.workspace = true
-sysinfo.workspace = true
+system_specs.workspace = true
 ui.workspace = true
 urlencoding.workspace = true
 util.workspace = true
diff --git a/crates/feedback/src/feedback.rs b/crates/feedback/src/feedback.rs
index 40c2707d34..3822dd7ba3 100644
--- a/crates/feedback/src/feedback.rs
+++ b/crates/feedback/src/feedback.rs
@@ -1,18 +1,14 @@
 use gpui::{App, ClipboardItem, PromptLevel, actions};
-use system_specs::SystemSpecs;
+use system_specs::{CopySystemSpecsIntoClipboard, SystemSpecs};
 use util::ResultExt;
 use workspace::Workspace;
 use zed_actions::feedback::FileBugReport;
 
 pub mod feedback_modal;
 
-pub mod system_specs;
-
 actions!(
     zed,
     [
-        /// Copies system specifications to the clipboard for bug reports.
-        CopySystemSpecsIntoClipboard,
         /// Opens email client to send feedback to Zed support.
         EmailZed,
         /// Opens the Zed repository on GitHub.
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 5e4b5fe6e9..0f5b98df39 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -352,7 +352,7 @@ impl<T> Flatten<T> for Result<T> {
 }
 
 /// Information about the GPU GPUI is running on.
-#[derive(Default, Debug)]
+#[derive(Default, Debug, serde::Serialize, serde::Deserialize, Clone)]
 pub struct GpuSpecs {
     /// Whether the GPU is really a fake (like `llvmpipe`) running on the CPU.
     pub is_software_emulated: bool,
diff --git a/crates/system_specs/Cargo.toml b/crates/system_specs/Cargo.toml
new file mode 100644
index 0000000000..8ef1b581ae
--- /dev/null
+++ b/crates/system_specs/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "system_specs"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/system_specs.rs"
+
+[features]
+default = []
+
+[dependencies]
+anyhow.workspace = true
+client.workspace = true
+gpui.workspace = true
+human_bytes.workspace = true
+release_channel.workspace = true
+serde.workspace = true
+sysinfo.workspace = true
+workspace-hack.workspace = true
+
+[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
+pciid-parser.workspace = true
diff --git a/crates/system_specs/LICENSE-GPL b/crates/system_specs/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/system_specs/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/feedback/src/system_specs.rs b/crates/system_specs/src/system_specs.rs
similarity index 59%
rename from crates/feedback/src/system_specs.rs
rename to crates/system_specs/src/system_specs.rs
index 87642ab929..731d335232 100644
--- a/crates/feedback/src/system_specs.rs
+++ b/crates/system_specs/src/system_specs.rs
@@ -1,11 +1,22 @@
+//! # system_specs
+
 use client::telemetry;
-use gpui::{App, AppContext as _, SemanticVersion, Task, Window};
+pub use gpui::GpuSpecs;
+use gpui::{App, AppContext as _, SemanticVersion, Task, Window, actions};
 use human_bytes::human_bytes;
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use serde::Serialize;
 use std::{env, fmt::Display};
 use sysinfo::{MemoryRefreshKind, RefreshKind, System};
 
+actions!(
+    zed,
+    [
+        /// Copies system specifications to the clipboard for bug reports.
+        CopySystemSpecsIntoClipboard,
+    ]
+);
+
 #[derive(Clone, Debug, Serialize)]
 pub struct SystemSpecs {
     app_version: String,
@@ -158,6 +169,115 @@ fn try_determine_available_gpus() -> Option<String> {
     }
 }
 
+#[derive(Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize, Clone)]
+pub struct GpuInfo {
+    pub device_name: Option<String>,
+    pub device_pci_id: u16,
+    pub vendor_name: Option<String>,
+    pub vendor_pci_id: u16,
+    pub driver_version: Option<String>,
+    pub driver_name: Option<String>,
+}
+
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+pub fn read_gpu_info_from_sys_class_drm() -> anyhow::Result<Vec<GpuInfo>> {
+    use anyhow::Context as _;
+    use pciid_parser;
+    let dir_iter = std::fs::read_dir("/sys/class/drm").context("Failed to read /sys/class/drm")?;
+    let mut pci_addresses = vec![];
+    let mut gpus = Vec::<GpuInfo>::new();
+    let pci_db = pciid_parser::Database::read().ok();
+    for entry in dir_iter {
+        let Ok(entry) = entry else {
+            continue;
+        };
+
+        let device_path = entry.path().join("device");
+        let Some(pci_address) = device_path.read_link().ok().and_then(|pci_address| {
+            pci_address
+                .file_name()
+                .and_then(std::ffi::OsStr::to_str)
+                .map(str::trim)
+                .map(str::to_string)
+        }) else {
+            continue;
+        };
+        let Ok(device_pci_id) = read_pci_id_from_path(device_path.join("device")) else {
+            continue;
+        };
+        let Ok(vendor_pci_id) = read_pci_id_from_path(device_path.join("vendor")) else {
+            continue;
+        };
+        let driver_name = std::fs::read_link(device_path.join("driver"))
+            .ok()
+            .and_then(|driver_link| {
+                driver_link
+                    .file_name()
+                    .and_then(std::ffi::OsStr::to_str)
+                    .map(str::trim)
+                    .map(str::to_string)
+            });
+        let driver_version = driver_name
+            .as_ref()
+            .and_then(|driver_name| {
+                std::fs::read_to_string(format!("/sys/module/{driver_name}/version")).ok()
+            })
+            .as_deref()
+            .map(str::trim)
+            .map(str::to_string);
+
+        let already_found = gpus
+            .iter()
+            .zip(&pci_addresses)
+            .any(|(gpu, gpu_pci_address)| {
+                gpu_pci_address == &pci_address
+                    && gpu.driver_version == driver_version
+                    && gpu.driver_name == driver_name
+            });
+
+        if already_found {
+            continue;
+        }
+
+        let vendor = pci_db
+            .as_ref()
+            .and_then(|db| db.vendors.get(&vendor_pci_id));
+        let vendor_name = vendor.map(|vendor| vendor.name.clone());
+        let device_name = vendor
+            .and_then(|vendor| vendor.devices.get(&device_pci_id))
+            .map(|device| device.name.clone());
+
+        gpus.push(GpuInfo {
+            device_name,
+            device_pci_id,
+            vendor_name,
+            vendor_pci_id,
+            driver_version,
+            driver_name,
+        });
+        pci_addresses.push(pci_address);
+    }
+
+    Ok(gpus)
+}
+
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+fn read_pci_id_from_path(path: impl AsRef<std::path::Path>) -> anyhow::Result<u16> {
+    use anyhow::Context as _;
+    let id = std::fs::read_to_string(path)?;
+    let id = id
+        .trim()
+        .strip_prefix("0x")
+        .context("Not a device ID")
+        .context(id.clone())?;
+    anyhow::ensure!(
+        id.len() == 4,
+        "Not a device id, expected 4 digits, found {}",
+        id.len()
+    );
+    u16::from_str_radix(id, 16).context("Failed to parse device ID")
+}
+
 /// Returns value of `ZED_BUNDLE_TYPE` set at compiletime or else at runtime.
 ///
 /// The compiletime value is used by flatpak since it doesn't seem to have a way to provide a
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index e1bda7ad36..570657ba8f 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -29,7 +29,7 @@ test-support = [
 any_vec.workspace = true
 anyhow.workspace = true
 async-recursion.workspace = true
-bincode = "1.2.1"
+bincode.workspace = true
 call.workspace = true
 client.workspace = true
 clock.workspace = true
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index ac4cd72124..c61e23f0a1 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -33,6 +33,7 @@ audio.workspace = true
 auto_update.workspace = true
 auto_update_ui.workspace = true
 backtrace = "0.3"
+bincode.workspace = true
 breadcrumbs.workspace = true
 call.workspace = true
 channel.workspace = true
@@ -60,6 +61,7 @@ extensions_ui.workspace = true
 feature_flags.workspace = true
 feedback.workspace = true
 file_finder.workspace = true
+system_specs.workspace = true
 fs.workspace = true
 futures.workspace = true
 git.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 7ab76b71de..8beefd5891 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -16,7 +16,7 @@ use extension_host::ExtensionStore;
 use fs::{Fs, RealFs};
 use futures::{StreamExt, channel::oneshot, future};
 use git::GitHostingProviderRegistry;
-use gpui::{App, AppContext as _, Application, AsyncApp, Focusable as _, UpdateGlobal as _};
+use gpui::{App, AppContext, Application, AsyncApp, Focusable as _, UpdateGlobal as _};
 
 use gpui_tokio::Tokio;
 use http_client::{Url, read_proxy_from_env};
@@ -240,7 +240,7 @@ pub fn main() {
         option_env!("ZED_COMMIT_SHA").map(|commit_sha| AppCommitSha::new(commit_sha.to_string()));
 
     if args.system_specs {
-        let system_specs = feedback::system_specs::SystemSpecs::new_stateless(
+        let system_specs = system_specs::SystemSpecs::new_stateless(
             app_version,
             app_commit_sha,
             *release_channel::RELEASE_CHANNEL,
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index e9acaa588d..ac06f1fd9f 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -89,7 +89,9 @@ pub fn init_panic_hook(
                 },
                 backtrace,
             );
-            std::process::exit(-1);
+            if MINIDUMP_ENDPOINT.is_none() {
+                std::process::exit(-1);
+            }
         }
         let main_module_base_address = get_main_module_base_address();
 
@@ -148,7 +150,9 @@ pub fn init_panic_hook(
         }
         zlog::flush();
 
-        if !is_pty && let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err() {
+        if (!is_pty || MINIDUMP_ENDPOINT.is_some())
+            && let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err()
+        {
             let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
             let panic_file_path = paths::logs_dir().join(format!("zed-{timestamp}.panic"));
             let panic_file = fs::OpenOptions::new()
@@ -614,10 +618,9 @@ async fn upload_minidump(
     let mut panic_message = "".to_owned();
     if let Some(panic_info) = metadata.panic.as_ref() {
         panic_message = panic_info.message.clone();
-        form = form.text("sentry[logentry][formatted]", panic_info.message.clone());
-        form = form.text("span", panic_info.span.clone());
-        // TODO: add gpu-context, feature-flag-context, and more of device-context like gpu
-        // name, screen resolution, available ram, device model, etc
+        form = form
+            .text("sentry[logentry][formatted]", panic_info.message.clone())
+            .text("span", panic_info.span.clone());
     }
     if let Some(minidump_error) = metadata.minidump_error.clone() {
         form = form.text("minidump_error", minidump_error);
@@ -633,6 +636,63 @@ async fn upload_minidump(
         commit_sha = metadata.init.commit_sha.clone(),
     );
 
+    let gpu_count = metadata.gpus.len();
+    for (index, gpu) in metadata.gpus.iter().cloned().enumerate() {
+        let system_specs::GpuInfo {
+            device_name,
+            device_pci_id,
+            vendor_name,
+            vendor_pci_id,
+            driver_version,
+            driver_name,
+        } = gpu;
+        let num = if gpu_count == 1 && metadata.active_gpu.is_none() {
+            String::new()
+        } else {
+            index.to_string()
+        };
+        let name = format!("gpu{num}");
+        let root = format!("sentry[contexts][{name}]");
+        form = form
+            .text(
+                format!("{root}[Description]"),
+                "A GPU found on the users system. May or may not be the GPU Zed is running on",
+            )
+            .text(format!("{root}[type]"), "gpu")
+            .text(format!("{root}[name]"), device_name.unwrap_or(name))
+            .text(format!("{root}[id]"), format!("{:#06x}", device_pci_id))
+            .text(
+                format!("{root}[vendor_id]"),
+                format!("{:#06x}", vendor_pci_id),
+            )
+            .text_if_some(format!("{root}[vendor_name]"), vendor_name)
+            .text_if_some(format!("{root}[driver_version]"), driver_version)
+            .text_if_some(format!("{root}[driver_name]"), driver_name);
+    }
+    if let Some(active_gpu) = metadata.active_gpu.clone() {
+        form = form
+            .text(
+                "sentry[contexts][Active_GPU][Description]",
+                "The GPU Zed is running on",
+            )
+            .text("sentry[contexts][Active_GPU][type]", "gpu")
+            .text("sentry[contexts][Active_GPU][name]", active_gpu.device_name)
+            .text(
+                "sentry[contexts][Active_GPU][driver_version]",
+                active_gpu.driver_info,
+            )
+            .text(
+                "sentry[contexts][Active_GPU][driver_name]",
+                active_gpu.driver_name,
+            )
+            .text(
+                "sentry[contexts][Active_GPU][is_software_emulated]",
+                active_gpu.is_software_emulated.to_string(),
+            );
+    }
+
+    // TODO: feature-flag-context, and more of device-context like screen resolution, available ram, device model, etc
+
     let mut response_text = String::new();
     let mut response = http.send_multipart_form(endpoint, form).await?;
     response
@@ -646,6 +706,27 @@ async fn upload_minidump(
     Ok(())
 }
 
+trait FormExt {
+    fn text_if_some(
+        self,
+        label: impl Into<std::borrow::Cow<'static, str>>,
+        value: Option<impl Into<std::borrow::Cow<'static, str>>>,
+    ) -> Self;
+}
+
+impl FormExt for Form {
+    fn text_if_some(
+        self,
+        label: impl Into<std::borrow::Cow<'static, str>>,
+        value: Option<impl Into<std::borrow::Cow<'static, str>>>,
+    ) -> Self {
+        match value {
+            Some(value) => self.text(label.into(), value.into()),
+            None => self,
+        }
+    }
+}
+
 async fn upload_panic(
     http: &Arc<HttpClientWithUrl>,
     panic_report_url: &Url,
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 3b5f99f9bd..638e1dca0e 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -344,7 +344,17 @@ pub fn initialize_workspace(
 
         if let Some(specs) = window.gpu_specs() {
             log::info!("Using GPU: {:?}", specs);
-            show_software_emulation_warning_if_needed(specs, window, cx);
+            show_software_emulation_warning_if_needed(specs.clone(), window, cx);
+            if let Some((crash_server, message)) = crashes::CRASH_HANDLER
+                .get()
+                .zip(bincode::serialize(&specs).ok())
+                && let Err(err) = crash_server.send_message(3, message)
+            {
+                log::warn!(
+                    "Failed to store active gpu info for crash reporting: {}",
+                    err
+                );
+            }
         }
 
         let edit_prediction_menu_handle = PopoverMenuHandle::default();

From ca139b701e20517260baf31602e2840e483b772b Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 21 Aug 2025 19:18:25 -0500
Subject: [PATCH 285/823] keymap_ui: Improve conflict resolution for
 semantically equal contexts (#36204)

Closes #ISSUE

Creates a function named `normalized_ctx_eq` that compares
`gpui::KeybindContextPredicate`'s while taking into account the
associativity of the binary operators. This function is now used to
compare context predicates in the keymap editor, greatly improving the
number of cases caught by our overloading and conflict detection

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/settings_ui/src/keybindings.rs | 397 +++++++++++++++++++++++---
 1 file changed, 353 insertions(+), 44 deletions(-)

diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 9a2d33ef7c..9c76725972 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -12,9 +12,11 @@ use fs::Fs;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
     Action, AppContext as _, AsyncApp, Axis, ClickEvent, Context, DismissEvent, Entity,
-    EventEmitter, FocusHandle, Focusable, Global, IsZero, KeyContext, Keystroke, MouseButton,
-    Point, ScrollStrategy, ScrollWheelEvent, Stateful, StyledText, Subscription, Task,
-    TextStyleRefinement, WeakEntity, actions, anchored, deferred, div,
+    EventEmitter, FocusHandle, Focusable, Global, IsZero,
+    KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or},
+    KeyContext, Keystroke, MouseButton, Point, ScrollStrategy, ScrollWheelEvent, Stateful,
+    StyledText, Subscription, Task, TextStyleRefinement, WeakEntity, actions, anchored, deferred,
+    div,
 };
 use language::{Language, LanguageConfig, ToOffset as _};
 use notifications::status_toast::{StatusToast, ToastIcon};
@@ -182,15 +184,6 @@ struct KeybindConflict {
     remaining_conflict_amount: usize,
 }
 
-impl KeybindConflict {
-    fn from_iter<'a>(mut indices: impl Iterator<Item = &'a ConflictOrigin>) -> Option<Self> {
-        indices.next().map(|origin| Self {
-            first_conflict_index: origin.index,
-            remaining_conflict_amount: indices.count(),
-        })
-    }
-}
-
 #[derive(Clone, Copy, PartialEq)]
 struct ConflictOrigin {
     override_source: KeybindSource,
@@ -238,13 +231,21 @@ impl ConflictOrigin {
 #[derive(Default)]
 struct ConflictState {
     conflicts: Vec<Option<ConflictOrigin>>,
-    keybind_mapping: HashMap<ActionMapping, Vec<ConflictOrigin>>,
+    keybind_mapping: ConflictKeybindMapping,
     has_user_conflicts: bool,
 }
 
+type ConflictKeybindMapping = HashMap<
+    Vec<Keystroke>,
+    Vec<(
+        Option<gpui::KeyBindingContextPredicate>,
+        Vec<ConflictOrigin>,
+    )>,
+>;
+
 impl ConflictState {
     fn new(key_bindings: &[ProcessedBinding]) -> Self {
-        let mut action_keybind_mapping: HashMap<_, Vec<ConflictOrigin>> = HashMap::default();
+        let mut action_keybind_mapping = ConflictKeybindMapping::default();
 
         let mut largest_index = 0;
         for (index, binding) in key_bindings
@@ -252,29 +253,48 @@ impl ConflictState {
             .enumerate()
             .flat_map(|(index, binding)| Some(index).zip(binding.keybind_information()))
         {
-            action_keybind_mapping
-                .entry(binding.get_action_mapping())
-                .or_default()
-                .push(ConflictOrigin::new(binding.source, index));
+            let mapping = binding.get_action_mapping();
+            let predicate = mapping
+                .context
+                .and_then(|ctx| gpui::KeyBindingContextPredicate::parse(&ctx).ok());
+            let entry = action_keybind_mapping
+                .entry(mapping.keystrokes)
+                .or_default();
+            let origin = ConflictOrigin::new(binding.source, index);
+            if let Some((_, origins)) =
+                entry
+                    .iter_mut()
+                    .find(|(other_predicate, _)| match (&predicate, other_predicate) {
+                        (None, None) => true,
+                        (Some(a), Some(b)) => normalized_ctx_eq(a, b),
+                        _ => false,
+                    })
+            {
+                origins.push(origin);
+            } else {
+                entry.push((predicate, vec![origin]));
+            }
             largest_index = index;
         }
 
         let mut conflicts = vec![None; largest_index + 1];
         let mut has_user_conflicts = false;
 
-        for indices in action_keybind_mapping.values_mut() {
-            indices.sort_unstable_by_key(|origin| origin.override_source);
-            let Some((fst, snd)) = indices.get(0).zip(indices.get(1)) else {
-                continue;
-            };
+        for entries in action_keybind_mapping.values_mut() {
+            for (_, indices) in entries.iter_mut() {
+                indices.sort_unstable_by_key(|origin| origin.override_source);
+                let Some((fst, snd)) = indices.get(0).zip(indices.get(1)) else {
+                    continue;
+                };
 
-            for origin in indices.iter() {
-                conflicts[origin.index] =
-                    origin.get_conflict_with(if origin == fst { snd } else { fst })
+                for origin in indices.iter() {
+                    conflicts[origin.index] =
+                        origin.get_conflict_with(if origin == fst { snd } else { fst })
+                }
+
+                has_user_conflicts |= fst.override_source == KeybindSource::User
+                    && snd.override_source == KeybindSource::User;
             }
-
-            has_user_conflicts |= fst.override_source == KeybindSource::User
-                && snd.override_source == KeybindSource::User;
         }
 
         Self {
@@ -289,15 +309,34 @@ impl ConflictState {
         action_mapping: &ActionMapping,
         keybind_idx: Option<usize>,
     ) -> Option<KeybindConflict> {
-        self.keybind_mapping
-            .get(action_mapping)
-            .and_then(|indices| {
-                KeybindConflict::from_iter(
-                    indices
+        let ActionMapping {
+            keystrokes,
+            context,
+        } = action_mapping;
+        let predicate = context
+            .as_deref()
+            .and_then(|ctx| gpui::KeyBindingContextPredicate::parse(&ctx).ok());
+        self.keybind_mapping.get(keystrokes).and_then(|entries| {
+            entries
+                .iter()
+                .find_map(|(other_predicate, indices)| {
+                    match (&predicate, other_predicate) {
+                        (None, None) => true,
+                        (Some(pred), Some(other)) => normalized_ctx_eq(pred, other),
+                        _ => false,
+                    }
+                    .then_some(indices)
+                })
+                .and_then(|indices| {
+                    let mut indices = indices
                         .iter()
-                        .filter(|&conflict| Some(conflict.index) != keybind_idx),
-                )
-            })
+                        .filter(|&conflict| Some(conflict.index) != keybind_idx);
+                    indices.next().map(|origin| KeybindConflict {
+                        first_conflict_index: origin.index,
+                        remaining_conflict_amount: indices.count(),
+                    })
+                })
+        })
     }
 
     fn conflict_for_idx(&self, idx: usize) -> Option<ConflictOrigin> {
@@ -3089,29 +3128,29 @@ fn collect_contexts_from_assets() -> Vec<SharedString> {
             queue.push(root_context);
             while let Some(context) = queue.pop() {
                 match context {
-                    gpui::KeyBindingContextPredicate::Identifier(ident) => {
+                    Identifier(ident) => {
                         contexts.insert(ident);
                     }
-                    gpui::KeyBindingContextPredicate::Equal(ident_a, ident_b) => {
+                    Equal(ident_a, ident_b) => {
                         contexts.insert(ident_a);
                         contexts.insert(ident_b);
                     }
-                    gpui::KeyBindingContextPredicate::NotEqual(ident_a, ident_b) => {
+                    NotEqual(ident_a, ident_b) => {
                         contexts.insert(ident_a);
                         contexts.insert(ident_b);
                     }
-                    gpui::KeyBindingContextPredicate::Descendant(ctx_a, ctx_b) => {
+                    Descendant(ctx_a, ctx_b) => {
                         queue.push(*ctx_a);
                         queue.push(*ctx_b);
                     }
-                    gpui::KeyBindingContextPredicate::Not(ctx) => {
+                    Not(ctx) => {
                         queue.push(*ctx);
                     }
-                    gpui::KeyBindingContextPredicate::And(ctx_a, ctx_b) => {
+                    And(ctx_a, ctx_b) => {
                         queue.push(*ctx_a);
                         queue.push(*ctx_b);
                     }
-                    gpui::KeyBindingContextPredicate::Or(ctx_a, ctx_b) => {
+                    Or(ctx_a, ctx_b) => {
                         queue.push(*ctx_a);
                         queue.push(*ctx_b);
                     }
@@ -3126,6 +3165,127 @@ fn collect_contexts_from_assets() -> Vec<SharedString> {
     contexts
 }
 
+fn normalized_ctx_eq(
+    a: &gpui::KeyBindingContextPredicate,
+    b: &gpui::KeyBindingContextPredicate,
+) -> bool {
+    use gpui::KeyBindingContextPredicate::*;
+    return match (a, b) {
+        (Identifier(_), Identifier(_)) => a == b,
+        (Equal(a_left, a_right), Equal(b_left, b_right)) => {
+            (a_left == b_left && a_right == b_right) || (a_left == b_right && a_right == b_left)
+        }
+        (NotEqual(a_left, a_right), NotEqual(b_left, b_right)) => {
+            (a_left == b_left && a_right == b_right) || (a_left == b_right && a_right == b_left)
+        }
+        (Descendant(a_parent, a_child), Descendant(b_parent, b_child)) => {
+            normalized_ctx_eq(a_parent, b_parent) && normalized_ctx_eq(a_child, b_child)
+        }
+        (Not(a_expr), Not(b_expr)) => normalized_ctx_eq(a_expr, b_expr),
+        // Handle double negation: !(!a) == a
+        (Not(a_expr), b) if matches!(a_expr.as_ref(), Not(_)) => {
+            let Not(a_inner) = a_expr.as_ref() else {
+                unreachable!();
+            };
+            normalized_ctx_eq(b, a_inner)
+        }
+        (a, Not(b_expr)) if matches!(b_expr.as_ref(), Not(_)) => {
+            let Not(b_inner) = b_expr.as_ref() else {
+                unreachable!();
+            };
+            normalized_ctx_eq(a, b_inner)
+        }
+        (And(a_left, a_right), And(b_left, b_right))
+            if matches!(a_left.as_ref(), And(_, _))
+                || matches!(a_right.as_ref(), And(_, _))
+                || matches!(b_left.as_ref(), And(_, _))
+                || matches!(b_right.as_ref(), And(_, _)) =>
+        {
+            let mut a_operands = Vec::new();
+            flatten_and(a, &mut a_operands);
+            let mut b_operands = Vec::new();
+            flatten_and(b, &mut b_operands);
+            compare_operand_sets(&a_operands, &b_operands)
+        }
+        (And(a_left, a_right), And(b_left, b_right)) => {
+            (normalized_ctx_eq(a_left, b_left) && normalized_ctx_eq(a_right, b_right))
+                || (normalized_ctx_eq(a_left, b_right) && normalized_ctx_eq(a_right, b_left))
+        }
+        (Or(a_left, a_right), Or(b_left, b_right))
+            if matches!(a_left.as_ref(), Or(_, _))
+                || matches!(a_right.as_ref(), Or(_, _))
+                || matches!(b_left.as_ref(), Or(_, _))
+                || matches!(b_right.as_ref(), Or(_, _)) =>
+        {
+            let mut a_operands = Vec::new();
+            flatten_or(a, &mut a_operands);
+            let mut b_operands = Vec::new();
+            flatten_or(b, &mut b_operands);
+            compare_operand_sets(&a_operands, &b_operands)
+        }
+        (Or(a_left, a_right), Or(b_left, b_right)) => {
+            (normalized_ctx_eq(a_left, b_left) && normalized_ctx_eq(a_right, b_right))
+                || (normalized_ctx_eq(a_left, b_right) && normalized_ctx_eq(a_right, b_left))
+        }
+        _ => false,
+    };
+
+    fn flatten_and<'a>(
+        pred: &'a gpui::KeyBindingContextPredicate,
+        operands: &mut Vec<&'a gpui::KeyBindingContextPredicate>,
+    ) {
+        use gpui::KeyBindingContextPredicate::*;
+        match pred {
+            And(left, right) => {
+                flatten_and(left, operands);
+                flatten_and(right, operands);
+            }
+            _ => operands.push(pred),
+        }
+    }
+
+    fn flatten_or<'a>(
+        pred: &'a gpui::KeyBindingContextPredicate,
+        operands: &mut Vec<&'a gpui::KeyBindingContextPredicate>,
+    ) {
+        use gpui::KeyBindingContextPredicate::*;
+        match pred {
+            Or(left, right) => {
+                flatten_or(left, operands);
+                flatten_or(right, operands);
+            }
+            _ => operands.push(pred),
+        }
+    }
+
+    fn compare_operand_sets(
+        a: &[&gpui::KeyBindingContextPredicate],
+        b: &[&gpui::KeyBindingContextPredicate],
+    ) -> bool {
+        if a.len() != b.len() {
+            return false;
+        }
+
+        // For each operand in a, find a matching operand in b
+        let mut b_matched = vec![false; b.len()];
+        for a_operand in a {
+            let mut found = false;
+            for (b_idx, b_operand) in b.iter().enumerate() {
+                if !b_matched[b_idx] && normalized_ctx_eq(a_operand, b_operand) {
+                    b_matched[b_idx] = true;
+                    found = true;
+                    break;
+                }
+            }
+            if !found {
+                return false;
+            }
+        }
+
+        true
+    }
+}
+
 impl SerializableItem for KeymapEditor {
     fn serialized_item_kind() -> &'static str {
         "KeymapEditor"
@@ -3228,3 +3388,152 @@ mod persistence {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalized_ctx_cmp() {
+        #[track_caller]
+        fn cmp(a: &str, b: &str) -> bool {
+            let a = gpui::KeyBindingContextPredicate::parse(a)
+                .expect("Failed to parse keybinding context a");
+            let b = gpui::KeyBindingContextPredicate::parse(b)
+                .expect("Failed to parse keybinding context b");
+            normalized_ctx_eq(&a, &b)
+        }
+
+        // Basic equality - identical expressions
+        assert!(cmp("a && b", "a && b"));
+        assert!(cmp("a || b", "a || b"));
+        assert!(cmp("a == b", "a == b"));
+        assert!(cmp("a != b", "a != b"));
+        assert!(cmp("a > b", "a > b"));
+        assert!(cmp("!a", "!a"));
+
+        // AND operator - associative/commutative
+        assert!(cmp("a && b", "b && a"));
+        assert!(cmp("a && b && c", "c && b && a"));
+        assert!(cmp("a && b && c", "b && a && c"));
+        assert!(cmp("a && b && c && d", "d && c && b && a"));
+
+        // OR operator - associative/commutative
+        assert!(cmp("a || b", "b || a"));
+        assert!(cmp("a || b || c", "c || b || a"));
+        assert!(cmp("a || b || c", "b || a || c"));
+        assert!(cmp("a || b || c || d", "d || c || b || a"));
+
+        // Equality operator - associative/commutative
+        assert!(cmp("a == b", "b == a"));
+        assert!(cmp("x == y", "y == x"));
+
+        // Inequality operator - associative/commutative
+        assert!(cmp("a != b", "b != a"));
+        assert!(cmp("x != y", "y != x"));
+
+        // Complex nested expressions with associative operators
+        assert!(cmp("(a && b) || c", "c || (a && b)"));
+        assert!(cmp("(a && b) || c", "c || (b && a)"));
+        assert!(cmp("(a || b) && c", "c && (a || b)"));
+        assert!(cmp("(a || b) && c", "c && (b || a)"));
+        assert!(cmp("(a && b) || (c && d)", "(c && d) || (a && b)"));
+        assert!(cmp("(a && b) || (c && d)", "(d && c) || (b && a)"));
+
+        // Multiple levels of nesting
+        assert!(cmp("((a && b) || c) && d", "d && ((a && b) || c)"));
+        assert!(cmp("((a && b) || c) && d", "d && (c || (b && a))"));
+        assert!(cmp("a && (b || (c && d))", "(b || (c && d)) && a"));
+        assert!(cmp("a && (b || (c && d))", "(b || (d && c)) && a"));
+
+        // Negation with associative operators
+        assert!(cmp("!a && b", "b && !a"));
+        assert!(cmp("!a || b", "b || !a"));
+        assert!(cmp("!(a && b) || c", "c || !(a && b)"));
+        assert!(cmp("!(a && b) || c", "c || !(b && a)"));
+
+        // Descendant operator (>) - NOT associative/commutative
+        assert!(cmp("a > b", "a > b"));
+        assert!(!cmp("a > b", "b > a"));
+        assert!(!cmp("a > b > c", "c > b > a"));
+        assert!(!cmp("a > b > c", "a > c > b"));
+
+        // Mixed operators with descendant
+        assert!(cmp("(a > b) && c", "c && (a > b)"));
+        assert!(!cmp("(a > b) && c", "c && (b > a)"));
+        assert!(cmp("(a > b) || (c > d)", "(c > d) || (a > b)"));
+        assert!(!cmp("(a > b) || (c > d)", "(b > a) || (d > c)"));
+
+        // Negative cases - different operators
+        assert!(!cmp("a && b", "a || b"));
+        assert!(!cmp("a == b", "a != b"));
+        assert!(!cmp("a && b", "a > b"));
+        assert!(!cmp("a || b", "a > b"));
+        assert!(!cmp("a == b", "a && b"));
+        assert!(!cmp("a != b", "a || b"));
+
+        // Negative cases - different operands
+        assert!(!cmp("a && b", "a && c"));
+        assert!(!cmp("a && b", "c && d"));
+        assert!(!cmp("a || b", "a || c"));
+        assert!(!cmp("a || b", "c || d"));
+        assert!(!cmp("a == b", "a == c"));
+        assert!(!cmp("a != b", "a != c"));
+        assert!(!cmp("a > b", "a > c"));
+        assert!(!cmp("a > b", "c > b"));
+
+        // Negative cases - with negation
+        assert!(!cmp("!a", "a"));
+        assert!(!cmp("!a && b", "a && b"));
+        assert!(!cmp("!(a && b)", "a && b"));
+        assert!(!cmp("!a || b", "a || b"));
+        assert!(!cmp("!(a || b)", "a || b"));
+
+        // Negative cases - complex expressions
+        assert!(!cmp("(a && b) || c", "(a || b) && c"));
+        assert!(!cmp("a && (b || c)", "a || (b && c)"));
+        assert!(!cmp("(a && b) || (c && d)", "(a || b) && (c || d)"));
+        assert!(!cmp("a > b && c", "a && b > c"));
+
+        // Edge cases - multiple same operands
+        assert!(cmp("a && a", "a && a"));
+        assert!(cmp("a || a", "a || a"));
+        assert!(cmp("a && a && b", "b && a && a"));
+        assert!(cmp("a || a || b", "b || a || a"));
+
+        // Edge cases - deeply nested
+        assert!(cmp(
+            "((a && b) || (c && d)) && ((e || f) && g)",
+            "((e || f) && g) && ((c && d) || (a && b))"
+        ));
+        assert!(cmp(
+            "((a && b) || (c && d)) && ((e || f) && g)",
+            "(g && (f || e)) && ((d && c) || (b && a))"
+        ));
+
+        // Edge cases - repeated patterns
+        assert!(cmp("(a && b) || (a && b)", "(b && a) || (b && a)"));
+        assert!(cmp("(a || b) && (a || b)", "(b || a) && (b || a)"));
+
+        // Negative cases - subtle differences
+        assert!(!cmp("a && b && c", "a && b"));
+        assert!(!cmp("a || b || c", "a || b"));
+        assert!(!cmp("(a && b) || c", "a && (b || c)"));
+
+        // a > b > c is not the same as a > c, should not be equal
+        assert!(!cmp("a > b > c", "a > c"));
+
+        // Double negation with complex expressions
+        assert!(cmp("!(!(a && b))", "a && b"));
+        assert!(cmp("!(!(a || b))", "a || b"));
+        assert!(cmp("!(!(a > b))", "a > b"));
+        assert!(cmp("!(!a) && b", "a && b"));
+        assert!(cmp("!(!a) || b", "a || b"));
+        assert!(cmp("!(!(a && b)) || c", "(a && b) || c"));
+        assert!(cmp("!(!(a && b)) || c", "(b && a) || c"));
+        assert!(cmp("!(!a)", "a"));
+        assert!(cmp("a", "!(!a)"));
+        assert!(cmp("!(!(!a))", "!a"));
+        assert!(cmp("!(!(!(!a)))", "a"));
+    }
+}

From e1a96b68f0e3d995e57cd7ca5c7d8fd5b313944d Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 21 Aug 2025 17:37:41 -0700
Subject: [PATCH 286/823] acp: Tool name prep (#36726)

Prep work for deduping tool names

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs                    |  2 -
 crates/agent2/src/tests/mod.rs                | 55 +++++++++----------
 crates/agent2/src/tests/test_tools.rs         | 30 +++++-----
 crates/agent2/src/thread.rs                   | 16 +++---
 crates/agent2/src/tools.rs                    | 25 +++++++++
 crates/agent2/src/tools/copy_path_tool.rs     |  8 +--
 .../agent2/src/tools/create_directory_tool.rs |  6 +-
 crates/agent2/src/tools/delete_path_tool.rs   |  6 +-
 crates/agent2/src/tools/diagnostics_tool.rs   |  6 +-
 crates/agent2/src/tools/edit_file_tool.rs     | 29 ++--------
 crates/agent2/src/tools/fetch_tool.rs         |  6 +-
 crates/agent2/src/tools/find_path_tool.rs     |  6 +-
 crates/agent2/src/tools/grep_tool.rs          |  6 +-
 .../agent2/src/tools/list_directory_tool.rs   |  6 +-
 crates/agent2/src/tools/move_path_tool.rs     |  6 +-
 crates/agent2/src/tools/now_tool.rs           |  6 +-
 crates/agent2/src/tools/open_tool.rs          |  6 +-
 crates/agent2/src/tools/read_file_tool.rs     |  6 +-
 crates/agent2/src/tools/terminal_tool.rs      |  6 +-
 crates/agent2/src/tools/thinking_tool.rs      |  6 +-
 crates/agent2/src/tools/web_search_tool.rs    |  6 +-
 21 files changed, 126 insertions(+), 123 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index bbc30b74bc..215f8f454b 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -857,7 +857,6 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         cx.spawn(async move |cx| {
             log::debug!("Starting thread creation in async context");
 
-            let action_log = cx.new(|_cx| ActionLog::new(project.clone()))?;
             // Create Thread
             let thread = agent.update(
                 cx,
@@ -878,7 +877,6 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                             project.clone(),
                             agent.project_context.clone(),
                             agent.context_server_registry.clone(),
-                            action_log.clone(),
                             agent.templates.clone(),
                             default_model,
                             cx,
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index e7e28f495e..ac7b40c64f 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1,6 +1,5 @@
 use super::*;
 use acp_thread::{AgentConnection, AgentModelGroupName, AgentModelList, UserMessageId};
-use action_log::ActionLog;
 use agent_client_protocol::{self as acp};
 use agent_settings::AgentProfileId;
 use anyhow::Result;
@@ -224,7 +223,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
 
     let tool_use = LanguageModelToolUse {
         id: "tool_1".into(),
-        name: EchoTool.name().into(),
+        name: EchoTool::name().into(),
         raw_input: json!({"text": "test"}).to_string(),
         input: json!({"text": "test"}),
         is_input_complete: true,
@@ -237,7 +236,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
     let completion = fake_model.pending_completions().pop().unwrap();
     let tool_result = LanguageModelToolResult {
         tool_use_id: "tool_1".into(),
-        tool_name: EchoTool.name().into(),
+        tool_name: EchoTool::name().into(),
         is_error: false,
         content: "test".into(),
         output: Some("test".into()),
@@ -307,7 +306,7 @@ async fn test_basic_tool_calls(cx: &mut TestAppContext) {
     // Test a tool calls that's likely to complete *after* streaming stops.
     let events = thread
         .update(cx, |thread, cx| {
-            thread.remove_tool(&AgentTool::name(&EchoTool));
+            thread.remove_tool(&EchoTool::name());
             thread.add_tool(DelayTool);
             thread.send(
                 UserMessageId::new(),
@@ -411,7 +410,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
             id: "tool_id_1".into(),
-            name: ToolRequiringPermission.name().into(),
+            name: ToolRequiringPermission::name().into(),
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
@@ -420,7 +419,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
             id: "tool_id_2".into(),
-            name: ToolRequiringPermission.name().into(),
+            name: ToolRequiringPermission::name().into(),
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
@@ -451,14 +450,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         vec![
             language_model::MessageContent::ToolResult(LanguageModelToolResult {
                 tool_use_id: tool_call_auth_1.tool_call.id.0.to_string().into(),
-                tool_name: ToolRequiringPermission.name().into(),
+                tool_name: ToolRequiringPermission::name().into(),
                 is_error: false,
                 content: "Allowed".into(),
                 output: Some("Allowed".into())
             }),
             language_model::MessageContent::ToolResult(LanguageModelToolResult {
                 tool_use_id: tool_call_auth_2.tool_call.id.0.to_string().into(),
-                tool_name: ToolRequiringPermission.name().into(),
+                tool_name: ToolRequiringPermission::name().into(),
                 is_error: true,
                 content: "Permission to run tool denied by user".into(),
                 output: None
@@ -470,7 +469,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
             id: "tool_id_3".into(),
-            name: ToolRequiringPermission.name().into(),
+            name: ToolRequiringPermission::name().into(),
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
@@ -492,7 +491,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         vec![language_model::MessageContent::ToolResult(
             LanguageModelToolResult {
                 tool_use_id: tool_call_auth_3.tool_call.id.0.to_string().into(),
-                tool_name: ToolRequiringPermission.name().into(),
+                tool_name: ToolRequiringPermission::name().into(),
                 is_error: false,
                 content: "Allowed".into(),
                 output: Some("Allowed".into())
@@ -504,7 +503,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
             id: "tool_id_4".into(),
-            name: ToolRequiringPermission.name().into(),
+            name: ToolRequiringPermission::name().into(),
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
@@ -519,7 +518,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         vec![language_model::MessageContent::ToolResult(
             LanguageModelToolResult {
                 tool_use_id: "tool_id_4".into(),
-                tool_name: ToolRequiringPermission.name().into(),
+                tool_name: ToolRequiringPermission::name().into(),
                 is_error: false,
                 content: "Allowed".into(),
                 output: Some("Allowed".into())
@@ -571,7 +570,7 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
     cx.run_until_parked();
     let tool_use = LanguageModelToolUse {
         id: "tool_id_1".into(),
-        name: EchoTool.name().into(),
+        name: EchoTool::name().into(),
         raw_input: "{}".into(),
         input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
         is_input_complete: true,
@@ -584,7 +583,7 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
     let completion = fake_model.pending_completions().pop().unwrap();
     let tool_result = LanguageModelToolResult {
         tool_use_id: "tool_id_1".into(),
-        tool_name: EchoTool.name().into(),
+        tool_name: EchoTool::name().into(),
         is_error: false,
         content: "def".into(),
         output: Some("def".into()),
@@ -690,14 +689,14 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
 
     let tool_use = LanguageModelToolUse {
         id: "tool_id_1".into(),
-        name: EchoTool.name().into(),
+        name: EchoTool::name().into(),
         raw_input: "{}".into(),
         input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
         is_input_complete: true,
     };
     let tool_result = LanguageModelToolResult {
         tool_use_id: "tool_id_1".into(),
-        tool_name: EchoTool.name().into(),
+        tool_name: EchoTool::name().into(),
         is_error: false,
         content: "def".into(),
         output: Some("def".into()),
@@ -874,14 +873,14 @@ async fn test_profiles(cx: &mut TestAppContext) {
                     "test-1": {
                         "name": "Test Profile 1",
                         "tools": {
-                            EchoTool.name(): true,
-                            DelayTool.name(): true,
+                            EchoTool::name(): true,
+                            DelayTool::name(): true,
                         }
                     },
                     "test-2": {
                         "name": "Test Profile 2",
                         "tools": {
-                            InfiniteTool.name(): true,
+                            InfiniteTool::name(): true,
                         }
                     }
                 }
@@ -910,7 +909,7 @@ async fn test_profiles(cx: &mut TestAppContext) {
         .iter()
         .map(|tool| tool.name.clone())
         .collect();
-    assert_eq!(tool_names, vec![DelayTool.name(), EchoTool.name()]);
+    assert_eq!(tool_names, vec![DelayTool::name(), EchoTool::name()]);
     fake_model.end_last_completion_stream();
 
     // Switch to test-2 profile, and verify that it has only the infinite tool.
@@ -929,7 +928,7 @@ async fn test_profiles(cx: &mut TestAppContext) {
         .iter()
         .map(|tool| tool.name.clone())
         .collect();
-    assert_eq!(tool_names, vec![InfiniteTool.name()]);
+    assert_eq!(tool_names, vec![InfiniteTool::name()]);
 }
 
 #[gpui::test]
@@ -1552,7 +1551,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         LanguageModelToolUse {
             id: "1".into(),
-            name: ThinkingTool.name().into(),
+            name: ThinkingTool::name().into(),
             raw_input: input.to_string(),
             input,
             is_input_complete: false,
@@ -1840,11 +1839,11 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
                     "test-profile": {
                         "name": "Test Profile",
                         "tools": {
-                            EchoTool.name(): true,
-                            DelayTool.name(): true,
-                            WordListTool.name(): true,
-                            ToolRequiringPermission.name(): true,
-                            InfiniteTool.name(): true,
+                            EchoTool::name(): true,
+                            DelayTool::name(): true,
+                            WordListTool::name(): true,
+                            ToolRequiringPermission::name(): true,
+                            InfiniteTool::name(): true,
                         }
                     }
                 }
@@ -1903,13 +1902,11 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
     let project_context = cx.new(|_cx| ProjectContext::default());
     let context_server_registry =
         cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-    let action_log = cx.new(|_| ActionLog::new(project.clone()));
     let thread = cx.new(|cx| {
         Thread::new(
             project,
             project_context.clone(),
             context_server_registry,
-            action_log,
             templates,
             Some(model.clone()),
             cx,
diff --git a/crates/agent2/src/tests/test_tools.rs b/crates/agent2/src/tests/test_tools.rs
index cbff44cedf..27be7b6ac3 100644
--- a/crates/agent2/src/tests/test_tools.rs
+++ b/crates/agent2/src/tests/test_tools.rs
@@ -16,11 +16,11 @@ impl AgentTool for EchoTool {
     type Input = EchoToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "echo".into()
+    fn name() -> &'static str {
+        "echo"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Other
     }
 
@@ -51,8 +51,8 @@ impl AgentTool for DelayTool {
     type Input = DelayToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "delay".into()
+    fn name() -> &'static str {
+        "delay"
     }
 
     fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
@@ -63,7 +63,7 @@ impl AgentTool for DelayTool {
         }
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Other
     }
 
@@ -92,11 +92,11 @@ impl AgentTool for ToolRequiringPermission {
     type Input = ToolRequiringPermissionInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "tool_requiring_permission".into()
+    fn name() -> &'static str {
+        "tool_requiring_permission"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Other
     }
 
@@ -127,11 +127,11 @@ impl AgentTool for InfiniteTool {
     type Input = InfiniteToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "infinite".into()
+    fn name() -> &'static str {
+        "infinite"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Other
     }
 
@@ -178,11 +178,11 @@ impl AgentTool for WordListTool {
     type Input = WordListInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "word_list".into()
+    fn name() -> &'static str {
+        "word_list"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Other
     }
 
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index f6ef11c20b..af18afa055 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -544,12 +544,12 @@ impl Thread {
         project: Entity<Project>,
         project_context: Entity<ProjectContext>,
         context_server_registry: Entity<ContextServerRegistry>,
-        action_log: Entity<ActionLog>,
         templates: Arc<Templates>,
         model: Option<Arc<dyn LanguageModel>>,
         cx: &mut Context<Self>,
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
+        let action_log = cx.new(|_cx| ActionLog::new(project.clone()));
         Self {
             id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
             prompt_id: PromptId::new(),
@@ -959,11 +959,11 @@ impl Thread {
         ));
         self.add_tool(TerminalTool::new(self.project.clone(), cx));
         self.add_tool(ThinkingTool);
-        self.add_tool(WebSearchTool); // TODO: Enable this only if it's a zed model.
+        self.add_tool(WebSearchTool);
     }
 
-    pub fn add_tool(&mut self, tool: impl AgentTool) {
-        self.tools.insert(tool.name(), tool.erase());
+    pub fn add_tool<T: AgentTool>(&mut self, tool: T) {
+        self.tools.insert(T::name().into(), tool.erase());
     }
 
     pub fn remove_tool(&mut self, name: &str) -> bool {
@@ -1989,7 +1989,7 @@ where
     type Input: for<'de> Deserialize<'de> + Serialize + JsonSchema;
     type Output: for<'de> Deserialize<'de> + Serialize + Into<LanguageModelToolResultContent>;
 
-    fn name(&self) -> SharedString;
+    fn name() -> &'static str;
 
     fn description(&self) -> SharedString {
         let schema = schemars::schema_for!(Self::Input);
@@ -2001,7 +2001,7 @@ where
         )
     }
 
-    fn kind(&self) -> acp::ToolKind;
+    fn kind() -> acp::ToolKind;
 
     /// The initial tool title to display. Can be updated during the tool run.
     fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString;
@@ -2077,7 +2077,7 @@ where
     T: AgentTool,
 {
     fn name(&self) -> SharedString {
-        self.0.name()
+        T::name().into()
     }
 
     fn description(&self) -> SharedString {
@@ -2085,7 +2085,7 @@ where
     }
 
     fn kind(&self) -> agent_client_protocol::ToolKind {
-        self.0.kind()
+        T::kind()
     }
 
     fn initial_title(&self, input: serde_json::Value) -> SharedString {
diff --git a/crates/agent2/src/tools.rs b/crates/agent2/src/tools.rs
index d1f2b3b1c7..bcca7eecd1 100644
--- a/crates/agent2/src/tools.rs
+++ b/crates/agent2/src/tools.rs
@@ -16,6 +16,29 @@ mod terminal_tool;
 mod thinking_tool;
 mod web_search_tool;
 
+/// A list of all built in tool names, for use in deduplicating MCP tool names
+pub fn default_tool_names() -> impl Iterator<Item = &'static str> {
+    [
+        CopyPathTool::name(),
+        CreateDirectoryTool::name(),
+        DeletePathTool::name(),
+        DiagnosticsTool::name(),
+        EditFileTool::name(),
+        FetchTool::name(),
+        FindPathTool::name(),
+        GrepTool::name(),
+        ListDirectoryTool::name(),
+        MovePathTool::name(),
+        NowTool::name(),
+        OpenTool::name(),
+        ReadFileTool::name(),
+        TerminalTool::name(),
+        ThinkingTool::name(),
+        WebSearchTool::name(),
+    ]
+    .into_iter()
+}
+
 pub use context_server_registry::*;
 pub use copy_path_tool::*;
 pub use create_directory_tool::*;
@@ -33,3 +56,5 @@ pub use read_file_tool::*;
 pub use terminal_tool::*;
 pub use thinking_tool::*;
 pub use web_search_tool::*;
+
+use crate::AgentTool;
diff --git a/crates/agent2/src/tools/copy_path_tool.rs b/crates/agent2/src/tools/copy_path_tool.rs
index 4b40a9842f..819a6ff209 100644
--- a/crates/agent2/src/tools/copy_path_tool.rs
+++ b/crates/agent2/src/tools/copy_path_tool.rs
@@ -1,7 +1,7 @@
 use crate::{AgentTool, ToolCallEventStream};
 use agent_client_protocol::ToolKind;
 use anyhow::{Context as _, Result, anyhow};
-use gpui::{App, AppContext, Entity, SharedString, Task};
+use gpui::{App, AppContext, Entity, Task};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -50,11 +50,11 @@ impl AgentTool for CopyPathTool {
     type Input = CopyPathToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "copy_path".into()
+    fn name() -> &'static str {
+        "copy_path"
     }
 
-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
         ToolKind::Move
     }
 
diff --git a/crates/agent2/src/tools/create_directory_tool.rs b/crates/agent2/src/tools/create_directory_tool.rs
index 7720eb3595..652363d5fa 100644
--- a/crates/agent2/src/tools/create_directory_tool.rs
+++ b/crates/agent2/src/tools/create_directory_tool.rs
@@ -41,11 +41,11 @@ impl AgentTool for CreateDirectoryTool {
     type Input = CreateDirectoryToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "create_directory".into()
+    fn name() -> &'static str {
+        "create_directory"
     }
 
-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
         ToolKind::Read
     }
 
diff --git a/crates/agent2/src/tools/delete_path_tool.rs b/crates/agent2/src/tools/delete_path_tool.rs
index c281f1b5b6..0f9641127f 100644
--- a/crates/agent2/src/tools/delete_path_tool.rs
+++ b/crates/agent2/src/tools/delete_path_tool.rs
@@ -44,11 +44,11 @@ impl AgentTool for DeletePathTool {
     type Input = DeletePathToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "delete_path".into()
+    fn name() -> &'static str {
+        "delete_path"
     }
 
-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
         ToolKind::Delete
     }
 
diff --git a/crates/agent2/src/tools/diagnostics_tool.rs b/crates/agent2/src/tools/diagnostics_tool.rs
index 6ba8b7b377..558bb918ce 100644
--- a/crates/agent2/src/tools/diagnostics_tool.rs
+++ b/crates/agent2/src/tools/diagnostics_tool.rs
@@ -63,11 +63,11 @@ impl AgentTool for DiagnosticsTool {
     type Input = DiagnosticsToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "diagnostics".into()
+    fn name() -> &'static str {
+        "diagnostics"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Read
     }
 
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index f89cace9a8..5a68d0c70a 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -186,11 +186,11 @@ impl AgentTool for EditFileTool {
     type Input = EditFileToolInput;
     type Output = EditFileToolOutput;
 
-    fn name(&self) -> SharedString {
-        "edit_file".into()
+    fn name() -> &'static str {
+        "edit_file"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Edit
     }
 
@@ -517,7 +517,6 @@ fn resolve_path(
 mod tests {
     use super::*;
     use crate::{ContextServerRegistry, Templates};
-    use action_log::ActionLog;
     use client::TelemetrySettings;
     use fs::Fs;
     use gpui::{TestAppContext, UpdateGlobal};
@@ -535,7 +534,6 @@ mod tests {
         fs.insert_tree("/root", json!({})).await;
         let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let model = Arc::new(FakeLanguageModel::default());
@@ -544,7 +542,6 @@ mod tests {
                 project,
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
-                action_log,
                 Templates::new(),
                 Some(model),
                 cx,
@@ -735,7 +732,6 @@ mod tests {
             }
         });
 
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let model = Arc::new(FakeLanguageModel::default());
@@ -744,7 +740,6 @@ mod tests {
                 project,
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -801,7 +796,9 @@ mod tests {
             "Code should be formatted when format_on_save is enabled"
         );
 
-        let stale_buffer_count = action_log.read_with(cx, |log, cx| log.stale_buffers(cx).count());
+        let stale_buffer_count = thread
+            .read_with(cx, |thread, _cx| thread.action_log.clone())
+            .read_with(cx, |log, cx| log.stale_buffers(cx).count());
 
         assert_eq!(
             stale_buffer_count, 0,
@@ -879,14 +876,12 @@ mod tests {
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -1008,14 +1003,12 @@ mod tests {
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -1146,14 +1139,12 @@ mod tests {
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
                 project,
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -1254,7 +1245,6 @@ mod tests {
         )
         .await;
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let model = Arc::new(FakeLanguageModel::default());
@@ -1263,7 +1253,6 @@ mod tests {
                 project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry.clone(),
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -1336,7 +1325,6 @@ mod tests {
         .await;
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let model = Arc::new(FakeLanguageModel::default());
@@ -1345,7 +1333,6 @@ mod tests {
                 project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry.clone(),
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -1421,7 +1408,6 @@ mod tests {
         .await;
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let model = Arc::new(FakeLanguageModel::default());
@@ -1430,7 +1416,6 @@ mod tests {
                 project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry.clone(),
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
@@ -1503,7 +1488,6 @@ mod tests {
         let fs = project::FakeFs::new(cx.executor());
         let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
         let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
         let model = Arc::new(FakeLanguageModel::default());
@@ -1512,7 +1496,6 @@ mod tests {
                 project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
-                action_log.clone(),
                 Templates::new(),
                 Some(model.clone()),
                 cx,
diff --git a/crates/agent2/src/tools/fetch_tool.rs b/crates/agent2/src/tools/fetch_tool.rs
index ae26c5fe19..0313c4e4c2 100644
--- a/crates/agent2/src/tools/fetch_tool.rs
+++ b/crates/agent2/src/tools/fetch_tool.rs
@@ -118,11 +118,11 @@ impl AgentTool for FetchTool {
     type Input = FetchToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "fetch".into()
+    fn name() -> &'static str {
+        "fetch"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Fetch
     }
 
diff --git a/crates/agent2/src/tools/find_path_tool.rs b/crates/agent2/src/tools/find_path_tool.rs
index 9e11ca6a37..5b35c40f85 100644
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -85,11 +85,11 @@ impl AgentTool for FindPathTool {
     type Input = FindPathToolInput;
     type Output = FindPathToolOutput;
 
-    fn name(&self) -> SharedString {
-        "find_path".into()
+    fn name() -> &'static str {
+        "find_path"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Search
     }
 
diff --git a/crates/agent2/src/tools/grep_tool.rs b/crates/agent2/src/tools/grep_tool.rs
index 955dae7235..b24e773903 100644
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -67,11 +67,11 @@ impl AgentTool for GrepTool {
     type Input = GrepToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "grep".into()
+    fn name() -> &'static str {
+        "grep"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Search
     }
 
diff --git a/crates/agent2/src/tools/list_directory_tool.rs b/crates/agent2/src/tools/list_directory_tool.rs
index 31575a92e4..e6fa8d7431 100644
--- a/crates/agent2/src/tools/list_directory_tool.rs
+++ b/crates/agent2/src/tools/list_directory_tool.rs
@@ -51,11 +51,11 @@ impl AgentTool for ListDirectoryTool {
     type Input = ListDirectoryToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "list_directory".into()
+    fn name() -> &'static str {
+        "list_directory"
     }
 
-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
         ToolKind::Read
     }
 
diff --git a/crates/agent2/src/tools/move_path_tool.rs b/crates/agent2/src/tools/move_path_tool.rs
index 2a173a4404..d9fb60651b 100644
--- a/crates/agent2/src/tools/move_path_tool.rs
+++ b/crates/agent2/src/tools/move_path_tool.rs
@@ -52,11 +52,11 @@ impl AgentTool for MovePathTool {
     type Input = MovePathToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "move_path".into()
+    fn name() -> &'static str {
+        "move_path"
     }
 
-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
         ToolKind::Move
     }
 
diff --git a/crates/agent2/src/tools/now_tool.rs b/crates/agent2/src/tools/now_tool.rs
index a72ede26fe..9467e7db68 100644
--- a/crates/agent2/src/tools/now_tool.rs
+++ b/crates/agent2/src/tools/now_tool.rs
@@ -32,11 +32,11 @@ impl AgentTool for NowTool {
     type Input = NowToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "now".into()
+    fn name() -> &'static str {
+        "now"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Other
     }
 
diff --git a/crates/agent2/src/tools/open_tool.rs b/crates/agent2/src/tools/open_tool.rs
index c20369c2d8..df7b04c787 100644
--- a/crates/agent2/src/tools/open_tool.rs
+++ b/crates/agent2/src/tools/open_tool.rs
@@ -37,11 +37,11 @@ impl AgentTool for OpenTool {
     type Input = OpenToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "open".into()
+    fn name() -> &'static str {
+        "open"
     }
 
-    fn kind(&self) -> ToolKind {
+    fn kind() -> ToolKind {
         ToolKind::Execute
     }
 
diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index 11a57506fb..903e1582ac 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -59,11 +59,11 @@ impl AgentTool for ReadFileTool {
     type Input = ReadFileToolInput;
     type Output = LanguageModelToolResultContent;
 
-    fn name(&self) -> SharedString {
-        "read_file".into()
+    fn name() -> &'static str {
+        "read_file"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Read
     }
 
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index 3d4faf2e03..f41b909d0b 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -63,11 +63,11 @@ impl AgentTool for TerminalTool {
     type Input = TerminalToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "terminal".into()
+    fn name() -> &'static str {
+        "terminal"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Execute
     }
 
diff --git a/crates/agent2/src/tools/thinking_tool.rs b/crates/agent2/src/tools/thinking_tool.rs
index c5e9451162..61fb9eb0d6 100644
--- a/crates/agent2/src/tools/thinking_tool.rs
+++ b/crates/agent2/src/tools/thinking_tool.rs
@@ -21,11 +21,11 @@ impl AgentTool for ThinkingTool {
     type Input = ThinkingToolInput;
     type Output = String;
 
-    fn name(&self) -> SharedString {
-        "thinking".into()
+    fn name() -> &'static str {
+        "thinking"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Think
     }
 
diff --git a/crates/agent2/src/tools/web_search_tool.rs b/crates/agent2/src/tools/web_search_tool.rs
index ffcd4ad3be..d7a34bec29 100644
--- a/crates/agent2/src/tools/web_search_tool.rs
+++ b/crates/agent2/src/tools/web_search_tool.rs
@@ -40,11 +40,11 @@ impl AgentTool for WebSearchTool {
     type Input = WebSearchToolInput;
     type Output = WebSearchToolOutput;
 
-    fn name(&self) -> SharedString {
-        "web_search".into()
+    fn name() -> &'static str {
+        "web_search"
     }
 
-    fn kind(&self) -> acp::ToolKind {
+    fn kind() -> acp::ToolKind {
         acp::ToolKind::Fetch
     }
 

From f5fd4ac6701239ec7620651bb2185fc3b1774bfa Mon Sep 17 00:00:00 2001
From: Kaem <46230985+kaem-e@users.noreply.github.com>
Date: Fri, 22 Aug 2025 08:02:47 +0500
Subject: [PATCH 287/823] vim: Implement partial increment/decrement for visual
 selection (#36553)

This change adds the ability to increment / decrement numbers that are
part of a visual selection. Previously Zed would resolve to the entire
number under visual selection for increment as oppposed to only
incrementing the part of the number that is selected

Release Notes:

- vim: Fixed increment/decrement in visual mode
---
 crates/vim/src/normal/increment.rs            | 111 +++++++++++++++++-
 .../test_increment_visual_partial_number.json |  20 ++++
 2 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 crates/vim/test_data/test_increment_visual_partial_number.json

diff --git a/crates/vim/src/normal/increment.rs b/crates/vim/src/normal/increment.rs
index 1d2a4e9b61..34ac4aab1f 100644
--- a/crates/vim/src/normal/increment.rs
+++ b/crates/vim/src/normal/increment.rs
@@ -70,8 +70,19 @@ impl Vim {
                     } else {
                         Point::new(row, 0)
                     };
+                    let end = if row == selection.end.row {
+                        selection.end
+                    } else {
+                        Point::new(row, snapshot.line_len(multi_buffer::MultiBufferRow(row)))
+                    };
 
-                    if let Some((range, num, radix)) = find_number(&snapshot, start) {
+                    let number_result = if !selection.is_empty() {
+                        find_number_in_range(&snapshot, start, end)
+                    } else {
+                        find_number(&snapshot, start)
+                    };
+
+                    if let Some((range, num, radix)) = number_result {
                         let replace = match radix {
                             10 => increment_decimal_string(&num, delta),
                             16 => increment_hex_string(&num, delta),
@@ -189,6 +200,90 @@ fn increment_binary_string(num: &str, delta: i64) -> String {
     format!("{:0width$b}", result, width = num.len())
 }
 
+fn find_number_in_range(
+    snapshot: &MultiBufferSnapshot,
+    start: Point,
+    end: Point,
+) -> Option<(Range<Point>, String, u32)> {
+    let start_offset = start.to_offset(snapshot);
+    let end_offset = end.to_offset(snapshot);
+
+    let mut offset = start_offset;
+
+    // Backward scan to find the start of the number, but stop at start_offset
+    for ch in snapshot.reversed_chars_at(offset) {
+        if ch.is_ascii_hexdigit() || ch == '-' || ch == 'b' || ch == 'x' {
+            if offset == 0 {
+                break;
+            }
+            offset -= ch.len_utf8();
+            if offset < start_offset {
+                offset = start_offset;
+                break;
+            }
+        } else {
+            break;
+        }
+    }
+
+    let mut begin = None;
+    let mut end_num = None;
+    let mut num = String::new();
+    let mut radix = 10;
+
+    let mut chars = snapshot.chars_at(offset).peekable();
+
+    while let Some(ch) = chars.next() {
+        if offset >= end_offset {
+            break; // stop at end of selection
+        }
+
+        if num == "0" && ch == 'b' && chars.peek().is_some() && chars.peek().unwrap().is_digit(2) {
+            radix = 2;
+            begin = None;
+            num = String::new();
+        } else if num == "0"
+            && ch == 'x'
+            && chars.peek().is_some()
+            && chars.peek().unwrap().is_ascii_hexdigit()
+        {
+            radix = 16;
+            begin = None;
+            num = String::new();
+        }
+
+        if ch.is_digit(radix)
+            || (begin.is_none()
+                && ch == '-'
+                && chars.peek().is_some()
+                && chars.peek().unwrap().is_digit(radix))
+        {
+            if begin.is_none() {
+                begin = Some(offset);
+            }
+            num.push(ch);
+        } else if begin.is_some() {
+            end_num = Some(offset);
+            break;
+        } else if ch == '\n' {
+            break;
+        }
+
+        offset += ch.len_utf8();
+    }
+
+    if let Some(begin) = begin {
+        let end_num = end_num.unwrap_or(offset);
+        Some((
+            begin.to_point(snapshot)..end_num.to_point(snapshot),
+            num,
+            radix,
+        ))
+    } else {
+        None
+    }
+}
+
 fn find_number(
     snapshot: &MultiBufferSnapshot,
     start: Point,
@@ -764,4 +859,18 @@ mod test {
         cx.simulate_keystrokes("v b ctrl-a");
         cx.assert_state("let enabled = ˇOff;", Mode::Normal);
     }
+
+    #[gpui::test]
+    async fn test_increment_visual_partial_number(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state("ˇ123").await;
+        cx.simulate_shared_keystrokes("v l ctrl-a").await;
+        cx.shared_state().await.assert_eq(indoc! {"ˇ133"});
+        cx.simulate_shared_keystrokes("l v l ctrl-a").await;
+        cx.shared_state().await.assert_eq(indoc! {"1ˇ34"});
+        cx.simulate_shared_keystrokes("shift-v y p p ctrl-v k k l ctrl-a")
+            .await;
+        cx.shared_state().await.assert_eq(indoc! {"ˇ144\n144\n144"});
+    }
 }
diff --git a/crates/vim/test_data/test_increment_visual_partial_number.json b/crates/vim/test_data/test_increment_visual_partial_number.json
new file mode 100644
index 0000000000..ebb4eece78
--- /dev/null
+++ b/crates/vim/test_data/test_increment_visual_partial_number.json
@@ -0,0 +1,20 @@
+{"Put":{"state":"ˇ123"}}
+{"Key":"v"}
+{"Key":"l"}
+{"Key":"ctrl-a"}
+{"Get":{"state":"ˇ133","mode":"Normal"}}
+{"Key":"l"}
+{"Key":"v"}
+{"Key":"l"}
+{"Key":"ctrl-a"}
+{"Get":{"state":"1ˇ34","mode":"Normal"}}
+{"Key":"shift-v"}
+{"Key":"y"}
+{"Key":"p"}
+{"Key":"p"}
+{"Key":"ctrl-v"}
+{"Key":"k"}
+{"Key":"k"}
+{"Key":"l"}
+{"Key":"ctrl-a"}
+{"Get":{"state":"ˇ144\n144\n144","mode":"Normal"}}

From 852439452cb5816e4afa5bd42e2b98a2edae0bec Mon Sep 17 00:00:00 2001
From: Adam Mulvany <llamaha@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:20:22 +1000
Subject: [PATCH 288/823] vim: Fix cursor jumping past empty lines with inlay
 hints in visual mode (#35757)

**Summary**

Fixes #29134 - Visual mode cursor incorrectly jumps past empty lines
that contain inlay hints (type hints).

**Problem**

When in VIM visual mode, pressing j to move down from a longer line to
an empty line that contains an inlay hint would cause the cursor to skip
the empty line entirely and jump to the next line. This only occurred
when moving down (not up) and only in visual mode.

**Root Cause**

The issue was introduced by commit f9ee28db5e which added bias-based
navigation for handling multi-line inlay hints. When using Bias::Right
while moving down, the clipping logic would place the cursor past the
inlay hint, causing it to jump to the next line.

**Solution**
Added logic in up_down_buffer_rows to detect when clipping would place
the cursor within an inlay hint position. When detected, it uses the
buffer column position instead of the display column to avoid jumping
past the hint.

**Testing**

- Added comprehensive test case
test_visual_mode_with_inlay_hints_on_empty_line that reproduces the
exact scenario
- Manually verified the fix with the reproduction case from the issue
- All 356 tests pass with `cargo test -p vim`

**Release Notes:**
- Fixed VIM visual mode cursor jumping past empty lines with type hints
when navigating down
---
 crates/vim/src/motion.rs | 96 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 92 insertions(+), 4 deletions(-)

diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index a2f165e9fe..a54d3caa60 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -1610,10 +1610,20 @@ fn up_down_buffer_rows(
         map.line_len(begin_folded_line.row())
     };
 
-    (
-        map.clip_point(DisplayPoint::new(begin_folded_line.row(), new_col), bias),
-        goal,
-    )
+    let point = DisplayPoint::new(begin_folded_line.row(), new_col);
+    let mut clipped_point = map.clip_point(point, bias);
+
+    // When navigating vertically in vim mode with inlay hints present,
+    // we need to handle the case where clipping moves us to a different row.
+    // This can happen when moving down (Bias::Right) and hitting an inlay hint.
+    // Re-clip with opposite bias to stay on the intended line.
+    //
+    // See: https://github.com/zed-industries/zed/issues/29134
+    if clipped_point.row() > point.row() {
+        clipped_point = map.clip_point(point, Bias::Left);
+    }
+
+    (clipped_point, goal)
 }
 
 fn down_display(
@@ -3842,6 +3852,84 @@ mod test {
         );
     }
 
+    #[gpui::test]
+    async fn test_visual_mode_with_inlay_hints_on_empty_line(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        // Test the exact scenario from issue #29134
+        cx.set_state(
+            indoc! {"
+                fn main() {
+                    let this_is_a_long_name = Vec::<u32>::new();
+                    let new_oneˇ = this_is_a_long_name
+                        .iter()
+                        .map(|i| i + 1)
+                        .map(|i| i * 2)
+                        .collect::<Vec<_>>();
+                }
+            "},
+            Mode::Normal,
+        );
+
+        // Add type hint inlay on the empty line (line 3, after "this_is_a_long_name")
+        cx.update_editor(|editor, _window, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            // The empty line is at line 3 (0-indexed)
+            let line_start = snapshot.anchor_after(Point::new(3, 0));
+            let inlay_text = ": Vec<u32>";
+            let inlay = Inlay::edit_prediction(1, line_start, inlay_text);
+            editor.splice_inlays(&[], vec![inlay], cx);
+        });
+
+        // Enter visual mode
+        cx.simulate_keystrokes("v");
+        cx.assert_state(
+            indoc! {"
+                fn main() {
+                    let this_is_a_long_name = Vec::<u32>::new();
+                    let new_one« ˇ»= this_is_a_long_name
+                        .iter()
+                        .map(|i| i + 1)
+                        .map(|i| i * 2)
+                        .collect::<Vec<_>>();
+                }
+            "},
+            Mode::Visual,
+        );
+
+        // Move down - should go to the beginning of line 4, not skip to line 5
+        cx.simulate_keystrokes("j");
+        cx.assert_state(
+            indoc! {"
+                fn main() {
+                    let this_is_a_long_name = Vec::<u32>::new();
+                    let new_one« = this_is_a_long_name
+                      ˇ»  .iter()
+                        .map(|i| i + 1)
+                        .map(|i| i * 2)
+                        .collect::<Vec<_>>();
+                }
+            "},
+            Mode::Visual,
+        );
+
+        // Test with multiple movements
+        cx.set_state("let aˇ = 1;\nlet b = 2;\n\nlet c = 3;", Mode::Normal);
+
+        // Add type hint on the empty line
+        cx.update_editor(|editor, _window, cx| {
+            let snapshot = editor.buffer().read(cx).snapshot(cx);
+            let empty_line_start = snapshot.anchor_after(Point::new(2, 0));
+            let inlay_text = ": i32";
+            let inlay = Inlay::edit_prediction(2, empty_line_start, inlay_text);
+            editor.splice_inlays(&[], vec![inlay], cx);
+        });
+
+        // Enter visual mode and move down twice
+        cx.simulate_keystrokes("v j j");
+        cx.assert_state("let a« = 1;\nlet b = 2;\n\nˇ»let c = 3;", Mode::Visual);
+    }
+
     #[gpui::test]
     async fn test_go_to_percentage(cx: &mut gpui::TestAppContext) {
         let mut cx = NeovimBackedTestContext::new(cx).await;

From e15856a37f5668433cbfb61a1e7950cf27ec3793 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 22 Aug 2025 10:17:37 +0530
Subject: [PATCH 289/823] Move APCA contrast from terminal_view to ui utils
 (#36731)

In prep for using this in the editor search/select highlighting.

Release Notes:

- N/A
---
 crates/terminal_view/src/terminal_element.rs  | 25 ++++++++++---------
 crates/terminal_view/src/terminal_view.rs     |  1 -
 crates/ui/src/utils.rs                        |  2 ++
 .../src/utils/apca_contrast.rs}               |  0
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename crates/{terminal_view/src/color_contrast.rs => ui/src/utils/apca_contrast.rs} (100%)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index c2fbeb7ee6..fe3301fb89 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1,4 +1,3 @@
-use crate::color_contrast;
 use editor::{CursorLayout, HighlightedRange, HighlightedRangeLine};
 use gpui::{
     AbsoluteLength, AnyElement, App, AvailableSpace, Bounds, ContentMask, Context, DispatchPhase,
@@ -27,6 +26,7 @@ use terminal::{
     terminal_settings::TerminalSettings,
 };
 use theme::{ActiveTheme, Theme, ThemeSettings};
+use ui::utils::ensure_minimum_contrast;
 use ui::{ParentElement, Tooltip};
 use util::ResultExt;
 use workspace::Workspace;
@@ -534,7 +534,7 @@ impl TerminalElement {
 
         // Only apply contrast adjustment to non-decorative characters
         if !Self::is_decorative_character(indexed.c) {
-            fg = color_contrast::ensure_minimum_contrast(fg, bg, minimum_contrast);
+            fg = ensure_minimum_contrast(fg, bg, minimum_contrast);
         }
 
         // Ghostty uses (175/255) as the multiplier (~0.69), Alacritty uses 0.66, Kitty
@@ -1598,6 +1598,7 @@ pub fn convert_color(fg: &terminal::alacritty_terminal::vte::ansi::Color, theme:
 mod tests {
     use super::*;
     use gpui::{AbsoluteLength, Hsla, font};
+    use ui::utils::apca_contrast;
 
     #[test]
     fn test_is_decorative_character() {
@@ -1713,7 +1714,7 @@ mod tests {
         };
 
         // Should have poor contrast
-        let actual_contrast = color_contrast::apca_contrast(white_fg, light_gray_bg).abs();
+        let actual_contrast = apca_contrast(white_fg, light_gray_bg).abs();
         assert!(
             actual_contrast < 30.0,
             "White on light gray should have poor APCA contrast: {}",
@@ -1721,12 +1722,12 @@ mod tests {
         );
 
         // After adjustment with minimum APCA contrast of 45, should be darker
-        let adjusted = color_contrast::ensure_minimum_contrast(white_fg, light_gray_bg, 45.0);
+        let adjusted = ensure_minimum_contrast(white_fg, light_gray_bg, 45.0);
         assert!(
             adjusted.l < white_fg.l,
             "Adjusted color should be darker than original"
         );
-        let adjusted_contrast = color_contrast::apca_contrast(adjusted, light_gray_bg).abs();
+        let adjusted_contrast = apca_contrast(adjusted, light_gray_bg).abs();
         assert!(adjusted_contrast >= 45.0, "Should meet minimum contrast");
 
         // Test case 2: Dark colors (poor contrast)
@@ -1744,7 +1745,7 @@ mod tests {
         };
 
         // Should have poor contrast
-        let actual_contrast = color_contrast::apca_contrast(black_fg, dark_gray_bg).abs();
+        let actual_contrast = apca_contrast(black_fg, dark_gray_bg).abs();
         assert!(
             actual_contrast < 30.0,
             "Black on dark gray should have poor APCA contrast: {}",
@@ -1752,16 +1753,16 @@ mod tests {
         );
 
         // After adjustment with minimum APCA contrast of 45, should be lighter
-        let adjusted = color_contrast::ensure_minimum_contrast(black_fg, dark_gray_bg, 45.0);
+        let adjusted = ensure_minimum_contrast(black_fg, dark_gray_bg, 45.0);
         assert!(
             adjusted.l > black_fg.l,
             "Adjusted color should be lighter than original"
         );
-        let adjusted_contrast = color_contrast::apca_contrast(adjusted, dark_gray_bg).abs();
+        let adjusted_contrast = apca_contrast(adjusted, dark_gray_bg).abs();
         assert!(adjusted_contrast >= 45.0, "Should meet minimum contrast");
 
         // Test case 3: Already good contrast
-        let good_contrast = color_contrast::ensure_minimum_contrast(black_fg, white_fg, 45.0);
+        let good_contrast = ensure_minimum_contrast(black_fg, white_fg, 45.0);
         assert_eq!(
             good_contrast, black_fg,
             "Good contrast should not be adjusted"
@@ -1788,11 +1789,11 @@ mod tests {
         };
 
         // With minimum contrast of 0.0, no adjustment should happen
-        let no_adjust = color_contrast::ensure_minimum_contrast(white_fg, white_bg, 0.0);
+        let no_adjust = ensure_minimum_contrast(white_fg, white_bg, 0.0);
         assert_eq!(no_adjust, white_fg, "No adjustment with min_contrast 0.0");
 
         // With minimum APCA contrast of 15, it should adjust to a darker color
-        let adjusted = color_contrast::ensure_minimum_contrast(white_fg, white_bg, 15.0);
+        let adjusted = ensure_minimum_contrast(white_fg, white_bg, 15.0);
         assert!(
             adjusted.l < white_fg.l,
             "White on white should become darker, got l={}",
@@ -1800,7 +1801,7 @@ mod tests {
         );
 
         // Verify the contrast is now acceptable
-        let new_contrast = color_contrast::apca_contrast(adjusted, white_bg).abs();
+        let new_contrast = apca_contrast(adjusted, white_bg).abs();
         assert!(
             new_contrast >= 15.0,
             "Adjusted APCA contrast {} should be >= 15.0",
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index e2f9ba818d..9aa855acb7 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1,4 +1,3 @@
-mod color_contrast;
 mod persistence;
 pub mod terminal_element;
 pub mod terminal_panel;
diff --git a/crates/ui/src/utils.rs b/crates/ui/src/utils.rs
index 26a59001f6..cd7d8eb497 100644
--- a/crates/ui/src/utils.rs
+++ b/crates/ui/src/utils.rs
@@ -3,12 +3,14 @@
 use gpui::App;
 use theme::ActiveTheme;
 
+mod apca_contrast;
 mod color_contrast;
 mod corner_solver;
 mod format_distance;
 mod search_input;
 mod with_rem_size;
 
+pub use apca_contrast::*;
 pub use color_contrast::*;
 pub use corner_solver::{CornerSolver, inner_corner_radius};
 pub use format_distance::*;
diff --git a/crates/terminal_view/src/color_contrast.rs b/crates/ui/src/utils/apca_contrast.rs
similarity index 100%
rename from crates/terminal_view/src/color_contrast.rs
rename to crates/ui/src/utils/apca_contrast.rs

From b349a8f34c9bbd2297633aae820bf8432b4f9c63 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 22 Aug 2025 01:12:12 -0400
Subject: [PATCH 290/823] ai: Auto select user model when there's no default
 (#36722)

This PR identifies automatic configuration options that users can select
from the agent panel. If no default provider is set in their settings,
the PR defaults to the first recommended option. Additionally, it
updates the selected provider for a thread when a user changes the
default provider through the settings file, if the thread hasn't had any
queries yet.

Release Notes:

- agent: automatically select a language model provider if there's no
user set provider.

---------

Co-authored-by: Michael Sloan <michael@zed.dev>
---
 crates/agent/src/thread.rs                    |  17 ++-
 crates/agent2/src/agent.rs                    |   4 +-
 crates/agent2/src/tests/mod.rs                |   4 +-
 .../agent_ui/src/language_model_selector.rs   |  55 +--------
 crates/git_ui/src/git_panel.rs                |   2 +-
 crates/language_model/src/registry.rs         | 114 ++++++++++--------
 crates/language_models/Cargo.toml             |   1 +
 crates/language_models/src/language_models.rs | 103 +++++++++++++++-
 crates/language_models/src/provider/cloud.rs  |   6 +-
 9 files changed, 184 insertions(+), 122 deletions(-)

diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 7b70fde56a..899e360ab0 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -664,7 +664,7 @@ impl Thread {
     }
 
     pub fn get_or_init_configured_model(&mut self, cx: &App) -> Option<ConfiguredModel> {
-        if self.configured_model.is_none() {
+        if self.configured_model.is_none() || self.messages.is_empty() {
             self.configured_model = LanguageModelRegistry::read_global(cx).default_model();
         }
         self.configured_model.clone()
@@ -2097,7 +2097,7 @@ impl Thread {
     }
 
     pub fn summarize(&mut self, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model(cx) else {
             println!("No thread summary model");
             return;
         };
@@ -2416,7 +2416,7 @@ impl Thread {
         }
 
         let Some(ConfiguredModel { model, provider }) =
-            LanguageModelRegistry::read_global(cx).thread_summary_model()
+            LanguageModelRegistry::read_global(cx).thread_summary_model(cx)
         else {
             return;
         };
@@ -5410,13 +5410,10 @@ fn main() {{
                     }),
                     cx,
                 );
-                registry.set_thread_summary_model(
-                    Some(ConfiguredModel {
-                        provider,
-                        model: model.clone(),
-                    }),
-                    cx,
-                );
+                registry.set_thread_summary_model(Some(ConfiguredModel {
+                    provider,
+                    model: model.clone(),
+                }));
             })
         });
 
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 215f8f454b..3502cf0ba9 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -228,7 +228,7 @@ impl NativeAgent {
     ) -> Entity<AcpThread> {
         let connection = Rc::new(NativeAgentConnection(cx.entity()));
         let registry = LanguageModelRegistry::read_global(cx);
-        let summarization_model = registry.thread_summary_model().map(|c| c.model);
+        let summarization_model = registry.thread_summary_model(cx).map(|c| c.model);
 
         thread_handle.update(cx, |thread, cx| {
             thread.set_summarization_model(summarization_model, cx);
@@ -521,7 +521,7 @@ impl NativeAgent {
 
         let registry = LanguageModelRegistry::read_global(cx);
         let default_model = registry.default_model().map(|m| m.model);
-        let summarization_model = registry.thread_summary_model().map(|m| m.model);
+        let summarization_model = registry.thread_summary_model(cx).map(|m| m.model);
 
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, cx| {
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index ac7b40c64f..09048488c8 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1414,11 +1414,11 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
         let clock = Arc::new(clock::FakeSystemClock::new());
         let client = Client::new(clock, http_client, cx);
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
+        Project::init_settings(cx);
+        agent_settings::init(cx);
         language_model::init(client.clone(), cx);
         language_models::init(user_store, client.clone(), cx);
-        Project::init_settings(cx);
         LanguageModelRegistry::test(cx);
-        agent_settings::init(cx);
     });
     cx.executor().forbid_parking();
 
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 3633e533da..aceca79dbf 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -6,8 +6,7 @@ use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task};
 use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
-    LanguageModelRegistry,
+    ConfiguredModel, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
@@ -77,7 +76,6 @@ pub struct LanguageModelPickerDelegate {
     all_models: Arc<GroupedModels>,
     filtered_entries: Vec<LanguageModelPickerEntry>,
     selected_index: usize,
-    _authenticate_all_providers_task: Task<()>,
     _subscriptions: Vec<Subscription>,
 }
 
@@ -98,7 +96,6 @@ impl LanguageModelPickerDelegate {
             selected_index: Self::get_active_model_index(&entries, get_active_model(cx)),
             filtered_entries: entries,
             get_active_model: Arc::new(get_active_model),
-            _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
             _subscriptions: vec![cx.subscribe_in(
                 &LanguageModelRegistry::global(cx),
                 window,
@@ -142,56 +139,6 @@ impl LanguageModelPickerDelegate {
             .unwrap_or(0)
     }
 
-    /// Authenticates all providers in the [`LanguageModelRegistry`].
-    ///
-    /// We do this so that we can populate the language selector with all of the
-    /// models from the configured providers.
-    fn authenticate_all_providers(cx: &mut App) -> Task<()> {
-        let authenticate_all_providers = LanguageModelRegistry::global(cx)
-            .read(cx)
-            .providers()
-            .iter()
-            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |_cx| {
-            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
-                if let Err(err) = authenticate_task.await {
-                    if matches!(err, AuthenticateError::CredentialsNotFound) {
-                        // Since we're authenticating these providers in the
-                        // background for the purposes of populating the
-                        // language selector, we don't care about providers
-                        // where the credentials are not found.
-                    } else {
-                        // Some providers have noisy failure states that we
-                        // don't want to spam the logs with every time the
-                        // language model selector is initialized.
-                        //
-                        // Ideally these should have more clear failure modes
-                        // that we know are safe to ignore here, like what we do
-                        // with `CredentialsNotFound` above.
-                        match provider_id.0.as_ref() {
-                            "lmstudio" | "ollama" => {
-                                // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
-                                //
-                                // These fail noisily, so we don't log them.
-                            }
-                            "copilot_chat" => {
-                                // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
-                            }
-                            _ => {
-                                log::error!(
-                                    "Failed to authenticate provider: {}: {err}",
-                                    provider_name.0
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        })
-    }
-
     pub fn active_model(&self, cx: &App) -> Option<ConfiguredModel> {
         (self.get_active_model)(cx)
     }
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 4ecb4a8829..958a609a09 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -4466,7 +4466,7 @@ fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn Language
     is_enabled
         .then(|| {
             let ConfiguredModel { provider, model } =
-                LanguageModelRegistry::read_global(cx).commit_message_model()?;
+                LanguageModelRegistry::read_global(cx).commit_message_model(cx)?;
 
             provider.is_authenticated(cx).then(|| model)
         })
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index 8f52f8c1c3..bcbb3404a8 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -6,7 +6,6 @@ use collections::BTreeMap;
 use gpui::{App, Context, Entity, EventEmitter, Global, prelude::*};
 use std::{str::FromStr, sync::Arc};
 use thiserror::Error;
-use util::maybe;
 
 pub fn init(cx: &mut App) {
     let registry = cx.new(|_cx| LanguageModelRegistry::default());
@@ -48,7 +47,9 @@ impl std::fmt::Debug for ConfigurationError {
 #[derive(Default)]
 pub struct LanguageModelRegistry {
     default_model: Option<ConfiguredModel>,
-    default_fast_model: Option<ConfiguredModel>,
+    /// This model is automatically configured by a user's environment after
+    /// authenticating all providers. It's only used when default_model is not available.
+    environment_fallback_model: Option<ConfiguredModel>,
     inline_assistant_model: Option<ConfiguredModel>,
     commit_message_model: Option<ConfiguredModel>,
     thread_summary_model: Option<ConfiguredModel>,
@@ -104,9 +105,6 @@ impl ConfiguredModel {
 
 pub enum Event {
     DefaultModelChanged,
-    InlineAssistantModelChanged,
-    CommitMessageModelChanged,
-    ThreadSummaryModelChanged,
     ProviderStateChanged(LanguageModelProviderId),
     AddedProvider(LanguageModelProviderId),
     RemovedProvider(LanguageModelProviderId),
@@ -238,7 +236,7 @@ impl LanguageModelRegistry {
         cx: &mut Context<Self>,
     ) {
         let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_inline_assistant_model(configured_model, cx);
+        self.set_inline_assistant_model(configured_model);
     }
 
     pub fn select_commit_message_model(
@@ -247,7 +245,7 @@ impl LanguageModelRegistry {
         cx: &mut Context<Self>,
     ) {
         let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_commit_message_model(configured_model, cx);
+        self.set_commit_message_model(configured_model);
     }
 
     pub fn select_thread_summary_model(
@@ -256,7 +254,7 @@ impl LanguageModelRegistry {
         cx: &mut Context<Self>,
     ) {
         let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_thread_summary_model(configured_model, cx);
+        self.set_thread_summary_model(configured_model);
     }
 
     /// Selects and sets the inline alternatives for language models based on
@@ -290,68 +288,60 @@ impl LanguageModelRegistry {
     }
 
     pub fn set_default_model(&mut self, model: Option<ConfiguredModel>, cx: &mut Context<Self>) {
-        match (self.default_model.as_ref(), model.as_ref()) {
+        match (self.default_model(), model.as_ref()) {
             (Some(old), Some(new)) if old.is_same_as(new) => {}
             (None, None) => {}
             _ => cx.emit(Event::DefaultModelChanged),
         }
-        self.default_fast_model = maybe!({
-            let provider = &model.as_ref()?.provider;
-            let fast_model = provider.default_fast_model(cx)?;
-            Some(ConfiguredModel {
-                provider: provider.clone(),
-                model: fast_model,
-            })
-        });
         self.default_model = model;
     }
 
-    pub fn set_inline_assistant_model(
+    pub fn set_environment_fallback_model(
         &mut self,
         model: Option<ConfiguredModel>,
         cx: &mut Context<Self>,
     ) {
-        match (self.inline_assistant_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::InlineAssistantModelChanged),
+        if self.default_model.is_none() {
+            match (self.environment_fallback_model.as_ref(), model.as_ref()) {
+                (Some(old), Some(new)) if old.is_same_as(new) => {}
+                (None, None) => {}
+                _ => cx.emit(Event::DefaultModelChanged),
+            }
         }
+        self.environment_fallback_model = model;
+    }
+
+    pub fn set_inline_assistant_model(&mut self, model: Option<ConfiguredModel>) {
         self.inline_assistant_model = model;
     }
 
-    pub fn set_commit_message_model(
-        &mut self,
-        model: Option<ConfiguredModel>,
-        cx: &mut Context<Self>,
-    ) {
-        match (self.commit_message_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::CommitMessageModelChanged),
-        }
+    pub fn set_commit_message_model(&mut self, model: Option<ConfiguredModel>) {
         self.commit_message_model = model;
     }
 
-    pub fn set_thread_summary_model(
-        &mut self,
-        model: Option<ConfiguredModel>,
-        cx: &mut Context<Self>,
-    ) {
-        match (self.thread_summary_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::ThreadSummaryModelChanged),
-        }
+    pub fn set_thread_summary_model(&mut self, model: Option<ConfiguredModel>) {
         self.thread_summary_model = model;
     }
 
+    #[track_caller]
     pub fn default_model(&self) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
             return None;
         }
 
-        self.default_model.clone()
+        self.default_model
+            .clone()
+            .or_else(|| self.environment_fallback_model.clone())
+    }
+
+    pub fn default_fast_model(&self, cx: &App) -> Option<ConfiguredModel> {
+        let provider = self.default_model()?.provider;
+        let fast_model = provider.default_fast_model(cx)?;
+        Some(ConfiguredModel {
+            provider,
+            model: fast_model,
+        })
     }
 
     pub fn inline_assistant_model(&self) -> Option<ConfiguredModel> {
@@ -365,7 +355,7 @@ impl LanguageModelRegistry {
             .or_else(|| self.default_model.clone())
     }
 
-    pub fn commit_message_model(&self) -> Option<ConfiguredModel> {
+    pub fn commit_message_model(&self, cx: &App) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
             return None;
@@ -373,11 +363,11 @@ impl LanguageModelRegistry {
 
         self.commit_message_model
             .clone()
-            .or_else(|| self.default_fast_model.clone())
+            .or_else(|| self.default_fast_model(cx))
             .or_else(|| self.default_model.clone())
     }
 
-    pub fn thread_summary_model(&self) -> Option<ConfiguredModel> {
+    pub fn thread_summary_model(&self, cx: &App) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
             return None;
@@ -385,7 +375,7 @@ impl LanguageModelRegistry {
 
         self.thread_summary_model
             .clone()
-            .or_else(|| self.default_fast_model.clone())
+            .or_else(|| self.default_fast_model(cx))
             .or_else(|| self.default_model.clone())
     }
 
@@ -422,4 +412,34 @@ mod tests {
         let providers = registry.read(cx).providers();
         assert!(providers.is_empty());
     }
+
+    #[gpui::test]
+    async fn test_configure_environment_fallback_model(cx: &mut gpui::TestAppContext) {
+        let registry = cx.new(|_| LanguageModelRegistry::default());
+
+        let provider = FakeLanguageModelProvider::default();
+        registry.update(cx, |registry, cx| {
+            registry.register_provider(provider.clone(), cx);
+        });
+
+        cx.update(|cx| provider.authenticate(cx)).await.unwrap();
+
+        registry.update(cx, |registry, cx| {
+            let provider = registry.provider(&provider.id()).unwrap();
+
+            registry.set_environment_fallback_model(
+                Some(ConfiguredModel {
+                    provider: provider.clone(),
+                    model: provider.default_model(cx).unwrap(),
+                }),
+                cx,
+            );
+
+            let default_model = registry.default_model().unwrap();
+            let fallback_model = registry.environment_fallback_model.clone().unwrap();
+
+            assert_eq!(default_model.model.id(), fallback_model.model.id());
+            assert_eq!(default_model.provider.id(), fallback_model.provider.id());
+        });
+    }
 }
diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml
index b5bfb870f6..cd41478668 100644
--- a/crates/language_models/Cargo.toml
+++ b/crates/language_models/Cargo.toml
@@ -44,6 +44,7 @@ ollama = { workspace = true, features = ["schemars"] }
 open_ai = { workspace = true, features = ["schemars"] }
 open_router = { workspace = true, features = ["schemars"] }
 partial-json-fixer.workspace = true
+project.workspace = true
 release_channel.workspace = true
 schemars.workspace = true
 serde.workspace = true
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
index 738b72b0c9..beed306e74 100644
--- a/crates/language_models/src/language_models.rs
+++ b/crates/language_models/src/language_models.rs
@@ -3,8 +3,12 @@ use std::sync::Arc;
 use ::settings::{Settings, SettingsStore};
 use client::{Client, UserStore};
 use collections::HashSet;
-use gpui::{App, Context, Entity};
-use language_model::{LanguageModelProviderId, LanguageModelRegistry};
+use futures::future;
+use gpui::{App, AppContext as _, Context, Entity};
+use language_model::{
+    AuthenticateError, ConfiguredModel, LanguageModelProviderId, LanguageModelRegistry,
+};
+use project::DisableAiSettings;
 use provider::deepseek::DeepSeekLanguageModelProvider;
 
 pub mod provider;
@@ -13,7 +17,7 @@ pub mod ui;
 
 use crate::provider::anthropic::AnthropicLanguageModelProvider;
 use crate::provider::bedrock::BedrockLanguageModelProvider;
-use crate::provider::cloud::CloudLanguageModelProvider;
+use crate::provider::cloud::{self, CloudLanguageModelProvider};
 use crate::provider::copilot_chat::CopilotChatLanguageModelProvider;
 use crate::provider::google::GoogleLanguageModelProvider;
 use crate::provider::lmstudio::LmStudioLanguageModelProvider;
@@ -48,6 +52,13 @@ pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
             cx,
         );
     });
+
+    let mut already_authenticated = false;
+    if !DisableAiSettings::get_global(cx).disable_ai {
+        authenticate_all_providers(registry.clone(), cx);
+        already_authenticated = true;
+    }
+
     cx.observe_global::<SettingsStore>(move |cx| {
         let openai_compatible_providers_new = AllLanguageModelSettings::get_global(cx)
             .openai_compatible
@@ -65,6 +76,12 @@ pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
                 );
             });
             openai_compatible_providers = openai_compatible_providers_new;
+            already_authenticated = false;
+        }
+
+        if !DisableAiSettings::get_global(cx).disable_ai && !already_authenticated {
+            authenticate_all_providers(registry.clone(), cx);
+            already_authenticated = true;
         }
     })
     .detach();
@@ -151,3 +168,83 @@ fn register_language_model_providers(
     registry.register_provider(XAiLanguageModelProvider::new(client.http_client(), cx), cx);
     registry.register_provider(CopilotChatLanguageModelProvider::new(cx), cx);
 }
+
+/// Authenticates all providers in the [`LanguageModelRegistry`].
+///
+/// We do this so that we can populate the language selector with all of the
+/// models from the configured providers.
+///
+/// This function won't do anything if AI is disabled.
+fn authenticate_all_providers(registry: Entity<LanguageModelRegistry>, cx: &mut App) {
+    let providers_to_authenticate = registry
+        .read(cx)
+        .providers()
+        .iter()
+        .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
+        .collect::<Vec<_>>();
+
+    let mut tasks = Vec::with_capacity(providers_to_authenticate.len());
+
+    for (provider_id, provider_name, authenticate_task) in providers_to_authenticate {
+        tasks.push(cx.background_spawn(async move {
+            if let Err(err) = authenticate_task.await {
+                if matches!(err, AuthenticateError::CredentialsNotFound) {
+                    // Since we're authenticating these providers in the
+                    // background for the purposes of populating the
+                    // language selector, we don't care about providers
+                    // where the credentials are not found.
+                } else {
+                    // Some providers have noisy failure states that we
+                    // don't want to spam the logs with every time the
+                    // language model selector is initialized.
+                    //
+                    // Ideally these should have more clear failure modes
+                    // that we know are safe to ignore here, like what we do
+                    // with `CredentialsNotFound` above.
+                    match provider_id.0.as_ref() {
+                        "lmstudio" | "ollama" => {
+                            // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
+                            //
+                            // These fail noisily, so we don't log them.
+                        }
+                        "copilot_chat" => {
+                            // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
+                        }
+                        _ => {
+                            log::error!(
+                                "Failed to authenticate provider: {}: {err}",
+                                provider_name.0
+                            );
+                        }
+                    }
+                }
+            }
+        }));
+    }
+
+    let all_authenticated_future = future::join_all(tasks);
+
+    cx.spawn(async move |cx| {
+        all_authenticated_future.await;
+
+        registry
+            .update(cx, |registry, cx| {
+                let cloud_provider = registry.provider(&cloud::PROVIDER_ID);
+                let fallback_model = cloud_provider
+                    .iter()
+                    .chain(registry.providers().iter())
+                    .find(|provider| provider.is_authenticated(cx))
+                    .and_then(|provider| {
+                        Some(ConfiguredModel {
+                            provider: provider.clone(),
+                            model: provider
+                                .default_model(cx)
+                                .or_else(|| provider.recommended_models(cx).first().cloned())?,
+                        })
+                    });
+                registry.set_environment_fallback_model(fallback_model, cx);
+            })
+            .ok();
+    })
+    .detach();
+}
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index b1b5ff3eb3..8e4b786935 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -44,8 +44,8 @@ use crate::provider::anthropic::{AnthropicEventMapper, count_anthropic_tokens, i
 use crate::provider::google::{GoogleEventMapper, into_google};
 use crate::provider::open_ai::{OpenAiEventMapper, count_open_ai_tokens, into_open_ai};
 
-const PROVIDER_ID: LanguageModelProviderId = language_model::ZED_CLOUD_PROVIDER_ID;
-const PROVIDER_NAME: LanguageModelProviderName = language_model::ZED_CLOUD_PROVIDER_NAME;
+pub const PROVIDER_ID: LanguageModelProviderId = language_model::ZED_CLOUD_PROVIDER_ID;
+pub const PROVIDER_NAME: LanguageModelProviderName = language_model::ZED_CLOUD_PROVIDER_NAME;
 
 #[derive(Default, Clone, Debug, PartialEq)]
 pub struct ZedDotDevSettings {
@@ -148,7 +148,7 @@ impl State {
             default_fast_model: None,
             recommended_models: Vec::new(),
             _fetch_models_task: cx.spawn(async move |this, cx| {
-                maybe!(async move {
+                maybe!(async {
                     let (client, llm_api_token) = this
                         .read_with(cx, |this, _cx| (client.clone(), this.llm_api_token.clone()))?;
 

From e36069110659ad113876c7fa5c85338176bf7172 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 22 Aug 2025 01:54:25 -0400
Subject: [PATCH 291/823] telemetry: Add panel button clicked event (#36735)

The event has two fields

1. name: The name of the panel being clicked
2. toggle_state: true if clicking to open, otherwise false

cc @katie-z-geer

Release Notes:

- N/A
---
 crates/workspace/src/dock.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 7a8de6e910..149a122c0c 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -915,6 +915,11 @@ impl Render for PanelButtons {
                                 .on_click({
                                     let action = action.boxed_clone();
                                     move |_, window, cx| {
+                                        telemetry::event!(
+                                            "Panel Button Clicked",
+                                            name = name,
+                                            toggle_state = !is_open
+                                        );
                                         window.focus(&focus_handle);
                                         window.dispatch_action(action.boxed_clone(), cx)
                                     }

From f4ba7997a7d7e9da61b98fda8e28542d3e29f518 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 21 Aug 2025 23:57:30 -0600
Subject: [PATCH 292/823] acp: Fix history search (#36734)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs                    |   5 +-
 crates/agent2/src/history_store.rs            |  31 +-
 .../agent_ui/src/acp/completion_provider.rs   |   2 +-
 crates/agent_ui/src/acp/thread_history.rs     | 495 ++++++++----------
 crates/agent_ui/src/acp/thread_view.rs        |   6 +-
 5 files changed, 228 insertions(+), 311 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 3502cf0ba9..4eaf87e218 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -1406,10 +1406,9 @@ mod tests {
         history: &Entity<HistoryStore>,
         cx: &mut TestAppContext,
     ) -> Vec<(HistoryEntryId, String)> {
-        history.read_with(cx, |history, cx| {
+        history.read_with(cx, |history, _| {
             history
-                .entries(cx)
-                .iter()
+                .entries()
                 .map(|e| (e.id(), e.title().to_string()))
                 .collect::<Vec<_>>()
         })
diff --git a/crates/agent2/src/history_store.rs b/crates/agent2/src/history_store.rs
index 78d83cc1d0..c656456e01 100644
--- a/crates/agent2/src/history_store.rs
+++ b/crates/agent2/src/history_store.rs
@@ -86,6 +86,7 @@ enum SerializedRecentOpen {
 
 pub struct HistoryStore {
     threads: Vec<DbThreadMetadata>,
+    entries: Vec<HistoryEntry>,
     context_store: Entity<assistant_context::ContextStore>,
     recently_opened_entries: VecDeque<HistoryEntryId>,
     _subscriptions: Vec<gpui::Subscription>,
@@ -97,7 +98,7 @@ impl HistoryStore {
         context_store: Entity<assistant_context::ContextStore>,
         cx: &mut Context<Self>,
     ) -> Self {
-        let subscriptions = vec![cx.observe(&context_store, |_, _, cx| cx.notify())];
+        let subscriptions = vec![cx.observe(&context_store, |this, _, cx| this.update_entries(cx))];
 
         cx.spawn(async move |this, cx| {
             let entries = Self::load_recently_opened_entries(cx).await;
@@ -116,6 +117,7 @@ impl HistoryStore {
             context_store,
             recently_opened_entries: VecDeque::default(),
             threads: Vec::default(),
+            entries: Vec::default(),
             _subscriptions: subscriptions,
             _save_recently_opened_entries_task: Task::ready(()),
         }
@@ -181,20 +183,18 @@ impl HistoryStore {
                     }
                 }
                 this.threads = threads;
-                cx.notify();
+                this.update_entries(cx);
             })
         })
         .detach_and_log_err(cx);
     }
 
-    pub fn entries(&self, cx: &App) -> Vec<HistoryEntry> {
-        let mut history_entries = Vec::new();
-
+    fn update_entries(&mut self, cx: &mut Context<Self>) {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return history_entries;
+            return;
         }
-
+        let mut history_entries = Vec::new();
         history_entries.extend(self.threads.iter().cloned().map(HistoryEntry::AcpThread));
         history_entries.extend(
             self.context_store
@@ -205,17 +205,12 @@ impl HistoryStore {
         );
 
         history_entries.sort_unstable_by_key(|entry| std::cmp::Reverse(entry.updated_at()));
-        history_entries
+        self.entries = history_entries;
+        cx.notify()
     }
 
-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.threads.is_empty()
-            && self
-                .context_store
-                .read(cx)
-                .unordered_contexts()
-                .next()
-                .is_none()
+    pub fn is_empty(&self, _cx: &App) -> bool {
+        self.entries.is_empty()
     }
 
     pub fn recently_opened_entries(&self, cx: &App) -> Vec<HistoryEntry> {
@@ -356,7 +351,7 @@ impl HistoryStore {
         self.save_recently_opened_entries(cx);
     }
 
-    pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
-        self.entries(cx).into_iter().take(limit).collect()
+    pub fn entries(&self) -> impl Iterator<Item = HistoryEntry> {
+        self.entries.iter().cloned()
     }
 }
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 3587e5144e..22a9ea6773 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -805,7 +805,7 @@ pub(crate) fn search_threads(
     history_store: &Entity<HistoryStore>,
     cx: &mut App,
 ) -> Task<Vec<HistoryEntry>> {
-    let threads = history_store.read(cx).entries(cx);
+    let threads = history_store.read(cx).entries().collect();
     if query.is_empty() {
         return Task::ready(threads);
     }
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
index d76969378c..5d852f0ddc 100644
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -3,18 +3,18 @@ use crate::{AgentPanel, RemoveSelectedThread};
 use agent2::{HistoryEntry, HistoryStore};
 use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
 use editor::{Editor, EditorEvent};
-use fuzzy::{StringMatch, StringMatchCandidate};
+use fuzzy::StringMatchCandidate;
 use gpui::{
-    App, Empty, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
+    App, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
     UniformListScrollHandle, WeakEntity, Window, uniform_list,
 };
-use std::{fmt::Display, ops::Range, sync::Arc};
+use std::{fmt::Display, ops::Range};
+use text::Bias;
 use time::{OffsetDateTime, UtcOffset};
 use ui::{
     HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Scrollbar, ScrollbarState,
     Tooltip, prelude::*,
 };
-use util::ResultExt;
 
 pub struct AcpThreadHistory {
     pub(crate) history_store: Entity<HistoryStore>,
@@ -22,38 +22,38 @@ pub struct AcpThreadHistory {
     selected_index: usize,
     hovered_index: Option<usize>,
     search_editor: Entity<Editor>,
-    all_entries: Arc<Vec<HistoryEntry>>,
-    // When the search is empty, we display date separators between history entries
-    // This vector contains an enum of either a separator or an actual entry
-    separated_items: Vec<ListItemType>,
-    // Maps entry indexes to list item indexes
-    separated_item_indexes: Vec<u32>,
-    _separated_items_task: Option<Task<()>>,
-    search_state: SearchState,
+    search_query: SharedString,
+
+    visible_items: Vec<ListItemType>,
+
     scrollbar_visibility: bool,
     scrollbar_state: ScrollbarState,
     local_timezone: UtcOffset,
-    _subscriptions: Vec<gpui::Subscription>,
-}
 
-enum SearchState {
-    Empty,
-    Searching {
-        query: SharedString,
-        _task: Task<()>,
-    },
-    Searched {
-        query: SharedString,
-        matches: Vec<StringMatch>,
-    },
+    _update_task: Task<()>,
+    _subscriptions: Vec<gpui::Subscription>,
 }
 
 enum ListItemType {
     BucketSeparator(TimeBucket),
     Entry {
-        index: usize,
+        entry: HistoryEntry,
         format: EntryTimeFormat,
     },
+    SearchResult {
+        entry: HistoryEntry,
+        positions: Vec<usize>,
+    },
+}
+
+impl ListItemType {
+    fn history_entry(&self) -> Option<&HistoryEntry> {
+        match self {
+            ListItemType::Entry { entry, .. } => Some(entry),
+            ListItemType::SearchResult { entry, .. } => Some(entry),
+            _ => None,
+        }
+    }
 }
 
 pub enum ThreadHistoryEvent {
@@ -78,12 +78,15 @@ impl AcpThreadHistory {
             cx.subscribe(&search_editor, |this, search_editor, event, cx| {
                 if let EditorEvent::BufferEdited = event {
                     let query = search_editor.read(cx).text(cx);
-                    this.search(query.into(), cx);
+                    if this.search_query != query {
+                        this.search_query = query.into();
+                        this.update_visible_items(false, cx);
+                    }
                 }
             });
 
         let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
-            this.update_all_entries(cx);
+            this.update_visible_items(true, cx);
         });
 
         let scroll_handle = UniformListScrollHandle::default();
@@ -94,10 +97,7 @@ impl AcpThreadHistory {
             scroll_handle,
             selected_index: 0,
             hovered_index: None,
-            search_state: SearchState::Empty,
-            all_entries: Default::default(),
-            separated_items: Default::default(),
-            separated_item_indexes: Default::default(),
+            visible_items: Default::default(),
             search_editor,
             scrollbar_visibility: true,
             scrollbar_state,
@@ -105,29 +105,61 @@ impl AcpThreadHistory {
                 chrono::Local::now().offset().local_minus_utc(),
             )
             .unwrap(),
+            search_query: SharedString::default(),
             _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _separated_items_task: None,
+            _update_task: Task::ready(()),
         };
-        this.update_all_entries(cx);
+        this.update_visible_items(false, cx);
         this
     }
 
-    fn update_all_entries(&mut self, cx: &mut Context<Self>) {
-        let new_entries: Arc<Vec<HistoryEntry>> = self
+    fn update_visible_items(&mut self, preserve_selected_item: bool, cx: &mut Context<Self>) {
+        let entries = self
             .history_store
-            .update(cx, |store, cx| store.entries(cx))
-            .into();
+            .update(cx, |store, _| store.entries().collect());
+        let new_list_items = if self.search_query.is_empty() {
+            self.add_list_separators(entries, cx)
+        } else {
+            self.filter_search_results(entries, cx)
+        };
+        let selected_history_entry = if preserve_selected_item {
+            self.selected_history_entry().cloned()
+        } else {
+            None
+        };
 
-        self._separated_items_task.take();
+        self._update_task = cx.spawn(async move |this, cx| {
+            let new_visible_items = new_list_items.await;
+            this.update(cx, |this, cx| {
+                let new_selected_index = if let Some(history_entry) = selected_history_entry {
+                    let history_entry_id = history_entry.id();
+                    new_visible_items
+                        .iter()
+                        .position(|visible_entry| {
+                            visible_entry
+                                .history_entry()
+                                .is_some_and(|entry| entry.id() == history_entry_id)
+                        })
+                        .unwrap_or(0)
+                } else {
+                    0
+                };
 
-        let mut items = Vec::with_capacity(new_entries.len() + 1);
-        let mut indexes = Vec::with_capacity(new_entries.len() + 1);
+                this.visible_items = new_visible_items;
+                this.set_selected_index(new_selected_index, Bias::Right, cx);
+                cx.notify();
+            })
+            .ok();
+        });
+    }
 
-        let bg_task = cx.background_spawn(async move {
+    fn add_list_separators(&self, entries: Vec<HistoryEntry>, cx: &App) -> Task<Vec<ListItemType>> {
+        cx.background_spawn(async move {
+            let mut items = Vec::with_capacity(entries.len() + 1);
             let mut bucket = None;
             let today = Local::now().naive_local().date();
 
-            for (index, entry) in new_entries.iter().enumerate() {
+            for entry in entries.into_iter() {
                 let entry_date = entry
                     .updated_at()
                     .with_timezone(&Local)
@@ -140,75 +172,33 @@ impl AcpThreadHistory {
                     items.push(ListItemType::BucketSeparator(entry_bucket));
                 }
 
-                indexes.push(items.len() as u32);
                 items.push(ListItemType::Entry {
-                    index,
+                    entry,
                     format: entry_bucket.into(),
                 });
             }
-            (new_entries, items, indexes)
-        });
-
-        let task = cx.spawn(async move |this, cx| {
-            let (new_entries, items, indexes) = bg_task.await;
-            this.update(cx, |this, cx| {
-                let previously_selected_entry =
-                    this.all_entries.get(this.selected_index).map(|e| e.id());
-
-                this.all_entries = new_entries;
-                this.separated_items = items;
-                this.separated_item_indexes = indexes;
-
-                match &this.search_state {
-                    SearchState::Empty => {
-                        if this.selected_index >= this.all_entries.len() {
-                            this.set_selected_entry_index(
-                                this.all_entries.len().saturating_sub(1),
-                                cx,
-                            );
-                        } else if let Some(prev_id) = previously_selected_entry
-                            && let Some(new_ix) = this
-                                .all_entries
-                                .iter()
-                                .position(|probe| probe.id() == prev_id)
-                        {
-                            this.set_selected_entry_index(new_ix, cx);
-                        }
-                    }
-                    SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
-                        this.search(query.clone(), cx);
-                    }
-                }
-
-                cx.notify();
-            })
-            .log_err();
-        });
-        self._separated_items_task = Some(task);
+            items
+        })
     }
 
-    fn search(&mut self, query: SharedString, cx: &mut Context<Self>) {
-        if query.is_empty() {
-            self.search_state = SearchState::Empty;
-            cx.notify();
-            return;
-        }
-
-        let all_entries = self.all_entries.clone();
-
-        let fuzzy_search_task = cx.background_spawn({
-            let query = query.clone();
+    fn filter_search_results(
+        &self,
+        entries: Vec<HistoryEntry>,
+        cx: &App,
+    ) -> Task<Vec<ListItemType>> {
+        let query = self.search_query.clone();
+        cx.background_spawn({
             let executor = cx.background_executor().clone();
             async move {
-                let mut candidates = Vec::with_capacity(all_entries.len());
+                let mut candidates = Vec::with_capacity(entries.len());
 
-                for (idx, entry) in all_entries.iter().enumerate() {
+                for (idx, entry) in entries.iter().enumerate() {
                     candidates.push(StringMatchCandidate::new(idx, entry.title()));
                 }
 
                 const MAX_MATCHES: usize = 100;
 
-                fuzzy::match_strings(
+                let matches = fuzzy::match_strings(
                     &candidates,
                     &query,
                     false,
@@ -217,74 +207,61 @@ impl AcpThreadHistory {
                     &Default::default(),
                     executor,
                 )
-                .await
+                .await;
+
+                matches
+                    .into_iter()
+                    .map(|search_match| ListItemType::SearchResult {
+                        entry: entries[search_match.candidate_id].clone(),
+                        positions: search_match.positions,
+                    })
+                    .collect()
             }
-        });
-
-        let task = cx.spawn({
-            let query = query.clone();
-            async move |this, cx| {
-                let matches = fuzzy_search_task.await;
-
-                this.update(cx, |this, cx| {
-                    let SearchState::Searching {
-                        query: current_query,
-                        _task,
-                    } = &this.search_state
-                    else {
-                        return;
-                    };
-
-                    if &query == current_query {
-                        this.search_state = SearchState::Searched {
-                            query: query.clone(),
-                            matches,
-                        };
-
-                        this.set_selected_entry_index(0, cx);
-                        cx.notify();
-                    };
-                })
-                .log_err();
-            }
-        });
-
-        self.search_state = SearchState::Searching { query, _task: task };
-        cx.notify();
-    }
-
-    fn matched_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
-    }
-
-    fn list_item_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.separated_items.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
+        })
     }
 
     fn search_produced_no_matches(&self) -> bool {
-        match &self.search_state {
-            SearchState::Empty => false,
-            SearchState::Searching { .. } => false,
-            SearchState::Searched { matches, .. } => matches.is_empty(),
-        }
+        self.visible_items.is_empty() && !self.search_query.is_empty()
     }
 
-    fn get_match(&self, ix: usize) -> Option<&HistoryEntry> {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.get(ix),
-            SearchState::Searching { .. } => None,
-            SearchState::Searched { matches, .. } => matches
-                .get(ix)
-                .and_then(|m| self.all_entries.get(m.candidate_id)),
+    fn selected_history_entry(&self) -> Option<&HistoryEntry> {
+        self.get_history_entry(self.selected_index)
+    }
+
+    fn get_history_entry(&self, visible_items_ix: usize) -> Option<&HistoryEntry> {
+        self.visible_items.get(visible_items_ix)?.history_entry()
+    }
+
+    fn set_selected_index(&mut self, mut index: usize, bias: Bias, cx: &mut Context<Self>) {
+        if self.visible_items.len() == 0 {
+            self.selected_index = 0;
+            return;
         }
+        while matches!(
+            self.visible_items.get(index),
+            None | Some(ListItemType::BucketSeparator(..))
+        ) {
+            index = match bias {
+                Bias::Left => {
+                    if index == 0 {
+                        self.visible_items.len() - 1
+                    } else {
+                        index - 1
+                    }
+                }
+                Bias::Right => {
+                    if index >= self.visible_items.len() - 1 {
+                        0
+                    } else {
+                        index + 1
+                    }
+                }
+            };
+        }
+        self.selected_index = index;
+        self.scroll_handle
+            .scroll_to_item(index, ScrollStrategy::Top);
+        cx.notify()
     }
 
     pub fn select_previous(
@@ -293,13 +270,10 @@ impl AcpThreadHistory {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let count = self.matched_count();
-        if count > 0 {
-            if self.selected_index == 0 {
-                self.set_selected_entry_index(count - 1, cx);
-            } else {
-                self.set_selected_entry_index(self.selected_index - 1, cx);
-            }
+        if self.selected_index == 0 {
+            self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
+        } else {
+            self.set_selected_index(self.selected_index - 1, Bias::Left, cx);
         }
     }
 
@@ -309,13 +283,10 @@ impl AcpThreadHistory {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let count = self.matched_count();
-        if count > 0 {
-            if self.selected_index == count - 1 {
-                self.set_selected_entry_index(0, cx);
-            } else {
-                self.set_selected_entry_index(self.selected_index + 1, cx);
-            }
+        if self.selected_index == self.visible_items.len() - 1 {
+            self.set_selected_index(0, Bias::Right, cx);
+        } else {
+            self.set_selected_index(self.selected_index + 1, Bias::Right, cx);
         }
     }
 
@@ -325,35 +296,47 @@ impl AcpThreadHistory {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let count = self.matched_count();
-        if count > 0 {
-            self.set_selected_entry_index(0, cx);
-        }
+        self.set_selected_index(0, Bias::Right, cx);
     }
 
     fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.matched_count();
-        if count > 0 {
-            self.set_selected_entry_index(count - 1, cx);
-        }
+        self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
     }
 
-    fn set_selected_entry_index(&mut self, entry_index: usize, cx: &mut Context<Self>) {
-        self.selected_index = entry_index;
+    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
+        self.confirm_entry(self.selected_index, cx);
+    }
 
-        let scroll_ix = match self.search_state {
-            SearchState::Empty | SearchState::Searching { .. } => self
-                .separated_item_indexes
-                .get(entry_index)
-                .map(|ix| *ix as usize)
-                .unwrap_or(entry_index + 1),
-            SearchState::Searched { .. } => entry_index,
+    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
+        let Some(entry) = self.get_history_entry(ix) else {
+            return;
+        };
+        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
+    }
+
+    fn remove_selected_thread(
+        &mut self,
+        _: &RemoveSelectedThread,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.remove_thread(self.selected_index, cx)
+    }
+
+    fn remove_thread(&mut self, visible_item_ix: usize, cx: &mut Context<Self>) {
+        let Some(entry) = self.get_history_entry(visible_item_ix) else {
+            return;
         };
 
-        self.scroll_handle
-            .scroll_to_item(scroll_ix, ScrollStrategy::Top);
-
-        cx.notify();
+        let task = match entry {
+            HistoryEntry::AcpThread(thread) => self
+                .history_store
+                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
+            HistoryEntry::TextThread(context) => self.history_store.update(cx, |this, cx| {
+                this.delete_text_thread(context.path.clone(), cx)
+            }),
+        };
+        task.detach_and_log_err(cx);
     }
 
     fn render_scrollbar(&self, cx: &mut Context<Self>) -> Option<Stateful<Div>> {
@@ -393,91 +376,33 @@ impl AcpThreadHistory {
         )
     }
 
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirm_entry(self.selected_index, cx);
-    }
-
-    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_match(ix) else {
-            return;
-        };
-        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
-    }
-
-    fn remove_selected_thread(
-        &mut self,
-        _: &RemoveSelectedThread,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_thread(self.selected_index, cx)
-    }
-
-    fn remove_thread(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_match(ix) else {
-            return;
-        };
-
-        let task = match entry {
-            HistoryEntry::AcpThread(thread) => self
-                .history_store
-                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
-            HistoryEntry::TextThread(context) => self.history_store.update(cx, |this, cx| {
-                this.delete_text_thread(context.path.clone(), cx)
-            }),
-        };
-        task.detach_and_log_err(cx);
-    }
-
-    fn list_items(
+    fn render_list_items(
         &mut self,
         range: Range<usize>,
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Vec<AnyElement> {
-        match &self.search_state {
-            SearchState::Empty => self
-                .separated_items
-                .get(range)
-                .iter()
-                .flat_map(|items| {
-                    items
-                        .iter()
-                        .map(|item| self.render_list_item(item, vec![], cx))
-                })
-                .collect(),
-            SearchState::Searched { matches, .. } => matches[range]
-                .iter()
-                .filter_map(|m| {
-                    let entry = self.all_entries.get(m.candidate_id)?;
-                    Some(self.render_history_entry(
-                        entry,
-                        EntryTimeFormat::DateAndTime,
-                        m.candidate_id,
-                        m.positions.clone(),
-                        cx,
-                    ))
-                })
-                .collect(),
-            SearchState::Searching { .. } => {
-                vec![]
-            }
-        }
+        self.visible_items
+            .get(range.clone())
+            .into_iter()
+            .flatten()
+            .enumerate()
+            .map(|(ix, item)| self.render_list_item(item, range.start + ix, cx))
+            .collect()
     }
 
-    fn render_list_item(
-        &self,
-        item: &ListItemType,
-        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
+    fn render_list_item(&self, item: &ListItemType, ix: usize, cx: &Context<Self>) -> AnyElement {
         match item {
-            ListItemType::Entry { index, format } => match self.all_entries.get(*index) {
-                Some(entry) => self
-                    .render_history_entry(entry, *format, *index, highlight_positions, cx)
-                    .into_any(),
-                None => Empty.into_any_element(),
-            },
+            ListItemType::Entry { entry, format } => self
+                .render_history_entry(entry, *format, ix, Vec::default(), cx)
+                .into_any(),
+            ListItemType::SearchResult { entry, positions } => self.render_history_entry(
+                entry,
+                EntryTimeFormat::DateAndTime,
+                ix,
+                positions.clone(),
+                cx,
+            ),
             ListItemType::BucketSeparator(bucket) => div()
                 .px(DynamicSpacing::Base06.rems(cx))
                 .pt_2()
@@ -495,12 +420,12 @@ impl AcpThreadHistory {
         &self,
         entry: &HistoryEntry,
         format: EntryTimeFormat,
-        list_entry_ix: usize,
+        ix: usize,
         highlight_positions: Vec<usize>,
         cx: &Context<Self>,
     ) -> AnyElement {
-        let selected = list_entry_ix == self.selected_index;
-        let hovered = Some(list_entry_ix) == self.hovered_index;
+        let selected = ix == self.selected_index;
+        let hovered = Some(ix) == self.hovered_index;
         let timestamp = entry.updated_at().timestamp();
         let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);
 
@@ -508,7 +433,7 @@ impl AcpThreadHistory {
             .w_full()
             .pb_1()
             .child(
-                ListItem::new(list_entry_ix)
+                ListItem::new(ix)
                     .rounded()
                     .toggle_state(selected)
                     .spacing(ListItemSpacing::Sparse)
@@ -530,8 +455,8 @@ impl AcpThreadHistory {
                     )
                     .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
                         if *is_hovered {
-                            this.hovered_index = Some(list_entry_ix);
-                        } else if this.hovered_index == Some(list_entry_ix) {
+                            this.hovered_index = Some(ix);
+                        } else if this.hovered_index == Some(ix) {
                             this.hovered_index = None;
                         }
 
@@ -546,16 +471,14 @@ impl AcpThreadHistory {
                                 .tooltip(move |window, cx| {
                                     Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
                                 })
-                                .on_click(cx.listener(move |this, _, _, cx| {
-                                    this.remove_thread(list_entry_ix, cx)
-                                })),
+                                .on_click(
+                                    cx.listener(move |this, _, _, cx| this.remove_thread(ix, cx)),
+                                ),
                         )
                     } else {
                         None
                     })
-                    .on_click(
-                        cx.listener(move |this, _, _, cx| this.confirm_entry(list_entry_ix, cx)),
-                    ),
+                    .on_click(cx.listener(move |this, _, _, cx| this.confirm_entry(ix, cx))),
             )
             .into_any_element()
     }
@@ -578,7 +501,7 @@ impl Render for AcpThreadHistory {
             .on_action(cx.listener(Self::select_last))
             .on_action(cx.listener(Self::confirm))
             .on_action(cx.listener(Self::remove_selected_thread))
-            .when(!self.all_entries.is_empty(), |parent| {
+            .when(!self.history_store.read(cx).is_empty(cx), |parent| {
                 parent.child(
                     h_flex()
                         .h(px(41.)) // Match the toolbar perfectly
@@ -604,7 +527,7 @@ impl Render for AcpThreadHistory {
                     .overflow_hidden()
                     .flex_grow();
 
-                if self.all_entries.is_empty() {
+                if self.history_store.read(cx).is_empty(cx) {
                     view.justify_center()
                         .child(
                             h_flex().w_full().justify_center().child(
@@ -623,9 +546,9 @@ impl Render for AcpThreadHistory {
                         .child(
                             uniform_list(
                                 "thread-history",
-                                self.list_item_count(),
+                                self.visible_items.len(),
                                 cx.processor(|this, range: Range<usize>, window, cx| {
-                                    this.list_items(range, window, cx)
+                                    this.render_list_items(range, window, cx)
                                 }),
                             )
                             .p_1()
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 4d89a55139..dae89b3283 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2538,9 +2538,9 @@ impl AcpThreadView {
                 )
             })
             .when(render_history, |this| {
-                let recent_history = self
-                    .history_store
-                    .update(cx, |history_store, cx| history_store.recent_entries(3, cx));
+                let recent_history: Vec<_> = self.history_store.update(cx, |history_store, _| {
+                    history_store.entries().take(3).collect()
+                });
                 this.justify_end().child(
                     v_flex()
                         .child(

From d88fd00e87673263eefdbe6fa5b3d582a05f2aee Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 22 Aug 2025 03:48:47 -0400
Subject: [PATCH 293/823] acp: Fix panic with edit file tool (#36732)

We had a frequent panic when the agent was using our edit file tool. The
root cause was that we were constructing a `BufferDiff` with
`BufferDiff::new`, then calling `set_base_text`, but not waiting for
that asynchronous operation to finish. This means there was a window of
time where the diff's base text was set to the initial value of
`""`--that's not a problem in itself, but it was possible for us to call
`PendingDiff::update` during that window, which calls
`BufferDiff::update_diff`, which calls
`BufferDiffSnapshot::new_with_base_buffer`, which takes two arguments
`base_text` and `base_text_snapshot` that are supposed to represent the
same text. We were getting the first of those arguments from the
`base_text` field of `PendingDiff`, which is set immediately to the
target base text without waiting for `BufferDiff::set_base_text` to run
to completion; and the second from the `BufferDiff` itself, which still
has the empty base text during that window.

As a result of that mismatch, we could end up adding `DeletedHunk` diff
transforms to the multibuffer for the diff card even though the
multibuffer's base text was empty, ultimately leading to a panic very
far away in rendering code.

I've fixed this by adding a new `BufferDiff` constructor for the case
where the buffer contents and the base text are (initially) the same,
like for the diff cards, and so we don't need an async diff calculation.
I also added a debug assertion to catch the basic issue here earlier,
when `BufferDiffSnapshot::new_with_base_buffer` is called with two base
texts that don't match.

Release Notes:

- N/A

---------

Co-authored-by: Conrad <conrad@zed.dev>
---
 crates/acp_thread/src/diff.rs         | 40 +++++++++++++++++----------
 crates/buffer_diff/src/buffer_diff.rs | 33 +++++++++++++++++++++-
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index 59f907dcc4..0fec6809e0 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -85,27 +85,19 @@ impl Diff {
     }
 
     pub fn new(buffer: Entity<Buffer>, cx: &mut Context<Self>) -> Self {
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let base_text = buffer_snapshot.text();
-        let language_registry = buffer.read(cx).language_registry();
-        let text_snapshot = buffer.read(cx).text_snapshot();
+        let buffer_text_snapshot = buffer.read(cx).text_snapshot();
+        let base_text_snapshot = buffer.read(cx).snapshot();
+        let base_text = base_text_snapshot.text();
+        debug_assert_eq!(buffer_text_snapshot.text(), base_text);
         let buffer_diff = cx.new(|cx| {
-            let mut diff = BufferDiff::new(&text_snapshot, cx);
-            let _ = diff.set_base_text(
-                buffer_snapshot.clone(),
-                language_registry,
-                text_snapshot,
-                cx,
-            );
+            let mut diff = BufferDiff::new_unchanged(&buffer_text_snapshot, base_text_snapshot);
             let snapshot = diff.snapshot(cx);
-
             let secondary_diff = cx.new(|cx| {
-                let mut diff = BufferDiff::new(&buffer_snapshot, cx);
-                diff.set_snapshot(snapshot, &buffer_snapshot, cx);
+                let mut diff = BufferDiff::new(&buffer_text_snapshot, cx);
+                diff.set_snapshot(snapshot, &buffer_text_snapshot, cx);
                 diff
             });
             diff.set_secondary_diff(secondary_diff);
-
             diff
         });
 
@@ -412,3 +404,21 @@ async fn build_buffer_diff(
         diff
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use gpui::{AppContext as _, TestAppContext};
+    use language::Buffer;
+
+    use crate::Diff;
+
+    #[gpui::test]
+    async fn test_pending_diff(cx: &mut TestAppContext) {
+        let buffer = cx.new(|cx| Buffer::local("hello!", cx));
+        let _diff = cx.new(|cx| Diff::new(buffer.clone(), cx));
+        buffer.update(cx, |buffer, cx| {
+            buffer.set_text("HELLO!", cx);
+        });
+        cx.run_until_parked();
+    }
+}
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index 10b59d0ba2..b20dad4ebb 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -162,6 +162,22 @@ impl BufferDiffSnapshot {
         }
     }
 
+    fn unchanged(
+        buffer: &text::BufferSnapshot,
+        base_text: language::BufferSnapshot,
+    ) -> BufferDiffSnapshot {
+        debug_assert_eq!(buffer.text(), base_text.text());
+        BufferDiffSnapshot {
+            inner: BufferDiffInner {
+                base_text,
+                hunks: SumTree::new(buffer),
+                pending_hunks: SumTree::new(buffer),
+                base_text_exists: false,
+            },
+            secondary_diff: None,
+        }
+    }
+
     fn new_with_base_text(
         buffer: text::BufferSnapshot,
         base_text: Option<Arc<String>>,
@@ -213,7 +229,10 @@ impl BufferDiffSnapshot {
         cx: &App,
     ) -> impl Future<Output = Self> + use<> {
         let base_text_exists = base_text.is_some();
-        let base_text_pair = base_text.map(|text| (text, base_text_snapshot.as_rope().clone()));
+        let base_text_pair = base_text.map(|text| {
+            debug_assert_eq!(&*text, &base_text_snapshot.text());
+            (text, base_text_snapshot.as_rope().clone())
+        });
         cx.background_executor()
             .spawn_labeled(*CALCULATE_DIFF_TASK, async move {
                 Self {
@@ -873,6 +892,18 @@ impl BufferDiff {
         }
     }
 
+    pub fn new_unchanged(
+        buffer: &text::BufferSnapshot,
+        base_text: language::BufferSnapshot,
+    ) -> Self {
+        debug_assert_eq!(buffer.text(), base_text.text());
+        BufferDiff {
+            buffer_id: buffer.remote_id(),
+            inner: BufferDiffSnapshot::unchanged(buffer, base_text).inner,
+            secondary_diff: None,
+        }
+    }
+
     #[cfg(any(test, feature = "test-support"))]
     pub fn new_with_base_text(
         base_text: &str,

From 27a26d53b1ea1d83ab16c840a5ba1f05da96edea Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 22 Aug 2025 08:28:03 -0300
Subject: [PATCH 294/823] thread view: Inform when editing previous messages is
 unavailable (#36727)

Release Notes:

- N/A
---
 assets/icons/pencil_unavailable.svg           |  6 ++
 crates/agent_ui/src/acp/thread_view.rs        | 97 ++++++++++++-------
 crates/agent_ui/src/ui.rs                     |  2 +
 .../src/ui/unavailable_editing_tooltip.rs     | 29 ++++++
 crates/icons/src/icons.rs                     |  1 +
 5 files changed, 98 insertions(+), 37 deletions(-)
 create mode 100644 assets/icons/pencil_unavailable.svg
 create mode 100644 crates/agent_ui/src/ui/unavailable_editing_tooltip.rs

diff --git a/assets/icons/pencil_unavailable.svg b/assets/icons/pencil_unavailable.svg
new file mode 100644
index 0000000000..4241d766ac
--- /dev/null
+++ b/assets/icons/pencil_unavailable.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 5.50621L10.5941 3.41227C10.8585 3.14798 11.217 2.99953 11.5908 2.99957C11.9646 2.99962 12.3231 3.14816 12.5874 3.41252C12.8517 3.67688 13.0001 4.03541 13.0001 4.40922C13.0001 4.78304 12.8515 5.14152 12.5872 5.40582L10.493 7.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.50789 8.5L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L7.49184 10.5019" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 3L13 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index dae89b3283..619885144a 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -57,7 +57,9 @@ use crate::agent_diff::AgentDiff;
 use crate::profile_selector::{ProfileProvider, ProfileSelector};
 
 use crate::ui::preview::UsageCallout;
-use crate::ui::{AgentNotification, AgentNotificationEvent, BurnModeTooltip};
+use crate::ui::{
+    AgentNotification, AgentNotificationEvent, BurnModeTooltip, UnavailableEditingTooltip,
+};
 use crate::{
     AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, ExpandMessageEditor, Follow,
     KeepAll, OpenAgentDiff, OpenHistory, RejectAll, ToggleBurnMode, ToggleProfileSelector,
@@ -1239,6 +1241,8 @@ impl AcpThreadView {
                     None
                 };
 
+                let agent_name = self.agent.name();
+
                 v_flex()
                     .id(("user_message", entry_ix))
                     .pt_2()
@@ -1292,42 +1296,61 @@ impl AcpThreadView {
                                     .text_xs()
                                     .child(editor.clone().into_any_element()),
                             )
-                            .when(editing && editor_focus, |this|
-                                this.child(
-                                    h_flex()
-                                        .absolute()
-                                        .top_neg_3p5()
-                                        .right_3()
-                                        .gap_1()
-                                        .rounded_sm()
-                                        .border_1()
-                                        .border_color(cx.theme().colors().border)
-                                        .bg(cx.theme().colors().editor_background)
-                                        .overflow_hidden()
-                                        .child(
-                                            IconButton::new("cancel", IconName::Close)
-                                                .icon_color(Color::Error)
-                                                .icon_size(IconSize::XSmall)
-                                                .on_click(cx.listener(Self::cancel_editing))
-                                        )
-                                        .child(
-                                            IconButton::new("regenerate", IconName::Return)
-                                                .icon_color(Color::Muted)
-                                                .icon_size(IconSize::XSmall)
-                                                .tooltip(Tooltip::text(
-                                                    "Editing will restart the thread from this point."
-                                                ))
-                                                .on_click(cx.listener({
-                                                    let editor = editor.clone();
-                                                    move |this, _, window, cx| {
-                                                        this.regenerate(
-                                                            entry_ix, &editor, window, cx,
-                                                        );
-                                                    }
-                                                })),
-                                        )
-                                )
-                            ),
+                            .when(editor_focus, |this| {
+                                let base_container = h_flex()
+                                    .absolute()
+                                    .top_neg_3p5()
+                                    .right_3()
+                                    .gap_1()
+                                    .rounded_sm()
+                                    .border_1()
+                                    .border_color(cx.theme().colors().border)
+                                    .bg(cx.theme().colors().editor_background)
+                                    .overflow_hidden();
+
+                                if message.id.is_some() {
+                                    this.child(
+                                        base_container
+                                            .child(
+                                                IconButton::new("cancel", IconName::Close)
+                                                    .icon_color(Color::Error)
+                                                    .icon_size(IconSize::XSmall)
+                                                    .on_click(cx.listener(Self::cancel_editing))
+                                            )
+                                            .child(
+                                                IconButton::new("regenerate", IconName::Return)
+                                                    .icon_color(Color::Muted)
+                                                    .icon_size(IconSize::XSmall)
+                                                    .tooltip(Tooltip::text(
+                                                        "Editing will restart the thread from this point."
+                                                    ))
+                                                    .on_click(cx.listener({
+                                                        let editor = editor.clone();
+                                                        move |this, _, window, cx| {
+                                                            this.regenerate(
+                                                                entry_ix, &editor, window, cx,
+                                                            );
+                                                        }
+                                                    })),
+                                            )
+                                    )
+                                } else {
+                                    this.child(
+                                        base_container
+                                            .border_dashed()
+                                            .child(
+                                                IconButton::new("editing_unavailable", IconName::PencilUnavailable)
+                                                    .icon_size(IconSize::Small)
+                                                    .icon_color(Color::Muted)
+                                                    .style(ButtonStyle::Transparent)
+                                                    .tooltip(move |_window, cx| {
+                                                        cx.new(|_| UnavailableEditingTooltip::new(agent_name.into()))
+                                                            .into()
+                                                    })
+                                            )
+                                    )
+                                }
+                            }),
                     )
                     .into_any()
             }
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index e27a224240..ada973cddf 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -4,9 +4,11 @@ mod context_pill;
 mod end_trial_upsell;
 mod onboarding_modal;
 pub mod preview;
+mod unavailable_editing_tooltip;
 
 pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
 pub use end_trial_upsell::*;
 pub use onboarding_modal::*;
+pub use unavailable_editing_tooltip::*;
diff --git a/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs b/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
new file mode 100644
index 0000000000..78d4c64e0a
--- /dev/null
+++ b/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
@@ -0,0 +1,29 @@
+use gpui::{Context, IntoElement, Render, Window};
+use ui::{prelude::*, tooltip_container};
+
+pub struct UnavailableEditingTooltip {
+    agent_name: SharedString,
+}
+
+impl UnavailableEditingTooltip {
+    pub fn new(agent_name: SharedString) -> Self {
+        Self { agent_name }
+    }
+}
+
+impl Render for UnavailableEditingTooltip {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        tooltip_container(window, cx, |this, _, _| {
+            this.child(Label::new("Unavailable Editing")).child(
+                div().max_w_64().child(
+                    Label::new(format!(
+                        "Editing previous messages is not available for {} yet.",
+                        self.agent_name
+                    ))
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+                ),
+            )
+        })
+    }
+}
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 38f02c2206..b5f891713a 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -164,6 +164,7 @@ pub enum IconName {
     PageDown,
     PageUp,
     Pencil,
+    PencilUnavailable,
     Person,
     Pin,
     PlayOutlined,

From 3b7c1744b424c9127267e8935ac668ece52394e4 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 22 Aug 2025 09:52:44 -0300
Subject: [PATCH 295/823] thread view: Add more UI improvements (#36750)

Release Notes:

- N/A
---
 assets/icons/attach.svg                |  3 ++
 assets/icons/tool_think.svg            |  2 +-
 crates/agent_servers/src/claude.rs     |  2 +-
 crates/agent_servers/src/gemini.rs     |  2 +-
 crates/agent_ui/src/acp/thread_view.rs | 68 +++++++++-----------------
 crates/agent_ui/src/agent_panel.rs     |  5 ++
 crates/icons/src/icons.rs              |  1 +
 7 files changed, 36 insertions(+), 47 deletions(-)
 create mode 100644 assets/icons/attach.svg

diff --git a/assets/icons/attach.svg b/assets/icons/attach.svg
new file mode 100644
index 0000000000..f923a3c7c8
--- /dev/null
+++ b/assets/icons/attach.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.37288 4.48506L7.43539 10.6638C7.43539 10.9365 7.54373 11.1981 7.73655 11.3909C7.92938 11.5837 8.19092 11.6921 8.46362 11.6921C8.73632 11.6921 8.99785 11.5837 9.19068 11.3909C9.38351 11.1981 9.49184 10.9366 9.49184 10.6638L9.42933 4.48506C9.42933 3.93975 9.2127 3.41678 8.82711 3.03119C8.44152 2.6456 7.91855 2.42898 7.37324 2.42898C6.82794 2.42898 6.30496 2.6456 5.91937 3.03119C5.53378 3.41678 5.31716 3.93975 5.31716 4.48506L5.37968 10.6384C5.37636 11.0455 5.45368 11.4492 5.60718 11.8263C5.76067 12.2034 5.98731 12.5463 6.27401 12.8354C6.56071 13.1244 6.9018 13.3538 7.27761 13.5104C7.65341 13.667 8.0565 13.7476 8.46362 13.7476C8.87073 13.7476 9.27382 13.667 9.64963 13.5104C10.0254 13.3538 10.3665 13.1244 10.6532 12.8354C10.9399 12.5463 11.1666 12.2034 11.3201 11.8263C11.4736 11.4492 11.5509 11.0455 11.5476 10.6384L11.485 4.48506" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/icons/tool_think.svg b/assets/icons/tool_think.svg
index efd5908a90..773f5e7fa7 100644
--- a/assets/icons/tool_think.svg
+++ b/assets/icons/tool_think.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95231 10.2159C10.0803 9.58974 9.95231 9.57261 10.9111 8.46959C11.4686 7.82822 11.8699 7.09214 11.8699 6.27818C11.8699 5.28184 11.4658 4.32631 10.7467 3.62179C10.0275 2.91728 9.05201 2.52148 8.03492 2.52148C7.01782 2.52148 6.04239 2.91728 5.32319 3.62179C4.604 4.32631 4.19995 5.28184 4.19995 6.27818C4.19995 6.9043 4.32779 7.65565 5.1587 8.46959C6.11744 9.59098 5.98965 9.58974 6.11748 10.2159M9.95231 10.2159V12.2989C9.95231 12.9504 9.41327 13.4786 8.7482 13.4786H7.32165C6.65658 13.4786 6.11744 12.9504 6.11744 12.2989L6.11748 10.2159M9.95231 10.2159H8.03492H6.11748" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.9526 10.2625C10.0833 9.62316 9.9526 9.60566 10.9315 8.47946C11.5008 7.82461 11.9105 7.07306 11.9105 6.242C11.9105 5.22472 11.4979 4.2491 10.7637 3.52978C10.0294 2.81046 9.03338 2.40634 7.99491 2.40634C6.95644 2.40634 5.96051 2.81046 5.22619 3.52978C4.49189 4.2491 4.07935 5.22472 4.07935 6.242C4.07935 6.88128 4.20987 7.64842 5.05825 8.47946C6.03714 9.62442 5.90666 9.62316 6.03718 10.2625M9.9526 10.2625V12.3893C9.9526 13.0544 9.40223 13.5937 8.72319 13.5937H7.26665C6.58761 13.5937 6.03714 13.0544 6.03714 12.3893L6.03718 10.2625M9.9526 10.2625H7.99491H6.03718" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index d6ccabb130..ef666974f1 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -44,7 +44,7 @@ pub struct ClaudeCode;
 
 impl AgentServer for ClaudeCode {
     fn name(&self) -> &'static str {
-        "Welcome to Claude Code"
+        "Claude Code"
     }
 
     fn empty_state_headline(&self) -> &'static str {
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 3b892e7931..29120fff6e 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -23,7 +23,7 @@ impl AgentServer for Gemini {
     }
 
     fn empty_state_headline(&self) -> &'static str {
-        "Welcome to Gemini CLI"
+        self.name()
     }
 
     fn empty_state_message(&self) -> &'static str {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 619885144a..d27dee1fe6 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1697,7 +1697,7 @@ impl AcpThreadView {
                 .absolute()
                 .top_0()
                 .right_0()
-                .w_12()
+                .w_16()
                 .h_full()
                 .bg(linear_gradient(
                     90.,
@@ -1837,6 +1837,7 @@ impl AcpThreadView {
                                     .w_full()
                                     .max_w_full()
                                     .ml_1p5()
+                                    .overflow_hidden()
                                     .child(h_flex().pr_8().child(self.render_markdown(
                                         tool_call.label.clone(),
                                         default_markdown_style(false, true, window, cx),
@@ -1906,13 +1907,10 @@ impl AcpThreadView {
             .text_color(cx.theme().colors().text_muted)
             .child(self.render_markdown(markdown, default_markdown_style(false, false, window, cx)))
             .child(
-                Button::new(button_id, "Collapse")
+                IconButton::new(button_id, IconName::ChevronUp)
                     .full_width()
                     .style(ButtonStyle::Outlined)
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::ChevronUp)
                     .icon_color(Color::Muted)
-                    .icon_position(IconPosition::Start)
                     .on_click(cx.listener({
                         move |this: &mut Self, _, _, cx: &mut Context<Self>| {
                             this.expanded_tool_calls.remove(&tool_call_id);
@@ -2414,39 +2412,32 @@ impl AcpThreadView {
             return None;
         }
 
+        let has_both = user_rules_text.is_some() && rules_file_text.is_some();
+
         Some(
-            v_flex()
+            h_flex()
                 .px_2p5()
-                .gap_1()
+                .pb_1()
+                .child(
+                    Icon::new(IconName::Attach)
+                        .size(IconSize::XSmall)
+                        .color(Color::Disabled),
+                )
                 .when_some(user_rules_text, |parent, user_rules_text| {
                     parent.child(
                         h_flex()
-                            .group("user-rules")
                             .id("user-rules")
-                            .w_full()
-                            .child(
-                                Icon::new(IconName::Reader)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Disabled),
-                            )
+                            .ml_1()
+                            .mr_1p5()
                             .child(
                                 Label::new(user_rules_text)
                                     .size(LabelSize::XSmall)
                                     .color(Color::Muted)
                                     .truncate()
-                                    .buffer_font(cx)
-                                    .ml_1p5()
-                                    .mr_0p5(),
-                            )
-                            .child(
-                                IconButton::new("open-prompt-library", IconName::ArrowUpRight)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::XSmall)
-                                    .icon_color(Color::Ignored)
-                                    .visible_on_hover("user-rules")
-                                    // TODO: Figure out a way to pass focus handle here so we can display the `OpenRulesLibrary`  keybinding
-                                    .tooltip(Tooltip::text("View User Rules")),
+                                    .buffer_font(cx),
                             )
+                            .hover(|s| s.bg(cx.theme().colors().element_hover))
+                            .tooltip(Tooltip::text("View User Rules"))
                             .on_click(move |_event, window, cx| {
                                 window.dispatch_action(
                                     Box::new(OpenRulesLibrary {
@@ -2457,33 +2448,20 @@ impl AcpThreadView {
                             }),
                     )
                 })
+                .when(has_both, |this| this.child(Divider::vertical()))
                 .when_some(rules_file_text, |parent, rules_file_text| {
                     parent.child(
                         h_flex()
-                            .group("project-rules")
                             .id("project-rules")
-                            .w_full()
-                            .child(
-                                Icon::new(IconName::Reader)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Disabled),
-                            )
+                            .ml_1p5()
                             .child(
                                 Label::new(rules_file_text)
                                     .size(LabelSize::XSmall)
                                     .color(Color::Muted)
-                                    .buffer_font(cx)
-                                    .ml_1p5()
-                                    .mr_0p5(),
-                            )
-                            .child(
-                                IconButton::new("open-rule", IconName::ArrowUpRight)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::XSmall)
-                                    .icon_color(Color::Ignored)
-                                    .visible_on_hover("project-rules")
-                                    .tooltip(Tooltip::text("View Project Rules")),
+                                    .buffer_font(cx),
                             )
+                            .hover(|s| s.bg(cx.theme().colors().element_hover))
+                            .tooltip(Tooltip::text("View Project Rules"))
                             .on_click(cx.listener(Self::handle_open_rules)),
                     )
                 })
@@ -4080,8 +4058,10 @@ impl AcpThreadView {
             .group("thread-controls-container")
             .w_full()
             .mr_1()
+            .pt_1()
             .pb_2()
             .px(RESPONSE_PADDING_X)
+            .gap_px()
             .opacity(0.4)
             .hover(|style| style.opacity(1.))
             .flex_wrap()
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index d2ff6aa4f3..469898d10f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2041,9 +2041,11 @@ impl AgentPanel {
                 match state {
                     ThreadSummary::Pending => Label::new(ThreadSummary::DEFAULT)
                         .truncate()
+                        .color(Color::Muted)
                         .into_any_element(),
                     ThreadSummary::Generating => Label::new(LOADING_SUMMARY_PLACEHOLDER)
                         .truncate()
+                        .color(Color::Muted)
                         .into_any_element(),
                     ThreadSummary::Ready(_) => div()
                         .w_full()
@@ -2098,6 +2100,7 @@ impl AgentPanel {
                         .into_any_element()
                 } else {
                     Label::new(thread_view.read(cx).title(cx))
+                        .color(Color::Muted)
                         .truncate()
                         .into_any_element()
                 }
@@ -2111,6 +2114,7 @@ impl AgentPanel {
 
                 match summary {
                     ContextSummary::Pending => Label::new(ContextSummary::DEFAULT)
+                        .color(Color::Muted)
                         .truncate()
                         .into_any_element(),
                     ContextSummary::Content(summary) => {
@@ -2122,6 +2126,7 @@ impl AgentPanel {
                         } else {
                             Label::new(LOADING_SUMMARY_PLACEHOLDER)
                                 .truncate()
+                                .color(Color::Muted)
                                 .into_any_element()
                         }
                     }
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index b5f891713a..4fc6039fd7 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -34,6 +34,7 @@ pub enum IconName {
     ArrowRightLeft,
     ArrowUp,
     ArrowUpRight,
+    Attach,
     AudioOff,
     AudioOn,
     Backspace,

From 4f0fad69960d0aad5cfd9840592d70fa82df5d91 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 22 Aug 2025 15:16:42 +0200
Subject: [PATCH 296/823] acp: Support calling tools provided by MCP servers
 (#36752)

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs    | 441 +++++++++++++++++++++++++++++-
 crates/agent2/src/thread.rs       | 148 +++++++---
 crates/context_server/src/test.rs |  36 ++-
 3 files changed, 561 insertions(+), 64 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 09048488c8..60b3198081 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -4,26 +4,35 @@ use agent_client_protocol::{self as acp};
 use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, UserStore};
+use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use fs::{FakeFs, Fs};
-use futures::{StreamExt, channel::mpsc::UnboundedReceiver};
+use futures::{
+    StreamExt,
+    channel::{
+        mpsc::{self, UnboundedReceiver},
+        oneshot,
+    },
+};
 use gpui::{
     App, AppContext, Entity, Task, TestAppContext, UpdateGlobal, http_client::FakeHttpClient,
 };
 use indoc::indoc;
 use language_model::{
     LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
-    LanguageModelProviderName, LanguageModelRegistry, LanguageModelRequestMessage,
-    LanguageModelToolResult, LanguageModelToolUse, MessageContent, Role, StopReason,
-    fake_provider::FakeLanguageModel,
+    LanguageModelProviderName, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolSchemaFormat,
+    LanguageModelToolUse, MessageContent, Role, StopReason, fake_provider::FakeLanguageModel,
 };
 use pretty_assertions::assert_eq;
-use project::Project;
+use project::{
+    Project, context_server_store::ContextServerStore, project_settings::ProjectSettings,
+};
 use prompt_store::ProjectContext;
 use reqwest_client::ReqwestClient;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use settings::SettingsStore;
+use settings::{Settings, SettingsStore};
 use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
 use util::path;
 
@@ -931,6 +940,334 @@ async fn test_profiles(cx: &mut TestAppContext) {
     assert_eq!(tool_names, vec![InfiniteTool::name()]);
 }
 
+#[gpui::test]
+async fn test_mcp_tools(cx: &mut TestAppContext) {
+    let ThreadTest {
+        model,
+        thread,
+        context_server_store,
+        fs,
+        ..
+    } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    // Override profiles and wait for settings to be loaded.
+    fs.insert_file(
+        paths::settings_file(),
+        json!({
+            "agent": {
+                "profiles": {
+                    "test": {
+                        "name": "Test Profile",
+                        "enable_all_context_servers": true,
+                        "tools": {
+                            EchoTool::name(): true,
+                        }
+                    },
+                }
+            }
+        })
+        .to_string()
+        .into_bytes(),
+    )
+    .await;
+    cx.run_until_parked();
+    thread.update(cx, |thread, _| {
+        thread.set_profile(AgentProfileId("test".into()))
+    });
+
+    let mut mcp_tool_calls = setup_context_server(
+        "test_server",
+        vec![context_server::types::Tool {
+            name: "echo".into(),
+            description: None,
+            input_schema: serde_json::to_value(
+                EchoTool.input_schema(LanguageModelToolSchemaFormat::JsonSchema),
+            )
+            .unwrap(),
+            output_schema: None,
+            annotations: None,
+        }],
+        &context_server_store,
+        cx,
+    );
+
+    let events = thread.update(cx, |thread, cx| {
+        thread.send(UserMessageId::new(), ["Hey"], cx).unwrap()
+    });
+    cx.run_until_parked();
+
+    // Simulate the model calling the MCP tool.
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(tool_names_for_completion(&completion), vec!["echo"]);
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "tool_1".into(),
+            name: "echo".into(),
+            raw_input: json!({"text": "test"}).to_string(),
+            input: json!({"text": "test"}),
+            is_input_complete: true,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    let (tool_call_params, tool_call_response) = mcp_tool_calls.next().await.unwrap();
+    assert_eq!(tool_call_params.name, "echo");
+    assert_eq!(tool_call_params.arguments, Some(json!({"text": "test"})));
+    tool_call_response
+        .send(context_server::types::CallToolResponse {
+            content: vec![context_server::types::ToolResponseContent::Text {
+                text: "test".into(),
+            }],
+            is_error: None,
+            meta: None,
+            structured_content: None,
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    assert_eq!(tool_names_for_completion(&completion), vec!["echo"]);
+    fake_model.send_last_completion_stream_text_chunk("Done!");
+    fake_model.end_last_completion_stream();
+    events.collect::<Vec<_>>().await;
+
+    // Send again after adding the echo tool, ensuring the name collision is resolved.
+    let events = thread.update(cx, |thread, cx| {
+        thread.add_tool(EchoTool);
+        thread.send(UserMessageId::new(), ["Go"], cx).unwrap()
+    });
+    cx.run_until_parked();
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        tool_names_for_completion(&completion),
+        vec!["echo", "test_server_echo"]
+    );
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "tool_2".into(),
+            name: "test_server_echo".into(),
+            raw_input: json!({"text": "mcp"}).to_string(),
+            input: json!({"text": "mcp"}),
+            is_input_complete: true,
+        },
+    ));
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        LanguageModelToolUse {
+            id: "tool_3".into(),
+            name: "echo".into(),
+            raw_input: json!({"text": "native"}).to_string(),
+            input: json!({"text": "native"}),
+            is_input_complete: true,
+        },
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    let (tool_call_params, tool_call_response) = mcp_tool_calls.next().await.unwrap();
+    assert_eq!(tool_call_params.name, "echo");
+    assert_eq!(tool_call_params.arguments, Some(json!({"text": "mcp"})));
+    tool_call_response
+        .send(context_server::types::CallToolResponse {
+            content: vec![context_server::types::ToolResponseContent::Text { text: "mcp".into() }],
+            is_error: None,
+            meta: None,
+            structured_content: None,
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    // Ensure the tool results were inserted with the correct names.
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        completion.messages.last().unwrap().content,
+        vec![
+            MessageContent::ToolResult(LanguageModelToolResult {
+                tool_use_id: "tool_3".into(),
+                tool_name: "echo".into(),
+                is_error: false,
+                content: "native".into(),
+                output: Some("native".into()),
+            },),
+            MessageContent::ToolResult(LanguageModelToolResult {
+                tool_use_id: "tool_2".into(),
+                tool_name: "test_server_echo".into(),
+                is_error: false,
+                content: "mcp".into(),
+                output: Some("mcp".into()),
+            },),
+        ]
+    );
+    fake_model.end_last_completion_stream();
+    events.collect::<Vec<_>>().await;
+}
+
+#[gpui::test]
+async fn test_mcp_tool_truncation(cx: &mut TestAppContext) {
+    let ThreadTest {
+        model,
+        thread,
+        context_server_store,
+        fs,
+        ..
+    } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    // Set up a profile with all tools enabled
+    fs.insert_file(
+        paths::settings_file(),
+        json!({
+            "agent": {
+                "profiles": {
+                    "test": {
+                        "name": "Test Profile",
+                        "enable_all_context_servers": true,
+                        "tools": {
+                            EchoTool::name(): true,
+                            DelayTool::name(): true,
+                            WordListTool::name(): true,
+                            ToolRequiringPermission::name(): true,
+                            InfiniteTool::name(): true,
+                        }
+                    },
+                }
+            }
+        })
+        .to_string()
+        .into_bytes(),
+    )
+    .await;
+    cx.run_until_parked();
+
+    thread.update(cx, |thread, _| {
+        thread.set_profile(AgentProfileId("test".into()));
+        thread.add_tool(EchoTool);
+        thread.add_tool(DelayTool);
+        thread.add_tool(WordListTool);
+        thread.add_tool(ToolRequiringPermission);
+        thread.add_tool(InfiniteTool);
+    });
+
+    // Set up multiple context servers with some overlapping tool names
+    let _server1_calls = setup_context_server(
+        "xxx",
+        vec![
+            context_server::types::Tool {
+                name: "echo".into(), // Conflicts with native EchoTool
+                description: None,
+                input_schema: serde_json::to_value(
+                    EchoTool.input_schema(LanguageModelToolSchemaFormat::JsonSchema),
+                )
+                .unwrap(),
+                output_schema: None,
+                annotations: None,
+            },
+            context_server::types::Tool {
+                name: "unique_tool_1".into(),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+        ],
+        &context_server_store,
+        cx,
+    );
+
+    let _server2_calls = setup_context_server(
+        "yyy",
+        vec![
+            context_server::types::Tool {
+                name: "echo".into(), // Also conflicts with native EchoTool
+                description: None,
+                input_schema: serde_json::to_value(
+                    EchoTool.input_schema(LanguageModelToolSchemaFormat::JsonSchema),
+                )
+                .unwrap(),
+                output_schema: None,
+                annotations: None,
+            },
+            context_server::types::Tool {
+                name: "unique_tool_2".into(),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+            context_server::types::Tool {
+                name: "a".repeat(MAX_TOOL_NAME_LENGTH - 2),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+            context_server::types::Tool {
+                name: "b".repeat(MAX_TOOL_NAME_LENGTH - 1),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+        ],
+        &context_server_store,
+        cx,
+    );
+    let _server3_calls = setup_context_server(
+        "zzz",
+        vec![
+            context_server::types::Tool {
+                name: "a".repeat(MAX_TOOL_NAME_LENGTH - 2),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+            context_server::types::Tool {
+                name: "b".repeat(MAX_TOOL_NAME_LENGTH - 1),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+            context_server::types::Tool {
+                name: "c".repeat(MAX_TOOL_NAME_LENGTH + 1),
+                description: None,
+                input_schema: json!({"type": "object", "properties": {}}),
+                output_schema: None,
+                annotations: None,
+            },
+        ],
+        &context_server_store,
+        cx,
+    );
+
+    thread
+        .update(cx, |thread, cx| {
+            thread.send(UserMessageId::new(), ["Go"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        tool_names_for_completion(&completion),
+        vec![
+            "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+            "delay",
+            "echo",
+            "infinite",
+            "tool_requiring_permission",
+            "unique_tool_1",
+            "unique_tool_2",
+            "word_list",
+            "xxx_echo",
+            "y_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+            "yyy_echo",
+            "z_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        ]
+    );
+}
+
 #[gpui::test]
 #[cfg_attr(not(feature = "e2e"), ignore)]
 async fn test_cancellation(cx: &mut TestAppContext) {
@@ -1806,6 +2143,7 @@ struct ThreadTest {
     model: Arc<dyn LanguageModel>,
     thread: Entity<Thread>,
     project_context: Entity<ProjectContext>,
+    context_server_store: Entity<ContextServerStore>,
     fs: Arc<FakeFs>,
 }
 
@@ -1844,6 +2182,7 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
                             WordListTool::name(): true,
                             ToolRequiringPermission::name(): true,
                             InfiniteTool::name(): true,
+                            ThinkingTool::name(): true,
                         }
                     }
                 }
@@ -1900,8 +2239,9 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
         .await;
 
     let project_context = cx.new(|_cx| ProjectContext::default());
+    let context_server_store = project.read_with(cx, |project, _| project.context_server_store());
     let context_server_registry =
-        cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
+        cx.new(|cx| ContextServerRegistry::new(context_server_store.clone(), cx));
     let thread = cx.new(|cx| {
         Thread::new(
             project,
@@ -1916,6 +2256,7 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
         model,
         thread,
         project_context,
+        context_server_store,
         fs,
     }
 }
@@ -1950,3 +2291,89 @@ fn watch_settings(fs: Arc<dyn Fs>, cx: &mut App) {
     })
     .detach();
 }
+
+fn tool_names_for_completion(completion: &LanguageModelRequest) -> Vec<String> {
+    completion
+        .tools
+        .iter()
+        .map(|tool| tool.name.clone())
+        .collect()
+}
+
+fn setup_context_server(
+    name: &'static str,
+    tools: Vec<context_server::types::Tool>,
+    context_server_store: &Entity<ContextServerStore>,
+    cx: &mut TestAppContext,
+) -> mpsc::UnboundedReceiver<(
+    context_server::types::CallToolParams,
+    oneshot::Sender<context_server::types::CallToolResponse>,
+)> {
+    cx.update(|cx| {
+        let mut settings = ProjectSettings::get_global(cx).clone();
+        settings.context_servers.insert(
+            name.into(),
+            project::project_settings::ContextServerSettings::Custom {
+                enabled: true,
+                command: ContextServerCommand {
+                    path: "somebinary".into(),
+                    args: Vec::new(),
+                    env: None,
+                },
+            },
+        );
+        ProjectSettings::override_global(settings, cx);
+    });
+
+    let (mcp_tool_calls_tx, mcp_tool_calls_rx) = mpsc::unbounded();
+    let fake_transport = context_server::test::create_fake_transport(name, cx.executor())
+        .on_request::<context_server::types::requests::Initialize, _>(move |_params| async move {
+            context_server::types::InitializeResponse {
+                protocol_version: context_server::types::ProtocolVersion(
+                    context_server::types::LATEST_PROTOCOL_VERSION.to_string(),
+                ),
+                server_info: context_server::types::Implementation {
+                    name: name.into(),
+                    version: "1.0.0".to_string(),
+                },
+                capabilities: context_server::types::ServerCapabilities {
+                    tools: Some(context_server::types::ToolsCapabilities {
+                        list_changed: Some(true),
+                    }),
+                    ..Default::default()
+                },
+                meta: None,
+            }
+        })
+        .on_request::<context_server::types::requests::ListTools, _>(move |_params| {
+            let tools = tools.clone();
+            async move {
+                context_server::types::ListToolsResponse {
+                    tools,
+                    next_cursor: None,
+                    meta: None,
+                }
+            }
+        })
+        .on_request::<context_server::types::requests::CallTool, _>(move |params| {
+            let mcp_tool_calls_tx = mcp_tool_calls_tx.clone();
+            async move {
+                let (response_tx, response_rx) = oneshot::channel();
+                mcp_tool_calls_tx
+                    .unbounded_send((params, response_tx))
+                    .unwrap();
+                response_rx.await.unwrap()
+            }
+        });
+    context_server_store.update(cx, |store, cx| {
+        store.start_server(
+            Arc::new(ContextServer::new(
+                ContextServerId(name.into()),
+                Arc::new(fake_transport),
+            )),
+            cx,
+        );
+    });
+    cx.run_until_parked();
+    mcp_tool_calls_rx
+}
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index af18afa055..c89e5875f9 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -9,15 +9,15 @@ use action_log::ActionLog;
 use agent::thread::{GitState, ProjectSnapshot, WorktreeSnapshot};
 use agent_client_protocol as acp;
 use agent_settings::{
-    AgentProfileId, AgentSettings, CompletionMode, SUMMARIZE_THREAD_DETAILED_PROMPT,
-    SUMMARIZE_THREAD_PROMPT,
+    AgentProfileId, AgentProfileSettings, AgentSettings, CompletionMode,
+    SUMMARIZE_THREAD_DETAILED_PROMPT, SUMMARIZE_THREAD_PROMPT,
 };
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::adapt_schema_to_format;
 use chrono::{DateTime, Utc};
 use client::{ModelRequestUsage, RequestUsage};
 use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};
-use collections::{HashMap, IndexMap};
+use collections::{HashMap, HashSet, IndexMap};
 use fs::Fs;
 use futures::{
     FutureExt,
@@ -56,6 +56,7 @@ use util::{ResultExt, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
 
 const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
+pub const MAX_TOOL_NAME_LENGTH: usize = 64;
 
 /// The ID of the user prompt that initiated a request.
 ///
@@ -627,7 +628,20 @@ impl Thread {
         stream: &ThreadEventStream,
         cx: &mut Context<Self>,
     ) {
-        let Some(tool) = self.tools.get(tool_use.name.as_ref()) else {
+        let tool = self.tools.get(tool_use.name.as_ref()).cloned().or_else(|| {
+            self.context_server_registry
+                .read(cx)
+                .servers()
+                .find_map(|(_, tools)| {
+                    if let Some(tool) = tools.get(tool_use.name.as_ref()) {
+                        Some(tool.clone())
+                    } else {
+                        None
+                    }
+                })
+        });
+
+        let Some(tool) = tool else {
             stream
                 .0
                 .unbounded_send(Ok(ThreadEvent::ToolCall(acp::ToolCall {
@@ -1079,6 +1093,10 @@ impl Thread {
         self.cancel(cx);
 
         let model = self.model.clone().context("No language model configured")?;
+        let profile = AgentSettings::get_global(cx)
+            .profiles
+            .get(&self.profile_id)
+            .context("Profile not found")?;
         let (events_tx, events_rx) = mpsc::unbounded::<Result<ThreadEvent>>();
         let event_stream = ThreadEventStream(events_tx);
         let message_ix = self.messages.len().saturating_sub(1);
@@ -1086,6 +1104,7 @@ impl Thread {
         self.summary = None;
         self.running_turn = Some(RunningTurn {
             event_stream: event_stream.clone(),
+            tools: self.enabled_tools(profile, &model, cx),
             _task: cx.spawn(async move |this, cx| {
                 log::info!("Starting agent turn execution");
 
@@ -1417,7 +1436,7 @@ impl Thread {
     ) -> Option<Task<LanguageModelToolResult>> {
         cx.notify();
 
-        let tool = self.tools.get(tool_use.name.as_ref()).cloned();
+        let tool = self.tool(tool_use.name.as_ref());
         let mut title = SharedString::from(&tool_use.name);
         let mut kind = acp::ToolKind::Other;
         if let Some(tool) = tool.as_ref() {
@@ -1727,6 +1746,21 @@ impl Thread {
         cx: &mut App,
     ) -> Result<LanguageModelRequest> {
         let model = self.model().context("No language model configured")?;
+        let tools = if let Some(turn) = self.running_turn.as_ref() {
+            turn.tools
+                .iter()
+                .filter_map(|(tool_name, tool)| {
+                    log::trace!("Including tool: {}", tool_name);
+                    Some(LanguageModelRequestTool {
+                        name: tool_name.to_string(),
+                        description: tool.description().to_string(),
+                        input_schema: tool.input_schema(model.tool_input_format()).log_err()?,
+                    })
+                })
+                .collect::<Vec<_>>()
+        } else {
+            Vec::new()
+        };
 
         log::debug!("Building completion request");
         log::debug!("Completion intent: {:?}", completion_intent);
@@ -1734,23 +1768,6 @@ impl Thread {
 
         let messages = self.build_request_messages(cx);
         log::info!("Request will include {} messages", messages.len());
-
-        let tools = if let Some(tools) = self.tools(cx).log_err() {
-            tools
-                .filter_map(|tool| {
-                    let tool_name = tool.name().to_string();
-                    log::trace!("Including tool: {}", tool_name);
-                    Some(LanguageModelRequestTool {
-                        name: tool_name,
-                        description: tool.description().to_string(),
-                        input_schema: tool.input_schema(model.tool_input_format()).log_err()?,
-                    })
-                })
-                .collect()
-        } else {
-            Vec::new()
-        };
-
         log::info!("Request includes {} tools", tools.len());
 
         let request = LanguageModelRequest {
@@ -1770,37 +1787,76 @@ impl Thread {
         Ok(request)
     }
 
-    fn tools<'a>(&'a self, cx: &'a App) -> Result<impl Iterator<Item = &'a Arc<dyn AnyAgentTool>>> {
-        let model = self.model().context("No language model configured")?;
+    fn enabled_tools(
+        &self,
+        profile: &AgentProfileSettings,
+        model: &Arc<dyn LanguageModel>,
+        cx: &App,
+    ) -> BTreeMap<SharedString, Arc<dyn AnyAgentTool>> {
+        fn truncate(tool_name: &SharedString) -> SharedString {
+            if tool_name.len() > MAX_TOOL_NAME_LENGTH {
+                let mut truncated = tool_name.to_string();
+                truncated.truncate(MAX_TOOL_NAME_LENGTH);
+                truncated.into()
+            } else {
+                tool_name.clone()
+            }
+        }
 
-        let profile = AgentSettings::get_global(cx)
-            .profiles
-            .get(&self.profile_id)
-            .context("profile not found")?;
-        let provider_id = model.provider_id();
-
-        Ok(self
+        let mut tools = self
             .tools
             .iter()
-            .filter(move |(_, tool)| tool.supported_provider(&provider_id))
             .filter_map(|(tool_name, tool)| {
-                if profile.is_tool_enabled(tool_name) {
-                    Some(tool)
+                if tool.supported_provider(&model.provider_id())
+                    && profile.is_tool_enabled(tool_name)
+                {
+                    Some((truncate(tool_name), tool.clone()))
                 } else {
                     None
                 }
             })
-            .chain(self.context_server_registry.read(cx).servers().flat_map(
-                |(server_id, tools)| {
-                    tools.iter().filter_map(|(tool_name, tool)| {
-                        if profile.is_context_server_tool_enabled(&server_id.0, tool_name) {
-                            Some(tool)
-                        } else {
-                            None
-                        }
-                    })
-                },
-            )))
+            .collect::<BTreeMap<_, _>>();
+
+        let mut context_server_tools = Vec::new();
+        let mut seen_tools = tools.keys().cloned().collect::<HashSet<_>>();
+        let mut duplicate_tool_names = HashSet::default();
+        for (server_id, server_tools) in self.context_server_registry.read(cx).servers() {
+            for (tool_name, tool) in server_tools {
+                if profile.is_context_server_tool_enabled(&server_id.0, &tool_name) {
+                    let tool_name = truncate(tool_name);
+                    if !seen_tools.insert(tool_name.clone()) {
+                        duplicate_tool_names.insert(tool_name.clone());
+                    }
+                    context_server_tools.push((server_id.clone(), tool_name, tool.clone()));
+                }
+            }
+        }
+
+        // When there are duplicate tool names, disambiguate by prefixing them
+        // with the server ID. In the rare case there isn't enough space for the
+        // disambiguated tool name, keep only the last tool with this name.
+        for (server_id, tool_name, tool) in context_server_tools {
+            if duplicate_tool_names.contains(&tool_name) {
+                let available = MAX_TOOL_NAME_LENGTH.saturating_sub(tool_name.len());
+                if available >= 2 {
+                    let mut disambiguated = server_id.0.to_string();
+                    disambiguated.truncate(available - 1);
+                    disambiguated.push('_');
+                    disambiguated.push_str(&tool_name);
+                    tools.insert(disambiguated.into(), tool.clone());
+                } else {
+                    tools.insert(tool_name, tool.clone());
+                }
+            } else {
+                tools.insert(tool_name, tool.clone());
+            }
+        }
+
+        tools
+    }
+
+    fn tool(&self, name: &str) -> Option<Arc<dyn AnyAgentTool>> {
+        self.running_turn.as_ref()?.tools.get(name).cloned()
     }
 
     fn build_request_messages(&self, cx: &App) -> Vec<LanguageModelRequestMessage> {
@@ -1965,6 +2021,8 @@ struct RunningTurn {
     /// The current event stream for the running turn. Used to report a final
     /// cancellation event if we cancel the turn.
     event_stream: ThreadEventStream,
+    /// The tools that were enabled for this turn.
+    tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
 }
 
 impl RunningTurn {
diff --git a/crates/context_server/src/test.rs b/crates/context_server/src/test.rs
index dedf589664..008542ab24 100644
--- a/crates/context_server/src/test.rs
+++ b/crates/context_server/src/test.rs
@@ -1,6 +1,6 @@
 use anyhow::Context as _;
 use collections::HashMap;
-use futures::{Stream, StreamExt as _, lock::Mutex};
+use futures::{FutureExt, Stream, StreamExt as _, future::BoxFuture, lock::Mutex};
 use gpui::BackgroundExecutor;
 use std::{pin::Pin, sync::Arc};
 
@@ -14,9 +14,12 @@ pub fn create_fake_transport(
     executor: BackgroundExecutor,
 ) -> FakeTransport {
     let name = name.into();
-    FakeTransport::new(executor).on_request::<crate::types::requests::Initialize>(move |_params| {
-        create_initialize_response(name.clone())
-    })
+    FakeTransport::new(executor).on_request::<crate::types::requests::Initialize, _>(
+        move |_params| {
+            let name = name.clone();
+            async move { create_initialize_response(name.clone()) }
+        },
+    )
 }
 
 fn create_initialize_response(server_name: String) -> InitializeResponse {
@@ -32,8 +35,10 @@ fn create_initialize_response(server_name: String) -> InitializeResponse {
 }
 
 pub struct FakeTransport {
-    request_handlers:
-        HashMap<&'static str, Arc<dyn Fn(serde_json::Value) -> serde_json::Value + Send + Sync>>,
+    request_handlers: HashMap<
+        &'static str,
+        Arc<dyn Send + Sync + Fn(serde_json::Value) -> BoxFuture<'static, serde_json::Value>>,
+    >,
     tx: futures::channel::mpsc::UnboundedSender<String>,
     rx: Arc<Mutex<futures::channel::mpsc::UnboundedReceiver<String>>>,
     executor: BackgroundExecutor,
@@ -50,18 +55,25 @@ impl FakeTransport {
         }
     }
 
-    pub fn on_request<T: crate::types::Request>(
+    pub fn on_request<T, Fut>(
         mut self,
-        handler: impl Fn(T::Params) -> T::Response + Send + Sync + 'static,
-    ) -> Self {
+        handler: impl 'static + Send + Sync + Fn(T::Params) -> Fut,
+    ) -> Self
+    where
+        T: crate::types::Request,
+        Fut: 'static + Send + Future<Output = T::Response>,
+    {
         self.request_handlers.insert(
             T::METHOD,
             Arc::new(move |value| {
-                let params = value.get("params").expect("Missing parameters").clone();
+                let params = value
+                    .get("params")
+                    .cloned()
+                    .unwrap_or(serde_json::Value::Null);
                 let params: T::Params =
                     serde_json::from_value(params).expect("Invalid parameters received");
                 let response = handler(params);
-                serde_json::to_value(response).unwrap()
+                async move { serde_json::to_value(response.await).unwrap() }.boxed()
             }),
         );
         self
@@ -77,7 +89,7 @@ impl Transport for FakeTransport {
             if let Some(method) = msg.get("method") {
                 let method = method.as_str().expect("Invalid method received");
                 if let Some(handler) = self.request_handlers.get(method) {
-                    let payload = handler(msg);
+                    let payload = handler(msg).await;
                     let response = serde_json::json!({
                         "jsonrpc": "2.0",
                         "id": id,

From 54df43e06f5340c6e9ae5540550a3a2f102a521f Mon Sep 17 00:00:00 2001
From: Sarah Price <83782422+Louis454545@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:18:46 +0200
Subject: [PATCH 297/823] Fix cursor movement in protected files on
 backspace/delete (#36753)

## Summary

Fixes cursor movement behavior in protected files (like Default
Settings) when pressing backspace or delete keys.

Previously, these keys would cause unwanted cursor movement instead of
being ignored as expected in read-only files.

## Changes

- Added read-only checks to `backspace()` and `delete()` methods in the
editor
- Consistent with existing pattern used by other editing methods
(`indent()`, `outdent()`, `undo()`, etc.)

## Test Plan

1. Open Default Settings in Zed
2. Place cursor at arbitrary position (not at start/end of file)
3. Press backspace - cursor should remain in place (no movement)
4. Press delete - cursor should remain in place (no movement)

Fixes #36302

Release Notes:

- Fixed backspace and delete keys moving caret in protected files

Co-authored-by: Claude <noreply@anthropic.com>
---
 crates/editor/src/editor.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2af8e6c0e4..216aa2463b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9809,6 +9809,9 @@ impl Editor {
     }
 
     pub fn backspace(&mut self, _: &Backspace, window: &mut Window, cx: &mut Context<Self>) {
+        if self.read_only(cx) {
+            return;
+        }
         self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
         self.transact(window, cx, |this, window, cx| {
             this.select_autoclose_pair(window, cx);
@@ -9902,6 +9905,9 @@ impl Editor {
     }
 
     pub fn delete(&mut self, _: &Delete, window: &mut Window, cx: &mut Context<Self>) {
+        if self.read_only(cx) {
+            return;
+        }
         self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
         self.transact(window, cx, |this, window, cx| {
             this.change_selections(Default::default(), window, cx, |s| {

From 92bbcdeb7daeaaea5dbb2148a457861fa7947603 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:34:55 +0200
Subject: [PATCH 298/823] workspace: Do not prompt for hanging up current call
 when replacing last visible project (#36697)

This fixes a bug where in order to open a new project in a call (even if
it's not shared), you need to hang up.


Release Notes:

- N/A
---
 crates/workspace/src/workspace.rs | 50 ++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 499e4f4619..44aa94fe61 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2249,27 +2249,43 @@ impl Workspace {
             })?;
 
             if let Some(active_call) = active_call
-                && close_intent != CloseIntent::Quit
                 && workspace_count == 1
                 && active_call.read_with(cx, |call, _| call.room().is_some())?
             {
-                let answer = cx.update(|window, cx| {
-                    window.prompt(
-                        PromptLevel::Warning,
-                        "Do you want to leave the current call?",
-                        None,
-                        &["Close window and hang up", "Cancel"],
-                        cx,
-                    )
-                })?;
+                if close_intent == CloseIntent::CloseWindow {
+                    let answer = cx.update(|window, cx| {
+                        window.prompt(
+                            PromptLevel::Warning,
+                            "Do you want to leave the current call?",
+                            None,
+                            &["Close window and hang up", "Cancel"],
+                            cx,
+                        )
+                    })?;
 
-                if answer.await.log_err() == Some(1) {
-                    return anyhow::Ok(false);
-                } else {
-                    active_call
-                        .update(cx, |call, cx| call.hang_up(cx))?
-                        .await
-                        .log_err();
+                    if answer.await.log_err() == Some(1) {
+                        return anyhow::Ok(false);
+                    } else {
+                        active_call
+                            .update(cx, |call, cx| call.hang_up(cx))?
+                            .await
+                            .log_err();
+                    }
+                }
+                if close_intent == CloseIntent::ReplaceWindow {
+                    _ = active_call.update(cx, |this, cx| {
+                        let workspace = cx
+                            .windows()
+                            .iter()
+                            .filter_map(|window| window.downcast::<Workspace>())
+                            .next()
+                            .unwrap();
+                        let project = workspace.read(cx)?.project.clone();
+                        if project.read(cx).is_shared() {
+                            this.unshare_project(project, cx)?;
+                        }
+                        Ok::<_, anyhow::Error>(())
+                    })?;
                 }
             }
 

From 3d2fa72d1fcf177e2beee1433c97e3bfa7adc09a Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 22 Aug 2025 16:58:17 +0300
Subject: [PATCH 299/823] Make word completions less intrusive (#36745)

Introduce `min_words_query_len` threshold for automatic word completion
display, and set it to 3 by default.

Re-enable word completions in Markdown and Plaintext.

Release Notes:

- Introduced `min_words_query_len` threshold for automatic word
completion display, and set it to 3 by default to make them less
intrusive
---
 assets/settings/default.json                  | 11 ++--
 .../src/copilot_completion_provider.rs        |  2 +
 crates/editor/src/editor.rs                   | 35 ++++++++----
 crates/editor/src/editor_tests.rs             | 57 +++++++++++++++++++
 crates/language/src/language_settings.rs      | 13 ++++-
 docs/src/configuring-zed.md                   | 12 ++++
 6 files changed, 109 insertions(+), 21 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index c290baf003..014b483250 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1503,6 +1503,11 @@
     //
     // Default: fallback
     "words": "fallback",
+    // Minimum number of characters required to automatically trigger word-based completions.
+    // Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
+    //
+    // Default: 3
+    "words_min_length": 3,
     // Whether to fetch LSP completions or not.
     //
     // Default: true
@@ -1642,9 +1647,6 @@
       "use_on_type_format": false,
       "allow_rewrap": "anywhere",
       "soft_wrap": "editor_width",
-      "completions": {
-        "words": "disabled"
-      },
       "prettier": {
         "allowed": true
       }
@@ -1658,9 +1660,6 @@
       }
     },
     "Plain Text": {
-      "completions": {
-        "words": "disabled"
-      },
       "allow_rewrap": "anywhere"
     },
     "Python": {
diff --git a/crates/copilot/src/copilot_completion_provider.rs b/crates/copilot/src/copilot_completion_provider.rs
index 9308500ed4..52d75175e5 100644
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -301,6 +301,7 @@ mod tests {
         init_test(cx, |settings| {
             settings.defaults.completions = Some(CompletionSettings {
                 words: WordsCompletionMode::Disabled,
+                words_min_length: 0,
                 lsp: true,
                 lsp_fetch_timeout_ms: 0,
                 lsp_insert_mode: LspInsertMode::Insert,
@@ -533,6 +534,7 @@ mod tests {
         init_test(cx, |settings| {
             settings.defaults.completions = Some(CompletionSettings {
                 words: WordsCompletionMode::Disabled,
+                words_min_length: 0,
                 lsp: true,
                 lsp_fetch_timeout_ms: 0,
                 lsp_insert_mode: LspInsertMode::Insert,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 216aa2463b..a59eb930c3 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5576,6 +5576,11 @@ impl Editor {
             .as_ref()
             .is_none_or(|query| !query.chars().any(|c| c.is_digit(10)));
 
+        let omit_word_completions = match &query {
+            Some(query) => query.chars().count() < completion_settings.words_min_length,
+            None => completion_settings.words_min_length != 0,
+        };
+
         let (mut words, provider_responses) = match &provider {
             Some(provider) => {
                 let provider_responses = provider.completions(
@@ -5587,9 +5592,11 @@ impl Editor {
                     cx,
                 );
 
-                let words = match completion_settings.words {
-                    WordsCompletionMode::Disabled => Task::ready(BTreeMap::default()),
-                    WordsCompletionMode::Enabled | WordsCompletionMode::Fallback => cx
+                let words = match (omit_word_completions, completion_settings.words) {
+                    (true, _) | (_, WordsCompletionMode::Disabled) => {
+                        Task::ready(BTreeMap::default())
+                    }
+                    (false, WordsCompletionMode::Enabled | WordsCompletionMode::Fallback) => cx
                         .background_spawn(async move {
                             buffer_snapshot.words_in_range(WordsQuery {
                                 fuzzy_contents: None,
@@ -5601,16 +5608,20 @@ impl Editor {
 
                 (words, provider_responses)
             }
-            None => (
-                cx.background_spawn(async move {
-                    buffer_snapshot.words_in_range(WordsQuery {
-                        fuzzy_contents: None,
-                        range: word_search_range,
-                        skip_digits,
+            None => {
+                let words = if omit_word_completions {
+                    Task::ready(BTreeMap::default())
+                } else {
+                    cx.background_spawn(async move {
+                        buffer_snapshot.words_in_range(WordsQuery {
+                            fuzzy_contents: None,
+                            range: word_search_range,
+                            skip_digits,
+                        })
                     })
-                }),
-                Task::ready(Ok(Vec::new())),
-            ),
+                };
+                (words, Task::ready(Ok(Vec::new())))
+            }
         };
 
         let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 96261fdb2c..5b854e3a97 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -12237,6 +12237,7 @@ async fn test_completion_mode(cx: &mut TestAppContext) {
                 settings.defaults.completions = Some(CompletionSettings {
                     lsp_insert_mode,
                     words: WordsCompletionMode::Disabled,
+                    words_min_length: 0,
                     lsp: true,
                     lsp_fetch_timeout_ms: 0,
                 });
@@ -12295,6 +12296,7 @@ async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext)
     update_test_language_settings(&mut cx, |settings| {
         settings.defaults.completions = Some(CompletionSettings {
             words: WordsCompletionMode::Disabled,
+            words_min_length: 0,
             // set the opposite here to ensure that the action is overriding the default behavior
             lsp_insert_mode: LspInsertMode::Insert,
             lsp: true,
@@ -12331,6 +12333,7 @@ async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext)
     update_test_language_settings(&mut cx, |settings| {
         settings.defaults.completions = Some(CompletionSettings {
             words: WordsCompletionMode::Disabled,
+            words_min_length: 0,
             // set the opposite here to ensure that the action is overriding the default behavior
             lsp_insert_mode: LspInsertMode::Replace,
             lsp: true,
@@ -13072,6 +13075,7 @@ async fn test_word_completion(cx: &mut TestAppContext) {
     init_test(cx, |language_settings| {
         language_settings.defaults.completions = Some(CompletionSettings {
             words: WordsCompletionMode::Fallback,
+            words_min_length: 0,
             lsp: true,
             lsp_fetch_timeout_ms: 10,
             lsp_insert_mode: LspInsertMode::Insert,
@@ -13168,6 +13172,7 @@ async fn test_word_completions_do_not_duplicate_lsp_ones(cx: &mut TestAppContext
     init_test(cx, |language_settings| {
         language_settings.defaults.completions = Some(CompletionSettings {
             words: WordsCompletionMode::Enabled,
+            words_min_length: 0,
             lsp: true,
             lsp_fetch_timeout_ms: 0,
             lsp_insert_mode: LspInsertMode::Insert,
@@ -13231,6 +13236,7 @@ async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
     init_test(cx, |language_settings| {
         language_settings.defaults.completions = Some(CompletionSettings {
             words: WordsCompletionMode::Disabled,
+            words_min_length: 0,
             lsp: true,
             lsp_fetch_timeout_ms: 0,
             lsp_insert_mode: LspInsertMode::Insert,
@@ -13304,6 +13310,7 @@ async fn test_word_completions_usually_skip_digits(cx: &mut TestAppContext) {
     init_test(cx, |language_settings| {
         language_settings.defaults.completions = Some(CompletionSettings {
             words: WordsCompletionMode::Fallback,
+            words_min_length: 0,
             lsp: false,
             lsp_fetch_timeout_ms: 0,
             lsp_insert_mode: LspInsertMode::Insert,
@@ -13361,6 +13368,56 @@ async fn test_word_completions_usually_skip_digits(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_word_completions_do_not_show_before_threshold(cx: &mut TestAppContext) {
+    init_test(cx, |language_settings| {
+        language_settings.defaults.completions = Some(CompletionSettings {
+            words: WordsCompletionMode::Enabled,
+            words_min_length: 3,
+            lsp: true,
+            lsp_fetch_timeout_ms: 0,
+            lsp_insert_mode: LspInsertMode::Insert,
+        });
+    });
+
+    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
+    cx.set_state(indoc! {"ˇ
+        wow
+        wowen
+        wowser
+    "});
+    cx.simulate_keystroke("w");
+    cx.executor().run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        if editor.context_menu.borrow_mut().is_some() {
+            panic!(
+                "expected completion menu to be hidden, as words completion threshold is not met"
+            );
+        }
+    });
+
+    cx.simulate_keystroke("o");
+    cx.executor().run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        if editor.context_menu.borrow_mut().is_some() {
+            panic!(
+                "expected completion menu to be hidden, as words completion threshold is not met still"
+            );
+        }
+    });
+
+    cx.simulate_keystroke("w");
+    cx.executor().run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
+        {
+            assert_eq!(completion_menu_entries(menu), &["wowen", "wowser"], "After word completion threshold is met, matching words should be shown, excluding the already typed word");
+        } else {
+            panic!("expected completion menu to be open after the word completions threshold is met");
+        }
+    });
+}
+
 fn gen_text_edit(params: &CompletionParams, text: &str) -> Option<lsp::CompletionTextEdit> {
     let position = || lsp::Position {
         line: params.text_document_position.position.line,
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 386ad19747..0f82d3997f 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -350,6 +350,12 @@ pub struct CompletionSettings {
     /// Default: `fallback`
     #[serde(default = "default_words_completion_mode")]
     pub words: WordsCompletionMode,
+    /// How many characters has to be in the completions query to automatically show the words-based completions.
+    /// Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
+    ///
+    /// Default: 3
+    #[serde(default = "default_3")]
+    pub words_min_length: usize,
     /// Whether to fetch LSP completions or not.
     ///
     /// Default: true
@@ -359,7 +365,7 @@ pub struct CompletionSettings {
     /// When set to 0, waits indefinitely.
     ///
     /// Default: 0
-    #[serde(default = "default_lsp_fetch_timeout_ms")]
+    #[serde(default)]
     pub lsp_fetch_timeout_ms: u64,
     /// Controls how LSP completions are inserted.
     ///
@@ -405,8 +411,8 @@ fn default_lsp_insert_mode() -> LspInsertMode {
     LspInsertMode::ReplaceSuffix
 }
 
-fn default_lsp_fetch_timeout_ms() -> u64 {
-    0
+fn default_3() -> usize {
+    3
 }
 
 /// The settings for a particular language.
@@ -1468,6 +1474,7 @@ impl settings::Settings for AllLanguageSettings {
             } else {
                 d.completions = Some(CompletionSettings {
                     words: mode,
+                    words_min_length: 3,
                     lsp: true,
                     lsp_fetch_timeout_ms: 0,
                     lsp_insert_mode: LspInsertMode::ReplaceSuffix,
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 696370e310..fb139db6e4 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -2425,6 +2425,7 @@ Examples:
 {
   "completions": {
     "words": "fallback",
+    "words_min_length": 3,
     "lsp": true,
     "lsp_fetch_timeout_ms": 0,
     "lsp_insert_mode": "replace_suffix"
@@ -2444,6 +2445,17 @@ Examples:
 2. `fallback` - Only if LSP response errors or times out, use document's words to show completions
 3. `disabled` - Never fetch or complete document's words for completions (word-based completions can still be queried via a separate action)
 
+### Min Words Query Length
+
+- Description: Minimum number of characters required to automatically trigger word-based completions.
+  Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
+- Setting: `words_min_length`
+- Default: `3`
+
+**Options**
+
+Positive integer values
+
 ### LSP
 
 - Description: Whether to fetch LSP completions or not.

From 8204ef1e51cb89dc46415e5efe12c8705d51dfdf Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 22 Aug 2025 11:45:47 -0400
Subject: [PATCH 300/823] onboarding: Remove accept AI ToS from within Zed
 (#36612)

Users now accept ToS from Zed's website when they sign in to Zed the
first time. So it's no longer possible that a signed in account could
not have accepted the ToS.


Release Notes:

- N/A

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
---
 crates/agent_ui/src/active_thread.rs          |   5 -
 crates/agent_ui/src/agent_configuration.rs    |  10 +-
 crates/agent_ui/src/agent_panel.rs            |  15 +-
 crates/agent_ui/src/message_editor.rs         |   7 +-
 crates/agent_ui/src/text_thread_editor.rs     |  16 --
 crates/ai_onboarding/src/ai_onboarding.rs     |  77 +------
 crates/client/src/user.rs                     |  44 +---
 .../cloud_api_client/src/cloud_api_client.rs  |  28 ---
 crates/edit_prediction/src/edit_prediction.rs |   8 -
 .../src/edit_prediction_button.rs             |   8 +-
 crates/editor/src/editor.rs                   |  41 ----
 crates/language_model/src/language_model.rs   |  12 +-
 crates/language_model/src/registry.rs         |  12 -
 crates/language_models/src/provider/cloud.rs  | 213 ++----------------
 .../zed/src/zed/edit_prediction_registry.rs   |  25 --
 crates/zeta/src/zeta.rs                       |  22 +-
 16 files changed, 44 insertions(+), 499 deletions(-)

diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 2cad913295..e0cecad6e2 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1595,11 +1595,6 @@ impl ActiveThread {
             return;
         };
 
-        if model.provider.must_accept_terms(cx) {
-            cx.notify();
-            return;
-        }
-
         let edited_text = state.editor.read(cx).text(cx);
 
         let creases = state.editor.update(cx, extract_message_creases);
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 00e48efdac..f33f0ba032 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -93,14 +93,6 @@ impl AgentConfiguration {
         let scroll_handle = ScrollHandle::new();
         let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
 
-        let mut expanded_provider_configurations = HashMap::default();
-        if LanguageModelRegistry::read_global(cx)
-            .provider(&ZED_CLOUD_PROVIDER_ID)
-            .is_some_and(|cloud_provider| cloud_provider.must_accept_terms(cx))
-        {
-            expanded_provider_configurations.insert(ZED_CLOUD_PROVIDER_ID, true);
-        }
-
         let mut this = Self {
             fs,
             language_registry,
@@ -109,7 +101,7 @@ impl AgentConfiguration {
             configuration_views_by_provider: HashMap::default(),
             context_server_store,
             expanded_context_server_tools: HashMap::default(),
-            expanded_provider_configurations,
+            expanded_provider_configurations: HashMap::default(),
             tools,
             _registry_subscription: registry_subscription,
             scroll_handle,
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 469898d10f..d0fb676fd2 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -54,9 +54,7 @@ use gpui::{
     Pixels, Subscription, Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,
 };
 use language::LanguageRegistry;
-use language_model::{
-    ConfigurationError, ConfiguredModel, LanguageModelProviderTosView, LanguageModelRegistry,
-};
+use language_model::{ConfigurationError, ConfiguredModel, LanguageModelRegistry};
 use project::{DisableAiSettings, Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use rules_library::{RulesLibrary, open_rules_library};
@@ -3203,17 +3201,6 @@ impl AgentPanel {
             ConfigurationError::ModelNotFound
             | ConfigurationError::ProviderNotAuthenticated(_)
             | ConfigurationError::NoProvider => callout.into_any_element(),
-            ConfigurationError::ProviderPendingTermsAcceptance(provider) => {
-                Banner::new()
-                    .severity(Severity::Warning)
-                    .child(h_flex().w_full().children(
-                        provider.render_accept_terms(
-                            LanguageModelProviderTosView::ThreadEmptyState,
-                            cx,
-                        ),
-                    ))
-                    .into_any_element()
-            }
         }
     }
 
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index bed10e90a7..45e7529ec2 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -378,18 +378,13 @@ impl MessageEditor {
     }
 
     fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, provider }) = self
+        let Some(ConfiguredModel { model, .. }) = self
             .thread
             .update(cx, |thread, cx| thread.get_or_init_configured_model(cx))
         else {
             return;
         };
 
-        if provider.must_accept_terms(cx) {
-            cx.notify();
-            return;
-        }
-
         let (user_message, user_message_creases) = self.editor.update(cx, |editor, cx| {
             let creases = extract_message_creases(editor, cx);
             let text = editor.text(cx);
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 9fbd90c4a6..edb672a872 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -190,7 +190,6 @@ pub struct TextThreadEditor {
     invoked_slash_command_creases: HashMap<InvokedSlashCommandId, CreaseId>,
     _subscriptions: Vec<Subscription>,
     last_error: Option<AssistError>,
-    show_accept_terms: bool,
     pub(crate) slash_menu_handle:
         PopoverMenuHandle<Picker<slash_command_picker::SlashCommandDelegate>>,
     // dragged_file_worktrees is used to keep references to worktrees that were added
@@ -289,7 +288,6 @@ impl TextThreadEditor {
             invoked_slash_command_creases: HashMap::default(),
             _subscriptions,
             last_error: None,
-            show_accept_terms: false,
             slash_menu_handle: Default::default(),
             dragged_file_worktrees: Vec::new(),
             language_model_selector: cx.new(|cx| {
@@ -367,20 +365,7 @@ impl TextThreadEditor {
     }
 
     fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
-        if provider
-            .as_ref()
-            .is_some_and(|provider| provider.must_accept_terms(cx))
-        {
-            self.show_accept_terms = true;
-            cx.notify();
-            return;
-        }
-
         self.last_error = None;
-
         if let Some(user_message) = self.context.update(cx, |context, cx| context.assist(cx)) {
             let new_selection = {
                 let cursor = user_message
@@ -1930,7 +1915,6 @@ impl TextThreadEditor {
             ConfigurationError::NoProvider
             | ConfigurationError::ModelNotFound
             | ConfigurationError::ProviderNotAuthenticated(_) => true,
-            ConfigurationError::ProviderPendingTermsAcceptance(_) => self.show_accept_terms,
         }
     }
 
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index 717abebfd1..6d8ac64725 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -19,7 +19,7 @@ use std::sync::Arc;
 
 use client::{Client, UserStore, zed_urls};
 use gpui::{AnyElement, Entity, IntoElement, ParentElement};
-use ui::{Divider, RegisterComponent, TintColor, Tooltip, prelude::*};
+use ui::{Divider, RegisterComponent, Tooltip, prelude::*};
 
 #[derive(PartialEq)]
 pub enum SignInStatus {
@@ -43,12 +43,10 @@ impl From<client::Status> for SignInStatus {
 #[derive(RegisterComponent, IntoElement)]
 pub struct ZedAiOnboarding {
     pub sign_in_status: SignInStatus,
-    pub has_accepted_terms_of_service: bool,
     pub plan: Option<Plan>,
     pub account_too_young: bool,
     pub continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
     pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub accept_terms_of_service: Arc<dyn Fn(&mut Window, &mut App)>,
     pub dismiss_onboarding: Option<Arc<dyn Fn(&mut Window, &mut App)>>,
 }
 
@@ -64,17 +62,9 @@ impl ZedAiOnboarding {
 
         Self {
             sign_in_status: status.into(),
-            has_accepted_terms_of_service: store.has_accepted_terms_of_service(),
             plan: store.plan(),
             account_too_young: store.account_too_young(),
             continue_with_zed_ai,
-            accept_terms_of_service: Arc::new({
-                let store = user_store.clone();
-                move |_window, cx| {
-                    let task = store.update(cx, |store, cx| store.accept_terms_of_service(cx));
-                    task.detach_and_log_err(cx);
-                }
-            }),
             sign_in: Arc::new(move |_window, cx| {
                 cx.spawn({
                     let client = client.clone();
@@ -94,42 +84,6 @@ impl ZedAiOnboarding {
         self
     }
 
-    fn render_accept_terms_of_service(&self) -> AnyElement {
-        v_flex()
-            .gap_1()
-            .w_full()
-            .child(Headline::new("Accept Terms of Service"))
-            .child(
-                Label::new("We don’t sell your data, track you across the web, or compromise your privacy.")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(
-                Button::new("terms_of_service", "Review Terms of Service")
-                    .full_width()
-                    .style(ButtonStyle::Outlined)
-                    .icon(IconName::ArrowUpRight)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small)
-                    .on_click(move |_, _window, cx| {
-                        telemetry::event!("Review Terms of Service Clicked");
-                        cx.open_url(&zed_urls::terms_of_service(cx))
-                    }),
-            )
-            .child(
-                Button::new("accept_terms", "Accept")
-                    .full_width()
-                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                    .on_click({
-                        let callback = self.accept_terms_of_service.clone();
-                        move |_, window, cx| {
-                            telemetry::event!("Terms of Service Accepted");
-                            (callback)(window, cx)}
-                    }),
-            )
-            .into_any_element()
-    }
-
     fn render_sign_in_disclaimer(&self, _cx: &mut App) -> AnyElement {
         let signing_in = matches!(self.sign_in_status, SignInStatus::SigningIn);
         let plan_definitions = PlanDefinitions;
@@ -359,14 +313,10 @@ impl ZedAiOnboarding {
 impl RenderOnce for ZedAiOnboarding {
     fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
         if matches!(self.sign_in_status, SignInStatus::SignedIn) {
-            if self.has_accepted_terms_of_service {
-                match self.plan {
-                    None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
-                    Some(Plan::ZedProTrial) => self.render_trial_state(cx),
-                    Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
-                }
-            } else {
-                self.render_accept_terms_of_service()
+            match self.plan {
+                None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
+                Some(Plan::ZedProTrial) => self.render_trial_state(cx),
+                Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
             }
         } else {
             self.render_sign_in_disclaimer(cx)
@@ -390,18 +340,15 @@ impl Component for ZedAiOnboarding {
     fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
         fn onboarding(
             sign_in_status: SignInStatus,
-            has_accepted_terms_of_service: bool,
             plan: Option<Plan>,
             account_too_young: bool,
         ) -> AnyElement {
             ZedAiOnboarding {
                 sign_in_status,
-                has_accepted_terms_of_service,
                 plan,
                 account_too_young,
                 continue_with_zed_ai: Arc::new(|_, _| {}),
                 sign_in: Arc::new(|_, _| {}),
-                accept_terms_of_service: Arc::new(|_, _| {}),
                 dismiss_onboarding: None,
             }
             .into_any_element()
@@ -415,27 +362,23 @@ impl Component for ZedAiOnboarding {
                 .children(vec![
                     single_example(
                         "Not Signed-in",
-                        onboarding(SignInStatus::SignedOut, false, None, false),
-                    ),
-                    single_example(
-                        "Not Accepted ToS",
-                        onboarding(SignInStatus::SignedIn, false, None, false),
+                        onboarding(SignInStatus::SignedOut, None, false),
                     ),
                     single_example(
                         "Young Account",
-                        onboarding(SignInStatus::SignedIn, true, None, true),
+                        onboarding(SignInStatus::SignedIn, None, true),
                     ),
                     single_example(
                         "Free Plan",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedFree), false),
+                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedFree), false),
                     ),
                     single_example(
                         "Pro Trial",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedProTrial), false),
+                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedProTrial), false),
                     ),
                     single_example(
                         "Pro Plan",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedPro), false),
+                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedPro), false),
                     ),
                 ])
                 .into_any_element(),
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 20f99e3944..1f8174dbc3 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -1,5 +1,5 @@
 use super::{Client, Status, TypedEnvelope, proto};
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, Result};
 use chrono::{DateTime, Utc};
 use cloud_api_client::websocket_protocol::MessageToClient;
 use cloud_api_client::{GetAuthenticatedUserResponse, PlanInfo};
@@ -116,7 +116,6 @@ pub struct UserStore {
     edit_prediction_usage: Option<EditPredictionUsage>,
     plan_info: Option<PlanInfo>,
     current_user: watch::Receiver<Option<Arc<User>>>,
-    accepted_tos_at: Option<Option<cloud_api_client::Timestamp>>,
     contacts: Vec<Arc<Contact>>,
     incoming_contact_requests: Vec<Arc<User>>,
     outgoing_contact_requests: Vec<Arc<User>>,
@@ -194,7 +193,6 @@ impl UserStore {
             plan_info: None,
             model_request_usage: None,
             edit_prediction_usage: None,
-            accepted_tos_at: None,
             contacts: Default::default(),
             incoming_contact_requests: Default::default(),
             participant_indices: Default::default(),
@@ -271,7 +269,6 @@ impl UserStore {
                         Status::SignedOut => {
                             current_user_tx.send(None).await.ok();
                             this.update(cx, |this, cx| {
-                                this.accepted_tos_at = None;
                                 cx.emit(Event::PrivateUserInfoUpdated);
                                 cx.notify();
                                 this.clear_contacts()
@@ -791,19 +788,6 @@ impl UserStore {
                 .set_authenticated_user_info(Some(response.user.metrics_id.clone()), staff);
         }
 
-        let accepted_tos_at = {
-            #[cfg(debug_assertions)]
-            if std::env::var("ZED_IGNORE_ACCEPTED_TOS").is_ok() {
-                None
-            } else {
-                response.user.accepted_tos_at
-            }
-
-            #[cfg(not(debug_assertions))]
-            response.user.accepted_tos_at
-        };
-
-        self.accepted_tos_at = Some(accepted_tos_at);
         self.model_request_usage = Some(ModelRequestUsage(RequestUsage {
             limit: response.plan.usage.model_requests.limit,
             amount: response.plan.usage.model_requests.used as i32,
@@ -846,32 +830,6 @@ impl UserStore {
         self.current_user.clone()
     }
 
-    pub fn has_accepted_terms_of_service(&self) -> bool {
-        self.accepted_tos_at
-            .is_some_and(|accepted_tos_at| accepted_tos_at.is_some())
-    }
-
-    pub fn accept_terms_of_service(&self, cx: &Context<Self>) -> Task<Result<()>> {
-        if self.current_user().is_none() {
-            return Task::ready(Err(anyhow!("no current user")));
-        };
-
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| -> anyhow::Result<()> {
-            let client = client.upgrade().context("client not found")?;
-            let response = client
-                .cloud_client()
-                .accept_terms_of_service()
-                .await
-                .context("error accepting tos")?;
-            this.update(cx, |this, cx| {
-                this.accepted_tos_at = Some(response.user.accepted_tos_at);
-                cx.emit(Event::PrivateUserInfoUpdated);
-            })?;
-            Ok(())
-        })
-    }
-
     fn load_users(
         &self,
         request: impl RequestMessage<Response = UsersResponse>,
diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
index 205f3e2432..7fd96fcef0 100644
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@@ -115,34 +115,6 @@ impl CloudApiClient {
         }))
     }
 
-    pub async fn accept_terms_of_service(&self) -> Result<AcceptTermsOfServiceResponse> {
-        let request = self.build_request(
-            Request::builder().method(Method::POST).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/terms_of_service/accept", &[])?
-                    .as_ref(),
-            ),
-            AsyncBody::default(),
-        )?;
-
-        let mut response = self.http_client.send(request).await?;
-
-        if !response.status().is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-
-            anyhow::bail!(
-                "Failed to accept terms of service.\nStatus: {:?}\nBody: {body}",
-                response.status()
-            )
-        }
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        Ok(serde_json::from_str(&body)?)
-    }
-
     pub async fn create_llm_token(
         &self,
         system_id: Option<String>,
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 964f202934..6b695af1ae 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -89,9 +89,6 @@ pub trait EditPredictionProvider: 'static + Sized {
         debounce: bool,
         cx: &mut Context<Self>,
     );
-    fn needs_terms_acceptance(&self, _cx: &App) -> bool {
-        false
-    }
     fn cycle(
         &mut self,
         buffer: Entity<Buffer>,
@@ -124,7 +121,6 @@ pub trait EditPredictionProviderHandle {
     fn data_collection_state(&self, cx: &App) -> DataCollectionState;
     fn usage(&self, cx: &App) -> Option<EditPredictionUsage>;
     fn toggle_data_collection(&self, cx: &mut App);
-    fn needs_terms_acceptance(&self, cx: &App) -> bool;
     fn is_refreshing(&self, cx: &App) -> bool;
     fn refresh(
         &self,
@@ -196,10 +192,6 @@ where
         self.read(cx).is_enabled(buffer, cursor_position, cx)
     }
 
-    fn needs_terms_acceptance(&self, cx: &App) -> bool {
-        self.read(cx).needs_terms_acceptance(cx)
-    }
-
     fn is_refreshing(&self, cx: &App) -> bool {
         self.read(cx).is_refreshing()
     }
diff --git a/crates/edit_prediction_button/src/edit_prediction_button.rs b/crates/edit_prediction_button/src/edit_prediction_button.rs
index 4f69af7ee4..0e3fe8cb1a 100644
--- a/crates/edit_prediction_button/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_button/src/edit_prediction_button.rs
@@ -242,13 +242,9 @@ impl Render for EditPredictionButton {
                     IconName::ZedPredictDisabled
                 };
 
-                if zeta::should_show_upsell_modal(&self.user_store, cx) {
+                if zeta::should_show_upsell_modal() {
                     let tooltip_meta = if self.user_store.read(cx).current_user().is_some() {
-                        if self.user_store.read(cx).has_accepted_terms_of_service() {
-                            "Choose a Plan"
-                        } else {
-                            "Accept the Terms of Service"
-                        }
+                        "Choose a Plan"
                     } else {
                         "Sign In"
                     };
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a59eb930c3..29e009fdf8 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -253,7 +253,6 @@ pub type RenderDiffHunkControlsFn = Arc<
 enum ReportEditorEvent {
     Saved { auto_saved: bool },
     EditorOpened,
-    ZetaTosClicked,
     Closed,
 }
 
@@ -262,7 +261,6 @@ impl ReportEditorEvent {
         match self {
             Self::Saved { .. } => "Editor Saved",
             Self::EditorOpened => "Editor Opened",
-            Self::ZetaTosClicked => "Edit Prediction Provider ToS Clicked",
             Self::Closed => "Editor Closed",
         }
     }
@@ -9180,45 +9178,6 @@ impl Editor {
         let provider = self.edit_prediction_provider.as_ref()?;
         let provider_icon = Self::get_prediction_provider_icon_name(&self.edit_prediction_provider);
 
-        if provider.provider.needs_terms_acceptance(cx) {
-            return Some(
-                h_flex()
-                    .min_w(min_width)
-                    .flex_1()
-                    .px_2()
-                    .py_1()
-                    .gap_3()
-                    .elevation_2(cx)
-                    .hover(|style| style.bg(cx.theme().colors().element_hover))
-                    .id("accept-terms")
-                    .cursor_pointer()
-                    .on_mouse_down(MouseButton::Left, |_, window, _| window.prevent_default())
-                    .on_click(cx.listener(|this, _event, window, cx| {
-                        cx.stop_propagation();
-                        this.report_editor_event(ReportEditorEvent::ZetaTosClicked, None, cx);
-                        window.dispatch_action(
-                            zed_actions::OpenZedPredictOnboarding.boxed_clone(),
-                            cx,
-                        );
-                    }))
-                    .child(
-                        h_flex()
-                            .flex_1()
-                            .gap_2()
-                            .child(Icon::new(provider_icon))
-                            .child(Label::new("Accept Terms of Service"))
-                            .child(div().w_full())
-                            .child(
-                                Icon::new(IconName::ArrowUpRight)
-                                    .color(Color::Muted)
-                                    .size(IconSize::Small),
-                            )
-                            .into_any_element(),
-                    )
-                    .into_any(),
-            );
-        }
-
         let is_refreshing = provider.provider.is_refreshing(cx);
 
         fn pending_completion_container(icon: IconName) -> Div {
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index 158bebcbbf..e0a3866443 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -14,7 +14,7 @@ use client::Client;
 use cloud_llm_client::{CompletionMode, CompletionRequestStatus};
 use futures::FutureExt;
 use futures::{StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyElement, AnyView, App, AsyncApp, SharedString, Task, Window};
+use gpui::{AnyView, App, AsyncApp, SharedString, Task, Window};
 use http_client::{StatusCode, http};
 use icons::IconName;
 use parking_lot::Mutex;
@@ -640,16 +640,6 @@ pub trait LanguageModelProvider: 'static {
         window: &mut Window,
         cx: &mut App,
     ) -> AnyView;
-    fn must_accept_terms(&self, _cx: &App) -> bool {
-        false
-    }
-    fn render_accept_terms(
-        &self,
-        _view: LanguageModelProviderTosView,
-        _cx: &mut App,
-    ) -> Option<AnyElement> {
-        None
-    }
     fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
 }
 
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index bcbb3404a8..c7693a64c7 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -24,9 +24,6 @@ pub enum ConfigurationError {
     ModelNotFound,
     #[error("{} LLM provider is not configured.", .0.name().0)]
     ProviderNotAuthenticated(Arc<dyn LanguageModelProvider>),
-    #[error("Using the {} LLM provider requires accepting the Terms of Service.",
-    .0.name().0)]
-    ProviderPendingTermsAcceptance(Arc<dyn LanguageModelProvider>),
 }
 
 impl std::fmt::Debug for ConfigurationError {
@@ -37,9 +34,6 @@ impl std::fmt::Debug for ConfigurationError {
             Self::ProviderNotAuthenticated(provider) => {
                 write!(f, "ProviderNotAuthenticated({})", provider.id())
             }
-            Self::ProviderPendingTermsAcceptance(provider) => {
-                write!(f, "ProviderPendingTermsAcceptance({})", provider.id())
-            }
         }
     }
 }
@@ -198,12 +192,6 @@ impl LanguageModelRegistry {
             return Some(ConfigurationError::ProviderNotAuthenticated(model.provider));
         }
 
-        if model.provider.must_accept_terms(cx) {
-            return Some(ConfigurationError::ProviderPendingTermsAcceptance(
-                model.provider,
-            ));
-        }
-
         None
     }
 
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index 8e4b786935..fb6e2fb1e4 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -23,9 +23,9 @@ use language_model::{
     AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
     LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
     LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelProviderTosView, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolSchemaFormat, LlmApiToken,
-    ModelRequestLimitReachedError, PaymentRequiredError, RateLimiter, RefreshLlmTokenListener,
+    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+    LanguageModelToolSchemaFormat, LlmApiToken, ModelRequestLimitReachedError,
+    PaymentRequiredError, RateLimiter, RefreshLlmTokenListener,
 };
 use release_channel::AppVersion;
 use schemars::JsonSchema;
@@ -118,7 +118,6 @@ pub struct State {
     llm_api_token: LlmApiToken,
     user_store: Entity<UserStore>,
     status: client::Status,
-    accept_terms_of_service_task: Option<Task<Result<()>>>,
     models: Vec<Arc<cloud_llm_client::LanguageModel>>,
     default_model: Option<Arc<cloud_llm_client::LanguageModel>>,
     default_fast_model: Option<Arc<cloud_llm_client::LanguageModel>>,
@@ -142,7 +141,6 @@ impl State {
             llm_api_token: LlmApiToken::default(),
             user_store,
             status,
-            accept_terms_of_service_task: None,
             models: Vec::new(),
             default_model: None,
             default_fast_model: None,
@@ -197,24 +195,6 @@ impl State {
             state.update(cx, |_, cx| cx.notify())
         })
     }
-
-    fn has_accepted_terms_of_service(&self, cx: &App) -> bool {
-        self.user_store.read(cx).has_accepted_terms_of_service()
-    }
-
-    fn accept_terms_of_service(&mut self, cx: &mut Context<Self>) {
-        let user_store = self.user_store.clone();
-        self.accept_terms_of_service_task = Some(cx.spawn(async move |this, cx| {
-            let _ = user_store
-                .update(cx, |store, cx| store.accept_terms_of_service(cx))?
-                .await;
-            this.update(cx, |this, cx| {
-                this.accept_terms_of_service_task = None;
-                cx.notify()
-            })
-        }));
-    }
-
     fn update_models(&mut self, response: ListModelsResponse, cx: &mut Context<Self>) {
         let mut models = Vec::new();
 
@@ -384,7 +364,7 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
 
     fn is_authenticated(&self, cx: &App) -> bool {
         let state = self.state.read(cx);
-        !state.is_signed_out(cx) && state.has_accepted_terms_of_service(cx)
+        !state.is_signed_out(cx)
     }
 
     fn authenticate(&self, _cx: &mut App) -> Task<Result<(), AuthenticateError>> {
@@ -401,112 +381,11 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
             .into()
     }
 
-    fn must_accept_terms(&self, cx: &App) -> bool {
-        !self.state.read(cx).has_accepted_terms_of_service(cx)
-    }
-
-    fn render_accept_terms(
-        &self,
-        view: LanguageModelProviderTosView,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let state = self.state.read(cx);
-        if state.has_accepted_terms_of_service(cx) {
-            return None;
-        }
-        Some(
-            render_accept_terms(view, state.accept_terms_of_service_task.is_some(), {
-                let state = self.state.clone();
-                move |_window, cx| {
-                    state.update(cx, |state, cx| state.accept_terms_of_service(cx));
-                }
-            })
-            .into_any_element(),
-        )
-    }
-
     fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
         Task::ready(Ok(()))
     }
 }
 
-fn render_accept_terms(
-    view_kind: LanguageModelProviderTosView,
-    accept_terms_of_service_in_progress: bool,
-    accept_terms_callback: impl Fn(&mut Window, &mut App) + 'static,
-) -> impl IntoElement {
-    let thread_fresh_start = matches!(view_kind, LanguageModelProviderTosView::ThreadFreshStart);
-    let thread_empty_state = matches!(view_kind, LanguageModelProviderTosView::ThreadEmptyState);
-
-    let terms_button = Button::new("terms_of_service", "Terms of Service")
-        .style(ButtonStyle::Subtle)
-        .icon(IconName::ArrowUpRight)
-        .icon_color(Color::Muted)
-        .icon_size(IconSize::Small)
-        .when(thread_empty_state, |this| this.label_size(LabelSize::Small))
-        .on_click(move |_, _window, cx| cx.open_url("https://zed.dev/terms-of-service"));
-
-    let button_container = h_flex().child(
-        Button::new("accept_terms", "I accept the Terms of Service")
-            .when(!thread_empty_state, |this| {
-                this.full_width()
-                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                    .icon(IconName::Check)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::Small)
-            })
-            .when(thread_empty_state, |this| {
-                this.style(ButtonStyle::Tinted(TintColor::Warning))
-                    .label_size(LabelSize::Small)
-            })
-            .disabled(accept_terms_of_service_in_progress)
-            .on_click(move |_, window, cx| (accept_terms_callback)(window, cx)),
-    );
-
-    if thread_empty_state {
-        h_flex()
-            .w_full()
-            .flex_wrap()
-            .justify_between()
-            .child(
-                h_flex()
-                    .child(
-                        Label::new("To start using Zed AI, please read and accept the")
-                            .size(LabelSize::Small),
-                    )
-                    .child(terms_button),
-            )
-            .child(button_container)
-    } else {
-        v_flex()
-            .w_full()
-            .gap_2()
-            .child(
-                h_flex()
-                    .flex_wrap()
-                    .when(thread_fresh_start, |this| this.justify_center())
-                    .child(Label::new(
-                        "To start using Zed AI, please read and accept the",
-                    ))
-                    .child(terms_button),
-            )
-            .child({
-                match view_kind {
-                    LanguageModelProviderTosView::TextThreadPopup => {
-                        button_container.w_full().justify_end()
-                    }
-                    LanguageModelProviderTosView::Configuration => {
-                        button_container.w_full().justify_start()
-                    }
-                    LanguageModelProviderTosView::ThreadFreshStart => {
-                        button_container.w_full().justify_center()
-                    }
-                    LanguageModelProviderTosView::ThreadEmptyState => div().w_0(),
-                }
-            })
-    }
-}
-
 pub struct CloudLanguageModel {
     id: LanguageModelId,
     model: Arc<cloud_llm_client::LanguageModel>,
@@ -1107,10 +986,7 @@ struct ZedAiConfiguration {
     plan: Option<Plan>,
     subscription_period: Option<(DateTime<Utc>, DateTime<Utc>)>,
     eligible_for_trial: bool,
-    has_accepted_terms_of_service: bool,
     account_too_young: bool,
-    accept_terms_of_service_in_progress: bool,
-    accept_terms_of_service_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
     sign_in_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
 }
 
@@ -1176,58 +1052,30 @@ impl RenderOnce for ZedAiConfiguration {
                 );
         }
 
-        v_flex()
-            .gap_2()
-            .w_full()
-            .when(!self.has_accepted_terms_of_service, |this| {
-                this.child(render_accept_terms(
-                    LanguageModelProviderTosView::Configuration,
-                    self.accept_terms_of_service_in_progress,
-                    {
-                        let callback = self.accept_terms_of_service_callback.clone();
-                        move |window, cx| (callback)(window, cx)
-                    },
-                ))
-            })
-            .map(|this| {
-                if self.has_accepted_terms_of_service && self.account_too_young {
-                    this.child(young_account_banner).child(
-                        Button::new("upgrade", "Upgrade to Pro")
-                            .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
-                            .full_width()
-                            .on_click(|_, _, cx| {
-                                cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))
-                            }),
-                    )
-                } else if self.has_accepted_terms_of_service {
-                    this.text_sm()
-                        .child(subscription_text)
-                        .child(manage_subscription_buttons)
-                } else {
-                    this
-                }
-            })
-            .when(self.has_accepted_terms_of_service, |this| this)
+        v_flex().gap_2().w_full().map(|this| {
+            if self.account_too_young {
+                this.child(young_account_banner).child(
+                    Button::new("upgrade", "Upgrade to Pro")
+                        .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
+                        .full_width()
+                        .on_click(|_, _, cx| cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))),
+                )
+            } else {
+                this.text_sm()
+                    .child(subscription_text)
+                    .child(manage_subscription_buttons)
+            }
+        })
     }
 }
 
 struct ConfigurationView {
     state: Entity<State>,
-    accept_terms_of_service_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
     sign_in_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
 }
 
 impl ConfigurationView {
     fn new(state: Entity<State>) -> Self {
-        let accept_terms_of_service_callback = Arc::new({
-            let state = state.clone();
-            move |_window: &mut Window, cx: &mut App| {
-                state.update(cx, |state, cx| {
-                    state.accept_terms_of_service(cx);
-                });
-            }
-        });
-
         let sign_in_callback = Arc::new({
             let state = state.clone();
             move |_window: &mut Window, cx: &mut App| {
@@ -1239,7 +1087,6 @@ impl ConfigurationView {
 
         Self {
             state,
-            accept_terms_of_service_callback,
             sign_in_callback,
         }
     }
@@ -1255,10 +1102,7 @@ impl Render for ConfigurationView {
             plan: user_store.plan(),
             subscription_period: user_store.subscription_period(),
             eligible_for_trial: user_store.trial_started_at().is_none(),
-            has_accepted_terms_of_service: state.has_accepted_terms_of_service(cx),
             account_too_young: user_store.account_too_young(),
-            accept_terms_of_service_in_progress: state.accept_terms_of_service_task.is_some(),
-            accept_terms_of_service_callback: self.accept_terms_of_service_callback.clone(),
             sign_in_callback: self.sign_in_callback.clone(),
         }
     }
@@ -1283,7 +1127,6 @@ impl Component for ZedAiConfiguration {
             plan: Option<Plan>,
             eligible_for_trial: bool,
             account_too_young: bool,
-            has_accepted_terms_of_service: bool,
         ) -> AnyElement {
             ZedAiConfiguration {
                 is_connected,
@@ -1292,10 +1135,7 @@ impl Component for ZedAiConfiguration {
                     .is_some()
                     .then(|| (Utc::now(), Utc::now() + chrono::Duration::days(7))),
                 eligible_for_trial,
-                has_accepted_terms_of_service,
                 account_too_young,
-                accept_terms_of_service_in_progress: false,
-                accept_terms_of_service_callback: Arc::new(|_, _| {}),
                 sign_in_callback: Arc::new(|_, _| {}),
             }
             .into_any_element()
@@ -1306,33 +1146,30 @@ impl Component for ZedAiConfiguration {
                 .p_4()
                 .gap_4()
                 .children(vec![
-                    single_example(
-                        "Not connected",
-                        configuration(false, None, false, false, true),
-                    ),
+                    single_example("Not connected", configuration(false, None, false, false)),
                     single_example(
                         "Accept Terms of Service",
-                        configuration(true, None, true, false, false),
+                        configuration(true, None, true, false),
                     ),
                     single_example(
                         "No Plan - Not eligible for trial",
-                        configuration(true, None, false, false, true),
+                        configuration(true, None, false, false),
                     ),
                     single_example(
                         "No Plan - Eligible for trial",
-                        configuration(true, None, true, false, true),
+                        configuration(true, None, true, false),
                     ),
                     single_example(
                         "Free Plan",
-                        configuration(true, Some(Plan::ZedFree), true, false, true),
+                        configuration(true, Some(Plan::ZedFree), true, false),
                     ),
                     single_example(
                         "Zed Pro Trial Plan",
-                        configuration(true, Some(Plan::ZedProTrial), true, false, true),
+                        configuration(true, Some(Plan::ZedProTrial), true, false),
                     ),
                     single_example(
                         "Zed Pro Plan",
-                        configuration(true, Some(Plan::ZedPro), true, false, true),
+                        configuration(true, Some(Plan::ZedPro), true, false),
                     ),
                 ])
                 .into_any_element(),
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index a9abd9bc74..bc2d757fd1 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -75,13 +75,10 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
             let new_provider = all_language_settings(None, cx).edit_predictions.provider;
 
             if new_provider != provider {
-                let tos_accepted = user_store.read(cx).has_accepted_terms_of_service();
-
                 telemetry::event!(
                     "Edit Prediction Provider Changed",
                     from = provider,
                     to = new_provider,
-                    zed_ai_tos_accepted = tos_accepted,
                 );
 
                 provider = new_provider;
@@ -92,28 +89,6 @@ pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
                     user_store.clone(),
                     cx,
                 );
-
-                if !tos_accepted {
-                    match provider {
-                        EditPredictionProvider::Zed => {
-                            let Some(window) = cx.active_window() else {
-                                return;
-                            };
-
-                            window
-                                .update(cx, |_, window, cx| {
-                                    window.dispatch_action(
-                                        Box::new(zed_actions::OpenZedPredictOnboarding),
-                                        cx,
-                                    );
-                                })
-                                .ok();
-                        }
-                        EditPredictionProvider::None
-                        | EditPredictionProvider::Copilot
-                        | EditPredictionProvider::Supermaven => {}
-                    }
-                }
             }
         }
     })
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 916699d29b..7b14d12796 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -118,12 +118,8 @@ impl Dismissable for ZedPredictUpsell {
     }
 }
 
-pub fn should_show_upsell_modal(user_store: &Entity<UserStore>, cx: &App) -> bool {
-    if user_store.read(cx).has_accepted_terms_of_service() {
-        !ZedPredictUpsell::dismissed()
-    } else {
-        true
-    }
+pub fn should_show_upsell_modal() -> bool {
+    !ZedPredictUpsell::dismissed()
 }
 
 #[derive(Clone)]
@@ -1547,16 +1543,6 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
     ) -> bool {
         true
     }
-
-    fn needs_terms_acceptance(&self, cx: &App) -> bool {
-        !self
-            .zeta
-            .read(cx)
-            .user_store
-            .read(cx)
-            .has_accepted_terms_of_service()
-    }
-
     fn is_refreshing(&self) -> bool {
         !self.pending_completions.is_empty()
     }
@@ -1569,10 +1555,6 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
         _debounce: bool,
         cx: &mut Context<Self>,
     ) {
-        if self.needs_terms_acceptance(cx) {
-            return;
-        }
-
         if self.zeta.read(cx).update_required {
             return;
         }

From ac9fdaa1dad22e67731315f972177d860278600f Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 22 Aug 2025 11:51:01 -0400
Subject: [PATCH 301/823] onboarding: Improve Windows/Linux keyboard shortcuts;
 example ligature (#36712)

Small fixes to onboarding.
Correct ligature example.
Replace`ctrl-escape` and `alt-tab` since they are reserved on windows
(and often on linux) and so are caught by the OS.

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json     | 5 ++---
 crates/onboarding/src/editing_page.rs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 955e68f5a9..fdc1403eb8 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -16,7 +16,6 @@
       "up": "menu::SelectPrevious",
       "enter": "menu::Confirm",
       "ctrl-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
       "ctrl-c": "menu::Cancel",
       "escape": "menu::Cancel",
       "alt-shift-enter": "menu::Restart",
@@ -1195,8 +1194,8 @@
       "ctrl-1": "onboarding::ActivateBasicsPage",
       "ctrl-2": "onboarding::ActivateEditingPage",
       "ctrl-3": "onboarding::ActivateAISetupPage",
-      "ctrl-escape": "onboarding::Finish",
-      "alt-tab": "onboarding::SignIn",
+      "ctrl-enter": "onboarding::Finish",
+      "alt-shift-l": "onboarding::SignIn",
       "alt-shift-a": "onboarding::OpenAccount"
     }
   }
diff --git a/crates/onboarding/src/editing_page.rs b/crates/onboarding/src/editing_page.rs
index 8fae695854..47dfd84894 100644
--- a/crates/onboarding/src/editing_page.rs
+++ b/crates/onboarding/src/editing_page.rs
@@ -606,7 +606,7 @@ fn render_popular_settings_section(
     cx: &mut App,
 ) -> impl IntoElement {
     const LIGATURE_TOOLTIP: &str =
-        "Font ligatures combine two characters into one. For example, turning =/= into ≠.";
+        "Font ligatures combine two characters into one. For example, turning != into ≠.";
 
     v_flex()
         .pt_6()

From eb0f9ddcdc1305991b59adee2d87b3b1bea5b562 Mon Sep 17 00:00:00 2001
From: Oleksiy Syvokon <oleksiy@zed.dev>
Date: Fri, 22 Aug 2025 19:03:47 +0300
Subject: [PATCH 302/823] themes: Implement Bright Black and Bright White
 colors (#36761)

Before:
<img width="356" height="50" alt="image"
src="https://github.com/user-attachments/assets/c4f4ae53-8820-4f22-b306-2e5062cfe552"
/>

After:
<img width="340" height="41" alt="image"
src="https://github.com/user-attachments/assets/8e69d9dc-5640-4e41-845d-f299fc5954e3"
/>


Release Notes:

- Fixed ANSI Bright Black and Bright White colors
---
 assets/themes/ayu/ayu.json         |  6 +++---
 assets/themes/gruvbox/gruvbox.json | 12 ++++++------
 assets/themes/one/one.json         |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index f9f8720729..0ffbb9f61e 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -93,7 +93,7 @@
         "terminal.ansi.bright_cyan": "#4c806fff",
         "terminal.ansi.dim_cyan": "#cbf2e4ff",
         "terminal.ansi.white": "#bfbdb6ff",
-        "terminal.ansi.bright_white": "#bfbdb6ff",
+        "terminal.ansi.bright_white": "#fafafaff",
         "terminal.ansi.dim_white": "#787876ff",
         "link_text.hover": "#5ac1feff",
         "conflict": "#feb454ff",
@@ -479,7 +479,7 @@
         "terminal.ansi.bright_cyan": "#ace0cbff",
         "terminal.ansi.dim_cyan": "#2a5f4aff",
         "terminal.ansi.white": "#fcfcfcff",
-        "terminal.ansi.bright_white": "#fcfcfcff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#bcbec0ff",
         "link_text.hover": "#3b9ee5ff",
         "conflict": "#f1ad49ff",
@@ -865,7 +865,7 @@
         "terminal.ansi.bright_cyan": "#4c806fff",
         "terminal.ansi.dim_cyan": "#cbf2e4ff",
         "terminal.ansi.white": "#cccac2ff",
-        "terminal.ansi.bright_white": "#cccac2ff",
+        "terminal.ansi.bright_white": "#fafafaff",
         "terminal.ansi.dim_white": "#898a8aff",
         "link_text.hover": "#72cffeff",
         "conflict": "#fecf72ff",
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index 459825c733..f0f0358b76 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -94,7 +94,7 @@
         "terminal.ansi.bright_cyan": "#45603eff",
         "terminal.ansi.dim_cyan": "#c7dfbdff",
         "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
         "version_control.added": "#b7bb26ff",
@@ -494,7 +494,7 @@
         "terminal.ansi.bright_cyan": "#45603eff",
         "terminal.ansi.dim_cyan": "#c7dfbdff",
         "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
         "version_control.added": "#b7bb26ff",
@@ -894,7 +894,7 @@
         "terminal.ansi.bright_cyan": "#45603eff",
         "terminal.ansi.dim_cyan": "#c7dfbdff",
         "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
         "version_control.added": "#b7bb26ff",
@@ -1294,7 +1294,7 @@
         "terminal.ansi.bright_cyan": "#9fbca8ff",
         "terminal.ansi.dim_cyan": "#253e2eff",
         "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#0b6678ff",
         "version_control.added": "#797410ff",
@@ -1694,7 +1694,7 @@
         "terminal.ansi.bright_cyan": "#9fbca8ff",
         "terminal.ansi.dim_cyan": "#253e2eff",
         "terminal.ansi.white": "#f9f5d7ff",
-        "terminal.ansi.bright_white": "#f9f5d7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#0b6678ff",
         "version_control.added": "#797410ff",
@@ -2094,7 +2094,7 @@
         "terminal.ansi.bright_cyan": "#9fbca8ff",
         "terminal.ansi.dim_cyan": "#253e2eff",
         "terminal.ansi.white": "#f2e5bcff",
-        "terminal.ansi.bright_white": "#f2e5bcff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#0b6678ff",
         "version_control.added": "#797410ff",
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index 23ebbcc67e..33f6d3c622 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -93,7 +93,7 @@
         "terminal.ansi.bright_cyan": "#3a565bff",
         "terminal.ansi.dim_cyan": "#b9d9dfff",
         "terminal.ansi.white": "#dce0e5ff",
-        "terminal.ansi.bright_white": "#dce0e5ff",
+        "terminal.ansi.bright_white": "#fafafaff",
         "terminal.ansi.dim_white": "#575d65ff",
         "link_text.hover": "#74ade8ff",
         "version_control.added": "#27a657ff",
@@ -468,7 +468,7 @@
         "terminal.bright_foreground": "#242529ff",
         "terminal.dim_foreground": "#fafafaff",
         "terminal.ansi.black": "#242529ff",
-        "terminal.ansi.bright_black": "#242529ff",
+        "terminal.ansi.bright_black": "#747579ff",
         "terminal.ansi.dim_black": "#97979aff",
         "terminal.ansi.red": "#d36151ff",
         "terminal.ansi.bright_red": "#f0b0a4ff",
@@ -489,7 +489,7 @@
         "terminal.ansi.bright_cyan": "#a3bedaff",
         "terminal.ansi.dim_cyan": "#254058ff",
         "terminal.ansi.white": "#fafafaff",
-        "terminal.ansi.bright_white": "#fafafaff",
+        "terminal.ansi.bright_white": "#ffffffff",
         "terminal.ansi.dim_white": "#aaaaaaff",
         "link_text.hover": "#5c78e2ff",
         "version_control.added": "#27a657ff",

From 42ae3301d01602514daf09b10b2ba5396fe5a731 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 22 Aug 2025 20:04:39 +0300
Subject: [PATCH 303/823] Show file open error view instead of the modal
 (#36764)

Closes https://github.com/zed-industries/zed/issues/36672

Before:
either
<img width="966" height="642" alt="image"
src="https://github.com/user-attachments/assets/7263ea3c-3d48-4f4d-be9e-16b24ca6f60b"
/>
(when opening from the project panel)

or

<img width="959" height="1019" alt="image"
src="https://github.com/user-attachments/assets/834041d4-f4d6-46db-b333-803169ec4803"
/>

(for the rest of the cases)

After:

<img width="2032" height="1167" alt="Screenshot 2025-08-22 at 19 34 10"
src="https://github.com/user-attachments/assets/1aa4530b-69f6-4c3a-8ea1-d4035dbb28da"
/>

(the unified error view)

Release Notes:

- Improved unsupported file opening in Zed

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/keymaps/default-linux.json           |   9 +-
 assets/keymaps/default-macos.json           |   9 +-
 assets/keymaps/vim.json                     |   2 +-
 crates/editor/src/editor_tests.rs           |  37 +++++++
 crates/editor/src/items.rs                  |  11 ++
 crates/project_panel/src/project_panel.rs   |   3 +-
 crates/workspace/src/invalid_buffer_view.rs | 111 ++++++++++++++++++++
 crates/workspace/src/item.rs                |  18 ++++
 crates/workspace/src/pane.rs                | 100 +++++++++++++-----
 crates/workspace/src/workspace.rs           |  56 +++++++---
 crates/zed_actions/src/lib.rs               |   5 +-
 11 files changed, 316 insertions(+), 45 deletions(-)
 create mode 100644 crates/workspace/src/invalid_buffer_view.rs

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index fdc1403eb8..e84f4834af 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -855,7 +855,7 @@
       "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
       "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
       "alt-ctrl-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "ctrl-shift-enter": "workspace::OpenWithSystem",
       "alt-d": "project_panel::CompareMarkedFiles",
       "shift-find": "project_panel::NewSearchInDirectory",
       "ctrl-alt-shift-f": "project_panel::NewSearchInDirectory",
@@ -1198,5 +1198,12 @@
       "alt-shift-l": "onboarding::SignIn",
       "alt-shift-a": "onboarding::OpenAccount"
     }
+  },
+  {
+    "context": "InvalidBuffer",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-enter": "workspace::OpenWithSystem"
+    }
   }
 ]
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 8b18299a91..e72f4174ff 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -915,7 +915,7 @@
       "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }],
       "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }],
       "alt-cmd-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "ctrl-shift-enter": "workspace::OpenWithSystem",
       "alt-d": "project_panel::CompareMarkedFiles",
       "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
       "cmd-alt-shift-f": "project_panel::NewSearchInDirectory",
@@ -1301,5 +1301,12 @@
       "alt-tab": "onboarding::SignIn",
       "alt-shift-a": "onboarding::OpenAccount"
     }
+  },
+  {
+    "context": "InvalidBuffer",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-enter": "workspace::OpenWithSystem"
+    }
   }
 ]
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index be6d34a134..62e50b3c8c 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -819,7 +819,7 @@
       "v": "project_panel::OpenPermanent",
       "p": "project_panel::Open",
       "x": "project_panel::RevealInFileManager",
-      "s": "project_panel::OpenWithSystem",
+      "s": "workspace::OpenWithSystem",
       "z d": "project_panel::CompareMarkedFiles",
       "] c": "project_panel::SelectNextGitEntry",
       "[ c": "project_panel::SelectPrevGitEntry",
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 5b854e3a97..03f5da9a20 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -57,7 +57,9 @@ use util::{
 use workspace::{
     CloseActiveItem, CloseAllItems, CloseOtherItems, MoveItemToPaneInDirection, NavigationEntry,
     OpenOptions, ViewId,
+    invalid_buffer_view::InvalidBufferView,
     item::{FollowEvent, FollowableItem, Item, ItemHandle, SaveOptions},
+    register_project_item,
 };
 
 #[gpui::test]
@@ -24348,6 +24350,41 @@ async fn test_newline_replacement_in_single_line(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_non_utf_8_opens(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    cx.update(|cx| {
+        register_project_item::<Editor>(cx);
+    });
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree("/root1", json!({})).await;
+    fs.insert_file("/root1/one.pdf", vec![0xff, 0xfe, 0xfd])
+        .await;
+
+    let project = Project::test(fs, ["/root1".as_ref()], cx).await;
+    let (workspace, cx) =
+        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+    let worktree_id = project.update(cx, |project, cx| {
+        project.worktrees(cx).next().unwrap().read(cx).id()
+    });
+
+    let handle = workspace
+        .update_in(cx, |workspace, window, cx| {
+            let project_path = (worktree_id, "one.pdf");
+            workspace.open_path(project_path, None, true, window, cx)
+        })
+        .await
+        .unwrap();
+
+    assert_eq!(
+        handle.to_any().entity_type(),
+        TypeId::of::<InvalidBufferView>()
+    );
+}
+
 #[track_caller]
 fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
     editor
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index afc5767de0..641e8a97ed 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -42,6 +42,7 @@ use ui::{IconDecorationKind, prelude::*};
 use util::{ResultExt, TryFutureExt, paths::PathExt};
 use workspace::{
     CollaboratorId, ItemId, ItemNavHistory, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
+    invalid_buffer_view::InvalidBufferView,
     item::{FollowableItem, Item, ItemEvent, ProjectItem, SaveOptions},
     searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
 };
@@ -1401,6 +1402,16 @@ impl ProjectItem for Editor {
 
         editor
     }
+
+    fn for_broken_project_item(
+        abs_path: PathBuf,
+        is_local: bool,
+        e: &anyhow::Error,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Option<InvalidBufferView> {
+        Some(InvalidBufferView::new(abs_path, is_local, e, window, cx))
+    }
 }
 
 fn clip_ranges<'a>(
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 52ec7a9880..c99f5f8172 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -69,6 +69,7 @@ use workspace::{
     notifications::{DetachAndPromptErr, NotifyTaskExt},
 };
 use worktree::CreatedEntry;
+use zed_actions::workspace::OpenWithSystem;
 
 const PROJECT_PANEL_KEY: &str = "ProjectPanel";
 const NEW_ENTRY_ID: ProjectEntryId = ProjectEntryId::MAX;
@@ -255,8 +256,6 @@ actions!(
         RevealInFileManager,
         /// Removes the selected folder from the project.
         RemoveFromProject,
-        /// Opens the selected file with the system's default application.
-        OpenWithSystem,
         /// Cuts the selected file or directory.
         Cut,
         /// Pastes the previously cut or copied item.
diff --git a/crates/workspace/src/invalid_buffer_view.rs b/crates/workspace/src/invalid_buffer_view.rs
new file mode 100644
index 0000000000..e2361d5967
--- /dev/null
+++ b/crates/workspace/src/invalid_buffer_view.rs
@@ -0,0 +1,111 @@
+use std::{path::PathBuf, sync::Arc};
+
+use gpui::{EventEmitter, FocusHandle, Focusable};
+use ui::{
+    App, Button, ButtonCommon, ButtonStyle, Clickable, Context, FluentBuilder, InteractiveElement,
+    KeyBinding, ParentElement, Render, SharedString, Styled as _, Window, h_flex, v_flex,
+};
+use zed_actions::workspace::OpenWithSystem;
+
+use crate::Item;
+
+/// A view to display when a certain buffer fails to open.
+pub struct InvalidBufferView {
+    /// Which path was attempted to open.
+    pub abs_path: Arc<PathBuf>,
+    /// An error message, happened when opening the buffer.
+    pub error: SharedString,
+    is_local: bool,
+    focus_handle: FocusHandle,
+}
+
+impl InvalidBufferView {
+    pub fn new(
+        abs_path: PathBuf,
+        is_local: bool,
+        e: &anyhow::Error,
+        _: &mut Window,
+        cx: &mut App,
+    ) -> Self {
+        Self {
+            is_local,
+            abs_path: Arc::new(abs_path),
+            error: format!("{e}").into(),
+            focus_handle: cx.focus_handle(),
+        }
+    }
+}
+
+impl Item for InvalidBufferView {
+    type Event = ();
+
+    fn tab_content_text(&self, mut detail: usize, _: &App) -> SharedString {
+        // Ensure we always render at least the filename.
+        detail += 1;
+
+        let path = self.abs_path.as_path();
+
+        let mut prefix = path;
+        while detail > 0 {
+            if let Some(parent) = prefix.parent() {
+                prefix = parent;
+                detail -= 1;
+            } else {
+                break;
+            }
+        }
+
+        let path = if detail > 0 {
+            path
+        } else {
+            path.strip_prefix(prefix).unwrap_or(path)
+        };
+
+        SharedString::new(path.to_string_lossy())
+    }
+}
+
+impl EventEmitter<()> for InvalidBufferView {}
+
+impl Focusable for InvalidBufferView {
+    fn focus_handle(&self, _: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for InvalidBufferView {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl gpui::IntoElement {
+        let abs_path = self.abs_path.clone();
+        v_flex()
+            .size_full()
+            .track_focus(&self.focus_handle(cx))
+            .flex_none()
+            .justify_center()
+            .overflow_hidden()
+            .key_context("InvalidBuffer")
+            .child(
+                h_flex().size_full().justify_center().child(
+                    v_flex()
+                        .justify_center()
+                        .gap_2()
+                        .child("Cannot display the file contents in Zed")
+                        .when(self.is_local, |contents| {
+                            contents.child(
+                                h_flex().justify_center().child(
+                                    Button::new("open-with-system", "Open in Default App")
+                                        .on_click(move |_, _, cx| {
+                                            cx.open_with_system(&abs_path);
+                                        })
+                                        .style(ButtonStyle::Outlined)
+                                        .key_binding(KeyBinding::for_action(
+                                            &OpenWithSystem,
+                                            window,
+                                            cx,
+                                        )),
+                                ),
+                            )
+                        }),
+                ),
+            )
+    }
+}
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 5a497398f9..3485fcca43 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -1,6 +1,7 @@
 use crate::{
     CollaboratorId, DelayedDebouncedEditAction, FollowableViewRegistry, ItemNavHistory,
     SerializableItemRegistry, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
+    invalid_buffer_view::InvalidBufferView,
     pane::{self, Pane},
     persistence::model::ItemId,
     searchable::SearchableItemHandle,
@@ -22,6 +23,7 @@ use std::{
     any::{Any, TypeId},
     cell::RefCell,
     ops::Range,
+    path::PathBuf,
     rc::Rc,
     sync::Arc,
     time::Duration,
@@ -1161,6 +1163,22 @@ pub trait ProjectItem: Item {
     ) -> Self
     where
         Self: Sized;
+
+    /// A fallback handler, which will be called after [`project::ProjectItem::try_open`] fails,
+    /// with the error from that failure as an argument.
+    /// Allows to open an item that can gracefully display and handle errors.
+    fn for_broken_project_item(
+        _abs_path: PathBuf,
+        _is_local: bool,
+        _e: &anyhow::Error,
+        _window: &mut Window,
+        _cx: &mut App,
+    ) -> Option<InvalidBufferView>
+    where
+        Self: Sized,
+    {
+        None
+    }
 }
 
 #[derive(Debug)]
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 23c8c0b185..e88402adc0 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2,6 +2,7 @@ use crate::{
     CloseWindow, NewFile, NewTerminal, OpenInTerminal, OpenOptions, OpenTerminal, OpenVisible,
     SplitDirection, ToggleFileFinder, ToggleProjectSymbols, ToggleZoom, Workspace,
     WorkspaceItemBuilder,
+    invalid_buffer_view::InvalidBufferView,
     item::{
         ActivateOnClose, ClosePosition, Item, ItemHandle, ItemSettings, PreviewTabsSettings,
         ProjectItemKind, SaveOptions, ShowCloseButton, ShowDiagnostics, TabContentParams,
@@ -897,19 +898,43 @@ impl Pane {
                 }
             }
         }
+
+        let set_up_existing_item =
+            |index: usize, pane: &mut Self, window: &mut Window, cx: &mut Context<Self>| {
+                // If the item is already open, and the item is a preview item
+                // and we are not allowing items to open as preview, mark the item as persistent.
+                if let Some(preview_item_id) = pane.preview_item_id
+                    && let Some(tab) = pane.items.get(index)
+                    && tab.item_id() == preview_item_id
+                    && !allow_preview
+                {
+                    pane.set_preview_item_id(None, cx);
+                }
+                if activate {
+                    pane.activate_item(index, focus_item, focus_item, window, cx);
+                }
+            };
+        let set_up_new_item = |new_item: Box<dyn ItemHandle>,
+                               destination_index: Option<usize>,
+                               pane: &mut Self,
+                               window: &mut Window,
+                               cx: &mut Context<Self>| {
+            if allow_preview {
+                pane.set_preview_item_id(Some(new_item.item_id()), cx);
+            }
+            pane.add_item_inner(
+                new_item,
+                true,
+                focus_item,
+                activate,
+                destination_index,
+                window,
+                cx,
+            );
+        };
+
         if let Some((index, existing_item)) = existing_item {
-            // If the item is already open, and the item is a preview item
-            // and we are not allowing items to open as preview, mark the item as persistent.
-            if let Some(preview_item_id) = self.preview_item_id
-                && let Some(tab) = self.items.get(index)
-                && tab.item_id() == preview_item_id
-                && !allow_preview
-            {
-                self.set_preview_item_id(None, cx);
-            }
-            if activate {
-                self.activate_item(index, focus_item, focus_item, window, cx);
-            }
+            set_up_existing_item(index, self, window, cx);
             existing_item
         } else {
             // If the item is being opened as preview and we have an existing preview tab,
@@ -921,21 +946,46 @@ impl Pane {
             };
 
             let new_item = build_item(self, window, cx);
+            // A special case that won't ever get a `project_entry_id` but has to be deduplicated nonetheless.
+            if let Some(invalid_buffer_view) = new_item.downcast::<InvalidBufferView>() {
+                let mut already_open_view = None;
+                let mut views_to_close = HashSet::default();
+                for existing_error_view in self
+                    .items_of_type::<InvalidBufferView>()
+                    .filter(|item| item.read(cx).abs_path == invalid_buffer_view.read(cx).abs_path)
+                {
+                    if already_open_view.is_none()
+                        && existing_error_view.read(cx).error == invalid_buffer_view.read(cx).error
+                    {
+                        already_open_view = Some(existing_error_view);
+                    } else {
+                        views_to_close.insert(existing_error_view.item_id());
+                    }
+                }
 
-            if allow_preview {
-                self.set_preview_item_id(Some(new_item.item_id()), cx);
+                let resulting_item = match already_open_view {
+                    Some(already_open_view) => {
+                        if let Some(index) = self.index_for_item_id(already_open_view.item_id()) {
+                            set_up_existing_item(index, self, window, cx);
+                        }
+                        Box::new(already_open_view) as Box<_>
+                    }
+                    None => {
+                        set_up_new_item(new_item.clone(), destination_index, self, window, cx);
+                        new_item
+                    }
+                };
+
+                self.close_items(window, cx, SaveIntent::Skip, |existing_item| {
+                    views_to_close.contains(&existing_item)
+                })
+                .detach();
+
+                resulting_item
+            } else {
+                set_up_new_item(new_item.clone(), destination_index, self, window, cx);
+                new_item
             }
-            self.add_item_inner(
-                new_item.clone(),
-                true,
-                focus_item,
-                activate,
-                destination_index,
-                window,
-                cx,
-            );
-
-            new_item
         }
     }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 44aa94fe61..d31aae2c59 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1,5 +1,6 @@
 pub mod dock;
 pub mod history_manager;
+pub mod invalid_buffer_view;
 pub mod item;
 mod modal_layer;
 pub mod notifications;
@@ -612,21 +613,49 @@ impl ProjectItemRegistry {
         );
         self.build_project_item_for_path_fns
             .push(|project, project_path, window, cx| {
+                let project_path = project_path.clone();
+                let abs_path = project.read(cx).absolute_path(&project_path, cx);
+                let is_local = project.read(cx).is_local();
                 let project_item =
-                    <T::Item as project::ProjectItem>::try_open(project, project_path, cx)?;
+                    <T::Item as project::ProjectItem>::try_open(project, &project_path, cx)?;
                 let project = project.clone();
-                Some(window.spawn(cx, async move |cx| {
-                    let project_item = project_item.await?;
-                    let project_entry_id: Option<ProjectEntryId> =
-                        project_item.read_with(cx, project::ProjectItem::entry_id)?;
-                    let build_workspace_item = Box::new(
-                        |pane: &mut Pane, window: &mut Window, cx: &mut Context<Pane>| {
-                            Box::new(cx.new(|cx| {
-                                T::for_project_item(project, Some(pane), project_item, window, cx)
-                            })) as Box<dyn ItemHandle>
+                Some(window.spawn(cx, async move |cx| match project_item.await {
+                    Ok(project_item) => {
+                        let project_item = project_item;
+                        let project_entry_id: Option<ProjectEntryId> =
+                            project_item.read_with(cx, project::ProjectItem::entry_id)?;
+                        let build_workspace_item = Box::new(
+                            |pane: &mut Pane, window: &mut Window, cx: &mut Context<Pane>| {
+                                Box::new(cx.new(|cx| {
+                                    T::for_project_item(
+                                        project,
+                                        Some(pane),
+                                        project_item,
+                                        window,
+                                        cx,
+                                    )
+                                })) as Box<dyn ItemHandle>
+                            },
+                        ) as Box<_>;
+                        Ok((project_entry_id, build_workspace_item))
+                    }
+                    Err(e) => match abs_path {
+                        Some(abs_path) => match cx.update(|window, cx| {
+                            T::for_broken_project_item(abs_path, is_local, &e, window, cx)
+                        })? {
+                            Some(broken_project_item_view) => {
+                                let build_workspace_item = Box::new(
+                                    move |_: &mut Pane, _: &mut Window, cx: &mut Context<Pane>| {
+                                        cx.new(|_| broken_project_item_view).boxed_clone()
+                                    },
+                                )
+                                    as Box<_>;
+                                Ok((None, build_workspace_item))
+                            }
+                            None => Err(e)?,
                         },
-                    ) as Box<_>;
-                    Ok((project_entry_id, build_workspace_item))
+                        None => Err(e)?,
+                    },
                 }))
             });
     }
@@ -3379,9 +3408,8 @@ impl Workspace {
         window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<(Option<ProjectEntryId>, WorkspaceItemBuilder)>> {
-        let project = self.project().clone();
         let registry = cx.default_global::<ProjectItemRegistry>().clone();
-        registry.open_path(&project, &path, window, cx)
+        registry.open_path(self.project(), &path, window, cx)
     }
 
     pub fn find_project_item<T>(
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 9455369e9a..069abc0a12 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -156,7 +156,10 @@ pub mod workspace {
             #[action(deprecated_aliases = ["editor::CopyPath", "outline_panel::CopyPath", "project_panel::CopyPath"])]
             CopyPath,
             #[action(deprecated_aliases = ["editor::CopyRelativePath", "outline_panel::CopyRelativePath", "project_panel::CopyRelativePath"])]
-            CopyRelativePath
+            CopyRelativePath,
+            /// Opens the selected file with the system's default application.
+            #[action(deprecated_aliases = ["project_panel::OpenWithSystem"])]
+            OpenWithSystem,
         ]
     );
 }

From 72bd248544c58f7bee885bf2ec3f527772e25db5 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 22 Aug 2025 20:49:12 +0200
Subject: [PATCH 304/823] editor: Fix multi buffer header context menu not
 handling absolute paths (#36769)

Release Notes:

- N/A
---
 crates/editor/src/element.rs | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 797b0d6634..32582ba941 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -74,6 +74,7 @@ use std::{
     fmt::{self, Write},
     iter, mem,
     ops::{Deref, Range},
+    path::Path,
     rc::Rc,
     sync::Arc,
     time::{Duration, Instant},
@@ -3693,7 +3694,12 @@ impl EditorElement {
                                 })
                                 .take(1),
                         )
-                        .children(indicator)
+                        .child(
+                            h_flex()
+                                .size(Pixels(12.0))
+                                .justify_center()
+                                .children(indicator),
+                        )
                         .child(
                             h_flex()
                                 .cursor_pointer()
@@ -3782,25 +3788,31 @@ impl EditorElement {
                         && let Some(worktree) =
                             project.read(cx).worktree_for_id(file.worktree_id(cx), cx)
                     {
+                        let worktree = worktree.read(cx);
                         let relative_path = file.path();
-                        let entry_for_path = worktree.read(cx).entry_for_path(relative_path);
-                        let abs_path = entry_for_path.and_then(|e| e.canonical_path.as_deref());
-                        let has_relative_path =
-                            worktree.read(cx).root_entry().is_some_and(Entry::is_dir);
+                        let entry_for_path = worktree.entry_for_path(relative_path);
+                        let abs_path = entry_for_path.map(|e| {
+                            e.canonical_path.as_deref().map_or_else(
+                                || worktree.abs_path().join(relative_path),
+                                Path::to_path_buf,
+                            )
+                        });
+                        let has_relative_path = worktree.root_entry().is_some_and(Entry::is_dir);
 
-                        let parent_abs_path =
-                            abs_path.and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
+                        let parent_abs_path = abs_path
+                            .as_ref()
+                            .and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
                         let relative_path = has_relative_path
                             .then_some(relative_path)
                             .map(ToOwned::to_owned);
 
                         let visible_in_project_panel =
-                            relative_path.is_some() && worktree.read(cx).is_visible();
+                            relative_path.is_some() && worktree.is_visible();
                         let reveal_in_project_panel = entry_for_path
                             .filter(|_| visible_in_project_panel)
                             .map(|entry| entry.id);
                         menu = menu
-                            .when_some(abs_path.map(ToOwned::to_owned), |menu, abs_path| {
+                            .when_some(abs_path, |menu, abs_path| {
                                 menu.entry(
                                     "Copy Path",
                                     Some(Box::new(zed_actions::workspace::CopyPath)),

From 18ac4ac5ef0548e66cd6785ab218dce7eb1de267 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Fri, 22 Aug 2025 16:32:49 -0300
Subject: [PATCH 305/823] ACP debug tools pane (#36768)

Adds a new "acp: open debug tools" action that opens a new workspace
item with a log of ACP messages for the active connection.

Release Notes:

- N/A
---
 Cargo.lock                         |  27 +-
 Cargo.toml                         |   4 +-
 crates/acp_tools/Cargo.toml        |  30 ++
 crates/acp_tools/LICENSE-GPL       |   1 +
 crates/acp_tools/src/acp_tools.rs  | 494 +++++++++++++++++++++++++++++
 crates/agent_servers/Cargo.toml    |   1 +
 crates/agent_servers/src/acp/v1.rs |  11 +-
 crates/zed/Cargo.toml              |   1 +
 crates/zed/src/main.rs             |   1 +
 crates/zed/src/zed.rs              |   1 +
 script/squawk                      |  12 +-
 tooling/workspace-hack/Cargo.toml  |   8 +-
 12 files changed, 574 insertions(+), 17 deletions(-)
 create mode 100644 crates/acp_tools/Cargo.toml
 create mode 120000 crates/acp_tools/LICENSE-GPL
 create mode 100644 crates/acp_tools/src/acp_tools.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2b3d7b2691..cd1018d4c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,6 +39,26 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "acp_tools"
+version = "0.1.0"
+dependencies = [
+ "agent-client-protocol",
+ "collections",
+ "gpui",
+ "language",
+ "markdown",
+ "project",
+ "serde",
+ "serde_json",
+ "settings",
+ "theme",
+ "ui",
+ "util",
+ "workspace",
+ "workspace-hack",
+]
+
 [[package]]
 name = "action_log"
 version = "0.1.0"
@@ -171,11 +191,12 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.30"
+version = "0.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f792e009ba59b137ee1db560bc37e567887ad4b5af6f32181d381fff690e2d4"
+checksum = "289eb34ee17213dadcca47eedadd386a5e7678094095414e475965d1bcca2860"
 dependencies = [
  "anyhow",
+ "async-broadcast",
  "futures 0.3.31",
  "log",
  "parking_lot",
@@ -264,6 +285,7 @@ name = "agent_servers"
 version = "0.1.0"
 dependencies = [
  "acp_thread",
+ "acp_tools",
  "action_log",
  "agent-client-protocol",
  "agent_settings",
@@ -20417,6 +20439,7 @@ dependencies = [
 name = "zed"
 version = "0.202.0"
 dependencies = [
+ "acp_tools",
  "activity_indicator",
  "agent",
  "agent_servers",
diff --git a/Cargo.toml b/Cargo.toml
index 84de9b30ad..7668d18752 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/acp_tools",
     "crates/acp_thread",
     "crates/action_log",
     "crates/activity_indicator",
@@ -227,6 +228,7 @@ edition = "2024"
 # Workspace member crates
 #
 
+acp_tools = { path = "crates/acp_tools" }
 acp_thread = { path = "crates/acp_thread" }
 action_log = { path = "crates/action_log" }
 agent = { path = "crates/agent" }
@@ -425,7 +427,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #
 
 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.30"
+agent-client-protocol = "0.0.31"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_tools/Cargo.toml b/crates/acp_tools/Cargo.toml
new file mode 100644
index 0000000000..7a6d8c21a0
--- /dev/null
+++ b/crates/acp_tools/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "acp_tools"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/acp_tools.rs"
+doctest = false
+
+[dependencies]
+agent-client-protocol.workspace = true
+collections.workspace = true
+gpui.workspace = true
+language.workspace= true
+markdown.workspace = true
+project.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace-hack.workspace = true
+workspace.workspace = true
diff --git a/crates/acp_tools/LICENSE-GPL b/crates/acp_tools/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/acp_tools/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
new file mode 100644
index 0000000000..ca5e57e85a
--- /dev/null
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -0,0 +1,494 @@
+use std::{
+    cell::RefCell,
+    collections::HashSet,
+    fmt::Display,
+    rc::{Rc, Weak},
+    sync::Arc,
+};
+
+use agent_client_protocol as acp;
+use collections::HashMap;
+use gpui::{
+    App, Empty, Entity, EventEmitter, FocusHandle, Focusable, Global, ListAlignment, ListState,
+    StyleRefinement, Subscription, Task, TextStyleRefinement, Window, actions, list, prelude::*,
+};
+use language::LanguageRegistry;
+use markdown::{CodeBlockRenderer, Markdown, MarkdownElement, MarkdownStyle};
+use project::Project;
+use settings::Settings;
+use theme::ThemeSettings;
+use ui::prelude::*;
+use util::ResultExt as _;
+use workspace::{Item, Workspace};
+
+actions!(acp, [OpenDebugTools]);
+
+pub fn init(cx: &mut App) {
+    cx.observe_new(
+        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
+            workspace.register_action(|workspace, _: &OpenDebugTools, window, cx| {
+                let acp_tools =
+                    Box::new(cx.new(|cx| AcpTools::new(workspace.project().clone(), cx)));
+                workspace.add_item_to_active_pane(acp_tools, None, true, window, cx);
+            });
+        },
+    )
+    .detach();
+}
+
+struct GlobalAcpConnectionRegistry(Entity<AcpConnectionRegistry>);
+
+impl Global for GlobalAcpConnectionRegistry {}
+
+#[derive(Default)]
+pub struct AcpConnectionRegistry {
+    active_connection: RefCell<Option<ActiveConnection>>,
+}
+
+struct ActiveConnection {
+    server_name: &'static str,
+    connection: Weak<acp::ClientSideConnection>,
+}
+
+impl AcpConnectionRegistry {
+    pub fn default_global(cx: &mut App) -> Entity<Self> {
+        if cx.has_global::<GlobalAcpConnectionRegistry>() {
+            cx.global::<GlobalAcpConnectionRegistry>().0.clone()
+        } else {
+            let registry = cx.new(|_cx| AcpConnectionRegistry::default());
+            cx.set_global(GlobalAcpConnectionRegistry(registry.clone()));
+            registry
+        }
+    }
+
+    pub fn set_active_connection(
+        &self,
+        server_name: &'static str,
+        connection: &Rc<acp::ClientSideConnection>,
+        cx: &mut Context<Self>,
+    ) {
+        self.active_connection.replace(Some(ActiveConnection {
+            server_name,
+            connection: Rc::downgrade(connection),
+        }));
+        cx.notify();
+    }
+}
+
+struct AcpTools {
+    project: Entity<Project>,
+    focus_handle: FocusHandle,
+    expanded: HashSet<usize>,
+    watched_connection: Option<WatchedConnection>,
+    connection_registry: Entity<AcpConnectionRegistry>,
+    _subscription: Subscription,
+}
+
+struct WatchedConnection {
+    server_name: &'static str,
+    messages: Vec<WatchedConnectionMessage>,
+    list_state: ListState,
+    connection: Weak<acp::ClientSideConnection>,
+    incoming_request_methods: HashMap<i32, Arc<str>>,
+    outgoing_request_methods: HashMap<i32, Arc<str>>,
+    _task: Task<()>,
+}
+
+impl AcpTools {
+    fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
+        let connection_registry = AcpConnectionRegistry::default_global(cx);
+
+        let subscription = cx.observe(&connection_registry, |this, _, cx| {
+            this.update_connection(cx);
+            cx.notify();
+        });
+
+        let mut this = Self {
+            project,
+            focus_handle: cx.focus_handle(),
+            expanded: HashSet::default(),
+            watched_connection: None,
+            connection_registry,
+            _subscription: subscription,
+        };
+        this.update_connection(cx);
+        this
+    }
+
+    fn update_connection(&mut self, cx: &mut Context<Self>) {
+        let active_connection = self.connection_registry.read(cx).active_connection.borrow();
+        let Some(active_connection) = active_connection.as_ref() else {
+            return;
+        };
+
+        if let Some(watched_connection) = self.watched_connection.as_ref() {
+            if Weak::ptr_eq(
+                &watched_connection.connection,
+                &active_connection.connection,
+            ) {
+                return;
+            }
+        }
+
+        if let Some(connection) = active_connection.connection.upgrade() {
+            let mut receiver = connection.subscribe();
+            let task = cx.spawn(async move |this, cx| {
+                while let Ok(message) = receiver.recv().await {
+                    this.update(cx, |this, cx| {
+                        this.push_stream_message(message, cx);
+                    })
+                    .ok();
+                }
+            });
+
+            self.watched_connection = Some(WatchedConnection {
+                server_name: active_connection.server_name,
+                messages: vec![],
+                list_state: ListState::new(0, ListAlignment::Bottom, px(2048.)),
+                connection: active_connection.connection.clone(),
+                incoming_request_methods: HashMap::default(),
+                outgoing_request_methods: HashMap::default(),
+                _task: task,
+            });
+        }
+    }
+
+    fn push_stream_message(&mut self, stream_message: acp::StreamMessage, cx: &mut Context<Self>) {
+        let Some(connection) = self.watched_connection.as_mut() else {
+            return;
+        };
+        let language_registry = self.project.read(cx).languages().clone();
+        let index = connection.messages.len();
+
+        let (request_id, method, message_type, params) = match stream_message.message {
+            acp::StreamMessageContent::Request { id, method, params } => {
+                let method_map = match stream_message.direction {
+                    acp::StreamMessageDirection::Incoming => {
+                        &mut connection.incoming_request_methods
+                    }
+                    acp::StreamMessageDirection::Outgoing => {
+                        &mut connection.outgoing_request_methods
+                    }
+                };
+
+                method_map.insert(id, method.clone());
+                (Some(id), method.into(), MessageType::Request, Ok(params))
+            }
+            acp::StreamMessageContent::Response { id, result } => {
+                let method_map = match stream_message.direction {
+                    acp::StreamMessageDirection::Incoming => {
+                        &mut connection.outgoing_request_methods
+                    }
+                    acp::StreamMessageDirection::Outgoing => {
+                        &mut connection.incoming_request_methods
+                    }
+                };
+
+                if let Some(method) = method_map.remove(&id) {
+                    (Some(id), method.into(), MessageType::Response, result)
+                } else {
+                    (
+                        Some(id),
+                        "[unrecognized response]".into(),
+                        MessageType::Response,
+                        result,
+                    )
+                }
+            }
+            acp::StreamMessageContent::Notification { method, params } => {
+                (None, method.into(), MessageType::Notification, Ok(params))
+            }
+        };
+
+        let message = WatchedConnectionMessage {
+            name: method,
+            message_type,
+            request_id,
+            direction: stream_message.direction,
+            collapsed_params_md: match params.as_ref() {
+                Ok(params) => params
+                    .as_ref()
+                    .map(|params| collapsed_params_md(params, &language_registry, cx)),
+                Err(err) => {
+                    if let Ok(err) = &serde_json::to_value(err) {
+                        Some(collapsed_params_md(&err, &language_registry, cx))
+                    } else {
+                        None
+                    }
+                }
+            },
+
+            expanded_params_md: None,
+            params,
+        };
+
+        connection.messages.push(message);
+        connection.list_state.splice(index..index, 1);
+        cx.notify();
+    }
+
+    fn render_message(
+        &mut self,
+        index: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> AnyElement {
+        let Some(connection) = self.watched_connection.as_ref() else {
+            return Empty.into_any();
+        };
+
+        let Some(message) = connection.messages.get(index) else {
+            return Empty.into_any();
+        };
+
+        let base_size = TextSize::Editor.rems(cx);
+
+        let theme_settings = ThemeSettings::get_global(cx);
+        let text_style = window.text_style();
+
+        let colors = cx.theme().colors();
+        let expanded = self.expanded.contains(&index);
+
+        v_flex()
+            .w_full()
+            .px_4()
+            .py_3()
+            .border_color(colors.border)
+            .border_b_1()
+            .gap_2()
+            .items_start()
+            .font_buffer(cx)
+            .text_size(base_size)
+            .id(index)
+            .group("message")
+            .hover(|this| this.bg(colors.element_background.opacity(0.5)))
+            .on_click(cx.listener(move |this, _, _, cx| {
+                if this.expanded.contains(&index) {
+                    this.expanded.remove(&index);
+                } else {
+                    this.expanded.insert(index);
+                    let Some(connection) = &mut this.watched_connection else {
+                        return;
+                    };
+                    let Some(message) = connection.messages.get_mut(index) else {
+                        return;
+                    };
+                    message.expanded(this.project.read(cx).languages().clone(), cx);
+                    connection.list_state.scroll_to_reveal_item(index);
+                }
+                cx.notify()
+            }))
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_2()
+                    .items_center()
+                    .flex_shrink_0()
+                    .child(match message.direction {
+                        acp::StreamMessageDirection::Incoming => {
+                            ui::Icon::new(ui::IconName::ArrowDown).color(Color::Error)
+                        }
+                        acp::StreamMessageDirection::Outgoing => {
+                            ui::Icon::new(ui::IconName::ArrowUp).color(Color::Success)
+                        }
+                    })
+                    .child(
+                        Label::new(message.name.clone())
+                            .buffer_font(cx)
+                            .color(Color::Muted),
+                    )
+                    .child(div().flex_1())
+                    .child(
+                        div()
+                            .child(ui::Chip::new(message.message_type.to_string()))
+                            .visible_on_hover("message"),
+                    )
+                    .children(
+                        message
+                            .request_id
+                            .map(|req_id| div().child(ui::Chip::new(req_id.to_string()))),
+                    ),
+            )
+            // I'm aware using markdown is a hack. Trying to get something working for the demo.
+            // Will clean up soon!
+            .when_some(
+                if expanded {
+                    message.expanded_params_md.clone()
+                } else {
+                    message.collapsed_params_md.clone()
+                },
+                |this, params| {
+                    this.child(
+                        div().pl_6().w_full().child(
+                            MarkdownElement::new(
+                                params,
+                                MarkdownStyle {
+                                    base_text_style: text_style,
+                                    selection_background_color: colors.element_selection_background,
+                                    syntax: cx.theme().syntax().clone(),
+                                    code_block_overflow_x_scroll: true,
+                                    code_block: StyleRefinement {
+                                        text: Some(TextStyleRefinement {
+                                            font_family: Some(
+                                                theme_settings.buffer_font.family.clone(),
+                                            ),
+                                            font_size: Some((base_size * 0.8).into()),
+                                            ..Default::default()
+                                        }),
+                                        ..Default::default()
+                                    },
+                                    ..Default::default()
+                                },
+                            )
+                            .code_block_renderer(
+                                CodeBlockRenderer::Default {
+                                    copy_button: false,
+                                    copy_button_on_hover: expanded,
+                                    border: false,
+                                },
+                            ),
+                        ),
+                    )
+                },
+            )
+            .into_any()
+    }
+}
+
+struct WatchedConnectionMessage {
+    name: SharedString,
+    request_id: Option<i32>,
+    direction: acp::StreamMessageDirection,
+    message_type: MessageType,
+    params: Result<Option<serde_json::Value>, acp::Error>,
+    collapsed_params_md: Option<Entity<Markdown>>,
+    expanded_params_md: Option<Entity<Markdown>>,
+}
+
+impl WatchedConnectionMessage {
+    fn expanded(&mut self, language_registry: Arc<LanguageRegistry>, cx: &mut App) {
+        let params_md = match &self.params {
+            Ok(Some(params)) => Some(expanded_params_md(params, &language_registry, cx)),
+            Err(err) => {
+                if let Some(err) = &serde_json::to_value(err).log_err() {
+                    Some(expanded_params_md(&err, &language_registry, cx))
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        };
+        self.expanded_params_md = params_md;
+    }
+}
+
+fn collapsed_params_md(
+    params: &serde_json::Value,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &mut App,
+) -> Entity<Markdown> {
+    let params_json = serde_json::to_string(params).unwrap_or_default();
+    let mut spaced_out_json = String::with_capacity(params_json.len() + params_json.len() / 4);
+
+    for ch in params_json.chars() {
+        match ch {
+            '{' => spaced_out_json.push_str("{ "),
+            '}' => spaced_out_json.push_str(" }"),
+            ':' => spaced_out_json.push_str(": "),
+            ',' => spaced_out_json.push_str(", "),
+            c => spaced_out_json.push(c),
+        }
+    }
+
+    let params_md = format!("```json\n{}\n```", spaced_out_json);
+    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
+}
+
+fn expanded_params_md(
+    params: &serde_json::Value,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &mut App,
+) -> Entity<Markdown> {
+    let params_json = serde_json::to_string_pretty(params).unwrap_or_default();
+    let params_md = format!("```json\n{}\n```", params_json);
+    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
+}
+
+enum MessageType {
+    Request,
+    Response,
+    Notification,
+}
+
+impl Display for MessageType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            MessageType::Request => write!(f, "Request"),
+            MessageType::Response => write!(f, "Response"),
+            MessageType::Notification => write!(f, "Notification"),
+        }
+    }
+}
+
+enum AcpToolsEvent {}
+
+impl EventEmitter<AcpToolsEvent> for AcpTools {}
+
+impl Item for AcpTools {
+    type Event = AcpToolsEvent;
+
+    fn tab_content_text(&self, _detail: usize, _cx: &App) -> ui::SharedString {
+        format!(
+            "ACP: {}",
+            self.watched_connection
+                .as_ref()
+                .map_or("Disconnected", |connection| connection.server_name)
+        )
+        .into()
+    }
+
+    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
+        Some(ui::Icon::new(IconName::Thread))
+    }
+}
+
+impl Focusable for AcpTools {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for AcpTools {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .track_focus(&self.focus_handle)
+            .size_full()
+            .bg(cx.theme().colors().editor_background)
+            .child(match self.watched_connection.as_ref() {
+                Some(connection) => {
+                    if connection.messages.is_empty() {
+                        h_flex()
+                            .size_full()
+                            .justify_center()
+                            .items_center()
+                            .child("No messages recorded yet")
+                            .into_any()
+                    } else {
+                        list(
+                            connection.list_state.clone(),
+                            cx.processor(Self::render_message),
+                        )
+                        .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
+                        .flex_grow()
+                        .into_any()
+                    }
+                }
+                None => h_flex()
+                    .size_full()
+                    .justify_center()
+                    .items_center()
+                    .child("No active connection")
+                    .into_any(),
+            })
+    }
+}
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 60dd796463..8ea4a27f4c 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -17,6 +17,7 @@ path = "src/agent_servers.rs"
 doctest = false
 
 [dependencies]
+acp_tools.workspace = true
 acp_thread.workspace = true
 action_log.workspace = true
 agent-client-protocol.workspace = true
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
index 29f389547d..1945ad2483 100644
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@@ -1,3 +1,4 @@
+use acp_tools::AcpConnectionRegistry;
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
 use anyhow::anyhow;
@@ -101,6 +102,14 @@ impl AcpConnection {
         })
         .detach();
 
+        let connection = Rc::new(connection);
+
+        cx.update(|cx| {
+            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
+                registry.set_active_connection(server_name, &connection, cx)
+            });
+        })?;
+
         let response = connection
             .initialize(acp::InitializeRequest {
                 protocol_version: acp::VERSION,
@@ -119,7 +128,7 @@ impl AcpConnection {
 
         Ok(Self {
             auth_methods: response.auth_methods,
-            connection: connection.into(),
+            connection,
             server_name,
             sessions,
             prompt_capabilities: response.agent_capabilities.prompt_capabilities,
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index c61e23f0a1..6f4ead9ebb 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -20,6 +20,7 @@ path = "src/main.rs"
 
 [dependencies]
 activity_indicator.workspace = true
+acp_tools.workspace = true
 agent.workspace = true
 agent_ui.workspace = true
 agent_settings.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 8beefd5891..b8150a600d 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -566,6 +566,7 @@ pub fn main() {
         language_models::init(app_state.user_store.clone(), app_state.client.clone(), cx);
         agent_settings::init(cx);
         agent_servers::init(cx);
+        acp_tools::init(cx);
         web_search::init(cx);
         web_search_providers::init(app_state.client.clone(), cx);
         snippet_provider::init(cx);
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 638e1dca0e..1b9657dcc6 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4434,6 +4434,7 @@ mod tests {
             assert_eq!(actions_without_namespace, Vec::<&str>::new());
 
             let expected_namespaces = vec![
+                "acp",
                 "activity_indicator",
                 "agent",
                 #[cfg(not(target_os = "macos"))]
diff --git a/script/squawk b/script/squawk
index 8489206f14..497fcff089 100755
--- a/script/squawk
+++ b/script/squawk
@@ -15,13 +15,11 @@ SQUAWK_VERSION=0.26.0
 SQUAWK_BIN="./target/squawk-$SQUAWK_VERSION"
 SQUAWK_ARGS="--assume-in-transaction --config script/lib/squawk.toml"
 
-if  [ ! -f "$SQUAWK_BIN" ]; then
-  pkgutil --pkg-info com.apple.pkg.RosettaUpdateAuto || /usr/sbin/softwareupdate --install-rosetta --agree-to-license
-  # When bootstrapping a brand new CI machine, the `target` directory may not exist yet.
-  mkdir -p "./target"
-  curl -L -o "$SQUAWK_BIN" "https://github.com/sbdchd/squawk/releases/download/v$SQUAWK_VERSION/squawk-darwin-x86_64"
-  chmod +x "$SQUAWK_BIN"
-fi
+pkgutil --pkg-info com.apple.pkg.RosettaUpdateAuto || /usr/sbin/softwareupdate --install-rosetta --agree-to-license
+# When bootstrapping a brand new CI machine, the `target` directory may not exist yet.
+mkdir -p "./target"
+curl -L -o "$SQUAWK_BIN" "https://github.com/sbdchd/squawk/releases/download/v$SQUAWK_VERSION/squawk-darwin-x86_64"
+chmod +x "$SQUAWK_BIN"
 
 if [ -n "$SQUAWK_GITHUB_TOKEN" ]; then
     export SQUAWK_GITHUB_REPO_OWNER=$(echo $GITHUB_REPOSITORY | awk -F/ '{print $1}')
diff --git a/tooling/workspace-hack/Cargo.toml b/tooling/workspace-hack/Cargo.toml
index 054e757056..bf44fc195e 100644
--- a/tooling/workspace-hack/Cargo.toml
+++ b/tooling/workspace-hack/Cargo.toml
@@ -54,6 +54,7 @@ digest = { version = "0.10", features = ["mac", "oid", "std"] }
 either = { version = "1", features = ["serde", "use_std"] }
 euclid = { version = "0.22" }
 event-listener = { version = "5" }
+event-listener-strategy = { version = "0.5" }
 flate2 = { version = "1", features = ["zlib-rs"] }
 form_urlencoded = { version = "1" }
 futures = { version = "0.3", features = ["io-compat"] }
@@ -183,6 +184,7 @@ digest = { version = "0.10", features = ["mac", "oid", "std"] }
 either = { version = "1", features = ["serde", "use_std"] }
 euclid = { version = "0.22" }
 event-listener = { version = "5" }
+event-listener-strategy = { version = "0.5" }
 flate2 = { version = "1", features = ["zlib-rs"] }
 form_urlencoded = { version = "1" }
 futures = { version = "0.3", features = ["io-compat"] }
@@ -403,7 +405,6 @@ bytemuck = { version = "1", default-features = false, features = ["min_const_gen
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "rand_core", "zeroize"] }
 codespan-reporting = { version = "0.12" }
 crypto-common = { version = "0.1", default-features = false, features = ["rand_core", "std"] }
-event-listener-strategy = { version = "0.5" }
 flume = { version = "0.11" }
 foldhash = { version = "0.1", default-features = false, features = ["std"] }
 getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] }
@@ -444,7 +445,6 @@ bytemuck = { version = "1", default-features = false, features = ["min_const_gen
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "rand_core", "zeroize"] }
 codespan-reporting = { version = "0.12" }
 crypto-common = { version = "0.1", default-features = false, features = ["rand_core", "std"] }
-event-listener-strategy = { version = "0.5" }
 flume = { version = "0.11" }
 foldhash = { version = "0.1", default-features = false, features = ["std"] }
 getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] }
@@ -483,7 +483,6 @@ bytemuck = { version = "1", default-features = false, features = ["min_const_gen
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "rand_core", "zeroize"] }
 codespan-reporting = { version = "0.12" }
 crypto-common = { version = "0.1", default-features = false, features = ["rand_core", "std"] }
-event-listener-strategy = { version = "0.5" }
 flume = { version = "0.11" }
 foldhash = { version = "0.1", default-features = false, features = ["std"] }
 getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] }
@@ -524,7 +523,6 @@ bytemuck = { version = "1", default-features = false, features = ["min_const_gen
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "rand_core", "zeroize"] }
 codespan-reporting = { version = "0.12" }
 crypto-common = { version = "0.1", default-features = false, features = ["rand_core", "std"] }
-event-listener-strategy = { version = "0.5" }
 flume = { version = "0.11" }
 foldhash = { version = "0.1", default-features = false, features = ["std"] }
 getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] }
@@ -610,7 +608,6 @@ bytemuck = { version = "1", default-features = false, features = ["min_const_gen
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "rand_core", "zeroize"] }
 codespan-reporting = { version = "0.12" }
 crypto-common = { version = "0.1", default-features = false, features = ["rand_core", "std"] }
-event-listener-strategy = { version = "0.5" }
 flume = { version = "0.11" }
 foldhash = { version = "0.1", default-features = false, features = ["std"] }
 getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] }
@@ -651,7 +648,6 @@ bytemuck = { version = "1", default-features = false, features = ["min_const_gen
 cipher = { version = "0.4", default-features = false, features = ["block-padding", "rand_core", "zeroize"] }
 codespan-reporting = { version = "0.12" }
 crypto-common = { version = "0.1", default-features = false, features = ["rand_core", "std"] }
-event-listener-strategy = { version = "0.5" }
 flume = { version = "0.11" }
 foldhash = { version = "0.1", default-features = false, features = ["std"] }
 getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] }

From 4560d1ec58af7bbd4eed1eae55fca0854c455fc8 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 22 Aug 2025 23:09:37 +0300
Subject: [PATCH 306/823] Use a better message for the InvalidBufferView
 (#36770)

Follow-up of https://github.com/zed-industries/zed/pull/36764

Release Notes:

- N/A
---
 crates/workspace/src/invalid_buffer_view.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/workspace/src/invalid_buffer_view.rs b/crates/workspace/src/invalid_buffer_view.rs
index e2361d5967..b017373474 100644
--- a/crates/workspace/src/invalid_buffer_view.rs
+++ b/crates/workspace/src/invalid_buffer_view.rs
@@ -88,7 +88,7 @@ impl Render for InvalidBufferView {
                     v_flex()
                         .justify_center()
                         .gap_2()
-                        .child("Cannot display the file contents in Zed")
+                        .child(h_flex().justify_center().child("Unsupported file type"))
                         .when(self.is_local, |contents| {
                             contents.child(
                                 h_flex().justify_center().child(

From 896a35f7befce468427a30489adf88c851b9507d Mon Sep 17 00:00:00 2001
From: Jonathan Andersson <zeapo@pm.me>
Date: Fri, 22 Aug 2025 22:16:43 +0200
Subject: [PATCH 307/823] Capture `shorthand_field_initializer` and modules in
 Rust highlights (#35842)

Currently shorthand field initializers are not captured the same way as
the full initializers, leading to awkward and mismatching highlighting.
This PR addresses this fact, in addition to capturing new highlights:
- Tags the `!` as part of a macro invocation.
- Tags the identifier part of a lifetime as `@lifetime`.
- Tag module definitions as a new capture group, `@module`.
- Shorthand initializers are now properly tagged as `@property`.

Here's what the current version of Zed looks like:

<img width="596" height="683" alt="image"
src="https://github.com/user-attachments/assets/c9e52d8e-03dc-426b-8545-4fe872b803e0"
/>

With the new highlighting applied:

<img width="596" height="683" alt="image"
src="https://github.com/user-attachments/assets/b7bd9391-9910-456b-8198-6871174d0f4f"
/>

Release Notes:

- Improved highlighting of Rust files, including new highlight groups
for modules and shorthand initializers.
---
 crates/languages/src/rust/highlights.scm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
index 1c46061827..9c02fbedaa 100644
--- a/crates/languages/src/rust/highlights.scm
+++ b/crates/languages/src/rust/highlights.scm
@@ -6,6 +6,9 @@
 (self) @variable.special
 (field_identifier) @property
 
+(shorthand_field_initializer
+  (identifier) @property)
+
 (trait_item name: (type_identifier) @type.interface)
 (impl_item trait: (type_identifier) @type.interface)
 (abstract_type trait: (type_identifier) @type.interface)
@@ -38,11 +41,20 @@
     (identifier) @function.special
     (scoped_identifier
       name: (identifier) @function.special)
-  ])
+  ]
+  "!" @function.special)
 
 (macro_definition
   name: (identifier) @function.special.definition)
 
+(mod_item
+  name: (identifier) @module)
+
+(visibility_modifier [
+  (crate) @keyword
+  (super) @keyword
+])
+
 ; Identifier conventions
 
 ; Assume uppercase names are types/enum-constructors
@@ -115,9 +127,7 @@
   "where"
   "while"
   "yield"
-  (crate)
   (mutable_specifier)
-  (super)
 ] @keyword
 
 [
@@ -189,6 +199,7 @@
 operator: "/" @operator
 
 (lifetime) @lifetime
+(lifetime (identifier) @lifetime)
 
 (parameter (identifier) @variable.parameter)
 

From 639417c2bc2dec345b79024f243ce15bd60638a9 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 22 Aug 2025 17:40:52 -0300
Subject: [PATCH 308/823] thread_view: Adjust empty state and error displays
 (#36774)

Also changes the message editor placeholder depending on the agent.

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/agent2/src/native_agent_server.rs |   4 +-
 crates/agent_ui/src/acp/thread_view.rs   | 514 +++++++++++------------
 crates/agent_ui/src/agent_panel.rs       |   2 +-
 crates/ui/src/components/callout.rs      |   1 +
 4 files changed, 254 insertions(+), 267 deletions(-)

diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index ac5aa95c04..4ce467d6fd 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -23,11 +23,11 @@ impl NativeAgentServer {
 
 impl AgentServer for NativeAgentServer {
     fn name(&self) -> &'static str {
-        "Native Agent"
+        "Zed Agent"
     }
 
     fn empty_state_headline(&self) -> &'static str {
-        "Welcome to the Agent Panel"
+        self.name()
     }
 
     fn empty_state_message(&self) -> &'static str {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index d27dee1fe6..2a83a4ab5b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -258,6 +258,7 @@ pub struct AcpThreadView {
     hovered_recent_history_item: Option<usize>,
     entry_view_state: Entity<EntryViewState>,
     message_editor: Entity<MessageEditor>,
+    focus_handle: FocusHandle,
     model_selector: Option<Entity<AcpModelSelectorPopover>>,
     profile_selector: Option<Entity<ProfileSelector>>,
     notifications: Vec<WindowHandle<AgentNotification>>,
@@ -312,6 +313,13 @@ impl AcpThreadView {
     ) -> Self {
         let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
         let prevent_slash_commands = agent.clone().downcast::<ClaudeCode>().is_some();
+
+        let placeholder = if agent.name() == "Zed Agent" {
+            format!("Message the {} — @ to include context", agent.name())
+        } else {
+            format!("Message {} — @ to include context", agent.name())
+        };
+
         let message_editor = cx.new(|cx| {
             let mut editor = MessageEditor::new(
                 workspace.clone(),
@@ -319,7 +327,7 @@ impl AcpThreadView {
                 history_store.clone(),
                 prompt_store.clone(),
                 prompt_capabilities.clone(),
-                "Message the agent — @ to include context",
+                placeholder,
                 prevent_slash_commands,
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
@@ -381,6 +389,7 @@ impl AcpThreadView {
             prompt_capabilities,
             _subscriptions: subscriptions,
             _cancel_task: None,
+            focus_handle: cx.focus_handle(),
         }
     }
 
@@ -404,8 +413,12 @@ impl AcpThreadView {
             let connection = match connect_task.await {
                 Ok(connection) => connection,
                 Err(err) => {
-                    this.update(cx, |this, cx| {
-                        this.handle_load_error(err, cx);
+                    this.update_in(cx, |this, window, cx| {
+                        if err.downcast_ref::<LoadError>().is_some() {
+                            this.handle_load_error(err, window, cx);
+                        } else {
+                            this.handle_thread_error(err, cx);
+                        }
                         cx.notify();
                     })
                     .log_err();
@@ -522,6 +535,7 @@ impl AcpThreadView {
                             title_editor,
                             _subscriptions: subscriptions,
                         };
+                        this.message_editor.focus_handle(cx).focus(window);
 
                         this.profile_selector = this.as_native_thread(cx).map(|thread| {
                             cx.new(|cx| {
@@ -537,7 +551,7 @@ impl AcpThreadView {
                         cx.notify();
                     }
                     Err(err) => {
-                        this.handle_load_error(err, cx);
+                        this.handle_load_error(err, window, cx);
                     }
                 };
             })
@@ -606,17 +620,28 @@ impl AcpThreadView {
                     .map(|desc| cx.new(|cx| Markdown::new(desc.into(), None, None, cx))),
                 _subscription: subscription,
             };
+            if this.message_editor.focus_handle(cx).is_focused(window) {
+                this.focus_handle.focus(window)
+            }
             cx.notify();
         })
         .ok();
     }
 
-    fn handle_load_error(&mut self, err: anyhow::Error, cx: &mut Context<Self>) {
+    fn handle_load_error(
+        &mut self,
+        err: anyhow::Error,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         if let Some(load_err) = err.downcast_ref::<LoadError>() {
             self.thread_state = ThreadState::LoadError(load_err.clone());
         } else {
             self.thread_state = ThreadState::LoadError(LoadError::Other(err.to_string().into()))
         }
+        if self.message_editor.focus_handle(cx).is_focused(window) {
+            self.focus_handle.focus(window)
+        }
         cx.notify();
     }
 
@@ -633,12 +658,11 @@ impl AcpThreadView {
         }
     }
 
-    pub fn title(&self, cx: &App) -> SharedString {
+    pub fn title(&self) -> SharedString {
         match &self.thread_state {
-            ThreadState::Ready { thread, .. } => thread.read(cx).title(),
+            ThreadState::Ready { .. } | ThreadState::Unauthenticated { .. } => "New Thread".into(),
             ThreadState::Loading { .. } => "Loading…".into(),
             ThreadState::LoadError(_) => "Failed to load".into(),
-            ThreadState::Unauthenticated { .. } => "Authentication Required".into(),
         }
     }
 
@@ -1069,6 +1093,9 @@ impl AcpThreadView {
             AcpThreadEvent::LoadError(error) => {
                 self.thread_retry_status.take();
                 self.thread_state = ThreadState::LoadError(error.clone());
+                if self.message_editor.focus_handle(cx).is_focused(window) {
+                    self.focus_handle.focus(window)
+                }
             }
             AcpThreadEvent::TitleUpdated => {
                 let title = thread.read(cx).title();
@@ -2338,33 +2365,6 @@ impl AcpThreadView {
             .into_any()
     }
 
-    fn render_agent_logo(&self) -> AnyElement {
-        Icon::new(self.agent.logo())
-            .color(Color::Muted)
-            .size(IconSize::XLarge)
-            .into_any_element()
-    }
-
-    fn render_error_agent_logo(&self) -> AnyElement {
-        let logo = Icon::new(self.agent.logo())
-            .color(Color::Muted)
-            .size(IconSize::XLarge)
-            .into_any_element();
-
-        h_flex()
-            .relative()
-            .justify_center()
-            .child(div().opacity(0.3).child(logo))
-            .child(
-                h_flex()
-                    .absolute()
-                    .right_1()
-                    .bottom_0()
-                    .child(Icon::new(IconName::XCircleFilled).color(Color::Error)),
-            )
-            .into_any_element()
-    }
-
     fn render_rules_item(&self, cx: &Context<Self>) -> Option<AnyElement> {
         let project_context = self
             .as_native_thread(cx)?
@@ -2493,8 +2493,7 @@ impl AcpThreadView {
         )
     }
 
-    fn render_empty_state(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        let loading = matches!(&self.thread_state, ThreadState::Loading { .. });
+    fn render_recent_history(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
         let render_history = self
             .agent
             .clone()
@@ -2506,38 +2505,6 @@ impl AcpThreadView {
 
         v_flex()
             .size_full()
-            .when(!render_history, |this| {
-                this.child(
-                    v_flex()
-                        .size_full()
-                        .items_center()
-                        .justify_center()
-                        .child(if loading {
-                            h_flex()
-                                .justify_center()
-                                .child(self.render_agent_logo())
-                                .with_animation(
-                                    "pulsating_icon",
-                                    Animation::new(Duration::from_secs(2))
-                                        .repeat()
-                                        .with_easing(pulsating_between(0.4, 1.0)),
-                                    |icon, delta| icon.opacity(delta),
-                                )
-                                .into_any()
-                        } else {
-                            self.render_agent_logo().into_any_element()
-                        })
-                        .child(h_flex().mt_4().mb_2().justify_center().child(if loading {
-                            div()
-                                .child(LoadingLabel::new("").size(LabelSize::Large))
-                                .into_any_element()
-                        } else {
-                            Headline::new(self.agent.empty_state_headline())
-                                .size(HeadlineSize::Medium)
-                                .into_any_element()
-                        })),
-                )
-            })
             .when(render_history, |this| {
                 let recent_history: Vec<_> = self.history_store.update(cx, |history_store, _| {
                     history_store.entries().take(3).collect()
@@ -2612,196 +2579,118 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &Context<Self>,
     ) -> Div {
-        v_flex()
-            .p_2()
-            .gap_2()
-            .flex_1()
-            .items_center()
-            .justify_center()
-            .child(
-                v_flex()
-                    .items_center()
-                    .justify_center()
-                    .child(self.render_error_agent_logo())
-                    .child(
-                        h_flex().mt_4().mb_1().justify_center().child(
-                            Headline::new("Authentication Required").size(HeadlineSize::Medium),
+        v_flex().flex_1().size_full().justify_end().child(
+            v_flex()
+                .p_2()
+                .pr_3()
+                .w_full()
+                .border_t_1()
+                .border_color(cx.theme().colors().border)
+                .bg(cx.theme().status().warning.opacity(0.04))
+                .child(
+                    h_flex()
+                        .gap_1p5()
+                        .child(
+                            Icon::new(IconName::Warning)
+                                .color(Color::Warning)
+                                .size(IconSize::Small),
+                        )
+                        .child(Label::new("Authentication Required")),
+                )
+                .children(description.map(|desc| {
+                    div().text_ui(cx).child(self.render_markdown(
+                        desc.clone(),
+                        default_markdown_style(false, false, window, cx),
+                    ))
+                }))
+                .children(
+                    configuration_view
+                        .cloned()
+                        .map(|view| div().w_full().child(view)),
+                )
+                .when(
+                    configuration_view.is_none()
+                        && description.is_none()
+                        && pending_auth_method.is_none(),
+                    |el| {
+                        el.child(
+                            Label::new(format!(
+                                "You are not currently authenticated with {}. Please choose one of the following options:",
+                                self.agent.name()
+                            ))
+                            .color(Color::Muted)
+                            .mb_1()
+                            .ml_5(),
+                        )
+                    },
+                )
+                .when(!connection.auth_methods().is_empty(), |this| {
+                    this.child(
+                        h_flex().justify_end().flex_wrap().gap_1().children(
+                            connection.auth_methods().iter().enumerate().rev().map(
+                                |(ix, method)| {
+                                    Button::new(
+                                        SharedString::from(method.id.0.clone()),
+                                        method.name.clone(),
+                                    )
+                                    .when(ix == 0, |el| {
+                                        el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
+                                    })
+                                    .on_click({
+                                        let method_id = method.id.clone();
+                                        cx.listener(move |this, _, window, cx| {
+                                            this.authenticate(method_id.clone(), window, cx)
+                                        })
+                                    })
+                                },
+                            ),
                         ),
                     )
-                    .into_any(),
-            )
-            .children(description.map(|desc| {
-                div().text_ui(cx).text_center().child(self.render_markdown(
-                    desc.clone(),
-                    default_markdown_style(false, false, window, cx),
-                ))
-            }))
-            .children(
-                configuration_view
-                    .cloned()
-                    .map(|view| div().px_4().w_full().max_w_128().child(view)),
-            )
-            .when(
-                configuration_view.is_none()
-                    && description.is_none()
-                    && pending_auth_method.is_none(),
-                |el| {
+                })
+                .when_some(pending_auth_method, |el, _| {
                     el.child(
-                        div()
-                            .text_ui(cx)
-                            .text_center()
-                            .px_4()
+                        h_flex()
+                            .py_4()
                             .w_full()
-                            .max_w_128()
-                            .child(Label::new("Authentication required")),
-                    )
-                },
-            )
-            .when_some(pending_auth_method, |el, _| {
-                let spinner_icon = div()
-                    .px_0p5()
-                    .id("generating")
-                    .tooltip(Tooltip::text("Generating Changes…"))
-                    .child(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::Small)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
+                            .justify_center()
+                            .gap_1()
+                            .child(
+                                Icon::new(IconName::ArrowCircle)
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted)
+                                    .with_animation(
+                                        "arrow-circle",
+                                        Animation::new(Duration::from_secs(2)).repeat(),
+                                        |icon, delta| {
+                                            icon.transform(Transformation::rotate(percentage(
+                                                delta,
+                                            )))
+                                        },
+                                    )
+                                    .into_any_element(),
                             )
-                            .into_any_element(),
+                            .child(Label::new("Authenticating…")),
                     )
-                    .into_any();
-                el.child(
-                    h_flex()
-                        .text_ui(cx)
-                        .text_center()
-                        .justify_center()
-                        .gap_2()
-                        .px_4()
-                        .w_full()
-                        .max_w_128()
-                        .child(Label::new("Authenticating..."))
-                        .child(spinner_icon),
-                )
-            })
-            .child(
-                h_flex()
-                    .mt_1p5()
-                    .gap_1()
-                    .flex_wrap()
-                    .justify_center()
-                    .children(connection.auth_methods().iter().enumerate().rev().map(
-                        |(ix, method)| {
-                            Button::new(
-                                SharedString::from(method.id.0.clone()),
-                                method.name.clone(),
-                            )
-                            .style(ButtonStyle::Outlined)
-                            .when(ix == 0, |el| {
-                                el.style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                            })
-                            .size(ButtonSize::Medium)
-                            .label_size(LabelSize::Small)
-                            .on_click({
-                                let method_id = method.id.clone();
-                                cx.listener(move |this, _, window, cx| {
-                                    this.authenticate(method_id.clone(), window, cx)
-                                })
-                            })
-                        },
-                    )),
-            )
+                }),
+        )
     }
 
     fn render_load_error(&self, e: &LoadError, cx: &Context<Self>) -> AnyElement {
-        let mut container = v_flex()
-            .items_center()
-            .justify_center()
-            .child(self.render_error_agent_logo())
-            .child(
-                v_flex()
-                    .mt_4()
-                    .mb_2()
-                    .gap_0p5()
-                    .text_center()
-                    .items_center()
-                    .child(Headline::new("Failed to launch").size(HeadlineSize::Medium))
-                    .child(
-                        Label::new(e.to_string())
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    ),
-            );
-
-        if let LoadError::Unsupported {
-            upgrade_message,
-            upgrade_command,
-            ..
-        } = &e
-        {
-            let upgrade_message = upgrade_message.clone();
-            let upgrade_command = upgrade_command.clone();
-            container = container.child(
-                Button::new("upgrade", upgrade_message)
-                    .tooltip(Tooltip::text(upgrade_command.clone()))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        let task = this
-                            .workspace
-                            .update(cx, |workspace, cx| {
-                                let project = workspace.project().read(cx);
-                                let cwd = project.first_project_directory(cx);
-                                let shell = project.terminal_settings(&cwd, cx).shell.clone();
-                                let spawn_in_terminal = task::SpawnInTerminal {
-                                    id: task::TaskId("upgrade".to_string()),
-                                    full_label: upgrade_command.clone(),
-                                    label: upgrade_command.clone(),
-                                    command: Some(upgrade_command.clone()),
-                                    args: Vec::new(),
-                                    command_label: upgrade_command.clone(),
-                                    cwd,
-                                    env: Default::default(),
-                                    use_new_terminal: true,
-                                    allow_concurrent_runs: true,
-                                    reveal: Default::default(),
-                                    reveal_target: Default::default(),
-                                    hide: Default::default(),
-                                    shell,
-                                    show_summary: true,
-                                    show_command: true,
-                                    show_rerun: false,
-                                };
-                                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
-                            })
-                            .ok();
-                        let Some(task) = task else { return };
-                        cx.spawn_in(window, async move |this, cx| {
-                            if let Some(Ok(_)) = task.await {
-                                this.update_in(cx, |this, window, cx| {
-                                    this.reset(window, cx);
-                                })
-                                .ok();
-                            }
-                        })
-                        .detach()
-                    })),
-            );
-        } else if let LoadError::NotInstalled {
-            install_message,
-            install_command,
-            ..
-        } = e
-        {
-            let install_message = install_message.clone();
-            let install_command = install_command.clone();
-            container = container.child(
-                Button::new("install", install_message)
-                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                    .size(ButtonSize::Medium)
+        let (message, action_slot) = match e {
+            LoadError::NotInstalled {
+                error_message,
+                install_message,
+                install_command,
+            } => {
+                let install_command = install_command.clone();
+                let button = Button::new("install", install_message)
                     .tooltip(Tooltip::text(install_command.clone()))
+                    .style(ButtonStyle::Outlined)
+                    .label_size(LabelSize::Small)
+                    .icon(IconName::Download)
+                    .icon_size(IconSize::Small)
+                    .icon_color(Color::Muted)
+                    .icon_position(IconPosition::Start)
                     .on_click(cx.listener(move |this, _, window, cx| {
                         let task = this
                             .workspace
@@ -2841,11 +2730,81 @@ impl AcpThreadView {
                             }
                         })
                         .detach()
-                    })),
-            );
-        }
+                    }));
 
-        container.into_any()
+                (error_message.clone(), Some(button.into_any_element()))
+            }
+            LoadError::Unsupported {
+                error_message,
+                upgrade_message,
+                upgrade_command,
+            } => {
+                let upgrade_command = upgrade_command.clone();
+                let button = Button::new("upgrade", upgrade_message)
+                    .tooltip(Tooltip::text(upgrade_command.clone()))
+                    .style(ButtonStyle::Outlined)
+                    .label_size(LabelSize::Small)
+                    .icon(IconName::Download)
+                    .icon_size(IconSize::Small)
+                    .icon_color(Color::Muted)
+                    .icon_position(IconPosition::Start)
+                    .on_click(cx.listener(move |this, _, window, cx| {
+                        let task = this
+                            .workspace
+                            .update(cx, |workspace, cx| {
+                                let project = workspace.project().read(cx);
+                                let cwd = project.first_project_directory(cx);
+                                let shell = project.terminal_settings(&cwd, cx).shell.clone();
+                                let spawn_in_terminal = task::SpawnInTerminal {
+                                    id: task::TaskId("upgrade".to_string()),
+                                    full_label: upgrade_command.clone(),
+                                    label: upgrade_command.clone(),
+                                    command: Some(upgrade_command.clone()),
+                                    args: Vec::new(),
+                                    command_label: upgrade_command.clone(),
+                                    cwd,
+                                    env: Default::default(),
+                                    use_new_terminal: true,
+                                    allow_concurrent_runs: true,
+                                    reveal: Default::default(),
+                                    reveal_target: Default::default(),
+                                    hide: Default::default(),
+                                    shell,
+                                    show_summary: true,
+                                    show_command: true,
+                                    show_rerun: false,
+                                };
+                                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
+                            })
+                            .ok();
+                        let Some(task) = task else { return };
+                        cx.spawn_in(window, async move |this, cx| {
+                            if let Some(Ok(_)) = task.await {
+                                this.update_in(cx, |this, window, cx| {
+                                    this.reset(window, cx);
+                                })
+                                .ok();
+                            }
+                        })
+                        .detach()
+                    }));
+
+                (error_message.clone(), Some(button.into_any_element()))
+            }
+            LoadError::Exited { .. } => ("Server exited with status {status}".into(), None),
+            LoadError::Other(msg) => (
+                msg.into(),
+                Some(self.create_copy_button(msg.to_string()).into_any_element()),
+            ),
+        };
+
+        Callout::new()
+            .severity(Severity::Error)
+            .icon(IconName::XCircleFilled)
+            .title("Failed to Launch")
+            .description(message)
+            .actions_slot(div().children(action_slot))
+            .into_any_element()
     }
 
     fn render_activity_bar(
@@ -3336,6 +3295,19 @@ impl AcpThreadView {
             (IconName::Maximize, "Expand Message Editor")
         };
 
+        let backdrop = div()
+            .size_full()
+            .absolute()
+            .inset_0()
+            .bg(cx.theme().colors().panel_background)
+            .opacity(0.8)
+            .block_mouse_except_scroll();
+
+        let enable_editor = match self.thread_state {
+            ThreadState::Loading { .. } | ThreadState::Ready { .. } => true,
+            ThreadState::Unauthenticated { .. } | ThreadState::LoadError(..) => false,
+        };
+
         v_flex()
             .on_action(cx.listener(Self::expand_message_editor))
             .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
@@ -3411,6 +3383,7 @@ impl AcpThreadView {
                             .child(self.render_send_button(cx)),
                     ),
             )
+            .when(!enable_editor, |this| this.child(backdrop))
             .into_any()
     }
 
@@ -3913,18 +3886,19 @@ impl AcpThreadView {
             return;
         }
 
-        let title = self.title(cx);
+        // TODO: Change this once we have title summarization for external agents.
+        let title = self.agent.name();
 
         match AgentSettings::get_global(cx).notify_when_agent_waiting {
             NotifyWhenAgentWaiting::PrimaryScreen => {
                 if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title, window, primary, cx);
+                    self.pop_up(icon, caption.into(), title.into(), window, primary, cx);
                 }
             }
             NotifyWhenAgentWaiting::AllScreens => {
                 let caption = caption.into();
                 for screen in cx.displays() {
-                    self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
+                    self.pop_up(icon, caption.clone(), title.into(), window, screen, cx);
                 }
             }
             NotifyWhenAgentWaiting::Never => {
@@ -4423,6 +4397,7 @@ impl AcpThreadView {
         Callout::new()
             .severity(Severity::Error)
             .title("Error")
+            .icon(IconName::XCircle)
             .description(error.clone())
             .actions_slot(self.create_copy_button(error.to_string()))
             .dismiss_action(self.dismiss_error_button(cx))
@@ -4434,6 +4409,7 @@ impl AcpThreadView {
 
         Callout::new()
             .severity(Severity::Error)
+            .icon(IconName::XCircle)
             .title("Free Usage Exceeded")
             .description(ERROR_MESSAGE)
             .actions_slot(
@@ -4453,6 +4429,7 @@ impl AcpThreadView {
         Callout::new()
             .severity(Severity::Error)
             .title("Authentication Required")
+            .icon(IconName::XCircle)
             .description(error.clone())
             .actions_slot(
                 h_flex()
@@ -4478,6 +4455,7 @@ impl AcpThreadView {
         Callout::new()
             .severity(Severity::Error)
             .title("Model Prompt Limit Reached")
+            .icon(IconName::XCircle)
             .description(error_message)
             .actions_slot(
                 h_flex()
@@ -4648,7 +4626,14 @@ impl AcpThreadView {
 
 impl Focusable for AcpThreadView {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.message_editor.focus_handle(cx)
+        match self.thread_state {
+            ThreadState::Loading { .. } | ThreadState::Ready { .. } => {
+                self.message_editor.focus_handle(cx)
+            }
+            ThreadState::LoadError(_) | ThreadState::Unauthenticated { .. } => {
+                self.focus_handle.clone()
+            }
+        }
     }
 }
 
@@ -4664,6 +4649,7 @@ impl Render for AcpThreadView {
             .on_action(cx.listener(Self::toggle_burn_mode))
             .on_action(cx.listener(Self::keep_all))
             .on_action(cx.listener(Self::reject_all))
+            .track_focus(&self.focus_handle)
             .bg(cx.theme().colors().panel_background)
             .child(match &self.thread_state {
                 ThreadState::Unauthenticated {
@@ -4680,14 +4666,14 @@ impl Render for AcpThreadView {
                     window,
                     cx,
                 ),
-                ThreadState::Loading { .. } => {
-                    v_flex().flex_1().child(self.render_empty_state(window, cx))
-                }
-                ThreadState::LoadError(e) => v_flex()
-                    .p_2()
+                ThreadState::Loading { .. } => v_flex()
                     .flex_1()
+                    .child(self.render_recent_history(window, cx)),
+                ThreadState::LoadError(e) => v_flex()
+                    .flex_1()
+                    .size_full()
                     .items_center()
-                    .justify_center()
+                    .justify_end()
                     .child(self.render_load_error(e, cx)),
                 ThreadState::Ready { thread, .. } => {
                     let thread_clone = thread.clone();
@@ -4724,7 +4710,7 @@ impl Render for AcpThreadView {
                                 },
                             )
                         } else {
-                            this.child(self.render_empty_state(window, cx))
+                            this.child(self.render_recent_history(window, cx))
                         }
                     })
                 }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index d0fb676fd2..0e611d0db9 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2097,7 +2097,7 @@ impl AgentPanel {
                         .child(title_editor)
                         .into_any_element()
                 } else {
-                    Label::new(thread_view.read(cx).title(cx))
+                    Label::new(thread_view.read(cx).title())
                         .color(Color::Muted)
                         .truncate()
                         .into_any_element()
diff --git a/crates/ui/src/components/callout.rs b/crates/ui/src/components/callout.rs
index 7ffeda881c..b1ead18ee7 100644
--- a/crates/ui/src/components/callout.rs
+++ b/crates/ui/src/components/callout.rs
@@ -132,6 +132,7 @@ impl RenderOnce for Callout {
 
         h_flex()
             .min_w_0()
+            .w_full()
             .p_2()
             .gap_2()
             .items_start()

From f649c31bf94ac56757aff1394c5a0926232285af Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 22 Aug 2025 14:10:45 -0700
Subject: [PATCH 309/823] Restructure persistence of remote workspaces to make
 room for WSL and other non-ssh remote projects (#36714)

This is another pure refactor, to prepare for adding direct WSL support.

###  Todo

* [x] Represent `paths` in the same way for all workspaces, instead of
having a completely separate SSH representation
* [x] Adjust sqlite tables
    * [x] `ssh_projects` -> `ssh_connections` (drop paths)
    * [x] `workspaces.local_paths` -> `paths`
    * [x] remove duplicate path columns on `workspaces`
* [x] Add migrations for backward-compatibility

Release Notes:

- N/A

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
---
 Cargo.lock                                    |    2 +-
 crates/client/src/user.rs                     |    5 -
 .../src/disconnected_overlay.rs               |   14 +-
 crates/recent_projects/src/recent_projects.rs |   62 +-
 crates/workspace/Cargo.toml                   |    2 +-
 crates/workspace/src/history_manager.rs       |   18 +-
 crates/workspace/src/path_list.rs             |  121 ++
 crates/workspace/src/persistence.rs           | 1121 ++++++++---------
 crates/workspace/src/persistence/model.rs     |  305 +----
 crates/workspace/src/workspace.rs             |  182 +--
 crates/zed/src/main.rs                        |   15 +-
 crates/zed/src/zed/open_listener.rs           |   17 +-
 12 files changed, 784 insertions(+), 1080 deletions(-)
 create mode 100644 crates/workspace/src/path_list.rs

diff --git a/Cargo.lock b/Cargo.lock
index cd1018d4c9..4043666823 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19829,7 +19829,6 @@ dependencies = [
  "any_vec",
  "anyhow",
  "async-recursion",
- "bincode",
  "call",
  "client",
  "clock",
@@ -19848,6 +19847,7 @@ dependencies = [
  "node_runtime",
  "parking_lot",
  "postage",
+ "pretty_assertions",
  "project",
  "remote",
  "schemars",
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 1f8174dbc3..d23eb37519 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -46,11 +46,6 @@ impl ProjectId {
     }
 }
 
-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
-)]
-pub struct DevServerProjectId(pub u64);
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ParticipantIndex(pub u32);
 
diff --git a/crates/recent_projects/src/disconnected_overlay.rs b/crates/recent_projects/src/disconnected_overlay.rs
index dd4d788cfd..8ffe0ef07c 100644
--- a/crates/recent_projects/src/disconnected_overlay.rs
+++ b/crates/recent_projects/src/disconnected_overlay.rs
@@ -1,5 +1,3 @@
-use std::path::PathBuf;
-
 use gpui::{ClickEvent, DismissEvent, EventEmitter, FocusHandle, Focusable, Render, WeakEntity};
 use project::project_settings::ProjectSettings;
 use remote::SshConnectionOptions;
@@ -103,17 +101,17 @@ impl DisconnectedOverlay {
             return;
         };
 
-        let Some(ssh_project) = workspace.read(cx).serialized_ssh_project() else {
-            return;
-        };
-
         let Some(window_handle) = window.window_handle().downcast::<Workspace>() else {
             return;
         };
 
         let app_state = workspace.read(cx).app_state().clone();
-
-        let paths = ssh_project.paths.iter().map(PathBuf::from).collect();
+        let paths = workspace
+            .read(cx)
+            .root_paths(cx)
+            .iter()
+            .map(|path| path.to_path_buf())
+            .collect();
 
         cx.spawn_in(window, async move |_, cx| {
             open_ssh_project(
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 2093e96cae..fa57b588cd 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -19,15 +19,12 @@ use picker::{
 pub use remote_servers::RemoteServerProjects;
 use settings::Settings;
 pub use ssh_connections::SshSettings;
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
+use std::{path::Path, sync::Arc};
 use ui::{KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*, tooltip_container};
 use util::{ResultExt, paths::PathExt};
 use workspace::{
-    CloseIntent, HistoryManager, ModalView, OpenOptions, SerializedWorkspaceLocation, WORKSPACE_DB,
-    Workspace, WorkspaceId, with_active_or_new_workspace,
+    CloseIntent, HistoryManager, ModalView, OpenOptions, PathList, SerializedWorkspaceLocation,
+    WORKSPACE_DB, Workspace, WorkspaceId, with_active_or_new_workspace,
 };
 use zed_actions::{OpenRecent, OpenRemote};
 
@@ -154,7 +151,7 @@ impl Render for RecentProjects {
 
 pub struct RecentProjectsDelegate {
     workspace: WeakEntity<Workspace>,
-    workspaces: Vec<(WorkspaceId, SerializedWorkspaceLocation)>,
+    workspaces: Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>,
     selected_match_index: usize,
     matches: Vec<StringMatch>,
     render_paths: bool,
@@ -178,12 +175,15 @@ impl RecentProjectsDelegate {
         }
     }
 
-    pub fn set_workspaces(&mut self, workspaces: Vec<(WorkspaceId, SerializedWorkspaceLocation)>) {
+    pub fn set_workspaces(
+        &mut self,
+        workspaces: Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>,
+    ) {
         self.workspaces = workspaces;
         self.has_any_non_local_projects = !self
             .workspaces
             .iter()
-            .all(|(_, location)| matches!(location, SerializedWorkspaceLocation::Local(_, _)));
+            .all(|(_, location, _)| matches!(location, SerializedWorkspaceLocation::Local));
     }
 }
 impl EventEmitter<DismissEvent> for RecentProjectsDelegate {}
@@ -236,15 +236,14 @@ impl PickerDelegate for RecentProjectsDelegate {
             .workspaces
             .iter()
             .enumerate()
-            .filter(|(_, (id, _))| !self.is_current_workspace(*id, cx))
-            .map(|(id, (_, location))| {
-                let combined_string = location
-                    .sorted_paths()
+            .filter(|(_, (id, _, _))| !self.is_current_workspace(*id, cx))
+            .map(|(id, (_, _, paths))| {
+                let combined_string = paths
+                    .paths()
                     .iter()
                     .map(|path| path.compact().to_string_lossy().into_owned())
                     .collect::<Vec<_>>()
                     .join("");
-
                 StringMatchCandidate::new(id, &combined_string)
             })
             .collect::<Vec<_>>();
@@ -279,7 +278,7 @@ impl PickerDelegate for RecentProjectsDelegate {
             .get(self.selected_index())
             .zip(self.workspace.upgrade())
         {
-            let (candidate_workspace_id, candidate_workspace_location) =
+            let (candidate_workspace_id, candidate_workspace_location, candidate_workspace_paths) =
                 &self.workspaces[selected_match.candidate_id];
             let replace_current_window = if self.create_new_window {
                 secondary
@@ -292,8 +291,8 @@ impl PickerDelegate for RecentProjectsDelegate {
                         Task::ready(Ok(()))
                     } else {
                         match candidate_workspace_location {
-                            SerializedWorkspaceLocation::Local(paths, _) => {
-                                let paths = paths.paths().to_vec();
+                            SerializedWorkspaceLocation::Local => {
+                                let paths = candidate_workspace_paths.paths().to_vec();
                                 if replace_current_window {
                                     cx.spawn_in(window, async move |workspace, cx| {
                                         let continue_replacing = workspace
@@ -321,7 +320,7 @@ impl PickerDelegate for RecentProjectsDelegate {
                                     workspace.open_workspace_for_paths(false, paths, window, cx)
                                 }
                             }
-                            SerializedWorkspaceLocation::Ssh(ssh_project) => {
+                            SerializedWorkspaceLocation::Ssh(connection) => {
                                 let app_state = workspace.app_state().clone();
 
                                 let replace_window = if replace_current_window {
@@ -337,12 +336,12 @@ impl PickerDelegate for RecentProjectsDelegate {
 
                                 let connection_options = SshSettings::get_global(cx)
                                     .connection_options_for(
-                                        ssh_project.host.clone(),
-                                        ssh_project.port,
-                                        ssh_project.user.clone(),
+                                        connection.host.clone(),
+                                        connection.port,
+                                        connection.user.clone(),
                                     );
 
-                                let paths = ssh_project.paths.iter().map(PathBuf::from).collect();
+                                let paths = candidate_workspace_paths.paths().to_vec();
 
                                 cx.spawn_in(window, async move |_, cx| {
                                     open_ssh_project(
@@ -383,12 +382,12 @@ impl PickerDelegate for RecentProjectsDelegate {
     ) -> Option<Self::ListItem> {
         let hit = self.matches.get(ix)?;
 
-        let (_, location) = self.workspaces.get(hit.candidate_id)?;
+        let (_, location, paths) = self.workspaces.get(hit.candidate_id)?;
 
         let mut path_start_offset = 0;
 
-        let (match_labels, paths): (Vec<_>, Vec<_>) = location
-            .sorted_paths()
+        let (match_labels, paths): (Vec<_>, Vec<_>) = paths
+            .paths()
             .iter()
             .map(|p| p.compact())
             .map(|path| {
@@ -416,11 +415,9 @@ impl PickerDelegate for RecentProjectsDelegate {
                         .gap_3()
                         .when(self.has_any_non_local_projects, |this| {
                             this.child(match location {
-                                SerializedWorkspaceLocation::Local(_, _) => {
-                                    Icon::new(IconName::Screen)
-                                        .color(Color::Muted)
-                                        .into_any_element()
-                                }
+                                SerializedWorkspaceLocation::Local => Icon::new(IconName::Screen)
+                                    .color(Color::Muted)
+                                    .into_any_element(),
                                 SerializedWorkspaceLocation::Ssh(_) => Icon::new(IconName::Server)
                                     .color(Color::Muted)
                                     .into_any_element(),
@@ -568,7 +565,7 @@ impl RecentProjectsDelegate {
         cx: &mut Context<Picker<Self>>,
     ) {
         if let Some(selected_match) = self.matches.get(ix) {
-            let (workspace_id, _) = self.workspaces[selected_match.candidate_id];
+            let (workspace_id, _, _) = self.workspaces[selected_match.candidate_id];
             cx.spawn_in(window, async move |this, cx| {
                 let _ = WORKSPACE_DB.delete_workspace_by_id(workspace_id).await;
                 let workspaces = WORKSPACE_DB
@@ -707,7 +704,8 @@ mod tests {
                     }];
                     delegate.set_workspaces(vec![(
                         WorkspaceId::default(),
-                        SerializedWorkspaceLocation::from_local_paths(vec![path!("/test/path/")]),
+                        SerializedWorkspaceLocation::Local,
+                        PathList::new(&[path!("/test/path")]),
                     )]);
                 });
             })
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index 570657ba8f..869aa5322e 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -29,7 +29,6 @@ test-support = [
 any_vec.workspace = true
 anyhow.workspace = true
 async-recursion.workspace = true
-bincode.workspace = true
 call.workspace = true
 client.workspace = true
 clock.workspace = true
@@ -80,5 +79,6 @@ project = { workspace = true, features = ["test-support"] }
 session = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
 http_client = { workspace = true, features = ["test-support"] }
+pretty_assertions.workspace = true
 tempfile.workspace = true
 zlog.workspace = true
diff --git a/crates/workspace/src/history_manager.rs b/crates/workspace/src/history_manager.rs
index a8387369f4..f68b58ff82 100644
--- a/crates/workspace/src/history_manager.rs
+++ b/crates/workspace/src/history_manager.rs
@@ -5,7 +5,9 @@ use smallvec::SmallVec;
 use ui::App;
 use util::{ResultExt, paths::PathExt};
 
-use crate::{NewWindow, SerializedWorkspaceLocation, WORKSPACE_DB, WorkspaceId};
+use crate::{
+    NewWindow, SerializedWorkspaceLocation, WORKSPACE_DB, WorkspaceId, path_list::PathList,
+};
 
 pub fn init(cx: &mut App) {
     let manager = cx.new(|_| HistoryManager::new());
@@ -44,7 +46,13 @@ impl HistoryManager {
                 .unwrap_or_default()
                 .into_iter()
                 .rev()
-                .map(|(id, location)| HistoryManagerEntry::new(id, &location))
+                .filter_map(|(id, location, paths)| {
+                    if matches!(location, SerializedWorkspaceLocation::Local) {
+                        Some(HistoryManagerEntry::new(id, &paths))
+                    } else {
+                        None
+                    }
+                })
                 .collect::<Vec<_>>();
             this.update(cx, |this, cx| {
                 this.history = recent_folders;
@@ -118,9 +126,9 @@ impl HistoryManager {
 }
 
 impl HistoryManagerEntry {
-    pub fn new(id: WorkspaceId, location: &SerializedWorkspaceLocation) -> Self {
-        let path = location
-            .sorted_paths()
+    pub fn new(id: WorkspaceId, paths: &PathList) -> Self {
+        let path = paths
+            .paths()
             .iter()
             .map(|path| path.compact())
             .collect::<SmallVec<[PathBuf; 2]>>();
diff --git a/crates/workspace/src/path_list.rs b/crates/workspace/src/path_list.rs
new file mode 100644
index 0000000000..4f9ed42312
--- /dev/null
+++ b/crates/workspace/src/path_list.rs
@@ -0,0 +1,121 @@
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+
+use util::paths::SanitizedPath;
+
+/// A list of absolute paths, in a specific order.
+///
+/// The paths are stored in lexicographic order, so that they can be compared to
+/// other path lists without regard to the order of the paths.
+#[derive(Default, PartialEq, Eq, Debug, Clone)]
+pub struct PathList {
+    paths: Arc<[PathBuf]>,
+    order: Arc<[usize]>,
+}
+
+#[derive(Debug)]
+pub struct SerializedPathList {
+    pub paths: String,
+    pub order: String,
+}
+
+impl PathList {
+    pub fn new<P: AsRef<Path>>(paths: &[P]) -> Self {
+        let mut indexed_paths: Vec<(usize, PathBuf)> = paths
+            .iter()
+            .enumerate()
+            .map(|(ix, path)| (ix, SanitizedPath::from(path).into()))
+            .collect();
+        indexed_paths.sort_by(|(_, a), (_, b)| a.cmp(b));
+        let order = indexed_paths.iter().map(|e| e.0).collect::<Vec<_>>().into();
+        let paths = indexed_paths
+            .into_iter()
+            .map(|e| e.1)
+            .collect::<Vec<_>>()
+            .into();
+        Self { order, paths }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.paths.is_empty()
+    }
+
+    pub fn paths(&self) -> &[PathBuf] {
+        self.paths.as_ref()
+    }
+
+    pub fn order(&self) -> &[usize] {
+        self.order.as_ref()
+    }
+
+    pub fn is_lexicographically_ordered(&self) -> bool {
+        self.order.iter().enumerate().all(|(i, &j)| i == j)
+    }
+
+    pub fn deserialize(serialized: &SerializedPathList) -> Self {
+        let mut paths: Vec<PathBuf> = if serialized.paths.is_empty() {
+            Vec::new()
+        } else {
+            serde_json::from_str::<Vec<PathBuf>>(&serialized.paths)
+                .unwrap_or(Vec::new())
+                .into_iter()
+                .map(|s| SanitizedPath::from(s).into())
+                .collect()
+        };
+
+        let mut order: Vec<usize> = serialized
+            .order
+            .split(',')
+            .filter_map(|s| s.parse().ok())
+            .collect();
+
+        if !paths.is_sorted() || order.len() != paths.len() {
+            order = (0..paths.len()).collect();
+            paths.sort();
+        }
+
+        Self {
+            paths: paths.into(),
+            order: order.into(),
+        }
+    }
+
+    pub fn serialize(&self) -> SerializedPathList {
+        use std::fmt::Write as _;
+
+        let paths = serde_json::to_string(&self.paths).unwrap_or_default();
+
+        let mut order = String::new();
+        for ix in self.order.iter() {
+            if !order.is_empty() {
+                order.push(',');
+            }
+            write!(&mut order, "{}", *ix).unwrap();
+        }
+        SerializedPathList { paths, order }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_path_list() {
+        let list1 = PathList::new(&["a/d", "a/c"]);
+        let list2 = PathList::new(&["a/c", "a/d"]);
+
+        assert_eq!(list1.paths(), list2.paths());
+        assert_ne!(list1, list2);
+        assert_eq!(list1.order(), &[1, 0]);
+        assert_eq!(list2.order(), &[0, 1]);
+
+        let list1_deserialized = PathList::deserialize(&list1.serialize());
+        assert_eq!(list1_deserialized, list1);
+
+        let list2_deserialized = PathList::deserialize(&list2.serialize());
+        assert_eq!(list2_deserialized, list2);
+    }
+}
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index b2d1340a7b..de8f63957c 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -9,10 +9,8 @@ use std::{
 };
 
 use anyhow::{Context as _, Result, bail};
-use client::DevServerProjectId;
 use db::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql};
 use gpui::{Axis, Bounds, Task, WindowBounds, WindowId, point, size};
-use itertools::Itertools;
 use project::debugger::breakpoint_store::{BreakpointState, SourceBreakpoint};
 
 use language::{LanguageName, Toolchain};
@@ -28,14 +26,17 @@ use ui::{App, px};
 use util::{ResultExt, maybe};
 use uuid::Uuid;
 
-use crate::WorkspaceId;
-
-use model::{
-    GroupId, ItemId, LocalPaths, PaneId, SerializedItem, SerializedPane, SerializedPaneGroup,
-    SerializedSshProject, SerializedWorkspace,
+use crate::{
+    WorkspaceId,
+    path_list::{PathList, SerializedPathList},
 };
 
-use self::model::{DockStructure, LocalPathsOrder, SerializedWorkspaceLocation};
+use model::{
+    GroupId, ItemId, PaneId, SerializedItem, SerializedPane, SerializedPaneGroup,
+    SerializedSshConnection, SerializedWorkspace,
+};
+
+use self::model::{DockStructure, SerializedWorkspaceLocation};
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub(crate) struct SerializedAxis(pub(crate) gpui::Axis);
@@ -275,70 +276,9 @@ impl sqlez::bindable::Bind for SerializedPixels {
 }
 
 define_connection! {
-    // Current schema shape using pseudo-rust syntax:
-    //
-    // workspaces(
-    //   workspace_id: usize, // Primary key for workspaces
-    //   local_paths: Bincode<Vec<PathBuf>>,
-    //   local_paths_order: Bincode<Vec<usize>>,
-    //   dock_visible: bool, // Deprecated
-    //   dock_anchor: DockAnchor, // Deprecated
-    //   dock_pane: Option<usize>, // Deprecated
-    //   left_sidebar_open: boolean,
-    //   timestamp: String, // UTC YYYY-MM-DD HH:MM:SS
-    //   window_state: String, // WindowBounds Discriminant
-    //   window_x: Option<f32>, // WindowBounds::Fixed RectF x
-    //   window_y: Option<f32>, // WindowBounds::Fixed RectF y
-    //   window_width: Option<f32>, // WindowBounds::Fixed RectF width
-    //   window_height: Option<f32>, // WindowBounds::Fixed RectF height
-    //   display: Option<Uuid>, // Display id
-    //   fullscreen: Option<bool>, // Is the window fullscreen?
-    //   centered_layout: Option<bool>, // Is the Centered Layout mode activated?
-    //   session_id: Option<String>, // Session id
-    //   window_id: Option<u64>, // Window Id
-    // )
-    //
-    // pane_groups(
-    //   group_id: usize, // Primary key for pane_groups
-    //   workspace_id: usize, // References workspaces table
-    //   parent_group_id: Option<usize>, // None indicates that this is the root node
-    //   position: Option<usize>, // None indicates that this is the root node
-    //   axis: Option<Axis>, // 'Vertical', 'Horizontal'
-    //   flexes: Option<Vec<f32>>, // A JSON array of floats
-    // )
-    //
-    // panes(
-    //     pane_id: usize, // Primary key for panes
-    //     workspace_id: usize, // References workspaces table
-    //     active: bool,
-    // )
-    //
-    // center_panes(
-    //     pane_id: usize, // Primary key for center_panes
-    //     parent_group_id: Option<usize>, // References pane_groups. If none, this is the root
-    //     position: Option<usize>, // None indicates this is the root
-    // )
-    //
-    // CREATE TABLE items(
-    //     item_id: usize, // This is the item's view id, so this is not unique
-    //     workspace_id: usize, // References workspaces table
-    //     pane_id: usize, // References panes table
-    //     kind: String, // Indicates which view this connects to. This is the key in the item_deserializers global
-    //     position: usize, // Position of the item in the parent pane. This is equivalent to panes' position column
-    //     active: bool, // Indicates if this item is the active one in the pane
-    //     preview: bool // Indicates if this item is a preview item
-    // )
-    //
-    // CREATE TABLE breakpoints(
-    //      workspace_id: usize Foreign Key, // References workspace table
-    //      path: PathBuf, // The absolute path of the file that this breakpoint belongs to
-    //      breakpoint_location: Vec<u32>, // A list of the locations of breakpoints
-    //      kind: int, // The kind of breakpoint (standard, log)
-    //      log_message: String, // log message for log breakpoints, otherwise it's Null
-    // )
     pub static ref DB: WorkspaceDb<()> =
     &[
-        sql!(
+    sql!(
         CREATE TABLE workspaces(
             workspace_id INTEGER PRIMARY KEY,
             workspace_location BLOB UNIQUE,
@@ -555,7 +495,109 @@ define_connection! {
             SELECT * FROM toolchains;
         DROP TABLE toolchains;
         ALTER TABLE toolchains2 RENAME TO toolchains;
-    )
+    ),
+    sql!(
+        CREATE TABLE ssh_connections (
+            id INTEGER PRIMARY KEY,
+            host TEXT NOT NULL,
+            port INTEGER,
+            user TEXT
+        );
+
+        INSERT INTO ssh_connections (host, port, user)
+        SELECT DISTINCT host, port, user
+        FROM ssh_projects;
+
+        CREATE TABLE workspaces_2(
+            workspace_id INTEGER PRIMARY KEY,
+            paths TEXT,
+            paths_order TEXT,
+            ssh_connection_id INTEGER REFERENCES ssh_connections(id),
+            timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+            window_state TEXT,
+            window_x REAL,
+            window_y REAL,
+            window_width REAL,
+            window_height REAL,
+            display BLOB,
+            left_dock_visible INTEGER,
+            left_dock_active_panel TEXT,
+            right_dock_visible INTEGER,
+            right_dock_active_panel TEXT,
+            bottom_dock_visible INTEGER,
+            bottom_dock_active_panel TEXT,
+            left_dock_zoom INTEGER,
+            right_dock_zoom INTEGER,
+            bottom_dock_zoom INTEGER,
+            fullscreen INTEGER,
+            centered_layout INTEGER,
+            session_id TEXT,
+            window_id INTEGER
+        ) STRICT;
+
+        INSERT
+        INTO workspaces_2
+        SELECT
+            workspaces.workspace_id,
+            CASE
+                WHEN ssh_projects.id IS NOT NULL THEN ssh_projects.paths
+                ELSE
+                    CASE
+                        WHEN workspaces.local_paths_array IS NULL OR workspaces.local_paths_array = "" THEN
+                            NULL
+                        ELSE
+                            json('[' || '"' || replace(workspaces.local_paths_array, ',', '"' || "," || '"') || '"' || ']')
+                    END
+            END as paths,
+
+            CASE
+                WHEN ssh_projects.id IS NOT NULL THEN ""
+                ELSE workspaces.local_paths_order_array
+            END as paths_order,
+
+            CASE
+                WHEN ssh_projects.id IS NOT NULL THEN (
+                    SELECT ssh_connections.id
+                    FROM ssh_connections
+                    WHERE
+                        ssh_connections.host IS ssh_projects.host AND
+                        ssh_connections.port IS ssh_projects.port AND
+                        ssh_connections.user IS ssh_projects.user
+                )
+                ELSE NULL
+            END as ssh_connection_id,
+
+            workspaces.timestamp,
+            workspaces.window_state,
+            workspaces.window_x,
+            workspaces.window_y,
+            workspaces.window_width,
+            workspaces.window_height,
+            workspaces.display,
+            workspaces.left_dock_visible,
+            workspaces.left_dock_active_panel,
+            workspaces.right_dock_visible,
+            workspaces.right_dock_active_panel,
+            workspaces.bottom_dock_visible,
+            workspaces.bottom_dock_active_panel,
+            workspaces.left_dock_zoom,
+            workspaces.right_dock_zoom,
+            workspaces.bottom_dock_zoom,
+            workspaces.fullscreen,
+            workspaces.centered_layout,
+            workspaces.session_id,
+            workspaces.window_id
+        FROM
+            workspaces LEFT JOIN
+            ssh_projects ON
+            workspaces.ssh_project_id = ssh_projects.id;
+
+        DROP TABLE ssh_projects;
+        DROP TABLE workspaces;
+        ALTER TABLE workspaces_2 RENAME TO workspaces;
+
+        CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(ssh_connection_id, paths);
+    ),
     ];
 }
 
@@ -566,17 +608,33 @@ impl WorkspaceDb {
     pub(crate) fn workspace_for_roots<P: AsRef<Path>>(
         &self,
         worktree_roots: &[P],
+    ) -> Option<SerializedWorkspace> {
+        self.workspace_for_roots_internal(worktree_roots, None)
+    }
+
+    pub(crate) fn ssh_workspace_for_roots<P: AsRef<Path>>(
+        &self,
+        worktree_roots: &[P],
+        ssh_project_id: SshProjectId,
+    ) -> Option<SerializedWorkspace> {
+        self.workspace_for_roots_internal(worktree_roots, Some(ssh_project_id))
+    }
+
+    pub(crate) fn workspace_for_roots_internal<P: AsRef<Path>>(
+        &self,
+        worktree_roots: &[P],
+        ssh_connection_id: Option<SshProjectId>,
     ) -> Option<SerializedWorkspace> {
         // paths are sorted before db interactions to ensure that the order of the paths
         // doesn't affect the workspace selection for existing workspaces
-        let local_paths = LocalPaths::new(worktree_roots);
+        let root_paths = PathList::new(worktree_roots);
 
         // Note that we re-assign the workspace_id here in case it's empty
         // and we've grabbed the most recent workspace
         let (
             workspace_id,
-            local_paths,
-            local_paths_order,
+            paths,
+            paths_order,
             window_bounds,
             display,
             centered_layout,
@@ -584,8 +642,8 @@ impl WorkspaceDb {
             window_id,
         ): (
             WorkspaceId,
-            Option<LocalPaths>,
-            Option<LocalPathsOrder>,
+            String,
+            String,
             Option<SerializedWindowBounds>,
             Option<Uuid>,
             Option<bool>,
@@ -595,8 +653,8 @@ impl WorkspaceDb {
             .select_row_bound(sql! {
                 SELECT
                     workspace_id,
-                    local_paths,
-                    local_paths_order,
+                    paths,
+                    paths_order,
                     window_state,
                     window_x,
                     window_y,
@@ -615,25 +673,31 @@ impl WorkspaceDb {
                     bottom_dock_zoom,
                     window_id
                 FROM workspaces
-                WHERE local_paths = ?
+                WHERE
+                    paths IS ? AND
+                    ssh_connection_id IS ?
+                LIMIT 1
+            })
+            .map(|mut prepared_statement| {
+                (prepared_statement)((
+                    root_paths.serialize().paths,
+                    ssh_connection_id.map(|id| id.0 as i32),
+                ))
+                .unwrap()
             })
-            .and_then(|mut prepared_statement| (prepared_statement)(&local_paths))
             .context("No workspaces found")
             .warn_on_err()
             .flatten()?;
 
-        let local_paths = local_paths?;
-        let location = match local_paths_order {
-            Some(order) => SerializedWorkspaceLocation::Local(local_paths, order),
-            None => {
-                let order = LocalPathsOrder::default_for_paths(&local_paths);
-                SerializedWorkspaceLocation::Local(local_paths, order)
-            }
-        };
+        let paths = PathList::deserialize(&SerializedPathList {
+            paths,
+            order: paths_order,
+        });
 
         Some(SerializedWorkspace {
             id: workspace_id,
-            location,
+            location: SerializedWorkspaceLocation::Local,
+            paths,
             center_group: self
                 .get_center_pane_group(workspace_id)
                 .context("Getting center group")
@@ -648,63 +712,6 @@ impl WorkspaceDb {
         })
     }
 
-    pub(crate) fn workspace_for_ssh_project(
-        &self,
-        ssh_project: &SerializedSshProject,
-    ) -> Option<SerializedWorkspace> {
-        let (workspace_id, window_bounds, display, centered_layout, docks, window_id): (
-            WorkspaceId,
-            Option<SerializedWindowBounds>,
-            Option<Uuid>,
-            Option<bool>,
-            DockStructure,
-            Option<u64>,
-        ) = self
-            .select_row_bound(sql! {
-                SELECT
-                    workspace_id,
-                    window_state,
-                    window_x,
-                    window_y,
-                    window_width,
-                    window_height,
-                    display,
-                    centered_layout,
-                    left_dock_visible,
-                    left_dock_active_panel,
-                    left_dock_zoom,
-                    right_dock_visible,
-                    right_dock_active_panel,
-                    right_dock_zoom,
-                    bottom_dock_visible,
-                    bottom_dock_active_panel,
-                    bottom_dock_zoom,
-                    window_id
-                FROM workspaces
-                WHERE ssh_project_id = ?
-            })
-            .and_then(|mut prepared_statement| (prepared_statement)(ssh_project.id.0))
-            .context("No workspaces found")
-            .warn_on_err()
-            .flatten()?;
-
-        Some(SerializedWorkspace {
-            id: workspace_id,
-            location: SerializedWorkspaceLocation::Ssh(ssh_project.clone()),
-            center_group: self
-                .get_center_pane_group(workspace_id)
-                .context("Getting center group")
-                .log_err()?,
-            window_bounds,
-            centered_layout: centered_layout.unwrap_or(false),
-            breakpoints: self.breakpoints(workspace_id),
-            display,
-            docks,
-            session_id: None,
-            window_id,
-        })
-    }
-
     fn breakpoints(&self, workspace_id: WorkspaceId) -> BTreeMap<Arc<Path>, Vec<SourceBreakpoint>> {
         let breakpoints: Result<Vec<(PathBuf, Breakpoint)>> = self
             .select_bound(sql! {
@@ -754,6 +761,13 @@ impl WorkspaceDb {
     /// Saves a workspace using the worktree roots. Will garbage collect any workspaces
     /// that used this workspace previously
     pub(crate) async fn save_workspace(&self, workspace: SerializedWorkspace) {
+        let paths = workspace.paths.serialize();
+        let ssh_connection_id = match &workspace.location {
+            SerializedWorkspaceLocation::Local => None,
+            SerializedWorkspaceLocation::Ssh(serialized_ssh_connection) => {
+                Some(serialized_ssh_connection.id.0)
+            }
+        };
         log::debug!("Saving workspace at location: {:?}", workspace.location);
         self.write(move |conn| {
             conn.with_savepoint("update_worktrees", || {
@@ -763,7 +777,12 @@ impl WorkspaceDb {
                     DELETE FROM panes WHERE workspace_id = ?1;))?(workspace.id)
                     .context("Clearing old panes")?;
 
-                conn.exec_bound(sql!(DELETE FROM breakpoints WHERE workspace_id = ?1))?(workspace.id).context("Clearing old breakpoints")?;
+                conn.exec_bound(
+                    sql!(
+                        DELETE FROM breakpoints WHERE workspace_id = ?1;
+                        DELETE FROM toolchains WHERE workspace_id = ?1;
+                    )
+                )?(workspace.id).context("Clearing old breakpoints")?;
 
                 for (path, breakpoints) in workspace.breakpoints {
                     for bp in breakpoints {
@@ -790,115 +809,73 @@ impl WorkspaceDb {
                             }
                         }
                     }
-
                 }
 
+                conn.exec_bound(sql!(
+                    DELETE
+                    FROM workspaces
+                    WHERE
+                        workspace_id != ?1 AND
+                        paths IS ?2 AND
+                        ssh_connection_id IS ?3
+                ))?((
+                    workspace.id,
+                    paths.paths.clone(),
+                    ssh_connection_id,
+                ))
+                .context("clearing out old locations")?;
 
-                match workspace.location {
-                    SerializedWorkspaceLocation::Local(local_paths, local_paths_order) => {
-                        conn.exec_bound(sql!(
-                            DELETE FROM toolchains WHERE workspace_id = ?1;
-                            DELETE FROM workspaces WHERE local_paths = ? AND workspace_id != ?
-                        ))?((&local_paths, workspace.id))
-                        .context("clearing out old locations")?;
+                // Upsert
+                let query = sql!(
+                    INSERT INTO workspaces(
+                        workspace_id,
+                        paths,
+                        paths_order,
+                        ssh_connection_id,
+                        left_dock_visible,
+                        left_dock_active_panel,
+                        left_dock_zoom,
+                        right_dock_visible,
+                        right_dock_active_panel,
+                        right_dock_zoom,
+                        bottom_dock_visible,
+                        bottom_dock_active_panel,
+                        bottom_dock_zoom,
+                        session_id,
+                        window_id,
+                        timestamp
+                    )
+                    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, CURRENT_TIMESTAMP)
+                    ON CONFLICT DO
+                    UPDATE SET
+                        paths = ?2,
+                        paths_order = ?3,
+                        ssh_connection_id = ?4,
+                        left_dock_visible = ?5,
+                        left_dock_active_panel = ?6,
+                        left_dock_zoom = ?7,
+                        right_dock_visible = ?8,
+                        right_dock_active_panel = ?9,
+                        right_dock_zoom = ?10,
+                        bottom_dock_visible = ?11,
+                        bottom_dock_active_panel = ?12,
+                        bottom_dock_zoom = ?13,
+                        session_id = ?14,
+                        window_id = ?15,
+                        timestamp = CURRENT_TIMESTAMP
+                );
+                let mut prepared_query = conn.exec_bound(query)?;
+                let args = (
+                    workspace.id,
+                    paths.paths.clone(),
+                    paths.order.clone(),
+                    ssh_connection_id,
+                    workspace.docks,
+                    workspace.session_id,
+                    workspace.window_id,
+                );
 
-                        // Upsert
-                        let query = sql!(
-                            INSERT INTO workspaces(
-                                workspace_id,
-                                local_paths,
-                                local_paths_order,
-                                left_dock_visible,
-                                left_dock_active_panel,
-                                left_dock_zoom,
-                                right_dock_visible,
-                                right_dock_active_panel,
-                                right_dock_zoom,
-                                bottom_dock_visible,
-                                bottom_dock_active_panel,
-                                bottom_dock_zoom,
-                                session_id,
-                                window_id,
-                                timestamp,
-                                local_paths_array,
-                                local_paths_order_array
-                            )
-                            VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, CURRENT_TIMESTAMP, ?15, ?16)
-                            ON CONFLICT DO
-                            UPDATE SET
-                                local_paths = ?2,
-                                local_paths_order = ?3,
-                                left_dock_visible = ?4,
-                                left_dock_active_panel = ?5,
-                                left_dock_zoom = ?6,
-                                right_dock_visible = ?7,
-                                right_dock_active_panel = ?8,
-                                right_dock_zoom = ?9,
-                                bottom_dock_visible = ?10,
-                                bottom_dock_active_panel = ?11,
-                                bottom_dock_zoom = ?12,
-                                session_id = ?13,
-                                window_id = ?14,
-                                timestamp = CURRENT_TIMESTAMP,
-                                local_paths_array = ?15,
-                                local_paths_order_array = ?16
-                        );
-                        let mut prepared_query = conn.exec_bound(query)?;
-                        let args = (workspace.id, &local_paths, &local_paths_order, workspace.docks, workspace.session_id, workspace.window_id, local_paths.paths().iter().map(|path| path.to_string_lossy().to_string()).join(","), local_paths_order.order().iter().map(|order| order.to_string()).join(","));
-
-                        prepared_query(args).context("Updating workspace")?;
-                    }
-                    SerializedWorkspaceLocation::Ssh(ssh_project) => {
-                        conn.exec_bound(sql!(
-                            DELETE FROM toolchains WHERE workspace_id = ?1;
-                            DELETE FROM workspaces WHERE ssh_project_id = ? AND workspace_id != ?
-                        ))?((ssh_project.id.0, workspace.id))
-                        .context("clearing out old locations")?;
-
-                        // Upsert
-                        conn.exec_bound(sql!(
-                            INSERT INTO workspaces(
-                                workspace_id,
-                                ssh_project_id,
-                                left_dock_visible,
-                                left_dock_active_panel,
-                                left_dock_zoom,
-                                right_dock_visible,
-                                right_dock_active_panel,
-                                right_dock_zoom,
-                                bottom_dock_visible,
-                                bottom_dock_active_panel,
-                                bottom_dock_zoom,
-                                session_id,
-                                window_id,
-                                timestamp
-                            )
-                            VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, CURRENT_TIMESTAMP)
-                            ON CONFLICT DO
-                            UPDATE SET
-                                ssh_project_id = ?2,
-                                left_dock_visible = ?3,
-                                left_dock_active_panel = ?4,
-                                left_dock_zoom = ?5,
-                                right_dock_visible = ?6,
-                                right_dock_active_panel = ?7,
-                                right_dock_zoom = ?8,
-                                bottom_dock_visible = ?9,
-                                bottom_dock_active_panel = ?10,
-                                bottom_dock_zoom = ?11,
-                                session_id = ?12,
-                                window_id = ?13,
-                                timestamp = CURRENT_TIMESTAMP
-                        ))?((
-                            workspace.id,
-                            ssh_project.id.0,
-                            workspace.docks,
-                            workspace.session_id,
-                            workspace.window_id
-                        ))
-                        .context("Updating workspace")?;
-                    }
-                }
+                prepared_query(args).context("Updating workspace")?;
 
                 // Save center pane group
                 Self::save_pane_group(conn, workspace.id, &workspace.center_group, None)
@@ -911,89 +888,100 @@ impl WorkspaceDb {
         .await;
     }
 
-    pub(crate) async fn get_or_create_ssh_project(
+    pub(crate) async fn get_or_create_ssh_connection(
         &self,
         host: String,
         port: Option<u16>,
-        paths: Vec<String>,
         user: Option<String>,
-    ) -> Result<SerializedSshProject> {
-        let paths = serde_json::to_string(&paths)?;
-        if let Some(project) = self
-            .get_ssh_project(host.clone(), port, paths.clone(), user.clone())
+    ) -> Result<SshProjectId> {
+        if let Some(id) = self
+            .get_ssh_connection(host.clone(), port, user.clone())
             .await?
         {
-            Ok(project)
+            Ok(SshProjectId(id))
         } else {
             log::debug!("Inserting SSH project at host {host}");
-            self.insert_ssh_project(host, port, paths, user)
+            let id = self
+                .insert_ssh_connection(host, port, user)
                 .await?
-                .context("failed to insert ssh project")
+                .context("failed to insert ssh project")?;
+            Ok(SshProjectId(id))
         }
     }
 
     query! {
-        async fn get_ssh_project(host: String, port: Option<u16>, paths: String, user: Option<String>) -> Result<Option<SerializedSshProject>> {
-            SELECT id, host, port, paths, user
-            FROM ssh_projects
-            WHERE host IS ? AND port IS ? AND paths IS ? AND user IS ?
+        async fn get_ssh_connection(host: String, port: Option<u16>, user: Option<String>) -> Result<Option<u64>> {
+            SELECT id
+            FROM ssh_connections
+            WHERE host IS ? AND port IS ? AND user IS ?
             LIMIT 1
         }
     }
 
     query! {
-        async fn insert_ssh_project(host: String, port: Option<u16>, paths: String, user: Option<String>) -> Result<Option<SerializedSshProject>> {
-            INSERT INTO ssh_projects(
+        async fn insert_ssh_connection(host: String, port: Option<u16>, user: Option<String>) -> Result<Option<u64>> {
+            INSERT INTO ssh_connections (
                 host,
                 port,
-                paths,
                 user
-            ) VALUES (?1, ?2, ?3, ?4)
-            RETURNING id, host, port, paths, user
+            ) VALUES (?1, ?2, ?3)
+            RETURNING id
         }
     }
 
-    query! {
-        pub async fn update_ssh_project_paths_query(ssh_project_id: u64, paths: String) -> Result<Option<SerializedSshProject>> {
-            UPDATE ssh_projects
-            SET paths = ?2
-            WHERE id = ?1
-            RETURNING id, host, port, paths, user
-        }
-    }
-
-    pub(crate) async fn update_ssh_project_paths(
-        &self,
-        ssh_project_id: SshProjectId,
-        new_paths: Vec<String>,
-    ) -> Result<SerializedSshProject> {
-        let paths = serde_json::to_string(&new_paths)?;
-        self.update_ssh_project_paths_query(ssh_project_id.0, paths)
-            .await?
-            .context("failed to update ssh project paths")
-    }
-
     query! {
         pub async fn next_id() -> Result<WorkspaceId> {
             INSERT INTO workspaces DEFAULT VALUES RETURNING workspace_id
         }
     }
 
+    fn recent_workspaces(&self) -> Result<Vec<(WorkspaceId, PathList, Option<u64>)>> {
+        Ok(self
+            .recent_workspaces_query()?
+            .into_iter()
+            .map(|(id, paths, order, ssh_connection_id)| {
+                (
+                    id,
+                    PathList::deserialize(&SerializedPathList { paths, order }),
+                    ssh_connection_id,
+                )
+            })
+            .collect())
+    }
+
     query! {
-        fn recent_workspaces() -> Result<Vec<(WorkspaceId, LocalPaths, LocalPathsOrder, Option<u64>)>> {
-            SELECT workspace_id, local_paths, local_paths_order, ssh_project_id
+        fn recent_workspaces_query() -> Result<Vec<(WorkspaceId, String, String, Option<u64>)>> {
+            SELECT workspace_id, paths, paths_order, ssh_connection_id
             FROM workspaces
-            WHERE local_paths IS NOT NULL
-                OR ssh_project_id IS NOT NULL
+            WHERE
+                paths IS NOT NULL OR
+                ssh_connection_id IS NOT NULL
             ORDER BY timestamp DESC
         }
     }
 
+    fn session_workspaces(
+        &self,
+        session_id: String,
+    ) -> Result<Vec<(PathList, Option<u64>, Option<SshProjectId>)>> {
+        Ok(self
+            .session_workspaces_query(session_id)?
+            .into_iter()
+            .map(|(paths, order, window_id, ssh_connection_id)| {
+                (
+                    PathList::deserialize(&SerializedPathList { paths, order }),
+                    window_id,
+                    ssh_connection_id.map(SshProjectId),
+                )
+            })
+            .collect())
+    }
+
     query! {
-        fn session_workspaces(session_id: String) -> Result<Vec<(LocalPaths, LocalPathsOrder, Option<u64>, Option<u64>)>> {
-            SELECT local_paths, local_paths_order, window_id, ssh_project_id
+        fn session_workspaces_query(session_id: String) -> Result<Vec<(String, String, Option<u64>, Option<u64>)>> {
+            SELECT paths, paths_order, window_id, ssh_connection_id
             FROM workspaces
-            WHERE session_id = ?1 AND dev_server_project_id IS NULL
+            WHERE session_id = ?1
             ORDER BY timestamp DESC
         }
     }
@@ -1013,17 +1001,40 @@ impl WorkspaceDb {
         }
     }
 
-    query! {
-        fn ssh_projects() -> Result<Vec<SerializedSshProject>> {
-            SELECT id, host, port, paths, user
-            FROM ssh_projects
-        }
+    fn ssh_connections(&self) -> Result<Vec<SerializedSshConnection>> {
+        Ok(self
+            .ssh_connections_query()?
+            .into_iter()
+            .map(|(id, host, port, user)| SerializedSshConnection {
+                id: SshProjectId(id),
+                host,
+                port,
+                user,
+            })
+            .collect())
     }
 
     query! {
-        fn ssh_project(id: u64) -> Result<SerializedSshProject> {
-            SELECT id, host, port, paths, user
-            FROM ssh_projects
+        pub fn ssh_connections_query() -> Result<Vec<(u64, String, Option<u16>, Option<String>)>> {
+            SELECT id, host, port, user
+            FROM ssh_connections
+        }
+    }
+
+    pub fn ssh_connection(&self, id: SshProjectId) -> Result<SerializedSshConnection> {
+        let row = self.ssh_connection_query(id.0)?;
+        Ok(SerializedSshConnection {
+            id: SshProjectId(row.0),
+            host: row.1,
+            port: row.2,
+            user: row.3,
+        })
+    }
+
+    query! {
+        fn ssh_connection_query(id: u64) -> Result<(u64, String, Option<u16>, Option<String>)> {
+            SELECT id, host, port, user
+            FROM ssh_connections
             WHERE id = ?
         }
     }
@@ -1037,7 +1048,7 @@ impl WorkspaceDb {
                 display,
                 window_state, window_x, window_y, window_width, window_height
                 FROM workspaces
-                WHERE local_paths
+                WHERE paths
                 IS NOT NULL
                 ORDER BY timestamp DESC
                 LIMIT 1
@@ -1054,46 +1065,35 @@ impl WorkspaceDb {
         }
     }
 
-    pub async fn delete_workspace_by_dev_server_project_id(
-        &self,
-        id: DevServerProjectId,
-    ) -> Result<()> {
-        self.write(move |conn| {
-            conn.exec_bound(sql!(
-                DELETE FROM dev_server_projects WHERE id = ?
-            ))?(id.0)?;
-            conn.exec_bound(sql!(
-                DELETE FROM toolchains WHERE workspace_id = ?1;
-                DELETE FROM workspaces
-                WHERE dev_server_project_id IS ?
-            ))?(id.0)
-        })
-        .await
-    }
-
     // Returns the recent locations which are still valid on disk and deletes ones which no longer
     // exist.
     pub async fn recent_workspaces_on_disk(
         &self,
-    ) -> Result<Vec<(WorkspaceId, SerializedWorkspaceLocation)>> {
+    ) -> Result<Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>> {
         let mut result = Vec::new();
         let mut delete_tasks = Vec::new();
-        let ssh_projects = self.ssh_projects()?;
+        let ssh_connections = self.ssh_connections()?;
 
-        for (id, location, order, ssh_project_id) in self.recent_workspaces()? {
-            if let Some(ssh_project_id) = ssh_project_id.map(SshProjectId) {
-                if let Some(ssh_project) = ssh_projects.iter().find(|rp| rp.id == ssh_project_id) {
-                    result.push((id, SerializedWorkspaceLocation::Ssh(ssh_project.clone())));
+        for (id, paths, ssh_connection_id) in self.recent_workspaces()? {
+            if let Some(ssh_connection_id) = ssh_connection_id.map(SshProjectId) {
+                if let Some(ssh_connection) =
+                    ssh_connections.iter().find(|rp| rp.id == ssh_connection_id)
+                {
+                    result.push((
+                        id,
+                        SerializedWorkspaceLocation::Ssh(ssh_connection.clone()),
+                        paths,
+                    ));
                 } else {
                     delete_tasks.push(self.delete_workspace_by_id(id));
                 }
                 continue;
             }
 
-            if location.paths().iter().all(|path| path.exists())
-                && location.paths().iter().any(|path| path.is_dir())
+            if paths.paths().iter().all(|path| path.exists())
+                && paths.paths().iter().any(|path| path.is_dir())
             {
-                result.push((id, SerializedWorkspaceLocation::Local(location, order)));
+                result.push((id, SerializedWorkspaceLocation::Local, paths));
             } else {
                 delete_tasks.push(self.delete_workspace_by_id(id));
             }
@@ -1103,13 +1103,13 @@ impl WorkspaceDb {
         Ok(result)
     }
 
-    pub async fn last_workspace(&self) -> Result<Option<SerializedWorkspaceLocation>> {
+    pub async fn last_workspace(&self) -> Result<Option<(SerializedWorkspaceLocation, PathList)>> {
         Ok(self
             .recent_workspaces_on_disk()
             .await?
             .into_iter()
             .next()
-            .map(|(_, location)| location))
+            .map(|(_, location, paths)| (location, paths)))
     }
 
     // Returns the locations of the workspaces that were still opened when the last
@@ -1120,25 +1120,31 @@ impl WorkspaceDb {
         &self,
         last_session_id: &str,
         last_session_window_stack: Option<Vec<WindowId>>,
-    ) -> Result<Vec<SerializedWorkspaceLocation>> {
+    ) -> Result<Vec<(SerializedWorkspaceLocation, PathList)>> {
         let mut workspaces = Vec::new();
 
-        for (location, order, window_id, ssh_project_id) in
+        for (paths, window_id, ssh_connection_id) in
             self.session_workspaces(last_session_id.to_owned())?
         {
-            if let Some(ssh_project_id) = ssh_project_id {
-                let location = SerializedWorkspaceLocation::Ssh(self.ssh_project(ssh_project_id)?);
-                workspaces.push((location, window_id.map(WindowId::from)));
-            } else if location.paths().iter().all(|path| path.exists())
-                && location.paths().iter().any(|path| path.is_dir())
+            if let Some(ssh_connection_id) = ssh_connection_id {
+                workspaces.push((
+                    SerializedWorkspaceLocation::Ssh(self.ssh_connection(ssh_connection_id)?),
+                    paths,
+                    window_id.map(WindowId::from),
+                ));
+            } else if paths.paths().iter().all(|path| path.exists())
+                && paths.paths().iter().any(|path| path.is_dir())
             {
-                let location = SerializedWorkspaceLocation::Local(location, order);
-                workspaces.push((location, window_id.map(WindowId::from)));
+                workspaces.push((
+                    SerializedWorkspaceLocation::Local,
+                    paths,
+                    window_id.map(WindowId::from),
+                ));
             }
         }
 
         if let Some(stack) = last_session_window_stack {
-            workspaces.sort_by_key(|(_, window_id)| {
+            workspaces.sort_by_key(|(_, _, window_id)| {
                 window_id
                     .and_then(|id| stack.iter().position(|&order_id| order_id == id))
                     .unwrap_or(usize::MAX)
@@ -1147,7 +1153,7 @@ impl WorkspaceDb {
 
         Ok(workspaces
             .into_iter()
-            .map(|(paths, _)| paths)
+            .map(|(location, paths, _)| (location, paths))
             .collect::<Vec<_>>())
     }
 
@@ -1499,13 +1505,13 @@ pub fn delete_unloaded_items(
 
 #[cfg(test)]
 mod tests {
-    use std::thread;
-    use std::time::Duration;
-
     use super::*;
-    use crate::persistence::model::SerializedWorkspace;
-    use crate::persistence::model::{SerializedItem, SerializedPane, SerializedPaneGroup};
+    use crate::persistence::model::{
+        SerializedItem, SerializedPane, SerializedPaneGroup, SerializedWorkspace,
+    };
     use gpui;
+    use pretty_assertions::assert_eq;
+    use std::{thread, time::Duration};
 
     #[gpui::test]
     async fn test_breakpoints() {
@@ -1558,7 +1564,8 @@ mod tests {
 
         let workspace = SerializedWorkspace {
             id,
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp"]),
+            paths: PathList::new(&["/tmp"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -1711,7 +1718,8 @@ mod tests {
 
         let workspace = SerializedWorkspace {
             id,
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp"]),
+            paths: PathList::new(&["/tmp"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -1757,7 +1765,8 @@ mod tests {
 
         let workspace_without_breakpoint = SerializedWorkspace {
             id,
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp"]),
+            paths: PathList::new(&["/tmp"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -1851,7 +1860,8 @@ mod tests {
 
         let mut workspace_1 = SerializedWorkspace {
             id: WorkspaceId(1),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp", "/tmp2"]),
+            paths: PathList::new(&["/tmp", "/tmp2"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -1864,7 +1874,8 @@ mod tests {
 
         let workspace_2 = SerializedWorkspace {
             id: WorkspaceId(2),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp"]),
+            paths: PathList::new(&["/tmp"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -1893,7 +1904,7 @@ mod tests {
         })
         .await;
 
-        workspace_1.location = SerializedWorkspaceLocation::from_local_paths(["/tmp", "/tmp3"]);
+        workspace_1.paths = PathList::new(&["/tmp", "/tmp3"]);
         db.save_workspace(workspace_1.clone()).await;
         db.save_workspace(workspace_1).await;
         db.save_workspace(workspace_2).await;
@@ -1969,10 +1980,8 @@ mod tests {
 
         let workspace = SerializedWorkspace {
             id: WorkspaceId(5),
-            location: SerializedWorkspaceLocation::Local(
-                LocalPaths::new(["/tmp", "/tmp2"]),
-                LocalPathsOrder::new([1, 0]),
-            ),
+            paths: PathList::new(&["/tmp", "/tmp2"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group,
             window_bounds: Default::default(),
             breakpoints: Default::default(),
@@ -2004,10 +2013,8 @@ mod tests {
 
         let workspace_1 = SerializedWorkspace {
             id: WorkspaceId(1),
-            location: SerializedWorkspaceLocation::Local(
-                LocalPaths::new(["/tmp", "/tmp2"]),
-                LocalPathsOrder::new([0, 1]),
-            ),
+            paths: PathList::new(&["/tmp", "/tmp2"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             breakpoints: Default::default(),
@@ -2020,7 +2027,8 @@ mod tests {
 
         let mut workspace_2 = SerializedWorkspace {
             id: WorkspaceId(2),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp"]),
+            paths: PathList::new(&["/tmp"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2049,7 +2057,7 @@ mod tests {
         assert_eq!(db.workspace_for_roots(&["/tmp3", "/tmp2", "/tmp4"]), None);
 
         // Test 'mutate' case of updating a pre-existing id
-        workspace_2.location = SerializedWorkspaceLocation::from_local_paths(["/tmp", "/tmp2"]);
+        workspace_2.paths = PathList::new(&["/tmp", "/tmp2"]);
 
         db.save_workspace(workspace_2.clone()).await;
         assert_eq!(
@@ -2060,10 +2068,8 @@ mod tests {
         // Test other mechanism for mutating
         let mut workspace_3 = SerializedWorkspace {
             id: WorkspaceId(3),
-            location: SerializedWorkspaceLocation::Local(
-                LocalPaths::new(["/tmp", "/tmp2"]),
-                LocalPathsOrder::new([1, 0]),
-            ),
+            paths: PathList::new(&["/tmp2", "/tmp"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             breakpoints: Default::default(),
@@ -2081,8 +2087,7 @@ mod tests {
         );
 
         // Make sure that updating paths differently also works
-        workspace_3.location =
-            SerializedWorkspaceLocation::from_local_paths(["/tmp3", "/tmp4", "/tmp2"]);
+        workspace_3.paths = PathList::new(&["/tmp3", "/tmp4", "/tmp2"]);
         db.save_workspace(workspace_3.clone()).await;
         assert_eq!(db.workspace_for_roots(&["/tmp2", "tmp"]), None);
         assert_eq!(
@@ -2100,7 +2105,8 @@ mod tests {
 
         let workspace_1 = SerializedWorkspace {
             id: WorkspaceId(1),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp1"]),
+            paths: PathList::new(&["/tmp1"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2113,7 +2119,8 @@ mod tests {
 
         let workspace_2 = SerializedWorkspace {
             id: WorkspaceId(2),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp2"]),
+            paths: PathList::new(&["/tmp2"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2126,7 +2133,8 @@ mod tests {
 
         let workspace_3 = SerializedWorkspace {
             id: WorkspaceId(3),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp3"]),
+            paths: PathList::new(&["/tmp3"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2139,7 +2147,8 @@ mod tests {
 
         let workspace_4 = SerializedWorkspace {
             id: WorkspaceId(4),
-            location: SerializedWorkspaceLocation::from_local_paths(["/tmp4"]),
+            paths: PathList::new(&["/tmp4"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2150,14 +2159,15 @@ mod tests {
             window_id: None,
         };
 
-        let ssh_project = db
-            .get_or_create_ssh_project("my-host".to_string(), Some(1234), vec![], None)
+        let connection_id = db
+            .get_or_create_ssh_connection("my-host".to_string(), Some(1234), None)
             .await
             .unwrap();
 
         let workspace_5 = SerializedWorkspace {
             id: WorkspaceId(5),
-            location: SerializedWorkspaceLocation::Ssh(ssh_project.clone()),
+            paths: PathList::default(),
+            location: SerializedWorkspaceLocation::Ssh(db.ssh_connection(connection_id).unwrap()),
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2170,10 +2180,8 @@ mod tests {
 
         let workspace_6 = SerializedWorkspace {
             id: WorkspaceId(6),
-            location: SerializedWorkspaceLocation::Local(
-                LocalPaths::new(["/tmp6a", "/tmp6b", "/tmp6c"]),
-                LocalPathsOrder::new([2, 1, 0]),
-            ),
+            paths: PathList::new(&["/tmp6a", "/tmp6b", "/tmp6c"]),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             breakpoints: Default::default(),
@@ -2195,41 +2203,36 @@ mod tests {
 
         let locations = db.session_workspaces("session-id-1".to_owned()).unwrap();
         assert_eq!(locations.len(), 2);
-        assert_eq!(locations[0].0, LocalPaths::new(["/tmp2"]));
-        assert_eq!(locations[0].1, LocalPathsOrder::new([0]));
-        assert_eq!(locations[0].2, Some(20));
-        assert_eq!(locations[1].0, LocalPaths::new(["/tmp1"]));
-        assert_eq!(locations[1].1, LocalPathsOrder::new([0]));
-        assert_eq!(locations[1].2, Some(10));
+        assert_eq!(locations[0].0, PathList::new(&["/tmp2"]));
+        assert_eq!(locations[0].1, Some(20));
+        assert_eq!(locations[1].0, PathList::new(&["/tmp1"]));
+        assert_eq!(locations[1].1, Some(10));
 
         let locations = db.session_workspaces("session-id-2".to_owned()).unwrap();
         assert_eq!(locations.len(), 2);
-        let empty_paths: Vec<&str> = Vec::new();
-        assert_eq!(locations[0].0, LocalPaths::new(empty_paths.iter()));
-        assert_eq!(locations[0].1, LocalPathsOrder::new([]));
-        assert_eq!(locations[0].2, Some(50));
-        assert_eq!(locations[0].3, Some(ssh_project.id.0));
-        assert_eq!(locations[1].0, LocalPaths::new(["/tmp3"]));
-        assert_eq!(locations[1].1, LocalPathsOrder::new([0]));
-        assert_eq!(locations[1].2, Some(30));
+        assert_eq!(locations[0].0, PathList::default());
+        assert_eq!(locations[0].1, Some(50));
+        assert_eq!(locations[0].2, Some(connection_id));
+        assert_eq!(locations[1].0, PathList::new(&["/tmp3"]));
+        assert_eq!(locations[1].1, Some(30));
 
         let locations = db.session_workspaces("session-id-3".to_owned()).unwrap();
         assert_eq!(locations.len(), 1);
         assert_eq!(
             locations[0].0,
-            LocalPaths::new(["/tmp6a", "/tmp6b", "/tmp6c"]),
+            PathList::new(&["/tmp6a", "/tmp6b", "/tmp6c"]),
         );
-        assert_eq!(locations[0].1, LocalPathsOrder::new([2, 1, 0]));
-        assert_eq!(locations[0].2, Some(60));
+        assert_eq!(locations[0].1, Some(60));
     }
 
     fn default_workspace<P: AsRef<Path>>(
-        workspace_id: &[P],
+        paths: &[P],
         center_group: &SerializedPaneGroup,
     ) -> SerializedWorkspace {
         SerializedWorkspace {
             id: WorkspaceId(4),
-            location: SerializedWorkspaceLocation::from_local_paths(workspace_id),
+            paths: PathList::new(paths),
+            location: SerializedWorkspaceLocation::Local,
             center_group: center_group.clone(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2252,30 +2255,18 @@ mod tests {
             WorkspaceDb::open_test_db("test_serializing_workspaces_last_session_workspaces").await;
 
         let workspaces = [
-            (1, vec![dir1.path()], vec![0], 9),
-            (2, vec![dir2.path()], vec![0], 5),
-            (3, vec![dir3.path()], vec![0], 8),
-            (4, vec![dir4.path()], vec![0], 2),
-            (
-                5,
-                vec![dir1.path(), dir2.path(), dir3.path()],
-                vec![0, 1, 2],
-                3,
-            ),
-            (
-                6,
-                vec![dir2.path(), dir3.path(), dir4.path()],
-                vec![2, 1, 0],
-                4,
-            ),
+            (1, vec![dir1.path()], 9),
+            (2, vec![dir2.path()], 5),
+            (3, vec![dir3.path()], 8),
+            (4, vec![dir4.path()], 2),
+            (5, vec![dir1.path(), dir2.path(), dir3.path()], 3),
+            (6, vec![dir4.path(), dir3.path(), dir2.path()], 4),
         ]
         .into_iter()
-        .map(|(id, locations, order, window_id)| SerializedWorkspace {
+        .map(|(id, paths, window_id)| SerializedWorkspace {
             id: WorkspaceId(id),
-            location: SerializedWorkspaceLocation::Local(
-                LocalPaths::new(locations),
-                LocalPathsOrder::new(order),
-            ),
+            paths: PathList::new(paths.as_slice()),
+            location: SerializedWorkspaceLocation::Local,
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2300,39 +2291,37 @@ mod tests {
             WindowId::from(4), // Bottom
         ]));
 
-        let have = db
+        let locations = db
             .last_session_workspace_locations("one-session", stack)
             .unwrap();
-        assert_eq!(have.len(), 6);
         assert_eq!(
-            have[0],
-            SerializedWorkspaceLocation::from_local_paths(&[dir4.path()])
-        );
-        assert_eq!(
-            have[1],
-            SerializedWorkspaceLocation::from_local_paths([dir3.path()])
-        );
-        assert_eq!(
-            have[2],
-            SerializedWorkspaceLocation::from_local_paths([dir2.path()])
-        );
-        assert_eq!(
-            have[3],
-            SerializedWorkspaceLocation::from_local_paths([dir1.path()])
-        );
-        assert_eq!(
-            have[4],
-            SerializedWorkspaceLocation::Local(
-                LocalPaths::new([dir1.path(), dir2.path(), dir3.path()]),
-                LocalPathsOrder::new([0, 1, 2]),
-            ),
-        );
-        assert_eq!(
-            have[5],
-            SerializedWorkspaceLocation::Local(
-                LocalPaths::new([dir2.path(), dir3.path(), dir4.path()]),
-                LocalPathsOrder::new([2, 1, 0]),
-            ),
+            locations,
+            [
+                (
+                    SerializedWorkspaceLocation::Local,
+                    PathList::new(&[dir4.path()])
+                ),
+                (
+                    SerializedWorkspaceLocation::Local,
+                    PathList::new(&[dir3.path()])
+                ),
+                (
+                    SerializedWorkspaceLocation::Local,
+                    PathList::new(&[dir2.path()])
+                ),
+                (
+                    SerializedWorkspaceLocation::Local,
+                    PathList::new(&[dir1.path()])
+                ),
+                (
+                    SerializedWorkspaceLocation::Local,
+                    PathList::new(&[dir1.path(), dir2.path(), dir3.path()])
+                ),
+                (
+                    SerializedWorkspaceLocation::Local,
+                    PathList::new(&[dir4.path(), dir3.path(), dir2.path()])
+                ),
+            ]
         );
     }
 
@@ -2343,7 +2332,7 @@ mod tests {
         )
         .await;
 
-        let ssh_projects = [
+        let ssh_connections = [
             ("host-1", "my-user-1"),
             ("host-2", "my-user-2"),
             ("host-3", "my-user-3"),
@@ -2351,24 +2340,32 @@ mod tests {
         ]
         .into_iter()
         .map(|(host, user)| async {
-            db.get_or_create_ssh_project(host.to_string(), None, vec![], Some(user.to_string()))
+            let id = db
+                .get_or_create_ssh_connection(host.to_string(), None, Some(user.to_string()))
                 .await
-                .unwrap()
+                .unwrap();
+            SerializedSshConnection {
+                id,
+                host: host.into(),
+                port: None,
+                user: Some(user.into()),
+            }
         })
         .collect::<Vec<_>>();
 
-        let ssh_projects = futures::future::join_all(ssh_projects).await;
+        let ssh_connections = futures::future::join_all(ssh_connections).await;
 
         let workspaces = [
-            (1, ssh_projects[0].clone(), 9),
-            (2, ssh_projects[1].clone(), 5),
-            (3, ssh_projects[2].clone(), 8),
-            (4, ssh_projects[3].clone(), 2),
+            (1, ssh_connections[0].clone(), 9),
+            (2, ssh_connections[1].clone(), 5),
+            (3, ssh_connections[2].clone(), 8),
+            (4, ssh_connections[3].clone(), 2),
         ]
         .into_iter()
-        .map(|(id, ssh_project, window_id)| SerializedWorkspace {
+        .map(|(id, ssh_connection, window_id)| SerializedWorkspace {
             id: WorkspaceId(id),
-            location: SerializedWorkspaceLocation::Ssh(ssh_project),
+            paths: PathList::default(),
+            location: SerializedWorkspaceLocation::Ssh(ssh_connection),
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2397,19 +2394,31 @@ mod tests {
         assert_eq!(have.len(), 4);
         assert_eq!(
             have[0],
-            SerializedWorkspaceLocation::Ssh(ssh_projects[3].clone())
+            (
+                SerializedWorkspaceLocation::Ssh(ssh_connections[3].clone()),
+                PathList::default()
+            )
         );
         assert_eq!(
             have[1],
-            SerializedWorkspaceLocation::Ssh(ssh_projects[2].clone())
+            (
+                SerializedWorkspaceLocation::Ssh(ssh_connections[2].clone()),
+                PathList::default()
+            )
         );
         assert_eq!(
             have[2],
-            SerializedWorkspaceLocation::Ssh(ssh_projects[1].clone())
+            (
+                SerializedWorkspaceLocation::Ssh(ssh_connections[1].clone()),
+                PathList::default()
+            )
         );
         assert_eq!(
             have[3],
-            SerializedWorkspaceLocation::Ssh(ssh_projects[0].clone())
+            (
+                SerializedWorkspaceLocation::Ssh(ssh_connections[0].clone()),
+                PathList::default()
+            )
         );
     }
 
@@ -2417,116 +2426,102 @@ mod tests {
     async fn test_get_or_create_ssh_project() {
         let db = WorkspaceDb::open_test_db("test_get_or_create_ssh_project").await;
 
-        let (host, port, paths, user) = (
-            "example.com".to_string(),
-            Some(22_u16),
-            vec!["/home/user".to_string(), "/etc/nginx".to_string()],
-            Some("user".to_string()),
-        );
+        let host = "example.com".to_string();
+        let port = Some(22_u16);
+        let user = Some("user".to_string());
 
-        let project = db
-            .get_or_create_ssh_project(host.clone(), port, paths.clone(), user.clone())
+        let connection_id = db
+            .get_or_create_ssh_connection(host.clone(), port, user.clone())
             .await
             .unwrap();
 
-        assert_eq!(project.host, host);
-        assert_eq!(project.paths, paths);
-        assert_eq!(project.user, user);
-
         // Test that calling the function again with the same parameters returns the same project
-        let same_project = db
-            .get_or_create_ssh_project(host.clone(), port, paths.clone(), user.clone())
+        let same_connection = db
+            .get_or_create_ssh_connection(host.clone(), port, user.clone())
             .await
             .unwrap();
 
-        assert_eq!(project.id, same_project.id);
+        assert_eq!(connection_id, same_connection);
 
         // Test with different parameters
-        let (host2, paths2, user2) = (
-            "otherexample.com".to_string(),
-            vec!["/home/otheruser".to_string()],
-            Some("otheruser".to_string()),
-        );
+        let host2 = "otherexample.com".to_string();
+        let port2 = None;
+        let user2 = Some("otheruser".to_string());
 
-        let different_project = db
-            .get_or_create_ssh_project(host2.clone(), None, paths2.clone(), user2.clone())
+        let different_connection = db
+            .get_or_create_ssh_connection(host2.clone(), port2, user2.clone())
             .await
             .unwrap();
 
-        assert_ne!(project.id, different_project.id);
-        assert_eq!(different_project.host, host2);
-        assert_eq!(different_project.paths, paths2);
-        assert_eq!(different_project.user, user2);
+        assert_ne!(connection_id, different_connection);
     }
 
     #[gpui::test]
     async fn test_get_or_create_ssh_project_with_null_user() {
         let db = WorkspaceDb::open_test_db("test_get_or_create_ssh_project_with_null_user").await;
 
-        let (host, port, paths, user) = (
-            "example.com".to_string(),
-            None,
-            vec!["/home/user".to_string()],
-            None,
-        );
+        let (host, port, user) = ("example.com".to_string(), None, None);
 
-        let project = db
-            .get_or_create_ssh_project(host.clone(), port, paths.clone(), None)
+        let connection_id = db
+            .get_or_create_ssh_connection(host.clone(), port, None)
             .await
             .unwrap();
 
-        assert_eq!(project.host, host);
-        assert_eq!(project.paths, paths);
-        assert_eq!(project.user, None);
-
-        // Test that calling the function again with the same parameters returns the same project
-        let same_project = db
-            .get_or_create_ssh_project(host.clone(), port, paths.clone(), user.clone())
+        let same_connection_id = db
+            .get_or_create_ssh_connection(host.clone(), port, user.clone())
             .await
             .unwrap();
 
-        assert_eq!(project.id, same_project.id);
+        assert_eq!(connection_id, same_connection_id);
     }
 
     #[gpui::test]
-    async fn test_get_ssh_projects() {
-        let db = WorkspaceDb::open_test_db("test_get_ssh_projects").await;
+    async fn test_get_ssh_connections() {
+        let db = WorkspaceDb::open_test_db("test_get_ssh_connections").await;
 
-        let projects = vec![
-            (
-                "example.com".to_string(),
-                None,
-                vec!["/home/user".to_string()],
-                None,
-            ),
+        let connections = [
+            ("example.com".to_string(), None, None),
             (
                 "anotherexample.com".to_string(),
                 Some(123_u16),
-                vec!["/home/user2".to_string()],
                 Some("user2".to_string()),
             ),
-            (
-                "yetanother.com".to_string(),
-                Some(345_u16),
-                vec!["/home/user3".to_string(), "/proc/1234/exe".to_string()],
-                None,
-            ),
+            ("yetanother.com".to_string(), Some(345_u16), None),
         ];
 
-        for (host, port, paths, user) in projects.iter() {
-            let project = db
-                .get_or_create_ssh_project(host.clone(), *port, paths.clone(), user.clone())
-                .await
-                .unwrap();
-
-            assert_eq!(&project.host, host);
-            assert_eq!(&project.port, port);
-            assert_eq!(&project.paths, paths);
-            assert_eq!(&project.user, user);
+        let mut ids = Vec::new();
+        for (host, port, user) in connections.iter() {
+            ids.push(
+                db.get_or_create_ssh_connection(host.clone(), *port, user.clone())
+                    .await
+                    .unwrap(),
+            );
         }
 
-        let stored_projects = db.ssh_projects().unwrap();
-        assert_eq!(stored_projects.len(), projects.len());
+        let stored_projects = db.ssh_connections().unwrap();
+        assert_eq!(
+            stored_projects,
+            &[
+                SerializedSshConnection {
+                    id: ids[0],
+                    host: "example.com".into(),
+                    port: None,
+                    user: None,
+                },
+                SerializedSshConnection {
+                    id: ids[1],
+                    host: "anotherexample.com".into(),
+                    port: Some(123),
+                    user: Some("user2".into()),
+                },
+                SerializedSshConnection {
+                    id: ids[2],
+                    host: "yetanother.com".into(),
+                    port: Some(345),
+                    user: None,
+                },
+            ]
+        );
     }
 
     #[gpui::test]
@@ -2659,56 +2654,4 @@ mod tests {
 
         assert_eq!(workspace.center_group, new_workspace.center_group);
     }
-
-    #[gpui::test]
-    async fn test_update_ssh_project_paths() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_update_ssh_project_paths").await;
-
-        let (host, port, initial_paths, user) = (
-            "example.com".to_string(),
-            Some(22_u16),
-            vec!["/home/user".to_string(), "/etc/nginx".to_string()],
-            Some("user".to_string()),
-        );
-
-        let project = db
-            .get_or_create_ssh_project(host.clone(), port, initial_paths.clone(), user.clone())
-            .await
-            .unwrap();
-
-        assert_eq!(project.host, host);
-        assert_eq!(project.paths, initial_paths);
-        assert_eq!(project.user, user);
-
-        let new_paths = vec![
-            "/home/user".to_string(),
-            "/etc/nginx".to_string(),
-            "/var/log".to_string(),
-            "/opt/app".to_string(),
-        ];
-
-        let updated_project = db
-            .update_ssh_project_paths(project.id, new_paths.clone())
-            .await
-            .unwrap();
-
-        assert_eq!(updated_project.id, project.id);
-        assert_eq!(updated_project.paths, new_paths);
-
-        let retrieved_project = db
-            .get_ssh_project(
-                host.clone(),
-                port,
-                serde_json::to_string(&new_paths).unwrap(),
-                user.clone(),
-            )
-            .await
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(retrieved_project.id, project.id);
-        assert_eq!(retrieved_project.paths, new_paths);
-    }
 }
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index 15a54ac62f..afe4ae6235 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -1,15 +1,16 @@
 use super::{SerializedAxis, SerializedWindowBounds};
 use crate::{
     Member, Pane, PaneAxis, SerializableItemRegistry, Workspace, WorkspaceId, item::ItemHandle,
+    path_list::PathList,
 };
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use async_recursion::async_recursion;
 use db::sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
     statement::Statement,
 };
 use gpui::{AsyncWindowContext, Entity, WeakEntity};
-use itertools::Itertools as _;
+
 use project::{Project, debugger::breakpoint_store::SourceBreakpoint};
 use remote::ssh_session::SshProjectId;
 use serde::{Deserialize, Serialize};
@@ -18,239 +19,27 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use util::{ResultExt, paths::SanitizedPath};
+use util::ResultExt;
 use uuid::Uuid;
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
-pub struct SerializedSshProject {
+pub struct SerializedSshConnection {
     pub id: SshProjectId,
     pub host: String,
     pub port: Option<u16>,
-    pub paths: Vec<String>,
     pub user: Option<String>,
 }
 
-impl SerializedSshProject {
-    pub fn ssh_urls(&self) -> Vec<PathBuf> {
-        self.paths
-            .iter()
-            .map(|path| {
-                let mut result = String::new();
-                if let Some(user) = &self.user {
-                    result.push_str(user);
-                    result.push('@');
-                }
-                result.push_str(&self.host);
-                if let Some(port) = &self.port {
-                    result.push(':');
-                    result.push_str(&port.to_string());
-                }
-                result.push_str(path);
-                PathBuf::from(result)
-            })
-            .collect()
-    }
-}
-
-impl StaticColumnCount for SerializedSshProject {
-    fn column_count() -> usize {
-        5
-    }
-}
-
-impl Bind for &SerializedSshProject {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let next_index = statement.bind(&self.id.0, start_index)?;
-        let next_index = statement.bind(&self.host, next_index)?;
-        let next_index = statement.bind(&self.port, next_index)?;
-        let raw_paths = serde_json::to_string(&self.paths)?;
-        let next_index = statement.bind(&raw_paths, next_index)?;
-        statement.bind(&self.user, next_index)
-    }
-}
-
-impl Column for SerializedSshProject {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let id = statement.column_int64(start_index)?;
-        let host = statement.column_text(start_index + 1)?.to_string();
-        let (port, _) = Option::<u16>::column(statement, start_index + 2)?;
-        let raw_paths = statement.column_text(start_index + 3)?.to_string();
-        let paths: Vec<String> = serde_json::from_str(&raw_paths)?;
-
-        let (user, _) = Option::<String>::column(statement, start_index + 4)?;
-
-        Ok((
-            Self {
-                id: SshProjectId(id as u64),
-                host,
-                port,
-                paths,
-                user,
-            },
-            start_index + 5,
-        ))
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct LocalPaths(Arc<Vec<PathBuf>>);
-
-impl LocalPaths {
-    pub fn new<P: AsRef<Path>>(paths: impl IntoIterator<Item = P>) -> Self {
-        let mut paths: Vec<PathBuf> = paths
-            .into_iter()
-            .map(|p| SanitizedPath::from(p).into())
-            .collect();
-        // Ensure all future `zed workspace1 workspace2` and `zed workspace2 workspace1` calls are using the same workspace.
-        // The actual workspace order is stored in the `LocalPathsOrder` struct.
-        paths.sort();
-        Self(Arc::new(paths))
-    }
-
-    pub fn paths(&self) -> &Arc<Vec<PathBuf>> {
-        &self.0
-    }
-}
-
-impl StaticColumnCount for LocalPaths {}
-impl Bind for &LocalPaths {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement.bind(&bincode::serialize(&self.0)?, start_index)
-    }
-}
-
-impl Column for LocalPaths {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let path_blob = statement.column_blob(start_index)?;
-        let paths: Arc<Vec<PathBuf>> = if path_blob.is_empty() {
-            Default::default()
-        } else {
-            bincode::deserialize(path_blob).context("Bincode deserialization of paths failed")?
-        };
-
-        Ok((Self(paths), start_index + 1))
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct LocalPathsOrder(Vec<usize>);
-
-impl LocalPathsOrder {
-    pub fn new(order: impl IntoIterator<Item = usize>) -> Self {
-        Self(order.into_iter().collect())
-    }
-
-    pub fn order(&self) -> &[usize] {
-        self.0.as_slice()
-    }
-
-    pub fn default_for_paths(paths: &LocalPaths) -> Self {
-        Self::new(0..paths.0.len())
-    }
-}
-
-impl StaticColumnCount for LocalPathsOrder {}
-impl Bind for &LocalPathsOrder {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement.bind(&bincode::serialize(&self.0)?, start_index)
-    }
-}
-
-impl Column for LocalPathsOrder {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let order_blob = statement.column_blob(start_index)?;
-        let order = if order_blob.is_empty() {
-            Vec::new()
-        } else {
-            bincode::deserialize(order_blob).context("deserializing workspace root order")?
-        };
-
-        Ok((Self(order), start_index + 1))
-    }
-}
-
 #[derive(Debug, PartialEq, Clone)]
 pub enum SerializedWorkspaceLocation {
-    Local(LocalPaths, LocalPathsOrder),
-    Ssh(SerializedSshProject),
+    Local,
+    Ssh(SerializedSshConnection),
 }
 
 impl SerializedWorkspaceLocation {
-    /// Create a new `SerializedWorkspaceLocation` from a list of local paths.
-    ///
-    /// The paths will be sorted and the order will be stored in the `LocalPathsOrder` struct.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::path::Path;
-    /// use zed_workspace::SerializedWorkspaceLocation;
-    ///
-    /// let location = SerializedWorkspaceLocation::from_local_paths(vec![
-    ///     Path::new("path/to/workspace1"),
-    ///     Path::new("path/to/workspace2"),
-    /// ]);
-    /// assert_eq!(location, SerializedWorkspaceLocation::Local(
-    ///    LocalPaths::new(vec![
-    ///         Path::new("path/to/workspace1"),
-    ///         Path::new("path/to/workspace2"),
-    ///    ]),
-    ///   LocalPathsOrder::new(vec![0, 1]),
-    /// ));
-    /// ```
-    ///
-    /// ```
-    /// use std::path::Path;
-    /// use zed_workspace::SerializedWorkspaceLocation;
-    ///
-    /// let location = SerializedWorkspaceLocation::from_local_paths(vec![
-    ///     Path::new("path/to/workspace2"),
-    ///     Path::new("path/to/workspace1"),
-    /// ]);
-    ///
-    /// assert_eq!(location, SerializedWorkspaceLocation::Local(
-    ///    LocalPaths::new(vec![
-    ///         Path::new("path/to/workspace1"),
-    ///         Path::new("path/to/workspace2"),
-    ///   ]),
-    ///  LocalPathsOrder::new(vec![1, 0]),
-    /// ));
-    /// ```
-    pub fn from_local_paths<P: AsRef<Path>>(paths: impl IntoIterator<Item = P>) -> Self {
-        let mut indexed_paths: Vec<_> = paths
-            .into_iter()
-            .map(|p| p.as_ref().to_path_buf())
-            .enumerate()
-            .collect();
-
-        indexed_paths.sort_by(|(_, a), (_, b)| a.cmp(b));
-
-        let sorted_paths: Vec<_> = indexed_paths.iter().map(|(_, path)| path.clone()).collect();
-        let order: Vec<_> = indexed_paths.iter().map(|(index, _)| *index).collect();
-
-        Self::Local(LocalPaths::new(sorted_paths), LocalPathsOrder::new(order))
-    }
-
     /// Get sorted paths
     pub fn sorted_paths(&self) -> Arc<Vec<PathBuf>> {
-        match self {
-            SerializedWorkspaceLocation::Local(paths, order) => {
-                if order.order().is_empty() {
-                    paths.paths().clone()
-                } else {
-                    Arc::new(
-                        order
-                            .order()
-                            .iter()
-                            .zip(paths.paths().iter())
-                            .sorted_by_key(|(i, _)| **i)
-                            .map(|(_, p)| p.clone())
-                            .collect(),
-                    )
-                }
-            }
-            SerializedWorkspaceLocation::Ssh(ssh_project) => Arc::new(ssh_project.ssh_urls()),
-        }
+        unimplemented!()
     }
 }
 
@@ -258,6 +47,7 @@ impl SerializedWorkspaceLocation {
 pub(crate) struct SerializedWorkspace {
     pub(crate) id: WorkspaceId,
     pub(crate) location: SerializedWorkspaceLocation,
+    pub(crate) paths: PathList,
     pub(crate) center_group: SerializedPaneGroup,
     pub(crate) window_bounds: Option<SerializedWindowBounds>,
     pub(crate) centered_layout: bool,
@@ -581,80 +371,3 @@ impl Column for SerializedItem {
         ))
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_serialize_local_paths() {
-        let paths = vec!["b", "a", "c"];
-        let serialized = SerializedWorkspaceLocation::from_local_paths(paths);
-
-        assert_eq!(
-            serialized,
-            SerializedWorkspaceLocation::Local(
-                LocalPaths::new(vec!["a", "b", "c"]),
-                LocalPathsOrder::new(vec![1, 0, 2])
-            )
-        );
-    }
-
-    #[test]
-    fn test_sorted_paths() {
-        let paths = vec!["b", "a", "c"];
-        let serialized = SerializedWorkspaceLocation::from_local_paths(paths);
-        assert_eq!(
-            serialized.sorted_paths(),
-            Arc::new(vec![
-                PathBuf::from("b"),
-                PathBuf::from("a"),
-                PathBuf::from("c"),
-            ])
-        );
-
-        let paths = Arc::new(vec![
-            PathBuf::from("a"),
-            PathBuf::from("b"),
-            PathBuf::from("c"),
-        ]);
-        let order = vec![2, 0, 1];
-        let serialized =
-            SerializedWorkspaceLocation::Local(LocalPaths(paths), LocalPathsOrder(order));
-        assert_eq!(
-            serialized.sorted_paths(),
-            Arc::new(vec![
-                PathBuf::from("b"),
-                PathBuf::from("c"),
-                PathBuf::from("a"),
-            ])
-        );
-
-        let paths = Arc::new(vec![
-            PathBuf::from("a"),
-            PathBuf::from("b"),
-            PathBuf::from("c"),
-        ]);
-        let order = vec![];
-        let serialized =
-            SerializedWorkspaceLocation::Local(LocalPaths(paths.clone()), LocalPathsOrder(order));
-        assert_eq!(serialized.sorted_paths(), paths);
-
-        let urls = ["/a", "/b", "/c"];
-        let serialized = SerializedWorkspaceLocation::Ssh(SerializedSshProject {
-            id: SshProjectId(0),
-            host: "host".to_string(),
-            port: Some(22),
-            paths: urls.iter().map(|s| s.to_string()).collect(),
-            user: Some("user".to_string()),
-        });
-        assert_eq!(
-            serialized.sorted_paths(),
-            Arc::new(
-                urls.iter()
-                    .map(|p| PathBuf::from(format!("user@host:22{}", p)))
-                    .collect()
-            )
-        );
-    }
-}
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index d31aae2c59..d07ea30cf9 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6,6 +6,7 @@ mod modal_layer;
 pub mod notifications;
 pub mod pane;
 pub mod pane_group;
+mod path_list;
 mod persistence;
 pub mod searchable;
 pub mod shared_screen;
@@ -18,6 +19,7 @@ mod workspace_settings;
 
 pub use crate::notifications::NotificationFrame;
 pub use dock::Panel;
+pub use path_list::PathList;
 pub use toast_layer::{ToastAction, ToastLayer, ToastView};
 
 use anyhow::{Context as _, Result, anyhow};
@@ -62,20 +64,20 @@ use notifications::{
 };
 pub use pane::*;
 pub use pane_group::*;
-use persistence::{
-    DB, SerializedWindowBounds,
-    model::{SerializedSshProject, SerializedWorkspace},
-};
+use persistence::{DB, SerializedWindowBounds, model::SerializedWorkspace};
 pub use persistence::{
     DB as WORKSPACE_DB, WorkspaceDb, delete_unloaded_items,
-    model::{ItemId, LocalPaths, SerializedWorkspaceLocation},
+    model::{ItemId, SerializedSshConnection, SerializedWorkspaceLocation},
 };
 use postage::stream::Stream;
 use project::{
     DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
     debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
 };
-use remote::{SshClientDelegate, SshConnectionOptions, ssh_session::ConnectionIdentifier};
+use remote::{
+    SshClientDelegate, SshConnectionOptions,
+    ssh_session::{ConnectionIdentifier, SshProjectId},
+};
 use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
@@ -1042,7 +1044,7 @@ pub enum OpenVisible {
 
 enum WorkspaceLocation {
     // Valid local paths or SSH project to serialize
-    Location(SerializedWorkspaceLocation),
+    Location(SerializedWorkspaceLocation, PathList),
     // No valid location found hence clear session id
     DetachFromSession,
     // No valid location found to serialize
@@ -1126,7 +1128,7 @@ pub struct Workspace {
     terminal_provider: Option<Box<dyn TerminalProvider>>,
     debugger_provider: Option<Arc<dyn DebuggerProvider>>,
     serializable_items_tx: UnboundedSender<Box<dyn SerializableItemHandle>>,
-    serialized_ssh_project: Option<SerializedSshProject>,
+    serialized_ssh_connection_id: Option<SshProjectId>,
     _items_serializer: Task<Result<()>>,
     session_id: Option<String>,
     scheduled_tasks: Vec<Task<()>>,
@@ -1175,8 +1177,6 @@ impl Workspace {
 
                 project::Event::WorktreeRemoved(_) | project::Event::WorktreeAdded(_) => {
                     this.update_window_title(window, cx);
-                    this.update_ssh_paths(cx);
-                    this.serialize_ssh_paths(window, cx);
                     this.serialize_workspace(window, cx);
                     // This event could be triggered by `AddFolderToProject` or `RemoveFromProject`.
                     this.update_history(cx);
@@ -1461,7 +1461,7 @@ impl Workspace {
             serializable_items_tx,
             _items_serializer,
             session_id: Some(session_id),
-            serialized_ssh_project: None,
+            serialized_ssh_connection_id: None,
             scheduled_tasks: Vec::new(),
         }
     }
@@ -1501,20 +1501,9 @@ impl Workspace {
             let serialized_workspace =
                 persistence::DB.workspace_for_roots(paths_to_open.as_slice());
 
-            let workspace_location = serialized_workspace
-                .as_ref()
-                .map(|ws| &ws.location)
-                .and_then(|loc| match loc {
-                    SerializedWorkspaceLocation::Local(_, order) => {
-                        Some((loc.sorted_paths(), order.order()))
-                    }
-                    _ => None,
-                });
-
-            if let Some((paths, order)) = workspace_location {
-                paths_to_open = paths.iter().cloned().collect();
-
-                if order.iter().enumerate().any(|(i, &j)| i != j) {
+            if let Some(paths) = serialized_workspace.as_ref().map(|ws| &ws.paths) {
+                paths_to_open = paths.paths().to_vec();
+                if !paths.is_lexicographically_ordered() {
                     project_handle
                         .update(cx, |project, cx| {
                             project.set_worktrees_reordered(true, cx);
@@ -2034,14 +2023,6 @@ impl Workspace {
         self.debugger_provider.clone()
     }
 
-    pub fn serialized_ssh_project(&self) -> Option<SerializedSshProject> {
-        self.serialized_ssh_project.clone()
-    }
-
-    pub fn set_serialized_ssh_project(&mut self, serialized_ssh_project: SerializedSshProject) {
-        self.serialized_ssh_project = Some(serialized_ssh_project);
-    }
-
     pub fn prompt_for_open_path(
         &mut self,
         path_prompt_options: PathPromptOptions,
@@ -5088,59 +5069,12 @@ impl Workspace {
         self.session_id.clone()
     }
 
-    fn local_paths(&self, cx: &App) -> Option<Vec<Arc<Path>>> {
+    pub fn root_paths(&self, cx: &App) -> Vec<Arc<Path>> {
         let project = self.project().read(cx);
-
-        if project.is_local() {
-            Some(
-                project
-                    .visible_worktrees(cx)
-                    .map(|worktree| worktree.read(cx).abs_path())
-                    .collect::<Vec<_>>(),
-            )
-        } else {
-            None
-        }
-    }
-
-    fn update_ssh_paths(&mut self, cx: &App) {
-        let project = self.project().read(cx);
-        if !project.is_local() {
-            let paths: Vec<String> = project
-                .visible_worktrees(cx)
-                .map(|worktree| worktree.read(cx).abs_path().to_string_lossy().to_string())
-                .collect();
-            if let Some(ssh_project) = &mut self.serialized_ssh_project {
-                ssh_project.paths = paths;
-            }
-        }
-    }
-
-    fn serialize_ssh_paths(&mut self, window: &mut Window, cx: &mut Context<Workspace>) {
-        if self._schedule_serialize_ssh_paths.is_none() {
-            self._schedule_serialize_ssh_paths =
-                Some(cx.spawn_in(window, async move |this, cx| {
-                    cx.background_executor()
-                        .timer(SERIALIZATION_THROTTLE_TIME)
-                        .await;
-                    this.update_in(cx, |this, window, cx| {
-                        let task = if let Some(ssh_project) = &this.serialized_ssh_project {
-                            let ssh_project_id = ssh_project.id;
-                            let ssh_project_paths = ssh_project.paths.clone();
-                            window.spawn(cx, async move |_| {
-                                persistence::DB
-                                    .update_ssh_project_paths(ssh_project_id, ssh_project_paths)
-                                    .await
-                            })
-                        } else {
-                            Task::ready(Err(anyhow::anyhow!("No SSH project to serialize")))
-                        };
-                        task.detach();
-                        this._schedule_serialize_ssh_paths.take();
-                    })
-                    .log_err();
-                }));
-        }
+        project
+            .visible_worktrees(cx)
+            .map(|worktree| worktree.read(cx).abs_path())
+            .collect::<Vec<_>>()
     }
 
     fn remove_panes(&mut self, member: Member, window: &mut Window, cx: &mut Context<Workspace>) {
@@ -5313,7 +5247,7 @@ impl Workspace {
         }
 
         match self.serialize_workspace_location(cx) {
-            WorkspaceLocation::Location(location) => {
+            WorkspaceLocation::Location(location, paths) => {
                 let breakpoints = self.project.update(cx, |project, cx| {
                     project
                         .breakpoint_store()
@@ -5327,6 +5261,7 @@ impl Workspace {
                 let serialized_workspace = SerializedWorkspace {
                     id: database_id,
                     location,
+                    paths,
                     center_group,
                     window_bounds,
                     display: Default::default(),
@@ -5352,13 +5287,21 @@ impl Workspace {
     }
 
     fn serialize_workspace_location(&self, cx: &App) -> WorkspaceLocation {
-        if let Some(ssh_project) = &self.serialized_ssh_project {
-            WorkspaceLocation::Location(SerializedWorkspaceLocation::Ssh(ssh_project.clone()))
-        } else if let Some(local_paths) = self.local_paths(cx) {
-            if !local_paths.is_empty() {
-                WorkspaceLocation::Location(SerializedWorkspaceLocation::from_local_paths(
-                    local_paths,
-                ))
+        let paths = PathList::new(&self.root_paths(cx));
+        let connection = self.project.read(cx).ssh_connection_options(cx);
+        if let Some((id, connection)) = self.serialized_ssh_connection_id.zip(connection) {
+            WorkspaceLocation::Location(
+                SerializedWorkspaceLocation::Ssh(SerializedSshConnection {
+                    id,
+                    host: connection.host,
+                    port: connection.port,
+                    user: connection.username,
+                }),
+                paths,
+            )
+        } else if self.project.read(cx).is_local() {
+            if !paths.is_empty() {
+                WorkspaceLocation::Location(SerializedWorkspaceLocation::Local, paths)
             } else {
                 WorkspaceLocation::DetachFromSession
             }
@@ -5371,13 +5314,13 @@ impl Workspace {
         let Some(id) = self.database_id() else {
             return;
         };
-        let location = match self.serialize_workspace_location(cx) {
-            WorkspaceLocation::Location(location) => location,
-            _ => return,
-        };
+        if !self.project.read(cx).is_local() {
+            return;
+        }
         if let Some(manager) = HistoryManager::global(cx) {
+            let paths = PathList::new(&self.root_paths(cx));
             manager.update(cx, |this, cx| {
-                this.update_history(id, HistoryManagerEntry::new(id, &location), cx);
+                this.update_history(id, HistoryManagerEntry::new(id, &paths), cx);
             });
         }
     }
@@ -6843,14 +6786,14 @@ impl WorkspaceHandle for Entity<Workspace> {
     }
 }
 
-pub async fn last_opened_workspace_location() -> Option<SerializedWorkspaceLocation> {
+pub async fn last_opened_workspace_location() -> Option<(SerializedWorkspaceLocation, PathList)> {
     DB.last_workspace().await.log_err().flatten()
 }
 
 pub fn last_session_workspace_locations(
     last_session_id: &str,
     last_session_window_stack: Option<Vec<WindowId>>,
-) -> Option<Vec<SerializedWorkspaceLocation>> {
+) -> Option<Vec<(SerializedWorkspaceLocation, PathList)>> {
     DB.last_session_workspace_locations(last_session_id, last_session_window_stack)
         .log_err()
 }
@@ -7353,7 +7296,7 @@ pub fn open_ssh_project_with_new_connection(
     cx: &mut App,
 ) -> Task<Result<()>> {
     cx.spawn(async move |cx| {
-        let (serialized_ssh_project, workspace_id, serialized_workspace) =
+        let (workspace_id, serialized_workspace) =
             serialize_ssh_project(connection_options.clone(), paths.clone(), cx).await?;
 
         let session = match cx
@@ -7387,7 +7330,6 @@ pub fn open_ssh_project_with_new_connection(
         open_ssh_project_inner(
             project,
             paths,
-            serialized_ssh_project,
             workspace_id,
             serialized_workspace,
             app_state,
@@ -7407,13 +7349,12 @@ pub fn open_ssh_project_with_existing_connection(
     cx: &mut AsyncApp,
 ) -> Task<Result<()>> {
     cx.spawn(async move |cx| {
-        let (serialized_ssh_project, workspace_id, serialized_workspace) =
+        let (workspace_id, serialized_workspace) =
             serialize_ssh_project(connection_options.clone(), paths.clone(), cx).await?;
 
         open_ssh_project_inner(
             project,
             paths,
-            serialized_ssh_project,
             workspace_id,
             serialized_workspace,
             app_state,
@@ -7427,7 +7368,6 @@ pub fn open_ssh_project_with_existing_connection(
 async fn open_ssh_project_inner(
     project: Entity<Project>,
     paths: Vec<PathBuf>,
-    serialized_ssh_project: SerializedSshProject,
     workspace_id: WorkspaceId,
     serialized_workspace: Option<SerializedWorkspace>,
     app_state: Arc<AppState>,
@@ -7480,7 +7420,6 @@ async fn open_ssh_project_inner(
 
             let mut workspace =
                 Workspace::new(Some(workspace_id), project, app_state.clone(), window, cx);
-            workspace.set_serialized_ssh_project(serialized_ssh_project);
             workspace.update_history(cx);
 
             if let Some(ref serialized) = serialized_workspace {
@@ -7517,28 +7456,18 @@ fn serialize_ssh_project(
     connection_options: SshConnectionOptions,
     paths: Vec<PathBuf>,
     cx: &AsyncApp,
-) -> Task<
-    Result<(
-        SerializedSshProject,
-        WorkspaceId,
-        Option<SerializedWorkspace>,
-    )>,
-> {
+) -> Task<Result<(WorkspaceId, Option<SerializedWorkspace>)>> {
     cx.background_spawn(async move {
-        let serialized_ssh_project = persistence::DB
-            .get_or_create_ssh_project(
+        let ssh_connection_id = persistence::DB
+            .get_or_create_ssh_connection(
                 connection_options.host.clone(),
                 connection_options.port,
-                paths
-                    .iter()
-                    .map(|path| path.to_string_lossy().to_string())
-                    .collect::<Vec<_>>(),
                 connection_options.username.clone(),
             )
             .await?;
 
         let serialized_workspace =
-            persistence::DB.workspace_for_ssh_project(&serialized_ssh_project);
+            persistence::DB.ssh_workspace_for_roots(&paths, ssh_connection_id);
 
         let workspace_id = if let Some(workspace_id) =
             serialized_workspace.as_ref().map(|workspace| workspace.id)
@@ -7548,7 +7477,7 @@ fn serialize_ssh_project(
             persistence::DB.next_id().await?
         };
 
-        Ok((serialized_ssh_project, workspace_id, serialized_workspace))
+        Ok((workspace_id, serialized_workspace))
     })
 }
 
@@ -8095,18 +8024,15 @@ pub fn ssh_workspace_position_from_db(
     paths_to_open: &[PathBuf],
     cx: &App,
 ) -> Task<Result<WorkspacePosition>> {
-    let paths = paths_to_open
-        .iter()
-        .map(|path| path.to_string_lossy().to_string())
-        .collect::<Vec<_>>();
+    let paths = paths_to_open.to_vec();
 
     cx.background_spawn(async move {
-        let serialized_ssh_project = persistence::DB
-            .get_or_create_ssh_project(host, port, paths, user)
+        let ssh_connection_id = persistence::DB
+            .get_or_create_ssh_connection(host, port, user)
             .await
             .context("fetching serialized ssh project")?;
         let serialized_workspace =
-            persistence::DB.workspace_for_ssh_project(&serialized_ssh_project);
+            persistence::DB.ssh_workspace_for_roots(&paths, ssh_connection_id);
 
         let (window_bounds, display) = if let Some(bounds) = window_bounds_env_override() {
             (Some(WindowBounds::Windowed(bounds)), None)
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index b8150a600d..e99c8b564b 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -47,8 +47,8 @@ use theme::{
 use util::{ResultExt, TryFutureExt, maybe};
 use uuid::Uuid;
 use workspace::{
-    AppState, SerializedWorkspaceLocation, Toast, Workspace, WorkspaceSettings, WorkspaceStore,
-    notifications::NotificationId,
+    AppState, PathList, SerializedWorkspaceLocation, Toast, Workspace, WorkspaceSettings,
+    WorkspaceStore, notifications::NotificationId,
 };
 use zed::{
     OpenListener, OpenRequest, RawOpenRequest, app_menus, build_window_options,
@@ -949,15 +949,14 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
     if let Some(locations) = restorable_workspace_locations(cx, &app_state).await {
         let mut tasks = Vec::new();
 
-        for location in locations {
+        for (location, paths) in locations {
             match location {
-                SerializedWorkspaceLocation::Local(location, _) => {
+                SerializedWorkspaceLocation::Local => {
                     let app_state = app_state.clone();
-                    let paths = location.paths().to_vec();
                     let task = cx.spawn(async move |cx| {
                         let open_task = cx.update(|cx| {
                             workspace::open_paths(
-                                &paths,
+                                &paths.paths(),
                                 app_state,
                                 workspace::OpenOptions::default(),
                                 cx,
@@ -979,7 +978,7 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
                         match connection_options {
                             Ok(connection_options) => recent_projects::open_ssh_project(
                                 connection_options,
-                                ssh.paths.into_iter().map(PathBuf::from).collect(),
+                                paths.paths().into_iter().map(PathBuf::from).collect(),
                                 app_state,
                                 workspace::OpenOptions::default(),
                                 cx,
@@ -1070,7 +1069,7 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
 pub(crate) async fn restorable_workspace_locations(
     cx: &mut AsyncApp,
     app_state: &Arc<AppState>,
-) -> Option<Vec<SerializedWorkspaceLocation>> {
+) -> Option<Vec<(SerializedWorkspaceLocation, PathList)>> {
     let mut restore_behavior = cx
         .update(|cx| WorkspaceSettings::get(None, cx).restore_on_startup)
         .ok()?;
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index 827c7754fa..2194fb7af5 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -26,6 +26,7 @@ use std::thread;
 use std::time::Duration;
 use util::ResultExt;
 use util::paths::PathWithPosition;
+use workspace::PathList;
 use workspace::item::ItemHandle;
 use workspace::{AppState, OpenOptions, SerializedWorkspaceLocation, Workspace};
 
@@ -361,12 +362,14 @@ async fn open_workspaces(
         if open_new_workspace == Some(true) {
             Vec::new()
         } else {
-            let locations = restorable_workspace_locations(cx, &app_state).await;
-            locations.unwrap_or_default()
+            restorable_workspace_locations(cx, &app_state)
+                .await
+                .unwrap_or_default()
         }
     } else {
-        vec![SerializedWorkspaceLocation::from_local_paths(
-            paths.into_iter().map(PathBuf::from),
+        vec![(
+            SerializedWorkspaceLocation::Local,
+            PathList::new(&paths.into_iter().map(PathBuf::from).collect::<Vec<_>>()),
         )]
     };
 
@@ -394,9 +397,9 @@ async fn open_workspaces(
         // If there are paths to open, open a workspace for each grouping of paths
         let mut errored = false;
 
-        for location in grouped_locations {
+        for (location, workspace_paths) in grouped_locations {
             match location {
-                SerializedWorkspaceLocation::Local(workspace_paths, _) => {
+                SerializedWorkspaceLocation::Local => {
                     let workspace_paths = workspace_paths
                         .paths()
                         .iter()
@@ -429,7 +432,7 @@ async fn open_workspaces(
                         cx.spawn(async move |cx| {
                             open_ssh_project(
                                 connection_options,
-                                ssh.paths.into_iter().map(PathBuf::from).collect(),
+                                workspace_paths.paths().to_vec(),
                                 app_state,
                                 OpenOptions::default(),
                                 cx,

From e6267c42f70233542f09429337d688cc96ceee90 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 22 Aug 2025 23:28:55 +0200
Subject: [PATCH 310/823] Ensure `pane: swap item right` does not panic
 (#36765)

This fixes a panic I randomly ran into whilst mistyping in the command
palette: I accidentally ran `pane: swap item right`in a state where no
items were opened in my active pane. We were checking for `index + 1 ==
self.items.len()` there when it really should be `>=`, as otherwise in
the case of no items this panics.

This PR fixes the bug, adds a test for both the panic as well as the
actions themselves (they were untested previously). Lastly (and mostly),
this also cleans up a bit around existing actions to update them with
how we generally handle actions now.

Release Notes:

- Fixed a panic that could occur with the `pane: swap item right`
action.
---
 crates/collab/src/tests/following_tests.rs |   8 +-
 crates/editor/src/editor_tests.rs          |   4 +-
 crates/search/src/project_search.rs        |   6 +-
 crates/workspace/src/pane.rs               | 149 ++++++++++++++-------
 4 files changed, 110 insertions(+), 57 deletions(-)

diff --git a/crates/collab/src/tests/following_tests.rs b/crates/collab/src/tests/following_tests.rs
index d9fd8ffeb2..1e0c915bcb 100644
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -970,7 +970,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
     // the follow.
     workspace_b.update_in(cx_b, |workspace, window, cx| {
         workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_prev_item(true, window, cx);
+            pane.activate_previous_item(&Default::default(), window, cx);
         });
     });
     executor.run_until_parked();
@@ -1073,7 +1073,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
     // Client A cycles through some tabs.
     workspace_a.update_in(cx_a, |workspace, window, cx| {
         workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_prev_item(true, window, cx);
+            pane.activate_previous_item(&Default::default(), window, cx);
         });
     });
     executor.run_until_parked();
@@ -1117,7 +1117,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
 
     workspace_a.update_in(cx_a, |workspace, window, cx| {
         workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_prev_item(true, window, cx);
+            pane.activate_previous_item(&Default::default(), window, cx);
         });
     });
     executor.run_until_parked();
@@ -1164,7 +1164,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
 
     workspace_a.update_in(cx_a, |workspace, window, cx| {
         workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_prev_item(true, window, cx);
+            pane.activate_previous_item(&Default::default(), window, cx);
         });
     });
     executor.run_until_parked();
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 03f5da9a20..2cfdb92593 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -22715,7 +22715,7 @@ async fn test_invisible_worktree_servers(cx: &mut TestAppContext) {
     .await
     .unwrap();
     pane.update_in(cx, |pane, window, cx| {
-        pane.navigate_backward(window, cx);
+        pane.navigate_backward(&Default::default(), window, cx);
     });
     cx.run_until_parked();
     pane.update(cx, |pane, cx| {
@@ -24302,7 +24302,7 @@ async fn test_document_colors(cx: &mut TestAppContext) {
     workspace
         .update(cx, |workspace, window, cx| {
             workspace.active_pane().update(cx, |pane, cx| {
-                pane.navigate_backward(window, cx);
+                pane.navigate_backward(&Default::default(), window, cx);
             })
         })
         .unwrap();
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index c4ba9b5154..8ac12588af 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -3905,7 +3905,7 @@ pub mod tests {
                 assert_eq!(workspace.active_pane(), &second_pane);
                 second_pane.update(cx, |this, cx| {
                     assert_eq!(this.active_item_index(), 1);
-                    this.activate_prev_item(false, window, cx);
+                    this.activate_previous_item(&Default::default(), window, cx);
                     assert_eq!(this.active_item_index(), 0);
                 });
                 workspace.activate_pane_in_direction(workspace::SplitDirection::Left, window, cx);
@@ -3940,7 +3940,9 @@ pub mod tests {
         // Focus the second pane's non-search item
         window
             .update(cx, |_workspace, window, cx| {
-                second_pane.update(cx, |pane, cx| pane.activate_next_item(true, window, cx));
+                second_pane.update(cx, |pane, cx| {
+                    pane.activate_next_item(&Default::default(), window, cx)
+                });
             })
             .unwrap();
 
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index e88402adc0..fe8014d9f7 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -514,7 +514,7 @@ impl Pane {
         }
     }
 
-    fn alternate_file(&mut self, window: &mut Window, cx: &mut Context<Pane>) {
+    fn alternate_file(&mut self, _: &AlternateFile, window: &mut Window, cx: &mut Context<Pane>) {
         let (_, alternative) = &self.alternate_file_items;
         if let Some(alternative) = alternative {
             let existing = self
@@ -788,7 +788,7 @@ impl Pane {
         !self.nav_history.0.lock().forward_stack.is_empty()
     }
 
-    pub fn navigate_backward(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    pub fn navigate_backward(&mut self, _: &GoBack, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(workspace) = self.workspace.upgrade() {
             let pane = cx.entity().downgrade();
             window.defer(cx, move |window, cx| {
@@ -799,7 +799,7 @@ impl Pane {
         }
     }
 
-    fn navigate_forward(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn navigate_forward(&mut self, _: &GoForward, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(workspace) = self.workspace.upgrade() {
             let pane = cx.entity().downgrade();
             window.defer(cx, move |window, cx| {
@@ -1283,9 +1283,9 @@ impl Pane {
         }
     }
 
-    pub fn activate_prev_item(
+    pub fn activate_previous_item(
         &mut self,
-        activate_pane: bool,
+        _: &ActivatePreviousItem,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1295,12 +1295,12 @@ impl Pane {
         } else if !self.items.is_empty() {
             index = self.items.len() - 1;
         }
-        self.activate_item(index, activate_pane, activate_pane, window, cx);
+        self.activate_item(index, true, true, window, cx);
     }
 
     pub fn activate_next_item(
         &mut self,
-        activate_pane: bool,
+        _: &ActivateNextItem,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1310,10 +1310,15 @@ impl Pane {
         } else {
             index = 0;
         }
-        self.activate_item(index, activate_pane, activate_pane, window, cx);
+        self.activate_item(index, true, true, window, cx);
     }
 
-    pub fn swap_item_left(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    pub fn swap_item_left(
+        &mut self,
+        _: &SwapItemLeft,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         let index = self.active_item_index;
         if index == 0 {
             return;
@@ -1323,9 +1328,14 @@ impl Pane {
         self.activate_item(index - 1, true, true, window, cx);
     }
 
-    pub fn swap_item_right(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    pub fn swap_item_right(
+        &mut self,
+        _: &SwapItemRight,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         let index = self.active_item_index;
-        if index + 1 == self.items.len() {
+        if index + 1 >= self.items.len() {
             return;
         }
 
@@ -1333,6 +1343,16 @@ impl Pane {
         self.activate_item(index + 1, true, true, window, cx);
     }
 
+    pub fn activate_last_item(
+        &mut self,
+        _: &ActivateLastItem,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let index = self.items.len().saturating_sub(1);
+        self.activate_item(index, true, true, window, cx);
+    }
+
     pub fn close_active_item(
         &mut self,
         action: &CloseActiveItem,
@@ -2881,7 +2901,9 @@ impl Pane {
             .on_click({
                 let entity = cx.entity();
                 move |_, window, cx| {
-                    entity.update(cx, |pane, cx| pane.navigate_backward(window, cx))
+                    entity.update(cx, |pane, cx| {
+                        pane.navigate_backward(&Default::default(), window, cx)
+                    })
                 }
             })
             .disabled(!self.can_navigate_backward())
@@ -2896,7 +2918,11 @@ impl Pane {
             .icon_size(IconSize::Small)
             .on_click({
                 let entity = cx.entity();
-                move |_, window, cx| entity.update(cx, |pane, cx| pane.navigate_forward(window, cx))
+                move |_, window, cx| {
+                    entity.update(cx, |pane, cx| {
+                        pane.navigate_forward(&Default::default(), window, cx)
+                    })
+                }
             })
             .disabled(!self.can_navigate_forward())
             .tooltip({
@@ -3528,9 +3554,6 @@ impl Render for Pane {
             .size_full()
             .flex_none()
             .overflow_hidden()
-            .on_action(cx.listener(|pane, _: &AlternateFile, window, cx| {
-                pane.alternate_file(window, cx);
-            }))
             .on_action(
                 cx.listener(|pane, _: &SplitLeft, _, cx| pane.split(SplitDirection::Left, cx)),
             )
@@ -3547,12 +3570,6 @@ impl Render for Pane {
             .on_action(
                 cx.listener(|pane, _: &SplitDown, _, cx| pane.split(SplitDirection::Down, cx)),
             )
-            .on_action(
-                cx.listener(|pane, _: &GoBack, window, cx| pane.navigate_backward(window, cx)),
-            )
-            .on_action(
-                cx.listener(|pane, _: &GoForward, window, cx| pane.navigate_forward(window, cx)),
-            )
             .on_action(cx.listener(|_, _: &JoinIntoNext, _, cx| {
                 cx.emit(Event::JoinIntoNext);
             }))
@@ -3560,6 +3577,8 @@ impl Render for Pane {
                 cx.emit(Event::JoinAll);
             }))
             .on_action(cx.listener(Pane::toggle_zoom))
+            .on_action(cx.listener(Self::navigate_backward))
+            .on_action(cx.listener(Self::navigate_forward))
             .on_action(
                 cx.listener(|pane: &mut Pane, action: &ActivateItem, window, cx| {
                     pane.activate_item(
@@ -3571,33 +3590,14 @@ impl Render for Pane {
                     );
                 }),
             )
-            .on_action(
-                cx.listener(|pane: &mut Pane, _: &ActivateLastItem, window, cx| {
-                    pane.activate_item(pane.items.len().saturating_sub(1), true, true, window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|pane: &mut Pane, _: &ActivatePreviousItem, window, cx| {
-                    pane.activate_prev_item(true, window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|pane: &mut Pane, _: &ActivateNextItem, window, cx| {
-                    pane.activate_next_item(true, window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|pane, _: &SwapItemLeft, window, cx| pane.swap_item_left(window, cx)),
-            )
-            .on_action(
-                cx.listener(|pane, _: &SwapItemRight, window, cx| pane.swap_item_right(window, cx)),
-            )
-            .on_action(cx.listener(|pane, action, window, cx| {
-                pane.toggle_pin_tab(action, window, cx);
-            }))
-            .on_action(cx.listener(|pane, action, window, cx| {
-                pane.unpin_all_tabs(action, window, cx);
-            }))
+            .on_action(cx.listener(Self::alternate_file))
+            .on_action(cx.listener(Self::activate_last_item))
+            .on_action(cx.listener(Self::activate_previous_item))
+            .on_action(cx.listener(Self::activate_next_item))
+            .on_action(cx.listener(Self::swap_item_left))
+            .on_action(cx.listener(Self::swap_item_right))
+            .on_action(cx.listener(Self::toggle_pin_tab))
+            .on_action(cx.listener(Self::unpin_all_tabs))
             .when(PreviewTabsSettings::get_global(cx).enabled, |this| {
                 this.on_action(cx.listener(|pane: &mut Pane, _: &TogglePreviewTab, _, cx| {
                     if let Some(active_item_id) = pane.active_item().map(|i| i.item_id()) {
@@ -6452,6 +6452,57 @@ mod tests {
         .unwrap();
     }
 
+    #[gpui::test]
+    async fn test_item_swapping_actions(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, None, cx).await;
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
+        assert_item_labels(&pane, [], cx);
+
+        // Test that these actions do not panic
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_right(&Default::default(), window, cx);
+        });
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_left(&Default::default(), window, cx);
+        });
+
+        add_labeled_item(&pane, "A", false, cx);
+        add_labeled_item(&pane, "B", false, cx);
+        add_labeled_item(&pane, "C", false, cx);
+        assert_item_labels(&pane, ["A", "B", "C*"], cx);
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_right(&Default::default(), window, cx);
+        });
+        assert_item_labels(&pane, ["A", "B", "C*"], cx);
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_left(&Default::default(), window, cx);
+        });
+        assert_item_labels(&pane, ["A", "C*", "B"], cx);
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_left(&Default::default(), window, cx);
+        });
+        assert_item_labels(&pane, ["C*", "A", "B"], cx);
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_left(&Default::default(), window, cx);
+        });
+        assert_item_labels(&pane, ["C*", "A", "B"], cx);
+
+        pane.update_in(cx, |pane, window, cx| {
+            pane.swap_item_right(&Default::default(), window, cx);
+        });
+        assert_item_labels(&pane, ["A", "C*", "B"], cx);
+    }
+
     fn init_test(cx: &mut TestAppContext) {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);

From 91b2a84001930c00e41462d87279d8ddc87a3b5b Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Fri, 22 Aug 2025 15:17:02 -0700
Subject: [PATCH 311/823] Add a few more testing features (#36778)

Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
---
 Procfile.web                |  2 ++
 crates/client/src/client.rs | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 Procfile.web

diff --git a/Procfile.web b/Procfile.web
new file mode 100644
index 0000000000..8140555144
--- /dev/null
+++ b/Procfile.web
@@ -0,0 +1,2 @@
+postgrest_llm: postgrest crates/collab/postgrest_llm.conf
+website: cd ../zed.dev; npm run dev -- --port=3000
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index f9b8a10610..2bbe7dd1b5 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -66,6 +66,8 @@ pub static IMPERSONATE_LOGIN: LazyLock<Option<String>> = LazyLock::new(|| {
         .and_then(|s| if s.is_empty() { None } else { Some(s) })
 });
 
+pub static USE_WEB_LOGIN: LazyLock<bool> = LazyLock::new(|| std::env::var("ZED_WEB_LOGIN").is_ok());
+
 pub static ADMIN_API_TOKEN: LazyLock<Option<String>> = LazyLock::new(|| {
     std::env::var("ZED_ADMIN_API_TOKEN")
         .ok()
@@ -1392,11 +1394,13 @@ impl Client {
                     if let Some((login, token)) =
                         IMPERSONATE_LOGIN.as_ref().zip(ADMIN_API_TOKEN.as_ref())
                     {
-                        eprintln!("authenticate as admin {login}, {token}");
+                        if !*USE_WEB_LOGIN {
+                            eprintln!("authenticate as admin {login}, {token}");
 
-                        return this
-                            .authenticate_as_admin(http, login.clone(), token.clone())
-                            .await;
+                            return this
+                                .authenticate_as_admin(http, login.clone(), token.clone())
+                                .await;
+                        }
                     }
 
                     // Start an HTTP server to receive the redirect from Zed's sign-in page.

From bc566fe18e2e7fe84df7475029ad480561e87d78 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Sat, 23 Aug 2025 00:35:26 +0200
Subject: [PATCH 312/823] agent2: Tweak usage callout border (#36777)

Release Notes:

- N/A
---
 .../agent_ui/src/ui/preview/usage_callouts.rs | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/crates/agent_ui/src/ui/preview/usage_callouts.rs b/crates/agent_ui/src/ui/preview/usage_callouts.rs
index 29b12ea627..d4d037b976 100644
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -86,23 +86,18 @@ impl RenderOnce for UsageCallout {
             (IconName::Warning, Severity::Warning)
         };
 
-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                Callout::new()
-                    .icon(icon)
-                    .severity(severity)
-                    .icon(icon)
-                    .title(title)
-                    .description(message)
-                    .actions_slot(
-                        Button::new("upgrade", button_text)
-                            .label_size(LabelSize::Small)
-                            .on_click(move |_, _, cx| {
-                                cx.open_url(&url);
-                            }),
-                    ),
+        Callout::new()
+            .icon(icon)
+            .severity(severity)
+            .icon(icon)
+            .title(title)
+            .description(message)
+            .actions_slot(
+                Button::new("upgrade", button_text)
+                    .label_size(LabelSize::Small)
+                    .on_click(move |_, _, cx| {
+                        cx.open_url(&url);
+                    }),
             )
             .into_any_element()
     }

From 153724aad3709abc8bbbc59d584fe139d4ec801f Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 22 Aug 2025 15:44:58 -0700
Subject: [PATCH 313/823] Clean up handling of serialized ssh connection ids
 (#36781)

Small follow-up to #36714

Release Notes:

- N/A
---
 crates/remote/src/ssh_session.rs          |   5 -
 crates/workspace/src/persistence.rs       | 166 +++++++++++-----------
 crates/workspace/src/persistence/model.rs |   7 +-
 crates/workspace/src/workspace.rs         |  12 +-
 4 files changed, 93 insertions(+), 97 deletions(-)

diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index c02d0ad7e7..b9af528643 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -52,11 +52,6 @@ use util::{
     paths::{PathStyle, RemotePathBuf},
 };
 
-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
-)]
-pub struct SshProjectId(pub u64);
-
 #[derive(Clone)]
 pub struct SshSocket {
     connection_options: SshConnectionOptions,
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index de8f63957c..39a1e08c93 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -9,13 +9,13 @@ use std::{
 };
 
 use anyhow::{Context as _, Result, bail};
+use collections::HashMap;
 use db::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql};
 use gpui::{Axis, Bounds, Task, WindowBounds, WindowId, point, size};
 use project::debugger::breakpoint_store::{BreakpointState, SourceBreakpoint};
 
 use language::{LanguageName, Toolchain};
 use project::WorktreeId;
-use remote::ssh_session::SshProjectId;
 use sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
     statement::{SqlType, Statement},
@@ -33,7 +33,7 @@ use crate::{
 
 use model::{
     GroupId, ItemId, PaneId, SerializedItem, SerializedPane, SerializedPaneGroup,
-    SerializedSshConnection, SerializedWorkspace,
+    SerializedSshConnection, SerializedWorkspace, SshConnectionId,
 };
 
 use self::model::{DockStructure, SerializedWorkspaceLocation};
@@ -615,7 +615,7 @@ impl WorkspaceDb {
     pub(crate) fn ssh_workspace_for_roots<P: AsRef<Path>>(
         &self,
         worktree_roots: &[P],
-        ssh_project_id: SshProjectId,
+        ssh_project_id: SshConnectionId,
     ) -> Option<SerializedWorkspace> {
         self.workspace_for_roots_internal(worktree_roots, Some(ssh_project_id))
     }
@@ -623,7 +623,7 @@ impl WorkspaceDb {
     pub(crate) fn workspace_for_roots_internal<P: AsRef<Path>>(
         &self,
         worktree_roots: &[P],
-        ssh_connection_id: Option<SshProjectId>,
+        ssh_connection_id: Option<SshConnectionId>,
     ) -> Option<SerializedWorkspace> {
         // paths are sorted before db interactions to ensure that the order of the paths
         // doesn't affect the workspace selection for existing workspaces
@@ -762,15 +762,21 @@ impl WorkspaceDb {
     /// that used this workspace previously
     pub(crate) async fn save_workspace(&self, workspace: SerializedWorkspace) {
         let paths = workspace.paths.serialize();
-        let ssh_connection_id = match &workspace.location {
-            SerializedWorkspaceLocation::Local => None,
-            SerializedWorkspaceLocation::Ssh(serialized_ssh_connection) => {
-                Some(serialized_ssh_connection.id.0)
-            }
-        };
         log::debug!("Saving workspace at location: {:?}", workspace.location);
         self.write(move |conn| {
             conn.with_savepoint("update_worktrees", || {
+                let ssh_connection_id = match &workspace.location {
+                    SerializedWorkspaceLocation::Local => None,
+                    SerializedWorkspaceLocation::Ssh(connection) => {
+                        Some(Self::get_or_create_ssh_connection_query(
+                            conn,
+                            connection.host.clone(),
+                            connection.port,
+                            connection.user.clone(),
+                        )?.0)
+                    }
+                };
+
                 // Clear out panes and pane_groups
                 conn.exec_bound(sql!(
                     DELETE FROM pane_groups WHERE workspace_id = ?1;
@@ -893,39 +899,34 @@ impl WorkspaceDb {
         host: String,
         port: Option<u16>,
         user: Option<String>,
-    ) -> Result<SshProjectId> {
-        if let Some(id) = self
-            .get_ssh_connection(host.clone(), port, user.clone())
-            .await?
+    ) -> Result<SshConnectionId> {
+        self.write(move |conn| Self::get_or_create_ssh_connection_query(conn, host, port, user))
+            .await
+    }
+
+    fn get_or_create_ssh_connection_query(
+        this: &Connection,
+        host: String,
+        port: Option<u16>,
+        user: Option<String>,
+    ) -> Result<SshConnectionId> {
+        if let Some(id) = this.select_row_bound(sql!(
+            SELECT id FROM ssh_connections WHERE host IS ? AND port IS ? AND user IS ? LIMIT 1
+        ))?((host.clone(), port, user.clone()))?
         {
-            Ok(SshProjectId(id))
+            Ok(SshConnectionId(id))
         } else {
             log::debug!("Inserting SSH project at host {host}");
-            let id = self
-                .insert_ssh_connection(host, port, user)
-                .await?
-                .context("failed to insert ssh project")?;
-            Ok(SshProjectId(id))
-        }
-    }
-
-    query! {
-        async fn get_ssh_connection(host: String, port: Option<u16>, user: Option<String>) -> Result<Option<u64>> {
-            SELECT id
-            FROM ssh_connections
-            WHERE host IS ? AND port IS ? AND user IS ?
-            LIMIT 1
-        }
-    }
-
-    query! {
-        async fn insert_ssh_connection(host: String, port: Option<u16>, user: Option<String>) -> Result<Option<u64>> {
-            INSERT INTO ssh_connections (
-                host,
-                port,
-                user
-            ) VALUES (?1, ?2, ?3)
-            RETURNING id
+            let id = this.select_row_bound(sql!(
+                INSERT INTO ssh_connections (
+                    host,
+                    port,
+                    user
+                ) VALUES (?1, ?2, ?3)
+                RETURNING id
+            ))?((host, port, user))?
+            .context("failed to insert ssh project")?;
+            Ok(SshConnectionId(id))
         }
     }
 
@@ -963,7 +964,7 @@ impl WorkspaceDb {
     fn session_workspaces(
         &self,
         session_id: String,
-    ) -> Result<Vec<(PathList, Option<u64>, Option<SshProjectId>)>> {
+    ) -> Result<Vec<(PathList, Option<u64>, Option<SshConnectionId>)>> {
         Ok(self
             .session_workspaces_query(session_id)?
             .into_iter()
@@ -971,7 +972,7 @@ impl WorkspaceDb {
                 (
                     PathList::deserialize(&SerializedPathList { paths, order }),
                     window_id,
-                    ssh_connection_id.map(SshProjectId),
+                    ssh_connection_id.map(SshConnectionId),
                 )
             })
             .collect())
@@ -1001,15 +1002,15 @@ impl WorkspaceDb {
         }
     }
 
-    fn ssh_connections(&self) -> Result<Vec<SerializedSshConnection>> {
+    fn ssh_connections(&self) -> Result<HashMap<SshConnectionId, SerializedSshConnection>> {
         Ok(self
             .ssh_connections_query()?
             .into_iter()
-            .map(|(id, host, port, user)| SerializedSshConnection {
-                id: SshProjectId(id),
-                host,
-                port,
-                user,
+            .map(|(id, host, port, user)| {
+                (
+                    SshConnectionId(id),
+                    SerializedSshConnection { host, port, user },
+                )
             })
             .collect())
     }
@@ -1021,19 +1022,18 @@ impl WorkspaceDb {
         }
     }
 
-    pub fn ssh_connection(&self, id: SshProjectId) -> Result<SerializedSshConnection> {
+    pub(crate) fn ssh_connection(&self, id: SshConnectionId) -> Result<SerializedSshConnection> {
         let row = self.ssh_connection_query(id.0)?;
         Ok(SerializedSshConnection {
-            id: SshProjectId(row.0),
-            host: row.1,
-            port: row.2,
-            user: row.3,
+            host: row.0,
+            port: row.1,
+            user: row.2,
         })
     }
 
     query! {
-        fn ssh_connection_query(id: u64) -> Result<(u64, String, Option<u16>, Option<String>)> {
-            SELECT id, host, port, user
+        fn ssh_connection_query(id: u64) -> Result<(String, Option<u16>, Option<String>)> {
+            SELECT host, port, user
             FROM ssh_connections
             WHERE id = ?
         }
@@ -1075,10 +1075,8 @@ impl WorkspaceDb {
         let ssh_connections = self.ssh_connections()?;
 
         for (id, paths, ssh_connection_id) in self.recent_workspaces()? {
-            if let Some(ssh_connection_id) = ssh_connection_id.map(SshProjectId) {
-                if let Some(ssh_connection) =
-                    ssh_connections.iter().find(|rp| rp.id == ssh_connection_id)
-                {
+            if let Some(ssh_connection_id) = ssh_connection_id.map(SshConnectionId) {
+                if let Some(ssh_connection) = ssh_connections.get(&ssh_connection_id) {
                     result.push((
                         id,
                         SerializedWorkspaceLocation::Ssh(ssh_connection.clone()),
@@ -2340,12 +2338,10 @@ mod tests {
         ]
         .into_iter()
         .map(|(host, user)| async {
-            let id = db
-                .get_or_create_ssh_connection(host.to_string(), None, Some(user.to_string()))
+            db.get_or_create_ssh_connection(host.to_string(), None, Some(user.to_string()))
                 .await
                 .unwrap();
             SerializedSshConnection {
-                id,
                 host: host.into(),
                 port: None,
                 user: Some(user.into()),
@@ -2501,26 +2497,34 @@ mod tests {
         let stored_projects = db.ssh_connections().unwrap();
         assert_eq!(
             stored_projects,
-            &[
-                SerializedSshConnection {
-                    id: ids[0],
-                    host: "example.com".into(),
-                    port: None,
-                    user: None,
-                },
-                SerializedSshConnection {
-                    id: ids[1],
-                    host: "anotherexample.com".into(),
-                    port: Some(123),
-                    user: Some("user2".into()),
-                },
-                SerializedSshConnection {
-                    id: ids[2],
-                    host: "yetanother.com".into(),
-                    port: Some(345),
-                    user: None,
-                },
+            [
+                (
+                    ids[0],
+                    SerializedSshConnection {
+                        host: "example.com".into(),
+                        port: None,
+                        user: None,
+                    }
+                ),
+                (
+                    ids[1],
+                    SerializedSshConnection {
+                        host: "anotherexample.com".into(),
+                        port: Some(123),
+                        user: Some("user2".into()),
+                    }
+                ),
+                (
+                    ids[2],
+                    SerializedSshConnection {
+                        host: "yetanother.com".into(),
+                        port: Some(345),
+                        user: None,
+                    }
+                ),
             ]
+            .into_iter()
+            .collect::<HashMap<_, _>>(),
         );
     }
 
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index afe4ae6235..04757d0495 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -12,7 +12,6 @@ use db::sqlez::{
 use gpui::{AsyncWindowContext, Entity, WeakEntity};
 
 use project::{Project, debugger::breakpoint_store::SourceBreakpoint};
-use remote::ssh_session::SshProjectId;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::BTreeMap,
@@ -22,9 +21,13 @@ use std::{
 use util::ResultExt;
 use uuid::Uuid;
 
+#[derive(
+    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
+)]
+pub(crate) struct SshConnectionId(pub u64);
+
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct SerializedSshConnection {
-    pub id: SshProjectId,
     pub host: String,
     pub port: Option<u16>,
     pub user: Option<String>,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index d07ea30cf9..bf58786d67 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -74,10 +74,7 @@ use project::{
     DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
     debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
 };
-use remote::{
-    SshClientDelegate, SshConnectionOptions,
-    ssh_session::{ConnectionIdentifier, SshProjectId},
-};
+use remote::{SshClientDelegate, SshConnectionOptions, ssh_session::ConnectionIdentifier};
 use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
@@ -1128,7 +1125,6 @@ pub struct Workspace {
     terminal_provider: Option<Box<dyn TerminalProvider>>,
     debugger_provider: Option<Arc<dyn DebuggerProvider>>,
     serializable_items_tx: UnboundedSender<Box<dyn SerializableItemHandle>>,
-    serialized_ssh_connection_id: Option<SshProjectId>,
     _items_serializer: Task<Result<()>>,
     session_id: Option<String>,
     scheduled_tasks: Vec<Task<()>>,
@@ -1461,7 +1457,7 @@ impl Workspace {
             serializable_items_tx,
             _items_serializer,
             session_id: Some(session_id),
-            serialized_ssh_connection_id: None,
+
             scheduled_tasks: Vec::new(),
         }
     }
@@ -5288,11 +5284,9 @@ impl Workspace {
 
     fn serialize_workspace_location(&self, cx: &App) -> WorkspaceLocation {
         let paths = PathList::new(&self.root_paths(cx));
-        let connection = self.project.read(cx).ssh_connection_options(cx);
-        if let Some((id, connection)) = self.serialized_ssh_connection_id.zip(connection) {
+        if let Some(connection) = self.project.read(cx).ssh_connection_options(cx) {
             WorkspaceLocation::Location(
                 SerializedWorkspaceLocation::Ssh(SerializedSshConnection {
-                    id,
                     host: connection.host,
                     port: connection.port,
                     user: connection.username,

From d24cad30f3805f03a4030703701ef77639a028bc Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 23 Aug 2025 01:55:50 +0300
Subject: [PATCH 314/823] Be more lenient when dealing with rust-analyzer's
 flycheck commands (#36782)

Flycheck commands are global and makes sense to fall back to looking up
project's rust-analyzer even if the commands are run on a non-rust
buffer. If multiple rust-analyzers are found in the project, avoid
ambiguous commands and bail (as before).

Closes #ISSUE

Release Notes:

- Made it possible to run rust-analyzer's flycheck actions from anywhere
in the project
---
 crates/diagnostics/src/diagnostics.rs         |   4 +-
 crates/editor/src/rust_analyzer_ext.rs        |  35 +++---
 crates/project/src/lsp_store.rs               |  23 ++--
 .../src/lsp_store/rust_analyzer_ext.rs        | 108 ++++++++++++------
 crates/proto/proto/lsp.proto                  |   8 +-
 5 files changed, 114 insertions(+), 64 deletions(-)

diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 2e20118381..037e4fc0fd 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -438,7 +438,7 @@ impl ProjectDiagnosticsEditor {
             for buffer_path in diagnostics_sources.iter().cloned() {
                 if cx
                     .update(|cx| {
-                        fetch_tasks.push(run_flycheck(project.clone(), buffer_path, cx));
+                        fetch_tasks.push(run_flycheck(project.clone(), Some(buffer_path), cx));
                     })
                     .is_err()
                 {
@@ -462,7 +462,7 @@ impl ProjectDiagnosticsEditor {
             .iter()
             .cloned()
         {
-            cancel_gasks.push(cancel_flycheck(self.project.clone(), buffer_path, cx));
+            cancel_gasks.push(cancel_flycheck(self.project.clone(), Some(buffer_path), cx));
         }
 
         self.cargo_diagnostics_fetch.cancel_task = Some(cx.background_spawn(async move {
diff --git a/crates/editor/src/rust_analyzer_ext.rs b/crates/editor/src/rust_analyzer_ext.rs
index e3d83ab160..cf74ee0a9e 100644
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@@ -26,6 +26,17 @@ fn is_rust_language(language: &Language) -> bool {
 }
 
 pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) {
+    if editor.read(cx).project().is_some_and(|project| {
+        project
+            .read(cx)
+            .language_server_statuses(cx)
+            .any(|(_, status)| status.name == RUST_ANALYZER_NAME)
+    }) {
+        register_action(editor, window, cancel_flycheck_action);
+        register_action(editor, window, run_flycheck_action);
+        register_action(editor, window, clear_flycheck_action);
+    }
+
     if editor
         .read(cx)
         .buffer()
@@ -38,9 +49,6 @@ pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &
         register_action(editor, window, go_to_parent_module);
         register_action(editor, window, expand_macro_recursively);
         register_action(editor, window, open_docs);
-        register_action(editor, window, cancel_flycheck_action);
-        register_action(editor, window, run_flycheck_action);
-        register_action(editor, window, clear_flycheck_action);
     }
 }
 
@@ -309,7 +317,7 @@ fn cancel_flycheck_action(
     let Some(project) = &editor.project else {
         return;
     };
-    let Some(buffer_id) = editor
+    let buffer_id = editor
         .selections
         .disjoint_anchors()
         .iter()
@@ -321,10 +329,7 @@ fn cancel_flycheck_action(
                 .read(cx)
                 .entry_id(cx)?;
             project.path_for_entry(entry_id, cx)
-        })
-    else {
-        return;
-    };
+        });
     cancel_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
 }
 
@@ -337,7 +342,7 @@ fn run_flycheck_action(
     let Some(project) = &editor.project else {
         return;
     };
-    let Some(buffer_id) = editor
+    let buffer_id = editor
         .selections
         .disjoint_anchors()
         .iter()
@@ -349,10 +354,7 @@ fn run_flycheck_action(
                 .read(cx)
                 .entry_id(cx)?;
             project.path_for_entry(entry_id, cx)
-        })
-    else {
-        return;
-    };
+        });
     run_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
 }
 
@@ -365,7 +367,7 @@ fn clear_flycheck_action(
     let Some(project) = &editor.project else {
         return;
     };
-    let Some(buffer_id) = editor
+    let buffer_id = editor
         .selections
         .disjoint_anchors()
         .iter()
@@ -377,9 +379,6 @@ fn clear_flycheck_action(
                 .read(cx)
                 .entry_id(cx)?;
             project.path_for_entry(entry_id, cx)
-        })
-    else {
-        return;
-    };
+        });
     clear_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
 }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index cc3a0a05bb..fb1fae3736 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -9029,13 +9029,22 @@ impl LspStore {
         lsp_store.update(&mut cx, |lsp_store, cx| {
             if let Some(server) = lsp_store.language_server_for_id(server_id) {
                 let text_document = if envelope.payload.current_file_only {
-                    let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-                    lsp_store
-                        .buffer_store()
-                        .read(cx)
-                        .get(buffer_id)
-                        .and_then(|buffer| Some(buffer.read(cx).file()?.as_local()?.abs_path(cx)))
-                        .map(|path| make_text_document_identifier(&path))
+                    let buffer_id = envelope
+                        .payload
+                        .buffer_id
+                        .map(|id| BufferId::new(id))
+                        .transpose()?;
+                    buffer_id
+                        .and_then(|buffer_id| {
+                            lsp_store
+                                .buffer_store()
+                                .read(cx)
+                                .get(buffer_id)
+                                .and_then(|buffer| {
+                                    Some(buffer.read(cx).file()?.as_local()?.abs_path(cx))
+                                })
+                                .map(|path| make_text_document_identifier(&path))
+                        })
                         .transpose()?
                 } else {
                     None
diff --git a/crates/project/src/lsp_store/rust_analyzer_ext.rs b/crates/project/src/lsp_store/rust_analyzer_ext.rs
index e5e6338d3c..54f63220b1 100644
--- a/crates/project/src/lsp_store/rust_analyzer_ext.rs
+++ b/crates/project/src/lsp_store/rust_analyzer_ext.rs
@@ -1,8 +1,8 @@
 use ::serde::{Deserialize, Serialize};
 use anyhow::Context as _;
-use gpui::{App, Entity, Task, WeakEntity};
-use language::ServerHealth;
-use lsp::{LanguageServer, LanguageServerName};
+use gpui::{App, AsyncApp, Entity, Task, WeakEntity};
+use language::{Buffer, ServerHealth};
+use lsp::{LanguageServer, LanguageServerId, LanguageServerName};
 use rpc::proto;
 
 use crate::{LspStore, LspStoreEvent, Project, ProjectPath, lsp_store};
@@ -83,31 +83,32 @@ pub fn register_notifications(lsp_store: WeakEntity<LspStore>, language_server:
 
 pub fn cancel_flycheck(
     project: Entity<Project>,
-    buffer_path: ProjectPath,
+    buffer_path: Option<ProjectPath>,
     cx: &mut App,
 ) -> Task<anyhow::Result<()>> {
     let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
     let lsp_store = project.read(cx).lsp_store();
-    let buffer = project.update(cx, |project, cx| {
-        project.buffer_store().update(cx, |buffer_store, cx| {
-            buffer_store.open_buffer(buffer_path, cx)
+    let buffer = buffer_path.map(|buffer_path| {
+        project.update(cx, |project, cx| {
+            project.buffer_store().update(cx, |buffer_store, cx| {
+                buffer_store.open_buffer(buffer_path, cx)
+            })
         })
     });
 
     cx.spawn(async move |cx| {
-        let buffer = buffer.await?;
-        let Some(rust_analyzer_server) = project.read_with(cx, |project, cx| {
-            project.language_server_id_for_name(buffer.read(cx), &RUST_ANALYZER_NAME, cx)
-        })?
+        let buffer = match buffer {
+            Some(buffer) => Some(buffer.await?),
+            None => None,
+        };
+        let Some(rust_analyzer_server) = find_rust_analyzer_server(&project, buffer.as_ref(), cx)
         else {
             return Ok(());
         };
-        let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id().to_proto())?;
 
         if let Some((client, project_id)) = upstream_client {
             let request = proto::LspExtCancelFlycheck {
                 project_id,
-                buffer_id,
                 language_server_id: rust_analyzer_server.to_proto(),
             };
             client
@@ -130,28 +131,33 @@ pub fn cancel_flycheck(
 
 pub fn run_flycheck(
     project: Entity<Project>,
-    buffer_path: ProjectPath,
+    buffer_path: Option<ProjectPath>,
     cx: &mut App,
 ) -> Task<anyhow::Result<()>> {
     let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
     let lsp_store = project.read(cx).lsp_store();
-    let buffer = project.update(cx, |project, cx| {
-        project.buffer_store().update(cx, |buffer_store, cx| {
-            buffer_store.open_buffer(buffer_path, cx)
+    let buffer = buffer_path.map(|buffer_path| {
+        project.update(cx, |project, cx| {
+            project.buffer_store().update(cx, |buffer_store, cx| {
+                buffer_store.open_buffer(buffer_path, cx)
+            })
         })
     });
 
     cx.spawn(async move |cx| {
-        let buffer = buffer.await?;
-        let Some(rust_analyzer_server) = project.read_with(cx, |project, cx| {
-            project.language_server_id_for_name(buffer.read(cx), &RUST_ANALYZER_NAME, cx)
-        })?
+        let buffer = match buffer {
+            Some(buffer) => Some(buffer.await?),
+            None => None,
+        };
+        let Some(rust_analyzer_server) = find_rust_analyzer_server(&project, buffer.as_ref(), cx)
         else {
             return Ok(());
         };
-        let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id().to_proto())?;
 
         if let Some((client, project_id)) = upstream_client {
+            let buffer_id = buffer
+                .map(|buffer| buffer.read_with(cx, |buffer, _| buffer.remote_id().to_proto()))
+                .transpose()?;
             let request = proto::LspExtRunFlycheck {
                 project_id,
                 buffer_id,
@@ -182,31 +188,32 @@ pub fn run_flycheck(
 
 pub fn clear_flycheck(
     project: Entity<Project>,
-    buffer_path: ProjectPath,
+    buffer_path: Option<ProjectPath>,
     cx: &mut App,
 ) -> Task<anyhow::Result<()>> {
     let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
     let lsp_store = project.read(cx).lsp_store();
-    let buffer = project.update(cx, |project, cx| {
-        project.buffer_store().update(cx, |buffer_store, cx| {
-            buffer_store.open_buffer(buffer_path, cx)
+    let buffer = buffer_path.map(|buffer_path| {
+        project.update(cx, |project, cx| {
+            project.buffer_store().update(cx, |buffer_store, cx| {
+                buffer_store.open_buffer(buffer_path, cx)
+            })
         })
     });
 
     cx.spawn(async move |cx| {
-        let buffer = buffer.await?;
-        let Some(rust_analyzer_server) = project.read_with(cx, |project, cx| {
-            project.language_server_id_for_name(buffer.read(cx), &RUST_ANALYZER_NAME, cx)
-        })?
+        let buffer = match buffer {
+            Some(buffer) => Some(buffer.await?),
+            None => None,
+        };
+        let Some(rust_analyzer_server) = find_rust_analyzer_server(&project, buffer.as_ref(), cx)
         else {
             return Ok(());
         };
-        let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id().to_proto())?;
 
         if let Some((client, project_id)) = upstream_client {
             let request = proto::LspExtClearFlycheck {
                 project_id,
-                buffer_id,
                 language_server_id: rust_analyzer_server.to_proto(),
             };
             client
@@ -226,3 +233,40 @@ pub fn clear_flycheck(
         anyhow::Ok(())
     })
 }
+
+fn find_rust_analyzer_server(
+    project: &Entity<Project>,
+    buffer: Option<&Entity<Buffer>>,
+    cx: &mut AsyncApp,
+) -> Option<LanguageServerId> {
+    project
+        .read_with(cx, |project, cx| {
+            buffer
+                .and_then(|buffer| {
+                    project.language_server_id_for_name(buffer.read(cx), &RUST_ANALYZER_NAME, cx)
+                })
+                // If no rust-analyzer found for the current buffer (e.g. `settings.json`), fall back to the project lookup
+                // and use project's rust-analyzer if it's the only one.
+                .or_else(|| {
+                    let rust_analyzer_servers = project
+                        .lsp_store()
+                        .read(cx)
+                        .language_server_statuses
+                        .iter()
+                        .filter_map(|(server_id, server_status)| {
+                            if server_status.name == RUST_ANALYZER_NAME {
+                                Some(*server_id)
+                            } else {
+                                None
+                            }
+                        })
+                        .collect::<Vec<_>>();
+                    if rust_analyzer_servers.len() == 1 {
+                        rust_analyzer_servers.first().copied()
+                    } else {
+                        None
+                    }
+                })
+        })
+        .ok()?
+}
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index ac9c275aa2..473ef5c38c 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -834,21 +834,19 @@ message LspRunnable {
 
 message LspExtCancelFlycheck {
     uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    uint64 language_server_id = 3;
+    uint64 language_server_id = 2;
 }
 
 message LspExtRunFlycheck {
     uint64 project_id = 1;
-    uint64 buffer_id = 2;
+    optional uint64 buffer_id = 2;
     uint64 language_server_id = 3;
     bool current_file_only = 4;
 }
 
 message LspExtClearFlycheck {
     uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    uint64 language_server_id = 3;
+    uint64 language_server_id = 2;
 }
 
 message LspDiagnosticRelatedInformation {

From f48a8f2b6a702fe1051016817097ee2c08ad7e22 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:10:26 -0300
Subject: [PATCH 315/823] thread view: Simplify tool call & improve required
 auth state UIs (#36783)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 145 ++++++++++++++-----------
 1 file changed, 82 insertions(+), 63 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2a83a4ab5b..0e1d4123b9 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1668,39 +1668,14 @@ impl AcpThreadView {
         let header_id = SharedString::from(format!("outer-tool-call-header-{}", entry_ix));
         let card_header_id = SharedString::from("inner-tool-call-header");
 
-        let status_icon = match &tool_call.status {
-            ToolCallStatus::Pending
-            | ToolCallStatus::WaitingForConfirmation { .. }
-            | ToolCallStatus::Completed => None,
-            ToolCallStatus::InProgress => Some(
-                div()
-                    .absolute()
-                    .right_2()
-                    .child(
-                        Icon::new(IconName::ArrowCircle)
-                            .color(Color::Muted)
-                            .size(IconSize::Small)
-                            .with_animation(
-                                "running",
-                                Animation::new(Duration::from_secs(3)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            ),
-                    )
-                    .into_any(),
-            ),
-            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => Some(
-                div()
-                    .absolute()
-                    .right_2()
-                    .child(
-                        Icon::new(IconName::Close)
-                            .color(Color::Error)
-                            .size(IconSize::Small),
-                    )
-                    .into_any_element(),
-            ),
+        let in_progress = match &tool_call.status {
+            ToolCallStatus::InProgress => true,
+            _ => false,
+        };
+
+        let failed_or_canceled = match &tool_call.status {
+            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
+            _ => false,
         };
 
         let failed_tool_call = matches!(
@@ -1884,7 +1859,33 @@ impl AcpThreadView {
                                     .into_any()
                             }),
                     )
-                    .children(status_icon),
+                    .when(in_progress && use_card_layout, |this| {
+                        this.child(
+                            div().absolute().right_2().child(
+                                Icon::new(IconName::ArrowCircle)
+                                    .color(Color::Muted)
+                                    .size(IconSize::Small)
+                                    .with_animation(
+                                        "running",
+                                        Animation::new(Duration::from_secs(3)).repeat(),
+                                        |icon, delta| {
+                                            icon.transform(Transformation::rotate(percentage(
+                                                delta,
+                                            )))
+                                        },
+                                    ),
+                            ),
+                        )
+                    })
+                    .when(failed_or_canceled, |this| {
+                        this.child(
+                            div().absolute().right_2().child(
+                                Icon::new(IconName::Close)
+                                    .color(Color::Error)
+                                    .size(IconSize::Small),
+                            ),
+                        )
+                    }),
             )
             .children(tool_output_display)
     }
@@ -2579,11 +2580,15 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &Context<Self>,
     ) -> Div {
+        let show_description =
+            configuration_view.is_none() && description.is_none() && pending_auth_method.is_none();
+
         v_flex().flex_1().size_full().justify_end().child(
             v_flex()
                 .p_2()
                 .pr_3()
                 .w_full()
+                .gap_1()
                 .border_t_1()
                 .border_color(cx.theme().colors().border)
                 .bg(cx.theme().status().warning.opacity(0.04))
@@ -2595,7 +2600,7 @@ impl AcpThreadView {
                                 .color(Color::Warning)
                                 .size(IconSize::Small),
                         )
-                        .child(Label::new("Authentication Required")),
+                        .child(Label::new("Authentication Required").size(LabelSize::Small)),
                 )
                 .children(description.map(|desc| {
                     div().text_ui(cx).child(self.render_markdown(
@@ -2609,44 +2614,20 @@ impl AcpThreadView {
                         .map(|view| div().w_full().child(view)),
                 )
                 .when(
-                    configuration_view.is_none()
-                        && description.is_none()
-                        && pending_auth_method.is_none(),
+                    show_description,
                     |el| {
                         el.child(
                             Label::new(format!(
                                 "You are not currently authenticated with {}. Please choose one of the following options:",
                                 self.agent.name()
                             ))
+                            .size(LabelSize::Small)
                             .color(Color::Muted)
                             .mb_1()
                             .ml_5(),
                         )
                     },
                 )
-                .when(!connection.auth_methods().is_empty(), |this| {
-                    this.child(
-                        h_flex().justify_end().flex_wrap().gap_1().children(
-                            connection.auth_methods().iter().enumerate().rev().map(
-                                |(ix, method)| {
-                                    Button::new(
-                                        SharedString::from(method.id.0.clone()),
-                                        method.name.clone(),
-                                    )
-                                    .when(ix == 0, |el| {
-                                        el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                    })
-                                    .on_click({
-                                        let method_id = method.id.clone();
-                                        cx.listener(move |this, _, window, cx| {
-                                            this.authenticate(method_id.clone(), window, cx)
-                                        })
-                                    })
-                                },
-                            ),
-                        ),
-                    )
-                })
                 .when_some(pending_auth_method, |el, _| {
                     el.child(
                         h_flex()
@@ -2669,9 +2650,47 @@ impl AcpThreadView {
                                     )
                                     .into_any_element(),
                             )
-                            .child(Label::new("Authenticating…")),
+                            .child(Label::new("Authenticating…").size(LabelSize::Small)),
                     )
-                }),
+                })
+                .when(!connection.auth_methods().is_empty(), |this| {
+                    this.child(
+                        h_flex()
+                            .justify_end()
+                            .flex_wrap()
+                            .gap_1()
+                            .when(!show_description, |this| {
+                                this.border_t_1()
+                                    .mt_1()
+                                    .pt_2()
+                                    .border_color(cx.theme().colors().border.opacity(0.8))
+                            })
+                            .children(
+                                connection
+                                    .auth_methods()
+                                    .iter()
+                                    .enumerate()
+                                    .rev()
+                                    .map(|(ix, method)| {
+                                        Button::new(
+                                            SharedString::from(method.id.0.clone()),
+                                            method.name.clone(),
+                                        )
+                                        .when(ix == 0, |el| {
+                                            el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
+                                        })
+                                        .label_size(LabelSize::Small)
+                                        .on_click({
+                                            let method_id = method.id.clone();
+                                            cx.listener(move |this, _, window, cx| {
+                                                this.authenticate(method_id.clone(), window, cx)
+                                            })
+                                        })
+                                    }),
+                            ),
+                    )
+                })
+
         )
     }
 

From 5da31fdb725d41f62900a8317e0919d30fa54f15 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 22 Aug 2025 22:09:08 -0600
Subject: [PATCH 316/823] acp: Remove ACP v0 (#36785)

We had a few people confused about why some features weren't working due
to the fallback logic.

It's gone.

Release Notes:

- N/A
---
 Cargo.lock                        |  61 +----
 Cargo.toml                        |   1 -
 crates/agent_servers/Cargo.toml   |   1 -
 crates/agent_servers/src/acp.rs   | 387 ++++++++++++++++++++++++++++--
 tooling/workspace-hack/Cargo.toml |   2 -
 5 files changed, 381 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4043666823..aa3a910390 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -289,7 +289,6 @@ dependencies = [
  "action_log",
  "agent-client-protocol",
  "agent_settings",
- "agentic-coding-protocol",
  "anyhow",
  "client",
  "collections",
@@ -443,24 +442,6 @@ dependencies = [
  "zed_actions",
 ]
 
-[[package]]
-name = "agentic-coding-protocol"
-version = "0.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e6ae951b36fa2f8d9dd6e1af6da2fcaba13d7c866cf6a9e65deda9dc6c5fe4"
-dependencies = [
- "anyhow",
- "chrono",
- "derive_more 2.0.1",
- "futures 0.3.31",
- "log",
- "parking_lot",
- "schemars",
- "semver",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -876,7 +857,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "collections",
- "derive_more 0.99.19",
+ "derive_more",
  "extension",
  "futures 0.3.31",
  "gpui",
@@ -939,7 +920,7 @@ dependencies = [
  "clock",
  "collections",
  "ctor",
- "derive_more 0.99.19",
+ "derive_more",
  "gpui",
  "icons",
  "indoc",
@@ -976,7 +957,7 @@ dependencies = [
  "cloud_llm_client",
  "collections",
  "component",
- "derive_more 0.99.19",
+ "derive_more",
  "diffy",
  "editor",
  "feature_flags",
@@ -3089,7 +3070,7 @@ dependencies = [
  "cocoa 0.26.0",
  "collections",
  "credentials_provider",
- "derive_more 0.99.19",
+ "derive_more",
  "feature_flags",
  "fs",
  "futures 0.3.31",
@@ -3521,7 +3502,7 @@ name = "command_palette_hooks"
 version = "0.1.0"
 dependencies = [
  "collections",
- "derive_more 0.99.19",
+ "derive_more",
  "gpui",
  "workspace-hack",
 ]
@@ -4684,27 +4665,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "derive_more"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
- "unicode-xid",
-]
-
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
@@ -6441,7 +6401,7 @@ dependencies = [
  "askpass",
  "async-trait",
  "collections",
- "derive_more 0.99.19",
+ "derive_more",
  "futures 0.3.31",
  "git2",
  "gpui",
@@ -7471,7 +7431,7 @@ dependencies = [
  "core-video",
  "cosmic-text",
  "ctor",
- "derive_more 0.99.19",
+ "derive_more",
  "embed-resource",
  "env_logger 0.11.8",
  "etagere",
@@ -7996,7 +7956,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bytes 1.10.1",
- "derive_more 0.99.19",
+ "derive_more",
  "futures 0.3.31",
  "http 1.3.1",
  "http-body 1.0.1",
@@ -14399,12 +14359,10 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe8c9d1c68d67dd9f97ecbc6f932b60eb289c5dbddd8aa1405484a8fd2fcd984"
 dependencies = [
- "chrono",
  "dyn-clone",
  "indexmap",
  "ref-cast",
  "schemars_derive",
- "semver",
  "serde",
  "serde_json",
 ]
@@ -16488,7 +16446,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
- "derive_more 0.99.19",
+ "derive_more",
  "fs",
  "futures 0.3.31",
  "gpui",
@@ -20003,7 +19961,6 @@ dependencies = [
  "rustix 1.0.7",
  "rustls 0.23.26",
  "rustls-webpki 0.103.1",
- "schemars",
  "scopeguard",
  "sea-orm",
  "sea-query-binder",
diff --git a/Cargo.toml b/Cargo.toml
index 7668d18752..6ec243a9b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -426,7 +426,6 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agentic-coding-protocol = "0.0.10"
 agent-client-protocol = "0.0.31"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 8ea4a27f4c..9f90f3a78a 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -22,7 +22,6 @@ acp_thread.workspace = true
 action_log.workspace = true
 agent-client-protocol.workspace = true
 agent_settings.workspace = true
-agentic-coding-protocol.workspace = true
 anyhow.workspace = true
 client = { workspace = true, optional = true }
 collections.workspace = true
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 1cfb1fcabf..a99a401431 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -1,34 +1,391 @@
-use std::{path::Path, rc::Rc};
-
 use crate::AgentServerCommand;
 use acp_thread::AgentConnection;
-use anyhow::Result;
-use gpui::AsyncApp;
+use acp_tools::AcpConnectionRegistry;
+use action_log::ActionLog;
+use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
+use anyhow::anyhow;
+use collections::HashMap;
+use futures::AsyncBufReadExt as _;
+use futures::channel::oneshot;
+use futures::io::BufReader;
+use project::Project;
+use serde::Deserialize;
+use std::{any::Any, cell::RefCell};
+use std::{path::Path, rc::Rc};
 use thiserror::Error;
 
-mod v0;
-mod v1;
+use anyhow::{Context as _, Result};
+use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
+
+use acp_thread::{AcpThread, AuthRequired, LoadError};
 
 #[derive(Debug, Error)]
 #[error("Unsupported version")]
 pub struct UnsupportedVersion;
 
+pub struct AcpConnection {
+    server_name: &'static str,
+    connection: Rc<acp::ClientSideConnection>,
+    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
+    auth_methods: Vec<acp::AuthMethod>,
+    prompt_capabilities: acp::PromptCapabilities,
+    _io_task: Task<Result<()>>,
+}
+
+pub struct AcpSession {
+    thread: WeakEntity<AcpThread>,
+    suppress_abort_err: bool,
+}
+
 pub async fn connect(
     server_name: &'static str,
     command: AgentServerCommand,
     root_dir: &Path,
     cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
-    let conn = v1::AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await;
+    let conn = AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await?;
+    Ok(Rc::new(conn) as _)
+}
 
-    match conn {
-        Ok(conn) => Ok(Rc::new(conn) as _),
-        Err(err) if err.is::<UnsupportedVersion>() => {
-            // Consider re-using initialize response and subprocess when adding another version here
-            let conn: Rc<dyn AgentConnection> =
-                Rc::new(v0::AcpConnection::stdio(server_name, command, root_dir, cx).await?);
-            Ok(conn)
+const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
+
+impl AcpConnection {
+    pub async fn stdio(
+        server_name: &'static str,
+        command: AgentServerCommand,
+        root_dir: &Path,
+        cx: &mut AsyncApp,
+    ) -> Result<Self> {
+        let mut child = util::command::new_smol_command(&command.path)
+            .args(command.args.iter().map(|arg| arg.as_str()))
+            .envs(command.env.iter().flatten())
+            .current_dir(root_dir)
+            .stdin(std::process::Stdio::piped())
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped())
+            .kill_on_drop(true)
+            .spawn()?;
+
+        let stdout = child.stdout.take().context("Failed to take stdout")?;
+        let stdin = child.stdin.take().context("Failed to take stdin")?;
+        let stderr = child.stderr.take().context("Failed to take stderr")?;
+        log::trace!("Spawned (pid: {})", child.id());
+
+        let sessions = Rc::new(RefCell::new(HashMap::default()));
+
+        let client = ClientDelegate {
+            sessions: sessions.clone(),
+            cx: cx.clone(),
+        };
+        let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
+            let foreground_executor = cx.foreground_executor().clone();
+            move |fut| {
+                foreground_executor.spawn(fut).detach();
+            }
+        });
+
+        let io_task = cx.background_spawn(io_task);
+
+        cx.background_spawn(async move {
+            let mut stderr = BufReader::new(stderr);
+            let mut line = String::new();
+            while let Ok(n) = stderr.read_line(&mut line).await
+                && n > 0
+            {
+                log::warn!("agent stderr: {}", &line);
+                line.clear();
+            }
+        })
+        .detach();
+
+        cx.spawn({
+            let sessions = sessions.clone();
+            async move |cx| {
+                let status = child.status().await?;
+
+                for session in sessions.borrow().values() {
+                    session
+                        .thread
+                        .update(cx, |thread, cx| {
+                            thread.emit_load_error(LoadError::Exited { status }, cx)
+                        })
+                        .ok();
+                }
+
+                anyhow::Ok(())
+            }
+        })
+        .detach();
+
+        let connection = Rc::new(connection);
+
+        cx.update(|cx| {
+            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
+                registry.set_active_connection(server_name, &connection, cx)
+            });
+        })?;
+
+        let response = connection
+            .initialize(acp::InitializeRequest {
+                protocol_version: acp::VERSION,
+                client_capabilities: acp::ClientCapabilities {
+                    fs: acp::FileSystemCapability {
+                        read_text_file: true,
+                        write_text_file: true,
+                    },
+                },
+            })
+            .await?;
+
+        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
+            return Err(UnsupportedVersion.into());
         }
-        Err(err) => Err(err),
+
+        Ok(Self {
+            auth_methods: response.auth_methods,
+            connection,
+            server_name,
+            sessions,
+            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
+            _io_task: io_task,
+        })
+    }
+}
+
+impl AgentConnection for AcpConnection {
+    fn new_thread(
+        self: Rc<Self>,
+        project: Entity<Project>,
+        cwd: &Path,
+        cx: &mut App,
+    ) -> Task<Result<Entity<AcpThread>>> {
+        let conn = self.connection.clone();
+        let sessions = self.sessions.clone();
+        let cwd = cwd.to_path_buf();
+        cx.spawn(async move |cx| {
+            let response = conn
+                .new_session(acp::NewSessionRequest {
+                    mcp_servers: vec![],
+                    cwd,
+                })
+                .await
+                .map_err(|err| {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
+                        let mut error = AuthRequired::new();
+
+                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
+                            error = error.with_description(err.message);
+                        }
+
+                        anyhow!(error)
+                    } else {
+                        anyhow!(err)
+                    }
+                })?;
+
+            let session_id = response.session_id;
+            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
+            let thread = cx.new(|_cx| {
+                AcpThread::new(
+                    self.server_name,
+                    self.clone(),
+                    project,
+                    action_log,
+                    session_id.clone(),
+                )
+            })?;
+
+            let session = AcpSession {
+                thread: thread.downgrade(),
+                suppress_abort_err: false,
+            };
+            sessions.borrow_mut().insert(session_id, session);
+
+            Ok(thread)
+        })
+    }
+
+    fn auth_methods(&self) -> &[acp::AuthMethod] {
+        &self.auth_methods
+    }
+
+    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
+        let conn = self.connection.clone();
+        cx.foreground_executor().spawn(async move {
+            let result = conn
+                .authenticate(acp::AuthenticateRequest {
+                    method_id: method_id.clone(),
+                })
+                .await?;
+
+            Ok(result)
+        })
+    }
+
+    fn prompt(
+        &self,
+        _id: Option<acp_thread::UserMessageId>,
+        params: acp::PromptRequest,
+        cx: &mut App,
+    ) -> Task<Result<acp::PromptResponse>> {
+        let conn = self.connection.clone();
+        let sessions = self.sessions.clone();
+        let session_id = params.session_id.clone();
+        cx.foreground_executor().spawn(async move {
+            let result = conn.prompt(params).await;
+
+            let mut suppress_abort_err = false;
+
+            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
+                suppress_abort_err = session.suppress_abort_err;
+                session.suppress_abort_err = false;
+            }
+
+            match result {
+                Ok(response) => Ok(response),
+                Err(err) => {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
+                        anyhow::bail!(err)
+                    }
+
+                    let Some(data) = &err.data else {
+                        anyhow::bail!(err)
+                    };
+
+                    // Temporary workaround until the following PR is generally available:
+                    // https://github.com/google-gemini/gemini-cli/pull/6656
+
+                    #[derive(Deserialize)]
+                    #[serde(deny_unknown_fields)]
+                    struct ErrorDetails {
+                        details: Box<str>,
+                    }
+
+                    match serde_json::from_value(data.clone()) {
+                        Ok(ErrorDetails { details }) => {
+                            if suppress_abort_err && details.contains("This operation was aborted")
+                            {
+                                Ok(acp::PromptResponse {
+                                    stop_reason: acp::StopReason::Cancelled,
+                                })
+                            } else {
+                                Err(anyhow!(details))
+                            }
+                        }
+                        Err(_) => Err(anyhow!(err)),
+                    }
+                }
+            }
+        })
+    }
+
+    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        self.prompt_capabilities
+    }
+
+    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
+        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
+            session.suppress_abort_err = true;
+        }
+        let conn = self.connection.clone();
+        let params = acp::CancelNotification {
+            session_id: session_id.clone(),
+        };
+        cx.foreground_executor()
+            .spawn(async move { conn.cancel(params).await })
+            .detach();
+    }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+        self
+    }
+}
+
+struct ClientDelegate {
+    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
+    cx: AsyncApp,
+}
+
+impl acp::Client for ClientDelegate {
+    async fn request_permission(
+        &self,
+        arguments: acp::RequestPermissionRequest,
+    ) -> Result<acp::RequestPermissionResponse, acp::Error> {
+        let cx = &mut self.cx.clone();
+        let rx = self
+            .sessions
+            .borrow()
+            .get(&arguments.session_id)
+            .context("Failed to get session")?
+            .thread
+            .update(cx, |thread, cx| {
+                thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
+            })?;
+
+        let result = rx?.await;
+
+        let outcome = match result {
+            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
+            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
+        };
+
+        Ok(acp::RequestPermissionResponse { outcome })
+    }
+
+    async fn write_text_file(
+        &self,
+        arguments: acp::WriteTextFileRequest,
+    ) -> Result<(), acp::Error> {
+        let cx = &mut self.cx.clone();
+        let task = self
+            .sessions
+            .borrow()
+            .get(&arguments.session_id)
+            .context("Failed to get session")?
+            .thread
+            .update(cx, |thread, cx| {
+                thread.write_text_file(arguments.path, arguments.content, cx)
+            })?;
+
+        task.await?;
+
+        Ok(())
+    }
+
+    async fn read_text_file(
+        &self,
+        arguments: acp::ReadTextFileRequest,
+    ) -> Result<acp::ReadTextFileResponse, acp::Error> {
+        let cx = &mut self.cx.clone();
+        let task = self
+            .sessions
+            .borrow()
+            .get(&arguments.session_id)
+            .context("Failed to get session")?
+            .thread
+            .update(cx, |thread, cx| {
+                thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
+            })?;
+
+        let content = task.await?;
+
+        Ok(acp::ReadTextFileResponse { content })
+    }
+
+    async fn session_notification(
+        &self,
+        notification: acp::SessionNotification,
+    ) -> Result<(), acp::Error> {
+        let cx = &mut self.cx.clone();
+        let sessions = self.sessions.borrow();
+        let session = sessions
+            .get(&notification.session_id)
+            .context("Failed to get session")?;
+
+        session.thread.update(cx, |thread, cx| {
+            thread.handle_session_update(notification.update, cx)
+        })??;
+
+        Ok(())
     }
 }
diff --git a/tooling/workspace-hack/Cargo.toml b/tooling/workspace-hack/Cargo.toml
index bf44fc195e..2f9a963abc 100644
--- a/tooling/workspace-hack/Cargo.toml
+++ b/tooling/workspace-hack/Cargo.toml
@@ -109,7 +109,6 @@ rustc-hash = { version = "1" }
 rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", default-features = false, features = ["fs", "net", "std"] }
 rustls = { version = "0.23", features = ["ring"] }
 rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] }
-schemars = { version = "1", features = ["chrono04", "indexmap2", "semver1"] }
 sea-orm = { version = "1", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite"] }
 sea-query-binder = { version = "0.7", default-features = false, features = ["postgres-array", "sqlx-postgres", "sqlx-sqlite", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
 semver = { version = "1", features = ["serde"] }
@@ -244,7 +243,6 @@ rustc-hash = { version = "1" }
 rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", default-features = false, features = ["fs", "net", "std"] }
 rustls = { version = "0.23", features = ["ring"] }
 rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] }
-schemars = { version = "1", features = ["chrono04", "indexmap2", "semver1"] }
 sea-orm = { version = "1", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite"] }
 sea-query-binder = { version = "0.7", default-features = false, features = ["postgres-array", "sqlx-postgres", "sqlx-sqlite", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
 semver = { version = "1", features = ["serde"] }

From ea42013746f1533a49c32c0a6a5d6b84920f85b2 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sat, 23 Aug 2025 01:21:20 -0400
Subject: [PATCH 317/823] acp: Eagerly load all kinds of mentions (#36741)

This PR makes it so that all kinds of @-mentions start loading their
context as soon as they are confirmed. Previously, we were waiting to
load the context for file, symbol, selection, and rule mentions until
the user's message was sent. By kicking off loading immediately for
these kinds of context, we can support adding selections from unsaved
buffers, and we make the semantics of @-mentions more consistent.

Loading all kinds of context eagerly also makes it possible to simplify
the structure of the MentionSet and the code around it. Now MentionSet
is just a single hash map, all the management of creases happens in a
uniform way in `MessageEditor::confirm_completion`, and the helper
methods for loading different kinds of context are much more focused and
orthogonal.

Release Notes:

- N/A

---------

Co-authored-by: Conrad <conrad@zed.dev>
---
 crates/acp_thread/src/mention.rs              |  154 +-
 crates/agent/src/thread_store.rs              |   13 +-
 crates/agent2/src/db.rs                       |   13 +-
 crates/agent2/src/thread.rs                   |   54 +-
 .../agent_ui/src/acp/completion_provider.rs   |    4 +-
 crates/agent_ui/src/acp/message_editor.rs     | 1252 +++++++----------
 crates/agent_ui/src/acp/thread_view.rs        |   46 +-
 7 files changed, 699 insertions(+), 837 deletions(-)

diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index a1e713cffa..6fa0887e22 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -5,7 +5,7 @@ use prompt_store::{PromptId, UserPromptId};
 use serde::{Deserialize, Serialize};
 use std::{
     fmt,
-    ops::Range,
+    ops::RangeInclusive,
     path::{Path, PathBuf},
     str::FromStr,
 };
@@ -17,13 +17,14 @@ pub enum MentionUri {
     File {
         abs_path: PathBuf,
     },
+    PastedImage,
     Directory {
         abs_path: PathBuf,
     },
     Symbol {
-        path: PathBuf,
+        abs_path: PathBuf,
         name: String,
-        line_range: Range<u32>,
+        line_range: RangeInclusive<u32>,
     },
     Thread {
         id: acp::SessionId,
@@ -38,8 +39,9 @@ pub enum MentionUri {
         name: String,
     },
     Selection {
-        path: PathBuf,
-        line_range: Range<u32>,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        abs_path: Option<PathBuf>,
+        line_range: RangeInclusive<u32>,
     },
     Fetch {
         url: Url,
@@ -48,36 +50,44 @@ pub enum MentionUri {
 
 impl MentionUri {
     pub fn parse(input: &str) -> Result<Self> {
+        fn parse_line_range(fragment: &str) -> Result<RangeInclusive<u32>> {
+            let range = fragment
+                .strip_prefix("L")
+                .context("Line range must start with \"L\"")?;
+            let (start, end) = range
+                .split_once(":")
+                .context("Line range must use colon as separator")?;
+            let range = start
+                .parse::<u32>()
+                .context("Parsing line range start")?
+                .checked_sub(1)
+                .context("Line numbers should be 1-based")?
+                ..=end
+                    .parse::<u32>()
+                    .context("Parsing line range end")?
+                    .checked_sub(1)
+                    .context("Line numbers should be 1-based")?;
+            Ok(range)
+        }
+
         let url = url::Url::parse(input)?;
         let path = url.path();
         match url.scheme() {
             "file" => {
                 let path = url.to_file_path().ok().context("Extracting file path")?;
                 if let Some(fragment) = url.fragment() {
-                    let range = fragment
-                        .strip_prefix("L")
-                        .context("Line range must start with \"L\"")?;
-                    let (start, end) = range
-                        .split_once(":")
-                        .context("Line range must use colon as separator")?;
-                    let line_range = start
-                        .parse::<u32>()
-                        .context("Parsing line range start")?
-                        .checked_sub(1)
-                        .context("Line numbers should be 1-based")?
-                        ..end
-                            .parse::<u32>()
-                            .context("Parsing line range end")?
-                            .checked_sub(1)
-                            .context("Line numbers should be 1-based")?;
+                    let line_range = parse_line_range(fragment)?;
                     if let Some(name) = single_query_param(&url, "symbol")? {
                         Ok(Self::Symbol {
                             name,
-                            path,
+                            abs_path: path,
                             line_range,
                         })
                     } else {
-                        Ok(Self::Selection { path, line_range })
+                        Ok(Self::Selection {
+                            abs_path: Some(path),
+                            line_range,
+                        })
                     }
                 } else if input.ends_with("/") {
                     Ok(Self::Directory { abs_path: path })
@@ -105,6 +115,17 @@ impl MentionUri {
                         id: rule_id.into(),
                         name,
                     })
+                } else if path.starts_with("/agent/pasted-image") {
+                    Ok(Self::PastedImage)
+                } else if path.starts_with("/agent/untitled-buffer") {
+                    let fragment = url
+                        .fragment()
+                        .context("Missing fragment for untitled buffer selection")?;
+                    let line_range = parse_line_range(fragment)?;
+                    Ok(Self::Selection {
+                        abs_path: None,
+                        line_range,
+                    })
                 } else {
                     bail!("invalid zed url: {:?}", input);
                 }
@@ -121,13 +142,16 @@ impl MentionUri {
                 .unwrap_or_default()
                 .to_string_lossy()
                 .into_owned(),
+            MentionUri::PastedImage => "Image".to_string(),
             MentionUri::Symbol { name, .. } => name.clone(),
             MentionUri::Thread { name, .. } => name.clone(),
             MentionUri::TextThread { name, .. } => name.clone(),
             MentionUri::Rule { name, .. } => name.clone(),
             MentionUri::Selection {
-                path, line_range, ..
-            } => selection_name(path, line_range),
+                abs_path: path,
+                line_range,
+                ..
+            } => selection_name(path.as_deref(), line_range),
             MentionUri::Fetch { url } => url.to_string(),
         }
     }
@@ -137,6 +161,7 @@ impl MentionUri {
             MentionUri::File { abs_path } => {
                 FileIcons::get_icon(abs_path, cx).unwrap_or_else(|| IconName::File.path().into())
             }
+            MentionUri::PastedImage => IconName::Image.path().into(),
             MentionUri::Directory { .. } => FileIcons::get_folder_icon(false, cx)
                 .unwrap_or_else(|| IconName::Folder.path().into()),
             MentionUri::Symbol { .. } => IconName::Code.path().into(),
@@ -157,29 +182,40 @@ impl MentionUri {
             MentionUri::File { abs_path } => {
                 Url::from_file_path(abs_path).expect("mention path should be absolute")
             }
+            MentionUri::PastedImage => Url::parse("zed:///agent/pasted-image").unwrap(),
             MentionUri::Directory { abs_path } => {
                 Url::from_directory_path(abs_path).expect("mention path should be absolute")
             }
             MentionUri::Symbol {
-                path,
+                abs_path,
                 name,
                 line_range,
             } => {
-                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
+                let mut url =
+                    Url::from_file_path(abs_path).expect("mention path should be absolute");
                 url.query_pairs_mut().append_pair("symbol", name);
                 url.set_fragment(Some(&format!(
                     "L{}:{}",
-                    line_range.start + 1,
-                    line_range.end + 1
+                    line_range.start() + 1,
+                    line_range.end() + 1
                 )));
                 url
             }
-            MentionUri::Selection { path, line_range } => {
-                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
+            MentionUri::Selection {
+                abs_path: path,
+                line_range,
+            } => {
+                let mut url = if let Some(path) = path {
+                    Url::from_file_path(path).expect("mention path should be absolute")
+                } else {
+                    let mut url = Url::parse("zed:///").unwrap();
+                    url.set_path("/agent/untitled-buffer");
+                    url
+                };
                 url.set_fragment(Some(&format!(
                     "L{}:{}",
-                    line_range.start + 1,
-                    line_range.end + 1
+                    line_range.start() + 1,
+                    line_range.end() + 1
                 )));
                 url
             }
@@ -191,7 +227,10 @@ impl MentionUri {
             }
             MentionUri::TextThread { path, name } => {
                 let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!("/agent/text-thread/{}", path.to_string_lossy()));
+                url.set_path(&format!(
+                    "/agent/text-thread/{}",
+                    path.to_string_lossy().trim_start_matches('/')
+                ));
                 url.query_pairs_mut().append_pair("name", name);
                 url
             }
@@ -237,12 +276,14 @@ fn single_query_param(url: &Url, name: &'static str) -> Result<Option<String>> {
     }
 }
 
-pub fn selection_name(path: &Path, line_range: &Range<u32>) -> String {
+pub fn selection_name(path: Option<&Path>, line_range: &RangeInclusive<u32>) -> String {
     format!(
         "{} ({}:{})",
-        path.file_name().unwrap_or_default().display(),
-        line_range.start + 1,
-        line_range.end + 1
+        path.and_then(|path| path.file_name())
+            .unwrap_or("Untitled".as_ref())
+            .display(),
+        *line_range.start() + 1,
+        *line_range.end() + 1
     )
 }
 
@@ -302,14 +343,14 @@ mod tests {
         let parsed = MentionUri::parse(symbol_uri).unwrap();
         match &parsed {
             MentionUri::Symbol {
-                path,
+                abs_path: path,
                 name,
                 line_range,
             } => {
                 assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
                 assert_eq!(name, "MySymbol");
-                assert_eq!(line_range.start, 9);
-                assert_eq!(line_range.end, 19);
+                assert_eq!(line_range.start(), &9);
+                assert_eq!(line_range.end(), &19);
             }
             _ => panic!("Expected Symbol variant"),
         }
@@ -321,16 +362,39 @@ mod tests {
         let selection_uri = uri!("file:///path/to/file.rs#L5:15");
         let parsed = MentionUri::parse(selection_uri).unwrap();
         match &parsed {
-            MentionUri::Selection { path, line_range } => {
-                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
-                assert_eq!(line_range.start, 4);
-                assert_eq!(line_range.end, 14);
+            MentionUri::Selection {
+                abs_path: path,
+                line_range,
+            } => {
+                assert_eq!(
+                    path.as_ref().unwrap().to_str().unwrap(),
+                    path!("/path/to/file.rs")
+                );
+                assert_eq!(line_range.start(), &4);
+                assert_eq!(line_range.end(), &14);
             }
             _ => panic!("Expected Selection variant"),
         }
         assert_eq!(parsed.to_uri().to_string(), selection_uri);
     }
 
+    #[test]
+    fn test_parse_untitled_selection_uri() {
+        let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");
+        let parsed = MentionUri::parse(selection_uri).unwrap();
+        match &parsed {
+            MentionUri::Selection {
+                abs_path: None,
+                line_range,
+            } => {
+                assert_eq!(line_range.start(), &0);
+                assert_eq!(line_range.end(), &9);
+            }
+            _ => panic!("Expected Selection variant without path"),
+        }
+        assert_eq!(parsed.to_uri().to_string(), selection_uri);
+    }
+
     #[test]
     fn test_parse_thread_uri() {
         let thread_uri = "zed:///agent/thread/session123?name=Thread+name";
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index 45e551dbdf..cba2457566 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -893,8 +893,19 @@ impl ThreadsDatabase {
 
         let needs_migration_from_heed = mdb_path.exists();
 
-        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
+        let connection = if *ZED_STATELESS {
             Connection::open_memory(Some("THREAD_FALLBACK_DB"))
+        } else if cfg!(any(feature = "test-support", test)) {
+            // rust stores the name of the test on the current thread.
+            // We use this to automatically create a database that will
+            // be shared within the test (for the test_retrieve_old_thread)
+            // but not with concurrent tests.
+            let thread = std::thread::current();
+            let test_name = thread.name();
+            Connection::open_memory(Some(&format!(
+                "THREAD_FALLBACK_{}",
+                test_name.unwrap_or_default()
+            )))
         } else {
             Connection::open_file(&sqlite_path.to_string_lossy())
         };
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index 1b88955a24..e7d31c0c7a 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -266,8 +266,19 @@ impl ThreadsDatabase {
     }
 
     pub fn new(executor: BackgroundExecutor) -> Result<Self> {
-        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
+        let connection = if *ZED_STATELESS {
             Connection::open_memory(Some("THREAD_FALLBACK_DB"))
+        } else if cfg!(any(feature = "test-support", test)) {
+            // rust stores the name of the test on the current thread.
+            // We use this to automatically create a database that will
+            // be shared within the test (for the test_retrieve_old_thread)
+            // but not with concurrent tests.
+            let thread = std::thread::current();
+            let test_name = thread.name();
+            Connection::open_memory(Some(&format!(
+                "THREAD_FALLBACK_{}",
+                test_name.unwrap_or_default()
+            )))
         } else {
             let threads_dir = paths::data_dir().join("threads");
             std::fs::create_dir_all(&threads_dir)?;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index c89e5875f9..6d616f73fc 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -45,14 +45,15 @@ use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;
+use std::fmt::Write;
 use std::{
     collections::BTreeMap,
+    ops::RangeInclusive,
     path::Path,
     sync::Arc,
     time::{Duration, Instant},
 };
-use std::{fmt::Write, ops::Range};
-use util::{ResultExt, markdown::MarkdownCodeBlock};
+use util::{ResultExt, debug_panic, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
 
 const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
@@ -187,6 +188,7 @@ impl UserMessage {
         const OPEN_FILES_TAG: &str = "<files>";
         const OPEN_DIRECTORIES_TAG: &str = "<directories>";
         const OPEN_SYMBOLS_TAG: &str = "<symbols>";
+        const OPEN_SELECTIONS_TAG: &str = "<selections>";
         const OPEN_THREADS_TAG: &str = "<threads>";
         const OPEN_FETCH_TAG: &str = "<fetched_urls>";
         const OPEN_RULES_TAG: &str =
@@ -195,6 +197,7 @@ impl UserMessage {
         let mut file_context = OPEN_FILES_TAG.to_string();
         let mut directory_context = OPEN_DIRECTORIES_TAG.to_string();
         let mut symbol_context = OPEN_SYMBOLS_TAG.to_string();
+        let mut selection_context = OPEN_SELECTIONS_TAG.to_string();
         let mut thread_context = OPEN_THREADS_TAG.to_string();
         let mut fetch_context = OPEN_FETCH_TAG.to_string();
         let mut rules_context = OPEN_RULES_TAG.to_string();
@@ -211,7 +214,7 @@ impl UserMessage {
                     match uri {
                         MentionUri::File { abs_path } => {
                             write!(
-                                &mut symbol_context,
+                                &mut file_context,
                                 "\n{}",
                                 MarkdownCodeBlock {
                                     tag: &codeblock_tag(abs_path, None),
@@ -220,17 +223,19 @@ impl UserMessage {
                             )
                             .ok();
                         }
+                        MentionUri::PastedImage => {
+                            debug_panic!("pasted image URI should not be used in mention content")
+                        }
                         MentionUri::Directory { .. } => {
                             write!(&mut directory_context, "\n{}\n", content).ok();
                         }
                         MentionUri::Symbol {
-                            path, line_range, ..
-                        }
-                        | MentionUri::Selection {
-                            path, line_range, ..
+                            abs_path: path,
+                            line_range,
+                            ..
                         } => {
                             write!(
-                                &mut rules_context,
+                                &mut symbol_context,
                                 "\n{}",
                                 MarkdownCodeBlock {
                                     tag: &codeblock_tag(path, Some(line_range)),
@@ -239,6 +244,24 @@ impl UserMessage {
                             )
                             .ok();
                         }
+                        MentionUri::Selection {
+                            abs_path: path,
+                            line_range,
+                            ..
+                        } => {
+                            write!(
+                                &mut selection_context,
+                                "\n{}",
+                                MarkdownCodeBlock {
+                                    tag: &codeblock_tag(
+                                        path.as_deref().unwrap_or("Untitled".as_ref()),
+                                        Some(line_range)
+                                    ),
+                                    text: content
+                                }
+                            )
+                            .ok();
+                        }
                         MentionUri::Thread { .. } => {
                             write!(&mut thread_context, "\n{}\n", content).ok();
                         }
@@ -291,6 +314,13 @@ impl UserMessage {
                 .push(language_model::MessageContent::Text(symbol_context));
         }
 
+        if selection_context.len() > OPEN_SELECTIONS_TAG.len() {
+            selection_context.push_str("</selections>\n");
+            message
+                .content
+                .push(language_model::MessageContent::Text(selection_context));
+        }
+
         if thread_context.len() > OPEN_THREADS_TAG.len() {
             thread_context.push_str("</threads>\n");
             message
@@ -326,7 +356,7 @@ impl UserMessage {
     }
 }
 
-fn codeblock_tag(full_path: &Path, line_range: Option<&Range<u32>>) -> String {
+fn codeblock_tag(full_path: &Path, line_range: Option<&RangeInclusive<u32>>) -> String {
     let mut result = String::new();
 
     if let Some(extension) = full_path.extension().and_then(|ext| ext.to_str()) {
@@ -336,10 +366,10 @@ fn codeblock_tag(full_path: &Path, line_range: Option<&Range<u32>>) -> String {
     let _ = write!(result, "{}", full_path.display());
 
     if let Some(range) = line_range {
-        if range.start == range.end {
-            let _ = write!(result, ":{}", range.start + 1);
+        if range.start() == range.end() {
+            let _ = write!(result, ":{}", range.start() + 1);
         } else {
-            let _ = write!(result, ":{}-{}", range.start + 1, range.end + 1);
+            let _ = write!(result, ":{}-{}", range.start() + 1, range.end() + 1);
         }
     }
 
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 22a9ea6773..5b40967069 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -247,9 +247,9 @@ impl ContextPickerCompletionProvider {
 
         let abs_path = project.read(cx).absolute_path(&symbol.path, cx)?;
         let uri = MentionUri::Symbol {
-            path: abs_path,
+            abs_path,
             name: symbol.name.clone(),
-            line_range: symbol.range.start.0.row..symbol.range.end.0.row,
+            line_range: symbol.range.start.0.row..=symbol.range.end.0.row,
         };
         let new_text = format!("{} ", uri.as_link());
         let new_text_len = new_text.len();
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 7d73ebeb19..115008cf52 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -6,7 +6,7 @@ use acp_thread::{MentionUri, selection_name};
 use agent_client_protocol as acp;
 use agent_servers::AgentServer;
 use agent2::HistoryStore;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
 use editor::{
@@ -17,8 +17,8 @@ use editor::{
     display_map::{Crease, CreaseId, FoldId},
 };
 use futures::{
-    FutureExt as _, TryFutureExt as _,
-    future::{Shared, join_all, try_join_all},
+    FutureExt as _,
+    future::{Shared, join_all},
 };
 use gpui::{
     AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable,
@@ -28,14 +28,14 @@ use gpui::{
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
 use project::{CompletionIntent, Project, ProjectItem, ProjectPath, Worktree};
-use prompt_store::PromptStore;
+use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::Settings;
 use std::{
     cell::Cell,
     ffi::OsStr,
     fmt::Write,
-    ops::Range,
+    ops::{Range, RangeInclusive},
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
@@ -49,12 +49,8 @@ use ui::{
     Render, SelectableButton, SharedString, Styled, TextSize, TintColor, Toggleable, Window, div,
     h_flex, px,
 };
-use url::Url;
-use util::ResultExt;
-use workspace::{
-    Toast, Workspace,
-    notifications::{NotificationId, NotifyResultExt as _},
-};
+use util::{ResultExt, debug_panic};
+use workspace::{Workspace, notifications::NotifyResultExt as _};
 use zed_actions::agent::Chat;
 
 const PARSE_SLASH_COMMAND_DEBOUNCE: Duration = Duration::from_millis(50);
@@ -219,9 +215,9 @@ impl MessageEditor {
 
     pub fn mentions(&self) -> HashSet<MentionUri> {
         self.mention_set
-            .uri_by_crease_id
+            .mentions
             .values()
-            .cloned()
+            .map(|(uri, _)| uri.clone())
             .collect()
     }
 
@@ -246,132 +242,168 @@ impl MessageEditor {
         else {
             return Task::ready(());
         };
+        let end_anchor = snapshot
+            .buffer_snapshot
+            .anchor_before(start_anchor.to_offset(&snapshot.buffer_snapshot) + content_len + 1);
 
-        if let MentionUri::File { abs_path, .. } = &mention_uri {
-            let extension = abs_path
-                .extension()
-                .and_then(OsStr::to_str)
-                .unwrap_or_default();
-
-            if Img::extensions().contains(&extension) && !extension.contains("svg") {
-                if !self.prompt_capabilities.get().image {
-                    struct ImagesNotAllowed;
-
-                    let end_anchor = snapshot.buffer_snapshot.anchor_before(
-                        start_anchor.to_offset(&snapshot.buffer_snapshot) + content_len + 1,
-                    );
-
-                    self.editor.update(cx, |editor, cx| {
-                        // Remove mention
-                        editor.edit([((start_anchor..end_anchor), "")], cx);
-                    });
-
-                    self.workspace
-                        .update(cx, |workspace, cx| {
-                            workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<ImagesNotAllowed>(),
-                                    "This agent does not support images yet",
-                                )
-                                .autohide(),
-                                cx,
-                            );
-                        })
-                        .ok();
-                    return Task::ready(());
-                }
-
-                let project = self.project.clone();
-                let Some(project_path) = project
-                    .read(cx)
-                    .project_path_for_absolute_path(abs_path, cx)
-                else {
-                    return Task::ready(());
-                };
-                let image = cx
-                    .spawn(async move |_, cx| {
-                        let image = project
-                            .update(cx, |project, cx| project.open_image(project_path, cx))
-                            .map_err(|e| e.to_string())?
-                            .await
-                            .map_err(|e| e.to_string())?;
-                        image
-                            .read_with(cx, |image, _cx| image.image.clone())
-                            .map_err(|e| e.to_string())
-                    })
-                    .shared();
-                let Some(crease_id) = insert_crease_for_image(
-                    *excerpt_id,
-                    start,
-                    content_len,
-                    Some(abs_path.as_path().into()),
-                    image.clone(),
-                    self.editor.clone(),
-                    window,
-                    cx,
-                ) else {
-                    return Task::ready(());
-                };
-                return self.confirm_mention_for_image(
-                    crease_id,
-                    start_anchor,
-                    Some(abs_path.clone()),
-                    image,
-                    window,
-                    cx,
-                );
-            }
-        }
-
-        let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
-            *excerpt_id,
-            start,
-            content_len,
-            crease_text,
-            mention_uri.icon_path(cx),
-            self.editor.clone(),
-            window,
-            cx,
-        ) else {
+        let crease_id = if let MentionUri::File { abs_path } = &mention_uri
+            && let Some(extension) = abs_path.extension()
+            && let Some(extension) = extension.to_str()
+            && Img::extensions().contains(&extension)
+            && !extension.contains("svg")
+        {
+            let Some(project_path) = self
+                .project
+                .read(cx)
+                .project_path_for_absolute_path(&abs_path, cx)
+            else {
+                log::error!("project path not found");
+                return Task::ready(());
+            };
+            let image = self
+                .project
+                .update(cx, |project, cx| project.open_image(project_path, cx));
+            let image = cx
+                .spawn(async move |_, cx| {
+                    let image = image.await.map_err(|e| e.to_string())?;
+                    let image = image
+                        .update(cx, |image, _| image.image.clone())
+                        .map_err(|e| e.to_string())?;
+                    Ok(image)
+                })
+                .shared();
+            insert_crease_for_image(
+                *excerpt_id,
+                start,
+                content_len,
+                Some(abs_path.as_path().into()),
+                image,
+                self.editor.clone(),
+                window,
+                cx,
+            )
+        } else {
+            crate::context_picker::insert_crease_for_mention(
+                *excerpt_id,
+                start,
+                content_len,
+                crease_text,
+                mention_uri.icon_path(cx),
+                self.editor.clone(),
+                window,
+                cx,
+            )
+        };
+        let Some(crease_id) = crease_id else {
             return Task::ready(());
         };
 
-        match mention_uri {
-            MentionUri::Fetch { url } => {
-                self.confirm_mention_for_fetch(crease_id, start_anchor, url, window, cx)
+        let task = match mention_uri.clone() {
+            MentionUri::Fetch { url } => self.confirm_mention_for_fetch(url, cx),
+            MentionUri::Directory { abs_path } => self.confirm_mention_for_directory(abs_path, cx),
+            MentionUri::Thread { id, .. } => self.confirm_mention_for_thread(id, cx),
+            MentionUri::TextThread { path, .. } => self.confirm_mention_for_text_thread(path, cx),
+            MentionUri::File { abs_path } => self.confirm_mention_for_file(abs_path, cx),
+            MentionUri::Symbol {
+                abs_path,
+                line_range,
+                ..
+            } => self.confirm_mention_for_symbol(abs_path, line_range, cx),
+            MentionUri::Rule { id, .. } => self.confirm_mention_for_rule(id, cx),
+            MentionUri::PastedImage => {
+                debug_panic!("pasted image URI should not be included in completions");
+                Task::ready(Err(anyhow!(
+                    "pasted imaged URI should not be included in completions"
+                )))
             }
-            MentionUri::Directory { abs_path } => {
-                self.confirm_mention_for_directory(crease_id, start_anchor, abs_path, window, cx)
+            MentionUri::Selection { .. } => {
+                // Handled elsewhere
+                debug_panic!("unexpected selection URI");
+                Task::ready(Err(anyhow!("unexpected selection URI")))
             }
-            MentionUri::Thread { id, name } => {
-                self.confirm_mention_for_thread(crease_id, start_anchor, id, name, window, cx)
+        };
+        let task = cx
+            .spawn(async move |_, _| task.await.map_err(|e| e.to_string()))
+            .shared();
+        self.mention_set
+            .mentions
+            .insert(crease_id, (mention_uri, task.clone()));
+
+        // Notify the user if we failed to load the mentioned context
+        cx.spawn_in(window, async move |this, cx| {
+            if task.await.notify_async_err(cx).is_none() {
+                this.update(cx, |this, cx| {
+                    this.editor.update(cx, |editor, cx| {
+                        // Remove mention
+                        editor.edit([(start_anchor..end_anchor, "")], cx);
+                    });
+                    this.mention_set.mentions.remove(&crease_id);
+                })
+                .ok();
             }
-            MentionUri::TextThread { path, name } => self.confirm_mention_for_text_thread(
-                crease_id,
-                start_anchor,
-                path,
-                name,
-                window,
-                cx,
-            ),
-            MentionUri::File { .. }
-            | MentionUri::Symbol { .. }
-            | MentionUri::Rule { .. }
-            | MentionUri::Selection { .. } => {
-                self.mention_set.insert_uri(crease_id, mention_uri.clone());
-                Task::ready(())
+        })
+    }
+
+    fn confirm_mention_for_file(
+        &mut self,
+        abs_path: PathBuf,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Mention>> {
+        let Some(project_path) = self
+            .project
+            .read(cx)
+            .project_path_for_absolute_path(&abs_path, cx)
+        else {
+            return Task::ready(Err(anyhow!("project path not found")));
+        };
+        let extension = abs_path
+            .extension()
+            .and_then(OsStr::to_str)
+            .unwrap_or_default();
+
+        if Img::extensions().contains(&extension) && !extension.contains("svg") {
+            if !self.prompt_capabilities.get().image {
+                return Task::ready(Err(anyhow!("This agent does not support images yet")));
             }
+            let task = self
+                .project
+                .update(cx, |project, cx| project.open_image(project_path, cx));
+            return cx.spawn(async move |_, cx| {
+                let image = task.await?;
+                let image = image.update(cx, |image, _| image.image.clone())?;
+                let format = image.format;
+                let image = cx
+                    .update(|cx| LanguageModelImage::from_image(image, cx))?
+                    .await;
+                if let Some(image) = image {
+                    Ok(Mention::Image(MentionImage {
+                        data: image.source,
+                        format,
+                    }))
+                } else {
+                    Err(anyhow!("Failed to convert image"))
+                }
+            });
         }
+
+        let buffer = self
+            .project
+            .update(cx, |project, cx| project.open_buffer(project_path, cx));
+        cx.spawn(async move |_, cx| {
+            let buffer = buffer.await?;
+            let mention = buffer.update(cx, |buffer, cx| Mention::Text {
+                content: buffer.text(),
+                tracked_buffers: vec![cx.entity()],
+            })?;
+            anyhow::Ok(mention)
+        })
     }
 
     fn confirm_mention_for_directory(
         &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
         abs_path: PathBuf,
-        window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Task<()> {
+    ) -> Task<Result<Mention>> {
         fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<(Arc<Path>, PathBuf)> {
             let mut files = Vec::new();
 
@@ -386,24 +418,21 @@ impl MessageEditor {
             files
         }
 
-        let uri = MentionUri::Directory {
-            abs_path: abs_path.clone(),
-        };
         let Some(project_path) = self
             .project
             .read(cx)
             .project_path_for_absolute_path(&abs_path, cx)
         else {
-            return Task::ready(());
+            return Task::ready(Err(anyhow!("project path not found")));
         };
         let Some(entry) = self.project.read(cx).entry_for_path(&project_path, cx) else {
-            return Task::ready(());
+            return Task::ready(Err(anyhow!("project entry not found")));
         };
         let Some(worktree) = self.project.read(cx).worktree_for_entry(entry.id, cx) else {
-            return Task::ready(());
+            return Task::ready(Err(anyhow!("worktree not found")));
         };
         let project = self.project.clone();
-        let task = cx.spawn(async move |_, cx| {
+        cx.spawn(async move |_, cx| {
             let directory_path = entry.path.clone();
 
             let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id())?;
@@ -453,89 +482,83 @@ impl MessageEditor {
                             ((rel_path, full_path, rope), buffer)
                         })
                         .unzip();
-                    (render_directory_contents(contents), tracked_buffers)
+                    Mention::Text {
+                        content: render_directory_contents(contents),
+                        tracked_buffers,
+                    }
                 })
                 .await;
             anyhow::Ok(contents)
-        });
-        let task = cx
-            .spawn(async move |_, _| task.await.map_err(|e| e.to_string()))
-            .shared();
-
-        self.mention_set
-            .directories
-            .insert(abs_path.clone(), task.clone());
-
-        let editor = self.editor.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_some() {
-                this.update(cx, |this, _| {
-                    this.mention_set.insert_uri(crease_id, uri);
-                })
-                .ok();
-            } else {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    })
-                    .ok();
-                this.update(cx, |this, _cx| {
-                    this.mention_set.directories.remove(&abs_path);
-                })
-                .ok();
-            }
         })
     }
 
     fn confirm_mention_for_fetch(
         &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
         url: url::Url,
-        window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let Some(http_client) = self
+    ) -> Task<Result<Mention>> {
+        let http_client = match self
             .workspace
-            .update(cx, |workspace, _cx| workspace.client().http_client())
-            .ok()
-        else {
-            return Task::ready(());
+            .update(cx, |workspace, _| workspace.client().http_client())
+        {
+            Ok(http_client) => http_client,
+            Err(e) => return Task::ready(Err(e)),
         };
-
-        let url_string = url.to_string();
-        let fetch = cx
-            .background_executor()
-            .spawn(async move {
-                fetch_url_content(http_client, url_string)
-                    .map_err(|e| e.to_string())
-                    .await
+        cx.background_executor().spawn(async move {
+            let content = fetch_url_content(http_client, url.to_string()).await?;
+            Ok(Mention::Text {
+                content,
+                tracked_buffers: Vec::new(),
             })
-            .shared();
-        self.mention_set
-            .add_fetch_result(url.clone(), fetch.clone());
+        })
+    }
 
-        cx.spawn_in(window, async move |this, cx| {
-            let fetch = fetch.await.notify_async_err(cx);
-            this.update(cx, |this, cx| {
-                if fetch.is_some() {
-                    this.mention_set
-                        .insert_uri(crease_id, MentionUri::Fetch { url });
-                } else {
-                    // Remove crease if we failed to fetch
-                    this.editor.update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    });
-                    this.mention_set.fetch_results.remove(&url);
+    fn confirm_mention_for_symbol(
+        &mut self,
+        abs_path: PathBuf,
+        line_range: RangeInclusive<u32>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Mention>> {
+        let Some(project_path) = self
+            .project
+            .read(cx)
+            .project_path_for_absolute_path(&abs_path, cx)
+        else {
+            return Task::ready(Err(anyhow!("project path not found")));
+        };
+        let buffer = self
+            .project
+            .update(cx, |project, cx| project.open_buffer(project_path, cx));
+        cx.spawn(async move |_, cx| {
+            let buffer = buffer.await?;
+            let mention = buffer.update(cx, |buffer, cx| {
+                let start = Point::new(*line_range.start(), 0).min(buffer.max_point());
+                let end = Point::new(*line_range.end() + 1, 0).min(buffer.max_point());
+                let content = buffer.text_for_range(start..end).collect();
+                Mention::Text {
+                    content,
+                    tracked_buffers: vec![cx.entity()],
                 }
+            })?;
+            anyhow::Ok(mention)
+        })
+    }
+
+    fn confirm_mention_for_rule(
+        &mut self,
+        id: PromptId,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Mention>> {
+        let Some(prompt_store) = self.prompt_store.clone() else {
+            return Task::ready(Err(anyhow!("missing prompt store")));
+        };
+        let prompt = prompt_store.read(cx).load(id, cx);
+        cx.spawn(async move |_, _| {
+            let prompt = prompt.await?;
+            Ok(Mention::Text {
+                content: prompt,
+                tracked_buffers: Vec::new(),
             })
-            .ok();
         })
     }
 
@@ -560,24 +583,24 @@ impl MessageEditor {
             let range = snapshot.anchor_after(offset + range_to_fold.start)
                 ..snapshot.anchor_after(offset + range_to_fold.end);
 
-            // TODO support selections from buffers with no path
-            let Some(project_path) = buffer.read(cx).project_path(cx) else {
-                continue;
-            };
-            let Some(abs_path) = self.project.read(cx).absolute_path(&project_path, cx) else {
-                continue;
-            };
+            let abs_path = buffer
+                .read(cx)
+                .project_path(cx)
+                .and_then(|project_path| self.project.read(cx).absolute_path(&project_path, cx));
             let snapshot = buffer.read(cx).snapshot();
 
+            let text = snapshot
+                .text_for_range(selection_range.clone())
+                .collect::<String>();
             let point_range = selection_range.to_point(&snapshot);
-            let line_range = point_range.start.row..point_range.end.row;
+            let line_range = point_range.start.row..=point_range.end.row;
 
             let uri = MentionUri::Selection {
-                path: abs_path.clone(),
+                abs_path: abs_path.clone(),
                 line_range: line_range.clone(),
             };
             let crease = crate::context_picker::crease_for_mention(
-                selection_name(&abs_path, &line_range).into(),
+                selection_name(abs_path.as_deref(), &line_range).into(),
                 uri.icon_path(cx),
                 range,
                 self.editor.downgrade(),
@@ -589,132 +612,69 @@ impl MessageEditor {
                 crease_ids.first().copied().unwrap()
             });
 
-            self.mention_set.insert_uri(crease_id, uri);
+            self.mention_set.mentions.insert(
+                crease_id,
+                (
+                    uri,
+                    Task::ready(Ok(Mention::Text {
+                        content: text,
+                        tracked_buffers: vec![buffer],
+                    }))
+                    .shared(),
+                ),
+            );
         }
     }
 
     fn confirm_mention_for_thread(
         &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
         id: acp::SessionId,
-        name: String,
-        window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let uri = MentionUri::Thread {
-            id: id.clone(),
-            name,
-        };
+    ) -> Task<Result<Mention>> {
         let server = Rc::new(agent2::NativeAgentServer::new(
             self.project.read(cx).fs().clone(),
             self.history_store.clone(),
         ));
         let connection = server.connect(Path::new(""), &self.project, cx);
-        let load_summary = cx.spawn({
-            let id = id.clone();
-            async move |_, cx| {
-                let agent = connection.await?;
-                let agent = agent.downcast::<agent2::NativeAgentConnection>().unwrap();
-                let summary = agent
-                    .0
-                    .update(cx, |agent, cx| agent.thread_summary(id, cx))?
-                    .await?;
-                anyhow::Ok(summary)
-            }
-        });
-        let task = cx
-            .spawn(async move |_, _| load_summary.await.map_err(|e| format!("{e}")))
-            .shared();
-
-        self.mention_set.insert_thread(id.clone(), task.clone());
-        self.mention_set.insert_uri(crease_id, uri);
-
-        let editor = self.editor.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_none() {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    })
-                    .ok();
-                this.update(cx, |this, _| {
-                    this.mention_set.thread_summaries.remove(&id);
-                    this.mention_set.uri_by_crease_id.remove(&crease_id);
-                })
-                .ok();
-            }
+        cx.spawn(async move |_, cx| {
+            let agent = connection.await?;
+            let agent = agent.downcast::<agent2::NativeAgentConnection>().unwrap();
+            let summary = agent
+                .0
+                .update(cx, |agent, cx| agent.thread_summary(id, cx))?
+                .await?;
+            anyhow::Ok(Mention::Text {
+                content: summary.to_string(),
+                tracked_buffers: Vec::new(),
+            })
         })
     }
 
     fn confirm_mention_for_text_thread(
         &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
         path: PathBuf,
-        name: String,
-        window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let uri = MentionUri::TextThread {
-            path: path.clone(),
-            name,
-        };
+    ) -> Task<Result<Mention>> {
         let context = self.history_store.update(cx, |text_thread_store, cx| {
             text_thread_store.load_text_thread(path.as_path().into(), cx)
         });
-        let task = cx
-            .spawn(async move |_, cx| {
-                let context = context.await.map_err(|e| e.to_string())?;
-                let xml = context
-                    .update(cx, |context, cx| context.to_xml(cx))
-                    .map_err(|e| e.to_string())?;
-                Ok(xml)
+        cx.spawn(async move |_, cx| {
+            let context = context.await?;
+            let xml = context.update(cx, |context, cx| context.to_xml(cx))?;
+            Ok(Mention::Text {
+                content: xml,
+                tracked_buffers: Vec::new(),
             })
-            .shared();
-
-        self.mention_set
-            .insert_text_thread(path.clone(), task.clone());
-
-        let editor = self.editor.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_some() {
-                this.update(cx, |this, _| {
-                    this.mention_set.insert_uri(crease_id, uri);
-                })
-                .ok();
-            } else {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    })
-                    .ok();
-                this.update(cx, |this, _| {
-                    this.mention_set.text_thread_summaries.remove(&path);
-                })
-                .ok();
-            }
         })
     }
 
     pub fn contents(
         &self,
-        window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
-        let contents = self.mention_set.contents(
-            &self.project,
-            self.prompt_store.as_ref(),
-            &self.prompt_capabilities.get(),
-            window,
-            cx,
-        );
+        let contents = self
+            .mention_set
+            .contents(&self.prompt_capabilities.get(), cx);
         let editor = self.editor.clone();
         let prevent_slash_commands = self.prevent_slash_commands;
 
@@ -729,7 +689,7 @@ impl MessageEditor {
                 editor.display_map.update(cx, |map, cx| {
                     let snapshot = map.snapshot(cx);
                     for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-                        let Some(mention) = contents.get(&crease_id) else {
+                        let Some((uri, mention)) = contents.get(&crease_id) else {
                             continue;
                         };
 
@@ -747,7 +707,6 @@ impl MessageEditor {
                         }
                         let chunk = match mention {
                             Mention::Text {
-                                uri,
                                 content,
                                 tracked_buffers,
                             } => {
@@ -764,17 +723,25 @@ impl MessageEditor {
                                 })
                             }
                             Mention::Image(mention_image) => {
+                                let uri = match uri {
+                                    MentionUri::File { .. } => Some(uri.to_uri().to_string()),
+                                    MentionUri::PastedImage => None,
+                                    other => {
+                                        debug_panic!(
+                                            "unexpected mention uri for image: {:?}",
+                                            other
+                                        );
+                                        None
+                                    }
+                                };
                                 acp::ContentBlock::Image(acp::ImageContent {
                                     annotations: None,
                                     data: mention_image.data.to_string(),
                                     mime_type: mention_image.format.mime_type().into(),
-                                    uri: mention_image
-                                        .abs_path
-                                        .as_ref()
-                                        .map(|path| format!("file://{}", path.display())),
+                                    uri,
                                 })
                             }
-                            Mention::UriOnly(uri) => {
+                            Mention::UriOnly => {
                                 acp::ContentBlock::ResourceLink(acp::ResourceLink {
                                     name: uri.name(),
                                     uri: uri.to_uri().to_string(),
@@ -813,7 +780,13 @@ impl MessageEditor {
     pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
             editor.clear(window, cx);
-            editor.remove_creases(self.mention_set.drain(), cx)
+            editor.remove_creases(
+                self.mention_set
+                    .mentions
+                    .drain()
+                    .map(|(crease_id, _)| crease_id),
+                cx,
+            )
         });
     }
 
@@ -853,7 +826,7 @@ impl MessageEditor {
         }
         cx.stop_propagation();
 
-        let replacement_text = "image";
+        let replacement_text = MentionUri::PastedImage.as_link().to_string();
         for image in images {
             let (excerpt_id, text_anchor, multibuffer_anchor) =
                 self.editor.update(cx, |message_editor, cx| {
@@ -876,24 +849,62 @@ impl MessageEditor {
                 });
 
             let content_len = replacement_text.len();
-            let Some(anchor) = multibuffer_anchor else {
-                return;
+            let Some(start_anchor) = multibuffer_anchor else {
+                continue;
             };
-            let task = Task::ready(Ok(Arc::new(image))).shared();
+            let end_anchor = self.editor.update(cx, |editor, cx| {
+                let snapshot = editor.buffer().read(cx).snapshot(cx);
+                snapshot.anchor_before(start_anchor.to_offset(&snapshot) + content_len)
+            });
+            let image = Arc::new(image);
             let Some(crease_id) = insert_crease_for_image(
                 excerpt_id,
                 text_anchor,
                 content_len,
                 None.clone(),
-                task.clone(),
+                Task::ready(Ok(image.clone())).shared(),
                 self.editor.clone(),
                 window,
                 cx,
             ) else {
-                return;
+                continue;
             };
-            self.confirm_mention_for_image(crease_id, anchor, None, task, window, cx)
-                .detach();
+            let task = cx
+                .spawn_in(window, {
+                    async move |_, cx| {
+                        let format = image.format;
+                        let image = cx
+                            .update(|_, cx| LanguageModelImage::from_image(image, cx))
+                            .map_err(|e| e.to_string())?
+                            .await;
+                        if let Some(image) = image {
+                            Ok(Mention::Image(MentionImage {
+                                data: image.source,
+                                format,
+                            }))
+                        } else {
+                            Err("Failed to convert image".into())
+                        }
+                    }
+                })
+                .shared();
+
+            self.mention_set
+                .mentions
+                .insert(crease_id, (MentionUri::PastedImage, task.clone()));
+
+            cx.spawn_in(window, async move |this, cx| {
+                if task.await.notify_async_err(cx).is_none() {
+                    this.update(cx, |this, cx| {
+                        this.editor.update(cx, |editor, cx| {
+                            editor.edit([(start_anchor..end_anchor, "")], cx);
+                        });
+                        this.mention_set.mentions.remove(&crease_id);
+                    })
+                    .ok();
+                }
+            })
+            .detach();
         }
     }
 
@@ -995,67 +1006,6 @@ impl MessageEditor {
         })
     }
 
-    fn confirm_mention_for_image(
-        &mut self,
-        crease_id: CreaseId,
-        anchor: Anchor,
-        abs_path: Option<PathBuf>,
-        image: Shared<Task<Result<Arc<Image>, String>>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let editor = self.editor.clone();
-        let task = cx
-            .spawn_in(window, {
-                let abs_path = abs_path.clone();
-                async move |_, cx| {
-                    let image = image.await?;
-                    let format = image.format;
-                    let image = cx
-                        .update(|_, cx| LanguageModelImage::from_image(image, cx))
-                        .map_err(|e| e.to_string())?
-                        .await;
-                    if let Some(image) = image {
-                        Ok(MentionImage {
-                            abs_path,
-                            data: image.source,
-                            format,
-                        })
-                    } else {
-                        Err("Failed to convert image".into())
-                    }
-                }
-            })
-            .shared();
-
-        self.mention_set.insert_image(crease_id, task.clone());
-
-        cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_some() {
-                if let Some(abs_path) = abs_path.clone() {
-                    this.update(cx, |this, _cx| {
-                        this.mention_set
-                            .insert_uri(crease_id, MentionUri::File { abs_path });
-                    })
-                    .ok();
-                }
-            } else {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(vec![anchor..anchor], true, cx);
-                        });
-                        editor.remove_creases([crease_id], cx);
-                    })
-                    .ok();
-                this.update(cx, |this, _cx| {
-                    this.mention_set.images.remove(&crease_id);
-                })
-                .ok();
-            }
-        })
-    }
-
     pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
             editor.set_mode(mode);
@@ -1073,7 +1023,6 @@ impl MessageEditor {
 
         let mut text = String::new();
         let mut mentions = Vec::new();
-        let mut images = Vec::new();
 
         for chunk in message {
             match chunk {
@@ -1084,26 +1033,58 @@ impl MessageEditor {
                     resource: acp::EmbeddedResourceResource::TextResourceContents(resource),
                     ..
                 }) => {
-                    if let Some(mention_uri) = MentionUri::parse(&resource.uri).log_err() {
-                        let start = text.len();
-                        write!(&mut text, "{}", mention_uri.as_link()).ok();
-                        let end = text.len();
-                        mentions.push((start..end, mention_uri, resource.text));
-                    }
+                    let Some(mention_uri) = MentionUri::parse(&resource.uri).log_err() else {
+                        continue;
+                    };
+                    let start = text.len();
+                    write!(&mut text, "{}", mention_uri.as_link()).ok();
+                    let end = text.len();
+                    mentions.push((
+                        start..end,
+                        mention_uri,
+                        Mention::Text {
+                            content: resource.text,
+                            tracked_buffers: Vec::new(),
+                        },
+                    ));
                 }
                 acp::ContentBlock::ResourceLink(resource) => {
                     if let Some(mention_uri) = MentionUri::parse(&resource.uri).log_err() {
                         let start = text.len();
                         write!(&mut text, "{}", mention_uri.as_link()).ok();
                         let end = text.len();
-                        mentions.push((start..end, mention_uri, resource.uri));
+                        mentions.push((start..end, mention_uri, Mention::UriOnly));
                     }
                 }
-                acp::ContentBlock::Image(content) => {
+                acp::ContentBlock::Image(acp::ImageContent {
+                    uri,
+                    data,
+                    mime_type,
+                    annotations: _,
+                }) => {
+                    let mention_uri = if let Some(uri) = uri {
+                        MentionUri::parse(&uri)
+                    } else {
+                        Ok(MentionUri::PastedImage)
+                    };
+                    let Some(mention_uri) = mention_uri.log_err() else {
+                        continue;
+                    };
+                    let Some(format) = ImageFormat::from_mime_type(&mime_type) else {
+                        log::error!("failed to parse MIME type for image: {mime_type:?}");
+                        continue;
+                    };
                     let start = text.len();
-                    text.push_str("image");
+                    write!(&mut text, "{}", mention_uri.as_link()).ok();
                     let end = text.len();
-                    images.push((start..end, content));
+                    mentions.push((
+                        start..end,
+                        mention_uri,
+                        Mention::Image(MentionImage {
+                            data: data.into(),
+                            format,
+                        }),
+                    ));
                 }
                 acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => {}
             }
@@ -1114,9 +1095,9 @@ impl MessageEditor {
             editor.buffer().read(cx).snapshot(cx)
         });
 
-        for (range, mention_uri, text) in mentions {
+        for (range, mention_uri, mention) in mentions {
             let anchor = snapshot.anchor_before(range.start);
-            let crease_id = crate::context_picker::insert_crease_for_mention(
+            let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
                 anchor.excerpt_id,
                 anchor.text_anchor,
                 range.end - range.start,
@@ -1125,77 +1106,14 @@ impl MessageEditor {
                 self.editor.clone(),
                 window,
                 cx,
-            );
-
-            if let Some(crease_id) = crease_id {
-                self.mention_set.insert_uri(crease_id, mention_uri.clone());
-            }
-
-            match mention_uri {
-                MentionUri::Thread { id, .. } => {
-                    self.mention_set
-                        .insert_thread(id, Task::ready(Ok(text.into())).shared());
-                }
-                MentionUri::TextThread { path, .. } => {
-                    self.mention_set
-                        .insert_text_thread(path, Task::ready(Ok(text)).shared());
-                }
-                MentionUri::Fetch { url } => {
-                    self.mention_set
-                        .add_fetch_result(url, Task::ready(Ok(text)).shared());
-                }
-                MentionUri::Directory { abs_path } => {
-                    let task = Task::ready(Ok((text, Vec::new()))).shared();
-                    self.mention_set.directories.insert(abs_path, task);
-                }
-                MentionUri::File { .. }
-                | MentionUri::Symbol { .. }
-                | MentionUri::Rule { .. }
-                | MentionUri::Selection { .. } => {}
-            }
-        }
-        for (range, content) in images {
-            let Some(format) = ImageFormat::from_mime_type(&content.mime_type) else {
+            ) else {
                 continue;
             };
-            let anchor = snapshot.anchor_before(range.start);
-            let abs_path = content
-                .uri
-                .as_ref()
-                .and_then(|uri| uri.strip_prefix("file://").map(|s| Path::new(s).into()));
 
-            let name = content
-                .uri
-                .as_ref()
-                .and_then(|uri| {
-                    uri.strip_prefix("file://")
-                        .and_then(|path| Path::new(path).file_name())
-                })
-                .map(|name| name.to_string_lossy().to_string())
-                .unwrap_or("Image".to_owned());
-            let crease_id = crate::context_picker::insert_crease_for_mention(
-                anchor.excerpt_id,
-                anchor.text_anchor,
-                range.end - range.start,
-                name.into(),
-                IconName::Image.path().into(),
-                self.editor.clone(),
-                window,
-                cx,
+            self.mention_set.mentions.insert(
+                crease_id,
+                (mention_uri.clone(), Task::ready(Ok(mention)).shared()),
             );
-            let data: SharedString = content.data.to_string().into();
-
-            if let Some(crease_id) = crease_id {
-                self.mention_set.insert_image(
-                    crease_id,
-                    Task::ready(Ok(MentionImage {
-                        abs_path,
-                        data,
-                        format,
-                    }))
-                    .shared(),
-                );
-            }
         }
         cx.notify();
     }
@@ -1425,289 +1343,60 @@ impl Render for ImageHover {
     }
 }
 
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum Mention {
     Text {
-        uri: MentionUri,
         content: String,
         tracked_buffers: Vec<Entity<Buffer>>,
     },
     Image(MentionImage),
-    UriOnly(MentionUri),
+    UriOnly,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct MentionImage {
-    pub abs_path: Option<PathBuf>,
     pub data: SharedString,
     pub format: ImageFormat,
 }
 
 #[derive(Default)]
 pub struct MentionSet {
-    uri_by_crease_id: HashMap<CreaseId, MentionUri>,
-    fetch_results: HashMap<Url, Shared<Task<Result<String, String>>>>,
-    images: HashMap<CreaseId, Shared<Task<Result<MentionImage, String>>>>,
-    thread_summaries: HashMap<acp::SessionId, Shared<Task<Result<SharedString, String>>>>,
-    text_thread_summaries: HashMap<PathBuf, Shared<Task<Result<String, String>>>>,
-    directories: HashMap<PathBuf, Shared<Task<Result<(String, Vec<Entity<Buffer>>), String>>>>,
+    mentions: HashMap<CreaseId, (MentionUri, Shared<Task<Result<Mention, String>>>)>,
 }
 
 impl MentionSet {
-    pub fn insert_uri(&mut self, crease_id: CreaseId, uri: MentionUri) {
-        self.uri_by_crease_id.insert(crease_id, uri);
-    }
-
-    pub fn add_fetch_result(&mut self, url: Url, content: Shared<Task<Result<String, String>>>) {
-        self.fetch_results.insert(url, content);
-    }
-
-    pub fn insert_image(
-        &mut self,
-        crease_id: CreaseId,
-        task: Shared<Task<Result<MentionImage, String>>>,
-    ) {
-        self.images.insert(crease_id, task);
-    }
-
-    fn insert_thread(
-        &mut self,
-        id: acp::SessionId,
-        task: Shared<Task<Result<SharedString, String>>>,
-    ) {
-        self.thread_summaries.insert(id, task);
-    }
-
-    fn insert_text_thread(&mut self, path: PathBuf, task: Shared<Task<Result<String, String>>>) {
-        self.text_thread_summaries.insert(path, task);
-    }
-
-    pub fn contents(
+    fn contents(
         &self,
-        project: &Entity<Project>,
-        prompt_store: Option<&Entity<PromptStore>>,
         prompt_capabilities: &acp::PromptCapabilities,
-        _window: &mut Window,
         cx: &mut App,
-    ) -> Task<Result<HashMap<CreaseId, Mention>>> {
+    ) -> Task<Result<HashMap<CreaseId, (MentionUri, Mention)>>> {
         if !prompt_capabilities.embedded_context {
             let mentions = self
-                .uri_by_crease_id
+                .mentions
                 .iter()
-                .map(|(crease_id, uri)| (*crease_id, Mention::UriOnly(uri.clone())))
+                .map(|(crease_id, (uri, _))| (*crease_id, (uri.clone(), Mention::UriOnly)))
                 .collect();
 
             return Task::ready(Ok(mentions));
         }
 
-        let mut processed_image_creases = HashSet::default();
-
-        let mut contents = self
-            .uri_by_crease_id
-            .iter()
-            .map(|(&crease_id, uri)| {
-                match uri {
-                    MentionUri::File { abs_path, .. } => {
-                        let uri = uri.clone();
-                        let abs_path = abs_path.to_path_buf();
-
-                        if let Some(task) = self.images.get(&crease_id).cloned() {
-                            processed_image_creases.insert(crease_id);
-                            return cx.spawn(async move |_| {
-                                let image = task.await.map_err(|e| anyhow!("{e}"))?;
-                                anyhow::Ok((crease_id, Mention::Image(image)))
-                            });
-                        }
-
-                        let buffer_task = project.update(cx, |project, cx| {
-                            let path = project
-                                .find_project_path(abs_path, cx)
-                                .context("Failed to find project path")?;
-                            anyhow::Ok(project.open_buffer(path, cx))
-                        });
-                        cx.spawn(async move |cx| {
-                            let buffer = buffer_task?.await?;
-                            let content = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
-
-                            anyhow::Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content,
-                                    tracked_buffers: vec![buffer],
-                                },
-                            ))
-                        })
-                    }
-                    MentionUri::Directory { abs_path } => {
-                        let Some(content) = self.directories.get(abs_path).cloned() else {
-                            return Task::ready(Err(anyhow!("missing directory load task")));
-                        };
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            let (content, tracked_buffers) =
-                                content.await.map_err(|e| anyhow::anyhow!("{e}"))?;
-                            Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content,
-                                    tracked_buffers,
-                                },
-                            ))
-                        })
-                    }
-                    MentionUri::Symbol {
-                        path, line_range, ..
-                    }
-                    | MentionUri::Selection {
-                        path, line_range, ..
-                    } => {
-                        let uri = uri.clone();
-                        let path_buf = path.clone();
-                        let line_range = line_range.clone();
-
-                        let buffer_task = project.update(cx, |project, cx| {
-                            let path = project
-                                .find_project_path(&path_buf, cx)
-                                .context("Failed to find project path")?;
-                            anyhow::Ok(project.open_buffer(path, cx))
-                        });
-
-                        cx.spawn(async move |cx| {
-                            let buffer = buffer_task?.await?;
-                            let content = buffer.read_with(cx, |buffer, _cx| {
-                                buffer
-                                    .text_for_range(
-                                        Point::new(line_range.start, 0)
-                                            ..Point::new(
-                                                line_range.end,
-                                                buffer.line_len(line_range.end),
-                                            ),
-                                    )
-                                    .collect()
-                            })?;
-
-                            anyhow::Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content,
-                                    tracked_buffers: vec![buffer],
-                                },
-                            ))
-                        })
-                    }
-                    MentionUri::Thread { id, .. } => {
-                        let Some(content) = self.thread_summaries.get(id).cloned() else {
-                            return Task::ready(Err(anyhow!("missing thread summary")));
-                        };
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content: content
-                                        .await
-                                        .map_err(|e| anyhow::anyhow!("{e}"))?
-                                        .to_string(),
-                                    tracked_buffers: Vec::new(),
-                                },
-                            ))
-                        })
-                    }
-                    MentionUri::TextThread { path, .. } => {
-                        let Some(content) = self.text_thread_summaries.get(path).cloned() else {
-                            return Task::ready(Err(anyhow!("missing text thread summary")));
-                        };
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
-                                    tracked_buffers: Vec::new(),
-                                },
-                            ))
-                        })
-                    }
-                    MentionUri::Rule { id: prompt_id, .. } => {
-                        let Some(prompt_store) = prompt_store else {
-                            return Task::ready(Err(anyhow!("missing prompt store")));
-                        };
-                        let text_task = prompt_store.read(cx).load(*prompt_id, cx);
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            // TODO: report load errors instead of just logging
-                            let text = text_task.await?;
-                            anyhow::Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content: text,
-                                    tracked_buffers: Vec::new(),
-                                },
-                            ))
-                        })
-                    }
-                    MentionUri::Fetch { url } => {
-                        let Some(content) = self.fetch_results.get(url).cloned() else {
-                            return Task::ready(Err(anyhow!("missing fetch result")));
-                        };
-                        let uri = uri.clone();
-                        cx.spawn(async move |_| {
-                            Ok((
-                                crease_id,
-                                Mention::Text {
-                                    uri,
-                                    content: content.await.map_err(|e| anyhow::anyhow!("{e}"))?,
-                                    tracked_buffers: Vec::new(),
-                                },
-                            ))
-                        })
-                    }
-                }
-            })
-            .collect::<Vec<_>>();
-
-        // Handle images that didn't have a mention URI (because they were added by the paste handler).
-        contents.extend(self.images.iter().filter_map(|(crease_id, image)| {
-            if processed_image_creases.contains(crease_id) {
-                return None;
-            }
-            let crease_id = *crease_id;
-            let image = image.clone();
-            Some(cx.spawn(async move |_| {
-                Ok((
-                    crease_id,
-                    Mention::Image(image.await.map_err(|e| anyhow::anyhow!("{e}"))?),
-                ))
-            }))
-        }));
-
+        let mentions = self.mentions.clone();
         cx.spawn(async move |_cx| {
-            let contents = try_join_all(contents).await?.into_iter().collect();
-            anyhow::Ok(contents)
+            let mut contents = HashMap::default();
+            for (crease_id, (mention_uri, task)) in mentions {
+                contents.insert(
+                    crease_id,
+                    (mention_uri, task.await.map_err(|e| anyhow!("{e}"))?),
+                );
+            }
+            Ok(contents)
         })
     }
 
-    pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
-        self.fetch_results.clear();
-        self.thread_summaries.clear();
-        self.text_thread_summaries.clear();
-        self.directories.clear();
-        self.uri_by_crease_id
-            .drain()
-            .map(|(id, _)| id)
-            .chain(self.images.drain().map(|(id, _)| id))
-    }
-
-    pub fn remove_invalid(&mut self, snapshot: EditorSnapshot) {
+    fn remove_invalid(&mut self, snapshot: EditorSnapshot) {
         for (crease_id, crease) in snapshot.crease_snapshot.creases() {
             if !crease.range().start.is_valid(&snapshot.buffer_snapshot) {
-                self.uri_by_crease_id.remove(&crease_id);
+                self.mentions.remove(&crease_id);
             }
         }
     }
@@ -1969,9 +1658,7 @@ mod tests {
         });
 
         let (content, _) = message_editor
-            .update_in(cx, |message_editor, window, cx| {
-                message_editor.contents(window, cx)
-            })
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
             .await
             .unwrap();
 
@@ -2038,7 +1725,8 @@ mod tests {
                         "six.txt": "6",
                         "seven.txt": "7",
                         "eight.txt": "8",
-                    }
+                    },
+                    "x.png": "",
                 }),
             )
             .await;
@@ -2222,14 +1910,10 @@ mod tests {
         };
 
         let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    &project,
-                    None,
-                    &all_prompt_capabilities,
-                    window,
-                    cx,
-                )
+            .update(&mut cx, |message_editor, cx| {
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap()
@@ -2237,7 +1921,7 @@ mod tests {
             .collect::<Vec<_>>();
 
         {
-            let [Mention::Text { content, uri, .. }] = contents.as_slice() else {
+            let [(uri, Mention::Text { content, .. })] = contents.as_slice() else {
                 panic!("Unexpected mentions");
             };
             pretty_assertions::assert_eq!(content, "1");
@@ -2245,14 +1929,10 @@ mod tests {
         }
 
         let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    &project,
-                    None,
-                    &acp::PromptCapabilities::default(),
-                    window,
-                    cx,
-                )
+            .update(&mut cx, |message_editor, cx| {
+                message_editor
+                    .mention_set()
+                    .contents(&acp::PromptCapabilities::default(), cx)
             })
             .await
             .unwrap()
@@ -2260,7 +1940,7 @@ mod tests {
             .collect::<Vec<_>>();
 
         {
-            let [Mention::UriOnly(uri)] = contents.as_slice() else {
+            let [(uri, Mention::UriOnly)] = contents.as_slice() else {
                 panic!("Unexpected mentions");
             };
             pretty_assertions::assert_eq!(uri, &url_one.parse::<MentionUri>().unwrap());
@@ -2300,14 +1980,10 @@ mod tests {
         cx.run_until_parked();
 
         let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    &project,
-                    None,
-                    &all_prompt_capabilities,
-                    window,
-                    cx,
-                )
+            .update(&mut cx, |message_editor, cx| {
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap()
@@ -2317,7 +1993,7 @@ mod tests {
         let url_eight = uri!("file:///dir/b/eight.txt");
 
         {
-            let [_, Mention::Text { content, uri, .. }] = contents.as_slice() else {
+            let [_, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
                 panic!("Unexpected mentions");
             };
             pretty_assertions::assert_eq!(content, "8");
@@ -2414,14 +2090,10 @@ mod tests {
         });
 
         let contents = message_editor
-            .update_in(&mut cx, |message_editor, window, cx| {
-                message_editor.mention_set().contents(
-                    &project,
-                    None,
-                    &all_prompt_capabilities,
-                    window,
-                    cx,
-                )
+            .update(&mut cx, |message_editor, cx| {
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
             })
             .await
             .unwrap()
@@ -2429,7 +2101,7 @@ mod tests {
             .collect::<Vec<_>>();
 
         {
-            let [_, _, Mention::Text { content, uri, .. }] = contents.as_slice() else {
+            let [_, _, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
                 panic!("Unexpected mentions");
             };
             pretty_assertions::assert_eq!(content, "1");
@@ -2444,11 +2116,85 @@ mod tests {
         cx.run_until_parked();
 
         editor.read_with(&cx, |editor, cx| {
-                assert_eq!(
-                    editor.text(cx),
-                    format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
-                );
-            });
+            assert_eq!(
+                editor.text(cx),
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
+            );
+        });
+
+        // Try to mention an "image" file that will fail to load
+        cx.simulate_input("@file x.png");
+
+        editor.update(&mut cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) @file x.png")
+            );
+            assert!(editor.has_visible_completions_menu());
+            assert_eq!(current_completion_labels(editor), &["x.png dir/"]);
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        // Getting the message contents fails
+        message_editor
+            .update(&mut cx, |message_editor, cx| {
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
+            })
+            .await
+            .expect_err("Should fail to load x.png");
+
+        cx.run_until_parked();
+
+        // Mention was removed
+        editor.read_with(&cx, |editor, cx| {
+            assert_eq!(
+                editor.text(cx),
+                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
+            );
+        });
+
+        // Once more
+        cx.simulate_input("@file x.png");
+
+        editor.update(&mut cx, |editor, cx| {
+                    assert_eq!(
+                        editor.text(cx),
+                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) @file x.png")
+                    );
+                    assert!(editor.has_visible_completions_menu());
+                    assert_eq!(current_completion_labels(editor), &["x.png dir/"]);
+                });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        // This time don't immediately get the contents, just let the confirmed completion settle
+        cx.run_until_parked();
+
+        // Mention was removed
+        editor.read_with(&cx, |editor, cx| {
+                    assert_eq!(
+                        editor.text(cx),
+                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({url_one}?symbol=MySymbol#L1:1) ")
+                    );
+                });
+
+        // Now getting the contents succeeds, because the invalid mention was removed
+        let contents = message_editor
+            .update(&mut cx, |message_editor, cx| {
+                message_editor
+                    .mention_set()
+                    .contents(&all_prompt_capabilities, cx)
+            })
+            .await
+            .unwrap();
+        assert_eq!(contents.len(), 3);
     }
 
     fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 0e1d4123b9..3ad1234e22 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -274,6 +274,7 @@ pub struct AcpThreadView {
     edits_expanded: bool,
     plan_expanded: bool,
     editor_expanded: bool,
+    terminal_expanded: bool,
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     _cancel_task: Option<Task<()>>,
@@ -384,6 +385,7 @@ impl AcpThreadView {
             edits_expanded: false,
             plan_expanded: false,
             editor_expanded: false,
+            terminal_expanded: true,
             history_store,
             hovered_recent_history_item: None,
             prompt_capabilities,
@@ -835,7 +837,7 @@ impl AcpThreadView {
 
         let contents = self
             .message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(window, cx));
+            .update(cx, |message_editor, cx| message_editor.contents(cx));
         self.send_impl(contents, window, cx)
     }
 
@@ -848,7 +850,7 @@ impl AcpThreadView {
 
         let contents = self
             .message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(window, cx));
+            .update(cx, |message_editor, cx| message_editor.contents(cx));
 
         cx.spawn_in(window, async move |this, cx| {
             cancelled.await;
@@ -956,8 +958,7 @@ impl AcpThreadView {
             return;
         };
 
-        let contents =
-            message_editor.update(cx, |message_editor, cx| message_editor.contents(window, cx));
+        let contents = message_editor.update(cx, |message_editor, cx| message_editor.contents(cx));
 
         let task = cx.foreground_executor().spawn(async move {
             rewind.await?;
@@ -1690,9 +1691,10 @@ impl AcpThreadView {
             matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
         let use_card_layout = needs_confirmation || is_edit;
 
-        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;
+        let is_collapsible = !tool_call.content.is_empty() && !use_card_layout;
 
-        let is_open = needs_confirmation || self.expanded_tool_calls.contains(&tool_call.id);
+        let is_open =
+            needs_confirmation || is_edit || self.expanded_tool_calls.contains(&tool_call.id);
 
         let gradient_overlay = |color: Hsla| {
             div()
@@ -2162,8 +2164,6 @@ impl AcpThreadView {
             .map(|path| format!("{}", path.display()))
             .unwrap_or_else(|| "current directory".to_string());
 
-        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
-
         let header = h_flex()
             .id(SharedString::from(format!(
                 "terminal-tool-header-{}",
@@ -2297,19 +2297,12 @@ impl AcpThreadView {
                         "terminal-tool-disclosure-{}",
                         terminal.entity_id()
                     )),
-                    is_expanded,
+                    self.terminal_expanded,
                 )
                 .opened_icon(IconName::ChevronUp)
                 .closed_icon(IconName::ChevronDown)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, _window, _cx| {
-                        if is_expanded {
-                            this.expanded_tool_calls.remove(&id);
-                        } else {
-                            this.expanded_tool_calls.insert(id.clone());
-                        }
-                    }
+                .on_click(cx.listener(move |this, _event, _window, _cx| {
+                    this.terminal_expanded = !this.terminal_expanded;
                 })),
             );
 
@@ -2318,7 +2311,7 @@ impl AcpThreadView {
             .read(cx)
             .entry(entry_ix)
             .and_then(|entry| entry.terminal(terminal));
-        let show_output = is_expanded && terminal_view.is_some();
+        let show_output = self.terminal_expanded && terminal_view.is_some();
 
         v_flex()
             .mb_2()
@@ -3655,6 +3648,7 @@ impl AcpThreadView {
                         .open_path(path, None, true, window, cx)
                         .detach_and_log_err(cx);
                 }
+                MentionUri::PastedImage => {}
                 MentionUri::Directory { abs_path } => {
                     let project = workspace.project();
                     let Some(entry) = project.update(cx, |project, cx| {
@@ -3669,9 +3663,14 @@ impl AcpThreadView {
                     });
                 }
                 MentionUri::Symbol {
-                    path, line_range, ..
+                    abs_path: path,
+                    line_range,
+                    ..
                 }
-                | MentionUri::Selection { path, line_range } => {
+                | MentionUri::Selection {
+                    abs_path: Some(path),
+                    line_range,
+                } => {
                     let project = workspace.project();
                     let Some((path, _)) = project.update(cx, |project, cx| {
                         let path = project.find_project_path(path, cx)?;
@@ -3687,8 +3686,8 @@ impl AcpThreadView {
                             let Some(editor) = item.await?.downcast::<Editor>() else {
                                 return Ok(());
                             };
-                            let range =
-                                Point::new(line_range.start, 0)..Point::new(line_range.start, 0);
+                            let range = Point::new(*line_range.start(), 0)
+                                ..Point::new(*line_range.start(), 0);
                             editor
                                 .update_in(cx, |editor, window, cx| {
                                     editor.change_selections(
@@ -3703,6 +3702,7 @@ impl AcpThreadView {
                         })
                         .detach_and_log_err(cx);
                 }
+                MentionUri::Selection { abs_path: None, .. } => {}
                 MentionUri::Thread { id, name } => {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         panel.update(cx, |panel, cx| {

From 70575d1115133988df19d3d2d6c8cc1f35a19a6b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 23 Aug 2025 10:03:36 +0300
Subject: [PATCH 318/823] Remove redundant Cargo diagnostics settings (#36795)

Removes `diagnostics.cargo.fetch_cargo_diagnostics` settings as those
are not needed for the flycheck diagnostics to run.
This setting disabled `checkOnSave` in rust-analyzer and allowed to
update diagnostics via flycheck in the project diagnostics editor with
the "refresh" button.

Instead, `"checkOnSave": false,` can be set manually as
https://zed.dev/docs/languages/rust#more-server-configuration example
shows and flycheck commands can be called manually from anywhere,
including the diagnostics panel, to refresh the diagnostics.

Release Notes:

- Removed redundant `diagnostics.cargo.fetch_cargo_diagnostics` settings
---
 Cargo.lock                                 |   1 -
 assets/settings/default.json               |   5 -
 crates/diagnostics/Cargo.toml              |   1 -
 crates/diagnostics/src/diagnostics.rs      | 127 +--------------------
 crates/diagnostics/src/toolbar_controls.rs |  38 ++----
 crates/languages/src/rust.rs               |  14 ---
 crates/project/src/project_settings.rs     |  22 ----
 docs/src/languages/rust.md                 |  17 +--
 8 files changed, 14 insertions(+), 211 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa3a910390..6964ed4890 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4685,7 +4685,6 @@ dependencies = [
  "component",
  "ctor",
  "editor",
- "futures 0.3.31",
  "gpui",
  "indoc",
  "language",
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 014b483250..ac26952c7f 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1133,11 +1133,6 @@
       // The minimum severity of the diagnostics to show inline.
       // Inherits editor's diagnostics' max severity settings when `null`.
       "max_severity": null
-    },
-    "cargo": {
-      // When enabled, Zed disables rust-analyzer's check on save and starts to query
-      // Cargo diagnostics separately.
-      "fetch_cargo_diagnostics": false
     }
   },
   // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
index 53b5792e10..fd678078e8 100644
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -18,7 +18,6 @@ collections.workspace = true
 component.workspace = true
 ctor.workspace = true
 editor.workspace = true
-futures.workspace = true
 gpui.workspace = true
 indoc.workspace = true
 language.workspace = true
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 037e4fc0fd..1c27e820a0 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -13,7 +13,6 @@ use editor::{
     DEFAULT_MULTIBUFFER_CONTEXT, Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
     display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
 };
-use futures::future::join_all;
 use gpui::{
     AnyElement, AnyView, App, AsyncApp, Context, Entity, EventEmitter, FocusHandle, Focusable,
     Global, InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled,
@@ -24,7 +23,6 @@ use language::{
 };
 use project::{
     DiagnosticSummary, Project, ProjectPath,
-    lsp_store::rust_analyzer_ext::{cancel_flycheck, run_flycheck},
     project_settings::{DiagnosticSeverity, ProjectSettings},
 };
 use settings::Settings;
@@ -79,17 +77,10 @@ pub(crate) struct ProjectDiagnosticsEditor {
     paths_to_update: BTreeSet<ProjectPath>,
     include_warnings: bool,
     update_excerpts_task: Option<Task<Result<()>>>,
-    cargo_diagnostics_fetch: CargoDiagnosticsFetchState,
     diagnostic_summary_update: Task<()>,
     _subscription: Subscription,
 }
 
-struct CargoDiagnosticsFetchState {
-    fetch_task: Option<Task<()>>,
-    cancel_task: Option<Task<()>>,
-    diagnostic_sources: Arc<Vec<ProjectPath>>,
-}
-
 impl EventEmitter<EditorEvent> for ProjectDiagnosticsEditor {}
 
 const DIAGNOSTICS_UPDATE_DELAY: Duration = Duration::from_millis(50);
@@ -260,11 +251,7 @@ impl ProjectDiagnosticsEditor {
                 )
             });
             this.diagnostics.clear();
-            this.update_all_diagnostics(false, window, cx);
-        })
-        .detach();
-        cx.observe_release(&cx.entity(), |editor, _, cx| {
-            editor.stop_cargo_diagnostics_fetch(cx);
+            this.update_all_excerpts(window, cx);
         })
         .detach();
 
@@ -281,15 +268,10 @@ impl ProjectDiagnosticsEditor {
             editor,
             paths_to_update: Default::default(),
             update_excerpts_task: None,
-            cargo_diagnostics_fetch: CargoDiagnosticsFetchState {
-                fetch_task: None,
-                cancel_task: None,
-                diagnostic_sources: Arc::new(Vec::new()),
-            },
             diagnostic_summary_update: Task::ready(()),
             _subscription: project_event_subscription,
         };
-        this.update_all_diagnostics(true, window, cx);
+        this.update_all_excerpts(window, cx);
         this
     }
 
@@ -373,20 +355,10 @@ impl ProjectDiagnosticsEditor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let fetch_cargo_diagnostics = ProjectSettings::get_global(cx)
-            .diagnostics
-            .fetch_cargo_diagnostics();
-
-        if fetch_cargo_diagnostics {
-            if self.cargo_diagnostics_fetch.fetch_task.is_some() {
-                self.stop_cargo_diagnostics_fetch(cx);
-            } else {
-                self.update_all_diagnostics(false, window, cx);
-            }
-        } else if self.update_excerpts_task.is_some() {
+        if self.update_excerpts_task.is_some() {
             self.update_excerpts_task = None;
         } else {
-            self.update_all_diagnostics(false, window, cx);
+            self.update_all_excerpts(window, cx);
         }
         cx.notify();
     }
@@ -404,73 +376,6 @@ impl ProjectDiagnosticsEditor {
         }
     }
 
-    fn update_all_diagnostics(
-        &mut self,
-        first_launch: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let cargo_diagnostics_sources = self.cargo_diagnostics_sources(cx);
-        if cargo_diagnostics_sources.is_empty() {
-            self.update_all_excerpts(window, cx);
-        } else if first_launch && !self.summary.is_empty() {
-            self.update_all_excerpts(window, cx);
-        } else {
-            self.fetch_cargo_diagnostics(Arc::new(cargo_diagnostics_sources), cx);
-        }
-    }
-
-    fn fetch_cargo_diagnostics(
-        &mut self,
-        diagnostics_sources: Arc<Vec<ProjectPath>>,
-        cx: &mut Context<Self>,
-    ) {
-        let project = self.project.clone();
-        self.cargo_diagnostics_fetch.cancel_task = None;
-        self.cargo_diagnostics_fetch.fetch_task = None;
-        self.cargo_diagnostics_fetch.diagnostic_sources = diagnostics_sources.clone();
-        if self.cargo_diagnostics_fetch.diagnostic_sources.is_empty() {
-            return;
-        }
-
-        self.cargo_diagnostics_fetch.fetch_task = Some(cx.spawn(async move |editor, cx| {
-            let mut fetch_tasks = Vec::new();
-            for buffer_path in diagnostics_sources.iter().cloned() {
-                if cx
-                    .update(|cx| {
-                        fetch_tasks.push(run_flycheck(project.clone(), Some(buffer_path), cx));
-                    })
-                    .is_err()
-                {
-                    break;
-                }
-            }
-
-            let _ = join_all(fetch_tasks).await;
-            editor
-                .update(cx, |editor, _| {
-                    editor.cargo_diagnostics_fetch.fetch_task = None;
-                })
-                .ok();
-        }));
-    }
-
-    fn stop_cargo_diagnostics_fetch(&mut self, cx: &mut App) {
-        self.cargo_diagnostics_fetch.fetch_task = None;
-        let mut cancel_gasks = Vec::new();
-        for buffer_path in std::mem::take(&mut self.cargo_diagnostics_fetch.diagnostic_sources)
-            .iter()
-            .cloned()
-        {
-            cancel_gasks.push(cancel_flycheck(self.project.clone(), Some(buffer_path), cx));
-        }
-
-        self.cargo_diagnostics_fetch.cancel_task = Some(cx.background_spawn(async move {
-            let _ = join_all(cancel_gasks).await;
-            log::info!("Finished fetching cargo diagnostics");
-        }));
-    }
-
     /// Enqueue an update of all excerpts. Updates all paths that either
     /// currently have diagnostics or are currently present in this view.
     fn update_all_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -695,30 +600,6 @@ impl ProjectDiagnosticsEditor {
             })
         })
     }
-
-    pub fn cargo_diagnostics_sources(&self, cx: &App) -> Vec<ProjectPath> {
-        let fetch_cargo_diagnostics = ProjectSettings::get_global(cx)
-            .diagnostics
-            .fetch_cargo_diagnostics();
-        if !fetch_cargo_diagnostics {
-            return Vec::new();
-        }
-        self.project
-            .read(cx)
-            .worktrees(cx)
-            .filter_map(|worktree| {
-                let _cargo_toml_entry = worktree.read(cx).entry_for_path("Cargo.toml")?;
-                let rust_file_entry = worktree.read(cx).entries(false, 0).find(|entry| {
-                    entry
-                        .path
-                        .extension()
-                        .and_then(|extension| extension.to_str())
-                        == Some("rs")
-                })?;
-                self.project.read(cx).path_for_entry(rust_file_entry.id, cx)
-            })
-            .collect()
-    }
 }
 
 impl Focusable for ProjectDiagnosticsEditor {
diff --git a/crates/diagnostics/src/toolbar_controls.rs b/crates/diagnostics/src/toolbar_controls.rs
index e77b80115f..404db39164 100644
--- a/crates/diagnostics/src/toolbar_controls.rs
+++ b/crates/diagnostics/src/toolbar_controls.rs
@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::{ProjectDiagnosticsEditor, ToggleDiagnosticsRefresh};
 use gpui::{Context, Entity, EventEmitter, ParentElement, Render, WeakEntity, Window};
 use ui::prelude::*;
@@ -15,26 +13,18 @@ impl Render for ToolbarControls {
         let mut include_warnings = false;
         let mut has_stale_excerpts = false;
         let mut is_updating = false;
-        let cargo_diagnostics_sources = Arc::new(self.diagnostics().map_or(Vec::new(), |editor| {
-            editor.read(cx).cargo_diagnostics_sources(cx)
-        }));
-        let fetch_cargo_diagnostics = !cargo_diagnostics_sources.is_empty();
 
         if let Some(editor) = self.diagnostics() {
             let diagnostics = editor.read(cx);
             include_warnings = diagnostics.include_warnings;
             has_stale_excerpts = !diagnostics.paths_to_update.is_empty();
-            is_updating = if fetch_cargo_diagnostics {
-                diagnostics.cargo_diagnostics_fetch.fetch_task.is_some()
-            } else {
-                diagnostics.update_excerpts_task.is_some()
-                    || diagnostics
-                        .project
-                        .read(cx)
-                        .language_servers_running_disk_based_diagnostics(cx)
-                        .next()
-                        .is_some()
-            };
+            is_updating = diagnostics.update_excerpts_task.is_some()
+                || diagnostics
+                    .project
+                    .read(cx)
+                    .language_servers_running_disk_based_diagnostics(cx)
+                    .next()
+                    .is_some();
         }
 
         let tooltip = if include_warnings {
@@ -64,7 +54,6 @@ impl Render for ToolbarControls {
                             .on_click(cx.listener(move |toolbar_controls, _, _, cx| {
                                 if let Some(diagnostics) = toolbar_controls.diagnostics() {
                                     diagnostics.update(cx, |diagnostics, cx| {
-                                        diagnostics.stop_cargo_diagnostics_fetch(cx);
                                         diagnostics.update_excerpts_task = None;
                                         cx.notify();
                                     });
@@ -76,7 +65,7 @@ impl Render for ToolbarControls {
                         IconButton::new("refresh-diagnostics", IconName::ArrowCircle)
                             .icon_color(Color::Info)
                             .shape(IconButtonShape::Square)
-                            .disabled(!has_stale_excerpts && !fetch_cargo_diagnostics)
+                            .disabled(!has_stale_excerpts)
                             .tooltip(Tooltip::for_action_title(
                                 "Refresh diagnostics",
                                 &ToggleDiagnosticsRefresh,
@@ -84,17 +73,8 @@ impl Render for ToolbarControls {
                             .on_click(cx.listener({
                                 move |toolbar_controls, _, window, cx| {
                                     if let Some(diagnostics) = toolbar_controls.diagnostics() {
-                                        let cargo_diagnostics_sources =
-                                            Arc::clone(&cargo_diagnostics_sources);
                                         diagnostics.update(cx, move |diagnostics, cx| {
-                                            if fetch_cargo_diagnostics {
-                                                diagnostics.fetch_cargo_diagnostics(
-                                                    cargo_diagnostics_sources,
-                                                    cx,
-                                                );
-                                            } else {
-                                                diagnostics.update_all_excerpts(window, cx);
-                                            }
+                                            diagnostics.update_all_excerpts(window, cx);
                                         });
                                     }
                                 }
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index c6c7357148..3e8dce756b 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -510,20 +510,6 @@ impl LspAdapter for RustLspAdapter {
             }
         }
 
-        let cargo_diagnostics_fetched_separately = ProjectSettings::get_global(cx)
-            .diagnostics
-            .fetch_cargo_diagnostics();
-        if cargo_diagnostics_fetched_separately {
-            let disable_check_on_save = json!({
-                "checkOnSave": false,
-            });
-            if let Some(initialization_options) = &mut original.initialization_options {
-                merge_json_value_into(disable_check_on_save, initialization_options);
-            } else {
-                original.initialization_options = Some(disable_check_on_save);
-            }
-        }
-
         Ok(original)
     }
 }
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index a6fea4059c..4447c25129 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -181,17 +181,6 @@ pub struct DiagnosticsSettings {
 
     /// Settings for showing inline diagnostics.
     pub inline: InlineDiagnosticsSettings,
-
-    /// Configuration, related to Rust language diagnostics.
-    pub cargo: Option<CargoDiagnosticsSettings>,
-}
-
-impl DiagnosticsSettings {
-    pub fn fetch_cargo_diagnostics(&self) -> bool {
-        self.cargo
-            .as_ref()
-            .is_some_and(|cargo_diagnostics| cargo_diagnostics.fetch_cargo_diagnostics)
-    }
 }
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
@@ -258,7 +247,6 @@ impl Default for DiagnosticsSettings {
             include_warnings: true,
             lsp_pull_diagnostics: LspPullDiagnosticsSettings::default(),
             inline: InlineDiagnosticsSettings::default(),
-            cargo: None,
         }
     }
 }
@@ -292,16 +280,6 @@ impl Default for GlobalLspSettings {
     }
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
-pub struct CargoDiagnosticsSettings {
-    /// When enabled, Zed disables rust-analyzer's check on save and starts to query
-    /// Cargo diagnostics separately.
-    ///
-    /// Default: false
-    #[serde(default)]
-    pub fetch_cargo_diagnostics: bool,
-}
-
 #[derive(
     Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, JsonSchema,
 )]
diff --git a/docs/src/languages/rust.md b/docs/src/languages/rust.md
index 7695280275..0bfa3ecac7 100644
--- a/docs/src/languages/rust.md
+++ b/docs/src/languages/rust.md
@@ -136,22 +136,7 @@ This is enabled by default and can be configured as
 ## Manual Cargo Diagnostics fetch
 
 By default, rust-analyzer has `checkOnSave: true` enabled, which causes every buffer save to trigger a `cargo check --workspace --all-targets` command.
-For lager projects this might introduce excessive wait times, so a more fine-grained triggering could be enabled by altering the
-
-```json
-"diagnostics": {
-  "cargo": {
-    // When enabled, Zed disables rust-analyzer's check on save and starts to query
-    // Cargo diagnostics separately.
-    "fetch_cargo_diagnostics": false
-  }
-}
-```
-
-default settings.
-
-This will stop rust-analyzer from running `cargo check ...` on save, yet still allow to run
-`editor: run/clear/cancel flycheck` commands in Rust files to refresh cargo diagnostics; the project diagnostics editor will also refresh cargo diagnostics with `editor: run flycheck` command when the setting is enabled.
+If disabled with `checkOnSave: false` (see the example of the server configuration json above), it's still possible to fetch the diagnostics manually, with the `editor: run/clear/cancel flycheck` commands in Rust files to refresh cargo diagnostics; the project diagnostics editor will also refresh cargo diagnostics with `editor: run flycheck` command when the setting is enabled.
 
 ## More server configuration
 

From 61bc1cc44172d61c2fb69d8265bc5d809512f342 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 23 Aug 2025 16:30:54 +0200
Subject: [PATCH 319/823] acp: Support launching custom agent servers (#36805)

It's enough to add this to your settings:

```json
{
    "agent_servers": {
        "Name Of Your Agent": {
            "command": "/path/to/custom/agent",
            "args": ["arguments", "that", "you", "want"],
        }
    }
}
```

Release Notes:

- N/A
---
 crates/acp_tools/src/acp_tools.rs             |  12 +-
 crates/agent2/src/native_agent_server.rs      |  12 +-
 crates/agent_servers/src/acp.rs               |  12 +-
 crates/agent_servers/src/agent_servers.rs     |   8 +-
 crates/agent_servers/src/claude.rs            |  12 +-
 crates/agent_servers/src/custom.rs            |  59 ++++++++++
 crates/agent_servers/src/e2e_tests.rs         |  17 ++-
 crates/agent_servers/src/gemini.rs            |  13 +--
 crates/agent_servers/src/settings.rs          |  24 +++-
 crates/agent_ui/src/acp/thread_view.rs        |  20 ++--
 crates/agent_ui/src/agent_panel.rs            | 105 ++++++++++++++----
 crates/agent_ui/src/agent_ui.rs               |  19 +++-
 crates/language_model/src/language_model.rs   |   4 +-
 .../language_models/src/provider/anthropic.rs |   6 +-
 crates/language_models/src/provider/google.rs |   6 +-
 15 files changed, 238 insertions(+), 91 deletions(-)
 create mode 100644 crates/agent_servers/src/custom.rs

diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
index ca5e57e85a..ee12b04cde 100644
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -46,7 +46,7 @@ pub struct AcpConnectionRegistry {
 }
 
 struct ActiveConnection {
-    server_name: &'static str,
+    server_name: SharedString,
     connection: Weak<acp::ClientSideConnection>,
 }
 
@@ -63,12 +63,12 @@ impl AcpConnectionRegistry {
 
     pub fn set_active_connection(
         &self,
-        server_name: &'static str,
+        server_name: impl Into<SharedString>,
         connection: &Rc<acp::ClientSideConnection>,
         cx: &mut Context<Self>,
     ) {
         self.active_connection.replace(Some(ActiveConnection {
-            server_name,
+            server_name: server_name.into(),
             connection: Rc::downgrade(connection),
         }));
         cx.notify();
@@ -85,7 +85,7 @@ struct AcpTools {
 }
 
 struct WatchedConnection {
-    server_name: &'static str,
+    server_name: SharedString,
     messages: Vec<WatchedConnectionMessage>,
     list_state: ListState,
     connection: Weak<acp::ClientSideConnection>,
@@ -142,7 +142,7 @@ impl AcpTools {
             });
 
             self.watched_connection = Some(WatchedConnection {
-                server_name: active_connection.server_name,
+                server_name: active_connection.server_name.clone(),
                 messages: vec![],
                 list_state: ListState::new(0, ListAlignment::Bottom, px(2048.)),
                 connection: active_connection.connection.clone(),
@@ -442,7 +442,7 @@ impl Item for AcpTools {
             "ACP: {}",
             self.watched_connection
                 .as_ref()
-                .map_or("Disconnected", |connection| connection.server_name)
+                .map_or("Disconnected", |connection| &connection.server_name)
         )
         .into()
     }
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 4ce467d6fd..12d3c79d1b 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -3,7 +3,7 @@ use std::{any::Any, path::Path, rc::Rc, sync::Arc};
 use agent_servers::AgentServer;
 use anyhow::Result;
 use fs::Fs;
-use gpui::{App, Entity, Task};
+use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use prompt_store::PromptStore;
 
@@ -22,16 +22,16 @@ impl NativeAgentServer {
 }
 
 impl AgentServer for NativeAgentServer {
-    fn name(&self) -> &'static str {
-        "Zed Agent"
+    fn name(&self) -> SharedString {
+        "Zed Agent".into()
     }
 
-    fn empty_state_headline(&self) -> &'static str {
+    fn empty_state_headline(&self) -> SharedString {
         self.name()
     }
 
-    fn empty_state_message(&self) -> &'static str {
-        ""
+    fn empty_state_message(&self) -> SharedString {
+        "".into()
     }
 
     fn logo(&self) -> ui::IconName {
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index a99a401431..c9c938c6c0 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -15,7 +15,7 @@ use std::{path::Path, rc::Rc};
 use thiserror::Error;
 
 use anyhow::{Context as _, Result};
-use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntity};
 
 use acp_thread::{AcpThread, AuthRequired, LoadError};
 
@@ -24,7 +24,7 @@ use acp_thread::{AcpThread, AuthRequired, LoadError};
 pub struct UnsupportedVersion;
 
 pub struct AcpConnection {
-    server_name: &'static str,
+    server_name: SharedString,
     connection: Rc<acp::ClientSideConnection>,
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
@@ -38,7 +38,7 @@ pub struct AcpSession {
 }
 
 pub async fn connect(
-    server_name: &'static str,
+    server_name: SharedString,
     command: AgentServerCommand,
     root_dir: &Path,
     cx: &mut AsyncApp,
@@ -51,7 +51,7 @@ const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
 
 impl AcpConnection {
     pub async fn stdio(
-        server_name: &'static str,
+        server_name: SharedString,
         command: AgentServerCommand,
         root_dir: &Path,
         cx: &mut AsyncApp,
@@ -121,7 +121,7 @@ impl AcpConnection {
 
         cx.update(|cx| {
             AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
-                registry.set_active_connection(server_name, &connection, cx)
+                registry.set_active_connection(server_name.clone(), &connection, cx)
             });
         })?;
 
@@ -187,7 +187,7 @@ impl AgentConnection for AcpConnection {
             let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
             let thread = cx.new(|_cx| {
                 AcpThread::new(
-                    self.server_name,
+                    self.server_name.clone(),
                     self.clone(),
                     project,
                     action_log,
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 2f5ec478ae..fa59201338 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -1,5 +1,6 @@
 mod acp;
 mod claude;
+mod custom;
 mod gemini;
 mod settings;
 
@@ -7,6 +8,7 @@ mod settings;
 pub mod e2e_tests;
 
 pub use claude::*;
+pub use custom::*;
 pub use gemini::*;
 pub use settings::*;
 
@@ -31,9 +33,9 @@ pub fn init(cx: &mut App) {
 
 pub trait AgentServer: Send {
     fn logo(&self) -> ui::IconName;
-    fn name(&self) -> &'static str;
-    fn empty_state_headline(&self) -> &'static str;
-    fn empty_state_message(&self) -> &'static str;
+    fn name(&self) -> SharedString;
+    fn empty_state_headline(&self) -> SharedString;
+    fn empty_state_message(&self) -> SharedString;
 
     fn connect(
         &self,
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index ef666974f1..048563103f 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -30,7 +30,7 @@ use futures::{
     io::BufReader,
     select_biased,
 };
-use gpui::{App, AppContext, AsyncApp, Entity, Task, WeakEntity};
+use gpui::{App, AppContext, AsyncApp, Entity, SharedString, Task, WeakEntity};
 use serde::{Deserialize, Serialize};
 use util::{ResultExt, debug_panic};
 
@@ -43,16 +43,16 @@ use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri
 pub struct ClaudeCode;
 
 impl AgentServer for ClaudeCode {
-    fn name(&self) -> &'static str {
-        "Claude Code"
+    fn name(&self) -> SharedString {
+        "Claude Code".into()
     }
 
-    fn empty_state_headline(&self) -> &'static str {
+    fn empty_state_headline(&self) -> SharedString {
         self.name()
     }
 
-    fn empty_state_message(&self) -> &'static str {
-        "How can I help you today?"
+    fn empty_state_message(&self) -> SharedString {
+        "How can I help you today?".into()
     }
 
     fn logo(&self) -> ui::IconName {
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
new file mode 100644
index 0000000000..e544c4f21f
--- /dev/null
+++ b/crates/agent_servers/src/custom.rs
@@ -0,0 +1,59 @@
+use crate::{AgentServerCommand, AgentServerSettings};
+use acp_thread::AgentConnection;
+use anyhow::Result;
+use gpui::{App, Entity, SharedString, Task};
+use project::Project;
+use std::{path::Path, rc::Rc};
+use ui::IconName;
+
+/// A generic agent server implementation for custom user-defined agents
+pub struct CustomAgentServer {
+    name: SharedString,
+    command: AgentServerCommand,
+}
+
+impl CustomAgentServer {
+    pub fn new(name: SharedString, settings: &AgentServerSettings) -> Self {
+        Self {
+            name,
+            command: settings.command.clone(),
+        }
+    }
+}
+
+impl crate::AgentServer for CustomAgentServer {
+    fn name(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn logo(&self) -> IconName {
+        IconName::Terminal
+    }
+
+    fn empty_state_headline(&self) -> SharedString {
+        "No conversations yet".into()
+    }
+
+    fn empty_state_message(&self) -> SharedString {
+        format!("Start a conversation with {}", self.name).into()
+    }
+
+    fn connect(
+        &self,
+        root_dir: &Path,
+        _project: &Entity<Project>,
+        cx: &mut App,
+    ) -> Task<Result<Rc<dyn AgentConnection>>> {
+        let server_name = self.name();
+        let command = self.command.clone();
+        let root_dir = root_dir.to_path_buf();
+
+        cx.spawn(async move |mut cx| {
+            crate::acp::connect(server_name, command, &root_dir, &mut cx).await
+        })
+    }
+
+    fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
+        self
+    }
+}
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index c271079071..42264b4b4f 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,17 +1,15 @@
+use crate::AgentServer;
+use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
+use agent_client_protocol as acp;
+use futures::{FutureExt, StreamExt, channel::mpsc, select};
+use gpui::{AppContext, Entity, TestAppContext};
+use indoc::indoc;
+use project::{FakeFs, Project};
 use std::{
     path::{Path, PathBuf},
     sync::Arc,
     time::Duration,
 };
-
-use crate::AgentServer;
-use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
-use agent_client_protocol as acp;
-
-use futures::{FutureExt, StreamExt, channel::mpsc, select};
-use gpui::{AppContext, Entity, TestAppContext};
-use indoc::indoc;
-use project::{FakeFs, Project};
 use util::path;
 
 pub async fn test_basic<T, F>(server: F, cx: &mut TestAppContext)
@@ -479,6 +477,7 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
                 gemini: Some(crate::AgentServerSettings {
                     command: crate::gemini::tests::local_command(),
                 }),
+                custom: collections::HashMap::default(),
             },
             cx,
         );
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 29120fff6e..9ebcee745c 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -4,11 +4,10 @@ use std::{any::Any, path::Path};
 use crate::{AgentServer, AgentServerCommand};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
-use gpui::{Entity, Task};
+use gpui::{App, Entity, SharedString, Task};
 use language_models::provider::google::GoogleLanguageModelProvider;
 use project::Project;
 use settings::SettingsStore;
-use ui::App;
 
 use crate::AllAgentServersSettings;
 
@@ -18,16 +17,16 @@ pub struct Gemini;
 const ACP_ARG: &str = "--experimental-acp";
 
 impl AgentServer for Gemini {
-    fn name(&self) -> &'static str {
-        "Gemini CLI"
+    fn name(&self) -> SharedString {
+        "Gemini CLI".into()
     }
 
-    fn empty_state_headline(&self) -> &'static str {
+    fn empty_state_headline(&self) -> SharedString {
         self.name()
     }
 
-    fn empty_state_message(&self) -> &'static str {
-        "Ask questions, edit files, run commands"
+    fn empty_state_message(&self) -> SharedString {
+        "Ask questions, edit files, run commands".into()
     }
 
     fn logo(&self) -> ui::IconName {
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
index 645674b5f1..96ac6e3cbe 100644
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -1,6 +1,7 @@
 use crate::AgentServerCommand;
 use anyhow::Result;
-use gpui::App;
+use collections::HashMap;
+use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
@@ -13,9 +14,13 @@ pub fn init(cx: &mut App) {
 pub struct AllAgentServersSettings {
     pub gemini: Option<AgentServerSettings>,
     pub claude: Option<AgentServerSettings>,
+
+    /// Custom agent servers configured by the user
+    #[serde(flatten)]
+    pub custom: HashMap<SharedString, AgentServerSettings>,
 }
 
-#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)]
+#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
 pub struct AgentServerSettings {
     #[serde(flatten)]
     pub command: AgentServerCommand,
@@ -29,13 +34,26 @@ impl settings::Settings for AllAgentServersSettings {
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         let mut settings = AllAgentServersSettings::default();
 
-        for AllAgentServersSettings { gemini, claude } in sources.defaults_and_customizations() {
+        for AllAgentServersSettings {
+            gemini,
+            claude,
+            custom,
+        } in sources.defaults_and_customizations()
+        {
             if gemini.is_some() {
                 settings.gemini = gemini.clone();
             }
             if claude.is_some() {
                 settings.claude = claude.clone();
             }
+
+            // Merge custom agents
+            for (name, config) in custom {
+                // Skip built-in agent names to avoid conflicts
+                if name != "gemini" && name != "claude" {
+                    settings.custom.insert(name.clone(), config.clone());
+                }
+            }
         }
 
         Ok(settings)
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 3ad1234e22..87928767c6 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -600,7 +600,7 @@ impl AcpThreadView {
 
             let view = registry.read(cx).provider(&provider_id).map(|provider| {
                 provider.configuration_view(
-                    language_model::ConfigurationViewTargetAgent::Other(agent_name),
+                    language_model::ConfigurationViewTargetAgent::Other(agent_name.clone()),
                     window,
                     cx,
                 )
@@ -1372,7 +1372,7 @@ impl AcpThreadView {
                                                     .icon_color(Color::Muted)
                                                     .style(ButtonStyle::Transparent)
                                                     .tooltip(move |_window, cx| {
-                                                        cx.new(|_| UnavailableEditingTooltip::new(agent_name.into()))
+                                                        cx.new(|_| UnavailableEditingTooltip::new(agent_name.clone()))
                                                             .into()
                                                     })
                                             )
@@ -3911,13 +3911,13 @@ impl AcpThreadView {
         match AgentSettings::get_global(cx).notify_when_agent_waiting {
             NotifyWhenAgentWaiting::PrimaryScreen => {
                 if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title.into(), window, primary, cx);
+                    self.pop_up(icon, caption.into(), title, window, primary, cx);
                 }
             }
             NotifyWhenAgentWaiting::AllScreens => {
                 let caption = caption.into();
                 for screen in cx.displays() {
-                    self.pop_up(icon, caption.clone(), title.into(), window, screen, cx);
+                    self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
                 }
             }
             NotifyWhenAgentWaiting::Never => {
@@ -5153,16 +5153,16 @@ pub(crate) mod tests {
             ui::IconName::Ai
         }
 
-        fn name(&self) -> &'static str {
-            "Test"
+        fn name(&self) -> SharedString {
+            "Test".into()
         }
 
-        fn empty_state_headline(&self) -> &'static str {
-            "Test"
+        fn empty_state_headline(&self) -> SharedString {
+            "Test".into()
         }
 
-        fn empty_state_message(&self) -> &'static str {
-            "Test"
+        fn empty_state_message(&self) -> SharedString {
+            "Test".into()
         }
 
         fn connect(
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 0e611d0db9..50f9fc6a45 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5,6 +5,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use acp_thread::AcpThread;
+use agent_servers::AgentServerSettings;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
@@ -128,7 +129,7 @@ pub fn init(cx: &mut App) {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
                         panel.update(cx, |panel, cx| {
-                            panel.external_thread(action.agent, None, None, window, cx)
+                            panel.external_thread(action.agent.clone(), None, None, window, cx)
                         });
                     }
                 })
@@ -239,7 +240,7 @@ enum WhichFontSize {
     None,
 }
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 pub enum AgentType {
     #[default]
     Zed,
@@ -247,23 +248,29 @@ pub enum AgentType {
     Gemini,
     ClaudeCode,
     NativeAgent,
+    Custom {
+        name: SharedString,
+        settings: AgentServerSettings,
+    },
 }
 
 impl AgentType {
-    fn label(self) -> impl Into<SharedString> {
+    fn label(&self) -> SharedString {
         match self {
-            Self::Zed | Self::TextThread => "Zed Agent",
-            Self::NativeAgent => "Agent 2",
-            Self::Gemini => "Gemini CLI",
-            Self::ClaudeCode => "Claude Code",
+            Self::Zed | Self::TextThread => "Zed Agent".into(),
+            Self::NativeAgent => "Agent 2".into(),
+            Self::Gemini => "Gemini CLI".into(),
+            Self::ClaudeCode => "Claude Code".into(),
+            Self::Custom { name, .. } => name.into(),
         }
     }
 
-    fn icon(self) -> Option<IconName> {
+    fn icon(&self) -> Option<IconName> {
         match self {
             Self::Zed | Self::NativeAgent | Self::TextThread => None,
             Self::Gemini => Some(IconName::AiGemini),
             Self::ClaudeCode => Some(IconName::AiClaude),
+            Self::Custom { .. } => Some(IconName::Terminal),
         }
     }
 }
@@ -517,7 +524,7 @@ pub struct AgentPanel {
 impl AgentPanel {
     fn serialize(&mut self, cx: &mut Context<Self>) {
         let width = self.width;
-        let selected_agent = self.selected_agent;
+        let selected_agent = self.selected_agent.clone();
         self.pending_serialization = Some(cx.background_spawn(async move {
             KEY_VALUE_STORE
                 .write_kvp(
@@ -607,7 +614,7 @@ impl AgentPanel {
                     panel.update(cx, |panel, cx| {
                         panel.width = serialized_panel.width.map(|w| w.round());
                         if let Some(selected_agent) = serialized_panel.selected_agent {
-                            panel.selected_agent = selected_agent;
+                            panel.selected_agent = selected_agent.clone();
                             panel.new_agent_thread(selected_agent, window, cx);
                         }
                         cx.notify();
@@ -1077,14 +1084,17 @@ impl AgentPanel {
         cx.spawn_in(window, async move |this, cx| {
             let ext_agent = match agent_choice {
                 Some(agent) => {
-                    cx.background_spawn(async move {
-                        if let Some(serialized) =
-                            serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
-                        {
-                            KEY_VALUE_STORE
-                                .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
-                                .await
-                                .log_err();
+                    cx.background_spawn({
+                        let agent = agent.clone();
+                        async move {
+                            if let Some(serialized) =
+                                serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
+                            {
+                                KEY_VALUE_STORE
+                                    .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
+                                    .await
+                                    .log_err();
+                            }
                         }
                     })
                     .detach();
@@ -1110,7 +1120,9 @@ impl AgentPanel {
 
             this.update_in(cx, |this, window, cx| {
                 match ext_agent {
-                    crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => {
+                    crate::ExternalAgent::Gemini
+                    | crate::ExternalAgent::NativeAgent
+                    | crate::ExternalAgent::Custom { .. } => {
                         if !cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                             return;
                         }
@@ -1839,14 +1851,14 @@ impl AgentPanel {
         cx: &mut Context<Self>,
     ) {
         if self.selected_agent != agent {
-            self.selected_agent = agent;
+            self.selected_agent = agent.clone();
             self.serialize(cx);
         }
         self.new_agent_thread(agent, window, cx);
     }
 
     pub fn selected_agent(&self) -> AgentType {
-        self.selected_agent
+        self.selected_agent.clone()
     }
 
     pub fn new_agent_thread(
@@ -1885,6 +1897,13 @@ impl AgentPanel {
                 window,
                 cx,
             ),
+            AgentType::Custom { name, settings } => self.external_thread(
+                Some(crate::ExternalAgent::Custom { name, settings }),
+                None,
+                None,
+                window,
+                cx,
+            ),
         }
     }
 
@@ -2610,13 +2629,55 @@ impl AgentPanel {
                                             }
                                         }),
                                 )
+                            })
+                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |mut menu| {
+                                // Add custom agents from settings
+                                let settings =
+                                    agent_servers::AllAgentServersSettings::get_global(cx);
+                                for (agent_name, agent_settings) in &settings.custom {
+                                    menu = menu.item(
+                                        ContextMenuEntry::new(format!("New {} Thread", agent_name))
+                                            .icon(IconName::Terminal)
+                                            .icon_color(Color::Muted)
+                                            .handler({
+                                                let workspace = workspace.clone();
+                                                let agent_name = agent_name.clone();
+                                                let agent_settings = agent_settings.clone();
+                                                move |window, cx| {
+                                                    if let Some(workspace) = workspace.upgrade() {
+                                                        workspace.update(cx, |workspace, cx| {
+                                                            if let Some(panel) =
+                                                                workspace.panel::<AgentPanel>(cx)
+                                                            {
+                                                                panel.update(cx, |panel, cx| {
+                                                                    panel.set_selected_agent(
+                                                                        AgentType::Custom {
+                                                                            name: agent_name
+                                                                                .clone(),
+                                                                            settings:
+                                                                                agent_settings
+                                                                                    .clone(),
+                                                                        },
+                                                                        window,
+                                                                        cx,
+                                                                    );
+                                                                });
+                                                            }
+                                                        });
+                                                    }
+                                                }
+                                            }),
+                                    );
+                                }
+
+                                menu
                             });
                         menu
                     }))
                 }
             });
 
-        let selected_agent_label = self.selected_agent.label().into();
+        let selected_agent_label = self.selected_agent.label();
         let selected_agent = div()
             .id("selected_agent_icon")
             .when_some(self.selected_agent.icon(), |this, icon| {
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 6084fd6423..40f6c6a2bb 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -28,13 +28,14 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use agent::{Thread, ThreadId};
+use agent_servers::AgentServerSettings;
 use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
-use gpui::{Action, App, Entity, actions};
+use gpui::{Action, App, Entity, SharedString, actions};
 use language::LanguageRegistry;
 use language_model::{
     ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
@@ -159,13 +160,17 @@ pub struct NewNativeAgentThreadFromSummary {
     from_session_id: agent_client_protocol::SessionId,
 }
 
-#[derive(Default, Debug, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 enum ExternalAgent {
     #[default]
     Gemini,
     ClaudeCode,
     NativeAgent,
+    Custom {
+        name: SharedString,
+        settings: AgentServerSettings,
+    },
 }
 
 impl ExternalAgent {
@@ -175,9 +180,13 @@ impl ExternalAgent {
         history: Entity<agent2::HistoryStore>,
     ) -> Rc<dyn agent_servers::AgentServer> {
         match self {
-            ExternalAgent::Gemini => Rc::new(agent_servers::Gemini),
-            ExternalAgent::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            ExternalAgent::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
+            Self::Gemini => Rc::new(agent_servers::Gemini),
+            Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
+            Self::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
+            Self::Custom { name, settings } => Rc::new(agent_servers::CustomAgentServer::new(
+                name.clone(),
+                settings,
+            )),
         }
     }
 }
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index e0a3866443..d5313b6a3a 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -643,11 +643,11 @@ pub trait LanguageModelProvider: 'static {
     fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
 }
 
-#[derive(Default, Clone, Copy)]
+#[derive(Default, Clone)]
 pub enum ConfigurationViewTargetAgent {
     #[default]
     ZedAgent,
-    Other(&'static str),
+    Other(SharedString),
 }
 
 #[derive(PartialEq, Eq)]
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 0d061c0587..c492edeaf5 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -1041,9 +1041,9 @@ impl Render for ConfigurationView {
             v_flex()
                 .size_full()
                 .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match self.target_agent {
-                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic",
-                    ConfigurationViewTargetAgent::Other(agent) => agent,
+                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
+                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic".into(),
+                    ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
                 })))
                 .child(
                     List::new()
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 566620675e..f252ab7aa3 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -921,9 +921,9 @@ impl Render for ConfigurationView {
             v_flex()
                 .size_full()
                 .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match self.target_agent {
-                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Google AI",
-                    ConfigurationViewTargetAgent::Other(agent) => agent,
+                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
+                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Google AI".into(),
+                    ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
                 })))
                 .child(
                     List::new()

From 60ea4754b29ea5292539496abf40f1a361dced4a Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Sat, 23 Aug 2025 20:30:16 +0530
Subject: [PATCH 320/823] project: Fix dynamic registration for
 textDocument/documentColor (#36807)

From:
https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/protocol/src/common/protocol.colorProvider.ts#L50

Release Notes:

- N/A
---
 crates/project/src/lsp_store.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index fb1fae3736..d2958dce01 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11913,7 +11913,7 @@ impl LspStore {
                         notify_server_capabilities_updated(&server, cx);
                     }
                 }
-                "textDocument/colorProvider" => {
+                "textDocument/documentColor" => {
                     if let Some(caps) = reg
                         .register_options
                         .map(serde_json::from_value)
@@ -12064,7 +12064,7 @@ impl LspStore {
                     });
                     notify_server_capabilities_updated(&server, cx);
                 }
-                "textDocument/colorProvider" => {
+                "textDocument/documentColor" => {
                     server.update_capabilities(|capabilities| {
                         capabilities.color_provider = None;
                     });

From d49409caba7f4b39409c38299d61511b6a3bb406 Mon Sep 17 00:00:00 2001
From: itsaphel <mandeep@cheema.uk>
Date: Sat, 23 Aug 2025 17:11:27 +0100
Subject: [PATCH 321/823] docs: Update settings in diagnostics.md (#36806)

For project_panel, the diagnostics key seems to be `show_diagnostics`
not `diagnostics`
([source](https://github.com/zed-industries/zed/blob/main/crates/project_panel/src/project_panel_settings.rs#L149-L152)).
Updating the docs accordingly

Release Notes:

- N/A
---
 docs/src/diagnostics.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/diagnostics.md b/docs/src/diagnostics.md
index a015fbebf8..9603c8197c 100644
--- a/docs/src/diagnostics.md
+++ b/docs/src/diagnostics.md
@@ -51,7 +51,7 @@ To configure, use
 
 ```json5
 "project_panel": {
-  "diagnostics": "all",
+  "show_diagnostics": "all",
 }
 ```
 

From 19764794b77c08e828fd7170c7539a9ca9c2b3de Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sat, 23 Aug 2025 16:39:14 -0400
Subject: [PATCH 322/823] acp: Animate loading context creases (#36814)

- Add pulsating animation for context creases while they're loading
- Add spinner in message editors (replacing send button) during the
window where sending has been requested, but we haven't finished loading
the message contents to send to the model
- During the same window, ignore further send requests, so we don't end
up sending the same message twice if you mash enter while loading is in
progress
- Wait for context to load before rewinding the thread when sending an
edited past message, avoiding an empty-looking state during the same
window

Release Notes:

- N/A
---
 Cargo.lock                                |   1 +
 crates/agent_ui/Cargo.toml                |   1 +
 crates/agent_ui/src/acp/message_editor.rs | 224 ++++++++++++++--------
 crates/agent_ui/src/acp/thread_view.rs    |  92 +++++++--
 4 files changed, 217 insertions(+), 101 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6964ed4890..0575796034 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -403,6 +403,7 @@ dependencies = [
  "parking_lot",
  "paths",
  "picker",
+ "postage",
  "pretty_assertions",
  "project",
  "prompt_store",
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 43e3b25124..6b0979ee69 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -67,6 +67,7 @@ ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 picker.workspace = true
+postage.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 115008cf52..bab42e3da2 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -21,12 +21,13 @@ use futures::{
     future::{Shared, join_all},
 };
 use gpui::{
-    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    HighlightStyle, Image, ImageFormat, Img, KeyContext, Subscription, Task, TextStyle,
-    UnderlineStyle, WeakEntity,
+    Animation, AnimationExt as _, AppContext, ClipboardEntry, Context, Entity, EntityId,
+    EventEmitter, FocusHandle, Focusable, HighlightStyle, Image, ImageFormat, Img, KeyContext,
+    Subscription, Task, TextStyle, UnderlineStyle, WeakEntity, pulsating_between,
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
+use postage::stream::Stream as _;
 use project::{CompletionIntent, Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{PromptId, PromptStore};
 use rope::Point;
@@ -44,10 +45,10 @@ use std::{
 use text::{OffsetRangeExt, ToOffset as _};
 use theme::ThemeSettings;
 use ui::{
-    ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Icon, IconName,
-    IconSize, InteractiveElement, IntoElement, Label, LabelCommon, LabelSize, ParentElement,
-    Render, SelectableButton, SharedString, Styled, TextSize, TintColor, Toggleable, Window, div,
-    h_flex, px,
+    ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Element as _,
+    FluentBuilder as _, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
+    LabelCommon, LabelSize, ParentElement, Render, SelectableButton, SharedString, Styled,
+    TextSize, TintColor, Toggleable, Window, div, h_flex, px,
 };
 use util::{ResultExt, debug_panic};
 use workspace::{Workspace, notifications::NotifyResultExt as _};
@@ -246,7 +247,7 @@ impl MessageEditor {
             .buffer_snapshot
             .anchor_before(start_anchor.to_offset(&snapshot.buffer_snapshot) + content_len + 1);
 
-        let crease_id = if let MentionUri::File { abs_path } = &mention_uri
+        let crease = if let MentionUri::File { abs_path } = &mention_uri
             && let Some(extension) = abs_path.extension()
             && let Some(extension) = extension.to_str()
             && Img::extensions().contains(&extension)
@@ -272,29 +273,31 @@ impl MessageEditor {
                     Ok(image)
                 })
                 .shared();
-            insert_crease_for_image(
+            insert_crease_for_mention(
                 *excerpt_id,
                 start,
                 content_len,
-                Some(abs_path.as_path().into()),
-                image,
+                mention_uri.name().into(),
+                IconName::Image.path().into(),
+                Some(image),
                 self.editor.clone(),
                 window,
                 cx,
             )
         } else {
-            crate::context_picker::insert_crease_for_mention(
+            insert_crease_for_mention(
                 *excerpt_id,
                 start,
                 content_len,
                 crease_text,
                 mention_uri.icon_path(cx),
+                None,
                 self.editor.clone(),
                 window,
                 cx,
             )
         };
-        let Some(crease_id) = crease_id else {
+        let Some((crease_id, tx)) = crease else {
             return Task::ready(());
         };
 
@@ -331,7 +334,9 @@ impl MessageEditor {
 
         // Notify the user if we failed to load the mentioned context
         cx.spawn_in(window, async move |this, cx| {
-            if task.await.notify_async_err(cx).is_none() {
+            let result = task.await.notify_async_err(cx);
+            drop(tx);
+            if result.is_none() {
                 this.update(cx, |this, cx| {
                     this.editor.update(cx, |editor, cx| {
                         // Remove mention
@@ -857,12 +862,13 @@ impl MessageEditor {
                 snapshot.anchor_before(start_anchor.to_offset(&snapshot) + content_len)
             });
             let image = Arc::new(image);
-            let Some(crease_id) = insert_crease_for_image(
+            let Some((crease_id, tx)) = insert_crease_for_mention(
                 excerpt_id,
                 text_anchor,
                 content_len,
-                None.clone(),
-                Task::ready(Ok(image.clone())).shared(),
+                MentionUri::PastedImage.name().into(),
+                IconName::Image.path().into(),
+                Some(Task::ready(Ok(image.clone())).shared()),
                 self.editor.clone(),
                 window,
                 cx,
@@ -877,6 +883,7 @@ impl MessageEditor {
                             .update(|_, cx| LanguageModelImage::from_image(image, cx))
                             .map_err(|e| e.to_string())?
                             .await;
+                        drop(tx);
                         if let Some(image) = image {
                             Ok(Mention::Image(MentionImage {
                                 data: image.source,
@@ -1097,18 +1104,20 @@ impl MessageEditor {
 
         for (range, mention_uri, mention) in mentions {
             let anchor = snapshot.anchor_before(range.start);
-            let Some(crease_id) = crate::context_picker::insert_crease_for_mention(
+            let Some((crease_id, tx)) = insert_crease_for_mention(
                 anchor.excerpt_id,
                 anchor.text_anchor,
                 range.end - range.start,
                 mention_uri.name().into(),
                 mention_uri.icon_path(cx),
+                None,
                 self.editor.clone(),
                 window,
                 cx,
             ) else {
                 continue;
             };
+            drop(tx);
 
             self.mention_set.mentions.insert(
                 crease_id,
@@ -1227,23 +1236,21 @@ impl Render for MessageEditor {
     }
 }
 
-pub(crate) fn insert_crease_for_image(
+pub(crate) fn insert_crease_for_mention(
     excerpt_id: ExcerptId,
     anchor: text::Anchor,
     content_len: usize,
-    abs_path: Option<Arc<Path>>,
-    image: Shared<Task<Result<Arc<Image>, String>>>,
+    crease_label: SharedString,
+    crease_icon: SharedString,
+    // abs_path: Option<Arc<Path>>,
+    image: Option<Shared<Task<Result<Arc<Image>, String>>>>,
     editor: Entity<Editor>,
     window: &mut Window,
     cx: &mut App,
-) -> Option<CreaseId> {
-    let crease_label = abs_path
-        .as_ref()
-        .and_then(|path| path.file_name())
-        .map(|name| name.to_string_lossy().to_string().into())
-        .unwrap_or(SharedString::from("Image"));
+) -> Option<(CreaseId, postage::barrier::Sender)> {
+    let (tx, rx) = postage::barrier::channel();
 
-    editor.update(cx, |editor, cx| {
+    let crease_id = editor.update(cx, |editor, cx| {
         let snapshot = editor.buffer().read(cx).snapshot(cx);
 
         let start = snapshot.anchor_in_excerpt(excerpt_id, anchor)?;
@@ -1252,7 +1259,15 @@ pub(crate) fn insert_crease_for_image(
         let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);
 
         let placeholder = FoldPlaceholder {
-            render: render_image_fold_icon_button(crease_label, image, cx.weak_entity()),
+            render: render_fold_icon_button(
+                crease_label,
+                crease_icon,
+                start..end,
+                rx,
+                image,
+                cx.weak_entity(),
+                cx,
+            ),
             merge_adjacent: false,
             ..Default::default()
         };
@@ -1269,63 +1284,112 @@ pub(crate) fn insert_crease_for_image(
         editor.fold_creases(vec![crease], false, window, cx);
 
         Some(ids[0])
-    })
+    })?;
+
+    Some((crease_id, tx))
 }
 
-fn render_image_fold_icon_button(
+fn render_fold_icon_button(
     label: SharedString,
-    image_task: Shared<Task<Result<Arc<Image>, String>>>,
+    icon: SharedString,
+    range: Range<Anchor>,
+    mut loading_finished: postage::barrier::Receiver,
+    image_task: Option<Shared<Task<Result<Arc<Image>, String>>>>,
     editor: WeakEntity<Editor>,
+    cx: &mut App,
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
-    Arc::new({
-        move |fold_id, fold_range, cx| {
-            let is_in_text_selection = editor
-                .update(cx, |editor, cx| editor.is_range_selected(&fold_range, cx))
-                .unwrap_or_default();
-
-            ButtonLike::new(fold_id)
-                .style(ButtonStyle::Filled)
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .toggle_state(is_in_text_selection)
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Image)
-                                .size(IconSize::XSmall)
-                                .color(Color::Muted),
-                        )
-                        .child(
-                            Label::new(label.clone())
-                                .size(LabelSize::Small)
-                                .buffer_font(cx)
-                                .single_line(),
-                        ),
-                )
-                .hoverable_tooltip({
-                    let image_task = image_task.clone();
-                    move |_, cx| {
-                        let image = image_task.peek().cloned().transpose().ok().flatten();
-                        let image_task = image_task.clone();
-                        cx.new::<ImageHover>(|cx| ImageHover {
-                            image,
-                            _task: cx.spawn(async move |this, cx| {
-                                if let Ok(image) = image_task.clone().await {
-                                    this.update(cx, |this, cx| {
-                                        if this.image.replace(image).is_none() {
-                                            cx.notify();
-                                        }
-                                    })
-                                    .ok();
-                                }
-                            }),
-                        })
-                        .into()
-                    }
-                })
-                .into_any_element()
+    let loading = cx.new(|cx| {
+        let loading = cx.spawn(async move |this, cx| {
+            loading_finished.recv().await;
+            this.update(cx, |this: &mut LoadingContext, cx| {
+                this.loading = None;
+                cx.notify();
+            })
+            .ok();
+        });
+        LoadingContext {
+            id: cx.entity_id(),
+            label,
+            icon,
+            range,
+            editor,
+            loading: Some(loading),
+            image: image_task.clone(),
         }
-    })
+    });
+    Arc::new(move |_fold_id, _fold_range, _cx| loading.clone().into_any_element())
+}
+
+struct LoadingContext {
+    id: EntityId,
+    label: SharedString,
+    icon: SharedString,
+    range: Range<Anchor>,
+    editor: WeakEntity<Editor>,
+    loading: Option<Task<()>>,
+    image: Option<Shared<Task<Result<Arc<Image>, String>>>>,
+}
+
+impl Render for LoadingContext {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let is_in_text_selection = self
+            .editor
+            .update(cx, |editor, cx| editor.is_range_selected(&self.range, cx))
+            .unwrap_or_default();
+        ButtonLike::new(("loading-context", self.id))
+            .style(ButtonStyle::Filled)
+            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+            .toggle_state(is_in_text_selection)
+            .when_some(self.image.clone(), |el, image_task| {
+                el.hoverable_tooltip(move |_, cx| {
+                    let image = image_task.peek().cloned().transpose().ok().flatten();
+                    let image_task = image_task.clone();
+                    cx.new::<ImageHover>(|cx| ImageHover {
+                        image,
+                        _task: cx.spawn(async move |this, cx| {
+                            if let Ok(image) = image_task.clone().await {
+                                this.update(cx, |this, cx| {
+                                    if this.image.replace(image).is_none() {
+                                        cx.notify();
+                                    }
+                                })
+                                .ok();
+                            }
+                        }),
+                    })
+                    .into()
+                })
+            })
+            .child(
+                h_flex()
+                    .gap_1()
+                    .child(
+                        Icon::from_path(self.icon.clone())
+                            .size(IconSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .child(
+                        Label::new(self.label.clone())
+                            .size(LabelSize::Small)
+                            .buffer_font(cx)
+                            .single_line(),
+                    )
+                    .map(|el| {
+                        if self.loading.is_some() {
+                            el.with_animation(
+                                "loading-context-crease",
+                                Animation::new(Duration::from_secs(2))
+                                    .repeat()
+                                    .with_easing(pulsating_between(0.4, 0.8)),
+                                |label, delta| label.opacity(delta),
+                            )
+                            .into_any()
+                        } else {
+                            el.into_any()
+                        }
+                    }),
+            )
+    }
 }
 
 struct ImageHover {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 87928767c6..3ad3ecbf61 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -277,6 +277,7 @@ pub struct AcpThreadView {
     terminal_expanded: bool,
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
+    is_loading_contents: bool,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
 }
@@ -389,6 +390,7 @@ impl AcpThreadView {
             history_store,
             hovered_recent_history_item: None,
             prompt_capabilities,
+            is_loading_contents: false,
             _subscriptions: subscriptions,
             _cancel_task: None,
             focus_handle: cx.focus_handle(),
@@ -823,6 +825,11 @@ impl AcpThreadView {
 
     fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let Some(thread) = self.thread() else { return };
+
+        if self.is_loading_contents {
+            return;
+        }
+
         self.history_store.update(cx, |history, cx| {
             history.push_recently_opened_entry(
                 HistoryEntryId::AcpThread(thread.read(cx).session_id().clone()),
@@ -876,6 +883,15 @@ impl AcpThreadView {
         let Some(thread) = self.thread().cloned() else {
             return;
         };
+
+        self.is_loading_contents = true;
+        let guard = cx.new(|_| ());
+        cx.observe_release(&guard, |this, _guard, cx| {
+            this.is_loading_contents = false;
+            cx.notify();
+        })
+        .detach();
+
         let task = cx.spawn_in(window, async move |this, cx| {
             let (contents, tracked_buffers) = contents.await?;
 
@@ -896,6 +912,7 @@ impl AcpThreadView {
                         action_log.buffer_read(buffer, cx)
                     }
                 });
+                drop(guard);
                 thread.send(contents, cx)
             })?;
             send.await
@@ -950,19 +967,24 @@ impl AcpThreadView {
         let Some(thread) = self.thread().cloned() else {
             return;
         };
+        if self.is_loading_contents {
+            return;
+        }
 
-        let Some(rewind) = thread.update(cx, |thread, cx| {
-            let user_message_id = thread.entries().get(entry_ix)?.user_message()?.id.clone()?;
-            Some(thread.rewind(user_message_id, cx))
+        let Some(user_message_id) = thread.update(cx, |thread, _| {
+            thread.entries().get(entry_ix)?.user_message()?.id.clone()
         }) else {
             return;
         };
 
         let contents = message_editor.update(cx, |message_editor, cx| message_editor.contents(cx));
 
-        let task = cx.foreground_executor().spawn(async move {
-            rewind.await?;
-            contents.await
+        let task = cx.spawn(async move |_, cx| {
+            let contents = contents.await?;
+            thread
+                .update(cx, |thread, cx| thread.rewind(user_message_id, cx))?
+                .await?;
+            Ok(contents)
         });
         self.send_impl(task, window, cx);
     }
@@ -1341,25 +1363,34 @@ impl AcpThreadView {
                                         base_container
                                             .child(
                                                 IconButton::new("cancel", IconName::Close)
+                                                    .disabled(self.is_loading_contents)
                                                     .icon_color(Color::Error)
                                                     .icon_size(IconSize::XSmall)
                                                     .on_click(cx.listener(Self::cancel_editing))
                                             )
                                             .child(
-                                                IconButton::new("regenerate", IconName::Return)
-                                                    .icon_color(Color::Muted)
-                                                    .icon_size(IconSize::XSmall)
-                                                    .tooltip(Tooltip::text(
-                                                        "Editing will restart the thread from this point."
-                                                    ))
-                                                    .on_click(cx.listener({
-                                                        let editor = editor.clone();
-                                                        move |this, _, window, cx| {
-                                                            this.regenerate(
-                                                                entry_ix, &editor, window, cx,
-                                                            );
-                                                        }
-                                                    })),
+                                                if self.is_loading_contents {
+                                                    div()
+                                                        .id("loading-edited-message-content")
+                                                        .tooltip(Tooltip::text("Loading Added Context…"))
+                                                        .child(loading_contents_spinner(IconSize::XSmall))
+                                                        .into_any_element()
+                                                } else {
+                                                    IconButton::new("regenerate", IconName::Return)
+                                                        .icon_color(Color::Muted)
+                                                        .icon_size(IconSize::XSmall)
+                                                        .tooltip(Tooltip::text(
+                                                            "Editing will restart the thread from this point."
+                                                        ))
+                                                        .on_click(cx.listener({
+                                                            let editor = editor.clone();
+                                                            move |this, _, window, cx| {
+                                                                this.regenerate(
+                                                                    entry_ix, &editor, window, cx,
+                                                                );
+                                                            }
+                                                        })).into_any_element()
+                                                }
                                             )
                                     )
                                 } else {
@@ -3542,7 +3573,14 @@ impl AcpThreadView {
             .thread()
             .is_some_and(|thread| thread.read(cx).status() != ThreadStatus::Idle);
 
-        if is_generating && is_editor_empty {
+        if self.is_loading_contents {
+            div()
+                .id("loading-message-content")
+                .px_1()
+                .tooltip(Tooltip::text("Loading Added Context…"))
+                .child(loading_contents_spinner(IconSize::default()))
+                .into_any_element()
+        } else if is_generating && is_editor_empty {
             IconButton::new("stop-generation", IconName::Stop)
                 .icon_color(Color::Error)
                 .style(ButtonStyle::Tinted(ui::TintColor::Error))
@@ -4643,6 +4681,18 @@ impl AcpThreadView {
     }
 }
 
+fn loading_contents_spinner(size: IconSize) -> AnyElement {
+    Icon::new(IconName::LoadCircle)
+        .size(size)
+        .color(Color::Accent)
+        .with_animation(
+            "load_context_circle",
+            Animation::new(Duration::from_secs(3)).repeat(),
+            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+        )
+        .into_any_element()
+}
+
 impl Focusable for AcpThreadView {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         match self.thread_state {

From 1b91f3de41bf86c1792d9bd4a8677a222ca4d903 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sat, 23 Aug 2025 20:02:23 -0400
Subject: [PATCH 323/823] acp: Fix accidentally reverted thread view changes
 (#36825)

Merge conflict resolution for #36741 accidentally reverted the changes
in #36670 to allow expanding terminals individually and in #36675 to
allow collapsing edit cards. This PR re-applies those changes, fixing
the regression.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 27 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 3ad3ecbf61..d62ccf4cef 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -274,7 +274,6 @@ pub struct AcpThreadView {
     edits_expanded: bool,
     plan_expanded: bool,
     editor_expanded: bool,
-    terminal_expanded: bool,
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     is_loading_contents: bool,
@@ -386,7 +385,6 @@ impl AcpThreadView {
             edits_expanded: false,
             plan_expanded: false,
             editor_expanded: false,
-            terminal_expanded: true,
             history_store,
             hovered_recent_history_item: None,
             prompt_capabilities,
@@ -1722,10 +1720,9 @@ impl AcpThreadView {
             matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
         let use_card_layout = needs_confirmation || is_edit;
 
-        let is_collapsible = !tool_call.content.is_empty() && !use_card_layout;
+        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;
 
-        let is_open =
-            needs_confirmation || is_edit || self.expanded_tool_calls.contains(&tool_call.id);
+        let is_open = needs_confirmation || self.expanded_tool_calls.contains(&tool_call.id);
 
         let gradient_overlay = |color: Hsla| {
             div()
@@ -2195,6 +2192,8 @@ impl AcpThreadView {
             .map(|path| format!("{}", path.display()))
             .unwrap_or_else(|| "current directory".to_string());
 
+        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
+
         let header = h_flex()
             .id(SharedString::from(format!(
                 "terminal-tool-header-{}",
@@ -2328,21 +2327,27 @@ impl AcpThreadView {
                         "terminal-tool-disclosure-{}",
                         terminal.entity_id()
                     )),
-                    self.terminal_expanded,
+                    is_expanded,
                 )
                 .opened_icon(IconName::ChevronUp)
                 .closed_icon(IconName::ChevronDown)
-                .on_click(cx.listener(move |this, _event, _window, _cx| {
-                    this.terminal_expanded = !this.terminal_expanded;
-                })),
-            );
+                .on_click(cx.listener({
+                    let id = tool_call.id.clone();
+                    move |this, _event, _window, _cx| {
+                        if is_expanded {
+                            this.expanded_tool_calls.remove(&id);
+                        } else {
+                            this.expanded_tool_calls.insert(id.clone());
+                        }
+                    }})),
+                );
 
         let terminal_view = self
             .entry_view_state
             .read(cx)
             .entry(entry_ix)
             .and_then(|entry| entry.terminal(terminal));
-        let show_output = self.terminal_expanded && terminal_view.is_some();
+        let show_output = is_expanded && terminal_view.is_some();
 
         v_flex()
             .mb_2()

From de5f87e8f24eea848baa07fa733134b76a96dbce Mon Sep 17 00:00:00 2001
From: versecafe <147033096+versecafe@users.noreply.github.com>
Date: Sat, 23 Aug 2025 23:54:47 -0700
Subject: [PATCH 324/823] languages: Add `module` to TS/JS keywords (#36830)

<img width="376" height="166" alt="image"
src="https://github.com/user-attachments/assets/ae32d74c-387b-4809-a0d6-cfa97888347d"
/>


Release Notes:

- Improved syntax highlights for `module` keyword in TS/JS
---
 crates/languages/src/javascript/highlights.scm | 3 ++-
 crates/languages/src/tsx/highlights.scm        | 3 ++-
 crates/languages/src/typescript/highlights.scm | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/languages/src/javascript/highlights.scm b/crates/languages/src/javascript/highlights.scm
index 9d5ebbaf71..ebeac7efff 100644
--- a/crates/languages/src/javascript/highlights.scm
+++ b/crates/languages/src/javascript/highlights.scm
@@ -231,6 +231,7 @@
   "implements"
   "interface"
   "keyof"
+  "module"
   "namespace"
   "private"
   "protected"
@@ -250,4 +251,4 @@
 (jsx_closing_element (["</" ">"]) @punctuation.bracket.jsx)
 (jsx_self_closing_element (["<" "/>"]) @punctuation.bracket.jsx)
 (jsx_attribute "=" @punctuation.delimiter.jsx)
-(jsx_text) @text.jsx
\ No newline at end of file
+(jsx_text) @text.jsx
diff --git a/crates/languages/src/tsx/highlights.scm b/crates/languages/src/tsx/highlights.scm
index 5e2fbbf63a..f7cb987831 100644
--- a/crates/languages/src/tsx/highlights.scm
+++ b/crates/languages/src/tsx/highlights.scm
@@ -237,6 +237,7 @@
   "implements"
   "interface"
   "keyof"
+  "module"
   "namespace"
   "private"
   "protected"
@@ -256,4 +257,4 @@
 (jsx_closing_element (["</" ">"]) @punctuation.bracket.jsx)
 (jsx_self_closing_element (["<" "/>"]) @punctuation.bracket.jsx)
 (jsx_attribute "=" @punctuation.delimiter.jsx)
-(jsx_text) @text.jsx
\ No newline at end of file
+(jsx_text) @text.jsx
diff --git a/crates/languages/src/typescript/highlights.scm b/crates/languages/src/typescript/highlights.scm
index af37ef6415..84cbbae77d 100644
--- a/crates/languages/src/typescript/highlights.scm
+++ b/crates/languages/src/typescript/highlights.scm
@@ -248,6 +248,7 @@
   "is"
   "keyof"
   "let"
+  "module"
   "namespace"
   "new"
   "of"
@@ -272,4 +273,4 @@
   "while"
   "with"
   "yield"
-] @keyword
\ No newline at end of file
+] @keyword

From dd6fce6d4eafdc6b2463e28af029a3e92b41e39f Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Sun, 24 Aug 2025 09:59:32 +0300
Subject: [PATCH 325/823] multi_buffer: Pre-allocate IDs when editing (#36819)

Something I came across when looking at `edit_internal`. Potentially
saves multiple re-allocations on an edit

Release Notes:

- N/A
---
 crates/multi_buffer/src/multi_buffer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index a54d38163d..e27cbf868a 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -835,7 +835,7 @@ impl MultiBuffer {
                 this.convert_edits_to_buffer_edits(edits, &snapshot, &original_indent_columns);
             drop(snapshot);
 
-            let mut buffer_ids = Vec::new();
+            let mut buffer_ids = Vec::with_capacity(buffer_edits.len());
             for (buffer_id, mut edits) in buffer_edits {
                 buffer_ids.push(buffer_id);
                 edits.sort_by_key(|edit| edit.range.start);

From 54c7d9dc5fc915cf979d2df8f514ebd4b8f3fb2d Mon Sep 17 00:00:00 2001
From: Chuqiao Feng <mzx2689@gmail.com>
Date: Sun, 24 Aug 2025 19:01:42 +0800
Subject: [PATCH 326/823] Fix crash when opening inspector on Windows debug
 build (#36829)

---
 Cargo.lock                               | 1 +
 crates/inspector_ui/Cargo.toml           | 1 +
 crates/inspector_ui/src/div_inspector.rs | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0575796034..c835b503ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8468,6 +8468,7 @@ dependencies = [
  "theme",
  "ui",
  "util",
+ "util_macros",
  "workspace",
  "workspace-hack",
  "zed_actions",
diff --git a/crates/inspector_ui/Cargo.toml b/crates/inspector_ui/Cargo.toml
index 8e55a8a477..cefe888974 100644
--- a/crates/inspector_ui/Cargo.toml
+++ b/crates/inspector_ui/Cargo.toml
@@ -24,6 +24,7 @@ serde_json_lenient.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
+util_macros.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
diff --git a/crates/inspector_ui/src/div_inspector.rs b/crates/inspector_ui/src/div_inspector.rs
index 0c2b16b9f4..c3d687e57a 100644
--- a/crates/inspector_ui/src/div_inspector.rs
+++ b/crates/inspector_ui/src/div_inspector.rs
@@ -25,7 +25,7 @@ use util::split_str_with_ranges;
 
 /// Path used for unsaved buffer that contains style json. To support the json language server, this
 /// matches the name used in the generated schemas.
-const ZED_INSPECTOR_STYLE_JSON: &str = "/zed-inspector-style.json";
+const ZED_INSPECTOR_STYLE_JSON: &str = util_macros::path!("/zed-inspector-style.json");
 
 pub(crate) struct DivInspector {
     state: State,

From d8bffd7ef298ccf6017e25299ce8d9d0bc1ba4aa Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Sun, 24 Aug 2025 13:05:39 +0200
Subject: [PATCH 327/823] acp: Cancel editing when focus is lost and message
 was not changed (#36822)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs       |  2 +-
 crates/agent_ui/src/acp/message_editor.rs | 16 ++++++++++------
 crates/agent_ui/src/acp/thread_view.rs    | 13 +++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index c748f22275..029d175054 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -509,7 +509,7 @@ impl ContentBlock {
         "`Image`".into()
     }
 
-    fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
+    pub fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
         match self {
             ContentBlock::Empty => "",
             ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index bab42e3da2..70faa0ed27 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -74,6 +74,7 @@ pub enum MessageEditorEvent {
     Send,
     Cancel,
     Focus,
+    LostFocus,
 }
 
 impl EventEmitter<MessageEditorEvent> for MessageEditor {}
@@ -131,10 +132,14 @@ impl MessageEditor {
             editor
         });
 
-        cx.on_focus(&editor.focus_handle(cx), window, |_, _, cx| {
+        cx.on_focus_in(&editor.focus_handle(cx), window, |_, _, cx| {
             cx.emit(MessageEditorEvent::Focus)
         })
         .detach();
+        cx.on_focus_out(&editor.focus_handle(cx), window, |_, _, _, cx| {
+            cx.emit(MessageEditorEvent::LostFocus)
+        })
+        .detach();
 
         let mut subscriptions = Vec::new();
         subscriptions.push(cx.subscribe_in(&editor, window, {
@@ -1169,17 +1174,16 @@ impl MessageEditor {
         })
     }
 
+    pub fn text(&self, cx: &App) -> String {
+        self.editor.read(cx).text(cx)
+    }
+
     #[cfg(test)]
     pub fn set_text(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
         self.editor.update(cx, |editor, cx| {
             editor.set_text(text, window, cx);
         });
     }
-
-    #[cfg(test)]
-    pub fn text(&self, cx: &App) -> String {
-        self.editor.read(cx).text(cx)
-    }
 }
 
 fn render_directory_contents(entries: Vec<(Arc<Path>, PathBuf, String)>) -> String {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index d62ccf4cef..9caa4bad8c 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -762,6 +762,7 @@ impl AcpThreadView {
             MessageEditorEvent::Focus => {
                 self.cancel_editing(&Default::default(), window, cx);
             }
+            MessageEditorEvent::LostFocus => {}
         }
     }
 
@@ -793,6 +794,18 @@ impl AcpThreadView {
                     cx.notify();
                 }
             }
+            ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::LostFocus) => {
+                if let Some(thread) = self.thread()
+                    && let Some(AgentThreadEntry::UserMessage(user_message)) =
+                        thread.read(cx).entries().get(event.entry_index)
+                    && user_message.id.is_some()
+                {
+                    if editor.read(cx).text(cx).as_str() == user_message.content.to_markdown(cx) {
+                        self.editing_message = None;
+                        cx.notify();
+                    }
+                }
+            }
             ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::Send) => {
                 self.regenerate(event.entry_index, editor, window, cx);
             }

From a79aef7bdd38668215f1e916ef866f029ba8d9cb Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sun, 24 Aug 2025 18:30:34 +0200
Subject: [PATCH 328/823] acp: Never build a request with a tool use without
 its corresponding result (#36847)

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs | 76 ++++++++++++++++++++++++++++++++++
 crates/agent2/src/thread.rs    | 74 ++++++++++++++++-----------------
 2 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 60b3198081..5b935dae4c 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -4,6 +4,7 @@ use agent_client_protocol::{self as acp};
 use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, UserStore};
+use cloud_llm_client::CompletionIntent;
 use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use fs::{FakeFs, Fs};
 use futures::{
@@ -1737,6 +1738,81 @@ async fn test_title_generation(cx: &mut TestAppContext) {
     thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
 }
 
+#[gpui::test]
+async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
+    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let _events = thread
+        .update(cx, |thread, cx| {
+            thread.add_tool(ToolRequiringPermission);
+            thread.add_tool(EchoTool);
+            thread.send(UserMessageId::new(), ["Hey!"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    let permission_tool_use = LanguageModelToolUse {
+        id: "tool_id_1".into(),
+        name: ToolRequiringPermission::name().into(),
+        raw_input: "{}".into(),
+        input: json!({}),
+        is_input_complete: true,
+    };
+    let echo_tool_use = LanguageModelToolUse {
+        id: "tool_id_2".into(),
+        name: EchoTool::name().into(),
+        raw_input: json!({"text": "test"}).to_string(),
+        input: json!({"text": "test"}),
+        is_input_complete: true,
+    };
+    fake_model.send_last_completion_stream_text_chunk("Hi!");
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        permission_tool_use,
+    ));
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        echo_tool_use.clone(),
+    ));
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // Ensure pending tools are skipped when building a request.
+    let request = thread
+        .read_with(cx, |thread, cx| {
+            thread.build_completion_request(CompletionIntent::EditFile, cx)
+        })
+        .unwrap();
+    assert_eq!(
+        request.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Hey!".into()],
+                cache: true
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![
+                    MessageContent::Text("Hi!".into()),
+                    MessageContent::ToolUse(echo_tool_use.clone())
+                ],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::ToolResult(LanguageModelToolResult {
+                    tool_use_id: echo_tool_use.id.clone(),
+                    tool_name: echo_tool_use.name,
+                    is_error: false,
+                    content: "test".into(),
+                    output: Some("test".into())
+                })],
+                cache: false
+            },
+        ],
+    );
+}
+
 #[gpui::test]
 async fn test_agent_connection(cx: &mut TestAppContext) {
     cx.update(settings::init);
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 6d616f73fc..c000027368 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -448,24 +448,33 @@ impl AgentMessage {
             cache: false,
         };
         for chunk in &self.content {
-            let chunk = match chunk {
+            match chunk {
                 AgentMessageContent::Text(text) => {
-                    language_model::MessageContent::Text(text.clone())
+                    assistant_message
+                        .content
+                        .push(language_model::MessageContent::Text(text.clone()));
                 }
                 AgentMessageContent::Thinking { text, signature } => {
-                    language_model::MessageContent::Thinking {
-                        text: text.clone(),
-                        signature: signature.clone(),
-                    }
+                    assistant_message
+                        .content
+                        .push(language_model::MessageContent::Thinking {
+                            text: text.clone(),
+                            signature: signature.clone(),
+                        });
                 }
                 AgentMessageContent::RedactedThinking(value) => {
-                    language_model::MessageContent::RedactedThinking(value.clone())
+                    assistant_message.content.push(
+                        language_model::MessageContent::RedactedThinking(value.clone()),
+                    );
                 }
-                AgentMessageContent::ToolUse(value) => {
-                    language_model::MessageContent::ToolUse(value.clone())
+                AgentMessageContent::ToolUse(tool_use) => {
+                    if self.tool_results.contains_key(&tool_use.id) {
+                        assistant_message
+                            .content
+                            .push(language_model::MessageContent::ToolUse(tool_use.clone()));
+                    }
                 }
             };
-            assistant_message.content.push(chunk);
         }
 
         let mut user_message = LanguageModelRequestMessage {
@@ -1315,23 +1324,6 @@ impl Thread {
         }
     }
 
-    pub fn build_system_message(&self, cx: &App) -> LanguageModelRequestMessage {
-        log::debug!("Building system message");
-        let prompt = SystemPromptTemplate {
-            project: self.project_context.read(cx),
-            available_tools: self.tools.keys().cloned().collect(),
-        }
-        .render(&self.templates)
-        .context("failed to build system prompt")
-        .expect("Invalid template");
-        log::debug!("System message built");
-        LanguageModelRequestMessage {
-            role: Role::System,
-            content: vec![prompt.into()],
-            cache: true,
-        }
-    }
-
     /// A helper method that's called on every streamed completion event.
     /// Returns an optional tool result task, which the main agentic loop will
     /// send back to the model when it resolves.
@@ -1773,7 +1765,7 @@ impl Thread {
     pub(crate) fn build_completion_request(
         &self,
         completion_intent: CompletionIntent,
-        cx: &mut App,
+        cx: &App,
     ) -> Result<LanguageModelRequest> {
         let model = self.model().context("No language model configured")?;
         let tools = if let Some(turn) = self.running_turn.as_ref() {
@@ -1894,21 +1886,29 @@ impl Thread {
             "Building request messages from {} thread messages",
             self.messages.len()
         );
-        let mut messages = vec![self.build_system_message(cx)];
+
+        let system_prompt = SystemPromptTemplate {
+            project: self.project_context.read(cx),
+            available_tools: self.tools.keys().cloned().collect(),
+        }
+        .render(&self.templates)
+        .context("failed to build system prompt")
+        .expect("Invalid template");
+        let mut messages = vec![LanguageModelRequestMessage {
+            role: Role::System,
+            content: vec![system_prompt.into()],
+            cache: false,
+        }];
         for message in &self.messages {
             messages.extend(message.to_request());
         }
 
-        if let Some(message) = self.pending_message.as_ref() {
-            messages.extend(message.to_request());
+        if let Some(last_message) = messages.last_mut() {
+            last_message.cache = true;
         }
 
-        if let Some(last_user_message) = messages
-            .iter_mut()
-            .rev()
-            .find(|message| message.role == Role::User)
-        {
-            last_user_message.cache = true;
+        if let Some(message) = self.pending_message.as_ref() {
+            messages.extend(message.to_request());
         }
 
         messages

From 11545c669e100392a8ca60063476037ab52c7cb5 Mon Sep 17 00:00:00 2001
From: Aleksei Gusev <aleksei.gusev@gmail.com>
Date: Sun, 24 Aug 2025 19:57:12 +0300
Subject: [PATCH 329/823] Add file icons to multibuffer view (#36836)

<img width="1988" height="1420" alt="multi-buffer-icons-git-diff"
src="https://github.com/user-attachments/assets/48f9722f-ca09-4aa7-ad7a-0b7e85f440d9"
/>

Unfortunately, `cargo format` decided to reformat everything. Probably,
because of hitting the right margin, no idea. The essence of this change
is the following:

```rust
.map(|path_header| {
    let filename = filename
        .map(SharedString::from)
        .unwrap_or_else(|| "untitled".into());
    let path = path::Path::new(filename.as_str());
    let icon =
        FileIcons::get_icon(path, cx).unwrap_or_default();
    let icon = Icon::from_path(icon).color(Color::Muted);

    let label = Label::new(filename).single_line().when_some(
        file_status,
        |el, status| {
            el.color(if status.is_conflicted() {
                Color::Conflict
            } else if status.is_modified() {
                Color::Modified
            } else if status.is_deleted() {
                Color::Disabled
            } else {
                Color::Created
            })
            .when(status.is_deleted(), |el| el.strikethrough())
        },
    );

    path_header.child(icon).child(label)
})
```

Release Notes:

- Added file icons to multi buffer view
---
 crates/editor/src/element.rs | 339 ++++++++++++++++++-----------------
 1 file changed, 175 insertions(+), 164 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 32582ba941..4f3580da07 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -74,7 +74,7 @@ use std::{
     fmt::{self, Write},
     iter, mem,
     ops::{Deref, Range},
-    path::Path,
+    path::{self, Path},
     rc::Rc,
     sync::Arc,
     time::{Duration, Instant},
@@ -90,8 +90,8 @@ use unicode_segmentation::UnicodeSegmentation;
 use util::post_inc;
 use util::{RangeExt, ResultExt, debug_panic};
 use workspace::{
-    CollaboratorId, OpenInTerminal, OpenTerminal, RevealInProjectPanel, Workspace, item::Item,
-    notifications::NotifyTaskExt,
+    CollaboratorId, ItemSettings, OpenInTerminal, OpenTerminal, RevealInProjectPanel, Workspace,
+    item::Item, notifications::NotifyTaskExt,
 };
 
 /// Determines what kinds of highlights should be applied to a lines background.
@@ -3603,176 +3603,187 @@ impl EditorElement {
         let focus_handle = editor.focus_handle(cx);
         let colors = cx.theme().colors();
 
-        let header =
-            div()
-                .p_1()
-                .w_full()
-                .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
-                .child(
-                    h_flex()
-                        .size_full()
-                        .gap_2()
-                        .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
-                        .pl_0p5()
-                        .pr_5()
-                        .rounded_sm()
-                        .when(is_sticky, |el| el.shadow_md())
-                        .border_1()
-                        .map(|div| {
-                            let border_color = if is_selected
-                                && is_folded
-                                && focus_handle.contains_focused(window, cx)
-                            {
-                                colors.border_focused
-                            } else {
-                                colors.border
-                            };
-                            div.border_color(border_color)
-                        })
-                        .bg(colors.editor_subheader_background)
-                        .hover(|style| style.bg(colors.element_hover))
-                        .map(|header| {
-                            let editor = self.editor.clone();
-                            let buffer_id = for_excerpt.buffer_id;
-                            let toggle_chevron_icon =
-                                FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
-                            header.child(
-                                div()
-                                    .hover(|style| style.bg(colors.element_selected))
-                                    .rounded_xs()
-                                    .child(
-                                        ButtonLike::new("toggle-buffer-fold")
-                                            .style(ui::ButtonStyle::Transparent)
-                                            .height(px(28.).into())
-                                            .width(px(28.))
-                                            .children(toggle_chevron_icon)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |window, cx| {
-                                                    Tooltip::with_meta_in(
-                                                        "Toggle Excerpt Fold",
-                                                        Some(&ToggleFold),
-                                                        "Alt+click to toggle all",
-                                                        &focus_handle,
+        let header = div()
+            .p_1()
+            .w_full()
+            .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
+            .child(
+                h_flex()
+                    .size_full()
+                    .gap_2()
+                    .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
+                    .pl_0p5()
+                    .pr_5()
+                    .rounded_sm()
+                    .when(is_sticky, |el| el.shadow_md())
+                    .border_1()
+                    .map(|div| {
+                        let border_color = if is_selected
+                            && is_folded
+                            && focus_handle.contains_focused(window, cx)
+                        {
+                            colors.border_focused
+                        } else {
+                            colors.border
+                        };
+                        div.border_color(border_color)
+                    })
+                    .bg(colors.editor_subheader_background)
+                    .hover(|style| style.bg(colors.element_hover))
+                    .map(|header| {
+                        let editor = self.editor.clone();
+                        let buffer_id = for_excerpt.buffer_id;
+                        let toggle_chevron_icon =
+                            FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
+                        header.child(
+                            div()
+                                .hover(|style| style.bg(colors.element_selected))
+                                .rounded_xs()
+                                .child(
+                                    ButtonLike::new("toggle-buffer-fold")
+                                        .style(ui::ButtonStyle::Transparent)
+                                        .height(px(28.).into())
+                                        .width(px(28.))
+                                        .children(toggle_chevron_icon)
+                                        .tooltip({
+                                            let focus_handle = focus_handle.clone();
+                                            move |window, cx| {
+                                                Tooltip::with_meta_in(
+                                                    "Toggle Excerpt Fold",
+                                                    Some(&ToggleFold),
+                                                    "Alt+click to toggle all",
+                                                    &focus_handle,
+                                                    window,
+                                                    cx,
+                                                )
+                                            }
+                                        })
+                                        .on_click(move |event, window, cx| {
+                                            if event.modifiers().alt {
+                                                // Alt+click toggles all buffers
+                                                editor.update(cx, |editor, cx| {
+                                                    editor.toggle_fold_all(
+                                                        &ToggleFoldAll,
                                                         window,
                                                         cx,
-                                                    )
-                                                }
-                                            })
-                                            .on_click(move |event, window, cx| {
-                                                if event.modifiers().alt {
-                                                    // Alt+click toggles all buffers
+                                                    );
+                                                });
+                                            } else {
+                                                // Regular click toggles single buffer
+                                                if is_folded {
                                                     editor.update(cx, |editor, cx| {
-                                                        editor.toggle_fold_all(
-                                                            &ToggleFoldAll,
-                                                            window,
-                                                            cx,
-                                                        );
+                                                        editor.unfold_buffer(buffer_id, cx);
                                                     });
                                                 } else {
-                                                    // Regular click toggles single buffer
-                                                    if is_folded {
-                                                        editor.update(cx, |editor, cx| {
-                                                            editor.unfold_buffer(buffer_id, cx);
-                                                        });
-                                                    } else {
-                                                        editor.update(cx, |editor, cx| {
-                                                            editor.fold_buffer(buffer_id, cx);
-                                                        });
-                                                    }
+                                                    editor.update(cx, |editor, cx| {
+                                                        editor.fold_buffer(buffer_id, cx);
+                                                    });
                                                 }
-                                            }),
-                                    ),
-                            )
-                        })
-                        .children(
-                            editor
-                                .addons
-                                .values()
-                                .filter_map(|addon| {
-                                    addon.render_buffer_header_controls(for_excerpt, window, cx)
-                                })
-                                .take(1),
+                                            }
+                                        }),
+                                ),
                         )
-                        .child(
-                            h_flex()
-                                .size(Pixels(12.0))
-                                .justify_center()
-                                .children(indicator),
-                        )
-                        .child(
-                            h_flex()
-                                .cursor_pointer()
-                                .id("path header block")
-                                .size_full()
-                                .justify_between()
-                                .overflow_hidden()
-                                .child(
-                                    h_flex()
-                                        .gap_2()
-                                        .child(
-                                            Label::new(
-                                                filename
-                                                    .map(SharedString::from)
-                                                    .unwrap_or_else(|| "untitled".into()),
-                                            )
-                                            .single_line()
-                                            .when_some(file_status, |el, status| {
-                                                el.color(if status.is_conflicted() {
-                                                    Color::Conflict
-                                                } else if status.is_modified() {
-                                                    Color::Modified
-                                                } else if status.is_deleted() {
-                                                    Color::Disabled
-                                                } else {
-                                                    Color::Created
-                                                })
-                                                .when(status.is_deleted(), |el| el.strikethrough())
-                                            }),
-                                        )
-                                        .when_some(parent_path, |then, path| {
-                                            then.child(div().child(path).text_color(
-                                                if file_status.is_some_and(FileStatus::is_deleted) {
-                                                    colors.text_disabled
-                                                } else {
-                                                    colors.text_muted
+                    })
+                    .children(
+                        editor
+                            .addons
+                            .values()
+                            .filter_map(|addon| {
+                                addon.render_buffer_header_controls(for_excerpt, window, cx)
+                            })
+                            .take(1),
+                    )
+                    .child(
+                        h_flex()
+                            .size(Pixels(12.0))
+                            .justify_center()
+                            .children(indicator),
+                    )
+                    .child(
+                        h_flex()
+                            .cursor_pointer()
+                            .id("path header block")
+                            .size_full()
+                            .justify_between()
+                            .overflow_hidden()
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .map(|path_header| {
+                                        let filename = filename
+                                            .map(SharedString::from)
+                                            .unwrap_or_else(|| "untitled".into());
+
+                                        path_header
+                                            .when(ItemSettings::get_global(cx).file_icons, |el| {
+                                                let path = path::Path::new(filename.as_str());
+                                                let icon = FileIcons::get_icon(path, cx)
+                                                    .unwrap_or_default();
+                                                let icon =
+                                                    Icon::from_path(icon).color(Color::Muted);
+                                                el.child(icon)
+                                            })
+                                            .child(Label::new(filename).single_line().when_some(
+                                                file_status,
+                                                |el, status| {
+                                                    el.color(if status.is_conflicted() {
+                                                        Color::Conflict
+                                                    } else if status.is_modified() {
+                                                        Color::Modified
+                                                    } else if status.is_deleted() {
+                                                        Color::Disabled
+                                                    } else {
+                                                        Color::Created
+                                                    })
+                                                    .when(status.is_deleted(), |el| {
+                                                        el.strikethrough()
+                                                    })
                                                 },
                                             ))
-                                        }),
-                                )
-                                .when(
-                                    can_open_excerpts && is_selected && relative_path.is_some(),
-                                    |el| {
-                                        el.child(
-                                            h_flex()
-                                                .id("jump-to-file-button")
-                                                .gap_2p5()
-                                                .child(Label::new("Jump To File"))
-                                                .children(
-                                                    KeyBinding::for_action_in(
-                                                        &OpenExcerpts,
-                                                        &focus_handle,
-                                                        window,
-                                                        cx,
-                                                    )
-                                                    .map(|binding| binding.into_any_element()),
-                                                ),
-                                        )
-                                    },
-                                )
-                                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                                .on_click(window.listener_for(&self.editor, {
-                                    move |editor, e: &ClickEvent, window, cx| {
-                                        editor.open_excerpts_common(
-                                            Some(jump_data.clone()),
-                                            e.modifiers().secondary(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                })),
-                        ),
-                );
+                                    })
+                                    .when_some(parent_path, |then, path| {
+                                        then.child(div().child(path).text_color(
+                                            if file_status.is_some_and(FileStatus::is_deleted) {
+                                                colors.text_disabled
+                                            } else {
+                                                colors.text_muted
+                                            },
+                                        ))
+                                    }),
+                            )
+                            .when(
+                                can_open_excerpts && is_selected && relative_path.is_some(),
+                                |el| {
+                                    el.child(
+                                        h_flex()
+                                            .id("jump-to-file-button")
+                                            .gap_2p5()
+                                            .child(Label::new("Jump To File"))
+                                            .children(
+                                                KeyBinding::for_action_in(
+                                                    &OpenExcerpts,
+                                                    &focus_handle,
+                                                    window,
+                                                    cx,
+                                                )
+                                                .map(|binding| binding.into_any_element()),
+                                            ),
+                                    )
+                                },
+                            )
+                            .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
+                            .on_click(window.listener_for(&self.editor, {
+                                move |editor, e: &ClickEvent, window, cx| {
+                                    editor.open_excerpts_common(
+                                        Some(jump_data.clone()),
+                                        e.modifiers().secondary(),
+                                        window,
+                                        cx,
+                                    );
+                                }
+                            })),
+                    ),
+            );
 
         let file = for_excerpt.buffer.file().cloned();
         let editor = self.editor.clone();

From c48197b2804a17ecf8ec46781985d4f9cff35e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hendrik=20M=C3=BCller?=
 <henne90gen@users.noreply.github.com>
Date: Mon, 25 Aug 2025 11:28:33 +0200
Subject: [PATCH 330/823] util: Fix edge case when parsing paths (#36025)

Searching for files broke a couple releases ago. It used to be possible
to start typing part of a file name, then select a file (not confirm it
yet) and then type in `:` and a line number to navigate directly to that
line.
The current behavior can be seen in the following screenshots. When the
`:` is typed, the selection is lost, since no files match any more.
<img width="552" height="370" alt="Screenshot From 2025-08-12 10-36-08"
src="https://github.com/user-attachments/assets/e4b4b613-7f0c-40d7-94c9-04d8ab541656"
/>
<img width="553" height="124" alt="Screenshot From 2025-08-12 10-36-25"
src="https://github.com/user-attachments/assets/843e9ecf-9e08-4fa6-9340-0388a957cbb2"
/>
<img width="549" height="370" alt="Screenshot From 2025-08-12 10-36-47"
src="https://github.com/user-attachments/assets/4a1bbbd8-268a-4ea8-999f-6cef1eb34a45"
/>

---

With this PR, the previous behavior is restored and can be seen in these
screenshots:

<img width="552" height="370" alt="Screenshot From 2025-08-12 10-36-08"
src="https://github.com/user-attachments/assets/466e1906-4735-47ae-a699-117bdd6490ca"
/>
<img width="549" height="370" alt="Screenshot From 2025-08-12 10-47-07"
src="https://github.com/user-attachments/assets/17f3acda-662d-4962-9eb8-4b494f211d26"
/>
<img width="549" height="370" alt="Screenshot From 2025-08-12 10-47-21"
src="https://github.com/user-attachments/assets/d98447fe-7377-4f4f-b3da-f690cd44c141"
/>

---

Release Notes:

- Adjusted the file finder to show matching file paths when adding the
`:row:column` to the query
---
 crates/file_finder/src/file_finder.rs       |  9 ++--
 crates/file_finder/src/file_finder_tests.rs | 48 +++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 8aaaa04729..7512152324 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1401,13 +1401,16 @@ impl PickerDelegate for FileFinderDelegate {
             #[cfg(windows)]
             let raw_query = raw_query.trim().to_owned().replace("/", "\\");
             #[cfg(not(windows))]
-            let raw_query = raw_query.trim().to_owned();
+            let raw_query = raw_query.trim();
 
-            let file_query_end = if path_position.path.to_str().unwrap_or(&raw_query) == raw_query {
+            let raw_query = raw_query.trim_end_matches(':').to_owned();
+            let path = path_position.path.to_str();
+            let path_trimmed = path.unwrap_or(&raw_query).trim_end_matches(':');
+            let file_query_end = if path_trimmed == raw_query {
                 None
             } else {
                 // Safe to unwrap as we won't get here when the unwrap in if fails
-                Some(path_position.path.to_str().unwrap().len())
+                Some(path.unwrap().len())
             };
 
             let query = FileSearchQuery {
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 8203d1b1fd..cd0f203d6a 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -218,6 +218,7 @@ async fn test_matching_paths(cx: &mut TestAppContext) {
         " ndan ",
         " band ",
         "a bandana",
+        "bandana:",
     ] {
         picker
             .update_in(cx, |picker, window, cx| {
@@ -252,6 +253,53 @@ async fn test_matching_paths(cx: &mut TestAppContext) {
     }
 }
 
+#[gpui::test]
+async fn test_matching_paths_with_colon(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            path!("/root"),
+            json!({
+                "a": {
+                    "foo:bar.rs": "",
+                    "foo.rs": "",
+                }
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
+
+    let (picker, _, cx) = build_find_picker(project, cx);
+
+    // 'foo:' matches both files
+    cx.simulate_input("foo:");
+    picker.update(cx, |picker, _| {
+        assert_eq!(picker.delegate.matches.len(), 3);
+        assert_match_at_position(picker, 0, "foo.rs");
+        assert_match_at_position(picker, 1, "foo:bar.rs");
+    });
+
+    // 'foo:b' matches one of the files
+    cx.simulate_input("b");
+    picker.update(cx, |picker, _| {
+        assert_eq!(picker.delegate.matches.len(), 2);
+        assert_match_at_position(picker, 0, "foo:bar.rs");
+    });
+
+    cx.dispatch_action(editor::actions::Backspace);
+
+    // 'foo:1' matches both files, specifying which row to jump to
+    cx.simulate_input("1");
+    picker.update(cx, |picker, _| {
+        assert_eq!(picker.delegate.matches.len(), 3);
+        assert_match_at_position(picker, 0, "foo.rs");
+        assert_match_at_position(picker, 1, "foo:bar.rs");
+    });
+}
+
 #[gpui::test]
 async fn test_unicode_paths(cx: &mut TestAppContext) {
     let app_state = init_test(cx);

From fe5e81203f03e86ada3397b1738b9f0f79801368 Mon Sep 17 00:00:00 2001
From: versecafe <147033096+versecafe@users.noreply.github.com>
Date: Mon, 25 Aug 2025 03:55:56 -0700
Subject: [PATCH 331/823] Fix macOS arch reporting from `arch_ios` to
 `arch_arm` (#36217)

```xml
<key>arch_kind</key>
<string>arch_arm</string>
```

Closes #36037

Release Notes:

- N/A
---
 crates/zed/resources/info/SupportedPlatforms.plist | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 crates/zed/resources/info/SupportedPlatforms.plist

diff --git a/crates/zed/resources/info/SupportedPlatforms.plist b/crates/zed/resources/info/SupportedPlatforms.plist
new file mode 100644
index 0000000000..fd2a4101d8
--- /dev/null
+++ b/crates/zed/resources/info/SupportedPlatforms.plist
@@ -0,0 +1,4 @@
+<key>CFBundleSupportedPlatforms</key>
+<array>
+    <string>MacOSX</string>
+</array>

From dfc99de7b8c3796ded1c5ec73b585f85ef7bc783 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:18:23 -0300
Subject: [PATCH 332/823] thread view: Add a few UI tweaks (#36845)

Release Notes:

- N/A
---
 assets/icons/copy.svg                  |  5 +-
 crates/agent_ui/src/acp/thread_view.rs | 76 +++++++++++---------------
 crates/markdown/src/markdown.rs        | 11 ++--
 3 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg
index bca13f8d56..aba193930b 100644
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12.286 6H7.048C6.469 6 6 6.469 6 7.048v5.238c0 .578.469 1.047 1.048 1.047h5.238c.578 0 1.047-.469 1.047-1.047V7.048c0-.579-.469-1.048-1.047-1.048Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.714 10a1.05 1.05 0 0 1-1.047-1.048V3.714a1.05 1.05 0 0 1 1.047-1.047h5.238A1.05 1.05 0 0 1 10 3.714"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.486 6.2H7.24795C6.66895 6.2 6.19995 6.669 6.19995 7.248V12.486C6.19995 13.064 6.66895 13.533 7.24795 13.533H12.486C13.064 13.533 13.533 13.064 13.533 12.486V7.248C13.533 6.669 13.064 6.2 12.486 6.2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.91712 10.203C3.63951 10.2022 3.37351 10.0915 3.1773 9.89511C2.98109 9.69872 2.87064 9.43261 2.87012 9.155V3.917C2.87091 3.63956 2.98147 3.37371 3.17765 3.17753C3.37383 2.98135 3.63968 2.87079 3.91712 2.87H9.15512C9.43273 2.87053 9.69883 2.98097 9.89523 3.17718C10.0916 3.37339 10.2023 3.63939 10.2031 3.917" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 9caa4bad8c..0b987e25b6 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1306,7 +1306,11 @@ impl AcpThreadView {
 
                 v_flex()
                     .id(("user_message", entry_ix))
-                    .pt_2()
+                    .map(|this| if rules_item.is_some() {
+                        this.pt_3()
+                    } else {
+                        this.pt_2()
+                    })
                     .pb_4()
                     .px_2()
                     .gap_1p5()
@@ -1315,6 +1319,7 @@ impl AcpThreadView {
                     .children(message.id.clone().and_then(|message_id| {
                         message.checkpoint.as_ref()?.show.then(|| {
                             h_flex()
+                                .px_3()
                                 .gap_2()
                                 .child(Divider::horizontal())
                                 .child(
@@ -1492,9 +1497,7 @@ impl AcpThreadView {
                 .child(self.render_thread_controls(cx))
                 .when_some(
                     self.thread_feedback.comments_editor.clone(),
-                    |this, editor| {
-                        this.child(Self::render_feedback_feedback_editor(editor, window, cx))
-                    },
+                    |this, editor| this.child(Self::render_feedback_feedback_editor(editor, cx)),
                 )
                 .into_any_element()
         } else {
@@ -1725,6 +1728,7 @@ impl AcpThreadView {
             tool_call.status,
             ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed
         );
+
         let needs_confirmation = matches!(
             tool_call.status,
             ToolCallStatus::WaitingForConfirmation { .. }
@@ -1742,7 +1746,7 @@ impl AcpThreadView {
                 .absolute()
                 .top_0()
                 .right_0()
-                .w_16()
+                .w_12()
                 .h_full()
                 .bg(linear_gradient(
                     90.,
@@ -1902,7 +1906,7 @@ impl AcpThreadView {
                                     .into_any()
                             }),
                     )
-                    .when(in_progress && use_card_layout, |this| {
+                    .when(in_progress && use_card_layout && !is_open, |this| {
                         this.child(
                             div().absolute().right_2().child(
                                 Icon::new(IconName::ArrowCircle)
@@ -2460,7 +2464,6 @@ impl AcpThreadView {
         Some(
             h_flex()
                 .px_2p5()
-                .pb_1()
                 .child(
                     Icon::new(IconName::Attach)
                         .size(IconSize::XSmall)
@@ -2476,8 +2479,7 @@ impl AcpThreadView {
                                 Label::new(user_rules_text)
                                     .size(LabelSize::XSmall)
                                     .color(Color::Muted)
-                                    .truncate()
-                                    .buffer_font(cx),
+                                    .truncate(),
                             )
                             .hover(|s| s.bg(cx.theme().colors().element_hover))
                             .tooltip(Tooltip::text("View User Rules"))
@@ -2491,7 +2493,13 @@ impl AcpThreadView {
                             }),
                     )
                 })
-                .when(has_both, |this| this.child(Divider::vertical()))
+                .when(has_both, |this| {
+                    this.child(
+                        Label::new("•")
+                            .size(LabelSize::XSmall)
+                            .color(Color::Disabled),
+                    )
+                })
                 .when_some(rules_file_text, |parent, rules_file_text| {
                     parent.child(
                         h_flex()
@@ -2500,8 +2508,7 @@ impl AcpThreadView {
                             .child(
                                 Label::new(rules_file_text)
                                     .size(LabelSize::XSmall)
-                                    .color(Color::Muted)
-                                    .buffer_font(cx),
+                                    .color(Color::Muted),
                             )
                             .hover(|s| s.bg(cx.theme().colors().element_hover))
                             .tooltip(Tooltip::text("View Project Rules"))
@@ -3078,13 +3085,13 @@ impl AcpThreadView {
         h_flex()
             .p_1()
             .justify_between()
+            .flex_wrap()
             .when(expanded, |this| {
                 this.border_b_1().border_color(cx.theme().colors().border)
             })
             .child(
                 h_flex()
                     .id("edits-container")
-                    .w_full()
                     .gap_1()
                     .child(Disclosure::new("edits-disclosure", expanded))
                     .map(|this| {
@@ -4177,13 +4184,8 @@ impl AcpThreadView {
         container.child(open_as_markdown).child(scroll_to_top)
     }
 
-    fn render_feedback_feedback_editor(
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let focus_handle = editor.focus_handle(cx);
-        v_flex()
+    fn render_feedback_feedback_editor(editor: Entity<Editor>, cx: &Context<Self>) -> Div {
+        h_flex()
             .key_context("AgentFeedbackMessageEditor")
             .on_action(cx.listener(move |this, _: &menu::Cancel, _, cx| {
                 this.thread_feedback.dismiss_comments();
@@ -4192,43 +4194,31 @@ impl AcpThreadView {
             .on_action(cx.listener(move |this, _: &menu::Confirm, _window, cx| {
                 this.submit_feedback_message(cx);
             }))
-            .mb_2()
-            .mx_4()
             .p_2()
+            .mb_2()
+            .mx_5()
+            .gap_1()
             .rounded_md()
             .border_1()
             .border_color(cx.theme().colors().border)
             .bg(cx.theme().colors().editor_background)
-            .child(editor)
+            .child(div().w_full().child(editor))
             .child(
                 h_flex()
-                    .gap_1()
-                    .justify_end()
                     .child(
-                        Button::new("dismiss-feedback-message", "Cancel")
-                            .label_size(LabelSize::Small)
-                            .key_binding(
-                                KeyBinding::for_action_in(&menu::Cancel, &focus_handle, window, cx)
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                            )
+                        IconButton::new("dismiss-feedback-message", IconName::Close)
+                            .icon_color(Color::Error)
+                            .icon_size(IconSize::XSmall)
+                            .shape(ui::IconButtonShape::Square)
                             .on_click(cx.listener(move |this, _, _window, cx| {
                                 this.thread_feedback.dismiss_comments();
                                 cx.notify();
                             })),
                     )
                     .child(
-                        Button::new("submit-feedback-message", "Share Feedback")
-                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                            .label_size(LabelSize::Small)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &menu::Confirm,
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(10.))),
-                            )
+                        IconButton::new("submit-feedback-message", IconName::Return)
+                            .icon_size(IconSize::XSmall)
+                            .shape(ui::IconButtonShape::Square)
                             .on_click(cx.listener(move |this, _, _window, cx| {
                                 this.submit_feedback_message(cx);
                             })),
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 39a438c512..f16da45d79 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -1085,10 +1085,10 @@ impl Element for MarkdownElement {
                                 );
                                 el.child(
                                     h_flex()
-                                        .w_5()
+                                        .w_4()
                                         .absolute()
-                                        .top_1()
-                                        .right_1()
+                                        .top_1p5()
+                                        .right_1p5()
                                         .justify_end()
                                         .child(codeblock),
                                 )
@@ -1115,11 +1115,12 @@ impl Element for MarkdownElement {
                                     cx,
                                 );
                                 el.child(
-                                    div()
+                                    h_flex()
+                                        .w_4()
                                         .absolute()
                                         .top_0()
                                         .right_0()
-                                        .w_5()
+                                        .justify_end()
                                         .visible_on_hover("code_block")
                                         .child(codeblock),
                                 )

From 8c83281399d013aab4415b4e425063be5a02b89e Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 25 Aug 2025 08:23:36 -0400
Subject: [PATCH 333/823] acp: Fix read_file tool flickering (#36854)

We were rendering a Markdown link like `[Read file x.rs (lines
Y-Z)](@selection)` while the tool ran, but then switching to just `x.rs`
as soon as we got the file location from the tool call (due to an
if/else in the UI code that applies to all tools). This caused a
flicker, which is fixed by having `initial_title` return just the
filename from the input as it arrives instead of a link that we're going
to stop rendering almost immediately anyway.

Release Notes:

- N/A
---
 crates/agent2/src/tools/read_file_tool.rs | 29 ++++++-----------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index 903e1582ac..fea9732093 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -10,7 +10,7 @@ use project::{AgentLocation, ImageItem, Project, WorktreeSettings, image_store};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
-use std::sync::Arc;
+use std::{path::Path, sync::Arc};
 
 use crate::{AgentTool, ToolCallEventStream};
 
@@ -68,27 +68,12 @@ impl AgentTool for ReadFileTool {
     }
 
     fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
-        if let Ok(input) = input {
-            let path = &input.path;
-            match (input.start_line, input.end_line) {
-                (Some(start), Some(end)) => {
-                    format!(
-                        "[Read file `{}` (lines {}-{})](@selection:{}:({}-{}))",
-                        path, start, end, path, start, end
-                    )
-                }
-                (Some(start), None) => {
-                    format!(
-                        "[Read file `{}` (from line {})](@selection:{}:({}-{}))",
-                        path, start, path, start, start
-                    )
-                }
-                _ => format!("[Read file `{}`](@file:{})", path, path),
-            }
-            .into()
-        } else {
-            "Read file".into()
-        }
+        input
+            .ok()
+            .as_ref()
+            .and_then(|input| Path::new(&input.path).file_name())
+            .map(|file_name| file_name.to_string_lossy().to_string().into())
+            .unwrap_or_default()
     }
 
     fn run(

From 4c0ad95acc50c8bc509e5845991c811dbcf1a513 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 25 Aug 2025 14:52:25 +0200
Subject: [PATCH 334/823] acp: Show retry button for errors (#36862)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/acp_thread/src/acp_thread.rs    |   6 +-
 crates/acp_thread/src/connection.rs    |   8 +-
 crates/agent2/src/agent.rs             |   8 +-
 crates/agent2/src/tests/mod.rs         |  98 ++++++++++++++++---
 crates/agent2/src/thread.rs            | 124 +++++++++++++------------
 crates/agent_ui/src/acp/thread_view.rs |  46 ++++++++-
 6 files changed, 212 insertions(+), 78 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 029d175054..d9a7a2582a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1373,6 +1373,10 @@ impl AcpThread {
         })
     }
 
+    pub fn can_resume(&self, cx: &App) -> bool {
+        self.connection.resume(&self.session_id, cx).is_some()
+    }
+
     pub fn resume(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
         self.run_turn(cx, async move |this, cx| {
             this.update(cx, |this, cx| {
@@ -2659,7 +2663,7 @@ mod tests {
         fn truncate(
             &self,
             session_id: &acp::SessionId,
-            _cx: &mut App,
+            _cx: &App,
         ) -> Option<Rc<dyn AgentSessionTruncate>> {
             Some(Rc::new(FakeAgentSessionEditor {
                 _session_id: session_id.clone(),
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 91e46dbac1..5f5032e588 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -43,7 +43,7 @@ pub trait AgentConnection {
     fn resume(
         &self,
         _session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
     ) -> Option<Rc<dyn AgentSessionResume>> {
         None
     }
@@ -53,7 +53,7 @@ pub trait AgentConnection {
     fn truncate(
         &self,
         _session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
     ) -> Option<Rc<dyn AgentSessionTruncate>> {
         None
     }
@@ -61,7 +61,7 @@ pub trait AgentConnection {
     fn set_title(
         &self,
         _session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
     ) -> Option<Rc<dyn AgentSessionSetTitle>> {
         None
     }
@@ -439,7 +439,7 @@ mod test_support {
         fn truncate(
             &self,
             _session_id: &agent_client_protocol::SessionId,
-            _cx: &mut App,
+            _cx: &App,
         ) -> Option<Rc<dyn AgentSessionTruncate>> {
             Some(Rc::new(StubAgentSessionEditor))
         }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 4eaf87e218..415933b7d1 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -936,7 +936,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
     fn resume(
         &self,
         session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
     ) -> Option<Rc<dyn acp_thread::AgentSessionResume>> {
         Some(Rc::new(NativeAgentSessionResume {
             connection: self.clone(),
@@ -956,9 +956,9 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
     fn truncate(
         &self,
         session_id: &agent_client_protocol::SessionId,
-        cx: &mut App,
+        cx: &App,
     ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
-        self.0.update(cx, |agent, _cx| {
+        self.0.read_with(cx, |agent, _cx| {
             agent.sessions.get(session_id).map(|session| {
                 Rc::new(NativeAgentSessionEditor {
                     thread: session.thread.clone(),
@@ -971,7 +971,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
     fn set_title(
         &self,
         session_id: &acp::SessionId,
-        _cx: &mut App,
+        _cx: &App,
     ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
         Some(Rc::new(NativeAgentSessionSetTitle {
             connection: self.clone(),
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 5b935dae4c..87ecc1037c 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -5,6 +5,7 @@ use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, UserStore};
 use cloud_llm_client::CompletionIntent;
+use collections::IndexMap;
 use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use fs::{FakeFs, Fs};
 use futures::{
@@ -673,15 +674,6 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
             "}
         )
     });
-
-    // Ensure we error if calling resume when tool use limit was *not* reached.
-    let error = thread
-        .update(cx, |thread, cx| thread.resume(cx))
-        .unwrap_err();
-    assert_eq!(
-        error.to_string(),
-        "can only resume after tool use limit is reached"
-    )
 }
 
 #[gpui::test]
@@ -2105,6 +2097,7 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
         .unwrap();
     cx.run_until_parked();
 
+    fake_model.send_last_completion_stream_text_chunk("Hey,");
     fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
         provider: LanguageModelProviderName::new("Anthropic"),
         retry_after: Some(Duration::from_secs(3)),
@@ -2114,8 +2107,9 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
     cx.executor().advance_clock(Duration::from_secs(3));
     cx.run_until_parked();
 
-    fake_model.send_last_completion_stream_text_chunk("Hey!");
+    fake_model.send_last_completion_stream_text_chunk("there!");
     fake_model.end_last_completion_stream();
+    cx.run_until_parked();
 
     let mut retry_events = Vec::new();
     while let Some(Ok(event)) = events.next().await {
@@ -2143,12 +2137,94 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
 
                 ## Assistant
 
-                Hey!
+                Hey,
+
+                [resume]
+
+                ## Assistant
+
+                there!
             "}
         )
     });
 }
 
+#[gpui::test]
+async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
+    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
+    let fake_model = model.as_fake();
+
+    let events = thread
+        .update(cx, |thread, cx| {
+            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
+            thread.add_tool(EchoTool);
+            thread.send(UserMessageId::new(), ["Call the echo tool!"], cx)
+        })
+        .unwrap();
+    cx.run_until_parked();
+
+    let tool_use_1 = LanguageModelToolUse {
+        id: "tool_1".into(),
+        name: EchoTool::name().into(),
+        raw_input: json!({"text": "test"}).to_string(),
+        input: json!({"text": "test"}),
+        is_input_complete: true,
+    };
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
+        tool_use_1.clone(),
+    ));
+    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
+        provider: LanguageModelProviderName::new("Anthropic"),
+        retry_after: Some(Duration::from_secs(3)),
+    });
+    fake_model.end_last_completion_stream();
+
+    cx.executor().advance_clock(Duration::from_secs(3));
+    let completion = fake_model.pending_completions().pop().unwrap();
+    assert_eq!(
+        completion.messages[1..],
+        vec![
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec!["Call the echo tool!".into()],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::Assistant,
+                content: vec![language_model::MessageContent::ToolUse(tool_use_1.clone())],
+                cache: false
+            },
+            LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![language_model::MessageContent::ToolResult(
+                    LanguageModelToolResult {
+                        tool_use_id: tool_use_1.id.clone(),
+                        tool_name: tool_use_1.name.clone(),
+                        is_error: false,
+                        content: "test".into(),
+                        output: Some("test".into())
+                    }
+                )],
+                cache: true
+            },
+        ]
+    );
+
+    fake_model.send_last_completion_stream_text_chunk("Done");
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+    events.collect::<Vec<_>>().await;
+    thread.read_with(cx, |thread, _cx| {
+        assert_eq!(
+            thread.last_message(),
+            Some(Message::Agent(AgentMessage {
+                content: vec![AgentMessageContent::Text("Done".into())],
+                tool_results: IndexMap::default()
+            }))
+        );
+    })
+}
+
 #[gpui::test]
 async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
     let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index c000027368..43f391ca64 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -123,7 +123,7 @@ impl Message {
         match self {
             Message::User(message) => message.to_markdown(),
             Message::Agent(message) => message.to_markdown(),
-            Message::Resume => "[resumed after tool use limit was reached]".into(),
+            Message::Resume => "[resume]\n".into(),
         }
     }
 
@@ -1085,11 +1085,6 @@ impl Thread {
         &mut self,
         cx: &mut Context<Self>,
     ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
-        anyhow::ensure!(
-            self.tool_use_limit_reached,
-            "can only resume after tool use limit is reached"
-        );
-
         self.messages.push(Message::Resume);
         cx.notify();
 
@@ -1216,12 +1211,13 @@ impl Thread {
         cx: &mut AsyncApp,
     ) -> Result<()> {
         log::debug!("Stream completion started successfully");
-        let request = this.update(cx, |this, cx| {
-            this.build_completion_request(completion_intent, cx)
-        })??;
 
         let mut attempt = None;
-        'retry: loop {
+        loop {
+            let request = this.update(cx, |this, cx| {
+                this.build_completion_request(completion_intent, cx)
+            })??;
+
             telemetry::event!(
                 "Agent Thread Completion",
                 thread_id = this.read_with(cx, |this, _| this.id.to_string())?,
@@ -1236,10 +1232,11 @@ impl Thread {
                 attempt.unwrap_or(0)
             );
             let mut events = model
-                .stream_completion(request.clone(), cx)
+                .stream_completion(request, cx)
                 .await
                 .map_err(|error| anyhow!(error))?;
             let mut tool_results = FuturesUnordered::new();
+            let mut error = None;
 
             while let Some(event) = events.next().await {
                 match event {
@@ -1249,51 +1246,9 @@ impl Thread {
                             this.handle_streamed_completion_event(event, event_stream, cx)
                         })??);
                     }
-                    Err(error) => {
-                        let completion_mode =
-                            this.read_with(cx, |thread, _cx| thread.completion_mode())?;
-                        if completion_mode == CompletionMode::Normal {
-                            return Err(anyhow!(error))?;
-                        }
-
-                        let Some(strategy) = Self::retry_strategy_for(&error) else {
-                            return Err(anyhow!(error))?;
-                        };
-
-                        let max_attempts = match &strategy {
-                            RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
-                            RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
-                        };
-
-                        let attempt = attempt.get_or_insert(0u8);
-
-                        *attempt += 1;
-
-                        let attempt = *attempt;
-                        if attempt > max_attempts {
-                            return Err(anyhow!(error))?;
-                        }
-
-                        let delay = match &strategy {
-                            RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
-                                let delay_secs =
-                                    initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
-                                Duration::from_secs(delay_secs)
-                            }
-                            RetryStrategy::Fixed { delay, .. } => *delay,
-                        };
-                        log::debug!("Retry attempt {attempt} with delay {delay:?}");
-
-                        event_stream.send_retry(acp_thread::RetryStatus {
-                            last_error: error.to_string().into(),
-                            attempt: attempt as usize,
-                            max_attempts: max_attempts as usize,
-                            started_at: Instant::now(),
-                            duration: delay,
-                        });
-
-                        cx.background_executor().timer(delay).await;
-                        continue 'retry;
+                    Err(err) => {
+                        error = Some(err);
+                        break;
                     }
                 }
             }
@@ -1320,7 +1275,58 @@ impl Thread {
                 })?;
             }
 
-            return Ok(());
+            if let Some(error) = error {
+                let completion_mode = this.read_with(cx, |thread, _cx| thread.completion_mode())?;
+                if completion_mode == CompletionMode::Normal {
+                    return Err(anyhow!(error))?;
+                }
+
+                let Some(strategy) = Self::retry_strategy_for(&error) else {
+                    return Err(anyhow!(error))?;
+                };
+
+                let max_attempts = match &strategy {
+                    RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
+                    RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
+                };
+
+                let attempt = attempt.get_or_insert(0u8);
+
+                *attempt += 1;
+
+                let attempt = *attempt;
+                if attempt > max_attempts {
+                    return Err(anyhow!(error))?;
+                }
+
+                let delay = match &strategy {
+                    RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
+                        let delay_secs = initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
+                        Duration::from_secs(delay_secs)
+                    }
+                    RetryStrategy::Fixed { delay, .. } => *delay,
+                };
+                log::debug!("Retry attempt {attempt} with delay {delay:?}");
+
+                event_stream.send_retry(acp_thread::RetryStatus {
+                    last_error: error.to_string().into(),
+                    attempt: attempt as usize,
+                    max_attempts: max_attempts as usize,
+                    started_at: Instant::now(),
+                    duration: delay,
+                });
+                cx.background_executor().timer(delay).await;
+                this.update(cx, |this, cx| {
+                    this.flush_pending_message(cx);
+                    if let Some(Message::Agent(message)) = this.messages.last() {
+                        if message.tool_results.is_empty() {
+                            this.messages.push(Message::Resume);
+                        }
+                    }
+                })?;
+            } else {
+                return Ok(());
+            }
         }
     }
 
@@ -1737,6 +1743,10 @@ impl Thread {
             return;
         };
 
+        if message.content.is_empty() {
+            return;
+        }
+
         for content in &message.content {
             let AgentMessageContent::ToolUse(tool_use) = content else {
                 continue;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 0b987e25b6..5674b15c98 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -820,6 +820,9 @@ impl AcpThreadView {
         let Some(thread) = self.thread() else {
             return;
         };
+        if !thread.read(cx).can_resume(cx) {
+            return;
+        }
 
         let task = thread.update(cx, |thread, cx| thread.resume(cx));
         cx.spawn(async move |this, cx| {
@@ -4459,12 +4462,53 @@ impl AcpThreadView {
     }
 
     fn render_any_thread_error(&self, error: SharedString, cx: &mut Context<'_, Self>) -> Callout {
+        let can_resume = self
+            .thread()
+            .map_or(false, |thread| thread.read(cx).can_resume(cx));
+
+        let can_enable_burn_mode = self.as_native_thread(cx).map_or(false, |thread| {
+            let thread = thread.read(cx);
+            let supports_burn_mode = thread
+                .model()
+                .map_or(false, |model| model.supports_burn_mode());
+            supports_burn_mode && thread.completion_mode() == CompletionMode::Normal
+        });
+
         Callout::new()
             .severity(Severity::Error)
             .title("Error")
             .icon(IconName::XCircle)
             .description(error.clone())
-            .actions_slot(self.create_copy_button(error.to_string()))
+            .actions_slot(
+                h_flex()
+                    .gap_0p5()
+                    .when(can_resume && can_enable_burn_mode, |this| {
+                        this.child(
+                            Button::new("enable-burn-mode-and-retry", "Enable Burn Mode and Retry")
+                                .icon(IconName::ZedBurnMode)
+                                .icon_position(IconPosition::Start)
+                                .icon_size(IconSize::Small)
+                                .label_size(LabelSize::Small)
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
+                                    this.resume_chat(cx);
+                                })),
+                        )
+                    })
+                    .when(can_resume, |this| {
+                        this.child(
+                            Button::new("retry", "Retry")
+                                .icon(IconName::RotateCw)
+                                .icon_position(IconPosition::Start)
+                                .icon_size(IconSize::Small)
+                                .label_size(LabelSize::Small)
+                                .on_click(cx.listener(|this, _, _window, cx| {
+                                    this.resume_chat(cx);
+                                })),
+                        )
+                    })
+                    .child(self.create_copy_button(error.to_string())),
+            )
             .dismiss_action(self.dismiss_error_button(cx))
     }
 

From 2b5a3029727f6aa031f6771add3cc4a8cc85515a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:08:48 -0300
Subject: [PATCH 335/823] thread view: Prevent user message controls to be
 cut-off (#36865)

In the thread view, when focusing on the user message, we display the
editing control container absolutely-positioned in the top right.
However, if there are no rules items and no restore checkpoint button
_and_ it is the very first message, the editing controls container would
be cut-off. This PR fixes that by giving it a bit more top padding.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 5674b15c98..25f2745f75 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1305,14 +1305,23 @@ impl AcpThreadView {
                     None
                 };
 
+                let has_checkpoint_button = message
+                    .checkpoint
+                    .as_ref()
+                    .is_some_and(|checkpoint| checkpoint.show);
+
                 let agent_name = self.agent.name();
 
                 v_flex()
                     .id(("user_message", entry_ix))
-                    .map(|this| if rules_item.is_some() {
-                        this.pt_3()
-                    } else {
-                        this.pt_2()
+                    .map(|this| {
+                        if entry_ix == 0 && !has_checkpoint_button && rules_item.is_none()  {
+                            this.pt_4()
+                        } else if rules_item.is_some() {
+                            this.pt_3()
+                        } else {
+                            this.pt_2()
+                        }
                     })
                     .pb_4()
                     .px_2()

From db949546cf477818da206f12f5e0dfa45f2e038a Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 25 Aug 2025 15:14:48 +0200
Subject: [PATCH 336/823] agent2: Less noisy logs (#36863)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs               | 10 ++++-----
 crates/agent2/src/native_agent_server.rs |  4 ++--
 crates/agent2/src/thread.rs              | 26 ++++++++++++------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 415933b7d1..1576c3cf96 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -180,7 +180,7 @@ impl NativeAgent {
         fs: Arc<dyn Fs>,
         cx: &mut AsyncApp,
     ) -> Result<Entity<NativeAgent>> {
-        log::info!("Creating new NativeAgent");
+        log::debug!("Creating new NativeAgent");
 
         let project_context = cx
             .update(|cx| Self::build_project_context(&project, prompt_store.as_ref(), cx))?
@@ -756,7 +756,7 @@ impl NativeAgentConnection {
                 }
             }
 
-            log::info!("Response stream completed");
+            log::debug!("Response stream completed");
             anyhow::Ok(acp::PromptResponse {
                 stop_reason: acp::StopReason::EndTurn,
             })
@@ -781,7 +781,7 @@ impl AgentModelSelector for NativeAgentConnection {
         model_id: acp_thread::AgentModelId,
         cx: &mut App,
     ) -> Task<Result<()>> {
-        log::info!("Setting model for session {}: {}", session_id, model_id);
+        log::debug!("Setting model for session {}: {}", session_id, model_id);
         let Some(thread) = self
             .0
             .read(cx)
@@ -852,7 +852,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         cx: &mut App,
     ) -> Task<Result<Entity<acp_thread::AcpThread>>> {
         let agent = self.0.clone();
-        log::info!("Creating new thread for project at: {:?}", cwd);
+        log::debug!("Creating new thread for project at: {:?}", cwd);
 
         cx.spawn(async move |cx| {
             log::debug!("Starting thread creation in async context");
@@ -917,7 +917,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                 .into_iter()
                 .map(Into::into)
                 .collect::<Vec<_>>();
-            log::info!("Converted prompt to message: {} chars", content.len());
+            log::debug!("Converted prompt to message: {} chars", content.len());
             log::debug!("Message id: {:?}", id);
             log::debug!("Message content: {:?}", content);
 
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 12d3c79d1b..33ee44c9a3 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -44,7 +44,7 @@ impl AgentServer for NativeAgentServer {
         project: &Entity<Project>,
         cx: &mut App,
     ) -> Task<Result<Rc<dyn acp_thread::AgentConnection>>> {
-        log::info!(
+        log::debug!(
             "NativeAgentServer::connect called for path: {:?}",
             _root_dir
         );
@@ -63,7 +63,7 @@ impl AgentServer for NativeAgentServer {
 
             // Create the connection wrapper
             let connection = NativeAgentConnection(agent);
-            log::info!("NativeAgentServer connection established successfully");
+            log::debug!("NativeAgentServer connection established successfully");
 
             Ok(Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>)
         })
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 43f391ca64..4bbbdbdec7 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1088,7 +1088,7 @@ impl Thread {
         self.messages.push(Message::Resume);
         cx.notify();
 
-        log::info!("Total messages in thread: {}", self.messages.len());
+        log::debug!("Total messages in thread: {}", self.messages.len());
         self.run_turn(cx)
     }
 
@@ -1106,7 +1106,7 @@ impl Thread {
     {
         let model = self.model().context("No language model configured")?;
 
-        log::info!("Thread::send called with model: {:?}", model.name());
+        log::info!("Thread::send called with model: {}", model.name().0);
         self.advance_prompt_id();
 
         let content = content.into_iter().map(Into::into).collect::<Vec<_>>();
@@ -1116,7 +1116,7 @@ impl Thread {
             .push(Message::User(UserMessage { id, content }));
         cx.notify();
 
-        log::info!("Total messages in thread: {}", self.messages.len());
+        log::debug!("Total messages in thread: {}", self.messages.len());
         self.run_turn(cx)
     }
 
@@ -1140,7 +1140,7 @@ impl Thread {
             event_stream: event_stream.clone(),
             tools: self.enabled_tools(profile, &model, cx),
             _task: cx.spawn(async move |this, cx| {
-                log::info!("Starting agent turn execution");
+                log::debug!("Starting agent turn execution");
 
                 let turn_result: Result<()> = async {
                     let mut intent = CompletionIntent::UserPrompt;
@@ -1165,7 +1165,7 @@ impl Thread {
                             log::info!("Tool use limit reached, completing turn");
                             return Err(language_model::ToolUseLimitReachedError.into());
                         } else if end_turn {
-                            log::info!("No tool uses found, completing turn");
+                            log::debug!("No tool uses found, completing turn");
                             return Ok(());
                         } else {
                             intent = CompletionIntent::ToolResults;
@@ -1177,7 +1177,7 @@ impl Thread {
 
                 match turn_result {
                     Ok(()) => {
-                        log::info!("Turn execution completed");
+                        log::debug!("Turn execution completed");
                         event_stream.send_stop(acp::StopReason::EndTurn);
                     }
                     Err(error) => {
@@ -1227,7 +1227,7 @@ impl Thread {
                 attempt
             );
 
-            log::info!(
+            log::debug!(
                 "Calling model.stream_completion, attempt {}",
                 attempt.unwrap_or(0)
             );
@@ -1254,7 +1254,7 @@ impl Thread {
             }
 
             while let Some(tool_result) = tool_results.next().await {
-                log::info!("Tool finished {:?}", tool_result);
+                log::debug!("Tool finished {:?}", tool_result);
 
                 event_stream.update_tool_call_fields(
                     &tool_result.tool_use_id,
@@ -1528,7 +1528,7 @@ impl Thread {
         });
         let supports_images = self.model().is_some_and(|model| model.supports_images());
         let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
-        log::info!("Running tool {}", tool_use.name);
+        log::debug!("Running tool {}", tool_use.name);
         Some(cx.foreground_executor().spawn(async move {
             let tool_result = tool_result.await.and_then(|output| {
                 if let LanguageModelToolResultContent::Image(_) = &output.llm_output
@@ -1640,7 +1640,7 @@ impl Thread {
                 summary.extend(lines.next());
             }
 
-            log::info!("Setting summary: {}", summary);
+            log::debug!("Setting summary: {}", summary);
             let summary = SharedString::from(summary);
 
             this.update(cx, |this, cx| {
@@ -1657,7 +1657,7 @@ impl Thread {
             return;
         };
 
-        log::info!(
+        log::debug!(
             "Generating title with model: {:?}",
             self.summarization_model.as_ref().map(|model| model.name())
         );
@@ -1799,8 +1799,8 @@ impl Thread {
         log::debug!("Completion mode: {:?}", self.completion_mode);
 
         let messages = self.build_request_messages(cx);
-        log::info!("Request will include {} messages", messages.len());
-        log::info!("Request includes {} tools", tools.len());
+        log::debug!("Request will include {} messages", messages.len());
+        log::debug!("Request includes {} tools", tools.len());
 
         let request = LanguageModelRequest {
             thread_id: Some(self.id.to_string()),

From 69127d2beaf69900505c420adef9310a5aeb9694 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Mon, 25 Aug 2025 15:38:19 +0200
Subject: [PATCH 337/823] acp: Simplify control flow for native agent loop
 (#36868)

Release Notes:

- N/A

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/agent2/src/thread.rs | 164 ++++++++++++++++--------------------
 1 file changed, 73 insertions(+), 91 deletions(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 4bbbdbdec7..2d1e608297 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -1142,37 +1142,7 @@ impl Thread {
             _task: cx.spawn(async move |this, cx| {
                 log::debug!("Starting agent turn execution");
 
-                let turn_result: Result<()> = async {
-                    let mut intent = CompletionIntent::UserPrompt;
-                    loop {
-                        Self::stream_completion(&this, &model, intent, &event_stream, cx).await?;
-
-                        let mut end_turn = true;
-                        this.update(cx, |this, cx| {
-                            // Generate title if needed.
-                            if this.title.is_none() && this.pending_title_generation.is_none() {
-                                this.generate_title(cx);
-                            }
-
-                            // End the turn if the model didn't use tools.
-                            let message = this.pending_message.as_ref();
-                            end_turn =
-                                message.map_or(true, |message| message.tool_results.is_empty());
-                            this.flush_pending_message(cx);
-                        })?;
-
-                        if this.read_with(cx, |this, _| this.tool_use_limit_reached)? {
-                            log::info!("Tool use limit reached, completing turn");
-                            return Err(language_model::ToolUseLimitReachedError.into());
-                        } else if end_turn {
-                            log::debug!("No tool uses found, completing turn");
-                            return Ok(());
-                        } else {
-                            intent = CompletionIntent::ToolResults;
-                        }
-                    }
-                }
-                .await;
+                let turn_result = Self::run_turn_internal(&this, model, &event_stream, cx).await;
                 _ = this.update(cx, |this, cx| this.flush_pending_message(cx));
 
                 match turn_result {
@@ -1203,20 +1173,17 @@ impl Thread {
         Ok(events_rx)
     }
 
-    async fn stream_completion(
+    async fn run_turn_internal(
         this: &WeakEntity<Self>,
-        model: &Arc<dyn LanguageModel>,
-        completion_intent: CompletionIntent,
+        model: Arc<dyn LanguageModel>,
         event_stream: &ThreadEventStream,
         cx: &mut AsyncApp,
     ) -> Result<()> {
-        log::debug!("Stream completion started successfully");
-
-        let mut attempt = None;
+        let mut attempt = 0;
+        let mut intent = CompletionIntent::UserPrompt;
         loop {
-            let request = this.update(cx, |this, cx| {
-                this.build_completion_request(completion_intent, cx)
-            })??;
+            let request =
+                this.update(cx, |this, cx| this.build_completion_request(intent, cx))??;
 
             telemetry::event!(
                 "Agent Thread Completion",
@@ -1227,23 +1194,19 @@ impl Thread {
                 attempt
             );
 
-            log::debug!(
-                "Calling model.stream_completion, attempt {}",
-                attempt.unwrap_or(0)
-            );
+            log::debug!("Calling model.stream_completion, attempt {}", attempt);
             let mut events = model
                 .stream_completion(request, cx)
                 .await
                 .map_err(|error| anyhow!(error))?;
             let mut tool_results = FuturesUnordered::new();
             let mut error = None;
-
             while let Some(event) = events.next().await {
+                log::trace!("Received completion event: {:?}", event);
                 match event {
                     Ok(event) => {
-                        log::trace!("Received completion event: {:?}", event);
                         tool_results.extend(this.update(cx, |this, cx| {
-                            this.handle_streamed_completion_event(event, event_stream, cx)
+                            this.handle_completion_event(event, event_stream, cx)
                         })??);
                     }
                     Err(err) => {
@@ -1253,6 +1216,7 @@ impl Thread {
                 }
             }
 
+            let end_turn = tool_results.is_empty();
             while let Some(tool_result) = tool_results.next().await {
                 log::debug!("Tool finished {:?}", tool_result);
 
@@ -1275,65 +1239,83 @@ impl Thread {
                 })?;
             }
 
+            this.update(cx, |this, cx| {
+                this.flush_pending_message(cx);
+                if this.title.is_none() && this.pending_title_generation.is_none() {
+                    this.generate_title(cx);
+                }
+            })?;
+
             if let Some(error) = error {
-                let completion_mode = this.read_with(cx, |thread, _cx| thread.completion_mode())?;
-                if completion_mode == CompletionMode::Normal {
-                    return Err(anyhow!(error))?;
-                }
-
-                let Some(strategy) = Self::retry_strategy_for(&error) else {
-                    return Err(anyhow!(error))?;
-                };
-
-                let max_attempts = match &strategy {
-                    RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
-                    RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
-                };
-
-                let attempt = attempt.get_or_insert(0u8);
-
-                *attempt += 1;
-
-                let attempt = *attempt;
-                if attempt > max_attempts {
-                    return Err(anyhow!(error))?;
-                }
-
-                let delay = match &strategy {
-                    RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
-                        let delay_secs = initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
-                        Duration::from_secs(delay_secs)
-                    }
-                    RetryStrategy::Fixed { delay, .. } => *delay,
-                };
-                log::debug!("Retry attempt {attempt} with delay {delay:?}");
-
-                event_stream.send_retry(acp_thread::RetryStatus {
-                    last_error: error.to_string().into(),
-                    attempt: attempt as usize,
-                    max_attempts: max_attempts as usize,
-                    started_at: Instant::now(),
-                    duration: delay,
-                });
-                cx.background_executor().timer(delay).await;
-                this.update(cx, |this, cx| {
-                    this.flush_pending_message(cx);
+                attempt += 1;
+                let retry =
+                    this.update(cx, |this, _| this.handle_completion_error(error, attempt))??;
+                let timer = cx.background_executor().timer(retry.duration);
+                event_stream.send_retry(retry);
+                timer.await;
+                this.update(cx, |this, _cx| {
                     if let Some(Message::Agent(message)) = this.messages.last() {
                         if message.tool_results.is_empty() {
+                            intent = CompletionIntent::UserPrompt;
                             this.messages.push(Message::Resume);
                         }
                     }
                 })?;
-            } else {
+            } else if this.read_with(cx, |this, _| this.tool_use_limit_reached)? {
+                return Err(language_model::ToolUseLimitReachedError.into());
+            } else if end_turn {
                 return Ok(());
+            } else {
+                intent = CompletionIntent::ToolResults;
+                attempt = 0;
             }
         }
     }
 
+    fn handle_completion_error(
+        &mut self,
+        error: LanguageModelCompletionError,
+        attempt: u8,
+    ) -> Result<acp_thread::RetryStatus> {
+        if self.completion_mode == CompletionMode::Normal {
+            return Err(anyhow!(error));
+        }
+
+        let Some(strategy) = Self::retry_strategy_for(&error) else {
+            return Err(anyhow!(error));
+        };
+
+        let max_attempts = match &strategy {
+            RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
+            RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
+        };
+
+        if attempt > max_attempts {
+            return Err(anyhow!(error));
+        }
+
+        let delay = match &strategy {
+            RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
+                let delay_secs = initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
+                Duration::from_secs(delay_secs)
+            }
+            RetryStrategy::Fixed { delay, .. } => *delay,
+        };
+        log::debug!("Retry attempt {attempt} with delay {delay:?}");
+
+        Ok(acp_thread::RetryStatus {
+            last_error: error.to_string().into(),
+            attempt: attempt as usize,
+            max_attempts: max_attempts as usize,
+            started_at: Instant::now(),
+            duration: delay,
+        })
+    }
+
     /// A helper method that's called on every streamed completion event.
     /// Returns an optional tool result task, which the main agentic loop will
     /// send back to the model when it resolves.
-    fn handle_streamed_completion_event(
+    fn handle_completion_event(
         &mut self,
         event: LanguageModelCompletionEvent,
         event_stream: &ThreadEventStream,

From fda5111dc0239e3003d3c0d26346270c356cbc9f Mon Sep 17 00:00:00 2001
From: Zach Riegel <zjriegel@gmail.com>
Date: Mon, 25 Aug 2025 08:30:09 -0700
Subject: [PATCH 338/823] Add CSS language injections for calls to `styled`
 (#33966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…emotion).

Closes: https://github.com/zed-industries/zed/issues/17026

Release Notes:

- Added CSS language injection support for styled-components and emotion
in JavaScript, TypeScript, and TSX files.
---
 crates/languages/src/javascript/injections.scm | 15 +++++++++++++++
 crates/languages/src/tsx/injections.scm        | 15 +++++++++++++++
 crates/languages/src/typescript/injections.scm | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/crates/languages/src/javascript/injections.scm b/crates/languages/src/javascript/injections.scm
index 7baba5f227..dbec1937b1 100644
--- a/crates/languages/src/javascript/injections.scm
+++ b/crates/languages/src/javascript/injections.scm
@@ -11,6 +11,21 @@
                               (#set! injection.language "css"))
 )
 
+(call_expression
+  function: (member_expression
+    object: (identifier) @_obj (#eq? @_obj "styled")
+    property: (property_identifier))
+  arguments: (template_string (string_fragment) @injection.content
+                              (#set! injection.language "css"))
+)
+
+(call_expression
+  function: (call_expression
+    function: (identifier) @_name (#eq? @_name "styled"))
+  arguments: (template_string (string_fragment) @injection.content
+                              (#set! injection.language "css"))
+)
+
 (call_expression
   function: (identifier) @_name (#eq? @_name "html")
   arguments: (template_string) @injection.content
diff --git a/crates/languages/src/tsx/injections.scm b/crates/languages/src/tsx/injections.scm
index 48da80995b..9eec01cc89 100644
--- a/crates/languages/src/tsx/injections.scm
+++ b/crates/languages/src/tsx/injections.scm
@@ -11,6 +11,21 @@
                               (#set! injection.language "css"))
 )
 
+(call_expression
+  function: (member_expression
+    object: (identifier) @_obj (#eq? @_obj "styled")
+    property: (property_identifier))
+  arguments: (template_string (string_fragment) @injection.content
+                              (#set! injection.language "css"))
+)
+
+(call_expression
+  function: (call_expression
+    function: (identifier) @_name (#eq? @_name "styled"))
+  arguments: (template_string (string_fragment) @injection.content
+                              (#set! injection.language "css"))
+)
+
 (call_expression
   function: (identifier) @_name (#eq? @_name "html")
   arguments: (template_string (string_fragment) @injection.content
diff --git a/crates/languages/src/typescript/injections.scm b/crates/languages/src/typescript/injections.scm
index 7affdc5b75..1ca1e9ad59 100644
--- a/crates/languages/src/typescript/injections.scm
+++ b/crates/languages/src/typescript/injections.scm
@@ -15,6 +15,21 @@
                               (#set! injection.language "css"))
 )
 
+(call_expression
+  function: (member_expression
+    object: (identifier) @_obj (#eq? @_obj "styled")
+    property: (property_identifier))
+  arguments: (template_string (string_fragment) @injection.content
+                              (#set! injection.language "css"))
+)
+
+(call_expression
+  function: (call_expression
+    function: (identifier) @_name (#eq? @_name "styled"))
+  arguments: (template_string (string_fragment) @injection.content
+                              (#set! injection.language "css"))
+)
+
 (call_expression
   function: (identifier) @_name (#eq? @_name "html")
   arguments: (template_string) @injection.content

From 2fe3dbed31147cc869bdb01aea4b7fae57f5fdc8 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Mon, 25 Aug 2025 21:00:53 +0530
Subject: [PATCH 339/823] project: Remove redundant Option from
 parse_register_capabilities (#36874)

Release Notes:

- N/A
---
 crates/project/src/lsp_store.rs | 83 +++++++++++++++------------------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index d2958dce01..853490ddac 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11706,12 +11706,11 @@ impl LspStore {
                     // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
                 }
                 "workspace/symbol" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.workspace_symbol_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.workspace_symbol_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "workspace/fileOperations" => {
                     if let Some(options) = reg.register_options {
@@ -11735,12 +11734,11 @@ impl LspStore {
                     }
                 }
                 "textDocument/rangeFormatting" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.document_range_formatting_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.document_range_formatting_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/onTypeFormatting" => {
                     if let Some(options) = reg
@@ -11755,36 +11753,32 @@ impl LspStore {
                     }
                 }
                 "textDocument/formatting" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.document_formatting_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.document_formatting_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/rename" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.rename_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.rename_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/inlayHint" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.inlay_hint_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.inlay_hint_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/documentSymbol" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.document_symbol_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.document_symbol_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/codeAction" => {
                     if let Some(options) = reg
@@ -11800,12 +11794,11 @@ impl LspStore {
                     }
                 }
                 "textDocument/definition" => {
-                    if let Some(options) = parse_register_capabilities(reg)? {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.definition_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    server.update_capabilities(|capabilities| {
+                        capabilities.definition_provider = Some(options);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/completion" => {
                     if let Some(caps) = reg
@@ -12184,10 +12177,10 @@ impl LspStore {
 // https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/client.ts#L2133
 fn parse_register_capabilities<T: serde::de::DeserializeOwned>(
     reg: lsp::Registration,
-) -> anyhow::Result<Option<OneOf<bool, T>>> {
+) -> Result<OneOf<bool, T>> {
     Ok(match reg.register_options {
-        Some(options) => Some(OneOf::Right(serde_json::from_value::<T>(options)?)),
-        None => Some(OneOf::Left(true)),
+        Some(options) => OneOf::Right(serde_json::from_value::<T>(options)?),
+        None => OneOf::Left(true),
     })
 }
 

From 65fb17e2c9f817e7d7776cc406e3c7f3291fd24d Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 25 Aug 2025 09:34:30 -0600
Subject: [PATCH 340/823] acp: Remember following state (#36793)

A beta user reported that following was "lost" when asking for
confirmation, I
suspect they moved their cursor in the agent file while reviewing the
change.
Now we will resume following when the agent starts up again.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs    |  2 +-
 crates/agent_ui/src/acp/thread_view.rs | 73 ++++++++++++++++++++------
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index d9a7a2582a..cc33879586 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -774,7 +774,7 @@ pub enum AcpThreadEvent {
 
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
 
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum ThreadStatus {
     Idle,
     WaitingForToolConfirmation,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 25f2745f75..609777e2d1 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -274,6 +274,7 @@ pub struct AcpThreadView {
     edits_expanded: bool,
     plan_expanded: bool,
     editor_expanded: bool,
+    should_be_following: bool,
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     is_loading_contents: bool,
@@ -385,6 +386,7 @@ impl AcpThreadView {
             edits_expanded: false,
             plan_expanded: false,
             editor_expanded: false,
+            should_be_following: false,
             history_store,
             hovered_recent_history_item: None,
             prompt_capabilities,
@@ -897,6 +899,13 @@ impl AcpThreadView {
         let Some(thread) = self.thread().cloned() else {
             return;
         };
+        if self.should_be_following {
+            self.workspace
+                .update(cx, |workspace, cx| {
+                    workspace.follow(CollaboratorId::Agent, window, cx);
+                })
+                .ok();
+        }
 
         self.is_loading_contents = true;
         let guard = cx.new(|_| ());
@@ -938,6 +947,16 @@ impl AcpThreadView {
                     this.handle_thread_error(err, cx);
                 })
                 .ok();
+            } else {
+                this.update(cx, |this, cx| {
+                    this.should_be_following = this
+                        .workspace
+                        .update(cx, |workspace, _| {
+                            workspace.is_being_followed(CollaboratorId::Agent)
+                        })
+                        .unwrap_or_default();
+                })
+                .ok();
             }
         })
         .detach();
@@ -1254,6 +1273,7 @@ impl AcpThreadView {
         tool_call_id: acp::ToolCallId,
         option_id: acp::PermissionOptionId,
         option_kind: acp::PermissionOptionKind,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         let Some(thread) = self.thread() else {
@@ -1262,6 +1282,13 @@ impl AcpThreadView {
         thread.update(cx, |thread, cx| {
             thread.authorize_tool_call(tool_call_id, option_id, option_kind, cx);
         });
+        if self.should_be_following {
+            self.workspace
+                .update(cx, |workspace, cx| {
+                    workspace.follow(CollaboratorId::Agent, window, cx);
+                })
+                .ok();
+        }
         cx.notify();
     }
 
@@ -2095,11 +2122,12 @@ impl AcpThreadView {
                         let tool_call_id = tool_call_id.clone();
                         let option_id = option.id.clone();
                         let option_kind = option.kind;
-                        move |this, _, _, cx| {
+                        move |this, _, window, cx| {
                             this.authorize_tool_call(
                                 tool_call_id.clone(),
                                 option_id.clone(),
                                 option_kind,
+                                window,
                                 cx,
                             );
                         }
@@ -3652,13 +3680,34 @@ impl AcpThreadView {
         }
     }
 
-    fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let following = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                workspace.is_being_followed(CollaboratorId::Agent)
+    fn is_following(&self, cx: &App) -> bool {
+        match self.thread().map(|thread| thread.read(cx).status()) {
+            Some(ThreadStatus::Generating) => self
+                .workspace
+                .read_with(cx, |workspace, _| {
+                    workspace.is_being_followed(CollaboratorId::Agent)
+                })
+                .unwrap_or(false),
+            _ => self.should_be_following,
+        }
+    }
+
+    fn toggle_following(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let following = self.is_following(cx);
+        self.should_be_following = !following;
+        self.workspace
+            .update(cx, |workspace, cx| {
+                if following {
+                    workspace.unfollow(CollaboratorId::Agent, window, cx);
+                } else {
+                    workspace.follow(CollaboratorId::Agent, window, cx);
+                }
             })
-            .unwrap_or(false);
+            .ok();
+    }
+
+    fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let following = self.is_following(cx);
 
         IconButton::new("follow-agent", IconName::Crosshair)
             .icon_size(IconSize::Small)
@@ -3679,15 +3728,7 @@ impl AcpThreadView {
                 }
             })
             .on_click(cx.listener(move |this, _, window, cx| {
-                this.workspace
-                    .update(cx, |workspace, cx| {
-                        if following {
-                            workspace.unfollow(CollaboratorId::Agent, window, cx);
-                        } else {
-                            workspace.follow(CollaboratorId::Agent, window, cx);
-                        }
-                    })
-                    .ok();
+                this.toggle_following(window, cx);
             }))
     }
 

From 557753d092e167422ae28df5d4399612dc59e893 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 25 Aug 2025 17:46:07 +0200
Subject: [PATCH 341/823] acp: Add Reauthenticate to dropdown (#36878)

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/agent_ui/src/acp/thread_view.rs | 18 ++++++++++++++++++
 crates/agent_ui/src/agent_panel.rs     | 13 +++++++++++++
 crates/zed_actions/src/lib.rs          |  4 +++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 609777e2d1..18a65ec634 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4746,6 +4746,24 @@ impl AcpThreadView {
             }))
     }
 
+    pub(crate) fn reauthenticate(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let agent = self.agent.clone();
+        let ThreadState::Ready { thread, .. } = &self.thread_state else {
+            return;
+        };
+
+        let connection = thread.read(cx).connection().clone();
+        let err = AuthRequired {
+            description: None,
+            provider_id: None,
+        };
+        self.clear_thread_error(cx);
+        let this = cx.weak_entity();
+        window.defer(cx, |window, cx| {
+            Self::handle_auth_required(this, err, agent, connection, window, cx);
+        })
+    }
+
     fn upgrade_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
         Button::new("upgrade", "Upgrade")
             .label_size(LabelSize::Small)
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 50f9fc6a45..f1a8a744ee 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -9,6 +9,7 @@ use agent_servers::AgentServerSettings;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
+use zed_actions::agent::ReauthenticateAgent;
 
 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
 use crate::agent_diff::AgentDiffThread;
@@ -2204,6 +2205,8 @@ impl AgentPanel {
             "Enable Full Screen"
         };
 
+        let selected_agent = self.selected_agent.clone();
+
         PopoverMenu::new("agent-options-menu")
             .trigger_with_tooltip(
                 IconButton::new("agent-options-menu", IconName::Ellipsis)
@@ -2283,6 +2286,11 @@ impl AgentPanel {
                             .action("Settings", Box::new(OpenSettings))
                             .separator()
                             .action(full_screen_label, Box::new(ToggleZoom));
+
+                        if selected_agent == AgentType::Gemini {
+                            menu = menu.action("Reauthenticate", Box::new(ReauthenticateAgent))
+                        }
+
                         menu
                     }))
                 }
@@ -3751,6 +3759,11 @@ impl Render for AgentPanel {
                 }
             }))
             .on_action(cx.listener(Self::toggle_burn_mode))
+            .on_action(cx.listener(|this, _: &ReauthenticateAgent, window, cx| {
+                if let Some(thread_view) = this.active_thread_view() {
+                    thread_view.update(cx, |thread_view, cx| thread_view.reauthenticate(window, cx))
+                }
+            }))
             .child(self.render_toolbar(window, cx))
             .children(self.render_onboarding(window, cx))
             .map(|parent| match &self.active_view {
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 069abc0a12..a5223a2cdf 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -290,7 +290,9 @@ pub mod agent {
             Chat,
             /// Toggles the language model selector dropdown.
             #[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
-            ToggleModelSelector
+            ToggleModelSelector,
+            /// Triggers re-authentication on Gemini
+            ReauthenticateAgent
         ]
     );
 }

From 2dc4f156b387ccd4698fbf1a5e54ea7050b738ca Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 25 Aug 2025 11:51:31 -0400
Subject: [PATCH 342/823] Revert "Capture `shorthand_field_initializer` and
 modules in Rust highlights (#35842)" (#36880)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR reverts https://github.com/zed-industries/zed/pull/35842, as it
broke the syntax highlighting for `crate`:

### Before Revert

<img width="367" height="70" alt="Screenshot 2025-08-25 at 11 29 50 AM"
src="https://github.com/user-attachments/assets/ce9b8b59-4e89-43ed-84c7-95c0156b9168"
/>

### After Revert

<img width="353" height="69" alt="Screenshot 2025-08-25 at 11 32 17 AM"
src="https://github.com/user-attachments/assets/b6df5a21-64db-4abf-aa76-f085236da0c4"
/>

This reverts commit 896a35f7befce468427a30489adf88c851b9507d.

Release Notes:

- Reverted https://github.com/zed-industries/zed/pull/35842.
---
 crates/languages/src/rust/highlights.scm | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
index 9c02fbedaa..1c46061827 100644
--- a/crates/languages/src/rust/highlights.scm
+++ b/crates/languages/src/rust/highlights.scm
@@ -6,9 +6,6 @@
 (self) @variable.special
 (field_identifier) @property
 
-(shorthand_field_initializer
-  (identifier) @property)
-
 (trait_item name: (type_identifier) @type.interface)
 (impl_item trait: (type_identifier) @type.interface)
 (abstract_type trait: (type_identifier) @type.interface)
@@ -41,20 +38,11 @@
     (identifier) @function.special
     (scoped_identifier
       name: (identifier) @function.special)
-  ]
-  "!" @function.special)
+  ])
 
 (macro_definition
   name: (identifier) @function.special.definition)
 
-(mod_item
-  name: (identifier) @module)
-
-(visibility_modifier [
-  (crate) @keyword
-  (super) @keyword
-])
-
 ; Identifier conventions
 
 ; Assume uppercase names are types/enum-constructors
@@ -127,7 +115,9 @@
   "where"
   "while"
   "yield"
+  (crate)
   (mutable_specifier)
+  (super)
 ] @keyword
 
 [
@@ -199,7 +189,6 @@
 operator: "/" @operator
 
 (lifetime) @lifetime
-(lifetime (identifier) @lifetime)
 
 (parameter (identifier) @variable.parameter)
 

From a102b087438c0424ce32a47177b7e16132aa24df Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 25 Aug 2025 10:03:07 -0600
Subject: [PATCH 343/823] Require confirmation for fetch tool (#36881)

Using prompt injection, the agent may be tricked into making a fetch
request that includes unexpected data from the conversation in the URL.

As agent conversations may contain sensitive information (like private
code, or
potentially even API keys), this seems bad.

The easiest way to prevent this is to require the user to look at the
URL
before the model is allowed to fetch it.

Thanks to @ant4g0nist for bringing this to our attention.

Release Notes:

- agent panel: The fetch tool now requires confirmation.
---
 crates/agent2/src/tools/fetch_tool.rs    | 9 +++++++--
 crates/assistant_tools/src/fetch_tool.rs | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/agent2/src/tools/fetch_tool.rs b/crates/agent2/src/tools/fetch_tool.rs
index 0313c4e4c2..dd97271a79 100644
--- a/crates/agent2/src/tools/fetch_tool.rs
+++ b/crates/agent2/src/tools/fetch_tool.rs
@@ -136,12 +136,17 @@ impl AgentTool for FetchTool {
     fn run(
         self: Arc<Self>,
         input: Self::Input,
-        _event_stream: ToolCallEventStream,
+        event_stream: ToolCallEventStream,
         cx: &mut App,
     ) -> Task<Result<Self::Output>> {
+        let authorize = event_stream.authorize(input.url.clone(), cx);
+
         let text = cx.background_spawn({
             let http_client = self.http_client.clone();
-            async move { Self::build_message(http_client, &input.url).await }
+            async move {
+                authorize.await?;
+                Self::build_message(http_client, &input.url).await
+            }
         });
 
         cx.foreground_executor().spawn(async move {
diff --git a/crates/assistant_tools/src/fetch_tool.rs b/crates/assistant_tools/src/fetch_tool.rs
index 79e205f205..cc22c9fc09 100644
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -118,7 +118,7 @@ impl Tool for FetchTool {
     }
 
     fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
-        false
+        true
     }
 
     fn may_perform_edits(&self) -> bool {

From 5c346a4ccf3642e8e804db70c59616ac3cb0f86a Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Mon, 25 Aug 2025 19:12:33 +0200
Subject: [PATCH 344/823] kotlin: Specify default language server (#36871)

As of
https://github.com/zed-extensions/kotlin/commit/db52fc3655df8594a89b3a6b539274f23dfa2f28,
the Kotlin extension has two language servers. However, following that
change, no default language server for Kotlin was configured within this
repo, which led to two language servers being activated for Kotlin by
default.

This PR makes `kotlin-language-server` the default language server for
the extension. This also ensures that the [documentation within the
repository](https://github.com/zed-extensions/kotlin?tab=readme-ov-file#kotlin-lsp)
matches what is actually the case.


Release Notes:

- kotlin: Made `kotlin-language-server` the default language server.
---
 assets/settings/default.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index ac26952c7f..59450dcc15 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1629,6 +1629,9 @@
         "allowed": true
       }
     },
+    "Kotlin": {
+      "language_servers": ["kotlin-language-server", "!kotlin-lsp", "..."]
+    },
     "LaTeX": {
       "formatter": "language_server",
       "language_servers": ["texlab", "..."],

From 2e1ca472414792eea4f9a8ae4eabb469b76f1cf3 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 25 Aug 2025 13:21:20 -0400
Subject: [PATCH 345/823] Make fields of `AiUpsellCard` private (#36888)

This PR makes the fields of the `AiUpsellCard` private, for better
encapsulation.

Release Notes:

- N/A
---
 crates/ai_onboarding/src/ai_upsell_card.rs | 15 ++++++++++-----
 crates/onboarding/src/ai_setup_page.rs     | 18 +++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index e9639ca075..106dcb0aef 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -12,11 +12,11 @@ use crate::{SignInStatus, YoungAccountBanner, plan_definitions::PlanDefinitions}
 
 #[derive(IntoElement, RegisterComponent)]
 pub struct AiUpsellCard {
-    pub sign_in_status: SignInStatus,
-    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub account_too_young: bool,
-    pub user_plan: Option<Plan>,
-    pub tab_index: Option<isize>,
+    sign_in_status: SignInStatus,
+    sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
+    account_too_young: bool,
+    user_plan: Option<Plan>,
+    tab_index: Option<isize>,
 }
 
 impl AiUpsellCard {
@@ -43,6 +43,11 @@ impl AiUpsellCard {
             tab_index: None,
         }
     }
+
+    pub fn tab_index(mut self, tab_index: Option<isize>) -> Self {
+        self.tab_index = tab_index;
+        self
+    }
 }
 
 impl RenderOnce for AiUpsellCard {
diff --git a/crates/onboarding/src/ai_setup_page.rs b/crates/onboarding/src/ai_setup_page.rs
index 672bcf1cd9..54c49bc72a 100644
--- a/crates/onboarding/src/ai_setup_page.rs
+++ b/crates/onboarding/src/ai_setup_page.rs
@@ -283,17 +283,13 @@ pub(crate) fn render_ai_setup_page(
             v_flex()
                 .mt_2()
                 .gap_6()
-                .child({
-                    let mut ai_upsell_card =
-                        AiUpsellCard::new(client, &user_store, user_store.read(cx).plan(), cx);
-
-                    ai_upsell_card.tab_index = Some({
-                        tab_index += 1;
-                        tab_index - 1
-                    });
-
-                    ai_upsell_card
-                })
+                .child(
+                    AiUpsellCard::new(client, &user_store, user_store.read(cx).plan(), cx)
+                        .tab_index(Some({
+                            tab_index += 1;
+                            tab_index - 1
+                        })),
+                )
                 .child(render_llm_provider_section(
                     &mut tab_index,
                     workspace,

From f1204dfc333ceb83b5769c0f3ab876fc96e39252 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 25 Aug 2025 10:46:36 -0700
Subject: [PATCH 346/823] Revert "workspace: Disable padding on zoomed panels"
 (#36884)

Reverts zed-industries/zed#36012

We thought we didn't need this UI, but it turns out it was load bearing
:)

Release Notes:

- Restored the zoomed panel padding
---
 crates/workspace/src/workspace.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index bf58786d67..3654df09be 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6622,15 +6622,25 @@ impl Render for Workspace {
                                     }
                                 })
                                 .children(self.zoomed.as_ref().and_then(|view| {
-                                    Some(div()
+                                    let zoomed_view = view.upgrade()?;
+                                    let div = div()
                                         .occlude()
                                         .absolute()
                                         .overflow_hidden()
                                         .border_color(colors.border)
                                         .bg(colors.background)
-                                        .child(view.upgrade()?)
+                                        .child(zoomed_view)
                                         .inset_0()
-                                        .shadow_lg())
+                                        .shadow_lg();
+
+                                    Some(match self.zoomed_position {
+                                        Some(DockPosition::Left) => div.right_2().border_r_1(),
+                                        Some(DockPosition::Right) => div.left_2().border_l_1(),
+                                        Some(DockPosition::Bottom) => div.top_2().border_t_1(),
+                                        None => {
+                                            div.top_2().bottom_2().left_2().right_2().border_1()
+                                        }
+                                    })
                                 }))
                                 .children(self.render_notifications(window, cx)),
                         )

From 5fd29d37a63539c991ebae477bd4a78c849e0a78 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 25 Aug 2025 14:28:11 -0400
Subject: [PATCH 347/823] acp: Model-specific prompt capabilities for 1PA
 (#36879)

Adds support for per-session prompt capabilities and capability changes
on the Zed side (ACP itself still only has per-connection static
capabilities for now), and uses it to reflect image support accurately
in 1PA threads based on the currently-selected model.

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs       | 38 +++++++++++++++++------
 crates/acp_thread/src/connection.rs       | 18 +++++------
 crates/agent2/src/agent.rs                | 13 +++-----
 crates/agent2/src/thread.rs               | 21 +++++++++++++
 crates/agent_servers/src/acp.rs           |  9 +++---
 crates/agent_servers/src/claude.rs        | 16 +++++-----
 crates/agent_ui/src/acp/message_editor.rs |  2 +-
 crates/agent_ui/src/acp/thread_view.rs    | 20 ++++++------
 crates/agent_ui/src/agent_diff.rs         |  1 +
 crates/watch/src/watch.rs                 | 13 ++++++++
 10 files changed, 98 insertions(+), 53 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index cc33879586..779f9964da 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -756,6 +756,8 @@ pub struct AcpThread {
     connection: Rc<dyn AgentConnection>,
     session_id: acp::SessionId,
     token_usage: Option<TokenUsage>,
+    prompt_capabilities: acp::PromptCapabilities,
+    _observe_prompt_capabilities: Task<anyhow::Result<()>>,
 }
 
 #[derive(Debug)]
@@ -770,6 +772,7 @@ pub enum AcpThreadEvent {
     Stopped,
     Error,
     LoadError(LoadError),
+    PromptCapabilitiesUpdated,
 }
 
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -821,7 +824,20 @@ impl AcpThread {
         project: Entity<Project>,
         action_log: Entity<ActionLog>,
         session_id: acp::SessionId,
+        mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
+        cx: &mut Context<Self>,
     ) -> Self {
+        let prompt_capabilities = *prompt_capabilities_rx.borrow();
+        let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
+            loop {
+                let caps = prompt_capabilities_rx.recv().await?;
+                this.update(cx, |this, cx| {
+                    this.prompt_capabilities = caps;
+                    cx.emit(AcpThreadEvent::PromptCapabilitiesUpdated);
+                })?;
+            }
+        });
+
         Self {
             action_log,
             shared_buffers: Default::default(),
@@ -833,9 +849,15 @@ impl AcpThread {
             connection,
             session_id,
             token_usage: None,
+            prompt_capabilities,
+            _observe_prompt_capabilities: task,
         }
     }
 
+    pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
+        self.prompt_capabilities
+    }
+
     pub fn connection(&self) -> &Rc<dyn AgentConnection> {
         &self.connection
     }
@@ -2599,13 +2621,19 @@ mod tests {
                     .into(),
             );
             let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                 AcpThread::new(
                     "Test",
                     self.clone(),
                     project,
                     action_log,
                     session_id.clone(),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                    }),
+                    cx,
                 )
             });
             self.sessions.lock().insert(session_id, thread.downgrade());
@@ -2639,14 +2667,6 @@ mod tests {
             }
         }
 
-        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-            acp::PromptCapabilities {
-                image: true,
-                audio: true,
-                embedded_context: true,
-            }
-        }
-
         fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
             let sessions = self.sessions.lock();
             let thread = sessions.get(session_id).unwrap().clone();
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 5f5032e588..af229b7545 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -38,8 +38,6 @@ pub trait AgentConnection {
         cx: &mut App,
     ) -> Task<Result<acp::PromptResponse>>;
 
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities;
-
     fn resume(
         &self,
         _session_id: &acp::SessionId,
@@ -329,13 +327,19 @@ mod test_support {
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
             let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
             let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                 AcpThread::new(
                     "Test",
                     self.clone(),
                     project,
                     action_log,
                     session_id.clone(),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                    }),
+                    cx,
                 )
             });
             self.sessions.lock().insert(
@@ -348,14 +352,6 @@ mod test_support {
             Task::ready(Ok(thread))
         }
 
-        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-            acp::PromptCapabilities {
-                image: true,
-                audio: true,
-                embedded_context: true,
-            }
-        }
-
         fn authenticate(
             &self,
             _method_id: acp::AuthMethodId,
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 1576c3cf96..ecfaea4b49 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -240,13 +240,16 @@ impl NativeAgent {
         let title = thread.title();
         let project = thread.project.clone();
         let action_log = thread.action_log.clone();
-        let acp_thread = cx.new(|_cx| {
+        let prompt_capabilities_rx = thread.prompt_capabilities_rx.clone();
+        let acp_thread = cx.new(|cx| {
             acp_thread::AcpThread::new(
                 title,
                 connection,
                 project.clone(),
                 action_log.clone(),
                 session_id.clone(),
+                prompt_capabilities_rx,
+                cx,
             )
         });
         let subscriptions = vec![
@@ -925,14 +928,6 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
         })
     }
 
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        acp::PromptCapabilities {
-            image: true,
-            audio: false,
-            embedded_context: true,
-        }
-    }
-
     fn resume(
         &self,
         session_id: &acp::SessionId,
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 2d1e608297..1b1c014b79 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -575,11 +575,22 @@ pub struct Thread {
     templates: Arc<Templates>,
     model: Option<Arc<dyn LanguageModel>>,
     summarization_model: Option<Arc<dyn LanguageModel>>,
+    prompt_capabilities_tx: watch::Sender<acp::PromptCapabilities>,
+    pub(crate) prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
     pub(crate) project: Entity<Project>,
     pub(crate) action_log: Entity<ActionLog>,
 }
 
 impl Thread {
+    fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
+        let image = model.map_or(true, |model| model.supports_images());
+        acp::PromptCapabilities {
+            image,
+            audio: false,
+            embedded_context: true,
+        }
+    }
+
     pub fn new(
         project: Entity<Project>,
         project_context: Entity<ProjectContext>,
@@ -590,6 +601,8 @@ impl Thread {
     ) -> Self {
         let profile_id = AgentSettings::get_global(cx).default_profile.clone();
         let action_log = cx.new(|_cx| ActionLog::new(project.clone()));
+        let (prompt_capabilities_tx, prompt_capabilities_rx) =
+            watch::channel(Self::prompt_capabilities(model.as_deref()));
         Self {
             id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
             prompt_id: PromptId::new(),
@@ -617,6 +630,8 @@ impl Thread {
             templates,
             model,
             summarization_model: None,
+            prompt_capabilities_tx,
+            prompt_capabilities_rx,
             project,
             action_log,
         }
@@ -750,6 +765,8 @@ impl Thread {
                 .or_else(|| registry.default_model())
                 .map(|model| model.model)
         });
+        let (prompt_capabilities_tx, prompt_capabilities_rx) =
+            watch::channel(Self::prompt_capabilities(model.as_deref()));
 
         Self {
             id,
@@ -779,6 +796,8 @@ impl Thread {
             project,
             action_log,
             updated_at: db_thread.updated_at,
+            prompt_capabilities_tx,
+            prompt_capabilities_rx,
         }
     }
 
@@ -946,10 +965,12 @@ impl Thread {
     pub fn set_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
         let old_usage = self.latest_token_usage();
         self.model = Some(model);
+        let new_caps = Self::prompt_capabilities(self.model.as_deref());
         let new_usage = self.latest_token_usage();
         if old_usage != new_usage {
             cx.emit(TokenUsageUpdated(new_usage));
         }
+        self.prompt_capabilities_tx.send(new_caps).log_err();
         cx.notify()
     }
 
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index c9c938c6c0..5a4efe12e5 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -185,13 +185,16 @@ impl AgentConnection for AcpConnection {
 
             let session_id = response.session_id;
             let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                 AcpThread::new(
                     self.server_name.clone(),
                     self.clone(),
                     project,
                     action_log,
                     session_id.clone(),
+                    // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
+                    watch::Receiver::constant(self.prompt_capabilities),
+                    cx,
                 )
             })?;
 
@@ -279,10 +282,6 @@ impl AgentConnection for AcpConnection {
         })
     }
 
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        self.prompt_capabilities
-    }
-
     fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
         if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
             session.suppress_abort_err = true;
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 048563103f..6006bf3edb 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -249,13 +249,19 @@ impl AgentConnection for ClaudeAgentConnection {
             });
 
             let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|_cx| {
+            let thread = cx.new(|cx| {
                 AcpThread::new(
                     "Claude Code",
                     self.clone(),
                     project,
                     action_log,
                     session_id.clone(),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: false,
+                        embedded_context: true,
+                    }),
+                    cx,
                 )
             })?;
 
@@ -319,14 +325,6 @@ impl AgentConnection for ClaudeAgentConnection {
         cx.foreground_executor().spawn(async move { end_rx.await? })
     }
 
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        acp::PromptCapabilities {
-            image: true,
-            audio: false,
-            embedded_context: true,
-        }
-    }
-
     fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
         let sessions = self.sessions.borrow();
         let Some(session) = sessions.get(session_id) else {
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 70faa0ed27..12ae893c31 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -373,7 +373,7 @@ impl MessageEditor {
 
         if Img::extensions().contains(&extension) && !extension.contains("svg") {
             if !self.prompt_capabilities.get().image {
-                return Task::ready(Err(anyhow!("This agent does not support images yet")));
+                return Task::ready(Err(anyhow!("This model does not support images yet")));
             }
             let task = self
                 .project
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 18a65ec634..faba18acb1 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -474,7 +474,7 @@ impl AcpThreadView {
                         let action_log = thread.read(cx).action_log().clone();
 
                         this.prompt_capabilities
-                            .set(connection.prompt_capabilities());
+                            .set(thread.read(cx).prompt_capabilities());
 
                         let count = thread.read(cx).entries().len();
                         this.list_state.splice(0..0, count);
@@ -1163,6 +1163,10 @@ impl AcpThreadView {
                     });
                 }
             }
+            AcpThreadEvent::PromptCapabilitiesUpdated => {
+                self.prompt_capabilities
+                    .set(thread.read(cx).prompt_capabilities());
+            }
             AcpThreadEvent::TokenUsageUpdated => {}
         }
         cx.notify();
@@ -5367,6 +5371,12 @@ pub(crate) mod tests {
                     project,
                     action_log,
                     SessionId("test".into()),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                    }),
+                    cx,
                 )
             })))
         }
@@ -5375,14 +5385,6 @@ pub(crate) mod tests {
             &[]
         }
 
-        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-            acp::PromptCapabilities {
-                image: true,
-                audio: true,
-                embedded_context: true,
-            }
-        }
-
         fn authenticate(
             &self,
             _method_id: acp::AuthMethodId,
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index e07424987c..1e1ff95178 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1529,6 +1529,7 @@ impl AgentDiff {
             | AcpThreadEvent::TokenUsageUpdated
             | AcpThreadEvent::EntriesRemoved(_)
             | AcpThreadEvent::ToolAuthorizationRequired
+            | AcpThreadEvent::PromptCapabilitiesUpdated
             | AcpThreadEvent::Retry(_) => {}
         }
     }
diff --git a/crates/watch/src/watch.rs b/crates/watch/src/watch.rs
index f0ed5b4a18..71dab74820 100644
--- a/crates/watch/src/watch.rs
+++ b/crates/watch/src/watch.rs
@@ -162,6 +162,19 @@ impl<T> Receiver<T> {
             pending_waker_id: None,
         }
     }
+
+    /// Creates a new [`Receiver`] holding an initial value that will never change.
+    pub fn constant(value: T) -> Self {
+        let state = Arc::new(RwLock::new(State {
+            value,
+            wakers: BTreeMap::new(),
+            next_waker_id: WakerId::default(),
+            version: 0,
+            closed: false,
+        }));
+
+        Self { state, version: 0 }
+    }
 }
 
 impl<T: Clone> Receiver<T> {

From c786c0150f6b315ba4074117241b90bddd8f00fc Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:45:24 -0300
Subject: [PATCH 348/823] agent: Add section for agent servers in settings view
 (#35206)

Release Notes:

- N/A

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/agent_servers/src/agent_servers.rs  |   2 +-
 crates/agent_servers/src/gemini.rs         |  18 +-
 crates/agent_ui/src/acp/thread_view.rs     |   4 +-
 crates/agent_ui/src/agent_configuration.rs | 249 +++++++++++++++++++--
 crates/agent_ui/src/agent_panel.rs         |   2 +
 crates/agent_ui/src/agent_ui.rs            |   1 +
 6 files changed, 254 insertions(+), 22 deletions(-)

diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index fa59201338..0439934094 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -97,7 +97,7 @@ pub struct AgentServerCommand {
 }
 
 impl AgentServerCommand {
-    pub(crate) async fn resolve(
+    pub async fn resolve(
         path_bin_name: &'static str,
         extra_args: &[&'static str],
         fallback_path: Option<&Path>,
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 9ebcee745c..d09829fe65 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -53,7 +53,7 @@ impl AgentServer for Gemini {
                 return Err(LoadError::NotInstalled {
                     error_message: "Failed to find Gemini CLI binary".into(),
                     install_message: "Install Gemini CLI".into(),
-                    install_command: "npm install -g @google/gemini-cli@preview".into()
+                    install_command: Self::install_command().into(),
                 }.into());
             };
 
@@ -88,7 +88,7 @@ impl AgentServer for Gemini {
                             current_version
                         ).into(),
                         upgrade_message: "Upgrade Gemini CLI to latest".into(),
-                        upgrade_command: "npm install -g @google/gemini-cli@preview".into(),
+                        upgrade_command: Self::upgrade_command().into(),
                     }.into())
                 }
             }
@@ -101,6 +101,20 @@ impl AgentServer for Gemini {
     }
 }
 
+impl Gemini {
+    pub fn binary_name() -> &'static str {
+        "gemini"
+    }
+
+    pub fn install_command() -> &'static str {
+        "npm install -g @google/gemini-cli@preview"
+    }
+
+    pub fn upgrade_command() -> &'static str {
+        "npm install -g @google/gemini-cli@preview"
+    }
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index faba18acb1..97af249ae5 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2811,7 +2811,7 @@ impl AcpThreadView {
                                 let cwd = project.first_project_directory(cx);
                                 let shell = project.terminal_settings(&cwd, cx).shell.clone();
                                 let spawn_in_terminal = task::SpawnInTerminal {
-                                    id: task::TaskId("install".to_string()),
+                                    id: task::TaskId(install_command.clone()),
                                     full_label: install_command.clone(),
                                     label: install_command.clone(),
                                     command: Some(install_command.clone()),
@@ -2868,7 +2868,7 @@ impl AcpThreadView {
                                 let cwd = project.first_project_directory(cx);
                                 let shell = project.terminal_settings(&cwd, cx).shell.clone();
                                 let spawn_in_terminal = task::SpawnInTerminal {
-                                    id: task::TaskId("upgrade".to_string()),
+                                    id: task::TaskId(upgrade_command.to_string()),
                                     full_label: upgrade_command.clone(),
                                     label: upgrade_command.clone(),
                                     command: Some(upgrade_command.clone()),
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index f33f0ba032..52fb7eed4b 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -5,6 +5,7 @@ mod tool_picker;
 
 use std::{sync::Arc, time::Duration};
 
+use agent_servers::{AgentServerCommand, AllAgentServersSettings, Gemini};
 use agent_settings::AgentSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use cloud_llm_client::Plan;
@@ -15,7 +16,7 @@ use extension_host::ExtensionStore;
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt as _, AnyView, App, Corner, Entity, EventEmitter, FocusHandle,
-    Focusable, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
+    Focusable, Hsla, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
 };
 use language::LanguageRegistry;
 use language_model::{
@@ -23,10 +24,11 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
+    Project,
     context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
     project_settings::{ContextServerSettings, ProjectSettings},
 };
-use settings::{Settings, update_settings_file};
+use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
     Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
     Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip, prelude::*,
@@ -39,7 +41,7 @@ pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
 pub(crate) use manage_profiles_modal::ManageProfilesModal;
 
 use crate::{
-    AddContextServer,
+    AddContextServer, ExternalAgent, NewExternalAgentThread,
     agent_configuration::add_llm_provider_modal::{AddLlmProviderModal, LlmCompatibleProvider},
 };
 
@@ -47,6 +49,7 @@ pub struct AgentConfiguration {
     fs: Arc<dyn Fs>,
     language_registry: Arc<LanguageRegistry>,
     workspace: WeakEntity<Workspace>,
+    project: WeakEntity<Project>,
     focus_handle: FocusHandle,
     configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
     context_server_store: Entity<ContextServerStore>,
@@ -56,6 +59,8 @@ pub struct AgentConfiguration {
     _registry_subscription: Subscription,
     scroll_handle: ScrollHandle,
     scrollbar_state: ScrollbarState,
+    gemini_is_installed: bool,
+    _check_for_gemini: Task<()>,
 }
 
 impl AgentConfiguration {
@@ -65,6 +70,7 @@ impl AgentConfiguration {
         tools: Entity<ToolWorkingSet>,
         language_registry: Arc<LanguageRegistry>,
         workspace: WeakEntity<Workspace>,
+        project: WeakEntity<Project>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -89,6 +95,11 @@ impl AgentConfiguration {
 
         cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify())
             .detach();
+        cx.observe_global_in::<SettingsStore>(window, |this, _, cx| {
+            this.check_for_gemini(cx);
+            cx.notify();
+        })
+        .detach();
 
         let scroll_handle = ScrollHandle::new();
         let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
@@ -97,6 +108,7 @@ impl AgentConfiguration {
             fs,
             language_registry,
             workspace,
+            project,
             focus_handle,
             configuration_views_by_provider: HashMap::default(),
             context_server_store,
@@ -106,8 +118,11 @@ impl AgentConfiguration {
             _registry_subscription: registry_subscription,
             scroll_handle,
             scrollbar_state,
+            gemini_is_installed: false,
+            _check_for_gemini: Task::ready(()),
         };
         this.build_provider_configuration_views(window, cx);
+        this.check_for_gemini(cx);
         this
     }
 
@@ -137,6 +152,34 @@ impl AgentConfiguration {
         self.configuration_views_by_provider
             .insert(provider.id(), configuration_view);
     }
+
+    fn check_for_gemini(&mut self, cx: &mut Context<Self>) {
+        let project = self.project.clone();
+        let settings = AllAgentServersSettings::get_global(cx).clone();
+        self._check_for_gemini = cx.spawn({
+            async move |this, cx| {
+                let Some(project) = project.upgrade() else {
+                    return;
+                };
+                let gemini_is_installed = AgentServerCommand::resolve(
+                    Gemini::binary_name(),
+                    &[],
+                    // TODO expose fallback path from the Gemini/CC types so we don't have to hardcode it again here
+                    None,
+                    settings.gemini,
+                    &project,
+                    cx,
+                )
+                .await
+                .is_some();
+                this.update(cx, |this, cx| {
+                    this.gemini_is_installed = gemini_is_installed;
+                    cx.notify();
+                })
+                .ok();
+            }
+        });
+    }
 }
 
 impl Focusable for AgentConfiguration {
@@ -211,7 +254,6 @@ impl AgentConfiguration {
                     .child(
                         h_flex()
                             .id(provider_id_string.clone())
-                            .cursor_pointer()
                             .px_2()
                             .py_0p5()
                             .w_full()
@@ -231,10 +273,7 @@ impl AgentConfiguration {
                                         h_flex()
                                             .w_full()
                                             .gap_1()
-                                            .child(
-                                                Label::new(provider_name.clone())
-                                                    .size(LabelSize::Large),
-                                            )
+                                            .child(Label::new(provider_name.clone()))
                                             .map(|this| {
                                                 if is_zed_provider && is_signed_in {
                                                     this.child(
@@ -279,7 +318,7 @@ impl AgentConfiguration {
                                 "Start New Thread",
                             )
                             .icon_position(IconPosition::Start)
-                            .icon(IconName::Plus)
+                            .icon(IconName::Thread)
                             .icon_size(IconSize::Small)
                             .icon_color(Color::Muted)
                             .label_size(LabelSize::Small)
@@ -378,7 +417,7 @@ impl AgentConfiguration {
                                     ),
                             )
                             .child(
-                                Label::new("Add at least one provider to use AI-powered features.")
+                                Label::new("Add at least one provider to use AI-powered features with Zed's native agent.")
                                     .color(Color::Muted),
                             ),
                     ),
@@ -519,6 +558,14 @@ impl AgentConfiguration {
         }
     }
 
+    fn card_item_bg_color(&self, cx: &mut Context<Self>) -> Hsla {
+        cx.theme().colors().background.opacity(0.25)
+    }
+
+    fn card_item_border_color(&self, cx: &mut Context<Self>) -> Hsla {
+        cx.theme().colors().border.opacity(0.6)
+    }
+
     fn render_context_servers_section(
         &mut self,
         window: &mut Window,
@@ -536,7 +583,12 @@ impl AgentConfiguration {
                 v_flex()
                     .gap_0p5()
                     .child(Headline::new("Model Context Protocol (MCP) Servers"))
-                    .child(Label::new("Connect to context servers through the Model Context Protocol, either using Zed extensions or directly.").color(Color::Muted)),
+                    .child(
+                        Label::new(
+                            "All context servers connected through the Model Context Protocol.",
+                        )
+                        .color(Color::Muted),
+                    ),
             )
             .children(
                 context_server_ids.into_iter().map(|context_server_id| {
@@ -546,7 +598,7 @@ impl AgentConfiguration {
             .child(
                 h_flex()
                     .justify_between()
-                    .gap_2()
+                    .gap_1p5()
                     .child(
                         h_flex().w_full().child(
                             Button::new("add-context-server", "Add Custom Server")
@@ -637,8 +689,6 @@ impl AgentConfiguration {
             .map_or([].as_slice(), |tools| tools.as_slice());
         let tool_count = tools.len();
 
-        let border_color = cx.theme().colors().border.opacity(0.6);
-
         let (source_icon, source_tooltip) = if is_from_extension {
             (
                 IconName::ZedMcpExtension,
@@ -781,8 +831,8 @@ impl AgentConfiguration {
             .id(item_id.clone())
             .border_1()
             .rounded_md()
-            .border_color(border_color)
-            .bg(cx.theme().colors().background.opacity(0.2))
+            .border_color(self.card_item_border_color(cx))
+            .bg(self.card_item_bg_color(cx))
             .overflow_hidden()
             .child(
                 h_flex()
@@ -790,7 +840,11 @@ impl AgentConfiguration {
                     .justify_between()
                     .when(
                         error.is_some() || are_tools_expanded && tool_count >= 1,
-                        |element| element.border_b_1().border_color(border_color),
+                        |element| {
+                            element
+                                .border_b_1()
+                                .border_color(self.card_item_border_color(cx))
+                        },
                     )
                     .child(
                         h_flex()
@@ -972,6 +1026,166 @@ impl AgentConfiguration {
                 ))
             })
     }
+
+    fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let settings = AllAgentServersSettings::get_global(cx).clone();
+        let user_defined_agents = settings
+            .custom
+            .iter()
+            .map(|(name, settings)| {
+                self.render_agent_server(
+                    IconName::Ai,
+                    name.clone(),
+                    ExternalAgent::Custom {
+                        name: name.clone(),
+                        settings: settings.clone(),
+                    },
+                    None,
+                    cx,
+                )
+                .into_any_element()
+            })
+            .collect::<Vec<_>>();
+
+        v_flex()
+            .border_b_1()
+            .border_color(cx.theme().colors().border)
+            .child(
+                v_flex()
+                    .p(DynamicSpacing::Base16.rems(cx))
+                    .pr(DynamicSpacing::Base20.rems(cx))
+                    .gap_2()
+                    .child(
+                        v_flex()
+                            .gap_0p5()
+                            .child(Headline::new("External Agents"))
+                            .child(
+                                Label::new(
+                                    "Use the full power of Zed's UI with your favorite agent, connected via the Agent Client Protocol.",
+                                )
+                                .color(Color::Muted),
+                            ),
+                    )
+                    .child(self.render_agent_server(
+                        IconName::AiGemini,
+                        "Gemini CLI",
+                        ExternalAgent::Gemini,
+                        (!self.gemini_is_installed).then_some(Gemini::install_command().into()),
+                        cx,
+                    ))
+                    // TODO add CC
+                    .children(user_defined_agents),
+            )
+    }
+
+    fn render_agent_server(
+        &self,
+        icon: IconName,
+        name: impl Into<SharedString>,
+        agent: ExternalAgent,
+        install_command: Option<SharedString>,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let name = name.into();
+        h_flex()
+            .p_1()
+            .pl_2()
+            .gap_1p5()
+            .justify_between()
+            .border_1()
+            .rounded_md()
+            .border_color(self.card_item_border_color(cx))
+            .bg(self.card_item_bg_color(cx))
+            .overflow_hidden()
+            .child(
+                h_flex()
+                    .gap_1p5()
+                    .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
+                    .child(Label::new(name.clone())),
+            )
+            .map(|this| {
+                if let Some(install_command) = install_command {
+                    this.child(
+                        Button::new(
+                            SharedString::from(format!("install_external_agent-{name}")),
+                            "Install Agent",
+                        )
+                        .label_size(LabelSize::Small)
+                        .icon(IconName::Plus)
+                        .icon_position(IconPosition::Start)
+                        .icon_size(IconSize::XSmall)
+                        .icon_color(Color::Muted)
+                        .tooltip(Tooltip::text(install_command.clone()))
+                        .on_click(cx.listener(
+                            move |this, _, window, cx| {
+                                let Some(project) = this.project.upgrade() else {
+                                    return;
+                                };
+                                let Some(workspace) = this.workspace.upgrade() else {
+                                    return;
+                                };
+                                let cwd = project.read(cx).first_project_directory(cx);
+                                let shell =
+                                    project.read(cx).terminal_settings(&cwd, cx).shell.clone();
+                                let spawn_in_terminal = task::SpawnInTerminal {
+                                    id: task::TaskId(install_command.to_string()),
+                                    full_label: install_command.to_string(),
+                                    label: install_command.to_string(),
+                                    command: Some(install_command.to_string()),
+                                    args: Vec::new(),
+                                    command_label: install_command.to_string(),
+                                    cwd,
+                                    env: Default::default(),
+                                    use_new_terminal: true,
+                                    allow_concurrent_runs: true,
+                                    reveal: Default::default(),
+                                    reveal_target: Default::default(),
+                                    hide: Default::default(),
+                                    shell,
+                                    show_summary: true,
+                                    show_command: true,
+                                    show_rerun: false,
+                                };
+                                let task = workspace.update(cx, |workspace, cx| {
+                                    workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
+                                });
+                                cx.spawn(async move |this, cx| {
+                                    task.await;
+                                    this.update(cx, |this, cx| {
+                                        this.check_for_gemini(cx);
+                                    })
+                                    .ok();
+                                })
+                                .detach();
+                            },
+                        )),
+                    )
+                } else {
+                    this.child(
+                        h_flex().gap_1().child(
+                            Button::new(
+                                SharedString::from(format!("start_acp_thread-{name}")),
+                                "Start New Thread",
+                            )
+                            .label_size(LabelSize::Small)
+                            .icon(IconName::Thread)
+                            .icon_position(IconPosition::Start)
+                            .icon_size(IconSize::XSmall)
+                            .icon_color(Color::Muted)
+                            .on_click(move |_, window, cx| {
+                                window.dispatch_action(
+                                    NewExternalAgentThread {
+                                        agent: Some(agent.clone()),
+                                    }
+                                    .boxed_clone(),
+                                    cx,
+                                );
+                            }),
+                        ),
+                    )
+                }
+            })
+    }
 }
 
 impl Render for AgentConfiguration {
@@ -991,6 +1205,7 @@ impl Render for AgentConfiguration {
                     .size_full()
                     .overflow_y_scroll()
                     .child(self.render_general_settings_section(cx))
+                    .child(self.render_agent_servers_section(cx))
                     .child(self.render_context_servers_section(window, cx))
                     .child(self.render_provider_configuration_section(cx)),
             )
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index f1a8a744ee..c825785755 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -241,6 +241,7 @@ enum WhichFontSize {
     None,
 }
 
+// TODO unify this with ExternalAgent
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 pub enum AgentType {
     #[default]
@@ -1474,6 +1475,7 @@ impl AgentPanel {
                 tools,
                 self.language_registry.clone(),
                 self.workspace.clone(),
+                self.project.downgrade(),
                 window,
                 cx,
             )
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 40f6c6a2bb..d159f375b5 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -160,6 +160,7 @@ pub struct NewNativeAgentThreadFromSummary {
     from_session_id: agent_client_protocol::SessionId,
 }
 
+// TODO unify this with AgentType
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 enum ExternalAgent {

From 59af2a7d1f513d9f58fc07d4429d118c6a944069 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 25 Aug 2025 20:51:23 +0200
Subject: [PATCH 349/823] acp: Add telemetry (#36894)

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/agent2/src/native_agent_server.rs  |  4 ++
 crates/agent2/src/tests/mod.rs            |  1 +
 crates/agent_servers/src/agent_servers.rs |  1 +
 crates/agent_servers/src/claude.rs        |  4 ++
 crates/agent_servers/src/custom.rs        |  4 ++
 crates/agent_servers/src/gemini.rs        |  4 ++
 crates/agent_ui/src/acp/thread_view.rs    | 79 ++++++++++++++++-------
 crates/agent_ui/src/agent_panel.rs        |  8 +++
 crates/agent_ui/src/agent_ui.rs           |  9 +++
 crates/agent_ui/src/text_thread_editor.rs |  1 +
 10 files changed, 93 insertions(+), 22 deletions(-)

diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 33ee44c9a3..9ff98ccd18 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -22,6 +22,10 @@ impl NativeAgentServer {
 }
 
 impl AgentServer for NativeAgentServer {
+    fn telemetry_id(&self) -> &'static str {
+        "zed"
+    }
+
     fn name(&self) -> SharedString {
         "Zed Agent".into()
     }
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 87ecc1037c..864fbf8b10 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1685,6 +1685,7 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
+#[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_title_generation(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 0439934094..7c7e124ca7 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -36,6 +36,7 @@ pub trait AgentServer: Send {
     fn name(&self) -> SharedString;
     fn empty_state_headline(&self) -> SharedString;
     fn empty_state_message(&self) -> SharedString;
+    fn telemetry_id(&self) -> &'static str;
 
     fn connect(
         &self,
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 6006bf3edb..250e564526 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -43,6 +43,10 @@ use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri
 pub struct ClaudeCode;
 
 impl AgentServer for ClaudeCode {
+    fn telemetry_id(&self) -> &'static str {
+        "claude-code"
+    }
+
     fn name(&self) -> SharedString {
         "Claude Code".into()
     }
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index e544c4f21f..72823026d7 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -22,6 +22,10 @@ impl CustomAgentServer {
 }
 
 impl crate::AgentServer for CustomAgentServer {
+    fn telemetry_id(&self) -> &'static str {
+        "custom"
+    }
+
     fn name(&self) -> SharedString {
         self.name.clone()
     }
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index d09829fe65..5d6a70fa64 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -17,6 +17,10 @@ pub struct Gemini;
 const ACP_ARG: &str = "--experimental-acp";
 
 impl AgentServer for Gemini {
+    fn telemetry_id(&self) -> &'static str {
+        "gemini-cli"
+    }
+
     fn name(&self) -> SharedString {
         "Gemini CLI".into()
     }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 97af249ae5..d80f4eabce 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -892,6 +892,8 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        let agent_telemetry_id = self.agent.telemetry_id();
+
         self.thread_error.take();
         self.editing_message.take();
         self.thread_feedback.clear();
@@ -936,6 +938,9 @@ impl AcpThreadView {
                     }
                 });
                 drop(guard);
+
+                telemetry::event!("Agent Message Sent", agent = agent_telemetry_id);
+
                 thread.send(contents, cx)
             })?;
             send.await
@@ -1246,30 +1251,44 @@ impl AcpThreadView {
         pending_auth_method.replace(method.clone());
         let authenticate = connection.authenticate(method, cx);
         cx.notify();
-        self.auth_task = Some(cx.spawn_in(window, {
-            let project = self.project.clone();
-            let agent = self.agent.clone();
-            async move |this, cx| {
-                let result = authenticate.await;
+        self.auth_task =
+            Some(cx.spawn_in(window, {
+                let project = self.project.clone();
+                let agent = self.agent.clone();
+                async move |this, cx| {
+                    let result = authenticate.await;
 
-                this.update_in(cx, |this, window, cx| {
-                    if let Err(err) = result {
-                        this.handle_thread_error(err, cx);
-                    } else {
-                        this.thread_state = Self::initial_state(
-                            agent,
-                            None,
-                            this.workspace.clone(),
-                            project.clone(),
-                            window,
-                            cx,
-                        )
+                    match &result {
+                        Ok(_) => telemetry::event!(
+                            "Authenticate Agent Succeeded",
+                            agent = agent.telemetry_id()
+                        ),
+                        Err(_) => {
+                            telemetry::event!(
+                                "Authenticate Agent Failed",
+                                agent = agent.telemetry_id(),
+                            )
+                        }
                     }
-                    this.auth_task.take()
-                })
-                .ok();
-            }
-        }));
+
+                    this.update_in(cx, |this, window, cx| {
+                        if let Err(err) = result {
+                            this.handle_thread_error(err, cx);
+                        } else {
+                            this.thread_state = Self::initial_state(
+                                agent,
+                                None,
+                                this.workspace.clone(),
+                                project.clone(),
+                                window,
+                                cx,
+                            )
+                        }
+                        this.auth_task.take()
+                    })
+                    .ok();
+                }
+            }));
     }
 
     fn authorize_tool_call(
@@ -2776,6 +2795,12 @@ impl AcpThreadView {
                                         .on_click({
                                             let method_id = method.id.clone();
                                             cx.listener(move |this, _, window, cx| {
+                                                telemetry::event!(
+                                                    "Authenticate Agent Started",
+                                                    agent = this.agent.telemetry_id(),
+                                                    method = method_id
+                                                );
+
                                                 this.authenticate(method_id.clone(), window, cx)
                                             })
                                         })
@@ -2804,6 +2829,8 @@ impl AcpThreadView {
                     .icon_color(Color::Muted)
                     .icon_position(IconPosition::Start)
                     .on_click(cx.listener(move |this, _, window, cx| {
+                        telemetry::event!("Agent Install CLI", agent = this.agent.telemetry_id());
+
                         let task = this
                             .workspace
                             .update(cx, |workspace, cx| {
@@ -2861,6 +2888,8 @@ impl AcpThreadView {
                     .icon_color(Color::Muted)
                     .icon_position(IconPosition::Start)
                     .on_click(cx.listener(move |this, _, window, cx| {
+                        telemetry::event!("Agent Upgrade CLI", agent = this.agent.telemetry_id());
+
                         let task = this
                             .workspace
                             .update(cx, |workspace, cx| {
@@ -3708,6 +3737,8 @@ impl AcpThreadView {
                 }
             })
             .ok();
+
+        telemetry::event!("Follow Agent Selected", following = !following);
     }
 
     fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
@@ -5323,6 +5354,10 @@ pub(crate) mod tests {
     where
         C: 'static + AgentConnection + Send + Clone,
     {
+        fn telemetry_id(&self) -> &'static str {
+            "test"
+        }
+
         fn logo(&self) -> ui::IconName {
             ui::IconName::Ai
         }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index c825785755..1eafb8dd4d 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1026,6 +1026,8 @@ impl AgentPanel {
     }
 
     fn new_prompt_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        telemetry::event!("Agent Thread Started", agent = "zed-text");
+
         let context = self
             .context_store
             .update(cx, |context_store, cx| context_store.create(cx));
@@ -1118,6 +1120,8 @@ impl AgentPanel {
                 }
             };
 
+            telemetry::event!("Agent Thread Started", agent = ext_agent.name());
+
             let server = ext_agent.server(fs, history);
 
             this.update_in(cx, |this, window, cx| {
@@ -2327,6 +2331,8 @@ impl AgentPanel {
             .menu({
                 let menu = self.assistant_navigation_menu.clone();
                 move |window, cx| {
+                    telemetry::event!("View Thread History Clicked");
+
                     if let Some(menu) = menu.as_ref() {
                         menu.update(cx, |_, cx| {
                             cx.defer_in(window, |menu, window, cx| {
@@ -2505,6 +2511,8 @@ impl AgentPanel {
                 let workspace = self.workspace.clone();
 
                 move |window, cx| {
+                    telemetry::event!("New Thread Clicked");
+
                     let active_thread = active_thread.clone();
                     Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
                         menu = menu
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index d159f375b5..110c432df3 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -175,6 +175,15 @@ enum ExternalAgent {
 }
 
 impl ExternalAgent {
+    fn name(&self) -> &'static str {
+        match self {
+            Self::NativeAgent => "zed",
+            Self::Gemini => "gemini-cli",
+            Self::ClaudeCode => "claude-code",
+            Self::Custom { .. } => "custom",
+        }
+    }
+
     pub fn server(
         &self,
         fs: Arc<dyn fs::Fs>,
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index edb672a872..e9e7eba4b6 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -361,6 +361,7 @@ impl TextThreadEditor {
         if self.sending_disabled(cx) {
             return;
         }
+        telemetry::event!("Agent Message Sent", agent = "zed-text");
         self.send_to_model(window, cx);
     }
 

From 79e74b880bafaf32778eead2e336cb0f7d68cde7 Mon Sep 17 00:00:00 2001
From: Cretezy <Cretezy@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:02:19 -0400
Subject: [PATCH 350/823] workspace: Allow disabling of padding on zoomed
 panels (#31913)

Screenshot:

| Before | After |
| -------|------|
|
![image](https://github.com/user-attachments/assets/629e7da2-6070-4abb-b469-3b0824524ca4)
|
![image](https://github.com/user-attachments/assets/99e54412-2e0b-4df9-9c40-a89b0411f6d8)
|
|
![image](https://github.com/user-attachments/assets/e99da846-f39b-47b5-808e-65c22a1af47b)
|
![image](https://github.com/user-attachments/assets/ccd4408f-8cce-44ec-a69a-81794125ec99)
|


Release Notes:

- Added `zoomed_padding` to allow disabling of padding around zoomed
panels

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
---
 assets/settings/default.json               | 6 ++++++
 crates/workspace/src/workspace.rs          | 4 ++++
 crates/workspace/src/workspace_settings.rs | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 59450dcc15..f0b9e11e57 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -162,6 +162,12 @@
   //  2. Always quit the application
   //         "on_last_window_closed": "quit_app",
   "on_last_window_closed": "platform_default",
+  // Whether to show padding for zoomed panels.
+  // When enabled, zoomed center panels (e.g. code editor) will have padding all around,
+  // while zoomed bottom/left/right panels will have padding to the top/right/left (respectively).
+  //
+  // Default: true
+  "zoomed_padding": true,
   // Whether to use the system provided dialogs for Open and Save As.
   // When set to false, Zed will use the built-in keyboard-first pickers.
   "use_system_path_prompts": true,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 3654df09be..0b4694601e 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6633,6 +6633,10 @@ impl Render for Workspace {
                                         .inset_0()
                                         .shadow_lg();
 
+                                    if !WorkspaceSettings::get_global(cx).zoomed_padding {
+                                       return Some(div);
+                                    }
+
                                     Some(match self.zoomed_position {
                                         Some(DockPosition::Left) => div.right_2().border_r_1(),
                                         Some(DockPosition::Right) => div.left_2().border_l_1(),
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 5635347514..3b6bc1ea97 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -29,6 +29,7 @@ pub struct WorkspaceSettings {
     pub on_last_window_closed: OnLastWindowClosed,
     pub resize_all_panels_in_dock: Vec<DockPosition>,
     pub close_on_file_delete: bool,
+    pub zoomed_padding: bool,
 }
 
 #[derive(Copy, Clone, Default, Serialize, Deserialize, JsonSchema)]
@@ -202,6 +203,12 @@ pub struct WorkspaceSettingsContent {
     ///
     /// Default: false
     pub close_on_file_delete: Option<bool>,
+    /// Whether to show padding for zoomed panels.
+    /// When enabled, zoomed bottom panels will have some top padding,
+    /// while zoomed left/right panels will have padding to the right/left (respectively).
+    ///
+    /// Default: true
+    pub zoomed_padding: Option<bool>,
 }
 
 #[derive(Deserialize)]

From 949398cb93b6f68986cab45dc4ef91e6b54fb2b6 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:07:30 -0300
Subject: [PATCH 351/823] thread view: Fix some design papercuts (#36893)

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
Co-authored-by: Matt Miller <mattrx@gmail.com>
---
 crates/agent2/src/tools/find_path_tool.rs    |  27 +-
 crates/agent_ui/src/acp/thread_history.rs    |   2 +-
 crates/agent_ui/src/acp/thread_view.rs       | 296 +++++++++----------
 crates/assistant_tools/src/find_path_tool.rs |   8 +-
 crates/assistant_tools/src/read_file_tool.rs |   2 +-
 5 files changed, 152 insertions(+), 183 deletions(-)

diff --git a/crates/agent2/src/tools/find_path_tool.rs b/crates/agent2/src/tools/find_path_tool.rs
index 5b35c40f85..384bd56e77 100644
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -165,16 +165,17 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
         .collect();
 
     cx.background_spawn(async move {
-        Ok(snapshots
-            .iter()
-            .flat_map(|snapshot| {
+        let mut results = Vec::new();
+        for snapshot in snapshots {
+            for entry in snapshot.entries(false, 0) {
                 let root_name = PathBuf::from(snapshot.root_name());
-                snapshot
-                    .entries(false, 0)
-                    .map(move |entry| root_name.join(&entry.path))
-                    .filter(|path| path_matcher.is_match(&path))
-            })
-            .collect())
+                if path_matcher.is_match(root_name.join(&entry.path)) {
+                    results.push(snapshot.abs_path().join(entry.path.as_ref()));
+                }
+            }
+        }
+
+        Ok(results)
     })
 }
 
@@ -215,8 +216,8 @@ mod test {
         assert_eq!(
             matches,
             &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("/root/apple/banana/carrot")),
+                PathBuf::from(path!("/root/apple/bandana/carbonara"))
             ]
         );
 
@@ -227,8 +228,8 @@ mod test {
         assert_eq!(
             matches,
             &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("/root/apple/banana/carrot")),
+                PathBuf::from(path!("/root/apple/bandana/carbonara"))
             ]
         );
     }
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
index 5d852f0ddc..a49dae25b3 100644
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -462,7 +462,7 @@ impl AcpThreadHistory {
 
                         cx.notify();
                     }))
-                    .end_slot::<IconButton>(if hovered || selected {
+                    .end_slot::<IconButton>(if hovered {
                         Some(
                             IconButton::new("delete", IconName::Trash)
                                 .shape(IconButtonShape::Square)
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index d80f4eabce..837ce6f90a 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -35,6 +35,7 @@ use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
 use std::cell::Cell;
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Instant;
 use std::{collections::BTreeMap, rc::Rc, time::Duration};
@@ -1551,12 +1552,11 @@ impl AcpThreadView {
             return primary;
         };
 
-        let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
-        let primary = if entry_ix == total_entries - 1 && !is_generating {
+        let primary = if entry_ix == total_entries - 1 {
             v_flex()
                 .w_full()
                 .child(primary)
-                .child(self.render_thread_controls(cx))
+                .child(self.render_thread_controls(&thread, cx))
                 .when_some(
                     self.thread_feedback.comments_editor.clone(),
                     |this, editor| this.child(Self::render_feedback_feedback_editor(editor, cx)),
@@ -1698,15 +1698,16 @@ impl AcpThreadView {
             .into_any_element()
     }
 
-    fn render_tool_call_icon(
+    fn render_tool_call(
         &self,
-        group_name: SharedString,
         entry_ix: usize,
-        is_collapsible: bool,
-        is_open: bool,
         tool_call: &ToolCall,
+        window: &Window,
         cx: &Context<Self>,
     ) -> Div {
+        let header_id = SharedString::from(format!("outer-tool-call-header-{}", entry_ix));
+        let card_header_id = SharedString::from("inner-tool-call-header");
+
         let tool_icon =
             if tool_call.kind == acp::ToolKind::Edit && tool_call.locations.len() == 1 {
                 FileIcons::get_icon(&tool_call.locations[0].path, cx)
@@ -1714,7 +1715,7 @@ impl AcpThreadView {
                     .unwrap_or(Icon::new(IconName::ToolPencil))
             } else {
                 Icon::new(match tool_call.kind {
-                    acp::ToolKind::Read => IconName::ToolRead,
+                    acp::ToolKind::Read => IconName::ToolSearch,
                     acp::ToolKind::Edit => IconName::ToolPencil,
                     acp::ToolKind::Delete => IconName::ToolDeleteFile,
                     acp::ToolKind::Move => IconName::ArrowRightLeft,
@@ -1728,59 +1729,6 @@ impl AcpThreadView {
             .size(IconSize::Small)
             .color(Color::Muted);
 
-        let base_container = h_flex().flex_shrink_0().size_4().justify_center();
-
-        if is_collapsible {
-            base_container
-                .child(
-                    div()
-                        .group_hover(&group_name, |s| s.invisible().w_0())
-                        .child(tool_icon),
-                )
-                .child(
-                    h_flex()
-                        .absolute()
-                        .inset_0()
-                        .invisible()
-                        .justify_center()
-                        .group_hover(&group_name, |s| s.visible())
-                        .child(
-                            Disclosure::new(("expand", entry_ix), is_open)
-                                .opened_icon(IconName::ChevronUp)
-                                .closed_icon(IconName::ChevronRight)
-                                .on_click(cx.listener({
-                                    let id = tool_call.id.clone();
-                                    move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                        if is_open {
-                                            this.expanded_tool_calls.remove(&id);
-                                        } else {
-                                            this.expanded_tool_calls.insert(id.clone());
-                                        }
-                                        cx.notify();
-                                    }
-                                })),
-                        ),
-                )
-        } else {
-            base_container.child(tool_icon)
-        }
-    }
-
-    fn render_tool_call(
-        &self,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let header_id = SharedString::from(format!("outer-tool-call-header-{}", entry_ix));
-        let card_header_id = SharedString::from("inner-tool-call-header");
-
-        let in_progress = match &tool_call.status {
-            ToolCallStatus::InProgress => true,
-            _ => false,
-        };
-
         let failed_or_canceled = match &tool_call.status {
             ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
             _ => false,
@@ -1880,6 +1828,7 @@ impl AcpThreadView {
             .child(
                 h_flex()
                     .id(header_id)
+                    .group(&card_header_id)
                     .relative()
                     .w_full()
                     .max_w_full()
@@ -1897,19 +1846,11 @@ impl AcpThreadView {
                     })
                     .child(
                         h_flex()
-                            .group(&card_header_id)
                             .relative()
                             .w_full()
                             .h(window.line_height() - px(2.))
                             .text_size(self.tool_name_font_size())
-                            .child(self.render_tool_call_icon(
-                                card_header_id,
-                                entry_ix,
-                                is_collapsible,
-                                is_open,
-                                tool_call,
-                                cx,
-                            ))
+                            .child(tool_icon)
                             .child(if tool_call.locations.len() == 1 {
                                 let name = tool_call.locations[0]
                                     .path
@@ -1937,13 +1878,13 @@ impl AcpThreadView {
                                     })
                                     .child(name)
                                     .tooltip(Tooltip::text("Jump to File"))
+                                    .cursor(gpui::CursorStyle::PointingHand)
                                     .on_click(cx.listener(move |this, _, window, cx| {
                                         this.open_tool_call_location(entry_ix, 0, window, cx);
                                     }))
                                     .into_any_element()
                             } else {
                                 h_flex()
-                                    .id("non-card-label-container")
                                     .relative()
                                     .w_full()
                                     .max_w_full()
@@ -1954,47 +1895,39 @@ impl AcpThreadView {
                                         default_markdown_style(false, true, window, cx),
                                     )))
                                     .child(gradient_overlay(gradient_color))
-                                    .on_click(cx.listener({
-                                        let id = tool_call.id.clone();
-                                        move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                            if is_open {
-                                                this.expanded_tool_calls.remove(&id);
-                                            } else {
-                                                this.expanded_tool_calls.insert(id.clone());
-                                            }
-                                            cx.notify();
-                                        }
-                                    }))
                                     .into_any()
                             }),
                     )
-                    .when(in_progress && use_card_layout && !is_open, |this| {
-                        this.child(
-                            div().absolute().right_2().child(
-                                Icon::new(IconName::ArrowCircle)
-                                    .color(Color::Muted)
-                                    .size(IconSize::Small)
-                                    .with_animation(
-                                        "running",
-                                        Animation::new(Duration::from_secs(3)).repeat(),
-                                        |icon, delta| {
-                                            icon.transform(Transformation::rotate(percentage(
-                                                delta,
-                                            )))
-                                        },
-                                    ),
-                            ),
-                        )
-                    })
-                    .when(failed_or_canceled, |this| {
-                        this.child(
-                            div().absolute().right_2().child(
-                                Icon::new(IconName::Close)
-                                    .color(Color::Error)
-                                    .size(IconSize::Small),
-                            ),
-                        )
-                    }),
+                    .child(
+                        h_flex()
+                            .gap_px()
+                            .when(is_collapsible, |this| {
+                                this.child(
+                                    Disclosure::new(("expand", entry_ix), is_open)
+                                        .opened_icon(IconName::ChevronUp)
+                                        .closed_icon(IconName::ChevronDown)
+                                        .visible_on_hover(&card_header_id)
+                                        .on_click(cx.listener({
+                                            let id = tool_call.id.clone();
+                                            move |this: &mut Self, _, _, cx: &mut Context<Self>| {
+                                                if is_open {
+                                                    this.expanded_tool_calls.remove(&id);
+                                                } else {
+                                                    this.expanded_tool_calls.insert(id.clone());
+                                                }
+                                                cx.notify();
+                                            }
+                                        })),
+                                )
+                            })
+                            .when(failed_or_canceled, |this| {
+                                this.child(
+                                    Icon::new(IconName::Close)
+                                        .color(Color::Error)
+                                        .size(IconSize::Small),
+                                )
+                            }),
+                    ),
             )
             .children(tool_output_display)
     }
@@ -2064,9 +1997,27 @@ impl AcpThreadView {
         cx: &Context<Self>,
     ) -> AnyElement {
         let uri: SharedString = resource_link.uri.clone().into();
+        let is_file = resource_link.uri.strip_prefix("file://");
 
-        let label: SharedString = if let Some(path) = resource_link.uri.strip_prefix("file://") {
-            path.to_string().into()
+        let label: SharedString = if let Some(abs_path) = is_file {
+            if let Some(project_path) = self
+                .project
+                .read(cx)
+                .project_path_for_absolute_path(&Path::new(abs_path), cx)
+                && let Some(worktree) = self
+                    .project
+                    .read(cx)
+                    .worktree_for_id(project_path.worktree_id, cx)
+            {
+                worktree
+                    .read(cx)
+                    .full_path(&project_path.path)
+                    .to_string_lossy()
+                    .to_string()
+                    .into()
+            } else {
+                abs_path.to_string().into()
+            }
         } else {
             uri.clone()
         };
@@ -2083,10 +2034,12 @@ impl AcpThreadView {
                 Button::new(button_id, label)
                     .label_size(LabelSize::Small)
                     .color(Color::Muted)
-                    .icon(IconName::ArrowUpRight)
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(Color::Muted)
                     .truncate(true)
+                    .when(is_file.is_none(), |this| {
+                        this.icon(IconName::ArrowUpRight)
+                            .icon_size(IconSize::XSmall)
+                            .icon_color(Color::Muted)
+                    })
                     .on_click(cx.listener({
                         let workspace = self.workspace.clone();
                         move |_, _, window, cx: &mut Context<Self>| {
@@ -3727,16 +3680,19 @@ impl AcpThreadView {
 
     fn toggle_following(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let following = self.is_following(cx);
+
         self.should_be_following = !following;
-        self.workspace
-            .update(cx, |workspace, cx| {
-                if following {
-                    workspace.unfollow(CollaboratorId::Agent, window, cx);
-                } else {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                }
-            })
-            .ok();
+        if self.thread().map(|thread| thread.read(cx).status()) == Some(ThreadStatus::Generating) {
+            self.workspace
+                .update(cx, |workspace, cx| {
+                    if following {
+                        workspace.unfollow(CollaboratorId::Agent, window, cx);
+                    } else {
+                        workspace.follow(CollaboratorId::Agent, window, cx);
+                    }
+                })
+                .ok();
+        }
 
         telemetry::event!("Follow Agent Selected", following = !following);
     }
@@ -3744,6 +3700,20 @@ impl AcpThreadView {
     fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
         let following = self.is_following(cx);
 
+        let tooltip_label = if following {
+            if self.agent.name() == "Zed Agent" {
+                format!("Stop Following the {}", self.agent.name())
+            } else {
+                format!("Stop Following {}", self.agent.name())
+            }
+        } else {
+            if self.agent.name() == "Zed Agent" {
+                format!("Follow the {}", self.agent.name())
+            } else {
+                format!("Follow {}", self.agent.name())
+            }
+        };
+
         IconButton::new("follow-agent", IconName::Crosshair)
             .icon_size(IconSize::Small)
             .icon_color(Color::Muted)
@@ -3751,10 +3721,10 @@ impl AcpThreadView {
             .selected_icon_color(Some(Color::Custom(cx.theme().players().agent().cursor)))
             .tooltip(move |window, cx| {
                 if following {
-                    Tooltip::for_action("Stop Following Agent", &Follow, window, cx)
+                    Tooltip::for_action(tooltip_label.clone(), &Follow, window, cx)
                 } else {
                     Tooltip::with_meta(
-                        "Follow Agent",
+                        tooltip_label.clone(),
                         Some(&Follow),
                         "Track the agent's location as it reads and edits files.",
                         window,
@@ -4175,7 +4145,20 @@ impl AcpThreadView {
         }
     }
 
-    fn render_thread_controls(&self, cx: &Context<Self>) -> impl IntoElement {
+    fn render_thread_controls(
+        &self,
+        thread: &Entity<AcpThread>,
+        cx: &Context<Self>,
+    ) -> impl IntoElement {
+        let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
+        if is_generating {
+            return h_flex().id("thread-controls-container").ml_1().child(
+                div()
+                    .py_2()
+                    .px(rems_from_px(22.))
+                    .child(SpinnerLabel::new().size(LabelSize::Small)),
+            );
+        }
         let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown)
             .shape(ui::IconButtonShape::Square)
             .icon_size(IconSize::Small)
@@ -4899,45 +4882,30 @@ impl Render for AcpThreadView {
                     .items_center()
                     .justify_end()
                     .child(self.render_load_error(e, cx)),
-                ThreadState::Ready { thread, .. } => {
-                    let thread_clone = thread.clone();
-
-                    v_flex().flex_1().map(|this| {
-                        if has_messages {
-                            this.child(
-                                list(
-                                    self.list_state.clone(),
-                                    cx.processor(|this, index: usize, window, cx| {
-                                        let Some((entry, len)) = this.thread().and_then(|thread| {
-                                            let entries = &thread.read(cx).entries();
-                                            Some((entries.get(index)?, entries.len()))
-                                        }) else {
-                                            return Empty.into_any();
-                                        };
-                                        this.render_entry(index, len, entry, window, cx)
-                                    }),
-                                )
-                                .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-                                .flex_grow()
-                                .into_any(),
+                ThreadState::Ready { .. } => v_flex().flex_1().map(|this| {
+                    if has_messages {
+                        this.child(
+                            list(
+                                self.list_state.clone(),
+                                cx.processor(|this, index: usize, window, cx| {
+                                    let Some((entry, len)) = this.thread().and_then(|thread| {
+                                        let entries = &thread.read(cx).entries();
+                                        Some((entries.get(index)?, entries.len()))
+                                    }) else {
+                                        return Empty.into_any();
+                                    };
+                                    this.render_entry(index, len, entry, window, cx)
+                                }),
                             )
-                            .child(self.render_vertical_scrollbar(cx))
-                            .children(
-                                match thread_clone.read(cx).status() {
-                                    ThreadStatus::Idle
-                                    | ThreadStatus::WaitingForToolConfirmation => None,
-                                    ThreadStatus::Generating => div()
-                                        .py_2()
-                                        .px(rems_from_px(22.))
-                                        .child(SpinnerLabel::new().size(LabelSize::Small))
-                                        .into(),
-                                },
-                            )
-                        } else {
-                            this.child(self.render_recent_history(window, cx))
-                        }
-                    })
-                }
+                            .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
+                            .flex_grow()
+                            .into_any(),
+                        )
+                        .child(self.render_vertical_scrollbar(cx))
+                    } else {
+                        this.child(self.render_recent_history(window, cx))
+                    }
+                }),
             })
             // The activity bar is intentionally rendered outside of the ThreadState::Ready match
             // above so that the scrollbar doesn't render behind it. The current setup allows
diff --git a/crates/assistant_tools/src/find_path_tool.rs b/crates/assistant_tools/src/find_path_tool.rs
index ac2c7a32ab..d1451132ae 100644
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -435,8 +435,8 @@ mod test {
         assert_eq!(
             matches,
             &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("root/apple/banana/carrot")),
+                PathBuf::from(path!("root/apple/bandana/carbonara"))
             ]
         );
 
@@ -447,8 +447,8 @@ mod test {
         assert_eq!(
             matches,
             &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
+                PathBuf::from(path!("root/apple/banana/carrot")),
+                PathBuf::from(path!("root/apple/bandana/carbonara"))
             ]
         );
     }
diff --git a/crates/assistant_tools/src/read_file_tool.rs b/crates/assistant_tools/src/read_file_tool.rs
index 766ee3b161..a6e984fca6 100644
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -68,7 +68,7 @@ impl Tool for ReadFileTool {
     }
 
     fn icon(&self) -> IconName {
-        IconName::ToolRead
+        IconName::ToolSearch
     }
 
     fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {

From 4605b9663059df38176db1c19c9edb1d52ac0ece Mon Sep 17 00:00:00 2001
From: John Tur <john-tur@outlook.com>
Date: Mon, 25 Aug 2025 15:45:28 -0400
Subject: [PATCH 352/823] Fix constant thread creation on Windows (#36779)

See
https://github.com/zed-industries/zed/issues/36057#issuecomment-3215808649

Fixes https://github.com/zed-industries/zed/issues/36057

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/dispatcher.rs | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/crates/gpui/src/platform/windows/dispatcher.rs b/crates/gpui/src/platform/windows/dispatcher.rs
index e5b9c020d5..f554dea128 100644
--- a/crates/gpui/src/platform/windows/dispatcher.rs
+++ b/crates/gpui/src/platform/windows/dispatcher.rs
@@ -9,10 +9,8 @@ use parking::Parker;
 use parking_lot::Mutex;
 use util::ResultExt;
 use windows::{
-    Foundation::TimeSpan,
     System::Threading::{
-        ThreadPool, ThreadPoolTimer, TimerElapsedHandler, WorkItemHandler, WorkItemOptions,
-        WorkItemPriority,
+        ThreadPool, ThreadPoolTimer, TimerElapsedHandler, WorkItemHandler, WorkItemPriority,
     },
     Win32::{
         Foundation::{LPARAM, WPARAM},
@@ -56,12 +54,7 @@ impl WindowsDispatcher {
                 Ok(())
             })
         };
-        ThreadPool::RunWithPriorityAndOptionsAsync(
-            &handler,
-            WorkItemPriority::High,
-            WorkItemOptions::TimeSliced,
-        )
-        .log_err();
+        ThreadPool::RunWithPriorityAsync(&handler, WorkItemPriority::High).log_err();
     }
 
     fn dispatch_on_threadpool_after(&self, runnable: Runnable, duration: Duration) {
@@ -72,12 +65,7 @@ impl WindowsDispatcher {
                 Ok(())
             })
         };
-        let delay = TimeSpan {
-            // A time period expressed in 100-nanosecond units.
-            // 10,000,000 ticks per second
-            Duration: (duration.as_nanos() / 100) as i64,
-        };
-        ThreadPoolTimer::CreateTimer(&handler, delay).log_err();
+        ThreadPoolTimer::CreateTimer(&handler, duration.into()).log_err();
     }
 }
 

From 0470baca50a557491d0a193ec125500c5bf22770 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Mon, 25 Aug 2025 13:50:08 -0600
Subject: [PATCH 353/823] open_ai: Remove `model` field from
 ResponseStreamEvent (#36902)

Closes #36901

Release Notes:

- Fixed use of Open WebUI as an LLM provider.
---
 crates/open_ai/src/open_ai.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index acf6ec434a..08be82b830 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -446,7 +446,6 @@ pub enum ResponseStreamResult {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ResponseStreamEvent {
-    pub model: String,
     pub choices: Vec<ChoiceDelta>,
     pub usage: Option<Usage>,
 }

From 9cc006ff7473afbfa999c3424b221326ade4ccf1 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 25 Aug 2025 14:07:10 -0600
Subject: [PATCH 354/823] acp: Update error matching (#36898)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs | 21 ++++++++++++---------
 crates/agent_servers/src/acp.rs     |  4 +++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 779f9964da..4ded647a74 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -183,16 +183,15 @@ impl ToolCall {
         language_registry: Arc<LanguageRegistry>,
         cx: &mut App,
     ) -> Self {
+        let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
+            first_line.to_owned() + "…"
+        } else {
+            tool_call.title
+        };
         Self {
             id: tool_call.id,
-            label: cx.new(|cx| {
-                Markdown::new(
-                    tool_call.title.into(),
-                    Some(language_registry.clone()),
-                    None,
-                    cx,
-                )
-            }),
+            label: cx
+                .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
             kind: tool_call.kind,
             content: tool_call
                 .content
@@ -233,7 +232,11 @@ impl ToolCall {
 
         if let Some(title) = title {
             self.label.update(cx, |label, cx| {
-                label.replace(title, cx);
+                if let Some((first_line, _)) = title.split_once("\n") {
+                    label.replace(first_line.to_owned() + "…", cx)
+                } else {
+                    label.replace(title, cx);
+                }
             });
         }
 
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 5a4efe12e5..9080fc1ab0 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -266,7 +266,9 @@ impl AgentConnection for AcpConnection {
 
                     match serde_json::from_value(data.clone()) {
                         Ok(ErrorDetails { details }) => {
-                            if suppress_abort_err && details.contains("This operation was aborted")
+                            if suppress_abort_err
+                                && (details.contains("This operation was aborted")
+                                    || details.contains("The user aborted a request"))
                             {
                                 Ok(acp::PromptResponse {
                                     stop_reason: acp::StopReason::Cancelled,

From 823a0018e5a5f758c63ab68622db23e1dfa45fba Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 25 Aug 2025 16:10:17 -0400
Subject: [PATCH 355/823] acp: Show output for read_file tool in a code block
 (#36900)

Release Notes:

- N/A
---
 crates/agent2/src/tools/read_file_tool.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index fea9732093..e771c26eca 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -11,6 +11,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
 use std::{path::Path, sync::Arc};
+use util::markdown::MarkdownCodeBlock;
 
 use crate::{AgentTool, ToolCallEventStream};
 
@@ -243,6 +244,19 @@ impl AgentTool for ReadFileTool {
                         }]),
                         ..Default::default()
                     });
+                    if let Ok(LanguageModelToolResultContent::Text(text)) = &result {
+                        let markdown = MarkdownCodeBlock {
+                            tag: &input.path,
+                            text,
+                        }
+                        .to_string();
+                        event_stream.update_fields(ToolCallUpdateFields {
+                            content: Some(vec![acp::ToolCallContent::Content {
+                                content: markdown.into(),
+                            }]),
+                            ..Default::default()
+                        })
+                    }
                 }
             })?;
 

From 99cee8778cc7c6ee9ddd405f5f00caa713299d68 Mon Sep 17 00:00:00 2001
From: Alvaro Parker <64918109+AlvaroParker@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:18:03 -0400
Subject: [PATCH 356/823] tab_switcher: Add support for diagnostics (#34547)

Support to show diagnostics on the tab switcher in the same way they are
displayed on the tab bar. This follows the setting
`tabs.show_diagnostics`.

This will improve user experience when disabling the tab bar and still
being able to see the diagnostics when switching tabs

Preview:

<img width="768" height="523" alt="Screenshot From 2025-07-16 11-02-42"
src="https://github.com/user-attachments/assets/308873ba-0458-485d-ae05-0de7c1cdfb28"
/>


Release Notes:

- Added diagnostics indicators to the tab switcher

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/language/src/buffer.rs           |  20 +++--
 crates/project/src/lsp_store.rs         |  23 +++--
 crates/tab_switcher/src/tab_switcher.rs | 114 +++++++++++++++++-------
 3 files changed, 108 insertions(+), 49 deletions(-)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index b106110c33..4ddc2b3018 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1569,11 +1569,21 @@ impl Buffer {
         self.send_operation(op, true, cx);
     }
 
-    pub fn get_diagnostics(&self, server_id: LanguageServerId) -> Option<&DiagnosticSet> {
-        let Ok(idx) = self.diagnostics.binary_search_by_key(&server_id, |v| v.0) else {
-            return None;
-        };
-        Some(&self.diagnostics[idx].1)
+    pub fn buffer_diagnostics(
+        &self,
+        for_server: Option<LanguageServerId>,
+    ) -> Vec<&DiagnosticEntry<Anchor>> {
+        match for_server {
+            Some(server_id) => match self.diagnostics.binary_search_by_key(&server_id, |v| v.0) {
+                Ok(idx) => self.diagnostics[idx].1.iter().collect(),
+                Err(_) => Vec::new(),
+            },
+            None => self
+                .diagnostics
+                .iter()
+                .flat_map(|(_, diagnostic_set)| diagnostic_set.iter())
+                .collect(),
+        }
     }
 
     fn request_autoindent(&mut self, cx: &mut Context<Self>) {
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 853490ddac..deebaedd74 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -7588,19 +7588,16 @@ impl LspStore {
                 let snapshot = buffer_handle.read(cx).snapshot();
                 let buffer = buffer_handle.read(cx);
                 let reused_diagnostics = buffer
-                    .get_diagnostics(server_id)
-                    .into_iter()
-                    .flat_map(|diag| {
-                        diag.iter()
-                            .filter(|v| merge(buffer, &v.diagnostic, cx))
-                            .map(|v| {
-                                let start = Unclipped(v.range.start.to_point_utf16(&snapshot));
-                                let end = Unclipped(v.range.end.to_point_utf16(&snapshot));
-                                DiagnosticEntry {
-                                    range: start..end,
-                                    diagnostic: v.diagnostic.clone(),
-                                }
-                            })
+                    .buffer_diagnostics(Some(server_id))
+                    .iter()
+                    .filter(|v| merge(buffer, &v.diagnostic, cx))
+                    .map(|v| {
+                        let start = Unclipped(v.range.start.to_point_utf16(&snapshot));
+                        let end = Unclipped(v.range.end.to_point_utf16(&snapshot));
+                        DiagnosticEntry {
+                            range: start..end,
+                            diagnostic: v.diagnostic.clone(),
+                        }
                     })
                     .collect::<Vec<_>>();
 
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 7c70bcd5b5..bf3ce7b568 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -2,12 +2,14 @@
 mod tab_switcher_tests;
 
 use collections::HashMap;
-use editor::items::entry_git_aware_label_color;
+use editor::items::{
+    entry_diagnostic_aware_icon_decoration_and_color, entry_git_aware_label_color,
+};
 use fuzzy::StringMatchCandidate;
 use gpui::{
     Action, AnyElement, App, Context, DismissEvent, Entity, EntityId, EventEmitter, FocusHandle,
-    Focusable, Modifiers, ModifiersChangedEvent, MouseButton, MouseUpEvent, ParentElement, Render,
-    Styled, Task, WeakEntity, Window, actions, rems,
+    Focusable, Modifiers, ModifiersChangedEvent, MouseButton, MouseUpEvent, ParentElement, Point,
+    Render, Styled, Task, WeakEntity, Window, actions, rems,
 };
 use picker::{Picker, PickerDelegate};
 use project::Project;
@@ -15,11 +17,14 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use settings::Settings;
 use std::{cmp::Reverse, sync::Arc};
-use ui::{ListItem, ListItemSpacing, Tooltip, prelude::*};
+use ui::{
+    DecoratedIcon, IconDecoration, IconDecorationKind, ListItem, ListItemSpacing, Tooltip,
+    prelude::*,
+};
 use util::ResultExt;
 use workspace::{
     ModalView, Pane, SaveIntent, Workspace,
-    item::{ItemHandle, ItemSettings, TabContentParams},
+    item::{ItemHandle, ItemSettings, ShowDiagnostics, TabContentParams},
     pane::{Event as PaneEvent, render_item_indicator, tab_details},
 };
 
@@ -233,6 +238,77 @@ pub struct TabSwitcherDelegate {
     restored_items: bool,
 }
 
+impl TabMatch {
+    fn icon(
+        &self,
+        project: &Entity<Project>,
+        selected: bool,
+        window: &Window,
+        cx: &App,
+    ) -> Option<DecoratedIcon> {
+        let icon = self.item.tab_icon(window, cx)?;
+        let item_settings = ItemSettings::get_global(cx);
+        let show_diagnostics = item_settings.show_diagnostics;
+        let git_status_color = item_settings
+            .git_status
+            .then(|| {
+                let path = self.item.project_path(cx)?;
+                let project = project.read(cx);
+                let entry = project.entry_for_path(&path, cx)?;
+                let git_status = project
+                    .project_path_git_status(&path, cx)
+                    .map(|status| status.summary())
+                    .unwrap_or_default();
+                Some(entry_git_aware_label_color(
+                    git_status,
+                    entry.is_ignored,
+                    selected,
+                ))
+            })
+            .flatten();
+        let colored_icon = icon.color(git_status_color.unwrap_or_default());
+
+        let most_sever_diagostic_level = if show_diagnostics == ShowDiagnostics::Off {
+            None
+        } else {
+            let buffer_store = project.read(cx).buffer_store().read(cx);
+            let buffer = self
+                .item
+                .project_path(cx)
+                .and_then(|path| buffer_store.get_by_path(&path))
+                .map(|buffer| buffer.read(cx));
+            buffer.and_then(|buffer| {
+                buffer
+                    .buffer_diagnostics(None)
+                    .iter()
+                    .map(|diagnostic_entry| diagnostic_entry.diagnostic.severity)
+                    .min()
+            })
+        };
+
+        let decorations =
+            entry_diagnostic_aware_icon_decoration_and_color(most_sever_diagostic_level)
+                .filter(|(d, _)| {
+                    *d != IconDecorationKind::Triangle
+                        || show_diagnostics != ShowDiagnostics::Errors
+                })
+                .map(|(icon, color)| {
+                    let knockout_item_color = if selected {
+                        cx.theme().colors().element_selected
+                    } else {
+                        cx.theme().colors().element_background
+                    };
+                    IconDecoration::new(icon, knockout_item_color, cx)
+                        .color(color.color(cx))
+                        .position(Point {
+                            x: px(-2.),
+                            y: px(-2.),
+                        })
+                });
+        Some(DecoratedIcon::new(colored_icon, decorations))
+    }
+}
+
 impl TabSwitcherDelegate {
     #[allow(clippy::complexity)]
     fn new(
@@ -574,31 +650,7 @@ impl PickerDelegate for TabSwitcherDelegate {
         };
         let label = tab_match.item.tab_content(params, window, cx);
 
-        let icon = tab_match.item.tab_icon(window, cx).map(|icon| {
-            let git_status_color = ItemSettings::get_global(cx)
-                .git_status
-                .then(|| {
-                    tab_match
-                        .item
-                        .project_path(cx)
-                        .as_ref()
-                        .and_then(|path| {
-                            let project = self.project.read(cx);
-                            let entry = project.entry_for_path(path, cx)?;
-                            let git_status = project
-                                .project_path_git_status(path, cx)
-                                .map(|status| status.summary())
-                                .unwrap_or_default();
-                            Some((entry, git_status))
-                        })
-                        .map(|(entry, git_status)| {
-                            entry_git_aware_label_color(git_status, entry.is_ignored, selected)
-                        })
-                })
-                .flatten();
-
-            icon.color(git_status_color.unwrap_or_default())
-        });
+        let icon = tab_match.icon(&self.project, selected, window, cx);
 
         let indicator = render_item_indicator(tab_match.item.boxed_clone(), cx);
         let indicator_color = if let Some(ref indicator) = indicator {
@@ -640,7 +692,7 @@ impl PickerDelegate for TabSwitcherDelegate {
                 .inset(true)
                 .toggle_state(selected)
                 .child(h_flex().w_full().child(label))
-                .start_slot::<Icon>(icon)
+                .start_slot::<DecoratedIcon>(icon)
                 .map(|el| {
                     if self.selected_index == ix {
                         el.end_slot::<AnyElement>(close_button)

From ad25aba990cc26b41903a91cdbff9bfec07ff95c Mon Sep 17 00:00:00 2001
From: Gwen Lg <105106246+gwen-lg@users.noreply.github.com>
Date: Mon, 25 Aug 2025 22:23:29 +0200
Subject: [PATCH 357/823] remote_server: Improve error reporting (#33770)

Closes #33736

Use `thiserror` to implement error stack and `anyhow` to report is to
user.
Also move some code from main to remote_server to have better crate
isolation.

Release Notes:

- N/A

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 Cargo.lock                                |   1 +
 crates/remote_server/Cargo.toml           |   1 +
 crates/remote_server/src/main.rs          |  90 ++-----------
 crates/remote_server/src/remote_server.rs |  74 +++++++++++
 crates/remote_server/src/unix.rs          | 155 ++++++++++++++++++----
 5 files changed, 216 insertions(+), 105 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c835b503ad..42649b137f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13521,6 +13521,7 @@ dependencies = [
  "smol",
  "sysinfo",
  "telemetry_events",
+ "thiserror 2.0.12",
  "toml 0.8.20",
  "unindent",
  "util",
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index dcec9f6fe0..5dbb9a2771 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -65,6 +65,7 @@ telemetry_events.workspace = true
 util.workspace = true
 watch.workspace = true
 worktree.workspace = true
+thiserror.workspace = true
 
 [target.'cfg(not(windows))'.dependencies]
 crashes.workspace = true
diff --git a/crates/remote_server/src/main.rs b/crates/remote_server/src/main.rs
index 03b0c3eda3..368c7cb639 100644
--- a/crates/remote_server/src/main.rs
+++ b/crates/remote_server/src/main.rs
@@ -1,6 +1,7 @@
 #![cfg_attr(target_os = "windows", allow(unused, dead_code))]
 
-use clap::{Parser, Subcommand};
+use clap::Parser;
+use remote_server::Commands;
 use std::path::PathBuf;
 
 #[derive(Parser)]
@@ -21,105 +22,34 @@ struct Cli {
     printenv: bool,
 }
 
-#[derive(Subcommand)]
-enum Commands {
-    Run {
-        #[arg(long)]
-        log_file: PathBuf,
-        #[arg(long)]
-        pid_file: PathBuf,
-        #[arg(long)]
-        stdin_socket: PathBuf,
-        #[arg(long)]
-        stdout_socket: PathBuf,
-        #[arg(long)]
-        stderr_socket: PathBuf,
-    },
-    Proxy {
-        #[arg(long)]
-        reconnect: bool,
-        #[arg(long)]
-        identifier: String,
-    },
-    Version,
-}
-
 #[cfg(windows)]
 fn main() {
     unimplemented!()
 }
 
 #[cfg(not(windows))]
-fn main() {
-    use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
-    use remote::proxy::ProxyLaunchError;
-    use remote_server::unix::{execute_proxy, execute_run};
-
+fn main() -> anyhow::Result<()> {
     let cli = Cli::parse();
 
     if let Some(socket_path) = &cli.askpass {
         askpass::main(socket_path);
-        return;
+        return Ok(());
     }
 
     if let Some(socket) = &cli.crash_handler {
         crashes::crash_server(socket.as_path());
-        return;
+        return Ok(());
     }
 
     if cli.printenv {
         util::shell_env::print_env();
-        return;
+        return Ok(());
     }
 
-    let result = match cli.command {
-        Some(Commands::Run {
-            log_file,
-            pid_file,
-            stdin_socket,
-            stdout_socket,
-            stderr_socket,
-        }) => execute_run(
-            log_file,
-            pid_file,
-            stdin_socket,
-            stdout_socket,
-            stderr_socket,
-        ),
-        Some(Commands::Proxy {
-            identifier,
-            reconnect,
-        }) => match execute_proxy(identifier, reconnect) {
-            Ok(_) => Ok(()),
-            Err(err) => {
-                if let Some(err) = err.downcast_ref::<ProxyLaunchError>() {
-                    std::process::exit(err.to_exit_code());
-                }
-                Err(err)
-            }
-        },
-        Some(Commands::Version) => {
-            let release_channel = *RELEASE_CHANNEL;
-            match release_channel {
-                ReleaseChannel::Stable | ReleaseChannel::Preview => {
-                    println!("{}", env!("ZED_PKG_VERSION"))
-                }
-                ReleaseChannel::Nightly | ReleaseChannel::Dev => {
-                    println!(
-                        "{}",
-                        option_env!("ZED_COMMIT_SHA").unwrap_or(release_channel.dev_name())
-                    )
-                }
-            };
-            std::process::exit(0);
-        }
-        None => {
-            eprintln!("usage: remote <run|proxy|version>");
-            std::process::exit(1);
-        }
-    };
-    if let Err(error) = result {
-        log::error!("exiting due to error: {}", error);
+    if let Some(command) = cli.command {
+        remote_server::run(command)
+    } else {
+        eprintln!("usage: remote <run|proxy|version>");
         std::process::exit(1);
     }
 }
diff --git a/crates/remote_server/src/remote_server.rs b/crates/remote_server/src/remote_server.rs
index 52003969af..c14a4828ac 100644
--- a/crates/remote_server/src/remote_server.rs
+++ b/crates/remote_server/src/remote_server.rs
@@ -6,4 +6,78 @@ pub mod unix;
 #[cfg(test)]
 mod remote_editing_tests;
 
+use clap::Subcommand;
+use std::path::PathBuf;
+
 pub use headless_project::{HeadlessAppState, HeadlessProject};
+
+#[derive(Subcommand)]
+pub enum Commands {
+    Run {
+        #[arg(long)]
+        log_file: PathBuf,
+        #[arg(long)]
+        pid_file: PathBuf,
+        #[arg(long)]
+        stdin_socket: PathBuf,
+        #[arg(long)]
+        stdout_socket: PathBuf,
+        #[arg(long)]
+        stderr_socket: PathBuf,
+    },
+    Proxy {
+        #[arg(long)]
+        reconnect: bool,
+        #[arg(long)]
+        identifier: String,
+    },
+    Version,
+}
+
+#[cfg(not(windows))]
+pub fn run(command: Commands) -> anyhow::Result<()> {
+    use anyhow::Context;
+    use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
+    use unix::{ExecuteProxyError, execute_proxy, execute_run};
+
+    match command {
+        Commands::Run {
+            log_file,
+            pid_file,
+            stdin_socket,
+            stdout_socket,
+            stderr_socket,
+        } => execute_run(
+            log_file,
+            pid_file,
+            stdin_socket,
+            stdout_socket,
+            stderr_socket,
+        ),
+        Commands::Proxy {
+            identifier,
+            reconnect,
+        } => execute_proxy(identifier, reconnect)
+            .inspect_err(|err| {
+                if let ExecuteProxyError::ServerNotRunning(err) = err {
+                    std::process::exit(err.to_exit_code());
+                }
+            })
+            .context("running proxy on the remote server"),
+        Commands::Version => {
+            let release_channel = *RELEASE_CHANNEL;
+            match release_channel {
+                ReleaseChannel::Stable | ReleaseChannel::Preview => {
+                    println!("{}", env!("ZED_PKG_VERSION"))
+                }
+                ReleaseChannel::Nightly | ReleaseChannel::Dev => {
+                    println!(
+                        "{}",
+                        option_env!("ZED_COMMIT_SHA").unwrap_or(release_channel.dev_name())
+                    )
+                }
+            };
+            Ok(())
+        }
+    }
+}
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index b8a7351552..c6d1566d60 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -36,6 +36,7 @@ use smol::Async;
 use smol::{net::unix::UnixListener, stream::StreamExt as _};
 use std::ffi::OsStr;
 use std::ops::ControlFlow;
+use std::process::ExitStatus;
 use std::str::FromStr;
 use std::sync::LazyLock;
 use std::{env, thread};
@@ -46,6 +47,7 @@ use std::{
     sync::Arc,
 };
 use telemetry_events::LocationData;
+use thiserror::Error;
 use util::ResultExt;
 
 pub static VERSION: LazyLock<&str> = LazyLock::new(|| match *RELEASE_CHANNEL {
@@ -526,7 +528,23 @@ pub fn execute_run(
     Ok(())
 }
 
-#[derive(Clone)]
+#[derive(Debug, Error)]
+pub(crate) enum ServerPathError {
+    #[error("Failed to create server_dir `{path}`")]
+    CreateServerDir {
+        #[source]
+        source: std::io::Error,
+        path: PathBuf,
+    },
+    #[error("Failed to create logs_dir `{path}`")]
+    CreateLogsDir {
+        #[source]
+        source: std::io::Error,
+        path: PathBuf,
+    },
+}
+
+#[derive(Clone, Debug)]
 struct ServerPaths {
     log_file: PathBuf,
     pid_file: PathBuf,
@@ -536,10 +554,19 @@ struct ServerPaths {
 }
 
 impl ServerPaths {
-    fn new(identifier: &str) -> Result<Self> {
+    fn new(identifier: &str) -> Result<Self, ServerPathError> {
         let server_dir = paths::remote_server_state_dir().join(identifier);
-        std::fs::create_dir_all(&server_dir)?;
-        std::fs::create_dir_all(&logs_dir())?;
+        std::fs::create_dir_all(&server_dir).map_err(|source| {
+            ServerPathError::CreateServerDir {
+                source,
+                path: server_dir.clone(),
+            }
+        })?;
+        let log_dir = logs_dir();
+        std::fs::create_dir_all(log_dir).map_err(|source| ServerPathError::CreateLogsDir {
+            source: source,
+            path: log_dir.clone(),
+        })?;
 
         let pid_file = server_dir.join("server.pid");
         let stdin_socket = server_dir.join("stdin.sock");
@@ -557,7 +584,43 @@ impl ServerPaths {
     }
 }
 
-pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
+#[derive(Debug, Error)]
+pub(crate) enum ExecuteProxyError {
+    #[error("Failed to init server paths")]
+    ServerPath(#[from] ServerPathError),
+
+    #[error(transparent)]
+    ServerNotRunning(#[from] ProxyLaunchError),
+
+    #[error("Failed to check PidFile '{path}'")]
+    CheckPidFile {
+        #[source]
+        source: CheckPidError,
+        path: PathBuf,
+    },
+
+    #[error("Failed to kill existing server with pid '{pid}'")]
+    KillRunningServer {
+        #[source]
+        source: std::io::Error,
+        pid: u32,
+    },
+
+    #[error("failed to spawn server")]
+    SpawnServer(#[source] SpawnServerError),
+
+    #[error("stdin_task failed")]
+    StdinTask(#[source] anyhow::Error),
+    #[error("stdout_task failed")]
+    StdoutTask(#[source] anyhow::Error),
+    #[error("stderr_task failed")]
+    StderrTask(#[source] anyhow::Error),
+}
+
+pub(crate) fn execute_proxy(
+    identifier: String,
+    is_reconnecting: bool,
+) -> Result<(), ExecuteProxyError> {
     init_logging_proxy();
 
     let server_paths = ServerPaths::new(&identifier)?;
@@ -574,12 +637,19 @@ pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
 
     log::info!("starting proxy process. PID: {}", std::process::id());
 
-    let server_pid = check_pid_file(&server_paths.pid_file)?;
+    let server_pid = check_pid_file(&server_paths.pid_file).map_err(|source| {
+        ExecuteProxyError::CheckPidFile {
+            source,
+            path: server_paths.pid_file.clone(),
+        }
+    })?;
     let server_running = server_pid.is_some();
     if is_reconnecting {
         if !server_running {
             log::error!("attempted to reconnect, but no server running");
-            anyhow::bail!(ProxyLaunchError::ServerNotRunning);
+            return Err(ExecuteProxyError::ServerNotRunning(
+                ProxyLaunchError::ServerNotRunning,
+            ));
         }
     } else {
         if let Some(pid) = server_pid {
@@ -590,7 +660,7 @@ pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
             kill_running_server(pid, &server_paths)?;
         }
 
-        spawn_server(&server_paths)?;
+        spawn_server(&server_paths).map_err(ExecuteProxyError::SpawnServer)?;
     };
 
     let stdin_task = smol::spawn(async move {
@@ -630,9 +700,9 @@ pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
 
     if let Err(forwarding_result) = smol::block_on(async move {
         futures::select! {
-            result = stdin_task.fuse() => result.context("stdin_task failed"),
-            result = stdout_task.fuse() => result.context("stdout_task failed"),
-            result = stderr_task.fuse() => result.context("stderr_task failed"),
+            result = stdin_task.fuse() => result.map_err(ExecuteProxyError::StdinTask),
+            result = stdout_task.fuse() => result.map_err(ExecuteProxyError::StdoutTask),
+            result = stderr_task.fuse() => result.map_err(ExecuteProxyError::StderrTask),
         }
     }) {
         log::error!(
@@ -645,12 +715,12 @@ pub fn execute_proxy(identifier: String, is_reconnecting: bool) -> Result<()> {
     Ok(())
 }
 
-fn kill_running_server(pid: u32, paths: &ServerPaths) -> Result<()> {
+fn kill_running_server(pid: u32, paths: &ServerPaths) -> Result<(), ExecuteProxyError> {
     log::info!("killing existing server with PID {}", pid);
     std::process::Command::new("kill")
         .arg(pid.to_string())
         .output()
-        .context("failed to kill existing server")?;
+        .map_err(|source| ExecuteProxyError::KillRunningServer { source, pid })?;
 
     for file in [
         &paths.pid_file,
@@ -664,18 +734,39 @@ fn kill_running_server(pid: u32, paths: &ServerPaths) -> Result<()> {
     Ok(())
 }
 
-fn spawn_server(paths: &ServerPaths) -> Result<()> {
+#[derive(Debug, Error)]
+pub(crate) enum SpawnServerError {
+    #[error("failed to remove stdin socket")]
+    RemoveStdinSocket(#[source] std::io::Error),
+
+    #[error("failed to remove stdout socket")]
+    RemoveStdoutSocket(#[source] std::io::Error),
+
+    #[error("failed to remove stderr socket")]
+    RemoveStderrSocket(#[source] std::io::Error),
+
+    #[error("failed to get current_exe")]
+    CurrentExe(#[source] std::io::Error),
+
+    #[error("failed to launch server process")]
+    ProcessStatus(#[source] std::io::Error),
+
+    #[error("failed to launch and detach server process: {status}\n{paths}")]
+    LaunchStatus { status: ExitStatus, paths: String },
+}
+
+fn spawn_server(paths: &ServerPaths) -> Result<(), SpawnServerError> {
     if paths.stdin_socket.exists() {
-        std::fs::remove_file(&paths.stdin_socket)?;
+        std::fs::remove_file(&paths.stdin_socket).map_err(SpawnServerError::RemoveStdinSocket)?;
     }
     if paths.stdout_socket.exists() {
-        std::fs::remove_file(&paths.stdout_socket)?;
+        std::fs::remove_file(&paths.stdout_socket).map_err(SpawnServerError::RemoveStdoutSocket)?;
     }
     if paths.stderr_socket.exists() {
-        std::fs::remove_file(&paths.stderr_socket)?;
+        std::fs::remove_file(&paths.stderr_socket).map_err(SpawnServerError::RemoveStderrSocket)?;
     }
 
-    let binary_name = std::env::current_exe()?;
+    let binary_name = std::env::current_exe().map_err(SpawnServerError::CurrentExe)?;
     let mut server_process = std::process::Command::new(binary_name);
     server_process
         .arg("run")
@@ -692,11 +783,17 @@ fn spawn_server(paths: &ServerPaths) -> Result<()> {
 
     let status = server_process
         .status()
-        .context("failed to launch server process")?;
-    anyhow::ensure!(
-        status.success(),
-        "failed to launch and detach server process"
-    );
+        .map_err(SpawnServerError::ProcessStatus)?;
+
+    if !status.success() {
+        return Err(SpawnServerError::LaunchStatus {
+            status,
+            paths: format!(
+                "log file: {:?}, pid file: {:?}",
+                paths.log_file, paths.pid_file,
+            ),
+        });
+    }
 
     let mut total_time_waited = std::time::Duration::from_secs(0);
     let wait_duration = std::time::Duration::from_millis(20);
@@ -717,7 +814,15 @@ fn spawn_server(paths: &ServerPaths) -> Result<()> {
     Ok(())
 }
 
-fn check_pid_file(path: &Path) -> Result<Option<u32>> {
+#[derive(Debug, Error)]
+#[error("Failed to remove PID file for missing process (pid `{pid}`")]
+pub(crate) struct CheckPidError {
+    #[source]
+    source: std::io::Error,
+    pid: u32,
+}
+
+fn check_pid_file(path: &Path) -> Result<Option<u32>, CheckPidError> {
     let Some(pid) = std::fs::read_to_string(&path)
         .ok()
         .and_then(|contents| contents.parse::<u32>().ok())
@@ -742,7 +847,7 @@ fn check_pid_file(path: &Path) -> Result<Option<u32>> {
             log::debug!(
                 "Found PID file, but process with that PID does not exist. Removing PID file."
             );
-            std::fs::remove_file(&path).context("Failed to remove PID file")?;
+            std::fs::remove_file(&path).map_err(|source| CheckPidError { source, pid })?;
             Ok(None)
         }
     }

From 628a9cd8eab0c41aee0011bfab1462c7bc54adf5 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 25 Aug 2025 17:34:55 -0300
Subject: [PATCH 358/823] thread view: Add link to docs in the toolbar plus
 menu (#36883)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs       | 10 ++++++++++
 crates/ui/src/components/context_menu.rs |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 1eafb8dd4d..269aec3365 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -9,6 +9,7 @@ use agent_servers::AgentServerSettings;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
+use zed_actions::OpenBrowser;
 use zed_actions::agent::ReauthenticateAgent;
 
 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
@@ -2689,6 +2690,15 @@ impl AgentPanel {
                                 }
 
                                 menu
+                            })
+                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
+                                menu.separator().link(
+                                    "Add Your Own Agent",
+                                    OpenBrowser {
+                                        url: "https://agentclientprotocol.com/".into(),
+                                    }
+                                    .boxed_clone(),
+                                )
                             });
                         menu
                     }))
diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
index 25575c4f1e..21ab283d88 100644
--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -561,7 +561,7 @@ impl ContextMenu {
             action: Some(action.boxed_clone()),
             handler: Rc::new(move |_, window, cx| window.dispatch_action(action.boxed_clone(), cx)),
             icon: Some(IconName::ArrowUpRight),
-            icon_size: IconSize::Small,
+            icon_size: IconSize::XSmall,
             icon_position: IconPosition::End,
             icon_color: None,
             disabled: false,

From 65de969cc858fe2d309895643754d5a0ad3d7880 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 26 Aug 2025 00:16:37 +0300
Subject: [PATCH 359/823] Do not show directories in the `InvalidBufferView`
 (#36906)

Follow-up of https://github.com/zed-industries/zed/pull/36764

Release Notes:

- N/A
---
 crates/editor/src/items.rs                  |   2 +-
 crates/language_tools/src/lsp_log.rs        |   1 -
 crates/workspace/src/invalid_buffer_view.rs |  10 +-
 crates/workspace/src/item.rs                |   4 +-
 crates/workspace/src/workspace.rs           | 119 +++++++-------------
 5 files changed, 50 insertions(+), 86 deletions(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 641e8a97ed..b7110190fd 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1404,7 +1404,7 @@ impl ProjectItem for Editor {
     }
 
     fn for_broken_project_item(
-        abs_path: PathBuf,
+        abs_path: &Path,
         is_local: bool,
         e: &anyhow::Error,
         window: &mut Window,
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index 43c0365291..d5206c1f26 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -1743,6 +1743,5 @@ pub enum Event {
 }
 
 impl EventEmitter<Event> for LogStore {}
-impl EventEmitter<Event> for LspLogView {}
 impl EventEmitter<EditorEvent> for LspLogView {}
 impl EventEmitter<SearchEvent> for LspLogView {}
diff --git a/crates/workspace/src/invalid_buffer_view.rs b/crates/workspace/src/invalid_buffer_view.rs
index b017373474..b8c0db29d3 100644
--- a/crates/workspace/src/invalid_buffer_view.rs
+++ b/crates/workspace/src/invalid_buffer_view.rs
@@ -1,4 +1,4 @@
-use std::{path::PathBuf, sync::Arc};
+use std::{path::Path, sync::Arc};
 
 use gpui::{EventEmitter, FocusHandle, Focusable};
 use ui::{
@@ -12,7 +12,7 @@ use crate::Item;
 /// A view to display when a certain buffer fails to open.
 pub struct InvalidBufferView {
     /// Which path was attempted to open.
-    pub abs_path: Arc<PathBuf>,
+    pub abs_path: Arc<Path>,
     /// An error message, happened when opening the buffer.
     pub error: SharedString,
     is_local: bool,
@@ -21,7 +21,7 @@ pub struct InvalidBufferView {
 
 impl InvalidBufferView {
     pub fn new(
-        abs_path: PathBuf,
+        abs_path: &Path,
         is_local: bool,
         e: &anyhow::Error,
         _: &mut Window,
@@ -29,7 +29,7 @@ impl InvalidBufferView {
     ) -> Self {
         Self {
             is_local,
-            abs_path: Arc::new(abs_path),
+            abs_path: Arc::from(abs_path),
             error: format!("{e}").into(),
             focus_handle: cx.focus_handle(),
         }
@@ -43,7 +43,7 @@ impl Item for InvalidBufferView {
         // Ensure we always render at least the filename.
         detail += 1;
 
-        let path = self.abs_path.as_path();
+        let path = self.abs_path.as_ref();
 
         let mut prefix = path;
         while detail > 0 {
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 3485fcca43..db91bd82b9 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -23,7 +23,7 @@ use std::{
     any::{Any, TypeId},
     cell::RefCell,
     ops::Range,
-    path::PathBuf,
+    path::Path,
     rc::Rc,
     sync::Arc,
     time::Duration,
@@ -1168,7 +1168,7 @@ pub trait ProjectItem: Item {
     /// with the error from that failure as an argument.
     /// Allows to open an item that can gracefully display and handle errors.
     fn for_broken_project_item(
-        _abs_path: PathBuf,
+        _abs_path: &Path,
         _is_local: bool,
         _e: &anyhow::Error,
         _window: &mut Window,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 0b4694601e..044601df97 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -613,48 +613,59 @@ impl ProjectItemRegistry {
         self.build_project_item_for_path_fns
             .push(|project, project_path, window, cx| {
                 let project_path = project_path.clone();
-                let abs_path = project.read(cx).absolute_path(&project_path, cx);
+                let is_file = project
+                    .read(cx)
+                    .entry_for_path(&project_path, cx)
+                    .is_some_and(|entry| entry.is_file());
+                let entry_abs_path = project.read(cx).absolute_path(&project_path, cx);
                 let is_local = project.read(cx).is_local();
                 let project_item =
                     <T::Item as project::ProjectItem>::try_open(project, &project_path, cx)?;
                 let project = project.clone();
-                Some(window.spawn(cx, async move |cx| match project_item.await {
-                    Ok(project_item) => {
-                        let project_item = project_item;
-                        let project_entry_id: Option<ProjectEntryId> =
-                            project_item.read_with(cx, project::ProjectItem::entry_id)?;
-                        let build_workspace_item = Box::new(
-                            |pane: &mut Pane, window: &mut Window, cx: &mut Context<Pane>| {
-                                Box::new(cx.new(|cx| {
-                                    T::for_project_item(
-                                        project,
-                                        Some(pane),
-                                        project_item,
-                                        window,
-                                        cx,
-                                    )
-                                })) as Box<dyn ItemHandle>
-                            },
-                        ) as Box<_>;
-                        Ok((project_entry_id, build_workspace_item))
-                    }
-                    Err(e) => match abs_path {
-                        Some(abs_path) => match cx.update(|window, cx| {
-                            T::for_broken_project_item(abs_path, is_local, &e, window, cx)
-                        })? {
-                            Some(broken_project_item_view) => {
-                                let build_workspace_item = Box::new(
+                Some(window.spawn(cx, async move |cx| {
+                    match project_item.await.with_context(|| {
+                        format!(
+                            "opening project path {:?}",
+                            entry_abs_path.as_deref().unwrap_or(&project_path.path)
+                        )
+                    }) {
+                        Ok(project_item) => {
+                            let project_item = project_item;
+                            let project_entry_id: Option<ProjectEntryId> =
+                                project_item.read_with(cx, project::ProjectItem::entry_id)?;
+                            let build_workspace_item = Box::new(
+                                |pane: &mut Pane, window: &mut Window, cx: &mut Context<Pane>| {
+                                    Box::new(cx.new(|cx| {
+                                        T::for_project_item(
+                                            project,
+                                            Some(pane),
+                                            project_item,
+                                            window,
+                                            cx,
+                                        )
+                                    })) as Box<dyn ItemHandle>
+                                },
+                            ) as Box<_>;
+                            Ok((project_entry_id, build_workspace_item))
+                        }
+                        Err(e) => match entry_abs_path.as_deref().filter(|_| is_file) {
+                            Some(abs_path) => match cx.update(|window, cx| {
+                                T::for_broken_project_item(abs_path, is_local, &e, window, cx)
+                            })? {
+                                Some(broken_project_item_view) => {
+                                    let build_workspace_item = Box::new(
                                     move |_: &mut Pane, _: &mut Window, cx: &mut Context<Pane>| {
                                         cx.new(|_| broken_project_item_view).boxed_clone()
                                     },
                                 )
                                     as Box<_>;
-                                Ok((None, build_workspace_item))
-                            }
+                                    Ok((None, build_workspace_item))
+                                }
+                                None => Err(e)?,
+                            },
                             None => Err(e)?,
                         },
-                        None => Err(e)?,
-                    },
+                    }
                 }))
             });
     }
@@ -4011,52 +4022,6 @@ impl Workspace {
         maybe_pane_handle
     }
 
-    pub fn split_pane_with_item(
-        &mut self,
-        pane_to_split: WeakEntity<Pane>,
-        split_direction: SplitDirection,
-        from: WeakEntity<Pane>,
-        item_id_to_move: EntityId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(pane_to_split) = pane_to_split.upgrade() else {
-            return;
-        };
-        let Some(from) = from.upgrade() else {
-            return;
-        };
-
-        let new_pane = self.add_pane(window, cx);
-        move_item(&from, &new_pane, item_id_to_move, 0, true, window, cx);
-        self.center
-            .split(&pane_to_split, &new_pane, split_direction)
-            .unwrap();
-        cx.notify();
-    }
-
-    pub fn split_pane_with_project_entry(
-        &mut self,
-        pane_to_split: WeakEntity<Pane>,
-        split_direction: SplitDirection,
-        project_entry: ProjectEntryId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let pane_to_split = pane_to_split.upgrade()?;
-        let new_pane = self.add_pane(window, cx);
-        self.center
-            .split(&pane_to_split, &new_pane, split_direction)
-            .unwrap();
-
-        let path = self.project.read(cx).path_for_entry(project_entry, cx)?;
-        let task = self.open_path(path, Some(new_pane.downgrade()), true, window, cx);
-        Some(cx.foreground_executor().spawn(async move {
-            task.await?;
-            Ok(())
-        }))
-    }
-
     pub fn join_all_panes(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let active_item = self.active_pane.read(cx).active_item();
         for pane in &self.panes {

From 1460573dd4397e193764e80f2854ba33d94495ce Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 25 Aug 2025 16:04:44 -0600
Subject: [PATCH 360/823] acp: Rename dev command (#36908)

Release Notes:

- N/A
---
 crates/acp_tools/src/acp_tools.rs | 4 ++--
 crates/zed/src/zed.rs             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
index ee12b04cde..e20a040e9d 100644
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -21,12 +21,12 @@ use ui::prelude::*;
 use util::ResultExt as _;
 use workspace::{Item, Workspace};
 
-actions!(acp, [OpenDebugTools]);
+actions!(dev, [OpenAcpLogs]);
 
 pub fn init(cx: &mut App) {
     cx.observe_new(
         |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-            workspace.register_action(|workspace, _: &OpenDebugTools, window, cx| {
+            workspace.register_action(|workspace, _: &OpenAcpLogs, window, cx| {
                 let acp_tools =
                     Box::new(cx.new(|cx| AcpTools::new(workspace.project().clone(), cx)));
                 workspace.add_item_to_active_pane(acp_tools, None, true, window, cx);
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 1b9657dcc6..638e1dca0e 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4434,7 +4434,6 @@ mod tests {
             assert_eq!(actions_without_namespace, Vec::<&str>::new());
 
             let expected_namespaces = vec![
-                "acp",
                 "activity_indicator",
                 "agent",
                 #[cfg(not(target_os = "macos"))]

From f8667a837949597200e2ae8e490d947c6cda75aa Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 25 Aug 2025 16:23:58 -0600
Subject: [PATCH 361/823] Remove unused files (#36909)

Closes #ISSUE

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs     |   1 +
 crates/agent_servers/src/acp/v0.rs | 524 -----------------------------
 crates/agent_servers/src/acp/v1.rs | 376 ---------------------
 3 files changed, 1 insertion(+), 900 deletions(-)
 delete mode 100644 crates/agent_servers/src/acp/v0.rs
 delete mode 100644 crates/agent_servers/src/acp/v1.rs

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 864fbf8b10..093b8ba971 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1347,6 +1347,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
+#[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
diff --git a/crates/agent_servers/src/acp/v0.rs b/crates/agent_servers/src/acp/v0.rs
deleted file mode 100644
index be96048929..0000000000
--- a/crates/agent_servers/src/acp/v0.rs
+++ /dev/null
@@ -1,524 +0,0 @@
-// Translates old acp agents into the new schema
-use action_log::ActionLog;
-use agent_client_protocol as acp;
-use agentic_coding_protocol::{self as acp_old, AgentRequest as _};
-use anyhow::{Context as _, Result, anyhow};
-use futures::channel::oneshot;
-use gpui::{AppContext as _, AsyncApp, Entity, Task, WeakEntity};
-use project::Project;
-use std::{any::Any, cell::RefCell, path::Path, rc::Rc};
-use ui::App;
-use util::ResultExt as _;
-
-use crate::AgentServerCommand;
-use acp_thread::{AcpThread, AgentConnection, AuthRequired};
-
-#[derive(Clone)]
-struct OldAcpClientDelegate {
-    thread: Rc<RefCell<WeakEntity<AcpThread>>>,
-    cx: AsyncApp,
-    next_tool_call_id: Rc<RefCell<u64>>,
-    // sent_buffer_versions: HashMap<Entity<Buffer>, HashMap<u64, BufferSnapshot>>,
-}
-
-impl OldAcpClientDelegate {
-    fn new(thread: Rc<RefCell<WeakEntity<AcpThread>>>, cx: AsyncApp) -> Self {
-        Self {
-            thread,
-            cx,
-            next_tool_call_id: Rc::new(RefCell::new(0)),
-        }
-    }
-}
-
-impl acp_old::Client for OldAcpClientDelegate {
-    async fn stream_assistant_message_chunk(
-        &self,
-        params: acp_old::StreamAssistantMessageChunkParams,
-    ) -> Result<(), acp_old::Error> {
-        let cx = &mut self.cx.clone();
-
-        cx.update(|cx| {
-            self.thread
-                .borrow()
-                .update(cx, |thread, cx| match params.chunk {
-                    acp_old::AssistantMessageChunk::Text { text } => {
-                        thread.push_assistant_content_block(text.into(), false, cx)
-                    }
-                    acp_old::AssistantMessageChunk::Thought { thought } => {
-                        thread.push_assistant_content_block(thought.into(), true, cx)
-                    }
-                })
-                .log_err();
-        })?;
-
-        Ok(())
-    }
-
-    async fn request_tool_call_confirmation(
-        &self,
-        request: acp_old::RequestToolCallConfirmationParams,
-    ) -> Result<acp_old::RequestToolCallConfirmationResponse, acp_old::Error> {
-        let cx = &mut self.cx.clone();
-
-        let old_acp_id = *self.next_tool_call_id.borrow() + 1;
-        self.next_tool_call_id.replace(old_acp_id);
-
-        let tool_call = into_new_tool_call(
-            acp::ToolCallId(old_acp_id.to_string().into()),
-            request.tool_call,
-        );
-
-        let mut options = match request.confirmation {
-            acp_old::ToolCallConfirmation::Edit { .. } => vec![(
-                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
-                acp::PermissionOptionKind::AllowAlways,
-                "Always Allow Edits".to_string(),
-            )],
-            acp_old::ToolCallConfirmation::Execute { root_command, .. } => vec![(
-                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
-                acp::PermissionOptionKind::AllowAlways,
-                format!("Always Allow {}", root_command),
-            )],
-            acp_old::ToolCallConfirmation::Mcp {
-                server_name,
-                tool_name,
-                ..
-            } => vec![
-                (
-                    acp_old::ToolCallConfirmationOutcome::AlwaysAllowMcpServer,
-                    acp::PermissionOptionKind::AllowAlways,
-                    format!("Always Allow {}", server_name),
-                ),
-                (
-                    acp_old::ToolCallConfirmationOutcome::AlwaysAllowTool,
-                    acp::PermissionOptionKind::AllowAlways,
-                    format!("Always Allow {}", tool_name),
-                ),
-            ],
-            acp_old::ToolCallConfirmation::Fetch { .. } => vec![(
-                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
-                acp::PermissionOptionKind::AllowAlways,
-                "Always Allow".to_string(),
-            )],
-            acp_old::ToolCallConfirmation::Other { .. } => vec![(
-                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
-                acp::PermissionOptionKind::AllowAlways,
-                "Always Allow".to_string(),
-            )],
-        };
-
-        options.extend([
-            (
-                acp_old::ToolCallConfirmationOutcome::Allow,
-                acp::PermissionOptionKind::AllowOnce,
-                "Allow".to_string(),
-            ),
-            (
-                acp_old::ToolCallConfirmationOutcome::Reject,
-                acp::PermissionOptionKind::RejectOnce,
-                "Reject".to_string(),
-            ),
-        ]);
-
-        let mut outcomes = Vec::with_capacity(options.len());
-        let mut acp_options = Vec::with_capacity(options.len());
-
-        for (index, (outcome, kind, label)) in options.into_iter().enumerate() {
-            outcomes.push(outcome);
-            acp_options.push(acp::PermissionOption {
-                id: acp::PermissionOptionId(index.to_string().into()),
-                name: label,
-                kind,
-            })
-        }
-
-        let response = cx
-            .update(|cx| {
-                self.thread.borrow().update(cx, |thread, cx| {
-                    thread.request_tool_call_authorization(tool_call.into(), acp_options, cx)
-                })
-            })??
-            .context("Failed to update thread")?
-            .await;
-
-        let outcome = match response {
-            Ok(option_id) => outcomes[option_id.0.parse::<usize>().unwrap_or(0)],
-            Err(oneshot::Canceled) => acp_old::ToolCallConfirmationOutcome::Cancel,
-        };
-
-        Ok(acp_old::RequestToolCallConfirmationResponse {
-            id: acp_old::ToolCallId(old_acp_id),
-            outcome,
-        })
-    }
-
-    async fn push_tool_call(
-        &self,
-        request: acp_old::PushToolCallParams,
-    ) -> Result<acp_old::PushToolCallResponse, acp_old::Error> {
-        let cx = &mut self.cx.clone();
-
-        let old_acp_id = *self.next_tool_call_id.borrow() + 1;
-        self.next_tool_call_id.replace(old_acp_id);
-
-        cx.update(|cx| {
-            self.thread.borrow().update(cx, |thread, cx| {
-                thread.upsert_tool_call(
-                    into_new_tool_call(acp::ToolCallId(old_acp_id.to_string().into()), request),
-                    cx,
-                )
-            })
-        })??
-        .context("Failed to update thread")?;
-
-        Ok(acp_old::PushToolCallResponse {
-            id: acp_old::ToolCallId(old_acp_id),
-        })
-    }
-
-    async fn update_tool_call(
-        &self,
-        request: acp_old::UpdateToolCallParams,
-    ) -> Result<(), acp_old::Error> {
-        let cx = &mut self.cx.clone();
-
-        cx.update(|cx| {
-            self.thread.borrow().update(cx, |thread, cx| {
-                thread.update_tool_call(
-                    acp::ToolCallUpdate {
-                        id: acp::ToolCallId(request.tool_call_id.0.to_string().into()),
-                        fields: acp::ToolCallUpdateFields {
-                            status: Some(into_new_tool_call_status(request.status)),
-                            content: Some(
-                                request
-                                    .content
-                                    .into_iter()
-                                    .map(into_new_tool_call_content)
-                                    .collect::<Vec<_>>(),
-                            ),
-                            ..Default::default()
-                        },
-                    },
-                    cx,
-                )
-            })
-        })?
-        .context("Failed to update thread")??;
-
-        Ok(())
-    }
-
-    async fn update_plan(&self, request: acp_old::UpdatePlanParams) -> Result<(), acp_old::Error> {
-        let cx = &mut self.cx.clone();
-
-        cx.update(|cx| {
-            self.thread.borrow().update(cx, |thread, cx| {
-                thread.update_plan(
-                    acp::Plan {
-                        entries: request
-                            .entries
-                            .into_iter()
-                            .map(into_new_plan_entry)
-                            .collect(),
-                    },
-                    cx,
-                )
-            })
-        })?
-        .context("Failed to update thread")?;
-
-        Ok(())
-    }
-
-    async fn read_text_file(
-        &self,
-        acp_old::ReadTextFileParams { path, line, limit }: acp_old::ReadTextFileParams,
-    ) -> Result<acp_old::ReadTextFileResponse, acp_old::Error> {
-        let content = self
-            .cx
-            .update(|cx| {
-                self.thread.borrow().update(cx, |thread, cx| {
-                    thread.read_text_file(path, line, limit, false, cx)
-                })
-            })?
-            .context("Failed to update thread")?
-            .await?;
-        Ok(acp_old::ReadTextFileResponse { content })
-    }
-
-    async fn write_text_file(
-        &self,
-        acp_old::WriteTextFileParams { path, content }: acp_old::WriteTextFileParams,
-    ) -> Result<(), acp_old::Error> {
-        self.cx
-            .update(|cx| {
-                self.thread
-                    .borrow()
-                    .update(cx, |thread, cx| thread.write_text_file(path, content, cx))
-            })?
-            .context("Failed to update thread")?
-            .await?;
-
-        Ok(())
-    }
-}
-
-fn into_new_tool_call(id: acp::ToolCallId, request: acp_old::PushToolCallParams) -> acp::ToolCall {
-    acp::ToolCall {
-        id,
-        title: request.label,
-        kind: acp_kind_from_old_icon(request.icon),
-        status: acp::ToolCallStatus::InProgress,
-        content: request
-            .content
-            .into_iter()
-            .map(into_new_tool_call_content)
-            .collect(),
-        locations: request
-            .locations
-            .into_iter()
-            .map(into_new_tool_call_location)
-            .collect(),
-        raw_input: None,
-        raw_output: None,
-    }
-}
-
-fn acp_kind_from_old_icon(icon: acp_old::Icon) -> acp::ToolKind {
-    match icon {
-        acp_old::Icon::FileSearch => acp::ToolKind::Search,
-        acp_old::Icon::Folder => acp::ToolKind::Search,
-        acp_old::Icon::Globe => acp::ToolKind::Search,
-        acp_old::Icon::Hammer => acp::ToolKind::Other,
-        acp_old::Icon::LightBulb => acp::ToolKind::Think,
-        acp_old::Icon::Pencil => acp::ToolKind::Edit,
-        acp_old::Icon::Regex => acp::ToolKind::Search,
-        acp_old::Icon::Terminal => acp::ToolKind::Execute,
-    }
-}
-
-fn into_new_tool_call_status(status: acp_old::ToolCallStatus) -> acp::ToolCallStatus {
-    match status {
-        acp_old::ToolCallStatus::Running => acp::ToolCallStatus::InProgress,
-        acp_old::ToolCallStatus::Finished => acp::ToolCallStatus::Completed,
-        acp_old::ToolCallStatus::Error => acp::ToolCallStatus::Failed,
-    }
-}
-
-fn into_new_tool_call_content(content: acp_old::ToolCallContent) -> acp::ToolCallContent {
-    match content {
-        acp_old::ToolCallContent::Markdown { markdown } => markdown.into(),
-        acp_old::ToolCallContent::Diff { diff } => acp::ToolCallContent::Diff {
-            diff: into_new_diff(diff),
-        },
-    }
-}
-
-fn into_new_diff(diff: acp_old::Diff) -> acp::Diff {
-    acp::Diff {
-        path: diff.path,
-        old_text: diff.old_text,
-        new_text: diff.new_text,
-    }
-}
-
-fn into_new_tool_call_location(location: acp_old::ToolCallLocation) -> acp::ToolCallLocation {
-    acp::ToolCallLocation {
-        path: location.path,
-        line: location.line,
-    }
-}
-
-fn into_new_plan_entry(entry: acp_old::PlanEntry) -> acp::PlanEntry {
-    acp::PlanEntry {
-        content: entry.content,
-        priority: into_new_plan_priority(entry.priority),
-        status: into_new_plan_status(entry.status),
-    }
-}
-
-fn into_new_plan_priority(priority: acp_old::PlanEntryPriority) -> acp::PlanEntryPriority {
-    match priority {
-        acp_old::PlanEntryPriority::Low => acp::PlanEntryPriority::Low,
-        acp_old::PlanEntryPriority::Medium => acp::PlanEntryPriority::Medium,
-        acp_old::PlanEntryPriority::High => acp::PlanEntryPriority::High,
-    }
-}
-
-fn into_new_plan_status(status: acp_old::PlanEntryStatus) -> acp::PlanEntryStatus {
-    match status {
-        acp_old::PlanEntryStatus::Pending => acp::PlanEntryStatus::Pending,
-        acp_old::PlanEntryStatus::InProgress => acp::PlanEntryStatus::InProgress,
-        acp_old::PlanEntryStatus::Completed => acp::PlanEntryStatus::Completed,
-    }
-}
-
-pub struct AcpConnection {
-    pub name: &'static str,
-    pub connection: acp_old::AgentConnection,
-    pub _child_status: Task<Result<()>>,
-    pub current_thread: Rc<RefCell<WeakEntity<AcpThread>>>,
-}
-
-impl AcpConnection {
-    pub fn stdio(
-        name: &'static str,
-        command: AgentServerCommand,
-        root_dir: &Path,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Self>> {
-        let root_dir = root_dir.to_path_buf();
-
-        cx.spawn(async move |cx| {
-            let mut child = util::command::new_smol_command(&command.path)
-                .args(command.args.iter())
-                .current_dir(root_dir)
-                .stdin(std::process::Stdio::piped())
-                .stdout(std::process::Stdio::piped())
-                .stderr(std::process::Stdio::inherit())
-                .kill_on_drop(true)
-                .spawn()?;
-
-            let stdin = child.stdin.take().unwrap();
-            let stdout = child.stdout.take().unwrap();
-            log::trace!("Spawned (pid: {})", child.id());
-
-            let foreground_executor = cx.foreground_executor().clone();
-
-            let thread_rc = Rc::new(RefCell::new(WeakEntity::new_invalid()));
-
-            let (connection, io_fut) = acp_old::AgentConnection::connect_to_agent(
-                OldAcpClientDelegate::new(thread_rc.clone(), cx.clone()),
-                stdin,
-                stdout,
-                move |fut| foreground_executor.spawn(fut).detach(),
-            );
-
-            let io_task = cx.background_spawn(async move {
-                io_fut.await.log_err();
-            });
-
-            let child_status = cx.background_spawn(async move {
-                let result = match child.status().await {
-                    Err(e) => Err(anyhow!(e)),
-                    Ok(result) if result.success() => Ok(()),
-                    Ok(result) => Err(anyhow!(result)),
-                };
-                drop(io_task);
-                result
-            });
-
-            Ok(Self {
-                name,
-                connection,
-                _child_status: child_status,
-                current_thread: thread_rc,
-            })
-        })
-    }
-}
-
-impl AgentConnection for AcpConnection {
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        _cwd: &Path,
-        cx: &mut App,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        let task = self.connection.request_any(
-            acp_old::InitializeParams {
-                protocol_version: acp_old::ProtocolVersion::latest(),
-            }
-            .into_any(),
-        );
-        let current_thread = self.current_thread.clone();
-        cx.spawn(async move |cx| {
-            let result = task.await?;
-            let result = acp_old::InitializeParams::response_from_any(result)?;
-
-            if !result.is_authenticated {
-                anyhow::bail!(AuthRequired::new())
-            }
-
-            cx.update(|cx| {
-                let thread = cx.new(|cx| {
-                    let session_id = acp::SessionId("acp-old-no-id".into());
-                    let action_log = cx.new(|_| ActionLog::new(project.clone()));
-                    AcpThread::new(self.name, self.clone(), project, action_log, session_id)
-                });
-                current_thread.replace(thread.downgrade());
-                thread
-            })
-        })
-    }
-
-    fn auth_methods(&self) -> &[acp::AuthMethod] {
-        &[]
-    }
-
-    fn authenticate(&self, _method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
-        let task = self
-            .connection
-            .request_any(acp_old::AuthenticateParams.into_any());
-        cx.foreground_executor().spawn(async move {
-            task.await?;
-            Ok(())
-        })
-    }
-
-    fn prompt(
-        &self,
-        _id: Option<acp_thread::UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        let chunks = params
-            .prompt
-            .into_iter()
-            .filter_map(|block| match block {
-                acp::ContentBlock::Text(text) => {
-                    Some(acp_old::UserMessageChunk::Text { text: text.text })
-                }
-                acp::ContentBlock::ResourceLink(link) => Some(acp_old::UserMessageChunk::Path {
-                    path: link.uri.into(),
-                }),
-                _ => None,
-            })
-            .collect();
-
-        let task = self
-            .connection
-            .request_any(acp_old::SendUserMessageParams { chunks }.into_any());
-        cx.foreground_executor().spawn(async move {
-            task.await?;
-            anyhow::Ok(acp::PromptResponse {
-                stop_reason: acp::StopReason::EndTurn,
-            })
-        })
-    }
-
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        acp::PromptCapabilities {
-            image: false,
-            audio: false,
-            embedded_context: false,
-        }
-    }
-
-    fn cancel(&self, _session_id: &acp::SessionId, cx: &mut App) {
-        let task = self
-            .connection
-            .request_any(acp_old::CancelSendMessageParams.into_any());
-        cx.foreground_executor()
-            .spawn(async move {
-                task.await?;
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx)
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
diff --git a/crates/agent_servers/src/acp/v1.rs b/crates/agent_servers/src/acp/v1.rs
deleted file mode 100644
index 1945ad2483..0000000000
--- a/crates/agent_servers/src/acp/v1.rs
+++ /dev/null
@@ -1,376 +0,0 @@
-use acp_tools::AcpConnectionRegistry;
-use action_log::ActionLog;
-use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
-use anyhow::anyhow;
-use collections::HashMap;
-use futures::AsyncBufReadExt as _;
-use futures::channel::oneshot;
-use futures::io::BufReader;
-use project::Project;
-use serde::Deserialize;
-use std::path::Path;
-use std::rc::Rc;
-use std::{any::Any, cell::RefCell};
-
-use anyhow::{Context as _, Result};
-use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
-
-use crate::{AgentServerCommand, acp::UnsupportedVersion};
-use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError};
-
-pub struct AcpConnection {
-    server_name: &'static str,
-    connection: Rc<acp::ClientSideConnection>,
-    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
-    auth_methods: Vec<acp::AuthMethod>,
-    prompt_capabilities: acp::PromptCapabilities,
-    _io_task: Task<Result<()>>,
-}
-
-pub struct AcpSession {
-    thread: WeakEntity<AcpThread>,
-    suppress_abort_err: bool,
-}
-
-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
-
-impl AcpConnection {
-    pub async fn stdio(
-        server_name: &'static str,
-        command: AgentServerCommand,
-        root_dir: &Path,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let mut child = util::command::new_smol_command(&command.path)
-            .args(command.args.iter().map(|arg| arg.as_str()))
-            .envs(command.env.iter().flatten())
-            .current_dir(root_dir)
-            .stdin(std::process::Stdio::piped())
-            .stdout(std::process::Stdio::piped())
-            .stderr(std::process::Stdio::piped())
-            .kill_on_drop(true)
-            .spawn()?;
-
-        let stdout = child.stdout.take().context("Failed to take stdout")?;
-        let stdin = child.stdin.take().context("Failed to take stdin")?;
-        let stderr = child.stderr.take().context("Failed to take stderr")?;
-        log::trace!("Spawned (pid: {})", child.id());
-
-        let sessions = Rc::new(RefCell::new(HashMap::default()));
-
-        let client = ClientDelegate {
-            sessions: sessions.clone(),
-            cx: cx.clone(),
-        };
-        let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
-            let foreground_executor = cx.foreground_executor().clone();
-            move |fut| {
-                foreground_executor.spawn(fut).detach();
-            }
-        });
-
-        let io_task = cx.background_spawn(io_task);
-
-        cx.background_spawn(async move {
-            let mut stderr = BufReader::new(stderr);
-            let mut line = String::new();
-            while let Ok(n) = stderr.read_line(&mut line).await
-                && n > 0
-            {
-                log::warn!("agent stderr: {}", &line);
-                line.clear();
-            }
-        })
-        .detach();
-
-        cx.spawn({
-            let sessions = sessions.clone();
-            async move |cx| {
-                let status = child.status().await?;
-
-                for session in sessions.borrow().values() {
-                    session
-                        .thread
-                        .update(cx, |thread, cx| {
-                            thread.emit_load_error(LoadError::Exited { status }, cx)
-                        })
-                        .ok();
-                }
-
-                anyhow::Ok(())
-            }
-        })
-        .detach();
-
-        let connection = Rc::new(connection);
-
-        cx.update(|cx| {
-            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
-                registry.set_active_connection(server_name, &connection, cx)
-            });
-        })?;
-
-        let response = connection
-            .initialize(acp::InitializeRequest {
-                protocol_version: acp::VERSION,
-                client_capabilities: acp::ClientCapabilities {
-                    fs: acp::FileSystemCapability {
-                        read_text_file: true,
-                        write_text_file: true,
-                    },
-                },
-            })
-            .await?;
-
-        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
-            return Err(UnsupportedVersion.into());
-        }
-
-        Ok(Self {
-            auth_methods: response.auth_methods,
-            connection,
-            server_name,
-            sessions,
-            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
-            _io_task: io_task,
-        })
-    }
-}
-
-impl AgentConnection for AcpConnection {
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut App,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        let conn = self.connection.clone();
-        let sessions = self.sessions.clone();
-        let cwd = cwd.to_path_buf();
-        cx.spawn(async move |cx| {
-            let response = conn
-                .new_session(acp::NewSessionRequest {
-                    mcp_servers: vec![],
-                    cwd,
-                })
-                .await
-                .map_err(|err| {
-                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
-                        let mut error = AuthRequired::new();
-
-                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
-                            error = error.with_description(err.message);
-                        }
-
-                        anyhow!(error)
-                    } else {
-                        anyhow!(err)
-                    }
-                })?;
-
-            let session_id = response.session_id;
-            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|_cx| {
-                AcpThread::new(
-                    self.server_name,
-                    self.clone(),
-                    project,
-                    action_log,
-                    session_id.clone(),
-                )
-            })?;
-
-            let session = AcpSession {
-                thread: thread.downgrade(),
-                suppress_abort_err: false,
-            };
-            sessions.borrow_mut().insert(session_id, session);
-
-            Ok(thread)
-        })
-    }
-
-    fn auth_methods(&self) -> &[acp::AuthMethod] {
-        &self.auth_methods
-    }
-
-    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
-        let conn = self.connection.clone();
-        cx.foreground_executor().spawn(async move {
-            let result = conn
-                .authenticate(acp::AuthenticateRequest {
-                    method_id: method_id.clone(),
-                })
-                .await?;
-
-            Ok(result)
-        })
-    }
-
-    fn prompt(
-        &self,
-        _id: Option<acp_thread::UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        let conn = self.connection.clone();
-        let sessions = self.sessions.clone();
-        let session_id = params.session_id.clone();
-        cx.foreground_executor().spawn(async move {
-            let result = conn.prompt(params).await;
-
-            let mut suppress_abort_err = false;
-
-            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
-                suppress_abort_err = session.suppress_abort_err;
-                session.suppress_abort_err = false;
-            }
-
-            match result {
-                Ok(response) => Ok(response),
-                Err(err) => {
-                    if err.code != ErrorCode::INTERNAL_ERROR.code {
-                        anyhow::bail!(err)
-                    }
-
-                    let Some(data) = &err.data else {
-                        anyhow::bail!(err)
-                    };
-
-                    // Temporary workaround until the following PR is generally available:
-                    // https://github.com/google-gemini/gemini-cli/pull/6656
-
-                    #[derive(Deserialize)]
-                    #[serde(deny_unknown_fields)]
-                    struct ErrorDetails {
-                        details: Box<str>,
-                    }
-
-                    match serde_json::from_value(data.clone()) {
-                        Ok(ErrorDetails { details }) => {
-                            if suppress_abort_err && details.contains("This operation was aborted")
-                            {
-                                Ok(acp::PromptResponse {
-                                    stop_reason: acp::StopReason::Cancelled,
-                                })
-                            } else {
-                                Err(anyhow!(details))
-                            }
-                        }
-                        Err(_) => Err(anyhow!(err)),
-                    }
-                }
-            }
-        })
-    }
-
-    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        self.prompt_capabilities
-    }
-
-    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
-        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
-            session.suppress_abort_err = true;
-        }
-        let conn = self.connection.clone();
-        let params = acp::CancelNotification {
-            session_id: session_id.clone(),
-        };
-        cx.foreground_executor()
-            .spawn(async move { conn.cancel(params).await })
-            .detach();
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
-
-struct ClientDelegate {
-    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
-    cx: AsyncApp,
-}
-
-impl acp::Client for ClientDelegate {
-    async fn request_permission(
-        &self,
-        arguments: acp::RequestPermissionRequest,
-    ) -> Result<acp::RequestPermissionResponse, acp::Error> {
-        let cx = &mut self.cx.clone();
-        let rx = self
-            .sessions
-            .borrow()
-            .get(&arguments.session_id)
-            .context("Failed to get session")?
-            .thread
-            .update(cx, |thread, cx| {
-                thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
-            })?;
-
-        let result = rx?.await;
-
-        let outcome = match result {
-            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
-            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
-        };
-
-        Ok(acp::RequestPermissionResponse { outcome })
-    }
-
-    async fn write_text_file(
-        &self,
-        arguments: acp::WriteTextFileRequest,
-    ) -> Result<(), acp::Error> {
-        let cx = &mut self.cx.clone();
-        let task = self
-            .sessions
-            .borrow()
-            .get(&arguments.session_id)
-            .context("Failed to get session")?
-            .thread
-            .update(cx, |thread, cx| {
-                thread.write_text_file(arguments.path, arguments.content, cx)
-            })?;
-
-        task.await?;
-
-        Ok(())
-    }
-
-    async fn read_text_file(
-        &self,
-        arguments: acp::ReadTextFileRequest,
-    ) -> Result<acp::ReadTextFileResponse, acp::Error> {
-        let cx = &mut self.cx.clone();
-        let task = self
-            .sessions
-            .borrow()
-            .get(&arguments.session_id)
-            .context("Failed to get session")?
-            .thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
-            })?;
-
-        let content = task.await?;
-
-        Ok(acp::ReadTextFileResponse { content })
-    }
-
-    async fn session_notification(
-        &self,
-        notification: acp::SessionNotification,
-    ) -> Result<(), acp::Error> {
-        let cx = &mut self.cx.clone();
-        let sessions = self.sessions.borrow();
-        let session = sessions
-            .get(&notification.session_id)
-            .context("Failed to get session")?;
-
-        session.thread.update(cx, |thread, cx| {
-            thread.handle_session_update(notification.update, cx)
-        })??;
-
-        Ok(())
-    }
-}

From d43df9e841bce3af1df219690c5c796f8bbff99a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 25 Aug 2025 17:27:52 -0700
Subject: [PATCH 362/823] Fix workspace migration failure (#36911)

This fixes a regression on nightly introduced in
https://github.com/zed-industries/zed/pull/36714

Release Notes:

- N/A
---
 crates/command_palette/src/persistence.rs     |  18 +-
 crates/db/src/db.rs                           | 118 +---
 crates/db/src/kvp.rs                          |  30 +-
 crates/editor/src/persistence.rs              |  27 +-
 crates/image_viewer/src/image_viewer.rs       |  19 +-
 crates/onboarding/src/onboarding.rs           |  21 +-
 crates/onboarding/src/welcome.rs              |  21 +-
 crates/settings_ui/src/keybindings.rs         |  15 +-
 crates/sqlez/src/domain.rs                    |  14 +-
 crates/sqlez/src/migrations.rs                |  64 +-
 crates/sqlez/src/thread_safe_connection.rs    |  18 +-
 crates/terminal_view/src/persistence.rs       |  18 +-
 crates/vim/src/state.rs                       |  18 +-
 crates/workspace/src/path_list.rs             |  14 +-
 crates/workspace/src/persistence.rs           | 643 +++++++++---------
 .../src/zed/component_preview/persistence.rs  |  19 +-
 16 files changed, 582 insertions(+), 495 deletions(-)

diff --git a/crates/command_palette/src/persistence.rs b/crates/command_palette/src/persistence.rs
index 5be97c36bc..01cf403083 100644
--- a/crates/command_palette/src/persistence.rs
+++ b/crates/command_palette/src/persistence.rs
@@ -1,7 +1,10 @@
 use anyhow::Result;
 use db::{
-    define_connection, query,
-    sqlez::{bindable::Column, statement::Statement},
+    query,
+    sqlez::{
+        bindable::Column, domain::Domain, statement::Statement,
+        thread_safe_connection::ThreadSafeConnection,
+    },
     sqlez_macros::sql,
 };
 use serde::{Deserialize, Serialize};
@@ -50,8 +53,11 @@ impl Column for SerializedCommandInvocation {
     }
 }
 
-define_connection!(pub static ref COMMAND_PALETTE_HISTORY: CommandPaletteDB<()> =
-    &[sql!(
+pub struct CommandPaletteDB(ThreadSafeConnection);
+
+impl Domain for CommandPaletteDB {
+    const NAME: &str = stringify!(CommandPaletteDB);
+    const MIGRATIONS: &[&str] = &[sql!(
         CREATE TABLE IF NOT EXISTS command_invocations(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             command_name TEXT NOT NULL,
@@ -59,7 +65,9 @@ define_connection!(pub static ref COMMAND_PALETTE_HISTORY: CommandPaletteDB<()>
             last_invoked INTEGER DEFAULT (unixepoch())  NOT NULL
         ) STRICT;
     )];
-);
+}
+
+db::static_connection!(COMMAND_PALETTE_HISTORY, CommandPaletteDB, []);
 
 impl CommandPaletteDB {
     pub async fn write_command_invocation(
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
index 8b790cbec8..0802bd8bb7 100644
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -110,11 +110,14 @@ pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
 }
 
 /// Implements a basic DB wrapper for a given domain
+///
+/// Arguments:
+/// - static variable name for connection
+/// - type of connection wrapper
+/// - dependencies, whose migrations should be run prior to this domain's migrations
 #[macro_export]
-macro_rules! define_connection {
-    (pub static ref $id:ident: $t:ident<()> = $migrations:expr; $($global:ident)?) => {
-        pub struct $t($crate::sqlez::thread_safe_connection::ThreadSafeConnection);
-
+macro_rules! static_connection {
+    ($id:ident, $t:ident, [ $($d:ty),* ] $(, $global:ident)?) => {
         impl ::std::ops::Deref for $t {
             type Target = $crate::sqlez::thread_safe_connection::ThreadSafeConnection;
 
@@ -123,16 +126,6 @@ macro_rules! define_connection {
             }
         }
 
-        impl $crate::sqlez::domain::Domain for $t {
-            fn name() -> &'static str {
-                stringify!($t)
-            }
-
-            fn migrations() -> &'static [&'static str] {
-                $migrations
-            }
-        }
-
         impl $t {
             #[cfg(any(test, feature = "test-support"))]
             pub async fn open_test_db(name: &'static str) -> Self {
@@ -142,7 +135,8 @@ macro_rules! define_connection {
 
         #[cfg(any(test, feature = "test-support"))]
         pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-            $t($crate::smol::block_on($crate::open_test_db::<$t>(stringify!($id))))
+            #[allow(unused_parens)]
+            $t($crate::smol::block_on($crate::open_test_db::<($($d,)* $t)>(stringify!($id))))
         });
 
         #[cfg(not(any(test, feature = "test-support")))]
@@ -153,46 +147,10 @@ macro_rules! define_connection {
             } else {
                 $crate::RELEASE_CHANNEL.dev_name()
             };
-            $t($crate::smol::block_on($crate::open_db::<$t>(db_dir, scope)))
+            #[allow(unused_parens)]
+            $t($crate::smol::block_on($crate::open_db::<($($d,)* $t)>(db_dir, scope)))
         });
-    };
-    (pub static ref $id:ident: $t:ident<$($d:ty),+> = $migrations:expr; $($global:ident)?) => {
-        pub struct $t($crate::sqlez::thread_safe_connection::ThreadSafeConnection);
-
-        impl ::std::ops::Deref for $t {
-            type Target = $crate::sqlez::thread_safe_connection::ThreadSafeConnection;
-
-            fn deref(&self) -> &Self::Target {
-                &self.0
-            }
-        }
-
-        impl $crate::sqlez::domain::Domain for $t {
-            fn name() -> &'static str {
-                stringify!($t)
-            }
-
-            fn migrations() -> &'static [&'static str] {
-                $migrations
-            }
-        }
-
-        #[cfg(any(test, feature = "test-support"))]
-        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-            $t($crate::smol::block_on($crate::open_test_db::<($($d),+, $t)>(stringify!($id))))
-        });
-
-        #[cfg(not(any(test, feature = "test-support")))]
-        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-            let db_dir = $crate::database_dir();
-            let scope = if false $(|| stringify!($global) == "global")? {
-                "global"
-            } else {
-                $crate::RELEASE_CHANNEL.dev_name()
-            };
-            $t($crate::smol::block_on($crate::open_db::<($($d),+, $t)>(db_dir, scope)))
-        });
-    };
+    }
 }
 
 pub fn write_and_log<F>(cx: &App, db_write: impl FnOnce() -> F + Send + 'static)
@@ -219,17 +177,12 @@ mod tests {
         enum BadDB {}
 
         impl Domain for BadDB {
-            fn name() -> &'static str {
-                "db_tests"
-            }
-
-            fn migrations() -> &'static [&'static str] {
-                &[
-                    sql!(CREATE TABLE test(value);),
-                    // failure because test already exists
-                    sql!(CREATE TABLE test(value);),
-                ]
-            }
+            const NAME: &str = "db_tests";
+            const MIGRATIONS: &[&str] = &[
+                sql!(CREATE TABLE test(value);),
+                // failure because test already exists
+                sql!(CREATE TABLE test(value);),
+            ];
         }
 
         let tempdir = tempfile::Builder::new()
@@ -251,25 +204,15 @@ mod tests {
         enum CorruptedDB {}
 
         impl Domain for CorruptedDB {
-            fn name() -> &'static str {
-                "db_tests"
-            }
-
-            fn migrations() -> &'static [&'static str] {
-                &[sql!(CREATE TABLE test(value);)]
-            }
+            const NAME: &str = "db_tests";
+            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test(value);)];
         }
 
         enum GoodDB {}
 
         impl Domain for GoodDB {
-            fn name() -> &'static str {
-                "db_tests" //Notice same name
-            }
-
-            fn migrations() -> &'static [&'static str] {
-                &[sql!(CREATE TABLE test2(value);)] //But different migration
-            }
+            const NAME: &str = "db_tests"; //Notice same name
+            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test2(value);)];
         }
 
         let tempdir = tempfile::Builder::new()
@@ -305,25 +248,16 @@ mod tests {
         enum CorruptedDB {}
 
         impl Domain for CorruptedDB {
-            fn name() -> &'static str {
-                "db_tests"
-            }
+            const NAME: &str = "db_tests";
 
-            fn migrations() -> &'static [&'static str] {
-                &[sql!(CREATE TABLE test(value);)]
-            }
+            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test(value);)];
         }
 
         enum GoodDB {}
 
         impl Domain for GoodDB {
-            fn name() -> &'static str {
-                "db_tests" //Notice same name
-            }
-
-            fn migrations() -> &'static [&'static str] {
-                &[sql!(CREATE TABLE test2(value);)] //But different migration
-            }
+            const NAME: &str = "db_tests"; //Notice same name
+            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test2(value);)]; // But different migration
         }
 
         let tempdir = tempfile::Builder::new()
diff --git a/crates/db/src/kvp.rs b/crates/db/src/kvp.rs
index 256b789c9b..8ea877b35b 100644
--- a/crates/db/src/kvp.rs
+++ b/crates/db/src/kvp.rs
@@ -2,16 +2,26 @@ use gpui::App;
 use sqlez_macros::sql;
 use util::ResultExt as _;
 
-use crate::{define_connection, query, write_and_log};
+use crate::{
+    query,
+    sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
+    write_and_log,
+};
 
-define_connection!(pub static ref KEY_VALUE_STORE: KeyValueStore<()> =
-    &[sql!(
+pub struct KeyValueStore(crate::sqlez::thread_safe_connection::ThreadSafeConnection);
+
+impl Domain for KeyValueStore {
+    const NAME: &str = stringify!(KeyValueStore);
+
+    const MIGRATIONS: &[&str] = &[sql!(
         CREATE TABLE IF NOT EXISTS kv_store(
             key TEXT PRIMARY KEY,
             value TEXT NOT NULL
         ) STRICT;
     )];
-);
+}
+
+crate::static_connection!(KEY_VALUE_STORE, KeyValueStore, []);
 
 pub trait Dismissable {
     const KEY: &'static str;
@@ -91,15 +101,19 @@ mod tests {
     }
 }
 
-define_connection!(pub static ref GLOBAL_KEY_VALUE_STORE: GlobalKeyValueStore<()> =
-    &[sql!(
+pub struct GlobalKeyValueStore(ThreadSafeConnection);
+
+impl Domain for GlobalKeyValueStore {
+    const NAME: &str = stringify!(GlobalKeyValueStore);
+    const MIGRATIONS: &[&str] = &[sql!(
         CREATE TABLE IF NOT EXISTS kv_store(
             key TEXT PRIMARY KEY,
             value TEXT NOT NULL
         ) STRICT;
     )];
-    global
-);
+}
+
+crate::static_connection!(GLOBAL_KEY_VALUE_STORE, GlobalKeyValueStore, [], global);
 
 impl GlobalKeyValueStore {
     query! {
diff --git a/crates/editor/src/persistence.rs b/crates/editor/src/persistence.rs
index 88fde53947..ec7c149b4e 100644
--- a/crates/editor/src/persistence.rs
+++ b/crates/editor/src/persistence.rs
@@ -1,13 +1,17 @@
 use anyhow::Result;
-use db::sqlez::bindable::{Bind, Column, StaticColumnCount};
-use db::sqlez::statement::Statement;
+use db::{
+    query,
+    sqlez::{
+        bindable::{Bind, Column, StaticColumnCount},
+        domain::Domain,
+        statement::Statement,
+    },
+    sqlez_macros::sql,
+};
 use fs::MTime;
 use itertools::Itertools as _;
 use std::path::PathBuf;
 
-use db::sqlez_macros::sql;
-use db::{define_connection, query};
-
 use workspace::{ItemId, WorkspaceDb, WorkspaceId};
 
 #[derive(Clone, Debug, PartialEq, Default)]
@@ -83,7 +87,11 @@ impl Column for SerializedEditor {
     }
 }
 
-define_connection!(
+pub struct EditorDb(db::sqlez::thread_safe_connection::ThreadSafeConnection);
+
+impl Domain for EditorDb {
+    const NAME: &str = stringify!(EditorDb);
+
     // Current schema shape using pseudo-rust syntax:
     // editors(
     //   item_id: usize,
@@ -113,7 +121,8 @@ define_connection!(
     //   start: usize,
     //   end: usize,
     // )
-    pub static ref DB: EditorDb<WorkspaceDb> = &[
+
+    const MIGRATIONS: &[&str] = &[
         sql! (
             CREATE TABLE editors(
                 item_id INTEGER NOT NULL,
@@ -189,7 +198,9 @@ define_connection!(
             ) STRICT;
         ),
     ];
-);
+}
+
+db::static_connection!(DB, EditorDb, [WorkspaceDb]);
 
 // https://www.sqlite.org/limits.html
 // > <..> the maximum value of a host parameter number is SQLITE_MAX_VARIABLE_NUMBER,
diff --git a/crates/image_viewer/src/image_viewer.rs b/crates/image_viewer/src/image_viewer.rs
index b96557b391..2dca57424b 100644
--- a/crates/image_viewer/src/image_viewer.rs
+++ b/crates/image_viewer/src/image_viewer.rs
@@ -401,12 +401,19 @@ pub fn init(cx: &mut App) {
 mod persistence {
     use std::path::PathBuf;
 
-    use db::{define_connection, query, sqlez_macros::sql};
+    use db::{
+        query,
+        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
+        sqlez_macros::sql,
+    };
     use workspace::{ItemId, WorkspaceDb, WorkspaceId};
 
-    define_connection! {
-        pub static ref IMAGE_VIEWER: ImageViewerDb<WorkspaceDb> =
-            &[sql!(
+    pub struct ImageViewerDb(ThreadSafeConnection);
+
+    impl Domain for ImageViewerDb {
+        const NAME: &str = stringify!(ImageViewerDb);
+
+        const MIGRATIONS: &[&str] = &[sql!(
                 CREATE TABLE image_viewers (
                     workspace_id INTEGER,
                     item_id INTEGER UNIQUE,
@@ -417,9 +424,11 @@ mod persistence {
                     FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
                     ON DELETE CASCADE
                 ) STRICT;
-            )];
+        )];
     }
 
+    db::static_connection!(IMAGE_VIEWER, ImageViewerDb, [WorkspaceDb]);
+
     impl ImageViewerDb {
         query! {
             pub async fn save_image_path(
diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs
index 884374a72f..873dd63201 100644
--- a/crates/onboarding/src/onboarding.rs
+++ b/crates/onboarding/src/onboarding.rs
@@ -850,13 +850,19 @@ impl workspace::SerializableItem for Onboarding {
 }
 
 mod persistence {
-    use db::{define_connection, query, sqlez_macros::sql};
+    use db::{
+        query,
+        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
+        sqlez_macros::sql,
+    };
     use workspace::WorkspaceDb;
 
-    define_connection! {
-        pub static ref ONBOARDING_PAGES: OnboardingPagesDb<WorkspaceDb> =
-            &[
-                sql!(
+    pub struct OnboardingPagesDb(ThreadSafeConnection);
+
+    impl Domain for OnboardingPagesDb {
+        const NAME: &str = stringify!(OnboardingPagesDb);
+
+        const MIGRATIONS: &[&str] = &[sql!(
                     CREATE TABLE onboarding_pages (
                         workspace_id INTEGER,
                         item_id INTEGER UNIQUE,
@@ -866,10 +872,11 @@ mod persistence {
                         FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
                         ON DELETE CASCADE
                     ) STRICT;
-                ),
-            ];
+        )];
     }
 
+    db::static_connection!(ONBOARDING_PAGES, OnboardingPagesDb, [WorkspaceDb]);
+
     impl OnboardingPagesDb {
         query! {
             pub async fn save_onboarding_page(
diff --git a/crates/onboarding/src/welcome.rs b/crates/onboarding/src/welcome.rs
index 3fe9c32a48..8ff55d812b 100644
--- a/crates/onboarding/src/welcome.rs
+++ b/crates/onboarding/src/welcome.rs
@@ -414,13 +414,19 @@ impl workspace::SerializableItem for WelcomePage {
 }
 
 mod persistence {
-    use db::{define_connection, query, sqlez_macros::sql};
+    use db::{
+        query,
+        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
+        sqlez_macros::sql,
+    };
     use workspace::WorkspaceDb;
 
-    define_connection! {
-        pub static ref WELCOME_PAGES: WelcomePagesDb<WorkspaceDb> =
-            &[
-                sql!(
+    pub struct WelcomePagesDb(ThreadSafeConnection);
+
+    impl Domain for WelcomePagesDb {
+        const NAME: &str = stringify!(WelcomePagesDb);
+
+        const MIGRATIONS: &[&str] = (&[sql!(
                     CREATE TABLE welcome_pages (
                         workspace_id INTEGER,
                         item_id INTEGER UNIQUE,
@@ -430,10 +436,11 @@ mod persistence {
                         FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
                         ON DELETE CASCADE
                     ) STRICT;
-                ),
-            ];
+        )]);
     }
 
+    db::static_connection!(WELCOME_PAGES, WelcomePagesDb, [WorkspaceDb]);
+
     impl WelcomePagesDb {
         query! {
             pub async fn save_welcome_page(
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 9c76725972..288f59c8e0 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -3348,12 +3348,15 @@ impl SerializableItem for KeymapEditor {
 }
 
 mod persistence {
-    use db::{define_connection, query, sqlez_macros::sql};
+    use db::{query, sqlez::domain::Domain, sqlez_macros::sql};
     use workspace::WorkspaceDb;
 
-    define_connection! {
-        pub static ref KEYBINDING_EDITORS: KeybindingEditorDb<WorkspaceDb> =
-            &[sql!(
+    pub struct KeybindingEditorDb(db::sqlez::thread_safe_connection::ThreadSafeConnection);
+
+    impl Domain for KeybindingEditorDb {
+        const NAME: &str = stringify!(KeybindingEditorDb);
+
+        const MIGRATIONS: &[&str] = &[sql!(
                 CREATE TABLE keybinding_editors (
                     workspace_id INTEGER,
                     item_id INTEGER UNIQUE,
@@ -3362,9 +3365,11 @@ mod persistence {
                     FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
                     ON DELETE CASCADE
                 ) STRICT;
-            )];
+        )];
     }
 
+    db::static_connection!(KEYBINDING_EDITORS, KeybindingEditorDb, [WorkspaceDb]);
+
     impl KeybindingEditorDb {
         query! {
             pub async fn save_keybinding_editor(
diff --git a/crates/sqlez/src/domain.rs b/crates/sqlez/src/domain.rs
index a83f4e18d6..5744a67da2 100644
--- a/crates/sqlez/src/domain.rs
+++ b/crates/sqlez/src/domain.rs
@@ -1,8 +1,12 @@
 use crate::connection::Connection;
 
 pub trait Domain: 'static {
-    fn name() -> &'static str;
-    fn migrations() -> &'static [&'static str];
+    const NAME: &str;
+    const MIGRATIONS: &[&str];
+
+    fn should_allow_migration_change(_index: usize, _old: &str, _new: &str) -> bool {
+        false
+    }
 }
 
 pub trait Migrator: 'static {
@@ -17,7 +21,11 @@ impl Migrator for () {
 
 impl<D: Domain> Migrator for D {
     fn migrate(connection: &Connection) -> anyhow::Result<()> {
-        connection.migrate(Self::name(), Self::migrations())
+        connection.migrate(
+            Self::NAME,
+            Self::MIGRATIONS,
+            Self::should_allow_migration_change,
+        )
     }
 }
 
diff --git a/crates/sqlez/src/migrations.rs b/crates/sqlez/src/migrations.rs
index 7c59ffe658..2429ddeb41 100644
--- a/crates/sqlez/src/migrations.rs
+++ b/crates/sqlez/src/migrations.rs
@@ -34,7 +34,12 @@ impl Connection {
     /// Note: Unlike everything else in SQLez, migrations are run eagerly, without first
     /// preparing the SQL statements. This makes it possible to do multi-statement schema
     /// updates in a single string without running into prepare errors.
-    pub fn migrate(&self, domain: &'static str, migrations: &[&'static str]) -> Result<()> {
+    pub fn migrate(
+        &self,
+        domain: &'static str,
+        migrations: &[&'static str],
+        mut should_allow_migration_change: impl FnMut(usize, &str, &str) -> bool,
+    ) -> Result<()> {
         self.with_savepoint("migrating", || {
             // Setup the migrations table unconditionally
             self.exec(indoc! {"
@@ -65,9 +70,14 @@ impl Connection {
                         &sqlformat::QueryParams::None,
                         Default::default(),
                     );
-                    if completed_migration == migration {
+                    if completed_migration == migration
+                        || migration.trim().starts_with("-- ALLOW_MIGRATION_CHANGE")
+                    {
                         // Migration already run. Continue
                         continue;
+                    } else if should_allow_migration_change(index, &completed_migration, &migration)
+                    {
+                        continue;
                     } else {
                         anyhow::bail!(formatdoc! {"
                             Migration changed for {domain} at step {index}
@@ -108,6 +118,7 @@ mod test {
                     a TEXT,
                     b TEXT
                 )"}],
+                disallow_migration_change,
             )
             .unwrap();
 
@@ -136,6 +147,7 @@ mod test {
                         d TEXT
                     )"},
                 ],
+                disallow_migration_change,
             )
             .unwrap();
 
@@ -214,7 +226,11 @@ mod test {
 
         // Run the migration verifying that the row got dropped
         connection
-            .migrate("test", &["DELETE FROM test_table"])
+            .migrate(
+                "test",
+                &["DELETE FROM test_table"],
+                disallow_migration_change,
+            )
             .unwrap();
         assert_eq!(
             connection
@@ -232,7 +248,11 @@ mod test {
 
         // Run the same migration again and verify that the table was left unchanged
         connection
-            .migrate("test", &["DELETE FROM test_table"])
+            .migrate(
+                "test",
+                &["DELETE FROM test_table"],
+                disallow_migration_change,
+            )
             .unwrap();
         assert_eq!(
             connection
@@ -252,27 +272,28 @@ mod test {
             .migrate(
                 "test migration",
                 &[
-                    indoc! {"
-                CREATE TABLE test (
-                    col INTEGER
-                )"},
-                    indoc! {"
-                    INSERT INTO test (col) VALUES (1)"},
+                    "CREATE TABLE test (col INTEGER)",
+                    "INSERT INTO test (col) VALUES (1)",
                 ],
+                disallow_migration_change,
             )
             .unwrap();
 
+        let mut migration_changed = false;
+
         // Create another migration with the same domain but different steps
         let second_migration_result = connection.migrate(
             "test migration",
             &[
-                indoc! {"
-                CREATE TABLE test (
-                    color INTEGER
-                )"},
-                indoc! {"
-                INSERT INTO test (color) VALUES (1)"},
+                "CREATE TABLE test (color INTEGER )",
+                "INSERT INTO test (color) VALUES (1)",
             ],
+            |_, old, new| {
+                assert_eq!(old, "CREATE TABLE test (col INTEGER)");
+                assert_eq!(new, "CREATE TABLE test (color INTEGER)");
+                migration_changed = true;
+                false
+            },
         );
 
         // Verify new migration returns error when run
@@ -284,7 +305,11 @@ mod test {
         let connection = Connection::open_memory(Some("test_create_alter_drop"));
 
         connection
-            .migrate("first_migration", &["CREATE TABLE table1(a TEXT) STRICT;"])
+            .migrate(
+                "first_migration",
+                &["CREATE TABLE table1(a TEXT) STRICT;"],
+                disallow_migration_change,
+            )
             .unwrap();
 
         connection
@@ -305,6 +330,7 @@ mod test {
 
                     ALTER TABLE table2 RENAME TO table1;
                 "}],
+                disallow_migration_change,
             )
             .unwrap();
 
@@ -312,4 +338,8 @@ mod test {
 
         assert_eq!(res, "test text");
     }
+
+    fn disallow_migration_change(_: usize, _: &str, _: &str) -> bool {
+        false
+    }
 }
diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
index afdc96586e..58d3afe78f 100644
--- a/crates/sqlez/src/thread_safe_connection.rs
+++ b/crates/sqlez/src/thread_safe_connection.rs
@@ -278,12 +278,8 @@ mod test {
 
         enum TestDomain {}
         impl Domain for TestDomain {
-            fn name() -> &'static str {
-                "test"
-            }
-            fn migrations() -> &'static [&'static str] {
-                &["CREATE TABLE test(col1 TEXT, col2 TEXT) STRICT;"]
-            }
+            const NAME: &str = "test";
+            const MIGRATIONS: &[&str] = &["CREATE TABLE test(col1 TEXT, col2 TEXT) STRICT;"];
         }
 
         for _ in 0..100 {
@@ -312,12 +308,9 @@ mod test {
     fn wild_zed_lost_failure() {
         enum TestWorkspace {}
         impl Domain for TestWorkspace {
-            fn name() -> &'static str {
-                "workspace"
-            }
+            const NAME: &str = "workspace";
 
-            fn migrations() -> &'static [&'static str] {
-                &["
+            const MIGRATIONS: &[&str] = &["
                     CREATE TABLE workspaces(
                         workspace_id INTEGER PRIMARY KEY,
                         dock_visible INTEGER, -- Boolean
@@ -336,8 +329,7 @@ mod test {
                             ON DELETE CASCADE
                             ON UPDATE CASCADE
                     ) STRICT;
-                "]
-            }
+                "];
         }
 
         let builder =
diff --git a/crates/terminal_view/src/persistence.rs b/crates/terminal_view/src/persistence.rs
index b93b267f58..c7ebd314e4 100644
--- a/crates/terminal_view/src/persistence.rs
+++ b/crates/terminal_view/src/persistence.rs
@@ -9,7 +9,11 @@ use std::path::{Path, PathBuf};
 use ui::{App, Context, Pixels, Window};
 use util::ResultExt as _;
 
-use db::{define_connection, query, sqlez::statement::Statement, sqlez_macros::sql};
+use db::{
+    query,
+    sqlez::{domain::Domain, statement::Statement, thread_safe_connection::ThreadSafeConnection},
+    sqlez_macros::sql,
+};
 use workspace::{
     ItemHandle, ItemId, Member, Pane, PaneAxis, PaneGroup, SerializableItem as _, Workspace,
     WorkspaceDb, WorkspaceId,
@@ -375,9 +379,13 @@ impl<'de> Deserialize<'de> for SerializedAxis {
     }
 }
 
-define_connection! {
-    pub static ref TERMINAL_DB: TerminalDb<WorkspaceDb> =
-        &[sql!(
+pub struct TerminalDb(ThreadSafeConnection);
+
+impl Domain for TerminalDb {
+    const NAME: &str = stringify!(TerminalDb);
+
+    const MIGRATIONS: &[&str] = &[
+        sql!(
             CREATE TABLE terminals (
                 workspace_id INTEGER,
                 item_id INTEGER UNIQUE,
@@ -414,6 +422,8 @@ define_connection! {
     ];
 }
 
+db::static_connection!(TERMINAL_DB, TerminalDb, [WorkspaceDb]);
+
 impl TerminalDb {
     query! {
        pub async fn update_workspace_id(
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index c0176cb12c..fe4bc7433d 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -7,8 +7,10 @@ use crate::{motion::Motion, object::Object};
 use anyhow::Result;
 use collections::HashMap;
 use command_palette_hooks::{CommandPaletteFilter, CommandPaletteInterceptor};
-use db::define_connection;
-use db::sqlez_macros::sql;
+use db::{
+    sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
+    sqlez_macros::sql,
+};
 use editor::display_map::{is_invisible, replacement};
 use editor::{Anchor, ClipboardSelection, Editor, MultiBuffer, ToPoint as EditorToPoint};
 use gpui::{
@@ -1668,8 +1670,12 @@ impl MarksView {
     }
 }
 
-define_connection! (
-    pub static ref DB: VimDb<WorkspaceDb> = &[
+pub struct VimDb(ThreadSafeConnection);
+
+impl Domain for VimDb {
+    const NAME: &str = stringify!(VimDb);
+
+    const MIGRATIONS: &[&str] = &[
         sql! (
             CREATE TABLE vim_marks (
               workspace_id INTEGER,
@@ -1689,7 +1695,9 @@ define_connection! (
             ON vim_global_marks_paths(workspace_id, mark_name);
         ),
     ];
-);
+}
+
+db::static_connection!(DB, VimDb, [WorkspaceDb]);
 
 struct SerializedMark {
     path: Arc<Path>,
diff --git a/crates/workspace/src/path_list.rs b/crates/workspace/src/path_list.rs
index 4f9ed42312..cf463e6b22 100644
--- a/crates/workspace/src/path_list.rs
+++ b/crates/workspace/src/path_list.rs
@@ -58,11 +58,7 @@ impl PathList {
         let mut paths: Vec<PathBuf> = if serialized.paths.is_empty() {
             Vec::new()
         } else {
-            serde_json::from_str::<Vec<PathBuf>>(&serialized.paths)
-                .unwrap_or(Vec::new())
-                .into_iter()
-                .map(|s| SanitizedPath::from(s).into())
-                .collect()
+            serialized.paths.split('\n').map(PathBuf::from).collect()
         };
 
         let mut order: Vec<usize> = serialized
@@ -85,7 +81,13 @@ impl PathList {
     pub fn serialize(&self) -> SerializedPathList {
         use std::fmt::Write as _;
 
-        let paths = serde_json::to_string(&self.paths).unwrap_or_default();
+        let mut paths = String::new();
+        for path in self.paths.iter() {
+            if !paths.is_empty() {
+                paths.push('\n');
+            }
+            paths.push_str(&path.to_string_lossy());
+        }
 
         let mut order = String::new();
         for ix in self.order.iter() {
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 39a1e08c93..89e1147d8a 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -10,7 +10,11 @@ use std::{
 
 use anyhow::{Context as _, Result, bail};
 use collections::HashMap;
-use db::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql};
+use db::{
+    query,
+    sqlez::{connection::Connection, domain::Domain},
+    sqlez_macros::sql,
+};
 use gpui::{Axis, Bounds, Task, WindowBounds, WindowId, point, size};
 use project::debugger::breakpoint_store::{BreakpointState, SourceBreakpoint};
 
@@ -275,186 +279,189 @@ impl sqlez::bindable::Bind for SerializedPixels {
     }
 }
 
-define_connection! {
-    pub static ref DB: WorkspaceDb<()> =
-    &[
-    sql!(
-        CREATE TABLE workspaces(
-            workspace_id INTEGER PRIMARY KEY,
-            workspace_location BLOB UNIQUE,
-            dock_visible INTEGER, // Deprecated. Preserving so users can downgrade Zed.
-            dock_anchor TEXT, // Deprecated. Preserving so users can downgrade Zed.
-            dock_pane INTEGER, // Deprecated.  Preserving so users can downgrade Zed.
-            left_sidebar_open INTEGER, // Boolean
-            timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-            FOREIGN KEY(dock_pane) REFERENCES panes(pane_id)
-        ) STRICT;
+pub struct WorkspaceDb(ThreadSafeConnection);
 
-        CREATE TABLE pane_groups(
-            group_id INTEGER PRIMARY KEY,
-            workspace_id INTEGER NOT NULL,
-            parent_group_id INTEGER, // NULL indicates that this is a root node
-            position INTEGER, // NULL indicates that this is a root node
-            axis TEXT NOT NULL, // Enum: 'Vertical' / 'Horizontal'
-            FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-            ON DELETE CASCADE
-            ON UPDATE CASCADE,
-            FOREIGN KEY(parent_group_id) REFERENCES pane_groups(group_id) ON DELETE CASCADE
-        ) STRICT;
+impl Domain for WorkspaceDb {
+    const NAME: &str = stringify!(WorkspaceDb);
 
-        CREATE TABLE panes(
-            pane_id INTEGER PRIMARY KEY,
-            workspace_id INTEGER NOT NULL,
-            active INTEGER NOT NULL, // Boolean
-            FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-            ON DELETE CASCADE
-            ON UPDATE CASCADE
-        ) STRICT;
+    const MIGRATIONS: &[&str] = &[
+        sql!(
+            CREATE TABLE workspaces(
+                workspace_id INTEGER PRIMARY KEY,
+                workspace_location BLOB UNIQUE,
+                dock_visible INTEGER, // Deprecated. Preserving so users can downgrade Zed.
+                dock_anchor TEXT, // Deprecated. Preserving so users can downgrade Zed.
+                dock_pane INTEGER, // Deprecated.  Preserving so users can downgrade Zed.
+                left_sidebar_open INTEGER, // Boolean
+                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+                FOREIGN KEY(dock_pane) REFERENCES panes(pane_id)
+            ) STRICT;
 
-        CREATE TABLE center_panes(
-            pane_id INTEGER PRIMARY KEY,
-            parent_group_id INTEGER, // NULL means that this is a root pane
-            position INTEGER, // NULL means that this is a root pane
-            FOREIGN KEY(pane_id) REFERENCES panes(pane_id)
-            ON DELETE CASCADE,
-            FOREIGN KEY(parent_group_id) REFERENCES pane_groups(group_id) ON DELETE CASCADE
-        ) STRICT;
+            CREATE TABLE pane_groups(
+                group_id INTEGER PRIMARY KEY,
+                workspace_id INTEGER NOT NULL,
+                parent_group_id INTEGER, // NULL indicates that this is a root node
+                position INTEGER, // NULL indicates that this is a root node
+                axis TEXT NOT NULL, // Enum: 'Vertical' / 'Horizontal'
+                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
+                ON DELETE CASCADE
+                ON UPDATE CASCADE,
+                FOREIGN KEY(parent_group_id) REFERENCES pane_groups(group_id) ON DELETE CASCADE
+            ) STRICT;
 
-        CREATE TABLE items(
-            item_id INTEGER NOT NULL, // This is the item's view id, so this is not unique
-            workspace_id INTEGER NOT NULL,
-            pane_id INTEGER NOT NULL,
-            kind TEXT NOT NULL,
-            position INTEGER NOT NULL,
-            active INTEGER NOT NULL,
-            FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-            ON DELETE CASCADE
-            ON UPDATE CASCADE,
-            FOREIGN KEY(pane_id) REFERENCES panes(pane_id)
-            ON DELETE CASCADE,
-            PRIMARY KEY(item_id, workspace_id)
-        ) STRICT;
-    ),
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN window_state TEXT;
-        ALTER TABLE workspaces ADD COLUMN window_x REAL;
-        ALTER TABLE workspaces ADD COLUMN window_y REAL;
-        ALTER TABLE workspaces ADD COLUMN window_width REAL;
-        ALTER TABLE workspaces ADD COLUMN window_height REAL;
-        ALTER TABLE workspaces ADD COLUMN display BLOB;
-    ),
-    // Drop foreign key constraint from workspaces.dock_pane to panes table.
-    sql!(
-        CREATE TABLE workspaces_2(
-            workspace_id INTEGER PRIMARY KEY,
-            workspace_location BLOB UNIQUE,
-            dock_visible INTEGER, // Deprecated. Preserving so users can downgrade Zed.
-            dock_anchor TEXT, // Deprecated. Preserving so users can downgrade Zed.
-            dock_pane INTEGER, // Deprecated.  Preserving so users can downgrade Zed.
-            left_sidebar_open INTEGER, // Boolean
-            timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-            window_state TEXT,
-            window_x REAL,
-            window_y REAL,
-            window_width REAL,
-            window_height REAL,
-            display BLOB
-        ) STRICT;
-        INSERT INTO workspaces_2 SELECT * FROM workspaces;
-        DROP TABLE workspaces;
-        ALTER TABLE workspaces_2 RENAME TO workspaces;
-    ),
-    // Add panels related information
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN left_dock_visible INTEGER; //bool
-        ALTER TABLE workspaces ADD COLUMN left_dock_active_panel TEXT;
-        ALTER TABLE workspaces ADD COLUMN right_dock_visible INTEGER; //bool
-        ALTER TABLE workspaces ADD COLUMN right_dock_active_panel TEXT;
-        ALTER TABLE workspaces ADD COLUMN bottom_dock_visible INTEGER; //bool
-        ALTER TABLE workspaces ADD COLUMN bottom_dock_active_panel TEXT;
-    ),
-    // Add panel zoom persistence
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN left_dock_zoom INTEGER; //bool
-        ALTER TABLE workspaces ADD COLUMN right_dock_zoom INTEGER; //bool
-        ALTER TABLE workspaces ADD COLUMN bottom_dock_zoom INTEGER; //bool
-    ),
-    // Add pane group flex data
-    sql!(
-        ALTER TABLE pane_groups ADD COLUMN flexes TEXT;
-    ),
-    // Add fullscreen field to workspace
-    // Deprecated, `WindowBounds` holds the fullscreen state now.
-    // Preserving so users can downgrade Zed.
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN fullscreen INTEGER; //bool
-    ),
-    // Add preview field to items
-    sql!(
-        ALTER TABLE items ADD COLUMN preview INTEGER; //bool
-    ),
-    // Add centered_layout field to workspace
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN centered_layout INTEGER; //bool
-    ),
-    sql!(
-        CREATE TABLE remote_projects (
-            remote_project_id INTEGER NOT NULL UNIQUE,
-            path TEXT,
-            dev_server_name TEXT
-        );
-        ALTER TABLE workspaces ADD COLUMN remote_project_id INTEGER;
-        ALTER TABLE workspaces RENAME COLUMN workspace_location TO local_paths;
-    ),
-    sql!(
-        DROP TABLE remote_projects;
-        CREATE TABLE dev_server_projects (
-            id INTEGER NOT NULL UNIQUE,
-            path TEXT,
-            dev_server_name TEXT
-        );
-        ALTER TABLE workspaces DROP COLUMN remote_project_id;
-        ALTER TABLE workspaces ADD COLUMN dev_server_project_id INTEGER;
-    ),
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN local_paths_order BLOB;
-    ),
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN session_id TEXT DEFAULT NULL;
-    ),
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN window_id INTEGER DEFAULT NULL;
-    ),
-    sql!(
-        ALTER TABLE panes ADD COLUMN pinned_count INTEGER DEFAULT 0;
-    ),
-    sql!(
-        CREATE TABLE ssh_projects (
-            id INTEGER PRIMARY KEY,
-            host TEXT NOT NULL,
-            port INTEGER,
-            path TEXT NOT NULL,
-            user TEXT
-        );
-        ALTER TABLE workspaces ADD COLUMN ssh_project_id INTEGER REFERENCES ssh_projects(id) ON DELETE CASCADE;
-    ),
-    sql!(
-        ALTER TABLE ssh_projects RENAME COLUMN path TO paths;
-    ),
-    sql!(
-        CREATE TABLE toolchains (
-            workspace_id INTEGER,
-            worktree_id INTEGER,
-            language_name TEXT NOT NULL,
-            name TEXT NOT NULL,
-            path TEXT NOT NULL,
-            PRIMARY KEY (workspace_id, worktree_id, language_name)
-        );
-    ),
-    sql!(
-        ALTER TABLE toolchains ADD COLUMN raw_json TEXT DEFAULT "{}";
-    ),
-    sql!(
+            CREATE TABLE panes(
+                pane_id INTEGER PRIMARY KEY,
+                workspace_id INTEGER NOT NULL,
+                active INTEGER NOT NULL, // Boolean
+                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
+                ON DELETE CASCADE
+                ON UPDATE CASCADE
+            ) STRICT;
+
+            CREATE TABLE center_panes(
+                pane_id INTEGER PRIMARY KEY,
+                parent_group_id INTEGER, // NULL means that this is a root pane
+                position INTEGER, // NULL means that this is a root pane
+                FOREIGN KEY(pane_id) REFERENCES panes(pane_id)
+                ON DELETE CASCADE,
+                FOREIGN KEY(parent_group_id) REFERENCES pane_groups(group_id) ON DELETE CASCADE
+            ) STRICT;
+
+            CREATE TABLE items(
+                item_id INTEGER NOT NULL, // This is the item's view id, so this is not unique
+                workspace_id INTEGER NOT NULL,
+                pane_id INTEGER NOT NULL,
+                kind TEXT NOT NULL,
+                position INTEGER NOT NULL,
+                active INTEGER NOT NULL,
+                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
+                ON DELETE CASCADE
+                ON UPDATE CASCADE,
+                FOREIGN KEY(pane_id) REFERENCES panes(pane_id)
+                ON DELETE CASCADE,
+                PRIMARY KEY(item_id, workspace_id)
+            ) STRICT;
+        ),
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN window_state TEXT;
+            ALTER TABLE workspaces ADD COLUMN window_x REAL;
+            ALTER TABLE workspaces ADD COLUMN window_y REAL;
+            ALTER TABLE workspaces ADD COLUMN window_width REAL;
+            ALTER TABLE workspaces ADD COLUMN window_height REAL;
+            ALTER TABLE workspaces ADD COLUMN display BLOB;
+        ),
+        // Drop foreign key constraint from workspaces.dock_pane to panes table.
+        sql!(
+            CREATE TABLE workspaces_2(
+                workspace_id INTEGER PRIMARY KEY,
+                workspace_location BLOB UNIQUE,
+                dock_visible INTEGER, // Deprecated. Preserving so users can downgrade Zed.
+                dock_anchor TEXT, // Deprecated. Preserving so users can downgrade Zed.
+                dock_pane INTEGER, // Deprecated.  Preserving so users can downgrade Zed.
+                left_sidebar_open INTEGER, // Boolean
+                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+                window_state TEXT,
+                window_x REAL,
+                window_y REAL,
+                window_width REAL,
+                window_height REAL,
+                display BLOB
+            ) STRICT;
+            INSERT INTO workspaces_2 SELECT * FROM workspaces;
+            DROP TABLE workspaces;
+            ALTER TABLE workspaces_2 RENAME TO workspaces;
+        ),
+        // Add panels related information
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN left_dock_visible INTEGER; //bool
+            ALTER TABLE workspaces ADD COLUMN left_dock_active_panel TEXT;
+            ALTER TABLE workspaces ADD COLUMN right_dock_visible INTEGER; //bool
+            ALTER TABLE workspaces ADD COLUMN right_dock_active_panel TEXT;
+            ALTER TABLE workspaces ADD COLUMN bottom_dock_visible INTEGER; //bool
+            ALTER TABLE workspaces ADD COLUMN bottom_dock_active_panel TEXT;
+        ),
+        // Add panel zoom persistence
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN left_dock_zoom INTEGER; //bool
+            ALTER TABLE workspaces ADD COLUMN right_dock_zoom INTEGER; //bool
+            ALTER TABLE workspaces ADD COLUMN bottom_dock_zoom INTEGER; //bool
+        ),
+        // Add pane group flex data
+        sql!(
+            ALTER TABLE pane_groups ADD COLUMN flexes TEXT;
+        ),
+        // Add fullscreen field to workspace
+        // Deprecated, `WindowBounds` holds the fullscreen state now.
+        // Preserving so users can downgrade Zed.
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN fullscreen INTEGER; //bool
+        ),
+        // Add preview field to items
+        sql!(
+            ALTER TABLE items ADD COLUMN preview INTEGER; //bool
+        ),
+        // Add centered_layout field to workspace
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN centered_layout INTEGER; //bool
+        ),
+        sql!(
+            CREATE TABLE remote_projects (
+                remote_project_id INTEGER NOT NULL UNIQUE,
+                path TEXT,
+                dev_server_name TEXT
+            );
+            ALTER TABLE workspaces ADD COLUMN remote_project_id INTEGER;
+            ALTER TABLE workspaces RENAME COLUMN workspace_location TO local_paths;
+        ),
+        sql!(
+            DROP TABLE remote_projects;
+            CREATE TABLE dev_server_projects (
+                id INTEGER NOT NULL UNIQUE,
+                path TEXT,
+                dev_server_name TEXT
+            );
+            ALTER TABLE workspaces DROP COLUMN remote_project_id;
+            ALTER TABLE workspaces ADD COLUMN dev_server_project_id INTEGER;
+        ),
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN local_paths_order BLOB;
+        ),
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN session_id TEXT DEFAULT NULL;
+        ),
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN window_id INTEGER DEFAULT NULL;
+        ),
+        sql!(
+            ALTER TABLE panes ADD COLUMN pinned_count INTEGER DEFAULT 0;
+        ),
+        sql!(
+            CREATE TABLE ssh_projects (
+                id INTEGER PRIMARY KEY,
+                host TEXT NOT NULL,
+                port INTEGER,
+                path TEXT NOT NULL,
+                user TEXT
+            );
+            ALTER TABLE workspaces ADD COLUMN ssh_project_id INTEGER REFERENCES ssh_projects(id) ON DELETE CASCADE;
+        ),
+        sql!(
+            ALTER TABLE ssh_projects RENAME COLUMN path TO paths;
+        ),
+        sql!(
+            CREATE TABLE toolchains (
+                workspace_id INTEGER,
+                worktree_id INTEGER,
+                language_name TEXT NOT NULL,
+                name TEXT NOT NULL,
+                path TEXT NOT NULL,
+                PRIMARY KEY (workspace_id, worktree_id, language_name)
+            );
+        ),
+        sql!(
+            ALTER TABLE toolchains ADD COLUMN raw_json TEXT DEFAULT "{}";
+        ),
+        sql!(
             CREATE TABLE breakpoints (
                 workspace_id INTEGER NOT NULL,
                 path TEXT NOT NULL,
@@ -466,141 +473,165 @@ define_connection! {
                 ON UPDATE CASCADE
             );
         ),
-    sql!(
-        ALTER TABLE workspaces ADD COLUMN local_paths_array TEXT;
-        CREATE UNIQUE INDEX local_paths_array_uq ON workspaces(local_paths_array);
-        ALTER TABLE workspaces ADD COLUMN local_paths_order_array TEXT;
-    ),
-    sql!(
-        ALTER TABLE breakpoints ADD COLUMN state INTEGER DEFAULT(0) NOT NULL
-    ),
-    sql!(
-        ALTER TABLE breakpoints DROP COLUMN kind
-    ),
-    sql!(ALTER TABLE toolchains ADD COLUMN relative_worktree_path TEXT DEFAULT "" NOT NULL),
-    sql!(
-        ALTER TABLE breakpoints ADD COLUMN condition TEXT;
-        ALTER TABLE breakpoints ADD COLUMN hit_condition TEXT;
-    ),
-    sql!(CREATE TABLE toolchains2 (
-        workspace_id INTEGER,
-        worktree_id INTEGER,
-        language_name TEXT NOT NULL,
-        name TEXT NOT NULL,
-        path TEXT NOT NULL,
-        raw_json TEXT NOT NULL,
-        relative_worktree_path TEXT NOT NULL,
-        PRIMARY KEY (workspace_id, worktree_id, language_name, relative_worktree_path)) STRICT;
-        INSERT INTO toolchains2
-            SELECT * FROM toolchains;
-        DROP TABLE toolchains;
-        ALTER TABLE toolchains2 RENAME TO toolchains;
-    ),
-    sql!(
-        CREATE TABLE ssh_connections (
-            id INTEGER PRIMARY KEY,
-            host TEXT NOT NULL,
-            port INTEGER,
-            user TEXT
-        );
+        sql!(
+            ALTER TABLE workspaces ADD COLUMN local_paths_array TEXT;
+            CREATE UNIQUE INDEX local_paths_array_uq ON workspaces(local_paths_array);
+            ALTER TABLE workspaces ADD COLUMN local_paths_order_array TEXT;
+        ),
+        sql!(
+            ALTER TABLE breakpoints ADD COLUMN state INTEGER DEFAULT(0) NOT NULL
+        ),
+        sql!(
+            ALTER TABLE breakpoints DROP COLUMN kind
+        ),
+        sql!(ALTER TABLE toolchains ADD COLUMN relative_worktree_path TEXT DEFAULT "" NOT NULL),
+        sql!(
+            ALTER TABLE breakpoints ADD COLUMN condition TEXT;
+            ALTER TABLE breakpoints ADD COLUMN hit_condition TEXT;
+        ),
+        sql!(CREATE TABLE toolchains2 (
+            workspace_id INTEGER,
+            worktree_id INTEGER,
+            language_name TEXT NOT NULL,
+            name TEXT NOT NULL,
+            path TEXT NOT NULL,
+            raw_json TEXT NOT NULL,
+            relative_worktree_path TEXT NOT NULL,
+            PRIMARY KEY (workspace_id, worktree_id, language_name, relative_worktree_path)) STRICT;
+            INSERT INTO toolchains2
+                SELECT * FROM toolchains;
+            DROP TABLE toolchains;
+            ALTER TABLE toolchains2 RENAME TO toolchains;
+        ),
+        sql!(
+            CREATE TABLE ssh_connections (
+                id INTEGER PRIMARY KEY,
+                host TEXT NOT NULL,
+                port INTEGER,
+                user TEXT
+            );
 
-        INSERT INTO ssh_connections (host, port, user)
-        SELECT DISTINCT host, port, user
-        FROM ssh_projects;
+            INSERT INTO ssh_connections (host, port, user)
+            SELECT DISTINCT host, port, user
+            FROM ssh_projects;
 
-        CREATE TABLE workspaces_2(
-            workspace_id INTEGER PRIMARY KEY,
-            paths TEXT,
-            paths_order TEXT,
-            ssh_connection_id INTEGER REFERENCES ssh_connections(id),
-            timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-            window_state TEXT,
-            window_x REAL,
-            window_y REAL,
-            window_width REAL,
-            window_height REAL,
-            display BLOB,
-            left_dock_visible INTEGER,
-            left_dock_active_panel TEXT,
-            right_dock_visible INTEGER,
-            right_dock_active_panel TEXT,
-            bottom_dock_visible INTEGER,
-            bottom_dock_active_panel TEXT,
-            left_dock_zoom INTEGER,
-            right_dock_zoom INTEGER,
-            bottom_dock_zoom INTEGER,
-            fullscreen INTEGER,
-            centered_layout INTEGER,
-            session_id TEXT,
-            window_id INTEGER
-        ) STRICT;
+            CREATE TABLE workspaces_2(
+                workspace_id INTEGER PRIMARY KEY,
+                paths TEXT,
+                paths_order TEXT,
+                ssh_connection_id INTEGER REFERENCES ssh_connections(id),
+                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+                window_state TEXT,
+                window_x REAL,
+                window_y REAL,
+                window_width REAL,
+                window_height REAL,
+                display BLOB,
+                left_dock_visible INTEGER,
+                left_dock_active_panel TEXT,
+                right_dock_visible INTEGER,
+                right_dock_active_panel TEXT,
+                bottom_dock_visible INTEGER,
+                bottom_dock_active_panel TEXT,
+                left_dock_zoom INTEGER,
+                right_dock_zoom INTEGER,
+                bottom_dock_zoom INTEGER,
+                fullscreen INTEGER,
+                centered_layout INTEGER,
+                session_id TEXT,
+                window_id INTEGER
+            ) STRICT;
 
-        INSERT
-        INTO workspaces_2
-        SELECT
-            workspaces.workspace_id,
-            CASE
-                WHEN ssh_projects.id IS NOT NULL THEN ssh_projects.paths
+            INSERT
+            INTO workspaces_2
+            SELECT
+                workspaces.workspace_id,
+                CASE
+                    WHEN ssh_projects.id IS NOT NULL THEN ssh_projects.paths
+                    ELSE
+                        CASE
+                            WHEN workspaces.local_paths_array IS NULL OR workspaces.local_paths_array = "" THEN
+                                NULL
+                            ELSE
+                                replace(workspaces.local_paths_array, ',', "\n")
+                        END
+                END as paths,
+
+                CASE
+                    WHEN ssh_projects.id IS NOT NULL THEN ""
+                    ELSE workspaces.local_paths_order_array
+                END as paths_order,
+
+                CASE
+                    WHEN ssh_projects.id IS NOT NULL THEN (
+                        SELECT ssh_connections.id
+                        FROM ssh_connections
+                        WHERE
+                            ssh_connections.host IS ssh_projects.host AND
+                            ssh_connections.port IS ssh_projects.port AND
+                            ssh_connections.user IS ssh_projects.user
+                    )
+                    ELSE NULL
+                END as ssh_connection_id,
+
+                workspaces.timestamp,
+                workspaces.window_state,
+                workspaces.window_x,
+                workspaces.window_y,
+                workspaces.window_width,
+                workspaces.window_height,
+                workspaces.display,
+                workspaces.left_dock_visible,
+                workspaces.left_dock_active_panel,
+                workspaces.right_dock_visible,
+                workspaces.right_dock_active_panel,
+                workspaces.bottom_dock_visible,
+                workspaces.bottom_dock_active_panel,
+                workspaces.left_dock_zoom,
+                workspaces.right_dock_zoom,
+                workspaces.bottom_dock_zoom,
+                workspaces.fullscreen,
+                workspaces.centered_layout,
+                workspaces.session_id,
+                workspaces.window_id
+            FROM
+                workspaces LEFT JOIN
+                ssh_projects ON
+                workspaces.ssh_project_id = ssh_projects.id;
+
+            DROP TABLE ssh_projects;
+            DROP TABLE workspaces;
+            ALTER TABLE workspaces_2 RENAME TO workspaces;
+
+            CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(ssh_connection_id, paths);
+        ),
+        // Fix any data from when workspaces.paths were briefly encoded as JSON arrays
+        sql!(
+            UPDATE workspaces
+            SET paths = CASE
+                WHEN substr(paths, 1, 2) = '[' || '"' AND substr(paths, -2, 2) = '"' || ']' THEN
+                    replace(
+                        substr(paths, 3, length(paths) - 4),
+                        '"' || ',' || '"',
+                        CHAR(10)
+                    )
                 ELSE
-                    CASE
-                        WHEN workspaces.local_paths_array IS NULL OR workspaces.local_paths_array = "" THEN
-                            NULL
-                        ELSE
-                            json('[' || '"' || replace(workspaces.local_paths_array, ',', '"' || "," || '"') || '"' || ']')
-                    END
-            END as paths,
-
-            CASE
-                WHEN ssh_projects.id IS NOT NULL THEN ""
-                ELSE workspaces.local_paths_order_array
-            END as paths_order,
-
-            CASE
-                WHEN ssh_projects.id IS NOT NULL THEN (
-                    SELECT ssh_connections.id
-                    FROM ssh_connections
-                    WHERE
-                        ssh_connections.host IS ssh_projects.host AND
-                        ssh_connections.port IS ssh_projects.port AND
-                        ssh_connections.user IS ssh_projects.user
-                )
-                ELSE NULL
-            END as ssh_connection_id,
-
-            workspaces.timestamp,
-            workspaces.window_state,
-            workspaces.window_x,
-            workspaces.window_y,
-            workspaces.window_width,
-            workspaces.window_height,
-            workspaces.display,
-            workspaces.left_dock_visible,
-            workspaces.left_dock_active_panel,
-            workspaces.right_dock_visible,
-            workspaces.right_dock_active_panel,
-            workspaces.bottom_dock_visible,
-            workspaces.bottom_dock_active_panel,
-            workspaces.left_dock_zoom,
-            workspaces.right_dock_zoom,
-            workspaces.bottom_dock_zoom,
-            workspaces.fullscreen,
-            workspaces.centered_layout,
-            workspaces.session_id,
-            workspaces.window_id
-        FROM
-            workspaces LEFT JOIN
-            ssh_projects ON
-            workspaces.ssh_project_id = ssh_projects.id;
-
-        DROP TABLE ssh_projects;
-        DROP TABLE workspaces;
-        ALTER TABLE workspaces_2 RENAME TO workspaces;
-
-        CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(ssh_connection_id, paths);
-    ),
+                    replace(paths, ',', CHAR(10))
+            END
+            WHERE paths IS NOT NULL
+        ),
     ];
+
+    // Allow recovering from bad migration that was initially shipped to nightly
+    // when introducing the ssh_connections table.
+    fn should_allow_migration_change(_index: usize, old: &str, new: &str) -> bool {
+        old.starts_with("CREATE TABLE ssh_connections")
+            && new.starts_with("CREATE TABLE ssh_connections")
+    }
 }
 
+db::static_connection!(DB, WorkspaceDb, []);
+
 impl WorkspaceDb {
     /// Returns a serialized workspace for the given worktree_roots. If the passed array
     /// is empty, the most recent workspace is returned instead. If no workspace for the
@@ -1803,6 +1834,7 @@ mod tests {
                         ON DELETE CASCADE
                     ) STRICT;
                 )],
+                |_, _, _| false,
             )
             .unwrap();
         })
@@ -1851,6 +1883,7 @@ mod tests {
                                 REFERENCES workspaces(workspace_id)
                             ON DELETE CASCADE
                         ) STRICT;)],
+                |_, _, _| false,
             )
         })
         .await
diff --git a/crates/zed/src/zed/component_preview/persistence.rs b/crates/zed/src/zed/component_preview/persistence.rs
index 780f7f7626..c37a4cc389 100644
--- a/crates/zed/src/zed/component_preview/persistence.rs
+++ b/crates/zed/src/zed/component_preview/persistence.rs
@@ -1,10 +1,17 @@
 use anyhow::Result;
-use db::{define_connection, query, sqlez::statement::Statement, sqlez_macros::sql};
+use db::{
+    query,
+    sqlez::{domain::Domain, statement::Statement, thread_safe_connection::ThreadSafeConnection},
+    sqlez_macros::sql,
+};
 use workspace::{ItemId, WorkspaceDb, WorkspaceId};
 
-define_connection! {
-    pub static ref COMPONENT_PREVIEW_DB: ComponentPreviewDb<WorkspaceDb> =
-        &[sql!(
+pub struct ComponentPreviewDb(ThreadSafeConnection);
+
+impl Domain for ComponentPreviewDb {
+    const NAME: &str = stringify!(ComponentPreviewDb);
+
+    const MIGRATIONS: &[&str] = &[sql!(
             CREATE TABLE component_previews (
                 workspace_id INTEGER,
                 item_id INTEGER UNIQUE,
@@ -13,9 +20,11 @@ define_connection! {
                 FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
                 ON DELETE CASCADE
             ) STRICT;
-        )];
+    )];
 }
 
+db::static_connection!(COMPONENT_PREVIEW_DB, ComponentPreviewDb, [WorkspaceDb]);
+
 impl ComponentPreviewDb {
     pub async fn save_active_page(
         &self,

From 633ce23ae974211de452683e6d5b2e1a0bf21431 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 25 Aug 2025 18:55:24 -0600
Subject: [PATCH 363/823] acp: Send user-configured MCP tools (#36910)

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs  |  1 +
 crates/agent_servers/src/acp.rs | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 093b8ba971..78e5c88280 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -72,6 +72,7 @@ async fn test_echo(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
+#[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_thinking(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 9080fc1ab0..b4e897374a 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -162,12 +162,34 @@ impl AgentConnection for AcpConnection {
         let conn = self.connection.clone();
         let sessions = self.sessions.clone();
         let cwd = cwd.to_path_buf();
+        let context_server_store = project.read(cx).context_server_store().read(cx);
+        let mcp_servers = context_server_store
+            .configured_server_ids()
+            .iter()
+            .filter_map(|id| {
+                let configuration = context_server_store.configuration_for_server(id)?;
+                let command = configuration.command();
+                Some(acp::McpServer {
+                    name: id.0.to_string(),
+                    command: command.path.clone(),
+                    args: command.args.clone(),
+                    env: if let Some(env) = command.env.as_ref() {
+                        env.iter()
+                            .map(|(name, value)| acp::EnvVariable {
+                                name: name.clone(),
+                                value: value.clone(),
+                            })
+                            .collect()
+                    } else {
+                        vec![]
+                    },
+                })
+            })
+            .collect();
+
         cx.spawn(async move |cx| {
             let response = conn
-                .new_session(acp::NewSessionRequest {
-                    mcp_servers: vec![],
-                    cwd,
-                })
+                .new_session(acp::NewSessionRequest { mcp_servers, cwd })
                 .await
                 .map_err(|err| {
                     if err.code == acp::ErrorCode::AUTH_REQUIRED.code {

From bb5cfe118f588336d54b0499be998cd7744fb8a2 Mon Sep 17 00:00:00 2001
From: Romans Malinovskis <me@nearly.guru>
Date: Tue, 26 Aug 2025 04:37:29 +0100
Subject: [PATCH 364/823] Add "shift-r" and "g ." support for helix mode
 (#35468)

Related #4642
Compatible with #34136

Release Notes:

- Helix: `Shift+R` works as Paste instead of taking you to ReplaceMode
- Helix: `g .` goes to last modification place (similar to `. in vim)
---
 assets/keymaps/vim.json |  2 +
 crates/vim/src/helix.rs | 87 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 62e50b3c8c..67add61bd3 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -428,11 +428,13 @@
       "g h": "vim::StartOfLine",
       "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
       "g e": "vim::EndOfDocument",
+      "g .": "vim::HelixGotoLastModification", // go to last modification
       "g r": "editor::FindAllReferences", // zed specific
       "g t": "vim::WindowTop",
       "g c": "vim::WindowMiddle",
       "g b": "vim::WindowBottom",
 
+      "shift-r": "editor::Paste",
       "x": "editor::SelectLine",
       "shift-x": "editor::SelectLine",
       "%": "editor::SelectAll",
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 2bc531268d..726022021d 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -23,6 +23,8 @@ actions!(
         HelixInsert,
         /// Appends at the end of the selection.
         HelixAppend,
+        /// Goes to the location of the last modification.
+        HelixGotoLastModification,
     ]
 );
 
@@ -31,6 +33,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
     Vim::action(editor, cx, Vim::helix_insert);
     Vim::action(editor, cx, Vim::helix_append);
     Vim::action(editor, cx, Vim::helix_yank);
+    Vim::action(editor, cx, Vim::helix_goto_last_modification);
 }
 
 impl Vim {
@@ -430,6 +433,15 @@ impl Vim {
         });
         self.switch_mode(Mode::HelixNormal, true, window, cx);
     }
+
+    pub fn helix_goto_last_modification(
+        &mut self,
+        _: &HelixGotoLastModification,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.jump(".".into(), false, false, window, cx);
+    }
 }
 
 #[cfg(test)]
@@ -441,6 +453,7 @@ mod test {
     #[gpui::test]
     async fn test_word_motions(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
         // «
         // ˇ
         // »
@@ -502,6 +515,7 @@ mod test {
     #[gpui::test]
     async fn test_delete(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
 
         // test delete a selection
         cx.set_state(
@@ -582,6 +596,7 @@ mod test {
     #[gpui::test]
     async fn test_f_and_t(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
 
         cx.set_state(
             indoc! {"
@@ -635,6 +650,7 @@ mod test {
     #[gpui::test]
     async fn test_newline_char(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
 
         cx.set_state("aa«\nˇ»bb cc", Mode::HelixNormal);
 
@@ -652,6 +668,7 @@ mod test {
     #[gpui::test]
     async fn test_insert_selected(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
         cx.set_state(
             indoc! {"
             «The ˇ»quick brown
@@ -674,6 +691,7 @@ mod test {
     #[gpui::test]
     async fn test_append(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
         // test from the end of the selection
         cx.set_state(
             indoc! {"
@@ -716,6 +734,7 @@ mod test {
     #[gpui::test]
     async fn test_replace(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
 
         // No selection (single character)
         cx.set_state("ˇaa", Mode::HelixNormal);
@@ -763,4 +782,72 @@ mod test {
         cx.shared_clipboard().assert_eq("worl");
         cx.assert_state("hello «worlˇ»d", Mode::HelixNormal);
     }
+    #[gpui::test]
+    async fn test_shift_r_paste(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // First copy some text to clipboard
+        cx.set_state("«hello worldˇ»", Mode::HelixNormal);
+        cx.simulate_keystrokes("y");
+
+        // Test paste with shift-r on single cursor
+        cx.set_state("foo ˇbar", Mode::HelixNormal);
+        cx.simulate_keystrokes("shift-r");
+
+        cx.assert_state("foo hello worldˇbar", Mode::HelixNormal);
+
+        // Test paste with shift-r on selection
+        cx.set_state("foo «barˇ» baz", Mode::HelixNormal);
+        cx.simulate_keystrokes("shift-r");
+
+        cx.assert_state("foo hello worldˇ baz", Mode::HelixNormal);
+    }
+
+    #[gpui::test]
+    async fn test_insert_mode_stickiness(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // Make a modification at a specific location
+        cx.set_state("ˇhello", Mode::HelixNormal);
+        assert_eq!(cx.mode(), Mode::HelixNormal);
+        cx.simulate_keystrokes("i");
+        assert_eq!(cx.mode(), Mode::Insert);
+        cx.simulate_keystrokes("escape");
+        assert_eq!(cx.mode(), Mode::HelixNormal);
+    }
+
+    #[gpui::test]
+    async fn test_goto_last_modification(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        // Make a modification at a specific location
+        cx.set_state("line one\nline ˇtwo\nline three", Mode::HelixNormal);
+        cx.assert_state("line one\nline ˇtwo\nline three", Mode::HelixNormal);
+        cx.simulate_keystrokes("i");
+        cx.simulate_keystrokes("escape");
+        cx.simulate_keystrokes("i");
+        cx.simulate_keystrokes("m o d i f i e d space");
+        cx.simulate_keystrokes("escape");
+
+        // TODO: this fails, because state is no longer helix
+        cx.assert_state(
+            "line one\nline modified ˇtwo\nline three",
+            Mode::HelixNormal,
+        );
+
+        // Move cursor away from the modification
+        cx.simulate_keystrokes("up");
+
+        // Use "g ." to go back to last modification
+        cx.simulate_keystrokes("g .");
+
+        // Verify we're back at the modification location and still in HelixNormal mode
+        cx.assert_state(
+            "line one\nline modifiedˇ two\nline three",
+            Mode::HelixNormal,
+        );
+    }
 }

From bf5ed6d1c9795369310b5b9d6c752d9dc54991b5 Mon Sep 17 00:00:00 2001
From: Rui Ning <107875822+iryanin@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:40:53 +0800
Subject: [PATCH 365/823] Remote: Change "sh -c" to "sh -lc" to make config in
 $HOME/.profile effective (#36760)

Closes #ISSUE

Release Notes:

- The environment of original remote dev cannot be changed without sudo
because of the behavior of "sh -c". This PR changes "sh -c" to "sh -lc"
to let the shell source $HOME/.profile and support customized
environment like customized $PATH variable.
---
 crates/remote/src/ssh_session.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index b9af528643..6794018470 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -445,7 +445,7 @@ impl SshSocket {
     }
 
     async fn platform(&self) -> Result<SshPlatform> {
-        let uname = self.run_command("sh", &["-c", "uname -sm"]).await?;
+        let uname = self.run_command("sh", &["-lc", "uname -sm"]).await?;
         let Some((os, arch)) = uname.split_once(" ") else {
             anyhow::bail!("unknown uname: {uname:?}")
         };
@@ -476,7 +476,7 @@ impl SshSocket {
     }
 
     async fn shell(&self) -> String {
-        match self.run_command("sh", &["-c", "echo $SHELL"]).await {
+        match self.run_command("sh", &["-lc", "echo $SHELL"]).await {
             Ok(shell) => shell.trim().to_owned(),
             Err(e) => {
                 log::error!("Failed to get shell: {e}");
@@ -1533,7 +1533,7 @@ impl RemoteConnection for SshRemoteConnection {
 
         let ssh_proxy_process = match self
             .socket
-            .ssh_command("sh", &["-c", &start_proxy_command])
+            .ssh_command("sh", &["-lc", &start_proxy_command])
             // IMPORTANT: we kill this process when we drop the task that uses it.
             .kill_on_drop(true)
             .spawn()
@@ -1910,7 +1910,7 @@ impl SshRemoteConnection {
                 .run_command(
                     "sh",
                     &[
-                        "-c",
+                        "-lc",
                         &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
                     ],
                 )
@@ -1988,7 +1988,7 @@ impl SshRemoteConnection {
                 .run_command(
                     "sh",
                     &[
-                        "-c",
+                        "-lc",
                         &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
                     ],
                 )
@@ -2036,7 +2036,7 @@ impl SshRemoteConnection {
                 dst_path = &dst_path.to_string()
             )
         };
-        self.socket.run_command("sh", &["-c", &script]).await?;
+        self.socket.run_command("sh", &["-lc", &script]).await?;
         Ok(())
     }
 

From 64b14ef84859de5d03c5959faedc1216415a2b52 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 25 Aug 2025 22:21:05 -0700
Subject: [PATCH 366/823] Fix Sqlite newline syntax in workspace migration
 (#36916)

Fixes one more case where I incorrectly tried to use a `\n` escape
sequence for a newline in sqlite.

Release Notes:

- N/A
---
 crates/workspace/src/persistence.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 89e1147d8a..12e719cfd9 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -553,7 +553,7 @@ impl Domain for WorkspaceDb {
                             WHEN workspaces.local_paths_array IS NULL OR workspaces.local_paths_array = "" THEN
                                 NULL
                             ELSE
-                                replace(workspaces.local_paths_array, ',', "\n")
+                                replace(workspaces.local_paths_array, ',', CHAR(10))
                         END
                 END as paths,
 

From 428fc6d483b785227dfd56e4e493ee7ccc3c384d Mon Sep 17 00:00:00 2001
From: Dan Dascalescu <ddascalescu+github@gmail.com>
Date: Tue, 26 Aug 2025 12:05:40 +0300
Subject: [PATCH 367/823] chore: Fix typo in `10_bug_report.yml` (#36922)

Release Notes:

- N/A
---
 .github/ISSUE_TEMPLATE/10_bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/10_bug_report.yml b/.github/ISSUE_TEMPLATE/10_bug_report.yml
index e132eca1e5..1bf6c80e40 100644
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
@@ -14,7 +14,7 @@ body:
         ### Description
         <!--  Describe with sufficient detail to reproduce from a clean Zed install.
           - Any code must be sufficient to reproduce (include context!)
-          - Code must as text, not just as a screenshot.
+          - Include code as text, not just as a screenshot.
           - Issues with insufficient detail may be summarily closed.
         -->
 

From c14d84cfdb61a4d6fbaeabe14c3b5ca0909163af Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 26 Aug 2025 11:20:33 +0200
Subject: [PATCH 368/823] acp: Add button to configure custom agent in the
 configuration view (#36923)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_configuration.rs | 107 ++++++++++++++++++++-
 1 file changed, 102 insertions(+), 5 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 52fb7eed4b..aa9b2ca94f 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -5,18 +5,21 @@ mod tool_picker;
 
 use std::{sync::Arc, time::Duration};
 
-use agent_servers::{AgentServerCommand, AllAgentServersSettings, Gemini};
+use agent_servers::{AgentServerCommand, AgentServerSettings, AllAgentServersSettings, Gemini};
 use agent_settings::AgentSettings;
+use anyhow::Result;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use cloud_llm_client::Plan;
 use collections::HashMap;
 use context_server::ContextServerId;
+use editor::{Editor, SelectionEffects, scroll::Autoscroll};
 use extension::ExtensionManifest;
 use extension_host::ExtensionStore;
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyView, App, Corner, Entity, EventEmitter, FocusHandle,
-    Focusable, Hsla, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
+    Action, Animation, AnimationExt as _, AnyView, App, AsyncWindowContext, Corner, Entity,
+    EventEmitter, FocusHandle, Focusable, Hsla, ScrollHandle, Subscription, Task, Transformation,
+    WeakEntity, percentage,
 };
 use language::LanguageRegistry;
 use language_model::{
@@ -34,7 +37,7 @@ use ui::{
     Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
-use workspace::Workspace;
+use workspace::{Workspace, create_and_open_local_file};
 use zed_actions::ExtensionCategoryFilter;
 
 pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
@@ -1058,7 +1061,36 @@ impl AgentConfiguration {
                     .child(
                         v_flex()
                             .gap_0p5()
-                            .child(Headline::new("External Agents"))
+                            .child(
+                                h_flex()
+                                    .w_full()
+                                    .gap_2()
+                                    .justify_between()
+                                    .child(Headline::new("External Agents"))
+                                    .child(
+                                        Button::new("add-agent", "Add Agent")
+                                            .icon_position(IconPosition::Start)
+                                            .icon(IconName::Plus)
+                                            .icon_size(IconSize::Small)
+                                            .icon_color(Color::Muted)
+                                            .label_size(LabelSize::Small)
+                                            .on_click(
+                                                move |_, window, cx| {
+                                                    if let Some(workspace) = window.root().flatten() {
+                                                        let workspace = workspace.downgrade();
+                                                        window
+                                                            .spawn(cx, async |cx| {
+                                                                open_new_agent_servers_entry_in_settings_editor(
+                                                                    workspace,
+                                                                    cx,
+                                                                ).await
+                                                            })
+                                                            .detach_and_log_err(cx);
+                                                    }
+                                                }
+                                            ),
+                                    )
+                            )
                             .child(
                                 Label::new(
                                     "Use the full power of Zed's UI with your favorite agent, connected via the Agent Client Protocol.",
@@ -1324,3 +1356,68 @@ fn show_unable_to_uninstall_extension_with_context_server(
 
     workspace.toggle_status_toast(status_toast, cx);
 }
+
+async fn open_new_agent_servers_entry_in_settings_editor(
+    workspace: WeakEntity<Workspace>,
+    cx: &mut AsyncWindowContext,
+) -> Result<()> {
+    let settings_editor = workspace
+        .update_in(cx, |_, window, cx| {
+            create_and_open_local_file(paths::settings_file(), window, cx, || {
+                settings::initial_user_settings_content().as_ref().into()
+            })
+        })?
+        .await?
+        .downcast::<Editor>()
+        .unwrap();
+
+    settings_editor
+        .downgrade()
+        .update_in(cx, |item, window, cx| {
+            let text = item.buffer().read(cx).snapshot(cx).text();
+
+            let settings = cx.global::<SettingsStore>();
+
+            let edits = settings.edits_for_update::<AllAgentServersSettings>(&text, |file| {
+                let unique_server_name = (0..u8::MAX)
+                    .map(|i| {
+                        if i == 0 {
+                            "your_agent".into()
+                        } else {
+                            format!("your_agent_{}", i).into()
+                        }
+                    })
+                    .find(|name| !file.custom.contains_key(name));
+                if let Some(server_name) = unique_server_name {
+                    file.custom.insert(
+                        server_name,
+                        AgentServerSettings {
+                            command: AgentServerCommand {
+                                path: "path_to_executable".into(),
+                                args: vec![],
+                                env: Some(HashMap::default()),
+                            },
+                        },
+                    );
+                }
+            });
+
+            if !edits.is_empty() {
+                let ranges = edits
+                    .iter()
+                    .map(|(range, _)| range.clone())
+                    .collect::<Vec<_>>();
+
+                item.edit(edits, cx);
+
+                item.change_selections(
+                    SelectionEffects::scroll(Autoscroll::newest()),
+                    window,
+                    cx,
+                    |selections| {
+                        selections.select_ranges(ranges);
+                    },
+                );
+            }
+        })
+}

From b249593abee31e420fe447f6b551b5e2130b1bc8 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 26 Aug 2025 02:46:29 -0700
Subject: [PATCH 369/823] agent2: Always finalize diffs from the edit tool
 (#36918)

Previously, we wouldn't finalize the diff if an error occurred during
editing or the tool call was canceled.

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent2/src/thread.rs                |  24 +++++
 crates/agent2/src/tools/edit_file_tool.rs  | 103 ++++++++++++++++++++-
 crates/language_model/src/fake_provider.rs |  31 ++++++-
 3 files changed, 152 insertions(+), 6 deletions(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 1b1c014b79..4acd72f275 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -2459,6 +2459,30 @@ impl ToolCallEventStreamReceiver {
         }
     }
 
+    pub async fn expect_update_fields(&mut self) -> acp::ToolCallUpdateFields {
+        let event = self.0.next().await;
+        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
+            update,
+        )))) = event
+        {
+            update.fields
+        } else {
+            panic!("Expected update fields but got: {:?}", event);
+        }
+    }
+
+    pub async fn expect_diff(&mut self) -> Entity<acp_thread::Diff> {
+        let event = self.0.next().await;
+        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateDiff(
+            update,
+        )))) = event
+        {
+            update.diff
+        } else {
+            panic!("Expected diff but got: {:?}", event);
+        }
+    }
+
     pub async fn expect_terminal(&mut self) -> Entity<acp_thread::Terminal> {
         let event = self.0.next().await;
         if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateTerminal(
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 5a68d0c70a..f86bfd25f7 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -273,6 +273,13 @@ impl AgentTool for EditFileTool {
 
             let diff = cx.new(|cx| Diff::new(buffer.clone(), cx))?;
             event_stream.update_diff(diff.clone());
+            let _finalize_diff = util::defer({
+               let diff = diff.downgrade();
+               let mut cx = cx.clone();
+               move || {
+                   diff.update(&mut cx, |diff, cx| diff.finalize(cx)).ok();
+               }
+            });
 
             let old_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
             let old_text = cx
@@ -389,8 +396,6 @@ impl AgentTool for EditFileTool {
                 })
                 .await;
 
-            diff.update(cx, |diff, cx| diff.finalize(cx)).ok();
-
             let input_path = input.path.display();
             if unified_diff.is_empty() {
                 anyhow::ensure!(
@@ -1545,6 +1550,100 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_diff_finalization(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree("/", json!({"main.rs": ""})).await;
+
+        let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
+        let languages = project.read_with(cx, |project, _cx| project.languages().clone());
+        let context_server_registry =
+            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
+        let model = Arc::new(FakeLanguageModel::default());
+        let thread = cx.new(|cx| {
+            Thread::new(
+                project.clone(),
+                cx.new(|_cx| ProjectContext::default()),
+                context_server_registry.clone(),
+                Templates::new(),
+                Some(model.clone()),
+                cx,
+            )
+        });
+
+        // Ensure the diff is finalized after the edit completes.
+        {
+            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
+            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
+            let edit = cx.update(|cx| {
+                tool.run(
+                    EditFileToolInput {
+                        display_description: "Edit file".into(),
+                        path: path!("/main.rs").into(),
+                        mode: EditFileMode::Edit,
+                    },
+                    stream_tx,
+                    cx,
+                )
+            });
+            stream_rx.expect_update_fields().await;
+            let diff = stream_rx.expect_diff().await;
+            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
+            cx.run_until_parked();
+            model.end_last_completion_stream();
+            edit.await.unwrap();
+            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
+        }
+
+        // Ensure the diff is finalized if an error occurs while editing.
+        {
+            model.forbid_requests();
+            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
+            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
+            let edit = cx.update(|cx| {
+                tool.run(
+                    EditFileToolInput {
+                        display_description: "Edit file".into(),
+                        path: path!("/main.rs").into(),
+                        mode: EditFileMode::Edit,
+                    },
+                    stream_tx,
+                    cx,
+                )
+            });
+            stream_rx.expect_update_fields().await;
+            let diff = stream_rx.expect_diff().await;
+            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
+            edit.await.unwrap_err();
+            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
+            model.allow_requests();
+        }
+
+        // Ensure the diff is finalized if the tool call gets dropped.
+        {
+            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
+            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
+            let edit = cx.update(|cx| {
+                tool.run(
+                    EditFileToolInput {
+                        display_description: "Edit file".into(),
+                        path: path!("/main.rs").into(),
+                        mode: EditFileMode::Edit,
+                    },
+                    stream_tx,
+                    cx,
+                )
+            });
+            stream_rx.expect_update_fields().await;
+            let diff = stream_rx.expect_diff().await;
+            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
+            drop(edit);
+            cx.run_until_parked();
+            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
+        }
+    }
+
     fn init_test(cx: &mut TestAppContext) {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);
diff --git a/crates/language_model/src/fake_provider.rs b/crates/language_model/src/fake_provider.rs
index ebfd37d16c..b06a475f93 100644
--- a/crates/language_model/src/fake_provider.rs
+++ b/crates/language_model/src/fake_provider.rs
@@ -4,12 +4,16 @@ use crate::{
     LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
     LanguageModelRequest, LanguageModelToolChoice,
 };
+use anyhow::anyhow;
 use futures::{FutureExt, channel::mpsc, future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, App, AsyncApp, Entity, Task, Window};
 use http_client::Result;
 use parking_lot::Mutex;
 use smol::stream::StreamExt;
-use std::sync::Arc;
+use std::sync::{
+    Arc,
+    atomic::{AtomicBool, Ordering::SeqCst},
+};
 
 #[derive(Clone)]
 pub struct FakeLanguageModelProvider {
@@ -106,6 +110,7 @@ pub struct FakeLanguageModel {
             >,
         )>,
     >,
+    forbid_requests: AtomicBool,
 }
 
 impl Default for FakeLanguageModel {
@@ -114,11 +119,20 @@ impl Default for FakeLanguageModel {
             provider_id: LanguageModelProviderId::from("fake".to_string()),
             provider_name: LanguageModelProviderName::from("Fake".to_string()),
             current_completion_txs: Mutex::new(Vec::new()),
+            forbid_requests: AtomicBool::new(false),
         }
     }
 }
 
 impl FakeLanguageModel {
+    pub fn allow_requests(&self) {
+        self.forbid_requests.store(false, SeqCst);
+    }
+
+    pub fn forbid_requests(&self) {
+        self.forbid_requests.store(true, SeqCst);
+    }
+
     pub fn pending_completions(&self) -> Vec<LanguageModelRequest> {
         self.current_completion_txs
             .lock()
@@ -251,9 +265,18 @@ impl LanguageModel for FakeLanguageModel {
             LanguageModelCompletionError,
         >,
     > {
-        let (tx, rx) = mpsc::unbounded();
-        self.current_completion_txs.lock().push((request, tx));
-        async move { Ok(rx.boxed()) }.boxed()
+        if self.forbid_requests.load(SeqCst) {
+            async move {
+                Err(LanguageModelCompletionError::Other(anyhow!(
+                    "requests are forbidden"
+                )))
+            }
+            .boxed()
+        } else {
+            let (tx, rx) = mpsc::unbounded();
+            self.current_completion_txs.lock().push((request, tx));
+            async move { Ok(rx.boxed()) }.boxed()
+        }
     }
 
     fn as_fake(&self) -> &Self {

From e96b68bc1599b92b6404f77326d79e198f4a8efb Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 26 Aug 2025 12:55:45 +0200
Subject: [PATCH 370/823] acp: Polish UI (#36927)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent2/src/tests/mod.rs         |  2 +-
 crates/agent2/src/thread.rs            | 14 ++++++++++++--
 crates/agent_ui/src/acp/thread_view.rs |  7 ++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 78e5c88280..a55eaacee3 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -472,7 +472,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
                 tool_name: ToolRequiringPermission::name().into(),
                 is_error: true,
                 content: "Permission to run tool denied by user".into(),
-                output: None
+                output: Some("Permission to run tool denied by user".into())
             })
         ]
     );
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 4acd72f275..97ea1caf1d 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -732,7 +732,17 @@ impl Thread {
         stream.update_tool_call_fields(
             &tool_use.id,
             acp::ToolCallUpdateFields {
-                status: Some(acp::ToolCallStatus::Completed),
+                status: Some(
+                    tool_result
+                        .as_ref()
+                        .map_or(acp::ToolCallStatus::Failed, |result| {
+                            if result.is_error {
+                                acp::ToolCallStatus::Failed
+                            } else {
+                                acp::ToolCallStatus::Completed
+                            }
+                        }),
+                ),
                 raw_output: output,
                 ..Default::default()
             },
@@ -1557,7 +1567,7 @@ impl Thread {
                     tool_name: tool_use.name,
                     is_error: true,
                     content: LanguageModelToolResultContent::Text(Arc::from(error.to_string())),
-                    output: None,
+                    output: Some(error.to_string().into()),
                 },
             }
         }))
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 837ce6f90a..6d8f8fb82e 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1684,7 +1684,7 @@ impl AcpThreadView {
                     div()
                         .relative()
                         .mt_1p5()
-                        .ml(px(7.))
+                        .ml(rems(0.4))
                         .pl_4()
                         .border_l_1()
                         .border_color(self.tool_card_border_color(cx))
@@ -1850,6 +1850,7 @@ impl AcpThreadView {
                             .w_full()
                             .h(window.line_height() - px(2.))
                             .text_size(self.tool_name_font_size())
+                            .gap_0p5()
                             .child(tool_icon)
                             .child(if tool_call.locations.len() == 1 {
                                 let name = tool_call.locations[0]
@@ -1968,7 +1969,7 @@ impl AcpThreadView {
 
         v_flex()
             .mt_1p5()
-            .ml(px(7.))
+            .ml(rems(0.4))
             .px_3p5()
             .gap_2()
             .border_l_1()
@@ -2025,7 +2026,7 @@ impl AcpThreadView {
         let button_id = SharedString::from(format!("item-{}", uri));
 
         div()
-            .ml(px(7.))
+            .ml(rems(0.4))
             .pl_2p5()
             .border_l_1()
             .border_color(self.tool_card_border_color(cx))

From 10a1140d49fc0af2c1adf301433a3c9a34374417 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 26 Aug 2025 13:18:50 +0200
Subject: [PATCH 371/823] acp: Improve matching logic when adding new entry to
 agent_servers (#36926)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent_ui/src/agent_configuration.rs | 75 +++++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index aa9b2ca94f..c279115880 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -3,7 +3,7 @@ mod configure_context_server_modal;
 mod manage_profiles_modal;
 mod tool_picker;
 
-use std::{sync::Arc, time::Duration};
+use std::{ops::Range, sync::Arc, time::Duration};
 
 use agent_servers::{AgentServerCommand, AgentServerSettings, AllAgentServersSettings, Gemini};
 use agent_settings::AgentSettings;
@@ -1378,8 +1378,9 @@ async fn open_new_agent_servers_entry_in_settings_editor(
 
             let settings = cx.global::<SettingsStore>();
 
+            let mut unique_server_name = None;
             let edits = settings.edits_for_update::<AllAgentServersSettings>(&text, |file| {
-                let unique_server_name = (0..u8::MAX)
+                let server_name: Option<SharedString> = (0..u8::MAX)
                     .map(|i| {
                         if i == 0 {
                             "your_agent".into()
@@ -1388,7 +1389,8 @@ async fn open_new_agent_servers_entry_in_settings_editor(
                         }
                     })
                     .find(|name| !file.custom.contains_key(name));
-                if let Some(server_name) = unique_server_name {
+                if let Some(server_name) = server_name {
+                    unique_server_name = Some(server_name.clone());
                     file.custom.insert(
                         server_name,
                         AgentServerSettings {
@@ -1402,22 +1404,61 @@ async fn open_new_agent_servers_entry_in_settings_editor(
                 }
             });
 
-            if !edits.is_empty() {
-                let ranges = edits
-                    .iter()
-                    .map(|(range, _)| range.clone())
-                    .collect::<Vec<_>>();
+            if edits.is_empty() {
+                return;
+            }
 
-                item.edit(edits, cx);
+            let ranges = edits
+                .iter()
+                .map(|(range, _)| range.clone())
+                .collect::<Vec<_>>();
 
-                item.change_selections(
-                    SelectionEffects::scroll(Autoscroll::newest()),
-                    window,
-                    cx,
-                    |selections| {
-                        selections.select_ranges(ranges);
-                    },
-                );
+            item.edit(edits, cx);
+            if let Some((unique_server_name, buffer)) =
+                unique_server_name.zip(item.buffer().read(cx).as_singleton())
+            {
+                let snapshot = buffer.read(cx).snapshot();
+                if let Some(range) =
+                    find_text_in_buffer(&unique_server_name, ranges[0].start, &snapshot)
+                {
+                    item.change_selections(
+                        SelectionEffects::scroll(Autoscroll::newest()),
+                        window,
+                        cx,
+                        |selections| {
+                            selections.select_ranges(vec![range]);
+                        },
+                    );
+                }
             }
         })
 }
+
+fn find_text_in_buffer(
+    text: &str,
+    start: usize,
+    snapshot: &language::BufferSnapshot,
+) -> Option<Range<usize>> {
+    let chars = text.chars().collect::<Vec<char>>();
+
+    let mut offset = start;
+    let mut char_offset = 0;
+    for c in snapshot.chars_at(start) {
+        if char_offset >= chars.len() {
+            break;
+        }
+        offset += 1;
+
+        if c == chars[char_offset] {
+            char_offset += 1;
+        } else {
+            char_offset = 0;
+        }
+    }
+
+    if char_offset == chars.len() {
+        Some(offset.saturating_sub(chars.len())..offset)
+    } else {
+        None
+    }
+}

From 372b3c7af632caffbc4e73d5b84bc804d375904a Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 26 Aug 2025 15:30:26 +0200
Subject: [PATCH 372/823] acp: Enable feature flag for everyone (#36928)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs        | 11 -----------
 crates/feature_flags/src/feature_flags.rs |  6 +++++-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 269aec3365..267c76d73f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -591,17 +591,6 @@ impl AgentPanel {
                 None
             };
 
-            // Wait for the Gemini/Native feature flag to be available.
-            let client = workspace.read_with(cx, |workspace, _| workspace.client().clone())?;
-            if !client.status().borrow().is_signed_out() {
-                cx.update(|_, cx| {
-                    cx.wait_for_flag_or_timeout::<feature_flags::GeminiAndNativeFeatureFlag>(
-                        Duration::from_secs(2),
-                    )
-                })?
-                .await;
-            }
-
             let panel = workspace.update_in(cx, |workspace, window, cx| {
                 let panel = cx.new(|cx| {
                     Self::new(
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 422979c429..f5f7fc42b3 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -98,6 +98,10 @@ impl FeatureFlag for GeminiAndNativeFeatureFlag {
     // integration too, and we'd like to turn Gemini/Native on in new builds
     // without enabling Claude Code in old builds.
     const NAME: &'static str = "gemini-and-native";
+
+    fn enabled_for_all() -> bool {
+        true
+    }
 }
 
 pub struct ClaudeCodeFeatureFlag;
@@ -201,7 +205,7 @@ impl FeatureFlagAppExt for App {
     fn has_flag<T: FeatureFlag>(&self) -> bool {
         self.try_global::<FeatureFlags>()
             .map(|flags| flags.has_flag::<T>())
-            .unwrap_or(false)
+            .unwrap_or(T::enabled_for_all())
     }
 
     fn is_staff(&self) -> bool {

From aa0f7a2d09c06331dbb176a8b0e45235f1ad8516 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 26 Aug 2025 09:33:42 -0400
Subject: [PATCH 373/823] Fix conflicts in Linux default keymap (#36519)

Closes https://github.com/zed-industries/zed/issues/29746

| Action | New Key | Old Key | Former Conflict |
| - | - | - | - |
| `edit_prediction::ToggleMenu` | `ctrl-alt-shift-i` | `ctrl-shift-i` |
`editor::Format` |
| `editor::ToggleEditPrediction` | `ctrl-alt-shift-e` | `ctrl-shift-e` |
`project_panel::ToggleFocus` |

These aren't great keys and I'm open to alternate suggestions, but the
will work out of the box without conflict.

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index e84f4834af..3cca560c00 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -40,7 +40,7 @@
       "shift-f11": "debugger::StepOut",
       "f11": "zed::ToggleFullScreen",
       "ctrl-alt-z": "edit_prediction::RateCompletions",
-      "ctrl-shift-i": "edit_prediction::ToggleMenu",
+      "ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
       "ctrl-alt-l": "lsp_tool::ToggleMenu"
     }
   },
@@ -120,7 +120,7 @@
       "alt-g m": "git::OpenModifiedFiles",
       "menu": "editor::OpenContextMenu",
       "shift-f10": "editor::OpenContextMenu",
-      "ctrl-shift-e": "editor::ToggleEditPrediction",
+      "ctrl-alt-shift-e": "editor::ToggleEditPrediction",
       "f9": "editor::ToggleBreakpoint",
       "shift-f9": "editor::EditLogBreakpoint"
     }

From 76dbcde62836445d146c3918edce26dbaec25314 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 26 Aug 2025 09:35:45 -0400
Subject: [PATCH 374/823] Support disabling drag-and-drop in Project Panel
 (#36719)

Release Notes:

- Added setting for disabling drag and drop in project panel. `{
"project_panel": {"drag_and_drop": false } }`
---
 assets/settings/default.json                  |  2 +
 crates/project_panel/src/project_panel.rs     | 74 ++++++++++---------
 .../src/project_panel_settings.rs             |  5 ++
 docs/src/configuring-zed.md                   |  1 +
 docs/src/visual-customization.md              |  1 +
 5 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index f0b9e11e57..804198090f 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -653,6 +653,8 @@
       //    "never"
       "show": "always"
     },
+    // Whether to enable drag-and-drop operations in the project panel.
+    "drag_and_drop": true,
     // Whether to hide the root entry when only one folder is open in the window.
     "hide_root": false
   },
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index c99f5f8172..5a30a3e9bc 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -4089,6 +4089,7 @@ impl ProjectPanel {
             .when(!is_sticky, |this| {
                 this
                 .when(is_highlighted && folded_directory_drag_target.is_none(), |this| this.border_color(transparent_white()).bg(item_colors.drag_over))
+                .when(settings.drag_and_drop, |this| this
                 .on_drag_move::<ExternalPaths>(cx.listener(
                     move |this, event: &DragMoveEvent<ExternalPaths>, _, cx| {
                         let is_current_target = this.drag_target_entry.as_ref()
@@ -4222,7 +4223,7 @@ impl ProjectPanel {
                         }
                         this.drag_onto(selections, entry_id, kind.is_file(), window, cx);
                     }),
-                )
+                ))
             })
             .on_mouse_down(
                 MouseButton::Left,
@@ -4433,6 +4434,7 @@ impl ProjectPanel {
                                                     div()
                                                     .when(!is_sticky, |div| {
                                                         div
+                                                            .when(settings.drag_and_drop, |div| div
                                                             .on_drop(cx.listener(move |this, selections: &DraggedSelection, window, cx| {
                                                             this.hover_scroll_task.take();
                                                             this.drag_target_entry = None;
@@ -4464,7 +4466,7 @@ impl ProjectPanel {
                                                                 }
 
                                                             },
-                                                        ))
+                                                        )))
                                                     })
                                                     .child(
                                                         Label::new(DELIMITER.clone())
@@ -4484,6 +4486,7 @@ impl ProjectPanel {
                                                 .when(index != components_len - 1, |div|{
                                                     let target_entry_id = folded_ancestors.ancestors.get(components_len - 1 - index).cloned();
                                                     div
+                                                    .when(settings.drag_and_drop, |div| div
                                                     .on_drag_move(cx.listener(
                                                         move |this, event: &DragMoveEvent<DraggedSelection>, _, _| {
                                                         if event.bounds.contains(&event.event.position) {
@@ -4521,7 +4524,7 @@ impl ProjectPanel {
                                                         target.index == index
                                                     ), |this| {
                                                         this.bg(item_colors.drag_over)
-                                                    })
+                                                    }))
                                                 })
                                             })
                                             .on_click(cx.listener(move |this, _, _, cx| {
@@ -5029,7 +5032,8 @@ impl ProjectPanel {
 
         sticky_parents.reverse();
 
-        let git_status_enabled = ProjectPanelSettings::get_global(cx).git_status;
+        let panel_settings = ProjectPanelSettings::get_global(cx);
+        let git_status_enabled = panel_settings.git_status;
         let root_name = OsStr::new(worktree.root_name());
 
         let git_summaries_by_id = if git_status_enabled {
@@ -5113,11 +5117,11 @@ impl Render for ProjectPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let has_worktree = !self.visible_entries.is_empty();
         let project = self.project.read(cx);
-        let indent_size = ProjectPanelSettings::get_global(cx).indent_size;
-        let show_indent_guides =
-            ProjectPanelSettings::get_global(cx).indent_guides.show == ShowIndentGuides::Always;
+        let panel_settings = ProjectPanelSettings::get_global(cx);
+        let indent_size = panel_settings.indent_size;
+        let show_indent_guides = panel_settings.indent_guides.show == ShowIndentGuides::Always;
         let show_sticky_entries = {
-            if ProjectPanelSettings::get_global(cx).sticky_scroll {
+            if panel_settings.sticky_scroll {
                 let is_scrollable = self.scroll_handle.is_scrollable();
                 let is_scrolled = self.scroll_handle.offset().y < px(0.);
                 is_scrollable && is_scrolled
@@ -5205,8 +5209,10 @@ impl Render for ProjectPanel {
             h_flex()
                 .id("project-panel")
                 .group("project-panel")
-                .on_drag_move(cx.listener(handle_drag_move::<ExternalPaths>))
-                .on_drag_move(cx.listener(handle_drag_move::<DraggedSelection>))
+                .when(panel_settings.drag_and_drop, |this| {
+                    this.on_drag_move(cx.listener(handle_drag_move::<ExternalPaths>))
+                        .on_drag_move(cx.listener(handle_drag_move::<DraggedSelection>))
+                })
                 .size_full()
                 .relative()
                 .on_modifiers_changed(cx.listener(
@@ -5544,30 +5550,32 @@ impl Render for ProjectPanel {
                         })),
                 )
                 .when(is_local, |div| {
-                    div.drag_over::<ExternalPaths>(|style, _, _, cx| {
-                        style.bg(cx.theme().colors().drop_target_background)
+                    div.when(panel_settings.drag_and_drop, |div| {
+                        div.drag_over::<ExternalPaths>(|style, _, _, cx| {
+                            style.bg(cx.theme().colors().drop_target_background)
+                        })
+                        .on_drop(cx.listener(
+                            move |this, external_paths: &ExternalPaths, window, cx| {
+                                this.drag_target_entry = None;
+                                this.hover_scroll_task.take();
+                                if let Some(task) = this
+                                    .workspace
+                                    .update(cx, |workspace, cx| {
+                                        workspace.open_workspace_for_paths(
+                                            true,
+                                            external_paths.paths().to_owned(),
+                                            window,
+                                            cx,
+                                        )
+                                    })
+                                    .log_err()
+                                {
+                                    task.detach_and_log_err(cx);
+                                }
+                                cx.stop_propagation();
+                            },
+                        ))
                     })
-                    .on_drop(cx.listener(
-                        move |this, external_paths: &ExternalPaths, window, cx| {
-                            this.drag_target_entry = None;
-                            this.hover_scroll_task.take();
-                            if let Some(task) = this
-                                .workspace
-                                .update(cx, |workspace, cx| {
-                                    workspace.open_workspace_for_paths(
-                                        true,
-                                        external_paths.paths().to_owned(),
-                                        window,
-                                        cx,
-                                    )
-                                })
-                                .log_err()
-                            {
-                                task.detach_and_log_err(cx);
-                            }
-                            cx.stop_propagation();
-                        },
-                    ))
                 })
         }
     }
diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs
index 8a243589ed..fc399d66a7 100644
--- a/crates/project_panel/src/project_panel_settings.rs
+++ b/crates/project_panel/src/project_panel_settings.rs
@@ -47,6 +47,7 @@ pub struct ProjectPanelSettings {
     pub scrollbar: ScrollbarSettings,
     pub show_diagnostics: ShowDiagnostics,
     pub hide_root: bool,
+    pub drag_and_drop: bool,
 }
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
@@ -160,6 +161,10 @@ pub struct ProjectPanelSettingsContent {
     ///
     /// Default: true
     pub sticky_scroll: Option<bool>,
+    /// Whether to enable drag-and-drop operations in the project panel.
+    ///
+    /// Default: true
+    pub drag_and_drop: Option<bool>,
 }
 
 impl Settings for ProjectPanelSettings {
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index fb139db6e4..a8a4689689 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -3243,6 +3243,7 @@ Run the `theme selector: toggle` action in the command palette to see a current
     "indent_size": 20,
     "auto_reveal_entries": true,
     "auto_fold_dirs": true,
+    "drag_and_drop": true,
     "scrollbar": {
       "show": null
     },
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 24b2a9d769..4fc5a9ba88 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -431,6 +431,7 @@ Project panel can be shown/hidden with {#action project_panel::ToggleFocus} ({#k
     "auto_reveal_entries": true,    // Show file in panel when activating its buffer
     "auto_fold_dirs": true,         // Fold dirs with single subdir
     "sticky_scroll": true,          // Stick parent directories at top of the project panel.
+    "drag_and_drop": true,          // Whether drag and drop is enabled
     "scrollbar": {                  // Project panel scrollbar settings
       "show": null                  // Show/hide: (auto, system, always, never)
     },

From b7dad2cf7199e4e31ce149d707dc87683981bc5d Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 26 Aug 2025 09:41:57 -0400
Subject: [PATCH 375/823] Fix initial_tasks.json triggering diagnostic warning
 (#36523)

`zed::OpenProjectTasks` without an existing tasks.json will recreate it
from the template.
This file will immediately show a warning.

<img width="810" height="168" alt="Screenshot 2025-08-19 at 17 16 07"
src="https://github.com/user-attachments/assets/bbc8c7a0-7036-4927-8e85-b81b79aeaacb"
/>

Release Notes:

- N/A
---
 assets/settings/initial_tasks.json | 4 ++--
 docs/src/tasks.md                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/settings/initial_tasks.json b/assets/settings/initial_tasks.json
index a79c550671..5cead67b6d 100644
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -43,8 +43,8 @@
     //           "args": ["--login"]
     //         }
     //     }
-    "shell": "system",
+    "shell": "system"
     // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    "tags": []
+    // "tags": []
   }
 ]
diff --git a/docs/src/tasks.md b/docs/src/tasks.md
index 9550563432..bff3eac860 100644
--- a/docs/src/tasks.md
+++ b/docs/src/tasks.md
@@ -45,9 +45,9 @@ Zed supports ways to spawn (and rerun) commands using its integrated terminal to
     // Whether to show the task line in the output of the spawned task, defaults to `true`.
     "show_summary": true,
     // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_output": true,
+    "show_output": true
     // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    "tags": []
+    // "tags": []
   }
 ]
 ```

From 2c64b05ea44c4b8be85d298c01c3c8984b433398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= <mardani29@yahoo.es>
Date: Tue, 26 Aug 2025 15:43:58 +0200
Subject: [PATCH 376/823] emacs: Add editor::FindAllReferences keybinding
 (#36840)

This commit maps `editor::FindAllReferences` to Alt+? in the Emacs
keymap.

Release Notes:

- N/A
---
 assets/keymaps/linux/emacs.json | 1 +
 assets/keymaps/macos/emacs.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json
index 0ff3796f03..62910e297b 100755
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -38,6 +38,7 @@
       "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
       "ctrl-x ctrl-;": "editor::ToggleComments",
       "alt-.": "editor::GoToDefinition", // xref-find-definitions
+      "alt-?": "editor::FindAllReferences", // xref-find-references
       "alt-,": "pane::GoBack", // xref-pop-marker-stack
       "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
       "ctrl-d": "editor::Delete", // delete-char
diff --git a/assets/keymaps/macos/emacs.json b/assets/keymaps/macos/emacs.json
index 0ff3796f03..62910e297b 100755
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -38,6 +38,7 @@
       "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
       "ctrl-x ctrl-;": "editor::ToggleComments",
       "alt-.": "editor::GoToDefinition", // xref-find-definitions
+      "alt-?": "editor::FindAllReferences", // xref-find-references
       "alt-,": "pane::GoBack", // xref-pop-marker-stack
       "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
       "ctrl-d": "editor::Delete", // delete-char

From 858ab9cc2358a4f7571c3a0a46cdfa9ac5124714 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 26 Aug 2025 15:55:09 +0200
Subject: [PATCH 377/823] Revert "ai: Auto select user model when there's no
 default" (#36932)

Reverts zed-industries/zed#36722

Release Notes:

- N/A
---
 crates/agent/src/thread.rs                    |  17 +--
 crates/agent2/src/agent.rs                    |   4 +-
 crates/agent2/src/tests/mod.rs                |   4 +-
 .../agent_ui/src/language_model_selector.rs   |  55 ++++++++-
 crates/git_ui/src/git_panel.rs                |   2 +-
 crates/language_model/src/registry.rs         | 114 ++++++++----------
 crates/language_models/Cargo.toml             |   1 -
 crates/language_models/src/language_models.rs | 103 +---------------
 crates/language_models/src/provider/cloud.rs  |   6 +-
 9 files changed, 122 insertions(+), 184 deletions(-)

diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 899e360ab0..7b70fde56a 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -664,7 +664,7 @@ impl Thread {
     }
 
     pub fn get_or_init_configured_model(&mut self, cx: &App) -> Option<ConfiguredModel> {
-        if self.configured_model.is_none() || self.messages.is_empty() {
+        if self.configured_model.is_none() {
             self.configured_model = LanguageModelRegistry::read_global(cx).default_model();
         }
         self.configured_model.clone()
@@ -2097,7 +2097,7 @@ impl Thread {
     }
 
     pub fn summarize(&mut self, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model(cx) else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
             println!("No thread summary model");
             return;
         };
@@ -2416,7 +2416,7 @@ impl Thread {
         }
 
         let Some(ConfiguredModel { model, provider }) =
-            LanguageModelRegistry::read_global(cx).thread_summary_model(cx)
+            LanguageModelRegistry::read_global(cx).thread_summary_model()
         else {
             return;
         };
@@ -5410,10 +5410,13 @@ fn main() {{
                     }),
                     cx,
                 );
-                registry.set_thread_summary_model(Some(ConfiguredModel {
-                    provider,
-                    model: model.clone(),
-                }));
+                registry.set_thread_summary_model(
+                    Some(ConfiguredModel {
+                        provider,
+                        model: model.clone(),
+                    }),
+                    cx,
+                );
             })
         });
 
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index ecfaea4b49..6fa36d33d5 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -228,7 +228,7 @@ impl NativeAgent {
     ) -> Entity<AcpThread> {
         let connection = Rc::new(NativeAgentConnection(cx.entity()));
         let registry = LanguageModelRegistry::read_global(cx);
-        let summarization_model = registry.thread_summary_model(cx).map(|c| c.model);
+        let summarization_model = registry.thread_summary_model().map(|c| c.model);
 
         thread_handle.update(cx, |thread, cx| {
             thread.set_summarization_model(summarization_model, cx);
@@ -524,7 +524,7 @@ impl NativeAgent {
 
         let registry = LanguageModelRegistry::read_global(cx);
         let default_model = registry.default_model().map(|m| m.model);
-        let summarization_model = registry.thread_summary_model(cx).map(|m| m.model);
+        let summarization_model = registry.thread_summary_model().map(|m| m.model);
 
         for session in self.sessions.values_mut() {
             session.thread.update(cx, |thread, cx| {
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index a55eaacee3..fbeee46a48 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1822,11 +1822,11 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
         let clock = Arc::new(clock::FakeSystemClock::new());
         let client = Client::new(clock, http_client, cx);
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        Project::init_settings(cx);
-        agent_settings::init(cx);
         language_model::init(client.clone(), cx);
         language_models::init(user_store, client.clone(), cx);
+        Project::init_settings(cx);
         LanguageModelRegistry::test(cx);
+        agent_settings::init(cx);
     });
     cx.executor().forbid_parking();
 
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index aceca79dbf..3633e533da 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -6,7 +6,8 @@ use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task};
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
+    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
+    LanguageModelRegistry,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
@@ -76,6 +77,7 @@ pub struct LanguageModelPickerDelegate {
     all_models: Arc<GroupedModels>,
     filtered_entries: Vec<LanguageModelPickerEntry>,
     selected_index: usize,
+    _authenticate_all_providers_task: Task<()>,
     _subscriptions: Vec<Subscription>,
 }
 
@@ -96,6 +98,7 @@ impl LanguageModelPickerDelegate {
             selected_index: Self::get_active_model_index(&entries, get_active_model(cx)),
             filtered_entries: entries,
             get_active_model: Arc::new(get_active_model),
+            _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
             _subscriptions: vec![cx.subscribe_in(
                 &LanguageModelRegistry::global(cx),
                 window,
@@ -139,6 +142,56 @@ impl LanguageModelPickerDelegate {
             .unwrap_or(0)
     }
 
+    /// Authenticates all providers in the [`LanguageModelRegistry`].
+    ///
+    /// We do this so that we can populate the language selector with all of the
+    /// models from the configured providers.
+    fn authenticate_all_providers(cx: &mut App) -> Task<()> {
+        let authenticate_all_providers = LanguageModelRegistry::global(cx)
+            .read(cx)
+            .providers()
+            .iter()
+            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
+            .collect::<Vec<_>>();
+
+        cx.spawn(async move |_cx| {
+            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
+                if let Err(err) = authenticate_task.await {
+                    if matches!(err, AuthenticateError::CredentialsNotFound) {
+                        // Since we're authenticating these providers in the
+                        // background for the purposes of populating the
+                        // language selector, we don't care about providers
+                        // where the credentials are not found.
+                    } else {
+                        // Some providers have noisy failure states that we
+                        // don't want to spam the logs with every time the
+                        // language model selector is initialized.
+                        //
+                        // Ideally these should have more clear failure modes
+                        // that we know are safe to ignore here, like what we do
+                        // with `CredentialsNotFound` above.
+                        match provider_id.0.as_ref() {
+                            "lmstudio" | "ollama" => {
+                                // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
+                                //
+                                // These fail noisily, so we don't log them.
+                            }
+                            "copilot_chat" => {
+                                // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
+                            }
+                            _ => {
+                                log::error!(
+                                    "Failed to authenticate provider: {}: {err}",
+                                    provider_name.0
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        })
+    }
+
     pub fn active_model(&self, cx: &App) -> Option<ConfiguredModel> {
         (self.get_active_model)(cx)
     }
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 958a609a09..4ecb4a8829 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -4466,7 +4466,7 @@ fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn Language
     is_enabled
         .then(|| {
             let ConfiguredModel { provider, model } =
-                LanguageModelRegistry::read_global(cx).commit_message_model(cx)?;
+                LanguageModelRegistry::read_global(cx).commit_message_model()?;
 
             provider.is_authenticated(cx).then(|| model)
         })
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index c7693a64c7..531c3615dc 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -6,6 +6,7 @@ use collections::BTreeMap;
 use gpui::{App, Context, Entity, EventEmitter, Global, prelude::*};
 use std::{str::FromStr, sync::Arc};
 use thiserror::Error;
+use util::maybe;
 
 pub fn init(cx: &mut App) {
     let registry = cx.new(|_cx| LanguageModelRegistry::default());
@@ -41,9 +42,7 @@ impl std::fmt::Debug for ConfigurationError {
 #[derive(Default)]
 pub struct LanguageModelRegistry {
     default_model: Option<ConfiguredModel>,
-    /// This model is automatically configured by a user's environment after
-    /// authenticating all providers. It's only used when default_model is not available.
-    environment_fallback_model: Option<ConfiguredModel>,
+    default_fast_model: Option<ConfiguredModel>,
     inline_assistant_model: Option<ConfiguredModel>,
     commit_message_model: Option<ConfiguredModel>,
     thread_summary_model: Option<ConfiguredModel>,
@@ -99,6 +98,9 @@ impl ConfiguredModel {
 
 pub enum Event {
     DefaultModelChanged,
+    InlineAssistantModelChanged,
+    CommitMessageModelChanged,
+    ThreadSummaryModelChanged,
     ProviderStateChanged(LanguageModelProviderId),
     AddedProvider(LanguageModelProviderId),
     RemovedProvider(LanguageModelProviderId),
@@ -224,7 +226,7 @@ impl LanguageModelRegistry {
         cx: &mut Context<Self>,
     ) {
         let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_inline_assistant_model(configured_model);
+        self.set_inline_assistant_model(configured_model, cx);
     }
 
     pub fn select_commit_message_model(
@@ -233,7 +235,7 @@ impl LanguageModelRegistry {
         cx: &mut Context<Self>,
     ) {
         let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_commit_message_model(configured_model);
+        self.set_commit_message_model(configured_model, cx);
     }
 
     pub fn select_thread_summary_model(
@@ -242,7 +244,7 @@ impl LanguageModelRegistry {
         cx: &mut Context<Self>,
     ) {
         let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_thread_summary_model(configured_model);
+        self.set_thread_summary_model(configured_model, cx);
     }
 
     /// Selects and sets the inline alternatives for language models based on
@@ -276,60 +278,68 @@ impl LanguageModelRegistry {
     }
 
     pub fn set_default_model(&mut self, model: Option<ConfiguredModel>, cx: &mut Context<Self>) {
-        match (self.default_model(), model.as_ref()) {
+        match (self.default_model.as_ref(), model.as_ref()) {
             (Some(old), Some(new)) if old.is_same_as(new) => {}
             (None, None) => {}
             _ => cx.emit(Event::DefaultModelChanged),
         }
+        self.default_fast_model = maybe!({
+            let provider = &model.as_ref()?.provider;
+            let fast_model = provider.default_fast_model(cx)?;
+            Some(ConfiguredModel {
+                provider: provider.clone(),
+                model: fast_model,
+            })
+        });
         self.default_model = model;
     }
 
-    pub fn set_environment_fallback_model(
+    pub fn set_inline_assistant_model(
         &mut self,
         model: Option<ConfiguredModel>,
         cx: &mut Context<Self>,
     ) {
-        if self.default_model.is_none() {
-            match (self.environment_fallback_model.as_ref(), model.as_ref()) {
-                (Some(old), Some(new)) if old.is_same_as(new) => {}
-                (None, None) => {}
-                _ => cx.emit(Event::DefaultModelChanged),
-            }
+        match (self.inline_assistant_model.as_ref(), model.as_ref()) {
+            (Some(old), Some(new)) if old.is_same_as(new) => {}
+            (None, None) => {}
+            _ => cx.emit(Event::InlineAssistantModelChanged),
         }
-        self.environment_fallback_model = model;
-    }
-
-    pub fn set_inline_assistant_model(&mut self, model: Option<ConfiguredModel>) {
         self.inline_assistant_model = model;
     }
 
-    pub fn set_commit_message_model(&mut self, model: Option<ConfiguredModel>) {
+    pub fn set_commit_message_model(
+        &mut self,
+        model: Option<ConfiguredModel>,
+        cx: &mut Context<Self>,
+    ) {
+        match (self.commit_message_model.as_ref(), model.as_ref()) {
+            (Some(old), Some(new)) if old.is_same_as(new) => {}
+            (None, None) => {}
+            _ => cx.emit(Event::CommitMessageModelChanged),
+        }
         self.commit_message_model = model;
     }
 
-    pub fn set_thread_summary_model(&mut self, model: Option<ConfiguredModel>) {
+    pub fn set_thread_summary_model(
+        &mut self,
+        model: Option<ConfiguredModel>,
+        cx: &mut Context<Self>,
+    ) {
+        match (self.thread_summary_model.as_ref(), model.as_ref()) {
+            (Some(old), Some(new)) if old.is_same_as(new) => {}
+            (None, None) => {}
+            _ => cx.emit(Event::ThreadSummaryModelChanged),
+        }
         self.thread_summary_model = model;
     }
 
-    #[track_caller]
     pub fn default_model(&self) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
             return None;
         }
 
-        self.default_model
-            .clone()
-            .or_else(|| self.environment_fallback_model.clone())
-    }
-
-    pub fn default_fast_model(&self, cx: &App) -> Option<ConfiguredModel> {
-        let provider = self.default_model()?.provider;
-        let fast_model = provider.default_fast_model(cx)?;
-        Some(ConfiguredModel {
-            provider,
-            model: fast_model,
-        })
+        self.default_model.clone()
     }
 
     pub fn inline_assistant_model(&self) -> Option<ConfiguredModel> {
@@ -343,7 +353,7 @@ impl LanguageModelRegistry {
             .or_else(|| self.default_model.clone())
     }
 
-    pub fn commit_message_model(&self, cx: &App) -> Option<ConfiguredModel> {
+    pub fn commit_message_model(&self) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
             return None;
@@ -351,11 +361,11 @@ impl LanguageModelRegistry {
 
         self.commit_message_model
             .clone()
-            .or_else(|| self.default_fast_model(cx))
+            .or_else(|| self.default_fast_model.clone())
             .or_else(|| self.default_model.clone())
     }
 
-    pub fn thread_summary_model(&self, cx: &App) -> Option<ConfiguredModel> {
+    pub fn thread_summary_model(&self) -> Option<ConfiguredModel> {
         #[cfg(debug_assertions)]
         if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
             return None;
@@ -363,7 +373,7 @@ impl LanguageModelRegistry {
 
         self.thread_summary_model
             .clone()
-            .or_else(|| self.default_fast_model(cx))
+            .or_else(|| self.default_fast_model.clone())
             .or_else(|| self.default_model.clone())
     }
 
@@ -400,34 +410,4 @@ mod tests {
         let providers = registry.read(cx).providers();
         assert!(providers.is_empty());
     }
-
-    #[gpui::test]
-    async fn test_configure_environment_fallback_model(cx: &mut gpui::TestAppContext) {
-        let registry = cx.new(|_| LanguageModelRegistry::default());
-
-        let provider = FakeLanguageModelProvider::default();
-        registry.update(cx, |registry, cx| {
-            registry.register_provider(provider.clone(), cx);
-        });
-
-        cx.update(|cx| provider.authenticate(cx)).await.unwrap();
-
-        registry.update(cx, |registry, cx| {
-            let provider = registry.provider(&provider.id()).unwrap();
-
-            registry.set_environment_fallback_model(
-                Some(ConfiguredModel {
-                    provider: provider.clone(),
-                    model: provider.default_model(cx).unwrap(),
-                }),
-                cx,
-            );
-
-            let default_model = registry.default_model().unwrap();
-            let fallback_model = registry.environment_fallback_model.clone().unwrap();
-
-            assert_eq!(default_model.model.id(), fallback_model.model.id());
-            assert_eq!(default_model.provider.id(), fallback_model.provider.id());
-        });
-    }
 }
diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml
index cd41478668..b5bfb870f6 100644
--- a/crates/language_models/Cargo.toml
+++ b/crates/language_models/Cargo.toml
@@ -44,7 +44,6 @@ ollama = { workspace = true, features = ["schemars"] }
 open_ai = { workspace = true, features = ["schemars"] }
 open_router = { workspace = true, features = ["schemars"] }
 partial-json-fixer.workspace = true
-project.workspace = true
 release_channel.workspace = true
 schemars.workspace = true
 serde.workspace = true
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
index beed306e74..738b72b0c9 100644
--- a/crates/language_models/src/language_models.rs
+++ b/crates/language_models/src/language_models.rs
@@ -3,12 +3,8 @@ use std::sync::Arc;
 use ::settings::{Settings, SettingsStore};
 use client::{Client, UserStore};
 use collections::HashSet;
-use futures::future;
-use gpui::{App, AppContext as _, Context, Entity};
-use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModelProviderId, LanguageModelRegistry,
-};
-use project::DisableAiSettings;
+use gpui::{App, Context, Entity};
+use language_model::{LanguageModelProviderId, LanguageModelRegistry};
 use provider::deepseek::DeepSeekLanguageModelProvider;
 
 pub mod provider;
@@ -17,7 +13,7 @@ pub mod ui;
 
 use crate::provider::anthropic::AnthropicLanguageModelProvider;
 use crate::provider::bedrock::BedrockLanguageModelProvider;
-use crate::provider::cloud::{self, CloudLanguageModelProvider};
+use crate::provider::cloud::CloudLanguageModelProvider;
 use crate::provider::copilot_chat::CopilotChatLanguageModelProvider;
 use crate::provider::google::GoogleLanguageModelProvider;
 use crate::provider::lmstudio::LmStudioLanguageModelProvider;
@@ -52,13 +48,6 @@ pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
             cx,
         );
     });
-
-    let mut already_authenticated = false;
-    if !DisableAiSettings::get_global(cx).disable_ai {
-        authenticate_all_providers(registry.clone(), cx);
-        already_authenticated = true;
-    }
-
     cx.observe_global::<SettingsStore>(move |cx| {
         let openai_compatible_providers_new = AllLanguageModelSettings::get_global(cx)
             .openai_compatible
@@ -76,12 +65,6 @@ pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
                 );
             });
             openai_compatible_providers = openai_compatible_providers_new;
-            already_authenticated = false;
-        }
-
-        if !DisableAiSettings::get_global(cx).disable_ai && !already_authenticated {
-            authenticate_all_providers(registry.clone(), cx);
-            already_authenticated = true;
         }
     })
     .detach();
@@ -168,83 +151,3 @@ fn register_language_model_providers(
     registry.register_provider(XAiLanguageModelProvider::new(client.http_client(), cx), cx);
     registry.register_provider(CopilotChatLanguageModelProvider::new(cx), cx);
 }
-
-/// Authenticates all providers in the [`LanguageModelRegistry`].
-///
-/// We do this so that we can populate the language selector with all of the
-/// models from the configured providers.
-///
-/// This function won't do anything if AI is disabled.
-fn authenticate_all_providers(registry: Entity<LanguageModelRegistry>, cx: &mut App) {
-    let providers_to_authenticate = registry
-        .read(cx)
-        .providers()
-        .iter()
-        .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
-        .collect::<Vec<_>>();
-
-    let mut tasks = Vec::with_capacity(providers_to_authenticate.len());
-
-    for (provider_id, provider_name, authenticate_task) in providers_to_authenticate {
-        tasks.push(cx.background_spawn(async move {
-            if let Err(err) = authenticate_task.await {
-                if matches!(err, AuthenticateError::CredentialsNotFound) {
-                    // Since we're authenticating these providers in the
-                    // background for the purposes of populating the
-                    // language selector, we don't care about providers
-                    // where the credentials are not found.
-                } else {
-                    // Some providers have noisy failure states that we
-                    // don't want to spam the logs with every time the
-                    // language model selector is initialized.
-                    //
-                    // Ideally these should have more clear failure modes
-                    // that we know are safe to ignore here, like what we do
-                    // with `CredentialsNotFound` above.
-                    match provider_id.0.as_ref() {
-                        "lmstudio" | "ollama" => {
-                            // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
-                            //
-                            // These fail noisily, so we don't log them.
-                        }
-                        "copilot_chat" => {
-                            // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
-                        }
-                        _ => {
-                            log::error!(
-                                "Failed to authenticate provider: {}: {err}",
-                                provider_name.0
-                            );
-                        }
-                    }
-                }
-            }
-        }));
-    }
-
-    let all_authenticated_future = future::join_all(tasks);
-
-    cx.spawn(async move |cx| {
-        all_authenticated_future.await;
-
-        registry
-            .update(cx, |registry, cx| {
-                let cloud_provider = registry.provider(&cloud::PROVIDER_ID);
-                let fallback_model = cloud_provider
-                    .iter()
-                    .chain(registry.providers().iter())
-                    .find(|provider| provider.is_authenticated(cx))
-                    .and_then(|provider| {
-                        Some(ConfiguredModel {
-                            provider: provider.clone(),
-                            model: provider
-                                .default_model(cx)
-                                .or_else(|| provider.recommended_models(cx).first().cloned())?,
-                        })
-                    });
-                registry.set_environment_fallback_model(fallback_model, cx);
-            })
-            .ok();
-    })
-    .detach();
-}
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index fb6e2fb1e4..b473d06357 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -44,8 +44,8 @@ use crate::provider::anthropic::{AnthropicEventMapper, count_anthropic_tokens, i
 use crate::provider::google::{GoogleEventMapper, into_google};
 use crate::provider::open_ai::{OpenAiEventMapper, count_open_ai_tokens, into_open_ai};
 
-pub const PROVIDER_ID: LanguageModelProviderId = language_model::ZED_CLOUD_PROVIDER_ID;
-pub const PROVIDER_NAME: LanguageModelProviderName = language_model::ZED_CLOUD_PROVIDER_NAME;
+const PROVIDER_ID: LanguageModelProviderId = language_model::ZED_CLOUD_PROVIDER_ID;
+const PROVIDER_NAME: LanguageModelProviderName = language_model::ZED_CLOUD_PROVIDER_NAME;
 
 #[derive(Default, Clone, Debug, PartialEq)]
 pub struct ZedDotDevSettings {
@@ -146,7 +146,7 @@ impl State {
             default_fast_model: None,
             recommended_models: Vec::new(),
             _fetch_models_task: cx.spawn(async move |this, cx| {
-                maybe!(async {
+                maybe!(async move {
                     let (client, llm_api_token) = this
                         .read_with(cx, |this, _cx| (client.clone(), this.llm_api_token.clone()))?;
 

From 65c6c709fdf606cbba9aea8aa8c3818702b110d7 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:55:40 -0300
Subject: [PATCH 378/823] thread view: Refine tool call UI (#36937)

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/agent_ui/src/acp/entry_view_state.rs |  58 ++-
 crates/agent_ui/src/acp/thread_view.rs      | 467 +++++++++++---------
 crates/markdown/src/markdown.rs             |   2 +-
 3 files changed, 315 insertions(+), 212 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 0e4080d689..becf6953fd 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -6,7 +6,7 @@ use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, Focusable,
+    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, Focusable, ScrollHandle,
     TextStyleRefinement, WeakEntity, Window,
 };
 use language::language_settings::SoftWrap;
@@ -154,10 +154,22 @@ impl EntryViewState {
                     });
                 }
             }
-            AgentThreadEntry::AssistantMessage(_) => {
-                if index == self.entries.len() {
-                    self.entries.push(Entry::empty())
-                }
+            AgentThreadEntry::AssistantMessage(message) => {
+                let entry = if let Some(Entry::AssistantMessage(entry)) =
+                    self.entries.get_mut(index)
+                {
+                    entry
+                } else {
+                    self.set_entry(
+                        index,
+                        Entry::AssistantMessage(AssistantMessageEntry::default()),
+                    );
+                    let Some(Entry::AssistantMessage(entry)) = self.entries.get_mut(index) else {
+                        unreachable!()
+                    };
+                    entry
+                };
+                entry.sync(message);
             }
         };
     }
@@ -177,7 +189,7 @@ impl EntryViewState {
     pub fn settings_changed(&mut self, cx: &mut App) {
         for entry in self.entries.iter() {
             match entry {
-                Entry::UserMessage { .. } => {}
+                Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
                 Entry::Content(response_views) => {
                     for view in response_views.values() {
                         if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
@@ -208,9 +220,29 @@ pub enum ViewEvent {
     MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }
 
+#[derive(Default, Debug)]
+pub struct AssistantMessageEntry {
+    scroll_handles_by_chunk_index: HashMap<usize, ScrollHandle>,
+}
+
+impl AssistantMessageEntry {
+    pub fn scroll_handle_for_chunk(&self, ix: usize) -> Option<ScrollHandle> {
+        self.scroll_handles_by_chunk_index.get(&ix).cloned()
+    }
+
+    pub fn sync(&mut self, message: &acp_thread::AssistantMessage) {
+        if let Some(acp_thread::AssistantMessageChunk::Thought { .. }) = message.chunks.last() {
+            let ix = message.chunks.len() - 1;
+            let handle = self.scroll_handles_by_chunk_index.entry(ix).or_default();
+            handle.scroll_to_bottom();
+        }
+    }
+}
+
 #[derive(Debug)]
 pub enum Entry {
     UserMessage(Entity<MessageEditor>),
+    AssistantMessage(AssistantMessageEntry),
     Content(HashMap<EntityId, AnyEntity>),
 }
 
@@ -218,7 +250,7 @@ impl Entry {
     pub fn message_editor(&self) -> Option<&Entity<MessageEditor>> {
         match self {
             Self::UserMessage(editor) => Some(editor),
-            Entry::Content(_) => None,
+            Self::AssistantMessage(_) | Self::Content(_) => None,
         }
     }
 
@@ -239,6 +271,16 @@ impl Entry {
             .map(|entity| entity.downcast::<TerminalView>().unwrap())
     }
 
+    pub fn scroll_handle_for_assistant_message_chunk(
+        &self,
+        chunk_ix: usize,
+    ) -> Option<ScrollHandle> {
+        match self {
+            Self::AssistantMessage(message) => message.scroll_handle_for_chunk(chunk_ix),
+            Self::UserMessage(_) | Self::Content(_) => None,
+        }
+    }
+
     fn content_map(&self) -> Option<&HashMap<EntityId, AnyEntity>> {
         match self {
             Self::Content(map) => Some(map),
@@ -254,7 +296,7 @@ impl Entry {
     pub fn has_content(&self) -> bool {
         match self {
             Self::Content(map) => !map.is_empty(),
-            Self::UserMessage(_) => false,
+            Self::UserMessage(_) | Self::AssistantMessage(_) => false,
         }
     }
 }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 6d8f8fb82e..f3b1e6ce3b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -20,11 +20,11 @@ use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
     Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
-    EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset,
-    ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription,
-    Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
-    WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage, point,
-    prelude::*, pulsating_between,
+    CursorStyle, EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length,
+    ListOffset, ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement,
+    Subscription, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity,
+    Window, WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage,
+    point, prelude::*, pulsating_between,
 };
 use language::Buffer;
 
@@ -66,7 +66,6 @@ use crate::{
     KeepAll, OpenAgentDiff, OpenHistory, RejectAll, ToggleBurnMode, ToggleProfileSelector,
 };
 
-const RESPONSE_PADDING_X: Pixels = px(19.);
 pub const MIN_EDITOR_LINES: usize = 4;
 pub const MAX_EDITOR_LINES: usize = 8;
 
@@ -1334,6 +1333,10 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &Context<Self>,
     ) -> AnyElement {
+        let is_generating = self
+            .thread()
+            .is_some_and(|thread| thread.read(cx).status() != ThreadStatus::Idle);
+
         let primary = match &entry {
             AgentThreadEntry::UserMessage(message) => {
                 let Some(editor) = self
@@ -1493,6 +1496,20 @@ impl AcpThreadView {
                     .into_any()
             }
             AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) => {
+                let is_last = entry_ix + 1 == total_entries;
+                let pending_thinking_chunk_ix = if is_generating && is_last {
+                    chunks
+                        .iter()
+                        .enumerate()
+                        .next_back()
+                        .filter(|(_, segment)| {
+                            matches!(segment, AssistantMessageChunk::Thought { .. })
+                        })
+                        .map(|(index, _)| index)
+                } else {
+                    None
+                };
+
                 let style = default_markdown_style(false, false, window, cx);
                 let message_body = v_flex()
                     .w_full()
@@ -1511,6 +1528,7 @@ impl AcpThreadView {
                                         entry_ix,
                                         chunk_ix,
                                         md.clone(),
+                                        Some(chunk_ix) == pending_thinking_chunk_ix,
                                         window,
                                         cx,
                                     )
@@ -1524,7 +1542,7 @@ impl AcpThreadView {
                 v_flex()
                     .px_5()
                     .py_1()
-                    .when(entry_ix + 1 == total_entries, |this| this.pb_4())
+                    .when(is_last, |this| this.pb_4())
                     .w_full()
                     .text_ui(cx)
                     .child(message_body)
@@ -1533,7 +1551,7 @@ impl AcpThreadView {
             AgentThreadEntry::ToolCall(tool_call) => {
                 let has_terminals = tool_call.terminals().next().is_some();
 
-                div().w_full().py_1().px_5().map(|this| {
+                div().w_full().map(|this| {
                     if has_terminals {
                         this.children(tool_call.terminals().map(|terminal| {
                             self.render_terminal_tool_call(
@@ -1609,64 +1627,90 @@ impl AcpThreadView {
         entry_ix: usize,
         chunk_ix: usize,
         chunk: Entity<Markdown>,
+        pending: bool,
         window: &Window,
         cx: &Context<Self>,
     ) -> AnyElement {
         let header_id = SharedString::from(format!("thinking-block-header-{}", entry_ix));
         let card_header_id = SharedString::from("inner-card-header");
+
         let key = (entry_ix, chunk_ix);
+
         let is_open = self.expanded_thinking_blocks.contains(&key);
+        let editor_bg = cx.theme().colors().editor_background;
+        let gradient_overlay = div()
+            .rounded_b_lg()
+            .h_full()
+            .absolute()
+            .w_full()
+            .bottom_0()
+            .left_0()
+            .bg(linear_gradient(
+                180.,
+                linear_color_stop(editor_bg, 1.),
+                linear_color_stop(editor_bg.opacity(0.2), 0.),
+            ));
+
+        let scroll_handle = self
+            .entry_view_state
+            .read(cx)
+            .entry(entry_ix)
+            .and_then(|entry| entry.scroll_handle_for_assistant_message_chunk(chunk_ix));
 
         v_flex()
+            .rounded_md()
+            .border_1()
+            .border_color(self.tool_card_border_color(cx))
             .child(
                 h_flex()
                     .id(header_id)
                     .group(&card_header_id)
                     .relative()
                     .w_full()
-                    .gap_1p5()
+                    .py_0p5()
+                    .px_1p5()
+                    .rounded_t_md()
+                    .bg(self.tool_card_header_bg(cx))
+                    .justify_between()
+                    .border_b_1()
+                    .border_color(self.tool_card_border_color(cx))
                     .child(
                         h_flex()
-                            .size_4()
-                            .justify_center()
+                            .h(window.line_height())
+                            .gap_1p5()
                             .child(
-                                div()
-                                    .group_hover(&card_header_id, |s| s.invisible().w_0())
-                                    .child(
-                                        Icon::new(IconName::ToolThink)
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    ),
+                                Icon::new(IconName::ToolThink)
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted),
                             )
                             .child(
-                                h_flex()
-                                    .absolute()
-                                    .inset_0()
-                                    .invisible()
-                                    .justify_center()
-                                    .group_hover(&card_header_id, |s| s.visible())
-                                    .child(
-                                        Disclosure::new(("expand", entry_ix), is_open)
-                                            .opened_icon(IconName::ChevronUp)
-                                            .closed_icon(IconName::ChevronRight)
-                                            .on_click(cx.listener({
-                                                move |this, _event, _window, cx| {
-                                                    if is_open {
-                                                        this.expanded_thinking_blocks.remove(&key);
-                                                    } else {
-                                                        this.expanded_thinking_blocks.insert(key);
-                                                    }
-                                                    cx.notify();
-                                                }
-                                            })),
-                                    ),
+                                div()
+                                    .text_size(self.tool_name_font_size())
+                                    .text_color(cx.theme().colors().text_muted)
+                                    .map(|this| {
+                                        if pending {
+                                            this.child("Thinking")
+                                        } else {
+                                            this.child("Thought Process")
+                                        }
+                                    }),
                             ),
                     )
                     .child(
-                        div()
-                            .text_size(self.tool_name_font_size())
-                            .text_color(cx.theme().colors().text_muted)
-                            .child("Thinking"),
+                        Disclosure::new(("expand", entry_ix), is_open)
+                            .opened_icon(IconName::ChevronUp)
+                            .closed_icon(IconName::ChevronDown)
+                            .visible_on_hover(&card_header_id)
+                            .on_click(cx.listener({
+                                move |this, _event, _window, cx| {
+                                    if is_open {
+                                        this.expanded_thinking_blocks.remove(&key);
+                                    } else {
+                                        this.expanded_thinking_blocks.insert(key);
+                                    }
+                                    cx.notify();
+                                }
+                            })),
                     )
                     .on_click(cx.listener({
                         move |this, _event, _window, cx| {
@@ -1679,22 +1723,28 @@ impl AcpThreadView {
                         }
                     })),
             )
-            .when(is_open, |this| {
-                this.child(
-                    div()
-                        .relative()
-                        .mt_1p5()
-                        .ml(rems(0.4))
-                        .pl_4()
-                        .border_l_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .text_ui_sm(cx)
-                        .child(self.render_markdown(
-                            chunk,
-                            default_markdown_style(false, false, window, cx),
-                        )),
-                )
-            })
+            .child(
+                div()
+                    .relative()
+                    .bg(editor_bg)
+                    .rounded_b_lg()
+                    .child(
+                        div()
+                            .id(("thinking-content", chunk_ix))
+                            .when_some(scroll_handle, |this, scroll_handle| {
+                                this.track_scroll(&scroll_handle)
+                            })
+                            .p_2()
+                            .when(!is_open, |this| this.max_h_20())
+                            .text_ui_sm(cx)
+                            .overflow_hidden()
+                            .child(self.render_markdown(
+                                chunk,
+                                default_markdown_style(false, false, window, cx),
+                            )),
+                    )
+                    .when(!is_open && pending, |this| this.child(gradient_overlay)),
+            )
             .into_any_element()
     }
 
@@ -1705,7 +1755,6 @@ impl AcpThreadView {
         window: &Window,
         cx: &Context<Self>,
     ) -> Div {
-        let header_id = SharedString::from(format!("outer-tool-call-header-{}", entry_ix));
         let card_header_id = SharedString::from("inner-tool-call-header");
 
         let tool_icon =
@@ -1734,11 +1783,7 @@ impl AcpThreadView {
             _ => false,
         };
 
-        let failed_tool_call = matches!(
-            tool_call.status,
-            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed
-        );
-
+        let has_location = tool_call.locations.len() == 1;
         let needs_confirmation = matches!(
             tool_call.status,
             ToolCallStatus::WaitingForConfirmation { .. }
@@ -1751,23 +1796,31 @@ impl AcpThreadView {
 
         let is_open = needs_confirmation || self.expanded_tool_calls.contains(&tool_call.id);
 
-        let gradient_overlay = |color: Hsla| {
+        let gradient_overlay = {
             div()
                 .absolute()
                 .top_0()
                 .right_0()
                 .w_12()
                 .h_full()
-                .bg(linear_gradient(
-                    90.,
-                    linear_color_stop(color, 1.),
-                    linear_color_stop(color.opacity(0.2), 0.),
-                ))
-        };
-        let gradient_color = if use_card_layout {
-            self.tool_card_header_bg(cx)
-        } else {
-            cx.theme().colors().panel_background
+                .map(|this| {
+                    if use_card_layout {
+                        this.bg(linear_gradient(
+                            90.,
+                            linear_color_stop(self.tool_card_header_bg(cx), 1.),
+                            linear_color_stop(self.tool_card_header_bg(cx).opacity(0.2), 0.),
+                        ))
+                    } else {
+                        this.bg(linear_gradient(
+                            90.,
+                            linear_color_stop(cx.theme().colors().panel_background, 1.),
+                            linear_color_stop(
+                                cx.theme().colors().panel_background.opacity(0.2),
+                                0.,
+                            ),
+                        ))
+                    }
+                })
         };
 
         let tool_output_display = if is_open {
@@ -1818,41 +1871,58 @@ impl AcpThreadView {
         };
 
         v_flex()
-            .when(use_card_layout, |this| {
-                this.rounded_md()
-                    .border_1()
-                    .border_color(self.tool_card_border_color(cx))
-                    .bg(cx.theme().colors().editor_background)
-                    .overflow_hidden()
+            .map(|this| {
+                if use_card_layout {
+                    this.my_2()
+                        .rounded_md()
+                        .border_1()
+                        .border_color(self.tool_card_border_color(cx))
+                        .bg(cx.theme().colors().editor_background)
+                        .overflow_hidden()
+                } else {
+                    this.my_1()
+                }
             })
+            .map(|this| {
+                if has_location && !use_card_layout {
+                    this.ml_4()
+                } else {
+                    this.ml_5()
+                }
+            })
+            .mr_5()
             .child(
                 h_flex()
-                    .id(header_id)
                     .group(&card_header_id)
                     .relative()
                     .w_full()
-                    .max_w_full()
                     .gap_1()
+                    .justify_between()
                     .when(use_card_layout, |this| {
-                        this.pl_1p5()
-                            .pr_1()
-                            .py_0p5()
+                        this.p_0p5()
                             .rounded_t_md()
-                            .when(is_open && !failed_tool_call, |this| {
+                            .bg(self.tool_card_header_bg(cx))
+                            .when(is_open && !failed_or_canceled, |this| {
                                 this.border_b_1()
                                     .border_color(self.tool_card_border_color(cx))
                             })
-                            .bg(self.tool_card_header_bg(cx))
                     })
                     .child(
                         h_flex()
                             .relative()
                             .w_full()
-                            .h(window.line_height() - px(2.))
+                            .h(window.line_height())
                             .text_size(self.tool_name_font_size())
-                            .gap_0p5()
+                            .gap_1p5()
+                            .when(has_location || use_card_layout, |this| this.px_1())
+                            .when(has_location, |this| {
+                                this.cursor(CursorStyle::PointingHand)
+                                    .rounded_sm()
+                                    .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.5)))
+                            })
+                            .overflow_hidden()
                             .child(tool_icon)
-                            .child(if tool_call.locations.len() == 1 {
+                            .child(if has_location {
                                 let name = tool_call.locations[0]
                                     .path
                                     .file_name()
@@ -1863,13 +1933,6 @@ impl AcpThreadView {
                                 h_flex()
                                     .id(("open-tool-call-location", entry_ix))
                                     .w_full()
-                                    .max_w_full()
-                                    .px_1p5()
-                                    .rounded_sm()
-                                    .overflow_x_scroll()
-                                    .hover(|label| {
-                                        label.bg(cx.theme().colors().element_hover.opacity(0.5))
-                                    })
                                     .map(|this| {
                                         if use_card_layout {
                                             this.text_color(cx.theme().colors().text)
@@ -1879,31 +1942,28 @@ impl AcpThreadView {
                                     })
                                     .child(name)
                                     .tooltip(Tooltip::text("Jump to File"))
-                                    .cursor(gpui::CursorStyle::PointingHand)
                                     .on_click(cx.listener(move |this, _, window, cx| {
                                         this.open_tool_call_location(entry_ix, 0, window, cx);
                                     }))
                                     .into_any_element()
                             } else {
                                 h_flex()
-                                    .relative()
                                     .w_full()
-                                    .max_w_full()
-                                    .ml_1p5()
-                                    .overflow_hidden()
-                                    .child(h_flex().pr_8().child(self.render_markdown(
+                                    .child(self.render_markdown(
                                         tool_call.label.clone(),
                                         default_markdown_style(false, true, window, cx),
-                                    )))
-                                    .child(gradient_overlay(gradient_color))
+                                    ))
                                     .into_any()
-                            }),
+                            })
+                            .when(!has_location, |this| this.child(gradient_overlay)),
                     )
-                    .child(
-                        h_flex()
-                            .gap_px()
-                            .when(is_collapsible, |this| {
-                                this.child(
+                    .when(is_collapsible || failed_or_canceled, |this| {
+                        this.child(
+                            h_flex()
+                                .px_1()
+                                .gap_px()
+                                .when(is_collapsible, |this| {
+                                    this.child(
                                     Disclosure::new(("expand", entry_ix), is_open)
                                         .opened_icon(IconName::ChevronUp)
                                         .closed_icon(IconName::ChevronDown)
@@ -1920,15 +1980,16 @@ impl AcpThreadView {
                                             }
                                         })),
                                 )
-                            })
-                            .when(failed_or_canceled, |this| {
-                                this.child(
-                                    Icon::new(IconName::Close)
-                                        .color(Color::Error)
-                                        .size(IconSize::Small),
-                                )
-                            }),
-                    ),
+                                })
+                                .when(failed_or_canceled, |this| {
+                                    this.child(
+                                        Icon::new(IconName::Close)
+                                            .color(Color::Error)
+                                            .size(IconSize::Small),
+                                    )
+                                }),
+                        )
+                    }),
             )
             .children(tool_output_display)
     }
@@ -2214,6 +2275,12 @@ impl AcpThreadView {
             started_at.elapsed()
         };
 
+        let header_id =
+            SharedString::from(format!("terminal-tool-header-{}", terminal.entity_id()));
+        let header_group = SharedString::from(format!(
+            "terminal-tool-header-group-{}",
+            terminal.entity_id()
+        ));
         let header_bg = cx
             .theme()
             .colors()
@@ -2229,10 +2296,7 @@ impl AcpThreadView {
         let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
 
         let header = h_flex()
-            .id(SharedString::from(format!(
-                "terminal-tool-header-{}",
-                terminal.entity_id()
-            )))
+            .id(header_id)
             .flex_none()
             .gap_1()
             .justify_between()
@@ -2296,23 +2360,6 @@ impl AcpThreadView {
                             ),
                     )
             })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", terminal.entity_id()))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
-                        )
-                        .when_some(output.and_then(|o| o.exit_status), |this, status| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                status.code().unwrap_or(-1),
-                            )))
-                        }),
-                )
-            })
             .when(truncated_output, |header| {
                 let tooltip = if let Some(output) = output {
                     if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
@@ -2365,6 +2412,7 @@ impl AcpThreadView {
                 )
                 .opened_icon(IconName::ChevronUp)
                 .closed_icon(IconName::ChevronDown)
+                .visible_on_hover(&header_group)
                 .on_click(cx.listener({
                     let id = tool_call.id.clone();
                     move |this, _event, _window, _cx| {
@@ -2373,8 +2421,26 @@ impl AcpThreadView {
                         } else {
                             this.expanded_tool_calls.insert(id.clone());
                         }
-                    }})),
-                );
+                    }
+                })),
+            )
+            .when(tool_failed || command_failed, |header| {
+                header.child(
+                    div()
+                        .id(("terminal-tool-error-code-indicator", terminal.entity_id()))
+                        .child(
+                            Icon::new(IconName::Close)
+                                .size(IconSize::Small)
+                                .color(Color::Error),
+                        )
+                        .when_some(output.and_then(|o| o.exit_status), |this, status| {
+                            this.tooltip(Tooltip::text(format!(
+                                "Exited with code {}",
+                                status.code().unwrap_or(-1),
+                            )))
+                        }),
+                )
+            });
 
         let terminal_view = self
             .entry_view_state
@@ -2384,7 +2450,8 @@ impl AcpThreadView {
         let show_output = is_expanded && terminal_view.is_some();
 
         v_flex()
-            .mb_2()
+            .my_2()
+            .mx_5()
             .border_1()
             .when(tool_failed || command_failed, |card| card.border_dashed())
             .border_color(border_color)
@@ -2392,9 +2459,10 @@ impl AcpThreadView {
             .overflow_hidden()
             .child(
                 v_flex()
+                    .group(&header_group)
                     .py_1p5()
-                    .pl_2()
                     .pr_1p5()
+                    .pl_2()
                     .gap_0p5()
                     .bg(header_bg)
                     .text_xs()
@@ -4153,13 +4221,14 @@ impl AcpThreadView {
     ) -> impl IntoElement {
         let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
         if is_generating {
-            return h_flex().id("thread-controls-container").ml_1().child(
+            return h_flex().id("thread-controls-container").child(
                 div()
                     .py_2()
-                    .px(rems_from_px(22.))
+                    .px_5()
                     .child(SpinnerLabel::new().size(LabelSize::Small)),
             );
         }
+
         let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown)
             .shape(ui::IconButtonShape::Square)
             .icon_size(IconSize::Small)
@@ -4185,12 +4254,10 @@ impl AcpThreadView {
             .id("thread-controls-container")
             .group("thread-controls-container")
             .w_full()
-            .mr_1()
-            .pt_1()
-            .pb_2()
-            .px(RESPONSE_PADDING_X)
+            .py_2()
+            .px_5()
             .gap_px()
-            .opacity(0.4)
+            .opacity(0.6)
             .hover(|style| style.opacity(1.))
             .flex_wrap()
             .justify_end();
@@ -4201,56 +4268,50 @@ impl AcpThreadView {
                 .is_some_and(|thread| thread.read(cx).connection().telemetry().is_some())
         {
             let feedback = self.thread_feedback.feedback;
-            container = container.child(
-                div().visible_on_hover("thread-controls-container").child(
-                    Label::new(
-                        match feedback {
+
+            container = container
+                .child(
+                    div().visible_on_hover("thread-controls-container").child(
+                        Label::new(match feedback {
                             Some(ThreadFeedback::Positive) => "Thanks for your feedback!",
-                            Some(ThreadFeedback::Negative) => "We appreciate your feedback and will use it to improve.",
-                            None => "Rating the thread sends all of your current conversation to the Zed team.",
-                        }
-                    )
-                    .color(Color::Muted)
-                    .size(LabelSize::XSmall)
-                    .truncate(),
-                ),
-            ).child(
-                h_flex()
-                    .child(
-                        IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
-                            .shape(ui::IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .icon_color(match feedback {
-                                Some(ThreadFeedback::Positive) => Color::Accent,
-                                _ => Color::Ignored,
-                            })
-                            .tooltip(Tooltip::text("Helpful Response"))
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.handle_feedback_click(
-                                    ThreadFeedback::Positive,
-                                    window,
-                                    cx,
-                                );
-                            })),
-                    )
-                    .child(
-                        IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
-                            .shape(ui::IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .icon_color(match feedback {
-                                Some(ThreadFeedback::Negative) => Color::Accent,
-                                _ => Color::Ignored,
-                            })
-                            .tooltip(Tooltip::text("Not Helpful"))
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.handle_feedback_click(
-                                    ThreadFeedback::Negative,
-                                    window,
-                                    cx,
-                                );
-                            })),
-                    )
-            )
+                            Some(ThreadFeedback::Negative) => {
+                                "We appreciate your feedback and will use it to improve."
+                            }
+                            None => {
+                                "Rating the thread sends all of your current conversation to the Zed team."
+                            }
+                        })
+                        .color(Color::Muted)
+                        .size(LabelSize::XSmall)
+                        .truncate(),
+                    ),
+                )
+                .child(
+                    IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
+                        .shape(ui::IconButtonShape::Square)
+                        .icon_size(IconSize::Small)
+                        .icon_color(match feedback {
+                            Some(ThreadFeedback::Positive) => Color::Accent,
+                            _ => Color::Ignored,
+                        })
+                        .tooltip(Tooltip::text("Helpful Response"))
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            this.handle_feedback_click(ThreadFeedback::Positive, window, cx);
+                        })),
+                )
+                .child(
+                    IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
+                        .shape(ui::IconButtonShape::Square)
+                        .icon_size(IconSize::Small)
+                        .icon_color(match feedback {
+                            Some(ThreadFeedback::Negative) => Color::Accent,
+                            _ => Color::Ignored,
+                        })
+                        .tooltip(Tooltip::text("Not Helpful"))
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            this.handle_feedback_click(ThreadFeedback::Negative, window, cx);
+                        })),
+                );
         }
 
         container.child(open_as_markdown).child(scroll_to_top)
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index f16da45d79..1f607a033a 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -1323,7 +1323,7 @@ fn render_copy_code_block_button(
     .icon_size(IconSize::Small)
     .style(ButtonStyle::Filled)
     .shape(ui::IconButtonShape::Square)
-    .tooltip(Tooltip::text("Copy Code"))
+    .tooltip(Tooltip::text("Copy"))
     .on_click({
         let markdown = markdown;
         move |_event, _window, cx| {

From 0e575b280997b346e58497725fa0609ac4f6f47c Mon Sep 17 00:00:00 2001
From: Adam Mulvany <llamaha@users.noreply.github.com>
Date: Wed, 27 Aug 2025 02:38:53 +1000
Subject: [PATCH 379/823] helix: Fix `buffer search: deploy` reset to normal
 mode (#36917)

## Fix: Preserve Helix mode when using  search

### Problem
When using `buffer search: deploy` in Helix mode, pressing Enter to
dismiss the search incorrectly returned to Vim NORMAL mode instead of
Helix NORMAL mode.

### Root Cause
The `search_deploy` function was resetting the entire `SearchState` to
default values when buffer search: deploy was activated. Since the
default `Mode` is `Normal`, this caused `prior_mode` to be set to Vim's
Normal mode regardless of the actual mode before search.

### Solution
Modified `search_deploy` to preserve the current mode when resetting
search state:
- Store the current mode before resetting
- Reset search state to default
- Restore the saved mode to `prior_mode`

This ensures the editor returns to the correct mode (Helix NORMAL or Vim
NORMAL) after dismissing buffer search.

### Settings

I was able to reproduce and then test the fix was successful with the
following config and have also tested with vim: default_mode commented
out to ensure that's not influencing the mode selection flow:

```
  "helix_mode": true,
  "vim_mode": true,
  "vim": {
    "default_mode": "helix_normal"
  },
```

This is on Kubuntu 24.04.

The following test combinations pass locally:

- `cargo test -p search`
- `cargo test -p vim`
- `cargo test -p editor`
- `cargo test -p workspace`
- `cargo test -p gpui -- vim`
- `cargo test -p gpui -- helix`

Release Notes:

- Fixed Helix mode switching to Vim normal mode after using `buffer
search: deploy` to search

Closes #36872
---
 crates/vim/src/normal/search.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index 4fbeec7236..dba003ec5f 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -203,7 +203,10 @@ impl Vim {
 
     // hook into the existing to clear out any vim search state on cmd+f or edit -> find.
     fn search_deploy(&mut self, _: &buffer_search::Deploy, _: &mut Window, cx: &mut Context<Self>) {
+        // Preserve the current mode when resetting search state
+        let current_mode = self.mode;
         self.search = Default::default();
+        self.search.prior_mode = current_mode;
         cx.propagate();
     }
 

From b1b60bb7fe64f6b1ee6c1758f2792a68822bcc8a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 26 Aug 2025 10:54:39 -0700
Subject: [PATCH 380/823] Work around duplicate ssh projects in workspace
 migration (#36946)

Fixes another case where the sqlite migration could fail, reported by
@SomeoneToIgnore.

Release Notes:

- N/A
---
 crates/workspace/src/persistence.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 12e719cfd9..c4ba93bcec 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -599,6 +599,13 @@ impl Domain for WorkspaceDb {
                 ssh_projects ON
                 workspaces.ssh_project_id = ssh_projects.id;
 
+            DELETE FROM workspaces_2
+            WHERE workspace_id NOT IN (
+                SELECT MAX(workspace_id)
+                FROM workspaces_2
+                GROUP BY ssh_connection_id, paths
+            );
+
             DROP TABLE ssh_projects;
             DROP TABLE workspaces;
             ALTER TABLE workspaces_2 RENAME TO workspaces;

From fff0ecead17c601721c35fcacfbb4804ad22a956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Wed, 27 Aug 2025 03:24:50 +0800
Subject: [PATCH 381/823] windows: Fix keystroke & keymap (#36572)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #36300

This PR follows Windows conventions by introducing
`KeybindingKeystroke`, so shortcuts now show up as `ctrl-shift-4`
instead of `ctrl-$`.

It also fixes issues with keyboard layouts: when `use_key_equivalents`
is set to true, keys are remapped based on their virtual key codes. For
example, `ctrl-\` on a standard English layout will be mapped to
`ctrl-ё` on a Russian layout.


Release Notes:

- N/A

---------

Co-authored-by: Kate <kate@zed.dev>
---
 assets/keymaps/default-windows.json           | 1260 ++++++++++++++
 crates/docs_preprocessor/src/main.rs          |    5 +
 crates/editor/src/editor.rs                   |   26 +-
 crates/editor/src/element.rs                  |   10 +-
 crates/gpui/src/app.rs                        |   17 +-
 crates/gpui/src/keymap.rs                     |    7 +-
 crates/gpui/src/keymap/binding.rs             |   49 +-
 crates/gpui/src/platform.rs                   |    6 +-
 crates/gpui/src/platform/keyboard.rs          |   34 +
 crates/gpui/src/platform/keystroke.rs         |  252 ++-
 crates/gpui/src/platform/linux/platform.rs    |    8 +-
 crates/gpui/src/platform/mac/keyboard.rs      | 1453 ++++++++++++++++-
 crates/gpui/src/platform/mac/platform.rs      |   28 +-
 crates/gpui/src/platform/test/platform.rs     |   11 +-
 crates/gpui/src/platform/windows/keyboard.rs  |  244 ++-
 crates/gpui/src/platform/windows/platform.rs  |    4 +
 crates/language_tools/src/key_context_view.rs |    4 +-
 crates/settings/src/key_equivalents.rs        | 1424 ----------------
 crates/settings/src/keymap_file.rs            |   66 +-
 crates/settings/src/settings.rs               |    7 +-
 crates/settings_ui/src/keybindings.rs         |  101 +-
 .../src/ui_components/keystroke_input.rs      |   74 +-
 crates/ui/src/components/keybinding.rs        |  131 +-
 crates/zed/src/zed.rs                         |   10 +-
 .../zed/src/zed/quick_action_bar/preview.rs   |    5 +-
 25 files changed, 3515 insertions(+), 1721 deletions(-)
 create mode 100644 assets/keymaps/default-windows.json
 delete mode 100644 crates/settings/src/key_equivalents.rs

diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
new file mode 100644
index 0000000000..c7a6c3149c
--- /dev/null
+++ b/assets/keymaps/default-windows.json
@@ -0,0 +1,1260 @@
+[
+  // Standard Windows bindings
+  {
+    "use_key_equivalents": true,
+    "bindings": {
+      "home": "menu::SelectFirst",
+      "shift-pageup": "menu::SelectFirst",
+      "pageup": "menu::SelectFirst",
+      "end": "menu::SelectLast",
+      "shift-pagedown": "menu::SelectLast",
+      "pagedown": "menu::SelectLast",
+      "ctrl-n": "menu::SelectNext",
+      "tab": "menu::SelectNext",
+      "down": "menu::SelectNext",
+      "ctrl-p": "menu::SelectPrevious",
+      "shift-tab": "menu::SelectPrevious",
+      "up": "menu::SelectPrevious",
+      "enter": "menu::Confirm",
+      "ctrl-enter": "menu::SecondaryConfirm",
+      "ctrl-escape": "menu::Cancel",
+      "ctrl-c": "menu::Cancel",
+      "escape": "menu::Cancel",
+      "shift-alt-enter": "menu::Restart",
+      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
+      "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
+      "ctrl-shift-w": "workspace::CloseWindow",
+      "shift-escape": "workspace::ToggleZoom",
+      "open": "workspace::Open",
+      "ctrl-o": "workspace::Open",
+      "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
+      "ctrl-shift-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
+      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
+      "ctrl-0": ["zed::ResetBufferFontSize", { "persist": false }],
+      "ctrl-,": "zed::OpenSettings",
+      "ctrl-q": "zed::Quit",
+      "f4": "debugger::Start",
+      "shift-f5": "debugger::Stop",
+      "ctrl-shift-f5": "debugger::RerunSession",
+      "f6": "debugger::Pause",
+      "f7": "debugger::StepOver",
+      "ctrl-f11": "debugger::StepInto",
+      "shift-f11": "debugger::StepOut",
+      "f11": "zed::ToggleFullScreen",
+      "ctrl-shift-i": "edit_prediction::ToggleMenu",
+      "shift-alt-l": "lsp_tool::ToggleMenu"
+    }
+  },
+  {
+    "context": "Picker || menu",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "menu::SelectPrevious",
+      "down": "menu::SelectNext"
+    }
+  },
+  {
+    "context": "Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "editor::Cancel",
+      "shift-backspace": "editor::Backspace",
+      "backspace": "editor::Backspace",
+      "delete": "editor::Delete",
+      "tab": "editor::Tab",
+      "shift-tab": "editor::Backtab",
+      "ctrl-k": "editor::CutToEndOfLine",
+      "ctrl-k ctrl-q": "editor::Rewrap",
+      "ctrl-k q": "editor::Rewrap",
+      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
+      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "cut": "editor::Cut",
+      "shift-delete": "editor::Cut",
+      "ctrl-x": "editor::Cut",
+      "copy": "editor::Copy",
+      "ctrl-insert": "editor::Copy",
+      "ctrl-c": "editor::Copy",
+      "paste": "editor::Paste",
+      "shift-insert": "editor::Paste",
+      "ctrl-v": "editor::Paste",
+      "undo": "editor::Undo",
+      "ctrl-z": "editor::Undo",
+      "redo": "editor::Redo",
+      "ctrl-y": "editor::Redo",
+      "ctrl-shift-z": "editor::Redo",
+      "up": "editor::MoveUp",
+      "ctrl-up": "editor::LineUp",
+      "ctrl-down": "editor::LineDown",
+      "pageup": "editor::MovePageUp",
+      "alt-pageup": "editor::PageUp",
+      "shift-pageup": "editor::SelectPageUp",
+      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      "down": "editor::MoveDown",
+      "pagedown": "editor::MovePageDown",
+      "alt-pagedown": "editor::PageDown",
+      "shift-pagedown": "editor::SelectPageDown",
+      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
+      "left": "editor::MoveLeft",
+      "right": "editor::MoveRight",
+      "ctrl-left": "editor::MoveToPreviousWordStart",
+      "ctrl-right": "editor::MoveToNextWordEnd",
+      "ctrl-home": "editor::MoveToBeginning",
+      "ctrl-end": "editor::MoveToEnd",
+      "shift-up": "editor::SelectUp",
+      "shift-down": "editor::SelectDown",
+      "shift-left": "editor::SelectLeft",
+      "shift-right": "editor::SelectRight",
+      "ctrl-shift-left": "editor::SelectToPreviousWordStart",
+      "ctrl-shift-right": "editor::SelectToNextWordEnd",
+      "ctrl-shift-home": "editor::SelectToBeginning",
+      "ctrl-shift-end": "editor::SelectToEnd",
+      "ctrl-a": "editor::SelectAll",
+      "ctrl-l": "editor::SelectLine",
+      "shift-alt-f": "editor::Format",
+      "shift-alt-o": "editor::OrganizeImports",
+      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
+      "ctrl-alt-space": "editor::ShowCharacterPalette",
+      "ctrl-;": "editor::ToggleLineNumbers",
+      "ctrl-'": "editor::ToggleSelectedDiffHunks",
+      "ctrl-\"": "editor::ExpandAllDiffHunks",
+      "ctrl-i": "editor::ShowSignatureHelp",
+      "alt-g b": "git::Blame",
+      "alt-g m": "git::OpenModifiedFiles",
+      "menu": "editor::OpenContextMenu",
+      "shift-f10": "editor::OpenContextMenu",
+      "ctrl-shift-e": "editor::ToggleEditPrediction",
+      "f9": "editor::ToggleBreakpoint",
+      "shift-f9": "editor::EditLogBreakpoint"
+    }
+  },
+  {
+    "context": "Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      "shift-enter": "editor::Newline",
+      "enter": "editor::Newline",
+      "ctrl-enter": "editor::NewlineAbove",
+      "ctrl-shift-enter": "editor::NewlineBelow",
+      "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
+      "ctrl-k z": "editor::ToggleSoftWrap",
+      "find": "buffer_search::Deploy",
+      "ctrl-f": "buffer_search::Deploy",
+      "ctrl-h": "buffer_search::DeployReplace",
+      "ctrl-shift-.": "assistant::QuoteSelection",
+      "ctrl-shift-,": "assistant::InsertIntoEditor",
+      "shift-alt-e": "editor::SelectEnclosingSymbol",
+      "ctrl-shift-backspace": "editor::GoToPreviousChange",
+      "ctrl-shift-alt-backspace": "editor::GoToNextChange",
+      "alt-enter": "editor::OpenSelectionsInMultibuffer"
+    }
+  },
+  {
+    "context": "Editor && mode == full && edit_prediction",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-]": "editor::NextEditPrediction",
+      "alt-[": "editor::PreviousEditPrediction"
+    }
+  },
+  {
+    "context": "Editor && !edit_prediction",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-\\": "editor::ShowEditPrediction"
+    }
+  },
+  {
+    "context": "Editor && mode == auto_height",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "editor::Newline",
+      "shift-enter": "editor::Newline",
+      "ctrl-shift-enter": "editor::NewlineBelow"
+    }
+  },
+  {
+    "context": "Markdown",
+    "use_key_equivalents": true,
+    "bindings": {
+      "copy": "markdown::Copy",
+      "ctrl-c": "markdown::Copy"
+    }
+  },
+  {
+    "context": "Editor && jupyter && !ContextEditor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-enter": "repl::Run",
+      "ctrl-alt-enter": "repl::RunInPlace"
+    }
+  },
+  {
+    "context": "Editor && !agent_diff",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-k ctrl-r": "git::Restore",
+      "alt-y": "git::StageAndNext",
+      "shift-alt-y": "git::UnstageAndNext"
+    }
+  },
+  {
+    "context": "Editor && editor_agent_diff",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-y": "agent::Keep",
+      "ctrl-n": "agent::Reject",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll",
+      "ctrl-shift-r": "agent::OpenAgentDiff"
+    }
+  },
+  {
+    "context": "AgentDiff",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-y": "agent::Keep",
+      "ctrl-n": "agent::Reject",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
+    }
+  },
+  {
+    "context": "ContextEditor > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "assistant::Assist",
+      "ctrl-s": "workspace::Save",
+      "save": "workspace::Save",
+      "ctrl-shift-,": "assistant::InsertIntoEditor",
+      "shift-enter": "assistant::Split",
+      "ctrl-r": "assistant::CycleMessageRole",
+      "enter": "assistant::ConfirmCommand",
+      "alt-enter": "editor::Newline",
+      "ctrl-k c": "assistant::CopyCode",
+      "ctrl-g": "search::SelectNextMatch",
+      "ctrl-shift-g": "search::SelectPreviousMatch",
+      "ctrl-k l": "agent::OpenRulesLibrary"
+    }
+  },
+  {
+    "context": "AgentPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-n": "agent::NewThread",
+      "shift-alt-n": "agent::NewTextThread",
+      "ctrl-shift-h": "agent::OpenHistory",
+      "shift-alt-c": "agent::OpenSettings",
+      "shift-alt-p": "agent::OpenRulesLibrary",
+      "ctrl-i": "agent::ToggleProfileSelector",
+      "shift-alt-/": "agent::ToggleModelSelector",
+      "ctrl-shift-a": "agent::ToggleContextPicker",
+      "ctrl-shift-j": "agent::ToggleNavigationMenu",
+      "ctrl-shift-i": "agent::ToggleOptionsMenu",
+      // "ctrl-shift-alt-n": "agent::ToggleNewThreadMenu",
+      "shift-alt-escape": "agent::ExpandMessageEditor",
+      "ctrl-shift-.": "assistant::QuoteSelection",
+      "shift-alt-e": "agent::RemoveAllContext",
+      "ctrl-shift-e": "project_panel::ToggleFocus",
+      "ctrl-shift-enter": "agent::ContinueThread",
+      "super-ctrl-b": "agent::ToggleBurnMode",
+      "alt-enter": "agent::ContinueWithBurnMode"
+    }
+  },
+  {
+    "context": "AgentPanel > NavigationMenu",
+    "use_key_equivalents": true,
+    "bindings": {
+      "shift-backspace": "agent::DeleteRecentlyOpenThread"
+    }
+  },
+  {
+    "context": "AgentPanel > Markdown",
+    "use_key_equivalents": true,
+    "bindings": {
+      "copy": "markdown::CopyAsMarkdown",
+      "ctrl-c": "markdown::CopyAsMarkdown"
+    }
+  },
+  {
+    "context": "AgentPanel && prompt_editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-n": "agent::NewTextThread",
+      "ctrl-alt-t": "agent::NewThread"
+    }
+  },
+  {
+    "context": "AgentPanel && external_agent_thread",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-n": "agent::NewExternalAgentThread",
+      "ctrl-alt-t": "agent::NewThread"
+    }
+  },
+  {
+    "context": "MessageEditor && !Picker > Editor && !use_modifier_to_send",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "agent::Chat",
+      "ctrl-enter": "agent::ChatWithFollow",
+      "ctrl-i": "agent::ToggleProfileSelector",
+      "ctrl-shift-r": "agent::OpenAgentDiff",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
+    }
+  },
+  {
+    "context": "MessageEditor && !Picker > Editor && use_modifier_to_send",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "agent::Chat",
+      "enter": "editor::Newline",
+      "ctrl-i": "agent::ToggleProfileSelector",
+      "ctrl-shift-r": "agent::OpenAgentDiff",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
+    }
+  },
+  {
+    "context": "EditMessageEditor > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "menu::Confirm",
+      "alt-enter": "editor::Newline"
+    }
+  },
+  {
+    "context": "AgentFeedbackMessageEditor > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "menu::Confirm",
+      "alt-enter": "editor::Newline"
+    }
+  },
+  {
+    "context": "ContextStrip",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "agent::FocusUp",
+      "right": "agent::FocusRight",
+      "left": "agent::FocusLeft",
+      "down": "agent::FocusDown",
+      "backspace": "agent::RemoveFocusedContext",
+      "enter": "agent::AcceptSuggestedContext"
+    }
+  },
+  {
+    "context": "AcpThread > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "agent::Chat",
+      "ctrl-shift-r": "agent::OpenAgentDiff",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
+    }
+  },
+  {
+    "context": "ThreadHistory",
+    "use_key_equivalents": true,
+    "bindings": {
+      "backspace": "agent::RemoveSelectedThread"
+    }
+  },
+  {
+    "context": "PromptLibrary",
+    "use_key_equivalents": true,
+    "bindings": {
+      "new": "rules_library::NewRule",
+      "ctrl-n": "rules_library::NewRule",
+      "ctrl-shift-s": "rules_library::ToggleDefaultRule"
+    }
+  },
+  {
+    "context": "BufferSearchBar",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "buffer_search::Dismiss",
+      "tab": "buffer_search::FocusEditor",
+      "enter": "search::SelectNextMatch",
+      "shift-enter": "search::SelectPreviousMatch",
+      "alt-enter": "search::SelectAllMatches",
+      "find": "search::FocusSearch",
+      "ctrl-f": "search::FocusSearch",
+      "ctrl-h": "search::ToggleReplace",
+      "ctrl-l": "search::ToggleSelection"
+    }
+  },
+  {
+    "context": "BufferSearchBar && in_replace > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "search::ReplaceNext",
+      "ctrl-enter": "search::ReplaceAll"
+    }
+  },
+  {
+    "context": "BufferSearchBar && !in_replace > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "search::PreviousHistoryQuery",
+      "down": "search::NextHistoryQuery"
+    }
+  },
+  {
+    "context": "ProjectSearchBar",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "project_search::ToggleFocus",
+      "shift-find": "search::FocusSearch",
+      "ctrl-shift-f": "search::FocusSearch",
+      "ctrl-shift-h": "search::ToggleReplace",
+      "alt-r": "search::ToggleRegex" // vscode
+    }
+  },
+  {
+    "context": "ProjectSearchBar > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "search::PreviousHistoryQuery",
+      "down": "search::NextHistoryQuery"
+    }
+  },
+  {
+    "context": "ProjectSearchBar && in_replace > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "search::ReplaceNext",
+      "ctrl-alt-enter": "search::ReplaceAll"
+    }
+  },
+  {
+    "context": "ProjectSearchView",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "project_search::ToggleFocus",
+      "ctrl-shift-h": "search::ToggleReplace",
+      "alt-r": "search::ToggleRegex" // vscode
+    }
+  },
+  {
+    "context": "Pane",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-1": ["pane::ActivateItem", 0],
+      "alt-2": ["pane::ActivateItem", 1],
+      "alt-3": ["pane::ActivateItem", 2],
+      "alt-4": ["pane::ActivateItem", 3],
+      "alt-5": ["pane::ActivateItem", 4],
+      "alt-6": ["pane::ActivateItem", 5],
+      "alt-7": ["pane::ActivateItem", 6],
+      "alt-8": ["pane::ActivateItem", 7],
+      "alt-9": ["pane::ActivateItem", 8],
+      "alt-0": "pane::ActivateLastItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-shift-pageup": "pane::SwapItemLeft",
+      "ctrl-shift-pagedown": "pane::SwapItemRight",
+      "ctrl-f4": ["pane::CloseActiveItem", { "close_pinned": false }],
+      "ctrl-w": ["pane::CloseActiveItem", { "close_pinned": false }],
+      "ctrl-shift-alt-t": ["pane::CloseOtherItems", { "close_pinned": false }],
+      "ctrl-shift-alt-w": "workspace::CloseInactiveTabsAndPanes",
+      "ctrl-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
+      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
+      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
+      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
+      "ctrl-k ctrl-w": "workspace::CloseAllItemsAndPanes",
+      "back": "pane::GoBack",
+      "alt--": "pane::GoBack",
+      "alt-=": "pane::GoForward",
+      "forward": "pane::GoForward",
+      "f3": "search::SelectNextMatch",
+      "shift-f3": "search::SelectPreviousMatch",
+      "shift-find": "project_search::ToggleFocus",
+      "ctrl-shift-f": "project_search::ToggleFocus",
+      "shift-alt-h": "search::ToggleReplace",
+      "alt-l": "search::ToggleSelection",
+      "alt-enter": "search::SelectAllMatches",
+      "alt-c": "search::ToggleCaseSensitive",
+      "alt-w": "search::ToggleWholeWord",
+      "alt-find": "project_search::ToggleFilters",
+      "alt-f": "project_search::ToggleFilters",
+      "alt-r": "search::ToggleRegex",
+      // "ctrl-shift-alt-x": "search::ToggleRegex",
+      "ctrl-k shift-enter": "pane::TogglePinTab"
+    }
+  },
+  // Bindings from VS Code
+  {
+    "context": "Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-[": "editor::Outdent",
+      "ctrl-]": "editor::Indent",
+      "ctrl-shift-alt-up": "editor::AddSelectionAbove", // Insert Cursor Above
+      "ctrl-shift-alt-down": "editor::AddSelectionBelow", // Insert Cursor Below
+      "ctrl-shift-k": "editor::DeleteLine",
+      "alt-up": "editor::MoveLineUp",
+      "alt-down": "editor::MoveLineDown",
+      "shift-alt-up": "editor::DuplicateLineUp",
+      "shift-alt-down": "editor::DuplicateLineDown",
+      "shift-alt-right": "editor::SelectLargerSyntaxNode", // Expand Selection
+      "shift-alt-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
+      "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
+      "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
+      "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
+      "ctrl-shift-down": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch
+      "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch
+      "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch  / find_under_expand_skip
+      "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
+      "ctrl-k ctrl-i": "editor::Hover",
+      "ctrl-k ctrl-b": "editor::BlameHover",
+      "ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }],
+      "f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
+      "shift-f8": ["editor::GoToPreviousDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
+      "f2": "editor::Rename",
+      "f12": "editor::GoToDefinition",
+      "alt-f12": "editor::GoToDefinitionSplit",
+      "ctrl-shift-f10": "editor::GoToDefinitionSplit",
+      "ctrl-f12": "editor::GoToImplementation",
+      "shift-f12": "editor::GoToTypeDefinition",
+      "ctrl-alt-f12": "editor::GoToTypeDefinitionSplit",
+      "shift-alt-f12": "editor::FindAllReferences",
+      "ctrl-m": "editor::MoveToEnclosingBracket", // from jetbrains
+      "ctrl-shift-\\": "editor::MoveToEnclosingBracket",
+      "ctrl-shift-[": "editor::Fold",
+      "ctrl-shift-]": "editor::UnfoldLines",
+      "ctrl-k ctrl-l": "editor::ToggleFold",
+      "ctrl-k ctrl-[": "editor::FoldRecursive",
+      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
+      "ctrl-k ctrl-1": ["editor::FoldAtLevel", 1],
+      "ctrl-k ctrl-2": ["editor::FoldAtLevel", 2],
+      "ctrl-k ctrl-3": ["editor::FoldAtLevel", 3],
+      "ctrl-k ctrl-4": ["editor::FoldAtLevel", 4],
+      "ctrl-k ctrl-5": ["editor::FoldAtLevel", 5],
+      "ctrl-k ctrl-6": ["editor::FoldAtLevel", 6],
+      "ctrl-k ctrl-7": ["editor::FoldAtLevel", 7],
+      "ctrl-k ctrl-8": ["editor::FoldAtLevel", 8],
+      "ctrl-k ctrl-9": ["editor::FoldAtLevel", 9],
+      "ctrl-k ctrl-0": "editor::FoldAll",
+      "ctrl-k ctrl-j": "editor::UnfoldAll",
+      "ctrl-space": "editor::ShowCompletions",
+      "ctrl-shift-space": "editor::ShowWordCompletions",
+      "ctrl-.": "editor::ToggleCodeActions",
+      "ctrl-k r": "editor::RevealInFileManager",
+      "ctrl-k p": "editor::CopyPath",
+      "ctrl-\\": "pane::SplitRight",
+      "ctrl-shift-alt-c": "editor::DisplayCursorNames",
+      "alt-.": "editor::GoToHunk",
+      "alt-,": "editor::GoToPreviousHunk"
+    }
+  },
+  {
+    "context": "Editor && extension == md",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-k v": "markdown::OpenPreviewToTheSide",
+      "ctrl-shift-v": "markdown::OpenPreview"
+    }
+  },
+  {
+    "context": "Editor && extension == svg",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-k v": "svg::OpenPreviewToTheSide",
+      "ctrl-shift-v": "svg::OpenPreview"
+    }
+  },
+  {
+    "context": "Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-o": "outline::Toggle",
+      "ctrl-g": "go_to_line::Toggle"
+    }
+  },
+  {
+    "context": "Workspace",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-open": ["projects::OpenRecent", { "create_new_window": false }],
+      // Change the default action on `menu::Confirm` by setting the parameter
+      // "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
+      "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
+      "shift-alt-open": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
+      // Change to open path modal for existing remote connection by setting the parameter
+      // "ctrl-shift-alt-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
+      "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
+      "shift-alt-b": "branches::OpenRecent",
+      "shift-alt-enter": "toast::RunAction",
+      "ctrl-shift-`": "workspace::NewTerminal",
+      "save": "workspace::Save",
+      "ctrl-s": "workspace::Save",
+      "ctrl-k ctrl-shift-s": "workspace::SaveWithoutFormat",
+      "shift-save": "workspace::SaveAs",
+      "ctrl-shift-s": "workspace::SaveAs",
+      "new": "workspace::NewFile",
+      "ctrl-n": "workspace::NewFile",
+      "shift-new": "workspace::NewWindow",
+      "ctrl-shift-n": "workspace::NewWindow",
+      "ctrl-`": "terminal_panel::ToggleFocus",
+      "f10": ["app_menu::OpenApplicationMenu", "Zed"],
+      "alt-1": ["workspace::ActivatePane", 0],
+      "alt-2": ["workspace::ActivatePane", 1],
+      "alt-3": ["workspace::ActivatePane", 2],
+      "alt-4": ["workspace::ActivatePane", 3],
+      "alt-5": ["workspace::ActivatePane", 4],
+      "alt-6": ["workspace::ActivatePane", 5],
+      "alt-7": ["workspace::ActivatePane", 6],
+      "alt-8": ["workspace::ActivatePane", 7],
+      "alt-9": ["workspace::ActivatePane", 8],
+      "ctrl-alt-b": "workspace::ToggleRightDock",
+      "ctrl-b": "workspace::ToggleLeftDock",
+      "ctrl-j": "workspace::ToggleBottomDock",
+      "ctrl-shift-y": "workspace::CloseAllDocks",
+      "alt-r": "workspace::ResetActiveDockSize",
+      // For 0px parameter, uses UI font size value.
+      "shift-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
+      "shift-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
+      "shift-alt-0": "workspace::ResetOpenDocksSize",
+      "ctrl-shift-alt--": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
+      "ctrl-shift-alt-=": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
+      "shift-find": "pane::DeploySearch",
+      "ctrl-shift-f": "pane::DeploySearch",
+      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
+      "ctrl-shift-t": "pane::ReopenClosedItem",
+      "ctrl-k ctrl-s": "zed::OpenKeymapEditor",
+      "ctrl-k ctrl-t": "theme_selector::Toggle",
+      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
+      "ctrl-t": "project_symbols::Toggle",
+      "ctrl-p": "file_finder::Toggle",
+      "ctrl-tab": "tab_switcher::Toggle",
+      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
+      "ctrl-e": "file_finder::Toggle",
+      "f1": "command_palette::Toggle",
+      "ctrl-shift-p": "command_palette::Toggle",
+      "ctrl-shift-m": "diagnostics::Deploy",
+      "ctrl-shift-e": "project_panel::ToggleFocus",
+      "ctrl-shift-b": "outline_panel::ToggleFocus",
+      "ctrl-shift-g": "git_panel::ToggleFocus",
+      "ctrl-shift-d": "debug_panel::ToggleFocus",
+      "ctrl-shift-/": "agent::ToggleFocus",
+      "alt-save": "workspace::SaveAll",
+      "ctrl-k s": "workspace::SaveAll",
+      "ctrl-k m": "language_selector::Toggle",
+      "escape": "workspace::Unfollow",
+      "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
+      "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
+      "ctrl-k ctrl-up": "workspace::ActivatePaneUp",
+      "ctrl-k ctrl-down": "workspace::ActivatePaneDown",
+      "ctrl-k shift-left": "workspace::SwapPaneLeft",
+      "ctrl-k shift-right": "workspace::SwapPaneRight",
+      "ctrl-k shift-up": "workspace::SwapPaneUp",
+      "ctrl-k shift-down": "workspace::SwapPaneDown",
+      "ctrl-shift-x": "zed::Extensions",
+      "ctrl-shift-r": "task::Rerun",
+      "alt-t": "task::Rerun",
+      "shift-alt-t": "task::Spawn",
+      "shift-alt-r": ["task::Spawn", { "reveal_target": "center" }],
+      // also possible to spawn tasks by name:
+      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
+      // or by tag:
+      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
+      "f5": "debugger::Rerun",
+      "ctrl-f4": "workspace::CloseActiveDock",
+      "ctrl-w": "workspace::CloseActiveDock"
+    }
+  },
+  {
+    "context": "Workspace && debugger_running",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "zed::NoAction"
+    }
+  },
+  {
+    "context": "Workspace && debugger_stopped",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "debugger::Continue"
+    }
+  },
+  {
+    "context": "ApplicationMenu",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f10": "menu::Cancel",
+      "left": "app_menu::ActivateMenuLeft",
+      "right": "app_menu::ActivateMenuRight"
+    }
+  },
+  // Bindings from Sublime Text
+  {
+    "context": "Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-u": "editor::UndoSelection",
+      "ctrl-shift-u": "editor::RedoSelection",
+      "ctrl-shift-j": "editor::JoinLines",
+      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
+      "shift-alt-h": "editor::DeleteToPreviousSubwordStart",
+      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
+      "shift-alt-d": "editor::DeleteToNextSubwordEnd",
+      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
+      "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
+      "ctrl-shift-alt-left": "editor::SelectToPreviousSubwordStart",
+      "ctrl-shift-alt-right": "editor::SelectToNextSubwordEnd"
+    }
+  },
+  // Bindings from Atom
+  {
+    "context": "Pane",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-k up": "pane::SplitUp",
+      "ctrl-k down": "pane::SplitDown",
+      "ctrl-k left": "pane::SplitLeft",
+      "ctrl-k right": "pane::SplitRight"
+    }
+  },
+  // Bindings that should be unified with bindings for more general actions
+  {
+    "context": "Editor && renaming",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "editor::ConfirmRename"
+    }
+  },
+  {
+    "context": "Editor && showing_completions",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "editor::ConfirmCompletion",
+      "shift-enter": "editor::ConfirmCompletionReplace",
+      "tab": "editor::ComposeCompletion"
+    }
+  },
+  // Bindings for accepting edit predictions
+  //
+  // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This is
+  // because alt-tab may not be available, as it is often used for window switching.
+  {
+    "context": "Editor && edit_prediction",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-tab": "editor::AcceptEditPrediction",
+      "alt-l": "editor::AcceptEditPrediction",
+      "tab": "editor::AcceptEditPrediction",
+      "alt-right": "editor::AcceptPartialEditPrediction"
+    }
+  },
+  {
+    "context": "Editor && edit_prediction_conflict",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-tab": "editor::AcceptEditPrediction",
+      "alt-l": "editor::AcceptEditPrediction",
+      "alt-right": "editor::AcceptPartialEditPrediction"
+    }
+  },
+  {
+    "context": "Editor && showing_code_actions",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "editor::ConfirmCodeAction"
+    }
+  },
+  {
+    "context": "Editor && (showing_code_actions || showing_completions)",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-p": "editor::ContextMenuPrevious",
+      "up": "editor::ContextMenuPrevious",
+      "ctrl-n": "editor::ContextMenuNext",
+      "down": "editor::ContextMenuNext",
+      "pageup": "editor::ContextMenuFirst",
+      "pagedown": "editor::ContextMenuLast"
+    }
+  },
+  {
+    "context": "Editor && showing_signature_help && !showing_completions",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "editor::SignatureHelpPrevious",
+      "down": "editor::SignatureHelpNext"
+    }
+  },
+  // Custom bindings
+  {
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-alt-f": "workspace::FollowNextCollaborator",
+      // Only available in debug builds: opens an element inspector for development.
+      "shift-alt-i": "dev::ToggleInspector"
+    }
+  },
+  {
+    "context": "!Terminal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-c": "collab_panel::ToggleFocus"
+    }
+  },
+  {
+    "context": "!ContextEditor > Editor && mode == full",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-enter": "editor::OpenExcerpts",
+      "shift-enter": "editor::ExpandExcerpts",
+      "ctrl-alt-enter": "editor::OpenExcerptsSplit",
+      "ctrl-shift-e": "pane::RevealInProjectPanel",
+      "ctrl-f8": "editor::GoToHunk",
+      "ctrl-shift-f8": "editor::GoToPreviousHunk",
+      "ctrl-enter": "assistant::InlineAssist",
+      "ctrl-shift-;": "editor::ToggleInlayHints"
+    }
+  },
+  {
+    "context": "PromptEditor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-[": "agent::CyclePreviousInlineAssist",
+      "ctrl-]": "agent::CycleNextInlineAssist",
+      "shift-alt-e": "agent::RemoveAllContext"
+    }
+  },
+  {
+    "context": "Prompt",
+    "use_key_equivalents": true,
+    "bindings": {
+      "left": "menu::SelectPrevious",
+      "right": "menu::SelectNext",
+      "h": "menu::SelectPrevious",
+      "l": "menu::SelectNext"
+    }
+  },
+  {
+    "context": "ProjectSearchBar && !in_replace",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "project_search::SearchInNew"
+    }
+  },
+  {
+    "context": "OutlinePanel && not_editing",
+    "use_key_equivalents": true,
+    "bindings": {
+      "left": "outline_panel::CollapseSelectedEntry",
+      "right": "outline_panel::ExpandSelectedEntry",
+      "alt-copy": "outline_panel::CopyPath",
+      "shift-alt-c": "outline_panel::CopyPath",
+      "shift-alt-copy": "workspace::CopyRelativePath",
+      "ctrl-shift-alt-c": "workspace::CopyRelativePath",
+      "ctrl-alt-r": "outline_panel::RevealInFileManager",
+      "space": "outline_panel::OpenSelectedEntry",
+      "shift-down": "menu::SelectNext",
+      "shift-up": "menu::SelectPrevious",
+      "alt-enter": "editor::OpenExcerpts",
+      "ctrl-alt-enter": "editor::OpenExcerptsSplit"
+    }
+  },
+  {
+    "context": "ProjectPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "left": "project_panel::CollapseSelectedEntry",
+      "right": "project_panel::ExpandSelectedEntry",
+      "new": "project_panel::NewFile",
+      "ctrl-n": "project_panel::NewFile",
+      "alt-new": "project_panel::NewDirectory",
+      "alt-n": "project_panel::NewDirectory",
+      "cut": "project_panel::Cut",
+      "ctrl-x": "project_panel::Cut",
+      "copy": "project_panel::Copy",
+      "ctrl-insert": "project_panel::Copy",
+      "ctrl-c": "project_panel::Copy",
+      "paste": "project_panel::Paste",
+      "shift-insert": "project_panel::Paste",
+      "ctrl-v": "project_panel::Paste",
+      "alt-copy": "project_panel::CopyPath",
+      "shift-alt-c": "project_panel::CopyPath",
+      "shift-alt-copy": "workspace::CopyRelativePath",
+      "ctrl-k ctrl-shift-c": "workspace::CopyRelativePath",
+      "enter": "project_panel::Rename",
+      "f2": "project_panel::Rename",
+      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
+      "delete": ["project_panel::Trash", { "skip_prompt": false }],
+      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
+      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
+      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
+      "ctrl-alt-r": "project_panel::RevealInFileManager",
+      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "alt-d": "project_panel::CompareMarkedFiles",
+      "shift-find": "project_panel::NewSearchInDirectory",
+      "ctrl-k ctrl-shift-f": "project_panel::NewSearchInDirectory",
+      "shift-down": "menu::SelectNext",
+      "shift-up": "menu::SelectPrevious",
+      "escape": "menu::Cancel"
+    }
+  },
+  {
+    "context": "ProjectPanel && not_editing",
+    "use_key_equivalents": true,
+    "bindings": {
+      "space": "project_panel::Open"
+    }
+  },
+  {
+    "context": "GitPanel && ChangesList",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "menu::SelectPrevious",
+      "down": "menu::SelectNext",
+      "enter": "menu::Confirm",
+      "alt-y": "git::StageFile",
+      "shift-alt-y": "git::UnstageFile",
+      "space": "git::ToggleStaged",
+      "shift-space": "git::StageRange",
+      "tab": "git_panel::FocusEditor",
+      "shift-tab": "git_panel::FocusEditor",
+      "escape": "git_panel::ToggleFocus",
+      "alt-enter": "menu::SecondaryConfirm",
+      "delete": ["git::RestoreFile", { "skip_prompt": false }],
+      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
+      "shift-delete": ["git::RestoreFile", { "skip_prompt": false }],
+      "ctrl-backspace": ["git::RestoreFile", { "skip_prompt": false }],
+      "ctrl-delete": ["git::RestoreFile", { "skip_prompt": false }]
+    }
+  },
+  {
+    "context": "GitPanel && CommitEditor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "git::Cancel"
+    }
+  },
+  {
+    "context": "GitCommit > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "editor::Newline",
+      "ctrl-enter": "git::Commit",
+      "ctrl-shift-enter": "git::Amend",
+      "alt-l": "git::GenerateCommitMessage"
+    }
+  },
+  {
+    "context": "GitPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-g ctrl-g": "git::Fetch",
+      "ctrl-g up": "git::Push",
+      "ctrl-g down": "git::Pull",
+      "ctrl-g shift-up": "git::ForcePush",
+      "ctrl-g d": "git::Diff",
+      "ctrl-g backspace": "git::RestoreTrackedFiles",
+      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
+      "ctrl-space": "git::StageAll",
+      "ctrl-shift-space": "git::UnstageAll",
+      "ctrl-enter": "git::Commit",
+      "ctrl-shift-enter": "git::Amend"
+    }
+  },
+  {
+    "context": "GitDiff > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "git::Commit",
+      "ctrl-shift-enter": "git::Amend",
+      "ctrl-space": "git::StageAll",
+      "ctrl-shift-space": "git::UnstageAll"
+    }
+  },
+  {
+    "context": "AskPass > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "menu::Confirm"
+    }
+  },
+  {
+    "context": "CommitEditor > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "git_panel::FocusChanges",
+      "tab": "git_panel::FocusChanges",
+      "shift-tab": "git_panel::FocusChanges",
+      "enter": "editor::Newline",
+      "ctrl-enter": "git::Commit",
+      "ctrl-shift-enter": "git::Amend",
+      "alt-up": "git_panel::FocusChanges",
+      "alt-l": "git::GenerateCommitMessage"
+    }
+  },
+  {
+    "context": "DebugPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-t": "debugger::ToggleThreadPicker",
+      "ctrl-i": "debugger::ToggleSessionPicker",
+      "shift-alt-escape": "debugger::ToggleExpandItem"
+    }
+  },
+  {
+    "context": "VariableList",
+    "use_key_equivalents": true,
+    "bindings": {
+      "left": "variable_list::CollapseSelectedEntry",
+      "right": "variable_list::ExpandSelectedEntry",
+      "enter": "variable_list::EditVariable",
+      "ctrl-c": "variable_list::CopyVariableValue",
+      "ctrl-alt-c": "variable_list::CopyVariableName",
+      "delete": "variable_list::RemoveWatch",
+      "backspace": "variable_list::RemoveWatch",
+      "alt-enter": "variable_list::AddWatch"
+    }
+  },
+  {
+    "context": "BreakpointList",
+    "use_key_equivalents": true,
+    "bindings": {
+      "space": "debugger::ToggleEnableBreakpoint",
+      "backspace": "debugger::UnsetBreakpoint",
+      "left": "debugger::PreviousBreakpointProperty",
+      "right": "debugger::NextBreakpointProperty"
+    }
+  },
+  {
+    "context": "CollabPanel && not_editing",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-backspace": "collab_panel::Remove",
+      "space": "menu::Confirm"
+    }
+  },
+  {
+    "context": "CollabPanel",
+    "use_key_equivalents": true,
+    "bindings": {
+      "alt-up": "collab_panel::MoveChannelUp",
+      "alt-down": "collab_panel::MoveChannelDown"
+    }
+  },
+  {
+    "context": "(CollabPanel && editing) > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "space": "collab_panel::InsertSpace"
+    }
+  },
+  {
+    "context": "ChannelModal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "tab": "channel_modal::ToggleMode"
+    }
+  },
+  {
+    "context": "Picker > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "up": "menu::SelectPrevious",
+      "down": "menu::SelectNext",
+      "tab": "picker::ConfirmCompletion",
+      "alt-enter": ["picker::ConfirmInput", { "secondary": false }]
+    }
+  },
+  {
+    "context": "ChannelModal > Picker > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "tab": "channel_modal::ToggleMode"
+    }
+  },
+  {
+    "context": "FileFinder || (FileFinder > Picker > Editor)",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-p": "file_finder::Toggle",
+      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
+      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
+    }
+  },
+  {
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-p": "file_finder::SelectPrevious",
+      "ctrl-j": "pane::SplitDown",
+      "ctrl-k": "pane::SplitUp",
+      "ctrl-h": "pane::SplitLeft",
+      "ctrl-l": "pane::SplitRight"
+    }
+  },
+  {
+    "context": "TabSwitcher",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-tab": "menu::SelectPrevious",
+      "ctrl-up": "menu::SelectPrevious",
+      "ctrl-down": "menu::SelectNext",
+      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
+    }
+  },
+  {
+    "context": "Terminal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-alt-space": "terminal::ShowCharacterPalette",
+      "copy": "terminal::Copy",
+      "ctrl-insert": "terminal::Copy",
+      "ctrl-shift-c": "terminal::Copy",
+      "paste": "terminal::Paste",
+      "shift-insert": "terminal::Paste",
+      "ctrl-shift-v": "terminal::Paste",
+      "ctrl-enter": "assistant::InlineAssist",
+      "alt-b": ["terminal::SendText", "\u001bb"],
+      "alt-f": ["terminal::SendText", "\u001bf"],
+      "alt-.": ["terminal::SendText", "\u001b."],
+      "ctrl-delete": ["terminal::SendText", "\u001bd"],
+      // Overrides for conflicting keybindings
+      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
+      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
+      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
+      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
+      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
+      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
+      "ctrl-shift-a": "editor::SelectAll",
+      "find": "buffer_search::Deploy",
+      "ctrl-shift-f": "buffer_search::Deploy",
+      "ctrl-shift-l": "terminal::Clear",
+      "ctrl-shift-w": "pane::CloseActiveItem",
+      "up": ["terminal::SendKeystroke", "up"],
+      "pageup": ["terminal::SendKeystroke", "pageup"],
+      "down": ["terminal::SendKeystroke", "down"],
+      "pagedown": ["terminal::SendKeystroke", "pagedown"],
+      "escape": ["terminal::SendKeystroke", "escape"],
+      "enter": ["terminal::SendKeystroke", "enter"],
+      "shift-pageup": "terminal::ScrollPageUp",
+      "shift-pagedown": "terminal::ScrollPageDown",
+      "shift-up": "terminal::ScrollLineUp",
+      "shift-down": "terminal::ScrollLineDown",
+      "shift-home": "terminal::ScrollToTop",
+      "shift-end": "terminal::ScrollToBottom",
+      "ctrl-shift-space": "terminal::ToggleViMode",
+      "ctrl-shift-r": "terminal::RerunTask",
+      "ctrl-alt-r": "terminal::RerunTask",
+      "alt-t": "terminal::RerunTask"
+    }
+  },
+  {
+    "context": "ZedPredictModal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel"
+    }
+  },
+  {
+    "context": "ConfigureContextServerModal > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "editor::Newline",
+      "ctrl-enter": "menu::Confirm"
+    }
+  },
+  {
+    "context": "OnboardingAiConfigurationModal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel"
+    }
+  },
+  {
+    "context": "Diagnostics",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
+    }
+  },
+  {
+    "context": "DebugConsole > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "menu::Confirm",
+      "alt-enter": "console::WatchExpression"
+    }
+  },
+  {
+    "context": "RunModal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-tab": "pane::ActivateNextItem",
+      "ctrl-shift-tab": "pane::ActivatePreviousItem"
+    }
+  },
+  {
+    "context": "MarkdownPreview",
+    "use_key_equivalents": true,
+    "bindings": {
+      "pageup": "markdown::MovePageUp",
+      "pagedown": "markdown::MovePageDown"
+    }
+  },
+  {
+    "context": "KeymapEditor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-f": "search::FocusSearch",
+      "alt-find": "keymap_editor::ToggleKeystrokeSearch",
+      "alt-f": "keymap_editor::ToggleKeystrokeSearch",
+      "alt-c": "keymap_editor::ToggleConflictFilter",
+      "enter": "keymap_editor::EditBinding",
+      "alt-enter": "keymap_editor::CreateBinding",
+      "ctrl-c": "keymap_editor::CopyAction",
+      "ctrl-shift-c": "keymap_editor::CopyContext",
+      "ctrl-t": "keymap_editor::ShowMatchingKeybinds"
+    }
+  },
+  {
+    "context": "KeystrokeInput",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "keystroke_input::StartRecording",
+      "escape escape escape": "keystroke_input::StopRecording",
+      "delete": "keystroke_input::ClearKeystrokes"
+    }
+  },
+  {
+    "context": "KeybindEditorModal",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-enter": "menu::Confirm",
+      "escape": "menu::Cancel"
+    }
+  },
+  {
+    "context": "KeybindEditorModal > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "up": "menu::SelectPrevious",
+      "down": "menu::SelectNext"
+    }
+  },
+  {
+    "context": "Onboarding",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-1": "onboarding::ActivateBasicsPage",
+      "ctrl-2": "onboarding::ActivateEditingPage",
+      "ctrl-3": "onboarding::ActivateAISetupPage",
+      "ctrl-escape": "onboarding::Finish",
+      "alt-tab": "onboarding::SignIn",
+      "shift-alt-a": "onboarding::OpenAccount"
+    }
+  }
+]
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
index c900eb692a..c8c3dc54b7 100644
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@@ -19,6 +19,10 @@ static KEYMAP_LINUX: LazyLock<KeymapFile> = LazyLock::new(|| {
     load_keymap("keymaps/default-linux.json").expect("Failed to load Linux keymap")
 });
 
+static KEYMAP_WINDOWS: LazyLock<KeymapFile> = LazyLock::new(|| {
+    load_keymap("keymaps/default-windows.json").expect("Failed to load Windows keymap")
+});
+
 static ALL_ACTIONS: LazyLock<Vec<ActionDef>> = LazyLock::new(dump_all_gpui_actions);
 
 const FRONT_MATTER_COMMENT: &str = "<!-- ZED_META {} -->";
@@ -216,6 +220,7 @@ fn find_binding(os: &str, action: &str) -> Option<String> {
     let keymap = match os {
         "macos" => &KEYMAP_MACOS,
         "linux" | "freebsd" => &KEYMAP_LINUX,
+        "windows" => &KEYMAP_WINDOWS,
         _ => unreachable!("Not a valid OS: {}", os),
     };
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 29e009fdf8..80680ae9c0 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2588,7 +2588,7 @@ impl Editor {
                 || binding
                     .keystrokes()
                     .first()
-                    .is_some_and(|keystroke| keystroke.modifiers.modified())
+                    .is_some_and(|keystroke| keystroke.display_modifiers.modified())
         }))
     }
 
@@ -7686,16 +7686,16 @@ impl Editor {
             .keystroke()
         {
             modifiers_held = modifiers_held
-                || (&accept_keystroke.modifiers == modifiers
-                    && accept_keystroke.modifiers.modified());
+                || (&accept_keystroke.display_modifiers == modifiers
+                    && accept_keystroke.display_modifiers.modified());
         };
         if let Some(accept_partial_keystroke) = self
             .accept_edit_prediction_keybind(true, window, cx)
             .keystroke()
         {
             modifiers_held = modifiers_held
-                || (&accept_partial_keystroke.modifiers == modifiers
-                    && accept_partial_keystroke.modifiers.modified());
+                || (&accept_partial_keystroke.display_modifiers == modifiers
+                    && accept_partial_keystroke.display_modifiers.modified());
         }
 
         if modifiers_held {
@@ -9044,7 +9044,7 @@ impl Editor {
 
         let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
 
-        let modifiers_color = if accept_keystroke.modifiers == window.modifiers() {
+        let modifiers_color = if accept_keystroke.display_modifiers == window.modifiers() {
             Color::Accent
         } else {
             Color::Muted
@@ -9056,19 +9056,19 @@ impl Editor {
             .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
             .text_size(TextSize::XSmall.rems(cx))
             .child(h_flex().children(ui::render_modifiers(
-                &accept_keystroke.modifiers,
+                &accept_keystroke.display_modifiers,
                 PlatformStyle::platform(),
                 Some(modifiers_color),
                 Some(IconSize::XSmall.rems().into()),
                 true,
             )))
             .when(is_platform_style_mac, |parent| {
-                parent.child(accept_keystroke.key.clone())
+                parent.child(accept_keystroke.display_key.clone())
             })
             .when(!is_platform_style_mac, |parent| {
                 parent.child(
                     Key::new(
-                        util::capitalize(&accept_keystroke.key),
+                        util::capitalize(&accept_keystroke.display_key),
                         Some(Color::Default),
                     )
                     .size(Some(IconSize::XSmall.rems().into())),
@@ -9171,7 +9171,7 @@ impl Editor {
         max_width: Pixels,
         cursor_point: Point,
         style: &EditorStyle,
-        accept_keystroke: Option<&gpui::Keystroke>,
+        accept_keystroke: Option<&gpui::KeybindingKeystroke>,
         _window: &Window,
         cx: &mut Context<Editor>,
     ) -> Option<AnyElement> {
@@ -9249,7 +9249,7 @@ impl Editor {
                                         accept_keystroke.as_ref(),
                                         |el, accept_keystroke| {
                                             el.child(h_flex().children(ui::render_modifiers(
-                                                &accept_keystroke.modifiers,
+                                                &accept_keystroke.display_modifiers,
                                                 PlatformStyle::platform(),
                                                 Some(Color::Default),
                                                 Some(IconSize::XSmall.rems().into()),
@@ -9319,7 +9319,7 @@ impl Editor {
                         .child(completion),
                 )
                 .when_some(accept_keystroke, |el, accept_keystroke| {
-                    if !accept_keystroke.modifiers.modified() {
+                    if !accept_keystroke.display_modifiers.modified() {
                         return el;
                     }
 
@@ -9338,7 +9338,7 @@ impl Editor {
                                     .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
                                     .when(is_platform_style_mac, |parent| parent.gap_1())
                                     .child(h_flex().children(ui::render_modifiers(
-                                        &accept_keystroke.modifiers,
+                                        &accept_keystroke.display_modifiers,
                                         PlatformStyle::platform(),
                                         Some(if !has_completion {
                                             Color::Muted
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 4f3580da07..91034829f7 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -43,10 +43,10 @@ use gpui::{
     Bounds, ClickEvent, ClipboardItem, ContentMask, Context, Corner, Corners, CursorStyle,
     DispatchPhase, Edges, Element, ElementInputHandler, Entity, Focusable as _, FontId,
     GlobalElementId, Hitbox, HitboxBehavior, Hsla, InteractiveElement, IntoElement, IsZero,
-    Keystroke, Length, ModifiersChangedEvent, MouseButton, MouseClickEvent, MouseDownEvent,
-    MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta, ScrollHandle,
-    ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled,
-    TextRun, TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill,
+    KeybindingKeystroke, Length, ModifiersChangedEvent, MouseButton, MouseClickEvent,
+    MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta,
+    ScrollHandle, ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement,
+    Style, Styled, TextRun, TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill,
     linear_color_stop, linear_gradient, outline, point, px, quad, relative, size, solid_background,
     transparent_black,
 };
@@ -7150,7 +7150,7 @@ fn header_jump_data(
 pub struct AcceptEditPredictionBinding(pub(crate) Option<gpui::KeyBinding>);
 
 impl AcceptEditPredictionBinding {
-    pub fn keystroke(&self) -> Option<&Keystroke> {
+    pub fn keystroke(&self) -> Option<&KeybindingKeystroke> {
         if let Some(binding) = self.0.as_ref() {
             match &binding.keystrokes() {
                 [keystroke, ..] => Some(keystroke),
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index bbd59fa7bc..b59d7e717a 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -37,10 +37,10 @@ use crate::{
     AssetSource, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DispatchPhase, DisplayId,
     EventEmitter, FocusHandle, FocusMap, ForegroundExecutor, Global, KeyBinding, KeyContext,
     Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
-    PlatformDisplay, PlatformKeyboardLayout, Point, PromptBuilder, PromptButton, PromptHandle,
-    PromptLevel, Render, RenderImage, RenderablePromptHandle, Reservation, ScreenCaptureSource,
-    SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, Window, WindowAppearance,
-    WindowHandle, WindowId, WindowInvalidator,
+    PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper, Point, PromptBuilder,
+    PromptButton, PromptHandle, PromptLevel, Render, RenderImage, RenderablePromptHandle,
+    Reservation, ScreenCaptureSource, SubscriberSet, Subscription, SvgRenderer, Task, TextSystem,
+    Window, WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
     colors::{Colors, GlobalColors},
     current_platform, hash, init_app_menus,
 };
@@ -263,6 +263,7 @@ pub struct App {
     pub(crate) focus_handles: Arc<FocusMap>,
     pub(crate) keymap: Rc<RefCell<Keymap>>,
     pub(crate) keyboard_layout: Box<dyn PlatformKeyboardLayout>,
+    pub(crate) keyboard_mapper: Rc<dyn PlatformKeyboardMapper>,
     pub(crate) global_action_listeners:
         FxHashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
     pending_effects: VecDeque<Effect>,
@@ -312,6 +313,7 @@ impl App {
         let text_system = Arc::new(TextSystem::new(platform.text_system()));
         let entities = EntityMap::new();
         let keyboard_layout = platform.keyboard_layout();
+        let keyboard_mapper = platform.keyboard_mapper();
 
         let app = Rc::new_cyclic(|this| AppCell {
             app: RefCell::new(App {
@@ -337,6 +339,7 @@ impl App {
                 focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
                 keymap: Rc::new(RefCell::new(Keymap::default())),
                 keyboard_layout,
+                keyboard_mapper,
                 global_action_listeners: FxHashMap::default(),
                 pending_effects: VecDeque::new(),
                 pending_notifications: FxHashSet::default(),
@@ -376,6 +379,7 @@ impl App {
                 if let Some(app) = app.upgrade() {
                     let cx = &mut app.borrow_mut();
                     cx.keyboard_layout = cx.platform.keyboard_layout();
+                    cx.keyboard_mapper = cx.platform.keyboard_mapper();
                     cx.keyboard_layout_observers
                         .clone()
                         .retain(&(), move |callback| (callback)(cx));
@@ -424,6 +428,11 @@ impl App {
         self.keyboard_layout.as_ref()
     }
 
+    /// Get the current keyboard mapper.
+    pub fn keyboard_mapper(&self) -> &Rc<dyn PlatformKeyboardMapper> {
+        &self.keyboard_mapper
+    }
+
     /// Invokes a handler when the current keyboard layout changes
     pub fn on_keyboard_layout_change<F>(&self, mut callback: F) -> Subscription
     where
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index 757205fcc3..b3db09d821 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -4,7 +4,7 @@ mod context;
 pub use binding::*;
 pub use context::*;
 
-use crate::{Action, Keystroke, is_no_action};
+use crate::{Action, AsKeystroke, Keystroke, is_no_action};
 use collections::{HashMap, HashSet};
 use smallvec::SmallVec;
 use std::any::TypeId;
@@ -141,7 +141,7 @@ impl Keymap {
     /// only.
     pub fn bindings_for_input(
         &self,
-        input: &[Keystroke],
+        input: &[impl AsKeystroke],
         context_stack: &[KeyContext],
     ) -> (SmallVec<[KeyBinding; 1]>, bool) {
         let mut matched_bindings = SmallVec::<[(usize, BindingIndex, &KeyBinding); 1]>::new();
@@ -192,7 +192,6 @@ impl Keymap {
 
         (bindings, !pending.is_empty())
     }
-
     /// Check if the given binding is enabled, given a certain key context.
     /// Returns the deepest depth at which the binding matches, or None if it doesn't match.
     fn binding_enabled(&self, binding: &KeyBinding, contexts: &[KeyContext]) -> Option<usize> {
@@ -639,7 +638,7 @@ mod tests {
         fn assert_bindings(keymap: &Keymap, action: &dyn Action, expected: &[&str]) {
             let actual = keymap
                 .bindings_for_action(action)
-                .map(|binding| binding.keystrokes[0].unparse())
+                .map(|binding| binding.keystrokes[0].inner.unparse())
                 .collect::<Vec<_>>();
             assert_eq!(actual, expected, "{:?}", action);
         }
diff --git a/crates/gpui/src/keymap/binding.rs b/crates/gpui/src/keymap/binding.rs
index 729498d153..a7cf9d5c54 100644
--- a/crates/gpui/src/keymap/binding.rs
+++ b/crates/gpui/src/keymap/binding.rs
@@ -1,14 +1,15 @@
 use std::rc::Rc;
 
-use collections::HashMap;
-
-use crate::{Action, InvalidKeystrokeError, KeyBindingContextPredicate, Keystroke, SharedString};
+use crate::{
+    Action, AsKeystroke, DummyKeyboardMapper, InvalidKeystrokeError, KeyBindingContextPredicate,
+    KeybindingKeystroke, Keystroke, PlatformKeyboardMapper, SharedString,
+};
 use smallvec::SmallVec;
 
 /// A keybinding and its associated metadata, from the keymap.
 pub struct KeyBinding {
     pub(crate) action: Box<dyn Action>,
-    pub(crate) keystrokes: SmallVec<[Keystroke; 2]>,
+    pub(crate) keystrokes: SmallVec<[KeybindingKeystroke; 2]>,
     pub(crate) context_predicate: Option<Rc<KeyBindingContextPredicate>>,
     pub(crate) meta: Option<KeyBindingMetaIndex>,
     /// The json input string used when building the keybinding, if any
@@ -32,7 +33,15 @@ impl KeyBinding {
     pub fn new<A: Action>(keystrokes: &str, action: A, context: Option<&str>) -> Self {
         let context_predicate =
             context.map(|context| KeyBindingContextPredicate::parse(context).unwrap().into());
-        Self::load(keystrokes, Box::new(action), context_predicate, None, None).unwrap()
+        Self::load(
+            keystrokes,
+            Box::new(action),
+            context_predicate,
+            false,
+            None,
+            &DummyKeyboardMapper,
+        )
+        .unwrap()
     }
 
     /// Load a keybinding from the given raw data.
@@ -40,24 +49,22 @@ impl KeyBinding {
         keystrokes: &str,
         action: Box<dyn Action>,
         context_predicate: Option<Rc<KeyBindingContextPredicate>>,
-        key_equivalents: Option<&HashMap<char, char>>,
+        use_key_equivalents: bool,
         action_input: Option<SharedString>,
+        keyboard_mapper: &dyn PlatformKeyboardMapper,
     ) -> std::result::Result<Self, InvalidKeystrokeError> {
-        let mut keystrokes: SmallVec<[Keystroke; 2]> = keystrokes
+        let keystrokes: SmallVec<[KeybindingKeystroke; 2]> = keystrokes
             .split_whitespace()
-            .map(Keystroke::parse)
+            .map(|source| {
+                let keystroke = Keystroke::parse(source)?;
+                Ok(KeybindingKeystroke::new(
+                    keystroke,
+                    use_key_equivalents,
+                    keyboard_mapper,
+                ))
+            })
             .collect::<std::result::Result<_, _>>()?;
 
-        if let Some(equivalents) = key_equivalents {
-            for keystroke in keystrokes.iter_mut() {
-                if keystroke.key.chars().count() == 1
-                    && let Some(key) = equivalents.get(&keystroke.key.chars().next().unwrap())
-                {
-                    keystroke.key = key.to_string();
-                }
-            }
-        }
-
         Ok(Self {
             keystrokes,
             action,
@@ -79,13 +86,13 @@ impl KeyBinding {
     }
 
     /// Check if the given keystrokes match this binding.
-    pub fn match_keystrokes(&self, typed: &[Keystroke]) -> Option<bool> {
+    pub fn match_keystrokes(&self, typed: &[impl AsKeystroke]) -> Option<bool> {
         if self.keystrokes.len() < typed.len() {
             return None;
         }
 
         for (target, typed) in self.keystrokes.iter().zip(typed.iter()) {
-            if !typed.should_match(target) {
+            if !typed.as_keystroke().should_match(target) {
                 return None;
             }
         }
@@ -94,7 +101,7 @@ impl KeyBinding {
     }
 
     /// Get the keystrokes associated with this binding
-    pub fn keystrokes(&self) -> &[Keystroke] {
+    pub fn keystrokes(&self) -> &[KeybindingKeystroke] {
         self.keystrokes.as_slice()
     }
 
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 4d2feeaf1d..f64710bc56 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -231,7 +231,6 @@ pub(crate) trait Platform: 'static {
 
     fn on_quit(&self, callback: Box<dyn FnMut()>);
     fn on_reopen(&self, callback: Box<dyn FnMut()>);
-    fn on_keyboard_layout_change(&self, callback: Box<dyn FnMut()>);
 
     fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap);
     fn get_menus(&self) -> Option<Vec<OwnedMenu>> {
@@ -251,7 +250,6 @@ pub(crate) trait Platform: 'static {
     fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>);
     fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>);
     fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>);
-    fn keyboard_layout(&self) -> Box<dyn PlatformKeyboardLayout>;
 
     fn compositor_name(&self) -> &'static str {
         ""
@@ -272,6 +270,10 @@ pub(crate) trait Platform: 'static {
     fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Task<Result<()>>;
     fn read_credentials(&self, url: &str) -> Task<Result<Option<(String, Vec<u8>)>>>;
     fn delete_credentials(&self, url: &str) -> Task<Result<()>>;
+
+    fn keyboard_layout(&self) -> Box<dyn PlatformKeyboardLayout>;
+    fn keyboard_mapper(&self) -> Rc<dyn PlatformKeyboardMapper>;
+    fn on_keyboard_layout_change(&self, callback: Box<dyn FnMut()>);
 }
 
 /// A handle to a platform's display, e.g. a monitor or laptop screen.
diff --git a/crates/gpui/src/platform/keyboard.rs b/crates/gpui/src/platform/keyboard.rs
index e28d781520..10b8620258 100644
--- a/crates/gpui/src/platform/keyboard.rs
+++ b/crates/gpui/src/platform/keyboard.rs
@@ -1,3 +1,7 @@
+use collections::HashMap;
+
+use crate::{KeybindingKeystroke, Keystroke};
+
 /// A trait for platform-specific keyboard layouts
 pub trait PlatformKeyboardLayout {
     /// Get the keyboard layout ID, which should be unique to the layout
@@ -5,3 +9,33 @@ pub trait PlatformKeyboardLayout {
     /// Get the keyboard layout display name
     fn name(&self) -> &str;
 }
+
+/// A trait for platform-specific keyboard mappings
+pub trait PlatformKeyboardMapper {
+    /// Map a key equivalent to its platform-specific representation
+    fn map_key_equivalent(
+        &self,
+        keystroke: Keystroke,
+        use_key_equivalents: bool,
+    ) -> KeybindingKeystroke;
+    /// Get the key equivalents for the current keyboard layout,
+    /// only used on macOS
+    fn get_key_equivalents(&self) -> Option<&HashMap<char, char>>;
+}
+
+/// A dummy implementation of the platform keyboard mapper
+pub struct DummyKeyboardMapper;
+
+impl PlatformKeyboardMapper for DummyKeyboardMapper {
+    fn map_key_equivalent(
+        &self,
+        keystroke: Keystroke,
+        _use_key_equivalents: bool,
+    ) -> KeybindingKeystroke {
+        KeybindingKeystroke::from_keystroke(keystroke)
+    }
+
+    fn get_key_equivalents(&self) -> Option<&HashMap<char, char>> {
+        None
+    }
+}
diff --git a/crates/gpui/src/platform/keystroke.rs b/crates/gpui/src/platform/keystroke.rs
index 24601eefd6..6ce17c3a01 100644
--- a/crates/gpui/src/platform/keystroke.rs
+++ b/crates/gpui/src/platform/keystroke.rs
@@ -5,6 +5,14 @@ use std::{
     fmt::{Display, Write},
 };
 
+use crate::PlatformKeyboardMapper;
+
+/// This is a helper trait so that we can simplify the implementation of some functions
+pub trait AsKeystroke {
+    /// Returns the GPUI representation of the keystroke.
+    fn as_keystroke(&self) -> &Keystroke;
+}
+
 /// A keystroke and associated metadata generated by the platform
 #[derive(Clone, Debug, Eq, PartialEq, Default, Deserialize, Hash)]
 pub struct Keystroke {
@@ -24,6 +32,17 @@ pub struct Keystroke {
     pub key_char: Option<String>,
 }
 
+/// Represents a keystroke that can be used in keybindings and displayed to the user.
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub struct KeybindingKeystroke {
+    /// The GPUI representation of the keystroke.
+    pub inner: Keystroke,
+    /// The modifiers to display.
+    pub display_modifiers: Modifiers,
+    /// The key to display.
+    pub display_key: String,
+}
+
 /// Error type for `Keystroke::parse`. This is used instead of `anyhow::Error` so that Zed can use
 /// markdown to display it.
 #[derive(Debug)]
@@ -58,7 +77,7 @@ impl Keystroke {
     ///
     /// This method assumes that `self` was typed and `target' is in the keymap, and checks
     /// both possibilities for self against the target.
-    pub fn should_match(&self, target: &Keystroke) -> bool {
+    pub fn should_match(&self, target: &KeybindingKeystroke) -> bool {
         #[cfg(not(target_os = "windows"))]
         if let Some(key_char) = self
             .key_char
@@ -71,7 +90,7 @@ impl Keystroke {
                 ..Default::default()
             };
 
-            if &target.key == key_char && target.modifiers == ime_modifiers {
+            if &target.inner.key == key_char && target.inner.modifiers == ime_modifiers {
                 return true;
             }
         }
@@ -83,12 +102,12 @@ impl Keystroke {
             .filter(|key_char| key_char != &&self.key)
         {
             // On Windows, if key_char is set, then the typed keystroke produced the key_char
-            if &target.key == key_char && target.modifiers == Modifiers::none() {
+            if &target.inner.key == key_char && target.inner.modifiers == Modifiers::none() {
                 return true;
             }
         }
 
-        target.modifiers == self.modifiers && target.key == self.key
+        target.inner.modifiers == self.modifiers && target.inner.key == self.key
     }
 
     /// key syntax is:
@@ -200,31 +219,7 @@ impl Keystroke {
 
     /// Produces a representation of this key that Parse can understand.
     pub fn unparse(&self) -> String {
-        let mut str = String::new();
-        if self.modifiers.function {
-            str.push_str("fn-");
-        }
-        if self.modifiers.control {
-            str.push_str("ctrl-");
-        }
-        if self.modifiers.alt {
-            str.push_str("alt-");
-        }
-        if self.modifiers.platform {
-            #[cfg(target_os = "macos")]
-            str.push_str("cmd-");
-
-            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-            str.push_str("super-");
-
-            #[cfg(target_os = "windows")]
-            str.push_str("win-");
-        }
-        if self.modifiers.shift {
-            str.push_str("shift-");
-        }
-        str.push_str(&self.key);
-        str
+        unparse(&self.modifiers, &self.key)
     }
 
     /// Returns true if this keystroke left
@@ -266,6 +261,32 @@ impl Keystroke {
     }
 }
 
+impl KeybindingKeystroke {
+    /// Create a new keybinding keystroke from the given keystroke
+    pub fn new(
+        inner: Keystroke,
+        use_key_equivalents: bool,
+        keyboard_mapper: &dyn PlatformKeyboardMapper,
+    ) -> Self {
+        keyboard_mapper.map_key_equivalent(inner, use_key_equivalents)
+    }
+
+    pub(crate) fn from_keystroke(keystroke: Keystroke) -> Self {
+        let key = keystroke.key.clone();
+        let modifiers = keystroke.modifiers;
+        KeybindingKeystroke {
+            inner: keystroke,
+            display_modifiers: modifiers,
+            display_key: key,
+        }
+    }
+
+    /// Produces a representation of this key that Parse can understand.
+    pub fn unparse(&self) -> String {
+        unparse(&self.display_modifiers, &self.display_key)
+    }
+}
+
 fn is_printable_key(key: &str) -> bool {
     !matches!(
         key,
@@ -322,65 +343,15 @@ fn is_printable_key(key: &str) -> bool {
 
 impl std::fmt::Display for Keystroke {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.modifiers.control {
-            #[cfg(target_os = "macos")]
-            f.write_char('^')?;
+        display_modifiers(&self.modifiers, f)?;
+        display_key(&self.key, f)
+    }
+}
 
-            #[cfg(not(target_os = "macos"))]
-            write!(f, "ctrl-")?;
-        }
-        if self.modifiers.alt {
-            #[cfg(target_os = "macos")]
-            f.write_char('⌥')?;
-
-            #[cfg(not(target_os = "macos"))]
-            write!(f, "alt-")?;
-        }
-        if self.modifiers.platform {
-            #[cfg(target_os = "macos")]
-            f.write_char('⌘')?;
-
-            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-            f.write_char('❖')?;
-
-            #[cfg(target_os = "windows")]
-            f.write_char('⊞')?;
-        }
-        if self.modifiers.shift {
-            #[cfg(target_os = "macos")]
-            f.write_char('⇧')?;
-
-            #[cfg(not(target_os = "macos"))]
-            write!(f, "shift-")?;
-        }
-        let key = match self.key.as_str() {
-            #[cfg(target_os = "macos")]
-            "backspace" => '⌫',
-            #[cfg(target_os = "macos")]
-            "up" => '↑',
-            #[cfg(target_os = "macos")]
-            "down" => '↓',
-            #[cfg(target_os = "macos")]
-            "left" => '←',
-            #[cfg(target_os = "macos")]
-            "right" => '→',
-            #[cfg(target_os = "macos")]
-            "tab" => '⇥',
-            #[cfg(target_os = "macos")]
-            "escape" => '⎋',
-            #[cfg(target_os = "macos")]
-            "shift" => '⇧',
-            #[cfg(target_os = "macos")]
-            "control" => '⌃',
-            #[cfg(target_os = "macos")]
-            "alt" => '⌥',
-            #[cfg(target_os = "macos")]
-            "platform" => '⌘',
-
-            key if key.len() == 1 => key.chars().next().unwrap().to_ascii_uppercase(),
-            key => return f.write_str(key),
-        };
-        f.write_char(key)
+impl std::fmt::Display for KeybindingKeystroke {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        display_modifiers(&self.display_modifiers, f)?;
+        display_key(&self.display_key, f)
     }
 }
 
@@ -600,3 +571,110 @@ pub struct Capslock {
     #[serde(default)]
     pub on: bool,
 }
+
+impl AsKeystroke for Keystroke {
+    fn as_keystroke(&self) -> &Keystroke {
+        self
+    }
+}
+
+impl AsKeystroke for KeybindingKeystroke {
+    fn as_keystroke(&self) -> &Keystroke {
+        &self.inner
+    }
+}
+
+fn display_modifiers(modifiers: &Modifiers, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    if modifiers.control {
+        #[cfg(target_os = "macos")]
+        f.write_char('^')?;
+
+        #[cfg(not(target_os = "macos"))]
+        write!(f, "ctrl-")?;
+    }
+    if modifiers.alt {
+        #[cfg(target_os = "macos")]
+        f.write_char('⌥')?;
+
+        #[cfg(not(target_os = "macos"))]
+        write!(f, "alt-")?;
+    }
+    if modifiers.platform {
+        #[cfg(target_os = "macos")]
+        f.write_char('⌘')?;
+
+        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+        f.write_char('❖')?;
+
+        #[cfg(target_os = "windows")]
+        f.write_char('⊞')?;
+    }
+    if modifiers.shift {
+        #[cfg(target_os = "macos")]
+        f.write_char('⇧')?;
+
+        #[cfg(not(target_os = "macos"))]
+        write!(f, "shift-")?;
+    }
+    Ok(())
+}
+
+fn display_key(key: &str, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    let key = match key {
+        #[cfg(target_os = "macos")]
+        "backspace" => '⌫',
+        #[cfg(target_os = "macos")]
+        "up" => '↑',
+        #[cfg(target_os = "macos")]
+        "down" => '↓',
+        #[cfg(target_os = "macos")]
+        "left" => '←',
+        #[cfg(target_os = "macos")]
+        "right" => '→',
+        #[cfg(target_os = "macos")]
+        "tab" => '⇥',
+        #[cfg(target_os = "macos")]
+        "escape" => '⎋',
+        #[cfg(target_os = "macos")]
+        "shift" => '⇧',
+        #[cfg(target_os = "macos")]
+        "control" => '⌃',
+        #[cfg(target_os = "macos")]
+        "alt" => '⌥',
+        #[cfg(target_os = "macos")]
+        "platform" => '⌘',
+
+        key if key.len() == 1 => key.chars().next().unwrap().to_ascii_uppercase(),
+        key => return f.write_str(key),
+    };
+    f.write_char(key)
+}
+
+#[inline]
+fn unparse(modifiers: &Modifiers, key: &str) -> String {
+    let mut result = String::new();
+    if modifiers.function {
+        result.push_str("fn-");
+    }
+    if modifiers.control {
+        result.push_str("ctrl-");
+    }
+    if modifiers.alt {
+        result.push_str("alt-");
+    }
+    if modifiers.platform {
+        #[cfg(target_os = "macos")]
+        result.push_str("cmd-");
+
+        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+        result.push_str("super-");
+
+        #[cfg(target_os = "windows")]
+        result.push_str("win-");
+    }
+    if modifiers.shift {
+        result.push_str("shift-");
+    }
+    result.push_str(&key);
+    result
+}
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 3fb1ef4572..8bd89fc399 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -25,8 +25,8 @@ use xkbcommon::xkb::{self, Keycode, Keysym, State};
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
     ForegroundExecutor, Keymap, LinuxDispatcher, Menu, MenuItem, OwnedMenu, PathPromptOptions,
-    Pixels, Platform, PlatformDisplay, PlatformKeyboardLayout, PlatformTextSystem, PlatformWindow,
-    Point, Result, Task, WindowAppearance, WindowParams, px,
+    Pixels, Platform, PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper,
+    PlatformTextSystem, PlatformWindow, Point, Result, Task, WindowAppearance, WindowParams, px,
 };
 
 #[cfg(any(feature = "wayland", feature = "x11"))]
@@ -144,6 +144,10 @@ impl<P: LinuxClient + 'static> Platform for P {
         self.keyboard_layout()
     }
 
+    fn keyboard_mapper(&self) -> Rc<dyn PlatformKeyboardMapper> {
+        Rc::new(crate::DummyKeyboardMapper)
+    }
+
     fn on_keyboard_layout_change(&self, callback: Box<dyn FnMut()>) {
         self.with_common(|common| common.callbacks.keyboard_layout_change = Some(callback));
     }
diff --git a/crates/gpui/src/platform/mac/keyboard.rs b/crates/gpui/src/platform/mac/keyboard.rs
index a9f6af3edb..1409731246 100644
--- a/crates/gpui/src/platform/mac/keyboard.rs
+++ b/crates/gpui/src/platform/mac/keyboard.rs
@@ -1,8 +1,9 @@
+use collections::HashMap;
 use std::ffi::{CStr, c_void};
 
 use objc::{msg_send, runtime::Object, sel, sel_impl};
 
-use crate::PlatformKeyboardLayout;
+use crate::{KeybindingKeystroke, Keystroke, PlatformKeyboardLayout, PlatformKeyboardMapper};
 
 use super::{
     TISCopyCurrentKeyboardLayoutInputSource, TISGetInputSourceProperty, kTISPropertyInputSourceID,
@@ -14,6 +15,10 @@ pub(crate) struct MacKeyboardLayout {
     name: String,
 }
 
+pub(crate) struct MacKeyboardMapper {
+    key_equivalents: Option<HashMap<char, char>>,
+}
+
 impl PlatformKeyboardLayout for MacKeyboardLayout {
     fn id(&self) -> &str {
         &self.id
@@ -24,6 +29,27 @@ impl PlatformKeyboardLayout for MacKeyboardLayout {
     }
 }
 
+impl PlatformKeyboardMapper for MacKeyboardMapper {
+    fn map_key_equivalent(
+        &self,
+        mut keystroke: Keystroke,
+        use_key_equivalents: bool,
+    ) -> KeybindingKeystroke {
+        if use_key_equivalents && let Some(key_equivalents) = &self.key_equivalents {
+            if keystroke.key.chars().count() == 1
+                && let Some(key) = key_equivalents.get(&keystroke.key.chars().next().unwrap())
+            {
+                keystroke.key = key.to_string();
+            }
+        }
+        KeybindingKeystroke::from_keystroke(keystroke)
+    }
+
+    fn get_key_equivalents(&self) -> Option<&HashMap<char, char>> {
+        self.key_equivalents.as_ref()
+    }
+}
+
 impl MacKeyboardLayout {
     pub(crate) fn new() -> Self {
         unsafe {
@@ -47,3 +73,1428 @@ impl MacKeyboardLayout {
         }
     }
 }
+
+impl MacKeyboardMapper {
+    pub(crate) fn new(layout_id: &str) -> Self {
+        let key_equivalents = get_key_equivalents(layout_id);
+
+        Self { key_equivalents }
+    }
+}
+
+// On some keyboards (e.g. German QWERTZ) it is not possible to type the full ASCII range
+// without using option. This means that some of our built in keyboard shortcuts do not work
+// for those users.
+//
+// The way macOS solves this problem is to move shortcuts around so that they are all reachable,
+// even if the mnemonic changes. https://developer.apple.com/documentation/swiftui/keyboardshortcut/localization-swift.struct
+//
+// For example, cmd-> is the "switch window" shortcut because the > key is right above tab.
+// To ensure this doesn't cause problems for shortcuts defined for a QWERTY layout, apple moves
+// any shortcuts defined as cmd-> to cmd-:. Coincidentally this s also the same keyboard position
+// as cmd-> on a QWERTY layout.
+//
+// Another example is cmd-[ and cmd-], as they cannot be typed without option, those keys are remapped to cmd-ö
+// and cmd-ä. These shortcuts are not in the same position as a QWERTY keyboard, because on a QWERTZ keyboard
+// the + key is in the way; and shortcuts bound to cmd-+ are still typed as cmd-+ on either keyboard (though the
+// specific key moves)
+//
+// As far as I can tell, there's no way to query the mappings Apple uses except by rendering a menu with every
+// possible key combination, and inspecting the UI to see what it rendered. So that's what we did...
+//
+// These mappings were generated by running https://github.com/ConradIrwin/keyboard-inspector, tidying up the
+// output to remove languages with no mappings and other oddities, and converting it to a less verbose representation with:
+//  jq -s 'map(to_entries | map({key: .key, value: [(.value | to_entries | map(.key) | join("")), (.value | to_entries | map(.value) | join(""))]}) | from_entries) | add'
+// From there I used multi-cursor to produce this match statement.
+fn get_key_equivalents(layout_id: &str) -> Option<HashMap<char, char>> {
+    let mappings: &[(char, char)] = match layout_id {
+        "com.apple.keylayout.ABC-AZERTY" => &[
+            ('!', '1'),
+            ('"', '%'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('.', ';'),
+            ('/', ':'),
+            ('0', 'à'),
+            ('1', '&'),
+            ('2', 'é'),
+            ('3', '"'),
+            ('4', '\''),
+            ('5', '('),
+            ('6', '§'),
+            ('7', 'è'),
+            ('8', '!'),
+            ('9', 'ç'),
+            (':', '°'),
+            (';', ')'),
+            ('<', '.'),
+            ('>', '/'),
+            ('@', '2'),
+            ('[', '^'),
+            ('\'', 'ù'),
+            ('\\', '`'),
+            (']', '$'),
+            ('^', '6'),
+            ('`', '<'),
+            ('{', '¨'),
+            ('|', '£'),
+            ('}', '*'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.ABC-QWERTZ" => &[
+            ('"', '`'),
+            ('#', '§'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', 'ß'),
+            (':', 'Ü'),
+            (';', 'ü'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '´'),
+            ('\\', '#'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '\''),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Albanian" => &[
+            ('"', '\''),
+            (':', 'Ç'),
+            (';', 'ç'),
+            ('<', ';'),
+            ('>', ':'),
+            ('@', '"'),
+            ('\'', '@'),
+            ('\\', 'ë'),
+            ('`', '<'),
+            ('|', 'Ë'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Austrian" => &[
+            ('"', '`'),
+            ('#', '§'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', 'ß'),
+            (':', 'Ü'),
+            (';', 'ü'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '´'),
+            ('\\', '#'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '\''),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Azeri" => &[
+            ('"', 'Ə'),
+            (',', 'ç'),
+            ('.', 'ş'),
+            ('/', '.'),
+            (':', 'I'),
+            (';', 'ı'),
+            ('<', 'Ç'),
+            ('>', 'Ş'),
+            ('?', ','),
+            ('W', 'Ü'),
+            ('[', 'ö'),
+            ('\'', 'ə'),
+            (']', 'ğ'),
+            ('w', 'ü'),
+            ('{', 'Ö'),
+            ('|', '/'),
+            ('}', 'Ğ'),
+        ],
+        "com.apple.keylayout.Belgian" => &[
+            ('!', '1'),
+            ('"', '%'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('.', ';'),
+            ('/', ':'),
+            ('0', 'à'),
+            ('1', '&'),
+            ('2', 'é'),
+            ('3', '"'),
+            ('4', '\''),
+            ('5', '('),
+            ('6', '§'),
+            ('7', 'è'),
+            ('8', '!'),
+            ('9', 'ç'),
+            (':', '°'),
+            (';', ')'),
+            ('<', '.'),
+            ('>', '/'),
+            ('@', '2'),
+            ('[', '^'),
+            ('\'', 'ù'),
+            ('\\', '`'),
+            (']', '$'),
+            ('^', '6'),
+            ('`', '<'),
+            ('{', '¨'),
+            ('|', '£'),
+            ('}', '*'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Brazilian-ABNT2" => &[
+            ('"', '`'),
+            ('/', 'ç'),
+            ('?', 'Ç'),
+            ('\'', '´'),
+            ('\\', '~'),
+            ('^', '¨'),
+            ('`', '\''),
+            ('|', '^'),
+            ('~', '"'),
+        ],
+        "com.apple.keylayout.Brazilian-Pro" => &[('^', 'ˆ'), ('~', '˜')],
+        "com.apple.keylayout.British" => &[('#', '£')],
+        "com.apple.keylayout.Canadian-CSA" => &[
+            ('"', 'È'),
+            ('/', 'é'),
+            ('<', '\''),
+            ('>', '"'),
+            ('?', 'É'),
+            ('[', '^'),
+            ('\'', 'è'),
+            ('\\', 'à'),
+            (']', 'ç'),
+            ('`', 'ù'),
+            ('{', '¨'),
+            ('|', 'À'),
+            ('}', 'Ç'),
+            ('~', 'Ù'),
+        ],
+        "com.apple.keylayout.Croatian" => &[
+            ('"', 'Ć'),
+            ('&', '\''),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            (':', 'Č'),
+            (';', 'č'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'š'),
+            ('\'', 'ć'),
+            ('\\', 'ž'),
+            (']', 'đ'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Š'),
+            ('|', 'Ž'),
+            ('}', 'Đ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Croatian-PC" => &[
+            ('"', 'Ć'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '\''),
+            (':', 'Č'),
+            (';', 'č'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'š'),
+            ('\'', 'ć'),
+            ('\\', 'ž'),
+            (']', 'đ'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Š'),
+            ('|', 'Ž'),
+            ('}', 'Đ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Czech" => &[
+            ('!', '1'),
+            ('"', '!'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('+', '%'),
+            ('/', '\''),
+            ('0', 'é'),
+            ('1', '+'),
+            ('2', 'ě'),
+            ('3', 'š'),
+            ('4', 'č'),
+            ('5', 'ř'),
+            ('6', 'ž'),
+            ('7', 'ý'),
+            ('8', 'á'),
+            ('9', 'í'),
+            (':', '"'),
+            (';', 'ů'),
+            ('<', '?'),
+            ('>', ':'),
+            ('?', 'ˇ'),
+            ('@', '2'),
+            ('[', 'ú'),
+            ('\'', '§'),
+            (']', ')'),
+            ('^', '6'),
+            ('`', '¨'),
+            ('{', 'Ú'),
+            ('}', '('),
+            ('~', '`'),
+        ],
+        "com.apple.keylayout.Czech-QWERTY" => &[
+            ('!', '1'),
+            ('"', '!'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('+', '%'),
+            ('/', '\''),
+            ('0', 'é'),
+            ('1', '+'),
+            ('2', 'ě'),
+            ('3', 'š'),
+            ('4', 'č'),
+            ('5', 'ř'),
+            ('6', 'ž'),
+            ('7', 'ý'),
+            ('8', 'á'),
+            ('9', 'í'),
+            (':', '"'),
+            (';', 'ů'),
+            ('<', '?'),
+            ('>', ':'),
+            ('?', 'ˇ'),
+            ('@', '2'),
+            ('[', 'ú'),
+            ('\'', '§'),
+            (']', ')'),
+            ('^', '6'),
+            ('`', '¨'),
+            ('{', 'Ú'),
+            ('}', '('),
+            ('~', '`'),
+        ],
+        "com.apple.keylayout.Danish" => &[
+            ('"', '^'),
+            ('$', '€'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'æ'),
+            ('\'', '¨'),
+            ('\\', '\''),
+            (']', 'ø'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Æ'),
+            ('|', '*'),
+            ('}', 'Ø'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Faroese" => &[
+            ('"', 'Ø'),
+            ('$', '€'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Æ'),
+            (';', 'æ'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'å'),
+            ('\'', 'ø'),
+            ('\\', '\''),
+            (']', 'ð'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Å'),
+            ('|', '*'),
+            ('}', 'Ð'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Finnish" => &[
+            ('"', '^'),
+            ('$', '€'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '¨'),
+            ('\\', '\''),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '*'),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.FinnishExtended" => &[
+            ('"', 'ˆ'),
+            ('$', '€'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '¨'),
+            ('\\', '\''),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '*'),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.FinnishSami-PC" => &[
+            ('"', 'ˆ'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '¨'),
+            ('\\', '@'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '*'),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.French" => &[
+            ('!', '1'),
+            ('"', '%'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('.', ';'),
+            ('/', ':'),
+            ('0', 'à'),
+            ('1', '&'),
+            ('2', 'é'),
+            ('3', '"'),
+            ('4', '\''),
+            ('5', '('),
+            ('6', '§'),
+            ('7', 'è'),
+            ('8', '!'),
+            ('9', 'ç'),
+            (':', '°'),
+            (';', ')'),
+            ('<', '.'),
+            ('>', '/'),
+            ('@', '2'),
+            ('[', '^'),
+            ('\'', 'ù'),
+            ('\\', '`'),
+            (']', '$'),
+            ('^', '6'),
+            ('`', '<'),
+            ('{', '¨'),
+            ('|', '£'),
+            ('}', '*'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.French-PC" => &[
+            ('!', '1'),
+            ('"', '%'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('-', ')'),
+            ('.', ';'),
+            ('/', ':'),
+            ('0', 'à'),
+            ('1', '&'),
+            ('2', 'é'),
+            ('3', '"'),
+            ('4', '\''),
+            ('5', '('),
+            ('6', '-'),
+            ('7', 'è'),
+            ('8', '_'),
+            ('9', 'ç'),
+            (':', '§'),
+            (';', '!'),
+            ('<', '.'),
+            ('>', '/'),
+            ('@', '2'),
+            ('[', '^'),
+            ('\'', 'ù'),
+            ('\\', '*'),
+            (']', '$'),
+            ('^', '6'),
+            ('_', '°'),
+            ('`', '<'),
+            ('{', '¨'),
+            ('|', 'μ'),
+            ('}', '£'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.French-numerical" => &[
+            ('!', '1'),
+            ('"', '%'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('.', ';'),
+            ('/', ':'),
+            ('0', 'à'),
+            ('1', '&'),
+            ('2', 'é'),
+            ('3', '"'),
+            ('4', '\''),
+            ('5', '('),
+            ('6', '§'),
+            ('7', 'è'),
+            ('8', '!'),
+            ('9', 'ç'),
+            (':', '°'),
+            (';', ')'),
+            ('<', '.'),
+            ('>', '/'),
+            ('@', '2'),
+            ('[', '^'),
+            ('\'', 'ù'),
+            ('\\', '`'),
+            (']', '$'),
+            ('^', '6'),
+            ('`', '<'),
+            ('{', '¨'),
+            ('|', '£'),
+            ('}', '*'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.German" => &[
+            ('"', '`'),
+            ('#', '§'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', 'ß'),
+            (':', 'Ü'),
+            (';', 'ü'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '´'),
+            ('\\', '#'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '\''),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.German-DIN-2137" => &[
+            ('"', '`'),
+            ('#', '§'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', 'ß'),
+            (':', 'Ü'),
+            (';', 'ü'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '´'),
+            ('\\', '#'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '\''),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Hawaiian" => &[('\'', 'ʻ')],
+        "com.apple.keylayout.Hungarian" => &[
+            ('!', '\''),
+            ('"', 'Á'),
+            ('#', '+'),
+            ('$', '!'),
+            ('&', '='),
+            ('(', ')'),
+            (')', 'Ö'),
+            ('*', '('),
+            ('+', 'Ó'),
+            ('/', 'ü'),
+            ('0', 'ö'),
+            (':', 'É'),
+            (';', 'é'),
+            ('<', 'Ü'),
+            ('=', 'ó'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ő'),
+            ('\'', 'á'),
+            ('\\', 'ű'),
+            (']', 'ú'),
+            ('^', '/'),
+            ('`', 'í'),
+            ('{', 'Ő'),
+            ('|', 'Ű'),
+            ('}', 'Ú'),
+            ('~', 'Í'),
+        ],
+        "com.apple.keylayout.Hungarian-QWERTY" => &[
+            ('!', '\''),
+            ('"', 'Á'),
+            ('#', '+'),
+            ('$', '!'),
+            ('&', '='),
+            ('(', ')'),
+            (')', 'Ö'),
+            ('*', '('),
+            ('+', 'Ó'),
+            ('/', 'ü'),
+            ('0', 'ö'),
+            (':', 'É'),
+            (';', 'é'),
+            ('<', 'Ü'),
+            ('=', 'ó'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ő'),
+            ('\'', 'á'),
+            ('\\', 'ű'),
+            (']', 'ú'),
+            ('^', '/'),
+            ('`', 'í'),
+            ('{', 'Ő'),
+            ('|', 'Ű'),
+            ('}', 'Ú'),
+            ('~', 'Í'),
+        ],
+        "com.apple.keylayout.Icelandic" => &[
+            ('"', 'Ö'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '\''),
+            (':', 'Ð'),
+            (';', 'ð'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'æ'),
+            ('\'', 'ö'),
+            ('\\', 'þ'),
+            (']', '´'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Æ'),
+            ('|', 'Þ'),
+            ('}', '´'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Irish" => &[('#', '£')],
+        "com.apple.keylayout.IrishExtended" => &[('#', '£')],
+        "com.apple.keylayout.Italian" => &[
+            ('!', '1'),
+            ('"', '%'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            (',', ';'),
+            ('.', ':'),
+            ('/', ','),
+            ('0', 'é'),
+            ('1', '&'),
+            ('2', '"'),
+            ('3', '\''),
+            ('4', '('),
+            ('5', 'ç'),
+            ('6', 'è'),
+            ('7', ')'),
+            ('8', '£'),
+            ('9', 'à'),
+            (':', '!'),
+            (';', 'ò'),
+            ('<', '.'),
+            ('>', '/'),
+            ('@', '2'),
+            ('[', 'ì'),
+            ('\'', 'ù'),
+            ('\\', '§'),
+            (']', '$'),
+            ('^', '6'),
+            ('`', '<'),
+            ('{', '^'),
+            ('|', '°'),
+            ('}', '*'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Italian-Pro" => &[
+            ('"', '^'),
+            ('#', '£'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '\''),
+            (':', 'é'),
+            (';', 'è'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ò'),
+            ('\'', 'ì'),
+            ('\\', 'ù'),
+            (']', 'à'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'ç'),
+            ('|', '§'),
+            ('}', '°'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.LatinAmerican" => &[
+            ('"', '¨'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '\''),
+            (':', 'Ñ'),
+            (';', 'ñ'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', '{'),
+            ('\'', '´'),
+            ('\\', '¿'),
+            (']', '}'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', '['),
+            ('|', '¡'),
+            ('}', ']'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Lithuanian" => &[
+            ('!', 'Ą'),
+            ('#', 'Ę'),
+            ('$', 'Ė'),
+            ('%', 'Į'),
+            ('&', 'Ų'),
+            ('*', 'Ū'),
+            ('+', 'Ž'),
+            ('1', 'ą'),
+            ('2', 'č'),
+            ('3', 'ę'),
+            ('4', 'ė'),
+            ('5', 'į'),
+            ('6', 'š'),
+            ('7', 'ų'),
+            ('8', 'ū'),
+            ('=', 'ž'),
+            ('@', 'Č'),
+            ('^', 'Š'),
+        ],
+        "com.apple.keylayout.Maltese" => &[
+            ('#', '£'),
+            ('[', 'ġ'),
+            (']', 'ħ'),
+            ('`', 'ż'),
+            ('{', 'Ġ'),
+            ('}', 'Ħ'),
+            ('~', 'Ż'),
+        ],
+        "com.apple.keylayout.NorthernSami" => &[
+            ('"', 'Ŋ'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('Q', 'Á'),
+            ('W', 'Š'),
+            ('X', 'Č'),
+            ('[', 'ø'),
+            ('\'', 'ŋ'),
+            ('\\', 'đ'),
+            (']', 'æ'),
+            ('^', '&'),
+            ('`', 'ž'),
+            ('q', 'á'),
+            ('w', 'š'),
+            ('x', 'č'),
+            ('{', 'Ø'),
+            ('|', 'Đ'),
+            ('}', 'Æ'),
+            ('~', 'Ž'),
+        ],
+        "com.apple.keylayout.Norwegian" => &[
+            ('"', '^'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ø'),
+            ('\'', '¨'),
+            ('\\', '@'),
+            (']', 'æ'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ø'),
+            ('|', '*'),
+            ('}', 'Æ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.NorwegianExtended" => &[
+            ('"', 'ˆ'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ø'),
+            ('\\', '@'),
+            (']', 'æ'),
+            ('`', '<'),
+            ('}', 'Æ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.NorwegianSami-PC" => &[
+            ('"', 'ˆ'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ø'),
+            ('\'', '¨'),
+            ('\\', '@'),
+            (']', 'æ'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ø'),
+            ('|', '*'),
+            ('}', 'Æ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Polish" => &[
+            ('!', '§'),
+            ('"', 'ę'),
+            ('#', '!'),
+            ('$', '?'),
+            ('%', '+'),
+            ('&', ':'),
+            ('(', '/'),
+            (')', '"'),
+            ('*', '_'),
+            ('+', ']'),
+            (',', '.'),
+            ('.', ','),
+            ('/', 'ż'),
+            (':', 'Ł'),
+            (';', 'ł'),
+            ('<', 'ś'),
+            ('=', '['),
+            ('>', 'ń'),
+            ('?', 'Ż'),
+            ('@', '%'),
+            ('[', 'ó'),
+            ('\'', 'ą'),
+            ('\\', ';'),
+            (']', '('),
+            ('^', '='),
+            ('_', 'ć'),
+            ('`', '<'),
+            ('{', 'ź'),
+            ('|', '$'),
+            ('}', ')'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Portuguese" => &[
+            ('"', '`'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '\''),
+            (':', 'ª'),
+            (';', 'º'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ç'),
+            ('\'', '´'),
+            (']', '~'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ç'),
+            ('}', '^'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Sami-PC" => &[
+            ('"', 'Ŋ'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('Q', 'Á'),
+            ('W', 'Š'),
+            ('X', 'Č'),
+            ('[', 'ø'),
+            ('\'', 'ŋ'),
+            ('\\', 'đ'),
+            (']', 'æ'),
+            ('^', '&'),
+            ('`', 'ž'),
+            ('q', 'á'),
+            ('w', 'š'),
+            ('x', 'č'),
+            ('{', 'Ø'),
+            ('|', 'Đ'),
+            ('}', 'Æ'),
+            ('~', 'Ž'),
+        ],
+        "com.apple.keylayout.Serbian-Latin" => &[
+            ('"', 'Ć'),
+            ('&', '\''),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            (':', 'Č'),
+            (';', 'č'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'š'),
+            ('\'', 'ć'),
+            ('\\', 'ž'),
+            (']', 'đ'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Š'),
+            ('|', 'Ž'),
+            ('}', 'Đ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Slovak" => &[
+            ('!', '1'),
+            ('"', '!'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('+', '%'),
+            ('/', '\''),
+            ('0', 'é'),
+            ('1', '+'),
+            ('2', 'ľ'),
+            ('3', 'š'),
+            ('4', 'č'),
+            ('5', 'ť'),
+            ('6', 'ž'),
+            ('7', 'ý'),
+            ('8', 'á'),
+            ('9', 'í'),
+            (':', '"'),
+            (';', 'ô'),
+            ('<', '?'),
+            ('>', ':'),
+            ('?', 'ˇ'),
+            ('@', '2'),
+            ('[', 'ú'),
+            ('\'', '§'),
+            (']', 'ä'),
+            ('^', '6'),
+            ('`', 'ň'),
+            ('{', 'Ú'),
+            ('}', 'Ä'),
+            ('~', 'Ň'),
+        ],
+        "com.apple.keylayout.Slovak-QWERTY" => &[
+            ('!', '1'),
+            ('"', '!'),
+            ('#', '3'),
+            ('$', '4'),
+            ('%', '5'),
+            ('&', '7'),
+            ('(', '9'),
+            (')', '0'),
+            ('*', '8'),
+            ('+', '%'),
+            ('/', '\''),
+            ('0', 'é'),
+            ('1', '+'),
+            ('2', 'ľ'),
+            ('3', 'š'),
+            ('4', 'č'),
+            ('5', 'ť'),
+            ('6', 'ž'),
+            ('7', 'ý'),
+            ('8', 'á'),
+            ('9', 'í'),
+            (':', '"'),
+            (';', 'ô'),
+            ('<', '?'),
+            ('>', ':'),
+            ('?', 'ˇ'),
+            ('@', '2'),
+            ('[', 'ú'),
+            ('\'', '§'),
+            (']', 'ä'),
+            ('^', '6'),
+            ('`', 'ň'),
+            ('{', 'Ú'),
+            ('}', 'Ä'),
+            ('~', 'Ň'),
+        ],
+        "com.apple.keylayout.Slovenian" => &[
+            ('"', 'Ć'),
+            ('&', '\''),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            (':', 'Č'),
+            (';', 'č'),
+            ('<', ';'),
+            ('=', '*'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'š'),
+            ('\'', 'ć'),
+            ('\\', 'ž'),
+            (']', 'đ'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Š'),
+            ('|', 'Ž'),
+            ('}', 'Đ'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Spanish" => &[
+            ('!', '¡'),
+            ('"', '¨'),
+            ('.', 'ç'),
+            ('/', '.'),
+            (':', 'º'),
+            (';', '´'),
+            ('<', '¿'),
+            ('>', 'Ç'),
+            ('@', '!'),
+            ('[', 'ñ'),
+            ('\'', '`'),
+            ('\\', '\''),
+            (']', ';'),
+            ('^', '/'),
+            ('`', '<'),
+            ('{', 'Ñ'),
+            ('|', '"'),
+            ('}', ':'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Spanish-ISO" => &[
+            ('"', '¨'),
+            ('#', '·'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('.', 'ç'),
+            ('/', '.'),
+            (':', 'º'),
+            (';', '´'),
+            ('<', '¿'),
+            ('>', 'Ç'),
+            ('@', '"'),
+            ('[', 'ñ'),
+            ('\'', '`'),
+            ('\\', '\''),
+            (']', ';'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ñ'),
+            ('|', '"'),
+            ('}', '`'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Swedish" => &[
+            ('"', '^'),
+            ('$', '€'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '¨'),
+            ('\\', '\''),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '*'),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Swedish-Pro" => &[
+            ('"', '^'),
+            ('$', '€'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '¨'),
+            ('\\', '\''),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '*'),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.SwedishSami-PC" => &[
+            ('"', 'ˆ'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('/', '´'),
+            (':', 'Å'),
+            (';', 'å'),
+            ('<', ';'),
+            ('=', '`'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '¨'),
+            ('\\', '@'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ö'),
+            ('|', '*'),
+            ('}', 'Ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.SwissFrench" => &[
+            ('!', '+'),
+            ('"', '`'),
+            ('#', '*'),
+            ('$', 'ç'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('+', '!'),
+            ('/', '\''),
+            (':', 'ü'),
+            (';', 'è'),
+            ('<', ';'),
+            ('=', '¨'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'é'),
+            ('\'', '^'),
+            ('\\', '$'),
+            (']', 'à'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'ö'),
+            ('|', '£'),
+            ('}', 'ä'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.SwissGerman" => &[
+            ('!', '+'),
+            ('"', '`'),
+            ('#', '*'),
+            ('$', 'ç'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('+', '!'),
+            ('/', '\''),
+            (':', 'è'),
+            (';', 'ü'),
+            ('<', ';'),
+            ('=', '¨'),
+            ('>', ':'),
+            ('@', '"'),
+            ('[', 'ö'),
+            ('\'', '^'),
+            ('\\', '$'),
+            (']', 'ä'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'é'),
+            ('|', '£'),
+            ('}', 'à'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Turkish" => &[
+            ('"', '-'),
+            ('#', '"'),
+            ('$', '\''),
+            ('%', '('),
+            ('&', ')'),
+            ('(', '%'),
+            (')', ':'),
+            ('*', '_'),
+            (',', 'ö'),
+            ('-', 'ş'),
+            ('.', 'ç'),
+            ('/', '.'),
+            (':', '$'),
+            ('<', 'Ö'),
+            ('>', 'Ç'),
+            ('@', '*'),
+            ('[', 'ğ'),
+            ('\'', ','),
+            ('\\', 'ü'),
+            (']', 'ı'),
+            ('^', '/'),
+            ('_', 'Ş'),
+            ('`', '<'),
+            ('{', 'Ğ'),
+            ('|', 'Ü'),
+            ('}', 'I'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Turkish-QWERTY-PC" => &[
+            ('"', 'I'),
+            ('#', '^'),
+            ('$', '+'),
+            ('&', '/'),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            ('+', ':'),
+            (',', 'ö'),
+            ('.', 'ç'),
+            ('/', '*'),
+            (':', 'Ş'),
+            (';', 'ş'),
+            ('<', 'Ö'),
+            ('=', '.'),
+            ('>', 'Ç'),
+            ('@', '\''),
+            ('[', 'ğ'),
+            ('\'', 'ı'),
+            ('\\', ','),
+            (']', 'ü'),
+            ('^', '&'),
+            ('`', '<'),
+            ('{', 'Ğ'),
+            ('|', ';'),
+            ('}', 'Ü'),
+            ('~', '>'),
+        ],
+        "com.apple.keylayout.Turkish-Standard" => &[
+            ('"', 'Ş'),
+            ('#', '^'),
+            ('&', '\''),
+            ('(', ')'),
+            (')', '='),
+            ('*', '('),
+            (',', '.'),
+            ('.', ','),
+            (':', 'Ç'),
+            (';', 'ç'),
+            ('<', ':'),
+            ('=', '*'),
+            ('>', ';'),
+            ('@', '"'),
+            ('[', 'ğ'),
+            ('\'', 'ş'),
+            ('\\', 'ü'),
+            (']', 'ı'),
+            ('^', '&'),
+            ('`', 'ö'),
+            ('{', 'Ğ'),
+            ('|', 'Ü'),
+            ('}', 'I'),
+            ('~', 'Ö'),
+        ],
+        "com.apple.keylayout.Turkmen" => &[
+            ('C', 'Ç'),
+            ('Q', 'Ä'),
+            ('V', 'Ý'),
+            ('X', 'Ü'),
+            ('[', 'ň'),
+            ('\\', 'ş'),
+            (']', 'ö'),
+            ('^', '№'),
+            ('`', 'ž'),
+            ('c', 'ç'),
+            ('q', 'ä'),
+            ('v', 'ý'),
+            ('x', 'ü'),
+            ('{', 'Ň'),
+            ('|', 'Ş'),
+            ('}', 'Ö'),
+            ('~', 'Ž'),
+        ],
+        "com.apple.keylayout.USInternational-PC" => &[('^', 'ˆ'), ('~', '˜')],
+        "com.apple.keylayout.Welsh" => &[('#', '£')],
+
+        _ => return None,
+    };
+
+    Some(HashMap::from_iter(mappings.iter().cloned()))
+}
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 832550dc46..30453def00 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -1,5 +1,5 @@
 use super::{
-    BoolExt, MacKeyboardLayout,
+    BoolExt, MacKeyboardLayout, MacKeyboardMapper,
     attributed_string::{NSAttributedString, NSMutableAttributedString},
     events::key_to_native,
     renderer,
@@ -8,8 +8,9 @@ use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardEntry, ClipboardItem, ClipboardString,
     CursorStyle, ForegroundExecutor, Image, ImageFormat, KeyContext, Keymap, MacDispatcher,
     MacDisplay, MacWindow, Menu, MenuItem, OsMenu, OwnedMenu, PathPromptOptions, Platform,
-    PlatformDisplay, PlatformKeyboardLayout, PlatformTextSystem, PlatformWindow, Result,
-    SemanticVersion, SystemMenuType, Task, WindowAppearance, WindowParams, hash,
+    PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper, PlatformTextSystem,
+    PlatformWindow, Result, SemanticVersion, SystemMenuType, Task, WindowAppearance, WindowParams,
+    hash,
 };
 use anyhow::{Context as _, anyhow};
 use block::ConcreteBlock;
@@ -171,6 +172,7 @@ pub(crate) struct MacPlatformState {
     finish_launching: Option<Box<dyn FnOnce()>>,
     dock_menu: Option<id>,
     menus: Option<Vec<OwnedMenu>>,
+    keyboard_mapper: Rc<MacKeyboardMapper>,
 }
 
 impl Default for MacPlatform {
@@ -189,6 +191,9 @@ impl MacPlatform {
         #[cfg(not(feature = "font-kit"))]
         let text_system = Arc::new(crate::NoopTextSystem::new());
 
+        let keyboard_layout = MacKeyboardLayout::new();
+        let keyboard_mapper = Rc::new(MacKeyboardMapper::new(keyboard_layout.id()));
+
         Self(Mutex::new(MacPlatformState {
             headless,
             text_system,
@@ -209,6 +214,7 @@ impl MacPlatform {
             dock_menu: None,
             on_keyboard_layout_change: None,
             menus: None,
+            keyboard_mapper,
         }))
     }
 
@@ -348,19 +354,19 @@ impl MacPlatform {
                             let mut mask = NSEventModifierFlags::empty();
                             for (modifier, flag) in &[
                                 (
-                                    keystroke.modifiers.platform,
+                                    keystroke.display_modifiers.platform,
                                     NSEventModifierFlags::NSCommandKeyMask,
                                 ),
                                 (
-                                    keystroke.modifiers.control,
+                                    keystroke.display_modifiers.control,
                                     NSEventModifierFlags::NSControlKeyMask,
                                 ),
                                 (
-                                    keystroke.modifiers.alt,
+                                    keystroke.display_modifiers.alt,
                                     NSEventModifierFlags::NSAlternateKeyMask,
                                 ),
                                 (
-                                    keystroke.modifiers.shift,
+                                    keystroke.display_modifiers.shift,
                                     NSEventModifierFlags::NSShiftKeyMask,
                                 ),
                             ] {
@@ -373,7 +379,7 @@ impl MacPlatform {
                                 .initWithTitle_action_keyEquivalent_(
                                     ns_string(name),
                                     selector,
-                                    ns_string(key_to_native(&keystroke.key).as_ref()),
+                                    ns_string(key_to_native(&keystroke.display_key).as_ref()),
                                 )
                                 .autorelease();
                             if Self::os_version() >= SemanticVersion::new(12, 0, 0) {
@@ -882,6 +888,10 @@ impl Platform for MacPlatform {
         Box::new(MacKeyboardLayout::new())
     }
 
+    fn keyboard_mapper(&self) -> Rc<dyn PlatformKeyboardMapper> {
+        self.0.lock().keyboard_mapper.clone()
+    }
+
     fn app_path(&self) -> Result<PathBuf> {
         unsafe {
             let bundle: id = NSBundle::mainBundle();
@@ -1393,6 +1403,8 @@ extern "C" fn will_terminate(this: &mut Object, _: Sel, _: id) {
 extern "C" fn on_keyboard_layout_change(this: &mut Object, _: Sel, _: id) {
     let platform = unsafe { get_mac_platform(this) };
     let mut lock = platform.0.lock();
+    let keyboard_layout = MacKeyboardLayout::new();
+    lock.keyboard_mapper = Rc::new(MacKeyboardMapper::new(keyboard_layout.id()));
     if let Some(mut callback) = lock.on_keyboard_layout_change.take() {
         drop(lock);
         callback();
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 00afcd81b5..15b909199f 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -1,8 +1,9 @@
 use crate::{
     AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DevicePixels,
-    ForegroundExecutor, Keymap, NoopTextSystem, Platform, PlatformDisplay, PlatformKeyboardLayout,
-    PlatformTextSystem, PromptButton, ScreenCaptureFrame, ScreenCaptureSource, ScreenCaptureStream,
-    SourceMetadata, Task, TestDisplay, TestWindow, WindowAppearance, WindowParams, size,
+    DummyKeyboardMapper, ForegroundExecutor, Keymap, NoopTextSystem, Platform, PlatformDisplay,
+    PlatformKeyboardLayout, PlatformKeyboardMapper, PlatformTextSystem, PromptButton,
+    ScreenCaptureFrame, ScreenCaptureSource, ScreenCaptureStream, SourceMetadata, Task,
+    TestDisplay, TestWindow, WindowAppearance, WindowParams, size,
 };
 use anyhow::Result;
 use collections::VecDeque;
@@ -237,6 +238,10 @@ impl Platform for TestPlatform {
         Box::new(TestKeyboardLayout)
     }
 
+    fn keyboard_mapper(&self) -> Rc<dyn PlatformKeyboardMapper> {
+        Rc::new(DummyKeyboardMapper)
+    }
+
     fn on_keyboard_layout_change(&self, _: Box<dyn FnMut()>) {}
 
     fn run(&self, _on_finish_launching: Box<dyn FnOnce()>) {
diff --git a/crates/gpui/src/platform/windows/keyboard.rs b/crates/gpui/src/platform/windows/keyboard.rs
index 371feb70c2..0eb97fbb0c 100644
--- a/crates/gpui/src/platform/windows/keyboard.rs
+++ b/crates/gpui/src/platform/windows/keyboard.rs
@@ -1,22 +1,31 @@
 use anyhow::Result;
+use collections::HashMap;
 use windows::Win32::UI::{
     Input::KeyboardAndMouse::{
-        GetKeyboardLayoutNameW, MAPVK_VK_TO_CHAR, MapVirtualKeyW, ToUnicode, VIRTUAL_KEY, VK_0,
-        VK_1, VK_2, VK_3, VK_4, VK_5, VK_6, VK_7, VK_8, VK_9, VK_ABNT_C1, VK_CONTROL, VK_MENU,
-        VK_OEM_1, VK_OEM_2, VK_OEM_3, VK_OEM_4, VK_OEM_5, VK_OEM_6, VK_OEM_7, VK_OEM_8, VK_OEM_102,
-        VK_OEM_COMMA, VK_OEM_MINUS, VK_OEM_PERIOD, VK_OEM_PLUS, VK_SHIFT,
+        GetKeyboardLayoutNameW, MAPVK_VK_TO_CHAR, MAPVK_VK_TO_VSC, MapVirtualKeyW, ToUnicode,
+        VIRTUAL_KEY, VK_0, VK_1, VK_2, VK_3, VK_4, VK_5, VK_6, VK_7, VK_8, VK_9, VK_ABNT_C1,
+        VK_CONTROL, VK_MENU, VK_OEM_1, VK_OEM_2, VK_OEM_3, VK_OEM_4, VK_OEM_5, VK_OEM_6, VK_OEM_7,
+        VK_OEM_8, VK_OEM_102, VK_OEM_COMMA, VK_OEM_MINUS, VK_OEM_PERIOD, VK_OEM_PLUS, VK_SHIFT,
     },
     WindowsAndMessaging::KL_NAMELENGTH,
 };
 use windows_core::HSTRING;
 
-use crate::{Modifiers, PlatformKeyboardLayout};
+use crate::{
+    KeybindingKeystroke, Keystroke, Modifiers, PlatformKeyboardLayout, PlatformKeyboardMapper,
+};
 
 pub(crate) struct WindowsKeyboardLayout {
     id: String,
     name: String,
 }
 
+pub(crate) struct WindowsKeyboardMapper {
+    key_to_vkey: HashMap<String, (u16, bool)>,
+    vkey_to_key: HashMap<u16, String>,
+    vkey_to_shifted: HashMap<u16, String>,
+}
+
 impl PlatformKeyboardLayout for WindowsKeyboardLayout {
     fn id(&self) -> &str {
         &self.id
@@ -27,6 +36,65 @@ impl PlatformKeyboardLayout for WindowsKeyboardLayout {
     }
 }
 
+impl PlatformKeyboardMapper for WindowsKeyboardMapper {
+    fn map_key_equivalent(
+        &self,
+        mut keystroke: Keystroke,
+        use_key_equivalents: bool,
+    ) -> KeybindingKeystroke {
+        let Some((vkey, shifted_key)) = self.get_vkey_from_key(&keystroke.key, use_key_equivalents)
+        else {
+            return KeybindingKeystroke::from_keystroke(keystroke);
+        };
+        if shifted_key && keystroke.modifiers.shift {
+            log::warn!(
+                "Keystroke '{}' has both shift and a shifted key, this is likely a bug",
+                keystroke.key
+            );
+        }
+
+        let shift = shifted_key || keystroke.modifiers.shift;
+        keystroke.modifiers.shift = false;
+
+        let Some(key) = self.vkey_to_key.get(&vkey).cloned() else {
+            log::error!(
+                "Failed to map key equivalent '{:?}' to a valid key",
+                keystroke
+            );
+            return KeybindingKeystroke::from_keystroke(keystroke);
+        };
+
+        keystroke.key = if shift {
+            let Some(shifted_key) = self.vkey_to_shifted.get(&vkey).cloned() else {
+                log::error!(
+                    "Failed to map keystroke {:?} with virtual key '{:?}' to a shifted key",
+                    keystroke,
+                    vkey
+                );
+                return KeybindingKeystroke::from_keystroke(keystroke);
+            };
+            shifted_key
+        } else {
+            key.clone()
+        };
+
+        let modifiers = Modifiers {
+            shift,
+            ..keystroke.modifiers
+        };
+
+        KeybindingKeystroke {
+            inner: keystroke,
+            display_modifiers: modifiers,
+            display_key: key,
+        }
+    }
+
+    fn get_key_equivalents(&self) -> Option<&HashMap<char, char>> {
+        None
+    }
+}
+
 impl WindowsKeyboardLayout {
     pub(crate) fn new() -> Result<Self> {
         let mut buffer = [0u16; KL_NAMELENGTH as usize];
@@ -48,6 +116,41 @@ impl WindowsKeyboardLayout {
     }
 }
 
+impl WindowsKeyboardMapper {
+    pub(crate) fn new() -> Self {
+        let mut key_to_vkey = HashMap::default();
+        let mut vkey_to_key = HashMap::default();
+        let mut vkey_to_shifted = HashMap::default();
+        for vkey in CANDIDATE_VKEYS {
+            if let Some(key) = get_key_from_vkey(*vkey) {
+                key_to_vkey.insert(key.clone(), (vkey.0, false));
+                vkey_to_key.insert(vkey.0, key);
+            }
+            let scan_code = unsafe { MapVirtualKeyW(vkey.0 as u32, MAPVK_VK_TO_VSC) };
+            if scan_code == 0 {
+                continue;
+            }
+            if let Some(shifted_key) = get_shifted_key(*vkey, scan_code) {
+                key_to_vkey.insert(shifted_key.clone(), (vkey.0, true));
+                vkey_to_shifted.insert(vkey.0, shifted_key);
+            }
+        }
+        Self {
+            key_to_vkey,
+            vkey_to_key,
+            vkey_to_shifted,
+        }
+    }
+
+    fn get_vkey_from_key(&self, key: &str, use_key_equivalents: bool) -> Option<(u16, bool)> {
+        if use_key_equivalents {
+            get_vkey_from_key_with_us_layout(key)
+        } else {
+            self.key_to_vkey.get(key).cloned()
+        }
+    }
+}
+
 pub(crate) fn get_keystroke_key(
     vkey: VIRTUAL_KEY,
     scan_code: u32,
@@ -140,3 +243,134 @@ pub(crate) fn generate_key_char(
         _ => None,
     }
 }
+
+fn get_vkey_from_key_with_us_layout(key: &str) -> Option<(u16, bool)> {
+    match key {
+        // ` => VK_OEM_3
+        "`" => Some((VK_OEM_3.0, false)),
+        "~" => Some((VK_OEM_3.0, true)),
+        "1" => Some((VK_1.0, false)),
+        "!" => Some((VK_1.0, true)),
+        "2" => Some((VK_2.0, false)),
+        "@" => Some((VK_2.0, true)),
+        "3" => Some((VK_3.0, false)),
+        "#" => Some((VK_3.0, true)),
+        "4" => Some((VK_4.0, false)),
+        "$" => Some((VK_4.0, true)),
+        "5" => Some((VK_5.0, false)),
+        "%" => Some((VK_5.0, true)),
+        "6" => Some((VK_6.0, false)),
+        "^" => Some((VK_6.0, true)),
+        "7" => Some((VK_7.0, false)),
+        "&" => Some((VK_7.0, true)),
+        "8" => Some((VK_8.0, false)),
+        "*" => Some((VK_8.0, true)),
+        "9" => Some((VK_9.0, false)),
+        "(" => Some((VK_9.0, true)),
+        "0" => Some((VK_0.0, false)),
+        ")" => Some((VK_0.0, true)),
+        "-" => Some((VK_OEM_MINUS.0, false)),
+        "_" => Some((VK_OEM_MINUS.0, true)),
+        "=" => Some((VK_OEM_PLUS.0, false)),
+        "+" => Some((VK_OEM_PLUS.0, true)),
+        "[" => Some((VK_OEM_4.0, false)),
+        "{" => Some((VK_OEM_4.0, true)),
+        "]" => Some((VK_OEM_6.0, false)),
+        "}" => Some((VK_OEM_6.0, true)),
+        "\\" => Some((VK_OEM_5.0, false)),
+        "|" => Some((VK_OEM_5.0, true)),
+        ";" => Some((VK_OEM_1.0, false)),
+        ":" => Some((VK_OEM_1.0, true)),
+        "'" => Some((VK_OEM_7.0, false)),
+        "\"" => Some((VK_OEM_7.0, true)),
+        "," => Some((VK_OEM_COMMA.0, false)),
+        "<" => Some((VK_OEM_COMMA.0, true)),
+        "." => Some((VK_OEM_PERIOD.0, false)),
+        ">" => Some((VK_OEM_PERIOD.0, true)),
+        "/" => Some((VK_OEM_2.0, false)),
+        "?" => Some((VK_OEM_2.0, true)),
+        _ => None,
+    }
+}
+
+const CANDIDATE_VKEYS: &[VIRTUAL_KEY] = &[
+    VK_OEM_3,
+    VK_OEM_MINUS,
+    VK_OEM_PLUS,
+    VK_OEM_4,
+    VK_OEM_5,
+    VK_OEM_6,
+    VK_OEM_1,
+    VK_OEM_7,
+    VK_OEM_COMMA,
+    VK_OEM_PERIOD,
+    VK_OEM_2,
+    VK_OEM_102,
+    VK_OEM_8,
+    VK_ABNT_C1,
+    VK_0,
+    VK_1,
+    VK_2,
+    VK_3,
+    VK_4,
+    VK_5,
+    VK_6,
+    VK_7,
+    VK_8,
+    VK_9,
+];
+
+#[cfg(test)]
+mod tests {
+    use crate::{Keystroke, Modifiers, PlatformKeyboardMapper, WindowsKeyboardMapper};
+
+    #[test]
+    fn test_keyboard_mapper() {
+        let mapper = WindowsKeyboardMapper::new();
+
+        // Normal case
+        let keystroke = Keystroke {
+            modifiers: Modifiers::control(),
+            key: "a".to_string(),
+            key_char: None,
+        };
+        let mapped = mapper.map_key_equivalent(keystroke.clone(), true);
+        assert_eq!(mapped.inner, keystroke);
+        assert_eq!(mapped.display_key, "a");
+        assert_eq!(mapped.display_modifiers, Modifiers::control());
+
+        // Shifted case, ctrl-$
+        let keystroke = Keystroke {
+            modifiers: Modifiers::control(),
+            key: "$".to_string(),
+            key_char: None,
+        };
+        let mapped = mapper.map_key_equivalent(keystroke.clone(), true);
+        assert_eq!(mapped.inner, keystroke);
+        assert_eq!(mapped.display_key, "4");
+        assert_eq!(mapped.display_modifiers, Modifiers::control_shift());
+
+        // Shifted case, but shift is true
+        let keystroke = Keystroke {
+            modifiers: Modifiers::control_shift(),
+            key: "$".to_string(),
+            key_char: None,
+        };
+        let mapped = mapper.map_key_equivalent(keystroke, true);
+        assert_eq!(mapped.inner.modifiers, Modifiers::control());
+        assert_eq!(mapped.display_key, "4");
+        assert_eq!(mapped.display_modifiers, Modifiers::control_shift());
+
+        // Windows style
+        let keystroke = Keystroke {
+            modifiers: Modifiers::control_shift(),
+            key: "4".to_string(),
+            key_char: None,
+        };
+        let mapped = mapper.map_key_equivalent(keystroke, true);
+        assert_eq!(mapped.inner.modifiers, Modifiers::control());
+        assert_eq!(mapped.inner.key, "$");
+        assert_eq!(mapped.display_key, "4");
+        assert_eq!(mapped.display_modifiers, Modifiers::control_shift());
+    }
+}
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index 6202e05fb3..5ac2be2f23 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -351,6 +351,10 @@ impl Platform for WindowsPlatform {
         )
     }
 
+    fn keyboard_mapper(&self) -> Rc<dyn PlatformKeyboardMapper> {
+        Rc::new(WindowsKeyboardMapper::new())
+    }
+
     fn on_keyboard_layout_change(&self, callback: Box<dyn FnMut()>) {
         self.state.borrow_mut().callbacks.keyboard_layout_change = Some(callback);
     }
diff --git a/crates/language_tools/src/key_context_view.rs b/crates/language_tools/src/key_context_view.rs
index 057259d114..4140713544 100644
--- a/crates/language_tools/src/key_context_view.rs
+++ b/crates/language_tools/src/key_context_view.rs
@@ -4,7 +4,6 @@ use gpui::{
 };
 use itertools::Itertools;
 use serde_json::json;
-use settings::get_key_equivalents;
 use ui::{Button, ButtonStyle};
 use ui::{
     ButtonCommon, Clickable, Context, FluentBuilder, InteractiveElement, Label, LabelCommon,
@@ -169,7 +168,8 @@ impl Item for KeyContextView {
 impl Render for KeyContextView {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
         use itertools::Itertools;
-        let key_equivalents = get_key_equivalents(cx.keyboard_layout().id());
+
+        let key_equivalents = cx.keyboard_mapper().get_key_equivalents();
         v_flex()
             .id("key-context-view")
             .overflow_scroll()
diff --git a/crates/settings/src/key_equivalents.rs b/crates/settings/src/key_equivalents.rs
deleted file mode 100644
index 6580137535..0000000000
--- a/crates/settings/src/key_equivalents.rs
+++ /dev/null
@@ -1,1424 +0,0 @@
-use collections::HashMap;
-
-// On some keyboards (e.g. German QWERTZ) it is not possible to type the full ASCII range
-// without using option. This means that some of our built in keyboard shortcuts do not work
-// for those users.
-//
-// The way macOS solves this problem is to move shortcuts around so that they are all reachable,
-// even if the mnemonic changes. https://developer.apple.com/documentation/swiftui/keyboardshortcut/localization-swift.struct
-//
-// For example, cmd-> is the "switch window" shortcut because the > key is right above tab.
-// To ensure this doesn't cause problems for shortcuts defined for a QWERTY layout, apple moves
-// any shortcuts defined as cmd-> to cmd-:. Coincidentally this s also the same keyboard position
-// as cmd-> on a QWERTY layout.
-//
-// Another example is cmd-[ and cmd-], as they cannot be typed without option, those keys are remapped to cmd-ö
-// and cmd-ä. These shortcuts are not in the same position as a QWERTY keyboard, because on a QWERTZ keyboard
-// the + key is in the way; and shortcuts bound to cmd-+ are still typed as cmd-+ on either keyboard (though the
-// specific key moves)
-//
-// As far as I can tell, there's no way to query the mappings Apple uses except by rendering a menu with every
-// possible key combination, and inspecting the UI to see what it rendered. So that's what we did...
-//
-// These mappings were generated by running https://github.com/ConradIrwin/keyboard-inspector, tidying up the
-// output to remove languages with no mappings and other oddities, and converting it to a less verbose representation with:
-//  jq -s 'map(to_entries | map({key: .key, value: [(.value | to_entries | map(.key) | join("")), (.value | to_entries | map(.value) | join(""))]}) | from_entries) | add'
-// From there I used multi-cursor to produce this match statement.
-#[cfg(target_os = "macos")]
-pub fn get_key_equivalents(layout: &str) -> Option<HashMap<char, char>> {
-    let mappings: &[(char, char)] = match layout {
-        "com.apple.keylayout.ABC-AZERTY" => &[
-            ('!', '1'),
-            ('"', '%'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('.', ';'),
-            ('/', ':'),
-            ('0', 'à'),
-            ('1', '&'),
-            ('2', 'é'),
-            ('3', '"'),
-            ('4', '\''),
-            ('5', '('),
-            ('6', '§'),
-            ('7', 'è'),
-            ('8', '!'),
-            ('9', 'ç'),
-            (':', '°'),
-            (';', ')'),
-            ('<', '.'),
-            ('>', '/'),
-            ('@', '2'),
-            ('[', '^'),
-            ('\'', 'ù'),
-            ('\\', '`'),
-            (']', '$'),
-            ('^', '6'),
-            ('`', '<'),
-            ('{', '¨'),
-            ('|', '£'),
-            ('}', '*'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.ABC-QWERTZ" => &[
-            ('"', '`'),
-            ('#', '§'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', 'ß'),
-            (':', 'Ü'),
-            (';', 'ü'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '´'),
-            ('\\', '#'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '\''),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Albanian" => &[
-            ('"', '\''),
-            (':', 'Ç'),
-            (';', 'ç'),
-            ('<', ';'),
-            ('>', ':'),
-            ('@', '"'),
-            ('\'', '@'),
-            ('\\', 'ë'),
-            ('`', '<'),
-            ('|', 'Ë'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Austrian" => &[
-            ('"', '`'),
-            ('#', '§'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', 'ß'),
-            (':', 'Ü'),
-            (';', 'ü'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '´'),
-            ('\\', '#'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '\''),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Azeri" => &[
-            ('"', 'Ə'),
-            (',', 'ç'),
-            ('.', 'ş'),
-            ('/', '.'),
-            (':', 'I'),
-            (';', 'ı'),
-            ('<', 'Ç'),
-            ('>', 'Ş'),
-            ('?', ','),
-            ('W', 'Ü'),
-            ('[', 'ö'),
-            ('\'', 'ə'),
-            (']', 'ğ'),
-            ('w', 'ü'),
-            ('{', 'Ö'),
-            ('|', '/'),
-            ('}', 'Ğ'),
-        ],
-        "com.apple.keylayout.Belgian" => &[
-            ('!', '1'),
-            ('"', '%'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('.', ';'),
-            ('/', ':'),
-            ('0', 'à'),
-            ('1', '&'),
-            ('2', 'é'),
-            ('3', '"'),
-            ('4', '\''),
-            ('5', '('),
-            ('6', '§'),
-            ('7', 'è'),
-            ('8', '!'),
-            ('9', 'ç'),
-            (':', '°'),
-            (';', ')'),
-            ('<', '.'),
-            ('>', '/'),
-            ('@', '2'),
-            ('[', '^'),
-            ('\'', 'ù'),
-            ('\\', '`'),
-            (']', '$'),
-            ('^', '6'),
-            ('`', '<'),
-            ('{', '¨'),
-            ('|', '£'),
-            ('}', '*'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Brazilian-ABNT2" => &[
-            ('"', '`'),
-            ('/', 'ç'),
-            ('?', 'Ç'),
-            ('\'', '´'),
-            ('\\', '~'),
-            ('^', '¨'),
-            ('`', '\''),
-            ('|', '^'),
-            ('~', '"'),
-        ],
-        "com.apple.keylayout.Brazilian-Pro" => &[('^', 'ˆ'), ('~', '˜')],
-        "com.apple.keylayout.British" => &[('#', '£')],
-        "com.apple.keylayout.Canadian-CSA" => &[
-            ('"', 'È'),
-            ('/', 'é'),
-            ('<', '\''),
-            ('>', '"'),
-            ('?', 'É'),
-            ('[', '^'),
-            ('\'', 'è'),
-            ('\\', 'à'),
-            (']', 'ç'),
-            ('`', 'ù'),
-            ('{', '¨'),
-            ('|', 'À'),
-            ('}', 'Ç'),
-            ('~', 'Ù'),
-        ],
-        "com.apple.keylayout.Croatian" => &[
-            ('"', 'Ć'),
-            ('&', '\''),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            (':', 'Č'),
-            (';', 'č'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'š'),
-            ('\'', 'ć'),
-            ('\\', 'ž'),
-            (']', 'đ'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Š'),
-            ('|', 'Ž'),
-            ('}', 'Đ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Croatian-PC" => &[
-            ('"', 'Ć'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '\''),
-            (':', 'Č'),
-            (';', 'č'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'š'),
-            ('\'', 'ć'),
-            ('\\', 'ž'),
-            (']', 'đ'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Š'),
-            ('|', 'Ž'),
-            ('}', 'Đ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Czech" => &[
-            ('!', '1'),
-            ('"', '!'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('+', '%'),
-            ('/', '\''),
-            ('0', 'é'),
-            ('1', '+'),
-            ('2', 'ě'),
-            ('3', 'š'),
-            ('4', 'č'),
-            ('5', 'ř'),
-            ('6', 'ž'),
-            ('7', 'ý'),
-            ('8', 'á'),
-            ('9', 'í'),
-            (':', '"'),
-            (';', 'ů'),
-            ('<', '?'),
-            ('>', ':'),
-            ('?', 'ˇ'),
-            ('@', '2'),
-            ('[', 'ú'),
-            ('\'', '§'),
-            (']', ')'),
-            ('^', '6'),
-            ('`', '¨'),
-            ('{', 'Ú'),
-            ('}', '('),
-            ('~', '`'),
-        ],
-        "com.apple.keylayout.Czech-QWERTY" => &[
-            ('!', '1'),
-            ('"', '!'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('+', '%'),
-            ('/', '\''),
-            ('0', 'é'),
-            ('1', '+'),
-            ('2', 'ě'),
-            ('3', 'š'),
-            ('4', 'č'),
-            ('5', 'ř'),
-            ('6', 'ž'),
-            ('7', 'ý'),
-            ('8', 'á'),
-            ('9', 'í'),
-            (':', '"'),
-            (';', 'ů'),
-            ('<', '?'),
-            ('>', ':'),
-            ('?', 'ˇ'),
-            ('@', '2'),
-            ('[', 'ú'),
-            ('\'', '§'),
-            (']', ')'),
-            ('^', '6'),
-            ('`', '¨'),
-            ('{', 'Ú'),
-            ('}', '('),
-            ('~', '`'),
-        ],
-        "com.apple.keylayout.Danish" => &[
-            ('"', '^'),
-            ('$', '€'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'æ'),
-            ('\'', '¨'),
-            ('\\', '\''),
-            (']', 'ø'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Æ'),
-            ('|', '*'),
-            ('}', 'Ø'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Faroese" => &[
-            ('"', 'Ø'),
-            ('$', '€'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Æ'),
-            (';', 'æ'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'å'),
-            ('\'', 'ø'),
-            ('\\', '\''),
-            (']', 'ð'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Å'),
-            ('|', '*'),
-            ('}', 'Ð'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Finnish" => &[
-            ('"', '^'),
-            ('$', '€'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '¨'),
-            ('\\', '\''),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '*'),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.FinnishExtended" => &[
-            ('"', 'ˆ'),
-            ('$', '€'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '¨'),
-            ('\\', '\''),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '*'),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.FinnishSami-PC" => &[
-            ('"', 'ˆ'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '¨'),
-            ('\\', '@'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '*'),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.French" => &[
-            ('!', '1'),
-            ('"', '%'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('.', ';'),
-            ('/', ':'),
-            ('0', 'à'),
-            ('1', '&'),
-            ('2', 'é'),
-            ('3', '"'),
-            ('4', '\''),
-            ('5', '('),
-            ('6', '§'),
-            ('7', 'è'),
-            ('8', '!'),
-            ('9', 'ç'),
-            (':', '°'),
-            (';', ')'),
-            ('<', '.'),
-            ('>', '/'),
-            ('@', '2'),
-            ('[', '^'),
-            ('\'', 'ù'),
-            ('\\', '`'),
-            (']', '$'),
-            ('^', '6'),
-            ('`', '<'),
-            ('{', '¨'),
-            ('|', '£'),
-            ('}', '*'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.French-PC" => &[
-            ('!', '1'),
-            ('"', '%'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('-', ')'),
-            ('.', ';'),
-            ('/', ':'),
-            ('0', 'à'),
-            ('1', '&'),
-            ('2', 'é'),
-            ('3', '"'),
-            ('4', '\''),
-            ('5', '('),
-            ('6', '-'),
-            ('7', 'è'),
-            ('8', '_'),
-            ('9', 'ç'),
-            (':', '§'),
-            (';', '!'),
-            ('<', '.'),
-            ('>', '/'),
-            ('@', '2'),
-            ('[', '^'),
-            ('\'', 'ù'),
-            ('\\', '*'),
-            (']', '$'),
-            ('^', '6'),
-            ('_', '°'),
-            ('`', '<'),
-            ('{', '¨'),
-            ('|', 'μ'),
-            ('}', '£'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.French-numerical" => &[
-            ('!', '1'),
-            ('"', '%'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('.', ';'),
-            ('/', ':'),
-            ('0', 'à'),
-            ('1', '&'),
-            ('2', 'é'),
-            ('3', '"'),
-            ('4', '\''),
-            ('5', '('),
-            ('6', '§'),
-            ('7', 'è'),
-            ('8', '!'),
-            ('9', 'ç'),
-            (':', '°'),
-            (';', ')'),
-            ('<', '.'),
-            ('>', '/'),
-            ('@', '2'),
-            ('[', '^'),
-            ('\'', 'ù'),
-            ('\\', '`'),
-            (']', '$'),
-            ('^', '6'),
-            ('`', '<'),
-            ('{', '¨'),
-            ('|', '£'),
-            ('}', '*'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.German" => &[
-            ('"', '`'),
-            ('#', '§'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', 'ß'),
-            (':', 'Ü'),
-            (';', 'ü'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '´'),
-            ('\\', '#'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '\''),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.German-DIN-2137" => &[
-            ('"', '`'),
-            ('#', '§'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', 'ß'),
-            (':', 'Ü'),
-            (';', 'ü'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '´'),
-            ('\\', '#'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '\''),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Hawaiian" => &[('\'', 'ʻ')],
-        "com.apple.keylayout.Hungarian" => &[
-            ('!', '\''),
-            ('"', 'Á'),
-            ('#', '+'),
-            ('$', '!'),
-            ('&', '='),
-            ('(', ')'),
-            (')', 'Ö'),
-            ('*', '('),
-            ('+', 'Ó'),
-            ('/', 'ü'),
-            ('0', 'ö'),
-            (':', 'É'),
-            (';', 'é'),
-            ('<', 'Ü'),
-            ('=', 'ó'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ő'),
-            ('\'', 'á'),
-            ('\\', 'ű'),
-            (']', 'ú'),
-            ('^', '/'),
-            ('`', 'í'),
-            ('{', 'Ő'),
-            ('|', 'Ű'),
-            ('}', 'Ú'),
-            ('~', 'Í'),
-        ],
-        "com.apple.keylayout.Hungarian-QWERTY" => &[
-            ('!', '\''),
-            ('"', 'Á'),
-            ('#', '+'),
-            ('$', '!'),
-            ('&', '='),
-            ('(', ')'),
-            (')', 'Ö'),
-            ('*', '('),
-            ('+', 'Ó'),
-            ('/', 'ü'),
-            ('0', 'ö'),
-            (':', 'É'),
-            (';', 'é'),
-            ('<', 'Ü'),
-            ('=', 'ó'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ő'),
-            ('\'', 'á'),
-            ('\\', 'ű'),
-            (']', 'ú'),
-            ('^', '/'),
-            ('`', 'í'),
-            ('{', 'Ő'),
-            ('|', 'Ű'),
-            ('}', 'Ú'),
-            ('~', 'Í'),
-        ],
-        "com.apple.keylayout.Icelandic" => &[
-            ('"', 'Ö'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '\''),
-            (':', 'Ð'),
-            (';', 'ð'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'æ'),
-            ('\'', 'ö'),
-            ('\\', 'þ'),
-            (']', '´'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Æ'),
-            ('|', 'Þ'),
-            ('}', '´'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Irish" => &[('#', '£')],
-        "com.apple.keylayout.IrishExtended" => &[('#', '£')],
-        "com.apple.keylayout.Italian" => &[
-            ('!', '1'),
-            ('"', '%'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            (',', ';'),
-            ('.', ':'),
-            ('/', ','),
-            ('0', 'é'),
-            ('1', '&'),
-            ('2', '"'),
-            ('3', '\''),
-            ('4', '('),
-            ('5', 'ç'),
-            ('6', 'è'),
-            ('7', ')'),
-            ('8', '£'),
-            ('9', 'à'),
-            (':', '!'),
-            (';', 'ò'),
-            ('<', '.'),
-            ('>', '/'),
-            ('@', '2'),
-            ('[', 'ì'),
-            ('\'', 'ù'),
-            ('\\', '§'),
-            (']', '$'),
-            ('^', '6'),
-            ('`', '<'),
-            ('{', '^'),
-            ('|', '°'),
-            ('}', '*'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Italian-Pro" => &[
-            ('"', '^'),
-            ('#', '£'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '\''),
-            (':', 'é'),
-            (';', 'è'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ò'),
-            ('\'', 'ì'),
-            ('\\', 'ù'),
-            (']', 'à'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'ç'),
-            ('|', '§'),
-            ('}', '°'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.LatinAmerican" => &[
-            ('"', '¨'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '\''),
-            (':', 'Ñ'),
-            (';', 'ñ'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', '{'),
-            ('\'', '´'),
-            ('\\', '¿'),
-            (']', '}'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', '['),
-            ('|', '¡'),
-            ('}', ']'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Lithuanian" => &[
-            ('!', 'Ą'),
-            ('#', 'Ę'),
-            ('$', 'Ė'),
-            ('%', 'Į'),
-            ('&', 'Ų'),
-            ('*', 'Ū'),
-            ('+', 'Ž'),
-            ('1', 'ą'),
-            ('2', 'č'),
-            ('3', 'ę'),
-            ('4', 'ė'),
-            ('5', 'į'),
-            ('6', 'š'),
-            ('7', 'ų'),
-            ('8', 'ū'),
-            ('=', 'ž'),
-            ('@', 'Č'),
-            ('^', 'Š'),
-        ],
-        "com.apple.keylayout.Maltese" => &[
-            ('#', '£'),
-            ('[', 'ġ'),
-            (']', 'ħ'),
-            ('`', 'ż'),
-            ('{', 'Ġ'),
-            ('}', 'Ħ'),
-            ('~', 'Ż'),
-        ],
-        "com.apple.keylayout.NorthernSami" => &[
-            ('"', 'Ŋ'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('Q', 'Á'),
-            ('W', 'Š'),
-            ('X', 'Č'),
-            ('[', 'ø'),
-            ('\'', 'ŋ'),
-            ('\\', 'đ'),
-            (']', 'æ'),
-            ('^', '&'),
-            ('`', 'ž'),
-            ('q', 'á'),
-            ('w', 'š'),
-            ('x', 'č'),
-            ('{', 'Ø'),
-            ('|', 'Đ'),
-            ('}', 'Æ'),
-            ('~', 'Ž'),
-        ],
-        "com.apple.keylayout.Norwegian" => &[
-            ('"', '^'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ø'),
-            ('\'', '¨'),
-            ('\\', '@'),
-            (']', 'æ'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ø'),
-            ('|', '*'),
-            ('}', 'Æ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.NorwegianExtended" => &[
-            ('"', 'ˆ'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ø'),
-            ('\\', '@'),
-            (']', 'æ'),
-            ('`', '<'),
-            ('}', 'Æ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.NorwegianSami-PC" => &[
-            ('"', 'ˆ'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ø'),
-            ('\'', '¨'),
-            ('\\', '@'),
-            (']', 'æ'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ø'),
-            ('|', '*'),
-            ('}', 'Æ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Polish" => &[
-            ('!', '§'),
-            ('"', 'ę'),
-            ('#', '!'),
-            ('$', '?'),
-            ('%', '+'),
-            ('&', ':'),
-            ('(', '/'),
-            (')', '"'),
-            ('*', '_'),
-            ('+', ']'),
-            (',', '.'),
-            ('.', ','),
-            ('/', 'ż'),
-            (':', 'Ł'),
-            (';', 'ł'),
-            ('<', 'ś'),
-            ('=', '['),
-            ('>', 'ń'),
-            ('?', 'Ż'),
-            ('@', '%'),
-            ('[', 'ó'),
-            ('\'', 'ą'),
-            ('\\', ';'),
-            (']', '('),
-            ('^', '='),
-            ('_', 'ć'),
-            ('`', '<'),
-            ('{', 'ź'),
-            ('|', '$'),
-            ('}', ')'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Portuguese" => &[
-            ('"', '`'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '\''),
-            (':', 'ª'),
-            (';', 'º'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ç'),
-            ('\'', '´'),
-            (']', '~'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ç'),
-            ('}', '^'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Sami-PC" => &[
-            ('"', 'Ŋ'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('Q', 'Á'),
-            ('W', 'Š'),
-            ('X', 'Č'),
-            ('[', 'ø'),
-            ('\'', 'ŋ'),
-            ('\\', 'đ'),
-            (']', 'æ'),
-            ('^', '&'),
-            ('`', 'ž'),
-            ('q', 'á'),
-            ('w', 'š'),
-            ('x', 'č'),
-            ('{', 'Ø'),
-            ('|', 'Đ'),
-            ('}', 'Æ'),
-            ('~', 'Ž'),
-        ],
-        "com.apple.keylayout.Serbian-Latin" => &[
-            ('"', 'Ć'),
-            ('&', '\''),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            (':', 'Č'),
-            (';', 'č'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'š'),
-            ('\'', 'ć'),
-            ('\\', 'ž'),
-            (']', 'đ'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Š'),
-            ('|', 'Ž'),
-            ('}', 'Đ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Slovak" => &[
-            ('!', '1'),
-            ('"', '!'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('+', '%'),
-            ('/', '\''),
-            ('0', 'é'),
-            ('1', '+'),
-            ('2', 'ľ'),
-            ('3', 'š'),
-            ('4', 'č'),
-            ('5', 'ť'),
-            ('6', 'ž'),
-            ('7', 'ý'),
-            ('8', 'á'),
-            ('9', 'í'),
-            (':', '"'),
-            (';', 'ô'),
-            ('<', '?'),
-            ('>', ':'),
-            ('?', 'ˇ'),
-            ('@', '2'),
-            ('[', 'ú'),
-            ('\'', '§'),
-            (']', 'ä'),
-            ('^', '6'),
-            ('`', 'ň'),
-            ('{', 'Ú'),
-            ('}', 'Ä'),
-            ('~', 'Ň'),
-        ],
-        "com.apple.keylayout.Slovak-QWERTY" => &[
-            ('!', '1'),
-            ('"', '!'),
-            ('#', '3'),
-            ('$', '4'),
-            ('%', '5'),
-            ('&', '7'),
-            ('(', '9'),
-            (')', '0'),
-            ('*', '8'),
-            ('+', '%'),
-            ('/', '\''),
-            ('0', 'é'),
-            ('1', '+'),
-            ('2', 'ľ'),
-            ('3', 'š'),
-            ('4', 'č'),
-            ('5', 'ť'),
-            ('6', 'ž'),
-            ('7', 'ý'),
-            ('8', 'á'),
-            ('9', 'í'),
-            (':', '"'),
-            (';', 'ô'),
-            ('<', '?'),
-            ('>', ':'),
-            ('?', 'ˇ'),
-            ('@', '2'),
-            ('[', 'ú'),
-            ('\'', '§'),
-            (']', 'ä'),
-            ('^', '6'),
-            ('`', 'ň'),
-            ('{', 'Ú'),
-            ('}', 'Ä'),
-            ('~', 'Ň'),
-        ],
-        "com.apple.keylayout.Slovenian" => &[
-            ('"', 'Ć'),
-            ('&', '\''),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            (':', 'Č'),
-            (';', 'č'),
-            ('<', ';'),
-            ('=', '*'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'š'),
-            ('\'', 'ć'),
-            ('\\', 'ž'),
-            (']', 'đ'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Š'),
-            ('|', 'Ž'),
-            ('}', 'Đ'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Spanish" => &[
-            ('!', '¡'),
-            ('"', '¨'),
-            ('.', 'ç'),
-            ('/', '.'),
-            (':', 'º'),
-            (';', '´'),
-            ('<', '¿'),
-            ('>', 'Ç'),
-            ('@', '!'),
-            ('[', 'ñ'),
-            ('\'', '`'),
-            ('\\', '\''),
-            (']', ';'),
-            ('^', '/'),
-            ('`', '<'),
-            ('{', 'Ñ'),
-            ('|', '"'),
-            ('}', ':'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Spanish-ISO" => &[
-            ('"', '¨'),
-            ('#', '·'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('.', 'ç'),
-            ('/', '.'),
-            (':', 'º'),
-            (';', '´'),
-            ('<', '¿'),
-            ('>', 'Ç'),
-            ('@', '"'),
-            ('[', 'ñ'),
-            ('\'', '`'),
-            ('\\', '\''),
-            (']', ';'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ñ'),
-            ('|', '"'),
-            ('}', '`'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Swedish" => &[
-            ('"', '^'),
-            ('$', '€'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '¨'),
-            ('\\', '\''),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '*'),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Swedish-Pro" => &[
-            ('"', '^'),
-            ('$', '€'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '¨'),
-            ('\\', '\''),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '*'),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.SwedishSami-PC" => &[
-            ('"', 'ˆ'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('/', '´'),
-            (':', 'Å'),
-            (';', 'å'),
-            ('<', ';'),
-            ('=', '`'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '¨'),
-            ('\\', '@'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ö'),
-            ('|', '*'),
-            ('}', 'Ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.SwissFrench" => &[
-            ('!', '+'),
-            ('"', '`'),
-            ('#', '*'),
-            ('$', 'ç'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('+', '!'),
-            ('/', '\''),
-            (':', 'ü'),
-            (';', 'è'),
-            ('<', ';'),
-            ('=', '¨'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'é'),
-            ('\'', '^'),
-            ('\\', '$'),
-            (']', 'à'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'ö'),
-            ('|', '£'),
-            ('}', 'ä'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.SwissGerman" => &[
-            ('!', '+'),
-            ('"', '`'),
-            ('#', '*'),
-            ('$', 'ç'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('+', '!'),
-            ('/', '\''),
-            (':', 'è'),
-            (';', 'ü'),
-            ('<', ';'),
-            ('=', '¨'),
-            ('>', ':'),
-            ('@', '"'),
-            ('[', 'ö'),
-            ('\'', '^'),
-            ('\\', '$'),
-            (']', 'ä'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'é'),
-            ('|', '£'),
-            ('}', 'à'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Turkish" => &[
-            ('"', '-'),
-            ('#', '"'),
-            ('$', '\''),
-            ('%', '('),
-            ('&', ')'),
-            ('(', '%'),
-            (')', ':'),
-            ('*', '_'),
-            (',', 'ö'),
-            ('-', 'ş'),
-            ('.', 'ç'),
-            ('/', '.'),
-            (':', '$'),
-            ('<', 'Ö'),
-            ('>', 'Ç'),
-            ('@', '*'),
-            ('[', 'ğ'),
-            ('\'', ','),
-            ('\\', 'ü'),
-            (']', 'ı'),
-            ('^', '/'),
-            ('_', 'Ş'),
-            ('`', '<'),
-            ('{', 'Ğ'),
-            ('|', 'Ü'),
-            ('}', 'I'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Turkish-QWERTY-PC" => &[
-            ('"', 'I'),
-            ('#', '^'),
-            ('$', '+'),
-            ('&', '/'),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            ('+', ':'),
-            (',', 'ö'),
-            ('.', 'ç'),
-            ('/', '*'),
-            (':', 'Ş'),
-            (';', 'ş'),
-            ('<', 'Ö'),
-            ('=', '.'),
-            ('>', 'Ç'),
-            ('@', '\''),
-            ('[', 'ğ'),
-            ('\'', 'ı'),
-            ('\\', ','),
-            (']', 'ü'),
-            ('^', '&'),
-            ('`', '<'),
-            ('{', 'Ğ'),
-            ('|', ';'),
-            ('}', 'Ü'),
-            ('~', '>'),
-        ],
-        "com.apple.keylayout.Turkish-Standard" => &[
-            ('"', 'Ş'),
-            ('#', '^'),
-            ('&', '\''),
-            ('(', ')'),
-            (')', '='),
-            ('*', '('),
-            (',', '.'),
-            ('.', ','),
-            (':', 'Ç'),
-            (';', 'ç'),
-            ('<', ':'),
-            ('=', '*'),
-            ('>', ';'),
-            ('@', '"'),
-            ('[', 'ğ'),
-            ('\'', 'ş'),
-            ('\\', 'ü'),
-            (']', 'ı'),
-            ('^', '&'),
-            ('`', 'ö'),
-            ('{', 'Ğ'),
-            ('|', 'Ü'),
-            ('}', 'I'),
-            ('~', 'Ö'),
-        ],
-        "com.apple.keylayout.Turkmen" => &[
-            ('C', 'Ç'),
-            ('Q', 'Ä'),
-            ('V', 'Ý'),
-            ('X', 'Ü'),
-            ('[', 'ň'),
-            ('\\', 'ş'),
-            (']', 'ö'),
-            ('^', '№'),
-            ('`', 'ž'),
-            ('c', 'ç'),
-            ('q', 'ä'),
-            ('v', 'ý'),
-            ('x', 'ü'),
-            ('{', 'Ň'),
-            ('|', 'Ş'),
-            ('}', 'Ö'),
-            ('~', 'Ž'),
-        ],
-        "com.apple.keylayout.USInternational-PC" => &[('^', 'ˆ'), ('~', '˜')],
-        "com.apple.keylayout.Welsh" => &[('#', '£')],
-
-        _ => return None,
-    };
-
-    Some(HashMap::from_iter(mappings.iter().cloned()))
-}
-
-#[cfg(not(target_os = "macos"))]
-pub fn get_key_equivalents(_layout: &str) -> Option<HashMap<char, char>> {
-    None
-}
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index ae3f42853a..0e8303c4c1 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -3,7 +3,8 @@ use collections::{BTreeMap, HashMap, IndexMap};
 use fs::Fs;
 use gpui::{
     Action, ActionBuildError, App, InvalidKeystrokeError, KEYSTROKE_PARSE_EXPECTED_MESSAGE,
-    KeyBinding, KeyBindingContextPredicate, KeyBindingMetaIndex, Keystroke, NoAction, SharedString,
+    KeyBinding, KeyBindingContextPredicate, KeyBindingMetaIndex, KeybindingKeystroke, Keystroke,
+    NoAction, SharedString,
 };
 use schemars::{JsonSchema, json_schema};
 use serde::Deserialize;
@@ -211,9 +212,6 @@ impl KeymapFile {
     }
 
     pub fn load(content: &str, cx: &App) -> KeymapFileLoadResult {
-        let key_equivalents =
-            crate::key_equivalents::get_key_equivalents(cx.keyboard_layout().id());
-
         if content.is_empty() {
             return KeymapFileLoadResult::Success {
                 key_bindings: Vec::new(),
@@ -255,12 +253,6 @@ impl KeymapFile {
                 }
             };
 
-            let key_equivalents = if *use_key_equivalents {
-                key_equivalents.as_ref()
-            } else {
-                None
-            };
-
             let mut section_errors = String::new();
 
             if !unrecognized_fields.is_empty() {
@@ -278,7 +270,7 @@ impl KeymapFile {
                         keystrokes,
                         action,
                         context_predicate.clone(),
-                        key_equivalents,
+                        *use_key_equivalents,
                         cx,
                     );
                     match result {
@@ -336,7 +328,7 @@ impl KeymapFile {
         keystrokes: &str,
         action: &KeymapAction,
         context: Option<Rc<KeyBindingContextPredicate>>,
-        key_equivalents: Option<&HashMap<char, char>>,
+        use_key_equivalents: bool,
         cx: &App,
     ) -> std::result::Result<KeyBinding, String> {
         let (build_result, action_input_string) = match &action.0 {
@@ -404,8 +396,9 @@ impl KeymapFile {
             keystrokes,
             action,
             context,
-            key_equivalents,
+            use_key_equivalents,
             action_input_string.map(SharedString::from),
+            cx.keyboard_mapper().as_ref(),
         ) {
             Ok(key_binding) => key_binding,
             Err(InvalidKeystrokeError { keystroke }) => {
@@ -607,6 +600,7 @@ impl KeymapFile {
         mut operation: KeybindUpdateOperation<'a>,
         mut keymap_contents: String,
         tab_size: usize,
+        keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
     ) -> Result<String> {
         match operation {
             // if trying to replace a keybinding that is not user-defined, treat it as an add operation
@@ -646,7 +640,7 @@ impl KeymapFile {
                 .action_value()
                 .context("Failed to generate target action JSON value")?;
             let Some((index, keystrokes_str)) =
-                find_binding(&keymap, &target, &target_action_value)
+                find_binding(&keymap, &target, &target_action_value, keyboard_mapper)
             else {
                 anyhow::bail!("Failed to find keybinding to remove");
             };
@@ -681,7 +675,7 @@ impl KeymapFile {
                 .context("Failed to generate source action JSON value")?;
 
             if let Some((index, keystrokes_str)) =
-                find_binding(&keymap, &target, &target_action_value)
+                find_binding(&keymap, &target, &target_action_value, keyboard_mapper)
             {
                 if target.context == source.context {
                     // if we are only changing the keybinding (common case)
@@ -781,7 +775,7 @@ impl KeymapFile {
             }
             let use_key_equivalents = from.and_then(|from| {
                 let action_value = from.action_value().context("Failed to serialize action value. `use_key_equivalents` on new keybinding may be incorrect.").log_err()?;
-                let (index, _) = find_binding(&keymap, &from, &action_value)?;
+                let (index, _) = find_binding(&keymap, &from, &action_value, keyboard_mapper)?;
                 Some(keymap.0[index].use_key_equivalents)
             }).unwrap_or(false);
             if use_key_equivalents {
@@ -808,6 +802,7 @@ impl KeymapFile {
             keymap: &'b KeymapFile,
             target: &KeybindUpdateTarget<'a>,
             target_action_value: &Value,
+            keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
         ) -> Option<(usize, &'b str)> {
             let target_context_parsed =
                 KeyBindingContextPredicate::parse(target.context.unwrap_or("")).ok();
@@ -823,8 +818,11 @@ impl KeymapFile {
                 for (keystrokes_str, action) in bindings {
                     let Ok(keystrokes) = keystrokes_str
                         .split_whitespace()
-                        .map(Keystroke::parse)
-                        .collect::<Result<Vec<_>, _>>()
+                        .map(|source| {
+                            let keystroke = Keystroke::parse(source)?;
+                            Ok(KeybindingKeystroke::new(keystroke, false, keyboard_mapper))
+                        })
+                        .collect::<Result<Vec<_>, InvalidKeystrokeError>>()
                     else {
                         continue;
                     };
@@ -832,7 +830,7 @@ impl KeymapFile {
                         || !keystrokes
                             .iter()
                             .zip(target.keystrokes)
-                            .all(|(a, b)| a.should_match(b))
+                            .all(|(a, b)| a.inner.should_match(b))
                     {
                         continue;
                     }
@@ -847,7 +845,7 @@ impl KeymapFile {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum KeybindUpdateOperation<'a> {
     Replace {
         /// Describes the keybind to create
@@ -916,7 +914,7 @@ impl<'a> KeybindUpdateOperation<'a> {
 #[derive(Debug, Clone)]
 pub struct KeybindUpdateTarget<'a> {
     pub context: Option<&'a str>,
-    pub keystrokes: &'a [Keystroke],
+    pub keystrokes: &'a [KeybindingKeystroke],
     pub action_name: &'a str,
     pub action_arguments: Option<&'a str>,
 }
@@ -941,6 +939,9 @@ impl<'a> KeybindUpdateTarget<'a> {
     fn keystrokes_unparsed(&self) -> String {
         let mut keystrokes = String::with_capacity(self.keystrokes.len() * 8);
         for keystroke in self.keystrokes {
+            // The reason use `keystroke.unparse()` instead of `keystroke.inner.unparse()`
+            // here is that, we want the user to use `ctrl-shift-4` instead of `ctrl-$`
+            // by default on Windows.
             keystrokes.push_str(&keystroke.unparse());
             keystrokes.push(' ');
         }
@@ -959,7 +960,7 @@ impl<'a> KeybindUpdateTarget<'a> {
     }
 }
 
-#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub enum KeybindSource {
     User,
     Vim,
@@ -1020,7 +1021,7 @@ impl From<KeybindSource> for KeyBindingMetaIndex {
 
 #[cfg(test)]
 mod tests {
-    use gpui::Keystroke;
+    use gpui::{DummyKeyboardMapper, KeybindingKeystroke, Keystroke};
     use unindent::Unindent;
 
     use crate::{
@@ -1049,16 +1050,27 @@ mod tests {
         operation: KeybindUpdateOperation,
         expected: impl ToString,
     ) {
-        let result = KeymapFile::update_keybinding(operation, input.to_string(), 4)
-            .expect("Update succeeded");
+        let result = KeymapFile::update_keybinding(
+            operation,
+            input.to_string(),
+            4,
+            &gpui::DummyKeyboardMapper,
+        )
+        .expect("Update succeeded");
         pretty_assertions::assert_eq!(expected.to_string(), result);
     }
 
     #[track_caller]
-    fn parse_keystrokes(keystrokes: &str) -> Vec<Keystroke> {
+    fn parse_keystrokes(keystrokes: &str) -> Vec<KeybindingKeystroke> {
         keystrokes
             .split(' ')
-            .map(|s| Keystroke::parse(s).expect("Keystrokes valid"))
+            .map(|s| {
+                KeybindingKeystroke::new(
+                    Keystroke::parse(s).expect("Keystrokes valid"),
+                    false,
+                    &DummyKeyboardMapper,
+                )
+            })
             .collect()
     }
 
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index b73ab9ae95..1966755d62 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -1,6 +1,5 @@
 mod base_keymap_setting;
 mod editable_setting_control;
-mod key_equivalents;
 mod keymap_file;
 mod settings_file;
 mod settings_json;
@@ -14,7 +13,6 @@ use util::asset_str;
 
 pub use base_keymap_setting::*;
 pub use editable_setting_control::*;
-pub use key_equivalents::*;
 pub use keymap_file::{
     KeyBindingValidator, KeyBindingValidatorRegistration, KeybindSource, KeybindUpdateOperation,
     KeybindUpdateTarget, KeymapFile, KeymapFileLoadResult,
@@ -89,7 +87,10 @@ pub fn default_settings() -> Cow<'static, str> {
 #[cfg(target_os = "macos")]
 pub const DEFAULT_KEYMAP_PATH: &str = "keymaps/default-macos.json";
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(target_os = "windows")]
+pub const DEFAULT_KEYMAP_PATH: &str = "keymaps/default-windows.json";
+
+#[cfg(not(any(target_os = "macos", target_os = "windows")))]
 pub const DEFAULT_KEYMAP_PATH: &str = "keymaps/default-linux.json";
 
 pub fn default_keymap() -> Cow<'static, str> {
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 288f59c8e0..76c7166007 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -14,9 +14,9 @@ use gpui::{
     Action, AppContext as _, AsyncApp, Axis, ClickEvent, Context, DismissEvent, Entity,
     EventEmitter, FocusHandle, Focusable, Global, IsZero,
     KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or},
-    KeyContext, Keystroke, MouseButton, Point, ScrollStrategy, ScrollWheelEvent, Stateful,
-    StyledText, Subscription, Task, TextStyleRefinement, WeakEntity, actions, anchored, deferred,
-    div,
+    KeyContext, KeybindingKeystroke, Keystroke, MouseButton, PlatformKeyboardMapper, Point,
+    ScrollStrategy, ScrollWheelEvent, Stateful, StyledText, Subscription, Task,
+    TextStyleRefinement, WeakEntity, actions, anchored, deferred, div,
 };
 use language::{Language, LanguageConfig, ToOffset as _};
 use notifications::status_toast::{StatusToast, ToastIcon};
@@ -174,7 +174,7 @@ impl FilterState {
 
 #[derive(Debug, Default, PartialEq, Eq, Clone, Hash)]
 struct ActionMapping {
-    keystrokes: Vec<Keystroke>,
+    keystrokes: Vec<KeybindingKeystroke>,
     context: Option<SharedString>,
 }
 
@@ -236,7 +236,7 @@ struct ConflictState {
 }
 
 type ConflictKeybindMapping = HashMap<
-    Vec<Keystroke>,
+    Vec<KeybindingKeystroke>,
     Vec<(
         Option<gpui::KeyBindingContextPredicate>,
         Vec<ConflictOrigin>,
@@ -414,12 +414,14 @@ impl Focusable for KeymapEditor {
     }
 }
 /// Helper function to check if two keystroke sequences match exactly
-fn keystrokes_match_exactly(keystrokes1: &[Keystroke], keystrokes2: &[Keystroke]) -> bool {
+fn keystrokes_match_exactly(
+    keystrokes1: &[KeybindingKeystroke],
+    keystrokes2: &[KeybindingKeystroke],
+) -> bool {
     keystrokes1.len() == keystrokes2.len()
-        && keystrokes1
-            .iter()
-            .zip(keystrokes2)
-            .all(|(k1, k2)| k1.key == k2.key && k1.modifiers == k2.modifiers)
+        && keystrokes1.iter().zip(keystrokes2).all(|(k1, k2)| {
+            k1.inner.key == k2.inner.key && k1.inner.modifiers == k2.inner.modifiers
+        })
 }
 
 impl KeymapEditor {
@@ -509,7 +511,7 @@ impl KeymapEditor {
         self.filter_editor.read(cx).text(cx)
     }
 
-    fn current_keystroke_query(&self, cx: &App) -> Vec<Keystroke> {
+    fn current_keystroke_query(&self, cx: &App) -> Vec<KeybindingKeystroke> {
         match self.search_mode {
             SearchMode::KeyStroke { .. } => self.keystroke_editor.read(cx).keystrokes().to_vec(),
             SearchMode::Normal => Default::default(),
@@ -530,7 +532,7 @@ impl KeymapEditor {
 
                 let keystroke_query = keystroke_query
                     .into_iter()
-                    .map(|keystroke| keystroke.unparse())
+                    .map(|keystroke| keystroke.inner.unparse())
                     .collect::<Vec<String>>()
                     .join(" ");
 
@@ -554,7 +556,7 @@ impl KeymapEditor {
     async fn update_matches(
         this: WeakEntity<Self>,
         action_query: String,
-        keystroke_query: Vec<Keystroke>,
+        keystroke_query: Vec<KeybindingKeystroke>,
         cx: &mut AsyncApp,
     ) -> anyhow::Result<()> {
         let action_query = command_palette::normalize_action_query(&action_query);
@@ -603,13 +605,15 @@ impl KeymapEditor {
                                         {
                                             let query = &keystroke_query[query_cursor];
                                             let keystroke = &keystrokes[keystroke_cursor];
-                                            let matches =
-                                                query.modifiers.is_subset_of(&keystroke.modifiers)
-                                                    && ((query.key.is_empty()
-                                                        || query.key == keystroke.key)
-                                                        && query.key_char.as_ref().is_none_or(
-                                                            |q_kc| q_kc == &keystroke.key,
-                                                        ));
+                                            let matches = query
+                                                .inner
+                                                .modifiers
+                                                .is_subset_of(&keystroke.inner.modifiers)
+                                                && ((query.inner.key.is_empty()
+                                                    || query.inner.key == keystroke.inner.key)
+                                                    && query.inner.key_char.as_ref().is_none_or(
+                                                        |q_kc| q_kc == &keystroke.inner.key,
+                                                    ));
                                             if matches {
                                                 found_count += 1;
                                                 query_cursor += 1;
@@ -678,7 +682,7 @@ impl KeymapEditor {
                 .map(KeybindSource::from_meta)
                 .unwrap_or(KeybindSource::Unknown);
 
-            let keystroke_text = ui::text_for_keystrokes(key_binding.keystrokes(), cx);
+            let keystroke_text = ui::text_for_keybinding_keystrokes(key_binding.keystrokes(), cx);
             let ui_key_binding = ui::KeyBinding::new_from_gpui(key_binding.clone(), cx)
                 .vim_mode(source == KeybindSource::Vim);
 
@@ -1202,8 +1206,11 @@ impl KeymapEditor {
                 .read(cx)
                 .get_scrollbar_offset(Axis::Vertical),
         ));
-        cx.spawn(async move |_, _| remove_keybinding(to_remove, &fs, tab_size).await)
-            .detach_and_notify_err(window, cx);
+        let keyboard_mapper = cx.keyboard_mapper().clone();
+        cx.spawn(async move |_, _| {
+            remove_keybinding(to_remove, &fs, tab_size, keyboard_mapper.as_ref()).await
+        })
+        .detach_and_notify_err(window, cx);
     }
 
     fn copy_context_to_clipboard(
@@ -1422,7 +1429,7 @@ impl ProcessedBinding {
             .map(|keybind| keybind.get_action_mapping())
     }
 
-    fn keystrokes(&self) -> Option<&[Keystroke]> {
+    fn keystrokes(&self) -> Option<&[KeybindingKeystroke]> {
         self.ui_key_binding()
             .map(|binding| binding.keystrokes.as_slice())
     }
@@ -2220,7 +2227,7 @@ impl KeybindingEditorModal {
         Ok(action_arguments)
     }
 
-    fn validate_keystrokes(&self, cx: &App) -> anyhow::Result<Vec<Keystroke>> {
+    fn validate_keystrokes(&self, cx: &App) -> anyhow::Result<Vec<KeybindingKeystroke>> {
         let new_keystrokes = self
             .keybind_editor
             .read_with(cx, |editor, _| editor.keystrokes().to_vec());
@@ -2316,6 +2323,7 @@ impl KeybindingEditorModal {
         }).unwrap_or(Ok(()))?;
 
         let create = self.creating;
+        let keyboard_mapper = cx.keyboard_mapper().clone();
 
         cx.spawn(async move |this, cx| {
             let action_name = existing_keybind.action().name;
@@ -2328,6 +2336,7 @@ impl KeybindingEditorModal {
                 new_action_args.as_deref(),
                 &fs,
                 tab_size,
+                keyboard_mapper.as_ref(),
             )
             .await
             {
@@ -2445,11 +2454,21 @@ impl KeybindingEditorModal {
     }
 }
 
-fn remove_key_char(Keystroke { modifiers, key, .. }: Keystroke) -> Keystroke {
-    Keystroke {
-        modifiers,
-        key,
-        ..Default::default()
+fn remove_key_char(
+    KeybindingKeystroke {
+        inner,
+        display_modifiers,
+        display_key,
+    }: KeybindingKeystroke,
+) -> KeybindingKeystroke {
+    KeybindingKeystroke {
+        inner: Keystroke {
+            modifiers: inner.modifiers,
+            key: inner.key,
+            key_char: None,
+        },
+        display_modifiers,
+        display_key,
     }
 }
 
@@ -2992,6 +3011,7 @@ async fn save_keybinding_update(
     new_args: Option<&str>,
     fs: &Arc<dyn Fs>,
     tab_size: usize,
+    keyboard_mapper: &dyn PlatformKeyboardMapper,
 ) -> anyhow::Result<()> {
     let keymap_contents = settings::KeymapFile::load_keymap_file(fs)
         .await
@@ -3034,9 +3054,13 @@ async fn save_keybinding_update(
 
     let (new_keybinding, removed_keybinding, source) = operation.generate_telemetry();
 
-    let updated_keymap_contents =
-        settings::KeymapFile::update_keybinding(operation, keymap_contents, tab_size)
-            .map_err(|err| anyhow::anyhow!("Could not save updated keybinding: {}", err))?;
+    let updated_keymap_contents = settings::KeymapFile::update_keybinding(
+        operation,
+        keymap_contents,
+        tab_size,
+        keyboard_mapper,
+    )
+    .map_err(|err| anyhow::anyhow!("Could not save updated keybinding: {}", err))?;
     fs.write(
         paths::keymap_file().as_path(),
         updated_keymap_contents.as_bytes(),
@@ -3057,6 +3081,7 @@ async fn remove_keybinding(
     existing: ProcessedBinding,
     fs: &Arc<dyn Fs>,
     tab_size: usize,
+    keyboard_mapper: &dyn PlatformKeyboardMapper,
 ) -> anyhow::Result<()> {
     let Some(keystrokes) = existing.keystrokes() else {
         anyhow::bail!("Cannot remove a keybinding that does not exist");
@@ -3080,9 +3105,13 @@ async fn remove_keybinding(
     };
 
     let (new_keybinding, removed_keybinding, source) = operation.generate_telemetry();
-    let updated_keymap_contents =
-        settings::KeymapFile::update_keybinding(operation, keymap_contents, tab_size)
-            .context("Failed to update keybinding")?;
+    let updated_keymap_contents = settings::KeymapFile::update_keybinding(
+        operation,
+        keymap_contents,
+        tab_size,
+        keyboard_mapper,
+    )
+    .context("Failed to update keybinding")?;
     fs.write(
         paths::keymap_file().as_path(),
         updated_keymap_contents.as_bytes(),
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/settings_ui/src/ui_components/keystroke_input.rs
index 1b8010853e..ca50d5c03d 100644
--- a/crates/settings_ui/src/ui_components/keystroke_input.rs
+++ b/crates/settings_ui/src/ui_components/keystroke_input.rs
@@ -1,6 +1,6 @@
 use gpui::{
     Animation, AnimationExt, Context, EventEmitter, FocusHandle, Focusable, FontWeight, KeyContext,
-    Keystroke, Modifiers, ModifiersChangedEvent, Subscription, Task, actions,
+    KeybindingKeystroke, Keystroke, Modifiers, ModifiersChangedEvent, Subscription, Task, actions,
 };
 use ui::{
     ActiveTheme as _, Color, IconButton, IconButtonShape, IconName, IconSize, Label, LabelSize,
@@ -42,8 +42,8 @@ impl PartialEq for CloseKeystrokeResult {
 }
 
 pub struct KeystrokeInput {
-    keystrokes: Vec<Keystroke>,
-    placeholder_keystrokes: Option<Vec<Keystroke>>,
+    keystrokes: Vec<KeybindingKeystroke>,
+    placeholder_keystrokes: Option<Vec<KeybindingKeystroke>>,
     outer_focus_handle: FocusHandle,
     inner_focus_handle: FocusHandle,
     intercept_subscription: Option<Subscription>,
@@ -70,7 +70,7 @@ impl KeystrokeInput {
     const KEYSTROKE_COUNT_MAX: usize = 3;
 
     pub fn new(
-        placeholder_keystrokes: Option<Vec<Keystroke>>,
+        placeholder_keystrokes: Option<Vec<KeybindingKeystroke>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -97,7 +97,7 @@ impl KeystrokeInput {
         }
     }
 
-    pub fn set_keystrokes(&mut self, keystrokes: Vec<Keystroke>, cx: &mut Context<Self>) {
+    pub fn set_keystrokes(&mut self, keystrokes: Vec<KeybindingKeystroke>, cx: &mut Context<Self>) {
         self.keystrokes = keystrokes;
         self.keystrokes_changed(cx);
     }
@@ -106,7 +106,7 @@ impl KeystrokeInput {
         self.search = search;
     }
 
-    pub fn keystrokes(&self) -> &[Keystroke] {
+    pub fn keystrokes(&self) -> &[KeybindingKeystroke] {
         if let Some(placeholders) = self.placeholder_keystrokes.as_ref()
             && self.keystrokes.is_empty()
         {
@@ -116,18 +116,22 @@ impl KeystrokeInput {
             && self
                 .keystrokes
                 .last()
-                .is_some_and(|last| last.key.is_empty())
+                .is_some_and(|last| last.display_key.is_empty())
         {
             return &self.keystrokes[..self.keystrokes.len() - 1];
         }
         &self.keystrokes
     }
 
-    fn dummy(modifiers: Modifiers) -> Keystroke {
-        Keystroke {
-            modifiers,
-            key: "".to_string(),
-            key_char: None,
+    fn dummy(modifiers: Modifiers) -> KeybindingKeystroke {
+        KeybindingKeystroke {
+            inner: Keystroke {
+                modifiers,
+                key: "".to_string(),
+                key_char: None,
+            },
+            display_modifiers: modifiers,
+            display_key: "".to_string(),
         }
     }
 
@@ -254,7 +258,7 @@ impl KeystrokeInput {
         self.keystrokes_changed(cx);
 
         if let Some(last) = self.keystrokes.last_mut()
-            && last.key.is_empty()
+            && last.display_key.is_empty()
             && keystrokes_len <= Self::KEYSTROKE_COUNT_MAX
         {
             if !self.search && !event.modifiers.modified() {
@@ -263,13 +267,15 @@ impl KeystrokeInput {
             }
             if self.search {
                 if self.previous_modifiers.modified() {
-                    last.modifiers |= event.modifiers;
+                    last.display_modifiers |= event.modifiers;
+                    last.inner.modifiers |= event.modifiers;
                 } else {
                     self.keystrokes.push(Self::dummy(event.modifiers));
                 }
                 self.previous_modifiers |= event.modifiers;
             } else {
-                last.modifiers = event.modifiers;
+                last.display_modifiers = event.modifiers;
+                last.inner.modifiers = event.modifiers;
                 return;
             }
         } else if keystrokes_len < Self::KEYSTROKE_COUNT_MAX {
@@ -297,14 +303,17 @@ impl KeystrokeInput {
             return;
         }
 
-        let mut keystroke = keystroke.clone();
+        let mut keystroke =
+            KeybindingKeystroke::new(keystroke.clone(), false, cx.keyboard_mapper().as_ref());
         if let Some(last) = self.keystrokes.last()
-            && last.key.is_empty()
+            && last.display_key.is_empty()
             && (!self.search || self.previous_modifiers.modified())
         {
-            let key = keystroke.key.clone();
+            let display_key = keystroke.display_key.clone();
+            let inner_key = keystroke.inner.key.clone();
             keystroke = last.clone();
-            keystroke.key = key;
+            keystroke.display_key = display_key;
+            keystroke.inner.key = inner_key;
             self.keystrokes.pop();
         }
 
@@ -324,11 +333,14 @@ impl KeystrokeInput {
         self.keystrokes_changed(cx);
 
         if self.search {
-            self.previous_modifiers = keystroke.modifiers;
+            self.previous_modifiers = keystroke.display_modifiers;
             return;
         }
-        if self.keystrokes.len() < Self::KEYSTROKE_COUNT_MAX && keystroke.modifiers.modified() {
-            self.keystrokes.push(Self::dummy(keystroke.modifiers));
+        if self.keystrokes.len() < Self::KEYSTROKE_COUNT_MAX
+            && keystroke.display_modifiers.modified()
+        {
+            self.keystrokes
+                .push(Self::dummy(keystroke.display_modifiers));
         }
     }
 
@@ -364,7 +376,7 @@ impl KeystrokeInput {
             &self.keystrokes
         };
         keystrokes.iter().map(move |keystroke| {
-            h_flex().children(ui::render_keystroke(
+            h_flex().children(ui::render_keybinding_keystroke(
                 keystroke,
                 Some(Color::Default),
                 Some(rems(0.875).into()),
@@ -809,9 +821,13 @@ mod tests {
         /// Verifies that the keystrokes match the expected strings
         #[track_caller]
         pub fn expect_keystrokes(&mut self, expected: &[&str]) -> &mut Self {
-            let actual = self
-                .input
-                .read_with(&self.cx, |input, _| input.keystrokes.clone());
+            let actual: Vec<Keystroke> = self.input.read_with(&self.cx, |input, _| {
+                input
+                    .keystrokes
+                    .iter()
+                    .map(|keystroke| keystroke.inner.clone())
+                    .collect()
+            });
             Self::expect_keystrokes_equal(&actual, expected);
             self
         }
@@ -939,7 +955,7 @@ mod tests {
     }
 
     struct KeystrokeUpdateTracker {
-        initial_keystrokes: Vec<Keystroke>,
+        initial_keystrokes: Vec<KeybindingKeystroke>,
         _subscription: Subscription,
         input: Entity<KeystrokeInput>,
         received_keystrokes_updated: bool,
@@ -983,8 +999,8 @@ mod tests {
                 );
             }
 
-            fn keystrokes_str(ks: &[Keystroke]) -> String {
-                ks.iter().map(|ks| ks.unparse()).join(" ")
+            fn keystrokes_str(ks: &[KeybindingKeystroke]) -> String {
+                ks.iter().map(|ks| ks.inner.unparse()).join(" ")
             }
         }
     }
diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs
index 1e7bb40c40..81817045dc 100644
--- a/crates/ui/src/components/keybinding.rs
+++ b/crates/ui/src/components/keybinding.rs
@@ -1,8 +1,8 @@
 use crate::PlatformStyle;
 use crate::{Icon, IconName, IconSize, h_flex, prelude::*};
 use gpui::{
-    Action, AnyElement, App, FocusHandle, Global, IntoElement, Keystroke, Modifiers, Window,
-    relative,
+    Action, AnyElement, App, FocusHandle, Global, IntoElement, KeybindingKeystroke, Keystroke,
+    Modifiers, Window, relative,
 };
 use itertools::Itertools;
 
@@ -13,7 +13,7 @@ pub struct KeyBinding {
     /// More than one keystroke produces a chord.
     ///
     /// This should always contain at least one keystroke.
-    pub keystrokes: Vec<Keystroke>,
+    pub keystrokes: Vec<KeybindingKeystroke>,
 
     /// The [`PlatformStyle`] to use when displaying this keybinding.
     platform_style: PlatformStyle,
@@ -59,7 +59,7 @@ impl KeyBinding {
         cx.try_global::<VimStyle>().is_some_and(|g| g.0)
     }
 
-    pub fn new(keystrokes: Vec<Keystroke>, cx: &App) -> Self {
+    pub fn new(keystrokes: Vec<KeybindingKeystroke>, cx: &App) -> Self {
         Self {
             keystrokes,
             platform_style: PlatformStyle::platform(),
@@ -99,16 +99,16 @@ impl KeyBinding {
 }
 
 fn render_key(
-    keystroke: &Keystroke,
+    key: &str,
     color: Option<Color>,
     platform_style: PlatformStyle,
     size: impl Into<Option<AbsoluteLength>>,
 ) -> AnyElement {
-    let key_icon = icon_for_key(keystroke, platform_style);
+    let key_icon = icon_for_key(key, platform_style);
     match key_icon {
         Some(icon) => KeyIcon::new(icon, color).size(size).into_any_element(),
         None => {
-            let key = util::capitalize(&keystroke.key);
+            let key = util::capitalize(key);
             Key::new(&key, color).size(size).into_any_element()
         }
     }
@@ -124,7 +124,7 @@ impl RenderOnce for KeyBinding {
                     "KEY_BINDING-{}",
                     self.keystrokes
                         .iter()
-                        .map(|k| k.key.to_string())
+                        .map(|k| k.display_key.to_string())
                         .collect::<Vec<_>>()
                         .join(" ")
                 )
@@ -137,7 +137,7 @@ impl RenderOnce for KeyBinding {
                     .py_0p5()
                     .rounded_xs()
                     .text_color(cx.theme().colors().text_muted)
-                    .children(render_keystroke(
+                    .children(render_keybinding_keystroke(
                         keystroke,
                         color,
                         self.size,
@@ -148,8 +148,8 @@ impl RenderOnce for KeyBinding {
     }
 }
 
-pub fn render_keystroke(
-    keystroke: &Keystroke,
+pub fn render_keybinding_keystroke(
+    keystroke: &KeybindingKeystroke,
     color: Option<Color>,
     size: impl Into<Option<AbsoluteLength>>,
     platform_style: PlatformStyle,
@@ -163,26 +163,39 @@ pub fn render_keystroke(
     let size = size.into();
 
     if use_text {
-        let element = Key::new(keystroke_text(keystroke, platform_style, vim_mode), color)
-            .size(size)
-            .into_any_element();
+        let element = Key::new(
+            keystroke_text(
+                &keystroke.display_modifiers,
+                &keystroke.display_key,
+                platform_style,
+                vim_mode,
+            ),
+            color,
+        )
+        .size(size)
+        .into_any_element();
         vec![element]
     } else {
         let mut elements = Vec::new();
         elements.extend(render_modifiers(
-            &keystroke.modifiers,
+            &keystroke.display_modifiers,
             platform_style,
             color,
             size,
             true,
         ));
-        elements.push(render_key(keystroke, color, platform_style, size));
+        elements.push(render_key(
+            &keystroke.display_key,
+            color,
+            platform_style,
+            size,
+        ));
         elements
     }
 }
 
-fn icon_for_key(keystroke: &Keystroke, platform_style: PlatformStyle) -> Option<IconName> {
-    match keystroke.key.as_str() {
+fn icon_for_key(key: &str, platform_style: PlatformStyle) -> Option<IconName> {
+    match key {
         "left" => Some(IconName::ArrowLeft),
         "right" => Some(IconName::ArrowRight),
         "up" => Some(IconName::ArrowUp),
@@ -379,7 +392,7 @@ impl KeyIcon {
 /// Returns a textual representation of the key binding for the given [`Action`].
 pub fn text_for_action(action: &dyn Action, window: &Window, cx: &App) -> Option<String> {
     let key_binding = window.highest_precedence_binding_for_action(action)?;
-    Some(text_for_keystrokes(key_binding.keystrokes(), cx))
+    Some(text_for_keybinding_keystrokes(key_binding.keystrokes(), cx))
 }
 
 pub fn text_for_keystrokes(keystrokes: &[Keystroke], cx: &App) -> String {
@@ -387,22 +400,50 @@ pub fn text_for_keystrokes(keystrokes: &[Keystroke], cx: &App) -> String {
     let vim_enabled = cx.try_global::<VimStyle>().is_some();
     keystrokes
         .iter()
-        .map(|keystroke| keystroke_text(keystroke, platform_style, vim_enabled))
+        .map(|keystroke| {
+            keystroke_text(
+                &keystroke.modifiers,
+                &keystroke.key,
+                platform_style,
+                vim_enabled,
+            )
+        })
         .join(" ")
 }
 
-pub fn text_for_keystroke(keystroke: &Keystroke, cx: &App) -> String {
+pub fn text_for_keybinding_keystrokes(keystrokes: &[KeybindingKeystroke], cx: &App) -> String {
     let platform_style = PlatformStyle::platform();
     let vim_enabled = cx.try_global::<VimStyle>().is_some();
-    keystroke_text(keystroke, platform_style, vim_enabled)
+    keystrokes
+        .iter()
+        .map(|keystroke| {
+            keystroke_text(
+                &keystroke.display_modifiers,
+                &keystroke.display_key,
+                platform_style,
+                vim_enabled,
+            )
+        })
+        .join(" ")
+}
+
+pub fn text_for_keystroke(modifiers: &Modifiers, key: &str, cx: &App) -> String {
+    let platform_style = PlatformStyle::platform();
+    let vim_enabled = cx.try_global::<VimStyle>().is_some();
+    keystroke_text(modifiers, key, platform_style, vim_enabled)
 }
 
 /// Returns a textual representation of the given [`Keystroke`].
-fn keystroke_text(keystroke: &Keystroke, platform_style: PlatformStyle, vim_mode: bool) -> String {
+fn keystroke_text(
+    modifiers: &Modifiers,
+    key: &str,
+    platform_style: PlatformStyle,
+    vim_mode: bool,
+) -> String {
     let mut text = String::new();
     let delimiter = '-';
 
-    if keystroke.modifiers.function {
+    if modifiers.function {
         match vim_mode {
             false => text.push_str("Fn"),
             true => text.push_str("fn"),
@@ -411,7 +452,7 @@ fn keystroke_text(keystroke: &Keystroke, platform_style: PlatformStyle, vim_mode
         text.push(delimiter);
     }
 
-    if keystroke.modifiers.control {
+    if modifiers.control {
         match (platform_style, vim_mode) {
             (PlatformStyle::Mac, false) => text.push_str("Control"),
             (PlatformStyle::Linux | PlatformStyle::Windows, false) => text.push_str("Ctrl"),
@@ -421,7 +462,7 @@ fn keystroke_text(keystroke: &Keystroke, platform_style: PlatformStyle, vim_mode
         text.push(delimiter);
     }
 
-    if keystroke.modifiers.platform {
+    if modifiers.platform {
         match (platform_style, vim_mode) {
             (PlatformStyle::Mac, false) => text.push_str("Command"),
             (PlatformStyle::Mac, true) => text.push_str("cmd"),
@@ -434,7 +475,7 @@ fn keystroke_text(keystroke: &Keystroke, platform_style: PlatformStyle, vim_mode
         text.push(delimiter);
     }
 
-    if keystroke.modifiers.alt {
+    if modifiers.alt {
         match (platform_style, vim_mode) {
             (PlatformStyle::Mac, false) => text.push_str("Option"),
             (PlatformStyle::Linux | PlatformStyle::Windows, false) => text.push_str("Alt"),
@@ -444,7 +485,7 @@ fn keystroke_text(keystroke: &Keystroke, platform_style: PlatformStyle, vim_mode
         text.push(delimiter);
     }
 
-    if keystroke.modifiers.shift {
+    if modifiers.shift {
         match (platform_style, vim_mode) {
             (_, false) => text.push_str("Shift"),
             (_, true) => text.push_str("shift"),
@@ -453,9 +494,9 @@ fn keystroke_text(keystroke: &Keystroke, platform_style: PlatformStyle, vim_mode
     }
 
     if vim_mode {
-        text.push_str(&keystroke.key)
+        text.push_str(key)
     } else {
-        let key = match keystroke.key.as_str() {
+        let key = match key {
             "pageup" => "PageUp",
             "pagedown" => "PageDown",
             key => &util::capitalize(key),
@@ -562,9 +603,11 @@ mod tests {
 
     #[test]
     fn test_text_for_keystroke() {
+        let keystroke = Keystroke::parse("cmd-c").unwrap();
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("cmd-c").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Mac,
                 false
             ),
@@ -572,7 +615,8 @@ mod tests {
         );
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("cmd-c").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Linux,
                 false
             ),
@@ -580,16 +624,19 @@ mod tests {
         );
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("cmd-c").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Windows,
                 false
             ),
             "Win-C".to_string()
         );
 
+        let keystroke = Keystroke::parse("ctrl-alt-delete").unwrap();
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("ctrl-alt-delete").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Mac,
                 false
             ),
@@ -597,7 +644,8 @@ mod tests {
         );
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("ctrl-alt-delete").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Linux,
                 false
             ),
@@ -605,16 +653,19 @@ mod tests {
         );
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("ctrl-alt-delete").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Windows,
                 false
             ),
             "Ctrl-Alt-Delete".to_string()
         );
 
+        let keystroke = Keystroke::parse("shift-pageup").unwrap();
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("shift-pageup").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Mac,
                 false
             ),
@@ -622,7 +673,8 @@ mod tests {
         );
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("shift-pageup").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Linux,
                 false,
             ),
@@ -630,7 +682,8 @@ mod tests {
         );
         assert_eq!(
             keystroke_text(
-                &Keystroke::parse("shift-pageup").unwrap(),
+                &keystroke.modifiers,
+                &keystroke.key,
                 PlatformStyle::Windows,
                 false
             ),
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 638e1dca0e..553444ebdb 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1308,11 +1308,11 @@ pub fn handle_keymap_file_changes(
     })
     .detach();
 
-    let mut current_mapping = settings::get_key_equivalents(cx.keyboard_layout().id());
+    let mut current_layout_id = cx.keyboard_layout().id().to_string();
     cx.on_keyboard_layout_change(move |cx| {
-        let next_mapping = settings::get_key_equivalents(cx.keyboard_layout().id());
-        if next_mapping != current_mapping {
-            current_mapping = next_mapping;
+        let next_layout_id = cx.keyboard_layout().id();
+        if next_layout_id != current_layout_id {
+            current_layout_id = next_layout_id.to_string();
             keyboard_layout_tx.unbounded_send(()).ok();
         }
     })
@@ -4729,7 +4729,7 @@ mod tests {
                 // and key strokes contain the given key
                 bindings
                     .into_iter()
-                    .any(|binding| binding.keystrokes().iter().any(|k| k.key == key)),
+                    .any(|binding| binding.keystrokes().iter().any(|k| k.display_key == key)),
                 "On {} Failed to find {} with key binding {}",
                 line,
                 action.name(),
diff --git a/crates/zed/src/zed/quick_action_bar/preview.rs b/crates/zed/src/zed/quick_action_bar/preview.rs
index 3772104f39..fb5a75f78d 100644
--- a/crates/zed/src/zed/quick_action_bar/preview.rs
+++ b/crates/zed/src/zed/quick_action_bar/preview.rs
@@ -72,7 +72,10 @@ impl QuickActionBar {
                 Tooltip::with_meta(
                     tooltip_text,
                     Some(open_action_for_tooltip),
-                    format!("{} to open in a split", text_for_keystroke(&alt_click, cx)),
+                    format!(
+                        "{} to open in a split",
+                        text_for_keystroke(&alt_click.modifiers, &alt_click.key, cx)
+                    ),
                     window,
                     cx,
                 )

From c5d3c7d790cdfda178aed768f00d488c45805e60 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 26 Aug 2025 16:58:23 -0300
Subject: [PATCH 382/823] thread view: Improve agent installation UI (#36957)

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/icons/terminal_ghost.svg        |   4 +
 crates/agent_ui/src/acp/thread_view.rs | 253 ++++++++++++++-----------
 crates/icons/src/icons.rs              |   1 +
 3 files changed, 143 insertions(+), 115 deletions(-)
 create mode 100644 assets/icons/terminal_ghost.svg

diff --git a/assets/icons/terminal_ghost.svg b/assets/icons/terminal_ghost.svg
new file mode 100644
index 0000000000..7d0d0e068e
--- /dev/null
+++ b/assets/icons/terminal_ghost.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 12.375H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 11.125L6.75003 7.375L3 3.62497" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f3b1e6ce3b..c68c3a3e93 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -43,7 +43,7 @@ use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
     Callout, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding, PopoverMenuHandle,
-    Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
+    Scrollbar, ScrollbarState, SpinnerLabel, TintColor, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -278,6 +278,7 @@ pub struct AcpThreadView {
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     is_loading_contents: bool,
+    install_command_markdown: Entity<Markdown>,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
 }
@@ -391,6 +392,7 @@ impl AcpThreadView {
             hovered_recent_history_item: None,
             prompt_capabilities,
             is_loading_contents: false,
+            install_command_markdown: cx.new(|cx| Markdown::new("".into(), None, None, cx)),
             _subscriptions: subscriptions,
             _cancel_task: None,
             focus_handle: cx.focus_handle(),
@@ -666,7 +668,12 @@ impl AcpThreadView {
         match &self.thread_state {
             ThreadState::Ready { .. } | ThreadState::Unauthenticated { .. } => "New Thread".into(),
             ThreadState::Loading { .. } => "Loading…".into(),
-            ThreadState::LoadError(_) => "Failed to load".into(),
+            ThreadState::LoadError(error) => match error {
+                LoadError::NotInstalled { .. } => format!("Install {}", self.agent.name()).into(),
+                LoadError::Unsupported { .. } => format!("Upgrade {}", self.agent.name()).into(),
+                LoadError::Exited { .. } => format!("{} Exited", self.agent.name()).into(),
+                LoadError::Other(_) => format!("Error Loading {}", self.agent.name()).into(),
+            },
         }
     }
 
@@ -2834,125 +2841,26 @@ impl AcpThreadView {
         )
     }
 
-    fn render_load_error(&self, e: &LoadError, cx: &Context<Self>) -> AnyElement {
-        let (message, action_slot) = match e {
+    fn render_load_error(
+        &self,
+        e: &LoadError,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> AnyElement {
+        let (message, action_slot): (SharedString, _) = match e {
             LoadError::NotInstalled {
-                error_message,
-                install_message,
+                error_message: _,
+                install_message: _,
                 install_command,
             } => {
-                let install_command = install_command.clone();
-                let button = Button::new("install", install_message)
-                    .tooltip(Tooltip::text(install_command.clone()))
-                    .style(ButtonStyle::Outlined)
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::Download)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .icon_position(IconPosition::Start)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        telemetry::event!("Agent Install CLI", agent = this.agent.telemetry_id());
-
-                        let task = this
-                            .workspace
-                            .update(cx, |workspace, cx| {
-                                let project = workspace.project().read(cx);
-                                let cwd = project.first_project_directory(cx);
-                                let shell = project.terminal_settings(&cwd, cx).shell.clone();
-                                let spawn_in_terminal = task::SpawnInTerminal {
-                                    id: task::TaskId(install_command.clone()),
-                                    full_label: install_command.clone(),
-                                    label: install_command.clone(),
-                                    command: Some(install_command.clone()),
-                                    args: Vec::new(),
-                                    command_label: install_command.clone(),
-                                    cwd,
-                                    env: Default::default(),
-                                    use_new_terminal: true,
-                                    allow_concurrent_runs: true,
-                                    reveal: Default::default(),
-                                    reveal_target: Default::default(),
-                                    hide: Default::default(),
-                                    shell,
-                                    show_summary: true,
-                                    show_command: true,
-                                    show_rerun: false,
-                                };
-                                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
-                            })
-                            .ok();
-                        let Some(task) = task else { return };
-                        cx.spawn_in(window, async move |this, cx| {
-                            if let Some(Ok(_)) = task.await {
-                                this.update_in(cx, |this, window, cx| {
-                                    this.reset(window, cx);
-                                })
-                                .ok();
-                            }
-                        })
-                        .detach()
-                    }));
-
-                (error_message.clone(), Some(button.into_any_element()))
+                return self.render_not_installed(install_command.clone(), false, window, cx);
             }
             LoadError::Unsupported {
-                error_message,
-                upgrade_message,
+                error_message: _,
+                upgrade_message: _,
                 upgrade_command,
             } => {
-                let upgrade_command = upgrade_command.clone();
-                let button = Button::new("upgrade", upgrade_message)
-                    .tooltip(Tooltip::text(upgrade_command.clone()))
-                    .style(ButtonStyle::Outlined)
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::Download)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .icon_position(IconPosition::Start)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        telemetry::event!("Agent Upgrade CLI", agent = this.agent.telemetry_id());
-
-                        let task = this
-                            .workspace
-                            .update(cx, |workspace, cx| {
-                                let project = workspace.project().read(cx);
-                                let cwd = project.first_project_directory(cx);
-                                let shell = project.terminal_settings(&cwd, cx).shell.clone();
-                                let spawn_in_terminal = task::SpawnInTerminal {
-                                    id: task::TaskId(upgrade_command.to_string()),
-                                    full_label: upgrade_command.clone(),
-                                    label: upgrade_command.clone(),
-                                    command: Some(upgrade_command.clone()),
-                                    args: Vec::new(),
-                                    command_label: upgrade_command.clone(),
-                                    cwd,
-                                    env: Default::default(),
-                                    use_new_terminal: true,
-                                    allow_concurrent_runs: true,
-                                    reveal: Default::default(),
-                                    reveal_target: Default::default(),
-                                    hide: Default::default(),
-                                    shell,
-                                    show_summary: true,
-                                    show_command: true,
-                                    show_rerun: false,
-                                };
-                                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
-                            })
-                            .ok();
-                        let Some(task) = task else { return };
-                        cx.spawn_in(window, async move |this, cx| {
-                            if let Some(Ok(_)) = task.await {
-                                this.update_in(cx, |this, window, cx| {
-                                    this.reset(window, cx);
-                                })
-                                .ok();
-                            }
-                        })
-                        .detach()
-                    }));
-
-                (error_message.clone(), Some(button.into_any_element()))
+                return self.render_not_installed(upgrade_command.clone(), true, window, cx);
             }
             LoadError::Exited { .. } => ("Server exited with status {status}".into(), None),
             LoadError::Other(msg) => (
@@ -2970,6 +2878,121 @@ impl AcpThreadView {
             .into_any_element()
     }
 
+    fn install_agent(&self, install_command: String, window: &mut Window, cx: &mut Context<Self>) {
+        telemetry::event!("Agent Install CLI", agent = self.agent.telemetry_id());
+        let task = self
+            .workspace
+            .update(cx, |workspace, cx| {
+                let project = workspace.project().read(cx);
+                let cwd = project.first_project_directory(cx);
+                let shell = project.terminal_settings(&cwd, cx).shell.clone();
+                let spawn_in_terminal = task::SpawnInTerminal {
+                    id: task::TaskId(install_command.clone()),
+                    full_label: install_command.clone(),
+                    label: install_command.clone(),
+                    command: Some(install_command.clone()),
+                    args: Vec::new(),
+                    command_label: install_command.clone(),
+                    cwd,
+                    env: Default::default(),
+                    use_new_terminal: true,
+                    allow_concurrent_runs: true,
+                    reveal: Default::default(),
+                    reveal_target: Default::default(),
+                    hide: Default::default(),
+                    shell,
+                    show_summary: true,
+                    show_command: true,
+                    show_rerun: false,
+                };
+                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
+            })
+            .ok();
+        let Some(task) = task else { return };
+        cx.spawn_in(window, async move |this, cx| {
+            if let Some(Ok(_)) = task.await {
+                this.update_in(cx, |this, window, cx| {
+                    this.reset(window, cx);
+                })
+                .ok();
+            }
+        })
+        .detach()
+    }
+
+    fn render_not_installed(
+        &self,
+        install_command: String,
+        is_upgrade: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> AnyElement {
+        self.install_command_markdown.update(cx, |markdown, cx| {
+            if !markdown.source().contains(&install_command) {
+                markdown.replace(format!("```\n{}\n```", install_command), cx);
+            }
+        });
+
+        let (heading_label, description_label, button_label, or_label) = if is_upgrade {
+            (
+                "Upgrade Gemini CLI in Zed",
+                "Get access to the latest version with support for Zed.",
+                "Upgrade Gemini CLI",
+                "Or, to upgrade it manually:",
+            )
+        } else {
+            (
+                "Get Started with Gemini CLI in Zed",
+                "Use Google's new coding agent directly in Zed.",
+                "Install Gemini CLI",
+                "Or, to install it manually:",
+            )
+        };
+
+        v_flex()
+            .w_full()
+            .p_3p5()
+            .gap_2p5()
+            .border_t_1()
+            .border_color(cx.theme().colors().border)
+            .bg(linear_gradient(
+                180.,
+                linear_color_stop(cx.theme().colors().editor_background.opacity(0.4), 4.),
+                linear_color_stop(cx.theme().status().info_background.opacity(0.), 0.),
+            ))
+            .child(
+                v_flex().gap_0p5().child(Label::new(heading_label)).child(
+                    Label::new(description_label)
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                ),
+            )
+            .child(
+                Button::new("install_gemini", button_label)
+                    .full_width()
+                    .size(ButtonSize::Medium)
+                    .style(ButtonStyle::Tinted(TintColor::Accent))
+                    .label_size(LabelSize::Small)
+                    .icon(IconName::TerminalGhost)
+                    .icon_color(Color::Muted)
+                    .icon_size(IconSize::Small)
+                    .icon_position(IconPosition::Start)
+                    .on_click(cx.listener(move |this, _, window, cx| {
+                        this.install_agent(install_command.clone(), window, cx)
+                    })),
+            )
+            .child(
+                Label::new(or_label)
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .child(MarkdownElement::new(
+                self.install_command_markdown.clone(),
+                default_markdown_style(false, false, window, cx),
+            ))
+            .into_any_element()
+    }
+
     fn render_activity_bar(
         &self,
         thread_entity: &Entity<AcpThread>,
@@ -4943,7 +4966,7 @@ impl Render for AcpThreadView {
                     .size_full()
                     .items_center()
                     .justify_end()
-                    .child(self.render_load_error(e, cx)),
+                    .child(self.render_load_error(e, window, cx)),
                 ThreadState::Ready { .. } => v_flex().flex_1().map(|this| {
                     if has_messages {
                         this.child(
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 4fc6039fd7..f7363395ae 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -215,6 +215,7 @@ pub enum IconName {
     Tab,
     Terminal,
     TerminalAlt,
+    TerminalGhost,
     TextSnippet,
     TextThread,
     Thread,

From bd4e943597d4b6c3ac52cd2edae2ae2e2abbec81 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 26 Aug 2025 16:59:12 -0300
Subject: [PATCH 383/823] acp: Add onboarding modal & title bar banner (#36784)

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 assets/images/acp_grid.svg                    | 1257 +++++++++++++++++
 assets/images/acp_logo.svg                    |    1 +
 assets/images/acp_logo_serif.svg              |    2 +
 crates/agent_ui/src/agent_configuration.rs    |    2 +-
 crates/agent_ui/src/agent_panel.rs            |   41 +-
 crates/agent_ui/src/ui.rs                     |    2 +
 .../agent_ui/src/ui/acp_onboarding_modal.rs   |  254 ++++
 crates/client/src/zed_urls.rs                 |    8 +
 crates/title_bar/src/onboarding_banner.rs     |    2 +-
 crates/title_bar/src/title_bar.rs             |   10 +-
 crates/ui/src/components/image.rs             |    3 +
 crates/zed_actions/src/lib.rs                 |    2 +
 12 files changed, 1556 insertions(+), 28 deletions(-)
 create mode 100644 assets/images/acp_grid.svg
 create mode 100644 assets/images/acp_logo.svg
 create mode 100644 assets/images/acp_logo_serif.svg
 create mode 100644 crates/agent_ui/src/ui/acp_onboarding_modal.rs

diff --git a/assets/images/acp_grid.svg b/assets/images/acp_grid.svg
new file mode 100644
index 0000000000..8ebff8e1bc
--- /dev/null
+++ b/assets/images/acp_grid.svg
@@ -0,0 +1,1257 @@
+<svg width="515" height="126" viewBox="0 0 515 126" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2906_6463)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 0.390625H0.390625V12.1094H12.1094V0.390625ZM0 0V12.5H12.5V0H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 0.390625H12.8906V12.1094H24.6094V0.390625ZM12.5 0V12.5H25V0H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 0.390625H25.3906V12.1094H37.1094V0.390625ZM25 0V12.5H37.5V0H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 0.390625H37.8906V12.1094H49.6094V0.390625ZM37.5 0V12.5H50V0H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 0.390625H50.3906V12.1094H62.1094V0.390625ZM50 0V12.5H62.5V0H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 0.390625H62.8906V12.1094H74.6094V0.390625ZM62.5 0V12.5H75V0H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 0.390625H75.3906V12.1094H87.1094V0.390625ZM75 0V12.5H87.5V0H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 0.390625H87.8906V12.1094H99.6094V0.390625ZM87.5 0V12.5H100V0H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 0.390625H100.391V12.1094H112.109V0.390625ZM100 0V12.5H112.5V0H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 0.390625H112.891V12.1094H124.609V0.390625ZM112.5 0V12.5H125V0H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 0.390625H125.391V12.1094H137.109V0.390625ZM125 0V12.5H137.5V0H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 0.390625H137.891V12.1094H149.609V0.390625ZM137.5 0V12.5H150V0H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 0.390625H150.391V12.1094H162.109V0.390625ZM150 0V12.5H162.5V0H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 0.390625H162.891V12.1094H174.609V0.390625ZM162.5 0V12.5H175V0H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 0.390625H175.391V12.1094H187.109V0.390625ZM175 0V12.5H187.5V0H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 0.390625H187.891V12.1094H199.609V0.390625ZM187.5 0V12.5H200V0H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 0.390625H200.391V12.1094H212.109V0.390625ZM200 0V12.5H212.5V0H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 0.390625H212.891V12.1094H224.609V0.390625ZM212.5 0V12.5H225V0H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 0.390625H225.391V12.1094H237.109V0.390625ZM225 0V12.5H237.5V0H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 0.390625H237.891V12.1094H249.609V0.390625ZM237.5 0V12.5H250V0H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 0.390625H250.391V12.1094H262.109V0.390625ZM250 0V12.5H262.5V0H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 0.390625H262.891V12.1094H274.609V0.390625ZM262.5 0V12.5H275V0H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 0.390625H275.391V12.1094H287.109V0.390625ZM275 0V12.5H287.5V0H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 0.390625H287.891V12.1094H299.609V0.390625ZM287.5 0V12.5H300V0H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 0.390625H300.391V12.1094H312.109V0.390625ZM300 0V12.5H312.5V0H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 0.390625H312.891V12.1094H324.609V0.390625ZM312.5 0V12.5H325V0H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 0.390625H325.391V12.1094H337.109V0.390625ZM325 0V12.5H337.5V0H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 0.390625H337.891V12.1094H349.609V0.390625ZM337.5 0V12.5H350V0H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 0.390625H350.391V12.1094H362.109V0.390625ZM350 0V12.5H362.5V0H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 0.390625H362.891V12.1094H374.609V0.390625ZM362.5 0V12.5H375V0H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 0.390625H375.391V12.1094H387.109V0.390625ZM375 0V12.5H387.5V0H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 0.390625H387.891V12.1094H399.609V0.390625ZM387.5 0V12.5H400V0H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 0.390625H400.391V12.1094H412.109V0.390625ZM400 0V12.5H412.5V0H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 0.390625H412.891V12.1094H424.609V0.390625ZM412.5 0V12.5H425V0H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 0.390625H425.391V12.1094H437.109V0.390625ZM425 0V12.5H437.5V0H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 0.390625H437.891V12.1094H449.609V0.390625ZM437.5 0V12.5H450V0H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 0.390625H450.391V12.1094H462.109V0.390625ZM450 0V12.5H462.5V0H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 0.390625H462.891V12.1094H474.609V0.390625ZM462.5 0V12.5H475V0H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 0.390625H475.391V12.1094H487.109V0.390625ZM475 0V12.5H487.5V0H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 0.390625H487.891V12.1094H499.609V0.390625ZM487.5 0V12.5H500V0H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 0.390625H500.391V12.1094H512.109V0.390625ZM500 0V12.5H512.5V0H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 0.390625H512.891V12.1094H524.609V0.390625ZM512.5 0V12.5H525V0H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 0.390625H525.391V12.1094H537.109V0.390625ZM525 0V12.5H537.5V0H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 0.390625H537.891V12.1094H549.609V0.390625ZM537.5 0V12.5H550V0H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 0.390625H550.391V12.1094H562.109V0.390625ZM550 0V12.5H562.5V0H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 0.390625H562.891V12.1094H574.609V0.390625ZM562.5 0V12.5H575V0H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 0.390625H575.391V12.1094H587.109V0.390625ZM575 0V12.5H587.5V0H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 0.390625H587.891V12.1094H599.609V0.390625ZM587.5 0V12.5H600V0H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 12.8906H0.390625V24.6094H12.1094V12.8906ZM0 12.5V25H12.5V12.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 12.8906H12.8906V24.6094H24.6094V12.8906ZM12.5 12.5V25H25V12.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 12.8906H25.3906V24.6094H37.1094V12.8906ZM25 12.5V25H37.5V12.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 12.8906H37.8906V24.6094H49.6094V12.8906ZM37.5 12.5V25H50V12.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 12.8906H50.3906V24.6094H62.1094V12.8906ZM50 12.5V25H62.5V12.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 12.8906H62.8906V24.6094H74.6094V12.8906ZM62.5 12.5V25H75V12.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 12.8906H75.3906V24.6094H87.1094V12.8906ZM75 12.5V25H87.5V12.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 12.8906H87.8906V24.6094H99.6094V12.8906ZM87.5 12.5V25H100V12.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 12.8906H100.391V24.6094H112.109V12.8906ZM100 12.5V25H112.5V12.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 12.8906H112.891V24.6094H124.609V12.8906ZM112.5 12.5V25H125V12.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 12.8906H125.391V24.6094H137.109V12.8906ZM125 12.5V25H137.5V12.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 12.8906H137.891V24.6094H149.609V12.8906ZM137.5 12.5V25H150V12.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 12.8906H150.391V24.6094H162.109V12.8906ZM150 12.5V25H162.5V12.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 12.8906H162.891V24.6094H174.609V12.8906ZM162.5 12.5V25H175V12.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 12.8906H175.391V24.6094H187.109V12.8906ZM175 12.5V25H187.5V12.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 12.8906H187.891V24.6094H199.609V12.8906ZM187.5 12.5V25H200V12.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 12.8906H200.391V24.6094H212.109V12.8906ZM200 12.5V25H212.5V12.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 12.8906H212.891V24.6094H224.609V12.8906ZM212.5 12.5V25H225V12.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 12.8906H225.391V24.6094H237.109V12.8906ZM225 12.5V25H237.5V12.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 12.8906H237.891V24.6094H249.609V12.8906ZM237.5 12.5V25H250V12.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 12.8906H250.391V24.6094H262.109V12.8906ZM250 12.5V25H262.5V12.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 12.8906H262.891V24.6094H274.609V12.8906ZM262.5 12.5V25H275V12.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 12.8906H275.391V24.6094H287.109V12.8906ZM275 12.5V25H287.5V12.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 12.8906H287.891V24.6094H299.609V12.8906ZM287.5 12.5V25H300V12.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 12.8906H300.391V24.6094H312.109V12.8906ZM300 12.5V25H312.5V12.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 12.8906H312.891V24.6094H324.609V12.8906ZM312.5 12.5V25H325V12.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 12.8906H325.391V24.6094H337.109V12.8906ZM325 12.5V25H337.5V12.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 12.8906H337.891V24.6094H349.609V12.8906ZM337.5 12.5V25H350V12.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 12.8906H350.391V24.6094H362.109V12.8906ZM350 12.5V25H362.5V12.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 12.8906H362.891V24.6094H374.609V12.8906ZM362.5 12.5V25H375V12.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 12.8906H375.391V24.6094H387.109V12.8906ZM375 12.5V25H387.5V12.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 12.8906H387.891V24.6094H399.609V12.8906ZM387.5 12.5V25H400V12.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 12.8906H400.391V24.6094H412.109V12.8906ZM400 12.5V25H412.5V12.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 12.8906H412.891V24.6094H424.609V12.8906ZM412.5 12.5V25H425V12.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 12.8906H425.391V24.6094H437.109V12.8906ZM425 12.5V25H437.5V12.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 12.8906H437.891V24.6094H449.609V12.8906ZM437.5 12.5V25H450V12.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 12.8906H450.391V24.6094H462.109V12.8906ZM450 12.5V25H462.5V12.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 12.8906H462.891V24.6094H474.609V12.8906ZM462.5 12.5V25H475V12.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 12.8906H475.391V24.6094H487.109V12.8906ZM475 12.5V25H487.5V12.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 12.8906H487.891V24.6094H499.609V12.8906ZM487.5 12.5V25H500V12.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 12.8906H500.391V24.6094H512.109V12.8906ZM500 12.5V25H512.5V12.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 12.8906H512.891V24.6094H524.609V12.8906ZM512.5 12.5V25H525V12.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 12.8906H525.391V24.6094H537.109V12.8906ZM525 12.5V25H537.5V12.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 12.8906H537.891V24.6094H549.609V12.8906ZM537.5 12.5V25H550V12.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 12.8906H550.391V24.6094H562.109V12.8906ZM550 12.5V25H562.5V12.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 12.8906H562.891V24.6094H574.609V12.8906ZM562.5 12.5V25H575V12.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 12.8906H575.391V24.6094H587.109V12.8906ZM575 12.5V25H587.5V12.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 12.8906H587.891V24.6094H599.609V12.8906ZM587.5 12.5V25H600V12.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 25.3906H0.390625V37.1094H12.1094V25.3906ZM0 25V37.5H12.5V25H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 25.3906H12.8906V37.1094H24.6094V25.3906ZM12.5 25V37.5H25V25H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 25.3906H25.3906V37.1094H37.1094V25.3906ZM25 25V37.5H37.5V25H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 25.3906H37.8906V37.1094H49.6094V25.3906ZM37.5 25V37.5H50V25H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 25.3906H50.3906V37.1094H62.1094V25.3906ZM50 25V37.5H62.5V25H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 25.3906H62.8906V37.1094H74.6094V25.3906ZM62.5 25V37.5H75V25H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 25.3906H75.3906V37.1094H87.1094V25.3906ZM75 25V37.5H87.5V25H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 25.3906H87.8906V37.1094H99.6094V25.3906ZM87.5 25V37.5H100V25H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 25.3906H100.391V37.1094H112.109V25.3906ZM100 25V37.5H112.5V25H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 25.3906H112.891V37.1094H124.609V25.3906ZM112.5 25V37.5H125V25H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 25.3906H125.391V37.1094H137.109V25.3906ZM125 25V37.5H137.5V25H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 25.3906H137.891V37.1094H149.609V25.3906ZM137.5 25V37.5H150V25H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 25.3906H150.391V37.1094H162.109V25.3906ZM150 25V37.5H162.5V25H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 25.3906H162.891V37.1094H174.609V25.3906ZM162.5 25V37.5H175V25H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 25.3906H175.391V37.1094H187.109V25.3906ZM175 25V37.5H187.5V25H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 25.3906H187.891V37.1094H199.609V25.3906ZM187.5 25V37.5H200V25H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 25.3906H200.391V37.1094H212.109V25.3906ZM200 25V37.5H212.5V25H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 25.3906H212.891V37.1094H224.609V25.3906ZM212.5 25V37.5H225V25H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 25.3906H225.391V37.1094H237.109V25.3906ZM225 25V37.5H237.5V25H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 25.3906H237.891V37.1094H249.609V25.3906ZM237.5 25V37.5H250V25H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 25.3906H250.391V37.1094H262.109V25.3906ZM250 25V37.5H262.5V25H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 25.3906H262.891V37.1094H274.609V25.3906ZM262.5 25V37.5H275V25H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 25.3906H275.391V37.1094H287.109V25.3906ZM275 25V37.5H287.5V25H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 25.3906H287.891V37.1094H299.609V25.3906ZM287.5 25V37.5H300V25H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 25.3906H300.391V37.1094H312.109V25.3906ZM300 25V37.5H312.5V25H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 25.3906H312.891V37.1094H324.609V25.3906ZM312.5 25V37.5H325V25H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 25.3906H325.391V37.1094H337.109V25.3906ZM325 25V37.5H337.5V25H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 25.3906H337.891V37.1094H349.609V25.3906ZM337.5 25V37.5H350V25H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 25.3906H350.391V37.1094H362.109V25.3906ZM350 25V37.5H362.5V25H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 25.3906H362.891V37.1094H374.609V25.3906ZM362.5 25V37.5H375V25H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 25.3906H375.391V37.1094H387.109V25.3906ZM375 25V37.5H387.5V25H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 25.3906H387.891V37.1094H399.609V25.3906ZM387.5 25V37.5H400V25H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 25.3906H400.391V37.1094H412.109V25.3906ZM400 25V37.5H412.5V25H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 25.3906H412.891V37.1094H424.609V25.3906ZM412.5 25V37.5H425V25H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 25.3906H425.391V37.1094H437.109V25.3906ZM425 25V37.5H437.5V25H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 25.3906H437.891V37.1094H449.609V25.3906ZM437.5 25V37.5H450V25H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 25.3906H450.391V37.1094H462.109V25.3906ZM450 25V37.5H462.5V25H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 25.3906H462.891V37.1094H474.609V25.3906ZM462.5 25V37.5H475V25H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 25.3906H475.391V37.1094H487.109V25.3906ZM475 25V37.5H487.5V25H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 25.3906H487.891V37.1094H499.609V25.3906ZM487.5 25V37.5H500V25H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 25.3906H500.391V37.1094H512.109V25.3906ZM500 25V37.5H512.5V25H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 25.3906H512.891V37.1094H524.609V25.3906ZM512.5 25V37.5H525V25H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 25.3906H525.391V37.1094H537.109V25.3906ZM525 25V37.5H537.5V25H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 25.3906H537.891V37.1094H549.609V25.3906ZM537.5 25V37.5H550V25H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 25.3906H550.391V37.1094H562.109V25.3906ZM550 25V37.5H562.5V25H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 25.3906H562.891V37.1094H574.609V25.3906ZM562.5 25V37.5H575V25H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 25.3906H575.391V37.1094H587.109V25.3906ZM575 25V37.5H587.5V25H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 25.3906H587.891V37.1094H599.609V25.3906ZM587.5 25V37.5H600V25H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 37.8906H0.390625V49.6094H12.1094V37.8906ZM0 37.5V50H12.5V37.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 37.8906H12.8906V49.6094H24.6094V37.8906ZM12.5 37.5V50H25V37.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 37.8906H25.3906V49.6094H37.1094V37.8906ZM25 37.5V50H37.5V37.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 37.8906H37.8906V49.6094H49.6094V37.8906ZM37.5 37.5V50H50V37.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 37.8906H50.3906V49.6094H62.1094V37.8906ZM50 37.5V50H62.5V37.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 37.8906H62.8906V49.6094H74.6094V37.8906ZM62.5 37.5V50H75V37.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 37.8906H75.3906V49.6094H87.1094V37.8906ZM75 37.5V50H87.5V37.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 37.8906H87.8906V49.6094H99.6094V37.8906ZM87.5 37.5V50H100V37.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 37.8906H100.391V49.6094H112.109V37.8906ZM100 37.5V50H112.5V37.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 37.8906H112.891V49.6094H124.609V37.8906ZM112.5 37.5V50H125V37.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 37.8906H125.391V49.6094H137.109V37.8906ZM125 37.5V50H137.5V37.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 37.8906H137.891V49.6094H149.609V37.8906ZM137.5 37.5V50H150V37.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 37.8906H150.391V49.6094H162.109V37.8906ZM150 37.5V50H162.5V37.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 37.8906H162.891V49.6094H174.609V37.8906ZM162.5 37.5V50H175V37.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 37.8906H175.391V49.6094H187.109V37.8906ZM175 37.5V50H187.5V37.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 37.8906H187.891V49.6094H199.609V37.8906ZM187.5 37.5V50H200V37.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 37.8906H200.391V49.6094H212.109V37.8906ZM200 37.5V50H212.5V37.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 37.8906H212.891V49.6094H224.609V37.8906ZM212.5 37.5V50H225V37.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 37.8906H225.391V49.6094H237.109V37.8906ZM225 37.5V50H237.5V37.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 37.8906H237.891V49.6094H249.609V37.8906ZM237.5 37.5V50H250V37.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 37.8906H250.391V49.6094H262.109V37.8906ZM250 37.5V50H262.5V37.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 37.8906H262.891V49.6094H274.609V37.8906ZM262.5 37.5V50H275V37.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 37.8906H275.391V49.6094H287.109V37.8906ZM275 37.5V50H287.5V37.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 37.8906H287.891V49.6094H299.609V37.8906ZM287.5 37.5V50H300V37.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 37.8906H300.391V49.6094H312.109V37.8906ZM300 37.5V50H312.5V37.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 37.8906H312.891V49.6094H324.609V37.8906ZM312.5 37.5V50H325V37.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 37.8906H325.391V49.6094H337.109V37.8906ZM325 37.5V50H337.5V37.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 37.8906H337.891V49.6094H349.609V37.8906ZM337.5 37.5V50H350V37.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 37.8906H350.391V49.6094H362.109V37.8906ZM350 37.5V50H362.5V37.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 37.8906H362.891V49.6094H374.609V37.8906ZM362.5 37.5V50H375V37.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 37.8906H375.391V49.6094H387.109V37.8906ZM375 37.5V50H387.5V37.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 37.8906H387.891V49.6094H399.609V37.8906ZM387.5 37.5V50H400V37.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 37.8906H400.391V49.6094H412.109V37.8906ZM400 37.5V50H412.5V37.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 37.8906H412.891V49.6094H424.609V37.8906ZM412.5 37.5V50H425V37.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 37.8906H425.391V49.6094H437.109V37.8906ZM425 37.5V50H437.5V37.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 37.8906H437.891V49.6094H449.609V37.8906ZM437.5 37.5V50H450V37.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 37.8906H450.391V49.6094H462.109V37.8906ZM450 37.5V50H462.5V37.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 37.8906H462.891V49.6094H474.609V37.8906ZM462.5 37.5V50H475V37.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 37.8906H475.391V49.6094H487.109V37.8906ZM475 37.5V50H487.5V37.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 37.8906H487.891V49.6094H499.609V37.8906ZM487.5 37.5V50H500V37.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 37.8906H500.391V49.6094H512.109V37.8906ZM500 37.5V50H512.5V37.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 37.8906H512.891V49.6094H524.609V37.8906ZM512.5 37.5V50H525V37.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 37.8906H525.391V49.6094H537.109V37.8906ZM525 37.5V50H537.5V37.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 37.8906H537.891V49.6094H549.609V37.8906ZM537.5 37.5V50H550V37.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 37.8906H550.391V49.6094H562.109V37.8906ZM550 37.5V50H562.5V37.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 37.8906H562.891V49.6094H574.609V37.8906ZM562.5 37.5V50H575V37.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 37.8906H575.391V49.6094H587.109V37.8906ZM575 37.5V50H587.5V37.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 37.8906H587.891V49.6094H599.609V37.8906ZM587.5 37.5V50H600V37.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 50.3906H0.390625V62.1094H12.1094V50.3906ZM0 50V62.5H12.5V50H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 50.3906H12.8906V62.1094H24.6094V50.3906ZM12.5 50V62.5H25V50H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 50.3906H25.3906V62.1094H37.1094V50.3906ZM25 50V62.5H37.5V50H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 50.3906H37.8906V62.1094H49.6094V50.3906ZM37.5 50V62.5H50V50H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 50.3906H50.3906V62.1094H62.1094V50.3906ZM50 50V62.5H62.5V50H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 50.3906H62.8906V62.1094H74.6094V50.3906ZM62.5 50V62.5H75V50H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 50.3906H75.3906V62.1094H87.1094V50.3906ZM75 50V62.5H87.5V50H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 50.3906H87.8906V62.1094H99.6094V50.3906ZM87.5 50V62.5H100V50H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 50.3906H100.391V62.1094H112.109V50.3906ZM100 50V62.5H112.5V50H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 50.3906H112.891V62.1094H124.609V50.3906ZM112.5 50V62.5H125V50H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 50.3906H125.391V62.1094H137.109V50.3906ZM125 50V62.5H137.5V50H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 50.3906H137.891V62.1094H149.609V50.3906ZM137.5 50V62.5H150V50H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 50.3906H150.391V62.1094H162.109V50.3906ZM150 50V62.5H162.5V50H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 50.3906H162.891V62.1094H174.609V50.3906ZM162.5 50V62.5H175V50H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 50.3906H175.391V62.1094H187.109V50.3906ZM175 50V62.5H187.5V50H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 50.3906H187.891V62.1094H199.609V50.3906ZM187.5 50V62.5H200V50H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 50.3906H200.391V62.1094H212.109V50.3906ZM200 50V62.5H212.5V50H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 50.3906H212.891V62.1094H224.609V50.3906ZM212.5 50V62.5H225V50H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 50.3906H225.391V62.1094H237.109V50.3906ZM225 50V62.5H237.5V50H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 50.3906H237.891V62.1094H249.609V50.3906ZM237.5 50V62.5H250V50H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 50.3906H250.391V62.1094H262.109V50.3906ZM250 50V62.5H262.5V50H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 50.3906H262.891V62.1094H274.609V50.3906ZM262.5 50V62.5H275V50H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 50.3906H275.391V62.1094H287.109V50.3906ZM275 50V62.5H287.5V50H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 50.3906H287.891V62.1094H299.609V50.3906ZM287.5 50V62.5H300V50H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 50.3906H300.391V62.1094H312.109V50.3906ZM300 50V62.5H312.5V50H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 50.3906H312.891V62.1094H324.609V50.3906ZM312.5 50V62.5H325V50H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 50.3906H325.391V62.1094H337.109V50.3906ZM325 50V62.5H337.5V50H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 50.3906H337.891V62.1094H349.609V50.3906ZM337.5 50V62.5H350V50H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 50.3906H350.391V62.1094H362.109V50.3906ZM350 50V62.5H362.5V50H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 50.3906H362.891V62.1094H374.609V50.3906ZM362.5 50V62.5H375V50H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 50.3906H375.391V62.1094H387.109V50.3906ZM375 50V62.5H387.5V50H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 50.3906H387.891V62.1094H399.609V50.3906ZM387.5 50V62.5H400V50H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 50.3906H400.391V62.1094H412.109V50.3906ZM400 50V62.5H412.5V50H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 50.3906H412.891V62.1094H424.609V50.3906ZM412.5 50V62.5H425V50H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 50.3906H425.391V62.1094H437.109V50.3906ZM425 50V62.5H437.5V50H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 50.3906H437.891V62.1094H449.609V50.3906ZM437.5 50V62.5H450V50H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 50.3906H450.391V62.1094H462.109V50.3906ZM450 50V62.5H462.5V50H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 50.3906H462.891V62.1094H474.609V50.3906ZM462.5 50V62.5H475V50H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 50.3906H475.391V62.1094H487.109V50.3906ZM475 50V62.5H487.5V50H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 50.3906H487.891V62.1094H499.609V50.3906ZM487.5 50V62.5H500V50H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 50.3906H500.391V62.1094H512.109V50.3906ZM500 50V62.5H512.5V50H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 50.3906H512.891V62.1094H524.609V50.3906ZM512.5 50V62.5H525V50H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 50.3906H525.391V62.1094H537.109V50.3906ZM525 50V62.5H537.5V50H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 50.3906H537.891V62.1094H549.609V50.3906ZM537.5 50V62.5H550V50H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 50.3906H550.391V62.1094H562.109V50.3906ZM550 50V62.5H562.5V50H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 50.3906H562.891V62.1094H574.609V50.3906ZM562.5 50V62.5H575V50H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 50.3906H575.391V62.1094H587.109V50.3906ZM575 50V62.5H587.5V50H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 50.3906H587.891V62.1094H599.609V50.3906ZM587.5 50V62.5H600V50H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 62.8906H0.390625V74.6094H12.1094V62.8906ZM0 62.5V75H12.5V62.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 62.8906H12.8906V74.6094H24.6094V62.8906ZM12.5 62.5V75H25V62.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 62.8906H25.3906V74.6094H37.1094V62.8906ZM25 62.5V75H37.5V62.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 62.8906H37.8906V74.6094H49.6094V62.8906ZM37.5 62.5V75H50V62.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 62.8906H50.3906V74.6094H62.1094V62.8906ZM50 62.5V75H62.5V62.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 62.8906H62.8906V74.6094H74.6094V62.8906ZM62.5 62.5V75H75V62.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 62.8906H75.3906V74.6094H87.1094V62.8906ZM75 62.5V75H87.5V62.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 62.8906H87.8906V74.6094H99.6094V62.8906ZM87.5 62.5V75H100V62.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 62.8906H100.391V74.6094H112.109V62.8906ZM100 62.5V75H112.5V62.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 62.8906H112.891V74.6094H124.609V62.8906ZM112.5 62.5V75H125V62.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 62.8906H125.391V74.6094H137.109V62.8906ZM125 62.5V75H137.5V62.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 62.8906H137.891V74.6094H149.609V62.8906ZM137.5 62.5V75H150V62.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 62.8906H150.391V74.6094H162.109V62.8906ZM150 62.5V75H162.5V62.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 62.8906H162.891V74.6094H174.609V62.8906ZM162.5 62.5V75H175V62.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 62.8906H175.391V74.6094H187.109V62.8906ZM175 62.5V75H187.5V62.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 62.8906H187.891V74.6094H199.609V62.8906ZM187.5 62.5V75H200V62.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 62.8906H200.391V74.6094H212.109V62.8906ZM200 62.5V75H212.5V62.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 62.8906H212.891V74.6094H224.609V62.8906ZM212.5 62.5V75H225V62.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 62.8906H225.391V74.6094H237.109V62.8906ZM225 62.5V75H237.5V62.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 62.8906H237.891V74.6094H249.609V62.8906ZM237.5 62.5V75H250V62.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 62.8906H250.391V74.6094H262.109V62.8906ZM250 62.5V75H262.5V62.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 62.8906H262.891V74.6094H274.609V62.8906ZM262.5 62.5V75H275V62.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 62.8906H275.391V74.6094H287.109V62.8906ZM275 62.5V75H287.5V62.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 62.8906H287.891V74.6094H299.609V62.8906ZM287.5 62.5V75H300V62.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 62.8906H300.391V74.6094H312.109V62.8906ZM300 62.5V75H312.5V62.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 62.8906H312.891V74.6094H324.609V62.8906ZM312.5 62.5V75H325V62.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 62.8906H325.391V74.6094H337.109V62.8906ZM325 62.5V75H337.5V62.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 62.8906H337.891V74.6094H349.609V62.8906ZM337.5 62.5V75H350V62.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 62.8906H350.391V74.6094H362.109V62.8906ZM350 62.5V75H362.5V62.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 62.8906H362.891V74.6094H374.609V62.8906ZM362.5 62.5V75H375V62.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 62.8906H375.391V74.6094H387.109V62.8906ZM375 62.5V75H387.5V62.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 62.8906H387.891V74.6094H399.609V62.8906ZM387.5 62.5V75H400V62.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 62.8906H400.391V74.6094H412.109V62.8906ZM400 62.5V75H412.5V62.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 62.8906H412.891V74.6094H424.609V62.8906ZM412.5 62.5V75H425V62.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 62.8906H425.391V74.6094H437.109V62.8906ZM425 62.5V75H437.5V62.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 62.8906H437.891V74.6094H449.609V62.8906ZM437.5 62.5V75H450V62.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 62.8906H450.391V74.6094H462.109V62.8906ZM450 62.5V75H462.5V62.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 62.8906H462.891V74.6094H474.609V62.8906ZM462.5 62.5V75H475V62.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 62.8906H475.391V74.6094H487.109V62.8906ZM475 62.5V75H487.5V62.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 62.8906H487.891V74.6094H499.609V62.8906ZM487.5 62.5V75H500V62.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 62.8906H500.391V74.6094H512.109V62.8906ZM500 62.5V75H512.5V62.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 62.8906H512.891V74.6094H524.609V62.8906ZM512.5 62.5V75H525V62.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 62.8906H525.391V74.6094H537.109V62.8906ZM525 62.5V75H537.5V62.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 62.8906H537.891V74.6094H549.609V62.8906ZM537.5 62.5V75H550V62.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 62.8906H550.391V74.6094H562.109V62.8906ZM550 62.5V75H562.5V62.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 62.8906H562.891V74.6094H574.609V62.8906ZM562.5 62.5V75H575V62.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 62.8906H575.391V74.6094H587.109V62.8906ZM575 62.5V75H587.5V62.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 62.8906H587.891V74.6094H599.609V62.8906ZM587.5 62.5V75H600V62.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 75.3906H0.390625V87.1094H12.1094V75.3906ZM0 75V87.5H12.5V75H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 75.3906H12.8906V87.1094H24.6094V75.3906ZM12.5 75V87.5H25V75H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 75.3906H25.3906V87.1094H37.1094V75.3906ZM25 75V87.5H37.5V75H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 75.3906H37.8906V87.1094H49.6094V75.3906ZM37.5 75V87.5H50V75H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 75.3906H50.3906V87.1094H62.1094V75.3906ZM50 75V87.5H62.5V75H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 75.3906H62.8906V87.1094H74.6094V75.3906ZM62.5 75V87.5H75V75H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 75.3906H75.3906V87.1094H87.1094V75.3906ZM75 75V87.5H87.5V75H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 75.3906H87.8906V87.1094H99.6094V75.3906ZM87.5 75V87.5H100V75H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 75.3906H100.391V87.1094H112.109V75.3906ZM100 75V87.5H112.5V75H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 75.3906H112.891V87.1094H124.609V75.3906ZM112.5 75V87.5H125V75H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 75.3906H125.391V87.1094H137.109V75.3906ZM125 75V87.5H137.5V75H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 75.3906H137.891V87.1094H149.609V75.3906ZM137.5 75V87.5H150V75H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 75.3906H150.391V87.1094H162.109V75.3906ZM150 75V87.5H162.5V75H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 75.3906H162.891V87.1094H174.609V75.3906ZM162.5 75V87.5H175V75H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 75.3906H175.391V87.1094H187.109V75.3906ZM175 75V87.5H187.5V75H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 75.3906H187.891V87.1094H199.609V75.3906ZM187.5 75V87.5H200V75H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 75.3906H200.391V87.1094H212.109V75.3906ZM200 75V87.5H212.5V75H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 75.3906H212.891V87.1094H224.609V75.3906ZM212.5 75V87.5H225V75H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 75.3906H225.391V87.1094H237.109V75.3906ZM225 75V87.5H237.5V75H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 75.3906H237.891V87.1094H249.609V75.3906ZM237.5 75V87.5H250V75H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 75.3906H250.391V87.1094H262.109V75.3906ZM250 75V87.5H262.5V75H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 75.3906H262.891V87.1094H274.609V75.3906ZM262.5 75V87.5H275V75H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 75.3906H275.391V87.1094H287.109V75.3906ZM275 75V87.5H287.5V75H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 75.3906H287.891V87.1094H299.609V75.3906ZM287.5 75V87.5H300V75H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 75.3906H300.391V87.1094H312.109V75.3906ZM300 75V87.5H312.5V75H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 75.3906H312.891V87.1094H324.609V75.3906ZM312.5 75V87.5H325V75H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 75.3906H325.391V87.1094H337.109V75.3906ZM325 75V87.5H337.5V75H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 75.3906H337.891V87.1094H349.609V75.3906ZM337.5 75V87.5H350V75H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 75.3906H350.391V87.1094H362.109V75.3906ZM350 75V87.5H362.5V75H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 75.3906H362.891V87.1094H374.609V75.3906ZM362.5 75V87.5H375V75H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 75.3906H375.391V87.1094H387.109V75.3906ZM375 75V87.5H387.5V75H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 75.3906H387.891V87.1094H399.609V75.3906ZM387.5 75V87.5H400V75H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 75.3906H400.391V87.1094H412.109V75.3906ZM400 75V87.5H412.5V75H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 75.3906H412.891V87.1094H424.609V75.3906ZM412.5 75V87.5H425V75H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 75.3906H425.391V87.1094H437.109V75.3906ZM425 75V87.5H437.5V75H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 75.3906H437.891V87.1094H449.609V75.3906ZM437.5 75V87.5H450V75H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 75.3906H450.391V87.1094H462.109V75.3906ZM450 75V87.5H462.5V75H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 75.3906H462.891V87.1094H474.609V75.3906ZM462.5 75V87.5H475V75H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 75.3906H475.391V87.1094H487.109V75.3906ZM475 75V87.5H487.5V75H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 75.3906H487.891V87.1094H499.609V75.3906ZM487.5 75V87.5H500V75H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 75.3906H500.391V87.1094H512.109V75.3906ZM500 75V87.5H512.5V75H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 75.3906H512.891V87.1094H524.609V75.3906ZM512.5 75V87.5H525V75H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 75.3906H525.391V87.1094H537.109V75.3906ZM525 75V87.5H537.5V75H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 75.3906H537.891V87.1094H549.609V75.3906ZM537.5 75V87.5H550V75H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 75.3906H550.391V87.1094H562.109V75.3906ZM550 75V87.5H562.5V75H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 75.3906H562.891V87.1094H574.609V75.3906ZM562.5 75V87.5H575V75H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 75.3906H575.391V87.1094H587.109V75.3906ZM575 75V87.5H587.5V75H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 75.3906H587.891V87.1094H599.609V75.3906ZM587.5 75V87.5H600V75H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 87.8906H0.390625V99.6094H12.1094V87.8906ZM0 87.5V100H12.5V87.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 87.8906H12.8906V99.6094H24.6094V87.8906ZM12.5 87.5V100H25V87.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 87.8906H25.3906V99.6094H37.1094V87.8906ZM25 87.5V100H37.5V87.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 87.8906H37.8906V99.6094H49.6094V87.8906ZM37.5 87.5V100H50V87.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 87.8906H50.3906V99.6094H62.1094V87.8906ZM50 87.5V100H62.5V87.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 87.8906H62.8906V99.6094H74.6094V87.8906ZM62.5 87.5V100H75V87.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 87.8906H75.3906V99.6094H87.1094V87.8906ZM75 87.5V100H87.5V87.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 87.8906H87.8906V99.6094H99.6094V87.8906ZM87.5 87.5V100H100V87.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 87.8906H100.391V99.6094H112.109V87.8906ZM100 87.5V100H112.5V87.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 87.8906H112.891V99.6094H124.609V87.8906ZM112.5 87.5V100H125V87.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 87.8906H125.391V99.6094H137.109V87.8906ZM125 87.5V100H137.5V87.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 87.8906H137.891V99.6094H149.609V87.8906ZM137.5 87.5V100H150V87.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 87.8906H150.391V99.6094H162.109V87.8906ZM150 87.5V100H162.5V87.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 87.8906H162.891V99.6094H174.609V87.8906ZM162.5 87.5V100H175V87.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 87.8906H175.391V99.6094H187.109V87.8906ZM175 87.5V100H187.5V87.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 87.8906H187.891V99.6094H199.609V87.8906ZM187.5 87.5V100H200V87.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 87.8906H200.391V99.6094H212.109V87.8906ZM200 87.5V100H212.5V87.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 87.8906H212.891V99.6094H224.609V87.8906ZM212.5 87.5V100H225V87.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 87.8906H225.391V99.6094H237.109V87.8906ZM225 87.5V100H237.5V87.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 87.8906H237.891V99.6094H249.609V87.8906ZM237.5 87.5V100H250V87.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 87.8906H250.391V99.6094H262.109V87.8906ZM250 87.5V100H262.5V87.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 87.8906H262.891V99.6094H274.609V87.8906ZM262.5 87.5V100H275V87.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 87.8906H275.391V99.6094H287.109V87.8906ZM275 87.5V100H287.5V87.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 87.8906H287.891V99.6094H299.609V87.8906ZM287.5 87.5V100H300V87.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 87.8906H300.391V99.6094H312.109V87.8906ZM300 87.5V100H312.5V87.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 87.8906H312.891V99.6094H324.609V87.8906ZM312.5 87.5V100H325V87.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 87.8906H325.391V99.6094H337.109V87.8906ZM325 87.5V100H337.5V87.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 87.8906H337.891V99.6094H349.609V87.8906ZM337.5 87.5V100H350V87.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 87.8906H350.391V99.6094H362.109V87.8906ZM350 87.5V100H362.5V87.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 87.8906H362.891V99.6094H374.609V87.8906ZM362.5 87.5V100H375V87.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 87.8906H375.391V99.6094H387.109V87.8906ZM375 87.5V100H387.5V87.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 87.8906H387.891V99.6094H399.609V87.8906ZM387.5 87.5V100H400V87.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 87.8906H400.391V99.6094H412.109V87.8906ZM400 87.5V100H412.5V87.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 87.8906H412.891V99.6094H424.609V87.8906ZM412.5 87.5V100H425V87.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 87.8906H425.391V99.6094H437.109V87.8906ZM425 87.5V100H437.5V87.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 87.8906H437.891V99.6094H449.609V87.8906ZM437.5 87.5V100H450V87.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 87.8906H450.391V99.6094H462.109V87.8906ZM450 87.5V100H462.5V87.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 87.8906H462.891V99.6094H474.609V87.8906ZM462.5 87.5V100H475V87.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 87.8906H475.391V99.6094H487.109V87.8906ZM475 87.5V100H487.5V87.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 87.8906H487.891V99.6094H499.609V87.8906ZM487.5 87.5V100H500V87.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 87.8906H500.391V99.6094H512.109V87.8906ZM500 87.5V100H512.5V87.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 87.8906H512.891V99.6094H524.609V87.8906ZM512.5 87.5V100H525V87.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 87.8906H525.391V99.6094H537.109V87.8906ZM525 87.5V100H537.5V87.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 87.8906H537.891V99.6094H549.609V87.8906ZM537.5 87.5V100H550V87.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 87.8906H550.391V99.6094H562.109V87.8906ZM550 87.5V100H562.5V87.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 87.8906H562.891V99.6094H574.609V87.8906ZM562.5 87.5V100H575V87.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 87.8906H575.391V99.6094H587.109V87.8906ZM575 87.5V100H587.5V87.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 87.8906H587.891V99.6094H599.609V87.8906ZM587.5 87.5V100H600V87.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 100.391H0.390625V112.109H12.1094V100.391ZM0 100V112.5H12.5V100H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 100.391H12.8906V112.109H24.6094V100.391ZM12.5 100V112.5H25V100H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 100.391H25.3906V112.109H37.1094V100.391ZM25 100V112.5H37.5V100H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 100.391H37.8906V112.109H49.6094V100.391ZM37.5 100V112.5H50V100H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 100.391H50.3906V112.109H62.1094V100.391ZM50 100V112.5H62.5V100H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 100.391H62.8906V112.109H74.6094V100.391ZM62.5 100V112.5H75V100H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 100.391H75.3906V112.109H87.1094V100.391ZM75 100V112.5H87.5V100H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 100.391H87.8906V112.109H99.6094V100.391ZM87.5 100V112.5H100V100H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 100.391H100.391V112.109H112.109V100.391ZM100 100V112.5H112.5V100H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 100.391H112.891V112.109H124.609V100.391ZM112.5 100V112.5H125V100H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 100.391H125.391V112.109H137.109V100.391ZM125 100V112.5H137.5V100H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 100.391H137.891V112.109H149.609V100.391ZM137.5 100V112.5H150V100H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 100.391H150.391V112.109H162.109V100.391ZM150 100V112.5H162.5V100H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 100.391H162.891V112.109H174.609V100.391ZM162.5 100V112.5H175V100H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 100.391H175.391V112.109H187.109V100.391ZM175 100V112.5H187.5V100H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 100.391H187.891V112.109H199.609V100.391ZM187.5 100V112.5H200V100H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 100.391H200.391V112.109H212.109V100.391ZM200 100V112.5H212.5V100H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 100.391H212.891V112.109H224.609V100.391ZM212.5 100V112.5H225V100H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 100.391H225.391V112.109H237.109V100.391ZM225 100V112.5H237.5V100H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 100.391H237.891V112.109H249.609V100.391ZM237.5 100V112.5H250V100H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 100.391H250.391V112.109H262.109V100.391ZM250 100V112.5H262.5V100H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 100.391H262.891V112.109H274.609V100.391ZM262.5 100V112.5H275V100H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 100.391H275.391V112.109H287.109V100.391ZM275 100V112.5H287.5V100H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 100.391H287.891V112.109H299.609V100.391ZM287.5 100V112.5H300V100H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 100.391H300.391V112.109H312.109V100.391ZM300 100V112.5H312.5V100H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 100.391H312.891V112.109H324.609V100.391ZM312.5 100V112.5H325V100H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 100.391H325.391V112.109H337.109V100.391ZM325 100V112.5H337.5V100H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 100.391H337.891V112.109H349.609V100.391ZM337.5 100V112.5H350V100H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 100.391H350.391V112.109H362.109V100.391ZM350 100V112.5H362.5V100H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 100.391H362.891V112.109H374.609V100.391ZM362.5 100V112.5H375V100H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 100.391H375.391V112.109H387.109V100.391ZM375 100V112.5H387.5V100H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 100.391H387.891V112.109H399.609V100.391ZM387.5 100V112.5H400V100H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 100.391H400.391V112.109H412.109V100.391ZM400 100V112.5H412.5V100H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 100.391H412.891V112.109H424.609V100.391ZM412.5 100V112.5H425V100H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 100.391H425.391V112.109H437.109V100.391ZM425 100V112.5H437.5V100H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 100.391H437.891V112.109H449.609V100.391ZM437.5 100V112.5H450V100H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 100.391H450.391V112.109H462.109V100.391ZM450 100V112.5H462.5V100H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 100.391H462.891V112.109H474.609V100.391ZM462.5 100V112.5H475V100H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 100.391H475.391V112.109H487.109V100.391ZM475 100V112.5H487.5V100H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 100.391H487.891V112.109H499.609V100.391ZM487.5 100V112.5H500V100H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 100.391H500.391V112.109H512.109V100.391ZM500 100V112.5H512.5V100H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 100.391H512.891V112.109H524.609V100.391ZM512.5 100V112.5H525V100H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 100.391H525.391V112.109H537.109V100.391ZM525 100V112.5H537.5V100H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 100.391H537.891V112.109H549.609V100.391ZM537.5 100V112.5H550V100H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 100.391H550.391V112.109H562.109V100.391ZM550 100V112.5H562.5V100H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 100.391H562.891V112.109H574.609V100.391ZM562.5 100V112.5H575V100H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 100.391H575.391V112.109H587.109V100.391ZM575 100V112.5H587.5V100H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 100.391H587.891V112.109H599.609V100.391ZM587.5 100V112.5H600V100H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 112.891H0.390625V124.609H12.1094V112.891ZM0 112.5V125H12.5V112.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 112.891H12.8906V124.609H24.6094V112.891ZM12.5 112.5V125H25V112.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 112.891H25.3906V124.609H37.1094V112.891ZM25 112.5V125H37.5V112.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 112.891H37.8906V124.609H49.6094V112.891ZM37.5 112.5V125H50V112.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 112.891H50.3906V124.609H62.1094V112.891ZM50 112.5V125H62.5V112.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 112.891H62.8906V124.609H74.6094V112.891ZM62.5 112.5V125H75V112.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 112.891H75.3906V124.609H87.1094V112.891ZM75 112.5V125H87.5V112.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 112.891H87.8906V124.609H99.6094V112.891ZM87.5 112.5V125H100V112.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 112.891H100.391V124.609H112.109V112.891ZM100 112.5V125H112.5V112.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 112.891H112.891V124.609H124.609V112.891ZM112.5 112.5V125H125V112.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 112.891H125.391V124.609H137.109V112.891ZM125 112.5V125H137.5V112.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 112.891H137.891V124.609H149.609V112.891ZM137.5 112.5V125H150V112.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 112.891H150.391V124.609H162.109V112.891ZM150 112.5V125H162.5V112.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 112.891H162.891V124.609H174.609V112.891ZM162.5 112.5V125H175V112.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 112.891H175.391V124.609H187.109V112.891ZM175 112.5V125H187.5V112.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 112.891H187.891V124.609H199.609V112.891ZM187.5 112.5V125H200V112.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 112.891H200.391V124.609H212.109V112.891ZM200 112.5V125H212.5V112.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 112.891H212.891V124.609H224.609V112.891ZM212.5 112.5V125H225V112.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 112.891H225.391V124.609H237.109V112.891ZM225 112.5V125H237.5V112.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 112.891H237.891V124.609H249.609V112.891ZM237.5 112.5V125H250V112.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 112.891H250.391V124.609H262.109V112.891ZM250 112.5V125H262.5V112.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 112.891H262.891V124.609H274.609V112.891ZM262.5 112.5V125H275V112.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 112.891H275.391V124.609H287.109V112.891ZM275 112.5V125H287.5V112.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 112.891H287.891V124.609H299.609V112.891ZM287.5 112.5V125H300V112.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 112.891H300.391V124.609H312.109V112.891ZM300 112.5V125H312.5V112.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 112.891H312.891V124.609H324.609V112.891ZM312.5 112.5V125H325V112.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 112.891H325.391V124.609H337.109V112.891ZM325 112.5V125H337.5V112.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 112.891H337.891V124.609H349.609V112.891ZM337.5 112.5V125H350V112.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 112.891H350.391V124.609H362.109V112.891ZM350 112.5V125H362.5V112.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 112.891H362.891V124.609H374.609V112.891ZM362.5 112.5V125H375V112.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 112.891H375.391V124.609H387.109V112.891ZM375 112.5V125H387.5V112.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 112.891H387.891V124.609H399.609V112.891ZM387.5 112.5V125H400V112.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 112.891H400.391V124.609H412.109V112.891ZM400 112.5V125H412.5V112.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 112.891H412.891V124.609H424.609V112.891ZM412.5 112.5V125H425V112.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 112.891H425.391V124.609H437.109V112.891ZM425 112.5V125H437.5V112.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 112.891H437.891V124.609H449.609V112.891ZM437.5 112.5V125H450V112.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 112.891H450.391V124.609H462.109V112.891ZM450 112.5V125H462.5V112.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 112.891H462.891V124.609H474.609V112.891ZM462.5 112.5V125H475V112.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 112.891H475.391V124.609H487.109V112.891ZM475 112.5V125H487.5V112.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 112.891H487.891V124.609H499.609V112.891ZM487.5 112.5V125H500V112.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 112.891H500.391V124.609H512.109V112.891ZM500 112.5V125H512.5V112.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 112.891H512.891V124.609H524.609V112.891ZM512.5 112.5V125H525V112.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 112.891H525.391V124.609H537.109V112.891ZM525 112.5V125H537.5V112.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 112.891H537.891V124.609H549.609V112.891ZM537.5 112.5V125H550V112.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 112.891H550.391V124.609H562.109V112.891ZM550 112.5V125H562.5V112.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 112.891H562.891V124.609H574.609V112.891ZM562.5 112.5V125H575V112.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 112.891H575.391V124.609H587.109V112.891ZM575 112.5V125H587.5V112.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 112.891H587.891V124.609H599.609V112.891ZM587.5 112.5V125H600V112.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 125.391H0.390625V137.109H12.1094V125.391ZM0 125V137.5H12.5V125H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 125.391H12.8906V137.109H24.6094V125.391ZM12.5 125V137.5H25V125H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 125.391H25.3906V137.109H37.1094V125.391ZM25 125V137.5H37.5V125H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 125.391H37.8906V137.109H49.6094V125.391ZM37.5 125V137.5H50V125H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 125.391H50.3906V137.109H62.1094V125.391ZM50 125V137.5H62.5V125H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 125.391H62.8906V137.109H74.6094V125.391ZM62.5 125V137.5H75V125H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 125.391H75.3906V137.109H87.1094V125.391ZM75 125V137.5H87.5V125H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 125.391H87.8906V137.109H99.6094V125.391ZM87.5 125V137.5H100V125H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 125.391H100.391V137.109H112.109V125.391ZM100 125V137.5H112.5V125H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 125.391H112.891V137.109H124.609V125.391ZM112.5 125V137.5H125V125H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 125.391H125.391V137.109H137.109V125.391ZM125 125V137.5H137.5V125H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 125.391H137.891V137.109H149.609V125.391ZM137.5 125V137.5H150V125H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 125.391H150.391V137.109H162.109V125.391ZM150 125V137.5H162.5V125H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 125.391H162.891V137.109H174.609V125.391ZM162.5 125V137.5H175V125H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 125.391H175.391V137.109H187.109V125.391ZM175 125V137.5H187.5V125H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 125.391H187.891V137.109H199.609V125.391ZM187.5 125V137.5H200V125H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 125.391H200.391V137.109H212.109V125.391ZM200 125V137.5H212.5V125H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 125.391H212.891V137.109H224.609V125.391ZM212.5 125V137.5H225V125H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 125.391H225.391V137.109H237.109V125.391ZM225 125V137.5H237.5V125H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 125.391H237.891V137.109H249.609V125.391ZM237.5 125V137.5H250V125H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 125.391H250.391V137.109H262.109V125.391ZM250 125V137.5H262.5V125H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 125.391H262.891V137.109H274.609V125.391ZM262.5 125V137.5H275V125H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 125.391H275.391V137.109H287.109V125.391ZM275 125V137.5H287.5V125H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 125.391H287.891V137.109H299.609V125.391ZM287.5 125V137.5H300V125H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 125.391H300.391V137.109H312.109V125.391ZM300 125V137.5H312.5V125H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 125.391H312.891V137.109H324.609V125.391ZM312.5 125V137.5H325V125H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 125.391H325.391V137.109H337.109V125.391ZM325 125V137.5H337.5V125H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 125.391H337.891V137.109H349.609V125.391ZM337.5 125V137.5H350V125H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 125.391H350.391V137.109H362.109V125.391ZM350 125V137.5H362.5V125H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 125.391H362.891V137.109H374.609V125.391ZM362.5 125V137.5H375V125H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 125.391H375.391V137.109H387.109V125.391ZM375 125V137.5H387.5V125H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 125.391H387.891V137.109H399.609V125.391ZM387.5 125V137.5H400V125H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 125.391H400.391V137.109H412.109V125.391ZM400 125V137.5H412.5V125H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 125.391H412.891V137.109H424.609V125.391ZM412.5 125V137.5H425V125H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 125.391H425.391V137.109H437.109V125.391ZM425 125V137.5H437.5V125H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 125.391H437.891V137.109H449.609V125.391ZM437.5 125V137.5H450V125H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 125.391H450.391V137.109H462.109V125.391ZM450 125V137.5H462.5V125H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 125.391H462.891V137.109H474.609V125.391ZM462.5 125V137.5H475V125H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 125.391H475.391V137.109H487.109V125.391ZM475 125V137.5H487.5V125H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 125.391H487.891V137.109H499.609V125.391ZM487.5 125V137.5H500V125H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 125.391H500.391V137.109H512.109V125.391ZM500 125V137.5H512.5V125H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 125.391H512.891V137.109H524.609V125.391ZM512.5 125V137.5H525V125H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 125.391H525.391V137.109H537.109V125.391ZM525 125V137.5H537.5V125H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 125.391H537.891V137.109H549.609V125.391ZM537.5 125V137.5H550V125H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 125.391H550.391V137.109H562.109V125.391ZM550 125V137.5H562.5V125H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 125.391H562.891V137.109H574.609V125.391ZM562.5 125V137.5H575V125H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 125.391H575.391V137.109H587.109V125.391ZM575 125V137.5H587.5V125H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 125.391H587.891V137.109H599.609V125.391ZM587.5 125V137.5H600V125H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 137.891H0.390625V149.609H12.1094V137.891ZM0 137.5V150H12.5V137.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 137.891H12.8906V149.609H24.6094V137.891ZM12.5 137.5V150H25V137.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 137.891H25.3906V149.609H37.1094V137.891ZM25 137.5V150H37.5V137.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 137.891H37.8906V149.609H49.6094V137.891ZM37.5 137.5V150H50V137.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 137.891H50.3906V149.609H62.1094V137.891ZM50 137.5V150H62.5V137.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 137.891H62.8906V149.609H74.6094V137.891ZM62.5 137.5V150H75V137.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 137.891H75.3906V149.609H87.1094V137.891ZM75 137.5V150H87.5V137.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 137.891H87.8906V149.609H99.6094V137.891ZM87.5 137.5V150H100V137.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 137.891H100.391V149.609H112.109V137.891ZM100 137.5V150H112.5V137.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 137.891H112.891V149.609H124.609V137.891ZM112.5 137.5V150H125V137.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 137.891H125.391V149.609H137.109V137.891ZM125 137.5V150H137.5V137.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 137.891H137.891V149.609H149.609V137.891ZM137.5 137.5V150H150V137.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 137.891H150.391V149.609H162.109V137.891ZM150 137.5V150H162.5V137.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 137.891H162.891V149.609H174.609V137.891ZM162.5 137.5V150H175V137.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 137.891H175.391V149.609H187.109V137.891ZM175 137.5V150H187.5V137.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 137.891H187.891V149.609H199.609V137.891ZM187.5 137.5V150H200V137.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 137.891H200.391V149.609H212.109V137.891ZM200 137.5V150H212.5V137.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 137.891H212.891V149.609H224.609V137.891ZM212.5 137.5V150H225V137.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 137.891H225.391V149.609H237.109V137.891ZM225 137.5V150H237.5V137.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 137.891H237.891V149.609H249.609V137.891ZM237.5 137.5V150H250V137.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 137.891H250.391V149.609H262.109V137.891ZM250 137.5V150H262.5V137.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 137.891H262.891V149.609H274.609V137.891ZM262.5 137.5V150H275V137.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 137.891H275.391V149.609H287.109V137.891ZM275 137.5V150H287.5V137.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 137.891H287.891V149.609H299.609V137.891ZM287.5 137.5V150H300V137.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 137.891H300.391V149.609H312.109V137.891ZM300 137.5V150H312.5V137.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 137.891H312.891V149.609H324.609V137.891ZM312.5 137.5V150H325V137.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 137.891H325.391V149.609H337.109V137.891ZM325 137.5V150H337.5V137.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 137.891H337.891V149.609H349.609V137.891ZM337.5 137.5V150H350V137.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 137.891H350.391V149.609H362.109V137.891ZM350 137.5V150H362.5V137.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 137.891H362.891V149.609H374.609V137.891ZM362.5 137.5V150H375V137.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 137.891H375.391V149.609H387.109V137.891ZM375 137.5V150H387.5V137.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 137.891H387.891V149.609H399.609V137.891ZM387.5 137.5V150H400V137.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 137.891H400.391V149.609H412.109V137.891ZM400 137.5V150H412.5V137.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 137.891H412.891V149.609H424.609V137.891ZM412.5 137.5V150H425V137.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 137.891H425.391V149.609H437.109V137.891ZM425 137.5V150H437.5V137.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 137.891H437.891V149.609H449.609V137.891ZM437.5 137.5V150H450V137.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 137.891H450.391V149.609H462.109V137.891ZM450 137.5V150H462.5V137.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 137.891H462.891V149.609H474.609V137.891ZM462.5 137.5V150H475V137.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 137.891H475.391V149.609H487.109V137.891ZM475 137.5V150H487.5V137.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 137.891H487.891V149.609H499.609V137.891ZM487.5 137.5V150H500V137.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 137.891H500.391V149.609H512.109V137.891ZM500 137.5V150H512.5V137.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 137.891H512.891V149.609H524.609V137.891ZM512.5 137.5V150H525V137.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 137.891H525.391V149.609H537.109V137.891ZM525 137.5V150H537.5V137.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 137.891H537.891V149.609H549.609V137.891ZM537.5 137.5V150H550V137.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 137.891H550.391V149.609H562.109V137.891ZM550 137.5V150H562.5V137.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 137.891H562.891V149.609H574.609V137.891ZM562.5 137.5V150H575V137.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 137.891H575.391V149.609H587.109V137.891ZM575 137.5V150H587.5V137.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 137.891H587.891V149.609H599.609V137.891ZM587.5 137.5V150H600V137.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 150.391H0.390625V162.109H12.1094V150.391ZM0 150V162.5H12.5V150H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 150.391H12.8906V162.109H24.6094V150.391ZM12.5 150V162.5H25V150H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 150.391H25.3906V162.109H37.1094V150.391ZM25 150V162.5H37.5V150H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 150.391H37.8906V162.109H49.6094V150.391ZM37.5 150V162.5H50V150H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 150.391H50.3906V162.109H62.1094V150.391ZM50 150V162.5H62.5V150H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 150.391H62.8906V162.109H74.6094V150.391ZM62.5 150V162.5H75V150H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 150.391H75.3906V162.109H87.1094V150.391ZM75 150V162.5H87.5V150H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 150.391H87.8906V162.109H99.6094V150.391ZM87.5 150V162.5H100V150H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 150.391H100.391V162.109H112.109V150.391ZM100 150V162.5H112.5V150H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 150.391H112.891V162.109H124.609V150.391ZM112.5 150V162.5H125V150H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 150.391H125.391V162.109H137.109V150.391ZM125 150V162.5H137.5V150H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 150.391H137.891V162.109H149.609V150.391ZM137.5 150V162.5H150V150H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 150.391H150.391V162.109H162.109V150.391ZM150 150V162.5H162.5V150H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 150.391H162.891V162.109H174.609V150.391ZM162.5 150V162.5H175V150H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 150.391H175.391V162.109H187.109V150.391ZM175 150V162.5H187.5V150H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 150.391H187.891V162.109H199.609V150.391ZM187.5 150V162.5H200V150H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 150.391H200.391V162.109H212.109V150.391ZM200 150V162.5H212.5V150H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 150.391H212.891V162.109H224.609V150.391ZM212.5 150V162.5H225V150H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 150.391H225.391V162.109H237.109V150.391ZM225 150V162.5H237.5V150H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 150.391H237.891V162.109H249.609V150.391ZM237.5 150V162.5H250V150H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 150.391H250.391V162.109H262.109V150.391ZM250 150V162.5H262.5V150H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 150.391H262.891V162.109H274.609V150.391ZM262.5 150V162.5H275V150H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 150.391H275.391V162.109H287.109V150.391ZM275 150V162.5H287.5V150H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 150.391H287.891V162.109H299.609V150.391ZM287.5 150V162.5H300V150H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 150.391H300.391V162.109H312.109V150.391ZM300 150V162.5H312.5V150H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 150.391H312.891V162.109H324.609V150.391ZM312.5 150V162.5H325V150H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 150.391H325.391V162.109H337.109V150.391ZM325 150V162.5H337.5V150H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 150.391H337.891V162.109H349.609V150.391ZM337.5 150V162.5H350V150H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 150.391H350.391V162.109H362.109V150.391ZM350 150V162.5H362.5V150H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 150.391H362.891V162.109H374.609V150.391ZM362.5 150V162.5H375V150H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 150.391H375.391V162.109H387.109V150.391ZM375 150V162.5H387.5V150H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 150.391H387.891V162.109H399.609V150.391ZM387.5 150V162.5H400V150H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 150.391H400.391V162.109H412.109V150.391ZM400 150V162.5H412.5V150H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 150.391H412.891V162.109H424.609V150.391ZM412.5 150V162.5H425V150H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 150.391H425.391V162.109H437.109V150.391ZM425 150V162.5H437.5V150H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 150.391H437.891V162.109H449.609V150.391ZM437.5 150V162.5H450V150H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 150.391H450.391V162.109H462.109V150.391ZM450 150V162.5H462.5V150H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 150.391H462.891V162.109H474.609V150.391ZM462.5 150V162.5H475V150H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 150.391H475.391V162.109H487.109V150.391ZM475 150V162.5H487.5V150H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 150.391H487.891V162.109H499.609V150.391ZM487.5 150V162.5H500V150H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 150.391H500.391V162.109H512.109V150.391ZM500 150V162.5H512.5V150H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 150.391H512.891V162.109H524.609V150.391ZM512.5 150V162.5H525V150H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 150.391H525.391V162.109H537.109V150.391ZM525 150V162.5H537.5V150H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 150.391H537.891V162.109H549.609V150.391ZM537.5 150V162.5H550V150H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 150.391H550.391V162.109H562.109V150.391ZM550 150V162.5H562.5V150H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 150.391H562.891V162.109H574.609V150.391ZM562.5 150V162.5H575V150H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 150.391H575.391V162.109H587.109V150.391ZM575 150V162.5H587.5V150H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 150.391H587.891V162.109H599.609V150.391ZM587.5 150V162.5H600V150H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 162.891H0.390625V174.609H12.1094V162.891ZM0 162.5V175H12.5V162.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 162.891H12.8906V174.609H24.6094V162.891ZM12.5 162.5V175H25V162.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 162.891H25.3906V174.609H37.1094V162.891ZM25 162.5V175H37.5V162.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 162.891H37.8906V174.609H49.6094V162.891ZM37.5 162.5V175H50V162.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 162.891H50.3906V174.609H62.1094V162.891ZM50 162.5V175H62.5V162.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 162.891H62.8906V174.609H74.6094V162.891ZM62.5 162.5V175H75V162.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 162.891H75.3906V174.609H87.1094V162.891ZM75 162.5V175H87.5V162.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 162.891H87.8906V174.609H99.6094V162.891ZM87.5 162.5V175H100V162.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 162.891H100.391V174.609H112.109V162.891ZM100 162.5V175H112.5V162.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 162.891H112.891V174.609H124.609V162.891ZM112.5 162.5V175H125V162.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 162.891H125.391V174.609H137.109V162.891ZM125 162.5V175H137.5V162.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 162.891H137.891V174.609H149.609V162.891ZM137.5 162.5V175H150V162.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 162.891H150.391V174.609H162.109V162.891ZM150 162.5V175H162.5V162.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 162.891H162.891V174.609H174.609V162.891ZM162.5 162.5V175H175V162.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 162.891H175.391V174.609H187.109V162.891ZM175 162.5V175H187.5V162.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 162.891H187.891V174.609H199.609V162.891ZM187.5 162.5V175H200V162.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 162.891H200.391V174.609H212.109V162.891ZM200 162.5V175H212.5V162.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 162.891H212.891V174.609H224.609V162.891ZM212.5 162.5V175H225V162.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 162.891H225.391V174.609H237.109V162.891ZM225 162.5V175H237.5V162.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 162.891H237.891V174.609H249.609V162.891ZM237.5 162.5V175H250V162.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 162.891H250.391V174.609H262.109V162.891ZM250 162.5V175H262.5V162.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 162.891H262.891V174.609H274.609V162.891ZM262.5 162.5V175H275V162.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 162.891H275.391V174.609H287.109V162.891ZM275 162.5V175H287.5V162.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 162.891H287.891V174.609H299.609V162.891ZM287.5 162.5V175H300V162.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 162.891H300.391V174.609H312.109V162.891ZM300 162.5V175H312.5V162.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 162.891H312.891V174.609H324.609V162.891ZM312.5 162.5V175H325V162.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 162.891H325.391V174.609H337.109V162.891ZM325 162.5V175H337.5V162.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 162.891H337.891V174.609H349.609V162.891ZM337.5 162.5V175H350V162.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 162.891H350.391V174.609H362.109V162.891ZM350 162.5V175H362.5V162.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 162.891H362.891V174.609H374.609V162.891ZM362.5 162.5V175H375V162.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 162.891H375.391V174.609H387.109V162.891ZM375 162.5V175H387.5V162.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 162.891H387.891V174.609H399.609V162.891ZM387.5 162.5V175H400V162.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 162.891H400.391V174.609H412.109V162.891ZM400 162.5V175H412.5V162.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 162.891H412.891V174.609H424.609V162.891ZM412.5 162.5V175H425V162.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 162.891H425.391V174.609H437.109V162.891ZM425 162.5V175H437.5V162.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 162.891H437.891V174.609H449.609V162.891ZM437.5 162.5V175H450V162.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 162.891H450.391V174.609H462.109V162.891ZM450 162.5V175H462.5V162.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 162.891H462.891V174.609H474.609V162.891ZM462.5 162.5V175H475V162.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 162.891H475.391V174.609H487.109V162.891ZM475 162.5V175H487.5V162.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 162.891H487.891V174.609H499.609V162.891ZM487.5 162.5V175H500V162.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 162.891H500.391V174.609H512.109V162.891ZM500 162.5V175H512.5V162.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 162.891H512.891V174.609H524.609V162.891ZM512.5 162.5V175H525V162.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 162.891H525.391V174.609H537.109V162.891ZM525 162.5V175H537.5V162.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 162.891H537.891V174.609H549.609V162.891ZM537.5 162.5V175H550V162.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 162.891H550.391V174.609H562.109V162.891ZM550 162.5V175H562.5V162.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 162.891H562.891V174.609H574.609V162.891ZM562.5 162.5V175H575V162.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 162.891H575.391V174.609H587.109V162.891ZM575 162.5V175H587.5V162.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 162.891H587.891V174.609H599.609V162.891ZM587.5 162.5V175H600V162.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 175.391H0.390625V187.109H12.1094V175.391ZM0 175V187.5H12.5V175H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 175.391H12.8906V187.109H24.6094V175.391ZM12.5 175V187.5H25V175H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 175.391H25.3906V187.109H37.1094V175.391ZM25 175V187.5H37.5V175H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 175.391H37.8906V187.109H49.6094V175.391ZM37.5 175V187.5H50V175H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 175.391H50.3906V187.109H62.1094V175.391ZM50 175V187.5H62.5V175H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 175.391H62.8906V187.109H74.6094V175.391ZM62.5 175V187.5H75V175H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 175.391H75.3906V187.109H87.1094V175.391ZM75 175V187.5H87.5V175H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 175.391H87.8906V187.109H99.6094V175.391ZM87.5 175V187.5H100V175H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 175.391H100.391V187.109H112.109V175.391ZM100 175V187.5H112.5V175H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 175.391H112.891V187.109H124.609V175.391ZM112.5 175V187.5H125V175H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 175.391H125.391V187.109H137.109V175.391ZM125 175V187.5H137.5V175H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 175.391H137.891V187.109H149.609V175.391ZM137.5 175V187.5H150V175H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 175.391H150.391V187.109H162.109V175.391ZM150 175V187.5H162.5V175H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 175.391H162.891V187.109H174.609V175.391ZM162.5 175V187.5H175V175H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 175.391H175.391V187.109H187.109V175.391ZM175 175V187.5H187.5V175H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 175.391H187.891V187.109H199.609V175.391ZM187.5 175V187.5H200V175H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 175.391H200.391V187.109H212.109V175.391ZM200 175V187.5H212.5V175H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 175.391H212.891V187.109H224.609V175.391ZM212.5 175V187.5H225V175H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 175.391H225.391V187.109H237.109V175.391ZM225 175V187.5H237.5V175H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 175.391H237.891V187.109H249.609V175.391ZM237.5 175V187.5H250V175H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 175.391H250.391V187.109H262.109V175.391ZM250 175V187.5H262.5V175H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 175.391H262.891V187.109H274.609V175.391ZM262.5 175V187.5H275V175H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 175.391H275.391V187.109H287.109V175.391ZM275 175V187.5H287.5V175H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 175.391H287.891V187.109H299.609V175.391ZM287.5 175V187.5H300V175H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 175.391H300.391V187.109H312.109V175.391ZM300 175V187.5H312.5V175H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 175.391H312.891V187.109H324.609V175.391ZM312.5 175V187.5H325V175H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 175.391H325.391V187.109H337.109V175.391ZM325 175V187.5H337.5V175H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 175.391H337.891V187.109H349.609V175.391ZM337.5 175V187.5H350V175H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 175.391H350.391V187.109H362.109V175.391ZM350 175V187.5H362.5V175H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 175.391H362.891V187.109H374.609V175.391ZM362.5 175V187.5H375V175H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 175.391H375.391V187.109H387.109V175.391ZM375 175V187.5H387.5V175H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 175.391H387.891V187.109H399.609V175.391ZM387.5 175V187.5H400V175H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 175.391H400.391V187.109H412.109V175.391ZM400 175V187.5H412.5V175H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 175.391H412.891V187.109H424.609V175.391ZM412.5 175V187.5H425V175H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 175.391H425.391V187.109H437.109V175.391ZM425 175V187.5H437.5V175H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 175.391H437.891V187.109H449.609V175.391ZM437.5 175V187.5H450V175H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 175.391H450.391V187.109H462.109V175.391ZM450 175V187.5H462.5V175H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 175.391H462.891V187.109H474.609V175.391ZM462.5 175V187.5H475V175H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 175.391H475.391V187.109H487.109V175.391ZM475 175V187.5H487.5V175H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 175.391H487.891V187.109H499.609V175.391ZM487.5 175V187.5H500V175H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 175.391H500.391V187.109H512.109V175.391ZM500 175V187.5H512.5V175H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 175.391H512.891V187.109H524.609V175.391ZM512.5 175V187.5H525V175H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 175.391H525.391V187.109H537.109V175.391ZM525 175V187.5H537.5V175H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 175.391H537.891V187.109H549.609V175.391ZM537.5 175V187.5H550V175H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 175.391H550.391V187.109H562.109V175.391ZM550 175V187.5H562.5V175H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 175.391H562.891V187.109H574.609V175.391ZM562.5 175V187.5H575V175H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 175.391H575.391V187.109H587.109V175.391ZM575 175V187.5H587.5V175H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 175.391H587.891V187.109H599.609V175.391ZM587.5 175V187.5H600V175H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 187.891H0.390625V199.609H12.1094V187.891ZM0 187.5V200H12.5V187.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 187.891H12.8906V199.609H24.6094V187.891ZM12.5 187.5V200H25V187.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 187.891H25.3906V199.609H37.1094V187.891ZM25 187.5V200H37.5V187.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 187.891H37.8906V199.609H49.6094V187.891ZM37.5 187.5V200H50V187.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 187.891H50.3906V199.609H62.1094V187.891ZM50 187.5V200H62.5V187.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 187.891H62.8906V199.609H74.6094V187.891ZM62.5 187.5V200H75V187.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 187.891H75.3906V199.609H87.1094V187.891ZM75 187.5V200H87.5V187.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 187.891H87.8906V199.609H99.6094V187.891ZM87.5 187.5V200H100V187.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 187.891H100.391V199.609H112.109V187.891ZM100 187.5V200H112.5V187.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 187.891H112.891V199.609H124.609V187.891ZM112.5 187.5V200H125V187.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 187.891H125.391V199.609H137.109V187.891ZM125 187.5V200H137.5V187.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 187.891H137.891V199.609H149.609V187.891ZM137.5 187.5V200H150V187.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 187.891H150.391V199.609H162.109V187.891ZM150 187.5V200H162.5V187.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 187.891H162.891V199.609H174.609V187.891ZM162.5 187.5V200H175V187.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 187.891H175.391V199.609H187.109V187.891ZM175 187.5V200H187.5V187.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 187.891H187.891V199.609H199.609V187.891ZM187.5 187.5V200H200V187.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 187.891H200.391V199.609H212.109V187.891ZM200 187.5V200H212.5V187.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 187.891H212.891V199.609H224.609V187.891ZM212.5 187.5V200H225V187.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 187.891H225.391V199.609H237.109V187.891ZM225 187.5V200H237.5V187.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 187.891H237.891V199.609H249.609V187.891ZM237.5 187.5V200H250V187.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 187.891H250.391V199.609H262.109V187.891ZM250 187.5V200H262.5V187.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 187.891H262.891V199.609H274.609V187.891ZM262.5 187.5V200H275V187.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 187.891H275.391V199.609H287.109V187.891ZM275 187.5V200H287.5V187.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 187.891H287.891V199.609H299.609V187.891ZM287.5 187.5V200H300V187.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 187.891H300.391V199.609H312.109V187.891ZM300 187.5V200H312.5V187.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 187.891H312.891V199.609H324.609V187.891ZM312.5 187.5V200H325V187.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 187.891H325.391V199.609H337.109V187.891ZM325 187.5V200H337.5V187.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 187.891H337.891V199.609H349.609V187.891ZM337.5 187.5V200H350V187.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 187.891H350.391V199.609H362.109V187.891ZM350 187.5V200H362.5V187.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 187.891H362.891V199.609H374.609V187.891ZM362.5 187.5V200H375V187.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 187.891H375.391V199.609H387.109V187.891ZM375 187.5V200H387.5V187.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 187.891H387.891V199.609H399.609V187.891ZM387.5 187.5V200H400V187.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 187.891H400.391V199.609H412.109V187.891ZM400 187.5V200H412.5V187.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 187.891H412.891V199.609H424.609V187.891ZM412.5 187.5V200H425V187.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 187.891H425.391V199.609H437.109V187.891ZM425 187.5V200H437.5V187.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 187.891H437.891V199.609H449.609V187.891ZM437.5 187.5V200H450V187.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 187.891H450.391V199.609H462.109V187.891ZM450 187.5V200H462.5V187.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 187.891H462.891V199.609H474.609V187.891ZM462.5 187.5V200H475V187.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 187.891H475.391V199.609H487.109V187.891ZM475 187.5V200H487.5V187.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 187.891H487.891V199.609H499.609V187.891ZM487.5 187.5V200H500V187.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 187.891H500.391V199.609H512.109V187.891ZM500 187.5V200H512.5V187.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 187.891H512.891V199.609H524.609V187.891ZM512.5 187.5V200H525V187.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 187.891H525.391V199.609H537.109V187.891ZM525 187.5V200H537.5V187.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 187.891H537.891V199.609H549.609V187.891ZM537.5 187.5V200H550V187.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 187.891H550.391V199.609H562.109V187.891ZM550 187.5V200H562.5V187.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 187.891H562.891V199.609H574.609V187.891ZM562.5 187.5V200H575V187.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 187.891H575.391V199.609H587.109V187.891ZM575 187.5V200H587.5V187.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 187.891H587.891V199.609H599.609V187.891ZM587.5 187.5V200H600V187.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 200.391H0.390625V212.109H12.1094V200.391ZM0 200V212.5H12.5V200H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 200.391H12.8906V212.109H24.6094V200.391ZM12.5 200V212.5H25V200H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 200.391H25.3906V212.109H37.1094V200.391ZM25 200V212.5H37.5V200H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 200.391H37.8906V212.109H49.6094V200.391ZM37.5 200V212.5H50V200H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 200.391H50.3906V212.109H62.1094V200.391ZM50 200V212.5H62.5V200H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 200.391H62.8906V212.109H74.6094V200.391ZM62.5 200V212.5H75V200H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 200.391H75.3906V212.109H87.1094V200.391ZM75 200V212.5H87.5V200H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 200.391H87.8906V212.109H99.6094V200.391ZM87.5 200V212.5H100V200H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 200.391H100.391V212.109H112.109V200.391ZM100 200V212.5H112.5V200H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 200.391H112.891V212.109H124.609V200.391ZM112.5 200V212.5H125V200H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 200.391H125.391V212.109H137.109V200.391ZM125 200V212.5H137.5V200H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 200.391H137.891V212.109H149.609V200.391ZM137.5 200V212.5H150V200H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 200.391H150.391V212.109H162.109V200.391ZM150 200V212.5H162.5V200H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 200.391H162.891V212.109H174.609V200.391ZM162.5 200V212.5H175V200H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 200.391H175.391V212.109H187.109V200.391ZM175 200V212.5H187.5V200H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 200.391H187.891V212.109H199.609V200.391ZM187.5 200V212.5H200V200H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 200.391H200.391V212.109H212.109V200.391ZM200 200V212.5H212.5V200H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 200.391H212.891V212.109H224.609V200.391ZM212.5 200V212.5H225V200H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 200.391H225.391V212.109H237.109V200.391ZM225 200V212.5H237.5V200H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 200.391H237.891V212.109H249.609V200.391ZM237.5 200V212.5H250V200H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 200.391H250.391V212.109H262.109V200.391ZM250 200V212.5H262.5V200H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 200.391H262.891V212.109H274.609V200.391ZM262.5 200V212.5H275V200H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 200.391H275.391V212.109H287.109V200.391ZM275 200V212.5H287.5V200H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 200.391H287.891V212.109H299.609V200.391ZM287.5 200V212.5H300V200H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 200.391H300.391V212.109H312.109V200.391ZM300 200V212.5H312.5V200H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 200.391H312.891V212.109H324.609V200.391ZM312.5 200V212.5H325V200H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 200.391H325.391V212.109H337.109V200.391ZM325 200V212.5H337.5V200H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 200.391H337.891V212.109H349.609V200.391ZM337.5 200V212.5H350V200H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 200.391H350.391V212.109H362.109V200.391ZM350 200V212.5H362.5V200H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 200.391H362.891V212.109H374.609V200.391ZM362.5 200V212.5H375V200H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 200.391H375.391V212.109H387.109V200.391ZM375 200V212.5H387.5V200H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 200.391H387.891V212.109H399.609V200.391ZM387.5 200V212.5H400V200H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 200.391H400.391V212.109H412.109V200.391ZM400 200V212.5H412.5V200H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 200.391H412.891V212.109H424.609V200.391ZM412.5 200V212.5H425V200H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 200.391H425.391V212.109H437.109V200.391ZM425 200V212.5H437.5V200H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 200.391H437.891V212.109H449.609V200.391ZM437.5 200V212.5H450V200H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 200.391H450.391V212.109H462.109V200.391ZM450 200V212.5H462.5V200H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 200.391H462.891V212.109H474.609V200.391ZM462.5 200V212.5H475V200H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 200.391H475.391V212.109H487.109V200.391ZM475 200V212.5H487.5V200H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 200.391H487.891V212.109H499.609V200.391ZM487.5 200V212.5H500V200H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 200.391H500.391V212.109H512.109V200.391ZM500 200V212.5H512.5V200H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 200.391H512.891V212.109H524.609V200.391ZM512.5 200V212.5H525V200H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 200.391H525.391V212.109H537.109V200.391ZM525 200V212.5H537.5V200H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 200.391H537.891V212.109H549.609V200.391ZM537.5 200V212.5H550V200H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 200.391H550.391V212.109H562.109V200.391ZM550 200V212.5H562.5V200H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 200.391H562.891V212.109H574.609V200.391ZM562.5 200V212.5H575V200H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 200.391H575.391V212.109H587.109V200.391ZM575 200V212.5H587.5V200H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 200.391H587.891V212.109H599.609V200.391ZM587.5 200V212.5H600V200H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 212.891H0.390625V224.609H12.1094V212.891ZM0 212.5V225H12.5V212.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 212.891H12.8906V224.609H24.6094V212.891ZM12.5 212.5V225H25V212.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 212.891H25.3906V224.609H37.1094V212.891ZM25 212.5V225H37.5V212.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 212.891H37.8906V224.609H49.6094V212.891ZM37.5 212.5V225H50V212.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 212.891H50.3906V224.609H62.1094V212.891ZM50 212.5V225H62.5V212.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 212.891H62.8906V224.609H74.6094V212.891ZM62.5 212.5V225H75V212.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 212.891H75.3906V224.609H87.1094V212.891ZM75 212.5V225H87.5V212.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 212.891H87.8906V224.609H99.6094V212.891ZM87.5 212.5V225H100V212.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 212.891H100.391V224.609H112.109V212.891ZM100 212.5V225H112.5V212.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 212.891H112.891V224.609H124.609V212.891ZM112.5 212.5V225H125V212.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 212.891H125.391V224.609H137.109V212.891ZM125 212.5V225H137.5V212.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 212.891H137.891V224.609H149.609V212.891ZM137.5 212.5V225H150V212.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 212.891H150.391V224.609H162.109V212.891ZM150 212.5V225H162.5V212.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 212.891H162.891V224.609H174.609V212.891ZM162.5 212.5V225H175V212.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 212.891H175.391V224.609H187.109V212.891ZM175 212.5V225H187.5V212.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 212.891H187.891V224.609H199.609V212.891ZM187.5 212.5V225H200V212.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 212.891H200.391V224.609H212.109V212.891ZM200 212.5V225H212.5V212.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 212.891H212.891V224.609H224.609V212.891ZM212.5 212.5V225H225V212.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 212.891H225.391V224.609H237.109V212.891ZM225 212.5V225H237.5V212.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 212.891H237.891V224.609H249.609V212.891ZM237.5 212.5V225H250V212.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 212.891H250.391V224.609H262.109V212.891ZM250 212.5V225H262.5V212.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 212.891H262.891V224.609H274.609V212.891ZM262.5 212.5V225H275V212.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 212.891H275.391V224.609H287.109V212.891ZM275 212.5V225H287.5V212.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 212.891H287.891V224.609H299.609V212.891ZM287.5 212.5V225H300V212.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 212.891H300.391V224.609H312.109V212.891ZM300 212.5V225H312.5V212.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 212.891H312.891V224.609H324.609V212.891ZM312.5 212.5V225H325V212.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 212.891H325.391V224.609H337.109V212.891ZM325 212.5V225H337.5V212.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 212.891H337.891V224.609H349.609V212.891ZM337.5 212.5V225H350V212.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 212.891H350.391V224.609H362.109V212.891ZM350 212.5V225H362.5V212.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 212.891H362.891V224.609H374.609V212.891ZM362.5 212.5V225H375V212.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 212.891H375.391V224.609H387.109V212.891ZM375 212.5V225H387.5V212.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 212.891H387.891V224.609H399.609V212.891ZM387.5 212.5V225H400V212.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 212.891H400.391V224.609H412.109V212.891ZM400 212.5V225H412.5V212.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 212.891H412.891V224.609H424.609V212.891ZM412.5 212.5V225H425V212.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 212.891H425.391V224.609H437.109V212.891ZM425 212.5V225H437.5V212.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 212.891H437.891V224.609H449.609V212.891ZM437.5 212.5V225H450V212.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 212.891H450.391V224.609H462.109V212.891ZM450 212.5V225H462.5V212.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 212.891H462.891V224.609H474.609V212.891ZM462.5 212.5V225H475V212.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 212.891H475.391V224.609H487.109V212.891ZM475 212.5V225H487.5V212.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 212.891H487.891V224.609H499.609V212.891ZM487.5 212.5V225H500V212.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 212.891H500.391V224.609H512.109V212.891ZM500 212.5V225H512.5V212.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 212.891H512.891V224.609H524.609V212.891ZM512.5 212.5V225H525V212.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 212.891H525.391V224.609H537.109V212.891ZM525 212.5V225H537.5V212.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 212.891H537.891V224.609H549.609V212.891ZM537.5 212.5V225H550V212.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 212.891H550.391V224.609H562.109V212.891ZM550 212.5V225H562.5V212.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 212.891H562.891V224.609H574.609V212.891ZM562.5 212.5V225H575V212.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 212.891H575.391V224.609H587.109V212.891ZM575 212.5V225H587.5V212.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 212.891H587.891V224.609H599.609V212.891ZM587.5 212.5V225H600V212.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 225.391H0.390625V237.109H12.1094V225.391ZM0 225V237.5H12.5V225H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 225.391H12.8906V237.109H24.6094V225.391ZM12.5 225V237.5H25V225H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 225.391H25.3906V237.109H37.1094V225.391ZM25 225V237.5H37.5V225H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 225.391H37.8906V237.109H49.6094V225.391ZM37.5 225V237.5H50V225H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 225.391H50.3906V237.109H62.1094V225.391ZM50 225V237.5H62.5V225H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 225.391H62.8906V237.109H74.6094V225.391ZM62.5 225V237.5H75V225H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 225.391H75.3906V237.109H87.1094V225.391ZM75 225V237.5H87.5V225H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 225.391H87.8906V237.109H99.6094V225.391ZM87.5 225V237.5H100V225H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 225.391H100.391V237.109H112.109V225.391ZM100 225V237.5H112.5V225H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 225.391H112.891V237.109H124.609V225.391ZM112.5 225V237.5H125V225H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 225.391H125.391V237.109H137.109V225.391ZM125 225V237.5H137.5V225H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 225.391H137.891V237.109H149.609V225.391ZM137.5 225V237.5H150V225H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 225.391H150.391V237.109H162.109V225.391ZM150 225V237.5H162.5V225H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 225.391H162.891V237.109H174.609V225.391ZM162.5 225V237.5H175V225H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 225.391H175.391V237.109H187.109V225.391ZM175 225V237.5H187.5V225H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 225.391H187.891V237.109H199.609V225.391ZM187.5 225V237.5H200V225H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 225.391H200.391V237.109H212.109V225.391ZM200 225V237.5H212.5V225H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 225.391H212.891V237.109H224.609V225.391ZM212.5 225V237.5H225V225H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 225.391H225.391V237.109H237.109V225.391ZM225 225V237.5H237.5V225H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 225.391H237.891V237.109H249.609V225.391ZM237.5 225V237.5H250V225H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 225.391H250.391V237.109H262.109V225.391ZM250 225V237.5H262.5V225H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 225.391H262.891V237.109H274.609V225.391ZM262.5 225V237.5H275V225H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 225.391H275.391V237.109H287.109V225.391ZM275 225V237.5H287.5V225H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 225.391H287.891V237.109H299.609V225.391ZM287.5 225V237.5H300V225H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 225.391H300.391V237.109H312.109V225.391ZM300 225V237.5H312.5V225H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 225.391H312.891V237.109H324.609V225.391ZM312.5 225V237.5H325V225H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 225.391H325.391V237.109H337.109V225.391ZM325 225V237.5H337.5V225H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 225.391H337.891V237.109H349.609V225.391ZM337.5 225V237.5H350V225H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 225.391H350.391V237.109H362.109V225.391ZM350 225V237.5H362.5V225H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 225.391H362.891V237.109H374.609V225.391ZM362.5 225V237.5H375V225H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 225.391H375.391V237.109H387.109V225.391ZM375 225V237.5H387.5V225H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 225.391H387.891V237.109H399.609V225.391ZM387.5 225V237.5H400V225H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 225.391H400.391V237.109H412.109V225.391ZM400 225V237.5H412.5V225H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 225.391H412.891V237.109H424.609V225.391ZM412.5 225V237.5H425V225H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 225.391H425.391V237.109H437.109V225.391ZM425 225V237.5H437.5V225H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 225.391H437.891V237.109H449.609V225.391ZM437.5 225V237.5H450V225H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 225.391H450.391V237.109H462.109V225.391ZM450 225V237.5H462.5V225H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 225.391H462.891V237.109H474.609V225.391ZM462.5 225V237.5H475V225H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 225.391H475.391V237.109H487.109V225.391ZM475 225V237.5H487.5V225H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 225.391H487.891V237.109H499.609V225.391ZM487.5 225V237.5H500V225H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 225.391H500.391V237.109H512.109V225.391ZM500 225V237.5H512.5V225H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 225.391H512.891V237.109H524.609V225.391ZM512.5 225V237.5H525V225H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 225.391H525.391V237.109H537.109V225.391ZM525 225V237.5H537.5V225H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 225.391H537.891V237.109H549.609V225.391ZM537.5 225V237.5H550V225H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 225.391H550.391V237.109H562.109V225.391ZM550 225V237.5H562.5V225H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 225.391H562.891V237.109H574.609V225.391ZM562.5 225V237.5H575V225H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 225.391H575.391V237.109H587.109V225.391ZM575 225V237.5H587.5V225H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 225.391H587.891V237.109H599.609V225.391ZM587.5 225V237.5H600V225H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 237.891H0.390625V249.609H12.1094V237.891ZM0 237.5V250H12.5V237.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 237.891H12.8906V249.609H24.6094V237.891ZM12.5 237.5V250H25V237.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 237.891H25.3906V249.609H37.1094V237.891ZM25 237.5V250H37.5V237.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 237.891H37.8906V249.609H49.6094V237.891ZM37.5 237.5V250H50V237.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 237.891H50.3906V249.609H62.1094V237.891ZM50 237.5V250H62.5V237.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 237.891H62.8906V249.609H74.6094V237.891ZM62.5 237.5V250H75V237.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 237.891H75.3906V249.609H87.1094V237.891ZM75 237.5V250H87.5V237.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 237.891H87.8906V249.609H99.6094V237.891ZM87.5 237.5V250H100V237.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 237.891H100.391V249.609H112.109V237.891ZM100 237.5V250H112.5V237.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 237.891H112.891V249.609H124.609V237.891ZM112.5 237.5V250H125V237.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 237.891H125.391V249.609H137.109V237.891ZM125 237.5V250H137.5V237.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 237.891H137.891V249.609H149.609V237.891ZM137.5 237.5V250H150V237.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 237.891H150.391V249.609H162.109V237.891ZM150 237.5V250H162.5V237.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 237.891H162.891V249.609H174.609V237.891ZM162.5 237.5V250H175V237.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 237.891H175.391V249.609H187.109V237.891ZM175 237.5V250H187.5V237.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 237.891H187.891V249.609H199.609V237.891ZM187.5 237.5V250H200V237.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 237.891H200.391V249.609H212.109V237.891ZM200 237.5V250H212.5V237.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 237.891H212.891V249.609H224.609V237.891ZM212.5 237.5V250H225V237.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 237.891H225.391V249.609H237.109V237.891ZM225 237.5V250H237.5V237.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 237.891H237.891V249.609H249.609V237.891ZM237.5 237.5V250H250V237.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 237.891H250.391V249.609H262.109V237.891ZM250 237.5V250H262.5V237.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 237.891H262.891V249.609H274.609V237.891ZM262.5 237.5V250H275V237.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 237.891H275.391V249.609H287.109V237.891ZM275 237.5V250H287.5V237.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 237.891H287.891V249.609H299.609V237.891ZM287.5 237.5V250H300V237.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 237.891H300.391V249.609H312.109V237.891ZM300 237.5V250H312.5V237.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 237.891H312.891V249.609H324.609V237.891ZM312.5 237.5V250H325V237.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 237.891H325.391V249.609H337.109V237.891ZM325 237.5V250H337.5V237.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 237.891H337.891V249.609H349.609V237.891ZM337.5 237.5V250H350V237.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 237.891H350.391V249.609H362.109V237.891ZM350 237.5V250H362.5V237.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 237.891H362.891V249.609H374.609V237.891ZM362.5 237.5V250H375V237.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 237.891H375.391V249.609H387.109V237.891ZM375 237.5V250H387.5V237.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 237.891H387.891V249.609H399.609V237.891ZM387.5 237.5V250H400V237.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 237.891H400.391V249.609H412.109V237.891ZM400 237.5V250H412.5V237.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 237.891H412.891V249.609H424.609V237.891ZM412.5 237.5V250H425V237.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 237.891H425.391V249.609H437.109V237.891ZM425 237.5V250H437.5V237.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 237.891H437.891V249.609H449.609V237.891ZM437.5 237.5V250H450V237.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 237.891H450.391V249.609H462.109V237.891ZM450 237.5V250H462.5V237.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 237.891H462.891V249.609H474.609V237.891ZM462.5 237.5V250H475V237.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 237.891H475.391V249.609H487.109V237.891ZM475 237.5V250H487.5V237.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 237.891H487.891V249.609H499.609V237.891ZM487.5 237.5V250H500V237.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 237.891H500.391V249.609H512.109V237.891ZM500 237.5V250H512.5V237.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 237.891H512.891V249.609H524.609V237.891ZM512.5 237.5V250H525V237.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 237.891H525.391V249.609H537.109V237.891ZM525 237.5V250H537.5V237.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 237.891H537.891V249.609H549.609V237.891ZM537.5 237.5V250H550V237.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 237.891H550.391V249.609H562.109V237.891ZM550 237.5V250H562.5V237.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 237.891H562.891V249.609H574.609V237.891ZM562.5 237.5V250H575V237.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 237.891H575.391V249.609H587.109V237.891ZM575 237.5V250H587.5V237.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 237.891H587.891V249.609H599.609V237.891ZM587.5 237.5V250H600V237.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 250.391H0.390625V262.109H12.1094V250.391ZM0 250V262.5H12.5V250H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 250.391H12.8906V262.109H24.6094V250.391ZM12.5 250V262.5H25V250H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 250.391H25.3906V262.109H37.1094V250.391ZM25 250V262.5H37.5V250H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 250.391H37.8906V262.109H49.6094V250.391ZM37.5 250V262.5H50V250H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 250.391H50.3906V262.109H62.1094V250.391ZM50 250V262.5H62.5V250H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 250.391H62.8906V262.109H74.6094V250.391ZM62.5 250V262.5H75V250H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 250.391H75.3906V262.109H87.1094V250.391ZM75 250V262.5H87.5V250H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 250.391H87.8906V262.109H99.6094V250.391ZM87.5 250V262.5H100V250H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 250.391H100.391V262.109H112.109V250.391ZM100 250V262.5H112.5V250H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 250.391H112.891V262.109H124.609V250.391ZM112.5 250V262.5H125V250H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 250.391H125.391V262.109H137.109V250.391ZM125 250V262.5H137.5V250H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 250.391H137.891V262.109H149.609V250.391ZM137.5 250V262.5H150V250H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 250.391H150.391V262.109H162.109V250.391ZM150 250V262.5H162.5V250H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 250.391H162.891V262.109H174.609V250.391ZM162.5 250V262.5H175V250H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 250.391H175.391V262.109H187.109V250.391ZM175 250V262.5H187.5V250H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 250.391H187.891V262.109H199.609V250.391ZM187.5 250V262.5H200V250H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 250.391H200.391V262.109H212.109V250.391ZM200 250V262.5H212.5V250H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 250.391H212.891V262.109H224.609V250.391ZM212.5 250V262.5H225V250H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 250.391H225.391V262.109H237.109V250.391ZM225 250V262.5H237.5V250H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 250.391H237.891V262.109H249.609V250.391ZM237.5 250V262.5H250V250H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 250.391H250.391V262.109H262.109V250.391ZM250 250V262.5H262.5V250H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 250.391H262.891V262.109H274.609V250.391ZM262.5 250V262.5H275V250H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 250.391H275.391V262.109H287.109V250.391ZM275 250V262.5H287.5V250H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 250.391H287.891V262.109H299.609V250.391ZM287.5 250V262.5H300V250H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 250.391H300.391V262.109H312.109V250.391ZM300 250V262.5H312.5V250H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 250.391H312.891V262.109H324.609V250.391ZM312.5 250V262.5H325V250H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 250.391H325.391V262.109H337.109V250.391ZM325 250V262.5H337.5V250H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 250.391H337.891V262.109H349.609V250.391ZM337.5 250V262.5H350V250H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 250.391H350.391V262.109H362.109V250.391ZM350 250V262.5H362.5V250H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 250.391H362.891V262.109H374.609V250.391ZM362.5 250V262.5H375V250H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 250.391H375.391V262.109H387.109V250.391ZM375 250V262.5H387.5V250H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 250.391H387.891V262.109H399.609V250.391ZM387.5 250V262.5H400V250H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 250.391H400.391V262.109H412.109V250.391ZM400 250V262.5H412.5V250H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 250.391H412.891V262.109H424.609V250.391ZM412.5 250V262.5H425V250H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 250.391H425.391V262.109H437.109V250.391ZM425 250V262.5H437.5V250H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 250.391H437.891V262.109H449.609V250.391ZM437.5 250V262.5H450V250H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 250.391H450.391V262.109H462.109V250.391ZM450 250V262.5H462.5V250H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 250.391H462.891V262.109H474.609V250.391ZM462.5 250V262.5H475V250H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 250.391H475.391V262.109H487.109V250.391ZM475 250V262.5H487.5V250H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 250.391H487.891V262.109H499.609V250.391ZM487.5 250V262.5H500V250H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 250.391H500.391V262.109H512.109V250.391ZM500 250V262.5H512.5V250H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 250.391H512.891V262.109H524.609V250.391ZM512.5 250V262.5H525V250H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 250.391H525.391V262.109H537.109V250.391ZM525 250V262.5H537.5V250H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 250.391H537.891V262.109H549.609V250.391ZM537.5 250V262.5H550V250H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 250.391H550.391V262.109H562.109V250.391ZM550 250V262.5H562.5V250H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 250.391H562.891V262.109H574.609V250.391ZM562.5 250V262.5H575V250H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 250.391H575.391V262.109H587.109V250.391ZM575 250V262.5H587.5V250H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 250.391H587.891V262.109H599.609V250.391ZM587.5 250V262.5H600V250H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 262.891H0.390625V274.609H12.1094V262.891ZM0 262.5V275H12.5V262.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 262.891H12.8906V274.609H24.6094V262.891ZM12.5 262.5V275H25V262.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 262.891H25.3906V274.609H37.1094V262.891ZM25 262.5V275H37.5V262.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 262.891H37.8906V274.609H49.6094V262.891ZM37.5 262.5V275H50V262.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 262.891H50.3906V274.609H62.1094V262.891ZM50 262.5V275H62.5V262.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 262.891H62.8906V274.609H74.6094V262.891ZM62.5 262.5V275H75V262.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 262.891H75.3906V274.609H87.1094V262.891ZM75 262.5V275H87.5V262.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 262.891H87.8906V274.609H99.6094V262.891ZM87.5 262.5V275H100V262.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 262.891H100.391V274.609H112.109V262.891ZM100 262.5V275H112.5V262.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 262.891H112.891V274.609H124.609V262.891ZM112.5 262.5V275H125V262.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 262.891H125.391V274.609H137.109V262.891ZM125 262.5V275H137.5V262.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 262.891H137.891V274.609H149.609V262.891ZM137.5 262.5V275H150V262.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 262.891H150.391V274.609H162.109V262.891ZM150 262.5V275H162.5V262.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 262.891H162.891V274.609H174.609V262.891ZM162.5 262.5V275H175V262.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 262.891H175.391V274.609H187.109V262.891ZM175 262.5V275H187.5V262.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 262.891H187.891V274.609H199.609V262.891ZM187.5 262.5V275H200V262.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 262.891H200.391V274.609H212.109V262.891ZM200 262.5V275H212.5V262.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 262.891H212.891V274.609H224.609V262.891ZM212.5 262.5V275H225V262.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 262.891H225.391V274.609H237.109V262.891ZM225 262.5V275H237.5V262.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 262.891H237.891V274.609H249.609V262.891ZM237.5 262.5V275H250V262.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 262.891H250.391V274.609H262.109V262.891ZM250 262.5V275H262.5V262.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 262.891H262.891V274.609H274.609V262.891ZM262.5 262.5V275H275V262.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 262.891H275.391V274.609H287.109V262.891ZM275 262.5V275H287.5V262.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 262.891H287.891V274.609H299.609V262.891ZM287.5 262.5V275H300V262.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 262.891H300.391V274.609H312.109V262.891ZM300 262.5V275H312.5V262.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 262.891H312.891V274.609H324.609V262.891ZM312.5 262.5V275H325V262.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 262.891H325.391V274.609H337.109V262.891ZM325 262.5V275H337.5V262.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 262.891H337.891V274.609H349.609V262.891ZM337.5 262.5V275H350V262.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 262.891H350.391V274.609H362.109V262.891ZM350 262.5V275H362.5V262.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 262.891H362.891V274.609H374.609V262.891ZM362.5 262.5V275H375V262.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 262.891H375.391V274.609H387.109V262.891ZM375 262.5V275H387.5V262.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 262.891H387.891V274.609H399.609V262.891ZM387.5 262.5V275H400V262.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 262.891H400.391V274.609H412.109V262.891ZM400 262.5V275H412.5V262.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 262.891H412.891V274.609H424.609V262.891ZM412.5 262.5V275H425V262.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 262.891H425.391V274.609H437.109V262.891ZM425 262.5V275H437.5V262.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 262.891H437.891V274.609H449.609V262.891ZM437.5 262.5V275H450V262.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 262.891H450.391V274.609H462.109V262.891ZM450 262.5V275H462.5V262.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 262.891H462.891V274.609H474.609V262.891ZM462.5 262.5V275H475V262.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 262.891H475.391V274.609H487.109V262.891ZM475 262.5V275H487.5V262.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 262.891H487.891V274.609H499.609V262.891ZM487.5 262.5V275H500V262.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 262.891H500.391V274.609H512.109V262.891ZM500 262.5V275H512.5V262.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 262.891H512.891V274.609H524.609V262.891ZM512.5 262.5V275H525V262.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 262.891H525.391V274.609H537.109V262.891ZM525 262.5V275H537.5V262.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 262.891H537.891V274.609H549.609V262.891ZM537.5 262.5V275H550V262.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 262.891H550.391V274.609H562.109V262.891ZM550 262.5V275H562.5V262.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 262.891H562.891V274.609H574.609V262.891ZM562.5 262.5V275H575V262.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 262.891H575.391V274.609H587.109V262.891ZM575 262.5V275H587.5V262.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 262.891H587.891V274.609H599.609V262.891ZM587.5 262.5V275H600V262.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 275.391H0.390625V287.109H12.1094V275.391ZM0 275V287.5H12.5V275H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 275.391H12.8906V287.109H24.6094V275.391ZM12.5 275V287.5H25V275H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 275.391H25.3906V287.109H37.1094V275.391ZM25 275V287.5H37.5V275H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 275.391H37.8906V287.109H49.6094V275.391ZM37.5 275V287.5H50V275H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 275.391H50.3906V287.109H62.1094V275.391ZM50 275V287.5H62.5V275H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 275.391H62.8906V287.109H74.6094V275.391ZM62.5 275V287.5H75V275H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 275.391H75.3906V287.109H87.1094V275.391ZM75 275V287.5H87.5V275H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 275.391H87.8906V287.109H99.6094V275.391ZM87.5 275V287.5H100V275H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 275.391H100.391V287.109H112.109V275.391ZM100 275V287.5H112.5V275H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 275.391H112.891V287.109H124.609V275.391ZM112.5 275V287.5H125V275H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 275.391H125.391V287.109H137.109V275.391ZM125 275V287.5H137.5V275H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 275.391H137.891V287.109H149.609V275.391ZM137.5 275V287.5H150V275H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 275.391H150.391V287.109H162.109V275.391ZM150 275V287.5H162.5V275H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 275.391H162.891V287.109H174.609V275.391ZM162.5 275V287.5H175V275H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 275.391H175.391V287.109H187.109V275.391ZM175 275V287.5H187.5V275H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 275.391H187.891V287.109H199.609V275.391ZM187.5 275V287.5H200V275H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 275.391H200.391V287.109H212.109V275.391ZM200 275V287.5H212.5V275H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 275.391H212.891V287.109H224.609V275.391ZM212.5 275V287.5H225V275H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 275.391H225.391V287.109H237.109V275.391ZM225 275V287.5H237.5V275H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 275.391H237.891V287.109H249.609V275.391ZM237.5 275V287.5H250V275H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 275.391H250.391V287.109H262.109V275.391ZM250 275V287.5H262.5V275H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 275.391H262.891V287.109H274.609V275.391ZM262.5 275V287.5H275V275H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 275.391H275.391V287.109H287.109V275.391ZM275 275V287.5H287.5V275H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 275.391H287.891V287.109H299.609V275.391ZM287.5 275V287.5H300V275H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 275.391H300.391V287.109H312.109V275.391ZM300 275V287.5H312.5V275H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 275.391H312.891V287.109H324.609V275.391ZM312.5 275V287.5H325V275H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 275.391H325.391V287.109H337.109V275.391ZM325 275V287.5H337.5V275H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 275.391H337.891V287.109H349.609V275.391ZM337.5 275V287.5H350V275H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 275.391H350.391V287.109H362.109V275.391ZM350 275V287.5H362.5V275H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 275.391H362.891V287.109H374.609V275.391ZM362.5 275V287.5H375V275H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 275.391H375.391V287.109H387.109V275.391ZM375 275V287.5H387.5V275H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 275.391H387.891V287.109H399.609V275.391ZM387.5 275V287.5H400V275H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 275.391H400.391V287.109H412.109V275.391ZM400 275V287.5H412.5V275H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 275.391H412.891V287.109H424.609V275.391ZM412.5 275V287.5H425V275H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 275.391H425.391V287.109H437.109V275.391ZM425 275V287.5H437.5V275H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 275.391H437.891V287.109H449.609V275.391ZM437.5 275V287.5H450V275H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 275.391H450.391V287.109H462.109V275.391ZM450 275V287.5H462.5V275H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 275.391H462.891V287.109H474.609V275.391ZM462.5 275V287.5H475V275H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 275.391H475.391V287.109H487.109V275.391ZM475 275V287.5H487.5V275H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 275.391H487.891V287.109H499.609V275.391ZM487.5 275V287.5H500V275H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 275.391H500.391V287.109H512.109V275.391ZM500 275V287.5H512.5V275H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 275.391H512.891V287.109H524.609V275.391ZM512.5 275V287.5H525V275H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 275.391H525.391V287.109H537.109V275.391ZM525 275V287.5H537.5V275H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 275.391H537.891V287.109H549.609V275.391ZM537.5 275V287.5H550V275H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 275.391H550.391V287.109H562.109V275.391ZM550 275V287.5H562.5V275H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 275.391H562.891V287.109H574.609V275.391ZM562.5 275V287.5H575V275H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 275.391H575.391V287.109H587.109V275.391ZM575 275V287.5H587.5V275H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 275.391H587.891V287.109H599.609V275.391ZM587.5 275V287.5H600V275H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 287.891H0.390625V299.609H12.1094V287.891ZM0 287.5V300H12.5V287.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 287.891H12.8906V299.609H24.6094V287.891ZM12.5 287.5V300H25V287.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 287.891H25.3906V299.609H37.1094V287.891ZM25 287.5V300H37.5V287.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 287.891H37.8906V299.609H49.6094V287.891ZM37.5 287.5V300H50V287.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 287.891H50.3906V299.609H62.1094V287.891ZM50 287.5V300H62.5V287.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 287.891H62.8906V299.609H74.6094V287.891ZM62.5 287.5V300H75V287.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 287.891H75.3906V299.609H87.1094V287.891ZM75 287.5V300H87.5V287.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 287.891H87.8906V299.609H99.6094V287.891ZM87.5 287.5V300H100V287.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 287.891H100.391V299.609H112.109V287.891ZM100 287.5V300H112.5V287.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 287.891H112.891V299.609H124.609V287.891ZM112.5 287.5V300H125V287.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 287.891H125.391V299.609H137.109V287.891ZM125 287.5V300H137.5V287.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 287.891H137.891V299.609H149.609V287.891ZM137.5 287.5V300H150V287.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 287.891H150.391V299.609H162.109V287.891ZM150 287.5V300H162.5V287.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 287.891H162.891V299.609H174.609V287.891ZM162.5 287.5V300H175V287.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 287.891H175.391V299.609H187.109V287.891ZM175 287.5V300H187.5V287.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 287.891H187.891V299.609H199.609V287.891ZM187.5 287.5V300H200V287.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 287.891H200.391V299.609H212.109V287.891ZM200 287.5V300H212.5V287.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 287.891H212.891V299.609H224.609V287.891ZM212.5 287.5V300H225V287.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 287.891H225.391V299.609H237.109V287.891ZM225 287.5V300H237.5V287.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 287.891H237.891V299.609H249.609V287.891ZM237.5 287.5V300H250V287.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 287.891H250.391V299.609H262.109V287.891ZM250 287.5V300H262.5V287.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 287.891H262.891V299.609H274.609V287.891ZM262.5 287.5V300H275V287.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 287.891H275.391V299.609H287.109V287.891ZM275 287.5V300H287.5V287.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 287.891H287.891V299.609H299.609V287.891ZM287.5 287.5V300H300V287.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 287.891H300.391V299.609H312.109V287.891ZM300 287.5V300H312.5V287.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 287.891H312.891V299.609H324.609V287.891ZM312.5 287.5V300H325V287.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 287.891H325.391V299.609H337.109V287.891ZM325 287.5V300H337.5V287.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 287.891H337.891V299.609H349.609V287.891ZM337.5 287.5V300H350V287.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 287.891H350.391V299.609H362.109V287.891ZM350 287.5V300H362.5V287.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 287.891H362.891V299.609H374.609V287.891ZM362.5 287.5V300H375V287.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 287.891H375.391V299.609H387.109V287.891ZM375 287.5V300H387.5V287.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 287.891H387.891V299.609H399.609V287.891ZM387.5 287.5V300H400V287.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 287.891H400.391V299.609H412.109V287.891ZM400 287.5V300H412.5V287.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 287.891H412.891V299.609H424.609V287.891ZM412.5 287.5V300H425V287.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 287.891H425.391V299.609H437.109V287.891ZM425 287.5V300H437.5V287.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 287.891H437.891V299.609H449.609V287.891ZM437.5 287.5V300H450V287.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 287.891H450.391V299.609H462.109V287.891ZM450 287.5V300H462.5V287.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 287.891H462.891V299.609H474.609V287.891ZM462.5 287.5V300H475V287.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 287.891H475.391V299.609H487.109V287.891ZM475 287.5V300H487.5V287.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 287.891H487.891V299.609H499.609V287.891ZM487.5 287.5V300H500V287.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 287.891H500.391V299.609H512.109V287.891ZM500 287.5V300H512.5V287.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 287.891H512.891V299.609H524.609V287.891ZM512.5 287.5V300H525V287.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 287.891H525.391V299.609H537.109V287.891ZM525 287.5V300H537.5V287.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 287.891H537.891V299.609H549.609V287.891ZM537.5 287.5V300H550V287.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 287.891H550.391V299.609H562.109V287.891ZM550 287.5V300H562.5V287.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 287.891H562.891V299.609H574.609V287.891ZM562.5 287.5V300H575V287.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 287.891H575.391V299.609H587.109V287.891ZM575 287.5V300H587.5V287.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 287.891H587.891V299.609H599.609V287.891ZM587.5 287.5V300H600V287.5H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 300.391H0.390625V312.109H12.1094V300.391ZM0 300V312.5H12.5V300H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 300.391H12.8906V312.109H24.6094V300.391ZM12.5 300V312.5H25V300H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 300.391H25.3906V312.109H37.1094V300.391ZM25 300V312.5H37.5V300H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 300.391H37.8906V312.109H49.6094V300.391ZM37.5 300V312.5H50V300H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 300.391H50.3906V312.109H62.1094V300.391ZM50 300V312.5H62.5V300H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 300.391H62.8906V312.109H74.6094V300.391ZM62.5 300V312.5H75V300H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 300.391H75.3906V312.109H87.1094V300.391ZM75 300V312.5H87.5V300H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 300.391H87.8906V312.109H99.6094V300.391ZM87.5 300V312.5H100V300H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 300.391H100.391V312.109H112.109V300.391ZM100 300V312.5H112.5V300H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 300.391H112.891V312.109H124.609V300.391ZM112.5 300V312.5H125V300H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 300.391H125.391V312.109H137.109V300.391ZM125 300V312.5H137.5V300H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 300.391H137.891V312.109H149.609V300.391ZM137.5 300V312.5H150V300H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 300.391H150.391V312.109H162.109V300.391ZM150 300V312.5H162.5V300H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 300.391H162.891V312.109H174.609V300.391ZM162.5 300V312.5H175V300H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 300.391H175.391V312.109H187.109V300.391ZM175 300V312.5H187.5V300H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 300.391H187.891V312.109H199.609V300.391ZM187.5 300V312.5H200V300H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 300.391H200.391V312.109H212.109V300.391ZM200 300V312.5H212.5V300H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 300.391H212.891V312.109H224.609V300.391ZM212.5 300V312.5H225V300H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 300.391H225.391V312.109H237.109V300.391ZM225 300V312.5H237.5V300H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 300.391H237.891V312.109H249.609V300.391ZM237.5 300V312.5H250V300H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 300.391H250.391V312.109H262.109V300.391ZM250 300V312.5H262.5V300H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 300.391H262.891V312.109H274.609V300.391ZM262.5 300V312.5H275V300H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 300.391H275.391V312.109H287.109V300.391ZM275 300V312.5H287.5V300H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 300.391H287.891V312.109H299.609V300.391ZM287.5 300V312.5H300V300H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 300.391H300.391V312.109H312.109V300.391ZM300 300V312.5H312.5V300H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 300.391H312.891V312.109H324.609V300.391ZM312.5 300V312.5H325V300H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 300.391H325.391V312.109H337.109V300.391ZM325 300V312.5H337.5V300H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 300.391H337.891V312.109H349.609V300.391ZM337.5 300V312.5H350V300H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 300.391H350.391V312.109H362.109V300.391ZM350 300V312.5H362.5V300H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 300.391H362.891V312.109H374.609V300.391ZM362.5 300V312.5H375V300H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 300.391H375.391V312.109H387.109V300.391ZM375 300V312.5H387.5V300H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 300.391H387.891V312.109H399.609V300.391ZM387.5 300V312.5H400V300H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 300.391H400.391V312.109H412.109V300.391ZM400 300V312.5H412.5V300H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 300.391H412.891V312.109H424.609V300.391ZM412.5 300V312.5H425V300H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 300.391H425.391V312.109H437.109V300.391ZM425 300V312.5H437.5V300H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 300.391H437.891V312.109H449.609V300.391ZM437.5 300V312.5H450V300H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 300.391H450.391V312.109H462.109V300.391ZM450 300V312.5H462.5V300H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 300.391H462.891V312.109H474.609V300.391ZM462.5 300V312.5H475V300H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 300.391H475.391V312.109H487.109V300.391ZM475 300V312.5H487.5V300H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 300.391H487.891V312.109H499.609V300.391ZM487.5 300V312.5H500V300H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 300.391H500.391V312.109H512.109V300.391ZM500 300V312.5H512.5V300H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 300.391H512.891V312.109H524.609V300.391ZM512.5 300V312.5H525V300H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 300.391H525.391V312.109H537.109V300.391ZM525 300V312.5H537.5V300H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 300.391H537.891V312.109H549.609V300.391ZM537.5 300V312.5H550V300H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 300.391H550.391V312.109H562.109V300.391ZM550 300V312.5H562.5V300H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 300.391H562.891V312.109H574.609V300.391ZM562.5 300V312.5H575V300H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 300.391H575.391V312.109H587.109V300.391ZM575 300V312.5H587.5V300H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 300.391H587.891V312.109H599.609V300.391ZM587.5 300V312.5H600V300H587.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 312.891H0.390625V324.609H12.1094V312.891ZM0 312.5V325H12.5V312.5H0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 312.891H12.8906V324.609H24.6094V312.891ZM12.5 312.5V325H25V312.5H12.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 312.891H25.3906V324.609H37.1094V312.891ZM25 312.5V325H37.5V312.5H25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 312.891H37.8906V324.609H49.6094V312.891ZM37.5 312.5V325H50V312.5H37.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 312.891H50.3906V324.609H62.1094V312.891ZM50 312.5V325H62.5V312.5H50Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 312.891H62.8906V324.609H74.6094V312.891ZM62.5 312.5V325H75V312.5H62.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 312.891H75.3906V324.609H87.1094V312.891ZM75 312.5V325H87.5V312.5H75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 312.891H87.8906V324.609H99.6094V312.891ZM87.5 312.5V325H100V312.5H87.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 312.891H100.391V324.609H112.109V312.891ZM100 312.5V325H112.5V312.5H100Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 312.891H112.891V324.609H124.609V312.891ZM112.5 312.5V325H125V312.5H112.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 312.891H125.391V324.609H137.109V312.891ZM125 312.5V325H137.5V312.5H125Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 312.891H137.891V324.609H149.609V312.891ZM137.5 312.5V325H150V312.5H137.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 312.891H150.391V324.609H162.109V312.891ZM150 312.5V325H162.5V312.5H150Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 312.891H162.891V324.609H174.609V312.891ZM162.5 312.5V325H175V312.5H162.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 312.891H175.391V324.609H187.109V312.891ZM175 312.5V325H187.5V312.5H175Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 312.891H187.891V324.609H199.609V312.891ZM187.5 312.5V325H200V312.5H187.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 312.891H200.391V324.609H212.109V312.891ZM200 312.5V325H212.5V312.5H200Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 312.891H212.891V324.609H224.609V312.891ZM212.5 312.5V325H225V312.5H212.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 312.891H225.391V324.609H237.109V312.891ZM225 312.5V325H237.5V312.5H225Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 312.891H237.891V324.609H249.609V312.891ZM237.5 312.5V325H250V312.5H237.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 312.891H250.391V324.609H262.109V312.891ZM250 312.5V325H262.5V312.5H250Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 312.891H262.891V324.609H274.609V312.891ZM262.5 312.5V325H275V312.5H262.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 312.891H275.391V324.609H287.109V312.891ZM275 312.5V325H287.5V312.5H275Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 312.891H287.891V324.609H299.609V312.891ZM287.5 312.5V325H300V312.5H287.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 312.891H300.391V324.609H312.109V312.891ZM300 312.5V325H312.5V312.5H300Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 312.891H312.891V324.609H324.609V312.891ZM312.5 312.5V325H325V312.5H312.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 312.891H325.391V324.609H337.109V312.891ZM325 312.5V325H337.5V312.5H325Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 312.891H337.891V324.609H349.609V312.891ZM337.5 312.5V325H350V312.5H337.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 312.891H350.391V324.609H362.109V312.891ZM350 312.5V325H362.5V312.5H350Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 312.891H362.891V324.609H374.609V312.891ZM362.5 312.5V325H375V312.5H362.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 312.891H375.391V324.609H387.109V312.891ZM375 312.5V325H387.5V312.5H375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 312.891H387.891V324.609H399.609V312.891ZM387.5 312.5V325H400V312.5H387.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 312.891H400.391V324.609H412.109V312.891ZM400 312.5V325H412.5V312.5H400Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 312.891H412.891V324.609H424.609V312.891ZM412.5 312.5V325H425V312.5H412.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 312.891H425.391V324.609H437.109V312.891ZM425 312.5V325H437.5V312.5H425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 312.891H437.891V324.609H449.609V312.891ZM437.5 312.5V325H450V312.5H437.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 312.891H450.391V324.609H462.109V312.891ZM450 312.5V325H462.5V312.5H450Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 312.891H462.891V324.609H474.609V312.891ZM462.5 312.5V325H475V312.5H462.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 312.891H475.391V324.609H487.109V312.891ZM475 312.5V325H487.5V312.5H475Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 312.891H487.891V324.609H499.609V312.891ZM487.5 312.5V325H500V312.5H487.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 312.891H500.391V324.609H512.109V312.891ZM500 312.5V325H512.5V312.5H500Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 312.891H512.891V324.609H524.609V312.891ZM512.5 312.5V325H525V312.5H512.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 312.891H525.391V324.609H537.109V312.891ZM525 312.5V325H537.5V312.5H525Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 312.891H537.891V324.609H549.609V312.891ZM537.5 312.5V325H550V312.5H537.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 312.891H550.391V324.609H562.109V312.891ZM550 312.5V325H562.5V312.5H550Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 312.891H562.891V324.609H574.609V312.891ZM562.5 312.5V325H575V312.5H562.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 312.891H575.391V324.609H587.109V312.891ZM575 312.5V325H587.5V312.5H575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 312.891H587.891V324.609H599.609V312.891ZM587.5 312.5V325H600V312.5H587.5Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_2906_6463">
+<rect width="515" height="126" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/assets/images/acp_logo.svg b/assets/images/acp_logo.svg
new file mode 100644
index 0000000000..efaa46707b
--- /dev/null
+++ b/assets/images/acp_logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="61" fill="none"><g clip-path="url(#a)"><path fill="#000" d="M130.75.385c5.428 0 10.297 2.81 13.011 7.511l14.214 24.618-.013-.005c2.599 4.504 2.707 9.932.28 14.513-2.618 4.944-7.862 8.015-13.679 8.015h-31.811c-.452 0-.873-.242-1.103-.637a1.268 1.268 0 0 1 0-1.274l3.919-6.78c.223-.394.65-.636 1.102-.636h28.288a5.622 5.622 0 0 0 4.925-2.849 5.615 5.615 0 0 0 0-5.69l-14.214-24.617a5.621 5.621 0 0 0-4.925-2.848 5.621 5.621 0 0 0-4.925 2.848l-14.214 24.618a6.267 6.267 0 0 0-.319.643.998.998 0 0 1-.069.14L101.724 54.4l-.823 1.313-2.529 4.39a1.27 1.27 0 0 1-1.103.636h-7.83c-.452 0-.873-.242-1.102-.637-.23-.394-.23-.879 0-1.274l2.188-3.791H66.803c-3.32 0-6.454-1.122-8.818-3.167a17.141 17.141 0 0 1-3.394-3.96 1.261 1.261 0 0 1-.091-.137L34.2 12.573a5.622 5.622 0 0 0-4.925-2.849 5.621 5.621 0 0 0-4.924 2.85L10.137 37.19a5.615 5.615 0 0 0 0 5.69 5.63 5.63 0 0 0 4.925 2.841h29.862a1.276 1.276 0 0 1 1.102 1.912l-3.912 6.778a1.27 1.27 0 0 1-1.102.638H14.495c-3.32 0-6.454-1.128-8.817-3.173-5.906-5.104-7.36-12.883-3.62-19.363L16.267 7.89C18.872 3.385 23.517.583 28.697.39c.184-.006.356-.006.534-.006 5.378 0 10.45 3.007 13.246 7.85l12.986 22.372L68.58 7.891C71.186 3.385 75.83.582 81.01.39c.185-.006.358-.006.536-.006 4.453 0 8.71 2.039 11.672 5.588.337.407.388.98.127 1.446l-3.765 6.6a1.268 1.268 0 0 1-2.205.006l-.847-1.465a5.623 5.623 0 0 0-4.926-2.848 5.622 5.622 0 0 0-4.924 2.848L62.464 37.18a5.614 5.614 0 0 0 0 5.689 5.628 5.628 0 0 0 4.925 2.842H95.91L117.76 7.87c2.714-4.683 7.575-7.486 12.99-7.486Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 .385h160v60.36H0z"/></clipPath></defs></svg>
diff --git a/assets/images/acp_logo_serif.svg b/assets/images/acp_logo_serif.svg
new file mode 100644
index 0000000000..6bc359cf82
--- /dev/null
+++ b/assets/images/acp_logo_serif.svg
@@ -0,0 +1,2 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" width="119" height="44" fill="none"><path fill="#fff" d="M28.35 32.01c.994 0 1.896.242 2.706.725a5.339 5.339 0 0 1 1.937 1.916c.483.81.725 1.733.725 2.77 0 1.093-.242 2.094-.725 3.002a5.564 5.564 0 0 1-1.917 2.13c-.81.525-1.717.788-2.725.788-.994 0-1.896-.228-2.706-.682a5.337 5.337 0 0 1-1.937-1.916c-.468-.824-.703-1.761-.703-2.812 0-1.121.235-2.13.703-3.024.469-.894 1.107-1.597 1.916-2.108.81-.526 1.719-.789 2.727-.789Zm9.775.341h3.578v.831l-3.578.042-.042 5.921c0 .639.05 1.186.148 1.64.114.44.292.774.534 1 .241.228.553.342.936.342.398 0 .767-.114 1.108-.341a3.27 3.27 0 0 0 .937-.937l.575.468c-.312.468-.625.838-.937 1.108a3.42 3.42 0 0 1-.873.596 2.42 2.42 0 0 1-.788.256 3.63 3.63 0 0 1-.617.063c-.327 0-.66-.049-1.002-.148a2.237 2.237 0 0 1-.959-.533c-.283-.27-.51-.66-.681-1.171-.17-.525-.255-1.214-.255-2.066l.042-6.176-1.64.021v-.916c.37-.014.746-.148 1.13-.404.383-.27.724-.632 1.022-1.086.312-.454.525-.952.638-1.491h.724v2.981Zm10.067-.34c.994 0 1.896.241 2.706.724a5.339 5.339 0 0 1 1.937 1.916c.483.81.725 1.733.725 2.77 0 1.093-.242 2.094-.725 3.002a5.564 5.564 0 0 1-1.917 2.13c-.81.525-1.718.788-2.726.788-.993 0-1.895-.228-2.705-.682a5.337 5.337 0 0 1-1.937-1.916c-.469-.824-.703-1.761-.703-2.812 0-1.121.234-2.13.703-3.024.468-.894 1.107-1.597 1.916-2.108.81-.526 1.718-.789 2.726-.789Zm12.245 0c.795 0 1.484.12 2.066.362.596.241 1.058.56 1.385.958.326.397.49.831.49 1.3 0 .312-.086.581-.256.808-.17.213-.419.32-.745.32-.355.014-.611-.093-.768-.32-.141-.241-.212-.454-.212-.639 0-.142.021-.283.064-.425a.954.954 0 0 1 .255-.426c-.114-.34-.312-.59-.596-.746a2.34 2.34 0 0 0-.894-.32 4.112 4.112 0 0 0-.745-.085c-.966 0-1.782.392-2.45 1.172-.653.767-.98 1.888-.98 3.365 0 .95.149 1.797.447 2.535.312.738.746 1.32 1.3 1.746a3.127 3.127 0 0 0 1.917.617 3.76 3.76 0 0 0 1.916-.532c.61-.355 1.086-.788 1.427-1.299l.553.426a4.877 4.877 0 0 1-1.34 1.448c-.512.37-1.044.64-1.598.81-.54.17-1.05.255-1.533.255a5.586 5.586 0 0 1-2.642-.64 5.057 5.057 0 0 1-1.916-1.873c-.468-.824-.703-1.81-.703-2.96 0-.738.135-1.456.404-2.151.27-.696.646-1.32 1.13-1.874A5.46 5.46 0 0 1 58.18 32.5a5.157 5.157 0 0 1 2.258-.49Zm10.593 0c.994 0 1.896.241 2.705.724a5.339 5.339 0 0 1 1.938 1.916c.483.81.724 1.733.724 2.77 0 1.093-.242 2.094-.724 3.002a5.564 5.564 0 0 1-1.917 2.13c-.81.525-1.718.788-2.726.788-.994 0-1.895-.228-2.705-.682a5.337 5.337 0 0 1-1.937-1.916c-.469-.824-.703-1.761-.703-2.812 0-1.121.234-2.13.703-3.024.468-.894 1.107-1.597 1.916-2.108.809-.526 1.718-.789 2.726-.789ZM6.92 28.048c1.377 0 2.535.157 3.472.47.937.312 1.654.773 2.151 1.383.497.61.766 1.37.809 2.28a4.83 4.83 0 0 1-.255 1.745c-.185.597-.54 1.165-1.066 1.705-.51.525-1.235.95-2.172 1.277-.937.326-2.137.49-3.6.49H5.94c-.156 0-.305-.007-.447-.021v3.087c0 .384-.007.717-.021 1.002 0 .27-.014.497-.042.681l.66-.043a9.66 9.66 0 0 1 .639-.02l.66-.043V43H2.17v-.703c.54-.028.909-.149 1.107-.362.2-.227.305-.532.32-.916.028-.397.043-.845.043-1.342v-9.2c0-.284.007-.554.021-.81.014-.269.028-.51.042-.723l-.767.042-.766.043v-.938c.752-.014 1.526-.02 2.321-.02.795-.014 1.605-.022 2.428-.022Zm14.152 3.961c.398 0 .745.107 1.043.32.298.213.448.554.448 1.022 0 .114-.036.256-.107.426a1.19 1.19 0 0 1-.34.426c-.157.113-.363.17-.618.17a.971.971 0 0 1-.745-.362 1.076 1.076 0 0 1-.214-.83c-.355-.014-.724.078-1.107.277a4.01 4.01 0 0 0-1.043.83c-.327.341-.618.746-.873 1.215l.02 5.239c0 .284-.006.54-.02.766 0 .213-.022.44-.065.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V43h-4.366v-.639c.44 0 .745-.106.916-.32.17-.226.27-.532.299-.915.028-.398.042-.853.042-1.364v-5.537c.014-.227.042-.46.085-.702l-.767.042c-.241 0-.49.007-.745.022v-.873h.66c.61 0 1.03-.058 1.257-.171a2.9 2.9 0 0 0 .596-.405h.618c.028.227.049.511.063.852.014.326.029.746.043 1.257.213-.355.504-.703.873-1.044a5.32 5.32 0 0 1 1.235-.852 3.33 3.33 0 0 1 1.47-.34Zm59.605 8.733c0 .284-.008.54-.022.766-.014.213-.042.44-.085.682.227-.014.448-.021.66-.021.228-.015.455-.03.682-.043V43h-4.345v-.639c.44 0 .746-.106.916-.32.17-.226.27-.532.298-.915.029-.398.043-.853.043-1.364V29.05c.014-.212.035-.46.064-.745l-.767.042c-.241.014-.49.03-.745.043v-.894c.625 0 1.108-.028 1.448-.085.355-.057.618-.128.788-.213.185-.085.327-.178.426-.277h.617l.022 13.822ZM28.35 32.82c-.739 0-1.342.213-1.811.639-.468.425-.816.98-1.043 1.66a7.314 7.314 0 0 0-.32 2.194c0 .88.12 1.719.362 2.514.241.78.61 1.42 1.107 1.917.497.497 1.122.745 1.874.745.753 0 1.35-.213 1.79-.639.44-.426.753-.98.937-1.66a7.649 7.649 0 0 0 .298-2.152c0-.64-.064-1.264-.192-1.874a6.01 6.01 0 0 0-.553-1.683 3.268 3.268 0 0 0-1.001-1.214c-.398-.298-.88-.447-1.448-.447Zm19.841 0c-.738 0-1.342.213-1.81.639-.469.425-.816.98-1.043 1.66a7.314 7.314 0 0 0-.32 2.194c0 .88.12 1.719.362 2.514.241.78.61 1.42 1.107 1.917.497.497 1.122.745 1.874.745.753 0 1.35-.213 1.79-.639.44-.426.752-.98.937-1.66a7.649 7.649 0 0 0 .298-2.152c0-.64-.064-1.264-.192-1.874a6.01 6.01 0 0 0-.553-1.683 3.268 3.268 0 0 0-1.001-1.214c-.398-.298-.88-.447-1.449-.447Zm22.838 0c-.738 0-1.342.213-1.81.639-.469.425-.816.98-1.043 1.66a7.317 7.317 0 0 0-.32 2.194c0 .88.12 1.719.362 2.514.241.78.61 1.42 1.107 1.917.497.497 1.122.745 1.874.745s1.35-.213 1.79-.639c.44-.426.752-.98.937-1.66a7.649 7.649 0 0 0 .298-2.152c0-.64-.064-1.264-.192-1.874a6.013 6.013 0 0 0-.553-1.683 3.268 3.268 0 0 0-1.002-1.214c-.397-.298-.88-.447-1.448-.447ZM6.878 28.88c-.497 0-.845.106-1.044.319-.185.213-.29.511-.32.894-.014.37-.02.81-.02 1.322v5.09c.269.028.496.049.68.063h.704c.81 0 1.548-.156 2.215-.469a3.984 3.984 0 0 0 1.597-1.383c.397-.597.596-1.307.596-2.13 0-.668-.106-1.236-.32-1.704a2.736 2.736 0 0 0-.915-1.15 3.556 3.556 0 0 0-1.384-.64 7.025 7.025 0 0 0-1.79-.212ZM24.895 4.733c.37 0 .646.1.83.298.2.184.3.44.3.767 0 .099-.03.22-.086.362a.807.807 0 0 1-.298.362c-.128.1-.306.149-.533.149a.853.853 0 0 1-.596-.213.953.953 0 0 1-.298-.533 1.204 1.204 0 0 0-.831.511c-.199.27-.334.568-.404.895.34.312.61.689.81 1.129.212.44.318.909.318 1.406 0 .795-.213 1.504-.638 2.129a4.317 4.317 0 0 1-1.64 1.47c-.682.34-1.42.511-2.216.511-.27 0-.503-.014-.702-.043a3.52 3.52 0 0 0-.725-.063c-.525 0-.95.127-1.277.383-.326.255-.44.56-.34.916.113.34.46.56 1.042.66.582.085 1.364.149 2.343.191 1.093.043 2.03.171 2.812.384.78.213 1.377.54 1.789.98.425.454.638 1.064.638 1.83 0 .569-.156 1.073-.468 1.513-.299.454-.703.831-1.214 1.13a6.15 6.15 0 0 1-1.683.68 7.448 7.448 0 0 1-1.852.234c-1.278 0-2.307-.142-3.088-.426-.781-.284-1.35-.645-1.704-1.086-.355-.44-.533-.894-.533-1.363 0-.44.1-.83.298-1.17.213-.327.469-.612.767-.853.312-.242.61-.419.894-.533-.454-.156-.816-.361-1.086-.617-.255-.27-.382-.625-.382-1.065 0-.497.198-.958.595-1.384.398-.44.909-.71 1.533-.81a4.051 4.051 0 0 1-1.575-1.298c-.383-.554-.575-1.2-.575-1.939 0-.852.22-1.59.66-2.215a4.412 4.412 0 0 1 1.683-1.47 4.68 4.68 0 0 1 2.15-.532c.469 0 .938.071 1.407.213.468.128.9.32 1.298.576.142-.398.341-.753.597-1.065.27-.312.574-.554.915-.725.34-.184.696-.276 1.066-.276Zm-7.347 12.8a2.81 2.81 0 0 0-.895.936c-.213.37-.319.76-.319 1.172 0 .696.326 1.25.98 1.661.667.426 1.547.639 2.64.64 1.221 0 2.173-.228 2.855-.683.68-.454 1.021-.987 1.021-1.597 0-.525-.177-.93-.532-1.214-.355-.27-.838-.462-1.448-.575-.61-.1-1.314-.156-2.109-.17-.383-.014-.76-.035-1.129-.064a8.46 8.46 0 0 1-1.064-.106ZM31.409 6.01c.596 0 1.15.1 1.661.3.526.184.987.475 1.384.872.398.384.71.873.938 1.469.227.582.34 1.271.34 2.066l-7.497.128c0 1.08.114 2.03.341 2.854.241.81.625 1.441 1.15 1.895.526.44 1.2.66 2.024.66.44 0 .888-.078 1.342-.234a5.268 5.268 0 0 0 1.299-.638c.397-.27.716-.569.958-.895l.511.426a4.753 4.753 0 0 1-1.384 1.427c-.54.355-1.094.61-1.661.766a5.974 5.974 0 0 1-1.577.234c-.98 0-1.867-.227-2.662-.681a5.03 5.03 0 0 1-1.852-1.96c-.455-.851-.682-1.852-.682-3.002 0-.994.22-1.924.66-2.79a5.48 5.48 0 0 1 1.896-2.087c.809-.54 1.746-.81 2.811-.81Zm21.14.341h3.578v.831l-3.578.042-.042 5.921c0 .639.049 1.186.148 1.64.114.44.292.774.533 1 .242.228.554.342.937.342.398 0 .767-.114 1.107-.341.355-.227.668-.54.938-.937l.575.468c-.312.469-.625.838-.937 1.107-.298.27-.59.47-.873.597a2.42 2.42 0 0 1-.788.256 3.63 3.63 0 0 1-.618.063c-.326 0-.66-.049-1-.148a2.238 2.238 0 0 1-.96-.533c-.284-.27-.511-.66-.681-1.171-.17-.525-.255-1.214-.255-2.066l.042-6.176-1.64.021v-.916c.37-.014.746-.148 1.13-.404.382-.27.723-.632 1.022-1.086.312-.454.525-.952.638-1.491h.724V6.35Zm17.387-4.6c.795 0 1.548.107 2.257.32a7.51 7.51 0 0 1 2.045.98l-.106-1.15h1.15v4.94h-.767c-.142-1.334-.61-2.37-1.406-3.109-.78-.738-1.789-1.107-3.024-1.107-.752 0-1.463.162-2.13.489a5.099 5.099 0 0 0-1.724 1.363c-.497.597-.888 1.314-1.172 2.152-.284.837-.426 1.781-.426 2.832 0 1.334.255 2.513.766 3.535.511 1.022 1.2 1.818 2.067 2.386a5.133 5.133 0 0 0 2.875.851 6.46 6.46 0 0 0 2.725-.617 5.621 5.621 0 0 0 2.195-1.832l.553.447c-.61.838-1.271 1.484-1.981 1.939-.71.454-1.42.76-2.129.916a8.104 8.104 0 0 1-1.917.255c-1.065 0-2.045-.192-2.94-.576a7.048 7.048 0 0 1-2.3-1.596 7.625 7.625 0 0 1-1.49-2.408 8.544 8.544 0 0 1-.511-2.981c0-1.008.15-1.987.447-2.939a8.216 8.216 0 0 1 1.385-2.577 6.648 6.648 0 0 1 2.3-1.832c.937-.454 2.023-.68 3.258-.68Zm23.298 4.26c.597 0 1.15.1 1.662.298.525.185.986.476 1.383.873.398.384.71.873.938 1.469.227.582.34 1.271.34 2.066l-7.496.128c0 1.08.113 2.03.34 2.854.242.81.625 1.441 1.15 1.895.526.44 1.2.66 2.024.66.44 0 .888-.078 1.342-.234a5.268 5.268 0 0 0 1.299-.638c.397-.27.717-.569.958-.895l.511.426a4.752 4.752 0 0 1-1.384 1.427 5.83 5.83 0 0 1-1.661.766 5.973 5.973 0 0 1-1.576.234c-.98 0-1.868-.227-2.663-.681a5.03 5.03 0 0 1-1.852-1.96c-.455-.851-.682-1.852-.682-3.002 0-.994.22-1.924.66-2.79a5.48 5.48 0 0 1 1.896-2.087c.81-.54 1.746-.81 2.811-.81Zm21.14.34h3.578v.831l-3.578.042-.042 5.921c0 .639.049 1.186.148 1.64.114.44.292.774.534 1 .241.228.553.342.936.342.398 0 .767-.114 1.108-.341a3.27 3.27 0 0 0 .937-.937l.575.468c-.312.469-.625.838-.937 1.107-.298.27-.589.47-.873.597a2.423 2.423 0 0 1-.788.256 3.63 3.63 0 0 1-.618.063c-.326 0-.66-.049-1-.148a2.235 2.235 0 0 1-.959-.533c-.284-.27-.512-.66-.682-1.171-.17-.525-.255-1.214-.255-2.066l.042-6.176-1.64.021v-.916c.37-.014.746-.148 1.129-.404.384-.27.725-.632 1.023-1.086.312-.454.525-.952.638-1.491h.724V6.35ZM12.586 13.805c.114.299.24.682.383 1.15.142.47.199.867.17 1.193l.724-.043.725-.042V17H9.71v-.703c.54-.014.895-.135 1.065-.362.17-.227.234-.497.192-.81a3.737 3.737 0 0 0-.213-.85l-.745-2.003-5.537.128-.746 2.278c-.1.341-.192.611-.277.81-.07.199-.156.419-.256.66l.831-.043.83-.042V17H.872v-.703c.426 0 .752-.113.98-.34.227-.228.411-.54.553-.938.156-.397.334-.858.533-1.384L7.324 1.687h.51l4.75 12.118ZM43.74 6.01c1.235 0 2.137.391 2.705 1.172.568.767.852 1.967.852 3.599v3.962c0 .284-.007.54-.022.766 0 .213-.02.44-.063.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.17-.226.27-.532.299-.915.028-.398.042-.853.042-1.364v-2.981c-.014-1.221-.22-2.144-.617-2.769-.384-.624-.995-.93-1.832-.916a3.492 3.492 0 0 0-1.512.406 3.928 3.928 0 0 0-1.214.98c.014.113.022.241.022.383v.447l-.022 5.43c0 .285-.007.54-.021.767 0 .213-.021.44-.064.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.17-.226.27-.532.299-.915.028-.398.042-.853.042-1.364l.022-4.855v-.682c.014-.227.042-.46.085-.702l-.767.042-.745.043v-.894c.624 0 1.093-.029 1.405-.085.327-.057.568-.128.725-.213.156-.085.283-.178.382-.278h.619c.014.1.021.213.021.341.014.128.028.27.042.426.014.156.022.334.022.532.312-.27.653-.51 1.022-.723.383-.213.78-.384 1.192-.512a4.36 4.36 0 0 1 1.257-.192Zm36.125 8.733c0 .284-.007.54-.021.766a6.4 6.4 0 0 1-.085.682c.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.106.916-.32.17-.226.27-.532.298-.915.028-.398.043-.853.043-1.364V3.05c.014-.212.035-.46.063-.745-.255.015-.511.028-.766.042-.242.015-.49.03-.746.043v-.894c.625 0 1.108-.028 1.449-.085.355-.057.617-.128.788-.213.184-.085.326-.178.426-.277h.617l.021 13.822Zm5.57 0c0 .284-.008.54-.022.766 0 .213-.022.44-.064.682.227-.014.448-.021.66-.021.228-.015.454-.03.681-.043V17h-4.344v-.639c.44 0 .745-.107.916-.32.17-.226.27-.532.299-.915.028-.398.041-.853.041-1.364V8.907c0-.227.008-.44.022-.639.014-.213.035-.461.064-.745l-.767.042-.745.043v-.894c.624 0 1.107-.029 1.448-.085.34-.057.596-.128.767-.213.184-.085.326-.178.425-.278h.619v8.605Zm20.13-8.733c1.236 0 2.137.391 2.705 1.172.567.767.852 1.966.852 3.599v3.962c0 .284-.007.54-.021.766 0 .213-.021.44-.064.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.171-.226.271-.532.299-.915.028-.398.042-.853.042-1.364v-2.981c-.014-1.221-.22-2.144-.617-2.769-.384-.624-.995-.93-1.832-.916a3.494 3.494 0 0 0-1.512.406 3.93 3.93 0 0 0-1.214.98c.014.113.022.241.022.383v.447l-.022 5.43c0 .285-.007.54-.021.767 0 .213-.021.44-.064.682.227-.014.448-.021.66-.021.228-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.171-.226.271-.532.299-.915.029-.398.042-.853.042-1.364l.022-4.855v-.682c.014-.227.042-.46.085-.702l-.767.042-.745.043v-.894c.624 0 1.093-.029 1.405-.085.327-.057.569-.128.725-.213.156-.085.283-.178.383-.278h.618c.014.1.021.213.021.341.014.128.028.27.042.426.014.156.022.334.022.532.312-.27.653-.51 1.022-.723a6.305 6.305 0 0 1 1.193-.512 4.359 4.359 0 0 1 1.256-.192Zm-85.994.746c-.766 0-1.363.291-1.789.874-.411.567-.618 1.277-.618 2.128 0 .682.1 1.286.299 1.811.199.511.482.916.851 1.214.384.284.838.426 1.364.426.525 0 .958-.128 1.299-.383.354-.256.617-.604.788-1.044.184-.44.277-.937.277-1.49 0-.625-.093-1.208-.277-1.747-.185-.54-.462-.973-.831-1.3-.355-.326-.81-.49-1.363-.49ZM7.197 4.796c-.142.398-.29.795-.447 1.193a66.26 66.26 0 0 1-.447 1.214L4.79 11.484H9.71L8.198 7.417c-.156-.44-.32-.874-.49-1.3l-.468-1.32h-.043Zm24.234 2.045c-.824 0-1.513.249-2.067.746-.54.482-.894 1.27-1.064 2.364h5.43c0-.511-.078-1.001-.234-1.47a2.423 2.423 0 0 0-.724-1.17c-.341-.313-.788-.47-1.341-.47Zm61.825 0c-.824 0-1.513.249-2.067.746-.54.482-.894 1.27-1.064 2.364h5.43c0-.511-.078-1.001-.234-1.47a2.423 2.423 0 0 0-.724-1.17c-.341-.313-.788-.47-1.341-.47Zm-8.844-5.345c.327 0 .597.127.81.383.227.24.34.54.34.894 0 .355-.12.653-.362.895a1.075 1.075 0 0 1-.81.362c-.297 0-.56-.121-.787-.362a1.256 1.256 0 0 1-.341-.895c0-.355.113-.653.34-.894.242-.256.512-.383.81-.383Z"/></svg>
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index c279115880..224f49cc3e 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -1093,7 +1093,7 @@ impl AgentConfiguration {
                             )
                             .child(
                                 Label::new(
-                                    "Use the full power of Zed's UI with your favorite agent, connected via the Agent Client Protocol.",
+                                    "Bring the agent of your choice to Zed via our new Agent Client Protocol.",
                                 )
                                 .color(Color::Muted),
                             ),
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 267c76d73f..d1cf748733 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -14,6 +14,7 @@ use zed_actions::agent::ReauthenticateAgent;
 
 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
 use crate::agent_diff::AgentDiffThread;
+use crate::ui::AcpOnboardingModal;
 use crate::{
     AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
     DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
@@ -77,7 +78,10 @@ use workspace::{
 };
 use zed_actions::{
     DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
-    agent::{OpenOnboardingModal, OpenSettings, ResetOnboarding, ToggleModelSelector},
+    agent::{
+        OpenAcpOnboardingModal, OpenOnboardingModal, OpenSettings, ResetOnboarding,
+        ToggleModelSelector,
+    },
     assistant::{OpenRulesLibrary, ToggleFocus},
 };
 
@@ -201,6 +205,9 @@ pub fn init(cx: &mut App) {
                 .register_action(|workspace, _: &OpenOnboardingModal, window, cx| {
                     AgentOnboardingModal::toggle(workspace, window, cx)
                 })
+                .register_action(|workspace, _: &OpenAcpOnboardingModal, window, cx| {
+                    AcpOnboardingModal::toggle(workspace, window, cx)
+                })
                 .register_action(|_workspace, _: &ResetOnboarding, window, cx| {
                     window.dispatch_action(workspace::RestoreBanner.boxed_clone(), cx);
                     window.refresh();
@@ -1841,19 +1848,6 @@ impl AgentPanel {
         menu
     }
 
-    pub fn set_selected_agent(
-        &mut self,
-        agent: AgentType,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_agent != agent {
-            self.selected_agent = agent.clone();
-            self.serialize(cx);
-        }
-        self.new_agent_thread(agent, window, cx);
-    }
-
     pub fn selected_agent(&self) -> AgentType {
         self.selected_agent.clone()
     }
@@ -1864,6 +1858,11 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        if self.selected_agent != agent {
+            self.selected_agent = agent.clone();
+            self.serialize(cx);
+        }
+
         match agent {
             AgentType::Zed => {
                 window.dispatch_action(
@@ -2544,7 +2543,7 @@ impl AgentPanel {
                                                         workspace.panel::<AgentPanel>(cx)
                                                     {
                                                         panel.update(cx, |panel, cx| {
-                                                            panel.set_selected_agent(
+                                                            panel.new_agent_thread(
                                                                 AgentType::NativeAgent,
                                                                 window,
                                                                 cx,
@@ -2570,7 +2569,7 @@ impl AgentPanel {
                                                         workspace.panel::<AgentPanel>(cx)
                                                     {
                                                         panel.update(cx, |panel, cx| {
-                                                            panel.set_selected_agent(
+                                                            panel.new_agent_thread(
                                                                 AgentType::TextThread,
                                                                 window,
                                                                 cx,
@@ -2598,7 +2597,7 @@ impl AgentPanel {
                                                             workspace.panel::<AgentPanel>(cx)
                                                         {
                                                             panel.update(cx, |panel, cx| {
-                                                                panel.set_selected_agent(
+                                                                panel.new_agent_thread(
                                                                     AgentType::Gemini,
                                                                     window,
                                                                     cx,
@@ -2625,7 +2624,7 @@ impl AgentPanel {
                                                             workspace.panel::<AgentPanel>(cx)
                                                         {
                                                             panel.update(cx, |panel, cx| {
-                                                                panel.set_selected_agent(
+                                                                panel.new_agent_thread(
                                                                     AgentType::ClaudeCode,
                                                                     window,
                                                                     cx,
@@ -2658,7 +2657,7 @@ impl AgentPanel {
                                                                 workspace.panel::<AgentPanel>(cx)
                                                             {
                                                                 panel.update(cx, |panel, cx| {
-                                                                    panel.set_selected_agent(
+                                                                    panel.new_agent_thread(
                                                                         AgentType::Custom {
                                                                             name: agent_name
                                                                                 .clone(),
@@ -2682,9 +2681,9 @@ impl AgentPanel {
                             })
                             .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
                                 menu.separator().link(
-                                    "Add Your Own Agent",
+                                    "Add Other Agents",
                                     OpenBrowser {
-                                        url: "https://agentclientprotocol.com/".into(),
+                                        url: zed_urls::external_agents_docs(cx),
                                     }
                                     .boxed_clone(),
                                 )
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index ada973cddf..600698b07e 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -1,3 +1,4 @@
+mod acp_onboarding_modal;
 mod agent_notification;
 mod burn_mode_tooltip;
 mod context_pill;
@@ -6,6 +7,7 @@ mod onboarding_modal;
 pub mod preview;
 mod unavailable_editing_tooltip;
 
+pub use acp_onboarding_modal::*;
 pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
diff --git a/crates/agent_ui/src/ui/acp_onboarding_modal.rs b/crates/agent_ui/src/ui/acp_onboarding_modal.rs
new file mode 100644
index 0000000000..0ed9de7221
--- /dev/null
+++ b/crates/agent_ui/src/ui/acp_onboarding_modal.rs
@@ -0,0 +1,254 @@
+use client::zed_urls;
+use gpui::{
+    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
+    linear_color_stop, linear_gradient,
+};
+use ui::{TintColor, Vector, VectorName, prelude::*};
+use workspace::{ModalView, Workspace};
+
+use crate::agent_panel::{AgentPanel, AgentType};
+
+macro_rules! acp_onboarding_event {
+    ($name:expr) => {
+        telemetry::event!($name, source = "ACP Onboarding");
+    };
+    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
+        telemetry::event!($name, source = "ACP Onboarding", $($key $(= $value)?),+);
+    };
+}
+
+pub struct AcpOnboardingModal {
+    focus_handle: FocusHandle,
+    workspace: Entity<Workspace>,
+}
+
+impl AcpOnboardingModal {
+    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
+        let workspace_entity = cx.entity();
+        workspace.toggle_modal(window, cx, |_window, cx| Self {
+            workspace: workspace_entity,
+            focus_handle: cx.focus_handle(),
+        });
+    }
+
+    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
+        self.workspace.update(cx, |workspace, cx| {
+            workspace.focus_panel::<AgentPanel>(window, cx);
+
+            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                panel.update(cx, |panel, cx| {
+                    panel.new_agent_thread(AgentType::Gemini, window, cx);
+                });
+            }
+        });
+
+        cx.emit(DismissEvent);
+
+        acp_onboarding_event!("Open Panel Clicked");
+    }
+
+    fn view_docs(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
+        cx.open_url(&zed_urls::external_agents_docs(cx));
+        cx.notify();
+
+        acp_onboarding_event!("Documentation Link Clicked");
+    }
+
+    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
+        cx.emit(DismissEvent);
+    }
+}
+
+impl EventEmitter<DismissEvent> for AcpOnboardingModal {}
+
+impl Focusable for AcpOnboardingModal {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl ModalView for AcpOnboardingModal {}
+
+impl Render for AcpOnboardingModal {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let illustration_element = |label: bool, opacity: f32| {
+            h_flex()
+                .px_1()
+                .py_0p5()
+                .gap_1()
+                .rounded_sm()
+                .bg(cx.theme().colors().element_active.opacity(0.05))
+                .border_1()
+                .border_color(cx.theme().colors().border)
+                .border_dashed()
+                .child(
+                    Icon::new(IconName::Stop)
+                        .size(IconSize::Small)
+                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.15))),
+                )
+                .map(|this| {
+                    if label {
+                        this.child(
+                            Label::new("Your Agent Here")
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                    } else {
+                        this.child(
+                            div().w_16().h_1().rounded_full().bg(cx
+                                .theme()
+                                .colors()
+                                .element_active
+                                .opacity(0.6)),
+                        )
+                    }
+                })
+                .opacity(opacity)
+        };
+
+        let illustration = h_flex()
+            .relative()
+            .h(rems_from_px(126.))
+            .bg(cx.theme().colors().editor_background)
+            .border_b_1()
+            .border_color(cx.theme().colors().border_variant)
+            .justify_center()
+            .gap_8()
+            .rounded_t_md()
+            .overflow_hidden()
+            .child(
+                div().absolute().inset_0().w(px(515.)).h(px(126.)).child(
+                    Vector::new(VectorName::AcpGrid, rems_from_px(515.), rems_from_px(126.))
+                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.02))),
+                ),
+            )
+            .child(div().absolute().inset_0().size_full().bg(linear_gradient(
+                0.,
+                linear_color_stop(
+                    cx.theme().colors().elevated_surface_background.opacity(0.1),
+                    0.9,
+                ),
+                linear_color_stop(
+                    cx.theme().colors().elevated_surface_background.opacity(0.),
+                    0.,
+                ),
+            )))
+            .child(
+                div()
+                    .absolute()
+                    .inset_0()
+                    .size_full()
+                    .bg(gpui::black().opacity(0.15)),
+            )
+            .child(
+                h_flex()
+                    .gap_4()
+                    .child(
+                        Vector::new(VectorName::AcpLogo, rems_from_px(106.), rems_from_px(40.))
+                            .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
+                    )
+                    .child(
+                        Vector::new(
+                            VectorName::AcpLogoSerif,
+                            rems_from_px(111.),
+                            rems_from_px(41.),
+                        )
+                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
+                    ),
+            )
+            .child(
+                v_flex()
+                    .gap_1p5()
+                    .child(illustration_element(false, 0.15))
+                    .child(illustration_element(true, 0.3))
+                    .child(
+                        h_flex()
+                            .pl_1()
+                            .pr_2()
+                            .py_0p5()
+                            .gap_1()
+                            .rounded_sm()
+                            .bg(cx.theme().colors().element_active.opacity(0.2))
+                            .border_1()
+                            .border_color(cx.theme().colors().border)
+                            .child(
+                                Icon::new(IconName::AiGemini)
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .child(Label::new("New Gemini CLI Thread").size(LabelSize::Small)),
+                    )
+                    .child(illustration_element(true, 0.3))
+                    .child(illustration_element(false, 0.15)),
+            );
+
+        let heading = v_flex()
+            .w_full()
+            .gap_1()
+            .child(
+                Label::new("Now Available")
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .child(Headline::new("Bring Your Own Agent to Zed").size(HeadlineSize::Large));
+
+        let copy = "Bring the agent of your choice to Zed via our new Agent Client Protocol (ACP), starting with Google's Gemini CLI integration.";
+
+        let open_panel_button = Button::new("open-panel", "Start with Gemini CLI")
+            .icon_size(IconSize::Indicator)
+            .style(ButtonStyle::Tinted(TintColor::Accent))
+            .full_width()
+            .on_click(cx.listener(Self::open_panel));
+
+        let docs_button = Button::new("add-other-agents", "Add Other Agents")
+            .icon(IconName::ArrowUpRight)
+            .icon_size(IconSize::Indicator)
+            .icon_color(Color::Muted)
+            .full_width()
+            .on_click(cx.listener(Self::view_docs));
+
+        let close_button = h_flex().absolute().top_2().right_2().child(
+            IconButton::new("cancel", IconName::Close).on_click(cx.listener(
+                |_, _: &ClickEvent, _window, cx| {
+                    acp_onboarding_event!("Canceled", trigger = "X click");
+                    cx.emit(DismissEvent);
+                },
+            )),
+        );
+
+        v_flex()
+            .id("acp-onboarding")
+            .key_context("AcpOnboardingModal")
+            .relative()
+            .w(rems(34.))
+            .h_full()
+            .elevation_3(cx)
+            .track_focus(&self.focus_handle(cx))
+            .overflow_hidden()
+            .on_action(cx.listener(Self::cancel))
+            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
+                acp_onboarding_event!("Canceled", trigger = "Action");
+                cx.emit(DismissEvent);
+            }))
+            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
+                this.focus_handle.focus(window);
+            }))
+            .child(illustration)
+            .child(
+                v_flex()
+                    .p_4()
+                    .gap_2()
+                    .child(heading)
+                    .child(Label::new(copy).color(Color::Muted))
+                    .child(
+                        v_flex()
+                            .w_full()
+                            .mt_2()
+                            .gap_1()
+                            .child(open_panel_button)
+                            .child(docs_button),
+                    ),
+            )
+            .child(close_button)
+    }
+}
diff --git a/crates/client/src/zed_urls.rs b/crates/client/src/zed_urls.rs
index 9df41906d7..7193c09947 100644
--- a/crates/client/src/zed_urls.rs
+++ b/crates/client/src/zed_urls.rs
@@ -43,3 +43,11 @@ pub fn ai_privacy_and_security(cx: &App) -> String {
         server_url = server_url(cx)
     )
 }
+
+/// Returns the URL to Zed AI's external agents documentation.
+pub fn external_agents_docs(cx: &App) -> String {
+    format!(
+        "{server_url}/docs/ai/external-agents",
+        server_url = server_url(cx)
+    )
+}
diff --git a/crates/title_bar/src/onboarding_banner.rs b/crates/title_bar/src/onboarding_banner.rs
index ed43c5277a..1c28942490 100644
--- a/crates/title_bar/src/onboarding_banner.rs
+++ b/crates/title_bar/src/onboarding_banner.rs
@@ -119,7 +119,7 @@ impl Render for OnboardingBanner {
                         h_flex()
                             .h_full()
                             .gap_1()
-                            .child(Icon::new(self.details.icon_name).size(IconSize::Small))
+                            .child(Icon::new(self.details.icon_name).size(IconSize::XSmall))
                             .child(
                                 h_flex()
                                     .gap_0p5()
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index b84a2800b6..ad64dac9c6 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -275,11 +275,11 @@ impl TitleBar {
 
         let banner = cx.new(|cx| {
             OnboardingBanner::new(
-                "Debugger Onboarding",
-                IconName::Debug,
-                "The Debugger",
-                None,
-                zed_actions::debugger::OpenOnboardingModal.boxed_clone(),
+                "ACP Onboarding",
+                IconName::Sparkle,
+                "Bring Your Own Agent",
+                Some("Introducing:".into()),
+                zed_actions::agent::OpenAcpOnboardingModal.boxed_clone(),
                 cx,
             )
         });
diff --git a/crates/ui/src/components/image.rs b/crates/ui/src/components/image.rs
index 09c3bbeb94..6e552ddcee 100644
--- a/crates/ui/src/components/image.rs
+++ b/crates/ui/src/components/image.rs
@@ -13,6 +13,9 @@ use crate::prelude::*;
 )]
 #[strum(serialize_all = "snake_case")]
 pub enum VectorName {
+    AcpGrid,
+    AcpLogo,
+    AcpLogoSerif,
     AiGrid,
     DebuggerGrid,
     Grid,
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index a5223a2cdf..8f4c42ca49 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -284,6 +284,8 @@ pub mod agent {
             OpenSettings,
             /// Opens the agent onboarding modal.
             OpenOnboardingModal,
+            /// Opens the ACP onboarding modal.
+            OpenAcpOnboardingModal,
             /// Resets the agent onboarding state.
             ResetOnboarding,
             /// Starts a chat conversation with the agent.

From d8847192c80f24bf5b279f49e1a6d0937fad541c Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:35:56 -0300
Subject: [PATCH 384/823] thread view: Adjust thinking block UI (#36958)

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/agent_ui/src/acp/thread_view.rs | 77 ++++++++++----------------
 1 file changed, 30 insertions(+), 47 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c68c3a3e93..cd02191d4b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1644,19 +1644,6 @@ impl AcpThreadView {
         let key = (entry_ix, chunk_ix);
 
         let is_open = self.expanded_thinking_blocks.contains(&key);
-        let editor_bg = cx.theme().colors().editor_background;
-        let gradient_overlay = div()
-            .rounded_b_lg()
-            .h_full()
-            .absolute()
-            .w_full()
-            .bottom_0()
-            .left_0()
-            .bg(linear_gradient(
-                180.,
-                linear_color_stop(editor_bg, 1.),
-                linear_color_stop(editor_bg.opacity(0.2), 0.),
-            ));
 
         let scroll_handle = self
             .entry_view_state
@@ -1664,27 +1651,34 @@ impl AcpThreadView {
             .entry(entry_ix)
             .and_then(|entry| entry.scroll_handle_for_assistant_message_chunk(chunk_ix));
 
+        let thinking_content = {
+            div()
+                .id(("thinking-content", chunk_ix))
+                .when_some(scroll_handle, |this, scroll_handle| {
+                    this.track_scroll(&scroll_handle)
+                })
+                .when(!is_open, |this| this.max_h_12().opacity(0.6))
+                .text_ui_sm(cx)
+                .overflow_hidden()
+                .child(
+                    self.render_markdown(chunk, default_markdown_style(false, false, window, cx)),
+                )
+        };
+
         v_flex()
-            .rounded_md()
-            .border_1()
-            .border_color(self.tool_card_border_color(cx))
+            .gap_1()
             .child(
                 h_flex()
                     .id(header_id)
                     .group(&card_header_id)
                     .relative()
                     .w_full()
-                    .py_0p5()
-                    .px_1p5()
-                    .rounded_t_md()
-                    .bg(self.tool_card_header_bg(cx))
                     .justify_between()
-                    .border_b_1()
-                    .border_color(self.tool_card_border_color(cx))
                     .child(
                         h_flex()
                             .h(window.line_height())
                             .gap_1p5()
+                            .overflow_hidden()
                             .child(
                                 Icon::new(IconName::ToolThink)
                                     .size(IconSize::Small)
@@ -1698,7 +1692,7 @@ impl AcpThreadView {
                                         if pending {
                                             this.child("Thinking")
                                         } else {
-                                            this.child("Thought Process")
+                                            this.child("Thought")
                                         }
                                     }),
                             ),
@@ -1730,28 +1724,17 @@ impl AcpThreadView {
                         }
                     })),
             )
-            .child(
-                div()
-                    .relative()
-                    .bg(editor_bg)
-                    .rounded_b_lg()
-                    .child(
-                        div()
-                            .id(("thinking-content", chunk_ix))
-                            .when_some(scroll_handle, |this, scroll_handle| {
-                                this.track_scroll(&scroll_handle)
-                            })
-                            .p_2()
-                            .when(!is_open, |this| this.max_h_20())
-                            .text_ui_sm(cx)
-                            .overflow_hidden()
-                            .child(self.render_markdown(
-                                chunk,
-                                default_markdown_style(false, false, window, cx),
-                            )),
-                    )
-                    .when(!is_open && pending, |this| this.child(gradient_overlay)),
-            )
+            .when(is_open, |this| {
+                this.child(
+                    div()
+                        .relative()
+                        .ml_1p5()
+                        .pl_3p5()
+                        .border_l_1()
+                        .border_color(self.tool_card_border_color(cx))
+                        .child(thinking_content),
+                )
+            })
             .into_any_element()
     }
 
@@ -1924,7 +1907,7 @@ impl AcpThreadView {
                             .when(has_location || use_card_layout, |this| this.px_1())
                             .when(has_location, |this| {
                                 this.cursor(CursorStyle::PointingHand)
-                                    .rounded_sm()
+                                    .rounded(rems_from_px(3.)) // Concentric border radius
                                     .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.5)))
                             })
                             .overflow_hidden()
@@ -4247,7 +4230,7 @@ impl AcpThreadView {
             return h_flex().id("thread-controls-container").child(
                 div()
                     .py_2()
-                    .px_5()
+                    .px(rems_from_px(22.))
                     .child(SpinnerLabel::new().size(LabelSize::Small)),
             );
         }

From d7c735959e9a7e194c7c1669d9287f182234926b Mon Sep 17 00:00:00 2001
From: Daniel Dye <dnitemaeric@gmail.com>
Date: Tue, 26 Aug 2025 22:08:45 +0100
Subject: [PATCH 385/823] Add xAI's Grok Code Fast 1 model (#36959)

Release Notes:

- Add the `grok-code-fast-1` model to xAI's list of available models.
---
 crates/language_models/src/provider/x_ai.rs |  2 +-
 crates/x_ai/src/x_ai.rs                     | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
index b37a55e19f..bb17f22c7f 100644
--- a/crates/language_models/src/provider/x_ai.rs
+++ b/crates/language_models/src/provider/x_ai.rs
@@ -319,7 +319,7 @@ impl LanguageModel for XAiLanguageModel {
     }
     fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
         let model_id = self.model.id().trim().to_lowercase();
-        if model_id.eq(x_ai::Model::Grok4.id()) {
+        if model_id.eq(x_ai::Model::Grok4.id()) || model_id.eq(x_ai::Model::GrokCodeFast1.id()) {
             LanguageModelToolSchemaFormat::JsonSchemaSubset
         } else {
             LanguageModelToolSchemaFormat::JsonSchema
diff --git a/crates/x_ai/src/x_ai.rs b/crates/x_ai/src/x_ai.rs
index 569503784c..50f8681c31 100644
--- a/crates/x_ai/src/x_ai.rs
+++ b/crates/x_ai/src/x_ai.rs
@@ -20,6 +20,8 @@ pub enum Model {
     Grok3MiniFast,
     #[serde(rename = "grok-4-latest")]
     Grok4,
+    #[serde(rename = "grok-code-fast-1")]
+    GrokCodeFast1,
     #[serde(rename = "custom")]
     Custom {
         name: String,
@@ -43,6 +45,7 @@ impl Model {
             "grok-3-mini" => Ok(Self::Grok3Mini),
             "grok-3-fast" => Ok(Self::Grok3Fast),
             "grok-3-mini-fast" => Ok(Self::Grok3MiniFast),
+            "grok-code-fast-1" => Ok(Self::GrokCodeFast1),
             _ => anyhow::bail!("invalid model id '{id}'"),
         }
     }
@@ -55,6 +58,7 @@ impl Model {
             Self::Grok3Fast => "grok-3-fast",
             Self::Grok3MiniFast => "grok-3-mini-fast",
             Self::Grok4 => "grok-4",
+            Self::GrokCodeFast1 => "grok-code-fast-1",
             Self::Custom { name, .. } => name,
         }
     }
@@ -67,6 +71,7 @@ impl Model {
             Self::Grok3Fast => "Grok 3 Fast",
             Self::Grok3MiniFast => "Grok 3 Mini Fast",
             Self::Grok4 => "Grok 4",
+            Self::GrokCodeFast1 => "Grok Code Fast 1",
             Self::Custom {
                 name, display_name, ..
             } => display_name.as_ref().unwrap_or(name),
@@ -76,7 +81,7 @@ impl Model {
     pub fn max_token_count(&self) -> u64 {
         match self {
             Self::Grok3 | Self::Grok3Mini | Self::Grok3Fast | Self::Grok3MiniFast => 131_072,
-            Self::Grok4 => 256_000,
+            Self::Grok4 | Self::GrokCodeFast1 => 256_000,
             Self::Grok2Vision => 8_192,
             Self::Custom { max_tokens, .. } => *max_tokens,
         }
@@ -85,7 +90,7 @@ impl Model {
     pub fn max_output_tokens(&self) -> Option<u64> {
         match self {
             Self::Grok3 | Self::Grok3Mini | Self::Grok3Fast | Self::Grok3MiniFast => Some(8_192),
-            Self::Grok4 => Some(64_000),
+            Self::Grok4 | Self::GrokCodeFast1 => Some(64_000),
             Self::Grok2Vision => Some(4_096),
             Self::Custom {
                 max_output_tokens, ..
@@ -101,7 +106,7 @@ impl Model {
             | Self::Grok3Fast
             | Self::Grok3MiniFast
             | Self::Grok4 => true,
-            Model::Custom { .. } => false,
+            Self::GrokCodeFast1 | Model::Custom { .. } => false,
         }
     }
 
@@ -116,7 +121,8 @@ impl Model {
             | Self::Grok3Mini
             | Self::Grok3Fast
             | Self::Grok3MiniFast
-            | Self::Grok4 => true,
+            | Self::Grok4
+            | Self::GrokCodeFast1 => true,
             Model::Custom { .. } => false,
         }
     }

From 9614b72b06870ac36e8f2ff33ed55d2a6cbe2825 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 26 Aug 2025 19:43:07 -0300
Subject: [PATCH 386/823] thread view: Add one more UI clean up pass (#36965)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 204 ++++++++++++-------------
 1 file changed, 99 insertions(+), 105 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index cd02191d4b..30941f9e76 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1340,10 +1340,6 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &Context<Self>,
     ) -> AnyElement {
-        let is_generating = self
-            .thread()
-            .is_some_and(|thread| thread.read(cx).status() != ThreadStatus::Idle);
-
         let primary = match &entry {
             AgentThreadEntry::UserMessage(message) => {
                 let Some(editor) = self
@@ -1377,14 +1373,14 @@ impl AcpThreadView {
                     .id(("user_message", entry_ix))
                     .map(|this| {
                         if entry_ix == 0 && !has_checkpoint_button && rules_item.is_none()  {
-                            this.pt_4()
+                            this.pt(rems_from_px(18.))
                         } else if rules_item.is_some() {
                             this.pt_3()
                         } else {
                             this.pt_2()
                         }
                     })
-                    .pb_4()
+                    .pb_3()
                     .px_2()
                     .gap_1p5()
                     .w_full()
@@ -1504,18 +1500,6 @@ impl AcpThreadView {
             }
             AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) => {
                 let is_last = entry_ix + 1 == total_entries;
-                let pending_thinking_chunk_ix = if is_generating && is_last {
-                    chunks
-                        .iter()
-                        .enumerate()
-                        .next_back()
-                        .filter(|(_, segment)| {
-                            matches!(segment, AssistantMessageChunk::Thought { .. })
-                        })
-                        .map(|(index, _)| index)
-                } else {
-                    None
-                };
 
                 let style = default_markdown_style(false, false, window, cx);
                 let message_body = v_flex()
@@ -1535,7 +1519,6 @@ impl AcpThreadView {
                                         entry_ix,
                                         chunk_ix,
                                         md.clone(),
-                                        Some(chunk_ix) == pending_thinking_chunk_ix,
                                         window,
                                         cx,
                                     )
@@ -1548,7 +1531,7 @@ impl AcpThreadView {
 
                 v_flex()
                     .px_5()
-                    .py_1()
+                    .py_1p5()
                     .when(is_last, |this| this.pb_4())
                     .w_full()
                     .text_ui(cx)
@@ -1634,7 +1617,6 @@ impl AcpThreadView {
         entry_ix: usize,
         chunk_ix: usize,
         chunk: Entity<Markdown>,
-        pending: bool,
         window: &Window,
         cx: &Context<Self>,
     ) -> AnyElement {
@@ -1657,7 +1639,6 @@ impl AcpThreadView {
                 .when_some(scroll_handle, |this, scroll_handle| {
                     this.track_scroll(&scroll_handle)
                 })
-                .when(!is_open, |this| this.max_h_12().opacity(0.6))
                 .text_ui_sm(cx)
                 .overflow_hidden()
                 .child(
@@ -1673,10 +1654,11 @@ impl AcpThreadView {
                     .group(&card_header_id)
                     .relative()
                     .w_full()
+                    .pr_1()
                     .justify_between()
                     .child(
                         h_flex()
-                            .h(window.line_height())
+                            .h(window.line_height() - px(2.))
                             .gap_1p5()
                             .overflow_hidden()
                             .child(
@@ -1688,13 +1670,7 @@ impl AcpThreadView {
                                 div()
                                     .text_size(self.tool_name_font_size())
                                     .text_color(cx.theme().colors().text_muted)
-                                    .map(|this| {
-                                        if pending {
-                                            this.child("Thinking")
-                                        } else {
-                                            this.child("Thought")
-                                        }
-                                    }),
+                                    .child("Thinking"),
                             ),
                     )
                     .child(
@@ -1727,7 +1703,6 @@ impl AcpThreadView {
             .when(is_open, |this| {
                 this.child(
                     div()
-                        .relative()
                         .ml_1p5()
                         .pl_3p5()
                         .border_l_1()
@@ -1815,25 +1790,27 @@ impl AcpThreadView {
 
         let tool_output_display = if is_open {
             match &tool_call.status {
-                ToolCallStatus::WaitingForConfirmation { options, .. } => {
-                    v_flex()
-                        .w_full()
-                        .children(tool_call.content.iter().map(|content| {
-                            div()
-                                .child(self.render_tool_call_content(
-                                    entry_ix, content, tool_call, window, cx,
-                                ))
-                                .into_any_element()
-                        }))
-                        .child(self.render_permission_buttons(
-                            options,
-                            entry_ix,
-                            tool_call.id.clone(),
-                            tool_call.content.is_empty(),
-                            cx,
-                        ))
-                        .into_any()
-                }
+                ToolCallStatus::WaitingForConfirmation { options, .. } => v_flex()
+                    .w_full()
+                    .children(tool_call.content.iter().map(|content| {
+                        div()
+                            .child(self.render_tool_call_content(
+                                entry_ix,
+                                content,
+                                tool_call,
+                                use_card_layout,
+                                window,
+                                cx,
+                            ))
+                            .into_any_element()
+                    }))
+                    .child(self.render_permission_buttons(
+                        options,
+                        entry_ix,
+                        tool_call.id.clone(),
+                        cx,
+                    ))
+                    .into_any(),
                 ToolCallStatus::Pending | ToolCallStatus::InProgress
                     if is_edit
                         && tool_call.content.is_empty()
@@ -1848,9 +1825,14 @@ impl AcpThreadView {
                 | ToolCallStatus::Canceled => v_flex()
                     .w_full()
                     .children(tool_call.content.iter().map(|content| {
-                        div().child(
-                            self.render_tool_call_content(entry_ix, content, tool_call, window, cx),
-                        )
+                        div().child(self.render_tool_call_content(
+                            entry_ix,
+                            content,
+                            tool_call,
+                            use_card_layout,
+                            window,
+                            cx,
+                        ))
                     }))
                     .into_any(),
                 ToolCallStatus::Rejected => Empty.into_any(),
@@ -1863,7 +1845,7 @@ impl AcpThreadView {
         v_flex()
             .map(|this| {
                 if use_card_layout {
-                    this.my_2()
+                    this.my_1p5()
                         .rounded_md()
                         .border_1()
                         .border_color(self.tool_card_border_color(cx))
@@ -1890,18 +1872,14 @@ impl AcpThreadView {
                     .justify_between()
                     .when(use_card_layout, |this| {
                         this.p_0p5()
-                            .rounded_t_md()
+                            .rounded_t(rems_from_px(5.))
                             .bg(self.tool_card_header_bg(cx))
-                            .when(is_open && !failed_or_canceled, |this| {
-                                this.border_b_1()
-                                    .border_color(self.tool_card_border_color(cx))
-                            })
                     })
                     .child(
                         h_flex()
                             .relative()
                             .w_full()
-                            .h(window.line_height())
+                            .h(window.line_height() - px(2.))
                             .text_size(self.tool_name_font_size())
                             .gap_1p5()
                             .when(has_location || use_card_layout, |this| this.px_1())
@@ -1989,6 +1967,7 @@ impl AcpThreadView {
         entry_ix: usize,
         content: &ToolCallContent,
         tool_call: &ToolCall,
+        card_layout: bool,
         window: &Window,
         cx: &Context<Self>,
     ) -> AnyElement {
@@ -1997,7 +1976,13 @@ impl AcpThreadView {
                 if let Some(resource_link) = content.resource_link() {
                     self.render_resource_link(resource_link, cx)
                 } else if let Some(markdown) = content.markdown() {
-                    self.render_markdown_output(markdown.clone(), tool_call.id.clone(), window, cx)
+                    self.render_markdown_output(
+                        markdown.clone(),
+                        tool_call.id.clone(),
+                        card_layout,
+                        window,
+                        cx,
+                    )
                 } else {
                     Empty.into_any_element()
                 }
@@ -2013,6 +1998,7 @@ impl AcpThreadView {
         &self,
         markdown: Entity<Markdown>,
         tool_call_id: acp::ToolCallId,
+        card_layout: bool,
         window: &Window,
         cx: &Context<Self>,
     ) -> AnyElement {
@@ -2020,26 +2006,35 @@ impl AcpThreadView {
 
         v_flex()
             .mt_1p5()
-            .ml(rems(0.4))
-            .px_3p5()
             .gap_2()
-            .border_l_1()
-            .border_color(self.tool_card_border_color(cx))
+            .when(!card_layout, |this| {
+                this.ml(rems(0.4))
+                    .px_3p5()
+                    .border_l_1()
+                    .border_color(self.tool_card_border_color(cx))
+            })
+            .when(card_layout, |this| {
+                this.p_2()
+                    .border_t_1()
+                    .border_color(self.tool_card_border_color(cx))
+            })
             .text_sm()
             .text_color(cx.theme().colors().text_muted)
             .child(self.render_markdown(markdown, default_markdown_style(false, false, window, cx)))
-            .child(
-                IconButton::new(button_id, IconName::ChevronUp)
-                    .full_width()
-                    .style(ButtonStyle::Outlined)
-                    .icon_color(Color::Muted)
-                    .on_click(cx.listener({
-                        move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                            this.expanded_tool_calls.remove(&tool_call_id);
-                            cx.notify();
-                        }
-                    })),
-            )
+            .when(!card_layout, |this| {
+                this.child(
+                    IconButton::new(button_id, IconName::ChevronUp)
+                        .full_width()
+                        .style(ButtonStyle::Outlined)
+                        .icon_color(Color::Muted)
+                        .on_click(cx.listener({
+                            move |this: &mut Self, _, _, cx: &mut Context<Self>| {
+                                this.expanded_tool_calls.remove(&tool_call_id);
+                                cx.notify();
+                            }
+                        })),
+                )
+            })
             .into_any_element()
     }
 
@@ -2107,7 +2102,6 @@ impl AcpThreadView {
         options: &[acp::PermissionOption],
         entry_ix: usize,
         tool_call_id: acp::ToolCallId,
-        empty_content: bool,
         cx: &Context<Self>,
     ) -> Div {
         h_flex()
@@ -2117,10 +2111,8 @@ impl AcpThreadView {
             .gap_1()
             .justify_between()
             .flex_wrap()
-            .when(!empty_content, |this| {
-                this.border_t_1()
-                    .border_color(self.tool_card_border_color(cx))
-            })
+            .border_t_1()
+            .border_color(self.tool_card_border_color(cx))
             .child(
                 div()
                     .min_w(rems_from_px(145.))
@@ -2218,6 +2210,8 @@ impl AcpThreadView {
 
         v_flex()
             .h_full()
+            .border_t_1()
+            .border_color(self.tool_card_border_color(cx))
             .child(
                 if let Some(entry) = self.entry_view_state.read(cx).entry(entry_ix)
                     && let Some(editor) = entry.editor_for_diff(diff)
@@ -2350,6 +2344,28 @@ impl AcpThreadView {
                             ),
                     )
             })
+            .child(
+                Disclosure::new(
+                    SharedString::from(format!(
+                        "terminal-tool-disclosure-{}",
+                        terminal.entity_id()
+                    )),
+                    is_expanded,
+                )
+                .opened_icon(IconName::ChevronUp)
+                .closed_icon(IconName::ChevronDown)
+                .visible_on_hover(&header_group)
+                .on_click(cx.listener({
+                    let id = tool_call.id.clone();
+                    move |this, _event, _window, _cx| {
+                        if is_expanded {
+                            this.expanded_tool_calls.remove(&id);
+                        } else {
+                            this.expanded_tool_calls.insert(id.clone());
+                        }
+                    }
+                })),
+            )
             .when(truncated_output, |header| {
                 let tooltip = if let Some(output) = output {
                     if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
@@ -2392,28 +2408,6 @@ impl AcpThreadView {
                         .size(LabelSize::XSmall),
                 )
             })
-            .child(
-                Disclosure::new(
-                    SharedString::from(format!(
-                        "terminal-tool-disclosure-{}",
-                        terminal.entity_id()
-                    )),
-                    is_expanded,
-                )
-                .opened_icon(IconName::ChevronUp)
-                .closed_icon(IconName::ChevronDown)
-                .visible_on_hover(&header_group)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, _window, _cx| {
-                        if is_expanded {
-                            this.expanded_tool_calls.remove(&id);
-                        } else {
-                            this.expanded_tool_calls.insert(id.clone());
-                        }
-                    }
-                })),
-            )
             .when(tool_failed || command_failed, |header| {
                 header.child(
                     div()
@@ -2440,7 +2434,7 @@ impl AcpThreadView {
         let show_output = is_expanded && terminal_view.is_some();
 
         v_flex()
-            .my_2()
+            .my_1p5()
             .mx_5()
             .border_1()
             .when(tool_failed || command_failed, |card| card.border_dashed())

From d713390366f6d9730baacb7b077b1546a8662f4f Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Tue, 26 Aug 2025 19:35:29 -0400
Subject: [PATCH 387/823] Add get stable channel release notes script (#36969)

Release Notes:

- N/A
---
 script/get-preview-channel-changes      |  41 +++-------
 script/get-stable-channel-release-notes | 101 ++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 29 deletions(-)
 create mode 100755 script/get-stable-channel-release-notes

diff --git a/script/get-preview-channel-changes b/script/get-preview-channel-changes
index 8e7dcf9b1e..14cd80f155 100755
--- a/script/get-preview-channel-changes
+++ b/script/get-preview-channel-changes
@@ -1,12 +1,11 @@
 #!/usr/bin/env node --redirect-warnings=/dev/null
 
 const { execFileSync } = require("child_process");
-let { GITHUB_ACCESS_TOKEN } = process.env;
+const { GITHUB_ACCESS_TOKEN } = process.env;
 const GITHUB_URL = "https://github.com";
 const SKIPPABLE_NOTE_REGEX = /^\s*-?\s*n\/?a\s*/ims;
 const PULL_REQUEST_WEB_URL = "https://github.com/zed-industries/zed/pull";
-const PULL_REQUEST_API_URL =
-  "https://api.github.com/repos/zed-industries/zed/pulls";
+const PULL_REQUEST_API_URL = "https://api.github.com/repos/zed-industries/zed/pulls";
 const DIVIDER = "-".repeat(80);
 
 main();
@@ -25,15 +24,12 @@ async function main() {
   const STAFF_MEMBERS = new Set(
     (
       await (
-        await fetch(
-          "https://api.github.com/orgs/zed-industries/teams/staff/members",
-          {
-            headers: {
-              Authorization: `token ${GITHUB_ACCESS_TOKEN}`,
-              Accept: "application/vnd.github+json",
-            },
+        await fetch("https://api.github.com/orgs/zed-industries/teams/staff/members", {
+          headers: {
+            Authorization: `token ${GITHUB_ACCESS_TOKEN}`,
+            Accept: "application/vnd.github+json",
           },
-        )
+        })
       ).json()
     ).map(({ login }) => login.toLowerCase()),
   );
@@ -44,11 +40,7 @@ async function main() {
   };
 
   // Get the last two preview tags
-  const [newTag, oldTag] = execFileSync(
-    "git",
-    ["tag", "--sort", "-committerdate"],
-    { encoding: "utf8" },
-  )
+  const [newTag, oldTag] = execFileSync("git", ["tag", "--sort", "-committerdate"], { encoding: "utf8" })
     .split("\n")
     .filter((t) => t.startsWith("v") && t.endsWith("-pre"));
 
@@ -59,14 +51,10 @@ async function main() {
   const pullRequestNumbers = getPullRequestNumbers(oldTag, newTag);
 
   // Get the PRs that were cherry-picked between main and the old tag.
-  const existingPullRequestNumbers = new Set(
-    getPullRequestNumbers("main", oldTag),
-  );
+  const existingPullRequestNumbers = new Set(getPullRequestNumbers("main", oldTag));
 
   // Filter out those existing PRs from the set of new PRs.
-  const newPullRequestNumbers = pullRequestNumbers.filter(
-    (number) => !existingPullRequestNumbers.has(number),
-  );
+  const newPullRequestNumbers = pullRequestNumbers.filter((number) => !existingPullRequestNumbers.has(number));
 
   // Fetch the pull requests from the GitHub API.
   console.log("Merged Pull requests:");
@@ -84,8 +72,7 @@ async function main() {
     const releaseNotesHeader = /^\s*Release Notes:(.+)/ims;
 
     const releaseNotes = pullRequest.body || "";
-    let contributor =
-      pullRequest.user?.login ?? "Unable to identify contributor";
+    let contributor = pullRequest.user?.login ?? "Unable to identify contributor";
     const captures = releaseNotesHeader.exec(releaseNotes);
     let notes = captures ? captures[1] : "MISSING";
     notes = notes.trim();
@@ -127,11 +114,7 @@ function getCreditString(pullRequestNumber, contributor, isStaff) {
 }
 
 function getPullRequestNumbers(oldTag, newTag) {
-  const pullRequestNumbers = execFileSync(
-    "git",
-    ["log", `${oldTag}..${newTag}`, "--oneline"],
-    { encoding: "utf8" },
-  )
+  const pullRequestNumbers = execFileSync("git", ["log", `${oldTag}..${newTag}`, "--oneline"], { encoding: "utf8" })
     .split("\n")
     .filter((line) => line.length > 0)
     .map((line) => {
diff --git a/script/get-stable-channel-release-notes b/script/get-stable-channel-release-notes
new file mode 100755
index 0000000000..b16bc9e41f
--- /dev/null
+++ b/script/get-stable-channel-release-notes
@@ -0,0 +1,101 @@
+#!/usr/bin/env node --redirect-warnings=/dev/null
+
+// This script should be ran before `bump-zed-minor-versions`
+
+// Prints the changelogs for all preview releases associated with the most
+// recent preview minor version.
+
+// Future TODO: Have the script perform deduplication of lines that were
+// included in both past stable and preview patches that shouldn't be mentioned
+// again in this week's stable minor release.
+
+// Future TODO: Get changelogs for latest cherry-picked commits on preview and
+// stable that didn't make it into a release, as they were cherry picked
+
+const { execFileSync } = require("child_process");
+const { GITHUB_ACCESS_TOKEN } = process.env;
+const GITHUB_TAGS_API_URL = "https://api.github.com/repos/zed-industries/zed/releases/tags";
+const DIVIDER = "-".repeat(80);
+
+main();
+
+async function main() {
+  if (!GITHUB_ACCESS_TOKEN) {
+    try {
+      GITHUB_ACCESS_TOKEN = execFileSync("gh", ["auth", "token"]).toString();
+    } catch (error) {
+      console.log(error);
+      console.log("No GITHUB_ACCESS_TOKEN and no `gh auth token`");
+      process.exit(1);
+    }
+  }
+
+  const allTags = execFileSync("git", ["tag", "--sort", "-committerdate"], { encoding: "utf8" })
+    .split("\n")
+    .filter((t) => t.length > 0);
+  const latestPreviewTag = allTags.filter((t) => t.startsWith("v") && t.endsWith("-pre"))[0];
+  const latestPreviewMinorVersion = latestPreviewTag.split(".")[1];
+  const latestPreviewTagRegex = new RegExp(`^v(\\d+)\\.(${latestPreviewMinorVersion})\\.(\\d+)-pre$`);
+
+  const parsedPreviewTags = allTags
+    .map((tag) => {
+      const match = tag.match(latestPreviewTagRegex);
+      if (match) {
+        return {
+          tag,
+          version: {
+            major: parseInt(match[1]),
+            minor: parseInt(match[2]),
+            patch: parseInt(match[3]),
+          },
+        };
+      }
+      return null;
+    })
+    .filter((item) => item !== null)
+    .sort((a, b) => a.version.patch - b.version.patch);
+
+  const matchingPreviewTags = parsedPreviewTags.map((item) => item.tag);
+
+  console.log("Fetching release information for preview tags:");
+  console.log(DIVIDER);
+
+  for (const tag of matchingPreviewTags) {
+    const releaseApiUrl = `${GITHUB_TAGS_API_URL}/${tag}`;
+
+    try {
+      const response = await fetch(releaseApiUrl, {
+        headers: {
+          Authorization: `token ${GITHUB_ACCESS_TOKEN}`,
+        },
+      });
+
+      if (!response.ok) {
+        console.log(`Failed to fetch release for ${tag}: ${response.status}`);
+        continue;
+      }
+
+      const release = await response.json();
+
+      console.log(`\nRelease: ${release.name || tag}`);
+      console.log(`Tag: ${tag}`);
+      console.log(`Published: ${release.published_at}`);
+      console.log(`URL: ${release.html_url}`);
+      console.log("\nRelease Notes:");
+      console.log(release.body || "No release notes");
+      console.log(DIVIDER);
+    } catch (error) {
+      console.log(`Error fetching release for ${tag}:`, error.message);
+    }
+  }
+
+  const patchUpdateTags = parsedPreviewTags.filter((tag) => tag.version.patch != 0).map((tag) => tag.tag);
+
+  console.log();
+  console.log("Please review the release notes associated with the following patch versions:");
+  for (const tag of patchUpdateTags) {
+    console.log(`- ${tag}`);
+  }
+  console.log("Remove items that have already been mentioned in the current published stable versions.");
+  console.log("https://github.com/zed-industries/zed/releases?q=prerelease%3Afalse&expanded=true");
+}

From 1eae76e85638fbf6da433d008fda6a29ae954ed5 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 26 Aug 2025 17:15:39 -0700
Subject: [PATCH 388/823] Restructure remote client crate, consolidate SSH
 logic (#36967)

This is a pure refactor that consolidates all SSH remoting logic such
that it should be straightforward to add another transport to the
remoting system.

Release Notes:

- N/A

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
---
 crates/agent_ui/src/inline_prompt_editor.rs   |    2 +-
 crates/call/src/call_impl/room.rs             |    2 +-
 .../remote_editing_collaboration_tests.rs     |   22 +-
 crates/collab/src/tests/test_server.rs        |    6 +-
 crates/debugger_ui/src/session/running.rs     |    9 +-
 crates/editor/src/editor.rs                   |    6 +-
 crates/extension_host/src/extension_host.rs   |   18 +-
 crates/file_finder/src/file_finder.rs         |    2 +-
 crates/language_tools/src/lsp_log.rs          |    6 +-
 crates/outline_panel/src/outline_panel.rs     |    6 +-
 crates/project/src/debugger/dap_store.rs      |  106 +-
 crates/project/src/git_store.rs               |   68 +-
 crates/project/src/project.rs                 |  309 +-
 crates/project/src/terminals.rs               |  351 +--
 crates/project/src/worktree_store.rs          |    6 +-
 crates/project_panel/src/project_panel.rs     |    4 +-
 crates/proto/src/proto.rs                     |    4 +-
 .../src/disconnected_overlay.rs               |    4 +-
 crates/recent_projects/src/remote_servers.rs  |    8 +-
 crates/recent_projects/src/ssh_connections.rs |   19 +-
 crates/remote/src/protocol.rs                 |   10 +
 crates/remote/src/remote.rs                   |   10 +-
 crates/remote/src/remote_client.rs            | 1478 +++++++++
 crates/remote/src/ssh_session.rs              | 2749 -----------------
 crates/remote/src/transport.rs                |    1 +
 crates/remote/src/transport/ssh.rs            | 1358 ++++++++
 crates/remote_server/src/headless_project.rs  |   52 +-
 .../remote_server/src/remote_editing_tests.rs |   12 +-
 crates/remote_server/src/unix.rs              |   25 +-
 crates/task/src/shell_builder.rs              |   15 +-
 crates/terminal_view/src/terminal_element.rs  |    2 +-
 crates/terminal_view/src/terminal_panel.rs    |   29 +-
 crates/title_bar/src/collab.rs                |    2 +-
 crates/title_bar/src/title_bar.rs             |   12 +-
 crates/vim/src/command.rs                     |    4 +-
 crates/workspace/src/tasks.rs                 |    2 +-
 crates/workspace/src/workspace.rs             |   14 +-
 crates/zed/src/reliability.rs                 |    4 +-
 crates/zed/src/zed.rs                         |    4 +-
 39 files changed, 3330 insertions(+), 3411 deletions(-)
 create mode 100644 crates/remote/src/remote_client.rs
 delete mode 100644 crates/remote/src/ssh_session.rs
 create mode 100644 crates/remote/src/transport.rs
 create mode 100644 crates/remote/src/transport/ssh.rs

diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index a626122769..3abefac8e8 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -334,7 +334,7 @@ impl<T: 'static> PromptEditor<T> {
             EditorEvent::Edited { .. } => {
                 if let Some(workspace) = window.root::<Workspace>().flatten() {
                     workspace.update(cx, |workspace, cx| {
-                        let is_via_ssh = workspace.project().read(cx).is_via_ssh();
+                        let is_via_ssh = workspace.project().read(cx).is_via_remote_server();
 
                         workspace
                             .client()
diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
index ffe4c6c251..c31a458c64 100644
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -1161,7 +1161,7 @@ impl Room {
         let request = self.client.request(proto::ShareProject {
             room_id: self.id(),
             worktrees: project.read(cx).worktree_metadata_protos(cx),
-            is_ssh_project: project.read(cx).is_via_ssh(),
+            is_ssh_project: project.read(cx).is_via_remote_server(),
         });
 
         cx.spawn(async move |this, cx| {
diff --git a/crates/collab/src/tests/remote_editing_collaboration_tests.rs b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
index 8ab6e6910c..6b46459a59 100644
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -26,7 +26,7 @@ use project::{
     debugger::session::ThreadId,
     lsp_store::{FormatTrigger, LspFormatTarget},
 };
-use remote::SshRemoteClient;
+use remote::RemoteClient;
 use remote_server::{HeadlessAppState, HeadlessProject};
 use rpc::proto;
 use serde_json::json;
@@ -59,7 +59,7 @@ async fn test_sharing_an_ssh_remote_project(
         .await;
 
     // Set up project on remote FS
-    let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
+    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
     let remote_fs = FakeFs::new(server_cx.executor());
     remote_fs
         .insert_tree(
@@ -101,7 +101,7 @@ async fn test_sharing_an_ssh_remote_project(
         )
     });
 
-    let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
+    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
     let (project_a, worktree_id) = client_a
         .build_ssh_project(path!("/code/project1"), client_ssh, cx_a)
         .await;
@@ -235,7 +235,7 @@ async fn test_ssh_collaboration_git_branches(
         .await;
 
     // Set up project on remote FS
-    let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
+    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
     let remote_fs = FakeFs::new(server_cx.executor());
     remote_fs
         .insert_tree("/project", serde_json::json!({ ".git":{} }))
@@ -268,7 +268,7 @@ async fn test_ssh_collaboration_git_branches(
         )
     });
 
-    let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
+    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
     let (project_a, _) = client_a
         .build_ssh_project("/project", client_ssh, cx_a)
         .await;
@@ -420,7 +420,7 @@ async fn test_ssh_collaboration_formatting_with_prettier(
         .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
         .await;
 
-    let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
+    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
     let remote_fs = FakeFs::new(server_cx.executor());
     let buffer_text = "let one = \"two\"";
     let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
@@ -473,7 +473,7 @@ async fn test_ssh_collaboration_formatting_with_prettier(
         )
     });
 
-    let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
+    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
     let (project_a, worktree_id) = client_a
         .build_ssh_project(path!("/project"), client_ssh, cx_a)
         .await;
@@ -602,7 +602,7 @@ async fn test_remote_server_debugger(
         release_channel::init(SemanticVersion::default(), cx);
         dap_adapters::init(cx);
     });
-    let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
+    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
     let remote_fs = FakeFs::new(server_cx.executor());
     remote_fs
         .insert_tree(
@@ -633,7 +633,7 @@ async fn test_remote_server_debugger(
         )
     });
 
-    let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
+    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
     let mut server = TestServer::start(server_cx.executor()).await;
     let client_a = server.create_client(cx_a, "user_a").await;
     cx_a.update(|cx| {
@@ -711,7 +711,7 @@ async fn test_slow_adapter_startup_retries(
         release_channel::init(SemanticVersion::default(), cx);
         dap_adapters::init(cx);
     });
-    let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
+    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
     let remote_fs = FakeFs::new(server_cx.executor());
     remote_fs
         .insert_tree(
@@ -742,7 +742,7 @@ async fn test_slow_adapter_startup_retries(
         )
     });
 
-    let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
+    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
     let mut server = TestServer::start(server_cx.executor()).await;
     let client_a = server.create_client(cx_a, "user_a").await;
     cx_a.update(|cx| {
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index fd5e3eefc1..eb7df28478 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -26,7 +26,7 @@ use node_runtime::NodeRuntime;
 use notifications::NotificationStore;
 use parking_lot::Mutex;
 use project::{Project, WorktreeId};
-use remote::SshRemoteClient;
+use remote::RemoteClient;
 use rpc::{
     RECEIVE_TIMEOUT,
     proto::{self, ChannelRole},
@@ -765,11 +765,11 @@ impl TestClient {
     pub async fn build_ssh_project(
         &self,
         root_path: impl AsRef<Path>,
-        ssh: Entity<SshRemoteClient>,
+        ssh: Entity<RemoteClient>,
         cx: &mut TestAppContext,
     ) -> (Entity<Project>, WorktreeId) {
         let project = cx.update(|cx| {
-            Project::ssh(
+            Project::remote(
                 ssh,
                 self.client().clone(),
                 self.app_state.node_runtime.clone(),
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 9991395f35..a0e7c9a101 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -916,10 +916,11 @@ impl RunningState {
         let task_store = project.read(cx).task_store().downgrade();
         let weak_project = project.downgrade();
         let weak_workspace = workspace.downgrade();
-        let ssh_info = project
+        let remote_shell = project
             .read(cx)
-            .ssh_client()
-            .and_then(|it| it.read(cx).ssh_info());
+            .remote_client()
+            .as_ref()
+            .and_then(|remote| remote.read(cx).shell());
 
         cx.spawn_in(window, async move |this, cx| {
             let DebugScenario {
@@ -1003,7 +1004,7 @@ impl RunningState {
                     None
                 };
 
-                let builder = ShellBuilder::new(ssh_info.as_ref().map(|info| &*info.shell), &task.resolved.shell);
+                let builder = ShellBuilder::new(remote_shell.as_deref(), &task.resolved.shell);
                 let command_label = builder.command_label(&task.resolved.command_label);
                 let (command, args) =
                     builder.build(task.resolved.command.clone(), &task.resolved.args);
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 80680ae9c0..52549902dd 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -20074,7 +20074,7 @@ impl Editor {
                 let (telemetry, is_via_ssh) = {
                     let project = project.read(cx);
                     let telemetry = project.client().telemetry().clone();
-                    let is_via_ssh = project.is_via_ssh();
+                    let is_via_ssh = project.is_via_remote_server();
                     (telemetry, is_via_ssh)
                 };
                 refresh_linked_ranges(self, window, cx);
@@ -20642,7 +20642,7 @@ impl Editor {
                 copilot_enabled,
                 copilot_enabled_for_language,
                 edit_predictions_provider,
-                is_via_ssh = project.is_via_ssh(),
+                is_via_ssh = project.is_via_remote_server(),
             );
         } else {
             telemetry::event!(
@@ -20652,7 +20652,7 @@ impl Editor {
                 copilot_enabled,
                 copilot_enabled_for_language,
                 edit_predictions_provider,
-                is_via_ssh = project.is_via_ssh(),
+                is_via_ssh = project.is_via_remote_server(),
             );
         };
     }
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index fde0aeac94..b8189c3651 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -43,7 +43,7 @@ use language::{
 use node_runtime::NodeRuntime;
 use project::ContextProviderWithTasks;
 use release_channel::ReleaseChannel;
-use remote::SshRemoteClient;
+use remote::RemoteClient;
 use semantic_version::SemanticVersion;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -117,7 +117,7 @@ pub struct ExtensionStore {
     pub wasm_host: Arc<WasmHost>,
     pub wasm_extensions: Vec<(Arc<ExtensionManifest>, WasmExtension)>,
     pub tasks: Vec<Task<()>>,
-    pub ssh_clients: HashMap<String, WeakEntity<SshRemoteClient>>,
+    pub remote_clients: HashMap<String, WeakEntity<RemoteClient>>,
     pub ssh_registered_tx: UnboundedSender<()>,
 }
 
@@ -270,7 +270,7 @@ impl ExtensionStore {
             reload_tx,
             tasks: Vec::new(),
 
-            ssh_clients: HashMap::default(),
+            remote_clients: HashMap::default(),
             ssh_registered_tx: connection_registered_tx,
         };
 
@@ -1693,7 +1693,7 @@ impl ExtensionStore {
 
     async fn sync_extensions_over_ssh(
         this: &WeakEntity<Self>,
-        client: WeakEntity<SshRemoteClient>,
+        client: WeakEntity<RemoteClient>,
         cx: &mut AsyncApp,
     ) -> Result<()> {
         let extensions = this.update(cx, |this, _cx| {
@@ -1765,8 +1765,8 @@ impl ExtensionStore {
 
     pub async fn update_ssh_clients(this: &WeakEntity<Self>, cx: &mut AsyncApp) -> Result<()> {
         let clients = this.update(cx, |this, _cx| {
-            this.ssh_clients.retain(|_k, v| v.upgrade().is_some());
-            this.ssh_clients.values().cloned().collect::<Vec<_>>()
+            this.remote_clients.retain(|_k, v| v.upgrade().is_some());
+            this.remote_clients.values().cloned().collect::<Vec<_>>()
         })?;
 
         for client in clients {
@@ -1778,17 +1778,17 @@ impl ExtensionStore {
         anyhow::Ok(())
     }
 
-    pub fn register_ssh_client(&mut self, client: Entity<SshRemoteClient>, cx: &mut Context<Self>) {
+    pub fn register_remote_client(&mut self, client: Entity<RemoteClient>, cx: &mut Context<Self>) {
         let connection_options = client.read(cx).connection_options();
         let ssh_url = connection_options.ssh_url();
 
-        if let Some(existing_client) = self.ssh_clients.get(&ssh_url)
+        if let Some(existing_client) = self.remote_clients.get(&ssh_url)
             && existing_client.upgrade().is_some()
         {
             return;
         }
 
-        self.ssh_clients.insert(ssh_url, client.downgrade());
+        self.remote_clients.insert(ssh_url, client.downgrade());
         self.ssh_registered_tx.unbounded_send(()).ok();
     }
 }
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 7512152324..e2f8d55cf2 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1381,7 +1381,7 @@ impl PickerDelegate for FileFinderDelegate {
                         project
                             .worktree_for_id(history_item.project.worktree_id, cx)
                             .is_some()
-                            || ((project.is_local() || project.is_via_ssh())
+                            || ((project.is_local() || project.is_via_remote_server())
                                 && history_item.absolute.is_some())
                     }),
                     self.currently_opened_path.as_ref(),
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index d5206c1f26..a71e434e52 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -222,7 +222,7 @@ pub fn init(cx: &mut App) {
 
     cx.observe_new(move |workspace: &mut Workspace, _, cx| {
         let project = workspace.project();
-        if project.read(cx).is_local() || project.read(cx).is_via_ssh() {
+        if project.read(cx).is_local() || project.read(cx).is_via_remote_server() {
             log_store.update(cx, |store, cx| {
                 store.add_project(project, cx);
             });
@@ -231,7 +231,7 @@ pub fn init(cx: &mut App) {
         let log_store = log_store.clone();
         workspace.register_action(move |workspace, _: &OpenLanguageServerLogs, window, cx| {
             let project = workspace.project().read(cx);
-            if project.is_local() || project.is_via_ssh() {
+            if project.is_local() || project.is_via_remote_server() {
                 let project = workspace.project().clone();
                 let log_store = log_store.clone();
                 get_or_create_tool(
@@ -321,7 +321,7 @@ impl LogStore {
                             .retain(|_, state| state.kind.project() != Some(&weak_project));
                     }),
                     cx.subscribe(project, |this, project, event, cx| {
-                        let server_kind = if project.read(cx).is_via_ssh() {
+                        let server_kind = if project.read(cx).is_via_remote_server() {
                             LanguageServerKind::Remote {
                                 project: project.downgrade(),
                             }
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 10698cead8..1521d01295 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -5102,9 +5102,9 @@ impl EventEmitter<PanelEvent> for OutlinePanel {}
 
 impl Render for OutlinePanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (is_local, is_via_ssh) = self
-            .project
-            .read_with(cx, |project, _| (project.is_local(), project.is_via_ssh()));
+        let (is_local, is_via_ssh) = self.project.read_with(cx, |project, _| {
+            (project.is_local(), project.is_via_remote_server())
+        });
         let query = self.query(cx);
         let pinned = self.pinned;
         let settings = OutlinePanelSettings::get_global(cx);
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index 2906c32ff4..d8c6d3acc1 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -5,11 +5,8 @@ use super::{
     session::{self, Session, SessionStateEvent},
 };
 use crate::{
-    InlayHint, InlayHintLabel, ProjectEnvironment, ResolveState,
-    debugger::session::SessionQuirks,
-    project_settings::ProjectSettings,
-    terminals::{SshCommand, wrap_for_ssh},
-    worktree_store::WorktreeStore,
+    InlayHint, InlayHintLabel, ProjectEnvironment, ResolveState, debugger::session::SessionQuirks,
+    project_settings::ProjectSettings, worktree_store::WorktreeStore,
 };
 use anyhow::{Context as _, Result, anyhow};
 use async_trait::async_trait;
@@ -34,7 +31,7 @@ use http_client::HttpClient;
 use language::{Buffer, LanguageToolchainStore, language_settings::InlayHintKind};
 use node_runtime::NodeRuntime;
 
-use remote::{SshInfo, SshRemoteClient, ssh_session::SshArgs};
+use remote::RemoteClient;
 use rpc::{
     AnyProtoClient, TypedEnvelope,
     proto::{self},
@@ -68,7 +65,7 @@ pub enum DapStoreEvent {
 
 enum DapStoreMode {
     Local(LocalDapStore),
-    Ssh(SshDapStore),
+    Remote(RemoteDapStore),
     Collab,
 }
 
@@ -80,8 +77,8 @@ pub struct LocalDapStore {
     toolchain_store: Arc<dyn LanguageToolchainStore>,
 }
 
-pub struct SshDapStore {
-    ssh_client: Entity<SshRemoteClient>,
+pub struct RemoteDapStore {
+    remote_client: Entity<RemoteClient>,
     upstream_client: AnyProtoClient,
     upstream_project_id: u64,
 }
@@ -147,16 +144,16 @@ impl DapStore {
         Self::new(mode, breakpoint_store, worktree_store, cx)
     }
 
-    pub fn new_ssh(
+    pub fn new_remote(
         project_id: u64,
-        ssh_client: Entity<SshRemoteClient>,
+        remote_client: Entity<RemoteClient>,
         breakpoint_store: Entity<BreakpointStore>,
         worktree_store: Entity<WorktreeStore>,
         cx: &mut Context<Self>,
     ) -> Self {
-        let mode = DapStoreMode::Ssh(SshDapStore {
-            upstream_client: ssh_client.read(cx).proto_client(),
-            ssh_client,
+        let mode = DapStoreMode::Remote(RemoteDapStore {
+            upstream_client: remote_client.read(cx).proto_client(),
+            remote_client,
             upstream_project_id: project_id,
         });
 
@@ -242,64 +239,51 @@ impl DapStore {
                     Ok(binary)
                 })
             }
-            DapStoreMode::Ssh(ssh) => {
-                let request = ssh.upstream_client.request(proto::GetDebugAdapterBinary {
-                    session_id: session_id.to_proto(),
-                    project_id: ssh.upstream_project_id,
-                    worktree_id: worktree.read(cx).id().to_proto(),
-                    definition: Some(definition.to_proto()),
-                });
-                let ssh_client = ssh.ssh_client.clone();
+            DapStoreMode::Remote(remote) => {
+                let request = remote
+                    .upstream_client
+                    .request(proto::GetDebugAdapterBinary {
+                        session_id: session_id.to_proto(),
+                        project_id: remote.upstream_project_id,
+                        worktree_id: worktree.read(cx).id().to_proto(),
+                        definition: Some(definition.to_proto()),
+                    });
+                let remote = remote.remote_client.clone();
 
                 cx.spawn(async move |_, cx| {
                     let response = request.await?;
                     let binary = DebugAdapterBinary::from_proto(response)?;
-                    let (mut ssh_command, envs, path_style, ssh_shell) =
-                        ssh_client.read_with(cx, |ssh, _| {
-                            let SshInfo {
-                                args: SshArgs { arguments, envs },
-                                path_style,
-                                shell,
-                            } = ssh.ssh_info().context("SSH arguments not found")?;
-                            anyhow::Ok((
-                                SshCommand { arguments },
-                                envs.unwrap_or_default(),
-                                path_style,
-                                shell,
-                            ))
-                        })??;
 
-                    let mut connection = None;
+                    let port_forwarding;
+                    let connection;
                     if let Some(c) = binary.connection {
-                        let local_bind_addr = Ipv4Addr::LOCALHOST;
-                        let port =
-                            dap::transport::TcpTransport::unused_port(local_bind_addr).await?;
-
-                        ssh_command.add_port_forwarding(port, c.host.to_string(), c.port);
+                        let host = Ipv4Addr::LOCALHOST;
+                        let port = dap::transport::TcpTransport::unused_port(host).await?;
+                        port_forwarding = Some((port, c.host.to_string(), c.port));
                         connection = Some(TcpArguments {
                             port,
-                            host: local_bind_addr,
+                            host,
                             timeout: c.timeout,
                         })
+                    } else {
+                        port_forwarding = None;
+                        connection = None;
                     }
 
-                    let (program, args) = wrap_for_ssh(
-                        &ssh_shell,
-                        &ssh_command,
-                        binary
-                            .command
-                            .as_ref()
-                            .map(|command| (command, &binary.arguments)),
-                        binary.cwd.as_deref(),
-                        binary.envs,
-                        None,
-                        path_style,
-                    );
+                    let command = remote.read_with(cx, |remote, _cx| {
+                        remote.build_command(
+                            binary.command,
+                            &binary.arguments,
+                            &binary.envs,
+                            binary.cwd.map(|path| path.display().to_string()),
+                            port_forwarding,
+                        )
+                    })??;
 
                     Ok(DebugAdapterBinary {
-                        command: Some(program),
-                        arguments: args,
-                        envs,
+                        command: Some(command.program),
+                        arguments: command.args,
+                        envs: command.env,
                         cwd: None,
                         connection,
                         request_args: binary.request_args,
@@ -365,9 +349,9 @@ impl DapStore {
                     )))
                 }
             }
-            DapStoreMode::Ssh(ssh) => {
-                let request = ssh.upstream_client.request(proto::RunDebugLocators {
-                    project_id: ssh.upstream_project_id,
+            DapStoreMode::Remote(remote) => {
+                let request = remote.upstream_client.request(proto::RunDebugLocators {
+                    project_id: remote.upstream_project_id,
                     build_command: Some(build_command.to_proto()),
                     locator: locator_name.to_owned(),
                 });
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 5cf298a8bf..a1c0508c3e 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -44,7 +44,7 @@ use parking_lot::Mutex;
 use postage::stream::Stream as _;
 use rpc::{
     AnyProtoClient, TypedEnvelope,
-    proto::{self, FromProto, SSH_PROJECT_ID, ToProto, git_reset, split_repository_update},
+    proto::{self, FromProto, ToProto, git_reset, split_repository_update},
 };
 use serde::Deserialize;
 use std::{
@@ -141,14 +141,10 @@ enum GitStoreState {
         project_environment: Entity<ProjectEnvironment>,
         fs: Arc<dyn Fs>,
     },
-    Ssh {
-        upstream_client: AnyProtoClient,
-        upstream_project_id: ProjectId,
-        downstream: Option<(AnyProtoClient, ProjectId)>,
-    },
     Remote {
         upstream_client: AnyProtoClient,
-        upstream_project_id: ProjectId,
+        upstream_project_id: u64,
+        downstream: Option<(AnyProtoClient, ProjectId)>,
     },
 }
 
@@ -355,7 +351,7 @@ impl GitStore {
         worktree_store: &Entity<WorktreeStore>,
         buffer_store: Entity<BufferStore>,
         upstream_client: AnyProtoClient,
-        project_id: ProjectId,
+        project_id: u64,
         cx: &mut Context<Self>,
     ) -> Self {
         Self::new(
@@ -364,23 +360,6 @@ impl GitStore {
             GitStoreState::Remote {
                 upstream_client,
                 upstream_project_id: project_id,
-            },
-            cx,
-        )
-    }
-
-    pub fn ssh(
-        worktree_store: &Entity<WorktreeStore>,
-        buffer_store: Entity<BufferStore>,
-        upstream_client: AnyProtoClient,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(
-            worktree_store.clone(),
-            buffer_store,
-            GitStoreState::Ssh {
-                upstream_client,
-                upstream_project_id: ProjectId(SSH_PROJECT_ID),
                 downstream: None,
             },
             cx,
@@ -451,7 +430,7 @@ impl GitStore {
 
     pub fn shared(&mut self, project_id: u64, client: AnyProtoClient, cx: &mut Context<Self>) {
         match &mut self.state {
-            GitStoreState::Ssh {
+            GitStoreState::Remote {
                 downstream: downstream_client,
                 ..
             } => {
@@ -527,9 +506,6 @@ impl GitStore {
                     }),
                 });
             }
-            GitStoreState::Remote { .. } => {
-                debug_panic!("shared called on remote store");
-            }
         }
     }
 
@@ -541,15 +517,12 @@ impl GitStore {
             } => {
                 downstream_client.take();
             }
-            GitStoreState::Ssh {
+            GitStoreState::Remote {
                 downstream: downstream_client,
                 ..
             } => {
                 downstream_client.take();
             }
-            GitStoreState::Remote { .. } => {
-                debug_panic!("unshared called on remote store");
-            }
         }
         self.shared_diffs.clear();
     }
@@ -1047,21 +1020,17 @@ impl GitStore {
             } => downstream_client
                 .as_ref()
                 .map(|state| (state.client.clone(), state.project_id)),
-            GitStoreState::Ssh {
+            GitStoreState::Remote {
                 downstream: downstream_client,
                 ..
             } => downstream_client.clone(),
-            GitStoreState::Remote { .. } => None,
         }
     }
 
     fn upstream_client(&self) -> Option<AnyProtoClient> {
         match &self.state {
             GitStoreState::Local { .. } => None,
-            GitStoreState::Ssh {
-                upstream_client, ..
-            }
-            | GitStoreState::Remote {
+            GitStoreState::Remote {
                 upstream_client, ..
             } => Some(upstream_client.clone()),
         }
@@ -1432,12 +1401,7 @@ impl GitStore {
                 cx.background_executor()
                     .spawn(async move { fs.git_init(&path, fallback_branch_name) })
             }
-            GitStoreState::Ssh {
-                upstream_client,
-                upstream_project_id: project_id,
-                ..
-            }
-            | GitStoreState::Remote {
+            GitStoreState::Remote {
                 upstream_client,
                 upstream_project_id: project_id,
                 ..
@@ -1447,7 +1411,7 @@ impl GitStore {
                 cx.background_executor().spawn(async move {
                     client
                         .request(proto::GitInit {
-                            project_id: project_id.0,
+                            project_id: project_id,
                             abs_path: path.to_string_lossy().to_string(),
                             fallback_branch_name,
                         })
@@ -1471,13 +1435,18 @@ impl GitStore {
                 cx.background_executor()
                     .spawn(async move { fs.git_clone(&repo, &path).await })
             }
-            GitStoreState::Ssh {
+            GitStoreState::Remote {
                 upstream_client,
                 upstream_project_id,
                 ..
             } => {
+                if upstream_client.is_via_collab() {
+                    return Task::ready(Err(anyhow!(
+                        "Git Clone isn't supported for project guests"
+                    )));
+                }
                 let request = upstream_client.request(proto::GitClone {
-                    project_id: upstream_project_id.0,
+                    project_id: *upstream_project_id,
                     abs_path: path.to_string_lossy().to_string(),
                     remote_repo: repo,
                 });
@@ -1491,9 +1460,6 @@ impl GitStore {
                     }
                 })
             }
-            GitStoreState::Remote { .. } => {
-                Task::ready(Err(anyhow!("Git Clone isn't supported for remote users")))
-            }
         }
     }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 9fd4eed641..9e3900198c 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -42,9 +42,7 @@ pub use manifest_tree::ManifestTree;
 
 use anyhow::{Context as _, Result, anyhow};
 use buffer_store::{BufferStore, BufferStoreEvent};
-use client::{
-    Client, Collaborator, PendingEntitySubscription, ProjectId, TypedEnvelope, UserStore, proto,
-};
+use client::{Client, Collaborator, PendingEntitySubscription, TypedEnvelope, UserStore, proto};
 use clock::ReplicaId;
 
 use dap::client::DebugAdapterClient;
@@ -89,10 +87,10 @@ use node_runtime::NodeRuntime;
 use parking_lot::Mutex;
 pub use prettier_store::PrettierStore;
 use project_settings::{ProjectSettings, SettingsObserver, SettingsObserverEvent};
-use remote::{SshConnectionOptions, SshRemoteClient};
+use remote::{RemoteClient, SshConnectionOptions};
 use rpc::{
     AnyProtoClient, ErrorCode,
-    proto::{FromProto, LanguageServerPromptResponse, SSH_PROJECT_ID, ToProto},
+    proto::{FromProto, LanguageServerPromptResponse, REMOTE_SERVER_PROJECT_ID, ToProto},
 };
 use search::{SearchInputKind, SearchQuery, SearchResult};
 use search_history::SearchHistory;
@@ -177,12 +175,12 @@ pub struct Project {
     dap_store: Entity<DapStore>,
 
     breakpoint_store: Entity<BreakpointStore>,
-    client: Arc<client::Client>,
+    collab_client: Arc<client::Client>,
     join_project_response_message_id: u32,
     task_store: Entity<TaskStore>,
     user_store: Entity<UserStore>,
     fs: Arc<dyn Fs>,
-    ssh_client: Option<Entity<SshRemoteClient>>,
+    remote_client: Option<Entity<RemoteClient>>,
     client_state: ProjectClientState,
     git_store: Entity<GitStore>,
     collaborators: HashMap<proto::PeerId, Collaborator>,
@@ -1154,12 +1152,12 @@ impl Project {
                 active_entry: None,
                 snippets,
                 languages,
-                client,
+                collab_client: client,
                 task_store,
                 user_store,
                 settings_observer,
                 fs,
-                ssh_client: None,
+                remote_client: None,
                 breakpoint_store,
                 dap_store,
 
@@ -1183,8 +1181,8 @@ impl Project {
         })
     }
 
-    pub fn ssh(
-        ssh: Entity<SshRemoteClient>,
+    pub fn remote(
+        remote: Entity<RemoteClient>,
         client: Arc<Client>,
         node: NodeRuntime,
         user_store: Entity<UserStore>,
@@ -1200,10 +1198,15 @@ impl Project {
             let snippets =
                 SnippetProvider::new(fs.clone(), BTreeSet::from_iter([global_snippets_dir]), cx);
 
-            let (ssh_proto, path_style) =
-                ssh.read_with(cx, |ssh, _| (ssh.proto_client(), ssh.path_style()));
+            let (remote_proto, path_style) =
+                remote.read_with(cx, |remote, _| (remote.proto_client(), remote.path_style()));
             let worktree_store = cx.new(|_| {
-                WorktreeStore::remote(false, ssh_proto.clone(), SSH_PROJECT_ID, path_style)
+                WorktreeStore::remote(
+                    false,
+                    remote_proto.clone(),
+                    REMOTE_SERVER_PROJECT_ID,
+                    path_style,
+                )
             });
             cx.subscribe(&worktree_store, Self::on_worktree_store_event)
                 .detach();
@@ -1215,31 +1218,32 @@ impl Project {
             let buffer_store = cx.new(|cx| {
                 BufferStore::remote(
                     worktree_store.clone(),
-                    ssh.read(cx).proto_client(),
-                    SSH_PROJECT_ID,
+                    remote.read(cx).proto_client(),
+                    REMOTE_SERVER_PROJECT_ID,
                     cx,
                 )
             });
             let image_store = cx.new(|cx| {
                 ImageStore::remote(
                     worktree_store.clone(),
-                    ssh.read(cx).proto_client(),
-                    SSH_PROJECT_ID,
+                    remote.read(cx).proto_client(),
+                    REMOTE_SERVER_PROJECT_ID,
                     cx,
                 )
             });
             cx.subscribe(&buffer_store, Self::on_buffer_store_event)
                 .detach();
-            let toolchain_store = cx
-                .new(|cx| ToolchainStore::remote(SSH_PROJECT_ID, ssh.read(cx).proto_client(), cx));
+            let toolchain_store = cx.new(|cx| {
+                ToolchainStore::remote(REMOTE_SERVER_PROJECT_ID, remote.read(cx).proto_client(), cx)
+            });
             let task_store = cx.new(|cx| {
                 TaskStore::remote(
                     fs.clone(),
                     buffer_store.downgrade(),
                     worktree_store.clone(),
                     toolchain_store.read(cx).as_language_toolchain_store(),
-                    ssh.read(cx).proto_client(),
-                    SSH_PROJECT_ID,
+                    remote.read(cx).proto_client(),
+                    REMOTE_SERVER_PROJECT_ID,
                     cx,
                 )
             });
@@ -1262,8 +1266,8 @@ impl Project {
                     buffer_store.clone(),
                     worktree_store.clone(),
                     languages.clone(),
-                    ssh_proto.clone(),
-                    SSH_PROJECT_ID,
+                    remote_proto.clone(),
+                    REMOTE_SERVER_PROJECT_ID,
                     fs.clone(),
                     cx,
                 )
@@ -1271,12 +1275,12 @@ impl Project {
             cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
 
             let breakpoint_store =
-                cx.new(|_| BreakpointStore::remote(SSH_PROJECT_ID, ssh_proto.clone()));
+                cx.new(|_| BreakpointStore::remote(REMOTE_SERVER_PROJECT_ID, remote_proto.clone()));
 
             let dap_store = cx.new(|cx| {
-                DapStore::new_ssh(
-                    SSH_PROJECT_ID,
-                    ssh.clone(),
+                DapStore::new_remote(
+                    REMOTE_SERVER_PROJECT_ID,
+                    remote.clone(),
                     breakpoint_store.clone(),
                     worktree_store.clone(),
                     cx,
@@ -1284,10 +1288,16 @@ impl Project {
             });
 
             let git_store = cx.new(|cx| {
-                GitStore::ssh(&worktree_store, buffer_store.clone(), ssh_proto.clone(), cx)
+                GitStore::remote(
+                    &worktree_store,
+                    buffer_store.clone(),
+                    remote_proto.clone(),
+                    REMOTE_SERVER_PROJECT_ID,
+                    cx,
+                )
             });
 
-            cx.subscribe(&ssh, Self::on_ssh_event).detach();
+            cx.subscribe(&remote, Self::on_remote_client_event).detach();
 
             let this = Self {
                 buffer_ordered_messages_tx: tx,
@@ -1306,11 +1316,13 @@ impl Project {
                 _subscriptions: vec![
                     cx.on_release(Self::release),
                     cx.on_app_quit(|this, cx| {
-                        let shutdown = this.ssh_client.take().and_then(|client| {
-                            client.read(cx).shutdown_processes(
-                                Some(proto::ShutdownRemoteServer {}),
-                                cx.background_executor().clone(),
-                            )
+                        let shutdown = this.remote_client.take().and_then(|client| {
+                            client.update(cx, |client, cx| {
+                                client.shutdown_processes(
+                                    Some(proto::ShutdownRemoteServer {}),
+                                    cx.background_executor().clone(),
+                                )
+                            })
                         });
 
                         cx.background_executor().spawn(async move {
@@ -1323,12 +1335,12 @@ impl Project {
                 active_entry: None,
                 snippets,
                 languages,
-                client,
+                collab_client: client,
                 task_store,
                 user_store,
                 settings_observer,
                 fs,
-                ssh_client: Some(ssh.clone()),
+                remote_client: Some(remote.clone()),
                 buffers_needing_diff: Default::default(),
                 git_diff_debouncer: DebouncedDelay::new(),
                 terminals: Terminals {
@@ -1346,52 +1358,34 @@ impl Project {
                 agent_location: None,
             };
 
-            // ssh -> local machine handlers
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &cx.entity());
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.buffer_store);
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.worktree_store);
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.lsp_store);
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.dap_store);
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.settings_observer);
-            ssh_proto.subscribe_to_entity(SSH_PROJECT_ID, &this.git_store);
+            // remote server -> local machine handlers
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &cx.entity());
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.buffer_store);
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.worktree_store);
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.lsp_store);
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.dap_store);
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.settings_observer);
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.git_store);
 
-            ssh_proto.add_entity_message_handler(Self::handle_create_buffer_for_peer);
-            ssh_proto.add_entity_message_handler(Self::handle_update_worktree);
-            ssh_proto.add_entity_message_handler(Self::handle_update_project);
-            ssh_proto.add_entity_message_handler(Self::handle_toast);
-            ssh_proto.add_entity_request_handler(Self::handle_language_server_prompt_request);
-            ssh_proto.add_entity_message_handler(Self::handle_hide_toast);
-            ssh_proto.add_entity_request_handler(Self::handle_update_buffer_from_ssh);
-            BufferStore::init(&ssh_proto);
-            LspStore::init(&ssh_proto);
-            SettingsObserver::init(&ssh_proto);
-            TaskStore::init(Some(&ssh_proto));
-            ToolchainStore::init(&ssh_proto);
-            DapStore::init(&ssh_proto, cx);
-            GitStore::init(&ssh_proto);
+            remote_proto.add_entity_message_handler(Self::handle_create_buffer_for_peer);
+            remote_proto.add_entity_message_handler(Self::handle_update_worktree);
+            remote_proto.add_entity_message_handler(Self::handle_update_project);
+            remote_proto.add_entity_message_handler(Self::handle_toast);
+            remote_proto.add_entity_request_handler(Self::handle_language_server_prompt_request);
+            remote_proto.add_entity_message_handler(Self::handle_hide_toast);
+            remote_proto.add_entity_request_handler(Self::handle_update_buffer_from_remote_server);
+            BufferStore::init(&remote_proto);
+            LspStore::init(&remote_proto);
+            SettingsObserver::init(&remote_proto);
+            TaskStore::init(Some(&remote_proto));
+            ToolchainStore::init(&remote_proto);
+            DapStore::init(&remote_proto, cx);
+            GitStore::init(&remote_proto);
 
             this
         })
     }
 
-    pub async fn remote(
-        remote_id: u64,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        languages: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        cx: AsyncApp,
-    ) -> Result<Entity<Self>> {
-        let project =
-            Self::in_room(remote_id, client, user_store, languages, fs, cx.clone()).await?;
-        cx.update(|cx| {
-            connection_manager::Manager::global(cx).update(cx, |manager, cx| {
-                manager.maintain_project_connection(&project, cx)
-            })
-        })?;
-        Ok(project)
-    }
-
     pub async fn in_room(
         remote_id: u64,
         client: Arc<Client>,
@@ -1523,7 +1517,7 @@ impl Project {
                 &worktree_store,
                 buffer_store.clone(),
                 client.clone().into(),
-                ProjectId(remote_id),
+                remote_id,
                 cx,
             )
         })?;
@@ -1574,11 +1568,11 @@ impl Project {
                 task_store,
                 snippets,
                 fs,
-                ssh_client: None,
+                remote_client: None,
                 settings_observer: settings_observer.clone(),
                 client_subscriptions: Default::default(),
                 _subscriptions: vec![cx.on_release(Self::release)],
-                client: client.clone(),
+                collab_client: client.clone(),
                 client_state: ProjectClientState::Remote {
                     sharing_has_stopped: false,
                     capability: Capability::ReadWrite,
@@ -1661,11 +1655,13 @@ impl Project {
     }
 
     fn release(&mut self, cx: &mut App) {
-        if let Some(client) = self.ssh_client.take() {
-            let shutdown = client.read(cx).shutdown_processes(
-                Some(proto::ShutdownRemoteServer {}),
-                cx.background_executor().clone(),
-            );
+        if let Some(client) = self.remote_client.take() {
+            let shutdown = client.update(cx, |client, cx| {
+                client.shutdown_processes(
+                    Some(proto::ShutdownRemoteServer {}),
+                    cx.background_executor().clone(),
+                )
+            });
 
             cx.background_spawn(async move {
                 if let Some(shutdown) = shutdown {
@@ -1681,7 +1677,7 @@ impl Project {
                 let _ = self.unshare_internal(cx);
             }
             ProjectClientState::Remote { remote_id, .. } => {
-                let _ = self.client.send(proto::LeaveProject {
+                let _ = self.collab_client.send(proto::LeaveProject {
                     project_id: *remote_id,
                 });
                 self.disconnected_from_host_internal(cx);
@@ -1808,11 +1804,11 @@ impl Project {
     }
 
     pub fn client(&self) -> Arc<Client> {
-        self.client.clone()
+        self.collab_client.clone()
     }
 
-    pub fn ssh_client(&self) -> Option<Entity<SshRemoteClient>> {
-        self.ssh_client.clone()
+    pub fn remote_client(&self) -> Option<Entity<RemoteClient>> {
+        self.remote_client.clone()
     }
 
     pub fn user_store(&self) -> Entity<UserStore> {
@@ -1893,30 +1889,30 @@ impl Project {
         if self.is_local() {
             return true;
         }
-        if self.is_via_ssh() {
+        if self.is_via_remote_server() {
             return true;
         }
 
         false
     }
 
-    pub fn ssh_connection_state(&self, cx: &App) -> Option<remote::ConnectionState> {
-        self.ssh_client
+    pub fn remote_connection_state(&self, cx: &App) -> Option<remote::ConnectionState> {
+        self.remote_client
             .as_ref()
-            .map(|ssh| ssh.read(cx).connection_state())
+            .map(|remote| remote.read(cx).connection_state())
     }
 
-    pub fn ssh_connection_options(&self, cx: &App) -> Option<SshConnectionOptions> {
-        self.ssh_client
+    pub fn remote_connection_options(&self, cx: &App) -> Option<SshConnectionOptions> {
+        self.remote_client
             .as_ref()
-            .map(|ssh| ssh.read(cx).connection_options())
+            .map(|remote| remote.read(cx).connection_options())
     }
 
     pub fn replica_id(&self) -> ReplicaId {
         match self.client_state {
             ProjectClientState::Remote { replica_id, .. } => replica_id,
             _ => {
-                if self.ssh_client.is_some() {
+                if self.remote_client.is_some() {
                     1
                 } else {
                     0
@@ -2220,55 +2216,55 @@ impl Project {
         );
 
         self.client_subscriptions.extend([
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&cx.entity(), &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.worktree_store, &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.buffer_store, &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.lsp_store, &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.settings_observer, &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.dap_store, &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.breakpoint_store, &cx.to_async()),
-            self.client
+            self.collab_client
                 .subscribe_to_entity(project_id)?
                 .set_entity(&self.git_store, &cx.to_async()),
         ]);
 
         self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.shared(project_id, self.client.clone().into(), cx)
+            buffer_store.shared(project_id, self.collab_client.clone().into(), cx)
         });
         self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.shared(project_id, self.client.clone().into(), cx);
+            worktree_store.shared(project_id, self.collab_client.clone().into(), cx);
         });
         self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.shared(project_id, self.client.clone().into(), cx)
+            lsp_store.shared(project_id, self.collab_client.clone().into(), cx)
         });
         self.breakpoint_store.update(cx, |breakpoint_store, _| {
-            breakpoint_store.shared(project_id, self.client.clone().into())
+            breakpoint_store.shared(project_id, self.collab_client.clone().into())
         });
         self.dap_store.update(cx, |dap_store, cx| {
-            dap_store.shared(project_id, self.client.clone().into(), cx);
+            dap_store.shared(project_id, self.collab_client.clone().into(), cx);
         });
         self.task_store.update(cx, |task_store, cx| {
-            task_store.shared(project_id, self.client.clone().into(), cx);
+            task_store.shared(project_id, self.collab_client.clone().into(), cx);
         });
         self.settings_observer.update(cx, |settings_observer, cx| {
-            settings_observer.shared(project_id, self.client.clone().into(), cx)
+            settings_observer.shared(project_id, self.collab_client.clone().into(), cx)
         });
         self.git_store.update(cx, |git_store, cx| {
-            git_store.shared(project_id, self.client.clone().into(), cx)
+            git_store.shared(project_id, self.collab_client.clone().into(), cx)
         });
 
         self.client_state = ProjectClientState::Shared {
@@ -2293,7 +2289,7 @@ impl Project {
         });
         if let Some(remote_id) = self.remote_id() {
             self.git_store.update(cx, |git_store, cx| {
-                git_store.shared(remote_id, self.client.clone().into(), cx)
+                git_store.shared(remote_id, self.collab_client.clone().into(), cx)
             });
         }
         cx.emit(Event::Reshared);
@@ -2370,7 +2366,7 @@ impl Project {
                 git_store.unshared(cx);
             });
 
-            self.client
+            self.collab_client
                 .send(proto::UnshareProject {
                     project_id: remote_id,
                 })
@@ -2437,15 +2433,17 @@ impl Project {
                 sharing_has_stopped,
                 ..
             } => *sharing_has_stopped,
-            ProjectClientState::Local if self.is_via_ssh() => self.ssh_is_disconnected(cx),
+            ProjectClientState::Local if self.is_via_remote_server() => {
+                self.remote_client_is_disconnected(cx)
+            }
             _ => false,
         }
     }
 
-    fn ssh_is_disconnected(&self, cx: &App) -> bool {
-        self.ssh_client
+    fn remote_client_is_disconnected(&self, cx: &App) -> bool {
+        self.remote_client
             .as_ref()
-            .map(|ssh| ssh.read(cx).is_disconnected())
+            .map(|remote| remote.read(cx).is_disconnected())
             .unwrap_or(false)
     }
 
@@ -2463,16 +2461,16 @@ impl Project {
     pub fn is_local(&self) -> bool {
         match &self.client_state {
             ProjectClientState::Local | ProjectClientState::Shared { .. } => {
-                self.ssh_client.is_none()
+                self.remote_client.is_none()
             }
             ProjectClientState::Remote { .. } => false,
         }
     }
 
-    pub fn is_via_ssh(&self) -> bool {
+    pub fn is_via_remote_server(&self) -> bool {
         match &self.client_state {
             ProjectClientState::Local | ProjectClientState::Shared { .. } => {
-                self.ssh_client.is_some()
+                self.remote_client.is_some()
             }
             ProjectClientState::Remote { .. } => false,
         }
@@ -2496,7 +2494,7 @@ impl Project {
         language: Option<Arc<Language>>,
         cx: &mut Context<Self>,
     ) -> Entity<Buffer> {
-        if self.is_via_collab() || self.is_via_ssh() {
+        if self.is_via_collab() || self.is_via_remote_server() {
             panic!("called create_local_buffer on a remote project")
         }
         self.buffer_store.update(cx, |buffer_store, cx| {
@@ -2620,10 +2618,10 @@ impl Project {
     ) -> Task<Result<Entity<Buffer>>> {
         if let Some(buffer) = self.buffer_for_id(id, cx) {
             Task::ready(Ok(buffer))
-        } else if self.is_local() || self.is_via_ssh() {
+        } else if self.is_local() || self.is_via_remote_server() {
             Task::ready(Err(anyhow!("buffer {id} does not exist")))
         } else if let Some(project_id) = self.remote_id() {
-            let request = self.client.request(proto::OpenBufferById {
+            let request = self.collab_client.request(proto::OpenBufferById {
                 project_id,
                 id: id.into(),
             });
@@ -2741,7 +2739,7 @@ impl Project {
             for (buffer_id, operations) in operations_by_buffer_id.drain() {
                 let request = this.read_with(cx, |this, _| {
                     let project_id = this.remote_id()?;
-                    Some(this.client.request(proto::UpdateBuffer {
+                    Some(this.collab_client.request(proto::UpdateBuffer {
                         buffer_id: buffer_id.into(),
                         project_id,
                         operations,
@@ -2808,7 +2806,7 @@ impl Project {
                         project.read_with(cx, |project, _| {
                             if let Some(project_id) = project.remote_id() {
                                 project
-                                    .client
+                                    .collab_client
                                     .send(proto::UpdateLanguageServer {
                                         project_id,
                                         server_name: name.map(|name| String::from(name.0)),
@@ -2846,8 +2844,8 @@ impl Project {
                 self.register_buffer(buffer, cx).log_err();
             }
             BufferStoreEvent::BufferDropped(buffer_id) => {
-                if let Some(ref ssh_client) = self.ssh_client {
-                    ssh_client
+                if let Some(ref remote_client) = self.remote_client {
+                    remote_client
                         .read(cx)
                         .proto_client()
                         .send(proto::CloseBuffer {
@@ -2995,16 +2993,14 @@ impl Project {
         }
     }
 
-    fn on_ssh_event(
+    fn on_remote_client_event(
         &mut self,
-        _: Entity<SshRemoteClient>,
-        event: &remote::SshRemoteEvent,
+        _: Entity<RemoteClient>,
+        event: &remote::RemoteClientEvent,
         cx: &mut Context<Self>,
     ) {
         match event {
-            remote::SshRemoteEvent::Disconnected => {
-                // if self.is_via_ssh() {
-                // self.collaborators.clear();
+            remote::RemoteClientEvent::Disconnected => {
                 self.worktree_store.update(cx, |store, cx| {
                     store.disconnected_from_host(cx);
                 });
@@ -3110,8 +3106,9 @@ impl Project {
     }
 
     fn on_worktree_released(&mut self, id_to_remove: WorktreeId, cx: &mut Context<Self>) {
-        if let Some(ssh) = &self.ssh_client {
-            ssh.read(cx)
+        if let Some(remote) = &self.remote_client {
+            remote
+                .read(cx)
                 .proto_client()
                 .send(proto::RemoveWorktree {
                     worktree_id: id_to_remove.to_proto(),
@@ -3144,8 +3141,9 @@ impl Project {
             } => {
                 let operation = language::proto::serialize_operation(operation);
 
-                if let Some(ssh) = &self.ssh_client {
-                    ssh.read(cx)
+                if let Some(remote) = &self.remote_client {
+                    remote
+                        .read(cx)
                         .proto_client()
                         .send(proto::UpdateBuffer {
                             project_id: 0,
@@ -3552,16 +3550,16 @@ impl Project {
 
     pub fn open_server_settings(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<Buffer>>> {
         let guard = self.retain_remotely_created_models(cx);
-        let Some(ssh_client) = self.ssh_client.as_ref() else {
+        let Some(remote) = self.remote_client.as_ref() else {
             return Task::ready(Err(anyhow!("not an ssh project")));
         };
 
-        let proto_client = ssh_client.read(cx).proto_client();
+        let proto_client = remote.read(cx).proto_client();
 
         cx.spawn(async move |project, cx| {
             let buffer = proto_client
                 .request(proto::OpenServerSettings {
-                    project_id: SSH_PROJECT_ID,
+                    project_id: REMOTE_SERVER_PROJECT_ID,
                 })
                 .await?;
 
@@ -3948,10 +3946,11 @@ impl Project {
     ) -> Receiver<Entity<Buffer>> {
         let (tx, rx) = smol::channel::unbounded();
 
-        let (client, remote_id): (AnyProtoClient, _) = if let Some(ssh_client) = &self.ssh_client {
+        let (client, remote_id): (AnyProtoClient, _) = if let Some(ssh_client) = &self.remote_client
+        {
             (ssh_client.read(cx).proto_client(), 0)
         } else if let Some(remote_id) = self.remote_id() {
-            (self.client.clone().into(), remote_id)
+            (self.collab_client.clone().into(), remote_id)
         } else {
             return rx;
         };
@@ -4095,14 +4094,14 @@ impl Project {
                     is_dir: metadata.is_dir,
                 })
             })
-        } else if let Some(ssh_client) = self.ssh_client.as_ref() {
+        } else if let Some(ssh_client) = self.remote_client.as_ref() {
             let path_style = ssh_client.read(cx).path_style();
             let request_path = RemotePathBuf::from_str(path, path_style);
             let request = ssh_client
                 .read(cx)
                 .proto_client()
                 .request(proto::GetPathMetadata {
-                    project_id: SSH_PROJECT_ID,
+                    project_id: REMOTE_SERVER_PROJECT_ID,
                     path: request_path.to_proto(),
                 });
             cx.background_spawn(async move {
@@ -4202,10 +4201,10 @@ impl Project {
     ) -> Task<Result<Vec<DirectoryItem>>> {
         if self.is_local() {
             DirectoryLister::Local(cx.entity(), self.fs.clone()).list_directory(query, cx)
-        } else if let Some(session) = self.ssh_client.as_ref() {
+        } else if let Some(session) = self.remote_client.as_ref() {
             let path_buf = PathBuf::from(query);
             let request = proto::ListRemoteDirectory {
-                dev_server_id: SSH_PROJECT_ID,
+                dev_server_id: REMOTE_SERVER_PROJECT_ID,
                 path: path_buf.to_proto(),
                 config: Some(proto::ListRemoteDirectoryConfig { is_dir: true }),
             };
@@ -4420,7 +4419,7 @@ impl Project {
         mut cx: AsyncApp,
     ) -> Result<()> {
         this.update(&mut cx, |this, cx| {
-            if this.is_local() || this.is_via_ssh() {
+            if this.is_local() || this.is_via_remote_server() {
                 this.unshare(cx)?;
             } else {
                 this.disconnected_from_host(cx);
@@ -4629,7 +4628,7 @@ impl Project {
         })?
     }
 
-    async fn handle_update_buffer_from_ssh(
+    async fn handle_update_buffer_from_remote_server(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::UpdateBuffer>,
         cx: AsyncApp,
@@ -4638,7 +4637,7 @@ impl Project {
             if let Some(remote_id) = this.remote_id() {
                 let mut payload = envelope.payload.clone();
                 payload.project_id = remote_id;
-                cx.background_spawn(this.client.request(payload))
+                cx.background_spawn(this.collab_client.request(payload))
                     .detach_and_log_err(cx);
             }
             this.buffer_store.clone()
@@ -4652,9 +4651,9 @@ impl Project {
         cx: AsyncApp,
     ) -> Result<proto::Ack> {
         let buffer_store = this.read_with(&cx, |this, cx| {
-            if let Some(ssh) = &this.ssh_client {
+            if let Some(ssh) = &this.remote_client {
                 let mut payload = envelope.payload.clone();
-                payload.project_id = SSH_PROJECT_ID;
+                payload.project_id = REMOTE_SERVER_PROJECT_ID;
                 cx.background_spawn(ssh.read(cx).proto_client().request(payload))
                     .detach_and_log_err(cx);
             }
@@ -4704,7 +4703,7 @@ impl Project {
         mut cx: AsyncApp,
     ) -> Result<proto::SynchronizeBuffersResponse> {
         let response = this.update(&mut cx, |this, cx| {
-            let client = this.client.clone();
+            let client = this.collab_client.clone();
             this.buffer_store.update(cx, |this, cx| {
                 this.handle_synchronize_buffers(envelope, cx, client)
             })
@@ -4841,7 +4840,7 @@ impl Project {
             }
         };
 
-        let client = self.client.clone();
+        let client = self.collab_client.clone();
         cx.spawn(async move |this, cx| {
             let (buffers, incomplete_buffer_ids) = this.update(cx, |this, cx| {
                 this.buffer_store.read(cx).buffer_version_info(cx)
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index b009b357fe..7e1be67e21 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -2,13 +2,11 @@ use crate::{Project, ProjectPath};
 use anyhow::{Context as _, Result};
 use collections::HashMap;
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity};
-use itertools::Itertools;
 use language::LanguageName;
-use remote::{SshInfo, ssh_session::SshArgs};
+use remote::RemoteClient;
 use settings::{Settings, SettingsLocation};
 use smol::channel::bounded;
 use std::{
-    borrow::Cow,
     env::{self},
     path::{Path, PathBuf},
     sync::Arc,
@@ -18,10 +16,7 @@ use terminal::{
     TaskState, TaskStatus, Terminal, TerminalBuilder,
     terminal_settings::{self, ActivateScript, TerminalSettings, VenvSettings},
 };
-use util::{
-    ResultExt,
-    paths::{PathStyle, RemotePathBuf},
-};
+use util::{ResultExt, paths::RemotePathBuf};
 
 /// The directory inside a Python virtual environment that contains executables
 const PYTHON_VENV_BIN_DIR: &str = if cfg!(target_os = "windows") {
@@ -44,29 +39,6 @@ pub enum TerminalKind {
     Task(SpawnInTerminal),
 }
 
-/// SshCommand describes how to connect to a remote server
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SshCommand {
-    pub arguments: Vec<String>,
-}
-
-impl SshCommand {
-    pub fn add_port_forwarding(&mut self, local_port: u16, host: String, remote_port: u16) {
-        self.arguments.push("-L".to_string());
-        self.arguments
-            .push(format!("{}:{}:{}", local_port, host, remote_port));
-    }
-}
-
-#[derive(Debug)]
-pub struct SshDetails {
-    pub host: String,
-    pub ssh_command: SshCommand,
-    pub envs: Option<HashMap<String, String>>,
-    pub path_style: PathStyle,
-    pub shell: String,
-}
-
 impl Project {
     pub fn active_project_directory(&self, cx: &App) -> Option<Arc<Path>> {
         self.active_entry()
@@ -86,28 +58,6 @@ impl Project {
         }
     }
 
-    pub fn ssh_details(&self, cx: &App) -> Option<SshDetails> {
-        if let Some(ssh_client) = &self.ssh_client {
-            let ssh_client = ssh_client.read(cx);
-            if let Some(SshInfo {
-                args: SshArgs { arguments, envs },
-                path_style,
-                shell,
-            }) = ssh_client.ssh_info()
-            {
-                return Some(SshDetails {
-                    host: ssh_client.connection_options().host,
-                    ssh_command: SshCommand { arguments },
-                    envs,
-                    path_style,
-                    shell,
-                });
-            }
-        }
-
-        None
-    }
-
     pub fn create_terminal(
         &mut self,
         kind: TerminalKind,
@@ -168,14 +118,14 @@ impl Project {
         TerminalSettings::get(settings_location, cx)
     }
 
-    pub fn exec_in_shell(&self, command: String, cx: &App) -> std::process::Command {
+    pub fn exec_in_shell(&self, command: String, cx: &App) -> Result<std::process::Command> {
         let path = self.first_project_directory(cx);
-        let ssh_details = self.ssh_details(cx);
+        let remote_client = self.remote_client.as_ref();
         let settings = self.terminal_settings(&path, cx).clone();
-
-        let builder =
-            ShellBuilder::new(ssh_details.as_ref().map(|ssh| &*ssh.shell), &settings.shell)
-                .non_interactive();
+        let remote_shell = remote_client
+            .as_ref()
+            .and_then(|remote_client| remote_client.read(cx).shell());
+        let builder = ShellBuilder::new(remote_shell.as_deref(), &settings.shell).non_interactive();
         let (command, args) = builder.build(Some(command), &Vec::new());
 
         let mut env = self
@@ -185,29 +135,16 @@ impl Project {
             .unwrap_or_default();
         env.extend(settings.env);
 
-        match self.ssh_details(cx) {
-            Some(SshDetails {
-                ssh_command,
-                envs,
-                path_style,
-                shell,
-                ..
-            }) => {
-                let (command, args) = wrap_for_ssh(
-                    &shell,
-                    &ssh_command,
-                    Some((&command, &args)),
-                    path.as_deref(),
-                    env,
-                    None,
-                    path_style,
-                );
-                let mut command = std::process::Command::new(command);
-                command.args(args);
-                if let Some(envs) = envs {
-                    command.envs(envs);
-                }
-                command
+        match remote_client {
+            Some(remote_client) => {
+                let command_template =
+                    remote_client
+                        .read(cx)
+                        .build_command(Some(command), &args, &env, None, None)?;
+                let mut command = std::process::Command::new(command_template.program);
+                command.args(command_template.args);
+                command.envs(command_template.env);
+                Ok(command)
             }
             None => {
                 let mut command = std::process::Command::new(command);
@@ -216,7 +153,7 @@ impl Project {
                 if let Some(path) = path {
                     command.current_dir(path);
                 }
-                command
+                Ok(command)
             }
         }
     }
@@ -227,13 +164,13 @@ impl Project {
         python_venv_directory: Option<PathBuf>,
         cx: &mut Context<Self>,
     ) -> Result<Entity<Terminal>> {
-        let this = &mut *self;
-        let ssh_details = this.ssh_details(cx);
+        let is_via_remote = self.remote_client.is_some();
+
         let path: Option<Arc<Path>> = match &kind {
             TerminalKind::Shell(path) => path.as_ref().map(|path| Arc::from(path.as_ref())),
             TerminalKind::Task(spawn_task) => {
                 if let Some(cwd) = &spawn_task.cwd {
-                    if ssh_details.is_some() {
+                    if is_via_remote {
                         Some(Arc::from(cwd.as_ref()))
                     } else {
                         let cwd = cwd.to_string_lossy();
@@ -241,16 +178,14 @@ impl Project {
                         Some(Arc::from(Path::new(tilde_substituted.as_ref())))
                     }
                 } else {
-                    this.active_project_directory(cx)
+                    self.active_project_directory(cx)
                 }
             }
         };
 
-        let is_ssh_terminal = ssh_details.is_some();
-
         let mut settings_location = None;
         if let Some(path) = path.as_ref()
-            && let Some((worktree, _)) = this.find_worktree(path, cx)
+            && let Some((worktree, _)) = self.find_worktree(path, cx)
         {
             settings_location = Some(SettingsLocation {
                 worktree_id: worktree.read(cx).id(),
@@ -262,7 +197,7 @@ impl Project {
         let (completion_tx, completion_rx) = bounded(1);
 
         // Start with the environment that we might have inherited from the Zed CLI.
-        let mut env = this
+        let mut env = self
             .environment
             .read(cx)
             .get_cli_environment()
@@ -271,14 +206,17 @@ impl Project {
         // precedence.
         env.extend(settings.env);
 
-        let local_path = if is_ssh_terminal { None } else { path.clone() };
+        let local_path = if is_via_remote { None } else { path.clone() };
 
         let mut python_venv_activate_command = Task::ready(None);
 
-        let (spawn_task, shell) = match kind {
+        let remote_client = self.remote_client.clone();
+        let spawn_task;
+        let shell;
+        match kind {
             TerminalKind::Shell(_) => {
                 if let Some(python_venv_directory) = &python_venv_directory {
-                    python_venv_activate_command = this.python_activate_command(
+                    python_venv_activate_command = self.python_activate_command(
                         python_venv_directory,
                         &settings.detect_venv,
                         &settings.shell,
@@ -286,63 +224,16 @@ impl Project {
                     );
                 }
 
-                match ssh_details {
-                    Some(SshDetails {
-                        host,
-                        ssh_command,
-                        envs,
-                        path_style,
-                        shell,
-                    }) => {
-                        log::debug!("Connecting to a remote server: {ssh_command:?}");
-
-                        // Alacritty sets its terminfo to `alacritty`, this requiring hosts to have it installed
-                        // to properly display colors.
-                        // We do not have the luxury of assuming the host has it installed,
-                        // so we set it to a default that does not break the highlighting via ssh.
-                        env.entry("TERM".to_string())
-                            .or_insert_with(|| "xterm-256color".to_string());
-
-                        let (program, args) = wrap_for_ssh(
-                            &shell,
-                            &ssh_command,
-                            None,
-                            path.as_deref(),
-                            env,
-                            None,
-                            path_style,
-                        );
-                        env = HashMap::default();
-                        if let Some(envs) = envs {
-                            env.extend(envs);
-                        }
-                        (
-                            Option::<TaskState>::None,
-                            Shell::WithArguments {
-                                program,
-                                args,
-                                title_override: Some(format!("{} — Terminal", host).into()),
-                            },
-                        )
+                spawn_task = None;
+                shell = match remote_client {
+                    Some(remote_client) => {
+                        create_remote_shell(None, &mut env, path, remote_client, cx)?
                     }
-                    None => (None, settings.shell),
-                }
+                    None => settings.shell,
+                };
             }
-            TerminalKind::Task(spawn_task) => {
-                let task_state = Some(TaskState {
-                    id: spawn_task.id,
-                    full_label: spawn_task.full_label,
-                    label: spawn_task.label,
-                    command_label: spawn_task.command_label,
-                    hide: spawn_task.hide,
-                    status: TaskStatus::Running,
-                    show_summary: spawn_task.show_summary,
-                    show_command: spawn_task.show_command,
-                    show_rerun: spawn_task.show_rerun,
-                    completion_rx,
-                });
-
-                env.extend(spawn_task.env);
+            TerminalKind::Task(task) => {
+                env.extend(task.env);
 
                 if let Some(venv_path) = &python_venv_directory {
                     env.insert(
@@ -351,41 +242,38 @@ impl Project {
                     );
                 }
 
-                match ssh_details {
-                    Some(SshDetails {
-                        host,
-                        ssh_command,
-                        envs,
-                        path_style,
-                        shell,
-                    }) => {
-                        log::debug!("Connecting to a remote server: {ssh_command:?}");
-                        env.entry("TERM".to_string())
-                            .or_insert_with(|| "xterm-256color".to_string());
-                        let (program, args) = wrap_for_ssh(
-                            &shell,
-                            &ssh_command,
-                            spawn_task
-                                .command
-                                .as_ref()
-                                .map(|command| (command, &spawn_task.args)),
-                            path.as_deref(),
-                            env,
-                            python_venv_directory.as_deref(),
-                            path_style,
-                        );
-                        env = HashMap::default();
-                        if let Some(envs) = envs {
-                            env.extend(envs);
+                spawn_task = Some(TaskState {
+                    id: task.id,
+                    full_label: task.full_label,
+                    label: task.label,
+                    command_label: task.command_label,
+                    hide: task.hide,
+                    status: TaskStatus::Running,
+                    show_summary: task.show_summary,
+                    show_command: task.show_command,
+                    show_rerun: task.show_rerun,
+                    completion_rx,
+                });
+                shell = match remote_client {
+                    Some(remote_client) => {
+                        let path_style = remote_client.read(cx).path_style();
+                        if let Some(venv_directory) = &python_venv_directory
+                            && let Ok(str) =
+                                shlex::try_quote(venv_directory.to_string_lossy().as_ref())
+                        {
+                            let path =
+                                RemotePathBuf::new(PathBuf::from(str.to_string()), path_style)
+                                    .to_string();
+                            env.insert("PATH".into(), format!("{}:$PATH ", path));
                         }
-                        (
-                            task_state,
-                            Shell::WithArguments {
-                                program,
-                                args,
-                                title_override: Some(format!("{} — Terminal", host).into()),
-                            },
-                        )
+
+                        create_remote_shell(
+                            task.command.as_ref().map(|command| (command, &task.args)),
+                            &mut env,
+                            path,
+                            remote_client,
+                            cx,
+                        )?
                     }
                     None => {
                         if let Some(venv_path) = &python_venv_directory {
@@ -393,18 +281,17 @@ impl Project {
                                 .log_err();
                         }
 
-                        let shell = if let Some(program) = spawn_task.command {
+                        if let Some(program) = task.command {
                             Shell::WithArguments {
                                 program,
-                                args: spawn_task.args,
+                                args: task.args,
                                 title_override: None,
                             }
                         } else {
                             Shell::System
-                        };
-                        (task_state, shell)
+                        }
                     }
-                }
+                };
             }
         };
         TerminalBuilder::new(
@@ -416,7 +303,7 @@ impl Project {
             settings.cursor_shape.unwrap_or_default(),
             settings.alternate_scroll,
             settings.max_scroll_history_lines,
-            is_ssh_terminal,
+            is_via_remote,
             cx.entity_id().as_u64(),
             completion_tx,
             cx,
@@ -424,7 +311,7 @@ impl Project {
         .map(|builder| {
             let terminal_handle = cx.new(|cx| builder.subscribe(cx));
 
-            this.terminals
+            self.terminals
                 .local_handles
                 .push(terminal_handle.downgrade());
 
@@ -442,7 +329,7 @@ impl Project {
             })
             .detach();
 
-            this.activate_python_virtual_environment(
+            self.activate_python_virtual_environment(
                 python_venv_activate_command,
                 &terminal_handle,
                 cx,
@@ -652,62 +539,42 @@ impl Project {
     }
 }
 
-pub fn wrap_for_ssh(
-    shell: &str,
-    ssh_command: &SshCommand,
-    command: Option<(&String, &Vec<String>)>,
-    path: Option<&Path>,
-    env: HashMap<String, String>,
-    venv_directory: Option<&Path>,
-    path_style: PathStyle,
-) -> (String, Vec<String>) {
-    let to_run = if let Some((command, args)) = command {
-        let command: Option<Cow<str>> = shlex::try_quote(command).ok();
-        let args = args.iter().filter_map(|arg| shlex::try_quote(arg).ok());
-        command.into_iter().chain(args).join(" ")
-    } else {
-        format!("exec {shell} -l")
+fn create_remote_shell(
+    spawn_command: Option<(&String, &Vec<String>)>,
+    env: &mut HashMap<String, String>,
+    working_directory: Option<Arc<Path>>,
+    remote_client: Entity<RemoteClient>,
+    cx: &mut App,
+) -> Result<Shell> {
+    // Alacritty sets its terminfo to `alacritty`, this requiring hosts to have it installed
+    // to properly display colors.
+    // We do not have the luxury of assuming the host has it installed,
+    // so we set it to a default that does not break the highlighting via ssh.
+    env.entry("TERM".to_string())
+        .or_insert_with(|| "xterm-256color".to_string());
+
+    let (program, args) = match spawn_command {
+        Some((program, args)) => (Some(program.clone()), args),
+        None => (None, &Vec::new()),
     };
 
-    let mut env_changes = String::new();
-    for (k, v) in env.iter() {
-        if let Some((k, v)) = shlex::try_quote(k).ok().zip(shlex::try_quote(v).ok()) {
-            env_changes.push_str(&format!("{}={} ", k, v));
-        }
-    }
-    if let Some(venv_directory) = venv_directory
-        && let Ok(str) = shlex::try_quote(venv_directory.to_string_lossy().as_ref())
-    {
-        let path = RemotePathBuf::new(PathBuf::from(str.to_string()), path_style).to_string();
-        env_changes.push_str(&format!("PATH={}:$PATH ", path));
-    }
+    let command = remote_client.read(cx).build_command(
+        program,
+        args.as_slice(),
+        env,
+        working_directory.map(|path| path.display().to_string()),
+        None,
+    )?;
+    *env = command.env;
 
-    let commands = if let Some(path) = path {
-        let path = RemotePathBuf::new(path.to_path_buf(), path_style).to_string();
-        // shlex will wrap the command in single quotes (''), disabling ~ expansion,
-        // replace ith with something that works
-        let tilde_prefix = "~/";
-        if path.starts_with(tilde_prefix) {
-            let trimmed_path = path
-                .trim_start_matches("/")
-                .trim_start_matches("~")
-                .trim_start_matches("/");
+    log::debug!("Connecting to a remote server: {:?}", command.program);
+    let host = remote_client.read(cx).connection_options().host;
 
-            format!("cd \"$HOME/{trimmed_path}\"; {env_changes} {to_run}")
-        } else {
-            format!("cd \"{path}\"; {env_changes} {to_run}")
-        }
-    } else {
-        format!("cd; {env_changes} {to_run}")
-    };
-    let shell_invocation = format!("{shell} -c {}", shlex::try_quote(&commands).unwrap());
-
-    let program = "ssh".to_string();
-    let mut args = ssh_command.arguments.clone();
-
-    args.push("-t".to_string());
-    args.push(shell_invocation);
-    (program, args)
+    Ok(Shell::WithArguments {
+        program: command.program,
+        args: command.args,
+        title_override: Some(format!("{} — Terminal", host).into()),
+    })
 }
 
 fn add_environment_path(env: &mut HashMap<String, String>, new_path: &Path) -> Result<()> {
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index b8905c73bc..9033415ca4 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -18,7 +18,7 @@ use gpui::{
 use postage::oneshot;
 use rpc::{
     AnyProtoClient, ErrorExt, TypedEnvelope,
-    proto::{self, FromProto, SSH_PROJECT_ID, ToProto},
+    proto::{self, FromProto, REMOTE_SERVER_PROJECT_ID, ToProto},
 };
 use smol::{
     channel::{Receiver, Sender},
@@ -278,7 +278,7 @@ impl WorktreeStore {
             let path = RemotePathBuf::new(abs_path.into(), path_style);
             let response = client
                 .request(proto::AddWorktree {
-                    project_id: SSH_PROJECT_ID,
+                    project_id: REMOTE_SERVER_PROJECT_ID,
                     path: path.to_proto(),
                     visible,
                 })
@@ -298,7 +298,7 @@ impl WorktreeStore {
 
             let worktree = cx.update(|cx| {
                 Worktree::remote(
-                    SSH_PROJECT_ID,
+                    REMOTE_SERVER_PROJECT_ID,
                     0,
                     proto::WorktreeMetadata {
                         id: response.worktree_id,
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 5a30a3e9bc..eeb2f7a49b 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -653,7 +653,7 @@ impl ProjectPanel {
                             let file_path = entry.path.clone();
                             let worktree_id = worktree.read(cx).id();
                             let entry_id = entry.id;
-                            let is_via_ssh = project.read(cx).is_via_ssh();
+                            let is_via_ssh = project.read(cx).is_via_remote_server();
 
                             workspace
                                 .open_path_preview(
@@ -5301,7 +5301,7 @@ impl Render for ProjectPanel {
                         .on_action(cx.listener(Self::open_system))
                         .on_action(cx.listener(Self::open_in_terminal))
                 })
-                .when(project.is_via_ssh(), |el| {
+                .when(project.is_via_remote_server(), |el| {
                     el.on_action(cx.listener(Self::open_in_terminal))
                 })
                 .on_mouse_down(
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index d38e54685f..e17ec5203b 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -16,8 +16,8 @@ pub use typed_envelope::*;
 
 include!(concat!(env!("OUT_DIR"), "/zed.messages.rs"));
 
-pub const SSH_PEER_ID: PeerId = PeerId { owner_id: 0, id: 0 };
-pub const SSH_PROJECT_ID: u64 = 0;
+pub const REMOTE_SERVER_PEER_ID: PeerId = PeerId { owner_id: 0, id: 0 };
+pub const REMOTE_SERVER_PROJECT_ID: u64 = 0;
 
 messages!(
     (Ack, Foreground),
diff --git a/crates/recent_projects/src/disconnected_overlay.rs b/crates/recent_projects/src/disconnected_overlay.rs
index 8ffe0ef07c..36da6897b9 100644
--- a/crates/recent_projects/src/disconnected_overlay.rs
+++ b/crates/recent_projects/src/disconnected_overlay.rs
@@ -64,8 +64,8 @@ impl DisconnectedOverlay {
                 }
                 let handle = cx.entity().downgrade();
 
-                let ssh_connection_options = project.read(cx).ssh_connection_options(cx);
-                let host = if let Some(ssh_connection_options) = ssh_connection_options {
+                let remote_connection_options = project.read(cx).remote_connection_options(cx);
+                let host = if let Some(ssh_connection_options) = remote_connection_options {
                     Host::SshRemoteProject(ssh_connection_options)
                 } else {
                     Host::RemoteProject
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index a9c3284d0b..f4fd1f1c1b 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -28,8 +28,8 @@ use paths::user_ssh_config_file;
 use picker::Picker;
 use project::Fs;
 use project::Project;
-use remote::ssh_session::ConnectionIdentifier;
-use remote::{SshConnectionOptions, SshRemoteClient};
+use remote::remote_client::ConnectionIdentifier;
+use remote::{RemoteClient, SshConnectionOptions};
 use settings::Settings;
 use settings::SettingsStore;
 use settings::update_settings_file;
@@ -69,7 +69,7 @@ pub struct RemoteServerProjects {
     mode: Mode,
     focus_handle: FocusHandle,
     workspace: WeakEntity<Workspace>,
-    retained_connections: Vec<Entity<SshRemoteClient>>,
+    retained_connections: Vec<Entity<RemoteClient>>,
     ssh_config_updates: Task<()>,
     ssh_config_servers: BTreeSet<SharedString>,
     create_new_window: bool,
@@ -597,7 +597,7 @@ impl RemoteServerProjects {
                     let (path_style, project) = cx.update(|_, cx| {
                         (
                             session.read(cx).path_style(),
-                            project::Project::ssh(
+                            project::Project::remote(
                                 session,
                                 app_state.client.clone(),
                                 app_state.node_runtime.clone(),
diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/ssh_connections.rs
index d07ea48c7e..e3fb249d16 100644
--- a/crates/recent_projects/src/ssh_connections.rs
+++ b/crates/recent_projects/src/ssh_connections.rs
@@ -15,8 +15,9 @@ use gpui::{
 use language::CursorShape;
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
 use release_channel::ReleaseChannel;
-use remote::ssh_session::{ConnectionIdentifier, SshPortForwardOption};
-use remote::{SshConnectionOptions, SshPlatform, SshRemoteClient};
+use remote::{
+    ConnectionIdentifier, RemoteClient, RemotePlatform, SshConnectionOptions, SshPortForwardOption,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
@@ -451,7 +452,7 @@ pub struct SshClientDelegate {
     known_password: Option<String>,
 }
 
-impl remote::SshClientDelegate for SshClientDelegate {
+impl remote::RemoteClientDelegate for SshClientDelegate {
     fn ask_password(&self, prompt: String, tx: oneshot::Sender<String>, cx: &mut AsyncApp) {
         let mut known_password = self.known_password.clone();
         if let Some(password) = known_password.take() {
@@ -473,7 +474,7 @@ impl remote::SshClientDelegate for SshClientDelegate {
 
     fn download_server_binary_locally(
         &self,
-        platform: SshPlatform,
+        platform: RemotePlatform,
         release_channel: ReleaseChannel,
         version: Option<SemanticVersion>,
         cx: &mut AsyncApp,
@@ -503,7 +504,7 @@ impl remote::SshClientDelegate for SshClientDelegate {
 
     fn get_download_params(
         &self,
-        platform: SshPlatform,
+        platform: RemotePlatform,
         release_channel: ReleaseChannel,
         version: Option<SemanticVersion>,
         cx: &mut AsyncApp,
@@ -543,13 +544,13 @@ pub fn connect_over_ssh(
     ui: Entity<SshPrompt>,
     window: &mut Window,
     cx: &mut App,
-) -> Task<Result<Option<Entity<SshRemoteClient>>>> {
+) -> Task<Result<Option<Entity<RemoteClient>>>> {
     let window = window.window_handle();
     let known_password = connection_options.password.clone();
     let (tx, rx) = oneshot::channel();
     ui.update(cx, |ui, _cx| ui.set_cancellation_tx(tx));
 
-    remote::SshRemoteClient::new(
+    remote::RemoteClient::ssh(
         unique_identifier,
         connection_options,
         rx,
@@ -681,9 +682,9 @@ pub async fn open_ssh_project(
 
         window
             .update(cx, |workspace, _, cx| {
-                if let Some(client) = workspace.project().read(cx).ssh_client() {
+                if let Some(client) = workspace.project().read(cx).remote_client() {
                     ExtensionStore::global(cx)
-                        .update(cx, |store, cx| store.register_ssh_client(client, cx));
+                        .update(cx, |store, cx| store.register_remote_client(client, cx));
                 }
             })
             .ok();
diff --git a/crates/remote/src/protocol.rs b/crates/remote/src/protocol.rs
index e5a9c5b7a5..867a31b164 100644
--- a/crates/remote/src/protocol.rs
+++ b/crates/remote/src/protocol.rs
@@ -51,6 +51,16 @@ pub async fn write_message<S: AsyncWrite + Unpin>(
     Ok(())
 }
 
+pub async fn write_size_prefixed_buffer<S: AsyncWrite + Unpin>(
+    stream: &mut S,
+    buffer: &mut Vec<u8>,
+) -> Result<()> {
+    let len = buffer.len() as u32;
+    stream.write_all(len.to_le_bytes().as_slice()).await?;
+    stream.write_all(buffer).await?;
+    Ok(())
+}
+
 pub async fn read_message_raw<S: AsyncRead + Unpin>(
     stream: &mut S,
     buffer: &mut Vec<u8>,
diff --git a/crates/remote/src/remote.rs b/crates/remote/src/remote.rs
index 71895f1678..c698353d9e 100644
--- a/crates/remote/src/remote.rs
+++ b/crates/remote/src/remote.rs
@@ -1,9 +1,11 @@
 pub mod json_log;
 pub mod protocol;
 pub mod proxy;
-pub mod ssh_session;
+pub mod remote_client;
+mod transport;
 
-pub use ssh_session::{
-    ConnectionState, SshClientDelegate, SshConnectionOptions, SshInfo, SshPlatform,
-    SshRemoteClient, SshRemoteEvent,
+pub use remote_client::{
+    ConnectionIdentifier, ConnectionState, RemoteClient, RemoteClientDelegate, RemoteClientEvent,
+    RemotePlatform,
 };
+pub use transport::ssh::{SshConnectionOptions, SshPortForwardOption};
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
new file mode 100644
index 0000000000..dd529ca874
--- /dev/null
+++ b/crates/remote/src/remote_client.rs
@@ -0,0 +1,1478 @@
+use crate::{
+    SshConnectionOptions, protocol::MessageId, proxy::ProxyLaunchError,
+    transport::ssh::SshRemoteConnection,
+};
+use anyhow::{Context as _, Result, anyhow};
+use async_trait::async_trait;
+use collections::HashMap;
+use futures::{
+    Future, FutureExt as _, StreamExt as _,
+    channel::{
+        mpsc::{self, Sender, UnboundedReceiver, UnboundedSender},
+        oneshot,
+    },
+    future::{BoxFuture, Shared},
+    select, select_biased,
+};
+use gpui::{
+    App, AppContext as _, AsyncApp, BackgroundExecutor, BorrowAppContext, Context, Entity,
+    EventEmitter, Global, SemanticVersion, Task, WeakEntity,
+};
+use parking_lot::Mutex;
+
+use release_channel::ReleaseChannel;
+use rpc::{
+    AnyProtoClient, ErrorExt, ProtoClient, ProtoMessageHandlerSet, RpcError,
+    proto::{self, Envelope, EnvelopedMessage, PeerId, RequestMessage, build_typed_envelope},
+};
+use std::{
+    collections::VecDeque,
+    fmt,
+    ops::ControlFlow,
+    path::PathBuf,
+    sync::{
+        Arc, Weak,
+        atomic::{AtomicU32, AtomicU64, Ordering::SeqCst},
+    },
+    time::{Duration, Instant},
+};
+use util::{
+    ResultExt,
+    paths::{PathStyle, RemotePathBuf},
+};
+
+#[derive(Copy, Clone, Debug)]
+pub struct RemotePlatform {
+    pub os: &'static str,
+    pub arch: &'static str,
+}
+
+#[derive(Clone, Debug)]
+pub struct CommandTemplate {
+    pub program: String,
+    pub args: Vec<String>,
+    pub env: HashMap<String, String>,
+}
+
+pub trait RemoteClientDelegate: Send + Sync {
+    fn ask_password(&self, prompt: String, tx: oneshot::Sender<String>, cx: &mut AsyncApp);
+    fn get_download_params(
+        &self,
+        platform: RemotePlatform,
+        release_channel: ReleaseChannel,
+        version: Option<SemanticVersion>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<Option<(String, String)>>>;
+    fn download_server_binary_locally(
+        &self,
+        platform: RemotePlatform,
+        release_channel: ReleaseChannel,
+        version: Option<SemanticVersion>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<PathBuf>>;
+    fn set_status(&self, status: Option<&str>, cx: &mut AsyncApp);
+}
+
+const MAX_MISSED_HEARTBEATS: usize = 5;
+const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
+const HEARTBEAT_TIMEOUT: Duration = Duration::from_secs(5);
+
+const MAX_RECONNECT_ATTEMPTS: usize = 3;
+
+enum State {
+    Connecting,
+    Connected {
+        ssh_connection: Arc<dyn RemoteConnection>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+
+        multiplex_task: Task<Result<()>>,
+        heartbeat_task: Task<Result<()>>,
+    },
+    HeartbeatMissed {
+        missed_heartbeats: usize,
+
+        ssh_connection: Arc<dyn RemoteConnection>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+
+        multiplex_task: Task<Result<()>>,
+        heartbeat_task: Task<Result<()>>,
+    },
+    Reconnecting,
+    ReconnectFailed {
+        ssh_connection: Arc<dyn RemoteConnection>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+
+        error: anyhow::Error,
+        attempts: usize,
+    },
+    ReconnectExhausted,
+    ServerNotRunning,
+}
+
+impl fmt::Display for State {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Connecting => write!(f, "connecting"),
+            Self::Connected { .. } => write!(f, "connected"),
+            Self::Reconnecting => write!(f, "reconnecting"),
+            Self::ReconnectFailed { .. } => write!(f, "reconnect failed"),
+            Self::ReconnectExhausted => write!(f, "reconnect exhausted"),
+            Self::HeartbeatMissed { .. } => write!(f, "heartbeat missed"),
+            Self::ServerNotRunning { .. } => write!(f, "server not running"),
+        }
+    }
+}
+
+impl State {
+    fn remote_connection(&self) -> Option<Arc<dyn RemoteConnection>> {
+        match self {
+            Self::Connected { ssh_connection, .. } => Some(ssh_connection.clone()),
+            Self::HeartbeatMissed { ssh_connection, .. } => Some(ssh_connection.clone()),
+            Self::ReconnectFailed { ssh_connection, .. } => Some(ssh_connection.clone()),
+            _ => None,
+        }
+    }
+
+    fn can_reconnect(&self) -> bool {
+        match self {
+            Self::Connected { .. }
+            | Self::HeartbeatMissed { .. }
+            | Self::ReconnectFailed { .. } => true,
+            State::Connecting
+            | State::Reconnecting
+            | State::ReconnectExhausted
+            | State::ServerNotRunning => false,
+        }
+    }
+
+    fn is_reconnect_failed(&self) -> bool {
+        matches!(self, Self::ReconnectFailed { .. })
+    }
+
+    fn is_reconnect_exhausted(&self) -> bool {
+        matches!(self, Self::ReconnectExhausted { .. })
+    }
+
+    fn is_server_not_running(&self) -> bool {
+        matches!(self, Self::ServerNotRunning)
+    }
+
+    fn is_reconnecting(&self) -> bool {
+        matches!(self, Self::Reconnecting { .. })
+    }
+
+    fn heartbeat_recovered(self) -> Self {
+        match self {
+            Self::HeartbeatMissed {
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+                ..
+            } => Self::Connected {
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+            },
+            _ => self,
+        }
+    }
+
+    fn heartbeat_missed(self) -> Self {
+        match self {
+            Self::Connected {
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+            } => Self::HeartbeatMissed {
+                missed_heartbeats: 1,
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+            },
+            Self::HeartbeatMissed {
+                missed_heartbeats,
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+            } => Self::HeartbeatMissed {
+                missed_heartbeats: missed_heartbeats + 1,
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+            },
+            _ => self,
+        }
+    }
+}
+
+/// The state of the ssh connection.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ConnectionState {
+    Connecting,
+    Connected,
+    HeartbeatMissed,
+    Reconnecting,
+    Disconnected,
+}
+
+impl From<&State> for ConnectionState {
+    fn from(value: &State) -> Self {
+        match value {
+            State::Connecting => Self::Connecting,
+            State::Connected { .. } => Self::Connected,
+            State::Reconnecting | State::ReconnectFailed { .. } => Self::Reconnecting,
+            State::HeartbeatMissed { .. } => Self::HeartbeatMissed,
+            State::ReconnectExhausted => Self::Disconnected,
+            State::ServerNotRunning => Self::Disconnected,
+        }
+    }
+}
+
+pub struct RemoteClient {
+    client: Arc<ChannelClient>,
+    unique_identifier: String,
+    connection_options: SshConnectionOptions,
+    path_style: PathStyle,
+    state: Option<State>,
+}
+
+#[derive(Debug)]
+pub enum RemoteClientEvent {
+    Disconnected,
+}
+
+impl EventEmitter<RemoteClientEvent> for RemoteClient {}
+
+// Identifies the socket on the remote server so that reconnects
+// can re-join the same project.
+pub enum ConnectionIdentifier {
+    Setup(u64),
+    Workspace(i64),
+}
+
+static NEXT_ID: AtomicU64 = AtomicU64::new(1);
+
+impl ConnectionIdentifier {
+    pub fn setup() -> Self {
+        Self::Setup(NEXT_ID.fetch_add(1, SeqCst))
+    }
+
+    // This string gets used in a socket name, and so must be relatively short.
+    // The total length of:
+    //   /home/{username}/.local/share/zed/server_state/{name}/stdout.sock
+    // Must be less than about 100 characters
+    //   https://unix.stackexchange.com/questions/367008/why-is-socket-path-length-limited-to-a-hundred-chars
+    // So our strings should be at most 20 characters or so.
+    fn to_string(&self, cx: &App) -> String {
+        let identifier_prefix = match ReleaseChannel::global(cx) {
+            ReleaseChannel::Stable => "".to_string(),
+            release_channel => format!("{}-", release_channel.dev_name()),
+        };
+        match self {
+            Self::Setup(setup_id) => format!("{identifier_prefix}setup-{setup_id}"),
+            Self::Workspace(workspace_id) => {
+                format!("{identifier_prefix}workspace-{workspace_id}",)
+            }
+        }
+    }
+}
+
+impl RemoteClient {
+    pub fn ssh(
+        unique_identifier: ConnectionIdentifier,
+        connection_options: SshConnectionOptions,
+        cancellation: oneshot::Receiver<()>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut App,
+    ) -> Task<Result<Option<Entity<Self>>>> {
+        let unique_identifier = unique_identifier.to_string(cx);
+        cx.spawn(async move |cx| {
+            let success = Box::pin(async move {
+                let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
+                let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
+                let (connection_activity_tx, connection_activity_rx) = mpsc::channel::<()>(1);
+
+                let client =
+                    cx.update(|cx| ChannelClient::new(incoming_rx, outgoing_tx, cx, "client"))?;
+
+                let ssh_connection = cx
+                    .update(|cx| {
+                        cx.update_default_global(|pool: &mut ConnectionPool, cx| {
+                            pool.connect(connection_options.clone(), &delegate, cx)
+                        })
+                    })?
+                    .await
+                    .map_err(|e| e.cloned())?;
+
+                let path_style = ssh_connection.path_style();
+                let this = cx.new(|_| Self {
+                    client: client.clone(),
+                    unique_identifier: unique_identifier.clone(),
+                    connection_options,
+                    path_style,
+                    state: Some(State::Connecting),
+                })?;
+
+                let io_task = ssh_connection.start_proxy(
+                    unique_identifier,
+                    false,
+                    incoming_tx,
+                    outgoing_rx,
+                    connection_activity_tx,
+                    delegate.clone(),
+                    cx,
+                );
+
+                let multiplex_task = Self::monitor(this.downgrade(), io_task, cx);
+
+                if let Err(error) = client.ping(HEARTBEAT_TIMEOUT).await {
+                    log::error!("failed to establish connection: {}", error);
+                    return Err(error);
+                }
+
+                let heartbeat_task = Self::heartbeat(this.downgrade(), connection_activity_rx, cx);
+
+                this.update(cx, |this, _| {
+                    this.state = Some(State::Connected {
+                        ssh_connection,
+                        delegate,
+                        multiplex_task,
+                        heartbeat_task,
+                    });
+                })?;
+
+                Ok(Some(this))
+            });
+
+            select! {
+                _ = cancellation.fuse() => {
+                    Ok(None)
+                }
+                result = success.fuse() =>  result
+            }
+        })
+    }
+
+    pub fn proto_client_from_channels(
+        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
+        outgoing_tx: mpsc::UnboundedSender<Envelope>,
+        cx: &App,
+        name: &'static str,
+    ) -> AnyProtoClient {
+        ChannelClient::new(incoming_rx, outgoing_tx, cx, name).into()
+    }
+
+    pub fn shutdown_processes<T: RequestMessage>(
+        &mut self,
+        shutdown_request: Option<T>,
+        executor: BackgroundExecutor,
+    ) -> Option<impl Future<Output = ()> + use<T>> {
+        let state = self.state.take()?;
+        log::info!("shutting down ssh processes");
+
+        let State::Connected {
+            multiplex_task,
+            heartbeat_task,
+            ssh_connection,
+            delegate,
+        } = state
+        else {
+            return None;
+        };
+
+        let client = self.client.clone();
+
+        Some(async move {
+            if let Some(shutdown_request) = shutdown_request {
+                client.send(shutdown_request).log_err();
+                // We wait 50ms instead of waiting for a response, because
+                // waiting for a response would require us to wait on the main thread
+                // which we want to avoid in an `on_app_quit` callback.
+                executor.timer(Duration::from_millis(50)).await;
+            }
+
+            // Drop `multiplex_task` because it owns our ssh_proxy_process, which is a
+            // child of master_process.
+            drop(multiplex_task);
+            // Now drop the rest of state, which kills master process.
+            drop(heartbeat_task);
+            drop(ssh_connection);
+            drop(delegate);
+        })
+    }
+
+    fn reconnect(&mut self, cx: &mut Context<Self>) -> Result<()> {
+        let can_reconnect = self
+            .state
+            .as_ref()
+            .map(|state| state.can_reconnect())
+            .unwrap_or(false);
+        if !can_reconnect {
+            log::info!("aborting reconnect, because not in state that allows reconnecting");
+            let error = if let Some(state) = self.state.as_ref() {
+                format!("invalid state, cannot reconnect while in state {state}")
+            } else {
+                "no state set".to_string()
+            };
+            anyhow::bail!(error);
+        }
+
+        let state = self.state.take().unwrap();
+        let (attempts, ssh_connection, delegate) = match state {
+            State::Connected {
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+            }
+            | State::HeartbeatMissed {
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task,
+                ..
+            } => {
+                drop(multiplex_task);
+                drop(heartbeat_task);
+                (0, ssh_connection, delegate)
+            }
+            State::ReconnectFailed {
+                attempts,
+                ssh_connection,
+                delegate,
+                ..
+            } => (attempts, ssh_connection, delegate),
+            State::Connecting
+            | State::Reconnecting
+            | State::ReconnectExhausted
+            | State::ServerNotRunning => unreachable!(),
+        };
+
+        let attempts = attempts + 1;
+        if attempts > MAX_RECONNECT_ATTEMPTS {
+            log::error!(
+                "Failed to reconnect to after {} attempts, giving up",
+                MAX_RECONNECT_ATTEMPTS
+            );
+            self.set_state(State::ReconnectExhausted, cx);
+            return Ok(());
+        }
+
+        self.set_state(State::Reconnecting, cx);
+
+        log::info!("Trying to reconnect to ssh server... Attempt {}", attempts);
+
+        let unique_identifier = self.unique_identifier.clone();
+        let client = self.client.clone();
+        let reconnect_task = cx.spawn(async move |this, cx| {
+            macro_rules! failed {
+                ($error:expr, $attempts:expr, $ssh_connection:expr, $delegate:expr) => {
+                    return State::ReconnectFailed {
+                        error: anyhow!($error),
+                        attempts: $attempts,
+                        ssh_connection: $ssh_connection,
+                        delegate: $delegate,
+                    };
+                };
+            }
+
+            if let Err(error) = ssh_connection
+                .kill()
+                .await
+                .context("Failed to kill ssh process")
+            {
+                failed!(error, attempts, ssh_connection, delegate);
+            };
+
+            let connection_options = ssh_connection.connection_options();
+
+            let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
+            let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
+            let (connection_activity_tx, connection_activity_rx) = mpsc::channel::<()>(1);
+
+            let (ssh_connection, io_task) = match async {
+                let ssh_connection = cx
+                    .update_global(|pool: &mut ConnectionPool, cx| {
+                        pool.connect(connection_options, &delegate, cx)
+                    })?
+                    .await
+                    .map_err(|error| error.cloned())?;
+
+                let io_task = ssh_connection.start_proxy(
+                    unique_identifier,
+                    true,
+                    incoming_tx,
+                    outgoing_rx,
+                    connection_activity_tx,
+                    delegate.clone(),
+                    cx,
+                );
+                anyhow::Ok((ssh_connection, io_task))
+            }
+            .await
+            {
+                Ok((ssh_connection, io_task)) => (ssh_connection, io_task),
+                Err(error) => {
+                    failed!(error, attempts, ssh_connection, delegate);
+                }
+            };
+
+            let multiplex_task = Self::monitor(this.clone(), io_task, cx);
+            client.reconnect(incoming_rx, outgoing_tx, cx);
+
+            if let Err(error) = client.resync(HEARTBEAT_TIMEOUT).await {
+                failed!(error, attempts, ssh_connection, delegate);
+            };
+
+            State::Connected {
+                ssh_connection,
+                delegate,
+                multiplex_task,
+                heartbeat_task: Self::heartbeat(this.clone(), connection_activity_rx, cx),
+            }
+        });
+
+        cx.spawn(async move |this, cx| {
+            let new_state = reconnect_task.await;
+            this.update(cx, |this, cx| {
+                this.try_set_state(cx, |old_state| {
+                    if old_state.is_reconnecting() {
+                        match &new_state {
+                            State::Connecting
+                            | State::Reconnecting
+                            | State::HeartbeatMissed { .. }
+                            | State::ServerNotRunning => {}
+                            State::Connected { .. } => {
+                                log::info!("Successfully reconnected");
+                            }
+                            State::ReconnectFailed {
+                                error, attempts, ..
+                            } => {
+                                log::error!(
+                                    "Reconnect attempt {} failed: {:?}. Starting new attempt...",
+                                    attempts,
+                                    error
+                                );
+                            }
+                            State::ReconnectExhausted => {
+                                log::error!("Reconnect attempt failed and all attempts exhausted");
+                            }
+                        }
+                        Some(new_state)
+                    } else {
+                        None
+                    }
+                });
+
+                if this.state_is(State::is_reconnect_failed) {
+                    this.reconnect(cx)
+                } else if this.state_is(State::is_reconnect_exhausted) {
+                    Ok(())
+                } else {
+                    log::debug!("State has transition from Reconnecting into new state while attempting reconnect.");
+                    Ok(())
+                }
+            })
+        })
+        .detach_and_log_err(cx);
+
+        Ok(())
+    }
+
+    fn heartbeat(
+        this: WeakEntity<Self>,
+        mut connection_activity_rx: mpsc::Receiver<()>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<()>> {
+        let Ok(client) = this.read_with(cx, |this, _| this.client.clone()) else {
+            return Task::ready(Err(anyhow!("SshRemoteClient lost")));
+        };
+
+        cx.spawn(async move |cx| {
+            let mut missed_heartbeats = 0;
+
+            let keepalive_timer = cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse();
+            futures::pin_mut!(keepalive_timer);
+
+            loop {
+                select_biased! {
+                    result = connection_activity_rx.next().fuse() => {
+                        if result.is_none() {
+                            log::warn!("ssh heartbeat: connection activity channel has been dropped. stopping.");
+                            return Ok(());
+                        }
+
+                        if missed_heartbeats != 0 {
+                            missed_heartbeats = 0;
+                            let _ =this.update(cx, |this, cx| {
+                                this.handle_heartbeat_result(missed_heartbeats, cx)
+                            })?;
+                        }
+                    }
+                    _ = keepalive_timer => {
+                        log::debug!("Sending heartbeat to server...");
+
+                        let result = select_biased! {
+                            _ = connection_activity_rx.next().fuse() => {
+                                Ok(())
+                            }
+                            ping_result = client.ping(HEARTBEAT_TIMEOUT).fuse() => {
+                                ping_result
+                            }
+                        };
+
+                        if result.is_err() {
+                            missed_heartbeats += 1;
+                            log::warn!(
+                                "No heartbeat from server after {:?}. Missed heartbeat {} out of {}.",
+                                HEARTBEAT_TIMEOUT,
+                                missed_heartbeats,
+                                MAX_MISSED_HEARTBEATS
+                            );
+                        } else if missed_heartbeats != 0 {
+                            missed_heartbeats = 0;
+                        } else {
+                            continue;
+                        }
+
+                        let result = this.update(cx, |this, cx| {
+                            this.handle_heartbeat_result(missed_heartbeats, cx)
+                        })?;
+                        if result.is_break() {
+                            return Ok(());
+                        }
+                    }
+                }
+
+                keepalive_timer.set(cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse());
+            }
+        })
+    }
+
+    fn handle_heartbeat_result(
+        &mut self,
+        missed_heartbeats: usize,
+        cx: &mut Context<Self>,
+    ) -> ControlFlow<()> {
+        let state = self.state.take().unwrap();
+        let next_state = if missed_heartbeats > 0 {
+            state.heartbeat_missed()
+        } else {
+            state.heartbeat_recovered()
+        };
+
+        self.set_state(next_state, cx);
+
+        if missed_heartbeats >= MAX_MISSED_HEARTBEATS {
+            log::error!(
+                "Missed last {} heartbeats. Reconnecting...",
+                missed_heartbeats
+            );
+
+            self.reconnect(cx)
+                .context("failed to start reconnect process after missing heartbeats")
+                .log_err();
+            ControlFlow::Break(())
+        } else {
+            ControlFlow::Continue(())
+        }
+    }
+
+    fn monitor(
+        this: WeakEntity<Self>,
+        io_task: Task<Result<i32>>,
+        cx: &AsyncApp,
+    ) -> Task<Result<()>> {
+        cx.spawn(async move |cx| {
+            let result = io_task.await;
+
+            match result {
+                Ok(exit_code) => {
+                    if let Some(error) = ProxyLaunchError::from_exit_code(exit_code) {
+                        match error {
+                            ProxyLaunchError::ServerNotRunning => {
+                                log::error!("failed to reconnect because server is not running");
+                                this.update(cx, |this, cx| {
+                                    this.set_state(State::ServerNotRunning, cx);
+                                })?;
+                            }
+                        }
+                    } else if exit_code > 0 {
+                        log::error!("proxy process terminated unexpectedly");
+                        this.update(cx, |this, cx| {
+                            this.reconnect(cx).ok();
+                        })?;
+                    }
+                }
+                Err(error) => {
+                    log::warn!("ssh io task died with error: {:?}. reconnecting...", error);
+                    this.update(cx, |this, cx| {
+                        this.reconnect(cx).ok();
+                    })?;
+                }
+            }
+
+            Ok(())
+        })
+    }
+
+    fn state_is(&self, check: impl FnOnce(&State) -> bool) -> bool {
+        self.state.as_ref().is_some_and(check)
+    }
+
+    fn try_set_state(&mut self, cx: &mut Context<Self>, map: impl FnOnce(&State) -> Option<State>) {
+        let new_state = self.state.as_ref().and_then(map);
+        if let Some(new_state) = new_state {
+            self.state.replace(new_state);
+            cx.notify();
+        }
+    }
+
+    fn set_state(&mut self, state: State, cx: &mut Context<Self>) {
+        log::info!("setting state to '{}'", &state);
+
+        let is_reconnect_exhausted = state.is_reconnect_exhausted();
+        let is_server_not_running = state.is_server_not_running();
+        self.state.replace(state);
+
+        if is_reconnect_exhausted || is_server_not_running {
+            cx.emit(RemoteClientEvent::Disconnected);
+        }
+        cx.notify();
+    }
+
+    pub fn shell(&self) -> Option<String> {
+        Some(self.state.as_ref()?.remote_connection()?.shell())
+    }
+
+    pub fn build_command(
+        &self,
+        program: Option<String>,
+        args: &[String],
+        env: &HashMap<String, String>,
+        working_dir: Option<String>,
+        port_forward: Option<(u16, String, u16)>,
+    ) -> Result<CommandTemplate> {
+        let Some(connection) = self
+            .state
+            .as_ref()
+            .and_then(|state| state.remote_connection())
+        else {
+            return Err(anyhow!("no connection"));
+        };
+        connection.build_command(program, args, env, working_dir, port_forward)
+    }
+
+    pub fn upload_directory(
+        &self,
+        src_path: PathBuf,
+        dest_path: RemotePathBuf,
+        cx: &App,
+    ) -> Task<Result<()>> {
+        let Some(connection) = self
+            .state
+            .as_ref()
+            .and_then(|state| state.remote_connection())
+        else {
+            return Task::ready(Err(anyhow!("no ssh connection")));
+        };
+        connection.upload_directory(src_path, dest_path, cx)
+    }
+
+    pub fn proto_client(&self) -> AnyProtoClient {
+        self.client.clone().into()
+    }
+
+    pub fn host(&self) -> String {
+        self.connection_options.host.clone()
+    }
+
+    pub fn connection_options(&self) -> SshConnectionOptions {
+        self.connection_options.clone()
+    }
+
+    pub fn connection_state(&self) -> ConnectionState {
+        self.state
+            .as_ref()
+            .map(ConnectionState::from)
+            .unwrap_or(ConnectionState::Disconnected)
+    }
+
+    pub fn is_disconnected(&self) -> bool {
+        self.connection_state() == ConnectionState::Disconnected
+    }
+
+    pub fn path_style(&self) -> PathStyle {
+        self.path_style
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn simulate_disconnect(&self, client_cx: &mut App) -> Task<()> {
+        let opts = self.connection_options();
+        client_cx.spawn(async move |cx| {
+            let connection = cx
+                .update_global(|c: &mut ConnectionPool, _| {
+                    if let Some(ConnectionPoolEntry::Connecting(c)) = c.connections.get(&opts) {
+                        c.clone()
+                    } else {
+                        panic!("missing test connection")
+                    }
+                })
+                .unwrap()
+                .await
+                .unwrap();
+
+            connection.simulate_disconnect(cx);
+        })
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn fake_server(
+        client_cx: &mut gpui::TestAppContext,
+        server_cx: &mut gpui::TestAppContext,
+    ) -> (SshConnectionOptions, AnyProtoClient) {
+        let port = client_cx
+            .update(|cx| cx.default_global::<ConnectionPool>().connections.len() as u16 + 1);
+        let opts = SshConnectionOptions {
+            host: "<fake>".to_string(),
+            port: Some(port),
+            ..Default::default()
+        };
+        let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
+        let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
+        let server_client =
+            server_cx.update(|cx| ChannelClient::new(incoming_rx, outgoing_tx, cx, "fake-server"));
+        let connection: Arc<dyn RemoteConnection> = Arc::new(fake::FakeRemoteConnection {
+            connection_options: opts.clone(),
+            server_cx: fake::SendableCx::new(server_cx),
+            server_channel: server_client.clone(),
+        });
+
+        client_cx.update(|cx| {
+            cx.update_default_global(|c: &mut ConnectionPool, cx| {
+                c.connections.insert(
+                    opts.clone(),
+                    ConnectionPoolEntry::Connecting(
+                        cx.background_spawn({
+                            let connection = connection.clone();
+                            async move { Ok(connection.clone()) }
+                        })
+                        .shared(),
+                    ),
+                );
+            })
+        });
+
+        (opts, server_client.into())
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub async fn fake_client(
+        opts: SshConnectionOptions,
+        client_cx: &mut gpui::TestAppContext,
+    ) -> Entity<Self> {
+        let (_tx, rx) = oneshot::channel();
+        client_cx
+            .update(|cx| {
+                Self::ssh(
+                    ConnectionIdentifier::setup(),
+                    opts,
+                    rx,
+                    Arc::new(fake::Delegate),
+                    cx,
+                )
+            })
+            .await
+            .unwrap()
+            .unwrap()
+    }
+}
+
+enum ConnectionPoolEntry {
+    Connecting(Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>>),
+    Connected(Weak<dyn RemoteConnection>),
+}
+
+#[derive(Default)]
+struct ConnectionPool {
+    connections: HashMap<SshConnectionOptions, ConnectionPoolEntry>,
+}
+
+impl Global for ConnectionPool {}
+
+impl ConnectionPool {
+    pub fn connect(
+        &mut self,
+        opts: SshConnectionOptions,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut App,
+    ) -> Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>> {
+        let connection = self.connections.get(&opts);
+        match connection {
+            Some(ConnectionPoolEntry::Connecting(task)) => {
+                let delegate = delegate.clone();
+                cx.spawn(async move |cx| {
+                    delegate.set_status(Some("Waiting for existing connection attempt"), cx);
+                })
+                .detach();
+                return task.clone();
+            }
+            Some(ConnectionPoolEntry::Connected(ssh)) => {
+                if let Some(ssh) = ssh.upgrade()
+                    && !ssh.has_been_killed()
+                {
+                    return Task::ready(Ok(ssh)).shared();
+                }
+                self.connections.remove(&opts);
+            }
+            None => {}
+        }
+
+        let task = cx
+            .spawn({
+                let opts = opts.clone();
+                let delegate = delegate.clone();
+                async move |cx| {
+                    let connection = SshRemoteConnection::new(opts.clone(), delegate, cx)
+                        .await
+                        .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>);
+
+                    cx.update_global(|pool: &mut Self, _| {
+                        debug_assert!(matches!(
+                            pool.connections.get(&opts),
+                            Some(ConnectionPoolEntry::Connecting(_))
+                        ));
+                        match connection {
+                            Ok(connection) => {
+                                pool.connections.insert(
+                                    opts.clone(),
+                                    ConnectionPoolEntry::Connected(Arc::downgrade(&connection)),
+                                );
+                                Ok(connection)
+                            }
+                            Err(error) => {
+                                pool.connections.remove(&opts);
+                                Err(Arc::new(error))
+                            }
+                        }
+                    })?
+                }
+            })
+            .shared();
+
+        self.connections
+            .insert(opts.clone(), ConnectionPoolEntry::Connecting(task.clone()));
+        task
+    }
+}
+
+#[async_trait(?Send)]
+pub(crate) trait RemoteConnection: Send + Sync {
+    fn start_proxy(
+        &self,
+        unique_identifier: String,
+        reconnect: bool,
+        incoming_tx: UnboundedSender<Envelope>,
+        outgoing_rx: UnboundedReceiver<Envelope>,
+        connection_activity_tx: Sender<()>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<i32>>;
+    fn upload_directory(
+        &self,
+        src_path: PathBuf,
+        dest_path: RemotePathBuf,
+        cx: &App,
+    ) -> Task<Result<()>>;
+    async fn kill(&self) -> Result<()>;
+    fn has_been_killed(&self) -> bool;
+    fn build_command(
+        &self,
+        program: Option<String>,
+        args: &[String],
+        env: &HashMap<String, String>,
+        working_dir: Option<String>,
+        port_forward: Option<(u16, String, u16)>,
+    ) -> Result<CommandTemplate>;
+    fn connection_options(&self) -> SshConnectionOptions;
+    fn path_style(&self) -> PathStyle;
+    fn shell(&self) -> String;
+
+    #[cfg(any(test, feature = "test-support"))]
+    fn simulate_disconnect(&self, _: &AsyncApp) {}
+}
+
+type ResponseChannels = Mutex<HashMap<MessageId, oneshot::Sender<(Envelope, oneshot::Sender<()>)>>>;
+
+struct ChannelClient {
+    next_message_id: AtomicU32,
+    outgoing_tx: Mutex<mpsc::UnboundedSender<Envelope>>,
+    buffer: Mutex<VecDeque<Envelope>>,
+    response_channels: ResponseChannels,
+    message_handlers: Mutex<ProtoMessageHandlerSet>,
+    max_received: AtomicU32,
+    name: &'static str,
+    task: Mutex<Task<Result<()>>>,
+}
+
+impl ChannelClient {
+    fn new(
+        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
+        outgoing_tx: mpsc::UnboundedSender<Envelope>,
+        cx: &App,
+        name: &'static str,
+    ) -> Arc<Self> {
+        Arc::new_cyclic(|this| Self {
+            outgoing_tx: Mutex::new(outgoing_tx),
+            next_message_id: AtomicU32::new(0),
+            max_received: AtomicU32::new(0),
+            response_channels: ResponseChannels::default(),
+            message_handlers: Default::default(),
+            buffer: Mutex::new(VecDeque::new()),
+            name,
+            task: Mutex::new(Self::start_handling_messages(
+                this.clone(),
+                incoming_rx,
+                &cx.to_async(),
+            )),
+        })
+    }
+
+    fn start_handling_messages(
+        this: Weak<Self>,
+        mut incoming_rx: mpsc::UnboundedReceiver<Envelope>,
+        cx: &AsyncApp,
+    ) -> Task<Result<()>> {
+        cx.spawn(async move |cx| {
+            let peer_id = PeerId { owner_id: 0, id: 0 };
+            while let Some(incoming) = incoming_rx.next().await {
+                let Some(this) = this.upgrade() else {
+                    return anyhow::Ok(());
+                };
+                if let Some(ack_id) = incoming.ack_id {
+                    let mut buffer = this.buffer.lock();
+                    while buffer.front().is_some_and(|msg| msg.id <= ack_id) {
+                        buffer.pop_front();
+                    }
+                }
+                if let Some(proto::envelope::Payload::FlushBufferedMessages(_)) = &incoming.payload
+                {
+                    log::debug!(
+                        "{}:ssh message received. name:FlushBufferedMessages",
+                        this.name
+                    );
+                    {
+                        let buffer = this.buffer.lock();
+                        for envelope in buffer.iter() {
+                            this.outgoing_tx
+                                .lock()
+                                .unbounded_send(envelope.clone())
+                                .ok();
+                        }
+                    }
+                    let mut envelope = proto::Ack {}.into_envelope(0, Some(incoming.id), None);
+                    envelope.id = this.next_message_id.fetch_add(1, SeqCst);
+                    this.outgoing_tx.lock().unbounded_send(envelope).ok();
+                    continue;
+                }
+
+                this.max_received.store(incoming.id, SeqCst);
+
+                if let Some(request_id) = incoming.responding_to {
+                    let request_id = MessageId(request_id);
+                    let sender = this.response_channels.lock().remove(&request_id);
+                    if let Some(sender) = sender {
+                        let (tx, rx) = oneshot::channel();
+                        if incoming.payload.is_some() {
+                            sender.send((incoming, tx)).ok();
+                        }
+                        rx.await.ok();
+                    }
+                } else if let Some(envelope) =
+                    build_typed_envelope(peer_id, Instant::now(), incoming)
+                {
+                    let type_name = envelope.payload_type_name();
+                    let message_id = envelope.message_id();
+                    if let Some(future) = ProtoMessageHandlerSet::handle_message(
+                        &this.message_handlers,
+                        envelope,
+                        this.clone().into(),
+                        cx.clone(),
+                    ) {
+                        log::debug!("{}:ssh message received. name:{type_name}", this.name);
+                        cx.foreground_executor()
+                            .spawn(async move {
+                                match future.await {
+                                    Ok(_) => {
+                                        log::debug!(
+                                            "{}:ssh message handled. name:{type_name}",
+                                            this.name
+                                        );
+                                    }
+                                    Err(error) => {
+                                        log::error!(
+                                            "{}:error handling message. type:{}, error:{}",
+                                            this.name,
+                                            type_name,
+                                            format!("{error:#}").lines().fold(
+                                                String::new(),
+                                                |mut message, line| {
+                                                    if !message.is_empty() {
+                                                        message.push(' ');
+                                                    }
+                                                    message.push_str(line);
+                                                    message
+                                                }
+                                            )
+                                        );
+                                    }
+                                }
+                            })
+                            .detach()
+                    } else {
+                        log::error!("{}:unhandled ssh message name:{type_name}", this.name);
+                        if let Err(e) = AnyProtoClient::from(this.clone()).send_response(
+                            message_id,
+                            anyhow::anyhow!("no handler registered for {type_name}").to_proto(),
+                        ) {
+                            log::error!(
+                                "{}:error sending error response for {type_name}:{e:#}",
+                                this.name
+                            );
+                        }
+                    }
+                }
+            }
+            anyhow::Ok(())
+        })
+    }
+
+    fn reconnect(
+        self: &Arc<Self>,
+        incoming_rx: UnboundedReceiver<Envelope>,
+        outgoing_tx: UnboundedSender<Envelope>,
+        cx: &AsyncApp,
+    ) {
+        *self.outgoing_tx.lock() = outgoing_tx;
+        *self.task.lock() = Self::start_handling_messages(Arc::downgrade(self), incoming_rx, cx);
+    }
+
+    fn request<T: RequestMessage>(
+        &self,
+        payload: T,
+    ) -> impl 'static + Future<Output = Result<T::Response>> {
+        self.request_internal(payload, true)
+    }
+
+    fn request_internal<T: RequestMessage>(
+        &self,
+        payload: T,
+        use_buffer: bool,
+    ) -> impl 'static + Future<Output = Result<T::Response>> {
+        log::debug!("ssh request start. name:{}", T::NAME);
+        let response =
+            self.request_dynamic(payload.into_envelope(0, None, None), T::NAME, use_buffer);
+        async move {
+            let response = response.await?;
+            log::debug!("ssh request finish. name:{}", T::NAME);
+            T::Response::from_envelope(response).context("received a response of the wrong type")
+        }
+    }
+
+    async fn resync(&self, timeout: Duration) -> Result<()> {
+        smol::future::or(
+            async {
+                self.request_internal(proto::FlushBufferedMessages {}, false)
+                    .await?;
+
+                for envelope in self.buffer.lock().iter() {
+                    self.outgoing_tx
+                        .lock()
+                        .unbounded_send(envelope.clone())
+                        .ok();
+                }
+                Ok(())
+            },
+            async {
+                smol::Timer::after(timeout).await;
+                anyhow::bail!("Timed out resyncing remote client")
+            },
+        )
+        .await
+    }
+
+    async fn ping(&self, timeout: Duration) -> Result<()> {
+        smol::future::or(
+            async {
+                self.request(proto::Ping {}).await?;
+                Ok(())
+            },
+            async {
+                smol::Timer::after(timeout).await;
+                anyhow::bail!("Timed out pinging remote client")
+            },
+        )
+        .await
+    }
+
+    fn send<T: EnvelopedMessage>(&self, payload: T) -> Result<()> {
+        log::debug!("ssh send name:{}", T::NAME);
+        self.send_dynamic(payload.into_envelope(0, None, None))
+    }
+
+    fn request_dynamic(
+        &self,
+        mut envelope: proto::Envelope,
+        type_name: &'static str,
+        use_buffer: bool,
+    ) -> impl 'static + Future<Output = Result<proto::Envelope>> {
+        envelope.id = self.next_message_id.fetch_add(1, SeqCst);
+        let (tx, rx) = oneshot::channel();
+        let mut response_channels_lock = self.response_channels.lock();
+        response_channels_lock.insert(MessageId(envelope.id), tx);
+        drop(response_channels_lock);
+
+        let result = if use_buffer {
+            self.send_buffered(envelope)
+        } else {
+            self.send_unbuffered(envelope)
+        };
+        async move {
+            if let Err(error) = &result {
+                log::error!("failed to send message: {error}");
+                anyhow::bail!("failed to send message: {error}");
+            }
+
+            let response = rx.await.context("connection lost")?.0;
+            if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
+                return Err(RpcError::from_proto(error, type_name));
+            }
+            Ok(response)
+        }
+    }
+
+    pub fn send_dynamic(&self, mut envelope: proto::Envelope) -> Result<()> {
+        envelope.id = self.next_message_id.fetch_add(1, SeqCst);
+        self.send_buffered(envelope)
+    }
+
+    fn send_buffered(&self, mut envelope: proto::Envelope) -> Result<()> {
+        envelope.ack_id = Some(self.max_received.load(SeqCst));
+        self.buffer.lock().push_back(envelope.clone());
+        // ignore errors on send (happen while we're reconnecting)
+        // assume that the global "disconnected" overlay is sufficient.
+        self.outgoing_tx.lock().unbounded_send(envelope).ok();
+        Ok(())
+    }
+
+    fn send_unbuffered(&self, mut envelope: proto::Envelope) -> Result<()> {
+        envelope.ack_id = Some(self.max_received.load(SeqCst));
+        self.outgoing_tx.lock().unbounded_send(envelope).ok();
+        Ok(())
+    }
+}
+
+impl ProtoClient for ChannelClient {
+    fn request(
+        &self,
+        envelope: proto::Envelope,
+        request_type: &'static str,
+    ) -> BoxFuture<'static, Result<proto::Envelope>> {
+        self.request_dynamic(envelope, request_type, true).boxed()
+    }
+
+    fn send(&self, envelope: proto::Envelope, _message_type: &'static str) -> Result<()> {
+        self.send_dynamic(envelope)
+    }
+
+    fn send_response(&self, envelope: Envelope, _message_type: &'static str) -> anyhow::Result<()> {
+        self.send_dynamic(envelope)
+    }
+
+    fn message_handler_set(&self) -> &Mutex<ProtoMessageHandlerSet> {
+        &self.message_handlers
+    }
+
+    fn is_via_collab(&self) -> bool {
+        false
+    }
+}
+
+#[cfg(any(test, feature = "test-support"))]
+mod fake {
+    use super::{ChannelClient, RemoteClientDelegate, RemoteConnection, RemotePlatform};
+    use crate::{SshConnectionOptions, remote_client::CommandTemplate};
+    use anyhow::Result;
+    use async_trait::async_trait;
+    use collections::HashMap;
+    use futures::{
+        FutureExt, SinkExt, StreamExt,
+        channel::{
+            mpsc::{self, Sender},
+            oneshot,
+        },
+        select_biased,
+    };
+    use gpui::{App, AppContext as _, AsyncApp, SemanticVersion, Task, TestAppContext};
+    use release_channel::ReleaseChannel;
+    use rpc::proto::Envelope;
+    use std::{path::PathBuf, sync::Arc};
+    use util::paths::{PathStyle, RemotePathBuf};
+
+    pub(super) struct FakeRemoteConnection {
+        pub(super) connection_options: SshConnectionOptions,
+        pub(super) server_channel: Arc<ChannelClient>,
+        pub(super) server_cx: SendableCx,
+    }
+
+    pub(super) struct SendableCx(AsyncApp);
+    impl SendableCx {
+        // SAFETY: When run in test mode, GPUI is always single threaded.
+        pub(super) fn new(cx: &TestAppContext) -> Self {
+            Self(cx.to_async())
+        }
+
+        // SAFETY: Enforce that we're on the main thread by requiring a valid AsyncApp
+        fn get(&self, _: &AsyncApp) -> AsyncApp {
+            self.0.clone()
+        }
+    }
+
+    // SAFETY: There is no way to access a SendableCx from a different thread, see [`SendableCx::new`] and [`SendableCx::get`]
+    unsafe impl Send for SendableCx {}
+    unsafe impl Sync for SendableCx {}
+
+    #[async_trait(?Send)]
+    impl RemoteConnection for FakeRemoteConnection {
+        async fn kill(&self) -> Result<()> {
+            Ok(())
+        }
+
+        fn has_been_killed(&self) -> bool {
+            false
+        }
+
+        fn build_command(
+            &self,
+            program: Option<String>,
+            args: &[String],
+            env: &HashMap<String, String>,
+            _: Option<String>,
+            _: Option<(u16, String, u16)>,
+        ) -> Result<CommandTemplate> {
+            let ssh_program = program.unwrap_or_else(|| "sh".to_string());
+            let mut ssh_args = Vec::new();
+            ssh_args.push(ssh_program);
+            ssh_args.extend(args.iter().cloned());
+            Ok(CommandTemplate {
+                program: "ssh".into(),
+                args: ssh_args,
+                env: env.clone(),
+            })
+        }
+
+        fn upload_directory(
+            &self,
+            _src_path: PathBuf,
+            _dest_path: RemotePathBuf,
+            _cx: &App,
+        ) -> Task<Result<()>> {
+            unreachable!()
+        }
+
+        fn connection_options(&self) -> SshConnectionOptions {
+            self.connection_options.clone()
+        }
+
+        fn simulate_disconnect(&self, cx: &AsyncApp) {
+            let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
+            let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
+            self.server_channel
+                .reconnect(incoming_rx, outgoing_tx, &self.server_cx.get(cx));
+        }
+
+        fn start_proxy(
+            &self,
+            _unique_identifier: String,
+            _reconnect: bool,
+            mut client_incoming_tx: mpsc::UnboundedSender<Envelope>,
+            mut client_outgoing_rx: mpsc::UnboundedReceiver<Envelope>,
+            mut connection_activity_tx: Sender<()>,
+            _delegate: Arc<dyn RemoteClientDelegate>,
+            cx: &mut AsyncApp,
+        ) -> Task<Result<i32>> {
+            let (mut server_incoming_tx, server_incoming_rx) = mpsc::unbounded::<Envelope>();
+            let (server_outgoing_tx, mut server_outgoing_rx) = mpsc::unbounded::<Envelope>();
+
+            self.server_channel.reconnect(
+                server_incoming_rx,
+                server_outgoing_tx,
+                &self.server_cx.get(cx),
+            );
+
+            cx.background_spawn(async move {
+                loop {
+                    select_biased! {
+                        server_to_client = server_outgoing_rx.next().fuse() => {
+                            let Some(server_to_client) = server_to_client else {
+                                return Ok(1)
+                            };
+                            connection_activity_tx.try_send(()).ok();
+                            client_incoming_tx.send(server_to_client).await.ok();
+                        }
+                        client_to_server = client_outgoing_rx.next().fuse() => {
+                            let Some(client_to_server) = client_to_server else {
+                                return Ok(1)
+                            };
+                            server_incoming_tx.send(client_to_server).await.ok();
+                        }
+                    }
+                }
+            })
+        }
+
+        fn path_style(&self) -> PathStyle {
+            PathStyle::current()
+        }
+
+        fn shell(&self) -> String {
+            "sh".to_owned()
+        }
+    }
+
+    pub(super) struct Delegate;
+
+    impl RemoteClientDelegate for Delegate {
+        fn ask_password(&self, _: String, _: oneshot::Sender<String>, _: &mut AsyncApp) {
+            unreachable!()
+        }
+
+        fn download_server_binary_locally(
+            &self,
+            _: RemotePlatform,
+            _: ReleaseChannel,
+            _: Option<SemanticVersion>,
+            _: &mut AsyncApp,
+        ) -> Task<Result<PathBuf>> {
+            unreachable!()
+        }
+
+        fn get_download_params(
+            &self,
+            _platform: RemotePlatform,
+            _release_channel: ReleaseChannel,
+            _version: Option<SemanticVersion>,
+            _cx: &mut AsyncApp,
+        ) -> Task<Result<Option<(String, String)>>> {
+            unreachable!()
+        }
+
+        fn set_status(&self, _: Option<&str>, _: &mut AsyncApp) {}
+    }
+}
diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
deleted file mode 100644
index 6794018470..0000000000
--- a/crates/remote/src/ssh_session.rs
+++ /dev/null
@@ -1,2749 +0,0 @@
-use crate::{
-    json_log::LogRecord,
-    protocol::{
-        MESSAGE_LEN_SIZE, MessageId, message_len_from_buffer, read_message_with_len, write_message,
-    },
-    proxy::ProxyLaunchError,
-};
-use anyhow::{Context as _, Result, anyhow};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::{
-    AsyncReadExt as _, Future, FutureExt as _, StreamExt as _,
-    channel::{
-        mpsc::{self, Sender, UnboundedReceiver, UnboundedSender},
-        oneshot,
-    },
-    future::{BoxFuture, Shared},
-    select, select_biased,
-};
-use gpui::{
-    App, AppContext as _, AsyncApp, BackgroundExecutor, BorrowAppContext, Context, Entity,
-    EventEmitter, Global, SemanticVersion, Task, WeakEntity,
-};
-use itertools::Itertools;
-use parking_lot::Mutex;
-
-use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
-use rpc::{
-    AnyProtoClient, ErrorExt, ProtoClient, ProtoMessageHandlerSet, RpcError,
-    proto::{self, Envelope, EnvelopedMessage, PeerId, RequestMessage, build_typed_envelope},
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use smol::{
-    fs,
-    process::{self, Child, Stdio},
-};
-use std::{
-    collections::VecDeque,
-    fmt, iter,
-    ops::ControlFlow,
-    path::{Path, PathBuf},
-    sync::{
-        Arc, Weak,
-        atomic::{AtomicU32, AtomicU64, Ordering::SeqCst},
-    },
-    time::{Duration, Instant},
-};
-use tempfile::TempDir;
-use util::{
-    ResultExt,
-    paths::{PathStyle, RemotePathBuf},
-};
-
-#[derive(Clone)]
-pub struct SshSocket {
-    connection_options: SshConnectionOptions,
-    #[cfg(not(target_os = "windows"))]
-    socket_path: PathBuf,
-    #[cfg(target_os = "windows")]
-    envs: HashMap<String, String>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize, JsonSchema)]
-pub struct SshPortForwardOption {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub local_host: Option<String>,
-    pub local_port: u16,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub remote_host: Option<String>,
-    pub remote_port: u16,
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
-pub struct SshConnectionOptions {
-    pub host: String,
-    pub username: Option<String>,
-    pub port: Option<u16>,
-    pub password: Option<String>,
-    pub args: Option<Vec<String>>,
-    pub port_forwards: Option<Vec<SshPortForwardOption>>,
-
-    pub nickname: Option<String>,
-    pub upload_binary_over_ssh: bool,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SshArgs {
-    pub arguments: Vec<String>,
-    pub envs: Option<HashMap<String, String>>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SshInfo {
-    pub args: SshArgs,
-    pub path_style: PathStyle,
-    pub shell: String,
-}
-
-#[macro_export]
-macro_rules! shell_script {
-    ($fmt:expr, $($name:ident = $arg:expr),+ $(,)?) => {{
-        format!(
-            $fmt,
-            $(
-                $name = shlex::try_quote($arg).unwrap()
-            ),+
-        )
-    }};
-}
-
-fn parse_port_number(port_str: &str) -> Result<u16> {
-    port_str
-        .parse()
-        .with_context(|| format!("parsing port number: {port_str}"))
-}
-
-fn parse_port_forward_spec(spec: &str) -> Result<SshPortForwardOption> {
-    let parts: Vec<&str> = spec.split(':').collect();
-
-    match parts.len() {
-        4 => {
-            let local_port = parse_port_number(parts[1])?;
-            let remote_port = parse_port_number(parts[3])?;
-
-            Ok(SshPortForwardOption {
-                local_host: Some(parts[0].to_string()),
-                local_port,
-                remote_host: Some(parts[2].to_string()),
-                remote_port,
-            })
-        }
-        3 => {
-            let local_port = parse_port_number(parts[0])?;
-            let remote_port = parse_port_number(parts[2])?;
-
-            Ok(SshPortForwardOption {
-                local_host: None,
-                local_port,
-                remote_host: Some(parts[1].to_string()),
-                remote_port,
-            })
-        }
-        _ => anyhow::bail!("Invalid port forward format"),
-    }
-}
-
-impl SshConnectionOptions {
-    pub fn parse_command_line(input: &str) -> Result<Self> {
-        let input = input.trim_start_matches("ssh ");
-        let mut hostname: Option<String> = None;
-        let mut username: Option<String> = None;
-        let mut port: Option<u16> = None;
-        let mut args = Vec::new();
-        let mut port_forwards: Vec<SshPortForwardOption> = Vec::new();
-
-        // disallowed: -E, -e, -F, -f, -G, -g, -M, -N, -n, -O, -q, -S, -s, -T, -t, -V, -v, -W
-        const ALLOWED_OPTS: &[&str] = &[
-            "-4", "-6", "-A", "-a", "-C", "-K", "-k", "-X", "-x", "-Y", "-y",
-        ];
-        const ALLOWED_ARGS: &[&str] = &[
-            "-B", "-b", "-c", "-D", "-F", "-I", "-i", "-J", "-l", "-m", "-o", "-P", "-p", "-R",
-            "-w",
-        ];
-
-        let mut tokens = shlex::split(input).context("invalid input")?.into_iter();
-
-        'outer: while let Some(arg) = tokens.next() {
-            if ALLOWED_OPTS.contains(&(&arg as &str)) {
-                args.push(arg.to_string());
-                continue;
-            }
-            if arg == "-p" {
-                port = tokens.next().and_then(|arg| arg.parse().ok());
-                continue;
-            } else if let Some(p) = arg.strip_prefix("-p") {
-                port = p.parse().ok();
-                continue;
-            }
-            if arg == "-l" {
-                username = tokens.next();
-                continue;
-            } else if let Some(l) = arg.strip_prefix("-l") {
-                username = Some(l.to_string());
-                continue;
-            }
-            if arg == "-L" || arg.starts_with("-L") {
-                let forward_spec = if arg == "-L" {
-                    tokens.next()
-                } else {
-                    Some(arg.strip_prefix("-L").unwrap().to_string())
-                };
-
-                if let Some(spec) = forward_spec {
-                    port_forwards.push(parse_port_forward_spec(&spec)?);
-                } else {
-                    anyhow::bail!("Missing port forward format");
-                }
-            }
-
-            for a in ALLOWED_ARGS {
-                if arg == *a {
-                    args.push(arg);
-                    if let Some(next) = tokens.next() {
-                        args.push(next);
-                    }
-                    continue 'outer;
-                } else if arg.starts_with(a) {
-                    args.push(arg);
-                    continue 'outer;
-                }
-            }
-            if arg.starts_with("-") || hostname.is_some() {
-                anyhow::bail!("unsupported argument: {:?}", arg);
-            }
-            let mut input = &arg as &str;
-            // Destination might be: username1@username2@ip2@ip1
-            if let Some((u, rest)) = input.rsplit_once('@') {
-                input = rest;
-                username = Some(u.to_string());
-            }
-            if let Some((rest, p)) = input.split_once(':') {
-                input = rest;
-                port = p.parse().ok()
-            }
-            hostname = Some(input.to_string())
-        }
-
-        let Some(hostname) = hostname else {
-            anyhow::bail!("missing hostname");
-        };
-
-        let port_forwards = match port_forwards.len() {
-            0 => None,
-            _ => Some(port_forwards),
-        };
-
-        Ok(Self {
-            host: hostname,
-            username,
-            port,
-            port_forwards,
-            args: Some(args),
-            password: None,
-            nickname: None,
-            upload_binary_over_ssh: false,
-        })
-    }
-
-    pub fn ssh_url(&self) -> String {
-        let mut result = String::from("ssh://");
-        if let Some(username) = &self.username {
-            // Username might be: username1@username2@ip2
-            let username = urlencoding::encode(username);
-            result.push_str(&username);
-            result.push('@');
-        }
-        result.push_str(&self.host);
-        if let Some(port) = self.port {
-            result.push(':');
-            result.push_str(&port.to_string());
-        }
-        result
-    }
-
-    pub fn additional_args(&self) -> Vec<String> {
-        let mut args = self.args.iter().flatten().cloned().collect::<Vec<String>>();
-
-        if let Some(forwards) = &self.port_forwards {
-            args.extend(forwards.iter().map(|pf| {
-                let local_host = match &pf.local_host {
-                    Some(host) => host,
-                    None => "localhost",
-                };
-                let remote_host = match &pf.remote_host {
-                    Some(host) => host,
-                    None => "localhost",
-                };
-
-                format!(
-                    "-L{}:{}:{}:{}",
-                    local_host, pf.local_port, remote_host, pf.remote_port
-                )
-            }));
-        }
-
-        args
-    }
-
-    fn scp_url(&self) -> String {
-        if let Some(username) = &self.username {
-            format!("{}@{}", username, self.host)
-        } else {
-            self.host.clone()
-        }
-    }
-
-    pub fn connection_string(&self) -> String {
-        let host = if let Some(username) = &self.username {
-            format!("{}@{}", username, self.host)
-        } else {
-            self.host.clone()
-        };
-        if let Some(port) = &self.port {
-            format!("{}:{}", host, port)
-        } else {
-            host
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct SshPlatform {
-    pub os: &'static str,
-    pub arch: &'static str,
-}
-
-pub trait SshClientDelegate: Send + Sync {
-    fn ask_password(&self, prompt: String, tx: oneshot::Sender<String>, cx: &mut AsyncApp);
-    fn get_download_params(
-        &self,
-        platform: SshPlatform,
-        release_channel: ReleaseChannel,
-        version: Option<SemanticVersion>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Option<(String, String)>>>;
-
-    fn download_server_binary_locally(
-        &self,
-        platform: SshPlatform,
-        release_channel: ReleaseChannel,
-        version: Option<SemanticVersion>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<PathBuf>>;
-    fn set_status(&self, status: Option<&str>, cx: &mut AsyncApp);
-}
-
-impl SshSocket {
-    #[cfg(not(target_os = "windows"))]
-    fn new(options: SshConnectionOptions, socket_path: PathBuf) -> Result<Self> {
-        Ok(Self {
-            connection_options: options,
-            socket_path,
-        })
-    }
-
-    #[cfg(target_os = "windows")]
-    fn new(options: SshConnectionOptions, temp_dir: &TempDir, secret: String) -> Result<Self> {
-        let askpass_script = temp_dir.path().join("askpass.bat");
-        std::fs::write(&askpass_script, "@ECHO OFF\necho %ZED_SSH_ASKPASS%")?;
-        let mut envs = HashMap::default();
-        envs.insert("SSH_ASKPASS_REQUIRE".into(), "force".into());
-        envs.insert("SSH_ASKPASS".into(), askpass_script.display().to_string());
-        envs.insert("ZED_SSH_ASKPASS".into(), secret);
-        Ok(Self {
-            connection_options: options,
-            envs,
-        })
-    }
-
-    // :WARNING: ssh unquotes arguments when executing on the remote :WARNING:
-    // e.g. $ ssh host sh -c 'ls -l' is equivalent to $ ssh host sh -c ls -l
-    // and passes -l as an argument to sh, not to ls.
-    // Furthermore, some setups (e.g. Coder) will change directory when SSH'ing
-    // into a machine. You must use `cd` to get back to $HOME.
-    // You need to do it like this: $ ssh host "cd; sh -c 'ls -l /tmp'"
-    fn ssh_command(&self, program: &str, args: &[&str]) -> process::Command {
-        let mut command = util::command::new_smol_command("ssh");
-        let to_run = iter::once(&program)
-            .chain(args.iter())
-            .map(|token| {
-                // We're trying to work with: sh, bash, zsh, fish, tcsh, ...?
-                debug_assert!(
-                    !token.contains('\n'),
-                    "multiline arguments do not work in all shells"
-                );
-                shlex::try_quote(token).unwrap()
-            })
-            .join(" ");
-        let to_run = format!("cd; {to_run}");
-        log::debug!("ssh {} {:?}", self.connection_options.ssh_url(), to_run);
-        self.ssh_options(&mut command)
-            .arg(self.connection_options.ssh_url())
-            .arg(to_run);
-        command
-    }
-
-    async fn run_command(&self, program: &str, args: &[&str]) -> Result<String> {
-        let output = self.ssh_command(program, args).output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "failed to run command: {}",
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(String::from_utf8_lossy(&output.stdout).to_string())
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn ssh_options<'a>(&self, command: &'a mut process::Command) -> &'a mut process::Command {
-        command
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .args(self.connection_options.additional_args())
-            .args(["-o", "ControlMaster=no", "-o"])
-            .arg(format!("ControlPath={}", self.socket_path.display()))
-    }
-
-    #[cfg(target_os = "windows")]
-    fn ssh_options<'a>(&self, command: &'a mut process::Command) -> &'a mut process::Command {
-        command
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .args(self.connection_options.additional_args())
-            .envs(self.envs.clone())
-    }
-
-    // On Windows, we need to use `SSH_ASKPASS` to provide the password to ssh.
-    // On Linux, we use the `ControlPath` option to create a socket file that ssh can use to
-    #[cfg(not(target_os = "windows"))]
-    fn ssh_args(&self) -> SshArgs {
-        let mut arguments = self.connection_options.additional_args();
-        arguments.extend(vec![
-            "-o".to_string(),
-            "ControlMaster=no".to_string(),
-            "-o".to_string(),
-            format!("ControlPath={}", self.socket_path.display()),
-            self.connection_options.ssh_url(),
-        ]);
-        SshArgs {
-            arguments,
-            envs: None,
-        }
-    }
-
-    #[cfg(target_os = "windows")]
-    fn ssh_args(&self) -> SshArgs {
-        let mut arguments = self.connection_options.additional_args();
-        arguments.push(self.connection_options.ssh_url());
-        SshArgs {
-            arguments,
-            envs: Some(self.envs.clone()),
-        }
-    }
-
-    async fn platform(&self) -> Result<SshPlatform> {
-        let uname = self.run_command("sh", &["-lc", "uname -sm"]).await?;
-        let Some((os, arch)) = uname.split_once(" ") else {
-            anyhow::bail!("unknown uname: {uname:?}")
-        };
-
-        let os = match os.trim() {
-            "Darwin" => "macos",
-            "Linux" => "linux",
-            _ => anyhow::bail!(
-                "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
-            ),
-        };
-        // exclude armv5,6,7 as they are 32-bit.
-        let arch = if arch.starts_with("armv8")
-            || arch.starts_with("armv9")
-            || arch.starts_with("arm64")
-            || arch.starts_with("aarch64")
-        {
-            "aarch64"
-        } else if arch.starts_with("x86") {
-            "x86_64"
-        } else {
-            anyhow::bail!(
-                "Prebuilt remote servers are not yet available for {arch:?}. See https://zed.dev/docs/remote-development"
-            )
-        };
-
-        Ok(SshPlatform { os, arch })
-    }
-
-    async fn shell(&self) -> String {
-        match self.run_command("sh", &["-lc", "echo $SHELL"]).await {
-            Ok(shell) => shell.trim().to_owned(),
-            Err(e) => {
-                log::error!("Failed to get shell: {e}");
-                "sh".to_owned()
-            }
-        }
-    }
-}
-
-const MAX_MISSED_HEARTBEATS: usize = 5;
-const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
-const HEARTBEAT_TIMEOUT: Duration = Duration::from_secs(5);
-
-const MAX_RECONNECT_ATTEMPTS: usize = 3;
-
-enum State {
-    Connecting,
-    Connected {
-        ssh_connection: Arc<dyn RemoteConnection>,
-        delegate: Arc<dyn SshClientDelegate>,
-
-        multiplex_task: Task<Result<()>>,
-        heartbeat_task: Task<Result<()>>,
-    },
-    HeartbeatMissed {
-        missed_heartbeats: usize,
-
-        ssh_connection: Arc<dyn RemoteConnection>,
-        delegate: Arc<dyn SshClientDelegate>,
-
-        multiplex_task: Task<Result<()>>,
-        heartbeat_task: Task<Result<()>>,
-    },
-    Reconnecting,
-    ReconnectFailed {
-        ssh_connection: Arc<dyn RemoteConnection>,
-        delegate: Arc<dyn SshClientDelegate>,
-
-        error: anyhow::Error,
-        attempts: usize,
-    },
-    ReconnectExhausted,
-    ServerNotRunning,
-}
-
-impl fmt::Display for State {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Connecting => write!(f, "connecting"),
-            Self::Connected { .. } => write!(f, "connected"),
-            Self::Reconnecting => write!(f, "reconnecting"),
-            Self::ReconnectFailed { .. } => write!(f, "reconnect failed"),
-            Self::ReconnectExhausted => write!(f, "reconnect exhausted"),
-            Self::HeartbeatMissed { .. } => write!(f, "heartbeat missed"),
-            Self::ServerNotRunning { .. } => write!(f, "server not running"),
-        }
-    }
-}
-
-impl State {
-    fn ssh_connection(&self) -> Option<&dyn RemoteConnection> {
-        match self {
-            Self::Connected { ssh_connection, .. } => Some(ssh_connection.as_ref()),
-            Self::HeartbeatMissed { ssh_connection, .. } => Some(ssh_connection.as_ref()),
-            Self::ReconnectFailed { ssh_connection, .. } => Some(ssh_connection.as_ref()),
-            _ => None,
-        }
-    }
-
-    fn can_reconnect(&self) -> bool {
-        match self {
-            Self::Connected { .. }
-            | Self::HeartbeatMissed { .. }
-            | Self::ReconnectFailed { .. } => true,
-            State::Connecting
-            | State::Reconnecting
-            | State::ReconnectExhausted
-            | State::ServerNotRunning => false,
-        }
-    }
-
-    fn is_reconnect_failed(&self) -> bool {
-        matches!(self, Self::ReconnectFailed { .. })
-    }
-
-    fn is_reconnect_exhausted(&self) -> bool {
-        matches!(self, Self::ReconnectExhausted { .. })
-    }
-
-    fn is_server_not_running(&self) -> bool {
-        matches!(self, Self::ServerNotRunning)
-    }
-
-    fn is_reconnecting(&self) -> bool {
-        matches!(self, Self::Reconnecting { .. })
-    }
-
-    fn heartbeat_recovered(self) -> Self {
-        match self {
-            Self::HeartbeatMissed {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-                ..
-            } => Self::Connected {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            },
-            _ => self,
-        }
-    }
-
-    fn heartbeat_missed(self) -> Self {
-        match self {
-            Self::Connected {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            } => Self::HeartbeatMissed {
-                missed_heartbeats: 1,
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            },
-            Self::HeartbeatMissed {
-                missed_heartbeats,
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            } => Self::HeartbeatMissed {
-                missed_heartbeats: missed_heartbeats + 1,
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            },
-            _ => self,
-        }
-    }
-}
-
-/// The state of the ssh connection.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ConnectionState {
-    Connecting,
-    Connected,
-    HeartbeatMissed,
-    Reconnecting,
-    Disconnected,
-}
-
-impl From<&State> for ConnectionState {
-    fn from(value: &State) -> Self {
-        match value {
-            State::Connecting => Self::Connecting,
-            State::Connected { .. } => Self::Connected,
-            State::Reconnecting | State::ReconnectFailed { .. } => Self::Reconnecting,
-            State::HeartbeatMissed { .. } => Self::HeartbeatMissed,
-            State::ReconnectExhausted => Self::Disconnected,
-            State::ServerNotRunning => Self::Disconnected,
-        }
-    }
-}
-
-pub struct SshRemoteClient {
-    client: Arc<ChannelClient>,
-    unique_identifier: String,
-    connection_options: SshConnectionOptions,
-    path_style: PathStyle,
-    state: Arc<Mutex<Option<State>>>,
-}
-
-#[derive(Debug)]
-pub enum SshRemoteEvent {
-    Disconnected,
-}
-
-impl EventEmitter<SshRemoteEvent> for SshRemoteClient {}
-
-// Identifies the socket on the remote server so that reconnects
-// can re-join the same project.
-pub enum ConnectionIdentifier {
-    Setup(u64),
-    Workspace(i64),
-}
-
-static NEXT_ID: AtomicU64 = AtomicU64::new(1);
-
-impl ConnectionIdentifier {
-    pub fn setup() -> Self {
-        Self::Setup(NEXT_ID.fetch_add(1, SeqCst))
-    }
-
-    // This string gets used in a socket name, and so must be relatively short.
-    // The total length of:
-    //   /home/{username}/.local/share/zed/server_state/{name}/stdout.sock
-    // Must be less than about 100 characters
-    //   https://unix.stackexchange.com/questions/367008/why-is-socket-path-length-limited-to-a-hundred-chars
-    // So our strings should be at most 20 characters or so.
-    fn to_string(&self, cx: &App) -> String {
-        let identifier_prefix = match ReleaseChannel::global(cx) {
-            ReleaseChannel::Stable => "".to_string(),
-            release_channel => format!("{}-", release_channel.dev_name()),
-        };
-        match self {
-            Self::Setup(setup_id) => format!("{identifier_prefix}setup-{setup_id}"),
-            Self::Workspace(workspace_id) => {
-                format!("{identifier_prefix}workspace-{workspace_id}",)
-            }
-        }
-    }
-}
-
-impl SshRemoteClient {
-    pub fn new(
-        unique_identifier: ConnectionIdentifier,
-        connection_options: SshConnectionOptions,
-        cancellation: oneshot::Receiver<()>,
-        delegate: Arc<dyn SshClientDelegate>,
-        cx: &mut App,
-    ) -> Task<Result<Option<Entity<Self>>>> {
-        let unique_identifier = unique_identifier.to_string(cx);
-        cx.spawn(async move |cx| {
-            let success = Box::pin(async move {
-                let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
-                let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
-                let (connection_activity_tx, connection_activity_rx) = mpsc::channel::<()>(1);
-
-                let client =
-                    cx.update(|cx| ChannelClient::new(incoming_rx, outgoing_tx, cx, "client"))?;
-
-                let ssh_connection = cx
-                    .update(|cx| {
-                        cx.update_default_global(|pool: &mut ConnectionPool, cx| {
-                            pool.connect(connection_options.clone(), &delegate, cx)
-                        })
-                    })?
-                    .await
-                    .map_err(|e| e.cloned())?;
-
-                let path_style = ssh_connection.path_style();
-                let this = cx.new(|_| Self {
-                    client: client.clone(),
-                    unique_identifier: unique_identifier.clone(),
-                    connection_options,
-                    path_style,
-                    state: Arc::new(Mutex::new(Some(State::Connecting))),
-                })?;
-
-                let io_task = ssh_connection.start_proxy(
-                    unique_identifier,
-                    false,
-                    incoming_tx,
-                    outgoing_rx,
-                    connection_activity_tx,
-                    delegate.clone(),
-                    cx,
-                );
-
-                let multiplex_task = Self::monitor(this.downgrade(), io_task, cx);
-
-                if let Err(error) = client.ping(HEARTBEAT_TIMEOUT).await {
-                    log::error!("failed to establish connection: {}", error);
-                    return Err(error);
-                }
-
-                let heartbeat_task = Self::heartbeat(this.downgrade(), connection_activity_rx, cx);
-
-                this.update(cx, |this, _| {
-                    *this.state.lock() = Some(State::Connected {
-                        ssh_connection,
-                        delegate,
-                        multiplex_task,
-                        heartbeat_task,
-                    });
-                })?;
-
-                Ok(Some(this))
-            });
-
-            select! {
-                _ = cancellation.fuse() => {
-                    Ok(None)
-                }
-                result = success.fuse() =>  result
-            }
-        })
-    }
-
-    pub fn proto_client_from_channels(
-        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
-        outgoing_tx: mpsc::UnboundedSender<Envelope>,
-        cx: &App,
-        name: &'static str,
-    ) -> AnyProtoClient {
-        ChannelClient::new(incoming_rx, outgoing_tx, cx, name).into()
-    }
-
-    pub fn shutdown_processes<T: RequestMessage>(
-        &self,
-        shutdown_request: Option<T>,
-        executor: BackgroundExecutor,
-    ) -> Option<impl Future<Output = ()> + use<T>> {
-        let state = self.state.lock().take()?;
-        log::info!("shutting down ssh processes");
-
-        let State::Connected {
-            multiplex_task,
-            heartbeat_task,
-            ssh_connection,
-            delegate,
-        } = state
-        else {
-            return None;
-        };
-
-        let client = self.client.clone();
-
-        Some(async move {
-            if let Some(shutdown_request) = shutdown_request {
-                client.send(shutdown_request).log_err();
-                // We wait 50ms instead of waiting for a response, because
-                // waiting for a response would require us to wait on the main thread
-                // which we want to avoid in an `on_app_quit` callback.
-                executor.timer(Duration::from_millis(50)).await;
-            }
-
-            // Drop `multiplex_task` because it owns our ssh_proxy_process, which is a
-            // child of master_process.
-            drop(multiplex_task);
-            // Now drop the rest of state, which kills master process.
-            drop(heartbeat_task);
-            drop(ssh_connection);
-            drop(delegate);
-        })
-    }
-
-    fn reconnect(&mut self, cx: &mut Context<Self>) -> Result<()> {
-        let mut lock = self.state.lock();
-
-        let can_reconnect = lock
-            .as_ref()
-            .map(|state| state.can_reconnect())
-            .unwrap_or(false);
-        if !can_reconnect {
-            log::info!("aborting reconnect, because not in state that allows reconnecting");
-            let error = if let Some(state) = lock.as_ref() {
-                format!("invalid state, cannot reconnect while in state {state}")
-            } else {
-                "no state set".to_string()
-            };
-            anyhow::bail!(error);
-        }
-
-        let state = lock.take().unwrap();
-        let (attempts, ssh_connection, delegate) = match state {
-            State::Connected {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            }
-            | State::HeartbeatMissed {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-                ..
-            } => {
-                drop(multiplex_task);
-                drop(heartbeat_task);
-                (0, ssh_connection, delegate)
-            }
-            State::ReconnectFailed {
-                attempts,
-                ssh_connection,
-                delegate,
-                ..
-            } => (attempts, ssh_connection, delegate),
-            State::Connecting
-            | State::Reconnecting
-            | State::ReconnectExhausted
-            | State::ServerNotRunning => unreachable!(),
-        };
-
-        let attempts = attempts + 1;
-        if attempts > MAX_RECONNECT_ATTEMPTS {
-            log::error!(
-                "Failed to reconnect to after {} attempts, giving up",
-                MAX_RECONNECT_ATTEMPTS
-            );
-            drop(lock);
-            self.set_state(State::ReconnectExhausted, cx);
-            return Ok(());
-        }
-        drop(lock);
-
-        self.set_state(State::Reconnecting, cx);
-
-        log::info!("Trying to reconnect to ssh server... Attempt {}", attempts);
-
-        let unique_identifier = self.unique_identifier.clone();
-        let client = self.client.clone();
-        let reconnect_task = cx.spawn(async move |this, cx| {
-            macro_rules! failed {
-                ($error:expr, $attempts:expr, $ssh_connection:expr, $delegate:expr) => {
-                    return State::ReconnectFailed {
-                        error: anyhow!($error),
-                        attempts: $attempts,
-                        ssh_connection: $ssh_connection,
-                        delegate: $delegate,
-                    };
-                };
-            }
-
-            if let Err(error) = ssh_connection
-                .kill()
-                .await
-                .context("Failed to kill ssh process")
-            {
-                failed!(error, attempts, ssh_connection, delegate);
-            };
-
-            let connection_options = ssh_connection.connection_options();
-
-            let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
-            let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
-            let (connection_activity_tx, connection_activity_rx) = mpsc::channel::<()>(1);
-
-            let (ssh_connection, io_task) = match async {
-                let ssh_connection = cx
-                    .update_global(|pool: &mut ConnectionPool, cx| {
-                        pool.connect(connection_options, &delegate, cx)
-                    })?
-                    .await
-                    .map_err(|error| error.cloned())?;
-
-                let io_task = ssh_connection.start_proxy(
-                    unique_identifier,
-                    true,
-                    incoming_tx,
-                    outgoing_rx,
-                    connection_activity_tx,
-                    delegate.clone(),
-                    cx,
-                );
-                anyhow::Ok((ssh_connection, io_task))
-            }
-            .await
-            {
-                Ok((ssh_connection, io_task)) => (ssh_connection, io_task),
-                Err(error) => {
-                    failed!(error, attempts, ssh_connection, delegate);
-                }
-            };
-
-            let multiplex_task = Self::monitor(this.clone(), io_task, cx);
-            client.reconnect(incoming_rx, outgoing_tx, cx);
-
-            if let Err(error) = client.resync(HEARTBEAT_TIMEOUT).await {
-                failed!(error, attempts, ssh_connection, delegate);
-            };
-
-            State::Connected {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task: Self::heartbeat(this.clone(), connection_activity_rx, cx),
-            }
-        });
-
-        cx.spawn(async move |this, cx| {
-            let new_state = reconnect_task.await;
-            this.update(cx, |this, cx| {
-                this.try_set_state(cx, |old_state| {
-                    if old_state.is_reconnecting() {
-                        match &new_state {
-                            State::Connecting
-                            | State::Reconnecting
-                            | State::HeartbeatMissed { .. }
-                            | State::ServerNotRunning => {}
-                            State::Connected { .. } => {
-                                log::info!("Successfully reconnected");
-                            }
-                            State::ReconnectFailed {
-                                error, attempts, ..
-                            } => {
-                                log::error!(
-                                    "Reconnect attempt {} failed: {:?}. Starting new attempt...",
-                                    attempts,
-                                    error
-                                );
-                            }
-                            State::ReconnectExhausted => {
-                                log::error!("Reconnect attempt failed and all attempts exhausted");
-                            }
-                        }
-                        Some(new_state)
-                    } else {
-                        None
-                    }
-                });
-
-                if this.state_is(State::is_reconnect_failed) {
-                    this.reconnect(cx)
-                } else if this.state_is(State::is_reconnect_exhausted) {
-                    Ok(())
-                } else {
-                    log::debug!("State has transition from Reconnecting into new state while attempting reconnect.");
-                    Ok(())
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-
-        Ok(())
-    }
-
-    fn heartbeat(
-        this: WeakEntity<Self>,
-        mut connection_activity_rx: mpsc::Receiver<()>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<()>> {
-        let Ok(client) = this.read_with(cx, |this, _| this.client.clone()) else {
-            return Task::ready(Err(anyhow!("SshRemoteClient lost")));
-        };
-
-        cx.spawn(async move |cx| {
-            let mut missed_heartbeats = 0;
-
-            let keepalive_timer = cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse();
-            futures::pin_mut!(keepalive_timer);
-
-            loop {
-                select_biased! {
-                    result = connection_activity_rx.next().fuse() => {
-                        if result.is_none() {
-                            log::warn!("ssh heartbeat: connection activity channel has been dropped. stopping.");
-                            return Ok(());
-                        }
-
-                        if missed_heartbeats != 0 {
-                            missed_heartbeats = 0;
-                            let _ =this.update(cx, |this, cx| {
-                                this.handle_heartbeat_result(missed_heartbeats, cx)
-                            })?;
-                        }
-                    }
-                    _ = keepalive_timer => {
-                        log::debug!("Sending heartbeat to server...");
-
-                        let result = select_biased! {
-                            _ = connection_activity_rx.next().fuse() => {
-                                Ok(())
-                            }
-                            ping_result = client.ping(HEARTBEAT_TIMEOUT).fuse() => {
-                                ping_result
-                            }
-                        };
-
-                        if result.is_err() {
-                            missed_heartbeats += 1;
-                            log::warn!(
-                                "No heartbeat from server after {:?}. Missed heartbeat {} out of {}.",
-                                HEARTBEAT_TIMEOUT,
-                                missed_heartbeats,
-                                MAX_MISSED_HEARTBEATS
-                            );
-                        } else if missed_heartbeats != 0 {
-                            missed_heartbeats = 0;
-                        } else {
-                            continue;
-                        }
-
-                        let result = this.update(cx, |this, cx| {
-                            this.handle_heartbeat_result(missed_heartbeats, cx)
-                        })?;
-                        if result.is_break() {
-                            return Ok(());
-                        }
-                    }
-                }
-
-                keepalive_timer.set(cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse());
-            }
-        })
-    }
-
-    fn handle_heartbeat_result(
-        &mut self,
-        missed_heartbeats: usize,
-        cx: &mut Context<Self>,
-    ) -> ControlFlow<()> {
-        let state = self.state.lock().take().unwrap();
-        let next_state = if missed_heartbeats > 0 {
-            state.heartbeat_missed()
-        } else {
-            state.heartbeat_recovered()
-        };
-
-        self.set_state(next_state, cx);
-
-        if missed_heartbeats >= MAX_MISSED_HEARTBEATS {
-            log::error!(
-                "Missed last {} heartbeats. Reconnecting...",
-                missed_heartbeats
-            );
-
-            self.reconnect(cx)
-                .context("failed to start reconnect process after missing heartbeats")
-                .log_err();
-            ControlFlow::Break(())
-        } else {
-            ControlFlow::Continue(())
-        }
-    }
-
-    fn monitor(
-        this: WeakEntity<Self>,
-        io_task: Task<Result<i32>>,
-        cx: &AsyncApp,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |cx| {
-            let result = io_task.await;
-
-            match result {
-                Ok(exit_code) => {
-                    if let Some(error) = ProxyLaunchError::from_exit_code(exit_code) {
-                        match error {
-                            ProxyLaunchError::ServerNotRunning => {
-                                log::error!("failed to reconnect because server is not running");
-                                this.update(cx, |this, cx| {
-                                    this.set_state(State::ServerNotRunning, cx);
-                                })?;
-                            }
-                        }
-                    } else if exit_code > 0 {
-                        log::error!("proxy process terminated unexpectedly");
-                        this.update(cx, |this, cx| {
-                            this.reconnect(cx).ok();
-                        })?;
-                    }
-                }
-                Err(error) => {
-                    log::warn!("ssh io task died with error: {:?}. reconnecting...", error);
-                    this.update(cx, |this, cx| {
-                        this.reconnect(cx).ok();
-                    })?;
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    fn state_is(&self, check: impl FnOnce(&State) -> bool) -> bool {
-        self.state.lock().as_ref().is_some_and(check)
-    }
-
-    fn try_set_state(&self, cx: &mut Context<Self>, map: impl FnOnce(&State) -> Option<State>) {
-        let mut lock = self.state.lock();
-        let new_state = lock.as_ref().and_then(map);
-
-        if let Some(new_state) = new_state {
-            lock.replace(new_state);
-            cx.notify();
-        }
-    }
-
-    fn set_state(&self, state: State, cx: &mut Context<Self>) {
-        log::info!("setting state to '{}'", &state);
-
-        let is_reconnect_exhausted = state.is_reconnect_exhausted();
-        let is_server_not_running = state.is_server_not_running();
-        self.state.lock().replace(state);
-
-        if is_reconnect_exhausted || is_server_not_running {
-            cx.emit(SshRemoteEvent::Disconnected);
-        }
-        cx.notify();
-    }
-
-    pub fn ssh_info(&self) -> Option<SshInfo> {
-        self.state
-            .lock()
-            .as_ref()
-            .and_then(|state| state.ssh_connection())
-            .map(|ssh_connection| SshInfo {
-                args: ssh_connection.ssh_args(),
-                path_style: ssh_connection.path_style(),
-                shell: ssh_connection.shell(),
-            })
-    }
-
-    pub fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let state = self.state.lock();
-        let Some(connection) = state.as_ref().and_then(|state| state.ssh_connection()) else {
-            return Task::ready(Err(anyhow!("no ssh connection")));
-        };
-        connection.upload_directory(src_path, dest_path, cx)
-    }
-
-    pub fn proto_client(&self) -> AnyProtoClient {
-        self.client.clone().into()
-    }
-
-    pub fn connection_string(&self) -> String {
-        self.connection_options.connection_string()
-    }
-
-    pub fn connection_options(&self) -> SshConnectionOptions {
-        self.connection_options.clone()
-    }
-
-    pub fn connection_state(&self) -> ConnectionState {
-        self.state
-            .lock()
-            .as_ref()
-            .map(ConnectionState::from)
-            .unwrap_or(ConnectionState::Disconnected)
-    }
-
-    pub fn is_disconnected(&self) -> bool {
-        self.connection_state() == ConnectionState::Disconnected
-    }
-
-    pub fn path_style(&self) -> PathStyle {
-        self.path_style
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn simulate_disconnect(&self, client_cx: &mut App) -> Task<()> {
-        let opts = self.connection_options();
-        client_cx.spawn(async move |cx| {
-            let connection = cx
-                .update_global(|c: &mut ConnectionPool, _| {
-                    if let Some(ConnectionPoolEntry::Connecting(c)) = c.connections.get(&opts) {
-                        c.clone()
-                    } else {
-                        panic!("missing test connection")
-                    }
-                })
-                .unwrap()
-                .await
-                .unwrap();
-
-            connection.simulate_disconnect(cx);
-        })
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn fake_server(
-        client_cx: &mut gpui::TestAppContext,
-        server_cx: &mut gpui::TestAppContext,
-    ) -> (SshConnectionOptions, AnyProtoClient) {
-        let port = client_cx
-            .update(|cx| cx.default_global::<ConnectionPool>().connections.len() as u16 + 1);
-        let opts = SshConnectionOptions {
-            host: "<fake>".to_string(),
-            port: Some(port),
-            ..Default::default()
-        };
-        let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
-        let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
-        let server_client =
-            server_cx.update(|cx| ChannelClient::new(incoming_rx, outgoing_tx, cx, "fake-server"));
-        let connection: Arc<dyn RemoteConnection> = Arc::new(fake::FakeRemoteConnection {
-            connection_options: opts.clone(),
-            server_cx: fake::SendableCx::new(server_cx),
-            server_channel: server_client.clone(),
-        });
-
-        client_cx.update(|cx| {
-            cx.update_default_global(|c: &mut ConnectionPool, cx| {
-                c.connections.insert(
-                    opts.clone(),
-                    ConnectionPoolEntry::Connecting(
-                        cx.background_spawn({
-                            let connection = connection.clone();
-                            async move { Ok(connection.clone()) }
-                        })
-                        .shared(),
-                    ),
-                );
-            })
-        });
-
-        (opts, server_client.into())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn fake_client(
-        opts: SshConnectionOptions,
-        client_cx: &mut gpui::TestAppContext,
-    ) -> Entity<Self> {
-        let (_tx, rx) = oneshot::channel();
-        client_cx
-            .update(|cx| {
-                Self::new(
-                    ConnectionIdentifier::setup(),
-                    opts,
-                    rx,
-                    Arc::new(fake::Delegate),
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .unwrap()
-    }
-}
-
-enum ConnectionPoolEntry {
-    Connecting(Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>>),
-    Connected(Weak<dyn RemoteConnection>),
-}
-
-#[derive(Default)]
-struct ConnectionPool {
-    connections: HashMap<SshConnectionOptions, ConnectionPoolEntry>,
-}
-
-impl Global for ConnectionPool {}
-
-impl ConnectionPool {
-    pub fn connect(
-        &mut self,
-        opts: SshConnectionOptions,
-        delegate: &Arc<dyn SshClientDelegate>,
-        cx: &mut App,
-    ) -> Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>> {
-        let connection = self.connections.get(&opts);
-        match connection {
-            Some(ConnectionPoolEntry::Connecting(task)) => {
-                let delegate = delegate.clone();
-                cx.spawn(async move |cx| {
-                    delegate.set_status(Some("Waiting for existing connection attempt"), cx);
-                })
-                .detach();
-                return task.clone();
-            }
-            Some(ConnectionPoolEntry::Connected(ssh)) => {
-                if let Some(ssh) = ssh.upgrade()
-                    && !ssh.has_been_killed()
-                {
-                    return Task::ready(Ok(ssh)).shared();
-                }
-                self.connections.remove(&opts);
-            }
-            None => {}
-        }
-
-        let task = cx
-            .spawn({
-                let opts = opts.clone();
-                let delegate = delegate.clone();
-                async move |cx| {
-                    let connection = SshRemoteConnection::new(opts.clone(), delegate, cx)
-                        .await
-                        .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>);
-
-                    cx.update_global(|pool: &mut Self, _| {
-                        debug_assert!(matches!(
-                            pool.connections.get(&opts),
-                            Some(ConnectionPoolEntry::Connecting(_))
-                        ));
-                        match connection {
-                            Ok(connection) => {
-                                pool.connections.insert(
-                                    opts.clone(),
-                                    ConnectionPoolEntry::Connected(Arc::downgrade(&connection)),
-                                );
-                                Ok(connection)
-                            }
-                            Err(error) => {
-                                pool.connections.remove(&opts);
-                                Err(Arc::new(error))
-                            }
-                        }
-                    })?
-                }
-            })
-            .shared();
-
-        self.connections
-            .insert(opts.clone(), ConnectionPoolEntry::Connecting(task.clone()));
-        task
-    }
-}
-
-impl From<SshRemoteClient> for AnyProtoClient {
-    fn from(client: SshRemoteClient) -> Self {
-        AnyProtoClient::new(client.client)
-    }
-}
-
-#[async_trait(?Send)]
-trait RemoteConnection: Send + Sync {
-    fn start_proxy(
-        &self,
-        unique_identifier: String,
-        reconnect: bool,
-        incoming_tx: UnboundedSender<Envelope>,
-        outgoing_rx: UnboundedReceiver<Envelope>,
-        connection_activity_tx: Sender<()>,
-        delegate: Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<i32>>;
-    fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>>;
-    async fn kill(&self) -> Result<()>;
-    fn has_been_killed(&self) -> bool;
-    /// On Windows, we need to use `SSH_ASKPASS` to provide the password to ssh.
-    /// On Linux, we use the `ControlPath` option to create a socket file that ssh can use to
-    fn ssh_args(&self) -> SshArgs;
-    fn connection_options(&self) -> SshConnectionOptions;
-    fn path_style(&self) -> PathStyle;
-    fn shell(&self) -> String;
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn simulate_disconnect(&self, _: &AsyncApp) {}
-}
-
-struct SshRemoteConnection {
-    socket: SshSocket,
-    master_process: Mutex<Option<Child>>,
-    remote_binary_path: Option<RemotePathBuf>,
-    ssh_platform: SshPlatform,
-    ssh_path_style: PathStyle,
-    ssh_shell: String,
-    _temp_dir: TempDir,
-}
-
-#[async_trait(?Send)]
-impl RemoteConnection for SshRemoteConnection {
-    async fn kill(&self) -> Result<()> {
-        let Some(mut process) = self.master_process.lock().take() else {
-            return Ok(());
-        };
-        process.kill().ok();
-        process.status().await?;
-        Ok(())
-    }
-
-    fn has_been_killed(&self) -> bool {
-        self.master_process.lock().is_none()
-    }
-
-    fn ssh_args(&self) -> SshArgs {
-        self.socket.ssh_args()
-    }
-
-    fn connection_options(&self) -> SshConnectionOptions {
-        self.socket.connection_options.clone()
-    }
-
-    fn shell(&self) -> String {
-        self.ssh_shell.clone()
-    }
-
-    fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let mut command = util::command::new_smol_command("scp");
-        let output = self
-            .socket
-            .ssh_options(&mut command)
-            .args(
-                self.socket
-                    .connection_options
-                    .port
-                    .map(|port| vec!["-P".to_string(), port.to_string()])
-                    .unwrap_or_default(),
-            )
-            .arg("-C")
-            .arg("-r")
-            .arg(&src_path)
-            .arg(format!(
-                "{}:{}",
-                self.socket.connection_options.scp_url(),
-                dest_path
-            ))
-            .output();
-
-        cx.background_spawn(async move {
-            let output = output.await?;
-
-            anyhow::ensure!(
-                output.status.success(),
-                "failed to upload directory {} -> {}: {}",
-                src_path.display(),
-                dest_path.to_string(),
-                String::from_utf8_lossy(&output.stderr)
-            );
-
-            Ok(())
-        })
-    }
-
-    fn start_proxy(
-        &self,
-        unique_identifier: String,
-        reconnect: bool,
-        incoming_tx: UnboundedSender<Envelope>,
-        outgoing_rx: UnboundedReceiver<Envelope>,
-        connection_activity_tx: Sender<()>,
-        delegate: Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<i32>> {
-        delegate.set_status(Some("Starting proxy"), cx);
-
-        let Some(remote_binary_path) = self.remote_binary_path.clone() else {
-            return Task::ready(Err(anyhow!("Remote binary path not set")));
-        };
-
-        let mut start_proxy_command = shell_script!(
-            "exec {binary_path} proxy --identifier {identifier}",
-            binary_path = &remote_binary_path.to_string(),
-            identifier = &unique_identifier,
-        );
-
-        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
-            if let Some(value) = std::env::var(env_var).ok() {
-                start_proxy_command = format!(
-                    "{}={} {} ",
-                    env_var,
-                    shlex::try_quote(&value).unwrap(),
-                    start_proxy_command,
-                );
-            }
-        }
-
-        if reconnect {
-            start_proxy_command.push_str(" --reconnect");
-        }
-
-        let ssh_proxy_process = match self
-            .socket
-            .ssh_command("sh", &["-lc", &start_proxy_command])
-            // IMPORTANT: we kill this process when we drop the task that uses it.
-            .kill_on_drop(true)
-            .spawn()
-        {
-            Ok(process) => process,
-            Err(error) => {
-                return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
-            }
-        };
-
-        Self::multiplex(
-            ssh_proxy_process,
-            incoming_tx,
-            outgoing_rx,
-            connection_activity_tx,
-            cx,
-        )
-    }
-
-    fn path_style(&self) -> PathStyle {
-        self.ssh_path_style
-    }
-}
-
-impl SshRemoteConnection {
-    async fn new(
-        connection_options: SshConnectionOptions,
-        delegate: Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        use askpass::AskPassResult;
-
-        delegate.set_status(Some("Connecting"), cx);
-
-        let url = connection_options.ssh_url();
-
-        let temp_dir = tempfile::Builder::new()
-            .prefix("zed-ssh-session")
-            .tempdir()?;
-        let askpass_delegate = askpass::AskPassDelegate::new(cx, {
-            let delegate = delegate.clone();
-            move |prompt, tx, cx| delegate.ask_password(prompt, tx, cx)
-        });
-
-        let mut askpass =
-            askpass::AskPassSession::new(cx.background_executor(), askpass_delegate).await?;
-
-        // Start the master SSH process, which does not do anything except for establish
-        // the connection and keep it open, allowing other ssh commands to reuse it
-        // via a control socket.
-        #[cfg(not(target_os = "windows"))]
-        let socket_path = temp_dir.path().join("ssh.sock");
-
-        let mut master_process = {
-            #[cfg(not(target_os = "windows"))]
-            let args = [
-                "-N",
-                "-o",
-                "ControlPersist=no",
-                "-o",
-                "ControlMaster=yes",
-                "-o",
-            ];
-            // On Windows, `ControlMaster` and `ControlPath` are not supported:
-            // https://github.com/PowerShell/Win32-OpenSSH/issues/405
-            // https://github.com/PowerShell/Win32-OpenSSH/wiki/Project-Scope
-            #[cfg(target_os = "windows")]
-            let args = ["-N"];
-            let mut master_process = util::command::new_smol_command("ssh");
-            master_process
-                .kill_on_drop(true)
-                .stdin(Stdio::null())
-                .stdout(Stdio::piped())
-                .stderr(Stdio::piped())
-                .env("SSH_ASKPASS_REQUIRE", "force")
-                .env("SSH_ASKPASS", askpass.script_path())
-                .args(connection_options.additional_args())
-                .args(args);
-            #[cfg(not(target_os = "windows"))]
-            master_process.arg(format!("ControlPath={}", socket_path.display()));
-            master_process.arg(&url).spawn()?
-        };
-        // Wait for this ssh process to close its stdout, indicating that authentication
-        // has completed.
-        let mut stdout = master_process.stdout.take().unwrap();
-        let mut output = Vec::new();
-
-        let result = select_biased! {
-            result = askpass.run().fuse() => {
-                match result {
-                    AskPassResult::CancelledByUser => {
-                        master_process.kill().ok();
-                        anyhow::bail!("SSH connection canceled")
-                    }
-                    AskPassResult::Timedout => {
-                        anyhow::bail!("connecting to host timed out")
-                    }
-                }
-            }
-            _ = stdout.read_to_end(&mut output).fuse() => {
-                anyhow::Ok(())
-            }
-        };
-
-        if let Err(e) = result {
-            return Err(e.context("Failed to connect to host"));
-        }
-
-        if master_process.try_status()?.is_some() {
-            output.clear();
-            let mut stderr = master_process.stderr.take().unwrap();
-            stderr.read_to_end(&mut output).await?;
-
-            let error_message = format!(
-                "failed to connect: {}",
-                String::from_utf8_lossy(&output).trim()
-            );
-            anyhow::bail!(error_message);
-        }
-
-        #[cfg(not(target_os = "windows"))]
-        let socket = SshSocket::new(connection_options, socket_path)?;
-        #[cfg(target_os = "windows")]
-        let socket = SshSocket::new(connection_options, &temp_dir, askpass.get_password())?;
-        drop(askpass);
-
-        let ssh_platform = socket.platform().await?;
-        let ssh_path_style = match ssh_platform.os {
-            "windows" => PathStyle::Windows,
-            _ => PathStyle::Posix,
-        };
-        let ssh_shell = socket.shell().await;
-
-        let mut this = Self {
-            socket,
-            master_process: Mutex::new(Some(master_process)),
-            _temp_dir: temp_dir,
-            remote_binary_path: None,
-            ssh_path_style,
-            ssh_platform,
-            ssh_shell,
-        };
-
-        let (release_channel, version, commit) = cx.update(|cx| {
-            (
-                ReleaseChannel::global(cx),
-                AppVersion::global(cx),
-                AppCommitSha::try_global(cx),
-            )
-        })?;
-        this.remote_binary_path = Some(
-            this.ensure_server_binary(&delegate, release_channel, version, commit, cx)
-                .await?,
-        );
-
-        Ok(this)
-    }
-
-    fn multiplex(
-        mut ssh_proxy_process: Child,
-        incoming_tx: UnboundedSender<Envelope>,
-        mut outgoing_rx: UnboundedReceiver<Envelope>,
-        mut connection_activity_tx: Sender<()>,
-        cx: &AsyncApp,
-    ) -> Task<Result<i32>> {
-        let mut child_stderr = ssh_proxy_process.stderr.take().unwrap();
-        let mut child_stdout = ssh_proxy_process.stdout.take().unwrap();
-        let mut child_stdin = ssh_proxy_process.stdin.take().unwrap();
-
-        let mut stdin_buffer = Vec::new();
-        let mut stdout_buffer = Vec::new();
-        let mut stderr_buffer = Vec::new();
-        let mut stderr_offset = 0;
-
-        let stdin_task = cx.background_spawn(async move {
-            while let Some(outgoing) = outgoing_rx.next().await {
-                write_message(&mut child_stdin, &mut stdin_buffer, outgoing).await?;
-            }
-            anyhow::Ok(())
-        });
-
-        let stdout_task = cx.background_spawn({
-            let mut connection_activity_tx = connection_activity_tx.clone();
-            async move {
-                loop {
-                    stdout_buffer.resize(MESSAGE_LEN_SIZE, 0);
-                    let len = child_stdout.read(&mut stdout_buffer).await?;
-
-                    if len == 0 {
-                        return anyhow::Ok(());
-                    }
-
-                    if len < MESSAGE_LEN_SIZE {
-                        child_stdout.read_exact(&mut stdout_buffer[len..]).await?;
-                    }
-
-                    let message_len = message_len_from_buffer(&stdout_buffer);
-                    let envelope =
-                        read_message_with_len(&mut child_stdout, &mut stdout_buffer, message_len)
-                            .await?;
-                    connection_activity_tx.try_send(()).ok();
-                    incoming_tx.unbounded_send(envelope).ok();
-                }
-            }
-        });
-
-        let stderr_task: Task<anyhow::Result<()>> = cx.background_spawn(async move {
-            loop {
-                stderr_buffer.resize(stderr_offset + 1024, 0);
-
-                let len = child_stderr
-                    .read(&mut stderr_buffer[stderr_offset..])
-                    .await?;
-                if len == 0 {
-                    return anyhow::Ok(());
-                }
-
-                stderr_offset += len;
-                let mut start_ix = 0;
-                while let Some(ix) = stderr_buffer[start_ix..stderr_offset]
-                    .iter()
-                    .position(|b| b == &b'\n')
-                {
-                    let line_ix = start_ix + ix;
-                    let content = &stderr_buffer[start_ix..line_ix];
-                    start_ix = line_ix + 1;
-                    if let Ok(record) = serde_json::from_slice::<LogRecord>(content) {
-                        record.log(log::logger())
-                    } else {
-                        eprintln!("(remote) {}", String::from_utf8_lossy(content));
-                    }
-                }
-                stderr_buffer.drain(0..start_ix);
-                stderr_offset -= start_ix;
-
-                connection_activity_tx.try_send(()).ok();
-            }
-        });
-
-        cx.background_spawn(async move {
-            let result = futures::select! {
-                result = stdin_task.fuse() => {
-                    result.context("stdin")
-                }
-                result = stdout_task.fuse() => {
-                    result.context("stdout")
-                }
-                result = stderr_task.fuse() => {
-                    result.context("stderr")
-                }
-            };
-
-            let status = ssh_proxy_process.status().await?.code().unwrap_or(1);
-            match result {
-                Ok(_) => Ok(status),
-                Err(error) => Err(error),
-            }
-        })
-    }
-
-    #[allow(unused)]
-    async fn ensure_server_binary(
-        &self,
-        delegate: &Arc<dyn SshClientDelegate>,
-        release_channel: ReleaseChannel,
-        version: SemanticVersion,
-        commit: Option<AppCommitSha>,
-        cx: &mut AsyncApp,
-    ) -> Result<RemotePathBuf> {
-        let version_str = match release_channel {
-            ReleaseChannel::Nightly => {
-                let commit = commit.map(|s| s.full()).unwrap_or_default();
-                format!("{}-{}", version, commit)
-            }
-            ReleaseChannel::Dev => "build".to_string(),
-            _ => version.to_string(),
-        };
-        let binary_name = format!(
-            "zed-remote-server-{}-{}",
-            release_channel.dev_name(),
-            version_str
-        );
-        let dst_path = RemotePathBuf::new(
-            paths::remote_server_dir_relative().join(binary_name),
-            self.ssh_path_style,
-        );
-
-        let build_remote_server = std::env::var("ZED_BUILD_REMOTE_SERVER").ok();
-        #[cfg(debug_assertions)]
-        if let Some(build_remote_server) = build_remote_server {
-            let src_path = self.build_local(build_remote_server, delegate, cx).await?;
-            let tmp_path = RemotePathBuf::new(
-                paths::remote_server_dir_relative().join(format!(
-                    "download-{}-{}",
-                    std::process::id(),
-                    src_path.file_name().unwrap().to_string_lossy()
-                )),
-                self.ssh_path_style,
-            );
-            self.upload_local_server_binary(&src_path, &tmp_path, delegate, cx)
-                .await?;
-            self.extract_server_binary(&dst_path, &tmp_path, delegate, cx)
-                .await?;
-            return Ok(dst_path);
-        }
-
-        if self
-            .socket
-            .run_command(&dst_path.to_string(), &["version"])
-            .await
-            .is_ok()
-        {
-            return Ok(dst_path);
-        }
-
-        let wanted_version = cx.update(|cx| match release_channel {
-            ReleaseChannel::Nightly => Ok(None),
-            ReleaseChannel::Dev => {
-                anyhow::bail!(
-                    "ZED_BUILD_REMOTE_SERVER is not set and no remote server exists at ({:?})",
-                    dst_path
-                )
-            }
-            _ => Ok(Some(AppVersion::global(cx))),
-        })??;
-
-        let tmp_path_gz = RemotePathBuf::new(
-            PathBuf::from(format!("{}-download-{}.gz", dst_path, std::process::id())),
-            self.ssh_path_style,
-        );
-        if !self.socket.connection_options.upload_binary_over_ssh
-            && let Some((url, body)) = delegate
-                .get_download_params(self.ssh_platform, release_channel, wanted_version, cx)
-                .await?
-        {
-            match self
-                .download_binary_on_server(&url, &body, &tmp_path_gz, delegate, cx)
-                .await
-            {
-                Ok(_) => {
-                    self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
-                        .await?;
-                    return Ok(dst_path);
-                }
-                Err(e) => {
-                    log::error!(
-                        "Failed to download binary on server, attempting to upload server: {}",
-                        e
-                    )
-                }
-            }
-        }
-
-        let src_path = delegate
-            .download_server_binary_locally(self.ssh_platform, release_channel, wanted_version, cx)
-            .await?;
-        self.upload_local_server_binary(&src_path, &tmp_path_gz, delegate, cx)
-            .await?;
-        self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
-            .await?;
-        Ok(dst_path)
-    }
-
-    async fn download_binary_on_server(
-        &self,
-        url: &str,
-        body: &str,
-        tmp_path_gz: &RemotePathBuf,
-        delegate: &Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        if let Some(parent) = tmp_path_gz.parent() {
-            self.socket
-                .run_command(
-                    "sh",
-                    &[
-                        "-lc",
-                        &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
-                    ],
-                )
-                .await?;
-        }
-
-        delegate.set_status(Some("Downloading remote development server on host"), cx);
-
-        match self
-            .socket
-            .run_command(
-                "curl",
-                &[
-                    "-f",
-                    "-L",
-                    "-X",
-                    "GET",
-                    "-H",
-                    "Content-Type: application/json",
-                    "-d",
-                    body,
-                    url,
-                    "-o",
-                    &tmp_path_gz.to_string(),
-                ],
-            )
-            .await
-        {
-            Ok(_) => {}
-            Err(e) => {
-                if self.socket.run_command("which", &["curl"]).await.is_ok() {
-                    return Err(e);
-                }
-
-                match self
-                    .socket
-                    .run_command(
-                        "wget",
-                        &[
-                            "--method=GET",
-                            "--header=Content-Type: application/json",
-                            "--body-data",
-                            body,
-                            url,
-                            "-O",
-                            &tmp_path_gz.to_string(),
-                        ],
-                    )
-                    .await
-                {
-                    Ok(_) => {}
-                    Err(e) => {
-                        if self.socket.run_command("which", &["wget"]).await.is_ok() {
-                            return Err(e);
-                        } else {
-                            anyhow::bail!("Neither curl nor wget is available");
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn upload_local_server_binary(
-        &self,
-        src_path: &Path,
-        tmp_path_gz: &RemotePathBuf,
-        delegate: &Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        if let Some(parent) = tmp_path_gz.parent() {
-            self.socket
-                .run_command(
-                    "sh",
-                    &[
-                        "-lc",
-                        &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
-                    ],
-                )
-                .await?;
-        }
-
-        let src_stat = fs::metadata(&src_path).await?;
-        let size = src_stat.len();
-
-        let t0 = Instant::now();
-        delegate.set_status(Some("Uploading remote development server"), cx);
-        log::info!(
-            "uploading remote development server to {:?} ({}kb)",
-            tmp_path_gz,
-            size / 1024
-        );
-        self.upload_file(src_path, tmp_path_gz)
-            .await
-            .context("failed to upload server binary")?;
-        log::info!("uploaded remote development server in {:?}", t0.elapsed());
-        Ok(())
-    }
-
-    async fn extract_server_binary(
-        &self,
-        dst_path: &RemotePathBuf,
-        tmp_path: &RemotePathBuf,
-        delegate: &Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        delegate.set_status(Some("Extracting remote development server"), cx);
-        let server_mode = 0o755;
-
-        let orig_tmp_path = tmp_path.to_string();
-        let script = if let Some(tmp_path) = orig_tmp_path.strip_suffix(".gz") {
-            shell_script!(
-                "gunzip -f {orig_tmp_path} && chmod {server_mode} {tmp_path} && mv {tmp_path} {dst_path}",
-                server_mode = &format!("{:o}", server_mode),
-                dst_path = &dst_path.to_string(),
-            )
-        } else {
-            shell_script!(
-                "chmod {server_mode} {orig_tmp_path} && mv {orig_tmp_path} {dst_path}",
-                server_mode = &format!("{:o}", server_mode),
-                dst_path = &dst_path.to_string()
-            )
-        };
-        self.socket.run_command("sh", &["-lc", &script]).await?;
-        Ok(())
-    }
-
-    async fn upload_file(&self, src_path: &Path, dest_path: &RemotePathBuf) -> Result<()> {
-        log::debug!("uploading file {:?} to {:?}", src_path, dest_path);
-        let mut command = util::command::new_smol_command("scp");
-        let output = self
-            .socket
-            .ssh_options(&mut command)
-            .args(
-                self.socket
-                    .connection_options
-                    .port
-                    .map(|port| vec!["-P".to_string(), port.to_string()])
-                    .unwrap_or_default(),
-            )
-            .arg(src_path)
-            .arg(format!(
-                "{}:{}",
-                self.socket.connection_options.scp_url(),
-                dest_path
-            ))
-            .output()
-            .await?;
-
-        anyhow::ensure!(
-            output.status.success(),
-            "failed to upload file {} -> {}: {}",
-            src_path.display(),
-            dest_path.to_string(),
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(())
-    }
-
-    #[cfg(debug_assertions)]
-    async fn build_local(
-        &self,
-        build_remote_server: String,
-        delegate: &Arc<dyn SshClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<PathBuf> {
-        use smol::process::{Command, Stdio};
-        use std::env::VarError;
-
-        async fn run_cmd(command: &mut Command) -> Result<()> {
-            let output = command
-                .kill_on_drop(true)
-                .stderr(Stdio::inherit())
-                .output()
-                .await?;
-            anyhow::ensure!(
-                output.status.success(),
-                "Failed to run command: {command:?}"
-            );
-            Ok(())
-        }
-
-        let use_musl = !build_remote_server.contains("nomusl");
-        let triple = format!(
-            "{}-{}",
-            self.ssh_platform.arch,
-            match self.ssh_platform.os {
-                "linux" =>
-                    if use_musl {
-                        "unknown-linux-musl"
-                    } else {
-                        "unknown-linux-gnu"
-                    },
-                "macos" => "apple-darwin",
-                _ => anyhow::bail!("can't cross compile for: {:?}", self.ssh_platform),
-            }
-        );
-        let mut rust_flags = match std::env::var("RUSTFLAGS") {
-            Ok(val) => val,
-            Err(VarError::NotPresent) => String::new(),
-            Err(e) => {
-                log::error!("Failed to get env var `RUSTFLAGS` value: {e}");
-                String::new()
-            }
-        };
-        if self.ssh_platform.os == "linux" && use_musl {
-            rust_flags.push_str(" -C target-feature=+crt-static");
-        }
-        if build_remote_server.contains("mold") {
-            rust_flags.push_str(" -C link-arg=-fuse-ld=mold");
-        }
-
-        if self.ssh_platform.arch == std::env::consts::ARCH
-            && self.ssh_platform.os == std::env::consts::OS
-        {
-            delegate.set_status(Some("Building remote server binary from source"), cx);
-            log::info!("building remote server binary from source");
-            run_cmd(
-                Command::new("cargo")
-                    .args([
-                        "build",
-                        "--package",
-                        "remote_server",
-                        "--features",
-                        "debug-embed",
-                        "--target-dir",
-                        "target/remote_server",
-                        "--target",
-                        &triple,
-                    ])
-                    .env("RUSTFLAGS", &rust_flags),
-            )
-            .await?;
-        } else if build_remote_server.contains("cross") {
-            #[cfg(target_os = "windows")]
-            use util::paths::SanitizedPath;
-
-            delegate.set_status(Some("Installing cross.rs for cross-compilation"), cx);
-            log::info!("installing cross");
-            run_cmd(Command::new("cargo").args([
-                "install",
-                "cross",
-                "--git",
-                "https://github.com/cross-rs/cross",
-            ]))
-            .await?;
-
-            delegate.set_status(
-                Some(&format!(
-                    "Building remote server binary from source for {} with Docker",
-                    &triple
-                )),
-                cx,
-            );
-            log::info!("building remote server binary from source for {}", &triple);
-
-            // On Windows, the binding needs to be set to the canonical path
-            #[cfg(target_os = "windows")]
-            let src =
-                SanitizedPath::from(smol::fs::canonicalize("./target").await?).to_glob_string();
-            #[cfg(not(target_os = "windows"))]
-            let src = "./target";
-            run_cmd(
-                Command::new("cross")
-                    .args([
-                        "build",
-                        "--package",
-                        "remote_server",
-                        "--features",
-                        "debug-embed",
-                        "--target-dir",
-                        "target/remote_server",
-                        "--target",
-                        &triple,
-                    ])
-                    .env(
-                        "CROSS_CONTAINER_OPTS",
-                        format!("--mount type=bind,src={src},dst=/app/target"),
-                    )
-                    .env("RUSTFLAGS", &rust_flags),
-            )
-            .await?;
-        } else {
-            let which = cx
-                .background_spawn(async move { which::which("zig") })
-                .await;
-
-            if which.is_err() {
-                #[cfg(not(target_os = "windows"))]
-                {
-                    anyhow::bail!(
-                        "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
-                    )
-                }
-                #[cfg(target_os = "windows")]
-                {
-                    anyhow::bail!(
-                        "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
-                    )
-                }
-            }
-
-            delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
-            log::info!("adding rustup target");
-            run_cmd(Command::new("rustup").args(["target", "add"]).arg(&triple)).await?;
-
-            delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
-            log::info!("installing cargo-zigbuild");
-            run_cmd(Command::new("cargo").args(["install", "--locked", "cargo-zigbuild"])).await?;
-
-            delegate.set_status(
-                Some(&format!(
-                    "Building remote binary from source for {triple} with Zig"
-                )),
-                cx,
-            );
-            log::info!("building remote binary from source for {triple} with Zig");
-            run_cmd(
-                Command::new("cargo")
-                    .args([
-                        "zigbuild",
-                        "--package",
-                        "remote_server",
-                        "--features",
-                        "debug-embed",
-                        "--target-dir",
-                        "target/remote_server",
-                        "--target",
-                        &triple,
-                    ])
-                    .env("RUSTFLAGS", &rust_flags),
-            )
-            .await?;
-        };
-        let bin_path = Path::new("target")
-            .join("remote_server")
-            .join(&triple)
-            .join("debug")
-            .join("remote_server");
-
-        let path = if !build_remote_server.contains("nocompress") {
-            delegate.set_status(Some("Compressing binary"), cx);
-
-            #[cfg(not(target_os = "windows"))]
-            {
-                run_cmd(Command::new("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
-            }
-            #[cfg(target_os = "windows")]
-            {
-                // On Windows, we use 7z to compress the binary
-                let seven_zip = which::which("7z.exe").context("7z.exe not found on $PATH, install it (e.g. with `winget install -e --id 7zip.7zip`) or, if you don't want this behaviour, set $env:ZED_BUILD_REMOTE_SERVER=\"nocompress\"")?;
-                let gz_path = format!("target/remote_server/{}/debug/remote_server.gz", triple);
-                if smol::fs::metadata(&gz_path).await.is_ok() {
-                    smol::fs::remove_file(&gz_path).await?;
-                }
-                run_cmd(Command::new(seven_zip).args([
-                    "a",
-                    "-tgzip",
-                    &gz_path,
-                    &bin_path.to_string_lossy(),
-                ]))
-                .await?;
-            }
-
-            let mut archive_path = bin_path;
-            archive_path.set_extension("gz");
-            std::env::current_dir()?.join(archive_path)
-        } else {
-            bin_path
-        };
-
-        Ok(path)
-    }
-}
-
-type ResponseChannels = Mutex<HashMap<MessageId, oneshot::Sender<(Envelope, oneshot::Sender<()>)>>>;
-
-struct ChannelClient {
-    next_message_id: AtomicU32,
-    outgoing_tx: Mutex<mpsc::UnboundedSender<Envelope>>,
-    buffer: Mutex<VecDeque<Envelope>>,
-    response_channels: ResponseChannels,
-    message_handlers: Mutex<ProtoMessageHandlerSet>,
-    max_received: AtomicU32,
-    name: &'static str,
-    task: Mutex<Task<Result<()>>>,
-}
-
-impl ChannelClient {
-    fn new(
-        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
-        outgoing_tx: mpsc::UnboundedSender<Envelope>,
-        cx: &App,
-        name: &'static str,
-    ) -> Arc<Self> {
-        Arc::new_cyclic(|this| Self {
-            outgoing_tx: Mutex::new(outgoing_tx),
-            next_message_id: AtomicU32::new(0),
-            max_received: AtomicU32::new(0),
-            response_channels: ResponseChannels::default(),
-            message_handlers: Default::default(),
-            buffer: Mutex::new(VecDeque::new()),
-            name,
-            task: Mutex::new(Self::start_handling_messages(
-                this.clone(),
-                incoming_rx,
-                &cx.to_async(),
-            )),
-        })
-    }
-
-    fn start_handling_messages(
-        this: Weak<Self>,
-        mut incoming_rx: mpsc::UnboundedReceiver<Envelope>,
-        cx: &AsyncApp,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |cx| {
-            let peer_id = PeerId { owner_id: 0, id: 0 };
-            while let Some(incoming) = incoming_rx.next().await {
-                let Some(this) = this.upgrade() else {
-                    return anyhow::Ok(());
-                };
-                if let Some(ack_id) = incoming.ack_id {
-                    let mut buffer = this.buffer.lock();
-                    while buffer.front().is_some_and(|msg| msg.id <= ack_id) {
-                        buffer.pop_front();
-                    }
-                }
-                if let Some(proto::envelope::Payload::FlushBufferedMessages(_)) = &incoming.payload
-                {
-                    log::debug!(
-                        "{}:ssh message received. name:FlushBufferedMessages",
-                        this.name
-                    );
-                    {
-                        let buffer = this.buffer.lock();
-                        for envelope in buffer.iter() {
-                            this.outgoing_tx
-                                .lock()
-                                .unbounded_send(envelope.clone())
-                                .ok();
-                        }
-                    }
-                    let mut envelope = proto::Ack {}.into_envelope(0, Some(incoming.id), None);
-                    envelope.id = this.next_message_id.fetch_add(1, SeqCst);
-                    this.outgoing_tx.lock().unbounded_send(envelope).ok();
-                    continue;
-                }
-
-                this.max_received.store(incoming.id, SeqCst);
-
-                if let Some(request_id) = incoming.responding_to {
-                    let request_id = MessageId(request_id);
-                    let sender = this.response_channels.lock().remove(&request_id);
-                    if let Some(sender) = sender {
-                        let (tx, rx) = oneshot::channel();
-                        if incoming.payload.is_some() {
-                            sender.send((incoming, tx)).ok();
-                        }
-                        rx.await.ok();
-                    }
-                } else if let Some(envelope) =
-                    build_typed_envelope(peer_id, Instant::now(), incoming)
-                {
-                    let type_name = envelope.payload_type_name();
-                    let message_id = envelope.message_id();
-                    if let Some(future) = ProtoMessageHandlerSet::handle_message(
-                        &this.message_handlers,
-                        envelope,
-                        this.clone().into(),
-                        cx.clone(),
-                    ) {
-                        log::debug!("{}:ssh message received. name:{type_name}", this.name);
-                        cx.foreground_executor()
-                            .spawn(async move {
-                                match future.await {
-                                    Ok(_) => {
-                                        log::debug!(
-                                            "{}:ssh message handled. name:{type_name}",
-                                            this.name
-                                        );
-                                    }
-                                    Err(error) => {
-                                        log::error!(
-                                            "{}:error handling message. type:{}, error:{}",
-                                            this.name,
-                                            type_name,
-                                            format!("{error:#}").lines().fold(
-                                                String::new(),
-                                                |mut message, line| {
-                                                    if !message.is_empty() {
-                                                        message.push(' ');
-                                                    }
-                                                    message.push_str(line);
-                                                    message
-                                                }
-                                            )
-                                        );
-                                    }
-                                }
-                            })
-                            .detach()
-                    } else {
-                        log::error!("{}:unhandled ssh message name:{type_name}", this.name);
-                        if let Err(e) = AnyProtoClient::from(this.clone()).send_response(
-                            message_id,
-                            anyhow::anyhow!("no handler registered for {type_name}").to_proto(),
-                        ) {
-                            log::error!(
-                                "{}:error sending error response for {type_name}:{e:#}",
-                                this.name
-                            );
-                        }
-                    }
-                }
-            }
-            anyhow::Ok(())
-        })
-    }
-
-    fn reconnect(
-        self: &Arc<Self>,
-        incoming_rx: UnboundedReceiver<Envelope>,
-        outgoing_tx: UnboundedSender<Envelope>,
-        cx: &AsyncApp,
-    ) {
-        *self.outgoing_tx.lock() = outgoing_tx;
-        *self.task.lock() = Self::start_handling_messages(Arc::downgrade(self), incoming_rx, cx);
-    }
-
-    fn request<T: RequestMessage>(
-        &self,
-        payload: T,
-    ) -> impl 'static + Future<Output = Result<T::Response>> {
-        self.request_internal(payload, true)
-    }
-
-    fn request_internal<T: RequestMessage>(
-        &self,
-        payload: T,
-        use_buffer: bool,
-    ) -> impl 'static + Future<Output = Result<T::Response>> {
-        log::debug!("ssh request start. name:{}", T::NAME);
-        let response =
-            self.request_dynamic(payload.into_envelope(0, None, None), T::NAME, use_buffer);
-        async move {
-            let response = response.await?;
-            log::debug!("ssh request finish. name:{}", T::NAME);
-            T::Response::from_envelope(response).context("received a response of the wrong type")
-        }
-    }
-
-    async fn resync(&self, timeout: Duration) -> Result<()> {
-        smol::future::or(
-            async {
-                self.request_internal(proto::FlushBufferedMessages {}, false)
-                    .await?;
-
-                for envelope in self.buffer.lock().iter() {
-                    self.outgoing_tx
-                        .lock()
-                        .unbounded_send(envelope.clone())
-                        .ok();
-                }
-                Ok(())
-            },
-            async {
-                smol::Timer::after(timeout).await;
-                anyhow::bail!("Timed out resyncing remote client")
-            },
-        )
-        .await
-    }
-
-    async fn ping(&self, timeout: Duration) -> Result<()> {
-        smol::future::or(
-            async {
-                self.request(proto::Ping {}).await?;
-                Ok(())
-            },
-            async {
-                smol::Timer::after(timeout).await;
-                anyhow::bail!("Timed out pinging remote client")
-            },
-        )
-        .await
-    }
-
-    pub fn send<T: EnvelopedMessage>(&self, payload: T) -> Result<()> {
-        log::debug!("ssh send name:{}", T::NAME);
-        self.send_dynamic(payload.into_envelope(0, None, None))
-    }
-
-    fn request_dynamic(
-        &self,
-        mut envelope: proto::Envelope,
-        type_name: &'static str,
-        use_buffer: bool,
-    ) -> impl 'static + Future<Output = Result<proto::Envelope>> {
-        envelope.id = self.next_message_id.fetch_add(1, SeqCst);
-        let (tx, rx) = oneshot::channel();
-        let mut response_channels_lock = self.response_channels.lock();
-        response_channels_lock.insert(MessageId(envelope.id), tx);
-        drop(response_channels_lock);
-
-        let result = if use_buffer {
-            self.send_buffered(envelope)
-        } else {
-            self.send_unbuffered(envelope)
-        };
-        async move {
-            if let Err(error) = &result {
-                log::error!("failed to send message: {error}");
-                anyhow::bail!("failed to send message: {error}");
-            }
-
-            let response = rx.await.context("connection lost")?.0;
-            if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
-                return Err(RpcError::from_proto(error, type_name));
-            }
-            Ok(response)
-        }
-    }
-
-    pub fn send_dynamic(&self, mut envelope: proto::Envelope) -> Result<()> {
-        envelope.id = self.next_message_id.fetch_add(1, SeqCst);
-        self.send_buffered(envelope)
-    }
-
-    fn send_buffered(&self, mut envelope: proto::Envelope) -> Result<()> {
-        envelope.ack_id = Some(self.max_received.load(SeqCst));
-        self.buffer.lock().push_back(envelope.clone());
-        // ignore errors on send (happen while we're reconnecting)
-        // assume that the global "disconnected" overlay is sufficient.
-        self.outgoing_tx.lock().unbounded_send(envelope).ok();
-        Ok(())
-    }
-
-    fn send_unbuffered(&self, mut envelope: proto::Envelope) -> Result<()> {
-        envelope.ack_id = Some(self.max_received.load(SeqCst));
-        self.outgoing_tx.lock().unbounded_send(envelope).ok();
-        Ok(())
-    }
-}
-
-impl ProtoClient for ChannelClient {
-    fn request(
-        &self,
-        envelope: proto::Envelope,
-        request_type: &'static str,
-    ) -> BoxFuture<'static, Result<proto::Envelope>> {
-        self.request_dynamic(envelope, request_type, true).boxed()
-    }
-
-    fn send(&self, envelope: proto::Envelope, _message_type: &'static str) -> Result<()> {
-        self.send_dynamic(envelope)
-    }
-
-    fn send_response(&self, envelope: Envelope, _message_type: &'static str) -> anyhow::Result<()> {
-        self.send_dynamic(envelope)
-    }
-
-    fn message_handler_set(&self) -> &Mutex<ProtoMessageHandlerSet> {
-        &self.message_handlers
-    }
-
-    fn is_via_collab(&self) -> bool {
-        false
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-mod fake {
-    use std::{path::PathBuf, sync::Arc};
-
-    use anyhow::Result;
-    use async_trait::async_trait;
-    use futures::{
-        FutureExt, SinkExt, StreamExt,
-        channel::{
-            mpsc::{self, Sender},
-            oneshot,
-        },
-        select_biased,
-    };
-    use gpui::{App, AppContext as _, AsyncApp, SemanticVersion, Task, TestAppContext};
-    use release_channel::ReleaseChannel;
-    use rpc::proto::Envelope;
-    use util::paths::{PathStyle, RemotePathBuf};
-
-    use super::{
-        ChannelClient, RemoteConnection, SshArgs, SshClientDelegate, SshConnectionOptions,
-        SshPlatform,
-    };
-
-    pub(super) struct FakeRemoteConnection {
-        pub(super) connection_options: SshConnectionOptions,
-        pub(super) server_channel: Arc<ChannelClient>,
-        pub(super) server_cx: SendableCx,
-    }
-
-    pub(super) struct SendableCx(AsyncApp);
-    impl SendableCx {
-        // SAFETY: When run in test mode, GPUI is always single threaded.
-        pub(super) fn new(cx: &TestAppContext) -> Self {
-            Self(cx.to_async())
-        }
-
-        // SAFETY: Enforce that we're on the main thread by requiring a valid AsyncApp
-        fn get(&self, _: &AsyncApp) -> AsyncApp {
-            self.0.clone()
-        }
-    }
-
-    // SAFETY: There is no way to access a SendableCx from a different thread, see [`SendableCx::new`] and [`SendableCx::get`]
-    unsafe impl Send for SendableCx {}
-    unsafe impl Sync for SendableCx {}
-
-    #[async_trait(?Send)]
-    impl RemoteConnection for FakeRemoteConnection {
-        async fn kill(&self) -> Result<()> {
-            Ok(())
-        }
-
-        fn has_been_killed(&self) -> bool {
-            false
-        }
-
-        fn ssh_args(&self) -> SshArgs {
-            SshArgs {
-                arguments: Vec::new(),
-                envs: None,
-            }
-        }
-
-        fn upload_directory(
-            &self,
-            _src_path: PathBuf,
-            _dest_path: RemotePathBuf,
-            _cx: &App,
-        ) -> Task<Result<()>> {
-            unreachable!()
-        }
-
-        fn connection_options(&self) -> SshConnectionOptions {
-            self.connection_options.clone()
-        }
-
-        fn simulate_disconnect(&self, cx: &AsyncApp) {
-            let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
-            let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
-            self.server_channel
-                .reconnect(incoming_rx, outgoing_tx, &self.server_cx.get(cx));
-        }
-
-        fn start_proxy(
-            &self,
-            _unique_identifier: String,
-            _reconnect: bool,
-            mut client_incoming_tx: mpsc::UnboundedSender<Envelope>,
-            mut client_outgoing_rx: mpsc::UnboundedReceiver<Envelope>,
-            mut connection_activity_tx: Sender<()>,
-            _delegate: Arc<dyn SshClientDelegate>,
-            cx: &mut AsyncApp,
-        ) -> Task<Result<i32>> {
-            let (mut server_incoming_tx, server_incoming_rx) = mpsc::unbounded::<Envelope>();
-            let (server_outgoing_tx, mut server_outgoing_rx) = mpsc::unbounded::<Envelope>();
-
-            self.server_channel.reconnect(
-                server_incoming_rx,
-                server_outgoing_tx,
-                &self.server_cx.get(cx),
-            );
-
-            cx.background_spawn(async move {
-                loop {
-                    select_biased! {
-                        server_to_client = server_outgoing_rx.next().fuse() => {
-                            let Some(server_to_client) = server_to_client else {
-                                return Ok(1)
-                            };
-                            connection_activity_tx.try_send(()).ok();
-                            client_incoming_tx.send(server_to_client).await.ok();
-                        }
-                        client_to_server = client_outgoing_rx.next().fuse() => {
-                            let Some(client_to_server) = client_to_server else {
-                                return Ok(1)
-                            };
-                            server_incoming_tx.send(client_to_server).await.ok();
-                        }
-                    }
-                }
-            })
-        }
-
-        fn path_style(&self) -> PathStyle {
-            PathStyle::current()
-        }
-
-        fn shell(&self) -> String {
-            "sh".to_owned()
-        }
-    }
-
-    pub(super) struct Delegate;
-
-    impl SshClientDelegate for Delegate {
-        fn ask_password(&self, _: String, _: oneshot::Sender<String>, _: &mut AsyncApp) {
-            unreachable!()
-        }
-
-        fn download_server_binary_locally(
-            &self,
-            _: SshPlatform,
-            _: ReleaseChannel,
-            _: Option<SemanticVersion>,
-            _: &mut AsyncApp,
-        ) -> Task<Result<PathBuf>> {
-            unreachable!()
-        }
-
-        fn get_download_params(
-            &self,
-            _platform: SshPlatform,
-            _release_channel: ReleaseChannel,
-            _version: Option<SemanticVersion>,
-            _cx: &mut AsyncApp,
-        ) -> Task<Result<Option<(String, String)>>> {
-            unreachable!()
-        }
-
-        fn set_status(&self, _: Option<&str>, _: &mut AsyncApp) {}
-    }
-}
diff --git a/crates/remote/src/transport.rs b/crates/remote/src/transport.rs
new file mode 100644
index 0000000000..aa086fd3f5
--- /dev/null
+++ b/crates/remote/src/transport.rs
@@ -0,0 +1 @@
+pub mod ssh;
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
new file mode 100644
index 0000000000..193b964973
--- /dev/null
+++ b/crates/remote/src/transport/ssh.rs
@@ -0,0 +1,1358 @@
+use crate::{
+    RemoteClientDelegate, RemotePlatform,
+    json_log::LogRecord,
+    protocol::{MESSAGE_LEN_SIZE, message_len_from_buffer, read_message_with_len, write_message},
+    remote_client::{CommandTemplate, RemoteConnection},
+};
+use anyhow::{Context as _, Result, anyhow};
+use async_trait::async_trait;
+use collections::HashMap;
+use futures::{
+    AsyncReadExt as _, FutureExt as _, StreamExt as _,
+    channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender},
+    select_biased,
+};
+use gpui::{App, AppContext as _, AsyncApp, SemanticVersion, Task};
+use itertools::Itertools;
+use parking_lot::Mutex;
+use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
+use rpc::proto::Envelope;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use smol::{
+    fs,
+    process::{self, Child, Stdio},
+};
+use std::{
+    iter,
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::Instant,
+};
+use tempfile::TempDir;
+use util::paths::{PathStyle, RemotePathBuf};
+
+pub(crate) struct SshRemoteConnection {
+    socket: SshSocket,
+    master_process: Mutex<Option<Child>>,
+    remote_binary_path: Option<RemotePathBuf>,
+    ssh_platform: RemotePlatform,
+    ssh_path_style: PathStyle,
+    ssh_shell: String,
+    _temp_dir: TempDir,
+}
+
+#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
+pub struct SshConnectionOptions {
+    pub host: String,
+    pub username: Option<String>,
+    pub port: Option<u16>,
+    pub password: Option<String>,
+    pub args: Option<Vec<String>>,
+    pub port_forwards: Option<Vec<SshPortForwardOption>>,
+
+    pub nickname: Option<String>,
+    pub upload_binary_over_ssh: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize, JsonSchema)]
+pub struct SshPortForwardOption {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub local_host: Option<String>,
+    pub local_port: u16,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_host: Option<String>,
+    pub remote_port: u16,
+}
+
+#[derive(Clone)]
+struct SshSocket {
+    connection_options: SshConnectionOptions,
+    #[cfg(not(target_os = "windows"))]
+    socket_path: PathBuf,
+    envs: HashMap<String, String>,
+}
+
+macro_rules! shell_script {
+    ($fmt:expr, $($name:ident = $arg:expr),+ $(,)?) => {{
+        format!(
+            $fmt,
+            $(
+                $name = shlex::try_quote($arg).unwrap()
+            ),+
+        )
+    }};
+}
+
+#[async_trait(?Send)]
+impl RemoteConnection for SshRemoteConnection {
+    async fn kill(&self) -> Result<()> {
+        let Some(mut process) = self.master_process.lock().take() else {
+            return Ok(());
+        };
+        process.kill().ok();
+        process.status().await?;
+        Ok(())
+    }
+
+    fn has_been_killed(&self) -> bool {
+        self.master_process.lock().is_none()
+    }
+
+    fn connection_options(&self) -> SshConnectionOptions {
+        self.socket.connection_options.clone()
+    }
+
+    fn shell(&self) -> String {
+        self.ssh_shell.clone()
+    }
+
+    fn build_command(
+        &self,
+        input_program: Option<String>,
+        input_args: &[String],
+        input_env: &HashMap<String, String>,
+        working_dir: Option<String>,
+        port_forward: Option<(u16, String, u16)>,
+    ) -> Result<CommandTemplate> {
+        use std::fmt::Write as _;
+
+        let mut script = String::new();
+        if let Some(working_dir) = working_dir {
+            let working_dir =
+                RemotePathBuf::new(working_dir.into(), self.ssh_path_style).to_string();
+
+            // shlex will wrap the command in single quotes (''), disabling ~ expansion,
+            // replace ith with something that works
+            const TILDE_PREFIX: &'static str = "~/";
+            if working_dir.starts_with(TILDE_PREFIX) {
+                let working_dir = working_dir.trim_start_matches("~").trim_start_matches("/");
+                write!(&mut script, "cd \"$HOME/{working_dir}\"; ").unwrap();
+            } else {
+                write!(&mut script, "cd \"{working_dir}\"; ").unwrap();
+            }
+        } else {
+            write!(&mut script, "cd; ").unwrap();
+        };
+
+        for (k, v) in input_env.iter() {
+            if let Some((k, v)) = shlex::try_quote(k).ok().zip(shlex::try_quote(v).ok()) {
+                write!(&mut script, "{}={} ", k, v).unwrap();
+            }
+        }
+
+        let shell = &self.ssh_shell;
+
+        if let Some(input_program) = input_program {
+            let command = shlex::try_quote(&input_program)?;
+            script.push_str(&command);
+            for arg in input_args {
+                let arg = shlex::try_quote(&arg)?;
+                script.push_str(" ");
+                script.push_str(&arg);
+            }
+        } else {
+            write!(&mut script, "exec {shell} -l").unwrap();
+        };
+
+        let shell_invocation = format!("{shell} -c {}", shlex::try_quote(&script).unwrap());
+
+        let mut args = Vec::new();
+        args.extend(self.socket.ssh_args());
+
+        if let Some((local_port, host, remote_port)) = port_forward {
+            args.push("-L".into());
+            args.push(format!("{local_port}:{host}:{remote_port}"));
+        }
+
+        args.push("-t".into());
+        args.push(shell_invocation);
+
+        Ok(CommandTemplate {
+            program: "ssh".into(),
+            args,
+            env: self.socket.envs.clone(),
+        })
+    }
+
+    fn upload_directory(
+        &self,
+        src_path: PathBuf,
+        dest_path: RemotePathBuf,
+        cx: &App,
+    ) -> Task<Result<()>> {
+        let mut command = util::command::new_smol_command("scp");
+        let output = self
+            .socket
+            .ssh_options(&mut command)
+            .args(
+                self.socket
+                    .connection_options
+                    .port
+                    .map(|port| vec!["-P".to_string(), port.to_string()])
+                    .unwrap_or_default(),
+            )
+            .arg("-C")
+            .arg("-r")
+            .arg(&src_path)
+            .arg(format!(
+                "{}:{}",
+                self.socket.connection_options.scp_url(),
+                dest_path
+            ))
+            .output();
+
+        cx.background_spawn(async move {
+            let output = output.await?;
+
+            anyhow::ensure!(
+                output.status.success(),
+                "failed to upload directory {} -> {}: {}",
+                src_path.display(),
+                dest_path.to_string(),
+                String::from_utf8_lossy(&output.stderr)
+            );
+
+            Ok(())
+        })
+    }
+
+    fn start_proxy(
+        &self,
+        unique_identifier: String,
+        reconnect: bool,
+        incoming_tx: UnboundedSender<Envelope>,
+        outgoing_rx: UnboundedReceiver<Envelope>,
+        connection_activity_tx: Sender<()>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<i32>> {
+        delegate.set_status(Some("Starting proxy"), cx);
+
+        let Some(remote_binary_path) = self.remote_binary_path.clone() else {
+            return Task::ready(Err(anyhow!("Remote binary path not set")));
+        };
+
+        let mut start_proxy_command = shell_script!(
+            "exec {binary_path} proxy --identifier {identifier}",
+            binary_path = &remote_binary_path.to_string(),
+            identifier = &unique_identifier,
+        );
+
+        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
+            if let Some(value) = std::env::var(env_var).ok() {
+                start_proxy_command = format!(
+                    "{}={} {} ",
+                    env_var,
+                    shlex::try_quote(&value).unwrap(),
+                    start_proxy_command,
+                );
+            }
+        }
+
+        if reconnect {
+            start_proxy_command.push_str(" --reconnect");
+        }
+
+        let ssh_proxy_process = match self
+            .socket
+            .ssh_command("sh", &["-lc", &start_proxy_command])
+            // IMPORTANT: we kill this process when we drop the task that uses it.
+            .kill_on_drop(true)
+            .spawn()
+        {
+            Ok(process) => process,
+            Err(error) => {
+                return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
+            }
+        };
+
+        Self::multiplex(
+            ssh_proxy_process,
+            incoming_tx,
+            outgoing_rx,
+            connection_activity_tx,
+            cx,
+        )
+    }
+
+    fn path_style(&self) -> PathStyle {
+        self.ssh_path_style
+    }
+}
+
+impl SshRemoteConnection {
+    pub(crate) async fn new(
+        connection_options: SshConnectionOptions,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<Self> {
+        use askpass::AskPassResult;
+
+        delegate.set_status(Some("Connecting"), cx);
+
+        let url = connection_options.ssh_url();
+
+        let temp_dir = tempfile::Builder::new()
+            .prefix("zed-ssh-session")
+            .tempdir()?;
+        let askpass_delegate = askpass::AskPassDelegate::new(cx, {
+            let delegate = delegate.clone();
+            move |prompt, tx, cx| delegate.ask_password(prompt, tx, cx)
+        });
+
+        let mut askpass =
+            askpass::AskPassSession::new(cx.background_executor(), askpass_delegate).await?;
+
+        // Start the master SSH process, which does not do anything except for establish
+        // the connection and keep it open, allowing other ssh commands to reuse it
+        // via a control socket.
+        #[cfg(not(target_os = "windows"))]
+        let socket_path = temp_dir.path().join("ssh.sock");
+
+        let mut master_process = {
+            #[cfg(not(target_os = "windows"))]
+            let args = [
+                "-N",
+                "-o",
+                "ControlPersist=no",
+                "-o",
+                "ControlMaster=yes",
+                "-o",
+            ];
+            // On Windows, `ControlMaster` and `ControlPath` are not supported:
+            // https://github.com/PowerShell/Win32-OpenSSH/issues/405
+            // https://github.com/PowerShell/Win32-OpenSSH/wiki/Project-Scope
+            #[cfg(target_os = "windows")]
+            let args = ["-N"];
+            let mut master_process = util::command::new_smol_command("ssh");
+            master_process
+                .kill_on_drop(true)
+                .stdin(Stdio::null())
+                .stdout(Stdio::piped())
+                .stderr(Stdio::piped())
+                .env("SSH_ASKPASS_REQUIRE", "force")
+                .env("SSH_ASKPASS", askpass.script_path())
+                .args(connection_options.additional_args())
+                .args(args);
+            #[cfg(not(target_os = "windows"))]
+            master_process.arg(format!("ControlPath={}", socket_path.display()));
+            master_process.arg(&url).spawn()?
+        };
+        // Wait for this ssh process to close its stdout, indicating that authentication
+        // has completed.
+        let mut stdout = master_process.stdout.take().unwrap();
+        let mut output = Vec::new();
+
+        let result = select_biased! {
+            result = askpass.run().fuse() => {
+                match result {
+                    AskPassResult::CancelledByUser => {
+                        master_process.kill().ok();
+                        anyhow::bail!("SSH connection canceled")
+                    }
+                    AskPassResult::Timedout => {
+                        anyhow::bail!("connecting to host timed out")
+                    }
+                }
+            }
+            _ = stdout.read_to_end(&mut output).fuse() => {
+                anyhow::Ok(())
+            }
+        };
+
+        if let Err(e) = result {
+            return Err(e.context("Failed to connect to host"));
+        }
+
+        if master_process.try_status()?.is_some() {
+            output.clear();
+            let mut stderr = master_process.stderr.take().unwrap();
+            stderr.read_to_end(&mut output).await?;
+
+            let error_message = format!(
+                "failed to connect: {}",
+                String::from_utf8_lossy(&output).trim()
+            );
+            anyhow::bail!(error_message);
+        }
+
+        #[cfg(not(target_os = "windows"))]
+        let socket = SshSocket::new(connection_options, socket_path)?;
+        #[cfg(target_os = "windows")]
+        let socket = SshSocket::new(connection_options, &temp_dir, askpass.get_password())?;
+        drop(askpass);
+
+        let ssh_platform = socket.platform().await?;
+        let ssh_path_style = match ssh_platform.os {
+            "windows" => PathStyle::Windows,
+            _ => PathStyle::Posix,
+        };
+        let ssh_shell = socket.shell().await;
+
+        let mut this = Self {
+            socket,
+            master_process: Mutex::new(Some(master_process)),
+            _temp_dir: temp_dir,
+            remote_binary_path: None,
+            ssh_path_style,
+            ssh_platform,
+            ssh_shell,
+        };
+
+        let (release_channel, version, commit) = cx.update(|cx| {
+            (
+                ReleaseChannel::global(cx),
+                AppVersion::global(cx),
+                AppCommitSha::try_global(cx),
+            )
+        })?;
+        this.remote_binary_path = Some(
+            this.ensure_server_binary(&delegate, release_channel, version, commit, cx)
+                .await?,
+        );
+
+        Ok(this)
+    }
+
+    fn multiplex(
+        mut ssh_proxy_process: Child,
+        incoming_tx: UnboundedSender<Envelope>,
+        mut outgoing_rx: UnboundedReceiver<Envelope>,
+        mut connection_activity_tx: Sender<()>,
+        cx: &AsyncApp,
+    ) -> Task<Result<i32>> {
+        let mut child_stderr = ssh_proxy_process.stderr.take().unwrap();
+        let mut child_stdout = ssh_proxy_process.stdout.take().unwrap();
+        let mut child_stdin = ssh_proxy_process.stdin.take().unwrap();
+
+        let mut stdin_buffer = Vec::new();
+        let mut stdout_buffer = Vec::new();
+        let mut stderr_buffer = Vec::new();
+        let mut stderr_offset = 0;
+
+        let stdin_task = cx.background_spawn(async move {
+            while let Some(outgoing) = outgoing_rx.next().await {
+                write_message(&mut child_stdin, &mut stdin_buffer, outgoing).await?;
+            }
+            anyhow::Ok(())
+        });
+
+        let stdout_task = cx.background_spawn({
+            let mut connection_activity_tx = connection_activity_tx.clone();
+            async move {
+                loop {
+                    stdout_buffer.resize(MESSAGE_LEN_SIZE, 0);
+                    let len = child_stdout.read(&mut stdout_buffer).await?;
+
+                    if len == 0 {
+                        return anyhow::Ok(());
+                    }
+
+                    if len < MESSAGE_LEN_SIZE {
+                        child_stdout.read_exact(&mut stdout_buffer[len..]).await?;
+                    }
+
+                    let message_len = message_len_from_buffer(&stdout_buffer);
+                    let envelope =
+                        read_message_with_len(&mut child_stdout, &mut stdout_buffer, message_len)
+                            .await?;
+                    connection_activity_tx.try_send(()).ok();
+                    incoming_tx.unbounded_send(envelope).ok();
+                }
+            }
+        });
+
+        let stderr_task: Task<anyhow::Result<()>> = cx.background_spawn(async move {
+            loop {
+                stderr_buffer.resize(stderr_offset + 1024, 0);
+
+                let len = child_stderr
+                    .read(&mut stderr_buffer[stderr_offset..])
+                    .await?;
+                if len == 0 {
+                    return anyhow::Ok(());
+                }
+
+                stderr_offset += len;
+                let mut start_ix = 0;
+                while let Some(ix) = stderr_buffer[start_ix..stderr_offset]
+                    .iter()
+                    .position(|b| b == &b'\n')
+                {
+                    let line_ix = start_ix + ix;
+                    let content = &stderr_buffer[start_ix..line_ix];
+                    start_ix = line_ix + 1;
+                    if let Ok(record) = serde_json::from_slice::<LogRecord>(content) {
+                        record.log(log::logger())
+                    } else {
+                        eprintln!("(remote) {}", String::from_utf8_lossy(content));
+                    }
+                }
+                stderr_buffer.drain(0..start_ix);
+                stderr_offset -= start_ix;
+
+                connection_activity_tx.try_send(()).ok();
+            }
+        });
+
+        cx.background_spawn(async move {
+            let result = futures::select! {
+                result = stdin_task.fuse() => {
+                    result.context("stdin")
+                }
+                result = stdout_task.fuse() => {
+                    result.context("stdout")
+                }
+                result = stderr_task.fuse() => {
+                    result.context("stderr")
+                }
+            };
+
+            let status = ssh_proxy_process.status().await?.code().unwrap_or(1);
+            match result {
+                Ok(_) => Ok(status),
+                Err(error) => Err(error),
+            }
+        })
+    }
+
+    #[allow(unused)]
+    async fn ensure_server_binary(
+        &self,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        release_channel: ReleaseChannel,
+        version: SemanticVersion,
+        commit: Option<AppCommitSha>,
+        cx: &mut AsyncApp,
+    ) -> Result<RemotePathBuf> {
+        let version_str = match release_channel {
+            ReleaseChannel::Nightly => {
+                let commit = commit.map(|s| s.full()).unwrap_or_default();
+                format!("{}-{}", version, commit)
+            }
+            ReleaseChannel::Dev => "build".to_string(),
+            _ => version.to_string(),
+        };
+        let binary_name = format!(
+            "zed-remote-server-{}-{}",
+            release_channel.dev_name(),
+            version_str
+        );
+        let dst_path = RemotePathBuf::new(
+            paths::remote_server_dir_relative().join(binary_name),
+            self.ssh_path_style,
+        );
+
+        let build_remote_server = std::env::var("ZED_BUILD_REMOTE_SERVER").ok();
+        #[cfg(debug_assertions)]
+        if let Some(build_remote_server) = build_remote_server {
+            let src_path = self.build_local(build_remote_server, delegate, cx).await?;
+            let tmp_path = RemotePathBuf::new(
+                paths::remote_server_dir_relative().join(format!(
+                    "download-{}-{}",
+                    std::process::id(),
+                    src_path.file_name().unwrap().to_string_lossy()
+                )),
+                self.ssh_path_style,
+            );
+            self.upload_local_server_binary(&src_path, &tmp_path, delegate, cx)
+                .await?;
+            self.extract_server_binary(&dst_path, &tmp_path, delegate, cx)
+                .await?;
+            return Ok(dst_path);
+        }
+
+        if self
+            .socket
+            .run_command(&dst_path.to_string(), &["version"])
+            .await
+            .is_ok()
+        {
+            return Ok(dst_path);
+        }
+
+        let wanted_version = cx.update(|cx| match release_channel {
+            ReleaseChannel::Nightly => Ok(None),
+            ReleaseChannel::Dev => {
+                anyhow::bail!(
+                    "ZED_BUILD_REMOTE_SERVER is not set and no remote server exists at ({:?})",
+                    dst_path
+                )
+            }
+            _ => Ok(Some(AppVersion::global(cx))),
+        })??;
+
+        let tmp_path_gz = RemotePathBuf::new(
+            PathBuf::from(format!("{}-download-{}.gz", dst_path, std::process::id())),
+            self.ssh_path_style,
+        );
+        if !self.socket.connection_options.upload_binary_over_ssh
+            && let Some((url, body)) = delegate
+                .get_download_params(self.ssh_platform, release_channel, wanted_version, cx)
+                .await?
+        {
+            match self
+                .download_binary_on_server(&url, &body, &tmp_path_gz, delegate, cx)
+                .await
+            {
+                Ok(_) => {
+                    self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
+                        .await?;
+                    return Ok(dst_path);
+                }
+                Err(e) => {
+                    log::error!(
+                        "Failed to download binary on server, attempting to upload server: {}",
+                        e
+                    )
+                }
+            }
+        }
+
+        let src_path = delegate
+            .download_server_binary_locally(self.ssh_platform, release_channel, wanted_version, cx)
+            .await?;
+        self.upload_local_server_binary(&src_path, &tmp_path_gz, delegate, cx)
+            .await?;
+        self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
+            .await?;
+        Ok(dst_path)
+    }
+
+    async fn download_binary_on_server(
+        &self,
+        url: &str,
+        body: &str,
+        tmp_path_gz: &RemotePathBuf,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        if let Some(parent) = tmp_path_gz.parent() {
+            self.socket
+                .run_command(
+                    "sh",
+                    &[
+                        "-lc",
+                        &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
+                    ],
+                )
+                .await?;
+        }
+
+        delegate.set_status(Some("Downloading remote development server on host"), cx);
+
+        match self
+            .socket
+            .run_command(
+                "curl",
+                &[
+                    "-f",
+                    "-L",
+                    "-X",
+                    "GET",
+                    "-H",
+                    "Content-Type: application/json",
+                    "-d",
+                    body,
+                    url,
+                    "-o",
+                    &tmp_path_gz.to_string(),
+                ],
+            )
+            .await
+        {
+            Ok(_) => {}
+            Err(e) => {
+                if self.socket.run_command("which", &["curl"]).await.is_ok() {
+                    return Err(e);
+                }
+
+                match self
+                    .socket
+                    .run_command(
+                        "wget",
+                        &[
+                            "--method=GET",
+                            "--header=Content-Type: application/json",
+                            "--body-data",
+                            body,
+                            url,
+                            "-O",
+                            &tmp_path_gz.to_string(),
+                        ],
+                    )
+                    .await
+                {
+                    Ok(_) => {}
+                    Err(e) => {
+                        if self.socket.run_command("which", &["wget"]).await.is_ok() {
+                            return Err(e);
+                        } else {
+                            anyhow::bail!("Neither curl nor wget is available");
+                        }
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    async fn upload_local_server_binary(
+        &self,
+        src_path: &Path,
+        tmp_path_gz: &RemotePathBuf,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        if let Some(parent) = tmp_path_gz.parent() {
+            self.socket
+                .run_command(
+                    "sh",
+                    &[
+                        "-lc",
+                        &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
+                    ],
+                )
+                .await?;
+        }
+
+        let src_stat = fs::metadata(&src_path).await?;
+        let size = src_stat.len();
+
+        let t0 = Instant::now();
+        delegate.set_status(Some("Uploading remote development server"), cx);
+        log::info!(
+            "uploading remote development server to {:?} ({}kb)",
+            tmp_path_gz,
+            size / 1024
+        );
+        self.upload_file(src_path, tmp_path_gz)
+            .await
+            .context("failed to upload server binary")?;
+        log::info!("uploaded remote development server in {:?}", t0.elapsed());
+        Ok(())
+    }
+
+    async fn extract_server_binary(
+        &self,
+        dst_path: &RemotePathBuf,
+        tmp_path: &RemotePathBuf,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        delegate.set_status(Some("Extracting remote development server"), cx);
+        let server_mode = 0o755;
+
+        let orig_tmp_path = tmp_path.to_string();
+        let script = if let Some(tmp_path) = orig_tmp_path.strip_suffix(".gz") {
+            shell_script!(
+                "gunzip -f {orig_tmp_path} && chmod {server_mode} {tmp_path} && mv {tmp_path} {dst_path}",
+                server_mode = &format!("{:o}", server_mode),
+                dst_path = &dst_path.to_string(),
+            )
+        } else {
+            shell_script!(
+                "chmod {server_mode} {orig_tmp_path} && mv {orig_tmp_path} {dst_path}",
+                server_mode = &format!("{:o}", server_mode),
+                dst_path = &dst_path.to_string()
+            )
+        };
+        self.socket.run_command("sh", &["-lc", &script]).await?;
+        Ok(())
+    }
+
+    async fn upload_file(&self, src_path: &Path, dest_path: &RemotePathBuf) -> Result<()> {
+        log::debug!("uploading file {:?} to {:?}", src_path, dest_path);
+        let mut command = util::command::new_smol_command("scp");
+        let output = self
+            .socket
+            .ssh_options(&mut command)
+            .args(
+                self.socket
+                    .connection_options
+                    .port
+                    .map(|port| vec!["-P".to_string(), port.to_string()])
+                    .unwrap_or_default(),
+            )
+            .arg(src_path)
+            .arg(format!(
+                "{}:{}",
+                self.socket.connection_options.scp_url(),
+                dest_path
+            ))
+            .output()
+            .await?;
+
+        anyhow::ensure!(
+            output.status.success(),
+            "failed to upload file {} -> {}: {}",
+            src_path.display(),
+            dest_path.to_string(),
+            String::from_utf8_lossy(&output.stderr)
+        );
+        Ok(())
+    }
+
+    #[cfg(debug_assertions)]
+    async fn build_local(
+        &self,
+        build_remote_server: String,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<PathBuf> {
+        use smol::process::{Command, Stdio};
+        use std::env::VarError;
+
+        async fn run_cmd(command: &mut Command) -> Result<()> {
+            let output = command
+                .kill_on_drop(true)
+                .stderr(Stdio::inherit())
+                .output()
+                .await?;
+            anyhow::ensure!(
+                output.status.success(),
+                "Failed to run command: {command:?}"
+            );
+            Ok(())
+        }
+
+        let use_musl = !build_remote_server.contains("nomusl");
+        let triple = format!(
+            "{}-{}",
+            self.ssh_platform.arch,
+            match self.ssh_platform.os {
+                "linux" =>
+                    if use_musl {
+                        "unknown-linux-musl"
+                    } else {
+                        "unknown-linux-gnu"
+                    },
+                "macos" => "apple-darwin",
+                _ => anyhow::bail!("can't cross compile for: {:?}", self.ssh_platform),
+            }
+        );
+        let mut rust_flags = match std::env::var("RUSTFLAGS") {
+            Ok(val) => val,
+            Err(VarError::NotPresent) => String::new(),
+            Err(e) => {
+                log::error!("Failed to get env var `RUSTFLAGS` value: {e}");
+                String::new()
+            }
+        };
+        if self.ssh_platform.os == "linux" && use_musl {
+            rust_flags.push_str(" -C target-feature=+crt-static");
+        }
+        if build_remote_server.contains("mold") {
+            rust_flags.push_str(" -C link-arg=-fuse-ld=mold");
+        }
+
+        if self.ssh_platform.arch == std::env::consts::ARCH
+            && self.ssh_platform.os == std::env::consts::OS
+        {
+            delegate.set_status(Some("Building remote server binary from source"), cx);
+            log::info!("building remote server binary from source");
+            run_cmd(
+                Command::new("cargo")
+                    .args([
+                        "build",
+                        "--package",
+                        "remote_server",
+                        "--features",
+                        "debug-embed",
+                        "--target-dir",
+                        "target/remote_server",
+                        "--target",
+                        &triple,
+                    ])
+                    .env("RUSTFLAGS", &rust_flags),
+            )
+            .await?;
+        } else if build_remote_server.contains("cross") {
+            #[cfg(target_os = "windows")]
+            use util::paths::SanitizedPath;
+
+            delegate.set_status(Some("Installing cross.rs for cross-compilation"), cx);
+            log::info!("installing cross");
+            run_cmd(Command::new("cargo").args([
+                "install",
+                "cross",
+                "--git",
+                "https://github.com/cross-rs/cross",
+            ]))
+            .await?;
+
+            delegate.set_status(
+                Some(&format!(
+                    "Building remote server binary from source for {} with Docker",
+                    &triple
+                )),
+                cx,
+            );
+            log::info!("building remote server binary from source for {}", &triple);
+
+            // On Windows, the binding needs to be set to the canonical path
+            #[cfg(target_os = "windows")]
+            let src =
+                SanitizedPath::from(smol::fs::canonicalize("./target").await?).to_glob_string();
+            #[cfg(not(target_os = "windows"))]
+            let src = "./target";
+            run_cmd(
+                Command::new("cross")
+                    .args([
+                        "build",
+                        "--package",
+                        "remote_server",
+                        "--features",
+                        "debug-embed",
+                        "--target-dir",
+                        "target/remote_server",
+                        "--target",
+                        &triple,
+                    ])
+                    .env(
+                        "CROSS_CONTAINER_OPTS",
+                        format!("--mount type=bind,src={src},dst=/app/target"),
+                    )
+                    .env("RUSTFLAGS", &rust_flags),
+            )
+            .await?;
+        } else {
+            let which = cx
+                .background_spawn(async move { which::which("zig") })
+                .await;
+
+            if which.is_err() {
+                #[cfg(not(target_os = "windows"))]
+                {
+                    anyhow::bail!(
+                        "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
+                    )
+                }
+                #[cfg(target_os = "windows")]
+                {
+                    anyhow::bail!(
+                        "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
+                    )
+                }
+            }
+
+            delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
+            log::info!("adding rustup target");
+            run_cmd(Command::new("rustup").args(["target", "add"]).arg(&triple)).await?;
+
+            delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
+            log::info!("installing cargo-zigbuild");
+            run_cmd(Command::new("cargo").args(["install", "--locked", "cargo-zigbuild"])).await?;
+
+            delegate.set_status(
+                Some(&format!(
+                    "Building remote binary from source for {triple} with Zig"
+                )),
+                cx,
+            );
+            log::info!("building remote binary from source for {triple} with Zig");
+            run_cmd(
+                Command::new("cargo")
+                    .args([
+                        "zigbuild",
+                        "--package",
+                        "remote_server",
+                        "--features",
+                        "debug-embed",
+                        "--target-dir",
+                        "target/remote_server",
+                        "--target",
+                        &triple,
+                    ])
+                    .env("RUSTFLAGS", &rust_flags),
+            )
+            .await?;
+        };
+        let bin_path = Path::new("target")
+            .join("remote_server")
+            .join(&triple)
+            .join("debug")
+            .join("remote_server");
+
+        let path = if !build_remote_server.contains("nocompress") {
+            delegate.set_status(Some("Compressing binary"), cx);
+
+            #[cfg(not(target_os = "windows"))]
+            {
+                run_cmd(Command::new("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
+            }
+            #[cfg(target_os = "windows")]
+            {
+                // On Windows, we use 7z to compress the binary
+                let seven_zip = which::which("7z.exe").context("7z.exe not found on $PATH, install it (e.g. with `winget install -e --id 7zip.7zip`) or, if you don't want this behaviour, set $env:ZED_BUILD_REMOTE_SERVER=\"nocompress\"")?;
+                let gz_path = format!("target/remote_server/{}/debug/remote_server.gz", triple);
+                if smol::fs::metadata(&gz_path).await.is_ok() {
+                    smol::fs::remove_file(&gz_path).await?;
+                }
+                run_cmd(Command::new(seven_zip).args([
+                    "a",
+                    "-tgzip",
+                    &gz_path,
+                    &bin_path.to_string_lossy(),
+                ]))
+                .await?;
+            }
+
+            let mut archive_path = bin_path;
+            archive_path.set_extension("gz");
+            std::env::current_dir()?.join(archive_path)
+        } else {
+            bin_path
+        };
+
+        Ok(path)
+    }
+}
+
+impl SshSocket {
+    #[cfg(not(target_os = "windows"))]
+    fn new(options: SshConnectionOptions, socket_path: PathBuf) -> Result<Self> {
+        Ok(Self {
+            connection_options: options,
+            envs: HashMap::default(),
+            socket_path,
+        })
+    }
+
+    #[cfg(target_os = "windows")]
+    fn new(options: SshConnectionOptions, temp_dir: &TempDir, secret: String) -> Result<Self> {
+        let askpass_script = temp_dir.path().join("askpass.bat");
+        std::fs::write(&askpass_script, "@ECHO OFF\necho %ZED_SSH_ASKPASS%")?;
+        let mut envs = HashMap::default();
+        envs.insert("SSH_ASKPASS_REQUIRE".into(), "force".into());
+        envs.insert("SSH_ASKPASS".into(), askpass_script.display().to_string());
+        envs.insert("ZED_SSH_ASKPASS".into(), secret);
+        Ok(Self {
+            connection_options: options,
+            envs,
+        })
+    }
+
+    // :WARNING: ssh unquotes arguments when executing on the remote :WARNING:
+    // e.g. $ ssh host sh -c 'ls -l' is equivalent to $ ssh host sh -c ls -l
+    // and passes -l as an argument to sh, not to ls.
+    // Furthermore, some setups (e.g. Coder) will change directory when SSH'ing
+    // into a machine. You must use `cd` to get back to $HOME.
+    // You need to do it like this: $ ssh host "cd; sh -c 'ls -l /tmp'"
+    fn ssh_command(&self, program: &str, args: &[&str]) -> process::Command {
+        let mut command = util::command::new_smol_command("ssh");
+        let to_run = iter::once(&program)
+            .chain(args.iter())
+            .map(|token| {
+                // We're trying to work with: sh, bash, zsh, fish, tcsh, ...?
+                debug_assert!(
+                    !token.contains('\n'),
+                    "multiline arguments do not work in all shells"
+                );
+                shlex::try_quote(token).unwrap()
+            })
+            .join(" ");
+        let to_run = format!("cd; {to_run}");
+        log::debug!("ssh {} {:?}", self.connection_options.ssh_url(), to_run);
+        self.ssh_options(&mut command)
+            .arg(self.connection_options.ssh_url())
+            .arg(to_run);
+        command
+    }
+
+    async fn run_command(&self, program: &str, args: &[&str]) -> Result<String> {
+        let output = self.ssh_command(program, args).output().await?;
+        anyhow::ensure!(
+            output.status.success(),
+            "failed to run command: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+        Ok(String::from_utf8_lossy(&output.stdout).to_string())
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    fn ssh_options<'a>(&self, command: &'a mut process::Command) -> &'a mut process::Command {
+        command
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .args(self.connection_options.additional_args())
+            .args(["-o", "ControlMaster=no", "-o"])
+            .arg(format!("ControlPath={}", self.socket_path.display()))
+    }
+
+    #[cfg(target_os = "windows")]
+    fn ssh_options<'a>(&self, command: &'a mut process::Command) -> &'a mut process::Command {
+        command
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .args(self.connection_options.additional_args())
+            .envs(self.envs.clone())
+    }
+
+    // On Windows, we need to use `SSH_ASKPASS` to provide the password to ssh.
+    // On Linux, we use the `ControlPath` option to create a socket file that ssh can use to
+    #[cfg(not(target_os = "windows"))]
+    fn ssh_args(&self) -> Vec<String> {
+        let mut arguments = self.connection_options.additional_args();
+        arguments.extend(vec![
+            "-o".to_string(),
+            "ControlMaster=no".to_string(),
+            "-o".to_string(),
+            format!("ControlPath={}", self.socket_path.display()),
+            self.connection_options.ssh_url(),
+        ]);
+        arguments
+    }
+
+    #[cfg(target_os = "windows")]
+    fn ssh_args(&self) -> Vec<String> {
+        let mut arguments = self.connection_options.additional_args();
+        arguments.push(self.connection_options.ssh_url());
+        arguments
+    }
+
+    async fn platform(&self) -> Result<RemotePlatform> {
+        let uname = self.run_command("sh", &["-lc", "uname -sm"]).await?;
+        let Some((os, arch)) = uname.split_once(" ") else {
+            anyhow::bail!("unknown uname: {uname:?}")
+        };
+
+        let os = match os.trim() {
+            "Darwin" => "macos",
+            "Linux" => "linux",
+            _ => anyhow::bail!(
+                "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
+            ),
+        };
+        // exclude armv5,6,7 as they are 32-bit.
+        let arch = if arch.starts_with("armv8")
+            || arch.starts_with("armv9")
+            || arch.starts_with("arm64")
+            || arch.starts_with("aarch64")
+        {
+            "aarch64"
+        } else if arch.starts_with("x86") {
+            "x86_64"
+        } else {
+            anyhow::bail!(
+                "Prebuilt remote servers are not yet available for {arch:?}. See https://zed.dev/docs/remote-development"
+            )
+        };
+
+        Ok(RemotePlatform { os, arch })
+    }
+
+    async fn shell(&self) -> String {
+        match self.run_command("sh", &["-lc", "echo $SHELL"]).await {
+            Ok(shell) => shell.trim().to_owned(),
+            Err(e) => {
+                log::error!("Failed to get shell: {e}");
+                "sh".to_owned()
+            }
+        }
+    }
+}
+
+fn parse_port_number(port_str: &str) -> Result<u16> {
+    port_str
+        .parse()
+        .with_context(|| format!("parsing port number: {port_str}"))
+}
+
+fn parse_port_forward_spec(spec: &str) -> Result<SshPortForwardOption> {
+    let parts: Vec<&str> = spec.split(':').collect();
+
+    match parts.len() {
+        4 => {
+            let local_port = parse_port_number(parts[1])?;
+            let remote_port = parse_port_number(parts[3])?;
+
+            Ok(SshPortForwardOption {
+                local_host: Some(parts[0].to_string()),
+                local_port,
+                remote_host: Some(parts[2].to_string()),
+                remote_port,
+            })
+        }
+        3 => {
+            let local_port = parse_port_number(parts[0])?;
+            let remote_port = parse_port_number(parts[2])?;
+
+            Ok(SshPortForwardOption {
+                local_host: None,
+                local_port,
+                remote_host: Some(parts[1].to_string()),
+                remote_port,
+            })
+        }
+        _ => anyhow::bail!("Invalid port forward format"),
+    }
+}
+
+impl SshConnectionOptions {
+    pub fn parse_command_line(input: &str) -> Result<Self> {
+        let input = input.trim_start_matches("ssh ");
+        let mut hostname: Option<String> = None;
+        let mut username: Option<String> = None;
+        let mut port: Option<u16> = None;
+        let mut args = Vec::new();
+        let mut port_forwards: Vec<SshPortForwardOption> = Vec::new();
+
+        // disallowed: -E, -e, -F, -f, -G, -g, -M, -N, -n, -O, -q, -S, -s, -T, -t, -V, -v, -W
+        const ALLOWED_OPTS: &[&str] = &[
+            "-4", "-6", "-A", "-a", "-C", "-K", "-k", "-X", "-x", "-Y", "-y",
+        ];
+        const ALLOWED_ARGS: &[&str] = &[
+            "-B", "-b", "-c", "-D", "-F", "-I", "-i", "-J", "-l", "-m", "-o", "-P", "-p", "-R",
+            "-w",
+        ];
+
+        let mut tokens = shlex::split(input).context("invalid input")?.into_iter();
+
+        'outer: while let Some(arg) = tokens.next() {
+            if ALLOWED_OPTS.contains(&(&arg as &str)) {
+                args.push(arg.to_string());
+                continue;
+            }
+            if arg == "-p" {
+                port = tokens.next().and_then(|arg| arg.parse().ok());
+                continue;
+            } else if let Some(p) = arg.strip_prefix("-p") {
+                port = p.parse().ok();
+                continue;
+            }
+            if arg == "-l" {
+                username = tokens.next();
+                continue;
+            } else if let Some(l) = arg.strip_prefix("-l") {
+                username = Some(l.to_string());
+                continue;
+            }
+            if arg == "-L" || arg.starts_with("-L") {
+                let forward_spec = if arg == "-L" {
+                    tokens.next()
+                } else {
+                    Some(arg.strip_prefix("-L").unwrap().to_string())
+                };
+
+                if let Some(spec) = forward_spec {
+                    port_forwards.push(parse_port_forward_spec(&spec)?);
+                } else {
+                    anyhow::bail!("Missing port forward format");
+                }
+            }
+
+            for a in ALLOWED_ARGS {
+                if arg == *a {
+                    args.push(arg);
+                    if let Some(next) = tokens.next() {
+                        args.push(next);
+                    }
+                    continue 'outer;
+                } else if arg.starts_with(a) {
+                    args.push(arg);
+                    continue 'outer;
+                }
+            }
+            if arg.starts_with("-") || hostname.is_some() {
+                anyhow::bail!("unsupported argument: {:?}", arg);
+            }
+            let mut input = &arg as &str;
+            // Destination might be: username1@username2@ip2@ip1
+            if let Some((u, rest)) = input.rsplit_once('@') {
+                input = rest;
+                username = Some(u.to_string());
+            }
+            if let Some((rest, p)) = input.split_once(':') {
+                input = rest;
+                port = p.parse().ok()
+            }
+            hostname = Some(input.to_string())
+        }
+
+        let Some(hostname) = hostname else {
+            anyhow::bail!("missing hostname");
+        };
+
+        let port_forwards = match port_forwards.len() {
+            0 => None,
+            _ => Some(port_forwards),
+        };
+
+        Ok(Self {
+            host: hostname,
+            username,
+            port,
+            port_forwards,
+            args: Some(args),
+            password: None,
+            nickname: None,
+            upload_binary_over_ssh: false,
+        })
+    }
+
+    pub fn ssh_url(&self) -> String {
+        let mut result = String::from("ssh://");
+        if let Some(username) = &self.username {
+            // Username might be: username1@username2@ip2
+            let username = urlencoding::encode(username);
+            result.push_str(&username);
+            result.push('@');
+        }
+        result.push_str(&self.host);
+        if let Some(port) = self.port {
+            result.push(':');
+            result.push_str(&port.to_string());
+        }
+        result
+    }
+
+    pub fn additional_args(&self) -> Vec<String> {
+        let mut args = self.args.iter().flatten().cloned().collect::<Vec<String>>();
+
+        if let Some(forwards) = &self.port_forwards {
+            args.extend(forwards.iter().map(|pf| {
+                let local_host = match &pf.local_host {
+                    Some(host) => host,
+                    None => "localhost",
+                };
+                let remote_host = match &pf.remote_host {
+                    Some(host) => host,
+                    None => "localhost",
+                };
+
+                format!(
+                    "-L{}:{}:{}:{}",
+                    local_host, pf.local_port, remote_host, pf.remote_port
+                )
+            }));
+        }
+
+        args
+    }
+
+    fn scp_url(&self) -> String {
+        if let Some(username) = &self.username {
+            format!("{}@{}", username, self.host)
+        } else {
+            self.host.clone()
+        }
+    }
+
+    pub fn connection_string(&self) -> String {
+        let host = if let Some(username) = &self.username {
+            format!("{}@{}", username, self.host)
+        } else {
+            self.host.clone()
+        };
+        if let Some(port) = &self.port {
+            format!("{}:{}", host, port)
+        } else {
+            host
+        }
+    }
+}
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 6216ff7728..04028ebcac 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -21,7 +21,7 @@ use project::{
 };
 use rpc::{
     AnyProtoClient, TypedEnvelope,
-    proto::{self, SSH_PEER_ID, SSH_PROJECT_ID},
+    proto::{self, REMOTE_SERVER_PEER_ID, REMOTE_SERVER_PROJECT_ID},
 };
 
 use settings::initial_server_settings_content;
@@ -83,7 +83,7 @@ impl HeadlessProject {
 
         let worktree_store = cx.new(|cx| {
             let mut store = WorktreeStore::local(true, fs.clone());
-            store.shared(SSH_PROJECT_ID, session.clone(), cx);
+            store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             store
         });
 
@@ -101,7 +101,7 @@ impl HeadlessProject {
 
         let buffer_store = cx.new(|cx| {
             let mut buffer_store = BufferStore::local(worktree_store.clone(), cx);
-            buffer_store.shared(SSH_PROJECT_ID, session.clone(), cx);
+            buffer_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             buffer_store
         });
 
@@ -119,7 +119,7 @@ impl HeadlessProject {
                 breakpoint_store.clone(),
                 cx,
             );
-            dap_store.shared(SSH_PROJECT_ID, session.clone(), cx);
+            dap_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             dap_store
         });
 
@@ -131,7 +131,7 @@ impl HeadlessProject {
                 fs.clone(),
                 cx,
             );
-            store.shared(SSH_PROJECT_ID, session.clone(), cx);
+            store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             store
         });
 
@@ -154,7 +154,7 @@ impl HeadlessProject {
                 environment.clone(),
                 cx,
             );
-            task_store.shared(SSH_PROJECT_ID, session.clone(), cx);
+            task_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             task_store
         });
         let settings_observer = cx.new(|cx| {
@@ -164,7 +164,7 @@ impl HeadlessProject {
                 task_store.clone(),
                 cx,
             );
-            observer.shared(SSH_PROJECT_ID, session.clone(), cx);
+            observer.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             observer
         });
 
@@ -185,7 +185,7 @@ impl HeadlessProject {
                 fs.clone(),
                 cx,
             );
-            lsp_store.shared(SSH_PROJECT_ID, session.clone(), cx);
+            lsp_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
             lsp_store
         });
 
@@ -213,15 +213,15 @@ impl HeadlessProject {
         );
 
         // local_machine -> ssh handlers
-        session.subscribe_to_entity(SSH_PROJECT_ID, &worktree_store);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &buffer_store);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &cx.entity());
-        session.subscribe_to_entity(SSH_PROJECT_ID, &lsp_store);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &task_store);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &toolchain_store);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &dap_store);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &settings_observer);
-        session.subscribe_to_entity(SSH_PROJECT_ID, &git_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &worktree_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &buffer_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &cx.entity());
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &lsp_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &task_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &toolchain_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &dap_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &settings_observer);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &git_store);
 
         session.add_request_handler(cx.weak_entity(), Self::handle_list_remote_directory);
         session.add_request_handler(cx.weak_entity(), Self::handle_get_path_metadata);
@@ -288,7 +288,7 @@ impl HeadlessProject {
         } = event
         {
             cx.background_spawn(self.session.request(proto::UpdateBuffer {
-                project_id: SSH_PROJECT_ID,
+                project_id: REMOTE_SERVER_PROJECT_ID,
                 buffer_id: buffer.read(cx).remote_id().to_proto(),
                 operations: vec![serialize_operation(operation)],
             }))
@@ -310,7 +310,7 @@ impl HeadlessProject {
             } => {
                 self.session
                     .send(proto::UpdateLanguageServer {
-                        project_id: SSH_PROJECT_ID,
+                        project_id: REMOTE_SERVER_PROJECT_ID,
                         server_name: name.as_ref().map(|name| name.to_string()),
                         language_server_id: language_server_id.to_proto(),
                         variant: Some(message.clone()),
@@ -320,7 +320,7 @@ impl HeadlessProject {
             LspStoreEvent::Notification(message) => {
                 self.session
                     .send(proto::Toast {
-                        project_id: SSH_PROJECT_ID,
+                        project_id: REMOTE_SERVER_PROJECT_ID,
                         notification_id: "lsp".to_string(),
                         message: message.clone(),
                     })
@@ -329,7 +329,7 @@ impl HeadlessProject {
             LspStoreEvent::LanguageServerLog(language_server_id, log_type, message) => {
                 self.session
                     .send(proto::LanguageServerLog {
-                        project_id: SSH_PROJECT_ID,
+                        project_id: REMOTE_SERVER_PROJECT_ID,
                         language_server_id: language_server_id.to_proto(),
                         message: message.clone(),
                         log_type: Some(log_type.to_proto()),
@@ -338,7 +338,7 @@ impl HeadlessProject {
             }
             LspStoreEvent::LanguageServerPrompt(prompt) => {
                 let request = self.session.request(proto::LanguageServerPromptRequest {
-                    project_id: SSH_PROJECT_ID,
+                    project_id: REMOTE_SERVER_PROJECT_ID,
                     actions: prompt
                         .actions
                         .iter()
@@ -474,7 +474,7 @@ impl HeadlessProject {
         let buffer_id = buffer.read_with(&cx, |b, _| b.remote_id())?;
         buffer_store.update(&mut cx, |buffer_store, cx| {
             buffer_store
-                .create_buffer_for_peer(&buffer, SSH_PEER_ID, cx)
+                .create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
                 .detach_and_log_err(cx);
         })?;
 
@@ -500,7 +500,7 @@ impl HeadlessProject {
         let buffer_id = buffer.read_with(&cx, |b, _| b.remote_id())?;
         buffer_store.update(&mut cx, |buffer_store, cx| {
             buffer_store
-                .create_buffer_for_peer(&buffer, SSH_PEER_ID, cx)
+                .create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
                 .detach_and_log_err(cx);
         })?;
 
@@ -550,7 +550,7 @@ impl HeadlessProject {
 
             buffer_store.update(cx, |buffer_store, cx| {
                 buffer_store
-                    .create_buffer_for_peer(&buffer, SSH_PEER_ID, cx)
+                    .create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
                     .detach_and_log_err(cx);
             });
 
@@ -586,7 +586,7 @@ impl HeadlessProject {
             response.buffer_ids.push(buffer_id.to_proto());
             buffer_store
                 .update(&mut cx, |buffer_store, cx| {
-                    buffer_store.create_buffer_for_peer(&buffer, SSH_PEER_ID, cx)
+                    buffer_store.create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
                 })?
                 .await?;
         }
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 69fae7f399..e106a5ef18 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -22,7 +22,7 @@ use project::{
     Project, ProjectPath,
     search::{SearchQuery, SearchResult},
 };
-use remote::SshRemoteClient;
+use remote::RemoteClient;
 use serde_json::json;
 use settings::{Settings, SettingsLocation, SettingsStore, initial_server_settings_content};
 use smol::stream::StreamExt;
@@ -1119,7 +1119,7 @@ async fn test_reconnect(cx: &mut TestAppContext, server_cx: &mut TestAppContext)
         buffer.edit([(ix..ix + 1, "100")], None, cx);
     });
 
-    let client = cx.read(|cx| project.read(cx).ssh_client().unwrap());
+    let client = cx.read(|cx| project.read(cx).remote_client().unwrap());
     client
         .update(cx, |client, cx| client.simulate_disconnect(cx))
         .detach();
@@ -1782,7 +1782,7 @@ pub async fn init_test(
     });
     init_logger();
 
-    let (opts, ssh_server_client) = SshRemoteClient::fake_server(cx, server_cx);
+    let (opts, ssh_server_client) = RemoteClient::fake_server(cx, server_cx);
     let http_client = Arc::new(BlockedHttpClient);
     let node_runtime = NodeRuntime::unavailable();
     let languages = Arc::new(LanguageRegistry::new(cx.executor()));
@@ -1804,7 +1804,7 @@ pub async fn init_test(
         )
     });
 
-    let ssh = SshRemoteClient::fake_client(opts, cx).await;
+    let ssh = RemoteClient::fake_client(opts, cx).await;
     let project = build_project(ssh, cx);
     project
         .update(cx, {
@@ -1819,7 +1819,7 @@ fn init_logger() {
     zlog::init_test();
 }
 
-fn build_project(ssh: Entity<SshRemoteClient>, cx: &mut TestAppContext) -> Entity<Project> {
+fn build_project(ssh: Entity<RemoteClient>, cx: &mut TestAppContext) -> Entity<Project> {
     cx.update(|cx| {
         if !cx.has_global::<SettingsStore>() {
             let settings_store = SettingsStore::test(cx);
@@ -1845,5 +1845,5 @@ fn build_project(ssh: Entity<SshRemoteClient>, cx: &mut TestAppContext) -> Entit
         language::init(cx);
     });
 
-    cx.update(|cx| Project::ssh(ssh, client, node, user_store, languages, fs, cx))
+    cx.update(|cx| Project::remote(ssh, client, node, user_store, languages, fs, cx))
 }
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index c6d1566d60..cb671a72d9 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -19,14 +19,14 @@ use project::project_settings::ProjectSettings;
 
 use proto::CrashReport;
 use release_channel::{AppVersion, RELEASE_CHANNEL, ReleaseChannel};
-use remote::SshRemoteClient;
+use remote::RemoteClient;
 use remote::{
     json_log::LogRecord,
     protocol::{read_message, write_message},
     proxy::ProxyLaunchError,
 };
 use reqwest_client::ReqwestClient;
-use rpc::proto::{self, Envelope, SSH_PROJECT_ID};
+use rpc::proto::{self, Envelope, REMOTE_SERVER_PROJECT_ID};
 use rpc::{AnyProtoClient, TypedEnvelope};
 use settings::{Settings, SettingsStore, watch_config_file};
 use smol::channel::{Receiver, Sender};
@@ -396,7 +396,7 @@ fn start_server(
     })
     .detach();
 
-    SshRemoteClient::proto_client_from_channels(incoming_rx, outgoing_tx, cx, "server")
+    RemoteClient::proto_client_from_channels(incoming_rx, outgoing_tx, cx, "server")
 }
 
 fn init_paths() -> anyhow::Result<()> {
@@ -867,34 +867,21 @@ where
     R: AsyncRead + Unpin,
     W: AsyncWrite + Unpin,
 {
-    use remote::protocol::read_message_raw;
+    use remote::protocol::{read_message_raw, write_size_prefixed_buffer};
 
     let mut buffer = Vec::new();
     loop {
         read_message_raw(&mut reader, &mut buffer)
             .await
             .with_context(|| format!("failed to read message from {}", socket_name))?;
-
         write_size_prefixed_buffer(&mut writer, &mut buffer)
             .await
             .with_context(|| format!("failed to write message to {}", socket_name))?;
-
         writer.flush().await?;
-
         buffer.clear();
     }
 }
 
-async fn write_size_prefixed_buffer<S: AsyncWrite + Unpin>(
-    stream: &mut S,
-    buffer: &mut Vec<u8>,
-) -> Result<()> {
-    let len = buffer.len() as u32;
-    stream.write_all(len.to_le_bytes().as_slice()).await?;
-    stream.write_all(buffer).await?;
-    Ok(())
-}
-
 fn initialize_settings(
     session: AnyProtoClient,
     fs: Arc<dyn Fs>,
@@ -910,7 +897,7 @@ fn initialize_settings(
 
                 session
                     .send(proto::Toast {
-                        project_id: SSH_PROJECT_ID,
+                        project_id: REMOTE_SERVER_PROJECT_ID,
                         notification_id: "server-settings-failed".to_string(),
                         message: format!(
                             "Error in settings on remote host {:?}: {}",
@@ -922,7 +909,7 @@ fn initialize_settings(
             } else {
                 session
                     .send(proto::HideToast {
-                        project_id: SSH_PROJECT_ID,
+                        project_id: REMOTE_SERVER_PROJECT_ID,
                         notification_id: "server-settings-failed".to_string(),
                     })
                     .log_err();
diff --git a/crates/task/src/shell_builder.rs b/crates/task/src/shell_builder.rs
index de4ddc00f4..f907bd1d9f 100644
--- a/crates/task/src/shell_builder.rs
+++ b/crates/task/src/shell_builder.rs
@@ -36,7 +36,7 @@ impl ShellKind {
         } else if program == "csh" {
             ShellKind::Csh
         } else {
-            // Someother shell detected, the user might install and use a
+            // Some other shell detected, the user might install and use a
             // unix-like shell.
             ShellKind::Posix
         }
@@ -203,14 +203,15 @@ pub struct ShellBuilder {
 impl ShellBuilder {
     /// Create a new ShellBuilder as configured.
     pub fn new(remote_system_shell: Option<&str>, shell: &Shell) -> Self {
-        let (program, args) = match shell {
-            Shell::System => match remote_system_shell {
-                Some(remote_shell) => (remote_shell.to_string(), Vec::new()),
-                None => (system_shell(), Vec::new()),
+        let (program, args) = match remote_system_shell {
+            Some(program) => (program.to_string(), Vec::new()),
+            None => match shell {
+                Shell::System => (system_shell(), Vec::new()),
+                Shell::Program(shell) => (shell.clone(), Vec::new()),
+                Shell::WithArguments { program, args, .. } => (program.clone(), args.clone()),
             },
-            Shell::Program(shell) => (shell.clone(), Vec::new()),
-            Shell::WithArguments { program, args, .. } => (program.clone(), args.clone()),
         };
+
         let kind = ShellKind::new(&program);
         Self {
             program,
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index fe3301fb89..56715b604e 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1403,7 +1403,7 @@ impl InputHandler for TerminalInputHandler {
                 window.invalidate_character_coordinates();
                 let project = this.project().read(cx);
                 let telemetry = project.client().telemetry().clone();
-                telemetry.log_edit_event("terminal", project.is_via_ssh());
+                telemetry.log_edit_event("terminal", project.is_via_remote_server());
             })
             .ok();
     }
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 6b17911487..c3d7c4f793 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -481,17 +481,28 @@ impl TerminalPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<WeakEntity<Terminal>>> {
-        let Ok((ssh_client, false)) = self.workspace.update(cx, |workspace, cx| {
-            let project = workspace.project().read(cx);
-            (
-                project.ssh_client().and_then(|it| it.read(cx).ssh_info()),
-                project.is_via_collab(),
-            )
-        }) else {
-            return Task::ready(Err(anyhow!("Project is not local")));
+        let remote_client = self
+            .workspace
+            .update(cx, |workspace, cx| {
+                let project = workspace.project().read(cx);
+                if project.is_via_collab() {
+                    Err(anyhow!("cannot spawn tasks as a guest"))
+                } else {
+                    Ok(project.remote_client())
+                }
+            })
+            .flatten();
+
+        let remote_client = match remote_client {
+            Ok(remote_client) => remote_client,
+            Err(e) => return Task::ready(Err(e)),
         };
 
-        let builder = ShellBuilder::new(ssh_client.as_ref().map(|info| &*info.shell), &task.shell);
+        let remote_shell = remote_client
+            .as_ref()
+            .and_then(|remote_client| remote_client.read(cx).shell());
+
+        let builder = ShellBuilder::new(remote_shell.as_deref(), &task.shell);
         let command_label = builder.command_label(&task.command_label);
         let (command, args) = builder.build(task.command.clone(), &task.args);
 
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
index c667edb509..78f22faa13 100644
--- a/crates/title_bar/src/collab.rs
+++ b/crates/title_bar/src/collab.rs
@@ -337,7 +337,7 @@ impl TitleBar {
 
         let room = room.read(cx);
         let project = self.project.read(cx);
-        let is_local = project.is_local() || project.is_via_ssh();
+        let is_local = project.is_local() || project.is_via_remote_server();
         let is_shared = is_local && project.is_shared();
         let is_muted = room.is_muted();
         let muted_by_user = room.muted_by_user();
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index ad64dac9c6..b08f139b25 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -299,8 +299,8 @@ impl TitleBar {
         }
     }
 
-    fn render_ssh_project_host(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let options = self.project.read(cx).ssh_connection_options(cx)?;
+    fn render_remote_project_connection(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+        let options = self.project.read(cx).remote_connection_options(cx)?;
         let host: SharedString = options.connection_string().into();
 
         let nickname = options
@@ -308,7 +308,7 @@ impl TitleBar {
             .map(|nick| nick.into())
             .unwrap_or_else(|| host.clone());
 
-        let (indicator_color, meta) = match self.project.read(cx).ssh_connection_state(cx)? {
+        let (indicator_color, meta) = match self.project.read(cx).remote_connection_state(cx)? {
             remote::ConnectionState::Connecting => (Color::Info, format!("Connecting to: {host}")),
             remote::ConnectionState::Connected => (Color::Success, format!("Connected to: {host}")),
             remote::ConnectionState::HeartbeatMissed => (
@@ -324,7 +324,7 @@ impl TitleBar {
             }
         };
 
-        let icon_color = match self.project.read(cx).ssh_connection_state(cx)? {
+        let icon_color = match self.project.read(cx).remote_connection_state(cx)? {
             remote::ConnectionState::Connecting => Color::Info,
             remote::ConnectionState::Connected => Color::Default,
             remote::ConnectionState::HeartbeatMissed => Color::Warning,
@@ -379,8 +379,8 @@ impl TitleBar {
     }
 
     pub fn render_project_host(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        if self.project.read(cx).is_via_ssh() {
-            return self.render_ssh_project_host(cx);
+        if self.project.read(cx).is_via_remote_server() {
+            return self.render_remote_project_connection(cx);
         }
 
         if self.project.read(cx).is_disconnected(cx) {
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index b57c916db9..29fe6aae02 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1924,7 +1924,9 @@ impl ShellExec {
 
         let Some(range) = input_range else { return };
 
-        let mut process = project.read(cx).exec_in_shell(command, cx);
+        let Some(mut process) = project.read(cx).exec_in_shell(command, cx).log_err() else {
+            return;
+        };
         process.stdout(Stdio::piped());
         process.stderr(Stdio::piped());
 
diff --git a/crates/workspace/src/tasks.rs b/crates/workspace/src/tasks.rs
index 32d066c7eb..71394c874a 100644
--- a/crates/workspace/src/tasks.rs
+++ b/crates/workspace/src/tasks.rs
@@ -20,7 +20,7 @@ impl Workspace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        match self.project.read(cx).ssh_connection_state(cx) {
+        match self.project.read(cx).remote_connection_state(cx) {
             None | Some(ConnectionState::Connected) => {}
             Some(
                 ConnectionState::Connecting
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 044601df97..25e2cb1cfe 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -74,7 +74,7 @@ use project::{
     DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
     debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
 };
-use remote::{SshClientDelegate, SshConnectionOptions, ssh_session::ConnectionIdentifier};
+use remote::{RemoteClientDelegate, SshConnectionOptions, remote_client::ConnectionIdentifier};
 use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
@@ -2084,7 +2084,7 @@ impl Workspace {
         cx: &mut Context<Self>,
     ) -> oneshot::Receiver<Option<Vec<PathBuf>>> {
         if self.project.read(cx).is_via_collab()
-            || self.project.read(cx).is_via_ssh()
+            || self.project.read(cx).is_via_remote_server()
             || !WorkspaceSettings::get_global(cx).use_system_path_prompts
         {
             let prompt = self.on_prompt_for_new_path.take().unwrap();
@@ -5249,7 +5249,7 @@ impl Workspace {
 
     fn serialize_workspace_location(&self, cx: &App) -> WorkspaceLocation {
         let paths = PathList::new(&self.root_paths(cx));
-        if let Some(connection) = self.project.read(cx).ssh_connection_options(cx) {
+        if let Some(connection) = self.project.read(cx).remote_connection_options(cx) {
             WorkspaceLocation::Location(
                 SerializedWorkspaceLocation::Ssh(SerializedSshConnection {
                     host: connection.host,
@@ -6917,7 +6917,7 @@ async fn join_channel_internal(
                     return None;
                 }
 
-                if (project.is_local() || project.is_via_ssh())
+                if (project.is_local() || project.is_via_remote_server())
                     && project.visible_worktrees(cx).any(|tree| {
                         tree.read(cx)
                             .root_entry()
@@ -7263,7 +7263,7 @@ pub fn open_ssh_project_with_new_connection(
     window: WindowHandle<Workspace>,
     connection_options: SshConnectionOptions,
     cancel_rx: oneshot::Receiver<()>,
-    delegate: Arc<dyn SshClientDelegate>,
+    delegate: Arc<dyn RemoteClientDelegate>,
     app_state: Arc<AppState>,
     paths: Vec<PathBuf>,
     cx: &mut App,
@@ -7274,7 +7274,7 @@ pub fn open_ssh_project_with_new_connection(
 
         let session = match cx
             .update(|cx| {
-                remote::SshRemoteClient::new(
+                remote::RemoteClient::ssh(
                     ConnectionIdentifier::Workspace(workspace_id.0),
                     connection_options,
                     cancel_rx,
@@ -7289,7 +7289,7 @@ pub fn open_ssh_project_with_new_connection(
         };
 
         let project = cx.update(|cx| {
-            project::Project::ssh(
+            project::Project::remote(
                 session,
                 app_state.client.clone(),
                 app_state.node_runtime.clone(),
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index ac06f1fd9f..9c12a5f146 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -220,10 +220,10 @@ pub fn init(
         let installation_id = installation_id.clone();
         let system_id = system_id.clone();
 
-        let Some(ssh_client) = project.ssh_client() else {
+        let Some(remote_client) = project.remote_client() else {
             return;
         };
-        ssh_client.update(cx, |client, cx| {
+        remote_client.update(cx, |client, cx| {
             if !TelemetrySettings::get_global(cx).diagnostics {
                 return;
             }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 553444ebdb..a3116971b4 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -918,7 +918,7 @@ fn register_actions(
             capture_audio(workspace, window, cx);
         });
 
-    if workspace.project().read(cx).is_via_ssh() {
+    if workspace.project().read(cx).is_via_remote_server() {
         workspace.register_action({
             move |workspace, _: &OpenServerSettings, window, cx| {
                 let open_server_settings = workspace
@@ -1543,7 +1543,7 @@ pub fn open_new_ssh_project_from_project(
     cx: &mut Context<Workspace>,
 ) -> Task<anyhow::Result<()>> {
     let app_state = workspace.app_state().clone();
-    let Some(ssh_client) = workspace.project().read(cx).ssh_client() else {
+    let Some(ssh_client) = workspace.project().read(cx).remote_client() else {
         return Task::ready(Err(anyhow::anyhow!("Not an ssh project")));
     };
     let connection_options = ssh_client.read(cx).connection_options();

From d0aef3cec196216b741dec1f8bfad3e69ed83beb Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 26 Aug 2025 22:17:03 -0300
Subject: [PATCH 389/823] thread view: Fix cut-off review button (#36970)

---
 crates/agent_ui/src/acp/thread_view.rs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 30941f9e76..f01a7958a8 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1504,7 +1504,7 @@ impl AcpThreadView {
                 let style = default_markdown_style(false, false, window, cx);
                 let message_body = v_flex()
                     .w_full()
-                    .gap_2p5()
+                    .gap_3()
                     .children(chunks.iter().enumerate().filter_map(
                         |(chunk_ix, chunk)| match chunk {
                             AssistantMessageChunk::Message { block } => {
@@ -3352,7 +3352,6 @@ impl AcpThreadView {
                 let element = h_flex()
                     .group("edited-code")
                     .id(("file-container", index))
-                    .relative()
                     .py_1()
                     .pl_2()
                     .pr_1()
@@ -3364,6 +3363,7 @@ impl AcpThreadView {
                     })
                     .child(
                         h_flex()
+                            .relative()
                             .id(("file-name", index))
                             .pr_8()
                             .gap_1p5()
@@ -3371,6 +3371,16 @@ impl AcpThreadView {
                             .overflow_x_scroll()
                             .child(file_icon)
                             .child(h_flex().gap_0p5().children(file_name).children(file_path))
+                            .child(
+                                div()
+                                    .absolute()
+                                    .h_full()
+                                    .w_12()
+                                    .top_0()
+                                    .bottom_0()
+                                    .right_0()
+                                    .bg(overlay_gradient),
+                            )
                             .on_click({
                                 let buffer = buffer.clone();
                                 cx.listener(move |this, _, window, cx| {
@@ -3431,17 +3441,6 @@ impl AcpThreadView {
                                         }
                                     }),
                             ),
-                    )
-                    .child(
-                        div()
-                            .id("gradient-overlay")
-                            .absolute()
-                            .h_full()
-                            .w_12()
-                            .top_0()
-                            .bottom_0()
-                            .right(px(152.))
-                            .bg(overlay_gradient),
                     );
 
                 Some(element)

From e6e64017eabb20907dbdd75ddfe7e9c536b48756 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 26 Aug 2025 20:01:51 -0600
Subject: [PATCH 390/823] acp: Require gemini version 0.2.0 (#36960)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs       | 20 +++--
 crates/agent2/src/native_agent_server.rs  |  4 +
 crates/agent_servers/src/acp.rs           |  6 +-
 crates/agent_servers/src/agent_servers.rs |  2 +
 crates/agent_servers/src/claude.rs        | 23 ++----
 crates/agent_servers/src/custom.rs        |  4 +
 crates/agent_servers/src/gemini.rs        | 98 +++++++++++++++--------
 crates/agent_ui/src/acp/thread_view.rs    | 67 ++++++++--------
 8 files changed, 130 insertions(+), 94 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 4ded647a74..0da4b43394 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -789,15 +789,10 @@ pub enum ThreadStatus {
 
 #[derive(Debug, Clone)]
 pub enum LoadError {
-    NotInstalled {
-        error_message: SharedString,
-        install_message: SharedString,
-        install_command: String,
-    },
+    NotInstalled,
     Unsupported {
-        error_message: SharedString,
-        upgrade_message: SharedString,
-        upgrade_command: String,
+        command: SharedString,
+        current_version: SharedString,
     },
     Exited {
         status: ExitStatus,
@@ -808,9 +803,12 @@ pub enum LoadError {
 impl Display for LoadError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            LoadError::NotInstalled { error_message, .. }
-            | LoadError::Unsupported { error_message, .. } => {
-                write!(f, "{error_message}")
+            LoadError::NotInstalled => write!(f, "not installed"),
+            LoadError::Unsupported {
+                command: path,
+                current_version,
+            } => {
+                write!(f, "version {current_version} from {path} is not supported")
             }
             LoadError::Exited { status } => write!(f, "Server exited with status {status}"),
             LoadError::Other(msg) => write!(f, "{}", msg),
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 9ff98ccd18..0079dcc572 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -42,6 +42,10 @@ impl AgentServer for NativeAgentServer {
         ui::IconName::ZedAgent
     }
 
+    fn install_command(&self) -> Option<&'static str> {
+        None
+    }
+
     fn connect(
         &self,
         _root_dir: &Path,
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index b4e897374a..b4f82a0a23 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -56,7 +56,7 @@ impl AcpConnection {
         root_dir: &Path,
         cx: &mut AsyncApp,
     ) -> Result<Self> {
-        let mut child = util::command::new_smol_command(&command.path)
+        let mut child = util::command::new_smol_command(command.path)
             .args(command.args.iter().map(|arg| arg.as_str()))
             .envs(command.env.iter().flatten())
             .current_dir(root_dir)
@@ -150,6 +150,10 @@ impl AcpConnection {
             _io_task: io_task,
         })
     }
+
+    pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {
+        &self.prompt_capabilities
+    }
 }
 
 impl AgentConnection for AcpConnection {
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 7c7e124ca7..dc7d75c52d 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -46,6 +46,8 @@ pub trait AgentServer: Send {
     ) -> Task<Result<Rc<dyn AgentConnection>>>;
 
     fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
+
+    fn install_command(&self) -> Option<&'static str>;
 }
 
 impl dyn AgentServer {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 250e564526..3a16b0601a 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -63,6 +63,10 @@ impl AgentServer for ClaudeCode {
         ui::IconName::AiClaude
     }
 
+    fn install_command(&self) -> Option<&'static str> {
+        Some("npm install -g @anthropic-ai/claude-code@latest")
+    }
+
     fn connect(
         &self,
         _root_dir: &Path,
@@ -108,11 +112,7 @@ impl AgentConnection for ClaudeAgentConnection {
             )
             .await
             else {
-                return Err(LoadError::NotInstalled {
-                    error_message: "Failed to find Claude Code binary".into(),
-                    install_message: "Install Claude Code".into(),
-                    install_command: "npm install -g @anthropic-ai/claude-code@latest".into(),
-                }.into());
+                return Err(LoadError::NotInstalled.into());
             };
 
             let api_key =
@@ -230,17 +230,8 @@ impl AgentConnection for ClaudeAgentConnection {
                                         || !help.contains("--session-id"))
                                 {
                                     LoadError::Unsupported {
-                                    error_message: format!(
-                                            "Your installed version of Claude Code ({}, version {}) does not have required features for use with Zed.",
-                                            command.path.to_string_lossy(),
-                                            version,
-                                        )
-                                        .into(),
-                                        upgrade_message: "Upgrade Claude Code to latest".into(),
-                                        upgrade_command: format!(
-                                            "{} update",
-                                            command.path.to_string_lossy()
-                                        ),
+                                        command: command.path.to_string_lossy().to_string().into(),
+                                        current_version: version.to_string().into(),
                                     }
                                 } else {
                                     LoadError::Exited { status }
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 72823026d7..75928a26a8 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -57,6 +57,10 @@ impl crate::AgentServer for CustomAgentServer {
         })
     }
 
+    fn install_command(&self) -> Option<&'static str> {
+        None
+    }
+
     fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
         self
     }
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 5d6a70fa64..33d92060a4 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -1,6 +1,7 @@
 use std::rc::Rc;
 use std::{any::Any, path::Path};
 
+use crate::acp::AcpConnection;
 use crate::{AgentServer, AgentServerCommand};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
@@ -37,6 +38,10 @@ impl AgentServer for Gemini {
         ui::IconName::AiGemini
     }
 
+    fn install_command(&self) -> Option<&'static str> {
+        Some("npm install -g @google/gemini-cli@latest")
+    }
+
     fn connect(
         &self,
         root_dir: &Path,
@@ -52,48 +57,73 @@ impl AgentServer for Gemini {
             })?;
 
             let Some(mut command) =
-                AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx).await
+                AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx)
+                    .await
             else {
-                return Err(LoadError::NotInstalled {
-                    error_message: "Failed to find Gemini CLI binary".into(),
-                    install_message: "Install Gemini CLI".into(),
-                    install_command: Self::install_command().into(),
-                }.into());
+                return Err(LoadError::NotInstalled.into());
             };
 
-            if let Some(api_key)= cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
-                command.env.get_or_insert_default().insert("GEMINI_API_KEY".to_owned(), api_key.key);
+            if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
+                command
+                    .env
+                    .get_or_insert_default()
+                    .insert("GEMINI_API_KEY".to_owned(), api_key.key);
             }
 
             let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
-            if result.is_err() {
-                let version_fut = util::command::new_smol_command(&command.path)
-                    .args(command.args.iter())
-                    .arg("--version")
-                    .kill_on_drop(true)
-                    .output();
+            match &result {
+                Ok(connection) => {
+                    if let Some(connection) = connection.clone().downcast::<AcpConnection>()
+                        && !connection.prompt_capabilities().image
+                    {
+                        let version_output = util::command::new_smol_command(&command.path)
+                            .args(command.args.iter())
+                            .arg("--version")
+                            .kill_on_drop(true)
+                            .output()
+                            .await;
+                        let current_version =
+                            String::from_utf8(version_output?.stdout)?.trim().to_owned();
+                        if !connection.prompt_capabilities().image {
+                            return Err(LoadError::Unsupported {
+                                current_version: current_version.into(),
+                                command: format!(
+                                    "{} {}",
+                                    command.path.to_string_lossy(),
+                                    command.args.join(" ")
+                                )
+                                .into(),
+                            }
+                            .into());
+                        }
+                    }
+                }
+                Err(_) => {
+                    let version_fut = util::command::new_smol_command(&command.path)
+                        .args(command.args.iter())
+                        .arg("--version")
+                        .kill_on_drop(true)
+                        .output();
 
-                let help_fut = util::command::new_smol_command(&command.path)
-                    .args(command.args.iter())
-                    .arg("--help")
-                    .kill_on_drop(true)
-                    .output();
+                    let help_fut = util::command::new_smol_command(&command.path)
+                        .args(command.args.iter())
+                        .arg("--help")
+                        .kill_on_drop(true)
+                        .output();
 
-                let (version_output, help_output) = futures::future::join(version_fut, help_fut).await;
+                    let (version_output, help_output) =
+                        futures::future::join(version_fut, help_fut).await;
 
-                let current_version = String::from_utf8(version_output?.stdout)?;
-                let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
+                    let current_version = String::from_utf8(version_output?.stdout)?;
+                    let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
 
-                if !supported {
-                    return Err(LoadError::Unsupported {
-                        error_message: format!(
-                            "Your installed version of Gemini CLI ({}, version {}) doesn't support the Agentic Coding Protocol (ACP).",
-                            command.path.to_string_lossy(),
-                            current_version
-                        ).into(),
-                        upgrade_message: "Upgrade Gemini CLI to latest".into(),
-                        upgrade_command: Self::upgrade_command().into(),
-                    }.into())
+                    if !supported {
+                        return Err(LoadError::Unsupported {
+                            current_version: current_version.into(),
+                            command: command.path.to_string_lossy().to_string().into(),
+                        }
+                        .into());
+                    }
                 }
             }
             result
@@ -111,11 +141,11 @@ impl Gemini {
     }
 
     pub fn install_command() -> &'static str {
-        "npm install -g @google/gemini-cli@preview"
+        "npm install -g @google/gemini-cli@latest"
     }
 
     pub fn upgrade_command() -> &'static str {
-        "npm install -g @google/gemini-cli@preview"
+        "npm install -g @google/gemini-cli@latest"
     }
 }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f01a7958a8..54d3421c3b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2825,19 +2825,14 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) -> AnyElement {
         let (message, action_slot): (SharedString, _) = match e {
-            LoadError::NotInstalled {
-                error_message: _,
-                install_message: _,
-                install_command,
-            } => {
-                return self.render_not_installed(install_command.clone(), false, window, cx);
+            LoadError::NotInstalled => {
+                return self.render_not_installed(None, window, cx);
             }
             LoadError::Unsupported {
-                error_message: _,
-                upgrade_message: _,
-                upgrade_command,
+                command: path,
+                current_version,
             } => {
-                return self.render_not_installed(upgrade_command.clone(), true, window, cx);
+                return self.render_not_installed(Some((path, current_version)), window, cx);
             }
             LoadError::Exited { .. } => ("Server exited with status {status}".into(), None),
             LoadError::Other(msg) => (
@@ -2855,8 +2850,11 @@ impl AcpThreadView {
             .into_any_element()
     }
 
-    fn install_agent(&self, install_command: String, window: &mut Window, cx: &mut Context<Self>) {
+    fn install_agent(&self, window: &mut Window, cx: &mut Context<Self>) {
         telemetry::event!("Agent Install CLI", agent = self.agent.telemetry_id());
+        let Some(install_command) = self.agent.install_command().map(|s| s.to_owned()) else {
+            return;
+        };
         let task = self
             .workspace
             .update(cx, |workspace, cx| {
@@ -2899,32 +2897,35 @@ impl AcpThreadView {
 
     fn render_not_installed(
         &self,
-        install_command: String,
-        is_upgrade: bool,
+        existing_version: Option<(&SharedString, &SharedString)>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> AnyElement {
+        let install_command = self.agent.install_command().unwrap_or_default();
+
         self.install_command_markdown.update(cx, |markdown, cx| {
             if !markdown.source().contains(&install_command) {
                 markdown.replace(format!("```\n{}\n```", install_command), cx);
             }
         });
 
-        let (heading_label, description_label, button_label, or_label) = if is_upgrade {
-            (
-                "Upgrade Gemini CLI in Zed",
-                "Get access to the latest version with support for Zed.",
-                "Upgrade Gemini CLI",
-                "Or, to upgrade it manually:",
-            )
-        } else {
-            (
-                "Get Started with Gemini CLI in Zed",
-                "Use Google's new coding agent directly in Zed.",
-                "Install Gemini CLI",
-                "Or, to install it manually:",
-            )
-        };
+        let (heading_label, description_label, button_label) =
+            if let Some((path, version)) = existing_version {
+                (
+                    format!("Upgrade {} to work with Zed", self.agent.name()),
+                    format!(
+                        "Currently using {}, which is only version {}",
+                        path, version
+                    ),
+                    format!("Upgrade {}", self.agent.name()),
+                )
+            } else {
+                (
+                    format!("Get Started with {} in Zed", self.agent.name()),
+                    "Use Google's new coding agent directly in Zed.".to_string(),
+                    format!("Install {}", self.agent.name()),
+                )
+            };
 
         v_flex()
             .w_full()
@@ -2954,12 +2955,10 @@ impl AcpThreadView {
                     .icon_color(Color::Muted)
                     .icon_size(IconSize::Small)
                     .icon_position(IconPosition::Start)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.install_agent(install_command.clone(), window, cx)
-                    })),
+                    .on_click(cx.listener(|this, _, window, cx| this.install_agent(window, cx))),
             )
             .child(
-                Label::new(or_label)
+                Label::new("Or, run the following command in your terminal:")
                     .size(LabelSize::Small)
                     .color(Color::Muted),
             )
@@ -5403,6 +5402,10 @@ pub(crate) mod tests {
             "Test".into()
         }
 
+        fn install_command(&self) -> Option<&'static str> {
+            None
+        }
+
         fn connect(
             &self,
             _root_dir: &Path,

From a3e1611fa86b3de7f65a9d25f16c3a7b107afaf9 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Tue, 26 Aug 2025 22:52:24 -0400
Subject: [PATCH 391/823] Bump Zed to v0.203 (#36975)

Release Notes:

- N/A
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 42649b137f..6ece2bb6bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20396,7 +20396,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.202.0"
+version = "0.203.0"
 dependencies = [
  "acp_tools",
  "activity_indicator",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 6f4ead9ebb..0ddfe3dde1 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "0.202.0"
+version = "0.203.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From abd6009b41595713de847e641bf78e9e46051909 Mon Sep 17 00:00:00 2001
From: Caio Piccirillo <34453935+caiopiccirillo@users.noreply.github.com>
Date: Wed, 27 Aug 2025 01:31:57 -0300
Subject: [PATCH 392/823] Enhance syntax highlight for C++20 keywords (#36817)

Closes #36439 and #32999

## C++20 modules:
Before (Zed Preview v0.201.3):
<img width="1048" height="704" alt="image"
src="https://github.com/user-attachments/assets/8eaaf77f-4e27-4a5a-9e87-4e5ba7293990"
/>
After:
<img width="1048" height="704" alt="image"
src="https://github.com/user-attachments/assets/df8d0b2c-f2d0-4b0e-9a52-495e6be5a8c0"
/>

## C++20 coroutines:
Before (Zed Preview v0.201.3):
<img width="1048" height="704" alt="image"
src="https://github.com/user-attachments/assets/652191ec-a653-444d-a239-da3e4e4b661e"
/>
After:
<img width="1048" height="704" alt="image"
src="https://github.com/user-attachments/assets/36947eb5-8997-483a-b36c-8af84872b158"
/>

## Logical operators:
Before (Zed Preview v0.201.3):
<img width="511" height="102" alt="image"
src="https://github.com/user-attachments/assets/9bf95bac-b076-4edd-a1f3-c3dfee98c2fd"
/>

After:
<img width="511" height="102" alt="image"
src="https://github.com/user-attachments/assets/82c7564d-b94d-41f5-9c48-e39fe3ba3b3e"
/>

## Operator keyword:
Before (Zed Preview v0.201.3):
<img width="591" height="381" alt="image"
src="https://github.com/user-attachments/assets/1d9dad05-2d86-4566-97f4-aff440dcd1df"
/>

After:
<img width="591" height="381" alt="image"
src="https://github.com/user-attachments/assets/a1ca289a-8a5d-4ffd-96db-0d511405da4b"
/>

## Goto:
Before (Zed Preview v0.201.3):
<img width="610" height="430" alt="image"
src="https://github.com/user-attachments/assets/2d00382b-d1ad-4e36-a3ee-88e06ec528ed"
/>

After:
<img width="610" height="430" alt="image"
src="https://github.com/user-attachments/assets/de887b21-66f0-4a70-9ed2-e18dbb3c81c9"
/>

Release Notes:

- Enhance keyword highlighting for C++
---
 Cargo.lock                              |  3 +-
 Cargo.toml                              |  2 +-
 crates/languages/src/cpp/highlights.scm | 68 ++++++++++++++++++++-----
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ece2bb6bf..4325addc39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17185,8 +17185,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-cpp"
 version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2196ea9d47b4ab4a31b9297eaa5a5d19a0b121dceb9f118f6790ad0ab94743"
+source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=5cb9b693cfd7bfacab1d9ff4acac1a4150700609#5cb9b693cfd7bfacab1d9ff4acac1a4150700609"
 dependencies = [
  "cc",
  "tree-sitter-language",
diff --git a/Cargo.toml b/Cargo.toml
index 6ec243a9b9..209c312aec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -624,7 +624,7 @@ tower-http = "0.4.4"
 tree-sitter = { version = "0.25.6", features = ["wasm"] }
 tree-sitter-bash = "0.25.0"
 tree-sitter-c = "0.23"
-tree-sitter-cpp = "0.23"
+tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609" }
 tree-sitter-css = "0.23"
 tree-sitter-diff = "0.1.0"
 tree-sitter-elixir = "0.3"
diff --git a/crates/languages/src/cpp/highlights.scm b/crates/languages/src/cpp/highlights.scm
index 6fa8bd7b08..bd988445bb 100644
--- a/crates/languages/src/cpp/highlights.scm
+++ b/crates/languages/src/cpp/highlights.scm
@@ -3,8 +3,27 @@
 (namespace_identifier) @namespace
 
 (concept_definition
-    (identifier) @concept)
+    name: (identifier) @concept)
 
+(requires_clause
+    constraint: (template_type
+        name: (type_identifier) @concept))
+
+(module_name
+  (identifier) @module)
+
+(module_declaration
+  name: (module_name
+    (identifier) @module))
+
+(import_declaration
+  name: (module_name
+    (identifier) @module))
+
+(import_declaration
+  partition: (module_partition
+    (module_name
+      (identifier) @module)))
 
 (call_expression
   function: (qualified_identifier
@@ -61,6 +80,9 @@
 (operator_name
   (identifier)? @operator) @function
 
+(operator_name
+  "<=>" @operator.spaceship)
+
 (destructor_name (identifier) @function)
 
 ((namespace_identifier) @type
@@ -68,21 +90,17 @@
 
 (auto) @type
 (type_identifier) @type
-type :(primitive_type) @type.primitive
-(sized_type_specifier) @type.primitive
-
-(requires_clause
-    constraint: (template_type
-        name: (type_identifier) @concept))
+type: (primitive_type) @type.builtin
+(sized_type_specifier) @type.builtin
 
 (attribute
-    name: (identifier) @keyword)
+    name: (identifier) @attribute)
 
-((identifier) @constant
- (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
+((identifier) @constant.builtin
+ (#match? @constant.builtin "^_*[A-Z][A-Z\\d_]*$"))
 
 (statement_identifier) @label
-(this) @variable.special
+(this) @variable.builtin
 ("static_assert") @function.builtin
 
 [
@@ -96,7 +114,9 @@ type :(primitive_type) @type.primitive
   "co_return"
   "co_yield"
   "concept"
+  "consteval"
   "constexpr"
+  "constinit"
   "continue"
   "decltype"
   "default"
@@ -105,15 +125,20 @@ type :(primitive_type) @type.primitive
   "else"
   "enum"
   "explicit"
+  "export"
   "extern"
   "final"
   "for"
   "friend"
+  "goto"
   "if"
+  "import"
   "inline"
+  "module"
   "namespace"
   "new"
   "noexcept"
+  "operator"
   "override"
   "private"
   "protected"
@@ -124,6 +149,7 @@ type :(primitive_type) @type.primitive
   "struct"
   "switch"
   "template"
+  "thread_local"
   "throw"
   "try"
   "typedef"
@@ -146,7 +172,7 @@ type :(primitive_type) @type.primitive
   "#ifndef"
   "#include"
   (preproc_directive)
-] @keyword
+] @keyword.directive
 
 (comment) @comment
 
@@ -224,10 +250,24 @@ type :(primitive_type) @type.primitive
   ">"
   "<="
   ">="
-  "<=>"
-  "||"
   "?"
+  "and"
+  "and_eq"
+  "bitand"
+  "bitor"
+  "compl"
+  "not"
+  "not_eq"
+  "or"
+  "or_eq"
+  "xor"
+  "xor_eq"
 ] @operator
 
+"<=>" @operator.spaceship
+
+(binary_expression
+  operator: "<=>" @operator.spaceship)
+
 (conditional_expression ":" @operator)
 (user_defined_literal (literal_suffix) @operator)

From f4071bdd8ea2a3914f169cd3ec4578541b684de0 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 27 Aug 2025 00:24:56 -0600
Subject: [PATCH 393/823] acp: Upgrade errors (#36980)

- **Pass --engine-strict to gemini install command**
- **Make it clearer that if upgrading fails, you need to fix i**

Closes #ISSUE

Release Notes:

- N/A
---
 crates/agent_servers/src/gemini.rs     |  4 ++--
 crates/agent_ui/src/acp/thread_view.rs | 22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 33d92060a4..6d17cc0512 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -39,7 +39,7 @@ impl AgentServer for Gemini {
     }
 
     fn install_command(&self) -> Option<&'static str> {
-        Some("npm install -g @google/gemini-cli@latest")
+        Some("npm install --engine-strict -g @google/gemini-cli@latest")
     }
 
     fn connect(
@@ -141,7 +141,7 @@ impl Gemini {
     }
 
     pub fn install_command() -> &'static str {
-        "npm install -g @google/gemini-cli@latest"
+        "npm install --engine-strict -g @google/gemini-cli@latest"
     }
 
     pub fn upgrade_command() -> &'static str {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 54d3421c3b..70d32088c5 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2913,10 +2913,17 @@ impl AcpThreadView {
             if let Some((path, version)) = existing_version {
                 (
                     format!("Upgrade {} to work with Zed", self.agent.name()),
-                    format!(
-                        "Currently using {}, which is only version {}",
-                        path, version
-                    ),
+                    if version.is_empty() {
+                        format!(
+                            "Currently using {}, which does not report a valid --version",
+                            path,
+                        )
+                    } else {
+                        format!(
+                            "Currently using {}, which is only version {}",
+                            path, version
+                        )
+                    },
                     format!("Upgrade {}", self.agent.name()),
                 )
             } else {
@@ -2966,6 +2973,13 @@ impl AcpThreadView {
                 self.install_command_markdown.clone(),
                 default_markdown_style(false, false, window, cx),
             ))
+            .when_some(existing_version, |el, (path, _)| {
+                el.child(
+                    Label::new(format!("If this does not work you will need to upgrade manually, or uninstall your existing version from {}", path))
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+            })
             .into_any_element()
     }
 

From a03897012e9c22709f26597ce96e8bf4caf8974e Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 27 Aug 2025 09:06:33 +0200
Subject: [PATCH 394/823] Swap `NewlineBelow` and `NewlineAbove` bindings for
 default linux keymap (#36939)

Closes https://github.com/zed-industries/zed/issues/33725

The default bindings for the `editor::NewlineAbove` and
`editor::NewlineBelow` actions in the default keymap were accidentally
swapped some time ago. This causes confusion, as normally these are the
other way around.

This PR fixes this by swapping these back, which also matches what
[VSCode does by
default](https://code.visualstudio.com/shortcuts/keyboard-shortcuts-linux.pdf).

Release Notes:

- Swapped the default bindings for `editor::NewlineBelow` and
`editor::NewlineAbove` for Linux and Windows to align more with other
editors.
---
 assets/keymaps/default-linux.json   | 4 ++--
 assets/keymaps/default-windows.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 3cca560c00..2610f9b705 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -130,8 +130,8 @@
     "bindings": {
       "shift-enter": "editor::Newline",
       "enter": "editor::Newline",
-      "ctrl-enter": "editor::NewlineAbove",
-      "ctrl-shift-enter": "editor::NewlineBelow",
+      "ctrl-enter": "editor::NewlineBelow",
+      "ctrl-shift-enter": "editor::NewlineAbove",
       "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
       "ctrl-k z": "editor::ToggleSoftWrap",
       "find": "buffer_search::Deploy",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index c7a6c3149c..dbd377409f 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -134,8 +134,8 @@
     "bindings": {
       "shift-enter": "editor::Newline",
       "enter": "editor::Newline",
-      "ctrl-enter": "editor::NewlineAbove",
-      "ctrl-shift-enter": "editor::NewlineBelow",
+      "ctrl-enter": "editor::NewlineBelow",
+      "ctrl-shift-enter": "editor::NewlineAbove",
       "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
       "ctrl-k z": "editor::ToggleSoftWrap",
       "find": "buffer_search::Deploy",

From ea347b0aa11c13b0acbccfc015e0c23c790811e3 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 27 Aug 2025 13:00:10 +0530
Subject: [PATCH 395/823] project: Handle capabilities parse for more methods
 when registerOptions doesn't exist (#36984)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #36938

Follow up to https://github.com/zed-industries/zed/pull/36554

When `registerOptions` is `None`, we should fall back instead of
skipping capability registration.

1. `Option<OneOf<bool, T>>`, where `T` is struct – handled in the
attached PR ✅
2. `Option<T>`, where `T` is an enum that can be `Simple(bool)` or
`Options(S)` – this PR ✅
3. `Option<T>`, where `T` is struct – we should fall back to default
values for these options ⚠️

Release Notes:

- Fixed an issue where hover popovers would not appear in language
servers like Java.
---
 crates/project/src/lsp_store.rs | 58 +++++++++++++++------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index deebaedd74..b92d739360 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11778,17 +11778,15 @@ impl LspStore {
                     notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/codeAction" => {
-                    if let Some(options) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.code_action_provider =
-                                Some(lsp::CodeActionProviderCapability::Options(options));
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::CodeActionProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    server.update_capabilities(|capabilities| {
+                        capabilities.code_action_provider = Some(provider);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/definition" => {
                     let options = parse_register_capabilities(reg)?;
@@ -11810,16 +11808,15 @@ impl LspStore {
                     }
                 }
                 "textDocument/hover" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.hover_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::HoverProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    server.update_capabilities(|capabilities| {
+                        capabilities.hover_provider = Some(provider);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 "textDocument/signatureHelp" => {
                     if let Some(caps) = reg
@@ -11904,16 +11901,15 @@ impl LspStore {
                     }
                 }
                 "textDocument/documentColor" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.color_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
+                    let options = parse_register_capabilities(reg)?;
+                    let provider = match options {
+                        OneOf::Left(value) => lsp::ColorProviderCapability::Simple(value),
+                        OneOf::Right(caps) => caps,
+                    };
+                    server.update_capabilities(|capabilities| {
+                        capabilities.color_provider = Some(provider);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
                 }
                 _ => log::warn!("unhandled capability registration: {reg:?}"),
             }

From e5c0614e8852fbb7151fbee3d1f21f7559d4ab92 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 27 Aug 2025 11:18:15 +0200
Subject: [PATCH 396/823] Ensure we use the new agent when opening the panel
 for the first time (#36988)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index d1cf748733..624cb5c0c6 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -618,6 +618,10 @@ impl AgentPanel {
                         }
                         cx.notify();
                     });
+                } else {
+                    panel.update(cx, |panel, cx| {
+                        panel.new_agent_thread(AgentType::NativeAgent, window, cx);
+                    });
                 }
                 panel
             })?;

From b4d4294bee6840e09814e399fb78dd7201c9247a Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 27 Aug 2025 11:29:17 +0200
Subject: [PATCH 397/823] Restore token count for text threads (#36989)

Release Notes:

- N/A

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/agent_ui/src/agent_panel.rs        |   7 +-
 crates/agent_ui/src/text_thread_editor.rs | 110 +++++++++++-----------
 2 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 624cb5c0c6..586a782bc3 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -29,7 +29,6 @@ use crate::{
     slash_command::SlashCommandCompletionProvider,
     text_thread_editor::{
         AgentPanelDelegate, TextThreadEditor, humanize_token_count, make_lsp_adapter_delegate,
-        render_remaining_tokens,
     },
     thread_history::{HistoryEntryElement, ThreadHistory},
     ui::{AgentOnboardingModal, EndTrialUpsell},
@@ -2875,12 +2874,8 @@ impl AgentPanel {
 
                 Some(token_count)
             }
-            ActiveView::TextThread { context_editor, .. } => {
-                let element = render_remaining_tokens(context_editor, cx)?;
-
-                Some(element.into_any_element())
-            }
             ActiveView::ExternalAgentThread { .. }
+            | ActiveView::TextThread { .. }
             | ActiveView::History
             | ActiveView::Configuration => None,
         }
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index e9e7eba4b6..70ec94beea 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1857,6 +1857,53 @@ impl TextThreadEditor {
             .update(cx, |context, cx| context.summarize(true, cx));
     }
 
+    fn render_remaining_tokens(&self, cx: &App) -> Option<impl IntoElement + use<>> {
+        let (token_count_color, token_count, max_token_count, tooltip) =
+            match token_state(&self.context, cx)? {
+                TokenState::NoTokensLeft {
+                    max_token_count,
+                    token_count,
+                } => (
+                    Color::Error,
+                    token_count,
+                    max_token_count,
+                    Some("Token Limit Reached"),
+                ),
+                TokenState::HasMoreTokens {
+                    max_token_count,
+                    token_count,
+                    over_warn_threshold,
+                } => {
+                    let (color, tooltip) = if over_warn_threshold {
+                        (Color::Warning, Some("Token Limit is Close to Exhaustion"))
+                    } else {
+                        (Color::Muted, None)
+                    };
+                    (color, token_count, max_token_count, tooltip)
+                }
+            };
+
+        Some(
+            h_flex()
+                .id("token-count")
+                .gap_0p5()
+                .child(
+                    Label::new(humanize_token_count(token_count))
+                        .size(LabelSize::Small)
+                        .color(token_count_color),
+                )
+                .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
+                .child(
+                    Label::new(humanize_token_count(max_token_count))
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                )
+                .when_some(tooltip, |element, tooltip| {
+                    element.tooltip(Tooltip::text(tooltip))
+                }),
+        )
+    }
+
     fn render_send_button(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let focus_handle = self.focus_handle(cx);
 
@@ -2420,9 +2467,14 @@ impl Render for TextThreadEditor {
                     )
                     .child(
                         h_flex()
-                            .gap_1()
-                            .child(self.render_language_model_selector(window, cx))
-                            .child(self.render_send_button(window, cx)),
+                            .gap_2p5()
+                            .children(self.render_remaining_tokens(cx))
+                            .child(
+                                h_flex()
+                                    .gap_1()
+                                    .child(self.render_language_model_selector(window, cx))
+                                    .child(self.render_send_button(window, cx)),
+                            ),
                     ),
             )
     }
@@ -2710,58 +2762,6 @@ impl FollowableItem for TextThreadEditor {
     }
 }
 
-pub fn render_remaining_tokens(
-    context_editor: &Entity<TextThreadEditor>,
-    cx: &App,
-) -> Option<impl IntoElement + use<>> {
-    let context = &context_editor.read(cx).context;
-
-    let (token_count_color, token_count, max_token_count, tooltip) = match token_state(context, cx)?
-    {
-        TokenState::NoTokensLeft {
-            max_token_count,
-            token_count,
-        } => (
-            Color::Error,
-            token_count,
-            max_token_count,
-            Some("Token Limit Reached"),
-        ),
-        TokenState::HasMoreTokens {
-            max_token_count,
-            token_count,
-            over_warn_threshold,
-        } => {
-            let (color, tooltip) = if over_warn_threshold {
-                (Color::Warning, Some("Token Limit is Close to Exhaustion"))
-            } else {
-                (Color::Muted, None)
-            };
-            (color, token_count, max_token_count, tooltip)
-        }
-    };
-
-    Some(
-        h_flex()
-            .id("token-count")
-            .gap_0p5()
-            .child(
-                Label::new(humanize_token_count(token_count))
-                    .size(LabelSize::Small)
-                    .color(token_count_color),
-            )
-            .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
-            .child(
-                Label::new(humanize_token_count(max_token_count))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .when_some(tooltip, |element, tooltip| {
-                element.tooltip(Tooltip::text(tooltip))
-            }),
-    )
-}
-
 enum PendingSlashCommand {}
 
 fn invoked_slash_command_fold_placeholder(

From c72e594afeeea634739d6db90b63c129600dee7c Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 27 Aug 2025 13:08:03 +0200
Subject: [PATCH 398/823] acp: Fix model selector sometimes showing no models
 (#36995)

Release Notes:

- N/A
---
 crates/agent2/src/agent.rs | 51 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 6fa36d33d5..51e1fc6316 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -61,16 +61,19 @@ pub struct LanguageModels {
     model_list: acp_thread::AgentModelList,
     refresh_models_rx: watch::Receiver<()>,
     refresh_models_tx: watch::Sender<()>,
+    _authenticate_all_providers_task: Task<()>,
 }
 
 impl LanguageModels {
-    fn new(cx: &App) -> Self {
+    fn new(cx: &mut App) -> Self {
         let (refresh_models_tx, refresh_models_rx) = watch::channel(());
+
         let mut this = Self {
             models: HashMap::default(),
             model_list: acp_thread::AgentModelList::Grouped(IndexMap::default()),
             refresh_models_rx,
             refresh_models_tx,
+            _authenticate_all_providers_task: Self::authenticate_all_language_model_providers(cx),
         };
         this.refresh_list(cx);
         this
@@ -150,6 +153,52 @@ impl LanguageModels {
     fn model_id(model: &Arc<dyn LanguageModel>) -> acp_thread::AgentModelId {
         acp_thread::AgentModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
     }
+
+    fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
+        let authenticate_all_providers = LanguageModelRegistry::global(cx)
+            .read(cx)
+            .providers()
+            .iter()
+            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
+            .collect::<Vec<_>>();
+
+        cx.background_spawn(async move {
+            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
+                if let Err(err) = authenticate_task.await {
+                    if matches!(err, language_model::AuthenticateError::CredentialsNotFound) {
+                        // Since we're authenticating these providers in the
+                        // background for the purposes of populating the
+                        // language selector, we don't care about providers
+                        // where the credentials are not found.
+                    } else {
+                        // Some providers have noisy failure states that we
+                        // don't want to spam the logs with every time the
+                        // language model selector is initialized.
+                        //
+                        // Ideally these should have more clear failure modes
+                        // that we know are safe to ignore here, like what we do
+                        // with `CredentialsNotFound` above.
+                        match provider_id.0.as_ref() {
+                            "lmstudio" | "ollama" => {
+                                // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
+                                //
+                                // These fail noisily, so we don't log them.
+                            }
+                            "copilot_chat" => {
+                                // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
+                            }
+                            _ => {
+                                log::error!(
+                                    "Failed to authenticate provider: {}: {err}",
+                                    provider_name.0
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        })
+    }
 }
 
 pub struct NativeAgent {

From d99a17e35777a63e3079bbce82a4c06f49706df9 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 27 Aug 2025 09:12:52 -0300
Subject: [PATCH 399/823] docs: Add ACP-related content (#36966)

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Matt Miller <mattrx@gmail.com>
---
 docs/src/SUMMARY.md            |  1 +
 docs/src/ai/agent-panel.md     | 27 ++++++-----
 docs/src/ai/external-agents.md | 82 ++++++++++++++++++++++++++++++++++
 docs/src/ai/overview.md        |  2 +
 4 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 docs/src/ai/external-agents.md

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 251cad6234..9d07881914 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -47,6 +47,7 @@
 - [Overview](./ai/overview.md)
 - [Agent Panel](./ai/agent-panel.md)
   - [Tools](./ai/tools.md)
+  - [External Agents](./ai/external-agents.md)
 - [Inline Assistant](./ai/inline-assistant.md)
 - [Edit Prediction](./ai/edit-prediction.md)
 - [Text Threads](./ai/text-threads.md)
diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index f944eb88b0..13d92278a4 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -1,14 +1,15 @@
 # Agent Panel
 
-The Agent Panel provides you with a surface to interact with LLMs, enabling various types of tasks, such as generating code, asking questions about your codebase, and general inquiries like emails, documentation, and more.
+The Agent Panel allows you to interact with many LLMs and coding agents that can support you in various types of tasks, such as generating code, codebase understanding, and other general inquiries like writing emails, documentation, and more.
 
 To open it, use the `agent: new thread` action in [the Command Palette](../getting-started.md#command-palette) or click the ✨ (sparkles) icon in the status bar.
 
-If you're using the Agent Panel for the first time, you need to have at least one LLM provider configured.
+If you're using the Agent Panel for the first time, you need to have at least one LLM or agent provider configured.
 You can do that by:
 
 1. [subscribing to our Pro plan](https://zed.dev/pricing), so you have access to our hosted models
-2. or by [bringing your own API keys](./llm-providers.md#use-your-own-keys) for your desired provider
+2. [bringing your own API keys](./llm-providers.md#use-your-own-keys) for your desired provider
+3. using an external agent like [Gemini CLI](./external-agents.md#gemini-cli)
 
 ## Overview {#overview}
 
@@ -17,6 +18,15 @@ If you need extra room to type, you can expand the message editor with {#kb agen
 
 You should start to see the responses stream in with indications of [which tools](./tools.md) the model is using to fulfill your prompt.
 
+> Note that, at the moment, not all features outlined below work for external agents, like [Gemini CLI](./external-agents.md#gemini-cli)—features like _checkpoints_, _token usage display_, and _model selection_ may be supported in the future.
+
+### Creating New Threads
+
+By default, the Agent Panel uses Zed's first-party agent.
+
+To change that, go to the plus button in the top-right of the Agent Panel and choose another option.
+You choose to create a new [Text Thread](./text-threads.md) or, if you have [external agents](/.external-agents.md) connected, you can create new threads with them.
+
 ### Editing Messages {#editing-messages}
 
 Any message that you send to the AI is editable.
@@ -30,7 +40,7 @@ The checkpoint button appears even if you interrupt the thread midway through an
 
 ### Navigating History {#navigating-history}
 
-To quickly navigate through recently opened threads, use the {#kb agent::ToggleNavigationMenu} binding, when focused on the panel's editor, or click the menu icon button at the top left of the panel to open the dropdown that shows you the six most recent threads.
+To quickly navigate through recently opened threads, use the {#kb agent::ToggleNavigationMenu} binding, when focused on the panel's editor, or click the menu icon button at the top right of the panel to open the dropdown that shows you the six most recent threads.
 
 The items in this menu function similarly to tabs, and closing them doesn’t delete the thread; instead, it simply removes them from the recent list.
 
@@ -70,16 +80,13 @@ So, if your active tab had edits made by the AI, you'll see diffs with the same
 
 Although Zed's agent is very efficient at reading through your code base to autonomously pick up relevant files, directories, and other context, manually adding context is still encouraged as a way to speed up and improve the AI's response quality.
 
-If you have a tab open while using the Agent Panel, that tab appears as a suggested context in form of a dashed button.
-You can also add other forms of context by either mentioning them with `@` or hitting the `+` icon button.
-
-You can even add previous threads as context by mentioning them with `@thread`, or by selecting the "New From Summary" option from the `+` menu to continue a longer conversation, keeping it within the context window.
+To add any file, directory, symbol, previous threads, rules files, or even web pages as context, type `@` to mention them in the editor.
 
 Pasting images as context is also supported by the Agent Panel.
 
 ### Token Usage {#token-usage}
 
-Zed surfaces how many tokens you are consuming for your currently active thread in the panel's toolbar.
+Zed surfaces how many tokens you are consuming for your currently active thread nearby the profile selector in the panel's message editor.
 Depending on how many pieces of context you add, your token consumption can grow rapidly.
 
 With that in mind, once you get close to the model's context window, a banner appears below the message editor suggesting to start a new thread with the current one summarized and added as context.
@@ -145,7 +152,7 @@ Zed's UI will inform about this via a warning icon that appears close to the mod
 
 ## Text Threads {#text-threads}
 
-["Text threads"](./text-threads.md) present your conversation with the LLM in a different format—as raw text.
+["Text Threads"](./text-threads.md) present your conversation with the LLM in a different format—as raw text.
 With text threads, you have full control over the conversation data.
 You can remove and edit responses from the LLM, swap roles, and include more context earlier in the conversation.
 
diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
new file mode 100644
index 0000000000..a67aa9d889
--- /dev/null
+++ b/docs/src/ai/external-agents.md
@@ -0,0 +1,82 @@
+# External Agents
+
+Zed supports terminal-based agentic coding tools through the [Agent Client Protocol (ACP)](https://agentclientprotocol.com).
+
+Currently, [Gemini CLI](https://github.com/google-gemini/gemini-cli) serves as the reference implementation, and you can [add custom ACP-compatible agents](#add-custom-agents) as well.
+
+## Gemini CLI {#gemini-cli}
+
+Zed provides the ability to run [Gemini CLI](https://github.com/google-gemini/gemini-cli) directly in the [agent panel](./agent-panel.md).
+
+Under the hood we run Gemini CLI in the background, and talk to it over ACP.
+This means that you're running the real Gemini CLI, with all of the advantages of that, but you can see and interact with files in your editor.
+
+### Getting Started
+
+As of Zed Stable v0.201.5 you should be able to use Gemini CLI directly from Zed. First open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a New Gemini CLI thread.
+
+If you'd like to bind this to a keyboard shortcut, you can do so by editing your keybindings file to include:
+
+```json
+[
+  {
+    "bindings": {
+      "cmd-alt-g": ["agent::NewExternalAgentThread", { "agent": "gemini" }]
+    }
+  }
+]
+```
+
+#### Installation
+
+If you don't yet have Gemini CLI installed, then Zed will install a version for you. If you do, then we will use the version of Gemini CLI on your path.
+
+You need to be running at least Gemini version `0.2.0-preview`, and if your version of Gemini is too old you will see an
+error message.
+
+The instructions to upgrade Gemini depend on how you originally installed it, but typically, running `npm install -g gemini-cli@preview` should work.
+
+#### Authentication
+
+After you have Gemini CLI running, you'll be prompted to choose your authentication method.
+
+Most users should click the "Log in with Google". This will cause a browser window to pop-up and auth directly with Gemini CLI. Zed does not see your oauth or access tokens in this case.
+
+You can also use the "Gemini API Key". If you select this, and have the `GEMINI_API_KEY` set, then we will use that. Otherwise Zed will prompt you for an API key which will be stored securely in your keychain, and used to start Gemini CLI from within Zed.
+
+The "Vertex AI" option is for those who are using Vertex AI, and have already configured their environment correctly.
+
+For more information, see the [Gemini CLI docs](https://github.com/google-gemini/gemini-cli/blob/main/docs/index.md).
+
+### Usage
+
+Similar to Zed's first-party agent, you can use Gemini CLI to do anything that you need.
+
+You can @-mention files, recent threads, symbols, or fetch the web.
+
+Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, and checkpointing.
+We hope to add these features in the near future.
+
+## Add Custom Agents {#add-custom-agents}
+
+You can run any agent speaking ACP in Zed by changing your settings as follows:
+
+```json
+{
+  "agent_servers": {
+    "Custom Agent": {
+      "command": "node",
+      "args": ["~/projects/agent/index.js", "--acp"],
+      "env": {}
+    }
+  }
+}
+```
+
+This can also be useful if you're in the middle of developing a new agent that speaks the protocol and you want to debug it.
+
+## Debugging Agents
+
+When using external agents in Zed, you can access the debug view via with `dev: open acp logs` from the Command Palette. This lets you see the messages being sent and received between Zed and the agent.
+
+![The debug view for ACP logs.](https://zed.dev/img/acp/acp-logs.webp)
diff --git a/docs/src/ai/overview.md b/docs/src/ai/overview.md
index 6f081cb243..8bd45240fd 100644
--- a/docs/src/ai/overview.md
+++ b/docs/src/ai/overview.md
@@ -6,6 +6,8 @@ Learn how to get started using AI with Zed and all its capabilities.
 
 - [Configuration](./configuration.md): Learn how to set up different language model providers like Anthropic, OpenAI, Ollama, Google AI, and more.
 
+- [External Agents](./external-agents.md): Learn how to plug in your favorite agent into Zed.
+
 - [Subscription](./subscription.md): Learn about Zed's hosted model service and other billing-related information.
 
 - [Privacy and Security](./privacy-and-security.md): Understand how Zed handles privacy and security with AI features.

From 54f9b67de2f5e943b671a19861675c2b90d06486 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 27 Aug 2025 14:51:06 +0200
Subject: [PATCH 400/823] docs: Document more settings (#36993)

Within our hosted docs, we are missing documentation for quite a lot of
settings - sometimes for newer settings, sometimes for settings that are
more than two years old. This leads (amongst other things) to feature
requests for features that are already supported, false issue reports
(because people couldn't find the setting for what caused the issue
within the documentation) and generally just takes time for for both
these affected by the missing documentation as well as these handling
the questions around it.

This change here takes a stab at the problem by adding more
documentation for a lot supported setting (not all of it) as well as
reorganizing some settings so that some stuff can (hopefully) be found
more easily. Eventually, we should find a better method for this, but
it's still better than informing people for the n-th time that we e.g.
have `agent_font_size` for the agent panel. Manually audited twice but
I'll take another thorough look before merging.

Release Notes:

- N/A
---
 docs/src/configuring-zed.md | 1146 ++++++++++++++++++++++++++++++++---
 1 file changed, 1062 insertions(+), 84 deletions(-)

diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index a8a4689689..9634ca0f6c 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -104,6 +104,70 @@ Non-negative `float` values
 }
 ```
 
+## Agent Font Size
+
+- Description: The font size for text in the agent panel. Inherits the UI font size if unset.
+- Setting: `agent_font_size`
+- Default: `null`
+
+**Options**
+
+`integer` values from `6` to `100` pixels (inclusive)
+
+## Allow Rewrap
+
+- Description: Controls where the `editor::Rewrap` action is allowed in the current language scope
+- Setting: `allow_rewrap`
+- Default: `"in_comments"`
+
+**Options**
+
+1. Allow rewrap in comments only:
+
+```json
+{
+  "allow_rewrap": "in_comments"
+}
+```
+
+2. Allow rewrap everywhere:
+
+```json
+{
+  "allow_rewrap": "everywhere"
+}
+```
+
+3. Never allow rewrap:
+
+```json
+{
+  "allow_rewrap": "never"
+}
+```
+
+Note: This setting has no effect in Vim mode, as rewrap is already allowed everywhere.
+
+## Auto Indent
+
+- Description: Whether indentation should be adjusted based on the context whilst typing. This can be specified on a per-language basis.
+- Setting: `auto_indent`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Auto Indent On Paste
+
+- Description: Whether indentation of pasted content should be adjusted based on the context
+- Setting: `auto_indent_on_paste`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
 ## Auto Install extensions
 
 - Description: Define extensions to be autoinstalled or never be installed.
@@ -182,38 +246,6 @@ Define extensions which should be installed (`true`) or never installed (`false`
 }
 ```
 
-## Restore on Startup
-
-- Description: Controls session restoration on startup.
-- Setting: `restore_on_startup`
-- Default: `last_session`
-
-**Options**
-
-1. Restore all workspaces that were open when quitting Zed:
-
-```json
-{
-  "restore_on_startup": "last_session"
-}
-```
-
-2. Restore the workspace that was closed last:
-
-```json
-{
-  "restore_on_startup": "last_workspace"
-}
-```
-
-3. Always start with an empty editor:
-
-```json
-{
-  "restore_on_startup": "none"
-}
-```
-
 ## Autoscroll on Clicks
 
 - Description: Whether to scroll when clicking near the edge of the visible text area.
@@ -224,6 +256,26 @@ Define extensions which should be installed (`true`) or never installed (`false`
 
 `boolean` values
 
+## Auto Signature Help
+
+- Description: Show method signatures in the editor, when inside parentheses
+- Setting: `auto_signature_help`
+- Default: `false`
+
+**Options**
+
+`boolean` values
+
+### Show Signature Help After Edits
+
+- Description: Whether to show the signature help after completion or a bracket pair inserted. If `auto_signature_help` is enabled, this setting will be treated as enabled also.
+- Setting: `show_signature_help_after_edits`
+- Default: `false`
+
+**Options**
+
+`boolean` values
+
 ## Auto Update
 
 - Description: Whether or not to automatically check for updates.
@@ -378,6 +430,24 @@ For example, to use `Nerd Font` as a fallback, add the following to your setting
 
 `"standard"`, `"comfortable"` or `{ "custom": float }` (`1` is compact, `2` is loose)
 
+## Centered Layout
+
+- Description: Configuration for the centered layout mode.
+- Setting: `centered_layout`
+- Default:
+
+```json
+"centered_layout": {
+  "left_padding": 0.2,
+  "right_padding": 0.2,
+}
+```
+
+**Options**
+
+The `left_padding` and `right_padding` options define the relative width of the
+left and right padding of the central pane from the workspace when the centered layout mode is activated. Valid values range is from `0` to `0.4`.
+
 ## Close on File Delete
 
 - Description: Whether to automatically close editor tabs when their corresponding files are deleted from disk.
@@ -402,23 +472,63 @@ Note: Dirty files (files with unsaved changes) will not be automatically closed
 
 `boolean` values
 
-## Centered Layout
+## Diagnostics Max Severity
 
-- Description: Configuration for the centered layout mode.
-- Setting: `centered_layout`
-- Default:
-
-```json
-"centered_layout": {
-  "left_padding": 0.2,
-  "right_padding": 0.2,
-}
-```
+- Description: Which level to use to filter out diagnostics displayed in the editor
+- Setting: `diagnostics_max_severity`
+- Default: `null`
 
 **Options**
 
-The `left_padding` and `right_padding` options define the relative width of the
-left and right padding of the central pane from the workspace when the centered layout mode is activated. Valid values range is from `0` to `0.4`.
+1. Allow all diagnostics (default):
+
+```json
+{
+  "diagnostics_max_severity": null
+}
+```
+
+2. Show only errors:
+
+```json
+{
+  "diagnostics_max_severity": "error"
+}
+```
+
+3. Show errors and warnings:
+
+```json
+{
+  "diagnostics_max_severity": "warning"
+}
+```
+
+4. Show errors, warnings, and information:
+
+```json
+{
+  "diagnostics_max_severity": "information"
+}
+```
+
+5. Show all including hints:
+
+```json
+{
+  "diagnostics_max_severity": "hint"
+}
+```
+
+## Disable AI
+
+- Description: Whether to disable all AI features in Zed
+- Setting: `disable_ai`
+- Default: `false`
+
+**Options**
+
+`boolean` values
 
 ## Direnv Integration
 
@@ -435,6 +545,42 @@ There are two options to choose from:
 1. `shell_hook`: Use the shell hook to load direnv. This relies on direnv to activate upon entering the directory. Supports POSIX shells and fish.
 2. `direct`: Use `direnv export json` to load direnv. This will load direnv directly without relying on the shell hook and might cause some inconsistencies. This allows direnv to work with any shell.
 
+## Double Click In Multibuffer
+
+- Description: What to do when multibuffer is double clicked in some of its excerpts (parts of singleton buffers)
+- Setting: `double_click_in_multibuffer`
+- Default: `"select"`
+
+**Options**
+
+1. Behave as a regular buffer and select the whole word (default):
+
+```json
+{
+  "double_click_in_multibuffer": "select"
+}
+```
+
+2. Open the excerpt clicked as a new buffer in the new tab:
+
+```json
+{
+  "double_click_in_multibuffer": "open"
+}
+```
+
+For the case of "open", regular selection behavior can be achieved by holding `alt` when double clicking.
+
+## Drop Target Size
+
+- Description: Relative size of the drop target in the editor that will open dropped file as a split pane (0-0.5). For example, 0.25 means if you drop onto the top/bottom quarter of the pane a new vertical split will be used, if you drop onto the left/right quarter of the pane a new horizontal split will be used.
+- Setting: `drop_target_size`
+- Default: `0.2`
+
+**Options**
+
+`float` values between `0` and `0.5`
+
 ## Edit Predictions
 
 - Description: Settings for edit predictions.
@@ -581,6 +727,32 @@ List of `string` values
 "cursor_shape": "hollow"
 ```
 
+## Gutter
+
+- Description: Settings for the editor gutter
+- Setting: `gutter`
+- Default:
+
+```json
+{
+  "gutter": {
+    "line_numbers": true,
+    "runnables": true,
+    "breakpoints": true,
+    "folds": true,
+    "min_line_number_digits": 4
+  }
+}
+```
+
+**Options**
+
+- `line_numbers`: Whether to show line numbers in the gutter
+- `runnables`: Whether to show runnable buttons in the gutter
+- `breakpoints`: Whether to show breakpoints in the gutter
+- `folds`: Whether to show fold buttons in the gutter
+- `min_line_number_digits`: Minimum number of characters to reserve space for in the gutter
+
 ## Hide Mouse
 
 - Description: Determines when the mouse cursor should be hidden in an editor or input box.
@@ -1269,6 +1441,26 @@ Each option controls displaying of a particular toolbar element. If all elements
 
 `boolean` values
 
+## Expand Excerpt Lines
+
+- Description: The default number of lines to expand excerpts in the multibuffer by
+- Setting: `expand_excerpt_lines`
+- Default: `5`
+
+**Options**
+
+Positive `integer` values
+
+## Extend Comment On Newline
+
+- Description: Whether to start a new line with a comment when a previous line is a comment as well.
+- Setting: `extend_comment_on_newline`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
 ## Status Bar
 
 - Description: Control various elements in the status bar. Note that some items in the status bar have their own settings set elsewhere.
@@ -1327,6 +1519,24 @@ While other options may be changed at a runtime and should be placed under `sett
 }
 ```
 
+## Global LSP Settings
+
+- Description: Configuration for global LSP settings that apply to all language servers
+- Setting: `global_lsp_settings`
+- Default:
+
+```json
+{
+  "global_lsp_settings": {
+    "button": true
+  }
+}
+```
+
+**Options**
+
+- `button`: Whether to show the LSP status button in the status bar
+
 ## LSP Highlight Debounce
 
 - Description: The debounce delay in milliseconds before querying highlights from the language server based on the current cursor location.
@@ -1349,6 +1559,68 @@ While other options may be changed at a runtime and should be placed under `sett
 
 `integer` values representing milliseconds
 
+## Features
+
+- Description: Features that can be globally enabled or disabled
+- Setting: `features`
+- Default:
+
+```json
+{
+  "features": {
+    "edit_prediction_provider": "zed"
+  }
+}
+```
+
+### Edit Prediction Provider
+
+- Description: Which edit prediction provider to use
+- Setting: `edit_prediction_provider`
+- Default: `"zed"`
+
+**Options**
+
+1. Use Zeta as the edit prediction provider:
+
+```json
+{
+  "features": {
+    "edit_prediction_provider": "zed"
+  }
+}
+```
+
+2. Use Copilot as the edit prediction provider:
+
+```json
+{
+  "features": {
+    "edit_prediction_provider": "copilot"
+  }
+}
+```
+
+3. Use Supermaven as the edit prediction provider:
+
+```json
+{
+  "features": {
+    "edit_prediction_provider": "supermaven"
+  }
+}
+```
+
+4. Turn off edit predictions across all providers
+
+```json
+{
+  "features": {
+    "edit_prediction_provider": "none"
+  }
+}
+```
+
 ## Format On Save
 
 - Description: Whether or not to perform a buffer format before saving.
@@ -1892,6 +2164,50 @@ Example:
 }
 ```
 
+## Go to Definition Fallback
+
+- Description: What to do when the "go to definition" action fails to find a definition
+- Setting: `go_to_definition_fallback`
+- Default: `"find_all_references"`
+
+**Options**
+
+1. Do nothing:
+
+```json
+{
+  "go_to_definition_fallback": "none"
+}
+```
+
+2. Find references for the same symbol (default):
+
+```json
+{
+  "go_to_definition_fallback": "find_all_references"
+}
+```
+
+## Hard Tabs
+
+- Description: Whether to indent lines using tab characters or multiple spaces.
+- Setting: `hard_tabs`
+- Default: `false`
+
+**Options**
+
+`boolean` values
+
+## Helix Mode
+
+- Description: Whether or not to enable Helix mode. Enabling `helix_mode` also enables `vim_mode`. See the [Helix documentation](./helix.md) for more details.
+- Setting: `helix_mode`
+- Default: `false`
+
+**Options**
+
+`boolean` values
+
 ## Indent Guides
 
 - Description: Configuration related to indent guides. Indent guides can be configured separately for each language.
@@ -1961,40 +2277,6 @@ Example:
 }
 ```
 
-## Hard Tabs
-
-- Description: Whether to indent lines using tab characters or multiple spaces.
-- Setting: `hard_tabs`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Multi Cursor Modifier
-
-- Description: Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
-- Setting: `multi_cursor_modifier`
-- Default: `alt`
-
-**Options**
-
-1. Maps to `Alt` on Linux and Windows and to `Option` on MacOS:
-
-```json
-{
-  "multi_cursor_modifier": "alt"
-}
-```
-
-2. Maps `Control` on Linux and Windows and to `Command` on MacOS:
-
-```json
-{
-  "multi_cursor_modifier": "cmd_or_ctrl" // alias: "cmd", "ctrl"
-}
-```
-
 ## Hover Popover Enabled
 
 - Description: Whether or not to show the informational hover box when moving the mouse over symbols in the editor.
@@ -2087,6 +2369,50 @@ Run the `icon theme selector: toggle` action in the command palette to see a cur
 
 Run the `icon theme selector: toggle` action in the command palette to see a current list of valid icon themes names.
 
+## Image Viewer
+
+- Description: Settings for image viewer functionality
+- Setting: `image_viewer`
+- Default:
+
+```json
+{
+  "image_viewer": {
+    "unit": "binary"
+  }
+}
+```
+
+**Options**
+
+### Unit
+
+- Description: The unit for image file sizes
+- Setting: `unit`
+- Default: `"binary"`
+
+**Options**
+
+1. Use binary units (KiB, MiB):
+
+```json
+{
+  "image_viewer": {
+    "unit": "binary"
+  }
+}
+```
+
+2. Use decimal units (KB, MB):
+
+```json
+{
+  "image_viewer": {
+    "unit": "decimal"
+  }
+}
+```
+
 ## Inlay hints
 
 - Description: Configuration for displaying extra text with hints in the editor.
@@ -2187,6 +2513,24 @@ Unspecified values have a `false` value, hints won't be toggled if all the modif
 }
 ```
 
+## JSX Tag Auto Close
+
+- Description: Whether to automatically close JSX tags
+- Setting: `jsx_tag_auto_close`
+- Default:
+
+```json
+{
+  "jsx_tag_auto_close": {
+    "enabled": true
+  }
+}
+```
+
+**Options**
+
+- `enabled`: Whether to enable automatic JSX tag closing
+
 ## Languages
 
 - Description: Configuration for specific languages.
@@ -2228,6 +2572,145 @@ The following settings can be overridden for each specific language:
 
 These values take in the same options as the root-level settings with the same name.
 
+## Language Models
+
+- Description: Configuration for language model providers
+- Setting: `language_models`
+- Default:
+
+```json
+{
+  "language_models": {
+    "anthropic": {
+      "api_url": "https://api.anthropic.com"
+    },
+    "google": {
+      "api_url": "https://generativelanguage.googleapis.com"
+    },
+    "ollama": {
+      "api_url": "http://localhost:11434"
+    },
+    "openai": {
+      "api_url": "https://api.openai.com/v1"
+    }
+  }
+}
+```
+
+**Options**
+
+Configuration for various AI model providers including API URLs and authentication settings.
+
+## Line Indicator Format
+
+- Description: Format for line indicator in the status bar
+- Setting: `line_indicator_format`
+- Default: `"short"`
+
+**Options**
+
+1. Short format:
+
+```json
+{
+  "line_indicator_format": "short"
+}
+```
+
+2. Long format:
+
+```json
+{
+  "line_indicator_format": "long"
+}
+```
+
+## Linked Edits
+
+- Description: Whether to perform linked edits of associated ranges, if the language server supports it. For example, when editing opening `<html>` tag, the contents of the closing `</html>` tag will be edited as well.
+- Setting: `linked_edits`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## LSP Document Colors
+
+- Description: Whether to show document color information from the language server
+- Setting: `lsp_document_colors`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Max Tabs
+
+- Description: Maximum number of tabs to show in the tab bar
+- Setting: `max_tabs`
+- Default: `null`
+
+**Options**
+
+Positive `integer` values or `null` for unlimited tabs
+
+## Middle Click Paste (Linux only)
+
+- Description: Enable middle-click paste on Linux
+- Setting: `middle_click_paste`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Multi Cursor Modifier
+
+- Description: Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
+- Setting: `multi_cursor_modifier`
+- Default: `alt`
+
+**Options**
+
+1. Maps to `Alt` on Linux and Windows and to `Option` on MacOS:
+
+```json
+{
+  "multi_cursor_modifier": "alt"
+}
+```
+
+2. Maps `Control` on Linux and Windows and to `Command` on MacOS:
+
+```json
+{
+  "multi_cursor_modifier": "cmd_or_ctrl" // alias: "cmd", "ctrl"
+}
+```
+
+## Node
+
+- Description: Configuration for Node.js integration
+- Setting: `node`
+- Default:
+
+```json
+{
+  "node": {
+    "ignore_system_version": false,
+    "path": null,
+    "npm_path": null
+  }
+}
+```
+
+**Options**
+
+- `ignore_system_version`: Whether to ignore the system Node.js version
+- `path`: Custom path to Node.js binary
+- `npm_path`: Custom path to npm binary
+
 ## Network Proxy
 
 - Description: Configure a network proxy for Zed.
@@ -2269,6 +2752,52 @@ Or to set a `socks5` proxy:
 
 If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` environment variable. This accepts a comma-separated list of hostnames, host suffixes, IPv4/IPv6 addresses or blocks that should not use the proxy. For example if your environment included `NO_PROXY="google.com, 192.168.1.0/24"` all hosts in `192.168.1.*`, `google.com` and `*.google.com` would bypass the proxy. See [reqwest NoProxy docs](https://docs.rs/reqwest/latest/reqwest/struct.NoProxy.html#method.from_string) for more.
 
+## On Last Window Closed
+
+- Description: What to do when the last window is closed
+- Setting: `on_last_window_closed`
+- Default: `"platform_default"`
+
+**Options**
+
+1. Use platform default behavior:
+
+```json
+{
+  "on_last_window_closed": "platform_default"
+}
+```
+
+2. Always quit the application:
+
+```json
+{
+  "on_last_window_closed": "quit_app"
+}
+```
+
+## Profiles
+
+- Description: Configuration profiles that can be applied on top of existing settings
+- Setting: `profiles`
+- Default: `{}`
+
+**Options**
+
+Configuration object for defining settings profiles. Example:
+
+```json
+{
+  "profiles": {
+    "presentation": {
+      "buffer_font_size": 20,
+      "ui_font_size": 18,
+      "theme": "One Light"
+    }
+  }
+}
+```
+
 ## Preview tabs
 
 - Description:
@@ -2332,6 +2861,54 @@ If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` en
 - Setting: `skip_focus_for_active_in_search`
 - Default: `true`
 
+## Pane Split Direction Horizontal
+
+- Description: The direction that you want to split panes horizontally
+- Setting: `pane_split_direction_horizontal`
+- Default: `"up"`
+
+**Options**
+
+1. Split upward:
+
+```json
+{
+  "pane_split_direction_horizontal": "up"
+}
+```
+
+2. Split downward:
+
+```json
+{
+  "pane_split_direction_horizontal": "down"
+}
+```
+
+## Pane Split Direction Vertical
+
+- Description: The direction that you want to split panes vertically
+- Setting: `pane_split_direction_vertical`
+- Default: `"left"`
+
+**Options**
+
+1. Split to the left:
+
+```json
+{
+  "pane_split_direction_vertical": "left"
+}
+```
+
+2. Split to the right:
+
+```json
+{
+  "pane_split_direction_vertical": "right"
+}
+```
+
 ## Preferred Line Length
 
 - Description: The column at which to soft-wrap lines, for buffers where soft-wrap is enabled.
@@ -2342,6 +2919,16 @@ If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` en
 
 `integer` values
 
+## Private Files
+
+- Description: Globs to match against file paths to determine if a file is private
+- Setting: `private_files`
+- Default: `["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"]`
+
+**Options**
+
+List of `string` glob patterns
+
 ## Projects Online By Default
 
 - Description: Whether or not to show the online projects view by default.
@@ -2352,6 +2939,36 @@ If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` en
 
 `boolean` values
 
+## Read SSH Config
+
+- Description: Whether to read SSH configuration files
+- Setting: `read_ssh_config`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Redact Private Values
+
+- Description: Hide the values of variables from visual display in private files
+- Setting: `redact_private_values`
+- Default: `false`
+
+**Options**
+
+`boolean` values
+
+## Relative Line Numbers
+
+- Description: Whether to show relative line numbers in the gutter
+- Setting: `relative_line_numbers`
+- Default: `false`
+
+**Options**
+
+`boolean` values
+
 ## Remove Trailing Whitespace On Save
 
 - Description: Whether or not to remove any trailing whitespace from lines of a buffer before saving it.
@@ -2362,6 +2979,138 @@ If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` en
 
 `boolean` values
 
+## Resize All Panels In Dock
+
+- Description: Whether to resize all the panels in a dock when resizing the dock. Can be a combination of "left", "right" and "bottom".
+- Setting: `resize_all_panels_in_dock`
+- Default: `["left"]`
+
+**Options**
+
+List of strings containing any combination of:
+
+- `"left"`: Resize left dock panels together
+- `"right"`: Resize right dock panels together
+- `"bottom"`: Resize bottom dock panels together
+
+## Restore on File Reopen
+
+- Description: Whether to attempt to restore previous file's state when opening it again. The state is stored per pane.
+- Setting: `restore_on_file_reopen`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Restore on Startup
+
+- Description: Controls session restoration on startup.
+- Setting: `restore_on_startup`
+- Default: `last_session`
+
+**Options**
+
+1. Restore all workspaces that were open when quitting Zed:
+
+```json
+{
+  "restore_on_startup": "last_session"
+}
+```
+
+2. Restore the workspace that was closed last:
+
+```json
+{
+  "restore_on_startup": "last_workspace"
+}
+```
+
+3. Always start with an empty editor:
+
+```json
+{
+  "restore_on_startup": "none"
+}
+```
+
+## Scroll Beyond Last Line
+
+- Description: Whether the editor will scroll beyond the last line
+- Setting: `scroll_beyond_last_line`
+- Default: `"one_page"`
+
+**Options**
+
+1. Scroll one page beyond the last line by one page:
+
+```json
+{
+  "scroll_beyond_last_line": "one_page"
+}
+```
+
+2. The editor will scroll beyond the last line by the same amount of lines as `vertical_scroll_margin`:
+
+```json
+{
+  "scroll_beyond_last_line": "vertical_scroll_margin"
+}
+```
+
+3. The editor will not scroll beyond the last line:
+
+```json
+{
+  "scroll_beyond_last_line": "off"
+}
+```
+
+**Options**
+
+`boolean` values
+
+## Scroll Sensitivity
+
+- Description: Scroll sensitivity multiplier. This multiplier is applied to both the horizontal and vertical delta values while scrolling.
+- Setting: `scroll_sensitivity`
+- Default: `1.0`
+
+**Options**
+
+Positive `float` values
+
+### Fast Scroll Sensitivity
+
+- Description: Scroll sensitivity multiplier for fast scrolling. This multiplier is applied to both the horizontal and vertical delta values while scrolling. Fast scrolling happens when a user holds the alt or option key while scrolling.
+- Setting: `fast_scroll_sensitivity`
+- Default: `4.0`
+
+**Options**
+
+Positive `float` values
+
+### Horizontal Scroll Margin
+
+- Description: The number of characters to keep on either side when scrolling with the mouse
+- Setting: `horizontal_scroll_margin`
+- Default: `5`
+
+**Options**
+
+Non-negative `integer` values
+
+### Vertical Scroll Margin
+
+- Description: The number of lines to keep above/below the cursor when scrolling with the keyboard
+- Setting: `vertical_scroll_margin`
+- Default: `3`
+
+**Options**
+
+Non-negative `integer` values
+
 ## Search
 
 - Description: Search options to enable by default when opening new project and buffer searches.
@@ -2377,6 +3126,12 @@ If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` en
 },
 ```
 
+## Search Wrap
+
+- Description: If `search_wrap` is disabled, search result do not wrap around the end of the file
+- Setting: `search_wrap`
+- Default: `true`
+
 ## Seed Search Query From Cursor
 
 - Description: When to populate a new search's query based on the text under the cursor.
@@ -2546,6 +3301,56 @@ Positive integer values
 4. `preferred_line_length` to wrap lines that overflow `preferred_line_length` config value
 5. `bounded` to wrap lines at the minimum of `editor_width` and `preferred_line_length`
 
+## Show Wrap Guides
+
+- Description: Whether to show wrap guides (vertical rulers) in the editor. Setting this to true will show a guide at the 'preferred_line_length' value if 'soft_wrap' is set to 'preferred_line_length', and will show any additional guides as specified by the 'wrap_guides' setting.
+- Setting: `show_wrap_guides`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Use On Type Format
+
+- Description: Whether to use additional LSP queries to format (and amend) the code after every "trigger" symbol input, defined by LSP server capabilities
+- Setting: `use_on_type_format`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Use Auto Surround
+
+- Description: Whether to automatically surround selected text when typing opening parenthesis, bracket, brace, single or double quote characters. For example, when you select text and type (, Zed will surround the text with ().
+- Setting: `use_auto_surround`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Use System Path Prompts
+
+- Description: Whether to use the system provided dialogs for Open and Save As. When set to false, Zed will use the built-in keyboard-first pickers.
+- Setting: `use_system_path_prompts`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
+## Use System Prompts
+
+- Description: Whether to use the system provided dialogs for prompts, such as confirmation prompts. When set to false, Zed will use its built-in prompts. Note that on Linux, this option is ignored and Zed will always use the built-in prompts.
+- Setting: `use_system_prompts`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
 ## Wrap Guides (Vertical Rulers)
 
 - Description: Where to display vertical rulers as wrap-guides. Disable by setting `show_wrap_guides` to `false`.
@@ -2566,6 +3371,28 @@ List of `integer` column numbers
 
 `integer` values
 
+## Tasks
+
+- Description: Configuration for tasks that can be run within Zed
+- Setting: `tasks`
+- Default:
+
+```json
+{
+  "tasks": {
+    "variables": {},
+    "enabled": true,
+    "prefer_lsp": false
+  }
+}
+```
+
+**Options**
+
+- `variables`: Custom variables for task configuration
+- `enabled`: Whether tasks are enabled
+- `prefer_lsp`: Whether to prefer LSP-provided tasks over Zed language extension ones
+
 ## Telemetry
 
 - Description: Control what info is collected by Zed.
@@ -3212,17 +4039,71 @@ Run the `theme selector: toggle` action in the command palette to see a current
 
 Run the `theme selector: toggle` action in the command palette to see a current list of valid themes names.
 
+## Title Bar
+
+- Description: Whether or not to show various elements in the title bar
+- Setting: `title_bar`
+- Default:
+
+```json
+"title_bar": {
+  "show_branch_icon": false,
+  "show_branch_name": true,
+  "show_project_items": true,
+  "show_onboarding_banner": true,
+  "show_user_picture": true,
+  "show_sign_in": true,
+  "show_menus": false
+}
+```
+
+**Options**
+
+- `show_branch_icon`: Whether to show the branch icon beside branch switcher in the titlebar
+- `show_branch_name`: Whether to show the branch name button in the titlebar
+- `show_project_items`: Whether to show the project host and name in the titlebar
+- `show_onboarding_banner`: Whether to show onboarding banners in the titlebar
+- `show_user_picture`: Whether to show user picture in the titlebar
+- `show_sign_in`: Whether to show the sign in button in the titlebar
+- `show_menus`: Whether to show the menus in the titlebar
+
 ## Vim
 
-- Description: Whether or not to enable vim mode. See the [Vim documentation](./vim.md) for more details on configuration.
+- Description: Whether or not to enable vim mode.
 - Setting: `vim_mode`
 - Default: `false`
 
-## Helix Mode
+## When Closing With No Tabs
 
-- Description: Whether or not to enable Helix mode. Enabling `helix_mode` also enables `vim_mode`. See the [Helix documentation](./helix.md) for more details.
-- Setting: `helix_mode`
-- Default: `false`
+- Description: Whether the window should be closed when using 'close active item' on a window with no tabs
+- Setting: `when_closing_with_no_tabs`
+- Default: `"platform_default"`
+
+**Options**
+
+1. Use platform default behavior:
+
+```json
+{
+  "when_closing_with_no_tabs": "platform_default"
+}
+```
+
+2. Always close the window:
+
+```json
+{
+  "when_closing_with_no_tabs": "close_window"
+}
+```
+
+3. Never close the window:
+
+```json
+{
+  "when_closing_with_no_tabs": "keep_window_open"
+}
+```
 
 ## Project Panel
 
@@ -3466,6 +4347,103 @@ Run the `theme selector: toggle` action in the command palette to see a current
 
 Visit [the Configuration page](./ai/configuration.md) under the AI section to learn more about all the agent-related settings.
 
+## Collaboration Panel
+
+- Description: Customizations for the collaboration panel.
+- Setting: `collaboration_panel`
+- Default:
+
+```json
+{
+  "collaboration_panel": {
+    "button": true,
+    "dock": "left",
+    "default_width": 240
+  }
+}
+```
+
+**Options**
+
+- `button`: Whether to show the collaboration panel button in the status bar
+- `dock`: Where to dock the collaboration panel. Can be `left` or `right`
+- `default_width`: Default width of the collaboration panel
+
+## Chat Panel
+
+- Description: Customizations for the chat panel.
+- Setting: `chat_panel`
+- Default:
+
+```json
+{
+  "chat_panel": {
+    "button": "when_in_call",
+    "dock": "right",
+    "default_width": 240
+  }
+}
+```
+
+**Options**
+
+- `button`: When to show the chat panel button in the status bar. Can be `never`, `always`, or `when_in_call`.
+- `dock`: Where to dock the chat panel. Can be 'left' or 'right'
+- `default_width`: Default width of the chat panel
+
+## Debugger
+
+- Description: Configuration for debugger panel and settings
+- Setting: `debugger`
+- Default:
+
+```json
+{
+  "debugger": {
+    "stepping_granularity": "line",
+    "save_breakpoints": true,
+    "dock": "bottom",
+    "button": true
+  }
+}
+```
+
+See the [debugger page](./debugger.md) for more information about debugging support within Zed.
+
+## Git Panel
+
+- Description: Setting to customize the behavior of the git panel.
+- Setting: `git_panel`
+- Default:
+
+```json
+{
+  "git_panel": {
+    "button": true,
+    "dock": "left",
+    "default_width": 360,
+    "status_style": "icon",
+    "fallback_branch_name": "main",
+    "sort_by_path": false,
+    "collapse_untracked_diff": false,
+    "scrollbar": {
+      "show": null
+    }
+  }
+}
+```
+
+**Options**
+
+- `button`: Whether to show the git panel button in the status bar
+- `dock`: Where to dock the git panel. Can be `left` or `right`
+- `default_width`: Default width of the git panel
+- `status_style`: How to display git status. Can be `label_color` or `icon`
+- `fallback_branch_name`: What branch name to use if `init.defaultBranch` is not set
+- `sort_by_path`: Whether to sort entries in the panel by path or by status (the default)
+- `collapse_untracked_diff`: Whether to collapse untracked files in the diff panel
+- `scrollbar`: When to show the scrollbar in the git panel
+
 ## Outline Panel
 
 - Description: Customize outline Panel

From 8cf663011f8aa1f8e1f75a7850945222e4bc0299 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 27 Aug 2025 14:53:07 +0200
Subject: [PATCH 401/823] acp: Add more logs to model selector to diagnose
 issue (#36997)

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Joseph T. Lyons <JosephTLyons@gmail.com>
Co-authored-by: Katie Geer <katie@zed.dev>
---
 crates/acp_thread/src/connection.rs       | 7 +++++++
 crates/agent_ui/src/acp/model_selector.rs | 9 ++++++++-
 crates/language_model/src/registry.rs     | 1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index af229b7545..e4ab4c6ec5 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -232,6 +232,13 @@ impl AgentModelList {
             AgentModelList::Grouped(groups) => groups.is_empty(),
         }
     }
+
+    pub fn len(&self) -> usize {
+        match self {
+            AgentModelList::Flat(models) => models.len(),
+            AgentModelList::Grouped(groups) => groups.values().len(),
+        }
+    }
 }
 
 #[cfg(feature = "test-support")]
diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
index 77c88c461d..052277d3e6 100644
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -71,7 +71,7 @@ impl AcpModelPickerDelegate {
                     let (models, selected_model) = futures::join!(models_task, selected_model_task);
 
                     this.update_in(cx, |this, window, cx| {
-                        this.delegate.models = models.ok();
+                        this.delegate.models = models.log_err();
                         this.delegate.selected_model = selected_model.ok();
                         this.delegate.update_matches(this.query(cx), window, cx)
                     })?
@@ -144,6 +144,11 @@ impl PickerDelegate for AcpModelPickerDelegate {
         cx.spawn_in(window, async move |this, cx| {
             let filtered_models = match this
                 .read_with(cx, |this, cx| {
+                    if let Some(models) = this.delegate.models.as_ref() {
+                        log::debug!("Filtering {} models.", models.len());
+                    } else {
+                        log::debug!("No models available.");
+                    }
                     this.delegate.models.clone().map(move |models| {
                         fuzzy_search(models, query, cx.background_executor().clone())
                     })
@@ -155,6 +160,8 @@ impl PickerDelegate for AcpModelPickerDelegate {
                 None => AgentModelList::Flat(vec![]),
             };
 
+            log::debug!("Filtered models. {} available.", filtered_models.len());
+
             this.update_in(cx, |this, window, cx| {
                 this.delegate.filtered_entries =
                     info_list_to_picker_entries(filtered_models).collect();
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
index 531c3615dc..bab258bca1 100644
--- a/crates/language_model/src/registry.rs
+++ b/crates/language_model/src/registry.rs
@@ -208,6 +208,7 @@ impl LanguageModelRegistry {
     ) -> impl Iterator<Item = Arc<dyn LanguageModel>> + 'a {
         self.providers
             .values()
+            .filter(|provider| provider.is_authenticated(cx))
             .flat_map(|provider| provider.provided_models(cx))
     }
 

From 1b9c471204cc5b9818347d6d061f94a6b53b35d7 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Wed, 27 Aug 2025 10:51:26 -0400
Subject: [PATCH 402/823] Fix 'Edit in Debug.json' in debugger::Start modal
 (#37002)

Closes https://github.com/zed-industries/zed/issues/36992

Release Notes:

- N/A
---
 crates/debugger_ui/src/new_process_modal.rs | 30 +++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index b30e3995ff..68770bc8b1 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -1383,14 +1383,28 @@ impl PickerDelegate for DebugDelegate {
             .border_color(cx.theme().colors().border_variant)
             .children({
                 let action = menu::SecondaryConfirm.boxed_clone();
-                KeyBinding::for_action(&*action, window, cx).map(|keybind| {
-                    Button::new("edit-debug-task", "Edit in debug.json")
-                        .label_size(LabelSize::Small)
-                        .key_binding(keybind)
-                        .on_click(move |_, window, cx| {
-                            window.dispatch_action(action.boxed_clone(), cx)
-                        })
-                })
+                if self.matches.is_empty() {
+                    Some(
+                        Button::new("edit-debug-json", "Edit debug.json")
+                            .label_size(LabelSize::Small)
+                            .on_click(cx.listener(|_picker, _, window, cx| {
+                                window.dispatch_action(
+                                    zed_actions::OpenProjectDebugTasks.boxed_clone(),
+                                    cx,
+                                );
+                                cx.emit(DismissEvent);
+                            })),
+                    )
+                } else {
+                    KeyBinding::for_action(&*action, window, cx).map(|keybind| {
+                        Button::new("edit-debug-task", "Edit in debug.json")
+                            .label_size(LabelSize::Small)
+                            .key_binding(keybind)
+                            .on_click(move |_, window, cx| {
+                                window.dispatch_action(action.boxed_clone(), cx)
+                            })
+                    })
+                }
             })
             .map(|this| {
                 if (current_modifiers.alt || self.matches.is_empty()) && !self.prompt.is_empty() {

From 5d7f12ce880b0878353b40206682e30a4ec27405 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 27 Aug 2025 21:01:36 +0530
Subject: [PATCH 403/823] project: Add dynamic capabilities registration for
 "workspace/didChangeWorkspaceFolders" (#37005)

Fixes missing capability registration for
"workspace/didChangeWorkspaceFolders".

```
WARN  [project::lsp_store] unhandled capability registration: Registration { id: "e288546c-4458-401a-a029-bbba759d5a71", method: "workspace/didChangeWorkspaceFolders", register_options: Some(Object {}) }
```

We already correctly send back events to server on workspace add and
remove by checking this capability.
https://github.com/zed-industries/zed/blob/cf89691b85e4652093548c0bf8b79d881e26562b/crates/lsp/src/lsp.rs#L1353


https://github.com/zed-industries/zed/blob/cf89691b85e4652093548c0bf8b79d881e26562b/crates/lsp/src/lsp.rs#L1388

Release Notes:

- N/A
---
 crates/lsp/src/lsp.rs           |  3 ++-
 crates/project/src/lsp_store.rs | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 942225d098..1ad89db017 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -1383,7 +1383,8 @@ impl LanguageServer {
             self.notify::<DidChangeWorkspaceFolders>(&params).ok();
         }
     }
-    /// Add new workspace folder to the list.
+
+    /// Remove existing workspace folder from the list.
     pub fn remove_workspace_folder(&self, uri: Url) {
         if self
             .capabilities()
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index b92d739360..ad9d0abf40 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11702,6 +11702,20 @@ impl LspStore {
                 "workspace/didChangeConfiguration" => {
                     // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
                 }
+                "workspace/didChangeWorkspaceFolders" => {
+                    // In this case register options is an empty object, we can ignore it
+                    let caps = lsp::WorkspaceFoldersServerCapabilities {
+                        supported: Some(true),
+                        change_notifications: Some(OneOf::Right(reg.id)),
+                    };
+                    server.update_capabilities(|capabilities| {
+                        capabilities
+                            .workspace
+                            .get_or_insert_default()
+                            .workspace_folders = Some(caps);
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
                 "workspace/symbol" => {
                     let options = parse_register_capabilities(reg)?;
                     server.update_capabilities(|capabilities| {
@@ -11944,6 +11958,18 @@ impl LspStore {
                 "workspace/didChangeConfiguration" => {
                     // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
                 }
+                "workspace/didChangeWorkspaceFolders" => {
+                    server.update_capabilities(|capabilities| {
+                        capabilities
+                            .workspace
+                            .get_or_insert_with(|| lsp::WorkspaceServerCapabilities {
+                                workspace_folders: None,
+                                file_operations: None,
+                            })
+                            .workspace_folders = None;
+                    });
+                    notify_server_capabilities_updated(&server, cx);
+                }
                 "workspace/symbol" => {
                     server.update_capabilities(|capabilities| {
                         capabilities.workspace_symbol_provider = None

From b5e9b65e8ccc2d31f6a59e0b1a971fe391396926 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 27 Aug 2025 17:39:39 +0200
Subject: [PATCH 404/823] acp: Fix model selector sometimes showing no models
 (#37006)

Release Notes:

- acp: Fix an issue where the model selector would sometimes be empty

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/acp_thread/src/connection.rs       |  7 -------
 crates/agent_ui/src/acp/model_selector.rs | 16 +++-------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index e4ab4c6ec5..af229b7545 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -232,13 +232,6 @@ impl AgentModelList {
             AgentModelList::Grouped(groups) => groups.is_empty(),
         }
     }
-
-    pub fn len(&self) -> usize {
-        match self {
-            AgentModelList::Flat(models) => models.len(),
-            AgentModelList::Grouped(groups) => groups.values().len(),
-        }
-    }
 }
 
 #[cfg(feature = "test-support")]
diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
index 052277d3e6..cbb513696d 100644
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -71,13 +71,10 @@ impl AcpModelPickerDelegate {
                     let (models, selected_model) = futures::join!(models_task, selected_model_task);
 
                     this.update_in(cx, |this, window, cx| {
-                        this.delegate.models = models.log_err();
+                        this.delegate.models = models.ok();
                         this.delegate.selected_model = selected_model.ok();
-                        this.delegate.update_matches(this.query(cx), window, cx)
-                    })?
-                    .await;
-
-                    Ok(())
+                        this.refresh(window, cx)
+                    })
                 }
 
                 refresh(&this, &session_id, cx).await.log_err();
@@ -144,11 +141,6 @@ impl PickerDelegate for AcpModelPickerDelegate {
         cx.spawn_in(window, async move |this, cx| {
             let filtered_models = match this
                 .read_with(cx, |this, cx| {
-                    if let Some(models) = this.delegate.models.as_ref() {
-                        log::debug!("Filtering {} models.", models.len());
-                    } else {
-                        log::debug!("No models available.");
-                    }
                     this.delegate.models.clone().map(move |models| {
                         fuzzy_search(models, query, cx.background_executor().clone())
                     })
@@ -160,8 +152,6 @@ impl PickerDelegate for AcpModelPickerDelegate {
                 None => AgentModelList::Flat(vec![]),
             };
 
-            log::debug!("Filtered models. {} available.", filtered_models.len());
-
             this.update_in(cx, |this, window, cx| {
                 this.delegate.filtered_entries =
                     info_list_to_picker_entries(filtered_models).collect();

From 07373d15ef8e095571c5640be6e0eafb0ced02b7 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 27 Aug 2025 12:21:28 -0400
Subject: [PATCH 405/823] acp: Fix gemini process being leaked (#37012)

Release Notes:

- acp: Fixed a bug that caused external agent server subprocesses to be
leaked.

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent_servers/src/acp.rs         | 15 +++++++++------
 crates/agent_ui/src/acp/thread_view.rs  |  3 ++-
 crates/tab_switcher/src/tab_switcher.rs |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index b4f82a0a23..bca47101d6 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -30,6 +30,8 @@ pub struct AcpConnection {
     auth_methods: Vec<acp::AuthMethod>,
     prompt_capabilities: acp::PromptCapabilities,
     _io_task: Task<Result<()>>,
+    _wait_task: Task<Result<()>>,
+    _stderr_task: Task<Result<()>>,
 }
 
 pub struct AcpSession {
@@ -86,7 +88,7 @@ impl AcpConnection {
 
         let io_task = cx.background_spawn(io_task);
 
-        cx.background_spawn(async move {
+        let stderr_task = cx.background_spawn(async move {
             let mut stderr = BufReader::new(stderr);
             let mut line = String::new();
             while let Ok(n) = stderr.read_line(&mut line).await
@@ -95,10 +97,10 @@ impl AcpConnection {
                 log::warn!("agent stderr: {}", &line);
                 line.clear();
             }
-        })
-        .detach();
+            Ok(())
+        });
 
-        cx.spawn({
+        let wait_task = cx.spawn({
             let sessions = sessions.clone();
             async move |cx| {
                 let status = child.status().await?;
@@ -114,8 +116,7 @@ impl AcpConnection {
 
                 anyhow::Ok(())
             }
-        })
-        .detach();
+        });
 
         let connection = Rc::new(connection);
 
@@ -148,6 +149,8 @@ impl AcpConnection {
             sessions,
             prompt_capabilities: response.agent_capabilities.prompt_capabilities,
             _io_task: io_task,
+            _wait_task: wait_task,
+            _stderr_task: stderr_task,
         })
     }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 70d32088c5..94b385c04e 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -905,9 +905,10 @@ impl AcpThreadView {
         self.editing_message.take();
         self.thread_feedback.clear();
 
-        let Some(thread) = self.thread().cloned() else {
+        let Some(thread) = self.thread() else {
             return;
         };
+        let thread = thread.downgrade();
         if self.should_be_following {
             self.workspace
                 .update(cx, |workspace, cx| {
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index bf3ce7b568..5f60bc03f2 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -268,7 +268,7 @@ impl TabMatch {
             .flatten();
         let colored_icon = icon.color(git_status_color.unwrap_or_default());
 
-        let most_sever_diagostic_level = if show_diagnostics == ShowDiagnostics::Off {
+        let most_severe_diagnostic_level = if show_diagnostics == ShowDiagnostics::Off {
             None
         } else {
             let buffer_store = project.read(cx).buffer_store().read(cx);
@@ -287,7 +287,7 @@ impl TabMatch {
         };
 
         let decorations =
-            entry_diagnostic_aware_icon_decoration_and_color(most_sever_diagostic_level)
+            entry_diagnostic_aware_icon_decoration_and_color(most_severe_diagnostic_level)
                 .filter(|(d, _)| {
                     *d != IconDecorationKind::Triangle
                         || show_diagnostics != ShowDiagnostics::Errors

From fead511df9d332533385aed82bddb7988896262b Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:29:30 +0530
Subject: [PATCH 406/823] docs: Update Gemini CLI version requirements and
 install instructions (#37008)

Gemini cli - 0.2.0 is no longer in preview it's the latest version and
released as of today.

Release Notes:

- N/A

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 docs/src/ai/external-agents.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index a67aa9d889..1d11ca0311 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -31,10 +31,10 @@ If you'd like to bind this to a keyboard shortcut, you can do so by editing your
 
 If you don't yet have Gemini CLI installed, then Zed will install a version for you. If you do, then we will use the version of Gemini CLI on your path.
 
-You need to be running at least Gemini version `0.2.0-preview`, and if your version of Gemini is too old you will see an
+You need to be running at least Gemini version `0.2.0`, and if your version of Gemini is too old you will see an
 error message.
 
-The instructions to upgrade Gemini depend on how you originally installed it, but typically, running `npm install -g gemini-cli@preview` should work.
+The instructions to upgrade Gemini depend on how you originally installed it, but typically, running `npm install -g @google/gemini-cli@latest` should work.
 
 #### Authentication
 

From 45ff22f793c5e6e243f05ce3785d7e771f955b2f Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Wed, 27 Aug 2025 10:17:34 -0700
Subject: [PATCH 407/823] Add bang to word chars for wrapping (#37019)

Fixes #37010

Release Notes:

- N/A
---
 crates/gpui/src/text_system/line_wrapper.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index 93ec6c854c..b1e1ee4459 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -181,7 +181,7 @@ impl LineWrapper {
         matches!(c, '\u{0400}'..='\u{04FF}') ||
         // Some other known special characters that should be treated as word characters,
         // e.g. `a-b`, `var_name`, `I'm`, '@mention`, `#hashtag`, `100%`, `3.1415`, `2^3`, `a~b`, etc.
-        matches!(c, '-' | '_' | '.' | '\'' | '$' | '%' | '@' | '#' | '^' | '~' | ',') ||
+        matches!(c, '-' | '_' | '.' | '\'' | '$' | '%' | '@' | '#' | '^' | '~' | ',' | '!') ||
         // Characters that used in URL, e.g. `https://github.com/zed-industries/zed?a=1&b=2` for better wrapping a long URL.
         matches!(c,  '/' | ':' | '?' | '&' | '=') ||
         // `⋯` character is special used in Zed, to keep this at the end of the line.

From 9ca4fb16b243328ff7fcea2e14e4f0f870413df7 Mon Sep 17 00:00:00 2001
From: Floyd Wang <gassnake999@gmail.com>
Date: Thu, 28 Aug 2025 01:26:57 +0800
Subject: [PATCH 408/823] gpui: Support disabling window resizing and
 minimizing (#36859)

Add support to disable both window resizing and minimizing.

| | macOS | Windows |
| - | - | - |
| **Unresizable** | <img width="412" height="440"
alt="SCR-20250822-qpea"
src="https://github.com/user-attachments/assets/d6d45510-dc4b-436f-a9fa-ce9cb0b0c411"
/> | <img width="276" height="298" alt="2025-08-22 110757"
src="https://github.com/user-attachments/assets/9deff498-e903-4173-9c26-072dd9409fc1"
/> |
| **Unminimizable** | <img width="412" height="440"
alt="SCR-20250822-qpfl"
src="https://github.com/user-attachments/assets/e1d5f9eb-6de5-4908-8b52-38ccb2e65689"
/> | <img width="276" height="298" alt="2025-08-22 110814"
src="https://github.com/user-attachments/assets/da94b006-3544-4274-8b02-1cab7ca8dd70"
/> |

Release Notes:

- N/A
---
 crates/agent_ui/src/ui/agent_notification.rs |  1 +
 crates/collab_ui/src/collab_ui.rs            |  1 +
 crates/gpui/examples/window.rs               | 30 ++++++++++++++++++++
 crates/gpui/examples/window_positioning.rs   |  1 +
 crates/gpui/src/platform.rs                  | 16 +++++++++++
 crates/gpui/src/platform/mac/window.rs       | 16 ++++++++---
 crates/gpui/src/platform/windows/window.rs   | 15 +++++++---
 crates/gpui/src/window.rs                    |  4 +++
 crates/zed/src/zed.rs                        |  1 +
 9 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/crates/agent_ui/src/ui/agent_notification.rs b/crates/agent_ui/src/ui/agent_notification.rs
index 68480c047f..b2342a87b5 100644
--- a/crates/agent_ui/src/ui/agent_notification.rs
+++ b/crates/agent_ui/src/ui/agent_notification.rs
@@ -62,6 +62,7 @@ impl AgentNotification {
             app_id: Some(app_id.to_owned()),
             window_min_size: None,
             window_decorations: Some(WindowDecorations::Client),
+            ..Default::default()
         }
     }
 }
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index f9a2fa4925..a49e38a8dd 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -66,5 +66,6 @@ fn notification_window_options(
         app_id: Some(app_id.to_owned()),
         window_min_size: None,
         window_decorations: Some(WindowDecorations::Client),
+        ..Default::default()
     }
 }
diff --git a/crates/gpui/examples/window.rs b/crates/gpui/examples/window.rs
index 30f3697b22..4445f24e4e 100644
--- a/crates/gpui/examples/window.rs
+++ b/crates/gpui/examples/window.rs
@@ -152,6 +152,36 @@ impl Render for WindowDemo {
                 )
                 .unwrap();
             }))
+            .child(button("Unresizable", move |_, cx| {
+                cx.open_window(
+                    WindowOptions {
+                        is_resizable: false,
+                        window_bounds: Some(window_bounds),
+                        ..Default::default()
+                    },
+                    |_, cx| {
+                        cx.new(|_| SubWindow {
+                            custom_titlebar: false,
+                        })
+                    },
+                )
+                .unwrap();
+            }))
+            .child(button("Unminimizable", move |_, cx| {
+                cx.open_window(
+                    WindowOptions {
+                        is_minimizable: false,
+                        window_bounds: Some(window_bounds),
+                        ..Default::default()
+                    },
+                    |_, cx| {
+                        cx.new(|_| SubWindow {
+                            custom_titlebar: false,
+                        })
+                    },
+                )
+                .unwrap();
+            }))
             .child(button("Hide Application", |window, cx| {
                 cx.hide();
 
diff --git a/crates/gpui/examples/window_positioning.rs b/crates/gpui/examples/window_positioning.rs
index 0f0bb8ac28..8180104e1e 100644
--- a/crates/gpui/examples/window_positioning.rs
+++ b/crates/gpui/examples/window_positioning.rs
@@ -62,6 +62,7 @@ fn build_window_options(display_id: DisplayId, bounds: Bounds<Pixels>) -> Window
         app_id: None,
         window_min_size: None,
         window_decorations: None,
+        ..Default::default()
     }
 }
 
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index f64710bc56..8e9c52c2e7 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1091,6 +1091,12 @@ pub struct WindowOptions {
     /// Whether the window should be movable by the user
     pub is_movable: bool,
 
+    /// Whether the window should be resizable by the user
+    pub is_resizable: bool,
+
+    /// Whether the window should be minimized by the user
+    pub is_minimizable: bool,
+
     /// The display to create the window on, if this is None,
     /// the window will be created on the main display
     pub display_id: Option<DisplayId>,
@@ -1133,6 +1139,14 @@ pub(crate) struct WindowParams {
     #[cfg_attr(any(target_os = "linux", target_os = "freebsd"), allow(dead_code))]
     pub is_movable: bool,
 
+    /// Whether the window should be resizable by the user
+    #[cfg_attr(any(target_os = "linux", target_os = "freebsd"), allow(dead_code))]
+    pub is_resizable: bool,
+
+    /// Whether the window should be minimized by the user
+    #[cfg_attr(any(target_os = "linux", target_os = "freebsd"), allow(dead_code))]
+    pub is_minimizable: bool,
+
     #[cfg_attr(
         any(target_os = "linux", target_os = "freebsd", target_os = "windows"),
         allow(dead_code)
@@ -1191,6 +1205,8 @@ impl Default for WindowOptions {
             show: true,
             kind: WindowKind::Normal,
             is_movable: true,
+            is_resizable: true,
+            is_minimizable: true,
             display_id: None,
             window_background: WindowBackgroundAppearance::default(),
             app_id: None,
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 4425d4fe24..fbea4748a3 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -530,6 +530,8 @@ impl MacWindow {
             titlebar,
             kind,
             is_movable,
+            is_resizable,
+            is_minimizable,
             focus,
             show,
             display_id,
@@ -545,10 +547,16 @@ impl MacWindow {
 
             let mut style_mask;
             if let Some(titlebar) = titlebar.as_ref() {
-                style_mask = NSWindowStyleMask::NSClosableWindowMask
-                    | NSWindowStyleMask::NSMiniaturizableWindowMask
-                    | NSWindowStyleMask::NSResizableWindowMask
-                    | NSWindowStyleMask::NSTitledWindowMask;
+                style_mask =
+                    NSWindowStyleMask::NSClosableWindowMask | NSWindowStyleMask::NSTitledWindowMask;
+
+                if is_resizable {
+                    style_mask |= NSWindowStyleMask::NSResizableWindowMask;
+                }
+
+                if is_minimizable {
+                    style_mask |= NSWindowStyleMask::NSMiniaturizableWindowMask;
+                }
 
                 if titlebar.appears_transparent {
                     style_mask |= NSWindowStyleMask::NSFullSizeContentViewWindowMask;
diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs
index 99e5073371..e3711d1a26 100644
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -382,10 +382,17 @@ impl WindowsWindow {
         let (mut dwexstyle, dwstyle) = if params.kind == WindowKind::PopUp {
             (WS_EX_TOOLWINDOW, WINDOW_STYLE(0x0))
         } else {
-            (
-                WS_EX_APPWINDOW,
-                WS_THICKFRAME | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
-            )
+            let mut dwstyle = WS_SYSMENU;
+
+            if params.is_resizable {
+                dwstyle |= WS_THICKFRAME | WS_MAXIMIZEBOX;
+            }
+
+            if params.is_minimizable {
+                dwstyle |= WS_MINIMIZEBOX;
+            }
+
+            (WS_EX_APPWINDOW, dwstyle)
         };
         if !disable_direct_composition {
             dwexstyle |= WS_EX_NOREDIRECTIONBITMAP;
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 0791dcc621..cc0db39303 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -939,6 +939,8 @@ impl Window {
             show,
             kind,
             is_movable,
+            is_resizable,
+            is_minimizable,
             display_id,
             window_background,
             app_id,
@@ -956,6 +958,8 @@ impl Window {
                 titlebar,
                 kind,
                 is_movable,
+                is_resizable,
+                is_minimizable,
                 focus,
                 show,
                 display_id,
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index a3116971b4..b0146cfd2b 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -301,6 +301,7 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowO
             width: px(360.0),
             height: px(240.0),
         }),
+        ..Default::default()
     }
 }
 

From 71f900346c768e0bbc3ecd3f9755eddefb001ec2 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Wed, 27 Aug 2025 14:12:34 -0400
Subject: [PATCH 409/823] Add ';' and '*' to word_chars to improve softwrap
 (#37024)

Follow-up to: https://github.com/zed-industries/zed/pull/37019
See also: https://github.com/zed-industries/zed/issues/37010

Before/After:
<img width="418" height="402" alt="Screenshot 2025-08-27 at 13 54 52"
src="https://github.com/user-attachments/assets/1b2e02dd-c216-4372-b23e-5a3a619d2b77"
/>


Release Notes:

- N/A
---
 crates/gpui/src/text_system/line_wrapper.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index b1e1ee4459..d499d78551 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -181,7 +181,7 @@ impl LineWrapper {
         matches!(c, '\u{0400}'..='\u{04FF}') ||
         // Some other known special characters that should be treated as word characters,
         // e.g. `a-b`, `var_name`, `I'm`, '@mention`, `#hashtag`, `100%`, `3.1415`, `2^3`, `a~b`, etc.
-        matches!(c, '-' | '_' | '.' | '\'' | '$' | '%' | '@' | '#' | '^' | '~' | ',' | '!') ||
+        matches!(c, '-' | '_' | '.' | '\'' | '$' | '%' | '@' | '#' | '^' | '~' | ',' | '!' | ';' | '*') ||
         // Characters that used in URL, e.g. `https://github.com/zed-industries/zed?a=1&b=2` for better wrapping a long URL.
         matches!(c,  '/' | ':' | '?' | '&' | '=') ||
         // `⋯` character is special used in Zed, to keep this at the end of the line.

From c158eb2442e1054f760d43770bc8a20088ab11a8 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 27 Aug 2025 14:34:40 -0400
Subject: [PATCH 410/823] docs: Note that Gemini CLI is not supported over SSH
 (#37023)

Release Notes:

- N/A
---
 docs/src/ai/external-agents.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index 1d11ca0311..b13cc0fe4b 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -54,7 +54,7 @@ Similar to Zed's first-party agent, you can use Gemini CLI to do anything that y
 
 You can @-mention files, recent threads, symbols, or fetch the web.
 
-Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, and checkpointing.
+Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, checkpointing, and using the agent in SSH projects.
 We hope to add these features in the near future.
 
 ## Add Custom Agents {#add-custom-agents}

From e2bf8e5d9c9b1b14cad1c9c618bb724c04182a2c Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 27 Aug 2025 13:55:34 -0500
Subject: [PATCH 411/823] Remote LSP logs (#36709)

Enables LSP log tracing in both remote collab and remote ssh
environments.
Server logs and server RPC traces can now be viewed remotely, and the
LSP button is now shown in such projects too.

Closes https://github.com/zed-industries/zed/issues/28557

Co-Authored-By: Kirill <kirill@zed.dev>
Co-Authored-By: Lukas <lukas@zed.dev>

Release Notes:

- Enabled LSP log tracing in both remote collab and remote ssh
environments

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 Cargo.lock                                    |   2 +
 crates/assistant_slash_command/Cargo.toml     |   2 +-
 crates/assistant_tool/Cargo.toml              |   2 +-
 crates/breadcrumbs/Cargo.toml                 |   2 +-
 .../20221109000000_test_schema.sql            |   1 +
 .../20250827084812_worktree_in_servers.sql    |   2 +
 crates/collab/src/db/queries/projects.rs      |   4 +-
 crates/collab/src/db/queries/rooms.rs         |   2 +-
 .../collab/src/db/tables/language_server.rs   |   1 +
 crates/collab/src/rpc.rs                      |   4 +-
 crates/copilot/Cargo.toml                     |   2 +-
 crates/editor/Cargo.toml                      |   2 +-
 crates/language_tools/Cargo.toml              |   3 +-
 crates/language_tools/src/language_tools.rs   |   4 +-
 crates/language_tools/src/lsp_log.rs          | 676 ++++++++++++------
 crates/language_tools/src/lsp_log_tests.rs    |   2 +-
 crates/language_tools/src/lsp_tool.rs         |  87 ++-
 crates/project/src/lsp_store.rs               |  92 ++-
 crates/project/src/project.rs                 |  21 +
 crates/project/src/project_tests.rs           |   1 +
 crates/proto/proto/lsp.proto                  |  44 +-
 crates/proto/proto/zed.proto                  |   3 +-
 crates/proto/src/proto.rs                     |   7 +-
 crates/remote_server/Cargo.toml               |   1 +
 crates/remote_server/src/headless_project.rs  |  79 +-
 crates/settings/src/settings.rs               |   2 +-
 crates/workspace/Cargo.toml                   |   3 +-
 crates/workspace/src/pane_group.rs            |  15 +-
 crates/workspace/src/workspace.rs             | 239 +++++--
 29 files changed, 956 insertions(+), 349 deletions(-)
 create mode 100644 crates/collab/migrations/20250827084812_worktree_in_servers.sql

diff --git a/Cargo.lock b/Cargo.lock
index 4325addc39..8088efd6ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9213,6 +9213,7 @@ dependencies = [
  "language",
  "lsp",
  "project",
+ "proto",
  "release_channel",
  "serde_json",
  "settings",
@@ -13500,6 +13501,7 @@ dependencies = [
  "language",
  "language_extension",
  "language_model",
+ "language_tools",
  "languages",
  "libc",
  "log",
diff --git a/crates/assistant_slash_command/Cargo.toml b/crates/assistant_slash_command/Cargo.toml
index f7b7af9b87..e33c2cda1a 100644
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -25,7 +25,7 @@ parking_lot.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 ui.workspace = true
-workspace.workspace = true
+workspace = { path = "../workspace", default-features = false }
 workspace-hack.workspace = true
 
 [dev-dependencies]
diff --git a/crates/assistant_tool/Cargo.toml b/crates/assistant_tool/Cargo.toml
index c95695052a..951226adfd 100644
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -28,7 +28,7 @@ serde.workspace = true
 serde_json.workspace = true
 text.workspace = true
 util.workspace = true
-workspace.workspace = true
+workspace = { path = "../workspace", default-features = false }
 workspace-hack.workspace = true
 
 [dev-dependencies]
diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
index c25cfc3c86..46f43d1630 100644
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -19,7 +19,7 @@ itertools.workspace = true
 settings.workspace = true
 theme.workspace = true
 ui.workspace = true
-workspace.workspace = true
+workspace = { path = "../workspace", default-features = false }
 zed_actions.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 43581fd942..b2e25458ef 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -175,6 +175,7 @@ CREATE TABLE "language_servers" (
     "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
     "name" VARCHAR NOT NULL,
     "capabilities" TEXT NOT NULL,
+    "worktree_id" BIGINT,
     PRIMARY KEY (project_id, id)
 );
 
diff --git a/crates/collab/migrations/20250827084812_worktree_in_servers.sql b/crates/collab/migrations/20250827084812_worktree_in_servers.sql
new file mode 100644
index 0000000000..d4c6ffbbcc
--- /dev/null
+++ b/crates/collab/migrations/20250827084812_worktree_in_servers.sql
@@ -0,0 +1,2 @@
+ALTER TABLE language_servers
+    ADD COLUMN worktree_id BIGINT;
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 393f2c80f8..a3f0ea6cbc 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -694,6 +694,7 @@ impl Database {
                 project_id: ActiveValue::set(project_id),
                 id: ActiveValue::set(server.id as i64),
                 name: ActiveValue::set(server.name.clone()),
+                worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
                 capabilities: ActiveValue::set(update.capabilities.clone()),
             })
             .on_conflict(
@@ -704,6 +705,7 @@ impl Database {
                 .update_columns([
                     language_server::Column::Name,
                     language_server::Column::Capabilities,
+                    language_server::Column::WorktreeId,
                 ])
                 .to_owned(),
             )
@@ -1065,7 +1067,7 @@ impl Database {
                     server: proto::LanguageServer {
                         id: language_server.id as u64,
                         name: language_server.name,
-                        worktree_id: None,
+                        worktree_id: language_server.worktree_id.map(|id| id as u64),
                     },
                     capabilities: language_server.capabilities,
                 })
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index 9e7cabf9b2..0713ac2cb2 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -809,7 +809,7 @@ impl Database {
                 server: proto::LanguageServer {
                     id: language_server.id as u64,
                     name: language_server.name,
-                    worktree_id: None,
+                    worktree_id: language_server.worktree_id.map(|id| id as u64),
                 },
                 capabilities: language_server.capabilities,
             })
diff --git a/crates/collab/src/db/tables/language_server.rs b/crates/collab/src/db/tables/language_server.rs
index 34c7514d91..705aae292b 100644
--- a/crates/collab/src/db/tables/language_server.rs
+++ b/crates/collab/src/db/tables/language_server.rs
@@ -10,6 +10,7 @@ pub struct Model {
     pub id: i64,
     pub name: String,
     pub capabilities: String,
+    pub worktree_id: Option<i64>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 73f327166a..9e4dfd4854 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -476,7 +476,9 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
             .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
             .add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
-            .add_message_handler(update_context);
+            .add_message_handler(update_context)
+            .add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
+            .add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>);
 
         Arc::new(server)
     }
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 0fc119f311..470d198958 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -50,7 +50,7 @@ sum_tree.workspace = true
 task.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace.workspace = true
+workspace = { path = "../workspace", default-features = false }
 workspace-hack.workspace = true
 itertools.workspace = true
 
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index 339f98ae8b..b7051c9b19 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -89,7 +89,7 @@ ui.workspace = true
 url.workspace = true
 util.workspace = true
 uuid.workspace = true
-workspace.workspace = true
+workspace = { path = "../workspace", default-features = false }
 zed_actions.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index 5aa914311a..a10b7dc50b 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -24,13 +24,14 @@ itertools.workspace = true
 language.workspace = true
 lsp.workspace = true
 project.workspace = true
+proto.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 theme.workspace = true
 tree-sitter.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace.workspace = true
+workspace = { path = "../workspace", default-features = false }
 zed_actions.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/language_tools/src/language_tools.rs b/crates/language_tools/src/language_tools.rs
index cbf5756875..d6a006f47b 100644
--- a/crates/language_tools/src/language_tools.rs
+++ b/crates/language_tools/src/language_tools.rs
@@ -1,5 +1,5 @@
 mod key_context_view;
-mod lsp_log;
+pub mod lsp_log;
 pub mod lsp_tool;
 mod syntax_tree_view;
 
@@ -14,7 +14,7 @@ use ui::{Context, Window};
 use workspace::{Item, ItemHandle, SplitDirection, Workspace};
 
 pub fn init(cx: &mut App) {
-    lsp_log::init(cx);
+    lsp_log::init(true, cx);
     syntax_tree_view::init(cx);
     key_context_view::init(cx);
 }
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index a71e434e52..d55b54a6d2 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -9,12 +9,16 @@ use gpui::{
 use itertools::Itertools;
 use language::{LanguageServerId, language_settings::SoftWrap};
 use lsp::{
-    IoKind, LanguageServer, LanguageServerName, LanguageServerSelector, MessageType,
-    SetTraceParams, TraceValue, notification::SetTrace,
+    IoKind, LanguageServer, LanguageServerBinary, LanguageServerName, LanguageServerSelector,
+    MessageType, SetTraceParams, TraceValue, notification::SetTrace,
+};
+use project::{
+    LspStore, Project, ProjectItem, WorktreeId, lsp_store::LanguageServerLogType,
+    search::SearchQuery,
 };
-use project::{Project, WorktreeId, search::SearchQuery};
 use std::{any::TypeId, borrow::Cow, sync::Arc};
 use ui::{Button, Checkbox, ContextMenu, Label, PopoverMenu, ToggleState, prelude::*};
+use util::ResultExt as _;
 use workspace::{
     SplitDirection, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, WorkspaceId,
     item::{Item, ItemHandle},
@@ -28,6 +32,7 @@ const RECEIVE_LINE: &str = "\n// Receive:";
 const MAX_STORED_LOG_ENTRIES: usize = 2000;
 
 pub struct LogStore {
+    store_logs: bool,
     projects: HashMap<WeakEntity<Project>, ProjectState>,
     language_servers: HashMap<LanguageServerId, LanguageServerState>,
     copilot_log_subscription: Option<lsp::Subscription>,
@@ -46,6 +51,7 @@ trait Message: AsRef<str> {
     }
 }
 
+#[derive(Debug)]
 pub(super) struct LogMessage {
     message: String,
     typ: MessageType,
@@ -73,8 +79,10 @@ impl Message for LogMessage {
     }
 }
 
+#[derive(Debug)]
 pub(super) struct TraceMessage {
     message: String,
+    is_verbose: bool,
 }
 
 impl AsRef<str> for TraceMessage {
@@ -84,9 +92,18 @@ impl AsRef<str> for TraceMessage {
 }
 
 impl Message for TraceMessage {
-    type Level = ();
+    type Level = TraceValue;
+
+    fn should_include(&self, level: Self::Level) -> bool {
+        match level {
+            TraceValue::Off => false,
+            TraceValue::Messages => !self.is_verbose,
+            TraceValue::Verbose => true,
+        }
+    }
 }
 
+#[derive(Debug)]
 struct RpcMessage {
     message: String,
 }
@@ -101,7 +118,7 @@ impl Message for RpcMessage {
     type Level = ();
 }
 
-pub(super) struct LanguageServerState {
+pub struct LanguageServerState {
     name: Option<LanguageServerName>,
     worktree_id: Option<WorktreeId>,
     kind: LanguageServerKind,
@@ -113,24 +130,35 @@ pub(super) struct LanguageServerState {
     io_logs_subscription: Option<lsp::Subscription>,
 }
 
+impl std::fmt::Debug for LanguageServerState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("LanguageServerState")
+            .field("name", &self.name)
+            .field("worktree_id", &self.worktree_id)
+            .field("kind", &self.kind)
+            .field("log_messages", &self.log_messages)
+            .field("trace_messages", &self.trace_messages)
+            .field("rpc_state", &self.rpc_state)
+            .field("trace_level", &self.trace_level)
+            .field("log_level", &self.log_level)
+            .finish_non_exhaustive()
+    }
+}
+
 #[derive(PartialEq, Clone)]
 pub enum LanguageServerKind {
     Local { project: WeakEntity<Project> },
     Remote { project: WeakEntity<Project> },
+    LocalSsh { lsp_store: WeakEntity<LspStore> },
     Global,
 }
 
-impl LanguageServerKind {
-    fn is_remote(&self) -> bool {
-        matches!(self, LanguageServerKind::Remote { .. })
-    }
-}
-
 impl std::fmt::Debug for LanguageServerKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             LanguageServerKind::Local { .. } => write!(f, "LanguageServerKind::Local"),
             LanguageServerKind::Remote { .. } => write!(f, "LanguageServerKind::Remote"),
+            LanguageServerKind::LocalSsh { .. } => write!(f, "LanguageServerKind::LocalSsh"),
             LanguageServerKind::Global => write!(f, "LanguageServerKind::Global"),
         }
     }
@@ -141,12 +169,14 @@ impl LanguageServerKind {
         match self {
             Self::Local { project } => Some(project),
             Self::Remote { project } => Some(project),
+            Self::LocalSsh { .. } => None,
             Self::Global { .. } => None,
         }
     }
 }
 
-struct LanguageServerRpcState {
+#[derive(Debug)]
+pub struct LanguageServerRpcState {
     rpc_messages: VecDeque<RpcMessage>,
     last_message_kind: Option<MessageKind>,
 }
@@ -167,7 +197,7 @@ pub struct LspLogToolbarItemView {
     _log_view_subscription: Option<Subscription>,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 enum MessageKind {
     Send,
     Receive,
@@ -183,6 +213,13 @@ pub enum LogKind {
 }
 
 impl LogKind {
+    fn from_server_log_type(log_type: &LanguageServerLogType) -> Self {
+        match log_type {
+            LanguageServerLogType::Log(_) => Self::Logs,
+            LanguageServerLogType::Trace { .. } => Self::Trace,
+            LanguageServerLogType::Rpc { .. } => Self::Rpc,
+        }
+    }
     fn label(&self) -> &'static str {
         match self {
             LogKind::Rpc => RPC_MESSAGES,
@@ -212,59 +249,53 @@ actions!(
     ]
 );
 
-pub(super) struct GlobalLogStore(pub WeakEntity<LogStore>);
+pub struct GlobalLogStore(pub WeakEntity<LogStore>);
 
 impl Global for GlobalLogStore {}
 
-pub fn init(cx: &mut App) {
-    let log_store = cx.new(LogStore::new);
+pub fn init(store_logs: bool, cx: &mut App) {
+    let log_store = cx.new(|cx| LogStore::new(store_logs, cx));
     cx.set_global(GlobalLogStore(log_store.downgrade()));
 
     cx.observe_new(move |workspace: &mut Workspace, _, cx| {
-        let project = workspace.project();
-        if project.read(cx).is_local() || project.read(cx).is_via_remote_server() {
-            log_store.update(cx, |store, cx| {
-                store.add_project(project, cx);
-            });
-        }
+        log_store.update(cx, |store, cx| {
+            store.add_project(workspace.project(), cx);
+        });
 
         let log_store = log_store.clone();
         workspace.register_action(move |workspace, _: &OpenLanguageServerLogs, window, cx| {
-            let project = workspace.project().read(cx);
-            if project.is_local() || project.is_via_remote_server() {
-                let project = workspace.project().clone();
-                let log_store = log_store.clone();
-                get_or_create_tool(
-                    workspace,
-                    SplitDirection::Right,
-                    window,
-                    cx,
-                    move |window, cx| LspLogView::new(project, log_store, window, cx),
-                );
-            }
+            let log_store = log_store.clone();
+            let project = workspace.project().clone();
+            get_or_create_tool(
+                workspace,
+                SplitDirection::Right,
+                window,
+                cx,
+                move |window, cx| LspLogView::new(project, log_store, window, cx),
+            );
         });
     })
     .detach();
 }
 
 impl LogStore {
-    pub fn new(cx: &mut Context<Self>) -> Self {
+    pub fn new(store_logs: bool, cx: &mut Context<Self>) -> Self {
         let (io_tx, mut io_rx) = mpsc::unbounded();
 
         let copilot_subscription = Copilot::global(cx).map(|copilot| {
             let copilot = &copilot;
-            cx.subscribe(copilot, |this, copilot, edit_prediction_event, cx| {
+            cx.subscribe(copilot, |log_store, copilot, edit_prediction_event, cx| {
                 if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event
                     && let Some(server) = copilot.read(cx).language_server()
                 {
                     let server_id = server.server_id();
-                    let weak_this = cx.weak_entity();
-                    this.copilot_log_subscription =
+                    let weak_lsp_store = cx.weak_entity();
+                    log_store.copilot_log_subscription =
                         Some(server.on_notification::<copilot::request::LogMessage, _>(
                             move |params, cx| {
-                                weak_this
-                                    .update(cx, |this, cx| {
-                                        this.add_language_server_log(
+                                weak_lsp_store
+                                    .update(cx, |lsp_store, cx| {
+                                        lsp_store.add_language_server_log(
                                             server_id,
                                             MessageType::LOG,
                                             &params.message,
@@ -274,8 +305,9 @@ impl LogStore {
                                     .ok();
                             },
                         ));
+
                     let name = LanguageServerName::new_static("copilot");
-                    this.add_language_server(
+                    log_store.add_language_server(
                         LanguageServerKind::Global,
                         server.server_id(),
                         Some(name),
@@ -287,26 +319,27 @@ impl LogStore {
             })
         });
 
-        let this = Self {
+        let log_store = Self {
             copilot_log_subscription: None,
             _copilot_subscription: copilot_subscription,
             projects: HashMap::default(),
             language_servers: HashMap::default(),
+            store_logs,
             io_tx,
         };
 
-        cx.spawn(async move |this, cx| {
+        cx.spawn(async move |log_store, cx| {
             while let Some((server_id, io_kind, message)) = io_rx.next().await {
-                if let Some(this) = this.upgrade() {
-                    this.update(cx, |this, cx| {
-                        this.on_io(server_id, io_kind, &message, cx);
+                if let Some(log_store) = log_store.upgrade() {
+                    log_store.update(cx, |log_store, cx| {
+                        log_store.on_io(server_id, io_kind, &message, cx);
                     })?;
                 }
             }
             anyhow::Ok(())
         })
         .detach_and_log_err(cx);
-        this
+        log_store
     }
 
     pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
@@ -320,20 +353,19 @@ impl LogStore {
                         this.language_servers
                             .retain(|_, state| state.kind.project() != Some(&weak_project));
                     }),
-                    cx.subscribe(project, |this, project, event, cx| {
-                        let server_kind = if project.read(cx).is_via_remote_server() {
-                            LanguageServerKind::Remote {
-                                project: project.downgrade(),
-                            }
-                        } else {
+                    cx.subscribe(project, move |log_store, project, event, cx| {
+                        let server_kind = if project.read(cx).is_local() {
                             LanguageServerKind::Local {
                                 project: project.downgrade(),
                             }
+                        } else {
+                            LanguageServerKind::Remote {
+                                project: project.downgrade(),
+                            }
                         };
-
                         match event {
                             project::Event::LanguageServerAdded(id, name, worktree_id) => {
-                                this.add_language_server(
+                                log_store.add_language_server(
                                     server_kind,
                                     *id,
                                     Some(name.clone()),
@@ -346,18 +378,76 @@ impl LogStore {
                                     cx,
                                 );
                             }
+                            project::Event::LanguageServerBufferRegistered {
+                                server_id,
+                                buffer_id,
+                                name,
+                                ..
+                            } if project.read(cx).is_via_collab() => {
+                                let worktree_id = project
+                                    .read(cx)
+                                    .buffer_for_id(*buffer_id, cx)
+                                    .and_then(|buffer| {
+                                        Some(buffer.read(cx).project_path(cx)?.worktree_id)
+                                    });
+                                let name = name.clone().or_else(|| {
+                                    project
+                                        .read(cx)
+                                        .lsp_store()
+                                        .read(cx)
+                                        .language_server_statuses
+                                        .get(server_id)
+                                        .map(|status| status.name.clone())
+                                });
+                                log_store.add_language_server(
+                                    server_kind,
+                                    *server_id,
+                                    name,
+                                    worktree_id,
+                                    None,
+                                    cx,
+                                );
+                            }
                             project::Event::LanguageServerRemoved(id) => {
-                                this.remove_language_server(*id, cx);
+                                log_store.remove_language_server(*id, cx);
                             }
                             project::Event::LanguageServerLog(id, typ, message) => {
-                                this.add_language_server(server_kind, *id, None, None, None, cx);
+                                log_store.add_language_server(
+                                    server_kind,
+                                    *id,
+                                    None,
+                                    None,
+                                    None,
+                                    cx,
+                                );
                                 match typ {
                                     project::LanguageServerLogType::Log(typ) => {
-                                        this.add_language_server_log(*id, *typ, message, cx);
+                                        log_store.add_language_server_log(*id, *typ, message, cx);
                                     }
-                                    project::LanguageServerLogType::Trace(_) => {
-                                        this.add_language_server_trace(*id, message, cx);
+                                    project::LanguageServerLogType::Trace { verbose_info } => {
+                                        log_store.add_language_server_trace(
+                                            *id,
+                                            message,
+                                            verbose_info.clone(),
+                                            cx,
+                                        );
                                     }
+                                    project::LanguageServerLogType::Rpc { received } => {
+                                        let kind = if *received {
+                                            MessageKind::Receive
+                                        } else {
+                                            MessageKind::Send
+                                        };
+                                        log_store.add_language_server_rpc(*id, kind, message, cx);
+                                    }
+                                }
+                            }
+                            project::Event::ToggleLspLogs { server_id, enabled } => {
+                                // we do not support any other log toggling yet
+                                if *enabled {
+                                    log_store.enable_rpc_trace_for_language_server(*server_id);
+                                } else {
+                                    log_store.disable_rpc_trace_for_language_server(*server_id);
                                 }
                             }
                             _ => {}
@@ -375,7 +465,7 @@ impl LogStore {
         self.language_servers.get_mut(&id)
     }
 
-    fn add_language_server(
+    pub fn add_language_server(
         &mut self,
         kind: LanguageServerKind,
         server_id: LanguageServerId,
@@ -426,20 +516,35 @@ impl LogStore {
         message: &str,
         cx: &mut Context<Self>,
     ) -> Option<()> {
+        let store_logs = self.store_logs;
         let language_server_state = self.get_language_server_state(id)?;
 
         let log_lines = &mut language_server_state.log_messages;
-        Self::add_language_server_message(
+        let message = message.trim_end().to_string();
+        if !store_logs {
+            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Log(typ),
+                    text: message,
+                },
+                cx,
+            );
+        } else if let Some(new_message) = Self::push_new_message(
             log_lines,
-            id,
-            LogMessage {
-                message: message.trim_end().to_string(),
-                typ,
-            },
+            LogMessage { message, typ },
             language_server_state.log_level,
-            LogKind::Logs,
-            cx,
-        );
+        ) {
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Log(typ),
+                    text: new_message,
+                },
+                cx,
+            );
+        }
         Some(())
     }
 
@@ -447,46 +552,127 @@ impl LogStore {
         &mut self,
         id: LanguageServerId,
         message: &str,
+        verbose_info: Option<String>,
         cx: &mut Context<Self>,
     ) -> Option<()> {
+        let store_logs = self.store_logs;
         let language_server_state = self.get_language_server_state(id)?;
 
         let log_lines = &mut language_server_state.trace_messages;
-        Self::add_language_server_message(
+        if !store_logs {
+            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Trace { verbose_info },
+                    text: message.trim().to_string(),
+                },
+                cx,
+            );
+        } else if let Some(new_message) = Self::push_new_message(
             log_lines,
-            id,
             TraceMessage {
                 message: message.trim().to_string(),
+                is_verbose: false,
             },
-            (),
-            LogKind::Trace,
-            cx,
-        );
+            TraceValue::Messages,
+        ) {
+            if let Some(verbose_message) = verbose_info.as_ref() {
+                Self::push_new_message(
+                    log_lines,
+                    TraceMessage {
+                        message: verbose_message.clone(),
+                        is_verbose: true,
+                    },
+                    TraceValue::Verbose,
+                );
+            }
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Trace { verbose_info },
+                    text: new_message,
+                },
+                cx,
+            );
+        }
         Some(())
     }
 
-    fn add_language_server_message<T: Message>(
+    fn push_new_message<T: Message>(
         log_lines: &mut VecDeque<T>,
-        id: LanguageServerId,
         message: T,
         current_severity: <T as Message>::Level,
-        kind: LogKind,
-        cx: &mut Context<Self>,
-    ) {
+    ) -> Option<String> {
         while log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
             log_lines.pop_front();
         }
-        let text = message.as_ref().to_string();
         let visible = message.should_include(current_severity);
-        log_lines.push_back(message);
 
-        if visible {
-            cx.emit(Event::NewServerLogEntry { id, kind, text });
-            cx.notify();
-        }
+        let visible_message = visible.then(|| message.as_ref().to_string());
+        log_lines.push_back(message);
+        visible_message
     }
 
-    fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
+    fn add_language_server_rpc(
+        &mut self,
+        language_server_id: LanguageServerId,
+        kind: MessageKind,
+        message: &str,
+        cx: &mut Context<'_, Self>,
+    ) {
+        let store_logs = self.store_logs;
+        let Some(state) = self
+            .get_language_server_state(language_server_id)
+            .and_then(|state| state.rpc_state.as_mut())
+        else {
+            return;
+        };
+
+        let received = kind == MessageKind::Receive;
+        let rpc_log_lines = &mut state.rpc_messages;
+        if state.last_message_kind != Some(kind) {
+            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+                rpc_log_lines.pop_front();
+            }
+            let line_before_message = match kind {
+                MessageKind::Send => SEND_LINE,
+                MessageKind::Receive => RECEIVE_LINE,
+            };
+            if store_logs {
+                rpc_log_lines.push_back(RpcMessage {
+                    message: line_before_message.to_string(),
+                });
+            }
+            // Do not send a synthetic message over the wire, it will be derived from the actual RPC message
+            cx.emit(Event::NewServerLogEntry {
+                id: language_server_id,
+                kind: LanguageServerLogType::Rpc { received },
+                text: line_before_message.to_string(),
+            });
+        }
+
+        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+            rpc_log_lines.pop_front();
+        }
+
+        if store_logs {
+            rpc_log_lines.push_back(RpcMessage {
+                message: message.trim().to_owned(),
+            });
+        }
+
+        self.emit_event(
+            Event::NewServerLogEntry {
+                id: language_server_id,
+                kind: LanguageServerLogType::Rpc { received },
+                text: message.to_owned(),
+            },
+            cx,
+        );
+    }
+
+    pub fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
         self.language_servers.remove(&id);
         cx.notify();
     }
@@ -516,11 +702,11 @@ impl LogStore {
                         None
                     }
                 }
-                LanguageServerKind::Global => Some(*id),
+                LanguageServerKind::Global | LanguageServerKind::LocalSsh { .. } => Some(*id),
             })
     }
 
-    fn enable_rpc_trace_for_language_server(
+    pub fn enable_rpc_trace_for_language_server(
         &mut self,
         server_id: LanguageServerId,
     ) -> Option<&mut LanguageServerRpcState> {
@@ -663,51 +849,46 @@ impl LogStore {
             }
         };
 
-        let state = self
-            .get_language_server_state(language_server_id)?
-            .rpc_state
-            .as_mut()?;
         let kind = if is_received {
             MessageKind::Receive
         } else {
             MessageKind::Send
         };
 
-        let rpc_log_lines = &mut state.rpc_messages;
-        if state.last_message_kind != Some(kind) {
-            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-                rpc_log_lines.pop_front();
-            }
-            let line_before_message = match kind {
-                MessageKind::Send => SEND_LINE,
-                MessageKind::Receive => RECEIVE_LINE,
-            };
-            rpc_log_lines.push_back(RpcMessage {
-                message: line_before_message.to_string(),
-            });
-            cx.emit(Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LogKind::Rpc,
-                text: line_before_message.to_string(),
-            });
-        }
-
-        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            rpc_log_lines.pop_front();
-        }
-
-        let message = message.trim();
-        rpc_log_lines.push_back(RpcMessage {
-            message: message.to_string(),
-        });
-        cx.emit(Event::NewServerLogEntry {
-            id: language_server_id,
-            kind: LogKind::Rpc,
-            text: message.to_string(),
-        });
+        self.add_language_server_rpc(language_server_id, kind, message, cx);
         cx.notify();
         Some(())
     }
+
+    fn emit_event(&mut self, e: Event, cx: &mut Context<Self>) {
+        match &e {
+            Event::NewServerLogEntry { id, kind, text } => {
+                if let Some(state) = self.get_language_server_state(*id) {
+                    let downstream_client = match &state.kind {
+                        LanguageServerKind::Remote { project }
+                        | LanguageServerKind::Local { project } => project
+                            .upgrade()
+                            .map(|project| project.read(cx).lsp_store()),
+                        LanguageServerKind::LocalSsh { lsp_store } => lsp_store.upgrade(),
+                        LanguageServerKind::Global => None,
+                    }
+                    .and_then(|lsp_store| lsp_store.read(cx).downstream_client());
+                    if let Some((client, project_id)) = downstream_client {
+                        client
+                            .send(proto::LanguageServerLog {
+                                project_id,
+                                language_server_id: id.to_proto(),
+                                message: text.clone(),
+                                log_type: Some(kind.to_proto()),
+                            })
+                            .ok();
+                    }
+                }
+            }
+        }
+
+        cx.emit(e);
+    }
 }
 
 impl LspLogView {
@@ -751,13 +932,14 @@ impl LspLogView {
 
                 cx.notify();
             });
+
         let events_subscriptions = cx.subscribe_in(
             &log_store,
             window,
             move |log_view, _, e, window, cx| match e {
                 Event::NewServerLogEntry { id, kind, text } => {
                     if log_view.current_server_id == Some(*id)
-                        && *kind == log_view.active_entry_kind
+                        && LogKind::from_server_log_type(kind) == log_view.active_entry_kind
                     {
                         log_view.editor.update(cx, |editor, cx| {
                             editor.set_read_only(false);
@@ -800,7 +982,7 @@ impl LspLogView {
             window.focus(&log_view.editor.focus_handle(cx));
         });
 
-        let mut this = Self {
+        let mut lsp_log_view = Self {
             focus_handle,
             editor,
             editor_subscriptions,
@@ -815,9 +997,9 @@ impl LspLogView {
             ],
         };
         if let Some(server_id) = server_id {
-            this.show_logs_for_server(server_id, window, cx);
+            lsp_log_view.show_logs_for_server(server_id, window, cx);
         }
-        this
+        lsp_log_view
     }
 
     fn editor_for_logs(
@@ -838,7 +1020,7 @@ impl LspLogView {
     }
 
     fn editor_for_server_info(
-        server: &LanguageServer,
+        info: ServerInfo,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> (Entity<Editor>, Vec<Subscription>) {
@@ -853,22 +1035,21 @@ impl LspLogView {
 * Capabilities: {CAPABILITIES}
 
 * Configuration: {CONFIGURATION}",
-            NAME = server.name(),
-            ID = server.server_id(),
-            BINARY = server.binary(),
-            WORKSPACE_FOLDERS = server
-                .workspace_folders()
-                .into_iter()
-                .filter_map(|path| path
-                    .to_file_path()
-                    .ok()
-                    .map(|path| path.to_string_lossy().into_owned()))
-                .collect::<Vec<_>>()
-                .join(", "),
-            CAPABILITIES = serde_json::to_string_pretty(&server.capabilities())
+            NAME = info.name,
+            ID = info.id,
+            BINARY = info.binary.as_ref().map_or_else(
+                || "Unknown".to_string(),
+                |bin| bin.path.as_path().to_string_lossy().to_string()
+            ),
+            WORKSPACE_FOLDERS = info.workspace_folders.join(", "),
+            CAPABILITIES = serde_json::to_string_pretty(&info.capabilities)
                 .unwrap_or_else(|e| format!("Failed to serialize capabilities: {e}")),
-            CONFIGURATION = serde_json::to_string_pretty(server.configuration())
-                .unwrap_or_else(|e| format!("Failed to serialize configuration: {e}")),
+            CONFIGURATION = info
+                .configuration
+                .map(|configuration| serde_json::to_string_pretty(&configuration))
+                .transpose()
+                .unwrap_or_else(|e| Some(format!("Failed to serialize configuration: {e}")))
+                .unwrap_or_else(|| "Unknown".to_string()),
         );
         let editor = initialize_new_editor(server_info, false, window, cx);
         let editor_subscription = cx.subscribe(
@@ -891,7 +1072,9 @@ impl LspLogView {
             .language_servers
             .iter()
             .map(|(server_id, state)| match &state.kind {
-                LanguageServerKind::Local { .. } | LanguageServerKind::Remote { .. } => {
+                LanguageServerKind::Local { .. }
+                | LanguageServerKind::Remote { .. }
+                | LanguageServerKind::LocalSsh { .. } => {
                     let worktree_root_name = state
                         .worktree_id
                         .and_then(|id| self.project.read(cx).worktree_for_id(id, cx))
@@ -1003,11 +1186,17 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        let trace_level = self
+            .log_store
+            .update(cx, |this, _| {
+                Some(this.get_language_server_state(server_id)?.trace_level)
+            })
+            .unwrap_or(TraceValue::Messages);
         let log_contents = self
             .log_store
             .read(cx)
             .server_trace(server_id)
-            .map(|v| log_contents(v, ()));
+            .map(|v| log_contents(v, trace_level));
         if let Some(log_contents) = log_contents {
             self.current_server_id = Some(server_id);
             self.active_entry_kind = LogKind::Trace;
@@ -1025,6 +1214,7 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        self.toggle_rpc_trace_for_server(server_id, true, window, cx);
         let rpc_log = self.log_store.update(cx, |log_store, _| {
             log_store
                 .enable_rpc_trace_for_language_server(server_id)
@@ -1069,12 +1259,33 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.log_store.update(cx, |log_store, _| {
+        self.log_store.update(cx, |log_store, cx| {
             if enabled {
                 log_store.enable_rpc_trace_for_language_server(server_id);
             } else {
                 log_store.disable_rpc_trace_for_language_server(server_id);
             }
+
+            if let Some(server_state) = log_store.language_servers.get(&server_id) {
+                if let LanguageServerKind::Remote { project } = &server_state.kind {
+                    project
+                        .update(cx, |project, cx| {
+                            if let Some((client, project_id)) =
+                                project.lsp_store().read(cx).upstream_client()
+                            {
+                                client
+                                    .send(proto::ToggleLspLogs {
+                                        project_id,
+                                        log_type: proto::toggle_lsp_logs::LogType::Rpc as i32,
+                                        server_id: server_id.to_proto(),
+                                        enabled,
+                                    })
+                                    .log_err();
+                            }
+                        })
+                        .ok();
+                }
+            };
         });
         if !enabled && Some(server_id) == self.current_server_id {
             self.show_logs_for_server(server_id, window, cx);
@@ -1113,13 +1324,38 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let lsp_store = self.project.read(cx).lsp_store();
-        let Some(server) = lsp_store.read(cx).language_server_for_id(server_id) else {
+        let Some(server_info) = self
+            .project
+            .read(cx)
+            .lsp_store()
+            .update(cx, |lsp_store, _| {
+                lsp_store
+                    .language_server_for_id(server_id)
+                    .as_ref()
+                    .map(|language_server| ServerInfo::new(language_server))
+                    .or_else(move || {
+                        let capabilities =
+                            lsp_store.lsp_server_capabilities.get(&server_id)?.clone();
+                        let name = lsp_store
+                            .language_server_statuses
+                            .get(&server_id)
+                            .map(|status| status.name.clone())?;
+                        Some(ServerInfo {
+                            id: server_id,
+                            capabilities,
+                            binary: None,
+                            name,
+                            workspace_folders: Vec::new(),
+                            configuration: None,
+                        })
+                    })
+            })
+        else {
             return;
         };
         self.current_server_id = Some(server_id);
         self.active_entry_kind = LogKind::ServerInfo;
-        let (editor, editor_subscriptions) = Self::editor_for_server_info(&server, window, cx);
+        let (editor, editor_subscriptions) = Self::editor_for_server_info(server_info, window, cx);
         self.editor = editor;
         self.editor_subscriptions = editor_subscriptions;
         cx.notify();
@@ -1416,7 +1652,6 @@ impl Render for LspLogToolbarItemView {
 
         let view_selector = current_server.map(|server| {
             let server_id = server.server_id;
-            let is_remote = server.server_kind.is_remote();
             let rpc_trace_enabled = server.rpc_trace_enabled;
             let log_view = log_view.clone();
             PopoverMenu::new("LspViewSelector")
@@ -1438,55 +1673,53 @@ impl Render for LspLogToolbarItemView {
                                 view.show_logs_for_server(server_id, window, cx);
                             }),
                         )
-                        .when(!is_remote, |this| {
-                            this.entry(
-                                SERVER_TRACE,
-                                None,
-                                window.handler_for(&log_view, move |view, window, cx| {
-                                    view.show_trace_for_server(server_id, window, cx);
-                                }),
-                            )
-                            .custom_entry(
-                                {
-                                    let log_toolbar_view = log_toolbar_view.clone();
-                                    move |window, _| {
-                                        h_flex()
-                                            .w_full()
-                                            .justify_between()
-                                            .child(Label::new(RPC_MESSAGES))
-                                            .child(
-                                                div().child(
-                                                    Checkbox::new(
-                                                        "LspLogEnableRpcTrace",
-                                                        if rpc_trace_enabled {
+                        .entry(
+                            SERVER_TRACE,
+                            None,
+                            window.handler_for(&log_view, move |view, window, cx| {
+                                view.show_trace_for_server(server_id, window, cx);
+                            }),
+                        )
+                        .custom_entry(
+                            {
+                                let log_toolbar_view = log_toolbar_view.clone();
+                                move |window, _| {
+                                    h_flex()
+                                        .w_full()
+                                        .justify_between()
+                                        .child(Label::new(RPC_MESSAGES))
+                                        .child(
+                                            div().child(
+                                                Checkbox::new(
+                                                    "LspLogEnableRpcTrace",
+                                                    if rpc_trace_enabled {
+                                                        ToggleState::Selected
+                                                    } else {
+                                                        ToggleState::Unselected
+                                                    },
+                                                )
+                                                .on_click(window.listener_for(
+                                                    &log_toolbar_view,
+                                                    move |view, selection, window, cx| {
+                                                        let enabled = matches!(
+                                                            selection,
                                                             ToggleState::Selected
-                                                        } else {
-                                                            ToggleState::Unselected
-                                                        },
-                                                    )
-                                                    .on_click(window.listener_for(
-                                                        &log_toolbar_view,
-                                                        move |view, selection, window, cx| {
-                                                            let enabled = matches!(
-                                                                selection,
-                                                                ToggleState::Selected
-                                                            );
-                                                            view.toggle_rpc_logging_for_server(
-                                                                server_id, enabled, window, cx,
-                                                            );
-                                                            cx.stop_propagation();
-                                                        },
-                                                    )),
-                                                ),
-                                            )
-                                            .into_any_element()
-                                    }
-                                },
-                                window.handler_for(&log_view, move |view, window, cx| {
-                                    view.show_rpc_trace_for_server(server_id, window, cx);
-                                }),
-                            )
-                        })
+                                                        );
+                                                        view.toggle_rpc_logging_for_server(
+                                                            server_id, enabled, window, cx,
+                                                        );
+                                                        cx.stop_propagation();
+                                                    },
+                                                )),
+                                            ),
+                                        )
+                                        .into_any_element()
+                                }
+                            },
+                            window.handler_for(&log_view, move |view, window, cx| {
+                                view.show_rpc_trace_for_server(server_id, window, cx);
+                            }),
+                        )
                         .entry(
                             SERVER_INFO,
                             None,
@@ -1696,12 +1929,6 @@ const SERVER_LOGS: &str = "Server Logs";
 const SERVER_TRACE: &str = "Server Trace";
 const SERVER_INFO: &str = "Server Info";
 
-impl Default for LspLogToolbarItemView {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl LspLogToolbarItemView {
     pub fn new() -> Self {
         Self {
@@ -1734,10 +1961,41 @@ impl LspLogToolbarItemView {
     }
 }
 
+struct ServerInfo {
+    id: LanguageServerId,
+    capabilities: lsp::ServerCapabilities,
+    binary: Option<LanguageServerBinary>,
+    name: LanguageServerName,
+    workspace_folders: Vec<String>,
+    configuration: Option<serde_json::Value>,
+}
+
+impl ServerInfo {
+    fn new(server: &LanguageServer) -> Self {
+        Self {
+            id: server.server_id(),
+            capabilities: server.capabilities(),
+            binary: Some(server.binary().clone()),
+            name: server.name(),
+            workspace_folders: server
+                .workspace_folders()
+                .into_iter()
+                .filter_map(|path| {
+                    path.to_file_path()
+                        .ok()
+                        .map(|path| path.to_string_lossy().into_owned())
+                })
+                .collect::<Vec<_>>(),
+            configuration: Some(server.configuration().clone()),
+        }
+    }
+}
+
+#[derive(Debug)]
 pub enum Event {
     NewServerLogEntry {
         id: LanguageServerId,
-        kind: LogKind,
+        kind: LanguageServerLogType,
         text: String,
     },
 }
diff --git a/crates/language_tools/src/lsp_log_tests.rs b/crates/language_tools/src/lsp_log_tests.rs
index ad2b653fdc..a7dbaa2a60 100644
--- a/crates/language_tools/src/lsp_log_tests.rs
+++ b/crates/language_tools/src/lsp_log_tests.rs
@@ -51,7 +51,7 @@ async fn test_lsp_logs(cx: &mut TestAppContext) {
         },
     );
 
-    let log_store = cx.new(LogStore::new);
+    let log_store = cx.new(|cx| LogStore::new(true, cx));
     log_store.update(cx, |store, cx| store.add_project(&project, cx));
 
     let _rust_buffer = project
diff --git a/crates/language_tools/src/lsp_tool.rs b/crates/language_tools/src/lsp_tool.rs
index dd3e80212f..2d6a99a0bc 100644
--- a/crates/language_tools/src/lsp_tool.rs
+++ b/crates/language_tools/src/lsp_tool.rs
@@ -122,8 +122,7 @@ impl LanguageServerState {
         let lsp_logs = cx
             .try_global::<GlobalLogStore>()
             .and_then(|lsp_logs| lsp_logs.0.upgrade());
-        let lsp_store = self.lsp_store.upgrade();
-        let Some((lsp_logs, lsp_store)) = lsp_logs.zip(lsp_store) else {
+        let Some(lsp_logs) = lsp_logs else {
             return menu;
         };
 
@@ -210,10 +209,11 @@ impl LanguageServerState {
             };
 
             let server_selector = server_info.server_selector();
-            // TODO currently, Zed remote does not work well with the LSP logs
-            // https://github.com/zed-industries/zed/issues/28557
-            let has_logs = lsp_store.read(cx).as_local().is_some()
-                && lsp_logs.read(cx).has_server_logs(&server_selector);
+            let is_remote = self
+                .lsp_store
+                .update(cx, |lsp_store, _| lsp_store.as_remote().is_some())
+                .unwrap_or(false);
+            let has_logs = is_remote || lsp_logs.read(cx).has_server_logs(&server_selector);
 
             let status_color = server_info
                 .binary_status
@@ -241,10 +241,10 @@ impl LanguageServerState {
                 .as_ref()
                 .or_else(|| server_info.binary_status.as_ref()?.message.as_ref())
                 .cloned();
-            let hover_label = if has_logs {
-                Some("View Logs")
-            } else if message.is_some() {
+            let hover_label = if message.is_some() {
                 Some("View Message")
+            } else if has_logs {
+                Some("View Logs")
             } else {
                 None
             };
@@ -288,16 +288,7 @@ impl LanguageServerState {
                     let server_name = server_info.name.clone();
                     let workspace = self.workspace.clone();
                     move |window, cx| {
-                        if has_logs {
-                            lsp_logs.update(cx, |lsp_logs, cx| {
-                                lsp_logs.open_server_trace(
-                                    workspace.clone(),
-                                    server_selector.clone(),
-                                    window,
-                                    cx,
-                                );
-                            });
-                        } else if let Some(message) = &message {
+                        if let Some(message) = &message {
                             let Some(create_buffer) = workspace
                                 .update(cx, |workspace, cx| {
                                     workspace
@@ -347,6 +338,15 @@ impl LanguageServerState {
                                 anyhow::Ok(())
                             })
                             .detach();
+                        } else if has_logs {
+                            lsp_logs.update(cx, |lsp_logs, cx| {
+                                lsp_logs.open_server_trace(
+                                    workspace.clone(),
+                                    server_selector.clone(),
+                                    window,
+                                    cx,
+                                );
+                            });
                         } else {
                             cx.propagate();
                         }
@@ -529,26 +529,48 @@ impl LspTool {
             });
 
         let lsp_store = workspace.project().read(cx).lsp_store();
+        let mut language_servers = LanguageServers::default();
+        for (_, status) in lsp_store.read(cx).language_server_statuses() {
+            language_servers.binary_statuses.insert(
+                status.name.clone(),
+                LanguageServerBinaryStatus {
+                    status: BinaryStatus::None,
+                    message: None,
+                },
+            );
+        }
+
         let lsp_store_subscription =
             cx.subscribe_in(&lsp_store, window, |lsp_tool, _, e, window, cx| {
                 lsp_tool.on_lsp_store_event(e, window, cx)
             });
 
-        let state = cx.new(|_| LanguageServerState {
+        let server_state = cx.new(|_| LanguageServerState {
             workspace: workspace.weak_handle(),
             items: Vec::new(),
             lsp_store: lsp_store.downgrade(),
             active_editor: None,
-            language_servers: LanguageServers::default(),
+            language_servers,
         });
 
-        Self {
-            server_state: state,
+        let mut lsp_tool = Self {
+            server_state,
             popover_menu_handle,
             lsp_menu: None,
             lsp_menu_refresh: Task::ready(()),
             _subscriptions: vec![settings_subscription, lsp_store_subscription],
+        };
+        if !lsp_tool
+            .server_state
+            .read(cx)
+            .language_servers
+            .binary_statuses
+            .is_empty()
+        {
+            lsp_tool.refresh_lsp_menu(true, window, cx);
         }
+
+        lsp_tool
     }
 
     fn on_lsp_store_event(
@@ -708,6 +730,25 @@ impl LspTool {
                     }
                 }
             }
+            state
+                .lsp_store
+                .update(cx, |lsp_store, cx| {
+                    for (server_id, status) in lsp_store.language_server_statuses() {
+                        if let Some(worktree) = status.worktree.and_then(|worktree_id| {
+                            lsp_store
+                                .worktree_store()
+                                .read(cx)
+                                .worktree_for_id(worktree_id, cx)
+                        }) {
+                            server_ids_to_worktrees.insert(server_id, worktree.clone());
+                            server_names_to_worktrees
+                                .entry(status.name.clone())
+                                .or_default()
+                                .insert((worktree, server_id));
+                        }
+                    }
+                })
+                .ok();
 
             let mut servers_per_worktree = BTreeMap::<SharedString, Vec<ServerData>>::new();
             let mut servers_without_worktree = Vec::<ServerData>::new();
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index ad9d0abf40..2bc95bf81d 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -977,7 +977,9 @@ impl LocalLspStore {
                         this.update(&mut cx, |_, cx| {
                             cx.emit(LspStoreEvent::LanguageServerLog(
                                 server_id,
-                                LanguageServerLogType::Trace(params.verbose),
+                                LanguageServerLogType::Trace {
+                                    verbose_info: params.verbose,
+                                },
                                 params.message,
                             ));
                         })
@@ -3482,13 +3484,13 @@ pub struct LspStore {
     buffer_store: Entity<BufferStore>,
     worktree_store: Entity<WorktreeStore>,
     pub languages: Arc<LanguageRegistry>,
-    language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
+    pub language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
     active_entry: Option<ProjectEntryId>,
     _maintain_workspace_config: (Task<Result<()>>, watch::Sender<()>),
     _maintain_buffer_languages: Task<()>,
     diagnostic_summaries:
         HashMap<WorktreeId, HashMap<Arc<Path>, HashMap<LanguageServerId, DiagnosticSummary>>>,
-    pub(super) lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
+    pub lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
     lsp_document_colors: HashMap<BufferId, DocumentColorData>,
     lsp_code_lens: HashMap<BufferId, CodeLensData>,
     running_lsp_requests: HashMap<TypeId, (Global, HashMap<LspRequestId, Task<()>>)>,
@@ -3565,6 +3567,7 @@ pub struct LanguageServerStatus {
     pub pending_work: BTreeMap<String, LanguageServerProgress>,
     pub has_pending_diagnostic_updates: bool,
     progress_tokens: HashSet<String>,
+    pub worktree: Option<WorktreeId>,
 }
 
 #[derive(Clone, Debug)]
@@ -7483,7 +7486,7 @@ impl LspStore {
                         server: Some(proto::LanguageServer {
                             id: server_id.to_proto(),
                             name: status.name.to_string(),
-                            worktree_id: None,
+                            worktree_id: status.worktree.map(|id| id.to_proto()),
                         }),
                         capabilities: serde_json::to_string(&server.capabilities())
                             .expect("serializing server LSP capabilities"),
@@ -7527,6 +7530,7 @@ impl LspStore {
                         pending_work: Default::default(),
                         has_pending_diagnostic_updates: false,
                         progress_tokens: Default::default(),
+                        worktree: server.worktree_id.map(WorktreeId::from_proto),
                     },
                 )
             })
@@ -8892,6 +8896,7 @@ impl LspStore {
                     pending_work: Default::default(),
                     has_pending_diagnostic_updates: false,
                     progress_tokens: Default::default(),
+                    worktree: server.worktree_id.map(WorktreeId::from_proto),
                 },
             );
             cx.emit(LspStoreEvent::LanguageServerAdded(
@@ -10905,6 +10910,7 @@ impl LspStore {
                 pending_work: Default::default(),
                 has_pending_diagnostic_updates: false,
                 progress_tokens: Default::default(),
+                worktree: Some(key.worktree_id),
             },
         );
 
@@ -12190,6 +12196,14 @@ impl LspStore {
         let data = self.lsp_code_lens.get_mut(&buffer_id)?;
         Some(data.update.take()?.1)
     }
+
+    pub fn downstream_client(&self) -> Option<(AnyProtoClient, u64)> {
+        self.downstream_client.clone()
+    }
+
+    pub fn worktree_store(&self) -> Entity<WorktreeStore> {
+        self.worktree_store.clone()
+    }
 }
 
 // Registration with registerOptions as null, should fallback to true.
@@ -12699,45 +12713,69 @@ impl PartialEq for LanguageServerPromptRequest {
 #[derive(Clone, Debug, PartialEq)]
 pub enum LanguageServerLogType {
     Log(MessageType),
-    Trace(Option<String>),
+    Trace { verbose_info: Option<String> },
+    Rpc { received: bool },
 }
 
 impl LanguageServerLogType {
     pub fn to_proto(&self) -> proto::language_server_log::LogType {
         match self {
             Self::Log(log_type) => {
-                let message_type = match *log_type {
-                    MessageType::ERROR => 1,
-                    MessageType::WARNING => 2,
-                    MessageType::INFO => 3,
-                    MessageType::LOG => 4,
+                use proto::log_message::LogLevel;
+                let level = match *log_type {
+                    MessageType::ERROR => LogLevel::Error,
+                    MessageType::WARNING => LogLevel::Warning,
+                    MessageType::INFO => LogLevel::Info,
+                    MessageType::LOG => LogLevel::Log,
                     other => {
-                        log::warn!("Unknown lsp log message type: {:?}", other);
-                        4
+                        log::warn!("Unknown lsp log message type: {other:?}");
+                        LogLevel::Log
                     }
                 };
-                proto::language_server_log::LogType::LogMessageType(message_type)
-            }
-            Self::Trace(message) => {
-                proto::language_server_log::LogType::LogTrace(proto::LspLogTrace {
-                    message: message.clone(),
+                proto::language_server_log::LogType::Log(proto::LogMessage {
+                    level: level as i32,
                 })
             }
+            Self::Trace { verbose_info } => {
+                proto::language_server_log::LogType::Trace(proto::TraceMessage {
+                    verbose_info: verbose_info.to_owned(),
+                })
+            }
+            Self::Rpc { received } => {
+                let kind = if *received {
+                    proto::rpc_message::Kind::Received
+                } else {
+                    proto::rpc_message::Kind::Sent
+                };
+                let kind = kind as i32;
+                proto::language_server_log::LogType::Rpc(proto::RpcMessage { kind })
+            }
         }
     }
 
     pub fn from_proto(log_type: proto::language_server_log::LogType) -> Self {
+        use proto::log_message::LogLevel;
+        use proto::rpc_message;
         match log_type {
-            proto::language_server_log::LogType::LogMessageType(message_type) => {
-                Self::Log(match message_type {
-                    1 => MessageType::ERROR,
-                    2 => MessageType::WARNING,
-                    3 => MessageType::INFO,
-                    4 => MessageType::LOG,
-                    _ => MessageType::LOG,
-                })
-            }
-            proto::language_server_log::LogType::LogTrace(trace) => Self::Trace(trace.message),
+            proto::language_server_log::LogType::Log(message_type) => Self::Log(
+                match LogLevel::from_i32(message_type.level).unwrap_or(LogLevel::Log) {
+                    LogLevel::Error => MessageType::ERROR,
+                    LogLevel::Warning => MessageType::WARNING,
+                    LogLevel::Info => MessageType::INFO,
+                    LogLevel::Log => MessageType::LOG,
+                },
+            ),
+            proto::language_server_log::LogType::Trace(trace_message) => Self::Trace {
+                verbose_info: trace_message.verbose_info,
+            },
+            proto::language_server_log::LogType::Rpc(message) => Self::Rpc {
+                received: match rpc_message::Kind::from_i32(message.kind)
+                    .unwrap_or(rpc_message::Kind::Received)
+                {
+                    rpc_message::Kind::Received => true,
+                    rpc_message::Kind::Sent => false,
+                },
+            },
         }
     }
 }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 9e3900198c..63ce309e7a 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -280,6 +280,11 @@ pub enum Event {
         server_id: LanguageServerId,
         buffer_id: BufferId,
         buffer_abs_path: PathBuf,
+        name: Option<LanguageServerName>,
+    },
+    ToggleLspLogs {
+        server_id: LanguageServerId,
+        enabled: bool,
     },
     Toast {
         notification_id: SharedString,
@@ -1001,6 +1006,7 @@ impl Project {
         client.add_entity_request_handler(Self::handle_open_buffer_by_path);
         client.add_entity_request_handler(Self::handle_open_new_buffer);
         client.add_entity_message_handler(Self::handle_create_buffer_for_peer);
+        client.add_entity_message_handler(Self::handle_toggle_lsp_logs);
 
         WorktreeStore::init(&client);
         BufferStore::init(&client);
@@ -2971,6 +2977,7 @@ impl Project {
                                 buffer_id,
                                 server_id: *language_server_id,
                                 buffer_abs_path: PathBuf::from(&update.buffer_abs_path),
+                                name: name.clone(),
                             });
                         }
                     }
@@ -4697,6 +4704,20 @@ impl Project {
         })?
     }
 
+    async fn handle_toggle_lsp_logs(
+        project: Entity<Self>,
+        envelope: TypedEnvelope<proto::ToggleLspLogs>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        project.update(&mut cx, |_, cx| {
+            cx.emit(Event::ToggleLspLogs {
+                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
+                enabled: envelope.payload.enabled,
+            })
+        })?;
+        Ok(())
+    }
+
     async fn handle_synchronize_buffers(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::SynchronizeBuffers>,
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 6dcd07482e..ed15ba845a 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1951,6 +1951,7 @@ async fn test_restarting_server_with_diagnostics_running(cx: &mut gpui::TestAppC
             server_id: LanguageServerId(1),
             buffer_id,
             buffer_abs_path: PathBuf::from(path!("/dir/a.rs")),
+            name: Some(fake_server.server.name())
         }
     );
     assert_eq!(
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 473ef5c38c..16f6217b29 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -610,11 +610,36 @@ message ServerMetadataUpdated {
 message LanguageServerLog {
     uint64 project_id = 1;
     uint64 language_server_id = 2;
+    string message = 3;
     oneof log_type {
-        uint32 log_message_type = 3;
-        LspLogTrace log_trace = 4;
+        LogMessage log = 4;
+        TraceMessage trace = 5;
+        RpcMessage rpc = 6;
+    }
+}
+
+message LogMessage {
+    LogLevel level = 1;
+
+    enum LogLevel {
+        LOG = 0;
+        INFO = 1;
+        WARNING = 2;
+        ERROR = 3;
+    }
+}
+
+message TraceMessage {
+    optional string verbose_info = 1;
+}
+
+message RpcMessage {
+    Kind kind = 1;
+
+    enum Kind {
+        RECEIVED = 0;
+        SENT = 1;
     }
-    string message = 5;
 }
 
 message LspLogTrace {
@@ -932,3 +957,16 @@ message MultiLspQuery {
 message MultiLspQueryResponse {
     repeated LspResponse responses = 1;
 }
+
+message ToggleLspLogs {
+    uint64 project_id = 1;
+    LogType log_type = 2;
+    uint64 server_id = 3;
+    bool enabled = 4;
+
+    enum LogType {
+        LOG = 0;
+        TRACE = 1;
+        RPC = 2;
+    }
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 70689bcd63..2222bdec08 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -396,7 +396,8 @@ message Envelope {
         GitCloneResponse git_clone_response = 364;
 
         LspQuery lsp_query = 365;
-        LspQueryResponse lsp_query_response = 366; // current max
+        LspQueryResponse lsp_query_response = 366;
+        ToggleLspLogs toggle_lsp_logs = 367; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index e17ec5203b..04495fb898 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -312,7 +312,8 @@ messages!(
     (GetDefaultBranch, Background),
     (GetDefaultBranchResponse, Background),
     (GitClone, Background),
-    (GitCloneResponse, Background)
+    (GitCloneResponse, Background),
+    (ToggleLspLogs, Background),
 );
 
 request_messages!(
@@ -481,7 +482,8 @@ request_messages!(
     (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse),
     (PullWorkspaceDiagnostics, Ack),
     (GetDefaultBranch, GetDefaultBranchResponse),
-    (GitClone, GitCloneResponse)
+    (GitClone, GitCloneResponse),
+    (ToggleLspLogs, Ack),
 );
 
 lsp_messages!(
@@ -612,6 +614,7 @@ entity_messages!(
     GitReset,
     GitCheckoutFiles,
     SetIndexText,
+    ToggleLspLogs,
 
     Push,
     Fetch,
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index 5dbb9a2771..249968b246 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -43,6 +43,7 @@ gpui_tokio.workspace = true
 http_client.workspace = true
 language.workspace = true
 language_extension.workspace = true
+language_tools.workspace = true
 languages.workspace = true
 log.workspace = true
 lsp.workspace = true
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 04028ebcac..1e197fdd33 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -1,5 +1,7 @@
 use ::proto::{FromProto, ToProto};
 use anyhow::{Context as _, Result, anyhow};
+use language_tools::lsp_log::{GlobalLogStore, LanguageServerKind};
+use lsp::LanguageServerId;
 
 use extension::ExtensionHostProxy;
 use extension_host::headless_host::HeadlessExtensionStore;
@@ -65,6 +67,7 @@ impl HeadlessProject {
         settings::init(cx);
         language::init(cx);
         project::Project::init_settings(cx);
+        language_tools::lsp_log::init(false, cx);
     }
 
     pub fn new(
@@ -235,6 +238,7 @@ impl HeadlessProject {
         session.add_entity_request_handler(Self::handle_open_new_buffer);
         session.add_entity_request_handler(Self::handle_find_search_candidates);
         session.add_entity_request_handler(Self::handle_open_server_settings);
+        session.add_entity_message_handler(Self::handle_toggle_lsp_logs);
 
         session.add_entity_request_handler(BufferStore::handle_update_buffer);
         session.add_entity_message_handler(BufferStore::handle_close_buffer);
@@ -298,11 +302,40 @@ impl HeadlessProject {
 
     fn on_lsp_store_event(
         &mut self,
-        _lsp_store: Entity<LspStore>,
+        lsp_store: Entity<LspStore>,
         event: &LspStoreEvent,
         cx: &mut Context<Self>,
     ) {
         match event {
+            LspStoreEvent::LanguageServerAdded(id, name, worktree_id) => {
+                let log_store = cx
+                    .try_global::<GlobalLogStore>()
+                    .and_then(|lsp_logs| lsp_logs.0.upgrade());
+                if let Some(log_store) = log_store {
+                    log_store.update(cx, |log_store, cx| {
+                        log_store.add_language_server(
+                            LanguageServerKind::LocalSsh {
+                                lsp_store: self.lsp_store.downgrade(),
+                            },
+                            *id,
+                            Some(name.clone()),
+                            *worktree_id,
+                            lsp_store.read(cx).language_server_for_id(*id),
+                            cx,
+                        );
+                    });
+                }
+            }
+            LspStoreEvent::LanguageServerRemoved(id) => {
+                let log_store = cx
+                    .try_global::<GlobalLogStore>()
+                    .and_then(|lsp_logs| lsp_logs.0.upgrade());
+                if let Some(log_store) = log_store {
+                    log_store.update(cx, |log_store, cx| {
+                        log_store.remove_language_server(*id, cx);
+                    });
+                }
+            }
             LspStoreEvent::LanguageServerUpdate {
                 language_server_id,
                 name,
@@ -326,16 +359,6 @@ impl HeadlessProject {
                     })
                     .log_err();
             }
-            LspStoreEvent::LanguageServerLog(language_server_id, log_type, message) => {
-                self.session
-                    .send(proto::LanguageServerLog {
-                        project_id: REMOTE_SERVER_PROJECT_ID,
-                        language_server_id: language_server_id.to_proto(),
-                        message: message.clone(),
-                        log_type: Some(log_type.to_proto()),
-                    })
-                    .log_err();
-            }
             LspStoreEvent::LanguageServerPrompt(prompt) => {
                 let request = self.session.request(proto::LanguageServerPromptRequest {
                     project_id: REMOTE_SERVER_PROJECT_ID,
@@ -509,7 +532,31 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_open_server_settings(
+    async fn handle_toggle_lsp_logs(
+        _: Entity<Self>,
+        envelope: TypedEnvelope<proto::ToggleLspLogs>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        let server_id = LanguageServerId::from_proto(envelope.payload.server_id);
+        let lsp_logs = cx
+            .update(|cx| {
+                cx.try_global::<GlobalLogStore>()
+                    .and_then(|lsp_logs| lsp_logs.0.upgrade())
+            })?
+            .context("lsp logs store is missing")?;
+
+        lsp_logs.update(&mut cx, |lsp_logs, _| {
+            // we do not support any other log toggling yet
+            if envelope.payload.enabled {
+                lsp_logs.enable_rpc_trace_for_language_server(server_id);
+            } else {
+                lsp_logs.disable_rpc_trace_for_language_server(server_id);
+            }
+        })?;
+        Ok(())
+    }
+
+    async fn handle_open_server_settings(
         this: Entity<Self>,
         _: TypedEnvelope<proto::OpenServerSettings>,
         mut cx: AsyncApp,
@@ -562,7 +609,7 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_find_search_candidates(
+    async fn handle_find_search_candidates(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::FindSearchCandidates>,
         mut cx: AsyncApp,
@@ -594,7 +641,7 @@ impl HeadlessProject {
         Ok(response)
     }
 
-    pub async fn handle_list_remote_directory(
+    async fn handle_list_remote_directory(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::ListRemoteDirectory>,
         cx: AsyncApp,
@@ -626,7 +673,7 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_get_path_metadata(
+    async fn handle_get_path_metadata(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::GetPathMetadata>,
         cx: AsyncApp,
@@ -644,7 +691,7 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_shutdown_remote_server(
+    async fn handle_shutdown_remote_server(
         _this: Entity<Self>,
         _envelope: TypedEnvelope<proto::ShutdownRemoteServer>,
         cx: AsyncApp,
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 1966755d62..a071733315 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -30,7 +30,7 @@ pub struct ActiveSettingsProfileName(pub String);
 
 impl Global for ActiveSettingsProfileName {}
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord, serde::Serialize)]
 pub struct WorktreeId(usize);
 
 impl From<WorktreeId> for usize {
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index 869aa5322e..ce9be0c7ed 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/workspace.rs"
 doctest = false
 
 [features]
+default = ["call"]
 test-support = [
     "call/test-support",
     "client/test-support",
@@ -29,7 +30,7 @@ test-support = [
 any_vec.workspace = true
 anyhow.workspace = true
 async-recursion.workspace = true
-call.workspace = true
+call = { workspace = true, optional = true }
 client.workspace = true
 clock.workspace = true
 collections.workspace = true
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 9c2d09fd26..5c08148031 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -4,11 +4,14 @@ use crate::{
     workspace_settings::{PaneSplitDirectionHorizontal, PaneSplitDirectionVertical},
 };
 use anyhow::Result;
+
+#[cfg(feature = "call")]
 use call::{ActiveCall, ParticipantLocation};
+
 use collections::HashMap;
 use gpui::{
-    Along, AnyView, AnyWeakView, Axis, Bounds, Entity, Hsla, IntoElement, MouseButton, Pixels,
-    Point, StyleRefinement, WeakEntity, Window, point, size,
+    Along, AnyView, AnyWeakView, Axis, Bounds, Entity, Hsla, IntoElement, Pixels, Point,
+    StyleRefinement, WeakEntity, Window, point, size,
 };
 use parking_lot::Mutex;
 use project::Project;
@@ -197,6 +200,7 @@ pub enum Member {
 pub struct PaneRenderContext<'a> {
     pub project: &'a Entity<Project>,
     pub follower_states: &'a HashMap<CollaboratorId, FollowerState>,
+    #[cfg(feature = "call")]
     pub active_call: Option<&'a Entity<ActiveCall>>,
     pub active_pane: &'a Entity<Pane>,
     pub app_state: &'a Arc<AppState>,
@@ -258,6 +262,11 @@ impl PaneLeaderDecorator for PaneRenderContext<'_> {
         let mut leader_color;
         let status_box;
         match leader_id {
+            #[cfg(not(feature = "call"))]
+            CollaboratorId::PeerId(_) => {
+                return LeaderDecoration::default();
+            }
+            #[cfg(feature = "call")]
             CollaboratorId::PeerId(peer_id) => {
                 let Some(leader) = self.active_call.as_ref().and_then(|call| {
                     let room = call.read(cx).room()?.read(cx);
@@ -315,7 +324,7 @@ impl PaneLeaderDecorator for PaneRenderContext<'_> {
                             |this, (leader_project_id, leader_user_id)| {
                                 let app_state = self.app_state.clone();
                                 this.cursor_pointer().on_mouse_down(
-                                    MouseButton::Left,
+                                    gpui::MouseButton::Left,
                                     move |_, _, cx| {
                                         crate::join_in_room_project(
                                             leader_project_id,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 25e2cb1cfe..b6577ff325 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -9,6 +9,7 @@ pub mod pane_group;
 mod path_list;
 mod persistence;
 pub mod searchable;
+#[cfg(feature = "call")]
 pub mod shared_screen;
 mod status_bar;
 pub mod tasks;
@@ -22,11 +23,17 @@ pub use dock::Panel;
 pub use path_list::PathList;
 pub use toast_layer::{ToastAction, ToastLayer, ToastView};
 
-use anyhow::{Context as _, Result, anyhow};
+#[cfg(feature = "call")]
 use call::{ActiveCall, call_settings::CallSettings};
+#[cfg(feature = "call")]
+use client::{Status, proto::ErrorCode};
+#[cfg(feature = "call")]
+use shared_screen::SharedScreen;
+
+use anyhow::{Context as _, Result, anyhow};
 use client::{
-    ChannelId, Client, ErrorExt, Status, TypedEnvelope, UserStore,
-    proto::{self, ErrorCode, PanelId, PeerId},
+    ChannelId, Client, ErrorExt, TypedEnvelope, UserStore,
+    proto::{self, PanelId, PeerId},
 };
 use collections::{HashMap, HashSet, hash_map};
 use dock::{Dock, DockPosition, PanelButtons, PanelHandle, RESIZE_HANDLE_SIZE};
@@ -79,7 +86,6 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
 use settings::{Settings, update_settings_file};
-use shared_screen::SharedScreen;
 use sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
     statement::Statement,
@@ -886,6 +892,7 @@ impl Global for GlobalAppState {}
 
 pub struct WorkspaceStore {
     workspaces: HashSet<WindowHandle<Workspace>>,
+    #[cfg(feature = "call")]
     client: Arc<Client>,
     _subscriptions: Vec<client::Subscription>,
 }
@@ -1117,6 +1124,7 @@ pub struct Workspace {
     window_edited: bool,
     last_window_title: Option<String>,
     dirty_items: HashMap<EntityId, Subscription>,
+    #[cfg(feature = "call")]
     active_call: Option<(Entity<ActiveCall>, Vec<Subscription>)>,
     leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>,
     database_id: Option<WorkspaceId>,
@@ -1158,6 +1166,7 @@ pub struct FollowerState {
 
 struct FollowerView {
     view: Box<dyn FollowableItemHandle>,
+    #[cfg(feature = "call")]
     location: Option<proto::PanelId>,
 }
 
@@ -1357,10 +1366,15 @@ impl Workspace {
 
         let session_id = app_state.session.read(cx).id().to_owned();
 
+        #[cfg(feature = "call")]
         let mut active_call = None;
-        if let Some(call) = ActiveCall::try_global(cx) {
-            let subscriptions = vec![cx.subscribe_in(&call, window, Self::on_active_call_event)];
-            active_call = Some((call, subscriptions));
+        #[cfg(feature = "call")]
+        {
+            if let Some(call) = ActiveCall::try_global(cx) {
+                let subscriptions =
+                    vec![cx.subscribe_in(&call, window, Self::on_active_call_event)];
+                active_call = Some((call, subscriptions));
+            }
         }
 
         let (serializable_items_tx, serializable_items_rx) =
@@ -1446,6 +1460,7 @@ impl Workspace {
             window_edited: false,
             last_window_title: None,
             dirty_items: Default::default(),
+            #[cfg(feature = "call")]
             active_call,
             database_id: workspace_id,
             app_state,
@@ -2250,6 +2265,7 @@ impl Workspace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<bool>> {
+        #[cfg(feature = "call")]
         let active_call = self.active_call().cloned();
 
         // On Linux and Windows, closing the last window should restore the last workspace.
@@ -2258,51 +2274,58 @@ impl Workspace {
             && cx.windows().len() == 1;
 
         cx.spawn_in(window, async move |this, cx| {
-            let workspace_count = cx.update(|_window, cx| {
-                cx.windows()
-                    .iter()
-                    .filter(|window| window.downcast::<Workspace>().is_some())
-                    .count()
-            })?;
-
-            if let Some(active_call) = active_call
-                && workspace_count == 1
-                && active_call.read_with(cx, |call, _| call.room().is_some())?
+            #[cfg(feature = "call")]
             {
-                if close_intent == CloseIntent::CloseWindow {
-                    let answer = cx.update(|window, cx| {
-                        window.prompt(
-                            PromptLevel::Warning,
-                            "Do you want to leave the current call?",
-                            None,
-                            &["Close window and hang up", "Cancel"],
-                            cx,
-                        )
-                    })?;
+                let workspace_count = cx.update(|_window, cx| {
+                    cx.windows()
+                        .iter()
+                        .filter(|window| window.downcast::<Workspace>().is_some())
+                        .count()
+                })?;
+                if let Some(active_call) = active_call
+                    && workspace_count == 1
+                    && active_call.read_with(cx, |call, _| call.room().is_some())?
+                {
+                    if close_intent == CloseIntent::CloseWindow {
+                        let answer = cx.update(|window, cx| {
+                            window.prompt(
+                                PromptLevel::Warning,
+                                "Do you want to leave the current call?",
+                                None,
+                                &["Close window and hang up", "Cancel"],
+                                cx,
+                            )
+                        })?;
 
-                    if answer.await.log_err() == Some(1) {
-                        return anyhow::Ok(false);
-                    } else {
-                        active_call
-                            .update(cx, |call, cx| call.hang_up(cx))?
-                            .await
-                            .log_err();
-                    }
-                }
-                if close_intent == CloseIntent::ReplaceWindow {
-                    _ = active_call.update(cx, |this, cx| {
-                        let workspace = cx
-                            .windows()
-                            .iter()
-                            .filter_map(|window| window.downcast::<Workspace>())
-                            .next()
-                            .unwrap();
-                        let project = workspace.read(cx)?.project.clone();
-                        if project.read(cx).is_shared() {
-                            this.unshare_project(project, cx)?;
+                        if answer.await.log_err() == Some(1) {
+                            return anyhow::Ok(false);
+                        } else {
+                            {
+                                active_call
+                                    .update(cx, |call, cx| call.hang_up(cx))?
+                                    .await
+                                    .log_err();
+                            }
                         }
-                        Ok::<_, anyhow::Error>(())
-                    })?;
+                    }
+                    if close_intent == CloseIntent::ReplaceWindow {
+                        #[cfg(feature = "call")]
+                        {
+                            _ = active_call.update(cx, |active_call, cx| {
+                                let workspace = cx
+                                    .windows()
+                                    .iter()
+                                    .filter_map(|window| window.downcast::<Workspace>())
+                                    .next()
+                                    .unwrap();
+                                let project = workspace.read(cx)?.project.clone();
+                                if project.read(cx).is_shared() {
+                                    active_call.unshare_project(project, cx)?;
+                                }
+                                anyhow::Ok(())
+                            })?;
+                        }
+                    }
                 }
             }
 
@@ -3486,6 +3509,7 @@ impl Workspace {
         item
     }
 
+    #[cfg(feature = "call")]
     pub fn open_shared_screen(
         &mut self,
         peer_id: PeerId,
@@ -3907,8 +3931,11 @@ impl Workspace {
                 pane.update(cx, |pane, _| {
                     pane.track_alternate_file_items();
                 });
-                if *local {
-                    self.unfollow_in_pane(pane, window, cx);
+                #[cfg(feature = "call")]
+                {
+                    if *local {
+                        self.unfollow_in_pane(pane, window, cx);
+                    }
                 }
                 serialize_workspace = *focus_changed || pane != self.active_pane();
                 if pane == self.active_pane() {
@@ -3973,6 +4000,17 @@ impl Workspace {
         }
     }
 
+    #[cfg(not(feature = "call"))]
+    pub fn unfollow_in_pane(
+        &mut self,
+        _pane: &Entity<Pane>,
+        _window: &mut Window,
+        _cx: &mut Context<Workspace>,
+    ) -> Option<CollaboratorId> {
+        None
+    }
+
+    #[cfg(feature = "call")]
     pub fn unfollow_in_pane(
         &mut self,
         pane: &Entity<Pane>,
@@ -4122,6 +4160,7 @@ impl Workspace {
         cx.notify();
     }
 
+    #[cfg(feature = "call")]
     pub fn start_following(
         &mut self,
         leader_id: impl Into<CollaboratorId>,
@@ -4185,6 +4224,16 @@ impl Workspace {
         }
     }
 
+    #[cfg(not(feature = "call"))]
+    pub fn follow_next_collaborator(
+        &mut self,
+        _: &FollowNextCollaborator,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) {
+    }
+
+    #[cfg(feature = "call")]
     pub fn follow_next_collaborator(
         &mut self,
         _: &FollowNextCollaborator,
@@ -4233,6 +4282,16 @@ impl Workspace {
         }
     }
 
+    #[cfg(not(feature = "call"))]
+    pub fn follow(
+        &mut self,
+        _leader_id: impl Into<CollaboratorId>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) {
+    }
+
+    #[cfg(feature = "call")]
     pub fn follow(
         &mut self,
         leader_id: impl Into<CollaboratorId>,
@@ -4285,6 +4344,17 @@ impl Workspace {
         }
     }
 
+    #[cfg(not(feature = "call"))]
+    pub fn unfollow(
+        &mut self,
+        _leader_id: impl Into<CollaboratorId>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<()> {
+        None
+    }
+
+    #[cfg(feature = "call")]
     pub fn unfollow(
         &mut self,
         leader_id: impl Into<CollaboratorId>,
@@ -4595,6 +4665,7 @@ impl Workspace {
             anyhow::bail!("no id for view");
         };
         let id = ViewId::from_proto(id)?;
+        #[cfg(feature = "call")]
         let panel_id = view.panel_id.and_then(proto::PanelId::from_i32);
 
         let pane = this.update(cx, |this, _cx| {
@@ -4667,6 +4738,7 @@ impl Workspace {
                 id,
                 FollowerView {
                     view: item,
+                    #[cfg(feature = "call")]
                     location: panel_id,
                 },
             );
@@ -4721,6 +4793,7 @@ impl Workspace {
                     view.map(|view| {
                         entry.insert(FollowerView {
                             view,
+                            #[cfg(feature = "call")]
                             location: None,
                         })
                     })
@@ -4911,6 +4984,17 @@ impl Workspace {
         )
     }
 
+    #[cfg(not(feature = "call"))]
+    fn active_item_for_peer(
+        &self,
+        _peer_id: PeerId,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<(Option<PanelId>, Box<dyn ItemHandle>)> {
+        None
+    }
+
+    #[cfg(feature = "call")]
     fn active_item_for_peer(
         &self,
         peer_id: PeerId,
@@ -4952,6 +5036,7 @@ impl Workspace {
         item_to_activate
     }
 
+    #[cfg(feature = "call")]
     fn shared_screen_for_peer(
         &self,
         peer_id: PeerId,
@@ -5002,10 +5087,12 @@ impl Workspace {
         }
     }
 
+    #[cfg(feature = "call")]
     pub fn active_call(&self) -> Option<&Entity<ActiveCall>> {
         self.active_call.as_ref().map(|(call, _)| call)
     }
 
+    #[cfg(feature = "call")]
     fn on_active_call_event(
         &mut self,
         _: &Entity<ActiveCall>,
@@ -5918,6 +6005,17 @@ impl Workspace {
     }
 }
 
+#[cfg(not(feature = "call"))]
+fn leader_border_for_pane(
+    _follower_states: &HashMap<CollaboratorId, FollowerState>,
+    _pane: &Entity<Pane>,
+    _: &Window,
+    _cx: &App,
+) -> Option<Div> {
+    None
+}
+
+#[cfg(feature = "call")]
 fn leader_border_for_pane(
     follower_states: &HashMap<CollaboratorId, FollowerState>,
     pane: &Entity<Pane>,
@@ -6384,6 +6482,7 @@ impl Render for Workspace {
                                                                         &PaneRenderContext {
                                                                             follower_states:
                                                                                 &self.follower_states,
+                                                                            #[cfg(feature = "call")]
                                                                             active_call: self.active_call(),
                                                                             active_pane: &self.active_pane,
                                                                             app_state: &self.app_state,
@@ -6448,6 +6547,7 @@ impl Render for Workspace {
                                                                                 &PaneRenderContext {
                                                                                     follower_states:
                                                                                         &self.follower_states,
+                                                                                    #[cfg(feature = "call")]
                                                                                     active_call: self.active_call(),
                                                                                     active_pane: &self.active_pane,
                                                                                     app_state: &self.app_state,
@@ -6510,6 +6610,7 @@ impl Render for Workspace {
                                                                                 &PaneRenderContext {
                                                                                     follower_states:
                                                                                         &self.follower_states,
+                                                                                    #[cfg(feature = "call")]
                                                                                     active_call: self.active_call(),
                                                                                     active_pane: &self.active_pane,
                                                                                     app_state: &self.app_state,
@@ -6558,6 +6659,7 @@ impl Render for Workspace {
                                                                 &PaneRenderContext {
                                                                     follower_states:
                                                                         &self.follower_states,
+                                                                    #[cfg(feature = "call")]
                                                                     active_call: self.active_call(),
                                                                     active_pane: &self.active_pane,
                                                                     app_state: &self.app_state,
@@ -6631,10 +6733,22 @@ impl WorkspaceStore {
                 client.add_request_handler(cx.weak_entity(), Self::handle_follow),
                 client.add_message_handler(cx.weak_entity(), Self::handle_update_followers),
             ],
+            #[cfg(feature = "call")]
             client,
         }
     }
 
+    #[cfg(not(feature = "call"))]
+    pub fn update_followers(
+        &self,
+        _project_id: Option<u64>,
+        _update: proto::update_followers::Variant,
+        _cx: &App,
+    ) -> Option<()> {
+        None
+    }
+
+    #[cfg(feature = "call")]
     pub fn update_followers(
         &self,
         project_id: Option<u64>,
@@ -6800,6 +6914,7 @@ actions!(
     ]
 );
 
+#[cfg(feature = "call")]
 async fn join_channel_internal(
     channel_id: ChannelId,
     app_state: &Arc<AppState>,
@@ -6947,6 +7062,17 @@ async fn join_channel_internal(
     anyhow::Ok(false)
 }
 
+#[cfg(not(feature = "call"))]
+pub fn join_channel(
+    _channel_id: ChannelId,
+    _app_state: Arc<AppState>,
+    _requesting_window: Option<WindowHandle<Workspace>>,
+    _cx: &mut App,
+) -> Task<Result<()>> {
+    Task::ready(Ok(()))
+}
+
+#[cfg(feature = "call")]
 pub fn join_channel(
     channel_id: ChannelId,
     app_state: Arc<AppState>,
@@ -7454,6 +7580,17 @@ fn serialize_ssh_project(
     })
 }
 
+#[cfg(not(feature = "call"))]
+pub fn join_in_room_project(
+    _project_id: u64,
+    _follow_user_id: u64,
+    _app_state: Arc<AppState>,
+    _cx: &mut App,
+) -> Task<Result<()>> {
+    Task::ready(Ok(()))
+}
+
+#[cfg(feature = "call")]
 pub fn join_in_room_project(
     project_id: u64,
     follow_user_id: u64,

From d43cf2c4866be7226bc0d5120e5c830e3f18b7f9 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 27 Aug 2025 15:10:10 -0400
Subject: [PATCH 412/823] Link out to release channel FAQ in Docs (#37029)

This PR links users to the FAQ on the release channels, which has more
in-depth coverage of the process.

Release Notes:

- N/A
---
 docs/src/development/releases.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/docs/src/development/releases.md b/docs/src/development/releases.md
index 5b821f3cf2..52c66c3420 100644
--- a/docs/src/development/releases.md
+++ b/docs/src/development/releases.md
@@ -1,13 +1,6 @@
 # Zed Releases
 
-Zed currently maintains two public releases for macOS:
-
-- [Stable](https://zed.dev/download): This is the primary version that people download and use.
-- [Preview](https://zed.dev/releases/preview): which receives updates a week ahead of Stable for early adopters.
-
-Typically we cut a new minor release every Wednesday. The current Preview becomes Stable, and the new Preview contains everything on main up until that point.
-
-If bugs are found and fixed during the week, they may be cherry-picked into the release branches and so new patch versions for preview and stable can become available throughout the week.
+Read about Zed's release channels [here](https://zed.dev/faq#what-are-the-release-channels).
 
 ## Wednesday release process
 

From 58f896e5cd7309d4526c136314e6ddb934ed1c3d Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 27 Aug 2025 15:59:08 -0400
Subject: [PATCH 413/823] Update Wednesday release process docs (#37033)

Release Notes:

- N/A
---
 docs/src/development/releases.md | 62 +++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/docs/src/development/releases.md b/docs/src/development/releases.md
index 52c66c3420..80458b0cdf 100644
--- a/docs/src/development/releases.md
+++ b/docs/src/development/releases.md
@@ -4,20 +4,56 @@ Read about Zed's release channels [here](https://zed.dev/faq#what-are-the-releas
 
 ## Wednesday release process
 
-You will need write access to the Zed repository to do this:
+You will need write access to the Zed repository to do this.
 
-- Checkout `main` and ensure your working copy is clean.
-- Run `./script/bump-zed-minor-versions` and push the tags
-  and branches as instructed.
-- Wait for the builds to appear on [the Releases tab on GitHub](https://github.com/zed-industries/zed/releases) (typically takes around 30 minutes)
-- While you're waiting:
-  - Start creating the new release notes for preview. You can start with the output of `./script/get-preview-channel-changes`.
-  - Start drafting the release tweets.
-- Once the builds are ready:
-  - Copy the release notes from the previous Preview release(s) to the current Stable release.
-  - Download the artifacts for each release and test that you can run them locally.
-  - Publish the releases on GitHub.
-  - Tweet the tweets (Credentials are in 1Password).
+Credentials for various services used in this process can be found in 1Password.
+
+---
+
+1. Checkout `main` and ensure your working copy is clean.
+
+1. Run `git fetch && git pull` to ensure you have the latest commits locally.
+
+1. Run `git fetch --tags --force` to forcibly ensure your local tags are in sync with the remote.
+
+1. Run `./script/get-stable-channel-release-notes`.
+
+   - Follow the instructions at the end of the script and aggregate the release notes into one structure.
+
+1. Run `./script/bump-zed-minor-versions`.
+
+   - Push the tags and branches as instructed.
+
+1. Run `./script/get-preview-channel-changes`.
+
+   - Take the script's output and build release notes by organizing each release note line into a category.
+   - Use a prior release for the initial outline.
+   - Make sure to append the `Credit` line, if present, to the end of the release note line.
+
+1. Once release drafts are up on [GitHub Releases](https://github.com/zed-industries/zed/releases), paste both preview and stable release notes into each and **save**.
+
+   - **Do not publish the drafts, yet.**
+
+1. Check the release assets.
+
+   - Ensure the stable and preview release jobs have finished without error.
+   - Ensure each build has the proper number of assets—releases currently have 10 assets each.
+   - Download the artifacts for each release and test that you can run them locally.
+
+1. Publish each build, one at a time.
+
+   - Use [Vercel](https://vercel.com/zed-industries/zed-dev) to check the status of each build.
+
+1. Publish the release email that has been sent to [Kit](https://kit.com).
+
+   - Make sure to double check that the email is correct before publishing.
+   - We sometimes correct things here and there that didn't translate from GitHub's renderer to Kit's.
+
+1. Build social media posts based on the popular items in stable.
+
+   - You can use the [prior week's post chain](https://zed.dev/channel/tweets-23331) as your outline.
+   - Stage the copy and assets using [Buffer](https://buffer.com), for both X and BlueSky.
+   - Publish both, one at a time, ensuring both are posted to each respective platform.
 
 ## Patch release process
 

From 5444fbd8fed6865e25546dcbf83dcf2d7b24af48 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:59:56 +0200
Subject: [PATCH 414/823] python: Look for local venvs in all directories
 between root of the worktree and current pyproject.toml (#37037)

cc @michael-ud - if you can build Zed, I'd appreciate it if you could
give this a go with your project. Otherwise I can provide a link to
download of current nightly via an e-mail for you to try out (if you
want).
This change will land in Preview (if merged) on next Wednesday and then
it'll be in Stable a week after that.
Related to: #20402
Release Notes:

- python: Zed now searches for virtual environments in intermediate
directories between a root of the worktree and the location of
pyproject.toml applicable to the currently focused file.
---
 crates/language/src/toolchain.rs      |  2 +-
 crates/languages/src/python.rs        | 18 ++++++++++--------
 crates/project/src/project_tests.rs   |  7 ++++---
 crates/project/src/toolchain_store.rs |  7 +------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
index 73c142c8ca..66879e56da 100644
--- a/crates/language/src/toolchain.rs
+++ b/crates/language/src/toolchain.rs
@@ -52,7 +52,7 @@ pub trait ToolchainLister: Send + Sync {
     async fn list(
         &self,
         worktree_root: PathBuf,
-        subroot_relative_path: Option<Arc<Path>>,
+        subroot_relative_path: Arc<Path>,
         project_env: Option<HashMap<String, String>>,
     ) -> ToolchainList;
     // Returns a term which we should use in UI to refer to a toolchain.
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index d21b5dabd3..0f78d5c5df 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -759,7 +759,7 @@ impl ToolchainLister for PythonToolchainProvider {
     async fn list(
         &self,
         worktree_root: PathBuf,
-        subroot_relative_path: Option<Arc<Path>>,
+        subroot_relative_path: Arc<Path>,
         project_env: Option<HashMap<String, String>>,
     ) -> ToolchainList {
         let env = project_env.unwrap_or_default();
@@ -771,13 +771,15 @@ impl ToolchainLister for PythonToolchainProvider {
         );
         let mut config = Configuration::default();
 
-        let mut directories = vec![worktree_root.clone()];
-        if let Some(subroot_relative_path) = subroot_relative_path {
-            debug_assert!(subroot_relative_path.is_relative());
-            directories.push(worktree_root.join(subroot_relative_path));
-        }
-
-        config.workspace_directories = Some(directories);
+        debug_assert!(subroot_relative_path.is_relative());
+        // `.ancestors()` will yield at least one path, so in case of empty `subroot_relative_path`, we'll just use
+        // worktree root as the workspace directory.
+        config.workspace_directories = Some(
+            subroot_relative_path
+                .ancestors()
+                .map(|ancestor| worktree_root.join(ancestor))
+                .collect(),
+        );
         for locator in locators.iter() {
             locator.configure(&config);
         }
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index ed15ba845a..a8f911883d 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -9189,13 +9189,14 @@ fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
         async fn list(
             &self,
             worktree_root: PathBuf,
-            subroot_relative_path: Option<Arc<Path>>,
+            subroot_relative_path: Arc<Path>,
             _: Option<HashMap<String, String>>,
         ) -> ToolchainList {
             // This lister will always return a path .venv directories within ancestors
             let ancestors = subroot_relative_path
-                .into_iter()
-                .flat_map(|path| path.ancestors().map(ToOwned::to_owned).collect::<Vec<_>>());
+                .ancestors()
+                .map(ToOwned::to_owned)
+                .collect::<Vec<_>>();
             let mut toolchains = vec![];
             for ancestor in ancestors {
                 let venv_path = worktree_root.join(ancestor).join(".venv");
diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
index ac87e64248..57d492e26f 100644
--- a/crates/project/src/toolchain_store.rs
+++ b/crates/project/src/toolchain_store.rs
@@ -389,12 +389,7 @@ impl LocalToolchainStore {
             cx.background_spawn(async move {
                 Some((
                     toolchains
-                        .list(
-                            worktree_root,
-                            Some(relative_path.path.clone())
-                                .filter(|_| *relative_path.path != *Path::new("")),
-                            project_env,
-                        )
+                        .list(worktree_root, relative_path.path.clone(), project_env)
                         .await,
                     relative_path.path,
                 ))

From 4e4bfd6f4ea40e88aedf819f41dcba3d20835dc9 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Wed, 27 Aug 2025 17:07:32 -0400
Subject: [PATCH 415/823] editor: Add "Wrap Selections in Tag" action (#36948)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR adds the ability for a user to select one or more blocks of text
and wrap each selection in an HTML tag — which works by placing multiple
cursors inside the open and close tags so the appropriate element name
can be typed in to all places simultaneously.

This is similar to the emmet "Wrap with Abbreviation" functionality
discussed in #15588 but is a simpler version that does not rely on
Emmet's language server.

Here's a preview of the feature in action:


https://github.com/user-attachments/assets/1931e717-136c-4766-a585-e4ba939d9adf


Some notes and questions:
- The current implementation is a hardcoded with regards to supported
languages. I'd love some direction on how much of this information to
push into the relevant language structs.
- I can see this feature as something that languages added by an
extension would want to enable support for — is this something you'd
want?
- The syntax is hardcoded to support HTML/XML/JSX-like languages. I
don't suppose this is a problem but figured I'd point it out anyway.
- I called it "Wrap in tag" but open to whatever naming you feel is
appropriate.
- The implementation doesn't use `manipulate_lines` — I wasn't sure how
make use of that without extra overhead / bookkeeping — does this seem
fine?
- I could also investigate adding wrap in abbreviation support by
communicating with the Emmet language server but I think I'll need some
direction on how to handle Emmet's custom LSP message. I could do this
either in addition to or instead of this feature — though imo this
feature is a nice "shortcut" regardless.

Release Notes:

- Added a new "Wrap Selections in Tag" action that lets you wrap one or
more selections in tags based on language. Works in HTML, JSX, and
similar languages, and places cursors inside both opening and closing
tags so you can type the tag name once and apply it everywhere.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/editor/src/actions.rs                |   4 +-
 crates/editor/src/editor.rs                 |  80 +++++++++++++
 crates/editor/src/editor_tests.rs           | 123 ++++++++++++++++++++
 crates/editor/src/element.rs                |   3 +
 crates/language/src/language.rs             |  16 +++
 crates/languages/src/javascript/config.toml |   1 +
 crates/languages/src/tsx/config.toml        |   1 +
 crates/languages/src/typescript/config.toml |   1 +
 extensions/html/languages/html/config.toml  |   1 +
 9 files changed, 229 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index ce02c4d2bf..3cc6c28464 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -753,6 +753,8 @@ actions!(
         UniqueLinesCaseInsensitive,
         /// Removes duplicate lines (case-sensitive).
         UniqueLinesCaseSensitive,
-        UnwrapSyntaxNode
+        UnwrapSyntaxNode,
+        /// Wraps selections in tag specified by language.
+        WrapSelectionsInTag
     ]
 );
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 52549902dd..2d96ddf7a4 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -10447,6 +10447,86 @@ impl Editor {
         })
     }
 
+    fn enable_wrap_selections_in_tag(&self, cx: &App) -> bool {
+        let snapshot = self.buffer.read(cx).snapshot(cx);
+        for selection in self.selections.disjoint_anchors().iter() {
+            if snapshot
+                .language_at(selection.start)
+                .and_then(|lang| lang.config().wrap_characters.as_ref())
+                .is_some()
+            {
+                return true;
+            }
+        }
+        false
+    }
+
+    fn wrap_selections_in_tag(
+        &mut self,
+        _: &WrapSelectionsInTag,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
+
+        let snapshot = self.buffer.read(cx).snapshot(cx);
+
+        let mut edits = Vec::new();
+        let mut boundaries = Vec::new();
+
+        for selection in self.selections.all::<Point>(cx).iter() {
+            let Some(wrap_config) = snapshot
+                .language_at(selection.start)
+                .and_then(|lang| lang.config().wrap_characters.clone())
+            else {
+                continue;
+            };
+
+            let open_tag = format!("{}{}", wrap_config.start_prefix, wrap_config.start_suffix);
+            let close_tag = format!("{}{}", wrap_config.end_prefix, wrap_config.end_suffix);
+
+            let start_before = snapshot.anchor_before(selection.start);
+            let end_after = snapshot.anchor_after(selection.end);
+
+            edits.push((start_before..start_before, open_tag));
+            edits.push((end_after..end_after, close_tag));
+
+            boundaries.push((
+                start_before,
+                end_after,
+                wrap_config.start_prefix.len(),
+                wrap_config.end_suffix.len(),
+            ));
+        }
+
+        if edits.is_empty() {
+            return;
+        }
+
+        self.transact(window, cx, |this, window, cx| {
+            let buffer = this.buffer.update(cx, |buffer, cx| {
+                buffer.edit(edits, None, cx);
+                buffer.snapshot(cx)
+            });
+
+            let mut new_selections = Vec::with_capacity(boundaries.len() * 2);
+            for (start_before, end_after, start_prefix_len, end_suffix_len) in
+                boundaries.into_iter()
+            {
+                let open_offset = start_before.to_offset(&buffer) + start_prefix_len;
+                let close_offset = end_after.to_offset(&buffer).saturating_sub(end_suffix_len);
+                new_selections.push(open_offset..open_offset);
+                new_selections.push(close_offset..close_offset);
+            }
+
+            this.change_selections(Default::default(), window, cx, |s| {
+                s.select_ranges(new_selections);
+            });
+
+            this.request_autoscroll(Autoscroll::fit(), cx);
+        });
+    }
+
     pub fn reload_file(&mut self, _: &ReloadFile, window: &mut Window, cx: &mut Context<Self>) {
         let Some(project) = self.project.clone() else {
             return;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 2cfdb92593..85471c7ce9 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -4403,6 +4403,129 @@ async fn test_unique_lines_single_selection(cx: &mut TestAppContext) {
     "});
 }
 
+#[gpui::test]
+async fn test_wrap_in_tag_single_selection(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let js_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "JavaScript".into(),
+            wrap_characters: Some(language::WrapCharactersConfig {
+                start_prefix: "<".into(),
+                start_suffix: ">".into(),
+                end_prefix: "</".into(),
+                end_suffix: ">".into(),
+            }),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(js_language), cx));
+
+    cx.set_state(indoc! {"
+        «testˇ»
+    "});
+    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
+    cx.assert_editor_state(indoc! {"
+        <«ˇ»>test</«ˇ»>
+    "});
+
+    cx.set_state(indoc! {"
+        «test
+         testˇ»
+    "});
+    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
+    cx.assert_editor_state(indoc! {"
+        <«ˇ»>test
+         test</«ˇ»>
+    "});
+
+    cx.set_state(indoc! {"
+        teˇst
+    "});
+    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
+    cx.assert_editor_state(indoc! {"
+        te<«ˇ»></«ˇ»>st
+    "});
+}
+
+#[gpui::test]
+async fn test_wrap_in_tag_multi_selection(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let js_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "JavaScript".into(),
+            wrap_characters: Some(language::WrapCharactersConfig {
+                start_prefix: "<".into(),
+                start_suffix: ">".into(),
+                end_prefix: "</".into(),
+                end_suffix: ">".into(),
+            }),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(js_language), cx));
+
+    cx.set_state(indoc! {"
+        «testˇ»
+        «testˇ» «testˇ»
+        «testˇ»
+    "});
+    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
+    cx.assert_editor_state(indoc! {"
+        <«ˇ»>test</«ˇ»>
+        <«ˇ»>test</«ˇ»> <«ˇ»>test</«ˇ»>
+        <«ˇ»>test</«ˇ»>
+    "});
+
+    cx.set_state(indoc! {"
+        «test
+         testˇ»
+        «test
+         testˇ»
+    "});
+    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
+    cx.assert_editor_state(indoc! {"
+        <«ˇ»>test
+         test</«ˇ»>
+        <«ˇ»>test
+         test</«ˇ»>
+    "});
+}
+
+#[gpui::test]
+async fn test_wrap_in_tag_does_nothing_in_unsupported_languages(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let plaintext_language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "Plain Text".into(),
+            ..LanguageConfig::default()
+        },
+        None,
+    ));
+
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(plaintext_language), cx));
+
+    cx.set_state(indoc! {"
+        «testˇ»
+    "});
+    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
+    cx.assert_editor_state(indoc! {"
+      «testˇ»
+    "});
+}
+
 #[gpui::test]
 async fn test_manipulate_immutable_lines_with_multi_selection(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 91034829f7..a63c18e003 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -585,6 +585,9 @@ impl EditorElement {
         register_action(editor, window, Editor::edit_log_breakpoint);
         register_action(editor, window, Editor::enable_breakpoint);
         register_action(editor, window, Editor::disable_breakpoint);
+        if editor.read(cx).enable_wrap_selections_in_tag(cx) {
+            register_action(editor, window, Editor::wrap_selections_in_tag);
+        }
     }
 
     fn register_key_listeners(&self, window: &mut Window, _: &mut App, layout: &EditorLayout) {
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 7ae77c9141..b349122193 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -720,6 +720,9 @@ pub struct LanguageConfig {
     /// How to soft-wrap long lines of text.
     #[serde(default)]
     pub soft_wrap: Option<SoftWrap>,
+    /// When set, selections can be wrapped using prefix/suffix pairs on both sides.
+    #[serde(default)]
+    pub wrap_characters: Option<WrapCharactersConfig>,
     /// The name of a Prettier parser that will be used for this language when no file path is available.
     /// If there's a parser name in the language settings, that will be used instead.
     #[serde(default)]
@@ -923,6 +926,7 @@ impl Default for LanguageConfig {
             hard_tabs: None,
             tab_size: None,
             soft_wrap: None,
+            wrap_characters: None,
             prettier_parser_name: None,
             hidden: false,
             jsx_tag_auto_close: None,
@@ -932,6 +936,18 @@ impl Default for LanguageConfig {
     }
 }
 
+#[derive(Clone, Debug, Deserialize, JsonSchema)]
+pub struct WrapCharactersConfig {
+    /// Opening token split into a prefix and suffix. The first caret goes
+    /// after the prefix (i.e., between prefix and suffix).
+    pub start_prefix: String,
+    pub start_suffix: String,
+    /// Closing token split into a prefix and suffix. The second caret goes
+    /// after the prefix (i.e., between prefix and suffix).
+    pub end_prefix: String,
+    pub end_suffix: String,
+}
+
 fn auto_indent_using_last_non_empty_line_default() -> bool {
     true
 }
diff --git a/crates/languages/src/javascript/config.toml b/crates/languages/src/javascript/config.toml
index 0df57d985e..128eac0e4d 100644
--- a/crates/languages/src/javascript/config.toml
+++ b/crates/languages/src/javascript/config.toml
@@ -6,6 +6,7 @@ first_line_pattern = '^#!.*\b(?:[/ ]node|deno run.*--ext[= ]js)\b'
 line_comments = ["// "]
 block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
 documentation_comment = { start = "/**", prefix = "* ", end = "*/", tab_size = 1 }
+wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
 autoclose_before = ";:.,=}])>"
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/crates/languages/src/tsx/config.toml b/crates/languages/src/tsx/config.toml
index 5849b9842f..b5ef5bd56d 100644
--- a/crates/languages/src/tsx/config.toml
+++ b/crates/languages/src/tsx/config.toml
@@ -4,6 +4,7 @@ path_suffixes = ["tsx"]
 line_comments = ["// "]
 block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
 documentation_comment = { start = "/**", prefix = "* ", end = "*/", tab_size = 1 }
+wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
 autoclose_before = ";:.,=}])>"
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/crates/languages/src/typescript/config.toml b/crates/languages/src/typescript/config.toml
index d7e3e4bd3d..2344f6209d 100644
--- a/crates/languages/src/typescript/config.toml
+++ b/crates/languages/src/typescript/config.toml
@@ -5,6 +5,7 @@ first_line_pattern = '^#!.*\b(?:deno run|ts-node|bun|tsx|[/ ]node)\b'
 line_comments = ["// "]
 block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
 documentation_comment = { start = "/**", prefix = "* ", end = "*/", tab_size = 1 }
+wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
 autoclose_before = ";:.,=}])>"
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/extensions/html/languages/html/config.toml b/extensions/html/languages/html/config.toml
index f74db2888e..388949d95c 100644
--- a/extensions/html/languages/html/config.toml
+++ b/extensions/html/languages/html/config.toml
@@ -3,6 +3,7 @@ grammar = "html"
 path_suffixes = ["html", "htm", "shtml"]
 autoclose_before = ">})"
 block_comment = { start = "<!--", prefix = "", end = "-->", tab_size = 0 }
+wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
     { start = "[", end = "]", close = true, newline = true },

From 48299b5b2402748a7501047cc11204e452289fcf Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Thu, 28 Aug 2025 00:17:21 +0300
Subject: [PATCH 416/823] search: Preserve `SearchOptions` across dismisses
 (#36954)

Closes #36931 and #21956

Preserves `SearchOptions` across dismisses of the buffer search bar.
This behavior is consistent with VSCode, which seems reasonable. The
`configured_options` field is then no longer being used. The
configuration is still read during initialization of the
`BufferSearchBar`, but not after.

Something to consider is that there are other elements in the search bar
which are not kept across dismisses such as replace status. However
these are visually separated in the UI, leading me to believe this is a
okay change to make.

Release Notes:

- Preserve search options between buffer search dismisses
---
 crates/search/src/buffer_search.rs | 62 ++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index a38dc8c35b..b2096d48ef 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -749,14 +749,16 @@ impl BufferSearchBar {
             return false;
         };
 
-        self.configured_options =
+        let configured_options =
             SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
-        if self.dismissed
-            && (self.configured_options != self.default_options
-                || self.configured_options != self.search_options)
-        {
-            self.search_options = self.configured_options;
-            self.default_options = self.configured_options;
+        let settings_changed = configured_options != self.configured_options;
+
+        if self.dismissed && settings_changed {
+            // Only update configuration options when search bar is dismissed,
+            // so we don't miss updates even after calling show twice
+            self.configured_options = configured_options;
+            self.search_options = configured_options;
+            self.default_options = configured_options;
         }
 
         self.dismissed = false;
@@ -2750,11 +2752,6 @@ mod tests {
                 "Search bar should be present and visible"
             );
             search_bar.deploy(&deploy, window, cx);
-            assert_eq!(
-                search_bar.configured_options,
-                SearchOptions::NONE,
-                "Should have configured search options matching the settings"
-            );
             assert_eq!(
                 search_bar.search_options,
                 SearchOptions::WHOLE_WORD,
@@ -2765,21 +2762,22 @@ mod tests {
             search_bar.deploy(&deploy, window, cx);
             assert_eq!(
                 search_bar.search_options,
-                SearchOptions::NONE,
-                "After hiding and showing the search bar, default options should be used"
+                SearchOptions::WHOLE_WORD,
+                "After hiding and showing the search bar, search options should be preserved"
             );
 
             search_bar.toggle_search_option(SearchOptions::REGEX, window, cx);
             search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
             assert_eq!(
                 search_bar.search_options,
-                SearchOptions::REGEX | SearchOptions::WHOLE_WORD,
+                SearchOptions::REGEX,
                 "Should enable the options toggled"
             );
             assert!(
                 !search_bar.dismissed,
                 "Search bar should be present and visible"
             );
+            search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
         });
 
         update_search_settings(
@@ -2800,11 +2798,6 @@ mod tests {
             );
 
             search_bar.deploy(&deploy, window, cx);
-            assert_eq!(
-                search_bar.configured_options,
-                SearchOptions::CASE_SENSITIVE,
-                "Should have configured search options matching the settings"
-            );
             assert_eq!(
                 search_bar.search_options,
                 SearchOptions::REGEX | SearchOptions::WHOLE_WORD,
@@ -2812,10 +2805,37 @@ mod tests {
             );
             search_bar.dismiss(&Dismiss, window, cx);
             search_bar.deploy(&deploy, window, cx);
+            assert_eq!(
+                search_bar.configured_options,
+                SearchOptions::CASE_SENSITIVE,
+                "After a settings update and toggling the search bar, configured options should be updated"
+            );
             assert_eq!(
                 search_bar.search_options,
                 SearchOptions::CASE_SENSITIVE,
-                "After hiding and showing the search bar, default options should be used"
+                "After a settings update and toggling the search bar, configured options should be used"
+            );
+        });
+
+        update_search_settings(
+            SearchSettings {
+                button: true,
+                whole_word: true,
+                case_sensitive: true,
+                include_ignored: false,
+                regex: false,
+            },
+            cx,
+        );
+
+        search_bar.update_in(cx, |search_bar, window, cx| {
+            search_bar.deploy(&deploy, window, cx);
+            search_bar.dismiss(&Dismiss, window, cx);
+            search_bar.show(window, cx);
+            assert_eq!(
+                search_bar.search_options,
+                SearchOptions::CASE_SENSITIVE | SearchOptions::WHOLE_WORD,
+                "Calling deploy on an already deployed search bar should not prevent settings updates from being detected"
             );
         });
     }

From 9a97f9465b08954ef3dc1729d3ad6abed0485620 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 28 Aug 2025 00:57:08 +0200
Subject: [PATCH 417/823] rust: Improve highlighting within macros (#37049)

This makes sure we do not apply the highlights for snake case
identifiers as well as paths for attributes too broadly to all types of
macros, which should make macros much more readable overall whilst
keeping the highlighting for the attribute items.

| Before | After |
| --- | --- |
| <img width="1414" height="958" alt="Bildschirmfoto 2025-08-28 um 00 37
58"
src="https://github.com/user-attachments/assets/1254b9a2-d07a-4be4-9b4f-555a7c640302"
/> | <img width="1414" height="958" alt="Bildschirmfoto 2025-08-28 um 00
37 38"
src="https://github.com/user-attachments/assets/5f6dd66c-5469-4f27-9f1d-0a6e6e8d8085"
/> |

Release Notes:

- rust: Improved highlighting within macros.
---
 crates/languages/src/rust/highlights.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
index 1c46061827..3f44c5fc0e 100644
--- a/crates/languages/src/rust/highlights.scm
+++ b/crates/languages/src/rust/highlights.scm
@@ -195,12 +195,13 @@ operator: "/" @operator
 (attribute_item (attribute [
   (identifier) @attribute
   (scoped_identifier name: (identifier) @attribute)
+  (token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
+  (token_tree (identifier) @variable "::" (identifier) @type (#match? @type "^[A-Z]"))
 ]))
+
 (inner_attribute_item (attribute [
   (identifier) @attribute
   (scoped_identifier name: (identifier) @attribute)
+  (token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
+  (token_tree (identifier) @variable "::" (identifier) @type (#match? @type "^[A-Z]"))
 ]))
-; Match nested snake case identifiers in attribute items.
-(token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
-; Override the attribute match for paths in scoped type/enum identifiers.
-(token_tree (identifier) @variable "::" (identifier) @type (#match? @type "^[A-Z]"))

From b233df8343b5f7316296995ced951dc166e56c7d Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 28 Aug 2025 02:24:19 +0300
Subject: [PATCH 418/823] Revert "Remote LSP logs (#36709)" (#37051)

This reverts commit e2bf8e5d9c9b1b14cad1c9c618bb724c04182a2c.

See
https://github.com/zed-industries/zed/pull/37050#issuecomment-3230017137
for the context: musl builds started to fail and the amount of `cfg!`s
to fix this is too large.

Instead, the lsp_log.rs has to be split and repurposed better for the
remote headless server.

Release Notes:

- N/A
---
 Cargo.lock                                    |   2 -
 crates/assistant_slash_command/Cargo.toml     |   2 +-
 crates/assistant_tool/Cargo.toml              |   2 +-
 crates/breadcrumbs/Cargo.toml                 |   2 +-
 .../20221109000000_test_schema.sql            |   1 -
 .../20250827084812_worktree_in_servers.sql    |   2 -
 crates/collab/src/db/queries/projects.rs      |   4 +-
 crates/collab/src/db/queries/rooms.rs         |   2 +-
 .../collab/src/db/tables/language_server.rs   |   1 -
 crates/collab/src/rpc.rs                      |   4 +-
 crates/copilot/Cargo.toml                     |   2 +-
 crates/editor/Cargo.toml                      |   2 +-
 crates/language_tools/Cargo.toml              |   3 +-
 crates/language_tools/src/language_tools.rs   |   4 +-
 crates/language_tools/src/lsp_log.rs          | 674 ++++++------------
 crates/language_tools/src/lsp_log_tests.rs    |   2 +-
 crates/language_tools/src/lsp_tool.rs         |  87 +--
 crates/project/src/lsp_store.rs               |  90 +--
 crates/project/src/project.rs                 |  21 -
 crates/project/src/project_tests.rs           |   1 -
 crates/proto/proto/lsp.proto                  |  44 +-
 crates/proto/proto/zed.proto                  |   3 +-
 crates/proto/src/proto.rs                     |   7 +-
 crates/remote_server/Cargo.toml               |   1 -
 crates/remote_server/src/headless_project.rs  |  79 +-
 crates/settings/src/settings.rs               |   2 +-
 crates/workspace/Cargo.toml                   |   3 +-
 crates/workspace/src/pane_group.rs            |  15 +-
 crates/workspace/src/workspace.rs             | 239 ++-----
 29 files changed, 347 insertions(+), 954 deletions(-)
 delete mode 100644 crates/collab/migrations/20250827084812_worktree_in_servers.sql

diff --git a/Cargo.lock b/Cargo.lock
index 8088efd6ea..4325addc39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9213,7 +9213,6 @@ dependencies = [
  "language",
  "lsp",
  "project",
- "proto",
  "release_channel",
  "serde_json",
  "settings",
@@ -13501,7 +13500,6 @@ dependencies = [
  "language",
  "language_extension",
  "language_model",
- "language_tools",
  "languages",
  "libc",
  "log",
diff --git a/crates/assistant_slash_command/Cargo.toml b/crates/assistant_slash_command/Cargo.toml
index e33c2cda1a..f7b7af9b87 100644
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -25,7 +25,7 @@ parking_lot.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 ui.workspace = true
-workspace = { path = "../workspace", default-features = false }
+workspace.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
diff --git a/crates/assistant_tool/Cargo.toml b/crates/assistant_tool/Cargo.toml
index 951226adfd..c95695052a 100644
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -28,7 +28,7 @@ serde.workspace = true
 serde_json.workspace = true
 text.workspace = true
 util.workspace = true
-workspace = { path = "../workspace", default-features = false }
+workspace.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
index 46f43d1630..c25cfc3c86 100644
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -19,7 +19,7 @@ itertools.workspace = true
 settings.workspace = true
 theme.workspace = true
 ui.workspace = true
-workspace = { path = "../workspace", default-features = false }
+workspace.workspace = true
 zed_actions.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index b2e25458ef..43581fd942 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -175,7 +175,6 @@ CREATE TABLE "language_servers" (
     "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
     "name" VARCHAR NOT NULL,
     "capabilities" TEXT NOT NULL,
-    "worktree_id" BIGINT,
     PRIMARY KEY (project_id, id)
 );
 
diff --git a/crates/collab/migrations/20250827084812_worktree_in_servers.sql b/crates/collab/migrations/20250827084812_worktree_in_servers.sql
deleted file mode 100644
index d4c6ffbbcc..0000000000
--- a/crates/collab/migrations/20250827084812_worktree_in_servers.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE language_servers
-    ADD COLUMN worktree_id BIGINT;
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index a3f0ea6cbc..393f2c80f8 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -694,7 +694,6 @@ impl Database {
                 project_id: ActiveValue::set(project_id),
                 id: ActiveValue::set(server.id as i64),
                 name: ActiveValue::set(server.name.clone()),
-                worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
                 capabilities: ActiveValue::set(update.capabilities.clone()),
             })
             .on_conflict(
@@ -705,7 +704,6 @@ impl Database {
                 .update_columns([
                     language_server::Column::Name,
                     language_server::Column::Capabilities,
-                    language_server::Column::WorktreeId,
                 ])
                 .to_owned(),
             )
@@ -1067,7 +1065,7 @@ impl Database {
                     server: proto::LanguageServer {
                         id: language_server.id as u64,
                         name: language_server.name,
-                        worktree_id: language_server.worktree_id.map(|id| id as u64),
+                        worktree_id: None,
                     },
                     capabilities: language_server.capabilities,
                 })
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index 0713ac2cb2..9e7cabf9b2 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -809,7 +809,7 @@ impl Database {
                 server: proto::LanguageServer {
                     id: language_server.id as u64,
                     name: language_server.name,
-                    worktree_id: language_server.worktree_id.map(|id| id as u64),
+                    worktree_id: None,
                 },
                 capabilities: language_server.capabilities,
             })
diff --git a/crates/collab/src/db/tables/language_server.rs b/crates/collab/src/db/tables/language_server.rs
index 705aae292b..34c7514d91 100644
--- a/crates/collab/src/db/tables/language_server.rs
+++ b/crates/collab/src/db/tables/language_server.rs
@@ -10,7 +10,6 @@ pub struct Model {
     pub id: i64,
     pub name: String,
     pub capabilities: String,
-    pub worktree_id: Option<i64>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 9e4dfd4854..73f327166a 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -476,9 +476,7 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
             .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
             .add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
-            .add_message_handler(update_context)
-            .add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>);
+            .add_message_handler(update_context);
 
         Arc::new(server)
     }
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 470d198958..0fc119f311 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -50,7 +50,7 @@ sum_tree.workspace = true
 task.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace = { path = "../workspace", default-features = false }
+workspace.workspace = true
 workspace-hack.workspace = true
 itertools.workspace = true
 
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index b7051c9b19..339f98ae8b 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -89,7 +89,7 @@ ui.workspace = true
 url.workspace = true
 util.workspace = true
 uuid.workspace = true
-workspace = { path = "../workspace", default-features = false }
+workspace.workspace = true
 zed_actions.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index a10b7dc50b..5aa914311a 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -24,14 +24,13 @@ itertools.workspace = true
 language.workspace = true
 lsp.workspace = true
 project.workspace = true
-proto.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 theme.workspace = true
 tree-sitter.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace = { path = "../workspace", default-features = false }
+workspace.workspace = true
 zed_actions.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/language_tools/src/language_tools.rs b/crates/language_tools/src/language_tools.rs
index d6a006f47b..cbf5756875 100644
--- a/crates/language_tools/src/language_tools.rs
+++ b/crates/language_tools/src/language_tools.rs
@@ -1,5 +1,5 @@
 mod key_context_view;
-pub mod lsp_log;
+mod lsp_log;
 pub mod lsp_tool;
 mod syntax_tree_view;
 
@@ -14,7 +14,7 @@ use ui::{Context, Window};
 use workspace::{Item, ItemHandle, SplitDirection, Workspace};
 
 pub fn init(cx: &mut App) {
-    lsp_log::init(true, cx);
+    lsp_log::init(cx);
     syntax_tree_view::init(cx);
     key_context_view::init(cx);
 }
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index d55b54a6d2..a71e434e52 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -9,16 +9,12 @@ use gpui::{
 use itertools::Itertools;
 use language::{LanguageServerId, language_settings::SoftWrap};
 use lsp::{
-    IoKind, LanguageServer, LanguageServerBinary, LanguageServerName, LanguageServerSelector,
-    MessageType, SetTraceParams, TraceValue, notification::SetTrace,
-};
-use project::{
-    LspStore, Project, ProjectItem, WorktreeId, lsp_store::LanguageServerLogType,
-    search::SearchQuery,
+    IoKind, LanguageServer, LanguageServerName, LanguageServerSelector, MessageType,
+    SetTraceParams, TraceValue, notification::SetTrace,
 };
+use project::{Project, WorktreeId, search::SearchQuery};
 use std::{any::TypeId, borrow::Cow, sync::Arc};
 use ui::{Button, Checkbox, ContextMenu, Label, PopoverMenu, ToggleState, prelude::*};
-use util::ResultExt as _;
 use workspace::{
     SplitDirection, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, WorkspaceId,
     item::{Item, ItemHandle},
@@ -32,7 +28,6 @@ const RECEIVE_LINE: &str = "\n// Receive:";
 const MAX_STORED_LOG_ENTRIES: usize = 2000;
 
 pub struct LogStore {
-    store_logs: bool,
     projects: HashMap<WeakEntity<Project>, ProjectState>,
     language_servers: HashMap<LanguageServerId, LanguageServerState>,
     copilot_log_subscription: Option<lsp::Subscription>,
@@ -51,7 +46,6 @@ trait Message: AsRef<str> {
     }
 }
 
-#[derive(Debug)]
 pub(super) struct LogMessage {
     message: String,
     typ: MessageType,
@@ -79,10 +73,8 @@ impl Message for LogMessage {
     }
 }
 
-#[derive(Debug)]
 pub(super) struct TraceMessage {
     message: String,
-    is_verbose: bool,
 }
 
 impl AsRef<str> for TraceMessage {
@@ -92,18 +84,9 @@ impl AsRef<str> for TraceMessage {
 }
 
 impl Message for TraceMessage {
-    type Level = TraceValue;
-
-    fn should_include(&self, level: Self::Level) -> bool {
-        match level {
-            TraceValue::Off => false,
-            TraceValue::Messages => !self.is_verbose,
-            TraceValue::Verbose => true,
-        }
-    }
+    type Level = ();
 }
 
-#[derive(Debug)]
 struct RpcMessage {
     message: String,
 }
@@ -118,7 +101,7 @@ impl Message for RpcMessage {
     type Level = ();
 }
 
-pub struct LanguageServerState {
+pub(super) struct LanguageServerState {
     name: Option<LanguageServerName>,
     worktree_id: Option<WorktreeId>,
     kind: LanguageServerKind,
@@ -130,35 +113,24 @@ pub struct LanguageServerState {
     io_logs_subscription: Option<lsp::Subscription>,
 }
 
-impl std::fmt::Debug for LanguageServerState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("LanguageServerState")
-            .field("name", &self.name)
-            .field("worktree_id", &self.worktree_id)
-            .field("kind", &self.kind)
-            .field("log_messages", &self.log_messages)
-            .field("trace_messages", &self.trace_messages)
-            .field("rpc_state", &self.rpc_state)
-            .field("trace_level", &self.trace_level)
-            .field("log_level", &self.log_level)
-            .finish_non_exhaustive()
-    }
-}
-
 #[derive(PartialEq, Clone)]
 pub enum LanguageServerKind {
     Local { project: WeakEntity<Project> },
     Remote { project: WeakEntity<Project> },
-    LocalSsh { lsp_store: WeakEntity<LspStore> },
     Global,
 }
 
+impl LanguageServerKind {
+    fn is_remote(&self) -> bool {
+        matches!(self, LanguageServerKind::Remote { .. })
+    }
+}
+
 impl std::fmt::Debug for LanguageServerKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             LanguageServerKind::Local { .. } => write!(f, "LanguageServerKind::Local"),
             LanguageServerKind::Remote { .. } => write!(f, "LanguageServerKind::Remote"),
-            LanguageServerKind::LocalSsh { .. } => write!(f, "LanguageServerKind::LocalSsh"),
             LanguageServerKind::Global => write!(f, "LanguageServerKind::Global"),
         }
     }
@@ -169,14 +141,12 @@ impl LanguageServerKind {
         match self {
             Self::Local { project } => Some(project),
             Self::Remote { project } => Some(project),
-            Self::LocalSsh { .. } => None,
             Self::Global { .. } => None,
         }
     }
 }
 
-#[derive(Debug)]
-pub struct LanguageServerRpcState {
+struct LanguageServerRpcState {
     rpc_messages: VecDeque<RpcMessage>,
     last_message_kind: Option<MessageKind>,
 }
@@ -197,7 +167,7 @@ pub struct LspLogToolbarItemView {
     _log_view_subscription: Option<Subscription>,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq)]
 enum MessageKind {
     Send,
     Receive,
@@ -213,13 +183,6 @@ pub enum LogKind {
 }
 
 impl LogKind {
-    fn from_server_log_type(log_type: &LanguageServerLogType) -> Self {
-        match log_type {
-            LanguageServerLogType::Log(_) => Self::Logs,
-            LanguageServerLogType::Trace { .. } => Self::Trace,
-            LanguageServerLogType::Rpc { .. } => Self::Rpc,
-        }
-    }
     fn label(&self) -> &'static str {
         match self {
             LogKind::Rpc => RPC_MESSAGES,
@@ -249,53 +212,59 @@ actions!(
     ]
 );
 
-pub struct GlobalLogStore(pub WeakEntity<LogStore>);
+pub(super) struct GlobalLogStore(pub WeakEntity<LogStore>);
 
 impl Global for GlobalLogStore {}
 
-pub fn init(store_logs: bool, cx: &mut App) {
-    let log_store = cx.new(|cx| LogStore::new(store_logs, cx));
+pub fn init(cx: &mut App) {
+    let log_store = cx.new(LogStore::new);
     cx.set_global(GlobalLogStore(log_store.downgrade()));
 
     cx.observe_new(move |workspace: &mut Workspace, _, cx| {
-        log_store.update(cx, |store, cx| {
-            store.add_project(workspace.project(), cx);
-        });
+        let project = workspace.project();
+        if project.read(cx).is_local() || project.read(cx).is_via_remote_server() {
+            log_store.update(cx, |store, cx| {
+                store.add_project(project, cx);
+            });
+        }
 
         let log_store = log_store.clone();
         workspace.register_action(move |workspace, _: &OpenLanguageServerLogs, window, cx| {
-            let log_store = log_store.clone();
-            let project = workspace.project().clone();
-            get_or_create_tool(
-                workspace,
-                SplitDirection::Right,
-                window,
-                cx,
-                move |window, cx| LspLogView::new(project, log_store, window, cx),
-            );
+            let project = workspace.project().read(cx);
+            if project.is_local() || project.is_via_remote_server() {
+                let project = workspace.project().clone();
+                let log_store = log_store.clone();
+                get_or_create_tool(
+                    workspace,
+                    SplitDirection::Right,
+                    window,
+                    cx,
+                    move |window, cx| LspLogView::new(project, log_store, window, cx),
+                );
+            }
         });
     })
     .detach();
 }
 
 impl LogStore {
-    pub fn new(store_logs: bool, cx: &mut Context<Self>) -> Self {
+    pub fn new(cx: &mut Context<Self>) -> Self {
         let (io_tx, mut io_rx) = mpsc::unbounded();
 
         let copilot_subscription = Copilot::global(cx).map(|copilot| {
             let copilot = &copilot;
-            cx.subscribe(copilot, |log_store, copilot, edit_prediction_event, cx| {
+            cx.subscribe(copilot, |this, copilot, edit_prediction_event, cx| {
                 if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event
                     && let Some(server) = copilot.read(cx).language_server()
                 {
                     let server_id = server.server_id();
-                    let weak_lsp_store = cx.weak_entity();
-                    log_store.copilot_log_subscription =
+                    let weak_this = cx.weak_entity();
+                    this.copilot_log_subscription =
                         Some(server.on_notification::<copilot::request::LogMessage, _>(
                             move |params, cx| {
-                                weak_lsp_store
-                                    .update(cx, |lsp_store, cx| {
-                                        lsp_store.add_language_server_log(
+                                weak_this
+                                    .update(cx, |this, cx| {
+                                        this.add_language_server_log(
                                             server_id,
                                             MessageType::LOG,
                                             &params.message,
@@ -305,9 +274,8 @@ impl LogStore {
                                     .ok();
                             },
                         ));
-
                     let name = LanguageServerName::new_static("copilot");
-                    log_store.add_language_server(
+                    this.add_language_server(
                         LanguageServerKind::Global,
                         server.server_id(),
                         Some(name),
@@ -319,27 +287,26 @@ impl LogStore {
             })
         });
 
-        let log_store = Self {
+        let this = Self {
             copilot_log_subscription: None,
             _copilot_subscription: copilot_subscription,
             projects: HashMap::default(),
             language_servers: HashMap::default(),
-            store_logs,
             io_tx,
         };
 
-        cx.spawn(async move |log_store, cx| {
+        cx.spawn(async move |this, cx| {
             while let Some((server_id, io_kind, message)) = io_rx.next().await {
-                if let Some(log_store) = log_store.upgrade() {
-                    log_store.update(cx, |log_store, cx| {
-                        log_store.on_io(server_id, io_kind, &message, cx);
+                if let Some(this) = this.upgrade() {
+                    this.update(cx, |this, cx| {
+                        this.on_io(server_id, io_kind, &message, cx);
                     })?;
                 }
             }
             anyhow::Ok(())
         })
         .detach_and_log_err(cx);
-        log_store
+        this
     }
 
     pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
@@ -353,19 +320,20 @@ impl LogStore {
                         this.language_servers
                             .retain(|_, state| state.kind.project() != Some(&weak_project));
                     }),
-                    cx.subscribe(project, move |log_store, project, event, cx| {
-                        let server_kind = if project.read(cx).is_local() {
-                            LanguageServerKind::Local {
-                                project: project.downgrade(),
-                            }
-                        } else {
+                    cx.subscribe(project, |this, project, event, cx| {
+                        let server_kind = if project.read(cx).is_via_remote_server() {
                             LanguageServerKind::Remote {
                                 project: project.downgrade(),
                             }
+                        } else {
+                            LanguageServerKind::Local {
+                                project: project.downgrade(),
+                            }
                         };
+
                         match event {
                             project::Event::LanguageServerAdded(id, name, worktree_id) => {
-                                log_store.add_language_server(
+                                this.add_language_server(
                                     server_kind,
                                     *id,
                                     Some(name.clone()),
@@ -378,76 +346,18 @@ impl LogStore {
                                     cx,
                                 );
                             }
-                            project::Event::LanguageServerBufferRegistered {
-                                server_id,
-                                buffer_id,
-                                name,
-                                ..
-                            } if project.read(cx).is_via_collab() => {
-                                let worktree_id = project
-                                    .read(cx)
-                                    .buffer_for_id(*buffer_id, cx)
-                                    .and_then(|buffer| {
-                                        Some(buffer.read(cx).project_path(cx)?.worktree_id)
-                                    });
-                                let name = name.clone().or_else(|| {
-                                    project
-                                        .read(cx)
-                                        .lsp_store()
-                                        .read(cx)
-                                        .language_server_statuses
-                                        .get(server_id)
-                                        .map(|status| status.name.clone())
-                                });
-                                log_store.add_language_server(
-                                    server_kind,
-                                    *server_id,
-                                    name,
-                                    worktree_id,
-                                    None,
-                                    cx,
-                                );
-                            }
                             project::Event::LanguageServerRemoved(id) => {
-                                log_store.remove_language_server(*id, cx);
+                                this.remove_language_server(*id, cx);
                             }
                             project::Event::LanguageServerLog(id, typ, message) => {
-                                log_store.add_language_server(
-                                    server_kind,
-                                    *id,
-                                    None,
-                                    None,
-                                    None,
-                                    cx,
-                                );
+                                this.add_language_server(server_kind, *id, None, None, None, cx);
                                 match typ {
                                     project::LanguageServerLogType::Log(typ) => {
-                                        log_store.add_language_server_log(*id, *typ, message, cx);
+                                        this.add_language_server_log(*id, *typ, message, cx);
                                     }
-                                    project::LanguageServerLogType::Trace { verbose_info } => {
-                                        log_store.add_language_server_trace(
-                                            *id,
-                                            message,
-                                            verbose_info.clone(),
-                                            cx,
-                                        );
+                                    project::LanguageServerLogType::Trace(_) => {
+                                        this.add_language_server_trace(*id, message, cx);
                                     }
-                                    project::LanguageServerLogType::Rpc { received } => {
-                                        let kind = if *received {
-                                            MessageKind::Receive
-                                        } else {
-                                            MessageKind::Send
-                                        };
-                                        log_store.add_language_server_rpc(*id, kind, message, cx);
-                                    }
-                                }
-                            }
-                            project::Event::ToggleLspLogs { server_id, enabled } => {
-                                // we do not support any other log toggling yet
-                                if *enabled {
-                                    log_store.enable_rpc_trace_for_language_server(*server_id);
-                                } else {
-                                    log_store.disable_rpc_trace_for_language_server(*server_id);
                                 }
                             }
                             _ => {}
@@ -465,7 +375,7 @@ impl LogStore {
         self.language_servers.get_mut(&id)
     }
 
-    pub fn add_language_server(
+    fn add_language_server(
         &mut self,
         kind: LanguageServerKind,
         server_id: LanguageServerId,
@@ -516,35 +426,20 @@ impl LogStore {
         message: &str,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        let store_logs = self.store_logs;
         let language_server_state = self.get_language_server_state(id)?;
 
         let log_lines = &mut language_server_state.log_messages;
-        let message = message.trim_end().to_string();
-        if !store_logs {
-            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Log(typ),
-                    text: message,
-                },
-                cx,
-            );
-        } else if let Some(new_message) = Self::push_new_message(
+        Self::add_language_server_message(
             log_lines,
-            LogMessage { message, typ },
+            id,
+            LogMessage {
+                message: message.trim_end().to_string(),
+                typ,
+            },
             language_server_state.log_level,
-        ) {
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Log(typ),
-                    text: new_message,
-                },
-                cx,
-            );
-        }
+            LogKind::Logs,
+            cx,
+        );
         Some(())
     }
 
@@ -552,127 +447,46 @@ impl LogStore {
         &mut self,
         id: LanguageServerId,
         message: &str,
-        verbose_info: Option<String>,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        let store_logs = self.store_logs;
         let language_server_state = self.get_language_server_state(id)?;
 
         let log_lines = &mut language_server_state.trace_messages;
-        if !store_logs {
-            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Trace { verbose_info },
-                    text: message.trim().to_string(),
-                },
-                cx,
-            );
-        } else if let Some(new_message) = Self::push_new_message(
+        Self::add_language_server_message(
             log_lines,
+            id,
             TraceMessage {
                 message: message.trim().to_string(),
-                is_verbose: false,
             },
-            TraceValue::Messages,
-        ) {
-            if let Some(verbose_message) = verbose_info.as_ref() {
-                Self::push_new_message(
-                    log_lines,
-                    TraceMessage {
-                        message: verbose_message.clone(),
-                        is_verbose: true,
-                    },
-                    TraceValue::Verbose,
-                );
-            }
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Trace { verbose_info },
-                    text: new_message,
-                },
-                cx,
-            );
-        }
+            (),
+            LogKind::Trace,
+            cx,
+        );
         Some(())
     }
 
-    fn push_new_message<T: Message>(
+    fn add_language_server_message<T: Message>(
         log_lines: &mut VecDeque<T>,
+        id: LanguageServerId,
         message: T,
         current_severity: <T as Message>::Level,
-    ) -> Option<String> {
+        kind: LogKind,
+        cx: &mut Context<Self>,
+    ) {
         while log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
             log_lines.pop_front();
         }
+        let text = message.as_ref().to_string();
         let visible = message.should_include(current_severity);
-
-        let visible_message = visible.then(|| message.as_ref().to_string());
         log_lines.push_back(message);
-        visible_message
+
+        if visible {
+            cx.emit(Event::NewServerLogEntry { id, kind, text });
+            cx.notify();
+        }
     }
 
-    fn add_language_server_rpc(
-        &mut self,
-        language_server_id: LanguageServerId,
-        kind: MessageKind,
-        message: &str,
-        cx: &mut Context<'_, Self>,
-    ) {
-        let store_logs = self.store_logs;
-        let Some(state) = self
-            .get_language_server_state(language_server_id)
-            .and_then(|state| state.rpc_state.as_mut())
-        else {
-            return;
-        };
-
-        let received = kind == MessageKind::Receive;
-        let rpc_log_lines = &mut state.rpc_messages;
-        if state.last_message_kind != Some(kind) {
-            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-                rpc_log_lines.pop_front();
-            }
-            let line_before_message = match kind {
-                MessageKind::Send => SEND_LINE,
-                MessageKind::Receive => RECEIVE_LINE,
-            };
-            if store_logs {
-                rpc_log_lines.push_back(RpcMessage {
-                    message: line_before_message.to_string(),
-                });
-            }
-            // Do not send a synthetic message over the wire, it will be derived from the actual RPC message
-            cx.emit(Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LanguageServerLogType::Rpc { received },
-                text: line_before_message.to_string(),
-            });
-        }
-
-        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            rpc_log_lines.pop_front();
-        }
-
-        if store_logs {
-            rpc_log_lines.push_back(RpcMessage {
-                message: message.trim().to_owned(),
-            });
-        }
-
-        self.emit_event(
-            Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LanguageServerLogType::Rpc { received },
-                text: message.to_owned(),
-            },
-            cx,
-        );
-    }
-
-    pub fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
+    fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
         self.language_servers.remove(&id);
         cx.notify();
     }
@@ -702,11 +516,11 @@ impl LogStore {
                         None
                     }
                 }
-                LanguageServerKind::Global | LanguageServerKind::LocalSsh { .. } => Some(*id),
+                LanguageServerKind::Global => Some(*id),
             })
     }
 
-    pub fn enable_rpc_trace_for_language_server(
+    fn enable_rpc_trace_for_language_server(
         &mut self,
         server_id: LanguageServerId,
     ) -> Option<&mut LanguageServerRpcState> {
@@ -849,45 +663,50 @@ impl LogStore {
             }
         };
 
+        let state = self
+            .get_language_server_state(language_server_id)?
+            .rpc_state
+            .as_mut()?;
         let kind = if is_received {
             MessageKind::Receive
         } else {
             MessageKind::Send
         };
 
-        self.add_language_server_rpc(language_server_id, kind, message, cx);
-        cx.notify();
-        Some(())
-    }
-
-    fn emit_event(&mut self, e: Event, cx: &mut Context<Self>) {
-        match &e {
-            Event::NewServerLogEntry { id, kind, text } => {
-                if let Some(state) = self.get_language_server_state(*id) {
-                    let downstream_client = match &state.kind {
-                        LanguageServerKind::Remote { project }
-                        | LanguageServerKind::Local { project } => project
-                            .upgrade()
-                            .map(|project| project.read(cx).lsp_store()),
-                        LanguageServerKind::LocalSsh { lsp_store } => lsp_store.upgrade(),
-                        LanguageServerKind::Global => None,
-                    }
-                    .and_then(|lsp_store| lsp_store.read(cx).downstream_client());
-                    if let Some((client, project_id)) = downstream_client {
-                        client
-                            .send(proto::LanguageServerLog {
-                                project_id,
-                                language_server_id: id.to_proto(),
-                                message: text.clone(),
-                                log_type: Some(kind.to_proto()),
-                            })
-                            .ok();
-                    }
-                }
+        let rpc_log_lines = &mut state.rpc_messages;
+        if state.last_message_kind != Some(kind) {
+            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+                rpc_log_lines.pop_front();
             }
+            let line_before_message = match kind {
+                MessageKind::Send => SEND_LINE,
+                MessageKind::Receive => RECEIVE_LINE,
+            };
+            rpc_log_lines.push_back(RpcMessage {
+                message: line_before_message.to_string(),
+            });
+            cx.emit(Event::NewServerLogEntry {
+                id: language_server_id,
+                kind: LogKind::Rpc,
+                text: line_before_message.to_string(),
+            });
         }
 
-        cx.emit(e);
+        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+            rpc_log_lines.pop_front();
+        }
+
+        let message = message.trim();
+        rpc_log_lines.push_back(RpcMessage {
+            message: message.to_string(),
+        });
+        cx.emit(Event::NewServerLogEntry {
+            id: language_server_id,
+            kind: LogKind::Rpc,
+            text: message.to_string(),
+        });
+        cx.notify();
+        Some(())
     }
 }
 
@@ -932,14 +751,13 @@ impl LspLogView {
 
                 cx.notify();
             });
-
         let events_subscriptions = cx.subscribe_in(
             &log_store,
             window,
             move |log_view, _, e, window, cx| match e {
                 Event::NewServerLogEntry { id, kind, text } => {
                     if log_view.current_server_id == Some(*id)
-                        && LogKind::from_server_log_type(kind) == log_view.active_entry_kind
+                        && *kind == log_view.active_entry_kind
                     {
                         log_view.editor.update(cx, |editor, cx| {
                             editor.set_read_only(false);
@@ -982,7 +800,7 @@ impl LspLogView {
             window.focus(&log_view.editor.focus_handle(cx));
         });
 
-        let mut lsp_log_view = Self {
+        let mut this = Self {
             focus_handle,
             editor,
             editor_subscriptions,
@@ -997,9 +815,9 @@ impl LspLogView {
             ],
         };
         if let Some(server_id) = server_id {
-            lsp_log_view.show_logs_for_server(server_id, window, cx);
+            this.show_logs_for_server(server_id, window, cx);
         }
-        lsp_log_view
+        this
     }
 
     fn editor_for_logs(
@@ -1020,7 +838,7 @@ impl LspLogView {
     }
 
     fn editor_for_server_info(
-        info: ServerInfo,
+        server: &LanguageServer,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> (Entity<Editor>, Vec<Subscription>) {
@@ -1035,21 +853,22 @@ impl LspLogView {
 * Capabilities: {CAPABILITIES}
 
 * Configuration: {CONFIGURATION}",
-            NAME = info.name,
-            ID = info.id,
-            BINARY = info.binary.as_ref().map_or_else(
-                || "Unknown".to_string(),
-                |bin| bin.path.as_path().to_string_lossy().to_string()
-            ),
-            WORKSPACE_FOLDERS = info.workspace_folders.join(", "),
-            CAPABILITIES = serde_json::to_string_pretty(&info.capabilities)
+            NAME = server.name(),
+            ID = server.server_id(),
+            BINARY = server.binary(),
+            WORKSPACE_FOLDERS = server
+                .workspace_folders()
+                .into_iter()
+                .filter_map(|path| path
+                    .to_file_path()
+                    .ok()
+                    .map(|path| path.to_string_lossy().into_owned()))
+                .collect::<Vec<_>>()
+                .join(", "),
+            CAPABILITIES = serde_json::to_string_pretty(&server.capabilities())
                 .unwrap_or_else(|e| format!("Failed to serialize capabilities: {e}")),
-            CONFIGURATION = info
-                .configuration
-                .map(|configuration| serde_json::to_string_pretty(&configuration))
-                .transpose()
-                .unwrap_or_else(|e| Some(format!("Failed to serialize configuration: {e}")))
-                .unwrap_or_else(|| "Unknown".to_string()),
+            CONFIGURATION = serde_json::to_string_pretty(server.configuration())
+                .unwrap_or_else(|e| format!("Failed to serialize configuration: {e}")),
         );
         let editor = initialize_new_editor(server_info, false, window, cx);
         let editor_subscription = cx.subscribe(
@@ -1072,9 +891,7 @@ impl LspLogView {
             .language_servers
             .iter()
             .map(|(server_id, state)| match &state.kind {
-                LanguageServerKind::Local { .. }
-                | LanguageServerKind::Remote { .. }
-                | LanguageServerKind::LocalSsh { .. } => {
+                LanguageServerKind::Local { .. } | LanguageServerKind::Remote { .. } => {
                     let worktree_root_name = state
                         .worktree_id
                         .and_then(|id| self.project.read(cx).worktree_for_id(id, cx))
@@ -1186,17 +1003,11 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let trace_level = self
-            .log_store
-            .update(cx, |this, _| {
-                Some(this.get_language_server_state(server_id)?.trace_level)
-            })
-            .unwrap_or(TraceValue::Messages);
         let log_contents = self
             .log_store
             .read(cx)
             .server_trace(server_id)
-            .map(|v| log_contents(v, trace_level));
+            .map(|v| log_contents(v, ()));
         if let Some(log_contents) = log_contents {
             self.current_server_id = Some(server_id);
             self.active_entry_kind = LogKind::Trace;
@@ -1214,7 +1025,6 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.toggle_rpc_trace_for_server(server_id, true, window, cx);
         let rpc_log = self.log_store.update(cx, |log_store, _| {
             log_store
                 .enable_rpc_trace_for_language_server(server_id)
@@ -1259,33 +1069,12 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.log_store.update(cx, |log_store, cx| {
+        self.log_store.update(cx, |log_store, _| {
             if enabled {
                 log_store.enable_rpc_trace_for_language_server(server_id);
             } else {
                 log_store.disable_rpc_trace_for_language_server(server_id);
             }
-
-            if let Some(server_state) = log_store.language_servers.get(&server_id) {
-                if let LanguageServerKind::Remote { project } = &server_state.kind {
-                    project
-                        .update(cx, |project, cx| {
-                            if let Some((client, project_id)) =
-                                project.lsp_store().read(cx).upstream_client()
-                            {
-                                client
-                                    .send(proto::ToggleLspLogs {
-                                        project_id,
-                                        log_type: proto::toggle_lsp_logs::LogType::Rpc as i32,
-                                        server_id: server_id.to_proto(),
-                                        enabled,
-                                    })
-                                    .log_err();
-                            }
-                        })
-                        .ok();
-                }
-            };
         });
         if !enabled && Some(server_id) == self.current_server_id {
             self.show_logs_for_server(server_id, window, cx);
@@ -1324,38 +1113,13 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let Some(server_info) = self
-            .project
-            .read(cx)
-            .lsp_store()
-            .update(cx, |lsp_store, _| {
-                lsp_store
-                    .language_server_for_id(server_id)
-                    .as_ref()
-                    .map(|language_server| ServerInfo::new(language_server))
-                    .or_else(move || {
-                        let capabilities =
-                            lsp_store.lsp_server_capabilities.get(&server_id)?.clone();
-                        let name = lsp_store
-                            .language_server_statuses
-                            .get(&server_id)
-                            .map(|status| status.name.clone())?;
-                        Some(ServerInfo {
-                            id: server_id,
-                            capabilities,
-                            binary: None,
-                            name,
-                            workspace_folders: Vec::new(),
-                            configuration: None,
-                        })
-                    })
-            })
-        else {
+        let lsp_store = self.project.read(cx).lsp_store();
+        let Some(server) = lsp_store.read(cx).language_server_for_id(server_id) else {
             return;
         };
         self.current_server_id = Some(server_id);
         self.active_entry_kind = LogKind::ServerInfo;
-        let (editor, editor_subscriptions) = Self::editor_for_server_info(server_info, window, cx);
+        let (editor, editor_subscriptions) = Self::editor_for_server_info(&server, window, cx);
         self.editor = editor;
         self.editor_subscriptions = editor_subscriptions;
         cx.notify();
@@ -1652,6 +1416,7 @@ impl Render for LspLogToolbarItemView {
 
         let view_selector = current_server.map(|server| {
             let server_id = server.server_id;
+            let is_remote = server.server_kind.is_remote();
             let rpc_trace_enabled = server.rpc_trace_enabled;
             let log_view = log_view.clone();
             PopoverMenu::new("LspViewSelector")
@@ -1673,53 +1438,55 @@ impl Render for LspLogToolbarItemView {
                                 view.show_logs_for_server(server_id, window, cx);
                             }),
                         )
-                        .entry(
-                            SERVER_TRACE,
-                            None,
-                            window.handler_for(&log_view, move |view, window, cx| {
-                                view.show_trace_for_server(server_id, window, cx);
-                            }),
-                        )
-                        .custom_entry(
-                            {
-                                let log_toolbar_view = log_toolbar_view.clone();
-                                move |window, _| {
-                                    h_flex()
-                                        .w_full()
-                                        .justify_between()
-                                        .child(Label::new(RPC_MESSAGES))
-                                        .child(
-                                            div().child(
-                                                Checkbox::new(
-                                                    "LspLogEnableRpcTrace",
-                                                    if rpc_trace_enabled {
-                                                        ToggleState::Selected
-                                                    } else {
-                                                        ToggleState::Unselected
-                                                    },
-                                                )
-                                                .on_click(window.listener_for(
-                                                    &log_toolbar_view,
-                                                    move |view, selection, window, cx| {
-                                                        let enabled = matches!(
-                                                            selection,
+                        .when(!is_remote, |this| {
+                            this.entry(
+                                SERVER_TRACE,
+                                None,
+                                window.handler_for(&log_view, move |view, window, cx| {
+                                    view.show_trace_for_server(server_id, window, cx);
+                                }),
+                            )
+                            .custom_entry(
+                                {
+                                    let log_toolbar_view = log_toolbar_view.clone();
+                                    move |window, _| {
+                                        h_flex()
+                                            .w_full()
+                                            .justify_between()
+                                            .child(Label::new(RPC_MESSAGES))
+                                            .child(
+                                                div().child(
+                                                    Checkbox::new(
+                                                        "LspLogEnableRpcTrace",
+                                                        if rpc_trace_enabled {
                                                             ToggleState::Selected
-                                                        );
-                                                        view.toggle_rpc_logging_for_server(
-                                                            server_id, enabled, window, cx,
-                                                        );
-                                                        cx.stop_propagation();
-                                                    },
-                                                )),
-                                            ),
-                                        )
-                                        .into_any_element()
-                                }
-                            },
-                            window.handler_for(&log_view, move |view, window, cx| {
-                                view.show_rpc_trace_for_server(server_id, window, cx);
-                            }),
-                        )
+                                                        } else {
+                                                            ToggleState::Unselected
+                                                        },
+                                                    )
+                                                    .on_click(window.listener_for(
+                                                        &log_toolbar_view,
+                                                        move |view, selection, window, cx| {
+                                                            let enabled = matches!(
+                                                                selection,
+                                                                ToggleState::Selected
+                                                            );
+                                                            view.toggle_rpc_logging_for_server(
+                                                                server_id, enabled, window, cx,
+                                                            );
+                                                            cx.stop_propagation();
+                                                        },
+                                                    )),
+                                                ),
+                                            )
+                                            .into_any_element()
+                                    }
+                                },
+                                window.handler_for(&log_view, move |view, window, cx| {
+                                    view.show_rpc_trace_for_server(server_id, window, cx);
+                                }),
+                            )
+                        })
                         .entry(
                             SERVER_INFO,
                             None,
@@ -1929,6 +1696,12 @@ const SERVER_LOGS: &str = "Server Logs";
 const SERVER_TRACE: &str = "Server Trace";
 const SERVER_INFO: &str = "Server Info";
 
+impl Default for LspLogToolbarItemView {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl LspLogToolbarItemView {
     pub fn new() -> Self {
         Self {
@@ -1961,41 +1734,10 @@ impl LspLogToolbarItemView {
     }
 }
 
-struct ServerInfo {
-    id: LanguageServerId,
-    capabilities: lsp::ServerCapabilities,
-    binary: Option<LanguageServerBinary>,
-    name: LanguageServerName,
-    workspace_folders: Vec<String>,
-    configuration: Option<serde_json::Value>,
-}
-
-impl ServerInfo {
-    fn new(server: &LanguageServer) -> Self {
-        Self {
-            id: server.server_id(),
-            capabilities: server.capabilities(),
-            binary: Some(server.binary().clone()),
-            name: server.name(),
-            workspace_folders: server
-                .workspace_folders()
-                .into_iter()
-                .filter_map(|path| {
-                    path.to_file_path()
-                        .ok()
-                        .map(|path| path.to_string_lossy().into_owned())
-                })
-                .collect::<Vec<_>>(),
-            configuration: Some(server.configuration().clone()),
-        }
-    }
-}
-
-#[derive(Debug)]
 pub enum Event {
     NewServerLogEntry {
         id: LanguageServerId,
-        kind: LanguageServerLogType,
+        kind: LogKind,
         text: String,
     },
 }
diff --git a/crates/language_tools/src/lsp_log_tests.rs b/crates/language_tools/src/lsp_log_tests.rs
index a7dbaa2a60..ad2b653fdc 100644
--- a/crates/language_tools/src/lsp_log_tests.rs
+++ b/crates/language_tools/src/lsp_log_tests.rs
@@ -51,7 +51,7 @@ async fn test_lsp_logs(cx: &mut TestAppContext) {
         },
     );
 
-    let log_store = cx.new(|cx| LogStore::new(true, cx));
+    let log_store = cx.new(LogStore::new);
     log_store.update(cx, |store, cx| store.add_project(&project, cx));
 
     let _rust_buffer = project
diff --git a/crates/language_tools/src/lsp_tool.rs b/crates/language_tools/src/lsp_tool.rs
index 2d6a99a0bc..dd3e80212f 100644
--- a/crates/language_tools/src/lsp_tool.rs
+++ b/crates/language_tools/src/lsp_tool.rs
@@ -122,7 +122,8 @@ impl LanguageServerState {
         let lsp_logs = cx
             .try_global::<GlobalLogStore>()
             .and_then(|lsp_logs| lsp_logs.0.upgrade());
-        let Some(lsp_logs) = lsp_logs else {
+        let lsp_store = self.lsp_store.upgrade();
+        let Some((lsp_logs, lsp_store)) = lsp_logs.zip(lsp_store) else {
             return menu;
         };
 
@@ -209,11 +210,10 @@ impl LanguageServerState {
             };
 
             let server_selector = server_info.server_selector();
-            let is_remote = self
-                .lsp_store
-                .update(cx, |lsp_store, _| lsp_store.as_remote().is_some())
-                .unwrap_or(false);
-            let has_logs = is_remote || lsp_logs.read(cx).has_server_logs(&server_selector);
+            // TODO currently, Zed remote does not work well with the LSP logs
+            // https://github.com/zed-industries/zed/issues/28557
+            let has_logs = lsp_store.read(cx).as_local().is_some()
+                && lsp_logs.read(cx).has_server_logs(&server_selector);
 
             let status_color = server_info
                 .binary_status
@@ -241,10 +241,10 @@ impl LanguageServerState {
                 .as_ref()
                 .or_else(|| server_info.binary_status.as_ref()?.message.as_ref())
                 .cloned();
-            let hover_label = if message.is_some() {
-                Some("View Message")
-            } else if has_logs {
+            let hover_label = if has_logs {
                 Some("View Logs")
+            } else if message.is_some() {
+                Some("View Message")
             } else {
                 None
             };
@@ -288,7 +288,16 @@ impl LanguageServerState {
                     let server_name = server_info.name.clone();
                     let workspace = self.workspace.clone();
                     move |window, cx| {
-                        if let Some(message) = &message {
+                        if has_logs {
+                            lsp_logs.update(cx, |lsp_logs, cx| {
+                                lsp_logs.open_server_trace(
+                                    workspace.clone(),
+                                    server_selector.clone(),
+                                    window,
+                                    cx,
+                                );
+                            });
+                        } else if let Some(message) = &message {
                             let Some(create_buffer) = workspace
                                 .update(cx, |workspace, cx| {
                                     workspace
@@ -338,15 +347,6 @@ impl LanguageServerState {
                                 anyhow::Ok(())
                             })
                             .detach();
-                        } else if has_logs {
-                            lsp_logs.update(cx, |lsp_logs, cx| {
-                                lsp_logs.open_server_trace(
-                                    workspace.clone(),
-                                    server_selector.clone(),
-                                    window,
-                                    cx,
-                                );
-                            });
                         } else {
                             cx.propagate();
                         }
@@ -529,48 +529,26 @@ impl LspTool {
             });
 
         let lsp_store = workspace.project().read(cx).lsp_store();
-        let mut language_servers = LanguageServers::default();
-        for (_, status) in lsp_store.read(cx).language_server_statuses() {
-            language_servers.binary_statuses.insert(
-                status.name.clone(),
-                LanguageServerBinaryStatus {
-                    status: BinaryStatus::None,
-                    message: None,
-                },
-            );
-        }
-
         let lsp_store_subscription =
             cx.subscribe_in(&lsp_store, window, |lsp_tool, _, e, window, cx| {
                 lsp_tool.on_lsp_store_event(e, window, cx)
             });
 
-        let server_state = cx.new(|_| LanguageServerState {
+        let state = cx.new(|_| LanguageServerState {
             workspace: workspace.weak_handle(),
             items: Vec::new(),
             lsp_store: lsp_store.downgrade(),
             active_editor: None,
-            language_servers,
+            language_servers: LanguageServers::default(),
         });
 
-        let mut lsp_tool = Self {
-            server_state,
+        Self {
+            server_state: state,
             popover_menu_handle,
             lsp_menu: None,
             lsp_menu_refresh: Task::ready(()),
             _subscriptions: vec![settings_subscription, lsp_store_subscription],
-        };
-        if !lsp_tool
-            .server_state
-            .read(cx)
-            .language_servers
-            .binary_statuses
-            .is_empty()
-        {
-            lsp_tool.refresh_lsp_menu(true, window, cx);
         }
-
-        lsp_tool
     }
 
     fn on_lsp_store_event(
@@ -730,25 +708,6 @@ impl LspTool {
                     }
                 }
             }
-            state
-                .lsp_store
-                .update(cx, |lsp_store, cx| {
-                    for (server_id, status) in lsp_store.language_server_statuses() {
-                        if let Some(worktree) = status.worktree.and_then(|worktree_id| {
-                            lsp_store
-                                .worktree_store()
-                                .read(cx)
-                                .worktree_for_id(worktree_id, cx)
-                        }) {
-                            server_ids_to_worktrees.insert(server_id, worktree.clone());
-                            server_names_to_worktrees
-                                .entry(status.name.clone())
-                                .or_default()
-                                .insert((worktree, server_id));
-                        }
-                    }
-                })
-                .ok();
 
             let mut servers_per_worktree = BTreeMap::<SharedString, Vec<ServerData>>::new();
             let mut servers_without_worktree = Vec::<ServerData>::new();
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 2bc95bf81d..ad9d0abf40 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -977,9 +977,7 @@ impl LocalLspStore {
                         this.update(&mut cx, |_, cx| {
                             cx.emit(LspStoreEvent::LanguageServerLog(
                                 server_id,
-                                LanguageServerLogType::Trace {
-                                    verbose_info: params.verbose,
-                                },
+                                LanguageServerLogType::Trace(params.verbose),
                                 params.message,
                             ));
                         })
@@ -3484,13 +3482,13 @@ pub struct LspStore {
     buffer_store: Entity<BufferStore>,
     worktree_store: Entity<WorktreeStore>,
     pub languages: Arc<LanguageRegistry>,
-    pub language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
+    language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
     active_entry: Option<ProjectEntryId>,
     _maintain_workspace_config: (Task<Result<()>>, watch::Sender<()>),
     _maintain_buffer_languages: Task<()>,
     diagnostic_summaries:
         HashMap<WorktreeId, HashMap<Arc<Path>, HashMap<LanguageServerId, DiagnosticSummary>>>,
-    pub lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
+    pub(super) lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
     lsp_document_colors: HashMap<BufferId, DocumentColorData>,
     lsp_code_lens: HashMap<BufferId, CodeLensData>,
     running_lsp_requests: HashMap<TypeId, (Global, HashMap<LspRequestId, Task<()>>)>,
@@ -3567,7 +3565,6 @@ pub struct LanguageServerStatus {
     pub pending_work: BTreeMap<String, LanguageServerProgress>,
     pub has_pending_diagnostic_updates: bool,
     progress_tokens: HashSet<String>,
-    pub worktree: Option<WorktreeId>,
 }
 
 #[derive(Clone, Debug)]
@@ -7486,7 +7483,7 @@ impl LspStore {
                         server: Some(proto::LanguageServer {
                             id: server_id.to_proto(),
                             name: status.name.to_string(),
-                            worktree_id: status.worktree.map(|id| id.to_proto()),
+                            worktree_id: None,
                         }),
                         capabilities: serde_json::to_string(&server.capabilities())
                             .expect("serializing server LSP capabilities"),
@@ -7530,7 +7527,6 @@ impl LspStore {
                         pending_work: Default::default(),
                         has_pending_diagnostic_updates: false,
                         progress_tokens: Default::default(),
-                        worktree: server.worktree_id.map(WorktreeId::from_proto),
                     },
                 )
             })
@@ -8896,7 +8892,6 @@ impl LspStore {
                     pending_work: Default::default(),
                     has_pending_diagnostic_updates: false,
                     progress_tokens: Default::default(),
-                    worktree: server.worktree_id.map(WorktreeId::from_proto),
                 },
             );
             cx.emit(LspStoreEvent::LanguageServerAdded(
@@ -10910,7 +10905,6 @@ impl LspStore {
                 pending_work: Default::default(),
                 has_pending_diagnostic_updates: false,
                 progress_tokens: Default::default(),
-                worktree: Some(key.worktree_id),
             },
         );
 
@@ -12196,14 +12190,6 @@ impl LspStore {
         let data = self.lsp_code_lens.get_mut(&buffer_id)?;
         Some(data.update.take()?.1)
     }
-
-    pub fn downstream_client(&self) -> Option<(AnyProtoClient, u64)> {
-        self.downstream_client.clone()
-    }
-
-    pub fn worktree_store(&self) -> Entity<WorktreeStore> {
-        self.worktree_store.clone()
-    }
 }
 
 // Registration with registerOptions as null, should fallback to true.
@@ -12713,69 +12699,45 @@ impl PartialEq for LanguageServerPromptRequest {
 #[derive(Clone, Debug, PartialEq)]
 pub enum LanguageServerLogType {
     Log(MessageType),
-    Trace { verbose_info: Option<String> },
-    Rpc { received: bool },
+    Trace(Option<String>),
 }
 
 impl LanguageServerLogType {
     pub fn to_proto(&self) -> proto::language_server_log::LogType {
         match self {
             Self::Log(log_type) => {
-                use proto::log_message::LogLevel;
-                let level = match *log_type {
-                    MessageType::ERROR => LogLevel::Error,
-                    MessageType::WARNING => LogLevel::Warning,
-                    MessageType::INFO => LogLevel::Info,
-                    MessageType::LOG => LogLevel::Log,
+                let message_type = match *log_type {
+                    MessageType::ERROR => 1,
+                    MessageType::WARNING => 2,
+                    MessageType::INFO => 3,
+                    MessageType::LOG => 4,
                     other => {
-                        log::warn!("Unknown lsp log message type: {other:?}");
-                        LogLevel::Log
+                        log::warn!("Unknown lsp log message type: {:?}", other);
+                        4
                     }
                 };
-                proto::language_server_log::LogType::Log(proto::LogMessage {
-                    level: level as i32,
-                })
+                proto::language_server_log::LogType::LogMessageType(message_type)
             }
-            Self::Trace { verbose_info } => {
-                proto::language_server_log::LogType::Trace(proto::TraceMessage {
-                    verbose_info: verbose_info.to_owned(),
+            Self::Trace(message) => {
+                proto::language_server_log::LogType::LogTrace(proto::LspLogTrace {
+                    message: message.clone(),
                 })
             }
-            Self::Rpc { received } => {
-                let kind = if *received {
-                    proto::rpc_message::Kind::Received
-                } else {
-                    proto::rpc_message::Kind::Sent
-                };
-                let kind = kind as i32;
-                proto::language_server_log::LogType::Rpc(proto::RpcMessage { kind })
-            }
         }
     }
 
     pub fn from_proto(log_type: proto::language_server_log::LogType) -> Self {
-        use proto::log_message::LogLevel;
-        use proto::rpc_message;
         match log_type {
-            proto::language_server_log::LogType::Log(message_type) => Self::Log(
-                match LogLevel::from_i32(message_type.level).unwrap_or(LogLevel::Log) {
-                    LogLevel::Error => MessageType::ERROR,
-                    LogLevel::Warning => MessageType::WARNING,
-                    LogLevel::Info => MessageType::INFO,
-                    LogLevel::Log => MessageType::LOG,
-                },
-            ),
-            proto::language_server_log::LogType::Trace(trace_message) => Self::Trace {
-                verbose_info: trace_message.verbose_info,
-            },
-            proto::language_server_log::LogType::Rpc(message) => Self::Rpc {
-                received: match rpc_message::Kind::from_i32(message.kind)
-                    .unwrap_or(rpc_message::Kind::Received)
-                {
-                    rpc_message::Kind::Received => true,
-                    rpc_message::Kind::Sent => false,
-                },
-            },
+            proto::language_server_log::LogType::LogMessageType(message_type) => {
+                Self::Log(match message_type {
+                    1 => MessageType::ERROR,
+                    2 => MessageType::WARNING,
+                    3 => MessageType::INFO,
+                    4 => MessageType::LOG,
+                    _ => MessageType::LOG,
+                })
+            }
+            proto::language_server_log::LogType::LogTrace(trace) => Self::Trace(trace.message),
         }
     }
 }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 63ce309e7a..9e3900198c 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -280,11 +280,6 @@ pub enum Event {
         server_id: LanguageServerId,
         buffer_id: BufferId,
         buffer_abs_path: PathBuf,
-        name: Option<LanguageServerName>,
-    },
-    ToggleLspLogs {
-        server_id: LanguageServerId,
-        enabled: bool,
     },
     Toast {
         notification_id: SharedString,
@@ -1006,7 +1001,6 @@ impl Project {
         client.add_entity_request_handler(Self::handle_open_buffer_by_path);
         client.add_entity_request_handler(Self::handle_open_new_buffer);
         client.add_entity_message_handler(Self::handle_create_buffer_for_peer);
-        client.add_entity_message_handler(Self::handle_toggle_lsp_logs);
 
         WorktreeStore::init(&client);
         BufferStore::init(&client);
@@ -2977,7 +2971,6 @@ impl Project {
                                 buffer_id,
                                 server_id: *language_server_id,
                                 buffer_abs_path: PathBuf::from(&update.buffer_abs_path),
-                                name: name.clone(),
                             });
                         }
                     }
@@ -4704,20 +4697,6 @@ impl Project {
         })?
     }
 
-    async fn handle_toggle_lsp_logs(
-        project: Entity<Self>,
-        envelope: TypedEnvelope<proto::ToggleLspLogs>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        project.update(&mut cx, |_, cx| {
-            cx.emit(Event::ToggleLspLogs {
-                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
-                enabled: envelope.payload.enabled,
-            })
-        })?;
-        Ok(())
-    }
-
     async fn handle_synchronize_buffers(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::SynchronizeBuffers>,
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index a8f911883d..f49713d208 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1951,7 +1951,6 @@ async fn test_restarting_server_with_diagnostics_running(cx: &mut gpui::TestAppC
             server_id: LanguageServerId(1),
             buffer_id,
             buffer_abs_path: PathBuf::from(path!("/dir/a.rs")),
-            name: Some(fake_server.server.name())
         }
     );
     assert_eq!(
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 16f6217b29..473ef5c38c 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -610,36 +610,11 @@ message ServerMetadataUpdated {
 message LanguageServerLog {
     uint64 project_id = 1;
     uint64 language_server_id = 2;
-    string message = 3;
     oneof log_type {
-        LogMessage log = 4;
-        TraceMessage trace = 5;
-        RpcMessage rpc = 6;
-    }
-}
-
-message LogMessage {
-    LogLevel level = 1;
-
-    enum LogLevel {
-        LOG = 0;
-        INFO = 1;
-        WARNING = 2;
-        ERROR = 3;
-    }
-}
-
-message TraceMessage {
-    optional string verbose_info = 1;
-}
-
-message RpcMessage {
-    Kind kind = 1;
-
-    enum Kind {
-        RECEIVED = 0;
-        SENT = 1;
+        uint32 log_message_type = 3;
+        LspLogTrace log_trace = 4;
     }
+    string message = 5;
 }
 
 message LspLogTrace {
@@ -957,16 +932,3 @@ message MultiLspQuery {
 message MultiLspQueryResponse {
     repeated LspResponse responses = 1;
 }
-
-message ToggleLspLogs {
-    uint64 project_id = 1;
-    LogType log_type = 2;
-    uint64 server_id = 3;
-    bool enabled = 4;
-
-    enum LogType {
-        LOG = 0;
-        TRACE = 1;
-        RPC = 2;
-    }
-}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 2222bdec08..70689bcd63 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -396,8 +396,7 @@ message Envelope {
         GitCloneResponse git_clone_response = 364;
 
         LspQuery lsp_query = 365;
-        LspQueryResponse lsp_query_response = 366;
-        ToggleLspLogs toggle_lsp_logs = 367; // current max
+        LspQueryResponse lsp_query_response = 366; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 04495fb898..e17ec5203b 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -312,8 +312,7 @@ messages!(
     (GetDefaultBranch, Background),
     (GetDefaultBranchResponse, Background),
     (GitClone, Background),
-    (GitCloneResponse, Background),
-    (ToggleLspLogs, Background),
+    (GitCloneResponse, Background)
 );
 
 request_messages!(
@@ -482,8 +481,7 @@ request_messages!(
     (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse),
     (PullWorkspaceDiagnostics, Ack),
     (GetDefaultBranch, GetDefaultBranchResponse),
-    (GitClone, GitCloneResponse),
-    (ToggleLspLogs, Ack),
+    (GitClone, GitCloneResponse)
 );
 
 lsp_messages!(
@@ -614,7 +612,6 @@ entity_messages!(
     GitReset,
     GitCheckoutFiles,
     SetIndexText,
-    ToggleLspLogs,
 
     Push,
     Fetch,
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index 249968b246..5dbb9a2771 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -43,7 +43,6 @@ gpui_tokio.workspace = true
 http_client.workspace = true
 language.workspace = true
 language_extension.workspace = true
-language_tools.workspace = true
 languages.workspace = true
 log.workspace = true
 lsp.workspace = true
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 1e197fdd33..04028ebcac 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -1,7 +1,5 @@
 use ::proto::{FromProto, ToProto};
 use anyhow::{Context as _, Result, anyhow};
-use language_tools::lsp_log::{GlobalLogStore, LanguageServerKind};
-use lsp::LanguageServerId;
 
 use extension::ExtensionHostProxy;
 use extension_host::headless_host::HeadlessExtensionStore;
@@ -67,7 +65,6 @@ impl HeadlessProject {
         settings::init(cx);
         language::init(cx);
         project::Project::init_settings(cx);
-        language_tools::lsp_log::init(false, cx);
     }
 
     pub fn new(
@@ -238,7 +235,6 @@ impl HeadlessProject {
         session.add_entity_request_handler(Self::handle_open_new_buffer);
         session.add_entity_request_handler(Self::handle_find_search_candidates);
         session.add_entity_request_handler(Self::handle_open_server_settings);
-        session.add_entity_message_handler(Self::handle_toggle_lsp_logs);
 
         session.add_entity_request_handler(BufferStore::handle_update_buffer);
         session.add_entity_message_handler(BufferStore::handle_close_buffer);
@@ -302,40 +298,11 @@ impl HeadlessProject {
 
     fn on_lsp_store_event(
         &mut self,
-        lsp_store: Entity<LspStore>,
+        _lsp_store: Entity<LspStore>,
         event: &LspStoreEvent,
         cx: &mut Context<Self>,
     ) {
         match event {
-            LspStoreEvent::LanguageServerAdded(id, name, worktree_id) => {
-                let log_store = cx
-                    .try_global::<GlobalLogStore>()
-                    .and_then(|lsp_logs| lsp_logs.0.upgrade());
-                if let Some(log_store) = log_store {
-                    log_store.update(cx, |log_store, cx| {
-                        log_store.add_language_server(
-                            LanguageServerKind::LocalSsh {
-                                lsp_store: self.lsp_store.downgrade(),
-                            },
-                            *id,
-                            Some(name.clone()),
-                            *worktree_id,
-                            lsp_store.read(cx).language_server_for_id(*id),
-                            cx,
-                        );
-                    });
-                }
-            }
-            LspStoreEvent::LanguageServerRemoved(id) => {
-                let log_store = cx
-                    .try_global::<GlobalLogStore>()
-                    .and_then(|lsp_logs| lsp_logs.0.upgrade());
-                if let Some(log_store) = log_store {
-                    log_store.update(cx, |log_store, cx| {
-                        log_store.remove_language_server(*id, cx);
-                    });
-                }
-            }
             LspStoreEvent::LanguageServerUpdate {
                 language_server_id,
                 name,
@@ -359,6 +326,16 @@ impl HeadlessProject {
                     })
                     .log_err();
             }
+            LspStoreEvent::LanguageServerLog(language_server_id, log_type, message) => {
+                self.session
+                    .send(proto::LanguageServerLog {
+                        project_id: REMOTE_SERVER_PROJECT_ID,
+                        language_server_id: language_server_id.to_proto(),
+                        message: message.clone(),
+                        log_type: Some(log_type.to_proto()),
+                    })
+                    .log_err();
+            }
             LspStoreEvent::LanguageServerPrompt(prompt) => {
                 let request = self.session.request(proto::LanguageServerPromptRequest {
                     project_id: REMOTE_SERVER_PROJECT_ID,
@@ -532,31 +509,7 @@ impl HeadlessProject {
         })
     }
 
-    async fn handle_toggle_lsp_logs(
-        _: Entity<Self>,
-        envelope: TypedEnvelope<proto::ToggleLspLogs>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let server_id = LanguageServerId::from_proto(envelope.payload.server_id);
-        let lsp_logs = cx
-            .update(|cx| {
-                cx.try_global::<GlobalLogStore>()
-                    .and_then(|lsp_logs| lsp_logs.0.upgrade())
-            })?
-            .context("lsp logs store is missing")?;
-
-        lsp_logs.update(&mut cx, |lsp_logs, _| {
-            // we do not support any other log toggling yet
-            if envelope.payload.enabled {
-                lsp_logs.enable_rpc_trace_for_language_server(server_id);
-            } else {
-                lsp_logs.disable_rpc_trace_for_language_server(server_id);
-            }
-        })?;
-        Ok(())
-    }
-
-    async fn handle_open_server_settings(
+    pub async fn handle_open_server_settings(
         this: Entity<Self>,
         _: TypedEnvelope<proto::OpenServerSettings>,
         mut cx: AsyncApp,
@@ -609,7 +562,7 @@ impl HeadlessProject {
         })
     }
 
-    async fn handle_find_search_candidates(
+    pub async fn handle_find_search_candidates(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::FindSearchCandidates>,
         mut cx: AsyncApp,
@@ -641,7 +594,7 @@ impl HeadlessProject {
         Ok(response)
     }
 
-    async fn handle_list_remote_directory(
+    pub async fn handle_list_remote_directory(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::ListRemoteDirectory>,
         cx: AsyncApp,
@@ -673,7 +626,7 @@ impl HeadlessProject {
         })
     }
 
-    async fn handle_get_path_metadata(
+    pub async fn handle_get_path_metadata(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::GetPathMetadata>,
         cx: AsyncApp,
@@ -691,7 +644,7 @@ impl HeadlessProject {
         })
     }
 
-    async fn handle_shutdown_remote_server(
+    pub async fn handle_shutdown_remote_server(
         _this: Entity<Self>,
         _envelope: TypedEnvelope<proto::ShutdownRemoteServer>,
         cx: AsyncApp,
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index a071733315..1966755d62 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -30,7 +30,7 @@ pub struct ActiveSettingsProfileName(pub String);
 
 impl Global for ActiveSettingsProfileName {}
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord, serde::Serialize)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
 pub struct WorktreeId(usize);
 
 impl From<WorktreeId> for usize {
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index ce9be0c7ed..869aa5322e 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -13,7 +13,6 @@ path = "src/workspace.rs"
 doctest = false
 
 [features]
-default = ["call"]
 test-support = [
     "call/test-support",
     "client/test-support",
@@ -30,7 +29,7 @@ test-support = [
 any_vec.workspace = true
 anyhow.workspace = true
 async-recursion.workspace = true
-call = { workspace = true, optional = true }
+call.workspace = true
 client.workspace = true
 clock.workspace = true
 collections.workspace = true
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 5c08148031..9c2d09fd26 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -4,14 +4,11 @@ use crate::{
     workspace_settings::{PaneSplitDirectionHorizontal, PaneSplitDirectionVertical},
 };
 use anyhow::Result;
-
-#[cfg(feature = "call")]
 use call::{ActiveCall, ParticipantLocation};
-
 use collections::HashMap;
 use gpui::{
-    Along, AnyView, AnyWeakView, Axis, Bounds, Entity, Hsla, IntoElement, Pixels, Point,
-    StyleRefinement, WeakEntity, Window, point, size,
+    Along, AnyView, AnyWeakView, Axis, Bounds, Entity, Hsla, IntoElement, MouseButton, Pixels,
+    Point, StyleRefinement, WeakEntity, Window, point, size,
 };
 use parking_lot::Mutex;
 use project::Project;
@@ -200,7 +197,6 @@ pub enum Member {
 pub struct PaneRenderContext<'a> {
     pub project: &'a Entity<Project>,
     pub follower_states: &'a HashMap<CollaboratorId, FollowerState>,
-    #[cfg(feature = "call")]
     pub active_call: Option<&'a Entity<ActiveCall>>,
     pub active_pane: &'a Entity<Pane>,
     pub app_state: &'a Arc<AppState>,
@@ -262,11 +258,6 @@ impl PaneLeaderDecorator for PaneRenderContext<'_> {
         let mut leader_color;
         let status_box;
         match leader_id {
-            #[cfg(not(feature = "call"))]
-            CollaboratorId::PeerId(_) => {
-                return LeaderDecoration::default();
-            }
-            #[cfg(feature = "call")]
             CollaboratorId::PeerId(peer_id) => {
                 let Some(leader) = self.active_call.as_ref().and_then(|call| {
                     let room = call.read(cx).room()?.read(cx);
@@ -324,7 +315,7 @@ impl PaneLeaderDecorator for PaneRenderContext<'_> {
                             |this, (leader_project_id, leader_user_id)| {
                                 let app_state = self.app_state.clone();
                                 this.cursor_pointer().on_mouse_down(
-                                    gpui::MouseButton::Left,
+                                    MouseButton::Left,
                                     move |_, _, cx| {
                                         crate::join_in_room_project(
                                             leader_project_id,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index b6577ff325..25e2cb1cfe 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -9,7 +9,6 @@ pub mod pane_group;
 mod path_list;
 mod persistence;
 pub mod searchable;
-#[cfg(feature = "call")]
 pub mod shared_screen;
 mod status_bar;
 pub mod tasks;
@@ -23,17 +22,11 @@ pub use dock::Panel;
 pub use path_list::PathList;
 pub use toast_layer::{ToastAction, ToastLayer, ToastView};
 
-#[cfg(feature = "call")]
-use call::{ActiveCall, call_settings::CallSettings};
-#[cfg(feature = "call")]
-use client::{Status, proto::ErrorCode};
-#[cfg(feature = "call")]
-use shared_screen::SharedScreen;
-
 use anyhow::{Context as _, Result, anyhow};
+use call::{ActiveCall, call_settings::CallSettings};
 use client::{
-    ChannelId, Client, ErrorExt, TypedEnvelope, UserStore,
-    proto::{self, PanelId, PeerId},
+    ChannelId, Client, ErrorExt, Status, TypedEnvelope, UserStore,
+    proto::{self, ErrorCode, PanelId, PeerId},
 };
 use collections::{HashMap, HashSet, hash_map};
 use dock::{Dock, DockPosition, PanelButtons, PanelHandle, RESIZE_HANDLE_SIZE};
@@ -86,6 +79,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
 use settings::{Settings, update_settings_file};
+use shared_screen::SharedScreen;
 use sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
     statement::Statement,
@@ -892,7 +886,6 @@ impl Global for GlobalAppState {}
 
 pub struct WorkspaceStore {
     workspaces: HashSet<WindowHandle<Workspace>>,
-    #[cfg(feature = "call")]
     client: Arc<Client>,
     _subscriptions: Vec<client::Subscription>,
 }
@@ -1124,7 +1117,6 @@ pub struct Workspace {
     window_edited: bool,
     last_window_title: Option<String>,
     dirty_items: HashMap<EntityId, Subscription>,
-    #[cfg(feature = "call")]
     active_call: Option<(Entity<ActiveCall>, Vec<Subscription>)>,
     leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>,
     database_id: Option<WorkspaceId>,
@@ -1166,7 +1158,6 @@ pub struct FollowerState {
 
 struct FollowerView {
     view: Box<dyn FollowableItemHandle>,
-    #[cfg(feature = "call")]
     location: Option<proto::PanelId>,
 }
 
@@ -1366,15 +1357,10 @@ impl Workspace {
 
         let session_id = app_state.session.read(cx).id().to_owned();
 
-        #[cfg(feature = "call")]
         let mut active_call = None;
-        #[cfg(feature = "call")]
-        {
-            if let Some(call) = ActiveCall::try_global(cx) {
-                let subscriptions =
-                    vec![cx.subscribe_in(&call, window, Self::on_active_call_event)];
-                active_call = Some((call, subscriptions));
-            }
+        if let Some(call) = ActiveCall::try_global(cx) {
+            let subscriptions = vec![cx.subscribe_in(&call, window, Self::on_active_call_event)];
+            active_call = Some((call, subscriptions));
         }
 
         let (serializable_items_tx, serializable_items_rx) =
@@ -1460,7 +1446,6 @@ impl Workspace {
             window_edited: false,
             last_window_title: None,
             dirty_items: Default::default(),
-            #[cfg(feature = "call")]
             active_call,
             database_id: workspace_id,
             app_state,
@@ -2265,7 +2250,6 @@ impl Workspace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<bool>> {
-        #[cfg(feature = "call")]
         let active_call = self.active_call().cloned();
 
         // On Linux and Windows, closing the last window should restore the last workspace.
@@ -2274,58 +2258,51 @@ impl Workspace {
             && cx.windows().len() == 1;
 
         cx.spawn_in(window, async move |this, cx| {
-            #[cfg(feature = "call")]
-            {
-                let workspace_count = cx.update(|_window, cx| {
-                    cx.windows()
-                        .iter()
-                        .filter(|window| window.downcast::<Workspace>().is_some())
-                        .count()
-                })?;
-                if let Some(active_call) = active_call
-                    && workspace_count == 1
-                    && active_call.read_with(cx, |call, _| call.room().is_some())?
-                {
-                    if close_intent == CloseIntent::CloseWindow {
-                        let answer = cx.update(|window, cx| {
-                            window.prompt(
-                                PromptLevel::Warning,
-                                "Do you want to leave the current call?",
-                                None,
-                                &["Close window and hang up", "Cancel"],
-                                cx,
-                            )
-                        })?;
+            let workspace_count = cx.update(|_window, cx| {
+                cx.windows()
+                    .iter()
+                    .filter(|window| window.downcast::<Workspace>().is_some())
+                    .count()
+            })?;
 
-                        if answer.await.log_err() == Some(1) {
-                            return anyhow::Ok(false);
-                        } else {
-                            {
-                                active_call
-                                    .update(cx, |call, cx| call.hang_up(cx))?
-                                    .await
-                                    .log_err();
-                            }
-                        }
+            if let Some(active_call) = active_call
+                && workspace_count == 1
+                && active_call.read_with(cx, |call, _| call.room().is_some())?
+            {
+                if close_intent == CloseIntent::CloseWindow {
+                    let answer = cx.update(|window, cx| {
+                        window.prompt(
+                            PromptLevel::Warning,
+                            "Do you want to leave the current call?",
+                            None,
+                            &["Close window and hang up", "Cancel"],
+                            cx,
+                        )
+                    })?;
+
+                    if answer.await.log_err() == Some(1) {
+                        return anyhow::Ok(false);
+                    } else {
+                        active_call
+                            .update(cx, |call, cx| call.hang_up(cx))?
+                            .await
+                            .log_err();
                     }
-                    if close_intent == CloseIntent::ReplaceWindow {
-                        #[cfg(feature = "call")]
-                        {
-                            _ = active_call.update(cx, |active_call, cx| {
-                                let workspace = cx
-                                    .windows()
-                                    .iter()
-                                    .filter_map(|window| window.downcast::<Workspace>())
-                                    .next()
-                                    .unwrap();
-                                let project = workspace.read(cx)?.project.clone();
-                                if project.read(cx).is_shared() {
-                                    active_call.unshare_project(project, cx)?;
-                                }
-                                anyhow::Ok(())
-                            })?;
+                }
+                if close_intent == CloseIntent::ReplaceWindow {
+                    _ = active_call.update(cx, |this, cx| {
+                        let workspace = cx
+                            .windows()
+                            .iter()
+                            .filter_map(|window| window.downcast::<Workspace>())
+                            .next()
+                            .unwrap();
+                        let project = workspace.read(cx)?.project.clone();
+                        if project.read(cx).is_shared() {
+                            this.unshare_project(project, cx)?;
                         }
-                    }
+                        Ok::<_, anyhow::Error>(())
+                    })?;
                 }
             }
 
@@ -3509,7 +3486,6 @@ impl Workspace {
         item
     }
 
-    #[cfg(feature = "call")]
     pub fn open_shared_screen(
         &mut self,
         peer_id: PeerId,
@@ -3931,11 +3907,8 @@ impl Workspace {
                 pane.update(cx, |pane, _| {
                     pane.track_alternate_file_items();
                 });
-                #[cfg(feature = "call")]
-                {
-                    if *local {
-                        self.unfollow_in_pane(pane, window, cx);
-                    }
+                if *local {
+                    self.unfollow_in_pane(pane, window, cx);
                 }
                 serialize_workspace = *focus_changed || pane != self.active_pane();
                 if pane == self.active_pane() {
@@ -4000,17 +3973,6 @@ impl Workspace {
         }
     }
 
-    #[cfg(not(feature = "call"))]
-    pub fn unfollow_in_pane(
-        &mut self,
-        _pane: &Entity<Pane>,
-        _window: &mut Window,
-        _cx: &mut Context<Workspace>,
-    ) -> Option<CollaboratorId> {
-        None
-    }
-
-    #[cfg(feature = "call")]
     pub fn unfollow_in_pane(
         &mut self,
         pane: &Entity<Pane>,
@@ -4160,7 +4122,6 @@ impl Workspace {
         cx.notify();
     }
 
-    #[cfg(feature = "call")]
     pub fn start_following(
         &mut self,
         leader_id: impl Into<CollaboratorId>,
@@ -4224,16 +4185,6 @@ impl Workspace {
         }
     }
 
-    #[cfg(not(feature = "call"))]
-    pub fn follow_next_collaborator(
-        &mut self,
-        _: &FollowNextCollaborator,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    #[cfg(feature = "call")]
     pub fn follow_next_collaborator(
         &mut self,
         _: &FollowNextCollaborator,
@@ -4282,16 +4233,6 @@ impl Workspace {
         }
     }
 
-    #[cfg(not(feature = "call"))]
-    pub fn follow(
-        &mut self,
-        _leader_id: impl Into<CollaboratorId>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    #[cfg(feature = "call")]
     pub fn follow(
         &mut self,
         leader_id: impl Into<CollaboratorId>,
@@ -4344,17 +4285,6 @@ impl Workspace {
         }
     }
 
-    #[cfg(not(feature = "call"))]
-    pub fn unfollow(
-        &mut self,
-        _leader_id: impl Into<CollaboratorId>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<()> {
-        None
-    }
-
-    #[cfg(feature = "call")]
     pub fn unfollow(
         &mut self,
         leader_id: impl Into<CollaboratorId>,
@@ -4665,7 +4595,6 @@ impl Workspace {
             anyhow::bail!("no id for view");
         };
         let id = ViewId::from_proto(id)?;
-        #[cfg(feature = "call")]
         let panel_id = view.panel_id.and_then(proto::PanelId::from_i32);
 
         let pane = this.update(cx, |this, _cx| {
@@ -4738,7 +4667,6 @@ impl Workspace {
                 id,
                 FollowerView {
                     view: item,
-                    #[cfg(feature = "call")]
                     location: panel_id,
                 },
             );
@@ -4793,7 +4721,6 @@ impl Workspace {
                     view.map(|view| {
                         entry.insert(FollowerView {
                             view,
-                            #[cfg(feature = "call")]
                             location: None,
                         })
                     })
@@ -4984,17 +4911,6 @@ impl Workspace {
         )
     }
 
-    #[cfg(not(feature = "call"))]
-    fn active_item_for_peer(
-        &self,
-        _peer_id: PeerId,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<(Option<PanelId>, Box<dyn ItemHandle>)> {
-        None
-    }
-
-    #[cfg(feature = "call")]
     fn active_item_for_peer(
         &self,
         peer_id: PeerId,
@@ -5036,7 +4952,6 @@ impl Workspace {
         item_to_activate
     }
 
-    #[cfg(feature = "call")]
     fn shared_screen_for_peer(
         &self,
         peer_id: PeerId,
@@ -5087,12 +5002,10 @@ impl Workspace {
         }
     }
 
-    #[cfg(feature = "call")]
     pub fn active_call(&self) -> Option<&Entity<ActiveCall>> {
         self.active_call.as_ref().map(|(call, _)| call)
     }
 
-    #[cfg(feature = "call")]
     fn on_active_call_event(
         &mut self,
         _: &Entity<ActiveCall>,
@@ -6005,17 +5918,6 @@ impl Workspace {
     }
 }
 
-#[cfg(not(feature = "call"))]
-fn leader_border_for_pane(
-    _follower_states: &HashMap<CollaboratorId, FollowerState>,
-    _pane: &Entity<Pane>,
-    _: &Window,
-    _cx: &App,
-) -> Option<Div> {
-    None
-}
-
-#[cfg(feature = "call")]
 fn leader_border_for_pane(
     follower_states: &HashMap<CollaboratorId, FollowerState>,
     pane: &Entity<Pane>,
@@ -6482,7 +6384,6 @@ impl Render for Workspace {
                                                                         &PaneRenderContext {
                                                                             follower_states:
                                                                                 &self.follower_states,
-                                                                            #[cfg(feature = "call")]
                                                                             active_call: self.active_call(),
                                                                             active_pane: &self.active_pane,
                                                                             app_state: &self.app_state,
@@ -6547,7 +6448,6 @@ impl Render for Workspace {
                                                                                 &PaneRenderContext {
                                                                                     follower_states:
                                                                                         &self.follower_states,
-                                                                                    #[cfg(feature = "call")]
                                                                                     active_call: self.active_call(),
                                                                                     active_pane: &self.active_pane,
                                                                                     app_state: &self.app_state,
@@ -6610,7 +6510,6 @@ impl Render for Workspace {
                                                                                 &PaneRenderContext {
                                                                                     follower_states:
                                                                                         &self.follower_states,
-                                                                                    #[cfg(feature = "call")]
                                                                                     active_call: self.active_call(),
                                                                                     active_pane: &self.active_pane,
                                                                                     app_state: &self.app_state,
@@ -6659,7 +6558,6 @@ impl Render for Workspace {
                                                                 &PaneRenderContext {
                                                                     follower_states:
                                                                         &self.follower_states,
-                                                                    #[cfg(feature = "call")]
                                                                     active_call: self.active_call(),
                                                                     active_pane: &self.active_pane,
                                                                     app_state: &self.app_state,
@@ -6733,22 +6631,10 @@ impl WorkspaceStore {
                 client.add_request_handler(cx.weak_entity(), Self::handle_follow),
                 client.add_message_handler(cx.weak_entity(), Self::handle_update_followers),
             ],
-            #[cfg(feature = "call")]
             client,
         }
     }
 
-    #[cfg(not(feature = "call"))]
-    pub fn update_followers(
-        &self,
-        _project_id: Option<u64>,
-        _update: proto::update_followers::Variant,
-        _cx: &App,
-    ) -> Option<()> {
-        None
-    }
-
-    #[cfg(feature = "call")]
     pub fn update_followers(
         &self,
         project_id: Option<u64>,
@@ -6914,7 +6800,6 @@ actions!(
     ]
 );
 
-#[cfg(feature = "call")]
 async fn join_channel_internal(
     channel_id: ChannelId,
     app_state: &Arc<AppState>,
@@ -7062,17 +6947,6 @@ async fn join_channel_internal(
     anyhow::Ok(false)
 }
 
-#[cfg(not(feature = "call"))]
-pub fn join_channel(
-    _channel_id: ChannelId,
-    _app_state: Arc<AppState>,
-    _requesting_window: Option<WindowHandle<Workspace>>,
-    _cx: &mut App,
-) -> Task<Result<()>> {
-    Task::ready(Ok(()))
-}
-
-#[cfg(feature = "call")]
 pub fn join_channel(
     channel_id: ChannelId,
     app_state: Arc<AppState>,
@@ -7580,17 +7454,6 @@ fn serialize_ssh_project(
     })
 }
 
-#[cfg(not(feature = "call"))]
-pub fn join_in_room_project(
-    _project_id: u64,
-    _follow_user_id: u64,
-    _app_state: Arc<AppState>,
-    _cx: &mut App,
-) -> Task<Result<()>> {
-    Task::ready(Ok(()))
-}
-
-#[cfg(feature = "call")]
 pub fn join_in_room_project(
     project_id: u64,
     follow_user_id: u64,

From 8af212e7853f88bd193d27e334f94bfc8d8bc5d1 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Wed, 27 Aug 2025 18:34:14 -0600
Subject: [PATCH 419/823] Fix watching of Git repo in presence of scanner
 restarts (#37052)

The scanner is restarted after loading initial settings, and there was
an optimization to not re-discover and re-watch git repositories if they
already exist in the snapshot. #35865 added cleanup of watches that
occurred when the scanner restarts, and so in some cases repos were no
longer watched.

Release Notes:

- Linux: Fixed a case where Git repositories might not be watched for
changes, causing branch switching to not update the UI.

Co-authored-by: Julia <julia@zed.dev>
---
 crates/worktree/src/worktree.rs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index cf61ee2669..845af53802 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -3151,16 +3151,6 @@ impl BackgroundScannerState {
             .work_directory_abs_path(&work_directory)
             .log_err()?;
 
-        if self
-            .snapshot
-            .git_repositories
-            .get(&work_dir_entry.id)
-            .is_some()
-        {
-            log::trace!("existing git repository for {work_directory:?}");
-            return None;
-        }
-
         let dot_git_abs_path: Arc<Path> = self
             .snapshot
             .abs_path

From 4e1a9010590d68b5bc97ecb4424cb73eb6e3f780 Mon Sep 17 00:00:00 2001
From: Romans Malinovskis <me@nearly.guru>
Date: Thu, 28 Aug 2025 02:25:00 +0100
Subject: [PATCH 420/823] helix: Improve "x" behavior (#35611)

Closes #32020

Release Notes:
- Helix: Improve `x` behaviour. Will respect modifiers (`5 x`). Pressing
`x` on a empty line, will select current+next line, because helix
considers current line to be already selected without the need of
pressing `x`.
---
 assets/keymaps/vim.json |   2 +-
 crates/vim/src/helix.rs | 188 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 187 insertions(+), 3 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 67add61bd3..0a88baee02 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -435,7 +435,7 @@
       "g b": "vim::WindowBottom",
 
       "shift-r": "editor::Paste",
-      "x": "editor::SelectLine",
+      "x": "vim::HelixSelectLine",
       "shift-x": "editor::SelectLine",
       "%": "editor::SelectAll",
       // Window mode
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 726022021d..abde3a8ce6 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -1,8 +1,10 @@
 use editor::display_map::DisplaySnapshot;
-use editor::{DisplayPoint, Editor, SelectionEffects, ToOffset, ToPoint, movement};
+use editor::{
+    DisplayPoint, Editor, HideMouseCursorOrigin, SelectionEffects, ToOffset, ToPoint, movement,
+};
 use gpui::{Action, actions};
 use gpui::{Context, Window};
-use language::{CharClassifier, CharKind};
+use language::{CharClassifier, CharKind, Point};
 use text::{Bias, SelectionGoal};
 
 use crate::motion;
@@ -25,11 +27,14 @@ actions!(
         HelixAppend,
         /// Goes to the location of the last modification.
         HelixGotoLastModification,
+        /// Select entire line or multiple lines, extending downwards.
+        HelixSelectLine,
     ]
 );
 
 pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
     Vim::action(editor, cx, Vim::helix_normal_after);
+    Vim::action(editor, cx, Vim::helix_select_lines);
     Vim::action(editor, cx, Vim::helix_insert);
     Vim::action(editor, cx, Vim::helix_append);
     Vim::action(editor, cx, Vim::helix_yank);
@@ -442,6 +447,47 @@ impl Vim {
     ) {
         self.jump(".".into(), false, false, window, cx);
     }
+
+    pub fn helix_select_lines(
+        &mut self,
+        _: &HelixSelectLine,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let count = Vim::take_count(cx).unwrap_or(1);
+        self.update_editor(cx, |_, editor, cx| {
+            editor.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
+            let display_map = editor.display_map.update(cx, |map, cx| map.snapshot(cx));
+            let mut selections = editor.selections.all::<Point>(cx);
+            let max_point = display_map.buffer_snapshot.max_point();
+            let buffer_snapshot = &display_map.buffer_snapshot;
+
+            for selection in &mut selections {
+                // Start always goes to column 0 of the first selected line
+                let start_row = selection.start.row;
+                let current_end_row = selection.end.row;
+
+                // Check if cursor is on empty line by checking first character
+                let line_start_offset = buffer_snapshot.point_to_offset(Point::new(start_row, 0));
+                let first_char = buffer_snapshot.chars_at(line_start_offset).next();
+                let extra_line = if first_char == Some('\n') { 1 } else { 0 };
+
+                let end_row = current_end_row + count as u32 + extra_line;
+
+                selection.start = Point::new(start_row, 0);
+                selection.end = if end_row > max_point.row {
+                    max_point
+                } else {
+                    Point::new(end_row, 0)
+                };
+                selection.reversed = false;
+            }
+
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.select(selections);
+            });
+        });
+    }
 }
 
 #[cfg(test)]
@@ -850,4 +896,142 @@ mod test {
             Mode::HelixNormal,
         );
     }
+
+    #[gpui::test]
+    async fn test_helix_select_lines(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.set_state(
+            "line one\nline ˇtwo\nline three\nline four",
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("2 x");
+        cx.assert_state(
+            "line one\n«line two\nline three\nˇ»line four",
+            Mode::HelixNormal,
+        );
+
+        // Test extending existing line selection
+        cx.set_state(
+            indoc! {"
+            li«ˇne one
+            li»ne two
+            line three
+            line four"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("x");
+        cx.assert_state(
+            indoc! {"
+            «line one
+            line two
+            ˇ»line three
+            line four"},
+            Mode::HelixNormal,
+        );
+
+        // Pressing x in empty line, select next line (because helix considers cursor a selection)
+        cx.set_state(
+            indoc! {"
+            line one
+            ˇ
+            line three
+            line four"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("x");
+        cx.assert_state(
+            indoc! {"
+            line one
+            «
+            line three
+            ˇ»line four"},
+            Mode::HelixNormal,
+        );
+
+        // Empty line with count selects extra + count lines
+        cx.set_state(
+            indoc! {"
+            line one
+            ˇ
+            line three
+            line four
+            line five"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("2 x");
+        cx.assert_state(
+            indoc! {"
+            line one
+            «
+            line three
+            line four
+            ˇ»line five"},
+            Mode::HelixNormal,
+        );
+
+        // Compare empty vs non-empty line behavior
+        cx.set_state(
+            indoc! {"
+            ˇnon-empty line
+            line two
+            line three"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("x");
+        cx.assert_state(
+            indoc! {"
+            «non-empty line
+            ˇ»line two
+            line three"},
+            Mode::HelixNormal,
+        );
+
+        // Same test but with empty line - should select one extra
+        cx.set_state(
+            indoc! {"
+            ˇ
+            line two
+            line three"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("x");
+        cx.assert_state(
+            indoc! {"
+            «
+            line two
+            ˇ»line three"},
+            Mode::HelixNormal,
+        );
+
+        // Test selecting multiple lines with count
+        cx.set_state(
+            indoc! {"
+            ˇline one
+            line two
+            line threeˇ
+            line four
+            line five"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("x");
+        cx.assert_state(
+            indoc! {"
+            «line one
+            ˇ»line two
+            «line three
+            ˇ»line four
+            line five"},
+            Mode::HelixNormal,
+        );
+        cx.simulate_keystrokes("x");
+        cx.assert_state(
+            indoc! {"
+            «line one
+            line two
+            line three
+            line four
+            ˇ»line five"},
+            Mode::HelixNormal,
+        );
+    }
 }

From 0a9f40787216f18ee2f4dc79211877d1af496284 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Thu, 28 Aug 2025 02:27:02 +0100
Subject: [PATCH 421/823] search: Add support for case-sensitivity pattern
 items (#34762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This Pull Request introduces support for pattern items in the buffer
search. It does so by splitting the `query` methods into two new
methods:

- `BufferSearchBar.raw_query` – returns the text from the search query
editor
- `BufferSearchBar.query` - returns the search query with pattern items
removed

Whenever the search query is updated, processing of the
`EditorEvent::Edited` event ends up calling the
`BufferSearchBar.apply_pattern_items` method, which parses the pattern
items from the raw query, and updates the buffer search bar's search
options accordingly. This `apply_pattern_items` function avoids updating
the `BufferSearchBar.default_options` field in order to be able to reset
the search options when a pattern items is removed. Lastly, new pattern
items can easily be added by updating the `PATTERN_ITEMS` array.

### Screen Capture


https://github.com/user-attachments/assets/ebd83c38-e480-4c24-9b8c-6edde69cf392

---

Closes #32390

Release Notes:

- Added support for the `\c` and `\C` query pattern items to control
case-sensitivity in buffer search

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/project/src/search.rs        | 132 +++++++++++++++++++++++++++-
 crates/search/src/buffer_search.rs  |  21 +++--
 crates/search/src/project_search.rs |   2 +-
 3 files changed, 146 insertions(+), 9 deletions(-)

diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index ee216a9976..f2c6091e0c 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -143,7 +143,7 @@ impl SearchQuery {
     pub fn regex(
         query: impl ToString,
         whole_word: bool,
-        case_sensitive: bool,
+        mut case_sensitive: bool,
         include_ignored: bool,
         one_match_per_line: bool,
         files_to_include: PathMatcher,
@@ -153,6 +153,14 @@ impl SearchQuery {
     ) -> Result<Self> {
         let mut query = query.to_string();
         let initial_query = Arc::from(query.as_str());
+
+        if let Some((case_sensitive_from_pattern, new_query)) =
+            Self::case_sensitive_from_pattern(&query)
+        {
+            case_sensitive = case_sensitive_from_pattern;
+            query = new_query
+        }
+
         if whole_word {
             let mut word_query = String::new();
             if let Some(first) = query.get(0..1)
@@ -192,6 +200,45 @@ impl SearchQuery {
         })
     }
 
+    /// Extracts case sensitivity settings from pattern items in the provided
+    /// query and returns the same query, with the pattern items removed.
+    ///
+    /// The following pattern modifiers are supported:
+    ///
+    /// - `\c` (case_sensitive: false)
+    /// - `\C` (case_sensitive: true)
+    ///
+    /// If no pattern item were found, `None` will be returned.
+    fn case_sensitive_from_pattern(query: &str) -> Option<(bool, String)> {
+        if !(query.contains("\\c") || query.contains("\\C")) {
+            return None;
+        }
+
+        let mut was_escaped = false;
+        let mut new_query = String::new();
+        let mut is_case_sensitive = None;
+
+        for c in query.chars() {
+            if was_escaped {
+                if c == 'c' {
+                    is_case_sensitive = Some(false);
+                } else if c == 'C' {
+                    is_case_sensitive = Some(true);
+                } else {
+                    new_query.push('\\');
+                    new_query.push(c);
+                }
+                was_escaped = false
+            } else if c == '\\' {
+                was_escaped = true
+            } else {
+                new_query.push(c);
+            }
+        }
+
+        is_case_sensitive.map(|c| (c, new_query))
+    }
+
     pub fn from_proto(message: proto::SearchQuery) -> Result<Self> {
         let files_to_include = if message.files_to_include.is_empty() {
             message
@@ -596,4 +643,87 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_case_sensitive_pattern_items() {
+        let case_sensitive = false;
+        let search_query = SearchQuery::regex(
+            "test\\C",
+            false,
+            case_sensitive,
+            false,
+            false,
+            Default::default(),
+            Default::default(),
+            false,
+            None,
+        )
+        .expect("Should be able to create a regex SearchQuery");
+
+        assert_eq!(
+            search_query.case_sensitive(),
+            true,
+            "Case sensitivity should be enabled when \\C pattern item is present in the query."
+        );
+
+        let case_sensitive = true;
+        let search_query = SearchQuery::regex(
+            "test\\c",
+            true,
+            case_sensitive,
+            false,
+            false,
+            Default::default(),
+            Default::default(),
+            false,
+            None,
+        )
+        .expect("Should be able to create a regex SearchQuery");
+
+        assert_eq!(
+            search_query.case_sensitive(),
+            false,
+            "Case sensitivity should be disabled when \\c pattern item is present, even if initially set to true."
+        );
+
+        let case_sensitive = false;
+        let search_query = SearchQuery::regex(
+            "test\\c\\C",
+            false,
+            case_sensitive,
+            false,
+            false,
+            Default::default(),
+            Default::default(),
+            false,
+            None,
+        )
+        .expect("Should be able to create a regex SearchQuery");
+
+        assert_eq!(
+            search_query.case_sensitive(),
+            true,
+            "Case sensitivity should be enabled when \\C is the last pattern item, even after a \\c."
+        );
+
+        let case_sensitive = false;
+        let search_query = SearchQuery::regex(
+            "tests\\\\C",
+            false,
+            case_sensitive,
+            false,
+            false,
+            Default::default(),
+            Default::default(),
+            false,
+            None,
+        )
+        .expect("Should be able to create a regex SearchQuery");
+
+        assert_eq!(
+            search_query.case_sensitive(),
+            false,
+            "Case sensitivity should not be enabled when \\C pattern item is preceded by a backslash."
+        );
+    }
 }
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index b2096d48ef..92992dced6 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -1516,18 +1516,25 @@ mod tests {
                 cx,
             )
         });
-        let cx = cx.add_empty_window();
-        let editor =
-            cx.new_window_entity(|window, cx| Editor::for_buffer(buffer.clone(), None, window, cx));
-
-        let search_bar = cx.new_window_entity(|window, cx| {
+        let mut editor = None;
+        let window = cx.add_window(|window, cx| {
+            let default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
+                "keymaps/default-macos.json",
+                cx,
+            )
+            .unwrap();
+            cx.bind_keys(default_key_bindings);
+            editor = Some(cx.new(|cx| Editor::for_buffer(buffer.clone(), None, window, cx)));
             let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
+            search_bar.set_active_pane_item(Some(&editor.clone().unwrap()), window, cx);
             search_bar.show(window, cx);
             search_bar
         });
+        let search_bar = window.root(cx).unwrap();
 
-        (editor, search_bar, cx)
+        let cx = VisualTestContext::from_window(*window, cx).into_mut();
+
+        (editor.unwrap(), search_bar, cx)
     }
 
     #[gpui::test]
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 8ac12588af..1ee959f111 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1139,7 +1139,7 @@ impl ProjectSearchView {
 
     fn build_search_query(&mut self, cx: &mut Context<Self>) -> Option<SearchQuery> {
         // Do not bail early in this function, as we want to fill out `self.panels_with_errors`.
-        let text = self.query_editor.read(cx).text(cx);
+        let text = self.search_query_text(cx);
         let open_buffers = if self.included_opened_only {
             Some(self.open_buffers(cx))
         } else {

From 78c2f1621d1ce84a745d9c1aec4177bcab6f4f03 Mon Sep 17 00:00:00 2001
From: Gaauwe Rombouts <gromdroid@gmail.com>
Date: Thu, 28 Aug 2025 05:51:22 +0200
Subject: [PATCH 422/823] Add macOS window tabs (#33334)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/zed-industries/zed/issues/14722
Closes https://github.com/zed-industries/zed/issues/4948
Closes https://github.com/zed-industries/zed/issues/7136

Follow up of https://github.com/zed-industries/zed/pull/20557 and
https://github.com/zed-industries/zed/pull/32238.

Based on the discussions in the previous PRs and the pairing session
with @ConradIrwin I've decided to rewrite it from scratch, to properly
incorporate all the requirements. The feature is opt-in, the settings is
set to false by default. Once enabled via the Zed settings, it will
behave according to the user’s system preference, without requiring a
restart — the next window opened will adopt the new behavior (similar to
Ghostty).

I’m not entirely sure if the changes to the Window class are the best
approach. I’ve tried to keep things flexible enough that other
applications built with GPUI won’t be affected (while giving them the
option to still use it), but I’d appreciate input on whether this
direction makes sense long-term.



https://github.com/user-attachments/assets/9573e094-4394-41ad-930c-5375a8204cbf

### Features
* System-aware tabbing behavior
* Respects the three system modes: Always, Never, and Fullscreen
(default on macOS)
* Changing the Zed setting does not require a restart — the next window
reflects the change
* Full theme support
    * Integrates with light and dark themes
* [One
Dark](https://github.com/user-attachments/assets/d1f55ff7-2339-4b09-9faf-d3d610ba7ca2)
* [One
Light](https://github.com/user-attachments/assets/7776e30c-2686-493e-9598-cdcd7e476ecf)
    * Supports opaque/blurred/transparent themes as best as possible
* [One Dark -
blurred](https://github.com/user-attachments/assets/c4521311-66cb-4cee-9e37-15146f6869aa)
* Dynamic layout adjustments
    * Only reserves tab bar space when tabs are actually visible
* [With
tabs](https://github.com/user-attachments/assets/3b6db943-58c5-4f55-bdf4-33d23ca7d820)
* [Without
tabs](https://github.com/user-attachments/assets/2d175959-5efc-4e4f-a15c-0108925c582e)
* VS Code compatibility
* Supports the `window.nativeTabs` setting in the VS Code settings
importer
* Command palette integration
    * Adds commands for managing tabs to the command palette
* These can be assigned to keyboard shortcuts as well, but didn't add
defaults as to not reserve precious default key combinations

Happy to pair again if things can be improved codewise, or if
explanations are necessary for certain choices!



Release Notes:
* Added support for native macOS window tabbing. When you set
`"use_system_window_tabs": true`, Zed will merge windows in the same was
as macOS: by default this happens only when full screened, but you can
adjust your macOS settings to have this happen on all windows.

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/settings/default.json                 |   2 +
 crates/agent_ui/src/ui/agent_notification.rs |   1 +
 crates/collab_ui/src/collab_ui.rs            |   1 +
 crates/gpui/examples/window_positioning.rs   |   1 +
 crates/gpui/src/app.rs                       | 305 +++++++++++-
 crates/gpui/src/platform.rs                  |  27 +-
 crates/gpui/src/platform/mac/window.rs       | 337 ++++++++++++-
 crates/gpui/src/window.rs                    | 118 ++++-
 crates/rules_library/src/rules_library.rs    |   2 +-
 crates/title_bar/src/platform_title_bar.rs   |  22 +-
 crates/title_bar/src/system_window_tabs.rs   | 477 +++++++++++++++++++
 crates/title_bar/src/title_bar.rs            |   5 +-
 crates/workspace/src/workspace.rs            |  67 ++-
 crates/workspace/src/workspace_settings.rs   |   7 +
 crates/zed/src/main.rs                       |  19 +-
 crates/zed/src/zed.rs                        |   8 +
 docs/src/configuring-zed.md                  |  10 +
 17 files changed, 1357 insertions(+), 52 deletions(-)
 create mode 100644 crates/title_bar/src/system_window_tabs.rs

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 804198090f..ef57412842 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -363,6 +363,8 @@
     // Whether to show code action buttons in the editor toolbar.
     "code_actions": false
   },
+  // Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
+  "use_system_window_tabs": false,
   // Titlebar related settings
   "title_bar": {
     // Whether to show the branch icon beside branch switcher in the titlebar.
diff --git a/crates/agent_ui/src/ui/agent_notification.rs b/crates/agent_ui/src/ui/agent_notification.rs
index b2342a87b5..af2a022f14 100644
--- a/crates/agent_ui/src/ui/agent_notification.rs
+++ b/crates/agent_ui/src/ui/agent_notification.rs
@@ -62,6 +62,7 @@ impl AgentNotification {
             app_id: Some(app_id.to_owned()),
             window_min_size: None,
             window_decorations: Some(WindowDecorations::Client),
+            tabbing_identifier: None,
             ..Default::default()
         }
     }
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index a49e38a8dd..b369d324ad 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -66,6 +66,7 @@ fn notification_window_options(
         app_id: Some(app_id.to_owned()),
         window_min_size: None,
         window_decorations: Some(WindowDecorations::Client),
+        tabbing_identifier: None,
         ..Default::default()
     }
 }
diff --git a/crates/gpui/examples/window_positioning.rs b/crates/gpui/examples/window_positioning.rs
index 8180104e1e..ca6cd535d6 100644
--- a/crates/gpui/examples/window_positioning.rs
+++ b/crates/gpui/examples/window_positioning.rs
@@ -62,6 +62,7 @@ fn build_window_options(display_id: DisplayId, bounds: Bounds<Pixels>) -> Window
         app_id: None,
         window_min_size: None,
         window_decorations: None,
+        tabbing_identifier: None,
         ..Default::default()
     }
 }
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index b59d7e717a..669a95bd91 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -7,7 +7,7 @@ use std::{
     path::{Path, PathBuf},
     rc::{Rc, Weak},
     sync::{Arc, atomic::Ordering::SeqCst},
-    time::Duration,
+    time::{Duration, Instant},
 };
 
 use anyhow::{Context as _, Result, anyhow};
@@ -17,6 +17,7 @@ use futures::{
     channel::oneshot,
     future::{LocalBoxFuture, Shared},
 };
+use itertools::Itertools;
 use parking_lot::RwLock;
 use slotmap::SlotMap;
 
@@ -39,8 +40,8 @@ use crate::{
     Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
     PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper, Point, PromptBuilder,
     PromptButton, PromptHandle, PromptLevel, Render, RenderImage, RenderablePromptHandle,
-    Reservation, ScreenCaptureSource, SubscriberSet, Subscription, SvgRenderer, Task, TextSystem,
-    Window, WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
+    Reservation, ScreenCaptureSource, SharedString, SubscriberSet, Subscription, SvgRenderer, Task,
+    TextSystem, Window, WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
     colors::{Colors, GlobalColors},
     current_platform, hash, init_app_menus,
 };
@@ -237,6 +238,303 @@ type WindowClosedHandler = Box<dyn FnMut(&mut App)>;
 type ReleaseListener = Box<dyn FnOnce(&mut dyn Any, &mut App) + 'static>;
 type NewEntityListener = Box<dyn FnMut(AnyEntity, &mut Option<&mut Window>, &mut App) + 'static>;
 
+#[doc(hidden)]
+#[derive(Clone, PartialEq, Eq)]
+pub struct SystemWindowTab {
+    pub id: WindowId,
+    pub title: SharedString,
+    pub handle: AnyWindowHandle,
+    pub last_active_at: Instant,
+}
+
+impl SystemWindowTab {
+    /// Create a new instance of the window tab.
+    pub fn new(title: SharedString, handle: AnyWindowHandle) -> Self {
+        Self {
+            id: handle.id,
+            title,
+            handle,
+            last_active_at: Instant::now(),
+        }
+    }
+}
+
+/// A controller for managing window tabs.
+#[derive(Default)]
+pub struct SystemWindowTabController {
+    visible: Option<bool>,
+    tab_groups: FxHashMap<usize, Vec<SystemWindowTab>>,
+}
+
+impl Global for SystemWindowTabController {}
+
+impl SystemWindowTabController {
+    /// Create a new instance of the window tab controller.
+    pub fn new() -> Self {
+        Self {
+            visible: None,
+            tab_groups: FxHashMap::default(),
+        }
+    }
+
+    /// Initialize the global window tab controller.
+    pub fn init(cx: &mut App) {
+        cx.set_global(SystemWindowTabController::new());
+    }
+
+    /// Get all tab groups.
+    pub fn tab_groups(&self) -> &FxHashMap<usize, Vec<SystemWindowTab>> {
+        &self.tab_groups
+    }
+
+    /// Get the next tab group window handle.
+    pub fn get_next_tab_group_window(cx: &mut App, id: WindowId) -> Option<&AnyWindowHandle> {
+        let controller = cx.global::<SystemWindowTabController>();
+        let current_group = controller
+            .tab_groups
+            .iter()
+            .find_map(|(group, tabs)| tabs.iter().find(|tab| tab.id == id).map(|_| group));
+
+        let current_group = current_group?;
+        let mut group_ids: Vec<_> = controller.tab_groups.keys().collect();
+        let idx = group_ids.iter().position(|g| *g == current_group)?;
+        let next_idx = (idx + 1) % group_ids.len();
+
+        controller
+            .tab_groups
+            .get(group_ids[next_idx])
+            .and_then(|tabs| {
+                tabs.iter()
+                    .max_by_key(|tab| tab.last_active_at)
+                    .or_else(|| tabs.first())
+                    .map(|tab| &tab.handle)
+            })
+    }
+
+    /// Get the previous tab group window handle.
+    pub fn get_prev_tab_group_window(cx: &mut App, id: WindowId) -> Option<&AnyWindowHandle> {
+        let controller = cx.global::<SystemWindowTabController>();
+        let current_group = controller
+            .tab_groups
+            .iter()
+            .find_map(|(group, tabs)| tabs.iter().find(|tab| tab.id == id).map(|_| group));
+
+        let current_group = current_group?;
+        let mut group_ids: Vec<_> = controller.tab_groups.keys().collect();
+        let idx = group_ids.iter().position(|g| *g == current_group)?;
+        let prev_idx = if idx == 0 {
+            group_ids.len() - 1
+        } else {
+            idx - 1
+        };
+
+        controller
+            .tab_groups
+            .get(group_ids[prev_idx])
+            .and_then(|tabs| {
+                tabs.iter()
+                    .max_by_key(|tab| tab.last_active_at)
+                    .or_else(|| tabs.first())
+                    .map(|tab| &tab.handle)
+            })
+    }
+
+    /// Get all tabs in the same window.
+    pub fn tabs(&self, id: WindowId) -> Option<&Vec<SystemWindowTab>> {
+        let tab_group = self
+            .tab_groups
+            .iter()
+            .find_map(|(group, tabs)| tabs.iter().find(|tab| tab.id == id).map(|_| *group));
+
+        if let Some(tab_group) = tab_group {
+            self.tab_groups.get(&tab_group)
+        } else {
+            None
+        }
+    }
+
+    /// Initialize the visibility of the system window tab controller.
+    pub fn init_visible(cx: &mut App, visible: bool) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        if controller.visible.is_none() {
+            controller.visible = Some(visible);
+        }
+    }
+
+    /// Get the visibility of the system window tab controller.
+    pub fn is_visible(&self) -> bool {
+        self.visible.unwrap_or(false)
+    }
+
+    /// Set the visibility of the system window tab controller.
+    pub fn set_visible(cx: &mut App, visible: bool) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        controller.visible = Some(visible);
+    }
+
+    /// Update the last active of a window.
+    pub fn update_last_active(cx: &mut App, id: WindowId) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        for windows in controller.tab_groups.values_mut() {
+            for tab in windows.iter_mut() {
+                if tab.id == id {
+                    tab.last_active_at = Instant::now();
+                }
+            }
+        }
+    }
+
+    /// Update the position of a tab within its group.
+    pub fn update_tab_position(cx: &mut App, id: WindowId, ix: usize) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        for (_, windows) in controller.tab_groups.iter_mut() {
+            if let Some(current_pos) = windows.iter().position(|tab| tab.id == id) {
+                if ix < windows.len() && current_pos != ix {
+                    let window_tab = windows.remove(current_pos);
+                    windows.insert(ix, window_tab);
+                }
+                break;
+            }
+        }
+    }
+
+    /// Update the title of a tab.
+    pub fn update_tab_title(cx: &mut App, id: WindowId, title: SharedString) {
+        let controller = cx.global::<SystemWindowTabController>();
+        let tab = controller
+            .tab_groups
+            .values()
+            .flat_map(|windows| windows.iter())
+            .find(|tab| tab.id == id);
+
+        if tab.map_or(true, |t| t.title == title) {
+            return;
+        }
+
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        for windows in controller.tab_groups.values_mut() {
+            for tab in windows.iter_mut() {
+                if tab.id == id {
+                    tab.title = title.clone();
+                }
+            }
+        }
+    }
+
+    /// Insert a tab into a tab group.
+    pub fn add_tab(cx: &mut App, id: WindowId, tabs: Vec<SystemWindowTab>) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        let Some(tab) = tabs.clone().into_iter().find(|tab| tab.id == id) else {
+            return;
+        };
+
+        let mut expected_tab_ids: Vec<_> = tabs
+            .iter()
+            .filter(|tab| tab.id != id)
+            .map(|tab| tab.id)
+            .sorted()
+            .collect();
+
+        let mut tab_group_id = None;
+        for (group_id, group_tabs) in &controller.tab_groups {
+            let tab_ids: Vec<_> = group_tabs.iter().map(|tab| tab.id).sorted().collect();
+            if tab_ids == expected_tab_ids {
+                tab_group_id = Some(*group_id);
+                break;
+            }
+        }
+
+        if let Some(tab_group_id) = tab_group_id {
+            if let Some(tabs) = controller.tab_groups.get_mut(&tab_group_id) {
+                tabs.push(tab);
+            }
+        } else {
+            let new_group_id = controller.tab_groups.len();
+            controller.tab_groups.insert(new_group_id, tabs);
+        }
+    }
+
+    /// Remove a tab from a tab group.
+    pub fn remove_tab(cx: &mut App, id: WindowId) -> Option<SystemWindowTab> {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        let mut removed_tab = None;
+
+        controller.tab_groups.retain(|_, tabs| {
+            if let Some(pos) = tabs.iter().position(|tab| tab.id == id) {
+                removed_tab = Some(tabs.remove(pos));
+            }
+            !tabs.is_empty()
+        });
+
+        removed_tab
+    }
+
+    /// Move a tab to a new tab group.
+    pub fn move_tab_to_new_window(cx: &mut App, id: WindowId) {
+        let mut removed_tab = Self::remove_tab(cx, id);
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+
+        if let Some(tab) = removed_tab {
+            let new_group_id = controller.tab_groups.keys().max().map_or(0, |k| k + 1);
+            controller.tab_groups.insert(new_group_id, vec![tab]);
+        }
+    }
+
+    /// Merge all tab groups into a single group.
+    pub fn merge_all_windows(cx: &mut App, id: WindowId) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        let Some(initial_tabs) = controller.tabs(id) else {
+            return;
+        };
+
+        let mut all_tabs = initial_tabs.clone();
+        for tabs in controller.tab_groups.values() {
+            all_tabs.extend(
+                tabs.iter()
+                    .filter(|tab| !initial_tabs.contains(tab))
+                    .cloned(),
+            );
+        }
+
+        controller.tab_groups.clear();
+        controller.tab_groups.insert(0, all_tabs);
+    }
+
+    /// Selects the next tab in the tab group in the trailing direction.
+    pub fn select_next_tab(cx: &mut App, id: WindowId) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        let Some(tabs) = controller.tabs(id) else {
+            return;
+        };
+
+        let current_index = tabs.iter().position(|tab| tab.id == id).unwrap();
+        let next_index = (current_index + 1) % tabs.len();
+
+        let _ = &tabs[next_index].handle.update(cx, |_, window, _| {
+            window.activate_window();
+        });
+    }
+
+    /// Selects the previous tab in the tab group in the leading direction.
+    pub fn select_previous_tab(cx: &mut App, id: WindowId) {
+        let mut controller = cx.global_mut::<SystemWindowTabController>();
+        let Some(tabs) = controller.tabs(id) else {
+            return;
+        };
+
+        let current_index = tabs.iter().position(|tab| tab.id == id).unwrap();
+        let previous_index = if current_index == 0 {
+            tabs.len() - 1
+        } else {
+            current_index - 1
+        };
+
+        let _ = &tabs[previous_index].handle.update(cx, |_, window, _| {
+            window.activate_window();
+        });
+    }
+}
+
 /// Contains the state of the full application, and passed as a reference to a variety of callbacks.
 /// Other [Context] derefs to this type.
 /// You need a reference to an `App` to access the state of a [Entity].
@@ -372,6 +670,7 @@ impl App {
         });
 
         init_app_menus(platform.as_ref(), &app.borrow());
+        SystemWindowTabController::init(&mut app.borrow_mut());
 
         platform.on_keyboard_layout_change(Box::new({
             let app = Rc::downgrade(&app);
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 8e9c52c2e7..eb1d738143 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -40,8 +40,8 @@ use crate::{
     DEFAULT_WINDOW_SIZE, DevicePixels, DispatchEventResult, Font, FontId, FontMetrics, FontRun,
     ForegroundExecutor, GlyphId, GpuSpecs, ImageSource, Keymap, LineLayout, Pixels, PlatformInput,
     Point, RenderGlyphParams, RenderImage, RenderImageParams, RenderSvgParams, ScaledPixels, Scene,
-    ShapedGlyph, ShapedRun, SharedString, Size, SvgRenderer, SvgSize, Task, TaskLabel, Window,
-    WindowControlArea, hash, point, px, size,
+    ShapedGlyph, ShapedRun, SharedString, Size, SvgRenderer, SvgSize, SystemWindowTab, Task,
+    TaskLabel, Window, WindowControlArea, hash, point, px, size,
 };
 use anyhow::Result;
 use async_task::Runnable;
@@ -502,9 +502,26 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
 
     // macOS specific methods
+    fn get_title(&self) -> String {
+        String::new()
+    }
+    fn tabbed_windows(&self) -> Option<Vec<SystemWindowTab>> {
+        None
+    }
+    fn tab_bar_visible(&self) -> bool {
+        false
+    }
     fn set_edited(&mut self, _edited: bool) {}
     fn show_character_palette(&self) {}
     fn titlebar_double_click(&self) {}
+    fn on_move_tab_to_new_window(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_merge_all_windows(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_select_previous_tab(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_select_next_tab(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_toggle_tab_bar(&self, _callback: Box<dyn FnMut()>) {}
+    fn merge_all_windows(&self) {}
+    fn move_tab_to_new_window(&self) {}
+    fn toggle_window_tab_overview(&self) {}
 
     #[cfg(target_os = "windows")]
     fn get_raw_handle(&self) -> windows::HWND;
@@ -1113,6 +1130,9 @@ pub struct WindowOptions {
     /// Whether to use client or server side decorations. Wayland only
     /// Note that this may be ignored.
     pub window_decorations: Option<WindowDecorations>,
+
+    /// Tab group name, allows opening the window as a native tab on macOS 10.12+. Windows with the same tabbing identifier will be grouped together.
+    pub tabbing_identifier: Option<String>,
 }
 
 /// The variables that can be configured when creating a new window
@@ -1160,6 +1180,8 @@ pub(crate) struct WindowParams {
     pub display_id: Option<DisplayId>,
 
     pub window_min_size: Option<Size<Pixels>>,
+    #[cfg(target_os = "macos")]
+    pub tabbing_identifier: Option<String>,
 }
 
 /// Represents the status of how a window should be opened.
@@ -1212,6 +1234,7 @@ impl Default for WindowOptions {
             app_id: None,
             window_min_size: None,
             window_decorations: None,
+            tabbing_identifier: None,
         }
     }
 }
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index fbea4748a3..0262cbb121 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -4,8 +4,10 @@ use crate::{
     ForegroundExecutor, KeyDownEvent, Keystroke, Modifiers, ModifiersChangedEvent, MouseButton,
     MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay,
     PlatformInput, PlatformWindow, Point, PromptButton, PromptLevel, RequestFrameOptions,
-    ScaledPixels, Size, Timer, WindowAppearance, WindowBackgroundAppearance, WindowBounds,
-    WindowControlArea, WindowKind, WindowParams, platform::PlatformInputHandler, point, px, size,
+    ScaledPixels, SharedString, Size, SystemWindowTab, Timer, WindowAppearance,
+    WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowKind, WindowParams,
+    dispatch_get_main_queue, dispatch_sys::dispatch_async_f, platform::PlatformInputHandler, point,
+    px, size,
 };
 use block::ConcreteBlock;
 use cocoa::{
@@ -24,6 +26,7 @@ use cocoa::{
         NSUserDefaults,
     },
 };
+
 use core_graphics::display::{CGDirectDisplayID, CGPoint, CGRect};
 use ctor::ctor;
 use futures::channel::oneshot;
@@ -82,6 +85,12 @@ type NSDragOperation = NSUInteger;
 const NSDragOperationNone: NSDragOperation = 0;
 #[allow(non_upper_case_globals)]
 const NSDragOperationCopy: NSDragOperation = 1;
+#[derive(PartialEq)]
+pub enum UserTabbingPreference {
+    Never,
+    Always,
+    InFullScreen,
+}
 
 #[link(name = "CoreGraphics", kind = "framework")]
 unsafe extern "C" {
@@ -343,6 +352,36 @@ unsafe fn build_window_class(name: &'static str, superclass: &Class) -> *const C
             conclude_drag_operation as extern "C" fn(&Object, Sel, id),
         );
 
+        decl.add_method(
+            sel!(addTitlebarAccessoryViewController:),
+            add_titlebar_accessory_view_controller as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.add_method(
+            sel!(moveTabToNewWindow:),
+            move_tab_to_new_window as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.add_method(
+            sel!(mergeAllWindows:),
+            merge_all_windows as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.add_method(
+            sel!(selectNextTab:),
+            select_next_tab as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.add_method(
+            sel!(selectPreviousTab:),
+            select_previous_tab as extern "C" fn(&Object, Sel, id),
+        );
+
+        decl.add_method(
+            sel!(toggleTabBar:),
+            toggle_tab_bar as extern "C" fn(&Object, Sel, id),
+        );
+
         decl.register()
     }
 }
@@ -375,6 +414,11 @@ struct MacWindowState {
     // Whether the next left-mouse click is also the focusing click.
     first_mouse: bool,
     fullscreen_restore_bounds: Bounds<Pixels>,
+    move_tab_to_new_window_callback: Option<Box<dyn FnMut()>>,
+    merge_all_windows_callback: Option<Box<dyn FnMut()>>,
+    select_next_tab_callback: Option<Box<dyn FnMut()>>,
+    select_previous_tab_callback: Option<Box<dyn FnMut()>>,
+    toggle_tab_bar_callback: Option<Box<dyn FnMut()>>,
 }
 
 impl MacWindowState {
@@ -536,6 +580,7 @@ impl MacWindow {
             show,
             display_id,
             window_min_size,
+            tabbing_identifier,
         }: WindowParams,
         executor: ForegroundExecutor,
         renderer_context: renderer::Context,
@@ -543,7 +588,12 @@ impl MacWindow {
         unsafe {
             let pool = NSAutoreleasePool::new(nil);
 
-            let () = msg_send![class!(NSWindow), setAllowsAutomaticWindowTabbing: NO];
+            let allows_automatic_window_tabbing = tabbing_identifier.is_some();
+            if allows_automatic_window_tabbing {
+                let () = msg_send![class!(NSWindow), setAllowsAutomaticWindowTabbing: YES];
+            } else {
+                let () = msg_send![class!(NSWindow), setAllowsAutomaticWindowTabbing: NO];
+            }
 
             let mut style_mask;
             if let Some(titlebar) = titlebar.as_ref() {
@@ -668,6 +718,11 @@ impl MacWindow {
                 external_files_dragged: false,
                 first_mouse: false,
                 fullscreen_restore_bounds: Bounds::default(),
+                move_tab_to_new_window_callback: None,
+                merge_all_windows_callback: None,
+                select_next_tab_callback: None,
+                select_previous_tab_callback: None,
+                toggle_tab_bar_callback: None,
             })));
 
             (*native_window).set_ivar(
@@ -722,6 +777,11 @@ impl MacWindow {
                 WindowKind::Normal => {
                     native_window.setLevel_(NSNormalWindowLevel);
                     native_window.setAcceptsMouseMovedEvents_(YES);
+
+                    if let Some(tabbing_identifier) = tabbing_identifier {
+                        let tabbing_id = NSString::alloc(nil).init_str(tabbing_identifier.as_str());
+                        let _: () = msg_send![native_window, setTabbingIdentifier: tabbing_id];
+                    }
                 }
                 WindowKind::PopUp => {
                     // Use a tracking area to allow receiving MouseMoved events even when
@@ -750,6 +810,38 @@ impl MacWindow {
                 }
             }
 
+            let app = NSApplication::sharedApplication(nil);
+            let main_window: id = msg_send![app, mainWindow];
+            if allows_automatic_window_tabbing
+                && !main_window.is_null()
+                && main_window != native_window
+            {
+                let main_window_is_fullscreen = main_window
+                    .styleMask()
+                    .contains(NSWindowStyleMask::NSFullScreenWindowMask);
+                let user_tabbing_preference = Self::get_user_tabbing_preference()
+                    .unwrap_or(UserTabbingPreference::InFullScreen);
+                let should_add_as_tab = user_tabbing_preference == UserTabbingPreference::Always
+                    || user_tabbing_preference == UserTabbingPreference::InFullScreen
+                        && main_window_is_fullscreen;
+
+                if should_add_as_tab {
+                    let main_window_can_tab: BOOL =
+                        msg_send![main_window, respondsToSelector: sel!(addTabbedWindow:ordered:)];
+                    let main_window_visible: BOOL = msg_send![main_window, isVisible];
+
+                    if main_window_can_tab == YES && main_window_visible == YES {
+                        let _: () = msg_send![main_window, addTabbedWindow: native_window ordered: NSWindowOrderingMode::NSWindowAbove];
+
+                        // Ensure the window is visible immediately after adding the tab, since the tab bar is updated with a new entry at this point.
+                        // Note: Calling orderFront here can break fullscreen mode (makes fullscreen windows exit fullscreen), so only do this if the main window is not fullscreen.
+                        if !main_window_is_fullscreen {
+                            let _: () = msg_send![native_window, orderFront: nil];
+                        }
+                    }
+                }
+            }
+
             if focus && show {
                 native_window.makeKeyAndOrderFront_(nil);
             } else if show {
@@ -804,6 +896,33 @@ impl MacWindow {
             window_handles
         }
     }
+
+    pub fn get_user_tabbing_preference() -> Option<UserTabbingPreference> {
+        unsafe {
+            let defaults: id = NSUserDefaults::standardUserDefaults();
+            let domain = NSString::alloc(nil).init_str("NSGlobalDomain");
+            let key = NSString::alloc(nil).init_str("AppleWindowTabbingMode");
+
+            let dict: id = msg_send![defaults, persistentDomainForName: domain];
+            let value: id = if !dict.is_null() {
+                msg_send![dict, objectForKey: key]
+            } else {
+                nil
+            };
+
+            let value_str = if !value.is_null() {
+                CStr::from_ptr(NSString::UTF8String(value)).to_string_lossy()
+            } else {
+                "".into()
+            };
+
+            match value_str.as_ref() {
+                "manual" => Some(UserTabbingPreference::Never),
+                "always" => Some(UserTabbingPreference::Always),
+                _ => Some(UserTabbingPreference::InFullScreen),
+            }
+        }
+    }
 }
 
 impl Drop for MacWindow {
@@ -859,6 +978,46 @@ impl PlatformWindow for MacWindow {
             .detach();
     }
 
+    fn merge_all_windows(&self) {
+        let native_window = self.0.lock().native_window;
+        unsafe extern "C" fn merge_windows_async(context: *mut std::ffi::c_void) {
+            let native_window = context as id;
+            let _: () = msg_send![native_window, mergeAllWindows:nil];
+        }
+
+        unsafe {
+            dispatch_async_f(
+                dispatch_get_main_queue(),
+                native_window as *mut std::ffi::c_void,
+                Some(merge_windows_async),
+            );
+        }
+    }
+
+    fn move_tab_to_new_window(&self) {
+        let native_window = self.0.lock().native_window;
+        unsafe extern "C" fn move_tab_async(context: *mut std::ffi::c_void) {
+            let native_window = context as id;
+            let _: () = msg_send![native_window, moveTabToNewWindow:nil];
+            let _: () = msg_send![native_window, makeKeyAndOrderFront: nil];
+        }
+
+        unsafe {
+            dispatch_async_f(
+                dispatch_get_main_queue(),
+                native_window as *mut std::ffi::c_void,
+                Some(move_tab_async),
+            );
+        }
+    }
+
+    fn toggle_window_tab_overview(&self) {
+        let native_window = self.0.lock().native_window;
+        unsafe {
+            let _: () = msg_send![native_window, toggleTabOverview:nil];
+        }
+    }
+
     fn scale_factor(&self) -> f32 {
         self.0.as_ref().lock().scale_factor()
     }
@@ -1059,6 +1218,17 @@ impl PlatformWindow for MacWindow {
         }
     }
 
+    fn get_title(&self) -> String {
+        unsafe {
+            let title: id = msg_send![self.0.lock().native_window, title];
+            if title.is_null() {
+                "".to_string()
+            } else {
+                title.to_str().to_string()
+            }
+        }
+    }
+
     fn set_app_id(&mut self, _app_id: &str) {}
 
     fn set_background_appearance(&self, background_appearance: WindowBackgroundAppearance) {
@@ -1220,6 +1390,62 @@ impl PlatformWindow for MacWindow {
         self.0.lock().appearance_changed_callback = Some(callback);
     }
 
+    fn tabbed_windows(&self) -> Option<Vec<SystemWindowTab>> {
+        unsafe {
+            let windows: id = msg_send![self.0.lock().native_window, tabbedWindows];
+            if windows.is_null() {
+                return None;
+            }
+
+            let count: NSUInteger = msg_send![windows, count];
+            let mut result = Vec::new();
+            for i in 0..count {
+                let window: id = msg_send![windows, objectAtIndex:i];
+                if msg_send![window, isKindOfClass: WINDOW_CLASS] {
+                    let handle = get_window_state(&*window).lock().handle;
+                    let title: id = msg_send![window, title];
+                    let title = SharedString::from(title.to_str().to_string());
+
+                    result.push(SystemWindowTab::new(title, handle));
+                }
+            }
+
+            Some(result)
+        }
+    }
+
+    fn tab_bar_visible(&self) -> bool {
+        unsafe {
+            let tab_group: id = msg_send![self.0.lock().native_window, tabGroup];
+            if tab_group.is_null() {
+                false
+            } else {
+                let tab_bar_visible: BOOL = msg_send![tab_group, isTabBarVisible];
+                tab_bar_visible == YES
+            }
+        }
+    }
+
+    fn on_move_tab_to_new_window(&self, callback: Box<dyn FnMut()>) {
+        self.0.as_ref().lock().move_tab_to_new_window_callback = Some(callback);
+    }
+
+    fn on_merge_all_windows(&self, callback: Box<dyn FnMut()>) {
+        self.0.as_ref().lock().merge_all_windows_callback = Some(callback);
+    }
+
+    fn on_select_next_tab(&self, callback: Box<dyn FnMut()>) {
+        self.0.as_ref().lock().select_next_tab_callback = Some(callback);
+    }
+
+    fn on_select_previous_tab(&self, callback: Box<dyn FnMut()>) {
+        self.0.as_ref().lock().select_previous_tab_callback = Some(callback);
+    }
+
+    fn on_toggle_tab_bar(&self, callback: Box<dyn FnMut()>) {
+        self.0.as_ref().lock().toggle_tab_bar_callback = Some(callback);
+    }
+
     fn draw(&self, scene: &crate::Scene) {
         let mut this = self.0.lock();
         this.renderer.draw(scene);
@@ -1661,6 +1887,7 @@ extern "C" fn window_did_change_occlusion_state(this: &Object, _: Sel, _: id) {
             .occlusionState()
             .contains(NSWindowOcclusionState::NSWindowOcclusionStateVisible)
         {
+            lock.move_traffic_light();
             lock.start_display_link();
         } else {
             lock.stop_display_link();
@@ -1722,7 +1949,7 @@ extern "C" fn window_did_change_screen(this: &Object, _: Sel, _: id) {
 
 extern "C" fn window_did_change_key_status(this: &Object, selector: Sel, _: id) {
     let window_state = unsafe { get_window_state(this) };
-    let lock = window_state.lock();
+    let mut lock = window_state.lock();
     let is_active = unsafe { lock.native_window.isKeyWindow() == YES };
 
     // When opening a pop-up while the application isn't active, Cocoa sends a spurious
@@ -1743,9 +1970,34 @@ extern "C" fn window_did_change_key_status(this: &Object, selector: Sel, _: id)
 
     let executor = lock.executor.clone();
     drop(lock);
+
+    // If window is becoming active, trigger immediate synchronous frame request.
+    if selector == sel!(windowDidBecomeKey:) && is_active {
+        let window_state = unsafe { get_window_state(this) };
+        let mut lock = window_state.lock();
+
+        if let Some(mut callback) = lock.request_frame_callback.take() {
+            #[cfg(not(feature = "macos-blade"))]
+            lock.renderer.set_presents_with_transaction(true);
+            lock.stop_display_link();
+            drop(lock);
+            callback(Default::default());
+
+            let mut lock = window_state.lock();
+            lock.request_frame_callback = Some(callback);
+            #[cfg(not(feature = "macos-blade"))]
+            lock.renderer.set_presents_with_transaction(false);
+            lock.start_display_link();
+        }
+    }
+
     executor
         .spawn(async move {
             let mut lock = window_state.as_ref().lock();
+            if is_active {
+                lock.move_traffic_light();
+            }
+
             if let Some(mut callback) = lock.activate_callback.take() {
                 drop(lock);
                 callback(is_active);
@@ -2281,3 +2533,80 @@ unsafe fn remove_layer_background(layer: id) {
         }
     }
 }
+
+extern "C" fn add_titlebar_accessory_view_controller(this: &Object, _: Sel, view_controller: id) {
+    unsafe {
+        let _: () = msg_send![super(this, class!(NSWindow)), addTitlebarAccessoryViewController: view_controller];
+
+        // Hide the native tab bar and set its height to 0, since we render our own.
+        let accessory_view: id = msg_send![view_controller, view];
+        let _: () = msg_send![accessory_view, setHidden: YES];
+        let mut frame: NSRect = msg_send![accessory_view, frame];
+        frame.size.height = 0.0;
+        let _: () = msg_send![accessory_view, setFrame: frame];
+    }
+}
+
+extern "C" fn move_tab_to_new_window(this: &Object, _: Sel, _: id) {
+    unsafe {
+        let _: () = msg_send![super(this, class!(NSWindow)), moveTabToNewWindow:nil];
+
+        let window_state = get_window_state(this);
+        let mut lock = window_state.as_ref().lock();
+        if let Some(mut callback) = lock.move_tab_to_new_window_callback.take() {
+            drop(lock);
+            callback();
+            window_state.lock().move_tab_to_new_window_callback = Some(callback);
+        }
+    }
+}
+
+extern "C" fn merge_all_windows(this: &Object, _: Sel, _: id) {
+    unsafe {
+        let _: () = msg_send![super(this, class!(NSWindow)), mergeAllWindows:nil];
+
+        let window_state = get_window_state(this);
+        let mut lock = window_state.as_ref().lock();
+        if let Some(mut callback) = lock.merge_all_windows_callback.take() {
+            drop(lock);
+            callback();
+            window_state.lock().merge_all_windows_callback = Some(callback);
+        }
+    }
+}
+
+extern "C" fn select_next_tab(this: &Object, _sel: Sel, _id: id) {
+    let window_state = unsafe { get_window_state(this) };
+    let mut lock = window_state.as_ref().lock();
+    if let Some(mut callback) = lock.select_next_tab_callback.take() {
+        drop(lock);
+        callback();
+        window_state.lock().select_next_tab_callback = Some(callback);
+    }
+}
+
+extern "C" fn select_previous_tab(this: &Object, _sel: Sel, _id: id) {
+    let window_state = unsafe { get_window_state(this) };
+    let mut lock = window_state.as_ref().lock();
+    if let Some(mut callback) = lock.select_previous_tab_callback.take() {
+        drop(lock);
+        callback();
+        window_state.lock().select_previous_tab_callback = Some(callback);
+    }
+}
+
+extern "C" fn toggle_tab_bar(this: &Object, _sel: Sel, _id: id) {
+    unsafe {
+        let _: () = msg_send![super(this, class!(NSWindow)), toggleTabBar:nil];
+
+        let window_state = get_window_state(this);
+        let mut lock = window_state.as_ref().lock();
+        lock.move_traffic_light();
+
+        if let Some(mut callback) = lock.toggle_tab_bar_callback.take() {
+            drop(lock);
+            callback();
+            window_state.lock().toggle_tab_bar_callback = Some(callback);
+        }
+    }
+}
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index cc0db39303..e6ea3fef07 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -12,11 +12,11 @@ use crate::{
     PlatformInputHandler, PlatformWindow, Point, PolychromeSprite, PromptButton, PromptLevel, Quad,
     Render, RenderGlyphParams, RenderImage, RenderImageParams, RenderSvgParams, Replay, ResizeEdge,
     SMOOTH_SVG_SCALE_FACTOR, SUBPIXEL_VARIANTS, ScaledPixels, Scene, Shadow, SharedString, Size,
-    StrikethroughStyle, Style, SubscriberSet, Subscription, TabHandles, TaffyLayoutEngine, Task,
-    TextStyle, TextStyleRefinement, TransformationMatrix, Underline, UnderlineStyle,
-    WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControls, WindowDecorations,
-    WindowOptions, WindowParams, WindowTextSystem, point, prelude::*, px, rems, size,
-    transparent_black,
+    StrikethroughStyle, Style, SubscriberSet, Subscription, SystemWindowTab,
+    SystemWindowTabController, TabHandles, TaffyLayoutEngine, Task, TextStyle, TextStyleRefinement,
+    TransformationMatrix, Underline, UnderlineStyle, WindowAppearance, WindowBackgroundAppearance,
+    WindowBounds, WindowControls, WindowDecorations, WindowOptions, WindowParams, WindowTextSystem,
+    point, prelude::*, px, rems, size, transparent_black,
 };
 use anyhow::{Context as _, Result, anyhow};
 use collections::{FxHashMap, FxHashSet};
@@ -946,6 +946,8 @@ impl Window {
             app_id,
             window_min_size,
             window_decorations,
+            #[cfg_attr(not(target_os = "macos"), allow(unused_variables))]
+            tabbing_identifier,
         } = options;
 
         let bounds = window_bounds
@@ -964,8 +966,17 @@ impl Window {
                 show,
                 display_id,
                 window_min_size,
+                #[cfg(target_os = "macos")]
+                tabbing_identifier,
             },
         )?;
+
+        let tab_bar_visible = platform_window.tab_bar_visible();
+        SystemWindowTabController::init_visible(cx, tab_bar_visible);
+        if let Some(tabs) = platform_window.tabbed_windows() {
+            SystemWindowTabController::add_tab(cx, handle.window_id(), tabs);
+        }
+
         let display_id = platform_window.display().map(|display| display.id());
         let sprite_atlas = platform_window.sprite_atlas();
         let mouse_position = platform_window.mouse_position();
@@ -995,9 +1006,13 @@ impl Window {
         }
 
         platform_window.on_close(Box::new({
+            let window_id = handle.window_id();
             let mut cx = cx.to_async();
             move || {
                 let _ = handle.update(&mut cx, |_, window, _| window.remove_window());
+                let _ = cx.update(|cx| {
+                    SystemWindowTabController::remove_tab(cx, window_id);
+                });
             }
         }));
         platform_window.on_request_frame(Box::new({
@@ -1086,7 +1101,11 @@ impl Window {
                             .activation_observers
                             .clone()
                             .retain(&(), |callback| callback(window, cx));
+
+                        window.bounds_changed(cx);
                         window.refresh();
+
+                        SystemWindowTabController::update_last_active(cx, window.handle.id);
                     })
                     .log_err();
             }
@@ -1127,6 +1146,57 @@ impl Window {
                     .unwrap_or(None)
             })
         });
+        platform_window.on_move_tab_to_new_window({
+            let mut cx = cx.to_async();
+            Box::new(move || {
+                handle
+                    .update(&mut cx, |_, _window, cx| {
+                        SystemWindowTabController::move_tab_to_new_window(cx, handle.window_id());
+                    })
+                    .log_err();
+            })
+        });
+        platform_window.on_merge_all_windows({
+            let mut cx = cx.to_async();
+            Box::new(move || {
+                handle
+                    .update(&mut cx, |_, _window, cx| {
+                        SystemWindowTabController::merge_all_windows(cx, handle.window_id());
+                    })
+                    .log_err();
+            })
+        });
+        platform_window.on_select_next_tab({
+            let mut cx = cx.to_async();
+            Box::new(move || {
+                handle
+                    .update(&mut cx, |_, _window, cx| {
+                        SystemWindowTabController::select_next_tab(cx, handle.window_id());
+                    })
+                    .log_err();
+            })
+        });
+        platform_window.on_select_previous_tab({
+            let mut cx = cx.to_async();
+            Box::new(move || {
+                handle
+                    .update(&mut cx, |_, _window, cx| {
+                        SystemWindowTabController::select_previous_tab(cx, handle.window_id())
+                    })
+                    .log_err();
+            })
+        });
+        platform_window.on_toggle_tab_bar({
+            let mut cx = cx.to_async();
+            Box::new(move || {
+                handle
+                    .update(&mut cx, |_, window, cx| {
+                        let tab_bar_visible = window.platform_window.tab_bar_visible();
+                        SystemWindowTabController::set_visible(cx, tab_bar_visible);
+                    })
+                    .log_err();
+            })
+        });
 
         if let Some(app_id) = app_id {
             platform_window.set_app_id(&app_id);
@@ -4279,11 +4349,47 @@ impl Window {
     }
 
     /// Perform titlebar double-click action.
-    /// This is MacOS specific.
+    /// This is macOS specific.
     pub fn titlebar_double_click(&self) {
         self.platform_window.titlebar_double_click();
     }
 
+    /// Gets the window's title at the platform level.
+    /// This is macOS specific.
+    pub fn window_title(&self) -> String {
+        self.platform_window.get_title()
+    }
+
+    /// Returns a list of all tabbed windows and their titles.
+    /// This is macOS specific.
+    pub fn tabbed_windows(&self) -> Option<Vec<SystemWindowTab>> {
+        self.platform_window.tabbed_windows()
+    }
+
+    /// Returns the tab bar visibility.
+    /// This is macOS specific.
+    pub fn tab_bar_visible(&self) -> bool {
+        self.platform_window.tab_bar_visible()
+    }
+
+    /// Merges all open windows into a single tabbed window.
+    /// This is macOS specific.
+    pub fn merge_all_windows(&self) {
+        self.platform_window.merge_all_windows()
+    }
+
+    /// Moves the tab to a new containing window.
+    /// This is macOS specific.
+    pub fn move_tab_to_new_window(&self) {
+        self.platform_window.move_tab_to_new_window()
+    }
+
+    /// Shows or hides the window tab overview.
+    /// This is macOS specific.
+    pub fn toggle_window_tab_overview(&self) {
+        self.platform_window.toggle_window_tab_overview()
+    }
+
     /// Toggles the inspector mode on this window.
     #[cfg(any(feature = "inspector", debug_assertions))]
     pub fn toggle_inspector(&mut self, cx: &mut App) {
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
index 5ad3996e78..3d7962fa17 100644
--- a/crates/rules_library/src/rules_library.rs
+++ b/crates/rules_library/src/rules_library.rs
@@ -414,7 +414,7 @@ impl RulesLibrary {
         });
         Self {
             title_bar: if !cfg!(target_os = "macos") {
-                Some(cx.new(|_| PlatformTitleBar::new("rules-library-title-bar")))
+                Some(cx.new(|cx| PlatformTitleBar::new("rules-library-title-bar", cx)))
             } else {
                 None
             },
diff --git a/crates/title_bar/src/platform_title_bar.rs b/crates/title_bar/src/platform_title_bar.rs
index ef6ef93eed..bc1057a4d4 100644
--- a/crates/title_bar/src/platform_title_bar.rs
+++ b/crates/title_bar/src/platform_title_bar.rs
@@ -1,28 +1,35 @@
 use gpui::{
-    AnyElement, Context, Decorations, Hsla, InteractiveElement, IntoElement, MouseButton,
+    AnyElement, Context, Decorations, Entity, Hsla, InteractiveElement, IntoElement, MouseButton,
     ParentElement, Pixels, StatefulInteractiveElement, Styled, Window, WindowControlArea, div, px,
 };
 use smallvec::SmallVec;
 use std::mem;
 use ui::prelude::*;
 
-use crate::platforms::{platform_linux, platform_mac, platform_windows};
+use crate::{
+    platforms::{platform_linux, platform_mac, platform_windows},
+    system_window_tabs::SystemWindowTabs,
+};
 
 pub struct PlatformTitleBar {
     id: ElementId,
     platform_style: PlatformStyle,
     children: SmallVec<[AnyElement; 2]>,
     should_move: bool,
+    system_window_tabs: Entity<SystemWindowTabs>,
 }
 
 impl PlatformTitleBar {
-    pub fn new(id: impl Into<ElementId>) -> Self {
+    pub fn new(id: impl Into<ElementId>, cx: &mut Context<Self>) -> Self {
         let platform_style = PlatformStyle::platform();
+        let system_window_tabs = cx.new(|_cx| SystemWindowTabs::new());
+
         Self {
             id: id.into(),
             platform_style,
             children: SmallVec::new(),
             should_move: false,
+            system_window_tabs,
         }
     }
 
@@ -66,7 +73,7 @@ impl Render for PlatformTitleBar {
         let close_action = Box::new(workspace::CloseWindow);
         let children = mem::take(&mut self.children);
 
-        h_flex()
+        let title_bar = h_flex()
             .window_control_area(WindowControlArea::Drag)
             .w_full()
             .h(height)
@@ -162,7 +169,12 @@ impl Render for PlatformTitleBar {
                         title_bar.child(platform_windows::WindowsWindowControls::new(height))
                     }
                 }
-            })
+            });
+
+        v_flex()
+            .w_full()
+            .child(title_bar)
+            .child(self.system_window_tabs.clone().into_any_element())
     }
 }
 
diff --git a/crates/title_bar/src/system_window_tabs.rs b/crates/title_bar/src/system_window_tabs.rs
new file mode 100644
index 0000000000..cc50fbc2b9
--- /dev/null
+++ b/crates/title_bar/src/system_window_tabs.rs
@@ -0,0 +1,477 @@
+use settings::Settings;
+
+use gpui::{
+    AnyWindowHandle, Context, Hsla, InteractiveElement, MouseButton, ParentElement, ScrollHandle,
+    Styled, SystemWindowTab, SystemWindowTabController, Window, WindowId, actions, canvas, div,
+};
+
+use theme::ThemeSettings;
+use ui::{
+    Color, ContextMenu, DynamicSpacing, IconButton, IconButtonShape, IconName, IconSize, Label,
+    LabelSize, Tab, h_flex, prelude::*, right_click_menu,
+};
+use workspace::{
+    CloseWindow, ItemSettings, Workspace,
+    item::{ClosePosition, ShowCloseButton},
+};
+
+actions!(
+    window,
+    [
+        ShowNextWindowTab,
+        ShowPreviousWindowTab,
+        MergeAllWindows,
+        MoveTabToNewWindow
+    ]
+);
+
+#[derive(Clone)]
+pub struct DraggedWindowTab {
+    pub id: WindowId,
+    pub ix: usize,
+    pub handle: AnyWindowHandle,
+    pub title: String,
+    pub width: Pixels,
+    pub is_active: bool,
+    pub active_background_color: Hsla,
+    pub inactive_background_color: Hsla,
+}
+
+pub struct SystemWindowTabs {
+    tab_bar_scroll_handle: ScrollHandle,
+    measured_tab_width: Pixels,
+    last_dragged_tab: Option<DraggedWindowTab>,
+}
+
+impl SystemWindowTabs {
+    pub fn new() -> Self {
+        Self {
+            tab_bar_scroll_handle: ScrollHandle::new(),
+            measured_tab_width: px(0.),
+            last_dragged_tab: None,
+        }
+    }
+
+    pub fn init(cx: &mut App) {
+        cx.observe_new(|workspace: &mut Workspace, _, _| {
+            workspace.register_action_renderer(|div, _, window, cx| {
+                let window_id = window.window_handle().window_id();
+                let controller = cx.global::<SystemWindowTabController>();
+
+                let tab_groups = controller.tab_groups();
+                let tabs = controller.tabs(window_id);
+                let Some(tabs) = tabs else {
+                    return div;
+                };
+
+                div.when(tabs.len() > 1, |div| {
+                    div.on_action(move |_: &ShowNextWindowTab, window, cx| {
+                        SystemWindowTabController::select_next_tab(
+                            cx,
+                            window.window_handle().window_id(),
+                        );
+                    })
+                    .on_action(move |_: &ShowPreviousWindowTab, window, cx| {
+                        SystemWindowTabController::select_previous_tab(
+                            cx,
+                            window.window_handle().window_id(),
+                        );
+                    })
+                    .on_action(move |_: &MoveTabToNewWindow, window, cx| {
+                        SystemWindowTabController::move_tab_to_new_window(
+                            cx,
+                            window.window_handle().window_id(),
+                        );
+                        window.move_tab_to_new_window();
+                    })
+                })
+                .when(tab_groups.len() > 1, |div| {
+                    div.on_action(move |_: &MergeAllWindows, window, cx| {
+                        SystemWindowTabController::merge_all_windows(
+                            cx,
+                            window.window_handle().window_id(),
+                        );
+                        window.merge_all_windows();
+                    })
+                })
+            });
+        })
+        .detach();
+    }
+
+    fn render_tab(
+        &self,
+        ix: usize,
+        item: SystemWindowTab,
+        tabs: Vec<SystemWindowTab>,
+        active_background_color: Hsla,
+        inactive_background_color: Hsla,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
+        let entity = cx.entity();
+        let settings = ItemSettings::get_global(cx);
+        let close_side = &settings.close_position;
+        let show_close_button = &settings.show_close_button;
+
+        let rem_size = window.rem_size();
+        let width = self.measured_tab_width.max(rem_size * 10);
+        let is_active = window.window_handle().window_id() == item.id;
+        let title = item.title.to_string();
+
+        let label = Label::new(&title)
+            .size(LabelSize::Small)
+            .truncate()
+            .color(if is_active {
+                Color::Default
+            } else {
+                Color::Muted
+            });
+
+        let tab = h_flex()
+            .id(ix)
+            .group("tab")
+            .w_full()
+            .overflow_hidden()
+            .h(Tab::content_height(cx))
+            .relative()
+            .px(DynamicSpacing::Base16.px(cx))
+            .justify_center()
+            .border_l_1()
+            .border_color(cx.theme().colors().border)
+            .cursor_pointer()
+            .on_drag(
+                DraggedWindowTab {
+                    id: item.id,
+                    ix,
+                    handle: item.handle,
+                    title: item.title.to_string(),
+                    width,
+                    is_active,
+                    active_background_color,
+                    inactive_background_color,
+                },
+                move |tab, _, _, cx| {
+                    entity.update(cx, |this, _cx| {
+                        this.last_dragged_tab = Some(tab.clone());
+                    });
+                    cx.new(|_| tab.clone())
+                },
+            )
+            .drag_over::<DraggedWindowTab>({
+                let tab_ix = ix;
+                move |element, dragged_tab: &DraggedWindowTab, _, cx| {
+                    let mut styled_tab = element
+                        .bg(cx.theme().colors().drop_target_background)
+                        .border_color(cx.theme().colors().drop_target_border)
+                        .border_0();
+
+                    if tab_ix < dragged_tab.ix {
+                        styled_tab = styled_tab.border_l_2();
+                    } else if tab_ix > dragged_tab.ix {
+                        styled_tab = styled_tab.border_r_2();
+                    }
+
+                    styled_tab
+                }
+            })
+            .on_drop({
+                let tab_ix = ix;
+                cx.listener(move |this, dragged_tab: &DraggedWindowTab, _window, cx| {
+                    this.last_dragged_tab = None;
+                    Self::handle_tab_drop(dragged_tab, tab_ix, cx);
+                })
+            })
+            .on_click(move |_, _, cx| {
+                let _ = item.handle.update(cx, |_, window, _| {
+                    window.activate_window();
+                });
+            })
+            .child(label)
+            .map(|this| match show_close_button {
+                ShowCloseButton::Hidden => this,
+                _ => this.child(
+                    div()
+                        .absolute()
+                        .top_2()
+                        .w_4()
+                        .h_4()
+                        .map(|this| match close_side {
+                            ClosePosition::Left => this.left_1(),
+                            ClosePosition::Right => this.right_1(),
+                        })
+                        .child(
+                            IconButton::new("close", IconName::Close)
+                                .shape(IconButtonShape::Square)
+                                .icon_color(Color::Muted)
+                                .icon_size(IconSize::XSmall)
+                                .on_click({
+                                    move |_, window, cx| {
+                                        if item.handle.window_id()
+                                            == window.window_handle().window_id()
+                                        {
+                                            window.dispatch_action(Box::new(CloseWindow), cx);
+                                        } else {
+                                            let _ = item.handle.update(cx, |_, window, cx| {
+                                                window.dispatch_action(Box::new(CloseWindow), cx);
+                                            });
+                                        }
+                                    }
+                                })
+                                .map(|this| match show_close_button {
+                                    ShowCloseButton::Hover => this.visible_on_hover("tab"),
+                                    _ => this,
+                                }),
+                        ),
+                ),
+            })
+            .into_any();
+
+        let menu = right_click_menu(ix)
+            .trigger(|_, _, _| tab)
+            .menu(move |window, cx| {
+                let focus_handle = cx.focus_handle();
+                let tabs = tabs.clone();
+                let other_tabs = tabs.clone();
+                let move_tabs = tabs.clone();
+                let merge_tabs = tabs.clone();
+
+                ContextMenu::build(window, cx, move |mut menu, _window_, _cx| {
+                    menu = menu.entry("Close Tab", None, move |window, cx| {
+                        Self::handle_right_click_action(
+                            cx,
+                            window,
+                            &tabs,
+                            |tab| tab.id == item.id,
+                            |window, cx| {
+                                window.dispatch_action(Box::new(CloseWindow), cx);
+                            },
+                        );
+                    });
+
+                    menu = menu.entry("Close Other Tabs", None, move |window, cx| {
+                        Self::handle_right_click_action(
+                            cx,
+                            window,
+                            &other_tabs,
+                            |tab| tab.id != item.id,
+                            |window, cx| {
+                                window.dispatch_action(Box::new(CloseWindow), cx);
+                            },
+                        );
+                    });
+
+                    menu = menu.entry("Move Tab to New Window", None, move |window, cx| {
+                        Self::handle_right_click_action(
+                            cx,
+                            window,
+                            &move_tabs,
+                            |tab| tab.id == item.id,
+                            |window, cx| {
+                                SystemWindowTabController::move_tab_to_new_window(
+                                    cx,
+                                    window.window_handle().window_id(),
+                                );
+                                window.move_tab_to_new_window();
+                            },
+                        );
+                    });
+
+                    menu = menu.entry("Show All Tabs", None, move |window, cx| {
+                        Self::handle_right_click_action(
+                            cx,
+                            window,
+                            &merge_tabs,
+                            |tab| tab.id == item.id,
+                            |window, _cx| {
+                                window.toggle_window_tab_overview();
+                            },
+                        );
+                    });
+
+                    menu.context(focus_handle)
+                })
+            });
+
+        div()
+            .flex_1()
+            .min_w(rem_size * 10)
+            .when(is_active, |this| this.bg(active_background_color))
+            .border_t_1()
+            .border_color(if is_active {
+                active_background_color
+            } else {
+                cx.theme().colors().border
+            })
+            .child(menu)
+    }
+
+    fn handle_tab_drop(dragged_tab: &DraggedWindowTab, ix: usize, cx: &mut Context<Self>) {
+        SystemWindowTabController::update_tab_position(cx, dragged_tab.id, ix);
+    }
+
+    fn handle_right_click_action<F, P>(
+        cx: &mut App,
+        window: &mut Window,
+        tabs: &Vec<SystemWindowTab>,
+        predicate: P,
+        mut action: F,
+    ) where
+        P: Fn(&SystemWindowTab) -> bool,
+        F: FnMut(&mut Window, &mut App),
+    {
+        for tab in tabs {
+            if predicate(tab) {
+                if tab.id == window.window_handle().window_id() {
+                    action(window, cx);
+                } else {
+                    let _ = tab.handle.update(cx, |_view, window, cx| {
+                        action(window, cx);
+                    });
+                }
+            }
+        }
+    }
+}
+
+impl Render for SystemWindowTabs {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let active_background_color = cx.theme().colors().title_bar_background;
+        let inactive_background_color = cx.theme().colors().tab_bar_background;
+        let entity = cx.entity();
+
+        let controller = cx.global::<SystemWindowTabController>();
+        let visible = controller.is_visible();
+        let current_window_tab = vec![SystemWindowTab::new(
+            SharedString::from(window.window_title()),
+            window.window_handle(),
+        )];
+        let tabs = controller
+            .tabs(window.window_handle().window_id())
+            .unwrap_or(&current_window_tab)
+            .clone();
+
+        let tab_items = tabs
+            .iter()
+            .enumerate()
+            .map(|(ix, item)| {
+                self.render_tab(
+                    ix,
+                    item.clone(),
+                    tabs.clone(),
+                    active_background_color,
+                    inactive_background_color,
+                    window,
+                    cx,
+                )
+            })
+            .collect::<Vec<_>>();
+
+        let number_of_tabs = tab_items.len().max(1);
+        if !window.tab_bar_visible() && !visible {
+            return h_flex().into_any_element();
+        }
+
+        h_flex()
+            .w_full()
+            .h(Tab::container_height(cx))
+            .bg(inactive_background_color)
+            .on_mouse_up_out(
+                MouseButton::Left,
+                cx.listener(|this, _event, window, cx| {
+                    if let Some(tab) = this.last_dragged_tab.take() {
+                        SystemWindowTabController::move_tab_to_new_window(cx, tab.id);
+                        if tab.id == window.window_handle().window_id() {
+                            window.move_tab_to_new_window();
+                        } else {
+                            let _ = tab.handle.update(cx, |_, window, _cx| {
+                                window.move_tab_to_new_window();
+                            });
+                        }
+                    }
+                }),
+            )
+            .child(
+                h_flex()
+                    .id("window tabs")
+                    .w_full()
+                    .h(Tab::container_height(cx))
+                    .bg(inactive_background_color)
+                    .overflow_x_scroll()
+                    .track_scroll(&self.tab_bar_scroll_handle)
+                    .children(tab_items)
+                    .child(
+                        canvas(
+                            |_, _, _| (),
+                            move |bounds, _, _, cx| {
+                                let entity = entity.clone();
+                                entity.update(cx, |this, cx| {
+                                    let width = bounds.size.width / number_of_tabs as f32;
+                                    if width != this.measured_tab_width {
+                                        this.measured_tab_width = width;
+                                        cx.notify();
+                                    }
+                                });
+                            },
+                        )
+                        .absolute()
+                        .size_full(),
+                    ),
+            )
+            .child(
+                h_flex()
+                    .h_full()
+                    .px(DynamicSpacing::Base06.rems(cx))
+                    .border_t_1()
+                    .border_l_1()
+                    .border_color(cx.theme().colors().border)
+                    .child(
+                        IconButton::new("plus", IconName::Plus)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted)
+                            .on_click(|_event, window, cx| {
+                                window.dispatch_action(
+                                    Box::new(zed_actions::OpenRecent {
+                                        create_new_window: true,
+                                    }),
+                                    cx,
+                                );
+                            }),
+                    ),
+            )
+            .into_any_element()
+    }
+}
+
+impl Render for DraggedWindowTab {
+    fn render(
+        &mut self,
+        _window: &mut gpui::Window,
+        cx: &mut gpui::Context<Self>,
+    ) -> impl gpui::IntoElement {
+        let ui_font = ThemeSettings::get_global(cx).ui_font.clone();
+        let label = Label::new(self.title.clone())
+            .size(LabelSize::Small)
+            .truncate()
+            .color(if self.is_active {
+                Color::Default
+            } else {
+                Color::Muted
+            });
+
+        h_flex()
+            .h(Tab::container_height(cx))
+            .w(self.width)
+            .px(DynamicSpacing::Base16.px(cx))
+            .justify_center()
+            .bg(if self.is_active {
+                self.active_background_color
+            } else {
+                self.inactive_background_color
+            })
+            .border_1()
+            .border_color(cx.theme().colors().border)
+            .font(ui_font)
+            .child(label)
+    }
+}
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index b08f139b25..ac5e9201b3 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -3,6 +3,7 @@ mod collab;
 mod onboarding_banner;
 pub mod platform_title_bar;
 mod platforms;
+mod system_window_tabs;
 mod title_bar_settings;
 
 #[cfg(feature = "stories")]
@@ -11,6 +12,7 @@ mod stories;
 use crate::{
     application_menu::{ApplicationMenu, show_menus},
     platform_title_bar::PlatformTitleBar,
+    system_window_tabs::SystemWindowTabs,
 };
 
 #[cfg(not(target_os = "macos"))]
@@ -65,6 +67,7 @@ actions!(
 
 pub fn init(cx: &mut App) {
     TitleBarSettings::register(cx);
+    SystemWindowTabs::init(cx);
 
     cx.observe_new(|workspace: &mut Workspace, window, cx| {
         let Some(window) = window else {
@@ -284,7 +287,7 @@ impl TitleBar {
             )
         });
 
-        let platform_titlebar = cx.new(|_| PlatformTitleBar::new(id));
+        let platform_titlebar = cx.new(|cx| PlatformTitleBar::new(id, cx));
 
         Self {
             platform_titlebar,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 25e2cb1cfe..1fee2793f0 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -42,9 +42,9 @@ use gpui::{
     Action, AnyEntity, AnyView, AnyWeakView, App, AsyncApp, AsyncWindowContext, Bounds, Context,
     CursorStyle, Decorations, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle,
     Focusable, Global, HitboxBehavior, Hsla, KeyContext, Keystroke, ManagedView, MouseButton,
-    PathPromptOptions, Point, PromptLevel, Render, ResizeEdge, Size, Stateful, Subscription, Task,
-    Tiling, WeakEntity, WindowBounds, WindowHandle, WindowId, WindowOptions, actions, canvas,
-    point, relative, size, transparent_black,
+    PathPromptOptions, Point, PromptLevel, Render, ResizeEdge, Size, Stateful, Subscription,
+    SystemWindowTabController, Task, Tiling, WeakEntity, WindowBounds, WindowHandle, WindowId,
+    WindowOptions, actions, canvas, point, relative, size, transparent_black,
 };
 pub use history_manager::*;
 pub use item::{
@@ -4375,6 +4375,11 @@ impl Workspace {
             return;
         }
         window.set_window_title(&title);
+        SystemWindowTabController::update_tab_title(
+            cx,
+            window.window_handle().window_id(),
+            SharedString::from(&title),
+        );
         self.last_window_title = Some(title);
     }
 
@@ -5797,17 +5802,22 @@ impl Workspace {
             return;
         };
         let windows = cx.windows();
-        let Some(next_window) = windows
-            .iter()
-            .cycle()
-            .skip_while(|window| window.window_id() != current_window_id)
-            .nth(1)
-        else {
-            return;
-        };
-        next_window
-            .update(cx, |_, window, _| window.activate_window())
-            .ok();
+        let next_window =
+            SystemWindowTabController::get_next_tab_group_window(cx, current_window_id).or_else(
+                || {
+                    windows
+                        .iter()
+                        .cycle()
+                        .skip_while(|window| window.window_id() != current_window_id)
+                        .nth(1)
+                },
+            );
+
+        if let Some(window) = next_window {
+            window
+                .update(cx, |_, window, _| window.activate_window())
+                .ok();
+        }
     }
 
     pub fn activate_previous_window(&mut self, cx: &mut Context<Self>) {
@@ -5815,18 +5825,23 @@ impl Workspace {
             return;
         };
         let windows = cx.windows();
-        let Some(prev_window) = windows
-            .iter()
-            .rev()
-            .cycle()
-            .skip_while(|window| window.window_id() != current_window_id)
-            .nth(1)
-        else {
-            return;
-        };
-        prev_window
-            .update(cx, |_, window, _| window.activate_window())
-            .ok();
+        let prev_window =
+            SystemWindowTabController::get_prev_tab_group_window(cx, current_window_id).or_else(
+                || {
+                    windows
+                        .iter()
+                        .rev()
+                        .cycle()
+                        .skip_while(|window| window.window_id() != current_window_id)
+                        .nth(1)
+                },
+            );
+
+        if let Some(window) = prev_window {
+            window
+                .update(cx, |_, window, _| window.activate_window())
+                .ok();
+        }
     }
 
     pub fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 3b6bc1ea97..0d7fb9bb9c 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -29,6 +29,7 @@ pub struct WorkspaceSettings {
     pub on_last_window_closed: OnLastWindowClosed,
     pub resize_all_panels_in_dock: Vec<DockPosition>,
     pub close_on_file_delete: bool,
+    pub use_system_window_tabs: bool,
     pub zoomed_padding: bool,
 }
 
@@ -203,6 +204,10 @@ pub struct WorkspaceSettingsContent {
     ///
     /// Default: false
     pub close_on_file_delete: Option<bool>,
+    /// Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
+    ///
+    /// Default: false
+    pub use_system_window_tabs: Option<bool>,
     /// Whether to show padding for zoomed panels.
     /// When enabled, zoomed bottom panels will have some top padding,
     /// while zoomed left/right panels will have padding to the right/left (respectively).
@@ -357,6 +362,8 @@ impl Settings for WorkspaceSettings {
             current.max_tabs = Some(n)
         }
 
+        vscode.bool_setting("window.nativeTabs", &mut current.use_system_window_tabs);
+
         // some combination of "window.restoreWindows" and "workbench.startupEditor" might
         // map to our "restore_on_startup"
 
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index e99c8b564b..5e7934c309 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -2,7 +2,7 @@ mod reliability;
 mod zed;
 
 use agent_ui::AgentPanel;
-use anyhow::{Context as _, Result};
+use anyhow::{Context as _, Error, Result};
 use clap::{Parser, command};
 use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
 use client::{Client, ProxySettings, UserStore, parse_zed_link};
@@ -947,9 +947,13 @@ async fn installation_id() -> Result<IdType> {
 
 async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp) -> Result<()> {
     if let Some(locations) = restorable_workspace_locations(cx, &app_state).await {
+        let use_system_window_tabs = cx
+            .update(|cx| WorkspaceSettings::get(None, cx).use_system_window_tabs)
+            .unwrap_or(false);
+        let mut results: Vec<Result<(), Error>> = Vec::new();
         let mut tasks = Vec::new();
 
-        for (location, paths) in locations {
+        for (index, (location, paths)) in locations.into_iter().enumerate() {
             match location {
                 SerializedWorkspaceLocation::Local => {
                     let app_state = app_state.clone();
@@ -964,7 +968,14 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
                         })?;
                         open_task.await.map(|_| ())
                     });
-                    tasks.push(task);
+
+                    // If we're using system window tabs and this is the first workspace,
+                    // wait for it to finish so that the other windows can be added as tabs.
+                    if use_system_window_tabs && index == 0 {
+                        results.push(task.await);
+                    } else {
+                        tasks.push(task);
+                    }
                 }
                 SerializedWorkspaceLocation::Ssh(ssh) => {
                     let app_state = app_state.clone();
@@ -998,7 +1009,7 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
         }
 
         // Wait for all workspaces to open concurrently
-        let results = future::join_all(tasks).await;
+        results.extend(future::join_all(tasks).await);
 
         // Show notifications for any errors that occurred
         let mut error_count = 0;
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index b0146cfd2b..a12249d6a4 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -282,6 +282,8 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowO
         _ => gpui::WindowDecorations::Client,
     };
 
+    let use_system_window_tabs = WorkspaceSettings::get_global(cx).use_system_window_tabs;
+
     WindowOptions {
         titlebar: Some(TitlebarOptions {
             title: None,
@@ -301,6 +303,11 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowO
             width: px(360.0),
             height: px(240.0),
         }),
+        tabbing_identifier: if use_system_window_tabs {
+            Some(String::from("zed"))
+        } else {
+            None
+        },
         ..Default::default()
     }
 }
@@ -4507,6 +4514,7 @@ mod tests {
                 "zed",
                 "zed_predict_onboarding",
                 "zeta",
+                "window",
             ];
             assert_eq!(
                 all_namespaces,
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 9634ca0f6c..fb9306acc5 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -1421,6 +1421,16 @@ or
 
 Each option controls displaying of a particular toolbar element. If all elements are hidden, the editor toolbar is not displayed.
 
+## Use System Tabs
+
+- Description: Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
+- Setting: `use_system_window_tabs`
+- Default: `false`
+
+**Options**
+
+This setting enables integration with macOS’s native window tabbing feature. When set to `true`, Zed windows can be grouped together as tabs in a single macOS window, following the system-wide tabbing preferences set by the user (such as "Always", "In Full Screen", or "Never"). This setting is only available on macOS.
+
 ## Enable Language Server
 
 - Description: Whether or not to use language servers to provide code intelligence.

From 38e5c8fb66ac19f5836e3c0590cc9dcf3e77e87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Thu, 28 Aug 2025 15:16:13 +0800
Subject: [PATCH 423/823] keymap_editor: Fix incorrect keystroke being reported
 (#36998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR fixes two bugs and also changes one behavior in the **Keymap
Editor**.

As shown in the video, when I press `ctrl-shift-2` in the Keymap Editor,
the first keystroke is displayed as `ctrl-shift-@`, which is incorrect.
On macOS and Linux, it should be `ctrl-@`.



https://github.com/user-attachments/assets/69cfcfa0-b422-45d6-8e69-80f8608180fd



Also, after pressing `ctrl-shift-2` and then releasing `2` and `ctrl`, a
`shift` keystroke was incorrectly added.



https://github.com/user-attachments/assets/892124fd-847d-4fde-9b20-a27ba49ac934



Now, when you enter a sequence like `+ctrl+alt-alt+f` in the Keymap
Editor, it will output `ctrl-f` instead of `ctrl-alt-f`, matching VS
Code’s behavior.


Release Notes:

- Fixed incorrect keystroke reporting in the Keymap Editor.
---
 crates/gpui/src/window.rs                     |   7 +
 .../src/ui_components/keystroke_input.rs      | 149 +++++++++++++++---
 2 files changed, 137 insertions(+), 19 deletions(-)

diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index e6ea3fef07..4504f51255 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -4578,6 +4578,13 @@ impl Window {
         }
         None
     }
+
+    /// For testing: set the current modifier keys state.
+    /// This does not generate any events.
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn set_modifiers(&mut self, modifiers: Modifiers) {
+        self.modifiers = modifiers;
+    }
 }
 
 // #[derive(Clone, Copy, Eq, PartialEq, Hash)]
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/settings_ui/src/ui_components/keystroke_input.rs
index ca50d5c03d..5d27598d91 100644
--- a/crates/settings_ui/src/ui_components/keystroke_input.rs
+++ b/crates/settings_ui/src/ui_components/keystroke_input.rs
@@ -303,17 +303,12 @@ impl KeystrokeInput {
             return;
         }
 
-        let mut keystroke =
+        let keystroke =
             KeybindingKeystroke::new(keystroke.clone(), false, cx.keyboard_mapper().as_ref());
         if let Some(last) = self.keystrokes.last()
             && last.display_key.is_empty()
             && (!self.search || self.previous_modifiers.modified())
         {
-            let display_key = keystroke.display_key.clone();
-            let inner_key = keystroke.inner.key.clone();
-            keystroke = last.clone();
-            keystroke.display_key = display_key;
-            keystroke.inner.key = inner_key;
             self.keystrokes.pop();
         }
 
@@ -329,18 +324,19 @@ impl KeystrokeInput {
             return;
         }
 
-        self.keystrokes.push(keystroke.clone());
+        self.keystrokes.push(keystroke);
         self.keystrokes_changed(cx);
 
+        // The reason we use the real modifiers from the window instead of the keystroke's modifiers
+        // is that for keystrokes like `ctrl-$` the modifiers reported by keystroke is `ctrl` which
+        // is wrong, it should be `ctrl-shift`. The window's modifiers are always correct.
+        let real_modifiers = window.modifiers();
         if self.search {
-            self.previous_modifiers = keystroke.display_modifiers;
+            self.previous_modifiers = real_modifiers;
             return;
         }
-        if self.keystrokes.len() < Self::KEYSTROKE_COUNT_MAX
-            && keystroke.display_modifiers.modified()
-        {
-            self.keystrokes
-                .push(Self::dummy(keystroke.display_modifiers));
+        if self.keystrokes.len() < Self::KEYSTROKE_COUNT_MAX && real_modifiers.modified() {
+            self.keystrokes.push(Self::dummy(real_modifiers));
         }
     }
 
@@ -718,8 +714,11 @@ mod tests {
 
             // Combine current modifiers with keystroke modifiers
             keystroke.modifiers |= self.current_modifiers;
+            let real_modifiers = keystroke.modifiers;
+            keystroke = to_gpui_keystroke(keystroke);
 
             self.update_input(|input, window, cx| {
+                window.set_modifiers(real_modifiers);
                 input.handle_keystroke(&keystroke, window, cx);
             });
 
@@ -747,6 +746,7 @@ mod tests {
             };
 
             self.update_input(|input, window, cx| {
+                window.set_modifiers(new_modifiers);
                 input.on_modifiers_changed(&event, window, cx);
             });
 
@@ -954,6 +954,100 @@ mod tests {
         }
     }
 
+    /// For GPUI, when you press `ctrl-shift-2`, it produces `ctrl-@` without the shift modifier.
+    fn to_gpui_keystroke(mut keystroke: Keystroke) -> Keystroke {
+        if keystroke.modifiers.shift {
+            match keystroke.key.as_str() {
+                "`" => {
+                    keystroke.key = "~".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "1" => {
+                    keystroke.key = "!".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "2" => {
+                    keystroke.key = "@".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "3" => {
+                    keystroke.key = "#".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "4" => {
+                    keystroke.key = "$".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "5" => {
+                    keystroke.key = "%".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "6" => {
+                    keystroke.key = "^".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "7" => {
+                    keystroke.key = "&".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "8" => {
+                    keystroke.key = "*".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "9" => {
+                    keystroke.key = "(".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "0" => {
+                    keystroke.key = ")".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "-" => {
+                    keystroke.key = "_".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "=" => {
+                    keystroke.key = "+".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "[" => {
+                    keystroke.key = "{".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "]" => {
+                    keystroke.key = "}".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "\\" => {
+                    keystroke.key = "|".into();
+                    keystroke.modifiers.shift = false;
+                }
+                ";" => {
+                    keystroke.key = ":".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "'" => {
+                    keystroke.key = "\"".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "," => {
+                    keystroke.key = "<".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "." => {
+                    keystroke.key = ">".into();
+                    keystroke.modifiers.shift = false;
+                }
+                "/" => {
+                    keystroke.key = "?".into();
+                    keystroke.modifiers.shift = false;
+                }
+                _ => {}
+            }
+        }
+        keystroke
+    }
+
     struct KeystrokeUpdateTracker {
         initial_keystrokes: Vec<KeybindingKeystroke>,
         _subscription: Subscription,
@@ -1057,7 +1151,15 @@ mod tests {
             .send_events(&["+cmd", "shift-f", "-cmd"])
             // In search mode, when completing a modifier-only keystroke with a key,
             // only the original modifiers are preserved, not the keystroke's modifiers
-            .expect_keystrokes(&["cmd-f"]);
+            //
+            // Update:
+            // This behavior was changed to preserve all modifiers in search mode, this is now reflected in the expected keystrokes.
+            // Specifically, considering the sequence: `+cmd +shift -shift 2`, we expect it to produce the same result as `+cmd +shift 2`
+            // which is `cmd-@`. But in the case of `+cmd +shift -shift 2`, the keystroke we receive is `cmd-2`, which means that
+            // we need to dynamically map the key from `2` to `@` when the shift modifier is not present, which is not possible.
+            // Therefore, we now preserve all modifiers in search mode to ensure consistent behavior.
+            // And also, VSCode seems to preserve all modifiers in search mode as well.
+            .expect_keystrokes(&["cmd-shift-f"]);
     }
 
     #[gpui::test]
@@ -1234,7 +1336,7 @@ mod tests {
             .await
             .with_search_mode(true)
             .send_events(&["+ctrl", "+shift", "-shift", "a", "-ctrl"])
-            .expect_keystrokes(&["ctrl-shift-a"]);
+            .expect_keystrokes(&["ctrl-a"]);
     }
 
     #[gpui::test]
@@ -1342,7 +1444,7 @@ mod tests {
             .await
             .with_search_mode(true)
             .send_events(&["+ctrl+alt", "-ctrl", "j"])
-            .expect_keystrokes(&["ctrl-alt-j"]);
+            .expect_keystrokes(&["alt-j"]);
     }
 
     #[gpui::test]
@@ -1364,11 +1466,11 @@ mod tests {
             .send_events(&["+ctrl+alt", "-ctrl", "+shift"])
             .expect_keystrokes(&["ctrl-shift-alt-"])
             .send_keystroke("j")
-            .expect_keystrokes(&["ctrl-shift-alt-j"])
+            .expect_keystrokes(&["shift-alt-j"])
             .send_keystroke("i")
-            .expect_keystrokes(&["ctrl-shift-alt-j", "shift-alt-i"])
+            .expect_keystrokes(&["shift-alt-j", "shift-alt-i"])
             .send_events(&["-shift-alt", "+cmd"])
-            .expect_keystrokes(&["ctrl-shift-alt-j", "shift-alt-i", "cmd-"]);
+            .expect_keystrokes(&["shift-alt-j", "shift-alt-i", "cmd-"]);
     }
 
     #[gpui::test]
@@ -1401,4 +1503,13 @@ mod tests {
             .send_events(&["+ctrl", "-ctrl", "+alt", "-alt", "+shift", "-shift"])
             .expect_empty();
     }
+
+    #[gpui::test]
+    async fn test_not_search_shifted_keys(cx: &mut TestAppContext) {
+        init_test(cx)
+            .await
+            .with_search_mode(false)
+            .send_events(&["+ctrl", "+shift", "4", "-all"])
+            .expect_keystrokes(&["ctrl-$"]);
+    }
 }

From 73b38c83068bdafd59d4f3f77adde8fa9e3b1281 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 28 Aug 2025 03:53:32 -0400
Subject: [PATCH 424/823] debugger: Add ability to only show stack frame
 entries from visible work trees (#37061)

This PR adds a toggleable filter to the stack frame list that filters
out entries that don't exist within a user's project (visible work
trees). This works by keeping a vector of entry indices that exist
within a user's project and updates the list state based on these
entries when filtering the list.

I went with this approach so the stack frame list wouldn't have to
rebuild itself whenever the filter is toggled and it could persist its
state across toggles (uncollapsing a collapse list). It was also easier
to keep track of selected entries on toggle using the vector as well.

### Preview

https://github.com/user-attachments/assets/d86c7485-c885-4bbb-bebb-2f6385674925



Release Notes:

- debugger: Add option to only show stack frames from user's project in
stack frame list
---
 assets/icons/list_filter.svg                  |   1 +
 crates/dap_adapters/src/python.rs             |   1 +
 crates/debugger_ui/src/debugger_ui.rs         |  17 ++
 crates/debugger_ui/src/persistence.rs         |   9 +-
 crates/debugger_ui/src/session/running.rs     |  23 ++
 .../src/session/running/stack_frame_list.rs   | 199 +++++++++++-
 .../debugger_ui/src/tests/stack_frame_list.rs | 285 ++++++++++++++++++
 crates/icons/src/icons.rs                     |   1 +
 8 files changed, 522 insertions(+), 14 deletions(-)
 create mode 100644 assets/icons/list_filter.svg

diff --git a/assets/icons/list_filter.svg b/assets/icons/list_filter.svg
new file mode 100644
index 0000000000..82f41f5f68
--- /dev/null
+++ b/assets/icons/list_filter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-list-filter-icon lucide-list-filter"><path d="M3 6h18"/><path d="M7 12h10"/><path d="M10 18h4"/></svg>
diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
index 614cd0e05d..6781e5cbd6 100644
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -234,6 +234,7 @@ impl PythonDebugAdapter {
                     .await
                     .map_err(|e| format!("{e:#?}"))?
                     .success();
+
                 if !did_succeed {
                     return Err("Failed to create base virtual environment".into());
                 }
diff --git a/crates/debugger_ui/src/debugger_ui.rs b/crates/debugger_ui/src/debugger_ui.rs
index 581cc16ff4..689e3cd878 100644
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ b/crates/debugger_ui/src/debugger_ui.rs
@@ -85,6 +85,10 @@ actions!(
         Rerun,
         /// Toggles expansion of the selected item in the debugger UI.
         ToggleExpandItem,
+        /// Toggle the user frame filter in the stack frame list
+        /// When toggled on, only frames from the user's code are shown
+        /// When toggled off, all frames are shown
+        ToggleUserFrames,
     ]
 );
 
@@ -272,12 +276,25 @@ pub fn init(cx: &mut App) {
                     }
                 })
                 .on_action({
+                    let active_item = active_item.clone();
                     move |_: &ToggleIgnoreBreakpoints, _, cx| {
                         active_item
                             .update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
                             .ok();
                     }
                 })
+                .on_action(move |_: &ToggleUserFrames, _, cx| {
+                    if let Some((thread_status, stack_frame_list)) = active_item
+                        .read_with(cx, |item, cx| {
+                            (item.thread_status(cx), item.stack_frame_list().clone())
+                        })
+                        .ok()
+                    {
+                        stack_frame_list.update(cx, |stack_frame_list, cx| {
+                            stack_frame_list.toggle_frame_filter(thread_status, cx);
+                        })
+                    }
+                })
             });
     })
     .detach();
diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rs
index cff2ba8335..ab68fea115 100644
--- a/crates/debugger_ui/src/persistence.rs
+++ b/crates/debugger_ui/src/persistence.rs
@@ -270,12 +270,9 @@ pub(crate) fn deserialize_pane_layout(
                 .children
                 .iter()
                 .map(|child| match child {
-                    DebuggerPaneItem::Frames => Box::new(SubView::new(
-                        stack_frame_list.focus_handle(cx),
-                        stack_frame_list.clone().into(),
-                        DebuggerPaneItem::Frames,
-                        cx,
-                    )),
+                    DebuggerPaneItem::Frames => {
+                        Box::new(SubView::stack_frame_list(stack_frame_list.clone(), cx))
+                    }
                     DebuggerPaneItem::Variables => Box::new(SubView::new(
                         variable_list.focus_handle(cx),
                         variable_list.clone().into(),
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index a0e7c9a101..25146dc7e4 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -158,6 +158,29 @@ impl SubView {
         })
     }
 
+    pub(crate) fn stack_frame_list(
+        stack_frame_list: Entity<StackFrameList>,
+        cx: &mut App,
+    ) -> Entity<Self> {
+        let weak_list = stack_frame_list.downgrade();
+        let this = Self::new(
+            stack_frame_list.focus_handle(cx),
+            stack_frame_list.into(),
+            DebuggerPaneItem::Frames,
+            cx,
+        );
+
+        this.update(cx, |this, _| {
+            this.with_actions(Box::new(move |_, cx| {
+                weak_list
+                    .update(cx, |this, _| this.render_control_strip())
+                    .unwrap_or_else(|_| div().into_any_element())
+            }));
+        });
+
+        this
+    }
+
     pub(crate) fn console(console: Entity<Console>, cx: &mut App) -> Entity<Self> {
         let weak_console = console.downgrade();
         let this = Self::new(
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index a4ea4ab654..f80173c365 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -4,16 +4,17 @@ use std::time::Duration;
 
 use anyhow::{Context as _, Result, anyhow};
 use dap::StackFrameId;
+use db::kvp::KEY_VALUE_STORE;
 use gpui::{
-    AnyElement, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, ListState, MouseButton,
-    Stateful, Subscription, Task, WeakEntity, list,
+    Action, AnyElement, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, ListState,
+    MouseButton, Stateful, Subscription, Task, WeakEntity, list,
 };
 use util::debug_panic;
 
-use crate::StackTraceView;
+use crate::{StackTraceView, ToggleUserFrames};
 use language::PointUtf16;
 use project::debugger::breakpoint_store::ActiveStackFrame;
-use project::debugger::session::{Session, SessionEvent, StackFrame};
+use project::debugger::session::{Session, SessionEvent, StackFrame, ThreadStatus};
 use project::{ProjectItem, ProjectPath};
 use ui::{Scrollbar, ScrollbarState, Tooltip, prelude::*};
 use workspace::{ItemHandle, Workspace};
@@ -26,6 +27,34 @@ pub enum StackFrameListEvent {
     BuiltEntries,
 }
 
+/// Represents the filter applied to the stack frame list
+#[derive(PartialEq, Eq, Copy, Clone)]
+enum StackFrameFilter {
+    /// Show all frames
+    All,
+    /// Show only frames from the user's code
+    OnlyUserFrames,
+}
+
+impl StackFrameFilter {
+    fn from_str_or_default(s: impl AsRef<str>) -> Self {
+        match s.as_ref() {
+            "user" => StackFrameFilter::OnlyUserFrames,
+            "all" => StackFrameFilter::All,
+            _ => StackFrameFilter::All,
+        }
+    }
+}
+
+impl From<StackFrameFilter> for String {
+    fn from(filter: StackFrameFilter) -> Self {
+        match filter {
+            StackFrameFilter::All => "all".to_string(),
+            StackFrameFilter::OnlyUserFrames => "user".to_string(),
+        }
+    }
+}
+
 pub struct StackFrameList {
     focus_handle: FocusHandle,
     _subscription: Subscription,
@@ -37,6 +66,8 @@ pub struct StackFrameList {
     opened_stack_frame_id: Option<StackFrameId>,
     scrollbar_state: ScrollbarState,
     list_state: ListState,
+    list_filter: StackFrameFilter,
+    filter_entries_indices: Vec<usize>,
     error: Option<SharedString>,
     _refresh_task: Task<()>,
 }
@@ -73,6 +104,16 @@ impl StackFrameList {
         let list_state = ListState::new(0, gpui::ListAlignment::Top, px(1000.));
         let scrollbar_state = ScrollbarState::new(list_state.clone());
 
+        let list_filter = KEY_VALUE_STORE
+            .read_kvp(&format!(
+                "stack-frame-list-filter-{}",
+                session.read(cx).adapter().0
+            ))
+            .ok()
+            .flatten()
+            .map(StackFrameFilter::from_str_or_default)
+            .unwrap_or(StackFrameFilter::All);
+
         let mut this = Self {
             session,
             workspace,
@@ -80,9 +121,11 @@ impl StackFrameList {
             state,
             _subscription,
             entries: Default::default(),
+            filter_entries_indices: Vec::default(),
             error: None,
             selected_ix: None,
             opened_stack_frame_id: None,
+            list_filter,
             list_state,
             scrollbar_state,
             _refresh_task: Task::ready(()),
@@ -103,7 +146,15 @@ impl StackFrameList {
     ) -> Vec<dap::StackFrame> {
         self.entries
             .iter()
-            .flat_map(|frame| match frame {
+            .enumerate()
+            .filter(|(ix, _)| {
+                self.list_filter == StackFrameFilter::All
+                    || self
+                        .filter_entries_indices
+                        .binary_search_by_key(&ix, |ix| ix)
+                        .is_ok()
+            })
+            .flat_map(|(_, frame)| match frame {
                 StackFrameEntry::Normal(frame) => vec![frame.clone()],
                 StackFrameEntry::Label(frame) if show_labels => vec![frame.clone()],
                 StackFrameEntry::Collapsed(frames) if show_collapsed => frames.clone(),
@@ -126,7 +177,15 @@ impl StackFrameList {
         self.stack_frames(cx)
             .unwrap_or_default()
             .into_iter()
-            .map(|stack_frame| stack_frame.dap)
+            .enumerate()
+            .filter(|(ix, _)| {
+                self.list_filter == StackFrameFilter::All
+                    || self
+                        .filter_entries_indices
+                        .binary_search_by_key(&ix, |ix| ix)
+                        .is_ok()
+            })
+            .map(|(_, stack_frame)| stack_frame.dap)
             .collect()
     }
 
@@ -192,7 +251,32 @@ impl StackFrameList {
                 return;
             }
         };
-        for stack_frame in &stack_frames {
+
+        let worktree_prefixes: Vec<_> = self
+            .workspace
+            .read_with(cx, |workspace, cx| {
+                workspace
+                    .visible_worktrees(cx)
+                    .map(|tree| tree.read(cx).abs_path())
+                    .collect()
+            })
+            .unwrap_or_default();
+
+        let mut filter_entries_indices = Vec::default();
+        for (ix, stack_frame) in stack_frames.iter().enumerate() {
+            let frame_in_visible_worktree = stack_frame.dap.source.as_ref().is_some_and(|source| {
+                source.path.as_ref().is_some_and(|path| {
+                    worktree_prefixes
+                        .iter()
+                        .filter_map(|tree| tree.to_str())
+                        .any(|tree| path.starts_with(tree))
+                })
+            });
+
+            if frame_in_visible_worktree {
+                filter_entries_indices.push(ix);
+            }
+
             match stack_frame.dap.presentation_hint {
                 Some(dap::StackFramePresentationHint::Deemphasize)
                 | Some(dap::StackFramePresentationHint::Subtle) => {
@@ -225,8 +309,10 @@ impl StackFrameList {
         let collapsed_entries = std::mem::take(&mut collapsed_entries);
         if !collapsed_entries.is_empty() {
             entries.push(StackFrameEntry::Collapsed(collapsed_entries));
+            self.filter_entries_indices.push(entries.len() - 1);
         }
         self.entries = entries;
+        self.filter_entries_indices = filter_entries_indices;
 
         if let Some(ix) = first_stack_frame_with_path
             .or(first_stack_frame)
@@ -242,7 +328,14 @@ impl StackFrameList {
             self.selected_ix = ix;
         }
 
-        self.list_state.reset(self.entries.len());
+        match self.list_filter {
+            StackFrameFilter::All => {
+                self.list_state.reset(self.entries.len());
+            }
+            StackFrameFilter::OnlyUserFrames => {
+                self.list_state.reset(self.filter_entries_indices.len());
+            }
+        }
         cx.emit(StackFrameListEvent::BuiltEntries);
         cx.notify();
     }
@@ -572,6 +665,11 @@ impl StackFrameList {
     }
 
     fn render_entry(&self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
+        let ix = match self.list_filter {
+            StackFrameFilter::All => ix,
+            StackFrameFilter::OnlyUserFrames => self.filter_entries_indices[ix],
+        };
+
         match &self.entries[ix] {
             StackFrameEntry::Label(stack_frame) => self.render_label_entry(stack_frame, cx),
             StackFrameEntry::Normal(stack_frame) => self.render_normal_entry(ix, stack_frame, cx),
@@ -702,6 +800,67 @@ impl StackFrameList {
         self.activate_selected_entry(window, cx);
     }
 
+    pub(crate) fn toggle_frame_filter(
+        &mut self,
+        thread_status: Option<ThreadStatus>,
+        cx: &mut Context<Self>,
+    ) {
+        self.list_filter = match self.list_filter {
+            StackFrameFilter::All => StackFrameFilter::OnlyUserFrames,
+            StackFrameFilter::OnlyUserFrames => StackFrameFilter::All,
+        };
+
+        if let Some(database_id) = self
+            .workspace
+            .read_with(cx, |workspace, _| workspace.database_id())
+            .ok()
+            .flatten()
+        {
+            let database_id: i64 = database_id.into();
+            let save_task = KEY_VALUE_STORE.write_kvp(
+                format!(
+                    "stack-frame-list-filter-{}-{}",
+                    self.session.read(cx).adapter().0,
+                    database_id,
+                ),
+                self.list_filter.into(),
+            );
+            cx.background_spawn(save_task).detach();
+        }
+
+        if let Some(ThreadStatus::Stopped) = thread_status {
+            match self.list_filter {
+                StackFrameFilter::All => {
+                    self.list_state.reset(self.entries.len());
+                }
+                StackFrameFilter::OnlyUserFrames => {
+                    self.list_state.reset(self.filter_entries_indices.len());
+                    if !self
+                        .selected_ix
+                        .map(|ix| self.filter_entries_indices.contains(&ix))
+                        .unwrap_or_default()
+                    {
+                        self.selected_ix = None;
+                    }
+                }
+            }
+
+            if let Some(ix) = self.selected_ix {
+                let scroll_to = match self.list_filter {
+                    StackFrameFilter::All => ix,
+                    StackFrameFilter::OnlyUserFrames => self
+                        .filter_entries_indices
+                        .binary_search_by_key(&ix, |ix| *ix)
+                        .expect("This index will always exist"),
+                };
+                self.list_state.scroll_to_reveal_item(scroll_to);
+            }
+
+            cx.emit(StackFrameListEvent::BuiltEntries);
+            cx.notify();
+        }
+    }
+
     fn render_list(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         div().p_1().size_full().child(
             list(
@@ -711,6 +870,30 @@ impl StackFrameList {
             .size_full(),
         )
     }
+
+    pub(crate) fn render_control_strip(&self) -> AnyElement {
+        let tooltip_title = match self.list_filter {
+            StackFrameFilter::All => "Show stack frames from your project",
+            StackFrameFilter::OnlyUserFrames => "Show all stack frames",
+        };
+
+        h_flex()
+            .child(
+                IconButton::new(
+                    "filter-by-visible-worktree-stack-frame-list",
+                    IconName::ListFilter,
+                )
+                .tooltip(move |window, cx| {
+                    Tooltip::for_action(tooltip_title, &ToggleUserFrames, window, cx)
+                })
+                .toggle_state(self.list_filter == StackFrameFilter::OnlyUserFrames)
+                .icon_size(IconSize::Small)
+                .on_click(|_, window, cx| {
+                    window.dispatch_action(ToggleUserFrames.boxed_clone(), cx)
+                }),
+            )
+            .into_any_element()
+    }
 }
 
 impl Render for StackFrameList {
diff --git a/crates/debugger_ui/src/tests/stack_frame_list.rs b/crates/debugger_ui/src/tests/stack_frame_list.rs
index 95a6903c14..023056224e 100644
--- a/crates/debugger_ui/src/tests/stack_frame_list.rs
+++ b/crates/debugger_ui/src/tests/stack_frame_list.rs
@@ -752,3 +752,288 @@ async fn test_collapsed_entries(executor: BackgroundExecutor, cx: &mut TestAppCo
         });
     });
 }
+
+#[gpui::test]
+async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(executor.clone());
+
+    let test_file_content = r#"
+        function main() {
+            doSomething();
+        }
+
+        function doSomething() {
+            console.log('doing something');
+        }
+    "#
+    .unindent();
+
+    fs.insert_tree(
+        path!("/project"),
+        json!({
+           "src": {
+               "test.js": test_file_content,
+           }
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
+    let workspace = init_test_workspace(&project, cx).await;
+    let cx = &mut VisualTestContext::from_window(*workspace, cx);
+
+    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
+    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
+
+    client.on_request::<Threads, _>(move |_, _| {
+        Ok(dap::ThreadsResponse {
+            threads: vec![dap::Thread {
+                id: 1,
+                name: "Thread 1".into(),
+            }],
+        })
+    });
+
+    client.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
+
+    let stack_frames = vec![
+        StackFrame {
+            id: 1,
+            name: "main".into(),
+            source: Some(dap::Source {
+                name: Some("test.js".into()),
+                path: Some(path!("/project/src/test.js").into()),
+                source_reference: None,
+                presentation_hint: None,
+                origin: None,
+                sources: None,
+                adapter_data: None,
+                checksums: None,
+            }),
+            line: 2,
+            column: 1,
+            end_line: None,
+            end_column: None,
+            can_restart: None,
+            instruction_pointer_reference: None,
+            module_id: None,
+            presentation_hint: None,
+        },
+        StackFrame {
+            id: 2,
+            name: "node:internal/modules/cjs/loader".into(),
+            source: Some(dap::Source {
+                name: Some("loader.js".into()),
+                path: Some(path!("/usr/lib/node/internal/modules/cjs/loader.js").into()),
+                source_reference: None,
+                presentation_hint: None,
+                origin: None,
+                sources: None,
+                adapter_data: None,
+                checksums: None,
+            }),
+            line: 100,
+            column: 1,
+            end_line: None,
+            end_column: None,
+            can_restart: None,
+            instruction_pointer_reference: None,
+            module_id: None,
+            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
+        },
+        StackFrame {
+            id: 3,
+            name: "node:internal/modules/run_main".into(),
+            source: Some(dap::Source {
+                name: Some("run_main.js".into()),
+                path: Some(path!("/usr/lib/node/internal/modules/run_main.js").into()),
+                source_reference: None,
+                presentation_hint: None,
+                origin: None,
+                sources: None,
+                adapter_data: None,
+                checksums: None,
+            }),
+            line: 50,
+            column: 1,
+            end_line: None,
+            end_column: None,
+            can_restart: None,
+            instruction_pointer_reference: None,
+            module_id: None,
+            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
+        },
+        StackFrame {
+            id: 4,
+            name: "doSomething".into(),
+            source: Some(dap::Source {
+                name: Some("test.js".into()),
+                path: Some(path!("/project/src/test.js").into()),
+                source_reference: None,
+                presentation_hint: None,
+                origin: None,
+                sources: None,
+                adapter_data: None,
+                checksums: None,
+            }),
+            line: 3,
+            column: 1,
+            end_line: None,
+            end_column: None,
+            can_restart: None,
+            instruction_pointer_reference: None,
+            module_id: None,
+            presentation_hint: None,
+        },
+    ];
+
+    // Store a copy for assertions
+    let stack_frames_for_assertions = stack_frames.clone();
+
+    client.on_request::<StackTrace, _>({
+        let stack_frames = Arc::new(stack_frames.clone());
+        move |_, args| {
+            assert_eq!(1, args.thread_id);
+
+            Ok(dap::StackTraceResponse {
+                stack_frames: (*stack_frames).clone(),
+                total_frames: None,
+            })
+        }
+    });
+
+    client
+        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
+            reason: dap::StoppedEventReason::Pause,
+            description: None,
+            thread_id: Some(1),
+            preserve_focus_hint: None,
+            text: None,
+            all_threads_stopped: None,
+            hit_breakpoint_ids: None,
+        }))
+        .await;
+
+    cx.run_until_parked();
+
+    // trigger threads to load
+    active_debug_session_panel(workspace, cx).update(cx, |session, cx| {
+        session.running_state().update(cx, |running_state, cx| {
+            running_state
+                .session()
+                .update(cx, |session, cx| session.threads(cx));
+        });
+    });
+
+    cx.run_until_parked();
+
+    // select first thread
+    active_debug_session_panel(workspace, cx).update_in(cx, |session, window, cx| {
+        session.running_state().update(cx, |running_state, cx| {
+            running_state.select_current_thread(
+                &running_state
+                    .session()
+                    .update(cx, |session, cx| session.threads(cx)),
+                window,
+                cx,
+            );
+        });
+    });
+
+    cx.run_until_parked();
+
+    // trigger stack frames to load
+    active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
+        let stack_frame_list = debug_panel_item
+            .running_state()
+            .update(cx, |state, _| state.stack_frame_list().clone());
+
+        stack_frame_list.update(cx, |stack_frame_list, cx| {
+            stack_frame_list.dap_stack_frames(cx);
+        });
+    });
+
+    cx.run_until_parked();
+
+    active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
+        let stack_frame_list = debug_panel_item
+            .running_state()
+            .update(cx, |state, _| state.stack_frame_list().clone());
+
+        stack_frame_list.update(cx, |stack_frame_list, cx| {
+            stack_frame_list.build_entries(true, window, cx);
+
+            // Verify we have the expected collapsed structure
+            assert_eq!(
+                stack_frame_list.entries(),
+                &vec![
+                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                    StackFrameEntry::Collapsed(vec![
+                        stack_frames_for_assertions[1].clone(),
+                        stack_frames_for_assertions[2].clone()
+                    ]),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                ]
+            );
+
+            // Test 1: Verify filtering works
+            let all_frames = stack_frame_list.flatten_entries(true, false);
+            assert_eq!(all_frames.len(), 4, "Should see all 4 frames initially");
+
+            // Toggle to user frames only
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+
+            let user_frames = stack_frame_list.dap_stack_frames(cx);
+            assert_eq!(user_frames.len(), 2, "Should only see 2 user frames");
+            assert_eq!(user_frames[0].name, "main");
+            assert_eq!(user_frames[1].name, "doSomething");
+
+            // Test 2: Verify filtering toggles correctly
+            // Check we can toggle back and see all frames again
+
+            // Toggle back to all frames
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+
+            let all_frames_again = stack_frame_list.flatten_entries(true, false);
+            assert_eq!(
+                all_frames_again.len(),
+                4,
+                "Should see all 4 frames after toggling back"
+            );
+
+            // Test 3: Verify collapsed entries stay expanded
+            stack_frame_list.expand_collapsed_entry(1, cx);
+            assert_eq!(
+                stack_frame_list.entries(),
+                &vec![
+                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                ]
+            );
+
+            // Toggle filter twice
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+
+            // Verify entries remain expanded
+            assert_eq!(
+                stack_frame_list.entries(),
+                &vec![
+                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                ],
+                "Expanded entries should remain expanded after toggling filter"
+            );
+        });
+    });
+}
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index f7363395ae..f3609f7ea8 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -146,6 +146,7 @@ pub enum IconName {
     Library,
     LineHeight,
     ListCollapse,
+    ListFilter,
     ListTodo,
     ListTree,
     ListX,

From ff03dda90ae6c5d3c9aedc8768431456cfe9de7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Thu, 28 Aug 2025 16:40:43 +0800
Subject: [PATCH 425/823] Refactor `KeybindingKeystroke` (#37065)

This pull request refactors the `KeybindingKeystroke` struct and related
code to improve platform abstraction. The changes centralize
platform-specific logic within `KeybindingKeystroke` and update its
usage throughout the codebase, making the API more consistent and less
error-prone.



Release Notes:

- N/A
---
 crates/editor/src/editor.rs                   |  24 ++--
 crates/gpui/src/keymap.rs                     |   2 +-
 crates/gpui/src/keymap/binding.rs             |   2 +-
 crates/gpui/src/platform/keystroke.rs         | 117 +++++++++++++++---
 crates/gpui/src/platform/mac/platform.rs      |  10 +-
 crates/gpui/src/platform/windows/keyboard.rs  |  32 +++--
 crates/settings/src/keymap_file.rs            |  10 +-
 crates/settings_ui/src/keybindings.rs         |  50 +++-----
 .../src/ui_components/keystroke_input.rs      |  38 +++---
 crates/ui/src/components/keybinding.rs        |  19 ++-
 crates/zed/src/zed.rs                         |   2 +-
 11 files changed, 183 insertions(+), 123 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2d96ddf7a4..ea7cce5d8b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2588,7 +2588,7 @@ impl Editor {
                 || binding
                     .keystrokes()
                     .first()
-                    .is_some_and(|keystroke| keystroke.display_modifiers.modified())
+                    .is_some_and(|keystroke| keystroke.modifiers().modified())
         }))
     }
 
@@ -7686,16 +7686,16 @@ impl Editor {
             .keystroke()
         {
             modifiers_held = modifiers_held
-                || (&accept_keystroke.display_modifiers == modifiers
-                    && accept_keystroke.display_modifiers.modified());
+                || (accept_keystroke.modifiers() == modifiers
+                    && accept_keystroke.modifiers().modified());
         };
         if let Some(accept_partial_keystroke) = self
             .accept_edit_prediction_keybind(true, window, cx)
             .keystroke()
         {
             modifiers_held = modifiers_held
-                || (&accept_partial_keystroke.display_modifiers == modifiers
-                    && accept_partial_keystroke.display_modifiers.modified());
+                || (accept_partial_keystroke.modifiers() == modifiers
+                    && accept_partial_keystroke.modifiers().modified());
         }
 
         if modifiers_held {
@@ -9044,7 +9044,7 @@ impl Editor {
 
         let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
 
-        let modifiers_color = if accept_keystroke.display_modifiers == window.modifiers() {
+        let modifiers_color = if *accept_keystroke.modifiers() == window.modifiers() {
             Color::Accent
         } else {
             Color::Muted
@@ -9056,19 +9056,19 @@ impl Editor {
             .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
             .text_size(TextSize::XSmall.rems(cx))
             .child(h_flex().children(ui::render_modifiers(
-                &accept_keystroke.display_modifiers,
+                accept_keystroke.modifiers(),
                 PlatformStyle::platform(),
                 Some(modifiers_color),
                 Some(IconSize::XSmall.rems().into()),
                 true,
             )))
             .when(is_platform_style_mac, |parent| {
-                parent.child(accept_keystroke.display_key.clone())
+                parent.child(accept_keystroke.key().to_string())
             })
             .when(!is_platform_style_mac, |parent| {
                 parent.child(
                     Key::new(
-                        util::capitalize(&accept_keystroke.display_key),
+                        util::capitalize(accept_keystroke.key()),
                         Some(Color::Default),
                     )
                     .size(Some(IconSize::XSmall.rems().into())),
@@ -9249,7 +9249,7 @@ impl Editor {
                                         accept_keystroke.as_ref(),
                                         |el, accept_keystroke| {
                                             el.child(h_flex().children(ui::render_modifiers(
-                                                &accept_keystroke.display_modifiers,
+                                                accept_keystroke.modifiers(),
                                                 PlatformStyle::platform(),
                                                 Some(Color::Default),
                                                 Some(IconSize::XSmall.rems().into()),
@@ -9319,7 +9319,7 @@ impl Editor {
                         .child(completion),
                 )
                 .when_some(accept_keystroke, |el, accept_keystroke| {
-                    if !accept_keystroke.display_modifiers.modified() {
+                    if !accept_keystroke.modifiers().modified() {
                         return el;
                     }
 
@@ -9338,7 +9338,7 @@ impl Editor {
                                     .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
                                     .when(is_platform_style_mac, |parent| parent.gap_1())
                                     .child(h_flex().children(ui::render_modifiers(
-                                        &accept_keystroke.display_modifiers,
+                                        accept_keystroke.modifiers(),
                                         PlatformStyle::platform(),
                                         Some(if !has_completion {
                                             Color::Muted
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index b3db09d821..12f082eb60 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -638,7 +638,7 @@ mod tests {
         fn assert_bindings(keymap: &Keymap, action: &dyn Action, expected: &[&str]) {
             let actual = keymap
                 .bindings_for_action(action)
-                .map(|binding| binding.keystrokes[0].inner.unparse())
+                .map(|binding| binding.keystrokes[0].inner().unparse())
                 .collect::<Vec<_>>();
             assert_eq!(actual, expected, "{:?}", action);
         }
diff --git a/crates/gpui/src/keymap/binding.rs b/crates/gpui/src/keymap/binding.rs
index a7cf9d5c54..fc4b32941b 100644
--- a/crates/gpui/src/keymap/binding.rs
+++ b/crates/gpui/src/keymap/binding.rs
@@ -57,7 +57,7 @@ impl KeyBinding {
             .split_whitespace()
             .map(|source| {
                 let keystroke = Keystroke::parse(source)?;
-                Ok(KeybindingKeystroke::new(
+                Ok(KeybindingKeystroke::new_with_mapper(
                     keystroke,
                     use_key_equivalents,
                     keyboard_mapper,
diff --git a/crates/gpui/src/platform/keystroke.rs b/crates/gpui/src/platform/keystroke.rs
index 6ce17c3a01..4a2bfc785e 100644
--- a/crates/gpui/src/platform/keystroke.rs
+++ b/crates/gpui/src/platform/keystroke.rs
@@ -36,11 +36,13 @@ pub struct Keystroke {
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct KeybindingKeystroke {
     /// The GPUI representation of the keystroke.
-    pub inner: Keystroke,
+    inner: Keystroke,
     /// The modifiers to display.
-    pub display_modifiers: Modifiers,
+    #[cfg(target_os = "windows")]
+    display_modifiers: Modifiers,
     /// The key to display.
-    pub display_key: String,
+    #[cfg(target_os = "windows")]
+    display_key: String,
 }
 
 /// Error type for `Keystroke::parse`. This is used instead of `anyhow::Error` so that Zed can use
@@ -262,8 +264,17 @@ impl Keystroke {
 }
 
 impl KeybindingKeystroke {
-    /// Create a new keybinding keystroke from the given keystroke
-    pub fn new(
+    #[cfg(target_os = "windows")]
+    pub(crate) fn new(inner: Keystroke, display_modifiers: Modifiers, display_key: String) -> Self {
+        KeybindingKeystroke {
+            inner,
+            display_modifiers,
+            display_key,
+        }
+    }
+
+    /// Create a new keybinding keystroke from the given keystroke using the given keyboard mapper.
+    pub fn new_with_mapper(
         inner: Keystroke,
         use_key_equivalents: bool,
         keyboard_mapper: &dyn PlatformKeyboardMapper,
@@ -271,19 +282,95 @@ impl KeybindingKeystroke {
         keyboard_mapper.map_key_equivalent(inner, use_key_equivalents)
     }
 
-    pub(crate) fn from_keystroke(keystroke: Keystroke) -> Self {
-        let key = keystroke.key.clone();
-        let modifiers = keystroke.modifiers;
-        KeybindingKeystroke {
-            inner: keystroke,
-            display_modifiers: modifiers,
-            display_key: key,
+    /// Create a new keybinding keystroke from the given keystroke, without any platform-specific mapping.
+    pub fn from_keystroke(keystroke: Keystroke) -> Self {
+        #[cfg(target_os = "windows")]
+        {
+            let key = keystroke.key.clone();
+            let modifiers = keystroke.modifiers;
+            KeybindingKeystroke {
+                inner: keystroke,
+                display_modifiers: modifiers,
+                display_key: key,
+            }
         }
+        #[cfg(not(target_os = "windows"))]
+        {
+            KeybindingKeystroke { inner: keystroke }
+        }
+    }
+
+    /// Returns the GPUI representation of the keystroke.
+    pub fn inner(&self) -> &Keystroke {
+        &self.inner
+    }
+
+    /// Returns the modifiers.
+    ///
+    /// Platform-specific behavior:
+    /// - On macOS and Linux, this modifiers is the same as `inner.modifiers`, which is the GPUI representation of the keystroke.
+    /// - On Windows, this modifiers is the display modifiers, for example, a `ctrl-@` keystroke will have `inner.modifiers` as
+    /// `Modifiers::control()` and `display_modifiers` as `Modifiers::control_shift()`.
+    pub fn modifiers(&self) -> &Modifiers {
+        #[cfg(target_os = "windows")]
+        {
+            &self.display_modifiers
+        }
+        #[cfg(not(target_os = "windows"))]
+        {
+            &self.inner.modifiers
+        }
+    }
+
+    /// Returns the key.
+    ///
+    /// Platform-specific behavior:
+    /// - On macOS and Linux, this key is the same as `inner.key`, which is the GPUI representation of the keystroke.
+    /// - On Windows, this key is the display key, for example, a `ctrl-@` keystroke will have `inner.key` as `@` and `display_key` as `2`.
+    pub fn key(&self) -> &str {
+        #[cfg(target_os = "windows")]
+        {
+            &self.display_key
+        }
+        #[cfg(not(target_os = "windows"))]
+        {
+            &self.inner.key
+        }
+    }
+
+    /// Sets the modifiers. On Windows this modifies both `inner.modifiers` and `display_modifiers`.
+    pub fn set_modifiers(&mut self, modifiers: Modifiers) {
+        self.inner.modifiers = modifiers;
+        #[cfg(target_os = "windows")]
+        {
+            self.display_modifiers = modifiers;
+        }
+    }
+
+    /// Sets the key. On Windows this modifies both `inner.key` and `display_key`.
+    pub fn set_key(&mut self, key: String) {
+        #[cfg(target_os = "windows")]
+        {
+            self.display_key = key.clone();
+        }
+        self.inner.key = key;
     }
 
     /// Produces a representation of this key that Parse can understand.
     pub fn unparse(&self) -> String {
-        unparse(&self.display_modifiers, &self.display_key)
+        #[cfg(target_os = "windows")]
+        {
+            unparse(&self.display_modifiers, &self.display_key)
+        }
+        #[cfg(not(target_os = "windows"))]
+        {
+            unparse(&self.inner.modifiers, &self.inner.key)
+        }
+    }
+
+    /// Removes the key_char
+    pub fn remove_key_char(&mut self) {
+        self.inner.key_char = None;
     }
 }
 
@@ -350,8 +437,8 @@ impl std::fmt::Display for Keystroke {
 
 impl std::fmt::Display for KeybindingKeystroke {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        display_modifiers(&self.display_modifiers, f)?;
-        display_key(&self.display_key, f)
+        display_modifiers(self.modifiers(), f)?;
+        display_key(self.key(), f)
     }
 }
 
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 30453def00..dea04d89a0 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -354,19 +354,19 @@ impl MacPlatform {
                             let mut mask = NSEventModifierFlags::empty();
                             for (modifier, flag) in &[
                                 (
-                                    keystroke.display_modifiers.platform,
+                                    keystroke.modifiers().platform,
                                     NSEventModifierFlags::NSCommandKeyMask,
                                 ),
                                 (
-                                    keystroke.display_modifiers.control,
+                                    keystroke.modifiers().control,
                                     NSEventModifierFlags::NSControlKeyMask,
                                 ),
                                 (
-                                    keystroke.display_modifiers.alt,
+                                    keystroke.modifiers().alt,
                                     NSEventModifierFlags::NSAlternateKeyMask,
                                 ),
                                 (
-                                    keystroke.display_modifiers.shift,
+                                    keystroke.modifiers().shift,
                                     NSEventModifierFlags::NSShiftKeyMask,
                                 ),
                             ] {
@@ -379,7 +379,7 @@ impl MacPlatform {
                                 .initWithTitle_action_keyEquivalent_(
                                     ns_string(name),
                                     selector,
-                                    ns_string(key_to_native(&keystroke.display_key).as_ref()),
+                                    ns_string(key_to_native(keystroke.key()).as_ref()),
                                 )
                                 .autorelease();
                             if Self::os_version() >= SemanticVersion::new(12, 0, 0) {
diff --git a/crates/gpui/src/platform/windows/keyboard.rs b/crates/gpui/src/platform/windows/keyboard.rs
index 0eb97fbb0c..259ebaebff 100644
--- a/crates/gpui/src/platform/windows/keyboard.rs
+++ b/crates/gpui/src/platform/windows/keyboard.rs
@@ -83,11 +83,7 @@ impl PlatformKeyboardMapper for WindowsKeyboardMapper {
             ..keystroke.modifiers
         };
 
-        KeybindingKeystroke {
-            inner: keystroke,
-            display_modifiers: modifiers,
-            display_key: key,
-        }
+        KeybindingKeystroke::new(keystroke, modifiers, key)
     }
 
     fn get_key_equivalents(&self) -> Option<&HashMap<char, char>> {
@@ -335,9 +331,9 @@ mod tests {
             key_char: None,
         };
         let mapped = mapper.map_key_equivalent(keystroke.clone(), true);
-        assert_eq!(mapped.inner, keystroke);
-        assert_eq!(mapped.display_key, "a");
-        assert_eq!(mapped.display_modifiers, Modifiers::control());
+        assert_eq!(*mapped.inner(), keystroke);
+        assert_eq!(mapped.key(), "a");
+        assert_eq!(*mapped.modifiers(), Modifiers::control());
 
         // Shifted case, ctrl-$
         let keystroke = Keystroke {
@@ -346,9 +342,9 @@ mod tests {
             key_char: None,
         };
         let mapped = mapper.map_key_equivalent(keystroke.clone(), true);
-        assert_eq!(mapped.inner, keystroke);
-        assert_eq!(mapped.display_key, "4");
-        assert_eq!(mapped.display_modifiers, Modifiers::control_shift());
+        assert_eq!(*mapped.inner(), keystroke);
+        assert_eq!(mapped.key(), "4");
+        assert_eq!(*mapped.modifiers(), Modifiers::control_shift());
 
         // Shifted case, but shift is true
         let keystroke = Keystroke {
@@ -357,9 +353,9 @@ mod tests {
             key_char: None,
         };
         let mapped = mapper.map_key_equivalent(keystroke, true);
-        assert_eq!(mapped.inner.modifiers, Modifiers::control());
-        assert_eq!(mapped.display_key, "4");
-        assert_eq!(mapped.display_modifiers, Modifiers::control_shift());
+        assert_eq!(mapped.inner().modifiers, Modifiers::control());
+        assert_eq!(mapped.key(), "4");
+        assert_eq!(*mapped.modifiers(), Modifiers::control_shift());
 
         // Windows style
         let keystroke = Keystroke {
@@ -368,9 +364,9 @@ mod tests {
             key_char: None,
         };
         let mapped = mapper.map_key_equivalent(keystroke, true);
-        assert_eq!(mapped.inner.modifiers, Modifiers::control());
-        assert_eq!(mapped.inner.key, "$");
-        assert_eq!(mapped.display_key, "4");
-        assert_eq!(mapped.display_modifiers, Modifiers::control_shift());
+        assert_eq!(mapped.inner().modifiers, Modifiers::control());
+        assert_eq!(mapped.inner().key, "$");
+        assert_eq!(mapped.key(), "4");
+        assert_eq!(*mapped.modifiers(), Modifiers::control_shift());
     }
 }
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index 0e8303c4c1..91fcca8d5c 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -820,7 +820,11 @@ impl KeymapFile {
                         .split_whitespace()
                         .map(|source| {
                             let keystroke = Keystroke::parse(source)?;
-                            Ok(KeybindingKeystroke::new(keystroke, false, keyboard_mapper))
+                            Ok(KeybindingKeystroke::new_with_mapper(
+                                keystroke,
+                                false,
+                                keyboard_mapper,
+                            ))
                         })
                         .collect::<Result<Vec<_>, InvalidKeystrokeError>>()
                     else {
@@ -830,7 +834,7 @@ impl KeymapFile {
                         || !keystrokes
                             .iter()
                             .zip(target.keystrokes)
-                            .all(|(a, b)| a.inner.should_match(b))
+                            .all(|(a, b)| a.inner().should_match(b))
                     {
                         continue;
                     }
@@ -1065,7 +1069,7 @@ mod tests {
         keystrokes
             .split(' ')
             .map(|s| {
-                KeybindingKeystroke::new(
+                KeybindingKeystroke::new_with_mapper(
                     Keystroke::parse(s).expect("Keystrokes valid"),
                     false,
                     &DummyKeyboardMapper,
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 76c7166007..161e1e768d 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -14,9 +14,9 @@ use gpui::{
     Action, AppContext as _, AsyncApp, Axis, ClickEvent, Context, DismissEvent, Entity,
     EventEmitter, FocusHandle, Focusable, Global, IsZero,
     KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or},
-    KeyContext, KeybindingKeystroke, Keystroke, MouseButton, PlatformKeyboardMapper, Point,
-    ScrollStrategy, ScrollWheelEvent, Stateful, StyledText, Subscription, Task,
-    TextStyleRefinement, WeakEntity, actions, anchored, deferred, div,
+    KeyContext, KeybindingKeystroke, MouseButton, PlatformKeyboardMapper, Point, ScrollStrategy,
+    ScrollWheelEvent, Stateful, StyledText, Subscription, Task, TextStyleRefinement, WeakEntity,
+    actions, anchored, deferred, div,
 };
 use language::{Language, LanguageConfig, ToOffset as _};
 use notifications::status_toast::{StatusToast, ToastIcon};
@@ -420,7 +420,7 @@ fn keystrokes_match_exactly(
 ) -> bool {
     keystrokes1.len() == keystrokes2.len()
         && keystrokes1.iter().zip(keystrokes2).all(|(k1, k2)| {
-            k1.inner.key == k2.inner.key && k1.inner.modifiers == k2.inner.modifiers
+            k1.inner().key == k2.inner().key && k1.inner().modifiers == k2.inner().modifiers
         })
 }
 
@@ -532,7 +532,7 @@ impl KeymapEditor {
 
                 let keystroke_query = keystroke_query
                     .into_iter()
-                    .map(|keystroke| keystroke.inner.unparse())
+                    .map(|keystroke| keystroke.inner().unparse())
                     .collect::<Vec<String>>()
                     .join(" ");
 
@@ -606,13 +606,13 @@ impl KeymapEditor {
                                             let query = &keystroke_query[query_cursor];
                                             let keystroke = &keystrokes[keystroke_cursor];
                                             let matches = query
-                                                .inner
+                                                .inner()
                                                 .modifiers
-                                                .is_subset_of(&keystroke.inner.modifiers)
-                                                && ((query.inner.key.is_empty()
-                                                    || query.inner.key == keystroke.inner.key)
-                                                    && query.inner.key_char.as_ref().is_none_or(
-                                                        |q_kc| q_kc == &keystroke.inner.key,
+                                                .is_subset_of(&keystroke.inner().modifiers)
+                                                && ((query.inner().key.is_empty()
+                                                    || query.inner().key == keystroke.inner().key)
+                                                    && query.inner().key_char.as_ref().is_none_or(
+                                                        |q_kc| q_kc == &keystroke.inner().key,
                                                     ));
                                             if matches {
                                                 found_count += 1;
@@ -2256,12 +2256,10 @@ impl KeybindingEditorModal {
         let fs = self.fs.clone();
         let tab_size = cx.global::<settings::SettingsStore>().json_tab_size();
 
-        let new_keystrokes = self
-            .validate_keystrokes(cx)
-            .map_err(InputError::error)?
-            .into_iter()
-            .map(remove_key_char)
-            .collect::<Vec<_>>();
+        let mut new_keystrokes = self.validate_keystrokes(cx).map_err(InputError::error)?;
+        new_keystrokes
+            .iter_mut()
+            .for_each(|ks| ks.remove_key_char());
 
         let new_context = self.validate_context(cx).map_err(InputError::error)?;
         let new_action_args = self
@@ -2454,24 +2452,6 @@ impl KeybindingEditorModal {
     }
 }
 
-fn remove_key_char(
-    KeybindingKeystroke {
-        inner,
-        display_modifiers,
-        display_key,
-    }: KeybindingKeystroke,
-) -> KeybindingKeystroke {
-    KeybindingKeystroke {
-        inner: Keystroke {
-            modifiers: inner.modifiers,
-            key: inner.key,
-            key_char: None,
-        },
-        display_modifiers,
-        display_key,
-    }
-}
-
 impl Render for KeybindingEditorModal {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let theme = cx.theme().colors();
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/settings_ui/src/ui_components/keystroke_input.rs
index 5d27598d91..e6b2ff7105 100644
--- a/crates/settings_ui/src/ui_components/keystroke_input.rs
+++ b/crates/settings_ui/src/ui_components/keystroke_input.rs
@@ -116,7 +116,7 @@ impl KeystrokeInput {
             && self
                 .keystrokes
                 .last()
-                .is_some_and(|last| last.display_key.is_empty())
+                .is_some_and(|last| last.key().is_empty())
         {
             return &self.keystrokes[..self.keystrokes.len() - 1];
         }
@@ -124,15 +124,11 @@ impl KeystrokeInput {
     }
 
     fn dummy(modifiers: Modifiers) -> KeybindingKeystroke {
-        KeybindingKeystroke {
-            inner: Keystroke {
-                modifiers,
-                key: "".to_string(),
-                key_char: None,
-            },
-            display_modifiers: modifiers,
-            display_key: "".to_string(),
-        }
+        KeybindingKeystroke::from_keystroke(Keystroke {
+            modifiers,
+            key: "".to_string(),
+            key_char: None,
+        })
     }
 
     fn keystrokes_changed(&self, cx: &mut Context<Self>) {
@@ -258,7 +254,7 @@ impl KeystrokeInput {
         self.keystrokes_changed(cx);
 
         if let Some(last) = self.keystrokes.last_mut()
-            && last.display_key.is_empty()
+            && last.key().is_empty()
             && keystrokes_len <= Self::KEYSTROKE_COUNT_MAX
         {
             if !self.search && !event.modifiers.modified() {
@@ -267,15 +263,14 @@ impl KeystrokeInput {
             }
             if self.search {
                 if self.previous_modifiers.modified() {
-                    last.display_modifiers |= event.modifiers;
-                    last.inner.modifiers |= event.modifiers;
+                    let modifiers = *last.modifiers() | event.modifiers;
+                    last.set_modifiers(modifiers);
                 } else {
                     self.keystrokes.push(Self::dummy(event.modifiers));
                 }
                 self.previous_modifiers |= event.modifiers;
             } else {
-                last.display_modifiers = event.modifiers;
-                last.inner.modifiers = event.modifiers;
+                last.set_modifiers(event.modifiers);
                 return;
             }
         } else if keystrokes_len < Self::KEYSTROKE_COUNT_MAX {
@@ -303,10 +298,13 @@ impl KeystrokeInput {
             return;
         }
 
-        let keystroke =
-            KeybindingKeystroke::new(keystroke.clone(), false, cx.keyboard_mapper().as_ref());
+        let keystroke = KeybindingKeystroke::new_with_mapper(
+            keystroke.clone(),
+            false,
+            cx.keyboard_mapper().as_ref(),
+        );
         if let Some(last) = self.keystrokes.last()
-            && last.display_key.is_empty()
+            && last.key().is_empty()
             && (!self.search || self.previous_modifiers.modified())
         {
             self.keystrokes.pop();
@@ -825,7 +823,7 @@ mod tests {
                 input
                     .keystrokes
                     .iter()
-                    .map(|keystroke| keystroke.inner.clone())
+                    .map(|keystroke| keystroke.inner().clone())
                     .collect()
             });
             Self::expect_keystrokes_equal(&actual, expected);
@@ -1094,7 +1092,7 @@ mod tests {
             }
 
             fn keystrokes_str(ks: &[KeybindingKeystroke]) -> String {
-                ks.iter().map(|ks| ks.inner.unparse()).join(" ")
+                ks.iter().map(|ks| ks.inner().unparse()).join(" ")
             }
         }
     }
diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs
index 81817045dc..98703f65f4 100644
--- a/crates/ui/src/components/keybinding.rs
+++ b/crates/ui/src/components/keybinding.rs
@@ -124,7 +124,7 @@ impl RenderOnce for KeyBinding {
                     "KEY_BINDING-{}",
                     self.keystrokes
                         .iter()
-                        .map(|k| k.display_key.to_string())
+                        .map(|k| k.key().to_string())
                         .collect::<Vec<_>>()
                         .join(" ")
                 )
@@ -165,8 +165,8 @@ pub fn render_keybinding_keystroke(
     if use_text {
         let element = Key::new(
             keystroke_text(
-                &keystroke.display_modifiers,
-                &keystroke.display_key,
+                keystroke.modifiers(),
+                keystroke.key(),
                 platform_style,
                 vim_mode,
             ),
@@ -178,18 +178,13 @@ pub fn render_keybinding_keystroke(
     } else {
         let mut elements = Vec::new();
         elements.extend(render_modifiers(
-            &keystroke.display_modifiers,
+            keystroke.modifiers(),
             platform_style,
             color,
             size,
             true,
         ));
-        elements.push(render_key(
-            &keystroke.display_key,
-            color,
-            platform_style,
-            size,
-        ));
+        elements.push(render_key(keystroke.key(), color, platform_style, size));
         elements
     }
 }
@@ -418,8 +413,8 @@ pub fn text_for_keybinding_keystrokes(keystrokes: &[KeybindingKeystroke], cx: &A
         .iter()
         .map(|keystroke| {
             keystroke_text(
-                &keystroke.display_modifiers,
-                &keystroke.display_key,
+                keystroke.modifiers(),
+                keystroke.key(),
                 platform_style,
                 vim_enabled,
             )
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index a12249d6a4..587065f9b1 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4738,7 +4738,7 @@ mod tests {
                 // and key strokes contain the given key
                 bindings
                     .into_iter()
-                    .any(|binding| binding.keystrokes().iter().any(|k| k.display_key == key)),
+                    .any(|binding| binding.keystrokes().iter().any(|k| k.key() == key)),
                 "On {} Failed to find {} with key binding {}",
                 line,
                 action.name(),

From 54609d4d00ad06635f4b63874102c2e45081f273 Mon Sep 17 00:00:00 2001
From: Lorenzo Stella <lorenzostella@gmail.com>
Date: Thu, 28 Aug 2025 12:35:30 +0200
Subject: [PATCH 426/823] Fix boolean settings in "Agent Settings"
 documentation page (#37068)

This fixes some errors in the examples in the "Agent Settings" page at
https://zed.dev/docs/ai/agent-settings#agent-settings, where strings
"true" and "false" are used in place of the proper boolean JSON values:
strings don't work for all those settings, and are marked as errors when
editing settings.json, while booleans do work.

Release Notes:

- N/A
---
 docs/src/ai/agent-settings.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/src/ai/agent-settings.md b/docs/src/ai/agent-settings.md
index ff97bcb8ee..d78f812e47 100644
--- a/docs/src/ai/agent-settings.md
+++ b/docs/src/ai/agent-settings.md
@@ -131,7 +131,7 @@ The default value is `false`.
 ```json
 {
   "agent": {
-    "always_allow_tool_actions": "true"
+    "always_allow_tool_actions": true
   }
 }
 ```
@@ -146,7 +146,7 @@ The default value is `false`.
 ```json
 {
   "agent": {
-    "single_file_review": "true"
+    "single_file_review": true
   }
 }
 ```
@@ -163,7 +163,7 @@ The default value is `false`.
 ```json
 {
   "agent": {
-    "play_sound_when_agent_done": "true"
+    "play_sound_when_agent_done": true
   }
 }
 ```
@@ -179,7 +179,7 @@ The default value is `false`.
 ```json
 {
   "agent": {
-    "use_modifier_to_send": "true"
+    "use_modifier_to_send": true
   }
 }
 ```
@@ -194,7 +194,7 @@ It is set to `true` by default, but if set to false, the card's height is capped
 ```json
 {
   "agent": {
-    "expand_edit_card": "false"
+    "expand_edit_card": false
   }
 }
 ```
@@ -207,7 +207,7 @@ It is set to `true` by default, but if set to false, the card will be fully coll
 ```json
 {
   "agent": {
-    "expand_terminal_card": "false"
+    "expand_terminal_card": false
   }
 }
 ```
@@ -220,7 +220,7 @@ The default value is `true`.
 ```json
 {
   "agent": {
-    "enable_feedback": "false"
+    "enable_feedback": false
   }
 }
 ```

From 4981c33bf36f3b2f40d91fbd9433e16e1a0e32c7 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 28 Aug 2025 12:57:09 +0200
Subject: [PATCH 427/823] acp: Don't cancel editing when scrolling message out
 of view (#37020)

Release Notes:

- agent: Fixed a bug that canceled editing when scrolling the user
message out of view.

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/agent_ui/src/acp/entry_view_state.rs | 11 +++++++++--
 crates/agent_ui/src/acp/thread_view.rs      | 14 +++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index becf6953fd..76b3709325 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -6,8 +6,8 @@ use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, Focusable, ScrollHandle,
-    TextStyleRefinement, WeakEntity, Window,
+    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
+    ScrollHandle, TextStyleRefinement, WeakEntity, Window,
 };
 use language::language_settings::SoftWrap;
 use project::Project;
@@ -247,6 +247,13 @@ pub enum Entry {
 }
 
 impl Entry {
+    pub fn focus_handle(&self, cx: &App) -> Option<FocusHandle> {
+        match self {
+            Self::UserMessage(editor) => Some(editor.read(cx).focus_handle(cx)),
+            Self::AssistantMessage(_) | Self::Content(_) => None,
+        }
+    }
+
     pub fn message_editor(&self) -> Option<&Entity<MessageEditor>> {
         match self {
             Self::UserMessage(editor) => Some(editor),
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 94b385c04e..57d90734ef 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -479,11 +479,14 @@ impl AcpThreadView {
                             .set(thread.read(cx).prompt_capabilities());
 
                         let count = thread.read(cx).entries().len();
-                        this.list_state.splice(0..0, count);
                         this.entry_view_state.update(cx, |view_state, cx| {
                             for ix in 0..count {
                                 view_state.sync_entry(ix, &thread, window, cx);
                             }
+                            this.list_state.splice_focusable(
+                                0..0,
+                                (0..count).map(|ix| view_state.entry(ix)?.focus_handle(cx)),
+                            );
                         });
 
                         if let Some(resume) = resume_thread {
@@ -1116,9 +1119,14 @@ impl AcpThreadView {
                 let len = thread.read(cx).entries().len();
                 let index = len - 1;
                 self.entry_view_state.update(cx, |view_state, cx| {
-                    view_state.sync_entry(index, thread, window, cx)
+                    view_state.sync_entry(index, thread, window, cx);
+                    self.list_state.splice_focusable(
+                        index..index,
+                        [view_state
+                            .entry(index)
+                            .and_then(|entry| entry.focus_handle(cx))],
+                    );
                 });
-                self.list_state.splice(index..index, 1);
             }
             AcpThreadEvent::EntryUpdated(index) => {
                 self.entry_view_state.update(cx, |view_state, cx| {

From 39d86eeb7f93001ba526eb97f58102034d522f8c Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 28 Aug 2025 14:00:44 +0200
Subject: [PATCH 428/823] Trim API key when submitting requests to LLM
 providers (#37082)

This prevents the common footgun of copy/pasting an API key
starting/ending with extra newlines, which would lead to a "bad request"
error.

Closes #37038

Release Notes:

- agent: Support pasting language model API keys that contain newlines.
---
 crates/anthropic/src/anthropic.rs     | 4 ++--
 crates/deepseek/src/deepseek.rs       | 2 +-
 crates/google_ai/src/google_ai.rs     | 1 +
 crates/mistral/src/mistral.rs         | 2 +-
 crates/open_ai/src/open_ai.rs         | 4 ++--
 crates/open_router/src/open_router.rs | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index 3ff1666755..773bb557de 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -373,7 +373,7 @@ pub async fn complete(
         .uri(uri)
         .header("Anthropic-Version", "2023-06-01")
         .header("Anthropic-Beta", beta_headers)
-        .header("X-Api-Key", api_key)
+        .header("X-Api-Key", api_key.trim())
         .header("Content-Type", "application/json");
 
     let serialized_request =
@@ -526,7 +526,7 @@ pub async fn stream_completion_with_rate_limit_info(
         .uri(uri)
         .header("Anthropic-Version", "2023-06-01")
         .header("Anthropic-Beta", beta_headers)
-        .header("X-Api-Key", api_key)
+        .header("X-Api-Key", api_key.trim())
         .header("Content-Type", "application/json");
     let serialized_request =
         serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
diff --git a/crates/deepseek/src/deepseek.rs b/crates/deepseek/src/deepseek.rs
index c49270febe..c2554c67e9 100644
--- a/crates/deepseek/src/deepseek.rs
+++ b/crates/deepseek/src/deepseek.rs
@@ -268,7 +268,7 @@ pub async fn stream_completion(
         .method(Method::POST)
         .uri(uri)
         .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key));
+        .header("Authorization", format!("Bearer {}", api_key.trim()));
 
     let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
     let mut response = client.send(request).await?;
diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
index ca0aa309b1..92fd531893 100644
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -13,6 +13,7 @@ pub async fn stream_generate_content(
     api_key: &str,
     mut request: GenerateContentRequest,
 ) -> Result<BoxStream<'static, Result<GenerateContentResponse>>> {
+    let api_key = api_key.trim();
     validate_generate_content_request(&request)?;
 
     // The `model` field is emptied as it is provided as a path parameter.
diff --git a/crates/mistral/src/mistral.rs b/crates/mistral/src/mistral.rs
index 5b4d05377c..55986e7e5b 100644
--- a/crates/mistral/src/mistral.rs
+++ b/crates/mistral/src/mistral.rs
@@ -482,7 +482,7 @@ pub async fn stream_completion(
         .method(Method::POST)
         .uri(uri)
         .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key));
+        .header("Authorization", format!("Bearer {}", api_key.trim()));
 
     let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
     let mut response = client.send(request).await?;
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 08be82b830..f9a983b433 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -461,7 +461,7 @@ pub async fn stream_completion(
         .method(Method::POST)
         .uri(uri)
         .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key));
+        .header("Authorization", format!("Bearer {}", api_key.trim()));
 
     let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
     let mut response = client.send(request).await?;
@@ -565,7 +565,7 @@ pub fn embed<'a>(
         .method(Method::POST)
         .uri(uri)
         .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key))
+        .header("Authorization", format!("Bearer {}", api_key.trim()))
         .body(body)
         .map(|request| client.send(request));
 
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index b7e6d69d8f..65ef519d2c 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -424,7 +424,7 @@ pub async fn complete(
         .method(Method::POST)
         .uri(uri)
         .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key))
+        .header("Authorization", format!("Bearer {}", api_key.trim()))
         .header("HTTP-Referer", "https://zed.dev")
         .header("X-Title", "Zed Editor");
 

From f127ba82d15fbe4add458281902bfb89fc35158a Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 28 Aug 2025 15:32:44 +0300
Subject: [PATCH 429/823] Remote LSP logs (#37083)

Take 2: https://github.com/zed-industries/zed/pull/36709 but without the
very bad `cfg`-based approach for storing the RPC logs.

--------------

Enables LSP log tracing in both remote collab and remote ssh
environments.
Server logs and server RPC traces can now be viewed remotely, and the
LSP button is now shown in such projects too.

Closes https://github.com/zed-industries/zed/issues/28557

Co-Authored-By: Kirill <kirill@zed.dev>
Co-Authored-By: Lukas <lukas@zed.dev>

Release Notes:

- Enabled LSP log tracing in both remote collab and remote ssh
environments

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 Cargo.lock                                    |    1 +
 .../20221109000000_test_schema.sql            |    1 +
 .../20250827084812_worktree_in_servers.sql    |    2 +
 crates/collab/src/db/queries/projects.rs      |    4 +-
 crates/collab/src/db/queries/rooms.rs         |    2 +-
 .../collab/src/db/tables/language_server.rs   |    1 +
 crates/collab/src/rpc.rs                      |    4 +-
 crates/language_tools/Cargo.toml              |    1 +
 crates/language_tools/src/language_tools.rs   |   10 +-
 .../src/{lsp_tool.rs => lsp_button.rs}        |  141 ++-
 .../src/{lsp_log.rs => lsp_log_view.rs}       | 1000 +++++------------
 ...lsp_log_tests.rs => lsp_log_view_tests.rs} |   14 +-
 crates/project/src/lsp_store.rs               |  130 ++-
 crates/project/src/lsp_store/log_store.rs     |  704 ++++++++++++
 crates/project/src/project.rs                 |   64 +-
 crates/project/src/project_tests.rs           |    1 +
 crates/proto/proto/lsp.proto                  |   44 +-
 crates/proto/proto/zed.proto                  |    3 +-
 crates/proto/src/proto.rs                     |    7 +-
 crates/remote_server/src/headless_project.rs  |   79 +-
 crates/settings/src/settings.rs               |    2 +-
 crates/zed/src/zed.rs                         |   17 +-
 22 files changed, 1357 insertions(+), 875 deletions(-)
 create mode 100644 crates/collab/migrations/20250827084812_worktree_in_servers.sql
 rename crates/language_tools/src/{lsp_tool.rs => lsp_button.rs} (90%)
 rename crates/language_tools/src/{lsp_log.rs => lsp_log_view.rs} (65%)
 rename crates/language_tools/src/{lsp_log_tests.rs => lsp_log_view_tests.rs} (91%)
 create mode 100644 crates/project/src/lsp_store/log_store.rs

diff --git a/Cargo.lock b/Cargo.lock
index 4325addc39..8bddc8b008 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9213,6 +9213,7 @@ dependencies = [
  "language",
  "lsp",
  "project",
+ "proto",
  "release_channel",
  "serde_json",
  "settings",
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 43581fd942..b2e25458ef 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -175,6 +175,7 @@ CREATE TABLE "language_servers" (
     "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
     "name" VARCHAR NOT NULL,
     "capabilities" TEXT NOT NULL,
+    "worktree_id" BIGINT,
     PRIMARY KEY (project_id, id)
 );
 
diff --git a/crates/collab/migrations/20250827084812_worktree_in_servers.sql b/crates/collab/migrations/20250827084812_worktree_in_servers.sql
new file mode 100644
index 0000000000..d4c6ffbbcc
--- /dev/null
+++ b/crates/collab/migrations/20250827084812_worktree_in_servers.sql
@@ -0,0 +1,2 @@
+ALTER TABLE language_servers
+    ADD COLUMN worktree_id BIGINT;
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 393f2c80f8..a3f0ea6cbc 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -694,6 +694,7 @@ impl Database {
                 project_id: ActiveValue::set(project_id),
                 id: ActiveValue::set(server.id as i64),
                 name: ActiveValue::set(server.name.clone()),
+                worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
                 capabilities: ActiveValue::set(update.capabilities.clone()),
             })
             .on_conflict(
@@ -704,6 +705,7 @@ impl Database {
                 .update_columns([
                     language_server::Column::Name,
                     language_server::Column::Capabilities,
+                    language_server::Column::WorktreeId,
                 ])
                 .to_owned(),
             )
@@ -1065,7 +1067,7 @@ impl Database {
                     server: proto::LanguageServer {
                         id: language_server.id as u64,
                         name: language_server.name,
-                        worktree_id: None,
+                        worktree_id: language_server.worktree_id.map(|id| id as u64),
                     },
                     capabilities: language_server.capabilities,
                 })
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index 9e7cabf9b2..0713ac2cb2 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -809,7 +809,7 @@ impl Database {
                 server: proto::LanguageServer {
                     id: language_server.id as u64,
                     name: language_server.name,
-                    worktree_id: None,
+                    worktree_id: language_server.worktree_id.map(|id| id as u64),
                 },
                 capabilities: language_server.capabilities,
             })
diff --git a/crates/collab/src/db/tables/language_server.rs b/crates/collab/src/db/tables/language_server.rs
index 34c7514d91..705aae292b 100644
--- a/crates/collab/src/db/tables/language_server.rs
+++ b/crates/collab/src/db/tables/language_server.rs
@@ -10,6 +10,7 @@ pub struct Model {
     pub id: i64,
     pub name: String,
     pub capabilities: String,
+    pub worktree_id: Option<i64>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 73f327166a..9e4dfd4854 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -476,7 +476,9 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
             .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
             .add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
-            .add_message_handler(update_context);
+            .add_message_handler(update_context)
+            .add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
+            .add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>);
 
         Arc::new(server)
     }
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index 5aa914311a..b8f85d8d90 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -24,6 +24,7 @@ itertools.workspace = true
 language.workspace = true
 lsp.workspace = true
 project.workspace = true
+proto.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 theme.workspace = true
diff --git a/crates/language_tools/src/language_tools.rs b/crates/language_tools/src/language_tools.rs
index cbf5756875..c784a67313 100644
--- a/crates/language_tools/src/language_tools.rs
+++ b/crates/language_tools/src/language_tools.rs
@@ -1,20 +1,20 @@
 mod key_context_view;
-mod lsp_log;
-pub mod lsp_tool;
+pub mod lsp_button;
+pub mod lsp_log_view;
 mod syntax_tree_view;
 
 #[cfg(test)]
-mod lsp_log_tests;
+mod lsp_log_view_tests;
 
 use gpui::{App, AppContext, Entity};
 
-pub use lsp_log::{LogStore, LspLogToolbarItemView, LspLogView};
+pub use lsp_log_view::LspLogView;
 pub use syntax_tree_view::{SyntaxTreeToolbarItemView, SyntaxTreeView};
 use ui::{Context, Window};
 use workspace::{Item, ItemHandle, SplitDirection, Workspace};
 
 pub fn init(cx: &mut App) {
-    lsp_log::init(cx);
+    lsp_log_view::init(true, cx);
     syntax_tree_view::init(cx);
     key_context_view::init(cx);
 }
diff --git a/crates/language_tools/src/lsp_tool.rs b/crates/language_tools/src/lsp_button.rs
similarity index 90%
rename from crates/language_tools/src/lsp_tool.rs
rename to crates/language_tools/src/lsp_button.rs
index dd3e80212f..f91c4cc61c 100644
--- a/crates/language_tools/src/lsp_tool.rs
+++ b/crates/language_tools/src/lsp_button.rs
@@ -11,7 +11,10 @@ use editor::{Editor, EditorEvent};
 use gpui::{Corner, Entity, Subscription, Task, WeakEntity, actions};
 use language::{BinaryStatus, BufferId, ServerHealth};
 use lsp::{LanguageServerId, LanguageServerName, LanguageServerSelector};
-use project::{LspStore, LspStoreEvent, Worktree, project_settings::ProjectSettings};
+use project::{
+    LspStore, LspStoreEvent, Worktree, lsp_store::log_store::GlobalLogStore,
+    project_settings::ProjectSettings,
+};
 use settings::{Settings as _, SettingsStore};
 use ui::{
     Context, ContextMenu, ContextMenuEntry, ContextMenuItem, DocumentationAside, DocumentationSide,
@@ -20,7 +23,7 @@ use ui::{
 
 use workspace::{StatusItemView, Workspace};
 
-use crate::lsp_log::GlobalLogStore;
+use crate::lsp_log_view;
 
 actions!(
     lsp_tool,
@@ -30,7 +33,7 @@ actions!(
     ]
 );
 
-pub struct LspTool {
+pub struct LspButton {
     server_state: Entity<LanguageServerState>,
     popover_menu_handle: PopoverMenuHandle<ContextMenu>,
     lsp_menu: Option<Entity<ContextMenu>>,
@@ -121,9 +124,8 @@ impl LanguageServerState {
         menu = menu.align_popover_bottom();
         let lsp_logs = cx
             .try_global::<GlobalLogStore>()
-            .and_then(|lsp_logs| lsp_logs.0.upgrade());
-        let lsp_store = self.lsp_store.upgrade();
-        let Some((lsp_logs, lsp_store)) = lsp_logs.zip(lsp_store) else {
+            .map(|lsp_logs| lsp_logs.0.clone());
+        let Some(lsp_logs) = lsp_logs else {
             return menu;
         };
 
@@ -210,10 +212,11 @@ impl LanguageServerState {
             };
 
             let server_selector = server_info.server_selector();
-            // TODO currently, Zed remote does not work well with the LSP logs
-            // https://github.com/zed-industries/zed/issues/28557
-            let has_logs = lsp_store.read(cx).as_local().is_some()
-                && lsp_logs.read(cx).has_server_logs(&server_selector);
+            let is_remote = self
+                .lsp_store
+                .update(cx, |lsp_store, _| lsp_store.as_remote().is_some())
+                .unwrap_or(false);
+            let has_logs = is_remote || lsp_logs.read(cx).has_server_logs(&server_selector);
 
             let status_color = server_info
                 .binary_status
@@ -241,10 +244,10 @@ impl LanguageServerState {
                 .as_ref()
                 .or_else(|| server_info.binary_status.as_ref()?.message.as_ref())
                 .cloned();
-            let hover_label = if has_logs {
-                Some("View Logs")
-            } else if message.is_some() {
+            let hover_label = if message.is_some() {
                 Some("View Message")
+            } else if has_logs {
+                Some("View Logs")
             } else {
                 None
             };
@@ -288,16 +291,7 @@ impl LanguageServerState {
                     let server_name = server_info.name.clone();
                     let workspace = self.workspace.clone();
                     move |window, cx| {
-                        if has_logs {
-                            lsp_logs.update(cx, |lsp_logs, cx| {
-                                lsp_logs.open_server_trace(
-                                    workspace.clone(),
-                                    server_selector.clone(),
-                                    window,
-                                    cx,
-                                );
-                            });
-                        } else if let Some(message) = &message {
+                        if let Some(message) = &message {
                             let Some(create_buffer) = workspace
                                 .update(cx, |workspace, cx| {
                                     workspace
@@ -347,6 +341,14 @@ impl LanguageServerState {
                                 anyhow::Ok(())
                             })
                             .detach();
+                        } else if has_logs {
+                            lsp_log_view::open_server_trace(
+                                &lsp_logs,
+                                workspace.clone(),
+                                server_selector.clone(),
+                                window,
+                                cx,
+                            );
                         } else {
                             cx.propagate();
                         }
@@ -510,7 +512,7 @@ impl ServerData<'_> {
     }
 }
 
-impl LspTool {
+impl LspButton {
     pub fn new(
         workspace: &Workspace,
         popover_menu_handle: PopoverMenuHandle<ContextMenu>,
@@ -518,37 +520,59 @@ impl LspTool {
         cx: &mut Context<Self>,
     ) -> Self {
         let settings_subscription =
-            cx.observe_global_in::<SettingsStore>(window, move |lsp_tool, window, cx| {
+            cx.observe_global_in::<SettingsStore>(window, move |lsp_button, window, cx| {
                 if ProjectSettings::get_global(cx).global_lsp_settings.button {
-                    if lsp_tool.lsp_menu.is_none() {
-                        lsp_tool.refresh_lsp_menu(true, window, cx);
+                    if lsp_button.lsp_menu.is_none() {
+                        lsp_button.refresh_lsp_menu(true, window, cx);
                     }
-                } else if lsp_tool.lsp_menu.take().is_some() {
+                } else if lsp_button.lsp_menu.take().is_some() {
                     cx.notify();
                 }
             });
 
         let lsp_store = workspace.project().read(cx).lsp_store();
+        let mut language_servers = LanguageServers::default();
+        for (_, status) in lsp_store.read(cx).language_server_statuses() {
+            language_servers.binary_statuses.insert(
+                status.name.clone(),
+                LanguageServerBinaryStatus {
+                    status: BinaryStatus::None,
+                    message: None,
+                },
+            );
+        }
+
         let lsp_store_subscription =
-            cx.subscribe_in(&lsp_store, window, |lsp_tool, _, e, window, cx| {
-                lsp_tool.on_lsp_store_event(e, window, cx)
+            cx.subscribe_in(&lsp_store, window, |lsp_button, _, e, window, cx| {
+                lsp_button.on_lsp_store_event(e, window, cx)
             });
 
-        let state = cx.new(|_| LanguageServerState {
+        let server_state = cx.new(|_| LanguageServerState {
             workspace: workspace.weak_handle(),
             items: Vec::new(),
             lsp_store: lsp_store.downgrade(),
             active_editor: None,
-            language_servers: LanguageServers::default(),
+            language_servers,
         });
 
-        Self {
-            server_state: state,
+        let mut lsp_button = Self {
+            server_state,
             popover_menu_handle,
             lsp_menu: None,
             lsp_menu_refresh: Task::ready(()),
             _subscriptions: vec![settings_subscription, lsp_store_subscription],
+        };
+        if !lsp_button
+            .server_state
+            .read(cx)
+            .language_servers
+            .binary_statuses
+            .is_empty()
+        {
+            lsp_button.refresh_lsp_menu(true, window, cx);
         }
+
+        lsp_button
     }
 
     fn on_lsp_store_event(
@@ -708,6 +732,25 @@ impl LspTool {
                     }
                 }
             }
+            state
+                .lsp_store
+                .update(cx, |lsp_store, cx| {
+                    for (server_id, status) in lsp_store.language_server_statuses() {
+                        if let Some(worktree) = status.worktree.and_then(|worktree_id| {
+                            lsp_store
+                                .worktree_store()
+                                .read(cx)
+                                .worktree_for_id(worktree_id, cx)
+                        }) {
+                            server_ids_to_worktrees.insert(server_id, worktree.clone());
+                            server_names_to_worktrees
+                                .entry(status.name.clone())
+                                .or_default()
+                                .insert((worktree, server_id));
+                        }
+                    }
+                })
+                .ok();
 
             let mut servers_per_worktree = BTreeMap::<SharedString, Vec<ServerData>>::new();
             let mut servers_without_worktree = Vec::<ServerData>::new();
@@ -852,18 +895,18 @@ impl LspTool {
     ) {
         if create_if_empty || self.lsp_menu.is_some() {
             let state = self.server_state.clone();
-            self.lsp_menu_refresh = cx.spawn_in(window, async move |lsp_tool, cx| {
+            self.lsp_menu_refresh = cx.spawn_in(window, async move |lsp_button, cx| {
                 cx.background_executor()
                     .timer(Duration::from_millis(30))
                     .await;
-                lsp_tool
-                    .update_in(cx, |lsp_tool, window, cx| {
-                        lsp_tool.regenerate_items(cx);
+                lsp_button
+                    .update_in(cx, |lsp_button, window, cx| {
+                        lsp_button.regenerate_items(cx);
                         let menu = ContextMenu::build(window, cx, |menu, _, cx| {
                             state.update(cx, |state, cx| state.fill_menu(menu, cx))
                         });
-                        lsp_tool.lsp_menu = Some(menu.clone());
-                        lsp_tool.popover_menu_handle.refresh_menu(
+                        lsp_button.lsp_menu = Some(menu.clone());
+                        lsp_button.popover_menu_handle.refresh_menu(
                             window,
                             cx,
                             Rc::new(move |_, _| Some(menu.clone())),
@@ -876,7 +919,7 @@ impl LspTool {
     }
 }
 
-impl StatusItemView for LspTool {
+impl StatusItemView for LspButton {
     fn set_active_pane_item(
         &mut self,
         active_pane_item: Option<&dyn workspace::ItemHandle>,
@@ -899,9 +942,9 @@ impl StatusItemView for LspTool {
                     let _editor_subscription = cx.subscribe_in(
                         &editor,
                         window,
-                        |lsp_tool, _, e: &EditorEvent, window, cx| match e {
+                        |lsp_button, _, e: &EditorEvent, window, cx| match e {
                             EditorEvent::ExcerptsAdded { buffer, .. } => {
-                                let updated = lsp_tool.server_state.update(cx, |state, cx| {
+                                let updated = lsp_button.server_state.update(cx, |state, cx| {
                                     if let Some(active_editor) = state.active_editor.as_mut() {
                                         let buffer_id = buffer.read(cx).remote_id();
                                         active_editor.editor_buffers.insert(buffer_id)
@@ -910,13 +953,13 @@ impl StatusItemView for LspTool {
                                     }
                                 });
                                 if updated {
-                                    lsp_tool.refresh_lsp_menu(false, window, cx);
+                                    lsp_button.refresh_lsp_menu(false, window, cx);
                                 }
                             }
                             EditorEvent::ExcerptsRemoved {
                                 removed_buffer_ids, ..
                             } => {
-                                let removed = lsp_tool.server_state.update(cx, |state, _| {
+                                let removed = lsp_button.server_state.update(cx, |state, _| {
                                     let mut removed = false;
                                     if let Some(active_editor) = state.active_editor.as_mut() {
                                         for id in removed_buffer_ids {
@@ -930,7 +973,7 @@ impl StatusItemView for LspTool {
                                     removed
                                 });
                                 if removed {
-                                    lsp_tool.refresh_lsp_menu(false, window, cx);
+                                    lsp_button.refresh_lsp_menu(false, window, cx);
                                 }
                             }
                             _ => {}
@@ -960,7 +1003,7 @@ impl StatusItemView for LspTool {
     }
 }
 
-impl Render for LspTool {
+impl Render for LspButton {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
         if self.server_state.read(cx).language_servers.is_empty() || self.lsp_menu.is_none() {
             return div();
@@ -1005,11 +1048,11 @@ impl Render for LspTool {
             (None, "All Servers Operational")
         };
 
-        let lsp_tool = cx.entity();
+        let lsp_button = cx.entity();
 
         div().child(
             PopoverMenu::new("lsp-tool")
-                .menu(move |_, cx| lsp_tool.read(cx).lsp_menu.clone())
+                .menu(move |_, cx| lsp_button.read(cx).lsp_menu.clone())
                 .anchor(Corner::BottomLeft)
                 .with_handle(self.popover_menu_handle.clone())
                 .trigger_with_tooltip(
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log_view.rs
similarity index 65%
rename from crates/language_tools/src/lsp_log.rs
rename to crates/language_tools/src/lsp_log_view.rs
index a71e434e52..e54411f1d4 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log_view.rs
@@ -1,20 +1,24 @@
-use collections::{HashMap, VecDeque};
+use collections::VecDeque;
 use copilot::Copilot;
 use editor::{Editor, EditorEvent, actions::MoveToEnd, scroll::Autoscroll};
-use futures::{StreamExt, channel::mpsc};
 use gpui::{
-    AnyView, App, Context, Corner, Entity, EventEmitter, FocusHandle, Focusable, Global,
-    IntoElement, ParentElement, Render, Styled, Subscription, WeakEntity, Window, actions, div,
+    AnyView, App, Context, Corner, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
+    ParentElement, Render, Styled, Subscription, WeakEntity, Window, actions, div,
 };
 use itertools::Itertools;
 use language::{LanguageServerId, language_settings::SoftWrap};
 use lsp::{
-    IoKind, LanguageServer, LanguageServerName, LanguageServerSelector, MessageType,
+    LanguageServer, LanguageServerBinary, LanguageServerName, LanguageServerSelector, MessageType,
     SetTraceParams, TraceValue, notification::SetTrace,
 };
-use project::{Project, WorktreeId, search::SearchQuery};
+use project::{
+    Project,
+    lsp_store::log_store::{self, Event, LanguageServerKind, LogKind, LogStore, Message},
+    search::SearchQuery,
+};
 use std::{any::TypeId, borrow::Cow, sync::Arc};
 use ui::{Button, Checkbox, ContextMenu, Label, PopoverMenu, ToggleState, prelude::*};
+use util::ResultExt as _;
 use workspace::{
     SplitDirection, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, WorkspaceId,
     item::{Item, ItemHandle},
@@ -23,590 +27,14 @@ use workspace::{
 
 use crate::get_or_create_tool;
 
-const SEND_LINE: &str = "\n// Send:";
-const RECEIVE_LINE: &str = "\n// Receive:";
-const MAX_STORED_LOG_ENTRIES: usize = 2000;
-
-pub struct LogStore {
-    projects: HashMap<WeakEntity<Project>, ProjectState>,
-    language_servers: HashMap<LanguageServerId, LanguageServerState>,
-    copilot_log_subscription: Option<lsp::Subscription>,
-    _copilot_subscription: Option<gpui::Subscription>,
-    io_tx: mpsc::UnboundedSender<(LanguageServerId, IoKind, String)>,
-}
-
-struct ProjectState {
-    _subscriptions: [gpui::Subscription; 2],
-}
-
-trait Message: AsRef<str> {
-    type Level: Copy + std::fmt::Debug;
-    fn should_include(&self, _: Self::Level) -> bool {
-        true
-    }
-}
-
-pub(super) struct LogMessage {
-    message: String,
-    typ: MessageType,
-}
-
-impl AsRef<str> for LogMessage {
-    fn as_ref(&self) -> &str {
-        &self.message
-    }
-}
-
-impl Message for LogMessage {
-    type Level = MessageType;
-
-    fn should_include(&self, level: Self::Level) -> bool {
-        match (self.typ, level) {
-            (MessageType::ERROR, _) => true,
-            (_, MessageType::ERROR) => false,
-            (MessageType::WARNING, _) => true,
-            (_, MessageType::WARNING) => false,
-            (MessageType::INFO, _) => true,
-            (_, MessageType::INFO) => false,
-            _ => true,
-        }
-    }
-}
-
-pub(super) struct TraceMessage {
-    message: String,
-}
-
-impl AsRef<str> for TraceMessage {
-    fn as_ref(&self) -> &str {
-        &self.message
-    }
-}
-
-impl Message for TraceMessage {
-    type Level = ();
-}
-
-struct RpcMessage {
-    message: String,
-}
-
-impl AsRef<str> for RpcMessage {
-    fn as_ref(&self) -> &str {
-        &self.message
-    }
-}
-
-impl Message for RpcMessage {
-    type Level = ();
-}
-
-pub(super) struct LanguageServerState {
-    name: Option<LanguageServerName>,
-    worktree_id: Option<WorktreeId>,
-    kind: LanguageServerKind,
-    log_messages: VecDeque<LogMessage>,
-    trace_messages: VecDeque<TraceMessage>,
-    rpc_state: Option<LanguageServerRpcState>,
-    trace_level: TraceValue,
-    log_level: MessageType,
-    io_logs_subscription: Option<lsp::Subscription>,
-}
-
-#[derive(PartialEq, Clone)]
-pub enum LanguageServerKind {
-    Local { project: WeakEntity<Project> },
-    Remote { project: WeakEntity<Project> },
-    Global,
-}
-
-impl LanguageServerKind {
-    fn is_remote(&self) -> bool {
-        matches!(self, LanguageServerKind::Remote { .. })
-    }
-}
-
-impl std::fmt::Debug for LanguageServerKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            LanguageServerKind::Local { .. } => write!(f, "LanguageServerKind::Local"),
-            LanguageServerKind::Remote { .. } => write!(f, "LanguageServerKind::Remote"),
-            LanguageServerKind::Global => write!(f, "LanguageServerKind::Global"),
-        }
-    }
-}
-
-impl LanguageServerKind {
-    fn project(&self) -> Option<&WeakEntity<Project>> {
-        match self {
-            Self::Local { project } => Some(project),
-            Self::Remote { project } => Some(project),
-            Self::Global { .. } => None,
-        }
-    }
-}
-
-struct LanguageServerRpcState {
-    rpc_messages: VecDeque<RpcMessage>,
-    last_message_kind: Option<MessageKind>,
-}
-
-pub struct LspLogView {
-    pub(crate) editor: Entity<Editor>,
-    editor_subscriptions: Vec<Subscription>,
-    log_store: Entity<LogStore>,
-    current_server_id: Option<LanguageServerId>,
-    active_entry_kind: LogKind,
-    project: Entity<Project>,
-    focus_handle: FocusHandle,
-    _log_store_subscriptions: Vec<Subscription>,
-}
-
-pub struct LspLogToolbarItemView {
-    log_view: Option<Entity<LspLogView>>,
-    _log_view_subscription: Option<Subscription>,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq)]
-enum MessageKind {
-    Send,
-    Receive,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub enum LogKind {
-    Rpc,
-    Trace,
-    #[default]
-    Logs,
-    ServerInfo,
-}
-
-impl LogKind {
-    fn label(&self) -> &'static str {
-        match self {
-            LogKind::Rpc => RPC_MESSAGES,
-            LogKind::Trace => SERVER_TRACE,
-            LogKind::Logs => SERVER_LOGS,
-            LogKind::ServerInfo => SERVER_INFO,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) struct LogMenuItem {
-    pub server_id: LanguageServerId,
-    pub server_name: LanguageServerName,
-    pub worktree_root_name: String,
-    pub rpc_trace_enabled: bool,
-    pub selected_entry: LogKind,
-    pub trace_level: lsp::TraceValue,
-    pub server_kind: LanguageServerKind,
-}
-
-actions!(
-    dev,
-    [
-        /// Opens the language server protocol logs viewer.
-        OpenLanguageServerLogs
-    ]
-);
-
-pub(super) struct GlobalLogStore(pub WeakEntity<LogStore>);
-
-impl Global for GlobalLogStore {}
-
-pub fn init(cx: &mut App) {
-    let log_store = cx.new(LogStore::new);
-    cx.set_global(GlobalLogStore(log_store.downgrade()));
-
-    cx.observe_new(move |workspace: &mut Workspace, _, cx| {
-        let project = workspace.project();
-        if project.read(cx).is_local() || project.read(cx).is_via_remote_server() {
-            log_store.update(cx, |store, cx| {
-                store.add_project(project, cx);
-            });
-        }
-
-        let log_store = log_store.clone();
-        workspace.register_action(move |workspace, _: &OpenLanguageServerLogs, window, cx| {
-            let project = workspace.project().read(cx);
-            if project.is_local() || project.is_via_remote_server() {
-                let project = workspace.project().clone();
-                let log_store = log_store.clone();
-                get_or_create_tool(
-                    workspace,
-                    SplitDirection::Right,
-                    window,
-                    cx,
-                    move |window, cx| LspLogView::new(project, log_store, window, cx),
-                );
-            }
-        });
-    })
-    .detach();
-}
-
-impl LogStore {
-    pub fn new(cx: &mut Context<Self>) -> Self {
-        let (io_tx, mut io_rx) = mpsc::unbounded();
-
-        let copilot_subscription = Copilot::global(cx).map(|copilot| {
-            let copilot = &copilot;
-            cx.subscribe(copilot, |this, copilot, edit_prediction_event, cx| {
-                if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event
-                    && let Some(server) = copilot.read(cx).language_server()
-                {
-                    let server_id = server.server_id();
-                    let weak_this = cx.weak_entity();
-                    this.copilot_log_subscription =
-                        Some(server.on_notification::<copilot::request::LogMessage, _>(
-                            move |params, cx| {
-                                weak_this
-                                    .update(cx, |this, cx| {
-                                        this.add_language_server_log(
-                                            server_id,
-                                            MessageType::LOG,
-                                            &params.message,
-                                            cx,
-                                        );
-                                    })
-                                    .ok();
-                            },
-                        ));
-                    let name = LanguageServerName::new_static("copilot");
-                    this.add_language_server(
-                        LanguageServerKind::Global,
-                        server.server_id(),
-                        Some(name),
-                        None,
-                        Some(server.clone()),
-                        cx,
-                    );
-                }
-            })
-        });
-
-        let this = Self {
-            copilot_log_subscription: None,
-            _copilot_subscription: copilot_subscription,
-            projects: HashMap::default(),
-            language_servers: HashMap::default(),
-            io_tx,
-        };
-
-        cx.spawn(async move |this, cx| {
-            while let Some((server_id, io_kind, message)) = io_rx.next().await {
-                if let Some(this) = this.upgrade() {
-                    this.update(cx, |this, cx| {
-                        this.on_io(server_id, io_kind, &message, cx);
-                    })?;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-        this
-    }
-
-    pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
-        let weak_project = project.downgrade();
-        self.projects.insert(
-            project.downgrade(),
-            ProjectState {
-                _subscriptions: [
-                    cx.observe_release(project, move |this, _, _| {
-                        this.projects.remove(&weak_project);
-                        this.language_servers
-                            .retain(|_, state| state.kind.project() != Some(&weak_project));
-                    }),
-                    cx.subscribe(project, |this, project, event, cx| {
-                        let server_kind = if project.read(cx).is_via_remote_server() {
-                            LanguageServerKind::Remote {
-                                project: project.downgrade(),
-                            }
-                        } else {
-                            LanguageServerKind::Local {
-                                project: project.downgrade(),
-                            }
-                        };
-
-                        match event {
-                            project::Event::LanguageServerAdded(id, name, worktree_id) => {
-                                this.add_language_server(
-                                    server_kind,
-                                    *id,
-                                    Some(name.clone()),
-                                    *worktree_id,
-                                    project
-                                        .read(cx)
-                                        .lsp_store()
-                                        .read(cx)
-                                        .language_server_for_id(*id),
-                                    cx,
-                                );
-                            }
-                            project::Event::LanguageServerRemoved(id) => {
-                                this.remove_language_server(*id, cx);
-                            }
-                            project::Event::LanguageServerLog(id, typ, message) => {
-                                this.add_language_server(server_kind, *id, None, None, None, cx);
-                                match typ {
-                                    project::LanguageServerLogType::Log(typ) => {
-                                        this.add_language_server_log(*id, *typ, message, cx);
-                                    }
-                                    project::LanguageServerLogType::Trace(_) => {
-                                        this.add_language_server_trace(*id, message, cx);
-                                    }
-                                }
-                            }
-                            _ => {}
-                        }
-                    }),
-                ],
-            },
-        );
-    }
-
-    pub(super) fn get_language_server_state(
-        &mut self,
-        id: LanguageServerId,
-    ) -> Option<&mut LanguageServerState> {
-        self.language_servers.get_mut(&id)
-    }
-
-    fn add_language_server(
-        &mut self,
-        kind: LanguageServerKind,
-        server_id: LanguageServerId,
-        name: Option<LanguageServerName>,
-        worktree_id: Option<WorktreeId>,
-        server: Option<Arc<LanguageServer>>,
-        cx: &mut Context<Self>,
-    ) -> Option<&mut LanguageServerState> {
-        let server_state = self.language_servers.entry(server_id).or_insert_with(|| {
-            cx.notify();
-            LanguageServerState {
-                name: None,
-                worktree_id: None,
-                kind,
-                rpc_state: None,
-                log_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
-                trace_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
-                trace_level: TraceValue::Off,
-                log_level: MessageType::LOG,
-                io_logs_subscription: None,
-            }
-        });
-
-        if let Some(name) = name {
-            server_state.name = Some(name);
-        }
-        if let Some(worktree_id) = worktree_id {
-            server_state.worktree_id = Some(worktree_id);
-        }
-
-        if let Some(server) = server.filter(|_| server_state.io_logs_subscription.is_none()) {
-            let io_tx = self.io_tx.clone();
-            let server_id = server.server_id();
-            server_state.io_logs_subscription = Some(server.on_io(move |io_kind, message| {
-                io_tx
-                    .unbounded_send((server_id, io_kind, message.to_string()))
-                    .ok();
-            }));
-        }
-
-        Some(server_state)
-    }
-
-    fn add_language_server_log(
-        &mut self,
-        id: LanguageServerId,
-        typ: MessageType,
-        message: &str,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let language_server_state = self.get_language_server_state(id)?;
-
-        let log_lines = &mut language_server_state.log_messages;
-        Self::add_language_server_message(
-            log_lines,
-            id,
-            LogMessage {
-                message: message.trim_end().to_string(),
-                typ,
-            },
-            language_server_state.log_level,
-            LogKind::Logs,
-            cx,
-        );
-        Some(())
-    }
-
-    fn add_language_server_trace(
-        &mut self,
-        id: LanguageServerId,
-        message: &str,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let language_server_state = self.get_language_server_state(id)?;
-
-        let log_lines = &mut language_server_state.trace_messages;
-        Self::add_language_server_message(
-            log_lines,
-            id,
-            TraceMessage {
-                message: message.trim().to_string(),
-            },
-            (),
-            LogKind::Trace,
-            cx,
-        );
-        Some(())
-    }
-
-    fn add_language_server_message<T: Message>(
-        log_lines: &mut VecDeque<T>,
-        id: LanguageServerId,
-        message: T,
-        current_severity: <T as Message>::Level,
-        kind: LogKind,
-        cx: &mut Context<Self>,
-    ) {
-        while log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            log_lines.pop_front();
-        }
-        let text = message.as_ref().to_string();
-        let visible = message.should_include(current_severity);
-        log_lines.push_back(message);
-
-        if visible {
-            cx.emit(Event::NewServerLogEntry { id, kind, text });
-            cx.notify();
-        }
-    }
-
-    fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
-        self.language_servers.remove(&id);
-        cx.notify();
-    }
-
-    pub(super) fn server_logs(&self, server_id: LanguageServerId) -> Option<&VecDeque<LogMessage>> {
-        Some(&self.language_servers.get(&server_id)?.log_messages)
-    }
-
-    pub(super) fn server_trace(
-        &self,
-        server_id: LanguageServerId,
-    ) -> Option<&VecDeque<TraceMessage>> {
-        Some(&self.language_servers.get(&server_id)?.trace_messages)
-    }
-
-    fn server_ids_for_project<'a>(
-        &'a self,
-        lookup_project: &'a WeakEntity<Project>,
-    ) -> impl Iterator<Item = LanguageServerId> + 'a {
-        self.language_servers
-            .iter()
-            .filter_map(move |(id, state)| match &state.kind {
-                LanguageServerKind::Local { project } | LanguageServerKind::Remote { project } => {
-                    if project == lookup_project {
-                        Some(*id)
-                    } else {
-                        None
-                    }
-                }
-                LanguageServerKind::Global => Some(*id),
-            })
-    }
-
-    fn enable_rpc_trace_for_language_server(
-        &mut self,
-        server_id: LanguageServerId,
-    ) -> Option<&mut LanguageServerRpcState> {
-        let rpc_state = self
-            .language_servers
-            .get_mut(&server_id)?
-            .rpc_state
-            .get_or_insert_with(|| LanguageServerRpcState {
-                rpc_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
-                last_message_kind: None,
-            });
-        Some(rpc_state)
-    }
-
-    pub fn disable_rpc_trace_for_language_server(
-        &mut self,
-        server_id: LanguageServerId,
-    ) -> Option<()> {
-        self.language_servers.get_mut(&server_id)?.rpc_state.take();
-        Some(())
-    }
-
-    pub fn has_server_logs(&self, server: &LanguageServerSelector) -> bool {
-        match server {
-            LanguageServerSelector::Id(id) => self.language_servers.contains_key(id),
-            LanguageServerSelector::Name(name) => self
-                .language_servers
-                .iter()
-                .any(|(_, state)| state.name.as_ref() == Some(name)),
-        }
-    }
-
-    pub fn open_server_log(
-        &mut self,
-        workspace: WeakEntity<Workspace>,
-        server: LanguageServerSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.spawn_in(window, async move |log_store, cx| {
-            let Some(log_store) = log_store.upgrade() else {
-                return;
-            };
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project = workspace.project().clone();
-                    let tool_log_store = log_store.clone();
-                    let log_view = get_or_create_tool(
-                        workspace,
-                        SplitDirection::Right,
-                        window,
-                        cx,
-                        move |window, cx| LspLogView::new(project, tool_log_store, window, cx),
-                    );
-                    log_view.update(cx, |log_view, cx| {
-                        let server_id = match server {
-                            LanguageServerSelector::Id(id) => Some(id),
-                            LanguageServerSelector::Name(name) => {
-                                log_store.read(cx).language_servers.iter().find_map(
-                                    |(id, state)| {
-                                        if state.name.as_ref() == Some(&name) {
-                                            Some(*id)
-                                        } else {
-                                            None
-                                        }
-                                    },
-                                )
-                            }
-                        };
-                        if let Some(server_id) = server_id {
-                            log_view.show_logs_for_server(server_id, window, cx);
-                        }
-                    });
-                })
-                .ok();
-        })
-        .detach();
-    }
-
-    pub fn open_server_trace(
-        &mut self,
-        workspace: WeakEntity<Workspace>,
-        server: LanguageServerSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+pub fn open_server_trace(
+    log_store: &Entity<LogStore>,
+    workspace: WeakEntity<Workspace>,
+    server: LanguageServerSelector,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    log_store.update(cx, |_, cx| {
         cx.spawn_in(window, async move |log_store, cx| {
             let Some(log_store) = log_store.upgrade() else {
                 return;
@@ -645,69 +73,106 @@ impl LogStore {
                 .ok();
         })
         .detach();
-    }
+    })
+}
 
-    fn on_io(
-        &mut self,
-        language_server_id: LanguageServerId,
-        io_kind: IoKind,
-        message: &str,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let is_received = match io_kind {
-            IoKind::StdOut => true,
-            IoKind::StdIn => false,
-            IoKind::StdErr => {
-                self.add_language_server_log(language_server_id, MessageType::LOG, message, cx);
-                return Some(());
-            }
-        };
+pub struct LspLogView {
+    pub(crate) editor: Entity<Editor>,
+    editor_subscriptions: Vec<Subscription>,
+    log_store: Entity<LogStore>,
+    current_server_id: Option<LanguageServerId>,
+    active_entry_kind: LogKind,
+    project: Entity<Project>,
+    focus_handle: FocusHandle,
+    _log_store_subscriptions: Vec<Subscription>,
+}
 
-        let state = self
-            .get_language_server_state(language_server_id)?
-            .rpc_state
-            .as_mut()?;
-        let kind = if is_received {
-            MessageKind::Receive
-        } else {
-            MessageKind::Send
-        };
+pub struct LspLogToolbarItemView {
+    log_view: Option<Entity<LspLogView>>,
+    _log_view_subscription: Option<Subscription>,
+}
 
-        let rpc_log_lines = &mut state.rpc_messages;
-        if state.last_message_kind != Some(kind) {
-            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-                rpc_log_lines.pop_front();
-            }
-            let line_before_message = match kind {
-                MessageKind::Send => SEND_LINE,
-                MessageKind::Receive => RECEIVE_LINE,
-            };
-            rpc_log_lines.push_back(RpcMessage {
-                message: line_before_message.to_string(),
-            });
-            cx.emit(Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LogKind::Rpc,
-                text: line_before_message.to_string(),
-            });
-        }
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct LogMenuItem {
+    pub server_id: LanguageServerId,
+    pub server_name: LanguageServerName,
+    pub worktree_root_name: String,
+    pub rpc_trace_enabled: bool,
+    pub selected_entry: LogKind,
+    pub trace_level: lsp::TraceValue,
+    pub server_kind: LanguageServerKind,
+}
 
-        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            rpc_log_lines.pop_front();
-        }
+actions!(
+    dev,
+    [
+        /// Opens the language server protocol logs viewer.
+        OpenLanguageServerLogs
+    ]
+);
 
-        let message = message.trim();
-        rpc_log_lines.push_back(RpcMessage {
-            message: message.to_string(),
+pub fn init(store_logs: bool, cx: &mut App) {
+    let log_store = log_store::init(store_logs, cx);
+
+    log_store.update(cx, |_, cx| {
+        Copilot::global(cx).map(|copilot| {
+            let copilot = &copilot;
+            cx.subscribe(copilot, |log_store, copilot, edit_prediction_event, cx| {
+                if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event
+                    && let Some(server) = copilot.read(cx).language_server()
+                {
+                    let server_id = server.server_id();
+                    let weak_lsp_store = cx.weak_entity();
+                    log_store.copilot_log_subscription =
+                        Some(server.on_notification::<copilot::request::LogMessage, _>(
+                            move |params, cx| {
+                                weak_lsp_store
+                                    .update(cx, |lsp_store, cx| {
+                                        lsp_store.add_language_server_log(
+                                            server_id,
+                                            MessageType::LOG,
+                                            &params.message,
+                                            cx,
+                                        );
+                                    })
+                                    .ok();
+                            },
+                        ));
+
+                    let name = LanguageServerName::new_static("copilot");
+                    log_store.add_language_server(
+                        LanguageServerKind::Global,
+                        server.server_id(),
+                        Some(name),
+                        None,
+                        Some(server.clone()),
+                        cx,
+                    );
+                }
+            })
+            .detach();
+        })
+    });
+
+    cx.observe_new(move |workspace: &mut Workspace, _, cx| {
+        log_store.update(cx, |store, cx| {
+            store.add_project(workspace.project(), cx);
         });
-        cx.emit(Event::NewServerLogEntry {
-            id: language_server_id,
-            kind: LogKind::Rpc,
-            text: message.to_string(),
+
+        let log_store = log_store.clone();
+        workspace.register_action(move |workspace, _: &OpenLanguageServerLogs, window, cx| {
+            let log_store = log_store.clone();
+            let project = workspace.project().clone();
+            get_or_create_tool(
+                workspace,
+                SplitDirection::Right,
+                window,
+                cx,
+                move |window, cx| LspLogView::new(project, log_store, window, cx),
+            );
         });
-        cx.notify();
-        Some(())
-    }
+    })
+    .detach();
 }
 
 impl LspLogView {
@@ -751,13 +216,14 @@ impl LspLogView {
 
                 cx.notify();
             });
+
         let events_subscriptions = cx.subscribe_in(
             &log_store,
             window,
             move |log_view, _, e, window, cx| match e {
                 Event::NewServerLogEntry { id, kind, text } => {
                     if log_view.current_server_id == Some(*id)
-                        && *kind == log_view.active_entry_kind
+                        && LogKind::from_server_log_type(kind) == log_view.active_entry_kind
                     {
                         log_view.editor.update(cx, |editor, cx| {
                             editor.set_read_only(false);
@@ -800,7 +266,7 @@ impl LspLogView {
             window.focus(&log_view.editor.focus_handle(cx));
         });
 
-        let mut this = Self {
+        let mut lsp_log_view = Self {
             focus_handle,
             editor,
             editor_subscriptions,
@@ -815,9 +281,9 @@ impl LspLogView {
             ],
         };
         if let Some(server_id) = server_id {
-            this.show_logs_for_server(server_id, window, cx);
+            lsp_log_view.show_logs_for_server(server_id, window, cx);
         }
-        this
+        lsp_log_view
     }
 
     fn editor_for_logs(
@@ -838,7 +304,7 @@ impl LspLogView {
     }
 
     fn editor_for_server_info(
-        server: &LanguageServer,
+        info: ServerInfo,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> (Entity<Editor>, Vec<Subscription>) {
@@ -853,22 +319,21 @@ impl LspLogView {
 * Capabilities: {CAPABILITIES}
 
 * Configuration: {CONFIGURATION}",
-            NAME = server.name(),
-            ID = server.server_id(),
-            BINARY = server.binary(),
-            WORKSPACE_FOLDERS = server
-                .workspace_folders()
-                .into_iter()
-                .filter_map(|path| path
-                    .to_file_path()
-                    .ok()
-                    .map(|path| path.to_string_lossy().into_owned()))
-                .collect::<Vec<_>>()
-                .join(", "),
-            CAPABILITIES = serde_json::to_string_pretty(&server.capabilities())
+            NAME = info.name,
+            ID = info.id,
+            BINARY = info.binary.as_ref().map_or_else(
+                || "Unknown".to_string(),
+                |bin| bin.path.as_path().to_string_lossy().to_string()
+            ),
+            WORKSPACE_FOLDERS = info.workspace_folders.join(", "),
+            CAPABILITIES = serde_json::to_string_pretty(&info.capabilities)
                 .unwrap_or_else(|e| format!("Failed to serialize capabilities: {e}")),
-            CONFIGURATION = serde_json::to_string_pretty(server.configuration())
-                .unwrap_or_else(|e| format!("Failed to serialize configuration: {e}")),
+            CONFIGURATION = info
+                .configuration
+                .map(|configuration| serde_json::to_string_pretty(&configuration))
+                .transpose()
+                .unwrap_or_else(|e| Some(format!("Failed to serialize configuration: {e}")))
+                .unwrap_or_else(|| "Unknown".to_string()),
         );
         let editor = initialize_new_editor(server_info, false, window, cx);
         let editor_subscription = cx.subscribe(
@@ -891,7 +356,9 @@ impl LspLogView {
             .language_servers
             .iter()
             .map(|(server_id, state)| match &state.kind {
-                LanguageServerKind::Local { .. } | LanguageServerKind::Remote { .. } => {
+                LanguageServerKind::Local { .. }
+                | LanguageServerKind::Remote { .. }
+                | LanguageServerKind::LocalSsh { .. } => {
                     let worktree_root_name = state
                         .worktree_id
                         .and_then(|id| self.project.read(cx).worktree_for_id(id, cx))
@@ -1003,11 +470,17 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        let trace_level = self
+            .log_store
+            .update(cx, |this, _| {
+                Some(this.get_language_server_state(server_id)?.trace_level)
+            })
+            .unwrap_or(TraceValue::Messages);
         let log_contents = self
             .log_store
             .read(cx)
             .server_trace(server_id)
-            .map(|v| log_contents(v, ()));
+            .map(|v| log_contents(v, trace_level));
         if let Some(log_contents) = log_contents {
             self.current_server_id = Some(server_id);
             self.active_entry_kind = LogKind::Trace;
@@ -1025,6 +498,7 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
+        self.toggle_rpc_trace_for_server(server_id, true, window, cx);
         let rpc_log = self.log_store.update(cx, |log_store, _| {
             log_store
                 .enable_rpc_trace_for_language_server(server_id)
@@ -1069,12 +543,33 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.log_store.update(cx, |log_store, _| {
+        self.log_store.update(cx, |log_store, cx| {
             if enabled {
                 log_store.enable_rpc_trace_for_language_server(server_id);
             } else {
                 log_store.disable_rpc_trace_for_language_server(server_id);
             }
+
+            if let Some(server_state) = log_store.language_servers.get(&server_id) {
+                if let LanguageServerKind::Remote { project } = &server_state.kind {
+                    project
+                        .update(cx, |project, cx| {
+                            if let Some((client, project_id)) =
+                                project.lsp_store().read(cx).upstream_client()
+                            {
+                                client
+                                    .send(proto::ToggleLspLogs {
+                                        project_id,
+                                        log_type: proto::toggle_lsp_logs::LogType::Rpc as i32,
+                                        server_id: server_id.to_proto(),
+                                        enabled,
+                                    })
+                                    .log_err();
+                            }
+                        })
+                        .ok();
+                }
+            };
         });
         if !enabled && Some(server_id) == self.current_server_id {
             self.show_logs_for_server(server_id, window, cx);
@@ -1113,13 +608,38 @@ impl LspLogView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let lsp_store = self.project.read(cx).lsp_store();
-        let Some(server) = lsp_store.read(cx).language_server_for_id(server_id) else {
+        let Some(server_info) = self
+            .project
+            .read(cx)
+            .lsp_store()
+            .update(cx, |lsp_store, _| {
+                lsp_store
+                    .language_server_for_id(server_id)
+                    .as_ref()
+                    .map(|language_server| ServerInfo::new(language_server))
+                    .or_else(move || {
+                        let capabilities =
+                            lsp_store.lsp_server_capabilities.get(&server_id)?.clone();
+                        let name = lsp_store
+                            .language_server_statuses
+                            .get(&server_id)
+                            .map(|status| status.name.clone())?;
+                        Some(ServerInfo {
+                            id: server_id,
+                            capabilities,
+                            binary: None,
+                            name,
+                            workspace_folders: Vec::new(),
+                            configuration: None,
+                        })
+                    })
+            })
+        else {
             return;
         };
         self.current_server_id = Some(server_id);
         self.active_entry_kind = LogKind::ServerInfo;
-        let (editor, editor_subscriptions) = Self::editor_for_server_info(&server, window, cx);
+        let (editor, editor_subscriptions) = Self::editor_for_server_info(server_info, window, cx);
         self.editor = editor;
         self.editor_subscriptions = editor_subscriptions;
         cx.notify();
@@ -1416,7 +936,6 @@ impl Render for LspLogToolbarItemView {
 
         let view_selector = current_server.map(|server| {
             let server_id = server.server_id;
-            let is_remote = server.server_kind.is_remote();
             let rpc_trace_enabled = server.rpc_trace_enabled;
             let log_view = log_view.clone();
             PopoverMenu::new("LspViewSelector")
@@ -1438,55 +957,53 @@ impl Render for LspLogToolbarItemView {
                                 view.show_logs_for_server(server_id, window, cx);
                             }),
                         )
-                        .when(!is_remote, |this| {
-                            this.entry(
-                                SERVER_TRACE,
-                                None,
-                                window.handler_for(&log_view, move |view, window, cx| {
-                                    view.show_trace_for_server(server_id, window, cx);
-                                }),
-                            )
-                            .custom_entry(
-                                {
-                                    let log_toolbar_view = log_toolbar_view.clone();
-                                    move |window, _| {
-                                        h_flex()
-                                            .w_full()
-                                            .justify_between()
-                                            .child(Label::new(RPC_MESSAGES))
-                                            .child(
-                                                div().child(
-                                                    Checkbox::new(
-                                                        "LspLogEnableRpcTrace",
-                                                        if rpc_trace_enabled {
+                        .entry(
+                            SERVER_TRACE,
+                            None,
+                            window.handler_for(&log_view, move |view, window, cx| {
+                                view.show_trace_for_server(server_id, window, cx);
+                            }),
+                        )
+                        .custom_entry(
+                            {
+                                let log_toolbar_view = log_toolbar_view.clone();
+                                move |window, _| {
+                                    h_flex()
+                                        .w_full()
+                                        .justify_between()
+                                        .child(Label::new(RPC_MESSAGES))
+                                        .child(
+                                            div().child(
+                                                Checkbox::new(
+                                                    "LspLogEnableRpcTrace",
+                                                    if rpc_trace_enabled {
+                                                        ToggleState::Selected
+                                                    } else {
+                                                        ToggleState::Unselected
+                                                    },
+                                                )
+                                                .on_click(window.listener_for(
+                                                    &log_toolbar_view,
+                                                    move |view, selection, window, cx| {
+                                                        let enabled = matches!(
+                                                            selection,
                                                             ToggleState::Selected
-                                                        } else {
-                                                            ToggleState::Unselected
-                                                        },
-                                                    )
-                                                    .on_click(window.listener_for(
-                                                        &log_toolbar_view,
-                                                        move |view, selection, window, cx| {
-                                                            let enabled = matches!(
-                                                                selection,
-                                                                ToggleState::Selected
-                                                            );
-                                                            view.toggle_rpc_logging_for_server(
-                                                                server_id, enabled, window, cx,
-                                                            );
-                                                            cx.stop_propagation();
-                                                        },
-                                                    )),
-                                                ),
-                                            )
-                                            .into_any_element()
-                                    }
-                                },
-                                window.handler_for(&log_view, move |view, window, cx| {
-                                    view.show_rpc_trace_for_server(server_id, window, cx);
-                                }),
-                            )
-                        })
+                                                        );
+                                                        view.toggle_rpc_logging_for_server(
+                                                            server_id, enabled, window, cx,
+                                                        );
+                                                        cx.stop_propagation();
+                                                    },
+                                                )),
+                                            ),
+                                        )
+                                        .into_any_element()
+                                }
+                            },
+                            window.handler_for(&log_view, move |view, window, cx| {
+                                view.show_rpc_trace_for_server(server_id, window, cx);
+                            }),
+                        )
                         .entry(
                             SERVER_INFO,
                             None,
@@ -1696,12 +1213,6 @@ const SERVER_LOGS: &str = "Server Logs";
 const SERVER_TRACE: &str = "Server Trace";
 const SERVER_INFO: &str = "Server Info";
 
-impl Default for LspLogToolbarItemView {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl LspLogToolbarItemView {
     pub fn new() -> Self {
         Self {
@@ -1734,14 +1245,35 @@ impl LspLogToolbarItemView {
     }
 }
 
-pub enum Event {
-    NewServerLogEntry {
-        id: LanguageServerId,
-        kind: LogKind,
-        text: String,
-    },
+struct ServerInfo {
+    id: LanguageServerId,
+    capabilities: lsp::ServerCapabilities,
+    binary: Option<LanguageServerBinary>,
+    name: LanguageServerName,
+    workspace_folders: Vec<String>,
+    configuration: Option<serde_json::Value>,
+}
+
+impl ServerInfo {
+    fn new(server: &LanguageServer) -> Self {
+        Self {
+            id: server.server_id(),
+            capabilities: server.capabilities(),
+            binary: Some(server.binary().clone()),
+            name: server.name(),
+            workspace_folders: server
+                .workspace_folders()
+                .into_iter()
+                .filter_map(|path| {
+                    path.to_file_path()
+                        .ok()
+                        .map(|path| path.to_string_lossy().into_owned())
+                })
+                .collect::<Vec<_>>(),
+            configuration: Some(server.configuration().clone()),
+        }
+    }
 }
 
-impl EventEmitter<Event> for LogStore {}
 impl EventEmitter<EditorEvent> for LspLogView {}
 impl EventEmitter<SearchEvent> for LspLogView {}
diff --git a/crates/language_tools/src/lsp_log_tests.rs b/crates/language_tools/src/lsp_log_view_tests.rs
similarity index 91%
rename from crates/language_tools/src/lsp_log_tests.rs
rename to crates/language_tools/src/lsp_log_view_tests.rs
index ad2b653fdc..bfd093e3db 100644
--- a/crates/language_tools/src/lsp_log_tests.rs
+++ b/crates/language_tools/src/lsp_log_view_tests.rs
@@ -1,20 +1,22 @@
 use std::sync::Arc;
 
-use crate::lsp_log::LogMenuItem;
+use crate::lsp_log_view::LogMenuItem;
 
 use super::*;
 use futures::StreamExt;
 use gpui::{AppContext as _, SemanticVersion, TestAppContext, VisualTestContext};
 use language::{FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
 use lsp::LanguageServerName;
-use lsp_log::LogKind;
-use project::{FakeFs, Project};
+use project::{
+    FakeFs, Project,
+    lsp_store::log_store::{LanguageServerKind, LogKind, LogStore},
+};
 use serde_json::json;
 use settings::SettingsStore;
 use util::path;
 
 #[gpui::test]
-async fn test_lsp_logs(cx: &mut TestAppContext) {
+async fn test_lsp_log_view(cx: &mut TestAppContext) {
     zlog::init_test();
 
     init_test(cx);
@@ -51,7 +53,7 @@ async fn test_lsp_logs(cx: &mut TestAppContext) {
         },
     );
 
-    let log_store = cx.new(LogStore::new);
+    let log_store = cx.new(|cx| LogStore::new(true, cx));
     log_store.update(cx, |store, cx| store.add_project(&project, cx));
 
     let _rust_buffer = project
@@ -94,7 +96,7 @@ async fn test_lsp_logs(cx: &mut TestAppContext) {
                 rpc_trace_enabled: false,
                 selected_entry: LogKind::Logs,
                 trace_level: lsp::TraceValue::Off,
-                server_kind: lsp_log::LanguageServerKind::Local {
+                server_kind: LanguageServerKind::Local {
                     project: project.downgrade()
                 }
             }]
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index ad9d0abf40..d11e567996 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -11,18 +11,22 @@
 //! Most of the interesting work happens at the local layer, as bulk of the complexity is with managing the lifecycle of language servers. The actual implementation of the LSP protocol is handled by [`lsp`] crate.
 pub mod clangd_ext;
 pub mod json_language_server_ext;
+pub mod log_store;
 pub mod lsp_ext_command;
 pub mod rust_analyzer_ext;
 
 use crate::{
     CodeAction, ColorPresentation, Completion, CompletionResponse, CompletionSource,
     CoreCompletion, DocumentColor, Hover, InlayHint, LocationLink, LspAction, LspPullDiagnostics,
-    ManifestProvidersStore, ProjectItem, ProjectPath, ProjectTransaction, PulledDiagnostics,
-    ResolveState, Symbol,
+    ManifestProvidersStore, Project, ProjectItem, ProjectPath, ProjectTransaction,
+    PulledDiagnostics, ResolveState, Symbol,
     buffer_store::{BufferStore, BufferStoreEvent},
     environment::ProjectEnvironment,
     lsp_command::{self, *},
-    lsp_store,
+    lsp_store::{
+        self,
+        log_store::{GlobalLogStore, LanguageServerKind},
+    },
     manifest_tree::{
         LanguageServerTree, LanguageServerTreeNode, LaunchDisposition, ManifestQueryDelegate,
         ManifestTree,
@@ -977,7 +981,9 @@ impl LocalLspStore {
                         this.update(&mut cx, |_, cx| {
                             cx.emit(LspStoreEvent::LanguageServerLog(
                                 server_id,
-                                LanguageServerLogType::Trace(params.verbose),
+                                LanguageServerLogType::Trace {
+                                    verbose_info: params.verbose,
+                                },
                                 params.message,
                             ));
                         })
@@ -3482,13 +3488,13 @@ pub struct LspStore {
     buffer_store: Entity<BufferStore>,
     worktree_store: Entity<WorktreeStore>,
     pub languages: Arc<LanguageRegistry>,
-    language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
+    pub language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
     active_entry: Option<ProjectEntryId>,
     _maintain_workspace_config: (Task<Result<()>>, watch::Sender<()>),
     _maintain_buffer_languages: Task<()>,
     diagnostic_summaries:
         HashMap<WorktreeId, HashMap<Arc<Path>, HashMap<LanguageServerId, DiagnosticSummary>>>,
-    pub(super) lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
+    pub lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
     lsp_document_colors: HashMap<BufferId, DocumentColorData>,
     lsp_code_lens: HashMap<BufferId, CodeLensData>,
     running_lsp_requests: HashMap<TypeId, (Global, HashMap<LspRequestId, Task<()>>)>,
@@ -3565,6 +3571,7 @@ pub struct LanguageServerStatus {
     pub pending_work: BTreeMap<String, LanguageServerProgress>,
     pub has_pending_diagnostic_updates: bool,
     progress_tokens: HashSet<String>,
+    pub worktree: Option<WorktreeId>,
 }
 
 #[derive(Clone, Debug)]
@@ -7483,7 +7490,7 @@ impl LspStore {
                         server: Some(proto::LanguageServer {
                             id: server_id.to_proto(),
                             name: status.name.to_string(),
-                            worktree_id: None,
+                            worktree_id: status.worktree.map(|id| id.to_proto()),
                         }),
                         capabilities: serde_json::to_string(&server.capabilities())
                             .expect("serializing server LSP capabilities"),
@@ -7508,9 +7515,15 @@ impl LspStore {
 
     pub(crate) fn set_language_server_statuses_from_proto(
         &mut self,
+        project: WeakEntity<Project>,
         language_servers: Vec<proto::LanguageServer>,
         server_capabilities: Vec<String>,
+        cx: &mut Context<Self>,
     ) {
+        let lsp_logs = cx
+            .try_global::<GlobalLogStore>()
+            .map(|lsp_store| lsp_store.0.clone());
+
         self.language_server_statuses = language_servers
             .into_iter()
             .zip(server_capabilities)
@@ -7520,13 +7533,34 @@ impl LspStore {
                     self.lsp_server_capabilities
                         .insert(server_id, server_capabilities);
                 }
+
+                let name = LanguageServerName::from_proto(server.name);
+                let worktree = server.worktree_id.map(WorktreeId::from_proto);
+
+                if let Some(lsp_logs) = &lsp_logs {
+                    lsp_logs.update(cx, |lsp_logs, cx| {
+                        lsp_logs.add_language_server(
+                            // Only remote clients get their language servers set from proto
+                            LanguageServerKind::Remote {
+                                project: project.clone(),
+                            },
+                            server_id,
+                            Some(name.clone()),
+                            worktree,
+                            None,
+                            cx,
+                        );
+                    });
+                }
+
                 (
                     server_id,
                     LanguageServerStatus {
-                        name: LanguageServerName::from_proto(server.name),
+                        name,
                         pending_work: Default::default(),
                         has_pending_diagnostic_updates: false,
                         progress_tokens: Default::default(),
+                        worktree,
                     },
                 )
             })
@@ -8892,6 +8926,7 @@ impl LspStore {
                     pending_work: Default::default(),
                     has_pending_diagnostic_updates: false,
                     progress_tokens: Default::default(),
+                    worktree: server.worktree_id.map(WorktreeId::from_proto),
                 },
             );
             cx.emit(LspStoreEvent::LanguageServerAdded(
@@ -10905,6 +10940,7 @@ impl LspStore {
                 pending_work: Default::default(),
                 has_pending_diagnostic_updates: false,
                 progress_tokens: Default::default(),
+                worktree: Some(key.worktree_id),
             },
         );
 
@@ -12190,6 +12226,14 @@ impl LspStore {
         let data = self.lsp_code_lens.get_mut(&buffer_id)?;
         Some(data.update.take()?.1)
     }
+
+    pub fn downstream_client(&self) -> Option<(AnyProtoClient, u64)> {
+        self.downstream_client.clone()
+    }
+
+    pub fn worktree_store(&self) -> Entity<WorktreeStore> {
+        self.worktree_store.clone()
+    }
 }
 
 // Registration with registerOptions as null, should fallback to true.
@@ -12699,45 +12743,69 @@ impl PartialEq for LanguageServerPromptRequest {
 #[derive(Clone, Debug, PartialEq)]
 pub enum LanguageServerLogType {
     Log(MessageType),
-    Trace(Option<String>),
+    Trace { verbose_info: Option<String> },
+    Rpc { received: bool },
 }
 
 impl LanguageServerLogType {
     pub fn to_proto(&self) -> proto::language_server_log::LogType {
         match self {
             Self::Log(log_type) => {
-                let message_type = match *log_type {
-                    MessageType::ERROR => 1,
-                    MessageType::WARNING => 2,
-                    MessageType::INFO => 3,
-                    MessageType::LOG => 4,
+                use proto::log_message::LogLevel;
+                let level = match *log_type {
+                    MessageType::ERROR => LogLevel::Error,
+                    MessageType::WARNING => LogLevel::Warning,
+                    MessageType::INFO => LogLevel::Info,
+                    MessageType::LOG => LogLevel::Log,
                     other => {
-                        log::warn!("Unknown lsp log message type: {:?}", other);
-                        4
+                        log::warn!("Unknown lsp log message type: {other:?}");
+                        LogLevel::Log
                     }
                 };
-                proto::language_server_log::LogType::LogMessageType(message_type)
-            }
-            Self::Trace(message) => {
-                proto::language_server_log::LogType::LogTrace(proto::LspLogTrace {
-                    message: message.clone(),
+                proto::language_server_log::LogType::Log(proto::LogMessage {
+                    level: level as i32,
                 })
             }
+            Self::Trace { verbose_info } => {
+                proto::language_server_log::LogType::Trace(proto::TraceMessage {
+                    verbose_info: verbose_info.to_owned(),
+                })
+            }
+            Self::Rpc { received } => {
+                let kind = if *received {
+                    proto::rpc_message::Kind::Received
+                } else {
+                    proto::rpc_message::Kind::Sent
+                };
+                let kind = kind as i32;
+                proto::language_server_log::LogType::Rpc(proto::RpcMessage { kind })
+            }
         }
     }
 
     pub fn from_proto(log_type: proto::language_server_log::LogType) -> Self {
+        use proto::log_message::LogLevel;
+        use proto::rpc_message;
         match log_type {
-            proto::language_server_log::LogType::LogMessageType(message_type) => {
-                Self::Log(match message_type {
-                    1 => MessageType::ERROR,
-                    2 => MessageType::WARNING,
-                    3 => MessageType::INFO,
-                    4 => MessageType::LOG,
-                    _ => MessageType::LOG,
-                })
-            }
-            proto::language_server_log::LogType::LogTrace(trace) => Self::Trace(trace.message),
+            proto::language_server_log::LogType::Log(message_type) => Self::Log(
+                match LogLevel::from_i32(message_type.level).unwrap_or(LogLevel::Log) {
+                    LogLevel::Error => MessageType::ERROR,
+                    LogLevel::Warning => MessageType::WARNING,
+                    LogLevel::Info => MessageType::INFO,
+                    LogLevel::Log => MessageType::LOG,
+                },
+            ),
+            proto::language_server_log::LogType::Trace(trace_message) => Self::Trace {
+                verbose_info: trace_message.verbose_info,
+            },
+            proto::language_server_log::LogType::Rpc(message) => Self::Rpc {
+                received: match rpc_message::Kind::from_i32(message.kind)
+                    .unwrap_or(rpc_message::Kind::Received)
+                {
+                    rpc_message::Kind::Received => true,
+                    rpc_message::Kind::Sent => false,
+                },
+            },
         }
     }
 }
diff --git a/crates/project/src/lsp_store/log_store.rs b/crates/project/src/lsp_store/log_store.rs
new file mode 100644
index 0000000000..1fbdb494a3
--- /dev/null
+++ b/crates/project/src/lsp_store/log_store.rs
@@ -0,0 +1,704 @@
+use std::{collections::VecDeque, sync::Arc};
+
+use collections::HashMap;
+use futures::{StreamExt, channel::mpsc};
+use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global, Subscription, WeakEntity};
+use lsp::{
+    IoKind, LanguageServer, LanguageServerId, LanguageServerName, LanguageServerSelector,
+    MessageType, TraceValue,
+};
+use rpc::proto;
+use settings::WorktreeId;
+
+use crate::{LanguageServerLogType, LspStore, Project, ProjectItem as _};
+
+const SEND_LINE: &str = "\n// Send:";
+const RECEIVE_LINE: &str = "\n// Receive:";
+const MAX_STORED_LOG_ENTRIES: usize = 2000;
+
+const RPC_MESSAGES: &str = "RPC Messages";
+const SERVER_LOGS: &str = "Server Logs";
+const SERVER_TRACE: &str = "Server Trace";
+const SERVER_INFO: &str = "Server Info";
+
+pub fn init(store_logs: bool, cx: &mut App) -> Entity<LogStore> {
+    let log_store = cx.new(|cx| LogStore::new(store_logs, cx));
+    cx.set_global(GlobalLogStore(log_store.clone()));
+    log_store
+}
+
+pub struct GlobalLogStore(pub Entity<LogStore>);
+
+impl Global for GlobalLogStore {}
+
+#[derive(Debug)]
+pub enum Event {
+    NewServerLogEntry {
+        id: LanguageServerId,
+        kind: LanguageServerLogType,
+        text: String,
+    },
+}
+
+impl EventEmitter<Event> for LogStore {}
+
+pub struct LogStore {
+    store_logs: bool,
+    projects: HashMap<WeakEntity<Project>, ProjectState>,
+    pub copilot_log_subscription: Option<lsp::Subscription>,
+    pub language_servers: HashMap<LanguageServerId, LanguageServerState>,
+    io_tx: mpsc::UnboundedSender<(LanguageServerId, IoKind, String)>,
+}
+
+struct ProjectState {
+    _subscriptions: [Subscription; 2],
+}
+
+pub trait Message: AsRef<str> {
+    type Level: Copy + std::fmt::Debug;
+    fn should_include(&self, _: Self::Level) -> bool {
+        true
+    }
+}
+
+#[derive(Debug)]
+pub struct LogMessage {
+    message: String,
+    typ: MessageType,
+}
+
+impl AsRef<str> for LogMessage {
+    fn as_ref(&self) -> &str {
+        &self.message
+    }
+}
+
+impl Message for LogMessage {
+    type Level = MessageType;
+
+    fn should_include(&self, level: Self::Level) -> bool {
+        match (self.typ, level) {
+            (MessageType::ERROR, _) => true,
+            (_, MessageType::ERROR) => false,
+            (MessageType::WARNING, _) => true,
+            (_, MessageType::WARNING) => false,
+            (MessageType::INFO, _) => true,
+            (_, MessageType::INFO) => false,
+            _ => true,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TraceMessage {
+    message: String,
+    is_verbose: bool,
+}
+
+impl AsRef<str> for TraceMessage {
+    fn as_ref(&self) -> &str {
+        &self.message
+    }
+}
+
+impl Message for TraceMessage {
+    type Level = TraceValue;
+
+    fn should_include(&self, level: Self::Level) -> bool {
+        match level {
+            TraceValue::Off => false,
+            TraceValue::Messages => !self.is_verbose,
+            TraceValue::Verbose => true,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RpcMessage {
+    message: String,
+}
+
+impl AsRef<str> for RpcMessage {
+    fn as_ref(&self) -> &str {
+        &self.message
+    }
+}
+
+impl Message for RpcMessage {
+    type Level = ();
+}
+
+pub struct LanguageServerState {
+    pub name: Option<LanguageServerName>,
+    pub worktree_id: Option<WorktreeId>,
+    pub kind: LanguageServerKind,
+    log_messages: VecDeque<LogMessage>,
+    trace_messages: VecDeque<TraceMessage>,
+    pub rpc_state: Option<LanguageServerRpcState>,
+    pub trace_level: TraceValue,
+    pub log_level: MessageType,
+    io_logs_subscription: Option<lsp::Subscription>,
+}
+
+impl std::fmt::Debug for LanguageServerState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("LanguageServerState")
+            .field("name", &self.name)
+            .field("worktree_id", &self.worktree_id)
+            .field("kind", &self.kind)
+            .field("log_messages", &self.log_messages)
+            .field("trace_messages", &self.trace_messages)
+            .field("rpc_state", &self.rpc_state)
+            .field("trace_level", &self.trace_level)
+            .field("log_level", &self.log_level)
+            .finish_non_exhaustive()
+    }
+}
+
+#[derive(PartialEq, Clone)]
+pub enum LanguageServerKind {
+    Local { project: WeakEntity<Project> },
+    Remote { project: WeakEntity<Project> },
+    LocalSsh { lsp_store: WeakEntity<LspStore> },
+    Global,
+}
+
+impl std::fmt::Debug for LanguageServerKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            LanguageServerKind::Local { .. } => write!(f, "LanguageServerKind::Local"),
+            LanguageServerKind::Remote { .. } => write!(f, "LanguageServerKind::Remote"),
+            LanguageServerKind::LocalSsh { .. } => write!(f, "LanguageServerKind::LocalSsh"),
+            LanguageServerKind::Global => write!(f, "LanguageServerKind::Global"),
+        }
+    }
+}
+
+impl LanguageServerKind {
+    pub fn project(&self) -> Option<&WeakEntity<Project>> {
+        match self {
+            Self::Local { project } => Some(project),
+            Self::Remote { project } => Some(project),
+            Self::LocalSsh { .. } => None,
+            Self::Global { .. } => None,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LanguageServerRpcState {
+    pub rpc_messages: VecDeque<RpcMessage>,
+    last_message_kind: Option<MessageKind>,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+enum MessageKind {
+    Send,
+    Receive,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub enum LogKind {
+    Rpc,
+    Trace,
+    #[default]
+    Logs,
+    ServerInfo,
+}
+
+impl LogKind {
+    pub fn from_server_log_type(log_type: &LanguageServerLogType) -> Self {
+        match log_type {
+            LanguageServerLogType::Log(_) => Self::Logs,
+            LanguageServerLogType::Trace { .. } => Self::Trace,
+            LanguageServerLogType::Rpc { .. } => Self::Rpc,
+        }
+    }
+
+    pub fn label(&self) -> &'static str {
+        match self {
+            LogKind::Rpc => RPC_MESSAGES,
+            LogKind::Trace => SERVER_TRACE,
+            LogKind::Logs => SERVER_LOGS,
+            LogKind::ServerInfo => SERVER_INFO,
+        }
+    }
+}
+
+impl LogStore {
+    pub fn new(store_logs: bool, cx: &mut Context<Self>) -> Self {
+        let (io_tx, mut io_rx) = mpsc::unbounded();
+
+        let log_store = Self {
+            projects: HashMap::default(),
+            language_servers: HashMap::default(),
+            copilot_log_subscription: None,
+            store_logs,
+            io_tx,
+        };
+        cx.spawn(async move |log_store, cx| {
+            while let Some((server_id, io_kind, message)) = io_rx.next().await {
+                if let Some(log_store) = log_store.upgrade() {
+                    log_store.update(cx, |log_store, cx| {
+                        log_store.on_io(server_id, io_kind, &message, cx);
+                    })?;
+                }
+            }
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+
+        log_store
+    }
+
+    pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
+        let weak_project = project.downgrade();
+        self.projects.insert(
+            project.downgrade(),
+            ProjectState {
+                _subscriptions: [
+                    cx.observe_release(project, move |this, _, _| {
+                        this.projects.remove(&weak_project);
+                        this.language_servers
+                            .retain(|_, state| state.kind.project() != Some(&weak_project));
+                    }),
+                    cx.subscribe(project, move |log_store, project, event, cx| {
+                        let server_kind = if project.read(cx).is_local() {
+                            LanguageServerKind::Local {
+                                project: project.downgrade(),
+                            }
+                        } else {
+                            LanguageServerKind::Remote {
+                                project: project.downgrade(),
+                            }
+                        };
+                        match event {
+                            crate::Event::LanguageServerAdded(id, name, worktree_id) => {
+                                log_store.add_language_server(
+                                    server_kind,
+                                    *id,
+                                    Some(name.clone()),
+                                    *worktree_id,
+                                    project
+                                        .read(cx)
+                                        .lsp_store()
+                                        .read(cx)
+                                        .language_server_for_id(*id),
+                                    cx,
+                                );
+                            }
+                            crate::Event::LanguageServerBufferRegistered {
+                                server_id,
+                                buffer_id,
+                                name,
+                                ..
+                            } => {
+                                let worktree_id = project
+                                    .read(cx)
+                                    .buffer_for_id(*buffer_id, cx)
+                                    .and_then(|buffer| {
+                                        Some(buffer.read(cx).project_path(cx)?.worktree_id)
+                                    });
+                                let name = name.clone().or_else(|| {
+                                    project
+                                        .read(cx)
+                                        .lsp_store()
+                                        .read(cx)
+                                        .language_server_statuses
+                                        .get(server_id)
+                                        .map(|status| status.name.clone())
+                                });
+                                log_store.add_language_server(
+                                    server_kind,
+                                    *server_id,
+                                    name,
+                                    worktree_id,
+                                    None,
+                                    cx,
+                                );
+                            }
+                            crate::Event::LanguageServerRemoved(id) => {
+                                log_store.remove_language_server(*id, cx);
+                            }
+                            crate::Event::LanguageServerLog(id, typ, message) => {
+                                log_store.add_language_server(
+                                    server_kind,
+                                    *id,
+                                    None,
+                                    None,
+                                    None,
+                                    cx,
+                                );
+                                match typ {
+                                    crate::LanguageServerLogType::Log(typ) => {
+                                        log_store.add_language_server_log(*id, *typ, message, cx);
+                                    }
+                                    crate::LanguageServerLogType::Trace { verbose_info } => {
+                                        log_store.add_language_server_trace(
+                                            *id,
+                                            message,
+                                            verbose_info.clone(),
+                                            cx,
+                                        );
+                                    }
+                                    crate::LanguageServerLogType::Rpc { received } => {
+                                        let kind = if *received {
+                                            MessageKind::Receive
+                                        } else {
+                                            MessageKind::Send
+                                        };
+                                        log_store.add_language_server_rpc(*id, kind, message, cx);
+                                    }
+                                }
+                            }
+                            crate::Event::ToggleLspLogs { server_id, enabled } => {
+                                // we do not support any other log toggling yet
+                                if *enabled {
+                                    log_store.enable_rpc_trace_for_language_server(*server_id);
+                                } else {
+                                    log_store.disable_rpc_trace_for_language_server(*server_id);
+                                }
+                            }
+                            _ => {}
+                        }
+                    }),
+                ],
+            },
+        );
+    }
+
+    pub fn get_language_server_state(
+        &mut self,
+        id: LanguageServerId,
+    ) -> Option<&mut LanguageServerState> {
+        self.language_servers.get_mut(&id)
+    }
+
+    pub fn add_language_server(
+        &mut self,
+        kind: LanguageServerKind,
+        server_id: LanguageServerId,
+        name: Option<LanguageServerName>,
+        worktree_id: Option<WorktreeId>,
+        server: Option<Arc<LanguageServer>>,
+        cx: &mut Context<Self>,
+    ) -> Option<&mut LanguageServerState> {
+        let server_state = self.language_servers.entry(server_id).or_insert_with(|| {
+            cx.notify();
+            LanguageServerState {
+                name: None,
+                worktree_id: None,
+                kind,
+                rpc_state: None,
+                log_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
+                trace_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
+                trace_level: TraceValue::Off,
+                log_level: MessageType::LOG,
+                io_logs_subscription: None,
+            }
+        });
+
+        if let Some(name) = name {
+            server_state.name = Some(name);
+        }
+        if let Some(worktree_id) = worktree_id {
+            server_state.worktree_id = Some(worktree_id);
+        }
+
+        if let Some(server) = server.filter(|_| server_state.io_logs_subscription.is_none()) {
+            let io_tx = self.io_tx.clone();
+            let server_id = server.server_id();
+            server_state.io_logs_subscription = Some(server.on_io(move |io_kind, message| {
+                io_tx
+                    .unbounded_send((server_id, io_kind, message.to_string()))
+                    .ok();
+            }));
+        }
+
+        Some(server_state)
+    }
+
+    pub fn add_language_server_log(
+        &mut self,
+        id: LanguageServerId,
+        typ: MessageType,
+        message: &str,
+        cx: &mut Context<Self>,
+    ) -> Option<()> {
+        let store_logs = self.store_logs;
+        let language_server_state = self.get_language_server_state(id)?;
+
+        let log_lines = &mut language_server_state.log_messages;
+        let message = message.trim_end().to_string();
+        if !store_logs {
+            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Log(typ),
+                    text: message,
+                },
+                cx,
+            );
+        } else if let Some(new_message) = Self::push_new_message(
+            log_lines,
+            LogMessage { message, typ },
+            language_server_state.log_level,
+        ) {
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Log(typ),
+                    text: new_message,
+                },
+                cx,
+            );
+        }
+        Some(())
+    }
+
+    fn add_language_server_trace(
+        &mut self,
+        id: LanguageServerId,
+        message: &str,
+        verbose_info: Option<String>,
+        cx: &mut Context<Self>,
+    ) -> Option<()> {
+        let store_logs = self.store_logs;
+        let language_server_state = self.get_language_server_state(id)?;
+
+        let log_lines = &mut language_server_state.trace_messages;
+        if !store_logs {
+            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Trace { verbose_info },
+                    text: message.trim().to_string(),
+                },
+                cx,
+            );
+        } else if let Some(new_message) = Self::push_new_message(
+            log_lines,
+            TraceMessage {
+                message: message.trim().to_string(),
+                is_verbose: false,
+            },
+            TraceValue::Messages,
+        ) {
+            if let Some(verbose_message) = verbose_info.as_ref() {
+                Self::push_new_message(
+                    log_lines,
+                    TraceMessage {
+                        message: verbose_message.clone(),
+                        is_verbose: true,
+                    },
+                    TraceValue::Verbose,
+                );
+            }
+            self.emit_event(
+                Event::NewServerLogEntry {
+                    id,
+                    kind: LanguageServerLogType::Trace { verbose_info },
+                    text: new_message,
+                },
+                cx,
+            );
+        }
+        Some(())
+    }
+
+    fn push_new_message<T: Message>(
+        log_lines: &mut VecDeque<T>,
+        message: T,
+        current_severity: <T as Message>::Level,
+    ) -> Option<String> {
+        while log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+            log_lines.pop_front();
+        }
+        let visible = message.should_include(current_severity);
+
+        let visible_message = visible.then(|| message.as_ref().to_string());
+        log_lines.push_back(message);
+        visible_message
+    }
+
+    fn add_language_server_rpc(
+        &mut self,
+        language_server_id: LanguageServerId,
+        kind: MessageKind,
+        message: &str,
+        cx: &mut Context<'_, Self>,
+    ) {
+        let store_logs = self.store_logs;
+        let Some(state) = self
+            .get_language_server_state(language_server_id)
+            .and_then(|state| state.rpc_state.as_mut())
+        else {
+            return;
+        };
+
+        let received = kind == MessageKind::Receive;
+        let rpc_log_lines = &mut state.rpc_messages;
+        if state.last_message_kind != Some(kind) {
+            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+                rpc_log_lines.pop_front();
+            }
+            let line_before_message = match kind {
+                MessageKind::Send => SEND_LINE,
+                MessageKind::Receive => RECEIVE_LINE,
+            };
+            if store_logs {
+                rpc_log_lines.push_back(RpcMessage {
+                    message: line_before_message.to_string(),
+                });
+            }
+            // Do not send a synthetic message over the wire, it will be derived from the actual RPC message
+            cx.emit(Event::NewServerLogEntry {
+                id: language_server_id,
+                kind: LanguageServerLogType::Rpc { received },
+                text: line_before_message.to_string(),
+            });
+        }
+
+        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
+            rpc_log_lines.pop_front();
+        }
+
+        if store_logs {
+            rpc_log_lines.push_back(RpcMessage {
+                message: message.trim().to_owned(),
+            });
+        }
+
+        self.emit_event(
+            Event::NewServerLogEntry {
+                id: language_server_id,
+                kind: LanguageServerLogType::Rpc { received },
+                text: message.to_owned(),
+            },
+            cx,
+        );
+    }
+
+    pub fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
+        self.language_servers.remove(&id);
+        cx.notify();
+    }
+
+    pub fn server_logs(&self, server_id: LanguageServerId) -> Option<&VecDeque<LogMessage>> {
+        Some(&self.language_servers.get(&server_id)?.log_messages)
+    }
+
+    pub fn server_trace(&self, server_id: LanguageServerId) -> Option<&VecDeque<TraceMessage>> {
+        Some(&self.language_servers.get(&server_id)?.trace_messages)
+    }
+
+    pub fn server_ids_for_project<'a>(
+        &'a self,
+        lookup_project: &'a WeakEntity<Project>,
+    ) -> impl Iterator<Item = LanguageServerId> + 'a {
+        self.language_servers
+            .iter()
+            .filter_map(move |(id, state)| match &state.kind {
+                LanguageServerKind::Local { project } | LanguageServerKind::Remote { project } => {
+                    if project == lookup_project {
+                        Some(*id)
+                    } else {
+                        None
+                    }
+                }
+                LanguageServerKind::Global | LanguageServerKind::LocalSsh { .. } => Some(*id),
+            })
+    }
+
+    pub fn enable_rpc_trace_for_language_server(
+        &mut self,
+        server_id: LanguageServerId,
+    ) -> Option<&mut LanguageServerRpcState> {
+        let rpc_state = self
+            .language_servers
+            .get_mut(&server_id)?
+            .rpc_state
+            .get_or_insert_with(|| LanguageServerRpcState {
+                rpc_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
+                last_message_kind: None,
+            });
+        Some(rpc_state)
+    }
+
+    pub fn disable_rpc_trace_for_language_server(
+        &mut self,
+        server_id: LanguageServerId,
+    ) -> Option<()> {
+        self.language_servers.get_mut(&server_id)?.rpc_state.take();
+        Some(())
+    }
+
+    pub fn has_server_logs(&self, server: &LanguageServerSelector) -> bool {
+        match server {
+            LanguageServerSelector::Id(id) => self.language_servers.contains_key(id),
+            LanguageServerSelector::Name(name) => self
+                .language_servers
+                .iter()
+                .any(|(_, state)| state.name.as_ref() == Some(name)),
+        }
+    }
+
+    fn on_io(
+        &mut self,
+        language_server_id: LanguageServerId,
+        io_kind: IoKind,
+        message: &str,
+        cx: &mut Context<Self>,
+    ) -> Option<()> {
+        let is_received = match io_kind {
+            IoKind::StdOut => true,
+            IoKind::StdIn => false,
+            IoKind::StdErr => {
+                self.add_language_server_log(language_server_id, MessageType::LOG, message, cx);
+                return Some(());
+            }
+        };
+
+        let kind = if is_received {
+            MessageKind::Receive
+        } else {
+            MessageKind::Send
+        };
+
+        self.add_language_server_rpc(language_server_id, kind, message, cx);
+        cx.notify();
+        Some(())
+    }
+
+    fn emit_event(&mut self, e: Event, cx: &mut Context<Self>) {
+        match &e {
+            Event::NewServerLogEntry { id, kind, text } => {
+                if let Some(state) = self.get_language_server_state(*id) {
+                    let downstream_client = match &state.kind {
+                        LanguageServerKind::Remote { project }
+                        | LanguageServerKind::Local { project } => project
+                            .upgrade()
+                            .map(|project| project.read(cx).lsp_store()),
+                        LanguageServerKind::LocalSsh { lsp_store } => lsp_store.upgrade(),
+                        LanguageServerKind::Global => None,
+                    }
+                    .and_then(|lsp_store| lsp_store.read(cx).downstream_client());
+                    if let Some((client, project_id)) = downstream_client {
+                        client
+                            .send(proto::LanguageServerLog {
+                                project_id,
+                                language_server_id: id.to_proto(),
+                                message: text.clone(),
+                                log_type: Some(kind.to_proto()),
+                            })
+                            .ok();
+                    }
+                }
+            }
+        }
+
+        cx.emit(e);
+    }
+}
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 9e3900198c..86b2e08d62 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -280,6 +280,11 @@ pub enum Event {
         server_id: LanguageServerId,
         buffer_id: BufferId,
         buffer_abs_path: PathBuf,
+        name: Option<LanguageServerName>,
+    },
+    ToggleLspLogs {
+        server_id: LanguageServerId,
+        enabled: bool,
     },
     Toast {
         notification_id: SharedString,
@@ -1001,6 +1006,7 @@ impl Project {
         client.add_entity_request_handler(Self::handle_open_buffer_by_path);
         client.add_entity_request_handler(Self::handle_open_new_buffer);
         client.add_entity_message_handler(Self::handle_create_buffer_for_peer);
+        client.add_entity_message_handler(Self::handle_toggle_lsp_logs);
 
         WorktreeStore::init(&client);
         BufferStore::init(&client);
@@ -1475,7 +1481,7 @@ impl Project {
         })?;
 
         let lsp_store = cx.new(|cx| {
-            let mut lsp_store = LspStore::new_remote(
+            LspStore::new_remote(
                 buffer_store.clone(),
                 worktree_store.clone(),
                 languages.clone(),
@@ -1483,12 +1489,7 @@ impl Project {
                 remote_id,
                 fs.clone(),
                 cx,
-            );
-            lsp_store.set_language_server_statuses_from_proto(
-                response.payload.language_servers,
-                response.payload.language_server_capabilities,
-            );
-            lsp_store
+            )
         })?;
 
         let task_store = cx.new(|cx| {
@@ -1522,7 +1523,7 @@ impl Project {
             )
         })?;
 
-        let this = cx.new(|cx| {
+        let project = cx.new(|cx| {
             let replica_id = response.payload.replica_id as ReplicaId;
 
             let snippets = SnippetProvider::new(fs.clone(), BTreeSet::from_iter([]), cx);
@@ -1553,7 +1554,7 @@ impl Project {
 
             cx.subscribe(&dap_store, Self::on_dap_store_event).detach();
 
-            let mut this = Self {
+            let mut project = Self {
                 buffer_ordered_messages_tx: tx,
                 buffer_store: buffer_store.clone(),
                 image_store,
@@ -1596,13 +1597,25 @@ impl Project {
                 toolchain_store: None,
                 agent_location: None,
             };
-            this.set_role(role, cx);
+            project.set_role(role, cx);
             for worktree in worktrees {
-                this.add_worktree(&worktree, cx);
+                project.add_worktree(&worktree, cx);
             }
-            this
+            project
         })?;
 
+        let weak_project = project.downgrade();
+        lsp_store
+            .update(&mut cx, |lsp_store, cx| {
+                lsp_store.set_language_server_statuses_from_proto(
+                    weak_project,
+                    response.payload.language_servers,
+                    response.payload.language_server_capabilities,
+                    cx,
+                );
+            })
+            .ok();
+
         let subscriptions = subscriptions
             .into_iter()
             .map(|s| match s {
@@ -1618,7 +1631,7 @@ impl Project {
                 EntitySubscription::SettingsObserver(subscription) => {
                     subscription.set_entity(&settings_observer, &cx)
                 }
-                EntitySubscription::Project(subscription) => subscription.set_entity(&this, &cx),
+                EntitySubscription::Project(subscription) => subscription.set_entity(&project, &cx),
                 EntitySubscription::LspStore(subscription) => {
                     subscription.set_entity(&lsp_store, &cx)
                 }
@@ -1638,13 +1651,13 @@ impl Project {
             .update(&mut cx, |user_store, cx| user_store.get_users(user_ids, cx))?
             .await?;
 
-        this.update(&mut cx, |this, cx| {
+        project.update(&mut cx, |this, cx| {
             this.set_collaborators_from_proto(response.payload.collaborators, cx)?;
             this.client_subscriptions.extend(subscriptions);
             anyhow::Ok(())
         })??;
 
-        Ok(this)
+        Ok(project)
     }
 
     fn new_search_history() -> SearchHistory {
@@ -2315,10 +2328,14 @@ impl Project {
         self.join_project_response_message_id = message_id;
         self.set_worktrees_from_proto(message.worktrees, cx)?;
         self.set_collaborators_from_proto(message.collaborators, cx)?;
-        self.lsp_store.update(cx, |lsp_store, _| {
+
+        let project = cx.weak_entity();
+        self.lsp_store.update(cx, |lsp_store, cx| {
             lsp_store.set_language_server_statuses_from_proto(
+                project,
                 message.language_servers,
                 message.language_server_capabilities,
+                cx,
             )
         });
         self.enqueue_buffer_ordered_message(BufferOrderedMessage::Resync)
@@ -2971,6 +2988,7 @@ impl Project {
                                 buffer_id,
                                 server_id: *language_server_id,
                                 buffer_abs_path: PathBuf::from(&update.buffer_abs_path),
+                                name: name.clone(),
                             });
                         }
                     }
@@ -4697,6 +4715,20 @@ impl Project {
         })?
     }
 
+    async fn handle_toggle_lsp_logs(
+        project: Entity<Self>,
+        envelope: TypedEnvelope<proto::ToggleLspLogs>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        project.update(&mut cx, |_, cx| {
+            cx.emit(Event::ToggleLspLogs {
+                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
+                enabled: envelope.payload.enabled,
+            })
+        })?;
+        Ok(())
+    }
+
     async fn handle_synchronize_buffers(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::SynchronizeBuffers>,
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index f49713d208..a8f911883d 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1951,6 +1951,7 @@ async fn test_restarting_server_with_diagnostics_running(cx: &mut gpui::TestAppC
             server_id: LanguageServerId(1),
             buffer_id,
             buffer_abs_path: PathBuf::from(path!("/dir/a.rs")),
+            name: Some(fake_server.server.name())
         }
     );
     assert_eq!(
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 473ef5c38c..16f6217b29 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -610,11 +610,36 @@ message ServerMetadataUpdated {
 message LanguageServerLog {
     uint64 project_id = 1;
     uint64 language_server_id = 2;
+    string message = 3;
     oneof log_type {
-        uint32 log_message_type = 3;
-        LspLogTrace log_trace = 4;
+        LogMessage log = 4;
+        TraceMessage trace = 5;
+        RpcMessage rpc = 6;
+    }
+}
+
+message LogMessage {
+    LogLevel level = 1;
+
+    enum LogLevel {
+        LOG = 0;
+        INFO = 1;
+        WARNING = 2;
+        ERROR = 3;
+    }
+}
+
+message TraceMessage {
+    optional string verbose_info = 1;
+}
+
+message RpcMessage {
+    Kind kind = 1;
+
+    enum Kind {
+        RECEIVED = 0;
+        SENT = 1;
     }
-    string message = 5;
 }
 
 message LspLogTrace {
@@ -932,3 +957,16 @@ message MultiLspQuery {
 message MultiLspQueryResponse {
     repeated LspResponse responses = 1;
 }
+
+message ToggleLspLogs {
+    uint64 project_id = 1;
+    LogType log_type = 2;
+    uint64 server_id = 3;
+    bool enabled = 4;
+
+    enum LogType {
+        LOG = 0;
+        TRACE = 1;
+        RPC = 2;
+    }
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 70689bcd63..2222bdec08 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -396,7 +396,8 @@ message Envelope {
         GitCloneResponse git_clone_response = 364;
 
         LspQuery lsp_query = 365;
-        LspQueryResponse lsp_query_response = 366; // current max
+        LspQueryResponse lsp_query_response = 366;
+        ToggleLspLogs toggle_lsp_logs = 367; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index e17ec5203b..04495fb898 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -312,7 +312,8 @@ messages!(
     (GetDefaultBranch, Background),
     (GetDefaultBranchResponse, Background),
     (GitClone, Background),
-    (GitCloneResponse, Background)
+    (GitCloneResponse, Background),
+    (ToggleLspLogs, Background),
 );
 
 request_messages!(
@@ -481,7 +482,8 @@ request_messages!(
     (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse),
     (PullWorkspaceDiagnostics, Ack),
     (GetDefaultBranch, GetDefaultBranchResponse),
-    (GitClone, GitCloneResponse)
+    (GitClone, GitCloneResponse),
+    (ToggleLspLogs, Ack),
 );
 
 lsp_messages!(
@@ -612,6 +614,7 @@ entity_messages!(
     GitReset,
     GitCheckoutFiles,
     SetIndexText,
+    ToggleLspLogs,
 
     Push,
     Fetch,
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 04028ebcac..c81a69c2b3 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -1,5 +1,6 @@
 use ::proto::{FromProto, ToProto};
 use anyhow::{Context as _, Result, anyhow};
+use lsp::LanguageServerId;
 
 use extension::ExtensionHostProxy;
 use extension_host::headless_host::HeadlessExtensionStore;
@@ -14,6 +15,7 @@ use project::{
     buffer_store::{BufferStore, BufferStoreEvent},
     debugger::{breakpoint_store::BreakpointStore, dap_store::DapStore},
     git_store::GitStore,
+    lsp_store::log_store::{self, GlobalLogStore, LanguageServerKind},
     project_settings::SettingsObserver,
     search::SearchQuery,
     task_store::TaskStore,
@@ -65,6 +67,7 @@ impl HeadlessProject {
         settings::init(cx);
         language::init(cx);
         project::Project::init_settings(cx);
+        log_store::init(false, cx);
     }
 
     pub fn new(
@@ -235,6 +238,7 @@ impl HeadlessProject {
         session.add_entity_request_handler(Self::handle_open_new_buffer);
         session.add_entity_request_handler(Self::handle_find_search_candidates);
         session.add_entity_request_handler(Self::handle_open_server_settings);
+        session.add_entity_message_handler(Self::handle_toggle_lsp_logs);
 
         session.add_entity_request_handler(BufferStore::handle_update_buffer);
         session.add_entity_message_handler(BufferStore::handle_close_buffer);
@@ -298,11 +302,40 @@ impl HeadlessProject {
 
     fn on_lsp_store_event(
         &mut self,
-        _lsp_store: Entity<LspStore>,
+        lsp_store: Entity<LspStore>,
         event: &LspStoreEvent,
         cx: &mut Context<Self>,
     ) {
         match event {
+            LspStoreEvent::LanguageServerAdded(id, name, worktree_id) => {
+                let log_store = cx
+                    .try_global::<GlobalLogStore>()
+                    .map(|lsp_logs| lsp_logs.0.clone());
+                if let Some(log_store) = log_store {
+                    log_store.update(cx, |log_store, cx| {
+                        log_store.add_language_server(
+                            LanguageServerKind::LocalSsh {
+                                lsp_store: self.lsp_store.downgrade(),
+                            },
+                            *id,
+                            Some(name.clone()),
+                            *worktree_id,
+                            lsp_store.read(cx).language_server_for_id(*id),
+                            cx,
+                        );
+                    });
+                }
+            }
+            LspStoreEvent::LanguageServerRemoved(id) => {
+                let log_store = cx
+                    .try_global::<GlobalLogStore>()
+                    .map(|lsp_logs| lsp_logs.0.clone());
+                if let Some(log_store) = log_store {
+                    log_store.update(cx, |log_store, cx| {
+                        log_store.remove_language_server(*id, cx);
+                    });
+                }
+            }
             LspStoreEvent::LanguageServerUpdate {
                 language_server_id,
                 name,
@@ -326,16 +359,6 @@ impl HeadlessProject {
                     })
                     .log_err();
             }
-            LspStoreEvent::LanguageServerLog(language_server_id, log_type, message) => {
-                self.session
-                    .send(proto::LanguageServerLog {
-                        project_id: REMOTE_SERVER_PROJECT_ID,
-                        language_server_id: language_server_id.to_proto(),
-                        message: message.clone(),
-                        log_type: Some(log_type.to_proto()),
-                    })
-                    .log_err();
-            }
             LspStoreEvent::LanguageServerPrompt(prompt) => {
                 let request = self.session.request(proto::LanguageServerPromptRequest {
                     project_id: REMOTE_SERVER_PROJECT_ID,
@@ -509,7 +532,31 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_open_server_settings(
+    async fn handle_toggle_lsp_logs(
+        _: Entity<Self>,
+        envelope: TypedEnvelope<proto::ToggleLspLogs>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        let server_id = LanguageServerId::from_proto(envelope.payload.server_id);
+        let lsp_logs = cx
+            .update(|cx| {
+                cx.try_global::<GlobalLogStore>()
+                    .map(|lsp_logs| lsp_logs.0.clone())
+            })?
+            .context("lsp logs store is missing")?;
+
+        lsp_logs.update(&mut cx, |lsp_logs, _| {
+            // we do not support any other log toggling yet
+            if envelope.payload.enabled {
+                lsp_logs.enable_rpc_trace_for_language_server(server_id);
+            } else {
+                lsp_logs.disable_rpc_trace_for_language_server(server_id);
+            }
+        })?;
+        Ok(())
+    }
+
+    async fn handle_open_server_settings(
         this: Entity<Self>,
         _: TypedEnvelope<proto::OpenServerSettings>,
         mut cx: AsyncApp,
@@ -562,7 +609,7 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_find_search_candidates(
+    async fn handle_find_search_candidates(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::FindSearchCandidates>,
         mut cx: AsyncApp,
@@ -594,7 +641,7 @@ impl HeadlessProject {
         Ok(response)
     }
 
-    pub async fn handle_list_remote_directory(
+    async fn handle_list_remote_directory(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::ListRemoteDirectory>,
         cx: AsyncApp,
@@ -626,7 +673,7 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_get_path_metadata(
+    async fn handle_get_path_metadata(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::GetPathMetadata>,
         cx: AsyncApp,
@@ -644,7 +691,7 @@ impl HeadlessProject {
         })
     }
 
-    pub async fn handle_shutdown_remote_server(
+    async fn handle_shutdown_remote_server(
         _this: Entity<Self>,
         _envelope: TypedEnvelope<proto::ShutdownRemoteServer>,
         cx: AsyncApp,
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 1966755d62..a071733315 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -30,7 +30,7 @@ pub struct ActiveSettingsProfileName(pub String);
 
 impl Global for ActiveSettingsProfileName {}
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord, serde::Serialize)]
 pub struct WorktreeId(usize);
 
 impl From<WorktreeId> for usize {
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 587065f9b1..5a180e4b42 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -32,7 +32,8 @@ use gpui::{
 };
 use image_viewer::ImageInfo;
 use language::Capability;
-use language_tools::lsp_tool::{self, LspTool};
+use language_tools::lsp_button::{self, LspButton};
+use language_tools::lsp_log_view::LspLogToolbarItemView;
 use migrate::{MigrationBanner, MigrationEvent, MigrationNotification, MigrationType};
 use migrator::{migrate_keymap, migrate_settings};
 use onboarding::DOCS_URL;
@@ -396,12 +397,12 @@ pub fn initialize_workspace(
         let vim_mode_indicator = cx.new(|cx| vim::ModeIndicator::new(window, cx));
         let image_info = cx.new(|_cx| ImageInfo::new(workspace));
 
-        let lsp_tool_menu_handle = PopoverMenuHandle::default();
-        let lsp_tool =
-            cx.new(|cx| LspTool::new(workspace, lsp_tool_menu_handle.clone(), window, cx));
+        let lsp_button_menu_handle = PopoverMenuHandle::default();
+        let lsp_button =
+            cx.new(|cx| LspButton::new(workspace, lsp_button_menu_handle.clone(), window, cx));
         workspace.register_action({
-            move |_, _: &lsp_tool::ToggleMenu, window, cx| {
-                lsp_tool_menu_handle.toggle(window, cx);
+            move |_, _: &lsp_button::ToggleMenu, window, cx| {
+                lsp_button_menu_handle.toggle(window, cx);
             }
         });
 
@@ -409,7 +410,7 @@ pub fn initialize_workspace(
             cx.new(|_| go_to_line::cursor_position::CursorPosition::new(workspace));
         workspace.status_bar().update(cx, |status_bar, cx| {
             status_bar.add_left_item(search_button, window, cx);
-            status_bar.add_left_item(lsp_tool, window, cx);
+            status_bar.add_left_item(lsp_button, window, cx);
             status_bar.add_left_item(diagnostic_summary, window, cx);
             status_bar.add_left_item(activity_indicator, window, cx);
             status_bar.add_right_item(edit_prediction_button, window, cx);
@@ -988,7 +989,7 @@ fn initialize_pane(
             toolbar.add_item(diagnostic_editor_controls, window, cx);
             let project_search_bar = cx.new(|_| ProjectSearchBar::new());
             toolbar.add_item(project_search_bar, window, cx);
-            let lsp_log_item = cx.new(|_| language_tools::LspLogToolbarItemView::new());
+            let lsp_log_item = cx.new(|_| LspLogToolbarItemView::new());
             toolbar.add_item(lsp_log_item, window, cx);
             let dap_log_item = cx.new(|_| debugger_tools::DapLogToolbarItemView::new());
             toolbar.add_item(dap_log_item, window, cx);

From 213ee32b94ceeb2662f498e8e47181511bb07fb3 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Thu, 28 Aug 2025 10:47:19 -0300
Subject: [PATCH 430/823] docs: Make unsupported features more prominent in
 external agents (#37090)

Use the notes component to better highlight that in the docs UI.

Release Notes:

- N/A
---
 docs/src/ai/agent-panel.md     | 2 +-
 docs/src/ai/external-agents.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index 13d92278a4..ff5fdf84ce 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -18,7 +18,7 @@ If you need extra room to type, you can expand the message editor with {#kb agen
 
 You should start to see the responses stream in with indications of [which tools](./tools.md) the model is using to fulfill your prompt.
 
-> Note that, at the moment, not all features outlined below work for external agents, like [Gemini CLI](./external-agents.md#gemini-cli)—features like _checkpoints_, _token usage display_, and _model selection_ may be supported in the future.
+> Note that, at the moment, not all features outlined below work for external agents, like [Gemini CLI](./external-agents.md#gemini-cli)—features like _restoring threads from history_, _checkpoints_, _token usage display_, _model selection_, and others may be supported in the future.
 
 ### Creating New Threads
 
diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index b13cc0fe4b..3d263afdb0 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -54,8 +54,8 @@ Similar to Zed's first-party agent, you can use Gemini CLI to do anything that y
 
 You can @-mention files, recent threads, symbols, or fetch the web.
 
-Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, checkpointing, and using the agent in SSH projects.
-We hope to add these features in the near future.
+> Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, checkpointing, and using the agent in SSH projects.
+> We hope to add these features in the near future.
 
 ## Add Custom Agents {#add-custom-agents}
 

From 24ee98b3e13a164e0c9403963787951dc069f661 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Thu, 28 Aug 2025 19:42:59 +0530
Subject: [PATCH 431/823] agent2: Fix model deduplication to use provider ID
 and model ID (#37088)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #37043

Previously claude sonnet 4 was missing from copilot as it was colliding
with zed's claude-sonnet-4 model id. Now we do deduplication based upon
model and provider id both.

| Before | After |
|--------|--------|
| <img width="784" height="950" alt="CleanShot 2025-08-28 at 18 31
28@2x"
src="https://github.com/user-attachments/assets/d49d5a17-7271-417d-bb5e-bc380071e810"
/> | <img width="720" height="876" alt="CleanShot 2025-08-28 at 18 31
42@2x"
src="https://github.com/user-attachments/assets/a5100c05-994e-4e19-ab20-34c0258b977c"
/> |

Release Notes:

- Fixed an issue where models with the same ID from different providers
(such as Claude Sonnet 4 from both Zed and Copilot) were incorrectly
deduplicated in the model selector—now all variants are shown.
---
 crates/agent2/src/agent.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 51e1fc6316..ea80df8fb5 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -93,7 +93,7 @@ impl LanguageModels {
         let mut recommended = Vec::new();
         for provider in &providers {
             for model in provider.recommended_models(cx) {
-                recommended_models.insert(model.id());
+                recommended_models.insert((model.provider_id(), model.id()));
                 recommended.push(Self::map_language_model_to_info(&model, provider));
             }
         }
@@ -110,7 +110,7 @@ impl LanguageModels {
             for model in provider.provided_models(cx) {
                 let model_info = Self::map_language_model_to_info(&model, &provider);
                 let model_id = model_info.id.clone();
-                if !recommended_models.contains(&model.id()) {
+                if !recommended_models.contains(&(model.provider_id(), model.id())) {
                     provider_models.push(model_info);
                 }
                 models.insert(model_id, model);

From 835e5ba662e5bade1a4bd91a45e64faa7f64aff4 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 28 Aug 2025 16:40:43 +0200
Subject: [PATCH 432/823] Inject venv environment via the toolchain (#36576)

Instead of manually constructing the venv we now ask the python
toolchain for the relevant information, unifying the approach of vent
inspection

Fixes https://github.com/zed-industries/zed/issues/27350

Release Notes:

- Improved the detection of python virtual environments for terminals
and tasks in remote projects.
---
 crates/agent2/src/tools/terminal_tool.rs      |   8 +-
 crates/assistant_tools/src/terminal_tool.rs   |   9 +-
 crates/debugger_ui/src/session/running.rs     |  15 +-
 crates/language/src/toolchain.rs              |  30 +-
 crates/languages/src/python.rs                |  44 +-
 crates/project/src/debugger/dap_store.rs      |   1 +
 crates/project/src/project_tests.rs           |   3 +
 crates/project/src/terminals.rs               | 831 ++++++++----------
 crates/proto/build.rs                         |   1 +
 crates/remote/src/remote_client.rs            |  12 +-
 crates/remote/src/transport/ssh.rs            |  13 +-
 crates/task/src/shell_builder.rs              |  39 +-
 crates/terminal/src/terminal.rs               |  63 +-
 crates/terminal_view/src/persistence.rs       |  12 +-
 crates/terminal_view/src/terminal_panel.rs    | 253 ++++--
 .../src/terminal_path_like_target.rs          |   6 +-
 crates/terminal_view/src/terminal_view.rs     |  29 +-
 crates/util/src/util.rs                       |  12 +
 crates/workspace/src/persistence.rs           |  16 +-
 19 files changed, 725 insertions(+), 672 deletions(-)

diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index f41b909d0b..2270a7c32f 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -2,7 +2,7 @@ use agent_client_protocol as acp;
 use anyhow::Result;
 use futures::{FutureExt as _, future::Shared};
 use gpui::{App, AppContext, Entity, SharedString, Task};
-use project::{Project, terminals::TerminalKind};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::{
@@ -144,14 +144,14 @@ impl AgentTool for TerminalTool {
                 let terminal = self
                     .project
                     .update(cx, |project, cx| {
-                        project.create_terminal(
-                            TerminalKind::Task(task::SpawnInTerminal {
+                        project.create_terminal_task(
+                            task::SpawnInTerminal {
                                 command: Some(program),
                                 args,
                                 cwd: working_dir.clone(),
                                 env,
                                 ..Default::default()
-                            }),
+                            },
                             cx,
                         )
                     })?
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index b28e55e78a..774f324265 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -15,7 +15,7 @@ use language::LineEnding;
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
 use portable_pty::{CommandBuilder, PtySize, native_pty_system};
-use project::{Project, terminals::TerminalKind};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -213,17 +213,16 @@ impl Tool for TerminalTool {
             async move |cx| {
                 let program = program.await;
                 let env = env.await;
-
                 project
                     .update(cx, |project, cx| {
-                        project.create_terminal(
-                            TerminalKind::Task(task::SpawnInTerminal {
+                        project.create_terminal_task(
+                            task::SpawnInTerminal {
                                 command: Some(program),
                                 args,
                                 cwd,
                                 env,
                                 ..Default::default()
-                            }),
+                            },
                             cx,
                         )
                     })?
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 25146dc7e4..46e5f35aec 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -36,7 +36,6 @@ use module_list::ModuleList;
 use project::{
     DebugScenarioContext, Project, WorktreeId,
     debugger::session::{self, Session, SessionEvent, SessionStateEvent, ThreadId, ThreadStatus},
-    terminals::TerminalKind,
 };
 use rpc::proto::ViewId;
 use serde_json::Value;
@@ -1040,12 +1039,11 @@ impl RunningState {
                 };
                 let terminal = project
                     .update(cx, |project, cx| {
-                        project.create_terminal(
-                            TerminalKind::Task(task_with_shell.clone()),
+                        project.create_terminal_task(
+                            task_with_shell.clone(),
                             cx,
                         )
-                    })?
-                    .await?;
+                    })?.await?;
 
                 let terminal_view = cx.new_window_entity(|window, cx| {
                     TerminalView::new(
@@ -1189,7 +1187,7 @@ impl RunningState {
             .filter(|title| !title.is_empty())
             .or_else(|| command.clone())
             .unwrap_or_else(|| "Debug terminal".to_string());
-        let kind = TerminalKind::Task(task::SpawnInTerminal {
+        let kind = task::SpawnInTerminal {
             id: task::TaskId("debug".to_string()),
             full_label: title.clone(),
             label: title.clone(),
@@ -1207,12 +1205,13 @@ impl RunningState {
             show_summary: false,
             show_command: false,
             show_rerun: false,
-        });
+        };
 
         let workspace = self.workspace.clone();
         let weak_project = project.downgrade();
 
-        let terminal_task = project.update(cx, |project, cx| project.create_terminal(kind, cx));
+        let terminal_task =
+            project.update(cx, |project, cx| project.create_terminal_task(kind, cx));
         let terminal_task = cx.spawn_in(window, async move |_, cx| {
             let terminal = terminal_task.await?;
 
diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
index 66879e56da..2a8dfd5841 100644
--- a/crates/language/src/toolchain.rs
+++ b/crates/language/src/toolchain.rs
@@ -11,13 +11,14 @@ use std::{
 
 use async_trait::async_trait;
 use collections::HashMap;
+use fs::Fs;
 use gpui::{AsyncApp, SharedString};
 use settings::WorktreeId;
 
 use crate::{LanguageName, ManifestName};
 
 /// Represents a single toolchain.
-#[derive(Clone, Debug, Eq)]
+#[derive(Clone, Eq, Debug)]
 pub struct Toolchain {
     /// User-facing label
     pub name: SharedString,
@@ -29,21 +30,29 @@ pub struct Toolchain {
 
 impl std::hash::Hash for Toolchain {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.name.hash(state);
-        self.path.hash(state);
-        self.language_name.hash(state);
+        let Self {
+            name,
+            path,
+            language_name,
+            as_json: _,
+        } = self;
+        name.hash(state);
+        path.hash(state);
+        language_name.hash(state);
     }
 }
 
 impl PartialEq for Toolchain {
     fn eq(&self, other: &Self) -> bool {
+        let Self {
+            name,
+            path,
+            language_name,
+            as_json: _,
+        } = self;
         // Do not use as_json for comparisons; it shouldn't impact equality, as it's not user-surfaced.
         // Thus, there could be multiple entries that look the same in the UI.
-        (&self.name, &self.path, &self.language_name).eq(&(
-            &other.name,
-            &other.path,
-            &other.language_name,
-        ))
+        (name, path, language_name).eq(&(&other.name, &other.path, &other.language_name))
     }
 }
 
@@ -59,6 +68,7 @@ pub trait ToolchainLister: Send + Sync {
     fn term(&self) -> SharedString;
     /// Returns the name of the manifest file for this toolchain.
     fn manifest_name(&self) -> ManifestName;
+    async fn activation_script(&self, toolchain: &Toolchain, fs: &dyn Fs) -> Option<String>;
 }
 
 #[async_trait(?Send)]
@@ -82,7 +92,7 @@ pub trait LocalLanguageToolchainStore: Send + Sync + 'static {
     ) -> Option<Toolchain>;
 }
 
-#[async_trait(?Send )]
+#[async_trait(?Send)]
 impl<T: LocalLanguageToolchainStore> LanguageToolchainStore for T {
     async fn active_toolchain(
         self: Arc<Self>,
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 0f78d5c5df..37d38de9da 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -2,6 +2,7 @@ use anyhow::{Context as _, ensure};
 use anyhow::{Result, anyhow};
 use async_trait::async_trait;
 use collections::HashMap;
+use futures::AsyncBufReadExt;
 use gpui::{App, Task};
 use gpui::{AsyncApp, SharedString};
 use language::Toolchain;
@@ -30,8 +31,6 @@ use std::{
     borrow::Cow,
     ffi::OsString,
     fmt::Write,
-    fs,
-    io::{self, BufRead},
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -741,14 +740,16 @@ fn env_priority(kind: Option<PythonEnvironmentKind>) -> usize {
 /// Return the name of environment declared in <worktree-root/.venv.
 ///
 /// https://virtualfish.readthedocs.io/en/latest/plugins.html#auto-activation-auto-activation
-fn get_worktree_venv_declaration(worktree_root: &Path) -> Option<String> {
-    fs::File::open(worktree_root.join(".venv"))
-        .and_then(|file| {
-            let mut venv_name = String::new();
-            io::BufReader::new(file).read_line(&mut venv_name)?;
-            Ok(venv_name.trim().to_string())
-        })
-        .ok()
+async fn get_worktree_venv_declaration(worktree_root: &Path) -> Option<String> {
+    let file = async_fs::File::open(worktree_root.join(".venv"))
+        .await
+        .ok()?;
+    let mut venv_name = String::new();
+    smol::io::BufReader::new(file)
+        .read_line(&mut venv_name)
+        .await
+        .ok()?;
+    Some(venv_name.trim().to_string())
 }
 
 #[async_trait]
@@ -793,7 +794,7 @@ impl ToolchainLister for PythonToolchainProvider {
             .map_or(Vec::new(), |mut guard| std::mem::take(&mut guard));
 
         let wr = worktree_root;
-        let wr_venv = get_worktree_venv_declaration(&wr);
+        let wr_venv = get_worktree_venv_declaration(&wr).await;
         // Sort detected environments by:
         //     environment name matching activation file (<workdir>/.venv)
         //     environment project dir matching worktree_root
@@ -858,7 +859,7 @@ impl ToolchainLister for PythonToolchainProvider {
             .into_iter()
             .filter_map(|toolchain| {
                 let mut name = String::from("Python");
-                if let Some(ref version) = toolchain.version {
+                if let Some(version) = &toolchain.version {
                     _ = write!(name, " {version}");
                 }
 
@@ -879,7 +880,7 @@ impl ToolchainLister for PythonToolchainProvider {
                     name: name.into(),
                     path: toolchain.executable.as_ref()?.to_str()?.to_owned().into(),
                     language_name: LanguageName::new("Python"),
-                    as_json: serde_json::to_value(toolchain).ok()?,
+                    as_json: serde_json::to_value(toolchain.clone()).ok()?,
                 })
             })
             .collect();
@@ -893,6 +894,23 @@ impl ToolchainLister for PythonToolchainProvider {
     fn term(&self) -> SharedString {
         self.term.clone()
     }
+    async fn activation_script(&self, toolchain: &Toolchain, fs: &dyn Fs) -> Option<String> {
+        let toolchain = serde_json::from_value::<pet_core::python_environment::PythonEnvironment>(
+            toolchain.as_json.clone(),
+        )
+        .ok()?;
+        let mut activation_script = None;
+        if let Some(prefix) = &toolchain.prefix {
+            #[cfg(not(target_os = "windows"))]
+            let path = prefix.join(BINARY_DIR).join("activate");
+            #[cfg(target_os = "windows")]
+            let path = prefix.join(BINARY_DIR).join("activate.ps1");
+            if fs.is_file(&path).await {
+                activation_script = Some(format!(". {}", path.display()));
+            }
+        }
+        activation_script
+    }
 }
 
 pub struct EnvironmentApi<'a> {
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index d8c6d3acc1..859574c82a 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -276,6 +276,7 @@ impl DapStore {
                             &binary.arguments,
                             &binary.envs,
                             binary.cwd.map(|path| path.display().to_string()),
+                            None,
                             port_forwarding,
                         )
                     })??;
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index a8f911883d..c814d6207e 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -9222,6 +9222,9 @@ fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
         fn manifest_name(&self) -> ManifestName {
             SharedString::new_static("pyproject.toml").into()
         }
+        async fn activation_script(&self, _: &Toolchain, _: &dyn Fs) -> Option<String> {
+            None
+        }
     }
     Arc::new(
         Language::new(
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 7e1be67e21..aad5ce9411 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -1,44 +1,28 @@
-use crate::{Project, ProjectPath};
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use collections::HashMap;
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity};
+use itertools::Itertools;
 use language::LanguageName;
 use remote::RemoteClient;
 use settings::{Settings, SettingsLocation};
 use smol::channel::bounded;
 use std::{
-    env::{self},
+    borrow::Cow,
     path::{Path, PathBuf},
     sync::Arc,
 };
 use task::{Shell, ShellBuilder, SpawnInTerminal};
 use terminal::{
-    TaskState, TaskStatus, Terminal, TerminalBuilder,
-    terminal_settings::{self, ActivateScript, TerminalSettings, VenvSettings},
+    TaskState, TaskStatus, Terminal, TerminalBuilder, terminal_settings::TerminalSettings,
 };
-use util::{ResultExt, paths::RemotePathBuf};
+use util::{get_default_system_shell, get_system_shell, maybe};
 
-/// The directory inside a Python virtual environment that contains executables
-const PYTHON_VENV_BIN_DIR: &str = if cfg!(target_os = "windows") {
-    "Scripts"
-} else {
-    "bin"
-};
+use crate::{Project, ProjectPath};
 
 pub struct Terminals {
     pub(crate) local_handles: Vec<WeakEntity<terminal::Terminal>>,
 }
 
-/// Terminals are opened either for the users shell, or to run a task.
-
-#[derive(Debug)]
-pub enum TerminalKind {
-    /// Run a shell at the given path (or $HOME if None)
-    Shell(Option<PathBuf>),
-    /// Run a task.
-    Task(SpawnInTerminal),
-}
-
 impl Project {
     pub fn active_project_directory(&self, cx: &App) -> Option<Arc<Path>> {
         self.active_entry()
@@ -58,20 +42,31 @@ impl Project {
         }
     }
 
-    pub fn create_terminal(
+    pub fn create_terminal_task(
         &mut self,
-        kind: TerminalKind,
+        spawn_task: SpawnInTerminal,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Terminal>>> {
-        let path: Option<Arc<Path>> = match &kind {
-            TerminalKind::Shell(path) => path.as_ref().map(|path| Arc::from(path.as_ref())),
-            TerminalKind::Task(spawn_task) => {
-                if let Some(cwd) = &spawn_task.cwd {
-                    Some(Arc::from(cwd.as_ref()))
-                } else {
-                    self.active_project_directory(cx)
-                }
+        let is_via_remote = self.remote_client.is_some();
+        let project_path_context = self
+            .active_entry()
+            .and_then(|entry_id| self.worktree_id_for_entry(entry_id, cx))
+            .or_else(|| self.visible_worktrees(cx).next().map(|wt| wt.read(cx).id()))
+            .map(|worktree_id| ProjectPath {
+                worktree_id,
+                path: Arc::from(Path::new("")),
+            });
+
+        let path: Option<Arc<Path>> = if let Some(cwd) = &spawn_task.cwd {
+            if is_via_remote {
+                Some(Arc::from(cwd.as_ref()))
+            } else {
+                let cwd = cwd.to_string_lossy();
+                let tilde_substituted = shellexpand::tilde(&cwd);
+                Some(Arc::from(Path::new(tilde_substituted.as_ref())))
             }
+        } else {
+            self.active_project_directory(cx)
         };
 
         let mut settings_location = None;
@@ -83,24 +78,329 @@ impl Project {
                 path,
             });
         }
-        let venv = TerminalSettings::get(settings_location, cx)
-            .detect_venv
-            .clone();
+        let settings = TerminalSettings::get(settings_location, cx).clone();
+        let detect_venv = settings.detect_venv.as_option().is_some();
 
+        let (completion_tx, completion_rx) = bounded(1);
+
+        // Start with the environment that we might have inherited from the Zed CLI.
+        let mut env = self
+            .environment
+            .read(cx)
+            .get_cli_environment()
+            .unwrap_or_default();
+        // Then extend it with the explicit env variables from the settings, so they take
+        // precedence.
+        env.extend(settings.env);
+
+        let local_path = if is_via_remote { None } else { path.clone() };
+        let task_state = Some(TaskState {
+            id: spawn_task.id,
+            full_label: spawn_task.full_label,
+            label: spawn_task.label,
+            command_label: spawn_task.command_label,
+            hide: spawn_task.hide,
+            status: TaskStatus::Running,
+            show_summary: spawn_task.show_summary,
+            show_command: spawn_task.show_command,
+            show_rerun: spawn_task.show_rerun,
+            completion_rx,
+        });
+        let remote_client = self.remote_client.clone();
+        let shell = match &remote_client {
+            Some(remote_client) => remote_client
+                .read(cx)
+                .shell()
+                .unwrap_or_else(get_default_system_shell),
+            None => match &settings.shell {
+                Shell::Program(program) => program.clone(),
+                Shell::WithArguments {
+                    program,
+                    args: _,
+                    title_override: _,
+                } => program.clone(),
+                Shell::System => get_system_shell(),
+            },
+        };
+
+        let toolchain = project_path_context
+            .filter(|_| detect_venv)
+            .map(|p| self.active_toolchain(p, LanguageName::new("Python"), cx));
+        let lang_registry = self.languages.clone();
+        let fs = self.fs.clone();
         cx.spawn(async move |project, cx| {
-            let python_venv_directory = if let Some(path) = path {
-                project
-                    .update(cx, |this, cx| this.python_venv_directory(path, venv, cx))?
+            let activation_script = maybe!(async {
+                let toolchain = toolchain?.await?;
+                lang_registry
+                    .language_for_name(&toolchain.language_name.0)
                     .await
-            } else {
-                None
-            };
-            project.update(cx, |project, cx| {
-                project.create_terminal_with_venv(kind, python_venv_directory, cx)
+                    .ok()?
+                    .toolchain_lister()?
+                    .activation_script(&toolchain, fs.as_ref())
+                    .await
+            })
+            .await;
+
+            project.update(cx, move |this, cx| {
+                let shell = {
+                    env.extend(spawn_task.env);
+                    match remote_client {
+                        Some(remote_client) => create_remote_shell(
+                            spawn_task
+                                .command
+                                .as_ref()
+                                .map(|command| (command, &spawn_task.args)),
+                            &mut env,
+                            path,
+                            remote_client,
+                            activation_script.clone(),
+                            cx,
+                        )?,
+                        None => match activation_script.clone() {
+                            Some(activation_script) => {
+                                let to_run = if let Some(command) = spawn_task.command {
+                                    let command: Option<Cow<str>> = shlex::try_quote(&command).ok();
+                                    let args = spawn_task
+                                        .args
+                                        .iter()
+                                        .filter_map(|arg| shlex::try_quote(arg).ok());
+                                    command.into_iter().chain(args).join(" ")
+                                } else {
+                                    format!("exec {shell} -l")
+                                };
+                                Shell::WithArguments {
+                                    program: get_default_system_shell(),
+                                    args: vec![
+                                        "-c".to_owned(),
+                                        format!("{activation_script}; {to_run}",),
+                                    ],
+                                    title_override: None,
+                                }
+                            }
+                            None => {
+                                if let Some(program) = spawn_task.command {
+                                    Shell::WithArguments {
+                                        program,
+                                        args: spawn_task.args,
+                                        title_override: None,
+                                    }
+                                } else {
+                                    Shell::System
+                                }
+                            }
+                        },
+                    }
+                };
+                TerminalBuilder::new(
+                    local_path.map(|path| path.to_path_buf()),
+                    task_state,
+                    shell,
+                    env,
+                    settings.cursor_shape.unwrap_or_default(),
+                    settings.alternate_scroll,
+                    settings.max_scroll_history_lines,
+                    is_via_remote,
+                    cx.entity_id().as_u64(),
+                    Some(completion_tx),
+                    cx,
+                    activation_script,
+                )
+                .map(|builder| {
+                    let terminal_handle = cx.new(|cx| builder.subscribe(cx));
+
+                    this.terminals
+                        .local_handles
+                        .push(terminal_handle.downgrade());
+
+                    let id = terminal_handle.entity_id();
+                    cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
+                        let handles = &mut project.terminals.local_handles;
+
+                        if let Some(index) = handles
+                            .iter()
+                            .position(|terminal| terminal.entity_id() == id)
+                        {
+                            handles.remove(index);
+                            cx.notify();
+                        }
+                    })
+                    .detach();
+
+                    terminal_handle
+                })
             })?
         })
     }
 
+    pub fn create_terminal_shell(
+        &mut self,
+        cwd: Option<PathBuf>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Entity<Terminal>>> {
+        let project_path_context = self
+            .active_entry()
+            .and_then(|entry_id| self.worktree_id_for_entry(entry_id, cx))
+            .or_else(|| self.visible_worktrees(cx).next().map(|wt| wt.read(cx).id()))
+            .map(|worktree_id| ProjectPath {
+                worktree_id,
+                path: Arc::from(Path::new("")),
+            });
+        let path = cwd.map(|p| Arc::from(&*p));
+        let is_via_remote = self.remote_client.is_some();
+
+        let mut settings_location = None;
+        if let Some(path) = path.as_ref()
+            && let Some((worktree, _)) = self.find_worktree(path, cx)
+        {
+            settings_location = Some(SettingsLocation {
+                worktree_id: worktree.read(cx).id(),
+                path,
+            });
+        }
+        let settings = TerminalSettings::get(settings_location, cx).clone();
+        let detect_venv = settings.detect_venv.as_option().is_some();
+
+        // Start with the environment that we might have inherited from the Zed CLI.
+        let mut env = self
+            .environment
+            .read(cx)
+            .get_cli_environment()
+            .unwrap_or_default();
+        // Then extend it with the explicit env variables from the settings, so they take
+        // precedence.
+        env.extend(settings.env);
+
+        let local_path = if is_via_remote { None } else { path.clone() };
+
+        let toolchain = project_path_context
+            .filter(|_| detect_venv)
+            .map(|p| self.active_toolchain(p, LanguageName::new("Python"), cx));
+        let remote_client = self.remote_client.clone();
+        let shell = match &remote_client {
+            Some(remote_client) => remote_client
+                .read(cx)
+                .shell()
+                .unwrap_or_else(get_default_system_shell),
+            None => match &settings.shell {
+                Shell::Program(program) => program.clone(),
+                Shell::WithArguments {
+                    program,
+                    args: _,
+                    title_override: _,
+                } => program.clone(),
+                Shell::System => get_system_shell(),
+            },
+        };
+
+        let lang_registry = self.languages.clone();
+        let fs = self.fs.clone();
+        cx.spawn(async move |project, cx| {
+            let activation_script = maybe!(async {
+                let toolchain = toolchain?.await?;
+                let language = lang_registry
+                    .language_for_name(&toolchain.language_name.0)
+                    .await
+                    .ok();
+                let lister = language?.toolchain_lister();
+                lister?.activation_script(&toolchain, fs.as_ref()).await
+            })
+            .await;
+            project.update(cx, move |this, cx| {
+                let shell = {
+                    match remote_client {
+                        Some(remote_client) => create_remote_shell(
+                            None,
+                            &mut env,
+                            path,
+                            remote_client,
+                            activation_script.clone(),
+                            cx,
+                        )?,
+                        None => match activation_script.clone() {
+                            Some(activation_script) => Shell::WithArguments {
+                                program: get_default_system_shell(),
+                                args: vec![
+                                    "-c".to_owned(),
+                                    format!("{activation_script}; exec {shell} -l",),
+                                ],
+                                title_override: Some(shell.into()),
+                            },
+                            None => settings.shell,
+                        },
+                    }
+                };
+                TerminalBuilder::new(
+                    local_path.map(|path| path.to_path_buf()),
+                    None,
+                    shell,
+                    env,
+                    settings.cursor_shape.unwrap_or_default(),
+                    settings.alternate_scroll,
+                    settings.max_scroll_history_lines,
+                    is_via_remote,
+                    cx.entity_id().as_u64(),
+                    None,
+                    cx,
+                    activation_script,
+                )
+                .map(|builder| {
+                    let terminal_handle = cx.new(|cx| builder.subscribe(cx));
+
+                    this.terminals
+                        .local_handles
+                        .push(terminal_handle.downgrade());
+
+                    let id = terminal_handle.entity_id();
+                    cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
+                        let handles = &mut project.terminals.local_handles;
+
+                        if let Some(index) = handles
+                            .iter()
+                            .position(|terminal| terminal.entity_id() == id)
+                        {
+                            handles.remove(index);
+                            cx.notify();
+                        }
+                    })
+                    .detach();
+
+                    terminal_handle
+                })
+            })?
+        })
+    }
+
+    pub fn clone_terminal(
+        &mut self,
+        terminal: &Entity<Terminal>,
+        cx: &mut Context<'_, Project>,
+        cwd: impl FnOnce() -> Option<PathBuf>,
+    ) -> Result<Entity<Terminal>> {
+        terminal.read(cx).clone_builder(cx, cwd).map(|builder| {
+            let terminal_handle = cx.new(|cx| builder.subscribe(cx));
+
+            self.terminals
+                .local_handles
+                .push(terminal_handle.downgrade());
+
+            let id = terminal_handle.entity_id();
+            cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
+                let handles = &mut project.terminals.local_handles;
+
+                if let Some(index) = handles
+                    .iter()
+                    .position(|terminal| terminal.entity_id() == id)
+                {
+                    handles.remove(index);
+                    cx.notify();
+                }
+            })
+            .detach();
+
+            terminal_handle
+        })
+    }
+
     pub fn terminal_settings<'a>(
         &'a self,
         path: &'a Option<PathBuf>,
@@ -137,10 +437,15 @@ impl Project {
 
         match remote_client {
             Some(remote_client) => {
-                let command_template =
-                    remote_client
-                        .read(cx)
-                        .build_command(Some(command), &args, &env, None, None)?;
+                let command_template = remote_client.read(cx).build_command(
+                    Some(command),
+                    &args,
+                    &env,
+                    None,
+                    // todo
+                    None,
+                    None,
+                )?;
                 let mut command = std::process::Command::new(command_template.program);
                 command.args(command_template.args);
                 command.envs(command_template.env);
@@ -158,382 +463,6 @@ impl Project {
         }
     }
 
-    pub fn create_terminal_with_venv(
-        &mut self,
-        kind: TerminalKind,
-        python_venv_directory: Option<PathBuf>,
-        cx: &mut Context<Self>,
-    ) -> Result<Entity<Terminal>> {
-        let is_via_remote = self.remote_client.is_some();
-
-        let path: Option<Arc<Path>> = match &kind {
-            TerminalKind::Shell(path) => path.as_ref().map(|path| Arc::from(path.as_ref())),
-            TerminalKind::Task(spawn_task) => {
-                if let Some(cwd) = &spawn_task.cwd {
-                    if is_via_remote {
-                        Some(Arc::from(cwd.as_ref()))
-                    } else {
-                        let cwd = cwd.to_string_lossy();
-                        let tilde_substituted = shellexpand::tilde(&cwd);
-                        Some(Arc::from(Path::new(tilde_substituted.as_ref())))
-                    }
-                } else {
-                    self.active_project_directory(cx)
-                }
-            }
-        };
-
-        let mut settings_location = None;
-        if let Some(path) = path.as_ref()
-            && let Some((worktree, _)) = self.find_worktree(path, cx)
-        {
-            settings_location = Some(SettingsLocation {
-                worktree_id: worktree.read(cx).id(),
-                path,
-            });
-        }
-        let settings = TerminalSettings::get(settings_location, cx).clone();
-
-        let (completion_tx, completion_rx) = bounded(1);
-
-        // Start with the environment that we might have inherited from the Zed CLI.
-        let mut env = self
-            .environment
-            .read(cx)
-            .get_cli_environment()
-            .unwrap_or_default();
-        // Then extend it with the explicit env variables from the settings, so they take
-        // precedence.
-        env.extend(settings.env);
-
-        let local_path = if is_via_remote { None } else { path.clone() };
-
-        let mut python_venv_activate_command = Task::ready(None);
-
-        let remote_client = self.remote_client.clone();
-        let spawn_task;
-        let shell;
-        match kind {
-            TerminalKind::Shell(_) => {
-                if let Some(python_venv_directory) = &python_venv_directory {
-                    python_venv_activate_command = self.python_activate_command(
-                        python_venv_directory,
-                        &settings.detect_venv,
-                        &settings.shell,
-                        cx,
-                    );
-                }
-
-                spawn_task = None;
-                shell = match remote_client {
-                    Some(remote_client) => {
-                        create_remote_shell(None, &mut env, path, remote_client, cx)?
-                    }
-                    None => settings.shell,
-                };
-            }
-            TerminalKind::Task(task) => {
-                env.extend(task.env);
-
-                if let Some(venv_path) = &python_venv_directory {
-                    env.insert(
-                        "VIRTUAL_ENV".to_string(),
-                        venv_path.to_string_lossy().to_string(),
-                    );
-                }
-
-                spawn_task = Some(TaskState {
-                    id: task.id,
-                    full_label: task.full_label,
-                    label: task.label,
-                    command_label: task.command_label,
-                    hide: task.hide,
-                    status: TaskStatus::Running,
-                    show_summary: task.show_summary,
-                    show_command: task.show_command,
-                    show_rerun: task.show_rerun,
-                    completion_rx,
-                });
-                shell = match remote_client {
-                    Some(remote_client) => {
-                        let path_style = remote_client.read(cx).path_style();
-                        if let Some(venv_directory) = &python_venv_directory
-                            && let Ok(str) =
-                                shlex::try_quote(venv_directory.to_string_lossy().as_ref())
-                        {
-                            let path =
-                                RemotePathBuf::new(PathBuf::from(str.to_string()), path_style)
-                                    .to_string();
-                            env.insert("PATH".into(), format!("{}:$PATH ", path));
-                        }
-
-                        create_remote_shell(
-                            task.command.as_ref().map(|command| (command, &task.args)),
-                            &mut env,
-                            path,
-                            remote_client,
-                            cx,
-                        )?
-                    }
-                    None => {
-                        if let Some(venv_path) = &python_venv_directory {
-                            add_environment_path(&mut env, &venv_path.join(PYTHON_VENV_BIN_DIR))
-                                .log_err();
-                        }
-
-                        if let Some(program) = task.command {
-                            Shell::WithArguments {
-                                program,
-                                args: task.args,
-                                title_override: None,
-                            }
-                        } else {
-                            Shell::System
-                        }
-                    }
-                };
-            }
-        };
-        TerminalBuilder::new(
-            local_path.map(|path| path.to_path_buf()),
-            python_venv_directory,
-            spawn_task,
-            shell,
-            env,
-            settings.cursor_shape.unwrap_or_default(),
-            settings.alternate_scroll,
-            settings.max_scroll_history_lines,
-            is_via_remote,
-            cx.entity_id().as_u64(),
-            completion_tx,
-            cx,
-        )
-        .map(|builder| {
-            let terminal_handle = cx.new(|cx| builder.subscribe(cx));
-
-            self.terminals
-                .local_handles
-                .push(terminal_handle.downgrade());
-
-            let id = terminal_handle.entity_id();
-            cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
-                let handles = &mut project.terminals.local_handles;
-
-                if let Some(index) = handles
-                    .iter()
-                    .position(|terminal| terminal.entity_id() == id)
-                {
-                    handles.remove(index);
-                    cx.notify();
-                }
-            })
-            .detach();
-
-            self.activate_python_virtual_environment(
-                python_venv_activate_command,
-                &terminal_handle,
-                cx,
-            );
-
-            terminal_handle
-        })
-    }
-
-    fn python_venv_directory(
-        &self,
-        abs_path: Arc<Path>,
-        venv_settings: VenvSettings,
-        cx: &Context<Project>,
-    ) -> Task<Option<PathBuf>> {
-        cx.spawn(async move |this, cx| {
-            if let Some((worktree, relative_path)) = this
-                .update(cx, |this, cx| this.find_worktree(&abs_path, cx))
-                .ok()?
-            {
-                let toolchain = this
-                    .update(cx, |this, cx| {
-                        this.active_toolchain(
-                            ProjectPath {
-                                worktree_id: worktree.read(cx).id(),
-                                path: relative_path.into(),
-                            },
-                            LanguageName::new("Python"),
-                            cx,
-                        )
-                    })
-                    .ok()?
-                    .await;
-
-                if let Some(toolchain) = toolchain {
-                    let toolchain_path = Path::new(toolchain.path.as_ref());
-                    return Some(toolchain_path.parent()?.parent()?.to_path_buf());
-                }
-            }
-            let venv_settings = venv_settings.as_option()?;
-            this.update(cx, move |this, cx| {
-                if let Some(path) = this.find_venv_in_worktree(&abs_path, &venv_settings, cx) {
-                    return Some(path);
-                }
-                this.find_venv_on_filesystem(&abs_path, &venv_settings, cx)
-            })
-            .ok()
-            .flatten()
-        })
-    }
-
-    fn find_venv_in_worktree(
-        &self,
-        abs_path: &Path,
-        venv_settings: &terminal_settings::VenvSettingsContent,
-        cx: &App,
-    ) -> Option<PathBuf> {
-        venv_settings
-            .directories
-            .iter()
-            .map(|name| abs_path.join(name))
-            .find(|venv_path| {
-                let bin_path = venv_path.join(PYTHON_VENV_BIN_DIR);
-                self.find_worktree(&bin_path, cx)
-                    .and_then(|(worktree, relative_path)| {
-                        worktree.read(cx).entry_for_path(&relative_path)
-                    })
-                    .is_some_and(|entry| entry.is_dir())
-            })
-    }
-
-    fn find_venv_on_filesystem(
-        &self,
-        abs_path: &Path,
-        venv_settings: &terminal_settings::VenvSettingsContent,
-        cx: &App,
-    ) -> Option<PathBuf> {
-        let (worktree, _) = self.find_worktree(abs_path, cx)?;
-        let fs = worktree.read(cx).as_local()?.fs();
-        venv_settings
-            .directories
-            .iter()
-            .map(|name| abs_path.join(name))
-            .find(|venv_path| {
-                let bin_path = venv_path.join(PYTHON_VENV_BIN_DIR);
-                // One-time synchronous check is acceptable for terminal/task initialization
-                smol::block_on(fs.metadata(&bin_path))
-                    .ok()
-                    .flatten()
-                    .is_some_and(|meta| meta.is_dir)
-            })
-    }
-
-    fn activate_script_kind(shell: Option<&str>) -> ActivateScript {
-        let shell_env = std::env::var("SHELL").ok();
-        let shell_path = shell.or_else(|| shell_env.as_deref());
-        let shell = std::path::Path::new(shell_path.unwrap_or(""))
-            .file_name()
-            .and_then(|name| name.to_str())
-            .unwrap_or("");
-        match shell {
-            "fish" => ActivateScript::Fish,
-            "tcsh" => ActivateScript::Csh,
-            "nu" => ActivateScript::Nushell,
-            "powershell" | "pwsh" => ActivateScript::PowerShell,
-            _ => ActivateScript::Default,
-        }
-    }
-
-    fn python_activate_command(
-        &self,
-        venv_base_directory: &Path,
-        venv_settings: &VenvSettings,
-        shell: &Shell,
-        cx: &mut App,
-    ) -> Task<Option<String>> {
-        let Some(venv_settings) = venv_settings.as_option() else {
-            return Task::ready(None);
-        };
-        let activate_keyword = match venv_settings.activate_script {
-            terminal_settings::ActivateScript::Default => match std::env::consts::OS {
-                "windows" => ".",
-                _ => ".",
-            },
-            terminal_settings::ActivateScript::Nushell => "overlay use",
-            terminal_settings::ActivateScript::PowerShell => ".",
-            terminal_settings::ActivateScript::Pyenv => "pyenv",
-            _ => "source",
-        };
-        let script_kind =
-            if venv_settings.activate_script == terminal_settings::ActivateScript::Default {
-                match shell {
-                    Shell::Program(program) => Self::activate_script_kind(Some(program)),
-                    Shell::WithArguments {
-                        program,
-                        args: _,
-                        title_override: _,
-                    } => Self::activate_script_kind(Some(program)),
-                    Shell::System => Self::activate_script_kind(None),
-                }
-            } else {
-                venv_settings.activate_script
-            };
-
-        let activate_script_name = match script_kind {
-            terminal_settings::ActivateScript::Default
-            | terminal_settings::ActivateScript::Pyenv => "activate",
-            terminal_settings::ActivateScript::Csh => "activate.csh",
-            terminal_settings::ActivateScript::Fish => "activate.fish",
-            terminal_settings::ActivateScript::Nushell => "activate.nu",
-            terminal_settings::ActivateScript::PowerShell => "activate.ps1",
-        };
-
-        let line_ending = match std::env::consts::OS {
-            "windows" => "\r",
-            _ => "\n",
-        };
-
-        if venv_settings.venv_name.is_empty() {
-            let path = venv_base_directory
-                .join(PYTHON_VENV_BIN_DIR)
-                .join(activate_script_name)
-                .to_string_lossy()
-                .to_string();
-
-            let is_valid_path = self.resolve_abs_path(path.as_ref(), cx);
-            cx.background_spawn(async move {
-                let quoted = shlex::try_quote(&path).ok()?;
-                if is_valid_path.await.is_some_and(|meta| meta.is_file()) {
-                    Some(format!(
-                        "{} {} ; clear{}",
-                        activate_keyword, quoted, line_ending
-                    ))
-                } else {
-                    None
-                }
-            })
-        } else {
-            Task::ready(Some(format!(
-                "{activate_keyword} {activate_script_name} {name}; clear{line_ending}",
-                name = venv_settings.venv_name
-            )))
-        }
-    }
-
-    fn activate_python_virtual_environment(
-        &self,
-        command: Task<Option<String>>,
-        terminal_handle: &Entity<Terminal>,
-        cx: &mut App,
-    ) {
-        terminal_handle.update(cx, |_, cx| {
-            cx.spawn(async move |this, cx| {
-                if let Some(command) = command.await {
-                    this.update(cx, |this, _| {
-                        this.input(command.into_bytes());
-                    })
-                    .ok();
-                }
-            })
-            .detach()
-        });
-    }
-
     pub fn local_terminal_handles(&self) -> &Vec<WeakEntity<terminal::Terminal>> {
         &self.terminals.local_handles
     }
@@ -544,6 +473,7 @@ fn create_remote_shell(
     env: &mut HashMap<String, String>,
     working_directory: Option<Arc<Path>>,
     remote_client: Entity<RemoteClient>,
+    activation_script: Option<String>,
     cx: &mut App,
 ) -> Result<Shell> {
     // Alacritty sets its terminfo to `alacritty`, this requiring hosts to have it installed
@@ -563,6 +493,7 @@ fn create_remote_shell(
         args.as_slice(),
         env,
         working_directory.map(|path| path.display().to_string()),
+        activation_script,
         None,
     )?;
     *env = command.env;
@@ -576,57 +507,3 @@ fn create_remote_shell(
         title_override: Some(format!("{} — Terminal", host).into()),
     })
 }
-
-fn add_environment_path(env: &mut HashMap<String, String>, new_path: &Path) -> Result<()> {
-    let mut env_paths = vec![new_path.to_path_buf()];
-    if let Some(path) = env.get("PATH").or(env::var("PATH").ok().as_ref()) {
-        let mut paths = std::env::split_paths(&path).collect::<Vec<_>>();
-        env_paths.append(&mut paths);
-    }
-
-    let paths = std::env::join_paths(env_paths).context("failed to create PATH env variable")?;
-    env.insert("PATH".to_string(), paths.to_string_lossy().to_string());
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use collections::HashMap;
-
-    #[test]
-    fn test_add_environment_path_with_existing_path() {
-        let tmp_path = std::path::PathBuf::from("/tmp/new");
-        let mut env = HashMap::default();
-        let old_path = if cfg!(windows) {
-            "/usr/bin;/usr/local/bin"
-        } else {
-            "/usr/bin:/usr/local/bin"
-        };
-        env.insert("PATH".to_string(), old_path.to_string());
-        env.insert("OTHER".to_string(), "aaa".to_string());
-
-        super::add_environment_path(&mut env, &tmp_path).unwrap();
-        if cfg!(windows) {
-            assert_eq!(env.get("PATH").unwrap(), &format!("/tmp/new;{}", old_path));
-        } else {
-            assert_eq!(env.get("PATH").unwrap(), &format!("/tmp/new:{}", old_path));
-        }
-        assert_eq!(env.get("OTHER").unwrap(), "aaa");
-    }
-
-    #[test]
-    fn test_add_environment_path_with_empty_path() {
-        let tmp_path = std::path::PathBuf::from("/tmp/new");
-        let mut env = HashMap::default();
-        env.insert("OTHER".to_string(), "aaa".to_string());
-        let os_path = std::env::var("PATH").unwrap();
-        super::add_environment_path(&mut env, &tmp_path).unwrap();
-        if cfg!(windows) {
-            assert_eq!(env.get("PATH").unwrap(), &format!("/tmp/new;{}", os_path));
-        } else {
-            assert_eq!(env.get("PATH").unwrap(), &format!("/tmp/new:{}", os_path));
-        }
-        assert_eq!(env.get("OTHER").unwrap(), "aaa");
-    }
-}
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 2997e302b6..184d0e53d5 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -1,4 +1,5 @@
 fn main() {
+    println!("cargo:rerun-if-changed=proto");
     let mut build = prost_build::Config::new();
     build
         .type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
index dd529ca874..2b8d9e4a94 100644
--- a/crates/remote/src/remote_client.rs
+++ b/crates/remote/src/remote_client.rs
@@ -757,6 +757,7 @@ impl RemoteClient {
         args: &[String],
         env: &HashMap<String, String>,
         working_dir: Option<String>,
+        activation_script: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate> {
         let Some(connection) = self
@@ -766,7 +767,14 @@ impl RemoteClient {
         else {
             return Err(anyhow!("no connection"));
         };
-        connection.build_command(program, args, env, working_dir, port_forward)
+        connection.build_command(
+            program,
+            args,
+            env,
+            working_dir,
+            activation_script,
+            port_forward,
+        )
     }
 
     pub fn upload_directory(
@@ -998,6 +1006,7 @@ pub(crate) trait RemoteConnection: Send + Sync {
         args: &[String],
         env: &HashMap<String, String>,
         working_dir: Option<String>,
+        activation_script: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate>;
     fn connection_options(&self) -> SshConnectionOptions;
@@ -1364,6 +1373,7 @@ mod fake {
             args: &[String],
             env: &HashMap<String, String>,
             _: Option<String>,
+            _: Option<String>,
             _: Option<(u16, String, u16)>,
         ) -> Result<CommandTemplate> {
             let ssh_program = program.unwrap_or_else(|| "sh".to_string());
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 193b964973..750fc6dc58 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -30,7 +30,10 @@ use std::{
     time::Instant,
 };
 use tempfile::TempDir;
-use util::paths::{PathStyle, RemotePathBuf};
+use util::{
+    get_default_system_shell,
+    paths::{PathStyle, RemotePathBuf},
+};
 
 pub(crate) struct SshRemoteConnection {
     socket: SshSocket,
@@ -113,6 +116,7 @@ impl RemoteConnection for SshRemoteConnection {
         input_args: &[String],
         input_env: &HashMap<String, String>,
         working_dir: Option<String>,
+        activation_script: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate> {
         use std::fmt::Write as _;
@@ -134,6 +138,9 @@ impl RemoteConnection for SshRemoteConnection {
         } else {
             write!(&mut script, "cd; ").unwrap();
         };
+        if let Some(activation_script) = activation_script {
+            write!(&mut script, " {activation_script};").unwrap();
+        }
 
         for (k, v) in input_env.iter() {
             if let Some((k, v)) = shlex::try_quote(k).ok().zip(shlex::try_quote(v).ok()) {
@@ -155,7 +162,8 @@ impl RemoteConnection for SshRemoteConnection {
             write!(&mut script, "exec {shell} -l").unwrap();
         };
 
-        let shell_invocation = format!("{shell} -c {}", shlex::try_quote(&script).unwrap());
+        let sys_shell = get_default_system_shell();
+        let shell_invocation = format!("{sys_shell} -c {}", shlex::try_quote(&script).unwrap());
 
         let mut args = Vec::new();
         args.extend(self.socket.ssh_args());
@@ -167,7 +175,6 @@ impl RemoteConnection for SshRemoteConnection {
 
         args.push("-t".into());
         args.push(shell_invocation);
-
         Ok(CommandTemplate {
             program: "ssh".into(),
             args,
diff --git a/crates/task/src/shell_builder.rs b/crates/task/src/shell_builder.rs
index f907bd1d9f..38a5a970b7 100644
--- a/crates/task/src/shell_builder.rs
+++ b/crates/task/src/shell_builder.rs
@@ -1,3 +1,7 @@
+use std::fmt;
+
+use util::get_system_shell;
+
 use crate::Shell;
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
@@ -11,9 +15,22 @@ pub enum ShellKind {
     Cmd,
 }
 
+impl fmt::Display for ShellKind {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            ShellKind::Posix => write!(f, "sh"),
+            ShellKind::Csh => write!(f, "csh"),
+            ShellKind::Fish => write!(f, "fish"),
+            ShellKind::Powershell => write!(f, "powershell"),
+            ShellKind::Nushell => write!(f, "nu"),
+            ShellKind::Cmd => write!(f, "cmd"),
+        }
+    }
+}
+
 impl ShellKind {
     pub fn system() -> Self {
-        Self::new(&system_shell())
+        Self::new(&get_system_shell())
     }
 
     pub fn new(program: &str) -> Self {
@@ -22,12 +39,12 @@ impl ShellKind {
         #[cfg(not(windows))]
         let (_, program) = program.rsplit_once('/').unwrap_or(("", program));
         if program == "powershell"
-            || program == "powershell.exe"
+            || program.ends_with("powershell.exe")
             || program == "pwsh"
-            || program == "pwsh.exe"
+            || program.ends_with("pwsh.exe")
         {
             ShellKind::Powershell
-        } else if program == "cmd" || program == "cmd.exe" {
+        } else if program == "cmd" || program.ends_with("cmd.exe") {
             ShellKind::Cmd
         } else if program == "nu" {
             ShellKind::Nushell
@@ -178,18 +195,6 @@ impl ShellKind {
     }
 }
 
-fn system_shell() -> String {
-    if cfg!(target_os = "windows") {
-        // `alacritty_terminal` uses this as default on Windows. See:
-        // https://github.com/alacritty/alacritty/blob/0d4ab7bca43213d96ddfe40048fc0f922543c6f8/alacritty_terminal/src/tty/windows/mod.rs#L130
-        // We could use `util::get_windows_system_shell()` here, but we are running tasks here, so leave it to `powershell.exe`
-        // should be okay.
-        "powershell.exe".to_string()
-    } else {
-        std::env::var("SHELL").unwrap_or("/bin/sh".to_string())
-    }
-}
-
 /// ShellBuilder is used to turn a user-requested task into a
 /// program that can be executed by the shell.
 pub struct ShellBuilder {
@@ -206,7 +211,7 @@ impl ShellBuilder {
         let (program, args) = match remote_system_shell {
             Some(program) => (program.to_string(), Vec::new()),
             None => match shell {
-                Shell::System => (system_shell(), Vec::new()),
+                Shell::System => (get_system_shell(), Vec::new()),
                 Shell::Program(shell) => (shell.clone(), Vec::new()),
                 Shell::WithArguments { program, args, .. } => (program.clone(), args.clone()),
             },
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index b38a69f095..a5e0227533 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -344,7 +344,6 @@ pub struct TerminalBuilder {
 impl TerminalBuilder {
     pub fn new(
         working_directory: Option<PathBuf>,
-        python_venv_directory: Option<PathBuf>,
         task: Option<TaskState>,
         shell: Shell,
         mut env: HashMap<String, String>,
@@ -353,8 +352,9 @@ impl TerminalBuilder {
         max_scroll_history_lines: Option<usize>,
         is_ssh_terminal: bool,
         window_id: u64,
-        completion_tx: Sender<Option<ExitStatus>>,
+        completion_tx: Option<Sender<Option<ExitStatus>>>,
         cx: &App,
+        activation_script: Option<String>,
     ) -> Result<TerminalBuilder> {
         // If the parent environment doesn't have a locale set
         // (As is the case when launched from a .app on MacOS),
@@ -428,13 +428,10 @@ impl TerminalBuilder {
                     .clone()
                     .or_else(|| Some(home_dir().to_path_buf())),
                 drain_on_exit: true,
-                env: env.into_iter().collect(),
+                env: env.clone().into_iter().collect(),
             }
         };
 
-        // Setup Alacritty's env, which modifies the current process's environment
-        alacritty_terminal::tty::setup_env();
-
         let default_cursor_style = AlacCursorStyle::from(cursor_shape);
         let scrolling_history = if task.is_some() {
             // Tasks like `cargo build --all` may produce a lot of output, ergo allow maximum scrolling.
@@ -517,11 +514,19 @@ impl TerminalBuilder {
             hyperlink_regex_searches: RegexSearches::new(),
             vi_mode_enabled: false,
             is_ssh_terminal,
-            python_venv_directory,
             last_mouse_move_time: Instant::now(),
             last_hyperlink_search_position: None,
             #[cfg(windows)]
             shell_program,
+            activation_script,
+            template: CopyTemplate {
+                shell,
+                env,
+                cursor_shape,
+                alternate_scroll,
+                max_scroll_history_lines,
+                window_id,
+            },
         };
 
         Ok(TerminalBuilder {
@@ -683,7 +688,7 @@ pub enum SelectionPhase {
 
 pub struct Terminal {
     pty_tx: Notifier,
-    completion_tx: Sender<Option<ExitStatus>>,
+    completion_tx: Option<Sender<Option<ExitStatus>>>,
     term: Arc<FairMutex<Term<ZedListener>>>,
     term_config: Config,
     events: VecDeque<InternalEvent>,
@@ -695,7 +700,6 @@ pub struct Terminal {
     pub breadcrumb_text: String,
     pub pty_info: PtyProcessInfo,
     title_override: Option<SharedString>,
-    pub python_venv_directory: Option<PathBuf>,
     scroll_px: Pixels,
     next_link_id: usize,
     selection_phase: SelectionPhase,
@@ -707,6 +711,17 @@ pub struct Terminal {
     last_hyperlink_search_position: Option<Point<Pixels>>,
     #[cfg(windows)]
     shell_program: Option<String>,
+    template: CopyTemplate,
+    activation_script: Option<String>,
+}
+
+struct CopyTemplate {
+    shell: Shell,
+    env: HashMap<String, String>,
+    cursor_shape: CursorShape,
+    alternate_scroll: AlternateScroll,
+    max_scroll_history_lines: Option<usize>,
+    window_id: u64,
 }
 
 pub struct TaskState {
@@ -1895,7 +1910,9 @@ impl Terminal {
             }
         });
 
-        self.completion_tx.try_send(e).ok();
+        if let Some(tx) = &self.completion_tx {
+            tx.try_send(e).ok();
+        }
         let task = match &mut self.task {
             Some(task) => task,
             None => {
@@ -1950,6 +1967,28 @@ impl Terminal {
     pub fn vi_mode_enabled(&self) -> bool {
         self.vi_mode_enabled
     }
+
+    pub fn clone_builder(
+        &self,
+        cx: &App,
+        cwd: impl FnOnce() -> Option<PathBuf>,
+    ) -> Result<TerminalBuilder> {
+        let working_directory = self.working_directory().or_else(cwd);
+        TerminalBuilder::new(
+            working_directory,
+            None,
+            self.template.shell.clone(),
+            self.template.env.clone(),
+            self.template.cursor_shape,
+            self.template.alternate_scroll,
+            self.template.max_scroll_history_lines,
+            self.is_ssh_terminal,
+            self.template.window_id,
+            None,
+            cx,
+            self.activation_script.clone(),
+        )
+    }
 }
 
 // Helper function to convert a grid row to a string
@@ -2164,7 +2203,6 @@ mod tests {
         let (completion_tx, completion_rx) = smol::channel::unbounded();
         let terminal = cx.new(|cx| {
             TerminalBuilder::new(
-                None,
                 None,
                 None,
                 task::Shell::WithArguments {
@@ -2178,8 +2216,9 @@ mod tests {
                 None,
                 false,
                 0,
-                completion_tx,
+                Some(completion_tx),
                 cx,
+                None,
             )
             .unwrap()
             .subscribe(cx)
diff --git a/crates/terminal_view/src/persistence.rs b/crates/terminal_view/src/persistence.rs
index c7ebd314e4..9759fe8337 100644
--- a/crates/terminal_view/src/persistence.rs
+++ b/crates/terminal_view/src/persistence.rs
@@ -3,9 +3,9 @@ use async_recursion::async_recursion;
 use collections::HashSet;
 use futures::{StreamExt as _, stream::FuturesUnordered};
 use gpui::{AppContext as _, AsyncWindowContext, Axis, Entity, Task, WeakEntity};
-use project::{Project, terminals::TerminalKind};
+use project::Project;
 use serde::{Deserialize, Serialize};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use ui::{App, Context, Pixels, Window};
 use util::ResultExt as _;
 
@@ -246,11 +246,9 @@ async fn deserialize_pane_group(
                             .update(cx, |workspace, cx| default_working_directory(workspace, cx))
                             .ok()
                             .flatten();
-                        let kind = TerminalKind::Shell(
-                            working_directory.as_deref().map(Path::to_path_buf),
-                        );
-                        let terminal =
-                            project.update(cx, |project, cx| project.create_terminal(kind, cx));
+                        let terminal = project.update(cx, |project, cx| {
+                            project.create_terminal_shell(working_directory, cx)
+                        });
                         Some(Some(terminal))
                     } else {
                         Some(None)
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index c3d7c4f793..45e36c1990 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -16,7 +16,7 @@ use gpui::{
     Task, WeakEntity, Window, actions,
 };
 use itertools::Itertools;
-use project::{Fs, Project, ProjectEntryId, terminals::TerminalKind};
+use project::{Fs, Project, ProjectEntryId};
 use search::{BufferSearchBar, buffer_search::DivRegistrar};
 use settings::Settings;
 use task::{RevealStrategy, RevealTarget, ShellBuilder, SpawnInTerminal, TaskId};
@@ -376,14 +376,19 @@ impl TerminalPanel {
                 }
                 self.serialize(cx);
             }
-            pane::Event::Split(direction) => {
-                let Some(new_pane) = self.new_pane_with_cloned_active_terminal(window, cx) else {
-                    return;
-                };
+            &pane::Event::Split(direction) => {
+                let fut = self.new_pane_with_cloned_active_terminal(window, cx);
                 let pane = pane.clone();
-                let direction = *direction;
-                self.center.split(&pane, &new_pane, direction).log_err();
-                window.focus(&new_pane.focus_handle(cx));
+                cx.spawn_in(window, async move |panel, cx| {
+                    let Some(new_pane) = fut.await else {
+                        return;
+                    };
+                    _ = panel.update_in(cx, |panel, window, cx| {
+                        panel.center.split(&pane, &new_pane, direction).log_err();
+                        window.focus(&new_pane.focus_handle(cx));
+                    });
+                })
+                .detach();
             }
             pane::Event::Focus => {
                 self.active_pane = pane.clone();
@@ -400,57 +405,62 @@ impl TerminalPanel {
         &mut self,
         window: &mut Window,
         cx: &mut Context<Self>,
-    ) -> Option<Entity<Pane>> {
-        let workspace = self.workspace.upgrade()?;
+    ) -> Task<Option<Entity<Pane>>> {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return Task::ready(None);
+        };
         let workspace = workspace.read(cx);
         let database_id = workspace.database_id();
         let weak_workspace = self.workspace.clone();
         let project = workspace.project().clone();
-        let (working_directory, python_venv_directory) = self
-            .active_pane
+        let active_pane = &self.active_pane;
+        let terminal_view = active_pane
             .read(cx)
             .active_item()
-            .and_then(|item| item.downcast::<TerminalView>())
-            .map(|terminal_view| {
-                let terminal = terminal_view.read(cx).terminal().read(cx);
-                (
-                    terminal
-                        .working_directory()
-                        .or_else(|| default_working_directory(workspace, cx)),
-                    terminal.python_venv_directory.clone(),
-                )
-            })
-            .unwrap_or((None, None));
-        let kind = TerminalKind::Shell(working_directory);
-        let terminal = project
-            .update(cx, |project, cx| {
-                project.create_terminal_with_venv(kind, python_venv_directory, cx)
-            })
-            .ok()?;
-
-        let terminal_view = Box::new(cx.new(|cx| {
-            TerminalView::new(
-                terminal.clone(),
-                weak_workspace.clone(),
-                database_id,
-                project.downgrade(),
-                window,
-                cx,
-            )
-        }));
-        let pane = new_terminal_pane(
-            weak_workspace,
-            project,
-            self.active_pane.read(cx).is_zoomed(),
-            window,
-            cx,
-        );
-        self.apply_tab_bar_buttons(&pane, cx);
-        pane.update(cx, |pane, cx| {
-            pane.add_item(terminal_view, true, true, None, window, cx);
+            .and_then(|item| item.downcast::<TerminalView>());
+        let working_directory = terminal_view.as_ref().and_then(|terminal_view| {
+            let terminal = terminal_view.read(cx).terminal().read(cx);
+            terminal
+                .working_directory()
+                .or_else(|| default_working_directory(workspace, cx))
         });
+        let is_zoomed = active_pane.read(cx).is_zoomed();
+        cx.spawn_in(window, async move |panel, cx| {
+            let terminal = project
+                .update(cx, |project, cx| match terminal_view {
+                    Some(view) => Task::ready(project.clone_terminal(
+                        &view.read(cx).terminal.clone(),
+                        cx,
+                        || working_directory,
+                    )),
+                    None => project.create_terminal_shell(working_directory, cx),
+                })
+                .ok()?
+                .await
+                .ok()?;
 
-        Some(pane)
+            panel
+                .update_in(cx, move |terminal_panel, window, cx| {
+                    let terminal_view = Box::new(cx.new(|cx| {
+                        TerminalView::new(
+                            terminal.clone(),
+                            weak_workspace.clone(),
+                            database_id,
+                            project.downgrade(),
+                            window,
+                            cx,
+                        )
+                    }));
+                    let pane = new_terminal_pane(weak_workspace, project, is_zoomed, window, cx);
+                    terminal_panel.apply_tab_bar_buttons(&pane, cx);
+                    pane.update(cx, |pane, cx| {
+                        pane.add_item(terminal_view, true, true, None, window, cx);
+                    });
+                    Some(pane)
+                })
+                .ok()
+                .flatten()
+        })
     }
 
     pub fn open_terminal(
@@ -465,8 +475,8 @@ impl TerminalPanel {
 
         terminal_panel
             .update(cx, |panel, cx| {
-                panel.add_terminal(
-                    TerminalKind::Shell(Some(action.working_directory.clone())),
+                panel.add_terminal_shell(
+                    Some(action.working_directory.clone()),
                     RevealStrategy::Always,
                     window,
                     cx,
@@ -571,15 +581,16 @@ impl TerminalPanel {
     ) -> Task<Result<WeakEntity<Terminal>>> {
         let reveal = spawn_task.reveal;
         let reveal_target = spawn_task.reveal_target;
-        let kind = TerminalKind::Task(spawn_task);
         match reveal_target {
             RevealTarget::Center => self
                 .workspace
                 .update(cx, |workspace, cx| {
-                    Self::add_center_terminal(workspace, kind, window, cx)
+                    Self::add_center_terminal(workspace, window, cx, |project, cx| {
+                        project.create_terminal_task(spawn_task, cx)
+                    })
                 })
                 .unwrap_or_else(|e| Task::ready(Err(e))),
-            RevealTarget::Dock => self.add_terminal(kind, reveal, window, cx),
+            RevealTarget::Dock => self.add_terminal_task(spawn_task, reveal, window, cx),
         }
     }
 
@@ -594,11 +605,14 @@ impl TerminalPanel {
             return;
         };
 
-        let kind = TerminalKind::Shell(default_working_directory(workspace, cx));
-
         terminal_panel
             .update(cx, |this, cx| {
-                this.add_terminal(kind, RevealStrategy::Always, window, cx)
+                this.add_terminal_shell(
+                    default_working_directory(workspace, cx),
+                    RevealStrategy::Always,
+                    window,
+                    cx,
+                )
             })
             .detach_and_log_err(cx);
     }
@@ -660,9 +674,13 @@ impl TerminalPanel {
 
     pub fn add_center_terminal(
         workspace: &mut Workspace,
-        kind: TerminalKind,
         window: &mut Window,
         cx: &mut Context<Workspace>,
+        create_terminal: impl FnOnce(
+            &mut Project,
+            &mut Context<Project>,
+        ) -> Task<Result<Entity<Terminal>>>
+        + 'static,
     ) -> Task<Result<WeakEntity<Terminal>>> {
         if !is_enabled_in_workspace(workspace, cx) {
             return Task::ready(Err(anyhow!(
@@ -671,9 +689,7 @@ impl TerminalPanel {
         }
         let project = workspace.project().downgrade();
         cx.spawn_in(window, async move |workspace, cx| {
-            let terminal = project
-                .update(cx, |project, cx| project.create_terminal(kind, cx))?
-                .await?;
+            let terminal = project.update(cx, create_terminal)?.await?;
 
             workspace.update_in(cx, |workspace, window, cx| {
                 let terminal_view = cx.new(|cx| {
@@ -692,9 +708,9 @@ impl TerminalPanel {
         })
     }
 
-    pub fn add_terminal(
+    pub fn add_terminal_task(
         &mut self,
-        kind: TerminalKind,
+        task: SpawnInTerminal,
         reveal_strategy: RevealStrategy,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -710,7 +726,66 @@ impl TerminalPanel {
             })?;
             let project = workspace.read_with(cx, |workspace, _| workspace.project().clone())?;
             let terminal = project
-                .update(cx, |project, cx| project.create_terminal(kind, cx))?
+                .update(cx, |project, cx| project.create_terminal_task(task, cx))?
+                .await?;
+            let result = workspace.update_in(cx, |workspace, window, cx| {
+                let terminal_view = Box::new(cx.new(|cx| {
+                    TerminalView::new(
+                        terminal.clone(),
+                        workspace.weak_handle(),
+                        workspace.database_id(),
+                        workspace.project().downgrade(),
+                        window,
+                        cx,
+                    )
+                }));
+
+                match reveal_strategy {
+                    RevealStrategy::Always => {
+                        workspace.focus_panel::<Self>(window, cx);
+                    }
+                    RevealStrategy::NoFocus => {
+                        workspace.open_panel::<Self>(window, cx);
+                    }
+                    RevealStrategy::Never => {}
+                }
+
+                pane.update(cx, |pane, cx| {
+                    let focus = pane.has_focus(window, cx)
+                        || matches!(reveal_strategy, RevealStrategy::Always);
+                    pane.add_item(terminal_view, true, focus, None, window, cx);
+                });
+
+                Ok(terminal.downgrade())
+            })?;
+            terminal_panel.update(cx, |terminal_panel, cx| {
+                terminal_panel.pending_terminals_to_add =
+                    terminal_panel.pending_terminals_to_add.saturating_sub(1);
+                terminal_panel.serialize(cx)
+            })?;
+            result
+        })
+    }
+
+    pub fn add_terminal_shell(
+        &mut self,
+        cwd: Option<PathBuf>,
+        reveal_strategy: RevealStrategy,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<WeakEntity<Terminal>>> {
+        let workspace = self.workspace.clone();
+        cx.spawn_in(window, async move |terminal_panel, cx| {
+            if workspace.update(cx, |workspace, cx| !is_enabled_in_workspace(workspace, cx))? {
+                anyhow::bail!("terminal not yet supported for remote projects");
+            }
+            let pane = terminal_panel.update(cx, |terminal_panel, _| {
+                terminal_panel.pending_terminals_to_add += 1;
+                terminal_panel.active_pane.clone()
+            })?;
+            let project = workspace.read_with(cx, |workspace, _| workspace.project().clone())?;
+            let terminal = project
+                .update(cx, |project, cx| project.create_terminal_shell(cwd, cx))?
                 .await?;
             let result = workspace.update_in(cx, |workspace, window, cx| {
                 let terminal_view = Box::new(cx.new(|cx| {
@@ -819,7 +894,7 @@ impl TerminalPanel {
             })??;
             let new_terminal = project
                 .update(cx, |project, cx| {
-                    project.create_terminal(TerminalKind::Task(spawn_task), cx)
+                    project.create_terminal_task(spawn_task, cx)
                 })?
                 .await?;
             terminal_to_replace.update_in(cx, |terminal_to_replace, window, cx| {
@@ -1248,18 +1323,29 @@ impl Render for TerminalPanel {
                         let panes = terminal_panel.center.panes();
                         if let Some(&pane) = panes.get(action.0) {
                             window.focus(&pane.read(cx).focus_handle(cx));
-                        } else if let Some(new_pane) =
-                            terminal_panel.new_pane_with_cloned_active_terminal(window, cx)
-                        {
-                            terminal_panel
-                                .center
-                                .split(
-                                    &terminal_panel.active_pane,
-                                    &new_pane,
-                                    SplitDirection::Right,
-                                )
-                                .log_err();
-                            window.focus(&new_pane.focus_handle(cx));
+                        } else {
+                            let future =
+                                terminal_panel.new_pane_with_cloned_active_terminal(window, cx);
+                            cx.spawn_in(window, async move |terminal_panel, cx| {
+                                if let Some(new_pane) = future.await {
+                                    _ = terminal_panel.update_in(
+                                        cx,
+                                        |terminal_panel, window, cx| {
+                                            terminal_panel
+                                                .center
+                                                .split(
+                                                    &terminal_panel.active_pane,
+                                                    &new_pane,
+                                                    SplitDirection::Right,
+                                                )
+                                                .log_err();
+                                            let new_pane = new_pane.read(cx);
+                                            window.focus(&new_pane.focus_handle(cx));
+                                        },
+                                    );
+                                }
+                            })
+                            .detach();
                         }
                     }),
                 )
@@ -1395,13 +1481,14 @@ impl Panel for TerminalPanel {
             return;
         }
         cx.defer_in(window, |this, window, cx| {
-            let Ok(kind) = this.workspace.update(cx, |workspace, cx| {
-                TerminalKind::Shell(default_working_directory(workspace, cx))
-            }) else {
+            let Ok(kind) = this
+                .workspace
+                .update(cx, |workspace, cx| default_working_directory(workspace, cx))
+            else {
                 return;
             };
 
-            this.add_terminal(kind, RevealStrategy::Always, window, cx)
+            this.add_terminal_shell(kind, RevealStrategy::Always, window, cx)
                 .detach_and_log_err(cx)
         })
     }
diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
index e20df7f001..226a8f4c3d 100644
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -364,7 +364,7 @@ fn possibly_open_target(
 mod tests {
     use super::*;
     use gpui::TestAppContext;
-    use project::{Project, terminals::TerminalKind};
+    use project::Project;
     use serde_json::json;
     use std::path::{Path, PathBuf};
     use terminal::{HoveredWord, alacritty_terminal::index::Point as AlacPoint};
@@ -405,8 +405,8 @@ mod tests {
             app_cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
         let terminal = project
-            .update(cx, |project, cx| {
-                project.create_terminal(TerminalKind::Shell(None), cx)
+            .update(cx, |project: &mut Project, cx| {
+                project.create_terminal_shell(None, cx)
             })
             .await
             .expect("Failed to create a terminal");
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 9aa855acb7..9e479464af 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -15,7 +15,7 @@ use gpui::{
     deferred, div,
 };
 use persistence::TERMINAL_DB;
-use project::{Project, search::SearchQuery, terminals::TerminalKind};
+use project::{Project, search::SearchQuery};
 use schemars::JsonSchema;
 use task::TaskId;
 use terminal::{
@@ -204,12 +204,9 @@ impl TerminalView {
         cx: &mut Context<Workspace>,
     ) {
         let working_directory = default_working_directory(workspace, cx);
-        TerminalPanel::add_center_terminal(
-            workspace,
-            TerminalKind::Shell(working_directory),
-            window,
-            cx,
-        )
+        TerminalPanel::add_center_terminal(workspace, window, cx, |project, cx| {
+            project.create_terminal_shell(working_directory, cx)
+        })
         .detach_and_log_err(cx);
     }
 
@@ -1333,16 +1330,10 @@ impl Item for TerminalView {
         let terminal = self
             .project
             .update(cx, |project, cx| {
-                let terminal = self.terminal().read(cx);
-                let working_directory = terminal
-                    .working_directory()
-                    .or_else(|| Some(project.active_project_directory(cx)?.to_path_buf()));
-                let python_venv_directory = terminal.python_venv_directory.clone();
-                project.create_terminal_with_venv(
-                    TerminalKind::Shell(working_directory),
-                    python_venv_directory,
-                    cx,
-                )
+                let cwd = project
+                    .active_project_directory(cx)
+                    .map(|it| it.to_path_buf());
+                project.clone_terminal(self.terminal(), cx, || cwd)
             })
             .ok()?
             .log_err()?;
@@ -1498,9 +1489,7 @@ impl SerializableItem for TerminalView {
                 .flatten();
 
             let terminal = project
-                .update(cx, |project, cx| {
-                    project.create_terminal(TerminalKind::Shell(cwd), cx)
-                })?
+                .update(cx, |project, cx| project.create_terminal_shell(cwd, cx))?
                 .await?;
             cx.update(|window, cx| {
                 cx.new(|cx| {
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 69a2c88706..0aceec5d7a 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -1057,6 +1057,18 @@ pub fn get_system_shell() -> String {
     }
 }
 
+pub fn get_default_system_shell() -> String {
+    #[cfg(target_os = "windows")]
+    {
+        get_windows_system_shell()
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        "/bin/sh".to_string()
+    }
+}
+
 #[derive(Debug)]
 pub enum ConnectionResult<O> {
     Timeout,
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index c4ba93bcec..3ef9ff65eb 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -824,7 +824,6 @@ impl WorkspaceDb {
                 conn.exec_bound(
                     sql!(
                         DELETE FROM breakpoints WHERE workspace_id = ?1;
-                        DELETE FROM toolchains WHERE workspace_id = ?1;
                     )
                 )?(workspace.id).context("Clearing old breakpoints")?;
 
@@ -1097,7 +1096,6 @@ impl WorkspaceDb {
 
     query! {
         pub async fn delete_workspace_by_id(id: WorkspaceId) -> Result<()> {
-            DELETE FROM toolchains WHERE workspace_id = ?1;
             DELETE FROM workspaces
             WHERE workspace_id IS ?
         }
@@ -1424,24 +1422,24 @@ impl WorkspaceDb {
         &self,
         workspace_id: WorkspaceId,
         worktree_id: WorktreeId,
-        relative_path: String,
+        relative_worktree_path: String,
         language_name: LanguageName,
     ) -> Result<Option<Toolchain>> {
         self.write(move |this| {
             let mut select = this
                 .select_bound(sql!(
-                    SELECT name, path, raw_json FROM toolchains WHERE workspace_id = ? AND language_name = ? AND worktree_id = ? AND relative_path = ?
+                    SELECT name, path, raw_json FROM toolchains WHERE workspace_id = ? AND language_name = ? AND worktree_id = ? AND relative_worktree_path = ?
                 ))
-                .context("Preparing insertion")?;
+                .context("select toolchain")?;
 
             let toolchain: Vec<(String, String, String)> =
-                select((workspace_id, language_name.as_ref().to_string(), worktree_id.to_usize(), relative_path))?;
+                select((workspace_id, language_name.as_ref().to_string(), worktree_id.to_usize(), relative_worktree_path))?;
 
             Ok(toolchain.into_iter().next().and_then(|(name, path, raw_json)| Some(Toolchain {
                 name: name.into(),
                 path: path.into(),
                 language_name,
-                as_json: serde_json::Value::from_str(&raw_json).ok()?
+                as_json: serde_json::Value::from_str(&raw_json).ok()?,
             })))
         })
         .await
@@ -1456,7 +1454,7 @@ impl WorkspaceDb {
                 .select_bound(sql!(
                     SELECT name, path, worktree_id, relative_worktree_path, language_name, raw_json FROM toolchains WHERE workspace_id = ?
                 ))
-                .context("Preparing insertion")?;
+                .context("select toolchains")?;
 
             let toolchain: Vec<(String, String, u64, String, String, String)> =
                 select(workspace_id)?;
@@ -1465,7 +1463,7 @@ impl WorkspaceDb {
                 name: name.into(),
                 path: path.into(),
                 language_name: LanguageName::new(&language_name),
-                as_json: serde_json::Value::from_str(&raw_json).ok()?
+                as_json: serde_json::Value::from_str(&raw_json).ok()?,
             }, WorktreeId::from_proto(worktree_id), Arc::from(relative_worktree_path.as_ref())))).collect())
         })
         .await

From c8e99125bdeafb08cb185c64251bf6ea1a523564 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Thu, 28 Aug 2025 20:58:22 +0530
Subject: [PATCH 433/823] language_models: Fix tool calling for
 `x-ai/grok-code-fast-1` model via OpenRouter (#37094)

Closes #37022
Closes #36994

This update ensures all Grok models use the JsonSchemaSubset format for
tool schemas.

A previous fix for this issue was too specific, only targeting grok-4
models. This caused other variants, like grok-code-fast-1, to be missed.
We've now broadened the logic to correctly apply the setting to the
entire Grok model family.

Release Notes:

- Fix tool calling for `x-ai/grok-code-fast-1` model via OpenRouter.
---
 crates/language_models/src/provider/open_router.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 8f2abfce35..aaa0bd620c 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -381,7 +381,7 @@ impl LanguageModel for OpenRouterLanguageModel {
 
     fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
         let model_id = self.model.id().trim().to_lowercase();
-        if model_id.contains("gemini") || model_id.contains("grok-4") {
+        if model_id.contains("gemini") || model_id.contains("grok") {
             LanguageModelToolSchemaFormat::JsonSchemaSubset
         } else {
             LanguageModelToolSchemaFormat::JsonSchema

From 2cb697e9f42a5b5988e5d3ab73ffb18fd112eb20 Mon Sep 17 00:00:00 2001
From: Liam <33645555+lj3954@users.noreply.github.com>
Date: Thu, 28 Aug 2025 15:32:15 +0000
Subject: [PATCH 434/823] copilot: Use updated Copilot Chat model schema
 (#33007)

Use the latest Copilot Chat model schema, matching what is used in
VSCode, to get more data about available models than was previously
accessible. Replace hardcoded default model (gpt-4.1) with the default
model included in JSON. Other data like premium request multipliers
could be used in the future if Zed implements a way for models to
display additional details about themselves, such as with tooltips on
hover.

Release Notes:

- N/A

---------

Co-authored-by: Peter Tripp <peter@zed.dev>
---
 crates/copilot/src/copilot_chat.rs | 52 +++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/crates/copilot/src/copilot_chat.rs b/crates/copilot/src/copilot_chat.rs
index e8e2251648..bfddba0e2f 100644
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -62,12 +62,6 @@ impl CopilotChatConfiguration {
     }
 }
 
-// Copilot's base model; defined by Microsoft in premium requests table
-// This will be moved to the front of the Copilot model list, and will be used for
-// 'fast' requests (e.g. title generation)
-// https://docs.github.com/en/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests
-const DEFAULT_MODEL_ID: &str = "gpt-4.1";
-
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub enum Role {
@@ -101,22 +95,39 @@ where
     Ok(models)
 }
 
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
+#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
 pub struct Model {
+    billing: ModelBilling,
     capabilities: ModelCapabilities,
     id: String,
     name: String,
     policy: Option<ModelPolicy>,
     vendor: ModelVendor,
+    is_chat_default: bool,
+    // The model with this value true is selected by VSCode copilot if a premium request limit is
+    // reached. Zed does not currently implement this behaviour
+    is_chat_fallback: bool,
     model_picker_enabled: bool,
 }
 
+#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
+struct ModelBilling {
+    is_premium: bool,
+    multiplier: f64,
+    // List of plans a model is restricted to
+    // Field is not present if a model is available for all plans
+    #[serde(default)]
+    restricted_to: Option<Vec<String>>,
+}
+
 #[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
 struct ModelCapabilities {
     family: String,
     #[serde(default)]
     limits: ModelLimits,
     supports: ModelSupportedFeatures,
+    #[serde(rename = "type")]
+    model_type: String,
 }
 
 #[derive(Default, Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
@@ -602,6 +613,7 @@ async fn get_models(
         .into_iter()
         .filter(|model| {
             model.model_picker_enabled
+                && model.capabilities.model_type.as_str() == "chat"
                 && model
                     .policy
                     .as_ref()
@@ -610,9 +622,7 @@ async fn get_models(
         .dedup_by(|a, b| a.capabilities.family == b.capabilities.family)
         .collect();
 
-    if let Some(default_model_position) =
-        models.iter().position(|model| model.id == DEFAULT_MODEL_ID)
-    {
+    if let Some(default_model_position) = models.iter().position(|model| model.is_chat_default) {
         let default_model = models.remove(default_model_position);
         models.insert(0, default_model);
     }
@@ -630,7 +640,9 @@ async fn request_models(
         .uri(models_url.as_ref())
         .header("Authorization", format!("Bearer {}", api_token))
         .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat");
+        .header("Copilot-Integration-Id", "vscode-chat")
+        .header("Editor-Version", "vscode/1.103.2")
+        .header("x-github-api-version", "2025-05-01");
 
     let request = request_builder.body(AsyncBody::empty())?;
 
@@ -801,6 +813,10 @@ mod tests {
         let json = r#"{
               "data": [
                 {
+                  "billing": {
+                    "is_premium": false,
+                    "multiplier": 0
+                  },
                   "capabilities": {
                     "family": "gpt-4",
                     "limits": {
@@ -814,6 +830,8 @@ mod tests {
                     "type": "chat"
                   },
                   "id": "gpt-4",
+                  "is_chat_default": false,
+                  "is_chat_fallback": false,
                   "model_picker_enabled": false,
                   "name": "GPT 4",
                   "object": "model",
@@ -825,6 +843,16 @@ mod tests {
                     "some-unknown-field": 123
                 },
                 {
+                  "billing": {
+                    "is_premium": true,
+                    "multiplier": 1,
+                    "restricted_to": [
+                      "pro",
+                      "pro_plus",
+                      "business",
+                      "enterprise"
+                    ]
+                  },
                   "capabilities": {
                     "family": "claude-3.7-sonnet",
                     "limits": {
@@ -848,6 +876,8 @@ mod tests {
                     "type": "chat"
                   },
                   "id": "claude-3.7-sonnet",
+                  "is_chat_default": false,
+                  "is_chat_fallback": false,
                   "model_picker_enabled": true,
                   "name": "Claude 3.7 Sonnet",
                   "object": "model",

From 4b0609840b6ba78e7b9c0e4b7e772914a8cb311d Mon Sep 17 00:00:00 2001
From: Kai Ren <tyranron@gmail.com>
Date: Thu, 28 Aug 2025 17:40:48 +0200
Subject: [PATCH 435/823] go: Fix highlighting of fields (#37026)

Closes #36420

## Synopsis

The issue in #36420 is caused by #7276, which bound the appropriate
tree-sitter queries to the `@variable.member` color. However, I have
found neither this color's declaration nor its other usages in the
codebase (neither on the latest `main` nor on
79c1003b344ee513cf97ee8313c38c7c3f02c916).

Other languages use for such situations the `@property` color.


## Solution

Just change the used `@variable.member` color to the `@property` one.

Seems fully inline with the changes illustrated in #7276.


## Screenshots

<img width="856" height="465" alt="Screenshot 2025-08-28 at 13 18 38"
src="https://github.com/user-attachments/assets/9d1f3542-8749-421f-864f-959c1242cc64"
/>

<img width="837" height="462" alt="Screenshot 2025-08-28 at 13 20 08"
src="https://github.com/user-attachments/assets/36a80c22-9de9-46b1-87e3-7fdeaa62978f"
/>


## Changelog

Release Notes:

- go: Fixed highlighting of fields.
---
 crates/languages/src/go.rs             | 3 ++-
 crates/languages/src/go/highlights.scm | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 24e2ca2f56..86f8e1faaa 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -764,6 +764,7 @@ mod tests {
         let highlight_type = grammar.highlight_id_for_name("type").unwrap();
         let highlight_keyword = grammar.highlight_id_for_name("keyword").unwrap();
         let highlight_number = grammar.highlight_id_for_name("number").unwrap();
+        let highlight_field = grammar.highlight_id_for_name("property").unwrap();
 
         assert_eq!(
             adapter
@@ -828,7 +829,7 @@ mod tests {
             Some(CodeLabel {
                 text: "two.Three a.Bcd".to_string(),
                 filter_range: 0..9,
-                runs: vec![(12..15, highlight_type)],
+                runs: vec![(4..9, highlight_field), (12..15, highlight_type)],
             })
         );
     }
diff --git a/crates/languages/src/go/highlights.scm b/crates/languages/src/go/highlights.scm
index 5aa23fca90..bb0eaab88a 100644
--- a/crates/languages/src/go/highlights.scm
+++ b/crates/languages/src/go/highlights.scm
@@ -1,13 +1,13 @@
 (identifier) @variable
 
 (type_identifier) @type
-(field_identifier) @variable.member
+(field_identifier) @property
 (package_identifier) @namespace
 
 (keyed_element
   .
   (literal_element
-    (identifier) @variable.member))
+    (identifier) @property))
 
 (call_expression
   function: (identifier) @function)

From 4ef9294123d639a270d8932944654ff23b2cf286 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 28 Aug 2025 18:44:30 +0200
Subject: [PATCH 436/823] html: Add outline (#37098)

We were missing an outline definition for HTML flies, hence this PR adds
one for that

<img width="255" height="726" alt="image"
src="https://github.com/user-attachments/assets/ae59cb8d-6c69-4019-966a-d5baf744329d"
/>

Release Notes:

- N/A
---
 extensions/html/languages/html/outline.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extensions/html/languages/html/outline.scm b/extensions/html/languages/html/outline.scm
index a9b95da556..e7f9dc4fab 100644
--- a/extensions/html/languages/html/outline.scm
+++ b/extensions/html/languages/html/outline.scm
@@ -1 +1,5 @@
 (comment) @annotation
+
+(element
+  (start_tag
+    (tag_name) @name)) @item

From 29fc324a78d5fdf664cec63c950df59135114634 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 28 Aug 2025 19:07:06 +0200
Subject: [PATCH 437/823] html: Bump to v0.2.2 (#37102)

This PR bumps the HTML extension to v0.2.2.

Changes:

- https://github.com/zed-industries/zed/pull/28184
- https://github.com/zed-industries/zed/pull/36948
- https://github.com/zed-industries/zed/pull/37098

Release Notes:

- N/A
---
 Cargo.lock                     | 2 +-
 extensions/html/Cargo.toml     | 2 +-
 extensions/html/extension.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8bddc8b008..4ecd8b42c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20590,7 +20590,7 @@ dependencies = [
 
 [[package]]
 name = "zed_html"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "zed_extension_api 0.1.0",
 ]
diff --git a/extensions/html/Cargo.toml b/extensions/html/Cargo.toml
index eacafeb2e4..27425da671 100644
--- a/extensions/html/Cargo.toml
+++ b/extensions/html/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zed_html"
-version = "0.2.1"
+version = "0.2.2"
 edition.workspace = true
 publish.workspace = true
 license = "Apache-2.0"
diff --git a/extensions/html/extension.toml b/extensions/html/extension.toml
index 0f6ea79f56..c1d45d4060 100644
--- a/extensions/html/extension.toml
+++ b/extensions/html/extension.toml
@@ -1,7 +1,7 @@
 id = "html"
 name = "HTML"
 description = "HTML support."
-version = "0.2.1"
+version = "0.2.2"
 schema_version = 1
 authors = ["Isaac Clayton <slightknack@gmail.com>"]
 repository = "https://github.com/zed-industries/zed"

From 4469b14512ec69168356b21db424da9f327066e3 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 28 Aug 2025 14:15:08 -0400
Subject: [PATCH 438/823] collab_ui: Show channel list while reconnecting
 (#37107)

This PR makes it so the channel list will still be shown while
reconnecting to Collab instead of showing the signed-out state.

In order to model the transitional states that occur while reconnecting,
we needed to introduce a new `Status::Reauthenticated` state that we go
through when signing in as part of a reconnect. This is because we
cannot tell from `Status::Authenticated` alone if we're authenticating
for the first time or reauthenticating.

Release Notes:

- N/A
---
 crates/client/src/client.rs          | 32 +++++++++++++++++++++++++---
 crates/client/src/user.rs            |  4 +++-
 crates/collab_ui/src/collab_panel.rs |  2 +-
 crates/workspace/src/workspace.rs    |  3 ++-
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 2bbe7dd1b5..bdbf049b75 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -287,6 +287,7 @@ pub enum Status {
     },
     ConnectionLost,
     Reauthenticating,
+    Reauthenticated,
     Reconnecting,
     ReconnectionError {
         next_reconnection: Instant,
@@ -298,6 +299,21 @@ impl Status {
         matches!(self, Self::Connected { .. })
     }
 
+    pub fn was_connected(&self) -> bool {
+        matches!(
+            self,
+            Self::ConnectionLost
+                | Self::Reauthenticating
+                | Self::Reauthenticated
+                | Self::Reconnecting
+        )
+    }
+
+    /// Returns whether the client is currently connected or was connected at some point.
+    pub fn is_or_was_connected(&self) -> bool {
+        self.is_connected() || self.was_connected()
+    }
+
     pub fn is_signing_in(&self) -> bool {
         matches!(
             self,
@@ -857,11 +873,13 @@ impl Client {
         try_provider: bool,
         cx: &AsyncApp,
     ) -> Result<Credentials> {
-        if self.status().borrow().is_signed_out() {
+        let is_reauthenticating = if self.status().borrow().is_signed_out() {
             self.set_status(Status::Authenticating, cx);
+            false
         } else {
             self.set_status(Status::Reauthenticating, cx);
-        }
+            true
+        };
 
         let mut credentials = None;
 
@@ -919,7 +937,14 @@ impl Client {
         self.cloud_client
             .set_credentials(credentials.user_id as u32, credentials.access_token.clone());
         self.state.write().credentials = Some(credentials.clone());
-        self.set_status(Status::Authenticated, cx);
+        self.set_status(
+            if is_reauthenticating {
+                Status::Reauthenticated
+            } else {
+                Status::Authenticated
+            },
+            cx,
+        );
 
         Ok(credentials)
     }
@@ -1034,6 +1059,7 @@ impl Client {
             | Status::Authenticating
             | Status::AuthenticationError
             | Status::Reauthenticating
+            | Status::Reauthenticated
             | Status::ReconnectionError { .. } => false,
             Status::Connected { .. } | Status::Connecting | Status::Reconnecting => {
                 return ConnectionResult::Result(Ok(()));
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index d23eb37519..a4c66e582c 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -216,7 +216,9 @@ impl UserStore {
                         return Ok(());
                     };
                     match status {
-                        Status::Authenticated | Status::Connected { .. } => {
+                        Status::Authenticated
+                        | Status::Reauthenticated
+                        | Status::Connected { .. } => {
                             if let Some(user_id) = client.user_id() {
                                 let response = client
                                     .cloud_client()
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index d85a6610a5..9009654294 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -3047,7 +3047,7 @@ impl Render for CollabPanel {
             .on_action(cx.listener(CollabPanel::move_channel_down))
             .track_focus(&self.focus_handle)
             .size_full()
-            .child(if !self.client.status().borrow().is_connected() {
+            .child(if !self.client.status().borrow().is_or_was_connected() {
                 self.render_signed_out(cx)
             } else {
                 self.render_signed_in(window, cx)
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 1fee2793f0..76693e716e 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -6890,7 +6890,8 @@ async fn join_channel_internal(
             | Status::Authenticating
             | Status::Authenticated
             | Status::Reconnecting
-            | Status::Reauthenticating => continue,
+            | Status::Reauthenticating
+            | Status::Reauthenticated => continue,
             Status::Connected { .. } => break 'outer,
             Status::SignedOut | Status::AuthenticationError => {
                 return Err(ErrorCode::SignedOut.into());

From 27777d4b8f8b59e58de35688eb1ce4ce66061053 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Thu, 28 Aug 2025 14:18:25 -0400
Subject: [PATCH 439/823] Have ACP respect always_allow_tool_actions (#37104)

Release Notes:

- ACP agents now respect the always_allow_tool_actions setting
---
 crates/agent_servers/src/acp.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index bca47101d6..d929d1fc50 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -3,6 +3,7 @@ use acp_thread::AgentConnection;
 use acp_tools::AcpConnectionRegistry;
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
+use agent_settings::AgentSettings;
 use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
@@ -10,6 +11,7 @@ use futures::channel::oneshot;
 use futures::io::BufReader;
 use project::Project;
 use serde::Deserialize;
+use settings::Settings as _;
 use std::{any::Any, cell::RefCell};
 use std::{path::Path, rc::Rc};
 use thiserror::Error;
@@ -342,6 +344,28 @@ impl acp::Client for ClientDelegate {
         arguments: acp::RequestPermissionRequest,
     ) -> Result<acp::RequestPermissionResponse, acp::Error> {
         let cx = &mut self.cx.clone();
+
+        // If always_allow_tool_actions is enabled, then auto-choose the first "Allow" button
+        if AgentSettings::try_read_global(cx, |settings| settings.always_allow_tool_actions)
+            .unwrap_or(false)
+        {
+            // Don't use AllowAlways, because then if you were to turn off always_allow_tool_actions,
+            // some tools would (incorrectly) continue to auto-accept.
+            if let Some(allow_once_option) = arguments.options.iter().find_map(|option| {
+                if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
+                    Some(option.id.clone())
+                } else {
+                    None
+                }
+            }) {
+                return Ok(acp::RequestPermissionResponse {
+                    outcome: acp::RequestPermissionOutcome::Selected {
+                        option_id: allow_once_option,
+                    },
+                });
+            }
+        }
+
         let rx = self
             .sessions
             .borrow()

From 909d7215c084458f200c9c713d53c9d5070dddde Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 28 Aug 2025 14:49:03 -0400
Subject: [PATCH 440/823] Update patch and nightly release docs (#37109)

Release Notes:

- N/A
---
 docs/src/development/releases.md | 56 ++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/docs/src/development/releases.md b/docs/src/development/releases.md
index 80458b0cdf..d1f99401d6 100644
--- a/docs/src/development/releases.md
+++ b/docs/src/development/releases.md
@@ -37,16 +37,17 @@ Credentials for various services used in this process can be found in 1Password.
 1. Check the release assets.
 
    - Ensure the stable and preview release jobs have finished without error.
-   - Ensure each build has the proper number of assets—releases currently have 10 assets each.
-   - Download the artifacts for each release and test that you can run them locally.
+   - Ensure each draft has the proper number of assets—releases currently have 10 assets each.
+   - Download the artifacts for each release draft and test that you can run them locally.
 
-1. Publish each build, one at a time.
+1. Publish stable / preview drafts, one at a time.
 
-   - Use [Vercel](https://vercel.com/zed-industries/zed-dev) to check the status of each build.
+   - Use [Vercel](https://vercel.com/zed-industries/zed-dev) to check the progress of the website rebuild.
+     The release will be public once the rebuild has completed.
 
 1. Publish the release email that has been sent to [Kit](https://kit.com).
 
-   - Make sure to double check that the email is correct before publishing.
+   - Make sure to double-check that the email is correct before publishing.
    - We sometimes correct things here and there that didn't translate from GitHub's renderer to Kit's.
 
 1. Build social media posts based on the popular items in stable.
@@ -57,22 +58,43 @@ Credentials for various services used in this process can be found in 1Password.
 
 ## Patch release process
 
-If your PR fixes a panic or a crash, you should cherry-pick it to the current stable and preview branches. If your PR fixes a regression in recently released code, you should cherry-pick it to preview.
+If your PR fixes a panic or a crash, you should cherry-pick it to the current stable and preview branches.
+If your PR fixes a regression in recently released code, you should cherry-pick it to preview.
 
 You will need write access to the Zed repository to do this:
 
-- Send a PR containing your change to `main` as normal.
-- Leave a comment on the PR `/cherry-pick v0.XXX.x`. Once your PR is merged, the GitHub bot will send a PR to the branch.
-  - In case of a merge conflict, you will have to cherry-pick manually and push the change to the `v0.XXX.x` branch.
-- After the commits are cherry-picked onto the branch, run `./script/trigger-release {preview|stable}`. This will bump the version numbers, create a new release tag, and kick off a release build.
-  - This can also be run from the [GitHub Actions UI](https://github.com/zed-industries/zed/actions/workflows/bump_patch_version.yml):
-    ![](https://github.com/zed-industries/zed/assets/1486634/9e31ae95-09e1-4c7f-9591-944f4f5b63ea)
-- Wait for the builds to appear on [the Releases tab on GitHub](https://github.com/zed-industries/zed/releases) (typically takes around 30 minutes)
-- Proof-read and edit the release notes as needed.
-- Download the artifacts for each release and test that you can run them locally.
-- Publish the release.
+---
+
+1. Send a PR containing your change to `main` as normal.
+
+1. Once it is merged, cherry-pick the commit locally to either of the release branches (`v0.XXX.x`).
+
+   - In some cases, you may have to handle a merge conflict.
+     More often than not, this will happen when cherry-picking to stable, as the stable branch is more "stale" than the preview branch.
+
+1. After the commit is cherry-picked, run `./script/trigger-release {preview|stable}`.
+   This will bump the version numbers, create a new release tag, and kick off a release build.
+
+   - This can also be run from the [GitHub Actions UI](https://github.com/zed-industries/zed/actions/workflows/bump_patch_version.yml):
+     ![](https://github.com/zed-industries/zed/assets/1486634/9e31ae95-09e1-4c7f-9591-944f4f5b63ea)
+
+1. Once release drafts are up on [GitHub Releases](https://github.com/zed-industries/zed/releases), proofread and edit the release notes as needed and **save**.
+
+   - **Do not publish the drafts, yet.**
+
+1. Check the release assets.
+
+   - Ensure the stable / preview release jobs have finished without error.
+   - Ensure each draft has the proper number of assets—releases currently have 10 assets each.
+   - Download the artifacts for each release draft and test that you can run them locally.
+
+1. Publish stable / preview drafts, one at a time.
+
+   - Use [Vercel](https://vercel.com/zed-industries/zed-dev) to check the progress of the website rebuild.
+     The release will be public once the rebuild has completed.
 
 ## Nightly release process
 
 In addition to the public releases, we also have a nightly build that we encourage employees to use.
-Nightly is released by cron once a day, and can be shipped as often as you'd like. There are no release notes or announcements, so you can just merge your changes to main and run `./script/trigger-release nightly`.
+Nightly is released by cron once a day, and can be shipped as often as you'd like.
+There are no release notes or announcements, so you can just merge your changes to main and run `./script/trigger-release nightly`.

From 69933d5b81c6a21db45cf27de1a19e68d4f1f3ac Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 28 Aug 2025 12:59:31 -0600
Subject: [PATCH 441/823] Add support for Claude Code auth (#37103)

Co-authored-by: Antonio Scandurra <me@as-cii.com>

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 crates/agent_servers/src/custom.rs         |  15 ++-
 crates/agent_ui/src/acp/thread_view.rs     | 125 ++++++++++++++++++++-
 crates/terminal_view/src/terminal_panel.rs |   2 +-
 3 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 75928a26a8..0669e0a68e 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -2,6 +2,7 @@ use crate::{AgentServerCommand, AgentServerSettings};
 use acp_thread::AgentConnection;
 use anyhow::Result;
 use gpui::{App, Entity, SharedString, Task};
+use language_models::provider::anthropic::AnthropicLanguageModelProvider;
 use project::Project;
 use std::{path::Path, rc::Rc};
 use ui::IconName;
@@ -49,10 +50,22 @@ impl crate::AgentServer for CustomAgentServer {
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let server_name = self.name();
-        let command = self.command.clone();
+        let mut command = self.command.clone();
         let root_dir = root_dir.to_path_buf();
 
+        // TODO: Remove this once we have Claude properly
         cx.spawn(async move |mut cx| {
+            if let Some(api_key) = cx
+                .update(AnthropicLanguageModelProvider::api_key)?
+                .await
+                .ok()
+            {
+                command
+                    .env
+                    .get_or_insert_default()
+                    .insert("ANTHROPIC_API_KEY".to_owned(), api_key.key);
+            }
+
             crate::acp::connect(server_name, command, &root_dir, &mut cx).await
         })
     }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 57d90734ef..2b18ebcd1d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -9,7 +9,7 @@ use agent_client_protocol::{self as acp, PromptCapabilities};
 use agent_servers::{AgentServer, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore};
-use anyhow::bail;
+use anyhow::{Result, anyhow, bail};
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use client::zed_urls;
@@ -18,6 +18,7 @@ use editor::scroll::Autoscroll;
 use editor::{Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects};
 use file_icons::FileIcons;
 use fs::Fs;
+use futures::FutureExt as _;
 use gpui::{
     Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
     CursorStyle, EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length,
@@ -39,6 +40,8 @@ use std::path::Path;
 use std::sync::Arc;
 use std::time::Instant;
 use std::{collections::BTreeMap, rc::Rc, time::Duration};
+use task::SpawnInTerminal;
+use terminal_view::terminal_panel::TerminalPanel;
 use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
@@ -93,6 +96,10 @@ impl ThreadError {
             error.downcast_ref::<language_model::ModelRequestLimitReachedError>()
         {
             Self::ModelRequestLimitReached(error.plan)
+        } else if let Some(acp_error) = error.downcast_ref::<acp::Error>()
+            && acp_error.code == acp::ErrorCode::AUTH_REQUIRED.code
+        {
+            Self::AuthenticationRequired(acp_error.message.clone().into())
         } else {
             let string = error.to_string();
             // TODO: we should have Gemini return better errors here.
@@ -898,7 +905,7 @@ impl AcpThreadView {
 
     fn send_impl(
         &mut self,
-        contents: Task<anyhow::Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>>,
+        contents: Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1234,6 +1241,31 @@ impl AcpThreadView {
                 });
                 return;
             }
+        } else if method.0.as_ref() == "anthropic-api-key" {
+            let registry = LanguageModelRegistry::global(cx);
+            let provider = registry
+                .read(cx)
+                .provider(&language_model::ANTHROPIC_PROVIDER_ID)
+                .unwrap();
+            if !provider.is_authenticated(cx) {
+                let this = cx.weak_entity();
+                let agent = self.agent.clone();
+                let connection = connection.clone();
+                window.defer(cx, |window, cx| {
+                    Self::handle_auth_required(
+                        this,
+                        AuthRequired {
+                            description: Some("ANTHROPIC_API_KEY must be set".to_owned()),
+                            provider_id: Some(language_model::ANTHROPIC_PROVIDER_ID),
+                        },
+                        agent,
+                        connection,
+                        window,
+                        cx,
+                    );
+                });
+                return;
+            }
         } else if method.0.as_ref() == "vertex-ai"
             && std::env::var("GOOGLE_API_KEY").is_err()
             && (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()
@@ -1265,7 +1297,15 @@ impl AcpThreadView {
         self.thread_error.take();
         configuration_view.take();
         pending_auth_method.replace(method.clone());
-        let authenticate = connection.authenticate(method, cx);
+        let authenticate = if method.0.as_ref() == "claude-login" {
+            if let Some(workspace) = self.workspace.upgrade() {
+                Self::spawn_claude_login(&workspace, window, cx)
+            } else {
+                Task::ready(Ok(()))
+            }
+        } else {
+            connection.authenticate(method, cx)
+        };
         cx.notify();
         self.auth_task =
             Some(cx.spawn_in(window, {
@@ -1289,6 +1329,13 @@ impl AcpThreadView {
 
                     this.update_in(cx, |this, window, cx| {
                         if let Err(err) = result {
+                            if let ThreadState::Unauthenticated {
+                                pending_auth_method,
+                                ..
+                            } = &mut this.thread_state
+                            {
+                                pending_auth_method.take();
+                            }
                             this.handle_thread_error(err, cx);
                         } else {
                             this.thread_state = Self::initial_state(
@@ -1307,6 +1354,76 @@ impl AcpThreadView {
             }));
     }
 
+    fn spawn_claude_login(
+        workspace: &Entity<Workspace>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<Result<()>> {
+        let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
+            return Task::ready(Ok(()));
+        };
+        let project = workspace.read(cx).project().read(cx);
+        let cwd = project.first_project_directory(cx);
+        let shell = project.terminal_settings(&cwd, cx).shell.clone();
+
+        let terminal = terminal_panel.update(cx, |terminal_panel, cx| {
+            terminal_panel.spawn_task(
+                &SpawnInTerminal {
+                    id: task::TaskId("claude-login".into()),
+                    full_label: "claude /login".to_owned(),
+                    label: "claude /login".to_owned(),
+                    command: Some("claude".to_owned()),
+                    args: vec!["/login".to_owned()],
+                    command_label: "claude /login".to_owned(),
+                    cwd,
+                    use_new_terminal: true,
+                    allow_concurrent_runs: true,
+                    hide: task::HideStrategy::Always,
+                    shell,
+                    ..Default::default()
+                },
+                window,
+                cx,
+            )
+        });
+        cx.spawn(async move |cx| {
+            let terminal = terminal.await?;
+            let mut exit_status = terminal
+                .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
+                .fuse();
+
+            let logged_in = cx
+                .spawn({
+                    let terminal = terminal.clone();
+                    async move |cx| {
+                        loop {
+                            cx.background_executor().timer(Duration::from_secs(1)).await;
+                            let content =
+                                terminal.update(cx, |terminal, _cx| terminal.get_content())?;
+                            if content.contains("Login successful") {
+                                return anyhow::Ok(());
+                            }
+                        }
+                    }
+                })
+                .fuse();
+            futures::pin_mut!(logged_in);
+            futures::select_biased! {
+                result = logged_in => {
+                    if let Err(e) = result {
+                        log::error!("{e}");
+                        return Err(anyhow!("exited before logging in"));
+                    }
+                }
+                _ = exit_status => {
+                    return Err(anyhow!("exited before logging in"));
+                }
+            }
+            terminal.update(cx, |terminal, _| terminal.kill_active_task())?;
+            Ok(())
+        })
+    }
+
     fn authorize_tool_call(
         &mut self,
         tool_call_id: acp::ToolCallId,
@@ -4024,7 +4141,7 @@ impl AcpThreadView {
         workspace: Entity<Workspace>,
         window: &mut Window,
         cx: &mut App,
-    ) -> Task<anyhow::Result<()>> {
+    ) -> Task<Result<()>> {
         let markdown_language_task = workspace
             .read(cx)
             .app_state()
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 45e36c1990..848737aeb2 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -485,7 +485,7 @@ impl TerminalPanel {
             .detach_and_log_err(cx);
     }
 
-    fn spawn_task(
+    pub fn spawn_task(
         &mut self,
         task: &SpawnInTerminal,
         window: &mut Window,

From 47aaaa8bcffeb00756a824f0628f48ae6af782af Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Thu, 28 Aug 2025 13:32:30 -0600
Subject: [PATCH 442/823] Make `SanitizedPath` wrap `Path` instead of
 `Arc<Path>` to avoid allocation (#37106)

Release Notes:

- N/A
---
 .../src/file_command.rs                       |   2 +-
 crates/fs/src/fs.rs                           |   8 +-
 crates/fs/src/fs_watcher.rs                   |   4 +-
 crates/gpui/src/platform/windows/platform.rs  |   2 +-
 crates/paths/src/paths.rs                     |   2 +-
 crates/project/src/git_store.rs               |   3 +-
 crates/project/src/lsp_store.rs               |   4 +-
 crates/project/src/project.rs                 |   5 +-
 crates/project/src/worktree_store.rs          |  27 ++--
 crates/remote/src/transport/ssh.rs            |   2 +-
 crates/util/src/paths.rs                      | 122 +++++++++++++-----
 crates/workspace/src/path_list.rs             |   2 +-
 crates/workspace/src/workspace.rs             |   2 +-
 crates/worktree/src/worktree.rs               |  56 ++++----
 14 files changed, 156 insertions(+), 85 deletions(-)

diff --git a/crates/assistant_slash_commands/src/file_command.rs b/crates/assistant_slash_commands/src/file_command.rs
index a973d653e4..261e15bc0a 100644
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -492,7 +492,7 @@ mod custom_path_matcher {
         pub fn new(globs: &[String]) -> Result<Self, globset::Error> {
             let globs = globs
                 .iter()
-                .map(|glob| Glob::new(&SanitizedPath::from(glob).to_glob_string()))
+                .map(|glob| Glob::new(&SanitizedPath::new(glob).to_glob_string()))
                 .collect::<Result<Vec<_>, _>>()?;
             let sources = globs.iter().map(|glob| glob.glob().to_owned()).collect();
             let sources_with_trailing_slash = globs
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 75312c5c0c..a5cf9b8825 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -495,7 +495,8 @@ impl Fs for RealFs {
         };
         // todo(windows)
         // When new version of `windows-rs` release, make this operation `async`
-        let path = SanitizedPath::from(path.canonicalize()?);
+        let path = path.canonicalize()?;
+        let path = SanitizedPath::new(&path);
         let path_string = path.to_string();
         let file = StorageFile::GetFileFromPathAsync(&HSTRING::from(path_string))?.get()?;
         file.DeleteAsync(StorageDeleteOption::Default)?.get()?;
@@ -522,7 +523,8 @@ impl Fs for RealFs {
 
         // todo(windows)
         // When new version of `windows-rs` release, make this operation `async`
-        let path = SanitizedPath::from(path.canonicalize()?);
+        let path = path.canonicalize()?;
+        let path = SanitizedPath::new(&path);
         let path_string = path.to_string();
         let folder = StorageFolder::GetFolderFromPathAsync(&HSTRING::from(path_string))?.get()?;
         folder.DeleteAsync(StorageDeleteOption::Default)?.get()?;
@@ -783,7 +785,7 @@ impl Fs for RealFs {
             {
                 target = parent.join(target);
                 if let Ok(canonical) = self.canonicalize(&target).await {
-                    target = SanitizedPath::from(canonical).as_path().to_path_buf();
+                    target = SanitizedPath::new(&canonical).as_path().to_path_buf();
                 }
             }
             watcher.add(&target).ok();
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 6ad03ba6df..07374b7f40 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -42,7 +42,7 @@ impl Drop for FsWatcher {
 
 impl Watcher for FsWatcher {
     fn add(&self, path: &std::path::Path) -> anyhow::Result<()> {
-        let root_path = SanitizedPath::from(path);
+        let root_path = SanitizedPath::new_arc(path);
 
         let tx = self.tx.clone();
         let pending_paths = self.pending_path_events.clone();
@@ -70,7 +70,7 @@ impl Watcher for FsWatcher {
                             .paths
                             .iter()
                             .filter_map(|event_path| {
-                                let event_path = SanitizedPath::from(event_path);
+                                let event_path = SanitizedPath::new(event_path);
                                 event_path.starts_with(&root_path).then(|| PathEvent {
                                     path: event_path.as_path().to_path_buf(),
                                     kind,
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index 5ac2be2f23..3a6ccff90f 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -851,7 +851,7 @@ fn file_save_dialog(
     if !directory.to_string_lossy().is_empty()
         && let Some(full_path) = directory.canonicalize().log_err()
     {
-        let full_path = SanitizedPath::from(full_path);
+        let full_path = SanitizedPath::new(&full_path);
         let full_path_string = full_path.to_string();
         let path_item: IShellItem =
             unsafe { SHCreateItemFromParsingName(&HSTRING::from(full_path_string), None)? };
diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs
index aab0354c96..c2c3c89305 100644
--- a/crates/paths/src/paths.rs
+++ b/crates/paths/src/paths.rs
@@ -63,7 +63,7 @@ pub fn set_custom_data_dir(dir: &str) -> &'static PathBuf {
             let abs_path = path
                 .canonicalize()
                 .expect("failed to canonicalize custom data directory's path to an absolute path");
-            path = PathBuf::from(util::paths::SanitizedPath::from(abs_path))
+            path = util::paths::SanitizedPath::new(&abs_path).into()
         }
         std::fs::create_dir_all(&path).expect("failed to create custom data directory");
         path
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index a1c0508c3e..b7ff3e7fef 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -62,7 +62,7 @@ use std::{
 };
 use sum_tree::{Edit, SumTree, TreeSet};
 use text::{Bias, BufferId};
-use util::{ResultExt, debug_panic, post_inc};
+use util::{ResultExt, debug_panic, paths::SanitizedPath, post_inc};
 use worktree::{
     File, PathChange, PathKey, PathProgress, PathSummary, PathTarget, ProjectEntryId,
     UpdatedGitRepositoriesSet, UpdatedGitRepository, Worktree,
@@ -3234,6 +3234,7 @@ impl Repository {
         let git_store = self.git_store.upgrade()?;
         let worktree_store = git_store.read(cx).worktree_store.read(cx);
         let abs_path = self.snapshot.work_directory_abs_path.join(&path.0);
+        let abs_path = SanitizedPath::new(&abs_path);
         let (worktree, relative_path) = worktree_store.find_worktree(abs_path, cx)?;
         Some(ProjectPath {
             worktree_id: worktree.read(cx).id(),
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index d11e567996..b4c7c0bc37 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3186,7 +3186,7 @@ impl LocalLspStore {
             } else {
                 let (path, pattern) = match &watcher.glob_pattern {
                     lsp::GlobPattern::String(s) => {
-                        let watcher_path = SanitizedPath::from(s);
+                        let watcher_path = SanitizedPath::new(s);
                         let path = glob_literal_prefix(watcher_path.as_path());
                         let pattern = watcher_path
                             .as_path()
@@ -3278,7 +3278,7 @@ impl LocalLspStore {
             let worktree_root_path = tree.abs_path();
             match &watcher.glob_pattern {
                 lsp::GlobPattern::String(s) => {
-                    let watcher_path = SanitizedPath::from(s);
+                    let watcher_path = SanitizedPath::new(s);
                     let relative = watcher_path
                         .as_path()
                         .strip_prefix(&worktree_root_path)
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 86b2e08d62..68e04cfd3b 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2061,13 +2061,12 @@ impl Project {
         exclude_sub_dirs: bool,
         cx: &App,
     ) -> Option<bool> {
-        let sanitized_path = SanitizedPath::from(path);
-        let path = sanitized_path.as_path();
+        let path = SanitizedPath::new(path).as_path();
         self.worktrees(cx)
             .filter_map(|worktree| {
                 let worktree = worktree.read(cx);
                 let abs_path = worktree.as_local()?.abs_path();
-                let contains = path == abs_path
+                let contains = path == abs_path.as_ref()
                     || (path.starts_with(abs_path) && (!exclude_sub_dirs || !metadata.is_dir));
                 contains.then(|| worktree.is_visible())
             })
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index 9033415ca4..b814e46bd1 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -61,7 +61,7 @@ pub struct WorktreeStore {
     worktrees_reordered: bool,
     #[allow(clippy::type_complexity)]
     loading_worktrees:
-        HashMap<SanitizedPath, Shared<Task<Result<Entity<Worktree>, Arc<anyhow::Error>>>>>,
+        HashMap<Arc<SanitizedPath>, Shared<Task<Result<Entity<Worktree>, Arc<anyhow::Error>>>>>,
     state: WorktreeStoreState,
 }
 
@@ -153,10 +153,10 @@ impl WorktreeStore {
 
     pub fn find_worktree(
         &self,
-        abs_path: impl Into<SanitizedPath>,
+        abs_path: impl AsRef<Path>,
         cx: &App,
     ) -> Option<(Entity<Worktree>, PathBuf)> {
-        let abs_path: SanitizedPath = abs_path.into();
+        let abs_path = SanitizedPath::new(&abs_path);
         for tree in self.worktrees() {
             if let Ok(relative_path) = abs_path.as_path().strip_prefix(tree.read(cx).abs_path()) {
                 return Some((tree.clone(), relative_path.into()));
@@ -212,11 +212,11 @@ impl WorktreeStore {
 
     pub fn create_worktree(
         &mut self,
-        abs_path: impl Into<SanitizedPath>,
+        abs_path: impl AsRef<Path>,
         visible: bool,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Worktree>>> {
-        let abs_path: SanitizedPath = abs_path.into();
+        let abs_path: Arc<SanitizedPath> = SanitizedPath::new_arc(&abs_path);
         if !self.loading_worktrees.contains_key(&abs_path) {
             let task = match &self.state {
                 WorktreeStoreState::Remote {
@@ -227,8 +227,7 @@ impl WorktreeStore {
                     if upstream_client.is_via_collab() {
                         Task::ready(Err(Arc::new(anyhow!("cannot create worktrees via collab"))))
                     } else {
-                        let abs_path =
-                            RemotePathBuf::new(abs_path.as_path().to_path_buf(), *path_style);
+                        let abs_path = RemotePathBuf::new(abs_path.to_path_buf(), *path_style);
                         self.create_ssh_worktree(upstream_client.clone(), abs_path, visible, cx)
                     }
                 }
@@ -321,15 +320,21 @@ impl WorktreeStore {
     fn create_local_worktree(
         &mut self,
         fs: Arc<dyn Fs>,
-        abs_path: impl Into<SanitizedPath>,
+        abs_path: Arc<SanitizedPath>,
         visible: bool,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Worktree>, Arc<anyhow::Error>>> {
         let next_entry_id = self.next_entry_id.clone();
-        let path: SanitizedPath = abs_path.into();
 
         cx.spawn(async move |this, cx| {
-            let worktree = Worktree::local(path.clone(), visible, fs, next_entry_id, cx).await;
+            let worktree = Worktree::local(
+                SanitizedPath::cast_arc(abs_path.clone()),
+                visible,
+                fs,
+                next_entry_id,
+                cx,
+            )
+            .await;
 
             let worktree = worktree?;
 
@@ -337,7 +342,7 @@ impl WorktreeStore {
 
             if visible {
                 cx.update(|cx| {
-                    cx.add_recent_document(path.as_path());
+                    cx.add_recent_document(abs_path.as_path());
                 })
                 .log_err();
             }
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 750fc6dc58..0036a687a6 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -902,7 +902,7 @@ impl SshRemoteConnection {
             // On Windows, the binding needs to be set to the canonical path
             #[cfg(target_os = "windows")]
             let src =
-                SanitizedPath::from(smol::fs::canonicalize("./target").await?).to_glob_string();
+                SanitizedPath::new(&smol::fs::canonicalize("./target").await?).to_glob_string();
             #[cfg(not(target_os = "windows"))]
             let src = "./target";
             run_cmd(
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 1192b14812..318900d540 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -3,6 +3,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::{Display, Formatter};
+use std::mem;
 use std::path::StripPrefixError;
 use std::sync::{Arc, OnceLock};
 use std::{
@@ -99,21 +100,86 @@ impl<T: AsRef<Path>> PathExt for T {
     }
 }
 
-/// Due to the issue of UNC paths on Windows, which can cause bugs in various parts of Zed, introducing this `SanitizedPath`
-/// leverages Rust's type system to ensure that all paths entering Zed are always "sanitized" by removing the `\\\\?\\` prefix.
-/// On non-Windows operating systems, this struct is effectively a no-op.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SanitizedPath(pub Arc<Path>);
+/// In memory, this is identical to `Path`. On non-Windows conversions to this type are no-ops. On
+/// windows, these conversions sanitize UNC paths by removing the `\\\\?\\` prefix.
+#[derive(Eq, PartialEq, Hash, Ord, PartialOrd)]
+#[repr(transparent)]
+pub struct SanitizedPath(Path);
 
 impl SanitizedPath {
-    pub fn starts_with(&self, prefix: &SanitizedPath) -> bool {
+    pub fn new<T: AsRef<Path> + ?Sized>(path: &T) -> &Self {
+        #[cfg(not(target_os = "windows"))]
+        return Self::unchecked_new(path.as_ref());
+
+        #[cfg(target_os = "windows")]
+        return Self::unchecked_new(dunce::simplified(path.as_ref()));
+    }
+
+    pub fn unchecked_new<T: AsRef<Path> + ?Sized>(path: &T) -> &Self {
+        // safe because `Path` and `SanitizedPath` have the same repr and Drop impl
+        unsafe { mem::transmute::<&Path, &Self>(path.as_ref()) }
+    }
+
+    pub fn from_arc(path: Arc<Path>) -> Arc<Self> {
+        // safe because `Path` and `SanitizedPath` have the same repr and Drop impl
+        #[cfg(not(target_os = "windows"))]
+        return unsafe { mem::transmute::<Arc<Path>, Arc<Self>>(path) };
+
+        // TODO: could avoid allocating here if dunce::simplified results in the same path
+        #[cfg(target_os = "windows")]
+        return Self::new(&path).into();
+    }
+
+    pub fn new_arc<T: AsRef<Path> + ?Sized>(path: &T) -> Arc<Self> {
+        Self::new(path).into()
+    }
+
+    pub fn cast_arc(path: Arc<Self>) -> Arc<Path> {
+        // safe because `Path` and `SanitizedPath` have the same repr and Drop impl
+        unsafe { mem::transmute::<Arc<Self>, Arc<Path>>(path) }
+    }
+
+    pub fn cast_arc_ref(path: &Arc<Self>) -> &Arc<Path> {
+        // safe because `Path` and `SanitizedPath` have the same repr and Drop impl
+        unsafe { mem::transmute::<&Arc<Self>, &Arc<Path>>(path) }
+    }
+
+    pub fn starts_with(&self, prefix: &Self) -> bool {
         self.0.starts_with(&prefix.0)
     }
 
-    pub fn as_path(&self) -> &Arc<Path> {
+    pub fn as_path(&self) -> &Path {
         &self.0
     }
 
+    pub fn file_name(&self) -> Option<&std::ffi::OsStr> {
+        self.0.file_name()
+    }
+
+    pub fn extension(&self) -> Option<&std::ffi::OsStr> {
+        self.0.extension()
+    }
+
+    pub fn join<P: AsRef<Path>>(&self, path: P) -> PathBuf {
+        self.0.join(path)
+    }
+
+    pub fn parent(&self) -> Option<&Self> {
+        self.0.parent().map(Self::unchecked_new)
+    }
+
+    pub fn strip_prefix(&self, base: &Self) -> Result<&Path, StripPrefixError> {
+        self.0.strip_prefix(base.as_path())
+    }
+
+    pub fn to_str(&self) -> Option<&str> {
+        self.0.to_str()
+    }
+
+    pub fn to_path_buf(&self) -> PathBuf {
+        self.0.to_path_buf()
+    }
+
     pub fn to_glob_string(&self) -> String {
         #[cfg(target_os = "windows")]
         {
@@ -124,13 +190,11 @@ impl SanitizedPath {
             self.0.to_string_lossy().to_string()
         }
     }
+}
 
-    pub fn join(&self, path: &Self) -> Self {
-        self.0.join(&path.0).into()
-    }
-
-    pub fn strip_prefix(&self, base: &Self) -> Result<&Path, StripPrefixError> {
-        self.0.strip_prefix(base.as_path())
+impl std::fmt::Debug for SanitizedPath {
+    fn fmt(&self, formatter: &mut Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Debug::fmt(&self.0, formatter)
     }
 }
 
@@ -140,29 +204,23 @@ impl Display for SanitizedPath {
     }
 }
 
-impl From<SanitizedPath> for Arc<Path> {
-    fn from(sanitized_path: SanitizedPath) -> Self {
-        sanitized_path.0
+impl From<&SanitizedPath> for Arc<SanitizedPath> {
+    fn from(sanitized_path: &SanitizedPath) -> Self {
+        let path: Arc<Path> = sanitized_path.0.into();
+        // safe because `Path` and `SanitizedPath` have the same repr and Drop impl
+        unsafe { mem::transmute(path) }
     }
 }
 
-impl From<SanitizedPath> for PathBuf {
-    fn from(sanitized_path: SanitizedPath) -> Self {
-        sanitized_path.0.as_ref().into()
+impl From<&SanitizedPath> for PathBuf {
+    fn from(sanitized_path: &SanitizedPath) -> Self {
+        sanitized_path.as_path().into()
     }
 }
 
-impl<T: AsRef<Path>> From<T> for SanitizedPath {
-    #[cfg(not(target_os = "windows"))]
-    fn from(path: T) -> Self {
-        let path = path.as_ref();
-        SanitizedPath(path.into())
-    }
-
-    #[cfg(target_os = "windows")]
-    fn from(path: T) -> Self {
-        let path = path.as_ref();
-        SanitizedPath(dunce::simplified(path).into())
+impl AsRef<Path> for SanitizedPath {
+    fn as_ref(&self) -> &Path {
+        &self.0
     }
 }
 
@@ -1195,14 +1253,14 @@ mod tests {
     #[cfg(target_os = "windows")]
     fn test_sanitized_path() {
         let path = Path::new("C:\\Users\\someone\\test_file.rs");
-        let sanitized_path = SanitizedPath::from(path);
+        let sanitized_path = SanitizedPath::new(path);
         assert_eq!(
             sanitized_path.to_string(),
             "C:\\Users\\someone\\test_file.rs"
         );
 
         let path = Path::new("\\\\?\\C:\\Users\\someone\\test_file.rs");
-        let sanitized_path = SanitizedPath::from(path);
+        let sanitized_path = SanitizedPath::new(path);
         assert_eq!(
             sanitized_path.to_string(),
             "C:\\Users\\someone\\test_file.rs"
diff --git a/crates/workspace/src/path_list.rs b/crates/workspace/src/path_list.rs
index cf463e6b22..01e2ffda94 100644
--- a/crates/workspace/src/path_list.rs
+++ b/crates/workspace/src/path_list.rs
@@ -26,7 +26,7 @@ impl PathList {
         let mut indexed_paths: Vec<(usize, PathBuf)> = paths
             .iter()
             .enumerate()
-            .map(|(ix, path)| (ix, SanitizedPath::from(path).into()))
+            .map(|(ix, path)| (ix, SanitizedPath::new(path).into()))
             .collect();
         indexed_paths.sort_by(|(_, a), (_, b)| a.cmp(b));
         let order = indexed_paths.iter().map(|e| e.0).collect::<Vec<_>>().into();
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 76693e716e..0f119c1400 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2576,7 +2576,7 @@ impl Workspace {
                 };
 
                 let this = this.clone();
-                let abs_path: Arc<Path> = SanitizedPath::from(abs_path.clone()).into();
+                let abs_path: Arc<Path> = SanitizedPath::new(&abs_path).as_path().into();
                 let fs = fs.clone();
                 let pane = pane.clone();
                 let task = cx.spawn(async move |cx| {
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 845af53802..711c99ce28 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -158,7 +158,7 @@ pub struct RemoteWorktree {
 #[derive(Clone)]
 pub struct Snapshot {
     id: WorktreeId,
-    abs_path: SanitizedPath,
+    abs_path: Arc<SanitizedPath>,
     root_name: String,
     root_char_bag: CharBag,
     entries_by_path: SumTree<Entry>,
@@ -457,7 +457,7 @@ enum ScanState {
         scanning: bool,
     },
     RootUpdated {
-        new_path: Option<SanitizedPath>,
+        new_path: Option<Arc<SanitizedPath>>,
     },
 }
 
@@ -763,8 +763,8 @@ impl Worktree {
 
     pub fn abs_path(&self) -> Arc<Path> {
         match self {
-            Worktree::Local(worktree) => worktree.abs_path.clone().into(),
-            Worktree::Remote(worktree) => worktree.abs_path.clone().into(),
+            Worktree::Local(worktree) => SanitizedPath::cast_arc(worktree.abs_path.clone()),
+            Worktree::Remote(worktree) => SanitizedPath::cast_arc(worktree.abs_path.clone()),
         }
     }
 
@@ -1813,7 +1813,7 @@ impl LocalWorktree {
                         // Otherwise, the FS watcher would do it on the `RootUpdated` event,
                         // but with a noticeable delay, so we handle it proactively.
                         local.update_abs_path_and_refresh(
-                            Some(SanitizedPath::from(abs_path.clone())),
+                            Some(SanitizedPath::new_arc(&abs_path)),
                             cx,
                         );
                         Task::ready(Ok(this.root_entry().cloned()))
@@ -2090,7 +2090,7 @@ impl LocalWorktree {
 
     fn update_abs_path_and_refresh(
         &mut self,
-        new_path: Option<SanitizedPath>,
+        new_path: Option<Arc<SanitizedPath>>,
         cx: &Context<Worktree>,
     ) {
         if let Some(new_path) = new_path {
@@ -2340,7 +2340,7 @@ impl Snapshot {
     pub fn new(id: u64, root_name: String, abs_path: Arc<Path>) -> Self {
         Snapshot {
             id: WorktreeId::from_usize(id as usize),
-            abs_path: abs_path.into(),
+            abs_path: SanitizedPath::from_arc(abs_path),
             root_char_bag: root_name.chars().map(|c| c.to_ascii_lowercase()).collect(),
             root_name,
             always_included_entries: Default::default(),
@@ -2368,7 +2368,7 @@ impl Snapshot {
     //
     // This is definitely a bug, but it's not clear if we should handle it here or not.
     pub fn abs_path(&self) -> &Arc<Path> {
-        self.abs_path.as_path()
+        SanitizedPath::cast_arc_ref(&self.abs_path)
     }
 
     fn build_initial_update(&self, project_id: u64, worktree_id: u64) -> proto::UpdateWorktree {
@@ -2464,7 +2464,7 @@ impl Snapshot {
         Some(removed_entry.path)
     }
 
-    fn update_abs_path(&mut self, abs_path: SanitizedPath, root_name: String) {
+    fn update_abs_path(&mut self, abs_path: Arc<SanitizedPath>, root_name: String) {
         self.abs_path = abs_path;
         if root_name != self.root_name {
             self.root_char_bag = root_name.chars().map(|c| c.to_ascii_lowercase()).collect();
@@ -2483,7 +2483,7 @@ impl Snapshot {
             update.removed_entries.len()
         );
         self.update_abs_path(
-            SanitizedPath::from(PathBuf::from_proto(update.abs_path)),
+            SanitizedPath::new_arc(&PathBuf::from_proto(update.abs_path)),
             update.root_name,
         );
 
@@ -3849,7 +3849,11 @@ impl BackgroundScanner {
                     root_entry.is_ignored = true;
                     state.insert_entry(root_entry.clone(), self.fs.as_ref(), self.watcher.as_ref());
                 }
-                state.enqueue_scan_dir(root_abs_path.into(), &root_entry, &scan_job_tx);
+                state.enqueue_scan_dir(
+                    SanitizedPath::cast_arc(root_abs_path),
+                    &root_entry,
+                    &scan_job_tx,
+                );
             }
         };
 
@@ -3930,8 +3934,9 @@ impl BackgroundScanner {
         self.forcibly_load_paths(&request.relative_paths).await;
 
         let root_path = self.state.lock().snapshot.abs_path.clone();
-        let root_canonical_path = match self.fs.canonicalize(root_path.as_path()).await {
-            Ok(path) => SanitizedPath::from(path),
+        let root_canonical_path = self.fs.canonicalize(root_path.as_path()).await;
+        let root_canonical_path = match &root_canonical_path {
+            Ok(path) => SanitizedPath::new(path),
             Err(err) => {
                 log::error!("failed to canonicalize root path {root_path:?}: {err}");
                 return true;
@@ -3959,8 +3964,8 @@ impl BackgroundScanner {
         }
 
         self.reload_entries_for_paths(
-            root_path,
-            root_canonical_path,
+            &root_path,
+            &root_canonical_path,
             &request.relative_paths,
             abs_paths,
             None,
@@ -3972,8 +3977,9 @@ impl BackgroundScanner {
 
     async fn process_events(&self, mut abs_paths: Vec<PathBuf>) {
         let root_path = self.state.lock().snapshot.abs_path.clone();
-        let root_canonical_path = match self.fs.canonicalize(root_path.as_path()).await {
-            Ok(path) => SanitizedPath::from(path),
+        let root_canonical_path = self.fs.canonicalize(root_path.as_path()).await;
+        let root_canonical_path = match &root_canonical_path {
+            Ok(path) => SanitizedPath::new(path),
             Err(err) => {
                 let new_path = self
                     .state
@@ -3982,7 +3988,7 @@ impl BackgroundScanner {
                     .root_file_handle
                     .clone()
                     .and_then(|handle| handle.current_path(&self.fs).log_err())
-                    .map(SanitizedPath::from)
+                    .map(|path| SanitizedPath::new_arc(&path))
                     .filter(|new_path| *new_path != root_path);
 
                 if let Some(new_path) = new_path.as_ref() {
@@ -4011,7 +4017,7 @@ impl BackgroundScanner {
         abs_paths.sort_unstable();
         abs_paths.dedup_by(|a, b| a.starts_with(b));
         abs_paths.retain(|abs_path| {
-            let abs_path = SanitizedPath::from(abs_path);
+            let abs_path = &SanitizedPath::new(abs_path);
 
             let snapshot = &self.state.lock().snapshot;
             {
@@ -4054,7 +4060,7 @@ impl BackgroundScanner {
                         return false;
                     };
 
-                if abs_path.0.file_name() == Some(*GITIGNORE) {
+                if abs_path.file_name() == Some(*GITIGNORE) {
                     for (_, repo) in snapshot.git_repositories.iter().filter(|(_, repo)| repo.directory_contains(&relative_path)) {
                         if !dot_git_abs_paths.iter().any(|dot_git_abs_path| dot_git_abs_path == repo.common_dir_abs_path.as_ref()) {
                             dot_git_abs_paths.push(repo.common_dir_abs_path.to_path_buf());
@@ -4093,8 +4099,8 @@ impl BackgroundScanner {
         let (scan_job_tx, scan_job_rx) = channel::unbounded();
         log::debug!("received fs events {:?}", relative_paths);
         self.reload_entries_for_paths(
-            root_path,
-            root_canonical_path,
+            &root_path,
+            &root_canonical_path,
             &relative_paths,
             abs_paths,
             Some(scan_job_tx.clone()),
@@ -4441,8 +4447,8 @@ impl BackgroundScanner {
     /// All list arguments should be sorted before calling this function
     async fn reload_entries_for_paths(
         &self,
-        root_abs_path: SanitizedPath,
-        root_canonical_path: SanitizedPath,
+        root_abs_path: &SanitizedPath,
+        root_canonical_path: &SanitizedPath,
         relative_paths: &[Arc<Path>],
         abs_paths: Vec<PathBuf>,
         scan_queue_tx: Option<Sender<ScanJob>>,
@@ -4470,7 +4476,7 @@ impl BackgroundScanner {
                             }
                         }
 
-                        anyhow::Ok(Some((metadata, SanitizedPath::from(canonical_path))))
+                        anyhow::Ok(Some((metadata, SanitizedPath::new_arc(&canonical_path))))
                     } else {
                         Ok(None)
                     }

From 8697b91ea09e612b5d5c088b5fe548fa8c1084c0 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 28 Aug 2025 15:33:00 -0400
Subject: [PATCH 443/823] acp: Automatically install gemini under Zed's data
 dir (#37054)

Closes: https://github.com/zed-industries/zed/issues/37089

Instead of looking for the gemini command on `$PATH`, by default we'll
install our own copy on demand under our data dir, as we already do for
language servers and debug adapters. This also means we can handle
keeping the binary up to date instead of prompting the user to upgrade.

Notes:

- The download is only triggered if you open a new Gemini thread
- Custom commands from `agent_servers.gemini` in settings are respected
as before
- A new `agent_servers.gemini.ignore_system_version` setting is added,
similar to the existing settings for language servers. It's `true` by
default, and setting it to `false` disables the automatic download and
makes Zed search `$PATH` as before.
- If `agent_servers.gemini.ignore_system_version` is `false` and no
binary is found on `$PATH`, we'll fall back to automatic installation.
If it's `false` and a binary is found, but the version is older than
v0.2.1, we'll show an error.

Release Notes:

- acp: By default, Zed will now download and use a private copy of the
Gemini CLI binary, instead of searching your `$PATH`. To make Zed search
your `$PATH` for Gemini CLI before attempting to download it, use the
following setting:

```
{
  "agent_servers": {
    "gemini": {
      "ignore_system_version": false
    }
  }
}
```
---
 Cargo.lock                                 |   1 +
 crates/acp_thread/src/acp_thread.rs        |  13 +-
 crates/agent2/src/native_agent_server.rs   |  19 +-
 crates/agent_servers/Cargo.toml            |   5 +-
 crates/agent_servers/src/agent_servers.rs  | 146 +++++++++++---
 crates/agent_servers/src/claude.rs         |  19 +-
 crates/agent_servers/src/custom.rs         |  26 +--
 crates/agent_servers/src/e2e_tests.rs      |  14 +-
 crates/agent_servers/src/gemini.rs         |  64 +++---
 crates/agent_servers/src/settings.rs       |  56 +++++-
 crates/agent_ui/src/acp/message_editor.rs  |   5 +-
 crates/agent_ui/src/acp/thread_view.rs     | 217 +++++++--------------
 crates/agent_ui/src/agent_configuration.rs | 151 +++-----------
 crates/agent_ui/src/agent_panel.rs         |  17 +-
 crates/agent_ui/src/agent_ui.rs            |   8 +-
 15 files changed, 331 insertions(+), 430 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ecd8b42c7..0e3bfd18c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,6 +306,7 @@ dependencies = [
  "libc",
  "log",
  "nix 0.29.0",
+ "node_runtime",
  "paths",
  "project",
  "rand 0.8.5",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 0da4b43394..04ff032ad4 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -789,11 +789,12 @@ pub enum ThreadStatus {
 
 #[derive(Debug, Clone)]
 pub enum LoadError {
-    NotInstalled,
     Unsupported {
         command: SharedString,
         current_version: SharedString,
+        minimum_version: SharedString,
     },
+    FailedToInstall(SharedString),
     Exited {
         status: ExitStatus,
     },
@@ -803,15 +804,19 @@ pub enum LoadError {
 impl Display for LoadError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            LoadError::NotInstalled => write!(f, "not installed"),
             LoadError::Unsupported {
                 command: path,
                 current_version,
+                minimum_version,
             } => {
-                write!(f, "version {current_version} from {path} is not supported")
+                write!(
+                    f,
+                    "version {current_version} from {path} is not supported (need at least {minimum_version})"
+                )
             }
+            LoadError::FailedToInstall(msg) => write!(f, "Failed to install: {msg}"),
             LoadError::Exited { status } => write!(f, "Server exited with status {status}"),
-            LoadError::Other(msg) => write!(f, "{}", msg),
+            LoadError::Other(msg) => write!(f, "{msg}"),
         }
     }
 }
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 0079dcc572..030d2cce74 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -1,10 +1,9 @@
 use std::{any::Any, path::Path, rc::Rc, sync::Arc};
 
-use agent_servers::AgentServer;
+use agent_servers::{AgentServer, AgentServerDelegate};
 use anyhow::Result;
 use fs::Fs;
 use gpui::{App, Entity, SharedString, Task};
-use project::Project;
 use prompt_store::PromptStore;
 
 use crate::{HistoryStore, NativeAgent, NativeAgentConnection, templates::Templates};
@@ -30,33 +29,21 @@ impl AgentServer for NativeAgentServer {
         "Zed Agent".into()
     }
 
-    fn empty_state_headline(&self) -> SharedString {
-        self.name()
-    }
-
-    fn empty_state_message(&self) -> SharedString {
-        "".into()
-    }
-
     fn logo(&self) -> ui::IconName {
         ui::IconName::ZedAgent
     }
 
-    fn install_command(&self) -> Option<&'static str> {
-        None
-    }
-
     fn connect(
         &self,
         _root_dir: &Path,
-        project: &Entity<Project>,
+        delegate: AgentServerDelegate,
         cx: &mut App,
     ) -> Task<Result<Rc<dyn acp_thread::AgentConnection>>> {
         log::debug!(
             "NativeAgentServer::connect called for path: {:?}",
             _root_dir
         );
-        let project = project.clone();
+        let project = delegate.project().clone();
         let fs = self.fs.clone();
         let history = self.history.clone();
         let prompt_store = PromptStore::global(cx);
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 9f90f3a78a..3e6bae104c 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -6,7 +6,7 @@ publish.workspace = true
 license = "GPL-3.0-or-later"
 
 [features]
-test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support", "dep:env_logger", "fs", "client/test-support", "dep:gpui_tokio", "reqwest_client/test-support"]
+test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support", "dep:env_logger", "client/test-support", "dep:gpui_tokio", "reqwest_client/test-support"]
 e2e = []
 
 [lints]
@@ -27,7 +27,7 @@ client = { workspace = true, optional = true }
 collections.workspace = true
 context_server.workspace = true
 env_logger = { workspace = true, optional = true }
-fs = { workspace = true, optional = true }
+fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 gpui_tokio = { workspace = true, optional = true }
@@ -37,6 +37,7 @@ language.workspace = true
 language_model.workspace = true
 language_models.workspace = true
 log.workspace = true
+node_runtime.workspace = true
 paths.workspace = true
 project.workspace = true
 rand.workspace = true
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index dc7d75c52d..e5d954b071 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -13,12 +13,19 @@ pub use gemini::*;
 pub use settings::*;
 
 use acp_thread::AgentConnection;
+use acp_thread::LoadError;
 use anyhow::Result;
+use anyhow::anyhow;
+use anyhow::bail;
 use collections::HashMap;
+use gpui::AppContext as _;
 use gpui::{App, AsyncApp, Entity, SharedString, Task};
+use node_runtime::VersionStrategy;
 use project::Project;
 use schemars::JsonSchema;
+use semver::Version;
 use serde::{Deserialize, Serialize};
+use std::str::FromStr as _;
 use std::{
     any::Any,
     path::{Path, PathBuf},
@@ -31,23 +38,118 @@ pub fn init(cx: &mut App) {
     settings::init(cx);
 }
 
+pub struct AgentServerDelegate {
+    project: Entity<Project>,
+    status_tx: watch::Sender<SharedString>,
+}
+
+impl AgentServerDelegate {
+    pub fn new(project: Entity<Project>, status_tx: watch::Sender<SharedString>) -> Self {
+        Self { project, status_tx }
+    }
+
+    pub fn project(&self) -> &Entity<Project> {
+        &self.project
+    }
+
+    fn get_or_npm_install_builtin_agent(
+        self,
+        binary_name: SharedString,
+        package_name: SharedString,
+        entrypoint_path: PathBuf,
+        settings: Option<BuiltinAgentServerSettings>,
+        minimum_version: Option<Version>,
+        cx: &mut App,
+    ) -> Task<Result<AgentServerCommand>> {
+        if let Some(settings) = &settings
+            && let Some(command) = settings.clone().custom_command()
+        {
+            return Task::ready(Ok(command));
+        }
+
+        let project = self.project;
+        let fs = project.read(cx).fs().clone();
+        let Some(node_runtime) = project.read(cx).node_runtime().cloned() else {
+            return Task::ready(Err(anyhow!("Missing node runtime")));
+        };
+        let mut status_tx = self.status_tx;
+
+        cx.spawn(async move |cx| {
+            if let Some(settings) = settings && !settings.ignore_system_version.unwrap_or(true) {
+                if let Some(bin) = find_bin_in_path(binary_name.clone(), &project, cx).await {
+                    return Ok(AgentServerCommand { path: bin, args: Vec::new(), env: Default::default() })
+                }
+            }
+
+            cx.background_spawn(async move {
+                let node_path = node_runtime.binary_path().await?;
+                let dir = paths::data_dir().join("external_agents").join(binary_name.as_str());
+                fs.create_dir(&dir).await?;
+                let local_executable_path = dir.join(entrypoint_path);
+                let command = AgentServerCommand {
+                    path: node_path,
+                    args: vec![local_executable_path.to_string_lossy().to_string()],
+                    env: Default::default(),
+                };
+
+                let installed_version = node_runtime
+                    .npm_package_installed_version(&dir, &package_name)
+                    .await?
+                    .filter(|version| {
+                        Version::from_str(&version)
+                            .is_ok_and(|version| Some(version) >= minimum_version)
+                    });
+
+                status_tx.send("Checking for latest version…".into())?;
+                let latest_version = match node_runtime.npm_package_latest_version(&package_name).await
+                {
+                    Ok(latest_version) => latest_version,
+                    Err(e) => {
+                        if let Some(installed_version) = installed_version {
+                            log::error!("{e}");
+                            log::warn!("failed to fetch latest version of {package_name}, falling back to cached version {installed_version}");
+                            return Ok(command);
+                        } else {
+                            bail!(e);
+                        }
+                    }
+                };
+
+                let should_install = node_runtime
+                    .should_install_npm_package(
+                        &package_name,
+                        &local_executable_path,
+                        &dir,
+                        VersionStrategy::Latest(&latest_version),
+                    )
+                    .await;
+
+                if should_install {
+                    status_tx.send("Installing latest version…".into())?;
+                    node_runtime
+                        .npm_install_packages(&dir, &[(&package_name, &latest_version)])
+                        .await?;
+                }
+
+                Ok(command)
+            }).await.map_err(|e| LoadError::FailedToInstall(e.to_string().into()).into())
+        })
+    }
+}
+
 pub trait AgentServer: Send {
     fn logo(&self) -> ui::IconName;
     fn name(&self) -> SharedString;
-    fn empty_state_headline(&self) -> SharedString;
-    fn empty_state_message(&self) -> SharedString;
     fn telemetry_id(&self) -> &'static str;
 
     fn connect(
         &self,
         root_dir: &Path,
-        project: &Entity<Project>,
+        delegate: AgentServerDelegate,
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>>;
 
     fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
-
-    fn install_command(&self) -> Option<&'static str>;
 }
 
 impl dyn AgentServer {
@@ -81,15 +183,6 @@ impl std::fmt::Debug for AgentServerCommand {
     }
 }
 
-pub enum AgentServerVersion {
-    Supported,
-    Unsupported {
-        error_message: SharedString,
-        upgrade_message: SharedString,
-        upgrade_command: String,
-    },
-}
-
 #[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema)]
 pub struct AgentServerCommand {
     #[serde(rename = "command")]
@@ -104,23 +197,16 @@ impl AgentServerCommand {
         path_bin_name: &'static str,
         extra_args: &[&'static str],
         fallback_path: Option<&Path>,
-        settings: Option<AgentServerSettings>,
+        settings: Option<BuiltinAgentServerSettings>,
         project: &Entity<Project>,
         cx: &mut AsyncApp,
     ) -> Option<Self> {
-        if let Some(agent_settings) = settings {
-            Some(Self {
-                path: agent_settings.command.path,
-                args: agent_settings
-                    .command
-                    .args
-                    .into_iter()
-                    .chain(extra_args.iter().map(|arg| arg.to_string()))
-                    .collect(),
-                env: agent_settings.command.env,
-            })
+        if let Some(settings) = settings
+            && let Some(command) = settings.custom_command()
+        {
+            Some(command)
         } else {
-            match find_bin_in_path(path_bin_name, project, cx).await {
+            match find_bin_in_path(path_bin_name.into(), project, cx).await {
                 Some(path) => Some(Self {
                     path,
                     args: extra_args.iter().map(|arg| arg.to_string()).collect(),
@@ -143,7 +229,7 @@ impl AgentServerCommand {
 }
 
 async fn find_bin_in_path(
-    bin_name: &'static str,
+    bin_name: SharedString,
     project: &Entity<Project>,
     cx: &mut AsyncApp,
 ) -> Option<PathBuf> {
@@ -173,11 +259,11 @@ async fn find_bin_in_path(
     cx.background_executor()
         .spawn(async move {
             let which_result = if cfg!(windows) {
-                which::which(bin_name)
+                which::which(bin_name.as_str())
             } else {
                 let env = env_task.await.unwrap_or_default();
                 let shell_path = env.get("PATH").cloned();
-                which::which_in(bin_name, shell_path.as_ref(), root_dir.as_ref())
+                which::which_in(bin_name.as_str(), shell_path.as_ref(), root_dir.as_ref())
             };
 
             if let Err(which::Error::CannotFindBinaryPath) = which_result {
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 3a16b0601a..b183219148 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -36,7 +36,7 @@ use util::{ResultExt, debug_panic};
 
 use crate::claude::mcp_server::{ClaudeZedMcpServer, McpConfig};
 use crate::claude::tools::ClaudeTool;
-use crate::{AgentServer, AgentServerCommand, AllAgentServersSettings};
+use crate::{AgentServer, AgentServerCommand, AgentServerDelegate, AllAgentServersSettings};
 use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri};
 
 #[derive(Clone)]
@@ -51,26 +51,14 @@ impl AgentServer for ClaudeCode {
         "Claude Code".into()
     }
 
-    fn empty_state_headline(&self) -> SharedString {
-        self.name()
-    }
-
-    fn empty_state_message(&self) -> SharedString {
-        "How can I help you today?".into()
-    }
-
     fn logo(&self) -> ui::IconName {
         ui::IconName::AiClaude
     }
 
-    fn install_command(&self) -> Option<&'static str> {
-        Some("npm install -g @anthropic-ai/claude-code@latest")
-    }
-
     fn connect(
         &self,
         _root_dir: &Path,
-        _project: &Entity<Project>,
+        _delegate: AgentServerDelegate,
         _cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let connection = ClaudeAgentConnection {
@@ -112,7 +100,7 @@ impl AgentConnection for ClaudeAgentConnection {
             )
             .await
             else {
-                return Err(LoadError::NotInstalled.into());
+                return Err(anyhow!("Failed to find Claude Code binary"));
             };
 
             let api_key =
@@ -232,6 +220,7 @@ impl AgentConnection for ClaudeAgentConnection {
                                     LoadError::Unsupported {
                                         command: command.path.to_string_lossy().to_string().into(),
                                         current_version: version.to_string().into(),
+                                        minimum_version: "1.0.0".into(),
                                     }
                                 } else {
                                     LoadError::Exited { status }
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 0669e0a68e..a481a850ff 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,9 +1,8 @@
-use crate::{AgentServerCommand, AgentServerSettings};
+use crate::{AgentServerCommand, AgentServerDelegate};
 use acp_thread::AgentConnection;
 use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{App, SharedString, Task};
 use language_models::provider::anthropic::AnthropicLanguageModelProvider;
-use project::Project;
 use std::{path::Path, rc::Rc};
 use ui::IconName;
 
@@ -14,11 +13,8 @@ pub struct CustomAgentServer {
 }
 
 impl CustomAgentServer {
-    pub fn new(name: SharedString, settings: &AgentServerSettings) -> Self {
-        Self {
-            name,
-            command: settings.command.clone(),
-        }
+    pub fn new(name: SharedString, command: AgentServerCommand) -> Self {
+        Self { name, command }
     }
 }
 
@@ -35,18 +31,10 @@ impl crate::AgentServer for CustomAgentServer {
         IconName::Terminal
     }
 
-    fn empty_state_headline(&self) -> SharedString {
-        "No conversations yet".into()
-    }
-
-    fn empty_state_message(&self) -> SharedString {
-        format!("Start a conversation with {}", self.name).into()
-    }
-
     fn connect(
         &self,
         root_dir: &Path,
-        _project: &Entity<Project>,
+        _delegate: AgentServerDelegate,
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let server_name = self.name();
@@ -70,10 +58,6 @@ impl crate::AgentServer for CustomAgentServer {
         })
     }
 
-    fn install_command(&self) -> Option<&'static str> {
-        None
-    }
-
     fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
         self
     }
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 42264b4b4f..d310870c23 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,4 +1,4 @@
-use crate::AgentServer;
+use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
 use agent_client_protocol as acp;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
@@ -471,12 +471,8 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
         #[cfg(test)]
         crate::AllAgentServersSettings::override_global(
             crate::AllAgentServersSettings {
-                claude: Some(crate::AgentServerSettings {
-                    command: crate::claude::tests::local_command(),
-                }),
-                gemini: Some(crate::AgentServerSettings {
-                    command: crate::gemini::tests::local_command(),
-                }),
+                claude: Some(crate::claude::tests::local_command().into()),
+                gemini: Some(crate::gemini::tests::local_command().into()),
                 custom: collections::HashMap::default(),
             },
             cx,
@@ -494,8 +490,10 @@ pub async fn new_test_thread(
     current_dir: impl AsRef<Path>,
     cx: &mut TestAppContext,
 ) -> Entity<AcpThread> {
+    let delegate = AgentServerDelegate::new(project.clone(), watch::channel("".into()).0);
+
     let connection = cx
-        .update(|cx| server.connect(current_dir.as_ref(), &project, cx))
+        .update(|cx| server.connect(current_dir.as_ref(), delegate, cx))
         .await
         .unwrap();
 
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 6d17cc0512..84dc6750b1 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -2,12 +2,11 @@ use std::rc::Rc;
 use std::{any::Any, path::Path};
 
 use crate::acp::AcpConnection;
-use crate::{AgentServer, AgentServerCommand};
+use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{App, SharedString, Task};
 use language_models::provider::google::GoogleLanguageModelProvider;
-use project::Project;
 use settings::SettingsStore;
 
 use crate::AllAgentServersSettings;
@@ -26,29 +25,16 @@ impl AgentServer for Gemini {
         "Gemini CLI".into()
     }
 
-    fn empty_state_headline(&self) -> SharedString {
-        self.name()
-    }
-
-    fn empty_state_message(&self) -> SharedString {
-        "Ask questions, edit files, run commands".into()
-    }
-
     fn logo(&self) -> ui::IconName {
         ui::IconName::AiGemini
     }
 
-    fn install_command(&self) -> Option<&'static str> {
-        Some("npm install --engine-strict -g @google/gemini-cli@latest")
-    }
-
     fn connect(
         &self,
         root_dir: &Path,
-        project: &Entity<Project>,
+        delegate: AgentServerDelegate,
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        let project = project.clone();
         let root_dir = root_dir.to_path_buf();
         let server_name = self.name();
         cx.spawn(async move |cx| {
@@ -56,12 +42,19 @@ impl AgentServer for Gemini {
                 settings.get::<AllAgentServersSettings>(None).gemini.clone()
             })?;
 
-            let Some(mut command) =
-                AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx)
-                    .await
-            else {
-                return Err(LoadError::NotInstalled.into());
-            };
+            let mut command = cx
+                .update(|cx| {
+                    delegate.get_or_npm_install_builtin_agent(
+                        Self::BINARY_NAME.into(),
+                        Self::PACKAGE_NAME.into(),
+                        format!("node_modules/{}/dist/index.js", Self::PACKAGE_NAME).into(),
+                        settings,
+                        Some("0.2.1".parse().unwrap()),
+                        cx,
+                    )
+                })?
+                .await?;
+            command.args.push("--experimental-acp".into());
 
             if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
                 command
@@ -87,12 +80,8 @@ impl AgentServer for Gemini {
                         if !connection.prompt_capabilities().image {
                             return Err(LoadError::Unsupported {
                                 current_version: current_version.into(),
-                                command: format!(
-                                    "{} {}",
-                                    command.path.to_string_lossy(),
-                                    command.args.join(" ")
-                                )
-                                .into(),
+                                command: command.path.to_string_lossy().to_string().into(),
+                                minimum_version: Self::MINIMUM_VERSION.into(),
                             }
                             .into());
                         }
@@ -114,13 +103,16 @@ impl AgentServer for Gemini {
                     let (version_output, help_output) =
                         futures::future::join(version_fut, help_fut).await;
 
-                    let current_version = String::from_utf8(version_output?.stdout)?;
+                    let current_version = std::str::from_utf8(&version_output?.stdout)?
+                        .trim()
+                        .to_string();
                     let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
 
                     if !supported {
                         return Err(LoadError::Unsupported {
                             current_version: current_version.into(),
                             command: command.path.to_string_lossy().to_string().into(),
+                            minimum_version: Self::MINIMUM_VERSION.into(),
                         }
                         .into());
                     }
@@ -136,17 +128,11 @@ impl AgentServer for Gemini {
 }
 
 impl Gemini {
-    pub fn binary_name() -> &'static str {
-        "gemini"
-    }
+    const PACKAGE_NAME: &str = "@google/gemini-cli";
 
-    pub fn install_command() -> &'static str {
-        "npm install --engine-strict -g @google/gemini-cli@latest"
-    }
+    const MINIMUM_VERSION: &str = "0.2.1";
 
-    pub fn upgrade_command() -> &'static str {
-        "npm install -g @google/gemini-cli@latest"
-    }
+    const BINARY_NAME: &str = "gemini";
 }
 
 #[cfg(test)]
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
index 96ac6e3cbe..59f3b4b540 100644
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use crate::AgentServerCommand;
 use anyhow::Result;
 use collections::HashMap;
@@ -12,16 +14,62 @@ pub fn init(cx: &mut App) {
 
 #[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug)]
 pub struct AllAgentServersSettings {
-    pub gemini: Option<AgentServerSettings>,
-    pub claude: Option<AgentServerSettings>,
+    pub gemini: Option<BuiltinAgentServerSettings>,
+    pub claude: Option<BuiltinAgentServerSettings>,
 
     /// Custom agent servers configured by the user
     #[serde(flatten)]
-    pub custom: HashMap<SharedString, AgentServerSettings>,
+    pub custom: HashMap<SharedString, CustomAgentServerSettings>,
+}
+
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
+pub struct BuiltinAgentServerSettings {
+    /// Absolute path to a binary to be used when launching this agent.
+    ///
+    /// This can be used to run a specific binary without automatic downloads or searching `$PATH`.
+    #[serde(rename = "command")]
+    pub path: Option<PathBuf>,
+    /// If a binary is specified in `command`, it will be passed these arguments.
+    pub args: Option<Vec<String>>,
+    /// If a binary is specified in `command`, it will be passed these environment variables.
+    pub env: Option<HashMap<String, String>>,
+    /// Whether to skip searching `$PATH` for an agent server binary when
+    /// launching this agent.
+    ///
+    /// This has no effect if a `command` is specified. Otherwise, when this is
+    /// `false`, Zed will search `$PATH` for an agent server binary and, if one
+    /// is found, use it for threads with this agent. If no agent binary is
+    /// found on `$PATH`, Zed will automatically install and use its own binary.
+    /// When this is `true`, Zed will not search `$PATH`, and will always use
+    /// its own binary.
+    ///
+    /// Default: true
+    pub ignore_system_version: Option<bool>,
+}
+
+impl BuiltinAgentServerSettings {
+    pub(crate) fn custom_command(self) -> Option<AgentServerCommand> {
+        self.path.map(|path| AgentServerCommand {
+            path,
+            args: self.args.unwrap_or_default(),
+            env: self.env,
+        })
+    }
+}
+
+impl From<AgentServerCommand> for BuiltinAgentServerSettings {
+    fn from(value: AgentServerCommand) -> Self {
+        BuiltinAgentServerSettings {
+            path: Some(value.path),
+            args: Some(value.args),
+            env: value.env,
+            ..Default::default()
+        }
+    }
 }
 
 #[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
-pub struct AgentServerSettings {
+pub struct CustomAgentServerSettings {
     #[serde(flatten)]
     pub command: AgentServerCommand,
 }
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 12ae893c31..f4ce2652d6 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use acp_thread::{MentionUri, selection_name};
 use agent_client_protocol as acp;
-use agent_servers::AgentServer;
+use agent_servers::{AgentServer, AgentServerDelegate};
 use agent2::HistoryStore;
 use anyhow::{Result, anyhow};
 use assistant_slash_commands::codeblock_fence_for_path;
@@ -645,7 +645,8 @@ impl MessageEditor {
             self.project.read(cx).fs().clone(),
             self.history_store.clone(),
         ));
-        let connection = server.connect(Path::new(""), &self.project, cx);
+        let delegate = AgentServerDelegate::new(self.project.clone(), watch::channel("".into()).0);
+        let connection = server.connect(Path::new(""), delegate, cx);
         cx.spawn(async move |_, cx| {
             let agent = connection.await?;
             let agent = agent.downcast::<agent2::NativeAgentConnection>().unwrap();
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 2b18ebcd1d..8069812729 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -6,7 +6,7 @@ use acp_thread::{
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, PromptCapabilities};
-use agent_servers::{AgentServer, ClaudeCode};
+use agent_servers::{AgentServer, AgentServerDelegate, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore};
 use anyhow::{Result, anyhow, bail};
@@ -46,7 +46,7 @@ use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
     Callout, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding, PopoverMenuHandle,
-    Scrollbar, ScrollbarState, SpinnerLabel, TintColor, Tooltip, prelude::*,
+    Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -285,15 +285,12 @@ pub struct AcpThreadView {
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     is_loading_contents: bool,
-    install_command_markdown: Entity<Markdown>,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
 }
 
 enum ThreadState {
-    Loading {
-        _task: Task<()>,
-    },
+    Loading(Entity<LoadingView>),
     Ready {
         thread: Entity<AcpThread>,
         title_editor: Option<Entity<Editor>>,
@@ -309,6 +306,12 @@ enum ThreadState {
     },
 }
 
+struct LoadingView {
+    title: SharedString,
+    _load_task: Task<()>,
+    _update_title_task: Task<anyhow::Result<()>>,
+}
+
 impl AcpThreadView {
     pub fn new(
         agent: Rc<dyn AgentServer>,
@@ -399,7 +402,6 @@ impl AcpThreadView {
             hovered_recent_history_item: None,
             prompt_capabilities,
             is_loading_contents: false,
-            install_command_markdown: cx.new(|cx| Markdown::new("".into(), None, None, cx)),
             _subscriptions: subscriptions,
             _cancel_task: None,
             focus_handle: cx.focus_handle(),
@@ -420,8 +422,10 @@ impl AcpThreadView {
             .next()
             .map(|worktree| worktree.read(cx).abs_path())
             .unwrap_or_else(|| paths::home_dir().as_path().into());
+        let (tx, mut rx) = watch::channel("Loading…".into());
+        let delegate = AgentServerDelegate::new(project.clone(), tx);
 
-        let connect_task = agent.connect(&root_dir, &project, cx);
+        let connect_task = agent.connect(&root_dir, delegate, cx);
         let load_task = cx.spawn_in(window, async move |this, cx| {
             let connection = match connect_task.await {
                 Ok(connection) => connection,
@@ -574,7 +578,25 @@ impl AcpThreadView {
             .log_err();
         });
 
-        ThreadState::Loading { _task: load_task }
+        let loading_view = cx.new(|cx| {
+            let update_title_task = cx.spawn(async move |this, cx| {
+                loop {
+                    let status = rx.recv().await?;
+                    this.update(cx, |this: &mut LoadingView, cx| {
+                        this.title = status;
+                        cx.notify();
+                    })?;
+                }
+            });
+
+            LoadingView {
+                title: "Loading…".into(),
+                _load_task: load_task,
+                _update_title_task: update_title_task,
+            }
+        });
+
+        ThreadState::Loading(loading_view)
     }
 
     fn handle_auth_required(
@@ -674,13 +696,15 @@ impl AcpThreadView {
         }
     }
 
-    pub fn title(&self) -> SharedString {
+    pub fn title(&self, cx: &App) -> SharedString {
         match &self.thread_state {
             ThreadState::Ready { .. } | ThreadState::Unauthenticated { .. } => "New Thread".into(),
-            ThreadState::Loading { .. } => "Loading…".into(),
+            ThreadState::Loading(loading_view) => loading_view.read(cx).title.clone(),
             ThreadState::LoadError(error) => match error {
-                LoadError::NotInstalled { .. } => format!("Install {}", self.agent.name()).into(),
                 LoadError::Unsupported { .. } => format!("Upgrade {}", self.agent.name()).into(),
+                LoadError::FailedToInstall(_) => {
+                    format!("Failed to Install {}", self.agent.name()).into()
+                }
                 LoadError::Exited { .. } => format!("{} Exited", self.agent.name()).into(),
                 LoadError::Other(_) => format!("Error Loading {}", self.agent.name()).into(),
             },
@@ -2950,18 +2974,26 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> AnyElement {
-        let (message, action_slot): (SharedString, _) = match e {
-            LoadError::NotInstalled => {
-                return self.render_not_installed(None, window, cx);
-            }
+        let (title, message, action_slot): (_, SharedString, _) = match e {
             LoadError::Unsupported {
                 command: path,
                 current_version,
+                minimum_version,
             } => {
-                return self.render_not_installed(Some((path, current_version)), window, cx);
+                return self.render_unsupported(path, current_version, minimum_version, window, cx);
             }
-            LoadError::Exited { .. } => ("Server exited with status {status}".into(), None),
+            LoadError::FailedToInstall(msg) => (
+                "Failed to Install",
+                msg.into(),
+                Some(self.create_copy_button(msg.to_string()).into_any_element()),
+            ),
+            LoadError::Exited { status } => (
+                "Failed to Launch",
+                format!("Server exited with status {status}").into(),
+                None,
+            ),
             LoadError::Other(msg) => (
+                "Failed to Launch",
                 msg.into(),
                 Some(self.create_copy_button(msg.to_string()).into_any_element()),
             ),
@@ -2970,95 +3002,34 @@ impl AcpThreadView {
         Callout::new()
             .severity(Severity::Error)
             .icon(IconName::XCircleFilled)
-            .title("Failed to Launch")
+            .title(title)
             .description(message)
             .actions_slot(div().children(action_slot))
             .into_any_element()
     }
 
-    fn install_agent(&self, window: &mut Window, cx: &mut Context<Self>) {
-        telemetry::event!("Agent Install CLI", agent = self.agent.telemetry_id());
-        let Some(install_command) = self.agent.install_command().map(|s| s.to_owned()) else {
-            return;
-        };
-        let task = self
-            .workspace
-            .update(cx, |workspace, cx| {
-                let project = workspace.project().read(cx);
-                let cwd = project.first_project_directory(cx);
-                let shell = project.terminal_settings(&cwd, cx).shell.clone();
-                let spawn_in_terminal = task::SpawnInTerminal {
-                    id: task::TaskId(install_command.clone()),
-                    full_label: install_command.clone(),
-                    label: install_command.clone(),
-                    command: Some(install_command.clone()),
-                    args: Vec::new(),
-                    command_label: install_command.clone(),
-                    cwd,
-                    env: Default::default(),
-                    use_new_terminal: true,
-                    allow_concurrent_runs: true,
-                    reveal: Default::default(),
-                    reveal_target: Default::default(),
-                    hide: Default::default(),
-                    shell,
-                    show_summary: true,
-                    show_command: true,
-                    show_rerun: false,
-                };
-                workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
-            })
-            .ok();
-        let Some(task) = task else { return };
-        cx.spawn_in(window, async move |this, cx| {
-            if let Some(Ok(_)) = task.await {
-                this.update_in(cx, |this, window, cx| {
-                    this.reset(window, cx);
-                })
-                .ok();
-            }
-        })
-        .detach()
-    }
-
-    fn render_not_installed(
+    fn render_unsupported(
         &self,
-        existing_version: Option<(&SharedString, &SharedString)>,
-        window: &mut Window,
+        path: &SharedString,
+        version: &SharedString,
+        minimum_version: &SharedString,
+        _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> AnyElement {
-        let install_command = self.agent.install_command().unwrap_or_default();
-
-        self.install_command_markdown.update(cx, |markdown, cx| {
-            if !markdown.source().contains(&install_command) {
-                markdown.replace(format!("```\n{}\n```", install_command), cx);
-            }
-        });
-
-        let (heading_label, description_label, button_label) =
-            if let Some((path, version)) = existing_version {
-                (
-                    format!("Upgrade {} to work with Zed", self.agent.name()),
-                    if version.is_empty() {
-                        format!(
-                            "Currently using {}, which does not report a valid --version",
-                            path,
-                        )
-                    } else {
-                        format!(
-                            "Currently using {}, which is only version {}",
-                            path, version
-                        )
-                    },
-                    format!("Upgrade {}", self.agent.name()),
+        let (heading_label, description_label) = (
+            format!("Upgrade {} to work with Zed", self.agent.name()),
+            if version.is_empty() {
+                format!(
+                    "Currently using {}, which does not report a valid --version",
+                    path,
                 )
             } else {
-                (
-                    format!("Get Started with {} in Zed", self.agent.name()),
-                    "Use Google's new coding agent directly in Zed.".to_string(),
-                    format!("Install {}", self.agent.name()),
+                format!(
+                    "Currently using {}, which is only version {} (need at least {minimum_version})",
+                    path, version
                 )
-            };
+            },
+        );
 
         v_flex()
             .w_full()
@@ -3078,34 +3049,6 @@ impl AcpThreadView {
                         .color(Color::Muted),
                 ),
             )
-            .child(
-                Button::new("install_gemini", button_label)
-                    .full_width()
-                    .size(ButtonSize::Medium)
-                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::TerminalGhost)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small)
-                    .icon_position(IconPosition::Start)
-                    .on_click(cx.listener(|this, _, window, cx| this.install_agent(window, cx))),
-            )
-            .child(
-                Label::new("Or, run the following command in your terminal:")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .child(MarkdownElement::new(
-                self.install_command_markdown.clone(),
-                default_markdown_style(false, false, window, cx),
-            ))
-            .when_some(existing_version, |el, (path, _)| {
-                el.child(
-                    Label::new(format!("If this does not work you will need to upgrade manually, or uninstall your existing version from {}", path))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-            })
             .into_any_element()
     }
 
@@ -4994,18 +4937,6 @@ impl AcpThreadView {
             }))
     }
 
-    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.thread_state = Self::initial_state(
-            self.agent.clone(),
-            None,
-            self.workspace.clone(),
-            self.project.clone(),
-            window,
-            cx,
-        );
-        cx.notify();
-    }
-
     pub fn delete_history_entry(&mut self, entry: HistoryEntry, cx: &mut Context<Self>) {
         let task = match entry {
             HistoryEntry::AcpThread(thread) => self.history_store.update(cx, |history, cx| {
@@ -5534,22 +5465,10 @@ pub(crate) mod tests {
             "Test".into()
         }
 
-        fn empty_state_headline(&self) -> SharedString {
-            "Test".into()
-        }
-
-        fn empty_state_message(&self) -> SharedString {
-            "Test".into()
-        }
-
-        fn install_command(&self) -> Option<&'static str> {
-            None
-        }
-
         fn connect(
             &self,
             _root_dir: &Path,
-            _project: &Entity<Project>,
+            _delegate: AgentServerDelegate,
             _cx: &mut App,
         ) -> Task<gpui::Result<Rc<dyn AgentConnection>>> {
             Task::ready(Ok(Rc::new(self.connection.clone())))
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 224f49cc3e..23b6e69a56 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -5,7 +5,7 @@ mod tool_picker;
 
 use std::{ops::Range, sync::Arc, time::Duration};
 
-use agent_servers::{AgentServerCommand, AgentServerSettings, AllAgentServersSettings, Gemini};
+use agent_servers::{AgentServerCommand, AllAgentServersSettings, CustomAgentServerSettings};
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use assistant_tool::{ToolSource, ToolWorkingSet};
@@ -27,7 +27,6 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
-    Project,
     context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
     project_settings::{ContextServerSettings, ProjectSettings},
 };
@@ -52,7 +51,6 @@ pub struct AgentConfiguration {
     fs: Arc<dyn Fs>,
     language_registry: Arc<LanguageRegistry>,
     workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
     focus_handle: FocusHandle,
     configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
     context_server_store: Entity<ContextServerStore>,
@@ -62,7 +60,6 @@ pub struct AgentConfiguration {
     _registry_subscription: Subscription,
     scroll_handle: ScrollHandle,
     scrollbar_state: ScrollbarState,
-    gemini_is_installed: bool,
     _check_for_gemini: Task<()>,
 }
 
@@ -73,7 +70,6 @@ impl AgentConfiguration {
         tools: Entity<ToolWorkingSet>,
         language_registry: Arc<LanguageRegistry>,
         workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -98,11 +94,6 @@ impl AgentConfiguration {
 
         cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify())
             .detach();
-        cx.observe_global_in::<SettingsStore>(window, |this, _, cx| {
-            this.check_for_gemini(cx);
-            cx.notify();
-        })
-        .detach();
 
         let scroll_handle = ScrollHandle::new();
         let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
@@ -111,7 +102,6 @@ impl AgentConfiguration {
             fs,
             language_registry,
             workspace,
-            project,
             focus_handle,
             configuration_views_by_provider: HashMap::default(),
             context_server_store,
@@ -121,11 +111,9 @@ impl AgentConfiguration {
             _registry_subscription: registry_subscription,
             scroll_handle,
             scrollbar_state,
-            gemini_is_installed: false,
             _check_for_gemini: Task::ready(()),
         };
         this.build_provider_configuration_views(window, cx);
-        this.check_for_gemini(cx);
         this
     }
 
@@ -155,34 +143,6 @@ impl AgentConfiguration {
         self.configuration_views_by_provider
             .insert(provider.id(), configuration_view);
     }
-
-    fn check_for_gemini(&mut self, cx: &mut Context<Self>) {
-        let project = self.project.clone();
-        let settings = AllAgentServersSettings::get_global(cx).clone();
-        self._check_for_gemini = cx.spawn({
-            async move |this, cx| {
-                let Some(project) = project.upgrade() else {
-                    return;
-                };
-                let gemini_is_installed = AgentServerCommand::resolve(
-                    Gemini::binary_name(),
-                    &[],
-                    // TODO expose fallback path from the Gemini/CC types so we don't have to hardcode it again here
-                    None,
-                    settings.gemini,
-                    &project,
-                    cx,
-                )
-                .await
-                .is_some();
-                this.update(cx, |this, cx| {
-                    this.gemini_is_installed = gemini_is_installed;
-                    cx.notify();
-                })
-                .ok();
-            }
-        });
-    }
 }
 
 impl Focusable for AgentConfiguration {
@@ -1041,9 +1001,8 @@ impl AgentConfiguration {
                     name.clone(),
                     ExternalAgent::Custom {
                         name: name.clone(),
-                        settings: settings.clone(),
+                        command: settings.command.clone(),
                     },
-                    None,
                     cx,
                 )
                 .into_any_element()
@@ -1102,7 +1061,6 @@ impl AgentConfiguration {
                         IconName::AiGemini,
                         "Gemini CLI",
                         ExternalAgent::Gemini,
-                        (!self.gemini_is_installed).then_some(Gemini::install_command().into()),
                         cx,
                     ))
                     // TODO add CC
@@ -1115,7 +1073,6 @@ impl AgentConfiguration {
         icon: IconName,
         name: impl Into<SharedString>,
         agent: ExternalAgent,
-        install_command: Option<SharedString>,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let name = name.into();
@@ -1135,88 +1092,28 @@ impl AgentConfiguration {
                     .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
                     .child(Label::new(name.clone())),
             )
-            .map(|this| {
-                if let Some(install_command) = install_command {
-                    this.child(
-                        Button::new(
-                            SharedString::from(format!("install_external_agent-{name}")),
-                            "Install Agent",
-                        )
-                        .label_size(LabelSize::Small)
-                        .icon(IconName::Plus)
-                        .icon_position(IconPosition::Start)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .tooltip(Tooltip::text(install_command.clone()))
-                        .on_click(cx.listener(
-                            move |this, _, window, cx| {
-                                let Some(project) = this.project.upgrade() else {
-                                    return;
-                                };
-                                let Some(workspace) = this.workspace.upgrade() else {
-                                    return;
-                                };
-                                let cwd = project.read(cx).first_project_directory(cx);
-                                let shell =
-                                    project.read(cx).terminal_settings(&cwd, cx).shell.clone();
-                                let spawn_in_terminal = task::SpawnInTerminal {
-                                    id: task::TaskId(install_command.to_string()),
-                                    full_label: install_command.to_string(),
-                                    label: install_command.to_string(),
-                                    command: Some(install_command.to_string()),
-                                    args: Vec::new(),
-                                    command_label: install_command.to_string(),
-                                    cwd,
-                                    env: Default::default(),
-                                    use_new_terminal: true,
-                                    allow_concurrent_runs: true,
-                                    reveal: Default::default(),
-                                    reveal_target: Default::default(),
-                                    hide: Default::default(),
-                                    shell,
-                                    show_summary: true,
-                                    show_command: true,
-                                    show_rerun: false,
-                                };
-                                let task = workspace.update(cx, |workspace, cx| {
-                                    workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
-                                });
-                                cx.spawn(async move |this, cx| {
-                                    task.await;
-                                    this.update(cx, |this, cx| {
-                                        this.check_for_gemini(cx);
-                                    })
-                                    .ok();
-                                })
-                                .detach();
-                            },
-                        )),
+            .child(
+                h_flex().gap_1().child(
+                    Button::new(
+                        SharedString::from(format!("start_acp_thread-{name}")),
+                        "Start New Thread",
                     )
-                } else {
-                    this.child(
-                        h_flex().gap_1().child(
-                            Button::new(
-                                SharedString::from(format!("start_acp_thread-{name}")),
-                                "Start New Thread",
-                            )
-                            .label_size(LabelSize::Small)
-                            .icon(IconName::Thread)
-                            .icon_position(IconPosition::Start)
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                            .on_click(move |_, window, cx| {
-                                window.dispatch_action(
-                                    NewExternalAgentThread {
-                                        agent: Some(agent.clone()),
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                );
-                            }),
-                        ),
-                    )
-                }
-            })
+                    .label_size(LabelSize::Small)
+                    .icon(IconName::Thread)
+                    .icon_position(IconPosition::Start)
+                    .icon_size(IconSize::XSmall)
+                    .icon_color(Color::Muted)
+                    .on_click(move |_, window, cx| {
+                        window.dispatch_action(
+                            NewExternalAgentThread {
+                                agent: Some(agent.clone()),
+                            }
+                            .boxed_clone(),
+                            cx,
+                        );
+                    }),
+                ),
+            )
     }
 }
 
@@ -1393,7 +1290,7 @@ async fn open_new_agent_servers_entry_in_settings_editor(
                     unique_server_name = Some(server_name.clone());
                     file.custom.insert(
                         server_name,
-                        AgentServerSettings {
+                        CustomAgentServerSettings {
                             command: AgentServerCommand {
                                 path: "path_to_executable".into(),
                                 args: vec![],
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 586a782bc3..232311c5b0 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use acp_thread::AcpThread;
-use agent_servers::AgentServerSettings;
+use agent_servers::AgentServerCommand;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
@@ -259,7 +259,7 @@ pub enum AgentType {
     NativeAgent,
     Custom {
         name: SharedString,
-        settings: AgentServerSettings,
+        command: AgentServerCommand,
     },
 }
 
@@ -1479,7 +1479,6 @@ impl AgentPanel {
                 tools,
                 self.language_registry.clone(),
                 self.workspace.clone(),
-                self.project.downgrade(),
                 window,
                 cx,
             )
@@ -1896,8 +1895,8 @@ impl AgentPanel {
                 window,
                 cx,
             ),
-            AgentType::Custom { name, settings } => self.external_thread(
-                Some(crate::ExternalAgent::Custom { name, settings }),
+            AgentType::Custom { name, command } => self.external_thread(
+                Some(crate::ExternalAgent::Custom { name, command }),
                 None,
                 None,
                 window,
@@ -2115,7 +2114,7 @@ impl AgentPanel {
                         .child(title_editor)
                         .into_any_element()
                 } else {
-                    Label::new(thread_view.read(cx).title())
+                    Label::new(thread_view.read(cx).title(cx))
                         .color(Color::Muted)
                         .truncate()
                         .into_any_element()
@@ -2664,9 +2663,9 @@ impl AgentPanel {
                                                                         AgentType::Custom {
                                                                             name: agent_name
                                                                                 .clone(),
-                                                                            settings:
-                                                                                agent_settings
-                                                                                    .clone(),
+                                                                            command: agent_settings
+                                                                                .command
+                                                                                .clone(),
                                                                         },
                                                                         window,
                                                                         cx,
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 110c432df3..93a4a8f748 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -28,7 +28,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use agent::{Thread, ThreadId};
-use agent_servers::AgentServerSettings;
+use agent_servers::AgentServerCommand;
 use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
@@ -170,7 +170,7 @@ enum ExternalAgent {
     NativeAgent,
     Custom {
         name: SharedString,
-        settings: AgentServerSettings,
+        command: AgentServerCommand,
     },
 }
 
@@ -193,9 +193,9 @@ impl ExternalAgent {
             Self::Gemini => Rc::new(agent_servers::Gemini),
             Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
             Self::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
-            Self::Custom { name, settings } => Rc::new(agent_servers::CustomAgentServer::new(
+            Self::Custom { name, command } => Rc::new(agent_servers::CustomAgentServer::new(
                 name.clone(),
-                settings,
+                command.clone(),
             )),
         }
     }

From f2e62c98d151370eb138547586441b25594afd10 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 28 Aug 2025 21:48:35 +0200
Subject: [PATCH 444/823] docs: Fix broken link in `agent-panel.md` (#37113)

This fixes a small typo I stumbled upon, which caused a 404 within the
docs.

Release Notes:

- N/A
---
 docs/src/ai/agent-panel.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index ff5fdf84ce..002c7d6415 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -25,7 +25,7 @@ You should start to see the responses stream in with indications of [which tools
 By default, the Agent Panel uses Zed's first-party agent.
 
 To change that, go to the plus button in the top-right of the Agent Panel and choose another option.
-You choose to create a new [Text Thread](./text-threads.md) or, if you have [external agents](/.external-agents.md) connected, you can create new threads with them.
+You choose to create a new [Text Thread](./text-threads.md) or, if you have [external agents](./external-agents.md) connected, you can create new threads with them.
 
 ### Editing Messages {#editing-messages}
 

From 88e8f7af6861f56edddccd9a87790602043c48fb Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 28 Aug 2025 14:07:02 -0700
Subject: [PATCH 445/823] Activate preview for initially selected item (#37112)

@JosephTLyons pointed out that it's a bit weird that we only show a
preview for items selected after the initial one, so this does it for
that too.

It makes tab switching feel even faster!

Release Notes:

- N/A

Co-authored-by: David Kleingeld <davidsk@zed.dev>
---
 crates/tab_switcher/src/tab_switcher.rs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 5f60bc03f2..241642115a 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -360,7 +360,12 @@ impl TabSwitcherDelegate {
         .detach();
     }
 
-    fn update_all_pane_matches(&mut self, query: String, window: &mut Window, cx: &mut App) {
+    fn update_all_pane_matches(
+        &mut self,
+        query: String,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) {
         let Some(workspace) = self.workspace.upgrade() else {
             return;
         };
@@ -418,7 +423,7 @@ impl TabSwitcherDelegate {
 
         let selected_item_id = self.selected_item_id();
         self.matches = matches;
-        self.selected_index = self.compute_selected_index(selected_item_id);
+        self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
     }
 
     fn update_matches(
@@ -477,7 +482,7 @@ impl TabSwitcherDelegate {
             a_score.cmp(&b_score)
         });
 
-        self.selected_index = self.compute_selected_index(selected_item_id);
+        self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
     }
 
     fn selected_item_id(&self) -> Option<EntityId> {
@@ -486,7 +491,12 @@ impl TabSwitcherDelegate {
             .map(|tab_match| tab_match.item.item_id())
     }
 
-    fn compute_selected_index(&mut self, prev_selected_item_id: Option<EntityId>) -> usize {
+    fn compute_selected_index(
+        &mut self,
+        prev_selected_item_id: Option<EntityId>,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> usize {
         if self.matches.is_empty() {
             return 0;
         }
@@ -508,8 +518,10 @@ impl TabSwitcherDelegate {
             return self.matches.len() - 1;
         }
 
+        // This only runs when initially opening the picker
+        // Index 0 is already active, so don't preselect it for switching.
         if self.matches.len() > 1 {
-            // Index 0 is active, so don't preselect it for switching.
+            self.set_selected_index(1, window, cx);
             return 1;
         }
 

From 08c23c92ca78a669a166f779cfefd2781b5f3d90 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 28 Aug 2025 14:16:06 -0700
Subject: [PATCH 446/823] acp: Bump to 0.1.1 (#37119)

No big changes, just tracking the latest version after the official
release

Release Notes:

- N/A
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0e3bfd18c2..a77d1e68c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -191,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.31"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "289eb34ee17213dadcca47eedadd386a5e7678094095414e475965d1bcca2860"
+checksum = "6b91e5ec3ce05e8effb2a7a3b7b1a587daa6699b9f98bbde6a35e44b8c6c773a"
 dependencies = [
  "anyhow",
  "async-broadcast",
diff --git a/Cargo.toml b/Cargo.toml
index 209c312aec..974796a5e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -426,7 +426,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol = "0.0.31"
+agent-client-protocol =  "0.1"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"

From 930189ed83a7ed641b38064a22f43d3955332ee3 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 28 Aug 2025 17:38:14 -0400
Subject: [PATCH 447/823] acp: Support automatic installation of Claude Code
 (#37120)

Release Notes:

- N/A
---
 Cargo.lock                                    |    5 -
 crates/agent_servers/Cargo.toml               |    5 -
 crates/agent_servers/src/agent_servers.rs     |   10 +-
 crates/agent_servers/src/claude.rs            | 1362 +----------------
 crates/agent_servers/src/claude/edit_tool.rs  |  178 ---
 crates/agent_servers/src/claude/mcp_server.rs |   99 --
 .../src/claude/permission_tool.rs             |  158 --
 crates/agent_servers/src/claude/read_tool.rs  |   59 -
 crates/agent_servers/src/claude/tools.rs      |  688 ---------
 crates/agent_servers/src/claude/write_tool.rs |   59 -
 crates/agent_servers/src/custom.rs            |   20 +-
 crates/agent_servers/src/e2e_tests.rs         |   10 +-
 crates/agent_servers/src/gemini.rs            |   29 +-
 crates/agent_servers/src/settings.rs          |    2 +-
 14 files changed, 76 insertions(+), 2608 deletions(-)
 delete mode 100644 crates/agent_servers/src/claude/edit_tool.rs
 delete mode 100644 crates/agent_servers/src/claude/mcp_server.rs
 delete mode 100644 crates/agent_servers/src/claude/permission_tool.rs
 delete mode 100644 crates/agent_servers/src/claude/read_tool.rs
 delete mode 100644 crates/agent_servers/src/claude/tools.rs
 delete mode 100644 crates/agent_servers/src/claude/write_tool.rs

diff --git a/Cargo.lock b/Cargo.lock
index a77d1e68c0..aeacdd8996 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -292,14 +292,12 @@ dependencies = [
  "anyhow",
  "client",
  "collections",
- "context_server",
  "env_logger 0.11.8",
  "fs",
  "futures 0.3.31",
  "gpui",
  "gpui_tokio",
  "indoc",
- "itertools 0.14.0",
  "language",
  "language_model",
  "language_models",
@@ -309,7 +307,6 @@ dependencies = [
  "node_runtime",
  "paths",
  "project",
- "rand 0.8.5",
  "reqwest_client",
  "schemars",
  "semver",
@@ -317,12 +314,10 @@ dependencies = [
  "serde_json",
  "settings",
  "smol",
- "strum 0.27.1",
  "tempfile",
  "thiserror 2.0.12",
  "ui",
  "util",
- "uuid",
  "watch",
  "which 6.0.3",
  "workspace-hack",
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 3e6bae104c..222feb9aaa 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -25,14 +25,12 @@ agent_settings.workspace = true
 anyhow.workspace = true
 client = { workspace = true, optional = true }
 collections.workspace = true
-context_server.workspace = true
 env_logger = { workspace = true, optional = true }
 fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 gpui_tokio = { workspace = true, optional = true }
 indoc.workspace = true
-itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_models.workspace = true
@@ -40,7 +38,6 @@ log.workspace = true
 node_runtime.workspace = true
 paths.workspace = true
 project.workspace = true
-rand.workspace = true
 reqwest_client = { workspace = true, optional = true }
 schemars.workspace = true
 semver.workspace = true
@@ -48,12 +45,10 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
-strum.workspace = true
 tempfile.workspace = true
 thiserror.workspace = true
 ui.workspace = true
 util.workspace = true
-uuid.workspace = true
 watch.workspace = true
 which.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index e5d954b071..e1b4057b71 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -57,16 +57,10 @@ impl AgentServerDelegate {
         binary_name: SharedString,
         package_name: SharedString,
         entrypoint_path: PathBuf,
-        settings: Option<BuiltinAgentServerSettings>,
+        ignore_system_version: bool,
         minimum_version: Option<Version>,
         cx: &mut App,
     ) -> Task<Result<AgentServerCommand>> {
-        if let Some(settings) = &settings
-            && let Some(command) = settings.clone().custom_command()
-        {
-            return Task::ready(Ok(command));
-        }
-
         let project = self.project;
         let fs = project.read(cx).fs().clone();
         let Some(node_runtime) = project.read(cx).node_runtime().cloned() else {
@@ -75,7 +69,7 @@ impl AgentServerDelegate {
         let mut status_tx = self.status_tx;
 
         cx.spawn(async move |cx| {
-            if let Some(settings) = settings && !settings.ignore_system_version.unwrap_or(true) {
+            if !ignore_system_version {
                 if let Some(bin) = find_bin_in_path(binary_name.clone(), &project, cx).await {
                     return Ok(AgentServerCommand { path: bin, args: Vec::new(), env: Default::default() })
                 }
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index b183219148..db8853695e 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,47 +1,23 @@
-mod edit_tool;
-mod mcp_server;
-mod permission_tool;
-mod read_tool;
-pub mod tools;
-mod write_tool;
-
-use action_log::ActionLog;
-use collections::HashMap;
-use context_server::listener::McpServerTool;
 use language_models::provider::anthropic::AnthropicLanguageModelProvider;
-use project::Project;
 use settings::SettingsStore;
-use smol::process::Child;
 use std::any::Any;
-use std::cell::RefCell;
-use std::fmt::Display;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::rc::Rc;
-use util::command::new_smol_command;
-use uuid::Uuid;
 
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result, anyhow};
-use futures::channel::oneshot;
-use futures::{AsyncBufReadExt, AsyncWriteExt};
-use futures::{
-    AsyncRead, AsyncWrite, FutureExt, StreamExt,
-    channel::mpsc::{self, UnboundedReceiver, UnboundedSender},
-    io::BufReader,
-    select_biased,
-};
-use gpui::{App, AppContext, AsyncApp, Entity, SharedString, Task, WeakEntity};
-use serde::{Deserialize, Serialize};
-use util::{ResultExt, debug_panic};
+use anyhow::Result;
+use gpui::{App, AppContext as _, SharedString, Task};
 
-use crate::claude::mcp_server::{ClaudeZedMcpServer, McpConfig};
-use crate::claude::tools::ClaudeTool;
-use crate::{AgentServer, AgentServerCommand, AgentServerDelegate, AllAgentServersSettings};
-use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri};
+use crate::{AgentServer, AgentServerDelegate, AllAgentServersSettings};
+use acp_thread::AgentConnection;
 
 #[derive(Clone)]
 pub struct ClaudeCode;
 
+impl ClaudeCode {
+    const BINARY_NAME: &'static str = "claude-code-acp";
+    const PACKAGE_NAME: &'static str = "@zed-industries/claude-code-acp";
+}
+
 impl AgentServer for ClaudeCode {
     fn telemetry_id(&self) -> &'static str {
         "claude-code"
@@ -57,1301 +33,49 @@ impl AgentServer for ClaudeCode {
 
     fn connect(
         &self,
-        _root_dir: &Path,
-        _delegate: AgentServerDelegate,
-        _cx: &mut App,
+        root_dir: &Path,
+        delegate: AgentServerDelegate,
+        cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        let connection = ClaudeAgentConnection {
-            sessions: Default::default(),
-        };
+        let root_dir = root_dir.to_path_buf();
+        let server_name = self.name();
+        let settings = cx.read_global(|settings: &SettingsStore, _| {
+            settings.get::<AllAgentServersSettings>(None).claude.clone()
+        });
 
-        Task::ready(Ok(Rc::new(connection) as _))
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
-
-struct ClaudeAgentConnection {
-    sessions: Rc<RefCell<HashMap<acp::SessionId, ClaudeAgentSession>>>,
-}
-
-impl AgentConnection for ClaudeAgentConnection {
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut App,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        let cwd = cwd.to_owned();
         cx.spawn(async move |cx| {
-            let settings = cx.read_global(|settings: &SettingsStore, _| {
-                settings.get::<AllAgentServersSettings>(None).claude.clone()
-            })?;
-
-            let Some(command) = AgentServerCommand::resolve(
-                "claude",
-                &[],
-                Some(&util::paths::home_dir().join(".claude/local/claude")),
-                settings,
-                &project,
-                cx,
-            )
-            .await
-            else {
-                return Err(anyhow!("Failed to find Claude Code binary"));
+            let mut command = if let Some(settings) = settings {
+                settings.command
+            } else {
+                cx.update(|cx| {
+                    delegate.get_or_npm_install_builtin_agent(
+                        Self::BINARY_NAME.into(),
+                        Self::PACKAGE_NAME.into(),
+                        format!("node_modules/{}/dist/index.js", Self::PACKAGE_NAME).into(),
+                        true,
+                        None,
+                        cx,
+                    )
+                })?
+                .await?
             };
 
-            let api_key =
-                cx.update(AnthropicLanguageModelProvider::api_key)?
-                    .await
-                    .map_err(|err| {
-                        if err.is::<language_model::AuthenticateError>() {
-                            anyhow!(AuthRequired::new().with_language_model_provider(
-                                language_model::ANTHROPIC_PROVIDER_ID
-                            ))
-                        } else {
-                            anyhow!(err)
-                        }
-                    })?;
+            if let Some(api_key) = cx
+                .update(AnthropicLanguageModelProvider::api_key)?
+                .await
+                .ok()
+            {
+                command
+                    .env
+                    .get_or_insert_default()
+                    .insert("ANTHROPIC_API_KEY".to_owned(), api_key.key);
+            }
 
-            let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
-            let fs = project.read_with(cx, |project, _cx| project.fs().clone())?;
-            let permission_mcp_server = ClaudeZedMcpServer::new(thread_rx.clone(), fs, cx).await?;
-
-            let mut mcp_servers = HashMap::default();
-            mcp_servers.insert(
-                mcp_server::SERVER_NAME.to_string(),
-                permission_mcp_server.server_config()?,
-            );
-            let mcp_config = McpConfig { mcp_servers };
-
-            let mcp_config_file = tempfile::NamedTempFile::new()?;
-            let (mcp_config_file, mcp_config_path) = mcp_config_file.into_parts();
-
-            let mut mcp_config_file = smol::fs::File::from(mcp_config_file);
-            mcp_config_file
-                .write_all(serde_json::to_string(&mcp_config)?.as_bytes())
-                .await?;
-            mcp_config_file.flush().await?;
-
-            let (incoming_message_tx, mut incoming_message_rx) = mpsc::unbounded();
-            let (outgoing_tx, outgoing_rx) = mpsc::unbounded();
-
-            let session_id = acp::SessionId(Uuid::new_v4().to_string().into());
-
-            log::trace!("Starting session with id: {}", session_id);
-
-            let mut child = spawn_claude(
-                &command,
-                ClaudeSessionMode::Start,
-                session_id.clone(),
-                api_key,
-                &mcp_config_path,
-                &cwd,
-            )?;
-
-            let stdout = child.stdout.take().context("Failed to take stdout")?;
-            let stdin = child.stdin.take().context("Failed to take stdin")?;
-            let stderr = child.stderr.take().context("Failed to take stderr")?;
-
-            let pid = child.id();
-            log::trace!("Spawned (pid: {})", pid);
-
-            cx.background_spawn(async move {
-                let mut stderr = BufReader::new(stderr);
-                let mut line = String::new();
-                while let Ok(n) = stderr.read_line(&mut line).await
-                    && n > 0
-                {
-                    log::warn!("agent stderr: {}", &line);
-                    line.clear();
-                }
-            })
-            .detach();
-
-            cx.background_spawn(async move {
-                let mut outgoing_rx = Some(outgoing_rx);
-
-                ClaudeAgentSession::handle_io(
-                    outgoing_rx.take().unwrap(),
-                    incoming_message_tx.clone(),
-                    stdin,
-                    stdout,
-                )
-                .await?;
-
-                log::trace!("Stopped (pid: {})", pid);
-
-                drop(mcp_config_path);
-                anyhow::Ok(())
-            })
-            .detach();
-
-            let turn_state = Rc::new(RefCell::new(TurnState::None));
-
-            let handler_task = cx.spawn({
-                let turn_state = turn_state.clone();
-                let mut thread_rx = thread_rx.clone();
-                async move |cx| {
-                    while let Some(message) = incoming_message_rx.next().await {
-                        ClaudeAgentSession::handle_message(
-                            thread_rx.clone(),
-                            message,
-                            turn_state.clone(),
-                            cx,
-                        )
-                        .await
-                    }
-
-                    if let Some(status) = child.status().await.log_err()
-                        && let Some(thread) = thread_rx.recv().await.ok()
-                    {
-                        let version = claude_version(command.path.clone(), cx).await.log_err();
-                        let help = claude_help(command.path.clone(), cx).await.log_err();
-                        thread
-                            .update(cx, |thread, cx| {
-                                let error = if let Some(version) = version
-                                    && let Some(help) = help
-                                    && (!help.contains("--input-format")
-                                        || !help.contains("--session-id"))
-                                {
-                                    LoadError::Unsupported {
-                                        command: command.path.to_string_lossy().to_string().into(),
-                                        current_version: version.to_string().into(),
-                                        minimum_version: "1.0.0".into(),
-                                    }
-                                } else {
-                                    LoadError::Exited { status }
-                                };
-                                thread.emit_load_error(error, cx);
-                            })
-                            .ok();
-                    }
-                }
-            });
-
-            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    "Claude Code",
-                    self.clone(),
-                    project,
-                    action_log,
-                    session_id.clone(),
-                    watch::Receiver::constant(acp::PromptCapabilities {
-                        image: true,
-                        audio: false,
-                        embedded_context: true,
-                    }),
-                    cx,
-                )
-            })?;
-
-            thread_tx.send(thread.downgrade())?;
-
-            let session = ClaudeAgentSession {
-                outgoing_tx,
-                turn_state,
-                _handler_task: handler_task,
-                _mcp_server: Some(permission_mcp_server),
-            };
-
-            self.sessions.borrow_mut().insert(session_id, session);
-
-            Ok(thread)
+            crate::acp::connect(server_name, command.clone(), &root_dir, cx).await
         })
     }
 
-    fn auth_methods(&self) -> &[acp::AuthMethod] {
-        &[]
-    }
-
-    fn authenticate(&self, _: acp::AuthMethodId, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Err(anyhow!("Authentication not supported")))
-    }
-
-    fn prompt(
-        &self,
-        _id: Option<acp_thread::UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        let sessions = self.sessions.borrow();
-        let Some(session) = sessions.get(&params.session_id) else {
-            return Task::ready(Err(anyhow!(
-                "Attempted to send message to nonexistent session {}",
-                params.session_id
-            )));
-        };
-
-        let (end_tx, end_rx) = oneshot::channel();
-        session.turn_state.replace(TurnState::InProgress { end_tx });
-
-        let content = acp_content_to_claude(params.prompt);
-
-        if let Err(err) = session.outgoing_tx.unbounded_send(SdkMessage::User {
-            message: Message {
-                role: Role::User,
-                content: Content::Chunks(content),
-                id: None,
-                model: None,
-                stop_reason: None,
-                stop_sequence: None,
-                usage: None,
-            },
-            session_id: Some(params.session_id.to_string()),
-        }) {
-            return Task::ready(Err(anyhow!(err)));
-        }
-
-        cx.foreground_executor().spawn(async move { end_rx.await? })
-    }
-
-    fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
-        let sessions = self.sessions.borrow();
-        let Some(session) = sessions.get(session_id) else {
-            log::warn!("Attempted to cancel nonexistent session {}", session_id);
-            return;
-        };
-
-        let request_id = new_request_id();
-
-        let turn_state = session.turn_state.take();
-        let TurnState::InProgress { end_tx } = turn_state else {
-            // Already canceled or idle, put it back
-            session.turn_state.replace(turn_state);
-            return;
-        };
-
-        session.turn_state.replace(TurnState::CancelRequested {
-            end_tx,
-            request_id: request_id.clone(),
-        });
-
-        session
-            .outgoing_tx
-            .unbounded_send(SdkMessage::ControlRequest {
-                request_id,
-                request: ControlRequest::Interrupt,
-            })
-            .log_err();
-    }
-
     fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
         self
     }
 }
-
-#[derive(Clone, Copy)]
-enum ClaudeSessionMode {
-    Start,
-    #[expect(dead_code)]
-    Resume,
-}
-
-fn spawn_claude(
-    command: &AgentServerCommand,
-    mode: ClaudeSessionMode,
-    session_id: acp::SessionId,
-    api_key: language_models::provider::anthropic::ApiKey,
-    mcp_config_path: &Path,
-    root_dir: &Path,
-) -> Result<Child> {
-    let child = util::command::new_smol_command(&command.path)
-        .args([
-            "--input-format",
-            "stream-json",
-            "--output-format",
-            "stream-json",
-            "--print",
-            "--verbose",
-            "--mcp-config",
-            mcp_config_path.to_string_lossy().as_ref(),
-            "--permission-prompt-tool",
-            &format!(
-                "mcp__{}__{}",
-                mcp_server::SERVER_NAME,
-                permission_tool::PermissionTool::NAME,
-            ),
-            "--allowedTools",
-            &format!(
-                "mcp__{}__{}",
-                mcp_server::SERVER_NAME,
-                read_tool::ReadTool::NAME
-            ),
-            "--disallowedTools",
-            "Read,Write,Edit,MultiEdit",
-        ])
-        .args(match mode {
-            ClaudeSessionMode::Start => ["--session-id".to_string(), session_id.to_string()],
-            ClaudeSessionMode::Resume => ["--resume".to_string(), session_id.to_string()],
-        })
-        .args(command.args.iter().map(|arg| arg.as_str()))
-        .envs(command.env.iter().flatten())
-        .env("ANTHROPIC_API_KEY", api_key.key)
-        .current_dir(root_dir)
-        .stdin(std::process::Stdio::piped())
-        .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::piped())
-        .kill_on_drop(true)
-        .spawn()?;
-
-    Ok(child)
-}
-
-fn claude_version(path: PathBuf, cx: &mut AsyncApp) -> Task<Result<semver::Version>> {
-    cx.background_spawn(async move {
-        let output = new_smol_command(path).arg("--version").output().await?;
-        let output = String::from_utf8(output.stdout)?;
-        let version = output
-            .trim()
-            .strip_suffix(" (Claude Code)")
-            .context("parsing Claude version")?;
-        let version = semver::Version::parse(version)?;
-        anyhow::Ok(version)
-    })
-}
-
-fn claude_help(path: PathBuf, cx: &mut AsyncApp) -> Task<Result<String>> {
-    cx.background_spawn(async move {
-        let output = new_smol_command(path).arg("--help").output().await?;
-        let output = String::from_utf8(output.stdout)?;
-        anyhow::Ok(output)
-    })
-}
-
-struct ClaudeAgentSession {
-    outgoing_tx: UnboundedSender<SdkMessage>,
-    turn_state: Rc<RefCell<TurnState>>,
-    _mcp_server: Option<ClaudeZedMcpServer>,
-    _handler_task: Task<()>,
-}
-
-#[derive(Debug, Default)]
-enum TurnState {
-    #[default]
-    None,
-    InProgress {
-        end_tx: oneshot::Sender<Result<acp::PromptResponse>>,
-    },
-    CancelRequested {
-        end_tx: oneshot::Sender<Result<acp::PromptResponse>>,
-        request_id: String,
-    },
-    CancelConfirmed {
-        end_tx: oneshot::Sender<Result<acp::PromptResponse>>,
-    },
-}
-
-impl TurnState {
-    fn is_canceled(&self) -> bool {
-        matches!(self, TurnState::CancelConfirmed { .. })
-    }
-
-    fn end_tx(self) -> Option<oneshot::Sender<Result<acp::PromptResponse>>> {
-        match self {
-            TurnState::None => None,
-            TurnState::InProgress { end_tx, .. } => Some(end_tx),
-            TurnState::CancelRequested { end_tx, .. } => Some(end_tx),
-            TurnState::CancelConfirmed { end_tx } => Some(end_tx),
-        }
-    }
-
-    fn confirm_cancellation(self, id: &str) -> Self {
-        match self {
-            TurnState::CancelRequested { request_id, end_tx } if request_id == id => {
-                TurnState::CancelConfirmed { end_tx }
-            }
-            _ => self,
-        }
-    }
-}
-
-impl ClaudeAgentSession {
-    async fn handle_message(
-        mut thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-        message: SdkMessage,
-        turn_state: Rc<RefCell<TurnState>>,
-        cx: &mut AsyncApp,
-    ) {
-        match message {
-            // we should only be sending these out, they don't need to be in the thread
-            SdkMessage::ControlRequest { .. } => {}
-            SdkMessage::User {
-                message,
-                session_id: _,
-            } => {
-                let Some(thread) = thread_rx
-                    .recv()
-                    .await
-                    .log_err()
-                    .and_then(|entity| entity.upgrade())
-                else {
-                    log::error!("Received an SDK message but thread is gone");
-                    return;
-                };
-
-                for chunk in message.content.chunks() {
-                    match chunk {
-                        ContentChunk::Text { text } | ContentChunk::UntaggedText(text) => {
-                            if !turn_state.borrow().is_canceled() {
-                                thread
-                                    .update(cx, |thread, cx| {
-                                        thread.push_user_content_block(None, text.into(), cx)
-                                    })
-                                    .log_err();
-                            }
-                        }
-                        ContentChunk::ToolResult {
-                            content,
-                            tool_use_id,
-                        } => {
-                            let content = content.to_string();
-                            thread
-                                .update(cx, |thread, cx| {
-                                    let id = acp::ToolCallId(tool_use_id.into());
-                                    let set_new_content = !content.is_empty()
-                                        && thread.tool_call(&id).is_none_or(|(_, tool_call)| {
-                                            // preserve rich diff if we have one
-                                            tool_call.diffs().next().is_none()
-                                        });
-
-                                    thread.update_tool_call(
-                                        acp::ToolCallUpdate {
-                                            id,
-                                            fields: acp::ToolCallUpdateFields {
-                                                status: if turn_state.borrow().is_canceled() {
-                                                    // Do not set to completed if turn was canceled
-                                                    None
-                                                } else {
-                                                    Some(acp::ToolCallStatus::Completed)
-                                                },
-                                                content: set_new_content
-                                                    .then(|| vec![content.into()]),
-                                                ..Default::default()
-                                            },
-                                        },
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                        }
-                        ContentChunk::Thinking { .. }
-                        | ContentChunk::RedactedThinking
-                        | ContentChunk::ToolUse { .. } => {
-                            debug_panic!(
-                                "Should not get {:?} with role: assistant. should we handle this?",
-                                chunk
-                            );
-                        }
-                        ContentChunk::Image { source } => {
-                            if !turn_state.borrow().is_canceled() {
-                                thread
-                                    .update(cx, |thread, cx| {
-                                        thread.push_user_content_block(None, source.into(), cx)
-                                    })
-                                    .log_err();
-                            }
-                        }
-
-                        ContentChunk::Document | ContentChunk::WebSearchToolResult => {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(
-                                        format!("Unsupported content: {:?}", chunk).into(),
-                                        false,
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                        }
-                    }
-                }
-            }
-            SdkMessage::Assistant {
-                message,
-                session_id: _,
-            } => {
-                let Some(thread) = thread_rx
-                    .recv()
-                    .await
-                    .log_err()
-                    .and_then(|entity| entity.upgrade())
-                else {
-                    log::error!("Received an SDK message but thread is gone");
-                    return;
-                };
-
-                for chunk in message.content.chunks() {
-                    match chunk {
-                        ContentChunk::Text { text } | ContentChunk::UntaggedText(text) => {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), false, cx)
-                                })
-                                .log_err();
-                        }
-                        ContentChunk::Thinking { thinking } => {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(thinking.into(), true, cx)
-                                })
-                                .log_err();
-                        }
-                        ContentChunk::RedactedThinking => {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(
-                                        "[REDACTED]".into(),
-                                        true,
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                        }
-                        ContentChunk::ToolUse { id, name, input } => {
-                            let claude_tool = ClaudeTool::infer(&name, input);
-
-                            thread
-                                .update(cx, |thread, cx| {
-                                    if let ClaudeTool::TodoWrite(Some(params)) = claude_tool {
-                                        thread.update_plan(
-                                            acp::Plan {
-                                                entries: params
-                                                    .todos
-                                                    .into_iter()
-                                                    .map(Into::into)
-                                                    .collect(),
-                                            },
-                                            cx,
-                                        )
-                                    } else {
-                                        thread.upsert_tool_call(
-                                            claude_tool.as_acp(acp::ToolCallId(id.into())),
-                                            cx,
-                                        )?;
-                                    }
-                                    anyhow::Ok(())
-                                })
-                                .log_err();
-                        }
-                        ContentChunk::ToolResult { .. } | ContentChunk::WebSearchToolResult => {
-                            debug_panic!(
-                                "Should not get tool results with role: assistant. should we handle this?"
-                            );
-                        }
-                        ContentChunk::Image { source } => {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(source.into(), false, cx)
-                                })
-                                .log_err();
-                        }
-                        ContentChunk::Document => {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(
-                                        format!("Unsupported content: {:?}", chunk).into(),
-                                        false,
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                        }
-                    }
-                }
-            }
-            SdkMessage::Result {
-                is_error,
-                subtype,
-                result,
-                ..
-            } => {
-                let turn_state = turn_state.take();
-                let was_canceled = turn_state.is_canceled();
-                let Some(end_turn_tx) = turn_state.end_tx() else {
-                    debug_panic!("Received `SdkMessage::Result` but there wasn't an active turn");
-                    return;
-                };
-
-                if is_error || (!was_canceled && subtype == ResultErrorType::ErrorDuringExecution) {
-                    end_turn_tx
-                        .send(Err(anyhow!(
-                            "Error: {}",
-                            result.unwrap_or_else(|| subtype.to_string())
-                        )))
-                        .ok();
-                } else {
-                    let stop_reason = match subtype {
-                        ResultErrorType::Success => acp::StopReason::EndTurn,
-                        ResultErrorType::ErrorMaxTurns => acp::StopReason::MaxTurnRequests,
-                        ResultErrorType::ErrorDuringExecution => acp::StopReason::Cancelled,
-                    };
-                    end_turn_tx
-                        .send(Ok(acp::PromptResponse { stop_reason }))
-                        .ok();
-                }
-            }
-            SdkMessage::ControlResponse { response } => {
-                if matches!(response.subtype, ResultErrorType::Success) {
-                    let new_state = turn_state.take().confirm_cancellation(&response.request_id);
-                    turn_state.replace(new_state);
-                } else {
-                    log::error!("Control response error: {:?}", response);
-                }
-            }
-            SdkMessage::System { .. } => {}
-        }
-    }
-
-    async fn handle_io(
-        mut outgoing_rx: UnboundedReceiver<SdkMessage>,
-        incoming_tx: UnboundedSender<SdkMessage>,
-        mut outgoing_bytes: impl Unpin + AsyncWrite,
-        incoming_bytes: impl Unpin + AsyncRead,
-    ) -> Result<UnboundedReceiver<SdkMessage>> {
-        let mut output_reader = BufReader::new(incoming_bytes);
-        let mut outgoing_line = Vec::new();
-        let mut incoming_line = String::new();
-        loop {
-            select_biased! {
-                message = outgoing_rx.next() => {
-                    if let Some(message) = message {
-                        outgoing_line.clear();
-                        serde_json::to_writer(&mut outgoing_line, &message)?;
-                        log::trace!("send: {}", String::from_utf8_lossy(&outgoing_line));
-                        outgoing_line.push(b'\n');
-                        outgoing_bytes.write_all(&outgoing_line).await.ok();
-                    } else {
-                        break;
-                    }
-                }
-                bytes_read = output_reader.read_line(&mut incoming_line).fuse() => {
-                    if bytes_read? == 0 {
-                        break
-                    }
-                    log::trace!("recv: {}", &incoming_line);
-                    match serde_json::from_str::<SdkMessage>(&incoming_line) {
-                        Ok(message) => {
-                            incoming_tx.unbounded_send(message).log_err();
-                        }
-                        Err(error) => {
-                            log::error!("failed to parse incoming message: {error}. Raw: {incoming_line}");
-                        }
-                    }
-                    incoming_line.clear();
-                }
-            }
-        }
-
-        Ok(outgoing_rx)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct Message {
-    role: Role,
-    content: Content,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    model: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    stop_reason: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    stop_sequence: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    usage: Option<Usage>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-enum Content {
-    UntaggedText(String),
-    Chunks(Vec<ContentChunk>),
-}
-
-impl Content {
-    pub fn chunks(self) -> impl Iterator<Item = ContentChunk> {
-        match self {
-            Self::Chunks(chunks) => chunks.into_iter(),
-            Self::UntaggedText(text) => vec![ContentChunk::Text { text }].into_iter(),
-        }
-    }
-}
-
-impl Display for Content {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Content::UntaggedText(txt) => write!(f, "{}", txt),
-            Content::Chunks(chunks) => {
-                for chunk in chunks {
-                    write!(f, "{}", chunk)?;
-                }
-                Ok(())
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-enum ContentChunk {
-    Text {
-        text: String,
-    },
-    ToolUse {
-        id: String,
-        name: String,
-        input: serde_json::Value,
-    },
-    ToolResult {
-        content: Content,
-        tool_use_id: String,
-    },
-    Thinking {
-        thinking: String,
-    },
-    RedactedThinking,
-    Image {
-        source: ImageSource,
-    },
-    // TODO
-    Document,
-    WebSearchToolResult,
-    #[serde(untagged)]
-    UntaggedText(String),
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-enum ImageSource {
-    Base64 { data: String, media_type: String },
-    Url { url: String },
-}
-
-impl Into<acp::ContentBlock> for ImageSource {
-    fn into(self) -> acp::ContentBlock {
-        match self {
-            ImageSource::Base64 { data, media_type } => {
-                acp::ContentBlock::Image(acp::ImageContent {
-                    annotations: None,
-                    data,
-                    mime_type: media_type,
-                    uri: None,
-                })
-            }
-            ImageSource::Url { url } => acp::ContentBlock::Image(acp::ImageContent {
-                annotations: None,
-                data: "".to_string(),
-                mime_type: "".to_string(),
-                uri: Some(url),
-            }),
-        }
-    }
-}
-
-impl Display for ContentChunk {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ContentChunk::Text { text } => write!(f, "{}", text),
-            ContentChunk::Thinking { thinking } => write!(f, "Thinking: {}", thinking),
-            ContentChunk::RedactedThinking => write!(f, "Thinking: [REDACTED]"),
-            ContentChunk::UntaggedText(text) => write!(f, "{}", text),
-            ContentChunk::ToolResult { content, .. } => write!(f, "{}", content),
-            ContentChunk::Image { .. }
-            | ContentChunk::Document
-            | ContentChunk::ToolUse { .. }
-            | ContentChunk::WebSearchToolResult => {
-                write!(f, "\n{:?}\n", &self)
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct Usage {
-    input_tokens: u32,
-    cache_creation_input_tokens: u32,
-    cache_read_input_tokens: u32,
-    output_tokens: u32,
-    service_tier: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-enum Role {
-    System,
-    Assistant,
-    User,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct MessageParam {
-    role: Role,
-    content: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-enum SdkMessage {
-    // An assistant message
-    Assistant {
-        message: Message, // from Anthropic SDK
-        #[serde(skip_serializing_if = "Option::is_none")]
-        session_id: Option<String>,
-    },
-    // A user message
-    User {
-        message: Message, // from Anthropic SDK
-        #[serde(skip_serializing_if = "Option::is_none")]
-        session_id: Option<String>,
-    },
-    // Emitted as the last message in a conversation
-    Result {
-        subtype: ResultErrorType,
-        duration_ms: f64,
-        duration_api_ms: f64,
-        is_error: bool,
-        num_turns: i32,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        result: Option<String>,
-        session_id: String,
-        total_cost_usd: f64,
-    },
-    // Emitted as the first message at the start of a conversation
-    System {
-        cwd: String,
-        session_id: String,
-        tools: Vec<String>,
-        model: String,
-        mcp_servers: Vec<McpServer>,
-        #[serde(rename = "apiKeySource")]
-        api_key_source: String,
-        #[serde(rename = "permissionMode")]
-        permission_mode: PermissionMode,
-    },
-    /// Messages used to control the conversation, outside of chat messages to the model
-    ControlRequest {
-        request_id: String,
-        request: ControlRequest,
-    },
-    /// Response to a control request
-    ControlResponse { response: ControlResponse },
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "subtype", rename_all = "snake_case")]
-enum ControlRequest {
-    /// Cancel the current conversation
-    Interrupt,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct ControlResponse {
-    request_id: String,
-    subtype: ResultErrorType,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-enum ResultErrorType {
-    Success,
-    ErrorMaxTurns,
-    ErrorDuringExecution,
-}
-
-impl Display for ResultErrorType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ResultErrorType::Success => write!(f, "success"),
-            ResultErrorType::ErrorMaxTurns => write!(f, "error_max_turns"),
-            ResultErrorType::ErrorDuringExecution => write!(f, "error_during_execution"),
-        }
-    }
-}
-
-fn acp_content_to_claude(prompt: Vec<acp::ContentBlock>) -> Vec<ContentChunk> {
-    let mut content = Vec::with_capacity(prompt.len());
-    let mut context = Vec::with_capacity(prompt.len());
-
-    for chunk in prompt {
-        match chunk {
-            acp::ContentBlock::Text(text_content) => {
-                content.push(ContentChunk::Text {
-                    text: text_content.text,
-                });
-            }
-            acp::ContentBlock::ResourceLink(resource_link) => {
-                match MentionUri::parse(&resource_link.uri) {
-                    Ok(uri) => {
-                        content.push(ContentChunk::Text {
-                            text: format!("{}", uri.as_link()),
-                        });
-                    }
-                    Err(_) => {
-                        content.push(ContentChunk::Text {
-                            text: resource_link.uri,
-                        });
-                    }
-                }
-            }
-            acp::ContentBlock::Resource(resource) => match resource.resource {
-                acp::EmbeddedResourceResource::TextResourceContents(resource) => {
-                    match MentionUri::parse(&resource.uri) {
-                        Ok(uri) => {
-                            content.push(ContentChunk::Text {
-                                text: format!("{}", uri.as_link()),
-                            });
-                        }
-                        Err(_) => {
-                            content.push(ContentChunk::Text {
-                                text: resource.uri.clone(),
-                            });
-                        }
-                    }
-
-                    context.push(ContentChunk::Text {
-                        text: format!(
-                            "\n<context ref=\"{}\">\n{}\n</context>",
-                            resource.uri, resource.text
-                        ),
-                    });
-                }
-                acp::EmbeddedResourceResource::BlobResourceContents(_) => {
-                    // Unsupported by SDK
-                }
-            },
-            acp::ContentBlock::Image(acp::ImageContent {
-                data, mime_type, ..
-            }) => content.push(ContentChunk::Image {
-                source: ImageSource::Base64 {
-                    data,
-                    media_type: mime_type,
-                },
-            }),
-            acp::ContentBlock::Audio(_) => {
-                // Unsupported by SDK
-            }
-        }
-    }
-
-    content.extend(context);
-    content
-}
-
-fn new_request_id() -> String {
-    use rand::Rng;
-    // In the Claude Code TS SDK they just generate a random 12 character string,
-    // `Math.random().toString(36).substring(2, 15)`
-    rand::thread_rng()
-        .sample_iter(&rand::distributions::Alphanumeric)
-        .take(12)
-        .map(char::from)
-        .collect()
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct McpServer {
-    name: String,
-    status: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-enum PermissionMode {
-    Default,
-    AcceptEdits,
-    BypassPermissions,
-    Plan,
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use crate::e2e_tests;
-    use gpui::TestAppContext;
-    use serde_json::json;
-
-    crate::common_e2e_tests!(async |_, _, _| ClaudeCode, allow_option_id = "allow");
-
-    pub fn local_command() -> AgentServerCommand {
-        AgentServerCommand {
-            path: "claude".into(),
-            args: vec![],
-            env: None,
-        }
-    }
-
-    #[gpui::test]
-    #[cfg_attr(not(feature = "e2e"), ignore)]
-    async fn test_todo_plan(cx: &mut TestAppContext) {
-        let fs = e2e_tests::init_test(cx).await;
-        let project = Project::test(fs, [], cx).await;
-        let thread =
-            e2e_tests::new_test_thread(ClaudeCode, project.clone(), "/private/tmp", cx).await;
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.send_raw(
-                    "Create a todo plan for initializing a new React app. I'll follow it myself, do not execute on it.",
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let mut entries_len = 0;
-
-        thread.read_with(cx, |thread, _| {
-            entries_len = thread.plan().entries.len();
-            assert!(!thread.plan().entries.is_empty(), "Empty plan");
-        });
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.send_raw(
-                    "Mark the first entry status as in progress without acting on it.",
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        thread.read_with(cx, |thread, _| {
-            assert!(matches!(
-                thread.plan().entries[0].status,
-                acp::PlanEntryStatus::InProgress
-            ));
-            assert_eq!(thread.plan().entries.len(), entries_len);
-        });
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.send_raw(
-                    "Now mark the first entry as completed without acting on it.",
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        thread.read_with(cx, |thread, _| {
-            assert!(matches!(
-                thread.plan().entries[0].status,
-                acp::PlanEntryStatus::Completed
-            ));
-            assert_eq!(thread.plan().entries.len(), entries_len);
-        });
-    }
-
-    #[test]
-    fn test_deserialize_content_untagged_text() {
-        let json = json!("Hello, world!");
-        let content: Content = serde_json::from_value(json).unwrap();
-        match content {
-            Content::UntaggedText(text) => assert_eq!(text, "Hello, world!"),
-            _ => panic!("Expected UntaggedText variant"),
-        }
-    }
-
-    #[test]
-    fn test_deserialize_content_chunks() {
-        let json = json!([
-            {
-                "type": "text",
-                "text": "Hello"
-            },
-            {
-                "type": "tool_use",
-                "id": "tool_123",
-                "name": "calculator",
-                "input": {"operation": "add", "a": 1, "b": 2}
-            }
-        ]);
-        let content: Content = serde_json::from_value(json).unwrap();
-        match content {
-            Content::Chunks(chunks) => {
-                assert_eq!(chunks.len(), 2);
-                match &chunks[0] {
-                    ContentChunk::Text { text } => assert_eq!(text, "Hello"),
-                    _ => panic!("Expected Text chunk"),
-                }
-                match &chunks[1] {
-                    ContentChunk::ToolUse { id, name, input } => {
-                        assert_eq!(id, "tool_123");
-                        assert_eq!(name, "calculator");
-                        assert_eq!(input["operation"], "add");
-                        assert_eq!(input["a"], 1);
-                        assert_eq!(input["b"], 2);
-                    }
-                    _ => panic!("Expected ToolUse chunk"),
-                }
-            }
-            _ => panic!("Expected Chunks variant"),
-        }
-    }
-
-    #[test]
-    fn test_deserialize_tool_result_untagged_text() {
-        let json = json!({
-            "type": "tool_result",
-            "content": "Result content",
-            "tool_use_id": "tool_456"
-        });
-        let chunk: ContentChunk = serde_json::from_value(json).unwrap();
-        match chunk {
-            ContentChunk::ToolResult {
-                content,
-                tool_use_id,
-            } => {
-                match content {
-                    Content::UntaggedText(text) => assert_eq!(text, "Result content"),
-                    _ => panic!("Expected UntaggedText content"),
-                }
-                assert_eq!(tool_use_id, "tool_456");
-            }
-            _ => panic!("Expected ToolResult variant"),
-        }
-    }
-
-    #[test]
-    fn test_deserialize_tool_result_chunks() {
-        let json = json!({
-            "type": "tool_result",
-            "content": [
-                {
-                    "type": "text",
-                    "text": "Processing complete"
-                },
-                {
-                    "type": "text",
-                    "text": "Result: 42"
-                }
-            ],
-            "tool_use_id": "tool_789"
-        });
-        let chunk: ContentChunk = serde_json::from_value(json).unwrap();
-        match chunk {
-            ContentChunk::ToolResult {
-                content,
-                tool_use_id,
-            } => {
-                match content {
-                    Content::Chunks(chunks) => {
-                        assert_eq!(chunks.len(), 2);
-                        match &chunks[0] {
-                            ContentChunk::Text { text } => assert_eq!(text, "Processing complete"),
-                            _ => panic!("Expected Text chunk"),
-                        }
-                        match &chunks[1] {
-                            ContentChunk::Text { text } => assert_eq!(text, "Result: 42"),
-                            _ => panic!("Expected Text chunk"),
-                        }
-                    }
-                    _ => panic!("Expected Chunks content"),
-                }
-                assert_eq!(tool_use_id, "tool_789");
-            }
-            _ => panic!("Expected ToolResult variant"),
-        }
-    }
-
-    #[test]
-    fn test_acp_content_to_claude() {
-        let acp_content = vec![
-            acp::ContentBlock::Text(acp::TextContent {
-                text: "Hello world".to_string(),
-                annotations: None,
-            }),
-            acp::ContentBlock::Image(acp::ImageContent {
-                data: "base64data".to_string(),
-                mime_type: "image/png".to_string(),
-                annotations: None,
-                uri: None,
-            }),
-            acp::ContentBlock::ResourceLink(acp::ResourceLink {
-                uri: "file:///path/to/example.rs".to_string(),
-                name: "example.rs".to_string(),
-                annotations: None,
-                description: None,
-                mime_type: None,
-                size: None,
-                title: None,
-            }),
-            acp::ContentBlock::Resource(acp::EmbeddedResource {
-                annotations: None,
-                resource: acp::EmbeddedResourceResource::TextResourceContents(
-                    acp::TextResourceContents {
-                        mime_type: None,
-                        text: "fn main() { println!(\"Hello!\"); }".to_string(),
-                        uri: "file:///path/to/code.rs".to_string(),
-                    },
-                ),
-            }),
-            acp::ContentBlock::ResourceLink(acp::ResourceLink {
-                uri: "invalid_uri_format".to_string(),
-                name: "invalid.txt".to_string(),
-                annotations: None,
-                description: None,
-                mime_type: None,
-                size: None,
-                title: None,
-            }),
-        ];
-
-        let claude_content = acp_content_to_claude(acp_content);
-
-        assert_eq!(claude_content.len(), 6);
-
-        match &claude_content[0] {
-            ContentChunk::Text { text } => assert_eq!(text, "Hello world"),
-            _ => panic!("Expected Text chunk"),
-        }
-
-        match &claude_content[1] {
-            ContentChunk::Image { source } => match source {
-                ImageSource::Base64 { data, media_type } => {
-                    assert_eq!(data, "base64data");
-                    assert_eq!(media_type, "image/png");
-                }
-                _ => panic!("Expected Base64 image source"),
-            },
-            _ => panic!("Expected Image chunk"),
-        }
-
-        match &claude_content[2] {
-            ContentChunk::Text { text } => {
-                assert!(text.contains("example.rs"));
-                assert!(text.contains("file:///path/to/example.rs"));
-            }
-            _ => panic!("Expected Text chunk for ResourceLink"),
-        }
-
-        match &claude_content[3] {
-            ContentChunk::Text { text } => {
-                assert!(text.contains("code.rs"));
-                assert!(text.contains("file:///path/to/code.rs"));
-            }
-            _ => panic!("Expected Text chunk for Resource"),
-        }
-
-        match &claude_content[4] {
-            ContentChunk::Text { text } => {
-                assert_eq!(text, "invalid_uri_format");
-            }
-            _ => panic!("Expected Text chunk for invalid URI"),
-        }
-
-        match &claude_content[5] {
-            ContentChunk::Text { text } => {
-                assert!(text.contains("<context ref=\"file:///path/to/code.rs\">"));
-                assert!(text.contains("fn main() { println!(\"Hello!\"); }"));
-                assert!(text.contains("</context>"));
-            }
-            _ => panic!("Expected Text chunk for context"),
-        }
-    }
-}
diff --git a/crates/agent_servers/src/claude/edit_tool.rs b/crates/agent_servers/src/claude/edit_tool.rs
deleted file mode 100644
index a8d93c3f3d..0000000000
--- a/crates/agent_servers/src/claude/edit_tool.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-use acp_thread::AcpThread;
-use anyhow::Result;
-use context_server::{
-    listener::{McpServerTool, ToolResponse},
-    types::{ToolAnnotations, ToolResponseContent},
-};
-use gpui::{AsyncApp, WeakEntity};
-use language::unified_diff;
-use util::markdown::MarkdownCodeBlock;
-
-use crate::tools::EditToolParams;
-
-#[derive(Clone)]
-pub struct EditTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl EditTool {
-    pub fn new(thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
-        Self { thread_rx }
-    }
-}
-
-impl McpServerTool for EditTool {
-    type Input = EditToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Edit";
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Edit file".to_string()),
-            read_only_hint: Some(false),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: Some(false),
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.abs_path.clone(), None, None, true, cx)
-            })?
-            .await?;
-
-        let (new_content, diff) = cx
-            .background_executor()
-            .spawn(async move {
-                let new_content = content.replace(&input.old_text, &input.new_text);
-                if new_content == content {
-                    return Err(anyhow::anyhow!("Failed to find `old_text`",));
-                }
-                let diff = unified_diff(&content, &new_content);
-
-                Ok((new_content, diff))
-            })
-            .await?;
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.write_text_file(input.abs_path, new_content, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text {
-                text: MarkdownCodeBlock {
-                    tag: "diff",
-                    text: diff.as_str().trim_end_matches('\n'),
-                }
-                .to_string(),
-            }],
-            structured_content: (),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::rc::Rc;
-
-    use acp_thread::{AgentConnection, StubAgentConnection};
-    use gpui::{Entity, TestAppContext};
-    use indoc::indoc;
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn old_text_not_found(cx: &mut TestAppContext) {
-        let (_thread, tool) = init_test(cx).await;
-
-        let result = tool
-            .run(
-                EditToolParams {
-                    abs_path: path!("/root/file.txt").into(),
-                    old_text: "hi".into(),
-                    new_text: "bye".into(),
-                },
-                &mut cx.to_async(),
-            )
-            .await;
-
-        assert_eq!(result.unwrap_err().to_string(), "Failed to find `old_text`");
-    }
-
-    #[gpui::test]
-    async fn found_and_replaced(cx: &mut TestAppContext) {
-        let (_thread, tool) = init_test(cx).await;
-
-        let result = tool
-            .run(
-                EditToolParams {
-                    abs_path: path!("/root/file.txt").into(),
-                    old_text: "hello".into(),
-                    new_text: "hi".into(),
-                },
-                &mut cx.to_async(),
-            )
-            .await;
-
-        assert_eq!(
-            result.unwrap().content[0].text().unwrap(),
-            indoc! {
-                r"
-                ```diff
-                @@ -1,1 +1,1 @@
-                -hello
-                +hi
-                ```
-                "
-            }
-        );
-    }
-
-    async fn init_test(cx: &mut TestAppContext) -> (Entity<AcpThread>, EditTool) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-        });
-
-        let connection = Rc::new(StubAgentConnection::new());
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "file.txt": "hello"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-        let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, path!("/test").as_ref(), cx))
-            .await
-            .unwrap();
-
-        thread_tx.send(thread.downgrade()).unwrap();
-
-        (thread, EditTool::new(thread_rx))
-    }
-}
diff --git a/crates/agent_servers/src/claude/mcp_server.rs b/crates/agent_servers/src/claude/mcp_server.rs
deleted file mode 100644
index 6442c784b5..0000000000
--- a/crates/agent_servers/src/claude/mcp_server.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use crate::claude::edit_tool::EditTool;
-use crate::claude::permission_tool::PermissionTool;
-use crate::claude::read_tool::ReadTool;
-use crate::claude::write_tool::WriteTool;
-use acp_thread::AcpThread;
-#[cfg(not(test))]
-use anyhow::Context as _;
-use anyhow::Result;
-use collections::HashMap;
-use context_server::types::{
-    Implementation, InitializeParams, InitializeResponse, ProtocolVersion, ServerCapabilities,
-    ToolsCapabilities, requests,
-};
-use gpui::{App, AsyncApp, Task, WeakEntity};
-use project::Fs;
-use serde::Serialize;
-
-pub struct ClaudeZedMcpServer {
-    server: context_server::listener::McpServer,
-}
-
-pub const SERVER_NAME: &str = "zed";
-
-impl ClaudeZedMcpServer {
-    pub async fn new(
-        thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-        fs: Arc<dyn Fs>,
-        cx: &AsyncApp,
-    ) -> Result<Self> {
-        let mut mcp_server = context_server::listener::McpServer::new(cx).await?;
-        mcp_server.handle_request::<requests::Initialize>(Self::handle_initialize);
-
-        mcp_server.add_tool(PermissionTool::new(fs.clone(), thread_rx.clone()));
-        mcp_server.add_tool(ReadTool::new(thread_rx.clone()));
-        mcp_server.add_tool(EditTool::new(thread_rx.clone()));
-        mcp_server.add_tool(WriteTool::new(thread_rx.clone()));
-
-        Ok(Self { server: mcp_server })
-    }
-
-    pub fn server_config(&self) -> Result<McpServerConfig> {
-        #[cfg(not(test))]
-        let zed_path = std::env::current_exe()
-            .context("finding current executable path for use in mcp_server")?;
-
-        #[cfg(test)]
-        let zed_path = crate::e2e_tests::get_zed_path();
-
-        Ok(McpServerConfig {
-            command: zed_path,
-            args: vec![
-                "--nc".into(),
-                self.server.socket_path().display().to_string(),
-            ],
-            env: None,
-        })
-    }
-
-    fn handle_initialize(_: InitializeParams, cx: &App) -> Task<Result<InitializeResponse>> {
-        cx.foreground_executor().spawn(async move {
-            Ok(InitializeResponse {
-                protocol_version: ProtocolVersion("2025-06-18".into()),
-                capabilities: ServerCapabilities {
-                    experimental: None,
-                    logging: None,
-                    completions: None,
-                    prompts: None,
-                    resources: None,
-                    tools: Some(ToolsCapabilities {
-                        list_changed: Some(false),
-                    }),
-                },
-                server_info: Implementation {
-                    name: SERVER_NAME.into(),
-                    version: "0.1.0".into(),
-                },
-                meta: None,
-            })
-        })
-    }
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct McpConfig {
-    pub mcp_servers: HashMap<String, McpServerConfig>,
-}
-
-#[derive(Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct McpServerConfig {
-    pub command: PathBuf,
-    pub args: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/agent_servers/src/claude/permission_tool.rs b/crates/agent_servers/src/claude/permission_tool.rs
deleted file mode 100644
index 96a24105e8..0000000000
--- a/crates/agent_servers/src/claude/permission_tool.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use std::sync::Arc;
-
-use acp_thread::AcpThread;
-use agent_client_protocol as acp;
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result};
-use context_server::{
-    listener::{McpServerTool, ToolResponse},
-    types::ToolResponseContent,
-};
-use gpui::{AsyncApp, WeakEntity};
-use project::Fs;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{Settings as _, update_settings_file};
-use util::debug_panic;
-
-use crate::tools::ClaudeTool;
-
-#[derive(Clone)]
-pub struct PermissionTool {
-    fs: Arc<dyn Fs>,
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-/// Request permission for tool calls
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct PermissionToolParams {
-    tool_name: String,
-    input: serde_json::Value,
-    tool_use_id: Option<String>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PermissionToolResponse {
-    behavior: PermissionToolBehavior,
-    updated_input: serde_json::Value,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-enum PermissionToolBehavior {
-    Allow,
-    Deny,
-}
-
-impl PermissionTool {
-    pub fn new(fs: Arc<dyn Fs>, thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
-        Self { fs, thread_rx }
-    }
-}
-
-impl McpServerTool for PermissionTool {
-    type Input = PermissionToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Confirmation";
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        if agent_settings::AgentSettings::try_read_global(cx, |settings| {
-            settings.always_allow_tool_actions
-        })
-        .unwrap_or(false)
-        {
-            let response = PermissionToolResponse {
-                behavior: PermissionToolBehavior::Allow,
-                updated_input: input.input,
-            };
-
-            return Ok(ToolResponse {
-                content: vec![ToolResponseContent::Text {
-                    text: serde_json::to_string(&response)?,
-                }],
-                structured_content: (),
-            });
-        }
-
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let claude_tool = ClaudeTool::infer(&input.tool_name, input.input.clone());
-        let tool_call_id = acp::ToolCallId(input.tool_use_id.context("Tool ID required")?.into());
-
-        const ALWAYS_ALLOW: &str = "always_allow";
-        const ALLOW: &str = "allow";
-        const REJECT: &str = "reject";
-
-        let chosen_option = thread
-            .update(cx, |thread, cx| {
-                thread.request_tool_call_authorization(
-                    claude_tool.as_acp(tool_call_id).into(),
-                    vec![
-                        acp::PermissionOption {
-                            id: acp::PermissionOptionId(ALWAYS_ALLOW.into()),
-                            name: "Always Allow".into(),
-                            kind: acp::PermissionOptionKind::AllowAlways,
-                        },
-                        acp::PermissionOption {
-                            id: acp::PermissionOptionId(ALLOW.into()),
-                            name: "Allow".into(),
-                            kind: acp::PermissionOptionKind::AllowOnce,
-                        },
-                        acp::PermissionOption {
-                            id: acp::PermissionOptionId(REJECT.into()),
-                            name: "Reject".into(),
-                            kind: acp::PermissionOptionKind::RejectOnce,
-                        },
-                    ],
-                    cx,
-                )
-            })??
-            .await?;
-
-        let response = match chosen_option.0.as_ref() {
-            ALWAYS_ALLOW => {
-                cx.update(|cx| {
-                    update_settings_file::<AgentSettings>(self.fs.clone(), cx, |settings, _| {
-                        settings.set_always_allow_tool_actions(true);
-                    });
-                })?;
-
-                PermissionToolResponse {
-                    behavior: PermissionToolBehavior::Allow,
-                    updated_input: input.input,
-                }
-            }
-            ALLOW => PermissionToolResponse {
-                behavior: PermissionToolBehavior::Allow,
-                updated_input: input.input,
-            },
-            REJECT => PermissionToolResponse {
-                behavior: PermissionToolBehavior::Deny,
-                updated_input: input.input,
-            },
-            opt => {
-                debug_panic!("Unexpected option: {}", opt);
-                PermissionToolResponse {
-                    behavior: PermissionToolBehavior::Deny,
-                    updated_input: input.input,
-                }
-            }
-        };
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text {
-                text: serde_json::to_string(&response)?,
-            }],
-            structured_content: (),
-        })
-    }
-}
diff --git a/crates/agent_servers/src/claude/read_tool.rs b/crates/agent_servers/src/claude/read_tool.rs
deleted file mode 100644
index cbe25876b3..0000000000
--- a/crates/agent_servers/src/claude/read_tool.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use acp_thread::AcpThread;
-use anyhow::Result;
-use context_server::{
-    listener::{McpServerTool, ToolResponse},
-    types::{ToolAnnotations, ToolResponseContent},
-};
-use gpui::{AsyncApp, WeakEntity};
-
-use crate::tools::ReadToolParams;
-
-#[derive(Clone)]
-pub struct ReadTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl ReadTool {
-    pub fn new(thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
-        Self { thread_rx }
-    }
-}
-
-impl McpServerTool for ReadTool {
-    type Input = ReadToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Read";
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Read file".to_string()),
-            read_only_hint: Some(true),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: None,
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.abs_path, input.offset, input.limit, false, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text { text: content }],
-            structured_content: (),
-        })
-    }
-}
diff --git a/crates/agent_servers/src/claude/tools.rs b/crates/agent_servers/src/claude/tools.rs
deleted file mode 100644
index 3231903001..0000000000
--- a/crates/agent_servers/src/claude/tools.rs
+++ /dev/null
@@ -1,688 +0,0 @@
-use std::path::PathBuf;
-
-use agent_client_protocol as acp;
-use itertools::Itertools;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use util::ResultExt;
-
-pub enum ClaudeTool {
-    Task(Option<TaskToolParams>),
-    NotebookRead(Option<NotebookReadToolParams>),
-    NotebookEdit(Option<NotebookEditToolParams>),
-    Edit(Option<EditToolParams>),
-    MultiEdit(Option<MultiEditToolParams>),
-    ReadFile(Option<ReadToolParams>),
-    Write(Option<WriteToolParams>),
-    Ls(Option<LsToolParams>),
-    Glob(Option<GlobToolParams>),
-    Grep(Option<GrepToolParams>),
-    Terminal(Option<BashToolParams>),
-    WebFetch(Option<WebFetchToolParams>),
-    WebSearch(Option<WebSearchToolParams>),
-    TodoWrite(Option<TodoWriteToolParams>),
-    ExitPlanMode(Option<ExitPlanModeToolParams>),
-    Other {
-        name: String,
-        input: serde_json::Value,
-    },
-}
-
-impl ClaudeTool {
-    pub fn infer(tool_name: &str, input: serde_json::Value) -> Self {
-        match tool_name {
-            // Known tools
-            "mcp__zed__Read" => Self::ReadFile(serde_json::from_value(input).log_err()),
-            "mcp__zed__Edit" => Self::Edit(serde_json::from_value(input).log_err()),
-            "mcp__zed__Write" => Self::Write(serde_json::from_value(input).log_err()),
-            "MultiEdit" => Self::MultiEdit(serde_json::from_value(input).log_err()),
-            "Write" => Self::Write(serde_json::from_value(input).log_err()),
-            "LS" => Self::Ls(serde_json::from_value(input).log_err()),
-            "Glob" => Self::Glob(serde_json::from_value(input).log_err()),
-            "Grep" => Self::Grep(serde_json::from_value(input).log_err()),
-            "Bash" => Self::Terminal(serde_json::from_value(input).log_err()),
-            "WebFetch" => Self::WebFetch(serde_json::from_value(input).log_err()),
-            "WebSearch" => Self::WebSearch(serde_json::from_value(input).log_err()),
-            "TodoWrite" => Self::TodoWrite(serde_json::from_value(input).log_err()),
-            "exit_plan_mode" => Self::ExitPlanMode(serde_json::from_value(input).log_err()),
-            "Task" => Self::Task(serde_json::from_value(input).log_err()),
-            "NotebookRead" => Self::NotebookRead(serde_json::from_value(input).log_err()),
-            "NotebookEdit" => Self::NotebookEdit(serde_json::from_value(input).log_err()),
-            // Inferred from name
-            _ => {
-                let tool_name = tool_name.to_lowercase();
-
-                if tool_name.contains("edit") || tool_name.contains("write") {
-                    Self::Edit(None)
-                } else if tool_name.contains("terminal") {
-                    Self::Terminal(None)
-                } else {
-                    Self::Other {
-                        name: tool_name,
-                        input,
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn label(&self) -> String {
-        match &self {
-            Self::Task(Some(params)) => params.description.clone(),
-            Self::Task(None) => "Task".into(),
-            Self::NotebookRead(Some(params)) => {
-                format!("Read Notebook {}", params.notebook_path.display())
-            }
-            Self::NotebookRead(None) => "Read Notebook".into(),
-            Self::NotebookEdit(Some(params)) => {
-                format!("Edit Notebook {}", params.notebook_path.display())
-            }
-            Self::NotebookEdit(None) => "Edit Notebook".into(),
-            Self::Terminal(Some(params)) => format!("`{}`", params.command),
-            Self::Terminal(None) => "Terminal".into(),
-            Self::ReadFile(_) => "Read File".into(),
-            Self::Ls(Some(params)) => {
-                format!("List Directory {}", params.path.display())
-            }
-            Self::Ls(None) => "List Directory".into(),
-            Self::Edit(Some(params)) => {
-                format!("Edit {}", params.abs_path.display())
-            }
-            Self::Edit(None) => "Edit".into(),
-            Self::MultiEdit(Some(params)) => {
-                format!("Multi Edit {}", params.file_path.display())
-            }
-            Self::MultiEdit(None) => "Multi Edit".into(),
-            Self::Write(Some(params)) => {
-                format!("Write {}", params.abs_path.display())
-            }
-            Self::Write(None) => "Write".into(),
-            Self::Glob(Some(params)) => {
-                format!("Glob `{params}`")
-            }
-            Self::Glob(None) => "Glob".into(),
-            Self::Grep(Some(params)) => format!("`{params}`"),
-            Self::Grep(None) => "Grep".into(),
-            Self::WebFetch(Some(params)) => format!("Fetch {}", params.url),
-            Self::WebFetch(None) => "Fetch".into(),
-            Self::WebSearch(Some(params)) => format!("Web Search: {}", params),
-            Self::WebSearch(None) => "Web Search".into(),
-            Self::TodoWrite(Some(params)) => format!(
-                "Update TODOs: {}",
-                params.todos.iter().map(|todo| &todo.content).join(", ")
-            ),
-            Self::TodoWrite(None) => "Update TODOs".into(),
-            Self::ExitPlanMode(_) => "Exit Plan Mode".into(),
-            Self::Other { name, .. } => name.clone(),
-        }
-    }
-    pub fn content(&self) -> Vec<acp::ToolCallContent> {
-        match &self {
-            Self::Other { input, .. } => vec![
-                format!(
-                    "```json\n{}```",
-                    serde_json::to_string_pretty(&input).unwrap_or("{}".to_string())
-                )
-                .into(),
-            ],
-            Self::Task(Some(params)) => vec![params.prompt.clone().into()],
-            Self::NotebookRead(Some(params)) => {
-                vec![params.notebook_path.display().to_string().into()]
-            }
-            Self::NotebookEdit(Some(params)) => vec![params.new_source.clone().into()],
-            Self::Terminal(Some(params)) => vec![
-                format!(
-                    "`{}`\n\n{}",
-                    params.command,
-                    params.description.as_deref().unwrap_or_default()
-                )
-                .into(),
-            ],
-            Self::ReadFile(Some(params)) => vec![params.abs_path.display().to_string().into()],
-            Self::Ls(Some(params)) => vec![params.path.display().to_string().into()],
-            Self::Glob(Some(params)) => vec![params.to_string().into()],
-            Self::Grep(Some(params)) => vec![format!("`{params}`").into()],
-            Self::WebFetch(Some(params)) => vec![params.prompt.clone().into()],
-            Self::WebSearch(Some(params)) => vec![params.to_string().into()],
-            Self::ExitPlanMode(Some(params)) => vec![params.plan.clone().into()],
-            Self::Edit(Some(params)) => vec![acp::ToolCallContent::Diff {
-                diff: acp::Diff {
-                    path: params.abs_path.clone(),
-                    old_text: Some(params.old_text.clone()),
-                    new_text: params.new_text.clone(),
-                },
-            }],
-            Self::Write(Some(params)) => vec![acp::ToolCallContent::Diff {
-                diff: acp::Diff {
-                    path: params.abs_path.clone(),
-                    old_text: None,
-                    new_text: params.content.clone(),
-                },
-            }],
-            Self::MultiEdit(Some(params)) => {
-                // todo: show multiple edits in a multibuffer?
-                params
-                    .edits
-                    .first()
-                    .map(|edit| {
-                        vec![acp::ToolCallContent::Diff {
-                            diff: acp::Diff {
-                                path: params.file_path.clone(),
-                                old_text: Some(edit.old_string.clone()),
-                                new_text: edit.new_string.clone(),
-                            },
-                        }]
-                    })
-                    .unwrap_or_default()
-            }
-            Self::TodoWrite(Some(_)) => {
-                // These are mapped to plan updates later
-                vec![]
-            }
-            Self::Task(None)
-            | Self::NotebookRead(None)
-            | Self::NotebookEdit(None)
-            | Self::Terminal(None)
-            | Self::ReadFile(None)
-            | Self::Ls(None)
-            | Self::Glob(None)
-            | Self::Grep(None)
-            | Self::WebFetch(None)
-            | Self::WebSearch(None)
-            | Self::TodoWrite(None)
-            | Self::ExitPlanMode(None)
-            | Self::Edit(None)
-            | Self::Write(None)
-            | Self::MultiEdit(None) => vec![],
-        }
-    }
-
-    pub fn kind(&self) -> acp::ToolKind {
-        match self {
-            Self::Task(_) => acp::ToolKind::Think,
-            Self::NotebookRead(_) => acp::ToolKind::Read,
-            Self::NotebookEdit(_) => acp::ToolKind::Edit,
-            Self::Edit(_) => acp::ToolKind::Edit,
-            Self::MultiEdit(_) => acp::ToolKind::Edit,
-            Self::Write(_) => acp::ToolKind::Edit,
-            Self::ReadFile(_) => acp::ToolKind::Read,
-            Self::Ls(_) => acp::ToolKind::Search,
-            Self::Glob(_) => acp::ToolKind::Search,
-            Self::Grep(_) => acp::ToolKind::Search,
-            Self::Terminal(_) => acp::ToolKind::Execute,
-            Self::WebSearch(_) => acp::ToolKind::Search,
-            Self::WebFetch(_) => acp::ToolKind::Fetch,
-            Self::TodoWrite(_) => acp::ToolKind::Think,
-            Self::ExitPlanMode(_) => acp::ToolKind::Think,
-            Self::Other { .. } => acp::ToolKind::Other,
-        }
-    }
-
-    pub fn locations(&self) -> Vec<acp::ToolCallLocation> {
-        match &self {
-            Self::Edit(Some(EditToolParams { abs_path, .. })) => vec![acp::ToolCallLocation {
-                path: abs_path.clone(),
-                line: None,
-            }],
-            Self::MultiEdit(Some(MultiEditToolParams { file_path, .. })) => {
-                vec![acp::ToolCallLocation {
-                    path: file_path.clone(),
-                    line: None,
-                }]
-            }
-            Self::Write(Some(WriteToolParams {
-                abs_path: file_path,
-                ..
-            })) => {
-                vec![acp::ToolCallLocation {
-                    path: file_path.clone(),
-                    line: None,
-                }]
-            }
-            Self::ReadFile(Some(ReadToolParams {
-                abs_path, offset, ..
-            })) => vec![acp::ToolCallLocation {
-                path: abs_path.clone(),
-                line: *offset,
-            }],
-            Self::NotebookRead(Some(NotebookReadToolParams { notebook_path, .. })) => {
-                vec![acp::ToolCallLocation {
-                    path: notebook_path.clone(),
-                    line: None,
-                }]
-            }
-            Self::NotebookEdit(Some(NotebookEditToolParams { notebook_path, .. })) => {
-                vec![acp::ToolCallLocation {
-                    path: notebook_path.clone(),
-                    line: None,
-                }]
-            }
-            Self::Glob(Some(GlobToolParams {
-                path: Some(path), ..
-            })) => vec![acp::ToolCallLocation {
-                path: path.clone(),
-                line: None,
-            }],
-            Self::Ls(Some(LsToolParams { path, .. })) => vec![acp::ToolCallLocation {
-                path: path.clone(),
-                line: None,
-            }],
-            Self::Grep(Some(GrepToolParams {
-                path: Some(path), ..
-            })) => vec![acp::ToolCallLocation {
-                path: PathBuf::from(path),
-                line: None,
-            }],
-            Self::Task(_)
-            | Self::NotebookRead(None)
-            | Self::NotebookEdit(None)
-            | Self::Edit(None)
-            | Self::MultiEdit(None)
-            | Self::Write(None)
-            | Self::ReadFile(None)
-            | Self::Ls(None)
-            | Self::Glob(_)
-            | Self::Grep(_)
-            | Self::Terminal(_)
-            | Self::WebFetch(_)
-            | Self::WebSearch(_)
-            | Self::TodoWrite(_)
-            | Self::ExitPlanMode(_)
-            | Self::Other { .. } => vec![],
-        }
-    }
-
-    pub fn as_acp(&self, id: acp::ToolCallId) -> acp::ToolCall {
-        acp::ToolCall {
-            id,
-            kind: self.kind(),
-            status: acp::ToolCallStatus::InProgress,
-            title: self.label(),
-            content: self.content(),
-            locations: self.locations(),
-            raw_input: None,
-            raw_output: None,
-        }
-    }
-}
-
-/// Edit a file.
-///
-/// In sessions with mcp__zed__Edit always use it instead of Edit as it will
-/// allow the user to conveniently review changes.
-///
-/// File editing instructions:
-/// - The `old_text` param must match existing file content, including indentation.
-/// - The `old_text` param must come from the actual file, not an outline.
-/// - The `old_text` section must not be empty.
-/// - Be minimal with replacements:
-///     - For unique lines, include only those lines.
-///     - For non-unique lines, include enough context to identify them.
-/// - Do not escape quotes, newlines, or other characters.
-/// - Only edit the specified file.
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct EditToolParams {
-    /// The absolute path to the file to read.
-    pub abs_path: PathBuf,
-    /// The old text to replace (must be unique in the file)
-    pub old_text: String,
-    /// The new text.
-    pub new_text: String,
-}
-
-/// Reads the content of the given file in the project.
-///
-/// Never attempt to read a path that hasn't been previously mentioned.
-///
-/// In sessions with mcp__zed__Read always use it instead of Read as it contains the most up-to-date contents.
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct ReadToolParams {
-    /// The absolute path to the file to read.
-    pub abs_path: PathBuf,
-    /// Which line to start reading from. Omit to start from the beginning.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub offset: Option<u32>,
-    /// How many lines to read. Omit for the whole file.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub limit: Option<u32>,
-}
-
-/// Writes content to the specified file in the project.
-///
-/// In sessions with mcp__zed__Write always use it instead of Write as it will
-/// allow the user to conveniently review changes.
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct WriteToolParams {
-    /// The absolute path of the file to write.
-    pub abs_path: PathBuf,
-    /// The full content to write.
-    pub content: String,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct BashToolParams {
-    /// Shell command to execute
-    pub command: String,
-    /// 5-10 word description of what command does
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    /// Timeout in ms (max 600000ms/10min, default 120000ms)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout: Option<u32>,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct GlobToolParams {
-    /// Glob pattern like **/*.js or src/**/*.ts
-    pub pattern: String,
-    /// Directory to search in (omit for current directory)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<PathBuf>,
-}
-
-impl std::fmt::Display for GlobToolParams {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if let Some(path) = &self.path {
-            write!(f, "{}", path.display())?;
-        }
-        write!(f, "{}", self.pattern)
-    }
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct LsToolParams {
-    /// Absolute path to directory
-    pub path: PathBuf,
-    /// Array of glob patterns to ignore
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub ignore: Vec<String>,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct GrepToolParams {
-    /// Regex pattern to search for
-    pub pattern: String,
-    /// File/directory to search (defaults to current directory)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<String>,
-    /// "content" (shows lines), "files_with_matches" (default), "count"
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub output_mode: Option<GrepOutputMode>,
-    /// Filter files with glob pattern like "*.js"
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub glob: Option<String>,
-    /// File type filter like "js", "py", "rust"
-    #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
-    pub file_type: Option<String>,
-    /// Case insensitive search
-    #[serde(rename = "-i", default, skip_serializing_if = "is_false")]
-    pub case_insensitive: bool,
-    /// Show line numbers (content mode only)
-    #[serde(rename = "-n", default, skip_serializing_if = "is_false")]
-    pub line_numbers: bool,
-    /// Lines after match (content mode only)
-    #[serde(rename = "-A", skip_serializing_if = "Option::is_none")]
-    pub after_context: Option<u32>,
-    /// Lines before match (content mode only)
-    #[serde(rename = "-B", skip_serializing_if = "Option::is_none")]
-    pub before_context: Option<u32>,
-    /// Lines before and after match (content mode only)
-    #[serde(rename = "-C", skip_serializing_if = "Option::is_none")]
-    pub context: Option<u32>,
-    /// Enable multiline/cross-line matching
-    #[serde(default, skip_serializing_if = "is_false")]
-    pub multiline: bool,
-    /// Limit output to first N results
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub head_limit: Option<u32>,
-}
-
-impl std::fmt::Display for GrepToolParams {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "grep")?;
-
-        // Boolean flags
-        if self.case_insensitive {
-            write!(f, " -i")?;
-        }
-        if self.line_numbers {
-            write!(f, " -n")?;
-        }
-
-        // Context options
-        if let Some(after) = self.after_context {
-            write!(f, " -A {}", after)?;
-        }
-        if let Some(before) = self.before_context {
-            write!(f, " -B {}", before)?;
-        }
-        if let Some(context) = self.context {
-            write!(f, " -C {}", context)?;
-        }
-
-        // Output mode
-        if let Some(mode) = &self.output_mode {
-            match mode {
-                GrepOutputMode::FilesWithMatches => write!(f, " -l")?,
-                GrepOutputMode::Count => write!(f, " -c")?,
-                GrepOutputMode::Content => {} // Default mode
-            }
-        }
-
-        // Head limit
-        if let Some(limit) = self.head_limit {
-            write!(f, " | head -{}", limit)?;
-        }
-
-        // Glob pattern
-        if let Some(glob) = &self.glob {
-            write!(f, " --include=\"{}\"", glob)?;
-        }
-
-        // File type
-        if let Some(file_type) = &self.file_type {
-            write!(f, " --type={}", file_type)?;
-        }
-
-        // Multiline
-        if self.multiline {
-            write!(f, " -P")?; // Perl-compatible regex for multiline
-        }
-
-        // Pattern (escaped if contains special characters)
-        write!(f, " \"{}\"", self.pattern)?;
-
-        // Path
-        if let Some(path) = &self.path {
-            write!(f, " {}", path)?;
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Default, Deserialize, Serialize, JsonSchema, strum::Display, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum TodoPriority {
-    High,
-    #[default]
-    Medium,
-    Low,
-}
-
-impl Into<acp::PlanEntryPriority> for TodoPriority {
-    fn into(self) -> acp::PlanEntryPriority {
-        match self {
-            TodoPriority::High => acp::PlanEntryPriority::High,
-            TodoPriority::Medium => acp::PlanEntryPriority::Medium,
-            TodoPriority::Low => acp::PlanEntryPriority::Low,
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum TodoStatus {
-    Pending,
-    InProgress,
-    Completed,
-}
-
-impl Into<acp::PlanEntryStatus> for TodoStatus {
-    fn into(self) -> acp::PlanEntryStatus {
-        match self {
-            TodoStatus::Pending => acp::PlanEntryStatus::Pending,
-            TodoStatus::InProgress => acp::PlanEntryStatus::InProgress,
-            TodoStatus::Completed => acp::PlanEntryStatus::Completed,
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Debug)]
-pub struct Todo {
-    /// Task description
-    pub content: String,
-    /// Current status of the todo
-    pub status: TodoStatus,
-    /// Priority level of the todo
-    #[serde(default)]
-    pub priority: TodoPriority,
-}
-
-impl Into<acp::PlanEntry> for Todo {
-    fn into(self) -> acp::PlanEntry {
-        acp::PlanEntry {
-            content: self.content,
-            priority: self.priority.into(),
-            status: self.status.into(),
-        }
-    }
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct TodoWriteToolParams {
-    pub todos: Vec<Todo>,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct ExitPlanModeToolParams {
-    /// Implementation plan in markdown format
-    pub plan: String,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct TaskToolParams {
-    /// Short 3-5 word description of task
-    pub description: String,
-    /// Detailed task for agent to perform
-    pub prompt: String,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct NotebookReadToolParams {
-    /// Absolute path to .ipynb file
-    pub notebook_path: PathBuf,
-    /// Specific cell ID to read
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cell_id: Option<String>,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum CellType {
-    Code,
-    Markdown,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum EditMode {
-    Replace,
-    Insert,
-    Delete,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct NotebookEditToolParams {
-    /// Absolute path to .ipynb file
-    pub notebook_path: PathBuf,
-    /// New cell content
-    pub new_source: String,
-    /// Cell ID to edit
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cell_id: Option<String>,
-    /// Type of cell (code or markdown)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cell_type: Option<CellType>,
-    /// Edit operation mode
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub edit_mode: Option<EditMode>,
-}
-
-#[derive(Deserialize, Serialize, JsonSchema, Debug)]
-pub struct MultiEditItem {
-    /// The text to search for and replace
-    pub old_string: String,
-    /// The replacement text
-    pub new_string: String,
-    /// Whether to replace all occurrences or just the first
-    #[serde(default, skip_serializing_if = "is_false")]
-    pub replace_all: bool,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct MultiEditToolParams {
-    /// Absolute path to file
-    pub file_path: PathBuf,
-    /// List of edits to apply
-    pub edits: Vec<MultiEditItem>,
-}
-
-fn is_false(v: &bool) -> bool {
-    !*v
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum GrepOutputMode {
-    Content,
-    FilesWithMatches,
-    Count,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct WebFetchToolParams {
-    /// Valid URL to fetch
-    #[serde(rename = "url")]
-    pub url: String,
-    /// What to extract from content
-    pub prompt: String,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct WebSearchToolParams {
-    /// Search query (min 2 chars)
-    pub query: String,
-    /// Only include these domains
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub allowed_domains: Vec<String>,
-    /// Exclude these domains
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub blocked_domains: Vec<String>,
-}
-
-impl std::fmt::Display for WebSearchToolParams {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "\"{}\"", self.query)?;
-
-        if !self.allowed_domains.is_empty() {
-            write!(f, " (allowed: {})", self.allowed_domains.join(", "))?;
-        }
-
-        if !self.blocked_domains.is_empty() {
-            write!(f, " (blocked: {})", self.blocked_domains.join(", "))?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/agent_servers/src/claude/write_tool.rs b/crates/agent_servers/src/claude/write_tool.rs
deleted file mode 100644
index 39479a9c38..0000000000
--- a/crates/agent_servers/src/claude/write_tool.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use acp_thread::AcpThread;
-use anyhow::Result;
-use context_server::{
-    listener::{McpServerTool, ToolResponse},
-    types::ToolAnnotations,
-};
-use gpui::{AsyncApp, WeakEntity};
-
-use crate::tools::WriteToolParams;
-
-#[derive(Clone)]
-pub struct WriteTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl WriteTool {
-    pub fn new(thread_rx: watch::Receiver<WeakEntity<AcpThread>>) -> Self {
-        Self { thread_rx }
-    }
-}
-
-impl McpServerTool for WriteTool {
-    type Input = WriteToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Write";
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Write file".to_string()),
-            read_only_hint: Some(false),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: Some(false),
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.write_text_file(input.abs_path, input.content, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![],
-            structured_content: (),
-        })
-    }
-}
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index a481a850ff..8d9670473a 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -2,7 +2,6 @@ use crate::{AgentServerCommand, AgentServerDelegate};
 use acp_thread::AgentConnection;
 use anyhow::Result;
 use gpui::{App, SharedString, Task};
-use language_models::provider::anthropic::AnthropicLanguageModelProvider;
 use std::{path::Path, rc::Rc};
 use ui::IconName;
 
@@ -38,24 +37,9 @@ impl crate::AgentServer for CustomAgentServer {
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let server_name = self.name();
-        let mut command = self.command.clone();
+        let command = self.command.clone();
         let root_dir = root_dir.to_path_buf();
-
-        // TODO: Remove this once we have Claude properly
-        cx.spawn(async move |mut cx| {
-            if let Some(api_key) = cx
-                .update(AnthropicLanguageModelProvider::api_key)?
-                .await
-                .ok()
-            {
-                command
-                    .env
-                    .get_or_insert_default()
-                    .insert("ANTHROPIC_API_KEY".to_owned(), api_key.key);
-            }
-
-            crate::acp::connect(server_name, command, &root_dir, &mut cx).await
-        })
+        cx.spawn(async move |cx| crate::acp::connect(server_name, command, &root_dir, cx).await)
     }
 
     fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index d310870c23..5d2becf0cc 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,4 +1,6 @@
 use crate::{AgentServer, AgentServerDelegate};
+#[cfg(test)]
+use crate::{AgentServerCommand, CustomAgentServerSettings};
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
 use agent_client_protocol as acp;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
@@ -471,7 +473,13 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
         #[cfg(test)]
         crate::AllAgentServersSettings::override_global(
             crate::AllAgentServersSettings {
-                claude: Some(crate::claude::tests::local_command().into()),
+                claude: Some(CustomAgentServerSettings {
+                    command: AgentServerCommand {
+                        path: "claude-code-acp".into(),
+                        args: vec![],
+                        env: None,
+                    },
+                }),
                 gemini: Some(crate::gemini::tests::local_command().into()),
                 custom: collections::HashMap::default(),
             },
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 84dc6750b1..5e958f6869 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -5,7 +5,7 @@ use crate::acp::AcpConnection;
 use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
-use gpui::{App, SharedString, Task};
+use gpui::{App, AppContext as _, SharedString, Task};
 use language_models::provider::google::GoogleLanguageModelProvider;
 use settings::SettingsStore;
 
@@ -37,23 +37,32 @@ impl AgentServer for Gemini {
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let root_dir = root_dir.to_path_buf();
         let server_name = self.name();
-        cx.spawn(async move |cx| {
-            let settings = cx.read_global(|settings: &SettingsStore, _| {
-                settings.get::<AllAgentServersSettings>(None).gemini.clone()
-            })?;
+        let settings = cx.read_global(|settings: &SettingsStore, _| {
+            settings.get::<AllAgentServersSettings>(None).gemini.clone()
+        });
 
-            let mut command = cx
-                .update(|cx| {
+        cx.spawn(async move |cx| {
+            let ignore_system_version = settings
+                .as_ref()
+                .and_then(|settings| settings.ignore_system_version)
+                .unwrap_or(true);
+            let mut command = if let Some(settings) = settings
+                && let Some(command) = settings.custom_command()
+            {
+                command
+            } else {
+                cx.update(|cx| {
                     delegate.get_or_npm_install_builtin_agent(
                         Self::BINARY_NAME.into(),
                         Self::PACKAGE_NAME.into(),
                         format!("node_modules/{}/dist/index.js", Self::PACKAGE_NAME).into(),
-                        settings,
-                        Some("0.2.1".parse().unwrap()),
+                        ignore_system_version,
+                        Some(Self::MINIMUM_VERSION.parse().unwrap()),
                         cx,
                     )
                 })?
-                .await?;
+                .await?
+            };
             command.args.push("--experimental-acp".into());
 
             if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
index 59f3b4b540..81f80a7d7d 100644
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -15,7 +15,7 @@ pub fn init(cx: &mut App) {
 #[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug)]
 pub struct AllAgentServersSettings {
     pub gemini: Option<BuiltinAgentServerSettings>,
-    pub claude: Option<BuiltinAgentServerSettings>,
+    pub claude: Option<CustomAgentServerSettings>,
 
     /// Custom agent servers configured by the user
     #[serde(flatten)]

From 8c18f059f195d099dfdf3fea70eac33703e6c9dd Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Thu, 28 Aug 2025 17:42:12 -0400
Subject: [PATCH 448/823] Always enable acp accept/reject buttons for now
 (#37121)

We have a bug in our ACP implementation where sometimes the
Accept/Reject buttons are disabled (and stay disabled even after the
thread has finished). I haven't found a complete fix for this yet, so in
the meantime I'm putting out the fire by making it so those buttons are
always enabled. That way you're never blocked, and the only consequence
of the bug is that sometimes they should be disabled but are enabled
instead.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 8069812729..c718540c21 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -3071,7 +3071,12 @@ impl AcpThreadView {
         let active_color = cx.theme().colors().element_selected;
         let bg_edit_files_disclosure = editor_bg_color.blend(active_color.opacity(0.3));
 
-        let pending_edits = thread.has_pending_edit_tool_calls();
+        // Temporarily always enable ACP edit controls. This is temporary, to lessen the
+        // impact of a nasty bug that causes them to sometimes be disabled when they shouldn't
+        // be, which blocks you from being able to accept or reject edits. This switches the
+        // bug to be that sometimes it's enabled when it shouldn't be, which at least doesn't
+        // block you from using the panel.
+        let pending_edits = false;
 
         v_flex()
             .mt_1()

From 52d119b637e2c4d3d4849cd692d94ea855e97686 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 28 Aug 2025 18:45:09 -0400
Subject: [PATCH 449/823] docs: Add Expert to Elixir docs (#37127)

This PR adds documentation for
[Expert](https://github.com/elixir-lang/expert) to the Elixir docs.

Also updated the examples for the other language servers to be
representative of all the supported language servers.

Release Notes:

- N/A
---
 docs/src/languages/elixir.md | 43 +++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/docs/src/languages/elixir.md b/docs/src/languages/elixir.md
index 175d0d2e8c..c7b7e2287a 100644
--- a/docs/src/languages/elixir.md
+++ b/docs/src/languages/elixir.md
@@ -6,35 +6,72 @@ Elixir support is available through the [Elixir extension](https://github.com/ze
   - [elixir-lang/tree-sitter-elixir](https://github.com/elixir-lang/tree-sitter-elixir)
   - [phoenixframework/tree-sitter-heex](https://github.com/phoenixframework/tree-sitter-heex)
 - Language servers:
+  - [elixir-lang/expert](https://github.com/elixir-lang/expert)
   - [elixir-lsp/elixir-ls](https://github.com/elixir-lsp/elixir-ls)
   - [elixir-tools/next-ls](https://github.com/elixir-tools/next-ls)
   - [lexical-lsp/lexical](https://github.com/lexical-lsp/lexical)
 
 ## Choosing a language server
 
-The Elixir extension offers language server support for `elixir-ls`, `next-ls`, and `lexical`.
+The Elixir extension offers language server support for `expert`, `elixir-ls`, `next-ls`, and `lexical`.
 
 `elixir-ls` is enabled by default.
 
+### Expert
+
+To switch to `expert`, add the following to your `settings.json`:
+
+```json
+{
+  "languages": {
+    "Elixir": {
+      "language_servers": [
+        "expert",
+        "!elixir-ls",
+        "!next-ls",
+        "!lexical",
+        "..."
+      ]
+    }
+  }
+}
+```
+
+### Next LS
+
 To switch to `next-ls`, add the following to your `settings.json`:
 
 ```json
 {
   "languages": {
     "Elixir": {
-      "language_servers": ["next-ls", "!elixir-ls", "..."]
+      "language_servers": [
+        "next-ls",
+        "!expert",
+        "!elixir-ls",
+        "!lexical",
+        "..."
+      ]
     }
   }
 }
 ```
 
+### Lexical
+
 To switch to `lexical`, add the following to your `settings.json`:
 
 ```json
 {
   "languages": {
     "Elixir": {
-      "language_servers": ["lexical", "!elixir-ls", "..."]
+      "language_servers": [
+        "lexical",
+        "!expert",
+        "!elixir-ls",
+        "!next-ls",
+        "..."
+      ]
     }
   }
 }

From 960d9ce48c854cee70d118486a76af7bb13115f1 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 28 Aug 2025 18:50:27 -0400
Subject: [PATCH 450/823] Disable Expert language server by default for Elixir
 (#37126)

This PR updates the language server configuration for Elixir and HEEx to
not start the [Expert](https://github.com/elixir-lang/expert) language
server by default.

While Expert is the official Elixir language server, it is still early,
so we don't want to make it the default just yet.

Release Notes:

- Updated the default Elixir and HEEx language server settings to not
start the Expert language server.
---
 assets/settings/default.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index ef57412842..57a5d13eab 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1585,7 +1585,7 @@
       "ensure_final_newline_on_save": false
     },
     "Elixir": {
-      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
+      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."]
     },
     "Elm": {
       "tab_size": 4
@@ -1610,7 +1610,7 @@
       }
     },
     "HEEX": {
-      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
+      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."]
     },
     "HTML": {
       "prettier": {

From cfd56a744d594e2cb239da47cebc498ca002d659 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Thu, 28 Aug 2025 18:22:56 -0600
Subject: [PATCH 451/823] zeta: Show update required notification on
 appropriate window(s) (#37130)

To show these notifications, Zeta was being initialized with the initial
workspace it's used on - which may not even still exist! This removes a
confusing/misleading workspace field from Zeta.

Release Notes:

- N/A
---
 .../zed/src/zed/edit_prediction_registry.rs   |  9 +--
 crates/zeta/src/zeta.rs                       | 60 +++++++------------
 2 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index bc2d757fd1..7b8b98018e 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -8,7 +8,6 @@ use settings::SettingsStore;
 use std::{cell::RefCell, rc::Rc, sync::Arc};
 use supermaven::{Supermaven, SupermavenCompletionProvider};
 use ui::Window;
-use workspace::Workspace;
 use zeta::{ProviderDataCollection, ZetaEditPredictionProvider};
 
 pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
@@ -204,13 +203,7 @@ fn assign_edit_prediction_provider(
                     }
                 }
 
-                let workspace = window
-                    .root::<Workspace>()
-                    .flatten()
-                    .map(|workspace| workspace.downgrade());
-
-                let zeta =
-                    zeta::Zeta::register(workspace, worktree, client.clone(), user_store, cx);
+                let zeta = zeta::Zeta::register(worktree, client.clone(), user_store, cx);
 
                 if let Some(buffer) = &singleton_buffer
                     && buffer.read(cx).file().is_some()
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 7b14d12796..e0cfd23dd2 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -24,7 +24,7 @@ use collections::{HashMap, HashSet, VecDeque};
 use futures::AsyncReadExt;
 use gpui::{
     App, AppContext as _, AsyncApp, Context, Entity, EntityId, Global, SemanticVersion,
-    Subscription, Task, WeakEntity, actions,
+    SharedString, Subscription, Task, actions,
 };
 use http_client::{AsyncBody, HttpClient, Method, Request, Response};
 use input_excerpt::excerpt_for_cursor_position;
@@ -51,8 +51,7 @@ use telemetry_events::EditPredictionRating;
 use thiserror::Error;
 use util::ResultExt;
 use uuid::Uuid;
-use workspace::Workspace;
-use workspace::notifications::{ErrorMessagePrompt, NotificationId};
+use workspace::notifications::{ErrorMessagePrompt, NotificationId, show_app_notification};
 use worktree::Worktree;
 
 const CURSOR_MARKER: &str = "<|user_cursor_is_here|>";
@@ -212,7 +211,6 @@ impl std::fmt::Debug for EditPrediction {
 }
 
 pub struct Zeta {
-    workspace: Option<WeakEntity<Workspace>>,
     client: Arc<Client>,
     events: VecDeque<Event>,
     registered_buffers: HashMap<gpui::EntityId, RegisteredBuffer>,
@@ -233,14 +231,13 @@ impl Zeta {
     }
 
     pub fn register(
-        workspace: Option<WeakEntity<Workspace>>,
         worktree: Option<Entity<Worktree>>,
         client: Arc<Client>,
         user_store: Entity<UserStore>,
         cx: &mut App,
     ) -> Entity<Self> {
         let this = Self::global(cx).unwrap_or_else(|| {
-            let entity = cx.new(|cx| Self::new(workspace, client, user_store, cx));
+            let entity = cx.new(|cx| Self::new(client, user_store, cx));
             cx.set_global(ZetaGlobal(entity.clone()));
             entity
         });
@@ -265,19 +262,13 @@ impl Zeta {
         self.user_store.read(cx).edit_prediction_usage()
     }
 
-    fn new(
-        workspace: Option<WeakEntity<Workspace>>,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
+    fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
         let refresh_llm_token_listener = RefreshLlmTokenListener::global(cx);
 
         let data_collection_choice = Self::load_data_collection_choices();
         let data_collection_choice = cx.new(|_| data_collection_choice);
 
         Self {
-            workspace,
             client,
             events: VecDeque::new(),
             shown_completions: VecDeque::new(),
@@ -370,7 +361,6 @@ impl Zeta {
 
     fn request_completion_impl<F, R>(
         &mut self,
-        workspace: Option<Entity<Workspace>>,
         project: Option<&Entity<Project>>,
         buffer: &Entity<Buffer>,
         cursor: language::Anchor,
@@ -453,23 +443,20 @@ impl Zeta {
                                 zeta.update_required = true;
                             });
 
-                            if let Some(workspace) = workspace {
-                                workspace.update(cx, |workspace, cx| {
-                                    workspace.show_notification(
-                                        NotificationId::unique::<ZedUpdateRequiredError>(),
-                                        cx,
-                                        |cx| {
-                                            cx.new(|cx| {
-                                                ErrorMessagePrompt::new(err.to_string(), cx)
-                                                    .with_link_button(
-                                                        "Update Zed",
-                                                        "https://zed.dev/releases",
-                                                    )
-                                            })
-                                        },
-                                    );
-                                });
-                            }
+                            let error_message: SharedString = err.to_string().into();
+                            show_app_notification(
+                                NotificationId::unique::<ZedUpdateRequiredError>(),
+                                cx,
+                                move |cx| {
+                                    cx.new(|cx| {
+                                        ErrorMessagePrompt::new(error_message.clone(), cx)
+                                            .with_link_button(
+                                                "Update Zed",
+                                                "https://zed.dev/releases",
+                                            )
+                                    })
+                                },
+                            );
                         })
                         .ok();
                     }
@@ -689,7 +676,7 @@ and then another
     ) -> Task<Result<Option<EditPrediction>>> {
         use std::future::ready;
 
-        self.request_completion_impl(None, project, buffer, position, false, cx, |_params| {
+        self.request_completion_impl(project, buffer, position, false, cx, |_params| {
             ready(Ok((response, None)))
         })
     }
@@ -702,12 +689,7 @@ and then another
         can_collect_data: bool,
         cx: &mut Context<Self>,
     ) -> Task<Result<Option<EditPrediction>>> {
-        let workspace = self
-            .workspace
-            .as_ref()
-            .and_then(|workspace| workspace.upgrade());
         self.request_completion_impl(
-            workspace,
             project,
             buffer,
             position,
@@ -2029,7 +2011,7 @@ mod tests {
         // Construct the fake server to authenticate.
         let _server = FakeServer::for_client(42, &client, cx).await;
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let zeta = cx.new(|cx| Zeta::new(None, client, user_store.clone(), cx));
+        let zeta = cx.new(|cx| Zeta::new(client, user_store.clone(), cx));
 
         let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
         let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
@@ -2093,7 +2075,7 @@ mod tests {
         // Construct the fake server to authenticate.
         let _server = FakeServer::for_client(42, &client, cx).await;
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let zeta = cx.new(|cx| Zeta::new(None, client, user_store.clone(), cx));
+        let zeta = cx.new(|cx| Zeta::new(client, user_store.clone(), cx));
 
         let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
         let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());

From e5cea54cbbdb37c4e047a344d5fd245860ccd529 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 28 Aug 2025 20:09:20 -0600
Subject: [PATCH 452/823] acp: Load agent panel even if serialized config is
 bogus (#37134)

Closes #ISSUE

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 232311c5b0..3eb171054a 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -86,7 +86,7 @@ use zed_actions::{
 
 const AGENT_PANEL_KEY: &str = "agent_panel";
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 struct SerializedAgentPanel {
     width: Option<Pixels>,
     selected_agent: Option<AgentType>,
@@ -592,7 +592,7 @@ impl AgentPanel {
                 .log_err()
                 .flatten()
             {
-                Some(serde_json::from_str::<SerializedAgentPanel>(&panel)?)
+                serde_json::from_str::<SerializedAgentPanel>(&panel).log_err()
             } else {
                 None
             };

From c3ccdc0b4421d34d541d592b0184345c2ac08f7e Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Thu, 28 Aug 2025 20:50:24 -0700
Subject: [PATCH 453/823] Add a setting to control the number of context lines
 in excerpts (#37138)

Fixes https://github.com/zed-industries/zed/discussions/28739

Release Notes:

- Added a setting, `excerpt_context_lines`, for setting the number of
context lines shown in a multibuffer
---
 assets/settings/default.json                 |  2 ++
 crates/acp_thread/src/diff.rs                |  8 +++----
 crates/agent_ui/src/agent_diff.rs            |  3 ++-
 crates/assistant_tools/src/edit_file_tool.rs | 10 +++++----
 crates/diagnostics/src/diagnostics.rs        |  6 +++--
 crates/editor/src/editor.rs                  | 12 +++++++---
 crates/editor/src/editor_settings.rs         |  6 +++++
 crates/editor/src/editor_tests.rs            |  2 +-
 crates/git_ui/src/commit_view.rs             |  4 ++--
 crates/git_ui/src/project_diff.rs            |  3 ++-
 crates/search/src/project_search.rs          |  3 ++-
 crates/settings/src/settings_store.rs        | 23 ++++++++++++++++++++
 docs/src/configuring-zed.md                  | 10 +++++++++
 docs/src/development/releases.md             |  2 --
 docs/src/visual-customization.md             |  4 +++-
 15 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 57a5d13eab..297c932e5b 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -279,6 +279,8 @@
   "redact_private_values": false,
   // The default number of lines to expand excerpts in the multibuffer by.
   "expand_excerpt_lines": 5,
+  // The default number of context lines shown in multibuffer excerpts.
+  "excerpt_context_lines": 2,
   // Globs to match against file paths to determine if a file is private.
   "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
   // Whether to use additional LSP queries to format (and amend) the code after
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index 0fec6809e0..f75af0543e 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{MultiBuffer, PathKey};
+use editor::{MultiBuffer, PathKey, multibuffer_context_lines};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task};
 use itertools::Itertools;
 use language::{
@@ -64,7 +64,7 @@ impl Diff {
                             PathKey::for_buffer(&buffer, cx),
                             buffer.clone(),
                             hunk_ranges,
-                            editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                            multibuffer_context_lines(cx),
                             cx,
                         );
                         multibuffer.add_diff(diff, cx);
@@ -279,7 +279,7 @@ impl PendingDiff {
                         path_key,
                         buffer,
                         ranges,
-                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                        multibuffer_context_lines(cx),
                         cx,
                     );
                     multibuffer.add_diff(buffer_diff.clone(), cx);
@@ -305,7 +305,7 @@ impl PendingDiff {
                 PathKey::for_buffer(&self.new_buffer, cx),
                 self.new_buffer.clone(),
                 ranges,
-                editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                multibuffer_context_lines(cx),
                 cx,
             );
             let end = multibuffer.len(cx);
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 1e1ff95178..4bd525e9d0 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -10,6 +10,7 @@ use editor::{
     Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot,
     SelectionEffects, ToPoint,
     actions::{GoToHunk, GoToPreviousHunk},
+    multibuffer_context_lines,
     scroll::Autoscroll,
 };
 use gpui::{
@@ -257,7 +258,7 @@ impl AgentDiffPane {
                         path_key.clone(),
                         buffer.clone(),
                         diff_hunk_ranges,
-                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                        multibuffer_context_lines(cx),
                         cx,
                     );
                     multibuffer.add_diff(diff_handle, cx);
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index 95b01c40eb..7b208ccc77 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -11,7 +11,9 @@ use assistant_tool::{
     AnyToolCard, Tool, ToolCard, ToolResult, ToolResultContent, ToolResultOutput, ToolUseStatus,
 };
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
+use editor::{
+    Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey, multibuffer_context_lines,
+};
 use futures::StreamExt;
 use gpui::{
     Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
@@ -474,7 +476,7 @@ impl Tool for EditFileTool {
                             PathKey::for_buffer(&buffer, cx),
                             buffer,
                             diff_hunk_ranges,
-                            editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                            multibuffer_context_lines(cx),
                             cx,
                         );
                         multibuffer.add_diff(buffer_diff, cx);
@@ -703,7 +705,7 @@ impl EditFileToolCard {
                 PathKey::for_buffer(buffer, cx),
                 buffer.clone(),
                 ranges,
-                editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                multibuffer_context_lines(cx),
                 cx,
             );
             let end = multibuffer.len(cx);
@@ -791,7 +793,7 @@ impl EditFileToolCard {
                         path_key,
                         buffer,
                         ranges,
-                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                        multibuffer_context_lines(cx),
                         cx,
                     );
                     multibuffer.add_diff(buffer_diff.clone(), cx);
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 1c27e820a0..53d0371847 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -10,8 +10,9 @@ use anyhow::Result;
 use collections::{BTreeSet, HashMap};
 use diagnostic_renderer::DiagnosticBlock;
 use editor::{
-    DEFAULT_MULTIBUFFER_CONTEXT, Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
+    Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
     display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
+    multibuffer_context_lines,
 };
 use gpui::{
     AnyElement, AnyView, App, AsyncApp, Context, Entity, EventEmitter, FocusHandle, Focusable,
@@ -493,10 +494,11 @@ impl ProjectDiagnosticsEditor {
             }
 
             let mut excerpt_ranges: Vec<ExcerptRange<Point>> = Vec::new();
+            let context_lines = cx.update(|_, cx| multibuffer_context_lines(cx))?;
             for b in blocks.iter() {
                 let excerpt_range = context_range_for_entry(
                     b.initial_range.clone(),
-                    DEFAULT_MULTIBUFFER_CONTEXT,
+                    context_lines,
                     buffer_snapshot.clone(),
                     cx,
                 )
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index ea7cce5d8b..04780e79f8 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -219,7 +219,6 @@ use crate::{
 
 pub const FILE_HEADER_HEIGHT: u32 = 2;
 pub const MULTI_BUFFER_EXCERPT_HEADER_HEIGHT: u32 = 1;
-pub const DEFAULT_MULTIBUFFER_CONTEXT: u32 = 2;
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 const MAX_LINE_LEN: usize = 1024;
 const MIN_NAVIGATION_HISTORY_ROW_DELTA: i64 = 10;
@@ -6402,7 +6401,7 @@ impl Editor {
                     PathKey::for_buffer(buffer_handle, cx),
                     buffer_handle.clone(),
                     edited_ranges,
-                    DEFAULT_MULTIBUFFER_CONTEXT,
+                    multibuffer_context_lines(cx),
                     cx,
                 );
 
@@ -16237,7 +16236,7 @@ impl Editor {
                     PathKey::for_buffer(&location.buffer, cx),
                     location.buffer.clone(),
                     ranges_for_buffer,
-                    DEFAULT_MULTIBUFFER_CONTEXT,
+                    multibuffer_context_lines(cx),
                     cx,
                 );
                 ranges.extend(new_ranges)
@@ -24078,3 +24077,10 @@ fn render_diff_hunk_controls(
         )
         .into_any_element()
 }
+
+pub fn multibuffer_context_lines(cx: &App) -> u32 {
+    EditorSettings::try_get(cx)
+        .map(|settings| settings.excerpt_context_lines)
+        .unwrap_or(2)
+        .clamp(1, 32)
+}
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 1d7e04cae0..9b110d782a 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -37,6 +37,7 @@ pub struct EditorSettings {
     pub multi_cursor_modifier: MultiCursorModifier,
     pub redact_private_values: bool,
     pub expand_excerpt_lines: u32,
+    pub excerpt_context_lines: u32,
     pub middle_click_paste: bool,
     #[serde(default)]
     pub double_click_in_multibuffer: DoubleClickInMultibuffer,
@@ -515,6 +516,11 @@ pub struct EditorSettingsContent {
     /// Default: 3
     pub expand_excerpt_lines: Option<u32>,
 
+    /// How many lines of context to provide in multibuffer excerpts by default
+    ///
+    /// Default: 2
+    pub excerpt_context_lines: Option<u32>,
+
     /// Whether to enable middle-click paste on Linux
     ///
     /// Default: true
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 85471c7ce9..dfef8a92f0 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -19867,7 +19867,7 @@ async fn test_display_diff_hunks(cx: &mut TestAppContext) {
                 PathKey::namespaced(0, buffer.read(cx).file().unwrap().path().clone()),
                 buffer.clone(),
                 vec![text::Anchor::MIN.to_point(&snapshot)..text::Anchor::MAX.to_point(&snapshot)],
-                DEFAULT_MULTIBUFFER_CONTEXT,
+                2,
                 cx,
             );
         }
diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs
index d428ccbb05..ac51cee8e4 100644
--- a/crates/git_ui/src/commit_view.rs
+++ b/crates/git_ui/src/commit_view.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context as _, Result};
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorEvent, MultiBuffer, SelectionEffects};
+use editor::{Editor, EditorEvent, MultiBuffer, SelectionEffects, multibuffer_context_lines};
 use git::repository::{CommitDetails, CommitDiff, CommitSummary, RepoPath};
 use gpui::{
     AnyElement, AnyView, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter,
@@ -195,7 +195,7 @@ impl CommitView {
                             PathKey::namespaced(FILE_NAMESPACE, path),
                             buffer,
                             diff_hunk_ranges,
-                            editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                            multibuffer_context_lines(cx),
                             cx,
                         );
                         multibuffer.add_diff(buffer_diff, cx);
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 524dbf13d3..69ebd83ea8 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -10,6 +10,7 @@ use collections::HashSet;
 use editor::{
     Editor, EditorEvent, SelectionEffects,
     actions::{GoToHunk, GoToPreviousHunk},
+    multibuffer_context_lines,
     scroll::Autoscroll,
 };
 use futures::StreamExt;
@@ -465,7 +466,7 @@ impl ProjectDiff {
                 path_key.clone(),
                 buffer,
                 excerpt_ranges,
-                editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                multibuffer_context_lines(cx),
                 cx,
             );
             (was_empty, is_newly_added)
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 1ee959f111..2668d270d7 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -11,6 +11,7 @@ use editor::{
     Anchor, Editor, EditorEvent, EditorSettings, MAX_TAB_TITLE_LEN, MultiBuffer, SelectionEffects,
     actions::{Backtab, SelectAll, Tab},
     items::active_match_index,
+    multibuffer_context_lines,
 };
 use futures::{StreamExt, stream::FuturesOrdered};
 use gpui::{
@@ -345,7 +346,7 @@ impl ProjectSearch {
                                     excerpts.set_anchored_excerpts_for_path(
                                         buffer,
                                         ranges,
-                                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                                        multibuffer_context_lines(cx),
                                         cx,
                                     )
                                 })
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 3deaed8b9d..c837191410 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -103,6 +103,18 @@ pub trait Settings: 'static + Send + Sync {
         cx.global::<SettingsStore>().get(None)
     }
 
+    #[track_caller]
+    fn try_get(cx: &App) -> Option<&Self>
+    where
+        Self: Sized,
+    {
+        if cx.has_global::<SettingsStore>() {
+            cx.global::<SettingsStore>().try_get(None)
+        } else {
+            None
+        }
+    }
+
     #[track_caller]
     fn try_read_global<R>(cx: &AsyncApp, f: impl FnOnce(&Self) -> R) -> Option<R>
     where
@@ -407,6 +419,17 @@ impl SettingsStore {
             .expect("no default value for setting type")
     }
 
+    /// Get the value of a setting.
+    ///
+    /// Panics if the given setting type has not been registered, or if there is no
+    /// value for this setting.
+    pub fn try_get<T: Settings>(&self, path: Option<SettingsLocation>) -> Option<&T> {
+        self.setting_values
+            .get(&TypeId::of::<T>())
+            .map(|value| value.value_for_path(path))
+            .and_then(|value| value.downcast_ref::<T>())
+    }
+
     /// Get all values from project specific settings
     pub fn get_all_locals<T: Settings>(&self) -> Vec<(WorktreeId, Arc<Path>, &T)> {
         self.setting_values
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index fb9306acc5..2b1d801f80 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -1461,6 +1461,16 @@ This setting enables integration with macOS’s native window tabbing feature. W
 
 Positive `integer` values
 
+## Excerpt Context Lines
+
+- Description: The number of lines of context to provide when showing excerpts in the multibuffer.
+- Setting: `excerpt_context_lines`
+- Default: `2`
+
+**Options**
+
+Positive `integer` value between 1 and 32. Values outside of this range will be clamped to this range.
+
 ## Extend Comment On Newline
 
 - Description: Whether to start a new line with a comment when a previous line is a comment as well.
diff --git a/docs/src/development/releases.md b/docs/src/development/releases.md
index d1f99401d6..76432d93f0 100644
--- a/docs/src/development/releases.md
+++ b/docs/src/development/releases.md
@@ -51,7 +51,6 @@ Credentials for various services used in this process can be found in 1Password.
    - We sometimes correct things here and there that didn't translate from GitHub's renderer to Kit's.
 
 1. Build social media posts based on the popular items in stable.
-
    - You can use the [prior week's post chain](https://zed.dev/channel/tweets-23331) as your outline.
    - Stage the copy and assets using [Buffer](https://buffer.com), for both X and BlueSky.
    - Publish both, one at a time, ensuring both are posted to each respective platform.
@@ -89,7 +88,6 @@ You will need write access to the Zed repository to do this:
    - Download the artifacts for each release draft and test that you can run them locally.
 
 1. Publish stable / preview drafts, one at a time.
-
    - Use [Vercel](https://vercel.com/zed-industries/zed-dev) to check the progress of the website rebuild.
      The release will be public once the rebuild has completed.
 
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 4fc5a9ba88..1df76d17f0 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -334,7 +334,9 @@ TBD: Centered layout related settings
 ```json
 {
   // The default number of lines to expand excerpts in the multibuffer by.
-  "expand_excerpt_lines": 5
+  "expand_excerpt_lines": 5,
+  // The default number of lines of context provided for excerpts in the multibuffer by.
+  "excerpt_context_lines": 2
 }
 ```
 

From 384ffb883f472546609b3cc0513623b6bb223c01 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Thu, 28 Aug 2025 21:07:52 -0700
Subject: [PATCH 454/823] Fix method documentation (#37140)

Release Notes:

- N/A
---
 crates/settings/src/settings_store.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index c837191410..fbd0f75aef 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -421,8 +421,7 @@ impl SettingsStore {
 
     /// Get the value of a setting.
     ///
-    /// Panics if the given setting type has not been registered, or if there is no
-    /// value for this setting.
+    /// Does not panic
     pub fn try_get<T: Settings>(&self, path: Option<SettingsLocation>) -> Option<&T> {
         self.setting_values
             .get(&TypeId::of::<T>())

From 52da72d80af8a985db74e04c081fef0453e55e00 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 29 Aug 2025 00:16:49 -0400
Subject: [PATCH 455/823] acp: Install new versions of agent binaries in the
 background (#37141)

Release Notes:

- acp: New releases of external agents are now installed in the
background.

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/agent_servers/src/agent_servers.rs | 192 ++++++++++++++++------
 1 file changed, 142 insertions(+), 50 deletions(-)

diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index e1b4057b71..83b3be76ce 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -7,20 +7,24 @@ mod settings;
 #[cfg(any(test, feature = "test-support"))]
 pub mod e2e_tests;
 
+use anyhow::Context as _;
 pub use claude::*;
 pub use custom::*;
+use fs::Fs;
+use fs::RemoveOptions;
+use fs::RenameOptions;
+use futures::StreamExt as _;
 pub use gemini::*;
+use gpui::AppContext;
+use node_runtime::NodeRuntime;
 pub use settings::*;
 
 use acp_thread::AgentConnection;
 use acp_thread::LoadError;
 use anyhow::Result;
 use anyhow::anyhow;
-use anyhow::bail;
 use collections::HashMap;
-use gpui::AppContext as _;
 use gpui::{App, AsyncApp, Entity, SharedString, Task};
-use node_runtime::VersionStrategy;
 use project::Project;
 use schemars::JsonSchema;
 use semver::Version;
@@ -64,71 +68,159 @@ impl AgentServerDelegate {
         let project = self.project;
         let fs = project.read(cx).fs().clone();
         let Some(node_runtime) = project.read(cx).node_runtime().cloned() else {
-            return Task::ready(Err(anyhow!("Missing node runtime")));
+            return Task::ready(Err(anyhow!(
+                "External agents are not yet available in remote projects."
+            )));
         };
         let mut status_tx = self.status_tx;
 
         cx.spawn(async move |cx| {
             if !ignore_system_version {
                 if let Some(bin) = find_bin_in_path(binary_name.clone(), &project, cx).await {
-                    return Ok(AgentServerCommand { path: bin, args: Vec::new(), env: Default::default() })
+                    return Ok(AgentServerCommand {
+                        path: bin,
+                        args: Vec::new(),
+                        env: Default::default(),
+                    });
                 }
             }
 
-            cx.background_spawn(async move {
+            cx.spawn(async move |cx| {
                 let node_path = node_runtime.binary_path().await?;
-                let dir = paths::data_dir().join("external_agents").join(binary_name.as_str());
+                let dir = paths::data_dir()
+                    .join("external_agents")
+                    .join(binary_name.as_str());
                 fs.create_dir(&dir).await?;
-                let local_executable_path = dir.join(entrypoint_path);
-                let command = AgentServerCommand {
-                    path: node_path,
-                    args: vec![local_executable_path.to_string_lossy().to_string()],
-                    env: Default::default(),
-                };
 
-                let installed_version = node_runtime
-                    .npm_package_installed_version(&dir, &package_name)
-                    .await?
-                    .filter(|version| {
-                        Version::from_str(&version)
-                            .is_ok_and(|version| Some(version) >= minimum_version)
-                    });
+                let mut stream = fs.read_dir(&dir).await?;
+                let mut versions = Vec::new();
+                let mut to_delete = Vec::new();
+                while let Some(entry) = stream.next().await {
+                    let Ok(entry) = entry else { continue };
+                    let Some(file_name) = entry.file_name() else {
+                        continue;
+                    };
 
-                status_tx.send("Checking for latest version…".into())?;
-                let latest_version = match node_runtime.npm_package_latest_version(&package_name).await
-                {
-                    Ok(latest_version) => latest_version,
-                    Err(e) => {
-                        if let Some(installed_version) = installed_version {
-                            log::error!("{e}");
-                            log::warn!("failed to fetch latest version of {package_name}, falling back to cached version {installed_version}");
-                            return Ok(command);
-                        } else {
-                            bail!(e);
-                        }
+                    if let Some(version) = file_name
+                        .to_str()
+                        .and_then(|name| semver::Version::from_str(&name).ok())
+                    {
+                        versions.push((file_name.to_owned(), version));
+                    } else {
+                        to_delete.push(file_name.to_owned())
                     }
-                };
-
-                let should_install = node_runtime
-                    .should_install_npm_package(
-                        &package_name,
-                        &local_executable_path,
-                        &dir,
-                        VersionStrategy::Latest(&latest_version),
-                    )
-                    .await;
-
-                if should_install {
-                    status_tx.send("Installing latest version…".into())?;
-                    node_runtime
-                        .npm_install_packages(&dir, &[(&package_name, &latest_version)])
-                        .await?;
                 }
 
-                Ok(command)
-            }).await.map_err(|e| LoadError::FailedToInstall(e.to_string().into()).into())
+                versions.sort();
+                let newest_version = if let Some((file_name, version)) = versions.last().cloned()
+                    && minimum_version.is_none_or(|minimum_version| version > minimum_version)
+                {
+                    versions.pop();
+                    Some(file_name)
+                } else {
+                    None
+                };
+                to_delete.extend(versions.into_iter().map(|(file_name, _)| file_name));
+
+                cx.background_spawn({
+                    let fs = fs.clone();
+                    let dir = dir.clone();
+                    async move {
+                        for file_name in to_delete {
+                            fs.remove_dir(
+                                &dir.join(file_name),
+                                RemoveOptions {
+                                    recursive: true,
+                                    ignore_if_not_exists: false,
+                                },
+                            )
+                            .await
+                            .ok();
+                        }
+                    }
+                })
+                .detach();
+
+                let version = if let Some(file_name) = newest_version {
+                    cx.background_spawn({
+                        let file_name = file_name.clone();
+                        let dir = dir.clone();
+                        async move {
+                            let latest_version =
+                                node_runtime.npm_package_latest_version(&package_name).await;
+                            if let Ok(latest_version) = latest_version
+                                && &latest_version != &file_name.to_string_lossy()
+                            {
+                                Self::download_latest_version(
+                                    fs,
+                                    dir.clone(),
+                                    node_runtime,
+                                    package_name,
+                                )
+                                .await
+                                .log_err();
+                            }
+                        }
+                    })
+                    .detach();
+                    file_name
+                } else {
+                    status_tx.send("Installing…".into()).ok();
+                    let dir = dir.clone();
+                    cx.background_spawn(Self::download_latest_version(
+                        fs,
+                        dir.clone(),
+                        node_runtime,
+                        package_name,
+                    ))
+                    .await?
+                    .into()
+                };
+                anyhow::Ok(AgentServerCommand {
+                    path: node_path,
+                    args: vec![
+                        dir.join(version)
+                            .join(entrypoint_path)
+                            .to_string_lossy()
+                            .to_string(),
+                    ],
+                    env: Default::default(),
+                })
+            })
+            .await
+            .map_err(|e| LoadError::FailedToInstall(e.to_string().into()).into())
         })
     }
+
+    async fn download_latest_version(
+        fs: Arc<dyn Fs>,
+        dir: PathBuf,
+        node_runtime: NodeRuntime,
+        package_name: SharedString,
+    ) -> Result<String> {
+        let tmp_dir = tempfile::tempdir_in(&dir)?;
+
+        node_runtime
+            .npm_install_packages(tmp_dir.path(), &[(&package_name, "latest")])
+            .await?;
+
+        let version = node_runtime
+            .npm_package_installed_version(tmp_dir.path(), &package_name)
+            .await?
+            .context("expected package to be installed")?;
+
+        fs.rename(
+            &tmp_dir.keep(),
+            &dir.join(&version),
+            RenameOptions {
+                ignore_if_exists: true,
+                overwrite: false,
+            },
+        )
+        .await?;
+
+        anyhow::Ok(version)
+    }
 }
 
 pub trait AgentServer: Send {

From 7403a4ba17d05e8ea02f80b5f4ea25d1d3c1cb71 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 29 Aug 2025 12:19:27 +0200
Subject: [PATCH 456/823] Add basic PyEnv and pixi support for python
 environments (#37156)

cc https://github.com/zed-industries/zed/issues/29807

Release Notes:

- Fixed terminals and tasks not respecting python pyenv and pixi
environments
---
 crates/language/src/toolchain.rs         |   8 +-
 crates/languages/src/python.rs           |  71 ++++++++++---
 crates/project/src/debugger/dap_store.rs |   1 -
 crates/project/src/project_tests.rs      |   6 +-
 crates/project/src/terminals.rs          | 125 +++++++++++++----------
 crates/remote/src/remote_client.rs       |  12 +--
 crates/remote/src/transport/ssh.rs       |  12 +--
 crates/terminal/src/terminal.rs          |  20 +++-
 8 files changed, 155 insertions(+), 100 deletions(-)

diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
index 2a8dfd5841..84b10c7961 100644
--- a/crates/language/src/toolchain.rs
+++ b/crates/language/src/toolchain.rs
@@ -14,6 +14,7 @@ use collections::HashMap;
 use fs::Fs;
 use gpui::{AsyncApp, SharedString};
 use settings::WorktreeId;
+use task::ShellKind;
 
 use crate::{LanguageName, ManifestName};
 
@@ -68,7 +69,12 @@ pub trait ToolchainLister: Send + Sync {
     fn term(&self) -> SharedString;
     /// Returns the name of the manifest file for this toolchain.
     fn manifest_name(&self) -> ManifestName;
-    async fn activation_script(&self, toolchain: &Toolchain, fs: &dyn Fs) -> Option<String>;
+    async fn activation_script(
+        &self,
+        toolchain: &Toolchain,
+        shell: ShellKind,
+        fs: &dyn Fs,
+    ) -> Vec<String>;
 }
 
 #[async_trait(?Send)]
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 37d38de9da..f76bd8e793 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -34,7 +34,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use task::{TaskTemplate, TaskTemplates, VariableName};
+use task::{ShellKind, TaskTemplate, TaskTemplates, VariableName};
 use util::ResultExt;
 
 pub(crate) struct PyprojectTomlManifestProvider;
@@ -894,20 +894,65 @@ impl ToolchainLister for PythonToolchainProvider {
     fn term(&self) -> SharedString {
         self.term.clone()
     }
-    async fn activation_script(&self, toolchain: &Toolchain, fs: &dyn Fs) -> Option<String> {
-        let toolchain = serde_json::from_value::<pet_core::python_environment::PythonEnvironment>(
+    async fn activation_script(
+        &self,
+        toolchain: &Toolchain,
+        shell: ShellKind,
+        fs: &dyn Fs,
+    ) -> Vec<String> {
+        let Ok(toolchain) = serde_json::from_value::<pet_core::python_environment::PythonEnvironment>(
             toolchain.as_json.clone(),
-        )
-        .ok()?;
-        let mut activation_script = None;
-        if let Some(prefix) = &toolchain.prefix {
-            #[cfg(not(target_os = "windows"))]
-            let path = prefix.join(BINARY_DIR).join("activate");
-            #[cfg(target_os = "windows")]
-            let path = prefix.join(BINARY_DIR).join("activate.ps1");
-            if fs.is_file(&path).await {
-                activation_script = Some(format!(". {}", path.display()));
+        ) else {
+            return vec![];
+        };
+        let mut activation_script = vec![];
+
+        match toolchain.kind {
+            Some(PythonEnvironmentKind::Pixi) => {
+                let env = toolchain.name.as_deref().unwrap_or("default");
+                activation_script.push(format!("pixi shell -e {env}"))
             }
+            Some(PythonEnvironmentKind::Venv | PythonEnvironmentKind::VirtualEnv) => {
+                if let Some(prefix) = &toolchain.prefix {
+                    let activate_keyword = match shell {
+                        ShellKind::Cmd => ".",
+                        ShellKind::Nushell => "overlay use",
+                        ShellKind::Powershell => ".",
+                        ShellKind::Fish => "source",
+                        ShellKind::Csh => "source",
+                        ShellKind::Posix => "source",
+                    };
+                    let activate_script_name = match shell {
+                        ShellKind::Posix => "activate",
+                        ShellKind::Csh => "activate.csh",
+                        ShellKind::Fish => "activate.fish",
+                        ShellKind::Nushell => "activate.nu",
+                        ShellKind::Powershell => "activate.ps1",
+                        ShellKind::Cmd => "activate.bat",
+                    };
+                    let path = prefix.join(BINARY_DIR).join(activate_script_name);
+                    if fs.is_file(&path).await {
+                        activation_script.push(format!("{activate_keyword} {}", path.display()));
+                    }
+                }
+            }
+            Some(PythonEnvironmentKind::Pyenv) => {
+                let Some(manager) = toolchain.manager else {
+                    return vec![];
+                };
+                let version = toolchain.version.as_deref().unwrap_or("system");
+                let pyenv = manager.executable;
+                let pyenv = pyenv.display();
+                activation_script.extend(match shell {
+                    ShellKind::Fish => Some(format!("{pyenv} shell - fish {version}")),
+                    ShellKind::Posix => Some(format!("{pyenv} shell - sh {version}")),
+                    ShellKind::Nushell => Some(format!("{pyenv} shell - nu {version}")),
+                    ShellKind::Powershell => None,
+                    ShellKind::Csh => None,
+                    ShellKind::Cmd => None,
+                })
+            }
+            _ => {}
         }
         activation_script
     }
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index 859574c82a..d8c6d3acc1 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -276,7 +276,6 @@ impl DapStore {
                             &binary.arguments,
                             &binary.envs,
                             binary.cwd.map(|path| path.display().to_string()),
-                            None,
                             port_forwarding,
                         )
                     })??;
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index c814d6207e..96f891d9c3 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -40,7 +40,7 @@ use serde_json::json;
 #[cfg(not(windows))]
 use std::os;
 use std::{env, mem, num::NonZeroU32, ops::Range, str::FromStr, sync::OnceLock, task::Poll};
-use task::{ResolvedTask, TaskContext};
+use task::{ResolvedTask, ShellKind, TaskContext};
 use unindent::Unindent as _;
 use util::{
     TryFutureExt as _, assert_set_eq, maybe, path,
@@ -9222,8 +9222,8 @@ fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
         fn manifest_name(&self) -> ManifestName {
             SharedString::new_static("pyproject.toml").into()
         }
-        async fn activation_script(&self, _: &Toolchain, _: &dyn Fs) -> Option<String> {
-            None
+        async fn activation_script(&self, _: &Toolchain, _: ShellKind, _: &dyn Fs) -> Vec<String> {
+            vec![]
         }
     }
     Arc::new(
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index aad5ce9411..c189242fad 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -1,7 +1,8 @@
 use anyhow::Result;
 use collections::HashMap;
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity};
-use itertools::Itertools;
+
+use itertools::Itertools as _;
 use language::LanguageName;
 use remote::RemoteClient;
 use settings::{Settings, SettingsLocation};
@@ -11,7 +12,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use task::{Shell, ShellBuilder, SpawnInTerminal};
+use task::{Shell, ShellBuilder, ShellKind, SpawnInTerminal};
 use terminal::{
     TaskState, TaskStatus, Terminal, TerminalBuilder, terminal_settings::TerminalSettings,
 };
@@ -131,33 +132,62 @@ impl Project {
         cx.spawn(async move |project, cx| {
             let activation_script = maybe!(async {
                 let toolchain = toolchain?.await?;
-                lang_registry
-                    .language_for_name(&toolchain.language_name.0)
-                    .await
-                    .ok()?
-                    .toolchain_lister()?
-                    .activation_script(&toolchain, fs.as_ref())
-                    .await
+                Some(
+                    lang_registry
+                        .language_for_name(&toolchain.language_name.0)
+                        .await
+                        .ok()?
+                        .toolchain_lister()?
+                        .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
+                        .await,
+                )
             })
-            .await;
+            .await
+            .unwrap_or_default();
 
             project.update(cx, move |this, cx| {
                 let shell = {
                     env.extend(spawn_task.env);
                     match remote_client {
-                        Some(remote_client) => create_remote_shell(
-                            spawn_task
-                                .command
-                                .as_ref()
-                                .map(|command| (command, &spawn_task.args)),
-                            &mut env,
-                            path,
-                            remote_client,
-                            activation_script.clone(),
-                            cx,
-                        )?,
+                        Some(remote_client) => match activation_script.clone() {
+                            activation_script if !activation_script.is_empty() => {
+                                let activation_script = activation_script.join("; ");
+                                let to_run = if let Some(command) = spawn_task.command {
+                                    let command: Option<Cow<str>> = shlex::try_quote(&command).ok();
+                                    let args = spawn_task
+                                        .args
+                                        .iter()
+                                        .filter_map(|arg| shlex::try_quote(arg).ok());
+                                    command.into_iter().chain(args).join(" ")
+                                } else {
+                                    format!("exec {shell} -l")
+                                };
+                                let args = vec![
+                                    "-c".to_owned(),
+                                    format!("{activation_script}; {to_run}",),
+                                ];
+                                create_remote_shell(
+                                    Some((&shell, &args)),
+                                    &mut env,
+                                    path,
+                                    remote_client,
+                                    cx,
+                                )?
+                            }
+                            _ => create_remote_shell(
+                                spawn_task
+                                    .command
+                                    .as_ref()
+                                    .map(|command| (command, &spawn_task.args)),
+                                &mut env,
+                                path,
+                                remote_client,
+                                cx,
+                            )?,
+                        },
                         None => match activation_script.clone() {
-                            Some(activation_script) => {
+                            activation_script if !activation_script.is_empty() => {
+                                let activation_script = activation_script.join("; ");
                                 let to_run = if let Some(command) = spawn_task.command {
                                     let command: Option<Cow<str>> = shlex::try_quote(&command).ok();
                                     let args = spawn_task
@@ -169,7 +199,7 @@ impl Project {
                                     format!("exec {shell} -l")
                                 };
                                 Shell::WithArguments {
-                                    program: get_default_system_shell(),
+                                    program: shell,
                                     args: vec![
                                         "-c".to_owned(),
                                         format!("{activation_script}; {to_run}",),
@@ -177,7 +207,7 @@ impl Project {
                                     title_override: None,
                                 }
                             }
-                            None => {
+                            _ => {
                                 if let Some(program) = spawn_task.command {
                                     Shell::WithArguments {
                                         program,
@@ -302,31 +332,21 @@ impl Project {
                     .await
                     .ok();
                 let lister = language?.toolchain_lister();
-                lister?.activation_script(&toolchain, fs.as_ref()).await
+                Some(
+                    lister?
+                        .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
+                        .await,
+                )
             })
-            .await;
+            .await
+            .unwrap_or_default();
             project.update(cx, move |this, cx| {
                 let shell = {
                     match remote_client {
-                        Some(remote_client) => create_remote_shell(
-                            None,
-                            &mut env,
-                            path,
-                            remote_client,
-                            activation_script.clone(),
-                            cx,
-                        )?,
-                        None => match activation_script.clone() {
-                            Some(activation_script) => Shell::WithArguments {
-                                program: get_default_system_shell(),
-                                args: vec![
-                                    "-c".to_owned(),
-                                    format!("{activation_script}; exec {shell} -l",),
-                                ],
-                                title_override: Some(shell.into()),
-                            },
-                            None => settings.shell,
-                        },
+                        Some(remote_client) => {
+                            create_remote_shell(None, &mut env, path, remote_client, cx)?
+                        }
+                        None => settings.shell,
                     }
                 };
                 TerminalBuilder::new(
@@ -437,15 +457,10 @@ impl Project {
 
         match remote_client {
             Some(remote_client) => {
-                let command_template = remote_client.read(cx).build_command(
-                    Some(command),
-                    &args,
-                    &env,
-                    None,
-                    // todo
-                    None,
-                    None,
-                )?;
+                let command_template =
+                    remote_client
+                        .read(cx)
+                        .build_command(Some(command), &args, &env, None, None)?;
                 let mut command = std::process::Command::new(command_template.program);
                 command.args(command_template.args);
                 command.envs(command_template.env);
@@ -473,7 +488,6 @@ fn create_remote_shell(
     env: &mut HashMap<String, String>,
     working_directory: Option<Arc<Path>>,
     remote_client: Entity<RemoteClient>,
-    activation_script: Option<String>,
     cx: &mut App,
 ) -> Result<Shell> {
     // Alacritty sets its terminfo to `alacritty`, this requiring hosts to have it installed
@@ -493,7 +507,6 @@ fn create_remote_shell(
         args.as_slice(),
         env,
         working_directory.map(|path| path.display().to_string()),
-        activation_script,
         None,
     )?;
     *env = command.env;
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
index 2b8d9e4a94..dd529ca874 100644
--- a/crates/remote/src/remote_client.rs
+++ b/crates/remote/src/remote_client.rs
@@ -757,7 +757,6 @@ impl RemoteClient {
         args: &[String],
         env: &HashMap<String, String>,
         working_dir: Option<String>,
-        activation_script: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate> {
         let Some(connection) = self
@@ -767,14 +766,7 @@ impl RemoteClient {
         else {
             return Err(anyhow!("no connection"));
         };
-        connection.build_command(
-            program,
-            args,
-            env,
-            working_dir,
-            activation_script,
-            port_forward,
-        )
+        connection.build_command(program, args, env, working_dir, port_forward)
     }
 
     pub fn upload_directory(
@@ -1006,7 +998,6 @@ pub(crate) trait RemoteConnection: Send + Sync {
         args: &[String],
         env: &HashMap<String, String>,
         working_dir: Option<String>,
-        activation_script: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate>;
     fn connection_options(&self) -> SshConnectionOptions;
@@ -1373,7 +1364,6 @@ mod fake {
             args: &[String],
             env: &HashMap<String, String>,
             _: Option<String>,
-            _: Option<String>,
             _: Option<(u16, String, u16)>,
         ) -> Result<CommandTemplate> {
             let ssh_program = program.unwrap_or_else(|| "sh".to_string());
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 0036a687a6..b669801402 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -30,10 +30,7 @@ use std::{
     time::Instant,
 };
 use tempfile::TempDir;
-use util::{
-    get_default_system_shell,
-    paths::{PathStyle, RemotePathBuf},
-};
+use util::paths::{PathStyle, RemotePathBuf};
 
 pub(crate) struct SshRemoteConnection {
     socket: SshSocket,
@@ -116,7 +113,6 @@ impl RemoteConnection for SshRemoteConnection {
         input_args: &[String],
         input_env: &HashMap<String, String>,
         working_dir: Option<String>,
-        activation_script: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate> {
         use std::fmt::Write as _;
@@ -138,9 +134,6 @@ impl RemoteConnection for SshRemoteConnection {
         } else {
             write!(&mut script, "cd; ").unwrap();
         };
-        if let Some(activation_script) = activation_script {
-            write!(&mut script, " {activation_script};").unwrap();
-        }
 
         for (k, v) in input_env.iter() {
             if let Some((k, v)) = shlex::try_quote(k).ok().zip(shlex::try_quote(v).ok()) {
@@ -162,8 +155,7 @@ impl RemoteConnection for SshRemoteConnection {
             write!(&mut script, "exec {shell} -l").unwrap();
         };
 
-        let sys_shell = get_default_system_shell();
-        let shell_invocation = format!("{sys_shell} -c {}", shlex::try_quote(&script).unwrap());
+        let shell_invocation = format!("{shell} -c {}", shlex::try_quote(&script).unwrap());
 
         let mut args = Vec::new();
         args.extend(self.socket.ssh_args());
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index a5e0227533..0f4f2ae97b 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -354,7 +354,7 @@ impl TerminalBuilder {
         window_id: u64,
         completion_tx: Option<Sender<Option<ExitStatus>>>,
         cx: &App,
-        activation_script: Option<String>,
+        activation_script: Vec<String>,
     ) -> Result<TerminalBuilder> {
         // If the parent environment doesn't have a locale set
         // (As is the case when launched from a .app on MacOS),
@@ -493,7 +493,9 @@ impl TerminalBuilder {
         let pty_tx = event_loop.channel();
         let _io_thread = event_loop.spawn(); // DANGER
 
-        let terminal = Terminal {
+        let no_task = task.is_none();
+
+        let mut terminal = Terminal {
             task,
             pty_tx: Notifier(pty_tx),
             completion_tx,
@@ -518,7 +520,7 @@ impl TerminalBuilder {
             last_hyperlink_search_position: None,
             #[cfg(windows)]
             shell_program,
-            activation_script,
+            activation_script: activation_script.clone(),
             template: CopyTemplate {
                 shell,
                 env,
@@ -529,6 +531,14 @@ impl TerminalBuilder {
             },
         };
 
+        if !activation_script.is_empty() && no_task {
+            for activation_script in activation_script {
+                terminal.input(activation_script.into_bytes());
+                terminal.write_to_pty(b"\n");
+            }
+            terminal.clear();
+        }
+
         Ok(TerminalBuilder {
             terminal,
             events_rx,
@@ -712,7 +722,7 @@ pub struct Terminal {
     #[cfg(windows)]
     shell_program: Option<String>,
     template: CopyTemplate,
-    activation_script: Option<String>,
+    activation_script: Vec<String>,
 }
 
 struct CopyTemplate {
@@ -2218,7 +2228,7 @@ mod tests {
                 0,
                 Some(completion_tx),
                 cx,
-                None,
+                vec![],
             )
             .unwrap()
             .subscribe(cx)

From d13ba0162ae5d6d200b3e4509e691b57e0a27dda Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 29 Aug 2025 12:44:47 +0200
Subject: [PATCH 457/823] Require authorization for MCP tools (#37155)

Release Notes:

- Fixed a regression that caused MCP tools to run without requesting
authorization first.
---
 crates/agent2/src/tests/mod.rs                     | 1 +
 crates/agent2/src/tools/context_server_registry.rs | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index fbeee46a48..4527cdb056 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -950,6 +950,7 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
         paths::settings_file(),
         json!({
             "agent": {
+                "always_allow_tool_actions": true,
                 "profiles": {
                     "test": {
                         "name": "Test Profile",
diff --git a/crates/agent2/src/tools/context_server_registry.rs b/crates/agent2/src/tools/context_server_registry.rs
index c7963fa6e6..e13f47fb23 100644
--- a/crates/agent2/src/tools/context_server_registry.rs
+++ b/crates/agent2/src/tools/context_server_registry.rs
@@ -169,15 +169,18 @@ impl AnyAgentTool for ContextServerTool {
     fn run(
         self: Arc<Self>,
         input: serde_json::Value,
-        _event_stream: ToolCallEventStream,
+        event_stream: ToolCallEventStream,
         cx: &mut App,
     ) -> Task<Result<AgentToolOutput>> {
         let Some(server) = self.store.read(cx).get_running_server(&self.server_id) else {
             return Task::ready(Err(anyhow!("Context server not found")));
         };
         let tool_name = self.tool.name.clone();
+        let authorize = event_stream.authorize(self.initial_title(input.clone()), cx);
 
         cx.spawn(async move |_cx| {
+            authorize.await?;
+
             let Some(protocol) = server.client() else {
                 bail!("Context server not initialized");
             };

From 4507f60b8d8b43be7770dfcd0ca52bcb655d5d66 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 29 Aug 2025 13:39:38 +0200
Subject: [PATCH 458/823] languages: Fix python activation scripts not being
 quoted (#37159)

Release Notes:

- N/A
---
 crates/languages/src/python.rs     | 115 +++++++++++++----------------
 crates/remote/src/transport/ssh.rs |   9 ++-
 2 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index f76bd8e793..5bdc4aa0d9 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -328,41 +328,35 @@ impl LspAdapter for PythonLspAdapter {
                     .unwrap_or_default();
 
             // If we have a detected toolchain, configure Pyright to use it
-            if let Some(toolchain) = toolchain {
+            if let Some(toolchain) = toolchain
+                && let Ok(env) = serde_json::from_value::<
+                    pet_core::python_environment::PythonEnvironment,
+                >(toolchain.as_json.clone())
+            {
                 if user_settings.is_null() {
                     user_settings = Value::Object(serde_json::Map::default());
                 }
                 let object = user_settings.as_object_mut().unwrap();
 
                 let interpreter_path = toolchain.path.to_string();
+                if let Some(venv_dir) = env.prefix {
+                    // Set venvPath and venv at the root level
+                    // This matches the format of a pyrightconfig.json file
+                    if let Some(parent) = venv_dir.parent() {
+                        // Use relative path if the venv is inside the workspace
+                        let venv_path = if parent == adapter.worktree_root_path() {
+                            ".".to_string()
+                        } else {
+                            parent.to_string_lossy().into_owned()
+                        };
+                        object.insert("venvPath".to_string(), Value::String(venv_path));
+                    }
 
-                // Detect if this is a virtual environment
-                if let Some(interpreter_dir) = Path::new(&interpreter_path).parent()
-                    && let Some(venv_dir) = interpreter_dir.parent()
-                {
-                    // Check if this looks like a virtual environment
-                    if venv_dir.join("pyvenv.cfg").exists()
-                        || venv_dir.join("bin/activate").exists()
-                        || venv_dir.join("Scripts/activate.bat").exists()
-                    {
-                        // Set venvPath and venv at the root level
-                        // This matches the format of a pyrightconfig.json file
-                        if let Some(parent) = venv_dir.parent() {
-                            // Use relative path if the venv is inside the workspace
-                            let venv_path = if parent == adapter.worktree_root_path() {
-                                ".".to_string()
-                            } else {
-                                parent.to_string_lossy().into_owned()
-                            };
-                            object.insert("venvPath".to_string(), Value::String(venv_path));
-                        }
-
-                        if let Some(venv_name) = venv_dir.file_name() {
-                            object.insert(
-                                "venv".to_owned(),
-                                Value::String(venv_name.to_string_lossy().into_owned()),
-                            );
-                        }
+                    if let Some(venv_name) = venv_dir.file_name() {
+                        object.insert(
+                            "venv".to_owned(),
+                            Value::String(venv_name.to_string_lossy().into_owned()),
+                        );
                     }
                 }
 
@@ -932,7 +926,8 @@ impl ToolchainLister for PythonToolchainProvider {
                     };
                     let path = prefix.join(BINARY_DIR).join(activate_script_name);
                     if fs.is_file(&path).await {
-                        activation_script.push(format!("{activate_keyword} {}", path.display()));
+                        activation_script
+                            .push(format!("{activate_keyword} \"{}\"", path.display()));
                     }
                 }
             }
@@ -944,9 +939,9 @@ impl ToolchainLister for PythonToolchainProvider {
                 let pyenv = manager.executable;
                 let pyenv = pyenv.display();
                 activation_script.extend(match shell {
-                    ShellKind::Fish => Some(format!("{pyenv} shell - fish {version}")),
-                    ShellKind::Posix => Some(format!("{pyenv} shell - sh {version}")),
-                    ShellKind::Nushell => Some(format!("{pyenv} shell - nu {version}")),
+                    ShellKind::Fish => Some(format!("\"{pyenv}\" shell - fish {version}")),
+                    ShellKind::Posix => Some(format!("\"{pyenv}\" shell - sh {version}")),
+                    ShellKind::Nushell => Some(format!("\"{pyenv}\" shell - nu {version}")),
                     ShellKind::Powershell => None,
                     ShellKind::Csh => None,
                     ShellKind::Cmd => None,
@@ -1108,10 +1103,10 @@ impl LspAdapter for PyLspAdapter {
                 arguments: vec![],
             })
         } else {
-            let venv = toolchain?;
-            let pylsp_path = Path::new(venv.path.as_ref()).parent()?.join("pylsp");
+            let toolchain = toolchain?;
+            let pylsp_path = Path::new(toolchain.path.as_ref()).parent()?.join("pylsp");
             pylsp_path.exists().then(|| LanguageServerBinary {
-                path: venv.path.to_string().into(),
+                path: toolchain.path.to_string().into(),
                 arguments: vec![pylsp_path.into()],
                 env: None,
             })
@@ -1575,41 +1570,35 @@ impl LspAdapter for BasedPyrightLspAdapter {
                     .unwrap_or_default();
 
             // If we have a detected toolchain, configure Pyright to use it
-            if let Some(toolchain) = toolchain {
+            if let Some(toolchain) = toolchain
+                && let Ok(env) = serde_json::from_value::<
+                    pet_core::python_environment::PythonEnvironment,
+                >(toolchain.as_json.clone())
+            {
                 if user_settings.is_null() {
                     user_settings = Value::Object(serde_json::Map::default());
                 }
                 let object = user_settings.as_object_mut().unwrap();
 
                 let interpreter_path = toolchain.path.to_string();
+                if let Some(venv_dir) = env.prefix {
+                    // Set venvPath and venv at the root level
+                    // This matches the format of a pyrightconfig.json file
+                    if let Some(parent) = venv_dir.parent() {
+                        // Use relative path if the venv is inside the workspace
+                        let venv_path = if parent == adapter.worktree_root_path() {
+                            ".".to_string()
+                        } else {
+                            parent.to_string_lossy().into_owned()
+                        };
+                        object.insert("venvPath".to_string(), Value::String(venv_path));
+                    }
 
-                // Detect if this is a virtual environment
-                if let Some(interpreter_dir) = Path::new(&interpreter_path).parent()
-                    && let Some(venv_dir) = interpreter_dir.parent()
-                {
-                    // Check if this looks like a virtual environment
-                    if venv_dir.join("pyvenv.cfg").exists()
-                        || venv_dir.join("bin/activate").exists()
-                        || venv_dir.join("Scripts/activate.bat").exists()
-                    {
-                        // Set venvPath and venv at the root level
-                        // This matches the format of a pyrightconfig.json file
-                        if let Some(parent) = venv_dir.parent() {
-                            // Use relative path if the venv is inside the workspace
-                            let venv_path = if parent == adapter.worktree_root_path() {
-                                ".".to_string()
-                            } else {
-                                parent.to_string_lossy().into_owned()
-                            };
-                            object.insert("venvPath".to_string(), Value::String(venv_path));
-                        }
-
-                        if let Some(venv_name) = venv_dir.file_name() {
-                            object.insert(
-                                "venv".to_owned(),
-                                Value::String(venv_name.to_string_lossy().into_owned()),
-                            );
-                        }
+                    if let Some(venv_name) = venv_dir.file_name() {
+                        object.insert(
+                            "venv".to_owned(),
+                            Value::String(venv_name.to_string_lossy().into_owned()),
+                        );
                     }
                 }
 
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index b669801402..34f1ebf71c 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -125,12 +125,13 @@ impl RemoteConnection for SshRemoteConnection {
             // shlex will wrap the command in single quotes (''), disabling ~ expansion,
             // replace ith with something that works
             const TILDE_PREFIX: &'static str = "~/";
-            if working_dir.starts_with(TILDE_PREFIX) {
+            let working_dir = if working_dir.starts_with(TILDE_PREFIX) {
                 let working_dir = working_dir.trim_start_matches("~").trim_start_matches("/");
-                write!(&mut script, "cd \"$HOME/{working_dir}\"; ").unwrap();
+                format!("$HOME/{working_dir}")
             } else {
-                write!(&mut script, "cd \"{working_dir}\"; ").unwrap();
-            }
+                working_dir
+            };
+            write!(&mut script, "cd \"{working_dir}\"; ",).unwrap();
         } else {
             write!(&mut script, "cd; ").unwrap();
         };

From 01266d10d60269723c6b8d41bbcbe6363bc38ca0 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 29 Aug 2025 15:23:45 +0300
Subject: [PATCH 459/823] Do not send any LSP logs by default to collab clients
 (#37163)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up https://github.com/zed-industries/zed/pull/37083

Noisy RPC LSP logs were functioning this way already, but to keep Collab
loaded even less, do not send any kind of logs to the client if the
client has a corresponding log tab not opened.

This change is pretty raw and does not fully cover scenarious with
multiple clients: if one client has a log tab open and another opens tab
with another kind of log, the 2nd kind of logs will be streamed only.
Also, it should be possible to forward the host logs to the client on
enabling — that is not done to keep the change smaller.

Release Notes:

- N/A
---
 crates/language_tools/src/language_tools.rs   |  2 +-
 crates/language_tools/src/lsp_log_view.rs     | 96 ++++++++++++++-----
 .../language_tools/src/lsp_log_view_tests.rs  |  2 +-
 crates/project/src/lsp_store/log_store.rs     | 66 ++++++++-----
 crates/project/src/project.rs                 | 12 ++-
 crates/remote_server/src/headless_project.rs  |  6 +-
 6 files changed, 135 insertions(+), 49 deletions(-)

diff --git a/crates/language_tools/src/language_tools.rs b/crates/language_tools/src/language_tools.rs
index c784a67313..aa16728064 100644
--- a/crates/language_tools/src/language_tools.rs
+++ b/crates/language_tools/src/language_tools.rs
@@ -14,7 +14,7 @@ use ui::{Context, Window};
 use workspace::{Item, ItemHandle, SplitDirection, Workspace};
 
 pub fn init(cx: &mut App) {
-    lsp_log_view::init(true, cx);
+    lsp_log_view::init(false, cx);
     syntax_tree_view::init(cx);
     key_context_view::init(cx);
 }
diff --git a/crates/language_tools/src/lsp_log_view.rs b/crates/language_tools/src/lsp_log_view.rs
index e54411f1d4..b1f1e5c4f6 100644
--- a/crates/language_tools/src/lsp_log_view.rs
+++ b/crates/language_tools/src/lsp_log_view.rs
@@ -16,6 +16,7 @@ use project::{
     lsp_store::log_store::{self, Event, LanguageServerKind, LogKind, LogStore, Message},
     search::SearchQuery,
 };
+use proto::toggle_lsp_logs::LogType;
 use std::{any::TypeId, borrow::Cow, sync::Arc};
 use ui::{Button, Checkbox, ContextMenu, Label, PopoverMenu, ToggleState, prelude::*};
 use util::ResultExt as _;
@@ -111,8 +112,8 @@ actions!(
     ]
 );
 
-pub fn init(store_logs: bool, cx: &mut App) {
-    let log_store = log_store::init(store_logs, cx);
+pub fn init(on_headless_host: bool, cx: &mut App) {
+    let log_store = log_store::init(on_headless_host, cx);
 
     log_store.update(cx, |_, cx| {
         Copilot::global(cx).map(|copilot| {
@@ -266,6 +267,19 @@ impl LspLogView {
             window.focus(&log_view.editor.focus_handle(cx));
         });
 
+        cx.on_release(|log_view, cx| {
+            log_view.log_store.update(cx, |log_store, cx| {
+                for (server_id, state) in &log_store.language_servers {
+                    if let Some(log_kind) = state.toggled_log_kind {
+                        if let Some(log_type) = log_type(log_kind) {
+                            send_toggle_log_message(state, *server_id, false, log_type, cx);
+                        }
+                    }
+                }
+            });
+        })
+        .detach();
+
         let mut lsp_log_view = Self {
             focus_handle,
             editor,
@@ -436,6 +450,12 @@ impl LspLogView {
             cx.notify();
         }
         self.editor.read(cx).focus_handle(cx).focus(window);
+        self.log_store.update(cx, |log_store, cx| {
+            let state = log_store.get_language_server_state(server_id)?;
+            state.toggled_log_kind = Some(LogKind::Logs);
+            send_toggle_log_message(state, server_id, true, LogType::Log, cx);
+            Some(())
+        });
     }
 
     fn update_log_level(
@@ -472,8 +492,8 @@ impl LspLogView {
     ) {
         let trace_level = self
             .log_store
-            .update(cx, |this, _| {
-                Some(this.get_language_server_state(server_id)?.trace_level)
+            .update(cx, |log_store, _| {
+                Some(log_store.get_language_server_state(server_id)?.trace_level)
             })
             .unwrap_or(TraceValue::Messages);
         let log_contents = self
@@ -487,6 +507,12 @@ impl LspLogView {
             let (editor, editor_subscriptions) = Self::editor_for_logs(log_contents, window, cx);
             self.editor = editor;
             self.editor_subscriptions = editor_subscriptions;
+            self.log_store.update(cx, |log_store, cx| {
+                let state = log_store.get_language_server_state(server_id)?;
+                state.toggled_log_kind = Some(LogKind::Trace);
+                send_toggle_log_message(state, server_id, true, LogType::Trace, cx);
+                Some(())
+            });
             cx.notify();
         }
         self.editor.read(cx).focus_handle(cx).focus(window);
@@ -551,24 +577,7 @@ impl LspLogView {
             }
 
             if let Some(server_state) = log_store.language_servers.get(&server_id) {
-                if let LanguageServerKind::Remote { project } = &server_state.kind {
-                    project
-                        .update(cx, |project, cx| {
-                            if let Some((client, project_id)) =
-                                project.lsp_store().read(cx).upstream_client()
-                            {
-                                client
-                                    .send(proto::ToggleLspLogs {
-                                        project_id,
-                                        log_type: proto::toggle_lsp_logs::LogType::Rpc as i32,
-                                        server_id: server_id.to_proto(),
-                                        enabled,
-                                    })
-                                    .log_err();
-                            }
-                        })
-                        .ok();
-                }
+                send_toggle_log_message(server_state, server_id, enabled, LogType::Rpc, cx);
             };
         });
         if !enabled && Some(server_id) == self.current_server_id {
@@ -644,6 +653,49 @@ impl LspLogView {
         self.editor_subscriptions = editor_subscriptions;
         cx.notify();
         self.editor.read(cx).focus_handle(cx).focus(window);
+        self.log_store.update(cx, |log_store, cx| {
+            let state = log_store.get_language_server_state(server_id)?;
+            if let Some(log_kind) = state.toggled_log_kind.take() {
+                if let Some(log_type) = log_type(log_kind) {
+                    send_toggle_log_message(state, server_id, false, log_type, cx);
+                }
+            };
+            Some(())
+        });
+    }
+}
+
+fn log_type(log_kind: LogKind) -> Option<LogType> {
+    match log_kind {
+        LogKind::Rpc => Some(LogType::Rpc),
+        LogKind::Trace => Some(LogType::Trace),
+        LogKind::Logs => Some(LogType::Log),
+        LogKind::ServerInfo => None,
+    }
+}
+
+fn send_toggle_log_message(
+    server_state: &log_store::LanguageServerState,
+    server_id: LanguageServerId,
+    enabled: bool,
+    log_type: LogType,
+    cx: &mut App,
+) {
+    if let LanguageServerKind::Remote { project } = &server_state.kind {
+        project
+            .update(cx, |project, cx| {
+                if let Some((client, project_id)) = project.lsp_store().read(cx).upstream_client() {
+                    client
+                        .send(proto::ToggleLspLogs {
+                            project_id,
+                            log_type: log_type as i32,
+                            server_id: server_id.to_proto(),
+                            enabled,
+                        })
+                        .log_err();
+                }
+            })
+            .ok();
     }
 }
 
diff --git a/crates/language_tools/src/lsp_log_view_tests.rs b/crates/language_tools/src/lsp_log_view_tests.rs
index bfd093e3db..d572c4375e 100644
--- a/crates/language_tools/src/lsp_log_view_tests.rs
+++ b/crates/language_tools/src/lsp_log_view_tests.rs
@@ -53,7 +53,7 @@ async fn test_lsp_log_view(cx: &mut TestAppContext) {
         },
     );
 
-    let log_store = cx.new(|cx| LogStore::new(true, cx));
+    let log_store = cx.new(|cx| LogStore::new(false, cx));
     log_store.update(cx, |store, cx| store.add_project(&project, cx));
 
     let _rust_buffer = project
diff --git a/crates/project/src/lsp_store/log_store.rs b/crates/project/src/lsp_store/log_store.rs
index 1fbdb494a3..67a20dd6cd 100644
--- a/crates/project/src/lsp_store/log_store.rs
+++ b/crates/project/src/lsp_store/log_store.rs
@@ -21,8 +21,8 @@ const SERVER_LOGS: &str = "Server Logs";
 const SERVER_TRACE: &str = "Server Trace";
 const SERVER_INFO: &str = "Server Info";
 
-pub fn init(store_logs: bool, cx: &mut App) -> Entity<LogStore> {
-    let log_store = cx.new(|cx| LogStore::new(store_logs, cx));
+pub fn init(on_headless_host: bool, cx: &mut App) -> Entity<LogStore> {
+    let log_store = cx.new(|cx| LogStore::new(on_headless_host, cx));
     cx.set_global(GlobalLogStore(log_store.clone()));
     log_store
 }
@@ -43,7 +43,7 @@ pub enum Event {
 impl EventEmitter<Event> for LogStore {}
 
 pub struct LogStore {
-    store_logs: bool,
+    on_headless_host: bool,
     projects: HashMap<WeakEntity<Project>, ProjectState>,
     pub copilot_log_subscription: Option<lsp::Subscription>,
     pub language_servers: HashMap<LanguageServerId, LanguageServerState>,
@@ -138,6 +138,7 @@ pub struct LanguageServerState {
     pub trace_level: TraceValue,
     pub log_level: MessageType,
     io_logs_subscription: Option<lsp::Subscription>,
+    pub toggled_log_kind: Option<LogKind>,
 }
 
 impl std::fmt::Debug for LanguageServerState {
@@ -151,6 +152,7 @@ impl std::fmt::Debug for LanguageServerState {
             .field("rpc_state", &self.rpc_state)
             .field("trace_level", &self.trace_level)
             .field("log_level", &self.log_level)
+            .field("toggled_log_kind", &self.toggled_log_kind)
             .finish_non_exhaustive()
     }
 }
@@ -226,14 +228,14 @@ impl LogKind {
 }
 
 impl LogStore {
-    pub fn new(store_logs: bool, cx: &mut Context<Self>) -> Self {
+    pub fn new(on_headless_host: bool, cx: &mut Context<Self>) -> Self {
         let (io_tx, mut io_rx) = mpsc::unbounded();
 
         let log_store = Self {
             projects: HashMap::default(),
             language_servers: HashMap::default(),
             copilot_log_subscription: None,
-            store_logs,
+            on_headless_host,
             io_tx,
         };
         cx.spawn(async move |log_store, cx| {
@@ -351,12 +353,26 @@ impl LogStore {
                                     }
                                 }
                             }
-                            crate::Event::ToggleLspLogs { server_id, enabled } => {
-                                // we do not support any other log toggling yet
-                                if *enabled {
-                                    log_store.enable_rpc_trace_for_language_server(*server_id);
-                                } else {
-                                    log_store.disable_rpc_trace_for_language_server(*server_id);
+                            crate::Event::ToggleLspLogs {
+                                server_id,
+                                enabled,
+                                toggled_log_kind,
+                            } => {
+                                if let Some(server_state) =
+                                    log_store.get_language_server_state(*server_id)
+                                {
+                                    if *enabled {
+                                        server_state.toggled_log_kind = Some(*toggled_log_kind);
+                                    } else {
+                                        server_state.toggled_log_kind = None;
+                                    }
+                                }
+                                if LogKind::Rpc == *toggled_log_kind {
+                                    if *enabled {
+                                        log_store.enable_rpc_trace_for_language_server(*server_id);
+                                    } else {
+                                        log_store.disable_rpc_trace_for_language_server(*server_id);
+                                    }
                                 }
                             }
                             _ => {}
@@ -395,6 +411,7 @@ impl LogStore {
                 trace_level: TraceValue::Off,
                 log_level: MessageType::LOG,
                 io_logs_subscription: None,
+                toggled_log_kind: None,
             }
         });
 
@@ -425,7 +442,7 @@ impl LogStore {
         message: &str,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        let store_logs = self.store_logs;
+        let store_logs = !self.on_headless_host;
         let language_server_state = self.get_language_server_state(id)?;
 
         let log_lines = &mut language_server_state.log_messages;
@@ -464,7 +481,7 @@ impl LogStore {
         verbose_info: Option<String>,
         cx: &mut Context<Self>,
     ) -> Option<()> {
-        let store_logs = self.store_logs;
+        let store_logs = !self.on_headless_host;
         let language_server_state = self.get_language_server_state(id)?;
 
         let log_lines = &mut language_server_state.trace_messages;
@@ -530,7 +547,7 @@ impl LogStore {
         message: &str,
         cx: &mut Context<'_, Self>,
     ) {
-        let store_logs = self.store_logs;
+        let store_logs = !self.on_headless_host;
         let Some(state) = self
             .get_language_server_state(language_server_id)
             .and_then(|state| state.rpc_state.as_mut())
@@ -673,6 +690,7 @@ impl LogStore {
     }
 
     fn emit_event(&mut self, e: Event, cx: &mut Context<Self>) {
+        let on_headless_host = self.on_headless_host;
         match &e {
             Event::NewServerLogEntry { id, kind, text } => {
                 if let Some(state) = self.get_language_server_state(*id) {
@@ -686,14 +704,18 @@ impl LogStore {
                     }
                     .and_then(|lsp_store| lsp_store.read(cx).downstream_client());
                     if let Some((client, project_id)) = downstream_client {
-                        client
-                            .send(proto::LanguageServerLog {
-                                project_id,
-                                language_server_id: id.to_proto(),
-                                message: text.clone(),
-                                log_type: Some(kind.to_proto()),
-                            })
-                            .ok();
+                        if on_headless_host
+                            || Some(LogKind::from_server_log_type(kind)) == state.toggled_log_kind
+                        {
+                            client
+                                .send(proto::LanguageServerLog {
+                                    project_id,
+                                    language_server_id: id.to_proto(),
+                                    message: text.clone(),
+                                    log_type: Some(kind.to_proto()),
+                                })
+                                .ok();
+                        }
                     }
                 }
             }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 68e04cfd3b..8c289c935c 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -33,7 +33,7 @@ mod yarn;
 
 use dap::inline_value::{InlineValueLocation, VariableLookupKind, VariableScope};
 
-use crate::git_store::GitStore;
+use crate::{git_store::GitStore, lsp_store::log_store::LogKind};
 pub use git_store::{
     ConflictRegion, ConflictSet, ConflictSetSnapshot, ConflictSetUpdate,
     git_traversal::{ChildEntriesGitIter, GitEntry, GitEntryRef, GitTraversal},
@@ -285,6 +285,7 @@ pub enum Event {
     ToggleLspLogs {
         server_id: LanguageServerId,
         enabled: bool,
+        toggled_log_kind: LogKind,
     },
     Toast {
         notification_id: SharedString,
@@ -4719,10 +4720,19 @@ impl Project {
         envelope: TypedEnvelope<proto::ToggleLspLogs>,
         mut cx: AsyncApp,
     ) -> Result<()> {
+        let toggled_log_kind =
+            match proto::toggle_lsp_logs::LogType::from_i32(envelope.payload.log_type)
+                .context("invalid log type")?
+            {
+                proto::toggle_lsp_logs::LogType::Log => LogKind::Logs,
+                proto::toggle_lsp_logs::LogType::Trace => LogKind::Trace,
+                proto::toggle_lsp_logs::LogType::Rpc => LogKind::Rpc,
+            };
         project.update(&mut cx, |_, cx| {
             cx.emit(Event::ToggleLspLogs {
                 server_id: LanguageServerId::from_proto(envelope.payload.server_id),
                 enabled: envelope.payload.enabled,
+                toggled_log_kind,
             })
         })?;
         Ok(())
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index c81a69c2b3..f55826631b 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -67,7 +67,7 @@ impl HeadlessProject {
         settings::init(cx);
         language::init(cx);
         project::Project::init_settings(cx);
-        log_store::init(false, cx);
+        log_store::init(true, cx);
     }
 
     pub fn new(
@@ -546,7 +546,9 @@ impl HeadlessProject {
             .context("lsp logs store is missing")?;
 
         lsp_logs.update(&mut cx, |lsp_logs, _| {
-            // we do not support any other log toggling yet
+            // RPC logs are very noisy and we need to toggle it on the headless server too.
+            // The rest of the logs for the ssh project are very important to have toggled always,
+            // to e.g. send language server error logs to the client before anything is toggled.
             if envelope.payload.enabled {
                 lsp_logs.enable_rpc_trace_for_language_server(server_id);
             } else {

From ff035e8a22fb40ea29af97f974351151af226198 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 29 Aug 2025 09:26:52 -0300
Subject: [PATCH 460/823] agent: Add CC item in the settings view (#37164)

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_configuration.rs | 49 ++++++++++++----------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 23b6e69a56..5f0b6f33c3 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -331,6 +331,7 @@ impl AgentConfiguration {
                             .gap_0p5()
                             .child(
                                 h_flex()
+                                    .pr_1()
                                     .w_full()
                                     .gap_2()
                                     .justify_between()
@@ -1022,6 +1023,7 @@ impl AgentConfiguration {
                             .gap_0p5()
                             .child(
                                 h_flex()
+                                    .pr_1()
                                     .w_full()
                                     .gap_2()
                                     .justify_between()
@@ -1052,7 +1054,7 @@ impl AgentConfiguration {
                             )
                             .child(
                                 Label::new(
-                                    "Bring the agent of your choice to Zed via our new Agent Client Protocol.",
+                                    "All agents connected through the Agent Client Protocol.",
                                 )
                                 .color(Color::Muted),
                             ),
@@ -1063,7 +1065,12 @@ impl AgentConfiguration {
                         ExternalAgent::Gemini,
                         cx,
                     ))
-                    // TODO add CC
+                    .child(self.render_agent_server(
+                        IconName::AiClaude,
+                        "Claude Code",
+                        ExternalAgent::ClaudeCode,
+                        cx,
+                    ))
                     .children(user_defined_agents),
             )
     }
@@ -1093,26 +1100,24 @@ impl AgentConfiguration {
                     .child(Label::new(name.clone())),
             )
             .child(
-                h_flex().gap_1().child(
-                    Button::new(
-                        SharedString::from(format!("start_acp_thread-{name}")),
-                        "Start New Thread",
-                    )
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::Thread)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(Color::Muted)
-                    .on_click(move |_, window, cx| {
-                        window.dispatch_action(
-                            NewExternalAgentThread {
-                                agent: Some(agent.clone()),
-                            }
-                            .boxed_clone(),
-                            cx,
-                        );
-                    }),
-                ),
+                Button::new(
+                    SharedString::from(format!("start_acp_thread-{name}")),
+                    "Start New Thread",
+                )
+                .label_size(LabelSize::Small)
+                .icon(IconName::Thread)
+                .icon_position(IconPosition::Start)
+                .icon_size(IconSize::XSmall)
+                .icon_color(Color::Muted)
+                .on_click(move |_, window, cx| {
+                    window.dispatch_action(
+                        NewExternalAgentThread {
+                            agent: Some(agent.clone()),
+                        }
+                        .boxed_clone(),
+                        cx,
+                    );
+                }),
             )
     }
 }

From 20d32d111c15dfef49a1c9c1267d33250d58b67b Mon Sep 17 00:00:00 2001
From: Wouter Kayser <wouterkayser@gmail.com>
Date: Fri, 29 Aug 2025 16:08:42 +0200
Subject: [PATCH 461/823] Update lsp-types to properly handle brackets (#37166)

Closes #21062

See also this pull request:
https://github.com/zed-industries/lsp-types/pull/6.

Release Notes:

- Fixed incorrect URL encoding of file paths with `[` `]` in them
---
 Cargo.lock                                    |  2 +-
 Cargo.toml                                    |  2 +-
 crates/agent_ui/src/acp/message_editor.rs     |  2 +-
 crates/collab/src/tests/editor_tests.rs       | 52 ++++++------
 crates/collab/src/tests/integration_tests.rs  | 26 +++---
 .../random_project_collaboration_tests.rs     |  2 +-
 crates/copilot/src/copilot.rs                 | 12 +--
 crates/copilot/src/request.rs                 |  2 +-
 crates/diagnostics/src/diagnostics_tests.rs   | 45 +++++-----
 crates/editor/src/editor_tests.rs             | 36 ++++----
 crates/editor/src/inlay_hint_cache.rs         | 28 +++---
 .../src/test/editor_lsp_test_context.rs       |  6 +-
 crates/language/src/buffer.rs                 |  2 +-
 crates/language/src/proto.rs                  |  2 +-
 crates/languages/src/rust.rs                  |  2 +-
 crates/lsp/src/lsp.rs                         | 38 ++++-----
 crates/project/src/lsp_command.rs             | 30 +++----
 crates/project/src/lsp_store.rs               | 54 +++++++-----
 .../project/src/lsp_store/lsp_ext_command.rs  |  2 +-
 crates/project/src/project.rs                 |  4 +-
 crates/project/src/project_tests.rs           | 85 +++++++++----------
 crates/project_symbols/src/project_symbols.rs |  2 +-
 .../remote_server/src/remote_editing_tests.rs |  2 +-
 23 files changed, 223 insertions(+), 215 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aeacdd8996..e493c99a2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9770,7 +9770,7 @@ dependencies = [
 [[package]]
 name = "lsp-types"
 version = "0.95.1"
-source = "git+https://github.com/zed-industries/lsp-types?rev=39f629bdd03d59abd786ed9fc27e8bca02c0c0ec#39f629bdd03d59abd786ed9fc27e8bca02c0c0ec"
+source = "git+https://github.com/zed-industries/lsp-types?rev=0874f8742fe55b4dc94308c1e3c0069710d8eeaf#0874f8742fe55b4dc94308c1e3c0069710d8eeaf"
 dependencies = [
  "bitflags 1.3.2",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 974796a5e5..d346043c0e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -519,7 +519,7 @@ libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
-lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "39f629bdd03d59abd786ed9fc27e8bca02c0c0ec" }
+lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "0874f8742fe55b4dc94308c1e3c0069710d8eeaf" }
 mach2 = "0.5"
 markup5ever_rcdom = "0.3.0"
 metal = "0.29"
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index f4ce2652d6..bd5e4faf7a 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -2128,7 +2128,7 @@ mod tests {
                     lsp::SymbolInformation {
                         name: "MySymbol".into(),
                         location: lsp::Location {
-                            uri: lsp::Url::from_file_path(path!("/dir/a/one.txt")).unwrap(),
+                            uri: lsp::Uri::from_file_path(path!("/dir/a/one.txt")).unwrap(),
                             range: lsp::Range::new(
                                 lsp::Position::new(0, 0),
                                 lsp::Position::new(0, 1),
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index 59d66f1821..bfea497e9b 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -369,7 +369,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
         .set_request_handler::<lsp::request::Completion, _, _>(|params, _| async move {
             assert_eq!(
                 params.text_document_position.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(
                 params.text_document_position.position,
@@ -488,7 +488,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
         .set_request_handler::<lsp::request::Completion, _, _>(|params, _| async move {
             assert_eq!(
                 params.text_document_position.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(
                 params.text_document_position.position,
@@ -615,7 +615,7 @@ async fn test_collaborating_with_code_actions(
         .set_request_handler::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(params.range.start, lsp::Position::new(0, 0));
             assert_eq!(params.range.end, lsp::Position::new(0, 0));
@@ -637,7 +637,7 @@ async fn test_collaborating_with_code_actions(
         .set_request_handler::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(params.range.start, lsp::Position::new(1, 31));
             assert_eq!(params.range.end, lsp::Position::new(1, 31));
@@ -649,7 +649,7 @@ async fn test_collaborating_with_code_actions(
                         changes: Some(
                             [
                                 (
-                                    lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                                     vec![lsp::TextEdit::new(
                                         lsp::Range::new(
                                             lsp::Position::new(1, 22),
@@ -659,7 +659,7 @@ async fn test_collaborating_with_code_actions(
                                     )],
                                 ),
                                 (
-                                    lsp::Url::from_file_path(path!("/a/other.rs")).unwrap(),
+                                    lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap(),
                                     vec![lsp::TextEdit::new(
                                         lsp::Range::new(
                                             lsp::Position::new(0, 0),
@@ -721,7 +721,7 @@ async fn test_collaborating_with_code_actions(
                     changes: Some(
                         [
                             (
-                                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                                 vec![lsp::TextEdit::new(
                                     lsp::Range::new(
                                         lsp::Position::new(1, 22),
@@ -731,7 +731,7 @@ async fn test_collaborating_with_code_actions(
                                 )],
                             ),
                             (
-                                lsp::Url::from_file_path(path!("/a/other.rs")).unwrap(),
+                                lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap(),
                                 vec![lsp::TextEdit::new(
                                     lsp::Range::new(
                                         lsp::Position::new(0, 0),
@@ -949,14 +949,14 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
                 changes: Some(
                     [
                         (
-                            lsp::Url::from_file_path(path!("/dir/one.rs")).unwrap(),
+                            lsp::Uri::from_file_path(path!("/dir/one.rs")).unwrap(),
                             vec![lsp::TextEdit::new(
                                 lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                                 "THREE".to_string(),
                             )],
                         ),
                         (
-                            lsp::Url::from_file_path(path!("/dir/two.rs")).unwrap(),
+                            lsp::Uri::from_file_path(path!("/dir/two.rs")).unwrap(),
                             vec![
                                 lsp::TextEdit::new(
                                     lsp::Range::new(
@@ -1574,7 +1574,7 @@ async fn test_on_input_format_from_host_to_guest(
         |params, _| async move {
             assert_eq!(
                 params.text_document_position.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(
                 params.text_document_position.position,
@@ -1717,7 +1717,7 @@ async fn test_on_input_format_from_guest_to_host(
         .set_request_handler::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
             assert_eq!(
                 params.text_document_position.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(
                 params.text_document_position.position,
@@ -1901,7 +1901,7 @@ async fn test_mutual_editor_inlay_hint_cache_update(
             async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                 );
                 let edits_made = task_edits_made.load(atomic::Ordering::Acquire);
                 Ok(Some(vec![lsp::InlayHint {
@@ -2151,7 +2151,7 @@ async fn test_inlay_hint_refresh_is_forwarded(
             async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                 );
                 let other_hints = task_other_hints.load(atomic::Ordering::Acquire);
                 let character = if other_hints { 0 } else { 2 };
@@ -2332,7 +2332,7 @@ async fn test_lsp_document_color(cx_a: &mut TestAppContext, cx_b: &mut TestAppCo
             async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                 );
                 requests_made.fetch_add(1, atomic::Ordering::Release);
                 Ok(vec![lsp::ColorInformation {
@@ -2621,11 +2621,11 @@ async fn test_lsp_pull_diagnostics(
             let requests_made = closure_diagnostics_pulls_made.clone();
             let diagnostics_pulls_result_ids = closure_diagnostics_pulls_result_ids.clone();
             async move {
-                let message = if lsp::Url::from_file_path(path!("/a/main.rs")).unwrap()
+                let message = if lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
                     == params.text_document.uri
                 {
                     expected_pull_diagnostic_main_message.to_string()
-                } else if lsp::Url::from_file_path(path!("/a/lib.rs")).unwrap()
+                } else if lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap()
                     == params.text_document.uri
                 {
                     expected_pull_diagnostic_lib_message.to_string()
@@ -2717,7 +2717,7 @@ async fn test_lsp_pull_diagnostics(
                         items: vec![
                             lsp::WorkspaceDocumentDiagnosticReport::Full(
                                 lsp::WorkspaceFullDocumentDiagnosticReport {
-                                    uri: lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                    uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                                     version: None,
                                     full_document_diagnostic_report:
                                         lsp::FullDocumentDiagnosticReport {
@@ -2746,7 +2746,7 @@ async fn test_lsp_pull_diagnostics(
                             ),
                             lsp::WorkspaceDocumentDiagnosticReport::Full(
                                 lsp::WorkspaceFullDocumentDiagnosticReport {
-                                    uri: lsp::Url::from_file_path(path!("/a/lib.rs")).unwrap(),
+                                    uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
                                     version: None,
                                     full_document_diagnostic_report:
                                         lsp::FullDocumentDiagnosticReport {
@@ -2821,7 +2821,7 @@ async fn test_lsp_pull_diagnostics(
 
     fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
         &lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             diagnostics: vec![lsp::Diagnostic {
                 range: lsp::Range {
                     start: lsp::Position {
@@ -2842,7 +2842,7 @@ async fn test_lsp_pull_diagnostics(
     );
     fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
         &lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a/lib.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
             diagnostics: vec![lsp::Diagnostic {
                 range: lsp::Range {
                     start: lsp::Position {
@@ -2870,7 +2870,7 @@ async fn test_lsp_pull_diagnostics(
                     items: vec![
                         lsp::WorkspaceDocumentDiagnosticReport::Full(
                             lsp::WorkspaceFullDocumentDiagnosticReport {
-                                uri: lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                                 version: None,
                                 full_document_diagnostic_report:
                                     lsp::FullDocumentDiagnosticReport {
@@ -2902,7 +2902,7 @@ async fn test_lsp_pull_diagnostics(
                         ),
                         lsp::WorkspaceDocumentDiagnosticReport::Full(
                             lsp::WorkspaceFullDocumentDiagnosticReport {
-                                uri: lsp::Url::from_file_path(path!("/a/lib.rs")).unwrap(),
+                                uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
                                 version: None,
                                 full_document_diagnostic_report:
                                     lsp::FullDocumentDiagnosticReport {
@@ -3051,7 +3051,7 @@ async fn test_lsp_pull_diagnostics(
                 lsp::WorkspaceDiagnosticReportResult::Report(lsp::WorkspaceDiagnosticReport {
                     items: vec![lsp::WorkspaceDocumentDiagnosticReport::Full(
                         lsp::WorkspaceFullDocumentDiagnosticReport {
-                            uri: lsp::Url::from_file_path(path!("/a/lib.rs")).unwrap(),
+                            uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
                             version: None,
                             full_document_diagnostic_report: lsp::FullDocumentDiagnosticReport {
                                 result_id: Some(format!(
@@ -4040,7 +4040,7 @@ async fn test_client_can_query_lsp_ext(cx_a: &mut TestAppContext, cx_b: &mut Tes
         |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(params.position, lsp::Position::new(0, 0));
             Ok(Some(ExpandedMacro {
@@ -4075,7 +4075,7 @@ async fn test_client_can_query_lsp_ext(cx_a: &mut TestAppContext, cx_b: &mut Tes
         |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(
                 params.position,
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 5c73253048..6bb2db0520 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -4075,7 +4075,7 @@ async fn test_collaborating_with_diagnostics(
         .await;
     fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
         &lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a/a.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
             version: None,
             diagnostics: vec![lsp::Diagnostic {
                 severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -4095,7 +4095,7 @@ async fn test_collaborating_with_diagnostics(
         .unwrap();
     fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
         &lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a/a.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
             version: None,
             diagnostics: vec![lsp::Diagnostic {
                 severity: Some(lsp::DiagnosticSeverity::ERROR),
@@ -4169,7 +4169,7 @@ async fn test_collaborating_with_diagnostics(
     // Simulate a language server reporting more errors for a file.
     fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
         &lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a/a.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
             version: None,
             diagnostics: vec![
                 lsp::Diagnostic {
@@ -4265,7 +4265,7 @@ async fn test_collaborating_with_diagnostics(
     // Simulate a language server reporting no errors for a file.
     fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
         &lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a/a.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
             version: None,
             diagnostics: Vec::new(),
         },
@@ -4372,7 +4372,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
     for file_name in file_names {
         fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
             &lsp::PublishDiagnosticsParams {
-                uri: lsp::Url::from_file_path(Path::new(path!("/test")).join(file_name)).unwrap(),
+                uri: lsp::Uri::from_file_path(Path::new(path!("/test")).join(file_name)).unwrap(),
                 version: None,
                 diagnostics: vec![lsp::Diagnostic {
                     severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -4838,7 +4838,7 @@ async fn test_definition(
         |_, _| async move {
             Ok(Some(lsp::GotoDefinitionResponse::Scalar(
                 lsp::Location::new(
-                    lsp::Url::from_file_path(path!("/root/dir-2/b.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/root/dir-2/b.rs")).unwrap(),
                     lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                 ),
             )))
@@ -4876,7 +4876,7 @@ async fn test_definition(
         |_, _| async move {
             Ok(Some(lsp::GotoDefinitionResponse::Scalar(
                 lsp::Location::new(
-                    lsp::Url::from_file_path(path!("/root/dir-2/b.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/root/dir-2/b.rs")).unwrap(),
                     lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)),
                 ),
             )))
@@ -4914,7 +4914,7 @@ async fn test_definition(
             );
             Ok(Some(lsp::GotoDefinitionResponse::Scalar(
                 lsp::Location::new(
-                    lsp::Url::from_file_path(path!("/root/dir-2/c.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/root/dir-2/c.rs")).unwrap(),
                     lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)),
                 ),
             )))
@@ -5049,15 +5049,15 @@ async fn test_references(
     lsp_response_tx
         .unbounded_send(Ok(Some(vec![
             lsp::Location {
-                uri: lsp::Url::from_file_path(path!("/root/dir-1/two.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/root/dir-1/two.rs")).unwrap(),
                 range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)),
             },
             lsp::Location {
-                uri: lsp::Url::from_file_path(path!("/root/dir-1/two.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/root/dir-1/two.rs")).unwrap(),
                 range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)),
             },
             lsp::Location {
-                uri: lsp::Url::from_file_path(path!("/root/dir-2/three.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/root/dir-2/three.rs")).unwrap(),
                 range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)),
             },
         ])))
@@ -5625,7 +5625,7 @@ async fn test_project_symbols(
                 lsp::SymbolInformation {
                     name: "TWO".into(),
                     location: lsp::Location {
-                        uri: lsp::Url::from_file_path(path!("/code/crate-2/two.rs")).unwrap(),
+                        uri: lsp::Uri::from_file_path(path!("/code/crate-2/two.rs")).unwrap(),
                         range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                     },
                     kind: lsp::SymbolKind::CONSTANT,
@@ -5737,7 +5737,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
         |_, _| async move {
             Ok(Some(lsp::GotoDefinitionResponse::Scalar(
                 lsp::Location::new(
-                    lsp::Url::from_file_path(path!("/root/b.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/root/b.rs")).unwrap(),
                     lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                 ),
             )))
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
index ac5c4c54ca..bfe05c4a1d 100644
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -1101,7 +1101,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                         files
                                             .into_iter()
                                             .map(|file| lsp::Location {
-                                                uri: lsp::Url::from_file_path(file).unwrap(),
+                                                uri: lsp::Uri::from_file_path(file).unwrap(),
                                                 range: Default::default(),
                                             })
                                             .collect(),
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index b7d8423fd7..d0a57735ab 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -197,7 +197,7 @@ impl Status {
 }
 
 struct RegisteredBuffer {
-    uri: lsp::Url,
+    uri: lsp::Uri,
     language_id: String,
     snapshot: BufferSnapshot,
     snapshot_version: i32,
@@ -1108,9 +1108,9 @@ fn id_for_language(language: Option<&Arc<Language>>) -> String {
         .unwrap_or_else(|| "plaintext".to_string())
 }
 
-fn uri_for_buffer(buffer: &Entity<Buffer>, cx: &App) -> Result<lsp::Url, ()> {
+fn uri_for_buffer(buffer: &Entity<Buffer>, cx: &App) -> Result<lsp::Uri, ()> {
     if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
-        lsp::Url::from_file_path(file.abs_path(cx))
+        lsp::Uri::from_file_path(file.abs_path(cx))
     } else {
         format!("buffer://{}", buffer.entity_id())
             .parse()
@@ -1201,7 +1201,7 @@ mod tests {
         let (copilot, mut lsp) = Copilot::fake(cx);
 
         let buffer_1 = cx.new(|cx| Buffer::local("Hello", cx));
-        let buffer_1_uri: lsp::Url = format!("buffer://{}", buffer_1.entity_id().as_u64())
+        let buffer_1_uri: lsp::Uri = format!("buffer://{}", buffer_1.entity_id().as_u64())
             .parse()
             .unwrap();
         copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_1, cx));
@@ -1219,7 +1219,7 @@ mod tests {
         );
 
         let buffer_2 = cx.new(|cx| Buffer::local("Goodbye", cx));
-        let buffer_2_uri: lsp::Url = format!("buffer://{}", buffer_2.entity_id().as_u64())
+        let buffer_2_uri: lsp::Uri = format!("buffer://{}", buffer_2.entity_id().as_u64())
             .parse()
             .unwrap();
         copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_2, cx));
@@ -1270,7 +1270,7 @@ mod tests {
                 text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri),
             }
         );
-        let buffer_1_uri = lsp::Url::from_file_path(path!("/root/child/buffer-1")).unwrap();
+        let buffer_1_uri = lsp::Uri::from_file_path(path!("/root/child/buffer-1")).unwrap();
         assert_eq!(
             lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
                 .await,
diff --git a/crates/copilot/src/request.rs b/crates/copilot/src/request.rs
index 0deabe16d1..85d6254dc0 100644
--- a/crates/copilot/src/request.rs
+++ b/crates/copilot/src/request.rs
@@ -102,7 +102,7 @@ pub struct GetCompletionsDocument {
     pub tab_size: u32,
     pub indent_size: u32,
     pub insert_spaces: bool,
-    pub uri: lsp::Url,
+    pub uri: lsp::Uri,
     pub relative_path: String,
     pub position: lsp::Position,
     pub version: usize,
diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index 4a544f9ea7..fdca32520d 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -24,6 +24,7 @@ use settings::SettingsStore;
 use std::{
     env,
     path::{Path, PathBuf},
+    str::FromStr,
 };
 use unindent::Unindent as _;
 use util::{RandomCharIter, path, post_inc};
@@ -70,7 +71,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
     let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
     let cx = &mut VisualTestContext::from_window(*window, cx);
     let workspace = window.root(cx).unwrap();
-    let uri = lsp::Url::from_file_path(path!("/test/main.rs")).unwrap();
+    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
 
     // Create some diagnostics
     lsp_store.update(cx, |lsp_store, cx| {
@@ -167,7 +168,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             .update_diagnostics(
                 language_server_id,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/consts.rs")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/consts.rs")).unwrap(),
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(
                             lsp::Position::new(0, 15),
@@ -243,7 +244,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             .update_diagnostics(
                 language_server_id,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/consts.rs")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/consts.rs")).unwrap(),
                     diagnostics: vec![
                         lsp::Diagnostic {
                             range: lsp::Range::new(
@@ -356,14 +357,14 @@ async fn test_diagnostics_with_folds(cx: &mut TestAppContext) {
             .update_diagnostics(
                 server_id_1,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/main.js")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(4, 0), lsp::Position::new(4, 4)),
                         severity: Some(lsp::DiagnosticSeverity::WARNING),
                         message: "no method `tset`".to_string(),
                         related_information: Some(vec![lsp::DiagnosticRelatedInformation {
                             location: lsp::Location::new(
-                                lsp::Url::from_file_path(path!("/test/main.js")).unwrap(),
+                                lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
                                 lsp::Range::new(
                                     lsp::Position::new(0, 9),
                                     lsp::Position::new(0, 13),
@@ -465,7 +466,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             .update_diagnostics(
                 server_id_1,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/main.js")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 1)),
                         severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -509,7 +510,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             .update_diagnostics(
                 server_id_2,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/main.js")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 1)),
                         severity: Some(lsp::DiagnosticSeverity::ERROR),
@@ -552,7 +553,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             .update_diagnostics(
                 server_id_1,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/main.js")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(2, 0), lsp::Position::new(2, 1)),
                         severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -571,7 +572,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             .update_diagnostics(
                 server_id_2,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/main.rs")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap(),
                     diagnostics: vec![],
                     version: None,
                 },
@@ -608,7 +609,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             .update_diagnostics(
                 server_id_2,
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/test/main.js")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(3, 0), lsp::Position::new(3, 1)),
                         severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -745,8 +746,8 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                         .update_diagnostics(
                             server_id,
                             lsp::PublishDiagnosticsParams {
-                                uri: lsp::Url::from_file_path(&path).unwrap_or_else(|_| {
-                                    lsp::Url::parse("file:///test/fallback.rs").unwrap()
+                                uri: lsp::Uri::from_file_path(&path).unwrap_or_else(|_| {
+                                    lsp::Uri::from_str("file:///test/fallback.rs").unwrap()
                                 }),
                                 diagnostics: diagnostics.clone(),
                                 version: None,
@@ -934,8 +935,8 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                         .update_diagnostics(
                             server_id,
                             lsp::PublishDiagnosticsParams {
-                                uri: lsp::Url::from_file_path(&path).unwrap_or_else(|_| {
-                                    lsp::Url::parse("file:///test/fallback.rs").unwrap()
+                                uri: lsp::Uri::from_file_path(&path).unwrap_or_else(|_| {
+                                    lsp::Uri::from_str("file:///test/fallback.rs").unwrap()
                                 }),
                                 diagnostics: diagnostics.clone(),
                                 version: None,
@@ -985,7 +986,7 @@ async fn active_diagnostics_dismiss_after_invalidation(cx: &mut TestAppContext)
                 .update_diagnostics(
                     LanguageServerId(0),
                     lsp::PublishDiagnosticsParams {
-                        uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
                         version: None,
                         diagnostics: vec![lsp::Diagnostic {
                             range: lsp::Range::new(
@@ -1028,7 +1029,7 @@ async fn active_diagnostics_dismiss_after_invalidation(cx: &mut TestAppContext)
                 .update_diagnostics(
                     LanguageServerId(0),
                     lsp::PublishDiagnosticsParams {
-                        uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
                         version: None,
                         diagnostics: Vec::new(),
                     },
@@ -1078,7 +1079,7 @@ async fn cycle_through_same_place_diagnostics(cx: &mut TestAppContext) {
                 .update_diagnostics(
                     LanguageServerId(0),
                     lsp::PublishDiagnosticsParams {
-                        uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
                         version: None,
                         diagnostics: vec![
                             lsp::Diagnostic {
@@ -1246,7 +1247,7 @@ async fn test_diagnostics_with_links(cx: &mut TestAppContext) {
             lsp_store.update_diagnostics(
                 LanguageServerId(0),
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
                     version: None,
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 12)),
@@ -1299,7 +1300,7 @@ async fn test_hover_diagnostic_and_info_popovers(cx: &mut gpui::TestAppContext)
             lsp_store.update_diagnostics(
                 LanguageServerId(0),
                 lsp::PublishDiagnosticsParams {
-                    uri: lsp::Url::from_file_path(path!("/root/dir/file.rs")).unwrap(),
+                    uri: lsp::Uri::from_file_path(path!("/root/dir/file.rs")).unwrap(),
                     version: None,
                     diagnostics: vec![lsp::Diagnostic {
                         range,
@@ -1376,7 +1377,7 @@ async fn test_diagnostics_with_code(cx: &mut TestAppContext) {
     let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
     let cx = &mut VisualTestContext::from_window(*window, cx);
     let workspace = window.root(cx).unwrap();
-    let uri = lsp::Url::from_file_path(path!("/root/main.js")).unwrap();
+    let uri = lsp::Uri::from_file_path(path!("/root/main.js")).unwrap();
 
     // Create diagnostics with code fields
     lsp_store.update(cx, |lsp_store, cx| {
@@ -1460,7 +1461,7 @@ async fn go_to_diagnostic_with_severity(cx: &mut TestAppContext) {
                 .update_diagnostics(
                     LanguageServerId(0),
                     lsp::PublishDiagnosticsParams {
-                        uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
                         version: None,
                         diagnostics: vec![
                             lsp::Diagnostic {
@@ -1673,7 +1674,7 @@ fn random_lsp_diagnostic(
             );
 
             related_info.push(lsp::DiagnosticRelatedInformation {
-                location: lsp::Location::new(lsp::Url::from_file_path(path).unwrap(), info_range),
+                location: lsp::Location::new(lsp::Uri::from_file_path(path).unwrap(), info_range),
                 message: format!("related info {i} for diagnostic {unique_id}"),
             });
         }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index dfef8a92f0..10ebae8e27 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -9909,7 +9909,7 @@ async fn test_document_format_during_save(cx: &mut TestAppContext) {
             move |params, _| async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
                 );
                 assert_eq!(params.options.tab_size, 4);
                 Ok(Some(vec![lsp::TextEdit::new(
@@ -9952,7 +9952,7 @@ async fn test_document_format_during_save(cx: &mut TestAppContext) {
             move |params, _| async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
                 );
                 futures::future::pending::<()>().await;
                 unreachable!()
@@ -10000,7 +10000,7 @@ async fn test_document_format_during_save(cx: &mut TestAppContext) {
             .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
                 );
                 assert_eq!(params.options.tab_size, 8);
                 Ok(Some(vec![]))
@@ -10548,7 +10548,7 @@ async fn test_range_format_on_save_success(cx: &mut TestAppContext) {
         .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
             );
             assert_eq!(params.options.tab_size, 4);
             Ok(Some(vec![lsp::TextEdit::new(
@@ -10581,7 +10581,7 @@ async fn test_range_format_on_save_timeout(cx: &mut TestAppContext) {
         move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
             );
             futures::future::pending::<()>().await;
             unreachable!()
@@ -10674,7 +10674,7 @@ async fn test_range_format_respects_language_tab_size_override(cx: &mut TestAppC
         .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
             );
             assert_eq!(params.options.tab_size, 8);
             Ok(Some(Vec::new()))
@@ -10761,7 +10761,7 @@ async fn test_document_format_manual_trigger(cx: &mut TestAppContext) {
         .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
             );
             assert_eq!(params.options.tab_size, 4);
             Ok(Some(vec![lsp::TextEdit::new(
@@ -10786,7 +10786,7 @@ async fn test_document_format_manual_trigger(cx: &mut TestAppContext) {
         move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.rs")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
             );
             futures::future::pending::<()>().await;
             unreachable!()
@@ -10882,7 +10882,7 @@ async fn test_multiple_formatters(cx: &mut TestAppContext) {
                 params.context.only,
                 Some(vec!["code-action-1".into(), "code-action-2".into()])
             );
-            let uri = lsp::Url::from_file_path(path!("/file.rs")).unwrap();
+            let uri = lsp::Uri::from_file_path(path!("/file.rs")).unwrap();
             Ok(Some(vec![
                 lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
                     kind: Some("code-action-1".into()),
@@ -10942,7 +10942,7 @@ async fn test_multiple_formatters(cx: &mut TestAppContext) {
                         edit: lsp::WorkspaceEdit {
                             changes: Some(
                                 [(
-                                    lsp::Url::from_file_path(path!("/file.rs")).unwrap(),
+                                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap(),
                                     vec![lsp::TextEdit {
                                         range: lsp::Range::new(
                                             lsp::Position::new(0, 0),
@@ -11153,7 +11153,7 @@ async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) {
         .set_request_handler::<lsp::request::CodeActionRequest, _, _>(move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.ts")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.ts")).unwrap()
             );
             Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
                 lsp::CodeAction {
@@ -11201,7 +11201,7 @@ async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) {
         move |params, _| async move {
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/file.ts")).unwrap()
+                lsp::Uri::from_file_path(path!("/file.ts")).unwrap()
             );
             futures::future::pending::<()>().await;
             unreachable!()
@@ -15478,7 +15478,7 @@ async fn go_to_prev_overlapping_diagnostic(executor: BackgroundExecutor, cx: &mu
                 .update_diagnostics(
                     LanguageServerId(0),
                     lsp::PublishDiagnosticsParams {
-                        uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
                         version: None,
                         diagnostics: vec![
                             lsp::Diagnostic {
@@ -15874,7 +15874,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut TestAppContext) {
         |params, _| async move {
             assert_eq!(
                 params.text_document_position.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
             );
             assert_eq!(
                 params.text_document_position.position,
@@ -16399,7 +16399,7 @@ async fn test_context_menus_hide_hover_popover(cx: &mut gpui::TestAppContext) {
                     edit: Some(lsp::WorkspaceEdit {
                         changes: Some(
                             [(
-                                lsp::Url::from_file_path(path!("/file.rs")).unwrap(),
+                                lsp::Uri::from_file_path(path!("/file.rs")).unwrap(),
                                 vec![lsp::TextEdit {
                                     range: lsp::Range::new(
                                         lsp::Position::new(5, 4),
@@ -22067,7 +22067,7 @@ async fn test_apply_code_lens_actions_with_commands(cx: &mut gpui::TestAppContex
                                 edit: lsp::WorkspaceEdit {
                                     changes: Some(
                                         [(
-                                            lsp::Url::from_file_path(path!("/dir/a.ts")).unwrap(),
+                                            lsp::Uri::from_file_path(path!("/dir/a.ts")).unwrap(),
                                             vec![lsp::TextEdit {
                                                 range: lsp::Range::new(
                                                     lsp::Position::new(0, 0),
@@ -24039,7 +24039,7 @@ async fn test_pulling_diagnostics(cx: &mut TestAppContext) {
             let result_id = Some(new_result_id.to_string());
             assert_eq!(
                 params.text_document.uri,
-                lsp::Url::from_file_path(path!("/a/first.rs")).unwrap()
+                lsp::Uri::from_file_path(path!("/a/first.rs")).unwrap()
             );
             async move {
                 Ok(lsp::DocumentDiagnosticReportResult::Report(
@@ -24254,7 +24254,7 @@ async fn test_document_colors(cx: &mut TestAppContext) {
             async move {
                 assert_eq!(
                     params.text_document.uri,
-                    lsp::Url::from_file_path(path!("/a/first.rs")).unwrap()
+                    lsp::Uri::from_file_path(path!("/a/first.rs")).unwrap()
                 );
                 requests_made.fetch_add(1, atomic::Ordering::Release);
                 Ok(vec![
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index dbf5ac95b7..c1b0a7640c 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -1339,7 +1339,7 @@ pub mod tests {
                         let i = task_lsp_request_count.fetch_add(1, Ordering::Release) + 1;
                         assert_eq!(
                             params.text_document.uri,
-                            lsp::Url::from_file_path(file_with_hints).unwrap(),
+                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
                         );
                         Ok(Some(vec![lsp::InlayHint {
                             position: lsp::Position::new(0, i),
@@ -1449,7 +1449,7 @@ pub mod tests {
                     async move {
                         assert_eq!(
                             params.text_document.uri,
-                            lsp::Url::from_file_path(file_with_hints).unwrap(),
+                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
                         );
                         let current_call_id =
                             Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
@@ -1594,7 +1594,7 @@ pub mod tests {
                                             "Rust" => {
                                                 assert_eq!(
                                                     params.text_document.uri,
-                                                    lsp::Url::from_file_path(path!("/a/main.rs"))
+                                                    lsp::Uri::from_file_path(path!("/a/main.rs"))
                                                         .unwrap(),
                                                 );
                                                 rs_lsp_request_count.fetch_add(1, Ordering::Release)
@@ -1603,7 +1603,7 @@ pub mod tests {
                                             "Markdown" => {
                                                 assert_eq!(
                                                     params.text_document.uri,
-                                                    lsp::Url::from_file_path(path!("/a/other.md"))
+                                                    lsp::Uri::from_file_path(path!("/a/other.md"))
                                                         .unwrap(),
                                                 );
                                                 md_lsp_request_count.fetch_add(1, Ordering::Release)
@@ -1789,7 +1789,7 @@ pub mod tests {
                         async move {
                             assert_eq!(
                                 params.text_document.uri,
-                                lsp::Url::from_file_path(file_with_hints).unwrap(),
+                                lsp::Uri::from_file_path(file_with_hints).unwrap(),
                             );
                             Ok(Some(vec![
                                 lsp::InlayHint {
@@ -2127,7 +2127,7 @@ pub mod tests {
                             let i = lsp_request_count.fetch_add(1, Ordering::SeqCst) + 1;
                             assert_eq!(
                                 params.text_document.uri,
-                                lsp::Url::from_file_path(file_with_hints).unwrap(),
+                                lsp::Uri::from_file_path(file_with_hints).unwrap(),
                             );
                             Ok(Some(vec![lsp::InlayHint {
                                 position: lsp::Position::new(0, i),
@@ -2290,7 +2290,7 @@ pub mod tests {
                                 async move {
                                     assert_eq!(
                                         params.text_document.uri,
-                                        lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                        lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                                     );
 
                                     task_lsp_request_ranges.lock().push(params.range);
@@ -2633,11 +2633,11 @@ pub mod tests {
                 let task_editor_edited = Arc::clone(&closure_editor_edited);
                 async move {
                     let hint_text = if params.text_document.uri
-                        == lsp::Url::from_file_path(path!("/a/main.rs")).unwrap()
+                        == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
                     {
                         "main hint"
                     } else if params.text_document.uri
-                        == lsp::Url::from_file_path(path!("/a/other.rs")).unwrap()
+                        == lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap()
                     {
                         "other hint"
                     } else {
@@ -2944,11 +2944,11 @@ pub mod tests {
                 let task_editor_edited = Arc::clone(&closure_editor_edited);
                 async move {
                     let hint_text = if params.text_document.uri
-                        == lsp::Url::from_file_path(path!("/a/main.rs")).unwrap()
+                        == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
                     {
                         "main hint"
                     } else if params.text_document.uri
-                        == lsp::Url::from_file_path(path!("/a/other.rs")).unwrap()
+                        == lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap()
                     {
                         "other hint"
                     } else {
@@ -3116,7 +3116,7 @@ pub mod tests {
                             async move {
                                 assert_eq!(
                                     params.text_document.uri,
-                                    lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                                 );
                                 let query_start = params.range.start;
                                 Ok(Some(vec![lsp::InlayHint {
@@ -3188,7 +3188,7 @@ pub mod tests {
                     async move {
                         assert_eq!(
                             params.text_document.uri,
-                            lsp::Url::from_file_path(file_with_hints).unwrap(),
+                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
                         );
 
                         let i = lsp_request_count.fetch_add(1, Ordering::SeqCst) + 1;
@@ -3351,7 +3351,7 @@ pub mod tests {
                         move |params, _| async move {
                             assert_eq!(
                                 params.text_document.uri,
-                                lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
+                                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
                             );
                             Ok(Some(
                                 serde_json::from_value(json!([
diff --git a/crates/editor/src/test/editor_lsp_test_context.rs b/crates/editor/src/test/editor_lsp_test_context.rs
index 3f78fa2f3e..7993534035 100644
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -29,7 +29,7 @@ pub struct EditorLspTestContext {
     pub cx: EditorTestContext,
     pub lsp: lsp::FakeLanguageServer,
     pub workspace: Entity<Workspace>,
-    pub buffer_lsp_url: lsp::Url,
+    pub buffer_lsp_url: lsp::Uri,
 }
 
 pub(crate) fn rust_lang() -> Arc<Language> {
@@ -189,7 +189,7 @@ impl EditorLspTestContext {
             },
             lsp,
             workspace,
-            buffer_lsp_url: lsp::Url::from_file_path(root.join("dir").join(file_name)).unwrap(),
+            buffer_lsp_url: lsp::Uri::from_file_path(root.join("dir").join(file_name)).unwrap(),
         }
     }
 
@@ -358,7 +358,7 @@ impl EditorLspTestContext {
     where
         T: 'static + request::Request,
         T::Params: 'static + Send,
-        F: 'static + Send + FnMut(lsp::Url, T::Params, gpui::AsyncApp) -> Fut,
+        F: 'static + Send + FnMut(lsp::Uri, T::Params, gpui::AsyncApp) -> Fut,
         Fut: 'static + Future<Output = Result<T::Result>>,
     {
         let url = self.buffer_lsp_url.clone();
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 4ddc2b3018..1a1d9fb4a7 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -202,7 +202,7 @@ pub struct Diagnostic {
     pub source: Option<String>,
     /// A machine-readable code that identifies this diagnostic.
     pub code: Option<NumberOrString>,
-    pub code_description: Option<lsp::Url>,
+    pub code_description: Option<lsp::Uri>,
     /// Whether this diagnostic is a hint, warning, or error.
     pub severity: DiagnosticSeverity,
     /// The human-readable message associated with this diagnostic.
diff --git a/crates/language/src/proto.rs b/crates/language/src/proto.rs
index 3be189cea0..0d5a8e916c 100644
--- a/crates/language/src/proto.rs
+++ b/crates/language/src/proto.rs
@@ -431,7 +431,7 @@ pub fn deserialize_diagnostics(
                     code: diagnostic.code.map(lsp::NumberOrString::from_string),
                     code_description: diagnostic
                         .code_description
-                        .and_then(|s| lsp::Url::parse(&s).ok()),
+                        .and_then(|s| lsp::Uri::from_str(&s).ok()),
                     is_primary: diagnostic.is_primary,
                     is_disk_based: diagnostic.is_disk_based,
                     is_unnecessary: diagnostic.is_unnecessary,
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 3e8dce756b..a5acc00432 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -1058,7 +1058,7 @@ mod tests {
     #[gpui::test]
     async fn test_process_rust_diagnostics() {
         let mut params = lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path(path!("/a")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/a")).unwrap(),
             version: None,
             diagnostics: vec![
                 // no newlines
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 1ad89db017..943bdab5ff 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -100,8 +100,8 @@ pub struct LanguageServer {
     io_tasks: Mutex<Option<(Task<Option<()>>, Task<Option<()>>)>>,
     output_done_rx: Mutex<Option<barrier::Receiver>>,
     server: Arc<Mutex<Option<Child>>>,
-    workspace_folders: Option<Arc<Mutex<BTreeSet<Url>>>>,
-    root_uri: Url,
+    workspace_folders: Option<Arc<Mutex<BTreeSet<Uri>>>>,
+    root_uri: Uri,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
@@ -310,7 +310,7 @@ impl LanguageServer {
         binary: LanguageServerBinary,
         root_path: &Path,
         code_action_kinds: Option<Vec<CodeActionKind>>,
-        workspace_folders: Option<Arc<Mutex<BTreeSet<Url>>>>,
+        workspace_folders: Option<Arc<Mutex<BTreeSet<Uri>>>>,
         cx: &mut AsyncApp,
     ) -> Result<Self> {
         let working_dir = if root_path.is_dir() {
@@ -318,7 +318,7 @@ impl LanguageServer {
         } else {
             root_path.parent().unwrap_or_else(|| Path::new("/"))
         };
-        let root_uri = Url::from_file_path(&working_dir)
+        let root_uri = Uri::from_file_path(&working_dir)
             .map_err(|()| anyhow!("{working_dir:?} is not a valid URI"))?;
 
         log::info!(
@@ -384,8 +384,8 @@ impl LanguageServer {
         server: Option<Child>,
         code_action_kinds: Option<Vec<CodeActionKind>>,
         binary: LanguageServerBinary,
-        root_uri: Url,
-        workspace_folders: Option<Arc<Mutex<BTreeSet<Url>>>>,
+        root_uri: Uri,
+        workspace_folders: Option<Arc<Mutex<BTreeSet<Uri>>>>,
         cx: &mut AsyncApp,
         on_unhandled_notification: F,
     ) -> Self
@@ -1350,7 +1350,7 @@ impl LanguageServer {
     }
 
     /// Add new workspace folder to the list.
-    pub fn add_workspace_folder(&self, uri: Url) {
+    pub fn add_workspace_folder(&self, uri: Uri) {
         if self
             .capabilities()
             .workspace
@@ -1385,7 +1385,7 @@ impl LanguageServer {
     }
 
     /// Remove existing workspace folder from the list.
-    pub fn remove_workspace_folder(&self, uri: Url) {
+    pub fn remove_workspace_folder(&self, uri: Uri) {
         if self
             .capabilities()
             .workspace
@@ -1417,7 +1417,7 @@ impl LanguageServer {
             self.notify::<DidChangeWorkspaceFolders>(&params).ok();
         }
     }
-    pub fn set_workspace_folders(&self, folders: BTreeSet<Url>) {
+    pub fn set_workspace_folders(&self, folders: BTreeSet<Uri>) {
         let Some(workspace_folders) = self.workspace_folders.as_ref() else {
             return;
         };
@@ -1450,7 +1450,7 @@ impl LanguageServer {
         }
     }
 
-    pub fn workspace_folders(&self) -> BTreeSet<Url> {
+    pub fn workspace_folders(&self) -> BTreeSet<Uri> {
         self.workspace_folders.as_ref().map_or_else(
             || BTreeSet::from_iter([self.root_uri.clone()]),
             |folders| folders.lock().clone(),
@@ -1459,7 +1459,7 @@ impl LanguageServer {
 
     pub fn register_buffer(
         &self,
-        uri: Url,
+        uri: Uri,
         language_id: String,
         version: i32,
         initial_text: String,
@@ -1470,7 +1470,7 @@ impl LanguageServer {
         .ok();
     }
 
-    pub fn unregister_buffer(&self, uri: Url) {
+    pub fn unregister_buffer(&self, uri: Uri) {
         self.notify::<notification::DidCloseTextDocument>(&DidCloseTextDocumentParams {
             text_document: TextDocumentIdentifier::new(uri),
         })
@@ -1587,7 +1587,7 @@ impl FakeLanguageServer {
         let server_name = LanguageServerName(name.clone().into());
         let process_name = Arc::from(name.as_str());
         let root = Self::root_path();
-        let workspace_folders: Arc<Mutex<BTreeSet<Url>>> = Default::default();
+        let workspace_folders: Arc<Mutex<BTreeSet<Uri>>> = Default::default();
         let mut server = LanguageServer::new_internal(
             server_id,
             server_name.clone(),
@@ -1657,13 +1657,13 @@ impl FakeLanguageServer {
         (server, fake)
     }
     #[cfg(target_os = "windows")]
-    fn root_path() -> Url {
-        Url::from_file_path("C:/").unwrap()
+    fn root_path() -> Uri {
+        Uri::from_file_path("C:/").unwrap()
     }
 
     #[cfg(not(target_os = "windows"))]
-    fn root_path() -> Url {
-        Url::from_file_path("/").unwrap()
+    fn root_path() -> Uri {
+        Uri::from_file_path("/").unwrap()
     }
 }
 
@@ -1865,7 +1865,7 @@ mod tests {
         server
             .notify::<notification::DidOpenTextDocument>(&DidOpenTextDocumentParams {
                 text_document: TextDocumentItem::new(
-                    Url::from_str("file://a/b").unwrap(),
+                    Uri::from_str("file://a/b").unwrap(),
                     "rust".to_string(),
                     0,
                     "".to_string(),
@@ -1886,7 +1886,7 @@ mod tests {
             message: "ok".to_string(),
         });
         fake.notify::<notification::PublishDiagnostics>(&PublishDiagnosticsParams {
-            uri: Url::from_str("file://b/c").unwrap(),
+            uri: Uri::from_str("file://b/c").unwrap(),
             version: Some(5),
             diagnostics: vec![],
         });
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index ce7a871d1a..a960e1183d 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -50,8 +50,8 @@ pub fn lsp_formatting_options(settings: &LanguageSettings) -> lsp::FormattingOpt
     }
 }
 
-pub fn file_path_to_lsp_url(path: &Path) -> Result<lsp::Url> {
-    match lsp::Url::from_file_path(path) {
+pub fn file_path_to_lsp_url(path: &Path) -> Result<lsp::Uri> {
+    match lsp::Uri::from_file_path(path) {
         Ok(url) => Ok(url),
         Err(()) => anyhow::bail!("Invalid file path provided to LSP request: {path:?}"),
     }
@@ -3135,7 +3135,7 @@ impl InlayHints {
                                     Some(((uri, range), server_id)) => Some((
                                         LanguageServerId(server_id as usize),
                                         lsp::Location {
-                                            uri: lsp::Url::parse(&uri)
+                                            uri: lsp::Uri::from_str(&uri)
                                                 .context("invalid uri in hint part {part:?}")?,
                                             range: lsp::Range::new(
                                                 point_to_lsp(PointUtf16::new(
@@ -3733,7 +3733,7 @@ impl GetDocumentDiagnostics {
             .filter_map(|diagnostics| {
                 Some(LspPullDiagnostics::Response {
                     server_id: LanguageServerId::from_proto(diagnostics.server_id),
-                    uri: lsp::Url::from_str(diagnostics.uri.as_str()).log_err()?,
+                    uri: lsp::Uri::from_str(diagnostics.uri.as_str()).log_err()?,
                     diagnostics: if diagnostics.changed {
                         PulledDiagnostics::Unchanged {
                             result_id: diagnostics.result_id?,
@@ -3788,7 +3788,7 @@ impl GetDocumentDiagnostics {
                             start: point_to_lsp(PointUtf16::new(start.row, start.column)),
                             end: point_to_lsp(PointUtf16::new(end.row, end.column)),
                         },
-                        uri: lsp::Url::parse(&info.location_url.unwrap()).unwrap(),
+                        uri: lsp::Uri::from_str(&info.location_url.unwrap()).unwrap(),
                     },
                     message: info.message,
                 }
@@ -3821,7 +3821,7 @@ impl GetDocumentDiagnostics {
             code_description: diagnostic
                 .code_description
                 .map(|code_description| CodeDescription {
-                    href: Some(lsp::Url::parse(&code_description).unwrap()),
+                    href: Some(lsp::Uri::from_str(&code_description).unwrap()),
                 }),
             related_information: Some(related_information),
             tags: Some(tags),
@@ -3961,7 +3961,7 @@ pub struct WorkspaceLspPullDiagnostics {
 }
 
 fn process_full_workspace_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Url, WorkspaceLspPullDiagnostics>,
+    diagnostics: &mut HashMap<lsp::Uri, WorkspaceLspPullDiagnostics>,
     server_id: LanguageServerId,
     report: lsp::WorkspaceFullDocumentDiagnosticReport,
 ) {
@@ -3984,7 +3984,7 @@ fn process_full_workspace_diagnostics_report(
 }
 
 fn process_unchanged_workspace_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Url, WorkspaceLspPullDiagnostics>,
+    diagnostics: &mut HashMap<lsp::Uri, WorkspaceLspPullDiagnostics>,
     server_id: LanguageServerId,
     report: lsp::WorkspaceUnchangedDocumentDiagnosticReport,
 ) {
@@ -4343,9 +4343,9 @@ impl LspCommand for GetDocumentColor {
 }
 
 fn process_related_documents(
-    diagnostics: &mut HashMap<lsp::Url, LspPullDiagnostics>,
+    diagnostics: &mut HashMap<lsp::Uri, LspPullDiagnostics>,
     server_id: LanguageServerId,
-    documents: impl IntoIterator<Item = (lsp::Url, lsp::DocumentDiagnosticReportKind)>,
+    documents: impl IntoIterator<Item = (lsp::Uri, lsp::DocumentDiagnosticReportKind)>,
 ) {
     for (url, report_kind) in documents {
         match report_kind {
@@ -4360,9 +4360,9 @@ fn process_related_documents(
 }
 
 fn process_unchanged_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Url, LspPullDiagnostics>,
+    diagnostics: &mut HashMap<lsp::Uri, LspPullDiagnostics>,
     server_id: LanguageServerId,
-    uri: lsp::Url,
+    uri: lsp::Uri,
     report: lsp::UnchangedDocumentDiagnosticReport,
 ) {
     let result_id = report.result_id;
@@ -4404,9 +4404,9 @@ fn process_unchanged_diagnostics_report(
 }
 
 fn process_full_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Url, LspPullDiagnostics>,
+    diagnostics: &mut HashMap<lsp::Uri, LspPullDiagnostics>,
     server_id: LanguageServerId,
-    uri: lsp::Url,
+    uri: lsp::Uri,
     report: lsp::FullDocumentDiagnosticReport,
 ) {
     let result_id = report.result_id;
@@ -4540,7 +4540,7 @@ mod tests {
     fn test_related_information() {
         let related_info = lsp::DiagnosticRelatedInformation {
             location: lsp::Location {
-                uri: lsp::Url::parse("file:///test.rs").unwrap(),
+                uri: lsp::Uri::from_str("file:///test.rs").unwrap(),
                 range: lsp::Range {
                     start: lsp::Position::new(1, 1),
                     end: lsp::Position::new(1, 5),
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index b4c7c0bc37..3f04f38607 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -79,7 +79,7 @@ use lsp::{
     LSP_REQUEST_TIMEOUT, LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions,
     LanguageServerId, LanguageServerName, LanguageServerSelector, LspRequestFuture,
     MessageActionItem, MessageType, OneOf, RenameFilesParams, SymbolKind,
-    TextDocumentSyncSaveOptions, TextEdit, WillRenameFiles, WorkDoneProgressCancelParams,
+    TextDocumentSyncSaveOptions, TextEdit, Uri, WillRenameFiles, WorkDoneProgressCancelParams,
     WorkspaceFolder, notification::DidRenameFiles,
 };
 use node_runtime::read_package_installed_version;
@@ -114,7 +114,7 @@ use std::{
 };
 use sum_tree::Dimensions;
 use text::{Anchor, BufferId, LineEnding, OffsetRangeExt};
-use url::Url;
+
 use util::{
     ConnectionResult, ResultExt as _, debug_panic, defer, maybe, merge_json_value_into,
     paths::{PathExt, SanitizedPath},
@@ -314,7 +314,7 @@ impl LocalLspStore {
             true,
             cx,
         );
-        let pending_workspace_folders: Arc<Mutex<BTreeSet<Url>>> = Default::default();
+        let pending_workspace_folders: Arc<Mutex<BTreeSet<Uri>>> = Default::default();
 
         let pending_server = cx.spawn({
             let adapter = adapter.clone();
@@ -2405,7 +2405,7 @@ impl LocalLspStore {
 
                     {
                         let uri =
-                            Url::from_file_path(worktree.read(cx).abs_path().join(&path.path));
+                            Uri::from_file_path(worktree.read(cx).abs_path().join(&path.path));
 
                         let server_id = self.get_or_insert_language_server(
                             &worktree,
@@ -2565,7 +2565,7 @@ impl LocalLspStore {
             None => return,
         };
 
-        let Ok(file_url) = lsp::Url::from_file_path(old_path.as_path()) else {
+        let Ok(file_url) = lsp::Uri::from_file_path(old_path.as_path()) else {
             debug_panic!(
                 "`{}` is not parseable as an URI",
                 old_path.to_string_lossy()
@@ -2578,7 +2578,7 @@ impl LocalLspStore {
     pub(crate) fn unregister_buffer_from_language_servers(
         &mut self,
         buffer: &Entity<Buffer>,
-        file_url: &lsp::Url,
+        file_url: &lsp::Uri,
         cx: &mut App,
     ) {
         buffer.update(cx, |buffer, cx| {
@@ -4694,7 +4694,7 @@ impl LspStore {
                     for node in nodes {
                         let server_id = node.server_id_or_init(|disposition| {
                             let path = &disposition.path;
-                            let uri = Url::from_file_path(worktree_root.join(&path.path));
+                            let uri = Uri::from_file_path(worktree_root.join(&path.path));
                             let key = LanguageServerSeed {
                                 worktree_id,
                                 name: disposition.server_name.clone(),
@@ -6578,7 +6578,7 @@ impl LspStore {
                                 File::from_dyn(buffer.file())
                                     .and_then(|file| {
                                         let abs_path = file.as_local()?.abs_path(cx);
-                                        lsp::Url::from_file_path(abs_path).ok()
+                                        lsp::Uri::from_file_path(abs_path).ok()
                                     })
                                     .is_none_or(|buffer_uri| {
                                         unchanged_buffers.contains(&buffer_uri)
@@ -7179,7 +7179,7 @@ impl LspStore {
         let buffer = buffer.read(cx);
         let file = File::from_dyn(buffer.file())?;
         let abs_path = file.as_local()?.abs_path(cx);
-        let uri = lsp::Url::from_file_path(abs_path).unwrap();
+        let uri = lsp::Uri::from_file_path(abs_path).unwrap();
         let next_snapshot = buffer.text_snapshot();
         for language_server in language_servers {
             let language_server = language_server.clone();
@@ -7816,7 +7816,7 @@ impl LspStore {
             };
 
             let symbol_abs_path = resolve_path(&worktree_abs_path, &symbol.path.path);
-            let symbol_uri = if let Ok(uri) = lsp::Url::from_file_path(symbol_abs_path) {
+            let symbol_uri = if let Ok(uri) = lsp::Uri::from_file_path(symbol_abs_path) {
                 uri
             } else {
                 return Task::ready(Err(anyhow!("invalid symbol path")));
@@ -7830,14 +7830,14 @@ impl LspStore {
 
     pub(crate) fn open_local_buffer_via_lsp(
         &mut self,
-        mut abs_path: lsp::Url,
+        abs_path: lsp::Uri,
         language_server_id: LanguageServerId,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Buffer>>> {
         cx.spawn(async move |lsp_store, cx| {
             // Escape percent-encoded string.
             let current_scheme = abs_path.scheme().to_owned();
-            let _ = abs_path.set_scheme("file");
+            // Uri is immutable, so we can't modify the scheme
 
             let abs_path = abs_path
                 .to_file_path()
@@ -9230,8 +9230,12 @@ impl LspStore {
         maybe!({
             let local_store = self.as_local()?;
 
-            let old_uri = lsp::Url::from_file_path(old_path).ok().map(String::from)?;
-            let new_uri = lsp::Url::from_file_path(new_path).ok().map(String::from)?;
+            let old_uri = lsp::Uri::from_file_path(old_path)
+                .ok()
+                .map(|uri| uri.to_string())?;
+            let new_uri = lsp::Uri::from_file_path(new_path)
+                .ok()
+                .map(|uri| uri.to_string())?;
 
             for language_server in local_store.language_servers_for_worktree(worktree_id) {
                 let Some(filter) = local_store
@@ -9264,8 +9268,12 @@ impl LspStore {
         is_dir: bool,
         cx: AsyncApp,
     ) -> Task<ProjectTransaction> {
-        let old_uri = lsp::Url::from_file_path(old_path).ok().map(String::from);
-        let new_uri = lsp::Url::from_file_path(new_path).ok().map(String::from);
+        let old_uri = lsp::Uri::from_file_path(old_path)
+            .ok()
+            .map(|uri| uri.to_string());
+        let new_uri = lsp::Uri::from_file_path(new_path)
+            .ok()
+            .map(|uri| uri.to_string());
         cx.spawn(async move |cx| {
             let mut tasks = vec![];
             this.update(cx, |this, cx| {
@@ -10878,7 +10886,7 @@ impl LspStore {
         language_server: Arc<LanguageServer>,
         server_id: LanguageServerId,
         key: LanguageServerSeed,
-        workspace_folders: Arc<Mutex<BTreeSet<Url>>>,
+        workspace_folders: Arc<Mutex<BTreeSet<Uri>>>,
         cx: &mut Context<Self>,
     ) {
         let Some(local) = self.as_local_mut() else {
@@ -11038,7 +11046,7 @@ impl LspStore {
                     let snapshot = versions.last().unwrap();
                     let version = snapshot.version;
                     let initial_snapshot = &snapshot.snapshot;
-                    let uri = lsp::Url::from_file_path(file.abs_path(cx)).unwrap();
+                    let uri = lsp::Uri::from_file_path(file.abs_path(cx)).unwrap();
                     language_server.register_buffer(
                         uri,
                         adapter.language_id(&language.name()),
@@ -11277,7 +11285,7 @@ impl LspStore {
                                 PathChange::AddedOrUpdated => lsp::FileChangeType::CHANGED,
                             };
                             Some(lsp::FileEvent {
-                                uri: lsp::Url::from_file_path(abs_path.join(path)).unwrap(),
+                                uri: lsp::Uri::from_file_path(abs_path.join(path)).unwrap(),
                                 typ,
                             })
                         })
@@ -11689,7 +11697,7 @@ impl LspStore {
                     File::from_dyn(buffer.file())
                         .and_then(|file| {
                             let abs_path = file.as_local()?.abs_path(cx);
-                            lsp::Url::from_file_path(abs_path).ok()
+                            lsp::Uri::from_file_path(abs_path).ok()
                         })
                         .is_none_or(|buffer_uri| {
                             unchanged_buffers.contains(&buffer_uri)
@@ -12821,7 +12829,7 @@ pub enum LanguageServerState {
     Starting {
         startup: Task<Option<Arc<LanguageServer>>>,
         /// List of language servers that will be added to the workspace once it's initialization completes.
-        pending_workspace_folders: Arc<Mutex<BTreeSet<Url>>>,
+        pending_workspace_folders: Arc<Mutex<BTreeSet<Uri>>>,
     },
 
     Running {
@@ -12833,7 +12841,7 @@ pub enum LanguageServerState {
 }
 
 impl LanguageServerState {
-    fn add_workspace_folder(&self, uri: Url) {
+    fn add_workspace_folder(&self, uri: Uri) {
         match self {
             LanguageServerState::Starting {
                 pending_workspace_folders,
@@ -12846,7 +12854,7 @@ impl LanguageServerState {
             }
         }
     }
-    fn _remove_workspace_folder(&self, uri: Url) {
+    fn _remove_workspace_folder(&self, uri: Uri) {
         match self {
             LanguageServerState::Starting {
                 pending_workspace_folders,
diff --git a/crates/project/src/lsp_store/lsp_ext_command.rs b/crates/project/src/lsp_store/lsp_ext_command.rs
index 1c969f8114..0263946b25 100644
--- a/crates/project/src/lsp_store/lsp_ext_command.rs
+++ b/crates/project/src/lsp_store/lsp_ext_command.rs
@@ -213,7 +213,7 @@ impl LspCommand for OpenDocs {
     ) -> Result<OpenDocsParams> {
         Ok(OpenDocsParams {
             text_document: lsp::TextDocumentIdentifier {
-                uri: lsp::Url::from_file_path(path).unwrap(),
+                uri: lsp::Uri::from_file_path(path).unwrap(),
             },
             position: point_to_lsp(self.position),
         })
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 8c289c935c..74ad08570a 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -930,7 +930,7 @@ pub enum LspPullDiagnostics {
         /// The id of the language server that produced diagnostics.
         server_id: LanguageServerId,
         /// URI of the resource,
-        uri: lsp::Url,
+        uri: lsp::Uri,
         /// The diagnostics produced by this language server.
         diagnostics: PulledDiagnostics,
     },
@@ -3599,7 +3599,7 @@ impl Project {
 
     pub fn open_local_buffer_via_lsp(
         &mut self,
-        abs_path: lsp::Url,
+        abs_path: lsp::Uri,
         language_server_id: LanguageServerId,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Buffer>>> {
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 96f891d9c3..a07f94fb73 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -18,7 +18,6 @@ use git::{
 };
 use git2::RepositoryInitOptions;
 use gpui::{App, BackgroundExecutor, SemanticVersion, UpdateGlobal};
-use http_client::Url;
 use itertools::Itertools;
 use language::{
     Diagnostic, DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, DiskState, FakeLspAdapter,
@@ -29,7 +28,7 @@ use language::{
 };
 use lsp::{
     DiagnosticSeverity, DocumentChanges, FileOperationFilter, NumberOrString, TextDocumentEdit,
-    WillRenameFiles, notification::DidRenameFiles,
+    Uri, WillRenameFiles, notification::DidRenameFiles,
 };
 use parking_lot::Mutex;
 use paths::{config_dir, tasks_file};
@@ -701,7 +700,7 @@ async fn test_running_multiple_instances_of_a_single_server_in_one_worktree(
     assert_eq!(
         server.workspace_folders(),
         BTreeSet::from_iter(
-            [Url::from_file_path(path!("/the-root/project-a")).unwrap()].into_iter()
+            [Uri::from_file_path(path!("/the-root/project-a")).unwrap()].into_iter()
         )
     );
 
@@ -891,7 +890,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentItem {
-            uri: lsp::Url::from_file_path(path!("/dir/test.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/dir/test.rs")).unwrap(),
             version: 0,
             text: "const A: i32 = 1;".to_string(),
             language_id: "rust".to_string(),
@@ -921,7 +920,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::VersionedTextDocumentIdentifier::new(
-            lsp::Url::from_file_path(path!("/dir/test.rs")).unwrap(),
+            lsp::Uri::from_file_path(path!("/dir/test.rs")).unwrap(),
             1
         )
     );
@@ -942,7 +941,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentItem {
-            uri: lsp::Url::from_file_path(path!("/dir/package.json")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/dir/package.json")).unwrap(),
             version: 0,
             text: "{\"a\": 1}".to_string(),
             language_id: "json".to_string(),
@@ -992,7 +991,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::VersionedTextDocumentIdentifier::new(
-            lsp::Url::from_file_path(path!("/dir/test2.rs")).unwrap(),
+            lsp::Uri::from_file_path(path!("/dir/test2.rs")).unwrap(),
             1
         )
     );
@@ -1008,7 +1007,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentIdentifier::new(
-            lsp::Url::from_file_path(path!("/dir/Cargo.toml")).unwrap()
+            lsp::Uri::from_file_path(path!("/dir/Cargo.toml")).unwrap()
         )
     );
     assert_eq!(
@@ -1017,7 +1016,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentIdentifier::new(
-            lsp::Url::from_file_path(path!("/dir/Cargo.toml")).unwrap()
+            lsp::Uri::from_file_path(path!("/dir/Cargo.toml")).unwrap()
         )
     );
 
@@ -1034,7 +1033,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .receive_notification::<lsp::notification::DidCloseTextDocument>()
             .await
             .text_document,
-        lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path(path!("/dir/test2.rs")).unwrap()),
+        lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path!("/dir/test2.rs")).unwrap()),
     );
     assert_eq!(
         fake_rust_server
@@ -1042,7 +1041,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentItem {
-            uri: lsp::Url::from_file_path(path!("/dir/test3.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/dir/test3.rs")).unwrap(),
             version: 0,
             text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
             language_id: "rust".to_string(),
@@ -1084,7 +1083,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .receive_notification::<lsp::notification::DidCloseTextDocument>()
             .await
             .text_document,
-        lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path(path!("/dir/test3.rs")).unwrap()),
+        lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path!("/dir/test3.rs")).unwrap()),
     );
     assert_eq!(
         fake_json_server
@@ -1092,7 +1091,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentItem {
-            uri: lsp::Url::from_file_path(path!("/dir/test3.json")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/dir/test3.json")).unwrap(),
             version: 0,
             text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
             language_id: "json".to_string(),
@@ -1118,7 +1117,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::VersionedTextDocumentIdentifier::new(
-            lsp::Url::from_file_path(path!("/dir/test3.json")).unwrap(),
+            lsp::Uri::from_file_path(path!("/dir/test3.json")).unwrap(),
             1
         )
     );
@@ -1148,7 +1147,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentItem {
-            uri: lsp::Url::from_file_path(path!("/dir/test.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/dir/test.rs")).unwrap(),
             version: 0,
             text: rust_buffer.update(cx, |buffer, _| buffer.text()),
             language_id: "rust".to_string(),
@@ -1169,13 +1168,13 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
         ],
         [
             lsp::TextDocumentItem {
-                uri: lsp::Url::from_file_path(path!("/dir/package.json")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/dir/package.json")).unwrap(),
                 version: 0,
                 text: json_buffer.update(cx, |buffer, _| buffer.text()),
                 language_id: "json".to_string(),
             },
             lsp::TextDocumentItem {
-                uri: lsp::Url::from_file_path(path!("/dir/test3.json")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/dir/test3.json")).unwrap(),
                 version: 0,
                 text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
                 language_id: "json".to_string(),
@@ -1187,7 +1186,7 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
     cx.update(|_| drop(_json_handle));
     let close_message = lsp::DidCloseTextDocumentParams {
         text_document: lsp::TextDocumentIdentifier::new(
-            lsp::Url::from_file_path(path!("/dir/package.json")).unwrap(),
+            lsp::Uri::from_file_path(path!("/dir/package.json")).unwrap(),
         ),
     };
     assert_eq!(
@@ -1316,7 +1315,7 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
     let _out_of_worktree_buffer = project
         .update(cx, |project, cx| {
             project.open_local_buffer_via_lsp(
-                lsp::Url::from_file_path(path!("/the-registry/dep1/src/dep1.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/the-registry/dep1/src/dep1.rs")).unwrap(),
                 server_id,
                 cx,
             )
@@ -1476,23 +1475,23 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
         &*file_changes.lock(),
         &[
             lsp::FileEvent {
-                uri: lsp::Url::from_file_path(path!("/the-root/Cargo.lock")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/the-root/Cargo.lock")).unwrap(),
                 typ: lsp::FileChangeType::CHANGED,
             },
             lsp::FileEvent {
-                uri: lsp::Url::from_file_path(path!("/the-root/src/b.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/the-root/src/b.rs")).unwrap(),
                 typ: lsp::FileChangeType::DELETED,
             },
             lsp::FileEvent {
-                uri: lsp::Url::from_file_path(path!("/the-root/src/c.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/the-root/src/c.rs")).unwrap(),
                 typ: lsp::FileChangeType::CREATED,
             },
             lsp::FileEvent {
-                uri: lsp::Url::from_file_path(path!("/the-root/target/y/out/y2.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/the-root/target/y/out/y2.rs")).unwrap(),
                 typ: lsp::FileChangeType::CREATED,
             },
             lsp::FileEvent {
-                uri: lsp::Url::from_file_path(path!("/the/stdlib/src/string.rs")).unwrap(),
+                uri: lsp::Uri::from_file_path(path!("/the/stdlib/src/string.rs")).unwrap(),
                 typ: lsp::FileChangeType::CHANGED,
             },
         ]
@@ -1539,7 +1538,7 @@ async fn test_single_file_worktrees_diagnostics(cx: &mut gpui::TestAppContext) {
             .update_diagnostics(
                 LanguageServerId(0),
                 lsp::PublishDiagnosticsParams {
-                    uri: Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+                    uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
                     version: None,
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
@@ -1558,7 +1557,7 @@ async fn test_single_file_worktrees_diagnostics(cx: &mut gpui::TestAppContext) {
             .update_diagnostics(
                 LanguageServerId(0),
                 lsp::PublishDiagnosticsParams {
-                    uri: Url::from_file_path(path!("/dir/b.rs")).unwrap(),
+                    uri: Uri::from_file_path(path!("/dir/b.rs")).unwrap(),
                     version: None,
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
@@ -1650,7 +1649,7 @@ async fn test_omitted_diagnostics(cx: &mut gpui::TestAppContext) {
             .update_diagnostics(
                 server_id,
                 lsp::PublishDiagnosticsParams {
-                    uri: Url::from_file_path(path!("/root/dir/b.rs")).unwrap(),
+                    uri: Uri::from_file_path(path!("/root/dir/b.rs")).unwrap(),
                     version: None,
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
@@ -1669,7 +1668,7 @@ async fn test_omitted_diagnostics(cx: &mut gpui::TestAppContext) {
             .update_diagnostics(
                 server_id,
                 lsp::PublishDiagnosticsParams {
-                    uri: Url::from_file_path(path!("/root/other.rs")).unwrap(),
+                    uri: Uri::from_file_path(path!("/root/other.rs")).unwrap(),
                     version: None,
                     diagnostics: vec![lsp::Diagnostic {
                         range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 9)),
@@ -1813,7 +1812,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
     );
 
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: None,
         diagnostics: vec![lsp::Diagnostic {
             range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
@@ -1866,7 +1865,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
 
     // Ensure publishing empty diagnostics twice only results in one update event.
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: None,
         diagnostics: Default::default(),
     });
@@ -1879,7 +1878,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
     );
 
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: None,
         diagnostics: Default::default(),
     });
@@ -2011,7 +2010,7 @@ async fn test_restarting_server_with_diagnostics_published(cx: &mut gpui::TestAp
     // Publish diagnostics
     let fake_server = fake_servers.next().await.unwrap();
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: None,
         diagnostics: vec![lsp::Diagnostic {
             range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
@@ -2092,7 +2091,7 @@ async fn test_restarted_server_reporting_invalid_buffer_version(cx: &mut gpui::T
     // Before restarting the server, report diagnostics with an unknown buffer version.
     let fake_server = fake_servers.next().await.unwrap();
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: lsp::Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: Some(10000),
         diagnostics: Vec::new(),
     });
@@ -2343,7 +2342,7 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
 
     // Report some diagnostics for the initial version of the buffer
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: lsp::Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: Some(open_notification.text_document.version),
         diagnostics: vec![
             lsp::Diagnostic {
@@ -2431,7 +2430,7 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
 
     // Ensure overlapping diagnostics are highlighted correctly.
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: lsp::Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: Some(open_notification.text_document.version),
         diagnostics: vec![
             lsp::Diagnostic {
@@ -2525,7 +2524,7 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
 
     // Handle out-of-order diagnostics
     fake_server.notify::<lsp::notification::PublishDiagnostics>(&lsp::PublishDiagnosticsParams {
-        uri: lsp::Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
         version: Some(change_notification_2.text_document.version),
         diagnostics: vec![
             lsp::Diagnostic {
@@ -3206,7 +3205,7 @@ async fn test_definition(cx: &mut gpui::TestAppContext) {
 
         Ok(Some(lsp::GotoDefinitionResponse::Scalar(
             lsp::Location::new(
-                lsp::Url::from_file_path(path!("/dir/a.rs")).unwrap(),
+                lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
                 lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
             ),
         )))
@@ -3765,7 +3764,7 @@ async fn test_apply_code_actions_with_commands(cx: &mut gpui::TestAppContext) {
                                 edit: lsp::WorkspaceEdit {
                                     changes: Some(
                                         [(
-                                            lsp::Url::from_file_path(path!("/dir/a.ts")).unwrap(),
+                                            lsp::Uri::from_file_path(path!("/dir/a.ts")).unwrap(),
                                             vec![lsp::TextEdit {
                                                 range: lsp::Range::new(
                                                     lsp::Position::new(0, 0),
@@ -3904,7 +3903,7 @@ async fn test_save_file_spawns_language_server(cx: &mut gpui::TestAppContext) {
             .await
             .text_document,
         lsp::TextDocumentItem {
-            uri: lsp::Url::from_file_path(path!("/dir/file.rs")).unwrap(),
+            uri: lsp::Uri::from_file_path(path!("/dir/file.rs")).unwrap(),
             version: 0,
             text: "".to_string(),
             language_id: "rust".to_string(),
@@ -4742,7 +4741,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
         .await
         .unwrap();
 
-    let buffer_uri = Url::from_file_path(path!("/dir/a.rs")).unwrap();
+    let buffer_uri = Uri::from_file_path(path!("/dir/a.rs")).unwrap();
     let message = lsp::PublishDiagnosticsParams {
         uri: buffer_uri.clone(),
         diagnostics: vec![
@@ -5064,7 +5063,7 @@ async fn test_lsp_rename_notifications(cx: &mut gpui::TestAppContext) {
                     new_text: "This is not a drill".to_owned(),
                 })],
                 text_document: lsp::OptionalVersionedTextDocumentIdentifier {
-                    uri: Url::from_str(uri!("file:///dir/two/two.rs")).unwrap(),
+                    uri: Uri::from_str(uri!("file:///dir/two/two.rs")).unwrap(),
                     version: Some(1337),
                 },
             }]
@@ -5189,14 +5188,14 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
                 changes: Some(
                     [
                         (
-                            lsp::Url::from_file_path(path!("/dir/one.rs")).unwrap(),
+                            lsp::Uri::from_file_path(path!("/dir/one.rs")).unwrap(),
                             vec![lsp::TextEdit::new(
                                 lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                                 "THREE".to_string(),
                             )],
                         ),
                         (
-                            lsp::Url::from_file_path(path!("/dir/two.rs")).unwrap(),
+                            lsp::Uri::from_file_path(path!("/dir/two.rs")).unwrap(),
                             vec![
                                 lsp::TextEdit::new(
                                     lsp::Range::new(
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 72029e55a0..7f42f9e8ef 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -437,7 +437,7 @@ mod tests {
             deprecated: None,
             container_name: None,
             location: lsp::Location::new(
-                lsp::Url::from_file_path(path.as_ref()).unwrap(),
+                lsp::Uri::from_file_path(path.as_ref()).unwrap(),
                 lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
             ),
         }
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index e106a5ef18..353857f587 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -533,7 +533,7 @@ async fn test_remote_lsp(cx: &mut TestAppContext, server_cx: &mut TestAppContext
         Ok(Some(lsp::WorkspaceEdit {
             changes: Some(
                 [(
-                    lsp::Url::from_file_path(path!("/code/project1/src/lib.rs")).unwrap(),
+                    lsp::Uri::from_file_path(path!("/code/project1/src/lib.rs")).unwrap(),
                     vec![lsp::TextEdit::new(
                         lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(0, 6)),
                         "two".to_string(),

From 5001c037116386cb3f3316d5e4459fe78a4bd3fc Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 29 Aug 2025 17:14:27 +0300
Subject: [PATCH 462/823] Properly process files that cannot be open for a
 reason (#37170)

Follow-up of https://github.com/zed-industries/zed/pull/36764

* Fix `anyhow!({e})` conversion lossing Collab error codes context when
opening a buffer remotely

* Use this context to only allow opening files that had not specific
Collab error code

Release Notes:

- N/A
---
 crates/client/src/client.rs        | 15 ++----------
 crates/project/src/buffer_store.rs | 22 ++++++++++++++---
 crates/remote/src/remote_client.rs |  2 +-
 crates/workspace/src/workspace.rs  | 39 ++++++++++++++++++------------
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index bdbf049b75..1e735b0025 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1696,21 +1696,10 @@ impl Client {
             );
             cx.spawn(async move |_| match future.await {
                 Ok(()) => {
-                    log::debug!(
-                        "rpc message handled. client_id:{}, sender_id:{:?}, type:{}",
-                        client_id,
-                        original_sender_id,
-                        type_name
-                    );
+                    log::debug!("rpc message handled. client_id:{client_id}, sender_id:{original_sender_id:?}, type:{type_name}");
                 }
                 Err(error) => {
-                    log::error!(
-                        "error handling message. client_id:{}, sender_id:{:?}, type:{}, error:{:?}",
-                        client_id,
-                        original_sender_id,
-                        type_name,
-                        error
-                    );
+                    log::error!("error handling message. client_id:{client_id}, sender_id:{original_sender_id:?}, type:{type_name}, error:{error:#}");
                 }
             })
             .detach();
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index 295bad6e59..89bd4b27c9 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -20,7 +20,7 @@ use language::{
     },
 };
 use rpc::{
-    AnyProtoClient, ErrorExt as _, TypedEnvelope,
+    AnyProtoClient, ErrorCode, ErrorExt as _, TypedEnvelope,
     proto::{self, ToProto},
 };
 use smol::channel::Receiver;
@@ -837,7 +837,15 @@ impl BufferStore {
             }
         };
 
-        cx.background_spawn(async move { task.await.map_err(|e| anyhow!("{e}")) })
+        cx.background_spawn(async move {
+            task.await.map_err(|e| {
+                if e.error_code() != ErrorCode::Internal {
+                    anyhow!(e.error_code())
+                } else {
+                    anyhow!("{e}")
+                }
+            })
+        })
     }
 
     pub fn create_buffer(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<Buffer>>> {
@@ -944,7 +952,15 @@ impl BufferStore {
     ) -> impl Iterator<Item = (&ProjectPath, impl Future<Output = Result<Entity<Buffer>>>)> {
         self.loading_buffers.iter().map(|(path, task)| {
             let task = task.clone();
-            (path, async move { task.await.map_err(|e| anyhow!("{e}")) })
+            (path, async move {
+                task.await.map_err(|e| {
+                    if e.error_code() != ErrorCode::Internal {
+                        anyhow!(e.error_code())
+                    } else {
+                        anyhow!("{e}")
+                    }
+                })
+            })
         })
     }
 
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
index dd529ca874..7e231e622c 100644
--- a/crates/remote/src/remote_client.rs
+++ b/crates/remote/src/remote_client.rs
@@ -1117,7 +1117,7 @@ impl ChannelClient {
                                     }
                                     Err(error) => {
                                         log::error!(
-                                            "{}:error handling message. type:{}, error:{}",
+                                            "{}:error handling message. type:{}, error:{:#}",
                                             this.name,
                                             type_name,
                                             format!("{error:#}").lines().fold(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 0f119c1400..61442eb634 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -648,23 +648,30 @@ impl ProjectItemRegistry {
                             ) as Box<_>;
                             Ok((project_entry_id, build_workspace_item))
                         }
-                        Err(e) => match entry_abs_path.as_deref().filter(|_| is_file) {
-                            Some(abs_path) => match cx.update(|window, cx| {
-                                T::for_broken_project_item(abs_path, is_local, &e, window, cx)
-                            })? {
-                                Some(broken_project_item_view) => {
-                                    let build_workspace_item = Box::new(
-                                    move |_: &mut Pane, _: &mut Window, cx: &mut Context<Pane>| {
-                                        cx.new(|_| broken_project_item_view).boxed_clone()
-                                    },
-                                )
-                                    as Box<_>;
-                                    Ok((None, build_workspace_item))
+                        Err(e) => {
+                            if e.error_code() == ErrorCode::Internal {
+                                if let Some(abs_path) =
+                                    entry_abs_path.as_deref().filter(|_| is_file)
+                                {
+                                    if let Some(broken_project_item_view) =
+                                        cx.update(|window, cx| {
+                                            T::for_broken_project_item(
+                                                abs_path, is_local, &e, window, cx,
+                                            )
+                                        })?
+                                    {
+                                        let build_workspace_item = Box::new(
+                                            move |_: &mut Pane, _: &mut Window, cx: &mut Context<Pane>| {
+                                                cx.new(|_| broken_project_item_view).boxed_clone()
+                                            },
+                                        )
+                                        as Box<_>;
+                                        return Ok((None, build_workspace_item));
+                                    }
                                 }
-                                None => Err(e)?,
-                            },
-                            None => Err(e)?,
-                        },
+                            }
+                            Err(e)
+                        }
                     }
                 }))
             });

From 11fb57a6d96f2133c492c6da18b6a976cb2429b2 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 29 Aug 2025 16:16:02 +0200
Subject: [PATCH 463/823] acp: Use the custom claude installation to perform
 login (#37169)

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Agus Zubiaga <agus@zed.dev>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: morgankrey <morgan@zed.dev>
---
 Cargo.lock                                |  1 +
 crates/agent_servers/src/agent_servers.rs | 10 ++--
 crates/agent_servers/src/claude.rs        | 40 ++++++++++++-
 crates/agent_servers/src/e2e_tests.rs     |  2 +-
 crates/agent_ui/Cargo.toml                |  1 +
 crates/agent_ui/src/acp/message_editor.rs |  2 +-
 crates/agent_ui/src/acp/thread_view.rs    | 69 +++++++++++++++--------
 7 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e493c99a2f..aa1bcab9a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -414,6 +414,7 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "settings",
+ "shlex",
  "smol",
  "streaming_diff",
  "task",
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 83b3be76ce..c1fc7b91ae 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -44,11 +44,11 @@ pub fn init(cx: &mut App) {
 
 pub struct AgentServerDelegate {
     project: Entity<Project>,
-    status_tx: watch::Sender<SharedString>,
+    status_tx: Option<watch::Sender<SharedString>>,
 }
 
 impl AgentServerDelegate {
-    pub fn new(project: Entity<Project>, status_tx: watch::Sender<SharedString>) -> Self {
+    pub fn new(project: Entity<Project>, status_tx: Option<watch::Sender<SharedString>>) -> Self {
         Self { project, status_tx }
     }
 
@@ -72,7 +72,7 @@ impl AgentServerDelegate {
                 "External agents are not yet available in remote projects."
             )));
         };
-        let mut status_tx = self.status_tx;
+        let status_tx = self.status_tx;
 
         cx.spawn(async move |cx| {
             if !ignore_system_version {
@@ -165,7 +165,9 @@ impl AgentServerDelegate {
                     .detach();
                     file_name
                 } else {
-                    status_tx.send("Installing…".into()).ok();
+                    if let Some(mut status_tx) = status_tx {
+                        status_tx.send("Installing…".into()).ok();
+                    }
                     let dir = dir.clone();
                     cx.background_spawn(Self::download_latest_version(
                         fs,
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index db8853695e..0a4f152e8a 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,8 +1,8 @@
 use language_models::provider::anthropic::AnthropicLanguageModelProvider;
 use settings::SettingsStore;
-use std::any::Any;
 use std::path::Path;
 use std::rc::Rc;
+use std::{any::Any, path::PathBuf};
 
 use anyhow::Result;
 use gpui::{App, AppContext as _, SharedString, Task};
@@ -13,9 +13,47 @@ use acp_thread::AgentConnection;
 #[derive(Clone)]
 pub struct ClaudeCode;
 
+pub struct ClaudeCodeLoginCommand {
+    pub path: PathBuf,
+    pub arguments: Vec<String>,
+}
+
 impl ClaudeCode {
     const BINARY_NAME: &'static str = "claude-code-acp";
     const PACKAGE_NAME: &'static str = "@zed-industries/claude-code-acp";
+
+    pub fn login_command(
+        delegate: AgentServerDelegate,
+        cx: &mut App,
+    ) -> Task<Result<ClaudeCodeLoginCommand>> {
+        let settings = cx.read_global(|settings: &SettingsStore, _| {
+            settings.get::<AllAgentServersSettings>(None).claude.clone()
+        });
+
+        cx.spawn(async move |cx| {
+            let mut command = if let Some(settings) = settings {
+                settings.command
+            } else {
+                cx.update(|cx| {
+                    delegate.get_or_npm_install_builtin_agent(
+                        Self::BINARY_NAME.into(),
+                        Self::PACKAGE_NAME.into(),
+                        "node_modules/@anthropic-ai/claude-code/cli.js".into(),
+                        true,
+                        None,
+                        cx,
+                    )
+                })?
+                .await?
+            };
+            command.args.push("/login".into());
+
+            Ok(ClaudeCodeLoginCommand {
+                path: command.path,
+                arguments: command.args,
+            })
+        })
+    }
 }
 
 impl AgentServer for ClaudeCode {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 5d2becf0cc..7988b86081 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -498,7 +498,7 @@ pub async fn new_test_thread(
     current_dir: impl AsRef<Path>,
     cx: &mut TestAppContext,
 ) -> Entity<AcpThread> {
-    let delegate = AgentServerDelegate::new(project.clone(), watch::channel("".into()).0);
+    let delegate = AgentServerDelegate::new(project.clone(), None);
 
     let connection = cx
         .update(|cx| server.connect(current_dir.as_ref(), delegate, cx))
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 6b0979ee69..6c8b952880 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -80,6 +80,7 @@ serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
+shlex.workspace = true
 smol.workspace = true
 streaming_diff.workspace = true
 task.workspace = true
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index bd5e4faf7a..b9e85e0ee3 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -645,7 +645,7 @@ impl MessageEditor {
             self.project.read(cx).fs().clone(),
             self.history_store.clone(),
         ));
-        let delegate = AgentServerDelegate::new(self.project.clone(), watch::channel("".into()).0);
+        let delegate = AgentServerDelegate::new(self.project.clone(), None);
         let connection = server.connect(Path::new(""), delegate, cx);
         cx.spawn(async move |_, cx| {
             let agent = connection.await?;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c718540c21..eff9ceedd4 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -9,7 +9,7 @@ use agent_client_protocol::{self as acp, PromptCapabilities};
 use agent_servers::{AgentServer, AgentServerDelegate, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore};
-use anyhow::{Result, anyhow, bail};
+use anyhow::{Context as _, Result, anyhow, bail};
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use client::zed_urls;
@@ -423,7 +423,7 @@ impl AcpThreadView {
             .map(|worktree| worktree.read(cx).abs_path())
             .unwrap_or_else(|| paths::home_dir().as_path().into());
         let (tx, mut rx) = watch::channel("Loading…".into());
-        let delegate = AgentServerDelegate::new(project.clone(), tx);
+        let delegate = AgentServerDelegate::new(project.clone(), Some(tx));
 
         let connect_task = agent.connect(&root_dir, delegate, cx);
         let load_task = cx.spawn_in(window, async move |this, cx| {
@@ -1386,31 +1386,52 @@ impl AcpThreadView {
         let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
             return Task::ready(Ok(()));
         };
-        let project = workspace.read(cx).project().read(cx);
+        let project_entity = workspace.read(cx).project();
+        let project = project_entity.read(cx);
         let cwd = project.first_project_directory(cx);
         let shell = project.terminal_settings(&cwd, cx).shell.clone();
 
-        let terminal = terminal_panel.update(cx, |terminal_panel, cx| {
-            terminal_panel.spawn_task(
-                &SpawnInTerminal {
-                    id: task::TaskId("claude-login".into()),
-                    full_label: "claude /login".to_owned(),
-                    label: "claude /login".to_owned(),
-                    command: Some("claude".to_owned()),
-                    args: vec!["/login".to_owned()],
-                    command_label: "claude /login".to_owned(),
-                    cwd,
-                    use_new_terminal: true,
-                    allow_concurrent_runs: true,
-                    hide: task::HideStrategy::Always,
-                    shell,
-                    ..Default::default()
-                },
-                window,
-                cx,
-            )
-        });
-        cx.spawn(async move |cx| {
+        let delegate = AgentServerDelegate::new(project_entity.clone(), None);
+        let command = ClaudeCode::login_command(delegate, cx);
+
+        window.spawn(cx, async move |cx| {
+            let login_command = command.await?;
+            let command = login_command
+                .path
+                .to_str()
+                .with_context(|| format!("invalid login command: {:?}", login_command.path))?;
+            let command = shlex::try_quote(command)?;
+            let args = login_command
+                .arguments
+                .iter()
+                .map(|arg| {
+                    Ok(shlex::try_quote(arg)
+                        .context("Failed to quote argument")?
+                        .to_string())
+                })
+                .collect::<Result<Vec<_>>>()?;
+
+            let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
+                terminal_panel.spawn_task(
+                    &SpawnInTerminal {
+                        id: task::TaskId("claude-login".into()),
+                        full_label: "claude /login".to_owned(),
+                        label: "claude /login".to_owned(),
+                        command: Some(command.into()),
+                        args,
+                        command_label: "claude /login".to_owned(),
+                        cwd,
+                        use_new_terminal: true,
+                        allow_concurrent_runs: true,
+                        hide: task::HideStrategy::Always,
+                        shell,
+                        ..Default::default()
+                    },
+                    window,
+                    cx,
+                )
+            })?;
+
             let terminal = terminal.await?;
             let mut exit_status = terminal
                 .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?

From a13881746a5ac5f5693f867016f2908b081090c3 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 29 Aug 2025 22:22:43 +0530
Subject: [PATCH 464/823] editor: APCA contrast (#37165)

Closes #35787
Closes #17890
Closes #28789
Closes #36495

How it works:

For highlights (and selections) within the visible rows of the editor,
we split them row by row. This is efficient since the number of visible
rows is constant. For each row, all highlights and selections, which may
overlap, are flattened using a line sweep. This produces non-overlapping
consecutive segments for each row, each with a blended background color.

Next, for each row, we split text runs into smaller runs to adjust its
color using APCA contrast. Since both text runs and segment are
non-overlapping and consecutive, we can use two-pointer on them to do
this.

For example, a text run for the variable red might be split into two
runs if a highlight partially covers it. As a result, one part may
appear as red, while the other appears as a lighter red, depending on
the background behind it.


Result:

<img width="1458" height="949" alt="image"
src="https://github.com/user-attachments/assets/4814c93d-12e7-4b4d-8542-d912acccfb8e"
/>

<img width="1459" height="952" alt="image"
src="https://github.com/user-attachments/assets/9e497b6c-3e66-43e8-8e5b-f634dd5ee8d3"
/>

<img width="1457" height="621" alt="image"
src="https://github.com/user-attachments/assets/8dfa6ce5-f46b-45b9-8008-66169d5aecd4"
/>

Release Notes:

- Improved text contrast when selected or highlighted in the editor.
---
 assets/settings/default.json         |  14 +
 crates/editor/src/editor_settings.rs |   7 +
 crates/editor/src/element.rs         | 538 ++++++++++++++++++++++++++-
 3 files changed, 557 insertions(+), 2 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 297c932e5b..572193be4e 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -226,6 +226,20 @@
   // The debounce delay before querying highlights from the language
   // server based on the current cursor location.
   "lsp_highlight_debounce": 75,
+  // The minimum APCA perceptual contrast between foreground and background colors.
+  // APCA (Accessible Perceptual Contrast Algorithm) is more accurate than WCAG 2.x,
+  // especially for dark mode. Values range from 0 to 106.
+  //
+  // Based on APCA Readability Criterion (ARC) Bronze Simple Mode:
+  // https://readtech.org/ARC/tests/bronze-simple-mode/
+  // - 0: No contrast adjustment
+  // - 45: Minimum for large fluent text (36px+)
+  // - 60: Minimum for other content text
+  // - 75: Minimum for body text
+  // - 90: Preferred for body text
+  //
+  // This only affects text drawn over highlight backgrounds in the editor.
+  "minimum_contrast_for_highlights": 45,
   // Whether to pop the completions menu while typing in an editor without
   // explicitly requesting it.
   "show_completions_on_input": true,
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 9b110d782a..55c040428d 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -56,6 +56,7 @@ pub struct EditorSettings {
     pub inline_code_actions: bool,
     pub drag_and_drop_selection: DragAndDropSelection,
     pub lsp_document_colors: DocumentColorsRenderMode,
+    pub minimum_contrast_for_highlights: f32,
 }
 
 /// How to render LSP `textDocument/documentColor` colors in the editor.
@@ -550,6 +551,12 @@ pub struct EditorSettingsContent {
     ///
     /// Default: false
     pub show_signature_help_after_edits: Option<bool>,
+    /// The minimum APCA perceptual contrast to maintain when
+    /// rendering text over highlight backgrounds in the editor.
+    ///
+    /// Values range from 0 to 106. Set to 0 to disable adjustments.
+    /// Default: 45
+    pub minimum_contrast_for_highlights: Option<f32>,
 
     /// Whether to follow-up empty go to definition responses from the language server or not.
     /// `FindAllReferences` allows to look up references of the same symbol instead.
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index a63c18e003..ca6eac080e 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -82,6 +82,7 @@ use std::{
 use sum_tree::Bias;
 use text::{BufferId, SelectionGoal};
 use theme::{ActiveTheme, Appearance, BufferLineHeight, PlayerColor};
+use ui::utils::ensure_minimum_contrast;
 use ui::{
     ButtonLike, ContextMenu, Indicator, KeyBinding, POPOVER_Y_PADDING, Tooltip, h_flex, prelude::*,
     right_click_menu,
@@ -3260,12 +3261,161 @@ impl EditorElement {
             .collect()
     }
 
+    fn bg_segments_per_row(
+        rows: Range<DisplayRow>,
+        selections: &[(PlayerColor, Vec<SelectionLayout>)],
+        highlight_ranges: &[(Range<DisplayPoint>, Hsla)],
+        base_background: Hsla,
+    ) -> Vec<Vec<(Range<DisplayPoint>, Hsla)>> {
+        if rows.start >= rows.end {
+            return Vec::new();
+        }
+        let highlight_iter = highlight_ranges.iter().cloned();
+        let selection_iter = selections.iter().flat_map(|(player_color, layouts)| {
+            let color = player_color.selection;
+            layouts.iter().filter_map(move |selection_layout| {
+                if selection_layout.range.start != selection_layout.range.end {
+                    Some((selection_layout.range.clone(), color))
+                } else {
+                    None
+                }
+            })
+        });
+        let mut per_row_map = vec![Vec::new(); rows.len()];
+        for (range, color) in highlight_iter.chain(selection_iter) {
+            let covered_rows = if range.end.column() == 0 {
+                cmp::max(range.start.row(), rows.start)..cmp::min(range.end.row(), rows.end)
+            } else {
+                cmp::max(range.start.row(), rows.start)
+                    ..cmp::min(range.end.row().next_row(), rows.end)
+            };
+            for row in covered_rows.iter_rows() {
+                let seg_start = if row == range.start.row() {
+                    range.start
+                } else {
+                    DisplayPoint::new(row, 0)
+                };
+                let seg_end = if row == range.end.row() && range.end.column() != 0 {
+                    range.end
+                } else {
+                    DisplayPoint::new(row, u32::MAX)
+                };
+                let ix = row.minus(rows.start) as usize;
+                debug_assert!(row >= rows.start && row < rows.end);
+                debug_assert!(ix < per_row_map.len());
+                per_row_map[ix].push((seg_start..seg_end, color));
+            }
+        }
+        for row_segments in per_row_map.iter_mut() {
+            if row_segments.is_empty() {
+                continue;
+            }
+            let segments = mem::take(row_segments);
+            let merged = Self::merge_overlapping_ranges(segments, base_background);
+            *row_segments = merged;
+        }
+        per_row_map
+    }
+
+    /// Merge overlapping ranges by splitting at all range boundaries and blending colors where
+    /// multiple ranges overlap. The result contains non-overlapping ranges ordered from left to right.
+    ///
+    /// Expects `start.row() == end.row()` for each range.
+    fn merge_overlapping_ranges(
+        ranges: Vec<(Range<DisplayPoint>, Hsla)>,
+        base_background: Hsla,
+    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
+        struct Boundary {
+            pos: DisplayPoint,
+            is_start: bool,
+            index: usize,
+            color: Hsla,
+        }
+
+        let mut boundaries: SmallVec<[Boundary; 16]> = SmallVec::with_capacity(ranges.len() * 2);
+        for (index, (range, color)) in ranges.iter().enumerate() {
+            debug_assert!(
+                range.start.row() == range.end.row(),
+                "expects single-row ranges"
+            );
+            if range.start < range.end {
+                boundaries.push(Boundary {
+                    pos: range.start,
+                    is_start: true,
+                    index,
+                    color: *color,
+                });
+                boundaries.push(Boundary {
+                    pos: range.end,
+                    is_start: false,
+                    index,
+                    color: *color,
+                });
+            }
+        }
+
+        if boundaries.is_empty() {
+            return Vec::new();
+        }
+
+        boundaries
+            .sort_unstable_by(|a, b| a.pos.cmp(&b.pos).then_with(|| a.is_start.cmp(&b.is_start)));
+
+        let mut processed_ranges: Vec<(Range<DisplayPoint>, Hsla)> = Vec::new();
+        let mut active_ranges: SmallVec<[(usize, Hsla); 8]> = SmallVec::new();
+
+        let mut i = 0;
+        let mut start_pos = boundaries[0].pos;
+
+        let boundaries_len = boundaries.len();
+        while i < boundaries_len {
+            let current_boundary_pos = boundaries[i].pos;
+            if start_pos < current_boundary_pos {
+                if !active_ranges.is_empty() {
+                    let mut color = base_background;
+                    for &(_, c) in &active_ranges {
+                        color = Hsla::blend(color, c);
+                    }
+                    if let Some((last_range, last_color)) = processed_ranges.last_mut() {
+                        if *last_color == color && last_range.end == start_pos {
+                            last_range.end = current_boundary_pos;
+                        } else {
+                            processed_ranges.push((start_pos..current_boundary_pos, color));
+                        }
+                    } else {
+                        processed_ranges.push((start_pos..current_boundary_pos, color));
+                    }
+                }
+            }
+            while i < boundaries_len && boundaries[i].pos == current_boundary_pos {
+                let active_range = &boundaries[i];
+                if active_range.is_start {
+                    let idx = active_range.index;
+                    let pos = active_ranges
+                        .binary_search_by_key(&idx, |(i, _)| *i)
+                        .unwrap_or_else(|p| p);
+                    active_ranges.insert(pos, (idx, active_range.color));
+                } else {
+                    let idx = active_range.index;
+                    if let Ok(pos) = active_ranges.binary_search_by_key(&idx, |(i, _)| *i) {
+                        active_ranges.remove(pos);
+                    }
+                }
+                i += 1;
+            }
+            start_pos = current_boundary_pos;
+        }
+
+        processed_ranges
+    }
+
     fn layout_lines(
         rows: Range<DisplayRow>,
         snapshot: &EditorSnapshot,
         style: &EditorStyle,
         editor_width: Pixels,
         is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
+        bg_segments_per_row: &[Vec<(Range<DisplayPoint>, Hsla)>],
         window: &mut Window,
         cx: &mut App,
     ) -> Vec<LineWithInvisibles> {
@@ -3321,6 +3471,7 @@ impl EditorElement {
                 &snapshot.mode,
                 editor_width,
                 is_row_soft_wrapped,
+                bg_segments_per_row,
                 window,
                 cx,
             )
@@ -7340,6 +7491,7 @@ impl LineWithInvisibles {
         editor_mode: &EditorMode,
         text_width: Pixels,
         is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
+        bg_segments_per_row: &[Vec<(Range<DisplayPoint>, Hsla)>],
         window: &mut Window,
         cx: &mut App,
     ) -> Vec<Self> {
@@ -7355,6 +7507,7 @@ impl LineWithInvisibles {
         let mut row = 0;
         let mut line_exceeded_max_len = false;
         let font_size = text_style.font_size.to_pixels(window.rem_size());
+        let min_contrast = EditorSettings::get_global(cx).minimum_contrast_for_highlights;
 
         let ellipsis = SharedString::from("⋯");
 
@@ -7367,10 +7520,16 @@ impl LineWithInvisibles {
         }]) {
             if let Some(replacement) = highlighted_chunk.replacement {
                 if !line.is_empty() {
+                    let segments = bg_segments_per_row.get(row).map(|v| &v[..]).unwrap_or(&[]);
+                    let text_runs: &[TextRun] = if segments.is_empty() {
+                        &styles
+                    } else {
+                        &Self::split_runs_by_bg_segments(&styles, segments, min_contrast)
+                    };
                     let shaped_line = window.text_system().shape_line(
                         line.clone().into(),
                         font_size,
-                        &styles,
+                        text_runs,
                         None,
                     );
                     width += shaped_line.width;
@@ -7448,10 +7607,16 @@ impl LineWithInvisibles {
             } else {
                 for (ix, mut line_chunk) in highlighted_chunk.text.split('\n').enumerate() {
                     if ix > 0 {
+                        let segments = bg_segments_per_row.get(row).map(|v| &v[..]).unwrap_or(&[]);
+                        let text_runs = if segments.is_empty() {
+                            &styles
+                        } else {
+                            &Self::split_runs_by_bg_segments(&styles, segments, min_contrast)
+                        };
                         let shaped_line = window.text_system().shape_line(
                             line.clone().into(),
                             font_size,
-                            &styles,
+                            text_runs,
                             None,
                         );
                         width += shaped_line.width;
@@ -7539,6 +7704,81 @@ impl LineWithInvisibles {
         layouts
     }
 
+    /// Takes text runs and non-overlapping left-to-right background ranges with color.
+    /// Returns new text runs with adjusted contrast as per background ranges.
+    fn split_runs_by_bg_segments(
+        text_runs: &[TextRun],
+        bg_segments: &[(Range<DisplayPoint>, Hsla)],
+        min_contrast: f32,
+    ) -> Vec<TextRun> {
+        let mut output_runs: Vec<TextRun> = Vec::with_capacity(text_runs.len());
+        let mut line_col = 0usize;
+        let mut segment_ix = 0usize;
+
+        for text_run in text_runs.iter() {
+            let run_start_col = line_col;
+            let run_end_col = run_start_col + text_run.len;
+            while segment_ix < bg_segments.len()
+                && (bg_segments[segment_ix].0.end.column() as usize) <= run_start_col
+            {
+                segment_ix += 1;
+            }
+            let mut cursor_col = run_start_col;
+            let mut local_segment_ix = segment_ix;
+            while local_segment_ix < bg_segments.len() {
+                let (range, segment_color) = &bg_segments[local_segment_ix];
+                let segment_start_col = range.start.column() as usize;
+                let segment_end_col = range.end.column() as usize;
+                if segment_start_col >= run_end_col {
+                    break;
+                }
+                if segment_start_col > cursor_col {
+                    let span_len = segment_start_col - cursor_col;
+                    output_runs.push(TextRun {
+                        len: span_len,
+                        font: text_run.font.clone(),
+                        color: text_run.color,
+                        background_color: text_run.background_color,
+                        underline: text_run.underline,
+                        strikethrough: text_run.strikethrough,
+                    });
+                    cursor_col = segment_start_col;
+                }
+                let segment_slice_end_col = segment_end_col.min(run_end_col);
+                if segment_slice_end_col > cursor_col {
+                    let new_text_color =
+                        ensure_minimum_contrast(text_run.color, *segment_color, min_contrast);
+                    output_runs.push(TextRun {
+                        len: segment_slice_end_col - cursor_col,
+                        font: text_run.font.clone(),
+                        color: new_text_color,
+                        background_color: text_run.background_color,
+                        underline: text_run.underline,
+                        strikethrough: text_run.strikethrough,
+                    });
+                    cursor_col = segment_slice_end_col;
+                }
+                if segment_end_col >= run_end_col {
+                    break;
+                }
+                local_segment_ix += 1;
+            }
+            if cursor_col < run_end_col {
+                output_runs.push(TextRun {
+                    len: run_end_col - cursor_col,
+                    font: text_run.font.clone(),
+                    color: text_run.color,
+                    background_color: text_run.background_color,
+                    underline: text_run.underline,
+                    strikethrough: text_run.strikethrough,
+                });
+            }
+            line_col = run_end_col;
+            segment_ix = local_segment_ix;
+        }
+        output_runs
+    }
+
     fn prepaint(
         &mut self,
         line_height: Pixels,
@@ -8452,12 +8692,20 @@ impl Element for EditorElement {
                         cx,
                     );
 
+                    let bg_segments_per_row = Self::bg_segments_per_row(
+                        start_row..end_row,
+                        &selections,
+                        &highlighted_ranges,
+                        self.style.background,
+                    );
+
                     let mut line_layouts = Self::layout_lines(
                         start_row..end_row,
                         &snapshot,
                         &self.style,
                         editor_width,
                         is_row_soft_wrapped,
+                        &bg_segments_per_row,
                         window,
                         cx,
                     );
@@ -9817,6 +10065,7 @@ pub fn layout_line(
         &snapshot.mode,
         text_width,
         is_row_soft_wrapped,
+        &[],
         window,
         cx,
     )
@@ -10717,4 +10966,289 @@ mod tests {
             .cloned()
             .collect()
     }
+
+    #[gpui::test]
+    fn test_merge_overlapping_ranges() {
+        let base_bg = Hsla::default();
+        let color1 = Hsla {
+            h: 0.0,
+            s: 0.5,
+            l: 0.5,
+            a: 0.5,
+        };
+        let color2 = Hsla {
+            h: 120.0,
+            s: 0.5,
+            l: 0.5,
+            a: 0.5,
+        };
+
+        let display_point = |col| DisplayPoint::new(DisplayRow(0), col);
+        let cols = |v: &Vec<(Range<DisplayPoint>, Hsla)>| -> Vec<(u32, u32)> {
+            v.iter()
+                .map(|(r, _)| (r.start.column(), r.end.column()))
+                .collect()
+        };
+
+        // Test overlapping ranges blend colors
+        let overlapping = vec![
+            (display_point(5)..display_point(15), color1),
+            (display_point(10)..display_point(20), color2),
+        ];
+        let result = EditorElement::merge_overlapping_ranges(overlapping, base_bg);
+        assert_eq!(cols(&result), vec![(5, 10), (10, 15), (15, 20)]);
+
+        // Test middle segment should have blended color
+        let blended = Hsla::blend(Hsla::blend(base_bg, color1), color2);
+        assert_eq!(result[1].1, blended);
+
+        // Test adjacent same-color ranges merge
+        let adjacent_same = vec![
+            (display_point(5)..display_point(10), color1),
+            (display_point(10)..display_point(15), color1),
+        ];
+        let result = EditorElement::merge_overlapping_ranges(adjacent_same, base_bg);
+        assert_eq!(cols(&result), vec![(5, 15)]);
+
+        // Test contained range splits
+        let contained = vec![
+            (display_point(5)..display_point(20), color1),
+            (display_point(10)..display_point(15), color2),
+        ];
+        let result = EditorElement::merge_overlapping_ranges(contained, base_bg);
+        assert_eq!(cols(&result), vec![(5, 10), (10, 15), (15, 20)]);
+
+        // Test multiple overlaps split at every boundary
+        let color3 = Hsla {
+            h: 240.0,
+            s: 0.5,
+            l: 0.5,
+            a: 0.5,
+        };
+        let complex = vec![
+            (display_point(5)..display_point(12), color1),
+            (display_point(8)..display_point(16), color2),
+            (display_point(10)..display_point(14), color3),
+        ];
+        let result = EditorElement::merge_overlapping_ranges(complex, base_bg);
+        assert_eq!(
+            cols(&result),
+            vec![(5, 8), (8, 10), (10, 12), (12, 14), (14, 16)]
+        );
+    }
+
+    #[gpui::test]
+    fn test_bg_segments_per_row() {
+        let base_bg = Hsla::default();
+
+        // Case A: selection spans three display rows: row 1 [5, end), full row 2, row 3 [0, 7)
+        {
+            let selection_color = Hsla {
+                h: 200.0,
+                s: 0.5,
+                l: 0.5,
+                a: 0.5,
+            };
+            let player_color = PlayerColor {
+                cursor: selection_color,
+                background: selection_color,
+                selection: selection_color,
+            };
+
+            let spanning_selection = SelectionLayout {
+                head: DisplayPoint::new(DisplayRow(3), 7),
+                cursor_shape: CursorShape::Bar,
+                is_newest: true,
+                is_local: true,
+                range: DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(3), 7),
+                active_rows: DisplayRow(1)..DisplayRow(4),
+                user_name: None,
+            };
+
+            let selections = vec![(player_color, vec![spanning_selection])];
+            let result = EditorElement::bg_segments_per_row(
+                DisplayRow(0)..DisplayRow(5),
+                &selections,
+                &[],
+                base_bg,
+            );
+
+            assert_eq!(result.len(), 5);
+            assert!(result[0].is_empty());
+            assert_eq!(result[1].len(), 1);
+            assert_eq!(result[2].len(), 1);
+            assert_eq!(result[3].len(), 1);
+            assert!(result[4].is_empty());
+
+            assert_eq!(result[1][0].0.start, DisplayPoint::new(DisplayRow(1), 5));
+            assert_eq!(result[1][0].0.end.row(), DisplayRow(1));
+            assert_eq!(result[1][0].0.end.column(), u32::MAX);
+            assert_eq!(result[2][0].0.start, DisplayPoint::new(DisplayRow(2), 0));
+            assert_eq!(result[2][0].0.end.row(), DisplayRow(2));
+            assert_eq!(result[2][0].0.end.column(), u32::MAX);
+            assert_eq!(result[3][0].0.start, DisplayPoint::new(DisplayRow(3), 0));
+            assert_eq!(result[3][0].0.end, DisplayPoint::new(DisplayRow(3), 7));
+        }
+
+        // Case B: selection ends exactly at the start of row 3, excluding row 3
+        {
+            let selection_color = Hsla {
+                h: 120.0,
+                s: 0.5,
+                l: 0.5,
+                a: 0.5,
+            };
+            let player_color = PlayerColor {
+                cursor: selection_color,
+                background: selection_color,
+                selection: selection_color,
+            };
+
+            let selection = SelectionLayout {
+                head: DisplayPoint::new(DisplayRow(2), 0),
+                cursor_shape: CursorShape::Bar,
+                is_newest: true,
+                is_local: true,
+                range: DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(3), 0),
+                active_rows: DisplayRow(1)..DisplayRow(3),
+                user_name: None,
+            };
+
+            let selections = vec![(player_color, vec![selection])];
+            let result = EditorElement::bg_segments_per_row(
+                DisplayRow(0)..DisplayRow(4),
+                &selections,
+                &[],
+                base_bg,
+            );
+
+            assert_eq!(result.len(), 4);
+            assert!(result[0].is_empty());
+            assert_eq!(result[1].len(), 1);
+            assert_eq!(result[2].len(), 1);
+            assert!(result[3].is_empty());
+
+            assert_eq!(result[1][0].0.start, DisplayPoint::new(DisplayRow(1), 5));
+            assert_eq!(result[1][0].0.end.row(), DisplayRow(1));
+            assert_eq!(result[1][0].0.end.column(), u32::MAX);
+            assert_eq!(result[2][0].0.start, DisplayPoint::new(DisplayRow(2), 0));
+            assert_eq!(result[2][0].0.end.row(), DisplayRow(2));
+            assert_eq!(result[2][0].0.end.column(), u32::MAX);
+        }
+    }
+
+    #[cfg(test)]
+    fn generate_test_run(len: usize, color: Hsla) -> TextRun {
+        TextRun {
+            len,
+            font: gpui::font(".SystemUIFont"),
+            color,
+            background_color: None,
+            underline: None,
+            strikethrough: None,
+        }
+    }
+
+    #[gpui::test]
+    fn test_split_runs_by_bg_segments(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+
+        let text_color = Hsla {
+            h: 210.0,
+            s: 0.1,
+            l: 0.4,
+            a: 1.0,
+        };
+        let bg1 = Hsla {
+            h: 30.0,
+            s: 0.6,
+            l: 0.8,
+            a: 1.0,
+        };
+        let bg2 = Hsla {
+            h: 200.0,
+            s: 0.6,
+            l: 0.2,
+            a: 1.0,
+        };
+        let min_contrast = 45.0;
+
+        // Case A: single run; disjoint segments inside the run
+        let runs = vec![generate_test_run(20, text_color)];
+        let segs = vec![
+            (
+                DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 10),
+                bg1,
+            ),
+            (
+                DisplayPoint::new(DisplayRow(0), 12)..DisplayPoint::new(DisplayRow(0), 16),
+                bg2,
+            ),
+        ];
+        let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast);
+        // Expected slices: [0,5) [5,10) [10,12) [12,16) [16,20)
+        assert_eq!(
+            out.iter().map(|r| r.len).collect::<Vec<_>>(),
+            vec![5, 5, 2, 4, 4]
+        );
+        assert_eq!(out[0].color, text_color);
+        assert_eq!(
+            out[1].color,
+            ensure_minimum_contrast(text_color, bg1, min_contrast)
+        );
+        assert_eq!(out[2].color, text_color);
+        assert_eq!(
+            out[3].color,
+            ensure_minimum_contrast(text_color, bg2, min_contrast)
+        );
+        assert_eq!(out[4].color, text_color);
+
+        // Case B: multiple runs; segment extends to end of line (u32::MAX)
+        let runs = vec![
+            generate_test_run(8, text_color),
+            generate_test_run(7, text_color),
+        ];
+        let segs = vec![(
+            DisplayPoint::new(DisplayRow(0), 6)..DisplayPoint::new(DisplayRow(0), u32::MAX),
+            bg1,
+        )];
+        let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast);
+        // Expected slices across runs: [0,6) [6,8) | [0,7)
+        assert_eq!(out.iter().map(|r| r.len).collect::<Vec<_>>(), vec![6, 2, 7]);
+        let adjusted = ensure_minimum_contrast(text_color, bg1, min_contrast);
+        assert_eq!(out[0].color, text_color);
+        assert_eq!(out[1].color, adjusted);
+        assert_eq!(out[2].color, adjusted);
+
+        // Case C: multi-byte characters
+        // for text: "Hello 🌍 世界!"
+        let runs = vec![
+            generate_test_run(5, text_color), // "Hello"
+            generate_test_run(6, text_color), // " 🌍 "
+            generate_test_run(6, text_color), // "世界"
+            generate_test_run(1, text_color), // "!"
+        ];
+        // selecting "🌍 世"
+        let segs = vec![(
+            DisplayPoint::new(DisplayRow(0), 6)..DisplayPoint::new(DisplayRow(0), 14),
+            bg1,
+        )];
+        let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast);
+        // "Hello" | " " | "🌍 " | "世" | "界" | "!"
+        assert_eq!(
+            out.iter().map(|r| r.len).collect::<Vec<_>>(),
+            vec![5, 1, 5, 3, 3, 1]
+        );
+        assert_eq!(out[0].color, text_color); // "Hello"
+        assert_eq!(
+            out[2].color,
+            ensure_minimum_contrast(text_color, bg1, min_contrast)
+        ); // "🌍 "
+        assert_eq!(
+            out[3].color,
+            ensure_minimum_contrast(text_color, bg1, min_contrast)
+        ); // "世"
+        assert_eq!(out[4].color, text_color); // "界"
+        assert_eq!(out[5].color, text_color); // "!"
+    }
 }

From 3d4f9172040eacc6cc8787524588506abef07c0a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 29 Aug 2025 14:07:27 -0300
Subject: [PATCH 465/823] Make project symbols picker entry consistent with
 outline picker (#37176)

Closes https://github.com/zed-industries/zed/issues/36383

The project symbols modal didn't use the buffer font and highlighted
matches through modifying the font weight, which is inconsistent with
the outline picker, which presents code in list items in a similar way,
as well as project _and_ buffer search highlighting design.

Release Notes:

- N/A
---
 crates/project_symbols/src/project_symbols.rs | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 7f42f9e8ef..ea67499acb 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -1,18 +1,19 @@
 use editor::{Bias, Editor, SelectionEffects, scroll::Autoscroll, styled_runs_for_code_label};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    App, Context, DismissEvent, Entity, FontWeight, ParentElement, StyledText, Task, WeakEntity,
-    Window, rems,
+    App, Context, DismissEvent, Entity, HighlightStyle, ParentElement, StyledText, Task, TextStyle,
+    WeakEntity, Window, relative, rems,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
 use project::{Project, Symbol};
+use settings::Settings;
 use std::{borrow::Cow, cmp::Reverse, sync::Arc};
-use theme::ActiveTheme;
+use theme::{ActiveTheme, ThemeSettings};
 use util::ResultExt;
 use workspace::{
     Workspace,
-    ui::{Color, Label, LabelCommon, LabelLike, ListItem, ListItemSpacing, Toggleable, v_flex},
+    ui::{LabelLike, ListItem, ListItemSpacing, prelude::*},
 };
 
 pub fn init(cx: &mut App) {
@@ -213,7 +214,7 @@ impl PickerDelegate for ProjectSymbolsDelegate {
         &self,
         ix: usize,
         selected: bool,
-        window: &mut Window,
+        _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
         let string_match = &self.matches[ix];
@@ -235,18 +236,29 @@ impl PickerDelegate for ProjectSymbolsDelegate {
         let label = symbol.label.text.clone();
         let path = path.to_string();
 
-        let highlights = gpui::combine_highlights(
-            string_match
-                .positions
-                .iter()
-                .map(|pos| (*pos..pos + 1, FontWeight::BOLD.into())),
-            syntax_runs.map(|(range, mut highlight)| {
-                // Ignore font weight for syntax highlighting, as we'll use it
-                // for fuzzy matches.
-                highlight.font_weight = None;
-                (range, highlight)
-            }),
-        );
+        let settings = ThemeSettings::get_global(cx);
+
+        let text_style = TextStyle {
+            color: cx.theme().colors().text,
+            font_family: settings.buffer_font.family.clone(),
+            font_features: settings.buffer_font.features.clone(),
+            font_fallbacks: settings.buffer_font.fallbacks.clone(),
+            font_size: settings.buffer_font_size(cx).into(),
+            font_weight: settings.buffer_font.weight,
+            line_height: relative(1.),
+            ..Default::default()
+        };
+
+        let highlight_style = HighlightStyle {
+            background_color: Some(cx.theme().colors().text_accent.alpha(0.3)),
+            ..Default::default()
+        };
+        let custom_highlights = string_match
+            .positions
+            .iter()
+            .map(|pos| (*pos..pos + 1, highlight_style));
+
+        let highlights = gpui::combine_highlights(custom_highlights, syntax_runs);
 
         Some(
             ListItem::new(ix)
@@ -255,13 +267,10 @@ impl PickerDelegate for ProjectSymbolsDelegate {
                 .toggle_state(selected)
                 .child(
                     v_flex()
-                        .child(
-                            LabelLike::new().child(
-                                StyledText::new(label)
-                                    .with_default_highlights(&window.text_style(), highlights),
-                            ),
-                        )
-                        .child(Label::new(path).color(Color::Muted)),
+                        .child(LabelLike::new().child(
+                            StyledText::new(label).with_default_highlights(&text_style, highlights),
+                        ))
+                        .child(Label::new(path).size(LabelSize::Small).color(Color::Muted)),
                 ),
         )
     }

From 92f739dbb9f2b46a1d825b39c0ea2c521dae0dbc Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 29 Aug 2025 13:40:39 -0400
Subject: [PATCH 466/823] acp: Improve error reporting and log more information
 when failing to launch gemini (#37178)

In the case where we fail to create an ACP connection to Gemini, only
report the "unsupported version" error if the version for the found
binary is at least our minimum version. That means we'll surface the
real error in this situation.

This also fixes incorrect sorting of downloaded Gemini versions--as @kpe
pointed out we were effectively using the version string as a key. Now
we'll correctly use the parsed semver::Version instead.

Release Notes:

- N/A
---
 crates/agent_servers/src/agent_servers.rs | 11 ++++---
 crates/agent_servers/src/gemini.rs        | 35 ++++++++++++++---------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index c1fc7b91ae..c610c53ea8 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -105,22 +105,23 @@ impl AgentServerDelegate {
                         .to_str()
                         .and_then(|name| semver::Version::from_str(&name).ok())
                     {
-                        versions.push((file_name.to_owned(), version));
+                        versions.push((version, file_name.to_owned()));
                     } else {
                         to_delete.push(file_name.to_owned())
                     }
                 }
 
                 versions.sort();
-                let newest_version = if let Some((file_name, version)) = versions.last().cloned()
-                    && minimum_version.is_none_or(|minimum_version| version > minimum_version)
+                let newest_version = if let Some((version, file_name)) = versions.last().cloned()
+                    && minimum_version.is_none_or(|minimum_version| version >= minimum_version)
                 {
                     versions.pop();
                     Some(file_name)
                 } else {
                     None
                 };
-                to_delete.extend(versions.into_iter().map(|(file_name, _)| file_name));
+                log::debug!("existing version of {package_name}: {newest_version:?}");
+                to_delete.extend(versions.into_iter().map(|(_, file_name)| file_name));
 
                 cx.background_spawn({
                     let fs = fs.clone();
@@ -200,6 +201,8 @@ impl AgentServerDelegate {
         node_runtime: NodeRuntime,
         package_name: SharedString,
     ) -> Result<String> {
+        log::debug!("downloading latest version of {package_name}");
+
         let tmp_dir = tempfile::tempdir_in(&dir)?;
 
         node_runtime
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 5e958f6869..a1553d288a 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -63,7 +63,9 @@ impl AgentServer for Gemini {
                 })?
                 .await?
             };
-            command.args.push("--experimental-acp".into());
+            if !command.args.contains(&ACP_ARG.into()) {
+                command.args.push(ACP_ARG.into());
+            }
 
             if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
                 command
@@ -86,17 +88,17 @@ impl AgentServer for Gemini {
                             .await;
                         let current_version =
                             String::from_utf8(version_output?.stdout)?.trim().to_owned();
-                        if !connection.prompt_capabilities().image {
-                            return Err(LoadError::Unsupported {
-                                current_version: current_version.into(),
-                                command: command.path.to_string_lossy().to_string().into(),
-                                minimum_version: Self::MINIMUM_VERSION.into(),
-                            }
-                            .into());
+
+                        log::error!("connected to gemini, but missing prompt_capabilities.image (version is {current_version})");
+                        return Err(LoadError::Unsupported {
+                            current_version: current_version.into(),
+                            command: command.path.to_string_lossy().to_string().into(),
+                            minimum_version: Self::MINIMUM_VERSION.into(),
                         }
+                        .into());
                     }
                 }
-                Err(_) => {
+                Err(e) => {
                     let version_fut = util::command::new_smol_command(&command.path)
                         .args(command.args.iter())
                         .arg("--version")
@@ -111,12 +113,19 @@ impl AgentServer for Gemini {
 
                     let (version_output, help_output) =
                         futures::future::join(version_fut, help_fut).await;
+                    let Some(version_output) = version_output.ok().and_then(|output| String::from_utf8(output.stdout).ok()) else {
+                        return result;
+                    };
+                    let Some((help_stdout, help_stderr)) = help_output.ok().and_then(|output| String::from_utf8(output.stdout).ok().zip(String::from_utf8(output.stderr).ok())) else  {
+                        return result;
+                    };
 
-                    let current_version = std::str::from_utf8(&version_output?.stdout)?
-                        .trim()
-                        .to_string();
-                    let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
+                    let current_version = version_output.trim().to_string();
+                    let supported = help_stdout.contains(ACP_ARG) || current_version.parse::<semver::Version>().is_ok_and(|version| version >= Self::MINIMUM_VERSION.parse::<semver::Version>().unwrap());
 
+                    log::error!("failed to create ACP connection to gemini (version is {current_version}, supported: {supported}): {e}");
+                    log::debug!("gemini --help stdout: {help_stdout:?}");
+                    log::debug!("gemini --help stderr: {help_stderr:?}");
                     if !supported {
                         return Err(LoadError::Unsupported {
                             current_version: current_version.into(),

From a790e514af4d6957aa1a14cc8190b2ff24a0484c Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Fri, 29 Aug 2025 14:58:54 -0300
Subject: [PATCH 467/823] Fix ACP permission request with new tool calls
 (#37182)

Release Notes:

- Gemini integration: Fixed a bug with permission requests when
`always_allow_tool_calls` is enabled
---
 Cargo.lock                          |  1 +
 crates/acp_thread/Cargo.toml        |  1 +
 crates/acp_thread/src/acp_thread.rs | 35 ++++++++++++++++++++++++++--
 crates/acp_thread/src/connection.rs | 17 +++++++-------
 crates/agent2/src/agent.rs          | 13 ++++-------
 crates/agent_servers/src/acp.rs     | 36 ++++-------------------------
 6 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa1bcab9a6..e201b4af80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,7 @@ version = "0.1.0"
 dependencies = [
  "action_log",
  "agent-client-protocol",
+ "agent_settings",
  "anyhow",
  "buffer_diff",
  "collections",
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index eab756db51..196614f731 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -19,6 +19,7 @@ test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot"]
 action_log.workspace = true
 agent-client-protocol.workspace = true
 anyhow.workspace = true
+agent_settings.workspace = true
 buffer_diff.workspace = true
 collections.workspace = true
 editor.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 04ff032ad4..394619732a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -3,6 +3,7 @@ mod diff;
 mod mention;
 mod terminal;
 
+use agent_settings::AgentSettings;
 use collections::HashSet;
 pub use connection::*;
 pub use diff::*;
@@ -10,6 +11,7 @@ use language::language_settings::FormatOnSave;
 pub use mention::*;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use serde::{Deserialize, Serialize};
+use settings::Settings as _;
 pub use terminal::*;
 
 use action_log::ActionLog;
@@ -1230,9 +1232,29 @@ impl AcpThread {
         tool_call: acp::ToolCallUpdate,
         options: Vec<acp::PermissionOption>,
         cx: &mut Context<Self>,
-    ) -> Result<oneshot::Receiver<acp::PermissionOptionId>, acp::Error> {
+    ) -> Result<BoxFuture<'static, acp::RequestPermissionOutcome>> {
         let (tx, rx) = oneshot::channel();
 
+        if AgentSettings::get_global(cx).always_allow_tool_actions {
+            // Don't use AllowAlways, because then if you were to turn off always_allow_tool_actions,
+            // some tools would (incorrectly) continue to auto-accept.
+            if let Some(allow_once_option) = options.iter().find_map(|option| {
+                if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
+                    Some(option.id.clone())
+                } else {
+                    None
+                }
+            }) {
+                self.upsert_tool_call_inner(tool_call, ToolCallStatus::Pending, cx)?;
+                return Ok(async {
+                    acp::RequestPermissionOutcome::Selected {
+                        option_id: allow_once_option,
+                    }
+                }
+                .boxed());
+            }
+        }
+
         let status = ToolCallStatus::WaitingForConfirmation {
             options,
             respond_tx: tx,
@@ -1240,7 +1262,16 @@ impl AcpThread {
 
         self.upsert_tool_call_inner(tool_call, status, cx)?;
         cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
-        Ok(rx)
+
+        let fut = async {
+            match rx.await {
+                Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
+                Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
+            }
+        }
+        .boxed();
+
+        Ok(fut)
     }
 
     pub fn authorize_tool_call(
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index af229b7545..96abd1d2b4 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -393,14 +393,15 @@ mod test_support {
                     };
                     let task = cx.spawn(async move |cx| {
                         if let Some((tool_call, options)) = permission_request {
-                            let permission = thread.update(cx, |thread, cx| {
-                                thread.request_tool_call_authorization(
-                                    tool_call.clone().into(),
-                                    options.clone(),
-                                    cx,
-                                )
-                            })?;
-                            permission?.await?;
+                            thread
+                                .update(cx, |thread, cx| {
+                                    thread.request_tool_call_authorization(
+                                        tool_call.clone().into(),
+                                        options.clone(),
+                                        cx,
+                                    )
+                                })??
+                                .await;
                         }
                         thread.update(cx, |thread, cx| {
                             thread.handle_session_update(update.clone(), cx).unwrap();
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index ea80df8fb5..bb6a3c097c 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -762,18 +762,15 @@ impl NativeAgentConnection {
                                 options,
                                 response,
                             }) => {
-                                let recv = acp_thread.update(cx, |thread, cx| {
+                                let outcome_task = acp_thread.update(cx, |thread, cx| {
                                     thread.request_tool_call_authorization(tool_call, options, cx)
-                                })?;
+                                })??;
                                 cx.background_spawn(async move {
-                                    if let Some(recv) = recv.log_err()
-                                        && let Some(option) = recv
-                                            .await
-                                            .context("authorization sender was dropped")
-                                            .log_err()
+                                    if let acp::RequestPermissionOutcome::Selected { option_id } =
+                                        outcome_task.await
                                     {
                                         response
-                                            .send(option)
+                                            .send(option_id)
                                             .map(|_| anyhow!("authorization receiver was dropped"))
                                             .log_err();
                                     }
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index d929d1fc50..b1d4bea5c3 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -3,15 +3,13 @@ use acp_thread::AgentConnection;
 use acp_tools::AcpConnectionRegistry;
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
-use agent_settings::AgentSettings;
 use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
-use futures::channel::oneshot;
 use futures::io::BufReader;
 use project::Project;
 use serde::Deserialize;
-use settings::Settings as _;
+
 use std::{any::Any, cell::RefCell};
 use std::{path::Path, rc::Rc};
 use thiserror::Error;
@@ -345,28 +343,7 @@ impl acp::Client for ClientDelegate {
     ) -> Result<acp::RequestPermissionResponse, acp::Error> {
         let cx = &mut self.cx.clone();
 
-        // If always_allow_tool_actions is enabled, then auto-choose the first "Allow" button
-        if AgentSettings::try_read_global(cx, |settings| settings.always_allow_tool_actions)
-            .unwrap_or(false)
-        {
-            // Don't use AllowAlways, because then if you were to turn off always_allow_tool_actions,
-            // some tools would (incorrectly) continue to auto-accept.
-            if let Some(allow_once_option) = arguments.options.iter().find_map(|option| {
-                if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
-                    Some(option.id.clone())
-                } else {
-                    None
-                }
-            }) {
-                return Ok(acp::RequestPermissionResponse {
-                    outcome: acp::RequestPermissionOutcome::Selected {
-                        option_id: allow_once_option,
-                    },
-                });
-            }
-        }
-
-        let rx = self
+        let task = self
             .sessions
             .borrow()
             .get(&arguments.session_id)
@@ -374,14 +351,9 @@ impl acp::Client for ClientDelegate {
             .thread
             .update(cx, |thread, cx| {
                 thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
-            })?;
+            })??;
 
-        let result = rx?.await;
-
-        let outcome = match result {
-            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
-            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
-        };
+        let outcome = task.await;
 
         Ok(acp::RequestPermissionResponse { outcome })
     }

From fcc3d1092fc2c0323d6f06e93e06c5ed8fad2c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raphael=20L=C3=BCthy?= <raphael@lty.gg>
Date: Fri, 29 Aug 2025 22:17:22 +0200
Subject: [PATCH 468/823] supermaven: Improve completion caching and position
 validation (#37047)

Closes #36981

- Add completion text and position caching to reduce redundant API calls
- Only trigger new completion requests on text changes, not cursor
movement
- Validate cursor position to ensure completions show at correct
location
- Improve end-of-line range calculation for more accurate deletions
- Extract reset_completion_cache helper for cleaner code organization
- Update completion diff algorithm documentation for clarity

Edit: Sorry this is the 2nd PR, I forgot that the forks history was
messy; I cherrypicked and cleaned it properly with this PR

Release Notes:

- supermaven: Improved caching of predictions
- supermaven: Fixed an issue where changing cursor position would
incorrectly trigger new completions
---
 .../src/supermaven_completion_provider.rs     | 93 +++++++++++++++----
 1 file changed, 77 insertions(+), 16 deletions(-)

diff --git a/crates/supermaven/src/supermaven_completion_provider.rs b/crates/supermaven/src/supermaven_completion_provider.rs
index eb54c83f81..89c5129822 100644
--- a/crates/supermaven/src/supermaven_completion_provider.rs
+++ b/crates/supermaven/src/supermaven_completion_provider.rs
@@ -19,8 +19,10 @@ pub struct SupermavenCompletionProvider {
     supermaven: Entity<Supermaven>,
     buffer_id: Option<EntityId>,
     completion_id: Option<SupermavenCompletionStateId>,
+    completion_text: Option<String>,
     file_extension: Option<String>,
     pending_refresh: Option<Task<Result<()>>>,
+    completion_position: Option<language::Anchor>,
 }
 
 impl SupermavenCompletionProvider {
@@ -29,16 +31,19 @@ impl SupermavenCompletionProvider {
             supermaven,
             buffer_id: None,
             completion_id: None,
+            completion_text: None,
             file_extension: None,
             pending_refresh: None,
+            completion_position: None,
         }
     }
 }
 
 // Computes the edit prediction from the difference between the completion text.
-// this is defined by greedily matching the buffer text against the completion text, with any leftover buffer placed at the end.
-// for example, given the completion text "moo cows are cool" and the buffer text "cowsre pool", the completion state would be
-// the inlays "moo ", " a", and "cool" which will render as "[moo ]cows[ a]re [cool]pool" in the editor.
+// This is defined by greedily matching the buffer text against the completion text.
+// Inlays are inserted for parts of the completion text that are not present in the buffer text.
+// For example, given the completion text "axbyc" and the buffer text "xy", the rendered output in the editor would be "[a]x[b]y[c]".
+// The parts in brackets are the inlays.
 fn completion_from_diff(
     snapshot: BufferSnapshot,
     completion_text: &str,
@@ -133,6 +138,14 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
         debounce: bool,
         cx: &mut Context<Self>,
     ) {
+        // Only make new completion requests when debounce is true (i.e., when text is typed)
+        // When debounce is false (i.e., cursor movement), we should not make new requests
+        if !debounce {
+            return;
+        }
+
+        reset_completion_cache(self, cx);
+
         let Some(mut completion) = self.supermaven.update(cx, |supermaven, cx| {
             supermaven.complete(&buffer_handle, cursor_position, cx)
         }) else {
@@ -146,6 +159,17 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
 
             while let Some(()) = completion.updates.next().await {
                 this.update(cx, |this, cx| {
+                    // Get the completion text and cache it
+                    if let Some(text) =
+                        this.supermaven
+                            .read(cx)
+                            .completion(&buffer_handle, cursor_position, cx)
+                    {
+                        this.completion_text = Some(text.to_string());
+
+                        this.completion_position = Some(cursor_position);
+                    }
+
                     this.completion_id = Some(completion.id);
                     this.buffer_id = Some(buffer_handle.entity_id());
                     this.file_extension = buffer_handle.read(cx).file().and_then(|file| {
@@ -156,7 +180,6 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
                                 .to_string(),
                         )
                     });
-                    this.pending_refresh = None;
                     cx.notify();
                 })?;
             }
@@ -174,13 +197,11 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
     }
 
     fn accept(&mut self, _cx: &mut Context<Self>) {
-        self.pending_refresh = None;
-        self.completion_id = None;
+        reset_completion_cache(self, _cx);
     }
 
     fn discard(&mut self, _cx: &mut Context<Self>) {
-        self.pending_refresh = None;
-        self.completion_id = None;
+        reset_completion_cache(self, _cx);
     }
 
     fn suggest(
@@ -189,10 +210,34 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
         cursor_position: Anchor,
         cx: &mut Context<Self>,
     ) -> Option<EditPrediction> {
-        let completion_text = self
-            .supermaven
-            .read(cx)
-            .completion(buffer, cursor_position, cx)?;
+        if self.buffer_id != Some(buffer.entity_id()) {
+            return None;
+        }
+
+        if self.completion_id.is_none() {
+            return None;
+        }
+
+        let completion_text = if let Some(cached_text) = &self.completion_text {
+            cached_text.as_str()
+        } else {
+            let text = self
+                .supermaven
+                .read(cx)
+                .completion(buffer, cursor_position, cx)?;
+            self.completion_text = Some(text.to_string());
+            text
+        };
+
+        // Check if the cursor is still at the same position as the completion request
+        // If we don't have a completion position stored, don't show the completion
+        if let Some(completion_position) = self.completion_position {
+            if cursor_position != completion_position {
+                return None;
+            }
+        } else {
+            return None;
+        }
 
         let completion_text = trim_to_end_of_line_unless_leading_newline(completion_text);
 
@@ -200,15 +245,20 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
 
         if !completion_text.trim().is_empty() {
             let snapshot = buffer.read(cx).snapshot();
-            let mut point = cursor_position.to_point(&snapshot);
-            point.column = snapshot.line_len(point.row);
-            let range = cursor_position..snapshot.anchor_after(point);
+
+            // Calculate the range from cursor to end of line correctly
+            let cursor_point = cursor_position.to_point(&snapshot);
+            let end_of_line = snapshot.anchor_after(language::Point::new(
+                cursor_point.row,
+                snapshot.line_len(cursor_point.row),
+            ));
+            let delete_range = cursor_position..end_of_line;
 
             Some(completion_from_diff(
                 snapshot,
                 completion_text,
                 cursor_position,
-                range,
+                delete_range,
             ))
         } else {
             None
@@ -216,6 +266,17 @@ impl EditPredictionProvider for SupermavenCompletionProvider {
     }
 }
 
+fn reset_completion_cache(
+    provider: &mut SupermavenCompletionProvider,
+    _cx: &mut Context<SupermavenCompletionProvider>,
+) {
+    provider.pending_refresh = None;
+    provider.completion_id = None;
+    provider.completion_text = None;
+    provider.completion_position = None;
+    provider.buffer_id = None;
+}
+
 fn trim_to_end_of_line_unless_leading_newline(text: &str) -> &str {
     if has_leading_newline(text) {
         text

From e9252a7a74b6af4002639405b32b6167da810fe6 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Fri, 29 Aug 2025 21:23:44 +0100
Subject: [PATCH 469/823] editor: Context menu aside scrolling (#35985)

Add support for scrolling the contents rendered aside an
`editor::code_context_menus::CodeContextMenu` by introducing the
`scroll_aside` method.

For now this method is only implemented for the
`CodeContextMenu::Completions` variant, which will scroll the aside
contents for an `editor::code_context_menus::CompletionsMenu` element,
as a `ScrollHandle` is added to the aside content that is rendered.

In order to be possible to trigger this via keybindings, a new editor
action is introduced, `ContextMenuScrollAside`, which accepts a number
of lines or pages to scroll the content by.

Lastly, the default keymaps for both MacOS and Linux, as well as for
Zed's vim mode, are updated to ensure that the following keybindings are
supported when a completion menu is open and the completion item's
documentation is rendered aside:

- `ctrl-e`
- `ctrl-y`
- `ctrl-d`
- `ctrl-u`

### Recording


https://github.com/user-attachments/assets/02043763-87ea-46f5-9768-00e907127b69

---

Closes #13194

Release Notes:

- Added support for scrolling the documentation panel shown alongside
the completion menu in the editor with `cltr-d`, `ctrl-u`, `ctrl-e` and
`ctrl-y`

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: MrSubidubi <finn@zed.dev>
---
 assets/keymaps/vim.json                   | 11 ++-
 crates/editor/src/code_context_menus.rs   | 43 ++++++++++-
 crates/editor/src/hover_links.rs          | 18 +++--
 crates/editor/src/hover_popover.rs        |  2 +-
 crates/editor/src/scroll/scroll_amount.rs |  2 +-
 crates/vim/src/normal/scroll.rs           |  6 +-
 crates/vim/src/test.rs                    | 87 ++++++++++++++++++++++-
 crates/vim/src/test/vim_test_context.rs   |  4 ++
 8 files changed, 156 insertions(+), 17 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 0a88baee02..bd6eb3982c 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -324,7 +324,7 @@
     }
   },
   {
-    "context": "vim_mode == insert",
+    "context": "vim_mode == insert && !menu",
     "bindings": {
       "ctrl-c": "vim::NormalBefore",
       "ctrl-[": "vim::NormalBefore",
@@ -354,6 +354,15 @@
       "ctrl-s": "editor::ShowSignatureHelp"
     }
   },
+  {
+    "context": "showing_completions",
+    "bindings": {
+      "ctrl-d": "vim::ScrollDown",
+      "ctrl-u": "vim::ScrollUp",
+      "ctrl-e": "vim::LineDown",
+      "ctrl-y": "vim::LineUp"
+    }
+  },
   {
     "context": "(vim_mode == normal || vim_mode == helix_normal) && !menu",
     "bindings": {
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 96809d6877..01e74284ef 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1,7 +1,9 @@
+use crate::scroll::ScrollAmount;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    AnyElement, Entity, Focusable, FontWeight, ListSizingBehavior, ScrollStrategy, SharedString,
-    Size, StrikethroughStyle, StyledText, Task, UniformListScrollHandle, div, px, uniform_list,
+    AnyElement, Entity, Focusable, FontWeight, ListSizingBehavior, ScrollHandle, ScrollStrategy,
+    SharedString, Size, StrikethroughStyle, StyledText, Task, UniformListScrollHandle, div, px,
+    uniform_list,
 };
 use itertools::Itertools;
 use language::CodeLabel;
@@ -184,6 +186,20 @@ impl CodeContextMenu {
             CodeContextMenu::CodeActions(_) => false,
         }
     }
+
+    pub fn scroll_aside(
+        &mut self,
+        scroll_amount: ScrollAmount,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        match self {
+            CodeContextMenu::Completions(completions_menu) => {
+                completions_menu.scroll_aside(scroll_amount, window, cx)
+            }
+            CodeContextMenu::CodeActions(_) => (),
+        }
+    }
 }
 
 pub enum ContextMenuOrigin {
@@ -207,6 +223,9 @@ pub struct CompletionsMenu {
     filter_task: Task<()>,
     cancel_filter: Arc<AtomicBool>,
     scroll_handle: UniformListScrollHandle,
+    // The `ScrollHandle` used on the Markdown documentation rendered on the
+    // side of the completions menu.
+    pub scroll_handle_aside: ScrollHandle,
     resolve_completions: bool,
     show_completion_documentation: bool,
     last_rendered_range: Rc<RefCell<Option<Range<usize>>>>,
@@ -279,6 +298,7 @@ impl CompletionsMenu {
             filter_task: Task::ready(()),
             cancel_filter: Arc::new(AtomicBool::new(false)),
             scroll_handle: UniformListScrollHandle::new(),
+            scroll_handle_aside: ScrollHandle::new(),
             resolve_completions: true,
             last_rendered_range: RefCell::new(None).into(),
             markdown_cache: RefCell::new(VecDeque::new()).into(),
@@ -348,6 +368,7 @@ impl CompletionsMenu {
             filter_task: Task::ready(()),
             cancel_filter: Arc::new(AtomicBool::new(false)),
             scroll_handle: UniformListScrollHandle::new(),
+            scroll_handle_aside: ScrollHandle::new(),
             resolve_completions: false,
             show_completion_documentation: false,
             last_rendered_range: RefCell::new(None).into(),
@@ -911,6 +932,7 @@ impl CompletionsMenu {
                         .max_w(max_size.width)
                         .max_h(max_size.height)
                         .overflow_y_scroll()
+                        .track_scroll(&self.scroll_handle_aside)
                         .occlude(),
                 )
                 .into_any_element(),
@@ -1175,6 +1197,23 @@ impl CompletionsMenu {
                 }
             });
     }
+
+    pub fn scroll_aside(
+        &mut self,
+        amount: ScrollAmount,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        let mut offset = self.scroll_handle_aside.offset();
+
+        offset.y -= amount.pixels(
+            window.line_height(),
+            self.scroll_handle_aside.bounds().size.height - px(16.),
+        ) / 2.0;
+
+        cx.notify();
+        self.scroll_handle_aside.set_offset(offset);
+    }
 }
 
 #[derive(Clone)]
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 94f49f601a..ba0b6f8868 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -188,22 +188,26 @@ impl Editor {
 
     pub fn scroll_hover(
         &mut self,
-        amount: &ScrollAmount,
+        amount: ScrollAmount,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> bool {
         let selection = self.selections.newest_anchor().head();
         let snapshot = self.snapshot(window, cx);
 
-        let Some(popover) = self.hover_state.info_popovers.iter().find(|popover| {
+        if let Some(popover) = self.hover_state.info_popovers.iter().find(|popover| {
             popover
                 .symbol_range
                 .point_within_range(&TriggerPoint::Text(selection), &snapshot)
-        }) else {
-            return false;
-        };
-        popover.scroll(amount, window, cx);
-        true
+        }) {
+            popover.scroll(amount, window, cx);
+            true
+        } else if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
+            context_menu.scroll_aside(amount, window, cx);
+            true
+        } else {
+            false
+        }
     }
 
     fn cmd_click_reveal_task(
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index fab5345787..6541f76a56 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -896,7 +896,7 @@ impl InfoPopover {
             .into_any_element()
     }
 
-    pub fn scroll(&self, amount: &ScrollAmount, window: &mut Window, cx: &mut Context<Editor>) {
+    pub fn scroll(&self, amount: ScrollAmount, window: &mut Window, cx: &mut Context<Editor>) {
         let mut current = self.scroll_handle.offset();
         current.y -= amount.pixels(
             window.line_height(),
diff --git a/crates/editor/src/scroll/scroll_amount.rs b/crates/editor/src/scroll/scroll_amount.rs
index 5992c9023c..43f1aa1285 100644
--- a/crates/editor/src/scroll/scroll_amount.rs
+++ b/crates/editor/src/scroll/scroll_amount.rs
@@ -15,7 +15,7 @@ impl ScrollDirection {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
 pub enum ScrollAmount {
     // Scroll N lines (positive is towards the end of the document)
     Line(f32),
diff --git a/crates/vim/src/normal/scroll.rs b/crates/vim/src/normal/scroll.rs
index 9eb8367f57..eeb98692bc 100644
--- a/crates/vim/src/normal/scroll.rs
+++ b/crates/vim/src/normal/scroll.rs
@@ -98,7 +98,7 @@ impl Vim {
         Vim::take_forced_motion(cx);
         self.exit_temporary_normal(window, cx);
         self.update_editor(cx, |_, editor, cx| {
-            scroll_editor(editor, move_cursor, &amount, window, cx)
+            scroll_editor(editor, move_cursor, amount, window, cx)
         });
     }
 }
@@ -106,7 +106,7 @@ impl Vim {
 fn scroll_editor(
     editor: &mut Editor,
     preserve_cursor_position: bool,
-    amount: &ScrollAmount,
+    amount: ScrollAmount,
     window: &mut Window,
     cx: &mut Context<Editor>,
 ) {
@@ -126,7 +126,7 @@ fn scroll_editor(
                 ScrollAmount::Line(amount.lines(visible_line_count) - 1.0)
             }
         }
-        _ => amount.clone(),
+        _ => amount,
     };
 
     editor.scroll_screen(&amount, window, cx);
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index ce04b621cb..84376719d1 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -8,13 +8,15 @@ use collections::HashMap;
 use command_palette::CommandPalette;
 use editor::{
     AnchorRangeExt, DisplayPoint, Editor, EditorMode, MultiBuffer, actions::DeleteLine,
-    display_map::DisplayRow, test::editor_test_context::EditorTestContext,
+    code_context_menus::CodeContextMenu, display_map::DisplayRow,
+    test::editor_test_context::EditorTestContext,
 };
 use futures::StreamExt;
-use gpui::{KeyBinding, Modifiers, MouseButton, TestAppContext};
+use gpui::{KeyBinding, Modifiers, MouseButton, TestAppContext, px};
 use language::Point;
 pub use neovim_backed_test_context::*;
 use settings::SettingsStore;
+use ui::Pixels;
 use util::test::marked_text_ranges;
 pub use vim_test_context::*;
 
@@ -971,6 +973,87 @@ async fn test_comma_w(cx: &mut gpui::TestAppContext) {
         .assert_eq("hellˇo hello\nhello hello");
 }
 
+#[gpui::test]
+async fn test_completion_menu_scroll_aside(cx: &mut TestAppContext) {
+    let mut cx = VimTestContext::new_typescript(cx).await;
+
+    cx.lsp
+        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
+            Ok(Some(lsp::CompletionResponse::Array(vec![
+                lsp::CompletionItem {
+                    label: "Test Item".to_string(),
+                    documentation: Some(lsp::Documentation::String(
+                        "This is some very long documentation content that will be displayed in the aside panel for scrolling.\n".repeat(50)
+                    )),
+                    ..Default::default()
+                },
+            ])))
+        });
+
+    cx.set_state("variableˇ", Mode::Insert);
+    cx.simulate_keystroke(".");
+    cx.executor().run_until_parked();
+
+    let mut initial_offset: Pixels = px(0.0);
+
+    cx.update_editor(|editor, _, _| {
+        let binding = editor.context_menu().borrow();
+        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
+            panic!("Should have completions menu open");
+        };
+
+        initial_offset = menu.scroll_handle_aside.offset().y;
+    });
+
+    // The `ctrl-e` shortcut should scroll the completion menu's aside content
+    // down, so the updated offset should be lower than the initial offset.
+    cx.simulate_keystroke("ctrl-e");
+    cx.update_editor(|editor, _, _| {
+        let binding = editor.context_menu().borrow();
+        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
+            panic!("Should have completions menu open");
+        };
+
+        assert!(menu.scroll_handle_aside.offset().y < initial_offset);
+    });
+
+    // The `ctrl-y` shortcut should do the inverse scrolling as `ctrl-e`, so the
+    // offset should now be the same as the initial offset.
+    cx.simulate_keystroke("ctrl-y");
+    cx.update_editor(|editor, _, _| {
+        let binding = editor.context_menu().borrow();
+        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
+            panic!("Should have completions menu open");
+        };
+
+        assert_eq!(menu.scroll_handle_aside.offset().y, initial_offset);
+    });
+
+    // The `ctrl-d` shortcut should scroll the completion menu's aside content
+    // down, so the updated offset should be lower than the initial offset.
+    cx.simulate_keystroke("ctrl-d");
+    cx.update_editor(|editor, _, _| {
+        let binding = editor.context_menu().borrow();
+        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
+            panic!("Should have completions menu open");
+        };
+
+        assert!(menu.scroll_handle_aside.offset().y < initial_offset);
+    });
+
+    // The `ctrl-u` shortcut should do the inverse scrolling as `ctrl-u`, so the
+    // offset should now be the same as the initial offset.
+    cx.simulate_keystroke("ctrl-u");
+    cx.update_editor(|editor, _, _| {
+        let binding = editor.context_menu().borrow();
+        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
+            panic!("Should have completions menu open");
+        };
+
+        assert_eq!(menu.scroll_handle_aside.offset().y, initial_offset);
+    });
+}
+
 #[gpui::test]
 async fn test_rename(cx: &mut gpui::TestAppContext) {
     let mut cx = VimTestContext::new_typescript(cx).await;
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index e7ac692df1..ef9588acae 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -49,6 +49,10 @@ impl VimTestContext {
         Self::new_with_lsp(
             EditorLspTestContext::new_typescript(
                 lsp::ServerCapabilities {
+                    completion_provider: Some(lsp::CompletionOptions {
+                        trigger_characters: Some(vec![".".to_string()]),
+                        ..Default::default()
+                    }),
                     rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
                         prepare_provider: Some(true),
                         work_done_progress_options: Default::default(),

From f2c3f3b168bab7c808e3ce2c3392b0c692919f81 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 29 Aug 2025 16:56:10 -0400
Subject: [PATCH 470/823] settings ui: Start work on creating the initial
 structure (#36904)

## Goal

This PR creates the initial settings ui structure with the primary goal
of making a settings UI that is
- Comprehensive: All settings are available through the UI
- Correct: Easy to understand the underlying JSON file from the UI
- Intuitive
- Easy to implement per setting so that UI is not a hindrance to future
settings changes

### Structure

The overall structure is settings layer -> data layer -> ui layer.

The settings layer is the pre-existing settings definitions, that
implement the `Settings` trait. The data layer is constructed from
settings primarily through the `SettingsUi` trait, and it's associated
derive macro. The data layer tracks the grouping of the settings, the
json path of the settings, and a data representation of how to render
the controls for the setting in the UI, that is either a marker value
for the component to use (avoiding a dependency on the `ui` crate) or a
custom render function.

Abstracting the data layer from the ui layer allows crates depending on
`settings` to implement their own UI without having to add additional UI
dependencies, thus avoiding circular dependencies. In cases where custom
UI is desired, and a creating a custom render function in the same crate
is infeasible due to circular dependencies, the current solution is to
implement a marker for the component in the `settings` crate, and then
handle the rendering of that component in `settings_ui`.

### Foundation

This PR creates a macro and a trait both called `SettingsUi`. The
`SettingsUi` trait is added as a new trait bound on the `Settings`
trait, this allows the type system to guarantee that all settings
implement UI functionality. The macro is used to derived the trait for
most types, and can be modified through attributes for unique cases as
well.

A derive-macro is used to generate the settings UI trait impl, allowing
it the UI generation to be generated from the static information in our
code base (`default.json`, Struct/Enum names, field names, `serde`
attributes, etc). This allows the UI to be auto-generated for the most
part, and ensures consistency across the UI.


#### Immediate Follow ups

- Add a new `SettingsPath` trait that will be a trait bound on
`SettingsUi` and `Settings`
- This trait will replace the `Settings::key` value to enable
`SettingsUi` to infer the json path of it's derived type
- Figure out how to render `Option<T> where T: SettingsUi` correctly
- Handle `serde` attributes in the `SettingsUi` proc macro to correctly
get json path from a type's field and identity

Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 Cargo.lock                                    |  75 ++-
 Cargo.toml                                    |  10 +-
 assets/settings/default.json                  |   3 +
 crates/agent_servers/src/settings.rs          |   4 +-
 crates/agent_settings/src/agent_settings.rs   |   4 +-
 crates/agent_ui/src/slash_command_settings.rs |   4 +-
 crates/audio/src/audio_settings.rs            |   4 +-
 crates/auto_update/src/auto_update.rs         |   3 +-
 crates/call/src/call_settings.rs              |   4 +-
 crates/client/src/client.rs                   |   8 +-
 crates/collab_ui/src/panel_settings.rs        |  10 +-
 crates/dap/src/debugger_settings.rs           |   8 +-
 crates/editor/src/editor_settings.rs          |   4 +-
 .../extension_host/src/extension_settings.rs  |   4 +-
 .../file_finder/src/file_finder_settings.rs   |   4 +-
 crates/git_hosting_providers/src/settings.rs  |   4 +-
 crates/git_ui/src/git_panel_settings.rs       |   4 +-
 crates/go_to_line/src/cursor_position.rs      |   4 +-
 crates/gpui_macros/src/derive_action.rs       |   7 +
 .../image_viewer/src/image_viewer_settings.rs |   4 +-
 crates/journal/src/journal.rs                 |   4 +-
 crates/keymap_editor/Cargo.toml               |  53 ++
 crates/keymap_editor/LICENSE-GPL              |   1 +
 .../src/keymap_editor.rs}                     |   6 +-
 .../src/ui_components/keystroke_input.rs      |   0
 .../src/ui_components/mod.rs                  |   0
 .../src/ui_components/table.rs                |   0
 crates/language/src/language_settings.rs      |   4 +-
 crates/language_models/src/settings.rs        |   4 +-
 .../src/outline_panel_settings.rs             |   4 +-
 crates/project/src/project.rs                 |   2 +-
 crates/project/src/project_settings.rs        |   4 +-
 .../src/project_panel_settings.rs             |   4 +-
 crates/recent_projects/src/ssh_connections.rs |   4 +-
 crates/repl/src/jupyter_settings.rs           |   4 +-
 crates/settings/Cargo.toml                    |   1 +
 crates/settings/src/base_keymap_setting.rs    |   8 +-
 crates/settings/src/settings.rs               |   4 +
 crates/settings/src/settings_json.rs          |  12 +-
 crates/settings/src/settings_store.rs         | 144 +++--
 crates/settings/src/settings_ui.rs            | 118 ++++
 crates/settings/src/vscode_import.rs          |   4 +-
 crates/settings_ui/Cargo.toml                 |  41 +-
 crates/settings_ui/src/settings_ui.rs         | 510 ++++++++++++++++--
 crates/settings_ui_macros/Cargo.toml          |  22 +
 crates/settings_ui_macros/LICENSE-GPL         |   1 +
 .../src/settings_ui_macros.rs                 | 201 +++++++
 crates/terminal/src/terminal_settings.rs      |   4 +-
 crates/theme/src/settings.rs                  |   4 +-
 crates/title_bar/Cargo.toml                   |   2 +-
 crates/title_bar/src/title_bar.rs             |   6 +-
 crates/title_bar/src/title_bar_settings.rs    |   5 +-
 crates/vim/src/vim.rs                         |   4 +-
 .../vim_mode_setting/src/vim_mode_setting.rs  |   4 +-
 crates/workspace/src/item.rs                  |   6 +-
 crates/workspace/src/workspace_settings.rs    |   6 +-
 crates/worktree/src/worktree_settings.rs      |   4 +-
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/main.rs                        |   1 +
 crates/zed/src/zed.rs                         |   2 +-
 crates/zed/src/zed/app_menus.rs               |   3 +-
 crates/zlog_settings/src/zlog_settings.rs     |   4 +-
 62 files changed, 1154 insertions(+), 234 deletions(-)
 create mode 100644 crates/keymap_editor/Cargo.toml
 create mode 120000 crates/keymap_editor/LICENSE-GPL
 rename crates/{settings_ui/src/keybindings.rs => keymap_editor/src/keymap_editor.rs} (99%)
 rename crates/{settings_ui => keymap_editor}/src/ui_components/keystroke_input.rs (100%)
 rename crates/{settings_ui => keymap_editor}/src/ui_components/mod.rs (100%)
 rename crates/{settings_ui => keymap_editor}/src/ui_components/table.rs (100%)
 create mode 100644 crates/settings/src/settings_ui.rs
 create mode 100644 crates/settings_ui_macros/Cargo.toml
 create mode 120000 crates/settings_ui_macros/LICENSE-GPL
 create mode 100644 crates/settings_ui_macros/src/settings_ui_macros.rs

diff --git a/Cargo.lock b/Cargo.lock
index e201b4af80..4c68280de2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8951,6 +8951,44 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "keymap_editor"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "command_palette",
+ "component",
+ "db",
+ "editor",
+ "fs",
+ "fuzzy",
+ "gpui",
+ "itertools 0.14.0",
+ "language",
+ "log",
+ "menu",
+ "notifications",
+ "paths",
+ "project",
+ "search",
+ "serde",
+ "serde_json",
+ "settings",
+ "telemetry",
+ "tempfile",
+ "theme",
+ "tree-sitter-json",
+ "tree-sitter-rust",
+ "ui",
+ "ui_input",
+ "util",
+ "vim",
+ "workspace",
+ "workspace-hack",
+ "zed_actions",
+]
+
 [[package]]
 name = "khronos-egl"
 version = "6.0.0"
@@ -14856,6 +14894,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_json_lenient",
+ "settings_ui_macros",
  "smallvec",
  "tree-sitter",
  "tree-sitter-json",
@@ -14891,39 +14930,28 @@ name = "settings_ui"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
- "command_palette",
  "command_palette_hooks",
- "component",
- "db",
  "editor",
  "feature_flags",
- "fs",
- "fuzzy",
  "gpui",
- "itertools 0.14.0",
- "language",
- "log",
- "menu",
- "notifications",
- "paths",
- "project",
- "search",
  "serde",
  "serde_json",
  "settings",
- "telemetry",
- "tempfile",
+ "smallvec",
  "theme",
- "tree-sitter-json",
- "tree-sitter-rust",
  "ui",
- "ui_input",
- "util",
- "vim",
  "workspace",
  "workspace-hack",
- "zed_actions",
+]
+
+[[package]]
+name = "settings_ui_macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -16739,6 +16767,7 @@ dependencies = [
  "db",
  "gpui",
  "http_client",
+ "keymap_editor",
  "notifications",
  "pretty_assertions",
  "project",
@@ -16747,7 +16776,6 @@ dependencies = [
  "schemars",
  "serde",
  "settings",
- "settings_ui",
  "smallvec",
  "story",
  "telemetry",
@@ -20458,6 +20486,7 @@ dependencies = [
  "itertools 0.14.0",
  "jj_ui",
  "journal",
+ "keymap_editor",
  "language",
  "language_extension",
  "language_model",
diff --git a/Cargo.toml b/Cargo.toml
index d346043c0e..b64113311a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,6 +54,8 @@ members = [
     "crates/deepseek",
     "crates/diagnostics",
     "crates/docs_preprocessor",
+    "crates/edit_prediction",
+    "crates/edit_prediction_button",
     "crates/editor",
     "crates/eval",
     "crates/explorer_command_injector",
@@ -82,13 +84,12 @@ members = [
     "crates/http_client_tls",
     "crates/icons",
     "crates/image_viewer",
-    "crates/edit_prediction",
-    "crates/edit_prediction_button",
     "crates/inspector_ui",
     "crates/install_cli",
     "crates/jj",
     "crates/jj_ui",
     "crates/journal",
+    "crates/keymap_editor",
     "crates/language",
     "crates/language_extension",
     "crates/language_model",
@@ -146,6 +147,7 @@ members = [
     "crates/settings",
     "crates/settings_profile_selector",
     "crates/settings_ui",
+    "crates/settings_ui_macros",
     "crates/snippet",
     "crates/snippet_provider",
     "crates/snippets_ui",
@@ -156,9 +158,9 @@ members = [
     "crates/streaming_diff",
     "crates/sum_tree",
     "crates/supermaven",
-    "crates/system_specs",
     "crates/supermaven_api",
     "crates/svg_preview",
+    "crates/system_specs",
     "crates/tab_switcher",
     "crates/task",
     "crates/tasks_ui",
@@ -314,6 +316,7 @@ install_cli = { path = "crates/install_cli" }
 jj = { path = "crates/jj" }
 jj_ui = { path = "crates/jj_ui" }
 journal = { path = "crates/journal" }
+keymap_editor = { path = "crates/keymap_editor" }
 language = { path = "crates/language" }
 language_extension = { path = "crates/language_extension" }
 language_model = { path = "crates/language_model" }
@@ -373,6 +376,7 @@ semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
 settings_ui = { path = "crates/settings_ui" }
+settings_ui_macros = { path = "crates/settings_ui_macros" }
 snippet = { path = "crates/snippet" }
 snippet_provider = { path = "crates/snippet_provider" }
 snippets_ui = { path = "crates/snippets_ui" }
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 572193be4e..b15eb6e5ce 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1922,7 +1922,10 @@
   "debugger": {
     "stepping_granularity": "line",
     "save_breakpoints": true,
+    "timeout": 2000,
     "dock": "bottom",
+    "log_dap_communications": true,
+    "format_dap_log_messages": true,
     "button": true
   },
   // Configures any number of settings profiles that are temporarily applied on
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
index 81f80a7d7d..693d7d7b70 100644
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -6,13 +6,13 @@ use collections::HashMap;
 use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 pub fn init(cx: &mut App) {
     AllAgentServersSettings::register(cx);
 }
 
-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug)]
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi)]
 pub struct AllAgentServersSettings {
     pub gemini: Option<BuiltinAgentServerSettings>,
     pub claude: Option<CustomAgentServerSettings>,
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index ed1ed2b898..3808cc510f 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -8,7 +8,7 @@ use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::borrow::Cow;
 
 pub use crate::agent_profile::*;
@@ -48,7 +48,7 @@ pub enum NotifyWhenAgentWaiting {
     Never,
 }
 
-#[derive(Default, Clone, Debug)]
+#[derive(Default, Clone, Debug, SettingsUi)]
 pub struct AgentSettings {
     pub enabled: bool,
     pub button: bool,
diff --git a/crates/agent_ui/src/slash_command_settings.rs b/crates/agent_ui/src/slash_command_settings.rs
index 73e5622aa9..c54a10ed49 100644
--- a/crates/agent_ui/src/slash_command_settings.rs
+++ b/crates/agent_ui/src/slash_command_settings.rs
@@ -2,10 +2,10 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 /// Settings for slash commands.
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema)]
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi)]
 pub struct SlashCommandSettings {
     /// Settings for the `/cargo-workspace` slash command.
     #[serde(default)]
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
index 807179881c..e42918825c 100644
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -2,9 +2,9 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct AudioSettings {
     /// Opt into the new audio system.
     #[serde(rename = "experimental.rodio_audio", default)]
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 2150873cad..71dcf25aee 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -10,7 +10,7 @@ use paths::remote_servers_dir;
 use release_channel::{AppCommitSha, ReleaseChannel};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsStore};
+use settings::{Settings, SettingsSources, SettingsStore, SettingsUi};
 use smol::{fs, io::AsyncReadExt};
 use smol::{fs::File, process::Command};
 use std::{
@@ -113,6 +113,7 @@ impl Drop for MacOsUnmounter {
     }
 }
 
+#[derive(SettingsUi)]
 struct AutoUpdateSetting(bool);
 
 /// Whether or not to automatically check for updates.
diff --git a/crates/call/src/call_settings.rs b/crates/call/src/call_settings.rs
index c8f51e0c1a..64d11d0df6 100644
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -2,9 +2,9 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, SettingsUi)]
 pub struct CallSettings {
     pub mute_on_join: bool,
     pub share_on_join: bool,
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 1e735b0025..c5bb1af0d7 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -31,7 +31,7 @@ use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::{
     any::TypeId,
     convert::TryFrom,
@@ -101,7 +101,7 @@ pub struct ClientSettingsContent {
     server_url: Option<String>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 pub struct ClientSettings {
     pub server_url: String,
 }
@@ -127,7 +127,7 @@ pub struct ProxySettingsContent {
     proxy: Option<String>,
 }
 
-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, SettingsUi)]
 pub struct ProxySettings {
     pub proxy: Option<String>,
 }
@@ -520,7 +520,7 @@ impl<T: 'static> Drop for PendingEntitySubscription<T> {
     }
 }
 
-#[derive(Copy, Clone, Deserialize, Debug)]
+#[derive(Copy, Clone, Deserialize, Debug, SettingsUi)]
 pub struct TelemetrySettings {
     pub diagnostics: bool,
     pub metrics: bool,
diff --git a/crates/collab_ui/src/panel_settings.rs b/crates/collab_ui/src/panel_settings.rs
index 652d9eb67f..4e5c8ad8f0 100644
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -1,10 +1,10 @@
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use workspace::dock::DockPosition;
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, SettingsUi)]
 pub struct CollaborationPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
@@ -20,7 +20,7 @@ pub enum ChatPanelButton {
     WhenInCall,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, SettingsUi)]
 pub struct ChatPanelSettings {
     pub button: ChatPanelButton,
     pub dock: DockPosition,
@@ -43,7 +43,7 @@ pub struct ChatPanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, SettingsUi)]
 pub struct NotificationPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
@@ -66,7 +66,7 @@ pub struct PanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct MessageEditorSettings {
     /// Whether to automatically replace emoji shortcodes with emoji characters.
     /// For example: typing `:wave:` gets replaced with `👋`.
diff --git a/crates/dap/src/debugger_settings.rs b/crates/dap/src/debugger_settings.rs
index e1176633e5..6843f19e38 100644
--- a/crates/dap/src/debugger_settings.rs
+++ b/crates/dap/src/debugger_settings.rs
@@ -2,9 +2,9 @@ use dap_types::SteppingGranularity;
 use gpui::{App, Global};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum DebugPanelDockPosition {
     Left,
@@ -12,12 +12,14 @@ pub enum DebugPanelDockPosition {
     Right,
 }
 
-#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy)]
+#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi)]
 #[serde(default)]
+#[settings_ui(group = "Debugger", path = "debugger")]
 pub struct DebuggerSettings {
     /// Determines the stepping granularity.
     ///
     /// Default: line
+    #[settings_ui(skip)]
     pub stepping_granularity: SteppingGranularity,
     /// Whether the breakpoints should be reused across Zed sessions.
     ///
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 55c040428d..c2baa9de02 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -6,12 +6,12 @@ use language::CursorShape;
 use project::project_settings::DiagnosticSeverity;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, VsCodeSettings};
+use settings::{Settings, SettingsSources, SettingsUi, VsCodeSettings};
 use util::serde::default_true;
 
 /// Imports from the VSCode settings at
 /// https://code.visualstudio.com/docs/reference/default-settings
-#[derive(Deserialize, Clone)]
+#[derive(Deserialize, Clone, SettingsUi)]
 pub struct EditorSettings {
     pub cursor_blink: bool,
     pub cursor_shape: Option<CursorShape>,
diff --git a/crates/extension_host/src/extension_settings.rs b/crates/extension_host/src/extension_settings.rs
index cfa67990b0..6bd760795c 100644
--- a/crates/extension_host/src/extension_settings.rs
+++ b/crates/extension_host/src/extension_settings.rs
@@ -3,10 +3,10 @@ use collections::HashMap;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::sync::Arc;
 
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema)]
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi)]
 pub struct ExtensionSettings {
     /// The extensions that should be automatically installed by Zed.
     ///
diff --git a/crates/file_finder/src/file_finder_settings.rs b/crates/file_finder/src/file_finder_settings.rs
index 350e1de3b3..20057417a2 100644
--- a/crates/file_finder/src/file_finder_settings.rs
+++ b/crates/file_finder/src/file_finder_settings.rs
@@ -1,9 +1,9 @@
 use anyhow::Result;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq, SettingsUi)]
 pub struct FileFinderSettings {
     pub file_icons: bool,
     pub modal_max_width: Option<FileFinderWidth>,
diff --git a/crates/git_hosting_providers/src/settings.rs b/crates/git_hosting_providers/src/settings.rs
index 91179fea39..34e3805a39 100644
--- a/crates/git_hosting_providers/src/settings.rs
+++ b/crates/git_hosting_providers/src/settings.rs
@@ -5,7 +5,7 @@ use git::GitHostingProviderRegistry;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
+use settings::{Settings, SettingsStore, SettingsUi};
 use url::Url;
 use util::ResultExt as _;
 
@@ -78,7 +78,7 @@ pub struct GitHostingProviderConfig {
     pub name: String,
 }
 
-#[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct GitHostingProviderSettings {
     /// The list of custom Git hosting providers.
     #[serde(default)]
diff --git a/crates/git_ui/src/git_panel_settings.rs b/crates/git_ui/src/git_panel_settings.rs
index b6891c7d25..5769492204 100644
--- a/crates/git_ui/src/git_panel_settings.rs
+++ b/crates/git_ui/src/git_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::ShowScrollbar;
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use workspace::dock::DockPosition;
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
@@ -77,7 +77,7 @@ pub struct GitPanelSettingsContent {
     pub collapse_untracked_diff: Option<bool>,
 }
 
-#[derive(Deserialize, Debug, Clone, PartialEq)]
+#[derive(Deserialize, Debug, Clone, PartialEq, SettingsUi)]
 pub struct GitPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index e60a3651aa..345af8a867 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -2,7 +2,7 @@ use editor::{Editor, EditorSettings, MultiBufferSnapshot};
 use gpui::{App, Entity, FocusHandle, Focusable, Subscription, Task, WeakEntity};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::{fmt::Write, num::NonZeroU32, time::Duration};
 use text::{Point, Selection};
 use ui::{
@@ -293,7 +293,7 @@ impl StatusItemView for CursorPosition {
     }
 }
 
-#[derive(Clone, Copy, Default, PartialEq, JsonSchema, Deserialize, Serialize)]
+#[derive(Clone, Copy, Default, PartialEq, JsonSchema, Deserialize, Serialize, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub(crate) enum LineIndicatorFormat {
     Short,
diff --git a/crates/gpui_macros/src/derive_action.rs b/crates/gpui_macros/src/derive_action.rs
index 9c7f97371d..4e6c6277e4 100644
--- a/crates/gpui_macros/src/derive_action.rs
+++ b/crates/gpui_macros/src/derive_action.rs
@@ -16,6 +16,13 @@ pub(crate) fn derive_action(input: TokenStream) -> TokenStream {
     let mut deprecated = None;
     let mut doc_str: Option<String> = None;
 
+    /*
+    *
+    * #[action()]
+    * Struct Foo {
+    *  bar: bool // is bar considered an attribute
+    }
+    */
     for attr in &input.attrs {
         if attr.path().is_ident("action") {
             attr.parse_nested_meta(|meta| {
diff --git a/crates/image_viewer/src/image_viewer_settings.rs b/crates/image_viewer/src/image_viewer_settings.rs
index 1dcf99c0af..4949b266b4 100644
--- a/crates/image_viewer/src/image_viewer_settings.rs
+++ b/crates/image_viewer/src/image_viewer_settings.rs
@@ -1,10 +1,10 @@
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 /// The settings for the image viewer.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Default, SettingsUi)]
 pub struct ImageViewerSettings {
     /// The unit to use for displaying image file sizes.
     ///
diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs
index c09ab6f764..ffa24571c8 100644
--- a/crates/journal/src/journal.rs
+++ b/crates/journal/src/journal.rs
@@ -5,7 +5,7 @@ use editor::{Editor, SelectionEffects};
 use gpui::{App, AppContext as _, Context, Window, actions};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::{
     fs::OpenOptions,
     path::{Path, PathBuf},
@@ -22,7 +22,7 @@ actions!(
 );
 
 /// Settings specific to journaling
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct JournalSettings {
     /// The path of the directory where journal entries are stored.
     ///
diff --git a/crates/keymap_editor/Cargo.toml b/crates/keymap_editor/Cargo.toml
new file mode 100644
index 0000000000..ae3af21239
--- /dev/null
+++ b/crates/keymap_editor/Cargo.toml
@@ -0,0 +1,53 @@
+[package]
+name = "keymap_editor"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/keymap_editor.rs"
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+command_palette.workspace = true
+component.workspace = true
+db.workspace = true
+editor.workspace = true
+fs.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+itertools.workspace = true
+language.workspace = true
+log.workspace = true
+menu.workspace = true
+notifications.workspace = true
+paths.workspace = true
+project.workspace = true
+search.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+telemetry.workspace = true
+tempfile.workspace = true
+theme.workspace = true
+tree-sitter-json.workspace = true
+tree-sitter-rust.workspace = true
+ui.workspace = true
+ui_input.workspace = true
+util.workspace = true
+vim.workspace = true
+workspace-hack.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
+
+[dev-dependencies]
+db = {"workspace"= true, "features" = ["test-support"]}
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/keymap_editor/LICENSE-GPL b/crates/keymap_editor/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/keymap_editor/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings_ui/src/keybindings.rs b/crates/keymap_editor/src/keymap_editor.rs
similarity index 99%
rename from crates/settings_ui/src/keybindings.rs
rename to crates/keymap_editor/src/keymap_editor.rs
index 161e1e768d..1214906112 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -5,6 +5,8 @@ use std::{
     time::Duration,
 };
 
+mod ui_components;
+
 use anyhow::{Context as _, anyhow};
 use collections::{HashMap, HashSet};
 use editor::{CompletionProvider, Editor, EditorEvent};
@@ -34,8 +36,10 @@ use workspace::{
     register_serializable_item,
 };
 
+pub use ui_components::*;
+
 use crate::{
-    keybindings::persistence::KEYBINDING_EDITORS,
+    persistence::KEYBINDING_EDITORS,
     ui_components::{
         keystroke_input::{ClearKeystrokes, KeystrokeInput, StartRecording, StopRecording},
         table::{ColumnWidths, ResizeBehavior, Table, TableInteractionState},
diff --git a/crates/settings_ui/src/ui_components/keystroke_input.rs b/crates/keymap_editor/src/ui_components/keystroke_input.rs
similarity index 100%
rename from crates/settings_ui/src/ui_components/keystroke_input.rs
rename to crates/keymap_editor/src/ui_components/keystroke_input.rs
diff --git a/crates/settings_ui/src/ui_components/mod.rs b/crates/keymap_editor/src/ui_components/mod.rs
similarity index 100%
rename from crates/settings_ui/src/ui_components/mod.rs
rename to crates/keymap_editor/src/ui_components/mod.rs
diff --git a/crates/settings_ui/src/ui_components/table.rs b/crates/keymap_editor/src/ui_components/table.rs
similarity index 100%
rename from crates/settings_ui/src/ui_components/table.rs
rename to crates/keymap_editor/src/ui_components/table.rs
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 0f82d3997f..a44df4993a 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -17,7 +17,7 @@ use serde::{
 };
 
 use settings::{
-    ParameterizedJsonSchema, Settings, SettingsLocation, SettingsSources, SettingsStore,
+    ParameterizedJsonSchema, Settings, SettingsLocation, SettingsSources, SettingsStore, SettingsUi,
 };
 use shellexpand;
 use std::{borrow::Cow, num::NonZeroU32, path::Path, slice, sync::Arc};
@@ -55,7 +55,7 @@ pub fn all_language_settings<'a>(
 }
 
 /// The settings for all languages.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, SettingsUi)]
 pub struct AllLanguageSettings {
     /// The edit prediction settings.
     pub edit_predictions: EditPredictionSettings,
diff --git a/crates/language_models/src/settings.rs b/crates/language_models/src/settings.rs
index b163585aa7..1d03ab48f7 100644
--- a/crates/language_models/src/settings.rs
+++ b/crates/language_models/src/settings.rs
@@ -5,7 +5,7 @@ use collections::HashMap;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 use crate::provider::{
     self,
@@ -29,7 +29,7 @@ pub fn init_settings(cx: &mut App) {
     AllLanguageModelSettings::register(cx);
 }
 
-#[derive(Default)]
+#[derive(Default, SettingsUi)]
 pub struct AllLanguageModelSettings {
     pub anthropic: AnthropicSettings,
     pub bedrock: AmazonBedrockSettings,
diff --git a/crates/outline_panel/src/outline_panel_settings.rs b/crates/outline_panel/src/outline_panel_settings.rs
index 133d28b748..c33125654f 100644
--- a/crates/outline_panel/src/outline_panel_settings.rs
+++ b/crates/outline_panel/src/outline_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::ShowScrollbar;
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Copy, PartialEq)]
 #[serde(rename_all = "snake_case")]
@@ -18,7 +18,7 @@ pub enum ShowIndentGuides {
     Never,
 }
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq, SettingsUi)]
 pub struct OutlinePanelSettings {
     pub button: bool,
     pub default_width: Pixels,
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 74ad08570a..b32e95741f 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -952,7 +952,7 @@ pub enum PulledDiagnostics {
 /// Whether to disable all AI features in Zed.
 ///
 /// Default: false
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, settings::SettingsUi)]
 pub struct DisableAiSettings {
     pub disable_ai: bool,
 }
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 4447c25129..30a71c4cae 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -19,7 +19,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{
     InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation, SettingsSources,
-    SettingsStore, parse_json_with_comments, watch_config_file,
+    SettingsStore, SettingsUi, parse_json_with_comments, watch_config_file,
 };
 use std::{
     collections::BTreeMap,
@@ -36,7 +36,7 @@ use crate::{
     worktree_store::{WorktreeStore, WorktreeStoreEvent},
 };
 
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ProjectSettings {
     /// Configuration for language servers.
     ///
diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs
index fc399d66a7..9c7bd4fd66 100644
--- a/crates/project_panel/src/project_panel_settings.rs
+++ b/crates/project_panel/src/project_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::ShowScrollbar;
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Copy, PartialEq)]
 #[serde(rename_all = "snake_case")]
@@ -28,7 +28,7 @@ pub enum EntrySpacing {
     Standard,
 }
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq, SettingsUi)]
 pub struct ProjectPanelSettings {
     pub button: bool,
     pub hide_gitignore: bool,
diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/ssh_connections.rs
index e3fb249d16..29f6e75bbd 100644
--- a/crates/recent_projects/src/ssh_connections.rs
+++ b/crates/recent_projects/src/ssh_connections.rs
@@ -20,7 +20,7 @@ use remote::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use theme::ThemeSettings;
 use ui::{
     ActiveTheme, Color, Context, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
@@ -29,7 +29,7 @@ use ui::{
 use util::serde::default_true;
 use workspace::{AppState, ModalView, Workspace};
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 pub struct SshSettings {
     pub ssh_connections: Option<Vec<SshConnection>>,
     /// Whether to read ~/.ssh/config for ssh connection sources.
diff --git a/crates/repl/src/jupyter_settings.rs b/crates/repl/src/jupyter_settings.rs
index 8b00e0f757..c3bfd2079d 100644
--- a/crates/repl/src/jupyter_settings.rs
+++ b/crates/repl/src/jupyter_settings.rs
@@ -4,9 +4,9 @@ use editor::EditorSettings;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, SettingsUi)]
 pub struct JupyterSettings {
     pub kernel_selections: HashMap<String, String>,
 }
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index 892d4dea8b..8768b40736 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -31,6 +31,7 @@ schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings_ui_macros.workspace = true
 serde_json_lenient.workspace = true
 smallvec.workspace = true
 tree-sitter-json.workspace = true
diff --git a/crates/settings/src/base_keymap_setting.rs b/crates/settings/src/base_keymap_setting.rs
index 91dda03d00..087f25185a 100644
--- a/crates/settings/src/base_keymap_setting.rs
+++ b/crates/settings/src/base_keymap_setting.rs
@@ -1,13 +1,17 @@
 use std::fmt::{Display, Formatter};
 
-use crate::{Settings, SettingsSources, VsCodeSettings};
+use crate as settings;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsSources, VsCodeSettings};
+use settings_ui_macros::SettingsUi;
 
 /// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
 ///
 /// Default: VSCode
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default)]
+#[derive(
+    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default, SettingsUi,
+)]
 pub enum BaseKeymap {
     #[default]
     VSCode,
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index a071733315..983cd31dd3 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -4,6 +4,7 @@ mod keymap_file;
 mod settings_file;
 mod settings_json;
 mod settings_store;
+mod settings_ui;
 mod vscode_import;
 
 use gpui::{App, Global};
@@ -23,6 +24,9 @@ pub use settings_store::{
     InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation, SettingsSources,
     SettingsStore,
 };
+pub use settings_ui::*;
+// Re-export the derive macro
+pub use settings_ui_macros::SettingsUi;
 pub use vscode_import::{VsCodeSettings, VsCodeSettingsSource};
 
 #[derive(Clone, Debug, PartialEq)]
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index f112ec811d..b916df6e5c 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -87,9 +87,9 @@ pub fn update_value_in_json_text<'a>(
 }
 
 /// * `replace_key` - When an exact key match according to `key_path` is found, replace the key with `replace_key` if `Some`.
-fn replace_value_in_json_text(
+pub fn replace_value_in_json_text<T: AsRef<str>>(
     text: &str,
-    key_path: &[&str],
+    key_path: &[T],
     tab_size: usize,
     new_value: Option<&Value>,
     replace_key: Option<&str>,
@@ -141,7 +141,7 @@ fn replace_value_in_json_text(
         let found_key = text
             .get(key_range.clone())
             .map(|key_text| {
-                depth < key_path.len() && key_text == format!("\"{}\"", key_path[depth])
+                depth < key_path.len() && key_text == format!("\"{}\"", key_path[depth].as_ref())
             })
             .unwrap_or(false);
 
@@ -226,13 +226,13 @@ fn replace_value_in_json_text(
         }
     } else {
         // We have key paths, construct the sub objects
-        let new_key = key_path[depth];
+        let new_key = key_path[depth].as_ref();
 
         // We don't have the key, construct the nested objects
         let mut new_value =
             serde_json::to_value(new_value.unwrap_or(&serde_json::Value::Null)).unwrap();
         for key in key_path[(depth + 1)..].iter().rev() {
-            new_value = serde_json::json!({ key.to_string(): new_value });
+            new_value = serde_json::json!({ key.as_ref().to_string(): new_value });
         }
 
         if let Some(first_key_start) = first_key_start {
@@ -465,7 +465,7 @@ pub fn append_top_level_array_value_in_json_text(
     }
 
     let (mut replace_range, mut replace_value) =
-        replace_value_in_json_text("", &[], tab_size, Some(new_value), None);
+        replace_value_in_json_text::<&str>("", &[], tab_size, Some(new_value), None);
 
     replace_range.start = close_bracket_start;
     replace_range.end = close_bracket_start;
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index fbd0f75aef..09ac6f9766 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -7,7 +7,7 @@ use futures::{
     channel::{mpsc, oneshot},
     future::LocalBoxFuture,
 };
-use gpui::{App, AsyncApp, BorrowAppContext, Global, Task, UpdateGlobal};
+use gpui::{App, AsyncApp, BorrowAppContext, Global, SharedString, Task, UpdateGlobal};
 
 use paths::{EDITORCONFIG_NAME, local_settings_file_relative_path, task_file_name};
 use schemars::JsonSchema;
@@ -31,14 +31,15 @@ use util::{
 pub type EditorconfigProperties = ec4rs::Properties;
 
 use crate::{
-    ActiveSettingsProfileName, ParameterizedJsonSchema, SettingsJsonSchemaParams, VsCodeSettings,
-    WorktreeId, parse_json_with_comments, update_value_in_json_text,
+    ActiveSettingsProfileName, ParameterizedJsonSchema, SettingsJsonSchemaParams, SettingsUiEntry,
+    VsCodeSettings, WorktreeId, parse_json_with_comments, replace_value_in_json_text,
+    settings_ui::SettingsUi, update_value_in_json_text,
 };
 
 /// A value that can be defined as a user setting.
 ///
 /// Settings can be loaded from a combination of multiple JSON files.
-pub trait Settings: 'static + Send + Sync {
+pub trait Settings: SettingsUi + 'static + Send + Sync {
     /// The name of a key within the JSON file from which this setting should
     /// be deserialized. If this is `None`, then the setting will be deserialized
     /// from the root object.
@@ -284,6 +285,7 @@ trait AnySettingValue: 'static + Send + Sync {
         text: &mut String,
         edits: &mut Vec<(Range<usize>, String)>,
     );
+    fn settings_ui_item(&self) -> SettingsUiEntry;
 }
 
 struct DeserializedSetting(Box<dyn Any>);
@@ -480,6 +482,11 @@ impl SettingsStore {
         self.raw_global_settings.as_ref()
     }
 
+    /// Access the raw JSON value of the default settings.
+    pub fn raw_default_settings(&self) -> &Value {
+        &self.raw_default_settings
+    }
+
     #[cfg(any(test, feature = "test-support"))]
     pub fn test(cx: &mut App) -> Self {
         let mut this = Self::new(cx);
@@ -532,49 +539,10 @@ impl SettingsStore {
         }
     }
 
-    pub fn update_settings_file<T: Settings>(
+    fn update_settings_file_inner(
         &self,
         fs: Arc<dyn Fs>,
-        update: impl 'static + Send + FnOnce(&mut T::FileContent, &App),
-    ) {
-        self.setting_file_updates_tx
-            .unbounded_send(Box::new(move |cx: AsyncApp| {
-                async move {
-                    let old_text = Self::load_settings(&fs).await?;
-                    let new_text = cx.read_global(|store: &SettingsStore, cx| {
-                        store.new_text_for_update::<T>(old_text, |content| update(content, cx))
-                    })?;
-                    let settings_path = paths::settings_file().as_path();
-                    if fs.is_file(settings_path).await {
-                        let resolved_path =
-                            fs.canonicalize(settings_path).await.with_context(|| {
-                                format!("Failed to canonicalize settings path {:?}", settings_path)
-                            })?;
-
-                        fs.atomic_write(resolved_path.clone(), new_text)
-                            .await
-                            .with_context(|| {
-                                format!("Failed to write settings to file {:?}", resolved_path)
-                            })?;
-                    } else {
-                        fs.atomic_write(settings_path.to_path_buf(), new_text)
-                            .await
-                            .with_context(|| {
-                                format!("Failed to write settings to file {:?}", settings_path)
-                            })?;
-                    }
-
-                    anyhow::Ok(())
-                }
-                .boxed_local()
-            }))
-            .ok();
-    }
-
-    pub fn import_vscode_settings(
-        &self,
-        fs: Arc<dyn Fs>,
-        vscode_settings: VsCodeSettings,
+        update: impl 'static + Send + FnOnce(String, AsyncApp) -> Result<String>,
     ) -> oneshot::Receiver<Result<()>> {
         let (tx, rx) = oneshot::channel::<Result<()>>();
         self.setting_file_updates_tx
@@ -582,9 +550,7 @@ impl SettingsStore {
                 async move {
                     let res = async move {
                         let old_text = Self::load_settings(&fs).await?;
-                        let new_text = cx.read_global(|store: &SettingsStore, _cx| {
-                            store.get_vscode_edits(old_text, &vscode_settings)
-                        })?;
+                        let new_text = update(old_text, cx)?;
                         let settings_path = paths::settings_file().as_path();
                         if fs.is_file(settings_path).await {
                             let resolved_path =
@@ -607,7 +573,6 @@ impl SettingsStore {
                                     format!("Failed to write settings to file {:?}", settings_path)
                                 })?;
                         }
-
                         anyhow::Ok(())
                     }
                     .await;
@@ -622,9 +587,67 @@ impl SettingsStore {
                 }
                 .boxed_local()
             }))
-            .ok();
+            .map_err(|err| anyhow::format_err!("Failed to update settings file: {}", err))
+            .log_with_level(log::Level::Warn);
+        return rx;
+    }
 
-        rx
+    pub fn update_settings_file_at_path(
+        &self,
+        fs: Arc<dyn Fs>,
+        path: &[&str],
+        new_value: serde_json::Value,
+    ) -> oneshot::Receiver<Result<()>> {
+        let key_path = path
+            .into_iter()
+            .cloned()
+            .map(SharedString::new)
+            .collect::<Vec<_>>();
+        let update = move |mut old_text: String, cx: AsyncApp| {
+            cx.read_global(|store: &SettingsStore, _cx| {
+                // todo(settings_ui) use `update_value_in_json_text` for merging new and old objects with comment preservation, needs old value though...
+                let (range, replacement) = replace_value_in_json_text(
+                    &old_text,
+                    key_path.as_slice(),
+                    store.json_tab_size(),
+                    Some(&new_value),
+                    None,
+                );
+                old_text.replace_range(range, &replacement);
+                old_text
+            })
+        };
+        self.update_settings_file_inner(fs, update)
+    }
+
+    pub fn update_settings_file<T: Settings>(
+        &self,
+        fs: Arc<dyn Fs>,
+        update: impl 'static + Send + FnOnce(&mut T::FileContent, &App),
+    ) {
+        _ = self.update_settings_file_inner(fs, move |old_text: String, cx: AsyncApp| {
+            cx.read_global(|store: &SettingsStore, cx| {
+                store.new_text_for_update::<T>(old_text, |content| update(content, cx))
+            })
+        });
+    }
+
+    pub fn import_vscode_settings(
+        &self,
+        fs: Arc<dyn Fs>,
+        vscode_settings: VsCodeSettings,
+    ) -> oneshot::Receiver<Result<()>> {
+        self.update_settings_file_inner(fs, move |old_text: String, cx: AsyncApp| {
+            cx.read_global(|store: &SettingsStore, _cx| {
+                store.get_vscode_edits(old_text, &vscode_settings)
+            })
+        })
+    }
+
+    pub fn settings_ui_items(&self) -> impl IntoIterator<Item = SettingsUiEntry> {
+        self.setting_values
+            .values()
+            .map(|item| item.settings_ui_item())
     }
 }
 
@@ -1520,6 +1543,10 @@ impl<T: Settings> AnySettingValue for SettingValue<T> {
             edits,
         );
     }
+
+    fn settings_ui_item(&self) -> SettingsUiEntry {
+        <T as SettingsUi>::settings_ui_entry()
+    }
 }
 
 #[cfg(test)]
@@ -1527,7 +1554,10 @@ mod tests {
     use crate::VsCodeSettingsSource;
 
     use super::*;
+    // This is so the SettingsUi macro can still work properly
+    use crate as settings;
     use serde_derive::Deserialize;
+    use settings_ui_macros::SettingsUi;
     use unindent::Unindent;
 
     #[gpui::test]
@@ -2070,14 +2100,14 @@ mod tests {
         pretty_assertions::assert_eq!(new, expected);
     }
 
-    #[derive(Debug, PartialEq, Deserialize)]
+    #[derive(Debug, PartialEq, Deserialize, SettingsUi)]
     struct UserSettings {
         name: String,
         age: u32,
         staff: bool,
     }
 
-    #[derive(Default, Clone, Serialize, Deserialize, JsonSchema)]
+    #[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
     struct UserSettingsContent {
         name: Option<String>,
         age: Option<u32>,
@@ -2097,7 +2127,7 @@ mod tests {
         }
     }
 
-    #[derive(Debug, Deserialize, PartialEq)]
+    #[derive(Debug, Deserialize, PartialEq, SettingsUi)]
     struct TurboSetting(bool);
 
     impl Settings for TurboSetting {
@@ -2111,7 +2141,7 @@ mod tests {
         fn import_from_vscode(_vscode: &VsCodeSettings, _current: &mut Self::FileContent) {}
     }
 
-    #[derive(Clone, Debug, PartialEq, Deserialize)]
+    #[derive(Clone, Debug, PartialEq, Deserialize, SettingsUi)]
     struct MultiKeySettings {
         #[serde(default)]
         key1: String,
@@ -2144,7 +2174,7 @@ mod tests {
         }
     }
 
-    #[derive(Debug, Deserialize)]
+    #[derive(Debug, Deserialize, SettingsUi)]
     struct JournalSettings {
         pub path: String,
         pub hour_format: HourFormat,
@@ -2245,7 +2275,7 @@ mod tests {
         );
     }
 
-    #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+    #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
     struct LanguageSettings {
         #[serde(default)]
         languages: HashMap<String, LanguageSettingEntry>,
diff --git a/crates/settings/src/settings_ui.rs b/crates/settings/src/settings_ui.rs
new file mode 100644
index 0000000000..8b30ebc9d5
--- /dev/null
+++ b/crates/settings/src/settings_ui.rs
@@ -0,0 +1,118 @@
+use anyhow::Context as _;
+use fs::Fs;
+use gpui::{AnyElement, App, AppContext as _, ReadGlobal as _, Window};
+use smallvec::SmallVec;
+
+use crate::SettingsStore;
+
+pub trait SettingsUi {
+    fn settings_ui_item() -> SettingsUiItem {
+        SettingsUiItem::None
+    }
+    fn settings_ui_entry() -> SettingsUiEntry;
+}
+
+pub struct SettingsUiEntry {
+    // todo(settings_ui): move this back here once there isn't a None variant
+    // pub path: &'static str,
+    // pub title: &'static str,
+    pub item: SettingsUiEntryVariant,
+}
+
+pub enum SettingsUiEntryVariant {
+    Group {
+        path: &'static str,
+        title: &'static str,
+        items: Vec<SettingsUiEntry>,
+    },
+    Item {
+        path: &'static str,
+        item: SettingsUiItemSingle,
+    },
+    // todo(settings_ui): remove
+    None,
+}
+
+pub enum SettingsUiItemSingle {
+    SwitchField,
+    NumericStepper,
+    ToggleGroup(&'static [&'static str]),
+    /// This should be used when toggle group size > 6
+    DropDown(&'static [&'static str]),
+    Custom(Box<dyn Fn(SettingsValue<serde_json::Value>, &mut Window, &mut App) -> AnyElement>),
+}
+
+pub struct SettingsValue<T> {
+    pub title: &'static str,
+    pub path: SmallVec<[&'static str; 1]>,
+    pub value: Option<T>,
+    pub default_value: T,
+}
+
+impl<T> SettingsValue<T> {
+    pub fn read(&self) -> &T {
+        match &self.value {
+            Some(value) => value,
+            None => &self.default_value,
+        }
+    }
+}
+
+impl SettingsValue<serde_json::Value> {
+    pub fn write_value(path: &SmallVec<[&'static str; 1]>, value: serde_json::Value, cx: &mut App) {
+        let settings_store = SettingsStore::global(cx);
+        let fs = <dyn Fs>::global(cx);
+
+        let rx = settings_store.update_settings_file_at_path(fs.clone(), path.as_slice(), value);
+        let path = path.clone();
+        cx.background_spawn(async move {
+            rx.await?
+                .with_context(|| format!("Failed to update setting at path `{:?}`", path.join(".")))
+        })
+        .detach_and_log_err(cx);
+    }
+}
+
+impl<T: serde::Serialize> SettingsValue<T> {
+    pub fn write(
+        path: &SmallVec<[&'static str; 1]>,
+        value: T,
+        cx: &mut App,
+    ) -> Result<(), serde_json::Error> {
+        SettingsValue::write_value(path, serde_json::to_value(value)?, cx);
+        Ok(())
+    }
+}
+
+pub enum SettingsUiItem {
+    Group {
+        title: &'static str,
+        items: Vec<SettingsUiEntry>,
+    },
+    Single(SettingsUiItemSingle),
+    None,
+}
+
+impl SettingsUi for bool {
+    fn settings_ui_item() -> SettingsUiItem {
+        SettingsUiItem::Single(SettingsUiItemSingle::SwitchField)
+    }
+
+    fn settings_ui_entry() -> SettingsUiEntry {
+        SettingsUiEntry {
+            item: SettingsUiEntryVariant::None,
+        }
+    }
+}
+
+impl SettingsUi for u64 {
+    fn settings_ui_item() -> SettingsUiItem {
+        SettingsUiItem::Single(SettingsUiItemSingle::NumericStepper)
+    }
+
+    fn settings_ui_entry() -> SettingsUiEntry {
+        SettingsUiEntry {
+            item: SettingsUiEntryVariant::None,
+        }
+    }
+}
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 4a48c18f7c..53fbf797c3 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -2,7 +2,7 @@ use anyhow::{Context as _, Result, anyhow};
 use fs::Fs;
 use paths::{cursor_settings_file_paths, vscode_settings_file_paths};
 use serde_json::{Map, Value};
-use std::{path::Path, rc::Rc, sync::Arc};
+use std::{path::Path, sync::Arc};
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub enum VsCodeSettingsSource {
@@ -21,7 +21,7 @@ impl std::fmt::Display for VsCodeSettingsSource {
 
 pub struct VsCodeSettings {
     pub source: VsCodeSettingsSource,
-    pub path: Rc<Path>,
+    pub path: Arc<Path>,
     content: Map<String, Value>,
 }
 
diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml
index 8a151359ec..7c2b81aee0 100644
--- a/crates/settings_ui/Cargo.toml
+++ b/crates/settings_ui/Cargo.toml
@@ -11,45 +11,26 @@ workspace = true
 [lib]
 path = "src/settings_ui.rs"
 
+[features]
+default = []
+
 [dependencies]
 anyhow.workspace = true
-collections.workspace = true
-command_palette.workspace = true
 command_palette_hooks.workspace = true
-component.workspace = true
-db.workspace = true
 editor.workspace = true
 feature_flags.workspace = true
-fs.workspace = true
-fuzzy.workspace = true
 gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-menu.workspace = true
-notifications.workspace = true
-paths.workspace = true
-project.workspace = true
-search.workspace = true
-serde.workspace = true
 serde_json.workspace = true
+serde.workspace = true
 settings.workspace = true
-telemetry.workspace = true
-tempfile.workspace = true
+smallvec.workspace = true
 theme.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter-rust.workspace = true
 ui.workspace = true
-ui_input.workspace = true
-util.workspace = true
-vim.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
-zed_actions.workspace = true
+workspace-hack.workspace = true
 
-[dev-dependencies]
-db = {"workspace"= true, "features" = ["test-support"]}
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
+# Uncomment other workspace dependencies as needed
+# assistant.workspace = true
+# client.workspace = true
+# project.workspace = true
+# settings.workspace = true
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 3022cc7142..ae03170a1a 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -1,20 +1,24 @@
 mod appearance_settings_controls;
 
 use std::any::TypeId;
+use std::ops::{Not, Range};
 
+use anyhow::Context as _;
 use command_palette_hooks::CommandPaletteFilter;
 use editor::EditorSettingsControls;
 use feature_flags::{FeatureFlag, FeatureFlagViewExt};
-use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, actions};
-use ui::prelude::*;
-use workspace::item::{Item, ItemEvent};
-use workspace::{Workspace, with_active_or_new_workspace};
+use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, actions};
+use settings::{SettingsStore, SettingsUiEntryVariant, SettingsUiItemSingle, SettingsValue};
+use smallvec::SmallVec;
+use ui::{NumericStepper, SwitchField, ToggleButtonGroup, ToggleButtonSimple, prelude::*};
+use workspace::{
+    Workspace,
+    item::{Item, ItemEvent},
+    with_active_or_new_workspace,
+};
 
 use crate::appearance_settings_controls::AppearanceSettingsControls;
 
-pub mod keybindings;
-pub mod ui_components;
-
 pub struct SettingsUiFeatureFlag;
 
 impl FeatureFlag for SettingsUiFeatureFlag {
@@ -75,18 +79,18 @@ pub fn init(cx: &mut App) {
         .detach();
     })
     .detach();
-
-    keybindings::init(cx);
 }
 
 pub struct SettingsPage {
     focus_handle: FocusHandle,
+    settings_tree: SettingsUiTree,
 }
 
 impl SettingsPage {
     pub fn new(_workspace: &Workspace, cx: &mut Context<Workspace>) -> Entity<Self> {
         cx.new(|cx| Self {
             focus_handle: cx.focus_handle(),
+            settings_tree: SettingsUiTree::new(cx),
         })
     }
 }
@@ -119,26 +123,472 @@ impl Item for SettingsPage {
     }
 }
 
-impl Render for SettingsPage {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .p_4()
-            .size_full()
-            .gap_4()
-            .child(Label::new("Settings").size(LabelSize::Large))
-            .child(
-                v_flex().gap_1().child(Label::new("Appearance")).child(
-                    v_flex()
-                        .elevation_2(cx)
-                        .child(AppearanceSettingsControls::new()),
-                ),
-            )
-            .child(
-                v_flex().gap_1().child(Label::new("Editor")).child(
-                    v_flex()
-                        .elevation_2(cx)
-                        .child(EditorSettingsControls::new()),
-                ),
-            )
+// We want to iterate over the side bar with root groups
+// - this is a loop over top level groups, and if any are expanded, recursively displaying their items
+// - Should be able to get all items from a group (flatten a group)
+// - Should be able to toggle/untoggle groups in UI (at least in sidebar)
+// - Search should be available
+//  - there should be an index of text -> item mappings, for using fuzzy::match
+//   - Do we want to show the parent groups when a item is matched?
+
+struct UIEntry {
+    title: &'static str,
+    path: &'static str,
+    _depth: usize,
+    // a
+    //  b     < a descendant range < a total descendant range
+    //    f   |                    |
+    //    g   |                    |
+    //  c     <                    |
+    //    d                        |
+    //    e                        <
+    descendant_range: Range<usize>,
+    total_descendant_range: Range<usize>,
+    next_sibling: Option<usize>,
+    // expanded: bool,
+    render: Option<SettingsUiItemSingle>,
+}
+
+struct SettingsUiTree {
+    root_entry_indices: Vec<usize>,
+    entries: Vec<UIEntry>,
+    active_entry_index: usize,
+}
+
+fn build_tree_item(
+    tree: &mut Vec<UIEntry>,
+    group: SettingsUiEntryVariant,
+    depth: usize,
+    prev_index: Option<usize>,
+) {
+    let index = tree.len();
+    tree.push(UIEntry {
+        title: "",
+        path: "",
+        _depth: depth,
+        descendant_range: index + 1..index + 1,
+        total_descendant_range: index + 1..index + 1,
+        render: None,
+        next_sibling: None,
+    });
+    if let Some(prev_index) = prev_index {
+        tree[prev_index].next_sibling = Some(index);
+    }
+    match group {
+        SettingsUiEntryVariant::Group {
+            path,
+            title,
+            items: group_items,
+        } => {
+            tree[index].path = path;
+            tree[index].title = title;
+            for group_item in group_items {
+                let prev_index = tree[index]
+                    .descendant_range
+                    .is_empty()
+                    .not()
+                    .then_some(tree[index].descendant_range.end - 1);
+                tree[index].descendant_range.end = tree.len() + 1;
+                build_tree_item(tree, group_item.item, depth + 1, prev_index);
+                tree[index].total_descendant_range.end = tree.len();
+            }
+        }
+        SettingsUiEntryVariant::Item { path, item } => {
+            tree[index].path = path;
+            // todo(settings_ui) create title from path in macro, and use here
+            tree[index].title = path;
+            tree[index].render = Some(item);
+        }
+        SettingsUiEntryVariant::None => {
+            return;
+        }
     }
 }
+
+impl SettingsUiTree {
+    fn new(cx: &App) -> Self {
+        let settings_store = SettingsStore::global(cx);
+        let mut tree = vec![];
+        let mut root_entry_indices = vec![];
+        for item in settings_store.settings_ui_items() {
+            if matches!(item.item, SettingsUiEntryVariant::None) {
+                continue;
+            }
+
+            assert!(
+                matches!(item.item, SettingsUiEntryVariant::Group { .. }),
+                "top level items must be groups: {:?}",
+                match item.item {
+                    SettingsUiEntryVariant::Item { path, .. } => path,
+                    _ => unreachable!(),
+                }
+            );
+            let prev_root_entry_index = root_entry_indices.last().copied();
+            root_entry_indices.push(tree.len());
+            build_tree_item(&mut tree, item.item, 0, prev_root_entry_index);
+        }
+
+        root_entry_indices.sort_by_key(|i| tree[*i].title);
+
+        let active_entry_index = root_entry_indices[0];
+        Self {
+            entries: tree,
+            root_entry_indices,
+            active_entry_index,
+        }
+    }
+}
+
+fn render_nav(tree: &SettingsUiTree, _window: &mut Window, cx: &mut Context<SettingsPage>) -> Div {
+    let mut nav = v_flex().p_4().gap_2();
+    for &index in &tree.root_entry_indices {
+        nav = nav.child(
+            div()
+                .id(index)
+                .on_click(cx.listener(move |settings, _, _, _| {
+                    settings.settings_tree.active_entry_index = index;
+                }))
+                .child(
+                    Label::new(SharedString::new_static(tree.entries[index].title))
+                        .size(LabelSize::Large)
+                        .when(tree.active_entry_index == index, |this| {
+                            this.color(Color::Selected)
+                        }),
+                ),
+        );
+    }
+    nav
+}
+
+fn render_content(
+    tree: &SettingsUiTree,
+    window: &mut Window,
+    cx: &mut Context<SettingsPage>,
+) -> impl IntoElement {
+    let Some(entry) = tree.entries.get(tree.active_entry_index) else {
+        return div()
+            .size_full()
+            .child(Label::new(SharedString::new_static("No settings found")).color(Color::Error));
+    };
+    let mut content = v_flex().size_full().gap_4();
+
+    let mut child_index = entry
+        .descendant_range
+        .is_empty()
+        .not()
+        .then_some(entry.descendant_range.start);
+    let mut path = smallvec::smallvec![entry.path];
+
+    while let Some(index) = child_index {
+        let child = &tree.entries[index];
+        child_index = child.next_sibling;
+        if child.render.is_none() {
+            // todo(settings_ui): subgroups?
+            continue;
+        }
+        path.push(child.path);
+        let settings_value = settings_value_from_settings_and_path(
+            path.clone(),
+            // PERF: how to structure this better? There feels like there's a way to avoid the clone
+            // and every value lookup
+            SettingsStore::global(cx).raw_user_settings(),
+            SettingsStore::global(cx).raw_default_settings(),
+        );
+        content = content.child(
+            div()
+                .child(
+                    Label::new(SharedString::new_static(tree.entries[index].title))
+                        .size(LabelSize::Large)
+                        .when(tree.active_entry_index == index, |this| {
+                            this.color(Color::Selected)
+                        }),
+                )
+                .child(render_item_single(
+                    settings_value,
+                    child.render.as_ref().unwrap(),
+                    window,
+                    cx,
+                )),
+        );
+
+        path.pop();
+    }
+
+    return content;
+}
+
+impl Render for SettingsPage {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .grid()
+            .grid_cols(16)
+            .p_4()
+            .bg(cx.theme().colors().editor_background)
+            .size_full()
+            .child(
+                div()
+                    .col_span(2)
+                    .h_full()
+                    .child(render_nav(&self.settings_tree, window, cx)),
+            )
+            .child(div().col_span(4).h_full().child(render_content(
+                &self.settings_tree,
+                window,
+                cx,
+            )))
+    }
+}
+
+// todo(settings_ui): remove, only here as inspiration
+#[allow(dead_code)]
+fn render_old_appearance_settings(cx: &mut App) -> impl IntoElement {
+    v_flex()
+        .p_4()
+        .size_full()
+        .gap_4()
+        .child(Label::new("Settings").size(LabelSize::Large))
+        .child(
+            v_flex().gap_1().child(Label::new("Appearance")).child(
+                v_flex()
+                    .elevation_2(cx)
+                    .child(AppearanceSettingsControls::new()),
+            ),
+        )
+        .child(
+            v_flex().gap_1().child(Label::new("Editor")).child(
+                v_flex()
+                    .elevation_2(cx)
+                    .child(EditorSettingsControls::new()),
+            ),
+        )
+}
+
+fn element_id_from_path(path: &[&'static str]) -> ElementId {
+    if path.len() == 0 {
+        panic!("Path length must not be zero");
+    } else if path.len() == 1 {
+        ElementId::Name(SharedString::new_static(path[0]))
+    } else {
+        ElementId::from((
+            ElementId::from(SharedString::new_static(path[path.len() - 2])),
+            SharedString::new_static(path[path.len() - 1]),
+        ))
+    }
+}
+
+fn render_item_single(
+    settings_value: SettingsValue<serde_json::Value>,
+    item: &SettingsUiItemSingle,
+    window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    match item {
+        SettingsUiItemSingle::Custom(_) => div()
+            .child(format!("Item: {}", settings_value.path.join(".")))
+            .into_any_element(),
+        SettingsUiItemSingle::SwitchField => {
+            render_any_item(settings_value, render_switch_field, window, cx)
+        }
+        SettingsUiItemSingle::NumericStepper => {
+            render_any_item(settings_value, render_numeric_stepper, window, cx)
+        }
+        SettingsUiItemSingle::ToggleGroup(variants) => {
+            render_toggle_button_group(settings_value, variants, window, cx)
+        }
+        SettingsUiItemSingle::DropDown(_) => {
+            unimplemented!("This")
+        }
+    }
+}
+
+fn read_settings_value_from_path<'a>(
+    settings_contents: &'a serde_json::Value,
+    path: &[&'static str],
+) -> Option<&'a serde_json::Value> {
+    let Some((key, remaining)) = path.split_first() else {
+        return Some(settings_contents);
+    };
+    let Some(value) = settings_contents.get(key) else {
+        return None;
+    };
+
+    read_settings_value_from_path(value, remaining)
+}
+
+fn downcast_any_item<T: serde::de::DeserializeOwned>(
+    settings_value: SettingsValue<serde_json::Value>,
+) -> SettingsValue<T> {
+    let value = settings_value
+        .value
+        .map(|value| serde_json::from_value::<T>(value).expect("value is not a T"));
+    // todo(settings_ui) Create test that constructs UI tree, and asserts that all elements have default values
+    let default_value = serde_json::from_value::<T>(settings_value.default_value)
+        .expect("default value is not an Option<T>");
+    let deserialized_setting_value = SettingsValue {
+        title: settings_value.title,
+        path: settings_value.path,
+        value,
+        default_value,
+    };
+    deserialized_setting_value
+}
+
+fn render_any_item<T: serde::de::DeserializeOwned>(
+    settings_value: SettingsValue<serde_json::Value>,
+    render_fn: impl Fn(SettingsValue<T>, &mut Window, &mut App) -> AnyElement + 'static,
+    window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    let deserialized_setting_value = downcast_any_item(settings_value);
+    render_fn(deserialized_setting_value, window, cx)
+}
+
+fn render_numeric_stepper(
+    value: SettingsValue<u64>,
+    _window: &mut Window,
+    _cx: &mut App,
+) -> AnyElement {
+    let id = element_id_from_path(&value.path);
+    let path = value.path.clone();
+    let num = value.value.unwrap_or_else(|| value.default_value);
+
+    NumericStepper::new(
+        id,
+        num.to_string(),
+        {
+            let path = value.path.clone();
+            move |_, _, cx| {
+                let Some(number) = serde_json::Number::from_u128(num.saturating_sub(1) as u128)
+                else {
+                    return;
+                };
+                let new_value = serde_json::Value::Number(number);
+                SettingsValue::write_value(&path, new_value, cx);
+            }
+        },
+        move |_, _, cx| {
+            let Some(number) = serde_json::Number::from_u128(num.saturating_add(1) as u128) else {
+                return;
+            };
+
+            let new_value = serde_json::Value::Number(number);
+
+            SettingsValue::write_value(&path, new_value, cx);
+        },
+    )
+    .style(ui::NumericStepperStyle::Outlined)
+    .into_any_element()
+}
+
+fn render_switch_field(
+    value: SettingsValue<bool>,
+    _window: &mut Window,
+    _cx: &mut App,
+) -> AnyElement {
+    let id = element_id_from_path(&value.path);
+    let path = value.path.clone();
+    SwitchField::new(
+        id,
+        SharedString::new_static(value.title),
+        None,
+        match value.read() {
+            true => ToggleState::Selected,
+            false => ToggleState::Unselected,
+        },
+        move |toggle_state, _, cx| {
+            let new_value = serde_json::Value::Bool(match toggle_state {
+                ToggleState::Indeterminate => {
+                    return;
+                }
+                ToggleState::Selected => true,
+                ToggleState::Unselected => false,
+            });
+
+            SettingsValue::write_value(&path, new_value, cx);
+        },
+    )
+    .into_any_element()
+}
+
+fn render_toggle_button_group(
+    value: SettingsValue<serde_json::Value>,
+    variants: &'static [&'static str],
+    _: &mut Window,
+    _: &mut App,
+) -> AnyElement {
+    let value = downcast_any_item::<String>(value);
+
+    fn make_toggle_group<const LEN: usize>(
+        group_name: &'static str,
+        value: SettingsValue<String>,
+        variants: &'static [&'static str],
+    ) -> AnyElement {
+        let mut variants_array: [&'static str; LEN] = ["default"; LEN];
+        variants_array.copy_from_slice(variants);
+        let active_value = value.read();
+
+        let selected_idx = variants_array
+            .iter()
+            .enumerate()
+            .find_map(|(idx, variant)| {
+                if variant == &active_value {
+                    Some(idx)
+                } else {
+                    None
+                }
+            });
+
+        ToggleButtonGroup::single_row(
+            group_name,
+            variants_array.map(|variant| {
+                let path = value.path.clone();
+                ToggleButtonSimple::new(variant, move |_, _, cx| {
+                    SettingsValue::write_value(
+                        &path,
+                        serde_json::Value::String(variant.to_string()),
+                        cx,
+                    );
+                })
+            }),
+        )
+        .when_some(selected_idx, |this, ix| this.selected_index(ix))
+        .style(ui::ToggleButtonGroupStyle::Filled)
+        .into_any_element()
+    }
+
+    macro_rules! templ_toggl_with_const_param {
+        ($len:expr) => {
+            if variants.len() == $len {
+                return make_toggle_group::<$len>(value.title, value, variants);
+            }
+        };
+    }
+    templ_toggl_with_const_param!(1);
+    templ_toggl_with_const_param!(2);
+    templ_toggl_with_const_param!(3);
+    templ_toggl_with_const_param!(4);
+    templ_toggl_with_const_param!(5);
+    templ_toggl_with_const_param!(6);
+    unreachable!("Too many variants");
+}
+
+fn settings_value_from_settings_and_path(
+    path: SmallVec<[&'static str; 1]>,
+    user_settings: &serde_json::Value,
+    default_settings: &serde_json::Value,
+) -> SettingsValue<serde_json::Value> {
+    let default_value = read_settings_value_from_path(default_settings, &path)
+        .with_context(|| format!("No default value for item at path {:?}", path.join(".")))
+        .expect("Default value set for item")
+        .clone();
+
+    let value = read_settings_value_from_path(user_settings, &path).cloned();
+    let settings_value = SettingsValue {
+        default_value,
+        value,
+        path: path.clone(),
+        // todo(settings_ui) title for items
+        title: path.last().expect("path non empty"),
+    };
+    return settings_value;
+}
diff --git a/crates/settings_ui_macros/Cargo.toml b/crates/settings_ui_macros/Cargo.toml
new file mode 100644
index 0000000000..e242e7546d
--- /dev/null
+++ b/crates/settings_ui_macros/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "settings_ui_macros"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lib]
+path = "src/settings_ui_macros.rs"
+proc-macro = true
+
+[lints]
+workspace = true
+
+[features]
+default = []
+
+[dependencies]
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/settings_ui_macros/LICENSE-GPL b/crates/settings_ui_macros/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/settings_ui_macros/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
new file mode 100644
index 0000000000..6e37745a7c
--- /dev/null
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -0,0 +1,201 @@
+use proc_macro2::TokenStream;
+use quote::{ToTokens, quote};
+use syn::{Data, DeriveInput, LitStr, Token, parse_macro_input};
+
+/// Derive macro for the `SettingsUi` marker trait.
+///
+/// This macro automatically implements the `SettingsUi` trait for the annotated type.
+/// The `SettingsUi` trait is a marker trait used to indicate that a type can be
+/// displayed in the settings UI.
+///
+/// # Example
+///
+/// ```
+/// use settings::SettingsUi;
+/// use settings_ui_macros::SettingsUi;
+///
+/// #[derive(SettingsUi)]
+/// #[settings_ui(group = "Standard")]
+/// struct MySettings {
+///     enabled: bool,
+///     count: usize,
+/// }
+/// ```
+#[proc_macro_derive(SettingsUi, attributes(settings_ui))]
+pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+    let name = &input.ident;
+
+    // Handle generic parameters if present
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let mut group_name = Option::<String>::None;
+    let mut path_name = Option::<String>::None;
+
+    for attr in &input.attrs {
+        if attr.path().is_ident("settings_ui") {
+            attr.parse_nested_meta(|meta| {
+                if meta.path.is_ident("group") {
+                    if group_name.is_some() {
+                        return Err(meta.error("Only one 'group' path can be specified"));
+                    }
+                    meta.input.parse::<Token![=]>()?;
+                    let lit: LitStr = meta.input.parse()?;
+                    group_name = Some(lit.value());
+                } else if meta.path.is_ident("path") {
+                    // todo(settings_ui) try get KEY from Settings if possible, and once we do,
+                    // if can get key from settings, throw error if path also passed
+                    if path_name.is_some() {
+                        return Err(meta.error("Only one 'path' can be specified"));
+                    }
+                    meta.input.parse::<Token![=]>()?;
+                    let lit: LitStr = meta.input.parse()?;
+                    path_name = Some(lit.value());
+                }
+                Ok(())
+            })
+            .unwrap_or_else(|e| panic!("in #[settings_ui] attribute: {}", e));
+        }
+    }
+
+    if path_name.is_none() && group_name.is_some() {
+        // todo(settings_ui) derive path from settings
+        panic!("path is required when group is specified");
+    }
+
+    let ui_render_fn_body = generate_ui_item_body(group_name.as_ref(), path_name.as_ref(), &input);
+
+    let settings_ui_item_fn_body = path_name
+        .as_ref()
+        .map(|path_name| map_ui_item_to_render(path_name, quote! { Self }))
+        .unwrap_or(quote! {
+            settings::SettingsUiEntry {
+                item: settings::SettingsUiEntryVariant::None
+            }
+        });
+
+    let expanded = quote! {
+        impl #impl_generics settings::SettingsUi for #name #ty_generics #where_clause {
+            fn settings_ui_item() -> settings::SettingsUiItem {
+                #ui_render_fn_body
+            }
+
+            fn settings_ui_entry() -> settings::SettingsUiEntry {
+                #settings_ui_item_fn_body
+            }
+        }
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}
+
+fn map_ui_item_to_render(path: &str, ty: TokenStream) -> TokenStream {
+    quote! {
+        settings::SettingsUiEntry {
+            item: match #ty::settings_ui_item() {
+                settings::SettingsUiItem::Group{title, items} => settings::SettingsUiEntryVariant::Group {
+                    title,
+                    path: #path,
+                    items,
+                },
+                settings::SettingsUiItem::Single(item) => settings::SettingsUiEntryVariant::Item {
+                    path: #path,
+                    item,
+                },
+                settings::SettingsUiItem::None => settings::SettingsUiEntryVariant::None,
+            }
+        }
+    }
+}
+
+fn generate_ui_item_body(
+    group_name: Option<&String>,
+    path_name: Option<&String>,
+    input: &syn::DeriveInput,
+) -> TokenStream {
+    match (group_name, path_name, &input.data) {
+        (_, _, Data::Union(_)) => unimplemented!("Derive SettingsUi for Unions"),
+        (None, None, Data::Struct(_)) => quote! {
+            settings::SettingsUiItem::None
+        },
+        (Some(_), None, Data::Struct(_)) => quote! {
+            settings::SettingsUiItem::None
+        },
+        (None, Some(_), Data::Struct(_)) => quote! {
+            settings::SettingsUiItem::None
+        },
+        (Some(group_name), _, Data::Struct(data_struct)) => {
+            let fields = data_struct
+                .fields
+                .iter()
+                .filter(|field| {
+                    !field.attrs.iter().any(|attr| {
+                        let mut has_skip = false;
+                        if attr.path().is_ident("settings_ui") {
+                            let _ = attr.parse_nested_meta(|meta| {
+                                if meta.path.is_ident("skip") {
+                                    has_skip = true;
+                                }
+                                Ok(())
+                            });
+                        }
+
+                        has_skip
+                    })
+                })
+                .map(|field| {
+                    (
+                        field.ident.clone().expect("tuple fields").to_string(),
+                        field.ty.to_token_stream(),
+                    )
+                })
+                .map(|(name, ty)| map_ui_item_to_render(&name, ty));
+
+            quote! {
+                settings::SettingsUiItem::Group{ title: #group_name, items: vec![#(#fields),*] }
+            }
+        }
+        (None, _, Data::Enum(data_enum)) => {
+            let mut lowercase = false;
+            for attr in &input.attrs {
+                if attr.path().is_ident("serde") {
+                    attr.parse_nested_meta(|meta| {
+                        if meta.path.is_ident("rename_all") {
+                            meta.input.parse::<Token![=]>()?;
+                            let lit = meta.input.parse::<LitStr>()?.value();
+                            // todo(settings_ui) snake case
+                            lowercase = lit == "lowercase" || lit == "snake_case";
+                        }
+                        Ok(())
+                    })
+                    .ok();
+                }
+            }
+            let length = data_enum.variants.len();
+
+            let variants = data_enum.variants.iter().map(|variant| {
+                let string = variant.ident.clone().to_string();
+
+                if lowercase {
+                    string.to_lowercase()
+                } else {
+                    string
+                }
+            });
+
+            if length > 6 {
+                quote! {
+                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown(&[#(#variants),*]))
+                }
+            } else {
+                quote! {
+                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup(&[#(#variants),*]))
+                }
+            }
+        }
+        // todo(settings_ui) discriminated unions
+        (_, _, Data::Enum(_)) => quote! {
+            settings::SettingsUiItem::None
+        },
+    }
+}
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 635e3e2ca5..01f2d85f09 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -6,7 +6,7 @@ use gpui::{AbsoluteLength, App, FontFallbacks, FontFeatures, FontWeight, Pixels,
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
 
-use settings::SettingsSources;
+use settings::{SettingsSources, SettingsUi};
 use std::path::PathBuf;
 use task::Shell;
 use theme::FontFamilyName;
@@ -24,7 +24,7 @@ pub struct Toolbar {
     pub breadcrumbs: bool,
 }
 
-#[derive(Clone, Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize, SettingsUi)]
 pub struct TerminalSettings {
     pub shell: Shell,
     pub working_directory: WorkingDirectory,
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index df147cfe92..61b41eba06 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -13,7 +13,7 @@ use gpui::{
 use refineable::Refineable;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
-use settings::{ParameterizedJsonSchema, Settings, SettingsSources};
+use settings::{ParameterizedJsonSchema, Settings, SettingsSources, SettingsUi};
 use std::sync::Arc;
 use util::ResultExt as _;
 use util::schemars::replace_subschema;
@@ -87,7 +87,7 @@ impl From<UiDensity> for String {
 }
 
 /// Customizable settings for the UI and theme system.
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, SettingsUi)]
 pub struct ThemeSettings {
     /// The UI font size. Determines the size of text in the UI,
     /// as well as the size of a [gpui::Rems] unit.
diff --git a/crates/title_bar/Cargo.toml b/crates/title_bar/Cargo.toml
index cf178e2850..f60ac7c301 100644
--- a/crates/title_bar/Cargo.toml
+++ b/crates/title_bar/Cargo.toml
@@ -42,7 +42,7 @@ rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
-settings_ui.workspace = true
+keymap_editor.workspace = true
 smallvec.workspace = true
 story = { workspace = true, optional = true }
 telemetry.workspace = true
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index ac5e9201b3..075b9fcd86 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -29,10 +29,10 @@ use gpui::{
     IntoElement, MouseButton, ParentElement, Render, StatefulInteractiveElement, Styled,
     Subscription, WeakEntity, Window, actions, div,
 };
+use keymap_editor;
 use onboarding_banner::OnboardingBanner;
 use project::Project;
 use settings::Settings as _;
-use settings_ui::keybindings;
 use std::sync::Arc;
 use theme::ActiveTheme;
 use title_bar_settings::TitleBarSettings;
@@ -684,7 +684,7 @@ impl TitleBar {
                             "Settings Profiles",
                             zed_actions::settings_profile_selector::Toggle.boxed_clone(),
                         )
-                        .action("Key Bindings", Box::new(keybindings::OpenKeymapEditor))
+                        .action("Key Bindings", Box::new(keymap_editor::OpenKeymapEditor))
                         .action(
                             "Themes…",
                             zed_actions::theme_selector::Toggle::default().boxed_clone(),
@@ -732,7 +732,7 @@ impl TitleBar {
                                 "Settings Profiles",
                                 zed_actions::settings_profile_selector::Toggle.boxed_clone(),
                             )
-                            .action("Key Bindings", Box::new(keybindings::OpenKeymapEditor))
+                            .action("Key Bindings", Box::new(keymap_editor::OpenKeymapEditor))
                             .action(
                                 "Themes…",
                                 zed_actions::theme_selector::Toggle::default().boxed_clone(),
diff --git a/crates/title_bar/src/title_bar_settings.rs b/crates/title_bar/src/title_bar_settings.rs
index a98e984d80..29d74c8590 100644
--- a/crates/title_bar/src/title_bar_settings.rs
+++ b/crates/title_bar/src/title_bar_settings.rs
@@ -1,9 +1,10 @@
 use db::anyhow;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Copy, Clone, Deserialize, Debug)]
+#[derive(Copy, Clone, Deserialize, Debug, SettingsUi)]
+#[settings_ui(group = "Title Bar", path = "title_bar")]
 pub struct TitleBarSettings {
     pub show_branch_icon: bool,
     pub show_onboarding_banner: bool,
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 9da01e6f44..a5cd909d5b 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -39,7 +39,7 @@ use object::Object;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde_derive::Serialize;
-use settings::{Settings, SettingsSources, SettingsStore, update_settings_file};
+use settings::{Settings, SettingsSources, SettingsStore, SettingsUi, update_settings_file};
 use state::{Mode, Operator, RecordedSelection, SearchState, VimGlobals};
 use std::{mem, ops::Range, sync::Arc};
 use surrounds::SurroundsType;
@@ -1774,7 +1774,7 @@ struct CursorShapeSettings {
     pub insert: Option<CursorShape>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 struct VimSettings {
     pub default_mode: Mode,
     pub toggle_relative_line_numbers: bool,
diff --git a/crates/vim_mode_setting/src/vim_mode_setting.rs b/crates/vim_mode_setting/src/vim_mode_setting.rs
index 6f60d3f21f..7fb39ef4f6 100644
--- a/crates/vim_mode_setting/src/vim_mode_setting.rs
+++ b/crates/vim_mode_setting/src/vim_mode_setting.rs
@@ -6,7 +6,7 @@
 
 use anyhow::Result;
 use gpui::App;
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
 /// Initializes the `vim_mode_setting` crate.
 pub fn init(cx: &mut App) {
@@ -17,6 +17,7 @@ pub fn init(cx: &mut App) {
 /// Whether or not to enable Vim mode.
 ///
 /// Default: false
+#[derive(SettingsUi)]
 pub struct VimModeSetting(pub bool);
 
 impl Settings for VimModeSetting {
@@ -43,6 +44,7 @@ impl Settings for VimModeSetting {
 /// Whether or not to enable Helix mode.
 ///
 /// Default: false
+#[derive(SettingsUi)]
 pub struct HelixModeSetting(pub bool);
 
 impl Settings for HelixModeSetting {
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index db91bd82b9..a513f8c931 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -17,7 +17,7 @@ use gpui::{
 use project::{Project, ProjectEntryId, ProjectPath};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsLocation, SettingsSources};
+use settings::{Settings, SettingsLocation, SettingsSources, SettingsUi};
 use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId},
@@ -49,7 +49,7 @@ impl Default for SaveOptions {
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 pub struct ItemSettings {
     pub git_status: bool,
     pub close_position: ClosePosition,
@@ -59,7 +59,7 @@ pub struct ItemSettings {
     pub show_close_button: ShowCloseButton,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 pub struct PreviewTabsSettings {
     pub enabled: bool,
     pub enable_preview_from_file_finder: bool,
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 0d7fb9bb9c..419e33e544 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -6,9 +6,9 @@ use collections::HashMap;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 pub struct WorkspaceSettings {
     pub active_pane_modifiers: ActivePanelModifiers,
     pub bottom_dock_layout: BottomDockLayout,
@@ -216,7 +216,7 @@ pub struct WorkspaceSettingsContent {
     pub zoomed_padding: Option<bool>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, SettingsUi)]
 pub struct TabBarSettings {
     pub show: bool,
     pub show_nav_history_buttons: bool,
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
index b18d3509be..df3a4d3557 100644
--- a/crates/worktree/src/worktree_settings.rs
+++ b/crates/worktree/src/worktree_settings.rs
@@ -4,10 +4,10 @@ use anyhow::Context as _;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsUi};
 use util::paths::PathMatcher;
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, SettingsUi)]
 pub struct WorktreeSettings {
     pub file_scan_inclusions: PathMatcher,
     pub file_scan_exclusions: PathMatcher,
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 0ddfe3dde1..bb46a5a4f6 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -131,6 +131,7 @@ serde_json.workspace = true
 session.workspace = true
 settings.workspace = true
 settings_ui.workspace = true
+keymap_editor.workspace = true
 shellexpand.workspace = true
 smol.workspace = true
 snippet_provider.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 5e7934c309..e443879204 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -632,6 +632,7 @@ pub fn main() {
         svg_preview::init(cx);
         onboarding::init(cx);
         settings_ui::init(cx);
+        keymap_editor::init(cx);
         extensions_ui::init(cx);
         zeta::init(cx);
         inspector_ui::init(app_state.clone(), cx);
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 5a180e4b42..5797070a39 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1491,7 +1491,7 @@ fn reload_keymaps(cx: &mut App, mut user_key_bindings: Vec<KeyBinding>) {
         workspace::NewWindow,
     )]);
     // todo: nicer api here?
-    settings_ui::keybindings::KeymapEventChannel::trigger_keymap_changed(cx);
+    keymap_editor::KeymapEventChannel::trigger_keymap_changed(cx);
 }
 
 pub fn load_default_keymap(cx: &mut App) {
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 6c7ab0b374..342fd26cb7 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -1,6 +1,5 @@
 use collab_ui::collab_panel;
 use gpui::{Menu, MenuItem, OsAction};
-use settings_ui::keybindings;
 use terminal_view::terminal_panel;
 
 pub fn app_menus() -> Vec<Menu> {
@@ -17,7 +16,7 @@ pub fn app_menus() -> Vec<Menu> {
                     name: "Settings".into(),
                     items: vec![
                         MenuItem::action("Open Settings", super::OpenSettings),
-                        MenuItem::action("Open Key Bindings", keybindings::OpenKeymapEditor),
+                        MenuItem::action("Open Key Bindings", keymap_editor::OpenKeymapEditor),
                         MenuItem::action("Open Default Settings", super::OpenDefaultSettings),
                         MenuItem::action(
                             "Open Default Key Bindings",
diff --git a/crates/zlog_settings/src/zlog_settings.rs b/crates/zlog_settings/src/zlog_settings.rs
index b58cbcc143..0cdc784489 100644
--- a/crates/zlog_settings/src/zlog_settings.rs
+++ b/crates/zlog_settings/src/zlog_settings.rs
@@ -3,7 +3,7 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
+use settings::{Settings, SettingsStore, SettingsUi};
 
 pub fn init(cx: &mut App) {
     ZlogSettings::register(cx);
@@ -15,7 +15,7 @@ pub fn init(cx: &mut App) {
     .detach();
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 pub struct ZlogSettings {
     #[serde(default, flatten)]
     pub scopes: std::collections::HashMap<String, String>,

From 515282d719416a2b95bfb1461e5796f41e96eae4 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Fri, 29 Aug 2025 15:16:42 -0600
Subject: [PATCH 471/823] zeta: Add detection of BSD licenses + efficiency
 improvements + more lenient whitespace handling (#37194)

Closes #36564

Release Notes:

- Edit Prediction: Added various BSD licenses to open-source licenses
eligible for data collection.
---
 Cargo.lock                                    |   1 +
 crates/zeta/Cargo.toml                        |   1 +
 crates/zeta/src/license_detection.rs          | 448 ++++++++----------
 crates/zeta/src/license_detection/0bsd.regex  |  12 +
 crates/zeta/src/license_detection/0bsd.txt    |  13 +
 .../{apache.regex => apache-2.0.regex}        |  12 +-
 .../{apache-text => apache-2.0.txt}           |   0
 .../src/license_detection/bsd-1-clause.regex  |  17 +
 .../src/license_detection/bsd-1-clause.txt    |  20 +
 .../src/license_detection/bsd-2-clause.regex  |  22 +
 .../src/license_detection/bsd-2-clause.txt    |  26 +
 .../src/license_detection/bsd-3-clause.regex  |  26 +
 .../src/license_detection/bsd-3-clause.txt    |  29 ++
 crates/zeta/src/license_detection/isc.regex   |   4 +-
 crates/zeta/src/license_detection/isc.txt     |  15 +
 crates/zeta/src/license_detection/mit.regex   |   4 +-
 .../license_detection/{mit-text => mit.txt}   |   0
 .../{upl.regex => upl-1.0.regex}              |   4 +-
 crates/zeta/src/license_detection/upl-1.0.txt |  35 ++
 19 files changed, 435 insertions(+), 254 deletions(-)
 create mode 100644 crates/zeta/src/license_detection/0bsd.regex
 create mode 100644 crates/zeta/src/license_detection/0bsd.txt
 rename crates/zeta/src/license_detection/{apache.regex => apache-2.0.regex} (98%)
 rename crates/zeta/src/license_detection/{apache-text => apache-2.0.txt} (100%)
 create mode 100644 crates/zeta/src/license_detection/bsd-1-clause.regex
 create mode 100644 crates/zeta/src/license_detection/bsd-1-clause.txt
 create mode 100644 crates/zeta/src/license_detection/bsd-2-clause.regex
 create mode 100644 crates/zeta/src/license_detection/bsd-2-clause.txt
 create mode 100644 crates/zeta/src/license_detection/bsd-3-clause.regex
 create mode 100644 crates/zeta/src/license_detection/bsd-3-clause.txt
 create mode 100644 crates/zeta/src/license_detection/isc.txt
 rename crates/zeta/src/license_detection/{mit-text => mit.txt} (100%)
 rename crates/zeta/src/license_detection/{upl.regex => upl-1.0.regex} (96%)
 create mode 100644 crates/zeta/src/license_detection/upl-1.0.txt

diff --git a/Cargo.lock b/Cargo.lock
index 4c68280de2..84d633dd6f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20830,6 +20830,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "strum 0.27.1",
  "telemetry",
  "telemetry_events",
  "theme",
diff --git a/crates/zeta/Cargo.toml b/crates/zeta/Cargo.toml
index ee76308ff3..05eedd6015 100644
--- a/crates/zeta/Cargo.toml
+++ b/crates/zeta/Cargo.toml
@@ -46,6 +46,7 @@ release_channel.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
+strum.workspace = true
 telemetry.workspace = true
 telemetry_events.workspace = true
 theme.workspace = true
diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index 022b2d19de..d6b8ef10a3 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::BTreeSet,
+    fmt::{Display, Formatter},
     path::{Path, PathBuf},
     sync::{Arc, LazyLock},
 };
@@ -10,6 +11,7 @@ use gpui::{App, AppContext as _, Entity, Subscription, Task};
 use postage::watch;
 use project::Worktree;
 use regex::Regex;
+use strum::VariantArray;
 use util::ResultExt as _;
 use worktree::ChildEntriesOptions;
 
@@ -17,8 +19,14 @@ use worktree::ChildEntriesOptions;
 static LICENSE_FILE_NAME_REGEX: LazyLock<regex::bytes::Regex> = LazyLock::new(|| {
     regex::bytes::RegexBuilder::new(
         "^ \
-        (?: license | licence) \
-        (?: [\\-._] (?: apache | isc | mit | upl))? \
+        (?: license | licence)? \
+        (?: [\\-._]? \
+            (?: apache (?: [\\-._] (?: 2.0 | 2 ))? | \
+                0? bsd (?: [\\-._] [0123])? (?: [\\-._] clause)? | \
+                isc | \
+                mit | \
+                upl))? \
+        (?: [\\-._]? (?: license | licence))? \
         (?: \\.txt | \\.md)? \
         $",
     )
@@ -28,40 +36,93 @@ static LICENSE_FILE_NAME_REGEX: LazyLock<regex::bytes::Regex> = LazyLock::new(||
     .unwrap()
 });
 
-fn is_license_eligible_for_data_collection(license: &str) -> bool {
-    static LICENSE_REGEXES: LazyLock<Vec<Regex>> = LazyLock::new(|| {
-        [
-            include_str!("license_detection/apache.regex"),
-            include_str!("license_detection/isc.regex"),
-            include_str!("license_detection/mit.regex"),
-            include_str!("license_detection/upl.regex"),
-        ]
-        .into_iter()
-        .map(|pattern| Regex::new(&canonicalize_license_text(pattern)).unwrap())
-        .collect()
+#[derive(Debug, Clone, Copy, Eq, PartialEq, VariantArray)]
+pub enum OpenSourceLicense {
+    Apache2_0,
+    BSD0Clause,
+    BSD1Clause,
+    BSD2Clause,
+    BSD3Clause,
+    ISC,
+    MIT,
+    UPL1_0,
+}
+
+impl Display for OpenSourceLicense {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.spdx_identifier())
+    }
+}
+
+impl OpenSourceLicense {
+    pub fn spdx_identifier(&self) -> &'static str {
+        match self {
+            OpenSourceLicense::Apache2_0 => "apache-2.0",
+            OpenSourceLicense::BSD0Clause => "0bsd",
+            OpenSourceLicense::BSD1Clause => "bsd-1-clause",
+            OpenSourceLicense::BSD2Clause => "bsd-2-clause",
+            OpenSourceLicense::BSD3Clause => "bsd-3-clause",
+            OpenSourceLicense::ISC => "isc",
+            OpenSourceLicense::MIT => "mit",
+            OpenSourceLicense::UPL1_0 => "upl-1.0",
+        }
+    }
+
+    pub fn regex(&self) -> &'static str {
+        match self {
+            OpenSourceLicense::Apache2_0 => include_str!("license_detection/apache-2.0.regex"),
+            OpenSourceLicense::BSD0Clause => include_str!("license_detection/0bsd.regex"),
+            OpenSourceLicense::BSD1Clause => include_str!("license_detection/bsd-1-clause.regex"),
+            OpenSourceLicense::BSD2Clause => include_str!("license_detection/bsd-2-clause.regex"),
+            OpenSourceLicense::BSD3Clause => include_str!("license_detection/bsd-3-clause.regex"),
+            OpenSourceLicense::ISC => include_str!("license_detection/isc.regex"),
+            OpenSourceLicense::MIT => include_str!("license_detection/mit.regex"),
+            OpenSourceLicense::UPL1_0 => include_str!("license_detection/upl-1.0.regex"),
+        }
+    }
+}
+
+fn detect_license(license: &str) -> Option<OpenSourceLicense> {
+    static LICENSE_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+        let mut regex_string = String::new();
+        let mut is_first = true;
+        for license in OpenSourceLicense::VARIANTS {
+            if is_first {
+                regex_string.push_str("^(?:(");
+                is_first = false;
+            } else {
+                regex_string.push_str(")|(");
+            }
+            regex_string.push_str(&canonicalize_license_text(license.regex()));
+        }
+        regex_string.push_str("))$");
+        let regex = Regex::new(&regex_string).unwrap();
+        assert_eq!(regex.captures_len(), OpenSourceLicense::VARIANTS.len() + 1);
+        regex
     });
 
-    let license = canonicalize_license_text(license);
-    LICENSE_REGEXES.iter().any(|regex| regex.is_match(&license))
+    LICENSE_REGEX
+        .captures(&canonicalize_license_text(license))
+        .and_then(|captures| {
+            let license = OpenSourceLicense::VARIANTS
+                .iter()
+                .enumerate()
+                .find(|(index, _)| captures.get(index + 1).is_some())
+                .map(|(_, license)| *license);
+            if license.is_none() {
+                log::error!("bug: open source license regex matched without any capture groups");
+            }
+            license
+        })
 }
 
 /// Canonicalizes the whitespace of license text and license regexes.
 fn canonicalize_license_text(license: &str) -> String {
-    static PARAGRAPH_SEPARATOR_REGEX: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"\s*\n\s*\n\s*").unwrap());
-
-    PARAGRAPH_SEPARATOR_REGEX
-        .split(license)
-        .filter(|paragraph| !paragraph.trim().is_empty())
-        .map(|paragraph| {
-            paragraph
-                .trim()
-                .split_whitespace()
-                .collect::<Vec<_>>()
-                .join(" ")
-        })
+    license
+        .split_ascii_whitespace()
         .collect::<Vec<_>>()
-        .join("\n\n")
+        .join(" ")
+        .to_ascii_lowercase()
 }
 
 pub enum LicenseDetectionWatcher {
@@ -157,7 +218,7 @@ impl LicenseDetectionWatcher {
             return None;
         }
         let text = fs.load(&abs_path).await.log_err()?;
-        let is_eligible = is_license_eligible_for_data_collection(&text);
+        let is_eligible = detect_license(&text).is_some();
         if is_eligible {
             log::debug!(
                 "`{abs_path:?}` matches a license that is eligible for data collection (if enabled)"
@@ -193,193 +254,47 @@ mod tests {
 
     use super::*;
 
-    const MIT_LICENSE: &str = include_str!("license_detection/mit-text");
-    const APACHE_LICENSE: &str = include_str!("license_detection/apache-text");
+    const APACHE_2_0_TXT: &str = include_str!("license_detection/apache-2.0.txt");
+    const ISC_TXT: &str = include_str!("license_detection/isc.txt");
+    const MIT_TXT: &str = include_str!("license_detection/mit.txt");
+    const UPL_1_0_TXT: &str = include_str!("license_detection/upl-1.0.txt");
+    const BSD_0_CLAUSE_TXT: &str = include_str!("license_detection/0bsd.txt");
+    const BSD_1_CLAUSE_TXT: &str = include_str!("license_detection/bsd-1-clause.txt");
+    const BSD_2_CLAUSE_TXT: &str = include_str!("license_detection/bsd-2-clause.txt");
+    const BSD_3_CLAUSE_TXT: &str = include_str!("license_detection/bsd-3-clause.txt");
 
-    #[test]
-    fn test_mit_positive_detection() {
-        assert!(is_license_eligible_for_data_collection(MIT_LICENSE));
+    #[track_caller]
+    fn assert_matches_license(text: &str, license: OpenSourceLicense) {
+        let license_regex =
+            Regex::new(&format!("^{}$", canonicalize_license_text(license.regex()))).unwrap();
+        assert!(license_regex.is_match(&canonicalize_license_text(text)));
+        assert_eq!(detect_license(text), Some(license));
     }
 
     #[test]
-    fn test_mit_negative_detection() {
-        let example_license = format!(
-            r#"{MIT_LICENSE}
-
-            This project is dual licensed under the MIT License and the Apache License, Version 2.0."#
-        );
-        assert!(!is_license_eligible_for_data_collection(&example_license));
-    }
-
-    #[test]
-    fn test_isc_positive_detection() {
-        let example_license = unindent(
-            r#"
-                ISC License
-
-                Copyright (c) 2024, John Doe
-
-                Permission to use, copy, modify, and/or distribute this software for any
-                purpose with or without fee is hereby granted, provided that the above
-                copyright notice and this permission notice appear in all copies.
-
-                THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-                WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-                MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-                ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-                WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-                ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-                OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-            "#
-            .trim(),
-        );
-
-        assert!(is_license_eligible_for_data_collection(&example_license));
-    }
-
-    #[test]
-    fn test_isc_negative_detection() {
-        let example_license = unindent(
-            r#"
-                ISC License
-
-                Copyright (c) 2024, John Doe
-
-                Permission to use, copy, modify, and/or distribute this software for any
-                purpose with or without fee is hereby granted, provided that the above
-                copyright notice and this permission notice appear in all copies.
-
-                THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-                WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-                MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-                ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-                WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-                ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-                OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-                This project is dual licensed under the ISC License and the MIT License.
-            "#
-            .trim(),
-        );
-
-        assert!(!is_license_eligible_for_data_collection(&example_license));
-    }
-
-    #[test]
-    fn test_upl_positive_detection() {
-        let example_license = unindent(
-            r#"
-                Copyright (c) 2025, John Doe
-
-                The Universal Permissive License (UPL), Version 1.0
-
-                Subject to the condition set forth below, permission is hereby granted to any person
-                obtaining a copy of this software, associated documentation and/or data (collectively
-                the "Software"), free of charge and under any and all copyright rights in the
-                Software, and any and all patent rights owned or freely licensable by each licensor
-                hereunder covering either (i) the unmodified Software as contributed to or provided
-                by such licensor, or (ii) the Larger Works (as defined below), to deal in both
-
-                (a) the Software, and
-
-                (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is
-                    included with the Software (each a "Larger Work" to which the Software is
-                    contributed by such licensors),
-
-                without restriction, including without limitation the rights to copy, create
-                derivative works of, display, perform, and distribute the Software and make, use,
-                sell, offer for sale, import, export, have made, and have sold the Software and the
-                Larger Work(s), and to sublicense the foregoing rights on either these or other
-                terms.
-
-                This license is subject to the following condition:
-
-                The above copyright notice and either this complete permission notice or at a minimum
-                a reference to the UPL must be included in all copies or substantial portions of the
-                Software.
-
-                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-                INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-                PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-                HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-                CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-                OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-            "#
-            .trim(),
-        );
-
-        assert!(is_license_eligible_for_data_collection(&example_license));
-    }
-
-    #[test]
-    fn test_upl_negative_detection() {
-        let example_license = unindent(
-            r#"
-                UPL License
-
-                Copyright (c) 2024, John Doe
-
-                The Universal Permissive License (UPL), Version 1.0
-
-                Subject to the condition set forth below, permission is hereby granted to any person
-                obtaining a copy of this software, associated documentation and/or data (collectively
-                the "Software"), free of charge and under any and all copyright rights in the
-                Software, and any and all patent rights owned or freely licensable by each licensor
-                hereunder covering either (i) the unmodified Software as contributed to or provided
-                by such licensor, or (ii) the Larger Works (as defined below), to deal in both
-
-                (a) the Software, and
-
-                (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is
-                    included with the Software (each a "Larger Work" to which the Software is
-                    contributed by such licensors),
-
-                without restriction, including without limitation the rights to copy, create
-                derivative works of, display, perform, and distribute the Software and make, use,
-                sell, offer for sale, import, export, have made, and have sold the Software and the
-                Larger Work(s), and to sublicense the foregoing rights on either these or other
-                terms.
-
-                This license is subject to the following condition:
-
-                The above copyright notice and either this complete permission notice or at a minimum
-                a reference to the UPL must be included in all copies or substantial portions of the
-                Software.
-
-                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-                INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-                PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-                HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-                CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-                OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-                This project is dual licensed under the ISC License and the MIT License.
-            "#
-            .trim(),
-        );
-
-        assert!(!is_license_eligible_for_data_collection(&example_license));
+    fn test_0bsd_positive_detection() {
+        assert_matches_license(BSD_0_CLAUSE_TXT, OpenSourceLicense::BSD0Clause);
     }
 
     #[test]
     fn test_apache_positive_detection() {
-        assert!(is_license_eligible_for_data_collection(APACHE_LICENSE));
+        assert_matches_license(APACHE_2_0_TXT, OpenSourceLicense::Apache2_0);
 
         let license_with_appendix = format!(
-            r#"{APACHE_LICENSE}
+            r#"{APACHE_2_0_TXT}
 
             END OF TERMS AND CONDITIONS
 
             APPENDIX: How to apply the Apache License to your work.
 
-               To apply the Apache License to your work, attach the following
-               boilerplate notice, with the fields enclosed by brackets "[]"
-               replaced with your own identifying information. (Don't include
-               the brackets!)  The text should be enclosed in the appropriate
-               comment syntax for the file format. We also recommend that a
-               file or class name and description of purpose be included on the
-               same "printed page" as the copyright notice for easier
-               identification within third-party archives.
+                To apply the Apache License to your work, attach the following
+                boilerplate notice, with the fields enclosed by brackets "[]"
+                replaced with your own identifying information. (Don't include
+                the brackets!)  The text should be enclosed in the appropriate
+                comment syntax for the file format. We also recommend that a
+                file or class name and description of purpose be included on the
+                same "printed page" as the copyright notice for easier
+                identification within third-party archives.
 
             Copyright [yyyy] [name of copyright owner]
 
@@ -395,9 +310,7 @@ mod tests {
             See the License for the specific language governing permissions and
             limitations under the License."#
         );
-        assert!(is_license_eligible_for_data_collection(
-            &license_with_appendix
-        ));
+        assert_matches_license(&license_with_appendix, OpenSourceLicense::Apache2_0);
 
         // Sometimes people fill in the appendix with copyright info.
         let license_with_copyright = license_with_appendix.replace(
@@ -405,16 +318,79 @@ mod tests {
             "Copyright 2025 John Doe",
         );
         assert!(license_with_copyright != license_with_appendix);
-        assert!(is_license_eligible_for_data_collection(
-            &license_with_copyright
-        ));
+        assert_matches_license(&license_with_copyright, OpenSourceLicense::Apache2_0);
     }
 
     #[test]
     fn test_apache_negative_detection() {
-        assert!(!is_license_eligible_for_data_collection(&format!(
-            "{APACHE_LICENSE}\n\nThe terms in this license are void if P=NP."
-        )));
+        assert!(
+            detect_license(&format!(
+                "{APACHE_2_0_TXT}\n\nThe terms in this license are void if P=NP."
+            ))
+            .is_none()
+        );
+    }
+
+    #[test]
+    fn test_bsd_1_clause_positive_detection() {
+        assert_matches_license(BSD_1_CLAUSE_TXT, OpenSourceLicense::BSD1Clause);
+    }
+
+    #[test]
+    fn test_bsd_2_clause_positive_detection() {
+        assert_matches_license(BSD_2_CLAUSE_TXT, OpenSourceLicense::BSD2Clause);
+    }
+
+    #[test]
+    fn test_bsd_3_clause_positive_detection() {
+        assert_matches_license(BSD_3_CLAUSE_TXT, OpenSourceLicense::BSD3Clause);
+    }
+
+    #[test]
+    fn test_isc_positive_detection() {
+        assert_matches_license(ISC_TXT, OpenSourceLicense::ISC);
+    }
+
+    #[test]
+    fn test_isc_negative_detection() {
+        let license_text = format!(
+            r#"{ISC_TXT}
+
+            This project is dual licensed under the ISC License and the MIT License."#
+        );
+
+        assert!(detect_license(&license_text).is_none());
+    }
+
+    #[test]
+    fn test_mit_positive_detection() {
+        assert_matches_license(MIT_TXT, OpenSourceLicense::MIT);
+    }
+
+    #[test]
+    fn test_mit_negative_detection() {
+        let license_text = format!(
+            r#"{MIT_TXT}
+
+            This project is dual licensed under the MIT License and the Apache License, Version 2.0."#
+        );
+        assert!(detect_license(&license_text).is_none());
+    }
+
+    #[test]
+    fn test_upl_positive_detection() {
+        assert_matches_license(UPL_1_0_TXT, OpenSourceLicense::UPL1_0);
+    }
+
+    #[test]
+    fn test_upl_negative_detection() {
+        let license_text = format!(
+            r#"{UPL_1_0_TXT}
+
+            This project is dual licensed under the UPL License and the MIT License."#
+        );
+
+        assert!(detect_license(&license_text).is_none());
     }
 
     #[test]
@@ -439,10 +415,22 @@ mod tests {
         assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-ISC"));
         assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-UPL"));
 
+        // Test with "license" coming after
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"APACHE-LICENSE"));
+
+        // Test version numbers
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"APACHE-2"));
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"APACHE-2.0"));
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-1"));
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-2"));
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-3"));
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-3-CLAUSE"));
+
         // Test combinations
         assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-MIT.txt"));
         assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENCE.ISC.md"));
         assert!(LICENSE_FILE_NAME_REGEX.is_match(b"license_upl"));
+        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.APACHE.2.0"));
 
         // Test case insensitive
         assert!(LICENSE_FILE_NAME_REGEX.is_match(b"License"));
@@ -461,39 +449,17 @@ mod tests {
         assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.old"));
         assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-GPL"));
         assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSEABC"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b""));
     }
 
     #[test]
     fn test_canonicalize_license_text() {
-        // Test basic whitespace normalization
-        let input = "Line 1\n   Line 2   \n\n\n  Line 3  ";
-        let expected = "Line 1 Line 2\n\nLine 3";
-        assert_eq!(canonicalize_license_text(input), expected);
-
-        // Test paragraph separation
-        let input = "Paragraph 1\nwith multiple lines\n\n\n\nParagraph 2\nwith more lines";
-        let expected = "Paragraph 1 with multiple lines\n\nParagraph 2 with more lines";
-        assert_eq!(canonicalize_license_text(input), expected);
-
-        // Test empty paragraphs are filtered out
-        let input = "\n\n\nParagraph 1\n\n\n   \n\n\nParagraph 2\n\n\n";
-        let expected = "Paragraph 1\n\nParagraph 2";
-        assert_eq!(canonicalize_license_text(input), expected);
-
-        // Test single line
-        let input = "   Single line with spaces   ";
-        let expected = "Single line with spaces";
-        assert_eq!(canonicalize_license_text(input), expected);
-
-        // Test multiple consecutive spaces within lines
-        let input = "Word1    Word2\n\nWord3     Word4";
-        let expected = "Word1 Word2\n\nWord3 Word4";
+        let input = "  Paragraph 1\nwith multiple lines\n\n\n\nParagraph 2\nwith more lines\n  ";
+        let expected = "paragraph 1 with multiple lines paragraph 2 with more lines";
         assert_eq!(canonicalize_license_text(input), expected);
 
         // Test tabs and mixed whitespace
         let input = "Word1\t\tWord2\n\n   Word3\r\n\r\n\r\nWord4   ";
-        let expected = "Word1 Word2\n\nWord3\n\nWord4";
+        let expected = "word1 word2 word3 word4";
         assert_eq!(canonicalize_license_text(input), expected);
     }
 
@@ -532,9 +498,7 @@ mod tests {
             .trim(),
         );
 
-        assert!(is_license_eligible_for_data_collection(
-            &mit_with_weird_spacing
-        ));
+        assert_matches_license(&mit_with_weird_spacing, OpenSourceLicense::MIT);
     }
 
     fn init_test(cx: &mut TestAppContext) {
@@ -590,14 +554,14 @@ mod tests {
         assert!(matches!(watcher, LicenseDetectionWatcher::Local { .. }));
         assert!(!watcher.is_project_open_source());
 
-        fs.write(Path::new("/root/LICENSE-MIT"), MIT_LICENSE.as_bytes())
+        fs.write(Path::new("/root/LICENSE-MIT"), MIT_TXT.as_bytes())
             .await
             .unwrap();
 
         cx.background_executor.run_until_parked();
         assert!(watcher.is_project_open_source());
 
-        fs.write(Path::new("/root/LICENSE-APACHE"), APACHE_LICENSE.as_bytes())
+        fs.write(Path::new("/root/LICENSE-APACHE"), APACHE_2_0_TXT.as_bytes())
             .await
             .unwrap();
 
@@ -630,7 +594,7 @@ mod tests {
         let fs = FakeFs::new(cx.background_executor.clone());
         fs.insert_tree(
             "/root",
-            json!({ "main.rs": "fn main() {}", "LICENSE-MIT": MIT_LICENSE }),
+            json!({ "main.rs": "fn main() {}", "LICENSE-MIT": MIT_TXT }),
         )
         .await;
 
diff --git a/crates/zeta/src/license_detection/0bsd.regex b/crates/zeta/src/license_detection/0bsd.regex
new file mode 100644
index 0000000000..7928a8d181
--- /dev/null
+++ b/crates/zeta/src/license_detection/0bsd.regex
@@ -0,0 +1,12 @@
+.*
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted\.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS\. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/0bsd.txt b/crates/zeta/src/license_detection/0bsd.txt
new file mode 100644
index 0000000000..d3061a372f
--- /dev/null
+++ b/crates/zeta/src/license_detection/0bsd.txt
@@ -0,0 +1,13 @@
+Zero-Clause BSD
+=============
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/zeta/src/license_detection/apache.regex b/crates/zeta/src/license_detection/apache-2.0.regex
similarity index 98%
rename from crates/zeta/src/license_detection/apache.regex
rename to crates/zeta/src/license_detection/apache-2.0.regex
index e200e063c9..dcf12fe289 100644
--- a/crates/zeta/src/license_detection/apache.regex
+++ b/crates/zeta/src/license_detection/apache-2.0.regex
@@ -1,4 +1,4 @@
-                                 ^Apache License
+                                 Apache License
                            Version 2\.0, January 2004
                         http://www\.apache\.org/licenses/
 
@@ -171,9 +171,9 @@
       of any other Contributor, and only if You agree to indemnify,
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability\.(:?
+      of your accepting any such warranty or additional liability\.(?:
 
-   END OF TERMS AND CONDITIONS)?(:?
+   END OF TERMS AND CONDITIONS)?(?:
 
    APPENDIX: How to apply the Apache License to your work\.
 
@@ -184,9 +184,9 @@
       comment syntax for the file format\. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third\-party archives\.)?(:?
+      identification within third\-party archives\.)?(?:
 
-   Copyright .*)?(:?
+   Copyright .*)?(?:
 
    Licensed under the Apache License, Version 2\.0 \(the "License"\);
    you may not use this file except in compliance with the License\.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.
    See the License for the specific language governing permissions and
-   limitations under the License\.)?$
+   limitations under the License\.)?
diff --git a/crates/zeta/src/license_detection/apache-text b/crates/zeta/src/license_detection/apache-2.0.txt
similarity index 100%
rename from crates/zeta/src/license_detection/apache-text
rename to crates/zeta/src/license_detection/apache-2.0.txt
diff --git a/crates/zeta/src/license_detection/bsd-1-clause.regex b/crates/zeta/src/license_detection/bsd-1-clause.regex
new file mode 100644
index 0000000000..5e73e5c6d0
--- /dev/null
+++ b/crates/zeta/src/license_detection/bsd-1-clause.regex
@@ -0,0 +1,17 @@
+.*Copyright.*
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+(?:1\.|\*)? Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer\.
+
+THIS SOFTWARE IS PROVIDED BY .* “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL .* BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
diff --git a/crates/zeta/src/license_detection/bsd-1-clause.txt b/crates/zeta/src/license_detection/bsd-1-clause.txt
new file mode 100644
index 0000000000..1ae6f9d5ff
--- /dev/null
+++ b/crates/zeta/src/license_detection/bsd-1-clause.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2024 John Doe
+Some Organization
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY [Name of Organization] “AS IS” AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL [Name of Organisation] BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
diff --git a/crates/zeta/src/license_detection/bsd-2-clause.regex b/crates/zeta/src/license_detection/bsd-2-clause.regex
new file mode 100644
index 0000000000..93d22652fb
--- /dev/null
+++ b/crates/zeta/src/license_detection/bsd-2-clause.regex
@@ -0,0 +1,22 @@
+.*Copyright.*
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+(?:1\.|\*)? Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer\.
+
+(?:2\.|\*)? Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution\.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
diff --git a/crates/zeta/src/license_detection/bsd-2-clause.txt b/crates/zeta/src/license_detection/bsd-2-clause.txt
new file mode 100644
index 0000000000..bbf946465e
--- /dev/null
+++ b/crates/zeta/src/license_detection/bsd-2-clause.txt
@@ -0,0 +1,26 @@
+Copyright (c) 2024
+
+John Doe (john.doe@gmail.com)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/zeta/src/license_detection/bsd-3-clause.regex b/crates/zeta/src/license_detection/bsd-3-clause.regex
new file mode 100644
index 0000000000..b31443de64
--- /dev/null
+++ b/crates/zeta/src/license_detection/bsd-3-clause.regex
@@ -0,0 +1,26 @@
+.*Copyright.*
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+(?:1\.|\*)? Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer\.
+
+(?:2\.|\*)? Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution\.
+
+(?:3\.|\*)? Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission\.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
diff --git a/crates/zeta/src/license_detection/bsd-3-clause.txt b/crates/zeta/src/license_detection/bsd-3-clause.txt
new file mode 100644
index 0000000000..0edcde7462
--- /dev/null
+++ b/crates/zeta/src/license_detection/bsd-3-clause.txt
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2025, John Doe
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/zeta/src/license_detection/isc.regex b/crates/zeta/src/license_detection/isc.regex
index 63c6126bce..ddaece5375 100644
--- a/crates/zeta/src/license_detection/isc.regex
+++ b/crates/zeta/src/license_detection/isc.regex
@@ -1,4 +1,4 @@
-^.*ISC License.*
+.*ISC License.*
 
 Copyright.*
 
@@ -12,4 +12,4 @@ MERCHANTABILITY AND FITNESS\. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.$
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/isc.txt b/crates/zeta/src/license_detection/isc.txt
new file mode 100644
index 0000000000..97fda7f975
--- /dev/null
+++ b/crates/zeta/src/license_detection/isc.txt
@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2024, John Doe
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/zeta/src/license_detection/mit.regex b/crates/zeta/src/license_detection/mit.regex
index deda8f0352..43130424c5 100644
--- a/crates/zeta/src/license_detection/mit.regex
+++ b/crates/zeta/src/license_detection/mit.regex
@@ -1,4 +1,4 @@
-^.*MIT License.*
+.*MIT License.*
 
 Copyright.*
 
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE\.$
+SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/mit-text b/crates/zeta/src/license_detection/mit.txt
similarity index 100%
rename from crates/zeta/src/license_detection/mit-text
rename to crates/zeta/src/license_detection/mit.txt
diff --git a/crates/zeta/src/license_detection/upl.regex b/crates/zeta/src/license_detection/upl-1.0.regex
similarity index 96%
rename from crates/zeta/src/license_detection/upl.regex
rename to crates/zeta/src/license_detection/upl-1.0.regex
index 34ba2a64c6..0959f72971 100644
--- a/crates/zeta/src/license_detection/upl.regex
+++ b/crates/zeta/src/license_detection/upl-1.0.regex
@@ -1,4 +1,4 @@
-^Copyright.*
+Copyright.*
 
 The Universal Permissive License.*
 
@@ -32,4 +32,4 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
 PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\.$
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/upl-1.0.txt b/crates/zeta/src/license_detection/upl-1.0.txt
new file mode 100644
index 0000000000..6193e80270
--- /dev/null
+++ b/crates/zeta/src/license_detection/upl-1.0.txt
@@ -0,0 +1,35 @@
+Copyright (c) 2025, John Doe
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any person
+obtaining a copy of this software, associated documentation and/or data (collectively
+the "Software"), free of charge and under any and all copyright rights in the
+Software, and any and all patent rights owned or freely licensable by each licensor
+hereunder covering either (i) the unmodified Software as contributed to or provided
+by such licensor, or (ii) the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is
+    included with the Software (each a "Larger Work" to which the Software is
+    contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make, use,
+sell, offer for sale, import, export, have made, and have sold the Software and the
+Larger Work(s), and to sublicense the foregoing rights on either these or other
+terms.
+
+This license is subject to the following condition:
+
+The above copyright notice and either this complete permission notice or at a minimum
+a reference to the UPL must be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From db508bbbe2fe41507b2930d19effbecd25ea84c4 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 29 Aug 2025 17:29:58 -0400
Subject: [PATCH 472/823] docs: Remove MSYS2 instructions

---
 docs/src/development/windows.md | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
index 551d5f9f21..45e8ea911b 100644
--- a/docs/src/development/windows.md
+++ b/docs/src/development/windows.md
@@ -114,20 +114,7 @@ cargo test --workspace
 
 ## Installing from msys2
 
-[MSYS2](https://msys2.org/) distribution provides Zed as a package [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed). The package is available for UCRT64, CLANG64 and CLANGARM64 repositories. To download it, run
-
-```sh
-pacman -Syu
-pacman -S $MINGW_PACKAGE_PREFIX-zed
-```
-
-You can see the [build script](https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-zed/PKGBUILD) for more details on build process.
-
-> Please, report any issue in [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed) first.
-
-See also MSYS2 [documentation page](https://www.msys2.org/docs/ides-editors).
-
-Note that `collab` is not supported for MSYS2.
+Zed does not support unofficial MSYS2 Zed packages built for Mingw-w64.  Please report any issues you may have with [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed) to [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed).
 
 ## Troubleshooting
 

From bdedb18c300e71086a63dae1cacf3fe87c885fcf Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 29 Aug 2025 17:36:22 -0400
Subject: [PATCH 473/823] docs: Fix msys2 (#37199)

I accidentally pushed
https://github.com/zed-industries/zed/commit/db508bbbe2fe41507b2930d19effbecd25ea84c4
to main instead of to a branch.

That broke tests.

Release Notes:

- N/A
---
 docs/src/development/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
index 45e8ea911b..a4ad220bcc 100644
--- a/docs/src/development/windows.md
+++ b/docs/src/development/windows.md
@@ -114,7 +114,7 @@ cargo test --workspace
 
 ## Installing from msys2
 
-Zed does not support unofficial MSYS2 Zed packages built for Mingw-w64.  Please report any issues you may have with [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed) to [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed).
+Zed does not support unofficial MSYS2 Zed packages built for Mingw-w64. Please report any issues you may have with [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed) to [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed).
 
 ## Troubleshooting
 

From a70cf3f1d432462f164fbc4b4de187bc7b52e31d Mon Sep 17 00:00:00 2001
From: Shardul Vaidya <31039336+5herlocked@users.noreply.github.com>
Date: Fri, 29 Aug 2025 18:13:06 -0400
Subject: [PATCH 474/823] bedrock: Inference Config updates (#35808)

Fixes #36866

- Updated internal naming for Claude 4 models to be consistent.
- Corrected max output tokens for Anthropic Bedrock models to match docs

Shoutout to @tlehn for noticing the bug, and finding the resolution.

Release Notes:

- bedrock: Fixed inference config errors causing Opus 4 Thinking and
Opus 4.1 Thinking to fail (thanks [@tlehn](https://github.com/tlehn) and
[@5herlocked](https://github.com/5herlocked])
- bedrock: Fixed an issue which prevented Rules / System prompts not
functioning with Bedrock models (thanks
[@tlehn](https://github.com/tlehn) and
[@5herlocked](https://github.com/5herlocked])
---
 crates/bedrock/src/bedrock.rs | 18 +++++++++++++++++-
 crates/bedrock/src/models.rs  | 28 +++++++++++++---------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/crates/bedrock/src/bedrock.rs b/crates/bedrock/src/bedrock.rs
index c8315d4201..ec0b407090 100644
--- a/crates/bedrock/src/bedrock.rs
+++ b/crates/bedrock/src/bedrock.rs
@@ -3,6 +3,7 @@ mod models;
 use anyhow::{Context, Error, Result, anyhow};
 use aws_sdk_bedrockruntime as bedrock;
 pub use aws_sdk_bedrockruntime as bedrock_client;
+use aws_sdk_bedrockruntime::types::InferenceConfiguration;
 pub use aws_sdk_bedrockruntime::types::{
     AnyToolChoice as BedrockAnyToolChoice, AutoToolChoice as BedrockAutoToolChoice,
     ContentBlock as BedrockInnerContent, Tool as BedrockTool, ToolChoice as BedrockToolChoice,
@@ -17,7 +18,8 @@ pub use bedrock::types::{
     ConverseOutput as BedrockResponse, ConverseStreamOutput as BedrockStreamingResponse,
     ImageBlock as BedrockImageBlock, Message as BedrockMessage,
     ReasoningContentBlock as BedrockThinkingBlock, ReasoningTextBlock as BedrockThinkingTextBlock,
-    ResponseStream as BedrockResponseStream, ToolResultBlock as BedrockToolResultBlock,
+    ResponseStream as BedrockResponseStream, SystemContentBlock as BedrockSystemContentBlock,
+    ToolResultBlock as BedrockToolResultBlock,
     ToolResultContentBlock as BedrockToolResultContentBlock,
     ToolResultStatus as BedrockToolResultStatus, ToolUseBlock as BedrockToolUseBlock,
 };
@@ -58,6 +60,20 @@ pub async fn stream_completion(
         response = response.set_tool_config(request.tools);
     }
 
+    let inference_config = InferenceConfiguration::builder()
+        .max_tokens(request.max_tokens as i32)
+        .set_temperature(request.temperature)
+        .set_top_p(request.top_p)
+        .build();
+
+    response = response.inference_config(inference_config);
+
+    if let Some(system) = request.system {
+        if !system.is_empty() {
+            response = response.system(BedrockSystemContentBlock::Text(system));
+        }
+    }
+
     let output = response
         .send()
         .await
diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
index 69d2ffb845..c3a793d69d 100644
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -151,12 +151,12 @@ impl Model {
 
     pub fn id(&self) -> &str {
         match self {
-            Model::ClaudeSonnet4 => "claude-4-sonnet",
-            Model::ClaudeSonnet4Thinking => "claude-4-sonnet-thinking",
-            Model::ClaudeOpus4 => "claude-4-opus",
-            Model::ClaudeOpus4_1 => "claude-4-opus-1",
-            Model::ClaudeOpus4Thinking => "claude-4-opus-thinking",
-            Model::ClaudeOpus4_1Thinking => "claude-4-opus-1-thinking",
+            Model::ClaudeSonnet4 => "claude-sonnet-4",
+            Model::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking",
+            Model::ClaudeOpus4 => "claude-opus-4",
+            Model::ClaudeOpus4_1 => "claude-opus-4-1",
+            Model::ClaudeOpus4Thinking => "claude-opus-4-thinking",
+            Model::ClaudeOpus4_1Thinking => "claude-opus-4-1-thinking",
             Model::Claude3_5SonnetV2 => "claude-3-5-sonnet-v2",
             Model::Claude3_5Sonnet => "claude-3-5-sonnet",
             Model::Claude3Opus => "claude-3-opus",
@@ -359,14 +359,12 @@ impl Model {
     pub fn max_output_tokens(&self) -> u64 {
         match self {
             Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3_5Haiku => 4_096,
-            Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeOpus4
-            | Model::ClaudeOpus4Thinking
+            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => 128_000,
+            Self::ClaudeSonnet4 | Self::ClaudeSonnet4Thinking => 64_000,
+            Self::ClaudeOpus4
+            | Self::ClaudeOpus4Thinking
             | Self::ClaudeOpus4_1
-            | Model::ClaudeOpus4_1Thinking => 128_000,
+            | Self::ClaudeOpus4_1Thinking => 32_000,
             Self::Claude3_5SonnetV2 | Self::PalmyraWriterX4 | Self::PalmyraWriterX5 => 8_192,
             Self::Custom {
                 max_output_tokens, ..
@@ -784,10 +782,10 @@ mod tests {
         );
 
         // Test thinking models have different friendly IDs but same request IDs
-        assert_eq!(Model::ClaudeSonnet4.id(), "claude-4-sonnet");
+        assert_eq!(Model::ClaudeSonnet4.id(), "claude-sonnet-4");
         assert_eq!(
             Model::ClaudeSonnet4Thinking.id(),
-            "claude-4-sonnet-thinking"
+            "claude-sonnet-4-thinking"
         );
         assert_eq!(
             Model::ClaudeSonnet4.request_id(),

From 1c2e2a00fe87d8a9820d5d23f4828482f94c57f9 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 29 Aug 2025 18:26:11 -0400
Subject: [PATCH 475/823] agent: Re-add workaround for language model behavior
 with empty tool result (#37196)

This is just copying over the same workaround here:


https://github.com/zed-industries/zed/blob/a790e514af4d6957aa1a14cc8190b2ff24a0484c/crates/agent/src/thread.rs#L1455-L1459

Into the agent2 code.

Release Notes:

- agent: Fixed an issue where some tool calls in the Zed agent could
return an error like "`tool_use` ids were found without `tool_result`
blocks immediately after"
---
 crates/agent2/src/thread.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 97ea1caf1d..8ff5b84506 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -484,11 +484,15 @@ impl AgentMessage {
         };
 
         for tool_result in self.tool_results.values() {
+            let mut tool_result = tool_result.clone();
+            // Surprisingly, the API fails if we return an empty string here.
+            // It thinks we are sending a tool use without a tool result.
+            if tool_result.content.is_empty() {
+                tool_result.content = "<Tool returned an empty string>".into();
+            }
             user_message
                 .content
-                .push(language_model::MessageContent::ToolResult(
-                    tool_result.clone(),
-                ));
+                .push(language_model::MessageContent::ToolResult(tool_result));
         }
 
         let mut messages = Vec::new();

From f78f3e7729b6e505685ba20ef207c709f0229149 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 29 Aug 2025 17:18:52 -0700
Subject: [PATCH 476/823] Add initial support for WSL (#37035)

Closes #36188

## Todo

* [x] CLI
* [x] terminals
* [x] tasks

## For future PRs
* debugging
* UI for opening WSL projects
* fixing workspace state restoration

Release Notes:

- Windows alpha: Zed now supports editing folders in WSL.

---------

Co-authored-by: Junkui Zhang <364772080@qq.com>
---
 crates/auto_update_helper/src/updater.rs      |  26 +-
 crates/cli/src/cli.rs                         |   1 +
 crates/cli/src/main.rs                        |  74 ++-
 crates/extension_host/src/extension_host.rs   |  11 +-
 crates/paths/src/paths.rs                     |   5 +
 crates/project/src/debugger/dap_store.rs      |  10 +-
 crates/project/src/project.rs                 |   4 +-
 crates/project/src/terminals.rs               |   2 +-
 .../src/disconnected_overlay.rs               |  31 +-
 crates/recent_projects/src/recent_projects.rs |  33 +-
 ...h_connections.rs => remote_connections.rs} | 138 ++---
 crates/recent_projects/src/remote_servers.rs  | 123 +++--
 crates/remote/src/remote.rs                   |   3 +-
 crates/remote/src/remote_client.rs            | 117 ++++-
 crates/remote/src/transport.rs                | 335 ++++++++++++
 crates/remote/src/transport/ssh.rs            | 341 +-----------
 crates/remote/src/transport/wsl.rs            | 494 ++++++++++++++++++
 crates/title_bar/src/title_bar.rs             |  13 +-
 crates/workspace/src/persistence.rs           | 438 +++++++++++-----
 crates/workspace/src/persistence/model.rs     |  32 +-
 crates/workspace/src/workspace.rs             |  59 +--
 crates/zed/resources/windows/zed-wsl          |  25 +
 crates/zed/src/main.rs                        |  75 +--
 crates/zed/src/zed.rs                         |   4 +-
 crates/zed/src/zed/open_listener.rs           |  91 ++--
 crates/zed/src/zed/windows_only_instance.rs   |   1 +
 script/bundle-windows.ps1                     |   1 +
 27 files changed, 1701 insertions(+), 786 deletions(-)
 rename crates/recent_projects/src/{ssh_connections.rs => remote_connections.rs} (85%)
 create mode 100644 crates/remote/src/transport/wsl.rs
 create mode 100644 crates/zed/resources/windows/zed-wsl

diff --git a/crates/auto_update_helper/src/updater.rs b/crates/auto_update_helper/src/updater.rs
index 7627716176..a48bbccec3 100644
--- a/crates/auto_update_helper/src/updater.rs
+++ b/crates/auto_update_helper/src/updater.rs
@@ -16,7 +16,7 @@ use crate::windows_impl::WM_JOB_UPDATED;
 type Job = fn(&Path) -> Result<()>;
 
 #[cfg(not(test))]
-pub(crate) const JOBS: [Job; 6] = [
+pub(crate) const JOBS: &[Job] = &[
     // Delete old files
     |app_dir| {
         let zed_executable = app_dir.join("Zed.exe");
@@ -32,6 +32,12 @@ pub(crate) const JOBS: [Job; 6] = [
         std::fs::remove_file(&zed_cli)
             .context(format!("Failed to remove old file {}", zed_cli.display()))
     },
+    |app_dir| {
+        let zed_wsl = app_dir.join("bin\\zed");
+        log::info!("Removing old file: {}", zed_wsl.display());
+        std::fs::remove_file(&zed_wsl)
+            .context(format!("Failed to remove old file {}", zed_wsl.display()))
+    },
     // Copy new files
     |app_dir| {
         let zed_executable_source = app_dir.join("install\\Zed.exe");
@@ -65,6 +71,22 @@ pub(crate) const JOBS: [Job; 6] = [
                 zed_cli_dest.display()
             ))
     },
+    |app_dir| {
+        let zed_wsl_source = app_dir.join("install\\bin\\zed");
+        let zed_wsl_dest = app_dir.join("bin\\zed");
+        log::info!(
+            "Copying new file {} to {}",
+            zed_wsl_source.display(),
+            zed_wsl_dest.display()
+        );
+        std::fs::copy(&zed_wsl_source, &zed_wsl_dest)
+            .map(|_| ())
+            .context(format!(
+                "Failed to copy new file {} to {}",
+                zed_wsl_source.display(),
+                zed_wsl_dest.display()
+            ))
+    },
     // Clean up installer folder and updates folder
     |app_dir| {
         let updates_folder = app_dir.join("updates");
@@ -85,7 +107,7 @@ pub(crate) const JOBS: [Job; 6] = [
 ];
 
 #[cfg(test)]
-pub(crate) const JOBS: [Job; 2] = [
+pub(crate) const JOBS: &[Job] = &[
     |_| {
         std::thread::sleep(Duration::from_millis(1000));
         if let Ok(config) = std::env::var("ZED_AUTO_UPDATE") {
diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs
index 6274f69035..79a10fa2b0 100644
--- a/crates/cli/src/cli.rs
+++ b/crates/cli/src/cli.rs
@@ -14,6 +14,7 @@ pub enum CliRequest {
         paths: Vec<String>,
         urls: Vec<String>,
         diff_paths: Vec<[String; 2]>,
+        wsl: Option<String>,
         wait: bool,
         open_new_workspace: Option<bool>,
         env: Option<HashMap<String, String>>,
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index b84e7a9f7a..151e96e3cf 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -6,7 +6,6 @@
 use anyhow::{Context as _, Result};
 use clap::Parser;
 use cli::{CliRequest, CliResponse, IpcHandshake, ipc::IpcOneShotServer};
-use collections::HashMap;
 use parking_lot::Mutex;
 use std::{
     env, fs, io,
@@ -85,6 +84,15 @@ struct Args {
     /// Run zed in dev-server mode
     #[arg(long)]
     dev_server_token: Option<String>,
+    /// The username and WSL distribution to use when opening paths. ,If not specified,
+    /// Zed will attempt to open the paths directly.
+    ///
+    /// The username is optional, and if not specified, the default user for the distribution
+    /// will be used.
+    ///
+    /// Example: `me@Ubuntu` or `Ubuntu` for default distribution.
+    #[arg(long, value_name = "USER@DISTRO")]
+    wsl: Option<String>,
     /// Not supported in Zed CLI, only supported on Zed binary
     /// Will attempt to give the correct command to run
     #[arg(long)]
@@ -129,14 +137,41 @@ fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
     Ok(canonicalized.to_string(|path| path.to_string_lossy().to_string()))
 }
 
-fn main() -> Result<()> {
-    #[cfg(all(not(debug_assertions), target_os = "windows"))]
-    unsafe {
-        use ::windows::Win32::System::Console::{ATTACH_PARENT_PROCESS, AttachConsole};
+fn parse_path_in_wsl(source: &str, wsl: &str) -> Result<String> {
+    let mut command = util::command::new_std_command("wsl.exe");
 
-        let _ = AttachConsole(ATTACH_PARENT_PROCESS);
+    let (user, distro_name) = if let Some((user, distro)) = wsl.split_once('@') {
+        if user.is_empty() {
+            anyhow::bail!("user is empty in wsl argument");
+        }
+        (Some(user), distro)
+    } else {
+        (None, wsl)
+    };
+
+    if let Some(user) = user {
+        command.arg("--user").arg(user);
     }
 
+    let output = command
+        .arg("--distribution")
+        .arg(distro_name)
+        .arg("wslpath")
+        .arg("-m")
+        .arg(source)
+        .output()?;
+
+    let result = String::from_utf8_lossy(&output.stdout);
+    let prefix = format!("//wsl.localhost/{}", distro_name);
+
+    Ok(result
+        .trim()
+        .strip_prefix(&prefix)
+        .unwrap_or(&result)
+        .to_string())
+}
+
+fn main() -> Result<()> {
     #[cfg(unix)]
     util::prevent_root_execution();
 
@@ -223,6 +258,8 @@ fn main() -> Result<()> {
     let env = {
         #[cfg(any(target_os = "linux", target_os = "freebsd"))]
         {
+            use collections::HashMap;
+
             // On Linux, the desktop entry uses `cli` to spawn `zed`.
             // We need to handle env vars correctly since std::env::vars() may not contain
             // project-specific vars (e.g. those set by direnv).
@@ -235,8 +272,19 @@ fn main() -> Result<()> {
             }
         }
 
-        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-        Some(std::env::vars().collect::<HashMap<_, _>>())
+        #[cfg(target_os = "windows")]
+        {
+            // On Windows, by default, a child process inherits a copy of the environment block of the parent process.
+            // So we don't need to pass env vars explicitly.
+            None
+        }
+
+        #[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "windows")))]
+        {
+            use collections::HashMap;
+
+            Some(std::env::vars().collect::<HashMap<_, _>>())
+        }
     };
 
     let exit_status = Arc::new(Mutex::new(None));
@@ -271,8 +319,10 @@ fn main() -> Result<()> {
             paths.push(tmp_file.path().to_string_lossy().to_string());
             let (tmp_file, _) = tmp_file.keep()?;
             anonymous_fd_tmp_files.push((file, tmp_file));
+        } else if let Some(wsl) = &args.wsl {
+            urls.push(format!("file://{}", parse_path_in_wsl(path, wsl)?));
         } else {
-            paths.push(parse_path_with_position(path)?)
+            paths.push(parse_path_with_position(path)?);
         }
     }
 
@@ -292,6 +342,7 @@ fn main() -> Result<()> {
                 paths,
                 urls,
                 diff_paths,
+                wsl: args.wsl,
                 wait: args.wait,
                 open_new_workspace,
                 env,
@@ -644,15 +695,15 @@ mod windows {
             Storage::FileSystem::{
                 CreateFileW, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE, OPEN_EXISTING, WriteFile,
             },
-            System::Threading::CreateMutexW,
+            System::Threading::{CREATE_NEW_PROCESS_GROUP, CreateMutexW},
         },
         core::HSTRING,
     };
 
     use crate::{Detect, InstalledApp};
-    use std::io;
     use std::path::{Path, PathBuf};
     use std::process::ExitStatus;
+    use std::{io, os::windows::process::CommandExt};
 
     fn check_single_instance() -> bool {
         let mutex = unsafe {
@@ -691,6 +742,7 @@ mod windows {
         fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
             if check_single_instance() {
                 std::process::Command::new(self.0.clone())
+                    .creation_flags(CREATE_NEW_PROCESS_GROUP.0)
                     .arg(ipc_url)
                     .spawn()?;
             } else {
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index b8189c3651..b114ad9f4c 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -43,7 +43,7 @@ use language::{
 use node_runtime::NodeRuntime;
 use project::ContextProviderWithTasks;
 use release_channel::ReleaseChannel;
-use remote::RemoteClient;
+use remote::{RemoteClient, RemoteConnectionOptions};
 use semantic_version::SemanticVersion;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -117,7 +117,7 @@ pub struct ExtensionStore {
     pub wasm_host: Arc<WasmHost>,
     pub wasm_extensions: Vec<(Arc<ExtensionManifest>, WasmExtension)>,
     pub tasks: Vec<Task<()>>,
-    pub remote_clients: HashMap<String, WeakEntity<RemoteClient>>,
+    pub remote_clients: HashMap<RemoteConnectionOptions, WeakEntity<RemoteClient>>,
     pub ssh_registered_tx: UnboundedSender<()>,
 }
 
@@ -1779,16 +1779,15 @@ impl ExtensionStore {
     }
 
     pub fn register_remote_client(&mut self, client: Entity<RemoteClient>, cx: &mut Context<Self>) {
-        let connection_options = client.read(cx).connection_options();
-        let ssh_url = connection_options.ssh_url();
+        let options = client.read(cx).connection_options();
 
-        if let Some(existing_client) = self.remote_clients.get(&ssh_url)
+        if let Some(existing_client) = self.remote_clients.get(&options)
             && existing_client.upgrade().is_some()
         {
             return;
         }
 
-        self.remote_clients.insert(ssh_url, client.downgrade());
+        self.remote_clients.insert(options, client.downgrade());
         self.ssh_registered_tx.unbounded_send(()).ok();
     }
 }
diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs
index c2c3c89305..ede42af027 100644
--- a/crates/paths/src/paths.rs
+++ b/crates/paths/src/paths.rs
@@ -33,6 +33,11 @@ pub fn remote_server_dir_relative() -> &'static Path {
     Path::new(".zed_server")
 }
 
+/// Returns the relative path to the zed_wsl_server directory on the wsl host.
+pub fn remote_wsl_server_dir_relative() -> &'static Path {
+    Path::new(".zed_wsl_server")
+}
+
 /// Sets a custom directory for all user data, overriding the default data directory.
 /// This function must be called before any other path operations that depend on the data directory.
 /// The directory's path will be canonicalized to an absolute path by a blocking FS operation.
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
index d8c6d3acc1..6c1449b728 100644
--- a/crates/project/src/debugger/dap_store.rs
+++ b/crates/project/src/debugger/dap_store.rs
@@ -258,8 +258,14 @@ impl DapStore {
                     let connection;
                     if let Some(c) = binary.connection {
                         let host = Ipv4Addr::LOCALHOST;
-                        let port = dap::transport::TcpTransport::unused_port(host).await?;
-                        port_forwarding = Some((port, c.host.to_string(), c.port));
+                        let port;
+                        if remote.read_with(cx, |remote, _cx| remote.shares_network_interface())? {
+                            port = c.port;
+                            port_forwarding = None;
+                        } else {
+                            port = dap::transport::TcpTransport::unused_port(host).await?;
+                            port_forwarding = Some((port, c.host.to_string(), c.port));
+                        }
                         connection = Some(TcpArguments {
                             port,
                             host,
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index b32e95741f..557367edf5 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -87,7 +87,7 @@ use node_runtime::NodeRuntime;
 use parking_lot::Mutex;
 pub use prettier_store::PrettierStore;
 use project_settings::{ProjectSettings, SettingsObserver, SettingsObserverEvent};
-use remote::{RemoteClient, SshConnectionOptions};
+use remote::{RemoteClient, RemoteConnectionOptions};
 use rpc::{
     AnyProtoClient, ErrorCode,
     proto::{FromProto, LanguageServerPromptResponse, REMOTE_SERVER_PROJECT_ID, ToProto},
@@ -1916,7 +1916,7 @@ impl Project {
             .map(|remote| remote.read(cx).connection_state())
     }
 
-    pub fn remote_connection_options(&self, cx: &App) -> Option<SshConnectionOptions> {
+    pub fn remote_connection_options(&self, cx: &App) -> Option<RemoteConnectionOptions> {
         self.remote_client
             .as_ref()
             .map(|remote| remote.read(cx).connection_options())
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index c189242fad..597da04617 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -512,7 +512,7 @@ fn create_remote_shell(
     *env = command.env;
 
     log::debug!("Connecting to a remote server: {:?}", command.program);
-    let host = remote_client.read(cx).connection_options().host;
+    let host = remote_client.read(cx).connection_options().display_name();
 
     Ok(Shell::WithArguments {
         program: command.program,
diff --git a/crates/recent_projects/src/disconnected_overlay.rs b/crates/recent_projects/src/disconnected_overlay.rs
index 36da6897b9..c97f7062a8 100644
--- a/crates/recent_projects/src/disconnected_overlay.rs
+++ b/crates/recent_projects/src/disconnected_overlay.rs
@@ -1,6 +1,6 @@
 use gpui::{ClickEvent, DismissEvent, EventEmitter, FocusHandle, Focusable, Render, WeakEntity};
 use project::project_settings::ProjectSettings;
-use remote::SshConnectionOptions;
+use remote::RemoteConnectionOptions;
 use settings::Settings;
 use ui::{
     Button, ButtonCommon, ButtonStyle, Clickable, Context, ElevationIndex, FluentBuilder, Headline,
@@ -9,11 +9,11 @@ use ui::{
 };
 use workspace::{ModalView, OpenOptions, Workspace, notifications::DetachAndPromptErr};
 
-use crate::open_ssh_project;
+use crate::open_remote_project;
 
 enum Host {
-    RemoteProject,
-    SshRemoteProject(SshConnectionOptions),
+    CollabGuestProject,
+    RemoteServerProject(RemoteConnectionOptions),
 }
 
 pub struct DisconnectedOverlay {
@@ -66,9 +66,9 @@ impl DisconnectedOverlay {
 
                 let remote_connection_options = project.read(cx).remote_connection_options(cx);
                 let host = if let Some(ssh_connection_options) = remote_connection_options {
-                    Host::SshRemoteProject(ssh_connection_options)
+                    Host::RemoteServerProject(ssh_connection_options)
                 } else {
-                    Host::RemoteProject
+                    Host::CollabGuestProject
                 };
 
                 workspace.toggle_modal(window, cx, |_, cx| DisconnectedOverlay {
@@ -86,14 +86,14 @@ impl DisconnectedOverlay {
         self.finished = true;
         cx.emit(DismissEvent);
 
-        if let Host::SshRemoteProject(ssh_connection_options) = &self.host {
-            self.reconnect_to_ssh_remote(ssh_connection_options.clone(), window, cx);
+        if let Host::RemoteServerProject(ssh_connection_options) = &self.host {
+            self.reconnect_to_remote_project(ssh_connection_options.clone(), window, cx);
         }
     }
 
-    fn reconnect_to_ssh_remote(
+    fn reconnect_to_remote_project(
         &self,
-        connection_options: SshConnectionOptions,
+        connection_options: RemoteConnectionOptions,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -114,7 +114,7 @@ impl DisconnectedOverlay {
             .collect();
 
         cx.spawn_in(window, async move |_, cx| {
-            open_ssh_project(
+            open_remote_project(
                 connection_options,
                 paths,
                 app_state,
@@ -138,13 +138,13 @@ impl DisconnectedOverlay {
 
 impl Render for DisconnectedOverlay {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let can_reconnect = matches!(self.host, Host::SshRemoteProject(_));
+        let can_reconnect = matches!(self.host, Host::RemoteServerProject(_));
 
         let message = match &self.host {
-            Host::RemoteProject => {
+            Host::CollabGuestProject => {
                 "Your connection to the remote project has been lost.".to_string()
             }
-            Host::SshRemoteProject(options) => {
+            Host::RemoteServerProject(options) => {
                 let autosave = if ProjectSettings::get_global(cx)
                     .session
                     .restore_unsaved_buffers
@@ -155,7 +155,8 @@ impl Render for DisconnectedOverlay {
                 };
                 format!(
                     "Your connection to {} has been lost.{}",
-                    options.host, autosave
+                    options.display_name(),
+                    autosave
                 )
             }
         };
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index fa57b588cd..aa0ce7661b 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -1,9 +1,10 @@
 pub mod disconnected_overlay;
+mod remote_connections;
 mod remote_servers;
 mod ssh_config;
-mod ssh_connections;
 
-pub use ssh_connections::{is_connecting_over_ssh, open_ssh_project};
+use remote::RemoteConnectionOptions;
+pub use remote_connections::open_remote_project;
 
 use disconnected_overlay::DisconnectedOverlay;
 use fuzzy::{StringMatch, StringMatchCandidate};
@@ -16,9 +17,9 @@ use picker::{
     Picker, PickerDelegate,
     highlighted_match_with_paths::{HighlightedMatch, HighlightedMatchWithPaths},
 };
+pub use remote_connections::SshSettings;
 pub use remote_servers::RemoteServerProjects;
 use settings::Settings;
-pub use ssh_connections::SshSettings;
 use std::{path::Path, sync::Arc};
 use ui::{KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*, tooltip_container};
 use util::{ResultExt, paths::PathExt};
@@ -290,7 +291,7 @@ impl PickerDelegate for RecentProjectsDelegate {
                     if workspace.database_id() == Some(*candidate_workspace_id) {
                         Task::ready(Ok(()))
                     } else {
-                        match candidate_workspace_location {
+                        match candidate_workspace_location.clone() {
                             SerializedWorkspaceLocation::Local => {
                                 let paths = candidate_workspace_paths.paths().to_vec();
                                 if replace_current_window {
@@ -320,7 +321,7 @@ impl PickerDelegate for RecentProjectsDelegate {
                                     workspace.open_workspace_for_paths(false, paths, window, cx)
                                 }
                             }
-                            SerializedWorkspaceLocation::Ssh(connection) => {
+                            SerializedWorkspaceLocation::Remote(mut connection) => {
                                 let app_state = workspace.app_state().clone();
 
                                 let replace_window = if replace_current_window {
@@ -334,18 +335,16 @@ impl PickerDelegate for RecentProjectsDelegate {
                                     ..Default::default()
                                 };
 
-                                let connection_options = SshSettings::get_global(cx)
-                                    .connection_options_for(
-                                        connection.host.clone(),
-                                        connection.port,
-                                        connection.user.clone(),
-                                    );
+                                if let RemoteConnectionOptions::Ssh(connection) = &mut connection {
+                                    SshSettings::get_global(cx)
+                                        .fill_connection_options_from_settings(connection);
+                                };
 
                                 let paths = candidate_workspace_paths.paths().to_vec();
 
                                 cx.spawn_in(window, async move |_, cx| {
-                                    open_ssh_project(
-                                        connection_options,
+                                    open_remote_project(
+                                        connection.clone(),
                                         paths,
                                         app_state,
                                         open_options,
@@ -418,9 +417,11 @@ impl PickerDelegate for RecentProjectsDelegate {
                                 SerializedWorkspaceLocation::Local => Icon::new(IconName::Screen)
                                     .color(Color::Muted)
                                     .into_any_element(),
-                                SerializedWorkspaceLocation::Ssh(_) => Icon::new(IconName::Server)
-                                    .color(Color::Muted)
-                                    .into_any_element(),
+                                SerializedWorkspaceLocation::Remote(_) => {
+                                    Icon::new(IconName::Server)
+                                        .color(Color::Muted)
+                                        .into_any_element()
+                                }
                             })
                         })
                         .child({
diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/remote_connections.rs
similarity index 85%
rename from crates/recent_projects/src/ssh_connections.rs
rename to crates/recent_projects/src/remote_connections.rs
index 29f6e75bbd..47607813b5 100644
--- a/crates/recent_projects/src/ssh_connections.rs
+++ b/crates/recent_projects/src/remote_connections.rs
@@ -16,7 +16,8 @@ use language::CursorShape;
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
 use release_channel::ReleaseChannel;
 use remote::{
-    ConnectionIdentifier, RemoteClient, RemotePlatform, SshConnectionOptions, SshPortForwardOption,
+    ConnectionIdentifier, RemoteClient, RemoteConnectionOptions, RemotePlatform,
+    SshConnectionOptions, SshPortForwardOption,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -42,32 +43,35 @@ impl SshSettings {
         self.ssh_connections.clone().into_iter().flatten()
     }
 
+    pub fn fill_connection_options_from_settings(&self, options: &mut SshConnectionOptions) {
+        for conn in self.ssh_connections() {
+            if conn.host == options.host
+                && conn.username == options.username
+                && conn.port == options.port
+            {
+                options.nickname = conn.nickname;
+                options.upload_binary_over_ssh = conn.upload_binary_over_ssh.unwrap_or_default();
+                options.args = Some(conn.args);
+                options.port_forwards = conn.port_forwards;
+                break;
+            }
+        }
+    }
+
     pub fn connection_options_for(
         &self,
         host: String,
         port: Option<u16>,
         username: Option<String>,
     ) -> SshConnectionOptions {
-        for conn in self.ssh_connections() {
-            if conn.host == host && conn.username == username && conn.port == port {
-                return SshConnectionOptions {
-                    nickname: conn.nickname,
-                    upload_binary_over_ssh: conn.upload_binary_over_ssh.unwrap_or_default(),
-                    args: Some(conn.args),
-                    host,
-                    port,
-                    username,
-                    port_forwards: conn.port_forwards,
-                    password: None,
-                };
-            }
-        }
-        SshConnectionOptions {
+        let mut options = SshConnectionOptions {
             host,
             port,
             username,
             ..Default::default()
-        }
+        };
+        self.fill_connection_options_from_settings(&mut options);
+        options
     }
 }
 
@@ -135,7 +139,7 @@ impl Settings for SshSettings {
     fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
 
-pub struct SshPrompt {
+pub struct RemoteConnectionPrompt {
     connection_string: SharedString,
     nickname: Option<SharedString>,
     status_message: Option<SharedString>,
@@ -144,7 +148,7 @@ pub struct SshPrompt {
     editor: Entity<Editor>,
 }
 
-impl Drop for SshPrompt {
+impl Drop for RemoteConnectionPrompt {
     fn drop(&mut self) {
         if let Some(cancel) = self.cancellation.take() {
             cancel.send(()).ok();
@@ -152,24 +156,22 @@ impl Drop for SshPrompt {
     }
 }
 
-pub struct SshConnectionModal {
-    pub(crate) prompt: Entity<SshPrompt>,
+pub struct RemoteConnectionModal {
+    pub(crate) prompt: Entity<RemoteConnectionPrompt>,
     paths: Vec<PathBuf>,
     finished: bool,
 }
 
-impl SshPrompt {
+impl RemoteConnectionPrompt {
     pub(crate) fn new(
-        connection_options: &SshConnectionOptions,
+        connection_string: String,
+        nickname: Option<String>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let connection_string = connection_options.connection_string().into();
-        let nickname = connection_options.nickname.clone().map(|s| s.into());
-
         Self {
-            connection_string,
-            nickname,
+            connection_string: connection_string.into(),
+            nickname: nickname.map(|nickname| nickname.into()),
             editor: cx.new(|cx| Editor::single_line(window, cx)),
             status_message: None,
             cancellation: None,
@@ -232,7 +234,7 @@ impl SshPrompt {
     }
 }
 
-impl Render for SshPrompt {
+impl Render for RemoteConnectionPrompt {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let theme = ThemeSettings::get_global(cx);
 
@@ -297,15 +299,22 @@ impl Render for SshPrompt {
     }
 }
 
-impl SshConnectionModal {
+impl RemoteConnectionModal {
     pub(crate) fn new(
-        connection_options: &SshConnectionOptions,
+        connection_options: &RemoteConnectionOptions,
         paths: Vec<PathBuf>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
+        let (connection_string, nickname) = match connection_options {
+            RemoteConnectionOptions::Ssh(options) => {
+                (options.connection_string(), options.nickname.clone())
+            }
+            RemoteConnectionOptions::Wsl(options) => (options.distro_name.clone(), None),
+        };
         Self {
-            prompt: cx.new(|cx| SshPrompt::new(connection_options, window, cx)),
+            prompt: cx
+                .new(|cx| RemoteConnectionPrompt::new(connection_string, nickname, window, cx)),
             finished: false,
             paths,
         }
@@ -386,7 +395,7 @@ impl RenderOnce for SshConnectionHeader {
     }
 }
 
-impl Render for SshConnectionModal {
+impl Render for RemoteConnectionModal {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
         let nickname = self.prompt.read(cx).nickname.clone();
         let connection_string = self.prompt.read(cx).connection_string.clone();
@@ -423,15 +432,15 @@ impl Render for SshConnectionModal {
     }
 }
 
-impl Focusable for SshConnectionModal {
+impl Focusable for RemoteConnectionModal {
     fn focus_handle(&self, cx: &gpui::App) -> gpui::FocusHandle {
         self.prompt.read(cx).editor.focus_handle(cx)
     }
 }
 
-impl EventEmitter<DismissEvent> for SshConnectionModal {}
+impl EventEmitter<DismissEvent> for RemoteConnectionModal {}
 
-impl ModalView for SshConnectionModal {
+impl ModalView for RemoteConnectionModal {
     fn on_before_dismiss(
         &mut self,
         _window: &mut Window,
@@ -446,13 +455,13 @@ impl ModalView for SshConnectionModal {
 }
 
 #[derive(Clone)]
-pub struct SshClientDelegate {
+pub struct RemoteClientDelegate {
     window: AnyWindowHandle,
-    ui: WeakEntity<SshPrompt>,
+    ui: WeakEntity<RemoteConnectionPrompt>,
     known_password: Option<String>,
 }
 
-impl remote::RemoteClientDelegate for SshClientDelegate {
+impl remote::RemoteClientDelegate for RemoteClientDelegate {
     fn ask_password(&self, prompt: String, tx: oneshot::Sender<String>, cx: &mut AsyncApp) {
         let mut known_password = self.known_password.clone();
         if let Some(password) = known_password.take() {
@@ -522,7 +531,7 @@ impl remote::RemoteClientDelegate for SshClientDelegate {
     }
 }
 
-impl SshClientDelegate {
+impl RemoteClientDelegate {
     fn update_status(&self, status: Option<&str>, cx: &mut AsyncApp) {
         self.window
             .update(cx, |_, _, cx| {
@@ -534,14 +543,10 @@ impl SshClientDelegate {
     }
 }
 
-pub fn is_connecting_over_ssh(workspace: &Workspace, cx: &App) -> bool {
-    workspace.active_modal::<SshConnectionModal>(cx).is_some()
-}
-
 pub fn connect_over_ssh(
     unique_identifier: ConnectionIdentifier,
     connection_options: SshConnectionOptions,
-    ui: Entity<SshPrompt>,
+    ui: Entity<RemoteConnectionPrompt>,
     window: &mut Window,
     cx: &mut App,
 ) -> Task<Result<Option<Entity<RemoteClient>>>> {
@@ -554,7 +559,7 @@ pub fn connect_over_ssh(
         unique_identifier,
         connection_options,
         rx,
-        Arc::new(SshClientDelegate {
+        Arc::new(RemoteClientDelegate {
             window,
             ui: ui.downgrade(),
             known_password,
@@ -563,8 +568,8 @@ pub fn connect_over_ssh(
     )
 }
 
-pub async fn open_ssh_project(
-    connection_options: SshConnectionOptions,
+pub async fn open_remote_project(
+    connection_options: RemoteConnectionOptions,
     paths: Vec<PathBuf>,
     app_state: Arc<AppState>,
     open_options: workspace::OpenOptions,
@@ -575,13 +580,7 @@ pub async fn open_ssh_project(
     } else {
         let workspace_position = cx
             .update(|cx| {
-                workspace::ssh_workspace_position_from_db(
-                    connection_options.host.clone(),
-                    connection_options.port,
-                    connection_options.username.clone(),
-                    &paths,
-                    cx,
-                )
+                workspace::remote_workspace_position_from_db(connection_options.clone(), &paths, cx)
             })?
             .await
             .context("fetching ssh workspace position from db")?;
@@ -611,16 +610,16 @@ pub async fn open_ssh_project(
     loop {
         let (cancel_tx, cancel_rx) = oneshot::channel();
         let delegate = window.update(cx, {
-            let connection_options = connection_options.clone();
             let paths = paths.clone();
+            let connection_options = connection_options.clone();
             move |workspace, window, cx| {
                 window.activate_window();
                 workspace.toggle_modal(window, cx, |window, cx| {
-                    SshConnectionModal::new(&connection_options, paths, window, cx)
+                    RemoteConnectionModal::new(&connection_options, paths, window, cx)
                 });
 
                 let ui = workspace
-                    .active_modal::<SshConnectionModal>(cx)?
+                    .active_modal::<RemoteConnectionModal>(cx)?
                     .read(cx)
                     .prompt
                     .clone();
@@ -629,19 +628,25 @@ pub async fn open_ssh_project(
                     ui.set_cancellation_tx(cancel_tx);
                 });
 
-                Some(Arc::new(SshClientDelegate {
+                Some(Arc::new(RemoteClientDelegate {
                     window: window.window_handle(),
                     ui: ui.downgrade(),
-                    known_password: connection_options.password.clone(),
+                    known_password: if let RemoteConnectionOptions::Ssh(options) =
+                        &connection_options
+                    {
+                        options.password.clone()
+                    } else {
+                        None
+                    },
                 }))
             }
         })?;
 
         let Some(delegate) = delegate else { break };
 
-        let did_open_ssh_project = cx
+        let did_open_project = cx
             .update(|cx| {
-                workspace::open_ssh_project_with_new_connection(
+                workspace::open_remote_project_with_new_connection(
                     window,
                     connection_options.clone(),
                     cancel_rx,
@@ -655,19 +660,22 @@ pub async fn open_ssh_project(
 
         window
             .update(cx, |workspace, _, cx| {
-                if let Some(ui) = workspace.active_modal::<SshConnectionModal>(cx) {
+                if let Some(ui) = workspace.active_modal::<RemoteConnectionModal>(cx) {
                     ui.update(cx, |modal, cx| modal.finished(cx))
                 }
             })
             .ok();
 
-        if let Err(e) = did_open_ssh_project {
+        if let Err(e) = did_open_project {
             log::error!("Failed to open project: {e:?}");
             let response = window
                 .update(cx, |_, window, cx| {
                     window.prompt(
                         PromptLevel::Critical,
-                        "Failed to connect over SSH",
+                        match connection_options {
+                            RemoteConnectionOptions::Ssh(_) => "Failed to connect over SSH",
+                            RemoteConnectionOptions::Wsl(_) => "Failed to connect to WSL",
+                        },
                         Some(&e.to_string()),
                         &["Retry", "Ok"],
                         cx,
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index f4fd1f1c1b..3cf084bef7 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1,70 +1,52 @@
-use std::any::Any;
-use std::borrow::Cow;
-use std::collections::BTreeSet;
-use std::path::PathBuf;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::sync::atomic;
-use std::sync::atomic::AtomicUsize;
-
+use crate::{
+    remote_connections::{
+        RemoteConnectionModal, RemoteConnectionPrompt, RemoteSettingsContent, SshConnection,
+        SshConnectionHeader, SshProject, SshSettings, connect_over_ssh, open_remote_project,
+    },
+    ssh_config::parse_ssh_config_hosts,
+};
 use editor::Editor;
 use file_finder::OpenPathDelegate;
-use futures::FutureExt;
-use futures::channel::oneshot;
-use futures::future::Shared;
-use futures::select;
-use gpui::ClickEvent;
-use gpui::ClipboardItem;
-use gpui::Subscription;
-use gpui::Task;
-use gpui::WeakEntity;
-use gpui::canvas;
+use futures::{FutureExt, channel::oneshot, future::Shared, select};
 use gpui::{
-    AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    PromptLevel, ScrollHandle, Window,
+    AnyElement, App, ClickEvent, ClipboardItem, Context, DismissEvent, Entity, EventEmitter,
+    FocusHandle, Focusable, PromptLevel, ScrollHandle, Subscription, Task, WeakEntity, Window,
+    canvas,
 };
-use paths::global_ssh_config_file;
-use paths::user_ssh_config_file;
+use paths::{global_ssh_config_file, user_ssh_config_file};
 use picker::Picker;
-use project::Fs;
-use project::Project;
-use remote::remote_client::ConnectionIdentifier;
-use remote::{RemoteClient, SshConnectionOptions};
-use settings::Settings;
-use settings::SettingsStore;
-use settings::update_settings_file;
-use settings::watch_config_file;
+use project::{Fs, Project};
+use remote::{
+    RemoteClient, RemoteConnectionOptions, SshConnectionOptions,
+    remote_client::ConnectionIdentifier,
+};
+use settings::{Settings, SettingsStore, update_settings_file, watch_config_file};
 use smol::stream::StreamExt as _;
-use ui::Navigable;
-use ui::NavigableEntry;
+use std::{
+    any::Any,
+    borrow::Cow,
+    collections::BTreeSet,
+    path::PathBuf,
+    rc::Rc,
+    sync::{
+        Arc,
+        atomic::{self, AtomicUsize},
+    },
+};
 use ui::{
-    IconButtonShape, List, ListItem, ListSeparator, Modal, ModalHeader, Scrollbar, ScrollbarState,
-    Section, Tooltip, prelude::*,
+    IconButtonShape, List, ListItem, ListSeparator, Modal, ModalHeader, Navigable, NavigableEntry,
+    Scrollbar, ScrollbarState, Section, Tooltip, prelude::*,
 };
 use util::{
     ResultExt,
     paths::{PathStyle, RemotePathBuf},
 };
-use workspace::OpenOptions;
-use workspace::Toast;
-use workspace::notifications::NotificationId;
 use workspace::{
-    ModalView, Workspace, notifications::DetachAndPromptErr,
-    open_ssh_project_with_existing_connection,
+    ModalView, OpenOptions, Toast, Workspace,
+    notifications::{DetachAndPromptErr, NotificationId},
+    open_remote_project_with_existing_connection,
 };
 
-use crate::ssh_config::parse_ssh_config_hosts;
-use crate::ssh_connections::RemoteSettingsContent;
-use crate::ssh_connections::SshConnection;
-use crate::ssh_connections::SshConnectionHeader;
-use crate::ssh_connections::SshConnectionModal;
-use crate::ssh_connections::SshProject;
-use crate::ssh_connections::SshPrompt;
-use crate::ssh_connections::SshSettings;
-use crate::ssh_connections::connect_over_ssh;
-use crate::ssh_connections::open_ssh_project;
-
-mod navigation_base {}
 pub struct RemoteServerProjects {
     mode: Mode,
     focus_handle: FocusHandle,
@@ -79,7 +61,7 @@ pub struct RemoteServerProjects {
 struct CreateRemoteServer {
     address_editor: Entity<Editor>,
     address_error: Option<SharedString>,
-    ssh_prompt: Option<Entity<SshPrompt>>,
+    ssh_prompt: Option<Entity<RemoteConnectionPrompt>>,
     _creating: Option<Task<Option<()>>>,
 }
 
@@ -222,8 +204,13 @@ impl ProjectPicker {
                         })
                         .log_err()?;
 
-                    open_ssh_project_with_existing_connection(
-                        connection, project, paths, app_state, window, cx,
+                    open_remote_project_with_existing_connection(
+                        RemoteConnectionOptions::Ssh(connection),
+                        project,
+                        paths,
+                        app_state,
+                        window,
+                        cx,
                     )
                     .await
                     .log_err();
@@ -472,7 +459,14 @@ impl RemoteServerProjects {
                 return;
             }
         };
-        let ssh_prompt = cx.new(|cx| SshPrompt::new(&connection_options, window, cx));
+        let ssh_prompt = cx.new(|cx| {
+            RemoteConnectionPrompt::new(
+                connection_options.connection_string(),
+                connection_options.nickname.clone(),
+                window,
+                cx,
+            )
+        });
 
         let connection = connect_over_ssh(
             ConnectionIdentifier::setup(),
@@ -552,15 +546,20 @@ impl RemoteServerProjects {
         };
 
         let create_new_window = self.create_new_window;
-        let connection_options = ssh_connection.into();
+        let connection_options: SshConnectionOptions = ssh_connection.into();
         workspace.update(cx, |_, cx| {
             cx.defer_in(window, move |workspace, window, cx| {
                 let app_state = workspace.app_state().clone();
                 workspace.toggle_modal(window, cx, |window, cx| {
-                    SshConnectionModal::new(&connection_options, Vec::new(), window, cx)
+                    RemoteConnectionModal::new(
+                        &RemoteConnectionOptions::Ssh(connection_options.clone()),
+                        Vec::new(),
+                        window,
+                        cx,
+                    )
                 });
                 let prompt = workspace
-                    .active_modal::<SshConnectionModal>(cx)
+                    .active_modal::<RemoteConnectionModal>(cx)
                     .unwrap()
                     .read(cx)
                     .prompt
@@ -579,7 +578,7 @@ impl RemoteServerProjects {
                     let session = connect.await;
 
                     workspace.update(cx, |workspace, cx| {
-                        if let Some(prompt) = workspace.active_modal::<SshConnectionModal>(cx) {
+                        if let Some(prompt) = workspace.active_modal::<RemoteConnectionModal>(cx) {
                             prompt.update(cx, |prompt, cx| prompt.finished(cx))
                         }
                     })?;
@@ -898,8 +897,8 @@ impl RemoteServerProjects {
                 };
 
                 cx.spawn_in(window, async move |_, cx| {
-                    let result = open_ssh_project(
-                        server.into(),
+                    let result = open_remote_project(
+                        RemoteConnectionOptions::Ssh(server.into()),
                         project.paths.into_iter().map(PathBuf::from).collect(),
                         app_state,
                         OpenOptions {
diff --git a/crates/remote/src/remote.rs b/crates/remote/src/remote.rs
index c698353d9e..74d45b1a69 100644
--- a/crates/remote/src/remote.rs
+++ b/crates/remote/src/remote.rs
@@ -6,6 +6,7 @@ mod transport;
 
 pub use remote_client::{
     ConnectionIdentifier, ConnectionState, RemoteClient, RemoteClientDelegate, RemoteClientEvent,
-    RemotePlatform,
+    RemoteConnectionOptions, RemotePlatform,
 };
 pub use transport::ssh::{SshConnectionOptions, SshPortForwardOption};
+pub use transport::wsl::WslConnectionOptions;
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
index 7e231e622c..501c6a8dd6 100644
--- a/crates/remote/src/remote_client.rs
+++ b/crates/remote/src/remote_client.rs
@@ -1,6 +1,11 @@
 use crate::{
-    SshConnectionOptions, protocol::MessageId, proxy::ProxyLaunchError,
-    transport::ssh::SshRemoteConnection,
+    SshConnectionOptions,
+    protocol::MessageId,
+    proxy::ProxyLaunchError,
+    transport::{
+        ssh::SshRemoteConnection,
+        wsl::{WslConnectionOptions, WslRemoteConnection},
+    },
 };
 use anyhow::{Context as _, Result, anyhow};
 use async_trait::async_trait;
@@ -237,7 +242,7 @@ impl From<&State> for ConnectionState {
 pub struct RemoteClient {
     client: Arc<ChannelClient>,
     unique_identifier: String,
-    connection_options: SshConnectionOptions,
+    connection_options: RemoteConnectionOptions,
     path_style: PathStyle,
     state: Option<State>,
 }
@@ -290,6 +295,22 @@ impl RemoteClient {
         cancellation: oneshot::Receiver<()>,
         delegate: Arc<dyn RemoteClientDelegate>,
         cx: &mut App,
+    ) -> Task<Result<Option<Entity<Self>>>> {
+        Self::new(
+            unique_identifier,
+            RemoteConnectionOptions::Ssh(connection_options),
+            cancellation,
+            delegate,
+            cx,
+        )
+    }
+
+    pub fn new(
+        unique_identifier: ConnectionIdentifier,
+        connection_options: RemoteConnectionOptions,
+        cancellation: oneshot::Receiver<()>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut App,
     ) -> Task<Result<Option<Entity<Self>>>> {
         let unique_identifier = unique_identifier.to_string(cx);
         cx.spawn(async move |cx| {
@@ -424,7 +445,7 @@ impl RemoteClient {
         }
 
         let state = self.state.take().unwrap();
-        let (attempts, ssh_connection, delegate) = match state {
+        let (attempts, remote_connection, delegate) = match state {
             State::Connected {
                 ssh_connection,
                 delegate,
@@ -482,15 +503,15 @@ impl RemoteClient {
                 };
             }
 
-            if let Err(error) = ssh_connection
+            if let Err(error) = remote_connection
                 .kill()
                 .await
                 .context("Failed to kill ssh process")
             {
-                failed!(error, attempts, ssh_connection, delegate);
+                failed!(error, attempts, remote_connection, delegate);
             };
 
-            let connection_options = ssh_connection.connection_options();
+            let connection_options = remote_connection.connection_options();
 
             let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
             let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
@@ -519,7 +540,7 @@ impl RemoteClient {
             {
                 Ok((ssh_connection, io_task)) => (ssh_connection, io_task),
                 Err(error) => {
-                    failed!(error, attempts, ssh_connection, delegate);
+                    failed!(error, attempts, remote_connection, delegate);
                 }
             };
 
@@ -751,6 +772,13 @@ impl RemoteClient {
         Some(self.state.as_ref()?.remote_connection()?.shell())
     }
 
+    pub fn shares_network_interface(&self) -> bool {
+        self.state
+            .as_ref()
+            .and_then(|state| state.remote_connection())
+            .map_or(false, |connection| connection.shares_network_interface())
+    }
+
     pub fn build_command(
         &self,
         program: Option<String>,
@@ -789,11 +817,7 @@ impl RemoteClient {
         self.client.clone().into()
     }
 
-    pub fn host(&self) -> String {
-        self.connection_options.host.clone()
-    }
-
-    pub fn connection_options(&self) -> SshConnectionOptions {
+    pub fn connection_options(&self) -> RemoteConnectionOptions {
         self.connection_options.clone()
     }
 
@@ -836,14 +860,14 @@ impl RemoteClient {
     pub fn fake_server(
         client_cx: &mut gpui::TestAppContext,
         server_cx: &mut gpui::TestAppContext,
-    ) -> (SshConnectionOptions, AnyProtoClient) {
+    ) -> (RemoteConnectionOptions, AnyProtoClient) {
         let port = client_cx
             .update(|cx| cx.default_global::<ConnectionPool>().connections.len() as u16 + 1);
-        let opts = SshConnectionOptions {
+        let opts = RemoteConnectionOptions::Ssh(SshConnectionOptions {
             host: "<fake>".to_string(),
             port: Some(port),
             ..Default::default()
-        };
+        });
         let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
         let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
         let server_client =
@@ -874,13 +898,13 @@ impl RemoteClient {
 
     #[cfg(any(test, feature = "test-support"))]
     pub async fn fake_client(
-        opts: SshConnectionOptions,
+        opts: RemoteConnectionOptions,
         client_cx: &mut gpui::TestAppContext,
     ) -> Entity<Self> {
         let (_tx, rx) = oneshot::channel();
         client_cx
             .update(|cx| {
-                Self::ssh(
+                Self::new(
                     ConnectionIdentifier::setup(),
                     opts,
                     rx,
@@ -901,7 +925,7 @@ enum ConnectionPoolEntry {
 
 #[derive(Default)]
 struct ConnectionPool {
-    connections: HashMap<SshConnectionOptions, ConnectionPoolEntry>,
+    connections: HashMap<RemoteConnectionOptions, ConnectionPoolEntry>,
 }
 
 impl Global for ConnectionPool {}
@@ -909,7 +933,7 @@ impl Global for ConnectionPool {}
 impl ConnectionPool {
     pub fn connect(
         &mut self,
-        opts: SshConnectionOptions,
+        opts: RemoteConnectionOptions,
         delegate: &Arc<dyn RemoteClientDelegate>,
         cx: &mut App,
     ) -> Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>> {
@@ -939,9 +963,18 @@ impl ConnectionPool {
                 let opts = opts.clone();
                 let delegate = delegate.clone();
                 async move |cx| {
-                    let connection = SshRemoteConnection::new(opts.clone(), delegate, cx)
-                        .await
-                        .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>);
+                    let connection = match opts.clone() {
+                        RemoteConnectionOptions::Ssh(opts) => {
+                            SshRemoteConnection::new(opts, delegate, cx)
+                                .await
+                                .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>)
+                        }
+                        RemoteConnectionOptions::Wsl(opts) => {
+                            WslRemoteConnection::new(opts, delegate, cx)
+                                .await
+                                .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>)
+                        }
+                    };
 
                     cx.update_global(|pool: &mut Self, _| {
                         debug_assert!(matches!(
@@ -972,6 +1005,33 @@ impl ConnectionPool {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum RemoteConnectionOptions {
+    Ssh(SshConnectionOptions),
+    Wsl(WslConnectionOptions),
+}
+
+impl RemoteConnectionOptions {
+    pub fn display_name(&self) -> String {
+        match self {
+            RemoteConnectionOptions::Ssh(opts) => opts.host.clone(),
+            RemoteConnectionOptions::Wsl(opts) => opts.distro_name.clone(),
+        }
+    }
+}
+
+impl From<SshConnectionOptions> for RemoteConnectionOptions {
+    fn from(opts: SshConnectionOptions) -> Self {
+        RemoteConnectionOptions::Ssh(opts)
+    }
+}
+
+impl From<WslConnectionOptions> for RemoteConnectionOptions {
+    fn from(opts: WslConnectionOptions) -> Self {
+        RemoteConnectionOptions::Wsl(opts)
+    }
+}
+
 #[async_trait(?Send)]
 pub(crate) trait RemoteConnection: Send + Sync {
     fn start_proxy(
@@ -992,6 +1052,9 @@ pub(crate) trait RemoteConnection: Send + Sync {
     ) -> Task<Result<()>>;
     async fn kill(&self) -> Result<()>;
     fn has_been_killed(&self) -> bool;
+    fn shares_network_interface(&self) -> bool {
+        false
+    }
     fn build_command(
         &self,
         program: Option<String>,
@@ -1000,7 +1063,7 @@ pub(crate) trait RemoteConnection: Send + Sync {
         working_dir: Option<String>,
         port_forward: Option<(u16, String, u16)>,
     ) -> Result<CommandTemplate>;
-    fn connection_options(&self) -> SshConnectionOptions;
+    fn connection_options(&self) -> RemoteConnectionOptions;
     fn path_style(&self) -> PathStyle;
     fn shell(&self) -> String;
 
@@ -1307,7 +1370,7 @@ impl ProtoClient for ChannelClient {
 #[cfg(any(test, feature = "test-support"))]
 mod fake {
     use super::{ChannelClient, RemoteClientDelegate, RemoteConnection, RemotePlatform};
-    use crate::{SshConnectionOptions, remote_client::CommandTemplate};
+    use crate::remote_client::{CommandTemplate, RemoteConnectionOptions};
     use anyhow::Result;
     use async_trait::async_trait;
     use collections::HashMap;
@@ -1326,7 +1389,7 @@ mod fake {
     use util::paths::{PathStyle, RemotePathBuf};
 
     pub(super) struct FakeRemoteConnection {
-        pub(super) connection_options: SshConnectionOptions,
+        pub(super) connection_options: RemoteConnectionOptions,
         pub(super) server_channel: Arc<ChannelClient>,
         pub(super) server_cx: SendableCx,
     }
@@ -1386,7 +1449,7 @@ mod fake {
             unreachable!()
         }
 
-        fn connection_options(&self) -> SshConnectionOptions {
+        fn connection_options(&self) -> RemoteConnectionOptions {
             self.connection_options.clone()
         }
 
diff --git a/crates/remote/src/transport.rs b/crates/remote/src/transport.rs
index aa086fd3f5..36525b7fcc 100644
--- a/crates/remote/src/transport.rs
+++ b/crates/remote/src/transport.rs
@@ -1 +1,336 @@
+use crate::{
+    json_log::LogRecord,
+    protocol::{MESSAGE_LEN_SIZE, message_len_from_buffer, read_message_with_len, write_message},
+};
+use anyhow::{Context as _, Result};
+use futures::{
+    AsyncReadExt as _, FutureExt as _, StreamExt as _,
+    channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender},
+};
+use gpui::{AppContext as _, AsyncApp, Task};
+use rpc::proto::Envelope;
+use smol::process::Child;
+
 pub mod ssh;
+pub mod wsl;
+
+fn handle_rpc_messages_over_child_process_stdio(
+    mut ssh_proxy_process: Child,
+    incoming_tx: UnboundedSender<Envelope>,
+    mut outgoing_rx: UnboundedReceiver<Envelope>,
+    mut connection_activity_tx: Sender<()>,
+    cx: &AsyncApp,
+) -> Task<Result<i32>> {
+    let mut child_stderr = ssh_proxy_process.stderr.take().unwrap();
+    let mut child_stdout = ssh_proxy_process.stdout.take().unwrap();
+    let mut child_stdin = ssh_proxy_process.stdin.take().unwrap();
+
+    let mut stdin_buffer = Vec::new();
+    let mut stdout_buffer = Vec::new();
+    let mut stderr_buffer = Vec::new();
+    let mut stderr_offset = 0;
+
+    let stdin_task = cx.background_spawn(async move {
+        while let Some(outgoing) = outgoing_rx.next().await {
+            write_message(&mut child_stdin, &mut stdin_buffer, outgoing).await?;
+        }
+        anyhow::Ok(())
+    });
+
+    let stdout_task = cx.background_spawn({
+        let mut connection_activity_tx = connection_activity_tx.clone();
+        async move {
+            loop {
+                stdout_buffer.resize(MESSAGE_LEN_SIZE, 0);
+                let len = child_stdout.read(&mut stdout_buffer).await?;
+
+                if len == 0 {
+                    return anyhow::Ok(());
+                }
+
+                if len < MESSAGE_LEN_SIZE {
+                    child_stdout.read_exact(&mut stdout_buffer[len..]).await?;
+                }
+
+                let message_len = message_len_from_buffer(&stdout_buffer);
+                let envelope =
+                    read_message_with_len(&mut child_stdout, &mut stdout_buffer, message_len)
+                        .await?;
+                connection_activity_tx.try_send(()).ok();
+                incoming_tx.unbounded_send(envelope).ok();
+            }
+        }
+    });
+
+    let stderr_task: Task<anyhow::Result<()>> = cx.background_spawn(async move {
+        loop {
+            stderr_buffer.resize(stderr_offset + 1024, 0);
+
+            let len = child_stderr
+                .read(&mut stderr_buffer[stderr_offset..])
+                .await?;
+            if len == 0 {
+                return anyhow::Ok(());
+            }
+
+            stderr_offset += len;
+            let mut start_ix = 0;
+            while let Some(ix) = stderr_buffer[start_ix..stderr_offset]
+                .iter()
+                .position(|b| b == &b'\n')
+            {
+                let line_ix = start_ix + ix;
+                let content = &stderr_buffer[start_ix..line_ix];
+                start_ix = line_ix + 1;
+                if let Ok(record) = serde_json::from_slice::<LogRecord>(content) {
+                    record.log(log::logger())
+                } else {
+                    eprintln!("(remote) {}", String::from_utf8_lossy(content));
+                }
+            }
+            stderr_buffer.drain(0..start_ix);
+            stderr_offset -= start_ix;
+
+            connection_activity_tx.try_send(()).ok();
+        }
+    });
+
+    cx.background_spawn(async move {
+        let result = futures::select! {
+            result = stdin_task.fuse() => {
+                result.context("stdin")
+            }
+            result = stdout_task.fuse() => {
+                result.context("stdout")
+            }
+            result = stderr_task.fuse() => {
+                result.context("stderr")
+            }
+        };
+
+        let status = ssh_proxy_process.status().await?.code().unwrap_or(1);
+        match result {
+            Ok(_) => Ok(status),
+            Err(error) => Err(error),
+        }
+    })
+}
+
+#[cfg(debug_assertions)]
+async fn build_remote_server_from_source(
+    platform: &crate::RemotePlatform,
+    delegate: &dyn crate::RemoteClientDelegate,
+    cx: &mut AsyncApp,
+) -> Result<Option<std::path::PathBuf>> {
+    use std::path::Path;
+
+    let Some(build_remote_server) = std::env::var("ZED_BUILD_REMOTE_SERVER").ok() else {
+        return Ok(None);
+    };
+
+    use smol::process::{Command, Stdio};
+    use std::env::VarError;
+
+    async fn run_cmd(command: &mut Command) -> Result<()> {
+        let output = command
+            .kill_on_drop(true)
+            .stderr(Stdio::inherit())
+            .output()
+            .await?;
+        anyhow::ensure!(
+            output.status.success(),
+            "Failed to run command: {command:?}"
+        );
+        Ok(())
+    }
+
+    let use_musl = !build_remote_server.contains("nomusl");
+    let triple = format!(
+        "{}-{}",
+        platform.arch,
+        match platform.os {
+            "linux" =>
+                if use_musl {
+                    "unknown-linux-musl"
+                } else {
+                    "unknown-linux-gnu"
+                },
+            "macos" => "apple-darwin",
+            _ => anyhow::bail!("can't cross compile for: {:?}", platform),
+        }
+    );
+    let mut rust_flags = match std::env::var("RUSTFLAGS") {
+        Ok(val) => val,
+        Err(VarError::NotPresent) => String::new(),
+        Err(e) => {
+            log::error!("Failed to get env var `RUSTFLAGS` value: {e}");
+            String::new()
+        }
+    };
+    if platform.os == "linux" && use_musl {
+        rust_flags.push_str(" -C target-feature=+crt-static");
+    }
+    if build_remote_server.contains("mold") {
+        rust_flags.push_str(" -C link-arg=-fuse-ld=mold");
+    }
+
+    if platform.arch == std::env::consts::ARCH && platform.os == std::env::consts::OS {
+        delegate.set_status(Some("Building remote server binary from source"), cx);
+        log::info!("building remote server binary from source");
+        run_cmd(
+            Command::new("cargo")
+                .args([
+                    "build",
+                    "--package",
+                    "remote_server",
+                    "--features",
+                    "debug-embed",
+                    "--target-dir",
+                    "target/remote_server",
+                    "--target",
+                    &triple,
+                ])
+                .env("RUSTFLAGS", &rust_flags),
+        )
+        .await?;
+    } else if build_remote_server.contains("cross") {
+        #[cfg(target_os = "windows")]
+        use util::paths::SanitizedPath;
+
+        delegate.set_status(Some("Installing cross.rs for cross-compilation"), cx);
+        log::info!("installing cross");
+        run_cmd(Command::new("cargo").args([
+            "install",
+            "cross",
+            "--git",
+            "https://github.com/cross-rs/cross",
+        ]))
+        .await?;
+
+        delegate.set_status(
+            Some(&format!(
+                "Building remote server binary from source for {} with Docker",
+                &triple
+            )),
+            cx,
+        );
+        log::info!("building remote server binary from source for {}", &triple);
+
+        // On Windows, the binding needs to be set to the canonical path
+        #[cfg(target_os = "windows")]
+        let src = SanitizedPath::new(&smol::fs::canonicalize("./target").await?).to_glob_string();
+        #[cfg(not(target_os = "windows"))]
+        let src = "./target";
+
+        run_cmd(
+            Command::new("cross")
+                .args([
+                    "build",
+                    "--package",
+                    "remote_server",
+                    "--features",
+                    "debug-embed",
+                    "--target-dir",
+                    "target/remote_server",
+                    "--target",
+                    &triple,
+                ])
+                .env(
+                    "CROSS_CONTAINER_OPTS",
+                    format!("--mount type=bind,src={src},dst=/app/target"),
+                )
+                .env("RUSTFLAGS", &rust_flags),
+        )
+        .await?;
+    } else {
+        let which = cx
+            .background_spawn(async move { which::which("zig") })
+            .await;
+
+        if which.is_err() {
+            #[cfg(not(target_os = "windows"))]
+            {
+                anyhow::bail!(
+                    "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
+                )
+            }
+            #[cfg(target_os = "windows")]
+            {
+                anyhow::bail!(
+                    "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
+                )
+            }
+        }
+
+        delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
+        log::info!("adding rustup target");
+        run_cmd(Command::new("rustup").args(["target", "add"]).arg(&triple)).await?;
+
+        delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
+        log::info!("installing cargo-zigbuild");
+        run_cmd(Command::new("cargo").args(["install", "--locked", "cargo-zigbuild"])).await?;
+
+        delegate.set_status(
+            Some(&format!(
+                "Building remote binary from source for {triple} with Zig"
+            )),
+            cx,
+        );
+        log::info!("building remote binary from source for {triple} with Zig");
+        run_cmd(
+            Command::new("cargo")
+                .args([
+                    "zigbuild",
+                    "--package",
+                    "remote_server",
+                    "--features",
+                    "debug-embed",
+                    "--target-dir",
+                    "target/remote_server",
+                    "--target",
+                    &triple,
+                ])
+                .env("RUSTFLAGS", &rust_flags),
+        )
+        .await?;
+    };
+    let bin_path = Path::new("target")
+        .join("remote_server")
+        .join(&triple)
+        .join("debug")
+        .join("remote_server");
+
+    let path = if !build_remote_server.contains("nocompress") {
+        delegate.set_status(Some("Compressing binary"), cx);
+
+        #[cfg(not(target_os = "windows"))]
+        {
+            run_cmd(Command::new("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
+        }
+
+        #[cfg(target_os = "windows")]
+        {
+            // On Windows, we use 7z to compress the binary
+            let seven_zip = which::which("7z.exe").context("7z.exe not found on $PATH, install it (e.g. with `winget install -e --id 7zip.7zip`) or, if you don't want this behaviour, set $env:ZED_BUILD_REMOTE_SERVER=\"nocompress\"")?;
+            let gz_path = format!("target/remote_server/{}/debug/remote_server.gz", triple);
+            if smol::fs::metadata(&gz_path).await.is_ok() {
+                smol::fs::remove_file(&gz_path).await?;
+            }
+            run_cmd(Command::new(seven_zip).args([
+                "a",
+                "-tgzip",
+                &gz_path,
+                &bin_path.to_string_lossy(),
+            ]))
+            .await?;
+        }
+
+        let mut archive_path = bin_path;
+        archive_path.set_extension("gz");
+        std::env::current_dir()?.join(archive_path)
+    } else {
+        bin_path
+    };
+
+    Ok(Some(path))
+}
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 34f1ebf71c..0995e0dd61 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -1,14 +1,12 @@
 use crate::{
     RemoteClientDelegate, RemotePlatform,
-    json_log::LogRecord,
-    protocol::{MESSAGE_LEN_SIZE, message_len_from_buffer, read_message_with_len, write_message},
-    remote_client::{CommandTemplate, RemoteConnection},
+    remote_client::{CommandTemplate, RemoteConnection, RemoteConnectionOptions},
 };
 use anyhow::{Context as _, Result, anyhow};
 use async_trait::async_trait;
 use collections::HashMap;
 use futures::{
-    AsyncReadExt as _, FutureExt as _, StreamExt as _,
+    AsyncReadExt as _, FutureExt as _,
     channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender},
     select_biased,
 };
@@ -99,8 +97,8 @@ impl RemoteConnection for SshRemoteConnection {
         self.master_process.lock().is_none()
     }
 
-    fn connection_options(&self) -> SshConnectionOptions {
-        self.socket.connection_options.clone()
+    fn connection_options(&self) -> RemoteConnectionOptions {
+        RemoteConnectionOptions::Ssh(self.socket.connection_options.clone())
     }
 
     fn shell(&self) -> String {
@@ -267,7 +265,7 @@ impl RemoteConnection for SshRemoteConnection {
             }
         };
 
-        Self::multiplex(
+        super::handle_rpc_messages_over_child_process_stdio(
             ssh_proxy_process,
             incoming_tx,
             outgoing_rx,
@@ -415,109 +413,6 @@ impl SshRemoteConnection {
         Ok(this)
     }
 
-    fn multiplex(
-        mut ssh_proxy_process: Child,
-        incoming_tx: UnboundedSender<Envelope>,
-        mut outgoing_rx: UnboundedReceiver<Envelope>,
-        mut connection_activity_tx: Sender<()>,
-        cx: &AsyncApp,
-    ) -> Task<Result<i32>> {
-        let mut child_stderr = ssh_proxy_process.stderr.take().unwrap();
-        let mut child_stdout = ssh_proxy_process.stdout.take().unwrap();
-        let mut child_stdin = ssh_proxy_process.stdin.take().unwrap();
-
-        let mut stdin_buffer = Vec::new();
-        let mut stdout_buffer = Vec::new();
-        let mut stderr_buffer = Vec::new();
-        let mut stderr_offset = 0;
-
-        let stdin_task = cx.background_spawn(async move {
-            while let Some(outgoing) = outgoing_rx.next().await {
-                write_message(&mut child_stdin, &mut stdin_buffer, outgoing).await?;
-            }
-            anyhow::Ok(())
-        });
-
-        let stdout_task = cx.background_spawn({
-            let mut connection_activity_tx = connection_activity_tx.clone();
-            async move {
-                loop {
-                    stdout_buffer.resize(MESSAGE_LEN_SIZE, 0);
-                    let len = child_stdout.read(&mut stdout_buffer).await?;
-
-                    if len == 0 {
-                        return anyhow::Ok(());
-                    }
-
-                    if len < MESSAGE_LEN_SIZE {
-                        child_stdout.read_exact(&mut stdout_buffer[len..]).await?;
-                    }
-
-                    let message_len = message_len_from_buffer(&stdout_buffer);
-                    let envelope =
-                        read_message_with_len(&mut child_stdout, &mut stdout_buffer, message_len)
-                            .await?;
-                    connection_activity_tx.try_send(()).ok();
-                    incoming_tx.unbounded_send(envelope).ok();
-                }
-            }
-        });
-
-        let stderr_task: Task<anyhow::Result<()>> = cx.background_spawn(async move {
-            loop {
-                stderr_buffer.resize(stderr_offset + 1024, 0);
-
-                let len = child_stderr
-                    .read(&mut stderr_buffer[stderr_offset..])
-                    .await?;
-                if len == 0 {
-                    return anyhow::Ok(());
-                }
-
-                stderr_offset += len;
-                let mut start_ix = 0;
-                while let Some(ix) = stderr_buffer[start_ix..stderr_offset]
-                    .iter()
-                    .position(|b| b == &b'\n')
-                {
-                    let line_ix = start_ix + ix;
-                    let content = &stderr_buffer[start_ix..line_ix];
-                    start_ix = line_ix + 1;
-                    if let Ok(record) = serde_json::from_slice::<LogRecord>(content) {
-                        record.log(log::logger())
-                    } else {
-                        eprintln!("(remote) {}", String::from_utf8_lossy(content));
-                    }
-                }
-                stderr_buffer.drain(0..start_ix);
-                stderr_offset -= start_ix;
-
-                connection_activity_tx.try_send(()).ok();
-            }
-        });
-
-        cx.background_spawn(async move {
-            let result = futures::select! {
-                result = stdin_task.fuse() => {
-                    result.context("stdin")
-                }
-                result = stdout_task.fuse() => {
-                    result.context("stdout")
-                }
-                result = stderr_task.fuse() => {
-                    result.context("stderr")
-                }
-            };
-
-            let status = ssh_proxy_process.status().await?.code().unwrap_or(1);
-            match result {
-                Ok(_) => Ok(status),
-                Err(error) => Err(error),
-            }
-        })
-    }
-
-    #[allow(unused)]
     async fn ensure_server_binary(
         &self,
         delegate: &Arc<dyn RemoteClientDelegate>,
@@ -544,19 +439,20 @@ impl SshRemoteConnection {
             self.ssh_path_style,
         );
 
-        let build_remote_server = std::env::var("ZED_BUILD_REMOTE_SERVER").ok();
         #[cfg(debug_assertions)]
-        if let Some(build_remote_server) = build_remote_server {
-            let src_path = self.build_local(build_remote_server, delegate, cx).await?;
+        if let Some(remote_server_path) =
+            super::build_remote_server_from_source(&self.ssh_platform, delegate.as_ref(), cx)
+                .await?
+        {
             let tmp_path = RemotePathBuf::new(
                 paths::remote_server_dir_relative().join(format!(
                     "download-{}-{}",
                     std::process::id(),
-                    src_path.file_name().unwrap().to_string_lossy()
+                    remote_server_path.file_name().unwrap().to_string_lossy()
                 )),
                 self.ssh_path_style,
             );
-            self.upload_local_server_binary(&src_path, &tmp_path, delegate, cx)
+            self.upload_local_server_binary(&remote_server_path, &tmp_path, delegate, cx)
                 .await?;
             self.extract_server_binary(&dst_path, &tmp_path, delegate, cx)
                 .await?;
@@ -794,221 +690,6 @@ impl SshRemoteConnection {
         );
         Ok(())
     }
-
-    #[cfg(debug_assertions)]
-    async fn build_local(
-        &self,
-        build_remote_server: String,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<PathBuf> {
-        use smol::process::{Command, Stdio};
-        use std::env::VarError;
-
-        async fn run_cmd(command: &mut Command) -> Result<()> {
-            let output = command
-                .kill_on_drop(true)
-                .stderr(Stdio::inherit())
-                .output()
-                .await?;
-            anyhow::ensure!(
-                output.status.success(),
-                "Failed to run command: {command:?}"
-            );
-            Ok(())
-        }
-
-        let use_musl = !build_remote_server.contains("nomusl");
-        let triple = format!(
-            "{}-{}",
-            self.ssh_platform.arch,
-            match self.ssh_platform.os {
-                "linux" =>
-                    if use_musl {
-                        "unknown-linux-musl"
-                    } else {
-                        "unknown-linux-gnu"
-                    },
-                "macos" => "apple-darwin",
-                _ => anyhow::bail!("can't cross compile for: {:?}", self.ssh_platform),
-            }
-        );
-        let mut rust_flags = match std::env::var("RUSTFLAGS") {
-            Ok(val) => val,
-            Err(VarError::NotPresent) => String::new(),
-            Err(e) => {
-                log::error!("Failed to get env var `RUSTFLAGS` value: {e}");
-                String::new()
-            }
-        };
-        if self.ssh_platform.os == "linux" && use_musl {
-            rust_flags.push_str(" -C target-feature=+crt-static");
-        }
-        if build_remote_server.contains("mold") {
-            rust_flags.push_str(" -C link-arg=-fuse-ld=mold");
-        }
-
-        if self.ssh_platform.arch == std::env::consts::ARCH
-            && self.ssh_platform.os == std::env::consts::OS
-        {
-            delegate.set_status(Some("Building remote server binary from source"), cx);
-            log::info!("building remote server binary from source");
-            run_cmd(
-                Command::new("cargo")
-                    .args([
-                        "build",
-                        "--package",
-                        "remote_server",
-                        "--features",
-                        "debug-embed",
-                        "--target-dir",
-                        "target/remote_server",
-                        "--target",
-                        &triple,
-                    ])
-                    .env("RUSTFLAGS", &rust_flags),
-            )
-            .await?;
-        } else if build_remote_server.contains("cross") {
-            #[cfg(target_os = "windows")]
-            use util::paths::SanitizedPath;
-
-            delegate.set_status(Some("Installing cross.rs for cross-compilation"), cx);
-            log::info!("installing cross");
-            run_cmd(Command::new("cargo").args([
-                "install",
-                "cross",
-                "--git",
-                "https://github.com/cross-rs/cross",
-            ]))
-            .await?;
-
-            delegate.set_status(
-                Some(&format!(
-                    "Building remote server binary from source for {} with Docker",
-                    &triple
-                )),
-                cx,
-            );
-            log::info!("building remote server binary from source for {}", &triple);
-
-            // On Windows, the binding needs to be set to the canonical path
-            #[cfg(target_os = "windows")]
-            let src =
-                SanitizedPath::new(&smol::fs::canonicalize("./target").await?).to_glob_string();
-            #[cfg(not(target_os = "windows"))]
-            let src = "./target";
-            run_cmd(
-                Command::new("cross")
-                    .args([
-                        "build",
-                        "--package",
-                        "remote_server",
-                        "--features",
-                        "debug-embed",
-                        "--target-dir",
-                        "target/remote_server",
-                        "--target",
-                        &triple,
-                    ])
-                    .env(
-                        "CROSS_CONTAINER_OPTS",
-                        format!("--mount type=bind,src={src},dst=/app/target"),
-                    )
-                    .env("RUSTFLAGS", &rust_flags),
-            )
-            .await?;
-        } else {
-            let which = cx
-                .background_spawn(async move { which::which("zig") })
-                .await;
-
-            if which.is_err() {
-                #[cfg(not(target_os = "windows"))]
-                {
-                    anyhow::bail!(
-                        "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
-                    )
-                }
-                #[cfg(target_os = "windows")]
-                {
-                    anyhow::bail!(
-                        "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup) or pass ZED_BUILD_REMOTE_SERVER=cross to use cross"
-                    )
-                }
-            }
-
-            delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
-            log::info!("adding rustup target");
-            run_cmd(Command::new("rustup").args(["target", "add"]).arg(&triple)).await?;
-
-            delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
-            log::info!("installing cargo-zigbuild");
-            run_cmd(Command::new("cargo").args(["install", "--locked", "cargo-zigbuild"])).await?;
-
-            delegate.set_status(
-                Some(&format!(
-                    "Building remote binary from source for {triple} with Zig"
-                )),
-                cx,
-            );
-            log::info!("building remote binary from source for {triple} with Zig");
-            run_cmd(
-                Command::new("cargo")
-                    .args([
-                        "zigbuild",
-                        "--package",
-                        "remote_server",
-                        "--features",
-                        "debug-embed",
-                        "--target-dir",
-                        "target/remote_server",
-                        "--target",
-                        &triple,
-                    ])
-                    .env("RUSTFLAGS", &rust_flags),
-            )
-            .await?;
-        };
-        let bin_path = Path::new("target")
-            .join("remote_server")
-            .join(&triple)
-            .join("debug")
-            .join("remote_server");
-
-        let path = if !build_remote_server.contains("nocompress") {
-            delegate.set_status(Some("Compressing binary"), cx);
-
-            #[cfg(not(target_os = "windows"))]
-            {
-                run_cmd(Command::new("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
-            }
-            #[cfg(target_os = "windows")]
-            {
-                // On Windows, we use 7z to compress the binary
-                let seven_zip = which::which("7z.exe").context("7z.exe not found on $PATH, install it (e.g. with `winget install -e --id 7zip.7zip`) or, if you don't want this behaviour, set $env:ZED_BUILD_REMOTE_SERVER=\"nocompress\"")?;
-                let gz_path = format!("target/remote_server/{}/debug/remote_server.gz", triple);
-                if smol::fs::metadata(&gz_path).await.is_ok() {
-                    smol::fs::remove_file(&gz_path).await?;
-                }
-                run_cmd(Command::new(seven_zip).args([
-                    "a",
-                    "-tgzip",
-                    &gz_path,
-                    &bin_path.to_string_lossy(),
-                ]))
-                .await?;
-            }
-
-            let mut archive_path = bin_path;
-            archive_path.set_extension("gz");
-            std::env::current_dir()?.join(archive_path)
-        } else {
-            bin_path
-        };
-
-        Ok(path)
-    }
 }
 
 impl SshSocket {
diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
new file mode 100644
index 0000000000..ea8f2443d9
--- /dev/null
+++ b/crates/remote/src/transport/wsl.rs
@@ -0,0 +1,494 @@
+use crate::{
+    RemoteClientDelegate, RemotePlatform,
+    remote_client::{CommandTemplate, RemoteConnection, RemoteConnectionOptions},
+};
+use anyhow::{Result, anyhow, bail};
+use async_trait::async_trait;
+use collections::HashMap;
+use futures::channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender};
+use gpui::{App, AppContext as _, AsyncApp, SemanticVersion, Task};
+use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
+use rpc::proto::Envelope;
+use smol::{fs, process};
+use std::{
+    fmt::Write as _,
+    path::{Path, PathBuf},
+    process::Stdio,
+    sync::Arc,
+    time::Instant,
+};
+use util::paths::{PathStyle, RemotePathBuf};
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct WslConnectionOptions {
+    pub distro_name: String,
+    pub user: Option<String>,
+}
+
+pub(crate) struct WslRemoteConnection {
+    remote_binary_path: Option<RemotePathBuf>,
+    platform: RemotePlatform,
+    shell: String,
+    connection_options: WslConnectionOptions,
+}
+
+impl WslRemoteConnection {
+    pub(crate) async fn new(
+        connection_options: WslConnectionOptions,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<Self> {
+        log::info!(
+            "Connecting to WSL distro {} with user {:?}",
+            connection_options.distro_name,
+            connection_options.user
+        );
+        let (release_channel, version, commit) = cx.update(|cx| {
+            (
+                ReleaseChannel::global(cx),
+                AppVersion::global(cx),
+                AppCommitSha::try_global(cx),
+            )
+        })?;
+
+        let mut this = Self {
+            connection_options,
+            remote_binary_path: None,
+            platform: RemotePlatform { os: "", arch: "" },
+            shell: String::new(),
+        };
+        delegate.set_status(Some("Detecting WSL environment"), cx);
+        this.platform = this.detect_platform().await?;
+        this.shell = this.detect_shell().await?;
+        this.remote_binary_path = Some(
+            this.ensure_server_binary(&delegate, release_channel, version, commit, cx)
+                .await?,
+        );
+
+        Ok(this)
+    }
+
+    async fn detect_platform(&self) -> Result<RemotePlatform> {
+        let arch_str = self.run_wsl_command("uname", &["-m"]).await?;
+        let arch_str = arch_str.trim().to_string();
+        let arch = match arch_str.as_str() {
+            "x86_64" => "x86_64",
+            "aarch64" | "arm64" => "aarch64",
+            _ => "x86_64",
+        };
+        Ok(RemotePlatform { os: "linux", arch })
+    }
+
+    async fn detect_shell(&self) -> Result<String> {
+        Ok(self
+            .run_wsl_command("sh", &["-c", "echo $SHELL"])
+            .await
+            .ok()
+            .and_then(|shell_path| shell_path.trim().split('/').next_back().map(str::to_string))
+            .unwrap_or_else(|| "bash".to_string()))
+    }
+
+    async fn windows_path_to_wsl_path(&self, source: &Path) -> Result<String> {
+        windows_path_to_wsl_path_impl(&self.connection_options, source).await
+    }
+
+    fn wsl_command(&self, program: &str, args: &[&str]) -> process::Command {
+        wsl_command_impl(&self.connection_options, program, args)
+    }
+
+    async fn run_wsl_command(&self, program: &str, args: &[&str]) -> Result<String> {
+        run_wsl_command_impl(&self.connection_options, program, args).await
+    }
+
+    async fn ensure_server_binary(
+        &self,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        release_channel: ReleaseChannel,
+        version: SemanticVersion,
+        commit: Option<AppCommitSha>,
+        cx: &mut AsyncApp,
+    ) -> Result<RemotePathBuf> {
+        let version_str = match release_channel {
+            ReleaseChannel::Nightly => {
+                let commit = commit.map(|s| s.full()).unwrap_or_default();
+                format!("{}-{}", version, commit)
+            }
+            ReleaseChannel::Dev => "build".to_string(),
+            _ => version.to_string(),
+        };
+
+        let binary_name = format!(
+            "zed-remote-server-{}-{}",
+            release_channel.dev_name(),
+            version_str
+        );
+
+        let dst_path = RemotePathBuf::new(
+            paths::remote_wsl_server_dir_relative().join(binary_name),
+            PathStyle::Posix,
+        );
+
+        if let Some(parent) = dst_path.parent() {
+            self.run_wsl_command("mkdir", &["-p", &parent.to_string()])
+                .await
+                .map_err(|e| anyhow!("Failed to create directory: {}", e))?;
+        }
+
+        #[cfg(debug_assertions)]
+        if let Some(remote_server_path) =
+            super::build_remote_server_from_source(&self.platform, delegate.as_ref(), cx).await?
+        {
+            let tmp_path = RemotePathBuf::new(
+                paths::remote_wsl_server_dir_relative().join(format!(
+                    "download-{}-{}",
+                    std::process::id(),
+                    remote_server_path.file_name().unwrap().to_string_lossy()
+                )),
+                PathStyle::Posix,
+            );
+            self.upload_file(&remote_server_path, &tmp_path, delegate, cx)
+                .await?;
+            self.extract_and_install(&tmp_path, &dst_path, delegate, cx)
+                .await?;
+            return Ok(dst_path);
+        }
+
+        if self
+            .run_wsl_command(&dst_path.to_string(), &["version"])
+            .await
+            .is_ok()
+        {
+            return Ok(dst_path);
+        }
+
+        delegate.set_status(Some("Installing remote server"), cx);
+
+        let wanted_version = match release_channel {
+            ReleaseChannel::Nightly => None,
+            ReleaseChannel::Dev => {
+                return Err(anyhow!("Dev builds require manual installation"));
+            }
+            _ => Some(cx.update(|cx| AppVersion::global(cx))?),
+        };
+
+        let src_path = delegate
+            .download_server_binary_locally(self.platform, release_channel, wanted_version, cx)
+            .await?;
+
+        let tmp_path = RemotePathBuf::new(
+            PathBuf::from(format!("{}.{}.tmp", dst_path, std::process::id())),
+            PathStyle::Posix,
+        );
+
+        self.upload_file(&src_path, &tmp_path, delegate, cx).await?;
+        self.extract_and_install(&tmp_path, &dst_path, delegate, cx)
+            .await?;
+
+        Ok(dst_path)
+    }
+
+    async fn upload_file(
+        &self,
+        src_path: &Path,
+        dst_path: &RemotePathBuf,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        delegate.set_status(Some("Uploading remote server to WSL"), cx);
+
+        if let Some(parent) = dst_path.parent() {
+            self.run_wsl_command("mkdir", &["-p", &parent.to_string()])
+                .await
+                .map_err(|e| anyhow!("Failed to create directory when uploading file: {}", e))?;
+        }
+
+        let t0 = Instant::now();
+        let src_stat = fs::metadata(&src_path).await?;
+        let size = src_stat.len();
+        log::info!(
+            "uploading remote server to WSL {:?} ({}kb)",
+            dst_path,
+            size / 1024
+        );
+
+        let src_path_in_wsl = self.windows_path_to_wsl_path(src_path).await?;
+        self.run_wsl_command("cp", &["-f", &src_path_in_wsl, &dst_path.to_string()])
+            .await
+            .map_err(|e| {
+                anyhow!(
+                    "Failed to copy file {}({}) to WSL {:?}: {}",
+                    src_path.display(),
+                    src_path_in_wsl,
+                    dst_path,
+                    e
+                )
+            })?;
+
+        log::info!("uploaded remote server in {:?}", t0.elapsed());
+        Ok(())
+    }
+
+    async fn extract_and_install(
+        &self,
+        tmp_path: &RemotePathBuf,
+        dst_path: &RemotePathBuf,
+        delegate: &Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        delegate.set_status(Some("Extracting remote server"), cx);
+
+        let tmp_path_str = tmp_path.to_string();
+        let dst_path_str = dst_path.to_string();
+
+        // Build extraction script with proper error handling
+        let script = if tmp_path_str.ends_with(".gz") {
+            let uncompressed = tmp_path_str.trim_end_matches(".gz");
+            format!(
+                "set -e; gunzip -f '{}' && chmod 755 '{}' && mv -f '{}' '{}'",
+                tmp_path_str, uncompressed, uncompressed, dst_path_str
+            )
+        } else {
+            format!(
+                "set -e; chmod 755 '{}' && mv -f '{}' '{}'",
+                tmp_path_str, tmp_path_str, dst_path_str
+            )
+        };
+
+        self.run_wsl_command("sh", &["-c", &script])
+            .await
+            .map_err(|e| anyhow!("Failed to extract server binary: {}", e))?;
+        Ok(())
+    }
+}
+
+#[async_trait(?Send)]
+impl RemoteConnection for WslRemoteConnection {
+    fn start_proxy(
+        &self,
+        unique_identifier: String,
+        reconnect: bool,
+        incoming_tx: UnboundedSender<Envelope>,
+        outgoing_rx: UnboundedReceiver<Envelope>,
+        connection_activity_tx: Sender<()>,
+        delegate: Arc<dyn RemoteClientDelegate>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<i32>> {
+        delegate.set_status(Some("Starting proxy"), cx);
+
+        let Some(remote_binary_path) = &self.remote_binary_path else {
+            return Task::ready(Err(anyhow!("Remote binary path not set")));
+        };
+
+        let mut proxy_command = format!(
+            "exec {} proxy --identifier {}",
+            remote_binary_path, unique_identifier
+        );
+
+        if reconnect {
+            proxy_command.push_str(" --reconnect");
+        }
+
+        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
+            if let Some(value) = std::env::var(env_var).ok() {
+                proxy_command = format!("{}='{}' {}", env_var, value, proxy_command);
+            }
+        }
+        let proxy_process = match self
+            .wsl_command("sh", &["-lc", &proxy_command])
+            .kill_on_drop(true)
+            .spawn()
+        {
+            Ok(process) => process,
+            Err(error) => {
+                return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
+            }
+        };
+
+        super::handle_rpc_messages_over_child_process_stdio(
+            proxy_process,
+            incoming_tx,
+            outgoing_rx,
+            connection_activity_tx,
+            cx,
+        )
+    }
+
+    fn upload_directory(
+        &self,
+        src_path: PathBuf,
+        dest_path: RemotePathBuf,
+        cx: &App,
+    ) -> Task<Result<()>> {
+        cx.background_spawn({
+            let options = self.connection_options.clone();
+            async move {
+                let wsl_src = windows_path_to_wsl_path_impl(&options, &src_path).await?;
+
+                run_wsl_command_impl(&options, "cp", &["-r", &wsl_src, &dest_path.to_string()])
+                    .await
+                    .map_err(|e| {
+                        anyhow!(
+                            "failed to upload directory {} -> {}: {}",
+                            src_path.display(),
+                            dest_path.to_string(),
+                            e
+                        )
+                    })?;
+
+                Ok(())
+            }
+        })
+    }
+
+    async fn kill(&self) -> Result<()> {
+        Ok(())
+    }
+
+    fn has_been_killed(&self) -> bool {
+        false
+    }
+
+    fn shares_network_interface(&self) -> bool {
+        true
+    }
+
+    fn build_command(
+        &self,
+        program: Option<String>,
+        args: &[String],
+        env: &HashMap<String, String>,
+        working_dir: Option<String>,
+        port_forward: Option<(u16, String, u16)>,
+    ) -> Result<CommandTemplate> {
+        if port_forward.is_some() {
+            bail!("WSL shares the network interface with the host system");
+        }
+
+        let working_dir = working_dir
+            .map(|working_dir| RemotePathBuf::new(working_dir.into(), PathStyle::Posix).to_string())
+            .unwrap_or("~".to_string());
+
+        let mut script = String::new();
+
+        for (k, v) in env.iter() {
+            write!(&mut script, "{}='{}' ", k, v).unwrap();
+        }
+
+        if let Some(program) = program {
+            let command = shlex::try_quote(&program)?;
+            script.push_str(&command);
+            for arg in args {
+                let arg = shlex::try_quote(&arg)?;
+                script.push_str(" ");
+                script.push_str(&arg);
+            }
+        } else {
+            write!(&mut script, "exec {} -l", self.shell).unwrap();
+        }
+
+        let wsl_args = if let Some(user) = &self.connection_options.user {
+            vec![
+                "--distribution".to_string(),
+                self.connection_options.distro_name.clone(),
+                "--user".to_string(),
+                user.clone(),
+                "--cd".to_string(),
+                working_dir,
+                "--".to_string(),
+                self.shell.clone(),
+                "-c".to_string(),
+                shlex::try_quote(&script)?.to_string(),
+            ]
+        } else {
+            vec![
+                "--distribution".to_string(),
+                self.connection_options.distro_name.clone(),
+                "--cd".to_string(),
+                working_dir,
+                "--".to_string(),
+                self.shell.clone(),
+                "-c".to_string(),
+                shlex::try_quote(&script)?.to_string(),
+            ]
+        };
+
+        Ok(CommandTemplate {
+            program: "wsl.exe".to_string(),
+            args: wsl_args,
+            env: HashMap::default(),
+        })
+    }
+
+    fn connection_options(&self) -> RemoteConnectionOptions {
+        RemoteConnectionOptions::Wsl(self.connection_options.clone())
+    }
+
+    fn path_style(&self) -> PathStyle {
+        PathStyle::Posix
+    }
+
+    fn shell(&self) -> String {
+        self.shell.clone()
+    }
+}
+
+/// `wslpath` is a executable available in WSL, it's a linux binary.
+/// So it doesn't support Windows style paths.
+async fn sanitize_path(path: &Path) -> Result<String> {
+    let path = smol::fs::canonicalize(path).await?;
+    let path_str = path.to_string_lossy();
+
+    let sanitized = path_str.strip_prefix(r"\\?\").unwrap_or(&path_str);
+    Ok(sanitized.replace('\\', "/"))
+}
+
+async fn windows_path_to_wsl_path_impl(
+    options: &WslConnectionOptions,
+    source: &Path,
+) -> Result<String> {
+    let source = sanitize_path(source).await?;
+    run_wsl_command_impl(options, "wslpath", &["-u", &source]).await
+}
+
+fn wsl_command_impl(
+    options: &WslConnectionOptions,
+    program: &str,
+    args: &[&str],
+) -> process::Command {
+    let mut command = util::command::new_smol_command("wsl.exe");
+
+    if let Some(user) = &options.user {
+        command.arg("--user").arg(user);
+    }
+
+    command
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .arg("--distribution")
+        .arg(&options.distro_name)
+        .arg("--cd")
+        .arg("~")
+        .arg(program)
+        .args(args);
+
+    command
+}
+
+async fn run_wsl_command_impl(
+    options: &WslConnectionOptions,
+    program: &str,
+    args: &[&str],
+) -> Result<String> {
+    let output = wsl_command_impl(options, program, args).output().await?;
+
+    if !output.status.success() {
+        return Err(anyhow!(
+            "Command '{}' failed: {}",
+            program,
+            String::from_utf8_lossy(&output.stderr).trim()
+        ));
+    }
+
+    Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
+}
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 075b9fcd86..2b13ef58c3 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -32,6 +32,7 @@ use gpui::{
 use keymap_editor;
 use onboarding_banner::OnboardingBanner;
 use project::Project;
+use remote::RemoteConnectionOptions;
 use settings::Settings as _;
 use std::sync::Arc;
 use theme::ActiveTheme;
@@ -304,12 +305,14 @@ impl TitleBar {
 
     fn render_remote_project_connection(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let options = self.project.read(cx).remote_connection_options(cx)?;
-        let host: SharedString = options.connection_string().into();
+        let host: SharedString = options.display_name().into();
 
-        let nickname = options
-            .nickname
-            .map(|nick| nick.into())
-            .unwrap_or_else(|| host.clone());
+        let nickname = if let RemoteConnectionOptions::Ssh(options) = options {
+            options.nickname.map(|nick| nick.into())
+        } else {
+            None
+        };
+        let nickname = nickname.unwrap_or_else(|| host.clone());
 
         let (indicator_color, meta) = match self.project.read(cx).remote_connection_state(cx)? {
             remote::ConnectionState::Connecting => (Color::Info, format!("Connecting to: {host}")),
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 3ef9ff65eb..160823f547 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -20,6 +20,7 @@ use project::debugger::breakpoint_store::{BreakpointState, SourceBreakpoint};
 
 use language::{LanguageName, Toolchain};
 use project::WorktreeId;
+use remote::{RemoteConnectionOptions, SshConnectionOptions, WslConnectionOptions};
 use sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
     statement::{SqlType, Statement},
@@ -33,11 +34,12 @@ use uuid::Uuid;
 use crate::{
     WorkspaceId,
     path_list::{PathList, SerializedPathList},
+    persistence::model::RemoteConnectionKind,
 };
 
 use model::{
-    GroupId, ItemId, PaneId, SerializedItem, SerializedPane, SerializedPaneGroup,
-    SerializedSshConnection, SerializedWorkspace, SshConnectionId,
+    GroupId, ItemId, PaneId, RemoteConnectionId, SerializedItem, SerializedPane,
+    SerializedPaneGroup, SerializedWorkspace,
 };
 
 use self::model::{DockStructure, SerializedWorkspaceLocation};
@@ -627,6 +629,88 @@ impl Domain for WorkspaceDb {
             END
             WHERE paths IS NOT NULL
         ),
+        sql!(
+            CREATE TABLE remote_connections(
+                id INTEGER PRIMARY KEY,
+                kind TEXT NOT NULL,
+                host TEXT,
+                port INTEGER,
+                user TEXT,
+                distro TEXT
+            );
+
+            CREATE TABLE workspaces_2(
+                workspace_id INTEGER PRIMARY KEY,
+                paths TEXT,
+                paths_order TEXT,
+                remote_connection_id INTEGER REFERENCES remote_connections(id),
+                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+                window_state TEXT,
+                window_x REAL,
+                window_y REAL,
+                window_width REAL,
+                window_height REAL,
+                display BLOB,
+                left_dock_visible INTEGER,
+                left_dock_active_panel TEXT,
+                right_dock_visible INTEGER,
+                right_dock_active_panel TEXT,
+                bottom_dock_visible INTEGER,
+                bottom_dock_active_panel TEXT,
+                left_dock_zoom INTEGER,
+                right_dock_zoom INTEGER,
+                bottom_dock_zoom INTEGER,
+                fullscreen INTEGER,
+                centered_layout INTEGER,
+                session_id TEXT,
+                window_id INTEGER
+            ) STRICT;
+
+            INSERT INTO remote_connections
+            SELECT
+                id,
+                "ssh" as kind,
+                host,
+                port,
+                user,
+                NULL as distro
+            FROM ssh_connections;
+
+            INSERT
+            INTO workspaces_2
+            SELECT
+                workspace_id,
+                paths,
+                paths_order,
+                ssh_connection_id as remote_connection_id,
+                timestamp,
+                window_state,
+                window_x,
+                window_y,
+                window_width,
+                window_height,
+                display,
+                left_dock_visible,
+                left_dock_active_panel,
+                right_dock_visible,
+                right_dock_active_panel,
+                bottom_dock_visible,
+                bottom_dock_active_panel,
+                left_dock_zoom,
+                right_dock_zoom,
+                bottom_dock_zoom,
+                fullscreen,
+                centered_layout,
+                session_id,
+                window_id
+            FROM
+                workspaces;
+
+            DROP TABLE workspaces;
+            ALTER TABLE workspaces_2 RENAME TO workspaces;
+
+            CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(remote_connection_id, paths);
+        ),
     ];
 
     // Allow recovering from bad migration that was initially shipped to nightly
@@ -650,10 +734,10 @@ impl WorkspaceDb {
         self.workspace_for_roots_internal(worktree_roots, None)
     }
 
-    pub(crate) fn ssh_workspace_for_roots<P: AsRef<Path>>(
+    pub(crate) fn remote_workspace_for_roots<P: AsRef<Path>>(
         &self,
         worktree_roots: &[P],
-        ssh_project_id: SshConnectionId,
+        ssh_project_id: RemoteConnectionId,
     ) -> Option<SerializedWorkspace> {
         self.workspace_for_roots_internal(worktree_roots, Some(ssh_project_id))
     }
@@ -661,7 +745,7 @@ impl WorkspaceDb {
     pub(crate) fn workspace_for_roots_internal<P: AsRef<Path>>(
         &self,
         worktree_roots: &[P],
-        ssh_connection_id: Option<SshConnectionId>,
+        remote_connection_id: Option<RemoteConnectionId>,
     ) -> Option<SerializedWorkspace> {
         // paths are sorted before db interactions to ensure that the order of the paths
         // doesn't affect the workspace selection for existing workspaces
@@ -713,13 +797,13 @@ impl WorkspaceDb {
                 FROM workspaces
                 WHERE
                     paths IS ? AND
-                    ssh_connection_id IS ?
+                    remote_connection_id IS ?
                 LIMIT 1
             })
             .map(|mut prepared_statement| {
                 (prepared_statement)((
                     root_paths.serialize().paths,
-                    ssh_connection_id.map(|id| id.0 as i32),
+                    remote_connection_id.map(|id| id.0 as i32),
                 ))
                 .unwrap()
             })
@@ -803,14 +887,12 @@ impl WorkspaceDb {
         log::debug!("Saving workspace at location: {:?}", workspace.location);
         self.write(move |conn| {
             conn.with_savepoint("update_worktrees", || {
-                let ssh_connection_id = match &workspace.location {
+                let remote_connection_id = match workspace.location.clone() {
                     SerializedWorkspaceLocation::Local => None,
-                    SerializedWorkspaceLocation::Ssh(connection) => {
-                        Some(Self::get_or_create_ssh_connection_query(
+                    SerializedWorkspaceLocation::Remote(connection_options) => {
+                        Some(Self::get_or_create_remote_connection_internal(
                             conn,
-                            connection.host.clone(),
-                            connection.port,
-                            connection.user.clone(),
+                            connection_options
                         )?.0)
                     }
                 };
@@ -860,11 +942,11 @@ impl WorkspaceDb {
                     WHERE
                         workspace_id != ?1 AND
                         paths IS ?2 AND
-                        ssh_connection_id IS ?3
+                        remote_connection_id IS ?3
                 ))?((
                     workspace.id,
                     paths.paths.clone(),
-                    ssh_connection_id,
+                    remote_connection_id,
                 ))
                 .context("clearing out old locations")?;
 
@@ -874,7 +956,7 @@ impl WorkspaceDb {
                         workspace_id,
                         paths,
                         paths_order,
-                        ssh_connection_id,
+                        remote_connection_id,
                         left_dock_visible,
                         left_dock_active_panel,
                         left_dock_zoom,
@@ -893,7 +975,7 @@ impl WorkspaceDb {
                     UPDATE SET
                         paths = ?2,
                         paths_order = ?3,
-                        ssh_connection_id = ?4,
+                        remote_connection_id = ?4,
                         left_dock_visible = ?5,
                         left_dock_active_panel = ?6,
                         left_dock_zoom = ?7,
@@ -912,7 +994,7 @@ impl WorkspaceDb {
                     workspace.id,
                     paths.paths.clone(),
                     paths.order.clone(),
-                    ssh_connection_id,
+                    remote_connection_id,
                     workspace.docks,
                     workspace.session_id,
                     workspace.window_id,
@@ -931,39 +1013,78 @@ impl WorkspaceDb {
         .await;
     }
 
-    pub(crate) async fn get_or_create_ssh_connection(
+    pub(crate) async fn get_or_create_remote_connection(
         &self,
-        host: String,
-        port: Option<u16>,
-        user: Option<String>,
-    ) -> Result<SshConnectionId> {
-        self.write(move |conn| Self::get_or_create_ssh_connection_query(conn, host, port, user))
+        options: RemoteConnectionOptions,
+    ) -> Result<RemoteConnectionId> {
+        self.write(move |conn| Self::get_or_create_remote_connection_internal(conn, options))
             .await
     }
 
-    fn get_or_create_ssh_connection_query(
+    fn get_or_create_remote_connection_internal(
         this: &Connection,
-        host: String,
+        options: RemoteConnectionOptions,
+    ) -> Result<RemoteConnectionId> {
+        let kind;
+        let user;
+        let mut host = None;
+        let mut port = None;
+        let mut distro = None;
+        match options {
+            RemoteConnectionOptions::Ssh(options) => {
+                kind = RemoteConnectionKind::Ssh;
+                host = Some(options.host);
+                port = options.port;
+                user = options.username;
+            }
+            RemoteConnectionOptions::Wsl(options) => {
+                kind = RemoteConnectionKind::Wsl;
+                distro = Some(options.distro_name);
+                user = options.user;
+            }
+        }
+        Self::get_or_create_remote_connection_query(this, kind, host, port, user, distro)
+    }
+
+    fn get_or_create_remote_connection_query(
+        this: &Connection,
+        kind: RemoteConnectionKind,
+        host: Option<String>,
         port: Option<u16>,
         user: Option<String>,
-    ) -> Result<SshConnectionId> {
+        distro: Option<String>,
+    ) -> Result<RemoteConnectionId> {
         if let Some(id) = this.select_row_bound(sql!(
-            SELECT id FROM ssh_connections WHERE host IS ? AND port IS ? AND user IS ? LIMIT 1
-        ))?((host.clone(), port, user.clone()))?
-        {
-            Ok(SshConnectionId(id))
+            SELECT id
+            FROM remote_connections
+            WHERE
+                kind IS ? AND
+                host IS ? AND
+                port IS ? AND
+                user IS ? AND
+                distro IS ?
+            LIMIT 1
+        ))?((
+            kind.serialize(),
+            host.clone(),
+            port,
+            user.clone(),
+            distro.clone(),
+        ))? {
+            Ok(RemoteConnectionId(id))
         } else {
-            log::debug!("Inserting SSH project at host {host}");
             let id = this.select_row_bound(sql!(
-                INSERT INTO ssh_connections (
+                INSERT INTO remote_connections (
+                    kind,
                     host,
                     port,
-                    user
-                ) VALUES (?1, ?2, ?3)
+                    user,
+                    distro
+                ) VALUES (?1, ?2, ?3, ?4, ?5)
                 RETURNING id
-            ))?((host, port, user))?
-            .context("failed to insert ssh project")?;
-            Ok(SshConnectionId(id))
+            ))?((kind.serialize(), host, port, user, distro))?
+            .context("failed to insert remote project")?;
+            Ok(RemoteConnectionId(id))
         }
     }
 
@@ -973,15 +1094,17 @@ impl WorkspaceDb {
         }
     }
 
-    fn recent_workspaces(&self) -> Result<Vec<(WorkspaceId, PathList, Option<u64>)>> {
+    fn recent_workspaces(
+        &self,
+    ) -> Result<Vec<(WorkspaceId, PathList, Option<RemoteConnectionId>)>> {
         Ok(self
             .recent_workspaces_query()?
             .into_iter()
-            .map(|(id, paths, order, ssh_connection_id)| {
+            .map(|(id, paths, order, remote_connection_id)| {
                 (
                     id,
                     PathList::deserialize(&SerializedPathList { paths, order }),
-                    ssh_connection_id,
+                    remote_connection_id.map(RemoteConnectionId),
                 )
             })
             .collect())
@@ -1001,7 +1124,7 @@ impl WorkspaceDb {
     fn session_workspaces(
         &self,
         session_id: String,
-    ) -> Result<Vec<(PathList, Option<u64>, Option<SshConnectionId>)>> {
+    ) -> Result<Vec<(PathList, Option<u64>, Option<RemoteConnectionId>)>> {
         Ok(self
             .session_workspaces_query(session_id)?
             .into_iter()
@@ -1009,7 +1132,7 @@ impl WorkspaceDb {
                 (
                     PathList::deserialize(&SerializedPathList { paths, order }),
                     window_id,
-                    ssh_connection_id.map(SshConnectionId),
+                    ssh_connection_id.map(RemoteConnectionId),
                 )
             })
             .collect())
@@ -1017,7 +1140,7 @@ impl WorkspaceDb {
 
     query! {
         fn session_workspaces_query(session_id: String) -> Result<Vec<(String, String, Option<u64>, Option<u64>)>> {
-            SELECT paths, paths_order, window_id, ssh_connection_id
+            SELECT paths, paths_order, window_id, remote_connection_id
             FROM workspaces
             WHERE session_id = ?1
             ORDER BY timestamp DESC
@@ -1039,40 +1162,55 @@ impl WorkspaceDb {
         }
     }
 
-    fn ssh_connections(&self) -> Result<HashMap<SshConnectionId, SerializedSshConnection>> {
-        Ok(self
-            .ssh_connections_query()?
-            .into_iter()
-            .map(|(id, host, port, user)| {
-                (
-                    SshConnectionId(id),
-                    SerializedSshConnection { host, port, user },
-                )
-            })
-            .collect())
-    }
-
-    query! {
-        pub fn ssh_connections_query() -> Result<Vec<(u64, String, Option<u16>, Option<String>)>> {
-            SELECT id, host, port, user
-            FROM ssh_connections
-        }
-    }
-
-    pub(crate) fn ssh_connection(&self, id: SshConnectionId) -> Result<SerializedSshConnection> {
-        let row = self.ssh_connection_query(id.0)?;
-        Ok(SerializedSshConnection {
-            host: row.0,
-            port: row.1,
-            user: row.2,
+    fn remote_connections(&self) -> Result<HashMap<RemoteConnectionId, RemoteConnectionOptions>> {
+        Ok(self.select(sql!(
+            SELECT
+                id, kind, host, port, user, distro
+            FROM
+                remote_connections
+        ))?()?
+        .into_iter()
+        .filter_map(|(id, kind, host, port, user, distro)| {
+            Some((
+                RemoteConnectionId(id),
+                Self::remote_connection_from_row(kind, host, port, user, distro)?,
+            ))
         })
+        .collect())
     }
 
-    query! {
-        fn ssh_connection_query(id: u64) -> Result<(String, Option<u16>, Option<String>)> {
-            SELECT host, port, user
-            FROM ssh_connections
+    pub(crate) fn remote_connection(
+        &self,
+        id: RemoteConnectionId,
+    ) -> Result<RemoteConnectionOptions> {
+        let (kind, host, port, user, distro) = self.select_row_bound(sql!(
+            SELECT kind, host, port, user, distro
+            FROM remote_connections
             WHERE id = ?
+        ))?(id.0)?
+        .context("no such remote connection")?;
+        Self::remote_connection_from_row(kind, host, port, user, distro)
+            .context("invalid remote_connection row")
+    }
+
+    fn remote_connection_from_row(
+        kind: String,
+        host: Option<String>,
+        port: Option<u16>,
+        user: Option<String>,
+        distro: Option<String>,
+    ) -> Option<RemoteConnectionOptions> {
+        match RemoteConnectionKind::deserialize(&kind)? {
+            RemoteConnectionKind::Wsl => Some(RemoteConnectionOptions::Wsl(WslConnectionOptions {
+                distro_name: distro?,
+                user: user,
+            })),
+            RemoteConnectionKind::Ssh => Some(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host?,
+                port,
+                username: user,
+                ..Default::default()
+            })),
         }
     }
 
@@ -1108,14 +1246,14 @@ impl WorkspaceDb {
     ) -> Result<Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>> {
         let mut result = Vec::new();
         let mut delete_tasks = Vec::new();
-        let ssh_connections = self.ssh_connections()?;
+        let remote_connections = self.remote_connections()?;
 
-        for (id, paths, ssh_connection_id) in self.recent_workspaces()? {
-            if let Some(ssh_connection_id) = ssh_connection_id.map(SshConnectionId) {
-                if let Some(ssh_connection) = ssh_connections.get(&ssh_connection_id) {
+        for (id, paths, remote_connection_id) in self.recent_workspaces()? {
+            if let Some(remote_connection_id) = remote_connection_id {
+                if let Some(connection_options) = remote_connections.get(&remote_connection_id) {
                     result.push((
                         id,
-                        SerializedWorkspaceLocation::Ssh(ssh_connection.clone()),
+                        SerializedWorkspaceLocation::Remote(connection_options.clone()),
                         paths,
                     ));
                 } else {
@@ -1157,12 +1295,14 @@ impl WorkspaceDb {
     ) -> Result<Vec<(SerializedWorkspaceLocation, PathList)>> {
         let mut workspaces = Vec::new();
 
-        for (paths, window_id, ssh_connection_id) in
+        for (paths, window_id, remote_connection_id) in
             self.session_workspaces(last_session_id.to_owned())?
         {
-            if let Some(ssh_connection_id) = ssh_connection_id {
+            if let Some(remote_connection_id) = remote_connection_id {
                 workspaces.push((
-                    SerializedWorkspaceLocation::Ssh(self.ssh_connection(ssh_connection_id)?),
+                    SerializedWorkspaceLocation::Remote(
+                        self.remote_connection(remote_connection_id)?,
+                    ),
                     paths,
                     window_id.map(WindowId::from),
                 ));
@@ -1545,6 +1685,7 @@ mod tests {
     };
     use gpui;
     use pretty_assertions::assert_eq;
+    use remote::SshConnectionOptions;
     use std::{thread, time::Duration};
 
     #[gpui::test]
@@ -2196,14 +2337,20 @@ mod tests {
         };
 
         let connection_id = db
-            .get_or_create_ssh_connection("my-host".to_string(), Some(1234), None)
+            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: "my-host".to_string(),
+                port: Some(1234),
+                ..Default::default()
+            }))
             .await
             .unwrap();
 
         let workspace_5 = SerializedWorkspace {
             id: WorkspaceId(5),
             paths: PathList::default(),
-            location: SerializedWorkspaceLocation::Ssh(db.ssh_connection(connection_id).unwrap()),
+            location: SerializedWorkspaceLocation::Remote(
+                db.remote_connection(connection_id).unwrap(),
+            ),
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2362,13 +2509,12 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_last_session_workspace_locations_ssh_projects() {
-        let db = WorkspaceDb::open_test_db(
-            "test_serializing_workspaces_last_session_workspaces_ssh_projects",
-        )
-        .await;
+    async fn test_last_session_workspace_locations_remote() {
+        let db =
+            WorkspaceDb::open_test_db("test_serializing_workspaces_last_session_workspaces_remote")
+                .await;
 
-        let ssh_connections = [
+        let remote_connections = [
             ("host-1", "my-user-1"),
             ("host-2", "my-user-2"),
             ("host-3", "my-user-3"),
@@ -2376,30 +2522,31 @@ mod tests {
         ]
         .into_iter()
         .map(|(host, user)| async {
-            db.get_or_create_ssh_connection(host.to_string(), None, Some(user.to_string()))
+            let options = RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host.to_string(),
+                username: Some(user.to_string()),
+                ..Default::default()
+            });
+            db.get_or_create_remote_connection(options.clone())
                 .await
                 .unwrap();
-            SerializedSshConnection {
-                host: host.into(),
-                port: None,
-                user: Some(user.into()),
-            }
+            options
         })
         .collect::<Vec<_>>();
 
-        let ssh_connections = futures::future::join_all(ssh_connections).await;
+        let remote_connections = futures::future::join_all(remote_connections).await;
 
         let workspaces = [
-            (1, ssh_connections[0].clone(), 9),
-            (2, ssh_connections[1].clone(), 5),
-            (3, ssh_connections[2].clone(), 8),
-            (4, ssh_connections[3].clone(), 2),
+            (1, remote_connections[0].clone(), 9),
+            (2, remote_connections[1].clone(), 5),
+            (3, remote_connections[2].clone(), 8),
+            (4, remote_connections[3].clone(), 2),
         ]
         .into_iter()
-        .map(|(id, ssh_connection, window_id)| SerializedWorkspace {
+        .map(|(id, remote_connection, window_id)| SerializedWorkspace {
             id: WorkspaceId(id),
             paths: PathList::default(),
-            location: SerializedWorkspaceLocation::Ssh(ssh_connection),
+            location: SerializedWorkspaceLocation::Remote(remote_connection),
             center_group: Default::default(),
             window_bounds: Default::default(),
             display: Default::default(),
@@ -2429,28 +2576,28 @@ mod tests {
         assert_eq!(
             have[0],
             (
-                SerializedWorkspaceLocation::Ssh(ssh_connections[3].clone()),
+                SerializedWorkspaceLocation::Remote(remote_connections[3].clone()),
                 PathList::default()
             )
         );
         assert_eq!(
             have[1],
             (
-                SerializedWorkspaceLocation::Ssh(ssh_connections[2].clone()),
+                SerializedWorkspaceLocation::Remote(remote_connections[2].clone()),
                 PathList::default()
             )
         );
         assert_eq!(
             have[2],
             (
-                SerializedWorkspaceLocation::Ssh(ssh_connections[1].clone()),
+                SerializedWorkspaceLocation::Remote(remote_connections[1].clone()),
                 PathList::default()
             )
         );
         assert_eq!(
             have[3],
             (
-                SerializedWorkspaceLocation::Ssh(ssh_connections[0].clone()),
+                SerializedWorkspaceLocation::Remote(remote_connections[0].clone()),
                 PathList::default()
             )
         );
@@ -2465,13 +2612,23 @@ mod tests {
         let user = Some("user".to_string());
 
         let connection_id = db
-            .get_or_create_ssh_connection(host.clone(), port, user.clone())
+            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host.clone(),
+                port,
+                username: user.clone(),
+                ..Default::default()
+            }))
             .await
             .unwrap();
 
         // Test that calling the function again with the same parameters returns the same project
         let same_connection = db
-            .get_or_create_ssh_connection(host.clone(), port, user.clone())
+            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host.clone(),
+                port,
+                username: user.clone(),
+                ..Default::default()
+            }))
             .await
             .unwrap();
 
@@ -2483,7 +2640,12 @@ mod tests {
         let user2 = Some("otheruser".to_string());
 
         let different_connection = db
-            .get_or_create_ssh_connection(host2.clone(), port2, user2.clone())
+            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host2.clone(),
+                port: port2,
+                username: user2.clone(),
+                ..Default::default()
+            }))
             .await
             .unwrap();
 
@@ -2497,12 +2659,22 @@ mod tests {
         let (host, port, user) = ("example.com".to_string(), None, None);
 
         let connection_id = db
-            .get_or_create_ssh_connection(host.clone(), port, None)
+            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host.clone(),
+                port,
+                username: None,
+                ..Default::default()
+            }))
             .await
             .unwrap();
 
         let same_connection_id = db
-            .get_or_create_ssh_connection(host.clone(), port, user.clone())
+            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
+                host: host.clone(),
+                port,
+                username: user.clone(),
+                ..Default::default()
+            }))
             .await
             .unwrap();
 
@@ -2510,8 +2682,8 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_get_ssh_connections() {
-        let db = WorkspaceDb::open_test_db("test_get_ssh_connections").await;
+    async fn test_get_remote_connections() {
+        let db = WorkspaceDb::open_test_db("test_get_remote_connections").await;
 
         let connections = [
             ("example.com".to_string(), None, None),
@@ -2526,39 +2698,49 @@ mod tests {
         let mut ids = Vec::new();
         for (host, port, user) in connections.iter() {
             ids.push(
-                db.get_or_create_ssh_connection(host.clone(), *port, user.clone())
-                    .await
-                    .unwrap(),
+                db.get_or_create_remote_connection(RemoteConnectionOptions::Ssh(
+                    SshConnectionOptions {
+                        host: host.clone(),
+                        port: *port,
+                        username: user.clone(),
+                        ..Default::default()
+                    },
+                ))
+                .await
+                .unwrap(),
             );
         }
 
-        let stored_projects = db.ssh_connections().unwrap();
+        let stored_connections = db.remote_connections().unwrap();
         assert_eq!(
-            stored_projects,
+            stored_connections,
             [
                 (
                     ids[0],
-                    SerializedSshConnection {
+                    RemoteConnectionOptions::Ssh(SshConnectionOptions {
                         host: "example.com".into(),
                         port: None,
-                        user: None,
-                    }
+                        username: None,
+                        ..Default::default()
+                    }),
                 ),
                 (
                     ids[1],
-                    SerializedSshConnection {
+                    RemoteConnectionOptions::Ssh(SshConnectionOptions {
                         host: "anotherexample.com".into(),
                         port: Some(123),
-                        user: Some("user2".into()),
-                    }
+                        username: Some("user2".into()),
+                        ..Default::default()
+                    }),
                 ),
                 (
                     ids[2],
-                    SerializedSshConnection {
+                    RemoteConnectionOptions::Ssh(SshConnectionOptions {
                         host: "yetanother.com".into(),
                         port: Some(345),
-                        user: None,
-                    }
+                        username: None,
+                        ..Default::default()
+                    }),
                 ),
             ]
             .into_iter()
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index 04757d0495..005a1ba234 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -12,7 +12,7 @@ use db::sqlez::{
 use gpui::{AsyncWindowContext, Entity, WeakEntity};
 
 use project::{Project, debugger::breakpoint_store::SourceBreakpoint};
-use serde::{Deserialize, Serialize};
+use remote::RemoteConnectionOptions;
 use std::{
     collections::BTreeMap,
     path::{Path, PathBuf},
@@ -24,19 +24,18 @@ use uuid::Uuid;
 #[derive(
     Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
 )]
-pub(crate) struct SshConnectionId(pub u64);
+pub(crate) struct RemoteConnectionId(pub u64);
 
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
-pub struct SerializedSshConnection {
-    pub host: String,
-    pub port: Option<u16>,
-    pub user: Option<String>,
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub(crate) enum RemoteConnectionKind {
+    Ssh,
+    Wsl,
 }
 
 #[derive(Debug, PartialEq, Clone)]
 pub enum SerializedWorkspaceLocation {
     Local,
-    Ssh(SerializedSshConnection),
+    Remote(RemoteConnectionOptions),
 }
 
 impl SerializedWorkspaceLocation {
@@ -68,6 +67,23 @@ pub struct DockStructure {
     pub(crate) bottom: DockData,
 }
 
+impl RemoteConnectionKind {
+    pub(crate) fn serialize(&self) -> &'static str {
+        match self {
+            RemoteConnectionKind::Ssh => "ssh",
+            RemoteConnectionKind::Wsl => "wsl",
+        }
+    }
+
+    pub(crate) fn deserialize(text: &str) -> Option<Self> {
+        match text {
+            "ssh" => Some(Self::Ssh),
+            "wsl" => Some(Self::Wsl),
+            _ => None,
+        }
+    }
+}
+
 impl Column for DockStructure {
     fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
         let (left, next_index) = DockData::column(statement, start_index)?;
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 61442eb634..bd19f37c1e 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -67,14 +67,14 @@ pub use pane_group::*;
 use persistence::{DB, SerializedWindowBounds, model::SerializedWorkspace};
 pub use persistence::{
     DB as WORKSPACE_DB, WorkspaceDb, delete_unloaded_items,
-    model::{ItemId, SerializedSshConnection, SerializedWorkspaceLocation},
+    model::{ItemId, SerializedWorkspaceLocation},
 };
 use postage::stream::Stream;
 use project::{
     DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
     debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
 };
-use remote::{RemoteClientDelegate, SshConnectionOptions, remote_client::ConnectionIdentifier};
+use remote::{RemoteClientDelegate, RemoteConnectionOptions, remote_client::ConnectionIdentifier};
 use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
@@ -5262,14 +5262,7 @@ impl Workspace {
     fn serialize_workspace_location(&self, cx: &App) -> WorkspaceLocation {
         let paths = PathList::new(&self.root_paths(cx));
         if let Some(connection) = self.project.read(cx).remote_connection_options(cx) {
-            WorkspaceLocation::Location(
-                SerializedWorkspaceLocation::Ssh(SerializedSshConnection {
-                    host: connection.host,
-                    port: connection.port,
-                    user: connection.username,
-                }),
-                paths,
-            )
+            WorkspaceLocation::Location(SerializedWorkspaceLocation::Remote(connection), paths)
         } else if self.project.read(cx).is_local() {
             if !paths.is_empty() {
                 WorkspaceLocation::Location(SerializedWorkspaceLocation::Local, paths)
@@ -7282,9 +7275,9 @@ pub fn create_and_open_local_file(
     })
 }
 
-pub fn open_ssh_project_with_new_connection(
+pub fn open_remote_project_with_new_connection(
     window: WindowHandle<Workspace>,
-    connection_options: SshConnectionOptions,
+    connection_options: RemoteConnectionOptions,
     cancel_rx: oneshot::Receiver<()>,
     delegate: Arc<dyn RemoteClientDelegate>,
     app_state: Arc<AppState>,
@@ -7293,11 +7286,11 @@ pub fn open_ssh_project_with_new_connection(
 ) -> Task<Result<()>> {
     cx.spawn(async move |cx| {
         let (workspace_id, serialized_workspace) =
-            serialize_ssh_project(connection_options.clone(), paths.clone(), cx).await?;
+            serialize_remote_project(connection_options.clone(), paths.clone(), cx).await?;
 
         let session = match cx
             .update(|cx| {
-                remote::RemoteClient::ssh(
+                remote::RemoteClient::new(
                     ConnectionIdentifier::Workspace(workspace_id.0),
                     connection_options,
                     cancel_rx,
@@ -7323,7 +7316,7 @@ pub fn open_ssh_project_with_new_connection(
             )
         })?;
 
-        open_ssh_project_inner(
+        open_remote_project_inner(
             project,
             paths,
             workspace_id,
@@ -7336,8 +7329,8 @@ pub fn open_ssh_project_with_new_connection(
     })
 }
 
-pub fn open_ssh_project_with_existing_connection(
-    connection_options: SshConnectionOptions,
+pub fn open_remote_project_with_existing_connection(
+    connection_options: RemoteConnectionOptions,
     project: Entity<Project>,
     paths: Vec<PathBuf>,
     app_state: Arc<AppState>,
@@ -7346,9 +7339,9 @@ pub fn open_ssh_project_with_existing_connection(
 ) -> Task<Result<()>> {
     cx.spawn(async move |cx| {
         let (workspace_id, serialized_workspace) =
-            serialize_ssh_project(connection_options.clone(), paths.clone(), cx).await?;
+            serialize_remote_project(connection_options.clone(), paths.clone(), cx).await?;
 
-        open_ssh_project_inner(
+        open_remote_project_inner(
             project,
             paths,
             workspace_id,
@@ -7361,7 +7354,7 @@ pub fn open_ssh_project_with_existing_connection(
     })
 }
 
-async fn open_ssh_project_inner(
+async fn open_remote_project_inner(
     project: Entity<Project>,
     paths: Vec<PathBuf>,
     workspace_id: WorkspaceId,
@@ -7448,22 +7441,18 @@ async fn open_ssh_project_inner(
     Ok(())
 }
 
-fn serialize_ssh_project(
-    connection_options: SshConnectionOptions,
+fn serialize_remote_project(
+    connection_options: RemoteConnectionOptions,
     paths: Vec<PathBuf>,
     cx: &AsyncApp,
 ) -> Task<Result<(WorkspaceId, Option<SerializedWorkspace>)>> {
     cx.background_spawn(async move {
-        let ssh_connection_id = persistence::DB
-            .get_or_create_ssh_connection(
-                connection_options.host.clone(),
-                connection_options.port,
-                connection_options.username.clone(),
-            )
+        let remote_connection_id = persistence::DB
+            .get_or_create_remote_connection(connection_options)
             .await?;
 
         let serialized_workspace =
-            persistence::DB.ssh_workspace_for_roots(&paths, ssh_connection_id);
+            persistence::DB.remote_workspace_for_roots(&paths, remote_connection_id);
 
         let workspace_id = if let Some(workspace_id) =
             serialized_workspace.as_ref().map(|workspace| workspace.id)
@@ -8013,22 +8002,20 @@ pub struct WorkspacePosition {
     pub centered_layout: bool,
 }
 
-pub fn ssh_workspace_position_from_db(
-    host: String,
-    port: Option<u16>,
-    user: Option<String>,
+pub fn remote_workspace_position_from_db(
+    connection_options: RemoteConnectionOptions,
     paths_to_open: &[PathBuf],
     cx: &App,
 ) -> Task<Result<WorkspacePosition>> {
     let paths = paths_to_open.to_vec();
 
     cx.background_spawn(async move {
-        let ssh_connection_id = persistence::DB
-            .get_or_create_ssh_connection(host, port, user)
+        let remote_connection_id = persistence::DB
+            .get_or_create_remote_connection(connection_options)
             .await
             .context("fetching serialized ssh project")?;
         let serialized_workspace =
-            persistence::DB.ssh_workspace_for_roots(&paths, ssh_connection_id);
+            persistence::DB.remote_workspace_for_roots(&paths, remote_connection_id);
 
         let (window_bounds, display) = if let Some(bounds) = window_bounds_env_override() {
             (Some(WindowBounds::Windowed(bounds)), None)
diff --git a/crates/zed/resources/windows/zed-wsl b/crates/zed/resources/windows/zed-wsl
new file mode 100644
index 0000000000..d3cbb93af6
--- /dev/null
+++ b/crates/zed/resources/windows/zed-wsl
@@ -0,0 +1,25 @@
+#!/usr/bin/env sh
+
+if [ "$ZED_WSL_DEBUG_INFO" = true ]; then
+	set -x
+fi
+
+ZED_PATH="$(dirname "$(realpath "$0")")"
+
+IN_WSL=false
+if [ -n "$WSL_DISTRO_NAME" ]; then
+	# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
+	IN_WSL=true
+fi
+
+if [ $IN_WSL = true ]; then
+    WSL_USER="$USER"
+    if [ -z "$WSL_USER" ]; then
+        WSL_USER="$USERNAME"
+    fi
+    "$ZED_PATH/zed.exe" --wsl "$WSL_USER@$WSL_DISTRO_NAME" "$@"
+    exit $?
+else
+    echo "Only WSL is supported for now" >&2
+    exit 1
+fi
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index e443879204..79cf2bfa66 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -23,13 +23,14 @@ use http_client::{Url, read_proxy_from_env};
 use language::LanguageRegistry;
 use onboarding::{FIRST_OPEN, show_onboarding_view};
 use prompt_store::PromptBuilder;
+use remote::RemoteConnectionOptions;
 use reqwest_client::ReqwestClient;
 
 use assets::Assets;
 use node_runtime::{NodeBinaryOptions, NodeRuntime};
 use parking_lot::Mutex;
 use project::project_settings::ProjectSettings;
-use recent_projects::{SshSettings, open_ssh_project};
+use recent_projects::{SshSettings, open_remote_project};
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use session::{AppSession, Session};
 use settings::{BaseKeymap, Settings, SettingsStore, watch_config_file};
@@ -360,6 +361,7 @@ pub fn main() {
             open_listener.open(RawOpenRequest {
                 urls,
                 diff_paths: Vec::new(),
+                ..Default::default()
             })
         }
     });
@@ -696,7 +698,7 @@ pub fn main() {
         let urls: Vec<_> = args
             .paths_or_urls
             .iter()
-            .filter_map(|arg| parse_url_arg(arg, cx).log_err())
+            .map(|arg| parse_url_arg(arg, cx))
             .collect();
 
         let diff_paths: Vec<[String; 2]> = args
@@ -706,7 +708,11 @@ pub fn main() {
             .collect();
 
         if !urls.is_empty() || !diff_paths.is_empty() {
-            open_listener.open(RawOpenRequest { urls, diff_paths })
+            open_listener.open(RawOpenRequest {
+                urls,
+                diff_paths,
+                wsl: args.wsl,
+            })
         }
 
         match open_rx
@@ -792,10 +798,10 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
         return;
     }
 
-    if let Some(connection_options) = request.ssh_connection {
+    if let Some(connection_options) = request.remote_connection {
         cx.spawn(async move |cx| {
             let paths: Vec<PathBuf> = request.open_paths.into_iter().map(PathBuf::from).collect();
-            open_ssh_project(
+            open_remote_project(
                 connection_options,
                 paths,
                 app_state,
@@ -978,31 +984,24 @@ async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp
                         tasks.push(task);
                     }
                 }
-                SerializedWorkspaceLocation::Ssh(ssh) => {
+                SerializedWorkspaceLocation::Remote(mut connection_options) => {
                     let app_state = app_state.clone();
-                    let ssh_host = ssh.host.clone();
-                    let task = cx.spawn(async move |cx| {
-                        let connection_options = cx.update(|cx| {
+                    if let RemoteConnectionOptions::Ssh(options) = &mut connection_options {
+                        cx.update(|cx| {
                             SshSettings::get_global(cx)
-                                .connection_options_for(ssh.host, ssh.port, ssh.user)
-                        });
-
-                        match connection_options {
-                            Ok(connection_options) => recent_projects::open_ssh_project(
-                                connection_options,
-                                paths.paths().into_iter().map(PathBuf::from).collect(),
-                                app_state,
-                                workspace::OpenOptions::default(),
-                                cx,
-                            )
-                            .await
-                            .map_err(|e| anyhow::anyhow!(e)),
-                            Err(e) => Err(anyhow::anyhow!(
-                                "Failed to get SSH connection options for {}: {}",
-                                ssh_host,
-                                e
-                            )),
-                        }
+                                .fill_connection_options_from_settings(options)
+                        })?;
+                    }
+                    let task = cx.spawn(async move |cx| {
+                        recent_projects::open_remote_project(
+                            connection_options,
+                            paths.paths().into_iter().map(PathBuf::from).collect(),
+                            app_state,
+                            workspace::OpenOptions::default(),
+                            cx,
+                        )
+                        .await
+                        .map_err(|e| anyhow::anyhow!(e))
                     });
                     tasks.push(task);
                 }
@@ -1184,6 +1183,16 @@ struct Args {
     #[arg(long, value_name = "DIR")]
     user_data_dir: Option<String>,
 
+    /// The username and WSL distribution to use when opening paths. ,If not specified,
+    /// Zed will attempt to open the paths directly.
+    ///
+    /// The username is optional, and if not specified, the default user for the distribution
+    /// will be used.
+    ///
+    /// Example: `me@Ubuntu` or `Ubuntu` for default distribution.
+    #[arg(long, value_name = "USER@DISTRO")]
+    wsl: Option<String>,
+
     /// Instructs zed to run as a dev server on this machine. (not implemented)
     #[arg(long)]
     dev_server_token: Option<String>,
@@ -1242,18 +1251,18 @@ impl ToString for IdType {
     }
 }
 
-fn parse_url_arg(arg: &str, cx: &App) -> Result<String> {
+fn parse_url_arg(arg: &str, cx: &App) -> String {
     match std::fs::canonicalize(Path::new(&arg)) {
-        Ok(path) => Ok(format!("file://{}", path.display())),
-        Err(error) => {
+        Ok(path) => format!("file://{}", path.display()),
+        Err(_) => {
             if arg.starts_with("file://")
                 || arg.starts_with("zed-cli://")
                 || arg.starts_with("ssh://")
                 || parse_zed_link(arg, cx).is_some()
             {
-                Ok(arg.into())
+                arg.into()
             } else {
-                anyhow::bail!("error parsing path argument: {error}")
+                format!("file://{arg}")
             }
         }
     }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 5797070a39..d0e4687a13 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -48,7 +48,7 @@ use project::{DirectoryLister, ProjectItem};
 use project_panel::ProjectPanel;
 use prompt_store::PromptBuilder;
 use quick_action_bar::QuickActionBar;
-use recent_projects::open_ssh_project;
+use recent_projects::open_remote_project;
 use release_channel::{AppCommitSha, ReleaseChannel};
 use rope::Rope;
 use search::project_search::ProjectSearchBar;
@@ -1557,7 +1557,7 @@ pub fn open_new_ssh_project_from_project(
     };
     let connection_options = ssh_client.read(cx).connection_options();
     cx.spawn_in(window, async move |_, cx| {
-        open_ssh_project(
+        open_remote_project(
             connection_options,
             paths,
             app_state,
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index 2194fb7af5..f2d8cd46c3 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -17,8 +17,8 @@ use gpui::{App, AsyncApp, Global, WindowHandle};
 use language::Point;
 use onboarding::FIRST_OPEN;
 use onboarding::show_onboarding_view;
-use recent_projects::{SshSettings, open_ssh_project};
-use remote::SshConnectionOptions;
+use recent_projects::{SshSettings, open_remote_project};
+use remote::{RemoteConnectionOptions, WslConnectionOptions};
 use settings::Settings;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -37,7 +37,7 @@ pub struct OpenRequest {
     pub diff_paths: Vec<[String; 2]>,
     pub open_channel_notes: Vec<(u64, Option<String>)>,
     pub join_channel: Option<u64>,
-    pub ssh_connection: Option<SshConnectionOptions>,
+    pub remote_connection: Option<RemoteConnectionOptions>,
 }
 
 #[derive(Debug)]
@@ -51,6 +51,23 @@ pub enum OpenRequestKind {
 impl OpenRequest {
     pub fn parse(request: RawOpenRequest, cx: &App) -> Result<Self> {
         let mut this = Self::default();
+
+        this.diff_paths = request.diff_paths;
+        if let Some(wsl) = request.wsl {
+            let (user, distro_name) = if let Some((user, distro)) = wsl.split_once('@') {
+                if user.is_empty() {
+                    anyhow::bail!("user is empty in wsl argument");
+                }
+                (Some(user.to_string()), distro.to_string())
+            } else {
+                (None, wsl)
+            };
+            this.remote_connection = Some(RemoteConnectionOptions::Wsl(WslConnectionOptions {
+                distro_name,
+                user,
+            }));
+        }
+
         for url in request.urls {
             if let Some(server_name) = url.strip_prefix("zed-cli://") {
                 this.kind = Some(OpenRequestKind::CliConnection(connect_to_cli(server_name)?));
@@ -80,8 +97,6 @@ impl OpenRequest {
             }
         }
 
-        this.diff_paths = request.diff_paths;
-
         Ok(this)
     }
 
@@ -108,13 +123,15 @@ impl OpenRequest {
         if let Some(password) = url.password() {
             connection_options.password = Some(password.to_string());
         }
-        if let Some(ssh_connection) = &self.ssh_connection {
+
+        let connection_options = RemoteConnectionOptions::Ssh(connection_options);
+        if let Some(ssh_connection) = &self.remote_connection {
             anyhow::ensure!(
                 *ssh_connection == connection_options,
-                "cannot open multiple ssh connections"
+                "cannot open multiple different remote connections"
             );
         }
-        self.ssh_connection = Some(connection_options);
+        self.remote_connection = Some(connection_options);
         self.parse_file_path(url.path());
         Ok(())
     }
@@ -152,6 +169,7 @@ pub struct OpenListener(UnboundedSender<RawOpenRequest>);
 pub struct RawOpenRequest {
     pub urls: Vec<String>,
     pub diff_paths: Vec<[String; 2]>,
+    pub wsl: Option<String>,
 }
 
 impl Global for OpenListener {}
@@ -303,13 +321,21 @@ pub async fn handle_cli_connection(
                 paths,
                 diff_paths,
                 wait,
+                wsl,
                 open_new_workspace,
                 env,
                 user_data_dir: _,
             } => {
                 if !urls.is_empty() {
                     cx.update(|cx| {
-                        match OpenRequest::parse(RawOpenRequest { urls, diff_paths }, cx) {
+                        match OpenRequest::parse(
+                            RawOpenRequest {
+                                urls,
+                                diff_paths,
+                                wsl,
+                            },
+                            cx,
+                        ) {
                             Ok(open_request) => {
                                 handle_open_request(open_request, app_state.clone(), cx);
                                 responses.send(CliResponse::Exit { status: 0 }).log_err();
@@ -422,30 +448,26 @@ async fn open_workspaces(
                         errored = true
                     }
                 }
-                SerializedWorkspaceLocation::Ssh(ssh) => {
+                SerializedWorkspaceLocation::Remote(mut connection) => {
                     let app_state = app_state.clone();
-                    let connection_options = cx.update(|cx| {
-                        SshSettings::get_global(cx)
-                            .connection_options_for(ssh.host, ssh.port, ssh.user)
-                    });
-                    if let Ok(connection_options) = connection_options {
-                        cx.spawn(async move |cx| {
-                            open_ssh_project(
-                                connection_options,
-                                workspace_paths.paths().to_vec(),
-                                app_state,
-                                OpenOptions::default(),
-                                cx,
-                            )
-                            .await
-                            .log_err();
-                        })
-                        .detach();
-                        // We don't set `errored` here if `open_ssh_project` fails, because for ssh projects, the
-                        // error is displayed in the window.
-                    } else {
-                        errored = false;
+                    if let RemoteConnectionOptions::Ssh(options) = &mut connection {
+                        cx.update(|cx| {
+                            SshSettings::get_global(cx)
+                                .fill_connection_options_from_settings(options)
+                        })?;
                     }
+                    cx.spawn(async move |cx| {
+                        open_remote_project(
+                            connection,
+                            workspace_paths.paths().to_vec(),
+                            app_state,
+                            OpenOptions::default(),
+                            cx,
+                        )
+                        .await
+                        .log_err();
+                    })
+                    .detach();
                 }
             }
         }
@@ -587,6 +609,7 @@ mod tests {
     };
     use editor::Editor;
     use gpui::TestAppContext;
+    use remote::SshConnectionOptions;
     use serde_json::json;
     use std::sync::Arc;
     use util::path;
@@ -609,8 +632,8 @@ mod tests {
             .unwrap()
         });
         assert_eq!(
-            request.ssh_connection.unwrap(),
-            SshConnectionOptions {
+            request.remote_connection.unwrap(),
+            RemoteConnectionOptions::Ssh(SshConnectionOptions {
                 host: "localhost".into(),
                 username: Some("me".into()),
                 port: None,
@@ -619,7 +642,7 @@ mod tests {
                 port_forwards: None,
                 nickname: None,
                 upload_binary_over_ssh: false,
-            }
+            })
         );
         assert_eq!(request.open_paths, vec!["/"]);
     }
diff --git a/crates/zed/src/zed/windows_only_instance.rs b/crates/zed/src/zed/windows_only_instance.rs
index bd62dea75a..1dd51b5ffb 100644
--- a/crates/zed/src/zed/windows_only_instance.rs
+++ b/crates/zed/src/zed/windows_only_instance.rs
@@ -153,6 +153,7 @@ fn send_args_to_instance(args: &Args) -> anyhow::Result<()> {
             urls,
             diff_paths,
             wait: false,
+            wsl: args.wsl.clone(),
             open_new_workspace: None,
             env: None,
             user_data_dir: args.user_data_dir.clone(),
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
index 8ae0212491..84ad39fb70 100644
--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@@ -150,6 +150,7 @@ function CollectFiles {
     Move-Item -Path "$innoDir\zed_explorer_command_injector.appx" -Destination "$innoDir\appx\zed_explorer_command_injector.appx" -Force
     Move-Item -Path "$innoDir\zed_explorer_command_injector.dll" -Destination "$innoDir\appx\zed_explorer_command_injector.dll" -Force
     Move-Item -Path "$innoDir\cli.exe" -Destination "$innoDir\bin\zed.exe" -Force
+    Move-Item -Path "$innoDir\zed-wsl" -Destination "$innoDir\bin\zed" -Force
     Move-Item -Path "$innoDir\auto_update_helper.exe" -Destination "$innoDir\tools\auto_update_helper.exe" -Force
     Move-Item -Path ".\AGS_SDK-6.3.0\ags_lib\lib\amd_ags_x64.dll" -Destination "$innoDir\amd_ags_x64.dll" -Force
 }

From 7d0a303785fd73677c255fb15657e6af8dc1e3e8 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 29 Aug 2025 23:03:47 -0400
Subject: [PATCH 477/823] Add xAI to supported language model providers
 (#37206)

After setting a `grok` model via the agent panel, the settings complains
that it doesn't recognize the language model provider:

<img width="1005" height="188" alt="SCR-20250829-tqqd"
src="https://github.com/user-attachments/assets/a25fc7e0-60f0-44fd-96d2-b1cb316d06b6"
/>

Also, sorted the list, in the follow-up commit.

Release Notes:

- N/A
---
 crates/agent_settings/src/agent_settings.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 3808cc510f..3e21e18a11 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -352,18 +352,19 @@ impl JsonSchema for LanguageModelProviderSetting {
     fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
         json_schema!({
             "enum": [
-                "anthropic",
                 "amazon-bedrock",
-                "google",
-                "lmstudio",
-                "ollama",
-                "openai",
-                "zed.dev",
+                "anthropic",
                 "copilot_chat",
                 "deepseek",
-                "openrouter",
+                "google",
+                "lmstudio",
                 "mistral",
-                "vercel"
+                "ollama",
+                "openai",
+                "openrouter",
+                "vercel",
+                "x_ai",
+                "zed.dev"
             ]
         })
     }

From b473f4a1304bc1a4b2e911cc6063167ede3a281c Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Sat, 30 Aug 2025 15:13:23 +0200
Subject: [PATCH 478/823] Fix SQL error in recent projects query (#37220)

Follow-up to https://github.com/zed-industries/zed/pull/37035

In the WSL PR, `ssh_connection_id` was renamed to
`remote_connection_id`. However, that was not accounted for within the
`recent_workspaces_query`. This caused a query fail:

```
2025-08-30T14:45:44+02:00 ERROR [recent_projects] Prepare call failed for query:
SELECT
  workspace_id,
  paths,
  paths_order,
  ssh_connection_id
FROM
  workspaces
WHERE
  paths IS NOT NULL
  OR ssh_connection_id IS NOT NULL
ORDER BY
  timestamp DESC

Caused by:
    Sqlite call failed with code 1 and message: Some("no such column: ssh_connection_id")
```

and resulted in no recent workspaces being shown within the recent
projects picker.

This change updates the column name to the new name and thus fixes the
error.

Release Notes:

- N/A
---
 crates/workspace/src/persistence.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index 160823f547..ef5a86a276 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -1112,11 +1112,11 @@ impl WorkspaceDb {
 
     query! {
         fn recent_workspaces_query() -> Result<Vec<(WorkspaceId, String, String, Option<u64>)>> {
-            SELECT workspace_id, paths, paths_order, ssh_connection_id
+            SELECT workspace_id, paths, paths_order, remote_connection_id
             FROM workspaces
             WHERE
                 paths IS NOT NULL OR
-                ssh_connection_id IS NOT NULL
+                remote_connection_id IS NOT NULL
             ORDER BY timestamp DESC
         }
     }
@@ -1128,11 +1128,11 @@ impl WorkspaceDb {
         Ok(self
             .session_workspaces_query(session_id)?
             .into_iter()
-            .map(|(paths, order, window_id, ssh_connection_id)| {
+            .map(|(paths, order, window_id, remote_connection_id)| {
                 (
                     PathList::deserialize(&SerializedPathList { paths, order }),
                     window_id,
-                    ssh_connection_id.map(RemoteConnectionId),
+                    remote_connection_id.map(RemoteConnectionId),
                 )
             })
             .collect())

From 0a32aa8db1c4bbd4ae8977b0923ece0f32537074 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Sat, 30 Aug 2025 20:12:15 +0530
Subject: [PATCH 479/823] language_models: Fix GitHub Copilot thread summary by
 removing unnecessary noop tool logic (#37152)

Closes #37025

This PR fixes GitHub Copilot thread summary failures by removing the
unnecessary `noop` tool insertion logic. The code was originally added
as a workaround in https://github.com/zed-industries/zed/pull/30007 for
supposed GitHub Copilot API issues when tools were used previously in a
conversation but no tools are provided in the current request. However,
testing revealed that this scenario works fine without the workaround,
and the `noop` tool insertion was actually causing "Invalid schema for
function 'noop'" errors that prevented thread summarization from
working. Removing this logic eliminates the errors and allows thread
summarization to function correctly with GitHub Copilot models.

The best way to see if removing that part of code works is just
triggering thread summarisation.

Error Log:
```
2025-08-27T13:47:50-04:00 ERROR [workspace::notifications] "Failed to connect to API: 400 Bad Request {"error":{"message":"Invalid schema for function 'noop': In context=(), object schema missing properties.","code":"invalid_function_parameters"}}\n"
```

Release Notes:

- Fixed GitHub Copilot thread summary failures by removing unnecessary
noop tool insertion logic.
---
 .../src/provider/copilot_chat.rs              | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index eb12c0056f..d48c12aa4b 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -475,7 +475,6 @@ fn into_copilot_chat(
         }
     }
 
-    let mut tool_called = false;
     let mut messages: Vec<ChatMessage> = Vec::new();
     for message in request_messages {
         match message.role {
@@ -545,7 +544,6 @@ fn into_copilot_chat(
                 let mut tool_calls = Vec::new();
                 for content in &message.content {
                     if let MessageContent::ToolUse(tool_use) = content {
-                        tool_called = true;
                         tool_calls.push(ToolCall {
                             id: tool_use.id.to_string(),
                             content: copilot::copilot_chat::ToolCallContent::Function {
@@ -590,7 +588,7 @@ fn into_copilot_chat(
         }
     }
 
-    let mut tools = request
+    let tools = request
         .tools
         .iter()
         .map(|tool| Tool::Function {
@@ -602,22 +600,6 @@ fn into_copilot_chat(
         })
         .collect::<Vec<_>>();
 
-    // The API will return a Bad Request (with no error message) when tools
-    // were used previously in the conversation but no tools are provided as
-    // part of this request. Inserting a dummy tool seems to circumvent this
-    // error.
-    if tool_called && tools.is_empty() {
-        tools.push(Tool::Function {
-            function: copilot::copilot_chat::Function {
-                name: "noop".to_string(),
-                description: "No operation".to_string(),
-                parameters: serde_json::json!({
-                    "type": "object"
-                }),
-            },
-        });
-    }
-
     Ok(CopilotChatRequest {
         intent: true,
         n: 1,

From af26b627bf8540edc6eea4146acc081183f6241e Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Sat, 30 Aug 2025 12:59:04 -0500
Subject: [PATCH 480/823] settings: Improve parse errors (#37234)

Closes #ISSUE

Adds a dependency on `serde_path_to_error` to the workspace allowing us
to include the path to the setting that failed to parse on settings
parse failure.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 Cargo.lock                            |  1 +
 Cargo.toml                            |  1 +
 crates/settings/Cargo.toml            |  1 +
 crates/settings/src/settings_json.rs  |  3 ++-
 crates/settings/src/settings_store.rs | 26 +++++++++++++++++++++++---
 docs/src/visual-customization.md      |  2 +-
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 84d633dd6f..a80809461e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14894,6 +14894,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_json_lenient",
+ "serde_path_to_error",
  "settings_ui_macros",
  "smallvec",
  "tree-sitter",
diff --git a/Cargo.toml b/Cargo.toml
index b64113311a..48017d9c6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -592,6 +592,7 @@ serde_json_lenient = { version = "0.2", features = [
     "preserve_order",
     "raw_value",
 ] }
+serde_path_to_error = "0.1.17"
 serde_repr = "0.1"
 serde_urlencoded = "0.7"
 sha2 = "0.10"
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index 8768b40736..d9b8d7275f 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -33,6 +33,7 @@ serde_derive.workspace = true
 serde_json.workspace = true
 settings_ui_macros.workspace = true
 serde_json_lenient.workspace = true
+serde_path_to_error.workspace = true
 smallvec.workspace = true
 tree-sitter-json.workspace = true
 tree-sitter.workspace = true
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index b916df6e5c..480fe057ea 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -563,7 +563,8 @@ pub fn to_pretty_json(
 }
 
 pub fn parse_json_with_comments<T: DeserializeOwned>(content: &str) -> Result<T> {
-    Ok(serde_json_lenient::from_str(content)?)
+    let mut deserializer = serde_json_lenient::Deserializer::from_str(content);
+    Ok(serde_path_to_error::deserialize(&mut deserializer)?)
 }
 
 #[cfg(test)]
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 09ac6f9766..023f8cbfba 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -11,7 +11,7 @@ use gpui::{App, AsyncApp, BorrowAppContext, Global, SharedString, Task, UpdateGl
 
 use paths::{EDITORCONFIG_NAME, local_settings_file_relative_path, task_file_name};
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
+use serde::{Serialize, de::DeserializeOwned};
 use serde_json::{Value, json};
 use smallvec::SmallVec;
 use std::{
@@ -1464,9 +1464,29 @@ impl<T: Settings> AnySettingValue for SettingValue<T> {
                 return (T::KEY, Ok(DeserializedSetting(Box::new(value))));
             }
         }
-        let value = T::FileContent::deserialize(json)
+        let value = serde_path_to_error::deserialize::<_, T::FileContent>(json)
             .map(|value| DeserializedSetting(Box::new(value)))
-            .map_err(anyhow::Error::from);
+            .map_err(|err| {
+                // construct a path using the key and reported error path if possible.
+                // Unfortunately, serde_path_to_error does not expose the necessary
+                // methods and data to simply add the key to the path
+                let mut path = String::new();
+                if let Some(key) = key {
+                    path.push_str(key);
+                }
+                let err_path = err.path().to_string();
+                // when the path is empty, serde_path_to_error stringifies the path as ".",
+                // when the path is unknown, serde_path_to_error stringifies the path as an empty string
+                if !err_path.is_empty() && !err_path.starts_with(".") {
+                    path.push('.');
+                    path.push_str(&err_path);
+                }
+                if path.is_empty() {
+                    anyhow::Error::from(err.into_inner())
+                } else {
+                    anyhow::anyhow!("'{}': {}", err.into_inner(), path)
+                }
+            });
         (key, value)
     }
 
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 1df76d17f0..47c72e80f5 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -8,7 +8,7 @@ See [Configuring Zed](./configuring-zed.md) for additional information and other
 
 Use may install zed extensions providing [Themes](./themes.md) and [Icon Themes](./icon-themes.md) via {#action zed::Extensions} from the command palette or menu.
 
-You can preview/choose amongsts your installed themes and icon themes with {#action theme_selector::Toggle} ({#kb theme_selector::Toggle}) and ({#action icon_theme_selector::Toggle}) which will modify the following settings:
+You can preview/choose amongst your installed themes and icon themes with {#action theme_selector::Toggle} ({#kb theme_selector::Toggle}) and ({#action icon_theme_selector::Toggle}) which will modify the following settings:
 
 ```json
 {

From de576bd1b81cef5a8bc41506806ea44c92d9d9a5 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sat, 30 Aug 2025 15:51:08 -0400
Subject: [PATCH 481/823] agent: Fix agent panel header not updating when
 opening a history entry (#37189)

Closes #37171

Release Notes:

- agent: Fixed a bug that caused the agent information in the panel
header to be incorrect when opening a thread from history.
---
 crates/agent_ui/src/agent_panel.rs | 33 +++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 3eb171054a..fac880b783 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -284,6 +284,17 @@ impl AgentType {
     }
 }
 
+impl From<ExternalAgent> for AgentType {
+    fn from(value: ExternalAgent) -> Self {
+        match value {
+            ExternalAgent::Gemini => Self::Gemini,
+            ExternalAgent::ClaudeCode => Self::ClaudeCode,
+            ExternalAgent::Custom { name, command } => Self::Custom { name, command },
+            ExternalAgent::NativeAgent => Self::NativeAgent,
+        }
+    }
+}
+
 impl ActiveView {
     pub fn which_font_size_used(&self) -> WhichFontSize {
         match self {
@@ -1049,6 +1060,11 @@ impl AgentPanel {
             editor
         });
 
+        if self.selected_agent != AgentType::TextThread {
+            self.selected_agent = AgentType::TextThread;
+            self.serialize(cx);
+        }
+
         self.set_active_view(
             ActiveView::prompt_editor(
                 context_editor.clone(),
@@ -1140,6 +1156,12 @@ impl AgentPanel {
                     }
                 }
 
+                let selected_agent = ext_agent.into();
+                if this.selected_agent != selected_agent {
+                    this.selected_agent = selected_agent;
+                    this.serialize(cx);
+                }
+
                 let thread_view = cx.new(|cx| {
                     crate::acp::AcpThreadView::new(
                         server,
@@ -1235,6 +1257,12 @@ impl AgentPanel {
                 cx,
             )
         });
+
+        if self.selected_agent != AgentType::TextThread {
+            self.selected_agent = AgentType::TextThread;
+            self.serialize(cx);
+        }
+
         self.set_active_view(
             ActiveView::prompt_editor(
                 editor,
@@ -1860,11 +1888,6 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.selected_agent != agent {
-            self.selected_agent = agent.clone();
-            self.serialize(cx);
-        }
-
         match agent {
             AgentType::Zed => {
                 window.dispatch_action(

From ad746f25f268ef0ad3aeddc41bc05287c1d0d006 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Sat, 30 Aug 2025 14:13:39 -0600
Subject: [PATCH 482/823] zeta: Add zlib to license detection + ignore symbol
 differences (#37238)

See discussion on #36564. Makes the license regexes a less fragile by
not matching on symbols, while also excluding cases where a long file
ends with a valid license. Also adds Zlib license, a commented out test
to check all license-like files discovered in the homedir, and more
testcases.

Not too happy with the efficiency here, on my quite good computer it
takes ~120ms to compile the regex and allocates ~8mb for it. This is
just not a great use of regexes, I think something using eager substring
matching would be much more efficient - hoping to followup with that.

Release Notes:

- Edit Prediction: Added Zlib license to open-source licenses eligible
for data collection.
---
 Cargo.lock                                    |   1 +
 crates/zeta/Cargo.toml                        |   1 +
 .../0bsd.txt                                  |   0
 .../apache-2.0-ex0.txt}                       |   0
 .../zeta/license_examples/apache-2.0-ex1.txt  |  55 +++++
 .../apache-2.0-ex2.txt}                       | 150 ++++++------
 .../zeta/license_examples/apache-2.0-ex3.txt  |  13 +
 .../bsd-1-clause.txt                          |   0
 .../bsd-2-clause-ex0.txt}                     |   0
 .../bsd-3-clause-ex0.txt}                     |   0
 .../license_examples/bsd-3-clause-ex1.txt     |  27 +++
 .../license_examples/bsd-3-clause-ex2.txt     |  31 +++
 .../license_examples/bsd-3-clause-ex3.txt     |  30 +++
 .../license_examples/bsd-3-clause-ex4.txt     |  27 +++
 .../isc.txt                                   |   0
 .../mit.txt => license_examples/mit-ex0.txt}  |   0
 crates/zeta/license_examples/mit-ex1.txt      |  26 ++
 crates/zeta/license_examples/mit-ex2.txt      |  22 ++
 crates/zeta/license_examples/mit-ex3.txt      |  21 ++
 .../upl-1.0.txt                               |   0
 crates/zeta/license_examples/zlib-ex0.txt     |  19 ++
 crates/zeta/license_regexes/0bsd.regex        |  10 +
 crates/zeta/license_regexes/apache-2.0.regex  | 223 +++++++++++++++++
 crates/zeta/license_regexes/bsd.regex         |  23 ++
 crates/zeta/license_regexes/isc.regex         |  12 +
 crates/zeta/license_regexes/mit.regex         |  17 ++
 crates/zeta/license_regexes/upl-1.0.regex     |  32 +++
 crates/zeta/license_regexes/zlib.regex        |  18 ++
 crates/zeta/src/license_detection.rs          | 229 +++++++++++++++---
 crates/zeta/src/license_detection/0bsd.regex  |  12 -
 .../src/license_detection/bsd-1-clause.regex  |  17 --
 .../src/license_detection/bsd-2-clause.regex  |  22 --
 .../src/license_detection/bsd-3-clause.regex  |  26 --
 crates/zeta/src/license_detection/isc.regex   |  15 --
 crates/zeta/src/license_detection/mit.regex   |  21 --
 .../zeta/src/license_detection/upl-1.0.regex  |  35 ---
 36 files changed, 867 insertions(+), 268 deletions(-)
 rename crates/zeta/{src/license_detection => license_examples}/0bsd.txt (100%)
 rename crates/zeta/{src/license_detection/apache-2.0.txt => license_examples/apache-2.0-ex0.txt} (100%)
 create mode 100644 crates/zeta/license_examples/apache-2.0-ex1.txt
 rename crates/zeta/{src/license_detection/apache-2.0.regex => license_examples/apache-2.0-ex2.txt} (59%)
 create mode 100644 crates/zeta/license_examples/apache-2.0-ex3.txt
 rename crates/zeta/{src/license_detection => license_examples}/bsd-1-clause.txt (100%)
 rename crates/zeta/{src/license_detection/bsd-2-clause.txt => license_examples/bsd-2-clause-ex0.txt} (100%)
 rename crates/zeta/{src/license_detection/bsd-3-clause.txt => license_examples/bsd-3-clause-ex0.txt} (100%)
 create mode 100644 crates/zeta/license_examples/bsd-3-clause-ex1.txt
 create mode 100644 crates/zeta/license_examples/bsd-3-clause-ex2.txt
 create mode 100644 crates/zeta/license_examples/bsd-3-clause-ex3.txt
 create mode 100644 crates/zeta/license_examples/bsd-3-clause-ex4.txt
 rename crates/zeta/{src/license_detection => license_examples}/isc.txt (100%)
 rename crates/zeta/{src/license_detection/mit.txt => license_examples/mit-ex0.txt} (100%)
 create mode 100644 crates/zeta/license_examples/mit-ex1.txt
 create mode 100644 crates/zeta/license_examples/mit-ex2.txt
 create mode 100644 crates/zeta/license_examples/mit-ex3.txt
 rename crates/zeta/{src/license_detection => license_examples}/upl-1.0.txt (100%)
 create mode 100644 crates/zeta/license_examples/zlib-ex0.txt
 create mode 100644 crates/zeta/license_regexes/0bsd.regex
 create mode 100644 crates/zeta/license_regexes/apache-2.0.regex
 create mode 100644 crates/zeta/license_regexes/bsd.regex
 create mode 100644 crates/zeta/license_regexes/isc.regex
 create mode 100644 crates/zeta/license_regexes/mit.regex
 create mode 100644 crates/zeta/license_regexes/upl-1.0.regex
 create mode 100644 crates/zeta/license_regexes/zlib.regex
 delete mode 100644 crates/zeta/src/license_detection/0bsd.regex
 delete mode 100644 crates/zeta/src/license_detection/bsd-1-clause.regex
 delete mode 100644 crates/zeta/src/license_detection/bsd-2-clause.regex
 delete mode 100644 crates/zeta/src/license_detection/bsd-3-clause.regex
 delete mode 100644 crates/zeta/src/license_detection/isc.regex
 delete mode 100644 crates/zeta/src/license_detection/mit.regex
 delete mode 100644 crates/zeta/src/license_detection/upl-1.0.regex

diff --git a/Cargo.lock b/Cargo.lock
index a80809461e..4ca45445e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20817,6 +20817,7 @@ dependencies = [
  "gpui",
  "http_client",
  "indoc",
+ "itertools 0.14.0",
  "language",
  "language_model",
  "log",
diff --git a/crates/zeta/Cargo.toml b/crates/zeta/Cargo.toml
index 05eedd6015..a57781ee8e 100644
--- a/crates/zeta/Cargo.toml
+++ b/crates/zeta/Cargo.toml
@@ -34,6 +34,7 @@ futures.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 indoc.workspace = true
+itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
 log.workspace = true
diff --git a/crates/zeta/src/license_detection/0bsd.txt b/crates/zeta/license_examples/0bsd.txt
similarity index 100%
rename from crates/zeta/src/license_detection/0bsd.txt
rename to crates/zeta/license_examples/0bsd.txt
diff --git a/crates/zeta/src/license_detection/apache-2.0.txt b/crates/zeta/license_examples/apache-2.0-ex0.txt
similarity index 100%
rename from crates/zeta/src/license_detection/apache-2.0.txt
rename to crates/zeta/license_examples/apache-2.0-ex0.txt
diff --git a/crates/zeta/license_examples/apache-2.0-ex1.txt b/crates/zeta/license_examples/apache-2.0-ex1.txt
new file mode 100644
index 0000000000..2df8c87fda
--- /dev/null
+++ b/crates/zeta/license_examples/apache-2.0-ex1.txt
@@ -0,0 +1,55 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/crates/zeta/src/license_detection/apache-2.0.regex b/crates/zeta/license_examples/apache-2.0-ex2.txt
similarity index 59%
rename from crates/zeta/src/license_detection/apache-2.0.regex
rename to crates/zeta/license_examples/apache-2.0-ex2.txt
index dcf12fe289..016b1bc2e6 100644
--- a/crates/zeta/src/license_detection/apache-2.0.regex
+++ b/crates/zeta/license_examples/apache-2.0-ex2.txt
@@ -1,109 +1,110 @@
+
                                  Apache License
-                           Version 2\.0, January 2004
-                        http://www\.apache\.org/licenses/
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   1\. Definitions\.
+   1. Definitions.
 
       "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document\.
+      and distribution as defined by Sections 1 through 9 of this document.
 
       "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License\.
+      the copyright owner that is granting the License.
 
       "Legal Entity" shall mean the union of the acting entity and all
       other entities that control, are controlled by, or are under common
-      control with that entity\. For the purposes of this definition,
-      "control" means \(i\) the power, direct or indirect, to cause the
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
       direction or management of such entity, whether by contract or
-      otherwise, or \(ii\) ownership of fifty percent \(50%\) or more of the
-      outstanding shares, or \(iii\) beneficial ownership of such entity\.
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "You" \(or "Your"\) shall mean an individual or Legal Entity
-      exercising permissions granted by this License\.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
       "Source" form shall mean the preferred form for making modifications,
       including but not limited to software source code, documentation
-      source, and configuration files\.
+      source, and configuration files.
 
       "Object" form shall mean any form resulting from mechanical
       transformation or translation of a Source form, including but
       not limited to compiled object code, generated documentation,
-      and conversions to other media types\.
+      and conversions to other media types.
 
       "Work" shall mean the work of authorship, whether in Source or
       Object form, made available under the License, as indicated by a
       copyright notice that is included in or attached to the work
-      \(an example is provided in the Appendix below\)\.
+      (an example is provided in the Appendix below).
 
       "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on \(or derived from\) the Work and for which the
+      form, that is based on (or derived from) the Work and for which the
       editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship\. For the purposes
+      represent, as a whole, an original work of authorship. For the purposes
       of this License, Derivative Works shall not include works that remain
-      separable from, or merely link \(or bind by name\) to the interfaces of,
-      the Work and Derivative Works thereof\.
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
       "Contribution" shall mean any work of authorship, including
       the original version of the Work and any modifications or additions
       to that Work or Derivative Works thereof, that is intentionally
       submitted to Licensor for inclusion in the Work by the copyright owner
       or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner\. For the purposes of this definition, "submitted"
+      the copyright owner. For the purposes of this definition, "submitted"
       means any form of electronic, verbal, or written communication sent
       to the Licensor or its representatives, including but not limited to
       communication on electronic mailing lists, source code control systems,
       and issue tracking systems that are managed by, or on behalf of, the
       Licensor for the purpose of discussing and improving the Work, but
       excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution\."
+      designated in writing by the copyright owner as "Not a Contribution."
 
       "Contributor" shall mean Licensor and any individual or Legal Entity
       on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work\.
+      subsequently incorporated within the Work.
 
-   2\. Grant of Copyright License\. Subject to the terms and conditions of
+   2. Grant of Copyright License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non\-exclusive, no\-charge, royalty\-free, irrevocable
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
       copyright license to reproduce, prepare Derivative Works of,
       publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form\.
+      Work and such Derivative Works in Source or Object form.
 
-   3\. Grant of Patent License\. Subject to the terms and conditions of
+   3. Grant of Patent License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non\-exclusive, no\-charge, royalty\-free, irrevocable
-      \(except as stated in this section\) patent license to make, have made,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
       use, offer to sell, sell, import, and otherwise transfer the Work,
       where such license applies only to those patent claims licensable
       by such Contributor that are necessarily infringed by their
-      Contribution\(s\) alone or by combination of their Contribution\(s\)
-      with the Work to which such Contribution\(s\) was submitted\. If You
-      institute patent litigation against any entity \(including a
-      cross\-claim or counterclaim in a lawsuit\) alleging that the Work
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
       or a Contribution incorporated within the Work constitutes direct
       or contributory patent infringement, then any patent licenses
       granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed\.
+      as of the date such litigation is filed.
 
-   4\. Redistribution\. You may reproduce and distribute copies of the
+   4. Redistribution. You may reproduce and distribute copies of the
       Work or Derivative Works thereof in any medium, with or without
       modifications, and in Source or Object form, provided that You
       meet the following conditions:
 
-      \(a\) You must give any other recipients of the Work or
+      (a) You must give any other recipients of the Work or
           Derivative Works a copy of this License; and
 
-      \(b\) You must cause any modified files to carry prominent notices
+      (b) You must cause any modified files to carry prominent notices
           stating that You changed the files; and
 
-      \(c\) You must retain, in the Source form of any Derivative Works
+      (c) You must retain, in the Source form of any Derivative Works
           that You distribute, all copyright, patent, trademark, and
           attribution notices from the Source form of the Work,
           excluding those notices that do not pertain to any part of
           the Derivative Works; and
 
-      \(d\) If the Work includes a "NOTICE" text file as part of its
+      (d) If the Work includes a "NOTICE" text file as part of its
           distribution, then any Derivative Works that You distribute must
           include a readable copy of the attribution notices contained
           within such NOTICE file, excluding those notices that do not
@@ -112,90 +113,77 @@
           as part of the Derivative Works; within the Source form or
           documentation, if provided along with the Derivative Works; or,
           within a display generated by the Derivative Works, if and
-          wherever such third\-party notices normally appear\. The contents
+          wherever such third-party notices normally appear. The contents
           of the NOTICE file are for informational purposes only and
-          do not modify the License\. You may add Your own attribution
+          do not modify the License. You may add Your own attribution
           notices within Derivative Works that You distribute, alongside
           or as an addendum to the NOTICE text from the Work, provided
           that such additional attribution notices cannot be construed
-          as modifying the License\.
+          as modifying the License.
 
       You may add Your own copyright statement to Your modifications and
       may provide additional or different license terms and conditions
       for use, reproduction, or distribution of Your modifications, or
       for any such Derivative Works as a whole, provided Your use,
       reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License\.
+      the conditions stated in this License.
 
-   5\. Submission of Contributions\. Unless You explicitly state otherwise,
+   5. Submission of Contributions. Unless You explicitly state otherwise,
       any Contribution intentionally submitted for inclusion in the Work
       by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions\.
+      this License, without any additional terms or conditions.
       Notwithstanding the above, nothing herein shall supersede or modify
       the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions\.
+      with Licensor regarding such Contributions.
 
-   6\. Trademarks\. This License does not grant permission to use the trade
+   6. Trademarks. This License does not grant permission to use the trade
       names, trademarks, service marks, or product names of the Licensor,
       except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file\.
+      origin of the Work and reproducing the content of the NOTICE file.
 
-   7\. Disclaimer of Warranty\. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work \(and each
-      Contributor provides its Contributions\) on an "AS IS" BASIS,
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
       implied, including, without limitation, any warranties or conditions
-      of TITLE, NON\-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE\. You are solely responsible for determining the
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
       appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License\.
+      risks associated with Your exercise of permissions under this License.
 
-   8\. Limitation of Liability\. In no event and under no legal theory,
-      whether in tort \(including negligence\), contract, or otherwise,
-      unless required by applicable law \(such as deliberate and grossly
-      negligent acts\) or agreed to in writing, shall any Contributor be
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
       liable to You for damages, including any direct, indirect, special,
       incidental, or consequential damages of any character arising as a
       result of this License or out of the use or inability to use the
-      Work \(including but not limited to damages for loss of goodwill,
+      Work (including but not limited to damages for loss of goodwill,
       work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses\), even if such Contributor
-      has been advised of the possibility of such damages\.
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-   9\. Accepting Warranty or Additional Liability\. While redistributing
+   9. Accepting Warranty or Additional Liability. While redistributing
       the Work or Derivative Works thereof, You may choose to offer,
       and charge a fee for, acceptance of support, warranty, indemnity,
       or other liability obligations and/or rights consistent with this
-      License\. However, in accepting such obligations, You may act only
+      License. However, in accepting such obligations, You may act only
       on Your own behalf and on Your sole responsibility, not on behalf
       of any other Contributor, and only if You agree to indemnify,
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability\.(?:
+      of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS)?(?:
+   END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work\.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "\[\]"
-      replaced with your own identifying information\. \(Don't include
-      the brackets!\)  The text should be enclosed in the appropriate
-      comment syntax for the file format\. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third\-party archives\.)?(?:
-
-   Copyright .*)?(?:
-
-   Licensed under the Apache License, Version 2\.0 \(the "License"\);
-   you may not use this file except in compliance with the License\.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www\.apache\.org/licenses/LICENSE\-2\.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License\.)?
+   limitations under the License.
diff --git a/crates/zeta/license_examples/apache-2.0-ex3.txt b/crates/zeta/license_examples/apache-2.0-ex3.txt
new file mode 100644
index 0000000000..243448ceb5
--- /dev/null
+++ b/crates/zeta/license_examples/apache-2.0-ex3.txt
@@ -0,0 +1,13 @@
+Copyright 2011 Someone
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/crates/zeta/src/license_detection/bsd-1-clause.txt b/crates/zeta/license_examples/bsd-1-clause.txt
similarity index 100%
rename from crates/zeta/src/license_detection/bsd-1-clause.txt
rename to crates/zeta/license_examples/bsd-1-clause.txt
diff --git a/crates/zeta/src/license_detection/bsd-2-clause.txt b/crates/zeta/license_examples/bsd-2-clause-ex0.txt
similarity index 100%
rename from crates/zeta/src/license_detection/bsd-2-clause.txt
rename to crates/zeta/license_examples/bsd-2-clause-ex0.txt
diff --git a/crates/zeta/src/license_detection/bsd-3-clause.txt b/crates/zeta/license_examples/bsd-3-clause-ex0.txt
similarity index 100%
rename from crates/zeta/src/license_detection/bsd-3-clause.txt
rename to crates/zeta/license_examples/bsd-3-clause-ex0.txt
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex1.txt b/crates/zeta/license_examples/bsd-3-clause-ex1.txt
new file mode 100644
index 0000000000..d460f67375
--- /dev/null
+++ b/crates/zeta/license_examples/bsd-3-clause-ex1.txt
@@ -0,0 +1,27 @@
+// Copyright 2024 (this is copy modified from chromium)
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of da company nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex2.txt b/crates/zeta/license_examples/bsd-3-clause-ex2.txt
new file mode 100644
index 0000000000..99fa52679d
--- /dev/null
+++ b/crates/zeta/license_examples/bsd-3-clause-ex2.txt
@@ -0,0 +1,31 @@
+The Glasgow Haskell Compiler License
+
+Copyright 2002, The University Court of the University of Glasgow.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+- Neither name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex3.txt b/crates/zeta/license_examples/bsd-3-clause-ex3.txt
new file mode 100644
index 0000000000..68a181b5a7
--- /dev/null
+++ b/crates/zeta/license_examples/bsd-3-clause-ex3.txt
@@ -0,0 +1,30 @@
+Copyright (c) 2019 Someone
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Someone nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex4.txt b/crates/zeta/license_examples/bsd-3-clause-ex4.txt
new file mode 100644
index 0000000000..259c59ff90
--- /dev/null
+++ b/crates/zeta/license_examples/bsd-3-clause-ex4.txt
@@ -0,0 +1,27 @@
+Copyright (c) 2009-2011, Mozilla Foundation and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the names of the Mozilla Foundation nor the names of project
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/zeta/src/license_detection/isc.txt b/crates/zeta/license_examples/isc.txt
similarity index 100%
rename from crates/zeta/src/license_detection/isc.txt
rename to crates/zeta/license_examples/isc.txt
diff --git a/crates/zeta/src/license_detection/mit.txt b/crates/zeta/license_examples/mit-ex0.txt
similarity index 100%
rename from crates/zeta/src/license_detection/mit.txt
rename to crates/zeta/license_examples/mit-ex0.txt
diff --git a/crates/zeta/license_examples/mit-ex1.txt b/crates/zeta/license_examples/mit-ex1.txt
new file mode 100644
index 0000000000..d3642458dc
--- /dev/null
+++ b/crates/zeta/license_examples/mit-ex1.txt
@@ -0,0 +1,26 @@
+Copyright (c) 2006-2009 Someone
+Copyright (c) 2009-2013 Some organization
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/crates/zeta/license_examples/mit-ex2.txt b/crates/zeta/license_examples/mit-ex2.txt
new file mode 100644
index 0000000000..31ec7bf0e8
--- /dev/null
+++ b/crates/zeta/license_examples/mit-ex2.txt
@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) someone
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/crates/zeta/license_examples/mit-ex3.txt b/crates/zeta/license_examples/mit-ex3.txt
new file mode 100644
index 0000000000..ed5c991402
--- /dev/null
+++ b/crates/zeta/license_examples/mit-ex3.txt
@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Someone.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
diff --git a/crates/zeta/src/license_detection/upl-1.0.txt b/crates/zeta/license_examples/upl-1.0.txt
similarity index 100%
rename from crates/zeta/src/license_detection/upl-1.0.txt
rename to crates/zeta/license_examples/upl-1.0.txt
diff --git a/crates/zeta/license_examples/zlib-ex0.txt b/crates/zeta/license_examples/zlib-ex0.txt
new file mode 100644
index 0000000000..84a3048c69
--- /dev/null
+++ b/crates/zeta/license_examples/zlib-ex0.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2021 Someone
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim
+    that you wrote the original software. If you use this software in a product,
+    an acknowledgment in the product documentation would be appreciated but is
+    not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
diff --git a/crates/zeta/license_regexes/0bsd.regex b/crates/zeta/license_regexes/0bsd.regex
new file mode 100644
index 0000000000..15725f206a
--- /dev/null
+++ b/crates/zeta/license_regexes/0bsd.regex
@@ -0,0 +1,10 @@
+.{0,512}Permission to use copy modify andor distribute this software for any
+purpose with or without fee is hereby granted
+
+THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL DIRECT INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE DATA OR PROFITS WHETHER IN
+AN ACTION OF CONTRACT NEGLIGENCE OR OTHER TORTIOUS ACTION ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE
diff --git a/crates/zeta/license_regexes/apache-2.0.regex b/crates/zeta/license_regexes/apache-2.0.regex
new file mode 100644
index 0000000000..26cbecf2ee
--- /dev/null
+++ b/crates/zeta/license_regexes/apache-2.0.regex
@@ -0,0 +1,223 @@
+.{0,512}Licensed under the Apache License Version 20 the License
+you may not use this file except in compliance with the License
+You may obtain a copy of the License at
+
+   https?wwwapacheorglicensesLICENSE20
+
+Unless required by applicable law or agreed to in writing software
+distributed under the License is distributed on an AS IS BASIS
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied
+See the License for the specific language governing permissions and
+limitations under the License|.{0,512}(?:Licensed under the Apache License Version 20 the License
+you may not use this file except in compliance with the License
+You may obtain a copy of the License at
+
+   https?wwwapacheorglicensesLICENSE20
+
+Unless required by applicable law or agreed to in writing software
+distributed under the License is distributed on an AS IS BASIS
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied
+See the License for the specific language governing permissions and
+limitations under the License)?
+
+                              ?Apache License
+                           Version 20 January 2004
+                        https?wwwapacheorglicenses
+
+   TERMS AND CONDITIONS FOR USE REPRODUCTION AND DISTRIBUTION
+
+   1 Definitions
+
+      License shall mean the terms and conditions for use reproduction
+      and distribution as defined by Sections 1 through 9 of this document
+
+      Licensor shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License
+
+      Legal Entity shall mean the union of the acting entity and all
+      other entities that control are controlled by or are under common
+      control with that entity For the purposes of this definition
+      control means i the power direct or indirect to cause the
+      direction or management of such entity whether by contract or
+      otherwise or ii ownership of fifty percent 50 or more of the
+      outstanding shares or iii beneficial ownership of such entity
+
+      You or Your shall mean an individual or Legal Entity
+      exercising permissions granted by this License
+
+      Source form shall mean the preferred form for making modifications
+      including but not limited to software source code documentation
+      source and configuration files
+
+      Object form shall mean any form resulting from mechanical
+      transformation or translation of a Source form including but
+      not limited to compiled object code generated documentation
+      and conversions to other media types
+
+      Work shall mean the work of authorship whether in Source or
+      Object form made available under the License as indicated by a
+      copyright notice that is included in or attached to the work
+      an example is provided in the Appendix below
+
+      Derivative Works shall mean any work whether in Source or Object
+      form that is based on or derived from the Work and for which the
+      editorial revisions annotations elaborations or other modifications
+      represent as a whole an original work of authorship For the purposes
+      of this License Derivative Works shall not include works that remain
+      separable from or merely link or bind by name to the interfaces of
+      the Work and Derivative Works thereof
+
+      Contribution shall mean any work of authorship including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner For the purposes of this definition submitted
+      means any form of electronic verbal or written communication sent
+      to the Licensor or its representatives including but not limited to
+      communication on electronic mailing lists source code control systems
+      and issue tracking systems that are managed by or on behalf of the
+      Licensor for the purpose of discussing and improving the Work but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as Not a Contribution
+
+      Contributor shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work
+
+   2 Grant of Copyright License Subject to the terms and conditions of
+      this License each Contributor hereby grants to You a perpetual
+      worldwide nonexclusive nocharge royaltyfree irrevocable
+      copyright license to reproduce prepare Derivative Works of
+      publicly display publicly perform sublicense and distribute the
+      Work and such Derivative Works in Source or Object form
+
+   3 Grant of Patent License Subject to the terms and conditions of
+      this License each Contributor hereby grants to You a perpetual
+      worldwide nonexclusive nocharge royaltyfree irrevocable
+      except as stated in this section patent license to make have made
+      use offer to sell sell import and otherwise transfer the Work
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contributions alone or by combination of their Contributions
+      with the Work to which such Contributions was submitted If You
+      institute patent litigation against any entity including a
+      crossclaim or counterclaim in a lawsuit alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed
+
+   4 Redistribution You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium with or without
+      modifications and in Source or Object form provided that You
+      meet the following conditions
+
+      (?:a )?You must give any other recipients of the Work or
+          Derivative Works a copy of this License and
+
+      (?:b )?You must cause any modified files to carry prominent notices
+          stating that You changed the files and
+
+      (?:c )?You must retain in the Source form of any Derivative Works
+          that You distribute all copyright patent trademark and
+          attribution notices from the Source form of the Work
+          excluding those notices that do not pertain to any part of
+          the Derivative Works and
+
+      (?:d )?If the Work includes a NOTICE text file as part of its
+          distribution then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file excluding those notices that do not
+          pertain to any part of the Derivative Works in at least one
+          of the following places within a NOTICE text file distributed
+          as part of the Derivative Works within the Source form or
+          documentation if provided along with the Derivative Works or
+          within a display generated by the Derivative Works if and
+          wherever such thirdparty notices normally appear The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License You may add Your own attribution
+          notices within Derivative Works that You distribute alongside
+          or as an addendum to the NOTICE text from the Work provided
+          that such additional attribution notices cannot be construed
+          as modifying the License
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use reproduction or distribution of Your modifications or
+      for any such Derivative Works as a whole provided Your use
+      reproduction and distribution of the Work otherwise complies with
+      the conditions stated in this License
+
+   5 Submission of Contributions Unless You explicitly state otherwise
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License without any additional terms or conditions
+      Notwithstanding the above nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions
+
+   6 Trademarks This License does not grant permission to use the trade
+      names trademarks service marks or product names of the Licensor
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file
+
+   7 Disclaimer of Warranty Unless required by applicable law or
+      agreed to in writing Licensor provides the Work and each
+      Contributor provides its Contributions on an AS IS BASIS
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or
+      implied including without limitation any warranties or conditions
+      of TITLE NONINFRINGEMENT MERCHANTABILITY or FITNESS FOR A
+      PARTICULAR PURPOSE You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License
+
+   8 Limitation of Liability In no event and under no legal theory
+      whether in tort including negligence contract or otherwise
+      unless required by applicable law such as deliberate and grossly
+      negligent acts or agreed to in writing shall any Contributor be
+      liable to You for damages including any direct indirect special
+      incidental or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work including but not limited to damages for loss of goodwill
+      work stoppage computer failure or malfunction or any and all
+      other commercial damages or losses even if such Contributor
+      has been advised of the possibility of such damages
+
+   9 Accepting Warranty or Additional Liability While redistributing
+      the Work or Derivative Works thereof You may choose to offer
+      and charge a fee for acceptance of support warranty indemnity
+      or other liability obligations andor rights consistent with this
+      License However in accepting such obligations You may act only
+      on Your own behalf and on Your sole responsibility not on behalf
+      of any other Contributor and only if You agree to indemnify
+      defend and hold each Contributor harmless for any liability
+      incurred by or claims asserted against such Contributor by reason
+      of your accepting any such warranty or additional liability(?:
+
+   END OF TERMS AND CONDITIONS)?(?:
+
+   APPENDIX How to apply the Apache License to your work
+
+      To apply the Apache License to your work attach the following
+      boilerplate notice with the fields enclosed by brackets
+      replaced with your own identifying information Dont include
+      the brackets  The text should be enclosed in the appropriate
+      comment syntax for the file format We also recommend that a
+      file or class name and description of purpose be included on the
+      same printed page as the copyright notice for easier
+      identification within thirdparty archives)?(?:
+
+   Copyright.{0,512})?(?:
+
+   Licensed under the Apache License Version 20 the License
+   you may not use this file except in compliance with the License
+   You may obtain a copy of the License at
+
+       https?wwwapacheorglicensesLICENSE20
+
+   Unless required by applicable law or agreed to in writing software
+   distributed under the License is distributed on an AS IS BASIS
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied
+   See the License for the specific language governing permissions and
+   limitations under the License)?
diff --git a/crates/zeta/license_regexes/bsd.regex b/crates/zeta/license_regexes/bsd.regex
new file mode 100644
index 0000000000..655e38fa43
--- /dev/null
+++ b/crates/zeta/license_regexes/bsd.regex
@@ -0,0 +1,23 @@
+.{0,512}Redistribution and use in source and binary forms with or without
+modification are permitted provided that the following conditions are met
+
+(?:1 )?Redistributions of source code must retain the above copyright
+notice this list of conditions and the following disclaimer(?:
+
+(?:2 )?Redistributions in binary form must reproduce the above copyright
+notice this list of conditions and the following disclaimer in the
+documentation andor other materials provided with the distribution(?:
+
+(?:3 )?.{0,128} may be used to endorse or
+promote products derived from this software without specific prior written
+permission)?)?
+
+THIS SOFTWARE IS PROVIDED BY .{0,128}AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES
+INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED IN NO EVENT SHALL .{0,128}BE LIABLE
+FOR ANY DIRECT INDIRECT INCIDENTAL SPECIAL EXEMPLARY OR CONSEQUENTIAL
+DAMAGES INCLUDING BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES LOSS OF USE DATA OR PROFITS OR BUSINESS INTERRUPTION HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY WHETHER IN CONTRACT STRICT LIABILITY OR
+TORT INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
diff --git a/crates/zeta/license_regexes/isc.regex b/crates/zeta/license_regexes/isc.regex
new file mode 100644
index 0000000000..ba3e3c9cbf
--- /dev/null
+++ b/crates/zeta/license_regexes/isc.regex
@@ -0,0 +1,12 @@
+.{0,512}Permission to use copy modify andor distribute
+this software for any purpose with or without fee is hereby granted provided
+that the above copyright notice and this permission notice appear in all
+copies
+
+THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL DIRECT INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE DATA OR PROFITS WHETHER IN AN
+ACTION OF CONTRACT NEGLIGENCE OR OTHER TORTIOUS ACTION ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE
diff --git a/crates/zeta/license_regexes/mit.regex b/crates/zeta/license_regexes/mit.regex
new file mode 100644
index 0000000000..a8fa7b3ee7
--- /dev/null
+++ b/crates/zeta/license_regexes/mit.regex
@@ -0,0 +1,17 @@
+.{0,512}Permission is hereby granted free of charge to any
+person obtaining a copy of this software and associated documentation files
+the Software to deal in the Software without restriction including
+without limitation the rights to use copy modify merge publish distribute
+sublicense andor sell copies of the Software and to permit persons to whom
+the Software is furnished to do so subject to the following conditions
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software
+
+THE SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND EXPRESS OR
+IMPLIED INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM DAMAGES OR OTHER
+LIABILITY WHETHER IN AN ACTION OF CONTRACT TORT OR OTHERWISE ARISING FROM
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE
diff --git a/crates/zeta/license_regexes/upl-1.0.regex b/crates/zeta/license_regexes/upl-1.0.regex
new file mode 100644
index 0000000000..f86f5fa3ab
--- /dev/null
+++ b/crates/zeta/license_regexes/upl-1.0.regex
@@ -0,0 +1,32 @@
+.{0,512}Subject to the condition set forth below permission is hereby granted to any
+person obtaining a copy of this software associated documentation andor data
+collectively the Software free of charge and under any and all copyright
+rights in the Software and any and all patent rights owned or freely licensable
+by each licensor hereunder covering either i the unmodified Software as
+contributed to or provided by such licensor or ii the Larger Works as
+defined below to deal in both
+
+a the Software and
+
+b any piece of software andor hardware listed in the lrgrwrkstxt file if one is
+    included with the Software each a Larger Work to which the Software is
+    contributed by such licensors
+
+without restriction including without limitation the rights to copy create
+derivative works of display perform and distribute the Software and make use
+sell offer for sale import export have made and have sold the Software and the
+Larger Works and to sublicense the foregoing rights on either these or other
+terms
+
+This license is subject to the following condition
+
+The above copyright notice and either this complete permission notice or at a minimum
+a reference to the UPL must be included in all copies or substantial portions of the
+Software
+
+THE SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND EXPRESS OR IMPLIED
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM DAMAGES OR OTHER LIABILITY WHETHER IN AN ACTION OF
+CONTRACT TORT OR OTHERWISE ARISING FROM OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
diff --git a/crates/zeta/license_regexes/zlib.regex b/crates/zeta/license_regexes/zlib.regex
new file mode 100644
index 0000000000..63a688d08c
--- /dev/null
+++ b/crates/zeta/license_regexes/zlib.regex
@@ -0,0 +1,18 @@
+.{0,512}This software is provided asis without any express or implied
+warranty In no event will the authors be held liable for any damages
+arising from the use of this software
+
+Permission is granted to anyone to use this software for any purpose
+including commercial applications and to alter it and redistribute it
+freely subject to the following restrictions
+
+1? The origin of this software must not be misrepresented you must not
+claim that you wrote the original software If you use this software
+in a product an acknowledgment in the product documentation would be
+appreciated but is not required
+
+2? Altered source versions must be plainly marked as such and must not be
+misrepresented as being the original software
+
+3? This notice may not be removed or altered from any source
+distribution
diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index d6b8ef10a3..81314477e5 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -8,6 +8,7 @@ use std::{
 use fs::Fs;
 use futures::StreamExt as _;
 use gpui::{App, AppContext as _, Entity, Subscription, Task};
+use itertools::Itertools;
 use postage::watch;
 use project::Worktree;
 use regex::Regex;
@@ -25,7 +26,8 @@ static LICENSE_FILE_NAME_REGEX: LazyLock<regex::bytes::Regex> = LazyLock::new(||
                 0? bsd (?: [\\-._] [0123])? (?: [\\-._] clause)? | \
                 isc | \
                 mit | \
-                upl))? \
+                upl | \
+                zlib))? \
         (?: [\\-._]? (?: license | licence))? \
         (?: \\.txt | \\.md)? \
         $",
@@ -36,16 +38,15 @@ static LICENSE_FILE_NAME_REGEX: LazyLock<regex::bytes::Regex> = LazyLock::new(||
     .unwrap()
 });
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq, VariantArray)]
+#[derive(Debug, Clone, Copy, Eq, Ord, PartialOrd, PartialEq, VariantArray)]
 pub enum OpenSourceLicense {
     Apache2_0,
-    BSD0Clause,
-    BSD1Clause,
-    BSD2Clause,
-    BSD3Clause,
+    BSDZero,
+    BSD,
     ISC,
     MIT,
     UPL1_0,
+    Zlib,
 }
 
 impl Display for OpenSourceLicense {
@@ -55,29 +56,31 @@ impl Display for OpenSourceLicense {
 }
 
 impl OpenSourceLicense {
+    /// These are SPDX identifiers for the licenses, except for BSD, where the variants are not
+    /// distinguished.
     pub fn spdx_identifier(&self) -> &'static str {
         match self {
             OpenSourceLicense::Apache2_0 => "apache-2.0",
-            OpenSourceLicense::BSD0Clause => "0bsd",
-            OpenSourceLicense::BSD1Clause => "bsd-1-clause",
-            OpenSourceLicense::BSD2Clause => "bsd-2-clause",
-            OpenSourceLicense::BSD3Clause => "bsd-3-clause",
+            OpenSourceLicense::BSDZero => "0bsd",
+            OpenSourceLicense::BSD => "bsd",
             OpenSourceLicense::ISC => "isc",
             OpenSourceLicense::MIT => "mit",
             OpenSourceLicense::UPL1_0 => "upl-1.0",
+            OpenSourceLicense::Zlib => "zlib",
         }
     }
 
+    /// Regexes to match the license text. These regexes are expected to match the entire file. Also
+    /// note that `canonicalize_license_text` removes everything but alphanumeric ascii characters.
     pub fn regex(&self) -> &'static str {
         match self {
-            OpenSourceLicense::Apache2_0 => include_str!("license_detection/apache-2.0.regex"),
-            OpenSourceLicense::BSD0Clause => include_str!("license_detection/0bsd.regex"),
-            OpenSourceLicense::BSD1Clause => include_str!("license_detection/bsd-1-clause.regex"),
-            OpenSourceLicense::BSD2Clause => include_str!("license_detection/bsd-2-clause.regex"),
-            OpenSourceLicense::BSD3Clause => include_str!("license_detection/bsd-3-clause.regex"),
-            OpenSourceLicense::ISC => include_str!("license_detection/isc.regex"),
-            OpenSourceLicense::MIT => include_str!("license_detection/mit.regex"),
-            OpenSourceLicense::UPL1_0 => include_str!("license_detection/upl-1.0.regex"),
+            OpenSourceLicense::Apache2_0 => include_str!("../license_regexes/apache-2.0.regex"),
+            OpenSourceLicense::BSDZero => include_str!("../license_regexes/0bsd.regex"),
+            OpenSourceLicense::BSD => include_str!("../license_regexes/bsd.regex"),
+            OpenSourceLicense::ISC => include_str!("../license_regexes/isc.regex"),
+            OpenSourceLicense::MIT => include_str!("../license_regexes/mit.regex"),
+            OpenSourceLicense::UPL1_0 => include_str!("../license_regexes/upl-1.0.regex"),
+            OpenSourceLicense::Zlib => include_str!("../license_regexes/zlib.regex"),
         }
     }
 }
@@ -93,7 +96,7 @@ fn detect_license(license: &str) -> Option<OpenSourceLicense> {
             } else {
                 regex_string.push_str(")|(");
             }
-            regex_string.push_str(&canonicalize_license_text(license.regex()));
+            regex_string.push_str(&canonicalize_license_regex(license.regex()));
         }
         regex_string.push_str("))$");
         let regex = Regex::new(&regex_string).unwrap();
@@ -116,15 +119,25 @@ fn detect_license(license: &str) -> Option<OpenSourceLicense> {
         })
 }
 
-/// Canonicalizes the whitespace of license text and license regexes.
-fn canonicalize_license_text(license: &str) -> String {
+/// Canonicalizes the whitespace of license text.
+fn canonicalize_license_regex(license: &str) -> String {
     license
         .split_ascii_whitespace()
-        .collect::<Vec<_>>()
         .join(" ")
         .to_ascii_lowercase()
 }
 
+/// Canonicalizes the whitespace of license text.
+fn canonicalize_license_text(license: &str) -> String {
+    license
+        .chars()
+        .filter(|c| c.is_ascii_alphanumeric() || c.is_ascii_whitespace())
+        .map(|c| c.to_ascii_lowercase())
+        .collect::<String>()
+        .split_ascii_whitespace()
+        .join(" ")
+}
+
 pub enum LicenseDetectionWatcher {
     Local {
         is_open_source_rx: watch::Receiver<bool>,
@@ -254,26 +267,96 @@ mod tests {
 
     use super::*;
 
-    const APACHE_2_0_TXT: &str = include_str!("license_detection/apache-2.0.txt");
-    const ISC_TXT: &str = include_str!("license_detection/isc.txt");
-    const MIT_TXT: &str = include_str!("license_detection/mit.txt");
-    const UPL_1_0_TXT: &str = include_str!("license_detection/upl-1.0.txt");
-    const BSD_0_CLAUSE_TXT: &str = include_str!("license_detection/0bsd.txt");
-    const BSD_1_CLAUSE_TXT: &str = include_str!("license_detection/bsd-1-clause.txt");
-    const BSD_2_CLAUSE_TXT: &str = include_str!("license_detection/bsd-2-clause.txt");
-    const BSD_3_CLAUSE_TXT: &str = include_str!("license_detection/bsd-3-clause.txt");
+    const APACHE_2_0_TXT: &str = include_str!("../license_examples/apache-2.0-ex0.txt");
+    const ISC_TXT: &str = include_str!("../license_examples/isc.txt");
+    const MIT_TXT: &str = include_str!("../license_examples/mit-ex0.txt");
+    const UPL_1_0_TXT: &str = include_str!("../license_examples/upl-1.0.txt");
+    const BSD_0_TXT: &str = include_str!("../license_examples/0bsd.txt");
 
     #[track_caller]
     fn assert_matches_license(text: &str, license: OpenSourceLicense) {
-        let license_regex =
-            Regex::new(&format!("^{}$", canonicalize_license_text(license.regex()))).unwrap();
-        assert!(license_regex.is_match(&canonicalize_license_text(text)));
-        assert_eq!(detect_license(text), Some(license));
+        if detect_license(text) != Some(license) {
+            let license_regex_text = canonicalize_license_regex(license.regex());
+            let license_regex = Regex::new(&format!("^{}$", license_regex_text)).unwrap();
+            let text = canonicalize_license_text(text);
+            let matched_regex = license_regex.is_match(&text);
+            if matched_regex {
+                panic!(
+                    "The following text matches the individual regex for {}, \
+                    but not the combined one:\n```license-text\n{}\n```\n",
+                    license, text
+                );
+            } else {
+                panic!(
+                    "The following text doesn't match the regex for {}:\n\
+                    ```license-text\n{}\n```\n\n```regex\n{}\n```\n",
+                    license, text, license_regex_text
+                );
+            }
+        }
     }
 
+    /*
+    // Uncomment this and run with `cargo test -p zeta -- --no-capture &> licenses-output` to
+    // traverse your entire home directory and run license detection on every file that has a
+    // license-like name.
     #[test]
-    fn test_0bsd_positive_detection() {
-        assert_matches_license(BSD_0_CLAUSE_TXT, OpenSourceLicense::BSD0Clause);
+    fn test_check_all_licenses_in_home_dir() {
+        let mut detected = Vec::new();
+        let mut unrecognized = Vec::new();
+        let mut walked_entries = 0;
+        let homedir = std::env::home_dir().unwrap();
+        for entry in walkdir::WalkDir::new(&homedir) {
+            walked_entries += 1;
+            if walked_entries % 10000 == 0 {
+                println!(
+                    "So far visited {} files in {}",
+                    walked_entries,
+                    homedir.display()
+                );
+            }
+            let Ok(entry) = entry else {
+                continue;
+            };
+            if !LICENSE_FILE_NAME_REGEX.is_match(entry.file_name().as_encoded_bytes()) {
+                continue;
+            }
+            let Ok(contents) = std::fs::read_to_string(entry.path()) else {
+                continue;
+            };
+            let path_string = entry.path().to_string_lossy().to_string();
+            match detect_license(&contents) {
+                Some(license) => detected.push((license, path_string)),
+                None => unrecognized.push(path_string),
+            }
+        }
+        println!("\nDetected licenses:\n");
+        detected.sort();
+        for (license, path) in &detected {
+            println!("{}: {}", license.spdx_identifier(), path);
+        }
+        println!("\nUnrecognized licenses:\n");
+        for path in &unrecognized {
+            println!("{}", path);
+        }
+        panic!(
+            "{} licenses detected, {} unrecognized",
+            detected.len(),
+            unrecognized.len()
+        );
+        println!("This line has a warning to make sure this test is always commented out");
+    }
+    */
+
+    #[test]
+    fn test_no_unicode_in_regexes() {
+        for license in OpenSourceLicense::VARIANTS {
+            assert!(
+                !license.regex().contains(|c: char| !c.is_ascii()),
+                "{}.regex contains unicode",
+                license.spdx_identifier()
+            );
+        }
     }
 
     #[test]
@@ -319,6 +402,24 @@ mod tests {
         );
         assert!(license_with_copyright != license_with_appendix);
         assert_matches_license(&license_with_copyright, OpenSourceLicense::Apache2_0);
+
+        assert_matches_license(
+            include_str!("../../../LICENSE-APACHE"),
+            OpenSourceLicense::Apache2_0,
+        );
+
+        assert_matches_license(
+            include_str!("../license_examples/apache-2.0-ex1.txt"),
+            OpenSourceLicense::Apache2_0,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/apache-2.0-ex2.txt"),
+            OpenSourceLicense::Apache2_0,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/apache-2.0-ex3.txt"),
+            OpenSourceLicense::Apache2_0,
+        );
     }
 
     #[test]
@@ -333,17 +434,47 @@ mod tests {
 
     #[test]
     fn test_bsd_1_clause_positive_detection() {
-        assert_matches_license(BSD_1_CLAUSE_TXT, OpenSourceLicense::BSD1Clause);
+        assert_matches_license(
+            include_str!("../license_examples/bsd-1-clause.txt"),
+            OpenSourceLicense::BSD,
+        );
     }
 
     #[test]
     fn test_bsd_2_clause_positive_detection() {
-        assert_matches_license(BSD_2_CLAUSE_TXT, OpenSourceLicense::BSD2Clause);
+        assert_matches_license(
+            include_str!("../license_examples/bsd-2-clause-ex0.txt"),
+            OpenSourceLicense::BSD,
+        );
     }
 
     #[test]
     fn test_bsd_3_clause_positive_detection() {
-        assert_matches_license(BSD_3_CLAUSE_TXT, OpenSourceLicense::BSD3Clause);
+        assert_matches_license(
+            include_str!("../license_examples/bsd-3-clause-ex0.txt"),
+            OpenSourceLicense::BSD,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/bsd-3-clause-ex1.txt"),
+            OpenSourceLicense::BSD,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/bsd-3-clause-ex2.txt"),
+            OpenSourceLicense::BSD,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/bsd-3-clause-ex3.txt"),
+            OpenSourceLicense::BSD,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/bsd-3-clause-ex4.txt"),
+            OpenSourceLicense::BSD,
+        );
+    }
+
+    #[test]
+    fn test_bsd_0_positive_detection() {
+        assert_matches_license(BSD_0_TXT, OpenSourceLicense::BSDZero);
     }
 
     #[test]
@@ -365,6 +496,18 @@ mod tests {
     #[test]
     fn test_mit_positive_detection() {
         assert_matches_license(MIT_TXT, OpenSourceLicense::MIT);
+        assert_matches_license(
+            include_str!("../license_examples/mit-ex1.txt"),
+            OpenSourceLicense::MIT,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/mit-ex2.txt"),
+            OpenSourceLicense::MIT,
+        );
+        assert_matches_license(
+            include_str!("../license_examples/mit-ex3.txt"),
+            OpenSourceLicense::MIT,
+        );
     }
 
     #[test]
@@ -393,6 +536,14 @@ mod tests {
         assert!(detect_license(&license_text).is_none());
     }
 
+    #[test]
+    fn test_zlib_positive_detection() {
+        assert_matches_license(
+            include_str!("../license_examples/zlib-ex0.txt"),
+            OpenSourceLicense::Zlib,
+        );
+    }
+
     #[test]
     fn test_license_file_name_regex() {
         // Test basic license file names
diff --git a/crates/zeta/src/license_detection/0bsd.regex b/crates/zeta/src/license_detection/0bsd.regex
deleted file mode 100644
index 7928a8d181..0000000000
--- a/crates/zeta/src/license_detection/0bsd.regex
+++ /dev/null
@@ -1,12 +0,0 @@
-.*
-
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted\.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS\. IN NO EVENT SHALL THE AUTHOR BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/bsd-1-clause.regex b/crates/zeta/src/license_detection/bsd-1-clause.regex
deleted file mode 100644
index 5e73e5c6d0..0000000000
--- a/crates/zeta/src/license_detection/bsd-1-clause.regex
+++ /dev/null
@@ -1,17 +0,0 @@
-.*Copyright.*
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-(?:1\.|\*)? Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer\.
-
-THIS SOFTWARE IS PROVIDED BY .* “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL .* BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
diff --git a/crates/zeta/src/license_detection/bsd-2-clause.regex b/crates/zeta/src/license_detection/bsd-2-clause.regex
deleted file mode 100644
index 93d22652fb..0000000000
--- a/crates/zeta/src/license_detection/bsd-2-clause.regex
+++ /dev/null
@@ -1,22 +0,0 @@
-.*Copyright.*
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-(?:1\.|\*)? Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer\.
-
-(?:2\.|\*)? Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution\.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
diff --git a/crates/zeta/src/license_detection/bsd-3-clause.regex b/crates/zeta/src/license_detection/bsd-3-clause.regex
deleted file mode 100644
index b31443de64..0000000000
--- a/crates/zeta/src/license_detection/bsd-3-clause.regex
+++ /dev/null
@@ -1,26 +0,0 @@
-.*Copyright.*
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-(?:1\.|\*)? Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer\.
-
-(?:2\.|\*)? Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution\.
-
-(?:3\.|\*)? Neither the name of the copyright holder nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission\.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED\. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
diff --git a/crates/zeta/src/license_detection/isc.regex b/crates/zeta/src/license_detection/isc.regex
deleted file mode 100644
index ddaece5375..0000000000
--- a/crates/zeta/src/license_detection/isc.regex
+++ /dev/null
@@ -1,15 +0,0 @@
-.*ISC License.*
-
-Copyright.*
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies\.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS\. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/mit.regex b/crates/zeta/src/license_detection/mit.regex
deleted file mode 100644
index 43130424c5..0000000000
--- a/crates/zeta/src/license_detection/mit.regex
+++ /dev/null
@@ -1,21 +0,0 @@
-.*MIT License.*
-
-Copyright.*
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files \(the "Software"\), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software\.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE\.
diff --git a/crates/zeta/src/license_detection/upl-1.0.regex b/crates/zeta/src/license_detection/upl-1.0.regex
deleted file mode 100644
index 0959f72971..0000000000
--- a/crates/zeta/src/license_detection/upl-1.0.regex
+++ /dev/null
@@ -1,35 +0,0 @@
-Copyright.*
-
-The Universal Permissive License.*
-
-Subject to the condition set forth below, permission is hereby granted to any person
-obtaining a copy of this software, associated documentation and/or data \(collectively
-the "Software"\), free of charge and under any and all copyright rights in the
-Software, and any and all patent rights owned or freely licensable by each licensor
-hereunder covering either \(i\) the unmodified Software as contributed to or provided
-by such licensor, or \(ii\) the Larger Works \(as defined below\), to deal in both
-
-\(a\) the Software, and
-
-\(b\) any piece of software and/or hardware listed in the lrgrwrks\.txt file if one is
-    included with the Software \(each a "Larger Work" to which the Software is
-    contributed by such licensors\),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make, use,
-sell, offer for sale, import, export, have made, and have sold the Software and the
-Larger Work\(s\), and to sublicense the foregoing rights on either these or other
-terms\.
-
-This license is subject to the following condition:
-
-The above copyright notice and either this complete permission notice or at a minimum
-a reference to the UPL must be included in all copies or substantial portions of the
-Software\.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\.

From 253765aaa1f15d45e2effe098222d07550fdf0e9 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Sun, 31 Aug 2025 01:23:21 -0600
Subject: [PATCH 483/823] zeta: Improve efficiency and clarity of license
 detection patterns (#37242)

See discussion on #36564

Adds a simple ad-hoc substring matching pattern language which allows
skipping a bounded number of chars between matched substrings. Before
this change compiling the regex was taking ~120ms on a fast machine and
~8mb of memory. This new version is way faster and uses minimal memory.

Checked the behavior of this vs by running it against 10k licenses that
happened to be in my home dir. There were only 4 differences of behavior
with the regex implementation, and these were false negatives for the
regex implementation that are true positives with the new one.

Of the ~10k licenses in my home dir, ~1k do not match one of these
licenses, usually because it's GPL/MPL/etc.

Release Notes:

- N/A
---
 Cargo.lock                                    |   1 -
 crates/zeta/Cargo.toml                        |   1 -
 .../zeta/license_examples/apache-2.0-ex4.txt  | 187 ++++++++++
 crates/zeta/license_patterns/0bsd-pattern     |  11 +
 .../zeta/license_patterns/apache-2.0-pattern  | 109 ++++++
 .../apache-2.0-reference-pattern              |  14 +
 crates/zeta/license_patterns/bsd-pattern      |  32 ++
 crates/zeta/license_patterns/isc-pattern      |  12 +
 crates/zeta/license_patterns/mit-pattern      |  18 +
 crates/zeta/license_patterns/upl-1.0-pattern  |  32 ++
 crates/zeta/license_patterns/zlib-pattern     |  21 ++
 crates/zeta/license_regexes/0bsd.regex        |  10 -
 crates/zeta/license_regexes/apache-2.0.regex  | 223 -----------
 crates/zeta/license_regexes/bsd.regex         |  23 --
 crates/zeta/license_regexes/isc.regex         |  12 -
 crates/zeta/license_regexes/mit.regex         |  17 -
 crates/zeta/license_regexes/upl-1.0.regex     |  32 --
 crates/zeta/license_regexes/zlib.regex        |  18 -
 crates/zeta/src/license_detection.rs          | 352 +++++++++---------
 19 files changed, 614 insertions(+), 511 deletions(-)
 create mode 100644 crates/zeta/license_examples/apache-2.0-ex4.txt
 create mode 100644 crates/zeta/license_patterns/0bsd-pattern
 create mode 100644 crates/zeta/license_patterns/apache-2.0-pattern
 create mode 100644 crates/zeta/license_patterns/apache-2.0-reference-pattern
 create mode 100644 crates/zeta/license_patterns/bsd-pattern
 create mode 100644 crates/zeta/license_patterns/isc-pattern
 create mode 100644 crates/zeta/license_patterns/mit-pattern
 create mode 100644 crates/zeta/license_patterns/upl-1.0-pattern
 create mode 100644 crates/zeta/license_patterns/zlib-pattern
 delete mode 100644 crates/zeta/license_regexes/0bsd.regex
 delete mode 100644 crates/zeta/license_regexes/apache-2.0.regex
 delete mode 100644 crates/zeta/license_regexes/bsd.regex
 delete mode 100644 crates/zeta/license_regexes/isc.regex
 delete mode 100644 crates/zeta/license_regexes/mit.regex
 delete mode 100644 crates/zeta/license_regexes/upl-1.0.regex
 delete mode 100644 crates/zeta/license_regexes/zlib.regex

diff --git a/Cargo.lock b/Cargo.lock
index 4ca45445e2..ab3b713a11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20840,7 +20840,6 @@ dependencies = [
  "tree-sitter-go",
  "tree-sitter-rust",
  "ui",
- "unindent",
  "util",
  "uuid",
  "workspace",
diff --git a/crates/zeta/Cargo.toml b/crates/zeta/Cargo.toml
index a57781ee8e..a9c2a7619f 100644
--- a/crates/zeta/Cargo.toml
+++ b/crates/zeta/Cargo.toml
@@ -78,7 +78,6 @@ settings = { workspace = true, features = ["test-support"] }
 theme = { workspace = true, features = ["test-support"] }
 tree-sitter-go.workspace = true
 tree-sitter-rust.workspace = true
-unindent.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 worktree = { workspace = true, features = ["test-support"] }
 zlog.workspace = true
diff --git a/crates/zeta/license_examples/apache-2.0-ex4.txt b/crates/zeta/license_examples/apache-2.0-ex4.txt
new file mode 100644
index 0000000000..8c004949ee
--- /dev/null
+++ b/crates/zeta/license_examples/apache-2.0-ex4.txt
@@ -0,0 +1,187 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright (c) 2017, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/crates/zeta/license_patterns/0bsd-pattern b/crates/zeta/license_patterns/0bsd-pattern
new file mode 100644
index 0000000000..8b7f610042
--- /dev/null
+++ b/crates/zeta/license_patterns/0bsd-pattern
@@ -0,0 +1,11 @@
+-- 0..512
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/zeta/license_patterns/apache-2.0-pattern b/crates/zeta/license_patterns/apache-2.0-pattern
new file mode 100644
index 0000000000..39e2d10c25
--- /dev/null
+++ b/crates/zeta/license_patterns/apache-2.0-pattern
@@ -0,0 +1,109 @@
+-- 0..512
+-- 0..0 optional:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http
+-- 0..1 optional:
+://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-- 0..5
+Apache License
+
+Version 2.0, January 2004
+
+http
+-- 0..1
+://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+-- 1..5
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+-- 1..5
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+-- 1..5
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+-- 1..5
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+-- 1..1 optional:
+END OF TERMS AND CONDITIONS
+
+-- 1..1 optional:
+APPENDIX How to apply the Apache License to your work
+
+To apply the Apache License to your work attach the following
+boilerplate notice with the fields enclosed by brackets
+replaced with your own identifying information Dont include
+the brackets  The text should be enclosed in the appropriate
+comment syntax for the file format We also recommend that a
+file or class name and description of purpose be included on the
+same printed page as the copyright notice for easier
+identification within thirdparty archives
+
+-- 1..512 optional:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+
+-- 1..5 optional:
+You may obtain a copy of the License at
+
+http
+-- 0..1 optional:
+://www.apache.org/licenses/LICENSE-2.0
+
+-- 1..5 optional:
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/crates/zeta/license_patterns/apache-2.0-reference-pattern b/crates/zeta/license_patterns/apache-2.0-reference-pattern
new file mode 100644
index 0000000000..192148fc7a
--- /dev/null
+++ b/crates/zeta/license_patterns/apache-2.0-reference-pattern
@@ -0,0 +1,14 @@
+-- 0..512
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http
+-- 0..1
+://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/crates/zeta/license_patterns/bsd-pattern b/crates/zeta/license_patterns/bsd-pattern
new file mode 100644
index 0000000000..917b7e3c44
--- /dev/null
+++ b/crates/zeta/license_patterns/bsd-pattern
@@ -0,0 +1,32 @@
+-- 0..512
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+-- 1..5
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+-- 1..5 optional:
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+-- 1..128 optional:
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+-- 1..5
+THIS SOFTWARE IS PROVIDED
+-- 1..128
+“AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL
+-- 1..128
+BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/zeta/license_patterns/isc-pattern b/crates/zeta/license_patterns/isc-pattern
new file mode 100644
index 0000000000..8a47a1339f
--- /dev/null
+++ b/crates/zeta/license_patterns/isc-pattern
@@ -0,0 +1,12 @@
+-- 0..512
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/zeta/license_patterns/mit-pattern b/crates/zeta/license_patterns/mit-pattern
new file mode 100644
index 0000000000..6e21baa00c
--- /dev/null
+++ b/crates/zeta/license_patterns/mit-pattern
@@ -0,0 +1,18 @@
+-- 0..512
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/crates/zeta/license_patterns/upl-1.0-pattern b/crates/zeta/license_patterns/upl-1.0-pattern
new file mode 100644
index 0000000000..da9d26ca3f
--- /dev/null
+++ b/crates/zeta/license_patterns/upl-1.0-pattern
@@ -0,0 +1,32 @@
+-- 0..512
+Subject to the condition set forth below, permission is hereby granted to any person
+obtaining a copy of this software, associated documentation and/or data (collectively
+the "Software"), free of charge and under any and all copyright rights in the
+Software, and any and all patent rights owned or freely licensable by each licensor
+hereunder covering either (i) the unmodified Software as contributed to or provided
+by such licensor, or (ii) the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is
+    included with the Software (each a "Larger Work" to which the Software is
+    contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make, use,
+sell, offer for sale, import, export, have made, and have sold the Software and the
+Larger Work(s), and to sublicense the foregoing rights on either these or other
+terms.
+
+This license is subject to the following condition:
+
+The above copyright notice and either this complete permission notice or at a minimum
+a reference to the UPL must be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/crates/zeta/license_patterns/zlib-pattern b/crates/zeta/license_patterns/zlib-pattern
new file mode 100644
index 0000000000..121b5409cc
--- /dev/null
+++ b/crates/zeta/license_patterns/zlib-pattern
@@ -0,0 +1,21 @@
+-- 0..512
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+-- 1..5
+The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product,
+an acknowledgment in the product documentation would be appreciated but is
+not required.
+
+-- 1..5
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+
+-- 1..5
+This notice may not be removed or altered from any source distribution.
diff --git a/crates/zeta/license_regexes/0bsd.regex b/crates/zeta/license_regexes/0bsd.regex
deleted file mode 100644
index 15725f206a..0000000000
--- a/crates/zeta/license_regexes/0bsd.regex
+++ /dev/null
@@ -1,10 +0,0 @@
-.{0,512}Permission to use copy modify andor distribute this software for any
-purpose with or without fee is hereby granted
-
-THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS IN NO EVENT SHALL THE AUTHOR BE LIABLE
-FOR ANY SPECIAL DIRECT INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE DATA OR PROFITS WHETHER IN
-AN ACTION OF CONTRACT NEGLIGENCE OR OTHER TORTIOUS ACTION ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE
diff --git a/crates/zeta/license_regexes/apache-2.0.regex b/crates/zeta/license_regexes/apache-2.0.regex
deleted file mode 100644
index 26cbecf2ee..0000000000
--- a/crates/zeta/license_regexes/apache-2.0.regex
+++ /dev/null
@@ -1,223 +0,0 @@
-.{0,512}Licensed under the Apache License Version 20 the License
-you may not use this file except in compliance with the License
-You may obtain a copy of the License at
-
-   https?wwwapacheorglicensesLICENSE20
-
-Unless required by applicable law or agreed to in writing software
-distributed under the License is distributed on an AS IS BASIS
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied
-See the License for the specific language governing permissions and
-limitations under the License|.{0,512}(?:Licensed under the Apache License Version 20 the License
-you may not use this file except in compliance with the License
-You may obtain a copy of the License at
-
-   https?wwwapacheorglicensesLICENSE20
-
-Unless required by applicable law or agreed to in writing software
-distributed under the License is distributed on an AS IS BASIS
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied
-See the License for the specific language governing permissions and
-limitations under the License)?
-
-                              ?Apache License
-                           Version 20 January 2004
-                        https?wwwapacheorglicenses
-
-   TERMS AND CONDITIONS FOR USE REPRODUCTION AND DISTRIBUTION
-
-   1 Definitions
-
-      License shall mean the terms and conditions for use reproduction
-      and distribution as defined by Sections 1 through 9 of this document
-
-      Licensor shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License
-
-      Legal Entity shall mean the union of the acting entity and all
-      other entities that control are controlled by or are under common
-      control with that entity For the purposes of this definition
-      control means i the power direct or indirect to cause the
-      direction or management of such entity whether by contract or
-      otherwise or ii ownership of fifty percent 50 or more of the
-      outstanding shares or iii beneficial ownership of such entity
-
-      You or Your shall mean an individual or Legal Entity
-      exercising permissions granted by this License
-
-      Source form shall mean the preferred form for making modifications
-      including but not limited to software source code documentation
-      source and configuration files
-
-      Object form shall mean any form resulting from mechanical
-      transformation or translation of a Source form including but
-      not limited to compiled object code generated documentation
-      and conversions to other media types
-
-      Work shall mean the work of authorship whether in Source or
-      Object form made available under the License as indicated by a
-      copyright notice that is included in or attached to the work
-      an example is provided in the Appendix below
-
-      Derivative Works shall mean any work whether in Source or Object
-      form that is based on or derived from the Work and for which the
-      editorial revisions annotations elaborations or other modifications
-      represent as a whole an original work of authorship For the purposes
-      of this License Derivative Works shall not include works that remain
-      separable from or merely link or bind by name to the interfaces of
-      the Work and Derivative Works thereof
-
-      Contribution shall mean any work of authorship including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner For the purposes of this definition submitted
-      means any form of electronic verbal or written communication sent
-      to the Licensor or its representatives including but not limited to
-      communication on electronic mailing lists source code control systems
-      and issue tracking systems that are managed by or on behalf of the
-      Licensor for the purpose of discussing and improving the Work but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as Not a Contribution
-
-      Contributor shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work
-
-   2 Grant of Copyright License Subject to the terms and conditions of
-      this License each Contributor hereby grants to You a perpetual
-      worldwide nonexclusive nocharge royaltyfree irrevocable
-      copyright license to reproduce prepare Derivative Works of
-      publicly display publicly perform sublicense and distribute the
-      Work and such Derivative Works in Source or Object form
-
-   3 Grant of Patent License Subject to the terms and conditions of
-      this License each Contributor hereby grants to You a perpetual
-      worldwide nonexclusive nocharge royaltyfree irrevocable
-      except as stated in this section patent license to make have made
-      use offer to sell sell import and otherwise transfer the Work
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contributions alone or by combination of their Contributions
-      with the Work to which such Contributions was submitted If You
-      institute patent litigation against any entity including a
-      crossclaim or counterclaim in a lawsuit alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed
-
-   4 Redistribution You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium with or without
-      modifications and in Source or Object form provided that You
-      meet the following conditions
-
-      (?:a )?You must give any other recipients of the Work or
-          Derivative Works a copy of this License and
-
-      (?:b )?You must cause any modified files to carry prominent notices
-          stating that You changed the files and
-
-      (?:c )?You must retain in the Source form of any Derivative Works
-          that You distribute all copyright patent trademark and
-          attribution notices from the Source form of the Work
-          excluding those notices that do not pertain to any part of
-          the Derivative Works and
-
-      (?:d )?If the Work includes a NOTICE text file as part of its
-          distribution then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file excluding those notices that do not
-          pertain to any part of the Derivative Works in at least one
-          of the following places within a NOTICE text file distributed
-          as part of the Derivative Works within the Source form or
-          documentation if provided along with the Derivative Works or
-          within a display generated by the Derivative Works if and
-          wherever such thirdparty notices normally appear The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License You may add Your own attribution
-          notices within Derivative Works that You distribute alongside
-          or as an addendum to the NOTICE text from the Work provided
-          that such additional attribution notices cannot be construed
-          as modifying the License
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use reproduction or distribution of Your modifications or
-      for any such Derivative Works as a whole provided Your use
-      reproduction and distribution of the Work otherwise complies with
-      the conditions stated in this License
-
-   5 Submission of Contributions Unless You explicitly state otherwise
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License without any additional terms or conditions
-      Notwithstanding the above nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions
-
-   6 Trademarks This License does not grant permission to use the trade
-      names trademarks service marks or product names of the Licensor
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file
-
-   7 Disclaimer of Warranty Unless required by applicable law or
-      agreed to in writing Licensor provides the Work and each
-      Contributor provides its Contributions on an AS IS BASIS
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or
-      implied including without limitation any warranties or conditions
-      of TITLE NONINFRINGEMENT MERCHANTABILITY or FITNESS FOR A
-      PARTICULAR PURPOSE You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License
-
-   8 Limitation of Liability In no event and under no legal theory
-      whether in tort including negligence contract or otherwise
-      unless required by applicable law such as deliberate and grossly
-      negligent acts or agreed to in writing shall any Contributor be
-      liable to You for damages including any direct indirect special
-      incidental or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work including but not limited to damages for loss of goodwill
-      work stoppage computer failure or malfunction or any and all
-      other commercial damages or losses even if such Contributor
-      has been advised of the possibility of such damages
-
-   9 Accepting Warranty or Additional Liability While redistributing
-      the Work or Derivative Works thereof You may choose to offer
-      and charge a fee for acceptance of support warranty indemnity
-      or other liability obligations andor rights consistent with this
-      License However in accepting such obligations You may act only
-      on Your own behalf and on Your sole responsibility not on behalf
-      of any other Contributor and only if You agree to indemnify
-      defend and hold each Contributor harmless for any liability
-      incurred by or claims asserted against such Contributor by reason
-      of your accepting any such warranty or additional liability(?:
-
-   END OF TERMS AND CONDITIONS)?(?:
-
-   APPENDIX How to apply the Apache License to your work
-
-      To apply the Apache License to your work attach the following
-      boilerplate notice with the fields enclosed by brackets
-      replaced with your own identifying information Dont include
-      the brackets  The text should be enclosed in the appropriate
-      comment syntax for the file format We also recommend that a
-      file or class name and description of purpose be included on the
-      same printed page as the copyright notice for easier
-      identification within thirdparty archives)?(?:
-
-   Copyright.{0,512})?(?:
-
-   Licensed under the Apache License Version 20 the License
-   you may not use this file except in compliance with the License
-   You may obtain a copy of the License at
-
-       https?wwwapacheorglicensesLICENSE20
-
-   Unless required by applicable law or agreed to in writing software
-   distributed under the License is distributed on an AS IS BASIS
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied
-   See the License for the specific language governing permissions and
-   limitations under the License)?
diff --git a/crates/zeta/license_regexes/bsd.regex b/crates/zeta/license_regexes/bsd.regex
deleted file mode 100644
index 655e38fa43..0000000000
--- a/crates/zeta/license_regexes/bsd.regex
+++ /dev/null
@@ -1,23 +0,0 @@
-.{0,512}Redistribution and use in source and binary forms with or without
-modification are permitted provided that the following conditions are met
-
-(?:1 )?Redistributions of source code must retain the above copyright
-notice this list of conditions and the following disclaimer(?:
-
-(?:2 )?Redistributions in binary form must reproduce the above copyright
-notice this list of conditions and the following disclaimer in the
-documentation andor other materials provided with the distribution(?:
-
-(?:3 )?.{0,128} may be used to endorse or
-promote products derived from this software without specific prior written
-permission)?)?
-
-THIS SOFTWARE IS PROVIDED BY .{0,128}AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES
-INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED IN NO EVENT SHALL .{0,128}BE LIABLE
-FOR ANY DIRECT INDIRECT INCIDENTAL SPECIAL EXEMPLARY OR CONSEQUENTIAL
-DAMAGES INCLUDING BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES LOSS OF USE DATA OR PROFITS OR BUSINESS INTERRUPTION HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY WHETHER IN CONTRACT STRICT LIABILITY OR
-TORT INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
diff --git a/crates/zeta/license_regexes/isc.regex b/crates/zeta/license_regexes/isc.regex
deleted file mode 100644
index ba3e3c9cbf..0000000000
--- a/crates/zeta/license_regexes/isc.regex
+++ /dev/null
@@ -1,12 +0,0 @@
-.{0,512}Permission to use copy modify andor distribute
-this software for any purpose with or without fee is hereby granted provided
-that the above copyright notice and this permission notice appear in all
-copies
-
-THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL DIRECT INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE DATA OR PROFITS WHETHER IN AN
-ACTION OF CONTRACT NEGLIGENCE OR OTHER TORTIOUS ACTION ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE
diff --git a/crates/zeta/license_regexes/mit.regex b/crates/zeta/license_regexes/mit.regex
deleted file mode 100644
index a8fa7b3ee7..0000000000
--- a/crates/zeta/license_regexes/mit.regex
+++ /dev/null
@@ -1,17 +0,0 @@
-.{0,512}Permission is hereby granted free of charge to any
-person obtaining a copy of this software and associated documentation files
-the Software to deal in the Software without restriction including
-without limitation the rights to use copy modify merge publish distribute
-sublicense andor sell copies of the Software and to permit persons to whom
-the Software is furnished to do so subject to the following conditions
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software
-
-THE SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND EXPRESS OR
-IMPLIED INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM DAMAGES OR OTHER
-LIABILITY WHETHER IN AN ACTION OF CONTRACT TORT OR OTHERWISE ARISING FROM
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
diff --git a/crates/zeta/license_regexes/upl-1.0.regex b/crates/zeta/license_regexes/upl-1.0.regex
deleted file mode 100644
index f86f5fa3ab..0000000000
--- a/crates/zeta/license_regexes/upl-1.0.regex
+++ /dev/null
@@ -1,32 +0,0 @@
-.{0,512}Subject to the condition set forth below permission is hereby granted to any
-person obtaining a copy of this software associated documentation andor data
-collectively the Software free of charge and under any and all copyright
-rights in the Software and any and all patent rights owned or freely licensable
-by each licensor hereunder covering either i the unmodified Software as
-contributed to or provided by such licensor or ii the Larger Works as
-defined below to deal in both
-
-a the Software and
-
-b any piece of software andor hardware listed in the lrgrwrkstxt file if one is
-    included with the Software each a Larger Work to which the Software is
-    contributed by such licensors
-
-without restriction including without limitation the rights to copy create
-derivative works of display perform and distribute the Software and make use
-sell offer for sale import export have made and have sold the Software and the
-Larger Works and to sublicense the foregoing rights on either these or other
-terms
-
-This license is subject to the following condition
-
-The above copyright notice and either this complete permission notice or at a minimum
-a reference to the UPL must be included in all copies or substantial portions of the
-Software
-
-THE SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND EXPRESS OR IMPLIED
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM DAMAGES OR OTHER LIABILITY WHETHER IN AN ACTION OF
-CONTRACT TORT OR OTHERWISE ARISING FROM OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
diff --git a/crates/zeta/license_regexes/zlib.regex b/crates/zeta/license_regexes/zlib.regex
deleted file mode 100644
index 63a688d08c..0000000000
--- a/crates/zeta/license_regexes/zlib.regex
+++ /dev/null
@@ -1,18 +0,0 @@
-.{0,512}This software is provided asis without any express or implied
-warranty In no event will the authors be held liable for any damages
-arising from the use of this software
-
-Permission is granted to anyone to use this software for any purpose
-including commercial applications and to alter it and redistribute it
-freely subject to the following restrictions
-
-1? The origin of this software must not be misrepresented you must not
-claim that you wrote the original software If you use this software
-in a product an acknowledgment in the product documentation would be
-appreciated but is not required
-
-2? Altered source versions must be plainly marked as such and must not be
-misrepresented as being the original software
-
-3? This notice may not be removed or altered from any source
-distribution
diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index 81314477e5..2939f8a0c4 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -1,19 +1,20 @@
 use std::{
     collections::BTreeSet,
     fmt::{Display, Formatter},
+    ops::Range,
     path::{Path, PathBuf},
     sync::{Arc, LazyLock},
 };
 
+use anyhow::{Result, anyhow};
 use fs::Fs;
 use futures::StreamExt as _;
 use gpui::{App, AppContext as _, Entity, Subscription, Task};
 use itertools::Itertools;
 use postage::watch;
 use project::Worktree;
-use regex::Regex;
 use strum::VariantArray;
-use util::ResultExt as _;
+use util::{ResultExt as _, maybe};
 use worktree::ChildEntriesOptions;
 
 /// Matches the most common license locations, with US and UK English spelling.
@@ -70,68 +71,170 @@ impl OpenSourceLicense {
         }
     }
 
-    /// Regexes to match the license text. These regexes are expected to match the entire file. Also
-    /// note that `canonicalize_license_text` removes everything but alphanumeric ascii characters.
-    pub fn regex(&self) -> &'static str {
+    pub fn patterns(&self) -> &'static [&'static str] {
         match self {
-            OpenSourceLicense::Apache2_0 => include_str!("../license_regexes/apache-2.0.regex"),
-            OpenSourceLicense::BSDZero => include_str!("../license_regexes/0bsd.regex"),
-            OpenSourceLicense::BSD => include_str!("../license_regexes/bsd.regex"),
-            OpenSourceLicense::ISC => include_str!("../license_regexes/isc.regex"),
-            OpenSourceLicense::MIT => include_str!("../license_regexes/mit.regex"),
-            OpenSourceLicense::UPL1_0 => include_str!("../license_regexes/upl-1.0.regex"),
-            OpenSourceLicense::Zlib => include_str!("../license_regexes/zlib.regex"),
+            OpenSourceLicense::Apache2_0 => &[
+                include_str!("../license_patterns/apache-2.0-pattern"),
+                include_str!("../license_patterns/apache-2.0-reference-pattern"),
+            ],
+            OpenSourceLicense::BSDZero => &[include_str!("../license_patterns/0bsd-pattern")],
+            OpenSourceLicense::BSD => &[include_str!("../license_patterns/bsd-pattern")],
+            OpenSourceLicense::ISC => &[include_str!("../license_patterns/isc-pattern")],
+            OpenSourceLicense::MIT => &[include_str!("../license_patterns/mit-pattern")],
+            OpenSourceLicense::UPL1_0 => &[include_str!("../license_patterns/upl-1.0-pattern")],
+            OpenSourceLicense::Zlib => &[include_str!("../license_patterns/zlib-pattern")],
         }
     }
 }
 
-fn detect_license(license: &str) -> Option<OpenSourceLicense> {
-    static LICENSE_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-        let mut regex_string = String::new();
-        let mut is_first = true;
-        for license in OpenSourceLicense::VARIANTS {
-            if is_first {
-                regex_string.push_str("^(?:(");
-                is_first = false;
-            } else {
-                regex_string.push_str(")|(");
-            }
-            regex_string.push_str(&canonicalize_license_regex(license.regex()));
+// TODO: Consider using databake or similar to not parse at runtime.
+static LICENSE_PATTERNS: LazyLock<LicensePatterns> = LazyLock::new(|| {
+    let mut approximate_max_length = 0;
+    let mut patterns = Vec::new();
+    for license in OpenSourceLicense::VARIANTS {
+        for pattern in license.patterns() {
+            let (pattern, length) = parse_pattern(pattern).unwrap();
+            patterns.push((*license, pattern));
+            approximate_max_length = approximate_max_length.max(length);
         }
-        regex_string.push_str("))$");
-        let regex = Regex::new(&regex_string).unwrap();
-        assert_eq!(regex.captures_len(), OpenSourceLicense::VARIANTS.len() + 1);
-        regex
-    });
+    }
+    LicensePatterns {
+        patterns,
+        approximate_max_length,
+    }
+});
 
-    LICENSE_REGEX
-        .captures(&canonicalize_license_text(license))
-        .and_then(|captures| {
-            let license = OpenSourceLicense::VARIANTS
-                .iter()
-                .enumerate()
-                .find(|(index, _)| captures.get(index + 1).is_some())
-                .map(|(_, license)| *license);
-            if license.is_none() {
-                log::error!("bug: open source license regex matched without any capture groups");
+fn detect_license(text: &str) -> Option<OpenSourceLicense> {
+    let text = canonicalize_license_text(text);
+    for (license, pattern) in LICENSE_PATTERNS.patterns.iter() {
+        log::trace!("Checking if license is {}", license);
+        if check_pattern(&pattern, &text) {
+            return Some(*license);
+        }
+    }
+
+    None
+}
+
+struct LicensePatterns {
+    patterns: Vec<(OpenSourceLicense, Vec<PatternPart>)>,
+    approximate_max_length: usize,
+}
+
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
+struct PatternPart {
+    /// Indicates that matching `text` is optional. Skipping `match_any_chars` is conditional on
+    /// matching `text`.
+    optional: bool,
+    /// Indicates the number of characters that can be skipped before matching `text`.
+    match_any_chars: Range<usize>,
+    /// The text to match, may be empty.
+    text: String,
+}
+
+/// Lines that start with "-- " begin a `PatternPart`. `-- 1..10` specifies `match_any_chars:
+/// 1..10`. `-- 1..10 optional:` additionally specifies `optional: true`. It's a parse error for a
+/// line to start with `--` without matching this format.
+///
+/// Text that does not have `--` prefixes participate in the `text` field and are canonicalized by
+/// lowercasing, replacing all runs of whitespace with a single space, and otherwise only keeping
+/// ascii alphanumeric characters.
+fn parse_pattern(pattern_source: &str) -> Result<(Vec<PatternPart>, usize)> {
+    let mut pattern = Vec::new();
+    let mut part = PatternPart::default();
+    let mut approximate_max_length = 0;
+    for line in pattern_source.lines() {
+        if let Some(directive) = line.trim().strip_prefix("--") {
+            if part != PatternPart::default() {
+                pattern.push(part);
+                part = PatternPart::default();
             }
-            license
-        })
+            let valid = maybe!({
+                let directive_chunks = directive.split_whitespace().collect::<Vec<_>>();
+                if !(1..=2).contains(&directive_chunks.len()) {
+                    return None;
+                }
+                if directive_chunks.len() == 2 {
+                    part.optional = true;
+                }
+                let range_chunks = directive_chunks[0].split("..").collect::<Vec<_>>();
+                if range_chunks.len() != 2 {
+                    return None;
+                }
+                part.match_any_chars.start = range_chunks[0].parse::<usize>().ok()?;
+                part.match_any_chars.end = range_chunks[1].parse::<usize>().ok()?;
+                if part.match_any_chars.start > part.match_any_chars.end {
+                    return None;
+                }
+                approximate_max_length += part.match_any_chars.end;
+                Some(())
+            });
+            if valid.is_none() {
+                return Err(anyhow!("Invalid pattern directive: {}", line));
+            }
+            continue;
+        }
+        approximate_max_length += line.len() + 1;
+        let line = canonicalize_license_text(line);
+        if line.is_empty() {
+            continue;
+        }
+        if !part.text.is_empty() {
+            part.text.push(' ');
+        }
+        part.text.push_str(&line);
+    }
+    if part != PatternPart::default() {
+        pattern.push(part);
+    }
+    Ok((pattern, approximate_max_length))
 }
 
-/// Canonicalizes the whitespace of license text.
-fn canonicalize_license_regex(license: &str) -> String {
-    license
-        .split_ascii_whitespace()
-        .join(" ")
-        .to_ascii_lowercase()
+/// Checks a pattern against text by iterating over the pattern parts in reverse order, and checking
+/// matches with the end of a prefix of the input. Assumes that `canonicalize_license_text` has
+/// already been applied to the input.
+fn check_pattern(pattern: &[PatternPart], input: &str) -> bool {
+    let mut input_ix = input.len();
+    let mut match_any_chars = 0..0;
+    for part in pattern.iter().rev() {
+        if part.text.is_empty() {
+            match_any_chars.start += part.match_any_chars.start;
+            match_any_chars.end += part.match_any_chars.end;
+            continue;
+        }
+        let mut matched = false;
+        for skip_count in match_any_chars.start..=match_any_chars.end {
+            let end_ix = input_ix.saturating_sub(skip_count);
+            if end_ix < part.text.len() {
+                break;
+            }
+            if input[..end_ix].ends_with(&part.text) {
+                matched = true;
+                input_ix = end_ix - part.text.len();
+                match_any_chars = part.match_any_chars.clone();
+                break;
+            }
+        }
+        if !matched && !part.optional {
+            log::trace!(
+                "Failed to match pattern `...{}` against input `...{}`",
+                &part.text[part.text.len().saturating_sub(128)..],
+                &input[input_ix.saturating_sub(128)..]
+            );
+            return false;
+        }
+    }
+    match_any_chars.contains(&input_ix)
 }
 
-/// Canonicalizes the whitespace of license text.
+/// Canonicalizes license text by removing all non-alphanumeric characters, lowercasing, and turning
+/// runs of whitespace into a single space. Unicode alphanumeric characters are intentionally
+/// preserved since these should cause license mismatch when not within a portion of the license
+/// where arbitrary text is allowed.
 fn canonicalize_license_text(license: &str) -> String {
     license
         .chars()
-        .filter(|c| c.is_ascii_alphanumeric() || c.is_ascii_whitespace())
+        .filter(|c| c.is_ascii_whitespace() || c.is_alphanumeric())
         .map(|c| c.to_ascii_lowercase())
         .collect::<String>()
         .split_ascii_whitespace()
@@ -218,7 +321,7 @@ impl LicenseDetectionWatcher {
 
     async fn is_path_eligible(fs: &Arc<dyn Fs>, abs_path: PathBuf) -> Option<bool> {
         log::debug!("checking if `{abs_path:?}` is an open source license");
-        // Resolve symlinks so that the file size from metadata is correct.
+        // resolve symlinks so that the file size from metadata is correct
         let Some(abs_path) = fs.canonicalize(&abs_path).await.ok() else {
             log::debug!(
                 "`{abs_path:?}` license file probably deleted (error canonicalizing the path)"
@@ -226,8 +329,13 @@ impl LicenseDetectionWatcher {
             return None;
         };
         let metadata = fs.metadata(&abs_path).await.log_err()??;
-        // If the license file is >32kb it's unlikely to legitimately match any eligible license.
-        if metadata.len > 32768 {
+        if metadata.len > LICENSE_PATTERNS.approximate_max_length as u64 {
+            log::debug!(
+                "`{abs_path:?}` license file was skipped \
+                because its size of {} bytes was larger than the max size of {} bytes",
+                metadata.len,
+                LICENSE_PATTERNS.approximate_max_length
+            );
             return None;
         }
         let text = fs.load(&abs_path).await.log_err()?;
@@ -262,7 +370,6 @@ mod tests {
     use gpui::TestAppContext;
     use serde_json::json;
     use settings::{Settings as _, SettingsStore};
-    use unindent::unindent;
     use worktree::WorktreeSettings;
 
     use super::*;
@@ -275,25 +382,8 @@ mod tests {
 
     #[track_caller]
     fn assert_matches_license(text: &str, license: OpenSourceLicense) {
-        if detect_license(text) != Some(license) {
-            let license_regex_text = canonicalize_license_regex(license.regex());
-            let license_regex = Regex::new(&format!("^{}$", license_regex_text)).unwrap();
-            let text = canonicalize_license_text(text);
-            let matched_regex = license_regex.is_match(&text);
-            if matched_regex {
-                panic!(
-                    "The following text matches the individual regex for {}, \
-                    but not the combined one:\n```license-text\n{}\n```\n",
-                    license, text
-                );
-            } else {
-                panic!(
-                    "The following text doesn't match the regex for {}:\n\
-                    ```license-text\n{}\n```\n\n```regex\n{}\n```\n",
-                    license, text, license_regex_text
-                );
-            }
-        }
+        assert_eq!(detect_license(text), Some(license));
+        assert!(text.len() < LICENSE_PATTERNS.approximate_max_length);
     }
 
     /*
@@ -325,7 +415,8 @@ mod tests {
                 continue;
             };
             let path_string = entry.path().to_string_lossy().to_string();
-            match detect_license(&contents) {
+            let license = detect_license(&contents);
+            match license {
                 Some(license) => detected.push((license, path_string)),
                 None => unrecognized.push(path_string),
             }
@@ -348,66 +439,9 @@ mod tests {
     }
     */
 
-    #[test]
-    fn test_no_unicode_in_regexes() {
-        for license in OpenSourceLicense::VARIANTS {
-            assert!(
-                !license.regex().contains(|c: char| !c.is_ascii()),
-                "{}.regex contains unicode",
-                license.spdx_identifier()
-            );
-        }
-    }
-
     #[test]
     fn test_apache_positive_detection() {
         assert_matches_license(APACHE_2_0_TXT, OpenSourceLicense::Apache2_0);
-
-        let license_with_appendix = format!(
-            r#"{APACHE_2_0_TXT}
-
-            END OF TERMS AND CONDITIONS
-
-            APPENDIX: How to apply the Apache License to your work.
-
-                To apply the Apache License to your work, attach the following
-                boilerplate notice, with the fields enclosed by brackets "[]"
-                replaced with your own identifying information. (Don't include
-                the brackets!)  The text should be enclosed in the appropriate
-                comment syntax for the file format. We also recommend that a
-                file or class name and description of purpose be included on the
-                same "printed page" as the copyright notice for easier
-                identification within third-party archives.
-
-            Copyright [yyyy] [name of copyright owner]
-
-            Licensed under the Apache License, Version 2.0 (the "License");
-            you may not use this file except in compliance with the License.
-            You may obtain a copy of the License at
-
-                http://www.apache.org/licenses/LICENSE-2.0
-
-            Unless required by applicable law or agreed to in writing, software
-            distributed under the License is distributed on an "AS IS" BASIS,
-            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            See the License for the specific language governing permissions and
-            limitations under the License."#
-        );
-        assert_matches_license(&license_with_appendix, OpenSourceLicense::Apache2_0);
-
-        // Sometimes people fill in the appendix with copyright info.
-        let license_with_copyright = license_with_appendix.replace(
-            "Copyright [yyyy] [name of copyright owner]",
-            "Copyright 2025 John Doe",
-        );
-        assert!(license_with_copyright != license_with_appendix);
-        assert_matches_license(&license_with_copyright, OpenSourceLicense::Apache2_0);
-
-        assert_matches_license(
-            include_str!("../../../LICENSE-APACHE"),
-            OpenSourceLicense::Apache2_0,
-        );
-
         assert_matches_license(
             include_str!("../license_examples/apache-2.0-ex1.txt"),
             OpenSourceLicense::Apache2_0,
@@ -420,15 +454,23 @@ mod tests {
             include_str!("../license_examples/apache-2.0-ex3.txt"),
             OpenSourceLicense::Apache2_0,
         );
+        assert_matches_license(
+            include_str!("../license_examples/apache-2.0-ex4.txt"),
+            OpenSourceLicense::Apache2_0,
+        );
+        assert_matches_license(
+            include_str!("../../../LICENSE-APACHE"),
+            OpenSourceLicense::Apache2_0,
+        );
     }
 
     #[test]
     fn test_apache_negative_detection() {
-        assert!(
+        assert_eq!(
             detect_license(&format!(
                 "{APACHE_2_0_TXT}\n\nThe terms in this license are void if P=NP."
-            ))
-            .is_none()
+            )),
+            None
         );
     }
 
@@ -490,7 +532,7 @@ mod tests {
             This project is dual licensed under the ISC License and the MIT License."#
         );
 
-        assert!(detect_license(&license_text).is_none());
+        assert_eq!(detect_license(&license_text), None);
     }
 
     #[test]
@@ -517,7 +559,7 @@ mod tests {
 
             This project is dual licensed under the MIT License and the Apache License, Version 2.0."#
         );
-        assert!(detect_license(&license_text).is_none());
+        assert_eq!(detect_license(&license_text), None);
     }
 
     #[test]
@@ -533,7 +575,7 @@ mod tests {
             This project is dual licensed under the UPL License and the MIT License."#
         );
 
-        assert!(detect_license(&license_text).is_none());
+        assert_eq!(detect_license(&license_text), None);
     }
 
     #[test]
@@ -614,44 +656,6 @@ mod tests {
         assert_eq!(canonicalize_license_text(input), expected);
     }
 
-    #[test]
-    fn test_license_detection_canonicalizes_whitespace() {
-        let mit_with_weird_spacing = unindent(
-            r#"
-                MIT License
-
-
-                Copyright (c) 2024 John Doe
-
-
-                Permission is hereby granted, free of charge, to any person obtaining a copy
-                of this software   and   associated   documentation files (the "Software"), to deal
-                in the Software without restriction, including without limitation the rights
-                to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-                copies of the Software, and to permit persons to whom the Software is
-                furnished to do so, subject to the following conditions:
-
-
-
-                The above copyright notice and this permission notice shall be included in all
-                copies or substantial portions of the Software.
-
-
-
-                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-                IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-                FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-                AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-                LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-                OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-                SOFTWARE.
-            "#
-            .trim(),
-        );
-
-        assert_matches_license(&mit_with_weird_spacing, OpenSourceLicense::MIT);
-    }
-
     fn init_test(cx: &mut TestAppContext) {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);

From fe0ab30e8fcdd66402131925c05fd38472d877ee Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Sun, 31 Aug 2025 16:14:57 +0800
Subject: [PATCH 484/823] Fix auto size rendering of SVG images in Markdown
 (#36663)

Release Notes:

- Fixed auto size rendering of SVG images in Markdown.

## Before

<img width="836" height="844" alt="image"
src="https://github.com/user-attachments/assets/0782e17e-620f-4c29-a5bc-a2ffe877d220"
/>
<img width="691" height="678" alt="image"
src="https://github.com/user-attachments/assets/dbe2dd5f-fd5b-48f9-bd09-0ee35e116aec"
/>


## After

<img width="873" height="1015" alt="image"
src="https://github.com/user-attachments/assets/59cbb69f-6a81-43cb-989f-3bcea873d81e"
/>
<img width="647" height="598" alt="image"
src="https://github.com/user-attachments/assets/11b67d8e-2b6c-4245-ad13-d4616fdabf22"
/>

For GPUI example

```
cargo run -p gpui --example image
```

<img width="1212" height="740" alt="SCR-20250821-ojoy"
src="https://github.com/user-attachments/assets/62bb2847-c533-4c4d-b5f7-c9764796262a"
/>
---
 crates/gpui/examples/image/image.rs | 104 +++++++++++++++-------------
 crates/gpui/src/assets.rs           |  11 ++-
 crates/gpui/src/elements/img.rs     |  23 +++---
 3 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/crates/gpui/examples/image/image.rs b/crates/gpui/examples/image/image.rs
index bd1708e8c4..34a510f76d 100644
--- a/crates/gpui/examples/image/image.rs
+++ b/crates/gpui/examples/image/image.rs
@@ -75,64 +75,70 @@ impl Render for ImageShowcase {
     fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
         div()
             .id("main")
+            .bg(gpui::white())
             .overflow_y_scroll()
             .p_5()
             .size_full()
-            .flex()
-            .flex_col()
-            .justify_center()
-            .items_center()
-            .gap_8()
-            .bg(rgb(0xffffff))
-            .child(
-                div()
-                    .flex()
-                    .flex_row()
-                    .justify_center()
-                    .items_center()
-                    .gap_8()
-                    .child(ImageContainer::new(
-                        "Image loaded from a local file",
-                        self.local_resource.clone(),
-                    ))
-                    .child(ImageContainer::new(
-                        "Image loaded from a remote resource",
-                        self.remote_resource.clone(),
-                    ))
-                    .child(ImageContainer::new(
-                        "Image loaded from an asset",
-                        self.asset_resource.clone(),
-                    )),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_row()
-                    .gap_8()
-                    .child(
-                        div()
-                            .flex_col()
-                            .child("Auto Width")
-                            .child(img("https://picsum.photos/800/400").h(px(180.))),
-                    )
-                    .child(
-                        div()
-                            .flex_col()
-                            .child("Auto Height")
-                            .child(img("https://picsum.photos/800/400").w(px(180.))),
-                    ),
-            )
             .child(
                 div()
                     .flex()
                     .flex_col()
                     .justify_center()
                     .items_center()
-                    .w_full()
-                    .border_1()
-                    .border_color(rgb(0xC0C0C0))
-                    .child("image with max width 100%")
-                    .child(img("https://picsum.photos/800/400").max_w_full()),
+                    .gap_8()
+                    .child(img(
+                        "https://github.com/zed-industries/zed/actions/workflows/ci.yml/badge.svg",
+                    ))
+                    .child(
+                        div()
+                            .flex()
+                            .flex_row()
+                            .justify_center()
+                            .items_center()
+                            .gap_8()
+                            .child(ImageContainer::new(
+                                "Image loaded from a local file",
+                                self.local_resource.clone(),
+                            ))
+                            .child(ImageContainer::new(
+                                "Image loaded from a remote resource",
+                                self.remote_resource.clone(),
+                            ))
+                            .child(ImageContainer::new(
+                                "Image loaded from an asset",
+                                self.asset_resource.clone(),
+                            )),
+                    )
+                    .child(
+                        div()
+                            .flex()
+                            .flex_row()
+                            .gap_8()
+                            .child(
+                                div()
+                                    .flex_col()
+                                    .child("Auto Width")
+                                    .child(img("https://picsum.photos/800/400").h(px(180.))),
+                            )
+                            .child(
+                                div()
+                                    .flex_col()
+                                    .child("Auto Height")
+                                    .child(img("https://picsum.photos/800/400").w(px(180.))),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .flex()
+                            .flex_col()
+                            .justify_center()
+                            .items_center()
+                            .w_full()
+                            .border_1()
+                            .border_color(rgb(0xC0C0C0))
+                            .child("image with max width 100%")
+                            .child(img("https://picsum.photos/800/400").max_w_full()),
+                    ),
             )
     }
 }
diff --git a/crates/gpui/src/assets.rs b/crates/gpui/src/assets.rs
index 70a07c11e9..8930b58f8d 100644
--- a/crates/gpui/src/assets.rs
+++ b/crates/gpui/src/assets.rs
@@ -1,4 +1,4 @@
-use crate::{DevicePixels, Result, SharedString, Size, size};
+use crate::{DevicePixels, Pixels, Result, SharedString, Size, size};
 use smallvec::SmallVec;
 
 use image::{Delay, Frame};
@@ -42,6 +42,8 @@ pub(crate) struct RenderImageParams {
 pub struct RenderImage {
     /// The ID associated with this image
     pub id: ImageId,
+    /// The scale factor of this image on render.
+    pub(crate) scale_factor: f32,
     data: SmallVec<[Frame; 1]>,
 }
 
@@ -60,6 +62,7 @@ impl RenderImage {
 
         Self {
             id: ImageId(NEXT_ID.fetch_add(1, SeqCst)),
+            scale_factor: 1.0,
             data: data.into(),
         }
     }
@@ -77,6 +80,12 @@ impl RenderImage {
         size(width.into(), height.into())
     }
 
+    /// Get the size of this image, in pixels for display, adjusted for the scale factor.
+    pub(crate) fn render_size(&self, frame_index: usize) -> Size<Pixels> {
+        self.size(frame_index)
+            .map(|v| (v.0 as f32 / self.scale_factor).into())
+    }
+
     /// Get the delay of this frame from the previous
     pub fn delay(&self, frame_index: usize) -> Delay {
         self.data[frame_index].delay()
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index 893860d7e1..40d1b5e449 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -332,20 +332,18 @@ impl Element for Img {
                                 state.started_loading = None;
                             }
 
-                            let image_size = data.size(frame_index);
-                            style.aspect_ratio =
-                                Some(image_size.width.0 as f32 / image_size.height.0 as f32);
+                            let image_size = data.render_size(frame_index);
+                            style.aspect_ratio = Some(image_size.width / image_size.height);
 
                             if let Length::Auto = style.size.width {
                                 style.size.width = match style.size.height {
                                     Length::Definite(DefiniteLength::Absolute(
                                         AbsoluteLength::Pixels(height),
                                     )) => Length::Definite(
-                                        px(image_size.width.0 as f32 * height.0
-                                            / image_size.height.0 as f32)
-                                        .into(),
+                                        px(image_size.width.0 * height.0 / image_size.height.0)
+                                            .into(),
                                     ),
-                                    _ => Length::Definite(px(image_size.width.0 as f32).into()),
+                                    _ => Length::Definite(image_size.width.into()),
                                 };
                             }
 
@@ -354,11 +352,10 @@ impl Element for Img {
                                     Length::Definite(DefiniteLength::Absolute(
                                         AbsoluteLength::Pixels(width),
                                     )) => Length::Definite(
-                                        px(image_size.height.0 as f32 * width.0
-                                            / image_size.width.0 as f32)
-                                        .into(),
+                                        px(image_size.height.0 * width.0 / image_size.width.0)
+                                            .into(),
                                     ),
-                                    _ => Length::Definite(px(image_size.height.0 as f32).into()),
+                                    _ => Length::Definite(image_size.height.into()),
                                 };
                             }
 
@@ -701,7 +698,9 @@ impl Asset for ImageAssetLoader {
                     swap_rgba_pa_to_bgra(pixel);
                 }
 
-                RenderImage::new(SmallVec::from_elem(Frame::new(buffer), 1))
+                let mut image = RenderImage::new(SmallVec::from_elem(Frame::new(buffer), 1));
+                image.scale_factor = SMOOTH_SVG_SCALE_FACTOR;
+                image
             };
 
             Ok(Arc::new(data))

From e1155848962bcd04ea3ab7b2493a63e468d0ac6f Mon Sep 17 00:00:00 2001
From: Dan Dascalescu <ddascalescu+github@gmail.com>
Date: Sun, 31 Aug 2025 11:19:25 +0300
Subject: [PATCH 485/823] docs: Copyedit debugger.md and clarify settings
 location (#36996)

Release Notes:

- N/A
---
 docs/src/debugger.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/src/debugger.md b/docs/src/debugger.md
index 7cfbf63cd8..b018ea904b 100644
--- a/docs/src/debugger.md
+++ b/docs/src/debugger.md
@@ -78,11 +78,10 @@ While configuration fields are debug adapter-dependent, most adapters support th
     // The debug adapter that Zed should use to debug the program
     "adapter": "Example adapter name",
     // Request:
-    //  - launch: Zed will launch the program if specified or shows a debug terminal with the right configuration
-    //  - attach: Zed will attach to a running program to debug it or when the process_id is not specified we will show a process picker (only supported for node currently)
+    //  - launch: Zed will launch the program if specified, or show a debug terminal with the right configuration
+    //  - attach: Zed will attach to a running program to debug it, or when the process_id is not specified, will show a process picker (only supported for node currently)
     "request": "launch",
-    // program: The program that you want to debug
-    // This field supports path resolution with ~ or . symbols
+    // The program to debug. This field supports path resolution with ~ or . symbols.
     "program": "path_to_program",
     // cwd: defaults to the current working directory of your project ($ZED_WORKTREE_ROOT)
     "cwd": "$ZED_WORKTREE_ROOT"
@@ -148,6 +147,8 @@ The debug adapter will then stop whenever an exception of a given kind occurs. W
 
 ## Settings
 
+The settings for the debugger are grouped under the `debugger` key in `settings.json`:
+
 - `dock`: Determines the position of the debug panel in the UI.
 - `stepping_granularity`: Determines the stepping granularity.
 - `save_breakpoints`: Whether the breakpoints should be reused across Zed sessions.

From d80f13242b410af03e54a0bdbe9c6007b9feb6d8 Mon Sep 17 00:00:00 2001
From: Gerd Augsburg <account@gerd-augsburg.de>
Date: Sun, 31 Aug 2025 10:26:28 +0200
Subject: [PATCH 486/823] Support for "Insert" from character key location
 (#37219)

Release Notes:
- Added support for the Insert-Key from a character key location for
keyboard layouts like neo2
---
 crates/gpui/src/platform/linux/platform.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 8bd89fc399..196e5b65d0 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -848,6 +848,7 @@ impl crate::Keystroke {
             Keysym::Down => "down".to_owned(),
             Keysym::Home => "home".to_owned(),
             Keysym::End => "end".to_owned(),
+            Keysym::Insert => "insert".to_owned(),
 
             _ => {
                 let name = xkb::keysym_get_name(key_sym).to_lowercase();

From 1ca5e84019a1541943863f281f9b1804bba7dee1 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Sun, 31 Aug 2025 10:43:24 +0200
Subject: [PATCH 487/823] markdown: Add HTML `img` tag support (#36700)

Closes #21992

<img width="1406" height="1184" alt="Screenshot 2025-08-21 at 18 09 24"
src="https://github.com/user-attachments/assets/5f14a0d8-c4d9-48ad-b10d-fadfaca258ea"
/>

Code example:

```markdown
# Html Tag
<img src="https://picsum.photos/200/300" alt="Description of image" />

# Html Tag with width and height
<img src="https://picsum.photos/200/300" alt="Description of image" width="100" height="200" />

# Html Tag with style attribute with width and height
<img src="https://picsum.photos/200/300" alt="Description of image" style="width: 100px; height: 200px" />

# Normal Tag
![alt text](https://picsum.photos/200/300)
```

Release Notes:

- Markdown: Added HTML `<img src="/some-image.svg">` tag support
---
 Cargo.lock                                    |   2 +
 crates/markdown_preview/Cargo.toml            |   6 +-
 .../markdown_preview/src/markdown_elements.rs |  17 +-
 .../markdown_preview/src/markdown_parser.rs   | 372 +++++++++++++++++-
 .../markdown_preview/src/markdown_renderer.rs | 137 ++++---
 5 files changed, 456 insertions(+), 78 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ab3b713a11..6fc771894f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9953,9 +9953,11 @@ dependencies = [
  "editor",
  "fs",
  "gpui",
+ "html5ever 0.27.0",
  "language",
  "linkify",
  "log",
+ "markup5ever_rcdom",
  "pretty_assertions",
  "pulldown-cmark 0.12.2",
  "settings",
diff --git a/crates/markdown_preview/Cargo.toml b/crates/markdown_preview/Cargo.toml
index ebdd8a9eb6..55646cdcf4 100644
--- a/crates/markdown_preview/Cargo.toml
+++ b/crates/markdown_preview/Cargo.toml
@@ -19,19 +19,21 @@ anyhow.workspace = true
 async-recursion.workspace = true
 collections.workspace = true
 editor.workspace = true
+fs.workspace = true
 gpui.workspace = true
+html5ever.workspace = true
 language.workspace = true
 linkify.workspace = true
 log.workspace = true
+markup5ever_rcdom.workspace = true
 pretty_assertions.workspace = true
 pulldown-cmark.workspace = true
 settings.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace.workspace = true
 workspace-hack.workspace = true
-fs.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/markdown_preview/src/markdown_elements.rs b/crates/markdown_preview/src/markdown_elements.rs
index a570e79f53..560e468439 100644
--- a/crates/markdown_preview/src/markdown_elements.rs
+++ b/crates/markdown_preview/src/markdown_elements.rs
@@ -1,5 +1,6 @@
 use gpui::{
-    FontStyle, FontWeight, HighlightStyle, SharedString, StrikethroughStyle, UnderlineStyle, px,
+    DefiniteLength, FontStyle, FontWeight, HighlightStyle, SharedString, StrikethroughStyle,
+    UnderlineStyle, px,
 };
 use language::HighlightId;
 use std::{fmt::Display, ops::Range, path::PathBuf};
@@ -15,6 +16,7 @@ pub enum ParsedMarkdownElement {
     /// A paragraph of text and other inline elements.
     Paragraph(MarkdownParagraph),
     HorizontalRule(Range<usize>),
+    Image(Image),
 }
 
 impl ParsedMarkdownElement {
@@ -30,6 +32,7 @@ impl ParsedMarkdownElement {
                 MarkdownParagraphChunk::Image(image) => image.source_range.clone(),
             },
             Self::HorizontalRule(range) => range.clone(),
+            Self::Image(image) => image.source_range.clone(),
         })
     }
 
@@ -290,6 +293,8 @@ pub struct Image {
     pub link: Link,
     pub source_range: Range<usize>,
     pub alt_text: Option<SharedString>,
+    pub width: Option<DefiniteLength>,
+    pub height: Option<DefiniteLength>,
 }
 
 impl Image {
@@ -303,10 +308,20 @@ impl Image {
             source_range,
             link,
             alt_text: None,
+            width: None,
+            height: None,
         })
     }
 
     pub fn set_alt_text(&mut self, alt_text: SharedString) {
         self.alt_text = Some(alt_text);
     }
+
+    pub fn set_width(&mut self, width: DefiniteLength) {
+        self.width = Some(width);
+    }
+
+    pub fn set_height(&mut self, height: DefiniteLength) {
+        self.height = Some(height);
+    }
 }
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
index b51b98a2ed..1b116c50d9 100644
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -1,10 +1,12 @@
 use crate::markdown_elements::*;
 use async_recursion::async_recursion;
 use collections::FxHashMap;
-use gpui::FontWeight;
+use gpui::{DefiniteLength, FontWeight, px, relative};
+use html5ever::{ParseOpts, local_name, parse_document, tendril::TendrilSink};
 use language::LanguageRegistry;
+use markup5ever_rcdom::RcDom;
 use pulldown_cmark::{Alignment, Event, Options, Parser, Tag, TagEnd};
-use std::{ops::Range, path::PathBuf, sync::Arc, vec};
+use std::{cell::RefCell, collections::HashMap, ops::Range, path::PathBuf, rc::Rc, sync::Arc, vec};
 
 pub async fn parse_markdown(
     markdown_input: &str,
@@ -172,9 +174,14 @@ impl<'a> MarkdownParser<'a> {
 
                     self.cursor += 1;
 
-                    let code_block = self.parse_code_block(language).await;
+                    let code_block = self.parse_code_block(language).await?;
                     Some(vec![ParsedMarkdownElement::CodeBlock(code_block)])
                 }
+                Tag::HtmlBlock => {
+                    self.cursor += 1;
+
+                    Some(self.parse_html_block().await)
+                }
                 _ => None,
             },
             Event::Rule => {
@@ -378,7 +385,7 @@ impl<'a> MarkdownParser<'a> {
                     TagEnd::Image => {
                         if let Some(mut image) = image.take() {
                             if !text.is_empty() {
-                                image.alt_text = Some(std::mem::take(&mut text).into());
+                                image.set_alt_text(std::mem::take(&mut text).into());
                             }
                             markdown_text_like.push(MarkdownParagraphChunk::Image(image));
                         }
@@ -695,13 +702,22 @@ impl<'a> MarkdownParser<'a> {
         }
     }
 
-    async fn parse_code_block(&mut self, language: Option<String>) -> ParsedMarkdownCodeBlock {
-        let (_event, source_range) = self.previous().unwrap();
+    async fn parse_code_block(
+        &mut self,
+        language: Option<String>,
+    ) -> Option<ParsedMarkdownCodeBlock> {
+        let Some((_event, source_range)) = self.previous() else {
+            return None;
+        };
+
         let source_range = source_range.clone();
         let mut code = String::new();
 
         while !self.eof() {
-            let (current, _source_range) = self.current().unwrap();
+            let Some((current, _source_range)) = self.current() else {
+                break;
+            };
+
             match current {
                 Event::Text(text) => {
                     code.push_str(text);
@@ -734,23 +750,190 @@ impl<'a> MarkdownParser<'a> {
             None
         };
 
-        ParsedMarkdownCodeBlock {
+        Some(ParsedMarkdownCodeBlock {
             source_range,
             contents: code.into(),
             language,
             highlights,
+        })
+    }
+
+    async fn parse_html_block(&mut self) -> Vec<ParsedMarkdownElement> {
+        let mut elements = Vec::new();
+        let Some((_event, _source_range)) = self.previous() else {
+            return elements;
+        };
+
+        while !self.eof() {
+            let Some((current, source_range)) = self.current() else {
+                break;
+            };
+            let source_range = source_range.clone();
+            match current {
+                Event::Html(html) => {
+                    let mut cursor = std::io::Cursor::new(html.as_bytes());
+                    let Some(dom) = parse_document(RcDom::default(), ParseOpts::default())
+                        .from_utf8()
+                        .read_from(&mut cursor)
+                        .ok()
+                    else {
+                        self.cursor += 1;
+                        continue;
+                    };
+
+                    self.cursor += 1;
+
+                    self.parse_html_node(source_range, &dom.document, &mut elements);
+                }
+                Event::End(TagEnd::CodeBlock) => {
+                    self.cursor += 1;
+                    break;
+                }
+                _ => {
+                    break;
+                }
+            }
+        }
+
+        elements
+    }
+
+    fn parse_html_node(
+        &self,
+        source_range: Range<usize>,
+        node: &Rc<markup5ever_rcdom::Node>,
+        elements: &mut Vec<ParsedMarkdownElement>,
+    ) {
+        match &node.data {
+            markup5ever_rcdom::NodeData::Document => {
+                self.consume_children(source_range, node, elements);
+            }
+            markup5ever_rcdom::NodeData::Doctype { .. } => {}
+            markup5ever_rcdom::NodeData::Text { contents } => {
+                elements.push(ParsedMarkdownElement::Paragraph(vec![
+                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
+                        source_range,
+                        contents: contents.borrow().to_string(),
+                        highlights: Vec::default(),
+                        region_ranges: Vec::default(),
+                        regions: Vec::default(),
+                    }),
+                ]));
+            }
+            markup5ever_rcdom::NodeData::Comment { .. } => {}
+            markup5ever_rcdom::NodeData::Element { name, attrs, .. } => {
+                if local_name!("img") == name.local {
+                    if let Some(image) = self.extract_image(source_range, attrs) {
+                        elements.push(ParsedMarkdownElement::Image(image));
+                    }
+                } else {
+                    self.consume_children(source_range, node, elements);
+                }
+            }
+            markup5ever_rcdom::NodeData::ProcessingInstruction { .. } => {}
+        }
+    }
+
+    fn consume_children(
+        &self,
+        source_range: Range<usize>,
+        node: &Rc<markup5ever_rcdom::Node>,
+        elements: &mut Vec<ParsedMarkdownElement>,
+    ) {
+        for node in node.children.borrow().iter() {
+            self.parse_html_node(source_range.clone(), node, elements);
+        }
+    }
+
+    fn attr_value(
+        attrs: &RefCell<Vec<html5ever::Attribute>>,
+        name: html5ever::LocalName,
+    ) -> Option<String> {
+        attrs.borrow().iter().find_map(|attr| {
+            if attr.name.local == name {
+                Some(attr.value.to_string())
+            } else {
+                None
+            }
+        })
+    }
+
+    fn extract_styles_from_attributes(
+        attrs: &RefCell<Vec<html5ever::Attribute>>,
+    ) -> HashMap<String, String> {
+        let mut styles = HashMap::new();
+
+        if let Some(style) = Self::attr_value(attrs, local_name!("style")) {
+            for decl in style.split(';') {
+                let mut parts = decl.splitn(2, ':');
+                if let Some((key, value)) = parts.next().zip(parts.next()) {
+                    styles.insert(
+                        key.trim().to_lowercase().to_string(),
+                        value.trim().to_string(),
+                    );
+                }
+            }
+        }
+
+        styles
+    }
+
+    fn extract_image(
+        &self,
+        source_range: Range<usize>,
+        attrs: &RefCell<Vec<html5ever::Attribute>>,
+    ) -> Option<Image> {
+        let src = Self::attr_value(attrs, local_name!("src"))?;
+
+        let mut image = Image::identify(src, source_range, self.file_location_directory.clone())?;
+
+        if let Some(alt) = Self::attr_value(attrs, local_name!("alt")) {
+            image.set_alt_text(alt.into());
+        }
+
+        let styles = Self::extract_styles_from_attributes(attrs);
+
+        if let Some(width) = Self::attr_value(attrs, local_name!("width"))
+            .or_else(|| styles.get("width").cloned())
+            .and_then(|width| Self::parse_length(&width))
+        {
+            image.set_width(width);
+        }
+
+        if let Some(height) = Self::attr_value(attrs, local_name!("height"))
+            .or_else(|| styles.get("height").cloned())
+            .and_then(|height| Self::parse_length(&height))
+        {
+            image.set_height(height);
+        }
+
+        Some(image)
+    }
+
+    /// Parses the width/height attribute value of an html element (e.g. img element)
+    fn parse_length(value: &str) -> Option<DefiniteLength> {
+        if value.ends_with("%") {
+            value
+                .trim_end_matches("%")
+                .parse::<f32>()
+                .ok()
+                .map(|value| relative(value / 100.))
+        } else {
+            value
+                .trim_end_matches("px")
+                .parse()
+                .ok()
+                .map(|value| px(value).into())
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use core::panic;
-
     use super::*;
-
     use ParsedMarkdownListItemType::*;
-    use gpui::BackgroundExecutor;
+    use core::panic;
+    use gpui::{AbsoluteLength, BackgroundExecutor, DefiniteLength};
     use language::{
         HighlightId, Language, LanguageConfig, LanguageMatcher, LanguageRegistry, tree_sitter_rust,
     };
@@ -925,6 +1108,8 @@ mod tests {
                     url: "https://blog.logrocket.com/wp-content/uploads/2024/04/exploring-zed-open-source-code-editor-rust-2.png".to_string(),
                 },
                 alt_text: Some("test".into()),
+                height: None,
+                width: None,
             },)
         );
     }
@@ -946,6 +1131,8 @@ mod tests {
                     url: "http://example.com/foo.png".to_string(),
                 },
                 alt_text: None,
+                height: None,
+                width: None,
             },)
         );
     }
@@ -965,6 +1152,8 @@ mod tests {
                     url: "http://example.com/foo.png".to_string(),
                 },
                 alt_text: Some("foo bar baz".into()),
+                height: None,
+                width: None,
             }),],
         );
     }
@@ -990,6 +1179,8 @@ mod tests {
                         url: "http://example.com/foo.png".to_string(),
                     },
                     alt_text: Some("foo".into()),
+                    height: None,
+                    width: None,
                 }),
                 MarkdownParagraphChunk::Text(ParsedMarkdownText {
                     source_range: 0..81,
@@ -1004,11 +1195,168 @@ mod tests {
                         url: "http://example.com/bar.png".to_string(),
                     },
                     alt_text: Some("bar".into()),
+                    height: None,
+                    width: None,
                 })
             ]
         );
     }
 
+    #[test]
+    fn test_parse_length() {
+        // Test percentage values
+        assert_eq!(
+            MarkdownParser::parse_length("50%"),
+            Some(DefiniteLength::Fraction(0.5))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("100%"),
+            Some(DefiniteLength::Fraction(1.0))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("25%"),
+            Some(DefiniteLength::Fraction(0.25))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("0%"),
+            Some(DefiniteLength::Fraction(0.0))
+        );
+
+        // Test pixel values
+        assert_eq!(
+            MarkdownParser::parse_length("100px"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("50px"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(50.0))))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("0px"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(0.0))))
+        );
+
+        // Test values without units (should be treated as pixels)
+        assert_eq!(
+            MarkdownParser::parse_length("100"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("42"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
+        );
+
+        // Test invalid values
+        assert_eq!(MarkdownParser::parse_length("invalid"), None);
+        assert_eq!(MarkdownParser::parse_length("px"), None);
+        assert_eq!(MarkdownParser::parse_length("%"), None);
+        assert_eq!(MarkdownParser::parse_length(""), None);
+        assert_eq!(MarkdownParser::parse_length("abc%"), None);
+        assert_eq!(MarkdownParser::parse_length("abcpx"), None);
+
+        // Test decimal values
+        assert_eq!(
+            MarkdownParser::parse_length("50.5%"),
+            Some(DefiniteLength::Fraction(0.505))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("100.25px"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.25))))
+        );
+        assert_eq!(
+            MarkdownParser::parse_length("42.0"),
+            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
+        );
+    }
+
+    #[gpui::test]
+    async fn test_html_image_tag() {
+        let parsed = parse("<img src=\"http://example.com/foo.png\" />").await;
+
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
+        assert_eq!(
+            image.clone(),
+            Image {
+                source_range: 0..40,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: None,
+                height: None,
+                width: None,
+            },
+        );
+    }
+
+    #[gpui::test]
+    async fn test_html_image_tag_with_alt_text() {
+        let parsed = parse("<img src=\"http://example.com/foo.png\" alt=\"Foo\" />").await;
+
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
+        assert_eq!(
+            image.clone(),
+            Image {
+                source_range: 0..50,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: Some("Foo".into()),
+                height: None,
+                width: None,
+            },
+        );
+    }
+
+    #[gpui::test]
+    async fn test_html_image_tag_with_height_and_width() {
+        let parsed =
+            parse("<img src=\"http://example.com/foo.png\" height=\"100\" width=\"200\" />").await;
+
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
+        assert_eq!(
+            image.clone(),
+            Image {
+                source_range: 0..65,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: None,
+                height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
+                width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
+            },
+        );
+    }
+
+    #[gpui::test]
+    async fn test_html_image_style_tag_with_height_and_width() {
+        let parsed = parse(
+            "<img src=\"http://example.com/foo.png\" style=\"height:100px; width:200px;\" />",
+        )
+        .await;
+
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
+        assert_eq!(
+            image.clone(),
+            Image {
+                source_range: 0..75,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: None,
+                height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
+                width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
+            },
+        );
+    }
+
     #[gpui::test]
     async fn test_header_only_table() {
         let markdown = "\
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index b0b10e927c..b07b4686a4 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -1,5 +1,5 @@
 use crate::markdown_elements::{
-    HeadingLevel, Link, MarkdownParagraph, MarkdownParagraphChunk, ParsedMarkdown,
+    HeadingLevel, Image, Link, MarkdownParagraph, MarkdownParagraphChunk, ParsedMarkdown,
     ParsedMarkdownBlockQuote, ParsedMarkdownCodeBlock, ParsedMarkdownElement,
     ParsedMarkdownHeading, ParsedMarkdownListItem, ParsedMarkdownListItemType, ParsedMarkdownTable,
     ParsedMarkdownTableAlignment, ParsedMarkdownTableRow,
@@ -164,6 +164,7 @@ pub fn render_markdown_block(block: &ParsedMarkdownElement, cx: &mut RenderConte
         BlockQuote(block_quote) => render_markdown_block_quote(block_quote, cx),
         CodeBlock(code_block) => render_markdown_code_block(code_block, cx),
         HorizontalRule(_) => render_markdown_rule(cx),
+        Image(image) => render_markdown_image(image, cx),
     }
 }
 
@@ -722,65 +723,7 @@ fn render_markdown_text(parsed_new: &MarkdownParagraph, cx: &mut RenderContext)
             }
 
             MarkdownParagraphChunk::Image(image) => {
-                let image_resource = match image.link.clone() {
-                    Link::Web { url } => Resource::Uri(url.into()),
-                    Link::Path { path, .. } => Resource::Path(Arc::from(path)),
-                };
-
-                let element_id = cx.next_id(&image.source_range);
-
-                let image_element = div()
-                    .id(element_id)
-                    .cursor_pointer()
-                    .child(
-                        img(ImageSource::Resource(image_resource))
-                            .max_w_full()
-                            .with_fallback({
-                                let alt_text = image.alt_text.clone();
-                                move || div().children(alt_text.clone()).into_any_element()
-                            }),
-                    )
-                    .tooltip({
-                        let link = image.link.clone();
-                        move |_, cx| {
-                            InteractiveMarkdownElementTooltip::new(
-                                Some(link.to_string()),
-                                "open image",
-                                cx,
-                            )
-                            .into()
-                        }
-                    })
-                    .on_click({
-                        let workspace = workspace_clone.clone();
-                        let link = image.link.clone();
-                        move |_, window, cx| {
-                            if window.modifiers().secondary() {
-                                match &link {
-                                    Link::Web { url } => cx.open_url(url),
-                                    Link::Path { path, .. } => {
-                                        if let Some(workspace) = &workspace {
-                                            _ = workspace.update(cx, |workspace, cx| {
-                                                workspace
-                                                    .open_abs_path(
-                                                        path.clone(),
-                                                        OpenOptions {
-                                                            visible: Some(OpenVisible::None),
-                                                            ..Default::default()
-                                                        },
-                                                        window,
-                                                        cx,
-                                                    )
-                                                    .detach();
-                                            });
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    })
-                    .into_any();
-                any_element.push(image_element);
+                any_element.push(render_markdown_image(image, cx));
             }
         }
     }
@@ -793,18 +736,86 @@ fn render_markdown_rule(cx: &mut RenderContext) -> AnyElement {
     div().py(cx.scaled_rems(0.5)).child(rule).into_any()
 }
 
+fn render_markdown_image(image: &Image, cx: &mut RenderContext) -> AnyElement {
+    let image_resource = match image.link.clone() {
+        Link::Web { url } => Resource::Uri(url.into()),
+        Link::Path { path, .. } => Resource::Path(Arc::from(path)),
+    };
+
+    let element_id = cx.next_id(&image.source_range);
+    let workspace = cx.workspace.clone();
+
+    div()
+        .id(element_id)
+        .cursor_pointer()
+        .child(
+            img(ImageSource::Resource(image_resource))
+                .max_w_full()
+                .with_fallback({
+                    let alt_text = image.alt_text.clone();
+                    move || div().children(alt_text.clone()).into_any_element()
+                })
+                .when_some(image.height, |this, height| this.h(height))
+                .when_some(image.width, |this, width| this.w(width)),
+        )
+        .tooltip({
+            let link = image.link.clone();
+            let alt_text = image.alt_text.clone();
+            move |_, cx| {
+                InteractiveMarkdownElementTooltip::new(
+                    Some(alt_text.clone().unwrap_or(link.to_string().into())),
+                    "open image",
+                    cx,
+                )
+                .into()
+            }
+        })
+        .on_click({
+            let link = image.link.clone();
+            move |_, window, cx| {
+                if window.modifiers().secondary() {
+                    match &link {
+                        Link::Web { url } => cx.open_url(url),
+                        Link::Path { path, .. } => {
+                            if let Some(workspace) = &workspace {
+                                _ = workspace.update(cx, |workspace, cx| {
+                                    workspace
+                                        .open_abs_path(
+                                            path.clone(),
+                                            OpenOptions {
+                                                visible: Some(OpenVisible::None),
+                                                ..Default::default()
+                                            },
+                                            window,
+                                            cx,
+                                        )
+                                        .detach();
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        })
+        .into_any()
+}
+
 struct InteractiveMarkdownElementTooltip {
     tooltip_text: Option<SharedString>,
-    action_text: String,
+    action_text: SharedString,
 }
 
 impl InteractiveMarkdownElementTooltip {
-    pub fn new(tooltip_text: Option<String>, action_text: &str, cx: &mut App) -> Entity<Self> {
+    pub fn new(
+        tooltip_text: Option<SharedString>,
+        action_text: impl Into<SharedString>,
+        cx: &mut App,
+    ) -> Entity<Self> {
         let tooltip_text = tooltip_text.map(|t| util::truncate_and_trailoff(&t, 50).into());
 
         cx.new(|_cx| Self {
             tooltip_text,
-            action_text: action_text.to_string(),
+            action_text: action_text.into(),
         })
     }
 }

From f348737e8cfac9da2b6579ee7ce86ae788cc09c6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 31 Aug 2025 08:54:22 +0000
Subject: [PATCH 488/823] Update Rust crate tracing-subscriber to v0.3.20
 [SECURITY] (#37195)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [tracing-subscriber](https://tokio.rs)
([source](https://redirect.github.com/tokio-rs/tracing)) | dependencies
| patch | `0.3.19` -> `0.3.20` |

### GitHub Vulnerability Alerts

####
[CVE-2025-58160](https://redirect.github.com/tokio-rs/tracing/security/advisories/GHSA-xwfj-jgwm-7wp5)

### Impact

Previous versions of tracing-subscriber were vulnerable to ANSI escape
sequence injection attacks. Untrusted user input containing ANSI escape
sequences could be injected into terminal output when logged,
potentially allowing attackers to:

- Manipulate terminal title bars
- Clear screens or modify terminal display
- Potentially mislead users through terminal manipulation

In isolation, impact is minimal, however security issues have been found
in terminal emulators that enabled an attacker to use ANSI escape
sequences via logs to exploit vulnerabilities in the terminal emulator.

### Patches

`tracing-subscriber` version 0.3.20 fixes this vulnerability by escaping
ANSI control characters in when writing events to destinations that may
be printed to the terminal.

### Workarounds

Avoid printing logs to terminal emulators without escaping ANSI control
sequences.

### References

https://www.packetlabs.net/posts/weaponizing-ansi-escape-sequences/

### Acknowledgments

We would like to thank [zefr0x](http://github.com/zefr0x) who
responsibly reported the issue at `security@tokio.rs`.

If you believe you have found a security vulnerability in any tokio-rs
project, please email us at `security@tokio.rs`.

---

### Release Notes

<details>
<summary>tokio-rs/tracing (tracing-subscriber)</summary>

###
[`v0.3.20`](https://redirect.github.com/tokio-rs/tracing/releases/tag/tracing-subscriber-0.3.20):
tracing-subscriber 0.3.20

[Compare
Source](https://redirect.github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.19...tracing-subscriber-0.3.20)

**Security Fix**: ANSI Escape Sequence Injection (CVE-TBD)

#### Impact

Previous versions of tracing-subscriber were vulnerable to ANSI escape
sequence injection attacks. Untrusted user input containing ANSI escape
sequences could be injected into terminal output when logged,
potentially allowing attackers to:

- Manipulate terminal title bars
- Clear screens or modify terminal display
- Potentially mislead users through terminal manipulation

In isolation, impact is minimal, however security issues have been found
in terminal emulators that enabled an attacker to use ANSI escape
sequences via logs to exploit vulnerabilities in the terminal emulator.

#### Solution

Version 0.3.20 fixes this vulnerability by escaping ANSI control
characters in when writing events to destinations that may be printed to
the terminal.

#### Affected Versions

All versions of tracing-subscriber prior to 0.3.20 are affected by this
vulnerability.

#### Recommendations

Immediate Action Required: We recommend upgrading to tracing-subscriber
0.3.20 immediately, especially if your application:

- Logs user-provided input (form data, HTTP headers, query parameters,
etc.)
- Runs in environments where terminal output is displayed to users

#### Migration

This is a patch release with no breaking API changes. Simply update your
Cargo.toml:

```toml
[dependencies]
tracing-subscriber = "0.3.20"
```

#### Acknowledgments

We would like to thank [zefr0x](http://github.com/zefr0x) who
responsibly reported the issue at `security@tokio.rs`.

If you believe you have found a security vulnerability in any tokio-rs
project, please email us at `security@tokio.rs`.

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "" in timezone America/New_York,
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

Release Notes:

- N/A

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi43IiwidXBkYXRlZEluVmVyIjoiNDEuODIuNyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 Cargo.lock                        | 81 ++++++++++---------------------
 tooling/workspace-hack/Cargo.toml |  4 +-
 2 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6fc771894f..fed7077281 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -507,7 +507,7 @@ dependencies = [
  "parking_lot",
  "piper",
  "polling",
- "regex-automata 0.4.9",
+ "regex-automata",
  "rustix-openpty",
  "serde",
  "signal-hook",
@@ -2457,7 +2457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "serde",
 ]
 
@@ -4732,7 +4732,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b545b8c50194bdd008283985ab0b31dba153cfd5b3066a92770634fbc0d7d291"
 dependencies = [
- "nu-ansi-term 0.50.1",
+ "nu-ansi-term",
 ]
 
 [[package]]
@@ -5631,8 +5631,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
 dependencies = [
  "bit-set 0.5.3",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -5642,8 +5642,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
 dependencies = [
  "bit-set 0.8.0",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -7293,8 +7293,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -8299,7 +8299,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -8898,7 +8898,7 @@ dependencies = [
  "percent-encoding",
  "referencing",
  "regex",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "reqwest 0.12.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_json",
@@ -9738,7 +9738,7 @@ dependencies = [
  "lazy_static",
  "proc-macro2",
  "quote",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "rustc_version",
  "syn 2.0.101",
 ]
@@ -10018,11 +10018,11 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -10723,16 +10723,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.1"
@@ -11426,12 +11416,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "p256"
 version = "0.11.1"
@@ -13422,17 +13406,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -13443,7 +13418,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -13452,12 +13427,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -17147,14 +17116,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
- "nu-ansi-term 0.46.0",
+ "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "serde",
  "serde_json",
  "sharded-slab",
@@ -17185,7 +17154,7 @@ checksum = "a7cf18d43cbf0bfca51f657132cc616a5097edc4424d538bae6fa60142eaf9f0"
 dependencies = [
  "cc",
  "regex",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "serde_json",
  "streaming-iterator",
  "tree-sitter-language",
@@ -19983,8 +19952,8 @@ dependencies = [
  "rand_core 0.6.4",
  "regalloc2",
  "regex",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
  "ring",
  "rust_decimal",
  "rustc-hash 1.1.0",
diff --git a/tooling/workspace-hack/Cargo.toml b/tooling/workspace-hack/Cargo.toml
index 2f9a963abc..9bcaabb8cc 100644
--- a/tooling/workspace-hack/Cargo.toml
+++ b/tooling/workspace-hack/Cargo.toml
@@ -568,7 +568,7 @@ tokio-rustls = { version = "0.26", default-features = false, features = ["loggin
 tokio-socks = { version = "0.5", features = ["futures-io"] }
 tokio-stream = { version = "0.1", features = ["fs"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
-winapi = { version = "0.3", default-features = false, features = ["cfg", "commapi", "consoleapi", "errhandlingapi", "evntrace", "fileapi", "handleapi", "impl-debug", "impl-default", "in6addr", "inaddr", "ioapiset", "knownfolders", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "objbase", "processenv", "processthreadsapi", "shlobj", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "windef", "winerror", "winioctl", "winnt", "winreg", "winsock2", "winuser"] }
+winapi = { version = "0.3", default-features = false, features = ["cfg", "commapi", "consoleapi", "evntrace", "fileapi", "handleapi", "impl-debug", "impl-default", "in6addr", "inaddr", "ioapiset", "knownfolders", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "objbase", "processenv", "processthreadsapi", "shlobj", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "windef", "winerror", "winioctl", "winnt", "winreg", "winsock2", "winuser"] }
 windows-core = { version = "0.61" }
 windows-numerics = { version = "0.2" }
 windows-sys-73dcd821b1037cfd = { package = "windows-sys", version = "0.59", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Win32_Globalization", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Console", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Ioctl", "Win32_System_Kernel", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Performance", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_Time", "Win32_System_WindowsProgramming", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] }
@@ -592,7 +592,7 @@ tokio-rustls = { version = "0.26", default-features = false, features = ["loggin
 tokio-socks = { version = "0.5", features = ["futures-io"] }
 tokio-stream = { version = "0.1", features = ["fs"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
-winapi = { version = "0.3", default-features = false, features = ["cfg", "commapi", "consoleapi", "errhandlingapi", "evntrace", "fileapi", "handleapi", "impl-debug", "impl-default", "in6addr", "inaddr", "ioapiset", "knownfolders", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "objbase", "processenv", "processthreadsapi", "shlobj", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "windef", "winerror", "winioctl", "winnt", "winreg", "winsock2", "winuser"] }
+winapi = { version = "0.3", default-features = false, features = ["cfg", "commapi", "consoleapi", "evntrace", "fileapi", "handleapi", "impl-debug", "impl-default", "in6addr", "inaddr", "ioapiset", "knownfolders", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "objbase", "processenv", "processthreadsapi", "shlobj", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "windef", "winerror", "winioctl", "winnt", "winreg", "winsock2", "winuser"] }
 windows-core = { version = "0.61" }
 windows-numerics = { version = "0.2" }
 windows-sys-73dcd821b1037cfd = { package = "windows-sys", version = "0.59", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Win32_Globalization", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Console", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Ioctl", "Win32_System_Kernel", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Performance", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_Time", "Win32_System_WindowsProgramming", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] }

From b69ebbd7b797117ffcd36d45a856cf4c1705d197 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 31 Aug 2025 13:19:12 +0300
Subject: [PATCH 489/823] Bump pnpm dependencies (#37258)

Takes care of
https://github.com/zed-industries/zed/security/dependabot/64

Release Notes:

- N/A
---
 script/danger/pnpm-lock.yaml         |  64 ++--
 script/issue_response/package.json   |  10 +-
 script/issue_response/pnpm-lock.yaml | 418 +++++++++++++++------------
 3 files changed, 264 insertions(+), 228 deletions(-)

diff --git a/script/danger/pnpm-lock.yaml b/script/danger/pnpm-lock.yaml
index f2739779e2..fd6b3f66ac 100644
--- a/script/danger/pnpm-lock.yaml
+++ b/script/danger/pnpm-lock.yaml
@@ -33,8 +33,8 @@ packages:
     resolution: {integrity: sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==}
     engines: {node: '>= 18'}
 
-  '@octokit/core@5.2.1':
-    resolution: {integrity: sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==}
+  '@octokit/core@5.2.2':
+    resolution: {integrity: sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==}
     engines: {node: '>= 18'}
 
   '@octokit/endpoint@9.0.6':
@@ -131,8 +131,8 @@ packages:
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
-  core-js@3.41.0:
-    resolution: {integrity: sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==}
+  core-js@3.45.1:
+    resolution: {integrity: sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==}
 
   danger-plugin-pr-hygiene@0.6.1:
     resolution: {integrity: sha512-nb+iUQvirE3BlKXI1WoOND6sujyGzHar590mJm5tt4RLi65HXFaU5hqONxgDoWFujJNHYnXse9yaZdxnxEi4QA==}
@@ -142,8 +142,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  debug@4.4.0:
-    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -252,8 +252,8 @@ packages:
     resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
     engines: {node: '>=12', npm: '>=6'}
 
-  jwa@1.4.1:
-    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
+  jwa@1.4.2:
+    resolution: {integrity: sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==}
 
   jws@3.2.2:
     resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
@@ -385,8 +385,8 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  semver@7.7.1:
-    resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
+  semver@7.7.2:
+    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -460,7 +460,7 @@ snapshots:
 
   '@octokit/auth-token@4.0.0': {}
 
-  '@octokit/core@5.2.1':
+  '@octokit/core@5.2.2':
     dependencies:
       '@octokit/auth-token': 4.0.0
       '@octokit/graphql': 7.1.1
@@ -483,18 +483,18 @@ snapshots:
 
   '@octokit/openapi-types@24.2.0': {}
 
-  '@octokit/plugin-paginate-rest@11.4.4-cjs.2(@octokit/core@5.2.1)':
+  '@octokit/plugin-paginate-rest@11.4.4-cjs.2(@octokit/core@5.2.2)':
     dependencies:
-      '@octokit/core': 5.2.1
+      '@octokit/core': 5.2.2
       '@octokit/types': 13.10.0
 
-  '@octokit/plugin-request-log@4.0.1(@octokit/core@5.2.1)':
+  '@octokit/plugin-request-log@4.0.1(@octokit/core@5.2.2)':
     dependencies:
-      '@octokit/core': 5.2.1
+      '@octokit/core': 5.2.2
 
-  '@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1(@octokit/core@5.2.1)':
+  '@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1(@octokit/core@5.2.2)':
     dependencies:
-      '@octokit/core': 5.2.1
+      '@octokit/core': 5.2.2
       '@octokit/types': 13.10.0
 
   '@octokit/request-error@5.1.1':
@@ -512,10 +512,10 @@ snapshots:
 
   '@octokit/rest@20.1.2':
     dependencies:
-      '@octokit/core': 5.2.1
-      '@octokit/plugin-paginate-rest': 11.4.4-cjs.2(@octokit/core@5.2.1)
-      '@octokit/plugin-request-log': 4.0.1(@octokit/core@5.2.1)
-      '@octokit/plugin-rest-endpoint-methods': 13.3.2-cjs.1(@octokit/core@5.2.1)
+      '@octokit/core': 5.2.2
+      '@octokit/plugin-paginate-rest': 11.4.4-cjs.2(@octokit/core@5.2.2)
+      '@octokit/plugin-request-log': 4.0.1(@octokit/core@5.2.2)
+      '@octokit/plugin-rest-endpoint-methods': 13.3.2-cjs.1(@octokit/core@5.2.2)
 
   '@octokit/types@13.10.0':
     dependencies:
@@ -525,7 +525,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -571,7 +571,7 @@ snapshots:
 
   commander@2.20.3: {}
 
-  core-js@3.41.0: {}
+  core-js@3.45.1: {}
 
   danger-plugin-pr-hygiene@0.6.1: {}
 
@@ -582,8 +582,8 @@ snapshots:
       async-retry: 1.2.3
       chalk: 2.4.2
       commander: 2.20.3
-      core-js: 3.41.0
-      debug: 4.4.0
+      core-js: 3.45.1
+      debug: 4.4.1
       fast-json-patch: 3.1.1
       get-stdin: 6.0.0
       http-proxy-agent: 5.0.0
@@ -618,7 +618,7 @@ snapshots:
       - encoding
       - supports-color
 
-  debug@4.4.0:
+  debug@4.4.1:
     dependencies:
       ms: 2.1.3
 
@@ -688,14 +688,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.4.0
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -720,9 +720,9 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.1
+      semver: 7.7.2
 
-  jwa@1.4.1:
+  jwa@1.4.2:
     dependencies:
       buffer-equal-constant-time: 1.0.1
       ecdsa-sig-formatter: 1.0.11
@@ -730,7 +730,7 @@ snapshots:
 
   jws@3.2.2:
     dependencies:
-      jwa: 1.4.1
+      jwa: 1.4.2
       safe-buffer: 5.2.1
 
   lodash.find@4.6.0: {}
@@ -823,7 +823,7 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
-  semver@7.7.1: {}
+  semver@7.7.2: {}
 
   side-channel-list@1.0.0:
     dependencies:
diff --git a/script/issue_response/package.json b/script/issue_response/package.json
index 0f3715ef27..70696bc4b8 100644
--- a/script/issue_response/package.json
+++ b/script/issue_response/package.json
@@ -9,14 +9,14 @@
     "start": "node main.js"
   },
   "dependencies": {
-    "@octokit/rest": "^21.1.0",
-    "@slack/webhook": "^7.0.4",
+    "@octokit/rest": "^21.1.1",
+    "@slack/webhook": "^7.0.6",
     "date-fns": "^4.1.0",
-    "octokit": "^4.1.1"
+    "octokit": "^4.1.4"
   },
   "devDependencies": {
-    "@octokit/types": "^13.8.0",
-    "@slack/types": "^2.14.0",
+    "@octokit/types": "^13.10.0",
+    "@slack/types": "^2.16.0",
     "@tsconfig/node20": "20.1.5",
     "@tsconfig/strictest": "2.0.5",
     "typescript": "5.7.3"
diff --git a/script/issue_response/pnpm-lock.yaml b/script/issue_response/pnpm-lock.yaml
index 7286c36467..a42e246075 100644
--- a/script/issue_response/pnpm-lock.yaml
+++ b/script/issue_response/pnpm-lock.yaml
@@ -9,24 +9,24 @@ importers:
   .:
     dependencies:
       '@octokit/rest':
-        specifier: ^21.1.0
+        specifier: ^21.1.1
         version: 21.1.1
       '@slack/webhook':
-        specifier: ^7.0.4
-        version: 7.0.5
+        specifier: ^7.0.6
+        version: 7.0.6
       date-fns:
         specifier: ^4.1.0
         version: 4.1.0
       octokit:
-        specifier: ^4.1.1
-        version: 4.1.2
+        specifier: ^4.1.4
+        version: 4.1.4
     devDependencies:
       '@octokit/types':
-        specifier: ^13.8.0
-        version: 13.8.0
+        specifier: ^13.10.0
+        version: 13.10.0
       '@slack/types':
-        specifier: ^2.14.0
-        version: 2.14.0
+        specifier: ^2.16.0
+        version: 2.16.0
       '@tsconfig/node20':
         specifier: 20.1.5
         version: 20.1.5
@@ -39,44 +39,44 @@ importers:
 
 packages:
 
-  '@octokit/app@15.1.4':
-    resolution: {integrity: sha512-PM1MqlPAnItjQIKWRmSoJu02+m7Eif4Am3w5C+Ctkw0//QETWMbW2ejBZhcw3aS7wRcFSbS+lH3NoYm614aZVQ==}
+  '@octokit/app@15.1.6':
+    resolution: {integrity: sha512-WELCamoCJo9SN0lf3SWZccf68CF0sBNPQuLYmZ/n87p5qvBJDe9aBtr5dHkh7T9nxWZ608pizwsUbypSzZAiUw==}
     engines: {node: '>= 18'}
 
-  '@octokit/auth-app@7.1.5':
-    resolution: {integrity: sha512-boklS4E6LpbA3nRx+SU2fRKRGZJdOGoSZne/i3Y0B5rfHOcGwFgcXrwDLdtbv4igfDSnAkZaoNBv1GYjPDKRNw==}
+  '@octokit/auth-app@7.2.2':
+    resolution: {integrity: sha512-p6hJtEyQDCJEPN9ijjhEC/kpFHMHN4Gca9r+8S0S8EJi7NaWftaEmexjxxpT1DFBeJpN4u/5RE22ArnyypupJw==}
     engines: {node: '>= 18'}
 
-  '@octokit/auth-oauth-app@8.1.3':
-    resolution: {integrity: sha512-4e6OjVe5rZ8yBe8w7byBjpKtSXFuro7gqeGAAZc7QYltOF8wB93rJl2FE0a4U1Mt88xxPv/mS+25/0DuLk0Ewg==}
+  '@octokit/auth-oauth-app@8.1.4':
+    resolution: {integrity: sha512-71iBa5SflSXcclk/OL3lJzdt4iFs56OJdpBGEBl1wULp7C58uiswZLV6TdRaiAzHP1LT8ezpbHlKuxADb+4NkQ==}
     engines: {node: '>= 18'}
 
-  '@octokit/auth-oauth-device@7.1.3':
-    resolution: {integrity: sha512-BECO/N4B/Uikj0w3GCvjf/odMujtYTP3q82BJSjxC2J3rxTEiZIJ+z2xnRlDb0IE9dQSaTgRqUPVOieSbFcVzg==}
+  '@octokit/auth-oauth-device@7.1.5':
+    resolution: {integrity: sha512-lR00+k7+N6xeECj0JuXeULQ2TSBB/zjTAmNF2+vyGPDEFx1dgk1hTDmL13MjbSmzusuAmuJD8Pu39rjp9jH6yw==}
     engines: {node: '>= 18'}
 
-  '@octokit/auth-oauth-user@5.1.3':
-    resolution: {integrity: sha512-zNPByPn9K7TC+OOHKGxU+MxrE9SZAN11UHYEFLsK2NRn3akJN2LHRl85q+Eypr3tuB2GrKx3rfj2phJdkYCvzw==}
+  '@octokit/auth-oauth-user@5.1.6':
+    resolution: {integrity: sha512-/R8vgeoulp7rJs+wfJ2LtXEVC7pjQTIqDab7wPKwVG6+2v/lUnCOub6vaHmysQBbb45FknM3tbHW8TOVqYHxCw==}
     engines: {node: '>= 18'}
 
   '@octokit/auth-token@5.1.2':
     resolution: {integrity: sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==}
     engines: {node: '>= 18'}
 
-  '@octokit/auth-unauthenticated@6.1.2':
-    resolution: {integrity: sha512-07DlUGcz/AAVdzu3EYfi/dOyMSHp9YsOxPl/MPmtlVXWiD//GlV8HgZsPhud94DEyx+RfrW0wSl46Lx+AWbOlg==}
+  '@octokit/auth-unauthenticated@6.1.3':
+    resolution: {integrity: sha512-d5gWJla3WdSl1yjbfMpET+hUSFCE15qM0KVSB0H1shyuJihf/RL1KqWoZMIaonHvlNojkL9XtLFp8QeLe+1iwA==}
     engines: {node: '>= 18'}
 
-  '@octokit/core@6.1.4':
-    resolution: {integrity: sha512-lAS9k7d6I0MPN+gb9bKDt7X8SdxknYqAMh44S5L+lNqIN2NuV8nvv3g8rPp7MuRxcOpxpUIATWprO0C34a8Qmg==}
+  '@octokit/core@6.1.6':
+    resolution: {integrity: sha512-kIU8SLQkYWGp3pVKiYzA5OSaNF5EE03P/R8zEmmrG6XwOg5oBjXyQVVIauQ0dgau4zYhpZEhJrvIYt6oM+zZZA==}
     engines: {node: '>= 18'}
 
-  '@octokit/endpoint@10.1.3':
-    resolution: {integrity: sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==}
+  '@octokit/endpoint@10.1.4':
+    resolution: {integrity: sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==}
     engines: {node: '>= 18'}
 
-  '@octokit/graphql@8.2.1':
-    resolution: {integrity: sha512-n57hXtOoHrhwTWdvhVkdJHdhTv0JstjDbDRhJfwIRNfFqmSo1DaK/mD2syoNUoLCyqSjBpGAKOG0BuwF392slw==}
+  '@octokit/graphql@8.2.2':
+    resolution: {integrity: sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==}
     engines: {node: '>= 18'}
 
   '@octokit/oauth-app@7.1.6':
@@ -87,15 +87,18 @@ packages:
     resolution: {integrity: sha512-ooXV8GBSabSWyhLUowlMIVd9l1s2nsOGQdlP2SQ4LnkEsGXzeCvbSbCPdZThXhEFzleGPwbapT0Sb+YhXRyjCA==}
     engines: {node: '>= 18'}
 
-  '@octokit/oauth-methods@5.1.4':
-    resolution: {integrity: sha512-Jc/ycnePClOvO1WL7tlC+TRxOFtyJBGuTDsL4dzXNiVZvzZdrPuNw7zHI3qJSUX2n6RLXE5L0SkFmYyNaVUFoQ==}
+  '@octokit/oauth-methods@5.1.5':
+    resolution: {integrity: sha512-Ev7K8bkYrYLhoOSZGVAGsLEscZQyq7XQONCBBAl2JdMg7IT3PQn/y8P0KjloPoYpI5UylqYrLeUcScaYWXwDvw==}
     engines: {node: '>= 18'}
 
-  '@octokit/openapi-types@23.0.1':
-    resolution: {integrity: sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==}
+  '@octokit/openapi-types@24.2.0':
+    resolution: {integrity: sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==}
 
-  '@octokit/openapi-webhooks-types@9.1.0':
-    resolution: {integrity: sha512-bO1D2jLdU8qEvqmbWjNxJzDYSFT4wesiYKIKP6f4LaM0XUGtn/0LBv/20hu9YqcnpdX38X5o/xANTMtIAqdwYw==}
+  '@octokit/openapi-types@25.1.0':
+    resolution: {integrity: sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==}
+
+  '@octokit/openapi-webhooks-types@11.0.0':
+    resolution: {integrity: sha512-ZBzCFj98v3SuRM7oBas6BHZMJRadlnDoeFfvm1olVxZnYeU6Vh97FhPxyS5aLh5pN51GYv2I51l/hVUAVkGBlA==}
 
   '@octokit/plugin-paginate-graphql@5.2.4':
     resolution: {integrity: sha512-pLZES1jWaOynXKHOqdnwZ5ULeVR6tVVCMm+AUbp0htdcyXDU95WbkYdU4R2ej1wKj5Tu94Mee2Ne0PjPO9cCyA==}
@@ -103,8 +106,14 @@ packages:
     peerDependencies:
       '@octokit/core': '>=6'
 
-  '@octokit/plugin-paginate-rest@11.4.2':
-    resolution: {integrity: sha512-BXJ7XPCTDXFF+wxcg/zscfgw2O/iDPtNSkwwR1W1W5c4Mb3zav/M2XvxQ23nVmKj7jpweB4g8viMeCQdm7LMVA==}
+  '@octokit/plugin-paginate-rest@11.6.0':
+    resolution: {integrity: sha512-n5KPteiF7pWKgBIBJSk8qzoZWcUkza2O6A0za97pMGVrGfPdltxrfmfF5GucHYvHGZD8BdaZmmHGz5cX/3gdpw==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/plugin-paginate-rest@12.0.0':
+    resolution: {integrity: sha512-MPd6WK1VtZ52lFrgZ0R2FlaoiWllzgqFHaSZxvp72NmoDeZ0m8GeJdg4oB6ctqMTYyrnDYp592Xma21mrgiyDA==}
     engines: {node: '>= 18'}
     peerDependencies:
       '@octokit/core': '>=6'
@@ -115,53 +124,62 @@ packages:
     peerDependencies:
       '@octokit/core': '>=6'
 
-  '@octokit/plugin-rest-endpoint-methods@13.3.1':
-    resolution: {integrity: sha512-o8uOBdsyR+WR8MK9Cco8dCgvG13H1RlM1nWnK/W7TEACQBFux/vPREgKucxUfuDQ5yi1T3hGf4C5ZmZXAERgwQ==}
+  '@octokit/plugin-rest-endpoint-methods@13.5.0':
+    resolution: {integrity: sha512-9Pas60Iv9ejO3WlAX3maE1+38c5nqbJXV5GrncEfkndIpZrJ/WPMRd2xYDcPPEt5yzpxcjw9fWNoPhsSGzqKqw==}
     engines: {node: '>= 18'}
     peerDependencies:
       '@octokit/core': '>=6'
 
-  '@octokit/plugin-retry@7.1.4':
-    resolution: {integrity: sha512-7AIP4p9TttKN7ctygG4BtR7rrB0anZqoU9ThXFk8nETqIfvgPUANTSYHqWYknK7W3isw59LpZeLI8pcEwiJdRg==}
+  '@octokit/plugin-rest-endpoint-methods@14.0.0':
+    resolution: {integrity: sha512-iQt6ovem4b7zZYZQtdv+PwgbL5VPq37th1m2x2TdkgimIDJpsi2A6Q/OI/23i/hR6z5mL0EgisNR4dcbmckSZQ==}
     engines: {node: '>= 18'}
     peerDependencies:
       '@octokit/core': '>=6'
 
-  '@octokit/plugin-throttling@9.4.0':
-    resolution: {integrity: sha512-IOlXxXhZA4Z3m0EEYtrrACkuHiArHLZ3CvqWwOez/pURNqRuwfoFlTPbN5Muf28pzFuztxPyiUiNwz8KctdZaQ==}
+  '@octokit/plugin-retry@7.2.1':
+    resolution: {integrity: sha512-wUc3gv0D6vNHpGxSaR3FlqJpTXGWgqmk607N9L3LvPL4QjaxDgX/1nY2mGpT37Khn+nlIXdljczkRnNdTTV3/A==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/plugin-throttling@10.0.0':
+    resolution: {integrity: sha512-Kuq5/qs0DVYTHZuBAzCZStCzo2nKvVRo/TDNhCcpC2TKiOGz/DisXMCvjt3/b5kr6SCI1Y8eeeJTHBxxpFvZEg==}
     engines: {node: '>= 18'}
     peerDependencies:
       '@octokit/core': ^6.1.3
 
-  '@octokit/request-error@6.1.7':
-    resolution: {integrity: sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==}
+  '@octokit/request-error@6.1.8':
+    resolution: {integrity: sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==}
     engines: {node: '>= 18'}
 
-  '@octokit/request@9.2.2':
-    resolution: {integrity: sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==}
+  '@octokit/request@9.2.4':
+    resolution: {integrity: sha512-q8ybdytBmxa6KogWlNa818r0k1wlqzNC+yNkcQDECHvQo8Vmstrg18JwqJHdJdUiHD2sjlwBgSm9kHkOKe2iyA==}
     engines: {node: '>= 18'}
 
   '@octokit/rest@21.1.1':
     resolution: {integrity: sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==}
     engines: {node: '>= 18'}
 
-  '@octokit/types@13.8.0':
-    resolution: {integrity: sha512-x7DjTIbEpEWXK99DMd01QfWy0hd5h4EN+Q7shkdKds3otGQP+oWE/y0A76i1OvH9fygo4ddvNf7ZvF0t78P98A==}
+  '@octokit/types@13.10.0':
+    resolution: {integrity: sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==}
+
+  '@octokit/types@14.1.0':
+    resolution: {integrity: sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==}
 
   '@octokit/webhooks-methods@5.1.1':
     resolution: {integrity: sha512-NGlEHZDseJTCj8TMMFehzwa9g7On4KJMPVHDSrHxCQumL6uSQR8wIkP/qesv52fXqV1BPf4pTxwtS31ldAt9Xg==}
     engines: {node: '>= 18'}
 
-  '@octokit/webhooks@13.6.1':
-    resolution: {integrity: sha512-vk0jnc5k0/mLMUI4IA9LfSYkLs3OHtfa7B3h4aRG6to912V3wIG8lS/wKwatwYxRkAug4oE8is0ERRI8pzoYTw==}
+  '@octokit/webhooks@13.9.1':
+    resolution: {integrity: sha512-Nss2b4Jyn4wB3EAqAPJypGuCJFalz/ZujKBQQ5934To7Xw9xjf4hkr/EAByxQY7hp7MKd790bWGz7XYSTsHmaw==}
     engines: {node: '>= 18'}
 
-  '@slack/types@2.14.0':
-    resolution: {integrity: sha512-n0EGm7ENQRxlXbgKSrQZL69grzg1gHLAVd+GlRVQJ1NSORo0FrApR7wql/gaKdu2n4TO83Sq/AmeUOqD60aXUA==}
+  '@slack/types@2.16.0':
+    resolution: {integrity: sha512-bICnyukvdklXhwxprR3uF1+ZFkTvWTZge4evlCS4G1H1HU6QLY68AcjqzQRymf7/5gNt6Y4OBb4NdviheyZcAg==}
     engines: {node: '>= 12.13.0', npm: '>= 6.12.0'}
 
-  '@slack/webhook@7.0.5':
-    resolution: {integrity: sha512-PmbZx89+SmH4zt78FUwe4If8hWX2MAIRmGXjmlF0A8PwyJb/H7CWaQYV6DDlZn1+7Zs6CEytKH0ejEE/idVSDw==}
+  '@slack/webhook@7.0.6':
+    resolution: {integrity: sha512-RvNCcOjNbzl5uQ2TZsbTJ+A+5ptoWMwnyd/W4lKzeXFToIwebeaZiuntcP0usmhZHj1LH9H1T9WN6Bt1B/DLyg==}
     engines: {node: '>= 18', npm: '>= 8.6.0'}
 
   '@tsconfig/node20@20.1.5':
@@ -170,17 +188,17 @@ packages:
   '@tsconfig/strictest@2.0.5':
     resolution: {integrity: sha512-ec4tjL2Rr0pkZ5hww65c+EEPYwxOi4Ryv+0MtjeaSQRJyq322Q27eOQiFbuNgw2hpL4hB1/W/HBGk3VKS43osg==}
 
-  '@types/aws-lambda@8.10.147':
-    resolution: {integrity: sha512-nD0Z9fNIZcxYX5Mai2CTmFD7wX7UldCkW2ezCF8D1T5hdiLsnTWDGRpfRYntU6VjTdLQjOvyszru7I1c1oCQew==}
+  '@types/aws-lambda@8.10.152':
+    resolution: {integrity: sha512-soT/c2gYBnT5ygwiHPmd9a1bftj462NWVk2tKCc1PYHSIacB2UwbTS2zYG4jzag1mRDuzg/OjtxQjQ2NKRB6Rw==}
 
-  '@types/node@22.13.13':
-    resolution: {integrity: sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==}
+  '@types/node@24.3.0':
+    resolution: {integrity: sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==}
 
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
-  axios@1.8.4:
-    resolution: {integrity: sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==}
+  axios@1.11.0:
+    resolution: {integrity: sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==}
 
   before-after-hook@3.0.2:
     resolution: {integrity: sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==}
@@ -226,8 +244,8 @@ packages:
   fast-content-type-parse@2.0.1:
     resolution: {integrity: sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==}
 
-  follow-redirects@1.15.9:
-    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+  follow-redirects@1.15.11:
+    resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -235,8 +253,8 @@ packages:
       debug:
         optional: true
 
-  form-data@4.0.2:
-    resolution: {integrity: sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==}
+  form-data@4.0.4:
+    resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
     engines: {node: '>= 6'}
 
   function-bind@1.1.2:
@@ -278,8 +296,8 @@ packages:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
 
-  octokit@4.1.2:
-    resolution: {integrity: sha512-0kcTxJOK3yQrJsRb8wKa28hlTze4QOz4sLuUnfXXnhboDhFKgv8LxS86tFwbsafDW9JZ08ByuVAE8kQbYJIZkA==}
+  octokit@4.1.4:
+    resolution: {integrity: sha512-cRvxRte6FU3vAHRC9+PMSY3D+mRAs2Rd9emMoqp70UGRvJRM3sbAoim2IXRZNNsf8wVfn4sGxVBHRAP+JBVX/g==}
     engines: {node: '>= 18'}
 
   proxy-from-env@1.1.0:
@@ -294,182 +312,198 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  undici-types@6.20.0:
-    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
+  undici-types@7.10.0:
+    resolution: {integrity: sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==}
 
-  universal-github-app-jwt@2.2.0:
-    resolution: {integrity: sha512-G5o6f95b5BggDGuUfKDApKaCgNYy2x7OdHY0zSMF081O0EJobw+1130VONhrA7ezGSV2FNOGyM+KQpQZAr9bIQ==}
+  universal-github-app-jwt@2.2.2:
+    resolution: {integrity: sha512-dcmbeSrOdTnsjGjUfAlqNDJrhxXizjAz94ija9Qw8YkZ1uu0d+GoZzyH+Jb9tIIqvGsadUfwg+22k5aDqqwzbw==}
 
-  universal-user-agent@7.0.2:
-    resolution: {integrity: sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==}
+  universal-user-agent@7.0.3:
+    resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==}
 
 snapshots:
 
-  '@octokit/app@15.1.4':
+  '@octokit/app@15.1.6':
     dependencies:
-      '@octokit/auth-app': 7.1.5
-      '@octokit/auth-unauthenticated': 6.1.2
-      '@octokit/core': 6.1.4
+      '@octokit/auth-app': 7.2.2
+      '@octokit/auth-unauthenticated': 6.1.3
+      '@octokit/core': 6.1.6
       '@octokit/oauth-app': 7.1.6
-      '@octokit/plugin-paginate-rest': 11.4.2(@octokit/core@6.1.4)
-      '@octokit/types': 13.8.0
-      '@octokit/webhooks': 13.6.1
+      '@octokit/plugin-paginate-rest': 12.0.0(@octokit/core@6.1.6)
+      '@octokit/types': 14.1.0
+      '@octokit/webhooks': 13.9.1
 
-  '@octokit/auth-app@7.1.5':
+  '@octokit/auth-app@7.2.2':
     dependencies:
-      '@octokit/auth-oauth-app': 8.1.3
-      '@octokit/auth-oauth-user': 5.1.3
-      '@octokit/request': 9.2.2
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/auth-oauth-app': 8.1.4
+      '@octokit/auth-oauth-user': 5.1.6
+      '@octokit/request': 9.2.4
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
       toad-cache: 3.7.0
-      universal-github-app-jwt: 2.2.0
-      universal-user-agent: 7.0.2
+      universal-github-app-jwt: 2.2.2
+      universal-user-agent: 7.0.3
 
-  '@octokit/auth-oauth-app@8.1.3':
+  '@octokit/auth-oauth-app@8.1.4':
     dependencies:
-      '@octokit/auth-oauth-device': 7.1.3
-      '@octokit/auth-oauth-user': 5.1.3
-      '@octokit/request': 9.2.2
-      '@octokit/types': 13.8.0
-      universal-user-agent: 7.0.2
+      '@octokit/auth-oauth-device': 7.1.5
+      '@octokit/auth-oauth-user': 5.1.6
+      '@octokit/request': 9.2.4
+      '@octokit/types': 14.1.0
+      universal-user-agent: 7.0.3
 
-  '@octokit/auth-oauth-device@7.1.3':
+  '@octokit/auth-oauth-device@7.1.5':
     dependencies:
-      '@octokit/oauth-methods': 5.1.4
-      '@octokit/request': 9.2.2
-      '@octokit/types': 13.8.0
-      universal-user-agent: 7.0.2
+      '@octokit/oauth-methods': 5.1.5
+      '@octokit/request': 9.2.4
+      '@octokit/types': 14.1.0
+      universal-user-agent: 7.0.3
 
-  '@octokit/auth-oauth-user@5.1.3':
+  '@octokit/auth-oauth-user@5.1.6':
     dependencies:
-      '@octokit/auth-oauth-device': 7.1.3
-      '@octokit/oauth-methods': 5.1.4
-      '@octokit/request': 9.2.2
-      '@octokit/types': 13.8.0
-      universal-user-agent: 7.0.2
+      '@octokit/auth-oauth-device': 7.1.5
+      '@octokit/oauth-methods': 5.1.5
+      '@octokit/request': 9.2.4
+      '@octokit/types': 14.1.0
+      universal-user-agent: 7.0.3
 
   '@octokit/auth-token@5.1.2': {}
 
-  '@octokit/auth-unauthenticated@6.1.2':
+  '@octokit/auth-unauthenticated@6.1.3':
     dependencies:
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
 
-  '@octokit/core@6.1.4':
+  '@octokit/core@6.1.6':
     dependencies:
       '@octokit/auth-token': 5.1.2
-      '@octokit/graphql': 8.2.1
-      '@octokit/request': 9.2.2
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/graphql': 8.2.2
+      '@octokit/request': 9.2.4
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
       before-after-hook: 3.0.2
-      universal-user-agent: 7.0.2
+      universal-user-agent: 7.0.3
 
-  '@octokit/endpoint@10.1.3':
+  '@octokit/endpoint@10.1.4':
     dependencies:
-      '@octokit/types': 13.8.0
-      universal-user-agent: 7.0.2
+      '@octokit/types': 14.1.0
+      universal-user-agent: 7.0.3
 
-  '@octokit/graphql@8.2.1':
+  '@octokit/graphql@8.2.2':
     dependencies:
-      '@octokit/request': 9.2.2
-      '@octokit/types': 13.8.0
-      universal-user-agent: 7.0.2
+      '@octokit/request': 9.2.4
+      '@octokit/types': 14.1.0
+      universal-user-agent: 7.0.3
 
   '@octokit/oauth-app@7.1.6':
     dependencies:
-      '@octokit/auth-oauth-app': 8.1.3
-      '@octokit/auth-oauth-user': 5.1.3
-      '@octokit/auth-unauthenticated': 6.1.2
-      '@octokit/core': 6.1.4
+      '@octokit/auth-oauth-app': 8.1.4
+      '@octokit/auth-oauth-user': 5.1.6
+      '@octokit/auth-unauthenticated': 6.1.3
+      '@octokit/core': 6.1.6
       '@octokit/oauth-authorization-url': 7.1.1
-      '@octokit/oauth-methods': 5.1.4
-      '@types/aws-lambda': 8.10.147
-      universal-user-agent: 7.0.2
+      '@octokit/oauth-methods': 5.1.5
+      '@types/aws-lambda': 8.10.152
+      universal-user-agent: 7.0.3
 
   '@octokit/oauth-authorization-url@7.1.1': {}
 
-  '@octokit/oauth-methods@5.1.4':
+  '@octokit/oauth-methods@5.1.5':
     dependencies:
       '@octokit/oauth-authorization-url': 7.1.1
-      '@octokit/request': 9.2.2
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/request': 9.2.4
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
 
-  '@octokit/openapi-types@23.0.1': {}
+  '@octokit/openapi-types@24.2.0': {}
 
-  '@octokit/openapi-webhooks-types@9.1.0': {}
+  '@octokit/openapi-types@25.1.0': {}
 
-  '@octokit/plugin-paginate-graphql@5.2.4(@octokit/core@6.1.4)':
+  '@octokit/openapi-webhooks-types@11.0.0': {}
+
+  '@octokit/plugin-paginate-graphql@5.2.4(@octokit/core@6.1.6)':
     dependencies:
-      '@octokit/core': 6.1.4
+      '@octokit/core': 6.1.6
 
-  '@octokit/plugin-paginate-rest@11.4.2(@octokit/core@6.1.4)':
+  '@octokit/plugin-paginate-rest@11.6.0(@octokit/core@6.1.6)':
     dependencies:
-      '@octokit/core': 6.1.4
-      '@octokit/types': 13.8.0
+      '@octokit/core': 6.1.6
+      '@octokit/types': 13.10.0
 
-  '@octokit/plugin-request-log@5.3.1(@octokit/core@6.1.4)':
+  '@octokit/plugin-paginate-rest@12.0.0(@octokit/core@6.1.6)':
     dependencies:
-      '@octokit/core': 6.1.4
+      '@octokit/core': 6.1.6
+      '@octokit/types': 14.1.0
 
-  '@octokit/plugin-rest-endpoint-methods@13.3.1(@octokit/core@6.1.4)':
+  '@octokit/plugin-request-log@5.3.1(@octokit/core@6.1.6)':
     dependencies:
-      '@octokit/core': 6.1.4
-      '@octokit/types': 13.8.0
+      '@octokit/core': 6.1.6
 
-  '@octokit/plugin-retry@7.1.4(@octokit/core@6.1.4)':
+  '@octokit/plugin-rest-endpoint-methods@13.5.0(@octokit/core@6.1.6)':
     dependencies:
-      '@octokit/core': 6.1.4
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/core': 6.1.6
+      '@octokit/types': 13.10.0
+
+  '@octokit/plugin-rest-endpoint-methods@14.0.0(@octokit/core@6.1.6)':
+    dependencies:
+      '@octokit/core': 6.1.6
+      '@octokit/types': 14.1.0
+
+  '@octokit/plugin-retry@7.2.1(@octokit/core@6.1.6)':
+    dependencies:
+      '@octokit/core': 6.1.6
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
       bottleneck: 2.19.5
 
-  '@octokit/plugin-throttling@9.4.0(@octokit/core@6.1.4)':
+  '@octokit/plugin-throttling@10.0.0(@octokit/core@6.1.6)':
     dependencies:
-      '@octokit/core': 6.1.4
-      '@octokit/types': 13.8.0
+      '@octokit/core': 6.1.6
+      '@octokit/types': 14.1.0
       bottleneck: 2.19.5
 
-  '@octokit/request-error@6.1.7':
+  '@octokit/request-error@6.1.8':
     dependencies:
-      '@octokit/types': 13.8.0
+      '@octokit/types': 14.1.0
 
-  '@octokit/request@9.2.2':
+  '@octokit/request@9.2.4':
     dependencies:
-      '@octokit/endpoint': 10.1.3
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/endpoint': 10.1.4
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
       fast-content-type-parse: 2.0.1
-      universal-user-agent: 7.0.2
+      universal-user-agent: 7.0.3
 
   '@octokit/rest@21.1.1':
     dependencies:
-      '@octokit/core': 6.1.4
-      '@octokit/plugin-paginate-rest': 11.4.2(@octokit/core@6.1.4)
-      '@octokit/plugin-request-log': 5.3.1(@octokit/core@6.1.4)
-      '@octokit/plugin-rest-endpoint-methods': 13.3.1(@octokit/core@6.1.4)
+      '@octokit/core': 6.1.6
+      '@octokit/plugin-paginate-rest': 11.6.0(@octokit/core@6.1.6)
+      '@octokit/plugin-request-log': 5.3.1(@octokit/core@6.1.6)
+      '@octokit/plugin-rest-endpoint-methods': 13.5.0(@octokit/core@6.1.6)
 
-  '@octokit/types@13.8.0':
+  '@octokit/types@13.10.0':
     dependencies:
-      '@octokit/openapi-types': 23.0.1
+      '@octokit/openapi-types': 24.2.0
+
+  '@octokit/types@14.1.0':
+    dependencies:
+      '@octokit/openapi-types': 25.1.0
 
   '@octokit/webhooks-methods@5.1.1': {}
 
-  '@octokit/webhooks@13.6.1':
+  '@octokit/webhooks@13.9.1':
     dependencies:
-      '@octokit/openapi-webhooks-types': 9.1.0
-      '@octokit/request-error': 6.1.7
+      '@octokit/openapi-webhooks-types': 11.0.0
+      '@octokit/request-error': 6.1.8
       '@octokit/webhooks-methods': 5.1.1
 
-  '@slack/types@2.14.0': {}
+  '@slack/types@2.16.0': {}
 
-  '@slack/webhook@7.0.5':
+  '@slack/webhook@7.0.6':
     dependencies:
-      '@slack/types': 2.14.0
-      '@types/node': 22.13.13
-      axios: 1.8.4
+      '@slack/types': 2.16.0
+      '@types/node': 24.3.0
+      axios: 1.11.0
     transitivePeerDependencies:
       - debug
 
@@ -477,18 +511,18 @@ snapshots:
 
   '@tsconfig/strictest@2.0.5': {}
 
-  '@types/aws-lambda@8.10.147': {}
+  '@types/aws-lambda@8.10.152': {}
 
-  '@types/node@22.13.13':
+  '@types/node@24.3.0':
     dependencies:
-      undici-types: 6.20.0
+      undici-types: 7.10.0
 
   asynckit@0.4.0: {}
 
-  axios@1.8.4:
+  axios@1.11.0:
     dependencies:
-      follow-redirects: 1.15.9
-      form-data: 4.0.2
+      follow-redirects: 1.15.11
+      form-data: 4.0.4
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
@@ -533,13 +567,14 @@ snapshots:
 
   fast-content-type-parse@2.0.1: {}
 
-  follow-redirects@1.15.9: {}
+  follow-redirects@1.15.11: {}
 
-  form-data@4.0.2:
+  form-data@4.0.4:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       es-set-tostringtag: 2.1.0
+      hasown: 2.0.2
       mime-types: 2.1.35
 
   function-bind@1.1.2: {}
@@ -582,18 +617,19 @@ snapshots:
     dependencies:
       mime-db: 1.52.0
 
-  octokit@4.1.2:
+  octokit@4.1.4:
     dependencies:
-      '@octokit/app': 15.1.4
-      '@octokit/core': 6.1.4
+      '@octokit/app': 15.1.6
+      '@octokit/core': 6.1.6
       '@octokit/oauth-app': 7.1.6
-      '@octokit/plugin-paginate-graphql': 5.2.4(@octokit/core@6.1.4)
-      '@octokit/plugin-paginate-rest': 11.4.2(@octokit/core@6.1.4)
-      '@octokit/plugin-rest-endpoint-methods': 13.3.1(@octokit/core@6.1.4)
-      '@octokit/plugin-retry': 7.1.4(@octokit/core@6.1.4)
-      '@octokit/plugin-throttling': 9.4.0(@octokit/core@6.1.4)
-      '@octokit/request-error': 6.1.7
-      '@octokit/types': 13.8.0
+      '@octokit/plugin-paginate-graphql': 5.2.4(@octokit/core@6.1.6)
+      '@octokit/plugin-paginate-rest': 12.0.0(@octokit/core@6.1.6)
+      '@octokit/plugin-rest-endpoint-methods': 14.0.0(@octokit/core@6.1.6)
+      '@octokit/plugin-retry': 7.2.1(@octokit/core@6.1.6)
+      '@octokit/plugin-throttling': 10.0.0(@octokit/core@6.1.6)
+      '@octokit/request-error': 6.1.8
+      '@octokit/types': 14.1.0
+      '@octokit/webhooks': 13.9.1
 
   proxy-from-env@1.1.0: {}
 
@@ -601,8 +637,8 @@ snapshots:
 
   typescript@5.7.3: {}
 
-  undici-types@6.20.0: {}
+  undici-types@7.10.0: {}
 
-  universal-github-app-jwt@2.2.0: {}
+  universal-github-app-jwt@2.2.2: {}
 
-  universal-user-agent@7.0.2: {}
+  universal-user-agent@7.0.3: {}

From 39d41ed822af014ef28a1499f8313939a641b724 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 31 Aug 2025 13:29:29 +0300
Subject: [PATCH 490/823] Add another entry to show how to hide the Sign In
 button from the interface (#37260)

Release Notes:

- N/A
---
 docs/src/accounts.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/src/accounts.md b/docs/src/accounts.md
index 1ce23cf902..af4c4c172f 100644
--- a/docs/src/accounts.md
+++ b/docs/src/accounts.md
@@ -30,3 +30,8 @@ To sign out of Zed, you can use either of these methods:
 Your Zed account's email address is the address provided by GitHub OAuth. If you have a public email address then it will be used, otherwise your primary GitHub email address will be used. Changes to your email address on GitHub can be synced to your Zed account by [signing in to zed.dev](https://zed.dev/sign_in).
 
 Stripe is used for billing, and will use your Zed account's email address when starting a subscription. Changes to your Zed account email address do not currently update the email address used in Stripe. See [Updating Billing Information](./ai/billing.md#updating-billing-info) for how to change this email address.
+
+## Hiding Sign In button from the interface
+
+In case the Sign In feature is not used, it's possible to hide that from the interface by using `show_sign_in` settings property.
+Refer to [Visual Customization page](./visual-customization.md) for more details.

From babc0c09f0f54c9b5d2df93de4430b0b4cac9e07 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 31 Aug 2025 20:56:23 +0300
Subject: [PATCH 491/823] Add a "mandatory PR contents" section in the
 contribution docs (#37259)

The LLM part is inspired by (and paraphrased from)
https://github.com/ghostty-org/ghostty?tab=contributing-ov-file#ai-assistance-notice

Release Notes:

- N/A
---
 CONTRIBUTING.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 91b1b75f82..dd5bbdc2e1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,6 +27,22 @@ By effectively engaging with the Zed team and community early in your process, w
 
 We plan to set aside time each week to pair program with contributors on promising pull requests in Zed. This will be an experiment. We tend to prefer pairing over async code review on our team, and we'd like to see how well it works in an open source setting. If we're finding it difficult to get on the same page with async review, we may ask you to pair with us if you're open to it. The closer a contribution is to the goals outlined in our roadmap, the more likely we'll be to spend time pairing on it.
 
+## Mandatory PR contents
+
+Please ensure the PR contains
+
+- Before & after screenshots, if there are visual adjustments introduced.
+
+Examples of visual adjustments: tree-sitter query updates, UI changes, etc.
+
+- A disclosure of the AI assistance usage, if any was used.
+
+Any kind of AI assistance must be disclosed in the PR, along with the extent to which AI assistance was used (e.g. docs only vs. code generation).
+
+If the PR responses are being generated by an AI, disclose that as well.
+
+As a small exception, trivial tab-completion doesn't need to be disclosed, as long as it's limited to single keywords or short phrases.
+
 ## Tips to improve the chances of your PR getting reviewed and merged
 
 - Discuss your plans ahead of time with the team

From e48be30266a836640d74fbda086041863e35cc47 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Sun, 31 Aug 2025 20:39:26 +0200
Subject: [PATCH 492/823] vim: Fix `NormalBefore` with completions shown
 (#37272)

Follow-up to https://github.com/zed-industries/zed/pull/35985

The `!menu` is actually not needed and breaks other keybinds from that
context.

Release Notes:

- N/A
---
 assets/keymaps/vim.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index bd6eb3982c..fd33b888b7 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -324,7 +324,7 @@
     }
   },
   {
-    "context": "vim_mode == insert && !menu",
+    "context": "vim_mode == insert",
     "bindings": {
       "ctrl-c": "vim::NormalBefore",
       "ctrl-[": "vim::NormalBefore",

From 9c8c3966dfc2089d7ff340f2b5c0842e638b7344 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Sun, 31 Aug 2025 15:57:24 -0400
Subject: [PATCH 493/823] linux: Support ctrl-insert in markdown previews
 (#37273)

Closes: https://github.com/zed-industries/zed/issues/37240

Release Notes:

- Added support for copying in Markdown preview using `ctrl-insert` on Linux/Windows
---
 assets/keymaps/default-linux.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 2610f9b705..a60dc92844 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -170,6 +170,7 @@
     "context": "Markdown",
     "bindings": {
       "copy": "markdown::Copy",
+      "ctrl-insert": "markdown::Copy",
       "ctrl-c": "markdown::Copy"
     }
   },
@@ -258,6 +259,7 @@
     "context": "AgentPanel > Markdown",
     "bindings": {
       "copy": "markdown::CopyAsMarkdown",
+      "ctrl-insert": "markdown::CopyAsMarkdown",
       "ctrl-c": "markdown::CopyAsMarkdown"
     }
   },

From 5abc398a0a1f486ba16743919a45955e721c9221 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Sun, 31 Aug 2025 23:09:09 +0200
Subject: [PATCH 494/823] nix: Update flake, remove legacy Darwin SDK usage
 (#37254)

`darwin.apple_sdk.frameworks` has been obsoleted and is no longer
required to be specified explicitly as per [Nixpkgs Reference
Manual](https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks).

@P1n3appl3 not sure what the process for updating Nix is, so lemme know
if this is desired/acceptable!

Release Notes:

- N/A
---
 flake.lock    | 18 +++++++++---------
 nix/build.nix |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 80022f7b55..d96f0a998f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1754269165,
-        "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
+        "lastModified": 1755993354,
+        "narHash": "sha256-FCRRAzSaL/+umLIm3RU3O/+fJ2ssaPHseI2SSFL8yZU=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "444e81206df3f7d92780680e45858e31d2f07a08",
+        "rev": "25bd41b24426c7734278c2ff02e53258851db914",
         "type": "github"
       },
       "original": {
@@ -33,10 +33,10 @@
     "nixpkgs": {
       "locked": {
         "lastModified": 315532800,
-        "narHash": "sha256-5VYevX3GccubYeccRGAXvCPA1ktrGmIX1IFC0icX07g=",
-        "rev": "a683adc19ff5228af548c6539dbc3440509bfed3",
+        "narHash": "sha256-E8CyvVDZuIsF7puIw+OLkrFmhj3qUV+iwPcNbBhdcxM=",
+        "rev": "a918bb3594dd243c2f8534b3be01b3cb4ed35fd1",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre840248.a683adc19ff5/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre854010.a918bb3594dd/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754575663,
-        "narHash": "sha256-afOx8AG0KYtw7mlt6s6ahBBy7eEHZwws3iCRoiuRQS4=",
+        "lastModified": 1756607787,
+        "narHash": "sha256-ciwAdgtlAN1PCaidWK6RuWsTBL8DVuyDCGM+X3ein5Q=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6db0fb0e9cec2e9729dc52bf4898e6c135bb8a0f",
+        "rev": "f46d294b87ebb9f7124f1ce13aa2a5f5acc0f3eb",
         "type": "github"
       },
       "original": {
diff --git a/nix/build.nix b/nix/build.nix
index 03403cc1c9..9012a47c1f 100644
--- a/nix/build.nix
+++ b/nix/build.nix
@@ -145,7 +145,6 @@ let
         ]
         ++ lib.optionals stdenv'.hostPlatform.isDarwin [
           apple-sdk_15
-          darwin.apple_sdk.frameworks.System
           (darwinMinVersionHook "10.15")
         ];
 

From d74384f6e2a1d0b04f7788883d1b599e7e0b85fa Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Mon, 1 Sep 2025 00:42:57 +0300
Subject: [PATCH 495/823] anthropic: Remove logging when no credentials are
 available (#37276)

Removes excess log which got through on each start of Zed
```
ERROR [agent_ui::language_model_selector] Failed to authenticate provider: Anthropic: credentials not found
```

The `AnthropicLanguageModelProvider::api_key` method returned a
`anyhow::Result` which would convert
`AuthenticateError::CredentialsNotFound` into a generic error because of
the implicit `Into` when using the `?` operator. This would then get
converted into a `AuthenticateError::Other` later.

By specifying the error type as `AuthenticateError`, we remove this
implicit conversion and the log gets removed.

Release Notes:

- N/A
---
 crates/language_models/src/provider/anthropic.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index c492edeaf5..6c003c4c39 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -197,7 +197,7 @@ impl AnthropicLanguageModelProvider {
         })
     }
 
-    pub fn api_key(cx: &mut App) -> Task<Result<ApiKey>> {
+    pub fn api_key(cx: &mut App) -> Task<Result<ApiKey, AuthenticateError>> {
         let credentials_provider = <dyn CredentialsProvider>::global(cx);
         let api_url = AllLanguageModelSettings::get_global(cx)
             .anthropic

From c833f8905bbe63955b34d69c2fb3eca42aa6c17e Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Mon, 1 Sep 2025 04:21:17 +0530
Subject: [PATCH 496/823] language_models: Fix `grok-code-fast-1` support for
 Copilot (#37116)

This PR fixes a deserialization issue in GitHub Copilot Chat that was
causing warnings when encountering xAI models from the GitHub Copilot
API and skipping the Grok model from model selector.

Release Notes:

- Fixed support for xAI models that are now available through GitHub
Copilot Chat.
---
 crates/copilot/src/copilot_chat.rs                  |  2 ++
 crates/language_models/src/provider/copilot_chat.rs | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/copilot/src/copilot_chat.rs b/crates/copilot/src/copilot_chat.rs
index bfddba0e2f..9b9d6e19b8 100644
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -164,6 +164,8 @@ pub enum ModelVendor {
     OpenAI,
     Google,
     Anthropic,
+    #[serde(rename = "xAI")]
+    XAI,
 }
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index d48c12aa4b..bd284eb72b 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -32,6 +32,8 @@ use std::time::Duration;
 use ui::prelude::*;
 use util::debug_panic;
 
+use crate::provider::x_ai::count_xai_tokens;
+
 use super::anthropic::count_anthropic_tokens;
 use super::google::count_google_tokens;
 use super::open_ai::count_open_ai_tokens;
@@ -228,7 +230,9 @@ impl LanguageModel for CopilotChatLanguageModel {
             ModelVendor::OpenAI | ModelVendor::Anthropic => {
                 LanguageModelToolSchemaFormat::JsonSchema
             }
-            ModelVendor::Google => LanguageModelToolSchemaFormat::JsonSchemaSubset,
+            ModelVendor::Google | ModelVendor::XAI => {
+                LanguageModelToolSchemaFormat::JsonSchemaSubset
+            }
         }
     }
 
@@ -256,6 +260,10 @@ impl LanguageModel for CopilotChatLanguageModel {
         match self.model.vendor() {
             ModelVendor::Anthropic => count_anthropic_tokens(request, cx),
             ModelVendor::Google => count_google_tokens(request, cx),
+            ModelVendor::XAI => {
+                let model = x_ai::Model::from_id(self.model.id()).unwrap_or_default();
+                count_xai_tokens(request, model, cx)
+            }
             ModelVendor::OpenAI => {
                 let model = open_ai::Model::from_id(self.model.id()).unwrap_or_default();
                 count_open_ai_tokens(request, model, cx)

From 129bff83585f79e77a72e787728bcd000eeca679 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Sun, 31 Aug 2025 19:52:43 -0400
Subject: [PATCH 497/823] agent: Make it so delete_path tool needs user
 confirmation (#37191)

Closes https://github.com/zed-industries/zed/issues/37048

Release Notes:

- agent: Make delete_path tool require user confirmation by default
---
 crates/assistant_tools/src/delete_path_tool.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/assistant_tools/src/delete_path_tool.rs b/crates/assistant_tools/src/delete_path_tool.rs
index b181eeff5c..7c85f1ed75 100644
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -35,7 +35,7 @@ impl Tool for DeletePathTool {
     }
 
     fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
-        false
+        true
     }
 
     fn may_perform_edits(&self) -> bool {

From f290daf7eac29a1aafa89be1074b76feb78acebb Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Sun, 31 Aug 2025 20:08:17 -0400
Subject: [PATCH 498/823] docs: Improve Bedrock suggested IAM policy (#37278)

Closes https://github.com/zed-industries/zed/issues/37251

H/T: @brandon-fryslie

Release Notes:

- N/A
---
 docs/src/ai/llm-providers.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/src/ai/llm-providers.md b/docs/src/ai/llm-providers.md
index 5ef6081421..ecc4cb004b 100644
--- a/docs/src/ai/llm-providers.md
+++ b/docs/src/ai/llm-providers.md
@@ -40,7 +40,6 @@ Ensure your credentials have the following permissions set up:
 
 - `bedrock:InvokeModelWithResponseStream`
 - `bedrock:InvokeModel`
-- `bedrock:ConverseStream`
 
 Your IAM policy should look similar to:
 
@@ -52,8 +51,7 @@ Your IAM policy should look similar to:
       "Effect": "Allow",
       "Action": [
         "bedrock:InvokeModel",
-        "bedrock:InvokeModelWithResponseStream",
-        "bedrock:ConverseStream"
+        "bedrock:InvokeModelWithResponseStream"
       ],
       "Resource": "*"
     }

From a852bcc09410b47dcabbe9b089725777024d125e Mon Sep 17 00:00:00 2001
From: Gaauwe Rombouts <gromdroid@gmail.com>
Date: Mon, 1 Sep 2025 02:24:00 +0200
Subject: [PATCH 499/823] Improve system window tabs visibility (#37244)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow up of https://github.com/zed-industries/zed/pull/33334

After chatting with @MrSubidubi we found out that he had an old defaults
setting (most likely from when he encountered a previous window tabbing
bug):
```
❯ defaults read dev.zed.Zed-Nightly
{
    NSNavPanelExpandedSizeForOpenMode = "{800, 448}";
    NSNavPanelExpandedSizeForSaveMode = "{800, 448}";
    NSNavPanelExpandedStateForSaveMode = 1;
    NSOSPLastRootDirectory = {length = 828, bytes = 0x626f6f6b 3c030000 00000410 30000000 ... dc010000 00000000 };
    "NSWindow Frame NSNavPanelAutosaveName" = "557 1726 800 448 -323 982 2560 1440 ";
    "NSWindowTabbingShoudShowTabBarKey-GPUIWindow-GPUIWindow-(null)-HT-FS" = 1;
}
```

> That suffix is AppKit’s fallback autosave name when no tabbing
identifier is set. It encodes the NSWindow subclass (GPUIWindow), plus
traits like HT (hidden titlebar) and FS (fullscreen).

Which explains why it only happened on the Nightly build, since each
bundle has it's own defaults. It also explains why the tabbar would
disappear when he activated the `use_system_window_tabs` setting,
because with that setting activated, the tabbing identifier becomes
"zed" (instead of the default one when omitted) for which he didn't have
the `NSWindowTabbingShoudShowTabBarKey` default.

The original implementation was perhaps a bit naive and relied fully on
macOS to determine if the tabbar should be shown. I've updated the code
to always hide the tabbar, if the setting is turned off and there is
only 1 tab entry.

While testing, I also noticed that the menu's like 'merge all windows'
wouldn't become active when the setting was turned on, only after a full
workspace reload. So I added a setting observer as well, to immediately
set the correct window properties to enable all the features without a
reload.

Release Notes:

- N/A
---
 crates/gpui/src/platform.rs                |  1 +
 crates/gpui/src/platform/mac/window.rs     | 21 ++++++++++
 crates/gpui/src/window.rs                  |  7 ++++
 crates/title_bar/src/system_window_tabs.rs | 49 ++++++++++++++++++++--
 crates/zed/src/main.rs                     |  2 +-
 5 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index eb1d738143..d3425c8835 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -522,6 +522,7 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn merge_all_windows(&self) {}
     fn move_tab_to_new_window(&self) {}
     fn toggle_window_tab_overview(&self) {}
+    fn set_tabbing_identifier(&self, _identifier: Option<String>) {}
 
     #[cfg(target_os = "windows")]
     fn get_raw_handle(&self) -> windows::HWND;
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 0262cbb121..686cfb314e 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -781,6 +781,8 @@ impl MacWindow {
                     if let Some(tabbing_identifier) = tabbing_identifier {
                         let tabbing_id = NSString::alloc(nil).init_str(tabbing_identifier.as_str());
                         let _: () = msg_send![native_window, setTabbingIdentifier: tabbing_id];
+                    } else {
+                        let _: () = msg_send![native_window, setTabbingIdentifier:nil];
                     }
                 }
                 WindowKind::PopUp => {
@@ -1018,6 +1020,25 @@ impl PlatformWindow for MacWindow {
         }
     }
 
+    fn set_tabbing_identifier(&self, tabbing_identifier: Option<String>) {
+        let native_window = self.0.lock().native_window;
+        unsafe {
+            let allows_automatic_window_tabbing = tabbing_identifier.is_some();
+            if allows_automatic_window_tabbing {
+                let () = msg_send![class!(NSWindow), setAllowsAutomaticWindowTabbing: YES];
+            } else {
+                let () = msg_send![class!(NSWindow), setAllowsAutomaticWindowTabbing: NO];
+            }
+
+            if let Some(tabbing_identifier) = tabbing_identifier {
+                let tabbing_id = NSString::alloc(nil).init_str(tabbing_identifier.as_str());
+                let _: () = msg_send![native_window, setTabbingIdentifier: tabbing_id];
+            } else {
+                let _: () = msg_send![native_window, setTabbingIdentifier:nil];
+            }
+        }
+    }
+
     fn scale_factor(&self) -> f32 {
         self.0.as_ref().lock().scale_factor()
     }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 4504f51255..c2719665d4 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -4390,6 +4390,13 @@ impl Window {
         self.platform_window.toggle_window_tab_overview()
     }
 
+    /// Sets the tabbing identifier for the window.
+    /// This is macOS specific.
+    pub fn set_tabbing_identifier(&self, tabbing_identifier: Option<String>) {
+        self.platform_window
+            .set_tabbing_identifier(tabbing_identifier)
+    }
+
     /// Toggles the inspector mode on this window.
     #[cfg(any(feature = "inspector", debug_assertions))]
     pub fn toggle_inspector(&mut self, cx: &mut App) {
diff --git a/crates/title_bar/src/system_window_tabs.rs b/crates/title_bar/src/system_window_tabs.rs
index cc50fbc2b9..ba898da716 100644
--- a/crates/title_bar/src/system_window_tabs.rs
+++ b/crates/title_bar/src/system_window_tabs.rs
@@ -1,4 +1,4 @@
-use settings::Settings;
+use settings::{Settings, SettingsStore};
 
 use gpui::{
     AnyWindowHandle, Context, Hsla, InteractiveElement, MouseButton, ParentElement, ScrollHandle,
@@ -11,7 +11,7 @@ use ui::{
     LabelSize, Tab, h_flex, prelude::*, right_click_menu,
 };
 use workspace::{
-    CloseWindow, ItemSettings, Workspace,
+    CloseWindow, ItemSettings, Workspace, WorkspaceSettings,
     item::{ClosePosition, ShowCloseButton},
 };
 
@@ -53,6 +53,46 @@ impl SystemWindowTabs {
     }
 
     pub fn init(cx: &mut App) {
+        let mut was_use_system_window_tabs =
+            WorkspaceSettings::get_global(cx).use_system_window_tabs;
+
+        cx.observe_global::<SettingsStore>(move |cx| {
+            let use_system_window_tabs = WorkspaceSettings::get_global(cx).use_system_window_tabs;
+            if use_system_window_tabs == was_use_system_window_tabs {
+                return;
+            }
+            was_use_system_window_tabs = use_system_window_tabs;
+
+            let tabbing_identifier = if use_system_window_tabs {
+                Some(String::from("zed"))
+            } else {
+                None
+            };
+
+            if use_system_window_tabs {
+                SystemWindowTabController::init(cx);
+            }
+
+            cx.windows().iter().for_each(|handle| {
+                let _ = handle.update(cx, |_, window, cx| {
+                    window.set_tabbing_identifier(tabbing_identifier.clone());
+                    if use_system_window_tabs {
+                        let tabs = if let Some(tabs) = window.tabbed_windows() {
+                            tabs
+                        } else {
+                            vec![SystemWindowTab::new(
+                                SharedString::from(window.window_title()),
+                                window.window_handle(),
+                            )]
+                        };
+
+                        SystemWindowTabController::add_tab(cx, handle.window_id(), tabs);
+                    }
+                });
+            });
+        })
+        .detach();
+
         cx.observe_new(|workspace: &mut Workspace, _, _| {
             workspace.register_action_renderer(|div, _, window, cx| {
                 let window_id = window.window_handle().window_id();
@@ -336,6 +376,7 @@ impl SystemWindowTabs {
 
 impl Render for SystemWindowTabs {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let use_system_window_tabs = WorkspaceSettings::get_global(cx).use_system_window_tabs;
         let active_background_color = cx.theme().colors().title_bar_background;
         let inactive_background_color = cx.theme().colors().tab_bar_background;
         let entity = cx.entity();
@@ -368,7 +409,9 @@ impl Render for SystemWindowTabs {
             .collect::<Vec<_>>();
 
         let number_of_tabs = tab_items.len().max(1);
-        if !window.tab_bar_visible() && !visible {
+        if (!window.tab_bar_visible() && !visible)
+            || (!use_system_window_tabs && number_of_tabs == 1)
+        {
             return h_flex().into_any_element();
         }
 
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 79cf2bfa66..d1d221fb37 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -955,7 +955,7 @@ async fn installation_id() -> Result<IdType> {
 async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp) -> Result<()> {
     if let Some(locations) = restorable_workspace_locations(cx, &app_state).await {
         let use_system_window_tabs = cx
-            .update(|cx| WorkspaceSettings::get(None, cx).use_system_window_tabs)
+            .update(|cx| WorkspaceSettings::get_global(cx).use_system_window_tabs)
             .unwrap_or(false);
         let mut results: Vec<Result<(), Error>> = Vec::new();
         let mut tasks = Vec::new();

From 62083fe7963dd5bed4579bb12abac1b7800cdbaa Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 1 Sep 2025 09:49:52 +0200
Subject: [PATCH 500/823] gpui: Do not render ligatures between different
 styled text runs (#37175)

Currently when we render text with differing styles adjacently we might
form a ligature between the text, causing the ligature forming
characters to take on one of the two styles. This can especially become
confusing when a ligature is formed between actual text and inlay hints.

Annoyingly, the only ways to prevent this with core text is to either
render each run separately, or to insert a zero-width non-joiner to
force core text to break the ligatures apart, as it otherwise will merge
subsequent font runs of the same fonts.

We currently do layouting on a per line basis and it is unlikely we want
to change that as it would incur a lot of complexity and annoyances to
merge things back into a line, so this goes with the other approach of
inserting ZWNJ characters instead.

Note that neither linux nor windows seem to currently render ligatures,
so this only concerns macOS rendering at the moment.

Release Notes:

- Fixed ligatures forming between real text and inlay hints on macOS
---
 crates/gpui/src/platform/mac/text_system.rs | 168 ++++++++++++++++----
 crates/gpui/src/text_system.rs              | 102 +++++++-----
 crates/gpui/src/text_system/line_layout.rs  |  15 +-
 3 files changed, 204 insertions(+), 81 deletions(-)

diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index 72a0f2e565..ba7017b58f 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -43,7 +43,7 @@ use pathfinder_geometry::{
     vector::{Vector2F, Vector2I},
 };
 use smallvec::SmallVec;
-use std::{borrow::Cow, char, cmp, convert::TryFrom, sync::Arc};
+use std::{borrow::Cow, char, convert::TryFrom, sync::Arc};
 
 use super::open_type::apply_features_and_fallbacks;
 
@@ -67,6 +67,7 @@ struct MacTextSystemState {
     font_ids_by_postscript_name: HashMap<String, FontId>,
     font_ids_by_font_key: HashMap<FontKey, SmallVec<[FontId; 4]>>,
     postscript_names_by_font_id: HashMap<FontId, String>,
+    zwnjs_scratch_space: Vec<(usize, usize)>,
 }
 
 impl MacTextSystem {
@@ -79,6 +80,7 @@ impl MacTextSystem {
             font_ids_by_postscript_name: HashMap::default(),
             font_ids_by_font_key: HashMap::default(),
             postscript_names_by_font_id: HashMap::default(),
+            zwnjs_scratch_space: Vec::new(),
         }))
     }
 }
@@ -424,29 +426,41 @@ impl MacTextSystemState {
     }
 
     fn layout_line(&mut self, text: &str, font_size: Pixels, font_runs: &[FontRun]) -> LineLayout {
+        const ZWNJ: char = '\u{200C}';
+        const ZWNJ_STR: &str = "\u{200C}";
+        const ZWNJ_SIZE_16: usize = ZWNJ.len_utf16();
+
+        self.zwnjs_scratch_space.clear();
         // Construct the attributed string, converting UTF8 ranges to UTF16 ranges.
         let mut string = CFMutableAttributedString::new();
+
         {
-            string.replace_str(&CFString::new(text), CFRange::init(0, 0));
-            let utf16_line_len = string.char_len() as usize;
-
-            let mut ix_converter = StringIndexConverter::new(text);
+            let mut ix_converter = StringIndexConverter::new(&text);
+            let mut last_font_run = None;
             for run in font_runs {
-                let utf8_end = ix_converter.utf8_ix + run.len;
-                let utf16_start = ix_converter.utf16_ix;
+                let text = &text[ix_converter.utf8_ix..][..run.len];
+                // if the fonts are the same, we need to disconnect the text with a ZWNJ
+                // to prevent core text from forming ligatures between them
+                let needs_zwnj = last_font_run.replace(run.font_id) == Some(run.font_id);
 
-                if utf16_start >= utf16_line_len {
-                    break;
+                let n_zwnjs = self.zwnjs_scratch_space.len();
+                let utf16_start = ix_converter.utf16_ix + n_zwnjs * ZWNJ_SIZE_16;
+                ix_converter.advance_to_utf8_ix(ix_converter.utf8_ix + run.len);
+
+                string.replace_str(&CFString::new(text), CFRange::init(utf16_start as isize, 0));
+                if needs_zwnj {
+                    let zwnjs_pos = string.char_len();
+                    self.zwnjs_scratch_space.push((n_zwnjs, zwnjs_pos as usize));
+                    string.replace_str(
+                        &CFString::from_static_string(ZWNJ_STR),
+                        CFRange::init(zwnjs_pos, 0),
+                    );
                 }
-
-                ix_converter.advance_to_utf8_ix(utf8_end);
-                let utf16_end = cmp::min(ix_converter.utf16_ix, utf16_line_len);
+                let utf16_end = string.char_len() as usize;
 
                 let cf_range =
                     CFRange::init(utf16_start as isize, (utf16_end - utf16_start) as isize);
-
-                let font: &FontKitFont = &self.fonts[run.font_id.0];
-
+                let font = &self.fonts[run.font_id.0];
                 unsafe {
                     string.set_attribute(
                         cf_range,
@@ -454,17 +468,12 @@ impl MacTextSystemState {
                         &font.native_font().clone_with_font_size(font_size.into()),
                     );
                 }
-
-                if utf16_end == utf16_line_len {
-                    break;
-                }
             }
         }
-
         // Retrieve the glyphs from the shaped line, converting UTF16 offsets to UTF8 offsets.
         let line = CTLine::new_with_attributed_string(string.as_concrete_TypeRef());
         let glyph_runs = line.glyph_runs();
-        let mut runs = Vec::with_capacity(glyph_runs.len() as usize);
+        let mut runs = <Vec<ShapedRun>>::with_capacity(glyph_runs.len() as usize);
         let mut ix_converter = StringIndexConverter::new(text);
         for run in glyph_runs.into_iter() {
             let attributes = run.attributes().unwrap();
@@ -476,28 +485,44 @@ impl MacTextSystemState {
             };
             let font_id = self.id_for_native_font(font);
 
-            let mut glyphs = Vec::with_capacity(run.glyph_count().try_into().unwrap_or(0));
-            for ((glyph_id, position), glyph_utf16_ix) in run
+            let mut glyphs = match runs.last_mut() {
+                Some(run) if run.font_id == font_id => &mut run.glyphs,
+                _ => {
+                    runs.push(ShapedRun {
+                        font_id,
+                        glyphs: Vec::with_capacity(run.glyph_count().try_into().unwrap_or(0)),
+                    });
+                    &mut runs.last_mut().unwrap().glyphs
+                }
+            };
+            for ((&glyph_id, position), &glyph_utf16_ix) in run
                 .glyphs()
                 .iter()
                 .zip(run.positions().iter())
                 .zip(run.string_indices().iter())
             {
-                let glyph_utf16_ix = usize::try_from(*glyph_utf16_ix).unwrap();
+                let mut glyph_utf16_ix = usize::try_from(glyph_utf16_ix).unwrap();
+                let r = self
+                    .zwnjs_scratch_space
+                    .binary_search_by(|&(_, it)| it.cmp(&glyph_utf16_ix));
+                match r {
+                    // this glyph is a ZWNJ, skip it
+                    Ok(_) => continue,
+                    // adjust the index to account for the ZWNJs we've inserted
+                    Err(idx) => glyph_utf16_ix -= idx * ZWNJ_SIZE_16,
+                }
                 if ix_converter.utf16_ix > glyph_utf16_ix {
                     // We cannot reuse current index converter, as it can only seek forward. Restart the search.
                     ix_converter = StringIndexConverter::new(text);
                 }
                 ix_converter.advance_to_utf16_ix(glyph_utf16_ix);
                 glyphs.push(ShapedGlyph {
-                    id: GlyphId(*glyph_id as u32),
+                    id: GlyphId(glyph_id as u32),
                     position: point(position.x as f32, position.y as f32).map(px),
                     index: ix_converter.utf8_ix,
                     is_emoji: self.is_emoji(font_id),
                 });
             }
-
-            runs.push(ShapedRun { font_id, glyphs });
         }
         let typographic_bounds = line.get_typographic_bounds();
         LineLayout {
@@ -696,4 +721,93 @@ mod tests {
         // There's no glyph for \u{feff}
         assert_eq!(layout.runs[0].glyphs[1].id, GlyphId(69u32)); // b
     }
+
+    #[test]
+    fn test_layout_line_zwnj_insertion() {
+        let fonts = MacTextSystem::new();
+        let font_id = fonts.font_id(&font("Helvetica")).unwrap();
+
+        let text = "hello world";
+        let font_runs = &[
+            FontRun { font_id, len: 5 }, // "hello"
+            FontRun { font_id, len: 6 }, // " world"
+        ];
+
+        let layout = fonts.layout_line(text, px(16.), font_runs);
+        assert_eq!(layout.len, text.len());
+
+        for run in &layout.runs {
+            for glyph in &run.glyphs {
+                assert!(
+                    glyph.index < text.len(),
+                    "Glyph index {} is out of bounds for text length {}",
+                    glyph.index,
+                    text.len()
+                );
+            }
+        }
+
+        // Test with different font runs - should not insert ZWNJ
+        let font_id2 = fonts.font_id(&font("Times")).unwrap_or(font_id);
+        let font_runs_different = &[
+            FontRun { font_id, len: 5 }, // "hello"
+            // " world"
+            FontRun {
+                font_id: font_id2,
+                len: 6,
+            },
+        ];
+
+        let layout2 = fonts.layout_line(text, px(16.), font_runs_different);
+        assert_eq!(layout2.len, text.len());
+
+        for run in &layout2.runs {
+            for glyph in &run.glyphs {
+                assert!(
+                    glyph.index < text.len(),
+                    "Glyph index {} is out of bounds for text length {}",
+                    glyph.index,
+                    text.len()
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_layout_line_zwnj_edge_cases() {
+        let fonts = MacTextSystem::new();
+        let font_id = fonts.font_id(&font("Helvetica")).unwrap();
+
+        let text = "hello";
+        let font_runs = &[FontRun { font_id, len: 5 }];
+        let layout = fonts.layout_line(text, px(16.), font_runs);
+        assert_eq!(layout.len, text.len());
+
+        let text = "abc";
+        let font_runs = &[
+            FontRun { font_id, len: 1 }, // "a"
+            FontRun { font_id, len: 1 }, // "b"
+            FontRun { font_id, len: 1 }, // "c"
+        ];
+        let layout = fonts.layout_line(text, px(16.), font_runs);
+        assert_eq!(layout.len, text.len());
+
+        for run in &layout.runs {
+            for glyph in &run.glyphs {
+                assert!(
+                    glyph.index < text.len(),
+                    "Glyph index {} is out of bounds for text length {}",
+                    glyph.index,
+                    text.len()
+                );
+            }
+        }
+
+        // Test with empty text
+        let text = "";
+        let font_runs = &[];
+        let layout = fonts.layout_line(text, px(16.), font_runs);
+        assert_eq!(layout.len, 0);
+        assert!(layout.runs.is_empty());
+    }
 }
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 53991089da..be34b9e2aa 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -413,9 +413,10 @@ impl WindowTextSystem {
         let mut wrapped_lines = 0;
 
         let mut process_line = |line_text: SharedString| {
+            font_runs.clear();
             let line_end = line_start + line_text.len();
 
-            let mut last_font: Option<Font> = None;
+            let mut last_font: Option<FontId> = None;
             let mut decoration_runs = SmallVec::<[DecorationRun; 32]>::new();
             let mut run_start = line_start;
             while run_start < line_end {
@@ -425,23 +426,14 @@ impl WindowTextSystem {
 
                 let run_len_within_line = cmp::min(line_end, run_start + run.len) - run_start;
 
-                if last_font == Some(run.font.clone()) {
-                    font_runs.last_mut().unwrap().len += run_len_within_line;
-                } else {
-                    last_font = Some(run.font.clone());
-                    font_runs.push(FontRun {
-                        len: run_len_within_line,
-                        font_id: self.resolve_font(&run.font),
-                    });
-                }
-
-                if decoration_runs.last().is_some_and(|last_run| {
-                    last_run.color == run.color
-                        && last_run.underline == run.underline
-                        && last_run.strikethrough == run.strikethrough
-                        && last_run.background_color == run.background_color
-                }) {
-                    decoration_runs.last_mut().unwrap().len += run_len_within_line as u32;
+                let decoration_changed = if let Some(last_run) = decoration_runs.last_mut()
+                    && last_run.color == run.color
+                    && last_run.underline == run.underline
+                    && last_run.strikethrough == run.strikethrough
+                    && last_run.background_color == run.background_color
+                {
+                    last_run.len += run_len_within_line as u32;
+                    false
                 } else {
                     decoration_runs.push(DecorationRun {
                         len: run_len_within_line as u32,
@@ -450,6 +442,21 @@ impl WindowTextSystem {
                         underline: run.underline,
                         strikethrough: run.strikethrough,
                     });
+                    true
+                };
+
+                if let Some(font_run) = font_runs.last_mut()
+                    && Some(font_run.font_id) == last_font
+                    && !decoration_changed
+                {
+                    font_run.len += run_len_within_line;
+                } else {
+                    let font_id = self.resolve_font(&run.font);
+                    last_font = Some(font_id);
+                    font_runs.push(FontRun {
+                        len: run_len_within_line,
+                        font_id,
+                    });
                 }
 
                 if run_len_within_line == run.len {
@@ -484,8 +491,6 @@ impl WindowTextSystem {
                     runs.next();
                 }
             }
-
-            font_runs.clear();
         };
 
         let mut split_lines = text.split('\n');
@@ -519,37 +524,54 @@ impl WindowTextSystem {
     /// Subsets of the line can be styled independently with the `runs` parameter.
     /// Generally, you should prefer to use `TextLayout::shape_line` instead, which
     /// can be painted directly.
-    pub fn layout_line<Text>(
+    pub fn layout_line(
         &self,
-        text: Text,
+        text: &str,
         font_size: Pixels,
         runs: &[TextRun],
         force_width: Option<Pixels>,
-    ) -> Arc<LineLayout>
-    where
-        Text: AsRef<str>,
-        SharedString: From<Text>,
-    {
+    ) -> Arc<LineLayout> {
+        let mut last_run = None::<&TextRun>;
+        let mut last_font: Option<FontId> = None;
         let mut font_runs = self.font_runs_pool.lock().pop().unwrap_or_default();
+        font_runs.clear();
+
         for run in runs.iter() {
-            let font_id = self.resolve_font(&run.font);
-            if let Some(last_run) = font_runs.last_mut()
-                && last_run.font_id == font_id
+            let decoration_changed = if let Some(last_run) = last_run
+                && last_run.color == run.color
+                && last_run.underline == run.underline
+                && last_run.strikethrough == run.strikethrough
+            // we do not consider differing background color relevant, as it does not affect glyphs
+            // && last_run.background_color == run.background_color
             {
-                last_run.len += run.len;
-                continue;
+                false
+            } else {
+                last_run = Some(run);
+                true
+            };
+
+            if let Some(font_run) = font_runs.last_mut()
+                && Some(font_run.font_id) == last_font
+                && !decoration_changed
+            {
+                font_run.len += run.len;
+            } else {
+                let font_id = self.resolve_font(&run.font);
+                last_font = Some(font_id);
+                font_runs.push(FontRun {
+                    len: run.len,
+                    font_id,
+                });
             }
-            font_runs.push(FontRun {
-                len: run.len,
-                font_id,
-            });
         }
 
-        let layout =
-            self.line_layout_cache
-                .layout_line_internal(text, font_size, &font_runs, force_width);
+        let layout = self.line_layout_cache.layout_line(
+            &SharedString::new(text),
+            font_size,
+            &font_runs,
+            force_width,
+        );
 
-        font_runs.clear();
         self.font_runs_pool.lock().push(font_runs);
 
         layout
diff --git a/crates/gpui/src/text_system/line_layout.rs b/crates/gpui/src/text_system/line_layout.rs
index 43694702a8..4ac1d25897 100644
--- a/crates/gpui/src/text_system/line_layout.rs
+++ b/crates/gpui/src/text_system/line_layout.rs
@@ -501,7 +501,7 @@ impl LineLayoutCache {
         } else {
             drop(current_frame);
             let text = SharedString::from(text);
-            let unwrapped_layout = self.layout_line::<&SharedString>(&text, font_size, runs);
+            let unwrapped_layout = self.layout_line::<&SharedString>(&text, font_size, runs, None);
             let wrap_boundaries = if let Some(wrap_width) = wrap_width {
                 unwrapped_layout.compute_wrap_boundaries(text.as_ref(), wrap_width, max_lines)
             } else {
@@ -535,19 +535,6 @@ impl LineLayoutCache {
         text: Text,
         font_size: Pixels,
         runs: &[FontRun],
-    ) -> Arc<LineLayout>
-    where
-        Text: AsRef<str>,
-        SharedString: From<Text>,
-    {
-        self.layout_line_internal(text, font_size, runs, None)
-    }
-
-    pub fn layout_line_internal<Text>(
-        &self,
-        text: Text,
-        font_size: Pixels,
-        runs: &[FontRun],
         force_width: Option<Pixels>,
     ) -> Arc<LineLayout>
     where

From 3315fd94d27fde9f4d327ce6a8c4a009fd605505 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 1 Sep 2025 11:21:55 +0300
Subject: [PATCH 501/823] editor: Add an option to disable rounded corners for
 text selection (#36987)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #19891

Similar to VSCode’s `editor.roundedSelection` option.

#### Before/after

<table>
<tr><th><th>Enabled (default)</th><th>Disabled</th>
<tr><td>Editor-based UIs<td><img width="268" height="58" alt="image"
src="https://github.com/user-attachments/assets/f58c6817-88fc-4cba-b2bc-f7eff58ec6e5"
/>
<img width="146" height="97" alt="image"
src="https://github.com/user-attachments/assets/0cd08afa-8243-4d4e-a5c6-9055f6834ecf"
/><td><img width="272" height="54" alt="image"
src="https://github.com/user-attachments/assets/286c8f53-1973-442e-8446-4f48e3feca30"
/>
<img width="133" height="90" alt="image"
src="https://github.com/user-attachments/assets/4aea2044-403c-47a5-bb6d-a88a0b65814e"
/></td>
<tr><td>Terminal<td><img width="287" height="84" alt="image"
src="https://github.com/user-attachments/assets/b1594f68-2ef6-4bdc-9030-e67d55a5bf99"
/><td><img width="289" height="79" alt="image"
src="https://github.com/user-attachments/assets/6d095d9d-b408-4440-a9f5-6a2af2b84b61"
/></td>
</table>

Release Notes:

- Added setting `rounded_selection` to disable rounded corners for text
selection.
---
 assets/settings/default.json                 | 2 ++
 crates/editor/src/editor_settings.rs         | 6 ++++++
 crates/editor/src/element.rs                 | 9 +++++++--
 crates/terminal_view/src/terminal_element.rs | 9 +++++++--
 docs/src/configuring-zed.md                  | 6 ++++++
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index b15eb6e5ce..2aec3aa7b9 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -223,6 +223,8 @@
   "current_line_highlight": "all",
   // Whether to highlight all occurrences of the selected text in an editor.
   "selection_highlight": true,
+  // Whether the text selection should have rounded corners.
+  "rounded_selection": true,
   // The debounce delay before querying highlights from the language
   // server based on the current cursor location.
   "lsp_highlight_debounce": 75,
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index c2baa9de02..084c4eb5c6 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -17,6 +17,7 @@ pub struct EditorSettings {
     pub cursor_shape: Option<CursorShape>,
     pub current_line_highlight: CurrentLineHighlight,
     pub selection_highlight: bool,
+    pub rounded_selection: bool,
     pub lsp_highlight_debounce: u64,
     pub hover_popover_enabled: bool,
     pub hover_popover_delay: u64,
@@ -441,6 +442,10 @@ pub struct EditorSettingsContent {
     ///
     /// Default: true
     pub selection_highlight: Option<bool>,
+    /// Whether the text selection should have rounded corners.
+    ///
+    /// Default: true
+    pub rounded_selection: Option<bool>,
     /// The debounce delay before querying highlights from the language
     /// server based on the current cursor location.
     ///
@@ -794,6 +799,7 @@ impl Settings for EditorSettings {
             "editor.selectionHighlight",
             &mut current.selection_highlight,
         );
+        vscode.bool_setting("editor.roundedSelection", &mut current.rounded_selection);
         vscode.bool_setting("editor.hover.enabled", &mut current.hover_popover_enabled);
         vscode.u64_setting("editor.hover.delay", &mut current.hover_popover_delay);
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index ca6eac080e..f384afa1ae 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -6063,7 +6063,7 @@ impl EditorElement {
                 };
 
                 self.paint_lines_background(layout, window, cx);
-                let invisible_display_ranges = self.paint_highlights(layout, window);
+                let invisible_display_ranges = self.paint_highlights(layout, window, cx);
                 self.paint_document_colors(layout, window);
                 self.paint_lines(&invisible_display_ranges, layout, window, cx);
                 self.paint_redactions(layout, window);
@@ -6085,6 +6085,7 @@ impl EditorElement {
         &mut self,
         layout: &mut EditorLayout,
         window: &mut Window,
+        cx: &mut App,
     ) -> SmallVec<[Range<DisplayPoint>; 32]> {
         window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
             let mut invisible_display_ranges = SmallVec::<[Range<DisplayPoint>; 32]>::new();
@@ -6101,7 +6102,11 @@ impl EditorElement {
                 );
             }
 
-            let corner_radius = 0.15 * layout.position_map.line_height;
+            let corner_radius = if EditorSettings::get_global(cx).rounded_selection {
+                0.15 * layout.position_map.line_height
+            } else {
+                Pixels::ZERO
+            };
 
             for (player_color, selections) in &layout.selections {
                 for selection in selections.iter() {
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 56715b604e..5bbf5ad36b 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1,4 +1,4 @@
-use editor::{CursorLayout, HighlightedRange, HighlightedRangeLine};
+use editor::{CursorLayout, EditorSettings, HighlightedRange, HighlightedRangeLine};
 use gpui::{
     AbsoluteLength, AnyElement, App, AvailableSpace, Bounds, ContentMask, Context, DispatchPhase,
     Element, ElementId, Entity, FocusHandle, Font, FontFeatures, FontStyle, FontWeight,
@@ -1257,12 +1257,17 @@ impl Element for TerminalElement {
                         if let Some((start_y, highlighted_range_lines)) =
                             to_highlighted_range_lines(relative_highlighted_range, layout, origin)
                         {
+                            let corner_radius = if EditorSettings::get_global(cx).rounded_selection {
+                                0.15 * layout.dimensions.line_height
+                            } else {
+                                Pixels::ZERO
+                            };
                             let hr = HighlightedRange {
                                 start_y,
                                 line_height: layout.dimensions.line_height,
                                 lines: highlighted_range_lines,
                                 color: *color,
-                                corner_radius: 0.15 * layout.dimensions.line_height,
+                                corner_radius: corner_radius,
                             };
                             hr.paint(true, bounds, window);
                         }
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 2b1d801f80..e245b3ca2f 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -685,6 +685,12 @@ List of `string` values
 - Setting: `selection_highlight`
 - Default: `true`
 
+## Rounded Selection
+
+- Description: Whether the text selection should have rounded corners.
+- Setting: `rounded_selection`
+- Default: `true`
+
 ## Cursor Blink
 
 - Description: Whether or not the cursor blinks.

From acff65ed3f70d9d48b1ad189e68b5ce136b0967b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Mon, 1 Sep 2025 16:33:59 +0800
Subject: [PATCH 502/823] windows: Update documents about WSL (#37292)

Release Notes:

- N/A
---
 crates/cli/src/main.rs | 6 ++++--
 crates/zed/src/main.rs | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 151e96e3cf..d67843b4c9 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -84,13 +84,15 @@ struct Args {
     /// Run zed in dev-server mode
     #[arg(long)]
     dev_server_token: Option<String>,
-    /// The username and WSL distribution to use when opening paths. ,If not specified,
+    /// The username and WSL distribution to use when opening paths. If not specified,
     /// Zed will attempt to open the paths directly.
     ///
     /// The username is optional, and if not specified, the default user for the distribution
     /// will be used.
     ///
-    /// Example: `me@Ubuntu` or `Ubuntu` for default distribution.
+    /// Example: `me@Ubuntu` or `Ubuntu`.
+    ///
+    /// WARN: You should not fill in this field by hand.
     #[arg(long, value_name = "USER@DISTRO")]
     wsl: Option<String>,
     /// Not supported in Zed CLI, only supported on Zed binary
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index d1d221fb37..3a7baa1559 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -1183,13 +1183,15 @@ struct Args {
     #[arg(long, value_name = "DIR")]
     user_data_dir: Option<String>,
 
-    /// The username and WSL distribution to use when opening paths. ,If not specified,
+    /// The username and WSL distribution to use when opening paths. If not specified,
     /// Zed will attempt to open the paths directly.
     ///
     /// The username is optional, and if not specified, the default user for the distribution
     /// will be used.
     ///
-    /// Example: `me@Ubuntu` or `Ubuntu` for default distribution.
+    /// Example: `me@Ubuntu` or `Ubuntu`.
+    ///
+    /// WARN: You should not fill in this field by hand.
     #[arg(long, value_name = "USER@DISTRO")]
     wsl: Option<String>,
 

From 2790eb604a1de04107f2412dadc06d4f75415380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E6=A2=85?= <1554694323@qq.com>
Date: Mon, 1 Sep 2025 16:49:09 +0800
Subject: [PATCH 503/823] deepseek: Fix API URL (#33905)

Closes #33904

Release Notes:

- Add support for custom API Urls for DeepSeek Provider

---------

Co-authored-by: Peter Tripp <peter@zed.dev>
---
 assets/settings/default.json    | 2 +-
 crates/deepseek/src/deepseek.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 2aec3aa7b9..623a4612d0 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1776,7 +1776,7 @@
       "api_url": "http://localhost:1234/api/v0"
     },
     "deepseek": {
-      "api_url": "https://api.deepseek.com"
+      "api_url": "https://api.deepseek.com/v1"
     },
     "mistral": {
       "api_url": "https://api.mistral.ai/v1"
diff --git a/crates/deepseek/src/deepseek.rs b/crates/deepseek/src/deepseek.rs
index c2554c67e9..e09a9e0f7a 100644
--- a/crates/deepseek/src/deepseek.rs
+++ b/crates/deepseek/src/deepseek.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::convert::TryFrom;
 
-pub const DEEPSEEK_API_URL: &str = "https://api.deepseek.com";
+pub const DEEPSEEK_API_URL: &str = "https://api.deepseek.com/v1";
 
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
@@ -263,7 +263,7 @@ pub async fn stream_completion(
     api_key: &str,
     request: Request,
 ) -> Result<BoxStream<'static, Result<StreamResponse>>> {
-    let uri = format!("{api_url}/v1/chat/completions");
+    let uri = format!("{api_url}/chat/completions");
     let request_builder = HttpRequest::builder()
         .method(Method::POST)
         .uri(uri)

From 61175ab9cdbe84feb647bddde84ee4766d627d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Mon, 1 Sep 2025 23:26:25 +0800
Subject: [PATCH 504/823] =?UTF-8?q?windows:=20Don=E2=80=99t=20skip=20the?=
 =?UTF-8?q?=20typo=20check=20for=20the=20windows=20folder=20(#37314)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Try to narrow down the scope of typo checking


Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/directx_renderer.rs | 2 +-
 crates/gpui/src/platform/windows/events.rs           | 2 +-
 crates/gpui/src/platform/windows/vsync.rs            | 2 +-
 typos.toml                                           | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform/windows/directx_renderer.rs b/crates/gpui/src/platform/windows/directx_renderer.rs
index f84a1c1b6d..c496d29a03 100644
--- a/crates/gpui/src/platform/windows/directx_renderer.rs
+++ b/crates/gpui/src/platform/windows/directx_renderer.rs
@@ -1760,7 +1760,7 @@ mod amd {
                 anyhow::bail!("Failed to initialize AMD AGS, error code: {}", result);
             }
 
-            // Vulkan acctually returns this as the driver version
+            // Vulkan actually returns this as the driver version
             let software_version = if !gpu_info.radeon_software_version.is_null() {
                 std::ffi::CStr::from_ptr(gpu_info.radeon_software_version)
                     .to_string_lossy()
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index 4def6a11a5..f4e3e5c302 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -708,7 +708,7 @@ impl WindowsWindowInner {
                 .system_settings
                 .auto_hide_taskbar_position
         {
-            // Fot the auto-hide taskbar, adjust in by 1 pixel on taskbar edge,
+            // For the auto-hide taskbar, adjust in by 1 pixel on taskbar edge,
             // so the window isn't treated as a "fullscreen app", which would cause
             // the taskbar to disappear.
             match taskbar_position {
diff --git a/crates/gpui/src/platform/windows/vsync.rs b/crates/gpui/src/platform/windows/vsync.rs
index 6d09b0960f..5cbcb8e99e 100644
--- a/crates/gpui/src/platform/windows/vsync.rs
+++ b/crates/gpui/src/platform/windows/vsync.rs
@@ -94,7 +94,7 @@ impl VSyncProvider {
         // DwmFlush and DCompositionWaitForCompositorClock returns very early
         // instead of waiting until vblank when the monitor goes to sleep or is
         // unplugged (nothing to present due to desktop occlusion). We use 1ms as
-        // a threshhold for the duration of the wait functions and fallback to
+        // a threshold for the duration of the wait functions and fallback to
         // Sleep() if it returns before that. This could happen during normal
         // operation for the first call after the vsync thread becomes non-idle,
         // but it shouldn't happen often.
diff --git a/typos.toml b/typos.toml
index e5f02b6415..ab33d9ccb4 100644
--- a/typos.toml
+++ b/typos.toml
@@ -36,7 +36,10 @@ extend-exclude = [
     # glsl isn't recognized by this tool.
     "extensions/glsl/languages/glsl/",
     # Windows likes its abbreviations.
-    "crates/gpui/src/platform/windows/",
+    "crates/gpui/src/platform/windows/directx_renderer.rs",
+    "crates/gpui/src/platform/windows/events.rs",
+    "crates/gpui/src/platform/windows/direct_write.rs",
+    "crates/gpui/src/platform/windows/window.rs",
     # Some typos in the base mdBook CSS.
     "docs/theme/css/",
     # Spellcheck triggers on `|Fixe[sd]|` regex part.

From d910feac1dfef3b9b3228f25acc7bc7e0193d9ad Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Mon, 1 Sep 2025 20:07:45 +0200
Subject: [PATCH 505/823] Implement perceptual gamma / contrast correction
 (#37167)

Closes #36023

This improves font rendering quality by doing perceptual gamma+contrast
correction which makes font edges look nicer and more legible.

A comparison image: (left is old, right is new)
<img width="1638" height="854" alt="Screenshot 2025-08-29 140015"
src="https://github.com/user-attachments/assets/85ca9818-0d55-4af0-a796-19e8cf9ed36b"
/>

This is most noticeable on smaller fonts / low-dpi displays

Release Notes:

- Improved font rendering quality
---
 Cargo.toml                                    |   1 +
 .../platform/windows/alpha_correction.hlsl    |  28 ++++
 .../platform/windows/color_text_raster.hlsl   |  14 +-
 .../gpui/src/platform/windows/direct_write.rs | 141 +++++-------------
 .../src/platform/windows/directx_renderer.rs  |  76 +++++++++-
 crates/gpui/src/platform/windows/platform.rs  |  15 +-
 crates/gpui/src/platform/windows/shaders.hlsl |   9 +-
 7 files changed, 157 insertions(+), 127 deletions(-)
 create mode 100644 crates/gpui/src/platform/windows/alpha_correction.hlsl

diff --git a/Cargo.toml b/Cargo.toml
index 48017d9c6b..b20b37edb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -696,6 +696,7 @@ features = [
     "Win32_Graphics_Dxgi_Common",
     "Win32_Graphics_Gdi",
     "Win32_Graphics_Imaging",
+    "Win32_Graphics_Hlsl",
     "Win32_Networking_WinSock",
     "Win32_Security",
     "Win32_Security_Credentials",
diff --git a/crates/gpui/src/platform/windows/alpha_correction.hlsl b/crates/gpui/src/platform/windows/alpha_correction.hlsl
new file mode 100644
index 0000000000..7844a15f48
--- /dev/null
+++ b/crates/gpui/src/platform/windows/alpha_correction.hlsl
@@ -0,0 +1,28 @@
+float color_brightness(float3 color) {
+    // REC. 601 luminance coefficients for percieved brightness
+    return dot(color, float3(0.30f, 0.59f, 0.11f));
+}
+
+float light_on_dark_contrast(float enhancedContrast, float3 color) {
+    float brightness = color_brightness(color);
+    float multiplier = saturate(4.0f * (0.75f - brightness));
+    return enhancedContrast * multiplier;
+}
+
+float enhance_contrast(float alpha, float k) {
+    return alpha * (k + 1.0f) / (alpha * k + 1.0f);
+}
+
+float apply_alpha_correction(float a, float b, float4 g) {
+    float brightness_adjustment = g.x * b + g.y;
+    float correction = brightness_adjustment * a + (g.z * b + g.w);
+    return a + a * (1.0f - a) * correction;
+}
+
+float apply_contrast_and_gamma_correction(float sample, float3 color, float enhanced_contrast_factor, float4 gamma_ratios) {
+    float enhanced_contrast = light_on_dark_contrast(enhanced_contrast_factor, color);
+    float brightness = color_brightness(color);
+
+    float contrasted = enhance_contrast(sample, enhanced_contrast);
+    return apply_alpha_correction(contrasted, brightness, gamma_ratios);
+}
diff --git a/crates/gpui/src/platform/windows/color_text_raster.hlsl b/crates/gpui/src/platform/windows/color_text_raster.hlsl
index ccc5fa26f0..322c743a99 100644
--- a/crates/gpui/src/platform/windows/color_text_raster.hlsl
+++ b/crates/gpui/src/platform/windows/color_text_raster.hlsl
@@ -1,3 +1,5 @@
+#include "alpha_correction.hlsl"
+
 struct RasterVertexOutput {
     float4 position : SV_Position;
     float2 texcoord : TEXCOORD0;
@@ -23,17 +25,19 @@ struct Bounds {
     int2 size;
 };
 
-Texture2D<float4> t_layer : register(t0);
+Texture2D<float> t_layer : register(t0);
 SamplerState s_layer : register(s0);
 
 cbuffer GlyphLayerTextureParams : register(b0) {
     Bounds bounds;
     float4 run_color;
+    float4 gamma_ratios;
+    float grayscale_enhanced_contrast;
+    float3 _pad;
 };
 
 float4 emoji_rasterization_fragment(PixelInput input): SV_Target {
-    float3 sampled = t_layer.Sample(s_layer, input.texcoord.xy).rgb;
-    float alpha = (sampled.r + sampled.g + sampled.b) / 3;
-
-    return float4(run_color.rgb, alpha);
+    float sample = t_layer.Sample(s_layer, input.texcoord.xy).r;
+    float alpha_corrected = apply_contrast_and_gamma_correction(sample, run_color.rgb, grayscale_enhanced_contrast, gamma_ratios);
+    return float4(run_color.rgb, alpha_corrected * run_color.a);
 }
diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index a86a1fab62..e81b87c733 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -10,12 +10,8 @@ use windows::{
         Foundation::*,
         Globalization::GetUserDefaultLocaleName,
         Graphics::{
-            Direct3D::D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP,
-            Direct3D11::*,
-            DirectWrite::*,
-            Dxgi::Common::*,
-            Gdi::{IsRectEmpty, LOGFONTW},
-            Imaging::*,
+            Direct3D::D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, Direct3D11::*, DirectWrite::*,
+            Dxgi::Common::*, Gdi::LOGFONTW,
         },
         System::SystemServices::LOCALE_NAME_MAX_LENGTH,
         UI::WindowsAndMessaging::*,
@@ -40,12 +36,10 @@ pub(crate) struct DirectWriteTextSystem(RwLock<DirectWriteState>);
 struct DirectWriteComponent {
     locale: String,
     factory: IDWriteFactory5,
-    bitmap_factory: AgileReference<IWICImagingFactory>,
     in_memory_loader: IDWriteInMemoryFontFileLoader,
     builder: IDWriteFontSetBuilder1,
     text_renderer: Arc<TextRendererWrapper>,
 
-    render_params: IDWriteRenderingParams3,
     gpu_state: GPUState,
 }
 
@@ -76,11 +70,10 @@ struct FontIdentifier {
 }
 
 impl DirectWriteComponent {
-    pub fn new(bitmap_factory: &IWICImagingFactory, gpu_context: &DirectXDevices) -> Result<Self> {
+    pub fn new(gpu_context: &DirectXDevices) -> Result<Self> {
         // todo: ideally this would not be a large unsafe block but smaller isolated ones for easier auditing
         unsafe {
             let factory: IDWriteFactory5 = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED)?;
-            let bitmap_factory = AgileReference::new(bitmap_factory)?;
             // The `IDWriteInMemoryFontFileLoader` here is supported starting from
             // Windows 10 Creators Update, which consequently requires the entire
             // `DirectWriteTextSystem` to run on `win10 1703`+.
@@ -92,36 +85,14 @@ impl DirectWriteComponent {
             let locale = String::from_utf16_lossy(&locale_vec);
             let text_renderer = Arc::new(TextRendererWrapper::new(&locale));
 
-            let render_params = {
-                let default_params: IDWriteRenderingParams3 =
-                    factory.CreateRenderingParams()?.cast()?;
-                let gamma = default_params.GetGamma();
-                let enhanced_contrast = default_params.GetEnhancedContrast();
-                let gray_contrast = default_params.GetGrayscaleEnhancedContrast();
-                let cleartype_level = default_params.GetClearTypeLevel();
-                let grid_fit_mode = default_params.GetGridFitMode();
-
-                factory.CreateCustomRenderingParams(
-                    gamma,
-                    enhanced_contrast,
-                    gray_contrast,
-                    cleartype_level,
-                    DWRITE_PIXEL_GEOMETRY_RGB,
-                    DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC,
-                    grid_fit_mode,
-                )?
-            };
-
             let gpu_state = GPUState::new(gpu_context)?;
 
             Ok(DirectWriteComponent {
                 locale,
                 factory,
-                bitmap_factory,
                 in_memory_loader,
                 builder,
                 text_renderer,
-                render_params,
                 gpu_state,
             })
         }
@@ -212,11 +183,8 @@ impl GPUState {
 }
 
 impl DirectWriteTextSystem {
-    pub(crate) fn new(
-        gpu_context: &DirectXDevices,
-        bitmap_factory: &IWICImagingFactory,
-    ) -> Result<Self> {
-        let components = DirectWriteComponent::new(bitmap_factory, gpu_context)?;
+    pub(crate) fn new(gpu_context: &DirectXDevices) -> Result<Self> {
+        let components = DirectWriteComponent::new(gpu_context)?;
         let system_font_collection = unsafe {
             let mut result = std::mem::zeroed();
             components
@@ -762,14 +730,14 @@ impl DirectWriteState {
         unsafe {
             font.font_face.GetRecommendedRenderingMode(
                 params.font_size.0,
-                // The dpi here seems that it has the same effect with `Some(&transform)`
-                1.0,
-                1.0,
+                // Using 96 as scale is applied by the transform
+                96.0,
+                96.0,
                 Some(&transform),
                 false,
                 DWRITE_OUTLINE_THRESHOLD_ANTIALIASED,
                 DWRITE_MEASURING_MODE_NATURAL,
-                &self.components.render_params,
+                None,
                 &mut rendering_mode,
                 &mut grid_fit_mode,
             )?;
@@ -782,8 +750,7 @@ impl DirectWriteState {
                 rendering_mode,
                 DWRITE_MEASURING_MODE_NATURAL,
                 grid_fit_mode,
-                // We're using cleartype not grayscale for monochrome is because it provides better quality
-                DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE,
+                DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE,
                 baseline_origin_x,
                 baseline_origin_y,
             )
@@ -794,10 +761,14 @@ impl DirectWriteState {
     fn raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
         let glyph_analysis = self.create_glyph_run_analysis(params)?;
 
-        let bounds = unsafe { glyph_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_CLEARTYPE_3x1)? };
-        // Some glyphs cannot be drawn with ClearType, such as bitmap fonts. In that case
-        // GetAlphaTextureBounds() supposedly returns an empty RECT, but I haven't tested that yet.
-        if !unsafe { IsRectEmpty(&bounds) }.as_bool() {
+        let bounds = unsafe { glyph_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_ALIASED_1x1)? };
+
+        if bounds.right < bounds.left {
+            Ok(Bounds {
+                origin: point(0.into(), 0.into()),
+                size: size(0.into(), 0.into()),
+            })
+        } else {
             Ok(Bounds {
                 origin: point(bounds.left.into(), bounds.top.into()),
                 size: size(
@@ -805,25 +776,6 @@ impl DirectWriteState {
                     (bounds.bottom - bounds.top).into(),
                 ),
             })
-        } else {
-            // If it's empty, retry with grayscale AA.
-            let bounds =
-                unsafe { glyph_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_ALIASED_1x1)? };
-
-            if bounds.right < bounds.left {
-                Ok(Bounds {
-                    origin: point(0.into(), 0.into()),
-                    size: size(0.into(), 0.into()),
-                })
-            } else {
-                Ok(Bounds {
-                    origin: point(bounds.left.into(), bounds.top.into()),
-                    size: size(
-                        (bounds.right - bounds.left).into(),
-                        (bounds.bottom - bounds.top).into(),
-                    ),
-                })
-            }
         }
     }
 
@@ -872,13 +824,12 @@ impl DirectWriteState {
         glyph_bounds: Bounds<DevicePixels>,
     ) -> Result<Vec<u8>> {
         let mut bitmap_data =
-            vec![0u8; glyph_bounds.size.width.0 as usize * glyph_bounds.size.height.0 as usize * 3];
+            vec![0u8; glyph_bounds.size.width.0 as usize * glyph_bounds.size.height.0 as usize];
 
         let glyph_analysis = self.create_glyph_run_analysis(params)?;
         unsafe {
             glyph_analysis.CreateAlphaTexture(
-                // We're using cleartype not grayscale for monochrome is because it provides better quality
-                DWRITE_TEXTURE_CLEARTYPE_3x1,
+                DWRITE_TEXTURE_ALIASED_1x1,
                 &RECT {
                     left: glyph_bounds.origin.x.0,
                     top: glyph_bounds.origin.y.0,
@@ -889,30 +840,6 @@ impl DirectWriteState {
             )?;
         }
 
-        let bitmap_factory = self.components.bitmap_factory.resolve()?;
-        let bitmap = unsafe {
-            bitmap_factory.CreateBitmapFromMemory(
-                glyph_bounds.size.width.0 as u32,
-                glyph_bounds.size.height.0 as u32,
-                &GUID_WICPixelFormat24bppRGB,
-                glyph_bounds.size.width.0 as u32 * 3,
-                &bitmap_data,
-            )
-        }?;
-
-        let grayscale_bitmap =
-            unsafe { WICConvertBitmapSource(&GUID_WICPixelFormat8bppGray, &bitmap) }?;
-
-        let mut bitmap_data =
-            vec![0u8; glyph_bounds.size.width.0 as usize * glyph_bounds.size.height.0 as usize];
-        unsafe {
-            grayscale_bitmap.CopyPixels(
-                std::ptr::null() as _,
-                glyph_bounds.size.width.0 as u32,
-                &mut bitmap_data,
-            )
-        }?;
-
         Ok(bitmap_data)
     }
 
@@ -981,25 +908,24 @@ impl DirectWriteState {
                         DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC,
                         DWRITE_MEASURING_MODE_NATURAL,
                         DWRITE_GRID_FIT_MODE_DEFAULT,
-                        DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE,
+                        DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE,
                         baseline_origin_x,
                         baseline_origin_y,
                     )
                 }?;
 
                 let color_bounds =
-                    unsafe { color_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_CLEARTYPE_3x1) }?;
+                    unsafe { color_analysis.GetAlphaTextureBounds(DWRITE_TEXTURE_ALIASED_1x1) }?;
 
                 let color_size = size(
                     color_bounds.right - color_bounds.left,
                     color_bounds.bottom - color_bounds.top,
                 );
                 if color_size.width > 0 && color_size.height > 0 {
-                    let mut alpha_data =
-                        vec![0u8; (color_size.width * color_size.height * 3) as usize];
+                    let mut alpha_data = vec![0u8; (color_size.width * color_size.height) as usize];
                     unsafe {
                         color_analysis.CreateAlphaTexture(
-                            DWRITE_TEXTURE_CLEARTYPE_3x1,
+                            DWRITE_TEXTURE_ALIASED_1x1,
                             &color_bounds,
                             &mut alpha_data,
                         )
@@ -1015,10 +941,6 @@ impl DirectWriteState {
                         }
                     };
                     let bounds = bounds(point(color_bounds.left, color_bounds.top), color_size);
-                    let alpha_data = alpha_data
-                        .chunks_exact(3)
-                        .flat_map(|chunk| [chunk[0], chunk[1], chunk[2], 255])
-                        .collect::<Vec<_>>();
                     glyph_layers.push(GlyphLayerTexture::new(
                         &self.components.gpu_state,
                         run_color,
@@ -1135,10 +1057,18 @@ impl DirectWriteState {
         unsafe { device_context.PSSetSamplers(0, Some(&gpu_state.sampler)) };
         unsafe { device_context.OMSetBlendState(&gpu_state.blend_state, None, 0xffffffff) };
 
+        let crate::FontInfo {
+            gamma_ratios,
+            grayscale_enhanced_contrast,
+        } = DirectXRenderer::get_font_info();
+
         for layer in glyph_layers {
             let params = GlyphLayerTextureParams {
                 run_color: layer.run_color,
                 bounds: layer.bounds,
+                gamma_ratios: *gamma_ratios,
+                grayscale_enhanced_contrast: *grayscale_enhanced_contrast,
+                _pad: [0f32; 3],
             };
             unsafe {
                 let mut dest = std::mem::zeroed();
@@ -1298,7 +1228,7 @@ impl GlyphLayerTexture {
             Height: texture_size.height as u32,
             MipLevels: 1,
             ArraySize: 1,
-            Format: DXGI_FORMAT_R8G8B8A8_UNORM,
+            Format: DXGI_FORMAT_R8_UNORM,
             SampleDesc: DXGI_SAMPLE_DESC {
                 Count: 1,
                 Quality: 0,
@@ -1334,7 +1264,7 @@ impl GlyphLayerTexture {
                 0,
                 None,
                 alpha_data.as_ptr() as _,
-                (texture_size.width * 4) as u32,
+                texture_size.width as u32,
                 0,
             )
         };
@@ -1352,6 +1282,9 @@ impl GlyphLayerTexture {
 struct GlyphLayerTextureParams {
     bounds: Bounds<i32>,
     run_color: Rgba,
+    gamma_ratios: [f32; 4],
+    grayscale_enhanced_contrast: f32,
+    _pad: [f32; 3],
 }
 
 struct TextRendererWrapper(pub IDWriteTextRenderer);
diff --git a/crates/gpui/src/platform/windows/directx_renderer.rs b/crates/gpui/src/platform/windows/directx_renderer.rs
index c496d29a03..0c092e2228 100644
--- a/crates/gpui/src/platform/windows/directx_renderer.rs
+++ b/crates/gpui/src/platform/windows/directx_renderer.rs
@@ -1,4 +1,7 @@
-use std::{mem::ManuallyDrop, sync::Arc};
+use std::{
+    mem::ManuallyDrop,
+    sync::{Arc, OnceLock},
+};
 
 use ::util::ResultExt;
 use anyhow::{Context, Result};
@@ -9,6 +12,7 @@ use windows::{
             Direct3D::*,
             Direct3D11::*,
             DirectComposition::*,
+            DirectWrite::*,
             Dxgi::{Common::*, *},
         },
     },
@@ -27,6 +31,11 @@ const RENDER_TARGET_FORMAT: DXGI_FORMAT = DXGI_FORMAT_B8G8R8A8_UNORM;
 // This configuration is used for MSAA rendering on paths only, and it's guaranteed to be supported by DirectX 11.
 const PATH_MULTISAMPLE_COUNT: u32 = 4;
 
+pub(crate) struct FontInfo {
+    pub gamma_ratios: [f32; 4],
+    pub grayscale_enhanced_contrast: f32,
+}
+
 pub(crate) struct DirectXRenderer {
     hwnd: HWND,
     atlas: Arc<DirectXAtlas>,
@@ -35,6 +44,7 @@ pub(crate) struct DirectXRenderer {
     globals: DirectXGlobalElements,
     pipelines: DirectXRenderPipelines,
     direct_composition: Option<DirectComposition>,
+    font_info: &'static FontInfo,
 }
 
 /// Direct3D objects
@@ -171,6 +181,7 @@ impl DirectXRenderer {
             globals,
             pipelines,
             direct_composition,
+            font_info: Self::get_font_info(),
         })
     }
 
@@ -183,10 +194,12 @@ impl DirectXRenderer {
             &self.devices.device_context,
             self.globals.global_params_buffer[0].as_ref().unwrap(),
             &[GlobalParams {
+                gamma_ratios: self.font_info.gamma_ratios,
                 viewport_size: [
                     self.resources.viewport[0].Width,
                     self.resources.viewport[0].Height,
                 ],
+                grayscale_enhanced_contrast: self.font_info.grayscale_enhanced_contrast,
                 _pad: 0,
             }],
         )?;
@@ -617,6 +630,52 @@ impl DirectXRenderer {
             driver_info: driver_version,
         })
     }
+
+    pub(crate) fn get_font_info() -> &'static FontInfo {
+        static CACHED_FONT_INFO: OnceLock<FontInfo> = OnceLock::new();
+        CACHED_FONT_INFO.get_or_init(|| unsafe {
+            let factory: IDWriteFactory5 = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED).unwrap();
+            let render_params: IDWriteRenderingParams1 =
+                factory.CreateRenderingParams().unwrap().cast().unwrap();
+            FontInfo {
+                gamma_ratios: Self::get_gamma_ratios(render_params.GetGamma()),
+                grayscale_enhanced_contrast: render_params.GetGrayscaleEnhancedContrast(),
+            }
+        })
+    }
+
+    // Gamma ratios for brightening/darkening edges for better contrast
+    // https://github.com/microsoft/terminal/blob/1283c0f5b99a2961673249fa77c6b986efb5086c/src/renderer/atlas/dwrite.cpp#L50
+    fn get_gamma_ratios(gamma: f32) -> [f32; 4] {
+        const GAMMA_INCORRECT_TARGET_RATIOS: [[f32; 4]; 13] = [
+            [0.0000 / 4.0, 0.0000 / 4.0, 0.0000 / 4.0, 0.0000 / 4.0], // gamma = 1.0
+            [0.0166 / 4.0, -0.0807 / 4.0, 0.2227 / 4.0, -0.0751 / 4.0], // gamma = 1.1
+            [0.0350 / 4.0, -0.1760 / 4.0, 0.4325 / 4.0, -0.1370 / 4.0], // gamma = 1.2
+            [0.0543 / 4.0, -0.2821 / 4.0, 0.6302 / 4.0, -0.1876 / 4.0], // gamma = 1.3
+            [0.0739 / 4.0, -0.3963 / 4.0, 0.8167 / 4.0, -0.2287 / 4.0], // gamma = 1.4
+            [0.0933 / 4.0, -0.5161 / 4.0, 0.9926 / 4.0, -0.2616 / 4.0], // gamma = 1.5
+            [0.1121 / 4.0, -0.6395 / 4.0, 1.1588 / 4.0, -0.2877 / 4.0], // gamma = 1.6
+            [0.1300 / 4.0, -0.7649 / 4.0, 1.3159 / 4.0, -0.3080 / 4.0], // gamma = 1.7
+            [0.1469 / 4.0, -0.8911 / 4.0, 1.4644 / 4.0, -0.3234 / 4.0], // gamma = 1.8
+            [0.1627 / 4.0, -1.0170 / 4.0, 1.6051 / 4.0, -0.3347 / 4.0], // gamma = 1.9
+            [0.1773 / 4.0, -1.1420 / 4.0, 1.7385 / 4.0, -0.3426 / 4.0], // gamma = 2.0
+            [0.1908 / 4.0, -1.2652 / 4.0, 1.8650 / 4.0, -0.3476 / 4.0], // gamma = 2.1
+            [0.2031 / 4.0, -1.3864 / 4.0, 1.9851 / 4.0, -0.3501 / 4.0], // gamma = 2.2
+        ];
+
+        const NORM13: f32 = ((0x10000 as f64) / (255.0 * 255.0) * 4.0) as f32;
+        const NORM24: f32 = ((0x100 as f64) / (255.0) * 4.0) as f32;
+
+        let index = ((gamma * 10.0).round() as usize).clamp(10, 22) - 10;
+        let ratios = GAMMA_INCORRECT_TARGET_RATIOS[index];
+
+        [
+            ratios[0] * NORM13,
+            ratios[1] * NORM24,
+            ratios[2] * NORM13,
+            ratios[3] * NORM24,
+        ]
+    }
 }
 
 impl DirectXResources {
@@ -822,8 +881,10 @@ impl DirectXGlobalElements {
 #[derive(Debug, Default)]
 #[repr(C)]
 struct GlobalParams {
+    gamma_ratios: [f32; 4],
     viewport_size: [f32; 2],
-    _pad: u64,
+    grayscale_enhanced_contrast: f32,
+    _pad: u32,
 }
 
 struct PipelineState<T> {
@@ -1544,6 +1605,10 @@ pub(crate) mod shader_resources {
     #[cfg(debug_assertions)]
     pub(super) fn build_shader_blob(entry: ShaderModule, target: ShaderTarget) -> Result<ID3DBlob> {
         unsafe {
+            use windows::Win32::Graphics::{
+                Direct3D::ID3DInclude, Hlsl::D3D_COMPILE_STANDARD_FILE_INCLUDE,
+            };
+
             let shader_name = if matches!(entry, ShaderModule::EmojiRasterization) {
                 "color_text_raster.hlsl"
             } else {
@@ -1572,10 +1637,15 @@ pub(crate) mod shader_resources {
             let entry_point = PCSTR::from_raw(entry.as_ptr());
             let target_cstr = PCSTR::from_raw(target.as_ptr());
 
+            // really dirty trick because winapi bindings are unhappy otherwise
+            let include_handler = &std::mem::transmute::<usize, ID3DInclude>(
+                D3D_COMPILE_STANDARD_FILE_INCLUDE as usize,
+            );
+
             let ret = D3DCompileFromFile(
                 &HSTRING::from(shader_path.to_str().unwrap()),
                 None,
-                None,
+                include_handler,
                 entry_point,
                 target_cstr,
                 D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION,
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index 3a6ccff90f..b06f369aab 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -1,7 +1,6 @@
 use std::{
     cell::RefCell,
     ffi::OsStr,
-    mem::ManuallyDrop,
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
@@ -18,10 +17,7 @@ use windows::{
     UI::ViewManagement::UISettings,
     Win32::{
         Foundation::*,
-        Graphics::{
-            Gdi::*,
-            Imaging::{CLSID_WICImagingFactory, IWICImagingFactory},
-        },
+        Graphics::Gdi::*,
         Security::Credentials::*,
         System::{Com::*, LibraryLoader::*, Ole::*, SystemInformation::*, Threading::*},
         UI::{Input::KeyboardAndMouse::*, Shell::*, WindowsAndMessaging::*},
@@ -41,7 +37,6 @@ pub(crate) struct WindowsPlatform {
     foreground_executor: ForegroundExecutor,
     text_system: Arc<DirectWriteTextSystem>,
     windows_version: WindowsVersion,
-    bitmap_factory: ManuallyDrop<IWICImagingFactory>,
     drop_target_helper: IDropTargetHelper,
     validation_number: usize,
     main_thread_id_win32: u32,
@@ -101,12 +96,8 @@ impl WindowsPlatform {
         let foreground_executor = ForegroundExecutor::new(dispatcher);
         let directx_devices = DirectXDevices::new(disable_direct_composition)
             .context("Unable to init directx devices.")?;
-        let bitmap_factory = ManuallyDrop::new(unsafe {
-            CoCreateInstance(&CLSID_WICImagingFactory, None, CLSCTX_INPROC_SERVER)
-                .context("Error creating bitmap factory.")?
-        });
         let text_system = Arc::new(
-            DirectWriteTextSystem::new(&directx_devices, &bitmap_factory)
+            DirectWriteTextSystem::new(&directx_devices)
                 .context("Error creating DirectWriteTextSystem")?,
         );
         let drop_target_helper: IDropTargetHelper = unsafe {
@@ -128,7 +119,6 @@ impl WindowsPlatform {
             text_system,
             disable_direct_composition,
             windows_version,
-            bitmap_factory,
             drop_target_helper,
             validation_number,
             main_thread_id_win32,
@@ -716,7 +706,6 @@ impl Platform for WindowsPlatform {
 impl Drop for WindowsPlatform {
     fn drop(&mut self) {
         unsafe {
-            ManuallyDrop::drop(&mut self.bitmap_factory);
             OleUninitialize();
         }
     }
diff --git a/crates/gpui/src/platform/windows/shaders.hlsl b/crates/gpui/src/platform/windows/shaders.hlsl
index 6fabe859e3..2cef54ae61 100644
--- a/crates/gpui/src/platform/windows/shaders.hlsl
+++ b/crates/gpui/src/platform/windows/shaders.hlsl
@@ -1,6 +1,10 @@
+#include "alpha_correction.hlsl"
+
 cbuffer GlobalParams: register(b0) {
+    float4 gamma_ratios;
     float2 global_viewport_size;
-    uint2 _pad;
+    float grayscale_enhanced_contrast;
+    uint _pad;
 };
 
 Texture2D<float4> t_sprite: register(t0);
@@ -1098,7 +1102,8 @@ MonochromeSpriteVertexOutput monochrome_sprite_vertex(uint vertex_id: SV_VertexI
 
 float4 monochrome_sprite_fragment(MonochromeSpriteFragmentInput input): SV_Target {
     float sample = t_sprite.Sample(s_sprite, input.tile_position).r;
-    return float4(input.color.rgb, input.color.a * sample);
+    float alpha_corrected = apply_contrast_and_gamma_correction(sample, input.color.rgb, grayscale_enhanced_contrast, gamma_ratios);
+    return float4(input.color.rgb, input.color.a * alpha_corrected);
 }
 
 /*

From 5b73b40df89fd4caf7596fb15b5b1ee54bd210df Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 1 Sep 2025 15:57:15 -0300
Subject: [PATCH 506/823] ACP Terminal support (#37129)

Exposes terminal support via ACP and migrates our agent to use it.

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 Cargo.lock                                  |   9 +-
 Cargo.toml                                  |   2 +-
 crates/acp_thread/Cargo.toml                |   3 +
 crates/acp_thread/src/acp_thread.rs         | 270 +++++++++++++---
 crates/acp_thread/src/terminal.rs           | 115 +++++--
 crates/agent2/Cargo.toml                    |   2 -
 crates/agent2/src/agent.rs                  |  94 +++++-
 crates/agent2/src/thread.rs                 |  48 ++-
 crates/agent2/src/tools/terminal_tool.rs    | 337 +++-----------------
 crates/agent_servers/src/acp.rs             | 121 +++++--
 crates/agent_ui/src/acp/entry_view_state.rs |  44 ++-
 crates/agent_ui/src/acp/thread_view.rs      |  14 +-
 12 files changed, 619 insertions(+), 440 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fed7077281..a2ba36a91c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,6 +23,7 @@ dependencies = [
  "language_model",
  "markdown",
  "parking_lot",
+ "portable-pty",
  "project",
  "prompt_store",
  "rand 0.8.5",
@@ -30,6 +31,7 @@ dependencies = [
  "serde_json",
  "settings",
  "smol",
+ "task",
  "tempfile",
  "terminal",
  "ui",
@@ -37,6 +39,7 @@ dependencies = [
  "util",
  "uuid",
  "watch",
+ "which 6.0.3",
  "workspace-hack",
 ]
 
@@ -192,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.1.1"
+version = "0.2.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b91e5ec3ce05e8effb2a7a3b7b1a587daa6699b9f98bbde6a35e44b8c6c773a"
+checksum = "4ec42b8b612665799c7667890df4b5f5cb441b18a68619fd770f1e054480ee3f"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -248,7 +251,6 @@ dependencies = [
  "open",
  "parking_lot",
  "paths",
- "portable-pty",
  "pretty_assertions",
  "project",
  "prompt_store",
@@ -274,7 +276,6 @@ dependencies = [
  "uuid",
  "watch",
  "web_search",
- "which 6.0.3",
  "workspace-hack",
  "worktree",
  "zlog",
diff --git a/Cargo.toml b/Cargo.toml
index b20b37edb9..6cf3d8858b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -430,7 +430,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol =  "0.1"
+agent-client-protocol = { version = "0.2.0-alpha.3", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 196614f731..8d7bea8659 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -31,18 +31,21 @@ language.workspace = true
 language_model.workspace = true
 markdown.workspace = true
 parking_lot = { workspace = true, optional = true }
+portable-pty.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+task.workspace = true
 terminal.workspace = true
 ui.workspace = true
 url.workspace = true
 util.workspace = true
 uuid.workspace = true
 watch.workspace = true
+which.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 394619732a..ab6aa98e99 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -7,6 +7,7 @@ use agent_settings::AgentSettings;
 use collections::HashSet;
 pub use connection::*;
 pub use diff::*;
+use futures::future::Shared;
 use language::language_settings::FormatOnSave;
 pub use mention::*;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
@@ -15,7 +16,7 @@ use settings::Settings as _;
 pub use terminal::*;
 
 use action_log::ActionLog;
-use agent_client_protocol as acp;
+use agent_client_protocol::{self as acp};
 use anyhow::{Context as _, Result, anyhow};
 use editor::Bias;
 use futures::{FutureExt, channel::oneshot, future::BoxFuture};
@@ -33,7 +34,8 @@ use std::rc::Rc;
 use std::time::{Duration, Instant};
 use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
 use ui::App;
-use util::ResultExt;
+use util::{ResultExt, get_system_shell};
+use uuid::Uuid;
 
 #[derive(Debug)]
 pub struct UserMessage {
@@ -183,37 +185,46 @@ impl ToolCall {
         tool_call: acp::ToolCall,
         status: ToolCallStatus,
         language_registry: Arc<LanguageRegistry>,
+        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
         cx: &mut App,
-    ) -> Self {
+    ) -> Result<Self> {
         let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
             first_line.to_owned() + "…"
         } else {
             tool_call.title
         };
-        Self {
+        let mut content = Vec::with_capacity(tool_call.content.len());
+        for item in tool_call.content {
+            content.push(ToolCallContent::from_acp(
+                item,
+                language_registry.clone(),
+                terminals,
+                cx,
+            )?);
+        }
+
+        let result = Self {
             id: tool_call.id,
             label: cx
                 .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
             kind: tool_call.kind,
-            content: tool_call
-                .content
-                .into_iter()
-                .map(|content| ToolCallContent::from_acp(content, language_registry.clone(), cx))
-                .collect(),
+            content,
             locations: tool_call.locations,
             resolved_locations: Vec::default(),
             status,
             raw_input: tool_call.raw_input,
             raw_output: tool_call.raw_output,
-        }
+        };
+        Ok(result)
     }
 
     fn update_fields(
         &mut self,
         fields: acp::ToolCallUpdateFields,
         language_registry: Arc<LanguageRegistry>,
+        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
         cx: &mut App,
-    ) {
+    ) -> Result<()> {
         let acp::ToolCallUpdateFields {
             kind,
             status,
@@ -248,14 +259,15 @@ impl ToolCall {
 
             // Reuse existing content if we can
             for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
-                old.update_from_acp(new, language_registry.clone(), cx);
+                old.update_from_acp(new, language_registry.clone(), terminals, cx)?;
             }
             for new in content {
                 self.content.push(ToolCallContent::from_acp(
                     new,
                     language_registry.clone(),
+                    terminals,
                     cx,
-                ))
+                )?)
             }
             self.content.truncate(new_content_len);
         }
@@ -279,6 +291,7 @@ impl ToolCall {
             }
             self.raw_output = Some(raw_output);
         }
+        Ok(())
     }
 
     pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
@@ -549,13 +562,16 @@ impl ToolCallContent {
     pub fn from_acp(
         content: acp::ToolCallContent,
         language_registry: Arc<LanguageRegistry>,
+        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
         cx: &mut App,
-    ) -> Self {
+    ) -> Result<Self> {
         match content {
-            acp::ToolCallContent::Content { content } => {
-                Self::ContentBlock(ContentBlock::new(content, &language_registry, cx))
-            }
-            acp::ToolCallContent::Diff { diff } => Self::Diff(cx.new(|cx| {
+            acp::ToolCallContent::Content { content } => Ok(Self::ContentBlock(ContentBlock::new(
+                content,
+                &language_registry,
+                cx,
+            ))),
+            acp::ToolCallContent::Diff { diff } => Ok(Self::Diff(cx.new(|cx| {
                 Diff::finalized(
                     diff.path,
                     diff.old_text,
@@ -563,7 +579,12 @@ impl ToolCallContent {
                     language_registry,
                     cx,
                 )
-            })),
+            }))),
+            acp::ToolCallContent::Terminal { terminal_id } => terminals
+                .get(&terminal_id)
+                .cloned()
+                .map(Self::Terminal)
+                .ok_or_else(|| anyhow::anyhow!("Terminal with id `{}` not found", terminal_id)),
         }
     }
 
@@ -571,8 +592,9 @@ impl ToolCallContent {
         &mut self,
         new: acp::ToolCallContent,
         language_registry: Arc<LanguageRegistry>,
+        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
         cx: &mut App,
-    ) {
+    ) -> Result<()> {
         let needs_update = match (&self, &new) {
             (Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
                 old_diff.read(cx).needs_update(
@@ -585,8 +607,9 @@ impl ToolCallContent {
         };
 
         if needs_update {
-            *self = Self::from_acp(new, language_registry, cx);
+            *self = Self::from_acp(new, language_registry, terminals, cx)?;
         }
+        Ok(())
     }
 
     pub fn to_markdown(&self, cx: &App) -> String {
@@ -763,6 +786,8 @@ pub struct AcpThread {
     token_usage: Option<TokenUsage>,
     prompt_capabilities: acp::PromptCapabilities,
     _observe_prompt_capabilities: Task<anyhow::Result<()>>,
+    determine_shell: Shared<Task<String>>,
+    terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
 }
 
 #[derive(Debug)]
@@ -846,6 +871,20 @@ impl AcpThread {
             }
         });
 
+        let determine_shell = cx
+            .background_spawn(async move {
+                if cfg!(windows) {
+                    return get_system_shell();
+                }
+
+                if which::which("bash").is_ok() {
+                    "bash".into()
+                } else {
+                    get_system_shell()
+                }
+            })
+            .shared();
+
         Self {
             action_log,
             shared_buffers: Default::default(),
@@ -859,6 +898,8 @@ impl AcpThread {
             token_usage: None,
             prompt_capabilities,
             _observe_prompt_capabilities: task,
+            terminals: HashMap::default(),
+            determine_shell,
         }
     }
 
@@ -1082,27 +1123,28 @@ impl AcpThread {
         let update = update.into();
         let languages = self.project.read(cx).languages().clone();
 
-        let (ix, current_call) = self
-            .tool_call_mut(update.id())
+        let ix = self
+            .index_for_tool_call(update.id())
             .context("Tool call not found")?;
+        let AgentThreadEntry::ToolCall(call) = &mut self.entries[ix] else {
+            unreachable!()
+        };
+
         match update {
             ToolCallUpdate::UpdateFields(update) => {
                 let location_updated = update.fields.locations.is_some();
-                current_call.update_fields(update.fields, languages, cx);
+                call.update_fields(update.fields, languages, &self.terminals, cx)?;
                 if location_updated {
                     self.resolve_locations(update.id, cx);
                 }
             }
             ToolCallUpdate::UpdateDiff(update) => {
-                current_call.content.clear();
-                current_call
-                    .content
-                    .push(ToolCallContent::Diff(update.diff));
+                call.content.clear();
+                call.content.push(ToolCallContent::Diff(update.diff));
             }
             ToolCallUpdate::UpdateTerminal(update) => {
-                current_call.content.clear();
-                current_call
-                    .content
+                call.content.clear();
+                call.content
                     .push(ToolCallContent::Terminal(update.terminal));
             }
         }
@@ -1125,21 +1167,30 @@ impl AcpThread {
     /// Fails if id does not match an existing entry.
     pub fn upsert_tool_call_inner(
         &mut self,
-        tool_call_update: acp::ToolCallUpdate,
+        update: acp::ToolCallUpdate,
         status: ToolCallStatus,
         cx: &mut Context<Self>,
     ) -> Result<(), acp::Error> {
         let language_registry = self.project.read(cx).languages().clone();
-        let id = tool_call_update.id.clone();
+        let id = update.id.clone();
 
-        if let Some((ix, current_call)) = self.tool_call_mut(&id) {
-            current_call.update_fields(tool_call_update.fields, language_registry, cx);
-            current_call.status = status;
+        if let Some(ix) = self.index_for_tool_call(&id) {
+            let AgentThreadEntry::ToolCall(call) = &mut self.entries[ix] else {
+                unreachable!()
+            };
+
+            call.update_fields(update.fields, language_registry, &self.terminals, cx)?;
+            call.status = status;
 
             cx.emit(AcpThreadEvent::EntryUpdated(ix));
         } else {
-            let call =
-                ToolCall::from_acp(tool_call_update.try_into()?, status, language_registry, cx);
+            let call = ToolCall::from_acp(
+                update.try_into()?,
+                status,
+                language_registry,
+                &self.terminals,
+                cx,
+            )?;
             self.push_entry(AgentThreadEntry::ToolCall(call), cx);
         };
 
@@ -1147,6 +1198,22 @@ impl AcpThread {
         Ok(())
     }
 
+    fn index_for_tool_call(&self, id: &acp::ToolCallId) -> Option<usize> {
+        self.entries
+            .iter()
+            .enumerate()
+            .rev()
+            .find_map(|(index, entry)| {
+                if let AgentThreadEntry::ToolCall(tool_call) = entry
+                    && &tool_call.id == id
+                {
+                    Some(index)
+                } else {
+                    None
+                }
+            })
+    }
+
     fn tool_call_mut(&mut self, id: &acp::ToolCallId) -> Option<(usize, &mut ToolCall)> {
         // The tool call we are looking for is typically the last one, or very close to the end.
         // At the moment, it doesn't seem like a hashmap would be a good fit for this use case.
@@ -1829,6 +1896,133 @@ impl AcpThread {
         })
     }
 
+    pub fn create_terminal(
+        &self,
+        mut command: String,
+        args: Vec<String>,
+        extra_env: Vec<acp::EnvVariable>,
+        cwd: Option<PathBuf>,
+        output_byte_limit: Option<u64>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Entity<Terminal>>> {
+        for arg in args {
+            command.push(' ');
+            command.push_str(&arg);
+        }
+
+        let shell_command = if cfg!(windows) {
+            format!("$null | & {{{}}}", command.replace("\"", "'"))
+        } else if let Some(cwd) = cwd.as_ref().and_then(|cwd| cwd.as_os_str().to_str()) {
+            // Make sure once we're *inside* the shell, we cd into `cwd`
+            format!("(cd {cwd}; {}) </dev/null", command)
+        } else {
+            format!("({}) </dev/null", command)
+        };
+        let args = vec!["-c".into(), shell_command];
+
+        let env = match &cwd {
+            Some(dir) => self.project.update(cx, |project, cx| {
+                project.directory_environment(dir.as_path().into(), cx)
+            }),
+            None => Task::ready(None).shared(),
+        };
+
+        let env = cx.spawn(async move |_, _| {
+            let mut env = env.await.unwrap_or_default();
+            if cfg!(unix) {
+                env.insert("PAGER".into(), "cat".into());
+            }
+            for var in extra_env {
+                env.insert(var.name, var.value);
+            }
+            env
+        });
+
+        let project = self.project.clone();
+        let language_registry = project.read(cx).languages().clone();
+        let determine_shell = self.determine_shell.clone();
+
+        let terminal_id = acp::TerminalId(Uuid::new_v4().to_string().into());
+        let terminal_task = cx.spawn({
+            let terminal_id = terminal_id.clone();
+            async move |_this, cx| {
+                let program = determine_shell.await;
+                let env = env.await;
+                let terminal = project
+                    .update(cx, |project, cx| {
+                        project.create_terminal_task(
+                            task::SpawnInTerminal {
+                                command: Some(program),
+                                args,
+                                cwd: cwd.clone(),
+                                env,
+                                ..Default::default()
+                            },
+                            cx,
+                        )
+                    })?
+                    .await?;
+
+                cx.new(|cx| {
+                    Terminal::new(
+                        terminal_id,
+                        command,
+                        cwd,
+                        output_byte_limit.map(|l| l as usize),
+                        terminal,
+                        language_registry,
+                        cx,
+                    )
+                })
+            }
+        });
+
+        cx.spawn(async move |this, cx| {
+            let terminal = terminal_task.await?;
+            this.update(cx, |this, _cx| {
+                this.terminals.insert(terminal_id, terminal.clone());
+                terminal
+            })
+        })
+    }
+
+    pub fn kill_terminal(
+        &mut self,
+        terminal_id: acp::TerminalId,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        self.terminals
+            .get(&terminal_id)
+            .context("Terminal not found")?
+            .update(cx, |terminal, cx| {
+                terminal.kill(cx);
+            });
+
+        Ok(())
+    }
+
+    pub fn release_terminal(
+        &mut self,
+        terminal_id: acp::TerminalId,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        self.terminals
+            .remove(&terminal_id)
+            .context("Terminal not found")?
+            .update(cx, |terminal, cx| {
+                terminal.kill(cx);
+            });
+
+        Ok(())
+    }
+
+    pub fn terminal(&self, terminal_id: acp::TerminalId) -> Result<Entity<Terminal>> {
+        self.terminals
+            .get(&terminal_id)
+            .context("Terminal not found")
+            .cloned()
+    }
+
     pub fn to_markdown(&self, cx: &App) -> String {
         self.entries.iter().map(|e| e.to_markdown(cx)).collect()
     }
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 41d7fb89bb..6b4cdb7346 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -1,34 +1,43 @@
-use gpui::{App, AppContext, Context, Entity};
+use agent_client_protocol as acp;
+
+use futures::{FutureExt as _, future::Shared};
+use gpui::{App, AppContext, Context, Entity, Task};
 use language::LanguageRegistry;
 use markdown::Markdown;
 use std::{path::PathBuf, process::ExitStatus, sync::Arc, time::Instant};
 
 pub struct Terminal {
+    id: acp::TerminalId,
     command: Entity<Markdown>,
     working_dir: Option<PathBuf>,
     terminal: Entity<terminal::Terminal>,
     started_at: Instant,
     output: Option<TerminalOutput>,
+    output_byte_limit: Option<usize>,
+    _output_task: Shared<Task<acp::TerminalExitStatus>>,
 }
 
 pub struct TerminalOutput {
     pub ended_at: Instant,
     pub exit_status: Option<ExitStatus>,
-    pub was_content_truncated: bool,
+    pub content: String,
     pub original_content_len: usize,
     pub content_line_count: usize,
-    pub finished_with_empty_output: bool,
 }
 
 impl Terminal {
     pub fn new(
+        id: acp::TerminalId,
         command: String,
         working_dir: Option<PathBuf>,
+        output_byte_limit: Option<usize>,
         terminal: Entity<terminal::Terminal>,
         language_registry: Arc<LanguageRegistry>,
         cx: &mut Context<Self>,
     ) -> Self {
+        let command_task = terminal.read(cx).wait_for_completed_task(cx);
         Self {
+            id,
             command: cx.new(|cx| {
                 Markdown::new(
                     format!("```\n{}\n```", command).into(),
@@ -41,27 +50,93 @@ impl Terminal {
             terminal,
             started_at: Instant::now(),
             output: None,
+            output_byte_limit,
+            _output_task: cx
+                .spawn(async move |this, cx| {
+                    let exit_status = command_task.await;
+
+                    this.update(cx, |this, cx| {
+                        let (content, original_content_len) = this.truncated_output(cx);
+                        let content_line_count = this.terminal.read(cx).total_lines();
+
+                        this.output = Some(TerminalOutput {
+                            ended_at: Instant::now(),
+                            exit_status,
+                            content,
+                            original_content_len,
+                            content_line_count,
+                        });
+                        cx.notify();
+                    })
+                    .ok();
+
+                    let exit_status = exit_status.map(portable_pty::ExitStatus::from);
+
+                    acp::TerminalExitStatus {
+                        exit_code: exit_status.as_ref().map(|e| e.exit_code()),
+                        signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                    }
+                })
+                .shared(),
         }
     }
 
-    pub fn finish(
-        &mut self,
-        exit_status: Option<ExitStatus>,
-        original_content_len: usize,
-        truncated_content_len: usize,
-        content_line_count: usize,
-        finished_with_empty_output: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.output = Some(TerminalOutput {
-            ended_at: Instant::now(),
-            exit_status,
-            was_content_truncated: truncated_content_len < original_content_len,
-            original_content_len,
-            content_line_count,
-            finished_with_empty_output,
+    pub fn id(&self) -> &acp::TerminalId {
+        &self.id
+    }
+
+    pub fn wait_for_exit(&self) -> Shared<Task<acp::TerminalExitStatus>> {
+        self._output_task.clone()
+    }
+
+    pub fn kill(&mut self, cx: &mut App) {
+        self.terminal.update(cx, |terminal, _cx| {
+            terminal.kill_active_task();
         });
-        cx.notify();
+    }
+
+    pub fn current_output(&self, cx: &App) -> acp::TerminalOutputResponse {
+        if let Some(output) = self.output.as_ref() {
+            let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);
+
+            acp::TerminalOutputResponse {
+                output: output.content.clone(),
+                truncated: output.original_content_len > output.content.len(),
+                exit_status: Some(acp::TerminalExitStatus {
+                    exit_code: exit_status.as_ref().map(|e| e.exit_code()),
+                    signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                }),
+            }
+        } else {
+            let (current_content, original_len) = self.truncated_output(cx);
+
+            acp::TerminalOutputResponse {
+                truncated: current_content.len() < original_len,
+                output: current_content,
+                exit_status: None,
+            }
+        }
+    }
+
+    fn truncated_output(&self, cx: &App) -> (String, usize) {
+        let terminal = self.terminal.read(cx);
+        let mut content = terminal.get_content();
+
+        let original_content_len = content.len();
+
+        if let Some(limit) = self.output_byte_limit
+            && content.len() > limit
+        {
+            let mut end_ix = limit.min(content.len());
+            while !content.is_char_boundary(end_ix) {
+                end_ix -= 1;
+            }
+            // Don't truncate mid-line, clear the remainder of the last line
+            end_ix = content[..end_ix].rfind('\n').unwrap_or(end_ix);
+            content.truncate(end_ix);
+        }
+
+        (content, original_content_len)
     }
 
     pub fn command(&self) -> &Entity<Markdown> {
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 68246a96b0..0e9c8fcf72 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -48,7 +48,6 @@ log.workspace = true
 open.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
-portable-pty.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 rust-embed.workspace = true
@@ -68,7 +67,6 @@ util.workspace = true
 uuid.workspace = true
 watch.workspace = true
 web_search.workspace = true
-which.workspace = true
 workspace-hack.workspace = true
 zstd.workspace = true
 
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index bb6a3c097c..e96b4c0cfa 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -2,7 +2,7 @@ use crate::{
     ContextServerRegistry, Thread, ThreadEvent, ThreadsDatabase, ToolCallAuthorization,
     UserMessageContent, templates::Templates,
 };
-use crate::{HistoryStore, TitleUpdated, TokenUsageUpdated};
+use crate::{HistoryStore, TerminalHandle, ThreadEnvironment, TitleUpdated, TokenUsageUpdated};
 use acp_thread::{AcpThread, AgentModelSelector};
 use action_log::ActionLog;
 use agent_client_protocol as acp;
@@ -10,7 +10,8 @@ use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, anyhow};
 use collections::{HashSet, IndexMap};
 use fs::Fs;
-use futures::channel::mpsc;
+use futures::channel::{mpsc, oneshot};
+use futures::future::Shared;
 use futures::{StreamExt, future};
 use gpui::{
     App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
@@ -23,7 +24,7 @@ use prompt_store::{
 use settings::update_settings_file;
 use std::any::Any;
 use std::collections::HashMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::rc::Rc;
 use std::sync::Arc;
 use util::ResultExt;
@@ -276,13 +277,6 @@ impl NativeAgent {
         cx: &mut Context<Self>,
     ) -> Entity<AcpThread> {
         let connection = Rc::new(NativeAgentConnection(cx.entity()));
-        let registry = LanguageModelRegistry::read_global(cx);
-        let summarization_model = registry.thread_summary_model().map(|c| c.model);
-
-        thread_handle.update(cx, |thread, cx| {
-            thread.set_summarization_model(summarization_model, cx);
-            thread.add_default_tools(cx)
-        });
 
         let thread = thread_handle.read(cx);
         let session_id = thread.id().clone();
@@ -301,6 +295,20 @@ impl NativeAgent {
                 cx,
             )
         });
+
+        let registry = LanguageModelRegistry::read_global(cx);
+        let summarization_model = registry.thread_summary_model().map(|c| c.model);
+
+        thread_handle.update(cx, |thread, cx| {
+            thread.set_summarization_model(summarization_model, cx);
+            thread.add_default_tools(
+                Rc::new(AcpThreadEnvironment {
+                    acp_thread: acp_thread.downgrade(),
+                }) as _,
+                cx,
+            )
+        });
+
         let subscriptions = vec![
             cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
                 this.sessions.remove(acp_thread.session_id());
@@ -1001,7 +1009,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
     ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
         self.0.read_with(cx, |agent, _cx| {
             agent.sessions.get(session_id).map(|session| {
-                Rc::new(NativeAgentSessionEditor {
+                Rc::new(NativeAgentSessionTruncate {
                     thread: session.thread.clone(),
                     acp_thread: session.acp_thread.clone(),
                 }) as _
@@ -1050,12 +1058,12 @@ impl acp_thread::AgentTelemetry for NativeAgentConnection {
     }
 }
 
-struct NativeAgentSessionEditor {
+struct NativeAgentSessionTruncate {
     thread: Entity<Thread>,
     acp_thread: WeakEntity<AcpThread>,
 }
 
-impl acp_thread::AgentSessionTruncate for NativeAgentSessionEditor {
+impl acp_thread::AgentSessionTruncate for NativeAgentSessionTruncate {
     fn run(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
         match self.thread.update(cx, |thread, cx| {
             thread.truncate(message_id.clone(), cx)?;
@@ -1104,6 +1112,66 @@ impl acp_thread::AgentSessionSetTitle for NativeAgentSessionSetTitle {
     }
 }
 
+pub struct AcpThreadEnvironment {
+    acp_thread: WeakEntity<AcpThread>,
+}
+
+impl ThreadEnvironment for AcpThreadEnvironment {
+    fn create_terminal(
+        &self,
+        command: String,
+        cwd: Option<PathBuf>,
+        output_byte_limit: Option<u64>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<Rc<dyn TerminalHandle>>> {
+        let task = self.acp_thread.update(cx, |thread, cx| {
+            thread.create_terminal(command, vec![], vec![], cwd, output_byte_limit, cx)
+        });
+
+        let acp_thread = self.acp_thread.clone();
+        cx.spawn(async move |cx| {
+            let terminal = task?.await?;
+
+            let (drop_tx, drop_rx) = oneshot::channel();
+            let terminal_id = terminal.read_with(cx, |terminal, _cx| terminal.id().clone())?;
+
+            cx.spawn(async move |cx| {
+                drop_rx.await.ok();
+                acp_thread.update(cx, |thread, cx| thread.release_terminal(terminal_id, cx))
+            })
+            .detach();
+
+            let handle = AcpTerminalHandle {
+                terminal,
+                _drop_tx: Some(drop_tx),
+            };
+
+            Ok(Rc::new(handle) as _)
+        })
+    }
+}
+
+pub struct AcpTerminalHandle {
+    terminal: Entity<acp_thread::Terminal>,
+    _drop_tx: Option<oneshot::Sender<()>>,
+}
+
+impl TerminalHandle for AcpTerminalHandle {
+    fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId> {
+        self.terminal.read_with(cx, |term, _cx| term.id().clone())
+    }
+
+    fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>> {
+        self.terminal
+            .read_with(cx, |term, _cx| term.wait_for_exit())
+    }
+
+    fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse> {
+        self.terminal
+            .read_with(cx, |term, cx| term.current_output(cx))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::HistoryEntryId;
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 8ff5b84506..6421e4982e 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -45,14 +45,15 @@ use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;
-use std::fmt::Write;
 use std::{
     collections::BTreeMap,
     ops::RangeInclusive,
     path::Path,
+    rc::Rc,
     sync::Arc,
     time::{Duration, Instant},
 };
+use std::{fmt::Write, path::PathBuf};
 use util::{ResultExt, debug_panic, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
 
@@ -523,6 +524,22 @@ pub enum AgentMessageContent {
     ToolUse(LanguageModelToolUse),
 }
 
+pub trait TerminalHandle {
+    fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId>;
+    fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse>;
+    fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>>;
+}
+
+pub trait ThreadEnvironment {
+    fn create_terminal(
+        &self,
+        command: String,
+        cwd: Option<PathBuf>,
+        output_byte_limit: Option<u64>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<Rc<dyn TerminalHandle>>>;
+}
+
 #[derive(Debug)]
 pub enum ThreadEvent {
     UserMessage(UserMessage),
@@ -535,6 +552,14 @@ pub enum ThreadEvent {
     Stop(acp::StopReason),
 }
 
+#[derive(Debug)]
+pub struct NewTerminal {
+    pub command: String,
+    pub output_byte_limit: Option<u64>,
+    pub cwd: Option<PathBuf>,
+    pub response: oneshot::Sender<Result<Entity<acp_thread::Terminal>>>,
+}
+
 #[derive(Debug)]
 pub struct ToolCallAuthorization {
     pub tool_call: acp::ToolCallUpdate,
@@ -1024,7 +1049,11 @@ impl Thread {
         }
     }
 
-    pub fn add_default_tools(&mut self, cx: &mut Context<Self>) {
+    pub fn add_default_tools(
+        &mut self,
+        environment: Rc<dyn ThreadEnvironment>,
+        cx: &mut Context<Self>,
+    ) {
         let language_registry = self.project.read(cx).languages().clone();
         self.add_tool(CopyPathTool::new(self.project.clone()));
         self.add_tool(CreateDirectoryTool::new(self.project.clone()));
@@ -1045,7 +1074,7 @@ impl Thread {
             self.project.clone(),
             self.action_log.clone(),
         ));
-        self.add_tool(TerminalTool::new(self.project.clone(), cx));
+        self.add_tool(TerminalTool::new(self.project.clone(), environment));
         self.add_tool(ThinkingTool);
         self.add_tool(WebSearchTool);
     }
@@ -2389,19 +2418,6 @@ impl ToolCallEventStream {
             .ok();
     }
 
-    pub fn update_terminal(&self, terminal: Entity<acp_thread::Terminal>) {
-        self.stream
-            .0
-            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
-                acp_thread::ToolCallUpdateTerminal {
-                    id: acp::ToolCallId(self.tool_use_id.to_string().into()),
-                    terminal,
-                }
-                .into(),
-            )))
-            .ok();
-    }
-
     pub fn authorize(&self, title: impl Into<String>, cx: &mut App) -> Task<Result<()>> {
         if agent_settings::AgentSettings::get_global(cx).always_allow_tool_actions {
             return Task::ready(Ok(()));
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index 2270a7c32f..9ed585b138 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -1,19 +1,19 @@
 use agent_client_protocol as acp;
 use anyhow::Result;
-use futures::{FutureExt as _, future::Shared};
-use gpui::{App, AppContext, Entity, SharedString, Task};
+use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::{
     path::{Path, PathBuf},
+    rc::Rc,
     sync::Arc,
 };
-use util::{ResultExt, get_system_shell, markdown::MarkdownInlineCode};
+use util::markdown::MarkdownInlineCode;
 
-use crate::{AgentTool, ToolCallEventStream};
+use crate::{AgentTool, ThreadEnvironment, ToolCallEventStream};
 
-const COMMAND_OUTPUT_LIMIT: usize = 16 * 1024;
+const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
 
 /// Executes a shell one-liner and returns the combined output.
 ///
@@ -36,25 +36,14 @@ pub struct TerminalToolInput {
 
 pub struct TerminalTool {
     project: Entity<Project>,
-    determine_shell: Shared<Task<String>>,
+    environment: Rc<dyn ThreadEnvironment>,
 }
 
 impl TerminalTool {
-    pub fn new(project: Entity<Project>, cx: &mut App) -> Self {
-        let determine_shell = cx.background_spawn(async move {
-            if cfg!(windows) {
-                return get_system_shell();
-            }
-
-            if which::which("bash").is_ok() {
-                "bash".into()
-            } else {
-                get_system_shell()
-            }
-        });
+    pub fn new(project: Entity<Project>, environment: Rc<dyn ThreadEnvironment>) -> Self {
         Self {
             project,
-            determine_shell: determine_shell.shared(),
+            environment,
         }
     }
 }
@@ -99,128 +88,49 @@ impl AgentTool for TerminalTool {
         event_stream: ToolCallEventStream,
         cx: &mut App,
     ) -> Task<Result<Self::Output>> {
-        let language_registry = self.project.read(cx).languages().clone();
         let working_dir = match working_dir(&input, &self.project, cx) {
             Ok(dir) => dir,
             Err(err) => return Task::ready(Err(err)),
         };
-        let program = self.determine_shell.clone();
-        let command = if cfg!(windows) {
-            format!("$null | & {{{}}}", input.command.replace("\"", "'"))
-        } else if let Some(cwd) = working_dir
-            .as_ref()
-            .and_then(|cwd| cwd.as_os_str().to_str())
-        {
-            // Make sure once we're *inside* the shell, we cd into `cwd`
-            format!("(cd {cwd}; {}) </dev/null", input.command)
-        } else {
-            format!("({}) </dev/null", input.command)
-        };
-        let args = vec!["-c".into(), command];
-
-        let env = match &working_dir {
-            Some(dir) => self.project.update(cx, |project, cx| {
-                project.directory_environment(dir.as_path().into(), cx)
-            }),
-            None => Task::ready(None).shared(),
-        };
-
-        let env = cx.spawn(async move |_| {
-            let mut env = env.await.unwrap_or_default();
-            if cfg!(unix) {
-                env.insert("PAGER".into(), "cat".into());
-            }
-            env
-        });
 
         let authorize = event_stream.authorize(self.initial_title(Ok(input.clone())), cx);
+        cx.spawn(async move |cx| {
+            authorize.await?;
 
-        cx.spawn({
-            async move |cx| {
-                authorize.await?;
+            let terminal = self
+                .environment
+                .create_terminal(
+                    input.command.clone(),
+                    working_dir,
+                    Some(COMMAND_OUTPUT_LIMIT),
+                    cx,
+                )
+                .await?;
 
-                let program = program.await;
-                let env = env.await;
-                let terminal = self
-                    .project
-                    .update(cx, |project, cx| {
-                        project.create_terminal_task(
-                            task::SpawnInTerminal {
-                                command: Some(program),
-                                args,
-                                cwd: working_dir.clone(),
-                                env,
-                                ..Default::default()
-                            },
-                            cx,
-                        )
-                    })?
-                    .await?;
-                let acp_terminal = cx.new(|cx| {
-                    acp_thread::Terminal::new(
-                        input.command.clone(),
-                        working_dir.clone(),
-                        terminal.clone(),
-                        language_registry,
-                        cx,
-                    )
-                })?;
-                event_stream.update_terminal(acp_terminal.clone());
+            let terminal_id = terminal.id(cx)?;
+            event_stream.update_fields(acp::ToolCallUpdateFields {
+                content: Some(vec![acp::ToolCallContent::Terminal { terminal_id }]),
+                ..Default::default()
+            });
 
-                let exit_status = terminal
-                    .update(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
-                    .await;
-                let (content, content_line_count) = terminal.read_with(cx, |terminal, _| {
-                    (terminal.get_content(), terminal.total_lines())
-                })?;
+            let exit_status = terminal.wait_for_exit(cx)?.await;
+            let output = terminal.current_output(cx)?;
 
-                let (processed_content, finished_with_empty_output) = process_content(
-                    &content,
-                    &input.command,
-                    exit_status.map(portable_pty::ExitStatus::from),
-                );
-
-                acp_terminal
-                    .update(cx, |terminal, cx| {
-                        terminal.finish(
-                            exit_status,
-                            content.len(),
-                            processed_content.len(),
-                            content_line_count,
-                            finished_with_empty_output,
-                            cx,
-                        );
-                    })
-                    .log_err();
-
-                Ok(processed_content)
-            }
+            Ok(process_content(output, &input.command, exit_status))
         })
     }
 }
 
 fn process_content(
-    content: &str,
+    output: acp::TerminalOutputResponse,
     command: &str,
-    exit_status: Option<portable_pty::ExitStatus>,
-) -> (String, bool) {
-    let should_truncate = content.len() > COMMAND_OUTPUT_LIMIT;
-
-    let content = if should_truncate {
-        let mut end_ix = COMMAND_OUTPUT_LIMIT.min(content.len());
-        while !content.is_char_boundary(end_ix) {
-            end_ix -= 1;
-        }
-        // Don't truncate mid-line, clear the remainder of the last line
-        end_ix = content[..end_ix].rfind('\n').unwrap_or(end_ix);
-        &content[..end_ix]
-    } else {
-        content
-    };
-    let content = content.trim();
+    exit_status: acp::TerminalExitStatus,
+) -> String {
+    let content = output.output.trim();
     let is_empty = content.is_empty();
+
     let content = format!("```\n{content}\n```");
-    let content = if should_truncate {
+    let content = if output.truncated {
         format!(
             "Command output too long. The first {} bytes:\n\n{content}",
             content.len(),
@@ -229,24 +139,21 @@ fn process_content(
         content
     };
 
-    let content = match exit_status {
-        Some(exit_status) if exit_status.success() => {
+    let content = match exit_status.exit_code {
+        Some(0) => {
             if is_empty {
                 "Command executed successfully.".to_string()
             } else {
                 content
             }
         }
-        Some(exit_status) => {
+        Some(exit_code) => {
             if is_empty {
-                format!(
-                    "Command \"{command}\" failed with exit code {}.",
-                    exit_status.exit_code()
-                )
+                format!("Command \"{command}\" failed with exit code {}.", exit_code)
             } else {
                 format!(
                     "Command \"{command}\" failed with exit code {}.\n\n{content}",
-                    exit_status.exit_code()
+                    exit_code
                 )
             }
         }
@@ -257,7 +164,7 @@ fn process_content(
             )
         }
     };
-    (content, is_empty)
+    content
 }
 
 fn working_dir(
@@ -300,169 +207,3 @@ fn working_dir(
         anyhow::bail!("`cd` directory {cd:?} was not in any of the project's worktrees.");
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use agent_settings::AgentSettings;
-    use editor::EditorSettings;
-    use fs::RealFs;
-    use gpui::{BackgroundExecutor, TestAppContext};
-    use pretty_assertions::assert_eq;
-    use serde_json::json;
-    use settings::{Settings, SettingsStore};
-    use terminal::terminal_settings::TerminalSettings;
-    use theme::ThemeSettings;
-    use util::test::TempTree;
-
-    use crate::ThreadEvent;
-
-    use super::*;
-
-    fn init_test(executor: &BackgroundExecutor, cx: &mut TestAppContext) {
-        zlog::init_test();
-
-        executor.allow_parking();
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-            ThemeSettings::register(cx);
-            TerminalSettings::register(cx);
-            EditorSettings::register(cx);
-            AgentSettings::register(cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_interactive_command(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        if cfg!(windows) {
-            return;
-        }
-
-        init_test(&executor, cx);
-
-        let fs = Arc::new(RealFs::new(None, executor));
-        let tree = TempTree::new(json!({
-            "project": {},
-        }));
-        let project: Entity<Project> =
-            Project::test(fs, [tree.path().join("project").as_path()], cx).await;
-
-        let input = TerminalToolInput {
-            command: "cat".to_owned(),
-            cd: tree
-                .path()
-                .join("project")
-                .as_path()
-                .to_string_lossy()
-                .to_string(),
-        };
-        let (event_stream_tx, mut event_stream_rx) = ToolCallEventStream::test();
-        let result = cx
-            .update(|cx| Arc::new(TerminalTool::new(project, cx)).run(input, event_stream_tx, cx));
-
-        let auth = event_stream_rx.expect_authorization().await;
-        auth.response.send(auth.options[0].id.clone()).unwrap();
-        event_stream_rx.expect_terminal().await;
-        assert_eq!(result.await.unwrap(), "Command executed successfully.");
-    }
-
-    #[gpui::test]
-    async fn test_working_directory(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        if cfg!(windows) {
-            return;
-        }
-
-        init_test(&executor, cx);
-
-        let fs = Arc::new(RealFs::new(None, executor));
-        let tree = TempTree::new(json!({
-            "project": {},
-            "other-project": {},
-        }));
-        let project: Entity<Project> =
-            Project::test(fs, [tree.path().join("project").as_path()], cx).await;
-
-        let check = |input, expected, cx: &mut TestAppContext| {
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let result = cx.update(|cx| {
-                Arc::new(TerminalTool::new(project.clone(), cx)).run(input, stream_tx, cx)
-            });
-            cx.run_until_parked();
-            let event = stream_rx.try_next();
-            if let Ok(Some(Ok(ThreadEvent::ToolCallAuthorization(auth)))) = event {
-                auth.response.send(auth.options[0].id.clone()).unwrap();
-            }
-
-            cx.spawn(async move |_| {
-                let output = result.await;
-                assert_eq!(output.ok(), expected);
-            })
-        };
-
-        check(
-            TerminalToolInput {
-                command: "pwd".into(),
-                cd: ".".into(),
-            },
-            Some(format!(
-                "```\n{}\n```",
-                tree.path().join("project").display()
-            )),
-            cx,
-        )
-        .await;
-
-        check(
-            TerminalToolInput {
-                command: "pwd".into(),
-                cd: "other-project".into(),
-            },
-            None, // other-project is a dir, but *not* a worktree (yet)
-            cx,
-        )
-        .await;
-
-        // Absolute path above the worktree root
-        check(
-            TerminalToolInput {
-                command: "pwd".into(),
-                cd: tree.path().to_string_lossy().into(),
-            },
-            None,
-            cx,
-        )
-        .await;
-
-        project
-            .update(cx, |project, cx| {
-                project.create_worktree(tree.path().join("other-project"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        check(
-            TerminalToolInput {
-                command: "pwd".into(),
-                cd: "other-project".into(),
-            },
-            Some(format!(
-                "```\n{}\n```",
-                tree.path().join("other-project").display()
-            )),
-            cx,
-        )
-        .await;
-
-        check(
-            TerminalToolInput {
-                command: "pwd".into(),
-                cd: ".".into(),
-            },
-            None,
-            cx,
-        )
-        .await;
-    }
-}
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index b1d4bea5c3..b29bfd5d89 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -134,6 +134,7 @@ impl AcpConnection {
                         read_text_file: true,
                         write_text_file: true,
                     },
+                    terminal: true,
                 },
             })
             .await?;
@@ -344,11 +345,7 @@ impl acp::Client for ClientDelegate {
         let cx = &mut self.cx.clone();
 
         let task = self
-            .sessions
-            .borrow()
-            .get(&arguments.session_id)
-            .context("Failed to get session")?
-            .thread
+            .session_thread(&arguments.session_id)?
             .update(cx, |thread, cx| {
                 thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
             })??;
@@ -364,11 +361,7 @@ impl acp::Client for ClientDelegate {
     ) -> Result<(), acp::Error> {
         let cx = &mut self.cx.clone();
         let task = self
-            .sessions
-            .borrow()
-            .get(&arguments.session_id)
-            .context("Failed to get session")?
-            .thread
+            .session_thread(&arguments.session_id)?
             .update(cx, |thread, cx| {
                 thread.write_text_file(arguments.path, arguments.content, cx)
             })?;
@@ -382,16 +375,12 @@ impl acp::Client for ClientDelegate {
         &self,
         arguments: acp::ReadTextFileRequest,
     ) -> Result<acp::ReadTextFileResponse, acp::Error> {
-        let cx = &mut self.cx.clone();
-        let task = self
-            .sessions
-            .borrow()
-            .get(&arguments.session_id)
-            .context("Failed to get session")?
-            .thread
-            .update(cx, |thread, cx| {
+        let task = self.session_thread(&arguments.session_id)?.update(
+            &mut self.cx.clone(),
+            |thread, cx| {
                 thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
-            })?;
+            },
+        )?;
 
         let content = task.await?;
 
@@ -402,16 +391,92 @@ impl acp::Client for ClientDelegate {
         &self,
         notification: acp::SessionNotification,
     ) -> Result<(), acp::Error> {
-        let cx = &mut self.cx.clone();
-        let sessions = self.sessions.borrow();
-        let session = sessions
-            .get(&notification.session_id)
-            .context("Failed to get session")?;
-
-        session.thread.update(cx, |thread, cx| {
-            thread.handle_session_update(notification.update, cx)
-        })??;
+        self.session_thread(&notification.session_id)?
+            .update(&mut self.cx.clone(), |thread, cx| {
+                thread.handle_session_update(notification.update, cx)
+            })??;
 
         Ok(())
     }
+
+    async fn create_terminal(
+        &self,
+        args: acp::CreateTerminalRequest,
+    ) -> Result<acp::CreateTerminalResponse, acp::Error> {
+        let terminal = self
+            .session_thread(&args.session_id)?
+            .update(&mut self.cx.clone(), |thread, cx| {
+                thread.create_terminal(
+                    args.command,
+                    args.args,
+                    args.env,
+                    args.cwd,
+                    args.output_byte_limit,
+                    cx,
+                )
+            })?
+            .await?;
+        Ok(
+            terminal.read_with(&self.cx, |terminal, _| acp::CreateTerminalResponse {
+                terminal_id: terminal.id().clone(),
+            })?,
+        )
+    }
+
+    async fn kill_terminal(&self, args: acp::KillTerminalRequest) -> Result<(), acp::Error> {
+        self.session_thread(&args.session_id)?
+            .update(&mut self.cx.clone(), |thread, cx| {
+                thread.kill_terminal(args.terminal_id, cx)
+            })??;
+
+        Ok(())
+    }
+
+    async fn release_terminal(&self, args: acp::ReleaseTerminalRequest) -> Result<(), acp::Error> {
+        self.session_thread(&args.session_id)?
+            .update(&mut self.cx.clone(), |thread, cx| {
+                thread.release_terminal(args.terminal_id, cx)
+            })??;
+
+        Ok(())
+    }
+
+    async fn terminal_output(
+        &self,
+        args: acp::TerminalOutputRequest,
+    ) -> Result<acp::TerminalOutputResponse, acp::Error> {
+        self.session_thread(&args.session_id)?
+            .read_with(&mut self.cx.clone(), |thread, cx| {
+                let out = thread
+                    .terminal(args.terminal_id)?
+                    .read(cx)
+                    .current_output(cx);
+
+                Ok(out)
+            })?
+    }
+
+    async fn wait_for_terminal_exit(
+        &self,
+        args: acp::WaitForTerminalExitRequest,
+    ) -> Result<acp::WaitForTerminalExitResponse, acp::Error> {
+        let exit_status = self
+            .session_thread(&args.session_id)?
+            .update(&mut self.cx.clone(), |thread, cx| {
+                anyhow::Ok(thread.terminal(args.terminal_id)?.read(cx).wait_for_exit())
+            })??
+            .await;
+
+        Ok(acp::WaitForTerminalExitResponse { exit_status })
+    }
+}
+
+impl ClientDelegate {
+    fn session_thread(&self, session_id: &acp::SessionId) -> Result<WeakEntity<AcpThread>> {
+        let sessions = self.sessions.borrow();
+        sessions
+            .get(session_id)
+            .context("Failed to get session")
+            .map(|session| session.thread.clone())
+    }
 }
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 76b3709325..0103219e31 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -125,22 +125,35 @@ impl EntryViewState {
                     views
                 };
 
+                let is_tool_call_completed =
+                    matches!(tool_call.status, acp_thread::ToolCallStatus::Completed);
+
                 for terminal in terminals {
-                    views.entry(terminal.entity_id()).or_insert_with(|| {
-                        let element = create_terminal(
-                            self.workspace.clone(),
-                            self.project.clone(),
-                            terminal.clone(),
-                            window,
-                            cx,
-                        )
-                        .into_any();
-                        cx.emit(EntryViewEvent {
-                            entry_index: index,
-                            view_event: ViewEvent::NewTerminal(id.clone()),
-                        });
-                        element
-                    });
+                    match views.entry(terminal.entity_id()) {
+                        collections::hash_map::Entry::Vacant(entry) => {
+                            let element = create_terminal(
+                                self.workspace.clone(),
+                                self.project.clone(),
+                                terminal.clone(),
+                                window,
+                                cx,
+                            )
+                            .into_any();
+                            cx.emit(EntryViewEvent {
+                                entry_index: index,
+                                view_event: ViewEvent::NewTerminal(id.clone()),
+                            });
+                            entry.insert(element);
+                        }
+                        collections::hash_map::Entry::Occupied(_entry) => {
+                            if is_tool_call_completed && terminal.read(cx).output().is_none() {
+                                cx.emit(EntryViewEvent {
+                                    entry_index: index,
+                                    view_event: ViewEvent::TerminalMovedToBackground(id.clone()),
+                                });
+                            }
+                        }
+                    }
                 }
 
                 for diff in diffs {
@@ -217,6 +230,7 @@ pub struct EntryViewEvent {
 pub enum ViewEvent {
     NewDiff(ToolCallId),
     NewTerminal(ToolCallId),
+    TerminalMovedToBackground(ToolCallId),
     MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index eff9ceedd4..5e842d713d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -827,6 +827,9 @@ impl AcpThreadView {
                     self.expanded_tool_calls.insert(tool_call_id.clone());
                 }
             }
+            ViewEvent::TerminalMovedToBackground(tool_call_id) => {
+                self.expanded_tool_calls.remove(tool_call_id);
+            }
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
                 if let Some(thread) = self.thread()
                     && let Some(AgentThreadEntry::UserMessage(user_message)) =
@@ -2418,7 +2421,8 @@ impl AcpThreadView {
 
         let output = terminal_data.output();
         let command_finished = output.is_some();
-        let truncated_output = output.is_some_and(|output| output.was_content_truncated);
+        let truncated_output =
+            output.is_some_and(|output| output.original_content_len > output.content.len());
         let output_line_count = output.map(|output| output.content_line_count).unwrap_or(0);
 
         let command_failed = command_finished
@@ -2540,14 +2544,14 @@ impl AcpThreadView {
             .when(truncated_output, |header| {
                 let tooltip = if let Some(output) = output {
                     if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
-                        "Output exceeded terminal max lines and was \
-                            truncated, the model received the first 16 KB."
-                            .to_string()
+                       format!("Output exceeded terminal max lines and was \
+                            truncated, the model received the first {}.", format_file_size(output.content.len() as u64, true))
                     } else {
                         format!(
                             "Output is {} long, and to avoid unexpected token usage, \
-                                only 16 KB was sent back to the model.",
+                                only {} was sent back to the agent.",
                             format_file_size(output.original_content_len as u64, true),
+                             format_file_size(output.content.len() as u64, true)
                         )
                     }
                 } else {

From 965dbc988fae39cc9dfdd7cdac6f38e8234b3913 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 1 Sep 2025 15:33:11 -0400
Subject: [PATCH 507/823] gpui: Fix typo in Windows alpha correction shader
 (#37328)

This PR fixes a typo in the Windows alpha correction shader that is now
caught by https://github.com/zed-industries/zed/pull/37314.

Another case that could be addressed by Bors.

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/alpha_correction.hlsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/windows/alpha_correction.hlsl b/crates/gpui/src/platform/windows/alpha_correction.hlsl
index 7844a15f48..dc8d0b5dc5 100644
--- a/crates/gpui/src/platform/windows/alpha_correction.hlsl
+++ b/crates/gpui/src/platform/windows/alpha_correction.hlsl
@@ -1,5 +1,5 @@
 float color_brightness(float3 color) {
-    // REC. 601 luminance coefficients for percieved brightness
+    // REC. 601 luminance coefficients for perceived brightness
     return dot(color, float3(0.30f, 0.59f, 0.11f));
 }
 

From 2ba25b5c940e9e2a9584001b7deb3ea783f8a259 Mon Sep 17 00:00:00 2001
From: claytonrcarter <claytonrcarter@gmail.com>
Date: Mon, 1 Sep 2025 16:00:01 -0400
Subject: [PATCH 508/823] editor: Support rewrap in block comments (#34418)

This updates `editor: rewrap` to work within doc comments, based on the
code that extends such comments on newline. I added some tests, and I've
tested it out in JS, C and PHP. (Though PHP depends on
https://github.com/zed-extensions/php/pull/40)

Closes #19794
Closes #18221

**Caveat:**
~~This will not rewrap an existing single-line block comment, such as
the one provided in #18221:~~ this will now rewrap as expected
```c
/* we can triangulate any convex polygon by picking a vertex and connecting it to the next two vertices; we first read two vertices, and then, for every subsequent vertex, we can form a triangle by connecting it to the first and previous vertex */
```
However, it will rewrap a similar comment if it is shaped like a doc
comment. In other words, this will rewrap as expected:
```c
/*
 * we can triangulate any convex polygon by picking a vertex and connecting it to the next two vertices; we first read two vertices, and then, for every subsequent vertex, we can form a triangle by connecting it to the first and previous vertex
 */
```

This seems like a reasonable improvement and limitation to me,
especially as a first step.

cc @smitbarmase because I think that you've been making a lot of the
`newline` and `rewrap` changes recently. (Thank you for those, by the
way!)

Release Notes:

- Added support for rewrap in block comments.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
---
 crates/editor/src/editor.rs       | 215 +++++++++++----
 crates/editor/src/editor_tests.rs | 425 +++++++++++++++++++++++++++++-
 2 files changed, 581 insertions(+), 59 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 04780e79f8..d5621e8165 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11816,6 +11816,18 @@ impl Editor {
         let buffer = self.buffer.read(cx).snapshot(cx);
         let selections = self.selections.all::<Point>(cx);
 
+        #[derive(Clone, Debug, PartialEq)]
+        enum CommentFormat {
+            /// single line comment, with prefix for line
+            Line(String),
+            /// single line within a block comment, with prefix for line
+            BlockLine(String),
+            /// a single line of a block comment that includes the initial delimiter
+            BlockCommentWithStart(BlockCommentConfig),
+            /// a single line of a block comment that includes the ending delimiter
+            BlockCommentWithEnd(BlockCommentConfig),
+        }
+
         // Split selections to respect paragraph, indent, and comment prefix boundaries.
         let wrap_ranges = selections.into_iter().flat_map(|selection| {
             let mut non_blank_rows_iter = (selection.start.row..=selection.end.row)
@@ -11832,37 +11844,75 @@ impl Editor {
             let language_scope = buffer.language_scope_at(selection.head());
 
             let indent_and_prefix_for_row =
-                |row: u32| -> (IndentSize, Option<String>, Option<String>) {
+                |row: u32| -> (IndentSize, Option<CommentFormat>, Option<String>) {
                     let indent = buffer.indent_size_for_line(MultiBufferRow(row));
-                    let (comment_prefix, rewrap_prefix) =
-                        if let Some(language_scope) = &language_scope {
-                            let indent_end = Point::new(row, indent.len);
-                            let comment_prefix = language_scope
+                    let (comment_prefix, rewrap_prefix) = if let Some(language_scope) =
+                        &language_scope
+                    {
+                        let indent_end = Point::new(row, indent.len);
+                        let line_end = Point::new(row, buffer.line_len(MultiBufferRow(row)));
+                        let line_text_after_indent = buffer
+                            .text_for_range(indent_end..line_end)
+                            .collect::<String>();
+
+                        let is_within_comment_override = buffer
+                            .language_scope_at(indent_end)
+                            .is_some_and(|scope| scope.override_name() == Some("comment"));
+                        let comment_delimiters = if is_within_comment_override {
+                            // we are within a comment syntax node, but we don't
+                            // yet know what kind of comment: block, doc or line
+                            match (
+                                language_scope.documentation_comment(),
+                                language_scope.block_comment(),
+                            ) {
+                                (Some(config), _) | (_, Some(config))
+                                    if buffer.contains_str_at(indent_end, &config.start) =>
+                                {
+                                    Some(CommentFormat::BlockCommentWithStart(config.clone()))
+                                }
+                                (Some(config), _) | (_, Some(config))
+                                    if line_text_after_indent.ends_with(config.end.as_ref()) =>
+                                {
+                                    Some(CommentFormat::BlockCommentWithEnd(config.clone()))
+                                }
+                                (Some(config), _) | (_, Some(config))
+                                    if buffer.contains_str_at(indent_end, &config.prefix) =>
+                                {
+                                    Some(CommentFormat::BlockLine(config.prefix.to_string()))
+                                }
+                                (_, _) => language_scope
+                                    .line_comment_prefixes()
+                                    .iter()
+                                    .find(|prefix| buffer.contains_str_at(indent_end, prefix))
+                                    .map(|prefix| CommentFormat::Line(prefix.to_string())),
+                            }
+                        } else {
+                            // we not in an overridden comment node, but we may
+                            // be within a non-overridden line comment node
+                            language_scope
                                 .line_comment_prefixes()
                                 .iter()
                                 .find(|prefix| buffer.contains_str_at(indent_end, prefix))
-                                .map(|prefix| prefix.to_string());
-                            let line_end = Point::new(row, buffer.line_len(MultiBufferRow(row)));
-                            let line_text_after_indent = buffer
-                                .text_for_range(indent_end..line_end)
-                                .collect::<String>();
-                            let rewrap_prefix = language_scope
-                                .rewrap_prefixes()
-                                .iter()
-                                .find_map(|prefix_regex| {
-                                    prefix_regex.find(&line_text_after_indent).map(|mat| {
-                                        if mat.start() == 0 {
-                                            Some(mat.as_str().to_string())
-                                        } else {
-                                            None
-                                        }
-                                    })
-                                })
-                                .flatten();
-                            (comment_prefix, rewrap_prefix)
-                        } else {
-                            (None, None)
+                                .map(|prefix| CommentFormat::Line(prefix.to_string()))
                         };
+
+                        let rewrap_prefix = language_scope
+                            .rewrap_prefixes()
+                            .iter()
+                            .find_map(|prefix_regex| {
+                                prefix_regex.find(&line_text_after_indent).map(|mat| {
+                                    if mat.start() == 0 {
+                                        Some(mat.as_str().to_string())
+                                    } else {
+                                        None
+                                    }
+                                })
+                            })
+                            .flatten();
+                        (comment_delimiters, rewrap_prefix)
+                    } else {
+                        (None, None)
+                    };
                     (indent, comment_prefix, rewrap_prefix)
                 };
 
@@ -11873,22 +11923,22 @@ impl Editor {
             let mut prev_row = first_row;
             let (
                 mut current_range_indent,
-                mut current_range_comment_prefix,
+                mut current_range_comment_delimiters,
                 mut current_range_rewrap_prefix,
             ) = indent_and_prefix_for_row(first_row);
 
             for row in non_blank_rows_iter.skip(1) {
                 let has_paragraph_break = row > prev_row + 1;
 
-                let (row_indent, row_comment_prefix, row_rewrap_prefix) =
+                let (row_indent, row_comment_delimiters, row_rewrap_prefix) =
                     indent_and_prefix_for_row(row);
 
                 let has_indent_change = row_indent != current_range_indent;
-                let has_comment_change = row_comment_prefix != current_range_comment_prefix;
+                let has_comment_change = row_comment_delimiters != current_range_comment_delimiters;
 
                 let has_boundary_change = has_comment_change
                     || row_rewrap_prefix.is_some()
-                    || (has_indent_change && current_range_comment_prefix.is_some());
+                    || (has_indent_change && current_range_comment_delimiters.is_some());
 
                 if has_paragraph_break || has_boundary_change {
                     ranges.push((
@@ -11896,13 +11946,13 @@ impl Editor {
                         Point::new(current_range_start, 0)
                             ..Point::new(prev_row, buffer.line_len(MultiBufferRow(prev_row))),
                         current_range_indent,
-                        current_range_comment_prefix.clone(),
+                        current_range_comment_delimiters.clone(),
                         current_range_rewrap_prefix.clone(),
                         from_empty_selection,
                     ));
                     current_range_start = row;
                     current_range_indent = row_indent;
-                    current_range_comment_prefix = row_comment_prefix;
+                    current_range_comment_delimiters = row_comment_delimiters;
                     current_range_rewrap_prefix = row_rewrap_prefix;
                 }
                 prev_row = row;
@@ -11913,7 +11963,7 @@ impl Editor {
                 Point::new(current_range_start, 0)
                     ..Point::new(prev_row, buffer.line_len(MultiBufferRow(prev_row))),
                 current_range_indent,
-                current_range_comment_prefix,
+                current_range_comment_delimiters,
                 current_range_rewrap_prefix,
                 from_empty_selection,
             ));
@@ -11927,7 +11977,7 @@ impl Editor {
         for (
             language_settings,
             wrap_range,
-            indent_size,
+            mut indent_size,
             comment_prefix,
             rewrap_prefix,
             from_empty_selection,
@@ -11947,16 +11997,26 @@ impl Editor {
 
             let tab_size = language_settings.tab_size;
 
+            let (line_prefix, inside_comment) = match &comment_prefix {
+                Some(CommentFormat::Line(prefix) | CommentFormat::BlockLine(prefix)) => {
+                    (Some(prefix.as_str()), true)
+                }
+                Some(CommentFormat::BlockCommentWithEnd(BlockCommentConfig { prefix, .. })) => {
+                    (Some(prefix.as_ref()), true)
+                }
+                Some(CommentFormat::BlockCommentWithStart(BlockCommentConfig {
+                    start: _,
+                    end: _,
+                    prefix,
+                    tab_size,
+                })) => {
+                    indent_size.len += tab_size;
+                    (Some(prefix.as_ref()), true)
+                }
+                None => (None, false),
+            };
             let indent_prefix = indent_size.chars().collect::<String>();
-            let mut line_prefix = indent_prefix.clone();
-            let mut inside_comment = false;
-            if let Some(prefix) = &comment_prefix {
-                line_prefix.push_str(prefix);
-                inside_comment = true;
-            }
-            if let Some(prefix) = &rewrap_prefix {
-                line_prefix.push_str(prefix);
-            }
+            let line_prefix = format!("{indent_prefix}{}", line_prefix.unwrap_or(""));
 
             let allow_rewrap_based_on_language = match language_settings.allow_rewrap {
                 RewrapBehavior::InComments => inside_comment,
@@ -12001,6 +12061,8 @@ impl Editor {
             let start_offset = start.to_offset(&buffer);
             let end = Point::new(end_row, buffer.line_len(MultiBufferRow(end_row)));
             let selection_text = buffer.text_for_range(start..end).collect::<String>();
+            let mut first_line_delimiter = None;
+            let mut last_line_delimiter = None;
             let Some(lines_without_prefixes) = selection_text
                 .lines()
                 .enumerate()
@@ -12008,6 +12070,46 @@ impl Editor {
                     let line_trimmed = line.trim_start();
                     if rewrap_prefix.is_some() && ix > 0 {
                         Ok(line_trimmed)
+                    } else if let Some(
+                        CommentFormat::BlockCommentWithStart(BlockCommentConfig {
+                            start,
+                            prefix,
+                            end,
+                            tab_size,
+                        })
+                        | CommentFormat::BlockCommentWithEnd(BlockCommentConfig {
+                            start,
+                            prefix,
+                            end,
+                            tab_size,
+                        }),
+                    ) = &comment_prefix
+                    {
+                        let line_trimmed = line_trimmed
+                            .strip_prefix(start.as_ref())
+                            .map(|s| {
+                                let mut indent_size = indent_size;
+                                indent_size.len -= tab_size;
+                                let indent_prefix: String = indent_size.chars().collect();
+                                first_line_delimiter = Some((indent_prefix, start));
+                                s.trim_start()
+                            })
+                            .unwrap_or(line_trimmed);
+                        let line_trimmed = line_trimmed
+                            .strip_suffix(end.as_ref())
+                            .map(|s| {
+                                last_line_delimiter = Some(end);
+                                s.trim_end()
+                            })
+                            .unwrap_or(line_trimmed);
+                        let line_trimmed = line_trimmed
+                            .strip_prefix(prefix.as_ref())
+                            .unwrap_or(line_trimmed);
+                        Ok(line_trimmed)
+                    } else if let Some(CommentFormat::BlockLine(prefix)) = &comment_prefix {
+                        line_trimmed.strip_prefix(prefix).with_context(|| {
+                            format!("line did not start with prefix {prefix:?}: {line:?}")
+                        })
                     } else {
                         line_trimmed
                             .strip_prefix(&line_prefix.trim_start())
@@ -12034,14 +12136,25 @@ impl Editor {
                 line_prefix.clone()
             };
 
-            let wrapped_text = wrap_with_prefix(
-                line_prefix,
-                subsequent_lines_prefix,
-                lines_without_prefixes.join("\n"),
-                wrap_column,
-                tab_size,
-                options.preserve_existing_whitespace,
-            );
+            let wrapped_text = {
+                let mut wrapped_text = wrap_with_prefix(
+                    line_prefix,
+                    subsequent_lines_prefix,
+                    lines_without_prefixes.join("\n"),
+                    wrap_column,
+                    tab_size,
+                    options.preserve_existing_whitespace,
+                );
+
+                if let Some((indent, delimiter)) = first_line_delimiter {
+                    wrapped_text = format!("{indent}{delimiter}\n{wrapped_text}");
+                }
+                if let Some(last_line) = last_line_delimiter {
+                    wrapped_text = format!("{wrapped_text}\n{indent_prefix}{last_line}");
+                }
+
+                wrapped_text
+            };
 
             // TODO: should always use char-based diff while still supporting cursor behavior that
             // matches vim.
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 10ebae8e27..ddfd32be8d 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -5561,14 +5561,18 @@ async fn test_rewrap(cx: &mut TestAppContext) {
         },
         None,
     ));
-    let rust_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            line_comments: vec!["// ".into(), "/// ".into()],
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
+    let rust_language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                line_comments: vec!["// ".into(), "/// ".into()],
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_override_query("[(line_comment)(block_comment)] @comment.inclusive")
+        .unwrap(),
+    );
 
     let plaintext_language = Arc::new(Language::new(
         LanguageConfig {
@@ -5884,6 +5888,411 @@ async fn test_rewrap(cx: &mut TestAppContext) {
     }
 }
 
+#[gpui::test]
+async fn test_rewrap_block_comments(cx: &mut TestAppContext) {
+    init_test(cx, |settings| {
+        settings.languages.0.extend([(
+            "Rust".into(),
+            LanguageSettingsContent {
+                allow_rewrap: Some(language_settings::RewrapBehavior::InComments),
+                preferred_line_length: Some(40),
+                ..Default::default()
+            },
+        )])
+    });
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    let rust_lang = Arc::new(
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                line_comments: vec!["// ".into()],
+                block_comment: Some(BlockCommentConfig {
+                    start: "/*".into(),
+                    end: "*/".into(),
+                    prefix: "* ".into(),
+                    tab_size: 1,
+                }),
+                documentation_comment: Some(BlockCommentConfig {
+                    start: "/**".into(),
+                    end: "*/".into(),
+                    prefix: "* ".into(),
+                    tab_size: 1,
+                }),
+
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_override_query("[(line_comment) (block_comment)] @comment.inclusive")
+        .unwrap(),
+    );
+
+    // regular block comment
+    assert_rewrap(
+        indoc! {"
+            /*
+             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+        "},
+        indoc! {"
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // indent is respected
+    assert_rewrap(
+        indoc! {"
+            {}
+                /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+        "},
+        indoc! {"
+            {}
+                /*
+                 *ˇ Lorem ipsum dolor sit amet,
+                 * consectetur adipiscing elit.
+                 */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // short block comments with inline delimiters
+    assert_rewrap(
+        indoc! {"
+            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+            /*
+             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+        "},
+        indoc! {"
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // multiline block comment with inline start/end delimiters
+    assert_rewrap(
+        indoc! {"
+            /*ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit. */
+        "},
+        indoc! {"
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // block comment rewrap still respects paragraph bounds
+    assert_rewrap(
+        indoc! {"
+            /*
+             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             *
+             * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+        "},
+        indoc! {"
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             *
+             * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // documentation comments
+    assert_rewrap(
+        indoc! {"
+            /**ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+            /**
+             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+        "},
+        indoc! {"
+            /**
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /**
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // different, adjacent comments
+    assert_rewrap(
+        indoc! {"
+            /**
+             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+            //ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+        "},
+        indoc! {"
+            /**
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /*
+             *ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            //ˇ Lorem ipsum dolor sit amet,
+            // consectetur adipiscing elit.
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // selection w/ single short block comment
+    assert_rewrap(
+        indoc! {"
+            «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
+        "},
+        indoc! {"
+            «/*
+             * Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */ˇ»
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // rewrapping a single comment w/ abutting comments
+    assert_rewrap(
+        indoc! {"
+            /* ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. */
+            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+        "},
+        indoc! {"
+            /*
+             * ˇLorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // selection w/ non-abutting short block comments
+    assert_rewrap(
+        indoc! {"
+            «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+
+            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
+        "},
+        indoc! {"
+            «/*
+             * Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+
+            /*
+             * Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */ˇ»
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // selection of multiline block comments
+    assert_rewrap(
+        indoc! {"
+            «/* Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit. */ˇ»
+        "},
+        indoc! {"
+            «/*
+             * Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */ˇ»
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // partial selection of multiline block comments
+    assert_rewrap(
+        indoc! {"
+            «/* Lorem ipsum dolor sit amet,ˇ»
+             * consectetur adipiscing elit. */
+            /* Lorem ipsum dolor sit amet,
+             «* consectetur adipiscing elit. */ˇ»
+        "},
+        indoc! {"
+            «/*
+             * Lorem ipsum dolor sit amet,ˇ»
+             * consectetur adipiscing elit. */
+            /* Lorem ipsum dolor sit amet,
+             «* consectetur adipiscing elit.
+             */ˇ»
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // selection w/ abutting short block comments
+    // TODO: should not be combined; should rewrap as 2 comments
+    assert_rewrap(
+        indoc! {"
+            «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
+        "},
+        // desired behavior:
+        // indoc! {"
+        //     «/*
+        //      * Lorem ipsum dolor sit amet,
+        //      * consectetur adipiscing elit.
+        //      */
+        //     /*
+        //      * Lorem ipsum dolor sit amet,
+        //      * consectetur adipiscing elit.
+        //      */ˇ»
+        // "},
+        // actual behaviour:
+        indoc! {"
+            «/*
+             * Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit. Lorem
+             * ipsum dolor sit amet, consectetur
+             * adipiscing elit.
+             */ˇ»
+        "},
+        rust_lang.clone(),
+        &mut cx,
+    );
+
+    // TODO: same as above, but with delimiters on separate line
+    // assert_rewrap(
+    //     indoc! {"
+    //         «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+    //          */
+    //         /*
+    //          * Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
+    //     "},
+    //     // desired:
+    //     // indoc! {"
+    //     //     «/*
+    //     //      * Lorem ipsum dolor sit amet,
+    //     //      * consectetur adipiscing elit.
+    //     //      */
+    //     //     /*
+    //     //      * Lorem ipsum dolor sit amet,
+    //     //      * consectetur adipiscing elit.
+    //     //      */ˇ»
+    //     // "},
+    //     // actual: (but with trailing w/s on the empty lines)
+    //     indoc! {"
+    //         «/*
+    //          * Lorem ipsum dolor sit amet,
+    //          * consectetur adipiscing elit.
+    //          *
+    //          */
+    //         /*
+    //          *
+    //          * Lorem ipsum dolor sit amet,
+    //          * consectetur adipiscing elit.
+    //          */ˇ»
+    //     "},
+    //     rust_lang.clone(),
+    //     &mut cx,
+    // );
+
+    // TODO these are unhandled edge cases; not correct, just documenting known issues
+    assert_rewrap(
+        indoc! {"
+            /*
+             //ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+             */
+            /*
+             //ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
+            /*ˇ Lorem ipsum dolor sit amet */ /* consectetur adipiscing elit. */
+        "},
+        // desired:
+        // indoc! {"
+        //     /*
+        //      *ˇ Lorem ipsum dolor sit amet,
+        //      * consectetur adipiscing elit.
+        //      */
+        //     /*
+        //      *ˇ Lorem ipsum dolor sit amet,
+        //      * consectetur adipiscing elit.
+        //      */
+        //     /*
+        //      *ˇ Lorem ipsum dolor sit amet
+        //      */ /* consectetur adipiscing elit. */
+        // "},
+        // actual:
+        indoc! {"
+            /*
+             //ˇ Lorem ipsum dolor sit amet,
+             // consectetur adipiscing elit.
+             */
+            /*
+             * //ˇ Lorem ipsum dolor sit amet,
+             * consectetur adipiscing elit.
+             */
+            /*
+             *ˇ Lorem ipsum dolor sit amet */ /*
+             * consectetur adipiscing elit.
+             */
+        "},
+        rust_lang,
+        &mut cx,
+    );
+
+    #[track_caller]
+    fn assert_rewrap(
+        unwrapped_text: &str,
+        wrapped_text: &str,
+        language: Arc<Language>,
+        cx: &mut EditorTestContext,
+    ) {
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, window, cx| e.rewrap(&Rewrap, window, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
+}
+
 #[gpui::test]
 async fn test_hard_wrap(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 634a1343ddf402bf72b5e153984542aee0dc2315 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 2 Sep 2025 00:51:15 +0300
Subject: [PATCH 509/823] Bump xcb dependency (#37335)

Deals with https://github.com/zed-industries/zed/security/dependabot/65

Release Notes:

- N/A
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2ba36a91c..abbe5e0297 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20136,9 +20136,9 @@ dependencies = [
 
 [[package]]
 name = "xcb"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e2f212bb1a92cd8caac8051b829a6582ede155ccb60b5d5908b81b100952be"
+checksum = "f07c123b796139bfe0603e654eaf08e132e52387ba95b252c78bad3640ba37ea"
 dependencies = [
  "bitflags 1.3.2",
  "libc",

From 8a8a9a4f079ef5a66252ad73d01476d45891e647 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 1 Sep 2025 16:53:43 -0500
Subject: [PATCH 510/823] settings_ui: Add dynamic settings UI item (#37331)

Closes #ISSUE

Adds a first draft of a way for "Dynamic" settings items to be added,
where Dynamic means settings where multiple sets of options are possible
(i.e. discriminated union, rust enum, etc). The implementation is very
similar to that of `Group`, except that instead of rendering all of it's
descendants, it contains a function to determine _which_ descendant to
render, whether that be a single item or a nested group of items.
Currently this is done in a type-unsafe way with indices, a future
improvement could be to make the API more type safe, and easier to
manually implement correctly.

An example of a "Dynamic" setting is `theme`, where it can either be a
string of the desired theme name, or an object with `mode: "light" |
"dark" | "system"` as well as theme names for `light` and `dark`. In the
system implemented by this PR, this would become a dynamic settings UI
item, where option `0` is a single item, the theme name selector, and
option `1` is a group, containing items for the `mode`, and
`light`/`dark` options.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/settings/src/settings_ui.rs            |   9 ++
 crates/settings_ui/src/settings_ui.rs         | 113 ++++++++++++------
 .../src/settings_ui_macros.rs                 |   6 +-
 3 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/crates/settings/src/settings_ui.rs b/crates/settings/src/settings_ui.rs
index 8b30ebc9d5..40ac3d9db9 100644
--- a/crates/settings/src/settings_ui.rs
+++ b/crates/settings/src/settings_ui.rs
@@ -29,6 +29,11 @@ pub enum SettingsUiEntryVariant {
         path: &'static str,
         item: SettingsUiItemSingle,
     },
+    Dynamic {
+        path: &'static str,
+        options: Vec<SettingsUiEntry>,
+        determine_option: fn(&serde_json::Value, &mut App) -> usize,
+    },
     // todo(settings_ui): remove
     None,
 }
@@ -90,6 +95,10 @@ pub enum SettingsUiItem {
         items: Vec<SettingsUiEntry>,
     },
     Single(SettingsUiItemSingle),
+    Dynamic {
+        options: Vec<SettingsUiEntry>,
+        determine_option: fn(&serde_json::Value, &mut App) -> usize,
+    },
     None,
 }
 
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index ae03170a1a..37edfd5679 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -1,6 +1,7 @@
 mod appearance_settings_controls;
 
 use std::any::TypeId;
+use std::collections::VecDeque;
 use std::ops::{Not, Range};
 
 use anyhow::Context as _;
@@ -131,7 +132,7 @@ impl Item for SettingsPage {
 //  - there should be an index of text -> item mappings, for using fuzzy::match
 //   - Do we want to show the parent groups when a item is matched?
 
-struct UIEntry {
+struct UiEntry {
     title: &'static str,
     path: &'static str,
     _depth: usize,
@@ -147,22 +148,46 @@ struct UIEntry {
     next_sibling: Option<usize>,
     // expanded: bool,
     render: Option<SettingsUiItemSingle>,
+    select_descendant: Option<fn(&serde_json::Value, &mut App) -> usize>,
+}
+
+impl UiEntry {
+    fn first_descendant_index(&self) -> Option<usize> {
+        return self
+            .descendant_range
+            .is_empty()
+            .not()
+            .then_some(self.descendant_range.start);
+    }
+
+    fn nth_descendant_index(&self, tree: &[UiEntry], n: usize) -> Option<usize> {
+        let first_descendant_index = self.first_descendant_index()?;
+        let mut current_index = 0;
+        let mut current_descendant_index = Some(first_descendant_index);
+        while let Some(descendant_index) = current_descendant_index
+            && current_index < n
+        {
+            current_index += 1;
+            current_descendant_index = tree[descendant_index].next_sibling;
+        }
+        current_descendant_index
+    }
 }
 
 struct SettingsUiTree {
     root_entry_indices: Vec<usize>,
-    entries: Vec<UIEntry>,
+    entries: Vec<UiEntry>,
     active_entry_index: usize,
 }
 
 fn build_tree_item(
-    tree: &mut Vec<UIEntry>,
-    group: SettingsUiEntryVariant,
+    tree: &mut Vec<UiEntry>,
+    entry: SettingsUiEntryVariant,
     depth: usize,
     prev_index: Option<usize>,
 ) {
     let index = tree.len();
-    tree.push(UIEntry {
+    tree.push(UiEntry {
         title: "",
         path: "",
         _depth: depth,
@@ -170,11 +195,12 @@ fn build_tree_item(
         total_descendant_range: index + 1..index + 1,
         render: None,
         next_sibling: None,
+        select_descendant: None,
     });
     if let Some(prev_index) = prev_index {
         tree[prev_index].next_sibling = Some(index);
     }
-    match group {
+    match entry {
         SettingsUiEntryVariant::Group {
             path,
             title,
@@ -199,6 +225,24 @@ fn build_tree_item(
             tree[index].title = path;
             tree[index].render = Some(item);
         }
+        SettingsUiEntryVariant::Dynamic {
+            path,
+            options,
+            determine_option,
+        } => {
+            tree[index].path = path;
+            tree[index].select_descendant = Some(determine_option);
+            for option in options {
+                let prev_index = tree[index]
+                    .descendant_range
+                    .is_empty()
+                    .not()
+                    .then_some(tree[index].descendant_range.end - 1);
+                tree[index].descendant_range.end = tree.len() + 1;
+                build_tree_item(tree, option.item, depth + 1, prev_index);
+                tree[index].total_descendant_range.end = tree.len();
+            }
+        }
         SettingsUiEntryVariant::None => {
             return;
         }
@@ -265,27 +309,28 @@ fn render_content(
     window: &mut Window,
     cx: &mut Context<SettingsPage>,
 ) -> impl IntoElement {
-    let Some(entry) = tree.entries.get(tree.active_entry_index) else {
+    let Some(active_entry) = tree.entries.get(tree.active_entry_index) else {
         return div()
             .size_full()
             .child(Label::new(SharedString::new_static("No settings found")).color(Color::Error));
     };
     let mut content = v_flex().size_full().gap_4();
 
-    let mut child_index = entry
-        .descendant_range
-        .is_empty()
-        .not()
-        .then_some(entry.descendant_range.start);
-    let mut path = smallvec::smallvec![entry.path];
+    let mut path = smallvec::smallvec![active_entry.path];
+    let mut entry_index_queue = VecDeque::new();
 
-    while let Some(index) = child_index {
-        let child = &tree.entries[index];
-        child_index = child.next_sibling;
-        if child.render.is_none() {
-            // todo(settings_ui): subgroups?
-            continue;
+    if let Some(child_index) = active_entry.first_descendant_index() {
+        entry_index_queue.push_back(child_index);
+        let mut index = child_index;
+        while let Some(next_sibling_index) = tree.entries[index].next_sibling {
+            entry_index_queue.push_back(next_sibling_index);
+            index = next_sibling_index;
         }
+    };
+
+    while let Some(index) = entry_index_queue.pop_front() {
+        // todo(settings_ui): subgroups?
+        let child = &tree.entries[index];
         path.push(child.path);
         let settings_value = settings_value_from_settings_and_path(
             path.clone(),
@@ -294,24 +339,23 @@ fn render_content(
             SettingsStore::global(cx).raw_user_settings(),
             SettingsStore::global(cx).raw_default_settings(),
         );
+        if let Some(select_descendant) = child.select_descendant {
+            let selected_descendant = select_descendant(settings_value.read(), cx);
+            if let Some(descendant_index) =
+                child.nth_descendant_index(&tree.entries, selected_descendant)
+            {
+                entry_index_queue.push_front(descendant_index);
+            }
+        }
+        path.pop();
+        let Some(child_render) = child.render.as_ref() else {
+            continue;
+        };
         content = content.child(
             div()
-                .child(
-                    Label::new(SharedString::new_static(tree.entries[index].title))
-                        .size(LabelSize::Large)
-                        .when(tree.active_entry_index == index, |this| {
-                            this.color(Color::Selected)
-                        }),
-                )
-                .child(render_item_single(
-                    settings_value,
-                    child.render.as_ref().unwrap(),
-                    window,
-                    cx,
-                )),
+                .child(Label::new(SharedString::new_static(child.title)).size(LabelSize::Large))
+                .child(render_item_single(settings_value, child_render, window, cx)),
         );
-
-        path.pop();
     }
 
     return content;
@@ -405,6 +449,7 @@ fn read_settings_value_from_path<'a>(
     settings_contents: &'a serde_json::Value,
     path: &[&'static str],
 ) -> Option<&'a serde_json::Value> {
+    // todo(settings_ui) make non recursive, and move to `settings` alongside SettingsValue, and add method to SettingsValue to get nested
     let Some((key, remaining)) = path.split_first() else {
         return Some(settings_contents);
     };
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index 6e37745a7c..5250febe98 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -12,7 +12,6 @@ use syn::{Data, DeriveInput, LitStr, Token, parse_macro_input};
 ///
 /// ```
 /// use settings::SettingsUi;
-/// use settings_ui_macros::SettingsUi;
 ///
 /// #[derive(SettingsUi)]
 /// #[settings_ui(group = "Standard")]
@@ -102,6 +101,11 @@ fn map_ui_item_to_render(path: &str, ty: TokenStream) -> TokenStream {
                     path: #path,
                     item,
                 },
+                settings::SettingsUiItem::Dynamic{ options, determine_option } => settings::SettingsUiEntryVariant::Dynamic {
+                    path: #path,
+                    options,
+                    determine_option,
+                },
                 settings::SettingsUiItem::None => settings::SettingsUiEntryVariant::None,
             }
         }

From 60d17cccd35b919d6226ae86559c4505d7c1e833 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 1 Sep 2025 17:42:33 -0500
Subject: [PATCH 511/823] settings_ui: Move settings UI trait to file content
 (#37337)

Closes #ISSUE

Initially, the `SettingsUi` trait was tied to `Settings`, however, given
that the `Settings::FileContent` type (which may be the same as the type
that implements `Settings`) will be the type that more directly maps to
the JSON structure (and therefore have the documentation, correct field
names (or `serde` rename attributes), etc) it makes more sense to have
the deriving of `SettingsUi` occur on the `FileContent` type rather than
the `Settings` type.

In order for this to work a relatively important change had to be made
to the derive macro, that being that it now "unwraps" options into their
inner type, so a field with type `Option<Foo>` where `Foo: SettingsUi`
will treat the field as if it were just `Foo`, expecting there to be a
default set in `default.json`. This imposes some restrictions on what
`Settings::FileContent` can be as seen in 1e19398 where `FileContent`
itself can't be optional without manually implementing `SettingsUi`, as
well as introducing some risk that if the `FileContent` type has
`serde(default)`, the default value will override the default value from
`default.json` in the UI even though it may differ (but it should!).

A future PR should probably replace the other settings with `FileContent
= Option<T>` (all of which currently have `T == bool`) with wrapper
structs and have `KEY = None` so the further niceties
`derive(SettingsUi)` will provide such as path renaming, custom UI, auto
naming and doc comment extraction can be used.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/agent_settings/src/agent_settings.rs   |  4 +--
 crates/audio/src/audio_settings.rs            |  4 +--
 crates/auto_update/src/auto_update.rs         | 13 ++++-----
 crates/call/src/call_settings.rs              |  4 +--
 crates/client/src/client.rs                   | 12 ++++-----
 crates/collab_ui/src/panel_settings.rs        | 10 +++----
 crates/dap/src/debugger_settings.rs           |  2 ++
 crates/editor/src/editor_settings.rs          |  4 +--
 .../file_finder/src/file_finder_settings.rs   |  4 +--
 crates/git_ui/src/git_panel_settings.rs       |  4 +--
 crates/go_to_line/src/cursor_position.rs      | 10 +++----
 crates/language/src/language_settings.rs      |  4 +--
 crates/language_models/src/settings.rs        |  4 +--
 crates/onboarding/src/base_keymap_picker.rs   |  2 +-
 crates/onboarding/src/basics_page.rs          |  2 +-
 .../src/outline_panel_settings.rs             |  4 +--
 .../src/project_panel_settings.rs             |  4 +--
 .../recent_projects/src/remote_connections.rs |  4 +--
 crates/repl/src/jupyter_settings.rs           |  4 +--
 crates/settings/src/base_keymap_setting.rs    | 25 ++++++++++++-----
 crates/settings/src/settings_store.rs         | 18 ++++++-------
 crates/settings/src/settings_ui.rs            | 23 ++++++++--------
 .../src/settings_ui_macros.rs                 | 27 +++++++++++++++++++
 crates/terminal/src/terminal_settings.rs      |  4 +--
 crates/theme/src/settings.rs                  |  4 +--
 crates/title_bar/src/title_bar_settings.rs    |  6 ++---
 crates/vim/src/vim.rs                         |  4 +--
 crates/workspace/src/item.rs                  |  8 +++---
 crates/workspace/src/workspace_settings.rs    | 10 +++----
 crates/worktree/src/worktree_settings.rs      |  4 +--
 30 files changed, 137 insertions(+), 95 deletions(-)

diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 3e21e18a11..8aebdcd288 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -48,7 +48,7 @@ pub enum NotifyWhenAgentWaiting {
     Never,
 }
 
-#[derive(Default, Clone, Debug, SettingsUi)]
+#[derive(Default, Clone, Debug)]
 pub struct AgentSettings {
     pub enabled: bool,
     pub button: bool,
@@ -223,7 +223,7 @@ impl AgentSettingsContent {
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default)]
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default, SettingsUi)]
 pub struct AgentSettingsContent {
     /// Whether the Agent is enabled.
     ///
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
index e42918825c..d30d950273 100644
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -4,7 +4,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
 pub struct AudioSettings {
     /// Opt into the new audio system.
     #[serde(rename = "experimental.rodio_audio", default)]
@@ -12,7 +12,7 @@ pub struct AudioSettings {
 }
 
 /// Configuration of audio in Zed.
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 #[serde(default)]
 pub struct AudioSettingsContent {
     /// Whether to use the experimental audio system
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 71dcf25aee..f0ae3fdb1c 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -113,20 +113,19 @@ impl Drop for MacOsUnmounter {
     }
 }
 
-#[derive(SettingsUi)]
 struct AutoUpdateSetting(bool);
 
 /// Whether or not to automatically check for updates.
 ///
 /// Default: true
-#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize)]
+#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi)]
 #[serde(transparent)]
 struct AutoUpdateSettingContent(bool);
 
 impl Settings for AutoUpdateSetting {
     const KEY: Option<&'static str> = Some("auto_update");
 
-    type FileContent = Option<AutoUpdateSettingContent>;
+    type FileContent = AutoUpdateSettingContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         let auto_update = [
@@ -136,17 +135,19 @@ impl Settings for AutoUpdateSetting {
             sources.user,
         ]
         .into_iter()
-        .find_map(|value| value.copied().flatten())
-        .unwrap_or(sources.default.ok_or_else(Self::missing_default)?);
+        .find_map(|value| value.copied())
+        .unwrap_or(*sources.default);
 
         Ok(Self(auto_update.0))
     }
 
     fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
-        vscode.enum_setting("update.mode", current, |s| match s {
+        let mut cur = &mut Some(*current);
+        vscode.enum_setting("update.mode", &mut cur, |s| match s {
             "none" | "manual" => Some(AutoUpdateSettingContent(false)),
             _ => Some(AutoUpdateSettingContent(true)),
         });
+        *current = cur.unwrap();
     }
 }
 
diff --git a/crates/call/src/call_settings.rs b/crates/call/src/call_settings.rs
index 64d11d0df6..7b0838e3a9 100644
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -4,14 +4,14 @@ use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize, Debug, SettingsUi)]
+#[derive(Deserialize, Debug)]
 pub struct CallSettings {
     pub mute_on_join: bool,
     pub share_on_join: bool,
 }
 
 /// Configuration of voice calls in Zed.
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct CallSettingsContent {
     /// Whether the microphone should be muted when joining a channel or a call.
     ///
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index c5bb1af0d7..1287b4563c 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -96,12 +96,12 @@ actions!(
     ]
 );
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ClientSettingsContent {
     server_url: Option<String>,
 }
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 pub struct ClientSettings {
     pub server_url: String,
 }
@@ -122,12 +122,12 @@ impl Settings for ClientSettings {
     fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
 
-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ProxySettingsContent {
     proxy: Option<String>,
 }
 
-#[derive(Deserialize, Default, SettingsUi)]
+#[derive(Deserialize, Default)]
 pub struct ProxySettings {
     pub proxy: Option<String>,
 }
@@ -520,14 +520,14 @@ impl<T: 'static> Drop for PendingEntitySubscription<T> {
     }
 }
 
-#[derive(Copy, Clone, Deserialize, Debug, SettingsUi)]
+#[derive(Copy, Clone, Deserialize, Debug)]
 pub struct TelemetrySettings {
     pub diagnostics: bool,
     pub metrics: bool,
 }
 
 /// Control what info is collected by Zed.
-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct TelemetrySettingsContent {
     /// Send debug info like crash reports.
     ///
diff --git a/crates/collab_ui/src/panel_settings.rs b/crates/collab_ui/src/panel_settings.rs
index 4e5c8ad8f0..64f0a9366d 100644
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 use workspace::dock::DockPosition;
 
-#[derive(Deserialize, Debug, SettingsUi)]
+#[derive(Deserialize, Debug)]
 pub struct CollaborationPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
@@ -20,14 +20,14 @@ pub enum ChatPanelButton {
     WhenInCall,
 }
 
-#[derive(Deserialize, Debug, SettingsUi)]
+#[derive(Deserialize, Debug)]
 pub struct ChatPanelSettings {
     pub button: ChatPanelButton,
     pub dock: DockPosition,
     pub default_width: Pixels,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct ChatPanelSettingsContent {
     /// When to show the panel button in the status bar.
     ///
@@ -43,14 +43,14 @@ pub struct ChatPanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[derive(Deserialize, Debug, SettingsUi)]
+#[derive(Deserialize, Debug)]
 pub struct NotificationPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
     pub default_width: Pixels,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct PanelSettingsContent {
     /// Whether to show the panel button in the status bar.
     ///
diff --git a/crates/dap/src/debugger_settings.rs b/crates/dap/src/debugger_settings.rs
index 6843f19e38..929bff747e 100644
--- a/crates/dap/src/debugger_settings.rs
+++ b/crates/dap/src/debugger_settings.rs
@@ -14,6 +14,8 @@ pub enum DebugPanelDockPosition {
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi)]
 #[serde(default)]
+// todo(settings_ui) @ben: I'm pretty sure not having the fields be optional here is a bug,
+// it means the defaults will override previously set values if a single key is missing
 #[settings_ui(group = "Debugger", path = "debugger")]
 pub struct DebuggerSettings {
     /// Determines the stepping granularity.
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 084c4eb5c6..3e4e86f023 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -11,7 +11,7 @@ use util::serde::default_true;
 
 /// Imports from the VSCode settings at
 /// https://code.visualstudio.com/docs/reference/default-settings
-#[derive(Deserialize, Clone, SettingsUi)]
+#[derive(Deserialize, Clone)]
 pub struct EditorSettings {
     pub cursor_blink: bool,
     pub cursor_shape: Option<CursorShape>,
@@ -415,7 +415,7 @@ pub enum SnippetSortOrder {
     None,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct EditorSettingsContent {
     /// Whether the cursor blinks in the editor.
     ///
diff --git a/crates/file_finder/src/file_finder_settings.rs b/crates/file_finder/src/file_finder_settings.rs
index 20057417a2..007af53b11 100644
--- a/crates/file_finder/src/file_finder_settings.rs
+++ b/crates/file_finder/src/file_finder_settings.rs
@@ -3,7 +3,7 @@ use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq, SettingsUi)]
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
 pub struct FileFinderSettings {
     pub file_icons: bool,
     pub modal_max_width: Option<FileFinderWidth>,
@@ -11,7 +11,7 @@ pub struct FileFinderSettings {
     pub include_ignored: Option<bool>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct FileFinderSettingsContent {
     /// Whether to show file icons in the file finder.
     ///
diff --git a/crates/git_ui/src/git_panel_settings.rs b/crates/git_ui/src/git_panel_settings.rs
index 5769492204..39d6540db5 100644
--- a/crates/git_ui/src/git_panel_settings.rs
+++ b/crates/git_ui/src/git_panel_settings.rs
@@ -36,7 +36,7 @@ pub enum StatusStyle {
     LabelColor,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct GitPanelSettingsContent {
     /// Whether to show the panel button in the status bar.
     ///
@@ -77,7 +77,7 @@ pub struct GitPanelSettingsContent {
     pub collapse_untracked_diff: Option<bool>,
 }
 
-#[derive(Deserialize, Debug, Clone, PartialEq, SettingsUi)]
+#[derive(Deserialize, Debug, Clone, PartialEq)]
 pub struct GitPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index 345af8a867..5840993ece 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -293,7 +293,7 @@ impl StatusItemView for CursorPosition {
     }
 }
 
-#[derive(Clone, Copy, Default, PartialEq, JsonSchema, Deserialize, Serialize, SettingsUi)]
+#[derive(Clone, Copy, Default, PartialEq, JsonSchema, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub(crate) enum LineIndicatorFormat {
     Short,
@@ -301,14 +301,14 @@ pub(crate) enum LineIndicatorFormat {
     Long,
 }
 
-#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize)]
+#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi)]
 #[serde(transparent)]
 pub(crate) struct LineIndicatorFormatContent(LineIndicatorFormat);
 
 impl Settings for LineIndicatorFormat {
     const KEY: Option<&'static str> = Some("line_indicator_format");
 
-    type FileContent = Option<LineIndicatorFormatContent>;
+    type FileContent = LineIndicatorFormatContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
         let format = [
@@ -317,8 +317,8 @@ impl Settings for LineIndicatorFormat {
             sources.user,
         ]
         .into_iter()
-        .find_map(|value| value.copied().flatten())
-        .unwrap_or(sources.default.ok_or_else(Self::missing_default)?);
+        .find_map(|value| value.copied())
+        .unwrap_or(*sources.default);
 
         Ok(format.0)
     }
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index a44df4993a..f04b83bc73 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -55,7 +55,7 @@ pub fn all_language_settings<'a>(
 }
 
 /// The settings for all languages.
-#[derive(Debug, Clone, SettingsUi)]
+#[derive(Debug, Clone)]
 pub struct AllLanguageSettings {
     /// The edit prediction settings.
     pub edit_predictions: EditPredictionSettings,
@@ -292,7 +292,7 @@ pub struct CopilotSettings {
 }
 
 /// The settings for all languages.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct AllLanguageSettingsContent {
     /// The settings for enabling/disabling features.
     #[serde(default)]
diff --git a/crates/language_models/src/settings.rs b/crates/language_models/src/settings.rs
index 1d03ab48f7..8b7ab5fc25 100644
--- a/crates/language_models/src/settings.rs
+++ b/crates/language_models/src/settings.rs
@@ -29,7 +29,7 @@ pub fn init_settings(cx: &mut App) {
     AllLanguageModelSettings::register(cx);
 }
 
-#[derive(Default, SettingsUi)]
+#[derive(Default)]
 pub struct AllLanguageModelSettings {
     pub anthropic: AnthropicSettings,
     pub bedrock: AmazonBedrockSettings,
@@ -46,7 +46,7 @@ pub struct AllLanguageModelSettings {
     pub zed_dot_dev: ZedDotDevSettings,
 }
 
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema)]
+#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, SettingsUi)]
 pub struct AllLanguageModelSettingsContent {
     pub anthropic: Option<AnthropicSettingsContent>,
     pub bedrock: Option<AmazonBedrockSettingsContent>,
diff --git a/crates/onboarding/src/base_keymap_picker.rs b/crates/onboarding/src/base_keymap_picker.rs
index 0ac07d9a9d..79a716cc9e 100644
--- a/crates/onboarding/src/base_keymap_picker.rs
+++ b/crates/onboarding/src/base_keymap_picker.rs
@@ -187,7 +187,7 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
             );
 
             update_settings_file::<BaseKeymap>(self.fs.clone(), cx, move |setting, _| {
-                *setting = Some(base_keymap)
+                setting.base_keymap = Some(base_keymap)
             });
         }
 
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 441d2ca4b7..991386cb38 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -325,7 +325,7 @@ fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoE
         let fs = <dyn Fs>::global(cx);
 
         update_settings_file::<BaseKeymap>(fs, cx, move |setting, _| {
-            *setting = Some(keymap_base);
+            setting.base_keymap = Some(keymap_base);
         });
     }
 }
diff --git a/crates/outline_panel/src/outline_panel_settings.rs b/crates/outline_panel/src/outline_panel_settings.rs
index c33125654f..48c6621e35 100644
--- a/crates/outline_panel/src/outline_panel_settings.rs
+++ b/crates/outline_panel/src/outline_panel_settings.rs
@@ -18,7 +18,7 @@ pub enum ShowIndentGuides {
     Never,
 }
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq, SettingsUi)]
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
 pub struct OutlinePanelSettings {
     pub button: bool,
     pub default_width: Pixels,
@@ -61,7 +61,7 @@ pub struct IndentGuidesSettingsContent {
     pub show: Option<ShowIndentGuides>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct OutlinePanelSettingsContent {
     /// Whether to show the outline panel button in the status bar.
     ///
diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs
index 9c7bd4fd66..db9b2b85d5 100644
--- a/crates/project_panel/src/project_panel_settings.rs
+++ b/crates/project_panel/src/project_panel_settings.rs
@@ -28,7 +28,7 @@ pub enum EntrySpacing {
     Standard,
 }
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq, SettingsUi)]
+#[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
 pub struct ProjectPanelSettings {
     pub button: bool,
     pub hide_gitignore: bool,
@@ -92,7 +92,7 @@ pub enum ShowDiagnostics {
     All,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct ProjectPanelSettingsContent {
     /// Whether to show the project panel button in the status bar.
     ///
diff --git a/crates/recent_projects/src/remote_connections.rs b/crates/recent_projects/src/remote_connections.rs
index 47607813b5..e543bf219f 100644
--- a/crates/recent_projects/src/remote_connections.rs
+++ b/crates/recent_projects/src/remote_connections.rs
@@ -30,7 +30,7 @@ use ui::{
 use util::serde::default_true;
 use workspace::{AppState, ModalView, Workspace};
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 pub struct SshSettings {
     pub ssh_connections: Option<Vec<SshConnection>>,
     /// Whether to read ~/.ssh/config for ssh connection sources.
@@ -121,7 +121,7 @@ pub struct SshProject {
     pub paths: Vec<String>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct RemoteSettingsContent {
     pub ssh_connections: Option<Vec<SshConnection>>,
     pub read_ssh_config: Option<bool>,
diff --git a/crates/repl/src/jupyter_settings.rs b/crates/repl/src/jupyter_settings.rs
index c3bfd2079d..6f3d6b1db6 100644
--- a/crates/repl/src/jupyter_settings.rs
+++ b/crates/repl/src/jupyter_settings.rs
@@ -6,7 +6,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Debug, Default, SettingsUi)]
+#[derive(Debug, Default)]
 pub struct JupyterSettings {
     pub kernel_selections: HashMap<String, String>,
 }
@@ -20,7 +20,7 @@ impl JupyterSettings {
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct JupyterSettingsContent {
     /// Default kernels to select for each language.
     ///
diff --git a/crates/settings/src/base_keymap_setting.rs b/crates/settings/src/base_keymap_setting.rs
index 087f25185a..fb5b445b49 100644
--- a/crates/settings/src/base_keymap_setting.rs
+++ b/crates/settings/src/base_keymap_setting.rs
@@ -100,25 +100,36 @@ impl BaseKeymap {
     }
 }
 
-impl Settings for BaseKeymap {
-    const KEY: Option<&'static str> = Some("base_keymap");
+#[derive(
+    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default, SettingsUi,
+)]
+// extracted so that it can be an option, and still work with derive(SettingsUi)
+pub struct BaseKeymapSetting {
+    pub base_keymap: Option<BaseKeymap>,
+}
 
-    type FileContent = Option<Self>;
+impl Settings for BaseKeymap {
+    const KEY: Option<&'static str> = None;
+
+    type FileContent = BaseKeymapSetting;
 
     fn load(
         sources: SettingsSources<Self::FileContent>,
         _: &mut gpui::App,
     ) -> anyhow::Result<Self> {
-        if let Some(Some(user_value)) = sources.user.copied() {
+        if let Some(Some(user_value)) = sources.user.map(|setting| setting.base_keymap) {
             return Ok(user_value);
         }
-        if let Some(Some(server_value)) = sources.server.copied() {
+        if let Some(Some(server_value)) = sources.server.map(|setting| setting.base_keymap) {
             return Ok(server_value);
         }
-        sources.default.ok_or_else(Self::missing_default)
+        sources
+            .default
+            .base_keymap
+            .ok_or_else(Self::missing_default)
     }
 
     fn import_from_vscode(_vscode: &VsCodeSettings, current: &mut Self::FileContent) {
-        *current = Some(BaseKeymap::VSCode);
+        current.base_keymap = Some(BaseKeymap::VSCode);
     }
 }
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 023f8cbfba..c1a7fd9e3c 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -39,7 +39,7 @@ use crate::{
 /// A value that can be defined as a user setting.
 ///
 /// Settings can be loaded from a combination of multiple JSON files.
-pub trait Settings: SettingsUi + 'static + Send + Sync {
+pub trait Settings: 'static + Send + Sync {
     /// The name of a key within the JSON file from which this setting should
     /// be deserialized. If this is `None`, then the setting will be deserialized
     /// from the root object.
@@ -57,7 +57,7 @@ pub trait Settings: SettingsUi + 'static + Send + Sync {
     const PRESERVED_KEYS: Option<&'static [&'static str]> = None;
 
     /// The type that is stored in an individual JSON file.
-    type FileContent: Clone + Default + Serialize + DeserializeOwned + JsonSchema;
+    type FileContent: Clone + Default + Serialize + DeserializeOwned + JsonSchema + SettingsUi;
 
     /// The logic for combining together values from one or more JSON files into the
     /// final value for this setting.
@@ -1565,7 +1565,7 @@ impl<T: Settings> AnySettingValue for SettingValue<T> {
     }
 
     fn settings_ui_item(&self) -> SettingsUiEntry {
-        <T as SettingsUi>::settings_ui_entry()
+        <<T as Settings>::FileContent as SettingsUi>::settings_ui_entry()
     }
 }
 
@@ -2147,12 +2147,12 @@ mod tests {
         }
     }
 
-    #[derive(Debug, Deserialize, PartialEq, SettingsUi)]
+    #[derive(Debug, Deserialize, PartialEq)]
     struct TurboSetting(bool);
 
     impl Settings for TurboSetting {
         const KEY: Option<&'static str> = Some("turbo");
-        type FileContent = Option<bool>;
+        type FileContent = bool;
 
         fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
             sources.json_merge()
@@ -2161,7 +2161,7 @@ mod tests {
         fn import_from_vscode(_vscode: &VsCodeSettings, _current: &mut Self::FileContent) {}
     }
 
-    #[derive(Clone, Debug, PartialEq, Deserialize, SettingsUi)]
+    #[derive(Clone, Debug, PartialEq, Deserialize)]
     struct MultiKeySettings {
         #[serde(default)]
         key1: String,
@@ -2169,7 +2169,7 @@ mod tests {
         key2: String,
     }
 
-    #[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+    #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
     struct MultiKeySettingsJson {
         key1: Option<String>,
         key2: Option<String>,
@@ -2194,7 +2194,7 @@ mod tests {
         }
     }
 
-    #[derive(Debug, Deserialize, SettingsUi)]
+    #[derive(Debug, Deserialize)]
     struct JournalSettings {
         pub path: String,
         pub hour_format: HourFormat,
@@ -2207,7 +2207,7 @@ mod tests {
         Hour24,
     }
 
-    #[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
+    #[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, SettingsUi)]
     struct JournalSettingsJson {
         pub path: Option<String>,
         pub hour_format: Option<HourFormat>,
diff --git a/crates/settings/src/settings_ui.rs b/crates/settings/src/settings_ui.rs
index 40ac3d9db9..3a77627d59 100644
--- a/crates/settings/src/settings_ui.rs
+++ b/crates/settings/src/settings_ui.rs
@@ -7,9 +7,16 @@ use crate::SettingsStore;
 
 pub trait SettingsUi {
     fn settings_ui_item() -> SettingsUiItem {
+        // todo(settings_ui): remove this default impl, only entry should have a default impl
+        // because it's expected that the macro or custom impl use the item and the known paths to create the entry
         SettingsUiItem::None
     }
-    fn settings_ui_entry() -> SettingsUiEntry;
+
+    fn settings_ui_entry() -> SettingsUiEntry {
+        SettingsUiEntry {
+            item: SettingsUiEntryVariant::None,
+        }
+    }
 }
 
 pub struct SettingsUiEntry {
@@ -106,11 +113,11 @@ impl SettingsUi for bool {
     fn settings_ui_item() -> SettingsUiItem {
         SettingsUiItem::Single(SettingsUiItemSingle::SwitchField)
     }
+}
 
-    fn settings_ui_entry() -> SettingsUiEntry {
-        SettingsUiEntry {
-            item: SettingsUiEntryVariant::None,
-        }
+impl SettingsUi for Option<bool> {
+    fn settings_ui_item() -> SettingsUiItem {
+        SettingsUiItem::Single(SettingsUiItemSingle::SwitchField)
     }
 }
 
@@ -118,10 +125,4 @@ impl SettingsUi for u64 {
     fn settings_ui_item() -> SettingsUiItem {
         SettingsUiItem::Single(SettingsUiItemSingle::NumericStepper)
     }
-
-    fn settings_ui_entry() -> SettingsUiEntry {
-        SettingsUiEntry {
-            item: SettingsUiEntryVariant::None,
-        }
-    }
 }
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index 5250febe98..3840bc38da 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -88,7 +88,34 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
     proc_macro::TokenStream::from(expanded)
 }
 
+fn extract_type_from_option(ty: TokenStream) -> TokenStream {
+    match option_inner_type(ty.clone()) {
+        Some(inner_type) => inner_type,
+        None => ty,
+    }
+}
+
+fn option_inner_type(ty: TokenStream) -> Option<TokenStream> {
+    let ty = syn::parse2::<syn::Type>(ty).ok()?;
+    let syn::Type::Path(path) = ty else {
+        return None;
+    };
+    let segment = path.path.segments.last()?;
+    if segment.ident != "Option" {
+        return None;
+    }
+    let syn::PathArguments::AngleBracketed(args) = &segment.arguments else {
+        return None;
+    };
+    let arg = args.args.first()?;
+    let syn::GenericArgument::Type(ty) = arg else {
+        return None;
+    };
+    return Some(ty.to_token_stream());
+}
+
 fn map_ui_item_to_render(path: &str, ty: TokenStream) -> TokenStream {
+    let ty = extract_type_from_option(ty);
     quote! {
         settings::SettingsUiEntry {
             item: match #ty::settings_ui_item() {
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 01f2d85f09..c3051e089c 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -24,7 +24,7 @@ pub struct Toolbar {
     pub breadcrumbs: bool,
 }
 
-#[derive(Clone, Debug, Deserialize, SettingsUi)]
+#[derive(Clone, Debug, Deserialize)]
 pub struct TerminalSettings {
     pub shell: Shell,
     pub working_directory: WorkingDirectory,
@@ -135,7 +135,7 @@ pub enum ActivateScript {
     Pyenv,
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct TerminalSettingsContent {
     /// What shell to use when opening a terminal.
     ///
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 61b41eba06..11db22d974 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -87,7 +87,7 @@ impl From<UiDensity> for String {
 }
 
 /// Customizable settings for the UI and theme system.
-#[derive(Clone, PartialEq, SettingsUi)]
+#[derive(Clone, PartialEq)]
 pub struct ThemeSettings {
     /// The UI font size. Determines the size of text in the UI,
     /// as well as the size of a [gpui::Rems] unit.
@@ -365,7 +365,7 @@ impl IconThemeSelection {
 }
 
 /// Settings for rendering text in UI and text buffers.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ThemeSettingsContent {
     /// The default font size for text in the UI.
     #[serde(default)]
diff --git a/crates/title_bar/src/title_bar_settings.rs b/crates/title_bar/src/title_bar_settings.rs
index 29d74c8590..0dc301f7ee 100644
--- a/crates/title_bar/src/title_bar_settings.rs
+++ b/crates/title_bar/src/title_bar_settings.rs
@@ -3,8 +3,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Copy, Clone, Deserialize, Debug, SettingsUi)]
-#[settings_ui(group = "Title Bar", path = "title_bar")]
+#[derive(Copy, Clone, Deserialize, Debug)]
 pub struct TitleBarSettings {
     pub show_branch_icon: bool,
     pub show_onboarding_banner: bool,
@@ -15,7 +14,8 @@ pub struct TitleBarSettings {
     pub show_menus: bool,
 }
 
-#[derive(Copy, Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Copy, Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[settings_ui(group = "Title Bar", path = "title_bar")]
 pub struct TitleBarSettingsContent {
     /// Whether to show the branch icon beside branch switcher in the title bar.
     ///
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index a5cd909d5b..5a4ac42518 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -1774,7 +1774,7 @@ struct CursorShapeSettings {
     pub insert: Option<CursorShape>,
 }
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 struct VimSettings {
     pub default_mode: Mode,
     pub toggle_relative_line_numbers: bool,
@@ -1785,7 +1785,7 @@ struct VimSettings {
     pub cursor_shape: CursorShapeSettings,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 struct VimSettingsContent {
     pub default_mode: Option<ModeContent>,
     pub toggle_relative_line_numbers: Option<bool>,
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index a513f8c931..731e169147 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -49,7 +49,7 @@ impl Default for SaveOptions {
     }
 }
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 pub struct ItemSettings {
     pub git_status: bool,
     pub close_position: ClosePosition,
@@ -59,7 +59,7 @@ pub struct ItemSettings {
     pub show_close_button: ShowCloseButton,
 }
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 pub struct PreviewTabsSettings {
     pub enabled: bool,
     pub enable_preview_from_file_finder: bool,
@@ -101,7 +101,7 @@ pub enum ActivateOnClose {
     LeftNeighbour,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ItemSettingsContent {
     /// Whether to show the Git file status on a tab item.
     ///
@@ -130,7 +130,7 @@ pub struct ItemSettingsContent {
     show_close_button: Option<ShowCloseButton>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct PreviewTabsSettingsContent {
     /// Whether to show opened editors as preview tabs.
     /// Preview tabs do not stay open, are reused until explicitly set to be kept open opened (via double-click or editing) and show file names in italic.
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 419e33e544..1a7e548e4e 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -8,7 +8,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 pub struct WorkspaceSettings {
     pub active_pane_modifiers: ActivePanelModifiers,
     pub bottom_dock_layout: BottomDockLayout,
@@ -118,7 +118,7 @@ pub enum RestoreOnStartupBehavior {
     LastSession,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct WorkspaceSettingsContent {
     /// Active pane styling settings.
     pub active_pane_modifiers: Option<ActivePanelModifiers>,
@@ -216,14 +216,14 @@ pub struct WorkspaceSettingsContent {
     pub zoomed_padding: Option<bool>,
 }
 
-#[derive(Deserialize, SettingsUi)]
+#[derive(Deserialize)]
 pub struct TabBarSettings {
     pub show: bool,
     pub show_nav_history_buttons: bool,
     pub show_tab_bar_buttons: bool,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct TabBarSettingsContent {
     /// Whether or not to show the tab bar in the editor.
     ///
@@ -266,7 +266,7 @@ pub enum PaneSplitDirectionVertical {
     Right,
 }
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub struct CenteredLayoutSettings {
     /// The relative width of the left padding of the central pane from the
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
index df3a4d3557..6a8e2b5d89 100644
--- a/crates/worktree/src/worktree_settings.rs
+++ b/crates/worktree/src/worktree_settings.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 use util::paths::PathMatcher;
 
-#[derive(Clone, PartialEq, Eq, SettingsUi)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct WorktreeSettings {
     pub file_scan_inclusions: PathMatcher,
     pub file_scan_exclusions: PathMatcher,
@@ -31,7 +31,7 @@ impl WorktreeSettings {
     }
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct WorktreeSettingsContent {
     /// Completely ignore files matching globs from `file_scan_exclusions`. Overrides
     /// `file_scan_inclusions`.

From 54cec5b484c3e71b5fe47331e1e21ad0cf801425 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 1 Sep 2025 19:26:42 -0500
Subject: [PATCH 512/823] settings_ui: Get editor settings working (#37330)

Closes #ISSUE

This PR includes the necessary work to get `EditorSettings` showing up
in the settings UI. Including making the `path` field on
`SettingsUiItem`'s optional so that top level items such as
`EditorSettings` which have `Settings::KEY = None` (i.e. are treated
like `serde(flatten)`) have their paths computed correctly for JSON
reading/updating.

It includes the first examples of a pattern I expect to continue with
the `SettingsUi` work with respect to settings reorganization, that
being adding missing defaults, and adding explicit values (or aliases)
to settings which previously relied on `null` being a value for optional
fields.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 assets/settings/default.json                  |   8 +-
 crates/editor/src/editor_settings.rs          |  59 +++++---
 crates/language/src/buffer.rs                 |   6 +-
 crates/project/src/project_settings.rs        |  13 +-
 crates/settings/src/settings.rs               |   4 +-
 crates/settings/src/settings_store.rs         |   2 +-
 .../{settings_ui.rs => settings_ui_core.rs}   | 109 +++++++++-----
 crates/settings_ui/src/settings_ui.rs         | 137 ++++++++++++------
 .../src/settings_ui_macros.rs                 |  60 +++-----
 9 files changed, 246 insertions(+), 152 deletions(-)
 rename crates/settings/src/{settings_ui.rs => settings_ui_core.rs} (51%)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 623a4612d0..0b5481bd4e 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -188,8 +188,8 @@
   //  4. A box drawn around the following character
   //     "hollow"
   //
-  // Default: not set, defaults to "bar"
-  "cursor_shape": null,
+  // Default: "bar"
+  "cursor_shape": "bar",
   // Determines when the mouse cursor should be hidden in an editor or input box.
   //
   // 1. Never hide the mouse cursor:
@@ -282,8 +282,8 @@
   //  - "warning"
   //  - "info"
   //  - "hint"
-  //  - null — allow all diagnostics (default)
-  "diagnostics_max_severity": null,
+  //  - "all" — allow all diagnostics (default)
+  "diagnostics_max_severity": "all",
   // Whether to show wrap guides (vertical rulers) in the editor.
   // Setting this to true will show a guide at the 'preferred_line_length' value
   // if 'soft_wrap' is set to 'preferred_line_length', and will show any
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 3e4e86f023..44cb074976 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -61,7 +61,9 @@ pub struct EditorSettings {
 }
 
 /// How to render LSP `textDocument/documentColor` colors in the editor.
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum DocumentColorsRenderMode {
     /// Do not query and render document colors.
@@ -75,7 +77,7 @@ pub enum DocumentColorsRenderMode {
     Background,
 }
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum CurrentLineHighlight {
     // Don't highlight the current line.
@@ -89,7 +91,7 @@ pub enum CurrentLineHighlight {
 }
 
 /// When to populate a new search's query based on the text under the cursor.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum SeedQuerySetting {
     /// Always populate the search query with the word under the cursor.
@@ -101,7 +103,9 @@ pub enum SeedQuerySetting {
 }
 
 /// What to do when multibuffer is double clicked in some of its excerpts (parts of singleton buffers).
-#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum DoubleClickInMultibuffer {
     /// Behave as a regular buffer and select the whole word.
@@ -120,7 +124,9 @@ pub struct Jupyter {
     pub enabled: bool,
 }
 
-#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub struct JupyterContent {
     /// Whether the Jupyter feature is enabled.
@@ -292,7 +298,9 @@ pub struct ScrollbarAxes {
 }
 
 /// Whether to allow drag and drop text selection in buffer.
-#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(
+    Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi,
+)]
 pub struct DragAndDropSelection {
     /// When true, enables drag and drop text selection in buffer.
     ///
@@ -332,7 +340,7 @@ pub enum ScrollbarDiagnostics {
 /// The key to use for adding multiple cursors
 ///
 /// Default: alt
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum MultiCursorModifier {
     Alt,
@@ -343,7 +351,7 @@ pub enum MultiCursorModifier {
 /// Whether the editor will scroll beyond the last line.
 ///
 /// Default: one_page
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum ScrollBeyondLastLine {
     /// The editor will not scroll beyond the last line.
@@ -357,7 +365,9 @@ pub enum ScrollBeyondLastLine {
 }
 
 /// Default options for buffer and project search items.
-#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(
+    Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi,
+)]
 pub struct SearchSettings {
     /// Whether to show the project search button in the status bar.
     #[serde(default = "default_true")]
@@ -373,7 +383,9 @@ pub struct SearchSettings {
 }
 
 /// What to do when go to definition yields no results.
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum GoToDefinitionFallback {
     /// Disables the fallback.
@@ -386,7 +398,9 @@ pub enum GoToDefinitionFallback {
 /// Determines when the mouse cursor should be hidden in an editor or input box.
 ///
 /// Default: on_typing_and_movement
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum HideMouseMode {
     /// Never hide the mouse cursor
@@ -401,7 +415,9 @@ pub enum HideMouseMode {
 /// Determines how snippets are sorted relative to other completion items.
 ///
 /// Default: inline
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum SnippetSortOrder {
     /// Place snippets at the top of the completion list
@@ -416,6 +432,7 @@ pub enum SnippetSortOrder {
 }
 
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[settings_ui(group = "Editor")]
 pub struct EditorSettingsContent {
     /// Whether the cursor blinks in the editor.
     ///
@@ -424,7 +441,7 @@ pub struct EditorSettingsContent {
     /// Cursor shape for the default editor.
     /// Can be "bar", "block", "underline", or "hollow".
     ///
-    /// Default: None
+    /// Default: bar
     pub cursor_shape: Option<CursorShape>,
     /// Determines when the mouse cursor should be hidden in an editor or input box.
     ///
@@ -601,7 +618,7 @@ pub struct EditorSettingsContent {
 }
 
 // Status bar related settings
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 pub struct StatusBarContent {
     /// Whether to display the active language button in the status bar.
     ///
@@ -614,7 +631,7 @@ pub struct StatusBarContent {
 }
 
 // Toolbar related settings
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 pub struct ToolbarContent {
     /// Whether to display breadcrumbs in the editor toolbar.
     ///
@@ -640,7 +657,9 @@ pub struct ToolbarContent {
 }
 
 /// Scrollbar related settings
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
+#[derive(
+    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default, SettingsUi,
+)]
 pub struct ScrollbarContent {
     /// When to show the scrollbar in the editor.
     ///
@@ -675,7 +694,9 @@ pub struct ScrollbarContent {
 }
 
 /// Minimap related settings
-#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(
+    Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, PartialEq, SettingsUi,
+)]
 pub struct MinimapContent {
     /// When to show the minimap in the editor.
     ///
@@ -723,7 +744,9 @@ pub struct ScrollbarAxesContent {
 }
 
 /// Gutter related settings
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(
+    Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi,
+)]
 pub struct GutterContent {
     /// Whether to show line numbers in the gutter.
     ///
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 1a1d9fb4a7..c978f6c4ef 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -32,7 +32,7 @@ use parking_lot::Mutex;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use settings::WorktreeId;
+use settings::{SettingsUi, WorktreeId};
 use smallvec::SmallVec;
 use smol::future::yield_now;
 use std::{
@@ -173,7 +173,9 @@ pub enum IndentKind {
 }
 
 /// The shape of a selection cursor.
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum CursorShape {
     /// A vertical bar
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 30a71c4cae..4a97130f15 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -281,7 +281,17 @@ impl Default for GlobalLspSettings {
 }
 
 #[derive(
-    Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, JsonSchema,
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    PartialEq,
+    Ord,
+    PartialOrd,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    SettingsUi,
 )]
 #[serde(rename_all = "snake_case")]
 pub enum DiagnosticSeverity {
@@ -290,6 +300,7 @@ pub enum DiagnosticSeverity {
     Error,
     Warning,
     Info,
+    #[serde(alias = "all")]
     Hint,
 }
 
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 983cd31dd3..7e567cc085 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -4,7 +4,7 @@ mod keymap_file;
 mod settings_file;
 mod settings_json;
 mod settings_store;
-mod settings_ui;
+mod settings_ui_core;
 mod vscode_import;
 
 use gpui::{App, Global};
@@ -24,7 +24,7 @@ pub use settings_store::{
     InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation, SettingsSources,
     SettingsStore,
 };
-pub use settings_ui::*;
+pub use settings_ui_core::*;
 // Re-export the derive macro
 pub use settings_ui_macros::SettingsUi;
 pub use vscode_import::{VsCodeSettings, VsCodeSettingsSource};
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index c1a7fd9e3c..60eb132ad8 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -33,7 +33,7 @@ pub type EditorconfigProperties = ec4rs::Properties;
 use crate::{
     ActiveSettingsProfileName, ParameterizedJsonSchema, SettingsJsonSchemaParams, SettingsUiEntry,
     VsCodeSettings, WorktreeId, parse_json_with_comments, replace_value_in_json_text,
-    settings_ui::SettingsUi, update_value_in_json_text,
+    settings_ui_core::SettingsUi, update_value_in_json_text,
 };
 
 /// A value that can be defined as a user setting.
diff --git a/crates/settings/src/settings_ui.rs b/crates/settings/src/settings_ui_core.rs
similarity index 51%
rename from crates/settings/src/settings_ui.rs
rename to crates/settings/src/settings_ui_core.rs
index 3a77627d59..3a5fa3016b 100644
--- a/crates/settings/src/settings_ui.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -1,3 +1,5 @@
+use std::any::TypeId;
+
 use anyhow::Context as _;
 use fs::Fs;
 use gpui::{AnyElement, App, AppContext as _, ReadGlobal as _, Window};
@@ -14,40 +16,26 @@ pub trait SettingsUi {
 
     fn settings_ui_entry() -> SettingsUiEntry {
         SettingsUiEntry {
-            item: SettingsUiEntryVariant::None,
+            path: None,
+            title: "None entry",
+            item: SettingsUiItem::None,
         }
     }
 }
 
 pub struct SettingsUiEntry {
     // todo(settings_ui): move this back here once there isn't a None variant
-    // pub path: &'static str,
-    // pub title: &'static str,
-    pub item: SettingsUiEntryVariant,
-}
-
-pub enum SettingsUiEntryVariant {
-    Group {
-        path: &'static str,
-        title: &'static str,
-        items: Vec<SettingsUiEntry>,
-    },
-    Item {
-        path: &'static str,
-        item: SettingsUiItemSingle,
-    },
-    Dynamic {
-        path: &'static str,
-        options: Vec<SettingsUiEntry>,
-        determine_option: fn(&serde_json::Value, &mut App) -> usize,
-    },
-    // todo(settings_ui): remove
-    None,
+    /// The path in the settings JSON file for this setting. Relative to parent
+    /// None implies `#[serde(flatten)]` or `Settings::KEY.is_none()` for top level settings
+    pub path: Option<&'static str>,
+    pub title: &'static str,
+    pub item: SettingsUiItem,
 }
 
 pub enum SettingsUiItemSingle {
     SwitchField,
-    NumericStepper,
+    /// A numeric stepper for a specific type of number
+    NumericStepper(NumType),
     ToggleGroup(&'static [&'static str]),
     /// This should be used when toggle group size > 6
     DropDown(&'static [&'static str]),
@@ -96,16 +84,19 @@ impl<T: serde::Serialize> SettingsValue<T> {
     }
 }
 
+pub struct SettingsUiItemDynamic {
+    pub options: Vec<SettingsUiEntry>,
+    pub determine_option: fn(&serde_json::Value, &mut App) -> usize,
+}
+
+pub struct SettingsUiItemGroup {
+    pub items: Vec<SettingsUiEntry>,
+}
+
 pub enum SettingsUiItem {
-    Group {
-        title: &'static str,
-        items: Vec<SettingsUiEntry>,
-    },
+    Group(SettingsUiItemGroup),
     Single(SettingsUiItemSingle),
-    Dynamic {
-        options: Vec<SettingsUiEntry>,
-        determine_option: fn(&serde_json::Value, &mut App) -> usize,
-    },
+    Dynamic(SettingsUiItemDynamic),
     None,
 }
 
@@ -121,8 +112,56 @@ impl SettingsUi for Option<bool> {
     }
 }
 
-impl SettingsUi for u64 {
-    fn settings_ui_item() -> SettingsUiItem {
-        SettingsUiItem::Single(SettingsUiItemSingle::NumericStepper)
+#[repr(u8)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum NumType {
+    U64 = 0,
+    U32 = 1,
+    F32 = 2,
+}
+pub static NUM_TYPE_NAMES: std::sync::LazyLock<[&'static str; NumType::COUNT]> =
+    std::sync::LazyLock::new(|| NumType::ALL.map(NumType::type_name));
+pub static NUM_TYPE_IDS: std::sync::LazyLock<[TypeId; NumType::COUNT]> =
+    std::sync::LazyLock::new(|| NumType::ALL.map(NumType::type_id));
+
+impl NumType {
+    const COUNT: usize = 3;
+    const ALL: [NumType; Self::COUNT] = [NumType::U64, NumType::U32, NumType::F32];
+
+    pub fn type_id(self) -> TypeId {
+        match self {
+            NumType::U64 => TypeId::of::<u64>(),
+            NumType::U32 => TypeId::of::<u32>(),
+            NumType::F32 => TypeId::of::<f32>(),
+        }
+    }
+
+    pub fn type_name(self) -> &'static str {
+        match self {
+            NumType::U64 => std::any::type_name::<u64>(),
+            NumType::U32 => std::any::type_name::<u32>(),
+            NumType::F32 => std::any::type_name::<f32>(),
+        }
     }
 }
+
+macro_rules! numeric_stepper_for_num_type {
+    ($type:ty, $num_type:ident) => {
+        impl SettingsUi for $type {
+            fn settings_ui_item() -> SettingsUiItem {
+                SettingsUiItem::Single(SettingsUiItemSingle::NumericStepper(NumType::$num_type))
+            }
+        }
+
+        impl SettingsUi for Option<$type> {
+            fn settings_ui_item() -> SettingsUiItem {
+                SettingsUiItem::Single(SettingsUiItemSingle::NumericStepper(NumType::$num_type))
+            }
+        }
+    };
+}
+
+numeric_stepper_for_num_type!(u64, U64);
+numeric_stepper_for_num_type!(u32, U32);
+// todo(settings_ui) is there a better ui for f32?
+numeric_stepper_for_num_type!(f32, F32);
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 37edfd5679..01f539d242 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -9,7 +9,10 @@ use command_palette_hooks::CommandPaletteFilter;
 use editor::EditorSettingsControls;
 use feature_flags::{FeatureFlag, FeatureFlagViewExt};
 use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, actions};
-use settings::{SettingsStore, SettingsUiEntryVariant, SettingsUiItemSingle, SettingsValue};
+use settings::{
+    NumType, SettingsStore, SettingsUiEntry, SettingsUiItem, SettingsUiItemDynamic,
+    SettingsUiItemGroup, SettingsUiItemSingle, SettingsValue,
+};
 use smallvec::SmallVec;
 use ui::{NumericStepper, SwitchField, ToggleButtonGroup, ToggleButtonSimple, prelude::*};
 use workspace::{
@@ -134,7 +137,7 @@ impl Item for SettingsPage {
 
 struct UiEntry {
     title: &'static str,
-    path: &'static str,
+    path: Option<&'static str>,
     _depth: usize,
     // a
     //  b     < a descendant range < a total descendant range
@@ -182,14 +185,14 @@ struct SettingsUiTree {
 
 fn build_tree_item(
     tree: &mut Vec<UiEntry>,
-    entry: SettingsUiEntryVariant,
+    entry: SettingsUiEntry,
     depth: usize,
     prev_index: Option<usize>,
 ) {
     let index = tree.len();
     tree.push(UiEntry {
-        title: "",
-        path: "",
+        title: entry.title,
+        path: entry.path,
         _depth: depth,
         descendant_range: index + 1..index + 1,
         total_descendant_range: index + 1..index + 1,
@@ -200,14 +203,8 @@ fn build_tree_item(
     if let Some(prev_index) = prev_index {
         tree[prev_index].next_sibling = Some(index);
     }
-    match entry {
-        SettingsUiEntryVariant::Group {
-            path,
-            title,
-            items: group_items,
-        } => {
-            tree[index].path = path;
-            tree[index].title = title;
+    match entry.item {
+        SettingsUiItem::Group(SettingsUiItemGroup { items: group_items }) => {
             for group_item in group_items {
                 let prev_index = tree[index]
                     .descendant_range
@@ -215,22 +212,17 @@ fn build_tree_item(
                     .not()
                     .then_some(tree[index].descendant_range.end - 1);
                 tree[index].descendant_range.end = tree.len() + 1;
-                build_tree_item(tree, group_item.item, depth + 1, prev_index);
+                build_tree_item(tree, group_item, depth + 1, prev_index);
                 tree[index].total_descendant_range.end = tree.len();
             }
         }
-        SettingsUiEntryVariant::Item { path, item } => {
-            tree[index].path = path;
-            // todo(settings_ui) create title from path in macro, and use here
-            tree[index].title = path;
+        SettingsUiItem::Single(item) => {
             tree[index].render = Some(item);
         }
-        SettingsUiEntryVariant::Dynamic {
-            path,
+        SettingsUiItem::Dynamic(SettingsUiItemDynamic {
             options,
             determine_option,
-        } => {
-            tree[index].path = path;
+        }) => {
             tree[index].select_descendant = Some(determine_option);
             for option in options {
                 let prev_index = tree[index]
@@ -239,11 +231,11 @@ fn build_tree_item(
                     .not()
                     .then_some(tree[index].descendant_range.end - 1);
                 tree[index].descendant_range.end = tree.len() + 1;
-                build_tree_item(tree, option.item, depth + 1, prev_index);
+                build_tree_item(tree, option, depth + 1, prev_index);
                 tree[index].total_descendant_range.end = tree.len();
             }
         }
-        SettingsUiEntryVariant::None => {
+        SettingsUiItem::None => {
             return;
         }
     }
@@ -255,21 +247,17 @@ impl SettingsUiTree {
         let mut tree = vec![];
         let mut root_entry_indices = vec![];
         for item in settings_store.settings_ui_items() {
-            if matches!(item.item, SettingsUiEntryVariant::None) {
+            if matches!(item.item, SettingsUiItem::None)
+            // todo(settings_ui): How to handle top level single items? BaseKeymap is in this category. Probably need a way to
+            // link them to other groups
+            || matches!(item.item, SettingsUiItem::Single(_))
+            {
                 continue;
             }
 
-            assert!(
-                matches!(item.item, SettingsUiEntryVariant::Group { .. }),
-                "top level items must be groups: {:?}",
-                match item.item {
-                    SettingsUiEntryVariant::Item { path, .. } => path,
-                    _ => unreachable!(),
-                }
-            );
             let prev_root_entry_index = root_entry_indices.last().copied();
             root_entry_indices.push(tree.len());
-            build_tree_item(&mut tree, item.item, 0, prev_root_entry_index);
+            build_tree_item(&mut tree, item, 0, prev_root_entry_index);
         }
 
         root_entry_indices.sort_by_key(|i| tree[*i].title);
@@ -314,9 +302,12 @@ fn render_content(
             .size_full()
             .child(Label::new(SharedString::new_static("No settings found")).color(Color::Error));
     };
-    let mut content = v_flex().size_full().gap_4();
+    let mut content = v_flex().size_full().gap_4().overflow_hidden();
 
-    let mut path = smallvec::smallvec![active_entry.path];
+    let mut path = smallvec::smallvec![];
+    if let Some(active_entry_path) = active_entry.path {
+        path.push(active_entry_path);
+    }
     let mut entry_index_queue = VecDeque::new();
 
     if let Some(child_index) = active_entry.first_descendant_index() {
@@ -331,7 +322,11 @@ fn render_content(
     while let Some(index) = entry_index_queue.pop_front() {
         // todo(settings_ui): subgroups?
         let child = &tree.entries[index];
-        path.push(child.path);
+        let mut pushed_path = false;
+        if let Some(child_path) = child.path {
+            path.push(child_path);
+            pushed_path = true;
+        }
         let settings_value = settings_value_from_settings_and_path(
             path.clone(),
             // PERF: how to structure this better? There feels like there's a way to avoid the clone
@@ -347,7 +342,9 @@ fn render_content(
                 entry_index_queue.push_front(descendant_index);
             }
         }
-        path.pop();
+        if pushed_path {
+            path.pop();
+        }
         let Some(child_render) = child.render.as_ref() else {
             continue;
         };
@@ -433,8 +430,8 @@ fn render_item_single(
         SettingsUiItemSingle::SwitchField => {
             render_any_item(settings_value, render_switch_field, window, cx)
         }
-        SettingsUiItemSingle::NumericStepper => {
-            render_any_item(settings_value, render_numeric_stepper, window, cx)
+        SettingsUiItemSingle::NumericStepper(num_type) => {
+            render_any_numeric_stepper(settings_value, *num_type, window, cx)
         }
         SettingsUiItemSingle::ToggleGroup(variants) => {
             render_toggle_button_group(settings_value, variants, window, cx)
@@ -468,6 +465,7 @@ fn downcast_any_item<T: serde::de::DeserializeOwned>(
         .map(|value| serde_json::from_value::<T>(value).expect("value is not a T"));
     // todo(settings_ui) Create test that constructs UI tree, and asserts that all elements have default values
     let default_value = serde_json::from_value::<T>(settings_value.default_value)
+        .with_context(|| format!("path: {:?}", settings_value.path.join(".")))
         .expect("default value is not an Option<T>");
     let deserialized_setting_value = SettingsValue {
         title: settings_value.title,
@@ -488,14 +486,62 @@ fn render_any_item<T: serde::de::DeserializeOwned>(
     render_fn(deserialized_setting_value, window, cx)
 }
 
-fn render_numeric_stepper(
-    value: SettingsValue<u64>,
+fn render_any_numeric_stepper(
+    settings_value: SettingsValue<serde_json::Value>,
+    num_type: NumType,
+    window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    match num_type {
+        NumType::U64 => render_numeric_stepper::<u64>(
+            downcast_any_item(settings_value),
+            u64::saturating_sub,
+            u64::saturating_add,
+            |n| {
+                serde_json::Number::try_from(n)
+                    .context("Failed to convert u64 to serde_json::Number")
+            },
+            window,
+            cx,
+        ),
+        NumType::U32 => render_numeric_stepper::<u32>(
+            downcast_any_item(settings_value),
+            u32::saturating_sub,
+            u32::saturating_add,
+            |n| {
+                serde_json::Number::try_from(n)
+                    .context("Failed to convert u32 to serde_json::Number")
+            },
+            window,
+            cx,
+        ),
+        NumType::F32 => render_numeric_stepper::<f32>(
+            downcast_any_item(settings_value),
+            |a, b| a - b,
+            |a, b| a + b,
+            |n| {
+                serde_json::Number::from_f64(n as f64)
+                    .context("Failed to convert f32 to serde_json::Number")
+            },
+            window,
+            cx,
+        ),
+    }
+}
+
+fn render_numeric_stepper<
+    T: serde::de::DeserializeOwned + std::fmt::Display + Copy + From<u8> + 'static,
+>(
+    value: SettingsValue<T>,
+    saturating_sub: fn(T, T) -> T,
+    saturating_add: fn(T, T) -> T,
+    to_serde_number: fn(T) -> anyhow::Result<serde_json::Number>,
     _window: &mut Window,
     _cx: &mut App,
 ) -> AnyElement {
     let id = element_id_from_path(&value.path);
     let path = value.path.clone();
-    let num = value.value.unwrap_or_else(|| value.default_value);
+    let num = *value.read();
 
     NumericStepper::new(
         id,
@@ -503,8 +549,7 @@ fn render_numeric_stepper(
         {
             let path = value.path.clone();
             move |_, _, cx| {
-                let Some(number) = serde_json::Number::from_u128(num.saturating_sub(1) as u128)
-                else {
+                let Some(number) = to_serde_number(saturating_sub(num, 1.into())).ok() else {
                     return;
                 };
                 let new_value = serde_json::Value::Number(number);
@@ -512,7 +557,7 @@ fn render_numeric_stepper(
             }
         },
         move |_, _, cx| {
-            let Some(number) = serde_json::Number::from_u128(num.saturating_add(1) as u128) else {
+            let Some(number) = to_serde_number(saturating_add(num, 1.into())).ok() else {
                 return;
             };
 
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index 3840bc38da..947840a5d9 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -57,30 +57,22 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
         }
     }
 
-    if path_name.is_none() && group_name.is_some() {
-        // todo(settings_ui) derive path from settings
-        panic!("path is required when group is specified");
-    }
+    let ui_item_fn_body = generate_ui_item_body(group_name.as_ref(), path_name.as_ref(), &input);
 
-    let ui_render_fn_body = generate_ui_item_body(group_name.as_ref(), path_name.as_ref(), &input);
+    // todo(settings_ui): Reformat title to be title case with spaces if group name not present,
+    // and make group name optional, repurpose group as tag indicating item is group
+    let title = group_name.unwrap_or(input.ident.to_string());
 
-    let settings_ui_item_fn_body = path_name
-        .as_ref()
-        .map(|path_name| map_ui_item_to_render(path_name, quote! { Self }))
-        .unwrap_or(quote! {
-            settings::SettingsUiEntry {
-                item: settings::SettingsUiEntryVariant::None
-            }
-        });
+    let ui_entry_fn_body = map_ui_item_to_entry(path_name.as_deref(), &title, quote! { Self });
 
     let expanded = quote! {
         impl #impl_generics settings::SettingsUi for #name #ty_generics #where_clause {
             fn settings_ui_item() -> settings::SettingsUiItem {
-                #ui_render_fn_body
+                #ui_item_fn_body
             }
 
             fn settings_ui_entry() -> settings::SettingsUiEntry {
-                #settings_ui_item_fn_body
+                #ui_entry_fn_body
             }
         }
     };
@@ -114,27 +106,14 @@ fn option_inner_type(ty: TokenStream) -> Option<TokenStream> {
     return Some(ty.to_token_stream());
 }
 
-fn map_ui_item_to_render(path: &str, ty: TokenStream) -> TokenStream {
+fn map_ui_item_to_entry(path: Option<&str>, title: &str, ty: TokenStream) -> TokenStream {
     let ty = extract_type_from_option(ty);
+    let path = path.map_or_else(|| quote! {None}, |path| quote! {Some(#path)});
     quote! {
         settings::SettingsUiEntry {
-            item: match #ty::settings_ui_item() {
-                settings::SettingsUiItem::Group{title, items} => settings::SettingsUiEntryVariant::Group {
-                    title,
-                    path: #path,
-                    items,
-                },
-                settings::SettingsUiItem::Single(item) => settings::SettingsUiEntryVariant::Item {
-                    path: #path,
-                    item,
-                },
-                settings::SettingsUiItem::Dynamic{ options, determine_option } => settings::SettingsUiEntryVariant::Dynamic {
-                    path: #path,
-                    options,
-                    determine_option,
-                },
-                settings::SettingsUiItem::None => settings::SettingsUiEntryVariant::None,
-            }
+            title: #title,
+            path: #path,
+            item: #ty::settings_ui_item(),
         }
     }
 }
@@ -146,16 +125,10 @@ fn generate_ui_item_body(
 ) -> TokenStream {
     match (group_name, path_name, &input.data) {
         (_, _, Data::Union(_)) => unimplemented!("Derive SettingsUi for Unions"),
-        (None, None, Data::Struct(_)) => quote! {
+        (None, _, Data::Struct(_)) => quote! {
             settings::SettingsUiItem::None
         },
-        (Some(_), None, Data::Struct(_)) => quote! {
-            settings::SettingsUiItem::None
-        },
-        (None, Some(_), Data::Struct(_)) => quote! {
-            settings::SettingsUiItem::None
-        },
-        (Some(group_name), _, Data::Struct(data_struct)) => {
+        (Some(_), _, Data::Struct(data_struct)) => {
             let fields = data_struct
                 .fields
                 .iter()
@@ -180,10 +153,11 @@ fn generate_ui_item_body(
                         field.ty.to_token_stream(),
                     )
                 })
-                .map(|(name, ty)| map_ui_item_to_render(&name, ty));
+                // todo(settings_ui): Re-format field name as nice title, and support setting different title with attr
+                .map(|(name, ty)| map_ui_item_to_entry(Some(&name), &name, ty));
 
             quote! {
-                settings::SettingsUiItem::Group{ title: #group_name, items: vec![#(#fields),*] }
+                settings::SettingsUiItem::Group(settings::SettingsUiItemGroup{ items: vec![#(#fields),*] })
             }
         }
         (None, _, Data::Enum(data_enum)) => {

From 970242480a156f89843454cc6bc69b2921a13794 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 1 Sep 2025 20:17:27 -0500
Subject: [PATCH 513/823] settings_ui: Improve case handling (#37342)

Closes #ISSUE

Improves the derive macro for `SettingsUi` so that titles generated from
struct and field names are shown in title case, and toggle button groups
use title case for rendering, while using lower case/snake case in JSON

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 Cargo.lock                                    |  1 +
 crates/settings/src/settings_ui_core.rs       | 15 +++++++--
 crates/settings_ui/src/settings_ui.rs         | 33 ++++++++++++-------
 crates/settings_ui_macros/Cargo.toml          |  1 +
 .../src/settings_ui_macros.rs                 | 28 ++++++++++------
 5 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index abbe5e0297..4ed798b390 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14921,6 +14921,7 @@ dependencies = [
 name = "settings_ui_macros"
 version = "0.1.0"
 dependencies = [
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index 3a5fa3016b..8ab744f5a8 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -24,7 +24,6 @@ pub trait SettingsUi {
 }
 
 pub struct SettingsUiEntry {
-    // todo(settings_ui): move this back here once there isn't a None variant
     /// The path in the settings JSON file for this setting. Relative to parent
     /// None implies `#[serde(flatten)]` or `Settings::KEY.is_none()` for top level settings
     pub path: Option<&'static str>,
@@ -36,9 +35,19 @@ pub enum SettingsUiItemSingle {
     SwitchField,
     /// A numeric stepper for a specific type of number
     NumericStepper(NumType),
-    ToggleGroup(&'static [&'static str]),
+    ToggleGroup {
+        /// Must be the same length as `labels`
+        variants: &'static [&'static str],
+        /// Must be the same length as `variants`
+        labels: &'static [&'static str],
+    },
     /// This should be used when toggle group size > 6
-    DropDown(&'static [&'static str]),
+    DropDown {
+        /// Must be the same length as `labels`
+        variants: &'static [&'static str],
+        /// Must be the same length as `variants`
+        labels: &'static [&'static str],
+    },
     Custom(Box<dyn Fn(SettingsValue<serde_json::Value>, &mut Window, &mut App) -> AnyElement>),
 }
 
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 01f539d242..80e82a3049 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -329,6 +329,7 @@ fn render_content(
         }
         let settings_value = settings_value_from_settings_and_path(
             path.clone(),
+            child.title,
             // PERF: how to structure this better? There feels like there's a way to avoid the clone
             // and every value lookup
             SettingsStore::global(cx).raw_user_settings(),
@@ -433,10 +434,11 @@ fn render_item_single(
         SettingsUiItemSingle::NumericStepper(num_type) => {
             render_any_numeric_stepper(settings_value, *num_type, window, cx)
         }
-        SettingsUiItemSingle::ToggleGroup(variants) => {
-            render_toggle_button_group(settings_value, variants, window, cx)
-        }
-        SettingsUiItemSingle::DropDown(_) => {
+        SettingsUiItemSingle::ToggleGroup {
+            variants: values,
+            labels: titles,
+        } => render_toggle_button_group(settings_value, values, titles, window, cx),
+        SettingsUiItemSingle::DropDown { .. } => {
             unimplemented!("This")
         }
     }
@@ -603,6 +605,7 @@ fn render_switch_field(
 fn render_toggle_button_group(
     value: SettingsValue<serde_json::Value>,
     variants: &'static [&'static str],
+    labels: &'static [&'static str],
     _: &mut Window,
     _: &mut App,
 ) -> AnyElement {
@@ -612,15 +615,18 @@ fn render_toggle_button_group(
         group_name: &'static str,
         value: SettingsValue<String>,
         variants: &'static [&'static str],
+        labels: &'static [&'static str],
     ) -> AnyElement {
-        let mut variants_array: [&'static str; LEN] = ["default"; LEN];
-        variants_array.copy_from_slice(variants);
+        let mut variants_array: [(&'static str, &'static str); LEN] = [("unused", "unused"); LEN];
+        for i in 0..LEN {
+            variants_array[i] = (variants[i], labels[i]);
+        }
         let active_value = value.read();
 
         let selected_idx = variants_array
             .iter()
             .enumerate()
-            .find_map(|(idx, variant)| {
+            .find_map(|(idx, (variant, _))| {
                 if variant == &active_value {
                     Some(idx)
                 } else {
@@ -628,11 +634,13 @@ fn render_toggle_button_group(
                 }
             });
 
+        let mut idx = 0;
         ToggleButtonGroup::single_row(
             group_name,
-            variants_array.map(|variant| {
+            variants_array.map(|(variant, label)| {
                 let path = value.path.clone();
-                ToggleButtonSimple::new(variant, move |_, _, cx| {
+                idx += 1;
+                ToggleButtonSimple::new(label, move |_, _, cx| {
                     SettingsValue::write_value(
                         &path,
                         serde_json::Value::String(variant.to_string()),
@@ -649,7 +657,7 @@ fn render_toggle_button_group(
     macro_rules! templ_toggl_with_const_param {
         ($len:expr) => {
             if variants.len() == $len {
-                return make_toggle_group::<$len>(value.title, value, variants);
+                return make_toggle_group::<$len>(value.title, value, variants, labels);
             }
         };
     }
@@ -664,6 +672,7 @@ fn render_toggle_button_group(
 
 fn settings_value_from_settings_and_path(
     path: SmallVec<[&'static str; 1]>,
+    title: &'static str,
     user_settings: &serde_json::Value,
     default_settings: &serde_json::Value,
 ) -> SettingsValue<serde_json::Value> {
@@ -677,8 +686,8 @@ fn settings_value_from_settings_and_path(
         default_value,
         value,
         path: path.clone(),
-        // todo(settings_ui) title for items
-        title: path.last().expect("path non empty"),
+        // todo(settings_ui) is title required inside SettingsValue?
+        title,
     };
     return settings_value;
 }
diff --git a/crates/settings_ui_macros/Cargo.toml b/crates/settings_ui_macros/Cargo.toml
index e242e7546d..1561e874f4 100644
--- a/crates/settings_ui_macros/Cargo.toml
+++ b/crates/settings_ui_macros/Cargo.toml
@@ -16,6 +16,7 @@ workspace = true
 default = []
 
 [dependencies]
+heck.workspace = true
 proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index 947840a5d9..c98705d5f8 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -1,3 +1,4 @@
+use heck::{ToSnakeCase as _, ToTitleCase as _};
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
 use syn::{Data, DeriveInput, LitStr, Token, parse_macro_input};
@@ -59,9 +60,8 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
 
     let ui_item_fn_body = generate_ui_item_body(group_name.as_ref(), path_name.as_ref(), &input);
 
-    // todo(settings_ui): Reformat title to be title case with spaces if group name not present,
-    // and make group name optional, repurpose group as tag indicating item is group
-    let title = group_name.unwrap_or(input.ident.to_string());
+    // todo(settings_ui): make group name optional, repurpose group as tag indicating item is group, and have "title" tag for custom title
+    let title = group_name.unwrap_or(input.ident.to_string().to_title_case());
 
     let ui_entry_fn_body = map_ui_item_to_entry(path_name.as_deref(), &title, quote! { Self });
 
@@ -154,7 +154,7 @@ fn generate_ui_item_body(
                     )
                 })
                 // todo(settings_ui): Re-format field name as nice title, and support setting different title with attr
-                .map(|(name, ty)| map_ui_item_to_entry(Some(&name), &name, ty));
+                .map(|(name, ty)| map_ui_item_to_entry(Some(&name), &name.to_title_case(), ty));
 
             quote! {
                 settings::SettingsUiItem::Group(settings::SettingsUiItemGroup{ items: vec![#(#fields),*] })
@@ -162,14 +162,15 @@ fn generate_ui_item_body(
         }
         (None, _, Data::Enum(data_enum)) => {
             let mut lowercase = false;
+            let mut snake_case = false;
             for attr in &input.attrs {
                 if attr.path().is_ident("serde") {
                     attr.parse_nested_meta(|meta| {
                         if meta.path.is_ident("rename_all") {
                             meta.input.parse::<Token![=]>()?;
                             let lit = meta.input.parse::<LitStr>()?.value();
-                            // todo(settings_ui) snake case
-                            lowercase = lit == "lowercase" || lit == "snake_case";
+                            lowercase = lit == "lowercase";
+                            snake_case = lit == "snake_case";
                         }
                         Ok(())
                     })
@@ -181,20 +182,27 @@ fn generate_ui_item_body(
             let variants = data_enum.variants.iter().map(|variant| {
                 let string = variant.ident.clone().to_string();
 
-                if lowercase {
+                let title = string.to_title_case();
+                let string = if lowercase {
                     string.to_lowercase()
+                } else if snake_case {
+                    string.to_snake_case()
                 } else {
                     string
-                }
+                };
+
+                (string, title)
             });
 
+            let (variants, labels): (Vec<_>, Vec<_>) = variants.unzip();
+
             if length > 6 {
                 quote! {
-                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown(&[#(#variants),*]))
+                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
                 }
             } else {
                 quote! {
-                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup(&[#(#variants),*]))
+                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
                 }
             }
         }

From f06be6f3ec798782d59bddc0a2b1e6b32325800a Mon Sep 17 00:00:00 2001
From: Maksim Bondarenkov <119937608+ognevny@users.noreply.github.com>
Date: Tue, 2 Sep 2025 10:02:41 +0300
Subject: [PATCH 514/823] docs: Add link to msys2 docs page (#37327)

it was removed earlier. better to keep this link because the page
contains some useful information

Release Notes:

- N/A
---
 docs/src/development/windows.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
index a4ad220bcc..65e65f4cc1 100644
--- a/docs/src/development/windows.md
+++ b/docs/src/development/windows.md
@@ -116,6 +116,8 @@ cargo test --workspace
 
 Zed does not support unofficial MSYS2 Zed packages built for Mingw-w64. Please report any issues you may have with [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed) to [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed).
 
+Please refer to [MSYS2 documentation](https://www.msys2.org/docs/ides-editors/#zed) first.
+
 ## Troubleshooting
 
 ### Setting `RUSTFLAGS` env var breaks builds

From 374a8bc4cb6fd1eb8d8a35b0654f280feba47997 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 2 Sep 2025 10:48:33 +0200
Subject: [PATCH 515/823] acp: Add support for slash commands (#37304)

Depends on
https://github.com/zed-industries/agent-client-protocol/pull/45

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 Cargo.lock                                    |   4 +-
 Cargo.toml                                    |   2 +-
 crates/acp_thread/src/acp_thread.rs           |   8 +
 crates/acp_thread/src/connection.rs           |   2 +-
 crates/agent2/src/agent.rs                    |   1 +
 crates/agent_servers/src/acp.rs               |   9 +-
 .../agent_ui/src/acp/completion_provider.rs   | 428 +++++++++++++----
 crates/agent_ui/src/acp/entry_view_state.rs   |  22 +-
 crates/agent_ui/src/acp/message_editor.rs     | 435 +++++++++---------
 crates/agent_ui/src/acp/thread_view.rs        |  16 +-
 crates/project/src/lsp_store.rs               |  15 +
 11 files changed, 621 insertions(+), 321 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ed798b390..da9eeabee4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec42b8b612665799c7667890df4b5f5cb441b18a68619fd770f1e054480ee3f"
+checksum = "603941db1d130ee275840c465b73a2312727d4acef97449550ccf033de71301f"
 dependencies = [
  "anyhow",
  "async-broadcast",
diff --git a/Cargo.toml b/Cargo.toml
index 6cf3d8858b..a96dc5d4d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -430,7 +430,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol = { version = "0.2.0-alpha.3", features = ["unstable"] }
+agent-client-protocol = { version = "0.2.0-alpha.4", features = ["unstable"]}
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index ab6aa98e99..f9a955eb9f 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -785,6 +785,7 @@ pub struct AcpThread {
     session_id: acp::SessionId,
     token_usage: Option<TokenUsage>,
     prompt_capabilities: acp::PromptCapabilities,
+    available_commands: Vec<acp::AvailableCommand>,
     _observe_prompt_capabilities: Task<anyhow::Result<()>>,
     determine_shell: Shared<Task<String>>,
     terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
@@ -858,6 +859,7 @@ impl AcpThread {
         action_log: Entity<ActionLog>,
         session_id: acp::SessionId,
         mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
+        available_commands: Vec<acp::AvailableCommand>,
         cx: &mut Context<Self>,
     ) -> Self {
         let prompt_capabilities = *prompt_capabilities_rx.borrow();
@@ -897,6 +899,7 @@ impl AcpThread {
             session_id,
             token_usage: None,
             prompt_capabilities,
+            available_commands,
             _observe_prompt_capabilities: task,
             terminals: HashMap::default(),
             determine_shell,
@@ -907,6 +910,10 @@ impl AcpThread {
         self.prompt_capabilities
     }
 
+    pub fn available_commands(&self) -> Vec<acp::AvailableCommand> {
+        self.available_commands.clone()
+    }
+
     pub fn connection(&self) -> &Rc<dyn AgentConnection> {
         &self.connection
     }
@@ -2864,6 +2871,7 @@ mod tests {
                         audio: true,
                         embedded_context: true,
                     }),
+                    vec![],
                     cx,
                 )
             });
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 96abd1d2b4..7901b08c90 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -75,7 +75,6 @@ pub trait AgentConnection {
     fn telemetry(&self) -> Option<Rc<dyn AgentTelemetry>> {
         None
     }
-
     fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
 }
 
@@ -339,6 +338,7 @@ mod test_support {
                         audio: true,
                         embedded_context: true,
                     }),
+                    vec![],
                     cx,
                 )
             });
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index e96b4c0cfa..241e3d389f 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -292,6 +292,7 @@ impl NativeAgent {
                 action_log.clone(),
                 session_id.clone(),
                 prompt_capabilities_rx,
+                vec![],
                 cx,
             )
         });
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index b29bfd5d89..7907083e14 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -28,7 +28,7 @@ pub struct AcpConnection {
     connection: Rc<acp::ClientSideConnection>,
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
-    prompt_capabilities: acp::PromptCapabilities,
+    agent_capabilities: acp::AgentCapabilities,
     _io_task: Task<Result<()>>,
     _wait_task: Task<Result<()>>,
     _stderr_task: Task<Result<()>>,
@@ -148,7 +148,7 @@ impl AcpConnection {
             connection,
             server_name,
             sessions,
-            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
+            agent_capabilities: response.agent_capabilities,
             _io_task: io_task,
             _wait_task: wait_task,
             _stderr_task: stderr_task,
@@ -156,7 +156,7 @@ impl AcpConnection {
     }
 
     pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {
-        &self.prompt_capabilities
+        &self.agent_capabilities.prompt_capabilities
     }
 }
 
@@ -223,7 +223,8 @@ impl AgentConnection for AcpConnection {
                     action_log,
                     session_id.clone(),
                     // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
-                    watch::Receiver::constant(self.prompt_capabilities),
+                    watch::Receiver::constant(self.agent_capabilities.prompt_capabilities),
+                    response.available_commands,
                     cx,
                 )
             })?;
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 5b40967069..59106c3795 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,4 +1,4 @@
-use std::cell::Cell;
+use std::cell::{Cell, RefCell};
 use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -13,6 +13,7 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{App, Entity, Task, WeakEntity};
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
+use project::lsp_store::CompletionDocumentation;
 use project::{
     Completion, CompletionIntent, CompletionResponse, Project, ProjectPath, Symbol, WorktreeId,
 };
@@ -23,7 +24,7 @@ use ui::prelude::*;
 use workspace::Workspace;
 
 use crate::AgentPanel;
-use crate::acp::message_editor::MessageEditor;
+use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::context_picker::file_context_picker::{FileMatch, search_files};
 use crate::context_picker::rules_context_picker::{RulesContextEntry, search_rules};
 use crate::context_picker::symbol_context_picker::SymbolMatch;
@@ -67,6 +68,7 @@ pub struct ContextPickerCompletionProvider {
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
     prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
 }
 
 impl ContextPickerCompletionProvider {
@@ -76,6 +78,7 @@ impl ContextPickerCompletionProvider {
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
         prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     ) -> Self {
         Self {
             message_editor,
@@ -83,6 +86,7 @@ impl ContextPickerCompletionProvider {
             history_store,
             prompt_store,
             prompt_capabilities,
+            available_commands,
         }
     }
 
@@ -369,7 +373,42 @@ impl ContextPickerCompletionProvider {
         })
     }
 
-    fn search(
+    fn search_slash_commands(
+        &self,
+        query: String,
+        cx: &mut App,
+    ) -> Task<Vec<acp::AvailableCommand>> {
+        let commands = self.available_commands.borrow().clone();
+        if commands.is_empty() {
+            return Task::ready(Vec::new());
+        }
+
+        cx.spawn(async move |cx| {
+            let candidates = commands
+                .iter()
+                .enumerate()
+                .map(|(id, command)| StringMatchCandidate::new(id, &command.name))
+                .collect::<Vec<_>>();
+
+            let matches = fuzzy::match_strings(
+                &candidates,
+                &query,
+                false,
+                true,
+                100,
+                &Arc::new(AtomicBool::default()),
+                cx.background_executor().clone(),
+            )
+            .await;
+
+            matches
+                .into_iter()
+                .map(|mat| commands[mat.candidate_id].clone())
+                .collect()
+        })
+    }
+
+    fn search_mentions(
         &self,
         mode: Option<ContextPickerMode>,
         query: String,
@@ -651,10 +690,10 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             let offset_to_line = buffer.point_to_offset(line_start);
             let mut lines = buffer.text_for_range(line_start..position).lines();
             let line = lines.next()?;
-            MentionCompletion::try_parse(
-                self.prompt_capabilities.get().embedded_context,
+            ContextCompletion::try_parse(
                 line,
                 offset_to_line,
+                self.prompt_capabilities.get().embedded_context,
             )
         });
         let Some(state) = state else {
@@ -667,97 +706,169 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
         let project = workspace.read(cx).project().clone();
         let snapshot = buffer.read(cx).snapshot();
-        let source_range = snapshot.anchor_before(state.source_range.start)
-            ..snapshot.anchor_after(state.source_range.end);
+        let source_range = snapshot.anchor_before(state.source_range().start)
+            ..snapshot.anchor_after(state.source_range().end);
 
         let editor = self.message_editor.clone();
 
-        let MentionCompletion { mode, argument, .. } = state;
-        let query = argument.unwrap_or_else(|| "".to_string());
-
-        let search_task = self.search(mode, query, Arc::<AtomicBool>::default(), cx);
-
-        cx.spawn(async move |_, cx| {
-            let matches = search_task.await;
-
-            let completions = cx.update(|cx| {
-                matches
-                    .into_iter()
-                    .filter_map(|mat| match mat {
-                        Match::File(FileMatch { mat, is_recent }) => {
-                            let project_path = ProjectPath {
-                                worktree_id: WorktreeId::from_usize(mat.worktree_id),
-                                path: mat.path.clone(),
+        match state {
+            ContextCompletion::SlashCommand(SlashCommandCompletion {
+                command, argument, ..
+            }) => {
+                let search_task = self.search_slash_commands(command.unwrap_or_default(), cx);
+                cx.background_spawn(async move {
+                    let completions = search_task
+                        .await
+                        .into_iter()
+                        .map(|command| {
+                            let new_text = if let Some(argument) = argument.as_ref() {
+                                format!("/{} {}", command.name, argument)
+                            } else {
+                                format!("/{} ", command.name)
                             };
 
-                            Self::completion_for_path(
-                                project_path,
-                                &mat.path_prefix,
-                                is_recent,
-                                mat.is_dir,
-                                source_range.clone(),
-                                editor.clone(),
-                                project.clone(),
-                                cx,
-                            )
-                        }
+                            let is_missing_argument = argument.is_none() && command.input.is_some();
+                            Completion {
+                                replace_range: source_range.clone(),
+                                new_text,
+                                label: CodeLabel::plain(command.name.to_string(), None),
+                                documentation: Some(CompletionDocumentation::SingleLine(
+                                    command.description.into(),
+                                )),
+                                source: project::CompletionSource::Custom,
+                                icon_path: None,
+                                insert_text_mode: None,
+                                confirm: Some(Arc::new({
+                                    let editor = editor.clone();
+                                    move |intent, _window, cx| {
+                                        if !is_missing_argument {
+                                            cx.defer({
+                                                let editor = editor.clone();
+                                                move |cx| {
+                                                    editor
+                                                        .update(cx, |_editor, cx| {
+                                                            match intent {
+                                                                CompletionIntent::Complete
+                                                                | CompletionIntent::CompleteWithInsert
+                                                                | CompletionIntent::CompleteWithReplace => {
+                                                                    if !is_missing_argument {
+                                                                        cx.emit(MessageEditorEvent::Send);
+                                                                    }
+                                                                }
+                                                                CompletionIntent::Compose => {}
+                                                            }
+                                                        })
+                                                        .ok();
+                                                }
+                                            });
+                                        }
+                                        is_missing_argument
+                                    }
+                                })),
+                            }
+                        })
+                        .collect();
 
-                        Match::Symbol(SymbolMatch { symbol, .. }) => Self::completion_for_symbol(
-                            symbol,
-                            source_range.clone(),
-                            editor.clone(),
-                            workspace.clone(),
-                            cx,
-                        ),
+                    Ok(vec![CompletionResponse {
+                        completions,
+                        // Since this does its own filtering (see `filter_completions()` returns false),
+                        // there is no benefit to computing whether this set of completions is incomplete.
+                        is_incomplete: true,
+                    }])
+                })
+            }
+            ContextCompletion::Mention(MentionCompletion { mode, argument, .. }) => {
+                let query = argument.unwrap_or_default();
+                let search_task =
+                    self.search_mentions(mode, query, Arc::<AtomicBool>::default(), cx);
 
-                        Match::Thread(thread) => Some(Self::completion_for_thread(
-                            thread,
-                            source_range.clone(),
-                            false,
-                            editor.clone(),
-                            cx,
-                        )),
+                cx.spawn(async move |_, cx| {
+                    let matches = search_task.await;
 
-                        Match::RecentThread(thread) => Some(Self::completion_for_thread(
-                            thread,
-                            source_range.clone(),
-                            true,
-                            editor.clone(),
-                            cx,
-                        )),
+                    let completions = cx.update(|cx| {
+                        matches
+                            .into_iter()
+                            .filter_map(|mat| match mat {
+                                Match::File(FileMatch { mat, is_recent }) => {
+                                    let project_path = ProjectPath {
+                                        worktree_id: WorktreeId::from_usize(mat.worktree_id),
+                                        path: mat.path.clone(),
+                                    };
 
-                        Match::Rules(user_rules) => Some(Self::completion_for_rules(
-                            user_rules,
-                            source_range.clone(),
-                            editor.clone(),
-                            cx,
-                        )),
+                                    Self::completion_for_path(
+                                        project_path,
+                                        &mat.path_prefix,
+                                        is_recent,
+                                        mat.is_dir,
+                                        source_range.clone(),
+                                        editor.clone(),
+                                        project.clone(),
+                                        cx,
+                                    )
+                                }
 
-                        Match::Fetch(url) => Self::completion_for_fetch(
-                            source_range.clone(),
-                            url,
-                            editor.clone(),
-                            cx,
-                        ),
+                                Match::Symbol(SymbolMatch { symbol, .. }) => {
+                                    Self::completion_for_symbol(
+                                        symbol,
+                                        source_range.clone(),
+                                        editor.clone(),
+                                        workspace.clone(),
+                                        cx,
+                                    )
+                                }
 
-                        Match::Entry(EntryMatch { entry, .. }) => Self::completion_for_entry(
-                            entry,
-                            source_range.clone(),
-                            editor.clone(),
-                            &workspace,
-                            cx,
-                        ),
-                    })
-                    .collect()
-            })?;
+                                Match::Thread(thread) => Some(Self::completion_for_thread(
+                                    thread,
+                                    source_range.clone(),
+                                    false,
+                                    editor.clone(),
+                                    cx,
+                                )),
 
-            Ok(vec![CompletionResponse {
-                completions,
-                // Since this does its own filtering (see `filter_completions()` returns false),
-                // there is no benefit to computing whether this set of completions is incomplete.
-                is_incomplete: true,
-            }])
-        })
+                                Match::RecentThread(thread) => Some(Self::completion_for_thread(
+                                    thread,
+                                    source_range.clone(),
+                                    true,
+                                    editor.clone(),
+                                    cx,
+                                )),
+
+                                Match::Rules(user_rules) => Some(Self::completion_for_rules(
+                                    user_rules,
+                                    source_range.clone(),
+                                    editor.clone(),
+                                    cx,
+                                )),
+
+                                Match::Fetch(url) => Self::completion_for_fetch(
+                                    source_range.clone(),
+                                    url,
+                                    editor.clone(),
+                                    cx,
+                                ),
+
+                                Match::Entry(EntryMatch { entry, .. }) => {
+                                    Self::completion_for_entry(
+                                        entry,
+                                        source_range.clone(),
+                                        editor.clone(),
+                                        &workspace,
+                                        cx,
+                                    )
+                                }
+                            })
+                            .collect()
+                    })?;
+
+                    Ok(vec![CompletionResponse {
+                        completions,
+                        // Since this does its own filtering (see `filter_completions()` returns false),
+                        // there is no benefit to computing whether this set of completions is incomplete.
+                        is_incomplete: true,
+                    }])
+                })
+            }
+        }
     }
 
     fn is_completion_trigger(
@@ -775,14 +886,14 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         let offset_to_line = buffer.point_to_offset(line_start);
         let mut lines = buffer.text_for_range(line_start..position).lines();
         if let Some(line) = lines.next() {
-            MentionCompletion::try_parse(
-                self.prompt_capabilities.get().embedded_context,
+            ContextCompletion::try_parse(
                 line,
                 offset_to_line,
+                self.prompt_capabilities.get().embedded_context,
             )
             .map(|completion| {
-                completion.source_range.start <= offset_to_line + position.column as usize
-                    && completion.source_range.end >= offset_to_line + position.column as usize
+                completion.source_range().start <= offset_to_line + position.column as usize
+                    && completion.source_range().end >= offset_to_line + position.column as usize
             })
             .unwrap_or(false)
         } else {
@@ -851,7 +962,7 @@ fn confirm_completion_callback(
                 .clone()
                 .update(cx, |message_editor, cx| {
                     message_editor
-                        .confirm_completion(
+                        .confirm_mention_completion(
                             crease_text,
                             start,
                             content_len,
@@ -867,6 +978,89 @@ fn confirm_completion_callback(
     })
 }
 
+enum ContextCompletion {
+    SlashCommand(SlashCommandCompletion),
+    Mention(MentionCompletion),
+}
+
+impl ContextCompletion {
+    fn source_range(&self) -> Range<usize> {
+        match self {
+            Self::SlashCommand(completion) => completion.source_range.clone(),
+            Self::Mention(completion) => completion.source_range.clone(),
+        }
+    }
+
+    fn try_parse(line: &str, offset_to_line: usize, allow_non_file_mentions: bool) -> Option<Self> {
+        if let Some(command) = SlashCommandCompletion::try_parse(line, offset_to_line) {
+            Some(Self::SlashCommand(command))
+        } else if let Some(mention) =
+            MentionCompletion::try_parse(allow_non_file_mentions, line, offset_to_line)
+        {
+            Some(Self::Mention(mention))
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Debug, Default, PartialEq)]
+struct SlashCommandCompletion {
+    source_range: Range<usize>,
+    command: Option<String>,
+    argument: Option<String>,
+}
+
+impl SlashCommandCompletion {
+    fn try_parse(line: &str, offset_to_line: usize) -> Option<Self> {
+        // If we decide to support commands that are not at the beginning of the prompt, we can remove this check
+        if !line.starts_with('/') || offset_to_line != 0 {
+            return None;
+        }
+
+        let last_command_start = line.rfind('/')?;
+        if last_command_start >= line.len() {
+            return Some(Self::default());
+        }
+        if last_command_start > 0
+            && line
+                .chars()
+                .nth(last_command_start - 1)
+                .is_some_and(|c| !c.is_whitespace())
+        {
+            return None;
+        }
+
+        let rest_of_line = &line[last_command_start + 1..];
+
+        let mut command = None;
+        let mut argument = None;
+        let mut end = last_command_start + 1;
+
+        if let Some(command_text) = rest_of_line.split_whitespace().next() {
+            command = Some(command_text.to_string());
+            end += command_text.len();
+
+            // Find the start of arguments after the command
+            if let Some(args_start) =
+                rest_of_line[command_text.len()..].find(|c: char| !c.is_whitespace())
+            {
+                let args = &rest_of_line[command_text.len() + args_start..].trim_end();
+                if !args.is_empty() {
+                    argument = Some(args.to_string());
+                    end += args.len() + 1;
+                }
+            }
+        }
+
+        Some(Self {
+            source_range: last_command_start + offset_to_line..end + offset_to_line,
+            command,
+            argument,
+        })
+    }
+}
+
 #[derive(Debug, Default, PartialEq)]
 struct MentionCompletion {
     source_range: Range<usize>,
@@ -932,6 +1126,62 @@ impl MentionCompletion {
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_slash_command_completion_parse() {
+        assert_eq!(
+            SlashCommandCompletion::try_parse("/", 0),
+            Some(SlashCommandCompletion {
+                source_range: 0..1,
+                command: None,
+                argument: None,
+            })
+        );
+
+        assert_eq!(
+            SlashCommandCompletion::try_parse("/help", 0),
+            Some(SlashCommandCompletion {
+                source_range: 0..5,
+                command: Some("help".to_string()),
+                argument: None,
+            })
+        );
+
+        assert_eq!(
+            SlashCommandCompletion::try_parse("/help ", 0),
+            Some(SlashCommandCompletion {
+                source_range: 0..5,
+                command: Some("help".to_string()),
+                argument: None,
+            })
+        );
+
+        assert_eq!(
+            SlashCommandCompletion::try_parse("/help arg1", 0),
+            Some(SlashCommandCompletion {
+                source_range: 0..10,
+                command: Some("help".to_string()),
+                argument: Some("arg1".to_string()),
+            })
+        );
+
+        assert_eq!(
+            SlashCommandCompletion::try_parse("/help arg1 arg2", 0),
+            Some(SlashCommandCompletion {
+                source_range: 0..15,
+                command: Some("help".to_string()),
+                argument: Some("arg1 arg2".to_string()),
+            })
+        );
+
+        assert_eq!(SlashCommandCompletion::try_parse("Lorem Ipsum", 0), None);
+
+        assert_eq!(SlashCommandCompletion::try_parse("Lorem /", 0), None);
+
+        assert_eq!(SlashCommandCompletion::try_parse("Lorem /help", 0), None);
+
+        assert_eq!(SlashCommandCompletion::try_parse("Lorem/", 0), None);
+    }
+
     #[test]
     fn test_mention_completion_parse() {
         assert_eq!(MentionCompletion::try_parse(true, "Lorem Ipsum", 0), None);
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 0103219e31..4a91e93fa8 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,7 +1,11 @@
-use std::{cell::Cell, ops::Range, rc::Rc};
+use std::{
+    cell::{Cell, RefCell},
+    ops::Range,
+    rc::Rc,
+};
 
 use acp_thread::{AcpThread, AgentThreadEntry};
-use agent_client_protocol::{PromptCapabilities, ToolCallId};
+use agent_client_protocol::{self as acp, ToolCallId};
 use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
@@ -26,8 +30,8 @@ pub struct EntryViewState {
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
     entries: Vec<Entry>,
-    prevent_slash_commands: bool,
-    prompt_capabilities: Rc<Cell<PromptCapabilities>>,
+    prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
 }
 
 impl EntryViewState {
@@ -36,8 +40,8 @@ impl EntryViewState {
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<Cell<PromptCapabilities>>,
-        prevent_slash_commands: bool,
+        prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     ) -> Self {
         Self {
             workspace,
@@ -45,8 +49,8 @@ impl EntryViewState {
             history_store,
             prompt_store,
             entries: Vec::new(),
-            prevent_slash_commands,
             prompt_capabilities,
+            available_commands,
         }
     }
 
@@ -85,8 +89,8 @@ impl EntryViewState {
                             self.history_store.clone(),
                             self.prompt_store.clone(),
                             self.prompt_capabilities.clone(),
+                            self.available_commands.clone(),
                             "Edit message － @ to include context",
-                            self.prevent_slash_commands,
                             editor::EditorMode::AutoHeight {
                                 min_lines: 1,
                                 max_lines: None,
@@ -471,7 +475,7 @@ mod tests {
                 history_store,
                 None,
                 Default::default(),
-                false,
+                Default::default(),
             )
         });
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index b9e85e0ee3..b51bc2e0a3 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -12,7 +12,7 @@ use collections::{HashMap, HashSet};
 use editor::{
     Addon, Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
     EditorEvent, EditorMode, EditorSnapshot, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer,
-    SemanticsProvider, ToOffset,
+    ToOffset,
     actions::Paste,
     display_map::{Crease, CreaseId, FoldId},
 };
@@ -22,8 +22,8 @@ use futures::{
 };
 use gpui::{
     Animation, AnimationExt as _, AppContext, ClipboardEntry, Context, Entity, EntityId,
-    EventEmitter, FocusHandle, Focusable, HighlightStyle, Image, ImageFormat, Img, KeyContext,
-    Subscription, Task, TextStyle, UnderlineStyle, WeakEntity, pulsating_between,
+    EventEmitter, FocusHandle, Focusable, Image, ImageFormat, Img, KeyContext, Subscription, Task,
+    TextStyle, WeakEntity, pulsating_between,
 };
 use language::{Buffer, Language};
 use language_model::LanguageModelImage;
@@ -33,7 +33,7 @@ use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::Settings;
 use std::{
-    cell::Cell,
+    cell::{Cell, RefCell},
     ffi::OsStr,
     fmt::Write,
     ops::{Range, RangeInclusive},
@@ -42,20 +42,18 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use text::{OffsetRangeExt, ToOffset as _};
+use text::OffsetRangeExt;
 use theme::ThemeSettings;
 use ui::{
     ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Element as _,
     FluentBuilder as _, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
     LabelCommon, LabelSize, ParentElement, Render, SelectableButton, SharedString, Styled,
-    TextSize, TintColor, Toggleable, Window, div, h_flex, px,
+    TextSize, TintColor, Toggleable, Window, div, h_flex,
 };
 use util::{ResultExt, debug_panic};
 use workspace::{Workspace, notifications::NotifyResultExt as _};
 use zed_actions::agent::Chat;
 
-const PARSE_SLASH_COMMAND_DEBOUNCE: Duration = Duration::from_millis(50);
-
 pub struct MessageEditor {
     mention_set: MentionSet,
     editor: Entity<Editor>,
@@ -63,7 +61,6 @@ pub struct MessageEditor {
     workspace: WeakEntity<Workspace>,
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
-    prevent_slash_commands: bool,
     prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
     _subscriptions: Vec<Subscription>,
     _parse_slash_command_task: Task<()>,
@@ -86,8 +83,8 @@ impl MessageEditor {
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
         prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
         placeholder: impl Into<Arc<str>>,
-        prevent_slash_commands: bool,
         mode: EditorMode,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -99,16 +96,14 @@ impl MessageEditor {
             },
             None,
         );
-        let completion_provider = ContextPickerCompletionProvider::new(
+        let completion_provider = Rc::new(ContextPickerCompletionProvider::new(
             cx.weak_entity(),
             workspace.clone(),
             history_store.clone(),
             prompt_store.clone(),
             prompt_capabilities.clone(),
-        );
-        let semantics_provider = Rc::new(SlashCommandSemanticsProvider {
-            range: Cell::new(None),
-        });
+            available_commands,
+        ));
         let mention_set = MentionSet::default();
         let editor = cx.new(|cx| {
             let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
@@ -119,15 +114,12 @@ impl MessageEditor {
             editor.set_show_indent_guides(false, cx);
             editor.set_soft_wrap();
             editor.set_use_modal_editing(true);
-            editor.set_completion_provider(Some(Rc::new(completion_provider)));
+            editor.set_completion_provider(Some(completion_provider.clone()));
             editor.set_context_menu_options(ContextMenuOptions {
                 min_entries_visible: 12,
                 max_entries_visible: 12,
                 placement: Some(ContextMenuPlacement::Above),
             });
-            if prevent_slash_commands {
-                editor.set_semantics_provider(Some(semantics_provider.clone()));
-            }
             editor.register_addon(MessageEditorAddon::new());
             editor
         });
@@ -143,17 +135,8 @@ impl MessageEditor {
 
         let mut subscriptions = Vec::new();
         subscriptions.push(cx.subscribe_in(&editor, window, {
-            let semantics_provider = semantics_provider.clone();
             move |this, editor, event, window, cx| {
                 if let EditorEvent::Edited { .. } = event {
-                    if prevent_slash_commands {
-                        this.highlight_slash_command(
-                            semantics_provider.clone(),
-                            editor.clone(),
-                            window,
-                            cx,
-                        );
-                    }
                     let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
                     this.mention_set.remove_invalid(snapshot);
                     cx.notify();
@@ -168,7 +151,6 @@ impl MessageEditor {
             workspace,
             history_store,
             prompt_store,
-            prevent_slash_commands,
             prompt_capabilities,
             _subscriptions: subscriptions,
             _parse_slash_command_task: Task::ready(()),
@@ -191,7 +173,7 @@ impl MessageEditor {
                 .text_anchor
         });
 
-        self.confirm_completion(
+        self.confirm_mention_completion(
             thread.title.clone(),
             start,
             thread.title.len(),
@@ -227,7 +209,7 @@ impl MessageEditor {
             .collect()
     }
 
-    pub fn confirm_completion(
+    pub fn confirm_mention_completion(
         &mut self,
         crease_text: SharedString,
         start: text::Anchor,
@@ -687,7 +669,6 @@ impl MessageEditor {
             .mention_set
             .contents(&self.prompt_capabilities.get(), cx);
         let editor = self.editor.clone();
-        let prevent_slash_commands = self.prevent_slash_commands;
 
         cx.spawn(async move |_, cx| {
             let contents = contents.await?;
@@ -706,14 +687,16 @@ impl MessageEditor {
 
                         let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot);
                         if crease_range.start > ix {
-                            let chunk = if prevent_slash_commands
-                                && ix == 0
-                                && parse_slash_command(&text[ix..]).is_some()
-                            {
-                                format!(" {}", &text[ix..crease_range.start]).into()
-                            } else {
-                                text[ix..crease_range.start].into()
-                            };
+                            //todo(): Custom slash command ContentBlock?
+                            // let chunk = if prevent_slash_commands
+                            //     && ix == 0
+                            //     && parse_slash_command(&text[ix..]).is_some()
+                            // {
+                            //     format!(" {}", &text[ix..crease_range.start]).into()
+                            // } else {
+                            //     text[ix..crease_range.start].into()
+                            // };
+                            let chunk = text[ix..crease_range.start].into();
                             chunks.push(chunk);
                         }
                         let chunk = match mention {
@@ -769,14 +752,16 @@ impl MessageEditor {
                     }
 
                     if ix < text.len() {
-                        let last_chunk = if prevent_slash_commands
-                            && ix == 0
-                            && parse_slash_command(&text[ix..]).is_some()
-                        {
-                            format!(" {}", text[ix..].trim_end())
-                        } else {
-                            text[ix..].trim_end().to_owned()
-                        };
+                        //todo(): Custom slash command ContentBlock?
+                        // let last_chunk = if prevent_slash_commands
+                        //     && ix == 0
+                        //     && parse_slash_command(&text[ix..]).is_some()
+                        // {
+                        //     format!(" {}", text[ix..].trim_end())
+                        // } else {
+                        //     text[ix..].trim_end().to_owned()
+                        // };
+                        let last_chunk = text[ix..].trim_end().to_owned();
                         if !last_chunk.is_empty() {
                             chunks.push(last_chunk.into());
                         }
@@ -971,7 +956,14 @@ impl MessageEditor {
                     cx,
                 );
             });
-            tasks.push(self.confirm_completion(file_name, anchor, content_len, uri, window, cx));
+            tasks.push(self.confirm_mention_completion(
+                file_name,
+                anchor,
+                content_len,
+                uri,
+                window,
+                cx,
+            ));
         }
         cx.spawn(async move |_, _| {
             join_all(tasks).await;
@@ -1133,48 +1125,6 @@ impl MessageEditor {
         cx.notify();
     }
 
-    fn highlight_slash_command(
-        &mut self,
-        semantics_provider: Rc<SlashCommandSemanticsProvider>,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        struct InvalidSlashCommand;
-
-        self._parse_slash_command_task = cx.spawn_in(window, async move |_, cx| {
-            cx.background_executor()
-                .timer(PARSE_SLASH_COMMAND_DEBOUNCE)
-                .await;
-            editor
-                .update_in(cx, |editor, window, cx| {
-                    let snapshot = editor.snapshot(window, cx);
-                    let range = parse_slash_command(&editor.text(cx));
-                    semantics_provider.range.set(range);
-                    if let Some((start, end)) = range {
-                        editor.highlight_text::<InvalidSlashCommand>(
-                            vec![
-                                snapshot.buffer_snapshot.anchor_after(start)
-                                    ..snapshot.buffer_snapshot.anchor_before(end),
-                            ],
-                            HighlightStyle {
-                                underline: Some(UnderlineStyle {
-                                    thickness: px(1.),
-                                    color: Some(gpui::red()),
-                                    wavy: true,
-                                }),
-                                ..Default::default()
-                            },
-                            cx,
-                        );
-                    } else {
-                        editor.clear_highlights::<InvalidSlashCommand>(cx);
-                    }
-                })
-                .ok();
-        })
-    }
-
     pub fn text(&self, cx: &App) -> String {
         self.editor.read(cx).text(cx)
     }
@@ -1264,7 +1214,7 @@ pub(crate) fn insert_crease_for_mention(
         let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);
 
         let placeholder = FoldPlaceholder {
-            render: render_fold_icon_button(
+            render: render_mention_fold_button(
                 crease_label,
                 crease_icon,
                 start..end,
@@ -1294,7 +1244,7 @@ pub(crate) fn insert_crease_for_mention(
     Some((crease_id, tx))
 }
 
-fn render_fold_icon_button(
+fn render_mention_fold_button(
     label: SharedString,
     icon: SharedString,
     range: Range<Anchor>,
@@ -1471,118 +1421,6 @@ impl MentionSet {
     }
 }
 
-struct SlashCommandSemanticsProvider {
-    range: Cell<Option<(usize, usize)>>,
-}
-
-impl SemanticsProvider for SlashCommandSemanticsProvider {
-    fn hover(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Option<Vec<project::Hover>>>> {
-        let snapshot = buffer.read(cx).snapshot();
-        let offset = position.to_offset(&snapshot);
-        let (start, end) = self.range.get()?;
-        if !(start..end).contains(&offset) {
-            return None;
-        }
-        let range = snapshot.anchor_after(start)..snapshot.anchor_after(end);
-        Some(Task::ready(Some(vec![project::Hover {
-            contents: vec![project::HoverBlock {
-                text: "Slash commands are not supported".into(),
-                kind: project::HoverBlockKind::PlainText,
-            }],
-            range: Some(range),
-            language: None,
-        }])))
-    }
-
-    fn inline_values(
-        &self,
-        _buffer_handle: Entity<Buffer>,
-        _range: Range<text::Anchor>,
-        _cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<project::InlayHint>>>> {
-        None
-    }
-
-    fn inlay_hints(
-        &self,
-        _buffer_handle: Entity<Buffer>,
-        _range: Range<text::Anchor>,
-        _cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<project::InlayHint>>>> {
-        None
-    }
-
-    fn resolve_inlay_hint(
-        &self,
-        _hint: project::InlayHint,
-        _buffer_handle: Entity<Buffer>,
-        _server_id: lsp::LanguageServerId,
-        _cx: &mut App,
-    ) -> Option<Task<anyhow::Result<project::InlayHint>>> {
-        None
-    }
-
-    fn supports_inlay_hints(&self, _buffer: &Entity<Buffer>, _cx: &mut App) -> bool {
-        false
-    }
-
-    fn document_highlights(
-        &self,
-        _buffer: &Entity<Buffer>,
-        _position: text::Anchor,
-        _cx: &mut App,
-    ) -> Option<Task<Result<Vec<project::DocumentHighlight>>>> {
-        None
-    }
-
-    fn definitions(
-        &self,
-        _buffer: &Entity<Buffer>,
-        _position: text::Anchor,
-        _kind: editor::GotoDefinitionKind,
-        _cx: &mut App,
-    ) -> Option<Task<Result<Option<Vec<project::LocationLink>>>>> {
-        None
-    }
-
-    fn range_for_rename(
-        &self,
-        _buffer: &Entity<Buffer>,
-        _position: text::Anchor,
-        _cx: &mut App,
-    ) -> Option<Task<Result<Option<Range<text::Anchor>>>>> {
-        None
-    }
-
-    fn perform_rename(
-        &self,
-        _buffer: &Entity<Buffer>,
-        _position: text::Anchor,
-        _new_name: String,
-        _cx: &mut App,
-    ) -> Option<Task<Result<project::ProjectTransaction>>> {
-        None
-    }
-}
-
-fn parse_slash_command(text: &str) -> Option<(usize, usize)> {
-    if let Some(remainder) = text.strip_prefix('/') {
-        let pos = remainder
-            .find(char::is_whitespace)
-            .unwrap_or(remainder.len());
-        let command = &remainder[..pos];
-        if !command.is_empty() && command.chars().all(char::is_alphanumeric) {
-            return Some((0, 1 + command.len()));
-        }
-    }
-    None
-}
-
 pub struct MessageEditorAddon {}
 
 impl MessageEditorAddon {
@@ -1610,7 +1448,13 @@ impl Addon for MessageEditorAddon {
 
 #[cfg(test)]
 mod tests {
-    use std::{cell::Cell, ops::Range, path::Path, rc::Rc, sync::Arc};
+    use std::{
+        cell::{Cell, RefCell},
+        ops::Range,
+        path::Path,
+        rc::Rc,
+        sync::Arc,
+    };
 
     use acp_thread::MentionUri;
     use agent_client_protocol as acp;
@@ -1657,8 +1501,8 @@ mod tests {
                     history_store.clone(),
                     None,
                     Default::default(),
+                    Default::default(),
                     "Test",
-                    false,
                     EditorMode::AutoHeight {
                         min_lines: 1,
                         max_lines: None,
@@ -1764,7 +1608,163 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_context_completion_provider(cx: &mut TestAppContext) {
+    async fn test_completion_provider_commands(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let app_state = cx.update(AppState::test);
+
+        cx.update(|cx| {
+            language::init(cx);
+            editor::init(cx);
+            workspace::init(app_state.clone(), cx);
+            Project::init_settings(cx);
+        });
+
+        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+        let workspace = window.root(cx).unwrap();
+
+        let mut cx = VisualTestContext::from_window(*window, cx);
+
+        let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
+        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
+        let available_commands = Rc::new(RefCell::new(vec![
+            acp::AvailableCommand {
+                name: "quick-math".to_string(),
+                description: "2 + 2 = 4 - 1 = 3".to_string(),
+                input: None,
+            },
+            acp::AvailableCommand {
+                name: "say-hello".to_string(),
+                description: "Say hello to whoever you want".to_string(),
+                input: Some(acp::AvailableCommandInput::Unstructured {
+                    hint: "Who do you want to say hello to?".to_string(),
+                }),
+            },
+        ]));
+
+        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
+            let workspace_handle = cx.weak_entity();
+            let message_editor = cx.new(|cx| {
+                MessageEditor::new(
+                    workspace_handle,
+                    project.clone(),
+                    history_store.clone(),
+                    None,
+                    prompt_capabilities.clone(),
+                    available_commands.clone(),
+                    "Test",
+                    EditorMode::AutoHeight {
+                        max_lines: None,
+                        min_lines: 1,
+                    },
+                    window,
+                    cx,
+                )
+            });
+            workspace.active_pane().update(cx, |pane, cx| {
+                pane.add_item(
+                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
+                    true,
+                    true,
+                    None,
+                    window,
+                    cx,
+                );
+            });
+            message_editor.read(cx).focus_handle(cx).focus(window);
+            message_editor.read(cx).editor().clone()
+        });
+
+        cx.simulate_input("/");
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert_eq!(editor.text(cx), "/");
+            assert!(editor.has_visible_completions_menu());
+
+            assert_eq!(
+                current_completion_labels_with_documentation(editor),
+                &[
+                    ("quick-math".into(), "2 + 2 = 4 - 1 = 3".into()),
+                    ("say-hello".into(), "Say hello to whoever you want".into())
+                ]
+            );
+            editor.set_text("", window, cx);
+        });
+
+        cx.simulate_input("/qui");
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert_eq!(editor.text(cx), "/qui");
+            assert!(editor.has_visible_completions_menu());
+
+            assert_eq!(
+                current_completion_labels_with_documentation(editor),
+                &[("quick-math".into(), "2 + 2 = 4 - 1 = 3".into())]
+            );
+            editor.set_text("", window, cx);
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert!(editor.has_visible_completions_menu());
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert_eq!(editor.text(cx), "/quick-math ");
+            assert!(!editor.has_visible_completions_menu());
+            editor.set_text("", window, cx);
+        });
+
+        cx.simulate_input("/say");
+
+        editor.update_in(&mut cx, |editor, _window, cx| {
+            assert_eq!(editor.text(cx), "/say");
+            assert!(editor.has_visible_completions_menu());
+
+            assert_eq!(
+                current_completion_labels_with_documentation(editor),
+                &[("say-hello".into(), "Say hello to whoever you want".into())]
+            );
+        });
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert!(editor.has_visible_completions_menu());
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        editor.update_in(&mut cx, |editor, _window, cx| {
+            assert_eq!(editor.text(cx), "/say-hello ");
+            assert!(editor.has_visible_completions_menu());
+
+            assert_eq!(
+                current_completion_labels_with_documentation(editor),
+                &[("say-hello".into(), "Say hello to whoever you want".into())]
+            );
+        });
+
+        cx.simulate_input("GPT5");
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert!(editor.has_visible_completions_menu());
+            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
+        });
+
+        cx.run_until_parked();
+
+        editor.update_in(&mut cx, |editor, _window, cx| {
+            assert_eq!(editor.text(cx), "/say-hello GPT5");
+            assert!(!editor.has_visible_completions_menu());
+        });
+    }
+
+    #[gpui::test]
+    async fn test_context_completion_provider_mentions(cx: &mut TestAppContext) {
         init_test(cx);
 
         let app_state = cx.update(AppState::test);
@@ -1857,8 +1857,8 @@ mod tests {
                     history_store.clone(),
                     None,
                     prompt_capabilities.clone(),
+                    Default::default(),
                     "Test",
-                    false,
                     EditorMode::AutoHeight {
                         max_lines: None,
                         min_lines: 1,
@@ -1888,7 +1888,6 @@ mod tests {
             assert_eq!(editor.text(cx), "Lorem @");
             assert!(editor.has_visible_completions_menu());
 
-            // Only files since we have default capabilities
             assert_eq!(
                 current_completion_labels(editor),
                 &[
@@ -2284,4 +2283,20 @@ mod tests {
             .map(|completion| completion.label.text)
             .collect::<Vec<_>>()
     }
+
+    fn current_completion_labels_with_documentation(editor: &Editor) -> Vec<(String, String)> {
+        let completions = editor.current_completions().expect("Missing completions");
+        completions
+            .into_iter()
+            .map(|completion| {
+                (
+                    completion.label.text,
+                    completion
+                        .documentation
+                        .map(|d| d.text().to_string())
+                        .unwrap_or_default(),
+                )
+            })
+            .collect::<Vec<_>>()
+    }
 }
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 5e842d713d..c039826c83 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -35,7 +35,7 @@ use project::{Project, ProjectEntryId};
 use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
-use std::cell::Cell;
+use std::cell::{Cell, RefCell};
 use std::path::Path;
 use std::sync::Arc;
 use std::time::Instant;
@@ -284,6 +284,7 @@ pub struct AcpThreadView {
     should_be_following: bool,
     editing_message: Option<usize>,
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
+    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     is_loading_contents: bool,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
@@ -325,7 +326,7 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) -> Self {
         let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
-        let prevent_slash_commands = agent.clone().downcast::<ClaudeCode>().is_some();
+        let available_commands = Rc::new(RefCell::new(vec![]));
 
         let placeholder = if agent.name() == "Zed Agent" {
             format!("Message the {} — @ to include context", agent.name())
@@ -340,8 +341,8 @@ impl AcpThreadView {
                 history_store.clone(),
                 prompt_store.clone(),
                 prompt_capabilities.clone(),
+                available_commands.clone(),
                 placeholder,
-                prevent_slash_commands,
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
                     max_lines: Some(MAX_EDITOR_LINES),
@@ -364,7 +365,7 @@ impl AcpThreadView {
                 history_store.clone(),
                 prompt_store.clone(),
                 prompt_capabilities.clone(),
-                prevent_slash_commands,
+                available_commands.clone(),
             )
         });
 
@@ -396,11 +397,12 @@ impl AcpThreadView {
             editing_message: None,
             edits_expanded: false,
             plan_expanded: false,
+            prompt_capabilities,
+            available_commands,
             editor_expanded: false,
             should_be_following: false,
             history_store,
             hovered_recent_history_item: None,
-            prompt_capabilities,
             is_loading_contents: false,
             _subscriptions: subscriptions,
             _cancel_task: None,
@@ -486,6 +488,9 @@ impl AcpThreadView {
                     Ok(thread) => {
                         let action_log = thread.read(cx).action_log().clone();
 
+                        this.available_commands
+                            .replace(thread.read(cx).available_commands());
+
                         this.prompt_capabilities
                             .set(thread.read(cx).prompt_capabilities());
 
@@ -5532,6 +5537,7 @@ pub(crate) mod tests {
                         audio: true,
                         embedded_context: true,
                     }),
+                    vec![],
                     cx,
                 )
             })))
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 3f04f38607..1315915203 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -12952,6 +12952,21 @@ pub enum CompletionDocumentation {
     },
 }
 
+impl CompletionDocumentation {
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn text(&self) -> SharedString {
+        match self {
+            CompletionDocumentation::Undocumented => "".into(),
+            CompletionDocumentation::SingleLine(s) => s.clone(),
+            CompletionDocumentation::MultiLinePlainText(s) => s.clone(),
+            CompletionDocumentation::MultiLineMarkdown(s) => s.clone(),
+            CompletionDocumentation::SingleLineAndMultiLinePlainText { single_line, .. } => {
+                single_line.clone()
+            }
+        }
+    }
+}
+
 impl From<lsp::Documentation> for CompletionDocumentation {
     fn from(docs: lsp::Documentation) -> Self {
         match docs {

From 35c0d02c7cf0afb79b2c641a14d42ba3c7921a7c Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 2 Sep 2025 12:42:29 +0200
Subject: [PATCH 516/823] project: Temporarily disable terminal activation
 scripts on windows (#37361)

They seem to break things on window right now

Release Notes:

- N/A
---
 crates/project/src/terminals.rs | 1 +
 crates/terminal/src/terminal.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 597da04617..8789366d1d 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -186,6 +186,7 @@ impl Project {
                             )?,
                         },
                         None => match activation_script.clone() {
+                            #[cfg(not(target_os = "windows"))]
                             activation_script if !activation_script.is_empty() => {
                                 let activation_script = activation_script.join("; ");
                                 let to_run = if let Some(command) = spawn_task.command {
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 0f4f2ae97b..c0c663f498 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -531,7 +531,7 @@ impl TerminalBuilder {
             },
         };
 
-        if !activation_script.is_empty() && no_task {
+        if cfg!(not(target_os = "windows")) && !activation_script.is_empty() && no_task {
             for activation_script in activation_script {
                 terminal.input(activation_script.into_bytes());
                 terminal.write_to_pty(b"\n");

From 47ad1b2143414482eeff20bab8b3b70d3c103875 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 2 Sep 2025 09:03:11 -0400
Subject: [PATCH 517/823] agent2: Fix terminal tool call content not being
 shown once truncated (#37318)

We render terminals as inline if their content is below a certain line
count, and scrollable past that point. In the scrollable case we weren't
setting a height for the terminal's container, causing it to be rendered
at height 0, which means no lines would be displayed. This PR fixes that
by setting an explicit height for the scrollable case, like we do in the
agent1 UI code.

Release Notes:

- agent: Fixed a bug that caused terminals in the panel to be empty
after their content reached a certain size.
---
 crates/agent_ui/src/acp/thread_view.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c039826c83..c3bf7219b4 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2655,7 +2655,18 @@ impl AcpThreadView {
                         .bg(cx.theme().colors().editor_background)
                         .rounded_b_md()
                         .text_ui_sm(cx)
-                        .children(terminal_view.clone()),
+                        .h_full()
+                        .children(terminal_view.map(|terminal_view| {
+                            if terminal_view
+                                .read(cx)
+                                .content_mode(window, cx)
+                                .is_scrollable()
+                            {
+                                div().h_72().child(terminal_view).into_any_element()
+                            } else {
+                                terminal_view.into_any_element()
+                            }
+                        })),
                 )
             })
             .into_any()

From 60b95d925360e7e1c8e05faca00987982c5bd9db Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Tue, 2 Sep 2025 15:59:27 +0200
Subject: [PATCH 518/823] Use premultiplied alpha for emoji rendering (#37370)

This improves emoji rendering on windows removing artifacts at the edges
by using premultiplied alpha. A bit more context can be found in #37167

Release Notes:

- N/A
---
 .../platform/windows/color_text_raster.hlsl    |  3 ++-
 .../gpui/src/platform/windows/direct_write.rs  | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform/windows/color_text_raster.hlsl b/crates/gpui/src/platform/windows/color_text_raster.hlsl
index 322c743a99..2fbc156ba5 100644
--- a/crates/gpui/src/platform/windows/color_text_raster.hlsl
+++ b/crates/gpui/src/platform/windows/color_text_raster.hlsl
@@ -39,5 +39,6 @@ cbuffer GlyphLayerTextureParams : register(b0) {
 float4 emoji_rasterization_fragment(PixelInput input): SV_Target {
     float sample = t_layer.Sample(s_layer, input.texcoord.xy).r;
     float alpha_corrected = apply_contrast_and_gamma_correction(sample, run_color.rgb, grayscale_enhanced_contrast, gamma_ratios);
-    return float4(run_color.rgb, alpha_corrected * run_color.a);
+    float alpha = alpha_corrected * run_color.a;
+    return float4(run_color.rgb * alpha, alpha);
 }
diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index e81b87c733..5e44a609db 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -112,10 +112,10 @@ impl GPUState {
                 RenderTarget: [
                     D3D11_RENDER_TARGET_BLEND_DESC {
                         BlendEnable: true.into(),
-                        SrcBlend: D3D11_BLEND_SRC_ALPHA,
+                        SrcBlend: D3D11_BLEND_ONE,
                         DestBlend: D3D11_BLEND_INV_SRC_ALPHA,
                         BlendOp: D3D11_BLEND_OP_ADD,
-                        SrcBlendAlpha: D3D11_BLEND_SRC_ALPHA,
+                        SrcBlendAlpha: D3D11_BLEND_ONE,
                         DestBlendAlpha: D3D11_BLEND_INV_SRC_ALPHA,
                         BlendOpAlpha: D3D11_BLEND_OP_ADD,
                         RenderTargetWriteMask: D3D11_COLOR_WRITE_ENABLE_ALL.0 as u8,
@@ -1132,6 +1132,20 @@ impl DirectWriteState {
             };
         }
 
+        // Convert from premultiplied to straight alpha
+        for chunk in rasterized.chunks_exact_mut(4) {
+            let b = chunk[0] as f32;
+            let g = chunk[1] as f32;
+            let r = chunk[2] as f32;
+            let a = chunk[3] as f32;
+            if a > 0.0 {
+                let inv_a = 255.0 / a;
+                chunk[0] = (b * inv_a).clamp(0.0, 255.0) as u8;
+                chunk[1] = (g * inv_a).clamp(0.0, 255.0) as u8;
+                chunk[2] = (r * inv_a).clamp(0.0, 255.0) as u8;
+            }
+        }
+
         Ok(rasterized)
     }
 

From 2f279c5de437f9119e692fdce5132f601fc604f2 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 2 Sep 2025 07:07:23 -0700
Subject: [PATCH 519/823] Fix small errors preventing WSL support from working 
 (#37350)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On nightly, when I run `zed` under WSL, I get an error parsing the
shebang line

```
/usr/bin/env: ‘sh\r’: No such file or directory
```

I believe that this is because in CI, Git checks out the file with CRLF
line endings, and that is how it is copied into the installer.

Also, the file extension was incorrect when downloading the production
remote server (a gzipped binary), preventing extraction from working
properly.

Release Notes:

- N/A
---
 .gitattributes                     | 3 +++
 crates/remote/src/transport/wsl.rs | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 9973cfb4db..0dedc2d567 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
 # Prevent GitHub from displaying comments within JSON files as errors.
 *.json linguist-language=JSON-with-Comments
+
+# Ensure the WSL script always has LF line endings, even on Windows
+crates/zed/resources/windows/zed-wsl text eol=lf
diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
index ea8f2443d9..2b4d29eafe 100644
--- a/crates/remote/src/transport/wsl.rs
+++ b/crates/remote/src/transport/wsl.rs
@@ -164,10 +164,7 @@ impl WslRemoteConnection {
         delegate.set_status(Some("Installing remote server"), cx);
 
         let wanted_version = match release_channel {
-            ReleaseChannel::Nightly => None,
-            ReleaseChannel::Dev => {
-                return Err(anyhow!("Dev builds require manual installation"));
-            }
+            ReleaseChannel::Nightly | ReleaseChannel::Dev => None,
             _ => Some(cx.update(|cx| AppVersion::global(cx))?),
         };
 
@@ -176,7 +173,7 @@ impl WslRemoteConnection {
             .await?;
 
         let tmp_path = RemotePathBuf::new(
-            PathBuf::from(format!("{}.{}.tmp", dst_path, std::process::id())),
+            PathBuf::from(format!("{}.{}.gz", dst_path, std::process::id())),
             PathStyle::Posix,
         );
 

From f06c18765f2029c7824c99e3628c13b9bafb3979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Tue, 2 Sep 2025 22:12:24 +0800
Subject: [PATCH 520/823] Rename from `create_ssh_worktree` to
 `create_remote_worktree` (#37358)

This is a left-over issue of #37035

Release Notes:

- N/A
---
 crates/project/src/worktree_store.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index b814e46bd1..1eeeefc40a 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -228,7 +228,7 @@ impl WorktreeStore {
                         Task::ready(Err(Arc::new(anyhow!("cannot create worktrees via collab"))))
                     } else {
                         let abs_path = RemotePathBuf::new(abs_path.to_path_buf(), *path_style);
-                        self.create_ssh_worktree(upstream_client.clone(), abs_path, visible, cx)
+                        self.create_remote_worktree(upstream_client.clone(), abs_path, visible, cx)
                     }
                 }
                 WorktreeStoreState::Local { fs } => {
@@ -251,7 +251,7 @@ impl WorktreeStore {
         })
     }
 
-    fn create_ssh_worktree(
+    fn create_remote_worktree(
         &mut self,
         client: AnyProtoClient,
         abs_path: RemotePathBuf,

From 2eb7ac97e031441330a3b50d6dc02c58431599ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Tue, 2 Sep 2025 22:32:24 +0800
Subject: [PATCH 521/823] windows: Use a message-only window for
 `WindowsPlatform` (#37313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, we were using `PostThreadMessage` to pass messages to
`WindowsPlatform`. This PR switches to an approach similar to `winit`
which using a hidden window as the message window (I guess that’s why
winit uses a hidden window?). The difference is that this PR creates it
as a message-only window.

Thanks to @reflectronic for the original PR #37255, this implementation
just fits better with the current code style.


Release Notes:

- N/A

---------

Co-authored-by: reflectronic <john-tur@outlook.com>
---
 .../gpui/src/platform/windows/dispatcher.rs   |  17 +-
 crates/gpui/src/platform/windows/events.rs    |  19 +-
 crates/gpui/src/platform/windows/platform.rs  | 383 ++++++++++++------
 crates/gpui/src/platform/windows/window.rs    |  10 +-
 4 files changed, 275 insertions(+), 154 deletions(-)

diff --git a/crates/gpui/src/platform/windows/dispatcher.rs b/crates/gpui/src/platform/windows/dispatcher.rs
index f554dea128..3707a69047 100644
--- a/crates/gpui/src/platform/windows/dispatcher.rs
+++ b/crates/gpui/src/platform/windows/dispatcher.rs
@@ -14,34 +14,37 @@ use windows::{
     },
     Win32::{
         Foundation::{LPARAM, WPARAM},
-        UI::WindowsAndMessaging::PostThreadMessageW,
+        UI::WindowsAndMessaging::PostMessageW,
     },
 };
 
-use crate::{PlatformDispatcher, TaskLabel, WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD};
+use crate::{
+    HWND, PlatformDispatcher, SafeHwnd, TaskLabel, WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD,
+};
 
 pub(crate) struct WindowsDispatcher {
     main_sender: Sender<Runnable>,
     parker: Mutex<Parker>,
     main_thread_id: ThreadId,
-    main_thread_id_win32: u32,
+    platform_window_handle: SafeHwnd,
     validation_number: usize,
 }
 
 impl WindowsDispatcher {
     pub(crate) fn new(
         main_sender: Sender<Runnable>,
-        main_thread_id_win32: u32,
+        platform_window_handle: HWND,
         validation_number: usize,
     ) -> Self {
         let parker = Mutex::new(Parker::new());
         let main_thread_id = current().id();
+        let platform_window_handle = platform_window_handle.into();
 
         WindowsDispatcher {
             main_sender,
             parker,
             main_thread_id,
-            main_thread_id_win32,
+            platform_window_handle,
             validation_number,
         }
     }
@@ -84,8 +87,8 @@ impl PlatformDispatcher for WindowsDispatcher {
     fn dispatch_on_main_thread(&self, runnable: Runnable) {
         match self.main_sender.send(runnable) {
             Ok(_) => unsafe {
-                PostThreadMessageW(
-                    self.main_thread_id_win32,
+                PostMessageW(
+                    Some(self.platform_window_handle.as_raw()),
                     WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD,
                     WPARAM(self.validation_number),
                     LPARAM(0),
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index f4e3e5c302..06b242465f 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -24,6 +24,7 @@ pub(crate) const WM_GPUI_CLOSE_ONE_WINDOW: u32 = WM_USER + 2;
 pub(crate) const WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD: u32 = WM_USER + 3;
 pub(crate) const WM_GPUI_DOCK_MENU_ACTION: u32 = WM_USER + 4;
 pub(crate) const WM_GPUI_FORCE_UPDATE_WINDOW: u32 = WM_USER + 5;
+pub(crate) const WM_GPUI_KEYBOARD_LAYOUT_CHANGED: u32 = WM_USER + 6;
 
 const SIZE_MOVE_LOOP_TIMER_ID: usize = 1;
 const AUTO_HIDE_TASKBAR_THICKNESS_PX: i32 = 1;
@@ -99,7 +100,7 @@ impl WindowsWindowInner {
             WM_IME_COMPOSITION => self.handle_ime_composition(handle, lparam),
             WM_SETCURSOR => self.handle_set_cursor(handle, lparam),
             WM_SETTINGCHANGE => self.handle_system_settings_changed(handle, wparam, lparam),
-            WM_INPUTLANGCHANGE => self.handle_input_language_changed(lparam),
+            WM_INPUTLANGCHANGE => self.handle_input_language_changed(),
             WM_SHOWWINDOW => self.handle_window_visibility_changed(handle, wparam),
             WM_GPUI_CURSOR_STYLE_CHANGED => self.handle_cursor_changed(lparam),
             WM_GPUI_FORCE_UPDATE_WINDOW => self.draw_window(handle, true),
@@ -264,8 +265,8 @@ impl WindowsWindowInner {
             callback();
         }
         unsafe {
-            PostThreadMessageW(
-                self.main_thread_id_win32,
+            PostMessageW(
+                Some(self.platform_window_handle),
                 WM_GPUI_CLOSE_ONE_WINDOW,
                 WPARAM(self.validation_number),
                 LPARAM(handle.0 as isize),
@@ -1146,11 +1147,15 @@ impl WindowsWindowInner {
         Some(0)
     }
 
-    fn handle_input_language_changed(&self, lparam: LPARAM) -> Option<isize> {
-        let thread = self.main_thread_id_win32;
-        let validation = self.validation_number;
+    fn handle_input_language_changed(&self) -> Option<isize> {
         unsafe {
-            PostThreadMessageW(thread, WM_INPUTLANGCHANGE, WPARAM(validation), lparam).log_err();
+            PostMessageW(
+                Some(self.platform_window_handle),
+                WM_GPUI_KEYBOARD_LAYOUT_CHANGED,
+                WPARAM(self.validation_number),
+                LPARAM(0),
+            )
+            .log_err();
         }
         Some(0)
     }
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index b06f369aab..e12a74b966 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -2,7 +2,7 @@ use std::{
     cell::RefCell,
     ffi::OsStr,
     path::{Path, PathBuf},
-    rc::Rc,
+    rc::{Rc, Weak},
     sync::Arc,
 };
 
@@ -19,7 +19,7 @@ use windows::{
         Foundation::*,
         Graphics::Gdi::*,
         Security::Credentials::*,
-        System::{Com::*, LibraryLoader::*, Ole::*, SystemInformation::*, Threading::*},
+        System::{Com::*, LibraryLoader::*, Ole::*, SystemInformation::*},
         UI::{Input::KeyboardAndMouse::*, Shell::*, WindowsAndMessaging::*},
     },
     core::*,
@@ -28,21 +28,27 @@ use windows::{
 use crate::*;
 
 pub(crate) struct WindowsPlatform {
-    state: RefCell<WindowsPlatformState>,
+    inner: Rc<WindowsPlatformInner>,
     raw_window_handles: Arc<RwLock<SmallVec<[SafeHwnd; 4]>>>,
     // The below members will never change throughout the entire lifecycle of the app.
     icon: HICON,
-    main_receiver: flume::Receiver<Runnable>,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
     text_system: Arc<DirectWriteTextSystem>,
     windows_version: WindowsVersion,
     drop_target_helper: IDropTargetHelper,
-    validation_number: usize,
-    main_thread_id_win32: u32,
+    handle: HWND,
     disable_direct_composition: bool,
 }
 
+struct WindowsPlatformInner {
+    state: RefCell<WindowsPlatformState>,
+    raw_window_handles: std::sync::Weak<RwLock<SmallVec<[SafeHwnd; 4]>>>,
+    // The below members will never change throughout the entire lifecycle of the app.
+    validation_number: usize,
+    main_receiver: flume::Receiver<Runnable>,
+}
+
 pub(crate) struct WindowsPlatformState {
     callbacks: PlatformCallbacks,
     menus: Vec<OwnedMenu>,
@@ -83,11 +89,36 @@ impl WindowsPlatform {
             OleInitialize(None).context("unable to initialize Windows OLE")?;
         }
         let (main_sender, main_receiver) = flume::unbounded::<Runnable>();
-        let main_thread_id_win32 = unsafe { GetCurrentThreadId() };
         let validation_number = rand::random::<usize>();
+        let raw_window_handles = Arc::new(RwLock::new(SmallVec::new()));
+        register_platform_window_class();
+        let mut context = PlatformWindowCreateContext {
+            inner: None,
+            raw_window_handles: Arc::downgrade(&raw_window_handles),
+            validation_number,
+            main_receiver: Some(main_receiver),
+        };
+        let result = unsafe {
+            CreateWindowExW(
+                WINDOW_EX_STYLE(0),
+                PLATFORM_WINDOW_CLASS_NAME,
+                None,
+                WINDOW_STYLE(0),
+                0,
+                0,
+                0,
+                0,
+                Some(HWND_MESSAGE),
+                None,
+                None,
+                Some(&context as *const _ as *const _),
+            )
+        };
+        let inner = context.inner.take().unwrap()?;
+        let handle = result?;
         let dispatcher = Arc::new(WindowsDispatcher::new(
             main_sender,
-            main_thread_id_win32,
+            handle,
             validation_number,
         ));
         let disable_direct_composition = std::env::var(DISABLE_DIRECT_COMPOSITION)
@@ -105,23 +136,19 @@ impl WindowsPlatform {
                 .context("Error creating drop target helper.")?
         };
         let icon = load_icon().unwrap_or_default();
-        let state = RefCell::new(WindowsPlatformState::new());
-        let raw_window_handles = Arc::new(RwLock::new(SmallVec::new()));
         let windows_version = WindowsVersion::new().context("Error retrieve windows version")?;
 
         Ok(Self {
-            state,
+            inner,
+            handle,
             raw_window_handles,
             icon,
-            main_receiver,
             background_executor,
             foreground_executor,
             text_system,
             disable_direct_composition,
             windows_version,
             drop_target_helper,
-            validation_number,
-            main_thread_id_win32,
         })
     }
 
@@ -143,119 +170,20 @@ impl WindowsPlatform {
             });
     }
 
-    fn close_one_window(&self, target_window: HWND) -> bool {
-        let mut lock = self.raw_window_handles.write();
-        let index = lock
-            .iter()
-            .position(|handle| handle.as_raw() == target_window)
-            .unwrap();
-        lock.remove(index);
-
-        lock.is_empty()
-    }
-
-    #[inline]
-    fn run_foreground_task(&self) {
-        for runnable in self.main_receiver.drain() {
-            runnable.run();
-        }
-    }
-
     fn generate_creation_info(&self) -> WindowCreationInfo {
         WindowCreationInfo {
             icon: self.icon,
             executor: self.foreground_executor.clone(),
-            current_cursor: self.state.borrow().current_cursor,
+            current_cursor: self.inner.state.borrow().current_cursor,
             windows_version: self.windows_version,
             drop_target_helper: self.drop_target_helper.clone(),
-            validation_number: self.validation_number,
-            main_receiver: self.main_receiver.clone(),
-            main_thread_id_win32: self.main_thread_id_win32,
+            validation_number: self.inner.validation_number,
+            main_receiver: self.inner.main_receiver.clone(),
+            platform_window_handle: self.handle,
             disable_direct_composition: self.disable_direct_composition,
         }
     }
 
-    fn handle_dock_action_event(&self, action_idx: usize) {
-        let mut lock = self.state.borrow_mut();
-        if let Some(mut callback) = lock.callbacks.app_menu_action.take() {
-            let Some(action) = lock
-                .jump_list
-                .dock_menus
-                .get(action_idx)
-                .map(|dock_menu| dock_menu.action.boxed_clone())
-            else {
-                lock.callbacks.app_menu_action = Some(callback);
-                log::error!("Dock menu for index {action_idx} not found");
-                return;
-            };
-            drop(lock);
-            callback(&*action);
-            self.state.borrow_mut().callbacks.app_menu_action = Some(callback);
-        }
-    }
-
-    fn handle_input_lang_change(&self) {
-        let mut lock = self.state.borrow_mut();
-        if let Some(mut callback) = lock.callbacks.keyboard_layout_change.take() {
-            drop(lock);
-            callback();
-            self.state
-                .borrow_mut()
-                .callbacks
-                .keyboard_layout_change
-                .get_or_insert(callback);
-        }
-    }
-
-    // Returns if the app should quit.
-    fn handle_events(&self) {
-        let mut msg = MSG::default();
-        unsafe {
-            while GetMessageW(&mut msg, None, 0, 0).as_bool() {
-                match msg.message {
-                    WM_QUIT => return,
-                    WM_INPUTLANGCHANGE
-                    | WM_GPUI_CLOSE_ONE_WINDOW
-                    | WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD
-                    | WM_GPUI_DOCK_MENU_ACTION => {
-                        if self.handle_gpui_events(msg.message, msg.wParam, msg.lParam, &msg) {
-                            return;
-                        }
-                    }
-                    _ => {
-                        DispatchMessageW(&msg);
-                    }
-                }
-            }
-        }
-    }
-
-    // Returns true if the app should quit.
-    fn handle_gpui_events(
-        &self,
-        message: u32,
-        wparam: WPARAM,
-        lparam: LPARAM,
-        msg: *const MSG,
-    ) -> bool {
-        if wparam.0 != self.validation_number {
-            unsafe { DispatchMessageW(msg) };
-            return false;
-        }
-        match message {
-            WM_GPUI_CLOSE_ONE_WINDOW => {
-                if self.close_one_window(HWND(lparam.0 as _)) {
-                    return true;
-                }
-            }
-            WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD => self.run_foreground_task(),
-            WM_GPUI_DOCK_MENU_ACTION => self.handle_dock_action_event(lparam.0 as _),
-            WM_INPUTLANGCHANGE => self.handle_input_lang_change(),
-            _ => unreachable!(),
-        }
-        false
-    }
-
     fn set_dock_menus(&self, menus: Vec<MenuItem>) {
         let mut actions = Vec::new();
         menus.into_iter().for_each(|menu| {
@@ -263,7 +191,7 @@ impl WindowsPlatform {
                 actions.push(dock_menu);
             }
         });
-        let mut lock = self.state.borrow_mut();
+        let mut lock = self.inner.state.borrow_mut();
         lock.jump_list.dock_menus = actions;
         update_jump_list(&lock.jump_list).log_err();
     }
@@ -279,7 +207,7 @@ impl WindowsPlatform {
                 actions.push(dock_menu);
             }
         });
-        let mut lock = self.state.borrow_mut();
+        let mut lock = self.inner.state.borrow_mut();
         lock.jump_list.dock_menus = actions;
         lock.jump_list.recent_workspaces = entries;
         update_jump_list(&lock.jump_list)
@@ -346,15 +274,25 @@ impl Platform for WindowsPlatform {
     }
 
     fn on_keyboard_layout_change(&self, callback: Box<dyn FnMut()>) {
-        self.state.borrow_mut().callbacks.keyboard_layout_change = Some(callback);
+        self.inner
+            .state
+            .borrow_mut()
+            .callbacks
+            .keyboard_layout_change = Some(callback);
     }
 
     fn run(&self, on_finish_launching: Box<dyn 'static + FnOnce()>) {
         on_finish_launching();
         self.begin_vsync_thread();
-        self.handle_events();
 
-        if let Some(ref mut callback) = self.state.borrow_mut().callbacks.quit {
+        let mut msg = MSG::default();
+        unsafe {
+            while GetMessageW(&mut msg, None, 0, 0).as_bool() {
+                DispatchMessageW(&msg);
+            }
+        }
+
+        if let Some(ref mut callback) = self.inner.state.borrow_mut().callbacks.quit {
             callback();
         }
     }
@@ -469,7 +407,7 @@ impl Platform for WindowsPlatform {
     }
 
     fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>) {
-        self.state.borrow_mut().callbacks.open_urls = Some(callback);
+        self.inner.state.borrow_mut().callbacks.open_urls = Some(callback);
     }
 
     fn prompt_for_paths(
@@ -539,19 +477,19 @@ impl Platform for WindowsPlatform {
     }
 
     fn on_quit(&self, callback: Box<dyn FnMut()>) {
-        self.state.borrow_mut().callbacks.quit = Some(callback);
+        self.inner.state.borrow_mut().callbacks.quit = Some(callback);
     }
 
     fn on_reopen(&self, callback: Box<dyn FnMut()>) {
-        self.state.borrow_mut().callbacks.reopen = Some(callback);
+        self.inner.state.borrow_mut().callbacks.reopen = Some(callback);
     }
 
     fn set_menus(&self, menus: Vec<Menu>, _keymap: &Keymap) {
-        self.state.borrow_mut().menus = menus.into_iter().map(|menu| menu.owned()).collect();
+        self.inner.state.borrow_mut().menus = menus.into_iter().map(|menu| menu.owned()).collect();
     }
 
     fn get_menus(&self) -> Option<Vec<OwnedMenu>> {
-        Some(self.state.borrow().menus.clone())
+        Some(self.inner.state.borrow().menus.clone())
     }
 
     fn set_dock_menu(&self, menus: Vec<MenuItem>, _keymap: &Keymap) {
@@ -559,15 +497,19 @@ impl Platform for WindowsPlatform {
     }
 
     fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
-        self.state.borrow_mut().callbacks.app_menu_action = Some(callback);
+        self.inner.state.borrow_mut().callbacks.app_menu_action = Some(callback);
     }
 
     fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>) {
-        self.state.borrow_mut().callbacks.will_open_app_menu = Some(callback);
+        self.inner.state.borrow_mut().callbacks.will_open_app_menu = Some(callback);
     }
 
     fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>) {
-        self.state.borrow_mut().callbacks.validate_app_menu_command = Some(callback);
+        self.inner
+            .state
+            .borrow_mut()
+            .callbacks
+            .validate_app_menu_command = Some(callback);
     }
 
     fn app_path(&self) -> Result<PathBuf> {
@@ -581,7 +523,7 @@ impl Platform for WindowsPlatform {
 
     fn set_cursor_style(&self, style: CursorStyle) {
         let hcursor = load_cursor(style);
-        let mut lock = self.state.borrow_mut();
+        let mut lock = self.inner.state.borrow_mut();
         if lock.current_cursor.map(|c| c.0) != hcursor.map(|c| c.0) {
             self.post_message(
                 WM_GPUI_CURSOR_STYLE_CHANGED,
@@ -684,10 +626,10 @@ impl Platform for WindowsPlatform {
 
     fn perform_dock_menu_action(&self, action: usize) {
         unsafe {
-            PostThreadMessageW(
-                self.main_thread_id_win32,
+            PostMessageW(
+                Some(self.handle),
                 WM_GPUI_DOCK_MENU_ACTION,
-                WPARAM(self.validation_number),
+                WPARAM(self.inner.validation_number),
                 LPARAM(action as isize),
             )
             .log_err();
@@ -703,9 +645,118 @@ impl Platform for WindowsPlatform {
     }
 }
 
+impl WindowsPlatformInner {
+    fn new(context: &mut PlatformWindowCreateContext) -> Result<Rc<Self>> {
+        let state = RefCell::new(WindowsPlatformState::new());
+        Ok(Rc::new(Self {
+            state,
+            raw_window_handles: context.raw_window_handles.clone(),
+            validation_number: context.validation_number,
+            main_receiver: context.main_receiver.take().unwrap(),
+        }))
+    }
+
+    fn handle_msg(
+        self: &Rc<Self>,
+        handle: HWND,
+        msg: u32,
+        wparam: WPARAM,
+        lparam: LPARAM,
+    ) -> LRESULT {
+        let handled = match msg {
+            WM_GPUI_CLOSE_ONE_WINDOW
+            | WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD
+            | WM_GPUI_DOCK_MENU_ACTION
+            | WM_GPUI_KEYBOARD_LAYOUT_CHANGED => self.handle_gpui_events(msg, wparam, lparam),
+            _ => None,
+        };
+        if let Some(result) = handled {
+            LRESULT(result)
+        } else {
+            unsafe { DefWindowProcW(handle, msg, wparam, lparam) }
+        }
+    }
+
+    fn handle_gpui_events(&self, message: u32, wparam: WPARAM, lparam: LPARAM) -> Option<isize> {
+        if wparam.0 != self.validation_number {
+            log::error!("Wrong validation number while processing message: {message}");
+            return None;
+        }
+        match message {
+            WM_GPUI_CLOSE_ONE_WINDOW => {
+                if self.close_one_window(HWND(lparam.0 as _)) {
+                    unsafe { PostQuitMessage(0) };
+                }
+                Some(0)
+            }
+            WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD => self.run_foreground_task(),
+            WM_GPUI_DOCK_MENU_ACTION => self.handle_dock_action_event(lparam.0 as _),
+            WM_GPUI_KEYBOARD_LAYOUT_CHANGED => self.handle_keyboard_layout_change(),
+            _ => unreachable!(),
+        }
+    }
+
+    fn close_one_window(&self, target_window: HWND) -> bool {
+        let Some(all_windows) = self.raw_window_handles.upgrade() else {
+            log::error!("Failed to upgrade raw window handles");
+            return false;
+        };
+        let mut lock = all_windows.write();
+        let index = lock
+            .iter()
+            .position(|handle| handle.as_raw() == target_window)
+            .unwrap();
+        lock.remove(index);
+
+        lock.is_empty()
+    }
+
+    #[inline]
+    fn run_foreground_task(&self) -> Option<isize> {
+        for runnable in self.main_receiver.drain() {
+            runnable.run();
+        }
+        Some(0)
+    }
+
+    fn handle_dock_action_event(&self, action_idx: usize) -> Option<isize> {
+        let mut lock = self.state.borrow_mut();
+        let mut callback = lock.callbacks.app_menu_action.take()?;
+        let Some(action) = lock
+            .jump_list
+            .dock_menus
+            .get(action_idx)
+            .map(|dock_menu| dock_menu.action.boxed_clone())
+        else {
+            lock.callbacks.app_menu_action = Some(callback);
+            log::error!("Dock menu for index {action_idx} not found");
+            return Some(1);
+        };
+        drop(lock);
+        callback(&*action);
+        self.state.borrow_mut().callbacks.app_menu_action = Some(callback);
+        Some(0)
+    }
+
+    fn handle_keyboard_layout_change(&self) -> Option<isize> {
+        let mut callback = self
+            .state
+            .borrow_mut()
+            .callbacks
+            .keyboard_layout_change
+            .take()?;
+        callback();
+        self.state.borrow_mut().callbacks.keyboard_layout_change = Some(callback);
+        Some(0)
+    }
+}
+
 impl Drop for WindowsPlatform {
     fn drop(&mut self) {
         unsafe {
+            DestroyWindow(self.handle)
+                .context("Destroying platform window")
+                .log_err();
             OleUninitialize();
         }
     }
@@ -719,10 +770,17 @@ pub(crate) struct WindowCreationInfo {
     pub(crate) drop_target_helper: IDropTargetHelper,
     pub(crate) validation_number: usize,
     pub(crate) main_receiver: flume::Receiver<Runnable>,
-    pub(crate) main_thread_id_win32: u32,
+    pub(crate) platform_window_handle: HWND,
     pub(crate) disable_direct_composition: bool,
 }
 
+struct PlatformWindowCreateContext {
+    inner: Option<Result<Rc<WindowsPlatformInner>>>,
+    raw_window_handles: std::sync::Weak<RwLock<SmallVec<[SafeHwnd; 4]>>>,
+    validation_number: usize,
+    main_receiver: Option<flume::Receiver<Runnable>>,
+}
+
 fn open_target(target: impl AsRef<OsStr>) -> Result<()> {
     let target = target.as_ref();
     let ret = unsafe {
@@ -893,6 +951,61 @@ fn should_auto_hide_scrollbars() -> Result<bool> {
     Ok(ui_settings.AutoHideScrollBars()?)
 }
 
+const PLATFORM_WINDOW_CLASS_NAME: PCWSTR = w!("Zed::PlatformWindow");
+
+fn register_platform_window_class() {
+    let wc = WNDCLASSW {
+        lpfnWndProc: Some(window_procedure),
+        lpszClassName: PCWSTR(PLATFORM_WINDOW_CLASS_NAME.as_ptr()),
+        ..Default::default()
+    };
+    unsafe { RegisterClassW(&wc) };
+}
+
+unsafe extern "system" fn window_procedure(
+    hwnd: HWND,
+    msg: u32,
+    wparam: WPARAM,
+    lparam: LPARAM,
+) -> LRESULT {
+    if msg == WM_NCCREATE {
+        let params = lparam.0 as *const CREATESTRUCTW;
+        let params = unsafe { &*params };
+        let creation_context = params.lpCreateParams as *mut PlatformWindowCreateContext;
+        let creation_context = unsafe { &mut *creation_context };
+        return match WindowsPlatformInner::new(creation_context) {
+            Ok(inner) => {
+                let weak = Box::new(Rc::downgrade(&inner));
+                unsafe { set_window_long(hwnd, GWLP_USERDATA, Box::into_raw(weak) as isize) };
+                creation_context.inner = Some(Ok(inner));
+                unsafe { DefWindowProcW(hwnd, msg, wparam, lparam) }
+            }
+            Err(error) => {
+                creation_context.inner = Some(Err(error));
+                LRESULT(0)
+            }
+        };
+    }
+
+    let ptr = unsafe { get_window_long(hwnd, GWLP_USERDATA) } as *mut Weak<WindowsPlatformInner>;
+    if ptr.is_null() {
+        return unsafe { DefWindowProcW(hwnd, msg, wparam, lparam) };
+    }
+    let inner = unsafe { &*ptr };
+    let result = if let Some(inner) = inner.upgrade() {
+        inner.handle_msg(hwnd, msg, wparam, lparam)
+    } else {
+        unsafe { DefWindowProcW(hwnd, msg, wparam, lparam) }
+    };
+
+    if msg == WM_NCDESTROY {
+        unsafe { set_window_long(hwnd, GWLP_USERDATA, 0) };
+        unsafe { drop(Box::from_raw(ptr)) };
+    }
+
+    result
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{ClipboardItem, read_from_clipboard, write_to_clipboard};
diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs
index e3711d1a26..7fd4aff3c6 100644
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -73,7 +73,7 @@ pub(crate) struct WindowsWindowInner {
     pub(crate) windows_version: WindowsVersion,
     pub(crate) validation_number: usize,
     pub(crate) main_receiver: flume::Receiver<Runnable>,
-    pub(crate) main_thread_id_win32: u32,
+    pub(crate) platform_window_handle: HWND,
 }
 
 impl WindowsWindowState {
@@ -228,7 +228,7 @@ impl WindowsWindowInner {
             windows_version: context.windows_version,
             validation_number: context.validation_number,
             main_receiver: context.main_receiver.clone(),
-            main_thread_id_win32: context.main_thread_id_win32,
+            platform_window_handle: context.platform_window_handle,
         }))
     }
 
@@ -342,7 +342,7 @@ struct WindowCreateContext {
     drop_target_helper: IDropTargetHelper,
     validation_number: usize,
     main_receiver: flume::Receiver<Runnable>,
-    main_thread_id_win32: u32,
+    platform_window_handle: HWND,
     appearance: WindowAppearance,
     disable_direct_composition: bool,
 }
@@ -361,7 +361,7 @@ impl WindowsWindow {
             drop_target_helper,
             validation_number,
             main_receiver,
-            main_thread_id_win32,
+            platform_window_handle,
             disable_direct_composition,
         } = creation_info;
         register_window_class(icon);
@@ -419,7 +419,7 @@ impl WindowsWindow {
             drop_target_helper,
             validation_number,
             main_receiver,
-            main_thread_id_win32,
+            platform_window_handle,
             appearance,
             disable_direct_composition,
         };

From a96015b3c5593368730cb5a97956d1e8960b4578 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Tue, 2 Sep 2025 16:51:13 +0200
Subject: [PATCH 522/823] activity_indicator: Show extension installation and
 updates (#37374)

This PR fixes an issue where extension operations would never show in
the activity indicator despite this being implemented for ages. This
happened because we were always returning `None` whenever the app has a
global auto updater, which is always the case, so the code path for
showing extension updates in the indicator could never be hit despite
existing prior. Also slightly improves the messages shown for ongoing
extension operations, as these were previously context unaware.

While I was at this, I also quickly took a stab at cleaning up some
remotely related stuff, namely:
- The `AnimationExt` trait is now by default only implemented for
anything that also implements `IntoElement`. This prevents
`with_animation` from showing up for e.g. `u32` within the suggestions
(finally).
- Commonly used animations are now implemented in the
`CommonAnimationExt` trait within the `ui` crate so the needed code does
not always need to be copied and element IDs for the animations are
truly unique.

Relevant change here regarding the original issue is the change from the
`return match` to just a `match` within the activitiy indicator, which
solved the issue at hand.

If we find this to be too noisy at some point, we can easily revisit,
but I think this holds important enough information to be shown in the
activity indicator, especially whilst developing extensions.

Release Notes:

- Extension installation and updates will now be shown in the activity
indicator.
---
 .../src/activity_indicator.rs                 | 100 ++++++++++--------
 crates/agent_ui/src/acp/thread_view.rs        |  43 ++------
 crates/agent_ui/src/active_thread.rs          |  45 ++------
 crates/agent_ui/src/agent_configuration.rs    |  19 ++--
 .../configure_context_server_modal.rs         |  16 ++-
 crates/agent_ui/src/agent_diff.rs             |  14 +--
 crates/agent_ui/src/text_thread_editor.rs     |  24 ++---
 crates/ai_onboarding/src/ai_upsell_card.rs    |  15 +--
 crates/assistant_tools/src/edit_file_tool.rs  |  10 +-
 crates/assistant_tools/src/terminal_tool.rs   |  12 +--
 crates/debugger_ui/src/dropdown_menus.rs      |  12 +--
 crates/git_ui/src/git_panel.rs                |  22 ++--
 crates/gpui/src/elements/animation.rs         |   2 +-
 .../src/provider/copilot_chat.rs              |  14 +--
 .../recent_projects/src/remote_connections.rs |  20 ++--
 crates/repl/src/outputs.rs                    |  17 +--
 crates/ui/src/components/icon.rs              |   5 +-
 crates/ui/src/components/image.rs             |   5 +-
 crates/ui/src/traits.rs                       |   2 +
 crates/ui/src/traits/animation_ext.rs         |  42 ++++++++
 crates/ui/src/traits/transformable.rs         |   7 ++
 crates/ui/src/ui.rs                           |   1 +
 .../zed/src/zed/quick_action_bar/repl_menu.rs |  14 +--
 23 files changed, 203 insertions(+), 258 deletions(-)
 create mode 100644 crates/ui/src/traits/animation_ext.rs
 create mode 100644 crates/ui/src/traits/transformable.rs

diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 6641db0805..b65d1472a7 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -1,11 +1,10 @@
 use auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage, VersionCheckType};
 use editor::Editor;
-use extension_host::ExtensionStore;
+use extension_host::{ExtensionOperation, ExtensionStore};
 use futures::StreamExt;
 use gpui::{
-    Animation, AnimationExt as _, App, Context, CursorStyle, Entity, EventEmitter,
-    InteractiveElement as _, ParentElement as _, Render, SharedString, StatefulInteractiveElement,
-    Styled, Transformation, Window, actions, percentage,
+    App, Context, CursorStyle, Entity, EventEmitter, InteractiveElement as _, ParentElement as _,
+    Render, SharedString, StatefulInteractiveElement, Styled, Window, actions,
 };
 use language::{
     BinaryStatus, LanguageRegistry, LanguageServerId, LanguageServerName,
@@ -25,7 +24,10 @@ use std::{
     sync::Arc,
     time::{Duration, Instant},
 };
-use ui::{ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{
+    ButtonLike, CommonAnimationExt, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip,
+    prelude::*,
+};
 use util::truncate_and_trailoff;
 use workspace::{StatusItemView, Workspace, item::ItemHandle};
 
@@ -405,13 +407,7 @@ impl ActivityIndicator {
                     icon: Some(
                         Icon::new(IconName::ArrowCircle)
                             .size(IconSize::Small)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            )
+                            .with_rotate_animation(2)
                             .into_any_element(),
                     ),
                     message,
@@ -433,11 +429,7 @@ impl ActivityIndicator {
                 icon: Some(
                     Icon::new(IconName::ArrowCircle)
                         .size(IconSize::Small)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        )
+                        .with_rotate_animation(2)
                         .into_any_element(),
                 ),
                 message: format!("Debug: {}", session.read(cx).adapter()),
@@ -460,11 +452,7 @@ impl ActivityIndicator {
                 icon: Some(
                     Icon::new(IconName::ArrowCircle)
                         .size(IconSize::Small)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        )
+                        .with_rotate_animation(2)
                         .into_any_element(),
                 ),
                 message: job_info.message.into(),
@@ -671,8 +659,9 @@ impl ActivityIndicator {
         }
 
         // Show any application auto-update info.
-        if let Some(updater) = &self.auto_updater {
-            return match &updater.read(cx).status() {
+        self.auto_updater
+            .as_ref()
+            .and_then(|updater| match &updater.read(cx).status() {
                 AutoUpdateStatus::Checking => Some(Content {
                     icon: Some(
                         Icon::new(IconName::Download)
@@ -728,28 +717,49 @@ impl ActivityIndicator {
                     tooltip_message: None,
                 }),
                 AutoUpdateStatus::Idle => None,
-            };
-        }
+            })
+            .or_else(|| {
+                if let Some(extension_store) =
+                    ExtensionStore::try_global(cx).map(|extension_store| extension_store.read(cx))
+                    && let Some((extension_id, operation)) =
+                        extension_store.outstanding_operations().iter().next()
+                {
+                    let (message, icon, rotate) = match operation {
+                        ExtensionOperation::Install => (
+                            format!("Installing {extension_id} extension…"),
+                            IconName::LoadCircle,
+                            true,
+                        ),
+                        ExtensionOperation::Upgrade => (
+                            format!("Updating {extension_id} extension…"),
+                            IconName::Download,
+                            false,
+                        ),
+                        ExtensionOperation::Remove => (
+                            format!("Removing {extension_id} extension…"),
+                            IconName::LoadCircle,
+                            true,
+                        ),
+                    };
 
-        if let Some(extension_store) =
-            ExtensionStore::try_global(cx).map(|extension_store| extension_store.read(cx))
-            && let Some(extension_id) = extension_store.outstanding_operations().keys().next()
-        {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Download)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: format!("Updating {extension_id} extension…"),
-                on_click: Some(Arc::new(|this, window, cx| {
-                    this.dismiss_error_message(&DismissErrorMessage, window, cx)
-                })),
-                tooltip_message: None,
-            });
-        }
-
-        None
+                    Some(Content {
+                        icon: Some(Icon::new(icon).size(IconSize::Small).map(|this| {
+                            if rotate {
+                                this.with_rotate_animation(3).into_any_element()
+                            } else {
+                                this.into_any_element()
+                            }
+                        })),
+                        message,
+                        on_click: Some(Arc::new(|this, window, cx| {
+                            this.dismiss_error_message(&Default::default(), window, cx)
+                        })),
+                        tooltip_message: None,
+                    })
+                } else {
+                    None
+                }
+            })
     }
 
     fn version_tooltip_message(version: &VersionCheckType) -> String {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c3bf7219b4..a9421723d1 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -23,9 +23,9 @@ use gpui::{
     Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
     CursorStyle, EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length,
     ListOffset, ListState, MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement,
-    Subscription, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity,
-    Window, WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, percentage,
-    point, prelude::*, pulsating_between,
+    Subscription, Task, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, Window,
+    WindowHandle, div, ease_in_out, linear_color_stop, linear_gradient, list, point, prelude::*,
+    pulsating_between,
 };
 use language::Buffer;
 
@@ -45,8 +45,8 @@ use terminal_view::terminal_panel::TerminalPanel;
 use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
-    Callout, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding, PopoverMenuHandle,
-    Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
+    Callout, CommonAnimationExt, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding,
+    PopoverMenuHandle, Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -2515,13 +2515,7 @@ impl AcpThreadView {
                         Icon::new(IconName::ArrowCircle)
                             .size(IconSize::XSmall)
                             .color(Color::Info)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            ),
+                            .with_rotate_animation(2)
                     )
             })
             .child(
@@ -2948,16 +2942,7 @@ impl AcpThreadView {
                                 Icon::new(IconName::ArrowCircle)
                                     .size(IconSize::Small)
                                     .color(Color::Muted)
-                                    .with_animation(
-                                        "arrow-circle",
-                                        Animation::new(Duration::from_secs(2)).repeat(),
-                                        |icon, delta| {
-                                            icon.transform(Transformation::rotate(percentage(
-                                                delta,
-                                            )))
-                                        },
-                                    )
-                                    .into_any_element(),
+                                    .with_rotate_animation(2)
                             )
                             .child(Label::new("Authenticating…").size(LabelSize::Small)),
                     )
@@ -3270,13 +3255,7 @@ impl AcpThreadView {
                             acp::PlanEntryStatus::InProgress => Icon::new(IconName::TodoProgress)
                                 .size(IconSize::Small)
                                 .color(Color::Accent)
-                                .with_animation(
-                                    "running",
-                                    Animation::new(Duration::from_secs(2)).repeat(),
-                                    |icon, delta| {
-                                        icon.transform(Transformation::rotate(percentage(delta)))
-                                    },
-                                )
+                                .with_rotate_animation(2)
                                 .into_any_element(),
                             acp::PlanEntryStatus::Completed => Icon::new(IconName::TodoComplete)
                                 .size(IconSize::Small)
@@ -5000,11 +4979,7 @@ fn loading_contents_spinner(size: IconSize) -> AnyElement {
     Icon::new(IconName::LoadCircle)
         .size(size)
         .color(Color::Accent)
-        .with_animation(
-            "load_context_circle",
-            Animation::new(Duration::from_secs(3)).repeat(),
-            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-        )
+        .with_rotate_animation(3)
         .into_any_element()
 }
 
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index e0cecad6e2..371a59e7eb 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -23,9 +23,8 @@ use gpui::{
     AbsoluteLength, Animation, AnimationExt, AnyElement, App, ClickEvent, ClipboardEntry,
     ClipboardItem, DefiniteLength, EdgesRefinement, Empty, Entity, EventEmitter, Focusable, Hsla,
     ListAlignment, ListOffset, ListState, MouseButton, PlatformDisplay, ScrollHandle, Stateful,
-    StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement, Transformation,
-    UnderlineStyle, WeakEntity, WindowHandle, linear_color_stop, linear_gradient, list, percentage,
-    pulsating_between,
+    StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement, UnderlineStyle,
+    WeakEntity, WindowHandle, linear_color_stop, linear_gradient, list, pulsating_between,
 };
 use language::{Buffer, Language, LanguageRegistry};
 use language_model::{
@@ -46,8 +45,8 @@ use std::time::Duration;
 use text::ToPoint;
 use theme::ThemeSettings;
 use ui::{
-    Banner, Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState, TextSize,
-    Tooltip, prelude::*,
+    Banner, CommonAnimationExt, Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar,
+    ScrollbarState, TextSize, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use util::markdown::MarkdownCodeBlock;
@@ -2647,15 +2646,7 @@ impl ActiveThread {
                                         Icon::new(IconName::ArrowCircle)
                                             .color(Color::Accent)
                                             .size(IconSize::Small)
-                                            .with_animation(
-                                                "arrow-circle",
-                                                Animation::new(Duration::from_secs(2)).repeat(),
-                                                |icon, delta| {
-                                                    icon.transform(Transformation::rotate(
-                                                        percentage(delta),
-                                                    ))
-                                                },
-                                            )
+                                            .with_rotate_animation(2)
                                     }),
                             ),
                     )
@@ -2831,17 +2822,11 @@ impl ActiveThread {
             }
             ToolUseStatus::Pending
             | ToolUseStatus::InputStillStreaming
-            | ToolUseStatus::Running => {
-                let icon = Icon::new(IconName::ArrowCircle)
-                    .color(Color::Accent)
-                    .size(IconSize::Small);
-                icon.with_animation(
-                    "arrow-circle",
-                    Animation::new(Duration::from_secs(2)).repeat(),
-                    |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                )
-                .into_any_element()
-            }
+            | ToolUseStatus::Running => Icon::new(IconName::ArrowCircle)
+                .color(Color::Accent)
+                .size(IconSize::Small)
+                .with_rotate_animation(2)
+                .into_any_element(),
             ToolUseStatus::Finished(_) => div().w_0().into_any_element(),
             ToolUseStatus::Error(_) => {
                 let icon = Icon::new(IconName::Close)
@@ -2930,15 +2915,7 @@ impl ActiveThread {
                                     Icon::new(IconName::ArrowCircle)
                                         .size(IconSize::Small)
                                         .color(Color::Accent)
-                                        .with_animation(
-                                            "arrow-circle",
-                                            Animation::new(Duration::from_secs(2)).repeat(),
-                                            |icon, delta| {
-                                                icon.transform(Transformation::rotate(percentage(
-                                                    delta,
-                                                )))
-                                            },
-                                        ),
+                                        .with_rotate_animation(2),
                                 )
                                 .child(
                                     Label::new("Running…")
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 5f0b6f33c3..5981a3c52b 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -3,7 +3,7 @@ mod configure_context_server_modal;
 mod manage_profiles_modal;
 mod tool_picker;
 
-use std::{ops::Range, sync::Arc, time::Duration};
+use std::{ops::Range, sync::Arc};
 
 use agent_servers::{AgentServerCommand, AllAgentServersSettings, CustomAgentServerSettings};
 use agent_settings::AgentSettings;
@@ -17,9 +17,8 @@ use extension::ExtensionManifest;
 use extension_host::ExtensionStore;
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyView, App, AsyncWindowContext, Corner, Entity,
-    EventEmitter, FocusHandle, Focusable, Hsla, ScrollHandle, Subscription, Task, Transformation,
-    WeakEntity, percentage,
+    Action, AnyView, App, AsyncWindowContext, Corner, Entity, EventEmitter, FocusHandle, Focusable,
+    Hsla, ScrollHandle, Subscription, Task, WeakEntity,
 };
 use language::LanguageRegistry;
 use language_model::{
@@ -32,8 +31,9 @@ use project::{
 };
 use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
-    Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
-    Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip, prelude::*,
+    Chip, CommonAnimationExt, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex,
+    Indicator, PopoverMenu, Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip,
+    prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{Workspace, create_and_open_local_file};
@@ -670,10 +670,9 @@ impl AgentConfiguration {
                 Icon::new(IconName::LoadCircle)
                     .size(IconSize::XSmall)
                     .color(Color::Accent)
-                    .with_animation(
-                        SharedString::from(format!("{}-starting", context_server_id.0,)),
-                        Animation::new(Duration::from_secs(3)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                    .with_keyed_rotate_animation(
+                        SharedString::from(format!("{}-starting", context_server_id.0)),
+                        3,
                     )
                     .into_any_element(),
                 "Server is starting.",
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index c898a5acb5..e5027b876a 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -1,16 +1,14 @@
 use std::{
     path::PathBuf,
     sync::{Arc, Mutex},
-    time::Duration,
 };
 
 use anyhow::{Context as _, Result};
 use context_server::{ContextServerCommand, ContextServerId};
 use editor::{Editor, EditorElement, EditorStyle};
 use gpui::{
-    Animation, AnimationExt as _, AsyncWindowContext, DismissEvent, Entity, EventEmitter,
-    FocusHandle, Focusable, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle,
-    WeakEntity, percentage, prelude::*,
+    AsyncWindowContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task,
+    TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,
 };
 use language::{Language, LanguageRegistry};
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
@@ -24,7 +22,9 @@ use project::{
 };
 use settings::{Settings as _, update_settings_file};
 use theme::ThemeSettings;
-use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
+use ui::{
+    CommonAnimationExt, KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*,
+};
 use util::ResultExt as _;
 use workspace::{ModalView, Workspace};
 
@@ -638,11 +638,7 @@ impl ConfigureContextServerModal {
                 Icon::new(IconName::ArrowCircle)
                     .size(IconSize::XSmall)
                     .color(Color::Info)
-                    .with_animation(
-                        "arrow-circle",
-                        Animation::new(Duration::from_secs(2)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                    )
+                    .with_rotate_animation(2)
                     .into_any_element(),
             )
             .child(
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 4bd525e9d0..74bcb266d5 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -14,9 +14,8 @@ use editor::{
     scroll::Autoscroll,
 };
 use gpui::{
-    Action, Animation, AnimationExt, AnyElement, AnyView, App, AppContext, Empty, Entity,
-    EventEmitter, FocusHandle, Focusable, Global, SharedString, Subscription, Task, Transformation,
-    WeakEntity, Window, percentage, prelude::*,
+    Action, AnyElement, AnyView, App, AppContext, Empty, Entity, EventEmitter, FocusHandle,
+    Focusable, Global, SharedString, Subscription, Task, WeakEntity, Window, prelude::*,
 };
 
 use language::{Buffer, Capability, DiskState, OffsetRangeExt, Point};
@@ -29,9 +28,8 @@ use std::{
     collections::hash_map::Entry,
     ops::Range,
     sync::Arc,
-    time::Duration,
 };
-use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
+use ui::{CommonAnimationExt, IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
 use util::ResultExt;
 use workspace::{
     Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
@@ -1084,11 +1082,7 @@ impl Render for AgentDiffToolbar {
                 Icon::new(IconName::LoadCircle)
                     .size(IconSize::Small)
                     .color(Color::Accent)
-                    .with_animation(
-                        "load_circle",
-                        Animation::new(Duration::from_secs(3)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                    ),
+                    .with_rotate_animation(3),
             )
             .into_any();
 
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 70ec94beea..d979db5e04 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -25,8 +25,8 @@ use gpui::{
     Action, Animation, AnimationExt, AnyElement, AnyView, App, ClipboardEntry, ClipboardItem,
     Empty, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, Global, InteractiveElement,
     IntoElement, ParentElement, Pixels, Render, RenderImage, SharedString, Size,
-    StatefulInteractiveElement, Styled, Subscription, Task, Transformation, WeakEntity, actions,
-    div, img, percentage, point, prelude::*, pulsating_between, size,
+    StatefulInteractiveElement, Styled, Subscription, Task, WeakEntity, actions, div, img, point,
+    prelude::*, pulsating_between, size,
 };
 use language::{
     BufferSnapshot, LspAdapterDelegate, ToOffset,
@@ -53,8 +53,8 @@ use std::{
 };
 use text::SelectionGoal;
 use ui::{
-    ButtonLike, Disclosure, ElevationIndex, KeyBinding, PopoverMenuHandle, TintColor, Tooltip,
-    prelude::*,
+    ButtonLike, CommonAnimationExt, Disclosure, ElevationIndex, KeyBinding, PopoverMenuHandle,
+    TintColor, Tooltip, prelude::*,
 };
 use util::{ResultExt, maybe};
 use workspace::{
@@ -1061,15 +1061,7 @@ impl TextThreadEditor {
                                         Icon::new(IconName::ArrowCircle)
                                             .size(IconSize::XSmall)
                                             .color(Color::Info)
-                                            .with_animation(
-                                                "arrow-circle",
-                                                Animation::new(Duration::from_secs(2)).repeat(),
-                                                |icon, delta| {
-                                                    icon.transform(Transformation::rotate(
-                                                        percentage(delta),
-                                                    ))
-                                                },
-                                            )
+                                            .with_rotate_animation(2)
                                             .into_any_element(),
                                     );
                                     note = Some(Self::esc_kbd(cx).into_any_element());
@@ -2790,11 +2782,7 @@ fn invoked_slash_command_fold_placeholder(
                 .child(Label::new(format!("/{}", command.name)))
                 .map(|parent| match &command.status {
                     InvokedSlashCommandStatus::Running(_) => {
-                        parent.child(Icon::new(IconName::ArrowCircle).with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(4)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ))
+                        parent.child(Icon::new(IconName::ArrowCircle).with_rotate_animation(4))
                     }
                     InvokedSlashCommandStatus::Error(message) => parent.child(
                         Label::new(format!("error: {message}"))
diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index 106dcb0aef..efe6e4165e 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -1,12 +1,9 @@
-use std::{sync::Arc, time::Duration};
+use std::sync::Arc;
 
 use client::{Client, UserStore, zed_urls};
 use cloud_llm_client::Plan;
-use gpui::{
-    Animation, AnimationExt, AnyElement, App, Entity, IntoElement, RenderOnce, Transformation,
-    Window, percentage,
-};
-use ui::{Divider, Vector, VectorName, prelude::*};
+use gpui::{AnyElement, App, Entity, IntoElement, RenderOnce, Window};
+use ui::{CommonAnimationExt, Divider, Vector, VectorName, prelude::*};
 
 use crate::{SignInStatus, YoungAccountBanner, plan_definitions::PlanDefinitions};
 
@@ -147,11 +144,7 @@ impl RenderOnce for AiUpsellCard {
                     rems_from_px(72.),
                 )
                 .color(Color::Custom(cx.theme().colors().text_accent.alpha(0.3)))
-                .with_animation(
-                    "loading_stamp",
-                    Animation::new(Duration::from_secs(10)).repeat(),
-                    |this, delta| this.transform(Transformation::rotate(percentage(delta))),
-                ),
+                .with_rotate_animation(10),
             );
 
         let pro_trial_stamp = div()
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index 7b208ccc77..d13f9891c3 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -17,7 +17,7 @@ use editor::{
 use futures::StreamExt;
 use gpui::{
     Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
-    TextStyleRefinement, Transformation, WeakEntity, percentage, pulsating_between, px,
+    TextStyleRefinement, WeakEntity, pulsating_between, px,
 };
 use indoc::formatdoc;
 use language::{
@@ -44,7 +44,7 @@ use std::{
     time::Duration,
 };
 use theme::ThemeSettings;
-use ui::{Disclosure, Tooltip, prelude::*};
+use ui::{CommonAnimationExt, Disclosure, Tooltip, prelude::*};
 use util::ResultExt;
 use workspace::Workspace;
 
@@ -939,11 +939,7 @@ impl ToolCard for EditFileToolCard {
                     Icon::new(IconName::ArrowCircle)
                         .size(IconSize::XSmall)
                         .color(Color::Info)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ),
+                        .with_rotate_animation(2),
                 )
             })
             .when_some(error_message, |header, error_message| {
diff --git a/crates/assistant_tools/src/terminal_tool.rs b/crates/assistant_tools/src/terminal_tool.rs
index 774f324265..1605003671 100644
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -8,8 +8,8 @@ use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
 use gpui::{
-    Animation, AnimationExt, AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task,
-    TextStyleRefinement, Transformation, WeakEntity, Window, percentage,
+    AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, TextStyleRefinement,
+    WeakEntity, Window,
 };
 use language::LineEnding;
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
@@ -28,7 +28,7 @@ use std::{
 };
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
-use ui::{Disclosure, Tooltip, prelude::*};
+use ui::{CommonAnimationExt, Disclosure, Tooltip, prelude::*};
 use util::{
     ResultExt, get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
     time::duration_alt_display,
@@ -522,11 +522,7 @@ impl ToolCard for TerminalToolCard {
                     Icon::new(IconName::ArrowCircle)
                         .size(IconSize::XSmall)
                         .color(Color::Info)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ),
+                        .with_rotate_animation(2),
                 )
             })
             .when(tool_failed || command_failed, |header| {
diff --git a/crates/debugger_ui/src/dropdown_menus.rs b/crates/debugger_ui/src/dropdown_menus.rs
index c5399f6f69..c611d5d44f 100644
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ b/crates/debugger_ui/src/dropdown_menus.rs
@@ -1,9 +1,9 @@
-use std::{rc::Rc, time::Duration};
+use std::rc::Rc;
 
 use collections::HashMap;
-use gpui::{Animation, AnimationExt as _, Entity, Transformation, WeakEntity, percentage};
+use gpui::{Entity, WeakEntity};
 use project::debugger::session::{ThreadId, ThreadStatus};
-use ui::{ContextMenu, DropdownMenu, DropdownStyle, Indicator, prelude::*};
+use ui::{CommonAnimationExt, ContextMenu, DropdownMenu, DropdownStyle, Indicator, prelude::*};
 use util::{maybe, truncate_and_trailoff};
 
 use crate::{
@@ -152,11 +152,7 @@ impl DebugPanel {
             Icon::new(IconName::ArrowCircle)
                 .size(IconSize::Small)
                 .color(Color::Muted)
-                .with_animation(
-                    "arrow-circle",
-                    Animation::new(Duration::from_secs(2)).repeat(),
-                    |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                )
+                .with_rotate_animation(2)
                 .into_any_element()
         } else {
             match running_state.thread_status(cx).unwrap_or_default() {
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 4ecb4a8829..64163b0ebc 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -31,11 +31,11 @@ use git::{
     UnstageAll,
 };
 use gpui::{
-    Action, Animation, AnimationExt as _, AsyncApp, AsyncWindowContext, Axis, ClickEvent, Corner,
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, KeyContext,
-    ListHorizontalSizingBehavior, ListSizingBehavior, MouseButton, MouseDownEvent, Point,
-    PromptLevel, ScrollStrategy, Subscription, Task, Transformation, UniformListScrollHandle,
-    WeakEntity, actions, anchored, deferred, percentage, uniform_list,
+    Action, AsyncApp, AsyncWindowContext, Axis, ClickEvent, Corner, DismissEvent, Entity,
+    EventEmitter, FocusHandle, Focusable, KeyContext, ListHorizontalSizingBehavior,
+    ListSizingBehavior, MouseButton, MouseDownEvent, Point, PromptLevel, ScrollStrategy,
+    Subscription, Task, UniformListScrollHandle, WeakEntity, actions, anchored, deferred,
+    uniform_list,
 };
 use itertools::Itertools;
 use language::{Buffer, File};
@@ -63,8 +63,8 @@ use std::{collections::HashSet, sync::Arc, time::Duration, usize};
 use strum::{IntoEnumIterator, VariantNames};
 use time::OffsetDateTime;
 use ui::{
-    Checkbox, ContextMenu, ElevationIndex, IconPosition, Label, LabelSize, PopoverMenu, Scrollbar,
-    ScrollbarState, SplitButton, Tooltip, prelude::*,
+    Checkbox, CommonAnimationExt, ContextMenu, ElevationIndex, IconPosition, Label, LabelSize,
+    PopoverMenu, Scrollbar, ScrollbarState, SplitButton, Tooltip, prelude::*,
 };
 use util::{ResultExt, TryFutureExt, maybe};
 use workspace::SERIALIZATION_THROTTLE_TIME;
@@ -3088,13 +3088,7 @@ impl GitPanel {
                         Icon::new(IconName::ArrowCircle)
                             .size(IconSize::XSmall)
                             .color(Color::Info)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            ),
+                            .with_rotate_animation(2),
                     )
                     .child(
                         Label::new("Generating Commit...")
diff --git a/crates/gpui/src/elements/animation.rs b/crates/gpui/src/elements/animation.rs
index 11dd19e260..e72fb00456 100644
--- a/crates/gpui/src/elements/animation.rs
+++ b/crates/gpui/src/elements/animation.rs
@@ -87,7 +87,7 @@ pub trait AnimationExt {
     }
 }
 
-impl<E> AnimationExt for E {}
+impl<E: IntoElement + 'static> AnimationExt for E {}
 
 /// A GPUI element that applies an animation to another element
 pub struct AnimationElement<E> {
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index bd284eb72b..071424eabe 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -14,10 +14,7 @@ use copilot::{Copilot, Status};
 use futures::future::BoxFuture;
 use futures::stream::BoxStream;
 use futures::{FutureExt, Stream, StreamExt};
-use gpui::{
-    Action, Animation, AnimationExt, AnyView, App, AsyncApp, Entity, Render, Subscription, Task,
-    Transformation, percentage, svg,
-};
+use gpui::{Action, AnyView, App, AsyncApp, Entity, Render, Subscription, Task, svg};
 use language::language_settings::all_language_settings;
 use language_model::{
     AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
@@ -28,8 +25,7 @@ use language_model::{
     StopReason, TokenUsage,
 };
 use settings::SettingsStore;
-use std::time::Duration;
-use ui::prelude::*;
+use ui::{CommonAnimationExt, prelude::*};
 use util::debug_panic;
 
 use crate::provider::x_ai::count_xai_tokens;
@@ -672,11 +668,7 @@ impl Render for ConfigurationView {
                         }),
                 )
         } else {
-            let loading_icon = Icon::new(IconName::ArrowCircle).with_animation(
-                "arrow-circle",
-                Animation::new(Duration::from_secs(4)).repeat(),
-                |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-            );
+            let loading_icon = Icon::new(IconName::ArrowCircle).with_rotate_animation(4);
 
             const ERROR_LABEL: &str = "Copilot Chat requires an active GitHub Copilot subscription. Please ensure Copilot is configured and try again, or use a different Assistant provider.";
 
diff --git a/crates/recent_projects/src/remote_connections.rs b/crates/recent_projects/src/remote_connections.rs
index e543bf219f..a7f915301f 100644
--- a/crates/recent_projects/src/remote_connections.rs
+++ b/crates/recent_projects/src/remote_connections.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeSet;
-use std::{path::PathBuf, sync::Arc, time::Duration};
+use std::{path::PathBuf, sync::Arc};
 
 use anyhow::{Context as _, Result};
 use auto_update::AutoUpdater;
@@ -7,9 +7,9 @@ use editor::Editor;
 use extension_host::ExtensionStore;
 use futures::channel::oneshot;
 use gpui::{
-    Animation, AnimationExt, AnyWindowHandle, App, AsyncApp, DismissEvent, Entity, EventEmitter,
-    Focusable, FontFeatures, ParentElement as _, PromptLevel, Render, SemanticVersion,
-    SharedString, Task, TextStyleRefinement, Transformation, WeakEntity, percentage,
+    AnyWindowHandle, App, AsyncApp, DismissEvent, Entity, EventEmitter, Focusable, FontFeatures,
+    ParentElement as _, PromptLevel, Render, SemanticVersion, SharedString, Task,
+    TextStyleRefinement, WeakEntity,
 };
 
 use language::CursorShape;
@@ -24,8 +24,8 @@ use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, SettingsUi};
 use theme::ThemeSettings;
 use ui::{
-    ActiveTheme, Color, Context, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
-    LabelCommon, Styled, Window, prelude::*,
+    ActiveTheme, Color, CommonAnimationExt, Context, Icon, IconName, IconSize, InteractiveElement,
+    IntoElement, Label, LabelCommon, Styled, Window, prelude::*,
 };
 use util::serde::default_true;
 use workspace::{AppState, ModalView, Workspace};
@@ -268,13 +268,7 @@ impl Render for RemoteConnectionPrompt {
                         .child(
                             Icon::new(IconName::ArrowCircle)
                                 .size(IconSize::Medium)
-                                .with_animation(
-                                    "arrow-circle",
-                                    Animation::new(Duration::from_secs(2)).repeat(),
-                                    |icon, delta| {
-                                        icon.transform(Transformation::rotate(percentage(delta)))
-                                    },
-                                ),
+                                .with_rotate_animation(2),
                         )
                         .child(
                             div()
diff --git a/crates/repl/src/outputs.rs b/crates/repl/src/outputs.rs
index 767b103435..2cd6494d66 100644
--- a/crates/repl/src/outputs.rs
+++ b/crates/repl/src/outputs.rs
@@ -33,16 +33,13 @@
 //! This module is designed to work with Jupyter message protocols,
 //! interpreting and displaying various types of Jupyter output.
 
-use std::time::Duration;
-
 use editor::{Editor, MultiBuffer};
-use gpui::{
-    Animation, AnimationExt, AnyElement, ClipboardItem, Entity, Render, Transformation, WeakEntity,
-    percentage,
-};
+use gpui::{AnyElement, ClipboardItem, Entity, Render, WeakEntity};
 use language::Buffer;
 use runtimelib::{ExecutionState, JupyterMessageContent, MimeBundle, MimeType};
-use ui::{Context, IntoElement, Styled, Tooltip, Window, div, prelude::*, v_flex};
+use ui::{
+    CommonAnimationExt, Context, IntoElement, Styled, Tooltip, Window, div, prelude::*, v_flex,
+};
 
 mod image;
 use image::ImageView;
@@ -481,11 +478,7 @@ impl Render for ExecutionView {
                     Icon::new(IconName::ArrowCircle)
                         .size(IconSize::Small)
                         .color(Color::Muted)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(3)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ),
+                        .with_rotate_animation(3),
                 )
                 .child(Label::new("Executing...").color(Color::Muted))
                 .into_any_element(),
diff --git a/crates/ui/src/components/icon.rs b/crates/ui/src/components/icon.rs
index bc0ec462e9..8f7ef41108 100644
--- a/crates/ui/src/components/icon.rs
+++ b/crates/ui/src/components/icon.rs
@@ -9,6 +9,7 @@ use gpui::{AnimationElement, AnyElement, Hsla, IntoElement, Rems, Transformation
 pub use icon_decoration::*;
 pub use icons::*;
 
+use crate::traits::transformable::Transformable;
 use crate::{Indicator, prelude::*};
 
 #[derive(IntoElement)]
@@ -180,8 +181,10 @@ impl Icon {
         self.size = size;
         self
     }
+}
 
-    pub fn transform(mut self, transformation: Transformation) -> Self {
+impl Transformable for Icon {
+    fn transform(mut self, transformation: Transformation) -> Self {
         self.transformation = transformation;
         self
     }
diff --git a/crates/ui/src/components/image.rs b/crates/ui/src/components/image.rs
index 6e552ddcee..8a14cffd3b 100644
--- a/crates/ui/src/components/image.rs
+++ b/crates/ui/src/components/image.rs
@@ -7,6 +7,7 @@ use strum::{EnumIter, EnumString, IntoStaticStr};
 
 use crate::Color;
 use crate::prelude::*;
+use crate::traits::transformable::Transformable;
 
 #[derive(
     Debug, PartialEq, Eq, Copy, Clone, EnumIter, EnumString, IntoStaticStr, Serialize, Deserialize,
@@ -74,8 +75,10 @@ impl Vector {
         self.size = size;
         self
     }
+}
 
-    pub fn transform(mut self, transformation: Transformation) -> Self {
+impl Transformable for Vector {
+    fn transform(mut self, transformation: Transformation) -> Self {
         self.transformation = transformation;
         self
     }
diff --git a/crates/ui/src/traits.rs b/crates/ui/src/traits.rs
index 628c76aadd..9627f6d6ad 100644
--- a/crates/ui/src/traits.rs
+++ b/crates/ui/src/traits.rs
@@ -1,6 +1,8 @@
+pub mod animation_ext;
 pub mod clickable;
 pub mod disableable;
 pub mod fixed;
 pub mod styled_ext;
 pub mod toggleable;
+pub mod transformable;
 pub mod visible_on_hover;
diff --git a/crates/ui/src/traits/animation_ext.rs b/crates/ui/src/traits/animation_ext.rs
new file mode 100644
index 0000000000..4907c71ff2
--- /dev/null
+++ b/crates/ui/src/traits/animation_ext.rs
@@ -0,0 +1,42 @@
+use std::time::Duration;
+
+use gpui::{Animation, AnimationElement, AnimationExt, Transformation, percentage};
+
+use crate::{prelude::*, traits::transformable::Transformable};
+
+/// An extension trait for adding common animations to animatable components.
+pub trait CommonAnimationExt: AnimationExt {
+    /// Render this component as rotating over the given duration.
+    ///
+    /// NOTE: This method uses the location of the caller to generate an ID for this state.
+    ///       If this is not sufficient to identify your state (e.g. you're rendering a list item),
+    ///       you can provide a custom ElementID using the `use_keyed_rotate_animation` method.
+    #[track_caller]
+    fn with_rotate_animation(self, duration: u64) -> AnimationElement<Self>
+    where
+        Self: Transformable + Sized,
+    {
+        self.with_keyed_rotate_animation(
+            ElementId::CodeLocation(*std::panic::Location::caller()),
+            duration,
+        )
+    }
+
+    /// Render this component as rotating with the given element ID over the given duration.
+    fn with_keyed_rotate_animation(
+        self,
+        id: impl Into<ElementId>,
+        duration: u64,
+    ) -> AnimationElement<Self>
+    where
+        Self: Transformable + Sized,
+    {
+        self.with_animation(
+            id,
+            Animation::new(Duration::from_secs(duration)).repeat(),
+            |component, delta| component.transform(Transformation::rotate(percentage(delta))),
+        )
+    }
+}
+
+impl<T: AnimationExt> CommonAnimationExt for T {}
diff --git a/crates/ui/src/traits/transformable.rs b/crates/ui/src/traits/transformable.rs
new file mode 100644
index 0000000000..f52141f304
--- /dev/null
+++ b/crates/ui/src/traits/transformable.rs
@@ -0,0 +1,7 @@
+use gpui::Transformation;
+
+/// A trait for components that can be transformed.
+pub trait Transformable {
+    /// Sets the transformation for the element.
+    fn transform(self, transformation: Transformation) -> Self;
+}
diff --git a/crates/ui/src/ui.rs b/crates/ui/src/ui.rs
index dadc5ecdd1..17e707f11b 100644
--- a/crates/ui/src/ui.rs
+++ b/crates/ui/src/ui.rs
@@ -17,3 +17,4 @@ pub mod utils;
 pub use components::*;
 pub use prelude::*;
 pub use styles::*;
+pub use traits::animation_ext::*;
diff --git a/crates/zed/src/zed/quick_action_bar/repl_menu.rs b/crates/zed/src/zed/quick_action_bar/repl_menu.rs
index eaa989f88d..82eb82de1e 100644
--- a/crates/zed/src/zed/quick_action_bar/repl_menu.rs
+++ b/crates/zed/src/zed/quick_action_bar/repl_menu.rs
@@ -1,7 +1,5 @@
-use std::time::Duration;
-
 use gpui::ElementId;
-use gpui::{Animation, AnimationExt, AnyElement, Entity, Transformation, percentage};
+use gpui::{AnyElement, Entity};
 use picker::Picker;
 use repl::{
     ExecutionState, JupyterSettings, Kernel, KernelSpecification, KernelStatus, Session,
@@ -10,8 +8,8 @@ use repl::{
     worktree_id_for_editor,
 };
 use ui::{
-    ButtonLike, ContextMenu, IconWithIndicator, Indicator, IntoElement, PopoverMenu,
-    PopoverMenuHandle, Tooltip, prelude::*,
+    ButtonLike, CommonAnimationExt, ContextMenu, IconWithIndicator, Indicator, IntoElement,
+    PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
 };
 use util::ResultExt;
 
@@ -224,11 +222,7 @@ impl QuickActionBar {
             .child(if menu_state.icon_is_animating {
                 Icon::new(menu_state.icon)
                     .color(menu_state.icon_color)
-                    .with_animation(
-                        "arrow-circle",
-                        Animation::new(Duration::from_secs(5)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                    )
+                    .with_rotate_animation(5)
                     .into_any_element()
             } else {
                 IconWithIndicator::new(

From c89435154450e8d8878f6f03ff39c772b1cfc503 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Tue, 2 Sep 2025 16:11:35 +0100
Subject: [PATCH 523/823] vim: Fix change surrounding quotes with whitespace
 within (#37321)

This commit fixes a bug with Zed's vim mode surrounds plugin when
dealing with replacing pairs with quote and the contents between the
pairs had some whitespace within them.

For example, with the following string:

```
' str '
```

If one was to use the `cs'"` command, to replace single quotes with
double quotes, the result would actually be:

```
"str"
```

As the whitespace before and after the closing character was removed.

This happens because of the way the plugin decides whether to add or
remove whitespace after and before the opening and closing characters,
repsectively. For example, using `cs{[` yields a different result from
using `cs{]`, the former adds a space while the latter does not.

However, since for quotes the opening and closing character is exactly
the same, this behavior is not possible, so this commit updates the code
in `vim::surrounds::Vim.change_surrounds` so that it never adds or
removes whitespace when dealing with any type of quotes.

Closes #12247

Release Notes:

- Fixed whitespace handling when changing surrounding pairs to quotes in
vim mode
---
 crates/vim/src/surrounds.rs | 43 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/crates/vim/src/surrounds.rs b/crates/vim/src/surrounds.rs
index ca65204fab..83500cf88b 100644
--- a/crates/vim/src/surrounds.rs
+++ b/crates/vim/src/surrounds.rs
@@ -240,7 +240,24 @@ impl Vim {
                             newline: false,
                         },
                     };
-                    let surround = pair.end != surround_alias((*text).as_ref());
+
+                    // Determines whether space should be added/removed after
+                    // and before the surround pairs.
+                    // For example, using `cs{[` will add a space before and
+                    // after the pair, while using `cs{]` will not, notice the
+                    // use of the closing bracket instead of the opening bracket
+                    // on the target object.
+                    // In the case of quotes, the opening and closing is the
+                    // same, so no space will ever be added or removed.
+                    let surround = match target {
+                        Object::Quotes
+                        | Object::BackQuotes
+                        | Object::AnyQuotes
+                        | Object::MiniQuotes
+                        | Object::DoubleQuotes => true,
+                        _ => pair.end != surround_alias((*text).as_ref()),
+                    };
+
                     let (display_map, selections) = editor.selections.all_adjusted_display(cx);
                     let mut edits = Vec::new();
                     let mut anchors = Vec::new();
@@ -1128,6 +1145,30 @@ mod test {
             ];"},
             Mode::Normal,
         );
+
+        // test change quotes.
+        cx.set_state(indoc! {"'  ˇstr  '"}, Mode::Normal);
+        cx.simulate_keystrokes("c s ' \"");
+        cx.assert_state(indoc! {"ˇ\"  str  \""}, Mode::Normal);
+
+        // test multi cursor change quotes
+        cx.set_state(
+            indoc! {"
+            '  ˇstr  '
+            some example text here
+            ˇ'  str  '
+        "},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes("c s ' \"");
+        cx.assert_state(
+            indoc! {"
+            ˇ\"  str  \"
+            some example text here
+            ˇ\"  str  \"
+        "},
+            Mode::Normal,
+        );
     }
 
     #[gpui::test]

From 8e7caa429dcfbf022393ba6241b63193ffb89e95 Mon Sep 17 00:00:00 2001
From: Jonathan Camp <github@jonathan.camp>
Date: Tue, 2 Sep 2025 17:26:12 +0200
Subject: [PATCH 524/823] remove extra brace in rules template (#37356)

Release Notes:

- Fixed: remove extra brace in rules template
---
 assets/prompts/assistant_system_prompt.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/prompts/assistant_system_prompt.hbs b/assets/prompts/assistant_system_prompt.hbs
index b4545f5a74..f47c1ffa90 100644
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -172,7 +172,7 @@ The user has specified the following rules that should be applied:
 Rules title: {{title}}
 {{/if}}
 ``````
-{{contents}}}
+{{contents}}
 ``````
 {{/each}}
 {{/if}}

From 7e3fbeb59d4c51241f9eabb154bb46f36f5767b2 Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Tue, 2 Sep 2025 17:59:58 +0200
Subject: [PATCH 525/823] Add the Glossary from the channel into Zed (#37360)

This should make it easier for contributors to learn all the terms used
in the Zed code base.

Release Notes:

- N/A
---
 CONTRIBUTING.md                  |   2 +
 docs/src/development/glossary.md | 108 +++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 docs/src/development/glossary.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dd5bbdc2e1..407ba002c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,6 +65,8 @@ If you would like to add a new icon to the Zed icon theme, [open a Discussion](h
 
 ## Bird's-eye view of Zed
 
+We suggest you keep the [zed glossary](docs/src/development/GLOSSARY.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
+
 Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
 
 - [`gpui`](/crates/gpui) is a GPU-accelerated UI framework which provides all of the building blocks for Zed. **We recommend familiarizing yourself with the root level GPUI documentation.**
diff --git a/docs/src/development/glossary.md b/docs/src/development/glossary.md
new file mode 100644
index 0000000000..08bc9f0e91
--- /dev/null
+++ b/docs/src/development/glossary.md
@@ -0,0 +1,108 @@
+These are some terms and structures frequently used throughout the zed codebase. This is a best effort list.
+
+Questions:
+
+- Can we generate this list from doc comments throughout zed?
+- We should have a section that shows the various UI parts and their names. (Can't do that in the channel.)
+
+## Naming conventions
+
+These are generally true for the whole codebase. Note that Name can be anything
+here. An example would be `AnyElement` and `LspStore`.
+
+- `AnyName`: A type erased version of _name_. Think `Box<dyn NameTrait>`.
+- `NameStore`: A wrapper type which abstracts over whether operations are running locally or on a remote.
+
+## GPUI
+
+### State menagement
+
+- `App`: A singleton which holds the full application state including all the entities. Crucially: `App` is not `Send`, which means that `App` only exists on the thread that created it (which is the main/UI thread, usually). Thus, if you see a `&mut App`, know that you're on UI thread.
+- `Context`: A wrapper around the `App` struct with specialized behavior for a specific `Entity`. Think of it as `(&mut App, Entity<V>)`. The specialized behavior is surfaced in the API surface of `Context`. E.g., `App::spawn` takes an `AsyncFnOnce(AsyncApp) -> Ret`, whereas `Context::spawn` takes an `AsyncFnOnce(WeakEntity<V>, AsyncApp) -> Ret`.
+- `AsyncApp`: An owned version of `App` for use in async contexts. This type is _still_ not `Send` (so `AsyncApp` = you're on the main thread) and any use of it may be fallible (to account for the fact that the `App` might've been terminated by the time this closure runs).
+  The convenience of `AsyncApp` lies in the fact that you usually interface with `App` via `&mut App`, which would be inconvenient to use with async closures; `AsyncApp` is owned, so you can use it in async closures with no sweat.
+- `AppContext` A trait which abstracts over `App`, `AsyncApp` & `Context` and their Test versions.
+- `Task`: A future running or scheduled to run on the background or foreground
+  executor. In contradiction to regular Futures Tasks do not need `.await` to start running. You do need to await them to get the result of the task.
+- `Executor`: Used to spawn tasks that run either on the foreground or background thread. Try to run the tasks on the background thread.
+  - `BackgroundExecutor`: A threadpool running `Task`s.
+  - `ForegroundExecutor`: The main thread running `Task`s.
+- `Entity`: A strong, well-typed reference to a struct which is managed by gpui. Effectively a pointer/map key into the `App::EntityMap`.
+- `WeakEntity`: A runtime checked reference to an `Entity` which may no longer exist. Similar to [`std::rc::Weak`](https://doc.rust-lang.org/std/rc/struct.Weak.html).
+- `Global`: A singleton type which has only one value, that is stored in the `App`.
+- `Event`: A datatype which can be send by an `Entity` to subscribers
+- `Action`: An event that represents a user's keyboard input that can be handled by listeners
+  Example: `file finder: toggle`
+- `Observing`: reacting entities notifying they've changed
+- `Subscription`: An event handler that is used to react to the changes of state in the application.
+  1. Emitted event handling
+  2. Observing `{new,release,on notify}` of an entity
+
+### UI
+
+- `View`: An `Entity` which can produce an `Element` through its implementation of `Render`.
+- `Element`: A type that can be laid out and painted to the screen.
+- `element expression`: An expression that builds an element tree, example:
+
+```rust
+h_flex()
+    .id(text[i])
+    .relative()
+    .when(selected, |this| {
+        this.child(
+            div()
+                .h_4()
+                .absolute()
+                etc etc
+```
+
+- `Component`: A builder which can be rendered turning it into an `Element`.
+- `Dispatch tree`: TODO
+- `Focus`: The place where keystrokes are handled first
+- `Focus tree`: Path from the place thats the current focus to the UI Root. Example <img> TODO
+
+## Zed UI
+
+- `Window`: A struct in zed representing a zed window in your desktop environment (see image below). There can be multiple if you have multiple zed instances open. Mostly passed around for rendering.
+- `Modal`: A UI element that floats on top of the rest of the UI
+- `Picker`: A struct representing a list of items in floating on top of the UI (Modal). You can select an item and confirm. What happens on select or confirm is determined by the picker's delegate. (The 'Model' in the image below is a picker.)
+- `PickerDelegate`: A trait used to specialize behavior for a `Picker`. The `Picker` stores the `PickerDelegate` in the field delegate.
+- `Center`: The middle of the zed window, the center is split into multiple `Pane`s. In the codebase this is a field on the `Workspace` struct. (see image below).
+- `Pane`: An area in the `Center` where we can place items, such as an editor, multi-buffer or terminal (see image below).
+- `Panel`: An `Entity` implementing the `Panel` trait. These can be placed in a `Dock`. In the image below we see the: `ProjectPanel` in the left dock, the `DebugPanel` in the bottom dock, and `AgentPanel` in the right dock. Note `Editor` does not implement `Panel` and hence is not a `Panel`.
+- `Dock`: A UI element similar to a `Pane` which can be opened and hidden. There can be up to 3 docks open at a time, left right and below the center. A dock contains one or more `Panel`s not `Pane`s. (see image).
+  <img width="1921" height="1080" alt="image" src="https://github.com/user-attachments/assets/2cb1170e-2850-450d-89bb-73622b5d07b2" />
+
+- `Project`: One or more `Worktree`s
+- `Worktree`: Represents either local or remote files.
+  <img width="552" height="1118" alt="image" src="https://github.com/user-attachments/assets/da5c58e4-b02e-4038-9736-27e3509fdbfa" />
+
+- [Multibuffer](https://zed.dev/docs/multibuffers): A list of Editors, a multi-buffer allows editing multiple files simultaneously. A multi-buffer opens when an operation in Zed returns multiple locations, examples: _search_ or _go to definition_. See project search in the image below.
+
+<img width="800" height="886" alt="image" src="https://github.com/user-attachments/assets/d59dcecd-8ab6-4172-8fb6-b1fc3c3eaf9d" />
+
+## Editor
+
+- `Editor`: _The_ text editor, nearly everything in zed is an `Editor`, even single line inputs. Each pane in the image above contains one or more `Editor` instances.
+- `Workspace`: The root of the window
+- `Entry`: A file, dir, pending dir or unloaded dir.
+- `Buffer`: The in-memory representation of a 'file' together with relevant data such as syntax trees, git status and diagnostics.
+- `pending selection`: You have mouse down and you're dragging but you have not yet released.
+
+## Collab
+
+- `Collab session`: Multiple users working in a shared `Project`
+- `Upstream client`: The zed client which has shared their workspace
+- `Downstream client`: The zed client joining a shared workspace
+
+## Debugger
+
+- `DapStore`: Is an entity that manages debugger sessions
+- `debugger::Session`: Is an entity that manages the lifecycle of a debug session and communication with DAPS
+- `BreakpointStore`: Is an entity that manages breakpoints states in local and remote instances of Zed
+- `DebugSession`: Manages a debug session's UI and running state
+- `RunningState`: Directily manages all the views of a debug session
+- `VariableList`: The variable and watch list view of a debug session
+- `Console`: TODO
+- `Terminal`: TODO
+- `BreakpointList`: TODO

From ad3ddd381da7899174fe5bad064ef2c3b70f9c4f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Tue, 2 Sep 2025 12:18:49 -0400
Subject: [PATCH 526/823] Revert "gpui: Do not render ligatures between
 different styled text runs (#37175) (#37382)

This reverts commit 62083fe7963dd5bed4579bb12abac1b7800cdbaa.

We're reverting this as it causes layout shift when typing/selecting
with ligatures:


https://github.com/user-attachments/assets/80b78909-62f5-404f-8cca-3535c5594ceb

Release Notes:

- Reverted #37175
---
 crates/gpui/src/platform/mac/text_system.rs | 168 ++++----------------
 crates/gpui/src/text_system.rs              | 102 +++++-------
 crates/gpui/src/text_system/line_layout.rs  |  15 +-
 3 files changed, 81 insertions(+), 204 deletions(-)

diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index ba7017b58f..72a0f2e565 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -43,7 +43,7 @@ use pathfinder_geometry::{
     vector::{Vector2F, Vector2I},
 };
 use smallvec::SmallVec;
-use std::{borrow::Cow, char, convert::TryFrom, sync::Arc};
+use std::{borrow::Cow, char, cmp, convert::TryFrom, sync::Arc};
 
 use super::open_type::apply_features_and_fallbacks;
 
@@ -67,7 +67,6 @@ struct MacTextSystemState {
     font_ids_by_postscript_name: HashMap<String, FontId>,
     font_ids_by_font_key: HashMap<FontKey, SmallVec<[FontId; 4]>>,
     postscript_names_by_font_id: HashMap<FontId, String>,
-    zwnjs_scratch_space: Vec<(usize, usize)>,
 }
 
 impl MacTextSystem {
@@ -80,7 +79,6 @@ impl MacTextSystem {
             font_ids_by_postscript_name: HashMap::default(),
             font_ids_by_font_key: HashMap::default(),
             postscript_names_by_font_id: HashMap::default(),
-            zwnjs_scratch_space: Vec::new(),
         }))
     }
 }
@@ -426,41 +424,29 @@ impl MacTextSystemState {
     }
 
     fn layout_line(&mut self, text: &str, font_size: Pixels, font_runs: &[FontRun]) -> LineLayout {
-        const ZWNJ: char = '\u{200C}';
-        const ZWNJ_STR: &str = "\u{200C}";
-        const ZWNJ_SIZE_16: usize = ZWNJ.len_utf16();
-
-        self.zwnjs_scratch_space.clear();
         // Construct the attributed string, converting UTF8 ranges to UTF16 ranges.
         let mut string = CFMutableAttributedString::new();
-
         {
-            let mut ix_converter = StringIndexConverter::new(&text);
-            let mut last_font_run = None;
+            string.replace_str(&CFString::new(text), CFRange::init(0, 0));
+            let utf16_line_len = string.char_len() as usize;
+
+            let mut ix_converter = StringIndexConverter::new(text);
             for run in font_runs {
-                let text = &text[ix_converter.utf8_ix..][..run.len];
-                // if the fonts are the same, we need to disconnect the text with a ZWNJ
-                // to prevent core text from forming ligatures between them
-                let needs_zwnj = last_font_run.replace(run.font_id) == Some(run.font_id);
+                let utf8_end = ix_converter.utf8_ix + run.len;
+                let utf16_start = ix_converter.utf16_ix;
 
-                let n_zwnjs = self.zwnjs_scratch_space.len();
-                let utf16_start = ix_converter.utf16_ix + n_zwnjs * ZWNJ_SIZE_16;
-                ix_converter.advance_to_utf8_ix(ix_converter.utf8_ix + run.len);
-
-                string.replace_str(&CFString::new(text), CFRange::init(utf16_start as isize, 0));
-                if needs_zwnj {
-                    let zwnjs_pos = string.char_len();
-                    self.zwnjs_scratch_space.push((n_zwnjs, zwnjs_pos as usize));
-                    string.replace_str(
-                        &CFString::from_static_string(ZWNJ_STR),
-                        CFRange::init(zwnjs_pos, 0),
-                    );
+                if utf16_start >= utf16_line_len {
+                    break;
                 }
-                let utf16_end = string.char_len() as usize;
+
+                ix_converter.advance_to_utf8_ix(utf8_end);
+                let utf16_end = cmp::min(ix_converter.utf16_ix, utf16_line_len);
 
                 let cf_range =
                     CFRange::init(utf16_start as isize, (utf16_end - utf16_start) as isize);
-                let font = &self.fonts[run.font_id.0];
+
+                let font: &FontKitFont = &self.fonts[run.font_id.0];
+
                 unsafe {
                     string.set_attribute(
                         cf_range,
@@ -468,12 +454,17 @@ impl MacTextSystemState {
                         &font.native_font().clone_with_font_size(font_size.into()),
                     );
                 }
+
+                if utf16_end == utf16_line_len {
+                    break;
+                }
             }
         }
+
         // Retrieve the glyphs from the shaped line, converting UTF16 offsets to UTF8 offsets.
         let line = CTLine::new_with_attributed_string(string.as_concrete_TypeRef());
         let glyph_runs = line.glyph_runs();
-        let mut runs = <Vec<ShapedRun>>::with_capacity(glyph_runs.len() as usize);
+        let mut runs = Vec::with_capacity(glyph_runs.len() as usize);
         let mut ix_converter = StringIndexConverter::new(text);
         for run in glyph_runs.into_iter() {
             let attributes = run.attributes().unwrap();
@@ -485,44 +476,28 @@ impl MacTextSystemState {
             };
             let font_id = self.id_for_native_font(font);
 
-            let mut glyphs = match runs.last_mut() {
-                Some(run) if run.font_id == font_id => &mut run.glyphs,
-                _ => {
-                    runs.push(ShapedRun {
-                        font_id,
-                        glyphs: Vec::with_capacity(run.glyph_count().try_into().unwrap_or(0)),
-                    });
-                    &mut runs.last_mut().unwrap().glyphs
-                }
-            };
-            for ((&glyph_id, position), &glyph_utf16_ix) in run
+            let mut glyphs = Vec::with_capacity(run.glyph_count().try_into().unwrap_or(0));
+            for ((glyph_id, position), glyph_utf16_ix) in run
                 .glyphs()
                 .iter()
                 .zip(run.positions().iter())
                 .zip(run.string_indices().iter())
             {
-                let mut glyph_utf16_ix = usize::try_from(glyph_utf16_ix).unwrap();
-                let r = self
-                    .zwnjs_scratch_space
-                    .binary_search_by(|&(_, it)| it.cmp(&glyph_utf16_ix));
-                match r {
-                    // this glyph is a ZWNJ, skip it
-                    Ok(_) => continue,
-                    // adjust the index to account for the ZWNJs we've inserted
-                    Err(idx) => glyph_utf16_ix -= idx * ZWNJ_SIZE_16,
-                }
+                let glyph_utf16_ix = usize::try_from(*glyph_utf16_ix).unwrap();
                 if ix_converter.utf16_ix > glyph_utf16_ix {
                     // We cannot reuse current index converter, as it can only seek forward. Restart the search.
                     ix_converter = StringIndexConverter::new(text);
                 }
                 ix_converter.advance_to_utf16_ix(glyph_utf16_ix);
                 glyphs.push(ShapedGlyph {
-                    id: GlyphId(glyph_id as u32),
+                    id: GlyphId(*glyph_id as u32),
                     position: point(position.x as f32, position.y as f32).map(px),
                     index: ix_converter.utf8_ix,
                     is_emoji: self.is_emoji(font_id),
                 });
             }
+
+            runs.push(ShapedRun { font_id, glyphs });
         }
         let typographic_bounds = line.get_typographic_bounds();
         LineLayout {
@@ -721,93 +696,4 @@ mod tests {
         // There's no glyph for \u{feff}
         assert_eq!(layout.runs[0].glyphs[1].id, GlyphId(69u32)); // b
     }
-
-    #[test]
-    fn test_layout_line_zwnj_insertion() {
-        let fonts = MacTextSystem::new();
-        let font_id = fonts.font_id(&font("Helvetica")).unwrap();
-
-        let text = "hello world";
-        let font_runs = &[
-            FontRun { font_id, len: 5 }, // "hello"
-            FontRun { font_id, len: 6 }, // " world"
-        ];
-
-        let layout = fonts.layout_line(text, px(16.), font_runs);
-        assert_eq!(layout.len, text.len());
-
-        for run in &layout.runs {
-            for glyph in &run.glyphs {
-                assert!(
-                    glyph.index < text.len(),
-                    "Glyph index {} is out of bounds for text length {}",
-                    glyph.index,
-                    text.len()
-                );
-            }
-        }
-
-        // Test with different font runs - should not insert ZWNJ
-        let font_id2 = fonts.font_id(&font("Times")).unwrap_or(font_id);
-        let font_runs_different = &[
-            FontRun { font_id, len: 5 }, // "hello"
-            // " world"
-            FontRun {
-                font_id: font_id2,
-                len: 6,
-            },
-        ];
-
-        let layout2 = fonts.layout_line(text, px(16.), font_runs_different);
-        assert_eq!(layout2.len, text.len());
-
-        for run in &layout2.runs {
-            for glyph in &run.glyphs {
-                assert!(
-                    glyph.index < text.len(),
-                    "Glyph index {} is out of bounds for text length {}",
-                    glyph.index,
-                    text.len()
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn test_layout_line_zwnj_edge_cases() {
-        let fonts = MacTextSystem::new();
-        let font_id = fonts.font_id(&font("Helvetica")).unwrap();
-
-        let text = "hello";
-        let font_runs = &[FontRun { font_id, len: 5 }];
-        let layout = fonts.layout_line(text, px(16.), font_runs);
-        assert_eq!(layout.len, text.len());
-
-        let text = "abc";
-        let font_runs = &[
-            FontRun { font_id, len: 1 }, // "a"
-            FontRun { font_id, len: 1 }, // "b"
-            FontRun { font_id, len: 1 }, // "c"
-        ];
-        let layout = fonts.layout_line(text, px(16.), font_runs);
-        assert_eq!(layout.len, text.len());
-
-        for run in &layout.runs {
-            for glyph in &run.glyphs {
-                assert!(
-                    glyph.index < text.len(),
-                    "Glyph index {} is out of bounds for text length {}",
-                    glyph.index,
-                    text.len()
-                );
-            }
-        }
-
-        // Test with empty text
-        let text = "";
-        let font_runs = &[];
-        let layout = fonts.layout_line(text, px(16.), font_runs);
-        assert_eq!(layout.len, 0);
-        assert!(layout.runs.is_empty());
-    }
 }
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index be34b9e2aa..53991089da 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -413,10 +413,9 @@ impl WindowTextSystem {
         let mut wrapped_lines = 0;
 
         let mut process_line = |line_text: SharedString| {
-            font_runs.clear();
             let line_end = line_start + line_text.len();
 
-            let mut last_font: Option<FontId> = None;
+            let mut last_font: Option<Font> = None;
             let mut decoration_runs = SmallVec::<[DecorationRun; 32]>::new();
             let mut run_start = line_start;
             while run_start < line_end {
@@ -426,14 +425,23 @@ impl WindowTextSystem {
 
                 let run_len_within_line = cmp::min(line_end, run_start + run.len) - run_start;
 
-                let decoration_changed = if let Some(last_run) = decoration_runs.last_mut()
-                    && last_run.color == run.color
-                    && last_run.underline == run.underline
-                    && last_run.strikethrough == run.strikethrough
-                    && last_run.background_color == run.background_color
-                {
-                    last_run.len += run_len_within_line as u32;
-                    false
+                if last_font == Some(run.font.clone()) {
+                    font_runs.last_mut().unwrap().len += run_len_within_line;
+                } else {
+                    last_font = Some(run.font.clone());
+                    font_runs.push(FontRun {
+                        len: run_len_within_line,
+                        font_id: self.resolve_font(&run.font),
+                    });
+                }
+
+                if decoration_runs.last().is_some_and(|last_run| {
+                    last_run.color == run.color
+                        && last_run.underline == run.underline
+                        && last_run.strikethrough == run.strikethrough
+                        && last_run.background_color == run.background_color
+                }) {
+                    decoration_runs.last_mut().unwrap().len += run_len_within_line as u32;
                 } else {
                     decoration_runs.push(DecorationRun {
                         len: run_len_within_line as u32,
@@ -442,21 +450,6 @@ impl WindowTextSystem {
                         underline: run.underline,
                         strikethrough: run.strikethrough,
                     });
-                    true
-                };
-
-                if let Some(font_run) = font_runs.last_mut()
-                    && Some(font_run.font_id) == last_font
-                    && !decoration_changed
-                {
-                    font_run.len += run_len_within_line;
-                } else {
-                    let font_id = self.resolve_font(&run.font);
-                    last_font = Some(font_id);
-                    font_runs.push(FontRun {
-                        len: run_len_within_line,
-                        font_id,
-                    });
                 }
 
                 if run_len_within_line == run.len {
@@ -491,6 +484,8 @@ impl WindowTextSystem {
                     runs.next();
                 }
             }
+
+            font_runs.clear();
         };
 
         let mut split_lines = text.split('\n');
@@ -524,54 +519,37 @@ impl WindowTextSystem {
     /// Subsets of the line can be styled independently with the `runs` parameter.
     /// Generally, you should prefer to use `TextLayout::shape_line` instead, which
     /// can be painted directly.
-    pub fn layout_line(
+    pub fn layout_line<Text>(
         &self,
-        text: &str,
+        text: Text,
         font_size: Pixels,
         runs: &[TextRun],
         force_width: Option<Pixels>,
-    ) -> Arc<LineLayout> {
-        let mut last_run = None::<&TextRun>;
-        let mut last_font: Option<FontId> = None;
+    ) -> Arc<LineLayout>
+    where
+        Text: AsRef<str>,
+        SharedString: From<Text>,
+    {
         let mut font_runs = self.font_runs_pool.lock().pop().unwrap_or_default();
-        font_runs.clear();
-
         for run in runs.iter() {
-            let decoration_changed = if let Some(last_run) = last_run
-                && last_run.color == run.color
-                && last_run.underline == run.underline
-                && last_run.strikethrough == run.strikethrough
-            // we do not consider differing background color relevant, as it does not affect glyphs
-            // && last_run.background_color == run.background_color
+            let font_id = self.resolve_font(&run.font);
+            if let Some(last_run) = font_runs.last_mut()
+                && last_run.font_id == font_id
             {
-                false
-            } else {
-                last_run = Some(run);
-                true
-            };
-
-            if let Some(font_run) = font_runs.last_mut()
-                && Some(font_run.font_id) == last_font
-                && !decoration_changed
-            {
-                font_run.len += run.len;
-            } else {
-                let font_id = self.resolve_font(&run.font);
-                last_font = Some(font_id);
-                font_runs.push(FontRun {
-                    len: run.len,
-                    font_id,
-                });
+                last_run.len += run.len;
+                continue;
             }
+            font_runs.push(FontRun {
+                len: run.len,
+                font_id,
+            });
         }
 
-        let layout = self.line_layout_cache.layout_line(
-            &SharedString::new(text),
-            font_size,
-            &font_runs,
-            force_width,
-        );
+        let layout =
+            self.line_layout_cache
+                .layout_line_internal(text, font_size, &font_runs, force_width);
 
+        font_runs.clear();
         self.font_runs_pool.lock().push(font_runs);
 
         layout
diff --git a/crates/gpui/src/text_system/line_layout.rs b/crates/gpui/src/text_system/line_layout.rs
index 4ac1d25897..43694702a8 100644
--- a/crates/gpui/src/text_system/line_layout.rs
+++ b/crates/gpui/src/text_system/line_layout.rs
@@ -501,7 +501,7 @@ impl LineLayoutCache {
         } else {
             drop(current_frame);
             let text = SharedString::from(text);
-            let unwrapped_layout = self.layout_line::<&SharedString>(&text, font_size, runs, None);
+            let unwrapped_layout = self.layout_line::<&SharedString>(&text, font_size, runs);
             let wrap_boundaries = if let Some(wrap_width) = wrap_width {
                 unwrapped_layout.compute_wrap_boundaries(text.as_ref(), wrap_width, max_lines)
             } else {
@@ -535,6 +535,19 @@ impl LineLayoutCache {
         text: Text,
         font_size: Pixels,
         runs: &[FontRun],
+    ) -> Arc<LineLayout>
+    where
+        Text: AsRef<str>,
+        SharedString: From<Text>,
+    {
+        self.layout_line_internal(text, font_size, runs, None)
+    }
+
+    pub fn layout_line_internal<Text>(
+        &self,
+        text: Text,
+        font_size: Pixels,
+        runs: &[FontRun],
         force_width: Option<Pixels>,
     ) -> Arc<LineLayout>
     where

From a02616374604492fe884ae456139adfab7a44865 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 2 Sep 2025 13:26:56 -0300
Subject: [PATCH 527/823] inline assistant: Adjust completion menu item font
 size (#37375)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now the @ completion menu items font size respect/match the buffer's
font size, as opposed to being rendered a bit bigger.

| Before | After |
|--------|--------|
| <img width="1226" height="468" alt="Screenshot 2025-09-02 at 11 
09@2x"
src="https://github.com/user-attachments/assets/a6d37110-b544-40c3-bf7a-447ea003d4d7"
/> | <img width="1218" height="462" alt="Screenshot 2025-09-02 at 11  09
2@2x"
src="https://github.com/user-attachments/assets/19e58bf8-2db5-442e-8f60-02dd9ee1308f"
/> |

Release Notes:

- inline assistant: Improved @-mention menu item font size, better
matching the buffer's font size.
---
 crates/agent_ui/src/inline_prompt_editor.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index 3abefac8e8..d268c2f211 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -93,8 +93,8 @@ impl<T: 'static> Render for PromptEditor<T> {
         };
 
         let bottom_padding = match &self.mode {
-            PromptEditorMode::Buffer { .. } => Pixels::from(0.),
-            PromptEditorMode::Terminal { .. } => Pixels::from(8.0),
+            PromptEditorMode::Buffer { .. } => rems_from_px(2.0),
+            PromptEditorMode::Terminal { .. } => rems_from_px(8.0),
         };
 
         buttons.extend(self.render_buttons(window, cx));
@@ -762,20 +762,22 @@ impl<T: 'static> PromptEditor<T> {
         )
     }
 
-    fn render_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        let font_size = TextSize::Default.rems(cx);
-        let line_height = font_size.to_pixels(window.rem_size()) * 1.3;
+    fn render_editor(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
+        let colors = cx.theme().colors();
 
         div()
             .key_context("InlineAssistEditor")
             .size_full()
             .p_2()
             .pl_1()
-            .bg(cx.theme().colors().editor_background)
+            .bg(colors.editor_background)
             .child({
                 let settings = ThemeSettings::get_global(cx);
+                let font_size = settings.buffer_font_size(cx);
+                let line_height = font_size * 1.2;
+
                 let text_style = TextStyle {
-                    color: cx.theme().colors().editor_foreground,
+                    color: colors.editor_foreground,
                     font_family: settings.buffer_font.family.clone(),
                     font_features: settings.buffer_font.features.clone(),
                     font_size: font_size.into(),
@@ -786,7 +788,7 @@ impl<T: 'static> PromptEditor<T> {
                 EditorElement::new(
                     &self.editor,
                     EditorStyle {
-                        background: cx.theme().colors().editor_background,
+                        background: colors.editor_background,
                         local_player: cx.theme().players().local(),
                         text: text_style,
                         ..Default::default()

From d2318be8d9600ab3f232f3dc582516bf35cfc747 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 2 Sep 2025 13:27:06 -0300
Subject: [PATCH 528/823] terminal view: Hide inline assist button if AI is
 disabled (#37378)

Closes https://github.com/zed-industries/zed/issues/37372

Release Notes:

- Fix the terminal inline assistant button showing despite `disable_ai`
being turned on.

---------

Co-authored-by: MrSubidubi <finn@zed.dev>
---
 crates/agent_ui/src/inline_assistant.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 13f1234b4d..7beb2f8ff8 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -144,7 +144,8 @@ impl InlineAssistant {
             let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
                 return;
             };
-            let enabled = AgentSettings::get_global(cx).enabled;
+            let enabled = !DisableAiSettings::get_global(cx).disable_ai
+                && AgentSettings::get_global(cx).enabled;
             terminal_panel.update(cx, |terminal_panel, cx| {
                 terminal_panel.set_assistant_enabled(enabled, cx)
             });

From ac8c653ae6d784bc2395f8ec3a0674fba5d770a8 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 2 Sep 2025 12:28:07 -0400
Subject: [PATCH 529/823] Fix race condition between feature flag and
 deserialization (#37381)

Right now if you open Zed, and we deserialize an agent that's behind a
feature flag (e.g. CC), we don't restore it because the feature flag
check hasn't happened yet at the time we're deserializing (due to auth
not having finished yet).

This is a simple fix: assume that if you had serialized it in the first
place, you must have had the feature flag enabled, so go ahead and
reopen it for you.

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index fac880b783..c80ddb5c92 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1911,13 +1911,17 @@ impl AgentPanel {
             AgentType::Gemini => {
                 self.external_thread(Some(crate::ExternalAgent::Gemini), None, None, window, cx)
             }
-            AgentType::ClaudeCode => self.external_thread(
-                Some(crate::ExternalAgent::ClaudeCode),
-                None,
-                None,
-                window,
-                cx,
-            ),
+            AgentType::ClaudeCode => {
+                self.selected_agent = AgentType::ClaudeCode;
+                self.serialize(cx);
+                self.external_thread(
+                    Some(crate::ExternalAgent::ClaudeCode),
+                    None,
+                    None,
+                    window,
+                    cx,
+                )
+            }
             AgentType::Custom { name, command } => self.external_thread(
                 Some(crate::ExternalAgent::Custom { name, command }),
                 None,

From dfa066dfe8fc63fe9070756a1b3c02442835fe0c Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 2 Sep 2025 13:39:55 -0300
Subject: [PATCH 530/823] acp: Display slash command hints (#37376)

Displays the slash command's argument hint while it hasn't been
provided:


https://github.com/user-attachments/assets/f3bb148c-247d-43bc-810d-92055a313514


Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 .../agent_ui/src/acp/completion_provider.rs   |  10 +-
 crates/agent_ui/src/acp/message_editor.rs     | 123 ++++++++++++++++--
 crates/project/src/project.rs                 |   1 -
 3 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 59106c3795..dc38c65868 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1005,14 +1005,14 @@ impl ContextCompletion {
 }
 
 #[derive(Debug, Default, PartialEq)]
-struct SlashCommandCompletion {
-    source_range: Range<usize>,
-    command: Option<String>,
-    argument: Option<String>,
+pub struct SlashCommandCompletion {
+    pub source_range: Range<usize>,
+    pub command: Option<String>,
+    pub argument: Option<String>,
 }
 
 impl SlashCommandCompletion {
-    fn try_parse(line: &str, offset_to_line: usize) -> Option<Self> {
+    pub fn try_parse(line: &str, offset_to_line: usize) -> Option<Self> {
         // If we decide to support commands that are not at the beginning of the prompt, we can remove this check
         if !line.starts_with('/') || offset_to_line != 0 {
             return None;
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index b51bc2e0a3..3350374aa5 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -1,5 +1,5 @@
 use crate::{
-    acp::completion_provider::ContextPickerCompletionProvider,
+    acp::completion_provider::{ContextPickerCompletionProvider, SlashCommandCompletion},
     context_picker::{ContextPickerAction, fetch_context_picker::fetch_url_content},
 };
 use acp_thread::{MentionUri, selection_name};
@@ -11,10 +11,10 @@ use assistant_slash_commands::codeblock_fence_for_path;
 use collections::{HashMap, HashSet};
 use editor::{
     Addon, Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorEvent, EditorMode, EditorSnapshot, EditorStyle, ExcerptId, FoldPlaceholder, MultiBuffer,
-    ToOffset,
+    EditorEvent, EditorMode, EditorSnapshot, EditorStyle, ExcerptId, FoldPlaceholder, InlayId,
+    MultiBuffer, ToOffset,
     actions::Paste,
-    display_map::{Crease, CreaseId, FoldId},
+    display_map::{Crease, CreaseId, FoldId, Inlay},
 };
 use futures::{
     FutureExt as _,
@@ -25,10 +25,12 @@ use gpui::{
     EventEmitter, FocusHandle, Focusable, Image, ImageFormat, Img, KeyContext, Subscription, Task,
     TextStyle, WeakEntity, pulsating_between,
 };
-use language::{Buffer, Language};
+use language::{Buffer, Language, language_settings::InlayHintKind};
 use language_model::LanguageModelImage;
 use postage::stream::Stream as _;
-use project::{CompletionIntent, Project, ProjectItem, ProjectPath, Worktree};
+use project::{
+    CompletionIntent, InlayHint, InlayHintLabel, Project, ProjectItem, ProjectPath, Worktree,
+};
 use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::Settings;
@@ -62,6 +64,7 @@ pub struct MessageEditor {
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
     prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     _subscriptions: Vec<Subscription>,
     _parse_slash_command_task: Task<()>,
 }
@@ -76,6 +79,8 @@ pub enum MessageEditorEvent {
 
 impl EventEmitter<MessageEditorEvent> for MessageEditor {}
 
+const COMMAND_HINT_INLAY_ID: usize = 0;
+
 impl MessageEditor {
     pub fn new(
         workspace: WeakEntity<Workspace>,
@@ -102,7 +107,7 @@ impl MessageEditor {
             history_store.clone(),
             prompt_store.clone(),
             prompt_capabilities.clone(),
-            available_commands,
+            available_commands.clone(),
         ));
         let mention_set = MentionSet::default();
         let editor = cx.new(|cx| {
@@ -133,12 +138,33 @@ impl MessageEditor {
         })
         .detach();
 
+        let mut has_hint = false;
         let mut subscriptions = Vec::new();
+
         subscriptions.push(cx.subscribe_in(&editor, window, {
             move |this, editor, event, window, cx| {
                 if let EditorEvent::Edited { .. } = event {
-                    let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
+                    let snapshot = editor.update(cx, |editor, cx| {
+                        let new_hints = this
+                            .command_hint(editor.buffer(), cx)
+                            .into_iter()
+                            .collect::<Vec<_>>();
+                        let has_new_hint = !new_hints.is_empty();
+                        editor.splice_inlays(
+                            if has_hint {
+                                &[InlayId::Hint(COMMAND_HINT_INLAY_ID)]
+                            } else {
+                                &[]
+                            },
+                            new_hints,
+                            cx,
+                        );
+                        has_hint = has_new_hint;
+
+                        editor.snapshot(window, cx)
+                    });
                     this.mention_set.remove_invalid(snapshot);
+
                     cx.notify();
                 }
             }
@@ -152,11 +178,55 @@ impl MessageEditor {
             history_store,
             prompt_store,
             prompt_capabilities,
+            available_commands,
             _subscriptions: subscriptions,
             _parse_slash_command_task: Task::ready(()),
         }
     }
 
+    fn command_hint(&self, buffer: &Entity<MultiBuffer>, cx: &App) -> Option<Inlay> {
+        let available_commands = self.available_commands.borrow();
+        if available_commands.is_empty() {
+            return None;
+        }
+
+        let snapshot = buffer.read(cx).snapshot(cx);
+        let parsed_command = SlashCommandCompletion::try_parse(&snapshot.text(), 0)?;
+        if parsed_command.argument.is_some() {
+            return None;
+        }
+
+        let command_name = parsed_command.command?;
+        let available_command = available_commands
+            .iter()
+            .find(|command| command.name == command_name)?;
+
+        let acp::AvailableCommandInput::Unstructured { mut hint } =
+            available_command.input.clone()?;
+
+        let mut hint_pos = parsed_command.source_range.end + 1;
+        if hint_pos > snapshot.len() {
+            hint_pos = snapshot.len();
+            hint.insert(0, ' ');
+        }
+
+        let hint_pos = snapshot.anchor_after(hint_pos);
+
+        Some(Inlay::hint(
+            COMMAND_HINT_INLAY_ID,
+            hint_pos,
+            &InlayHint {
+                position: hint_pos.text_anchor,
+                label: InlayHintLabel::String(hint),
+                kind: Some(InlayHintKind::Parameter),
+                padding_left: false,
+                padding_right: false,
+                tooltip: None,
+                resolve_state: project::ResolveState::Resolved,
+            },
+        ))
+    }
+
     pub fn insert_thread_summary(
         &mut self,
         thread: agent2::DbThreadMetadata,
@@ -1184,6 +1254,7 @@ impl Render for MessageEditor {
                         local_player: cx.theme().players().local(),
                         text: text_style,
                         syntax: cx.theme().syntax().clone(),
+                        inlay_hints_style: editor::make_inlay_hints_style(cx),
                         ..Default::default()
                     },
                 )
@@ -1639,7 +1710,7 @@ mod tests {
                 name: "say-hello".to_string(),
                 description: "Say hello to whoever you want".to_string(),
                 input: Some(acp::AvailableCommandInput::Unstructured {
-                    hint: "Who do you want to say hello to?".to_string(),
+                    hint: "<name>".to_string(),
                 }),
             },
         ]));
@@ -1714,7 +1785,7 @@ mod tests {
         cx.run_until_parked();
 
         editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/quick-math ");
+            assert_eq!(editor.display_text(cx), "/quick-math ");
             assert!(!editor.has_visible_completions_menu());
             editor.set_text("", window, cx);
         });
@@ -1722,7 +1793,7 @@ mod tests {
         cx.simulate_input("/say");
 
         editor.update_in(&mut cx, |editor, _window, cx| {
-            assert_eq!(editor.text(cx), "/say");
+            assert_eq!(editor.display_text(cx), "/say");
             assert!(editor.has_visible_completions_menu());
 
             assert_eq!(
@@ -1740,6 +1811,7 @@ mod tests {
 
         editor.update_in(&mut cx, |editor, _window, cx| {
             assert_eq!(editor.text(cx), "/say-hello ");
+            assert_eq!(editor.display_text(cx), "/say-hello <name>");
             assert!(editor.has_visible_completions_menu());
 
             assert_eq!(
@@ -1757,8 +1829,35 @@ mod tests {
 
         cx.run_until_parked();
 
-        editor.update_in(&mut cx, |editor, _window, cx| {
+        editor.update_in(&mut cx, |editor, window, cx| {
             assert_eq!(editor.text(cx), "/say-hello GPT5");
+            assert_eq!(editor.display_text(cx), "/say-hello GPT5");
+            assert!(!editor.has_visible_completions_menu());
+
+            // Delete argument
+            for _ in 0..4 {
+                editor.backspace(&editor::actions::Backspace, window, cx);
+            }
+        });
+
+        cx.run_until_parked();
+
+        editor.update_in(&mut cx, |editor, window, cx| {
+            assert_eq!(editor.text(cx), "/say-hello ");
+            // Hint is visible because argument was deleted
+            assert_eq!(editor.display_text(cx), "/say-hello <name>");
+
+            // Delete last command letter
+            editor.backspace(&editor::actions::Backspace, window, cx);
+            editor.backspace(&editor::actions::Backspace, window, cx);
+        });
+
+        cx.run_until_parked();
+
+        editor.update_in(&mut cx, |editor, _window, cx| {
+            // Hint goes away once command no longer matches an available one
+            assert_eq!(editor.text(cx), "/say-hell");
+            assert_eq!(editor.display_text(cx), "/say-hell");
             assert!(!editor.has_visible_completions_menu());
         });
     }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 557367edf5..229249d48c 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -666,7 +666,6 @@ pub enum ResolveState {
     CanResolve(LanguageServerId, Option<lsp::LSPAny>),
     Resolving,
 }
-
 impl InlayHint {
     pub fn text(&self) -> Rope {
         match &self.label {

From c01f12b15d264d1836db276a6ab7c15b75c921de Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Tue, 2 Sep 2025 11:23:35 -0600
Subject: [PATCH 531/823] zeta: Small refactoring in license detection check -
 rfind instead of iterated ends_with (#37329)

Release Notes:

- N/A
---
 crates/zeta/src/license_detection.rs | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index 2939f8a0c4..5f207a44e8 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -202,20 +202,13 @@ fn check_pattern(pattern: &[PatternPart], input: &str) -> bool {
             match_any_chars.end += part.match_any_chars.end;
             continue;
         }
-        let mut matched = false;
-        for skip_count in match_any_chars.start..=match_any_chars.end {
-            let end_ix = input_ix.saturating_sub(skip_count);
-            if end_ix < part.text.len() {
-                break;
-            }
-            if input[..end_ix].ends_with(&part.text) {
-                matched = true;
-                input_ix = end_ix - part.text.len();
-                match_any_chars = part.match_any_chars.clone();
-                break;
-            }
-        }
-        if !matched && !part.optional {
+        let search_range_start = input_ix.saturating_sub(match_any_chars.end + part.text.len());
+        let search_range_end = input_ix.saturating_sub(match_any_chars.start);
+        let found_ix = &input[search_range_start..search_range_end].rfind(&part.text);
+        if let Some(found_ix) = found_ix {
+            input_ix = search_range_start + found_ix;
+            match_any_chars = part.match_any_chars.clone();
+        } else if !part.optional {
             log::trace!(
                 "Failed to match pattern `...{}` against input `...{}`",
                 &part.text[part.text.len().saturating_sub(128)..],

From 5ac6ae501f21e6700b062d1513d0e59e1a29079e Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 2 Sep 2025 13:57:48 -0400
Subject: [PATCH 532/823] docs: Link glossary (#37387)

Follow-up to: https://github.com/zed-industries/zed/pull/37360

Add glossary.md to SUMMARY.md so it's linked to the public
documentation.

Release Notes:

- N/A
---
 docs/src/SUMMARY.md              |  1 +
 docs/src/development/glossary.md | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 9d07881914..a470018b2c 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -157,5 +157,6 @@
   - [FreeBSD](./development/freebsd.md)
   - [Local Collaboration](./development/local-collaboration.md)
   - [Using Debuggers](./development/debuggers.md)
+  - [Glossary](./development/glossary.md)
 - [Release Process](./development/releases.md)
 - [Debugging Crashes](./development/debugging-crashes.md)
diff --git a/docs/src/development/glossary.md b/docs/src/development/glossary.md
index 08bc9f0e91..d0ae12fe03 100644
--- a/docs/src/development/glossary.md
+++ b/docs/src/development/glossary.md
@@ -1,9 +1,17 @@
-These are some terms and structures frequently used throughout the zed codebase. This is a best effort list.
+# Zed Development: Glossary
+
+These are some terms and structures frequently used throughout the zed codebase.
+
+This is a best effort list and a work in progress.
+
+<!--
+TBD: Glossary Improvement
 
 Questions:
 
 - Can we generate this list from doc comments throughout zed?
 - We should have a section that shows the various UI parts and their names. (Can't do that in the channel.)
+-->
 
 ## Naming conventions
 

From 4c411b9fc825a6a6d5eb6267b6379d6d613a48c9 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Tue, 2 Sep 2025 23:59:07 +0530
Subject: [PATCH 533/823] language_models: Make `JsonSchemaSubset` the default
 `tool_input_format` for the OpenAI-compatible provider (#34921)

Closes #30188
Closes #34911
Closes #34906

Many OpenAI-compatible providers do not automatically filter the tool
schema to comply with the underlying model's requirements; they simply
proxy the request. This creates issues, as models like **Gemini**,
**Grok**, and **Claude** (when accessed via LiteLLM on Bedrock) are
incompatible with Zed's default tool schema.

This PR addresses this by defaulting to a more compatible schema subset
instead of the full schema.

### Why this approach?

* **Avoids Poor User Experience:** One alternative was to add an option
for users to manually set the JSON schema for models that return a `400
Bad Request` due to an invalid tool schema. This was discarded as it
provides a poor user experience.
* **Simplifies Complex Logic:** Another option was to filter the schema
based on the model ID. However, as demonstrated in the attached issues,
this is unreliable. For instance, `claude-4-sonnet` fails when proxied
through LiteLLM on Bedrock. Reliably determining behavior would require
a non-trivial implementation to manage provider-and-model combinations.
* **Better Default Behavior:** The current approach ensures that tool
usage works out-of-the-box for the majority of cases by default,
providing the most robust and user-friendly solution.


Release Notes:

- Improved tool compatibility with OpenAI API-compatible providers

Signed-off-by: Umesh Yadav <git@umesh.dev>
Co-authored-by: Peter Tripp <peter@zed.dev>
---
 crates/language_models/src/provider/open_ai_compatible.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index 55df534cc9..789eb00a57 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -9,7 +9,7 @@ use language_model::{
     AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
     LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
     LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, RateLimiter,
+    LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter,
 };
 use menu;
 use open_ai::{ResponseStreamEvent, stream_completion};
@@ -322,6 +322,10 @@ impl LanguageModel for OpenAiCompatibleLanguageModel {
         self.model.capabilities.tools
     }
 
+    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
+        LanguageModelToolSchemaFormat::JsonSchemaSubset
+    }
+
     fn supports_images(&self) -> bool {
         self.model.capabilities.images
     }

From 88a79750ccf26691aa666b2369679ed9ce198d56 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 2 Sep 2025 13:53:53 -0600
Subject: [PATCH 534/823] Disable external agents over collab (#37377)

Release Notes:

- Disable UI to boot external agents in collab projects (as they don't
work)
---
 Cargo.toml                             |  3 +++
 crates/agent_ui/src/acp/thread_view.rs |  9 ++++++-
 crates/agent_ui/src/agent_panel.rs     | 35 ++++++++++++++++++--------
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a96dc5d4d5..2c8143756b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -848,6 +848,9 @@ too_many_arguments = "allow"
 # We often have large enum variants yet we rarely actually bother with splitting them up.
 large_enum_variant = "allow"
 
+# Boolean expressions can be hard to read, requiring only the minimal form gets in the way
+nonminimal_bol = "allow"
+
 [workspace.metadata.cargo-machete]
 ignored = [
     "bindgen",
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index a9421723d1..c60710eaee 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -8,7 +8,7 @@ use action_log::ActionLog;
 use agent_client_protocol::{self as acp, PromptCapabilities};
 use agent_servers::{AgentServer, AgentServerDelegate, ClaudeCode};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
-use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore};
+use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
 use anyhow::{Context as _, Result, anyhow, bail};
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
@@ -418,6 +418,13 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> ThreadState {
+        if project.read(cx).is_via_collab()
+            && agent.clone().downcast::<NativeAgentServer>().is_none()
+        {
+            return ThreadState::LoadError(LoadError::Other(
+                "External agents are not yet supported for remote projects.".into(),
+            ));
+        }
         let root_dir = project
             .read(cx)
             .visible_worktrees(cx)
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index c80ddb5c92..3da63c281e 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1091,6 +1091,7 @@ impl AgentPanel {
         let workspace = self.workspace.clone();
         let project = self.project.clone();
         let fs = self.fs.clone();
+        let is_via_collab = self.project.read(cx).is_via_collab();
 
         const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
 
@@ -1122,17 +1123,21 @@ impl AgentPanel {
                     agent
                 }
                 None => {
-                    cx.background_spawn(async move {
-                        KEY_VALUE_STORE.read_kvp(LAST_USED_EXTERNAL_AGENT_KEY)
-                    })
-                    .await
-                    .log_err()
-                    .flatten()
-                    .and_then(|value| {
-                        serde_json::from_str::<LastUsedExternalAgent>(&value).log_err()
-                    })
-                    .unwrap_or_default()
-                    .agent
+                    if is_via_collab {
+                        ExternalAgent::NativeAgent
+                    } else {
+                        cx.background_spawn(async move {
+                            KEY_VALUE_STORE.read_kvp(LAST_USED_EXTERNAL_AGENT_KEY)
+                        })
+                        .await
+                        .log_err()
+                        .flatten()
+                        .and_then(|value| {
+                            serde_json::from_str::<LastUsedExternalAgent>(&value).log_err()
+                        })
+                        .unwrap_or_default()
+                        .agent
+                    }
                 }
             };
 
@@ -2527,6 +2532,11 @@ impl AgentPanel {
             .with_handle(self.new_thread_menu_handle.clone())
             .menu({
                 let workspace = self.workspace.clone();
+                let is_via_collab = workspace
+                    .update(cx, |workspace, cx| {
+                        workspace.project().read(cx).is_via_collab()
+                    })
+                    .unwrap_or_default();
 
                 move |window, cx| {
                     telemetry::event!("New Thread Clicked");
@@ -2617,6 +2627,7 @@ impl AgentPanel {
                                     ContextMenuEntry::new("New Gemini CLI Thread")
                                         .icon(IconName::AiGemini)
                                         .icon_color(Color::Muted)
+                                        .disabled(is_via_collab)
                                         .handler({
                                             let workspace = workspace.clone();
                                             move |window, cx| {
@@ -2643,6 +2654,7 @@ impl AgentPanel {
                                 menu.item(
                                     ContextMenuEntry::new("New Claude Code Thread")
                                         .icon(IconName::AiClaude)
+                                        .disabled(is_via_collab)
                                         .icon_color(Color::Muted)
                                         .handler({
                                             let workspace = workspace.clone();
@@ -2675,6 +2687,7 @@ impl AgentPanel {
                                         ContextMenuEntry::new(format!("New {} Thread", agent_name))
                                             .icon(IconName::Terminal)
                                             .icon_color(Color::Muted)
+                                            .disabled(is_via_collab)
                                             .handler({
                                                 let workspace = workspace.clone();
                                                 let agent_name = agent_name.clone();

From 5e01fb8f1c47099149d0009997ad8026affba8d8 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 2 Sep 2025 16:39:24 -0400
Subject: [PATCH 535/823] Nice errors for unsupported ACP slash commands
 (#37393)

If we get back slash-commands that aren't supported, tell the user that
this is the problem.

Release Notes:

- Improve error messages for unsupported ACP slash-commands

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/agent_ui/src/acp/entry_view_state.rs |   7 +-
 crates/agent_ui/src/acp/message_editor.rs   | 198 +++++++++++++++++++-
 crates/agent_ui/src/acp/thread_view.rs      |  57 +++++-
 3 files changed, 251 insertions(+), 11 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 4a91e93fa8..e60b923ca7 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -11,7 +11,7 @@ use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
     AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    ScrollHandle, TextStyleRefinement, WeakEntity, Window,
+    ScrollHandle, SharedString, TextStyleRefinement, WeakEntity, Window,
 };
 use language::language_settings::SoftWrap;
 use project::Project;
@@ -32,6 +32,7 @@ pub struct EntryViewState {
     entries: Vec<Entry>,
     prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
+    agent_name: SharedString,
 }
 
 impl EntryViewState {
@@ -42,6 +43,7 @@ impl EntryViewState {
         prompt_store: Option<Entity<PromptStore>>,
         prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
         available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
+        agent_name: SharedString,
     ) -> Self {
         Self {
             workspace,
@@ -51,6 +53,7 @@ impl EntryViewState {
             entries: Vec::new(),
             prompt_capabilities,
             available_commands,
+            agent_name,
         }
     }
 
@@ -90,6 +93,7 @@ impl EntryViewState {
                             self.prompt_store.clone(),
                             self.prompt_capabilities.clone(),
                             self.available_commands.clone(),
+                            self.agent_name.clone(),
                             "Edit message － @ to include context",
                             editor::EditorMode::AutoHeight {
                                 min_lines: 1,
@@ -476,6 +480,7 @@ mod tests {
                 None,
                 Default::default(),
                 Default::default(),
+                "Test Agent".into(),
             )
         });
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 3350374aa5..ebe0e5c1c6 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -22,8 +22,8 @@ use futures::{
 };
 use gpui::{
     Animation, AnimationExt as _, AppContext, ClipboardEntry, Context, Entity, EntityId,
-    EventEmitter, FocusHandle, Focusable, Image, ImageFormat, Img, KeyContext, Subscription, Task,
-    TextStyle, WeakEntity, pulsating_between,
+    EventEmitter, FocusHandle, Focusable, Image, ImageFormat, Img, KeyContext, SharedString,
+    Subscription, Task, TextStyle, WeakEntity, pulsating_between,
 };
 use language::{Buffer, Language, language_settings::InlayHintKind};
 use language_model::LanguageModelImage;
@@ -49,8 +49,8 @@ use theme::ThemeSettings;
 use ui::{
     ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, ButtonStyle, Color, Element as _,
     FluentBuilder as _, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
-    LabelCommon, LabelSize, ParentElement, Render, SelectableButton, SharedString, Styled,
-    TextSize, TintColor, Toggleable, Window, div, h_flex,
+    LabelCommon, LabelSize, ParentElement, Render, SelectableButton, Styled, TextSize, TintColor,
+    Toggleable, Window, div, h_flex,
 };
 use util::{ResultExt, debug_panic};
 use workspace::{Workspace, notifications::NotifyResultExt as _};
@@ -65,6 +65,7 @@ pub struct MessageEditor {
     prompt_store: Option<Entity<PromptStore>>,
     prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
+    agent_name: SharedString,
     _subscriptions: Vec<Subscription>,
     _parse_slash_command_task: Task<()>,
 }
@@ -89,6 +90,7 @@ impl MessageEditor {
         prompt_store: Option<Entity<PromptStore>>,
         prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
         available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
+        agent_name: SharedString,
         placeholder: impl Into<Arc<str>>,
         mode: EditorMode,
         window: &mut Window,
@@ -179,6 +181,7 @@ impl MessageEditor {
             prompt_store,
             prompt_capabilities,
             available_commands,
+            agent_name,
             _subscriptions: subscriptions,
             _parse_slash_command_task: Task::ready(()),
         }
@@ -731,10 +734,52 @@ impl MessageEditor {
         })
     }
 
+    fn validate_slash_commands(
+        text: &str,
+        available_commands: &[acp::AvailableCommand],
+        agent_name: &str,
+    ) -> Result<()> {
+        if let Some(parsed_command) = SlashCommandCompletion::try_parse(text, 0) {
+            if let Some(command_name) = parsed_command.command {
+                // Check if this command is in the list of available commands from the server
+                let is_supported = available_commands
+                    .iter()
+                    .any(|cmd| cmd.name == command_name);
+
+                if !is_supported {
+                    return Err(anyhow!(
+                        "The /{} command is not supported by {}.\n\nAvailable commands: {}",
+                        command_name,
+                        agent_name,
+                        if available_commands.is_empty() {
+                            "none".to_string()
+                        } else {
+                            available_commands
+                                .iter()
+                                .map(|cmd| format!("/{}", cmd.name))
+                                .collect::<Vec<_>>()
+                                .join(", ")
+                        }
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+
     pub fn contents(
         &self,
         cx: &mut Context<Self>,
     ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
+        // Check for unsupported slash commands before spawning async task
+        let text = self.editor.read(cx).text(cx);
+        let available_commands = self.available_commands.borrow().clone();
+        if let Err(err) =
+            Self::validate_slash_commands(&text, &available_commands, &self.agent_name)
+        {
+            return Task::ready(Err(err));
+        }
+
         let contents = self
             .mention_set
             .contents(&self.prompt_capabilities.get(), cx);
@@ -744,7 +789,7 @@ impl MessageEditor {
             let contents = contents.await?;
             let mut all_tracked_buffers = Vec::new();
 
-            editor.update(cx, |editor, cx| {
+            let result = editor.update(cx, |editor, cx| {
                 let mut ix = 0;
                 let mut chunks: Vec<acp::ContentBlock> = Vec::new();
                 let text = editor.text(cx);
@@ -837,9 +882,9 @@ impl MessageEditor {
                         }
                     }
                 });
-
-                (chunks, all_tracked_buffers)
-            })
+                Ok((chunks, all_tracked_buffers))
+            })?;
+            result
         })
     }
 
@@ -1573,6 +1618,7 @@ mod tests {
                     None,
                     Default::default(),
                     Default::default(),
+                    "Test Agent".into(),
                     "Test",
                     EditorMode::AutoHeight {
                         min_lines: 1,
@@ -1650,6 +1696,140 @@ mod tests {
         pretty_assertions::assert_matches!(content.as_slice(), [acp::ContentBlock::Text { .. }]);
     }
 
+    #[gpui::test]
+    async fn test_slash_command_validation(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/test",
+            json!({
+                ".zed": {
+                    "tasks.json": r#"[{"label": "test", "command": "echo"}]"#
+                },
+                "src": {
+                    "main.rs": "fn main() {}",
+                },
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
+        let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
+        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
+        // Start with no available commands - simulating Claude which doesn't support slash commands
+        let available_commands = Rc::new(RefCell::new(vec![]));
+
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+        let workspace_handle = workspace.downgrade();
+        let message_editor = workspace.update_in(cx, |_, window, cx| {
+            cx.new(|cx| {
+                MessageEditor::new(
+                    workspace_handle.clone(),
+                    project.clone(),
+                    history_store.clone(),
+                    None,
+                    prompt_capabilities.clone(),
+                    available_commands.clone(),
+                    "Claude Code".into(),
+                    "Test",
+                    EditorMode::AutoHeight {
+                        min_lines: 1,
+                        max_lines: None,
+                    },
+                    window,
+                    cx,
+                )
+            })
+        });
+        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
+
+        // Test that slash commands fail when no available_commands are set (empty list means no commands supported)
+        editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("/file test.txt", window, cx);
+        });
+
+        let contents_result = message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
+            .await;
+
+        // Should fail because available_commands is empty (no commands supported)
+        assert!(contents_result.is_err());
+        let error_message = contents_result.unwrap_err().to_string();
+        assert!(error_message.contains("not supported by Claude Code"));
+        assert!(error_message.contains("Available commands: none"));
+
+        // Now simulate Claude providing its list of available commands (which doesn't include file)
+        available_commands.replace(vec![acp::AvailableCommand {
+            name: "help".to_string(),
+            description: "Get help".to_string(),
+            input: None,
+        }]);
+
+        // Test that unsupported slash commands trigger an error when we have a list of available commands
+        editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("/file test.txt", window, cx);
+        });
+
+        let contents_result = message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
+            .await;
+
+        assert!(contents_result.is_err());
+        let error_message = contents_result.unwrap_err().to_string();
+        assert!(error_message.contains("not supported by Claude Code"));
+        assert!(error_message.contains("/file"));
+        assert!(error_message.contains("Available commands: /help"));
+
+        // Test that supported commands work fine
+        editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("/help", window, cx);
+        });
+
+        let contents_result = message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
+            .await;
+
+        // Should succeed because /help is in available_commands
+        assert!(contents_result.is_ok());
+
+        // Test that regular text works fine
+        editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Hello Claude!", window, cx);
+        });
+
+        let (content, _) = message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
+            .await
+            .unwrap();
+
+        assert_eq!(content.len(), 1);
+        if let acp::ContentBlock::Text(text) = &content[0] {
+            assert_eq!(text.text, "Hello Claude!");
+        } else {
+            panic!("Expected ContentBlock::Text");
+        }
+
+        // Test that @ mentions still work
+        editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Check this @", window, cx);
+        });
+
+        // The @ mention functionality should not be affected
+        let (content, _) = message_editor
+            .update(cx, |message_editor, cx| message_editor.contents(cx))
+            .await
+            .unwrap();
+
+        assert_eq!(content.len(), 1);
+        if let acp::ContentBlock::Text(text) = &content[0] {
+            assert_eq!(text.text, "Check this @");
+        } else {
+            panic!("Expected ContentBlock::Text");
+        }
+    }
+
     struct MessageEditorItem(Entity<MessageEditor>);
 
     impl Item for MessageEditorItem {
@@ -1725,6 +1905,7 @@ mod tests {
                     None,
                     prompt_capabilities.clone(),
                     available_commands.clone(),
+                    "Test Agent".into(),
                     "Test",
                     EditorMode::AutoHeight {
                         max_lines: None,
@@ -1957,6 +2138,7 @@ mod tests {
                     None,
                     prompt_capabilities.clone(),
                     Default::default(),
+                    "Test Agent".into(),
                     "Test",
                     EditorMode::AutoHeight {
                         max_lines: None,
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c60710eaee..357a854371 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -342,6 +342,7 @@ impl AcpThreadView {
                 prompt_store.clone(),
                 prompt_capabilities.clone(),
                 available_commands.clone(),
+                agent.name(),
                 placeholder,
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
@@ -366,6 +367,7 @@ impl AcpThreadView {
                 prompt_store.clone(),
                 prompt_capabilities.clone(),
                 available_commands.clone(),
+                agent.name(),
             )
         });
 
@@ -495,8 +497,25 @@ impl AcpThreadView {
                     Ok(thread) => {
                         let action_log = thread.read(cx).action_log().clone();
 
-                        this.available_commands
-                            .replace(thread.read(cx).available_commands());
+                        let mut available_commands = thread.read(cx).available_commands();
+
+                        if connection
+                            .auth_methods()
+                            .iter()
+                            .any(|method| method.id.0.as_ref() == "claude-login")
+                        {
+                            available_commands.push(acp::AvailableCommand {
+                                name: "login".to_owned(),
+                                description: "Authenticate".to_owned(),
+                                input: None,
+                            });
+                            available_commands.push(acp::AvailableCommand {
+                                name: "logout".to_owned(),
+                                description: "Authenticate".to_owned(),
+                                input: None,
+                            });
+                        }
+                        this.available_commands.replace(available_commands);
 
                         this.prompt_capabilities
                             .set(thread.read(cx).prompt_capabilities());
@@ -914,6 +933,40 @@ impl AcpThreadView {
             return;
         }
 
+        let text = self.message_editor.read(cx).text(cx);
+        let text = text.trim();
+        if text == "/login" || text == "/logout" {
+            let ThreadState::Ready { thread, .. } = &self.thread_state else {
+                return;
+            };
+
+            let connection = thread.read(cx).connection().clone();
+            if !connection
+                .auth_methods()
+                .iter()
+                .any(|method| method.id.0.as_ref() == "claude-login")
+            {
+                return;
+            };
+            let this = cx.weak_entity();
+            let agent = self.agent.clone();
+            window.defer(cx, |window, cx| {
+                Self::handle_auth_required(
+                    this,
+                    AuthRequired {
+                        description: None,
+                        provider_id: Some(language_model::ANTHROPIC_PROVIDER_ID),
+                    },
+                    agent,
+                    connection,
+                    window,
+                    cx,
+                );
+            });
+            cx.notify();
+            return;
+        }
+
         let contents = self
             .message_editor
             .update(cx, |message_editor, cx| message_editor.contents(cx));

From 6dcae2711dd7f7aa5813826dfc4aa416fee2abc9 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 3 Sep 2025 03:00:09 +0530
Subject: [PATCH 536/823] terminal: Fix not able to select text during
 continuous output (#37395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #37211

Regressed in https://github.com/zed-industries/zed/pull/33305

Every time the terminal updates, we emit
`SearchEvent::MatchesInvalidated` to trigger a re-run of the buffer
search, which calls `clear_matches` to drop stale results.
https://github.com/zed-industries/zed/pull/33305 PR also cleared the
selection when clearing matches, which caused this issue. We could fix
it by only clearing matches and selection when they’re non-empty, but
it’s better to not clear the selection at all. This matches how the
editor behaves and keeps it consistent. This PR reverts that part of
code.


Release Notes:

- Fixed an issue where text selection was lost during continuous
terminal output.
---
 crates/terminal/src/terminal.rs           | 5 -----
 crates/terminal_view/src/terminal_view.rs | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index c0c663f498..a8b1fcf0f2 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -1141,11 +1141,6 @@ impl Terminal {
         }
     }
 
-    pub fn clear_matches(&mut self) {
-        self.matches.clear();
-        self.set_selection(None);
-    }
-
     pub fn select_matches(&mut self, matches: &[RangeInclusive<AlacPoint>]) {
         let matches_to_select = self
             .matches
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 9e479464af..2548a7c244 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -1523,7 +1523,7 @@ impl SearchableItem for TerminalView {
 
     /// Clear stored matches
     fn clear_matches(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.terminal().update(cx, |term, _| term.clear_matches())
+        self.terminal().update(cx, |term, _| term.matches.clear())
     }
 
     /// Store matches returned from find_matches somewhere for rendering

From 8770fcc841f7e8ffbd8ca126a75f92c86135aa67 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 2 Sep 2025 23:57:29 +0200
Subject: [PATCH 537/823] acp: Enable claude code feature flag for everyone
 (#37390)

Release Notes:

- N/A
---
 crates/feature_flags/src/feature_flags.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index f5f7fc42b3..b9e9f3ae9f 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -108,6 +108,10 @@ pub struct ClaudeCodeFeatureFlag;
 
 impl FeatureFlag for ClaudeCodeFeatureFlag {
     const NAME: &'static str = "claude-code";
+
+    fn enabled_for_all() -> bool {
+        true
+    }
 }
 
 pub trait FeatureFlagViewExt<V: 'static> {

From e4df866664b4efa2adc78eb1a0fe3b6a89ece8d6 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 3 Sep 2025 03:41:10 +0530
Subject: [PATCH 538/823] editor: Do not show edit prediction during
 in-progress IME composition (#37400)

Closes #37249

We no longer show edit prediction when composing IME since it isn't
useful for unfinished alphabet.

Release Notes:

- Fixed edit predictions showing up during partial IME composition.
---
 crates/editor/src/editor.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index d5621e8165..0494eb6c1f 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -7744,6 +7744,11 @@ impl Editor {
             return None;
         }
 
+        if self.ime_transaction.is_some() {
+            self.discard_edit_prediction(false, cx);
+            return None;
+        }
+
         let selection = self.selections.newest_anchor();
         let cursor = selection.head();
         let multibuffer = self.buffer.read(cx).snapshot(cx);

From 7aecab8e14f1abaf6ebb3b4cb3857a53b3fd29e5 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 2 Sep 2025 16:02:36 -0700
Subject: [PATCH 539/823] agent2: Only setup real client for real models
 (#37403)

Before we were setting up lots of test setup regardless of if we were
actually going to be making real requests or not.

This will hopefully help with intermittent test errors we're seeing on
Windows in CI.

Release Notes:

- N/A
---
 crates/agent2/src/tests/mod.rs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 4527cdb056..9132c9a316 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -72,7 +72,6 @@ async fn test_echo(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_thinking(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
@@ -1349,7 +1348,6 @@ async fn test_cancellation(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
@@ -1688,7 +1686,6 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_title_generation(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
     let fake_model = model.as_fake();
@@ -2353,15 +2350,20 @@ async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
         settings::init(cx);
         Project::init_settings(cx);
         agent_settings::init(cx);
-        gpui_tokio::init(cx);
-        let http_client = ReqwestClient::user_agent("agent tests").unwrap();
-        cx.set_http_client(Arc::new(http_client));
 
-        client::init_settings(cx);
-        let client = Client::production(cx);
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        language_model::init(client.clone(), cx);
-        language_models::init(user_store, client.clone(), cx);
+        match model {
+            TestModel::Fake => {}
+            TestModel::Sonnet4 => {
+                gpui_tokio::init(cx);
+                let http_client = ReqwestClient::user_agent("agent tests").unwrap();
+                cx.set_http_client(Arc::new(http_client));
+                client::init_settings(cx);
+                let client = Client::production(cx);
+                let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
+                language_model::init(client.clone(), cx);
+                language_models::init(user_store, client.clone(), cx);
+            }
+        };
 
         watch_settings(fs.clone(), cx);
     });

From e5a968b709feeeac1e12de054645671d64071676 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Wed, 3 Sep 2025 00:03:14 +0100
Subject: [PATCH 540/823] vim: Fix change surround with any brackets text
 object (#37386)

This commit fixes an issue with how the `AnyBrackets` object was handled
with change surrounds (`cs`). With the keymap below, if one was to use
`csb{` with the text `(bracketed)` and the cursor inside the
parentheses, the text would not change.

```json
{
  "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
  "bindings": {
    "b": "vim::AnyBrackets"
  }
}
```

Unfortunately there was no implementation for finding a corresponding
`BracketPair` for the `AnyBrackets` object, meaning that, when using
`cs` (change surrounds) the code would simply do nothing.

This commit updates this logic so as to try and find the nearest
surrounding bracket (parentheses, curly brackets, square brackets or
angle brackets), ensuring that `cs` also works with `AnyBrackets`.

Closes #24439

Release Notes:

- Fixed handling of `AnyBrackets` in vim's change surrounds (`cs`)
---
 crates/vim/src/object.rs    |   2 +-
 crates/vim/src/surrounds.rs | 255 ++++++++++++++++++++++++++----------
 2 files changed, 190 insertions(+), 67 deletions(-)

diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
index 693de9f697..366acb740b 100644
--- a/crates/vim/src/object.rs
+++ b/crates/vim/src/object.rs
@@ -1510,7 +1510,7 @@ pub fn end_of_paragraph(map: &DisplaySnapshot, display_point: DisplayPoint) -> D
     map.max_point()
 }
 
-fn surrounding_markers(
+pub fn surrounding_markers(
     map: &DisplaySnapshot,
     relative_to: DisplayPoint,
     around: bool,
diff --git a/crates/vim/src/surrounds.rs b/crates/vim/src/surrounds.rs
index 83500cf88b..7c36ebe674 100644
--- a/crates/vim/src/surrounds.rs
+++ b/crates/vim/src/surrounds.rs
@@ -1,7 +1,7 @@
 use crate::{
     Vim,
     motion::{self, Motion},
-    object::Object,
+    object::{Object, surrounding_markers},
     state::Mode,
 };
 use editor::{Bias, movement};
@@ -224,7 +224,7 @@ impl Vim {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(will_replace_pair) = object_to_bracket_pair(target) {
+        if let Some(will_replace_pair) = self.object_to_bracket_pair(target, cx) {
             self.stop_recording(cx);
             self.update_editor(cx, |_, editor, cx| {
                 editor.transact(window, cx, |editor, window, cx| {
@@ -358,7 +358,7 @@ impl Vim {
         cx: &mut Context<Self>,
     ) -> bool {
         let mut valid = false;
-        if let Some(pair) = object_to_bracket_pair(object) {
+        if let Some(pair) = self.object_to_bracket_pair(object, cx) {
             self.update_editor(cx, |_, editor, cx| {
                 editor.transact(window, cx, |editor, window, cx| {
                     editor.set_clip_at_line_ends(false, cx);
@@ -405,6 +405,140 @@ impl Vim {
         }
         valid
     }
+
+    fn object_to_bracket_pair(
+        &self,
+        object: Object,
+        cx: &mut Context<Self>,
+    ) -> Option<BracketPair> {
+        match object {
+            Object::Quotes => Some(BracketPair {
+                start: "'".to_string(),
+                end: "'".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::BackQuotes => Some(BracketPair {
+                start: "`".to_string(),
+                end: "`".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::DoubleQuotes => Some(BracketPair {
+                start: "\"".to_string(),
+                end: "\"".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::VerticalBars => Some(BracketPair {
+                start: "|".to_string(),
+                end: "|".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::Parentheses => Some(BracketPair {
+                start: "(".to_string(),
+                end: ")".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::SquareBrackets => Some(BracketPair {
+                start: "[".to_string(),
+                end: "]".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::CurlyBrackets => Some(BracketPair {
+                start: "{".to_string(),
+                end: "}".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::AngleBrackets => Some(BracketPair {
+                start: "<".to_string(),
+                end: ">".to_string(),
+                close: true,
+                surround: true,
+                newline: false,
+            }),
+            Object::AnyBrackets => {
+                // If we're dealing with `AnyBrackets`, which can map to multiple
+                // bracket pairs, we'll need to first determine which `BracketPair` to
+                // target.
+                // As such, we keep track of the smallest range size, so
+                // that in cases like `({ name: "John" })` if the cursor is
+                // inside the curly brackets, we target the curly brackets
+                // instead of the parentheses.
+                let mut bracket_pair = None;
+                let mut min_range_size = usize::MAX;
+
+                let _ = self.editor.update(cx, |editor, cx| {
+                    let (display_map, selections) = editor.selections.all_adjusted_display(cx);
+                    // Even if there's multiple cursors, we'll simply rely on
+                    // the first one to understand what bracket pair to map to.
+                    // I believe we could, if worth it, go one step above and
+                    // have a `BracketPair` per selection, so that `AnyBracket`
+                    // could work in situations where the transformation below
+                    // could be done.
+                    //
+                    // ```
+                    // (< name:ˇ'Zed' >)
+                    // <[ name:ˇ'DeltaDB' ]>
+                    // ```
+                    //
+                    // After using `csb{`:
+                    //
+                    // ```
+                    // (ˇ{ name:'Zed' })
+                    // <ˇ{ name:'DeltaDB' }>
+                    // ```
+                    if let Some(selection) = selections.first() {
+                        let relative_to = selection.head();
+                        let bracket_pairs = [('(', ')'), ('[', ']'), ('{', '}'), ('<', '>')];
+                        let cursor_offset = relative_to.to_offset(&display_map, Bias::Left);
+
+                        for &(open, close) in bracket_pairs.iter() {
+                            if let Some(range) = surrounding_markers(
+                                &display_map,
+                                relative_to,
+                                true,
+                                false,
+                                open,
+                                close,
+                            ) {
+                                let start_offset = range.start.to_offset(&display_map, Bias::Left);
+                                let end_offset = range.end.to_offset(&display_map, Bias::Right);
+
+                                if cursor_offset >= start_offset && cursor_offset <= end_offset {
+                                    let size = end_offset - start_offset;
+                                    if size < min_range_size {
+                                        min_range_size = size;
+                                        bracket_pair = Some(BracketPair {
+                                            start: open.to_string(),
+                                            end: close.to_string(),
+                                            close: true,
+                                            surround: true,
+                                            newline: false,
+                                        })
+                                    }
+                                }
+                            }
+                        }
+                    }
+                });
+
+                bracket_pair
+            }
+            _ => None,
+        }
+    }
 }
 
 fn find_surround_pair<'a>(pairs: &'a [BracketPair], ch: &str) -> Option<&'a BracketPair> {
@@ -505,74 +639,12 @@ fn pair_to_object(pair: &BracketPair) -> Option<Object> {
     }
 }
 
-fn object_to_bracket_pair(object: Object) -> Option<BracketPair> {
-    match object {
-        Object::Quotes => Some(BracketPair {
-            start: "'".to_string(),
-            end: "'".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::BackQuotes => Some(BracketPair {
-            start: "`".to_string(),
-            end: "`".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::DoubleQuotes => Some(BracketPair {
-            start: "\"".to_string(),
-            end: "\"".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::VerticalBars => Some(BracketPair {
-            start: "|".to_string(),
-            end: "|".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::Parentheses => Some(BracketPair {
-            start: "(".to_string(),
-            end: ")".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::SquareBrackets => Some(BracketPair {
-            start: "[".to_string(),
-            end: "]".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::CurlyBrackets => Some(BracketPair {
-            start: "{".to_string(),
-            end: "}".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        Object::AngleBrackets => Some(BracketPair {
-            start: "<".to_string(),
-            end: ">".to_string(),
-            close: true,
-            surround: true,
-            newline: false,
-        }),
-        _ => None,
-    }
-}
-
 #[cfg(test)]
 mod test {
     use gpui::KeyBinding;
     use indoc::indoc;
 
-    use crate::{PushAddSurrounds, state::Mode, test::VimTestContext};
+    use crate::{PushAddSurrounds, object::AnyBrackets, state::Mode, test::VimTestContext};
 
     #[gpui::test]
     async fn test_add_surrounds(cx: &mut gpui::TestAppContext) {
@@ -1171,6 +1243,57 @@ mod test {
         );
     }
 
+    #[gpui::test]
+    async fn test_change_surrounds_any_brackets(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        // Update keybindings so that using `csb` triggers Vim's `AnyBrackets`
+        // action.
+        cx.update(|_, cx| {
+            cx.bind_keys([KeyBinding::new(
+                "b",
+                AnyBrackets,
+                Some("vim_operator == a || vim_operator == i || vim_operator == cs"),
+            )]);
+        });
+
+        cx.set_state(indoc! {"{braˇcketed}"}, Mode::Normal);
+        cx.simulate_keystrokes("c s b [");
+        cx.assert_state(indoc! {"ˇ[ bracketed ]"}, Mode::Normal);
+
+        cx.set_state(indoc! {"[braˇcketed]"}, Mode::Normal);
+        cx.simulate_keystrokes("c s b {");
+        cx.assert_state(indoc! {"ˇ{ bracketed }"}, Mode::Normal);
+
+        cx.set_state(indoc! {"<braˇcketed>"}, Mode::Normal);
+        cx.simulate_keystrokes("c s b [");
+        cx.assert_state(indoc! {"ˇ[ bracketed ]"}, Mode::Normal);
+
+        cx.set_state(indoc! {"(braˇcketed)"}, Mode::Normal);
+        cx.simulate_keystrokes("c s b [");
+        cx.assert_state(indoc! {"ˇ[ bracketed ]"}, Mode::Normal);
+
+        cx.set_state(indoc! {"(< name: ˇ'Zed' >)"}, Mode::Normal);
+        cx.simulate_keystrokes("c s b {");
+        cx.assert_state(indoc! {"(ˇ{ name: 'Zed' })"}, Mode::Normal);
+
+        cx.set_state(
+            indoc! {"
+            (< name: ˇ'Zed' >)
+            (< nˇame: 'DeltaDB' >)
+        "},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes("c s b {");
+        cx.set_state(
+            indoc! {"
+            (ˇ{ name: 'Zed' })
+            (ˇ{ name: 'DeltaDB' })
+        "},
+            Mode::Normal,
+        );
+    }
+
     #[gpui::test]
     async fn test_surrounds(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;

From 4368c1b56ba2c6f13957ca884459f00770a6fd01 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 3 Sep 2025 04:43:46 +0530
Subject: [PATCH 541/823] language_models: Add OpenRouterError and map
 OpenRouter errors to LanguageModelCompletionError (#34227)

Improves the error handling for openrouter and adds automatic retry like
anthropic for few of the status codes.
Release Notes:

- Improves error messages for Openrouter provider
- Automatic retry when rate limited or Server error from Openrouter
---
 Cargo.lock                                    |   3 +
 crates/language_model/Cargo.toml              |   1 +
 crates/language_model/src/language_model.rs   |  67 ++++
 .../src/provider/open_router.rs               |  63 ++--
 crates/open_router/Cargo.toml                 |   2 +
 crates/open_router/src/open_router.rs         | 346 +++++++++++-------
 6 files changed, 332 insertions(+), 150 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index da9eeabee4..42e343e062 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9147,6 +9147,7 @@ dependencies = [
  "icons",
  "image",
  "log",
+ "open_router",
  "parking_lot",
  "proto",
  "schemars",
@@ -11222,6 +11223,8 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
+ "strum 0.27.1",
+ "thiserror 2.0.12",
  "workspace-hack",
 ]
 
diff --git a/crates/language_model/Cargo.toml b/crates/language_model/Cargo.toml
index f9920623b5..d4513f617b 100644
--- a/crates/language_model/Cargo.toml
+++ b/crates/language_model/Cargo.toml
@@ -17,6 +17,7 @@ test-support = []
 
 [dependencies]
 anthropic = { workspace = true, features = ["schemars"] }
+open_router.workspace = true
 anyhow.workspace = true
 base64.workspace = true
 client.workspace = true
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
index d5313b6a3a..fac302104f 100644
--- a/crates/language_model/src/language_model.rs
+++ b/crates/language_model/src/language_model.rs
@@ -17,6 +17,7 @@ use futures::{StreamExt, future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, App, AsyncApp, SharedString, Task, Window};
 use http_client::{StatusCode, http};
 use icons::IconName;
+use open_router::OpenRouterError;
 use parking_lot::Mutex;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
@@ -347,6 +348,72 @@ impl From<anthropic::ApiError> for LanguageModelCompletionError {
     }
 }
 
+impl From<OpenRouterError> for LanguageModelCompletionError {
+    fn from(error: OpenRouterError) -> Self {
+        let provider = LanguageModelProviderName::new("OpenRouter");
+        match error {
+            OpenRouterError::SerializeRequest(error) => Self::SerializeRequest { provider, error },
+            OpenRouterError::BuildRequestBody(error) => Self::BuildRequestBody { provider, error },
+            OpenRouterError::HttpSend(error) => Self::HttpSend { provider, error },
+            OpenRouterError::DeserializeResponse(error) => {
+                Self::DeserializeResponse { provider, error }
+            }
+            OpenRouterError::ReadResponse(error) => Self::ApiReadResponseError { provider, error },
+            OpenRouterError::RateLimit { retry_after } => Self::RateLimitExceeded {
+                provider,
+                retry_after: Some(retry_after),
+            },
+            OpenRouterError::ServerOverloaded { retry_after } => Self::ServerOverloaded {
+                provider,
+                retry_after,
+            },
+            OpenRouterError::ApiError(api_error) => api_error.into(),
+        }
+    }
+}
+
+impl From<open_router::ApiError> for LanguageModelCompletionError {
+    fn from(error: open_router::ApiError) -> Self {
+        use open_router::ApiErrorCode::*;
+        let provider = LanguageModelProviderName::new("OpenRouter");
+        match error.code {
+            InvalidRequestError => Self::BadRequestFormat {
+                provider,
+                message: error.message,
+            },
+            AuthenticationError => Self::AuthenticationError {
+                provider,
+                message: error.message,
+            },
+            PaymentRequiredError => Self::AuthenticationError {
+                provider,
+                message: format!("Payment required: {}", error.message),
+            },
+            PermissionError => Self::PermissionError {
+                provider,
+                message: error.message,
+            },
+            RequestTimedOut => Self::HttpResponseError {
+                provider,
+                status_code: StatusCode::REQUEST_TIMEOUT,
+                message: error.message,
+            },
+            RateLimitError => Self::RateLimitExceeded {
+                provider,
+                retry_after: None,
+            },
+            ApiError => Self::ApiInternalServerError {
+                provider,
+                message: error.message,
+            },
+            OverloadedError => Self::ServerOverloaded {
+                provider,
+                retry_after: None,
+            },
+        }
+    }
+}
+
 /// Indicates the format used to define the input schema for a language model tool.
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum LanguageModelToolSchemaFormat {
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index aaa0bd620c..9138f6b82e 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -152,6 +152,7 @@ impl State {
             .open_router
             .api_url
             .clone();
+
         cx.spawn(async move |this, cx| {
             let (api_key, from_env) = if let Ok(api_key) = std::env::var(OPENROUTER_API_KEY_VAR) {
                 (api_key, true)
@@ -161,11 +162,11 @@ impl State {
                     .await?
                     .ok_or(AuthenticateError::CredentialsNotFound)?;
                 (
-                    String::from_utf8(api_key)
-                        .context(format!("invalid {} API key", PROVIDER_NAME))?,
+                    String::from_utf8(api_key).context("invalid {PROVIDER_NAME} API key")?,
                     false,
                 )
             };
+
             this.update(cx, |this, cx| {
                 this.api_key = Some(api_key);
                 this.api_key_from_env = from_env;
@@ -183,7 +184,9 @@ impl State {
         let api_url = settings.api_url.clone();
 
         cx.spawn(async move |this, cx| {
-            let models = list_models(http_client.as_ref(), &api_url).await?;
+            let models = list_models(http_client.as_ref(), &api_url)
+                .await
+                .map_err(|e| anyhow::anyhow!("OpenRouter error: {:?}", e))?;
 
             this.update(cx, |this, cx| {
                 this.available_models = models;
@@ -334,27 +337,37 @@ impl OpenRouterLanguageModel {
         &self,
         request: open_router::Request,
         cx: &AsyncApp,
-    ) -> BoxFuture<'static, Result<futures::stream::BoxStream<'static, Result<ResponseStreamEvent>>>>
-    {
+    ) -> BoxFuture<
+        'static,
+        Result<
+            futures::stream::BoxStream<
+                'static,
+                Result<ResponseStreamEvent, open_router::OpenRouterError>,
+            >,
+            LanguageModelCompletionError,
+        >,
+    > {
         let http_client = self.http_client.clone();
         let Ok((api_key, api_url)) = cx.read_entity(&self.state, |state, cx| {
             let settings = &AllLanguageModelSettings::get_global(cx).open_router;
             (state.api_key.clone(), settings.api_url.clone())
         }) else {
-            return futures::future::ready(Err(anyhow!(
-                "App state dropped: Unable to read API key or API URL from the application state"
-            )))
+            return futures::future::ready(Err(LanguageModelCompletionError::Other(anyhow!(
+                "App state dropped"
+            ))))
             .boxed();
         };
 
-        let future = self.request_limiter.stream(async move {
-            let api_key = api_key.ok_or_else(|| anyhow!("Missing OpenRouter API Key"))?;
+        async move {
+            let Some(api_key) = api_key else {
+                return Err(LanguageModelCompletionError::NoApiKey {
+                    provider: PROVIDER_NAME,
+                });
+            };
             let request = stream_completion(http_client.as_ref(), &api_url, &api_key, request);
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
+            request.await.map_err(Into::into)
+        }
+        .boxed()
     }
 }
 
@@ -435,12 +448,12 @@ impl LanguageModel for OpenRouterLanguageModel {
         >,
     > {
         let request = into_open_router(request, &self.model, self.max_output_tokens());
-        let completions = self.stream_completion(request, cx);
-        async move {
-            let mapper = OpenRouterEventMapper::new();
-            Ok(mapper.map_stream(completions.await?).boxed())
-        }
-        .boxed()
+        let request = self.stream_completion(request, cx);
+        let future = self.request_limiter.stream(async move {
+            let response = request.await?;
+            Ok(OpenRouterEventMapper::new().map_stream(response))
+        });
+        async move { Ok(future.await?.boxed()) }.boxed()
     }
 }
 
@@ -608,13 +621,17 @@ impl OpenRouterEventMapper {
 
     pub fn map_stream(
         mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<ResponseStreamEvent>>>>,
+        events: Pin<
+            Box<
+                dyn Send + Stream<Item = Result<ResponseStreamEvent, open_router::OpenRouterError>>,
+            >,
+        >,
     ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
     {
         events.flat_map(move |event| {
             futures::stream::iter(match event {
                 Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(LanguageModelCompletionError::from(anyhow!(error)))],
+                Err(error) => vec![Err(error.into())],
             })
         })
     }
diff --git a/crates/open_router/Cargo.toml b/crates/open_router/Cargo.toml
index bbc4fe190f..8920c157dc 100644
--- a/crates/open_router/Cargo.toml
+++ b/crates/open_router/Cargo.toml
@@ -22,4 +22,6 @@ http_client.workspace = true
 schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
+thiserror.workspace = true
+strum.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index 65ef519d2c..dfaa49746d 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -1,12 +1,31 @@
-use anyhow::{Context, Result, anyhow};
+use anyhow::{Result, anyhow};
 use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, http};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::convert::TryFrom;
+use std::{convert::TryFrom, io, time::Duration};
+use strum::EnumString;
+use thiserror::Error;
 
 pub const OPEN_ROUTER_API_URL: &str = "https://openrouter.ai/api/v1";
 
+fn extract_retry_after(headers: &http::HeaderMap) -> Option<std::time::Duration> {
+    if let Some(reset) = headers.get("X-RateLimit-Reset") {
+        if let Ok(s) = reset.to_str() {
+            if let Ok(epoch_ms) = s.parse::<u64>() {
+                let now = std::time::SystemTime::now()
+                    .duration_since(std::time::UNIX_EPOCH)
+                    .unwrap_or_default()
+                    .as_millis() as u64;
+                if epoch_ms > now {
+                    return Some(std::time::Duration::from_millis(epoch_ms - now));
+                }
+            }
+        }
+    }
+    None
+}
+
 fn is_none_or_empty<T: AsRef<[U]>, U>(opt: &Option<T>) -> bool {
     opt.as_ref().is_none_or(|v| v.as_ref().is_empty())
 }
@@ -413,76 +432,12 @@ pub struct ModelArchitecture {
     pub input_modalities: Vec<String>,
 }
 
-pub async fn complete(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-) -> Result<Response> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key.trim()))
-        .header("HTTP-Referer", "https://zed.dev")
-        .header("X-Title", "Zed Editor");
-
-    let mut request_body = request;
-    request_body.stream = false;
-
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request_body)?))?;
-    let mut response = client.send(request).await?;
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        let response: Response = serde_json::from_str(&body)?;
-        Ok(response)
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        #[derive(Deserialize)]
-        struct OpenRouterResponse {
-            error: OpenRouterError,
-        }
-
-        #[derive(Deserialize)]
-        struct OpenRouterError {
-            message: String,
-            #[serde(default)]
-            code: String,
-        }
-
-        match serde_json::from_str::<OpenRouterResponse>(&body) {
-            Ok(response) if !response.error.message.is_empty() => {
-                let error_message = if !response.error.code.is_empty() {
-                    format!("{}: {}", response.error.code, response.error.message)
-                } else {
-                    response.error.message
-                };
-
-                Err(anyhow!(
-                    "Failed to connect to OpenRouter API: {}",
-                    error_message
-                ))
-            }
-            _ => Err(anyhow!(
-                "Failed to connect to OpenRouter API: {} {}",
-                response.status(),
-                body,
-            )),
-        }
-    }
-}
-
 pub async fn stream_completion(
     client: &dyn HttpClient,
     api_url: &str,
     api_key: &str,
     request: Request,
-) -> Result<BoxStream<'static, Result<ResponseStreamEvent>>> {
+) -> Result<BoxStream<'static, Result<ResponseStreamEvent, OpenRouterError>>, OpenRouterError> {
     let uri = format!("{api_url}/chat/completions");
     let request_builder = HttpRequest::builder()
         .method(Method::POST)
@@ -492,8 +447,15 @@ pub async fn stream_completion(
         .header("HTTP-Referer", "https://zed.dev")
         .header("X-Title", "Zed Editor");
 
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
-    let mut response = client.send(request).await?;
+    let request = request_builder
+        .body(AsyncBody::from(
+            serde_json::to_string(&request).map_err(OpenRouterError::SerializeRequest)?,
+        ))
+        .map_err(OpenRouterError::BuildRequestBody)?;
+    let mut response = client
+        .send(request)
+        .await
+        .map_err(OpenRouterError::HttpSend)?;
 
     if response.status().is_success() {
         let reader = BufReader::new(response.into_body());
@@ -513,86 +475,85 @@ pub async fn stream_completion(
                             match serde_json::from_str::<ResponseStreamEvent>(line) {
                                 Ok(response) => Some(Ok(response)),
                                 Err(error) => {
-                                    #[derive(Deserialize)]
-                                    struct ErrorResponse {
-                                        error: String,
-                                    }
-
-                                    match serde_json::from_str::<ErrorResponse>(line) {
-                                        Ok(err_response) => Some(Err(anyhow!(err_response.error))),
-                                        Err(_) => {
-                                            if line.trim().is_empty() {
-                                                None
-                                            } else {
-                                                Some(Err(anyhow!(
-                                                    "Failed to parse response: {}. Original content: '{}'",
-                                                    error, line
-                                                )))
-                                            }
-                                        }
+                                    if line.trim().is_empty() {
+                                        None
+                                    } else {
+                                        Some(Err(OpenRouterError::DeserializeResponse(error)))
                                     }
                                 }
                             }
                         }
                     }
-                    Err(error) => Some(Err(anyhow!(error))),
+                    Err(error) => Some(Err(OpenRouterError::ReadResponse(error))),
                 }
             })
             .boxed())
     } else {
+        let code = ApiErrorCode::from_status(response.status().as_u16());
+
         let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
+        response
+            .body_mut()
+            .read_to_string(&mut body)
+            .await
+            .map_err(OpenRouterError::ReadResponse)?;
 
-        #[derive(Deserialize)]
-        struct OpenRouterResponse {
-            error: OpenRouterError,
-        }
+        let error_response = match serde_json::from_str::<OpenRouterErrorResponse>(&body) {
+            Ok(OpenRouterErrorResponse { error }) => error,
+            Err(_) => OpenRouterErrorBody {
+                code: response.status().as_u16(),
+                message: body,
+                metadata: None,
+            },
+        };
 
-        #[derive(Deserialize)]
-        struct OpenRouterError {
-            message: String,
-            #[serde(default)]
-            code: String,
-        }
-
-        match serde_json::from_str::<OpenRouterResponse>(&body) {
-            Ok(response) if !response.error.message.is_empty() => {
-                let error_message = if !response.error.code.is_empty() {
-                    format!("{}: {}", response.error.code, response.error.message)
-                } else {
-                    response.error.message
-                };
-
-                Err(anyhow!(
-                    "Failed to connect to OpenRouter API: {}",
-                    error_message
-                ))
+        match code {
+            ApiErrorCode::RateLimitError => {
+                let retry_after = extract_retry_after(response.headers());
+                Err(OpenRouterError::RateLimit {
+                    retry_after: retry_after.unwrap_or_else(|| std::time::Duration::from_secs(60)),
+                })
             }
-            _ => Err(anyhow!(
-                "Failed to connect to OpenRouter API: {} {}",
-                response.status(),
-                body,
-            )),
+            ApiErrorCode::OverloadedError => {
+                let retry_after = extract_retry_after(response.headers());
+                Err(OpenRouterError::ServerOverloaded { retry_after })
+            }
+            _ => Err(OpenRouterError::ApiError(ApiError {
+                code: code,
+                message: error_response.message,
+            })),
         }
     }
 }
 
-pub async fn list_models(client: &dyn HttpClient, api_url: &str) -> Result<Vec<Model>> {
+pub async fn list_models(
+    client: &dyn HttpClient,
+    api_url: &str,
+) -> Result<Vec<Model>, OpenRouterError> {
     let uri = format!("{api_url}/models");
     let request_builder = HttpRequest::builder()
         .method(Method::GET)
         .uri(uri)
         .header("Accept", "application/json");
 
-    let request = request_builder.body(AsyncBody::default())?;
-    let mut response = client.send(request).await?;
+    let request = request_builder
+        .body(AsyncBody::default())
+        .map_err(OpenRouterError::BuildRequestBody)?;
+    let mut response = client
+        .send(request)
+        .await
+        .map_err(OpenRouterError::HttpSend)?;
 
     let mut body = String::new();
-    response.body_mut().read_to_string(&mut body).await?;
+    response
+        .body_mut()
+        .read_to_string(&mut body)
+        .await
+        .map_err(OpenRouterError::ReadResponse)?;
 
     if response.status().is_success() {
         let response: ListModelsResponse =
-            serde_json::from_str(&body).context("Unable to parse OpenRouter models response")?;
+            serde_json::from_str(&body).map_err(OpenRouterError::DeserializeResponse)?;
 
         let models = response
             .data
@@ -637,10 +598,141 @@ pub async fn list_models(client: &dyn HttpClient, api_url: &str) -> Result<Vec<M
 
         Ok(models)
     } else {
-        Err(anyhow!(
-            "Failed to connect to OpenRouter API: {} {}",
-            response.status(),
-            body,
-        ))
+        let code = ApiErrorCode::from_status(response.status().as_u16());
+
+        let mut body = String::new();
+        response
+            .body_mut()
+            .read_to_string(&mut body)
+            .await
+            .map_err(OpenRouterError::ReadResponse)?;
+
+        let error_response = match serde_json::from_str::<OpenRouterErrorResponse>(&body) {
+            Ok(OpenRouterErrorResponse { error }) => error,
+            Err(_) => OpenRouterErrorBody {
+                code: response.status().as_u16(),
+                message: body,
+                metadata: None,
+            },
+        };
+
+        match code {
+            ApiErrorCode::RateLimitError => {
+                let retry_after = extract_retry_after(response.headers());
+                Err(OpenRouterError::RateLimit {
+                    retry_after: retry_after.unwrap_or_else(|| std::time::Duration::from_secs(60)),
+                })
+            }
+            ApiErrorCode::OverloadedError => {
+                let retry_after = extract_retry_after(response.headers());
+                Err(OpenRouterError::ServerOverloaded { retry_after })
+            }
+            _ => Err(OpenRouterError::ApiError(ApiError {
+                code: code,
+                message: error_response.message,
+            })),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum OpenRouterError {
+    /// Failed to serialize the HTTP request body to JSON
+    SerializeRequest(serde_json::Error),
+
+    /// Failed to construct the HTTP request body
+    BuildRequestBody(http::Error),
+
+    /// Failed to send the HTTP request
+    HttpSend(anyhow::Error),
+
+    /// Failed to deserialize the response from JSON
+    DeserializeResponse(serde_json::Error),
+
+    /// Failed to read from response stream
+    ReadResponse(io::Error),
+
+    /// Rate limit exceeded
+    RateLimit { retry_after: Duration },
+
+    /// Server overloaded
+    ServerOverloaded { retry_after: Option<Duration> },
+
+    /// API returned an error response
+    ApiError(ApiError),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct OpenRouterErrorBody {
+    pub code: u16,
+    pub message: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub metadata: Option<std::collections::HashMap<String, serde_json::Value>>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct OpenRouterErrorResponse {
+    pub error: OpenRouterErrorBody,
+}
+
+#[derive(Debug, Serialize, Deserialize, Error)]
+#[error("OpenRouter API Error: {code}: {message}")]
+pub struct ApiError {
+    pub code: ApiErrorCode,
+    pub message: String,
+}
+
+/// An OpenROuter API error code.
+/// <https://openrouter.ai/docs/api-reference/errors#error-codes>
+#[derive(Debug, PartialEq, Eq, Clone, Copy, EnumString, Serialize, Deserialize)]
+#[strum(serialize_all = "snake_case")]
+pub enum ApiErrorCode {
+    /// 400: Bad Request (invalid or missing params, CORS)
+    InvalidRequestError,
+    /// 401: Invalid credentials (OAuth session expired, disabled/invalid API key)
+    AuthenticationError,
+    /// 402: Your account or API key has insufficient credits. Add more credits and retry the request.
+    PaymentRequiredError,
+    /// 403: Your chosen model requires moderation and your input was flagged
+    PermissionError,
+    /// 408: Your request timed out
+    RequestTimedOut,
+    /// 429: You are being rate limited
+    RateLimitError,
+    /// 502: Your chosen model is down or we received an invalid response from it
+    ApiError,
+    /// 503: There is no available model provider that meets your routing requirements
+    OverloadedError,
+}
+
+impl std::fmt::Display for ApiErrorCode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let s = match self {
+            ApiErrorCode::InvalidRequestError => "invalid_request_error",
+            ApiErrorCode::AuthenticationError => "authentication_error",
+            ApiErrorCode::PaymentRequiredError => "payment_required_error",
+            ApiErrorCode::PermissionError => "permission_error",
+            ApiErrorCode::RequestTimedOut => "request_timed_out",
+            ApiErrorCode::RateLimitError => "rate_limit_error",
+            ApiErrorCode::ApiError => "api_error",
+            ApiErrorCode::OverloadedError => "overloaded_error",
+        };
+        write!(f, "{s}")
+    }
+}
+
+impl ApiErrorCode {
+    pub fn from_status(status: u16) -> Self {
+        match status {
+            400 => ApiErrorCode::InvalidRequestError,
+            401 => ApiErrorCode::AuthenticationError,
+            402 => ApiErrorCode::PaymentRequiredError,
+            403 => ApiErrorCode::PermissionError,
+            408 => ApiErrorCode::RequestTimedOut,
+            429 => ApiErrorCode::RateLimitError,
+            502 => ApiErrorCode::ApiError,
+            503 => ApiErrorCode::OverloadedError,
+            _ => ApiErrorCode::ApiError,
+        }
     }
 }

From 4b96ad3fbaf131fe11f32b18f5f93514027f88b7 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Tue, 2 Sep 2025 19:14:47 -0400
Subject: [PATCH 542/823] gpui: Remove `http_client` feature (#37401)

This PR removes the `http_client` feature from the `gpui` crate, as it
wasn't really doing anything.

It only controlled whether we depend on the `http_client` crate, but
from what I can tell we always depended on it anyways.

Obviates https://github.com/zed-industries/zed/pull/36615.

Release Notes:

- N/A
---
 Cargo.toml             | 4 +---
 crates/gpui/Cargo.toml | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2c8143756b..90b01945f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -299,9 +299,7 @@ git_hosting_providers = { path = "crates/git_hosting_providers" }
 git_ui = { path = "crates/git_ui" }
 go_to_line = { path = "crates/go_to_line" }
 google_ai = { path = "crates/google_ai" }
-gpui = { path = "crates/gpui", default-features = false, features = [
-    "http_client",
-] }
+gpui = { path = "crates/gpui", default-features = false }
 gpui_macros = { path = "crates/gpui_macros" }
 gpui_tokio = { path = "crates/gpui_tokio" }
 html_to_markdown = { path = "crates/html_to_markdown" }
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 9f5b66087d..dd91eb4d4e 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -12,13 +12,13 @@ license = "Apache-2.0"
 workspace = true
 
 [features]
-default = ["http_client", "font-kit", "wayland", "x11", "windows-manifest"]
+default = ["font-kit", "wayland", "x11", "windows-manifest"]
 test-support = [
     "leak-detection",
     "collections/test-support",
     "rand",
     "util/test-support",
-    "http_client?/test-support",
+    "http_client/test-support",
     "wayland",
     "x11",
 ]
@@ -91,7 +91,7 @@ derive_more.workspace = true
 etagere = "0.2"
 futures.workspace = true
 gpui_macros.workspace = true
-http_client = { optional = true, workspace = true }
+http_client.workspace = true
 image.workspace = true
 inventory.workspace = true
 itertools.workspace = true

From 946efb03df74a90dcaa15b2838820fda9d7e1daf Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 2 Sep 2025 20:18:15 -0300
Subject: [PATCH 543/823] Add option for code context menu items to have
 dynamic width (#37404)

Follow up to https://github.com/zed-industries/zed/pull/30598

This PR introduces the `display_options` field in the
`CompletionResponse`, allowing a code context menu width to be
dynamically dictated based on its larger item. This will allow us to
have the @-mentions and slash commands completion menus in the agent
panel not be bigger than it needs to be. It may also be relevant/useful
in the future for other use cases.

For now, we set all instances of code context menus to use a fixed
width, as defined in the PR linked above, which means this PR shouldn't
cause any visual change.

Release Notes:

- N/A

Co-authored-by: Michael Sloan <mgsloan+github@gmail.com>
---
 .../agent_ui/src/acp/completion_provider.rs   |  5 ++-
 .../src/context_picker/completion_provider.rs |  6 ++-
 crates/agent_ui/src/slash_command.rs          |  9 +++-
 .../src/chat_panel/message_editor.rs          |  6 ++-
 .../src/session/running/console.rs            |  4 +-
 crates/editor/src/code_context_menus.rs       | 41 ++++++++++++++++++-
 crates/editor/src/editor.rs                   | 29 +++++++++----
 crates/inspector_ui/src/div_inspector.rs      |  6 ++-
 crates/keymap_editor/src/keymap_editor.rs     |  3 +-
 crates/project/src/lsp_store.rs               | 10 +++--
 crates/project/src/project.rs                 | 12 ++++++
 11 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index dc38c65868..6d2253b406 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -15,7 +15,8 @@ use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
 use project::lsp_store::CompletionDocumentation;
 use project::{
-    Completion, CompletionIntent, CompletionResponse, Project, ProjectPath, Symbol, WorktreeId,
+    Completion, CompletionDisplayOptions, CompletionIntent, CompletionResponse, Project,
+    ProjectPath, Symbol, WorktreeId,
 };
 use prompt_store::PromptStore;
 use rope::Point;
@@ -771,6 +772,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
                     Ok(vec![CompletionResponse {
                         completions,
+                        display_options: CompletionDisplayOptions::default(),
                         // Since this does its own filtering (see `filter_completions()` returns false),
                         // there is no benefit to computing whether this set of completions is incomplete.
                         is_incomplete: true,
@@ -862,6 +864,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
                     Ok(vec![CompletionResponse {
                         completions,
+                        display_options: CompletionDisplayOptions::default(),
                         // Since this does its own filtering (see `filter_completions()` returns false),
                         // there is no benefit to computing whether this set of completions is incomplete.
                         is_incomplete: true,
diff --git a/crates/agent_ui/src/context_picker/completion_provider.rs b/crates/agent_ui/src/context_picker/completion_provider.rs
index 020d799c79..b67b463e3b 100644
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -13,7 +13,10 @@ use http_client::HttpClientWithUrl;
 use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
-use project::{Completion, CompletionIntent, CompletionResponse, ProjectPath, Symbol, WorktreeId};
+use project::{
+    Completion, CompletionDisplayOptions, CompletionIntent, CompletionResponse, ProjectPath,
+    Symbol, WorktreeId,
+};
 use prompt_store::PromptStore;
 use rope::Point;
 use text::{Anchor, OffsetRangeExt, ToPoint};
@@ -897,6 +900,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
             Ok(vec![CompletionResponse {
                 completions,
+                display_options: CompletionDisplayOptions::default(),
                 // Since this does its own filtering (see `filter_completions()` returns false),
                 // there is no benefit to computing whether this set of completions is incomplete.
                 is_incomplete: true,
diff --git a/crates/agent_ui/src/slash_command.rs b/crates/agent_ui/src/slash_command.rs
index 87e5d45fe8..c2f26c4f2e 100644
--- a/crates/agent_ui/src/slash_command.rs
+++ b/crates/agent_ui/src/slash_command.rs
@@ -7,7 +7,10 @@ use fuzzy::{StringMatchCandidate, match_strings};
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
 use language::{Anchor, Buffer, ToPoint};
 use parking_lot::Mutex;
-use project::{CompletionIntent, CompletionSource, lsp_store::CompletionDocumentation};
+use project::{
+    CompletionDisplayOptions, CompletionIntent, CompletionSource,
+    lsp_store::CompletionDocumentation,
+};
 use rope::Point;
 use std::{
     ops::Range,
@@ -133,6 +136,7 @@ impl SlashCommandCompletionProvider {
 
                 vec![project::CompletionResponse {
                     completions,
+                    display_options: CompletionDisplayOptions::default(),
                     is_incomplete: false,
                 }]
             })
@@ -237,6 +241,7 @@ impl SlashCommandCompletionProvider {
 
                 Ok(vec![project::CompletionResponse {
                     completions,
+                    display_options: CompletionDisplayOptions::default(),
                     // TODO: Could have slash commands indicate whether their completions are incomplete.
                     is_incomplete: true,
                 }])
@@ -244,6 +249,7 @@ impl SlashCommandCompletionProvider {
         } else {
             Task::ready(Ok(vec![project::CompletionResponse {
                 completions: Vec::new(),
+                display_options: CompletionDisplayOptions::default(),
                 is_incomplete: true,
             }]))
         }
@@ -305,6 +311,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
         else {
             return Task::ready(Ok(vec![project::CompletionResponse {
                 completions: Vec::new(),
+                display_options: CompletionDisplayOptions::default(),
                 is_incomplete: false,
             }]));
         };
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 5fead5bcf1..3864ca69d8 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -12,7 +12,9 @@ use language::{
     Anchor, Buffer, BufferSnapshot, CodeLabel, LanguageRegistry, ToOffset,
     language_settings::SoftWrap,
 };
-use project::{Completion, CompletionResponse, CompletionSource, search::SearchQuery};
+use project::{
+    Completion, CompletionDisplayOptions, CompletionResponse, CompletionSource, search::SearchQuery,
+};
 use settings::Settings;
 use std::{
     ops::Range,
@@ -275,6 +277,7 @@ impl MessageEditor {
 
         Task::ready(Ok(vec![CompletionResponse {
             completions: Vec::new(),
+            display_options: CompletionDisplayOptions::default(),
             is_incomplete: false,
         }]))
     }
@@ -317,6 +320,7 @@ impl MessageEditor {
 
         CompletionResponse {
             is_incomplete: completions.len() >= LIMIT,
+            display_options: CompletionDisplayOptions::default(),
             completions,
         }
     }
diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs
index a801cedd26..43d86d95c4 100644
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -15,7 +15,7 @@ use gpui::{
 use language::{Anchor, Buffer, CodeLabel, TextBufferSnapshot, ToOffset};
 use menu::{Confirm, SelectNext, SelectPrevious};
 use project::{
-    Completion, CompletionResponse,
+    Completion, CompletionDisplayOptions, CompletionResponse,
     debugger::session::{CompletionsQuery, OutputToken, Session},
     lsp_store::CompletionDocumentation,
     search_history::{SearchHistory, SearchHistoryCursor},
@@ -685,6 +685,7 @@ impl ConsoleQueryBarCompletionProvider {
 
             Ok(vec![project::CompletionResponse {
                 is_incomplete: completions.len() >= LIMIT,
+                display_options: CompletionDisplayOptions::default(),
                 completions,
             }])
         })
@@ -797,6 +798,7 @@ impl ConsoleQueryBarCompletionProvider {
 
             Ok(vec![project::CompletionResponse {
                 completions,
+                display_options: CompletionDisplayOptions::default(),
                 is_incomplete: false,
             }])
         })
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 01e74284ef..6d57048985 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -11,9 +11,9 @@ use language::{Buffer, LanguageName, LanguageRegistry};
 use markdown::{Markdown, MarkdownElement};
 use multi_buffer::{Anchor, ExcerptId};
 use ordered_float::OrderedFloat;
-use project::CompletionSource;
 use project::lsp_store::CompletionDocumentation;
 use project::{CodeAction, Completion, TaskSourceKind};
+use project::{CompletionDisplayOptions, CompletionSource};
 use task::DebugScenario;
 use task::TaskContext;
 
@@ -232,6 +232,7 @@ pub struct CompletionsMenu {
     markdown_cache: Rc<RefCell<VecDeque<(MarkdownCacheKey, Entity<Markdown>)>>>,
     language_registry: Option<Arc<LanguageRegistry>>,
     language: Option<LanguageName>,
+    display_options: CompletionDisplayOptions,
     snippet_sort_order: SnippetSortOrder,
 }
 
@@ -271,6 +272,7 @@ impl CompletionsMenu {
         is_incomplete: bool,
         buffer: Entity<Buffer>,
         completions: Box<[Completion]>,
+        display_options: CompletionDisplayOptions,
         snippet_sort_order: SnippetSortOrder,
         language_registry: Option<Arc<LanguageRegistry>>,
         language: Option<LanguageName>,
@@ -304,6 +306,7 @@ impl CompletionsMenu {
             markdown_cache: RefCell::new(VecDeque::new()).into(),
             language_registry,
             language,
+            display_options,
             snippet_sort_order,
         };
 
@@ -375,6 +378,7 @@ impl CompletionsMenu {
             markdown_cache: RefCell::new(VecDeque::new()).into(),
             language_registry: None,
             language: None,
+            display_options: CompletionDisplayOptions::default(),
             snippet_sort_order,
         }
     }
@@ -737,6 +741,33 @@ impl CompletionsMenu {
         cx: &mut Context<Editor>,
     ) -> AnyElement {
         let show_completion_documentation = self.show_completion_documentation;
+        let widest_completion_ix = if self.display_options.dynamic_width {
+            let completions = self.completions.borrow();
+            let widest_completion_ix = self
+                .entries
+                .borrow()
+                .iter()
+                .enumerate()
+                .max_by_key(|(_, mat)| {
+                    let completion = &completions[mat.candidate_id];
+                    let documentation = &completion.documentation;
+
+                    let mut len = completion.label.text.chars().count();
+                    if let Some(CompletionDocumentation::SingleLine(text)) = documentation {
+                        if show_completion_documentation {
+                            len += text.chars().count();
+                        }
+                    }
+
+                    len
+                })
+                .map(|(ix, _)| ix);
+            drop(completions);
+            widest_completion_ix
+        } else {
+            None
+        };
+
         let selected_item = self.selected_item;
         let completions = self.completions.clone();
         let entries = self.entries.clone();
@@ -863,7 +894,13 @@ impl CompletionsMenu {
         .max_h(max_height_in_lines as f32 * window.line_height())
         .track_scroll(self.scroll_handle.clone())
         .with_sizing_behavior(ListSizingBehavior::Infer)
-        .w(rems(34.));
+        .map(|this| {
+            if self.display_options.dynamic_width {
+                this.with_width_from_item(widest_completion_ix)
+            } else {
+                this.w(rems(34.))
+            }
+        });
 
         Popover::new().child(list).into_any_element()
     }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 0494eb6c1f..00fe6637bf 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -147,21 +147,22 @@ use multi_buffer::{
 use parking_lot::Mutex;
 use persistence::DB;
 use project::{
-    BreakpointWithPosition, CodeAction, Completion, CompletionIntent, CompletionResponse,
-    CompletionSource, DisableAiSettings, DocumentHighlight, InlayHint, Location, LocationLink,
-    PrepareRenameResponse, Project, ProjectItem, ProjectPath, ProjectTransaction, TaskSourceKind,
-    debugger::breakpoint_store::Breakpoint,
+    BreakpointWithPosition, CodeAction, Completion, CompletionDisplayOptions, CompletionIntent,
+    CompletionResponse, CompletionSource, DisableAiSettings, DocumentHighlight, InlayHint,
+    Location, LocationLink, PrepareRenameResponse, Project, ProjectItem, ProjectPath,
+    ProjectTransaction, TaskSourceKind,
     debugger::{
         breakpoint_store::{
-            BreakpointEditAction, BreakpointSessionState, BreakpointState, BreakpointStore,
-            BreakpointStoreEvent,
+            Breakpoint, BreakpointEditAction, BreakpointSessionState, BreakpointState,
+            BreakpointStore, BreakpointStoreEvent,
         },
         session::{Session, SessionEvent},
     },
     git_store::{GitStoreEvent, RepositoryEvent},
     lsp_store::{CompletionDocumentation, FormatTrigger, LspFormatTarget, OpenLspBufferHandle},
-    project_settings::{DiagnosticSeverity, GoToDiagnosticSeverityFilter},
-    project_settings::{GitGutterSetting, ProjectSettings},
+    project_settings::{
+        DiagnosticSeverity, GitGutterSetting, GoToDiagnosticSeverityFilter, ProjectSettings,
+    },
 };
 use rand::{seq::SliceRandom, thread_rng};
 use rpc::{ErrorCode, ErrorExt, proto::PeerId};
@@ -5635,17 +5636,25 @@ impl Editor {
             // that having one source with `is_incomplete: true` doesn't cause all to be re-queried.
             let mut completions = Vec::new();
             let mut is_incomplete = false;
+            let mut display_options: Option<CompletionDisplayOptions> = None;
             if let Some(provider_responses) = provider_responses.await.log_err()
                 && !provider_responses.is_empty()
             {
                 for response in provider_responses {
                     completions.extend(response.completions);
                     is_incomplete = is_incomplete || response.is_incomplete;
+                    match display_options.as_mut() {
+                        None => {
+                            display_options = Some(response.display_options);
+                        }
+                        Some(options) => options.merge(&response.display_options),
+                    }
                 }
                 if completion_settings.words == WordsCompletionMode::Fallback {
                     words = Task::ready(BTreeMap::default());
                 }
             }
+            let display_options = display_options.unwrap_or_default();
 
             let mut words = words.await;
             if let Some(word_to_exclude) = &word_to_exclude {
@@ -5687,6 +5696,7 @@ impl Editor {
                         is_incomplete,
                         buffer.clone(),
                         completions.into(),
+                        display_options,
                         snippet_sort_order,
                         languages,
                         language,
@@ -22260,6 +22270,7 @@ fn snippet_completions(
     if scopes.is_empty() {
         return Task::ready(Ok(CompletionResponse {
             completions: vec![],
+            display_options: CompletionDisplayOptions::default(),
             is_incomplete: false,
         }));
     }
@@ -22284,6 +22295,7 @@ fn snippet_completions(
             if last_word.is_empty() {
                 return Ok(CompletionResponse {
                     completions: vec![],
+                    display_options: CompletionDisplayOptions::default(),
                     is_incomplete: true,
                 });
             }
@@ -22405,6 +22417,7 @@ fn snippet_completions(
 
         Ok(CompletionResponse {
             completions,
+            display_options: CompletionDisplayOptions::default(),
             is_incomplete,
         })
     })
diff --git a/crates/inspector_ui/src/div_inspector.rs b/crates/inspector_ui/src/div_inspector.rs
index c3d687e57a..fa8b76517f 100644
--- a/crates/inspector_ui/src/div_inspector.rs
+++ b/crates/inspector_ui/src/div_inspector.rs
@@ -14,7 +14,10 @@ use language::{
     DiagnosticSeverity, LanguageServerId, Point, ToOffset as _, ToPoint as _,
 };
 use project::lsp_store::CompletionDocumentation;
-use project::{Completion, CompletionResponse, CompletionSource, Project, ProjectPath};
+use project::{
+    Completion, CompletionDisplayOptions, CompletionResponse, CompletionSource, Project,
+    ProjectPath,
+};
 use std::fmt::Write as _;
 use std::ops::Range;
 use std::path::Path;
@@ -664,6 +667,7 @@ impl CompletionProvider for RustStyleCompletionProvider {
                     confirm: None,
                 })
                 .collect(),
+            display_options: CompletionDisplayOptions::default(),
             is_incomplete: false,
         }]))
     }
diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index 1214906112..a8e356276b 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -22,7 +22,7 @@ use gpui::{
 };
 use language::{Language, LanguageConfig, ToOffset as _};
 use notifications::status_toast::{StatusToast, ToastIcon};
-use project::Project;
+use project::{CompletionDisplayOptions, Project};
 use settings::{BaseKeymap, KeybindSource, KeymapFile, Settings as _, SettingsAssets};
 use ui::{
     ActiveTheme as _, App, Banner, BorrowAppContext, ContextMenu, IconButtonShape, Indicator,
@@ -2911,6 +2911,7 @@ impl CompletionProvider for KeyContextCompletionProvider {
                     confirm: None,
                 })
                 .collect(),
+            display_options: CompletionDisplayOptions::default(),
             is_incomplete: false,
         }]))
     }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 1315915203..73f5da086c 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -16,10 +16,10 @@ pub mod lsp_ext_command;
 pub mod rust_analyzer_ext;
 
 use crate::{
-    CodeAction, ColorPresentation, Completion, CompletionResponse, CompletionSource,
-    CoreCompletion, DocumentColor, Hover, InlayHint, LocationLink, LspAction, LspPullDiagnostics,
-    ManifestProvidersStore, Project, ProjectItem, ProjectPath, ProjectTransaction,
-    PulledDiagnostics, ResolveState, Symbol,
+    CodeAction, ColorPresentation, Completion, CompletionDisplayOptions, CompletionResponse,
+    CompletionSource, CoreCompletion, DocumentColor, Hover, InlayHint, LocationLink, LspAction,
+    LspPullDiagnostics, ManifestProvidersStore, Project, ProjectItem, ProjectPath,
+    ProjectTransaction, PulledDiagnostics, ResolveState, Symbol,
     buffer_store::{BufferStore, BufferStoreEvent},
     environment::ProjectEnvironment,
     lsp_command::{self, *},
@@ -5828,6 +5828,7 @@ impl LspStore {
                 .await;
                 Ok(vec![CompletionResponse {
                     completions,
+                    display_options: CompletionDisplayOptions::default(),
                     is_incomplete: completion_response.is_incomplete,
                 }])
             })
@@ -5920,6 +5921,7 @@ impl LspStore {
                         .await;
                     Some(CompletionResponse {
                         completions,
+                        display_options: CompletionDisplayOptions::default(),
                         is_incomplete: completion_response.is_incomplete,
                     })
                 });
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 229249d48c..46dd3b7d9e 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -574,11 +574,23 @@ impl std::fmt::Debug for Completion {
 /// Response from a source of completions.
 pub struct CompletionResponse {
     pub completions: Vec<Completion>,
+    pub display_options: CompletionDisplayOptions,
     /// When false, indicates that the list is complete and so does not need to be re-queried if it
     /// can be filtered instead.
     pub is_incomplete: bool,
 }
 
+#[derive(Default)]
+pub struct CompletionDisplayOptions {
+    pub dynamic_width: bool,
+}
+
+impl CompletionDisplayOptions {
+    pub fn merge(&mut self, other: &CompletionDisplayOptions) {
+        self.dynamic_width = self.dynamic_width && other.dynamic_width;
+    }
+}
+
 /// Response from language server completion request.
 #[derive(Clone, Debug, Default)]
 pub(crate) struct CoreCompletionResponse {

From 9f749881b31a2cd10fefb240068e6bb1bd46c709 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 3 Sep 2025 04:52:57 +0530
Subject: [PATCH 544/823] language_models: Fix tool_choice null issue for other
 providers (#34554)

Follow up: #34532

Closes #35434

Mostly fixes a issue were when the tool_choice is none it was getting
serialised as null. This was fixed for openrouter just wanted to follow
up and cleanup for other providers which might have this issue as this
is against the spec.

Release Notes:

- N/A
---
 crates/lmstudio/src/lmstudio.rs | 3 ++-
 crates/mistral/src/mistral.rs   | 3 ++-
 crates/open_ai/src/open_ai.rs   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/lmstudio/src/lmstudio.rs b/crates/lmstudio/src/lmstudio.rs
index 43c78115cd..ef2f7b6208 100644
--- a/crates/lmstudio/src/lmstudio.rs
+++ b/crates/lmstudio/src/lmstudio.rs
@@ -86,11 +86,12 @@ impl Model {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
+#[serde(rename_all = "lowercase")]
 pub enum ToolChoice {
     Auto,
     Required,
     None,
+    #[serde(untagged)]
     Other(ToolDefinition),
 }
 
diff --git a/crates/mistral/src/mistral.rs b/crates/mistral/src/mistral.rs
index 55986e7e5b..d6f62cfaa0 100644
--- a/crates/mistral/src/mistral.rs
+++ b/crates/mistral/src/mistral.rs
@@ -286,12 +286,13 @@ pub enum Prediction {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[serde(rename_all = "lowercase")]
 pub enum ToolChoice {
     Auto,
     Required,
     None,
     Any,
+    #[serde(untagged)]
     Function(ToolDefinition),
 }
 
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index f9a983b433..279245c0b7 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -269,11 +269,12 @@ pub struct Request {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
+#[serde(rename_all = "lowercase")]
 pub enum ToolChoice {
     Auto,
     Required,
     None,
+    #[serde(untagged)]
     Other(ToolDefinition),
 }
 

From 63b3839a83984a48ef57e96253f3602c16cf22b3 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 3 Sep 2025 04:58:36 +0530
Subject: [PATCH 545/823] language_models: Prevent sending the tools object to
 unsupported models for Ollama (#37221)

Closes #32758

Release Notes:

- Resolved an issue with the Ollama provider that caused requests to
fail with a 400 error for models that don't support tools. The tools
object is now only sent to compatible models to ensure successful
requests.
---
 crates/language_models/src/provider/ollama.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 3f2d47fba3..8975115d90 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -347,7 +347,11 @@ impl OllamaLanguageModel {
                 .model
                 .supports_thinking
                 .map(|supports_thinking| supports_thinking && request.thinking_allowed),
-            tools: request.tools.into_iter().map(tool_into_ollama).collect(),
+            tools: if self.model.supports_tools.unwrap_or(false) {
+                request.tools.into_iter().map(tool_into_ollama).collect()
+            } else {
+                vec![]
+            },
         }
     }
 }

From 564ded71c144f441700323bfa3043390206421fe Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 2 Sep 2025 19:29:21 -0400
Subject: [PATCH 546/823] acp: Disable external agents over SSH (#37402)

Follow-up to #37377

Show a clearer error here until SSH support is implemented.

Release Notes:

- N/A
---
 Cargo.toml                             |  2 +-
 crates/agent_ui/src/acp/thread_view.rs |  4 +---
 crates/agent_ui/src/agent_panel.rs     | 16 +++++++---------
 crates/git_ui/src/branch_picker.rs     |  1 -
 crates/vim/src/visual.rs               |  1 -
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 90b01945f7..08551ef75a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -847,7 +847,7 @@ too_many_arguments = "allow"
 large_enum_variant = "allow"
 
 # Boolean expressions can be hard to read, requiring only the minimal form gets in the way
-nonminimal_bol = "allow"
+nonminimal_bool = "allow"
 
 [workspace.metadata.cargo-machete]
 ignored = [
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 357a854371..dc8abd99ae 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -420,9 +420,7 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> ThreadState {
-        if project.read(cx).is_via_collab()
-            && agent.clone().downcast::<NativeAgentServer>().is_none()
-        {
+        if !project.read(cx).is_local() && agent.clone().downcast::<NativeAgentServer>().is_none() {
             return ThreadState::LoadError(LoadError::Other(
                 "External agents are not yet supported for remote projects.".into(),
             ));
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 3da63c281e..2383963d6c 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1091,7 +1091,7 @@ impl AgentPanel {
         let workspace = self.workspace.clone();
         let project = self.project.clone();
         let fs = self.fs.clone();
-        let is_via_collab = self.project.read(cx).is_via_collab();
+        let is_not_local = !self.project.read(cx).is_local();
 
         const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
 
@@ -1123,7 +1123,7 @@ impl AgentPanel {
                     agent
                 }
                 None => {
-                    if is_via_collab {
+                    if is_not_local {
                         ExternalAgent::NativeAgent
                     } else {
                         cx.background_spawn(async move {
@@ -2532,10 +2532,8 @@ impl AgentPanel {
             .with_handle(self.new_thread_menu_handle.clone())
             .menu({
                 let workspace = self.workspace.clone();
-                let is_via_collab = workspace
-                    .update(cx, |workspace, cx| {
-                        workspace.project().read(cx).is_via_collab()
-                    })
+                let is_not_local = workspace
+                    .update(cx, |workspace, cx| !workspace.project().read(cx).is_local())
                     .unwrap_or_default();
 
                 move |window, cx| {
@@ -2627,7 +2625,7 @@ impl AgentPanel {
                                     ContextMenuEntry::new("New Gemini CLI Thread")
                                         .icon(IconName::AiGemini)
                                         .icon_color(Color::Muted)
-                                        .disabled(is_via_collab)
+                                        .disabled(is_not_local)
                                         .handler({
                                             let workspace = workspace.clone();
                                             move |window, cx| {
@@ -2654,7 +2652,7 @@ impl AgentPanel {
                                 menu.item(
                                     ContextMenuEntry::new("New Claude Code Thread")
                                         .icon(IconName::AiClaude)
-                                        .disabled(is_via_collab)
+                                        .disabled(is_not_local)
                                         .icon_color(Color::Muted)
                                         .handler({
                                             let workspace = workspace.clone();
@@ -2687,7 +2685,7 @@ impl AgentPanel {
                                         ContextMenuEntry::new(format!("New {} Thread", agent_name))
                                             .icon(IconName::Terminal)
                                             .icon_color(Color::Muted)
-                                            .disabled(is_via_collab)
+                                            .disabled(is_not_local)
                                             .handler({
                                                 let workspace = workspace.clone();
                                                 let agent_name = agent_name.clone();
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index fb56cdcc5d..2b5a543e93 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -341,7 +341,6 @@ impl PickerDelegate for BranchListDelegate {
             };
             picker
                 .update(cx, |picker, _| {
-                    #[allow(clippy::nonminimal_bool)]
                     if !query.is_empty()
                         && !matches
                             .first()
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index fcce00f0c0..c62712af31 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -216,7 +216,6 @@ impl Vim {
                         // If the file ends with a newline (which is common) we don't do this.
                         // so that if you go to the end of such a file you can use "up" to go
                         // to the previous line and have it work somewhat as expected.
-                        #[allow(clippy::nonminimal_bool)]
                         if !selection.reversed
                             && !selection.is_empty()
                             && !(selection.end.column() == 0 && selection.end == map.max_point())

From 60ad82cc94bc38ee30cae0ebe2e030d0c86c5c3a Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 2 Sep 2025 16:30:32 -0700
Subject: [PATCH 547/823] Fix typo in clippy lint name (#37405)

Release Notes:

- N/A

From 45fa6d81acaa2882eebdcbffbf5e586fe7e8dee0 Mon Sep 17 00:00:00 2001
From: Vitaly Slobodin <vitaliy.slobodin@gmail.com>
Date: Wed, 3 Sep 2025 01:32:43 +0200
Subject: [PATCH 548/823] tailwind: Add `HTML+ERB` to the list of supported
 languages (#36797)

Hi! As part of https://github.com/zed-extensions/ruby/issues/162 we
would like to rename HTML/ERB to HTML+ERB since it is more syntactically
correct to treat such language as ERB on top of HTML rather than HTML or
ERB.

To keep the user experience intact, we outlined the prerequisites in the
linked issue. This is the first PR that adds the HTML+ERB language name
to the list of enabled languages for the Emmet extension. We will do the
same for the Tailwind configuration in the Zed codebase. Once the new
versions of Emmet and Zed are released, we will merge the pull request
in the Ruby extension repository and release the updated version. After
that, we will remove the old HTML/ERB and YAML/ERB languages. Let me
know if that sounds good. Thanks!

Release Notes:

- N/A

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
---
 crates/languages/src/lib.rs      | 1 +
 crates/languages/src/tailwind.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index d391e67d33..168cf8f57c 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -296,6 +296,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         "Astro",
         "CSS",
         "ERB",
+        "HTML+ERB",
         "HTML/ERB",
         "HEEX",
         "HTML",
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 47eb254053..7215dc0d59 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -184,6 +184,7 @@ impl LspAdapter for TailwindLspAdapter {
             (LanguageName::new("Elixir"), "phoenix-heex".to_string()),
             (LanguageName::new("HEEX"), "phoenix-heex".to_string()),
             (LanguageName::new("ERB"), "erb".to_string()),
+            (LanguageName::new("HTML+ERB"), "erb".to_string()),
             (LanguageName::new("HTML/ERB"), "erb".to_string()),
             (LanguageName::new("PHP"), "php".to_string()),
             (LanguageName::new("Vue.js"), "vue".to_string()),

From 893eb92f9185d864af0503936b8d2ac448d98cce Mon Sep 17 00:00:00 2001
From: versecafe <147033096+versecafe@users.noreply.github.com>
Date: Tue, 2 Sep 2025 16:40:07 -0700
Subject: [PATCH 549/823] docs: Note edge case for macOS 26 (#37392)

- I believe this is caused by metal not being found due to it being on
the XcodeBeta path, not sure if there's a better fix for this but it'll
work until 26 is the latest release

Release Notes:

- N/A
---
 crates/gpui/README.md         | 2 +-
 docs/src/development/macos.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/README.md b/crates/gpui/README.md
index 9faab7b680..672d83e8ff 100644
--- a/crates/gpui/README.md
+++ b/crates/gpui/README.md
@@ -23,7 +23,7 @@ On macOS, GPUI uses Metal for rendering. In order to use Metal, you need to do t
 
 - Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) from the macOS App Store, or from the [Apple Developer](https://developer.apple.com/download/all/) website. Note this requires a developer account.
 
-> Ensure you launch XCode after installing, and install the macOS components, which is the default option.
+> Ensure you launch Xcode after installing, and install the macOS components, which is the default option. If you are on macOS 26 (Tahoe) you will need to use `--features gpui/runtime_shaders` or add the feature in the root `Cargo.toml`
 
 - Install [Xcode command line tools](https://developer.apple.com/xcode/resources/)
 
diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md
index f081f0b5f1..d90cc89abc 100644
--- a/docs/src/development/macos.md
+++ b/docs/src/development/macos.md
@@ -10,7 +10,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
 
 - Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) from the macOS App Store, or from the [Apple Developer](https://developer.apple.com/download/all/) website. Note this requires a developer account.
 
-> Ensure you launch Xcode after installing, and install the macOS components, which is the default option.
+> Ensure you launch Xcode after installing, and install the macOS components, which is the default option. If you are on macOS 26 (Tahoe) you will need to use `--features gpui/runtime_shaders` or add the feature in the root `Cargo.toml`
 
 - Install [Xcode command line tools](https://developer.apple.com/xcode/resources/)
 

From ae0ee70abddb7883bd5e9610d063508ce5ad532d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzywa=C5=BCnia?=
 <1815898+ribelo@users.noreply.github.com>
Date: Wed, 3 Sep 2025 02:03:56 +0200
Subject: [PATCH 550/823] Add configurable timeout for context server tool
 calls (#33348)

Closes: #32668

- Add
[tool_call_timeout_millis](https://github.com/cline/cline/pull/1904)
field to ContextServerCommand, like in Cline
- Update ModelContextServerBinary to include timeout configuration
- Modify Client to store and use configurable request timeout
- Replace hardcoded REQUEST_TIMEOUT with self.request_timeout
- Rename REQUEST_TIMEOUT to DEFAULT_REQUEST_TIMEOUT for clarity
- Maintain backward compatibility with 60-second default

Release Notes:

- context_server: Add support for configurable timeout for MCP tool
calls

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 crates/agent2/src/tests/mod.rs                 |  1 +
 crates/context_server/src/client.rs            | 18 ++++++++++++++----
 crates/context_server/src/context_server.rs    |  4 ++++
 crates/project/src/context_server_store.rs     |  7 +++++++
 .../src/context_server_store/extension.rs      |  1 +
 crates/project/src/project_settings.rs         |  1 +
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 9132c9a316..884580ed69 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -2477,6 +2477,7 @@ fn setup_context_server(
                     path: "somebinary".into(),
                     args: Vec::new(),
                     env: None,
+                    timeout: None,
                 },
             },
         );
diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs
index 03cf047ac5..b3b44dbde6 100644
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -25,7 +25,7 @@ use crate::{
 };
 
 const JSON_RPC_VERSION: &str = "2.0";
-const REQUEST_TIMEOUT: Duration = Duration::from_secs(60);
+const DEFAULT_REQUEST_TIMEOUT: Duration = Duration::from_secs(60);
 
 // Standard JSON-RPC error codes
 pub const PARSE_ERROR: i32 = -32700;
@@ -60,6 +60,7 @@ pub(crate) struct Client {
     executor: BackgroundExecutor,
     #[allow(dead_code)]
     transport: Arc<dyn Transport>,
+    request_timeout: Option<Duration>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -143,6 +144,7 @@ pub struct ModelContextServerBinary {
     pub executable: PathBuf,
     pub args: Vec<String>,
     pub env: Option<HashMap<String, String>>,
+    pub timeout: Option<u64>,
 }
 
 impl Client {
@@ -169,8 +171,9 @@ impl Client {
             .map(|name| name.to_string_lossy().to_string())
             .unwrap_or_else(String::new);
 
+        let timeout = binary.timeout.map(Duration::from_millis);
         let transport = Arc::new(StdioTransport::new(binary, working_directory, &cx)?);
-        Self::new(server_id, server_name.into(), transport, cx)
+        Self::new(server_id, server_name.into(), transport, timeout, cx)
     }
 
     /// Creates a new Client instance for a context server.
@@ -178,6 +181,7 @@ impl Client {
         server_id: ContextServerId,
         server_name: Arc<str>,
         transport: Arc<dyn Transport>,
+        request_timeout: Option<Duration>,
         cx: AsyncApp,
     ) -> Result<Self> {
         let (outbound_tx, outbound_rx) = channel::unbounded::<String>();
@@ -237,6 +241,7 @@ impl Client {
             io_tasks: Mutex::new(Some((input_task, output_task))),
             output_done_rx: Mutex::new(Some(output_done_rx)),
             transport,
+            request_timeout,
         })
     }
 
@@ -327,8 +332,13 @@ impl Client {
         method: &str,
         params: impl Serialize,
     ) -> Result<T> {
-        self.request_with(method, params, None, Some(REQUEST_TIMEOUT))
-            .await
+        self.request_with(
+            method,
+            params,
+            None,
+            self.request_timeout.or(Some(DEFAULT_REQUEST_TIMEOUT)),
+        )
+        .await
     }
 
     pub async fn request_with<T: DeserializeOwned>(
diff --git a/crates/context_server/src/context_server.rs b/crates/context_server/src/context_server.rs
index 9ca78138db..b126bb3937 100644
--- a/crates/context_server/src/context_server.rs
+++ b/crates/context_server/src/context_server.rs
@@ -34,6 +34,8 @@ pub struct ContextServerCommand {
     pub path: PathBuf,
     pub args: Vec<String>,
     pub env: Option<HashMap<String, String>>,
+    /// Timeout for tool calls in milliseconds. Defaults to 60000 (60 seconds) if not specified.
+    pub timeout: Option<u64>,
 }
 
 impl std::fmt::Debug for ContextServerCommand {
@@ -123,6 +125,7 @@ impl ContextServer {
                     executable: Path::new(&command.path).to_path_buf(),
                     args: command.args.clone(),
                     env: command.env.clone(),
+                    timeout: command.timeout,
                 },
                 working_directory,
                 cx.clone(),
@@ -131,6 +134,7 @@ impl ContextServer {
                 client::ContextServerId(self.id.0.clone()),
                 self.id().0,
                 transport.clone(),
+                None,
                 cx.clone(),
             )?,
         })
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
index 49a430c261..20188df5c4 100644
--- a/crates/project/src/context_server_store.rs
+++ b/crates/project/src/context_server_store.rs
@@ -976,6 +976,7 @@ mod tests {
                                 path: "somebinary".into(),
                                 args: vec!["arg".to_string()],
                                 env: None,
+                                timeout: None,
                             },
                         },
                     ),
@@ -1016,6 +1017,7 @@ mod tests {
                                 path: "somebinary".into(),
                                 args: vec!["anotherArg".to_string()],
                                 env: None,
+                                timeout: None,
                             },
                         },
                     ),
@@ -1098,6 +1100,7 @@ mod tests {
                         path: "somebinary".into(),
                         args: vec!["arg".to_string()],
                         env: None,
+                        timeout: None,
                     },
                 },
             )],
@@ -1150,6 +1153,7 @@ mod tests {
                             path: "somebinary".into(),
                             args: vec!["arg".to_string()],
                             env: None,
+                            timeout: None,
                         },
                     },
                 )],
@@ -1177,6 +1181,7 @@ mod tests {
                         command: ContextServerCommand {
                             path: "somebinary".into(),
                             args: vec!["arg".to_string()],
+                            timeout: None,
                             env: None,
                         },
                     },
@@ -1230,6 +1235,7 @@ mod tests {
                 path: "somebinary".into(),
                 args: vec!["arg".to_string()],
                 env: None,
+                timeout: None,
             },
         }
     }
@@ -1318,6 +1324,7 @@ mod tests {
                 path: self.path.clone(),
                 args: vec!["arg1".to_string(), "arg2".to_string()],
                 env: None,
+                timeout: None,
             }))
         }
 
diff --git a/crates/project/src/context_server_store/extension.rs b/crates/project/src/context_server_store/extension.rs
index 2a3a0c2e4b..ca5cacf3b5 100644
--- a/crates/project/src/context_server_store/extension.rs
+++ b/crates/project/src/context_server_store/extension.rs
@@ -69,6 +69,7 @@ impl registry::ContextServerDescriptor for ContextServerDescriptor {
                 path: command.command,
                 args: command.args,
                 env: Some(command.env.into_iter().collect()),
+                timeout: None,
             })
         })
     }
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 4a97130f15..4087463811 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -604,6 +604,7 @@ impl Settings for ProjectSettings {
                     path: cmd.command,
                     args: cmd.args.unwrap_or_default(),
                     env: cmd.env,
+                    timeout: None,
                 }
             }
         }

From e1b0a98c348870fa4ccbda82b10acf4d4b8035d9 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 2 Sep 2025 20:24:00 -0400
Subject: [PATCH 551/823] ci: Remove Windows crash analysis CI scripts (#36694)

We'll just SSH into the Windows runners and look for crashes there.

Reverts #35926

Release Notes:

- N/A

---------

Co-authored-by: Peter Tripp <petertripp@gmail.com>
---
 .github/actions/run_tests_windows/action.yml | 159 -------------------
 1 file changed, 159 deletions(-)

diff --git a/.github/actions/run_tests_windows/action.yml b/.github/actions/run_tests_windows/action.yml
index 0a550c7d32..8392ca1d37 100644
--- a/.github/actions/run_tests_windows/action.yml
+++ b/.github/actions/run_tests_windows/action.yml
@@ -20,167 +20,8 @@ runs:
       with:
         node-version: "18"
 
-    - name: Configure crash dumps
-      shell: powershell
-      run: |
-        # Record the start time for this CI run
-        $runStartTime = Get-Date
-        $runStartTimeStr = $runStartTime.ToString("yyyy-MM-dd HH:mm:ss")
-        Write-Host "CI run started at: $runStartTimeStr"
-
-        # Save the timestamp for later use
-        echo "CI_RUN_START_TIME=$($runStartTime.Ticks)" >> $env:GITHUB_ENV
-
-        # Create crash dump directory in workspace (non-persistent)
-        $dumpPath = "$env:GITHUB_WORKSPACE\crash_dumps"
-        New-Item -ItemType Directory -Force -Path $dumpPath | Out-Null
-
-        Write-Host "Setting up crash dump detection..."
-        Write-Host "Workspace dump path: $dumpPath"
-
-        # Note: We're NOT modifying registry on stateful runners
-        # Instead, we'll check default Windows crash locations after tests
-
     - name: Run tests
       shell: powershell
       working-directory: ${{ inputs.working-directory }}
       run: |
-        $env:RUST_BACKTRACE = "full"
-
-        # Enable Windows debugging features
-        $env:_NT_SYMBOL_PATH = "srv*https://msdl.microsoft.com/download/symbols"
-
-        # .NET crash dump environment variables (ephemeral)
-        $env:COMPlus_DbgEnableMiniDump = "1"
-        $env:COMPlus_DbgMiniDumpType = "4"
-        $env:COMPlus_CreateDumpDiagnostics = "1"
-
         cargo nextest run --workspace --no-fail-fast
-
-    - name: Analyze crash dumps
-      if: always()
-      shell: powershell
-      run: |
-        Write-Host "Checking for crash dumps..."
-
-        # Get the CI run start time from the environment
-        $runStartTime = [DateTime]::new([long]$env:CI_RUN_START_TIME)
-        Write-Host "Only analyzing dumps created after: $($runStartTime.ToString('yyyy-MM-dd HH:mm:ss'))"
-
-        # Check all possible crash dump locations
-        $searchPaths = @(
-            "$env:GITHUB_WORKSPACE\crash_dumps",
-            "$env:LOCALAPPDATA\CrashDumps",
-            "$env:TEMP",
-            "$env:GITHUB_WORKSPACE",
-            "$env:USERPROFILE\AppData\Local\CrashDumps",
-            "C:\Windows\System32\config\systemprofile\AppData\Local\CrashDumps"
-        )
-
-        $dumps = @()
-        foreach ($path in $searchPaths) {
-            if (Test-Path $path) {
-                Write-Host "Searching in: $path"
-                $found = Get-ChildItem "$path\*.dmp" -ErrorAction SilentlyContinue | Where-Object {
-                    $_.CreationTime -gt $runStartTime
-                }
-                if ($found) {
-                    $dumps += $found
-                    Write-Host "  Found $($found.Count) dump(s) from this CI run"
-                }
-            }
-        }
-
-        if ($dumps) {
-          Write-Host "Found $($dumps.Count) crash dump(s)"
-
-          # Install debugging tools if not present
-          $cdbPath = "C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe"
-          if (-not (Test-Path $cdbPath)) {
-            Write-Host "Installing Windows Debugging Tools..."
-            $url = "https://go.microsoft.com/fwlink/?linkid=2237387"
-            Invoke-WebRequest -Uri $url -OutFile winsdksetup.exe
-            Start-Process -Wait winsdksetup.exe -ArgumentList "/features OptionId.WindowsDesktopDebuggers /quiet"
-          }
-
-          foreach ($dump in $dumps) {
-            Write-Host "`n=================================="
-            Write-Host "Analyzing crash dump: $($dump.Name)"
-            Write-Host "Size: $([math]::Round($dump.Length / 1MB, 2)) MB"
-            Write-Host "Time: $($dump.CreationTime)"
-            Write-Host "=================================="
-
-            # Set symbol path
-            $env:_NT_SYMBOL_PATH = "srv*C:\symbols*https://msdl.microsoft.com/download/symbols"
-
-            # Run analysis
-            $analysisOutput = & $cdbPath -z $dump.FullName -c "!analyze -v; ~*k; lm; q" 2>&1 | Out-String
-
-            # Extract key information
-            if ($analysisOutput -match "ExceptionCode:\s*([\w]+)") {
-              Write-Host "Exception Code: $($Matches[1])"
-              if ($Matches[1] -eq "c0000005") {
-                Write-Host "Exception Type: ACCESS VIOLATION"
-              }
-            }
-
-            if ($analysisOutput -match "EXCEPTION_RECORD:\s*(.+)") {
-              Write-Host "Exception Record: $($Matches[1])"
-            }
-
-            if ($analysisOutput -match "FAULTING_IP:\s*\n(.+)") {
-              Write-Host "Faulting Instruction: $($Matches[1])"
-            }
-
-            # Save full analysis
-            $analysisFile = "$($dump.FullName).analysis.txt"
-            $analysisOutput | Out-File -FilePath $analysisFile
-            Write-Host "`nFull analysis saved to: $analysisFile"
-
-            # Print stack trace section
-            Write-Host "`n--- Stack Trace Preview ---"
-            $stackSection = $analysisOutput -split "STACK_TEXT:" | Select-Object -Last 1
-            $stackLines = $stackSection -split "`n" | Select-Object -First 20
-            $stackLines | ForEach-Object { Write-Host $_ }
-            Write-Host "--- End Stack Trace Preview ---"
-          }
-
-          Write-Host "`n⚠️  Crash dumps detected! Download the 'crash-dumps' artifact for detailed analysis."
-
-          # Copy dumps to workspace for artifact upload
-          $artifactPath = "$env:GITHUB_WORKSPACE\crash_dumps_collected"
-          New-Item -ItemType Directory -Force -Path $artifactPath | Out-Null
-
-          foreach ($dump in $dumps) {
-            $destName = "$($dump.Directory.Name)_$($dump.Name)"
-            Copy-Item $dump.FullName -Destination "$artifactPath\$destName"
-            if (Test-Path "$($dump.FullName).analysis.txt") {
-              Copy-Item "$($dump.FullName).analysis.txt" -Destination "$artifactPath\$destName.analysis.txt"
-            }
-          }
-
-          Write-Host "Copied $($dumps.Count) dump(s) to artifact directory"
-        } else {
-          Write-Host "No crash dumps from this CI run found"
-        }
-
-    - name: Upload crash dumps
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: crash-dumps-${{ github.run_id }}-${{ github.run_attempt }}
-        path: |
-          crash_dumps_collected/*.dmp
-          crash_dumps_collected/*.txt
-        if-no-files-found: ignore
-        retention-days: 7
-
-    - name: Check test results
-      shell: powershell
-      working-directory: ${{ inputs.working-directory }}
-      run: |
-        # Re-check test results to fail the job if tests failed
-        if ($LASTEXITCODE -ne 0) {
-          Write-Host "Tests failed with exit code: $LASTEXITCODE"
-          exit $LASTEXITCODE
-        }

From 161d128d45e9d99c0629917f0589ce6ac1e4d000 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 2 Sep 2025 20:25:10 -0400
Subject: [PATCH 552/823] Handle model refusal in ACP threads (#37383)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the model refuses a prompt, we now:
* Show an error if it was a user prompt (and truncate it out of the
history)
* Respond with a failed tool call if the refusal was for a tool call

<img width="607" height="260" alt="Screenshot 2025-09-02 at 5 11 45 PM"
src="https://github.com/user-attachments/assets/070b5ee7-6ad6-4a63-8395-f9a5093cc40e"
/>
<img width="607" height="265" alt="Screenshot 2025-09-02 at 5 11 38 PM"
src="https://github.com/user-attachments/assets/98862586-390b-494e-b1f8-71d8341c8d9d"
/>



Release Notes:

- Improve handling of model refusals in ACP threads
---
 crates/acp_thread/src/acp_thread.rs           | 223 +++++++++++++++++-
 .../src/acp/model_selector_popover.rs         |   8 +
 crates/agent_ui/src/acp/thread_view.rs        | 137 +++++++++++
 crates/agent_ui/src/active_thread.rs          |  16 +-
 crates/agent_ui/src/agent_diff.rs             |   5 +-
 crates/agent_ui/src/agent_panel.rs            |   9 +-
 6 files changed, 387 insertions(+), 11 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index f9a955eb9f..804e4683a7 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -804,6 +804,7 @@ pub enum AcpThreadEvent {
     Error,
     LoadError(LoadError),
     PromptCapabilitiesUpdated,
+    Refusal,
 }
 
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -1569,15 +1570,42 @@ impl AcpThread {
                             this.send_task.take();
                         }
 
-                        // Truncate entries if the last prompt was refused.
+                        // Handle refusal - distinguish between user prompt and tool call refusals
                         if let Ok(Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::Refusal,
                         })) = result
-                            && let Some((ix, _)) = this.last_user_message()
                         {
-                            let range = ix..this.entries.len();
-                            this.entries.truncate(ix);
-                            cx.emit(AcpThreadEvent::EntriesRemoved(range));
+                            if let Some((user_msg_ix, _)) = this.last_user_message() {
+                                // Check if there's a completed tool call with results after the last user message
+                                // This indicates the refusal is in response to tool output, not the user's prompt
+                                let has_completed_tool_call_after_user_msg =
+                                    this.entries.iter().skip(user_msg_ix + 1).any(|entry| {
+                                        if let AgentThreadEntry::ToolCall(tool_call) = entry {
+                                            // Check if the tool call has completed and has output
+                                            matches!(tool_call.status, ToolCallStatus::Completed)
+                                                && tool_call.raw_output.is_some()
+                                        } else {
+                                            false
+                                        }
+                                    });
+
+                                if has_completed_tool_call_after_user_msg {
+                                    // Refusal is due to tool output - don't truncate, just notify
+                                    // The model refused based on what the tool returned
+                                    cx.emit(AcpThreadEvent::Refusal);
+                                } else {
+                                    // User prompt was refused - truncate back to before the user message
+                                    let range = user_msg_ix..this.entries.len();
+                                    if range.start < range.end {
+                                        this.entries.truncate(user_msg_ix);
+                                        cx.emit(AcpThreadEvent::EntriesRemoved(range));
+                                    }
+                                    cx.emit(AcpThreadEvent::Refusal);
+                                }
+                            } else {
+                                // No user message found, treat as general refusal
+                                cx.emit(AcpThreadEvent::Refusal);
+                            }
                         }
 
                         cx.emit(AcpThreadEvent::Stopped);
@@ -2681,6 +2709,187 @@ mod tests {
         assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
     }
 
+    #[gpui::test]
+    async fn test_tool_result_refusal(cx: &mut TestAppContext) {
+        use std::sync::atomic::AtomicUsize;
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, None, cx).await;
+
+        // Create a connection that simulates refusal after tool result
+        let prompt_count = Arc::new(AtomicUsize::new(0));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
+            let prompt_count = prompt_count.clone();
+            move |_request, thread, mut cx| {
+                let count = prompt_count.fetch_add(1, SeqCst);
+                async move {
+                    if count == 0 {
+                        // First prompt: Generate a tool call with result
+                        thread.update(&mut cx, |thread, cx| {
+                            thread
+                                .handle_session_update(
+                                    acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                        id: acp::ToolCallId("tool1".into()),
+                                        title: "Test Tool".into(),
+                                        kind: acp::ToolKind::Fetch,
+                                        status: acp::ToolCallStatus::Completed,
+                                        content: vec![],
+                                        locations: vec![],
+                                        raw_input: Some(serde_json::json!({"query": "test"})),
+                                        raw_output: Some(
+                                            serde_json::json!({"result": "inappropriate content"}),
+                                        ),
+                                    }),
+                                    cx,
+                                )
+                                .unwrap();
+                        })?;
+
+                        // Now return refusal because of the tool result
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                        })
+                    } else {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::EndTurn,
+                        })
+                    }
+                }
+                .boxed_local()
+            }
+        }));
+
+        let thread = cx
+            .update(|cx| connection.new_thread(project, Path::new("/test"), cx))
+            .await
+            .unwrap();
+
+        // Track if we see a Refusal event
+        let saw_refusal_event = Arc::new(std::sync::Mutex::new(false));
+        let saw_refusal_event_captured = saw_refusal_event.clone();
+        thread.update(cx, |_thread, cx| {
+            cx.subscribe(
+                &thread,
+                move |_thread, _event_thread, event: &AcpThreadEvent, _cx| {
+                    if matches!(event, AcpThreadEvent::Refusal) {
+                        *saw_refusal_event_captured.lock().unwrap() = true;
+                    }
+                },
+            )
+            .detach();
+        });
+
+        // Send a user message - this will trigger tool call and then refusal
+        let send_task = thread.update(cx, |thread, cx| {
+            thread.send(
+                vec![acp::ContentBlock::Text(acp::TextContent {
+                    text: "Hello".into(),
+                    annotations: None,
+                })],
+                cx,
+            )
+        });
+        cx.background_executor.spawn(send_task).detach();
+        cx.run_until_parked();
+
+        // Verify that:
+        // 1. A Refusal event WAS emitted (because it's a tool result refusal, not user prompt)
+        // 2. The user message was NOT truncated
+        assert!(
+            *saw_refusal_event.lock().unwrap(),
+            "Refusal event should be emitted for tool result refusals"
+        );
+
+        thread.read_with(cx, |thread, _| {
+            let entries = thread.entries();
+            assert!(entries.len() >= 2, "Should have user message and tool call");
+
+            // Verify user message is still there
+            assert!(
+                matches!(entries[0], AgentThreadEntry::UserMessage(_)),
+                "User message should not be truncated"
+            );
+
+            // Verify tool call is there with result
+            if let AgentThreadEntry::ToolCall(tool_call) = &entries[1] {
+                assert!(
+                    tool_call.raw_output.is_some(),
+                    "Tool call should have output"
+                );
+            } else {
+                panic!("Expected tool call at index 1");
+            }
+        });
+    }
+
+    #[gpui::test]
+    async fn test_user_prompt_refusal_emits_event(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, None, cx).await;
+
+        let refuse_next = Arc::new(AtomicBool::new(false));
+        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
+            let refuse_next = refuse_next.clone();
+            move |_request, _thread, _cx| {
+                if refuse_next.load(SeqCst) {
+                    async move {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                        })
+                    }
+                    .boxed_local()
+                } else {
+                    async move {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::EndTurn,
+                        })
+                    }
+                    .boxed_local()
+                }
+            }
+        }));
+
+        let thread = cx
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
+            .await
+            .unwrap();
+
+        // Track if we see a Refusal event
+        let saw_refusal_event = Arc::new(std::sync::Mutex::new(false));
+        let saw_refusal_event_captured = saw_refusal_event.clone();
+        thread.update(cx, |_thread, cx| {
+            cx.subscribe(
+                &thread,
+                move |_thread, _event_thread, event: &AcpThreadEvent, _cx| {
+                    if matches!(event, AcpThreadEvent::Refusal) {
+                        *saw_refusal_event_captured.lock().unwrap() = true;
+                    }
+                },
+            )
+            .detach();
+        });
+
+        // Send a message that will be refused
+        refuse_next.store(true, SeqCst);
+        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
+            .await
+            .unwrap();
+
+        // Verify that a Refusal event WAS emitted for user prompt refusal
+        assert!(
+            *saw_refusal_event.lock().unwrap(),
+            "Refusal event should be emitted for user prompt refusals"
+        );
+
+        // Verify the message was truncated (user prompt refusal)
+        thread.read_with(cx, |thread, cx| {
+            assert_eq!(thread.to_markdown(cx), "");
+        });
+    }
+
     #[gpui::test]
     async fn test_refusal(cx: &mut TestAppContext) {
         init_test(cx);
@@ -2744,8 +2953,8 @@ mod tests {
             );
         });
 
-        // Simulate refusing the second message, ensuring the conversation gets
-        // truncated to before sending it.
+        // Simulate refusing the second message. The message should be truncated
+        // when a user prompt is refused.
         refuse_next.store(true, SeqCst);
         cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["world".into()], cx)))
             .await
diff --git a/crates/agent_ui/src/acp/model_selector_popover.rs b/crates/agent_ui/src/acp/model_selector_popover.rs
index e52101113a..e8e0d4be7f 100644
--- a/crates/agent_ui/src/acp/model_selector_popover.rs
+++ b/crates/agent_ui/src/acp/model_selector_popover.rs
@@ -36,6 +36,14 @@ impl AcpModelSelectorPopover {
     pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
         self.menu_handle.toggle(window, cx);
     }
+
+    pub fn active_model_name(&self, cx: &App) -> Option<SharedString> {
+        self.selector
+            .read(cx)
+            .delegate
+            .active_model()
+            .map(|model| model.name.clone())
+    }
 }
 
 impl Render for AcpModelSelectorPopover {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index dc8abd99ae..60b3166a57 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -78,10 +78,12 @@ enum ThreadFeedback {
     Negative,
 }
 
+#[derive(Debug)]
 enum ThreadError {
     PaymentRequired,
     ModelRequestLimitReached(cloud_llm_client::Plan),
     ToolUseLimitReached,
+    Refusal,
     AuthenticationRequired(SharedString),
     Other(SharedString),
 }
@@ -1255,6 +1257,14 @@ impl AcpThreadView {
                     cx,
                 );
             }
+            AcpThreadEvent::Refusal => {
+                self.thread_retry_status.take();
+                self.thread_error = Some(ThreadError::Refusal);
+                let model_or_agent_name = self.get_current_model_name(cx);
+                let notification_message =
+                    format!("{} refused to respond to this request", model_or_agent_name);
+                self.notify_with_sound(&notification_message, IconName::Warning, window, cx);
+            }
             AcpThreadEvent::Error => {
                 self.thread_retry_status.take();
                 self.notify_with_sound(
@@ -4740,6 +4750,7 @@ impl AcpThreadView {
     fn render_thread_error(&self, window: &mut Window, cx: &mut Context<Self>) -> Option<Div> {
         let content = match self.thread_error.as_ref()? {
             ThreadError::Other(error) => self.render_any_thread_error(error.clone(), cx),
+            ThreadError::Refusal => self.render_refusal_error(cx),
             ThreadError::AuthenticationRequired(error) => {
                 self.render_authentication_required_error(error.clone(), cx)
             }
@@ -4755,6 +4766,43 @@ impl AcpThreadView {
         Some(div().child(content))
     }
 
+    fn get_current_model_name(&self, cx: &App) -> SharedString {
+        // For native agent (Zed Agent), use the specific model name (e.g., "Claude 3.5 Sonnet")
+        // For ACP agents, use the agent name (e.g., "Claude Code", "Gemini CLI")
+        // This provides better clarity about what refused the request
+        if self
+            .agent
+            .clone()
+            .downcast::<agent2::NativeAgentServer>()
+            .is_some()
+        {
+            // Native agent - use the model name
+            self.model_selector
+                .as_ref()
+                .and_then(|selector| selector.read(cx).active_model_name(cx))
+                .unwrap_or_else(|| SharedString::from("The model"))
+        } else {
+            // ACP agent - use the agent name (e.g., "Claude Code", "Gemini CLI")
+            self.agent.name()
+        }
+    }
+
+    fn render_refusal_error(&self, cx: &mut Context<'_, Self>) -> Callout {
+        let model_or_agent_name = self.get_current_model_name(cx);
+        let refusal_message = format!(
+            "{} refused to respond to this prompt. This can happen when a model believes the prompt violates its content policy or safety guidelines, so rephrasing it can sometimes address the issue.",
+            model_or_agent_name
+        );
+
+        Callout::new()
+            .severity(Severity::Error)
+            .title("Request Refused")
+            .icon(IconName::XCircle)
+            .description(refusal_message.clone())
+            .actions_slot(self.create_copy_button(&refusal_message))
+            .dismiss_action(self.dismiss_error_button(cx))
+    }
+
     fn render_any_thread_error(&self, error: SharedString, cx: &mut Context<'_, Self>) -> Callout {
         let can_resume = self
             .thread()
@@ -5382,6 +5430,33 @@ pub(crate) mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_refusal_handling(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let (thread_view, cx) =
+            setup_thread_view(StubAgentServer::new(RefusalAgentConnection), cx).await;
+
+        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
+        message_editor.update_in(cx, |editor, window, cx| {
+            editor.set_text("Do something harmful", window, cx);
+        });
+
+        thread_view.update_in(cx, |thread_view, window, cx| {
+            thread_view.send(window, cx);
+        });
+
+        cx.run_until_parked();
+
+        // Check that the refusal error is set
+        thread_view.read_with(cx, |thread_view, _cx| {
+            assert!(
+                matches!(thread_view.thread_error, Some(ThreadError::Refusal)),
+                "Expected refusal error to be set"
+            );
+        });
+    }
+
     #[gpui::test]
     async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
         init_test(cx);
@@ -5617,6 +5692,68 @@ pub(crate) mod tests {
         }
     }
 
+    /// Simulates a model which always returns a refusal response
+    #[derive(Clone)]
+    struct RefusalAgentConnection;
+
+    impl AgentConnection for RefusalAgentConnection {
+        fn new_thread(
+            self: Rc<Self>,
+            project: Entity<Project>,
+            _cwd: &Path,
+            cx: &mut gpui::App,
+        ) -> Task<gpui::Result<Entity<AcpThread>>> {
+            Task::ready(Ok(cx.new(|cx| {
+                let action_log = cx.new(|_| ActionLog::new(project.clone()));
+                AcpThread::new(
+                    "RefusalAgentConnection",
+                    self,
+                    project,
+                    action_log,
+                    SessionId("test".into()),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                    }),
+                    Vec::new(),
+                    cx,
+                )
+            })))
+        }
+
+        fn auth_methods(&self) -> &[acp::AuthMethod] {
+            &[]
+        }
+
+        fn authenticate(
+            &self,
+            _method_id: acp::AuthMethodId,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<()>> {
+            unimplemented!()
+        }
+
+        fn prompt(
+            &self,
+            _id: Option<acp_thread::UserMessageId>,
+            _params: acp::PromptRequest,
+            _cx: &mut App,
+        ) -> Task<gpui::Result<acp::PromptResponse>> {
+            Task::ready(Ok(acp::PromptResponse {
+                stop_reason: acp::StopReason::Refusal,
+            }))
+        }
+
+        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
+            unimplemented!()
+        }
+
+        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
+            self
+        }
+    }
+
     pub(crate) fn init_test(cx: &mut TestAppContext) {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 371a59e7eb..fbba3eaffd 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1001,8 +1001,22 @@ impl ActiveThread {
                         // Don't notify for intermediate tool use
                     }
                     Ok(StopReason::Refusal) => {
+                        let model_name = self
+                            .thread
+                            .read(cx)
+                            .configured_model()
+                            .map(|configured| configured.model.name().0.to_string())
+                            .unwrap_or_else(|| "The model".to_string());
+                        let refusal_message = format!(
+                            "{} refused to respond to this prompt. This can happen when a model believes the prompt violates its content policy or safety guidelines, so rephrasing it can sometimes address the issue.",
+                            model_name
+                        );
+                        self.last_error = Some(ThreadError::Message {
+                            header: SharedString::from("Request Refused"),
+                            message: SharedString::from(refusal_message),
+                        });
                         self.notify_with_sound(
-                            "Language model refused to respond",
+                            format!("{} refused to respond", model_name),
                             IconName::Warning,
                             window,
                             cx,
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 74bcb266d5..f9d7321ca8 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1517,7 +1517,10 @@ impl AgentDiff {
                     self.update_reviewing_editors(workspace, window, cx);
                 }
             }
-            AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::LoadError(_) => {
+            AcpThreadEvent::Stopped
+            | AcpThreadEvent::Error
+            | AcpThreadEvent::LoadError(_)
+            | AcpThreadEvent::Refusal => {
                 self.update_reviewing_editors(workspace, window, cx);
             }
             AcpThreadEvent::TitleUpdated
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 2383963d6c..cfa5b56358 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -3532,6 +3532,11 @@ impl AgentPanel {
     ) -> AnyElement {
         let message_with_header = format!("{}\n{}", header, message);
 
+        // Don't show Retry button for refusals
+        let is_refusal = header == "Request Refused";
+        let retry_button = self.render_retry_button(thread);
+        let copy_button = self.create_copy_button(message_with_header);
+
         Callout::new()
             .severity(Severity::Error)
             .icon(IconName::XCircle)
@@ -3540,8 +3545,8 @@ impl AgentPanel {
             .actions_slot(
                 h_flex()
                     .gap_0p5()
-                    .child(self.render_retry_button(thread))
-                    .child(self.create_copy_button(message_with_header)),
+                    .when(!is_refusal, |this| this.child(retry_button))
+                    .child(copy_button),
             )
             .dismiss_action(self.dismiss_error_button(thread, cx))
             .into_any_element()

From 9d6727609070196b81cb675fc98a5edd248a531a Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:28:35 -0300
Subject: [PATCH 553/823] agent: Fix cut off slash command descriptions
 (#37408)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/completion_provider.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 6d2253b406..44e81433ab 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -733,7 +733,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                 replace_range: source_range.clone(),
                                 new_text,
                                 label: CodeLabel::plain(command.name.to_string(), None),
-                                documentation: Some(CompletionDocumentation::SingleLine(
+                                documentation: Some(CompletionDocumentation::MultiLinePlainText(
                                     command.description.into(),
                                 )),
                                 source: project::CompletionSource::Custom,
@@ -772,7 +772,9 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
                     Ok(vec![CompletionResponse {
                         completions,
-                        display_options: CompletionDisplayOptions::default(),
+                        display_options: CompletionDisplayOptions {
+                            dynamic_width: true,
+                        },
                         // Since this does its own filtering (see `filter_completions()` returns false),
                         // there is no benefit to computing whether this set of completions is incomplete.
                         is_incomplete: true,
@@ -864,7 +866,9 @@ impl CompletionProvider for ContextPickerCompletionProvider {
 
                     Ok(vec![CompletionResponse {
                         completions,
-                        display_options: CompletionDisplayOptions::default(),
+                        display_options: CompletionDisplayOptions {
+                            dynamic_width: true,
+                        },
                         // Since this does its own filtering (see `filter_completions()` returns false),
                         // there is no benefit to computing whether this set of completions is incomplete.
                         is_incomplete: true,

From 035d7ddcf89e80d3445b61444f14fbd2dc6d75b0 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 2 Sep 2025 20:37:40 -0400
Subject: [PATCH 554/823] ci: Skip Nix for commits on release branches and tags
 (#37407)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When doing stable/preview releases simultaneously there are two tags and
two branches pushed. Previously nix was attempting 1 job for each. Our
current mac parallelism is 4.

Can't easily test this. 🤷

Release Notes:

- N/A
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a34833d0fd..d416b4af0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,6 +81,7 @@ jobs:
             echo "run_license=false" >> "$GITHUB_OUTPUT"
 
           echo "$CHANGED_FILES" | grep -qP '^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)' && \
+            echo "$GITHUB_REF_NAME" | grep -qvP '^v[0-9]+\.[0-9]+\.[0-9x](-pre)?$' && \
             echo "run_nix=true" >> "$GITHUB_OUTPUT" || \
             echo "run_nix=false" >> "$GITHUB_OUTPUT"
 

From 7ea7f4e76765cb3337b1efe4656fbe1c26a9791a Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Tue, 2 Sep 2025 20:52:04 -0400
Subject: [PATCH 555/823] reqwest_client: Remove example (#37410)

This PR removes the example from the `reqwest_client` crate, as it
doesn't seem worth maintaining.

Release Notes:

- N/A
---
 Cargo.lock                               |  1 -
 crates/reqwest_client/Cargo.toml         |  5 ---
 crates/reqwest_client/examples/client.rs | 41 ------------------------
 3 files changed, 47 deletions(-)
 delete mode 100644 crates/reqwest_client/examples/client.rs

diff --git a/Cargo.lock b/Cargo.lock
index 42e343e062..50e57005fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13748,7 +13748,6 @@ dependencies = [
  "regex",
  "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
  "serde",
- "smol",
  "tokio",
  "workspace-hack",
 ]
diff --git a/crates/reqwest_client/Cargo.toml b/crates/reqwest_client/Cargo.toml
index 20b5177a73..68a354c13b 100644
--- a/crates/reqwest_client/Cargo.toml
+++ b/crates/reqwest_client/Cargo.toml
@@ -15,10 +15,6 @@ test-support = []
 path = "src/reqwest_client.rs"
 doctest = true
 
-[[example]]
-name = "client"
-path = "examples/client.rs"
-
 [dependencies]
 anyhow.workspace = true
 bytes.workspace = true
@@ -26,7 +22,6 @@ futures.workspace = true
 http_client.workspace = true
 http_client_tls.workspace = true
 serde.workspace = true
-smol.workspace = true
 log.workspace = true
 tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
 regex.workspace = true
diff --git a/crates/reqwest_client/examples/client.rs b/crates/reqwest_client/examples/client.rs
deleted file mode 100644
index 71af8d72cb..0000000000
--- a/crates/reqwest_client/examples/client.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::time::Instant;
-
-use futures::AsyncReadExt as _;
-use futures::stream::FuturesUnordered;
-use http_client::AsyncBody;
-use http_client::HttpClient;
-use reqwest_client::ReqwestClient;
-use smol::stream::StreamExt;
-
-fn main() {
-    let app = gpui::Application::new();
-    app.run(|cx| {
-        cx.spawn(async move |cx| {
-            let client = ReqwestClient::new();
-            let start = Instant::now();
-            let requests = [
-                client.get("https://www.google.com/", AsyncBody::empty(), true),
-                client.get("https://zed.dev/", AsyncBody::empty(), true),
-                client.get("https://docs.rs/", AsyncBody::empty(), true),
-            ];
-            let mut requests = requests.into_iter().collect::<FuturesUnordered<_>>();
-            while let Some(response) = requests.next().await {
-                let mut body = String::new();
-                response
-                    .unwrap()
-                    .into_body()
-                    .read_to_string(&mut body)
-                    .await
-                    .unwrap();
-                println!("{}", &body.len());
-            }
-            println!("{:?}", start.elapsed());
-
-            cx.update(|cx| {
-                cx.quit();
-            })
-            .ok();
-        })
-        .detach();
-    })
-}

From 1ed17fdd941f43891f4358980528c1d5231c731e Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Tue, 2 Sep 2025 21:00:19 -0400
Subject: [PATCH 556/823] Bump Zed to v0.204 (#37415)

Release Notes:

-N/A
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 50e57005fd..88150a2931 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20398,7 +20398,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.203.0"
+version = "0.204.0"
 dependencies = [
  "acp_tools",
  "activity_indicator",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index bb46a5a4f6..f82f544acc 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "0.203.0"
+version = "0.204.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From f23096034b35e9520e2799bc274d9f08d1426bcc Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 2 Sep 2025 20:49:04 -0700
Subject: [PATCH 557/823] Remove wsl command line args on non-windows platforms
 (#37422)

Release Notes:

- N/A
---
 crates/cli/src/main.rs | 15 +++++++++++++--
 crates/zed/src/main.rs |  8 +++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index d67843b4c9..d4b4a350f6 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -93,6 +93,7 @@ struct Args {
     /// Example: `me@Ubuntu` or `Ubuntu`.
     ///
     /// WARN: You should not fill in this field by hand.
+    #[cfg(target_os = "windows")]
     #[arg(long, value_name = "USER@DISTRO")]
     wsl: Option<String>,
     /// Not supported in Zed CLI, only supported on Zed binary
@@ -303,6 +304,11 @@ fn main() -> Result<()> {
         ]);
     }
 
+    #[cfg(target_os = "windows")]
+    let wsl = args.wsl.as_ref();
+    #[cfg(not(target_os = "windows"))]
+    let wsl = None;
+
     for path in args.paths_with_position.iter() {
         if path.starts_with("zed://")
             || path.starts_with("http://")
@@ -321,7 +327,7 @@ fn main() -> Result<()> {
             paths.push(tmp_file.path().to_string_lossy().to_string());
             let (tmp_file, _) = tmp_file.keep()?;
             anonymous_fd_tmp_files.push((file, tmp_file));
-        } else if let Some(wsl) = &args.wsl {
+        } else if let Some(wsl) = wsl {
             urls.push(format!("file://{}", parse_path_in_wsl(path, wsl)?));
         } else {
             paths.push(parse_path_with_position(path)?);
@@ -340,11 +346,16 @@ fn main() -> Result<()> {
             let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
             let (tx, rx) = (handshake.requests, handshake.responses);
 
+            #[cfg(target_os = "windows")]
+            let wsl = args.wsl;
+            #[cfg(not(target_os = "windows"))]
+            let wsl = None;
+
             tx.send(CliRequest::Open {
                 paths,
                 urls,
                 diff_paths,
-                wsl: args.wsl,
+                wsl,
                 wait: args.wait,
                 open_new_workspace,
                 env,
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 3a7baa1559..52e475edf8 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -707,11 +707,16 @@ pub fn main() {
             .map(|chunk| [chunk[0].clone(), chunk[1].clone()])
             .collect();
 
+        #[cfg(target_os = "windows")]
+        let wsl = args.wsl;
+        #[cfg(not(target_os = "windows"))]
+        let wsl = None;
+
         if !urls.is_empty() || !diff_paths.is_empty() {
             open_listener.open(RawOpenRequest {
                 urls,
                 diff_paths,
-                wsl: args.wsl,
+                wsl,
             })
         }
 
@@ -1192,6 +1197,7 @@ struct Args {
     /// Example: `me@Ubuntu` or `Ubuntu`.
     ///
     /// WARN: You should not fill in this field by hand.
+    #[cfg(target_os = "windows")]
     #[arg(long, value_name = "USER@DISTRO")]
     wsl: Option<String>,
 

From 2a7761fe172217213c8092c52a42bfa0898b2688 Mon Sep 17 00:00:00 2001
From: chris <7566903+cwwhitman@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:36:36 -0700
Subject: [PATCH 558/823] Instruct macOS users to run `xcodebuild
 -downloadComponent MetalToolchain` (#37411)

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 docs/src/development/macos.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md
index d90cc89abc..c7e92623d4 100644
--- a/docs/src/development/macos.md
+++ b/docs/src/development/macos.md
@@ -69,6 +69,8 @@ xcrun: error: unable to find utility "metal", not a developer tool or in PATH
 
 Try `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`
 
+If you're on macOS 26, try `xcodebuild -downloadComponent MetalToolchain`
+
 ### Cargo errors claiming that a dependency is using unstable features
 
 Try `cargo clean` and `cargo build`.

From 5a9e18603dfd41a1d8ee81aa0844d4a33bd179e0 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Wed, 3 Sep 2025 07:31:48 +0200
Subject: [PATCH 559/823] gpui: Fix intra rustdoc links (#37320)

The only warnings remaining are links to private modules/items, but I
lack knowledge to work out if the referenced modules/items should be
made public, or if the links should be rewritten into exposed
traits/items.

Links to associated items such as trait implementations have to be
written using full markdown format such as:

... [[ `App::update_global` ]](( BorrowAppContext::update_global ))

This is due to https://github.com/rust-lang/rust/issues/74563 which
sadly prohibits fully-qualified syntax:

... [[ `<App as BorrowAppContext>::update_global` ]]

Release Notes:

- N/A

Probably related to https://github.com/zed-industries/zed/pull/37072
---
 crates/gpui/src/app.rs               |  2 +-
 crates/gpui/src/app/async_context.rs |  4 ++--
 crates/gpui/src/colors.rs            |  4 ++--
 crates/gpui/src/element.rs           |  4 ++--
 crates/gpui/src/elements/div.rs      | 10 +++++-----
 crates/gpui/src/elements/list.rs     |  4 ++--
 crates/gpui/src/executor.rs          |  6 +++---
 crates/gpui/src/gpui.rs              | 12 ++++++------
 crates/gpui/src/input.rs             |  2 +-
 crates/gpui/src/path_builder.rs      |  2 +-
 crates/gpui/src/text_system.rs       |  8 ++++----
 crates/gpui/src/window.rs            | 22 +++++++++++-----------
 crates/util/src/schemars.rs          |  2 +-
 crates/util/src/util.rs              |  2 +-
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 669a95bd91..69d5c0ee43 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -2313,7 +2313,7 @@ pub struct AnyDrag {
 }
 
 /// Contains state associated with a tooltip. You'll only need this struct if you're implementing
-/// tooltip behavior on a custom element. Otherwise, use [Div::tooltip].
+/// tooltip behavior on a custom element. Otherwise, use [Div::tooltip](crate::Interactivity::tooltip).
 #[derive(Clone)]
 pub struct AnyTooltip {
     /// The view used to display the tooltip
diff --git a/crates/gpui/src/app/async_context.rs b/crates/gpui/src/app/async_context.rs
index 5eb4362904..f3b8c0ce77 100644
--- a/crates/gpui/src/app/async_context.rs
+++ b/crates/gpui/src/app/async_context.rs
@@ -218,7 +218,7 @@ impl AsyncApp {
         Some(read(app.try_global()?, &app))
     }
 
-    /// A convenience method for [App::update_global]
+    /// A convenience method for [`App::update_global`](BorrowAppContext::update_global)
     /// for updating the global state of the specified type.
     pub fn update_global<G: Global, R>(
         &self,
@@ -293,7 +293,7 @@ impl AsyncWindowContext {
             .update(self, |_, window, cx| read(cx.global(), window, cx))
     }
 
-    /// A convenience method for [`App::update_global`].
+    /// A convenience method for [`App::update_global`](BorrowAppContext::update_global).
     /// for updating the global state of the specified type.
     pub fn update_global<G, R>(
         &mut self,
diff --git a/crates/gpui/src/colors.rs b/crates/gpui/src/colors.rs
index 5e14c1238a..ef11ef57fd 100644
--- a/crates/gpui/src/colors.rs
+++ b/crates/gpui/src/colors.rs
@@ -88,9 +88,9 @@ impl Deref for GlobalColors {
 
 impl Global for GlobalColors {}
 
-/// Implement this trait to allow global [Color] access via `cx.default_colors()`.
+/// Implement this trait to allow global [Colors] access via `cx.default_colors()`.
 pub trait DefaultColors {
-    /// Returns the default [`gpui::Colors`]
+    /// Returns the default [`Colors`]
     fn default_colors(&self) -> &Arc<Colors>;
 }
 
diff --git a/crates/gpui/src/element.rs b/crates/gpui/src/element.rs
index f537bc5ac8..a3fc6269f3 100644
--- a/crates/gpui/src/element.rs
+++ b/crates/gpui/src/element.rs
@@ -14,13 +14,13 @@
 //! tree and any callbacks they have registered with GPUI are dropped and the process repeats.
 //!
 //! But some state is too simple and voluminous to store in every view that needs it, e.g.
-//! whether a hover has been started or not. For this, GPUI provides the [`Element::State`], associated type.
+//! whether a hover has been started or not. For this, GPUI provides the [`Element::PrepaintState`], associated type.
 //!
 //! # Implementing your own elements
 //!
 //! Elements are intended to be the low level, imperative API to GPUI. They are responsible for upholding,
 //! or breaking, GPUI's features as they deem necessary. As an example, most GPUI elements are expected
-//! to stay in the bounds that their parent element gives them. But with [`WindowContext::break_content_mask`],
+//! to stay in the bounds that their parent element gives them. But with [`Window::with_content_mask`],
 //! you can ignore this restriction and paint anywhere inside of the window's bounds. This is useful for overlays
 //! and popups and anything else that shows up 'on top' of other elements.
 //! With great power, comes great responsibility.
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index c9826b704e..443bcb14bb 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -533,7 +533,7 @@ impl Interactivity {
     }
 
     /// Use the given callback to construct a new tooltip view when the mouse hovers over this element.
-    /// The imperative API equivalent to [`InteractiveElement::tooltip`]
+    /// The imperative API equivalent to [`StatefulInteractiveElement::tooltip`]
     pub fn tooltip(&mut self, build_tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static)
     where
         Self: Sized,
@@ -550,7 +550,7 @@ impl Interactivity {
 
     /// Use the given callback to construct a new tooltip view when the mouse hovers over this element.
     /// The tooltip itself is also hoverable and won't disappear when the user moves the mouse into
-    /// the tooltip. The imperative API equivalent to [`InteractiveElement::hoverable_tooltip`]
+    /// the tooltip. The imperative API equivalent to [`StatefulInteractiveElement::hoverable_tooltip`]
     pub fn hoverable_tooltip(
         &mut self,
         build_tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
@@ -676,7 +676,7 @@ pub trait InteractiveElement: Sized {
 
     #[cfg(any(test, feature = "test-support"))]
     /// Set a key that can be used to look up this element's bounds
-    /// in the [`VisualTestContext::debug_bounds`] map
+    /// in the [`crate::VisualTestContext::debug_bounds`] map
     /// This is a noop in release builds
     fn debug_selector(mut self, f: impl FnOnce() -> String) -> Self {
         self.interactivity().debug_selector = Some(f());
@@ -685,7 +685,7 @@ pub trait InteractiveElement: Sized {
 
     #[cfg(not(any(test, feature = "test-support")))]
     /// Set a key that can be used to look up this element's bounds
-    /// in the [`VisualTestContext::debug_bounds`] map
+    /// in the [`crate::VisualTestContext::debug_bounds`] map
     /// This is a noop in release builds
     #[inline]
     fn debug_selector(self, _: impl FnOnce() -> String) -> Self {
@@ -1087,7 +1087,7 @@ pub trait StatefulInteractiveElement: InteractiveElement {
 
     /// On drag initiation, this callback will be used to create a new view to render the dragged value for a
     /// drag and drop operation. This API should also be used as the equivalent of 'on drag start' with
-    /// the [`Self::on_drag_move`] API.
+    /// the [`InteractiveElement::on_drag_move`] API.
     /// The callback also has access to the offset of triggering click from the origin of parent element.
     /// The fluent API equivalent to [`Interactivity::on_drag`]
     ///
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 6758f4eee1..ed4ca64e83 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -5,7 +5,7 @@
 //! In order to minimize re-renders, this element's state is stored intrusively
 //! on your own views, so that your code can coordinate directly with the list element's cached state.
 //!
-//! If all of your elements are the same height, see [`UniformList`] for a simpler API
+//! If all of your elements are the same height, see [`crate::UniformList`] for a simpler API
 
 use crate::{
     AnyElement, App, AvailableSpace, Bounds, ContentMask, DispatchPhase, Edges, Element, EntityId,
@@ -235,7 +235,7 @@ impl ListState {
     }
 
     /// Register with the list state that the items in `old_range` have been replaced
-    /// by new items. As opposed to [`splice`], this method allows an iterator of optional focus handles
+    /// by new items. As opposed to [`Self::splice`], this method allows an iterator of optional focus handles
     /// to be supplied to properly integrate with items in the list that can be focused. If a focused item
     /// is scrolled out of view, the list will continue to render it to allow keyboard interaction.
     pub fn splice_focusable(
diff --git a/crates/gpui/src/executor.rs b/crates/gpui/src/executor.rs
index 273a3ea503..0b28dd030b 100644
--- a/crates/gpui/src/executor.rs
+++ b/crates/gpui/src/executor.rs
@@ -391,7 +391,7 @@ impl BackgroundExecutor {
     }
 
     /// in tests, run all tasks that are ready to run. If after doing so
-    /// the test still has outstanding tasks, this will panic. (See also `allow_parking`)
+    /// the test still has outstanding tasks, this will panic. (See also [`Self::allow_parking`])
     #[cfg(any(test, feature = "test-support"))]
     pub fn run_until_parked(&self) {
         self.dispatcher.as_test().unwrap().run_until_parked()
@@ -405,7 +405,7 @@ impl BackgroundExecutor {
         self.dispatcher.as_test().unwrap().allow_parking();
     }
 
-    /// undoes the effect of [`allow_parking`].
+    /// undoes the effect of [`Self::allow_parking`].
     #[cfg(any(test, feature = "test-support"))]
     pub fn forbid_parking(&self) {
         self.dispatcher.as_test().unwrap().forbid_parking();
@@ -480,7 +480,7 @@ impl ForegroundExecutor {
 /// Variant of `async_task::spawn_local` that includes the source location of the spawn in panics.
 ///
 /// Copy-modified from:
-/// https://github.com/smol-rs/async-task/blob/ca9dbe1db9c422fd765847fa91306e30a6bb58a9/src/runnable.rs#L405
+/// <https://github.com/smol-rs/async-task/blob/ca9dbe1db9c422fd765847fa91306e30a6bb58a9/src/runnable.rs#L405>
 #[track_caller]
 fn spawn_local_with_source_location<Fut, S>(
     future: Fut,
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 0f5b98df39..3c4ee41c16 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -24,7 +24,7 @@
 //! - State management and communication with [`Entity`]'s. Whenever you need to store application state
 //!   that communicates between different parts of your application, you'll want to use GPUI's
 //!   entities. Entities are owned by GPUI and are only accessible through an owned smart pointer
-//!   similar to an [`std::rc::Rc`]. See the [`app::context`] module for more information.
+//!   similar to an [`std::rc::Rc`]. See [`app::Context`] for more information.
 //!
 //! - High level, declarative UI with views. All UI in GPUI starts with a view. A view is simply
 //!   a [`Entity`] that can be rendered, by implementing the [`Render`] trait. At the start of each frame, GPUI
@@ -37,7 +37,7 @@
 //!   provide a nice wrapper around an imperative API that provides as much flexibility and control as
 //!   you need. Elements have total control over how they and their child elements are rendered and
 //!   can be used for making efficient views into large lists, implement custom layouting for a code editor,
-//!   and anything else you can think of. See the [`element`] module for more information.
+//!   and anything else you can think of. See the [`elements`] module for more information.
 //!
 //!  Each of these registers has one or more corresponding contexts that can be accessed from all GPUI services.
 //!  This context is your main interface to GPUI, and is used extensively throughout the framework.
@@ -51,9 +51,9 @@
 //!   Use this for implementing keyboard shortcuts, such as cmd-q (See `action` module for more information).
 //! - Platform services, such as `quit the app` or `open a URL` are available as methods on the [`app::App`].
 //! - An async executor that is integrated with the platform's event loop. See the [`executor`] module for more information.,
-//! - The [`gpui::test`](test) macro provides a convenient way to write tests for your GPUI applications. Tests also have their
-//!   own kind of context, a [`TestAppContext`] which provides ways of simulating common platform input. See [`app::test_context`]
-//!   and [`test`] modules for more details.
+//! - The [`gpui::test`](macro@test) macro provides a convenient way to write tests for your GPUI applications. Tests also have their
+//!   own kind of context, a [`TestAppContext`] which provides ways of simulating common platform input. See [`TestAppContext`]
+//!   and [`mod@test`] modules for more details.
 //!
 //! Currently, the best way to learn about these APIs is to read the Zed source code, ask us about it at a fireside hack, or drop
 //! a question in the [Zed Discord](https://zed.dev/community-links). We're working on improving the documentation, creating more examples,
@@ -117,7 +117,7 @@ pub mod private {
 
 mod seal {
     /// A mechanism for restricting implementations of a trait to only those in GPUI.
-    /// See: https://predr.ag/blog/definitive-guide-to-sealed-traits-in-rust/
+    /// See: <https://predr.ag/blog/definitive-guide-to-sealed-traits-in-rust/>
     pub trait Sealed {}
 }
 
diff --git a/crates/gpui/src/input.rs b/crates/gpui/src/input.rs
index 4acd7f90c1..dc36ef9e16 100644
--- a/crates/gpui/src/input.rs
+++ b/crates/gpui/src/input.rs
@@ -72,7 +72,7 @@ pub trait EntityInputHandler: 'static + Sized {
     ) -> Option<usize>;
 }
 
-/// The canonical implementation of [`PlatformInputHandler`]. Call [`Window::handle_input`]
+/// The canonical implementation of [`crate::PlatformInputHandler`]. Call [`Window::handle_input`]
 /// with an instance during your element's paint.
 pub struct ElementInputHandler<V> {
     view: Entity<V>,
diff --git a/crates/gpui/src/path_builder.rs b/crates/gpui/src/path_builder.rs
index 38903ea588..40a6e71e0a 100644
--- a/crates/gpui/src/path_builder.rs
+++ b/crates/gpui/src/path_builder.rs
@@ -318,7 +318,7 @@ impl PathBuilder {
         Ok(Self::build_path(buf))
     }
 
-    /// Builds a [`Path`] from a [`lyon::VertexBuffers`].
+    /// Builds a [`Path`] from a [`lyon::tessellation::VertexBuffers`].
     pub fn build_path(buf: VertexBuffers<lyon::math::Point, u16>) -> Path<Pixels> {
         if buf.vertices.is_empty() {
             return Path::new(Point::default());
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 53991089da..4d4087f45d 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -351,7 +351,7 @@ impl WindowTextSystem {
     ///
     /// Note that this method can only shape a single line of text. It will panic
     /// if the text contains newlines. If you need to shape multiple lines of text,
-    /// use `TextLayout::shape_text` instead.
+    /// use [`Self::shape_text`] instead.
     pub fn shape_line(
         &self,
         text: SharedString,
@@ -517,7 +517,7 @@ impl WindowTextSystem {
 
     /// Layout the given line of text, at the given font_size.
     /// Subsets of the line can be styled independently with the `runs` parameter.
-    /// Generally, you should prefer to use `TextLayout::shape_line` instead, which
+    /// Generally, you should prefer to use [`Self::shape_line`] instead, which
     /// can be painted directly.
     pub fn layout_line<Text>(
         &self,
@@ -668,7 +668,7 @@ impl Display for FontStyle {
     }
 }
 
-/// A styled run of text, for use in [`TextLayout`].
+/// A styled run of text, for use in [`crate::TextLayout`].
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct TextRun {
     /// A number of utf8 bytes
@@ -694,7 +694,7 @@ impl TextRun {
     }
 }
 
-/// An identifier for a specific glyph, as returned by [`TextSystem::layout_line`].
+/// An identifier for a specific glyph, as returned by [`WindowTextSystem::layout_line`].
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
 #[repr(C)]
 pub struct GlyphId(pub(crate) u32);
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index c2719665d4..0ec73c4b00 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -585,7 +585,7 @@ pub enum HitboxBehavior {
     ///     if phase == DispatchPhase::Capture && hitbox.is_hovered(window) {
     ///         cx.stop_propagation();
     ///     }
-    /// }
+    /// })
     /// ```
     ///
     /// This has effects beyond event handling - any use of hitbox checking, such as hover
@@ -605,11 +605,11 @@ pub enum HitboxBehavior {
     /// bubble-phase handler for every mouse event type **except** `ScrollWheelEvent`:
     ///
     /// ```
-    /// window.on_mouse_event(move |_: &EveryMouseEventTypeExceptScroll, phase, window, _cx| {
+    /// window.on_mouse_event(move |_: &EveryMouseEventTypeExceptScroll, phase, window, cx| {
     ///     if phase == DispatchPhase::Bubble && hitbox.should_handle_scroll(window) {
     ///         cx.stop_propagation();
     ///     }
-    /// }
+    /// })
     /// ```
     ///
     /// See the documentation of [`Hitbox::is_hovered`] for details of why `ScrollWheelEvent` is
@@ -1909,7 +1909,7 @@ impl Window {
     }
 
     /// Produces a new frame and assigns it to `rendered_frame`. To actually show
-    /// the contents of the new [Scene], use [present].
+    /// the contents of the new [`Scene`], use [`Self::present`].
     #[profiling::function]
     pub fn draw(&mut self, cx: &mut App) -> ArenaClearNeeded {
         self.invalidate_entities();
@@ -2451,7 +2451,7 @@ impl Window {
     /// Perform prepaint on child elements in a "retryable" manner, so that any side effects
     /// of prepaints can be discarded before prepainting again. This is used to support autoscroll
     /// where we need to prepaint children to detect the autoscroll bounds, then adjust the
-    /// element offset and prepaint again. See [`List`] for an example. This method should only be
+    /// element offset and prepaint again. See [`crate::List`] for an example. This method should only be
     /// called during the prepaint phase of element drawing.
     pub fn transact<T, U>(&mut self, f: impl FnOnce(&mut Self) -> Result<T, U>) -> Result<T, U> {
         self.invalidator.debug_assert_prepaint();
@@ -2476,9 +2476,9 @@ impl Window {
         result
     }
 
-    /// When you call this method during [`prepaint`], containing elements will attempt to
+    /// When you call this method during [`Element::prepaint`], containing elements will attempt to
     /// scroll to cause the specified bounds to become visible. When they decide to autoscroll, they will call
-    /// [`prepaint`] again with a new set of bounds. See [`List`] for an example of an element
+    /// [`Element::prepaint`] again with a new set of bounds. See [`crate::List`] for an example of an element
     /// that supports this method being called on the elements it contains. This method should only be
     /// called during the prepaint phase of element drawing.
     pub fn request_autoscroll(&mut self, bounds: Bounds<Pixels>) {
@@ -2486,8 +2486,8 @@ impl Window {
         self.requested_autoscroll = Some(bounds);
     }
 
-    /// This method can be called from a containing element such as [`List`] to support the autoscroll behavior
-    /// described in [`request_autoscroll`].
+    /// This method can be called from a containing element such as [`crate::List`] to support the autoscroll behavior
+    /// described in [`Self::request_autoscroll`].
     pub fn take_autoscroll(&mut self) -> Option<Bounds<Pixels>> {
         self.invalidator.debug_assert_prepaint();
         self.requested_autoscroll.take()
@@ -2815,7 +2815,7 @@ impl Window {
 
     /// Paint one or more quads into the scene for the next frame at the current stacking context.
     /// Quads are colored rectangular regions with an optional background, border, and corner radius.
-    /// see [`fill`](crate::fill), [`outline`](crate::outline), and [`quad`](crate::quad) to construct this type.
+    /// see [`fill`], [`outline`], and [`quad`] to construct this type.
     ///
     /// This method should only be called as part of the paint phase of element drawing.
     ///
@@ -4821,7 +4821,7 @@ impl HasDisplayHandle for Window {
     }
 }
 
-/// An identifier for an [`Element`](crate::Element).
+/// An identifier for an [`Element`].
 ///
 /// Can be constructed with a string, a number, or both, as well
 /// as other internal representations.
diff --git a/crates/util/src/schemars.rs b/crates/util/src/schemars.rs
index a59d24c325..22e0570cdb 100644
--- a/crates/util/src/schemars.rs
+++ b/crates/util/src/schemars.rs
@@ -7,7 +7,7 @@ const DEFS_PATH: &str = "#/$defs/";
 ///
 /// This asserts that JsonSchema::schema_name() + "2" does not exist because this indicates that
 /// there are multiple types that use this name, and unfortunately schemars APIs do not support
-/// resolving this ambiguity - see https://github.com/GREsau/schemars/issues/449
+/// resolving this ambiguity - see <https://github.com/GREsau/schemars/issues/449>
 ///
 /// This takes a closure for `schema` because some settings types are not available on the remote
 /// server, and so will crash when attempting to access e.g. GlobalThemeRegistry.
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 0aceec5d7a..c66adb8b3a 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -329,7 +329,7 @@ pub fn load_login_shell_environment() -> Result<()> {
 /// Configures the process to start a new session, to prevent interactive shells from taking control
 /// of the terminal.
 ///
-/// For more details: https://registerspill.thorstenball.com/p/how-to-lose-control-of-your-shell
+/// For more details: <https://registerspill.thorstenball.com/p/how-to-lose-control-of-your-shell>
 pub fn set_pre_exec_to_start_new_session(
     command: &mut std::process::Command,
 ) -> &mut std::process::Command {

From 8d5861322bba51c6cf4e718496c4cb21161182cc Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 3 Sep 2025 08:50:53 +0300
Subject: [PATCH 560/823] Allow wrapping markdown text into `*` by selecting
 text and writing the `*` (#37426)

Release Notes:

- Allowed wrapping markdown text into `*` by selecting text and writing
the `*`
---
 crates/languages/src/markdown/config.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/languages/src/markdown/config.toml b/crates/languages/src/markdown/config.toml
index 926dcd70d9..36071cb539 100644
--- a/crates/languages/src/markdown/config.toml
+++ b/crates/languages/src/markdown/config.toml
@@ -12,6 +12,7 @@ brackets = [
     { start = "\"", end = "\"", close = false, newline = false },
     { start = "'", end = "'", close = false, newline = false },
     { start = "`", end = "`", close = false, newline = false },
+    { start = "*", end = "*", close = false, newline = false, surround = true },
 ]
 rewrap_prefixes = [
     "[-*+]\\s+",

From d7fd5910d7d0ae4404be21ada5be1f39d83d3aea Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Wed, 3 Sep 2025 00:35:31 -0600
Subject: [PATCH 561/823] Use slice from Rope chunk when possible while
 iterating lines (#37430)

Release Notes:

- N/A
---
 crates/rope/src/rope.rs | 48 +++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
index 0d3f5abbde..41b2a2d033 100644
--- a/crates/rope/src/rope.rs
+++ b/crates/rope/src/rope.rs
@@ -936,24 +936,36 @@ impl Lines<'_> {
         self.current_line.clear();
 
         while let Some(chunk) = self.chunks.peek() {
-            let lines = chunk.split('\n');
+            let chunk_lines = chunk.split('\n');
             if self.reversed {
-                let mut lines = lines.rev().peekable();
-                while let Some(line) = lines.next() {
-                    self.current_line.insert_str(0, line);
-                    if lines.peek().is_some() {
+                let mut chunk_lines = chunk_lines.rev().peekable();
+                if let Some(chunk_line) = chunk_lines.next() {
+                    let done = chunk_lines.peek().is_some();
+                    if done {
                         self.chunks
-                            .seek(self.chunks.offset() - line.len() - "\n".len());
+                            .seek(self.chunks.offset() - chunk_line.len() - "\n".len());
+                        if self.current_line.is_empty() {
+                            return Some(chunk_line);
+                        }
+                    }
+                    self.current_line.insert_str(0, chunk_line);
+                    if done {
                         return Some(&self.current_line);
                     }
                 }
             } else {
-                let mut lines = lines.peekable();
-                while let Some(line) = lines.next() {
-                    self.current_line.push_str(line);
-                    if lines.peek().is_some() {
+                let mut chunk_lines = chunk_lines.peekable();
+                if let Some(chunk_line) = chunk_lines.next() {
+                    let done = chunk_lines.peek().is_some();
+                    if done {
                         self.chunks
-                            .seek(self.chunks.offset() + line.len() + "\n".len());
+                            .seek(self.chunks.offset() + chunk_line.len() + "\n".len());
+                        if self.current_line.is_empty() {
+                            return Some(chunk_line);
+                        }
+                    }
+                    self.current_line.push_str(chunk_line);
+                    if done {
                         return Some(&self.current_line);
                     }
                 }
@@ -1573,6 +1585,20 @@ mod tests {
         assert_eq!(lines.next(), Some("defg"));
         assert_eq!(lines.next(), Some("abc"));
         assert_eq!(lines.next(), None);
+
+        let rope = Rope::from("abc\nlonger line test\nhi");
+        let mut lines = rope.chunks().lines();
+        assert_eq!(lines.next(), Some("abc"));
+        assert_eq!(lines.next(), Some("longer line test"));
+        assert_eq!(lines.next(), Some("hi"));
+        assert_eq!(lines.next(), None);
+
+        let rope = Rope::from("abc\nlonger line test\nhi");
+        let mut lines = rope.reversed_chunks_in_range(0..rope.len()).lines();
+        assert_eq!(lines.next(), Some("hi"));
+        assert_eq!(lines.next(), Some("longer line test"));
+        assert_eq!(lines.next(), Some("abc"));
+        assert_eq!(lines.next(), None);
     }
 
     #[gpui::test(iterations = 100)]

From ae840c6ef39007bd00ef8f63161825bd18cdcc50 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 3 Sep 2025 03:40:14 -0400
Subject: [PATCH 562/823] acp: Fix handling of single-file worktrees (#37412)

When the first visible worktree is a single-file worktree, we would
previously try to use the absolute path of that file as the root
directory for external agents, causing an error. This PR changes how we
handle this situation: we'll use the root of the first non-single-file
visible worktree if there are any, and if there are none, the parent
directory of the first single-file visible worktree.

Related to #37213

Release Notes:

- acp: Fixed being unable to run external agents when a single file (not
part of a project) was opened in Zed.
---
 crates/agent_ui/src/acp/thread_view.rs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 60b3166a57..bf981d10f7 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -427,11 +427,24 @@ impl AcpThreadView {
                 "External agents are not yet supported for remote projects.".into(),
             ));
         }
-        let root_dir = project
-            .read(cx)
-            .visible_worktrees(cx)
+        let mut worktrees = project.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
+        // Pick the first non-single-file worktree for the root directory if there are any,
+        // and otherwise the parent of a single-file worktree, falling back to $HOME if there are no visible worktrees.
+        worktrees.sort_by(|l, r| {
+            l.read(cx)
+                .is_single_file()
+                .cmp(&r.read(cx).is_single_file())
+        });
+        let root_dir = worktrees
+            .into_iter()
+            .filter_map(|worktree| {
+                if worktree.read(cx).is_single_file() {
+                    Some(worktree.read(cx).abs_path().parent()?.into())
+                } else {
+                    Some(worktree.read(cx).abs_path())
+                }
+            })
             .next()
-            .map(|worktree| worktree.read(cx).abs_path())
             .unwrap_or_else(|| paths::home_dir().as_path().into());
         let (tx, mut rx) = watch::channel("Loading…".into());
         let delegate = AgentServerDelegate::new(project.clone(), Some(tx));

From 6feae92616d473b0df61b6eb84cca3e8ea8115b6 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 3 Sep 2025 11:02:21 +0200
Subject: [PATCH 563/823] rust: Improve highlighting in derive macros (#37439)

Follow-up to https://github.com/zed-industries/zed/pull/37049

This fixes an issue where we would lose highlighting in derive macros if
one of the names was qualified.

| Before | After |
| --- | --- |
| <img width="886" height="398" alt="Bildschirmfoto 2025-09-03 um 10 39
25"
src="https://github.com/user-attachments/assets/dbc680e3-6ce3-4059-9934-9daa4c59d4a0"
/> | <img width="886" height="398" alt="Bildschirmfoto 2025-09-03 um 10
38 14"
src="https://github.com/user-attachments/assets/6e10df6f-5158-4bfd-81ab-8f2b384f1e99"
/> |


Release Notes:

- N/A
---
 crates/languages/src/rust/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
index 3f44c5fc0e..ec7e2d4251 100644
--- a/crates/languages/src/rust/highlights.scm
+++ b/crates/languages/src/rust/highlights.scm
@@ -196,12 +196,12 @@ operator: "/" @operator
   (identifier) @attribute
   (scoped_identifier name: (identifier) @attribute)
   (token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
-  (token_tree (identifier) @variable "::" (identifier) @type (#match? @type "^[A-Z]"))
+  (token_tree (identifier) @none "::" (#match? @none "^[a-z\\d_]*$"))
 ]))
 
 (inner_attribute_item (attribute [
   (identifier) @attribute
   (scoped_identifier name: (identifier) @attribute)
   (token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
-  (token_tree (identifier) @variable "::" (identifier) @type (#match? @type "^[A-Z]"))
+  (token_tree (identifier) @none "::" (#match? @none "^[a-z\\d_]*$"))
 ]))

From c4466628624f96378d6c81853add98eab7aabdaf Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Wed, 3 Sep 2025 11:21:45 +0200
Subject: [PATCH 564/823] Fix font rendering at very large scales (#37440)

Release Notes:

- Fixed fonts disappearing at very large scales on windows
---
 crates/gpui/src/platform/windows/direct_write.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index 5e44a609db..285f6a1143 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -742,6 +742,10 @@ impl DirectWriteState {
                 &mut grid_fit_mode,
             )?;
         }
+        let rendering_mode = match rendering_mode {
+            DWRITE_RENDERING_MODE1_OUTLINE => DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC,
+            m => m,
+        };
 
         let glyph_analysis = unsafe {
             self.components.factory.CreateGlyphRunAnalysis(

From 9a8c5053c22ee386f0b3f50f16cbfc6c8fe4b4e4 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 3 Sep 2025 06:54:31 -0300
Subject: [PATCH 565/823] agent: Update message editor placeholder (#37441)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index bf981d10f7..589633ae25 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -332,6 +332,11 @@ impl AcpThreadView {
 
         let placeholder = if agent.name() == "Zed Agent" {
             format!("Message the {} — @ to include context", agent.name())
+        } else if agent.name() == "Claude Code" || !available_commands.borrow().is_empty() {
+            format!(
+                "Message {} — @ to include context, / for commands",
+                agent.name()
+            )
         } else {
             format!("Message {} — @ to include context", agent.name())
         };

From 40199266b6634cc3165f3842abae1d562ef4dcca Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Wed, 3 Sep 2025 18:44:33 +0800
Subject: [PATCH 566/823] gpui: Fix overflow_hidden to support clip with border
 radius (#35083)

Release Notes:

- N/A

---

Same case in HTML example:


https://developer.mozilla.org/en-US/play?id=p7FhB3JAhiVfLHAXnsbrn7JYYX%2Byq1gje%2B%2BTZarnXvvjmaAx3NlrXqMAoI35s4zeakShKee6lydHYeHr

```html
<div style="padding: 50px; text-align: center;">
  <div style="overflow: hidden; border-radius: 24px">
    <div style="background: #000; border: 3px solid red; color: #fff; padding: 8px 28px;">
      Let build applications with GPUI.
    </div>
    <div style="background: #333; border: 3px dashed black; color: #fff; padding: 8px 28px;">
      Let build applications with GPUI.
    </div>
  </div>

  <div style="margin-top: 20px; border-radius: 24px">
    <div style="background: #000; color: #fff; padding: 8px 28px;">
      This is not overflow: hidden.
    </div>
  </div>
</div>
```

<img width="610" height="213" alt="image"
src="https://github.com/user-attachments/assets/5f95e263-e52c-414f-8f0c-e6aa04ceb802"
/>

### Before

<img width="912" height="740" alt="image"
src="https://github.com/user-attachments/assets/f09c1936-52fc-4381-9a50-93977e9d64a6"
/>

### After

```bash
cargo run -p gpui --example content_mask
```

<img width="912" height="740" alt="image"
src="https://github.com/user-attachments/assets/4bde58f3-c850-418d-9dc7-d2245852e7d7"
/> |


- [x] Metal
- [x] Blade
- [x] DirectX
- [x] ContentMask radius must reduce the container border widths.
- [x] The dash border render not correct, when not all side have
borders.
---
 crates/editor/src/element.rs                  |  25 +-
 crates/gpui/examples/content_mask.rs          | 228 ++++++++++++++++++
 crates/gpui/src/elements/list.rs              |  78 ++++--
 crates/gpui/src/elements/uniform_list.rs      |   5 +-
 crates/gpui/src/platform/blade/shaders.wgsl   |  60 +++--
 crates/gpui/src/platform/mac/shaders.metal    |  24 +-
 crates/gpui/src/platform/windows/shaders.hlsl |  49 ++--
 crates/gpui/src/style.rs                      |  66 ++---
 crates/gpui/src/window.rs                     |  23 +-
 crates/terminal_view/src/terminal_element.rs  |   2 +-
 crates/ui/src/components/scrollbar.rs         |  16 +-
 11 files changed, 446 insertions(+), 130 deletions(-)
 create mode 100644 crates/gpui/examples/content_mask.rs

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index f384afa1ae..500cce7e0a 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -6025,6 +6025,7 @@ impl EditorElement {
         window.with_content_mask(
             Some(ContentMask {
                 bounds: layout.position_map.text_hitbox.bounds,
+                ..Default::default()
             }),
             |window| {
                 let editor = self.editor.read(cx);
@@ -6967,9 +6968,15 @@ impl EditorElement {
             } else {
                 let mut bounds = layout.hitbox.bounds;
                 bounds.origin.x += layout.gutter_hitbox.bounds.size.width;
-                window.with_content_mask(Some(ContentMask { bounds }), |window| {
-                    block.element.paint(window, cx);
-                })
+                window.with_content_mask(
+                    Some(ContentMask {
+                        bounds,
+                        ..Default::default()
+                    }),
+                    |window| {
+                        block.element.paint(window, cx);
+                    },
+                )
             }
         }
     }
@@ -8270,9 +8277,13 @@ impl Element for EditorElement {
         }
 
         let rem_size = self.rem_size(cx);
+        let content_mask = ContentMask {
+            bounds,
+            ..Default::default()
+        };
         window.with_rem_size(rem_size, |window| {
             window.with_text_style(Some(text_style), |window| {
-                window.with_content_mask(Some(ContentMask { bounds }), |window| {
+                window.with_content_mask(Some(content_mask), |window| {
                     let (mut snapshot, is_read_only) = self.editor.update(cx, |editor, cx| {
                         (editor.snapshot(window, cx), editor.read_only(cx))
                     });
@@ -9380,9 +9391,13 @@ impl Element for EditorElement {
             ..Default::default()
         };
         let rem_size = self.rem_size(cx);
+        let content_mask = ContentMask {
+            bounds,
+            ..Default::default()
+        };
         window.with_rem_size(rem_size, |window| {
             window.with_text_style(Some(text_style), |window| {
-                window.with_content_mask(Some(ContentMask { bounds }), |window| {
+                window.with_content_mask(Some(content_mask), |window| {
                     self.paint_mouse_listeners(layout, window, cx);
                     self.paint_background(layout, window, cx);
                     self.paint_indent_guides(layout, window, cx);
diff --git a/crates/gpui/examples/content_mask.rs b/crates/gpui/examples/content_mask.rs
new file mode 100644
index 0000000000..8d40cc5bba
--- /dev/null
+++ b/crates/gpui/examples/content_mask.rs
@@ -0,0 +1,228 @@
+use gpui::{
+    App, Application, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px,
+    rgb, size,
+};
+
+struct Example {}
+
+impl Render for Example {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .font_family(".SystemUIFont")
+            .flex()
+            .flex_col()
+            .size_full()
+            .p_4()
+            .gap_4()
+            .bg(rgb(0x505050))
+            .justify_center()
+            .items_center()
+            .text_center()
+            .shadow_lg()
+            .text_sm()
+            .text_color(rgb(0xffffff))
+            .child(
+                div()
+                    .overflow_hidden()
+                    .rounded(px(32.))
+                    .border(px(8.))
+                    .border_color(gpui::white())
+                    .text_color(gpui::white())
+                    .child(
+                        div()
+                            .bg(gpui::black())
+                            .py_2()
+                            .px_7()
+                            .border_l_2()
+                            .border_r_2()
+                            .border_b_3()
+                            .border_color(gpui::red())
+                            .child("Let build applications with GPUI"),
+                    )
+                    .child(
+                        div()
+                            .bg(rgb(0x222222))
+                            .text_sm()
+                            .py_1()
+                            .px_7()
+                            .border_l_3()
+                            .border_r_3()
+                            .border_color(gpui::green())
+                            .child("The fast, productive UI framework for Rust"),
+                    )
+                    .child(
+                        div()
+                            .bg(rgb(0x222222))
+                            .w_full()
+                            .flex()
+                            .flex_row()
+                            .text_sm()
+                            .text_color(rgb(0xc0c0c0))
+                            .child(
+                                div()
+                                    .flex_1()
+                                    .p_2()
+                                    .border_3()
+                                    .border_dashed()
+                                    .border_color(gpui::blue())
+                                    .child("Rust"),
+                            )
+                            .child(
+                                div()
+                                    .flex_1()
+                                    .p_2()
+                                    .border_t_3()
+                                    .border_r_3()
+                                    .border_b_3()
+                                    .border_dashed()
+                                    .border_color(gpui::blue())
+                                    .child("GPU Rendering"),
+                            ),
+                    ),
+            )
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .w(px(320.))
+                    .gap_1()
+                    .overflow_hidden()
+                    .rounded(px(16.))
+                    .child(
+                        div()
+                            .w_full()
+                            .p_2()
+                            .bg(gpui::red())
+                            .child("Clip background"),
+                    ),
+            )
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .w(px(320.))
+                    .gap_1()
+                    .rounded(px(16.))
+                    .child(
+                        div()
+                            .w_full()
+                            .p_2()
+                            .bg(gpui::yellow())
+                            .text_color(gpui::black())
+                            .child("No content mask"),
+                    ),
+            )
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .w(px(320.))
+                    .gap_1()
+                    .overflow_hidden()
+                    .rounded(px(16.))
+                    .child(
+                        div()
+                            .w_full()
+                            .p_2()
+                            .border_4()
+                            .border_color(gpui::blue())
+                            .bg(gpui::blue().alpha(0.4))
+                            .child("Clip borders"),
+                    ),
+            )
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .w(px(320.))
+                    .gap_1()
+                    .overflow_hidden()
+                    .rounded(px(20.))
+                    .child(
+                        div().w_full().border_2().border_color(gpui::black()).child(
+                            div()
+                                .size_full()
+                                .bg(gpui::green().alpha(0.4))
+                                .p_2()
+                                .border_8()
+                                .border_color(gpui::green())
+                                .child("Clip nested elements"),
+                        ),
+                    ),
+            )
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .w(px(320.))
+                    .gap_1()
+                    .overflow_hidden()
+                    .rounded(px(32.))
+                    .child(
+                        div()
+                            .w_full()
+                            .p_2()
+                            .bg(gpui::black())
+                            .border_2()
+                            .border_dashed()
+                            .rounded_lg()
+                            .border_color(gpui::white())
+                            .child("dash border full and rounded"),
+                    )
+                    .child(
+                        div()
+                            .w_full()
+                            .flex()
+                            .flex_row()
+                            .gap_2()
+                            .child(
+                                div()
+                                    .w_full()
+                                    .p_2()
+                                    .bg(gpui::black())
+                                    .border_x_2()
+                                    .border_dashed()
+                                    .rounded_lg()
+                                    .border_color(gpui::white())
+                                    .child("border x"),
+                            )
+                            .child(
+                                div()
+                                    .w_full()
+                                    .p_2()
+                                    .bg(gpui::black())
+                                    .border_y_2()
+                                    .border_dashed()
+                                    .rounded_lg()
+                                    .border_color(gpui::white())
+                                    .child("border y"),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .w_full()
+                            .p_2()
+                            .bg(gpui::black())
+                            .border_2()
+                            .border_dashed()
+                            .border_color(gpui::white())
+                            .child("border full and no rounded"),
+                    ),
+            )
+    }
+}
+
+fn main() {
+    Application::new().run(|cx: &mut App| {
+        let bounds = Bounds::centered(None, size(px(800.), px(600.)), cx);
+        cx.open_window(
+            WindowOptions {
+                window_bounds: Some(WindowBounds::Windowed(bounds)),
+                ..Default::default()
+            },
+            |_, cx| cx.new(|_| Example {}),
+        )
+        .unwrap();
+        cx.activate(true);
+    });
+}
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index ed4ca64e83..9ae497cef9 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -8,10 +8,10 @@
 //! If all of your elements are the same height, see [`crate::UniformList`] for a simpler API
 
 use crate::{
-    AnyElement, App, AvailableSpace, Bounds, ContentMask, DispatchPhase, Edges, Element, EntityId,
-    FocusHandle, GlobalElementId, Hitbox, HitboxBehavior, InspectorElementId, IntoElement,
-    Overflow, Pixels, Point, ScrollDelta, ScrollWheelEvent, Size, Style, StyleRefinement, Styled,
-    Window, point, px, size,
+    AnyElement, App, AvailableSpace, Bounds, ContentMask, Corners, DispatchPhase, Edges, Element,
+    EntityId, FocusHandle, GlobalElementId, Hitbox, HitboxBehavior, InspectorElementId,
+    IntoElement, Overflow, Pixels, Point, ScrollDelta, ScrollWheelEvent, Size, Style,
+    StyleRefinement, Styled, Window, point, px, size,
 };
 use collections::VecDeque;
 use refineable::Refineable as _;
@@ -705,6 +705,7 @@ impl StateInner {
         &mut self,
         bounds: Bounds<Pixels>,
         padding: Edges<Pixels>,
+        corner_radii: Corners<Pixels>,
         autoscroll: bool,
         render_item: &mut RenderItemFn,
         window: &mut Window,
@@ -728,9 +729,15 @@ impl StateInner {
                 let mut item_origin = bounds.origin + Point::new(px(0.), padding.top);
                 item_origin.y -= layout_response.scroll_top.offset_in_item;
                 for item in &mut layout_response.item_layouts {
-                    window.with_content_mask(Some(ContentMask { bounds }), |window| {
-                        item.element.prepaint_at(item_origin, window, cx);
-                    });
+                    window.with_content_mask(
+                        Some(ContentMask {
+                            bounds,
+                            corner_radii,
+                        }),
+                        |window| {
+                            item.element.prepaint_at(item_origin, window, cx);
+                        },
+                    );
 
                     if let Some(autoscroll_bounds) = window.take_autoscroll()
                         && autoscroll
@@ -952,19 +959,34 @@ impl Element for List {
             state.items = new_items;
         }
 
-        let padding = style
-            .padding
-            .to_pixels(bounds.size.into(), window.rem_size());
-        let layout =
-            match state.prepaint_items(bounds, padding, true, &mut self.render_item, window, cx) {
-                Ok(layout) => layout,
-                Err(autoscroll_request) => {
-                    state.logical_scroll_top = Some(autoscroll_request);
-                    state
-                        .prepaint_items(bounds, padding, false, &mut self.render_item, window, cx)
-                        .unwrap()
-                }
-            };
+        let rem_size = window.rem_size();
+        let padding = style.padding.to_pixels(bounds.size.into(), rem_size);
+        let corner_radii = style.corner_radii.to_pixels(rem_size);
+        let layout = match state.prepaint_items(
+            bounds,
+            padding,
+            corner_radii,
+            true,
+            &mut self.render_item,
+            window,
+            cx,
+        ) {
+            Ok(layout) => layout,
+            Err(autoscroll_request) => {
+                state.logical_scroll_top = Some(autoscroll_request);
+                state
+                    .prepaint_items(
+                        bounds,
+                        padding,
+                        corner_radii,
+                        false,
+                        &mut self.render_item,
+                        window,
+                        cx,
+                    )
+                    .unwrap()
+            }
+        };
 
         state.last_layout_bounds = Some(bounds);
         state.last_padding = Some(padding);
@@ -982,11 +1004,17 @@ impl Element for List {
         cx: &mut App,
     ) {
         let current_view = window.current_view();
-        window.with_content_mask(Some(ContentMask { bounds }), |window| {
-            for item in &mut prepaint.layout.item_layouts {
-                item.element.paint(window, cx);
-            }
-        });
+        window.with_content_mask(
+            Some(ContentMask {
+                bounds,
+                ..Default::default()
+            }),
+            |window| {
+                for item in &mut prepaint.layout.item_layouts {
+                    item.element.paint(window, cx);
+                }
+            },
+        );
 
         let list_state = self.state.clone();
         let height = bounds.size.height;
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index cdf90d4eb8..db3b8c8839 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -411,7 +411,10 @@ impl Element for UniformList {
                         (self.render_items)(visible_range.clone(), window, cx)
                     };
 
-                    let content_mask = ContentMask { bounds };
+                    let content_mask = ContentMask {
+                        bounds,
+                        ..Default::default()
+                    };
                     window.with_content_mask(Some(content_mask), |window| {
                         for (mut item, ix) in items.into_iter().zip(visible_range.clone()) {
                             let item_origin = padded_bounds.origin
diff --git a/crates/gpui/src/platform/blade/shaders.wgsl b/crates/gpui/src/platform/blade/shaders.wgsl
index 95980b54fe..dbab4237e3 100644
--- a/crates/gpui/src/platform/blade/shaders.wgsl
+++ b/crates/gpui/src/platform/blade/shaders.wgsl
@@ -53,6 +53,11 @@ struct Corners {
     bottom_left: f32,
 }
 
+struct ContentMask {
+    bounds: Bounds,
+    corner_radii: Corners,
+}
+
 struct Edges {
     top: f32,
     right: f32,
@@ -440,7 +445,7 @@ struct Quad {
     order: u32,
     border_style: u32,
     bounds: Bounds,
-    content_mask: Bounds,
+    content_mask: ContentMask,
     background: Background,
     border_color: Hsla,
     corner_radii: Corners,
@@ -478,7 +483,7 @@ fn vs_quad(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) insta
     out.background_color1 = gradient.color1;
     out.border_color = hsla_to_rgba(quad.border_color);
     out.quad_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask.bounds);
     return out;
 }
 
@@ -491,8 +496,19 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
 
     let quad = b_quads[input.quad_id];
 
-    let background_color = gradient_color(quad.background, input.position.xy, quad.bounds,
+    // Signed distance field threshold for inclusion of pixels. 0.5 is the
+    // minimum distance between the center of the pixel and the edge.
+    let antialias_threshold = 0.5;
+
+    var background_color = gradient_color(quad.background, input.position.xy, quad.bounds,
         input.background_solid, input.background_color0, input.background_color1);
+    var border_color = input.border_color;
+
+    // Apply content_mask corner radii clipping
+    let clip_sdf = quad_sdf(input.position.xy, quad.content_mask.bounds, quad.content_mask.corner_radii);
+    let clip_alpha = saturate(antialias_threshold - clip_sdf);
+    background_color.a *= clip_alpha;
+    border_color.a *= clip_alpha;
 
     let unrounded = quad.corner_radii.top_left == 0.0 &&
         quad.corner_radii.bottom_left == 0.0 &&
@@ -513,10 +529,6 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
     let point = input.position.xy - quad.bounds.origin;
     let center_to_point = point - half_size;
 
-    // Signed distance field threshold for inclusion of pixels. 0.5 is the
-    // minimum distance between the center of the pixel and the edge.
-    let antialias_threshold = 0.5;
-
     // Radius of the nearest corner
     let corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
@@ -607,8 +619,6 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
 
     var color = background_color;
     if (border_sdf < antialias_threshold) {
-        var border_color = input.border_color;
-
         // Dashed border logic when border_style == 1
         if (quad.border_style == 1) {
             // Position along the perimeter in "dash space", where each dash
@@ -644,7 +654,11 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
                 let is_horizontal =
                         corner_center_to_point.x <
                         corner_center_to_point.y;
-                let border_width = select(border.y, border.x, is_horizontal);
+                var border_width = select(border.y, border.x, is_horizontal);
+                // When border width of some side is 0, we need to use the other side width for dash velocity.
+                if (border_width == 0.0) {
+                    border_width = select(border.x, border.y, is_horizontal);
+                }
                 dash_velocity = dv_numerator / border_width;
                 t = select(point.y, point.x, is_horizontal) * dash_velocity;
                 max_t = select(size.y, size.x, is_horizontal) * dash_velocity;
@@ -856,7 +870,7 @@ struct Shadow {
     blur_radius: f32,
     bounds: Bounds,
     corner_radii: Corners,
-    content_mask: Bounds,
+    content_mask: ContentMask,
     color: Hsla,
 }
 var<storage, read> b_shadows: array<Shadow>;
@@ -884,7 +898,7 @@ fn vs_shadow(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) ins
     out.position = to_device_position(unit_vertex, shadow.bounds);
     out.color = hsla_to_rgba(shadow.color);
     out.shadow_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, shadow.bounds, shadow.content_mask);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, shadow.bounds, shadow.content_mask.bounds);
     return out;
 }
 
@@ -899,7 +913,6 @@ fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
     let half_size = shadow.bounds.size / 2.0;
     let center = shadow.bounds.origin + half_size;
     let center_to_point = input.position.xy - center;
-
     let corner_radius = pick_corner_radius(center_to_point, shadow.corner_radii);
 
     // The signal is only non-zero in a limited range, so don't waste samples
@@ -1027,7 +1040,7 @@ struct Underline {
     order: u32,
     pad: u32,
     bounds: Bounds,
-    content_mask: Bounds,
+    content_mask: ContentMask,
     color: Hsla,
     thickness: f32,
     wavy: u32,
@@ -1051,7 +1064,7 @@ fn vs_underline(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index)
     out.position = to_device_position(unit_vertex, underline.bounds);
     out.color = hsla_to_rgba(underline.color);
     out.underline_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, underline.bounds, underline.content_mask);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, underline.bounds, underline.content_mask.bounds);
     return out;
 }
 
@@ -1093,7 +1106,7 @@ struct MonochromeSprite {
     order: u32,
     pad: u32,
     bounds: Bounds,
-    content_mask: Bounds,
+    content_mask: ContentMask,
     color: Hsla,
     tile: AtlasTile,
     transformation: TransformationMatrix,
@@ -1117,7 +1130,7 @@ fn vs_mono_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index
 
     out.tile_position = to_tile_position(unit_vertex, sprite.tile);
     out.color = hsla_to_rgba(sprite.color);
-    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask.bounds);
     return out;
 }
 
@@ -1139,7 +1152,7 @@ struct PolychromeSprite {
     grayscale: u32,
     opacity: f32,
     bounds: Bounds,
-    content_mask: Bounds,
+    content_mask: ContentMask,
     corner_radii: Corners,
     tile: AtlasTile,
 }
@@ -1161,7 +1174,7 @@ fn vs_poly_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index
     out.position = to_device_position(unit_vertex, sprite.bounds);
     out.tile_position = to_tile_position(unit_vertex, sprite.tile);
     out.sprite_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask.bounds);
     return out;
 }
 
@@ -1234,3 +1247,12 @@ fn fs_surface(input: SurfaceVarying) -> @location(0) vec4<f32> {
 
     return ycbcr_to_RGB * y_cb_cr;
 }
+
+fn max_corner_radii(a: Corners, b: Corners) -> Corners {
+    return Corners(
+        max(a.top_left, b.top_left),
+        max(a.top_right, b.top_right),
+        max(a.bottom_right, b.bottom_right),
+        max(a.bottom_left, b.bottom_left)
+    );
+}
diff --git a/crates/gpui/src/platform/mac/shaders.metal b/crates/gpui/src/platform/mac/shaders.metal
index 83c978b853..6aa1d18ee8 100644
--- a/crates/gpui/src/platform/mac/shaders.metal
+++ b/crates/gpui/src/platform/mac/shaders.metal
@@ -99,8 +99,21 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
                               constant Quad *quads
                               [[buffer(QuadInputIndex_Quads)]]) {
   Quad quad = quads[input.quad_id];
+
+  // Signed distance field threshold for inclusion of pixels. 0.5 is the
+  // minimum distance between the center of the pixel and the edge.
+  const float antialias_threshold = 0.5;
+
   float4 background_color = fill_color(quad.background, input.position.xy, quad.bounds,
     input.background_solid, input.background_color0, input.background_color1);
+  float4 border_color = input.border_color;
+
+  // Apply content_mask corner radii clipping
+  float clip_sdf = quad_sdf(input.position.xy, quad.content_mask.bounds,
+    quad.content_mask.corner_radii);
+  float clip_alpha = saturate(antialias_threshold - clip_sdf);
+  background_color.a *= clip_alpha;
+  border_color *= clip_alpha;
 
   bool unrounded = quad.corner_radii.top_left == 0.0 &&
     quad.corner_radii.bottom_left == 0.0 &&
@@ -121,10 +134,6 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
   float2 point = input.position.xy - float2(quad.bounds.origin.x, quad.bounds.origin.y);
   float2 center_to_point = point - half_size;
 
-  // Signed distance field threshold for inclusion of pixels. 0.5 is the
-  // minimum distance between the center of the pixel and the edge.
-  const float antialias_threshold = 0.5;
-
   // Radius of the nearest corner
   float corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
@@ -164,7 +173,6 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
     straight_border_inner_corner_to_point.x > 0.0 ||
     straight_border_inner_corner_to_point.y > 0.0;
 
-
   // Whether the point is far enough inside the quad, such that the pixels are
   // not affected by the straight border.
   bool is_within_inner_straight_border =
@@ -208,8 +216,6 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
 
   float4 color = background_color;
   if (border_sdf < antialias_threshold) {
-    float4 border_color = input.border_color;
-
     // Dashed border logic when border_style == 1
     if (quad.border_style == 1) {
       // Position along the perimeter in "dash space", where each dash
@@ -244,6 +250,10 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
         // perimeter. This way each line starts and ends with a dash.
         bool is_horizontal = corner_center_to_point.x < corner_center_to_point.y;
         float border_width = is_horizontal ? border.x : border.y;
+        // When border width of some side is 0, we need to use the other side width for dash velocity.
+        if (border_width == 0.0) {
+            border_width = is_horizontal ? border.y : border.x;
+        }
         dash_velocity = dv_numerator / border_width;
         t = is_horizontal ? point.x : point.y;
         t *= dash_velocity;
diff --git a/crates/gpui/src/platform/windows/shaders.hlsl b/crates/gpui/src/platform/windows/shaders.hlsl
index 2cef54ae61..296a6c825f 100644
--- a/crates/gpui/src/platform/windows/shaders.hlsl
+++ b/crates/gpui/src/platform/windows/shaders.hlsl
@@ -453,11 +453,16 @@ float quarter_ellipse_sdf(float2 pt, float2 radii) {
 **
 */
 
+struct ContentMask {
+    Bounds bounds;
+    Corners corner_radii;
+};
+
 struct Quad {
     uint order;
     uint border_style;
     Bounds bounds;
-    Bounds content_mask;
+    ContentMask content_mask;
     Background background;
     Hsla border_color;
     Corners corner_radii;
@@ -496,7 +501,7 @@ QuadVertexOutput quad_vertex(uint vertex_id: SV_VertexID, uint quad_id: SV_Insta
         quad.background.solid,
         quad.background.colors
     );
-    float4 clip_distance = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask);
+    float4 clip_distance = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask.bounds);
     float4 border_color = hsla_to_rgba(quad.border_color);
 
     QuadVertexOutput output;
@@ -512,8 +517,21 @@ QuadVertexOutput quad_vertex(uint vertex_id: SV_VertexID, uint quad_id: SV_Insta
 
 float4 quad_fragment(QuadFragmentInput input): SV_Target {
     Quad quad = quads[input.quad_id];
+
+    // Signed distance field threshold for inclusion of pixels. 0.5 is the
+    // minimum distance between the center of the pixel and the edge.
+    const float antialias_threshold = 0.5;
+
     float4 background_color = gradient_color(quad.background, input.position.xy, quad.bounds,
-    input.background_solid, input.background_color0, input.background_color1);
+        input.background_solid, input.background_color0, input.background_color1);
+    float4 border_color = input.border_color;
+
+    // Apply content_mask corner radii clipping
+    float clip_sdf = quad_sdf(input.position.xy, quad.content_mask.bounds,
+        quad.content_mask.corner_radii);
+    float clip_alpha = saturate(antialias_threshold - clip_sdf);
+    background_color.a *= clip_alpha;
+    border_color *= clip_alpha;
 
     bool unrounded = quad.corner_radii.top_left == 0.0 &&
         quad.corner_radii.top_right == 0.0 &&
@@ -534,10 +552,6 @@ float4 quad_fragment(QuadFragmentInput input): SV_Target {
     float2 the_point = input.position.xy - quad.bounds.origin;
     float2 center_to_point = the_point - half_size;
 
-    // Signed distance field threshold for inclusion of pixels. 0.5 is the
-    // minimum distance between the center of the pixel and the edge.
-    const float antialias_threshold = 0.5;
-
     // Radius of the nearest corner
     float corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
@@ -620,7 +634,6 @@ float4 quad_fragment(QuadFragmentInput input): SV_Target {
 
     float4 color = background_color;
     if (border_sdf < antialias_threshold) {
-        float4 border_color = input.border_color;
         // Dashed border logic when border_style == 1
         if (quad.border_style == 1) {
             // Position along the perimeter in "dash space", where each dash
@@ -655,6 +668,10 @@ float4 quad_fragment(QuadFragmentInput input): SV_Target {
                 // perimeter. This way each line starts and ends with a dash.
                 bool is_horizontal = corner_center_to_point.x < corner_center_to_point.y;
                 float border_width = is_horizontal ? border.x : border.y;
+                // When border width of some side is 0, we need to use the other side width for dash velocity.
+                if (border_width == 0.0) {
+                    border_width = is_horizontal ? border.y : border.x;
+                }
                 dash_velocity = dv_numerator / border_width;
                 t = is_horizontal ? the_point.x : the_point.y;
                 t *= dash_velocity;
@@ -805,7 +822,7 @@ struct Shadow {
     float blur_radius;
     Bounds bounds;
     Corners corner_radii;
-    Bounds content_mask;
+    ContentMask content_mask;
     Hsla color;
 };
 
@@ -834,7 +851,7 @@ ShadowVertexOutput shadow_vertex(uint vertex_id: SV_VertexID, uint shadow_id: SV
     bounds.size += 2.0 * margin;
 
     float4 device_position = to_device_position(unit_vertex, bounds);
-    float4 clip_distance = distance_from_clip_rect(unit_vertex, bounds, shadow.content_mask);
+    float4 clip_distance = distance_from_clip_rect(unit_vertex, bounds, shadow.content_mask.bounds);
     float4 color = hsla_to_rgba(shadow.color);
 
     ShadowVertexOutput output;
@@ -987,7 +1004,7 @@ struct Underline {
     uint order;
     uint pad;
     Bounds bounds;
-    Bounds content_mask;
+    ContentMask content_mask;
     Hsla color;
     float thickness;
     uint wavy;
@@ -1013,7 +1030,7 @@ UnderlineVertexOutput underline_vertex(uint vertex_id: SV_VertexID, uint underli
     Underline underline = underlines[underline_id];
     float4 device_position = to_device_position(unit_vertex, underline.bounds);
     float4 clip_distance = distance_from_clip_rect(unit_vertex, underline.bounds,
-                                                    underline.content_mask);
+                                                    underline.content_mask.bounds);
     float4 color = hsla_to_rgba(underline.color);
 
     UnderlineVertexOutput output;
@@ -1061,7 +1078,7 @@ struct MonochromeSprite {
     uint order;
     uint pad;
     Bounds bounds;
-    Bounds content_mask;
+    ContentMask content_mask;
     Hsla color;
     AtlasTile tile;
     TransformationMatrix transformation;
@@ -1088,7 +1105,7 @@ MonochromeSpriteVertexOutput monochrome_sprite_vertex(uint vertex_id: SV_VertexI
     MonochromeSprite sprite = mono_sprites[sprite_id];
     float4 device_position =
         to_device_position_transformed(unit_vertex, sprite.bounds, sprite.transformation);
-    float4 clip_distance = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
+    float4 clip_distance = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask.bounds);
     float2 tile_position = to_tile_position(unit_vertex, sprite.tile);
     float4 color = hsla_to_rgba(sprite.color);
 
@@ -1118,7 +1135,7 @@ struct PolychromeSprite {
     uint grayscale;
     float opacity;
     Bounds bounds;
-    Bounds content_mask;
+    ContentMask content_mask;
     Corners corner_radii;
     AtlasTile tile;
 };
@@ -1143,7 +1160,7 @@ PolychromeSpriteVertexOutput polychrome_sprite_vertex(uint vertex_id: SV_VertexI
     PolychromeSprite sprite = poly_sprites[sprite_id];
     float4 device_position = to_device_position(unit_vertex, sprite.bounds);
     float4 clip_distance = distance_from_clip_rect(unit_vertex, sprite.bounds,
-                                                    sprite.content_mask);
+                                                    sprite.content_mask.bounds);
     float2 tile_position = to_tile_position(unit_vertex, sprite.tile);
 
     PolychromeSpriteVertexOutput output;
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 5b69ce7fa6..09f598f9b0 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -601,7 +601,19 @@ impl Style {
                     (false, false) => Bounds::from_corners(min, max),
                 };
 
-                Some(ContentMask { bounds })
+                let corner_radii = self.corner_radii.to_pixels(rem_size);
+                let border_widths = self.border_widths.to_pixels(rem_size);
+                Some(ContentMask {
+                    bounds: Bounds {
+                        origin: bounds.origin - point(border_widths.left, border_widths.top),
+                        size: bounds.size
+                            + size(
+                                border_widths.left + border_widths.right,
+                                border_widths.top + border_widths.bottom,
+                            ),
+                    },
+                    corner_radii,
+                })
             }
         }
     }
@@ -661,64 +673,16 @@ impl Style {
 
         if self.is_border_visible() {
             let border_widths = self.border_widths.to_pixels(rem_size);
-            let max_border_width = border_widths.max();
-            let max_corner_radius = corner_radii.max();
-
-            let top_bounds = Bounds::from_corners(
-                bounds.origin,
-                bounds.top_right() + point(Pixels::ZERO, max_border_width.max(max_corner_radius)),
-            );
-            let bottom_bounds = Bounds::from_corners(
-                bounds.bottom_left() - point(Pixels::ZERO, max_border_width.max(max_corner_radius)),
-                bounds.bottom_right(),
-            );
-            let left_bounds = Bounds::from_corners(
-                top_bounds.bottom_left(),
-                bottom_bounds.origin + point(max_border_width, Pixels::ZERO),
-            );
-            let right_bounds = Bounds::from_corners(
-                top_bounds.bottom_right() - point(max_border_width, Pixels::ZERO),
-                bottom_bounds.top_right(),
-            );
-
             let mut background = self.border_color.unwrap_or_default();
             background.a = 0.;
-            let quad = quad(
+            window.paint_quad(quad(
                 bounds,
                 corner_radii,
                 background,
                 border_widths,
                 self.border_color.unwrap_or_default(),
                 self.border_style,
-            );
-
-            window.with_content_mask(Some(ContentMask { bounds: top_bounds }), |window| {
-                window.paint_quad(quad.clone());
-            });
-            window.with_content_mask(
-                Some(ContentMask {
-                    bounds: right_bounds,
-                }),
-                |window| {
-                    window.paint_quad(quad.clone());
-                },
-            );
-            window.with_content_mask(
-                Some(ContentMask {
-                    bounds: bottom_bounds,
-                }),
-                |window| {
-                    window.paint_quad(quad.clone());
-                },
-            );
-            window.with_content_mask(
-                Some(ContentMask {
-                    bounds: left_bounds,
-                }),
-                |window| {
-                    window.paint_quad(quad);
-                },
-            );
+            ));
         }
 
         #[cfg(debug_assertions)]
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 0ec73c4b00..cebf911b73 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1283,6 +1283,8 @@ pub(crate) struct DispatchEventResult {
 pub struct ContentMask<P: Clone + Debug + Default + PartialEq> {
     /// The bounds
     pub bounds: Bounds<P>,
+    /// The corner radii of the content mask.
+    pub corner_radii: Corners<P>,
 }
 
 impl ContentMask<Pixels> {
@@ -1290,13 +1292,31 @@ impl ContentMask<Pixels> {
     pub fn scale(&self, factor: f32) -> ContentMask<ScaledPixels> {
         ContentMask {
             bounds: self.bounds.scale(factor),
+            corner_radii: self.corner_radii.scale(factor),
         }
     }
 
     /// Intersect the content mask with the given content mask.
     pub fn intersect(&self, other: &Self) -> Self {
         let bounds = self.bounds.intersect(&other.bounds);
-        ContentMask { bounds }
+        ContentMask {
+            bounds,
+            corner_radii: Corners {
+                top_left: self.corner_radii.top_left.max(other.corner_radii.top_left),
+                top_right: self
+                    .corner_radii
+                    .top_right
+                    .max(other.corner_radii.top_right),
+                bottom_right: self
+                    .corner_radii
+                    .bottom_right
+                    .max(other.corner_radii.bottom_right),
+                bottom_left: self
+                    .corner_radii
+                    .bottom_left
+                    .max(other.corner_radii.bottom_left),
+            },
+        }
     }
 }
 
@@ -2557,6 +2577,7 @@ impl Window {
                     origin: Point::default(),
                     size: self.viewport_size,
                 },
+                ..Default::default()
             })
     }
 
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 5bbf5ad36b..e4d7f22691 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1184,7 +1184,7 @@ impl Element for TerminalElement {
         cx: &mut App,
     ) {
         let paint_start = Instant::now();
-        window.with_content_mask(Some(ContentMask { bounds }), |window| {
+        window.with_content_mask(Some(ContentMask { bounds, ..Default::default() }), |window| {
             let scroll_top = self.terminal_view.read(cx).scroll_top;
 
             window.paint_quad(fill(bounds, layout.background_color));
diff --git a/crates/ui/src/components/scrollbar.rs b/crates/ui/src/components/scrollbar.rs
index 605028202f..475575a483 100644
--- a/crates/ui/src/components/scrollbar.rs
+++ b/crates/ui/src/components/scrollbar.rs
@@ -303,9 +303,13 @@ impl Element for Scrollbar {
         window: &mut Window,
         _: &mut App,
     ) -> Self::PrepaintState {
-        window.with_content_mask(Some(ContentMask { bounds }), |window| {
-            window.insert_hitbox(bounds, HitboxBehavior::Normal)
-        })
+        window.with_content_mask(
+            Some(ContentMask {
+                bounds,
+                ..Default::default()
+            }),
+            |window| window.insert_hitbox(bounds, HitboxBehavior::Normal),
+        )
     }
 
     fn paint(
@@ -319,7 +323,11 @@ impl Element for Scrollbar {
         cx: &mut App,
     ) {
         const EXTRA_PADDING: Pixels = px(5.0);
-        window.with_content_mask(Some(ContentMask { bounds }), |window| {
+        let content_mask = ContentMask {
+            bounds,
+            ..Default::default()
+        };
+        window.with_content_mask(Some(content_mask), |window| {
             let axis = self.kind;
             let colors = cx.theme().colors();
             let thumb_state = self.state.thumb_state.get();

From 91cbb2ec25693c901f847a9bcbbebb97146c74bc Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 3 Sep 2025 12:59:14 +0200
Subject: [PATCH 567/823] Add onboarding banner for claude code support
 (#37443)

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 assets/images/acp_logo_serif.svg              |  48 +++-
 crates/agent_ui/src/agent_panel.rs            |   7 +-
 crates/agent_ui/src/ui.rs                     |   2 +
 .../agent_ui/src/ui/acp_onboarding_modal.rs   |  20 +-
 .../src/ui/claude_code_onboarding_modal.rs    | 254 ++++++++++++++++++
 crates/title_bar/src/onboarding_banner.rs     |  11 +-
 crates/title_bar/src/title_bar.rs             |  10 +-
 crates/zed_actions/src/lib.rs                 |   2 +
 8 files changed, 330 insertions(+), 24 deletions(-)
 create mode 100644 crates/agent_ui/src/ui/claude_code_onboarding_modal.rs

diff --git a/assets/images/acp_logo_serif.svg b/assets/images/acp_logo_serif.svg
index 6bc359cf82..a04d32e51c 100644
--- a/assets/images/acp_logo_serif.svg
+++ b/assets/images/acp_logo_serif.svg
@@ -1,2 +1,46 @@
-
-<svg xmlns="http://www.w3.org/2000/svg" width="119" height="44" fill="none"><path fill="#fff" d="M28.35 32.01c.994 0 1.896.242 2.706.725a5.339 5.339 0 0 1 1.937 1.916c.483.81.725 1.733.725 2.77 0 1.093-.242 2.094-.725 3.002a5.564 5.564 0 0 1-1.917 2.13c-.81.525-1.717.788-2.725.788-.994 0-1.896-.228-2.706-.682a5.337 5.337 0 0 1-1.937-1.916c-.468-.824-.703-1.761-.703-2.812 0-1.121.235-2.13.703-3.024.469-.894 1.107-1.597 1.916-2.108.81-.526 1.719-.789 2.727-.789Zm9.775.341h3.578v.831l-3.578.042-.042 5.921c0 .639.05 1.186.148 1.64.114.44.292.774.534 1 .241.228.553.342.936.342.398 0 .767-.114 1.108-.341a3.27 3.27 0 0 0 .937-.937l.575.468c-.312.468-.625.838-.937 1.108a3.42 3.42 0 0 1-.873.596 2.42 2.42 0 0 1-.788.256 3.63 3.63 0 0 1-.617.063c-.327 0-.66-.049-1.002-.148a2.237 2.237 0 0 1-.959-.533c-.283-.27-.51-.66-.681-1.171-.17-.525-.255-1.214-.255-2.066l.042-6.176-1.64.021v-.916c.37-.014.746-.148 1.13-.404.383-.27.724-.632 1.022-1.086.312-.454.525-.952.638-1.491h.724v2.981Zm10.067-.34c.994 0 1.896.241 2.706.724a5.339 5.339 0 0 1 1.937 1.916c.483.81.725 1.733.725 2.77 0 1.093-.242 2.094-.725 3.002a5.564 5.564 0 0 1-1.917 2.13c-.81.525-1.718.788-2.726.788-.993 0-1.895-.228-2.705-.682a5.337 5.337 0 0 1-1.937-1.916c-.469-.824-.703-1.761-.703-2.812 0-1.121.234-2.13.703-3.024.468-.894 1.107-1.597 1.916-2.108.81-.526 1.718-.789 2.726-.789Zm12.245 0c.795 0 1.484.12 2.066.362.596.241 1.058.56 1.385.958.326.397.49.831.49 1.3 0 .312-.086.581-.256.808-.17.213-.419.32-.745.32-.355.014-.611-.093-.768-.32-.141-.241-.212-.454-.212-.639 0-.142.021-.283.064-.425a.954.954 0 0 1 .255-.426c-.114-.34-.312-.59-.596-.746a2.34 2.34 0 0 0-.894-.32 4.112 4.112 0 0 0-.745-.085c-.966 0-1.782.392-2.45 1.172-.653.767-.98 1.888-.98 3.365 0 .95.149 1.797.447 2.535.312.738.746 1.32 1.3 1.746a3.127 3.127 0 0 0 1.917.617 3.76 3.76 0 0 0 1.916-.532c.61-.355 1.086-.788 1.427-1.299l.553.426a4.877 4.877 0 0 1-1.34 1.448c-.512.37-1.044.64-1.598.81-.54.17-1.05.255-1.533.255a5.586 5.586 0 0 1-2.642-.64 5.057 5.057 0 0 1-1.916-1.873c-.468-.824-.703-1.81-.703-2.96 0-.738.135-1.456.404-2.151.27-.696.646-1.32 1.13-1.874A5.46 5.46 0 0 1 58.18 32.5a5.157 5.157 0 0 1 2.258-.49Zm10.593 0c.994 0 1.896.241 2.705.724a5.339 5.339 0 0 1 1.938 1.916c.483.81.724 1.733.724 2.77 0 1.093-.242 2.094-.724 3.002a5.564 5.564 0 0 1-1.917 2.13c-.81.525-1.718.788-2.726.788-.994 0-1.895-.228-2.705-.682a5.337 5.337 0 0 1-1.937-1.916c-.469-.824-.703-1.761-.703-2.812 0-1.121.234-2.13.703-3.024.468-.894 1.107-1.597 1.916-2.108.809-.526 1.718-.789 2.726-.789ZM6.92 28.048c1.377 0 2.535.157 3.472.47.937.312 1.654.773 2.151 1.383.497.61.766 1.37.809 2.28a4.83 4.83 0 0 1-.255 1.745c-.185.597-.54 1.165-1.066 1.705-.51.525-1.235.95-2.172 1.277-.937.326-2.137.49-3.6.49H5.94c-.156 0-.305-.007-.447-.021v3.087c0 .384-.007.717-.021 1.002 0 .27-.014.497-.042.681l.66-.043a9.66 9.66 0 0 1 .639-.02l.66-.043V43H2.17v-.703c.54-.028.909-.149 1.107-.362.2-.227.305-.532.32-.916.028-.397.043-.845.043-1.342v-9.2c0-.284.007-.554.021-.81.014-.269.028-.51.042-.723l-.767.042-.766.043v-.938c.752-.014 1.526-.02 2.321-.02.795-.014 1.605-.022 2.428-.022Zm14.152 3.961c.398 0 .745.107 1.043.32.298.213.448.554.448 1.022 0 .114-.036.256-.107.426a1.19 1.19 0 0 1-.34.426c-.157.113-.363.17-.618.17a.971.971 0 0 1-.745-.362 1.076 1.076 0 0 1-.214-.83c-.355-.014-.724.078-1.107.277a4.01 4.01 0 0 0-1.043.83c-.327.341-.618.746-.873 1.215l.02 5.239c0 .284-.006.54-.02.766 0 .213-.022.44-.065.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V43h-4.366v-.639c.44 0 .745-.106.916-.32.17-.226.27-.532.299-.915.028-.398.042-.853.042-1.364v-5.537c.014-.227.042-.46.085-.702l-.767.042c-.241 0-.49.007-.745.022v-.873h.66c.61 0 1.03-.058 1.257-.171a2.9 2.9 0 0 0 .596-.405h.618c.028.227.049.511.063.852.014.326.029.746.043 1.257.213-.355.504-.703.873-1.044a5.32 5.32 0 0 1 1.235-.852 3.33 3.33 0 0 1 1.47-.34Zm59.605 8.733c0 .284-.008.54-.022.766-.014.213-.042.44-.085.682.227-.014.448-.021.66-.021.228-.015.455-.03.682-.043V43h-4.345v-.639c.44 0 .746-.106.916-.32.17-.226.27-.532.298-.915.029-.398.043-.853.043-1.364V29.05c.014-.212.035-.46.064-.745l-.767.042c-.241.014-.49.03-.745.043v-.894c.625 0 1.108-.028 1.448-.085.355-.057.618-.128.788-.213.185-.085.327-.178.426-.277h.617l.022 13.822ZM28.35 32.82c-.739 0-1.342.213-1.811.639-.468.425-.816.98-1.043 1.66a7.314 7.314 0 0 0-.32 2.194c0 .88.12 1.719.362 2.514.241.78.61 1.42 1.107 1.917.497.497 1.122.745 1.874.745.753 0 1.35-.213 1.79-.639.44-.426.753-.98.937-1.66a7.649 7.649 0 0 0 .298-2.152c0-.64-.064-1.264-.192-1.874a6.01 6.01 0 0 0-.553-1.683 3.268 3.268 0 0 0-1.001-1.214c-.398-.298-.88-.447-1.448-.447Zm19.841 0c-.738 0-1.342.213-1.81.639-.469.425-.816.98-1.043 1.66a7.314 7.314 0 0 0-.32 2.194c0 .88.12 1.719.362 2.514.241.78.61 1.42 1.107 1.917.497.497 1.122.745 1.874.745.753 0 1.35-.213 1.79-.639.44-.426.752-.98.937-1.66a7.649 7.649 0 0 0 .298-2.152c0-.64-.064-1.264-.192-1.874a6.01 6.01 0 0 0-.553-1.683 3.268 3.268 0 0 0-1.001-1.214c-.398-.298-.88-.447-1.449-.447Zm22.838 0c-.738 0-1.342.213-1.81.639-.469.425-.816.98-1.043 1.66a7.317 7.317 0 0 0-.32 2.194c0 .88.12 1.719.362 2.514.241.78.61 1.42 1.107 1.917.497.497 1.122.745 1.874.745s1.35-.213 1.79-.639c.44-.426.752-.98.937-1.66a7.649 7.649 0 0 0 .298-2.152c0-.64-.064-1.264-.192-1.874a6.013 6.013 0 0 0-.553-1.683 3.268 3.268 0 0 0-1.002-1.214c-.397-.298-.88-.447-1.448-.447ZM6.878 28.88c-.497 0-.845.106-1.044.319-.185.213-.29.511-.32.894-.014.37-.02.81-.02 1.322v5.09c.269.028.496.049.68.063h.704c.81 0 1.548-.156 2.215-.469a3.984 3.984 0 0 0 1.597-1.383c.397-.597.596-1.307.596-2.13 0-.668-.106-1.236-.32-1.704a2.736 2.736 0 0 0-.915-1.15 3.556 3.556 0 0 0-1.384-.64 7.025 7.025 0 0 0-1.79-.212ZM24.895 4.733c.37 0 .646.1.83.298.2.184.3.44.3.767 0 .099-.03.22-.086.362a.807.807 0 0 1-.298.362c-.128.1-.306.149-.533.149a.853.853 0 0 1-.596-.213.953.953 0 0 1-.298-.533 1.204 1.204 0 0 0-.831.511c-.199.27-.334.568-.404.895.34.312.61.689.81 1.129.212.44.318.909.318 1.406 0 .795-.213 1.504-.638 2.129a4.317 4.317 0 0 1-1.64 1.47c-.682.34-1.42.511-2.216.511-.27 0-.503-.014-.702-.043a3.52 3.52 0 0 0-.725-.063c-.525 0-.95.127-1.277.383-.326.255-.44.56-.34.916.113.34.46.56 1.042.66.582.085 1.364.149 2.343.191 1.093.043 2.03.171 2.812.384.78.213 1.377.54 1.789.98.425.454.638 1.064.638 1.83 0 .569-.156 1.073-.468 1.513-.299.454-.703.831-1.214 1.13a6.15 6.15 0 0 1-1.683.68 7.448 7.448 0 0 1-1.852.234c-1.278 0-2.307-.142-3.088-.426-.781-.284-1.35-.645-1.704-1.086-.355-.44-.533-.894-.533-1.363 0-.44.1-.83.298-1.17.213-.327.469-.612.767-.853.312-.242.61-.419.894-.533-.454-.156-.816-.361-1.086-.617-.255-.27-.382-.625-.382-1.065 0-.497.198-.958.595-1.384.398-.44.909-.71 1.533-.81a4.051 4.051 0 0 1-1.575-1.298c-.383-.554-.575-1.2-.575-1.939 0-.852.22-1.59.66-2.215a4.412 4.412 0 0 1 1.683-1.47 4.68 4.68 0 0 1 2.15-.532c.469 0 .938.071 1.407.213.468.128.9.32 1.298.576.142-.398.341-.753.597-1.065.27-.312.574-.554.915-.725.34-.184.696-.276 1.066-.276Zm-7.347 12.8a2.81 2.81 0 0 0-.895.936c-.213.37-.319.76-.319 1.172 0 .696.326 1.25.98 1.661.667.426 1.547.639 2.64.64 1.221 0 2.173-.228 2.855-.683.68-.454 1.021-.987 1.021-1.597 0-.525-.177-.93-.532-1.214-.355-.27-.838-.462-1.448-.575-.61-.1-1.314-.156-2.109-.17-.383-.014-.76-.035-1.129-.064a8.46 8.46 0 0 1-1.064-.106ZM31.409 6.01c.596 0 1.15.1 1.661.3.526.184.987.475 1.384.872.398.384.71.873.938 1.469.227.582.34 1.271.34 2.066l-7.497.128c0 1.08.114 2.03.341 2.854.241.81.625 1.441 1.15 1.895.526.44 1.2.66 2.024.66.44 0 .888-.078 1.342-.234a5.268 5.268 0 0 0 1.299-.638c.397-.27.716-.569.958-.895l.511.426a4.753 4.753 0 0 1-1.384 1.427c-.54.355-1.094.61-1.661.766a5.974 5.974 0 0 1-1.577.234c-.98 0-1.867-.227-2.662-.681a5.03 5.03 0 0 1-1.852-1.96c-.455-.851-.682-1.852-.682-3.002 0-.994.22-1.924.66-2.79a5.48 5.48 0 0 1 1.896-2.087c.809-.54 1.746-.81 2.811-.81Zm21.14.341h3.578v.831l-3.578.042-.042 5.921c0 .639.049 1.186.148 1.64.114.44.292.774.533 1 .242.228.554.342.937.342.398 0 .767-.114 1.107-.341.355-.227.668-.54.938-.937l.575.468c-.312.469-.625.838-.937 1.107-.298.27-.59.47-.873.597a2.42 2.42 0 0 1-.788.256 3.63 3.63 0 0 1-.618.063c-.326 0-.66-.049-1-.148a2.238 2.238 0 0 1-.96-.533c-.284-.27-.511-.66-.681-1.171-.17-.525-.255-1.214-.255-2.066l.042-6.176-1.64.021v-.916c.37-.014.746-.148 1.13-.404.382-.27.723-.632 1.022-1.086.312-.454.525-.952.638-1.491h.724V6.35Zm17.387-4.6c.795 0 1.548.107 2.257.32a7.51 7.51 0 0 1 2.045.98l-.106-1.15h1.15v4.94h-.767c-.142-1.334-.61-2.37-1.406-3.109-.78-.738-1.789-1.107-3.024-1.107-.752 0-1.463.162-2.13.489a5.099 5.099 0 0 0-1.724 1.363c-.497.597-.888 1.314-1.172 2.152-.284.837-.426 1.781-.426 2.832 0 1.334.255 2.513.766 3.535.511 1.022 1.2 1.818 2.067 2.386a5.133 5.133 0 0 0 2.875.851 6.46 6.46 0 0 0 2.725-.617 5.621 5.621 0 0 0 2.195-1.832l.553.447c-.61.838-1.271 1.484-1.981 1.939-.71.454-1.42.76-2.129.916a8.104 8.104 0 0 1-1.917.255c-1.065 0-2.045-.192-2.94-.576a7.048 7.048 0 0 1-2.3-1.596 7.625 7.625 0 0 1-1.49-2.408 8.544 8.544 0 0 1-.511-2.981c0-1.008.15-1.987.447-2.939a8.216 8.216 0 0 1 1.385-2.577 6.648 6.648 0 0 1 2.3-1.832c.937-.454 2.023-.68 3.258-.68Zm23.298 4.26c.597 0 1.15.1 1.662.298.525.185.986.476 1.383.873.398.384.71.873.938 1.469.227.582.34 1.271.34 2.066l-7.496.128c0 1.08.113 2.03.34 2.854.242.81.625 1.441 1.15 1.895.526.44 1.2.66 2.024.66.44 0 .888-.078 1.342-.234a5.268 5.268 0 0 0 1.299-.638c.397-.27.717-.569.958-.895l.511.426a4.752 4.752 0 0 1-1.384 1.427 5.83 5.83 0 0 1-1.661.766 5.973 5.973 0 0 1-1.576.234c-.98 0-1.868-.227-2.663-.681a5.03 5.03 0 0 1-1.852-1.96c-.455-.851-.682-1.852-.682-3.002 0-.994.22-1.924.66-2.79a5.48 5.48 0 0 1 1.896-2.087c.81-.54 1.746-.81 2.811-.81Zm21.14.34h3.578v.831l-3.578.042-.042 5.921c0 .639.049 1.186.148 1.64.114.44.292.774.534 1 .241.228.553.342.936.342.398 0 .767-.114 1.108-.341a3.27 3.27 0 0 0 .937-.937l.575.468c-.312.469-.625.838-.937 1.107-.298.27-.589.47-.873.597a2.423 2.423 0 0 1-.788.256 3.63 3.63 0 0 1-.618.063c-.326 0-.66-.049-1-.148a2.235 2.235 0 0 1-.959-.533c-.284-.27-.512-.66-.682-1.171-.17-.525-.255-1.214-.255-2.066l.042-6.176-1.64.021v-.916c.37-.014.746-.148 1.129-.404.384-.27.725-.632 1.023-1.086.312-.454.525-.952.638-1.491h.724V6.35ZM12.586 13.805c.114.299.24.682.383 1.15.142.47.199.867.17 1.193l.724-.043.725-.042V17H9.71v-.703c.54-.014.895-.135 1.065-.362.17-.227.234-.497.192-.81a3.737 3.737 0 0 0-.213-.85l-.745-2.003-5.537.128-.746 2.278c-.1.341-.192.611-.277.81-.07.199-.156.419-.256.66l.831-.043.83-.042V17H.872v-.703c.426 0 .752-.113.98-.34.227-.228.411-.54.553-.938.156-.397.334-.858.533-1.384L7.324 1.687h.51l4.75 12.118ZM43.74 6.01c1.235 0 2.137.391 2.705 1.172.568.767.852 1.967.852 3.599v3.962c0 .284-.007.54-.022.766 0 .213-.02.44-.063.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.17-.226.27-.532.299-.915.028-.398.042-.853.042-1.364v-2.981c-.014-1.221-.22-2.144-.617-2.769-.384-.624-.995-.93-1.832-.916a3.492 3.492 0 0 0-1.512.406 3.928 3.928 0 0 0-1.214.98c.014.113.022.241.022.383v.447l-.022 5.43c0 .285-.007.54-.021.767 0 .213-.021.44-.064.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.17-.226.27-.532.299-.915.028-.398.042-.853.042-1.364l.022-4.855v-.682c.014-.227.042-.46.085-.702l-.767.042-.745.043v-.894c.624 0 1.093-.029 1.405-.085.327-.057.568-.128.725-.213.156-.085.283-.178.382-.278h.619c.014.1.021.213.021.341.014.128.028.27.042.426.014.156.022.334.022.532.312-.27.653-.51 1.022-.723.383-.213.78-.384 1.192-.512a4.36 4.36 0 0 1 1.257-.192Zm36.125 8.733c0 .284-.007.54-.021.766a6.4 6.4 0 0 1-.085.682c.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.106.916-.32.17-.226.27-.532.298-.915.028-.398.043-.853.043-1.364V3.05c.014-.212.035-.46.063-.745-.255.015-.511.028-.766.042-.242.015-.49.03-.746.043v-.894c.625 0 1.108-.028 1.449-.085.355-.057.617-.128.788-.213.184-.085.326-.178.426-.277h.617l.021 13.822Zm5.57 0c0 .284-.008.54-.022.766 0 .213-.022.44-.064.682.227-.014.448-.021.66-.021.228-.015.454-.03.681-.043V17h-4.344v-.639c.44 0 .745-.107.916-.32.17-.226.27-.532.299-.915.028-.398.041-.853.041-1.364V8.907c0-.227.008-.44.022-.639.014-.213.035-.461.064-.745l-.767.042-.745.043v-.894c.624 0 1.107-.029 1.448-.085.34-.057.596-.128.767-.213.184-.085.326-.178.425-.278h.619v8.605Zm20.13-8.733c1.236 0 2.137.391 2.705 1.172.567.767.852 1.966.852 3.599v3.962c0 .284-.007.54-.021.766 0 .213-.021.44-.064.682.227-.014.447-.021.66-.021.227-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.171-.226.271-.532.299-.915.028-.398.042-.853.042-1.364v-2.981c-.014-1.221-.22-2.144-.617-2.769-.384-.624-.995-.93-1.832-.916a3.494 3.494 0 0 0-1.512.406 3.93 3.93 0 0 0-1.214.98c.014.113.022.241.022.383v.447l-.022 5.43c0 .285-.007.54-.021.767 0 .213-.021.44-.064.682.227-.014.448-.021.66-.021.228-.015.455-.03.682-.043V17h-4.345v-.639c.44 0 .745-.107.915-.32.171-.226.271-.532.299-.915.029-.398.042-.853.042-1.364l.022-4.855v-.682c.014-.227.042-.46.085-.702l-.767.042-.745.043v-.894c.624 0 1.093-.029 1.405-.085.327-.057.569-.128.725-.213.156-.085.283-.178.383-.278h.618c.014.1.021.213.021.341.014.128.028.27.042.426.014.156.022.334.022.532.312-.27.653-.51 1.022-.723a6.305 6.305 0 0 1 1.193-.512 4.359 4.359 0 0 1 1.256-.192Zm-85.994.746c-.766 0-1.363.291-1.789.874-.411.567-.618 1.277-.618 2.128 0 .682.1 1.286.299 1.811.199.511.482.916.851 1.214.384.284.838.426 1.364.426.525 0 .958-.128 1.299-.383.354-.256.617-.604.788-1.044.184-.44.277-.937.277-1.49 0-.625-.093-1.208-.277-1.747-.185-.54-.462-.973-.831-1.3-.355-.326-.81-.49-1.363-.49ZM7.197 4.796c-.142.398-.29.795-.447 1.193a66.26 66.26 0 0 1-.447 1.214L4.79 11.484H9.71L8.198 7.417c-.156-.44-.32-.874-.49-1.3l-.468-1.32h-.043Zm24.234 2.045c-.824 0-1.513.249-2.067.746-.54.482-.894 1.27-1.064 2.364h5.43c0-.511-.078-1.001-.234-1.47a2.423 2.423 0 0 0-.724-1.17c-.341-.313-.788-.47-1.341-.47Zm61.825 0c-.824 0-1.513.249-2.067.746-.54.482-.894 1.27-1.064 2.364h5.43c0-.511-.078-1.001-.234-1.47a2.423 2.423 0 0 0-.724-1.17c-.341-.313-.788-.47-1.341-.47Zm-8.844-5.345c.327 0 .597.127.81.383.227.24.34.54.34.894 0 .355-.12.653-.362.895a1.075 1.075 0 0 1-.81.362c-.297 0-.56-.121-.787-.362a1.256 1.256 0 0 1-.341-.895c0-.355.113-.653.34-.894.242-.256.512-.383.81-.383Z"/></svg>
+<svg width="257" height="47" viewBox="0 0 257 47" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_100_26)">
+<path d="M119.922 24.4481L109.212 5.8996C107.081 2.20815 103.26 0 98.9973 0C94.7394 0 90.9279 2.19855 88.7918 5.8804L66.6239 44.2734C66.3646 44.7198 66.3646 45.2671 66.6239 45.7135C66.8831 46.1599 67.3583 46.4336 67.8719 46.4336H73.7715C74.2852 46.4336 74.7604 46.1599 75.0196 45.7135L76.9302 42.4013L77.5158 41.4652C77.5158 41.4652 77.535 41.4364 77.5398 41.422L84.6923 29.0324C84.7211 28.9844 84.7499 28.9316 84.7691 28.874C84.8363 28.7203 84.9035 28.5763 84.9851 28.4419L95.6946 9.89347C96.3811 8.70299 97.6148 7.98774 98.9925 7.98774C100.37 7.98774 101.604 8.69819 102.29 9.89347L113 28.4419C113.686 29.6324 113.691 31.0581 113 32.2486C112.313 33.4391 111.08 34.1543 109.702 34.1543H102.232C101.718 34.1543 101.243 34.4279 100.984 34.8744L98.0318 39.9819C97.7726 40.4283 97.7726 40.9756 98.0318 41.422C98.291 41.8684 98.7662 42.1421 99.2799 42.1421H109.404C113.965 42.1421 118.079 39.7275 120.133 35.844C122.039 32.2438 121.957 27.9859 119.912 24.4433L119.922 24.4481Z" fill="white"/>
+<path d="M82.8564 34.1538H104.17L103.872 42.1416H79.9042C79.3905 42.1416 78.9153 41.8679 78.6561 41.4215C78.3969 40.9751 78.3969 40.4278 78.6561 39.9814L81.6083 34.8739C81.8675 34.4274 82.3427 34.1538 82.8564 34.1538Z" fill="url(#paint0_linear_100_26)"/>
+<path d="M43.7123 25.1535C43.7123 24.9039 43.6451 24.659 43.5155 24.443L32.8972 6.14897C30.7131 2.36152 26.7288 -0.000244141 22.5093 -0.000244141C22.3701 -0.000244141 22.2309 -0.000244141 22.0869 0.00935651C18.0162 0.158167 14.368 2.36152 12.323 5.89936L1.61829 24.4478C-1.31951 29.5314 -0.181833 35.6374 4.44568 39.6361C6.31301 41.2538 8.78518 42.1418 11.4062 42.1418H31.3851C31.8987 42.1418 32.374 41.8682 32.6332 41.4218L35.5806 36.3142C35.8398 35.8678 35.8398 35.3206 35.5806 34.8741C35.3214 34.4277 34.8461 34.1541 34.3325 34.1541H11.8334C10.4557 34.1541 9.22201 33.4436 8.53556 32.2532C7.84431 31.0627 7.84431 29.6418 8.53556 28.4465L19.2451 9.89803C19.9315 8.70755 21.1652 7.9923 22.5429 7.9923C23.9206 7.9923 25.1495 8.70275 25.8407 9.89803L41.1346 36.4198C41.461 36.9863 42.1282 37.2599 42.7619 37.0919C43.3955 36.9191 43.8276 36.343 43.8228 35.6902L43.7171 25.1583L43.7123 25.1535Z" fill="url(#paint1_linear_100_26)"/>
+<path d="M4.44544 39.6362C-0.182077 35.6376 -1.31975 29.5315 1.61805 24.448L8.53532 28.4467C7.84407 29.6419 7.84407 31.0628 8.53532 32.2533C9.22176 33.4438 10.4554 34.1543 11.8331 34.1543H34.3323C34.8459 34.1543 35.3211 34.4279 35.5804 34.8743C35.8396 35.3207 35.8396 35.868 35.5804 36.3144L32.633 41.422C32.3737 41.8684 31.8985 42.142 31.3849 42.142H11.4059C8.78493 42.142 6.31276 41.2539 4.44544 39.6362Z" fill="white"/>
+<path d="M74.6308 34.8696C74.3716 34.4231 73.8964 34.1495 73.3827 34.1495H51.2532C49.8755 34.1495 48.6418 33.4391 47.9554 32.2486C47.2642 31.0581 47.2642 29.6372 47.9554 28.4419L58.6649 9.89347C59.3514 8.70299 60.5851 7.98774 61.9628 7.98774C63.3404 7.98774 64.5693 8.69819 65.2606 9.89347L65.899 10.9975C66.1582 11.444 66.6335 11.7176 67.1471 11.7176C67.6607 11.7176 68.1408 11.4392 68.3952 10.9927L71.2322 6.01961C71.5298 5.49637 71.4722 4.84353 71.0882 4.3827C68.7648 1.59851 65.4238 0 61.9291 0C61.7899 0 61.6507 0 61.5067 0.00960065C57.436 0.158411 53.7878 2.36176 51.7429 5.8996L41.0333 24.4481C38.0955 29.5316 39.2332 35.6376 43.8607 39.6363C45.728 41.254 48.2002 42.1421 50.8212 42.1421H70.4257C70.9394 42.1421 71.4146 41.8684 71.6738 41.422L74.626 36.3145C74.8852 35.868 74.8852 35.3208 74.626 34.8744L74.6308 34.8696Z" fill="url(#paint2_linear_100_26)"/>
+</g>
+<path d="M132.976 15.5649V14.6449C133.383 14.6449 133.695 14.5359 133.911 14.3178C134.128 14.0998 134.311 13.8067 134.461 13.4388C134.61 13.0571 134.773 12.6346 134.949 12.1712L139.057 0.865676H139.871L144.325 12.3348C144.434 12.5937 144.556 12.9481 144.692 13.3979C144.827 13.834 144.888 14.2088 144.875 14.5223C145.105 14.495 145.329 14.4814 145.546 14.4814C145.776 14.4678 145.993 14.4541 146.197 14.4405V15.5649H141.254V14.6654C141.729 14.6518 142.041 14.5495 142.19 14.3587C142.352 14.1543 142.413 13.909 142.373 13.6227C142.346 13.3365 142.278 13.0503 142.169 12.7641L141.559 11.1081L136.576 11.2308L135.986 13.0094C135.905 13.282 135.817 13.541 135.722 13.7863C135.627 14.0316 135.532 14.2701 135.437 14.5018C135.681 14.4746 135.939 14.461 136.21 14.461C136.495 14.4473 136.745 14.4337 136.962 14.4201V15.5649H132.976ZM136.942 10.1268H141.213L139.932 6.67178C139.769 6.22201 139.613 5.77906 139.464 5.34292C139.315 4.89315 139.179 4.46382 139.057 4.05494H139.037C138.929 4.39568 138.807 4.77048 138.671 5.17937C138.535 5.58825 138.379 6.0312 138.203 6.50823L136.942 10.1268Z" fill="white"/>
+<path d="M151.397 21.1053C150.204 21.1053 149.241 20.969 148.509 20.6964C147.791 20.4374 147.268 20.0967 146.943 19.6742C146.631 19.2653 146.475 18.8292 146.475 18.3658C146.475 17.9978 146.557 17.657 146.719 17.3436C146.896 17.0301 147.126 16.7507 147.411 16.5054C147.696 16.2737 148.014 16.0897 148.367 15.9534C147.892 15.8034 147.533 15.5922 147.289 15.3196C147.045 15.0334 146.923 14.6858 146.923 14.277C146.923 13.8408 147.092 13.4115 147.431 12.989C147.784 12.5665 148.285 12.2803 148.936 12.1303C148.326 11.8577 147.838 11.4625 147.472 10.9446C147.106 10.4267 146.916 9.81334 146.902 9.10462C146.889 8.28686 147.092 7.57132 147.513 6.95799C147.946 6.34467 148.496 5.86765 149.16 5.52691C149.838 5.18618 150.543 5.01581 151.275 5.01581C151.696 5.01581 152.13 5.07714 152.577 5.19981C153.025 5.30884 153.431 5.48603 153.798 5.73135C153.947 5.3361 154.143 4.97492 154.387 4.64782C154.631 4.32072 154.916 4.06176 155.242 3.87095C155.581 3.68014 155.933 3.58473 156.299 3.58473C156.693 3.58473 156.991 3.68695 157.194 3.89139C157.398 4.09583 157.499 4.36842 157.499 4.70915C157.499 4.81819 157.465 4.95448 157.398 5.11803C157.343 5.26796 157.242 5.39743 157.093 5.50647C156.943 5.6155 156.74 5.67002 156.482 5.67002C156.265 5.67002 156.069 5.60187 155.893 5.46558C155.73 5.31566 155.628 5.13848 155.587 4.93404C155.303 4.98855 155.065 5.15892 154.876 5.44514C154.699 5.71772 154.584 5.99713 154.53 6.28334C154.882 6.59682 155.154 6.97162 155.343 7.40776C155.547 7.83027 155.648 8.28686 155.648 8.77751C155.648 9.55439 155.438 10.2427 155.018 10.8424C154.611 11.4421 154.076 11.9123 153.411 12.253C152.747 12.5937 152.028 12.7641 151.255 12.7641C151.025 12.7641 150.808 12.7505 150.604 12.7232C150.401 12.6823 150.177 12.6619 149.933 12.6619C149.499 12.6619 149.14 12.7641 148.855 12.9685C148.584 13.173 148.482 13.4183 148.55 13.7045C148.618 14.0044 148.902 14.202 149.404 14.2974C149.906 14.3928 150.631 14.461 151.581 14.5018C152.625 14.5427 153.52 14.6722 154.265 14.8903C155.025 15.0947 155.608 15.415 156.015 15.8511C156.435 16.2873 156.645 16.8802 156.645 17.6298C156.645 18.1886 156.489 18.6861 156.177 19.1222C155.879 19.5583 155.472 19.9195 154.957 20.2057C154.455 20.5056 153.892 20.7305 153.269 20.8804C152.645 21.0303 152.021 21.1053 151.397 21.1053ZM151.581 20.1035C152.679 20.1035 153.526 19.8991 154.123 19.4902C154.733 19.0813 155.038 18.6179 155.038 18.1C155.038 17.6638 154.889 17.3231 154.591 17.0778C154.292 16.8461 153.872 16.6757 153.33 16.5667C152.801 16.4713 152.177 16.4168 151.458 16.4031C151.106 16.3759 150.747 16.3554 150.38 16.3418C150.014 16.3282 149.675 16.2941 149.363 16.2396C149.052 16.4577 148.808 16.7234 148.631 17.0369C148.469 17.3504 148.38 17.6775 148.367 18.0182C148.367 18.6452 148.658 19.1494 149.241 19.5311C149.825 19.9127 150.604 20.1035 151.581 20.1035ZM151.316 11.8032C151.777 11.8032 152.157 11.6874 152.455 11.4557C152.767 11.2104 152.998 10.8901 153.147 10.4948C153.309 10.0859 153.391 9.64298 153.391 9.16595C153.391 8.60715 153.309 8.08242 153.147 7.59176C152.984 7.1011 152.747 6.70585 152.435 6.40601C152.123 6.10616 151.723 5.95624 151.235 5.95624C150.57 5.95624 150.055 6.22201 149.689 6.75356C149.323 7.2851 149.14 7.92568 149.14 8.67529C149.14 9.27499 149.221 9.81334 149.384 10.2904C149.56 10.7538 149.811 11.1218 150.136 11.3943C150.462 11.6669 150.855 11.8032 151.316 11.8032Z" fill="white"/>
+<path d="M162.5 15.892C161.551 15.892 160.696 15.674 159.937 15.2378C159.191 14.7881 158.601 14.1611 158.168 13.357C157.734 12.5392 157.517 11.5783 157.517 10.4744C157.517 9.52031 157.727 8.62759 158.147 7.7962C158.581 6.96481 159.185 6.29697 159.957 5.79269C160.73 5.27477 161.625 5.01581 162.642 5.01581C163.212 5.01581 163.747 5.1044 164.249 5.28159C164.764 5.45877 165.219 5.73817 165.612 6.11979C166.019 6.48778 166.337 6.97162 166.568 7.57132C166.798 8.15738 166.914 8.87292 166.914 9.71794L159.917 9.8406C159.917 10.7674 160.018 11.592 160.222 12.3143C160.439 13.0367 160.785 13.5955 161.259 13.9907C161.734 14.386 162.351 14.5836 163.11 14.5836C163.476 14.5836 163.863 14.5223 164.27 14.3996C164.69 14.2633 165.083 14.0725 165.449 13.8272C165.829 13.5819 166.148 13.2888 166.405 12.9481L167.036 13.5001C166.629 14.1134 166.161 14.5972 165.632 14.9516C165.103 15.2923 164.561 15.5309 164.005 15.6672C163.463 15.8171 162.961 15.892 162.5 15.892ZM159.998 8.77751H164.697C164.697 8.2596 164.622 7.7962 164.473 7.38732C164.337 6.96481 164.12 6.63089 163.822 6.38556C163.524 6.14023 163.144 6.01757 162.683 6.01757C161.964 6.01757 161.374 6.24927 160.913 6.71267C160.452 7.16244 160.147 7.85072 159.998 8.77751Z" fill="white"/>
+<path d="M168.419 15.5649V14.7063C168.826 14.7063 169.111 14.6109 169.273 14.4201C169.436 14.2293 169.531 13.9635 169.558 13.6227C169.599 13.282 169.619 12.8868 169.619 12.437L169.64 8.18464C169.64 7.96657 169.64 7.73487 169.64 7.48954C169.653 7.23058 169.68 6.97844 169.721 6.73311C169.477 6.74674 169.226 6.76037 168.968 6.774C168.724 6.774 168.494 6.78081 168.277 6.79444V5.71091C168.887 5.71091 169.362 5.68365 169.701 5.62913C170.053 5.56099 170.318 5.48603 170.494 5.40425C170.684 5.32247 170.826 5.23388 170.921 5.13848H171.653C171.667 5.26114 171.673 5.37699 171.673 5.48603C171.687 5.59506 171.694 5.71091 171.694 5.83357C171.707 5.95624 171.721 6.11298 171.735 6.30379C172.033 6.05846 172.358 5.84039 172.711 5.64958C173.063 5.45877 173.429 5.30884 173.809 5.19981C174.202 5.07714 174.575 5.01581 174.928 5.01581C176.135 5.01581 177.003 5.38381 177.531 6.11979C178.074 6.85578 178.345 8.00745 178.345 9.57483V13.0299C178.345 13.2752 178.338 13.5273 178.325 13.7863C178.311 14.0316 178.291 14.2838 178.264 14.5427C178.481 14.5291 178.697 14.5223 178.914 14.5223C179.145 14.5087 179.355 14.495 179.545 14.4814V15.5649H175.009V14.7063C175.416 14.7063 175.701 14.6109 175.863 14.4201C176.026 14.2293 176.121 13.9635 176.148 13.6227C176.189 13.282 176.209 12.8868 176.209 12.437V9.57483C176.196 8.49811 176.019 7.68717 175.68 7.14199C175.355 6.59682 174.826 6.33105 174.094 6.34467C173.66 6.34467 173.233 6.45371 172.813 6.67178C172.392 6.88985 172.04 7.15562 171.755 7.4691C171.755 7.60539 171.755 7.75531 171.755 7.91886C171.755 8.06879 171.755 8.22552 171.755 8.38908V13.0299C171.755 13.2752 171.748 13.5273 171.735 13.7863C171.721 14.0316 171.701 14.2838 171.673 14.5427C171.89 14.5291 172.107 14.5223 172.324 14.5223C172.555 14.5087 172.765 14.495 172.955 14.4814V15.5649H168.419Z" fill="white"/>
+<path d="M184.495 15.892C184.156 15.892 183.81 15.8443 183.458 15.7489C183.119 15.6671 182.807 15.4968 182.522 15.2378C182.237 14.9652 182.014 14.5768 181.851 14.0725C181.688 13.5682 181.607 12.9004 181.607 12.069L181.648 6.48778H180.142V5.34292C180.509 5.32929 180.881 5.19299 181.261 4.93404C181.641 4.67508 181.973 4.32753 182.258 3.89139C182.543 3.45525 182.739 2.98504 182.848 2.48075H183.804V5.34292H186.936V6.40601L183.804 6.4469L183.763 11.9054C183.763 12.4234 183.804 12.8799 183.885 13.2752C183.98 13.6568 184.129 13.9567 184.332 14.1747C184.549 14.3792 184.841 14.4814 185.207 14.4814C185.519 14.4814 185.838 14.386 186.163 14.1952C186.502 14.0044 186.821 13.6909 187.119 13.2548L187.811 13.8681C187.485 14.3451 187.16 14.7199 186.834 14.9925C186.509 15.2651 186.197 15.4627 185.899 15.5854C185.6 15.7217 185.329 15.8034 185.085 15.8307C184.841 15.8716 184.644 15.892 184.495 15.892Z" fill="white"/>
+<path d="M188.83 21.1053L187.508 20.2671L199.224 0.0683594L200.708 1.00878L188.83 21.1053Z" fill="white"/>
+<path d="M212.664 5.81313C212.515 4.58649 212.095 3.64606 211.403 2.99185C210.712 2.32402 209.81 1.98328 208.698 1.96965C207.993 1.96965 207.342 2.12639 206.745 2.43987C206.149 2.75334 205.633 3.19629 205.199 3.76873C204.766 4.32753 204.427 4.99537 204.182 5.77224C203.952 6.53549 203.837 7.37369 203.837 8.28686C203.837 9.52713 204.054 10.6311 204.488 11.5988C204.921 12.5528 205.518 13.2956 206.277 13.8272C207.05 14.3587 207.925 14.6245 208.901 14.6245C209.769 14.6245 210.623 14.4201 211.464 14.0112C212.318 13.5887 213.023 12.9958 213.579 12.2326L214.251 12.805C213.64 13.65 212.99 14.2974 212.298 14.7472C211.606 15.1969 210.915 15.4968 210.223 15.6467C209.545 15.8103 208.928 15.892 208.372 15.892C207.355 15.892 206.42 15.708 205.566 15.34C204.711 14.9721 203.972 14.461 203.349 13.8067C202.738 13.1389 202.264 12.3688 201.925 11.4966C201.599 10.6107 201.437 9.65661 201.437 8.63441C201.437 7.68035 201.586 6.74674 201.884 5.83357C202.182 4.92041 202.623 4.09583 203.206 3.35985C203.789 2.61023 204.521 2.01736 205.403 1.58122C206.298 1.14508 207.335 0.927008 208.515 0.927008C209.206 0.927008 209.878 1.02241 210.528 1.21322C211.193 1.40404 211.83 1.69707 212.44 2.09232L212.339 1.07012H213.6V5.81313H212.664Z" fill="white"/>
+<path d="M215.152 14.7063C215.559 14.7063 215.844 14.6109 216.006 14.4201C216.169 14.2293 216.264 13.9635 216.291 13.6227C216.332 13.282 216.352 12.8868 216.352 12.437V3.19629C216.352 2.9646 216.352 2.7329 216.352 2.5012C216.366 2.25587 216.386 1.99691 216.413 1.72432C216.183 1.73795 215.938 1.75158 215.681 1.76521C215.423 1.76521 215.193 1.77203 214.989 1.78566V0.702123C215.599 0.702123 216.081 0.674865 216.433 0.620348C216.799 0.552201 217.077 0.477239 217.267 0.395463C217.471 0.313687 217.62 0.225096 217.715 0.129691H218.488V13.0299C218.488 13.2752 218.481 13.5273 218.467 13.7863C218.454 14.0316 218.433 14.2838 218.406 14.5427C218.623 14.5291 218.84 14.5223 219.057 14.5223C219.288 14.5087 219.498 14.495 219.688 14.4814V15.5649H215.152V14.7063Z" fill="white"/>
+<path d="M220.993 14.7063C221.399 14.7063 221.684 14.6109 221.847 14.4201C222.01 14.2293 222.105 13.9635 222.132 13.6227C222.172 13.282 222.193 12.8868 222.193 12.437V8.20508C222.193 7.97338 222.199 7.74168 222.213 7.50998C222.227 7.26466 222.247 7.0057 222.274 6.73311C222.044 6.74674 221.799 6.76037 221.542 6.774C221.284 6.774 221.047 6.78081 220.83 6.79444V5.71091C221.44 5.71091 221.921 5.68365 222.274 5.62913C222.64 5.56099 222.918 5.48603 223.108 5.40425C223.311 5.32247 223.461 5.23388 223.555 5.13848H224.328V13.0299C224.328 13.2752 224.322 13.5273 224.308 13.7863C224.294 14.0316 224.274 14.2838 224.247 14.5427C224.464 14.5291 224.681 14.5223 224.898 14.5223C225.128 14.5087 225.339 14.495 225.528 14.4814V15.5649H220.993V14.7063ZM223.149 3.25763C222.796 3.25763 222.498 3.12815 222.254 2.86919C222.01 2.5966 221.888 2.2695 221.888 1.88788C221.888 1.50626 222.016 1.18597 222.274 0.927008C222.532 0.654421 222.823 0.518127 223.149 0.518127C223.501 0.518127 223.793 0.654421 224.023 0.927008C224.267 1.18597 224.389 1.50626 224.389 1.88788C224.389 2.2695 224.267 2.5966 224.023 2.86919C223.793 3.12815 223.501 3.25763 223.149 3.25763Z" fill="white"/>
+<path d="M231.689 15.892C230.74 15.892 229.886 15.674 229.126 15.2378C228.381 14.7881 227.791 14.1611 227.357 13.357C226.923 12.5392 226.706 11.5783 226.706 10.4744C226.706 9.52031 226.916 8.62759 227.337 7.7962C227.771 6.96481 228.374 6.29697 229.147 5.79269C229.92 5.27477 230.815 5.01581 231.832 5.01581C232.401 5.01581 232.937 5.1044 233.439 5.28159C233.954 5.45877 234.408 5.73817 234.801 6.11979C235.208 6.48778 235.527 6.97162 235.757 7.57132C235.988 8.15738 236.103 8.87292 236.103 9.71794L229.106 9.8406C229.106 10.7674 229.208 11.592 229.411 12.3143C229.628 13.0367 229.974 13.5955 230.449 13.9907C230.923 14.386 231.54 14.5836 232.299 14.5836C232.666 14.5836 233.052 14.5223 233.459 14.3996C233.879 14.2633 234.272 14.0725 234.639 13.8272C235.018 13.5819 235.337 13.2888 235.595 12.9481L236.225 13.5001C235.818 14.1134 235.35 14.5972 234.822 14.9516C234.293 15.2923 233.75 15.5309 233.194 15.6672C232.652 15.8171 232.15 15.892 231.689 15.892ZM229.188 8.77751H233.886C233.886 8.2596 233.811 7.7962 233.662 7.38732C233.527 6.96481 233.31 6.63089 233.011 6.38556C232.713 6.14023 232.333 6.01757 231.872 6.01757C231.154 6.01757 230.564 6.24927 230.103 6.71267C229.642 7.16244 229.337 7.85072 229.188 8.77751Z" fill="white"/>
+<path d="M237.608 15.5649V14.7063C238.015 14.7063 238.3 14.6109 238.463 14.4201C238.625 14.2293 238.72 13.9635 238.748 13.6227C238.788 13.282 238.809 12.8868 238.809 12.437L238.829 8.18464C238.829 7.96657 238.829 7.73487 238.829 7.48954C238.842 7.23058 238.87 6.97844 238.91 6.73311C238.666 6.74674 238.415 6.76037 238.158 6.774C237.914 6.774 237.683 6.78081 237.466 6.79444V5.71091C238.076 5.71091 238.551 5.68365 238.89 5.62913C239.242 5.56099 239.507 5.48603 239.683 5.40425C239.873 5.32247 240.015 5.23388 240.11 5.13848H240.842C240.856 5.26114 240.863 5.37699 240.863 5.48603C240.876 5.59506 240.883 5.71091 240.883 5.83357C240.897 5.95624 240.91 6.11298 240.924 6.30379C241.222 6.05846 241.548 5.84039 241.9 5.64958C242.253 5.45877 242.619 5.30884 242.999 5.19981C243.392 5.07714 243.765 5.01581 244.117 5.01581C245.324 5.01581 246.192 5.38381 246.721 6.11979C247.263 6.85578 247.534 8.00745 247.534 9.57483V13.0299C247.534 13.2752 247.528 13.5273 247.514 13.7863C247.5 14.0316 247.48 14.2838 247.453 14.5427C247.67 14.5291 247.887 14.5223 248.104 14.5223C248.334 14.5087 248.544 14.495 248.734 14.4814V15.5649H244.199V14.7063C244.605 14.7063 244.89 14.6109 245.053 14.4201C245.216 14.2293 245.31 13.9635 245.338 13.6227C245.378 13.282 245.399 12.8868 245.399 12.437V9.57483C245.385 8.49811 245.209 7.68717 244.87 7.14199C244.544 6.59682 244.016 6.33105 243.283 6.34467C242.849 6.34467 242.422 6.45371 242.002 6.67178C241.582 6.88985 241.229 7.15562 240.944 7.4691C240.944 7.60539 240.944 7.75531 240.944 7.91886C240.944 8.06879 240.944 8.22552 240.944 8.38908V13.0299C240.944 13.2752 240.937 13.5273 240.924 13.7863C240.91 14.0316 240.89 14.2838 240.863 14.5427C241.08 14.5291 241.297 14.5223 241.514 14.5223C241.744 14.5087 241.954 14.495 242.144 14.4814V15.5649H237.608Z" fill="white"/>
+<path d="M253.685 15.892C253.346 15.892 253 15.8443 252.647 15.7489C252.308 15.6671 251.996 15.4968 251.712 15.2378C251.427 14.9652 251.203 14.5768 251.04 14.0725C250.878 13.5682 250.796 12.9004 250.796 12.069L250.837 6.48778H249.332V5.34292C249.698 5.32929 250.071 5.19299 250.451 4.93404C250.83 4.67508 251.162 4.32753 251.447 3.89139C251.732 3.45525 251.929 2.98504 252.037 2.48075H252.993V5.34292H256.125V6.40601L252.993 6.4469L252.952 11.9054C252.952 12.4234 252.993 12.8799 253.074 13.2752C253.169 13.6568 253.318 13.9567 253.522 14.1747C253.739 14.3792 254.03 14.4814 254.396 14.4814C254.708 14.4814 255.027 14.386 255.352 14.1952C255.691 14.0044 256.01 13.6909 256.308 13.2548L257 13.8681C256.674 14.3451 256.349 14.7199 256.024 14.9925C255.698 15.2651 255.386 15.4627 255.088 15.5854C254.79 15.7217 254.518 15.8034 254.274 15.8307C254.03 15.8716 253.834 15.892 253.685 15.892Z" fill="white"/>
+<path d="M134.115 40.8445C134.562 40.8173 134.881 40.7219 135.071 40.5583C135.274 40.3948 135.403 40.1494 135.457 39.8223C135.512 39.4952 135.539 39.0795 135.539 38.5752V30.0705C135.539 29.7707 135.545 29.4845 135.559 29.2119C135.573 28.9257 135.586 28.6803 135.6 28.4759C135.369 28.4895 135.118 28.5032 134.847 28.5168C134.576 28.5304 134.332 28.544 134.115 28.5577V27.4333C134.915 27.4196 135.728 27.4128 136.556 27.4128C137.383 27.3992 138.223 27.3924 139.078 27.3924C140.352 27.3924 141.43 27.5491 142.312 27.8626C143.207 28.1624 143.892 28.6258 144.366 29.2528C144.854 29.8661 145.105 30.643 145.119 31.5834C145.132 32.1149 145.037 32.6669 144.834 33.2394C144.631 33.7982 144.285 34.3229 143.797 34.8135C143.308 35.2906 142.644 35.679 141.803 35.9789C140.976 36.2787 139.932 36.4286 138.671 36.4286C138.535 36.4423 138.379 36.4491 138.203 36.4491C138.04 36.4491 137.871 36.4423 137.695 36.4286V39.0046C137.695 39.3726 137.688 39.7065 137.674 40.0063C137.674 40.2925 137.661 40.5242 137.634 40.7014C137.823 40.6878 138.027 40.6742 138.244 40.6605C138.461 40.6469 138.671 40.6401 138.874 40.6401C139.091 40.6265 139.288 40.6128 139.464 40.5992V41.7441H134.115V40.8445ZM137.695 35.3451C137.925 35.3724 138.122 35.3928 138.285 35.4064C138.461 35.4064 138.664 35.4064 138.895 35.4064C139.654 35.4064 140.325 35.2633 140.908 34.9771C141.491 34.6909 141.946 34.2752 142.271 33.73C142.597 33.1848 142.759 32.5375 142.759 31.7878C142.759 31.1336 142.658 30.5885 142.454 30.1523C142.264 29.7025 141.993 29.355 141.641 29.1097C141.302 28.8507 140.908 28.6667 140.461 28.5577C140.013 28.4486 139.539 28.3941 139.037 28.3941C138.63 28.3941 138.332 28.4759 138.142 28.6395C137.952 28.803 137.83 29.0415 137.776 29.355C137.722 29.6685 137.695 30.0705 137.695 30.5612V35.3451Z" fill="white"/>
+<path d="M146.262 40.8854C146.668 40.8854 146.953 40.79 147.116 40.5992C147.278 40.4084 147.373 40.1426 147.401 39.8019C147.441 39.4612 147.462 39.0659 147.462 38.6161V34.3638C147.462 34.1457 147.462 33.914 147.462 33.6687C147.475 33.4097 147.502 33.1576 147.543 32.9123C147.312 32.9259 147.068 32.9395 146.811 32.9531C146.553 32.9531 146.316 32.96 146.099 32.9736V31.8901H146.79C147.36 31.8901 147.794 31.8287 148.092 31.7061C148.39 31.5834 148.607 31.4539 148.743 31.3176H149.475C149.502 31.5084 149.523 31.7742 149.536 32.1149C149.55 32.4557 149.563 32.8373 149.577 33.2598C149.835 32.8782 150.133 32.5374 150.472 32.2376C150.811 31.9241 151.177 31.672 151.57 31.4812C151.977 31.2904 152.397 31.195 152.831 31.195C153.252 31.195 153.611 31.3108 153.909 31.5425C154.221 31.7606 154.377 32.1218 154.377 32.626C154.377 32.7623 154.336 32.9191 154.255 33.0963C154.187 33.2734 154.065 33.4302 153.889 33.5665C153.726 33.6891 153.502 33.7505 153.218 33.7505C152.933 33.7368 152.682 33.6278 152.465 33.4234C152.262 33.2189 152.167 32.9395 152.18 32.5852C151.855 32.5852 151.53 32.6874 151.204 32.8918C150.879 33.0826 150.574 33.3416 150.289 33.6687C150.018 33.9958 149.787 34.3502 149.597 34.7318V39.209C149.597 39.4543 149.59 39.7065 149.577 39.9654C149.577 40.2108 149.557 40.4629 149.516 40.7219C149.733 40.7082 149.957 40.7014 150.187 40.7014C150.418 40.6878 150.628 40.6742 150.818 40.6605V41.7441H146.262V40.8854Z" fill="white"/>
+<path d="M160.08 42.0712C159.117 42.0712 158.249 41.8531 157.477 41.417C156.704 40.9808 156.087 40.3743 155.626 39.5975C155.178 38.8069 154.954 37.9006 154.954 36.8784C154.954 35.7744 155.178 34.7999 155.626 33.9549C156.087 33.0963 156.704 32.4216 157.477 31.9309C158.249 31.4403 159.11 31.195 160.06 31.195C161.022 31.195 161.89 31.4198 162.663 31.8696C163.436 32.3058 164.046 32.9191 164.494 33.7096C164.955 34.4864 165.185 35.386 165.185 36.4082C165.185 37.4849 164.962 38.4526 164.514 39.3112C164.067 40.1699 163.456 40.8445 162.683 41.3352C161.924 41.8259 161.056 42.0712 160.08 42.0712ZM160.222 41.049C160.873 41.0353 161.382 40.8309 161.748 40.4357C162.128 40.0404 162.399 39.5361 162.561 38.9228C162.724 38.2959 162.806 37.6485 162.806 36.9806C162.806 36.3946 162.751 35.8221 162.643 35.2633C162.548 34.6909 162.392 34.173 162.175 33.7096C161.958 33.2462 161.673 32.8782 161.321 32.6056C160.968 32.3194 160.541 32.1831 160.039 32.1967C159.402 32.1967 158.88 32.3943 158.473 32.7896C158.08 33.1848 157.788 33.6959 157.599 34.3229C157.422 34.9362 157.334 35.5904 157.334 36.2855C157.334 37.0897 157.436 37.8529 157.639 38.5752C157.843 39.2976 158.154 39.8905 158.575 40.3539C159.009 40.8173 159.558 41.049 160.222 41.049Z" fill="white"/>
+<path d="M170.516 42.0712C170.177 42.0712 169.832 42.0235 169.479 41.9281C169.14 41.8463 168.828 41.6759 168.543 41.417C168.259 41.1444 168.035 40.7559 167.872 40.2517C167.709 39.7474 167.628 39.0795 167.628 38.2481L167.669 32.6669H166.164V31.5221C166.53 31.5084 166.903 31.3721 167.282 31.1132C167.662 30.8542 167.994 30.5067 168.279 30.0705C168.564 29.6344 168.76 29.1642 168.869 28.6599H169.825V31.5221H172.957V32.5852L169.825 32.626L169.784 38.0846C169.784 38.6025 169.825 39.0591 169.906 39.4543C170.001 39.836 170.15 40.1358 170.354 40.3539C170.571 40.5583 170.862 40.6605 171.228 40.6605C171.54 40.6605 171.859 40.5651 172.184 40.3743C172.523 40.1835 172.842 39.87 173.14 39.4339L173.832 40.0472C173.506 40.5243 173.181 40.8991 172.855 41.1716C172.53 41.4442 172.218 41.6419 171.92 41.7645C171.621 41.9008 171.35 41.9826 171.106 42.0098C170.862 42.0507 170.666 42.0712 170.516 42.0712Z" fill="white"/>
+<path d="M179.516 42.0712C178.554 42.0712 177.686 41.8531 176.913 41.417C176.14 40.9808 175.523 40.3743 175.062 39.5975C174.615 38.8069 174.391 37.9006 174.391 36.8784C174.391 35.7744 174.615 34.7999 175.062 33.9549C175.523 33.0963 176.14 32.4216 176.913 31.9309C177.686 31.4403 178.547 31.195 179.496 31.195C180.459 31.195 181.327 31.4198 182.1 31.8696C182.872 32.3058 183.483 32.9191 183.93 33.7096C184.391 34.4864 184.622 35.386 184.622 36.4082C184.622 37.4849 184.398 38.4526 183.95 39.3112C183.503 40.1699 182.893 40.8445 182.12 41.3352C181.361 41.8259 180.493 42.0712 179.516 42.0712ZM179.659 41.049C180.31 41.0353 180.818 40.8309 181.184 40.4357C181.564 40.0404 181.835 39.5361 181.998 38.9228C182.161 38.2959 182.242 37.6485 182.242 36.9806C182.242 36.3946 182.188 35.8221 182.079 35.2633C181.984 34.6909 181.828 34.173 181.611 33.7096C181.394 33.2462 181.11 32.8782 180.757 32.6056C180.405 32.3194 179.977 32.1831 179.476 32.1967C178.838 32.1967 178.316 32.3943 177.91 32.7896C177.516 33.1848 177.225 33.6959 177.035 34.3229C176.859 34.9362 176.771 35.5904 176.771 36.2855C176.771 37.0897 176.872 37.8529 177.076 38.5752C177.279 39.2976 177.591 39.8905 178.011 40.3539C178.445 40.8173 178.994 41.049 179.659 41.049Z" fill="white"/>
+<path d="M190.97 42.0712C190.061 42.0712 189.227 41.8667 188.468 41.4579C187.709 41.0354 187.098 40.4357 186.637 39.6588C186.19 38.8819 185.966 37.9415 185.966 36.8375C185.966 36.1015 186.095 35.3996 186.353 34.7318C186.61 34.0503 186.97 33.4438 187.431 32.9123C187.905 32.3807 188.461 31.965 189.098 31.6652C189.749 31.3517 190.468 31.195 191.254 31.195C192.055 31.195 192.739 31.3176 193.309 31.563C193.878 31.8083 194.312 32.1286 194.611 32.5238C194.922 32.9191 195.078 33.3484 195.078 33.8118C195.078 34.1389 194.983 34.4251 194.794 34.6704C194.604 34.9158 194.333 35.0384 193.98 35.0384C193.587 35.0521 193.309 34.9362 193.146 34.6909C192.983 34.4319 192.902 34.1934 192.902 33.9753C192.902 33.8527 192.922 33.7164 192.963 33.5665C193.004 33.4029 193.078 33.2598 193.187 33.1371C193.078 32.8509 192.902 32.6397 192.658 32.5034C192.414 32.3671 192.163 32.2785 191.905 32.2376C191.648 32.1967 191.431 32.1763 191.254 32.1763C190.427 32.1899 189.729 32.5511 189.159 33.2598C188.604 33.9549 188.326 34.9635 188.326 36.2855C188.326 37.1305 188.448 37.887 188.692 38.5548C188.949 39.2226 189.322 39.7542 189.81 40.1494C190.299 40.5447 190.882 40.7491 191.56 40.7628C192.17 40.7628 192.76 40.606 193.329 40.2926C193.899 39.9654 194.36 39.5566 194.712 39.0659L195.363 39.6383C194.97 40.2517 194.516 40.7355 194 41.0899C193.499 41.4442 192.983 41.6964 192.455 41.8463C191.939 41.9962 191.444 42.0712 190.97 42.0712Z" fill="white"/>
+<path d="M201.555 42.0712C200.592 42.0712 199.724 41.8531 198.951 41.417C198.178 40.9808 197.561 40.3743 197.1 39.5975C196.653 38.8069 196.429 37.9006 196.429 36.8784C196.429 35.7744 196.653 34.7999 197.1 33.9549C197.561 33.0963 198.178 32.4216 198.951 31.9309C199.724 31.4403 200.585 31.195 201.534 31.195C202.497 31.195 203.365 31.4198 204.138 31.8696C204.911 32.3058 205.521 32.9191 205.969 33.7096C206.43 34.4864 206.66 35.386 206.66 36.4082C206.66 37.4849 206.436 38.4526 205.989 39.3112C205.541 40.1699 204.931 40.8445 204.158 41.3352C203.399 41.8259 202.531 42.0712 201.555 42.0712ZM201.697 41.049C202.348 41.0353 202.857 40.8309 203.223 40.4357C203.602 40.0404 203.874 39.5361 204.036 38.9228C204.199 38.2959 204.28 37.6485 204.28 36.9806C204.28 36.3946 204.226 35.8221 204.118 35.2633C204.023 34.6909 203.867 34.173 203.65 33.7096C203.433 33.2462 203.148 32.8782 202.796 32.6056C202.443 32.3194 202.016 32.1831 201.514 32.1967C200.877 32.1967 200.355 32.3943 199.948 32.7896C199.555 33.1848 199.263 33.6959 199.073 34.3229C198.897 34.9362 198.809 35.5904 198.809 36.2855C198.809 37.0897 198.911 37.8529 199.114 38.5752C199.317 39.2976 199.629 39.8905 200.05 40.3539C200.484 40.8173 201.033 41.049 201.697 41.049Z" fill="white"/>
+<path d="M207.842 40.8854C208.249 40.8854 208.534 40.79 208.697 40.5992C208.859 40.4084 208.954 40.1426 208.981 39.8019C209.022 39.4612 209.042 39.0659 209.042 38.6161V29.3754C209.042 29.1437 209.042 28.912 209.042 28.6803C209.056 28.435 209.076 28.1761 209.103 27.9035C208.873 27.9171 208.629 27.9307 208.371 27.9444C208.114 27.9444 207.883 27.9512 207.68 27.9648V26.8813C208.29 26.8813 208.771 26.854 209.124 26.7995C209.49 26.7313 209.768 26.6564 209.958 26.5746C210.161 26.4928 210.31 26.4042 210.405 26.3088H211.178V39.209C211.178 39.4543 211.171 39.7065 211.158 39.9654C211.144 40.2108 211.124 40.4629 211.097 40.7219C211.314 40.7082 211.531 40.7014 211.748 40.7014C211.978 40.6878 212.188 40.6742 212.378 40.6605V41.7441H207.842V40.8854Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_100_26" x1="99.1169" y1="38.1477" x2="82.6837" y2="38.1477" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_100_26" x1="33.8049" y1="16.9269" x2="38.7165" y2="26.9811" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_100_26" x1="55.0065" y1="30.3095" x2="68.2066" y2="40.7142" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<clipPath id="clip0_100_26">
+<rect width="121.515" height="46.4384" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index cfa5b56358..305261183e 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -10,11 +10,11 @@ use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
 use zed_actions::OpenBrowser;
-use zed_actions::agent::ReauthenticateAgent;
+use zed_actions::agent::{OpenClaudeCodeOnboardingModal, ReauthenticateAgent};
 
 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
 use crate::agent_diff::AgentDiffThread;
-use crate::ui::AcpOnboardingModal;
+use crate::ui::{AcpOnboardingModal, ClaudeCodeOnboardingModal};
 use crate::{
     AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
     DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
@@ -207,6 +207,9 @@ pub fn init(cx: &mut App) {
                 .register_action(|workspace, _: &OpenAcpOnboardingModal, window, cx| {
                     AcpOnboardingModal::toggle(workspace, window, cx)
                 })
+                .register_action(|workspace, _: &OpenClaudeCodeOnboardingModal, window, cx| {
+                    ClaudeCodeOnboardingModal::toggle(workspace, window, cx)
+                })
                 .register_action(|_workspace, _: &ResetOnboarding, window, cx| {
                     window.dispatch_action(workspace::RestoreBanner.boxed_clone(), cx);
                     window.refresh();
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index 600698b07e..1a3264bd77 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -1,6 +1,7 @@
 mod acp_onboarding_modal;
 mod agent_notification;
 mod burn_mode_tooltip;
+mod claude_code_onboarding_modal;
 mod context_pill;
 mod end_trial_upsell;
 mod onboarding_modal;
@@ -10,6 +11,7 @@ mod unavailable_editing_tooltip;
 pub use acp_onboarding_modal::*;
 pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
+pub use claude_code_onboarding_modal::*;
 pub use context_pill::*;
 pub use end_trial_upsell::*;
 pub use onboarding_modal::*;
diff --git a/crates/agent_ui/src/ui/acp_onboarding_modal.rs b/crates/agent_ui/src/ui/acp_onboarding_modal.rs
index 0ed9de7221..8433904fb3 100644
--- a/crates/agent_ui/src/ui/acp_onboarding_modal.rs
+++ b/crates/agent_ui/src/ui/acp_onboarding_modal.rs
@@ -141,20 +141,12 @@ impl Render for AcpOnboardingModal {
                     .bg(gpui::black().opacity(0.15)),
             )
             .child(
-                h_flex()
-                    .gap_4()
-                    .child(
-                        Vector::new(VectorName::AcpLogo, rems_from_px(106.), rems_from_px(40.))
-                            .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
-                    )
-                    .child(
-                        Vector::new(
-                            VectorName::AcpLogoSerif,
-                            rems_from_px(111.),
-                            rems_from_px(41.),
-                        )
-                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
-                    ),
+                Vector::new(
+                    VectorName::AcpLogoSerif,
+                    rems_from_px(257.),
+                    rems_from_px(47.),
+                )
+                .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
             )
             .child(
                 v_flex()
diff --git a/crates/agent_ui/src/ui/claude_code_onboarding_modal.rs b/crates/agent_ui/src/ui/claude_code_onboarding_modal.rs
new file mode 100644
index 0000000000..06980f1897
--- /dev/null
+++ b/crates/agent_ui/src/ui/claude_code_onboarding_modal.rs
@@ -0,0 +1,254 @@
+use client::zed_urls;
+use gpui::{
+    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
+    linear_color_stop, linear_gradient,
+};
+use ui::{TintColor, Vector, VectorName, prelude::*};
+use workspace::{ModalView, Workspace};
+
+use crate::agent_panel::{AgentPanel, AgentType};
+
+macro_rules! claude_code_onboarding_event {
+    ($name:expr) => {
+        telemetry::event!($name, source = "ACP Claude Code Onboarding");
+    };
+    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
+        telemetry::event!($name, source = "ACP Claude Code Onboarding", $($key $(= $value)?),+);
+    };
+}
+
+pub struct ClaudeCodeOnboardingModal {
+    focus_handle: FocusHandle,
+    workspace: Entity<Workspace>,
+}
+
+impl ClaudeCodeOnboardingModal {
+    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
+        let workspace_entity = cx.entity();
+        workspace.toggle_modal(window, cx, |_window, cx| Self {
+            workspace: workspace_entity,
+            focus_handle: cx.focus_handle(),
+        });
+    }
+
+    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
+        self.workspace.update(cx, |workspace, cx| {
+            workspace.focus_panel::<AgentPanel>(window, cx);
+
+            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                panel.update(cx, |panel, cx| {
+                    panel.new_agent_thread(AgentType::ClaudeCode, window, cx);
+                });
+            }
+        });
+
+        cx.emit(DismissEvent);
+
+        claude_code_onboarding_event!("Open Panel Clicked");
+    }
+
+    fn view_docs(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
+        cx.open_url(&zed_urls::external_agents_docs(cx));
+        cx.notify();
+
+        claude_code_onboarding_event!("Documentation Link Clicked");
+    }
+
+    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
+        cx.emit(DismissEvent);
+    }
+}
+
+impl EventEmitter<DismissEvent> for ClaudeCodeOnboardingModal {}
+
+impl Focusable for ClaudeCodeOnboardingModal {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl ModalView for ClaudeCodeOnboardingModal {}
+
+impl Render for ClaudeCodeOnboardingModal {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let illustration_element = |icon: IconName, label: Option<SharedString>, opacity: f32| {
+            h_flex()
+                .px_1()
+                .py_0p5()
+                .gap_1()
+                .rounded_sm()
+                .bg(cx.theme().colors().element_active.opacity(0.05))
+                .border_1()
+                .border_color(cx.theme().colors().border)
+                .border_dashed()
+                .child(
+                    Icon::new(icon)
+                        .size(IconSize::Small)
+                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.15))),
+                )
+                .map(|this| {
+                    if let Some(label_text) = label {
+                        this.child(
+                            Label::new(label_text)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                    } else {
+                        this.child(
+                            div().w_16().h_1().rounded_full().bg(cx
+                                .theme()
+                                .colors()
+                                .element_active
+                                .opacity(0.6)),
+                        )
+                    }
+                })
+                .opacity(opacity)
+        };
+
+        let illustration = h_flex()
+            .relative()
+            .h(rems_from_px(126.))
+            .bg(cx.theme().colors().editor_background)
+            .border_b_1()
+            .border_color(cx.theme().colors().border_variant)
+            .justify_center()
+            .gap_8()
+            .rounded_t_md()
+            .overflow_hidden()
+            .child(
+                div().absolute().inset_0().w(px(515.)).h(px(126.)).child(
+                    Vector::new(VectorName::AcpGrid, rems_from_px(515.), rems_from_px(126.))
+                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.02))),
+                ),
+            )
+            .child(div().absolute().inset_0().size_full().bg(linear_gradient(
+                0.,
+                linear_color_stop(
+                    cx.theme().colors().elevated_surface_background.opacity(0.1),
+                    0.9,
+                ),
+                linear_color_stop(
+                    cx.theme().colors().elevated_surface_background.opacity(0.),
+                    0.,
+                ),
+            )))
+            .child(
+                div()
+                    .absolute()
+                    .inset_0()
+                    .size_full()
+                    .bg(gpui::black().opacity(0.15)),
+            )
+            .child(
+                Vector::new(
+                    VectorName::AcpLogoSerif,
+                    rems_from_px(257.),
+                    rems_from_px(47.),
+                )
+                .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
+            )
+            .child(
+                v_flex()
+                    .gap_1p5()
+                    .child(illustration_element(IconName::Stop, None, 0.15))
+                    .child(illustration_element(
+                        IconName::AiGemini,
+                        Some("New Gemini CLI Thread".into()),
+                        0.3,
+                    ))
+                    .child(
+                        h_flex()
+                            .pl_1()
+                            .pr_2()
+                            .py_0p5()
+                            .gap_1()
+                            .rounded_sm()
+                            .bg(cx.theme().colors().element_active.opacity(0.2))
+                            .border_1()
+                            .border_color(cx.theme().colors().border)
+                            .child(
+                                Icon::new(IconName::AiClaude)
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .child(Label::new("New Claude Code Thread").size(LabelSize::Small)),
+                    )
+                    .child(illustration_element(
+                        IconName::Stop,
+                        Some("Your Agent Here".into()),
+                        0.3,
+                    ))
+                    .child(illustration_element(IconName::Stop, None, 0.15)),
+            );
+
+        let heading = v_flex()
+            .w_full()
+            .gap_1()
+            .child(
+                Label::new("Beta Release")
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .child(Headline::new("Claude Code: Natively in Zed").size(HeadlineSize::Large));
+
+        let copy = "Powered by the Agent Client Protocol, you can now run Claude Code as\na first-class citizen in Zed's agent panel.";
+
+        let open_panel_button = Button::new("open-panel", "Start with Claude Code")
+            .icon_size(IconSize::Indicator)
+            .style(ButtonStyle::Tinted(TintColor::Accent))
+            .full_width()
+            .on_click(cx.listener(Self::open_panel));
+
+        let docs_button = Button::new("add-other-agents", "Add Other Agents")
+            .icon(IconName::ArrowUpRight)
+            .icon_size(IconSize::Indicator)
+            .icon_color(Color::Muted)
+            .full_width()
+            .on_click(cx.listener(Self::view_docs));
+
+        let close_button = h_flex().absolute().top_2().right_2().child(
+            IconButton::new("cancel", IconName::Close).on_click(cx.listener(
+                |_, _: &ClickEvent, _window, cx| {
+                    claude_code_onboarding_event!("Canceled", trigger = "X click");
+                    cx.emit(DismissEvent);
+                },
+            )),
+        );
+
+        v_flex()
+            .id("acp-onboarding")
+            .key_context("AcpOnboardingModal")
+            .relative()
+            .w(rems(34.))
+            .h_full()
+            .elevation_3(cx)
+            .track_focus(&self.focus_handle(cx))
+            .overflow_hidden()
+            .on_action(cx.listener(Self::cancel))
+            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
+                claude_code_onboarding_event!("Canceled", trigger = "Action");
+                cx.emit(DismissEvent);
+            }))
+            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
+                this.focus_handle.focus(window);
+            }))
+            .child(illustration)
+            .child(
+                v_flex()
+                    .p_4()
+                    .gap_2()
+                    .child(heading)
+                    .child(Label::new(copy).color(Color::Muted))
+                    .child(
+                        v_flex()
+                            .w_full()
+                            .mt_2()
+                            .gap_1()
+                            .child(open_panel_button)
+                            .child(docs_button),
+                    ),
+            )
+            .child(close_button)
+    }
+}
diff --git a/crates/title_bar/src/onboarding_banner.rs b/crates/title_bar/src/onboarding_banner.rs
index 1c28942490..6adc576949 100644
--- a/crates/title_bar/src/onboarding_banner.rs
+++ b/crates/title_bar/src/onboarding_banner.rs
@@ -7,6 +7,7 @@ pub struct OnboardingBanner {
     dismissed: bool,
     source: String,
     details: BannerDetails,
+    visible_when: Option<Box<dyn Fn(&mut App) -> bool>>,
 }
 
 #[derive(Clone)]
@@ -42,12 +43,18 @@ impl OnboardingBanner {
                 label: label.into(),
                 subtitle: subtitle.or(Some(SharedString::from("Introducing:"))),
             },
+            visible_when: None,
             dismissed: get_dismissed(source),
         }
     }
 
-    fn should_show(&self, _cx: &mut App) -> bool {
-        !self.dismissed
+    pub fn visible_when(mut self, predicate: impl Fn(&mut App) -> bool + 'static) -> Self {
+        self.visible_when = Some(Box::new(predicate));
+        self
+    }
+
+    fn should_show(&self, cx: &mut App) -> bool {
+        !self.dismissed && self.visible_when.as_ref().map_or(true, |f| f(cx))
     }
 
     fn dismiss(&mut self, cx: &mut Context<Self>) {
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 2b13ef58c3..f031b8394a 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -279,13 +279,15 @@ impl TitleBar {
 
         let banner = cx.new(|cx| {
             OnboardingBanner::new(
-                "ACP Onboarding",
-                IconName::Sparkle,
-                "Bring Your Own Agent",
+                "ACP Claude Code Onboarding",
+                IconName::AiClaude,
+                "Claude Code",
                 Some("Introducing:".into()),
-                zed_actions::agent::OpenAcpOnboardingModal.boxed_clone(),
+                zed_actions::agent::OpenClaudeCodeOnboardingModal.boxed_clone(),
                 cx,
             )
+            // When updating this to a non-AI feature release, remove this line.
+            .visible_when(|cx| !project::DisableAiSettings::get_global(cx).disable_ai)
         });
 
         let platform_titlebar = cx.new(|cx| PlatformTitleBar::new(id, cx));
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 8f4c42ca49..bc47b8f1e4 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -286,6 +286,8 @@ pub mod agent {
             OpenOnboardingModal,
             /// Opens the ACP onboarding modal.
             OpenAcpOnboardingModal,
+            /// Opens the Claude Code onboarding modal.
+            OpenClaudeCodeOnboardingModal,
             /// Resets the agent onboarding state.
             ResetOnboarding,
             /// Starts a chat conversation with the agent.

From 7633bbf55a79d29acd9feb330f17f323a9de800f Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 3 Sep 2025 14:08:48 +0200
Subject: [PATCH 568/823] acp: Fix issue with claude code /logout command
 (#37452)

### First issue

In the scenario where you have an API key configured in Zed and you run
`/logout`, clicking on `Use Anthropic API Key` would show `Method not
implemented`.

This happened because we were only intercepting the `Use Anthropic API
Key` click if the provider was NOT authenticated, which would not be the
case when the user has an API key set.

### Second issue

When clicking on `Reset API Key` the modal would be dismissed even
though you picked no Authentication Method (which means you still would
be unauthenticated)

---

This PR fixes both of these issues

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 32 +++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 589633ae25..992e12177a 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -666,6 +666,10 @@ impl AcpThreadView {
                 move |_, ev, window, cx| {
                     if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev
                         && &provider_id == updated_provider_id
+                        && LanguageModelRegistry::global(cx)
+                            .read(cx)
+                            .provider(&provider_id)
+                            .map_or(false, |provider| provider.is_authenticated(cx))
                     {
                         this.update(cx, |this, cx| {
                             this.thread_state = Self::initial_state(
@@ -1365,11 +1369,11 @@ impl AcpThreadView {
                 .read(cx)
                 .provider(&language_model::ANTHROPIC_PROVIDER_ID)
                 .unwrap();
-            if !provider.is_authenticated(cx) {
-                let this = cx.weak_entity();
-                let agent = self.agent.clone();
-                let connection = connection.clone();
-                window.defer(cx, |window, cx| {
+            let this = cx.weak_entity();
+            let agent = self.agent.clone();
+            let connection = connection.clone();
+            window.defer(cx, move |window, cx| {
+                if !provider.is_authenticated(cx) {
                     Self::handle_auth_required(
                         this,
                         AuthRequired {
@@ -1381,9 +1385,21 @@ impl AcpThreadView {
                         window,
                         cx,
                     );
-                });
-                return;
-            }
+                } else {
+                    this.update(cx, |this, cx| {
+                        this.thread_state = Self::initial_state(
+                            agent,
+                            None,
+                            this.workspace.clone(),
+                            this.project.clone(),
+                            window,
+                            cx,
+                        )
+                    })
+                    .ok();
+                }
+            });
+            return;
         } else if method.0.as_ref() == "vertex-ai"
             && std::env::var("GOOGLE_API_KEY").is_err()
             && (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()

From ebc22c290bd0222261c7719dfc781ce5692060ca Mon Sep 17 00:00:00 2001
From: Nia <nia@zed.dev>
Date: Wed, 3 Sep 2025 15:44:07 +0200
Subject: [PATCH 569/823] gpui: Don't risk accidentally panicking during tests
 (#37457)

See the failure in
https://github.com/zed-industries/zed/actions/runs/17413839503/job/49437345296

Release Notes:

- N/A
---
 crates/gpui/src/test.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/gpui/src/test.rs b/crates/gpui/src/test.rs
index 4794fd002e..5ae72d2be1 100644
--- a/crates/gpui/src/test.rs
+++ b/crates/gpui/src/test.rs
@@ -64,6 +64,9 @@ pub fn run_test(
                     if attempt < max_retries {
                         println!("attempt {} failed, retrying", attempt);
                         attempt += 1;
+                        // The panic payload might itself trigger an unwind on drop:
+                        // https://doc.rust-lang.org/std/panic/fn.catch_unwind.html#notes
+                        std::mem::forget(error);
                     } else {
                         if is_multiple_runs {
                             eprintln!("failing seed: {}", seed);

From d80f9dda75528449d27ea7eff5ea170e617689d6 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 3 Sep 2025 16:11:36 +0200
Subject: [PATCH 570/823] languages: Fix python tasks failing when binary
 contains whitespaces (#37454)

Fixes https://github.com/zed-industries/zed/issues/33459

Release Notes:

- Fixed python tasks failing when the python binary path contains
whitespaces
---
 crates/languages/src/python.rs                | 39 ++++++++-----------
 .../project/src/debugger/locators/python.rs   | 16 ++------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 5bdc4aa0d9..bd3a7b34cf 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -409,9 +409,6 @@ const PYTHON_TEST_TARGET_TASK_VARIABLE: VariableName =
 const PYTHON_ACTIVE_TOOLCHAIN_PATH: VariableName =
     VariableName::Custom(Cow::Borrowed("PYTHON_ACTIVE_ZED_TOOLCHAIN"));
 
-const PYTHON_ACTIVE_TOOLCHAIN_PATH_RAW: VariableName =
-    VariableName::Custom(Cow::Borrowed("PYTHON_ACTIVE_ZED_TOOLCHAIN_RAW"));
-
 const PYTHON_MODULE_NAME_TASK_VARIABLE: VariableName =
     VariableName::Custom(Cow::Borrowed("PYTHON_MODULE_NAME"));
 
@@ -435,7 +432,7 @@ impl ContextProvider for PythonContextProvider {
         let worktree_id = location_file.as_ref().map(|f| f.worktree_id(cx));
 
         cx.spawn(async move |cx| {
-            let raw_toolchain = if let Some(worktree_id) = worktree_id {
+            let active_toolchain = if let Some(worktree_id) = worktree_id {
                 let file_path = location_file
                     .as_ref()
                     .and_then(|f| f.path().parent())
@@ -453,15 +450,13 @@ impl ContextProvider for PythonContextProvider {
                 String::from("python3")
             };
 
-            let active_toolchain = format!("\"{raw_toolchain}\"");
             let toolchain = (PYTHON_ACTIVE_TOOLCHAIN_PATH, active_toolchain);
-            let raw_toolchain_var = (PYTHON_ACTIVE_TOOLCHAIN_PATH_RAW, raw_toolchain);
 
             Ok(task::TaskVariables::from_iter(
                 test_target
                     .into_iter()
                     .chain(module_target.into_iter())
-                    .chain([toolchain, raw_toolchain_var]),
+                    .chain([toolchain]),
             ))
         })
     }
@@ -478,31 +473,31 @@ impl ContextProvider for PythonContextProvider {
             // Execute a selection
             TaskTemplate {
                 label: "execute selection".to_owned(),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                 args: vec![
                     "-c".to_owned(),
                     VariableName::SelectedText.template_value_with_whitespace(),
                 ],
-                cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                cwd: Some(VariableName::WorktreeRoot.template_value()),
                 ..TaskTemplate::default()
             },
             // Execute an entire file
             TaskTemplate {
                 label: format!("run '{}'", VariableName::File.template_value()),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                 args: vec![VariableName::File.template_value_with_whitespace()],
-                cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                cwd: Some(VariableName::WorktreeRoot.template_value()),
                 ..TaskTemplate::default()
             },
             // Execute a file as module
             TaskTemplate {
                 label: format!("run module '{}'", VariableName::File.template_value()),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                 args: vec![
                     "-m".to_owned(),
-                    PYTHON_MODULE_NAME_TASK_VARIABLE.template_value(),
+                    PYTHON_MODULE_NAME_TASK_VARIABLE.template_value_with_whitespace(),
                 ],
-                cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                cwd: Some(VariableName::WorktreeRoot.template_value()),
                 tags: vec!["python-module-main-method".to_owned()],
                 ..TaskTemplate::default()
             },
@@ -514,19 +509,19 @@ impl ContextProvider for PythonContextProvider {
                     // Run tests for an entire file
                     TaskTemplate {
                         label: format!("unittest '{}'", VariableName::File.template_value()),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                         args: vec![
                             "-m".to_owned(),
                             "unittest".to_owned(),
                             VariableName::File.template_value_with_whitespace(),
                         ],
-                        cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                        cwd: Some(VariableName::WorktreeRoot.template_value()),
                         ..TaskTemplate::default()
                     },
                     // Run test(s) for a specific target within a file
                     TaskTemplate {
                         label: "unittest $ZED_CUSTOM_PYTHON_TEST_TARGET".to_owned(),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                         args: vec![
                             "-m".to_owned(),
                             "unittest".to_owned(),
@@ -536,7 +531,7 @@ impl ContextProvider for PythonContextProvider {
                             "python-unittest-class".to_owned(),
                             "python-unittest-method".to_owned(),
                         ],
-                        cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                        cwd: Some(VariableName::WorktreeRoot.template_value()),
                         ..TaskTemplate::default()
                     },
                 ]
@@ -546,25 +541,25 @@ impl ContextProvider for PythonContextProvider {
                     // Run tests for an entire file
                     TaskTemplate {
                         label: format!("pytest '{}'", VariableName::File.template_value()),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                         args: vec![
                             "-m".to_owned(),
                             "pytest".to_owned(),
                             VariableName::File.template_value_with_whitespace(),
                         ],
-                        cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                        cwd: Some(VariableName::WorktreeRoot.template_value()),
                         ..TaskTemplate::default()
                     },
                     // Run test(s) for a specific target within a file
                     TaskTemplate {
                         label: "pytest $ZED_CUSTOM_PYTHON_TEST_TARGET".to_owned(),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
                         args: vec![
                             "-m".to_owned(),
                             "pytest".to_owned(),
                             PYTHON_TEST_TARGET_TASK_VARIABLE.template_value_with_whitespace(),
                         ],
-                        cwd: Some("$ZED_WORKTREE_ROOT".into()),
+                        cwd: Some(VariableName::WorktreeRoot.template_value()),
                         tags: vec![
                             "python-pytest-class".to_owned(),
                             "python-pytest-method".to_owned(),
diff --git a/crates/project/src/debugger/locators/python.rs b/crates/project/src/debugger/locators/python.rs
index 71efbb75b9..06f7ab2e79 100644
--- a/crates/project/src/debugger/locators/python.rs
+++ b/crates/project/src/debugger/locators/python.rs
@@ -25,7 +25,7 @@ impl DapLocator for PythonLocator {
         if adapter.0.as_ref() != "Debugpy" {
             return None;
         }
-        let valid_program = build_config.command.starts_with("$ZED_")
+        let valid_program = build_config.command.starts_with("\"$ZED_")
             || Path::new(&build_config.command)
                 .file_name()
                 .is_some_and(|name| name.to_str().is_some_and(|path| path.starts_with("python")));
@@ -33,13 +33,7 @@ impl DapLocator for PythonLocator {
             // We cannot debug selections.
             return None;
         }
-        let command = if build_config.command
-            == VariableName::Custom("PYTHON_ACTIVE_ZED_TOOLCHAIN".into()).template_value()
-        {
-            VariableName::Custom("PYTHON_ACTIVE_ZED_TOOLCHAIN_RAW".into()).template_value()
-        } else {
-            build_config.command.clone()
-        };
+        let command = build_config.command.clone();
         let module_specifier_position = build_config
             .args
             .iter()
@@ -57,10 +51,8 @@ impl DapLocator for PythonLocator {
         let program_position = mod_name
             .is_none()
             .then(|| {
-                build_config
-                    .args
-                    .iter()
-                    .position(|arg| *arg == "\"$ZED_FILE\"")
+                let zed_file = VariableName::File.template_value_with_whitespace();
+                build_config.args.iter().position(|arg| *arg == zed_file)
             })
             .flatten();
         let args = if let Some(position) = program_position {

From 92283285aef346cd69e6c748d3fde635474803b2 Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Wed, 3 Sep 2025 16:14:56 +0200
Subject: [PATCH 571/823] Fix rendering on devices that don't support
 MapOnDefaultTextures (#37456)

Closes #37231

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/direct_write.rs  | 2 +-
 crates/gpui/src/platform/windows/directx_atlas.rs | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index 285f6a1143..ec6d008e7b 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -1253,7 +1253,7 @@ impl GlyphLayerTexture {
             },
             Usage: D3D11_USAGE_DEFAULT,
             BindFlags: D3D11_BIND_SHADER_RESOURCE.0 as u32,
-            CPUAccessFlags: D3D11_CPU_ACCESS_WRITE.0 as u32,
+            CPUAccessFlags: 0,
             MiscFlags: 0,
         };
 
diff --git a/crates/gpui/src/platform/windows/directx_atlas.rs b/crates/gpui/src/platform/windows/directx_atlas.rs
index 6bced4c11d..38c22a41bf 100644
--- a/crates/gpui/src/platform/windows/directx_atlas.rs
+++ b/crates/gpui/src/platform/windows/directx_atlas.rs
@@ -3,9 +3,8 @@ use etagere::BucketedAtlasAllocator;
 use parking_lot::Mutex;
 use windows::Win32::Graphics::{
     Direct3D11::{
-        D3D11_BIND_SHADER_RESOURCE, D3D11_BOX, D3D11_CPU_ACCESS_WRITE, D3D11_TEXTURE2D_DESC,
-        D3D11_USAGE_DEFAULT, ID3D11Device, ID3D11DeviceContext, ID3D11ShaderResourceView,
-        ID3D11Texture2D,
+        D3D11_BIND_SHADER_RESOURCE, D3D11_BOX, D3D11_TEXTURE2D_DESC, D3D11_USAGE_DEFAULT,
+        ID3D11Device, ID3D11DeviceContext, ID3D11ShaderResourceView, ID3D11Texture2D,
     },
     Dxgi::Common::*,
 };
@@ -189,7 +188,7 @@ impl DirectXAtlasState {
             },
             Usage: D3D11_USAGE_DEFAULT,
             BindFlags: bind_flag.0 as u32,
-            CPUAccessFlags: D3D11_CPU_ACCESS_WRITE.0 as u32,
+            CPUAccessFlags: 0,
             MiscFlags: 0,
         };
         let mut texture: Option<ID3D11Texture2D> = None;

From c1ca7303a86362e3b985c37e296bb28c31a351a6 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 3 Sep 2025 16:22:35 +0200
Subject: [PATCH 572/823] editor: Make blame and inline blame work for
 multibuffers (#37366)

Release Notes:

- Added blame view and inline blame support for multi buffer editors

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/collab/src/tests/editor_tests.rs   |  22 +-
 crates/editor/src/editor.rs               | 139 +++-----
 crates/editor/src/editor_tests.rs         |  23 +-
 crates/editor/src/element.rs              |  38 ++-
 crates/editor/src/git/blame.rs            | 366 ++++++++++++++--------
 crates/multi_buffer/src/multi_buffer.rs   |   8 +-
 crates/outline_panel/src/outline_panel.rs | 131 +++++---
 crates/project/src/lsp_store.rs           |   5 +-
 crates/search/src/project_search.rs       |  21 +-
 crates/sum_tree/src/tree_map.rs           |   1 +
 10 files changed, 429 insertions(+), 325 deletions(-)

diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index bfea497e9b..a3f63c5276 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -3425,16 +3425,16 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
         assert_eq!(
             entries,
             vec![
-                Some(blame_entry("1b1b1b", 0..1)),
-                Some(blame_entry("0d0d0d", 1..2)),
-                Some(blame_entry("3a3a3a", 2..3)),
-                Some(blame_entry("4c4c4c", 3..4)),
+                Some((buffer_id_b, blame_entry("1b1b1b", 0..1))),
+                Some((buffer_id_b, blame_entry("0d0d0d", 1..2))),
+                Some((buffer_id_b, blame_entry("3a3a3a", 2..3))),
+                Some((buffer_id_b, blame_entry("4c4c4c", 3..4))),
             ]
         );
 
         blame.update(cx, |blame, _| {
-            for (idx, entry) in entries.iter().flatten().enumerate() {
-                let details = blame.details_for_entry(entry).unwrap();
+            for (idx, (buffer, entry)) in entries.iter().flatten().enumerate() {
+                let details = blame.details_for_entry(*buffer, entry).unwrap();
                 assert_eq!(details.message, format!("message for idx-{}", idx));
                 assert_eq!(
                     details.permalink.unwrap().to_string(),
@@ -3474,9 +3474,9 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
             entries,
             vec![
                 None,
-                Some(blame_entry("0d0d0d", 1..2)),
-                Some(blame_entry("3a3a3a", 2..3)),
-                Some(blame_entry("4c4c4c", 3..4)),
+                Some((buffer_id_b, blame_entry("0d0d0d", 1..2))),
+                Some((buffer_id_b, blame_entry("3a3a3a", 2..3))),
+                Some((buffer_id_b, blame_entry("4c4c4c", 3..4))),
             ]
         );
     });
@@ -3511,8 +3511,8 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
             vec![
                 None,
                 None,
-                Some(blame_entry("3a3a3a", 2..3)),
-                Some(blame_entry("4c4c4c", 3..4)),
+                Some((buffer_id_b, blame_entry("3a3a3a", 2..3))),
+                Some((buffer_id_b, blame_entry("4c4c4c", 3..4))),
             ]
         );
     });
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 00fe6637bf..a8e2b001f3 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -190,7 +190,6 @@ use std::{
     sync::Arc,
     time::{Duration, Instant},
 };
-use sum_tree::TreeMap;
 use task::{ResolvedTask, RunnableTag, TaskTemplate, TaskVariables};
 use text::{BufferId, FromAnchor, OffsetUtf16, Rope};
 use theme::{
@@ -227,7 +226,7 @@ const MAX_SELECTION_HISTORY_LEN: usize = 1024;
 pub(crate) const CURSORS_VISIBLE_FOR: Duration = Duration::from_millis(2000);
 #[doc(hidden)]
 pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
-const SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
+pub const SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
 
 pub(crate) const CODE_ACTION_TIMEOUT: Duration = Duration::from_secs(5);
 pub(crate) const FORMAT_TIMEOUT: Duration = Duration::from_secs(5);
@@ -1060,8 +1059,8 @@ pub struct Editor {
     placeholder_text: Option<Arc<str>>,
     highlight_order: usize,
     highlighted_rows: HashMap<TypeId, Vec<RowHighlight>>,
-    background_highlights: TreeMap<HighlightKey, BackgroundHighlight>,
-    gutter_highlights: TreeMap<TypeId, GutterHighlight>,
+    background_highlights: HashMap<HighlightKey, BackgroundHighlight>,
+    gutter_highlights: HashMap<TypeId, GutterHighlight>,
     scrollbar_marker_state: ScrollbarMarkerState,
     active_indent_guides_state: ActiveIndentGuidesState,
     nav_history: Option<ItemNavHistory>,
@@ -2112,8 +2111,8 @@ impl Editor {
             placeholder_text: None,
             highlight_order: 0,
             highlighted_rows: HashMap::default(),
-            background_highlights: TreeMap::default(),
-            gutter_highlights: TreeMap::default(),
+            background_highlights: HashMap::default(),
+            gutter_highlights: HashMap::default(),
             scrollbar_marker_state: ScrollbarMarkerState::default(),
             active_indent_guides_state: ActiveIndentGuidesState::default(),
             nav_history: None,
@@ -6630,7 +6629,7 @@ impl Editor {
             buffer_row: Some(point.row),
             ..Default::default()
         };
-        let Some(blame_entry) = blame
+        let Some((buffer, blame_entry)) = blame
             .update(cx, |blame, cx| blame.blame_for_rows(&[row_info], cx).next())
             .flatten()
         else {
@@ -6640,12 +6639,19 @@ impl Editor {
         let anchor = self.selections.newest_anchor().head();
         let position = self.to_pixel_point(anchor, &snapshot, window);
         if let (Some(position), Some(last_bounds)) = (position, self.last_bounds) {
-            self.show_blame_popover(&blame_entry, position + last_bounds.origin, true, cx);
+            self.show_blame_popover(
+                buffer,
+                &blame_entry,
+                position + last_bounds.origin,
+                true,
+                cx,
+            );
         };
     }
 
     fn show_blame_popover(
         &mut self,
+        buffer: BufferId,
         blame_entry: &BlameEntry,
         position: gpui::Point<Pixels>,
         ignore_timeout: bool,
@@ -6669,7 +6675,7 @@ impl Editor {
                             return;
                         };
                         let blame = blame.read(cx);
-                        let details = blame.details_for_entry(&blame_entry);
+                        let details = blame.details_for_entry(buffer, &blame_entry);
                         let markdown = cx.new(|cx| {
                             Markdown::new(
                                 details
@@ -19071,7 +19077,7 @@ impl Editor {
         let snapshot = self.snapshot(window, cx);
         let cursor = self.selections.newest::<Point>(cx).head();
         let (buffer, point, _) = snapshot.buffer_snapshot.point_to_buffer_point(cursor)?;
-        let blame_entry = blame
+        let (_, blame_entry) = blame
             .update(cx, |blame, cx| {
                 blame
                     .blame_for_rows(
@@ -19086,7 +19092,7 @@ impl Editor {
             })
             .flatten()?;
         let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-        let repo = blame.read(cx).repository(cx)?;
+        let repo = blame.read(cx).repository(cx, buffer.remote_id())?;
         let workspace = self.workspace()?.downgrade();
         renderer.open_blame_commit(blame_entry, repo, workspace, window, cx);
         None
@@ -19122,18 +19128,17 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         if let Some(project) = self.project() {
-            let Some(buffer) = self.buffer().read(cx).as_singleton() else {
-                return;
-            };
-
-            if buffer.read(cx).file().is_none() {
+            if let Some(buffer) = self.buffer().read(cx).as_singleton()
+                && buffer.read(cx).file().is_none()
+            {
                 return;
             }
 
             let focused = self.focus_handle(cx).contains_focused(window, cx);
 
             let project = project.clone();
-            let blame = cx.new(|cx| GitBlame::new(buffer, project, user_triggered, focused, cx));
+            let blame = cx
+                .new(|cx| GitBlame::new(self.buffer.clone(), project, user_triggered, focused, cx));
             self.blame_subscription =
                 Some(cx.observe_in(&blame, window, |_, _, _, cx| cx.notify()));
             self.blame = Some(blame);
@@ -19783,7 +19788,24 @@ impl Editor {
         let buffer = &snapshot.buffer_snapshot;
         let start = buffer.anchor_before(0);
         let end = buffer.anchor_after(buffer.len());
-        self.background_highlights_in_range(start..end, &snapshot, cx.theme())
+        self.sorted_background_highlights_in_range(start..end, &snapshot, cx.theme())
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn sorted_background_highlights_in_range(
+        &self,
+        search_range: Range<Anchor>,
+        display_snapshot: &DisplaySnapshot,
+        theme: &Theme,
+    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
+        let mut res = self.background_highlights_in_range(search_range, display_snapshot, theme);
+        res.sort_by(|a, b| {
+            a.0.start
+                .cmp(&b.0.start)
+                .then_with(|| a.0.end.cmp(&b.0.end))
+                .then_with(|| a.1.cmp(&b.1))
+        });
+        res
     }
 
     #[cfg(feature = "test-support")]
@@ -19848,6 +19870,9 @@ impl Editor {
             .is_some_and(|(_, highlights)| !highlights.is_empty())
     }
 
+    /// Returns all background highlights for a given range.
+    ///
+    /// The order of highlights is not deterministic, do sort the ranges if needed for the logic.
     pub fn background_highlights_in_range(
         &self,
         search_range: Range<Anchor>,
@@ -19886,84 +19911,6 @@ impl Editor {
         results
     }
 
-    pub fn background_highlight_row_ranges<T: 'static>(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        count: usize,
-    ) -> Vec<RangeInclusive<DisplayPoint>> {
-        let mut results = Vec::new();
-        let Some((_, ranges)) = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<T>()))
-        else {
-            return vec![];
-        };
-
-        let start_ix = match ranges.binary_search_by(|probe| {
-            let cmp = probe
-                .end
-                .cmp(&search_range.start, &display_snapshot.buffer_snapshot);
-            if cmp.is_gt() {
-                Ordering::Greater
-            } else {
-                Ordering::Less
-            }
-        }) {
-            Ok(i) | Err(i) => i,
-        };
-        let mut push_region = |start: Option<Point>, end: Option<Point>| {
-            if let (Some(start_display), Some(end_display)) = (start, end) {
-                results.push(
-                    start_display.to_display_point(display_snapshot)
-                        ..=end_display.to_display_point(display_snapshot),
-                );
-            }
-        };
-        let mut start_row: Option<Point> = None;
-        let mut end_row: Option<Point> = None;
-        if ranges.len() > count {
-            return Vec::new();
-        }
-        for range in &ranges[start_ix..] {
-            if range
-                .start
-                .cmp(&search_range.end, &display_snapshot.buffer_snapshot)
-                .is_ge()
-            {
-                break;
-            }
-            let end = range.end.to_point(&display_snapshot.buffer_snapshot);
-            if let Some(current_row) = &end_row
-                && end.row == current_row.row
-            {
-                continue;
-            }
-            let start = range.start.to_point(&display_snapshot.buffer_snapshot);
-            if start_row.is_none() {
-                assert_eq!(end_row, None);
-                start_row = Some(start);
-                end_row = Some(end);
-                continue;
-            }
-            if let Some(current_end) = end_row.as_mut() {
-                if start.row > current_end.row + 1 {
-                    push_region(start_row, end_row);
-                    start_row = Some(start);
-                    end_row = Some(end);
-                } else {
-                    // Merge two hunks.
-                    *current_end = end;
-                }
-            } else {
-                unreachable!();
-            }
-        }
-        // We might still have a hunk that was not rendered (if there was a search hit on the last line)
-        push_region(start_row, end_row);
-        results
-    }
-
     pub fn gutter_highlights_in_range(
         &self,
         search_range: Range<Anchor>,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index ddfd32be8d..1893839ea6 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -15453,37 +15453,34 @@ fn test_highlighted_ranges(cx: &mut TestAppContext) {
         );
 
         let snapshot = editor.snapshot(window, cx);
-        let mut highlighted_ranges = editor.background_highlights_in_range(
+        let highlighted_ranges = editor.sorted_background_highlights_in_range(
             anchor_range(Point::new(3, 4)..Point::new(7, 4)),
             &snapshot,
             cx.theme(),
         );
-        // Enforce a consistent ordering based on color without relying on the ordering of the
-        // highlight's `TypeId` which is non-executor.
-        highlighted_ranges.sort_unstable_by_key(|(_, color)| *color);
         assert_eq!(
             highlighted_ranges,
             &[
-                (
-                    DisplayPoint::new(DisplayRow(4), 2)..DisplayPoint::new(DisplayRow(4), 4),
-                    Hsla::red(),
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(6), 3)..DisplayPoint::new(DisplayRow(6), 5),
-                    Hsla::red(),
-                ),
                 (
                     DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 5),
                     Hsla::green(),
                 ),
+                (
+                    DisplayPoint::new(DisplayRow(4), 2)..DisplayPoint::new(DisplayRow(4), 4),
+                    Hsla::red(),
+                ),
                 (
                     DisplayPoint::new(DisplayRow(5), 3)..DisplayPoint::new(DisplayRow(5), 6),
                     Hsla::green(),
                 ),
+                (
+                    DisplayPoint::new(DisplayRow(6), 3)..DisplayPoint::new(DisplayRow(6), 5),
+                    Hsla::red(),
+                ),
             ]
         );
         assert_eq!(
-            editor.background_highlights_in_range(
+            editor.sorted_background_highlights_in_range(
                 anchor_range(Point::new(5, 6)..Point::new(6, 4)),
                 &snapshot,
                 cx.theme(),
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 500cce7e0a..fd5e544725 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -117,6 +117,7 @@ struct SelectionLayout {
 struct InlineBlameLayout {
     element: AnyElement,
     bounds: Bounds<Pixels>,
+    buffer_id: BufferId,
     entry: BlameEntry,
 }
 
@@ -1157,7 +1158,7 @@ impl EditorElement {
             cx.notify();
         }
 
-        if let Some((bounds, blame_entry)) = &position_map.inline_blame_bounds {
+        if let Some((bounds, buffer_id, blame_entry)) = &position_map.inline_blame_bounds {
             let mouse_over_inline_blame = bounds.contains(&event.position);
             let mouse_over_popover = editor
                 .inline_blame_popover
@@ -1170,7 +1171,7 @@ impl EditorElement {
                 .is_some_and(|state| state.keyboard_grace);
 
             if mouse_over_inline_blame || mouse_over_popover {
-                editor.show_blame_popover(blame_entry, event.position, false, cx);
+                editor.show_blame_popover(*buffer_id, blame_entry, event.position, false, cx);
             } else if !keyboard_grace {
                 editor.hide_blame_popover(cx);
             }
@@ -2454,7 +2455,7 @@ impl EditorElement {
             padding * em_width
         };
 
-        let entry = blame
+        let (buffer_id, entry) = blame
             .update(cx, |blame, cx| {
                 blame.blame_for_rows(&[*row_info], cx).next()
             })
@@ -2489,13 +2490,22 @@ impl EditorElement {
         let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
         let bounds = Bounds::new(absolute_offset, size);
 
-        self.layout_blame_entry_popover(entry.clone(), blame, line_height, text_hitbox, window, cx);
+        self.layout_blame_entry_popover(
+            entry.clone(),
+            blame,
+            line_height,
+            text_hitbox,
+            row_info.buffer_id?,
+            window,
+            cx,
+        );
 
         element.prepaint_as_root(absolute_offset, AvailableSpace::min_size(), window, cx);
 
         Some(InlineBlameLayout {
             element,
             bounds,
+            buffer_id,
             entry,
         })
     }
@@ -2506,6 +2516,7 @@ impl EditorElement {
         blame: Entity<GitBlame>,
         line_height: Pixels,
         text_hitbox: &Hitbox,
+        buffer: BufferId,
         window: &mut Window,
         cx: &mut App,
     ) {
@@ -2530,6 +2541,7 @@ impl EditorElement {
                 popover_state.markdown,
                 workspace,
                 &blame,
+                buffer,
                 window,
                 cx,
             )
@@ -2604,14 +2616,16 @@ impl EditorElement {
             .into_iter()
             .enumerate()
             .flat_map(|(ix, blame_entry)| {
+                let (buffer_id, blame_entry) = blame_entry?;
                 let mut element = render_blame_entry(
                     ix,
                     &blame,
-                    blame_entry?,
+                    blame_entry,
                     &self.style,
                     &mut last_used_color,
                     self.editor.clone(),
                     workspace.clone(),
+                    buffer_id,
                     blame_renderer.clone(),
                     cx,
                 )?;
@@ -7401,12 +7415,13 @@ fn render_blame_entry_popover(
     markdown: Entity<Markdown>,
     workspace: WeakEntity<Workspace>,
     blame: &Entity<GitBlame>,
+    buffer: BufferId,
     window: &mut Window,
     cx: &mut App,
 ) -> Option<AnyElement> {
     let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
     let blame = blame.read(cx);
-    let repository = blame.repository(cx)?;
+    let repository = blame.repository(cx, buffer)?;
     renderer.render_blame_entry_popover(
         blame_entry,
         scroll_handle,
@@ -7427,6 +7442,7 @@ fn render_blame_entry(
     last_used_color: &mut Option<(PlayerColor, Oid)>,
     editor: Entity<Editor>,
     workspace: Entity<Workspace>,
+    buffer: BufferId,
     renderer: Arc<dyn BlameRenderer>,
     cx: &mut App,
 ) -> Option<AnyElement> {
@@ -7447,8 +7463,8 @@ fn render_blame_entry(
     last_used_color.replace((sha_color, blame_entry.sha));
 
     let blame = blame.read(cx);
-    let details = blame.details_for_entry(&blame_entry);
-    let repository = blame.repository(cx)?;
+    let details = blame.details_for_entry(buffer, &blame_entry);
+    let repository = blame.repository(cx, buffer)?;
     renderer.render_blame_entry(
         &style.text,
         blame_entry,
@@ -8755,7 +8771,7 @@ impl Element for EditorElement {
                                 return None;
                             }
                             let blame = editor.blame.as_ref()?;
-                            let blame_entry = blame
+                            let (_, blame_entry) = blame
                                 .update(cx, |blame, cx| {
                                     let row_infos =
                                         snapshot.row_infos(snapshot.longest_row()).next()?;
@@ -9305,7 +9321,7 @@ impl Element for EditorElement {
                         text_hitbox: text_hitbox.clone(),
                         inline_blame_bounds: inline_blame_layout
                             .as_ref()
-                            .map(|layout| (layout.bounds, layout.entry.clone())),
+                            .map(|layout| (layout.bounds, layout.buffer_id, layout.entry.clone())),
                         display_hunks: display_hunks.clone(),
                         diff_hunk_control_bounds,
                     });
@@ -9969,7 +9985,7 @@ pub(crate) struct PositionMap {
     pub snapshot: EditorSnapshot,
     pub text_hitbox: Hitbox,
     pub gutter_hitbox: Hitbox,
-    pub inline_blame_bounds: Option<(Bounds<Pixels>, BlameEntry)>,
+    pub inline_blame_bounds: Option<(Bounds<Pixels>, BufferId, BlameEntry)>,
     pub display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
     pub diff_hunk_control_bounds: Vec<(DisplayRow, Bounds<Pixels>)>,
 }
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index b11617ccec..27a9b88703 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -10,16 +10,18 @@ use gpui::{
     AnyElement, App, AppContext as _, Context, Entity, Hsla, ScrollHandle, Subscription, Task,
     TextStyle, WeakEntity, Window,
 };
-use language::{Bias, Buffer, BufferSnapshot, Edit};
+use itertools::Itertools;
+use language::{Bias, BufferSnapshot, Edit};
 use markdown::Markdown;
-use multi_buffer::RowInfo;
+use multi_buffer::{MultiBuffer, RowInfo};
 use project::{
-    Project, ProjectItem,
+    Project, ProjectItem as _,
     git_store::{GitStoreEvent, Repository, RepositoryEvent},
 };
 use smallvec::SmallVec;
 use std::{sync::Arc, time::Duration};
 use sum_tree::SumTree;
+use text::BufferId;
 use workspace::Workspace;
 
 #[derive(Clone, Debug, Default)]
@@ -63,16 +65,19 @@ impl<'a> sum_tree::Dimension<'a, GitBlameEntrySummary> for u32 {
     }
 }
 
-pub struct GitBlame {
-    project: Entity<Project>,
-    buffer: Entity<Buffer>,
+struct GitBlameBuffer {
     entries: SumTree<GitBlameEntry>,
-    commit_details: HashMap<Oid, ParsedCommitMessage>,
     buffer_snapshot: BufferSnapshot,
     buffer_edits: text::Subscription,
+    commit_details: HashMap<Oid, ParsedCommitMessage>,
+}
+
+pub struct GitBlame {
+    project: Entity<Project>,
+    multi_buffer: WeakEntity<MultiBuffer>,
+    buffers: HashMap<BufferId, GitBlameBuffer>,
     task: Task<Result<()>>,
     focused: bool,
-    generated: bool,
     changed_while_blurred: bool,
     user_triggered: bool,
     regenerate_on_edit_task: Task<Result<()>>,
@@ -184,44 +189,44 @@ impl gpui::Global for GlobalBlameRenderer {}
 
 impl GitBlame {
     pub fn new(
-        buffer: Entity<Buffer>,
+        multi_buffer: Entity<MultiBuffer>,
         project: Entity<Project>,
         user_triggered: bool,
         focused: bool,
         cx: &mut Context<Self>,
     ) -> Self {
-        let entries = SumTree::from_item(
-            GitBlameEntry {
-                rows: buffer.read(cx).max_point().row + 1,
-                blame: None,
+        let multi_buffer_subscription = cx.subscribe(
+            &multi_buffer,
+            |git_blame, multi_buffer, event, cx| match event {
+                multi_buffer::Event::DirtyChanged => {
+                    if !multi_buffer.read(cx).is_dirty(cx) {
+                        git_blame.generate(cx);
+                    }
+                }
+                multi_buffer::Event::ExcerptsAdded { .. }
+                | multi_buffer::Event::ExcerptsEdited { .. } => git_blame.regenerate_on_edit(cx),
+                _ => {}
             },
-            &(),
         );
 
-        let buffer_subscriptions = cx.subscribe(&buffer, |this, buffer, event, cx| match event {
-            language::BufferEvent::DirtyChanged => {
-                if !buffer.read(cx).is_dirty() {
-                    this.generate(cx);
-                }
-            }
-            language::BufferEvent::Edited => {
-                this.regenerate_on_edit(cx);
-            }
-            _ => {}
-        });
-
         let project_subscription = cx.subscribe(&project, {
-            let buffer = buffer.clone();
+            let multi_buffer = multi_buffer.downgrade();
 
-            move |this, _, event, cx| {
+            move |git_blame, _, event, cx| {
                 if let project::Event::WorktreeUpdatedEntries(_, updated) = event {
-                    let project_entry_id = buffer.read(cx).entry_id(cx);
+                    let Some(multi_buffer) = multi_buffer.upgrade() else {
+                        return;
+                    };
+                    let project_entry_id = multi_buffer
+                        .read(cx)
+                        .as_singleton()
+                        .and_then(|it| it.read(cx).entry_id(cx));
                     if updated
                         .iter()
                         .any(|(_, entry_id, _)| project_entry_id == Some(*entry_id))
                     {
                         log::debug!("Updated buffers. Regenerating blame data...",);
-                        this.generate(cx);
+                        git_blame.generate(cx);
                     }
                 }
             }
@@ -239,24 +244,17 @@ impl GitBlame {
                 _ => {}
             });
 
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let buffer_edits = buffer.update(cx, |buffer, _| buffer.subscribe());
-
         let mut this = Self {
             project,
-            buffer,
-            buffer_snapshot,
-            entries,
-            buffer_edits,
+            multi_buffer: multi_buffer.downgrade(),
+            buffers: HashMap::default(),
             user_triggered,
             focused,
             changed_while_blurred: false,
-            commit_details: HashMap::default(),
             task: Task::ready(Ok(())),
-            generated: false,
             regenerate_on_edit_task: Task::ready(Ok(())),
             _regenerate_subscriptions: vec![
-                buffer_subscriptions,
+                multi_buffer_subscription,
                 project_subscription,
                 git_store_subscription,
             ],
@@ -265,56 +263,63 @@ impl GitBlame {
         this
     }
 
-    pub fn repository(&self, cx: &App) -> Option<Entity<Repository>> {
+    pub fn repository(&self, cx: &App, id: BufferId) -> Option<Entity<Repository>> {
         self.project
             .read(cx)
             .git_store()
             .read(cx)
-            .repository_and_path_for_buffer_id(self.buffer.read(cx).remote_id(), cx)
+            .repository_and_path_for_buffer_id(id, cx)
             .map(|(repo, _)| repo)
     }
 
     pub fn has_generated_entries(&self) -> bool {
-        self.generated
+        !self.buffers.is_empty()
     }
 
-    pub fn details_for_entry(&self, entry: &BlameEntry) -> Option<ParsedCommitMessage> {
-        self.commit_details.get(&entry.sha).cloned()
+    pub fn details_for_entry(
+        &self,
+        buffer: BufferId,
+        entry: &BlameEntry,
+    ) -> Option<ParsedCommitMessage> {
+        self.buffers
+            .get(&buffer)?
+            .commit_details
+            .get(&entry.sha)
+            .cloned()
     }
 
     pub fn blame_for_rows<'a>(
         &'a mut self,
         rows: &'a [RowInfo],
-        cx: &App,
-    ) -> impl 'a + Iterator<Item = Option<BlameEntry>> {
-        self.sync(cx);
-
-        let buffer_id = self.buffer_snapshot.remote_id();
-        let mut cursor = self.entries.cursor::<u32>(&());
+        cx: &'a mut App,
+    ) -> impl Iterator<Item = Option<(BufferId, BlameEntry)>> + use<'a> {
         rows.iter().map(move |info| {
-            let row = info
-                .buffer_row
-                .filter(|_| info.buffer_id == Some(buffer_id))?;
-            cursor.seek_forward(&row, Bias::Right);
-            cursor.item()?.blame.clone()
+            let buffer_id = info.buffer_id?;
+            self.sync(cx, buffer_id);
+
+            let buffer_row = info.buffer_row?;
+            let mut cursor = self.buffers.get(&buffer_id)?.entries.cursor::<u32>(&());
+            cursor.seek_forward(&buffer_row, Bias::Right);
+            Some((buffer_id, cursor.item()?.blame.clone()?))
         })
     }
 
-    pub fn max_author_length(&mut self, cx: &App) -> usize {
-        self.sync(cx);
-
+    pub fn max_author_length(&mut self, cx: &mut App) -> usize {
         let mut max_author_length = 0;
+        self.sync_all(cx);
 
-        for entry in self.entries.iter() {
-            let author_len = entry
-                .blame
-                .as_ref()
-                .and_then(|entry| entry.author.as_ref())
-                .map(|author| author.len());
-            if let Some(author_len) = author_len
-                && author_len > max_author_length
-            {
-                max_author_length = author_len;
+        for buffer in self.buffers.values() {
+            for entry in buffer.entries.iter() {
+                let author_len = entry
+                    .blame
+                    .as_ref()
+                    .and_then(|entry| entry.author.as_ref())
+                    .map(|author| author.len());
+                if let Some(author_len) = author_len
+                    && author_len > max_author_length
+                {
+                    max_author_length = author_len;
+                }
             }
         }
 
@@ -336,22 +341,48 @@ impl GitBlame {
         }
     }
 
-    fn sync(&mut self, cx: &App) {
-        let edits = self.buffer_edits.consume();
-        let new_snapshot = self.buffer.read(cx).snapshot();
+    fn sync_all(&mut self, cx: &mut App) {
+        let Some(multi_buffer) = self.multi_buffer.upgrade() else {
+            return;
+        };
+        multi_buffer
+            .read(cx)
+            .excerpt_buffer_ids()
+            .into_iter()
+            .for_each(|id| self.sync(cx, id));
+    }
+
+    fn sync(&mut self, cx: &mut App, buffer_id: BufferId) {
+        let Some(blame_buffer) = self.buffers.get_mut(&buffer_id) else {
+            return;
+        };
+        let Some(buffer) = self
+            .multi_buffer
+            .upgrade()
+            .and_then(|multi_buffer| multi_buffer.read(cx).buffer(buffer_id))
+        else {
+            return;
+        };
+        let edits = blame_buffer.buffer_edits.consume();
+        let new_snapshot = buffer.read(cx).snapshot();
 
         let mut row_edits = edits
             .into_iter()
             .map(|edit| {
-                let old_point_range = self.buffer_snapshot.offset_to_point(edit.old.start)
-                    ..self.buffer_snapshot.offset_to_point(edit.old.end);
+                let old_point_range = blame_buffer.buffer_snapshot.offset_to_point(edit.old.start)
+                    ..blame_buffer.buffer_snapshot.offset_to_point(edit.old.end);
                 let new_point_range = new_snapshot.offset_to_point(edit.new.start)
                     ..new_snapshot.offset_to_point(edit.new.end);
 
                 if old_point_range.start.column
-                    == self.buffer_snapshot.line_len(old_point_range.start.row)
+                    == blame_buffer
+                        .buffer_snapshot
+                        .line_len(old_point_range.start.row)
                     && (new_snapshot.chars_at(edit.new.start).next() == Some('\n')
-                        || self.buffer_snapshot.line_len(old_point_range.end.row) == 0)
+                        || blame_buffer
+                            .buffer_snapshot
+                            .line_len(old_point_range.end.row)
+                            == 0)
                 {
                     Edit {
                         old: old_point_range.start.row + 1..old_point_range.end.row + 1,
@@ -375,7 +406,7 @@ impl GitBlame {
             .peekable();
 
         let mut new_entries = SumTree::default();
-        let mut cursor = self.entries.cursor::<u32>(&());
+        let mut cursor = blame_buffer.entries.cursor::<u32>(&());
 
         while let Some(mut edit) = row_edits.next() {
             while let Some(next_edit) = row_edits.peek() {
@@ -433,17 +464,28 @@ impl GitBlame {
         new_entries.append(cursor.suffix(), &());
         drop(cursor);
 
-        self.buffer_snapshot = new_snapshot;
-        self.entries = new_entries;
+        blame_buffer.buffer_snapshot = new_snapshot;
+        blame_buffer.entries = new_entries;
     }
 
     #[cfg(test)]
     fn check_invariants(&mut self, cx: &mut Context<Self>) {
-        self.sync(cx);
-        assert_eq!(
-            self.entries.summary().rows,
-            self.buffer.read(cx).max_point().row + 1
-        );
+        self.sync_all(cx);
+        for (&id, buffer) in &self.buffers {
+            assert_eq!(
+                buffer.entries.summary().rows,
+                self.multi_buffer
+                    .upgrade()
+                    .unwrap()
+                    .read(cx)
+                    .buffer(id)
+                    .unwrap()
+                    .read(cx)
+                    .max_point()
+                    .row
+                    + 1
+            );
+        }
     }
 
     fn generate(&mut self, cx: &mut Context<Self>) {
@@ -451,62 +493,105 @@ impl GitBlame {
             self.changed_while_blurred = true;
             return;
         }
-        let buffer_edits = self.buffer.update(cx, |buffer, _| buffer.subscribe());
-        let snapshot = self.buffer.read(cx).snapshot();
         let blame = self.project.update(cx, |project, cx| {
-            project.blame_buffer(&self.buffer, None, cx)
+            let Some(multi_buffer) = self.multi_buffer.upgrade() else {
+                return Vec::new();
+            };
+            multi_buffer
+                .read(cx)
+                .all_buffer_ids()
+                .into_iter()
+                .filter_map(|id| {
+                    let buffer = multi_buffer.read(cx).buffer(id)?;
+                    let snapshot = buffer.read(cx).snapshot();
+                    let buffer_edits = buffer.update(cx, |buffer, _| buffer.subscribe());
+
+                    let blame_buffer = project.blame_buffer(&buffer, None, cx);
+                    Some((id, snapshot, buffer_edits, blame_buffer))
+                })
+                .collect::<Vec<_>>()
         });
         let provider_registry = GitHostingProviderRegistry::default_global(cx);
 
         self.task = cx.spawn(async move |this, cx| {
-            let result = cx
+            let (result, errors) = cx
                 .background_spawn({
-                    let snapshot = snapshot.clone();
                     async move {
-                        let Some(Blame {
-                            entries,
-                            messages,
-                            remote_url,
-                        }) = blame.await?
-                        else {
-                            return Ok(None);
-                        };
+                        let mut res = vec![];
+                        let mut errors = vec![];
+                        for (id, snapshot, buffer_edits, blame) in blame {
+                            match blame.await {
+                                Ok(Some(Blame {
+                                    entries,
+                                    messages,
+                                    remote_url,
+                                })) => {
+                                    let entries = build_blame_entry_sum_tree(
+                                        entries,
+                                        snapshot.max_point().row,
+                                    );
+                                    let commit_details = parse_commit_messages(
+                                        messages,
+                                        remote_url,
+                                        provider_registry.clone(),
+                                    )
+                                    .await;
 
-                        let entries = build_blame_entry_sum_tree(entries, snapshot.max_point().row);
-                        let commit_details =
-                            parse_commit_messages(messages, remote_url, provider_registry).await;
-
-                        anyhow::Ok(Some((entries, commit_details)))
+                                    res.push((
+                                        id,
+                                        snapshot,
+                                        buffer_edits,
+                                        Some(entries),
+                                        commit_details,
+                                    ));
+                                }
+                                Ok(None) => {
+                                    res.push((id, snapshot, buffer_edits, None, Default::default()))
+                                }
+                                Err(e) => errors.push(e),
+                            }
+                        }
+                        (res, errors)
                     }
                 })
                 .await;
 
-            this.update(cx, |this, cx| match result {
-                Ok(None) => {
-                    // Nothing to do, e.g. no repository found
+            this.update(cx, |this, cx| {
+                this.buffers.clear();
+                for (id, snapshot, buffer_edits, entries, commit_details) in result {
+                    let Some(entries) = entries else {
+                        continue;
+                    };
+                    this.buffers.insert(
+                        id,
+                        GitBlameBuffer {
+                            buffer_edits,
+                            buffer_snapshot: snapshot,
+                            entries,
+                            commit_details,
+                        },
+                    );
                 }
-                Ok(Some((entries, commit_details))) => {
-                    this.buffer_edits = buffer_edits;
-                    this.buffer_snapshot = snapshot;
-                    this.entries = entries;
-                    this.commit_details = commit_details;
-                    this.generated = true;
-                    cx.notify();
+                cx.notify();
+                if !errors.is_empty() {
+                    this.project.update(cx, |_, cx| {
+                        if this.user_triggered {
+                            log::error!("failed to get git blame data: {errors:?}");
+                            let notification = errors
+                                .into_iter()
+                                .format_with(",", |e, f| f(&format_args!("{:#}", e)))
+                                .to_string();
+                            cx.emit(project::Event::Toast {
+                                notification_id: "git-blame".into(),
+                                message: notification,
+                            });
+                        } else {
+                            // If we weren't triggered by a user, we just log errors in the background, instead of sending
+                            // notifications.
+                            log::debug!("failed to get git blame data: {errors:?}");
+                        }
+                    })
                 }
-                Err(error) => this.project.update(cx, |_, cx| {
-                    if this.user_triggered {
-                        log::error!("failed to get git blame data: {error:?}");
-                        let notification = format!("{:#}", error).trim().to_string();
-                        cx.emit(project::Event::Toast {
-                            notification_id: "git-blame".into(),
-                            message: notification,
-                        });
-                    } else {
-                        // If we weren't triggered by a user, we just log errors in the background, instead of sending
-                        // notifications.
-                        log::debug!("failed to get git blame data: {error:?}");
-                    }
-                }),
             })
         });
     }
@@ -520,7 +605,7 @@ impl GitBlame {
             this.update(cx, |this, cx| {
                 this.generate(cx);
             })
-        })
+        });
     }
 }
 
@@ -659,6 +744,9 @@ mod tests {
                 )
                 .collect::<Vec<_>>(),
             expected
+                .into_iter()
+                .map(|it| Some((buffer_id, it?)))
+                .collect::<Vec<_>>()
         );
     }
 
@@ -705,6 +793,7 @@ mod tests {
             })
             .await
             .unwrap();
+        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
 
         let blame = cx.new(|cx| GitBlame::new(buffer.clone(), project.clone(), true, true, cx));
 
@@ -785,6 +874,7 @@ mod tests {
             .await
             .unwrap();
         let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
+        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
 
         let git_blame = cx.new(|cx| GitBlame::new(buffer.clone(), project, false, true, cx));
 
@@ -806,14 +896,14 @@ mod tests {
                     )
                     .collect::<Vec<_>>(),
                 vec![
-                    Some(blame_entry("1b1b1b", 0..1)),
-                    Some(blame_entry("0d0d0d", 1..2)),
-                    Some(blame_entry("3a3a3a", 2..3)),
+                    Some((buffer_id, blame_entry("1b1b1b", 0..1))),
+                    Some((buffer_id, blame_entry("0d0d0d", 1..2))),
+                    Some((buffer_id, blame_entry("3a3a3a", 2..3))),
                     None,
                     None,
-                    Some(blame_entry("3a3a3a", 5..6)),
-                    Some(blame_entry("0d0d0d", 6..7)),
-                    Some(blame_entry("3a3a3a", 7..8)),
+                    Some((buffer_id, blame_entry("3a3a3a", 5..6))),
+                    Some((buffer_id, blame_entry("0d0d0d", 6..7))),
+                    Some((buffer_id, blame_entry("3a3a3a", 7..8))),
                 ]
             );
             // Subset of lines
@@ -831,8 +921,8 @@ mod tests {
                     )
                     .collect::<Vec<_>>(),
                 vec![
-                    Some(blame_entry("0d0d0d", 1..2)),
-                    Some(blame_entry("3a3a3a", 2..3)),
+                    Some((buffer_id, blame_entry("0d0d0d", 1..2))),
+                    Some((buffer_id, blame_entry("3a3a3a", 2..3))),
                     None
                 ]
             );
@@ -852,7 +942,7 @@ mod tests {
                         cx
                     )
                     .collect::<Vec<_>>(),
-                vec![Some(blame_entry("0d0d0d", 1..2)), None, None]
+                vec![Some((buffer_id, blame_entry("0d0d0d", 1..2))), None, None]
             );
         });
     }
@@ -895,6 +985,7 @@ mod tests {
             .await
             .unwrap();
         let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
+        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
 
         let git_blame = cx.new(|cx| GitBlame::new(buffer.clone(), project, false, true, cx));
 
@@ -1061,8 +1152,9 @@ mod tests {
             })
             .await
             .unwrap();
+        let mbuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
 
-        let git_blame = cx.new(|cx| GitBlame::new(buffer.clone(), project, false, true, cx));
+        let git_blame = cx.new(|cx| GitBlame::new(mbuffer.clone(), project, false, true, cx));
         cx.executor().run_until_parked();
         git_blame.update(cx, |blame, cx| blame.check_invariants(cx));
 
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index e27cbf868a..874e58d2a3 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -735,7 +735,7 @@ impl MultiBuffer {
 
     pub fn as_singleton(&self) -> Option<Entity<Buffer>> {
         if self.singleton {
-            return Some(
+            Some(
                 self.buffers
                     .borrow()
                     .values()
@@ -743,7 +743,7 @@ impl MultiBuffer {
                     .unwrap()
                     .buffer
                     .clone(),
-            );
+            )
         } else {
             None
         }
@@ -2552,6 +2552,10 @@ impl MultiBuffer {
             .collect()
     }
 
+    pub fn all_buffer_ids(&self) -> Vec<BufferId> {
+        self.buffers.borrow().keys().copied().collect()
+    }
+
     pub fn buffer(&self, buffer_id: BufferId) -> Option<Entity<Buffer>> {
         self.buffers
             .borrow()
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 1521d01295..a8d5046f90 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -5402,8 +5402,9 @@ mod tests {
         init_test(cx);
 
         let fs = FakeFs::new(cx.background_executor.clone());
-        populate_with_test_ra_project(&fs, "/rust-analyzer").await;
-        let project = Project::test(fs.clone(), ["/rust-analyzer".as_ref()], cx).await;
+        let root = path!("/rust-analyzer");
+        populate_with_test_ra_project(&fs, root).await;
+        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
         project.read_with(cx, |project, _| {
             project.languages().add(Arc::new(rust_lang()))
         });
@@ -5448,15 +5449,16 @@ mod tests {
                 });
         });
 
-        let all_matches = r#"/rust-analyzer/
+        let all_matches = format!(
+            r#"{root}/
   crates/
     ide/src/
       inlay_hints/
         fn_lifetime_fn.rs
-          search: match config.param_names_for_lifetime_elision_hints {
-          search: allocated_lifetimes.push(if config.param_names_for_lifetime_elision_hints {
-          search: Some(it) if config.param_names_for_lifetime_elision_hints => {
-          search: InlayHintsConfig { param_names_for_lifetime_elision_hints: true, ..TEST_CONFIG },
+          search: match config.param_names_for_lifetime_elision_hints {{
+          search: allocated_lifetimes.push(if config.param_names_for_lifetime_elision_hints {{
+          search: Some(it) if config.param_names_for_lifetime_elision_hints => {{
+          search: InlayHintsConfig {{ param_names_for_lifetime_elision_hints: true, ..TEST_CONFIG }},
       inlay_hints.rs
         search: pub param_names_for_lifetime_elision_hints: bool,
         search: param_names_for_lifetime_elision_hints: self
@@ -5467,7 +5469,9 @@ mod tests {
         analysis_stats.rs
           search: param_names_for_lifetime_elision_hints: true,
       config.rs
-        search: param_names_for_lifetime_elision_hints: self"#;
+        search: param_names_for_lifetime_elision_hints: self"#
+        );
+
         let select_first_in_all_matches = |line_to_select: &str| {
             assert!(all_matches.contains(line_to_select));
             all_matches.replacen(
@@ -5524,7 +5528,7 @@ mod tests {
                     cx,
                 ),
                 format!(
-                    r#"/rust-analyzer/
+                    r#"{root}/
   crates/
     ide/src/
       inlay_hints/
@@ -5594,7 +5598,7 @@ mod tests {
                     cx,
                 ),
                 format!(
-                    r#"/rust-analyzer/
+                    r#"{root}/
   crates/
     ide/src/{SELECTED_MARKER}
     rust-analyzer/src/
@@ -5631,8 +5635,9 @@ mod tests {
         init_test(cx);
 
         let fs = FakeFs::new(cx.background_executor.clone());
-        populate_with_test_ra_project(&fs, "/rust-analyzer").await;
-        let project = Project::test(fs.clone(), ["/rust-analyzer".as_ref()], cx).await;
+        let root = path!("/rust-analyzer");
+        populate_with_test_ra_project(&fs, root).await;
+        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
         project.read_with(cx, |project, _| {
             project.languages().add(Arc::new(rust_lang()))
         });
@@ -5676,15 +5681,16 @@ mod tests {
                     );
                 });
         });
-        let all_matches = r#"/rust-analyzer/
+        let all_matches = format!(
+            r#"{root}/
   crates/
     ide/src/
       inlay_hints/
         fn_lifetime_fn.rs
-          search: match config.param_names_for_lifetime_elision_hints {
-          search: allocated_lifetimes.push(if config.param_names_for_lifetime_elision_hints {
-          search: Some(it) if config.param_names_for_lifetime_elision_hints => {
-          search: InlayHintsConfig { param_names_for_lifetime_elision_hints: true, ..TEST_CONFIG },
+          search: match config.param_names_for_lifetime_elision_hints {{
+          search: allocated_lifetimes.push(if config.param_names_for_lifetime_elision_hints {{
+          search: Some(it) if config.param_names_for_lifetime_elision_hints => {{
+          search: InlayHintsConfig {{ param_names_for_lifetime_elision_hints: true, ..TEST_CONFIG }},
       inlay_hints.rs
         search: pub param_names_for_lifetime_elision_hints: bool,
         search: param_names_for_lifetime_elision_hints: self
@@ -5695,7 +5701,8 @@ mod tests {
         analysis_stats.rs
           search: param_names_for_lifetime_elision_hints: true,
       config.rs
-        search: param_names_for_lifetime_elision_hints: self"#;
+        search: param_names_for_lifetime_elision_hints: self"#
+        );
 
         cx.executor()
             .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
@@ -5768,8 +5775,9 @@ mod tests {
         init_test(cx);
 
         let fs = FakeFs::new(cx.background_executor.clone());
-        populate_with_test_ra_project(&fs, path!("/rust-analyzer")).await;
-        let project = Project::test(fs.clone(), [path!("/rust-analyzer").as_ref()], cx).await;
+        let root = path!("/rust-analyzer");
+        populate_with_test_ra_project(&fs, root).await;
+        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
         project.read_with(cx, |project, _| {
             project.languages().add(Arc::new(rust_lang()))
         });
@@ -5813,9 +5821,8 @@ mod tests {
                     );
                 });
         });
-        let root_path = format!("{}/", path!("/rust-analyzer"));
         let all_matches = format!(
-            r#"{root_path}
+            r#"{root}/
   crates/
     ide/src/
       inlay_hints/
@@ -5977,7 +5984,7 @@ mod tests {
 
         let fs = FakeFs::new(cx.background_executor.clone());
         fs.insert_tree(
-            "/root",
+            path!("/root"),
             json!({
                 "one": {
                     "a.txt": "aaa aaa"
@@ -5989,7 +5996,7 @@ mod tests {
             }),
         )
         .await;
-        let project = Project::test(fs.clone(), [Path::new("/root/one")], cx).await;
+        let project = Project::test(fs.clone(), [Path::new(path!("/root/one"))], cx).await;
         let workspace = add_outline_panel(&project, cx).await;
         let cx = &mut VisualTestContext::from_window(*workspace, cx);
         let outline_panel = outline_panel(&workspace, cx);
@@ -6000,7 +6007,7 @@ mod tests {
         let items = workspace
             .update(cx, |workspace, window, cx| {
                 workspace.open_paths(
-                    vec![PathBuf::from("/root/two")],
+                    vec![PathBuf::from(path!("/root/two"))],
                     OpenOptions {
                         visible: Some(OpenVisible::OnlyDirectories),
                         ..Default::default()
@@ -6064,13 +6071,17 @@ mod tests {
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/root/one/
+                format!(
+                    r#"{}/
   a.txt
     search: aaa aaa  <==== selected
     search: aaa aaa
-/root/two/
+{}/
   b.txt
-    search: a aaa"#
+    search: a aaa"#,
+                    path!("/root/one"),
+                    path!("/root/two"),
+                ),
             );
         });
 
@@ -6090,11 +6101,15 @@ mod tests {
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/root/one/
+                format!(
+                    r#"{}/
   a.txt  <==== selected
-/root/two/
+{}/
   b.txt
-    search: a aaa"#
+    search: a aaa"#,
+                    path!("/root/one"),
+                    path!("/root/two"),
+                ),
             );
         });
 
@@ -6114,9 +6129,13 @@ mod tests {
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/root/one/
+                format!(
+                    r#"{}/
   a.txt
-/root/two/  <==== selected"#
+{}/  <==== selected"#,
+                    path!("/root/one"),
+                    path!("/root/two"),
+                ),
             );
         });
 
@@ -6135,11 +6154,15 @@ mod tests {
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/root/one/
+                format!(
+                    r#"{}/
   a.txt
-/root/two/  <==== selected
+{}/  <==== selected
   b.txt
-    search: a aaa"#
+    search: a aaa"#,
+                    path!("/root/one"),
+                    path!("/root/two"),
+                )
             );
         });
     }
@@ -6165,7 +6188,7 @@ struct OutlineEntryExcerpt {
             }),
         )
         .await;
-        let project = Project::test(fs.clone(), [root.as_ref()], cx).await;
+        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
         project.read_with(cx, |project, _| {
             project.languages().add(Arc::new(
                 rust_lang()
@@ -6508,7 +6531,7 @@ outline: struct OutlineEntryExcerpt
     async fn test_frontend_repo_structure(cx: &mut TestAppContext) {
         init_test(cx);
 
-        let root = "/frontend-project";
+        let root = path!("/frontend-project");
         let fs = FakeFs::new(cx.background_executor.clone());
         fs.insert_tree(
             root,
@@ -6545,7 +6568,7 @@ outline: struct OutlineEntryExcerpt
             }),
         )
         .await;
-        let project = Project::test(fs.clone(), [root.as_ref()], cx).await;
+        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
         let workspace = add_outline_panel(&project, cx).await;
         let cx = &mut VisualTestContext::from_window(*workspace, cx);
         let outline_panel = outline_panel(&workspace, cx);
@@ -6599,10 +6622,11 @@ outline: struct OutlineEntryExcerpt
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/frontend-project/
+                format!(
+                    r#"{root}/
   public/lottie/
     syntax-tree.json
-      search: { "something": "static" }  <==== selected
+      search: {{ "something": "static" }}  <==== selected
   src/
     app/(site)/
       (about)/jobs/[slug]/
@@ -6614,6 +6638,7 @@ outline: struct OutlineEntryExcerpt
     components/
       ErrorBoundary.tsx
         search: static"#
+                )
             );
         });
 
@@ -6636,15 +6661,17 @@ outline: struct OutlineEntryExcerpt
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/frontend-project/
+                format!(
+                    r#"{root}/
   public/lottie/
     syntax-tree.json
-      search: { "something": "static" }
+      search: {{ "something": "static" }}
   src/
     app/(site)/  <==== selected
     components/
       ErrorBoundary.tsx
         search: static"#
+                )
             );
         });
 
@@ -6664,15 +6691,17 @@ outline: struct OutlineEntryExcerpt
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/frontend-project/
+                format!(
+                    r#"{root}/
   public/lottie/
     syntax-tree.json
-      search: { "something": "static" }
+      search: {{ "something": "static" }}
   src/
     app/(site)/
     components/
       ErrorBoundary.tsx
         search: static  <==== selected"#
+                )
             );
         });
 
@@ -6696,14 +6725,16 @@ outline: struct OutlineEntryExcerpt
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/frontend-project/
+                format!(
+                    r#"{root}/
   public/lottie/
     syntax-tree.json
-      search: { "something": "static" }
+      search: {{ "something": "static" }}
   src/
     app/(site)/
     components/
       ErrorBoundary.tsx  <==== selected"#
+                )
             );
         });
 
@@ -6727,15 +6758,17 @@ outline: struct OutlineEntryExcerpt
                     outline_panel.selected_entry(),
                     cx,
                 ),
-                r#"/frontend-project/
+                format!(
+                    r#"{root}/
   public/lottie/
     syntax-tree.json
-      search: { "something": "static" }
+      search: {{ "something": "static" }}
   src/
     app/(site)/
     components/
       ErrorBoundary.tsx  <==== selected
         search: static"#
+                )
             );
         });
     }
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 73f5da086c..6e06c2dd95 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -2566,10 +2566,7 @@ impl LocalLspStore {
         };
 
         let Ok(file_url) = lsp::Uri::from_file_path(old_path.as_path()) else {
-            debug_panic!(
-                "`{}` is not parseable as an URI",
-                old_path.to_string_lossy()
-            );
+            debug_panic!("{old_path:?} is not parseable as an URI");
             return;
         };
         self.unregister_buffer_from_language_servers(buffer, &file_url, cx);
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 2668d270d7..4a2dbf31fc 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1384,6 +1384,9 @@ impl ProjectSearchView {
         let match_ranges = self.entity.read(cx).match_ranges.clone();
         if match_ranges.is_empty() {
             self.active_match_index = None;
+            self.results_editor.update(cx, |editor, cx| {
+                editor.clear_background_highlights::<Self>(cx);
+            });
         } else {
             self.active_match_index = Some(0);
             self.update_match_index(cx);
@@ -2338,7 +2341,7 @@ pub fn perform_project_search(
 
 #[cfg(test)]
 pub mod tests {
-    use std::{ops::Deref as _, sync::Arc};
+    use std::{ops::Deref as _, sync::Arc, time::Duration};
 
     use super::*;
     use editor::{DisplayPoint, display_map::DisplayRow};
@@ -2381,6 +2384,7 @@ pub mod tests {
                 "\n\nconst THREE: usize = one::ONE + two::TWO;\n\n\nconst TWO: usize = one::ONE + one::ONE;"
             );
             let match_background_color = cx.theme().colors().search_match_background;
+            let selection_background_color = cx.theme().colors().editor_document_highlight_bracket_background;
             assert_eq!(
                 search_view
                     .results_editor
@@ -2390,14 +2394,23 @@ pub mod tests {
                         DisplayPoint::new(DisplayRow(2), 32)..DisplayPoint::new(DisplayRow(2), 35),
                         match_background_color
                     ),
+                    (
+                        DisplayPoint::new(DisplayRow(2), 37)..DisplayPoint::new(DisplayRow(2), 40),
+                        selection_background_color
+                    ),
                     (
                         DisplayPoint::new(DisplayRow(2), 37)..DisplayPoint::new(DisplayRow(2), 40),
                         match_background_color
                     ),
+                    (
+                        DisplayPoint::new(DisplayRow(5), 6)..DisplayPoint::new(DisplayRow(5), 9),
+                        selection_background_color
+                    ),
                     (
                         DisplayPoint::new(DisplayRow(5), 6)..DisplayPoint::new(DisplayRow(5), 9),
                         match_background_color
-                    )
+                    ),
+
                 ]
             );
             assert_eq!(search_view.active_match_index, Some(0));
@@ -4156,6 +4169,10 @@ pub mod tests {
                 search_view.search(cx);
             })
             .unwrap();
+        // Ensure editor highlights appear after the search is done
+        cx.executor().advance_clock(
+            editor::SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT + Duration::from_millis(100),
+        );
         cx.background_executor.run_until_parked();
     }
 }
diff --git a/crates/sum_tree/src/tree_map.rs b/crates/sum_tree/src/tree_map.rs
index 54e8ae8343..fc93d40ae5 100644
--- a/crates/sum_tree/src/tree_map.rs
+++ b/crates/sum_tree/src/tree_map.rs
@@ -2,6 +2,7 @@ use std::{cmp::Ordering, fmt::Debug};
 
 use crate::{Bias, Dimension, Edit, Item, KeyedItem, SeekTarget, SumTree, Summary};
 
+/// A cheaply-clonable ordered map based on a [SumTree](crate::SumTree).
 #[derive(Clone, PartialEq, Eq)]
 pub struct TreeMap<K, V>(SumTree<MapEntry<K, V>>)
 where

From 7327ef662b0012c29f11db283ca422f474752a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20von=20G=C3=B6wels?= <moritz@tarn-vedra.de>
Date: Wed, 3 Sep 2025 16:23:46 +0200
Subject: [PATCH 573/823] terminal_view: Fix focusing of center-pane terminals
 (#37359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With `reveal_stragegy=always` + `reveal_target=center`,
`TerminalPanel::spawn_task` activates & focuses the pane of the task.
This works fine in the terminal pane but doesn't for
`reveal_target=center`.

Please note: I'm not verified familiar with the architecture and
internal APIs of zed. If there's a better way or if this fix is a bad
idea, I'm fine with adapting this 😃

Closes #35908

Release Notes:

- Fixed task focus when re-spawning a task with `reveal_target=center`

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
---
 crates/terminal_view/src/terminal_panel.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 848737aeb2..2ba7f617bf 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -41,7 +41,7 @@ use workspace::{
     ui::IconName,
 };
 
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use zed_actions::assistant::InlineAssist;
 
 const TERMINAL_PANEL_KEY: &str = "TerminalPanel";
@@ -905,11 +905,16 @@ impl TerminalPanel {
                 RevealStrategy::Always => match reveal_target {
                     RevealTarget::Center => {
                         task_workspace.update_in(cx, |workspace, window, cx| {
-                            workspace
-                                .active_item(cx)
-                                .context("retrieving active terminal item in the workspace")?
-                                .item_focus_handle(cx)
-                                .focus(window);
+                            let did_activate = workspace.activate_item(
+                                &terminal_to_replace,
+                                true,
+                                true,
+                                window,
+                                cx,
+                            );
+
+                            anyhow::ensure!(did_activate, "Failed to retrieve terminal pane");
+
                             anyhow::Ok(())
                         })??;
                     }

From 0cbacb850082e92aa1503efac06b0f595444a8d3 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 3 Sep 2025 17:48:17 +0300
Subject: [PATCH 574/823] Make word deletions less greedy (#37352)

Closes https://github.com/zed-industries/zed/issues/37144

Adjusts `editor::DeleteToPreviousWordStart`,
`editor::DeleteToNextWordEnd`, `editor::DeleteToNextSubwordEnd` and
`editor::DeleteToPreviousSubwordStart` actions to

* take whitespace sequences with length >= 2 into account and stop after
removing them (whilst movement would also include the word after such
sequences)

* take current language's brackets into account and stop after removing
the text before them

The latter is configurable and can be disabled with `"ignore_brackets":
true` parameter in the action.

Release Notes:

- Improved word deletions to consider whitespace sequences and brackets
by default
---
 assets/keymaps/default-linux.json      |   4 +-
 assets/keymaps/default-macos.json      |   6 +-
 assets/keymaps/default-windows.json    |   4 +-
 assets/keymaps/linux/emacs.json        |   2 +-
 assets/keymaps/linux/sublime_text.json |   4 +-
 assets/keymaps/macos/emacs.json        |   2 +-
 assets/keymaps/macos/sublime_text.json |   4 +-
 assets/keymaps/macos/textmate.json     |   8 +-
 assets/keymaps/vim.json                |   2 +-
 crates/editor/src/actions.rs           |   8 +
 crates/editor/src/editor.rs            |  24 +-
 crates/editor/src/editor_tests.rs      | 384 +++++++++++++++++++++++--
 crates/editor/src/movement.rs          | 104 ++++++-
 crates/language/src/language.rs        |   1 +
 14 files changed, 509 insertions(+), 48 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index a60dc92844..28518490cc 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -63,8 +63,8 @@
       "ctrl-k": "editor::CutToEndOfLine",
       "ctrl-k ctrl-q": "editor::Rewrap",
       "ctrl-k q": "editor::Rewrap",
-      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
       "cut": "editor::Cut",
       "shift-delete": "editor::Cut",
       "ctrl-x": "editor::Cut",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index e72f4174ff..954684c826 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -70,9 +70,9 @@
       "cmd-k q": "editor::Rewrap",
       "cmd-backspace": "editor::DeleteToBeginningOfLine",
       "cmd-delete": "editor::DeleteToEndOfLine",
-      "alt-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-w": "editor::DeleteToPreviousWordStart",
-      "alt-delete": "editor::DeleteToNextWordEnd",
+      "alt-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "ctrl-w": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "alt-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
       "cmd-x": "editor::Cut",
       "cmd-c": "editor::Copy",
       "cmd-v": "editor::Paste",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index dbd377409f..728907e60c 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -66,8 +66,8 @@
       "ctrl-k": "editor::CutToEndOfLine",
       "ctrl-k ctrl-q": "editor::Rewrap",
       "ctrl-k q": "editor::Rewrap",
-      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
       "cut": "editor::Cut",
       "shift-delete": "editor::Cut",
       "ctrl-x": "editor::Cut",
diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json
index 62910e297b..0f936ba2f9 100755
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -42,7 +42,7 @@
       "alt-,": "pane::GoBack", // xref-pop-marker-stack
       "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
       "ctrl-d": "editor::Delete", // delete-char
-      "alt-d": "editor::DeleteToNextWordEnd", // kill-word
+      "alt-d": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }], // kill-word
       "ctrl-k": "editor::KillRingCut", // kill-line
       "ctrl-w": "editor::Cut", // kill-region
       "alt-w": "editor::Copy", // kill-ring-save
diff --git a/assets/keymaps/linux/sublime_text.json b/assets/keymaps/linux/sublime_text.json
index ece9d69dd1..f526db45ff 100644
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -50,8 +50,8 @@
       "ctrl-k ctrl-u": "editor::ConvertToUpperCase",
       "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
       "shift-alt-m": "markdown::OpenPreviewToTheSide",
-      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
       "alt-right": "editor::MoveToNextSubwordEnd",
       "alt-left": "editor::MoveToPreviousSubwordStart",
       "alt-shift-right": "editor::SelectToNextSubwordEnd",
diff --git a/assets/keymaps/macos/emacs.json b/assets/keymaps/macos/emacs.json
index 62910e297b..0f936ba2f9 100755
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -42,7 +42,7 @@
       "alt-,": "pane::GoBack", // xref-pop-marker-stack
       "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
       "ctrl-d": "editor::Delete", // delete-char
-      "alt-d": "editor::DeleteToNextWordEnd", // kill-word
+      "alt-d": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }], // kill-word
       "ctrl-k": "editor::KillRingCut", // kill-line
       "ctrl-w": "editor::Cut", // kill-region
       "alt-w": "editor::Copy", // kill-ring-save
diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json
index 9fa528c75f..a1e61bf885 100644
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -52,8 +52,8 @@
       "cmd-k cmd-l": "editor::ConvertToLowerCase",
       "cmd-shift-j": "editor::JoinLines",
       "shift-alt-m": "markdown::OpenPreviewToTheSide",
-      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
       "ctrl-right": "editor::MoveToNextSubwordEnd",
       "ctrl-left": "editor::MoveToPreviousSubwordStart",
       "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
diff --git a/assets/keymaps/macos/textmate.json b/assets/keymaps/macos/textmate.json
index 0bd8873b17..f91f39b7f5 100644
--- a/assets/keymaps/macos/textmate.json
+++ b/assets/keymaps/macos/textmate.json
@@ -21,10 +21,10 @@
   {
     "context": "Editor",
     "bindings": {
-      "alt-backspace": "editor::DeleteToPreviousWordStart",
-      "alt-shift-backspace": "editor::DeleteToNextWordEnd",
-      "alt-delete": "editor::DeleteToNextWordEnd",
-      "alt-shift-delete": "editor::DeleteToNextWordEnd",
+      "alt-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
+      "alt-shift-backspace": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
+      "alt-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
+      "alt-shift-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
       "ctrl-backspace": "editor::DeleteToPreviousSubwordStart",
       "ctrl-delete": "editor::DeleteToNextSubwordEnd",
       "alt-left": ["editor::MoveToPreviousWordStart", { "stop_at_soft_wraps": true }],
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index fd33b888b7..fa7f82e103 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -337,7 +337,7 @@
       "ctrl-x ctrl-z": "editor::Cancel",
       "ctrl-x ctrl-e": "vim::LineDown",
       "ctrl-x ctrl-y": "vim::LineUp",
-      "ctrl-w": "editor::DeleteToPreviousWordStart",
+      "ctrl-w": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
       "ctrl-u": "editor::DeleteToBeginningOfLine",
       "ctrl-t": "vim::Indent",
       "ctrl-d": "vim::Outdent",
diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 3cc6c28464..5b92f138c7 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -228,21 +228,29 @@ pub struct ShowCompletions {
 pub struct HandleInput(pub String);
 
 /// Deletes from the cursor to the end of the next word.
+/// Stops before the end of the next word, if whitespace sequences of length >= 2 are encountered.
 #[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
 #[action(namespace = editor)]
 #[serde(deny_unknown_fields)]
 pub struct DeleteToNextWordEnd {
     #[serde(default)]
     pub ignore_newlines: bool,
+    // Whether to stop before the end of the next word, if language-defined bracket is encountered.
+    #[serde(default)]
+    pub ignore_brackets: bool,
 }
 
 /// Deletes from the cursor to the start of the previous word.
+/// Stops before the start of the previous word, if whitespace sequences of length >= 2 are encountered.
 #[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
 #[action(namespace = editor)]
 #[serde(deny_unknown_fields)]
 pub struct DeleteToPreviousWordStart {
     #[serde(default)]
     pub ignore_newlines: bool,
+    // Whether to stop before the start of the previous word, if language-defined bracket is encountered.
+    #[serde(default)]
+    pub ignore_brackets: bool,
 }
 
 /// Folds all code blocks at the specified indentation level.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a8e2b001f3..5edc7f3c06 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -13153,11 +13153,17 @@ impl Editor {
             this.change_selections(Default::default(), window, cx, |s| {
                 s.move_with(|map, selection| {
                     if selection.is_empty() {
-                        let cursor = if action.ignore_newlines {
+                        let mut cursor = if action.ignore_newlines {
                             movement::previous_word_start(map, selection.head())
                         } else {
                             movement::previous_word_start_or_newline(map, selection.head())
                         };
+                        cursor = movement::adjust_greedy_deletion(
+                            map,
+                            selection.head(),
+                            cursor,
+                            action.ignore_brackets,
+                        );
                         selection.set_head(cursor, SelectionGoal::None);
                     }
                 });
@@ -13178,7 +13184,9 @@ impl Editor {
             this.change_selections(Default::default(), window, cx, |s| {
                 s.move_with(|map, selection| {
                     if selection.is_empty() {
-                        let cursor = movement::previous_subword_start(map, selection.head());
+                        let mut cursor = movement::previous_subword_start(map, selection.head());
+                        cursor =
+                            movement::adjust_greedy_deletion(map, selection.head(), cursor, false);
                         selection.set_head(cursor, SelectionGoal::None);
                     }
                 });
@@ -13254,11 +13262,17 @@ impl Editor {
             this.change_selections(Default::default(), window, cx, |s| {
                 s.move_with(|map, selection| {
                     if selection.is_empty() {
-                        let cursor = if action.ignore_newlines {
+                        let mut cursor = if action.ignore_newlines {
                             movement::next_word_end(map, selection.head())
                         } else {
                             movement::next_word_end_or_newline(map, selection.head())
                         };
+                        cursor = movement::adjust_greedy_deletion(
+                            map,
+                            selection.head(),
+                            cursor,
+                            action.ignore_brackets,
+                        );
                         selection.set_head(cursor, SelectionGoal::None);
                     }
                 });
@@ -13278,7 +13292,9 @@ impl Editor {
             this.change_selections(Default::default(), window, cx, |s| {
                 s.move_with(|map, selection| {
                     if selection.is_empty() {
-                        let cursor = movement::next_subword_end(map, selection.head());
+                        let mut cursor = movement::next_subword_end(map, selection.head());
+                        cursor =
+                            movement::adjust_greedy_deletion(map, selection.head(), cursor, false);
                         selection.set_head(cursor, SelectionGoal::None);
                     }
                 });
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 1893839ea6..5efa390825 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -2476,51 +2476,379 @@ async fn test_delete_to_beginning_of_line(cx: &mut TestAppContext) {
 }
 
 #[gpui::test]
-fn test_delete_to_word_boundary(cx: &mut TestAppContext) {
+async fn test_delete_to_word_boundary(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("one two three four", cx);
-        build_editor(buffer, window, cx)
-    });
+    let mut cx = EditorTestContext::new(cx).await;
 
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                // an empty selection - the preceding word fragment is deleted
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                // characters selected - they are deleted
-                DisplayPoint::new(DisplayRow(0), 9)..DisplayPoint::new(DisplayRow(0), 12),
-            ])
-        });
+    // For an empty selection, the preceding word fragment is deleted.
+    // For non-empty selections, only selected characters are deleted.
+    cx.set_state("onˇe two t«hreˇ»e four");
+    cx.update_editor(|editor, window, cx| {
         editor.delete_to_previous_word_start(
             &DeleteToPreviousWordStart {
                 ignore_newlines: false,
+                ignore_brackets: false,
             },
             window,
             cx,
         );
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "e two te four");
     });
+    cx.assert_editor_state("ˇe two tˇe four");
 
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                // an empty selection - the following word fragment is deleted
-                DisplayPoint::new(DisplayRow(0), 3)..DisplayPoint::new(DisplayRow(0), 3),
-                // characters selected - they are deleted
-                DisplayPoint::new(DisplayRow(0), 9)..DisplayPoint::new(DisplayRow(0), 10),
-            ])
-        });
+    cx.set_state("e tˇwo te «fˇ»our");
+    cx.update_editor(|editor, window, cx| {
         editor.delete_to_next_word_end(
             &DeleteToNextWordEnd {
                 ignore_newlines: false,
+                ignore_brackets: false,
             },
             window,
             cx,
         );
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "e t te our");
     });
+    cx.assert_editor_state("e tˇ te ˇour");
+}
+
+#[gpui::test]
+async fn test_delete_whitespaces(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state("here is some text    ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: false,
+                ignore_brackets: true,
+            },
+            window,
+            cx,
+        );
+    });
+    // Continuous whitespace sequences are removed entirely, words behind them are not affected by the deletion action.
+    cx.assert_editor_state("here is some textˇwith a space");
+
+    cx.set_state("here is some text    ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: false,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("here is some textˇwith a space");
+
+    cx.set_state("here is some textˇ    with a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: false,
+                ignore_brackets: true,
+            },
+            window,
+            cx,
+        );
+    });
+    // Same happens in the other direction.
+    cx.assert_editor_state("here is some textˇwith a space");
+
+    cx.set_state("here is some textˇ    with a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: false,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("here is some textˇwith a space");
+
+    cx.set_state("here is some textˇ    with a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("here is some textˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("here is some ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    // Single whitespaces are removed with the word behind them.
+    cx.assert_editor_state("here is ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("here ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("ˇwith a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    // Same happens in the other direction.
+    cx.assert_editor_state("ˇ a space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("ˇ space");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("ˇ");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("ˇ");
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state("ˇ");
+}
+
+#[gpui::test]
+async fn test_delete_to_bracket(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let language = Arc::new(
+        Language::new(
+            LanguageConfig {
+                brackets: BracketPairConfig {
+                    pairs: vec![
+                        BracketPair {
+                            start: "\"".to_string(),
+                            end: "\"".to_string(),
+                            close: true,
+                            surround: true,
+                            newline: false,
+                        },
+                        BracketPair {
+                            start: "(".to_string(),
+                            end: ")".to_string(),
+                            close: true,
+                            surround: true,
+                            newline: true,
+                        },
+                    ],
+                    ..BracketPairConfig::default()
+                },
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_brackets_query(
+            r#"
+                ("(" @open ")" @close)
+                ("\"" @open "\"" @close)
+            "#,
+        )
+        .unwrap(),
+    );
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+    cx.set_state(r#"macro!("// ˇCOMMENT");"#);
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    // Deletion stops before brackets if asked to not ignore them.
+    cx.assert_editor_state(r#"macro!("ˇCOMMENT");"#);
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    // Deletion has to remove a single bracket and then stop again.
+    cx.assert_editor_state(r#"macro!(ˇCOMMENT");"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state(r#"macro!ˇCOMMENT");"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state(r#"ˇCOMMENT");"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state(r#"ˇCOMMENT");"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    // Brackets on the right are not paired anymore, hence deletion does not stop at them
+    cx.assert_editor_state(r#"ˇ");"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state(r#"ˇ"#);
+
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_next_word_end(
+            &DeleteToNextWordEnd {
+                ignore_newlines: true,
+                ignore_brackets: false,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state(r#"ˇ"#);
+
+    cx.set_state(r#"macro!("// ˇCOMMENT");"#);
+    cx.update_editor(|editor, window, cx| {
+        editor.delete_to_previous_word_start(
+            &DeleteToPreviousWordStart {
+                ignore_newlines: true,
+                ignore_brackets: true,
+            },
+            window,
+            cx,
+        );
+    });
+    cx.assert_editor_state(r#"macroˇCOMMENT");"#);
 }
 
 #[gpui::test]
@@ -2533,9 +2861,11 @@ fn test_delete_to_previous_word_start_or_newline(cx: &mut TestAppContext) {
     });
     let del_to_prev_word_start = DeleteToPreviousWordStart {
         ignore_newlines: false,
+        ignore_brackets: false,
     };
     let del_to_prev_word_start_ignore_newlines = DeleteToPreviousWordStart {
         ignore_newlines: true,
+        ignore_brackets: false,
     };
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -2569,9 +2899,11 @@ fn test_delete_to_next_word_end_or_newline(cx: &mut TestAppContext) {
     });
     let del_to_next_word_end = DeleteToNextWordEnd {
         ignore_newlines: false,
+        ignore_brackets: false,
     };
     let del_to_next_word_end_ignore_newlines = DeleteToNextWordEnd {
         ignore_newlines: true,
+        ignore_brackets: false,
     };
 
     _ = editor.update(cx, |editor, window, cx| {
@@ -2600,6 +2932,8 @@ fn test_delete_to_next_word_end_or_newline(cx: &mut TestAppContext) {
         editor.delete_to_next_word_end(&del_to_next_word_end_ignore_newlines, window, cx);
         assert_eq!(editor.buffer.read(cx).read(cx).text(), "\n   four");
         editor.delete_to_next_word_end(&del_to_next_word_end_ignore_newlines, window, cx);
+        assert_eq!(editor.buffer.read(cx).read(cx).text(), "four");
+        editor.delete_to_next_word_end(&del_to_next_word_end_ignore_newlines, window, cx);
         assert_eq!(editor.buffer.read(cx).read(cx).text(), "");
     });
 }
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 7a008e3ba2..216bea1696 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -289,12 +289,114 @@ pub fn previous_word_start_or_newline(map: &DisplaySnapshot, point: DisplayPoint
     let classifier = map.buffer_snapshot.char_classifier_at(raw_point);
 
     find_preceding_boundary_display_point(map, point, FindRange::MultiLine, |left, right| {
-        (classifier.kind(left) != classifier.kind(right) && !right.is_whitespace())
+        (classifier.kind(left) != classifier.kind(right) && !classifier.is_whitespace(right))
             || left == '\n'
             || right == '\n'
     })
 }
 
+/// Text movements are too greedy, making deletions too greedy too.
+/// Makes deletions more ergonomic by potentially reducing the deletion range based on its text contents:
+/// * whitespace sequences with length >= 2 stop the deletion after removal (despite movement jumping over the word behind the whitespaces)
+/// * brackets stop the deletion after removal (despite movement currently not accounting for these and jumping over)
+pub fn adjust_greedy_deletion(
+    map: &DisplaySnapshot,
+    delete_from: DisplayPoint,
+    delete_until: DisplayPoint,
+    ignore_brackets: bool,
+) -> DisplayPoint {
+    if delete_from == delete_until {
+        return delete_until;
+    }
+    let is_backward = delete_from > delete_until;
+    let delete_range = if is_backward {
+        map.display_point_to_point(delete_until, Bias::Left)
+            .to_offset(&map.buffer_snapshot)
+            ..map
+                .display_point_to_point(delete_from, Bias::Right)
+                .to_offset(&map.buffer_snapshot)
+    } else {
+        map.display_point_to_point(delete_from, Bias::Left)
+            .to_offset(&map.buffer_snapshot)
+            ..map
+                .display_point_to_point(delete_until, Bias::Right)
+                .to_offset(&map.buffer_snapshot)
+    };
+
+    let trimmed_delete_range = if ignore_brackets {
+        delete_range
+    } else {
+        let brackets_in_delete_range = map
+            .buffer_snapshot
+            .bracket_ranges(delete_range.clone())
+            .into_iter()
+            .flatten()
+            .flat_map(|(left_bracket, right_bracket)| {
+                [
+                    left_bracket.start,
+                    left_bracket.end,
+                    right_bracket.start,
+                    right_bracket.end,
+                ]
+            })
+            .filter(|&bracket| delete_range.start < bracket && bracket < delete_range.end);
+        let closest_bracket = if is_backward {
+            brackets_in_delete_range.max()
+        } else {
+            brackets_in_delete_range.min()
+        };
+
+        if is_backward {
+            closest_bracket.unwrap_or(delete_range.start)..delete_range.end
+        } else {
+            delete_range.start..closest_bracket.unwrap_or(delete_range.end)
+        }
+    };
+
+    let mut whitespace_sequences = Vec::new();
+    let mut current_offset = trimmed_delete_range.start;
+    let mut whitespace_sequence_length = 0;
+    let mut whitespace_sequence_start = 0;
+    for ch in map
+        .buffer_snapshot
+        .text_for_range(trimmed_delete_range.clone())
+        .flat_map(str::chars)
+    {
+        if ch.is_whitespace() {
+            if whitespace_sequence_length == 0 {
+                whitespace_sequence_start = current_offset;
+            }
+            whitespace_sequence_length += 1;
+        } else {
+            if whitespace_sequence_length >= 2 {
+                whitespace_sequences.push((whitespace_sequence_start, current_offset));
+            }
+            whitespace_sequence_start = 0;
+            whitespace_sequence_length = 0;
+        }
+        current_offset += ch.len_utf8();
+    }
+    if whitespace_sequence_length >= 2 {
+        whitespace_sequences.push((whitespace_sequence_start, current_offset));
+    }
+
+    let closest_whitespace_end = if is_backward {
+        whitespace_sequences.last().map(|&(start, _)| start)
+    } else {
+        whitespace_sequences.first().map(|&(_, end)| end)
+    };
+
+    closest_whitespace_end
+        .unwrap_or_else(|| {
+            if is_backward {
+                trimmed_delete_range.start
+            } else {
+                trimmed_delete_range.end
+            }
+        })
+        .to_display_point(map)
+}
+
 /// Returns a position of the previous subword boundary, where a subword is defined as a run of
 /// word characters of the same "subkind" - where subcharacter kinds are '_' character,
 /// lowerspace characters and uppercase characters.
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index b349122193..0606ae3de9 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1250,6 +1250,7 @@ struct InjectionPatternConfig {
     combined: bool,
 }
 
+#[derive(Debug)]
 struct BracketsConfig {
     query: Query,
     open_capture_ix: u32,

From c3480c3d6f0ff1f313c2a3678e29081c54c2ab96 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 3 Sep 2025 11:59:49 -0300
Subject: [PATCH 575/823] docs: Update external agents content (#37413)

Release Notes:

- N/A

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 docs/src/ai/agent-panel.md     | 13 +++++---
 docs/src/ai/external-agents.md | 57 +++++++++++++++++++++++++++++-----
 docs/src/ai/overview.md        |  2 +-
 3 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index 002c7d6415..ce91ca3401 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -1,24 +1,27 @@
 # Agent Panel
 
-The Agent Panel allows you to interact with many LLMs and coding agents that can support you in various types of tasks, such as generating code, codebase understanding, and other general inquiries like writing emails, documentation, and more.
+The Agent Panel allows you to interact with many LLMs and coding agents that can help with in various types of tasks, such as generating code, codebase understanding, and other general inquiries like writing emails, documentation, and more.
 
 To open it, use the `agent: new thread` action in [the Command Palette](../getting-started.md#command-palette) or click the ✨ (sparkles) icon in the status bar.
 
-If you're using the Agent Panel for the first time, you need to have at least one LLM or agent provider configured.
+## Getting Started
+
+If you're using the Agent Panel for the first time, you need to have at least one LLM provider or external agent configured.
 You can do that by:
 
 1. [subscribing to our Pro plan](https://zed.dev/pricing), so you have access to our hosted models
 2. [bringing your own API keys](./llm-providers.md#use-your-own-keys) for your desired provider
-3. using an external agent like [Gemini CLI](./external-agents.md#gemini-cli)
+3. using an external agent like [Gemini CLI](./external-agents.md#gemini-cli) or [Claude Code](./external-agents.md#claude-code)
 
 ## Overview {#overview}
 
-After you've configured one or more LLM providers, type at the message editor and hit `enter` to submit your prompt.
+With an LLM provider or an external agent configured, type at the message editor and hit `enter` to submit your prompt.
 If you need extra room to type, you can expand the message editor with {#kb agent::ExpandMessageEditor}.
 
 You should start to see the responses stream in with indications of [which tools](./tools.md) the model is using to fulfill your prompt.
+From this point on, you can interact with the many supported features outlined below.
 
-> Note that, at the moment, not all features outlined below work for external agents, like [Gemini CLI](./external-agents.md#gemini-cli)—features like _restoring threads from history_, _checkpoints_, _token usage display_, _model selection_, and others may be supported in the future.
+> Note that for external agents, like [Gemini CLI](./external-agents.md#gemini-cli) or [Claude Code](./external-agents.md#claude-code), some of the features outlined below are _not_ currently supported—for example, _restoring threads from history_, _checkpoints_, _token usage display_, _model selection_, and others. All of them should hopefully be supported in the future.
 
 ### Creating New Threads
 
diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index 3d263afdb0..de374511d0 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -1,8 +1,9 @@
 # External Agents
 
-Zed supports terminal-based agentic coding tools through the [Agent Client Protocol (ACP)](https://agentclientprotocol.com).
+Zed supports terminal-based agents through the [Agent Client Protocol (ACP)](https://agentclientprotocol.com).
 
-Currently, [Gemini CLI](https://github.com/google-gemini/gemini-cli) serves as the reference implementation, and you can [add custom ACP-compatible agents](#add-custom-agents) as well.
+Currently, [Gemini CLI](https://github.com/google-gemini/gemini-cli) serves as the reference implementation.
+[Claude Code](https://www.anthropic.com/claude-code) is also included by default, and you can [add custom ACP-compatible agents](#add-custom-agents) as well.
 
 ## Gemini CLI {#gemini-cli}
 
@@ -13,9 +14,9 @@ This means that you're running the real Gemini CLI, with all of the advantages o
 
 ### Getting Started
 
-As of Zed Stable v0.201.5 you should be able to use Gemini CLI directly from Zed. First open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a New Gemini CLI thread.
+As of [Zed Stable v0.201.5](https://zed.dev/releases/stable/0.201.5) you should be able to use Gemini CLI directly from Zed. First open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a new Gemini CLI thread.
 
-If you'd like to bind this to a keyboard shortcut, you can do so by editing your keybindings file to include:
+If you'd like to bind this to a keyboard shortcut, you can do so by editing your `keymap.json` file via the `zed: open keymap` command to include:
 
 ```json
 [
@@ -40,23 +41,63 @@ The instructions to upgrade Gemini depend on how you originally installed it, bu
 
 After you have Gemini CLI running, you'll be prompted to choose your authentication method.
 
-Most users should click the "Log in with Google". This will cause a browser window to pop-up and auth directly with Gemini CLI. Zed does not see your oauth or access tokens in this case.
+Most users should click the "Log in with Google". This will cause a browser window to pop-up and auth directly with Gemini CLI. Zed does not see your OAuth or access tokens in this case.
 
 You can also use the "Gemini API Key". If you select this, and have the `GEMINI_API_KEY` set, then we will use that. Otherwise Zed will prompt you for an API key which will be stored securely in your keychain, and used to start Gemini CLI from within Zed.
 
-The "Vertex AI" option is for those who are using Vertex AI, and have already configured their environment correctly.
+The "Vertex AI" option is for those who are using [Vertex AI](https://cloud.google.com/vertex-ai), and have already configured their environment correctly.
 
 For more information, see the [Gemini CLI docs](https://github.com/google-gemini/gemini-cli/blob/main/docs/index.md).
 
 ### Usage
 
 Similar to Zed's first-party agent, you can use Gemini CLI to do anything that you need.
-
-You can @-mention files, recent threads, symbols, or fetch the web.
+And to give it context, you can @-mention files, recent threads, symbols, or fetch the web.
 
 > Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, checkpointing, and using the agent in SSH projects.
 > We hope to add these features in the near future.
 
+## Claude Code
+
+Similar to Gemini CLI, you can also run [Claude Code](https://www.anthropic.com/claude-code) directly via Zed's [agent panel](./agent-panel.md).
+Under the hood, Zed runs Claude Code and communicate to it over ACP, through [a dedicated adapter](https://github.com/zed-industries/claude-code-acp).
+
+### Getting Started
+
+Open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a new Claude Code thread.
+
+If you'd like to bind this to a keyboard shortcut, you can do so by editing your `keymap.json` file via the `zed: open keymap` command to include:
+
+```json
+[
+  {
+    "bindings": {
+      "cmd-alt-c": ["agent::NewExternalAgentThread", { "agent": "claude_code" }]
+    }
+  }
+]
+```
+
+#### Installation
+
+If you don't yet have Claude Code installed, then Zed will install a version for you.
+If you do, then we will use the version of Claude Code on your path.
+
+### Usage
+
+Similar to Zed's first-party agent, you can use Claude Code to do anything that you need.
+And to give it context, you can @-mention files, recent threads, symbols, or fetch the web.
+
+In complement to talking to it [over ACP](https://agentclientprotocol.com), Zed relies on the [Claude Code SDK](https://docs.anthropic.com/en/docs/claude-code/sdk/sdk-overview) to support some of its specific features.
+However, the SDK doesn't yet expose everything needed to fully support all of them:
+
+- Slash Commands: A subset of [built-in commands](https://docs.anthropic.com/en/docs/claude-code/slash-commands#built-in-slash-commands) are supported, while [custom slash commands](https://docs.anthropic.com/en/docs/claude-code/slash-commands#custom-slash-commands) are fully supported.
+- [Subagents](https://docs.anthropic.com/en/docs/claude-code/sub-agents) are supported.
+- [Hooks](https://docs.anthropic.com/en/docs/claude-code/hooks-guide) are currently _not_ supported.
+
+> Also note that some [first-party agent](./agent-panel.md) features don't yet work with Claude Code: editing past messages, resuming threads from history, checkpointing, and using the agent in SSH projects.
+> We hope to add these features in the near future.
+
 ## Add Custom Agents {#add-custom-agents}
 
 You can run any agent speaking ACP in Zed by changing your settings as follows:
diff --git a/docs/src/ai/overview.md b/docs/src/ai/overview.md
index 8bd45240fd..55d37ea352 100644
--- a/docs/src/ai/overview.md
+++ b/docs/src/ai/overview.md
@@ -14,7 +14,7 @@ Learn how to get started using AI with Zed and all its capabilities.
 
 ## Agentic Editing
 
-- [Agent Panel](./agent-panel.md): Create and manage interactions with language models.
+- [Agent Panel](./agent-panel.md): Create and manage interactions with LLM agents.
 
 - [Rules](./rules.md): How to define rules for AI interactions.
 

From 13de400a2acc809bc4d69e38ee3a166d6d412614 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 4 Sep 2025 00:03:48 +0530
Subject: [PATCH 576/823] editor: Do not correct text contrast on non-opaque
 editor (#37471)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t know the background color behind a non-opaque editor, so we
should skip contrast correction in that case. This prevents
single-editor mode (which is always transparent) from showing weird text
colors when text is selected.

We can’t account for the actual background during contrast correction
because we compute contrast outside gpui, while the actual color
blending happens inside gpui during drawing.

<img width="522" height="145" alt="image"
src="https://github.com/user-attachments/assets/6ee71475-f666-482d-87e6-15cf4c4fceef"
/>

Release Notes:

- Fixed an issue where Command Palette text looked faded when selected.
---
 crates/editor/src/element.rs | 8 ++++++--
 crates/gpui/src/color.rs     | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index fd5e544725..c21d31aa5c 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3284,6 +3284,10 @@ impl EditorElement {
         if rows.start >= rows.end {
             return Vec::new();
         }
+        if !base_background.is_opaque() {
+            // We don't actually know what color is behind this editor.
+            return Vec::new();
+        }
         let highlight_iter = highlight_ranges.iter().cloned();
         let selection_iter = selections.iter().flat_map(|(player_color, layouts)| {
             let color = player_color.selection;
@@ -11005,7 +11009,7 @@ mod tests {
 
     #[gpui::test]
     fn test_merge_overlapping_ranges() {
-        let base_bg = Hsla::default();
+        let base_bg = Hsla::white();
         let color1 = Hsla {
             h: 0.0,
             s: 0.5,
@@ -11075,7 +11079,7 @@ mod tests {
 
     #[gpui::test]
     fn test_bg_segments_per_row() {
-        let base_bg = Hsla::default();
+        let base_bg = Hsla::white();
 
         // Case A: selection spans three display rows: row 1 [5, end), full row 2, row 3 [0, 7)
         {
diff --git a/crates/gpui/src/color.rs b/crates/gpui/src/color.rs
index cb7329c03f..93c69744a6 100644
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -473,6 +473,11 @@ impl Hsla {
         self.a == 0.0
     }
 
+    /// Returns true if the HSLA color is fully opaque, false otherwise.
+    pub fn is_opaque(&self) -> bool {
+        self.a == 1.0
+    }
+
     /// Blends `other` on top of `self` based on `other`'s alpha value. The resulting color is a combination of `self`'s and `other`'s colors.
     ///
     /// If `other`'s alpha value is 1.0 or greater, `other` color is fully opaque, thus `other` is returned as the output color.

From 6bd52518821142b0d66a105220b0e1cc0c421930 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 3 Sep 2025 14:25:30 -0500
Subject: [PATCH 577/823] settings_ui: Add test for default values (#37466)

Closes #ISSUE

Adds a test that checks that all settings have default values in
`default.json`. Currently only tests that settings supported by
SettingsUi have defaults, as more settings are added to the settings
editor they will be added to the test as well.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 Cargo.lock                              |  1 +
 crates/settings/src/settings_ui_core.rs |  3 +-
 crates/settings_ui/Cargo.toml           |  5 ++
 crates/settings_ui/src/settings_ui.rs   | 68 +++++++++++++++++++++++--
 crates/zed/Cargo.toml                   |  1 +
 crates/zed/src/zed.rs                   | 30 +++++++++++
 6 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 88150a2931..239323517c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14906,6 +14906,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "command_palette_hooks",
+ "debugger_ui",
  "editor",
  "feature_flags",
  "gpui",
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index 8ab744f5a8..9086d3c745 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -27,6 +27,7 @@ pub struct SettingsUiEntry {
     /// The path in the settings JSON file for this setting. Relative to parent
     /// None implies `#[serde(flatten)]` or `Settings::KEY.is_none()` for top level settings
     pub path: Option<&'static str>,
+    /// What is displayed for the text for this entry
     pub title: &'static str,
     pub item: SettingsUiItem,
 }
@@ -95,7 +96,7 @@ impl<T: serde::Serialize> SettingsValue<T> {
 
 pub struct SettingsUiItemDynamic {
     pub options: Vec<SettingsUiEntry>,
-    pub determine_option: fn(&serde_json::Value, &mut App) -> usize,
+    pub determine_option: fn(&serde_json::Value, &App) -> usize,
 }
 
 pub struct SettingsUiItemGroup {
diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml
index 7c2b81aee0..3ecef880d2 100644
--- a/crates/settings_ui/Cargo.toml
+++ b/crates/settings_ui/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/settings_ui.rs"
 
 [features]
 default = []
+test-support = []
 
 [dependencies]
 anyhow.workspace = true
@@ -29,6 +30,10 @@ ui.workspace = true
 workspace.workspace = true
 workspace-hack.workspace = true
 
+
+[dev-dependencies]
+debugger_ui.workspace = true
+
 # Uncomment other workspace dependencies as needed
 # assistant.workspace = true
 # client.workspace = true
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 80e82a3049..f316a31878 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -151,7 +151,9 @@ struct UiEntry {
     next_sibling: Option<usize>,
     // expanded: bool,
     render: Option<SettingsUiItemSingle>,
-    select_descendant: Option<fn(&serde_json::Value, &mut App) -> usize>,
+    /// For dynamic items this is a way to select a value from a list of values
+    /// this is always none for non-dynamic items
+    select_descendant: Option<fn(&serde_json::Value, &App) -> usize>,
 }
 
 impl UiEntry {
@@ -177,7 +179,7 @@ impl UiEntry {
     }
 }
 
-struct SettingsUiTree {
+pub struct SettingsUiTree {
     root_entry_indices: Vec<usize>,
     entries: Vec<UiEntry>,
     active_entry_index: usize,
@@ -242,7 +244,7 @@ fn build_tree_item(
 }
 
 impl SettingsUiTree {
-    fn new(cx: &App) -> Self {
+    pub fn new(cx: &App) -> Self {
         let settings_store = SettingsStore::global(cx);
         let mut tree = vec![];
         let mut root_entry_indices = vec![];
@@ -269,6 +271,62 @@ impl SettingsUiTree {
             active_entry_index,
         }
     }
+
+    // todo(settings_ui): Make sure `Item::None` paths are added to the paths tree,
+    // so that we can keep none/skip and still test in CI that all settings have
+    #[cfg(feature = "test-support")]
+    pub fn all_paths(&self, cx: &App) -> Vec<Vec<&'static str>> {
+        fn all_paths_rec(
+            tree: &[UiEntry],
+            paths: &mut Vec<Vec<&'static str>>,
+            current_path: &mut Vec<&'static str>,
+            idx: usize,
+            cx: &App,
+        ) {
+            let child = &tree[idx];
+            let mut pushed_path = false;
+            if let Some(path) = child.path.as_ref() {
+                current_path.push(path);
+                paths.push(current_path.clone());
+                pushed_path = true;
+            }
+            // todo(settings_ui): handle dynamic nodes here
+            let selected_descendant_index = child
+                .select_descendant
+                .map(|select_descendant| {
+                    read_settings_value_from_path(
+                        SettingsStore::global(cx).raw_default_settings(),
+                        &current_path,
+                    )
+                    .map(|value| select_descendant(value, cx))
+                })
+                .and_then(|selected_descendant_index| {
+                    selected_descendant_index.map(|index| child.nth_descendant_index(tree, index))
+                });
+
+            if let Some(selected_descendant_index) = selected_descendant_index {
+                // just silently fail if we didn't find a setting value for the path
+                if let Some(descendant_index) = selected_descendant_index {
+                    all_paths_rec(tree, paths, current_path, descendant_index, cx);
+                }
+            } else if let Some(desc_idx) = child.first_descendant_index() {
+                let mut desc_idx = Some(desc_idx);
+                while let Some(descendant_index) = desc_idx {
+                    all_paths_rec(&tree, paths, current_path, descendant_index, cx);
+                    desc_idx = tree[descendant_index].next_sibling;
+                }
+            }
+            if pushed_path {
+                current_path.pop();
+            }
+        }
+
+        let mut paths = Vec::new();
+        for &index in &self.root_entry_indices {
+            all_paths_rec(&self.entries, &mut paths, &mut Vec::new(), index, cx);
+        }
+        paths
+    }
 }
 
 fn render_nav(tree: &SettingsUiTree, _window: &mut Window, cx: &mut Context<SettingsPage>) -> Div {
@@ -444,9 +502,9 @@ fn render_item_single(
     }
 }
 
-fn read_settings_value_from_path<'a>(
+pub fn read_settings_value_from_path<'a>(
     settings_contents: &'a serde_json::Value,
-    path: &[&'static str],
+    path: &[&str],
 ) -> Option<&'a serde_json::Value> {
     // todo(settings_ui) make non recursive, and move to `settings` alongside SettingsValue, and add method to SettingsValue to get nested
     let Some((key, remaining)) = path.split_first() else {
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index f82f544acc..9aceec1fbe 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -188,6 +188,7 @@ itertools.workspace = true
 language = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
+settings_ui = { workspace = true, features = ["test-support"] }
 terminal_view = { workspace = true, features = ["test-support"] }
 tree-sitter-md.workspace = true
 tree-sitter-rust.workspace = true
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index d0e4687a13..96f0f261dc 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4855,4 +4855,34 @@ mod tests {
             "BUG FOUND: Project settings were overwritten when opening via command - original custom content was lost"
         );
     }
+
+    #[gpui::test]
+    fn test_settings_defaults(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            settings::init(cx);
+            workspace::init_settings(cx);
+            title_bar::init(cx);
+            editor::init_settings(cx);
+            debugger_ui::init(cx);
+        });
+        let default_json =
+            cx.read(|cx| cx.global::<SettingsStore>().raw_default_settings().clone());
+
+        let all_paths = cx.read(|cx| settings_ui::SettingsUiTree::new(cx).all_paths(cx));
+        let mut failures = Vec::new();
+        for path in all_paths {
+            if settings_ui::read_settings_value_from_path(&default_json, &path).is_none() {
+                failures.push(path);
+            }
+        }
+        if !failures.is_empty() {
+            panic!(
+                "No default value found for paths: {:#?}",
+                failures
+                    .into_iter()
+                    .map(|path| path.join("."))
+                    .collect::<Vec<_>>()
+            );
+        }
+    }
 }

From 0e76cc803634df61621b0b2a1382dc682196ca14 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 3 Sep 2025 16:39:04 -0300
Subject: [PATCH 578/823] acp: Display a new version call out when one is
 available (#37479)

<img width="500" alt="CleanShot 2025-09-03 at 16 13 59@2x"
src="https://github.com/user-attachments/assets/beb91365-28e2-4f87-a2c5-7136d37382c7"></img>



Release Notes:

- Agent Panel: Display a callout when a new version of an external agent
is available

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/agent_servers/src/agent_servers.rs |  17 +++-
 crates/agent_servers/src/e2e_tests.rs     |   2 +-
 crates/agent_ui/src/acp/message_editor.rs |   2 +-
 crates/agent_ui/src/acp/thread_view.rs    | 101 +++++++++++++++++-----
 4 files changed, 95 insertions(+), 27 deletions(-)

diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index c610c53ea8..6ac81639ca 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -45,11 +45,20 @@ pub fn init(cx: &mut App) {
 pub struct AgentServerDelegate {
     project: Entity<Project>,
     status_tx: Option<watch::Sender<SharedString>>,
+    new_version_available: Option<watch::Sender<Option<String>>>,
 }
 
 impl AgentServerDelegate {
-    pub fn new(project: Entity<Project>, status_tx: Option<watch::Sender<SharedString>>) -> Self {
-        Self { project, status_tx }
+    pub fn new(
+        project: Entity<Project>,
+        status_tx: Option<watch::Sender<SharedString>>,
+        new_version_tx: Option<watch::Sender<Option<String>>>,
+    ) -> Self {
+        Self {
+            project,
+            status_tx,
+            new_version_available: new_version_tx,
+        }
     }
 
     pub fn project(&self) -> &Entity<Project> {
@@ -73,6 +82,7 @@ impl AgentServerDelegate {
             )));
         };
         let status_tx = self.status_tx;
+        let new_version_available = self.new_version_available;
 
         cx.spawn(async move |cx| {
             if !ignore_system_version {
@@ -160,6 +170,9 @@ impl AgentServerDelegate {
                                 )
                                 .await
                                 .log_err();
+                                if let Some(mut new_version_available) = new_version_available {
+                                    new_version_available.send(Some(latest_version)).ok();
+                                }
                             }
                         }
                     })
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 7988b86081..f801ef2468 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -498,7 +498,7 @@ pub async fn new_test_thread(
     current_dir: impl AsRef<Path>,
     cx: &mut TestAppContext,
 ) -> Entity<AcpThread> {
-    let delegate = AgentServerDelegate::new(project.clone(), None);
+    let delegate = AgentServerDelegate::new(project.clone(), None, None);
 
     let connection = cx
         .update(|cx| server.connect(current_dir.as_ref(), delegate, cx))
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index ebe0e5c1c6..da121bb7a4 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -700,7 +700,7 @@ impl MessageEditor {
             self.project.read(cx).fs().clone(),
             self.history_store.clone(),
         ));
-        let delegate = AgentServerDelegate::new(self.project.clone(), None);
+        let delegate = AgentServerDelegate::new(self.project.clone(), None, None);
         let connection = server.connect(Path::new(""), delegate, cx);
         cx.spawn(async move |_, cx| {
             let agent = connection.await?;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 992e12177a..5269b8b0f7 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -46,7 +46,7 @@ use text::Anchor;
 use theme::ThemeSettings;
 use ui::{
     Callout, CommonAnimationExt, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding,
-    PopoverMenuHandle, Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
+    PopoverMenuHandle, Scrollbar, ScrollbarState, SpinnerLabel, TintColor, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -288,6 +288,7 @@ pub struct AcpThreadView {
     prompt_capabilities: Rc<Cell<PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     is_loading_contents: bool,
+    new_server_version_available: Option<SharedString>,
     _cancel_task: Option<Task<()>>,
     _subscriptions: [Subscription; 3],
 }
@@ -416,9 +417,23 @@ impl AcpThreadView {
             _subscriptions: subscriptions,
             _cancel_task: None,
             focus_handle: cx.focus_handle(),
+            new_server_version_available: None,
         }
     }
 
+    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.thread_state = Self::initial_state(
+            self.agent.clone(),
+            None,
+            self.workspace.clone(),
+            self.project.clone(),
+            window,
+            cx,
+        );
+        self.new_server_version_available.take();
+        cx.notify();
+    }
+
     fn initial_state(
         agent: Rc<dyn AgentServer>,
         resume_thread: Option<DbThreadMetadata>,
@@ -451,8 +466,13 @@ impl AcpThreadView {
             })
             .next()
             .unwrap_or_else(|| paths::home_dir().as_path().into());
-        let (tx, mut rx) = watch::channel("Loading…".into());
-        let delegate = AgentServerDelegate::new(project.clone(), Some(tx));
+        let (status_tx, mut status_rx) = watch::channel("Loading…".into());
+        let (new_version_available_tx, mut new_version_available_rx) = watch::channel(None);
+        let delegate = AgentServerDelegate::new(
+            project.clone(),
+            Some(status_tx),
+            Some(new_version_available_tx),
+        );
 
         let connect_task = agent.connect(&root_dir, delegate, cx);
         let load_task = cx.spawn_in(window, async move |this, cx| {
@@ -627,10 +647,23 @@ impl AcpThreadView {
             .log_err();
         });
 
+        cx.spawn(async move |this, cx| {
+            while let Ok(new_version) = new_version_available_rx.recv().await {
+                if let Some(new_version) = new_version {
+                    this.update(cx, |this, cx| {
+                        this.new_server_version_available = Some(new_version.into());
+                        cx.notify();
+                    })
+                    .log_err();
+                }
+            }
+        })
+        .detach();
+
         let loading_view = cx.new(|cx| {
             let update_title_task = cx.spawn(async move |this, cx| {
                 loop {
-                    let status = rx.recv().await?;
+                    let status = status_rx.recv().await?;
                     this.update(cx, |this: &mut LoadingView, cx| {
                         this.title = status;
                         cx.notify();
@@ -672,15 +705,7 @@ impl AcpThreadView {
                             .map_or(false, |provider| provider.is_authenticated(cx))
                     {
                         this.update(cx, |this, cx| {
-                            this.thread_state = Self::initial_state(
-                                agent.clone(),
-                                None,
-                                this.workspace.clone(),
-                                this.project.clone(),
-                                window,
-                                cx,
-                            );
-                            cx.notify();
+                            this.reset(window, cx);
                         })
                         .ok();
                     }
@@ -1443,7 +1468,6 @@ impl AcpThreadView {
         cx.notify();
         self.auth_task =
             Some(cx.spawn_in(window, {
-                let project = self.project.clone();
                 let agent = self.agent.clone();
                 async move |this, cx| {
                     let result = authenticate.await;
@@ -1472,14 +1496,7 @@ impl AcpThreadView {
                             }
                             this.handle_thread_error(err, cx);
                         } else {
-                            this.thread_state = Self::initial_state(
-                                agent,
-                                None,
-                                this.workspace.clone(),
-                                project.clone(),
-                                window,
-                                cx,
-                            )
+                            this.reset(window, cx);
                         }
                         this.auth_task.take()
                     })
@@ -1501,7 +1518,7 @@ impl AcpThreadView {
         let cwd = project.first_project_directory(cx);
         let shell = project.terminal_settings(&cwd, cx).shell.clone();
 
-        let delegate = AgentServerDelegate::new(project_entity.clone(), None);
+        let delegate = AgentServerDelegate::new(project_entity.clone(), None, None);
         let command = ClaudeCode::login_command(delegate, cx);
 
         window.spawn(cx, async move |cx| {
@@ -4800,6 +4817,38 @@ impl AcpThreadView {
         Some(div().child(content))
     }
 
+    fn render_new_version_callout(&self, version: &SharedString, cx: &mut Context<Self>) -> Div {
+        v_flex().w_full().justify_end().child(
+            h_flex()
+                .p_2()
+                .pr_3()
+                .w_full()
+                .gap_1p5()
+                .border_t_1()
+                .border_color(cx.theme().colors().border)
+                .bg(cx.theme().colors().element_background)
+                .child(
+                    h_flex()
+                        .flex_1()
+                        .gap_1p5()
+                        .child(
+                            Icon::new(IconName::Download)
+                                .color(Color::Accent)
+                                .size(IconSize::Small),
+                        )
+                        .child(Label::new("New version available").size(LabelSize::Small)),
+                )
+                .child(
+                    Button::new("update-button", format!("Update to v{}", version))
+                        .label_size(LabelSize::Small)
+                        .style(ButtonStyle::Tinted(TintColor::Accent))
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            this.reset(window, cx);
+                        })),
+                ),
+        )
+    }
+
     fn get_current_model_name(&self, cx: &App) -> SharedString {
         // For native agent (Zed Agent), use the specific model name (e.g., "Claude 3.5 Sonnet")
         // For ACP agents, use the agent name (e.g., "Claude Code", "Gemini CLI")
@@ -5210,6 +5259,12 @@ impl Render for AcpThreadView {
             })
             .children(self.render_thread_retry_status_callout(window, cx))
             .children(self.render_thread_error(window, cx))
+            .when_some(
+                self.new_server_version_available.as_ref().filter(|_| {
+                    !has_messages || !matches!(self.thread_state, ThreadState::Ready { .. })
+                }),
+                |this, version| this.child(self.render_new_version_callout(&version, cx)),
+            )
             .children(
                 if let Some(usage_callout) = self.render_usage_callout(line_height, cx) {
                     Some(usage_callout.into_any_element())

From eedfc5be5aad0a043aec03ebb922e7ee5e5fc9b3 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 3 Sep 2025 15:47:39 -0400
Subject: [PATCH 579/823] acp: Improve handling of invalid external agent
 server downloads (#37465)

Related to #37213, #37150

When listing previously-downloaded versions of an external agent, don't
try to use any downloads that are missing the agent entrypoint
(indicating that they're corrupt/unusable), and delete those versions,
so that we can attempt to download the latest version again.

Also report clearer errors when failing to start a session due to an
agent server entrypoint or root directory not existing.

Release Notes:

- N/A
---
 crates/agent_servers/src/agent_servers.rs | 27 ++++++++++++++---------
 crates/agent_servers/src/claude.rs        |  8 +++++++
 crates/agent_servers/src/gemini.rs        | 12 ++++++++--
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 6ac81639ca..e214dabfc7 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -111,9 +111,11 @@ impl AgentServerDelegate {
                         continue;
                     };
 
-                    if let Some(version) = file_name
-                        .to_str()
-                        .and_then(|name| semver::Version::from_str(&name).ok())
+                    if let Some(name) = file_name.to_str()
+                        && let Some(version) = semver::Version::from_str(name).ok()
+                        && fs
+                            .is_file(&dir.join(file_name).join(&entrypoint_path))
+                            .await
                     {
                         versions.push((version, file_name.to_owned()));
                     } else {
@@ -156,6 +158,7 @@ impl AgentServerDelegate {
                     cx.background_spawn({
                         let file_name = file_name.clone();
                         let dir = dir.clone();
+                        let fs = fs.clone();
                         async move {
                             let latest_version =
                                 node_runtime.npm_package_latest_version(&package_name).await;
@@ -184,7 +187,7 @@ impl AgentServerDelegate {
                     }
                     let dir = dir.clone();
                     cx.background_spawn(Self::download_latest_version(
-                        fs,
+                        fs.clone(),
                         dir.clone(),
                         node_runtime,
                         package_name,
@@ -192,14 +195,18 @@ impl AgentServerDelegate {
                     .await?
                     .into()
                 };
+
+                let agent_server_path = dir.join(version).join(entrypoint_path);
+                let agent_server_path_exists = fs.is_file(&agent_server_path).await;
+                anyhow::ensure!(
+                    agent_server_path_exists,
+                    "Missing entrypoint path {} after installation",
+                    agent_server_path.to_string_lossy()
+                );
+
                 anyhow::Ok(AgentServerCommand {
                     path: node_path,
-                    args: vec![
-                        dir.join(version)
-                            .join(entrypoint_path)
-                            .to_string_lossy()
-                            .to_string(),
-                    ],
+                    args: vec![agent_server_path.to_string_lossy().to_string()],
                     env: Default::default(),
                 })
             })
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 0a4f152e8a..a02d8c37c1 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -76,6 +76,7 @@ impl AgentServer for ClaudeCode {
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let root_dir = root_dir.to_path_buf();
+        let fs = delegate.project().read(cx).fs().clone();
         let server_name = self.name();
         let settings = cx.read_global(|settings: &SettingsStore, _| {
             settings.get::<AllAgentServersSettings>(None).claude.clone()
@@ -109,6 +110,13 @@ impl AgentServer for ClaudeCode {
                     .insert("ANTHROPIC_API_KEY".to_owned(), api_key.key);
             }
 
+            let root_dir_exists = fs.is_dir(&root_dir).await;
+            anyhow::ensure!(
+                root_dir_exists,
+                "Session root {} does not exist or is not a directory",
+                root_dir.to_string_lossy()
+            );
+
             crate::acp::connect(server_name, command.clone(), &root_dir, cx).await
         })
     }
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index a1553d288a..b58ad703cd 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -36,6 +36,7 @@ impl AgentServer for Gemini {
         cx: &mut App,
     ) -> Task<Result<Rc<dyn AgentConnection>>> {
         let root_dir = root_dir.to_path_buf();
+        let fs = delegate.project().read(cx).fs().clone();
         let server_name = self.name();
         let settings = cx.read_global(|settings: &SettingsStore, _| {
             settings.get::<AllAgentServersSettings>(None).gemini.clone()
@@ -74,6 +75,13 @@ impl AgentServer for Gemini {
                     .insert("GEMINI_API_KEY".to_owned(), api_key.key);
             }
 
+            let root_dir_exists = fs.is_dir(&root_dir).await;
+            anyhow::ensure!(
+                root_dir_exists,
+                "Session root {} does not exist or is not a directory",
+                root_dir.to_string_lossy()
+            );
+
             let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
             match &result {
                 Ok(connection) => {
@@ -92,7 +100,7 @@ impl AgentServer for Gemini {
                         log::error!("connected to gemini, but missing prompt_capabilities.image (version is {current_version})");
                         return Err(LoadError::Unsupported {
                             current_version: current_version.into(),
-                            command: command.path.to_string_lossy().to_string().into(),
+                            command: (command.path.to_string_lossy().to_string() + " " + &command.args.join(" ")).into(),
                             minimum_version: Self::MINIMUM_VERSION.into(),
                         }
                         .into());
@@ -129,7 +137,7 @@ impl AgentServer for Gemini {
                     if !supported {
                         return Err(LoadError::Unsupported {
                             current_version: current_version.into(),
-                            command: command.path.to_string_lossy().to_string().into(),
+                            command: (command.path.to_string_lossy().to_string() + " " + &command.args.join(" ")).into(),
                             minimum_version: Self::MINIMUM_VERSION.into(),
                         }
                         .into());

From bb2d833373400d4debf416e90d5b2870f75dde96 Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Wed, 3 Sep 2025 21:52:47 +0200
Subject: [PATCH 580/823] Revert "gpui: Fix overflow_hidden to support clip
 with border radius" (#37480)

This reverts commit 40199266b6634cc3165f3842abae1d562ef4dcca.

The issue with the commit is: ContentMask<Pixels>::intersect is doing
intersection of corner radii which makes inner containers use the max
corner radius out of all the parents when it should be more complex to
correctly clip children (clip sorting..?)

Release Notes:

- N/A
---
 crates/editor/src/element.rs                  |  25 +-
 crates/gpui/examples/content_mask.rs          | 228 ------------------
 crates/gpui/src/elements/list.rs              |  78 ++----
 crates/gpui/src/elements/uniform_list.rs      |   5 +-
 crates/gpui/src/platform/blade/shaders.wgsl   |  60 ++---
 crates/gpui/src/platform/mac/shaders.metal    |  24 +-
 crates/gpui/src/platform/windows/shaders.hlsl |  49 ++--
 crates/gpui/src/style.rs                      |  66 +++--
 crates/gpui/src/window.rs                     |  23 +-
 crates/terminal_view/src/terminal_element.rs  |   2 +-
 crates/ui/src/components/scrollbar.rs         |  16 +-
 11 files changed, 130 insertions(+), 446 deletions(-)
 delete mode 100644 crates/gpui/examples/content_mask.rs

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index c21d31aa5c..9822ec23d5 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -6043,7 +6043,6 @@ impl EditorElement {
         window.with_content_mask(
             Some(ContentMask {
                 bounds: layout.position_map.text_hitbox.bounds,
-                ..Default::default()
             }),
             |window| {
                 let editor = self.editor.read(cx);
@@ -6986,15 +6985,9 @@ impl EditorElement {
             } else {
                 let mut bounds = layout.hitbox.bounds;
                 bounds.origin.x += layout.gutter_hitbox.bounds.size.width;
-                window.with_content_mask(
-                    Some(ContentMask {
-                        bounds,
-                        ..Default::default()
-                    }),
-                    |window| {
-                        block.element.paint(window, cx);
-                    },
-                )
+                window.with_content_mask(Some(ContentMask { bounds }), |window| {
+                    block.element.paint(window, cx);
+                })
             }
         }
     }
@@ -8297,13 +8290,9 @@ impl Element for EditorElement {
         }
 
         let rem_size = self.rem_size(cx);
-        let content_mask = ContentMask {
-            bounds,
-            ..Default::default()
-        };
         window.with_rem_size(rem_size, |window| {
             window.with_text_style(Some(text_style), |window| {
-                window.with_content_mask(Some(content_mask), |window| {
+                window.with_content_mask(Some(ContentMask { bounds }), |window| {
                     let (mut snapshot, is_read_only) = self.editor.update(cx, |editor, cx| {
                         (editor.snapshot(window, cx), editor.read_only(cx))
                     });
@@ -9411,13 +9400,9 @@ impl Element for EditorElement {
             ..Default::default()
         };
         let rem_size = self.rem_size(cx);
-        let content_mask = ContentMask {
-            bounds,
-            ..Default::default()
-        };
         window.with_rem_size(rem_size, |window| {
             window.with_text_style(Some(text_style), |window| {
-                window.with_content_mask(Some(content_mask), |window| {
+                window.with_content_mask(Some(ContentMask { bounds }), |window| {
                     self.paint_mouse_listeners(layout, window, cx);
                     self.paint_background(layout, window, cx);
                     self.paint_indent_guides(layout, window, cx);
diff --git a/crates/gpui/examples/content_mask.rs b/crates/gpui/examples/content_mask.rs
deleted file mode 100644
index 8d40cc5bba..0000000000
--- a/crates/gpui/examples/content_mask.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use gpui::{
-    App, Application, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px,
-    rgb, size,
-};
-
-struct Example {}
-
-impl Render for Example {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .font_family(".SystemUIFont")
-            .flex()
-            .flex_col()
-            .size_full()
-            .p_4()
-            .gap_4()
-            .bg(rgb(0x505050))
-            .justify_center()
-            .items_center()
-            .text_center()
-            .shadow_lg()
-            .text_sm()
-            .text_color(rgb(0xffffff))
-            .child(
-                div()
-                    .overflow_hidden()
-                    .rounded(px(32.))
-                    .border(px(8.))
-                    .border_color(gpui::white())
-                    .text_color(gpui::white())
-                    .child(
-                        div()
-                            .bg(gpui::black())
-                            .py_2()
-                            .px_7()
-                            .border_l_2()
-                            .border_r_2()
-                            .border_b_3()
-                            .border_color(gpui::red())
-                            .child("Let build applications with GPUI"),
-                    )
-                    .child(
-                        div()
-                            .bg(rgb(0x222222))
-                            .text_sm()
-                            .py_1()
-                            .px_7()
-                            .border_l_3()
-                            .border_r_3()
-                            .border_color(gpui::green())
-                            .child("The fast, productive UI framework for Rust"),
-                    )
-                    .child(
-                        div()
-                            .bg(rgb(0x222222))
-                            .w_full()
-                            .flex()
-                            .flex_row()
-                            .text_sm()
-                            .text_color(rgb(0xc0c0c0))
-                            .child(
-                                div()
-                                    .flex_1()
-                                    .p_2()
-                                    .border_3()
-                                    .border_dashed()
-                                    .border_color(gpui::blue())
-                                    .child("Rust"),
-                            )
-                            .child(
-                                div()
-                                    .flex_1()
-                                    .p_2()
-                                    .border_t_3()
-                                    .border_r_3()
-                                    .border_b_3()
-                                    .border_dashed()
-                                    .border_color(gpui::blue())
-                                    .child("GPU Rendering"),
-                            ),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .w(px(320.))
-                    .gap_1()
-                    .overflow_hidden()
-                    .rounded(px(16.))
-                    .child(
-                        div()
-                            .w_full()
-                            .p_2()
-                            .bg(gpui::red())
-                            .child("Clip background"),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .w(px(320.))
-                    .gap_1()
-                    .rounded(px(16.))
-                    .child(
-                        div()
-                            .w_full()
-                            .p_2()
-                            .bg(gpui::yellow())
-                            .text_color(gpui::black())
-                            .child("No content mask"),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .w(px(320.))
-                    .gap_1()
-                    .overflow_hidden()
-                    .rounded(px(16.))
-                    .child(
-                        div()
-                            .w_full()
-                            .p_2()
-                            .border_4()
-                            .border_color(gpui::blue())
-                            .bg(gpui::blue().alpha(0.4))
-                            .child("Clip borders"),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .w(px(320.))
-                    .gap_1()
-                    .overflow_hidden()
-                    .rounded(px(20.))
-                    .child(
-                        div().w_full().border_2().border_color(gpui::black()).child(
-                            div()
-                                .size_full()
-                                .bg(gpui::green().alpha(0.4))
-                                .p_2()
-                                .border_8()
-                                .border_color(gpui::green())
-                                .child("Clip nested elements"),
-                        ),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .w(px(320.))
-                    .gap_1()
-                    .overflow_hidden()
-                    .rounded(px(32.))
-                    .child(
-                        div()
-                            .w_full()
-                            .p_2()
-                            .bg(gpui::black())
-                            .border_2()
-                            .border_dashed()
-                            .rounded_lg()
-                            .border_color(gpui::white())
-                            .child("dash border full and rounded"),
-                    )
-                    .child(
-                        div()
-                            .w_full()
-                            .flex()
-                            .flex_row()
-                            .gap_2()
-                            .child(
-                                div()
-                                    .w_full()
-                                    .p_2()
-                                    .bg(gpui::black())
-                                    .border_x_2()
-                                    .border_dashed()
-                                    .rounded_lg()
-                                    .border_color(gpui::white())
-                                    .child("border x"),
-                            )
-                            .child(
-                                div()
-                                    .w_full()
-                                    .p_2()
-                                    .bg(gpui::black())
-                                    .border_y_2()
-                                    .border_dashed()
-                                    .rounded_lg()
-                                    .border_color(gpui::white())
-                                    .child("border y"),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .w_full()
-                            .p_2()
-                            .bg(gpui::black())
-                            .border_2()
-                            .border_dashed()
-                            .border_color(gpui::white())
-                            .child("border full and no rounded"),
-                    ),
-            )
-    }
-}
-
-fn main() {
-    Application::new().run(|cx: &mut App| {
-        let bounds = Bounds::centered(None, size(px(800.), px(600.)), cx);
-        cx.open_window(
-            WindowOptions {
-                window_bounds: Some(WindowBounds::Windowed(bounds)),
-                ..Default::default()
-            },
-            |_, cx| cx.new(|_| Example {}),
-        )
-        .unwrap();
-        cx.activate(true);
-    });
-}
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 9ae497cef9..ed4ca64e83 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -8,10 +8,10 @@
 //! If all of your elements are the same height, see [`crate::UniformList`] for a simpler API
 
 use crate::{
-    AnyElement, App, AvailableSpace, Bounds, ContentMask, Corners, DispatchPhase, Edges, Element,
-    EntityId, FocusHandle, GlobalElementId, Hitbox, HitboxBehavior, InspectorElementId,
-    IntoElement, Overflow, Pixels, Point, ScrollDelta, ScrollWheelEvent, Size, Style,
-    StyleRefinement, Styled, Window, point, px, size,
+    AnyElement, App, AvailableSpace, Bounds, ContentMask, DispatchPhase, Edges, Element, EntityId,
+    FocusHandle, GlobalElementId, Hitbox, HitboxBehavior, InspectorElementId, IntoElement,
+    Overflow, Pixels, Point, ScrollDelta, ScrollWheelEvent, Size, Style, StyleRefinement, Styled,
+    Window, point, px, size,
 };
 use collections::VecDeque;
 use refineable::Refineable as _;
@@ -705,7 +705,6 @@ impl StateInner {
         &mut self,
         bounds: Bounds<Pixels>,
         padding: Edges<Pixels>,
-        corner_radii: Corners<Pixels>,
         autoscroll: bool,
         render_item: &mut RenderItemFn,
         window: &mut Window,
@@ -729,15 +728,9 @@ impl StateInner {
                 let mut item_origin = bounds.origin + Point::new(px(0.), padding.top);
                 item_origin.y -= layout_response.scroll_top.offset_in_item;
                 for item in &mut layout_response.item_layouts {
-                    window.with_content_mask(
-                        Some(ContentMask {
-                            bounds,
-                            corner_radii,
-                        }),
-                        |window| {
-                            item.element.prepaint_at(item_origin, window, cx);
-                        },
-                    );
+                    window.with_content_mask(Some(ContentMask { bounds }), |window| {
+                        item.element.prepaint_at(item_origin, window, cx);
+                    });
 
                     if let Some(autoscroll_bounds) = window.take_autoscroll()
                         && autoscroll
@@ -959,34 +952,19 @@ impl Element for List {
             state.items = new_items;
         }
 
-        let rem_size = window.rem_size();
-        let padding = style.padding.to_pixels(bounds.size.into(), rem_size);
-        let corner_radii = style.corner_radii.to_pixels(rem_size);
-        let layout = match state.prepaint_items(
-            bounds,
-            padding,
-            corner_radii,
-            true,
-            &mut self.render_item,
-            window,
-            cx,
-        ) {
-            Ok(layout) => layout,
-            Err(autoscroll_request) => {
-                state.logical_scroll_top = Some(autoscroll_request);
-                state
-                    .prepaint_items(
-                        bounds,
-                        padding,
-                        corner_radii,
-                        false,
-                        &mut self.render_item,
-                        window,
-                        cx,
-                    )
-                    .unwrap()
-            }
-        };
+        let padding = style
+            .padding
+            .to_pixels(bounds.size.into(), window.rem_size());
+        let layout =
+            match state.prepaint_items(bounds, padding, true, &mut self.render_item, window, cx) {
+                Ok(layout) => layout,
+                Err(autoscroll_request) => {
+                    state.logical_scroll_top = Some(autoscroll_request);
+                    state
+                        .prepaint_items(bounds, padding, false, &mut self.render_item, window, cx)
+                        .unwrap()
+                }
+            };
 
         state.last_layout_bounds = Some(bounds);
         state.last_padding = Some(padding);
@@ -1004,17 +982,11 @@ impl Element for List {
         cx: &mut App,
     ) {
         let current_view = window.current_view();
-        window.with_content_mask(
-            Some(ContentMask {
-                bounds,
-                ..Default::default()
-            }),
-            |window| {
-                for item in &mut prepaint.layout.item_layouts {
-                    item.element.paint(window, cx);
-                }
-            },
-        );
+        window.with_content_mask(Some(ContentMask { bounds }), |window| {
+            for item in &mut prepaint.layout.item_layouts {
+                item.element.paint(window, cx);
+            }
+        });
 
         let list_state = self.state.clone();
         let height = bounds.size.height;
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index db3b8c8839..cdf90d4eb8 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -411,10 +411,7 @@ impl Element for UniformList {
                         (self.render_items)(visible_range.clone(), window, cx)
                     };
 
-                    let content_mask = ContentMask {
-                        bounds,
-                        ..Default::default()
-                    };
+                    let content_mask = ContentMask { bounds };
                     window.with_content_mask(Some(content_mask), |window| {
                         for (mut item, ix) in items.into_iter().zip(visible_range.clone()) {
                             let item_origin = padded_bounds.origin
diff --git a/crates/gpui/src/platform/blade/shaders.wgsl b/crates/gpui/src/platform/blade/shaders.wgsl
index dbab4237e3..95980b54fe 100644
--- a/crates/gpui/src/platform/blade/shaders.wgsl
+++ b/crates/gpui/src/platform/blade/shaders.wgsl
@@ -53,11 +53,6 @@ struct Corners {
     bottom_left: f32,
 }
 
-struct ContentMask {
-    bounds: Bounds,
-    corner_radii: Corners,
-}
-
 struct Edges {
     top: f32,
     right: f32,
@@ -445,7 +440,7 @@ struct Quad {
     order: u32,
     border_style: u32,
     bounds: Bounds,
-    content_mask: ContentMask,
+    content_mask: Bounds,
     background: Background,
     border_color: Hsla,
     corner_radii: Corners,
@@ -483,7 +478,7 @@ fn vs_quad(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) insta
     out.background_color1 = gradient.color1;
     out.border_color = hsla_to_rgba(quad.border_color);
     out.quad_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask.bounds);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask);
     return out;
 }
 
@@ -496,19 +491,8 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
 
     let quad = b_quads[input.quad_id];
 
-    // Signed distance field threshold for inclusion of pixels. 0.5 is the
-    // minimum distance between the center of the pixel and the edge.
-    let antialias_threshold = 0.5;
-
-    var background_color = gradient_color(quad.background, input.position.xy, quad.bounds,
+    let background_color = gradient_color(quad.background, input.position.xy, quad.bounds,
         input.background_solid, input.background_color0, input.background_color1);
-    var border_color = input.border_color;
-
-    // Apply content_mask corner radii clipping
-    let clip_sdf = quad_sdf(input.position.xy, quad.content_mask.bounds, quad.content_mask.corner_radii);
-    let clip_alpha = saturate(antialias_threshold - clip_sdf);
-    background_color.a *= clip_alpha;
-    border_color.a *= clip_alpha;
 
     let unrounded = quad.corner_radii.top_left == 0.0 &&
         quad.corner_radii.bottom_left == 0.0 &&
@@ -529,6 +513,10 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
     let point = input.position.xy - quad.bounds.origin;
     let center_to_point = point - half_size;
 
+    // Signed distance field threshold for inclusion of pixels. 0.5 is the
+    // minimum distance between the center of the pixel and the edge.
+    let antialias_threshold = 0.5;
+
     // Radius of the nearest corner
     let corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
@@ -619,6 +607,8 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
 
     var color = background_color;
     if (border_sdf < antialias_threshold) {
+        var border_color = input.border_color;
+
         // Dashed border logic when border_style == 1
         if (quad.border_style == 1) {
             // Position along the perimeter in "dash space", where each dash
@@ -654,11 +644,7 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
                 let is_horizontal =
                         corner_center_to_point.x <
                         corner_center_to_point.y;
-                var border_width = select(border.y, border.x, is_horizontal);
-                // When border width of some side is 0, we need to use the other side width for dash velocity.
-                if (border_width == 0.0) {
-                    border_width = select(border.x, border.y, is_horizontal);
-                }
+                let border_width = select(border.y, border.x, is_horizontal);
                 dash_velocity = dv_numerator / border_width;
                 t = select(point.y, point.x, is_horizontal) * dash_velocity;
                 max_t = select(size.y, size.x, is_horizontal) * dash_velocity;
@@ -870,7 +856,7 @@ struct Shadow {
     blur_radius: f32,
     bounds: Bounds,
     corner_radii: Corners,
-    content_mask: ContentMask,
+    content_mask: Bounds,
     color: Hsla,
 }
 var<storage, read> b_shadows: array<Shadow>;
@@ -898,7 +884,7 @@ fn vs_shadow(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) ins
     out.position = to_device_position(unit_vertex, shadow.bounds);
     out.color = hsla_to_rgba(shadow.color);
     out.shadow_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, shadow.bounds, shadow.content_mask.bounds);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, shadow.bounds, shadow.content_mask);
     return out;
 }
 
@@ -913,6 +899,7 @@ fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
     let half_size = shadow.bounds.size / 2.0;
     let center = shadow.bounds.origin + half_size;
     let center_to_point = input.position.xy - center;
+
     let corner_radius = pick_corner_radius(center_to_point, shadow.corner_radii);
 
     // The signal is only non-zero in a limited range, so don't waste samples
@@ -1040,7 +1027,7 @@ struct Underline {
     order: u32,
     pad: u32,
     bounds: Bounds,
-    content_mask: ContentMask,
+    content_mask: Bounds,
     color: Hsla,
     thickness: f32,
     wavy: u32,
@@ -1064,7 +1051,7 @@ fn vs_underline(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index)
     out.position = to_device_position(unit_vertex, underline.bounds);
     out.color = hsla_to_rgba(underline.color);
     out.underline_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, underline.bounds, underline.content_mask.bounds);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, underline.bounds, underline.content_mask);
     return out;
 }
 
@@ -1106,7 +1093,7 @@ struct MonochromeSprite {
     order: u32,
     pad: u32,
     bounds: Bounds,
-    content_mask: ContentMask,
+    content_mask: Bounds,
     color: Hsla,
     tile: AtlasTile,
     transformation: TransformationMatrix,
@@ -1130,7 +1117,7 @@ fn vs_mono_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index
 
     out.tile_position = to_tile_position(unit_vertex, sprite.tile);
     out.color = hsla_to_rgba(sprite.color);
-    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask.bounds);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
     return out;
 }
 
@@ -1152,7 +1139,7 @@ struct PolychromeSprite {
     grayscale: u32,
     opacity: f32,
     bounds: Bounds,
-    content_mask: ContentMask,
+    content_mask: Bounds,
     corner_radii: Corners,
     tile: AtlasTile,
 }
@@ -1174,7 +1161,7 @@ fn vs_poly_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index
     out.position = to_device_position(unit_vertex, sprite.bounds);
     out.tile_position = to_tile_position(unit_vertex, sprite.tile);
     out.sprite_id = instance_id;
-    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask.bounds);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
     return out;
 }
 
@@ -1247,12 +1234,3 @@ fn fs_surface(input: SurfaceVarying) -> @location(0) vec4<f32> {
 
     return ycbcr_to_RGB * y_cb_cr;
 }
-
-fn max_corner_radii(a: Corners, b: Corners) -> Corners {
-    return Corners(
-        max(a.top_left, b.top_left),
-        max(a.top_right, b.top_right),
-        max(a.bottom_right, b.bottom_right),
-        max(a.bottom_left, b.bottom_left)
-    );
-}
diff --git a/crates/gpui/src/platform/mac/shaders.metal b/crates/gpui/src/platform/mac/shaders.metal
index 6aa1d18ee8..83c978b853 100644
--- a/crates/gpui/src/platform/mac/shaders.metal
+++ b/crates/gpui/src/platform/mac/shaders.metal
@@ -99,21 +99,8 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
                               constant Quad *quads
                               [[buffer(QuadInputIndex_Quads)]]) {
   Quad quad = quads[input.quad_id];
-
-  // Signed distance field threshold for inclusion of pixels. 0.5 is the
-  // minimum distance between the center of the pixel and the edge.
-  const float antialias_threshold = 0.5;
-
   float4 background_color = fill_color(quad.background, input.position.xy, quad.bounds,
     input.background_solid, input.background_color0, input.background_color1);
-  float4 border_color = input.border_color;
-
-  // Apply content_mask corner radii clipping
-  float clip_sdf = quad_sdf(input.position.xy, quad.content_mask.bounds,
-    quad.content_mask.corner_radii);
-  float clip_alpha = saturate(antialias_threshold - clip_sdf);
-  background_color.a *= clip_alpha;
-  border_color *= clip_alpha;
 
   bool unrounded = quad.corner_radii.top_left == 0.0 &&
     quad.corner_radii.bottom_left == 0.0 &&
@@ -134,6 +121,10 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
   float2 point = input.position.xy - float2(quad.bounds.origin.x, quad.bounds.origin.y);
   float2 center_to_point = point - half_size;
 
+  // Signed distance field threshold for inclusion of pixels. 0.5 is the
+  // minimum distance between the center of the pixel and the edge.
+  const float antialias_threshold = 0.5;
+
   // Radius of the nearest corner
   float corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
@@ -173,6 +164,7 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
     straight_border_inner_corner_to_point.x > 0.0 ||
     straight_border_inner_corner_to_point.y > 0.0;
 
+
   // Whether the point is far enough inside the quad, such that the pixels are
   // not affected by the straight border.
   bool is_within_inner_straight_border =
@@ -216,6 +208,8 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
 
   float4 color = background_color;
   if (border_sdf < antialias_threshold) {
+    float4 border_color = input.border_color;
+
     // Dashed border logic when border_style == 1
     if (quad.border_style == 1) {
       // Position along the perimeter in "dash space", where each dash
@@ -250,10 +244,6 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
         // perimeter. This way each line starts and ends with a dash.
         bool is_horizontal = corner_center_to_point.x < corner_center_to_point.y;
         float border_width = is_horizontal ? border.x : border.y;
-        // When border width of some side is 0, we need to use the other side width for dash velocity.
-        if (border_width == 0.0) {
-            border_width = is_horizontal ? border.y : border.x;
-        }
         dash_velocity = dv_numerator / border_width;
         t = is_horizontal ? point.x : point.y;
         t *= dash_velocity;
diff --git a/crates/gpui/src/platform/windows/shaders.hlsl b/crates/gpui/src/platform/windows/shaders.hlsl
index 296a6c825f..2cef54ae61 100644
--- a/crates/gpui/src/platform/windows/shaders.hlsl
+++ b/crates/gpui/src/platform/windows/shaders.hlsl
@@ -453,16 +453,11 @@ float quarter_ellipse_sdf(float2 pt, float2 radii) {
 **
 */
 
-struct ContentMask {
-    Bounds bounds;
-    Corners corner_radii;
-};
-
 struct Quad {
     uint order;
     uint border_style;
     Bounds bounds;
-    ContentMask content_mask;
+    Bounds content_mask;
     Background background;
     Hsla border_color;
     Corners corner_radii;
@@ -501,7 +496,7 @@ QuadVertexOutput quad_vertex(uint vertex_id: SV_VertexID, uint quad_id: SV_Insta
         quad.background.solid,
         quad.background.colors
     );
-    float4 clip_distance = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask.bounds);
+    float4 clip_distance = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask);
     float4 border_color = hsla_to_rgba(quad.border_color);
 
     QuadVertexOutput output;
@@ -517,21 +512,8 @@ QuadVertexOutput quad_vertex(uint vertex_id: SV_VertexID, uint quad_id: SV_Insta
 
 float4 quad_fragment(QuadFragmentInput input): SV_Target {
     Quad quad = quads[input.quad_id];
-
-    // Signed distance field threshold for inclusion of pixels. 0.5 is the
-    // minimum distance between the center of the pixel and the edge.
-    const float antialias_threshold = 0.5;
-
     float4 background_color = gradient_color(quad.background, input.position.xy, quad.bounds,
-        input.background_solid, input.background_color0, input.background_color1);
-    float4 border_color = input.border_color;
-
-    // Apply content_mask corner radii clipping
-    float clip_sdf = quad_sdf(input.position.xy, quad.content_mask.bounds,
-        quad.content_mask.corner_radii);
-    float clip_alpha = saturate(antialias_threshold - clip_sdf);
-    background_color.a *= clip_alpha;
-    border_color *= clip_alpha;
+    input.background_solid, input.background_color0, input.background_color1);
 
     bool unrounded = quad.corner_radii.top_left == 0.0 &&
         quad.corner_radii.top_right == 0.0 &&
@@ -552,6 +534,10 @@ float4 quad_fragment(QuadFragmentInput input): SV_Target {
     float2 the_point = input.position.xy - quad.bounds.origin;
     float2 center_to_point = the_point - half_size;
 
+    // Signed distance field threshold for inclusion of pixels. 0.5 is the
+    // minimum distance between the center of the pixel and the edge.
+    const float antialias_threshold = 0.5;
+
     // Radius of the nearest corner
     float corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
@@ -634,6 +620,7 @@ float4 quad_fragment(QuadFragmentInput input): SV_Target {
 
     float4 color = background_color;
     if (border_sdf < antialias_threshold) {
+        float4 border_color = input.border_color;
         // Dashed border logic when border_style == 1
         if (quad.border_style == 1) {
             // Position along the perimeter in "dash space", where each dash
@@ -668,10 +655,6 @@ float4 quad_fragment(QuadFragmentInput input): SV_Target {
                 // perimeter. This way each line starts and ends with a dash.
                 bool is_horizontal = corner_center_to_point.x < corner_center_to_point.y;
                 float border_width = is_horizontal ? border.x : border.y;
-                // When border width of some side is 0, we need to use the other side width for dash velocity.
-                if (border_width == 0.0) {
-                    border_width = is_horizontal ? border.y : border.x;
-                }
                 dash_velocity = dv_numerator / border_width;
                 t = is_horizontal ? the_point.x : the_point.y;
                 t *= dash_velocity;
@@ -822,7 +805,7 @@ struct Shadow {
     float blur_radius;
     Bounds bounds;
     Corners corner_radii;
-    ContentMask content_mask;
+    Bounds content_mask;
     Hsla color;
 };
 
@@ -851,7 +834,7 @@ ShadowVertexOutput shadow_vertex(uint vertex_id: SV_VertexID, uint shadow_id: SV
     bounds.size += 2.0 * margin;
 
     float4 device_position = to_device_position(unit_vertex, bounds);
-    float4 clip_distance = distance_from_clip_rect(unit_vertex, bounds, shadow.content_mask.bounds);
+    float4 clip_distance = distance_from_clip_rect(unit_vertex, bounds, shadow.content_mask);
     float4 color = hsla_to_rgba(shadow.color);
 
     ShadowVertexOutput output;
@@ -1004,7 +987,7 @@ struct Underline {
     uint order;
     uint pad;
     Bounds bounds;
-    ContentMask content_mask;
+    Bounds content_mask;
     Hsla color;
     float thickness;
     uint wavy;
@@ -1030,7 +1013,7 @@ UnderlineVertexOutput underline_vertex(uint vertex_id: SV_VertexID, uint underli
     Underline underline = underlines[underline_id];
     float4 device_position = to_device_position(unit_vertex, underline.bounds);
     float4 clip_distance = distance_from_clip_rect(unit_vertex, underline.bounds,
-                                                    underline.content_mask.bounds);
+                                                    underline.content_mask);
     float4 color = hsla_to_rgba(underline.color);
 
     UnderlineVertexOutput output;
@@ -1078,7 +1061,7 @@ struct MonochromeSprite {
     uint order;
     uint pad;
     Bounds bounds;
-    ContentMask content_mask;
+    Bounds content_mask;
     Hsla color;
     AtlasTile tile;
     TransformationMatrix transformation;
@@ -1105,7 +1088,7 @@ MonochromeSpriteVertexOutput monochrome_sprite_vertex(uint vertex_id: SV_VertexI
     MonochromeSprite sprite = mono_sprites[sprite_id];
     float4 device_position =
         to_device_position_transformed(unit_vertex, sprite.bounds, sprite.transformation);
-    float4 clip_distance = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask.bounds);
+    float4 clip_distance = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
     float2 tile_position = to_tile_position(unit_vertex, sprite.tile);
     float4 color = hsla_to_rgba(sprite.color);
 
@@ -1135,7 +1118,7 @@ struct PolychromeSprite {
     uint grayscale;
     float opacity;
     Bounds bounds;
-    ContentMask content_mask;
+    Bounds content_mask;
     Corners corner_radii;
     AtlasTile tile;
 };
@@ -1160,7 +1143,7 @@ PolychromeSpriteVertexOutput polychrome_sprite_vertex(uint vertex_id: SV_VertexI
     PolychromeSprite sprite = poly_sprites[sprite_id];
     float4 device_position = to_device_position(unit_vertex, sprite.bounds);
     float4 clip_distance = distance_from_clip_rect(unit_vertex, sprite.bounds,
-                                                    sprite.content_mask.bounds);
+                                                    sprite.content_mask);
     float2 tile_position = to_tile_position(unit_vertex, sprite.tile);
 
     PolychromeSpriteVertexOutput output;
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 09f598f9b0..5b69ce7fa6 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -601,19 +601,7 @@ impl Style {
                     (false, false) => Bounds::from_corners(min, max),
                 };
 
-                let corner_radii = self.corner_radii.to_pixels(rem_size);
-                let border_widths = self.border_widths.to_pixels(rem_size);
-                Some(ContentMask {
-                    bounds: Bounds {
-                        origin: bounds.origin - point(border_widths.left, border_widths.top),
-                        size: bounds.size
-                            + size(
-                                border_widths.left + border_widths.right,
-                                border_widths.top + border_widths.bottom,
-                            ),
-                    },
-                    corner_radii,
-                })
+                Some(ContentMask { bounds })
             }
         }
     }
@@ -673,16 +661,64 @@ impl Style {
 
         if self.is_border_visible() {
             let border_widths = self.border_widths.to_pixels(rem_size);
+            let max_border_width = border_widths.max();
+            let max_corner_radius = corner_radii.max();
+
+            let top_bounds = Bounds::from_corners(
+                bounds.origin,
+                bounds.top_right() + point(Pixels::ZERO, max_border_width.max(max_corner_radius)),
+            );
+            let bottom_bounds = Bounds::from_corners(
+                bounds.bottom_left() - point(Pixels::ZERO, max_border_width.max(max_corner_radius)),
+                bounds.bottom_right(),
+            );
+            let left_bounds = Bounds::from_corners(
+                top_bounds.bottom_left(),
+                bottom_bounds.origin + point(max_border_width, Pixels::ZERO),
+            );
+            let right_bounds = Bounds::from_corners(
+                top_bounds.bottom_right() - point(max_border_width, Pixels::ZERO),
+                bottom_bounds.top_right(),
+            );
+
             let mut background = self.border_color.unwrap_or_default();
             background.a = 0.;
-            window.paint_quad(quad(
+            let quad = quad(
                 bounds,
                 corner_radii,
                 background,
                 border_widths,
                 self.border_color.unwrap_or_default(),
                 self.border_style,
-            ));
+            );
+
+            window.with_content_mask(Some(ContentMask { bounds: top_bounds }), |window| {
+                window.paint_quad(quad.clone());
+            });
+            window.with_content_mask(
+                Some(ContentMask {
+                    bounds: right_bounds,
+                }),
+                |window| {
+                    window.paint_quad(quad.clone());
+                },
+            );
+            window.with_content_mask(
+                Some(ContentMask {
+                    bounds: bottom_bounds,
+                }),
+                |window| {
+                    window.paint_quad(quad.clone());
+                },
+            );
+            window.with_content_mask(
+                Some(ContentMask {
+                    bounds: left_bounds,
+                }),
+                |window| {
+                    window.paint_quad(quad);
+                },
+            );
         }
 
         #[cfg(debug_assertions)]
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index cebf911b73..0ec73c4b00 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1283,8 +1283,6 @@ pub(crate) struct DispatchEventResult {
 pub struct ContentMask<P: Clone + Debug + Default + PartialEq> {
     /// The bounds
     pub bounds: Bounds<P>,
-    /// The corner radii of the content mask.
-    pub corner_radii: Corners<P>,
 }
 
 impl ContentMask<Pixels> {
@@ -1292,31 +1290,13 @@ impl ContentMask<Pixels> {
     pub fn scale(&self, factor: f32) -> ContentMask<ScaledPixels> {
         ContentMask {
             bounds: self.bounds.scale(factor),
-            corner_radii: self.corner_radii.scale(factor),
         }
     }
 
     /// Intersect the content mask with the given content mask.
     pub fn intersect(&self, other: &Self) -> Self {
         let bounds = self.bounds.intersect(&other.bounds);
-        ContentMask {
-            bounds,
-            corner_radii: Corners {
-                top_left: self.corner_radii.top_left.max(other.corner_radii.top_left),
-                top_right: self
-                    .corner_radii
-                    .top_right
-                    .max(other.corner_radii.top_right),
-                bottom_right: self
-                    .corner_radii
-                    .bottom_right
-                    .max(other.corner_radii.bottom_right),
-                bottom_left: self
-                    .corner_radii
-                    .bottom_left
-                    .max(other.corner_radii.bottom_left),
-            },
-        }
+        ContentMask { bounds }
     }
 }
 
@@ -2577,7 +2557,6 @@ impl Window {
                     origin: Point::default(),
                     size: self.viewport_size,
                 },
-                ..Default::default()
             })
     }
 
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index e4d7f22691..5bbf5ad36b 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1184,7 +1184,7 @@ impl Element for TerminalElement {
         cx: &mut App,
     ) {
         let paint_start = Instant::now();
-        window.with_content_mask(Some(ContentMask { bounds, ..Default::default() }), |window| {
+        window.with_content_mask(Some(ContentMask { bounds }), |window| {
             let scroll_top = self.terminal_view.read(cx).scroll_top;
 
             window.paint_quad(fill(bounds, layout.background_color));
diff --git a/crates/ui/src/components/scrollbar.rs b/crates/ui/src/components/scrollbar.rs
index 475575a483..605028202f 100644
--- a/crates/ui/src/components/scrollbar.rs
+++ b/crates/ui/src/components/scrollbar.rs
@@ -303,13 +303,9 @@ impl Element for Scrollbar {
         window: &mut Window,
         _: &mut App,
     ) -> Self::PrepaintState {
-        window.with_content_mask(
-            Some(ContentMask {
-                bounds,
-                ..Default::default()
-            }),
-            |window| window.insert_hitbox(bounds, HitboxBehavior::Normal),
-        )
+        window.with_content_mask(Some(ContentMask { bounds }), |window| {
+            window.insert_hitbox(bounds, HitboxBehavior::Normal)
+        })
     }
 
     fn paint(
@@ -323,11 +319,7 @@ impl Element for Scrollbar {
         cx: &mut App,
     ) {
         const EXTRA_PADDING: Pixels = px(5.0);
-        let content_mask = ContentMask {
-            bounds,
-            ..Default::default()
-        };
-        window.with_content_mask(Some(content_mask), |window| {
+        window.with_content_mask(Some(ContentMask { bounds }), |window| {
             let axis = self.kind;
             let colors = cx.theme().colors();
             let thumb_state = self.state.thumb_state.get();

From 2aa0114b40e090cf54a76663761d2ae772da9b4d Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 3 Sep 2025 17:59:12 -0300
Subject: [PATCH 581/823] ai onboarding: Add some fast-follow adjustments
 (#37486)

Closes https://github.com/zed-industries/zed/issues/37305

Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
---
 crates/agent_ui/src/agent_panel.rs                 | 14 ++++++++++++++
 .../src/edit_prediction_onboarding_content.rs      |  8 ++++++--
 crates/ai_onboarding/src/young_account_banner.rs   |  2 +-
 crates/zeta/src/onboarding_modal.rs                | 13 +++++++++++--
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 305261183e..d021eaefb5 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2967,6 +2967,20 @@ impl AgentPanel {
             return false;
         }
 
+        let user_store = self.user_store.read(cx);
+
+        if user_store
+            .plan()
+            .is_some_and(|plan| matches!(plan, Plan::ZedPro))
+            && user_store
+                .subscription_period()
+                .and_then(|period| period.0.checked_add_days(chrono::Days::new(1)))
+                .is_some_and(|date| date < chrono::Utc::now())
+        {
+            OnboardingUpsell::set_dismissed(true, cx);
+            return false;
+        }
+
         match &self.active_view {
             ActiveView::History | ActiveView::Configuration => false,
             ActiveView::ExternalAgentThread { thread_view, .. }
diff --git a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs b/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
index e883d8da8c..50b729c37e 100644
--- a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
+++ b/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use client::{Client, UserStore};
+use cloud_llm_client::Plan;
 use gpui::{Entity, IntoElement, ParentElement};
 use ui::prelude::*;
 
@@ -35,6 +36,8 @@ impl EditPredictionOnboarding {
 
 impl Render for EditPredictionOnboarding {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let is_free_plan = self.user_store.read(cx).plan() == Some(Plan::ZedFree);
+
         let github_copilot = v_flex()
             .gap_1()
             .child(Label::new(if self.copilot_is_configured {
@@ -67,7 +70,8 @@ impl Render for EditPredictionOnboarding {
                 self.continue_with_zed_ai.clone(),
                 cx,
             ))
-            .child(ui::Divider::horizontal())
-            .child(github_copilot)
+            .when(is_free_plan, |this| {
+                this.child(ui::Divider::horizontal()).child(github_copilot)
+            })
     }
 }
diff --git a/crates/ai_onboarding/src/young_account_banner.rs b/crates/ai_onboarding/src/young_account_banner.rs
index ed9a6b3b35..ae13b95568 100644
--- a/crates/ai_onboarding/src/young_account_banner.rs
+++ b/crates/ai_onboarding/src/young_account_banner.rs
@@ -6,7 +6,7 @@ pub struct YoungAccountBanner;
 
 impl RenderOnce for YoungAccountBanner {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, we cannot offer plans to GitHub accounts created fewer than 30 days ago. To request an exception, reach out to billing-support@zed.dev.";
+        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, GitHub accounts created fewer than 30 days ago are not eligible for free plan usage or Pro plan free trial. To request an exception, reach out to billing-support@zed.dev.";
 
         let label = div()
             .w_full()
diff --git a/crates/zeta/src/onboarding_modal.rs b/crates/zeta/src/onboarding_modal.rs
index 3a58c8c7b8..6b743d95f2 100644
--- a/crates/zeta/src/onboarding_modal.rs
+++ b/crates/zeta/src/onboarding_modal.rs
@@ -14,7 +14,7 @@ use settings::update_settings_file;
 use ui::{Vector, VectorName, prelude::*};
 use workspace::{ModalView, Workspace};
 
-/// Introduces user to Zed's Edit Prediction feature and terms of service
+/// Introduces user to Zed's Edit Prediction feature
 pub struct ZedPredictModal {
     onboarding: Entity<EditPredictionOnboarding>,
     focus_handle: FocusHandle,
@@ -86,7 +86,16 @@ impl Focusable for ZedPredictModal {
     }
 }
 
-impl ModalView for ZedPredictModal {}
+impl ModalView for ZedPredictModal {
+    fn on_before_dismiss(
+        &mut self,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> workspace::DismissDecision {
+        ZedPredictUpsell::set_dismissed(true, cx);
+        workspace::DismissDecision::Dismiss(true)
+    }
+}
 
 impl Render for ZedPredictModal {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {

From ec1528b8905e6ecacaad07e4641cc0b6342aef7c Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:09:59 -0300
Subject: [PATCH 582/823] thread view: Refine the terminal tool card header UI
 (#37488)

Rendering the disclosure button last (on the far right of the header
container) to avoid awkward layouts when there's truncation and elapsed
time information being displayed.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs | 46 +++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 5269b8b0f7..e277caf58d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2637,28 +2637,6 @@ impl AcpThreadView {
                             .with_rotate_animation(2)
                     )
             })
-            .child(
-                Disclosure::new(
-                    SharedString::from(format!(
-                        "terminal-tool-disclosure-{}",
-                        terminal.entity_id()
-                    )),
-                    is_expanded,
-                )
-                .opened_icon(IconName::ChevronUp)
-                .closed_icon(IconName::ChevronDown)
-                .visible_on_hover(&header_group)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, _window, _cx| {
-                        if is_expanded {
-                            this.expanded_tool_calls.remove(&id);
-                        } else {
-                            this.expanded_tool_calls.insert(id.clone());
-                        }
-                    }
-                })),
-            )
             .when(truncated_output, |header| {
                 let tooltip = if let Some(output) = output {
                     if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
@@ -2717,7 +2695,29 @@ impl AcpThreadView {
                             )))
                         }),
                 )
-            });
+            })
+            .child(
+                Disclosure::new(
+                    SharedString::from(format!(
+                        "terminal-tool-disclosure-{}",
+                        terminal.entity_id()
+                    )),
+                    is_expanded,
+                )
+                .opened_icon(IconName::ChevronUp)
+                .closed_icon(IconName::ChevronDown)
+                .visible_on_hover(&header_group)
+                .on_click(cx.listener({
+                    let id = tool_call.id.clone();
+                    move |this, _event, _window, _cx| {
+                        if is_expanded {
+                            this.expanded_tool_calls.remove(&id);
+                        } else {
+                            this.expanded_tool_calls.insert(id.clone());
+                        }
+                    }
+                })),
+            );
 
         let terminal_view = self
             .entry_view_state

From bb13228ad599dbb46d61f30ce0ae808df9c77e4d Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 3 Sep 2025 14:24:32 -0700
Subject: [PATCH 583/823] Revert "Remote: Change "sh -c" to "sh -lc" (#36760)"
 (#37417)

This reverts commit bf5ed6d1c9795369310b5b9d6c752d9dc54991b5.

We believe this may be breaking some users whose shell initialization
scripts change the working directory.

Release Notes:

- N/A
---
 crates/remote/src/transport/ssh.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
index 0995e0dd61..42c6da04b5 100644
--- a/crates/remote/src/transport/ssh.rs
+++ b/crates/remote/src/transport/ssh.rs
@@ -254,7 +254,7 @@ impl RemoteConnection for SshRemoteConnection {
 
         let ssh_proxy_process = match self
             .socket
-            .ssh_command("sh", &["-lc", &start_proxy_command])
+            .ssh_command("sh", &["-c", &start_proxy_command])
             // IMPORTANT: we kill this process when we drop the task that uses it.
             .kill_on_drop(true)
             .spawn()
@@ -529,7 +529,7 @@ impl SshRemoteConnection {
                 .run_command(
                     "sh",
                     &[
-                        "-lc",
+                        "-c",
                         &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
                     ],
                 )
@@ -607,7 +607,7 @@ impl SshRemoteConnection {
                 .run_command(
                     "sh",
                     &[
-                        "-lc",
+                        "-c",
                         &shell_script!("mkdir -p {parent}", parent = parent.to_string().as_ref()),
                     ],
                 )
@@ -655,7 +655,7 @@ impl SshRemoteConnection {
                 dst_path = &dst_path.to_string()
             )
         };
-        self.socket.run_command("sh", &["-lc", &script]).await?;
+        self.socket.run_command("sh", &["-c", &script]).await?;
         Ok(())
     }
 
@@ -797,7 +797,7 @@ impl SshSocket {
     }
 
     async fn platform(&self) -> Result<RemotePlatform> {
-        let uname = self.run_command("sh", &["-lc", "uname -sm"]).await?;
+        let uname = self.run_command("sh", &["-c", "uname -sm"]).await?;
         let Some((os, arch)) = uname.split_once(" ") else {
             anyhow::bail!("unknown uname: {uname:?}")
         };
@@ -828,7 +828,7 @@ impl SshSocket {
     }
 
     async fn shell(&self) -> String {
-        match self.run_command("sh", &["-lc", "echo $SHELL"]).await {
+        match self.run_command("sh", &["-c", "echo $SHELL"]).await {
             Ok(shell) => shell.trim().to_owned(),
             Err(e) => {
                 log::error!("Failed to get shell: {e}");

From 3b7dbb87b07e8b784ce52fbbf36e06ae9011e3b3 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:31:54 -0300
Subject: [PATCH 584/823] docs: Add note about `CLAUDE.md` usage (#37496)

Some users asked whether Claude Code in Zed can also observe/consume
`CLAUDE.md` guidelines, regardless of whether they're at the root
`.claude` directory or within the project. Answer is yes and the
documentation will mention it now!

Release Notes:

- N/A
---
 docs/src/ai/external-agents.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index de374511d0..c0794a6a01 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -98,6 +98,11 @@ However, the SDK doesn't yet expose everything needed to fully support all of th
 > Also note that some [first-party agent](./agent-panel.md) features don't yet work with Claude Code: editing past messages, resuming threads from history, checkpointing, and using the agent in SSH projects.
 > We hope to add these features in the near future.
 
+#### CLAUDE.md
+
+If you already have a `CLAUDE.md` file in your project (either at the root of it or in subdirectories) or at your root `.claude` directory, Claude Code in Zed will use it.
+If you don't have one, you can make Claude Code create one for you through through the `init` slash command.
+
 ## Add Custom Agents {#add-custom-agents}
 
 You can run any agent speaking ACP in Zed by changing your settings as follows:

From bf1ae1d196d9ddd0c90663f118bd3019b56fd5df Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:46:35 -0300
Subject: [PATCH 585/823] docs: Fix typo in the `CLAUDE.md` section (#37497)

Follow-up to https://github.com/zed-industries/zed/pull/37496. Fix a
typo and improves writing overall.

Release Notes:

- N/A
---
 docs/src/ai/external-agents.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index c0794a6a01..e8f348b32a 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -100,8 +100,9 @@ However, the SDK doesn't yet expose everything needed to fully support all of th
 
 #### CLAUDE.md
 
-If you already have a `CLAUDE.md` file in your project (either at the root of it or in subdirectories) or at your root `.claude` directory, Claude Code in Zed will use it.
-If you don't have one, you can make Claude Code create one for you through through the `init` slash command.
+Claude Code in Zed will automatically use any `CLAUDE.md` file found in your project root, project subdirectories, or root `.claude` directory.
+
+If you don't have a `CLAUDE.md` file, you can ask Claude Code to create one for you through the `init` slash command.
 
 ## Add Custom Agents {#add-custom-agents}
 

From be0bb4a56b0b495b895c99b27ce54e36b76aa9a7 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 3 Sep 2025 17:10:14 -0500
Subject: [PATCH 586/823] Centralize `ZED_STATELESS` (#37492)

Closes #ISSUE

Centralizes the references to the `ZED_STATELESS` env var into a single
location in a new crate named `zed_env_vars`

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 Cargo.lock                                    | 12 ++++++++++++
 Cargo.toml                                    |  2 ++
 crates/agent/Cargo.toml                       |  1 +
 crates/agent/src/thread_store.rs              |  3 +--
 crates/agent2/Cargo.toml                      |  1 +
 crates/agent2/src/db.rs                       |  4 +---
 crates/assistant_context/Cargo.toml           |  3 ++-
 crates/assistant_context/src/context_store.rs |  3 +--
 crates/db/Cargo.toml                          |  1 +
 crates/db/src/db.rs                           |  6 ++----
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/main.rs                        |  2 +-
 crates/zed_env_vars/Cargo.toml                | 18 ++++++++++++++++++
 crates/zed_env_vars/LICENSE-GPL               |  1 +
 crates/zed_env_vars/src/zed_env_vars.rs       |  6 ++++++
 script/new-crate                              |  1 +
 16 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 crates/zed_env_vars/Cargo.toml
 create mode 120000 crates/zed_env_vars/LICENSE-GPL
 create mode 100644 crates/zed_env_vars/src/zed_env_vars.rs

diff --git a/Cargo.lock b/Cargo.lock
index 239323517c..1e237d8438 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -190,6 +190,7 @@ dependencies = [
  "uuid",
  "workspace",
  "workspace-hack",
+ "zed_env_vars",
  "zstd",
 ]
 
@@ -278,6 +279,7 @@ dependencies = [
  "web_search",
  "workspace-hack",
  "worktree",
+ "zed_env_vars",
  "zlog",
  "zstd",
 ]
@@ -848,6 +850,7 @@ dependencies = [
  "uuid",
  "workspace",
  "workspace-hack",
+ "zed_env_vars",
 ]
 
 [[package]]
@@ -4489,6 +4492,7 @@ dependencies = [
  "tempfile",
  "util",
  "workspace-hack",
+ "zed_env_vars",
 ]
 
 [[package]]
@@ -20549,6 +20553,7 @@ dependencies = [
  "workspace",
  "workspace-hack",
  "zed_actions",
+ "zed_env_vars",
  "zeta",
  "zlog",
  "zlog_settings",
@@ -20565,6 +20570,13 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "zed_env_vars"
+version = "0.1.0"
+dependencies = [
+ "workspace-hack",
+]
+
 [[package]]
 name = "zed_extension_api"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 08551ef75a..3e90af94c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -193,6 +193,7 @@ members = [
     "crates/x_ai",
     "crates/zed",
     "crates/zed_actions",
+    "crates/zed_env_vars",
     "crates/zeta",
     "crates/zeta_cli",
     "crates/zlog",
@@ -420,6 +421,7 @@ worktree = { path = "crates/worktree" }
 x_ai = { path = "crates/x_ai" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
+zed_env_vars = { path = "crates/zed_env_vars" }
 zeta = { path = "crates/zeta" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index 391abb38fe..76f96647c7 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -63,6 +63,7 @@ time.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace-hack.workspace = true
+zed_env_vars.workspace = true
 zstd.workspace = true
 
 [dev-dependencies]
diff --git a/crates/agent/src/thread_store.rs b/crates/agent/src/thread_store.rs
index cba2457566..2eae758b83 100644
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -41,8 +41,7 @@ use std::{
 };
 use util::ResultExt as _;
 
-pub static ZED_STATELESS: std::sync::LazyLock<bool> =
-    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
+use zed_env_vars::ZED_STATELESS;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
diff --git a/crates/agent2/Cargo.toml b/crates/agent2/Cargo.toml
index 0e9c8fcf72..b712bed258 100644
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -68,6 +68,7 @@ uuid.workspace = true
 watch.workspace = true
 web_search.workspace = true
 workspace-hack.workspace = true
+zed_env_vars.workspace = true
 zstd.workspace = true
 
 [dev-dependencies]
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index e7d31c0c7a..c78725138f 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -18,6 +18,7 @@ use sqlez::{
 };
 use std::sync::Arc;
 use ui::{App, SharedString};
+use zed_env_vars::ZED_STATELESS;
 
 pub type DbMessage = crate::Message;
 pub type DbSummary = DetailedSummaryState;
@@ -201,9 +202,6 @@ impl DbThread {
     }
 }
 
-pub static ZED_STATELESS: std::sync::LazyLock<bool> =
-    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
     #[serde(rename = "json")]
diff --git a/crates/assistant_context/Cargo.toml b/crates/assistant_context/Cargo.toml
index 45c0072418..3e2761a846 100644
--- a/crates/assistant_context/Cargo.toml
+++ b/crates/assistant_context/Cargo.toml
@@ -50,8 +50,9 @@ text.workspace = true
 ui.workspace = true
 util.workspace = true
 uuid.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
+workspace-hack.workspace = true
+zed_env_vars.workspace = true
 
 [dev-dependencies]
 indoc.workspace = true
diff --git a/crates/assistant_context/src/context_store.rs b/crates/assistant_context/src/context_store.rs
index 6960d9db79..5fac44e31f 100644
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -24,6 +24,7 @@ use rpc::AnyProtoClient;
 use std::sync::LazyLock;
 use std::{cmp::Reverse, ffi::OsStr, mem, path::Path, sync::Arc, time::Duration};
 use util::{ResultExt, TryFutureExt};
+use zed_env_vars::ZED_STATELESS;
 
 pub(crate) fn init(client: &AnyProtoClient) {
     client.add_entity_message_handler(ContextStore::handle_advertise_contexts);
@@ -788,8 +789,6 @@ impl ContextStore {
     fn reload(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
         let fs = self.fs.clone();
         cx.spawn(async move |this, cx| {
-            pub static ZED_STATELESS: LazyLock<bool> =
-                LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
             if *ZED_STATELESS {
                 return Ok(());
             }
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index c53b2988b9..de449cd38f 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -27,6 +27,7 @@ sqlez.workspace = true
 sqlez_macros.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
+zed_env_vars.workspace = true
 
 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
index 0802bd8bb7..eab2f115d8 100644
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -17,9 +17,10 @@ use sqlez::thread_safe_connection::ThreadSafeConnection;
 use sqlez_macros::sql;
 use std::future::Future;
 use std::path::Path;
+use std::sync::atomic::AtomicBool;
 use std::sync::{LazyLock, atomic::Ordering};
-use std::{env, sync::atomic::AtomicBool};
 use util::{ResultExt, maybe};
+use zed_env_vars::ZED_STATELESS;
 
 const CONNECTION_INITIALIZE_QUERY: &str = sql!(
     PRAGMA foreign_keys=TRUE;
@@ -36,9 +37,6 @@ const FALLBACK_DB_NAME: &str = "FALLBACK_MEMORY_DB";
 
 const DB_FILE_NAME: &str = "db.sqlite";
 
-pub static ZED_STATELESS: LazyLock<bool> =
-    LazyLock::new(|| env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
-
 pub static ALL_FILE_DB_FAILED: LazyLock<AtomicBool> = LazyLock::new(|| AtomicBool::new(false));
 
 /// Open or create a database at the given directory path.
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 9aceec1fbe..f2295d5fa7 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -165,6 +165,7 @@ web_search_providers.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
+zed_env_vars.workspace = true
 zeta.workspace = true
 zlog.workspace = true
 zlog_settings.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 52e475edf8..9582e7a2ab 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -288,7 +288,7 @@ pub fn main() {
 
     let (open_listener, mut open_rx) = OpenListener::new();
 
-    let failed_single_instance_check = if *db::ZED_STATELESS
+    let failed_single_instance_check = if *zed_env_vars::ZED_STATELESS
         || *release_channel::RELEASE_CHANNEL == ReleaseChannel::Dev
     {
         false
diff --git a/crates/zed_env_vars/Cargo.toml b/crates/zed_env_vars/Cargo.toml
new file mode 100644
index 0000000000..9abfc410e7
--- /dev/null
+++ b/crates/zed_env_vars/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "zed_env_vars"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/zed_env_vars.rs"
+
+[features]
+default = []
+
+[dependencies]
+workspace-hack.workspace = true
diff --git a/crates/zed_env_vars/LICENSE-GPL b/crates/zed_env_vars/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/zed_env_vars/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zed_env_vars/src/zed_env_vars.rs b/crates/zed_env_vars/src/zed_env_vars.rs
new file mode 100644
index 0000000000..d1679a0518
--- /dev/null
+++ b/crates/zed_env_vars/src/zed_env_vars.rs
@@ -0,0 +1,6 @@
+use std::sync::LazyLock;
+
+/// Whether Zed is running in stateless mode.
+/// When true, Zed will use in-memory databases instead of persistent storage.
+pub static ZED_STATELESS: LazyLock<bool> =
+    LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
diff --git a/script/new-crate b/script/new-crate
index 52ee900b30..1ac2d92621 100755
--- a/script/new-crate
+++ b/script/new-crate
@@ -63,6 +63,7 @@ anyhow.workspace = true
 gpui.workspace = true
 ui.workspace = true
 util.workspace = true
+workspace-hack.workspace = true
 
 # Uncomment other workspace dependencies as needed
 # assistant.workspace = true

From d6f0811dabb9a5428780893598e0075c4829387d Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 3 Sep 2025 19:24:59 -0300
Subject: [PATCH 587/823] acp: Receive available commands over notifications
 (#37499)

See: https://github.com/zed-industries/agent-client-protocol/pull/62

Release Notes:

- Agent Panel: Fixes an issue where Claude Code would timeout waiting
for slash commands to be loaded

Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock                             |  4 +--
 Cargo.toml                             |  2 +-
 crates/acp_thread/src/acp_thread.rs    | 12 +++----
 crates/acp_thread/src/connection.rs    |  1 -
 crates/agent2/src/agent.rs             |  1 -
 crates/agent_servers/src/acp.rs        |  1 -
 crates/agent_servers/src/claude.rs     |  2 +-
 crates/agent_ui/src/acp/thread_view.rs | 47 ++++++++++++++------------
 crates/agent_ui/src/agent_diff.rs      |  1 +
 9 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e237d8438..58d01da633 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.2.0-alpha.4"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "603941db1d130ee275840c465b73a2312727d4acef97449550ccf033de71301f"
+checksum = "6d02292efd75080932b6466471d428c70e2ac06908ae24792fc7c36ecbaf67ca"
 dependencies = [
  "anyhow",
  "async-broadcast",
diff --git a/Cargo.toml b/Cargo.toml
index 3e90af94c5..941c364e0d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -430,7 +430,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol = { version = "0.2.0-alpha.4", features = ["unstable"]}
+agent-client-protocol = { version = "0.2.0-alpha.6", features = ["unstable"]}
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 804e4683a7..dc295369cc 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -785,7 +785,6 @@ pub struct AcpThread {
     session_id: acp::SessionId,
     token_usage: Option<TokenUsage>,
     prompt_capabilities: acp::PromptCapabilities,
-    available_commands: Vec<acp::AvailableCommand>,
     _observe_prompt_capabilities: Task<anyhow::Result<()>>,
     determine_shell: Shared<Task<String>>,
     terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
@@ -805,6 +804,7 @@ pub enum AcpThreadEvent {
     LoadError(LoadError),
     PromptCapabilitiesUpdated,
     Refusal,
+    AvailableCommandsUpdated(Vec<acp::AvailableCommand>),
 }
 
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -860,7 +860,6 @@ impl AcpThread {
         action_log: Entity<ActionLog>,
         session_id: acp::SessionId,
         mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
-        available_commands: Vec<acp::AvailableCommand>,
         cx: &mut Context<Self>,
     ) -> Self {
         let prompt_capabilities = *prompt_capabilities_rx.borrow();
@@ -900,7 +899,6 @@ impl AcpThread {
             session_id,
             token_usage: None,
             prompt_capabilities,
-            available_commands,
             _observe_prompt_capabilities: task,
             terminals: HashMap::default(),
             determine_shell,
@@ -911,10 +909,6 @@ impl AcpThread {
         self.prompt_capabilities
     }
 
-    pub fn available_commands(&self) -> Vec<acp::AvailableCommand> {
-        self.available_commands.clone()
-    }
-
     pub fn connection(&self) -> &Rc<dyn AgentConnection> {
         &self.connection
     }
@@ -1010,6 +1004,9 @@ impl AcpThread {
             acp::SessionUpdate::Plan(plan) => {
                 self.update_plan(plan, cx);
             }
+            acp::SessionUpdate::AvailableCommandsUpdate { available_commands } => {
+                cx.emit(AcpThreadEvent::AvailableCommandsUpdated(available_commands))
+            }
         }
         Ok(())
     }
@@ -3080,7 +3077,6 @@ mod tests {
                         audio: true,
                         embedded_context: true,
                     }),
-                    vec![],
                     cx,
                 )
             });
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 7901b08c90..1c465a4cdd 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -338,7 +338,6 @@ mod test_support {
                         audio: true,
                         embedded_context: true,
                     }),
-                    vec![],
                     cx,
                 )
             });
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 241e3d389f..e96b4c0cfa 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -292,7 +292,6 @@ impl NativeAgent {
                 action_log.clone(),
                 session_id.clone(),
                 prompt_capabilities_rx,
-                vec![],
                 cx,
             )
         });
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 7907083e14..7991c1e3cc 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -224,7 +224,6 @@ impl AgentConnection for AcpConnection {
                     session_id.clone(),
                     // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
                     watch::Receiver::constant(self.agent_capabilities.prompt_capabilities),
-                    response.available_commands,
                     cx,
                 )
             })?;
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index a02d8c37c1..194867241b 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -40,7 +40,7 @@ impl ClaudeCode {
                         Self::PACKAGE_NAME.into(),
                         "node_modules/@anthropic-ai/claude-code/cli.js".into(),
                         true,
-                        None,
+                        Some("0.2.5".parse().unwrap()),
                         cx,
                     )
                 })?
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index e277caf58d..50da44e430 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -430,6 +430,7 @@ impl AcpThreadView {
             window,
             cx,
         );
+        self.available_commands.replace(vec![]);
         self.new_server_version_available.take();
         cx.notify();
     }
@@ -535,26 +536,6 @@ impl AcpThreadView {
                     Ok(thread) => {
                         let action_log = thread.read(cx).action_log().clone();
 
-                        let mut available_commands = thread.read(cx).available_commands();
-
-                        if connection
-                            .auth_methods()
-                            .iter()
-                            .any(|method| method.id.0.as_ref() == "claude-login")
-                        {
-                            available_commands.push(acp::AvailableCommand {
-                                name: "login".to_owned(),
-                                description: "Authenticate".to_owned(),
-                                input: None,
-                            });
-                            available_commands.push(acp::AvailableCommand {
-                                name: "logout".to_owned(),
-                                description: "Authenticate".to_owned(),
-                                input: None,
-                            });
-                        }
-                        this.available_commands.replace(available_commands);
-
                         this.prompt_capabilities
                             .set(thread.read(cx).prompt_capabilities());
 
@@ -1343,6 +1324,30 @@ impl AcpThreadView {
                     .set(thread.read(cx).prompt_capabilities());
             }
             AcpThreadEvent::TokenUsageUpdated => {}
+            AcpThreadEvent::AvailableCommandsUpdated(available_commands) => {
+                let mut available_commands = available_commands.clone();
+
+                if thread
+                    .read(cx)
+                    .connection()
+                    .auth_methods()
+                    .iter()
+                    .any(|method| method.id.0.as_ref() == "claude-login")
+                {
+                    available_commands.push(acp::AvailableCommand {
+                        name: "login".to_owned(),
+                        description: "Authenticate".to_owned(),
+                        input: None,
+                    });
+                    available_commands.push(acp::AvailableCommand {
+                        name: "logout".to_owned(),
+                        description: "Authenticate".to_owned(),
+                        input: None,
+                    });
+                }
+
+                self.available_commands.replace(available_commands);
+            }
         }
         cx.notify();
     }
@@ -5745,7 +5750,6 @@ pub(crate) mod tests {
                         audio: true,
                         embedded_context: true,
                     }),
-                    vec![],
                     cx,
                 )
             })))
@@ -5805,7 +5809,6 @@ pub(crate) mod tests {
                         audio: true,
                         embedded_context: true,
                     }),
-                    Vec::new(),
                     cx,
                 )
             })))
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index f9d7321ca8..e3688dccce 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1528,6 +1528,7 @@ impl AgentDiff {
             | AcpThreadEvent::EntriesRemoved(_)
             | AcpThreadEvent::ToolAuthorizationRequired
             | AcpThreadEvent::PromptCapabilitiesUpdated
+            | AcpThreadEvent::AvailableCommandsUpdated(_)
             | AcpThreadEvent::Retry(_) => {}
         }
     }

From da2d791127872bf596af3fc39a3b761e5a3e8609 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 3 Sep 2025 21:02:34 -0300
Subject: [PATCH 588/823] Update external agents installation docs (#37500)

---
 docs/src/ai/external-agents.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index e8f348b32a..963e41d42f 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -30,12 +30,19 @@ If you'd like to bind this to a keyboard shortcut, you can do so by editing your
 
 #### Installation
 
-If you don't yet have Gemini CLI installed, then Zed will install a version for you. If you do, then we will use the version of Gemini CLI on your path.
+The first time you create a Gemini CLI thread, Zed will install [@google/gemini-cli](https://github.com/zed-industries/claude-code-acp). This installation is only available to Zed and is kept up to date as you use the agent.
 
-You need to be running at least Gemini version `0.2.0`, and if your version of Gemini is too old you will see an
-error message.
+By default, Zed will use this managed version of Gemini CLI even if you have it installed globally. However, you can configure it to use a version in your `PATH` by adding this to your settings:
 
-The instructions to upgrade Gemini depend on how you originally installed it, but typically, running `npm install -g @google/gemini-cli@latest` should work.
+```json
+{
+  "agent_servers": {
+    "gemini": {
+      "ignore_system_version": false
+    }
+  }
+}
+```
 
 #### Authentication
 
@@ -80,8 +87,9 @@ If you'd like to bind this to a keyboard shortcut, you can do so by editing your
 
 #### Installation
 
-If you don't yet have Claude Code installed, then Zed will install a version for you.
-If you do, then we will use the version of Claude Code on your path.
+The first time you create a Claude Code thread, Zed will install [@zed-industries/claude-code-acp](https://github.com/zed-industries/claude-code-acp). This installation is only available to Zed and is kept up to date as you use the agent.
+
+Zed will always use this managed version of Claude Code even if you have it installed globally.
 
 ### Usage
 
@@ -122,6 +130,8 @@ You can run any agent speaking ACP in Zed by changing your settings as follows:
 
 This can also be useful if you're in the middle of developing a new agent that speaks the protocol and you want to debug it.
 
+You can also specify a custom path, arguments, or environment for the builtin integrations by using the `claude` and `gemini` names.
+
 ## Debugging Agents
 
 When using external agents in Zed, you can access the debug view via with `dev: open acp logs` from the Command Palette. This lets you see the messages being sent and received between Zed and the agent.

From 9eeeda1330e814c57e71e317a14b3f357d549642 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Wed, 3 Sep 2025 20:02:57 -0400
Subject: [PATCH 589/823] onboarding: Add telemetry to Basics page (#37502)

- Welcome Keymap Changed
- Welcome Theme Changed
- Welcome Theme mode Changed
- Welcome Page Telemetry Diagnostics Toggled
- Welcome Page Telemetry Metrics Toggled
- Welcome Vim Mode Toggled
- Welcome Keymap Changed
- Welcome Sign In Clicked

cc: @katie-z-geer

Release Notes:

- N/A
---
 crates/onboarding/src/basics_page.rs | 56 +++++++++++++++++++++++++---
 crates/onboarding/src/onboarding.rs  |  1 +
 crates/sum_tree/src/tree_map.rs      |  2 +-
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 991386cb38..d98db03be8 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -68,6 +68,12 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
                             MODE_NAMES[mode as usize].clone(),
                             move |_, _, cx| {
                                 write_mode_change(mode, cx);
+
+                                telemetry::event!(
+                                    "Welcome Theme mode Changed",
+                                    from = theme_mode,
+                                    to = mode
+                                );
                             },
                         )
                     }),
@@ -105,7 +111,7 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
             ThemeMode::Dark => Appearance::Dark,
             ThemeMode::System => *system_appearance,
         };
-        let current_theme_name = theme_selection.theme(appearance);
+        let current_theme_name = SharedString::new(theme_selection.theme(appearance));
 
         let theme_names = match appearance {
             Appearance::Light => LIGHT_THEMES,
@@ -149,8 +155,15 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
                         })
                         .on_click({
                             let theme_name = theme.name.clone();
+                            let current_theme_name = current_theme_name.clone();
+
                             move |_, _, cx| {
                                 write_theme_change(theme_name.clone(), theme_mode, cx);
+                                telemetry::event!(
+                                    "Welcome Theme Changed",
+                                    from = current_theme_name,
+                                    to = theme_name
+                                );
                             }
                         })
                         .map(|this| {
@@ -239,6 +252,17 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement
                     cx,
                     move |setting, _| setting.metrics = Some(enabled),
                 );
+
+                // This telemetry event shouldn't fire when it's off. If it does we're be alerted
+                // and can fix it in a timely manner to respect a user's choice.
+                telemetry::event!("Welcome Page Telemetry Metrics Toggled",
+                    options = if enabled {
+                        "on"
+                    } else {
+                        "off"
+                    }
+                );
+
             }},
         ).tab_index({
             *tab_index += 1;
@@ -267,6 +291,16 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement
                         cx,
                         move |setting, _| setting.diagnostics = Some(enabled),
                     );
+
+                    // This telemetry event shouldn't fire when it's off. If it does we're be alerted
+                    // and can fix it in a timely manner to respect a user's choice.
+                    telemetry::event!("Welcome Page Telemetry Diagnostics Toggled",
+                        options = if enabled {
+                            "on"
+                        } else {
+                            "off"
+                        }
+                    );
                 }
             }
         ).tab_index({
@@ -327,6 +361,8 @@ fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoE
         update_settings_file::<BaseKeymap>(fs, cx, move |setting, _| {
             setting.base_keymap = Some(keymap_base);
         });
+
+        telemetry::event!("Welcome Keymap Changed", keymap = keymap_base);
     }
 }
 
@@ -344,13 +380,21 @@ fn render_vim_mode_switch(tab_index: &mut isize, cx: &mut App) -> impl IntoEleme
         {
             let fs = <dyn Fs>::global(cx);
             move |&selection, _, cx| {
-                update_settings_file::<VimModeSetting>(fs.clone(), cx, move |setting, _| {
-                    *setting = match selection {
-                        ToggleState::Selected => Some(true),
-                        ToggleState::Unselected => Some(false),
-                        ToggleState::Indeterminate => None,
+                let vim_mode = match selection {
+                    ToggleState::Selected => true,
+                    ToggleState::Unselected => false,
+                    ToggleState::Indeterminate => {
+                        return;
                     }
+                };
+                update_settings_file::<VimModeSetting>(fs.clone(), cx, move |setting, _| {
+                    *setting = Some(vim_mode);
                 });
+
+                telemetry::event!(
+                    "Welcome Vim Mode Toggled",
+                    options = if vim_mode { "on" } else { "off" },
+                );
             }
         },
     )
diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs
index 873dd63201..7f1bb81d4d 100644
--- a/crates/onboarding/src/onboarding.rs
+++ b/crates/onboarding/src/onboarding.rs
@@ -476,6 +476,7 @@ impl Onboarding {
                                 .map(|kb| kb.size(rems_from_px(12.))),
                         )
                         .on_click(|_, window, cx| {
+                            telemetry::event!("Welcome Sign In Clicked");
                             window.dispatch_action(SignIn.boxed_clone(), cx);
                         })
                         .into_any_element()
diff --git a/crates/sum_tree/src/tree_map.rs b/crates/sum_tree/src/tree_map.rs
index fc93d40ae5..818214e402 100644
--- a/crates/sum_tree/src/tree_map.rs
+++ b/crates/sum_tree/src/tree_map.rs
@@ -2,7 +2,7 @@ use std::{cmp::Ordering, fmt::Debug};
 
 use crate::{Bias, Dimension, Edit, Item, KeyedItem, SeekTarget, SumTree, Summary};
 
-/// A cheaply-clonable ordered map based on a [SumTree](crate::SumTree).
+/// A cheaply-cloneable ordered map based on a [SumTree](crate::SumTree).
 #[derive(Clone, PartialEq, Eq)]
 pub struct TreeMap<K, V>(SumTree<MapEntry<K, V>>)
 where

From f36a545a86469e4bbd0726b363a742d4879de756 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 3 Sep 2025 19:03:32 -0500
Subject: [PATCH 590/823] onboarding: Improve performance of AI upsell card
 (#37504)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/ai_onboarding/src/ai_upsell_card.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index efe6e4165e..d6e7a0bbad 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -86,10 +86,16 @@ impl RenderOnce for AiUpsellCard {
             )
             .child(plan_definitions.free_plan());
 
-        let grid_bg = h_flex().absolute().inset_0().w_full().h(px(240.)).child(
-            Vector::new(VectorName::Grid, rems_from_px(500.), rems_from_px(240.))
-                .color(Color::Custom(cx.theme().colors().border.opacity(0.05))),
-        );
+        let grid_bg = h_flex()
+            .absolute()
+            .inset_0()
+            .w_full()
+            .h(px(240.))
+            .bg(gpui::pattern_slash(
+                cx.theme().colors().border.opacity(0.1),
+                2.,
+                25.,
+            ));
 
         let gradient_bg = div()
             .absolute()

From 3c021d089041d5de0e38d18de514c2a4b304fd22 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Thu, 4 Sep 2025 09:32:13 +0530
Subject: [PATCH 591/823] language_models: Fix beta_headers for Anthropic
 custom models (#37306)

Closes #37289

The current implementation has a problem. The **`from_id` method** in
the Anthropic crate works well for predefined models, but not for custom
models that are defined in the settings. This is because it fallbacks to
using default beta headers, which are incorrect for custom models.

The issue is that the model instance for custom models lives within the
`language_models` provider, so I've updated the **`stream_completion`**
method to explicitly accept beta headers from its caller. Now, the beta
headers are passed from the `language_models` provider all the way to
`anthropic.stream_completion`, which resolves the issue.

Release Notes:

- Fixed a bug where extra_beta_headers defined in settings for Anthropic
custom models were being ignored.

---------

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 crates/anthropic/src/anthropic.rs                | 12 +++++-------
 crates/language_models/src/provider/anthropic.rs | 11 +++++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index 773bb557de..7fd0fb4bc5 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -363,11 +363,9 @@ pub async fn complete(
     api_url: &str,
     api_key: &str,
     request: Request,
+    beta_headers: String,
 ) -> Result<Response, AnthropicError> {
     let uri = format!("{api_url}/v1/messages");
-    let beta_headers = Model::from_id(&request.model)
-        .map(|model| model.beta_headers())
-        .unwrap_or_else(|_| Model::DEFAULT_BETA_HEADERS.join(","));
     let request_builder = HttpRequest::builder()
         .method(Method::POST)
         .uri(uri)
@@ -409,8 +407,9 @@ pub async fn stream_completion(
     api_url: &str,
     api_key: &str,
     request: Request,
+    beta_headers: String,
 ) -> Result<BoxStream<'static, Result<Event, AnthropicError>>, AnthropicError> {
-    stream_completion_with_rate_limit_info(client, api_url, api_key, request)
+    stream_completion_with_rate_limit_info(client, api_url, api_key, request, beta_headers)
         .await
         .map(|output| output.0)
 }
@@ -506,6 +505,7 @@ pub async fn stream_completion_with_rate_limit_info(
     api_url: &str,
     api_key: &str,
     request: Request,
+    beta_headers: String,
 ) -> Result<
     (
         BoxStream<'static, Result<Event, AnthropicError>>,
@@ -518,9 +518,7 @@ pub async fn stream_completion_with_rate_limit_info(
         stream: true,
     };
     let uri = format!("{api_url}/v1/messages");
-    let beta_headers = Model::from_id(&request.base.model)
-        .map(|model| model.beta_headers())
-        .unwrap_or_else(|_| Model::DEFAULT_BETA_HEADERS.join(","));
+
     let request_builder = HttpRequest::builder()
         .method(Method::POST)
         .uri(uri)
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index 6c003c4c39..d246976cda 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -424,14 +424,21 @@ impl AnthropicModel {
             return futures::future::ready(Err(anyhow!("App state dropped").into())).boxed();
         };
 
+        let beta_headers = self.model.beta_headers();
+
         async move {
             let Some(api_key) = api_key else {
                 return Err(LanguageModelCompletionError::NoApiKey {
                     provider: PROVIDER_NAME,
                 });
             };
-            let request =
-                anthropic::stream_completion(http_client.as_ref(), &api_url, &api_key, request);
+            let request = anthropic::stream_completion(
+                http_client.as_ref(),
+                &api_url,
+                &api_key,
+                request,
+                beta_headers,
+            );
             request.await.map_err(Into::into)
         }
         .boxed()

From ce362864dba541002b88a779def5e7db0cbcca5d Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 3 Sep 2025 21:39:06 -0700
Subject: [PATCH 592/823] docs: Update OpenAI-compatible provider config format
 (#37517)

The example was still showing how we used to setup openai compatible
providers, but that format should only be used for changing the url for
your actual OpenAI provider.

If you are doing a compatible provider, it should be using the new
format.

Closes #37093

Release Notes:

- N/A
---
 docs/src/ai/llm-providers.md | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/docs/src/ai/llm-providers.md b/docs/src/ai/llm-providers.md
index ecc4cb004b..2846ab2f2f 100644
--- a/docs/src/ai/llm-providers.md
+++ b/docs/src/ai/llm-providers.md
@@ -435,21 +435,24 @@ To do it via your `settings.json`, add the following snippet under `language_mod
 ```json
 {
   "language_models": {
-    "openai": {
-      "api_url": "https://api.together.xyz/v1", // Using Together AI as an example
-      "available_models": [
-        {
-          "name": "mistralai/Mixtral-8x7B-Instruct-v0.1",
-          "display_name": "Together Mixtral 8x7B",
-          "max_tokens": 32768,
-          "capabilities": {
-            "tools": true,
-            "images": false,
-            "parallel_tool_calls": false,
-            "prompt_cache_key": false
+    "openai_compatible": {
+      // Using Together AI as an example
+      "Together AI": {
+        "api_url": "https://api.together.xyz/v1",
+        "available_models": [
+          {
+            "name": "mistralai/Mixtral-8x7B-Instruct-v0.1",
+            "display_name": "Together Mixtral 8x7B",
+            "max_tokens": 32768,
+            "capabilities": {
+              "tools": true,
+              "images": false,
+              "parallel_tool_calls": false,
+              "prompt_cache_key": false
+            }
           }
-        }
-      ]
+        ]
+      }
     }
   }
 }
@@ -463,7 +466,7 @@ By default, OpenAI-compatible models inherit the following capabilities:
 - `prompt_cache_key`: false (does not support `prompt_cache_key` parameter)
 
 Note that LLM API keys aren't stored in your settings file.
-So, ensure you have it set in your environment variables (`OPENAI_API_KEY=<your api key>`) so your settings can pick it up.
+So, ensure you have it set in your environment variables (`<PROVIDER_NAME>_API_KEY=<your api key>`) so your settings can pick it up. In the example above, it would be `TOGETHER_AI_API_KEY=<your api key>`.
 
 ### OpenRouter {#openrouter}
 

From d677c98f437c920fd954d166b0d7dd01b7b489d2 Mon Sep 17 00:00:00 2001
From: Francis <75153730+fbo25@users.noreply.github.com>
Date: Thu, 4 Sep 2025 07:39:55 +0200
Subject: [PATCH 593/823] agent2: Use inline enums in `now` and `edit_file`
 tools JSON schema (#37397)

Added schemars annotations to generate inline enums instead of
references ($ref) in the JSON schema passed to LLMs.

Concerns :
- "timezeone" parameter for "now" tool function
- "mode" parameter for "edit_file" tool function

Should be the same for futures tools/functions enums. This is easier for
LLMs to understand the schema since many of them don't use JSON
references correctly.

Tested with :
- local GPT-OSS-120b with llama.cpp server (openai compatible)
- remote Claude Sonnet 4.0 with Zed pro subscription

Thanks in advance for the merge.
(notice this is my first PR ever on Github, I hope I'm doing things
well, please let me know if you have any comment - edit: just noticed my
username/email were not correctly setup on my local git, sorry, it's
been 5 years I've not used git)

Closes #37389

Release Notes:

- agent: Improve "now" and "edit_file" tool schemas to work with more
models.
---
 crates/agent2/src/tools/edit_file_tool.rs | 1 +
 crates/agent2/src/tools/now_tool.rs       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index f86bfd25f7..ae37dc1f13 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -83,6 +83,7 @@ struct EditFileToolPartialInput {
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "lowercase")]
+#[schemars(inline)]
 pub enum EditFileMode {
     Edit,
     Create,
diff --git a/crates/agent2/src/tools/now_tool.rs b/crates/agent2/src/tools/now_tool.rs
index 9467e7db68..49068be0dd 100644
--- a/crates/agent2/src/tools/now_tool.rs
+++ b/crates/agent2/src/tools/now_tool.rs
@@ -11,6 +11,7 @@ use crate::{AgentTool, ToolCallEventStream};
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
+#[schemars(inline)]
 pub enum Timezone {
     /// Use UTC for the datetime.
     Utc,

From d0aaf046736312fe3c7555586b54c185c6bc4c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E7=91=97=E6=9D=B0?= <3695888@qq.com>
Date: Thu, 4 Sep 2025 13:51:48 +0800
Subject: [PATCH 594/823] Change DeepSeek max token count to 128k (#36864)

https://api-docs.deepseek.com/zh-cn/news/news250821

Now the official API supports 128k token content

and have modify the name to v3.1/v3.1 thinking

Release Notes:

- N/A

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 crates/deepseek/src/deepseek.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/deepseek/src/deepseek.rs b/crates/deepseek/src/deepseek.rs
index e09a9e0f7a..64a1cbe5d9 100644
--- a/crates/deepseek/src/deepseek.rs
+++ b/crates/deepseek/src/deepseek.rs
@@ -96,7 +96,7 @@ impl Model {
 
     pub fn max_token_count(&self) -> u64 {
         match self {
-            Self::Chat | Self::Reasoner => 64_000,
+            Self::Chat | Self::Reasoner => 128_000,
             Self::Custom { max_tokens, .. } => *max_tokens,
         }
     }
@@ -104,7 +104,7 @@ impl Model {
     pub fn max_output_tokens(&self) -> Option<u64> {
         match self {
             Self::Chat => Some(8_192),
-            Self::Reasoner => Some(8_192),
+            Self::Reasoner => Some(64_000),
             Self::Custom {
                 max_output_tokens, ..
             } => *max_output_tokens,

From 69a5c45672fa599f1a5239a942724231fa36a427 Mon Sep 17 00:00:00 2001
From: James Tucker <jftucker@gmail.com>
Date: Wed, 3 Sep 2025 23:18:23 -0700
Subject: [PATCH 595/823] gpui: Fix out-of-bounds node indices in dispatch_path
 (#37252)

Observed in a somewhat regular startup crash on Windows at head (~50% of
launches in release mode).

Closes #37212

Release Notes:

- N/A
---
 crates/gpui/src/key_dispatch.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index 95374e579f..63cfa680c0 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -552,7 +552,7 @@ impl DispatchTree {
         let mut current_node_id = Some(target);
         while let Some(node_id) = current_node_id {
             dispatch_path.push(node_id);
-            current_node_id = self.nodes[node_id.0].parent;
+            current_node_id = self.nodes.get(node_id.0).and_then(|node| node.parent);
         }
         dispatch_path.reverse(); // Reverse the path so it goes from the root to the focused node.
         dispatch_path

From aa1629b544c4a6c3cf3aacf12fd7ff05d22b6740 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 4 Sep 2025 09:09:28 +0200
Subject: [PATCH 596/823] Remove some unused events (#37498)

This PR cleans up some emitted events around the codebase. These events
are either never emitted or never listened for.

It seems better to re-implement these at some point should they again be
needed - this ensures that they will actually be fired in the cases
where they are needed as opposed to being there and getting unreliable
and stale (which is already the case for the majority of the events
removed here).

Lastly, this ensures the `CapabilitiesChanged` event is not fired too
often.

Release Notes:

- N/A
---
 .../src/activity_indicator.rs                 | 15 ---------
 crates/debugger_ui/src/debugger_panel.rs      | 23 +------------
 crates/debugger_ui/src/session.rs             | 18 ++--------
 crates/debugger_ui/src/session/running.rs     |  3 --
 crates/editor/src/editor.rs                   |  4 ---
 crates/editor/src/items.rs                    |  8 -----
 crates/language/src/buffer.rs                 | 16 +++------
 crates/multi_buffer/src/multi_buffer.rs       | 33 +++++++------------
 crates/workspace/src/item.rs                  |  5 ---
 crates/workspace/src/pane.rs                  |  7 +---
 crates/workspace/src/workspace.rs             |  3 --
 11 files changed, 21 insertions(+), 114 deletions(-)

diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index b65d1472a7..1f4c10b060 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -84,7 +84,6 @@ impl ActivityIndicator {
     ) -> Entity<ActivityIndicator> {
         let project = workspace.project().clone();
         let auto_updater = AutoUpdater::get(cx);
-        let workspace_handle = cx.entity();
         let this = cx.new(|cx| {
             let mut status_events = languages.language_server_binary_statuses();
             cx.spawn(async move |this, cx| {
@@ -102,20 +101,6 @@ impl ActivityIndicator {
             })
             .detach();
 
-            cx.subscribe_in(
-                &workspace_handle,
-                window,
-                |activity_indicator, _, event, window, cx| {
-                    if let workspace::Event::ClearActivityIndicator = event
-                        && activity_indicator.statuses.pop().is_some()
-                    {
-                        activity_indicator.dismiss_error_message(&DismissErrorMessage, window, cx);
-                        cx.notify();
-                    }
-                },
-            )
-            .detach();
-
             cx.subscribe(
                 &project.read(cx).lsp_store(),
                 |activity_indicator, _, event, cx| {
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index f81c1fff89..ef714a1f67 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -13,11 +13,8 @@ use anyhow::{Context as _, Result, anyhow};
 use collections::IndexMap;
 use dap::adapters::DebugAdapterName;
 use dap::debugger_settings::DebugPanelDockPosition;
-use dap::{
-    ContinuedEvent, LoadedSourceEvent, ModuleEvent, OutputEvent, StoppedEvent, ThreadEvent,
-    client::SessionId, debugger_settings::DebuggerSettings,
-};
 use dap::{DapRegistry, StartDebuggingRequestArguments};
+use dap::{client::SessionId, debugger_settings::DebuggerSettings};
 use editor::Editor;
 use gpui::{
     Action, App, AsyncWindowContext, ClipboardItem, Context, DismissEvent, Entity, EntityId,
@@ -46,23 +43,6 @@ use workspace::{
 };
 use zed_actions::ToggleFocus;
 
-pub enum DebugPanelEvent {
-    Exited(SessionId),
-    Terminated(SessionId),
-    Stopped {
-        client_id: SessionId,
-        event: StoppedEvent,
-        go_to_stack_frame: bool,
-    },
-    Thread((SessionId, ThreadEvent)),
-    Continued((SessionId, ContinuedEvent)),
-    Output((SessionId, OutputEvent)),
-    Module((SessionId, ModuleEvent)),
-    LoadedSource((SessionId, LoadedSourceEvent)),
-    ClientShutdown(SessionId),
-    CapabilitiesChanged(SessionId),
-}
-
 pub struct DebugPanel {
     size: Pixels,
     active_session: Option<Entity<DebugSession>>,
@@ -1407,7 +1387,6 @@ async fn register_session_inner(
 }
 
 impl EventEmitter<PanelEvent> for DebugPanel {}
-impl EventEmitter<DebugPanelEvent> for DebugPanel {}
 
 impl Focusable for DebugPanel {
     fn focus_handle(&self, _: &App) -> FocusHandle {
diff --git a/crates/debugger_ui/src/session.rs b/crates/debugger_ui/src/session.rs
index 0fc003a14d..40c9bd810f 100644
--- a/crates/debugger_ui/src/session.rs
+++ b/crates/debugger_ui/src/session.rs
@@ -2,9 +2,7 @@ pub mod running;
 
 use crate::{StackTraceView, persistence::SerializedLayout, session::running::DebugTerminal};
 use dap::client::SessionId;
-use gpui::{
-    App, Axis, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task, WeakEntity,
-};
+use gpui::{App, Axis, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity};
 use project::debugger::session::Session;
 use project::worktree_store::WorktreeStore;
 use project::{Project, debugger::session::SessionQuirks};
@@ -24,13 +22,6 @@ pub struct DebugSession {
     stack_trace_view: OnceCell<Entity<StackTraceView>>,
     _worktree_store: WeakEntity<WorktreeStore>,
     workspace: WeakEntity<Workspace>,
-    _subscriptions: [Subscription; 1],
-}
-
-#[derive(Debug)]
-pub enum DebugPanelItemEvent {
-    Close,
-    Stopped { go_to_stack_frame: bool },
 }
 
 impl DebugSession {
@@ -59,9 +50,6 @@ impl DebugSession {
         let quirks = session.read(cx).quirks();
 
         cx.new(|cx| Self {
-            _subscriptions: [cx.subscribe(&running_state, |_, _, _, cx| {
-                cx.notify();
-            })],
             remote_id: None,
             running_state,
             quirks,
@@ -133,7 +121,7 @@ impl DebugSession {
     }
 }
 
-impl EventEmitter<DebugPanelItemEvent> for DebugSession {}
+impl EventEmitter<()> for DebugSession {}
 
 impl Focusable for DebugSession {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
@@ -142,7 +130,7 @@ impl Focusable for DebugSession {
 }
 
 impl Item for DebugSession {
-    type Event = DebugPanelItemEvent;
+    type Event = ();
     fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
         "Debugger".into()
     }
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index 46e5f35aec..a18a186469 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -14,7 +14,6 @@ use crate::{
     session::running::memory_view::MemoryView,
 };
 
-use super::DebugPanelItemEvent;
 use anyhow::{Context as _, Result, anyhow};
 use breakpoint_list::BreakpointList;
 use collections::{HashMap, IndexMap};
@@ -1826,8 +1825,6 @@ impl RunningState {
     }
 }
 
-impl EventEmitter<DebugPanelItemEvent> for RunningState {}
-
 impl Focusable for RunningState {
     fn focus_handle(&self, _: &App) -> FocusHandle {
         self.focus_handle.clone()
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 5edc7f3c06..fe5b2f83c2 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -20326,7 +20326,6 @@ impl Editor {
             multi_buffer::Event::FileHandleChanged
             | multi_buffer::Event::Reloaded
             | multi_buffer::Event::BufferDiffChanged => cx.emit(EditorEvent::TitleChanged),
-            multi_buffer::Event::Closed => cx.emit(EditorEvent::Closed),
             multi_buffer::Event::DiagnosticsUpdated => {
                 self.update_diagnostics_state(window, cx);
             }
@@ -23024,7 +23023,6 @@ pub enum EditorEvent {
     DirtyChanged,
     Saved,
     TitleChanged,
-    DiffBaseChanged,
     SelectionsChanged {
         local: bool,
     },
@@ -23032,14 +23030,12 @@ pub enum EditorEvent {
         local: bool,
         autoscroll: bool,
     },
-    Closed,
     TransactionUndone {
         transaction_id: clock::Lamport,
     },
     TransactionBegun {
         transaction_id: clock::Lamport,
     },
-    Reloaded,
     CursorShapeChanged,
     BreadcrumbsChanged,
     PushedToNavHistory {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index b7110190fd..8a07939cf4 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -775,12 +775,6 @@ impl Item for Editor {
         self.nav_history = Some(history);
     }
 
-    fn discarded(&self, _project: Entity<Project>, _: &mut Window, cx: &mut Context<Self>) {
-        for buffer in self.buffer().clone().read(cx).all_buffers() {
-            buffer.update(cx, |buffer, cx| buffer.discarded(cx))
-        }
-    }
-
     fn on_removed(&self, cx: &App) {
         self.report_editor_event(ReportEditorEvent::Closed, None, cx);
     }
@@ -1022,8 +1016,6 @@ impl Item for Editor {
 
     fn to_item_events(event: &EditorEvent, mut f: impl FnMut(ItemEvent)) {
         match event {
-            EditorEvent::Closed => f(ItemEvent::CloseItem),
-
             EditorEvent::Saved | EditorEvent::TitleChanged => {
                 f(ItemEvent::UpdateTab);
                 f(ItemEvent::UpdateBreadcrumbs);
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index c978f6c4ef..1f056aacc5 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -315,10 +315,6 @@ pub enum BufferEvent {
     DiagnosticsUpdated,
     /// The buffer gained or lost editing capabilities.
     CapabilityChanged,
-    /// The buffer was explicitly requested to close.
-    Closed,
-    /// The buffer was discarded when closing.
-    Discarded,
 }
 
 /// The file associated with a buffer.
@@ -1246,8 +1242,10 @@ impl Buffer {
 
     /// Assign the buffer a new [`Capability`].
     pub fn set_capability(&mut self, capability: Capability, cx: &mut Context<Self>) {
-        self.capability = capability;
-        cx.emit(BufferEvent::CapabilityChanged)
+        if self.capability != capability {
+            self.capability = capability;
+            cx.emit(BufferEvent::CapabilityChanged)
+        }
     }
 
     /// This method is called to signal that the buffer has been saved.
@@ -1267,12 +1265,6 @@ impl Buffer {
         cx.notify();
     }
 
-    /// This method is called to signal that the buffer has been discarded.
-    pub fn discarded(&self, cx: &mut Context<Self>) {
-        cx.emit(BufferEvent::Discarded);
-        cx.notify();
-    }
-
     /// Reloads the contents of the buffer from disk.
     pub fn reload(&mut self, cx: &Context<Self>) -> oneshot::Receiver<Option<Transaction>> {
         let (tx, rx) = futures::channel::oneshot::channel();
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 874e58d2a3..a2f28215b4 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -113,15 +113,10 @@ pub enum Event {
         transaction_id: TransactionId,
     },
     Reloaded,
-    ReloadNeeded,
-
     LanguageChanged(BufferId),
-    CapabilityChanged,
     Reparsed(BufferId),
     Saved,
     FileHandleChanged,
-    Closed,
-    Discarded,
     DirtyChanged,
     DiagnosticsUpdated,
     BufferDiffChanged,
@@ -2433,28 +2428,24 @@ impl MultiBuffer {
         event: &language::BufferEvent,
         cx: &mut Context<Self>,
     ) {
+        use language::BufferEvent;
         cx.emit(match event {
-            language::BufferEvent::Edited => Event::Edited {
+            BufferEvent::Edited => Event::Edited {
                 singleton_buffer_edited: true,
                 edited_buffer: Some(buffer),
             },
-            language::BufferEvent::DirtyChanged => Event::DirtyChanged,
-            language::BufferEvent::Saved => Event::Saved,
-            language::BufferEvent::FileHandleChanged => Event::FileHandleChanged,
-            language::BufferEvent::Reloaded => Event::Reloaded,
-            language::BufferEvent::ReloadNeeded => Event::ReloadNeeded,
-            language::BufferEvent::LanguageChanged => {
-                Event::LanguageChanged(buffer.read(cx).remote_id())
-            }
-            language::BufferEvent::Reparsed => Event::Reparsed(buffer.read(cx).remote_id()),
-            language::BufferEvent::DiagnosticsUpdated => Event::DiagnosticsUpdated,
-            language::BufferEvent::Closed => Event::Closed,
-            language::BufferEvent::Discarded => Event::Discarded,
-            language::BufferEvent::CapabilityChanged => {
+            BufferEvent::DirtyChanged => Event::DirtyChanged,
+            BufferEvent::Saved => Event::Saved,
+            BufferEvent::FileHandleChanged => Event::FileHandleChanged,
+            BufferEvent::Reloaded => Event::Reloaded,
+            BufferEvent::LanguageChanged => Event::LanguageChanged(buffer.read(cx).remote_id()),
+            BufferEvent::Reparsed => Event::Reparsed(buffer.read(cx).remote_id()),
+            BufferEvent::DiagnosticsUpdated => Event::DiagnosticsUpdated,
+            BufferEvent::CapabilityChanged => {
                 self.capability = buffer.read(cx).capability();
-                Event::CapabilityChanged
+                return;
             }
-            language::BufferEvent::Operation { .. } => return,
+            BufferEvent::Operation { .. } | BufferEvent::ReloadNeeded => return,
         });
     }
 
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 731e169147..f37be0f154 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -541,7 +541,6 @@ pub trait ItemHandle: 'static + Send {
         cx: &mut Context<Workspace>,
     );
     fn deactivated(&self, window: &mut Window, cx: &mut App);
-    fn discarded(&self, project: Entity<Project>, window: &mut Window, cx: &mut App);
     fn on_removed(&self, cx: &App);
     fn workspace_deactivated(&self, window: &mut Window, cx: &mut App);
     fn navigate(&self, data: Box<dyn Any>, window: &mut Window, cx: &mut App) -> bool;
@@ -975,10 +974,6 @@ impl<T: Item> ItemHandle for Entity<T> {
         });
     }
 
-    fn discarded(&self, project: Entity<Project>, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.discarded(project, window, cx));
-    }
-
     fn deactivated(&self, window: &mut Window, cx: &mut App) {
         self.update(cx, |this, cx| this.deactivated(window, cx));
     }
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index fe8014d9f7..b3b16acd4f 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -254,9 +254,6 @@ pub enum Event {
     Remove {
         focus_on_pane: Option<Entity<Pane>>,
     },
-    RemoveItem {
-        idx: usize,
-    },
     RemovedItem {
         item: Box<dyn ItemHandle>,
     },
@@ -287,7 +284,6 @@ impl fmt::Debug for Event {
                 .field("local", local)
                 .finish(),
             Event::Remove { .. } => f.write_str("Remove"),
-            Event::RemoveItem { idx } => f.debug_struct("RemoveItem").field("idx", idx).finish(),
             Event::RemovedItem { item } => f
                 .debug_struct("RemovedItem")
                 .field("item", &item.item_id())
@@ -2096,11 +2092,10 @@ impl Pane {
                             Ok(0) => {}
                             Ok(1) => {
                                 // Don't save this file
-                                pane.update_in(cx, |pane, window, cx| {
+                                pane.update_in(cx, |pane, _, cx| {
                                     if pane.is_tab_pinned(item_ix) && !item.can_save(cx) {
                                         pane.pinned_tab_count -= 1;
                                     }
-                                    item.discarded(project, window, cx)
                                 })
                                 .log_err();
                                 return Ok(true);
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index bd19f37c1e..af86517bb4 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1030,7 +1030,6 @@ pub enum Event {
     ItemAdded {
         item: Box<dyn ItemHandle>,
     },
-    ItemRemoved,
     ActiveItemChanged,
     UserSavedItem {
         pane: WeakEntity<Pane>,
@@ -1046,7 +1045,6 @@ pub enum Event {
     },
     ZoomChanged,
     ModalOpened,
-    ClearActivityIndicator,
 }
 
 #[derive(Debug)]
@@ -3939,7 +3937,6 @@ impl Workspace {
                 }
                 serialize_workspace = false;
             }
-            pane::Event::RemoveItem { .. } => {}
             pane::Event::RemovedItem { item } => {
                 cx.emit(Event::ActiveItemChanged);
                 self.update_window_edited(window, cx);

From b7ad20773c41cccbf5d761d2b7b58c4eb2197c0f Mon Sep 17 00:00:00 2001
From: "Mitch (a.k.a Voz)" <mitchelvostrez@gmail.com>
Date: Thu, 4 Sep 2025 03:25:47 -0500
Subject: [PATCH 597/823] worktree: Create parent directories on rename
 (#37437)

Closes https://github.com/zed-industries/zed/issues/37357

Release Notes:

- Allow creating sub-directories when renaming a file in file finder

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
---
 crates/worktree/src/worktree.rs       | 63 ++++++++++++------
 crates/worktree/src/worktree_tests.rs | 95 +++++++++++++++++++++++++++
 2 files changed, 138 insertions(+), 20 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 711c99ce28..7af86d3364 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -1775,36 +1775,54 @@ impl LocalWorktree {
             };
             absolutize_path
         };
-        let abs_path = abs_new_path.clone();
-        let fs = self.fs.clone();
-        let case_sensitive = self.fs_case_sensitive;
-        let rename = cx.background_spawn(async move {
-            let abs_old_path = abs_old_path?;
-            let abs_new_path = abs_new_path;
 
-            let abs_old_path_lower = abs_old_path.to_str().map(|p| p.to_lowercase());
-            let abs_new_path_lower = abs_new_path.to_str().map(|p| p.to_lowercase());
+        let fs = self.fs.clone();
+        let abs_path = abs_new_path.clone();
+        let case_sensitive = self.fs_case_sensitive;
+
+        let do_rename = async move |fs: &dyn Fs, old_path: &Path, new_path: &Path, overwrite| {
+            fs.rename(
+                &old_path,
+                &new_path,
+                fs::RenameOptions {
+                    overwrite,
+                    ..fs::RenameOptions::default()
+                },
+            )
+            .await
+            .with_context(|| format!("renaming {old_path:?} into {new_path:?}"))
+        };
+
+        let rename_task = cx.background_spawn(async move {
+            let abs_old_path = abs_old_path?;
 
             // If we're on a case-insensitive FS and we're doing a case-only rename (i.e. `foobar` to `FOOBAR`)
             // we want to overwrite, because otherwise we run into a file-already-exists error.
             let overwrite = !case_sensitive
                 && abs_old_path != abs_new_path
-                && abs_old_path_lower == abs_new_path_lower;
+                && abs_old_path.to_str().map(|p| p.to_lowercase())
+                    == abs_new_path.to_str().map(|p| p.to_lowercase());
 
-            fs.rename(
-                &abs_old_path,
-                &abs_new_path,
-                fs::RenameOptions {
-                    overwrite,
-                    ..Default::default()
-                },
-            )
-            .await
-            .with_context(|| format!("Renaming {abs_old_path:?} into {abs_new_path:?}"))
+            // The directory we're renaming into might not exist yet
+            if let Err(e) = do_rename(fs.as_ref(), &abs_old_path, &abs_new_path, overwrite).await {
+                if let Some(err) = e.downcast_ref::<std::io::Error>()
+                    && err.kind() == std::io::ErrorKind::NotFound
+                {
+                    if let Some(parent) = abs_new_path.parent() {
+                        fs.create_dir(parent)
+                            .await
+                            .with_context(|| format!("creating parent directory {parent:?}"))?;
+                        return do_rename(fs.as_ref(), &abs_old_path, &abs_new_path, overwrite)
+                            .await;
+                    }
+                }
+                return Err(e);
+            }
+            Ok(())
         });
 
         cx.spawn(async move |this, cx| {
-            rename.await?;
+            rename_task.await?;
             Ok(this
                 .update(cx, |this, cx| {
                     let local = this.as_local_mut().unwrap();
@@ -1818,6 +1836,11 @@ impl LocalWorktree {
                         );
                         Task::ready(Ok(this.root_entry().cloned()))
                     } else {
+                        // First refresh the parent directory (in case it was newly created)
+                        if let Some(parent) = new_path.parent() {
+                            let _ = local.refresh_entries_for_paths(vec![parent.into()]);
+                        }
+                        // Then refresh the new path
                         local.refresh_entry(new_path.clone(), Some(old_path), cx)
                     }
                 })?
diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs
index c46e14f077..1783ba317c 100644
--- a/crates/worktree/src/worktree_tests.rs
+++ b/crates/worktree/src/worktree_tests.rs
@@ -1924,6 +1924,101 @@ fn random_filename(rng: &mut impl Rng) -> String {
         .collect()
 }
 
+#[gpui::test]
+async fn test_rename_file_to_new_directory(cx: &mut TestAppContext) {
+    init_test(cx);
+    let fs = FakeFs::new(cx.background_executor.clone());
+    let expected_contents = "content";
+    fs.as_fake()
+        .insert_tree(
+            "/root",
+            json!({
+                "test.txt": expected_contents
+            }),
+        )
+        .await;
+    let worktree = Worktree::local(
+        Path::new("/root"),
+        true,
+        fs.clone(),
+        Arc::default(),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    cx.read(|cx| worktree.read(cx).as_local().unwrap().scan_complete())
+        .await;
+
+    let entry_id = worktree.read_with(cx, |worktree, _| {
+        worktree.entry_for_path("test.txt").unwrap().id
+    });
+    let _result = worktree
+        .update(cx, |worktree, cx| {
+            worktree.rename_entry(entry_id, Path::new("dir1/dir2/dir3/test.txt"), cx)
+        })
+        .await
+        .unwrap();
+    worktree.read_with(cx, |worktree, _| {
+        assert!(
+            worktree.entry_for_path("test.txt").is_none(),
+            "Old file should have been removed"
+        );
+        assert!(
+            worktree.entry_for_path("dir1/dir2/dir3/test.txt").is_some(),
+            "Whole directory hierarchy and the new file should have been created"
+        );
+    });
+    assert_eq!(
+        worktree
+            .update(cx, |worktree, cx| {
+                worktree.load_file("dir1/dir2/dir3/test.txt".as_ref(), cx)
+            })
+            .await
+            .unwrap()
+            .text,
+        expected_contents,
+        "Moved file's contents should be preserved"
+    );
+
+    let entry_id = worktree.read_with(cx, |worktree, _| {
+        worktree
+            .entry_for_path("dir1/dir2/dir3/test.txt")
+            .unwrap()
+            .id
+    });
+    let _result = worktree
+        .update(cx, |worktree, cx| {
+            worktree.rename_entry(entry_id, Path::new("dir1/dir2/test.txt"), cx)
+        })
+        .await
+        .unwrap();
+    worktree.read_with(cx, |worktree, _| {
+        assert!(
+            worktree.entry_for_path("test.txt").is_none(),
+            "First file should not reappear"
+        );
+        assert!(
+            worktree.entry_for_path("dir1/dir2/dir3/test.txt").is_none(),
+            "Old file should have been removed"
+        );
+        assert!(
+            worktree.entry_for_path("dir1/dir2/test.txt").is_some(),
+            "No error should have occurred after moving into existing directory"
+        );
+    });
+    assert_eq!(
+        worktree
+            .update(cx, |worktree, cx| {
+                worktree.load_file("dir1/dir2/test.txt".as_ref(), cx)
+            })
+            .await
+            .unwrap()
+            .text,
+        expected_contents,
+        "Moved file's contents should be preserved"
+    );
+}
+
 #[gpui::test]
 async fn test_private_single_file_worktree(cx: &mut TestAppContext) {
     init_test(cx);

From fca44f89c11070fad20bc365bd9e8ab484be1f21 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 4 Sep 2025 11:22:19 +0200
Subject: [PATCH 598/823] languages: Allow installing pre-release of
 rust-analyzer and clangd (#37530)

Release Notes:

- Added lsp binary config to allow fetching nightly rust-analyzer and
clangd releases
---
 crates/editor/src/editor_tests.rs             |  4 +++
 crates/language/src/language.rs               |  4 ++-
 .../src/extension_lsp_adapter.rs              |  1 +
 crates/languages/src/c.rs                     | 17 +++++++++--
 crates/languages/src/css.rs                   |  1 +
 crates/languages/src/go.rs                    |  1 +
 crates/languages/src/json.rs                  |  2 ++
 crates/languages/src/python.rs                |  3 ++
 crates/languages/src/rust.rs                  |  7 ++++-
 crates/languages/src/tailwind.rs              |  1 +
 crates/languages/src/typescript.rs            |  2 ++
 crates/languages/src/vtsls.rs                 |  1 +
 crates/languages/src/yaml.rs                  |  1 +
 crates/project/src/lsp_store.rs               |  1 +
 crates/project/src/project_settings.rs        |  8 ++++++
 docs/src/languages/cpp.md                     | 28 +++++++++++++++----
 docs/src/languages/rust.md                    | 16 ++++++++++-
 17 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 5efa390825..90e488368f 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -16783,6 +16783,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppCon
                     "some other init value": false
                 })),
                 enable_lsp_tasks: false,
+                fetch: None,
             },
         );
     });
@@ -16803,6 +16804,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppCon
                     "anotherInitValue": false
                 })),
                 enable_lsp_tasks: false,
+                fetch: None,
             },
         );
     });
@@ -16823,6 +16825,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppCon
                     "anotherInitValue": false
                 })),
                 enable_lsp_tasks: false,
+                fetch: None,
             },
         );
     });
@@ -16841,6 +16844,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppCon
                 settings: None,
                 initialization_options: None,
                 enable_lsp_tasks: false,
+                fetch: None,
             },
         );
     });
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 0606ae3de9..e4a1510d7d 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -395,6 +395,7 @@ pub trait LspAdapter: 'static + Send + Sync {
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
+        cx: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>>;
 
     fn will_fetch_server(
@@ -605,7 +606,7 @@ async fn try_fetch_server_binary<L: LspAdapter + 'static + Send + Sync + ?Sized>
     delegate.update_status(name.clone(), BinaryStatus::CheckingForUpdate);
 
     let latest_version = adapter
-        .fetch_latest_server_version(delegate.as_ref())
+        .fetch_latest_server_version(delegate.as_ref(), cx)
         .await?;
 
     if let Some(binary) = adapter
@@ -2222,6 +2223,7 @@ impl LspAdapter for FakeLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         unreachable!();
     }
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index e465a8dd0a..9b6e467f2f 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -204,6 +204,7 @@ impl LspAdapter for ExtensionLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         unreachable!("get_language_server_command is overridden")
     }
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index 2820f55a49..afdf49e66e 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -5,8 +5,9 @@ use gpui::{App, AsyncApp};
 use http_client::github::{AssetKind, GitHubLspBinaryVersion, latest_github_release};
 pub use language::*;
 use lsp::{InitializeParams, LanguageServerBinary, LanguageServerName};
-use project::lsp_store::clangd_ext;
+use project::{lsp_store::clangd_ext, project_settings::ProjectSettings};
 use serde_json::json;
+use settings::Settings as _;
 use smol::fs;
 use std::{any::Any, env::consts, path::PathBuf, sync::Arc};
 use util::{ResultExt, fs::remove_matching, maybe, merge_json_value_into};
@@ -42,9 +43,19 @@ impl super::LspAdapter for CLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
+        cx: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release =
-            latest_github_release("clangd/clangd", true, false, delegate.http_client()).await?;
+        let release = latest_github_release(
+            "clangd/clangd",
+            true,
+            ProjectSettings::try_read_global(cx, |s| {
+                s.lsp.get(&Self::SERVER_NAME)?.fetch.as_ref()?.pre_release
+            })
+            .flatten()
+            .unwrap_or(false),
+            delegate.http_client(),
+        )
+        .await?;
         let os_suffix = match consts::OS {
             "macos" => "mac",
             "linux" => "linux",
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index 2480d40268..5cea35084d 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -61,6 +61,7 @@ impl LspAdapter for CssLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Any + Send>> {
         Ok(Box::new(
             self.node
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 86f8e1faaa..8c116c899f 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -59,6 +59,7 @@ impl super::LspAdapter for GoLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release =
             latest_github_release("golang/tools", false, false, delegate.http_client()).await?;
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 4fcf865568..a33f5c9836 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -321,6 +321,7 @@ impl LspAdapter for JsonLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         Ok(Box::new(
             self.node
@@ -494,6 +495,7 @@ impl LspAdapter for NodeVersionAdapter {
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release = latest_github_release(
             "zed-industries/package-version-server",
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index bd3a7b34cf..5e6f5e414f 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -157,6 +157,7 @@ impl LspAdapter for PythonLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Any + Send>> {
         Ok(Box::new(
             self.node
@@ -1111,6 +1112,7 @@ impl LspAdapter for PyLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Any + Send>> {
         Ok(Box::new(()) as Box<_>)
     }
@@ -1422,6 +1424,7 @@ impl LspAdapter for BasedPyrightLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Any + Send>> {
         Ok(Box::new(()) as Box<_>)
     }
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index a5acc00432..3d5ff1cd06 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -147,11 +147,16 @@ impl LspAdapter for RustLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
+        cx: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release = latest_github_release(
             "rust-lang/rust-analyzer",
             true,
-            false,
+            ProjectSettings::try_read_global(cx, |s| {
+                s.lsp.get(&SERVER_NAME)?.fetch.as_ref()?.pre_release
+            })
+            .flatten()
+            .unwrap_or(false),
             delegate.http_client(),
         )
         .await?;
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 7215dc0d59..af7653ea9e 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -66,6 +66,7 @@ impl LspAdapter for TailwindLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Any + Send>> {
         Ok(Box::new(
             self.node
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index 77cf1a64f1..15adea6070 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -563,6 +563,7 @@ impl LspAdapter for TypeScriptLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         Ok(Box::new(TypeScriptVersions {
             typescript_version: self.node.npm_package_latest_version("typescript").await?,
@@ -885,6 +886,7 @@ impl LspAdapter for EsLintLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _delegate: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let url = build_asset_url(
             "zed-industries/vscode-eslint",
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index f7152b0b5d..1cf3c8aa52 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -73,6 +73,7 @@ impl LspAdapter for VtslsLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         Ok(Box::new(TypeScriptVersions {
             typescript_version: self.node.npm_package_latest_version("typescript").await?,
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index b9197b12ae..bf634aafba 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -44,6 +44,7 @@ impl LspAdapter for YamlLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Any + Send>> {
         Ok(Box::new(
             self.node
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 6e06c2dd95..36ec338fb7 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -13070,6 +13070,7 @@ impl LspAdapter for SshLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         anyhow::bail!("SshLspAdapter does not support fetch_latest_server_version")
     }
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 4087463811..c98065116e 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -516,6 +516,12 @@ pub struct BinarySettings {
     pub ignore_system_version: Option<bool>,
 }
 
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, Hash)]
+pub struct FetchSettings {
+    // Whether to consider pre-releases for fetching
+    pub pre_release: Option<bool>,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, Hash)]
 #[serde(rename_all = "snake_case")]
 pub struct LspSettings {
@@ -527,6 +533,7 @@ pub struct LspSettings {
     /// Default: true
     #[serde(default = "default_true")]
     pub enable_lsp_tasks: bool,
+    pub fetch: Option<FetchSettings>,
 }
 
 impl Default for LspSettings {
@@ -536,6 +543,7 @@ impl Default for LspSettings {
             initialization_options: None,
             settings: None,
             enable_lsp_tasks: true,
+            fetch: None,
         }
     }
 }
diff --git a/docs/src/languages/cpp.md b/docs/src/languages/cpp.md
index e84bb6ea50..91395b5a94 100644
--- a/docs/src/languages/cpp.md
+++ b/docs/src/languages/cpp.md
@@ -9,22 +9,23 @@ C++ support is available natively in Zed.
 
 You can configure which `clangd` binary Zed should use.
 
-To use a binary in a custom location, add the following to your `settings.json`:
+By default, Zed will try to find a `clangd` in your `$PATH` and try to use that. If that binary successfully executes, it's used. Otherwise, Zed will fall back to installing its own `clangd` version and use that.
+
+If you want to install a pre-release `clangd` version instead you can instruct Zed to do so by setting `pre_release` to `true` in your `settings.json`:
 
 ```json
 {
   "lsp": {
     "clangd": {
-      "binary": {
-        "path": "/path/to/clangd",
-        "arguments": []
+      "fetch": {
+        "pre_release": true
       }
     }
   }
 }
 ```
 
-If you want to disable Zed looking for a `clangd` binary, you can set `ignore_system_version` to `true`:
+If you want to disable Zed looking for a `clangd` binary, you can set `ignore_system_version` to `true` in your `settings.json`:
 
 ```json
 {
@@ -38,6 +39,23 @@ If you want to disable Zed looking for a `clangd` binary, you can set `ignore_sy
 }
 ```
 
+If you want to use a binary in a custom location, you can specify a `path` and optional `arguments`:
+
+```json
+{
+  "lsp": {
+    "cangd": {
+      "binary": {
+        "path": "/path/to/clangd",
+        "arguments": []
+      }
+    }
+  }
+}
+```
+
+This `"path"` has to be an absolute path.
+
 ## Arguments
 
 You can pass any number of arguments to clangd. To see a full set of available options, run `clangd --help` from the command line. For example with `--function-arg-placeholders=0` completions contain only parentheses for function calls, while the default (`--function-arg-placeholders=1`) completions also contain placeholders for method parameters.
diff --git a/docs/src/languages/rust.md b/docs/src/languages/rust.md
index 0bfa3ecac7..c8dd1ac550 100644
--- a/docs/src/languages/rust.md
+++ b/docs/src/languages/rust.md
@@ -63,7 +63,21 @@ A `true` setting will set the target directory to `target/rust-analyzer`. You ca
 
 You can configure which `rust-analyzer` binary Zed should use.
 
-By default, Zed will try to find a `rust-analyzer` in your `$PATH` and try to use that. If that binary successfully executes `rust-analyzer --help`, it's used. Otherwise, Zed will fall back to installing its own `rust-analyzer` version and using that.
+By default, Zed will try to find a `rust-analyzer` in your `$PATH` and try to use that. If that binary successfully executes `rust-analyzer --help`, it's used. Otherwise, Zed will fall back to installing its own stable `rust-analyzer` version and use that.
+
+If you want to install pre-release `rust-analyzer` version instead you can instruct Zed to do so by setting `pre_release` to `true` in your `settings.json`:
+
+```json
+{
+  "lsp": {
+    "rust-analyzer": {
+      "fetch": {
+        "pre_release": true
+      }
+    }
+  }
+}
+```
 
 If you want to disable Zed looking for a `rust-analyzer` binary, you can set `ignore_system_version` to `true` in your `settings.json`:
 

From 28c78d2d85c81d7ea9a0e3dbab5db8a8bf0e9f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Thu, 4 Sep 2025 21:31:12 +0800
Subject: [PATCH 599/823] windows: Keep just one copy of GPU instance (#37445)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now we only keep a single copy of the GPU device. The GPU lost handling
got broken after #35376, but it’s properly handled again now.

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows.rs           |   2 +
 .../gpui/src/platform/windows/direct_write.rs |  34 ++-
 .../src/platform/windows/directx_devices.rs   | 180 ++++++++++++
 .../src/platform/windows/directx_renderer.rs  | 272 +++++-------------
 crates/gpui/src/platform/windows/events.rs    |  29 +-
 crates/gpui/src/platform/windows/platform.rs  | 139 ++++++++-
 crates/gpui/src/platform/windows/window.rs    |   9 +-
 7 files changed, 431 insertions(+), 234 deletions(-)
 create mode 100644 crates/gpui/src/platform/windows/directx_devices.rs

diff --git a/crates/gpui/src/platform/windows.rs b/crates/gpui/src/platform/windows.rs
index 77e0ca41bf..9cd1a7d05f 100644
--- a/crates/gpui/src/platform/windows.rs
+++ b/crates/gpui/src/platform/windows.rs
@@ -2,6 +2,7 @@ mod clipboard;
 mod destination_list;
 mod direct_write;
 mod directx_atlas;
+mod directx_devices;
 mod directx_renderer;
 mod dispatcher;
 mod display;
@@ -18,6 +19,7 @@ pub(crate) use clipboard::*;
 pub(crate) use destination_list::*;
 pub(crate) use direct_write::*;
 pub(crate) use directx_atlas::*;
+pub(crate) use directx_devices::*;
 pub(crate) use directx_renderer::*;
 pub(crate) use dispatcher::*;
 pub(crate) use display::*;
diff --git a/crates/gpui/src/platform/windows/direct_write.rs b/crates/gpui/src/platform/windows/direct_write.rs
index ec6d008e7b..df3161bf07 100644
--- a/crates/gpui/src/platform/windows/direct_write.rs
+++ b/crates/gpui/src/platform/windows/direct_write.rs
@@ -1,7 +1,7 @@
 use std::{borrow::Cow, sync::Arc};
 
 use ::util::ResultExt;
-use anyhow::Result;
+use anyhow::{Context, Result};
 use collections::HashMap;
 use itertools::Itertools;
 use parking_lot::{RwLock, RwLockUpgradableReadGuard};
@@ -70,7 +70,7 @@ struct FontIdentifier {
 }
 
 impl DirectWriteComponent {
-    pub fn new(gpu_context: &DirectXDevices) -> Result<Self> {
+    pub fn new(directx_devices: &DirectXDevices) -> Result<Self> {
         // todo: ideally this would not be a large unsafe block but smaller isolated ones for easier auditing
         unsafe {
             let factory: IDWriteFactory5 = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED)?;
@@ -85,7 +85,7 @@ impl DirectWriteComponent {
             let locale = String::from_utf16_lossy(&locale_vec);
             let text_renderer = Arc::new(TextRendererWrapper::new(&locale));
 
-            let gpu_state = GPUState::new(gpu_context)?;
+            let gpu_state = GPUState::new(directx_devices)?;
 
             Ok(DirectWriteComponent {
                 locale,
@@ -100,9 +100,9 @@ impl DirectWriteComponent {
 }
 
 impl GPUState {
-    fn new(gpu_context: &DirectXDevices) -> Result<Self> {
-        let device = gpu_context.device.clone();
-        let device_context = gpu_context.device_context.clone();
+    fn new(directx_devices: &DirectXDevices) -> Result<Self> {
+        let device = directx_devices.device.clone();
+        let device_context = directx_devices.device_context.clone();
 
         let blend_state = {
             let mut blend_state = None;
@@ -183,8 +183,8 @@ impl GPUState {
 }
 
 impl DirectWriteTextSystem {
-    pub(crate) fn new(gpu_context: &DirectXDevices) -> Result<Self> {
-        let components = DirectWriteComponent::new(gpu_context)?;
+    pub(crate) fn new(directx_devices: &DirectXDevices) -> Result<Self> {
+        let components = DirectWriteComponent::new(directx_devices)?;
         let system_font_collection = unsafe {
             let mut result = std::mem::zeroed();
             components
@@ -210,6 +210,10 @@ impl DirectWriteTextSystem {
             font_id_by_identifier: HashMap::default(),
         })))
     }
+
+    pub(crate) fn handle_gpu_lost(&self, directx_devices: &DirectXDevices) {
+        self.0.write().handle_gpu_lost(directx_devices);
+    }
 }
 
 impl PlatformTextSystem for DirectWriteTextSystem {
@@ -1211,6 +1215,20 @@ impl DirectWriteState {
         ));
         result
     }
+
+    fn handle_gpu_lost(&mut self, directx_devices: &DirectXDevices) {
+        try_to_recover_from_device_lost(
+            || GPUState::new(directx_devices).context("Recreating GPU state for DirectWrite"),
+            |gpu_state| self.components.gpu_state = gpu_state,
+            || {
+                log::error!(
+                    "Failed to recreate GPU state for DirectWrite after multiple attempts."
+                );
+                // Do something here?
+                // At this point, the device loss is considered unrecoverable.
+            },
+        );
+    }
 }
 
 impl Drop for DirectWriteState {
diff --git a/crates/gpui/src/platform/windows/directx_devices.rs b/crates/gpui/src/platform/windows/directx_devices.rs
new file mode 100644
index 0000000000..005737ca20
--- /dev/null
+++ b/crates/gpui/src/platform/windows/directx_devices.rs
@@ -0,0 +1,180 @@
+use anyhow::{Context, Result};
+use util::ResultExt;
+use windows::Win32::{
+    Foundation::HMODULE,
+    Graphics::{
+        Direct3D::{
+            D3D_DRIVER_TYPE_UNKNOWN, D3D_FEATURE_LEVEL, D3D_FEATURE_LEVEL_10_1,
+            D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_11_1,
+        },
+        Direct3D11::{
+            D3D11_CREATE_DEVICE_BGRA_SUPPORT, D3D11_CREATE_DEVICE_DEBUG, D3D11_SDK_VERSION,
+            D3D11CreateDevice, ID3D11Device, ID3D11DeviceContext,
+        },
+        Dxgi::{
+            CreateDXGIFactory2, DXGI_CREATE_FACTORY_DEBUG, DXGI_CREATE_FACTORY_FLAGS,
+            DXGI_GPU_PREFERENCE_MINIMUM_POWER, IDXGIAdapter1, IDXGIFactory6,
+        },
+    },
+};
+
+pub(crate) fn try_to_recover_from_device_lost<T>(
+    mut f: impl FnMut() -> Result<T>,
+    on_success: impl FnOnce(T),
+    on_error: impl FnOnce(),
+) {
+    let result = (0..5).find_map(|i| {
+        if i > 0 {
+            // Add a small delay before retrying
+            std::thread::sleep(std::time::Duration::from_millis(100));
+        }
+        f().log_err()
+    });
+
+    if let Some(result) = result {
+        on_success(result);
+    } else {
+        on_error();
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct DirectXDevices {
+    pub(crate) adapter: IDXGIAdapter1,
+    pub(crate) dxgi_factory: IDXGIFactory6,
+    pub(crate) device: ID3D11Device,
+    pub(crate) device_context: ID3D11DeviceContext,
+}
+
+impl DirectXDevices {
+    pub(crate) fn new() -> Result<Self> {
+        let debug_layer_available = check_debug_layer_available();
+        let dxgi_factory =
+            get_dxgi_factory(debug_layer_available).context("Creating DXGI factory")?;
+        let adapter =
+            get_adapter(&dxgi_factory, debug_layer_available).context("Getting DXGI adapter")?;
+        let (device, device_context) = {
+            let mut device: Option<ID3D11Device> = None;
+            let mut context: Option<ID3D11DeviceContext> = None;
+            let mut feature_level = D3D_FEATURE_LEVEL::default();
+            get_device(
+                &adapter,
+                Some(&mut device),
+                Some(&mut context),
+                Some(&mut feature_level),
+                debug_layer_available,
+            )
+            .context("Creating Direct3D device")?;
+            match feature_level {
+                D3D_FEATURE_LEVEL_11_1 => {
+                    log::info!("Created device with Direct3D 11.1 feature level.")
+                }
+                D3D_FEATURE_LEVEL_11_0 => {
+                    log::info!("Created device with Direct3D 11.0 feature level.")
+                }
+                D3D_FEATURE_LEVEL_10_1 => {
+                    log::info!("Created device with Direct3D 10.1 feature level.")
+                }
+                _ => unreachable!(),
+            }
+            (device.unwrap(), context.unwrap())
+        };
+
+        Ok(Self {
+            adapter,
+            dxgi_factory,
+            device,
+            device_context,
+        })
+    }
+}
+
+#[inline]
+fn check_debug_layer_available() -> bool {
+    #[cfg(debug_assertions)]
+    {
+        use windows::Win32::Graphics::Dxgi::{DXGIGetDebugInterface1, IDXGIInfoQueue};
+
+        unsafe { DXGIGetDebugInterface1::<IDXGIInfoQueue>(0) }
+            .log_err()
+            .is_some()
+    }
+    #[cfg(not(debug_assertions))]
+    {
+        false
+    }
+}
+
+#[inline]
+fn get_dxgi_factory(debug_layer_available: bool) -> Result<IDXGIFactory6> {
+    let factory_flag = if debug_layer_available {
+        DXGI_CREATE_FACTORY_DEBUG
+    } else {
+        #[cfg(debug_assertions)]
+        log::warn!(
+            "Failed to get DXGI debug interface. DirectX debugging features will be disabled."
+        );
+        DXGI_CREATE_FACTORY_FLAGS::default()
+    };
+    unsafe { Ok(CreateDXGIFactory2(factory_flag)?) }
+}
+
+#[inline]
+fn get_adapter(dxgi_factory: &IDXGIFactory6, debug_layer_available: bool) -> Result<IDXGIAdapter1> {
+    for adapter_index in 0.. {
+        let adapter: IDXGIAdapter1 = unsafe {
+            dxgi_factory
+                .EnumAdapterByGpuPreference(adapter_index, DXGI_GPU_PREFERENCE_MINIMUM_POWER)
+        }?;
+        if let Ok(desc) = unsafe { adapter.GetDesc1() } {
+            let gpu_name = String::from_utf16_lossy(&desc.Description)
+                .trim_matches(char::from(0))
+                .to_string();
+            log::info!("Using GPU: {}", gpu_name);
+        }
+        // Check to see whether the adapter supports Direct3D 11, but don't
+        // create the actual device yet.
+        if get_device(&adapter, None, None, None, debug_layer_available)
+            .log_err()
+            .is_some()
+        {
+            return Ok(adapter);
+        }
+    }
+
+    unreachable!()
+}
+
+#[inline]
+fn get_device(
+    adapter: &IDXGIAdapter1,
+    device: Option<*mut Option<ID3D11Device>>,
+    context: Option<*mut Option<ID3D11DeviceContext>>,
+    feature_level: Option<*mut D3D_FEATURE_LEVEL>,
+    debug_layer_available: bool,
+) -> Result<()> {
+    let device_flags = if debug_layer_available {
+        D3D11_CREATE_DEVICE_BGRA_SUPPORT | D3D11_CREATE_DEVICE_DEBUG
+    } else {
+        D3D11_CREATE_DEVICE_BGRA_SUPPORT
+    };
+    unsafe {
+        D3D11CreateDevice(
+            adapter,
+            D3D_DRIVER_TYPE_UNKNOWN,
+            HMODULE::default(),
+            device_flags,
+            // 4x MSAA is required for Direct3D Feature Level 10.1 or better
+            Some(&[
+                D3D_FEATURE_LEVEL_11_1,
+                D3D_FEATURE_LEVEL_11_0,
+                D3D_FEATURE_LEVEL_10_1,
+            ]),
+            D3D11_SDK_VERSION,
+            device,
+            feature_level,
+            context,
+        )?;
+    }
+    Ok(())
+}
diff --git a/crates/gpui/src/platform/windows/directx_renderer.rs b/crates/gpui/src/platform/windows/directx_renderer.rs
index 0c092e2228..2baa237cda 100644
--- a/crates/gpui/src/platform/windows/directx_renderer.rs
+++ b/crates/gpui/src/platform/windows/directx_renderer.rs
@@ -7,7 +7,7 @@ use ::util::ResultExt;
 use anyhow::{Context, Result};
 use windows::{
     Win32::{
-        Foundation::{HMODULE, HWND},
+        Foundation::HWND,
         Graphics::{
             Direct3D::*,
             Direct3D11::*,
@@ -39,7 +39,7 @@ pub(crate) struct FontInfo {
 pub(crate) struct DirectXRenderer {
     hwnd: HWND,
     atlas: Arc<DirectXAtlas>,
-    devices: ManuallyDrop<DirectXDevices>,
+    devices: ManuallyDrop<DirectXRendererDevices>,
     resources: ManuallyDrop<DirectXResources>,
     globals: DirectXGlobalElements,
     pipelines: DirectXRenderPipelines,
@@ -49,9 +49,9 @@ pub(crate) struct DirectXRenderer {
 
 /// Direct3D objects
 #[derive(Clone)]
-pub(crate) struct DirectXDevices {
-    adapter: IDXGIAdapter1,
-    dxgi_factory: IDXGIFactory6,
+pub(crate) struct DirectXRendererDevices {
+    pub(crate) adapter: IDXGIAdapter1,
+    pub(crate) dxgi_factory: IDXGIFactory6,
     pub(crate) device: ID3D11Device,
     pub(crate) device_context: ID3D11DeviceContext,
     dxgi_device: Option<IDXGIDevice>,
@@ -96,39 +96,17 @@ struct DirectComposition {
     comp_visual: IDCompositionVisual,
 }
 
-impl DirectXDevices {
-    pub(crate) fn new(disable_direct_composition: bool) -> Result<ManuallyDrop<Self>> {
-        let debug_layer_available = check_debug_layer_available();
-        let dxgi_factory =
-            get_dxgi_factory(debug_layer_available).context("Creating DXGI factory")?;
-        let adapter =
-            get_adapter(&dxgi_factory, debug_layer_available).context("Getting DXGI adapter")?;
-        let (device, device_context) = {
-            let mut device: Option<ID3D11Device> = None;
-            let mut context: Option<ID3D11DeviceContext> = None;
-            let mut feature_level = D3D_FEATURE_LEVEL::default();
-            get_device(
-                &adapter,
-                Some(&mut device),
-                Some(&mut context),
-                Some(&mut feature_level),
-                debug_layer_available,
-            )
-            .context("Creating Direct3D device")?;
-            match feature_level {
-                D3D_FEATURE_LEVEL_11_1 => {
-                    log::info!("Created device with Direct3D 11.1 feature level.")
-                }
-                D3D_FEATURE_LEVEL_11_0 => {
-                    log::info!("Created device with Direct3D 11.0 feature level.")
-                }
-                D3D_FEATURE_LEVEL_10_1 => {
-                    log::info!("Created device with Direct3D 10.1 feature level.")
-                }
-                _ => unreachable!(),
-            }
-            (device.unwrap(), context.unwrap())
-        };
+impl DirectXRendererDevices {
+    pub(crate) fn new(
+        directx_devices: &DirectXDevices,
+        disable_direct_composition: bool,
+    ) -> Result<ManuallyDrop<Self>> {
+        let DirectXDevices {
+            adapter,
+            dxgi_factory,
+            device,
+            device_context,
+        } = directx_devices;
         let dxgi_device = if disable_direct_composition {
             None
         } else {
@@ -136,23 +114,27 @@ impl DirectXDevices {
         };
 
         Ok(ManuallyDrop::new(Self {
-            adapter,
-            dxgi_factory,
+            adapter: adapter.clone(),
+            dxgi_factory: dxgi_factory.clone(),
+            device: device.clone(),
+            device_context: device_context.clone(),
             dxgi_device,
-            device,
-            device_context,
         }))
     }
 }
 
 impl DirectXRenderer {
-    pub(crate) fn new(hwnd: HWND, disable_direct_composition: bool) -> Result<Self> {
+    pub(crate) fn new(
+        hwnd: HWND,
+        directx_devices: &DirectXDevices,
+        disable_direct_composition: bool,
+    ) -> Result<Self> {
         if disable_direct_composition {
             log::info!("Direct Composition is disabled.");
         }
 
-        let devices =
-            DirectXDevices::new(disable_direct_composition).context("Creating DirectX devices")?;
+        let devices = DirectXRendererDevices::new(directx_devices, disable_direct_composition)
+            .context("Creating DirectX devices")?;
         let atlas = Arc::new(DirectXAtlas::new(&devices.device, &devices.device_context));
 
         let resources = DirectXResources::new(&devices, 1, 1, hwnd, disable_direct_composition)
@@ -218,28 +200,30 @@ impl DirectXRenderer {
         Ok(())
     }
 
+    #[inline]
     fn present(&mut self) -> Result<()> {
-        unsafe {
-            let result = self.resources.swap_chain.Present(0, DXGI_PRESENT(0));
-            // Presenting the swap chain can fail if the DirectX device was removed or reset.
-            if result == DXGI_ERROR_DEVICE_REMOVED || result == DXGI_ERROR_DEVICE_RESET {
-                let reason = self.devices.device.GetDeviceRemovedReason();
-                log::error!(
-                    "DirectX device removed or reset when drawing. Reason: {:?}",
-                    reason
-                );
-                self.handle_device_lost()?;
-            } else {
-                result.ok()?;
-            }
-        }
-        Ok(())
+        let result = unsafe { self.resources.swap_chain.Present(0, DXGI_PRESENT(0)) };
+        result.ok().context("Presenting swap chain failed")
     }
 
-    fn handle_device_lost(&mut self) -> Result<()> {
-        // Here we wait a bit to ensure the the system has time to recover from the device lost state.
-        // If we don't wait, the final drawing result will be blank.
-        std::thread::sleep(std::time::Duration::from_millis(300));
+    pub(crate) fn handle_device_lost(&mut self, directx_devices: &DirectXDevices) {
+        try_to_recover_from_device_lost(
+            || {
+                self.handle_device_lost_impl(directx_devices)
+                    .context("DirectXRenderer handling device lost")
+            },
+            |_| {},
+            || {
+                log::error!(
+                    "DirectXRenderer failed to recover from device lost after multiple attempts"
+                );
+                // Do something here?
+                // At this point, the device loss is considered unrecoverable.
+            },
+        );
+    }
+
+    fn handle_device_lost_impl(&mut self, directx_devices: &DirectXDevices) -> Result<()> {
         let disable_direct_composition = self.direct_composition.is_none();
 
         unsafe {
@@ -262,7 +246,7 @@ impl DirectXRenderer {
             ManuallyDrop::drop(&mut self.devices);
         }
 
-        let devices = DirectXDevices::new(disable_direct_composition)
+        let devices = DirectXRendererDevices::new(directx_devices, disable_direct_composition)
             .context("Recreating DirectX devices")?;
         let resources = DirectXResources::new(
             &devices,
@@ -337,49 +321,39 @@ impl DirectXRenderer {
         if self.resources.width == width && self.resources.height == height {
             return Ok(());
         }
+        self.resources.width = width;
+        self.resources.height = height;
+
+        // Clear the render target before resizing
+        unsafe { self.devices.device_context.OMSetRenderTargets(None, None) };
+        unsafe { ManuallyDrop::drop(&mut self.resources.render_target) };
+        drop(self.resources.render_target_view[0].take().unwrap());
+
+        // Resizing the swap chain requires a call to the underlying DXGI adapter, which can return the device removed error.
+        // The app might have moved to a monitor that's attached to a different graphics device.
+        // When a graphics device is removed or reset, the desktop resolution often changes, resulting in a window size change.
+        // But here we just return the error, because we are handling device lost scenarios elsewhere.
         unsafe {
-            // Clear the render target before resizing
-            self.devices.device_context.OMSetRenderTargets(None, None);
-            ManuallyDrop::drop(&mut self.resources.render_target);
-            drop(self.resources.render_target_view[0].take().unwrap());
-
-            let result = self.resources.swap_chain.ResizeBuffers(
-                BUFFER_COUNT as u32,
-                width,
-                height,
-                RENDER_TARGET_FORMAT,
-                DXGI_SWAP_CHAIN_FLAG(0),
-            );
-            // Resizing the swap chain requires a call to the underlying DXGI adapter, which can return the device removed error.
-            // The app might have moved to a monitor that's attached to a different graphics device.
-            // When a graphics device is removed or reset, the desktop resolution often changes, resulting in a window size change.
-            match result {
-                Ok(_) => {}
-                Err(e) => {
-                    if e.code() == DXGI_ERROR_DEVICE_REMOVED || e.code() == DXGI_ERROR_DEVICE_RESET
-                    {
-                        let reason = self.devices.device.GetDeviceRemovedReason();
-                        log::error!(
-                            "DirectX device removed or reset when resizing. Reason: {:?}",
-                            reason
-                        );
-                        self.resources.width = width;
-                        self.resources.height = height;
-                        self.handle_device_lost()?;
-                        return Ok(());
-                    } else {
-                        log::error!("Failed to resize swap chain: {:?}", e);
-                        return Err(e.into());
-                    }
-                }
-            }
-
             self.resources
-                .recreate_resources(&self.devices, width, height)?;
+                .swap_chain
+                .ResizeBuffers(
+                    BUFFER_COUNT as u32,
+                    width,
+                    height,
+                    RENDER_TARGET_FORMAT,
+                    DXGI_SWAP_CHAIN_FLAG(0),
+                )
+                .context("Failed to resize swap chain")?;
+        }
+
+        self.resources
+            .recreate_resources(&self.devices, width, height)?;
+        unsafe {
             self.devices
                 .device_context
                 .OMSetRenderTargets(Some(&self.resources.render_target_view), None);
         }
+
         Ok(())
     }
 
@@ -680,7 +654,7 @@ impl DirectXRenderer {
 
 impl DirectXResources {
     pub fn new(
-        devices: &DirectXDevices,
+        devices: &DirectXRendererDevices,
         width: u32,
         height: u32,
         hwnd: HWND,
@@ -725,7 +699,7 @@ impl DirectXResources {
     #[inline]
     fn recreate_resources(
         &mut self,
-        devices: &DirectXDevices,
+        devices: &DirectXRendererDevices,
         width: u32,
         height: u32,
     ) -> Result<()> {
@@ -745,8 +719,6 @@ impl DirectXResources {
         self.path_intermediate_msaa_view = path_intermediate_msaa_view;
         self.path_intermediate_srv = path_intermediate_srv;
         self.viewport = viewport;
-        self.width = width;
-        self.height = height;
         Ok(())
     }
 }
@@ -1041,92 +1013,6 @@ impl Drop for DirectXResources {
     }
 }
 
-#[inline]
-fn check_debug_layer_available() -> bool {
-    #[cfg(debug_assertions)]
-    {
-        unsafe { DXGIGetDebugInterface1::<IDXGIInfoQueue>(0) }
-            .log_err()
-            .is_some()
-    }
-    #[cfg(not(debug_assertions))]
-    {
-        false
-    }
-}
-
-#[inline]
-fn get_dxgi_factory(debug_layer_available: bool) -> Result<IDXGIFactory6> {
-    let factory_flag = if debug_layer_available {
-        DXGI_CREATE_FACTORY_DEBUG
-    } else {
-        #[cfg(debug_assertions)]
-        log::warn!(
-            "Failed to get DXGI debug interface. DirectX debugging features will be disabled."
-        );
-        DXGI_CREATE_FACTORY_FLAGS::default()
-    };
-    unsafe { Ok(CreateDXGIFactory2(factory_flag)?) }
-}
-
-fn get_adapter(dxgi_factory: &IDXGIFactory6, debug_layer_available: bool) -> Result<IDXGIAdapter1> {
-    for adapter_index in 0.. {
-        let adapter: IDXGIAdapter1 = unsafe {
-            dxgi_factory
-                .EnumAdapterByGpuPreference(adapter_index, DXGI_GPU_PREFERENCE_MINIMUM_POWER)
-        }?;
-        if let Ok(desc) = unsafe { adapter.GetDesc1() } {
-            let gpu_name = String::from_utf16_lossy(&desc.Description)
-                .trim_matches(char::from(0))
-                .to_string();
-            log::info!("Using GPU: {}", gpu_name);
-        }
-        // Check to see whether the adapter supports Direct3D 11, but don't
-        // create the actual device yet.
-        if get_device(&adapter, None, None, None, debug_layer_available)
-            .log_err()
-            .is_some()
-        {
-            return Ok(adapter);
-        }
-    }
-
-    unreachable!()
-}
-
-fn get_device(
-    adapter: &IDXGIAdapter1,
-    device: Option<*mut Option<ID3D11Device>>,
-    context: Option<*mut Option<ID3D11DeviceContext>>,
-    feature_level: Option<*mut D3D_FEATURE_LEVEL>,
-    debug_layer_available: bool,
-) -> Result<()> {
-    let device_flags = if debug_layer_available {
-        D3D11_CREATE_DEVICE_BGRA_SUPPORT | D3D11_CREATE_DEVICE_DEBUG
-    } else {
-        D3D11_CREATE_DEVICE_BGRA_SUPPORT
-    };
-    unsafe {
-        D3D11CreateDevice(
-            adapter,
-            D3D_DRIVER_TYPE_UNKNOWN,
-            HMODULE::default(),
-            device_flags,
-            // 4x MSAA is required for Direct3D Feature Level 10.1 or better
-            Some(&[
-                D3D_FEATURE_LEVEL_11_1,
-                D3D_FEATURE_LEVEL_11_0,
-                D3D_FEATURE_LEVEL_10_1,
-            ]),
-            D3D11_SDK_VERSION,
-            device,
-            feature_level,
-            context,
-        )?;
-    }
-    Ok(())
-}
-
 #[inline]
 fn get_comp_device(dxgi_device: &IDXGIDevice) -> Result<IDCompositionDevice> {
     Ok(unsafe { DCompositionCreateDevice(dxgi_device)? })
@@ -1191,7 +1077,7 @@ fn create_swap_chain(
 
 #[inline]
 fn create_resources(
-    devices: &DirectXDevices,
+    devices: &DirectXRendererDevices,
     swap_chain: &IDXGISwapChain1,
     width: u32,
     height: u32,
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
index 06b242465f..c1e2040d37 100644
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -25,6 +25,7 @@ pub(crate) const WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD: u32 = WM_USER + 3;
 pub(crate) const WM_GPUI_DOCK_MENU_ACTION: u32 = WM_USER + 4;
 pub(crate) const WM_GPUI_FORCE_UPDATE_WINDOW: u32 = WM_USER + 5;
 pub(crate) const WM_GPUI_KEYBOARD_LAYOUT_CHANGED: u32 = WM_USER + 6;
+pub(crate) const WM_GPUI_GPU_DEVICE_LOST: u32 = WM_USER + 7;
 
 const SIZE_MOVE_LOOP_TIMER_ID: usize = 1;
 const AUTO_HIDE_TASKBAR_THICKNESS_PX: i32 = 1;
@@ -40,7 +41,6 @@ impl WindowsWindowInner {
         let handled = match msg {
             WM_ACTIVATE => self.handle_activate_msg(wparam),
             WM_CREATE => self.handle_create_msg(handle),
-            WM_DEVICECHANGE => self.handle_device_change_msg(handle, wparam),
             WM_MOVE => self.handle_move_msg(handle, lparam),
             WM_SIZE => self.handle_size_msg(wparam, lparam),
             WM_GETMINMAXINFO => self.handle_get_min_max_info_msg(lparam),
@@ -104,6 +104,7 @@ impl WindowsWindowInner {
             WM_SHOWWINDOW => self.handle_window_visibility_changed(handle, wparam),
             WM_GPUI_CURSOR_STYLE_CHANGED => self.handle_cursor_changed(lparam),
             WM_GPUI_FORCE_UPDATE_WINDOW => self.draw_window(handle, true),
+            WM_GPUI_GPU_DEVICE_LOST => self.handle_device_lost(lparam),
             _ => None,
         };
         if let Some(n) = handled {
@@ -1167,26 +1168,12 @@ impl WindowsWindowInner {
         None
     }
 
-    fn handle_device_change_msg(&self, handle: HWND, wparam: WPARAM) -> Option<isize> {
-        if wparam.0 == DBT_DEVNODES_CHANGED as usize {
-            // The reason for sending this message is to actually trigger a redraw of the window.
-            unsafe {
-                PostMessageW(
-                    Some(handle),
-                    WM_GPUI_FORCE_UPDATE_WINDOW,
-                    WPARAM(0),
-                    LPARAM(0),
-                )
-                .log_err();
-            }
-            // If the GPU device is lost, this redraw will take care of recreating the device context.
-            // The WM_GPUI_FORCE_UPDATE_WINDOW message will take care of redrawing the window, after
-            // the device context has been recreated.
-            self.draw_window(handle, true)
-        } else {
-            // Other device change messages are not handled.
-            None
-        }
+    fn handle_device_lost(&self, lparam: LPARAM) -> Option<isize> {
+        let mut lock = self.state.borrow_mut();
+        let devices = lparam.0 as *const DirectXDevices;
+        let devices = unsafe { &*devices };
+        lock.renderer.handle_device_lost(&devices);
+        Some(0)
     }
 
     #[inline]
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index e12a74b966..2df357b091 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -1,6 +1,7 @@
 use std::{
     cell::RefCell,
     ffi::OsStr,
+    mem::ManuallyDrop,
     path::{Path, PathBuf},
     rc::{Rc, Weak},
     sync::Arc,
@@ -17,7 +18,7 @@ use windows::{
     UI::ViewManagement::UISettings,
     Win32::{
         Foundation::*,
-        Graphics::Gdi::*,
+        Graphics::{Direct3D11::ID3D11Device, Gdi::*},
         Security::Credentials::*,
         System::{Com::*, LibraryLoader::*, Ole::*, SystemInformation::*},
         UI::{Input::KeyboardAndMouse::*, Shell::*, WindowsAndMessaging::*},
@@ -55,6 +56,7 @@ pub(crate) struct WindowsPlatformState {
     jump_list: JumpList,
     // NOTE: standard cursor handles don't need to close.
     pub(crate) current_cursor: Option<HCURSOR>,
+    directx_devices: ManuallyDrop<DirectXDevices>,
 }
 
 #[derive(Default)]
@@ -69,15 +71,17 @@ struct PlatformCallbacks {
 }
 
 impl WindowsPlatformState {
-    fn new() -> Self {
+    fn new(directx_devices: DirectXDevices) -> Self {
         let callbacks = PlatformCallbacks::default();
         let jump_list = JumpList::new();
         let current_cursor = load_cursor(CursorStyle::Arrow);
+        let directx_devices = ManuallyDrop::new(directx_devices);
 
         Self {
             callbacks,
             jump_list,
             current_cursor,
+            directx_devices,
             menus: Vec::new(),
         }
     }
@@ -88,15 +92,21 @@ impl WindowsPlatform {
         unsafe {
             OleInitialize(None).context("unable to initialize Windows OLE")?;
         }
+        let directx_devices = DirectXDevices::new().context("Creating DirectX devices")?;
         let (main_sender, main_receiver) = flume::unbounded::<Runnable>();
         let validation_number = rand::random::<usize>();
         let raw_window_handles = Arc::new(RwLock::new(SmallVec::new()));
+        let text_system = Arc::new(
+            DirectWriteTextSystem::new(&directx_devices)
+                .context("Error creating DirectWriteTextSystem")?,
+        );
         register_platform_window_class();
         let mut context = PlatformWindowCreateContext {
             inner: None,
             raw_window_handles: Arc::downgrade(&raw_window_handles),
             validation_number,
             main_receiver: Some(main_receiver),
+            directx_devices: Some(directx_devices),
         };
         let result = unsafe {
             CreateWindowExW(
@@ -125,12 +135,7 @@ impl WindowsPlatform {
             .is_ok_and(|value| value == "true" || value == "1");
         let background_executor = BackgroundExecutor::new(dispatcher.clone());
         let foreground_executor = ForegroundExecutor::new(dispatcher);
-        let directx_devices = DirectXDevices::new(disable_direct_composition)
-            .context("Unable to init directx devices.")?;
-        let text_system = Arc::new(
-            DirectWriteTextSystem::new(&directx_devices)
-                .context("Error creating DirectWriteTextSystem")?,
-        );
+
         let drop_target_helper: IDropTargetHelper = unsafe {
             CoCreateInstance(&CLSID_DragDropHelper, None, CLSCTX_INPROC_SERVER)
                 .context("Error creating drop target helper.")?
@@ -181,6 +186,7 @@ impl WindowsPlatform {
             main_receiver: self.inner.main_receiver.clone(),
             platform_window_handle: self.handle,
             disable_direct_composition: self.disable_direct_composition,
+            directx_devices: (*self.inner.state.borrow().directx_devices).clone(),
         }
     }
 
@@ -228,11 +234,24 @@ impl WindowsPlatform {
     }
 
     fn begin_vsync_thread(&self) {
+        let mut directx_device = (*self.inner.state.borrow().directx_devices).clone();
+        let platform_window: SafeHwnd = self.handle.into();
+        let validation_number = self.inner.validation_number;
         let all_windows = Arc::downgrade(&self.raw_window_handles);
+        let text_system = Arc::downgrade(&self.text_system);
         std::thread::spawn(move || {
             let vsync_provider = VSyncProvider::new();
             loop {
                 vsync_provider.wait_for_vsync();
+                if check_device_lost(&directx_device.device) {
+                    handle_gpu_device_lost(
+                        &mut directx_device,
+                        platform_window.as_raw(),
+                        validation_number,
+                        &all_windows,
+                        &text_system,
+                    );
+                }
                 let Some(all_windows) = all_windows.upgrade() else {
                     break;
                 };
@@ -647,7 +666,9 @@ impl Platform for WindowsPlatform {
 
 impl WindowsPlatformInner {
     fn new(context: &mut PlatformWindowCreateContext) -> Result<Rc<Self>> {
-        let state = RefCell::new(WindowsPlatformState::new());
+        let state = RefCell::new(WindowsPlatformState::new(
+            context.directx_devices.take().unwrap(),
+        ));
         Ok(Rc::new(Self {
             state,
             raw_window_handles: context.raw_window_handles.clone(),
@@ -667,7 +688,8 @@ impl WindowsPlatformInner {
             WM_GPUI_CLOSE_ONE_WINDOW
             | WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD
             | WM_GPUI_DOCK_MENU_ACTION
-            | WM_GPUI_KEYBOARD_LAYOUT_CHANGED => self.handle_gpui_events(msg, wparam, lparam),
+            | WM_GPUI_KEYBOARD_LAYOUT_CHANGED
+            | WM_GPUI_GPU_DEVICE_LOST => self.handle_gpui_events(msg, wparam, lparam),
             _ => None,
         };
         if let Some(result) = handled {
@@ -692,6 +714,7 @@ impl WindowsPlatformInner {
             WM_GPUI_TASK_DISPATCHED_ON_MAIN_THREAD => self.run_foreground_task(),
             WM_GPUI_DOCK_MENU_ACTION => self.handle_dock_action_event(lparam.0 as _),
             WM_GPUI_KEYBOARD_LAYOUT_CHANGED => self.handle_keyboard_layout_change(),
+            WM_GPUI_GPU_DEVICE_LOST => self.handle_device_lost(lparam),
             _ => unreachable!(),
         }
     }
@@ -749,6 +772,18 @@ impl WindowsPlatformInner {
         self.state.borrow_mut().callbacks.keyboard_layout_change = Some(callback);
         Some(0)
     }
+
+    fn handle_device_lost(&self, lparam: LPARAM) -> Option<isize> {
+        let mut lock = self.state.borrow_mut();
+        let directx_devices = lparam.0 as *const DirectXDevices;
+        let directx_devices = unsafe { &*directx_devices };
+        unsafe {
+            ManuallyDrop::drop(&mut lock.directx_devices);
+        }
+        lock.directx_devices = ManuallyDrop::new(directx_devices.clone());
+
+        Some(0)
+    }
 }
 
 impl Drop for WindowsPlatform {
@@ -762,6 +797,14 @@ impl Drop for WindowsPlatform {
     }
 }
 
+impl Drop for WindowsPlatformState {
+    fn drop(&mut self) {
+        unsafe {
+            ManuallyDrop::drop(&mut self.directx_devices);
+        }
+    }
+}
+
 pub(crate) struct WindowCreationInfo {
     pub(crate) icon: HICON,
     pub(crate) executor: ForegroundExecutor,
@@ -772,6 +815,7 @@ pub(crate) struct WindowCreationInfo {
     pub(crate) main_receiver: flume::Receiver<Runnable>,
     pub(crate) platform_window_handle: HWND,
     pub(crate) disable_direct_composition: bool,
+    pub(crate) directx_devices: DirectXDevices,
 }
 
 struct PlatformWindowCreateContext {
@@ -779,6 +823,7 @@ struct PlatformWindowCreateContext {
     raw_window_handles: std::sync::Weak<RwLock<SmallVec<[SafeHwnd; 4]>>>,
     validation_number: usize,
     main_receiver: Option<flume::Receiver<Runnable>>,
+    directx_devices: Option<DirectXDevices>,
 }
 
 fn open_target(target: impl AsRef<OsStr>) -> Result<()> {
@@ -951,6 +996,80 @@ fn should_auto_hide_scrollbars() -> Result<bool> {
     Ok(ui_settings.AutoHideScrollBars()?)
 }
 
+fn check_device_lost(device: &ID3D11Device) -> bool {
+    let device_state = unsafe { device.GetDeviceRemovedReason() };
+    match device_state {
+        Ok(_) => false,
+        Err(err) => {
+            log::error!("DirectX device lost detected: {:?}", err);
+            true
+        }
+    }
+}
+
+fn handle_gpu_device_lost(
+    directx_devices: &mut DirectXDevices,
+    platform_window: HWND,
+    validation_number: usize,
+    all_windows: &std::sync::Weak<RwLock<SmallVec<[SafeHwnd; 4]>>>,
+    text_system: &std::sync::Weak<DirectWriteTextSystem>,
+) {
+    // Here we wait a bit to ensure the the system has time to recover from the device lost state.
+    // If we don't wait, the final drawing result will be blank.
+    std::thread::sleep(std::time::Duration::from_millis(350));
+
+    try_to_recover_from_device_lost(
+        || {
+            DirectXDevices::new()
+                .context("Failed to recreate new DirectX devices after device lost")
+        },
+        |new_devices| *directx_devices = new_devices,
+        || {
+            log::error!("Failed to recover DirectX devices after multiple attempts.");
+            // Do something here?
+            // At this point, the device loss is considered unrecoverable.
+            // std::process::exit(1);
+        },
+    );
+    log::info!("DirectX devices successfully recreated.");
+
+    unsafe {
+        SendMessageW(
+            platform_window,
+            WM_GPUI_GPU_DEVICE_LOST,
+            Some(WPARAM(validation_number)),
+            Some(LPARAM(directx_devices as *const _ as _)),
+        );
+    }
+
+    if let Some(text_system) = text_system.upgrade() {
+        text_system.handle_gpu_lost(&directx_devices);
+    }
+    if let Some(all_windows) = all_windows.upgrade() {
+        for window in all_windows.read().iter() {
+            unsafe {
+                SendMessageW(
+                    window.as_raw(),
+                    WM_GPUI_GPU_DEVICE_LOST,
+                    Some(WPARAM(validation_number)),
+                    Some(LPARAM(directx_devices as *const _ as _)),
+                );
+            }
+        }
+        std::thread::sleep(std::time::Duration::from_millis(200));
+        for window in all_windows.read().iter() {
+            unsafe {
+                SendMessageW(
+                    window.as_raw(),
+                    WM_GPUI_FORCE_UPDATE_WINDOW,
+                    Some(WPARAM(validation_number)),
+                    None,
+                );
+            }
+        }
+    }
+}
+
 const PLATFORM_WINDOW_CLASS_NAME: PCWSTR = w!("Zed::PlatformWindow");
 
 fn register_platform_window_class() {
diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs
index 7fd4aff3c6..9d001da822 100644
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -79,6 +79,7 @@ pub(crate) struct WindowsWindowInner {
 impl WindowsWindowState {
     fn new(
         hwnd: HWND,
+        directx_devices: &DirectXDevices,
         window_params: &CREATESTRUCTW,
         current_cursor: Option<HCURSOR>,
         display: WindowsDisplay,
@@ -104,7 +105,7 @@ impl WindowsWindowState {
         };
         let border_offset = WindowBorderOffset::default();
         let restore_from_minimized = None;
-        let renderer = DirectXRenderer::new(hwnd, disable_direct_composition)
+        let renderer = DirectXRenderer::new(hwnd, directx_devices, disable_direct_composition)
             .context("Creating DirectX renderer")?;
         let callbacks = Callbacks::default();
         let input_handler = None;
@@ -205,9 +206,10 @@ impl WindowsWindowState {
 }
 
 impl WindowsWindowInner {
-    fn new(context: &WindowCreateContext, hwnd: HWND, cs: &CREATESTRUCTW) -> Result<Rc<Self>> {
+    fn new(context: &mut WindowCreateContext, hwnd: HWND, cs: &CREATESTRUCTW) -> Result<Rc<Self>> {
         let state = RefCell::new(WindowsWindowState::new(
             hwnd,
+            &context.directx_devices,
             cs,
             context.current_cursor,
             context.display,
@@ -345,6 +347,7 @@ struct WindowCreateContext {
     platform_window_handle: HWND,
     appearance: WindowAppearance,
     disable_direct_composition: bool,
+    directx_devices: DirectXDevices,
 }
 
 impl WindowsWindow {
@@ -363,6 +366,7 @@ impl WindowsWindow {
             main_receiver,
             platform_window_handle,
             disable_direct_composition,
+            directx_devices,
         } = creation_info;
         register_window_class(icon);
         let hide_title_bar = params
@@ -422,6 +426,7 @@ impl WindowsWindow {
             platform_window_handle,
             appearance,
             disable_direct_composition,
+            directx_devices,
         };
         let creation_result = unsafe {
             CreateWindowExW(

From 473bbd78cca3b81c833453955d56a7666203cd39 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 09:46:40 -0400
Subject: [PATCH 600/823] onboarding: Fix typos in comments (#37541)

This PR fixes some grammatical typos in some comments in the
`onboarding` crate.

Release Notes:

- N/A
---
 crates/onboarding/src/basics_page.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index d98db03be8..59ec437dcf 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -253,7 +253,7 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement
                     move |setting, _| setting.metrics = Some(enabled),
                 );
 
-                // This telemetry event shouldn't fire when it's off. If it does we're be alerted
+                // This telemetry event shouldn't fire when it's off. If it does we'll be alerted
                 // and can fix it in a timely manner to respect a user's choice.
                 telemetry::event!("Welcome Page Telemetry Metrics Toggled",
                     options = if enabled {
@@ -292,7 +292,7 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement
                         move |setting, _| setting.diagnostics = Some(enabled),
                     );
 
-                    // This telemetry event shouldn't fire when it's off. If it does we're be alerted
+                    // This telemetry event shouldn't fire when it's off. If it does we'll be alerted
                     // and can fix it in a timely manner to respect a user's choice.
                     telemetry::event!("Welcome Page Telemetry Diagnostics Toggled",
                         options = if enabled {

From a05f86f97bd69569d256229007bc51daacf1be22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Thu, 4 Sep 2025 22:47:17 +0800
Subject: [PATCH 601/823] windows: Don't log error when `RedrawWindow` (#37542)

Release Notes:

- N/A
---
 crates/gpui/src/platform/windows/platform.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index 2df357b091..96db8077c4 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -257,9 +257,7 @@ impl WindowsPlatform {
                 };
                 for hwnd in all_windows.read().iter() {
                     unsafe {
-                        RedrawWindow(Some(hwnd.as_raw()), None, None, RDW_INVALIDATE)
-                            .ok()
-                            .log_err();
+                        let _ = RedrawWindow(Some(hwnd.as_raw()), None, None, RDW_INVALIDATE);
                     }
                 }
             }

From 1ae326432e7bda2e89fd63e59a56c082277106b4 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Thu, 4 Sep 2025 09:14:53 -0600
Subject: [PATCH 602/823] Extract a scheduler crate from GPUI to enable unified
 integration testing of client and server code (#37326)

Extracts and cleans up GPUI's scheduler code into a new `scheduler`
crate, making it pluggable by external runtimes. This will enable
deterministic integration testing with cloud components by providing a
unified test scheduler across Zed and backend code. In Zed, it will
replace the existing GPUI scheduler for consistent async task management
across platforms.

## Changes

- **Core Implementation**: `TestScheduler` with seed-based
randomization, session tracking (`SessionId`), and foreground/background
task separation for reproducible testing.
- **Executors**: `ForegroundExecutor` (!Send, thread-local) and
`BackgroundExecutor` (Send, with blocking/timeout support) as
GPUI-compatible wrappers.
- **Clock and Timer**: Controllable `TestClock` and future-based `Timer`
for time-sensitive tests.
- **Testing APIs**: `once()`, `with_seed()`, and `many()` methods for
configurable test runs.
- **Dependencies**: Added `async-task`, `chrono`, `futures`, etc., with
updates to `Cargo.toml` and lock file.

## Benefits

- **Integration Testing**: Facilitates reliable async tests involving
cloud sessions, reducing flakiness via deterministic execution.
- **Pluggability**: Trait-based design (`Scheduler`) allows easy
integration into non-GPUI runtimes while maintaining GPUI compatibility.
- **Cleanup**: Refactors GPUI scheduler logic for clarity, correctness
(no `unwrap()`, proper error handling), and extensibility.

Follows Rust guidelines; run `./script/clippy` for verification.

- [x] Define and test a core scheduler that we think can power our cloud
code and GPUI
- [ ] Replace GPUI's scheduler


Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
---
 .rules                                        |  13 +
 Cargo.lock                                    |  73 ++--
 Cargo.toml                                    |   6 +-
 crates/acp_thread/src/acp_thread.rs           |   6 +-
 crates/action_log/src/action_log.rs           |   6 +-
 crates/agent_ui/src/buffer_codegen.rs         |   6 +-
 .../src/assistant_context_tests.rs            |  14 +-
 crates/assistant_tools/src/edit_agent.rs      |   8 +-
 .../src/edit_agent/create_file_parser.rs      |   2 +-
 .../src/edit_agent/edit_parser.rs             |   2 +-
 .../assistant_tools/src/edit_agent/evals.rs   |   4 +-
 .../src/edit_agent/streaming_fuzzy_matcher.rs |   2 +-
 crates/buffer_diff/src/buffer_diff.rs         |  17 +-
 crates/channel/src/channel_chat.rs            |   6 +-
 crates/client/src/client.rs                   |   7 +-
 crates/collab/src/auth.rs                     |  37 +-
 crates/collab/src/db.rs                       |   2 +-
 crates/collab/src/db/tests.rs                 |   4 +-
 crates/collab/src/tests/integration_tests.rs  |   2 +-
 .../src/tests/random_channel_buffer_tests.rs  |   2 +-
 .../random_project_collaboration_tests.rs     |  83 +++--
 .../src/tests/randomized_test_helpers.rs      |  18 +-
 crates/diagnostics/src/diagnostics_tests.rs   |  45 +--
 crates/editor/src/display_map.rs              |  59 ++-
 crates/editor/src/display_map/block_map.rs    |  56 +--
 crates/editor/src/display_map/fold_map.rs     |  48 +--
 crates/editor/src/display_map/inlay_map.rs    |  36 +-
 crates/editor/src/display_map/tab_map.rs      |  14 +-
 crates/editor/src/display_map/wrap_map.rs     |  24 +-
 crates/editor/src/editor.rs                   |   4 +-
 crates/editor/src/git/blame.rs                |   8 +-
 crates/gpui/examples/data_table.rs            |  54 +--
 crates/gpui/src/app/test_context.rs           |   2 +-
 crates/gpui/src/bounds_tree.rs                |  10 +-
 crates/gpui/src/platform/test/dispatcher.rs   |  10 +-
 crates/gpui/src/platform/windows/platform.rs  |   6 +-
 crates/language/src/buffer.rs                 |   4 +-
 crates/language/src/buffer_tests.rs           |  32 +-
 crates/multi_buffer/src/multi_buffer.rs       |  39 +-
 crates/multi_buffer/src/multi_buffer_tests.rs |  48 +--
 crates/project/src/lsp_store.rs               |   4 +-
 crates/project/src/project_tests.rs           |   6 +-
 crates/rope/benches/rope_benchmark.rs         |   6 +-
 crates/rope/src/chunk.rs                      |   8 +-
 crates/rope/src/rope.rs                       |  22 +-
 crates/rpc/src/auth.rs                        |  40 +-
 crates/scheduler/Cargo.toml                   |  25 ++
 crates/scheduler/LICENSE-APACHE               |   1 +
 crates/scheduler/src/clock.rs                 |  34 ++
 crates/scheduler/src/executor.rs              | 137 +++++++
 crates/scheduler/src/scheduler.rs             |  63 ++++
 crates/scheduler/src/test_scheduler.rs        | 352 ++++++++++++++++++
 crates/scheduler/src/tests.rs                 | 348 +++++++++++++++++
 crates/streaming_diff/src/streaming_diff.rs   |  12 +-
 crates/sum_tree/src/sum_tree.rs               |  46 ++-
 crates/terminal/src/terminal.rs               |  17 +-
 crates/text/src/locator.rs                    |   8 +-
 crates/text/src/network.rs                    |   6 +-
 crates/text/src/patch.rs                      |  12 +-
 crates/text/src/tests.rs                      |  21 +-
 crates/text/src/text.rs                       |   8 +-
 crates/util/src/util.rs                       |  13 +-
 crates/worktree/src/worktree_tests.rs         |  30 +-
 crates/zeta/src/input_excerpt.rs              |   4 +-
 64 files changed, 1569 insertions(+), 473 deletions(-)
 create mode 100644 crates/scheduler/Cargo.toml
 create mode 120000 crates/scheduler/LICENSE-APACHE
 create mode 100644 crates/scheduler/src/clock.rs
 create mode 100644 crates/scheduler/src/executor.rs
 create mode 100644 crates/scheduler/src/scheduler.rs
 create mode 100644 crates/scheduler/src/test_scheduler.rs
 create mode 100644 crates/scheduler/src/tests.rs

diff --git a/.rules b/.rules
index da009f1877..2f2b9cd705 100644
--- a/.rules
+++ b/.rules
@@ -12,6 +12,19 @@
   - Example: avoid `let _ = client.request(...).await?;` - use `client.request(...).await?;` instead
 * When implementing async operations that may fail, ensure errors propagate to the UI layer so users get meaningful feedback.
 * Never create files with `mod.rs` paths - prefer `src/some_module.rs` instead of `src/some_module/mod.rs`.
+* When creating new crates, prefer specifying the library root path in `Cargo.toml` using `[lib] path = "...rs"` instead of the default `lib.rs`, to maintain consistent and descriptive naming (e.g., `gpui.rs` or `main.rs`).
+* Avoid creative additions unless explicitly requested
+* Use full words for variable names (no abbreviations like "q" for "queue")
+* Use variable shadowing to scope clones in async contexts for clarity, minimizing the lifetime of borrowed references.
+  Example:
+  ```rust
+  executor.spawn({
+      let task_ran = task_ran.clone();
+      async move {
+          *task_ran.borrow_mut() = true;
+      }
+  });
+  ```
 
 # GPUI
 
diff --git a/Cargo.lock b/Cargo.lock
index 58d01da633..ee80d59006 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,7 +26,7 @@ dependencies = [
  "portable-pty",
  "project",
  "prompt_store",
- "rand 0.8.5",
+ "rand 0.9.1",
  "serde",
  "serde_json",
  "settings",
@@ -79,7 +79,7 @@ dependencies = [
  "log",
  "pretty_assertions",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "serde_json",
  "settings",
  "text",
@@ -172,7 +172,7 @@ dependencies = [
  "pretty_assertions",
  "project",
  "prompt_store",
- "rand 0.8.5",
+ "rand 0.9.1",
  "ref-cast",
  "rope",
  "schemars",
@@ -408,7 +408,7 @@ dependencies = [
  "project",
  "prompt_store",
  "proto",
- "rand 0.8.5",
+ "rand 0.9.1",
  "release_channel",
  "rope",
  "rules_library",
@@ -834,7 +834,7 @@ dependencies = [
  "project",
  "prompt_store",
  "proto",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "rpc",
  "serde",
@@ -933,7 +933,7 @@ dependencies = [
  "parking_lot",
  "pretty_assertions",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "serde",
  "serde_json",
@@ -985,7 +985,7 @@ dependencies = [
  "pretty_assertions",
  "project",
  "prompt_store",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "reqwest_client",
  "rust-embed",
@@ -2478,7 +2478,7 @@ dependencies = [
  "language",
  "log",
  "pretty_assertions",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rope",
  "serde_json",
  "sum_tree",
@@ -2899,7 +2899,7 @@ dependencies = [
  "language",
  "log",
  "postage",
- "rand 0.8.5",
+ "rand 0.9.1",
  "release_channel",
  "rpc",
  "settings",
@@ -3086,7 +3086,7 @@ dependencies = [
  "parking_lot",
  "paths",
  "postage",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "release_channel",
  "rpc",
@@ -3335,7 +3335,7 @@ dependencies = [
  "prometheus",
  "prompt_store",
  "prost 0.9.0",
- "rand 0.8.5",
+ "rand 0.9.1",
  "recent_projects",
  "release_channel",
  "remote",
@@ -4697,7 +4697,7 @@ dependencies = [
  "markdown",
  "pretty_assertions",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "serde",
  "serde_json",
  "settings",
@@ -5068,7 +5068,7 @@ dependencies = [
  "parking_lot",
  "pretty_assertions",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "release_channel",
  "rpc",
@@ -5563,7 +5563,7 @@ dependencies = [
  "parking_lot",
  "paths",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "release_channel",
  "remote",
  "reqwest_client",
@@ -6412,7 +6412,7 @@ dependencies = [
  "log",
  "parking_lot",
  "pretty_assertions",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "rope",
  "schemars",
@@ -7465,7 +7465,7 @@ dependencies = [
  "pathfinder_geometry",
  "postage",
  "profiling",
- "rand 0.8.5",
+ "rand 0.9.1",
  "raw-window-handle",
  "refineable",
  "reqwest_client",
@@ -9078,7 +9078,7 @@ dependencies = [
  "parking_lot",
  "postage",
  "pretty_assertions",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "rpc",
  "schemars",
@@ -10392,7 +10392,7 @@ dependencies = [
  "parking_lot",
  "pretty_assertions",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rope",
  "serde",
  "settings",
@@ -12618,7 +12618,7 @@ dependencies = [
  "postage",
  "prettier",
  "pretty_assertions",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "release_channel",
  "remote",
@@ -13892,7 +13892,7 @@ dependencies = [
  "ctor",
  "gpui",
  "log",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rayon",
  "smallvec",
  "sum_tree",
@@ -13921,7 +13921,7 @@ dependencies = [
  "gpui",
  "parking_lot",
  "proto",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rsa",
  "serde",
  "serde_json",
@@ -14356,6 +14356,19 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "scheduler"
+version = "0.1.0"
+dependencies = [
+ "async-task",
+ "chrono",
+ "futures 0.3.31",
+ "parking",
+ "parking_lot",
+ "rand 0.9.1",
+ "workspace-hack",
+]
+
 [[package]]
 name = "schema_generator"
 version = "0.1.0"
@@ -15655,7 +15668,7 @@ name = "streaming_diff"
 version = "0.1.0"
 dependencies = [
  "ordered-float 2.10.1",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rope",
  "util",
  "workspace-hack",
@@ -15769,7 +15782,7 @@ dependencies = [
  "arrayvec",
  "ctor",
  "log",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rayon",
  "workspace-hack",
  "zlog",
@@ -16360,7 +16373,7 @@ dependencies = [
  "futures 0.3.31",
  "gpui",
  "libc",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "release_channel",
  "schemars",
@@ -16408,7 +16421,7 @@ dependencies = [
  "language",
  "log",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "schemars",
  "search",
@@ -16440,7 +16453,7 @@ dependencies = [
  "log",
  "parking_lot",
  "postage",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "rope",
  "smallvec",
@@ -17797,7 +17810,7 @@ dependencies = [
  "libc",
  "log",
  "nix 0.29.0",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "rust-embed",
  "schemars",
@@ -18588,7 +18601,7 @@ dependencies = [
  "futures 0.3.31",
  "gpui",
  "parking_lot",
- "rand 0.8.5",
+ "rand 0.9.1",
  "workspace-hack",
  "zlog",
 ]
@@ -20047,7 +20060,7 @@ dependencies = [
  "paths",
  "postage",
  "pretty_assertions",
- "rand 0.8.5",
+ "rand 0.9.1",
  "rpc",
  "schemars",
  "serde",
@@ -20812,7 +20825,7 @@ dependencies = [
  "menu",
  "postage",
  "project",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "release_channel",
  "reqwest_client",
diff --git a/Cargo.toml b/Cargo.toml
index 941c364e0d..8a487b612a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,6 +131,7 @@ members = [
     "crates/refineable",
     "crates/refineable/derive_refineable",
     "crates/release_channel",
+    "crates/scheduler",
     "crates/remote",
     "crates/remote_server",
     "crates/repl",
@@ -360,6 +361,7 @@ proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
+scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
@@ -444,6 +446,7 @@ async-fs = "2.1"
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
+async-task = "4.7"
 async-trait = "0.1"
 async-tungstenite = "0.29.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
@@ -538,6 +541,7 @@ objc = "0.2"
 open = "5.0.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
+parking = "2.0"
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
@@ -560,7 +564,7 @@ prost-build = "0.9"
 prost-types = "0.9"
 pulldown-cmark = { version = "0.12.0", default-features = false }
 quote = "1.0.9"
-rand = "0.8.5"
+rand = "0.9"
 rayon = "1.8"
 ref-cast = "1.0.24"
 regex = "1.5"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index dc295369cc..a3a8e31230 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2114,7 +2114,7 @@ mod tests {
     use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
     use indoc::indoc;
     use project::{FakeFs, Fs};
-    use rand::Rng as _;
+    use rand::{distr, prelude::*};
     use serde_json::json;
     use settings::SettingsStore;
     use smol::stream::StreamExt as _;
@@ -3057,8 +3057,8 @@ mod tests {
             cx: &mut App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
             let session_id = acp::SessionId(
-                rand::thread_rng()
-                    .sample_iter(&rand::distributions::Alphanumeric)
+                rand::rng()
+                    .sample_iter(&distr::Alphanumeric)
                     .take(7)
                     .map(char::from)
                     .collect::<String>()
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index 9ec10f4dbb..11ba596ac5 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -2218,7 +2218,7 @@ mod tests {
         action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
 
         for _ in 0..operations {
-            match rng.gen_range(0..100) {
+            match rng.random_range(0..100) {
                 0..25 => {
                     action_log.update(cx, |log, cx| {
                         let range = buffer.read(cx).random_byte_range(0, &mut rng);
@@ -2237,7 +2237,7 @@ mod tests {
                         .unwrap();
                 }
                 _ => {
-                    let is_agent_edit = rng.gen_bool(0.5);
+                    let is_agent_edit = rng.random_bool(0.5);
                     if is_agent_edit {
                         log::info!("agent edit");
                     } else {
@@ -2252,7 +2252,7 @@ mod tests {
                 }
             }
 
-            if rng.gen_bool(0.2) {
+            if rng.random_bool(0.2) {
                 quiesce(&action_log, &buffer, cx);
             }
         }
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index 04eb41793f..2309aad754 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1139,7 +1139,7 @@ mod tests {
         );
         while !new_text.is_empty() {
             let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.gen_range(1..=max_len);
+            let len = rng.random_range(1..=max_len);
             let (chunk, suffix) = new_text.split_at(len);
             chunks_tx.unbounded_send(chunk.to_string()).unwrap();
             new_text = suffix;
@@ -1208,7 +1208,7 @@ mod tests {
         );
         while !new_text.is_empty() {
             let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.gen_range(1..=max_len);
+            let len = rng.random_range(1..=max_len);
             let (chunk, suffix) = new_text.split_at(len);
             chunks_tx.unbounded_send(chunk.to_string()).unwrap();
             new_text = suffix;
@@ -1277,7 +1277,7 @@ mod tests {
         );
         while !new_text.is_empty() {
             let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.gen_range(1..=max_len);
+            let len = rng.random_range(1..=max_len);
             let (chunk, suffix) = new_text.split_at(len);
             chunks_tx.unbounded_send(chunk.to_string()).unwrap();
             new_text = suffix;
diff --git a/crates/assistant_context/src/assistant_context_tests.rs b/crates/assistant_context/src/assistant_context_tests.rs
index 61d748cbdd..8b182685cf 100644
--- a/crates/assistant_context/src/assistant_context_tests.rs
+++ b/crates/assistant_context/src/assistant_context_tests.rs
@@ -764,7 +764,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
     let network = Arc::new(Mutex::new(Network::new(rng.clone())));
     let mut contexts = Vec::new();
 
-    let num_peers = rng.gen_range(min_peers..=max_peers);
+    let num_peers = rng.random_range(min_peers..=max_peers);
     let context_id = ContextId::new();
     let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
     for i in 0..num_peers {
@@ -806,10 +806,10 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
         || !network.lock().is_idle()
         || network.lock().contains_disconnected_peers()
     {
-        let context_index = rng.gen_range(0..contexts.len());
+        let context_index = rng.random_range(0..contexts.len());
         let context = &contexts[context_index];
 
-        match rng.gen_range(0..100) {
+        match rng.random_range(0..100) {
             0..=29 if mutation_count > 0 => {
                 log::info!("Context {}: edit buffer", context_index);
                 context.update(cx, |context, cx| {
@@ -874,10 +874,10 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
                         merge_same_roles: true,
                     })];
 
-                    let num_sections = rng.gen_range(0..=3);
+                    let num_sections = rng.random_range(0..=3);
                     let mut section_start = 0;
                     for _ in 0..num_sections {
-                        let mut section_end = rng.gen_range(section_start..=output_text.len());
+                        let mut section_end = rng.random_range(section_start..=output_text.len());
                         while !output_text.is_char_boundary(section_end) {
                             section_end += 1;
                         }
@@ -924,7 +924,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
             75..=84 if mutation_count > 0 => {
                 context.update(cx, |context, cx| {
                     if let Some(message) = context.messages(cx).choose(&mut rng) {
-                        let new_status = match rng.gen_range(0..3) {
+                        let new_status = match rng.random_range(0..3) {
                             0 => MessageStatus::Done,
                             1 => MessageStatus::Pending,
                             _ => MessageStatus::Error(SharedString::from("Random error")),
@@ -971,7 +971,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
 
                     network.lock().broadcast(replica_id, ops_to_send);
                     context.update(cx, |context, cx| context.apply_ops(ops_to_receive, cx));
-                } else if rng.gen_bool(0.1) && replica_id != 0 {
+                } else if rng.random_bool(0.1) && replica_id != 0 {
                     log::info!("Context {}: disconnecting", context_index);
                     network.lock().disconnect_peer(replica_id);
                 } else if network.lock().has_unreceived(replica_id) {
diff --git a/crates/assistant_tools/src/edit_agent.rs b/crates/assistant_tools/src/edit_agent.rs
index 665ece2baa..29ac53e2a6 100644
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -1315,17 +1315,17 @@ mod tests {
 
     #[gpui::test(iterations = 100)]
     async fn test_random_indents(mut rng: StdRng) {
-        let len = rng.gen_range(1..=100);
+        let len = rng.random_range(1..=100);
         let new_text = util::RandomCharIter::new(&mut rng)
             .with_simple_text()
             .take(len)
             .collect::<String>();
         let new_text = new_text
             .split('\n')
-            .map(|line| format!("{}{}", " ".repeat(rng.gen_range(0..=8)), line))
+            .map(|line| format!("{}{}", " ".repeat(rng.random_range(0..=8)), line))
             .collect::<Vec<_>>()
             .join("\n");
-        let delta = IndentDelta::Spaces(rng.gen_range(-4..=4));
+        let delta = IndentDelta::Spaces(rng.random_range(-4i8..=4i8) as isize);
 
         let chunks = to_random_chunks(&mut rng, &new_text);
         let new_text_chunks = stream::iter(chunks.iter().enumerate().map(|(index, chunk)| {
@@ -1357,7 +1357,7 @@ mod tests {
     }
 
     fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
-        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
         let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
         chunk_indices.sort();
         chunk_indices.push(input.len());
diff --git a/crates/assistant_tools/src/edit_agent/create_file_parser.rs b/crates/assistant_tools/src/edit_agent/create_file_parser.rs
index 0aad9ecb87..5126f9c6b1 100644
--- a/crates/assistant_tools/src/edit_agent/create_file_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/create_file_parser.rs
@@ -204,7 +204,7 @@ mod tests {
     }
 
     fn parse_random_chunks(input: &str, parser: &mut CreateFileParser, rng: &mut StdRng) -> String {
-        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
         let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
         chunk_indices.sort();
         chunk_indices.push(input.len());
diff --git a/crates/assistant_tools/src/edit_agent/edit_parser.rs b/crates/assistant_tools/src/edit_agent/edit_parser.rs
index db58c2bf36..8411171ba4 100644
--- a/crates/assistant_tools/src/edit_agent/edit_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/edit_parser.rs
@@ -996,7 +996,7 @@ mod tests {
     }
 
     fn parse_random_chunks(input: &str, parser: &mut EditParser, rng: &mut StdRng) -> Vec<Edit> {
-        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
         let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
         chunk_indices.sort();
         chunk_indices.push(input.len());
diff --git a/crates/assistant_tools/src/edit_agent/evals.rs b/crates/assistant_tools/src/edit_agent/evals.rs
index 4f182b3148..e78d43f56b 100644
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1399,7 +1399,7 @@ fn eval(
 }
 
 fn run_eval(eval: EvalInput, tx: mpsc::Sender<Result<EvalOutput>>) {
-    let dispatcher = gpui::TestDispatcher::new(StdRng::from_entropy());
+    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
     let mut cx = TestAppContext::build(dispatcher, None);
     let output = cx.executor().block_test(async {
         let test = EditAgentTest::new(&mut cx).await;
@@ -1707,7 +1707,7 @@ async fn retry_on_rate_limit<R>(mut request: impl AsyncFnMut() -> Result<R>) ->
         };
 
         if let Some(retry_after) = retry_delay {
-            let jitter = retry_after.mul_f64(rand::thread_rng().gen_range(0.0..1.0));
+            let jitter = retry_after.mul_f64(rand::rng().random_range(0.0..1.0));
             eprintln!("Attempt #{attempt}: Retry after {retry_after:?} + jitter of {jitter:?}");
             Timer::after(retry_after + jitter).await;
         } else {
diff --git a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
index 33b37679f0..386b820440 100644
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -771,7 +771,7 @@ mod tests {
     }
 
     fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
-        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
         let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
         chunk_indices.sort();
         chunk_indices.push(input.len());
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
index b20dad4ebb..22ee20e0db 100644
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -2044,10 +2044,10 @@ mod tests {
     #[gpui::test(iterations = 100)]
     async fn test_staging_and_unstaging_hunks(cx: &mut TestAppContext, mut rng: StdRng) {
         fn gen_line(rng: &mut StdRng) -> String {
-            if rng.gen_bool(0.2) {
+            if rng.random_bool(0.2) {
                 "\n".to_owned()
             } else {
-                let c = rng.gen_range('A'..='Z');
+                let c = rng.random_range('A'..='Z');
                 format!("{c}{c}{c}\n")
             }
         }
@@ -2066,7 +2066,7 @@ mod tests {
                 old_lines.into_iter()
             };
             let mut result = String::new();
-            let unchanged_count = rng.gen_range(0..=old_lines.len());
+            let unchanged_count = rng.random_range(0..=old_lines.len());
             result +=
                 &old_lines
                     .by_ref()
@@ -2076,14 +2076,14 @@ mod tests {
                         s
                     });
             while old_lines.len() > 0 {
-                let deleted_count = rng.gen_range(0..=old_lines.len());
+                let deleted_count = rng.random_range(0..=old_lines.len());
                 let _advance = old_lines
                     .by_ref()
                     .take(deleted_count)
                     .map(|line| line.len() + 1)
                     .sum::<usize>();
                 let minimum_added = if deleted_count == 0 { 1 } else { 0 };
-                let added_count = rng.gen_range(minimum_added..=5);
+                let added_count = rng.random_range(minimum_added..=5);
                 let addition = (0..added_count).map(|_| gen_line(rng)).collect::<String>();
                 result += &addition;
 
@@ -2092,7 +2092,8 @@ mod tests {
                     if blank_lines == old_lines.len() {
                         break;
                     };
-                    let unchanged_count = rng.gen_range((blank_lines + 1).max(1)..=old_lines.len());
+                    let unchanged_count =
+                        rng.random_range((blank_lines + 1).max(1)..=old_lines.len());
                     result += &old_lines.by_ref().take(unchanged_count).fold(
                         String::new(),
                         |mut s, line| {
@@ -2149,7 +2150,7 @@ mod tests {
             )
         });
         let working_copy = working_copy.read_with(cx, |working_copy, _| working_copy.snapshot());
-        let mut index_text = if rng.r#gen() {
+        let mut index_text = if rng.random() {
             Rope::from(head_text.as_str())
         } else {
             working_copy.as_rope().clone()
@@ -2165,7 +2166,7 @@ mod tests {
         }
 
         for _ in 0..operations {
-            let i = rng.gen_range(0..hunks.len());
+            let i = rng.random_range(0..hunks.len());
             let hunk = &mut hunks[i];
             let hunk_to_change = hunk.clone();
             let stage = match hunk.secondary_status {
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index baf23ac39f..776499c876 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -129,7 +129,7 @@ impl ChannelChat {
                 loaded_all_messages: false,
                 next_pending_message_id: 0,
                 last_acknowledged_id: None,
-                rng: StdRng::from_entropy(),
+                rng: StdRng::from_os_rng(),
                 first_loaded_message_id: None,
                 _subscription: subscription.set_entity(&cx.entity(), &cx.to_async()),
             }
@@ -183,7 +183,7 @@ impl ChannelChat {
 
         let channel_id = self.channel_id;
         let pending_id = ChannelMessageId::Pending(post_inc(&mut self.next_pending_message_id));
-        let nonce = self.rng.r#gen();
+        let nonce = self.rng.random();
         self.insert_messages(
             SumTree::from_item(
                 ChannelMessage {
@@ -257,7 +257,7 @@ impl ChannelChat {
             cx,
         );
 
-        let nonce: u128 = self.rng.r#gen();
+        let nonce: u128 = self.rng.random();
 
         let request = self.rpc.request(proto::UpdateChannelMessage {
             channel_id: self.channel_id.0,
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 1287b4563c..85f6aeade6 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -691,7 +691,7 @@ impl Client {
                     #[cfg(any(test, feature = "test-support"))]
                     let mut rng = StdRng::seed_from_u64(0);
                     #[cfg(not(any(test, feature = "test-support")))]
-                    let mut rng = StdRng::from_entropy();
+                    let mut rng = StdRng::from_os_rng();
 
                     let mut delay = INITIAL_RECONNECTION_DELAY;
                     loop {
@@ -721,8 +721,9 @@ impl Client {
                                 },
                                 cx,
                             );
-                            let jitter =
-                                Duration::from_millis(rng.gen_range(0..delay.as_millis() as u64));
+                            let jitter = Duration::from_millis(
+                                rng.random_range(0..delay.as_millis() as u64),
+                            );
                             cx.background_executor().timer(delay + jitter).await;
                             delay = cmp::min(delay * 2, MAX_RECONNECTION_DELAY);
                         } else {
diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs
index e484d6b510..13296b79ae 100644
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -227,7 +227,7 @@ pub async fn verify_access_token(
 
 #[cfg(test)]
 mod test {
-    use rand::thread_rng;
+    use rand::prelude::*;
     use scrypt::password_hash::{PasswordHasher, SaltString};
     use sea_orm::EntityTrait;
 
@@ -358,9 +358,42 @@ mod test {
                 None,
                 None,
                 params,
-                &SaltString::generate(thread_rng()),
+                &SaltString::generate(PasswordHashRngCompat::new()),
             )
             .map_err(anyhow::Error::new)?
             .to_string())
     }
+
+    // TODO: remove once we password_hash v0.6 is released.
+    struct PasswordHashRngCompat(rand::rngs::ThreadRng);
+
+    impl PasswordHashRngCompat {
+        fn new() -> Self {
+            Self(rand::rng())
+        }
+    }
+
+    impl scrypt::password_hash::rand_core::RngCore for PasswordHashRngCompat {
+        fn next_u32(&mut self) -> u32 {
+            self.0.next_u32()
+        }
+
+        fn next_u64(&mut self) -> u64 {
+            self.0.next_u64()
+        }
+
+        fn fill_bytes(&mut self, dest: &mut [u8]) {
+            self.0.fill_bytes(dest);
+        }
+
+        fn try_fill_bytes(
+            &mut self,
+            dest: &mut [u8],
+        ) -> Result<(), scrypt::password_hash::rand_core::Error> {
+            self.fill_bytes(dest);
+            Ok(())
+        }
+    }
+
+    impl scrypt::password_hash::rand_core::CryptoRng for PasswordHashRngCompat {}
 }
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 95a485305c..f39da309dd 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -256,7 +256,7 @@ impl Database {
             let test_options = self.test_options.as_ref().unwrap();
             test_options.executor.simulate_random_delay().await;
             let fail_probability = *test_options.query_failure_probability.lock();
-            if test_options.executor.rng().gen_bool(fail_probability) {
+            if test_options.executor.rng().random_bool(fail_probability) {
                 return Err(anyhow!("simulated query failure"))?;
             }
 
diff --git a/crates/collab/src/db/tests.rs b/crates/collab/src/db/tests.rs
index 2eb8d377ac..f8560edda7 100644
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -75,10 +75,10 @@ impl TestDb {
         static LOCK: Mutex<()> = Mutex::new(());
 
         let _guard = LOCK.lock();
-        let mut rng = StdRng::from_entropy();
+        let mut rng = StdRng::from_os_rng();
         let url = format!(
             "postgres://postgres@localhost/zed-test-{}",
-            rng.r#gen::<u128>()
+            rng.random::<u128>()
         );
         let runtime = tokio::runtime::Builder::new_current_thread()
             .enable_io()
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 6bb2db0520..07bd162e66 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -5746,7 +5746,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
 
     let definitions;
     let buffer_b2;
-    if rng.r#gen() {
+    if rng.random() {
         cx_a.run_until_parked();
         cx_b.run_until_parked();
         definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
diff --git a/crates/collab/src/tests/random_channel_buffer_tests.rs b/crates/collab/src/tests/random_channel_buffer_tests.rs
index 6fcd6d75cd..9451090af2 100644
--- a/crates/collab/src/tests/random_channel_buffer_tests.rs
+++ b/crates/collab/src/tests/random_channel_buffer_tests.rs
@@ -84,7 +84,7 @@ impl RandomizedTest for RandomChannelBufferTest {
         }
 
         loop {
-            match rng.gen_range(0..100_u32) {
+            match rng.random_range(0..100_u32) {
                 0..=29 => {
                     let channel_name = client.channel_store().read_with(cx, |store, cx| {
                         store.ordered_channels().find_map(|(_, channel)| {
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
index bfe05c4a1d..326f64cb24 100644
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -17,7 +17,7 @@ use project::{
     DEFAULT_COMPLETION_CONTEXT, Project, ProjectPath, search::SearchQuery, search::SearchResult,
 };
 use rand::{
-    distributions::{Alphanumeric, DistString},
+    distr::{self, SampleString},
     prelude::*,
 };
 use serde::{Deserialize, Serialize};
@@ -168,19 +168,19 @@ impl RandomizedTest for ProjectCollaborationTest {
     ) -> ClientOperation {
         let call = cx.read(ActiveCall::global);
         loop {
-            match rng.gen_range(0..100_u32) {
+            match rng.random_range(0..100_u32) {
                 // Mutate the call
                 0..=29 => {
                     // Respond to an incoming call
                     if call.read_with(cx, |call, _| call.incoming().borrow().is_some()) {
-                        break if rng.gen_bool(0.7) {
+                        break if rng.random_bool(0.7) {
                             ClientOperation::AcceptIncomingCall
                         } else {
                             ClientOperation::RejectIncomingCall
                         };
                     }
 
-                    match rng.gen_range(0..100_u32) {
+                    match rng.random_range(0..100_u32) {
                         // Invite a contact to the current call
                         0..=70 => {
                             let available_contacts =
@@ -212,7 +212,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                 }
 
                 // Mutate projects
-                30..=59 => match rng.gen_range(0..100_u32) {
+                30..=59 => match rng.random_range(0..100_u32) {
                     // Open a new project
                     0..=70 => {
                         // Open a remote project
@@ -270,7 +270,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                     }
 
                     // Mutate project worktrees
-                    81.. => match rng.gen_range(0..100_u32) {
+                    81.. => match rng.random_range(0..100_u32) {
                         // Add a worktree to a local project
                         0..=50 => {
                             let Some(project) = client.local_projects().choose(rng).cloned() else {
@@ -279,7 +279,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                             let project_root_name = root_name_for_project(&project, cx);
                             let mut paths = client.fs().paths(false);
                             paths.remove(0);
-                            let new_root_path = if paths.is_empty() || rng.r#gen() {
+                            let new_root_path = if paths.is_empty() || rng.random() {
                                 Path::new(path!("/")).join(plan.next_root_dir_name())
                             } else {
                                 paths.choose(rng).unwrap().clone()
@@ -309,7 +309,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                     .choose(rng)
                             });
                             let Some(worktree) = worktree else { continue };
-                            let is_dir = rng.r#gen::<bool>();
+                            let is_dir = rng.random::<bool>();
                             let mut full_path =
                                 worktree.read_with(cx, |w, _| PathBuf::from(w.root_name()));
                             full_path.push(gen_file_name(rng));
@@ -334,7 +334,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                     let project_root_name = root_name_for_project(&project, cx);
                     let is_local = project.read_with(cx, |project, _| project.is_local());
 
-                    match rng.gen_range(0..100_u32) {
+                    match rng.random_range(0..100_u32) {
                         // Manipulate an existing buffer
                         0..=70 => {
                             let Some(buffer) = client
@@ -349,7 +349,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                             let full_path = buffer
                                 .read_with(cx, |buffer, cx| buffer.file().unwrap().full_path(cx));
 
-                            match rng.gen_range(0..100_u32) {
+                            match rng.random_range(0..100_u32) {
                                 // Close the buffer
                                 0..=15 => {
                                     break ClientOperation::CloseBuffer {
@@ -360,7 +360,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                 }
                                 // Save the buffer
                                 16..=29 if buffer.read_with(cx, |b, _| b.is_dirty()) => {
-                                    let detach = rng.gen_bool(0.3);
+                                    let detach = rng.random_bool(0.3);
                                     break ClientOperation::SaveBuffer {
                                         project_root_name,
                                         is_local,
@@ -383,17 +383,17 @@ impl RandomizedTest for ProjectCollaborationTest {
                                 _ => {
                                     let offset = buffer.read_with(cx, |buffer, _| {
                                         buffer.clip_offset(
-                                            rng.gen_range(0..=buffer.len()),
+                                            rng.random_range(0..=buffer.len()),
                                             language::Bias::Left,
                                         )
                                     });
-                                    let detach = rng.r#gen();
+                                    let detach = rng.random();
                                     break ClientOperation::RequestLspDataInBuffer {
                                         project_root_name,
                                         full_path,
                                         offset,
                                         is_local,
-                                        kind: match rng.gen_range(0..5_u32) {
+                                        kind: match rng.random_range(0..5_u32) {
                                             0 => LspRequestKind::Rename,
                                             1 => LspRequestKind::Highlights,
                                             2 => LspRequestKind::Definition,
@@ -407,8 +407,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                         }
 
                         71..=80 => {
-                            let query = rng.gen_range('a'..='z').to_string();
-                            let detach = rng.gen_bool(0.3);
+                            let query = rng.random_range('a'..='z').to_string();
+                            let detach = rng.random_bool(0.3);
                             break ClientOperation::SearchProject {
                                 project_root_name,
                                 is_local,
@@ -460,7 +460,7 @@ impl RandomizedTest for ProjectCollaborationTest {
 
                 // Create or update a file or directory
                 96.. => {
-                    let is_dir = rng.r#gen::<bool>();
+                    let is_dir = rng.random::<bool>();
                     let content;
                     let mut path;
                     let dir_paths = client.fs().directories(false);
@@ -470,11 +470,11 @@ impl RandomizedTest for ProjectCollaborationTest {
                         path = dir_paths.choose(rng).unwrap().clone();
                         path.push(gen_file_name(rng));
                     } else {
-                        content = Alphanumeric.sample_string(rng, 16);
+                        content = distr::Alphanumeric.sample_string(rng, 16);
 
                         // Create a new file or overwrite an existing file
                         let file_paths = client.fs().files();
-                        if file_paths.is_empty() || rng.gen_bool(0.5) {
+                        if file_paths.is_empty() || rng.random_bool(0.5) {
                             path = dir_paths.choose(rng).unwrap().clone();
                             path.push(gen_file_name(rng));
                             path.set_extension("rs");
@@ -1090,7 +1090,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                             move |_, cx| {
                                 let background = cx.background_executor();
                                 let mut rng = background.rng();
-                                let count = rng.gen_range::<usize, _>(1..3);
+                                let count = rng.random_range::<usize, _>(1..3);
                                 let files = fs.as_fake().files();
                                 let files = (0..count)
                                     .map(|_| files.choose(&mut rng).unwrap().clone())
@@ -1117,12 +1117,12 @@ impl RandomizedTest for ProjectCollaborationTest {
                                     let background = cx.background_executor();
                                     let mut rng = background.rng();
 
-                                    let highlight_count = rng.gen_range(1..=5);
+                                    let highlight_count = rng.random_range(1..=5);
                                     for _ in 0..highlight_count {
-                                        let start_row = rng.gen_range(0..100);
-                                        let start_column = rng.gen_range(0..100);
-                                        let end_row = rng.gen_range(0..100);
-                                        let end_column = rng.gen_range(0..100);
+                                        let start_row = rng.random_range(0..100);
+                                        let start_column = rng.random_range(0..100);
+                                        let end_row = rng.random_range(0..100);
+                                        let end_column = rng.random_range(0..100);
                                         let start = PointUtf16::new(start_row, start_column);
                                         let end = PointUtf16::new(end_row, end_column);
                                         let range =
@@ -1219,8 +1219,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                                         guest_project.remote_id(),
                                     );
                                     assert_eq!(
-                                        guest_snapshot.entries(false, 0).collect::<Vec<_>>(),
-                                        host_snapshot.entries(false, 0).collect::<Vec<_>>(),
+                                        guest_snapshot.entries(false, 0).map(null_out_entry_size).collect::<Vec<_>>(),
+                                        host_snapshot.entries(false, 0).map(null_out_entry_size).collect::<Vec<_>>(),
                                         "{} has different snapshot than the host for worktree {:?} ({:?}) and project {:?}",
                                         client.username,
                                         host_snapshot.abs_path(),
@@ -1248,6 +1248,18 @@ impl RandomizedTest for ProjectCollaborationTest {
                             );
                         }
                     });
+
+                // A hack to work around a hack in
+                // https://github.com/zed-industries/zed/pull/16696 that wasn't
+                // detected until we upgraded the rng crate. This whole crate is
+                // going away with DeltaDB soon, so we hold our nose and
+                // continue.
+                fn null_out_entry_size(entry: &project::Entry) -> project::Entry {
+                    project::Entry {
+                        size: 0,
+                        ..entry.clone()
+                    }
+                }
             }
 
             let buffers = client.buffers().clone();
@@ -1422,7 +1434,7 @@ fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation
             .filter(|path| path.starts_with(repo_path))
             .collect::<Vec<_>>();
 
-        let count = rng.gen_range(0..=paths.len());
+        let count = rng.random_range(0..=paths.len());
         paths.shuffle(rng);
         paths.truncate(count);
 
@@ -1434,13 +1446,13 @@ fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation
 
     let repo_path = client.fs().directories(false).choose(rng).unwrap().clone();
 
-    match rng.gen_range(0..100_u32) {
+    match rng.random_range(0..100_u32) {
         0..=25 => {
             let file_paths = generate_file_paths(&repo_path, rng, client);
 
             let contents = file_paths
                 .into_iter()
-                .map(|path| (path, Alphanumeric.sample_string(rng, 16)))
+                .map(|path| (path, distr::Alphanumeric.sample_string(rng, 16)))
                 .collect();
 
             GitOperation::WriteGitIndex {
@@ -1449,7 +1461,8 @@ fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation
             }
         }
         26..=63 => {
-            let new_branch = (rng.gen_range(0..10) > 3).then(|| Alphanumeric.sample_string(rng, 8));
+            let new_branch =
+                (rng.random_range(0..10) > 3).then(|| distr::Alphanumeric.sample_string(rng, 8));
 
             GitOperation::WriteGitBranch {
                 repo_path,
@@ -1596,7 +1609,7 @@ fn choose_random_project(client: &TestClient, rng: &mut StdRng) -> Option<Entity
 fn gen_file_name(rng: &mut StdRng) -> String {
     let mut name = String::new();
     for _ in 0..10 {
-        let letter = rng.gen_range('a'..='z');
+        let letter = rng.random_range('a'..='z');
         name.push(letter);
     }
     name
@@ -1604,7 +1617,7 @@ fn gen_file_name(rng: &mut StdRng) -> String {
 
 fn gen_status(rng: &mut StdRng) -> FileStatus {
     fn gen_tracked_status(rng: &mut StdRng) -> TrackedStatus {
-        match rng.gen_range(0..3) {
+        match rng.random_range(0..3) {
             0 => TrackedStatus {
                 index_status: StatusCode::Unmodified,
                 worktree_status: StatusCode::Unmodified,
@@ -1626,7 +1639,7 @@ fn gen_status(rng: &mut StdRng) -> FileStatus {
     }
 
     fn gen_unmerged_status_code(rng: &mut StdRng) -> UnmergedStatusCode {
-        match rng.gen_range(0..3) {
+        match rng.random_range(0..3) {
             0 => UnmergedStatusCode::Updated,
             1 => UnmergedStatusCode::Added,
             2 => UnmergedStatusCode::Deleted,
@@ -1634,7 +1647,7 @@ fn gen_status(rng: &mut StdRng) -> FileStatus {
         }
     }
 
-    match rng.gen_range(0..2) {
+    match rng.random_range(0..2) {
         0 => FileStatus::Unmerged(UnmergedStatus {
             first_head: gen_unmerged_status_code(rng),
             second_head: gen_unmerged_status_code(rng),
diff --git a/crates/collab/src/tests/randomized_test_helpers.rs b/crates/collab/src/tests/randomized_test_helpers.rs
index d6c299a6a9..9a372017e3 100644
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -208,9 +208,9 @@ pub fn save_randomized_test_plan() {
 
 impl<T: RandomizedTest> TestPlan<T> {
     pub async fn new(server: &mut TestServer, mut rng: StdRng) -> Arc<Mutex<Self>> {
-        let allow_server_restarts = rng.gen_bool(0.7);
-        let allow_client_reconnection = rng.gen_bool(0.7);
-        let allow_client_disconnection = rng.gen_bool(0.1);
+        let allow_server_restarts = rng.random_bool(0.7);
+        let allow_client_reconnection = rng.random_bool(0.7);
+        let allow_client_disconnection = rng.random_bool(0.1);
 
         let mut users = Vec::new();
         for ix in 0..max_peers() {
@@ -407,7 +407,7 @@ impl<T: RandomizedTest> TestPlan<T> {
         }
 
         Some(loop {
-            break match self.rng.gen_range(0..100) {
+            break match self.rng.random_range(0..100) {
                 0..=29 if clients.len() < self.users.len() => {
                     let user = self
                         .users
@@ -421,13 +421,13 @@ impl<T: RandomizedTest> TestPlan<T> {
                     }
                 }
                 30..=34 if clients.len() > 1 && self.allow_client_disconnection => {
-                    let (client, cx) = &clients[self.rng.gen_range(0..clients.len())];
+                    let (client, cx) = &clients[self.rng.random_range(0..clients.len())];
                     let user_id = client.current_user_id(cx);
                     self.operation_ix += 1;
                     ServerOperation::RemoveConnection { user_id }
                 }
                 35..=39 if clients.len() > 1 && self.allow_client_reconnection => {
-                    let (client, cx) = &clients[self.rng.gen_range(0..clients.len())];
+                    let (client, cx) = &clients[self.rng.random_range(0..clients.len())];
                     let user_id = client.current_user_id(cx);
                     self.operation_ix += 1;
                     ServerOperation::BounceConnection { user_id }
@@ -439,12 +439,12 @@ impl<T: RandomizedTest> TestPlan<T> {
                 _ if !clients.is_empty() => {
                     let count = self
                         .rng
-                        .gen_range(1..10)
+                        .random_range(1..10)
                         .min(self.max_operations - self.operation_ix);
                     let batch_id = util::post_inc(&mut self.next_batch_id);
                     let mut user_ids = (0..count)
                         .map(|_| {
-                            let ix = self.rng.gen_range(0..clients.len());
+                            let ix = self.rng.random_range(0..clients.len());
                             let (client, cx) = &clients[ix];
                             client.current_user_id(cx)
                         })
@@ -453,7 +453,7 @@ impl<T: RandomizedTest> TestPlan<T> {
                     ServerOperation::MutateClients {
                         user_ids,
                         batch_id,
-                        quiesce: self.rng.gen_bool(0.7),
+                        quiesce: self.rng.random_bool(0.7),
                     }
                 }
                 _ => continue,
diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index fdca32520d..6a8baecdb3 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -682,7 +682,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
         Default::default();
 
     for _ in 0..operations {
-        match rng.gen_range(0..100) {
+        match rng.random_range(0..100) {
             // language server completes its diagnostic check
             0..=20 if !updated_language_servers.is_empty() => {
                 let server_id = *updated_language_servers.iter().choose(&mut rng).unwrap();
@@ -691,7 +691,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                     lsp_store.disk_based_diagnostics_finished(server_id, cx)
                 });
 
-                if rng.gen_bool(0.5) {
+                if rng.random_bool(0.5) {
                     cx.run_until_parked();
                 }
             }
@@ -701,7 +701,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                 let (path, server_id, diagnostics) =
                     match current_diagnostics.iter_mut().choose(&mut rng) {
                         // update existing set of diagnostics
-                        Some(((path, server_id), diagnostics)) if rng.gen_bool(0.5) => {
+                        Some(((path, server_id), diagnostics)) if rng.random_bool(0.5) => {
                             (path.clone(), *server_id, diagnostics)
                         }
 
@@ -709,13 +709,13 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                         _ => {
                             let path: PathBuf =
                                 format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
-                            let len = rng.gen_range(128..256);
+                            let len = rng.random_range(128..256);
                             let content =
                                 RandomCharIter::new(&mut rng).take(len).collect::<String>();
                             fs.insert_file(&path, content.into_bytes()).await;
 
                             let server_id = match language_server_ids.iter().choose(&mut rng) {
-                                Some(server_id) if rng.gen_bool(0.5) => *server_id,
+                                Some(server_id) if rng.random_bool(0.5) => *server_id,
                                 _ => {
                                     let id = LanguageServerId(language_server_ids.len());
                                     language_server_ids.push(id);
@@ -846,7 +846,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
     let mut next_inlay_id = 0;
 
     for _ in 0..operations {
-        match rng.gen_range(0..100) {
+        match rng.random_range(0..100) {
             // language server completes its diagnostic check
             0..=20 if !updated_language_servers.is_empty() => {
                 let server_id = *updated_language_servers.iter().choose(&mut rng).unwrap();
@@ -855,7 +855,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                     lsp_store.disk_based_diagnostics_finished(server_id, cx)
                 });
 
-                if rng.gen_bool(0.5) {
+                if rng.random_bool(0.5) {
                     cx.run_until_parked();
                 }
             }
@@ -864,7 +864,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                 diagnostics.editor.update(cx, |editor, cx| {
                     let snapshot = editor.snapshot(window, cx);
                     if !snapshot.buffer_snapshot.is_empty() {
-                        let position = rng.gen_range(0..snapshot.buffer_snapshot.len());
+                        let position = rng.random_range(0..snapshot.buffer_snapshot.len());
                         let position = snapshot.buffer_snapshot.clip_offset(position, Bias::Left);
                         log::info!(
                             "adding inlay at {position}/{}: {:?}",
@@ -890,7 +890,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                 let (path, server_id, diagnostics) =
                     match current_diagnostics.iter_mut().choose(&mut rng) {
                         // update existing set of diagnostics
-                        Some(((path, server_id), diagnostics)) if rng.gen_bool(0.5) => {
+                        Some(((path, server_id), diagnostics)) if rng.random_bool(0.5) => {
                             (path.clone(), *server_id, diagnostics)
                         }
 
@@ -898,13 +898,13 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                         _ => {
                             let path: PathBuf =
                                 format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
-                            let len = rng.gen_range(128..256);
+                            let len = rng.random_range(128..256);
                             let content =
                                 RandomCharIter::new(&mut rng).take(len).collect::<String>();
                             fs.insert_file(&path, content.into_bytes()).await;
 
                             let server_id = match language_server_ids.iter().choose(&mut rng) {
-                                Some(server_id) if rng.gen_bool(0.5) => *server_id,
+                                Some(server_id) if rng.random_bool(0.5) => *server_id,
                                 _ => {
                                     let id = LanguageServerId(language_server_ids.len());
                                     language_server_ids.push(id);
@@ -1589,10 +1589,10 @@ fn randomly_update_diagnostics_for_path(
     next_id: &mut usize,
     rng: &mut impl Rng,
 ) {
-    let mutation_count = rng.gen_range(1..=3);
+    let mutation_count = rng.random_range(1..=3);
     for _ in 0..mutation_count {
-        if rng.gen_bool(0.3) && !diagnostics.is_empty() {
-            let idx = rng.gen_range(0..diagnostics.len());
+        if rng.random_bool(0.3) && !diagnostics.is_empty() {
+            let idx = rng.random_range(0..diagnostics.len());
             log::info!("  removing diagnostic at index {idx}");
             diagnostics.remove(idx);
         } else {
@@ -1601,7 +1601,7 @@ fn randomly_update_diagnostics_for_path(
 
             let new_diagnostic = random_lsp_diagnostic(rng, fs, path, unique_id);
 
-            let ix = rng.gen_range(0..=diagnostics.len());
+            let ix = rng.random_range(0..=diagnostics.len());
             log::info!(
                 "  inserting {} at index {ix}. {},{}..{},{}",
                 new_diagnostic.message,
@@ -1638,8 +1638,8 @@ fn random_lsp_diagnostic(
     let file_content = fs.read_file_sync(path).unwrap();
     let file_text = Rope::from(String::from_utf8_lossy(&file_content).as_ref());
 
-    let start = rng.gen_range(0..file_text.len().saturating_add(ERROR_MARGIN));
-    let end = rng.gen_range(start..file_text.len().saturating_add(ERROR_MARGIN));
+    let start = rng.random_range(0..file_text.len().saturating_add(ERROR_MARGIN));
+    let end = rng.random_range(start..file_text.len().saturating_add(ERROR_MARGIN));
 
     let start_point = file_text.offset_to_point_utf16(start);
     let end_point = file_text.offset_to_point_utf16(end);
@@ -1649,7 +1649,7 @@ fn random_lsp_diagnostic(
         lsp::Position::new(end_point.row, end_point.column),
     );
 
-    let severity = if rng.gen_bool(0.5) {
+    let severity = if rng.random_bool(0.5) {
         Some(lsp::DiagnosticSeverity::ERROR)
     } else {
         Some(lsp::DiagnosticSeverity::WARNING)
@@ -1657,13 +1657,14 @@ fn random_lsp_diagnostic(
 
     let message = format!("diagnostic {unique_id}");
 
-    let related_information = if rng.gen_bool(0.3) {
-        let info_count = rng.gen_range(1..=3);
+    let related_information = if rng.random_bool(0.3) {
+        let info_count = rng.random_range(1..=3);
         let mut related_info = Vec::with_capacity(info_count);
 
         for i in 0..info_count {
-            let info_start = rng.gen_range(0..file_text.len().saturating_add(ERROR_MARGIN));
-            let info_end = rng.gen_range(info_start..file_text.len().saturating_add(ERROR_MARGIN));
+            let info_start = rng.random_range(0..file_text.len().saturating_add(ERROR_MARGIN));
+            let info_end =
+                rng.random_range(info_start..file_text.len().saturating_add(ERROR_MARGIN));
 
             let info_start_point = file_text.offset_to_point_utf16(info_start);
             let info_end_point = file_text.offset_to_point_utf16(info_end);
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index c16e4a6ddb..3a07ee45af 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -1552,15 +1552,15 @@ pub mod tests {
             .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
             .unwrap_or(10);
 
-        let mut tab_size = rng.gen_range(1..=4);
-        let buffer_start_excerpt_header_height = rng.gen_range(1..=5);
-        let excerpt_header_height = rng.gen_range(1..=5);
+        let mut tab_size = rng.random_range(1..=4);
+        let buffer_start_excerpt_header_height = rng.random_range(1..=5);
+        let excerpt_header_height = rng.random_range(1..=5);
         let font_size = px(14.0);
         let max_wrap_width = 300.0;
-        let mut wrap_width = if rng.gen_bool(0.1) {
+        let mut wrap_width = if rng.random_bool(0.1) {
             None
         } else {
-            Some(px(rng.gen_range(0.0..=max_wrap_width)))
+            Some(px(rng.random_range(0.0..=max_wrap_width)))
         };
 
         log::info!("tab size: {}", tab_size);
@@ -1571,8 +1571,8 @@ pub mod tests {
         });
 
         let buffer = cx.update(|cx| {
-            if rng.r#gen() {
-                let len = rng.gen_range(0..10);
+            if rng.random() {
+                let len = rng.random_range(0..10);
                 let text = util::RandomCharIter::new(&mut rng)
                     .take(len)
                     .collect::<String>();
@@ -1609,12 +1609,12 @@ pub mod tests {
         log::info!("display text: {:?}", snapshot.text());
 
         for _i in 0..operations {
-            match rng.gen_range(0..100) {
+            match rng.random_range(0..100) {
                 0..=19 => {
-                    wrap_width = if rng.gen_bool(0.2) {
+                    wrap_width = if rng.random_bool(0.2) {
                         None
                     } else {
-                        Some(px(rng.gen_range(0.0..=max_wrap_width)))
+                        Some(px(rng.random_range(0.0..=max_wrap_width)))
                     };
                     log::info!("setting wrap width to {:?}", wrap_width);
                     map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
@@ -1634,28 +1634,27 @@ pub mod tests {
                 }
                 30..=44 => {
                     map.update(cx, |map, cx| {
-                        if rng.r#gen() || blocks.is_empty() {
+                        if rng.random() || blocks.is_empty() {
                             let buffer = map.snapshot(cx).buffer_snapshot;
-                            let block_properties = (0..rng.gen_range(1..=1))
+                            let block_properties = (0..rng.random_range(1..=1))
                                 .map(|_| {
-                                    let position =
-                                        buffer.anchor_after(buffer.clip_offset(
-                                            rng.gen_range(0..=buffer.len()),
-                                            Bias::Left,
-                                        ));
+                                    let position = buffer.anchor_after(buffer.clip_offset(
+                                        rng.random_range(0..=buffer.len()),
+                                        Bias::Left,
+                                    ));
 
-                                    let placement = if rng.r#gen() {
+                                    let placement = if rng.random() {
                                         BlockPlacement::Above(position)
                                     } else {
                                         BlockPlacement::Below(position)
                                     };
-                                    let height = rng.gen_range(1..5);
+                                    let height = rng.random_range(1..5);
                                     log::info!(
                                         "inserting block {:?} with height {}",
                                         placement.as_ref().map(|p| p.to_point(&buffer)),
                                         height
                                     );
-                                    let priority = rng.gen_range(1..100);
+                                    let priority = rng.random_range(1..100);
                                     BlockProperties {
                                         placement,
                                         style: BlockStyle::Fixed,
@@ -1668,9 +1667,9 @@ pub mod tests {
                             blocks.extend(map.insert_blocks(block_properties, cx));
                         } else {
                             blocks.shuffle(&mut rng);
-                            let remove_count = rng.gen_range(1..=4.min(blocks.len()));
+                            let remove_count = rng.random_range(1..=4.min(blocks.len()));
                             let block_ids_to_remove = (0..remove_count)
-                                .map(|_| blocks.remove(rng.gen_range(0..blocks.len())))
+                                .map(|_| blocks.remove(rng.random_range(0..blocks.len())))
                                 .collect();
                             log::info!("removing block ids {:?}", block_ids_to_remove);
                             map.remove_blocks(block_ids_to_remove, cx);
@@ -1679,16 +1678,16 @@ pub mod tests {
                 }
                 45..=79 => {
                     let mut ranges = Vec::new();
-                    for _ in 0..rng.gen_range(1..=3) {
+                    for _ in 0..rng.random_range(1..=3) {
                         buffer.read_with(cx, |buffer, cx| {
                             let buffer = buffer.read(cx);
-                            let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
-                            let start = buffer.clip_offset(rng.gen_range(0..=end), Left);
+                            let end = buffer.clip_offset(rng.random_range(0..=buffer.len()), Right);
+                            let start = buffer.clip_offset(rng.random_range(0..=end), Left);
                             ranges.push(start..end);
                         });
                     }
 
-                    if rng.r#gen() && fold_count > 0 {
+                    if rng.random() && fold_count > 0 {
                         log::info!("unfolding ranges: {:?}", ranges);
                         map.update(cx, |map, cx| {
                             map.unfold_intersecting(ranges, true, cx);
@@ -1727,8 +1726,8 @@ pub mod tests {
             // Line boundaries
             let buffer = &snapshot.buffer_snapshot;
             for _ in 0..5 {
-                let row = rng.gen_range(0..=buffer.max_point().row);
-                let column = rng.gen_range(0..=buffer.line_len(MultiBufferRow(row)));
+                let row = rng.random_range(0..=buffer.max_point().row);
+                let column = rng.random_range(0..=buffer.line_len(MultiBufferRow(row)));
                 let point = buffer.clip_point(Point::new(row, column), Left);
 
                 let (prev_buffer_bound, prev_display_bound) = snapshot.prev_line_boundary(point);
@@ -1776,8 +1775,8 @@ pub mod tests {
             let min_point = snapshot.clip_point(DisplayPoint::new(DisplayRow(0), 0), Left);
             let max_point = snapshot.clip_point(snapshot.max_point(), Right);
             for _ in 0..5 {
-                let row = rng.gen_range(0..=snapshot.max_point().row().0);
-                let column = rng.gen_range(0..=snapshot.line_len(DisplayRow(row)));
+                let row = rng.random_range(0..=snapshot.max_point().row().0);
+                let column = rng.random_range(0..=snapshot.line_len(DisplayRow(row)));
                 let point = snapshot.clip_point(DisplayPoint::new(DisplayRow(row), column), Left);
 
                 log::info!("Moving from point {:?}", point);
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index b073fe7be7..de734e5ea6 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -128,10 +128,10 @@ impl<T> BlockPlacement<T> {
         }
     }
 
-    fn sort_order(&self) -> u8 {
+    fn tie_break(&self) -> u8 {
         match self {
-            BlockPlacement::Above(_) => 0,
-            BlockPlacement::Replace(_) => 1,
+            BlockPlacement::Replace(_) => 0,
+            BlockPlacement::Above(_) => 1,
             BlockPlacement::Near(_) => 2,
             BlockPlacement::Below(_) => 3,
         }
@@ -143,7 +143,7 @@ impl BlockPlacement<Anchor> {
         self.start()
             .cmp(other.start(), buffer)
             .then_with(|| other.end().cmp(self.end(), buffer))
-            .then_with(|| self.sort_order().cmp(&other.sort_order()))
+            .then_with(|| self.tie_break().cmp(&other.tie_break()))
     }
 
     fn to_wrap_row(&self, wrap_snapshot: &WrapSnapshot) -> Option<BlockPlacement<WrapRow>> {
@@ -847,6 +847,7 @@ impl BlockMap {
                 .start()
                 .cmp(placement_b.start())
                 .then_with(|| placement_b.end().cmp(placement_a.end()))
+                .then_with(|| placement_a.tie_break().cmp(&placement_b.tie_break()))
                 .then_with(|| {
                     if block_a.is_header() {
                         Ordering::Less
@@ -856,7 +857,6 @@ impl BlockMap {
                         Ordering::Equal
                     }
                 })
-                .then_with(|| placement_a.sort_order().cmp(&placement_b.sort_order()))
                 .then_with(|| match (block_a, block_b) {
                     (
                         Block::ExcerptBoundary {
@@ -2922,21 +2922,21 @@ mod tests {
             .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
             .unwrap_or(10);
 
-        let wrap_width = if rng.gen_bool(0.2) {
+        let wrap_width = if rng.random_bool(0.2) {
             None
         } else {
-            Some(px(rng.gen_range(0.0..=100.0)))
+            Some(px(rng.random_range(0.0..=100.0)))
         };
         let tab_size = 1.try_into().unwrap();
         let font_size = px(14.0);
-        let buffer_start_header_height = rng.gen_range(1..=5);
-        let excerpt_header_height = rng.gen_range(1..=5);
+        let buffer_start_header_height = rng.random_range(1..=5);
+        let excerpt_header_height = rng.random_range(1..=5);
 
         log::info!("Wrap width: {:?}", wrap_width);
         log::info!("Excerpt Header Height: {:?}", excerpt_header_height);
-        let is_singleton = rng.r#gen();
+        let is_singleton = rng.random();
         let buffer = if is_singleton {
-            let len = rng.gen_range(0..10);
+            let len = rng.random_range(0..10);
             let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
             log::info!("initial singleton buffer text: {:?}", text);
             cx.update(|cx| MultiBuffer::build_simple(&text, cx))
@@ -2966,30 +2966,30 @@ mod tests {
 
         for _ in 0..operations {
             let mut buffer_edits = Vec::new();
-            match rng.gen_range(0..=100) {
+            match rng.random_range(0..=100) {
                 0..=19 => {
-                    let wrap_width = if rng.gen_bool(0.2) {
+                    let wrap_width = if rng.random_bool(0.2) {
                         None
                     } else {
-                        Some(px(rng.gen_range(0.0..=100.0)))
+                        Some(px(rng.random_range(0.0..=100.0)))
                     };
                     log::info!("Setting wrap width to {:?}", wrap_width);
                     wrap_map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
                 }
                 20..=39 => {
-                    let block_count = rng.gen_range(1..=5);
+                    let block_count = rng.random_range(1..=5);
                     let block_properties = (0..block_count)
                         .map(|_| {
                             let buffer = cx.update(|cx| buffer.read(cx).read(cx).clone());
                             let offset =
-                                buffer.clip_offset(rng.gen_range(0..=buffer.len()), Bias::Left);
+                                buffer.clip_offset(rng.random_range(0..=buffer.len()), Bias::Left);
                             let mut min_height = 0;
-                            let placement = match rng.gen_range(0..3) {
+                            let placement = match rng.random_range(0..3) {
                                 0 => {
                                     min_height = 1;
                                     let start = buffer.anchor_after(offset);
                                     let end = buffer.anchor_after(buffer.clip_offset(
-                                        rng.gen_range(offset..=buffer.len()),
+                                        rng.random_range(offset..=buffer.len()),
                                         Bias::Left,
                                     ));
                                     BlockPlacement::Replace(start..=end)
@@ -2998,7 +2998,7 @@ mod tests {
                                 _ => BlockPlacement::Below(buffer.anchor_after(offset)),
                             };
 
-                            let height = rng.gen_range(min_height..5);
+                            let height = rng.random_range(min_height..5);
                             BlockProperties {
                                 style: BlockStyle::Fixed,
                                 placement,
@@ -3040,7 +3040,7 @@ mod tests {
                     }
                 }
                 40..=59 if !block_map.custom_blocks.is_empty() => {
-                    let block_count = rng.gen_range(1..=4.min(block_map.custom_blocks.len()));
+                    let block_count = rng.random_range(1..=4.min(block_map.custom_blocks.len()));
                     let block_ids_to_remove = block_map
                         .custom_blocks
                         .choose_multiple(&mut rng, block_count)
@@ -3095,8 +3095,8 @@ mod tests {
                     let mut folded_count = folded_buffers.len();
                     let mut unfolded_count = unfolded_buffers.len();
 
-                    let fold = !unfolded_buffers.is_empty() && rng.gen_bool(0.5);
-                    let unfold = !folded_buffers.is_empty() && rng.gen_bool(0.5);
+                    let fold = !unfolded_buffers.is_empty() && rng.random_bool(0.5);
+                    let unfold = !folded_buffers.is_empty() && rng.random_bool(0.5);
                     if !fold && !unfold {
                         log::info!(
                             "Noop fold/unfold operation. Unfolded buffers: {unfolded_count}, folded buffers: {folded_count}"
@@ -3107,7 +3107,7 @@ mod tests {
                     buffer.update(cx, |buffer, cx| {
                         if fold {
                             let buffer_to_fold =
-                                unfolded_buffers[rng.gen_range(0..unfolded_buffers.len())];
+                                unfolded_buffers[rng.random_range(0..unfolded_buffers.len())];
                             log::info!("Folding {buffer_to_fold:?}");
                             let related_excerpts = buffer_snapshot
                                 .excerpts()
@@ -3133,7 +3133,7 @@ mod tests {
                         }
                         if unfold {
                             let buffer_to_unfold =
-                                folded_buffers[rng.gen_range(0..folded_buffers.len())];
+                                folded_buffers[rng.random_range(0..folded_buffers.len())];
                             log::info!("Unfolding {buffer_to_unfold:?}");
                             unfolded_count += 1;
                             folded_count -= 1;
@@ -3146,7 +3146,7 @@ mod tests {
                 }
                 _ => {
                     buffer.update(cx, |buffer, cx| {
-                        let mutation_count = rng.gen_range(1..=5);
+                        let mutation_count = rng.random_range(1..=5);
                         let subscription = buffer.subscribe();
                         buffer.randomly_mutate(&mut rng, mutation_count, cx);
                         buffer_snapshot = buffer.snapshot(cx);
@@ -3331,7 +3331,7 @@ mod tests {
             );
 
             for start_row in 0..expected_row_count {
-                let end_row = rng.gen_range(start_row + 1..=expected_row_count);
+                let end_row = rng.random_range(start_row + 1..=expected_row_count);
                 let mut expected_text = expected_lines[start_row..end_row].join("\n");
                 if end_row < expected_row_count {
                     expected_text.push('\n');
@@ -3426,8 +3426,8 @@ mod tests {
             );
 
             for _ in 0..10 {
-                let end_row = rng.gen_range(1..=expected_lines.len());
-                let start_row = rng.gen_range(0..end_row);
+                let end_row = rng.random_range(1..=expected_lines.len());
+                let start_row = rng.random_range(0..end_row);
 
                 let mut expected_longest_rows_in_range = vec![];
                 let mut longest_line_len_in_range = 0;
diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs
index 42f46fb749..6d160d0d6d 100644
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -1771,9 +1771,9 @@ mod tests {
             .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
             .unwrap_or(10);
 
-        let len = rng.gen_range(0..10);
+        let len = rng.random_range(0..10);
         let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-        let buffer = if rng.r#gen() {
+        let buffer = if rng.random() {
             MultiBuffer::build_simple(&text, cx)
         } else {
             MultiBuffer::build_random(&mut rng, cx)
@@ -1790,7 +1790,7 @@ mod tests {
             log::info!("text: {:?}", buffer_snapshot.text());
             let mut buffer_edits = Vec::new();
             let mut inlay_edits = Vec::new();
-            match rng.gen_range(0..=100) {
+            match rng.random_range(0..=100) {
                 0..=39 => {
                     snapshot_edits.extend(map.randomly_mutate(&mut rng));
                 }
@@ -1800,7 +1800,7 @@ mod tests {
                 }
                 _ => buffer.update(cx, |buffer, cx| {
                     let subscription = buffer.subscribe();
-                    let edit_count = rng.gen_range(1..=5);
+                    let edit_count = rng.random_range(1..=5);
                     buffer.randomly_mutate(&mut rng, edit_count, cx);
                     buffer_snapshot = buffer.snapshot(cx);
                     let edits = subscription.consume().into_inner();
@@ -1917,10 +1917,14 @@ mod tests {
             }
 
             for _ in 0..5 {
-                let mut start = snapshot
-                    .clip_offset(FoldOffset(rng.gen_range(0..=snapshot.len().0)), Bias::Left);
-                let mut end = snapshot
-                    .clip_offset(FoldOffset(rng.gen_range(0..=snapshot.len().0)), Bias::Right);
+                let mut start = snapshot.clip_offset(
+                    FoldOffset(rng.random_range(0..=snapshot.len().0)),
+                    Bias::Left,
+                );
+                let mut end = snapshot.clip_offset(
+                    FoldOffset(rng.random_range(0..=snapshot.len().0)),
+                    Bias::Right,
+                );
                 if start > end {
                     mem::swap(&mut start, &mut end);
                 }
@@ -1975,8 +1979,8 @@ mod tests {
 
             for _ in 0..5 {
                 let end =
-                    buffer_snapshot.clip_offset(rng.gen_range(0..=buffer_snapshot.len()), Right);
-                let start = buffer_snapshot.clip_offset(rng.gen_range(0..=end), Left);
+                    buffer_snapshot.clip_offset(rng.random_range(0..=buffer_snapshot.len()), Right);
+                let start = buffer_snapshot.clip_offset(rng.random_range(0..=end), Left);
                 let expected_folds = map
                     .snapshot
                     .folds
@@ -2001,10 +2005,10 @@ mod tests {
 
             let text = snapshot.text();
             for _ in 0..5 {
-                let start_row = rng.gen_range(0..=snapshot.max_point().row());
-                let start_column = rng.gen_range(0..=snapshot.line_len(start_row));
-                let end_row = rng.gen_range(0..=snapshot.max_point().row());
-                let end_column = rng.gen_range(0..=snapshot.line_len(end_row));
+                let start_row = rng.random_range(0..=snapshot.max_point().row());
+                let start_column = rng.random_range(0..=snapshot.line_len(start_row));
+                let end_row = rng.random_range(0..=snapshot.max_point().row());
+                let end_column = rng.random_range(0..=snapshot.line_len(end_row));
                 let mut start =
                     snapshot.clip_point(FoldPoint::new(start_row, start_column), Bias::Left);
                 let mut end = snapshot.clip_point(FoldPoint::new(end_row, end_column), Bias::Right);
@@ -2109,17 +2113,17 @@ mod tests {
             rng: &mut impl Rng,
         ) -> Vec<(FoldSnapshot, Vec<FoldEdit>)> {
             let mut snapshot_edits = Vec::new();
-            match rng.gen_range(0..=100) {
+            match rng.random_range(0..=100) {
                 0..=39 if !self.snapshot.folds.is_empty() => {
                     let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
                     let buffer = &inlay_snapshot.buffer;
                     let mut to_unfold = Vec::new();
-                    for _ in 0..rng.gen_range(1..=3) {
-                        let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
-                        let start = buffer.clip_offset(rng.gen_range(0..=end), Left);
+                    for _ in 0..rng.random_range(1..=3) {
+                        let end = buffer.clip_offset(rng.random_range(0..=buffer.len()), Right);
+                        let start = buffer.clip_offset(rng.random_range(0..=end), Left);
                         to_unfold.push(start..end);
                     }
-                    let inclusive = rng.r#gen();
+                    let inclusive = rng.random();
                     log::info!("unfolding {:?} (inclusive: {})", to_unfold, inclusive);
                     let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
                     snapshot_edits.push((snapshot, edits));
@@ -2130,9 +2134,9 @@ mod tests {
                     let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
                     let buffer = &inlay_snapshot.buffer;
                     let mut to_fold = Vec::new();
-                    for _ in 0..rng.gen_range(1..=2) {
-                        let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
-                        let start = buffer.clip_offset(rng.gen_range(0..=end), Left);
+                    for _ in 0..rng.random_range(1..=2) {
+                        let end = buffer.clip_offset(rng.random_range(0..=buffer.len()), Right);
+                        let start = buffer.clip_offset(rng.random_range(0..=end), Left);
                         to_fold.push((start..end, FoldPlaceholder::test()));
                     }
                     log::info!("folding {:?}", to_fold);
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index 3db9d10fdc..e00ffdbf2c 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -719,14 +719,18 @@ impl InlayMap {
         let mut to_remove = Vec::new();
         let mut to_insert = Vec::new();
         let snapshot = &mut self.snapshot;
-        for i in 0..rng.gen_range(1..=5) {
-            if self.inlays.is_empty() || rng.r#gen() {
+        for i in 0..rng.random_range(1..=5) {
+            if self.inlays.is_empty() || rng.random() {
                 let position = snapshot.buffer.random_byte_range(0, rng).start;
-                let bias = if rng.r#gen() { Bias::Left } else { Bias::Right };
-                let len = if rng.gen_bool(0.01) {
+                let bias = if rng.random() {
+                    Bias::Left
+                } else {
+                    Bias::Right
+                };
+                let len = if rng.random_bool(0.01) {
                     0
                 } else {
-                    rng.gen_range(1..=5)
+                    rng.random_range(1..=5)
                 };
                 let text = util::RandomCharIter::new(&mut *rng)
                     .filter(|ch| *ch != '\r')
@@ -1665,8 +1669,8 @@ mod tests {
             .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
             .unwrap_or(10);
 
-        let len = rng.gen_range(0..30);
-        let buffer = if rng.r#gen() {
+        let len = rng.random_range(0..30);
+        let buffer = if rng.random() {
             let text = util::RandomCharIter::new(&mut rng)
                 .take(len)
                 .collect::<String>();
@@ -1683,7 +1687,7 @@ mod tests {
 
             let mut prev_inlay_text = inlay_snapshot.text();
             let mut buffer_edits = Vec::new();
-            match rng.gen_range(0..=100) {
+            match rng.random_range(0..=100) {
                 0..=50 => {
                     let (snapshot, edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
                     log::info!("mutated text: {:?}", snapshot.text());
@@ -1691,7 +1695,7 @@ mod tests {
                 }
                 _ => buffer.update(cx, |buffer, cx| {
                     let subscription = buffer.subscribe();
-                    let edit_count = rng.gen_range(1..=5);
+                    let edit_count = rng.random_range(1..=5);
                     buffer.randomly_mutate(&mut rng, edit_count, cx);
                     buffer_snapshot = buffer.snapshot(cx);
                     let edits = subscription.consume().into_inner();
@@ -1740,7 +1744,7 @@ mod tests {
             }
 
             let mut text_highlights = TextHighlights::default();
-            let text_highlight_count = rng.gen_range(0_usize..10);
+            let text_highlight_count = rng.random_range(0_usize..10);
             let mut text_highlight_ranges = (0..text_highlight_count)
                 .map(|_| buffer_snapshot.random_byte_range(0, &mut rng))
                 .collect::<Vec<_>>();
@@ -1762,10 +1766,10 @@ mod tests {
 
             let mut inlay_highlights = InlayHighlights::default();
             if !inlays.is_empty() {
-                let inlay_highlight_count = rng.gen_range(0..inlays.len());
+                let inlay_highlight_count = rng.random_range(0..inlays.len());
                 let mut inlay_indices = BTreeSet::default();
                 while inlay_indices.len() < inlay_highlight_count {
-                    inlay_indices.insert(rng.gen_range(0..inlays.len()));
+                    inlay_indices.insert(rng.random_range(0..inlays.len()));
                 }
                 let new_highlights = TreeMap::from_ordered_entries(
                     inlay_indices
@@ -1782,8 +1786,8 @@ mod tests {
                                 }),
                                 n => {
                                     let inlay_text = inlay.text.to_string();
-                                    let mut highlight_end = rng.gen_range(1..n);
-                                    let mut highlight_start = rng.gen_range(0..highlight_end);
+                                    let mut highlight_end = rng.random_range(1..n);
+                                    let mut highlight_start = rng.random_range(0..highlight_end);
                                     while !inlay_text.is_char_boundary(highlight_end) {
                                         highlight_end += 1;
                                     }
@@ -1805,9 +1809,9 @@ mod tests {
             }
 
             for _ in 0..5 {
-                let mut end = rng.gen_range(0..=inlay_snapshot.len().0);
+                let mut end = rng.random_range(0..=inlay_snapshot.len().0);
                 end = expected_text.clip_offset(end, Bias::Right);
-                let mut start = rng.gen_range(0..=end);
+                let mut start = rng.random_range(0..=end);
                 start = expected_text.clip_offset(start, Bias::Right);
 
                 let range = InlayOffset(start)..InlayOffset(end);
diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs
index 6f5df9bb8e..523e777d91 100644
--- a/crates/editor/src/display_map/tab_map.rs
+++ b/crates/editor/src/display_map/tab_map.rs
@@ -736,9 +736,9 @@ mod tests {
 
     #[gpui::test(iterations = 100)]
     fn test_random_tabs(cx: &mut gpui::App, mut rng: StdRng) {
-        let tab_size = NonZeroU32::new(rng.gen_range(1..=4)).unwrap();
-        let len = rng.gen_range(0..30);
-        let buffer = if rng.r#gen() {
+        let tab_size = NonZeroU32::new(rng.random_range(1..=4)).unwrap();
+        let len = rng.random_range(0..30);
+        let buffer = if rng.random() {
             let text = util::RandomCharIter::new(&mut rng)
                 .take(len)
                 .collect::<String>();
@@ -769,11 +769,11 @@ mod tests {
         );
 
         for _ in 0..5 {
-            let end_row = rng.gen_range(0..=text.max_point().row);
-            let end_column = rng.gen_range(0..=text.line_len(end_row));
+            let end_row = rng.random_range(0..=text.max_point().row);
+            let end_column = rng.random_range(0..=text.line_len(end_row));
             let mut end = TabPoint(text.clip_point(Point::new(end_row, end_column), Bias::Right));
-            let start_row = rng.gen_range(0..=text.max_point().row);
-            let start_column = rng.gen_range(0..=text.line_len(start_row));
+            let start_row = rng.random_range(0..=text.max_point().row);
+            let start_column = rng.random_range(0..=text.line_len(start_row));
             let mut start =
                 TabPoint(text.clip_point(Point::new(start_row, start_column), Bias::Left));
             if start > end {
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
index 500ec3a0bb..127293726a 100644
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -1215,12 +1215,12 @@ mod tests {
             .unwrap_or(10);
 
         let text_system = cx.read(|cx| cx.text_system().clone());
-        let mut wrap_width = if rng.gen_bool(0.1) {
+        let mut wrap_width = if rng.random_bool(0.1) {
             None
         } else {
-            Some(px(rng.gen_range(0.0..=1000.0)))
+            Some(px(rng.random_range(0.0..=1000.0)))
         };
-        let tab_size = NonZeroU32::new(rng.gen_range(1..=4)).unwrap();
+        let tab_size = NonZeroU32::new(rng.random_range(1..=4)).unwrap();
 
         let font = test_font();
         let _font_id = text_system.resolve_font(&font);
@@ -1230,10 +1230,10 @@ mod tests {
         log::info!("Wrap width: {:?}", wrap_width);
 
         let buffer = cx.update(|cx| {
-            if rng.r#gen() {
+            if rng.random() {
                 MultiBuffer::build_random(&mut rng, cx)
             } else {
-                let len = rng.gen_range(0..10);
+                let len = rng.random_range(0..10);
                 let text = util::RandomCharIter::new(&mut rng)
                     .take(len)
                     .collect::<String>();
@@ -1281,12 +1281,12 @@ mod tests {
             log::info!("{} ==============================================", _i);
 
             let mut buffer_edits = Vec::new();
-            match rng.gen_range(0..=100) {
+            match rng.random_range(0..=100) {
                 0..=19 => {
-                    wrap_width = if rng.gen_bool(0.2) {
+                    wrap_width = if rng.random_bool(0.2) {
                         None
                     } else {
-                        Some(px(rng.gen_range(0.0..=1000.0)))
+                        Some(px(rng.random_range(0.0..=1000.0)))
                     };
                     log::info!("Setting wrap width to {:?}", wrap_width);
                     wrap_map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
@@ -1317,7 +1317,7 @@ mod tests {
                 _ => {
                     buffer.update(cx, |buffer, cx| {
                         let subscription = buffer.subscribe();
-                        let edit_count = rng.gen_range(1..=5);
+                        let edit_count = rng.random_range(1..=5);
                         buffer.randomly_mutate(&mut rng, edit_count, cx);
                         buffer_snapshot = buffer.snapshot(cx);
                         buffer_edits.extend(subscription.consume());
@@ -1341,7 +1341,7 @@ mod tests {
             snapshot.verify_chunks(&mut rng);
             edits.push((snapshot, wrap_edits));
 
-            if wrap_map.read_with(cx, |map, _| map.is_rewrapping()) && rng.gen_bool(0.4) {
+            if wrap_map.read_with(cx, |map, _| map.is_rewrapping()) && rng.random_bool(0.4) {
                 log::info!("Waiting for wrapping to finish");
                 while wrap_map.read_with(cx, |map, _| map.is_rewrapping()) {
                     notifications.next().await.unwrap();
@@ -1479,8 +1479,8 @@ mod tests {
     impl WrapSnapshot {
         fn verify_chunks(&mut self, rng: &mut impl Rng) {
             for _ in 0..5 {
-                let mut end_row = rng.gen_range(0..=self.max_point().row());
-                let start_row = rng.gen_range(0..=end_row);
+                let mut end_row = rng.random_range(0..=self.max_point().row());
+                let start_row = rng.random_range(0..=end_row);
                 end_row += 1;
 
                 let mut expected_text = self.text_chunks(start_row).collect::<String>();
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index fe5b2f83c2..37951074d1 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -164,7 +164,7 @@ use project::{
         DiagnosticSeverity, GitGutterSetting, GoToDiagnosticSeverityFilter, ProjectSettings,
     },
 };
-use rand::{seq::SliceRandom, thread_rng};
+use rand::seq::SliceRandom;
 use rpc::{ErrorCode, ErrorExt, proto::PeerId};
 use scroll::{Autoscroll, OngoingScroll, ScrollAnchor, ScrollManager, ScrollbarAutoHide};
 use selections_collection::{
@@ -10971,7 +10971,7 @@ impl Editor {
     }
 
     pub fn shuffle_lines(&mut self, _: &ShuffleLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.shuffle(&mut thread_rng()))
+        self.manipulate_immutable_lines(window, cx, |lines| lines.shuffle(&mut rand::rng()))
     }
 
     fn manipulate_lines<M>(
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index 27a9b88703..51719048ef 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -1107,7 +1107,7 @@ mod tests {
         init_test(cx);
 
         let fs = FakeFs::new(cx.executor());
-        let buffer_initial_text_len = rng.gen_range(5..15);
+        let buffer_initial_text_len = rng.random_range(5..15);
         let mut buffer_initial_text = Rope::from(
             RandomCharIter::new(&mut rng)
                 .take(buffer_initial_text_len)
@@ -1159,7 +1159,7 @@ mod tests {
         git_blame.update(cx, |blame, cx| blame.check_invariants(cx));
 
         for _ in 0..operations {
-            match rng.gen_range(0..100) {
+            match rng.random_range(0..100) {
                 0..=19 => {
                     log::info!("quiescing");
                     cx.executor().run_until_parked();
@@ -1202,8 +1202,8 @@ mod tests {
         let mut blame_entries = Vec::new();
         for ix in 0..5 {
             if last_row < max_row {
-                let row_start = rng.gen_range(last_row..max_row);
-                let row_end = rng.gen_range(row_start + 1..cmp::min(row_start + 3, max_row) + 1);
+                let row_start = rng.random_range(last_row..max_row);
+                let row_end = rng.random_range(row_start + 1..cmp::min(row_start + 3, max_row) + 1);
                 blame_entries.push(blame_entry(&ix.to_string(), row_start..row_end));
                 last_row = row_end;
             } else {
diff --git a/crates/gpui/examples/data_table.rs b/crates/gpui/examples/data_table.rs
index 5e82b08839..10e22828a8 100644
--- a/crates/gpui/examples/data_table.rs
+++ b/crates/gpui/examples/data_table.rs
@@ -38,58 +38,58 @@ pub struct Quote {
 impl Quote {
     pub fn random() -> Self {
         use rand::Rng;
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         // simulate a base price in a realistic range
-        let prev_close = rng.gen_range(100.0..200.0);
-        let change = rng.gen_range(-5.0..5.0);
+        let prev_close = rng.random_range(100.0..200.0);
+        let change = rng.random_range(-5.0..5.0);
         let last_done = prev_close + change;
-        let open = prev_close + rng.gen_range(-3.0..3.0);
-        let high = (prev_close + rng.gen_range::<f64, _>(0.0..10.0)).max(open);
-        let low = (prev_close - rng.gen_range::<f64, _>(0.0..10.0)).min(open);
-        let timestamp = Duration::from_secs(rng.gen_range(0..86400));
-        let volume = rng.gen_range(1_000_000..100_000_000);
+        let open = prev_close + rng.random_range(-3.0..3.0);
+        let high = (prev_close + rng.random_range::<f64, _>(0.0..10.0)).max(open);
+        let low = (prev_close - rng.random_range::<f64, _>(0.0..10.0)).min(open);
+        let timestamp = Duration::from_secs(rng.random_range(0..86400));
+        let volume = rng.random_range(1_000_000..100_000_000);
         let turnover = last_done * volume as f64;
         let symbol = {
             let mut ticker = String::new();
-            if rng.gen_bool(0.5) {
+            if rng.random_bool(0.5) {
                 ticker.push_str(&format!(
                     "{:03}.{}",
-                    rng.gen_range(100..1000),
-                    rng.gen_range(0..10)
+                    rng.random_range(100..1000),
+                    rng.random_range(0..10)
                 ));
             } else {
                 ticker.push_str(&format!(
                     "{}{}",
-                    rng.gen_range('A'..='Z'),
-                    rng.gen_range('A'..='Z')
+                    rng.random_range('A'..='Z'),
+                    rng.random_range('A'..='Z')
                 ));
             }
-            ticker.push_str(&format!(".{}", rng.gen_range('A'..='Z')));
+            ticker.push_str(&format!(".{}", rng.random_range('A'..='Z')));
             ticker
         };
         let name = format!(
             "{} {} - #{}",
             symbol,
-            rng.gen_range(1..100),
-            rng.gen_range(10000..100000)
+            rng.random_range(1..100),
+            rng.random_range(10000..100000)
         );
-        let ttm = rng.gen_range(0.0..10.0);
-        let market_cap = rng.gen_range(1_000_000.0..10_000_000.0);
-        let float_cap = market_cap + rng.gen_range(1_000.0..10_000.0);
-        let shares = rng.gen_range(100.0..1000.0);
+        let ttm = rng.random_range(0.0..10.0);
+        let market_cap = rng.random_range(1_000_000.0..10_000_000.0);
+        let float_cap = market_cap + rng.random_range(1_000.0..10_000.0);
+        let shares = rng.random_range(100.0..1000.0);
         let pb = market_cap / shares;
         let pe = market_cap / shares;
         let eps = market_cap / shares;
-        let dividend = rng.gen_range(0.0..10.0);
-        let dividend_yield = rng.gen_range(0.0..10.0);
-        let dividend_per_share = rng.gen_range(0.0..10.0);
+        let dividend = rng.random_range(0.0..10.0);
+        let dividend_yield = rng.random_range(0.0..10.0);
+        let dividend_per_share = rng.random_range(0.0..10.0);
         let dividend_date = SharedString::new(format!(
             "{}-{}-{}",
-            rng.gen_range(2000..2023),
-            rng.gen_range(1..12),
-            rng.gen_range(1..28)
+            rng.random_range(2000..2023),
+            rng.random_range(1..12),
+            rng.random_range(1..28)
         ));
-        let dividend_payment = rng.gen_range(0.0..10.0);
+        let dividend_payment = rng.random_range(0.0..10.0);
 
         Self {
             name: name.into(),
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index c65c045f6b..b3d342b09b 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -144,7 +144,7 @@ impl TestAppContext {
 
     /// Create a single TestAppContext, for non-multi-client tests
     pub fn single() -> Self {
-        let dispatcher = TestDispatcher::new(StdRng::from_entropy());
+        let dispatcher = TestDispatcher::new(StdRng::seed_from_u64(0));
         Self::build(dispatcher, None)
     }
 
diff --git a/crates/gpui/src/bounds_tree.rs b/crates/gpui/src/bounds_tree.rs
index 03f83b9503..a96bfe55b9 100644
--- a/crates/gpui/src/bounds_tree.rs
+++ b/crates/gpui/src/bounds_tree.rs
@@ -309,12 +309,12 @@ mod tests {
             let mut expected_quads: Vec<(Bounds<f32>, u32)> = Vec::new();
 
             // Insert a random number of random AABBs into the tree.
-            let num_bounds = rng.gen_range(1..=max_bounds);
+            let num_bounds = rng.random_range(1..=max_bounds);
             for _ in 0..num_bounds {
-                let min_x: f32 = rng.gen_range(-100.0..100.0);
-                let min_y: f32 = rng.gen_range(-100.0..100.0);
-                let width: f32 = rng.gen_range(0.0..50.0);
-                let height: f32 = rng.gen_range(0.0..50.0);
+                let min_x: f32 = rng.random_range(-100.0..100.0);
+                let min_y: f32 = rng.random_range(-100.0..100.0);
+                let width: f32 = rng.random_range(0.0..50.0);
+                let height: f32 = rng.random_range(0.0..50.0);
                 let bounds = Bounds {
                     origin: Point { x: min_x, y: min_y },
                     size: Size { width, height },
diff --git a/crates/gpui/src/platform/test/dispatcher.rs b/crates/gpui/src/platform/test/dispatcher.rs
index 4ce62c4bdc..e19710effd 100644
--- a/crates/gpui/src/platform/test/dispatcher.rs
+++ b/crates/gpui/src/platform/test/dispatcher.rs
@@ -118,7 +118,7 @@ impl TestDispatcher {
         }
 
         YieldNow {
-            count: self.state.lock().random.gen_range(0..10),
+            count: self.state.lock().random.random_range(0..10),
         }
     }
 
@@ -151,11 +151,11 @@ impl TestDispatcher {
             if deprioritized_background_len == 0 {
                 return false;
             }
-            let ix = state.random.gen_range(0..deprioritized_background_len);
+            let ix = state.random.random_range(0..deprioritized_background_len);
             main_thread = false;
             runnable = state.deprioritized_background.swap_remove(ix);
         } else {
-            main_thread = state.random.gen_ratio(
+            main_thread = state.random.random_ratio(
                 foreground_len as u32,
                 (foreground_len + background_len) as u32,
             );
@@ -170,7 +170,7 @@ impl TestDispatcher {
                     .pop_front()
                     .unwrap();
             } else {
-                let ix = state.random.gen_range(0..background_len);
+                let ix = state.random.random_range(0..background_len);
                 runnable = state.background.swap_remove(ix);
             };
         };
@@ -241,7 +241,7 @@ impl TestDispatcher {
     pub fn gen_block_on_ticks(&self) -> usize {
         let mut lock = self.state.lock();
         let block_on_ticks = lock.block_on_ticks.clone();
-        lock.random.gen_range(block_on_ticks)
+        lock.random.random_range(block_on_ticks)
     }
 }
 
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index 96db8077c4..4d0e6ea56f 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -94,7 +94,11 @@ impl WindowsPlatform {
         }
         let directx_devices = DirectXDevices::new().context("Creating DirectX devices")?;
         let (main_sender, main_receiver) = flume::unbounded::<Runnable>();
-        let validation_number = rand::random::<usize>();
+        let validation_number = if usize::BITS == 64 {
+            rand::random::<u64>() as usize
+        } else {
+            rand::random::<u32>() as usize
+        };
         let raw_window_handles = Arc::new(RwLock::new(SmallVec::new()));
         let text_system = Arc::new(
             DirectWriteTextSystem::new(&directx_devices)
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 1f056aacc5..c86787e1f9 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2842,12 +2842,12 @@ impl Buffer {
 
             let new_start = last_end.map_or(0, |last_end| last_end + 1);
             let mut range = self.random_byte_range(new_start, rng);
-            if rng.gen_bool(0.2) {
+            if rng.random_bool(0.2) {
                 mem::swap(&mut range.start, &mut range.end);
             }
             last_end = Some(range.end);
 
-            let new_text_len = rng.gen_range(0..10);
+            let new_text_len = rng.random_range(0..10);
             let mut new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
             new_text = new_text.to_uppercase();
 
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index ce65afa628..5b88112c95 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -3013,7 +3013,7 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
         .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
         .unwrap_or(10);
 
-    let base_text_len = rng.gen_range(0..10);
+    let base_text_len = rng.random_range(0..10);
     let base_text = RandomCharIter::new(&mut rng)
         .take(base_text_len)
         .collect::<String>();
@@ -3022,7 +3022,7 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
     let network = Arc::new(Mutex::new(Network::new(rng.clone())));
     let base_buffer = cx.new(|cx| Buffer::local(base_text.as_str(), cx));
 
-    for i in 0..rng.gen_range(min_peers..=max_peers) {
+    for i in 0..rng.random_range(min_peers..=max_peers) {
         let buffer = cx.new(|cx| {
             let state = base_buffer.read(cx).to_proto(cx);
             let ops = cx
@@ -3035,7 +3035,7 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
                     .map(|op| proto::deserialize_operation(op).unwrap()),
                 cx,
             );
-            buffer.set_group_interval(Duration::from_millis(rng.gen_range(0..=200)));
+            buffer.set_group_interval(Duration::from_millis(rng.random_range(0..=200)));
             let network = network.clone();
             cx.subscribe(&cx.entity(), move |buffer, _, event, _| {
                 if let BufferEvent::Operation {
@@ -3066,11 +3066,11 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
     let mut next_diagnostic_id = 0;
     let mut active_selections = BTreeMap::default();
     loop {
-        let replica_index = rng.gen_range(0..replica_ids.len());
+        let replica_index = rng.random_range(0..replica_ids.len());
         let replica_id = replica_ids[replica_index];
         let buffer = &mut buffers[replica_index];
         let mut new_buffer = None;
-        match rng.gen_range(0..100) {
+        match rng.random_range(0..100) {
             0..=29 if mutation_count != 0 => {
                 buffer.update(cx, |buffer, cx| {
                     buffer.start_transaction_at(now);
@@ -3082,13 +3082,13 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
             }
             30..=39 if mutation_count != 0 => {
                 buffer.update(cx, |buffer, cx| {
-                    if rng.gen_bool(0.2) {
+                    if rng.random_bool(0.2) {
                         log::info!("peer {} clearing active selections", replica_id);
                         active_selections.remove(&replica_id);
                         buffer.remove_active_selections(cx);
                     } else {
                         let mut selections = Vec::new();
-                        for id in 0..rng.gen_range(1..=5) {
+                        for id in 0..rng.random_range(1..=5) {
                             let range = buffer.random_byte_range(0, &mut rng);
                             selections.push(Selection {
                                 id,
@@ -3111,7 +3111,7 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
                 mutation_count -= 1;
             }
             40..=49 if mutation_count != 0 && replica_id == 0 => {
-                let entry_count = rng.gen_range(1..=5);
+                let entry_count = rng.random_range(1..=5);
                 buffer.update(cx, |buffer, cx| {
                     let diagnostics = DiagnosticSet::new(
                         (0..entry_count).map(|_| {
@@ -3166,7 +3166,7 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
                         new_buffer.replica_id(),
                         new_buffer.text()
                     );
-                    new_buffer.set_group_interval(Duration::from_millis(rng.gen_range(0..=200)));
+                    new_buffer.set_group_interval(Duration::from_millis(rng.random_range(0..=200)));
                     let network = network.clone();
                     cx.subscribe(&cx.entity(), move |buffer, _, event, _| {
                         if let BufferEvent::Operation {
@@ -3238,7 +3238,7 @@ fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
             _ => {}
         }
 
-        now += Duration::from_millis(rng.gen_range(0..=200));
+        now += Duration::from_millis(rng.random_range(0..=200));
         buffers.extend(new_buffer);
 
         for buffer in &buffers {
@@ -3320,23 +3320,23 @@ fn test_trailing_whitespace_ranges(mut rng: StdRng) {
     // Generate a random multi-line string containing
     // some lines with trailing whitespace.
     let mut text = String::new();
-    for _ in 0..rng.gen_range(0..16) {
-        for _ in 0..rng.gen_range(0..36) {
-            text.push(match rng.gen_range(0..10) {
+    for _ in 0..rng.random_range(0..16) {
+        for _ in 0..rng.random_range(0..36) {
+            text.push(match rng.random_range(0..10) {
                 0..=1 => ' ',
                 3 => '\t',
-                _ => rng.gen_range('a'..='z'),
+                _ => rng.random_range('a'..='z'),
             });
         }
         text.push('\n');
     }
 
-    match rng.gen_range(0..10) {
+    match rng.random_range(0..10) {
         // sometimes remove the last newline
         0..=1 => drop(text.pop()), //
 
         // sometimes add extra newlines
-        2..=3 => text.push_str(&"\n".repeat(rng.gen_range(1..5))),
+        2..=3 => text.push_str(&"\n".repeat(rng.random_range(1..5))),
         _ => {}
     }
 
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index a2f28215b4..4535d57d77 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -3580,7 +3580,7 @@ impl MultiBuffer {
     pub fn build_random(rng: &mut impl rand::Rng, cx: &mut gpui::App) -> Entity<Self> {
         cx.new(|cx| {
             let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            let mutation_count = rng.gen_range(1..=5);
+            let mutation_count = rng.random_range(1..=5);
             multibuffer.randomly_edit_excerpts(rng, mutation_count, cx);
             multibuffer
         })
@@ -3603,16 +3603,17 @@ impl MultiBuffer {
             }
 
             let new_start = last_end.map_or(0, |last_end| last_end + 1);
-            let end = snapshot.clip_offset(rng.gen_range(new_start..=snapshot.len()), Bias::Right);
-            let start = snapshot.clip_offset(rng.gen_range(new_start..=end), Bias::Right);
+            let end =
+                snapshot.clip_offset(rng.random_range(new_start..=snapshot.len()), Bias::Right);
+            let start = snapshot.clip_offset(rng.random_range(new_start..=end), Bias::Right);
             last_end = Some(end);
 
             let mut range = start..end;
-            if rng.gen_bool(0.2) {
+            if rng.random_bool(0.2) {
                 mem::swap(&mut range.start, &mut range.end);
             }
 
-            let new_text_len = rng.gen_range(0..10);
+            let new_text_len = rng.random_range(0..10);
             let new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
 
             edits.push((range, new_text.into()));
@@ -3639,18 +3640,18 @@ impl MultiBuffer {
 
         let mut buffers = Vec::new();
         for _ in 0..mutation_count {
-            if rng.gen_bool(0.05) {
+            if rng.random_bool(0.05) {
                 log::info!("Clearing multi-buffer");
                 self.clear(cx);
                 continue;
-            } else if rng.gen_bool(0.1) && !self.excerpt_ids().is_empty() {
+            } else if rng.random_bool(0.1) && !self.excerpt_ids().is_empty() {
                 let ids = self.excerpt_ids();
                 let mut excerpts = HashSet::default();
-                for _ in 0..rng.gen_range(0..ids.len()) {
+                for _ in 0..rng.random_range(0..ids.len()) {
                     excerpts.extend(ids.choose(rng).copied());
                 }
 
-                let line_count = rng.gen_range(0..5);
+                let line_count = rng.random_range(0..5);
 
                 log::info!("Expanding excerpts {excerpts:?} by {line_count} lines");
 
@@ -3664,8 +3665,8 @@ impl MultiBuffer {
             }
 
             let excerpt_ids = self.excerpt_ids();
-            if excerpt_ids.is_empty() || (rng.r#gen() && excerpt_ids.len() < max_excerpts) {
-                let buffer_handle = if rng.r#gen() || self.buffers.borrow().is_empty() {
+            if excerpt_ids.is_empty() || (rng.random() && excerpt_ids.len() < max_excerpts) {
+                let buffer_handle = if rng.random() || self.buffers.borrow().is_empty() {
                     let text = RandomCharIter::new(&mut *rng).take(10).collect::<String>();
                     buffers.push(cx.new(|cx| Buffer::local(text, cx)));
                     let buffer = buffers.last().unwrap().read(cx);
@@ -3687,11 +3688,11 @@ impl MultiBuffer {
 
                 let buffer = buffer_handle.read(cx);
                 let buffer_text = buffer.text();
-                let ranges = (0..rng.gen_range(0..5))
+                let ranges = (0..rng.random_range(0..5))
                     .map(|_| {
                         let end_ix =
-                            buffer.clip_offset(rng.gen_range(0..=buffer.len()), Bias::Right);
-                        let start_ix = buffer.clip_offset(rng.gen_range(0..=end_ix), Bias::Left);
+                            buffer.clip_offset(rng.random_range(0..=buffer.len()), Bias::Right);
+                        let start_ix = buffer.clip_offset(rng.random_range(0..=end_ix), Bias::Left);
                         ExcerptRange::new(start_ix..end_ix)
                     })
                     .collect::<Vec<_>>();
@@ -3708,7 +3709,7 @@ impl MultiBuffer {
                 let excerpt_id = self.push_excerpts(buffer_handle.clone(), ranges, cx);
                 log::info!("Inserted with ids: {:?}", excerpt_id);
             } else {
-                let remove_count = rng.gen_range(1..=excerpt_ids.len());
+                let remove_count = rng.random_range(1..=excerpt_ids.len());
                 let mut excerpts_to_remove = excerpt_ids
                     .choose_multiple(rng, remove_count)
                     .cloned()
@@ -3730,7 +3731,7 @@ impl MultiBuffer {
     ) {
         use rand::prelude::*;
 
-        if rng.gen_bool(0.7) || self.singleton {
+        if rng.random_bool(0.7) || self.singleton {
             let buffer = self
                 .buffers
                 .borrow()
@@ -3740,7 +3741,7 @@ impl MultiBuffer {
 
             if let Some(buffer) = buffer {
                 buffer.update(cx, |buffer, cx| {
-                    if rng.r#gen() {
+                    if rng.random() {
                         buffer.randomly_edit(rng, mutation_count, cx);
                     } else {
                         buffer.randomly_undo_redo(rng, cx);
@@ -6388,8 +6389,8 @@ impl MultiBufferSnapshot {
 #[cfg(any(test, feature = "test-support"))]
 impl MultiBufferSnapshot {
     pub fn random_byte_range(&self, start_offset: usize, rng: &mut impl rand::Rng) -> Range<usize> {
-        let end = self.clip_offset(rng.gen_range(start_offset..=self.len()), Bias::Right);
-        let start = self.clip_offset(rng.gen_range(start_offset..=end), Bias::Right);
+        let end = self.clip_offset(rng.random_range(start_offset..=self.len()), Bias::Right);
+        let start = self.clip_offset(rng.random_range(start_offset..=end), Bias::Right);
         start..end
     }
 
diff --git a/crates/multi_buffer/src/multi_buffer_tests.rs b/crates/multi_buffer/src/multi_buffer_tests.rs
index 61b4b0520f..efc622b017 100644
--- a/crates/multi_buffer/src/multi_buffer_tests.rs
+++ b/crates/multi_buffer/src/multi_buffer_tests.rs
@@ -2491,12 +2491,12 @@ async fn test_random_set_ranges(cx: &mut TestAppContext, mut rng: StdRng) {
 
     for _ in 0..operations {
         let snapshot = buf.update(cx, |buf, _| buf.snapshot());
-        let num_ranges = rng.gen_range(0..=10);
+        let num_ranges = rng.random_range(0..=10);
         let max_row = snapshot.max_point().row;
         let mut ranges = (0..num_ranges)
             .map(|_| {
-                let start = rng.gen_range(0..max_row);
-                let end = rng.gen_range(start + 1..max_row + 1);
+                let start = rng.random_range(0..max_row);
+                let end = rng.random_range(start + 1..max_row + 1);
                 Point::row_range(start..end)
             })
             .collect::<Vec<_>>();
@@ -2562,11 +2562,11 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
     let mut needs_diff_calculation = false;
 
     for _ in 0..operations {
-        match rng.gen_range(0..100) {
+        match rng.random_range(0..100) {
             0..=14 if !buffers.is_empty() => {
                 let buffer = buffers.choose(&mut rng).unwrap();
                 buffer.update(cx, |buf, cx| {
-                    let edit_count = rng.gen_range(1..5);
+                    let edit_count = rng.random_range(1..5);
                     buf.randomly_edit(&mut rng, edit_count, cx);
                     log::info!("buffer text:\n{}", buf.text());
                     needs_diff_calculation = true;
@@ -2577,11 +2577,11 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
                 multibuffer.update(cx, |multibuffer, cx| {
                     let ids = multibuffer.excerpt_ids();
                     let mut excerpts = HashSet::default();
-                    for _ in 0..rng.gen_range(0..ids.len()) {
+                    for _ in 0..rng.random_range(0..ids.len()) {
                         excerpts.extend(ids.choose(&mut rng).copied());
                     }
 
-                    let line_count = rng.gen_range(0..5);
+                    let line_count = rng.random_range(0..5);
 
                     let excerpt_ixs = excerpts
                         .iter()
@@ -2600,7 +2600,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
             }
             20..=29 if !reference.excerpts.is_empty() => {
                 let mut ids_to_remove = vec![];
-                for _ in 0..rng.gen_range(1..=3) {
+                for _ in 0..rng.random_range(1..=3) {
                     let Some(excerpt) = reference.excerpts.choose(&mut rng) else {
                         break;
                     };
@@ -2620,8 +2620,12 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
                 let multibuffer =
                     multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
                 let offset =
-                    multibuffer.clip_offset(rng.gen_range(0..=multibuffer.len()), Bias::Left);
-                let bias = if rng.r#gen() { Bias::Left } else { Bias::Right };
+                    multibuffer.clip_offset(rng.random_range(0..=multibuffer.len()), Bias::Left);
+                let bias = if rng.random() {
+                    Bias::Left
+                } else {
+                    Bias::Right
+                };
                 log::info!("Creating anchor at {} with bias {:?}", offset, bias);
                 anchors.push(multibuffer.anchor_at(offset, bias));
                 anchors.sort_by(|a, b| a.cmp(b, &multibuffer));
@@ -2654,7 +2658,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
             45..=55 if !reference.excerpts.is_empty() => {
                 multibuffer.update(cx, |multibuffer, cx| {
                     let snapshot = multibuffer.snapshot(cx);
-                    let excerpt_ix = rng.gen_range(0..reference.excerpts.len());
+                    let excerpt_ix = rng.random_range(0..reference.excerpts.len());
                     let excerpt = &reference.excerpts[excerpt_ix];
                     let start = excerpt.range.start;
                     let end = excerpt.range.end;
@@ -2691,7 +2695,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
                 });
             }
             _ => {
-                let buffer_handle = if buffers.is_empty() || rng.gen_bool(0.4) {
+                let buffer_handle = if buffers.is_empty() || rng.random_bool(0.4) {
                     let mut base_text = util::RandomCharIter::new(&mut rng)
                         .take(256)
                         .collect::<String>();
@@ -2708,7 +2712,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
                     buffers.choose(&mut rng).unwrap()
                 };
 
-                let prev_excerpt_ix = rng.gen_range(0..=reference.excerpts.len());
+                let prev_excerpt_ix = rng.random_range(0..=reference.excerpts.len());
                 let prev_excerpt_id = reference
                     .excerpts
                     .get(prev_excerpt_ix)
@@ -2716,8 +2720,8 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
                 let excerpt_ix = (prev_excerpt_ix + 1).min(reference.excerpts.len());
 
                 let (range, anchor_range) = buffer_handle.read_with(cx, |buffer, _| {
-                    let end_row = rng.gen_range(0..=buffer.max_point().row);
-                    let start_row = rng.gen_range(0..=end_row);
+                    let end_row = rng.random_range(0..=buffer.max_point().row);
+                    let start_row = rng.random_range(0..=end_row);
                     let end_ix = buffer.point_to_offset(Point::new(end_row, 0));
                     let start_ix = buffer.point_to_offset(Point::new(start_row, 0));
                     let anchor_range = buffer.anchor_before(start_ix)..buffer.anchor_after(end_ix);
@@ -2766,7 +2770,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
             }
         }
 
-        if rng.gen_bool(0.3) {
+        if rng.random_bool(0.3) {
             multibuffer.update(cx, |multibuffer, cx| {
                 old_versions.push((multibuffer.snapshot(cx), multibuffer.subscribe()));
             })
@@ -2815,7 +2819,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
         pretty_assertions::assert_eq!(actual_row_infos, expected_row_infos);
 
         for _ in 0..5 {
-            let start_row = rng.gen_range(0..=expected_row_infos.len());
+            let start_row = rng.random_range(0..=expected_row_infos.len());
             assert_eq!(
                 snapshot
                     .row_infos(MultiBufferRow(start_row as u32))
@@ -2872,8 +2876,8 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
 
         let text_rope = Rope::from(expected_text.as_str());
         for _ in 0..10 {
-            let end_ix = text_rope.clip_offset(rng.gen_range(0..=text_rope.len()), Bias::Right);
-            let start_ix = text_rope.clip_offset(rng.gen_range(0..=end_ix), Bias::Left);
+            let end_ix = text_rope.clip_offset(rng.random_range(0..=text_rope.len()), Bias::Right);
+            let start_ix = text_rope.clip_offset(rng.random_range(0..=end_ix), Bias::Left);
 
             let text_for_range = snapshot
                 .text_for_range(start_ix..end_ix)
@@ -2908,7 +2912,7 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
         }
 
         for _ in 0..10 {
-            let end_ix = text_rope.clip_offset(rng.gen_range(0..=text_rope.len()), Bias::Right);
+            let end_ix = text_rope.clip_offset(rng.random_range(0..=text_rope.len()), Bias::Right);
             assert_eq!(
                 snapshot.reversed_chars_at(end_ix).collect::<String>(),
                 expected_text[..end_ix].chars().rev().collect::<String>(),
@@ -2916,8 +2920,8 @@ async fn test_random_multibuffer(cx: &mut TestAppContext, mut rng: StdRng) {
         }
 
         for _ in 0..10 {
-            let end_ix = rng.gen_range(0..=text_rope.len());
-            let start_ix = rng.gen_range(0..=end_ix);
+            let end_ix = rng.random_range(0..=text_rope.len());
+            let start_ix = rng.random_range(0..=end_ix);
             assert_eq!(
                 snapshot
                     .bytes_in_range(start_ix..end_ix)
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 36ec338fb7..7f7e759b27 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3761,7 +3761,7 @@ impl LspStore {
             worktree_store,
             languages: languages.clone(),
             language_server_statuses: Default::default(),
-            nonce: StdRng::from_entropy().r#gen(),
+            nonce: StdRng::from_os_rng().random(),
             diagnostic_summaries: HashMap::default(),
             lsp_server_capabilities: HashMap::default(),
             lsp_document_colors: HashMap::default(),
@@ -3823,7 +3823,7 @@ impl LspStore {
             worktree_store,
             languages: languages.clone(),
             language_server_statuses: Default::default(),
-            nonce: StdRng::from_entropy().r#gen(),
+            nonce: StdRng::from_os_rng().random(),
             diagnostic_summaries: HashMap::default(),
             lsp_server_capabilities: HashMap::default(),
             lsp_document_colors: HashMap::default(),
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index a07f94fb73..969e18f6d4 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -7661,7 +7661,7 @@ async fn test_staging_random_hunks(
         .unwrap_or(20);
 
     // Try to induce races between diff recalculation and index writes.
-    if rng.gen_bool(0.5) {
+    if rng.random_bool(0.5) {
         executor.deprioritize(*CALCULATE_DIFF_TASK);
     }
 
@@ -7717,7 +7717,7 @@ async fn test_staging_random_hunks(
     assert_eq!(hunks.len(), 6);
 
     for _i in 0..operations {
-        let hunk_ix = rng.gen_range(0..hunks.len());
+        let hunk_ix = rng.random_range(0..hunks.len());
         let hunk = &mut hunks[hunk_ix];
         let row = hunk.range.start.row;
 
@@ -7735,7 +7735,7 @@ async fn test_staging_random_hunks(
             hunk.secondary_status = SecondaryHunkAdditionPending;
         }
 
-        for _ in 0..rng.gen_range(0..10) {
+        for _ in 0..rng.random_range(0..10) {
             log::info!("yielding");
             cx.executor().simulate_random_delay().await;
         }
diff --git a/crates/rope/benches/rope_benchmark.rs b/crates/rope/benches/rope_benchmark.rs
index 2233708525..cb741fc784 100644
--- a/crates/rope/benches/rope_benchmark.rs
+++ b/crates/rope/benches/rope_benchmark.rs
@@ -28,11 +28,11 @@ fn generate_random_rope_ranges(mut rng: StdRng, rope: &Rope) -> Vec<Range<usize>
     let mut start = 0;
     for _ in 0..num_ranges {
         let range_start = rope.clip_offset(
-            rng.gen_range(start..=(start + range_max_len)),
+            rng.random_range(start..=(start + range_max_len)),
             sum_tree::Bias::Left,
         );
         let range_end = rope.clip_offset(
-            rng.gen_range(range_start..(range_start + range_max_len)),
+            rng.random_range(range_start..(range_start + range_max_len)),
             sum_tree::Bias::Right,
         );
 
@@ -52,7 +52,7 @@ fn generate_random_rope_points(mut rng: StdRng, rope: &Rope) -> Vec<Point> {
 
     let mut points = Vec::new();
     for _ in 0..num_points {
-        points.push(rope.offset_to_point(rng.gen_range(0..rope.len())));
+        points.push(rope.offset_to_point(rng.random_range(0..rope.len())));
     }
     points
 }
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
index 00679d8cf5..689875274a 100644
--- a/crates/rope/src/chunk.rs
+++ b/crates/rope/src/chunk.rs
@@ -612,7 +612,7 @@ mod tests {
 
     #[gpui::test(iterations = 100)]
     fn test_random_chunks(mut rng: StdRng) {
-        let chunk_len = rng.gen_range(0..=MAX_BASE);
+        let chunk_len = rng.random_range(0..=MAX_BASE);
         let text = RandomCharIter::new(&mut rng)
             .take(chunk_len)
             .collect::<String>();
@@ -627,8 +627,8 @@ mod tests {
         verify_chunk(chunk.as_slice(), text);
 
         for _ in 0..10 {
-            let mut start = rng.gen_range(0..=chunk.text.len());
-            let mut end = rng.gen_range(start..=chunk.text.len());
+            let mut start = rng.random_range(0..=chunk.text.len());
+            let mut end = rng.random_range(start..=chunk.text.len());
             while !chunk.text.is_char_boundary(start) {
                 start -= 1;
             }
@@ -645,7 +645,7 @@ mod tests {
 
     #[gpui::test(iterations = 1000)]
     fn test_nth_set_bit_random(mut rng: StdRng) {
-        let set_count = rng.gen_range(0..=128);
+        let set_count = rng.random_range(0..=128);
         let mut set_bits = (0..128).choose_multiple(&mut rng, set_count);
         set_bits.sort();
         let mut n = 0;
diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
index 41b2a2d033..3388685422 100644
--- a/crates/rope/src/rope.rs
+++ b/crates/rope/src/rope.rs
@@ -1610,9 +1610,9 @@ mod tests {
         let mut expected = String::new();
         let mut actual = Rope::new();
         for _ in 0..operations {
-            let end_ix = clip_offset(&expected, rng.gen_range(0..=expected.len()), Right);
-            let start_ix = clip_offset(&expected, rng.gen_range(0..=end_ix), Left);
-            let len = rng.gen_range(0..=64);
+            let end_ix = clip_offset(&expected, rng.random_range(0..=expected.len()), Right);
+            let start_ix = clip_offset(&expected, rng.random_range(0..=end_ix), Left);
+            let len = rng.random_range(0..=64);
             let new_text: String = RandomCharIter::new(&mut rng).take(len).collect();
 
             let mut new_actual = Rope::new();
@@ -1629,8 +1629,8 @@ mod tests {
             log::info!("text: {:?}", expected);
 
             for _ in 0..5 {
-                let end_ix = clip_offset(&expected, rng.gen_range(0..=expected.len()), Right);
-                let start_ix = clip_offset(&expected, rng.gen_range(0..=end_ix), Left);
+                let end_ix = clip_offset(&expected, rng.random_range(0..=expected.len()), Right);
+                let start_ix = clip_offset(&expected, rng.random_range(0..=end_ix), Left);
 
                 let actual_text = actual.chunks_in_range(start_ix..end_ix).collect::<String>();
                 assert_eq!(actual_text, &expected[start_ix..end_ix]);
@@ -1695,14 +1695,14 @@ mod tests {
                 );
 
                 // Check that next_line/prev_line work correctly from random positions
-                let mut offset = rng.gen_range(start_ix..=end_ix);
+                let mut offset = rng.random_range(start_ix..=end_ix);
                 while !expected.is_char_boundary(offset) {
                     offset -= 1;
                 }
                 chunks.seek(offset);
 
                 for _ in 0..5 {
-                    if rng.r#gen() {
+                    if rng.random() {
                         let expected_next_line_start = expected[offset..end_ix]
                             .find('\n')
                             .map(|newline_ix| offset + newline_ix + 1);
@@ -1791,8 +1791,8 @@ mod tests {
                     }
 
                     assert!((start_ix..=end_ix).contains(&chunks.offset()));
-                    if rng.r#gen() {
-                        offset = rng.gen_range(start_ix..=end_ix);
+                    if rng.random() {
+                        offset = rng.random_range(start_ix..=end_ix);
                         while !expected.is_char_boundary(offset) {
                             offset -= 1;
                         }
@@ -1876,8 +1876,8 @@ mod tests {
             }
 
             for _ in 0..5 {
-                let end_ix = clip_offset(&expected, rng.gen_range(0..=expected.len()), Right);
-                let start_ix = clip_offset(&expected, rng.gen_range(0..=end_ix), Left);
+                let end_ix = clip_offset(&expected, rng.random_range(0..=expected.len()), Right);
+                let start_ix = clip_offset(&expected, rng.random_range(0..=end_ix), Left);
                 assert_eq!(
                     actual.cursor(start_ix).summary::<TextSummary>(end_ix),
                     TextSummary::from(&expected[start_ix..end_ix])
diff --git a/crates/rpc/src/auth.rs b/crates/rpc/src/auth.rs
index 2e3546289d..3829f3d36b 100644
--- a/crates/rpc/src/auth.rs
+++ b/crates/rpc/src/auth.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context as _, Result};
 use base64::prelude::*;
-use rand::{Rng as _, thread_rng};
+use rand::prelude::*;
 use rsa::pkcs1::{DecodeRsaPublicKey, EncodeRsaPublicKey};
 use rsa::traits::PaddingScheme;
 use rsa::{Oaep, Pkcs1v15Encrypt, RsaPrivateKey, RsaPublicKey};
@@ -31,7 +31,7 @@ pub struct PrivateKey(RsaPrivateKey);
 
 /// Generate a public and private key for asymmetric encryption.
 pub fn keypair() -> Result<(PublicKey, PrivateKey)> {
-    let mut rng = thread_rng();
+    let mut rng = RsaRngCompat::new();
     let bits = 2048;
     let private_key = RsaPrivateKey::new(&mut rng, bits)?;
     let public_key = RsaPublicKey::from(&private_key);
@@ -40,10 +40,10 @@ pub fn keypair() -> Result<(PublicKey, PrivateKey)> {
 
 /// Generate a random 64-character base64 string.
 pub fn random_token() -> String {
-    let mut rng = thread_rng();
+    let mut rng = rand::rng();
     let mut token_bytes = [0; 48];
     for byte in token_bytes.iter_mut() {
-        *byte = rng.r#gen();
+        *byte = rng.random();
     }
     BASE64_URL_SAFE.encode(token_bytes)
 }
@@ -52,7 +52,7 @@ impl PublicKey {
     /// Convert a string to a base64-encoded string that can only be decoded with the corresponding
     /// private key.
     pub fn encrypt_string(&self, string: &str, format: EncryptionFormat) -> Result<String> {
-        let mut rng = thread_rng();
+        let mut rng = RsaRngCompat::new();
         let bytes = string.as_bytes();
         let encrypted_bytes = match format {
             EncryptionFormat::V0 => self.0.encrypt(&mut rng, Pkcs1v15Encrypt, bytes),
@@ -107,6 +107,36 @@ impl TryFrom<String> for PublicKey {
     }
 }
 
+// TODO: remove once we rsa v0.10 is released.
+struct RsaRngCompat(rand::rngs::ThreadRng);
+
+impl RsaRngCompat {
+    fn new() -> Self {
+        Self(rand::rng())
+    }
+}
+
+impl rsa::signature::rand_core::RngCore for RsaRngCompat {
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest);
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rsa::signature::rand_core::Error> {
+        self.fill_bytes(dest);
+        Ok(())
+    }
+}
+
+impl rsa::signature::rand_core::CryptoRng for RsaRngCompat {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
new file mode 100644
index 0000000000..0446c67914
--- /dev/null
+++ b/crates/scheduler/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "scheduler"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "Apache-2.0"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/scheduler.rs"
+doctest = false
+
+[features]
+test-support = []
+
+[dependencies]
+async-task.workspace = true
+chrono.workspace = true
+futures.workspace = true
+parking.workspace = true
+parking_lot.workspace = true
+rand.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/scheduler/LICENSE-APACHE b/crates/scheduler/LICENSE-APACHE
new file mode 120000
index 0000000000..1cd601d0a3
--- /dev/null
+++ b/crates/scheduler/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/scheduler/src/clock.rs b/crates/scheduler/src/clock.rs
new file mode 100644
index 0000000000..c035c6b7db
--- /dev/null
+++ b/crates/scheduler/src/clock.rs
@@ -0,0 +1,34 @@
+use chrono::{DateTime, Duration, Utc};
+use parking_lot::Mutex;
+
+pub trait Clock {
+    fn now(&self) -> DateTime<Utc>;
+}
+
+pub struct TestClock {
+    now: Mutex<DateTime<Utc>>,
+}
+
+impl TestClock {
+    pub fn new() -> Self {
+        const START_TIME: &str = "2025-07-01T23:59:58-00:00";
+        let now = DateTime::parse_from_rfc3339(START_TIME).unwrap().to_utc();
+        Self {
+            now: Mutex::new(now),
+        }
+    }
+
+    pub fn set_now(&self, now: DateTime<Utc>) {
+        *self.now.lock() = now;
+    }
+
+    pub fn advance(&self, duration: Duration) {
+        *self.now.lock() += duration;
+    }
+}
+
+impl Clock for TestClock {
+    fn now(&self) -> DateTime<Utc> {
+        *self.now.lock()
+    }
+}
diff --git a/crates/scheduler/src/executor.rs b/crates/scheduler/src/executor.rs
new file mode 100644
index 0000000000..03f91ae551
--- /dev/null
+++ b/crates/scheduler/src/executor.rs
@@ -0,0 +1,137 @@
+use crate::{Scheduler, SessionId, Timer};
+use std::{
+    future::Future,
+    marker::PhantomData,
+    pin::Pin,
+    rc::Rc,
+    sync::Arc,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+#[derive(Clone)]
+pub struct ForegroundExecutor {
+    session_id: SessionId,
+    scheduler: Arc<dyn Scheduler>,
+    not_send: PhantomData<Rc<()>>,
+}
+
+impl ForegroundExecutor {
+    pub fn spawn<F>(&self, future: F) -> Task<F::Output>
+    where
+        F: Future + 'static,
+        F::Output: 'static,
+    {
+        let session_id = self.session_id;
+        let scheduler = Arc::clone(&self.scheduler);
+        let (runnable, task) = async_task::spawn_local(future, move |runnable| {
+            scheduler.schedule_foreground(session_id, runnable);
+        });
+        runnable.schedule();
+        Task(TaskState::Spawned(task))
+    }
+
+    pub fn timer(&self, duration: Duration) -> Timer {
+        self.scheduler.timer(duration)
+    }
+}
+
+impl ForegroundExecutor {
+    pub fn new(session_id: SessionId, scheduler: Arc<dyn Scheduler>) -> Self {
+        assert!(
+            scheduler.is_main_thread(),
+            "ForegroundExecutor must be created on the same thread as the Scheduler"
+        );
+        Self {
+            session_id,
+            scheduler,
+            not_send: PhantomData,
+        }
+    }
+}
+
+impl BackgroundExecutor {
+    pub fn new(scheduler: Arc<dyn Scheduler>) -> Self {
+        Self { scheduler }
+    }
+}
+
+pub struct BackgroundExecutor {
+    scheduler: Arc<dyn Scheduler>,
+}
+
+impl BackgroundExecutor {
+    pub fn spawn<F>(&self, future: F) -> Task<F::Output>
+    where
+        F: Future + Send + 'static,
+        F::Output: Send + 'static,
+    {
+        let scheduler = Arc::clone(&self.scheduler);
+        let (runnable, task) = async_task::spawn(future, move |runnable| {
+            scheduler.schedule_background(runnable);
+        });
+        runnable.schedule();
+        Task(TaskState::Spawned(task))
+    }
+
+    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
+        self.scheduler.block_on(future)
+    }
+
+    pub fn block_with_timeout<Fut: Unpin + Future>(
+        &self,
+        future: &mut Fut,
+        timeout: Duration,
+    ) -> Option<Fut::Output> {
+        self.scheduler.block_with_timeout(future, timeout)
+    }
+
+    pub fn timer(&self, duration: Duration) -> Timer {
+        self.scheduler.timer(duration)
+    }
+}
+
+/// Task is a primitive that allows work to happen in the background.
+///
+/// It implements [`Future`] so you can `.await` on it.
+///
+/// If you drop a task it will be cancelled immediately. Calling [`Task::detach`] allows
+/// the task to continue running, but with no way to return a value.
+#[must_use]
+#[derive(Debug)]
+pub struct Task<T>(TaskState<T>);
+
+#[derive(Debug)]
+enum TaskState<T> {
+    /// A task that is ready to return a value
+    Ready(Option<T>),
+
+    /// A task that is currently running.
+    Spawned(async_task::Task<T>),
+}
+
+impl<T> Task<T> {
+    /// Creates a new task that will resolve with the value
+    pub fn ready(val: T) -> Self {
+        Task(TaskState::Ready(Some(val)))
+    }
+
+    /// Detaching a task runs it to completion in the background
+    pub fn detach(self) {
+        match self {
+            Task(TaskState::Ready(_)) => {}
+            Task(TaskState::Spawned(task)) => task.detach(),
+        }
+    }
+}
+
+impl<T> Future for Task<T> {
+    type Output = T;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+        match unsafe { self.get_unchecked_mut() } {
+            Task(TaskState::Ready(val)) => Poll::Ready(val.take().unwrap()),
+            Task(TaskState::Spawned(task)) => Pin::new(task).poll(cx),
+        }
+    }
+}
diff --git a/crates/scheduler/src/scheduler.rs b/crates/scheduler/src/scheduler.rs
new file mode 100644
index 0000000000..ee19647845
--- /dev/null
+++ b/crates/scheduler/src/scheduler.rs
@@ -0,0 +1,63 @@
+mod clock;
+mod executor;
+mod test_scheduler;
+#[cfg(test)]
+mod tests;
+
+pub use clock::*;
+pub use executor::*;
+pub use test_scheduler::*;
+
+use async_task::Runnable;
+use futures::{FutureExt as _, channel::oneshot, future::LocalBoxFuture};
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+pub trait Scheduler: Send + Sync {
+    fn block(&self, future: LocalBoxFuture<()>, timeout: Option<Duration>);
+    fn schedule_foreground(&self, session_id: SessionId, runnable: Runnable);
+    fn schedule_background(&self, runnable: Runnable);
+    fn timer(&self, timeout: Duration) -> Timer;
+    fn is_main_thread(&self) -> bool;
+}
+
+impl dyn Scheduler {
+    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
+        let mut output = None;
+        self.block(async { output = Some(future.await) }.boxed_local(), None);
+        output.unwrap()
+    }
+
+    pub fn block_with_timeout<Fut: Unpin + Future>(
+        &self,
+        future: &mut Fut,
+        timeout: Duration,
+    ) -> Option<Fut::Output> {
+        let mut output = None;
+        self.block(
+            async { output = Some(future.await) }.boxed_local(),
+            Some(timeout),
+        );
+        output
+    }
+}
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub struct SessionId(u16);
+
+pub struct Timer(oneshot::Receiver<()>);
+
+impl Future for Timer {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<()> {
+        match self.0.poll_unpin(cx) {
+            Poll::Ready(_) => Poll::Ready(()),
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
diff --git a/crates/scheduler/src/test_scheduler.rs b/crates/scheduler/src/test_scheduler.rs
new file mode 100644
index 0000000000..479759d9bd
--- /dev/null
+++ b/crates/scheduler/src/test_scheduler.rs
@@ -0,0 +1,352 @@
+use crate::{
+    BackgroundExecutor, Clock as _, ForegroundExecutor, Scheduler, SessionId, TestClock, Timer,
+};
+use async_task::Runnable;
+use chrono::{DateTime, Duration as ChronoDuration, Utc};
+use futures::{FutureExt as _, channel::oneshot, future::LocalBoxFuture};
+use parking_lot::Mutex;
+use rand::prelude::*;
+use std::{
+    collections::VecDeque,
+    future::Future,
+    panic::{self, AssertUnwindSafe},
+    pin::Pin,
+    sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering::SeqCst},
+    },
+    task::{Context, Poll, Wake, Waker},
+    thread,
+    time::{Duration, Instant},
+};
+
+pub struct TestScheduler {
+    clock: Arc<TestClock>,
+    rng: Arc<Mutex<StdRng>>,
+    state: Mutex<SchedulerState>,
+    pub thread_id: thread::ThreadId,
+    pub config: SchedulerConfig,
+}
+
+impl TestScheduler {
+    /// Run a test once with default configuration (seed 0)
+    pub fn once<R>(f: impl AsyncFnOnce(Arc<TestScheduler>) -> R) -> R {
+        Self::with_seed(0, f)
+    }
+
+    /// Run a test multiple times with sequential seeds (0, 1, 2, ...)
+    pub fn many<R>(iterations: usize, mut f: impl AsyncFnMut(Arc<TestScheduler>) -> R) -> Vec<R> {
+        (0..iterations as u64)
+            .map(|seed| {
+                let mut unwind_safe_f = AssertUnwindSafe(&mut f);
+                match panic::catch_unwind(move || Self::with_seed(seed, &mut *unwind_safe_f)) {
+                    Ok(result) => result,
+                    Err(error) => {
+                        eprintln!("Failing Seed: {seed}");
+                        panic::resume_unwind(error);
+                    }
+                }
+            })
+            .collect()
+    }
+
+    /// Run a test once with a specific seed
+    pub fn with_seed<R>(seed: u64, f: impl AsyncFnOnce(Arc<TestScheduler>) -> R) -> R {
+        let scheduler = Arc::new(TestScheduler::new(SchedulerConfig::with_seed(seed)));
+        let future = f(scheduler.clone());
+        let result = scheduler.block_on(future);
+        scheduler.run();
+        result
+    }
+
+    pub fn new(config: SchedulerConfig) -> Self {
+        Self {
+            rng: Arc::new(Mutex::new(StdRng::seed_from_u64(config.seed))),
+            state: Mutex::new(SchedulerState {
+                runnables: VecDeque::new(),
+                timers: Vec::new(),
+                randomize_order: config.randomize_order,
+                allow_parking: config.allow_parking,
+                next_session_id: SessionId(0),
+            }),
+            thread_id: thread::current().id(),
+            clock: Arc::new(TestClock::new()),
+            config,
+        }
+    }
+
+    pub fn clock(&self) -> Arc<TestClock> {
+        self.clock.clone()
+    }
+
+    pub fn rng(&self) -> Arc<Mutex<StdRng>> {
+        self.rng.clone()
+    }
+
+    /// Create a foreground executor for this scheduler
+    pub fn foreground(self: &Arc<Self>) -> ForegroundExecutor {
+        let session_id = {
+            let mut state = self.state.lock();
+            state.next_session_id.0 += 1;
+            state.next_session_id
+        };
+        ForegroundExecutor::new(session_id, self.clone())
+    }
+
+    /// Create a background executor for this scheduler
+    pub fn background(self: &Arc<Self>) -> BackgroundExecutor {
+        BackgroundExecutor::new(self.clone())
+    }
+
+    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
+        (self as &dyn Scheduler).block_on(future)
+    }
+
+    pub fn yield_random(&self) -> Yield {
+        Yield(self.rng.lock().random_range(0..20))
+    }
+
+    pub fn run(&self) {
+        while self.step() || self.advance_clock() {
+            // Continue until no work remains
+        }
+    }
+
+    fn step(&self) -> bool {
+        let elapsed_timers = {
+            let mut state = self.state.lock();
+            let end_ix = state
+                .timers
+                .partition_point(|timer| timer.expiration <= self.clock.now());
+            state.timers.drain(..end_ix).collect::<Vec<_>>()
+        };
+
+        if !elapsed_timers.is_empty() {
+            return true;
+        }
+
+        let runnable = self.state.lock().runnables.pop_front();
+        if let Some(runnable) = runnable {
+            runnable.run();
+            return true;
+        }
+
+        false
+    }
+
+    fn advance_clock(&self) -> bool {
+        if let Some(timer) = self.state.lock().timers.first() {
+            self.clock.set_now(timer.expiration);
+            true
+        } else {
+            false
+        }
+    }
+}
+
+impl Scheduler for TestScheduler {
+    fn is_main_thread(&self) -> bool {
+        thread::current().id() == self.thread_id
+    }
+
+    fn schedule_foreground(&self, session_id: SessionId, runnable: Runnable) {
+        let mut state = self.state.lock();
+        let ix = if state.randomize_order {
+            let start_ix = state
+                .runnables
+                .iter()
+                .rposition(|task| task.session_id == Some(session_id))
+                .map_or(0, |ix| ix + 1);
+            self.rng
+                .lock()
+                .random_range(start_ix..=state.runnables.len())
+        } else {
+            state.runnables.len()
+        };
+        state.runnables.insert(
+            ix,
+            ScheduledRunnable {
+                session_id: Some(session_id),
+                runnable,
+            },
+        );
+    }
+
+    fn schedule_background(&self, runnable: Runnable) {
+        let mut state = self.state.lock();
+        let ix = if state.randomize_order {
+            self.rng.lock().random_range(0..=state.runnables.len())
+        } else {
+            state.runnables.len()
+        };
+        state.runnables.insert(
+            ix,
+            ScheduledRunnable {
+                session_id: None,
+                runnable,
+            },
+        );
+    }
+
+    fn timer(&self, duration: Duration) -> Timer {
+        let (tx, rx) = oneshot::channel();
+        let expiration = self.clock.now() + ChronoDuration::from_std(duration).unwrap();
+        let state = &mut *self.state.lock();
+        state.timers.push(ScheduledTimer {
+            expiration,
+            _notify: tx,
+        });
+        state.timers.sort_by_key(|timer| timer.expiration);
+        Timer(rx)
+    }
+
+    /// Block until the given future completes, with an optional timeout. If the
+    /// future is unable to make progress at any moment before the timeout and
+    /// no other tasks or timers remain, we panic unless parking is allowed. If
+    /// parking is allowed, we block up to the timeout or indefinitely if none
+    /// is provided. This is to allow testing a mix of deterministic and
+    /// non-deterministic async behavior, such as when interacting with I/O in
+    /// an otherwise deterministic test.
+    fn block(&self, mut future: LocalBoxFuture<()>, timeout: Option<Duration>) {
+        let (parker, unparker) = parking::pair();
+        let deadline = timeout.map(|timeout| Instant::now() + timeout);
+        let awoken = Arc::new(AtomicBool::new(false));
+        let waker = Waker::from(Arc::new(WakerFn::new({
+            let awoken = awoken.clone();
+            move || {
+                awoken.store(true, SeqCst);
+                unparker.unpark();
+            }
+        })));
+        let max_ticks = if timeout.is_some() {
+            self.rng
+                .lock()
+                .random_range(0..=self.config.max_timeout_ticks)
+        } else {
+            usize::MAX
+        };
+        let mut cx = Context::from_waker(&waker);
+
+        for _ in 0..max_ticks {
+            let Poll::Pending = future.poll_unpin(&mut cx) else {
+                break;
+            };
+
+            let mut stepped = None;
+            while self.rng.lock().random() && stepped.unwrap_or(true) {
+                *stepped.get_or_insert(false) |= self.step();
+            }
+
+            let stepped = stepped.unwrap_or(true);
+            let awoken = awoken.swap(false, SeqCst);
+            if !stepped && !awoken && !self.advance_clock() {
+                if self.state.lock().allow_parking {
+                    if !park(&parker, deadline) {
+                        break;
+                    }
+                } else if deadline.is_some() {
+                    break;
+                } else {
+                    panic!("Parking forbidden");
+                }
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct SchedulerConfig {
+    pub seed: u64,
+    pub randomize_order: bool,
+    pub allow_parking: bool,
+    pub max_timeout_ticks: usize,
+}
+
+impl SchedulerConfig {
+    pub fn with_seed(seed: u64) -> Self {
+        Self {
+            seed,
+            ..Default::default()
+        }
+    }
+}
+
+impl Default for SchedulerConfig {
+    fn default() -> Self {
+        Self {
+            seed: 0,
+            randomize_order: true,
+            allow_parking: false,
+            max_timeout_ticks: 1000,
+        }
+    }
+}
+
+struct ScheduledRunnable {
+    session_id: Option<SessionId>,
+    runnable: Runnable,
+}
+
+impl ScheduledRunnable {
+    fn run(self) {
+        self.runnable.run();
+    }
+}
+
+struct ScheduledTimer {
+    expiration: DateTime<Utc>,
+    _notify: oneshot::Sender<()>,
+}
+
+struct SchedulerState {
+    runnables: VecDeque<ScheduledRunnable>,
+    timers: Vec<ScheduledTimer>,
+    randomize_order: bool,
+    allow_parking: bool,
+    next_session_id: SessionId,
+}
+
+struct WakerFn<F> {
+    f: F,
+}
+
+impl<F: Fn()> WakerFn<F> {
+    fn new(f: F) -> Self {
+        Self { f }
+    }
+}
+
+impl<F: Fn()> Wake for WakerFn<F> {
+    fn wake(self: Arc<Self>) {
+        (self.f)();
+    }
+
+    fn wake_by_ref(self: &Arc<Self>) {
+        (self.f)();
+    }
+}
+
+pub struct Yield(usize);
+
+impl Future for Yield {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+        if self.0 == 0 {
+            Poll::Ready(())
+        } else {
+            self.0 -= 1;
+            cx.waker().wake_by_ref();
+            Poll::Pending
+        }
+    }
+}
+
+fn park(parker: &parking::Parker, deadline: Option<Instant>) -> bool {
+    if let Some(deadline) = deadline {
+        parker.park_deadline(deadline)
+    } else {
+        parker.park();
+        true
+    }
+}
diff --git a/crates/scheduler/src/tests.rs b/crates/scheduler/src/tests.rs
new file mode 100644
index 0000000000..19eb354e97
--- /dev/null
+++ b/crates/scheduler/src/tests.rs
@@ -0,0 +1,348 @@
+use super::*;
+use futures::{
+    FutureExt,
+    channel::{mpsc, oneshot},
+    executor::block_on,
+    future,
+    sink::SinkExt,
+    stream::{FuturesUnordered, StreamExt},
+};
+use std::{
+    cell::RefCell,
+    collections::{BTreeSet, HashSet},
+    pin::Pin,
+    rc::Rc,
+    sync::Arc,
+    task::{Context, Poll},
+};
+
+#[test]
+fn test_foreground_executor_spawn() {
+    let result = TestScheduler::once(async |scheduler| {
+        let task = scheduler.foreground().spawn(async move { 42 });
+        task.await
+    });
+    assert_eq!(result, 42);
+}
+
+#[test]
+fn test_background_executor_spawn() {
+    TestScheduler::once(async |scheduler| {
+        let task = scheduler.background().spawn(async move { 42 });
+        let result = task.await;
+        assert_eq!(result, 42);
+    });
+}
+
+#[test]
+fn test_foreground_ordering() {
+    let mut traces = HashSet::new();
+
+    TestScheduler::many(100, async |scheduler| {
+        #[derive(Hash, PartialEq, Eq)]
+        struct TraceEntry {
+            session: usize,
+            task: usize,
+        }
+
+        let trace = Rc::new(RefCell::new(Vec::new()));
+
+        let foreground_1 = scheduler.foreground();
+        for task in 0..10 {
+            foreground_1
+                .spawn({
+                    let trace = trace.clone();
+                    async move {
+                        trace.borrow_mut().push(TraceEntry { session: 0, task });
+                    }
+                })
+                .detach();
+        }
+
+        let foreground_2 = scheduler.foreground();
+        for task in 0..10 {
+            foreground_2
+                .spawn({
+                    let trace = trace.clone();
+                    async move {
+                        trace.borrow_mut().push(TraceEntry { session: 1, task });
+                    }
+                })
+                .detach();
+        }
+
+        scheduler.run();
+
+        assert_eq!(
+            trace
+                .borrow()
+                .iter()
+                .filter(|entry| entry.session == 0)
+                .map(|entry| entry.task)
+                .collect::<Vec<_>>(),
+            (0..10).collect::<Vec<_>>()
+        );
+        assert_eq!(
+            trace
+                .borrow()
+                .iter()
+                .filter(|entry| entry.session == 1)
+                .map(|entry| entry.task)
+                .collect::<Vec<_>>(),
+            (0..10).collect::<Vec<_>>()
+        );
+
+        traces.insert(trace.take());
+    });
+
+    assert!(traces.len() > 1, "Expected at least two traces");
+}
+
+#[test]
+fn test_timer_ordering() {
+    TestScheduler::many(1, async |scheduler| {
+        let background = scheduler.background();
+        let futures = FuturesUnordered::new();
+        futures.push(
+            async {
+                background.timer(Duration::from_millis(100)).await;
+                2
+            }
+            .boxed(),
+        );
+        futures.push(
+            async {
+                background.timer(Duration::from_millis(50)).await;
+                1
+            }
+            .boxed(),
+        );
+        futures.push(
+            async {
+                background.timer(Duration::from_millis(150)).await;
+                3
+            }
+            .boxed(),
+        );
+        assert_eq!(futures.collect::<Vec<_>>().await, vec![1, 2, 3]);
+    });
+}
+
+#[test]
+fn test_send_from_bg_to_fg() {
+    TestScheduler::once(async |scheduler| {
+        let foreground = scheduler.foreground();
+        let background = scheduler.background();
+
+        let (sender, receiver) = oneshot::channel::<i32>();
+
+        background
+            .spawn(async move {
+                sender.send(42).unwrap();
+            })
+            .detach();
+
+        let task = foreground.spawn(async move { receiver.await.unwrap() });
+        let result = task.await;
+        assert_eq!(result, 42);
+    });
+}
+
+#[test]
+fn test_randomize_order() {
+    // Test deterministic mode: different seeds should produce same execution order
+    let mut deterministic_results = HashSet::new();
+    for seed in 0..10 {
+        let config = SchedulerConfig {
+            seed,
+            randomize_order: false,
+            ..Default::default()
+        };
+        let order = block_on(capture_execution_order(config));
+        assert_eq!(order.len(), 6);
+        deterministic_results.insert(order);
+    }
+
+    // All deterministic runs should produce the same result
+    assert_eq!(
+        deterministic_results.len(),
+        1,
+        "Deterministic mode should always produce same execution order"
+    );
+
+    // Test randomized mode: different seeds can produce different execution orders
+    let mut randomized_results = HashSet::new();
+    for seed in 0..20 {
+        let config = SchedulerConfig::with_seed(seed);
+        let order = block_on(capture_execution_order(config));
+        assert_eq!(order.len(), 6);
+        randomized_results.insert(order);
+    }
+
+    // Randomized mode should produce multiple different execution orders
+    assert!(
+        randomized_results.len() > 1,
+        "Randomized mode should produce multiple different orders"
+    );
+}
+
+async fn capture_execution_order(config: SchedulerConfig) -> Vec<String> {
+    let scheduler = Arc::new(TestScheduler::new(config));
+    let foreground = scheduler.foreground();
+    let background = scheduler.background();
+
+    let (sender, receiver) = mpsc::unbounded::<String>();
+
+    // Spawn foreground tasks
+    for i in 0..3 {
+        let mut sender = sender.clone();
+        foreground
+            .spawn(async move {
+                sender.send(format!("fg-{}", i)).await.ok();
+            })
+            .detach();
+    }
+
+    // Spawn background tasks
+    for i in 0..3 {
+        let mut sender = sender.clone();
+        background
+            .spawn(async move {
+                sender.send(format!("bg-{}", i)).await.ok();
+            })
+            .detach();
+    }
+
+    drop(sender); // Close sender to signal no more messages
+    scheduler.run();
+
+    receiver.collect().await
+}
+
+#[test]
+fn test_block() {
+    let scheduler = Arc::new(TestScheduler::new(SchedulerConfig::default()));
+    let executor = BackgroundExecutor::new(scheduler);
+    let (tx, rx) = oneshot::channel();
+
+    // Spawn background task to send value
+    let _ = executor
+        .spawn(async move {
+            tx.send(42).unwrap();
+        })
+        .detach();
+
+    // Block on receiving the value
+    let result = executor.block_on(async { rx.await.unwrap() });
+    assert_eq!(result, 42);
+}
+
+#[test]
+#[should_panic(expected = "Parking forbidden")]
+fn test_parking_panics() {
+    let scheduler = Arc::new(TestScheduler::new(SchedulerConfig::default()));
+    let executor = BackgroundExecutor::new(scheduler);
+    executor.block_on(future::pending::<()>());
+}
+
+#[test]
+fn test_block_with_parking() {
+    let config = SchedulerConfig {
+        allow_parking: true,
+        ..Default::default()
+    };
+    let scheduler = Arc::new(TestScheduler::new(config));
+    let executor = BackgroundExecutor::new(scheduler);
+    let (tx, rx) = oneshot::channel();
+
+    // Spawn background task to send value
+    let _ = executor
+        .spawn(async move {
+            tx.send(42).unwrap();
+        })
+        .detach();
+
+    // Block on receiving the value (will park if needed)
+    let result = executor.block_on(async { rx.await.unwrap() });
+    assert_eq!(result, 42);
+}
+
+#[test]
+fn test_helper_methods() {
+    // Test the once method
+    let result = TestScheduler::once(async |scheduler: Arc<TestScheduler>| {
+        let background = scheduler.background();
+        background.spawn(async { 42 }).await
+    });
+    assert_eq!(result, 42);
+
+    // Test the many method
+    let results = TestScheduler::many(3, async |scheduler: Arc<TestScheduler>| {
+        let background = scheduler.background();
+        background.spawn(async { 10 }).await
+    });
+    assert_eq!(results, vec![10, 10, 10]);
+
+    // Test the with_seed method
+    let result = TestScheduler::with_seed(123, async |scheduler: Arc<TestScheduler>| {
+        let background = scheduler.background();
+
+        // Spawn a background task and wait for its result
+        let task = background.spawn(async { 99 });
+        task.await
+    });
+    assert_eq!(result, 99);
+}
+
+#[test]
+fn test_block_with_timeout() {
+    // Test case: future completes within timeout
+    TestScheduler::once(async |scheduler| {
+        let background = scheduler.background();
+        let mut future = future::ready(42);
+        let output = background.block_with_timeout(&mut future, Duration::from_millis(100));
+        assert_eq!(output, Some(42));
+    });
+
+    // Test case: future times out
+    TestScheduler::once(async |scheduler| {
+        let background = scheduler.background();
+        let mut future = future::pending::<()>();
+        let output = background.block_with_timeout(&mut future, Duration::from_millis(50));
+        assert_eq!(output, None);
+    });
+
+    // Test case: future makes progress via timer but still times out
+    let mut results = BTreeSet::new();
+    TestScheduler::many(100, async |scheduler| {
+        let background = scheduler.background();
+        let mut task = background.spawn(async move {
+            Yield { polls: 10 }.await;
+            42
+        });
+        let output = background.block_with_timeout(&mut task, Duration::from_millis(50));
+        results.insert(output);
+    });
+    assert_eq!(
+        results.into_iter().collect::<Vec<_>>(),
+        vec![None, Some(42)]
+    );
+}
+
+struct Yield {
+    polls: usize,
+}
+
+impl Future for Yield {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.polls -= 1;
+        if self.polls == 0 {
+            Poll::Ready(())
+        } else {
+            cx.waker().wake_by_ref();
+            Poll::Pending
+        }
+    }
+}
diff --git a/crates/streaming_diff/src/streaming_diff.rs b/crates/streaming_diff/src/streaming_diff.rs
index 704164e01e..5677981b0d 100644
--- a/crates/streaming_diff/src/streaming_diff.rs
+++ b/crates/streaming_diff/src/streaming_diff.rs
@@ -945,7 +945,7 @@ mod tests {
         let mut new_len = 0;
 
         while new_len < new.len() {
-            let mut chunk_len = rng.gen_range(1..=new.len() - new_len);
+            let mut chunk_len = rng.random_range(1..=new.len() - new_len);
             while !new.is_char_boundary(new_len + chunk_len) {
                 chunk_len += 1;
             }
@@ -1034,14 +1034,14 @@ mod tests {
 
     fn randomly_edit(text: &str, rng: &mut impl Rng) -> String {
         let mut result = String::from(text);
-        let edit_count = rng.gen_range(1..=5);
+        let edit_count = rng.random_range(1..=5);
 
         fn random_char_range(text: &str, rng: &mut impl Rng) -> (usize, usize) {
-            let mut start = rng.gen_range(0..=text.len());
+            let mut start = rng.random_range(0..=text.len());
             while !text.is_char_boundary(start) {
                 start -= 1;
             }
-            let mut end = rng.gen_range(start..=text.len());
+            let mut end = rng.random_range(start..=text.len());
             while !text.is_char_boundary(end) {
                 end += 1;
             }
@@ -1049,11 +1049,11 @@ mod tests {
         }
 
         for _ in 0..edit_count {
-            match rng.gen_range(0..3) {
+            match rng.random_range(0..3) {
                 0 => {
                     // Insert
                     let (pos, _) = random_char_range(&result, rng);
-                    let insert_len = rng.gen_range(1..=5);
+                    let insert_len = rng.random_range(1..=5);
                     let insert_text: String = random_text(rng, insert_len);
                     result.insert_str(pos, &insert_text);
                 }
diff --git a/crates/sum_tree/src/sum_tree.rs b/crates/sum_tree/src/sum_tree.rs
index 710fdd4fbf..64814ad091 100644
--- a/crates/sum_tree/src/sum_tree.rs
+++ b/crates/sum_tree/src/sum_tree.rs
@@ -909,7 +909,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rand::{distributions, prelude::*};
+    use rand::{distr::StandardUniform, prelude::*};
     use std::cmp;
 
     #[ctor::ctor]
@@ -951,24 +951,24 @@ mod tests {
 
             let rng = &mut rng;
             let mut tree = SumTree::<u8>::default();
-            let count = rng.gen_range(0..10);
-            if rng.r#gen() {
-                tree.extend(rng.sample_iter(distributions::Standard).take(count), &());
+            let count = rng.random_range(0..10);
+            if rng.random() {
+                tree.extend(rng.sample_iter(StandardUniform).take(count), &());
             } else {
                 let items = rng
-                    .sample_iter(distributions::Standard)
+                    .sample_iter(StandardUniform)
                     .take(count)
                     .collect::<Vec<_>>();
                 tree.par_extend(items, &());
             }
 
             for _ in 0..num_operations {
-                let splice_end = rng.gen_range(0..tree.extent::<Count>(&()).0 + 1);
-                let splice_start = rng.gen_range(0..splice_end + 1);
-                let count = rng.gen_range(0..10);
+                let splice_end = rng.random_range(0..tree.extent::<Count>(&()).0 + 1);
+                let splice_start = rng.random_range(0..splice_end + 1);
+                let count = rng.random_range(0..10);
                 let tree_end = tree.extent::<Count>(&());
                 let new_items = rng
-                    .sample_iter(distributions::Standard)
+                    .sample_iter(StandardUniform)
                     .take(count)
                     .collect::<Vec<u8>>();
 
@@ -978,7 +978,7 @@ mod tests {
                 tree = {
                     let mut cursor = tree.cursor::<Count>(&());
                     let mut new_tree = cursor.slice(&Count(splice_start), Bias::Right);
-                    if rng.r#gen() {
+                    if rng.random() {
                         new_tree.extend(new_items, &());
                     } else {
                         new_tree.par_extend(new_items, &());
@@ -1005,7 +1005,7 @@ mod tests {
                     .filter(|(_, item)| (item & 1) == 0)
                     .collect::<Vec<_>>();
 
-                let mut item_ix = if rng.r#gen() {
+                let mut item_ix = if rng.random() {
                     filter_cursor.next();
                     0
                 } else {
@@ -1022,12 +1022,12 @@ mod tests {
                     filter_cursor.next();
                     item_ix += 1;
 
-                    while item_ix > 0 && rng.gen_bool(0.2) {
+                    while item_ix > 0 && rng.random_bool(0.2) {
                         log::info!("prev");
                         filter_cursor.prev();
                         item_ix -= 1;
 
-                        if item_ix == 0 && rng.gen_bool(0.2) {
+                        if item_ix == 0 && rng.random_bool(0.2) {
                             filter_cursor.prev();
                             assert_eq!(filter_cursor.item(), None);
                             assert_eq!(filter_cursor.start().0, 0);
@@ -1039,9 +1039,9 @@ mod tests {
 
                 let mut before_start = false;
                 let mut cursor = tree.cursor::<Count>(&());
-                let start_pos = rng.gen_range(0..=reference_items.len());
+                let start_pos = rng.random_range(0..=reference_items.len());
                 cursor.seek(&Count(start_pos), Bias::Right);
-                let mut pos = rng.gen_range(start_pos..=reference_items.len());
+                let mut pos = rng.random_range(start_pos..=reference_items.len());
                 cursor.seek_forward(&Count(pos), Bias::Right);
 
                 for i in 0..10 {
@@ -1084,10 +1084,18 @@ mod tests {
             }
 
             for _ in 0..10 {
-                let end = rng.gen_range(0..tree.extent::<Count>(&()).0 + 1);
-                let start = rng.gen_range(0..end + 1);
-                let start_bias = if rng.r#gen() { Bias::Left } else { Bias::Right };
-                let end_bias = if rng.r#gen() { Bias::Left } else { Bias::Right };
+                let end = rng.random_range(0..tree.extent::<Count>(&()).0 + 1);
+                let start = rng.random_range(0..end + 1);
+                let start_bias = if rng.random() {
+                    Bias::Left
+                } else {
+                    Bias::Right
+                };
+                let end_bias = if rng.random() {
+                    Bias::Left
+                } else {
+                    Bias::Right
+                };
 
                 let mut cursor = tree.cursor::<Count>(&());
                 cursor.seek(&Count(start), start_bias);
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index a8b1fcf0f2..96271ea771 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -2198,7 +2198,7 @@ mod tests {
     };
     use collections::HashMap;
     use gpui::{Pixels, Point, TestAppContext, bounds, point, size};
-    use rand::{Rng, distributions::Alphanumeric, rngs::ThreadRng, thread_rng};
+    use rand::{Rng, distr, rngs::ThreadRng};
 
     #[ignore = "Test is flaky on macOS, and doesn't run on Windows"]
     #[gpui::test]
@@ -2249,13 +2249,14 @@ mod tests {
 
     #[test]
     fn test_mouse_to_cell_test() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         const ITERATIONS: usize = 10;
         const PRECISION: usize = 1000;
 
         for _ in 0..ITERATIONS {
-            let viewport_cells = rng.gen_range(15..20);
-            let cell_size = rng.gen_range(5 * PRECISION..20 * PRECISION) as f32 / PRECISION as f32;
+            let viewport_cells = rng.random_range(15..20);
+            let cell_size =
+                rng.random_range(5 * PRECISION..20 * PRECISION) as f32 / PRECISION as f32;
 
             let size = crate::TerminalBounds {
                 cell_width: Pixels::from(cell_size),
@@ -2277,8 +2278,8 @@ mod tests {
                 for col in 0..(viewport_cells - 1) {
                     let col = col as usize;
 
-                    let row_offset = rng.gen_range(0..PRECISION) as f32 / PRECISION as f32;
-                    let col_offset = rng.gen_range(0..PRECISION) as f32 / PRECISION as f32;
+                    let row_offset = rng.random_range(0..PRECISION) as f32 / PRECISION as f32;
+                    let col_offset = rng.random_range(0..PRECISION) as f32 / PRECISION as f32;
 
                     let mouse_pos = point(
                         Pixels::from(col as f32 * cell_size + col_offset),
@@ -2298,7 +2299,7 @@ mod tests {
 
     #[test]
     fn test_mouse_to_cell_clamp() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
 
         let size = crate::TerminalBounds {
             cell_width: Pixels::from(10.),
@@ -2336,7 +2337,7 @@ mod tests {
         for _ in 0..((size.height() / size.line_height()) as usize) {
             let mut row_vec = Vec::new();
             for _ in 0..((size.width() / size.cell_width()) as usize) {
-                let cell_char = rng.sample(Alphanumeric) as char;
+                let cell_char = rng.sample(distr::Alphanumeric) as char;
                 row_vec.push(cell_char)
             }
             cells.push(row_vec)
diff --git a/crates/text/src/locator.rs b/crates/text/src/locator.rs
index d529e60d48..9b89cf21c7 100644
--- a/crates/text/src/locator.rs
+++ b/crates/text/src/locator.rs
@@ -106,13 +106,13 @@ mod tests {
         let mut rhs = Default::default();
         while lhs == rhs {
             lhs = Locator(
-                (0..rng.gen_range(1..=5))
-                    .map(|_| rng.gen_range(0..=100))
+                (0..rng.random_range(1..=5))
+                    .map(|_| rng.random_range(0..=100))
                     .collect(),
             );
             rhs = Locator(
-                (0..rng.gen_range(1..=5))
-                    .map(|_| rng.gen_range(0..=100))
+                (0..rng.random_range(1..=5))
+                    .map(|_| rng.random_range(0..=100))
                     .collect(),
             );
         }
diff --git a/crates/text/src/network.rs b/crates/text/src/network.rs
index f22bb52d20..d0d1b650ad 100644
--- a/crates/text/src/network.rs
+++ b/crates/text/src/network.rs
@@ -65,8 +65,8 @@ impl<T: Clone, R: rand::Rng> Network<T, R> {
                 for message in &messages {
                     // Insert one or more duplicates of this message, potentially *before* the previous
                     // message sent by this peer to simulate out-of-order delivery.
-                    for _ in 0..self.rng.gen_range(1..4) {
-                        let insertion_index = self.rng.gen_range(0..inbox.len() + 1);
+                    for _ in 0..self.rng.random_range(1..4) {
+                        let insertion_index = self.rng.random_range(0..inbox.len() + 1);
                         inbox.insert(
                             insertion_index,
                             Envelope {
@@ -85,7 +85,7 @@ impl<T: Clone, R: rand::Rng> Network<T, R> {
 
     pub fn receive(&mut self, receiver: ReplicaId) -> Vec<T> {
         let inbox = self.inboxes.get_mut(&receiver).unwrap();
-        let count = self.rng.gen_range(0..inbox.len() + 1);
+        let count = self.rng.random_range(0..inbox.len() + 1);
         inbox
             .drain(0..count)
             .map(|envelope| envelope.message)
diff --git a/crates/text/src/patch.rs b/crates/text/src/patch.rs
index dcb35e9a92..b8bb904052 100644
--- a/crates/text/src/patch.rs
+++ b/crates/text/src/patch.rs
@@ -497,8 +497,8 @@ mod tests {
             .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
             .unwrap_or(20);
 
-        let initial_chars = (0..rng.gen_range(0..=100))
-            .map(|_| rng.gen_range(b'a'..=b'z') as char)
+        let initial_chars = (0..rng.random_range(0..=100))
+            .map(|_| rng.random_range(b'a'..=b'z') as char)
             .collect::<Vec<_>>();
         log::info!("initial chars: {:?}", initial_chars);
 
@@ -517,11 +517,11 @@ mod tests {
                     break;
                 }
 
-                let end = rng.gen_range(last_edit_end..=expected_chars.len());
-                let start = rng.gen_range(last_edit_end..=end);
+                let end = rng.random_range(last_edit_end..=expected_chars.len());
+                let start = rng.random_range(last_edit_end..=end);
                 let old_len = end - start;
 
-                let mut new_len = rng.gen_range(0..=3);
+                let mut new_len = rng.random_range(0..=3);
                 if start == end && new_len == 0 {
                     new_len += 1;
                 }
@@ -529,7 +529,7 @@ mod tests {
                 last_edit_end = start + new_len + 1;
 
                 let new_chars = (0..new_len)
-                    .map(|_| rng.gen_range(b'A'..=b'Z') as char)
+                    .map(|_| rng.random_range(b'A'..=b'Z') as char)
                     .collect::<Vec<_>>();
                 log::info!(
                     "  editing {:?}: {:?}",
diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs
index a096f1281f..4298e704ab 100644
--- a/crates/text/src/tests.rs
+++ b/crates/text/src/tests.rs
@@ -36,14 +36,14 @@ fn test_random_edits(mut rng: StdRng) {
         .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
         .unwrap_or(10);
 
-    let reference_string_len = rng.gen_range(0..3);
+    let reference_string_len = rng.random_range(0..3);
     let mut reference_string = RandomCharIter::new(&mut rng)
         .take(reference_string_len)
         .collect::<String>();
     let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), reference_string.clone());
     LineEnding::normalize(&mut reference_string);
 
-    buffer.set_group_interval(Duration::from_millis(rng.gen_range(0..=200)));
+    buffer.set_group_interval(Duration::from_millis(rng.random_range(0..=200)));
     let mut buffer_versions = Vec::new();
     log::info!(
         "buffer text {:?}, version: {:?}",
@@ -64,7 +64,7 @@ fn test_random_edits(mut rng: StdRng) {
             buffer.version()
         );
 
-        if rng.gen_bool(0.25) {
+        if rng.random_bool(0.25) {
             buffer.randomly_undo_redo(&mut rng);
             reference_string = buffer.text();
             log::info!(
@@ -82,7 +82,7 @@ fn test_random_edits(mut rng: StdRng) {
 
         buffer.check_invariants();
 
-        if rng.gen_bool(0.3) {
+        if rng.random_bool(0.3) {
             buffer_versions.push((buffer.clone(), buffer.subscribe()));
         }
     }
@@ -112,8 +112,9 @@ fn test_random_edits(mut rng: StdRng) {
         );
 
         for _ in 0..5 {
-            let end_ix = old_buffer.clip_offset(rng.gen_range(0..=old_buffer.len()), Bias::Right);
-            let start_ix = old_buffer.clip_offset(rng.gen_range(0..=end_ix), Bias::Left);
+            let end_ix =
+                old_buffer.clip_offset(rng.random_range(0..=old_buffer.len()), Bias::Right);
+            let start_ix = old_buffer.clip_offset(rng.random_range(0..=end_ix), Bias::Left);
             let range = old_buffer.anchor_before(start_ix)..old_buffer.anchor_after(end_ix);
             let mut old_text = old_buffer.text_for_range(range.clone()).collect::<String>();
             let edits = buffer
@@ -731,7 +732,7 @@ fn test_random_concurrent_edits(mut rng: StdRng) {
         .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
         .unwrap_or(10);
 
-    let base_text_len = rng.gen_range(0..10);
+    let base_text_len = rng.random_range(0..10);
     let base_text = RandomCharIter::new(&mut rng)
         .take(base_text_len)
         .collect::<String>();
@@ -741,7 +742,7 @@ fn test_random_concurrent_edits(mut rng: StdRng) {
 
     for i in 0..peers {
         let mut buffer = Buffer::new(i as ReplicaId, BufferId::new(1).unwrap(), base_text.clone());
-        buffer.history.group_interval = Duration::from_millis(rng.gen_range(0..=200));
+        buffer.history.group_interval = Duration::from_millis(rng.random_range(0..=200));
         buffers.push(buffer);
         replica_ids.push(i as u16);
         network.add_peer(i as u16);
@@ -751,10 +752,10 @@ fn test_random_concurrent_edits(mut rng: StdRng) {
 
     let mut mutation_count = operations;
     loop {
-        let replica_index = rng.gen_range(0..peers);
+        let replica_index = rng.random_range(0..peers);
         let replica_id = replica_ids[replica_index];
         let buffer = &mut buffers[replica_index];
-        match rng.gen_range(0..=100) {
+        match rng.random_range(0..=100) {
             0..=50 if mutation_count != 0 => {
                 let op = buffer.randomly_edit(&mut rng, 5).1;
                 network.broadcast(buffer.replica_id, vec![op]);
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index 705d3f1788..8fb6f56222 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -1818,8 +1818,8 @@ impl Buffer {
     }
 
     pub fn random_byte_range(&self, start_offset: usize, rng: &mut impl rand::Rng) -> Range<usize> {
-        let end = self.clip_offset(rng.gen_range(start_offset..=self.len()), Bias::Right);
-        let start = self.clip_offset(rng.gen_range(start_offset..=end), Bias::Right);
+        let end = self.clip_offset(rng.random_range(start_offset..=self.len()), Bias::Right);
+        let start = self.clip_offset(rng.random_range(start_offset..=end), Bias::Right);
         start..end
     }
 
@@ -1841,7 +1841,7 @@ impl Buffer {
             let range = self.random_byte_range(new_start, rng);
             last_end = Some(range.end);
 
-            let new_text_len = rng.gen_range(0..10);
+            let new_text_len = rng.random_range(0..10);
             let new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
 
             edits.push((range, new_text.into()));
@@ -1877,7 +1877,7 @@ impl Buffer {
         use rand::prelude::*;
 
         let mut ops = Vec::new();
-        for _ in 0..rng.gen_range(1..=5) {
+        for _ in 0..rng.random_range(1..=5) {
             if let Some(entry) = self.history.undo_stack.choose(rng) {
                 let transaction = entry.transaction.clone();
                 log::info!(
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index c66adb8b3a..db44e39451 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -815,7 +815,8 @@ pub fn defer<F: FnOnce()>(f: F) -> Deferred<F> {
 
 #[cfg(any(test, feature = "test-support"))]
 mod rng {
-    use rand::{Rng, seq::SliceRandom};
+    use rand::prelude::*;
+
     pub struct RandomCharIter<T: Rng> {
         rng: T,
         simple_text: bool,
@@ -840,18 +841,18 @@ mod rng {
 
         fn next(&mut self) -> Option<Self::Item> {
             if self.simple_text {
-                return if self.rng.gen_range(0..100) < 5 {
+                return if self.rng.random_range(0..100) < 5 {
                     Some('\n')
                 } else {
-                    Some(self.rng.gen_range(b'a'..b'z' + 1).into())
+                    Some(self.rng.random_range(b'a'..b'z' + 1).into())
                 };
             }
 
-            match self.rng.gen_range(0..100) {
+            match self.rng.random_range(0..100) {
                 // whitespace
                 0..=19 => [' ', '\n', '\r', '\t'].choose(&mut self.rng).copied(),
                 // two-byte greek letters
-                20..=32 => char::from_u32(self.rng.gen_range(('α' as u32)..('ω' as u32 + 1))),
+                20..=32 => char::from_u32(self.rng.random_range(('α' as u32)..('ω' as u32 + 1))),
                 // // three-byte characters
                 33..=45 => ['✋', '✅', '❌', '❎', '⭐']
                     .choose(&mut self.rng)
@@ -859,7 +860,7 @@ mod rng {
                 // // four-byte characters
                 46..=58 => ['🍐', '🏀', '🍗', '🎉'].choose(&mut self.rng).copied(),
                 // ascii letters
-                _ => Some(self.rng.gen_range(b'a'..b'z' + 1).into()),
+                _ => Some(self.rng.random_range(b'a'..b'z' + 1).into()),
             }
         }
     }
diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs
index 1783ba317c..92569e0f81 100644
--- a/crates/worktree/src/worktree_tests.rs
+++ b/crates/worktree/src/worktree_tests.rs
@@ -1464,7 +1464,7 @@ async fn test_random_worktree_operations_during_initial_scan(
             tree.as_local().unwrap().snapshot().check_invariants(true)
         });
 
-        if rng.gen_bool(0.6) {
+        if rng.random_bool(0.6) {
             snapshots.push(worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot()));
         }
     }
@@ -1551,7 +1551,7 @@ async fn test_random_worktree_changes(cx: &mut TestAppContext, mut rng: StdRng)
     let mut snapshots = Vec::new();
     let mut mutations_len = operations;
     while mutations_len > 1 {
-        if rng.gen_bool(0.2) {
+        if rng.random_bool(0.2) {
             worktree
                 .update(cx, |worktree, cx| {
                     randomly_mutate_worktree(worktree, &mut rng, cx)
@@ -1563,8 +1563,8 @@ async fn test_random_worktree_changes(cx: &mut TestAppContext, mut rng: StdRng)
         }
 
         let buffered_event_count = fs.as_fake().buffered_event_count();
-        if buffered_event_count > 0 && rng.gen_bool(0.3) {
-            let len = rng.gen_range(0..=buffered_event_count);
+        if buffered_event_count > 0 && rng.random_bool(0.3) {
+            let len = rng.random_range(0..=buffered_event_count);
             log::info!("flushing {} events", len);
             fs.as_fake().flush_events(len);
         } else {
@@ -1573,7 +1573,7 @@ async fn test_random_worktree_changes(cx: &mut TestAppContext, mut rng: StdRng)
         }
 
         cx.executor().run_until_parked();
-        if rng.gen_bool(0.2) {
+        if rng.random_bool(0.2) {
             log::info!("storing snapshot {}", snapshots.len());
             let snapshot = worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot());
             snapshots.push(snapshot);
@@ -1701,7 +1701,7 @@ fn randomly_mutate_worktree(
     let snapshot = worktree.snapshot();
     let entry = snapshot.entries(false, 0).choose(rng).unwrap();
 
-    match rng.gen_range(0_u32..100) {
+    match rng.random_range(0_u32..100) {
         0..=33 if entry.path.as_ref() != Path::new("") => {
             log::info!("deleting entry {:?} ({})", entry.path, entry.id.0);
             worktree.delete_entry(entry.id, false, cx).unwrap()
@@ -1733,7 +1733,7 @@ fn randomly_mutate_worktree(
         _ => {
             if entry.is_dir() {
                 let child_path = entry.path.join(random_filename(rng));
-                let is_dir = rng.gen_bool(0.3);
+                let is_dir = rng.random_bool(0.3);
                 log::info!(
                     "creating {} at {:?}",
                     if is_dir { "dir" } else { "file" },
@@ -1776,11 +1776,11 @@ async fn randomly_mutate_fs(
         }
     }
 
-    if (files.is_empty() && dirs.len() == 1) || rng.gen_bool(insertion_probability) {
+    if (files.is_empty() && dirs.len() == 1) || rng.random_bool(insertion_probability) {
         let path = dirs.choose(rng).unwrap();
         let new_path = path.join(random_filename(rng));
 
-        if rng.r#gen() {
+        if rng.random() {
             log::info!(
                 "creating dir {:?}",
                 new_path.strip_prefix(root_path).unwrap()
@@ -1793,7 +1793,7 @@ async fn randomly_mutate_fs(
             );
             fs.create_file(&new_path, Default::default()).await.unwrap();
         }
-    } else if rng.gen_bool(0.05) {
+    } else if rng.random_bool(0.05) {
         let ignore_dir_path = dirs.choose(rng).unwrap();
         let ignore_path = ignore_dir_path.join(*GITIGNORE);
 
@@ -1808,11 +1808,11 @@ async fn randomly_mutate_fs(
             .cloned()
             .collect::<Vec<_>>();
         let files_to_ignore = {
-            let len = rng.gen_range(0..=subfiles.len());
+            let len = rng.random_range(0..=subfiles.len());
             subfiles.choose_multiple(rng, len)
         };
         let dirs_to_ignore = {
-            let len = rng.gen_range(0..subdirs.len());
+            let len = rng.random_range(0..subdirs.len());
             subdirs.choose_multiple(rng, len)
         };
 
@@ -1848,7 +1848,7 @@ async fn randomly_mutate_fs(
             file_path.into_iter().chain(dir_path).choose(rng).unwrap()
         };
 
-        let is_rename = rng.r#gen();
+        let is_rename = rng.random();
         if is_rename {
             let new_path_parent = dirs
                 .iter()
@@ -1857,7 +1857,7 @@ async fn randomly_mutate_fs(
                 .unwrap();
 
             let overwrite_existing_dir =
-                !old_path.starts_with(new_path_parent) && rng.gen_bool(0.3);
+                !old_path.starts_with(new_path_parent) && rng.random_bool(0.3);
             let new_path = if overwrite_existing_dir {
                 fs.remove_dir(
                     new_path_parent,
@@ -1919,7 +1919,7 @@ async fn randomly_mutate_fs(
 
 fn random_filename(rng: &mut impl Rng) -> String {
     (0..6)
-        .map(|_| rng.sample(rand::distributions::Alphanumeric))
+        .map(|_| rng.sample(rand::distr::Alphanumeric))
         .map(char::from)
         .collect()
 }
diff --git a/crates/zeta/src/input_excerpt.rs b/crates/zeta/src/input_excerpt.rs
index f4add6593e..dd1bbed1d7 100644
--- a/crates/zeta/src/input_excerpt.rs
+++ b/crates/zeta/src/input_excerpt.rs
@@ -149,7 +149,7 @@ mod tests {
                 let mut rng = rand::thread_rng();
                 let mut numbers = Vec::new();
                 for _ in 0..5 {
-                    numbers.push(rng.gen_range(1..101));
+                    numbers.push(rng.random_range(1..101));
                 }
                 numbers
             }
@@ -208,7 +208,7 @@ mod tests {
             <|editable_region_end|>
                 let mut numbers = Vec::new();
                 for _ in 0..5 {
-                    numbers.push(rng.gen_range(1..101));
+                    numbers.push(rng.random_range(1..101));
             ```"#}
         );
     }

From e37efc1e9b313ae4ac28322334db464a2b84c8c4 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 4 Sep 2025 17:30:23 +0200
Subject: [PATCH 603/823] diagnostics: Fix diagnostics pane clearing up too
 eagerly on typing (#37546)

Closes https://github.com/zed-industries/zed/issues/30494

Release Notes:

- Fixed diagnostics pane closing buffers too eagerly when typing inside
it
---
 crates/diagnostics/src/diagnostics.rs | 74 ++++++++++++++-------------
 crates/diagnostics/src/items.rs       | 63 ++++++++++-------------
 2 files changed, 64 insertions(+), 73 deletions(-)

diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 53d0371847..20e8a86133 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -94,43 +94,44 @@ impl Render for ProjectDiagnosticsEditor {
             0
         };
 
-        let child = if warning_count + self.summary.error_count == 0 {
-            let label = if self.summary.warning_count == 0 {
-                SharedString::new_static("No problems in workspace")
+        let child =
+            if warning_count + self.summary.error_count == 0 && self.editor.read(cx).is_empty(cx) {
+                let label = if self.summary.warning_count == 0 {
+                    SharedString::new_static("No problems in workspace")
+                } else {
+                    SharedString::new_static("No errors in workspace")
+                };
+                v_flex()
+                    .key_context("EmptyPane")
+                    .size_full()
+                    .gap_1()
+                    .justify_center()
+                    .items_center()
+                    .text_center()
+                    .bg(cx.theme().colors().editor_background)
+                    .child(Label::new(label).color(Color::Muted))
+                    .when(self.summary.warning_count > 0, |this| {
+                        let plural_suffix = if self.summary.warning_count > 1 {
+                            "s"
+                        } else {
+                            ""
+                        };
+                        let label = format!(
+                            "Show {} warning{}",
+                            self.summary.warning_count, plural_suffix
+                        );
+                        this.child(
+                            Button::new("diagnostics-show-warning-label", label).on_click(
+                                cx.listener(|this, _, window, cx| {
+                                    this.toggle_warnings(&Default::default(), window, cx);
+                                    cx.notify();
+                                }),
+                            ),
+                        )
+                    })
             } else {
-                SharedString::new_static("No errors in workspace")
+                div().size_full().child(self.editor.clone())
             };
-            v_flex()
-                .key_context("EmptyPane")
-                .size_full()
-                .gap_1()
-                .justify_center()
-                .items_center()
-                .text_center()
-                .bg(cx.theme().colors().editor_background)
-                .child(Label::new(label).color(Color::Muted))
-                .when(self.summary.warning_count > 0, |this| {
-                    let plural_suffix = if self.summary.warning_count > 1 {
-                        "s"
-                    } else {
-                        ""
-                    };
-                    let label = format!(
-                        "Show {} warning{}",
-                        self.summary.warning_count, plural_suffix
-                    );
-                    this.child(
-                        Button::new("diagnostics-show-warning-label", label).on_click(cx.listener(
-                            |this, _, window, cx| {
-                                this.toggle_warnings(&Default::default(), window, cx);
-                                cx.notify();
-                            },
-                        )),
-                    )
-                })
-        } else {
-            div().size_full().child(self.editor.clone())
-        };
 
         div()
             .key_context("Diagnostics")
@@ -233,6 +234,7 @@ impl ProjectDiagnosticsEditor {
                         }
                     }
                     EditorEvent::Blurred => this.update_stale_excerpts(window, cx),
+                    EditorEvent::Saved => this.update_stale_excerpts(window, cx),
                     _ => {}
                 }
             },
@@ -277,7 +279,7 @@ impl ProjectDiagnosticsEditor {
     }
 
     fn update_stale_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.update_excerpts_task.is_some() {
+        if self.update_excerpts_task.is_some() || self.multibuffer.read(cx).is_dirty(cx) {
             return;
         }
 
diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs
index 7ac6d101f3..11ee4ece96 100644
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -32,49 +32,38 @@ impl Render for DiagnosticIndicator {
         }
 
         let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) {
-            (0, 0) => h_flex().map(|this| {
-                this.child(
-                    Icon::new(IconName::Check)
-                        .size(IconSize::Small)
-                        .color(Color::Default),
-                )
-            }),
-            (0, warning_count) => h_flex()
-                .gap_1()
-                .child(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .color(Color::Warning),
-                )
-                .child(Label::new(warning_count.to_string()).size(LabelSize::Small)),
-            (error_count, 0) => h_flex()
-                .gap_1()
-                .child(
-                    Icon::new(IconName::XCircle)
-                        .size(IconSize::Small)
-                        .color(Color::Error),
-                )
-                .child(Label::new(error_count.to_string()).size(LabelSize::Small)),
+            (0, 0) => h_flex().child(
+                Icon::new(IconName::Check)
+                    .size(IconSize::Small)
+                    .color(Color::Default),
+            ),
             (error_count, warning_count) => h_flex()
                 .gap_1()
-                .child(
-                    Icon::new(IconName::XCircle)
-                        .size(IconSize::Small)
-                        .color(Color::Error),
-                )
-                .child(Label::new(error_count.to_string()).size(LabelSize::Small))
-                .child(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .color(Color::Warning),
-                )
-                .child(Label::new(warning_count.to_string()).size(LabelSize::Small)),
+                .when(error_count > 0, |this| {
+                    this.child(
+                        Icon::new(IconName::XCircle)
+                            .size(IconSize::Small)
+                            .color(Color::Error),
+                    )
+                    .child(Label::new(error_count.to_string()).size(LabelSize::Small))
+                })
+                .when(warning_count > 0, |this| {
+                    this.child(
+                        Icon::new(IconName::Warning)
+                            .size(IconSize::Small)
+                            .color(Color::Warning),
+                    )
+                    .child(Label::new(warning_count.to_string()).size(LabelSize::Small))
+                }),
         };
 
         let status = if let Some(diagnostic) = &self.current_diagnostic {
-            let message = diagnostic.message.split('\n').next().unwrap().to_string();
+            let message = diagnostic
+                .message
+                .split_once('\n')
+                .map_or(&*diagnostic.message, |(first, _)| first);
             Some(
-                Button::new("diagnostic_message", message)
+                Button::new("diagnostic_message", SharedString::new(message))
                     .label_size(LabelSize::Small)
                     .tooltip(|window, cx| {
                         Tooltip::for_action(

From 0870a1fe80b0724ddaae1408aa402761540131de Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 4 Sep 2025 09:01:50 -0700
Subject: [PATCH 604/823] acp: Don't share API key with Anthropic provider
 (#37543)

Since Claude Code has it's own preferred method of grabbing API keys, we
don't want to reuse this one.

Release Notes:

- acp: Don't share Anthropic API key from the Anthropic provider to
allow default Claude Code login options

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 crates/agent_servers/src/claude.rs     | 15 ++---
 crates/agent_ui/src/acp/thread_view.rs | 92 +++++++++++++-------------
 2 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 194867241b..48d3e33775 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,4 +1,3 @@
-use language_models::provider::anthropic::AnthropicLanguageModelProvider;
 use settings::SettingsStore;
 use std::path::Path;
 use std::rc::Rc;
@@ -99,16 +98,10 @@ impl AgentServer for ClaudeCode {
                 .await?
             };
 
-            if let Some(api_key) = cx
-                .update(AnthropicLanguageModelProvider::api_key)?
-                .await
-                .ok()
-            {
-                command
-                    .env
-                    .get_or_insert_default()
-                    .insert("ANTHROPIC_API_KEY".to_owned(), api_key.key);
-            }
+            command
+                .env
+                .get_or_insert_default()
+                .insert("ANTHROPIC_API_KEY".to_owned(), "".to_owned());
 
             let root_dir_exists = fs.is_dir(&root_dir).await;
             anyhow::ensure!(
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 50da44e430..3407f4e878 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -983,7 +983,7 @@ impl AcpThreadView {
                     this,
                     AuthRequired {
                         description: None,
-                        provider_id: Some(language_model::ANTHROPIC_PROVIDER_ID),
+                        provider_id: None,
                     },
                     agent,
                     connection,
@@ -3010,6 +3010,8 @@ impl AcpThreadView {
         let show_description =
             configuration_view.is_none() && description.is_none() && pending_auth_method.is_none();
 
+        let auth_methods = connection.auth_methods();
+
         v_flex().flex_1().size_full().justify_end().child(
             v_flex()
                 .p_2()
@@ -3040,21 +3042,23 @@ impl AcpThreadView {
                         .cloned()
                         .map(|view| div().w_full().child(view)),
                 )
-                .when(
-                    show_description,
-                    |el| {
-                        el.child(
-                            Label::new(format!(
-                                "You are not currently authenticated with {}. Please choose one of the following options:",
-                                self.agent.name()
-                            ))
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .mb_1()
-                            .ml_5(),
-                        )
-                    },
-                )
+                .when(show_description, |el| {
+                    el.child(
+                        Label::new(format!(
+                            "You are not currently authenticated with {}.{}",
+                            self.agent.name(),
+                            if auth_methods.len() > 1 {
+                                " Please choose one of the following options:"
+                            } else {
+                                ""
+                            }
+                        ))
+                        .size(LabelSize::Small)
+                        .color(Color::Muted)
+                        .mb_1()
+                        .ml_5(),
+                    )
+                })
                 .when_some(pending_auth_method, |el, _| {
                     el.child(
                         h_flex()
@@ -3066,12 +3070,12 @@ impl AcpThreadView {
                                 Icon::new(IconName::ArrowCircle)
                                     .size(IconSize::Small)
                                     .color(Color::Muted)
-                                    .with_rotate_animation(2)
+                                    .with_rotate_animation(2),
                             )
                             .child(Label::new("Authenticating…").size(LabelSize::Small)),
                     )
                 })
-                .when(!connection.auth_methods().is_empty(), |this| {
+                .when(!auth_methods.is_empty(), |this| {
                     this.child(
                         h_flex()
                             .justify_end()
@@ -3083,38 +3087,32 @@ impl AcpThreadView {
                                     .pt_2()
                                     .border_color(cx.theme().colors().border.opacity(0.8))
                             })
-                            .children(
-                                connection
-                                    .auth_methods()
-                                    .iter()
-                                    .enumerate()
-                                    .rev()
-                                    .map(|(ix, method)| {
-                                        Button::new(
-                                            SharedString::from(method.id.0.clone()),
-                                            method.name.clone(),
-                                        )
-                                        .when(ix == 0, |el| {
-                                            el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                        })
-                                        .label_size(LabelSize::Small)
-                                        .on_click({
-                                            let method_id = method.id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                telemetry::event!(
-                                                    "Authenticate Agent Started",
-                                                    agent = this.agent.telemetry_id(),
-                                                    method = method_id
-                                                );
+                            .children(connection.auth_methods().iter().enumerate().rev().map(
+                                |(ix, method)| {
+                                    Button::new(
+                                        SharedString::from(method.id.0.clone()),
+                                        method.name.clone(),
+                                    )
+                                    .when(ix == 0, |el| {
+                                        el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
+                                    })
+                                    .label_size(LabelSize::Small)
+                                    .on_click({
+                                        let method_id = method.id.clone();
+                                        cx.listener(move |this, _, window, cx| {
+                                            telemetry::event!(
+                                                "Authenticate Agent Started",
+                                                agent = this.agent.telemetry_id(),
+                                                method = method_id
+                                            );
 
-                                                this.authenticate(method_id.clone(), window, cx)
-                                            })
+                                            this.authenticate(method_id.clone(), window, cx)
                                         })
-                                    }),
-                            ),
+                                    })
+                                },
+                            )),
                     )
-                })
-
+                }),
         )
     }
 

From 25ee9b1013fe10a04b429576006b88fb34bdcd85 Mon Sep 17 00:00:00 2001
From: Jiqing Yang <73824809+WERDXZ@users.noreply.github.com>
Date: Thu, 4 Sep 2025 10:21:44 -0700
Subject: [PATCH 605/823] Fix Wayland crash on AMD GPUs by updating Blade
 (#37516)

Updates blade-graphics from e0ec4e7 to bfa594e to fix GPU crashes on
Wayland with AMD graphics cards.

The crash was caused by incorrect BLAS scratch buffer alignment - the
old version hardcoded 256-byte alignment, but AMD GPUs require different
alignment values. The newer Blade version uses the GPU's actual
alignment requirements instead of hardcoding.

Closes #37448

Release Notes:

- Migrate to newer version of Blade upstream
---
 Cargo.lock                                       | 6 +++---
 Cargo.toml                                       | 6 +++---
 crates/gpui/src/platform/blade/blade_renderer.rs | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee80d59006..d31c8ecd88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2291,7 +2291,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.6.0"
-source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
+source = "git+https://github.com/kvark/blade?rev=bfa594e#bfa594ea697d4b6326ea29f747525c85ecf933b9"
 dependencies = [
  "ash",
  "ash-window",
@@ -2324,7 +2324,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
+source = "git+https://github.com/kvark/blade?rev=bfa594e#bfa594ea697d4b6326ea29f747525c85ecf933b9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2334,7 +2334,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.2.0"
-source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
+source = "git+https://github.com/kvark/blade?rev=bfa594e#bfa594ea697d4b6326ea29f747525c85ecf933b9"
 dependencies = [
  "blade-graphics",
  "bytemuck",
diff --git a/Cargo.toml b/Cargo.toml
index 8a487b612a..1cce7701c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -462,9 +462,9 @@ aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
 bincode = "1.2.1"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "bfa594e" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "bfa594e" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "bfa594e" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
diff --git a/crates/gpui/src/platform/blade/blade_renderer.rs b/crates/gpui/src/platform/blade/blade_renderer.rs
index cc1df7748b..1f60920bcc 100644
--- a/crates/gpui/src/platform/blade/blade_renderer.rs
+++ b/crates/gpui/src/platform/blade/blade_renderer.rs
@@ -371,7 +371,7 @@ impl BladeRenderer {
             .or_else(|| {
                 [4, 2, 1]
                     .into_iter()
-                    .find(|count| context.gpu.supports_texture_sample_count(*count))
+                    .find(|&n| (context.gpu.capabilities().sample_count_mask & n) != 0)
             })
             .unwrap_or(1);
         let pipelines = BladePipelines::new(&context.gpu, surface.info(), path_sample_count);

From 6e2922367c16344c44d56181ba6f7348869501b7 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 13:41:47 -0400
Subject: [PATCH 606/823] Use full SHA for `blade` dependency (#37554)

In https://github.com/zed-industries/zed/pull/37516 we updated the
`blade` dependency, but used a short SHA.

No reason to not use the full SHA.

Release Notes:

- N/A
---
 Cargo.lock | 6 +++---
 Cargo.toml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d31c8ecd88..50632ef0a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2291,7 +2291,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.6.0"
-source = "git+https://github.com/kvark/blade?rev=bfa594e#bfa594ea697d4b6326ea29f747525c85ecf933b9"
+source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9"
 dependencies = [
  "ash",
  "ash-window",
@@ -2324,7 +2324,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=bfa594e#bfa594ea697d4b6326ea29f747525c85ecf933b9"
+source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2334,7 +2334,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.2.0"
-source = "git+https://github.com/kvark/blade?rev=bfa594e#bfa594ea697d4b6326ea29f747525c85ecf933b9"
+source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9"
 dependencies = [
  "blade-graphics",
  "bytemuck",
diff --git a/Cargo.toml b/Cargo.toml
index 1cce7701c0..6c9ca3b4a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -462,9 +462,9 @@ aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
 bincode = "1.2.1"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "bfa594e" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "bfa594e" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "bfa594e" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"

From caebd0cc4ddfd4a0838378d8ace632a92f682328 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:55:20 -0400
Subject: [PATCH 607/823] debugger: Fix stack frame filter crash (#37555)

The crash was caused by not accounting for the fact that a range of
collapse frames only counts as one entry. Causing the filter indices to
overshoot for indices after collapse frames (it was counting all
collapse frames instead of just one).

The test missed this because it all happened in one `cx.update` closure
and didn't render the stack frame list when the filter was applied. The
test has been updated to account for this.


Release Notes:

- N/A

Co-authored-by: Cole Miller <cole@zed.dev>
---
 .../src/session/running/stack_frame_list.rs   |  60 +++--
 .../debugger_ui/src/tests/stack_frame_list.rs | 206 +++++++++++-------
 2 files changed, 171 insertions(+), 95 deletions(-)

diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index f80173c365..e51b8da362 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -28,8 +28,8 @@ pub enum StackFrameListEvent {
 }
 
 /// Represents the filter applied to the stack frame list
-#[derive(PartialEq, Eq, Copy, Clone)]
-enum StackFrameFilter {
+#[derive(PartialEq, Eq, Copy, Clone, Debug)]
+pub(crate) enum StackFrameFilter {
     /// Show all frames
     All,
     /// Show only frames from the user's code
@@ -174,19 +174,29 @@ impl StackFrameList {
 
     #[cfg(test)]
     pub(crate) fn dap_stack_frames(&self, cx: &mut App) -> Vec<dap::StackFrame> {
-        self.stack_frames(cx)
-            .unwrap_or_default()
-            .into_iter()
-            .enumerate()
-            .filter(|(ix, _)| {
-                self.list_filter == StackFrameFilter::All
-                    || self
-                        .filter_entries_indices
-                        .binary_search_by_key(&ix, |ix| ix)
-                        .is_ok()
-            })
-            .map(|(_, stack_frame)| stack_frame.dap)
-            .collect()
+        match self.list_filter {
+            StackFrameFilter::All => self
+                .stack_frames(cx)
+                .unwrap_or_default()
+                .into_iter()
+                .map(|stack_frame| stack_frame.dap)
+                .collect(),
+            StackFrameFilter::OnlyUserFrames => self
+                .filter_entries_indices
+                .iter()
+                .map(|ix| match &self.entries[*ix] {
+                    StackFrameEntry::Label(label) => label,
+                    StackFrameEntry::Collapsed(_) => panic!("Collapsed tabs should not be visible"),
+                    StackFrameEntry::Normal(frame) => frame,
+                })
+                .cloned()
+                .collect(),
+        }
+    }
+
+    #[cfg(test)]
+    pub(crate) fn list_filter(&self) -> StackFrameFilter {
+        self.list_filter
     }
 
     pub fn opened_stack_frame_id(&self) -> Option<StackFrameId> {
@@ -246,6 +256,7 @@ impl StackFrameList {
                 self.entries.clear();
                 self.selected_ix = None;
                 self.list_state.reset(0);
+                self.filter_entries_indices.clear();
                 cx.emit(StackFrameListEvent::BuiltEntries);
                 cx.notify();
                 return;
@@ -263,7 +274,7 @@ impl StackFrameList {
             .unwrap_or_default();
 
         let mut filter_entries_indices = Vec::default();
-        for (ix, stack_frame) in stack_frames.iter().enumerate() {
+        for stack_frame in stack_frames.iter() {
             let frame_in_visible_worktree = stack_frame.dap.source.as_ref().is_some_and(|source| {
                 source.path.as_ref().is_some_and(|path| {
                     worktree_prefixes
@@ -273,10 +284,6 @@ impl StackFrameList {
                 })
             });
 
-            if frame_in_visible_worktree {
-                filter_entries_indices.push(ix);
-            }
-
             match stack_frame.dap.presentation_hint {
                 Some(dap::StackFramePresentationHint::Deemphasize)
                 | Some(dap::StackFramePresentationHint::Subtle) => {
@@ -302,6 +309,9 @@ impl StackFrameList {
                         first_stack_frame_with_path.get_or_insert(entries.len());
                     }
                     entries.push(StackFrameEntry::Normal(stack_frame.dap.clone()));
+                    if frame_in_visible_worktree {
+                        filter_entries_indices.push(entries.len() - 1);
+                    }
                 }
             }
         }
@@ -309,7 +319,6 @@ impl StackFrameList {
         let collapsed_entries = std::mem::take(&mut collapsed_entries);
         if !collapsed_entries.is_empty() {
             entries.push(StackFrameEntry::Collapsed(collapsed_entries));
-            self.filter_entries_indices.push(entries.len() - 1);
         }
         self.entries = entries;
         self.filter_entries_indices = filter_entries_indices;
@@ -612,7 +621,16 @@ impl StackFrameList {
         let entries = std::mem::take(stack_frames)
             .into_iter()
             .map(StackFrameEntry::Normal);
+        // HERE
+        let entries_len = entries.len();
         self.entries.splice(ix..ix + 1, entries);
+        let (Ok(filtered_indices_start) | Err(filtered_indices_start)) =
+            self.filter_entries_indices.binary_search(&ix);
+
+        for idx in &mut self.filter_entries_indices[filtered_indices_start..] {
+            *idx += entries_len - 1;
+        }
+
         self.selected_ix = Some(ix);
         self.list_state.reset(self.entries.len());
         cx.emit(StackFrameListEvent::BuiltEntries);
diff --git a/crates/debugger_ui/src/tests/stack_frame_list.rs b/crates/debugger_ui/src/tests/stack_frame_list.rs
index 023056224e..a61a31d270 100644
--- a/crates/debugger_ui/src/tests/stack_frame_list.rs
+++ b/crates/debugger_ui/src/tests/stack_frame_list.rs
@@ -1,6 +1,6 @@
 use crate::{
     debugger_panel::DebugPanel,
-    session::running::stack_frame_list::StackFrameEntry,
+    session::running::stack_frame_list::{StackFrameEntry, StackFrameFilter},
     tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
 };
 use dap::{
@@ -867,6 +867,28 @@ async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppC
         },
         StackFrame {
             id: 4,
+            name: "node:internal/modules/run_main2".into(),
+            source: Some(dap::Source {
+                name: Some("run_main.js".into()),
+                path: Some(path!("/usr/lib/node/internal/modules/run_main2.js").into()),
+                source_reference: None,
+                presentation_hint: None,
+                origin: None,
+                sources: None,
+                adapter_data: None,
+                checksums: None,
+            }),
+            line: 50,
+            column: 1,
+            end_line: None,
+            end_column: None,
+            can_restart: None,
+            instruction_pointer_reference: None,
+            module_id: None,
+            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
+        },
+        StackFrame {
+            id: 5,
             name: "doSomething".into(),
             source: Some(dap::Source {
                 name: Some("test.js".into()),
@@ -957,83 +979,119 @@ async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppC
 
     cx.run_until_parked();
 
-    active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
-        let stack_frame_list = debug_panel_item
-            .running_state()
-            .update(cx, |state, _| state.stack_frame_list().clone());
+    let stack_frame_list =
+        active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
+            let stack_frame_list = debug_panel_item
+                .running_state()
+                .update(cx, |state, _| state.stack_frame_list().clone());
 
-        stack_frame_list.update(cx, |stack_frame_list, cx| {
-            stack_frame_list.build_entries(true, window, cx);
+            stack_frame_list.update(cx, |stack_frame_list, cx| {
+                stack_frame_list.build_entries(true, window, cx);
 
-            // Verify we have the expected collapsed structure
-            assert_eq!(
-                stack_frame_list.entries(),
-                &vec![
-                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                    StackFrameEntry::Collapsed(vec![
-                        stack_frames_for_assertions[1].clone(),
-                        stack_frames_for_assertions[2].clone()
-                    ]),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                ]
-            );
+                // Verify we have the expected collapsed structure
+                assert_eq!(
+                    stack_frame_list.entries(),
+                    &vec![
+                        StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                        StackFrameEntry::Collapsed(vec![
+                            stack_frames_for_assertions[1].clone(),
+                            stack_frames_for_assertions[2].clone(),
+                            stack_frames_for_assertions[3].clone()
+                        ]),
+                        StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
+                    ]
+                );
+            });
 
-            // Test 1: Verify filtering works
-            let all_frames = stack_frame_list.flatten_entries(true, false);
-            assert_eq!(all_frames.len(), 4, "Should see all 4 frames initially");
-
-            // Toggle to user frames only
             stack_frame_list
-                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-
-            let user_frames = stack_frame_list.dap_stack_frames(cx);
-            assert_eq!(user_frames.len(), 2, "Should only see 2 user frames");
-            assert_eq!(user_frames[0].name, "main");
-            assert_eq!(user_frames[1].name, "doSomething");
-
-            // Test 2: Verify filtering toggles correctly
-            // Check we can toggle back and see all frames again
-
-            // Toggle back to all frames
-            stack_frame_list
-                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-
-            let all_frames_again = stack_frame_list.flatten_entries(true, false);
-            assert_eq!(
-                all_frames_again.len(),
-                4,
-                "Should see all 4 frames after toggling back"
-            );
-
-            // Test 3: Verify collapsed entries stay expanded
-            stack_frame_list.expand_collapsed_entry(1, cx);
-            assert_eq!(
-                stack_frame_list.entries(),
-                &vec![
-                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                ]
-            );
-
-            // Toggle filter twice
-            stack_frame_list
-                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-            stack_frame_list
-                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-
-            // Verify entries remain expanded
-            assert_eq!(
-                stack_frame_list.entries(),
-                &vec![
-                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
-                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                ],
-                "Expanded entries should remain expanded after toggling filter"
-            );
         });
+
+    stack_frame_list.update(cx, |stack_frame_list, cx| {
+        let all_frames = stack_frame_list.flatten_entries(true, false);
+        assert_eq!(all_frames.len(), 5, "Should see all 5 frames initially");
+
+        stack_frame_list
+            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+        assert_eq!(
+            stack_frame_list.list_filter(),
+            StackFrameFilter::OnlyUserFrames
+        );
+    });
+
+    stack_frame_list.update(cx, |stack_frame_list, cx| {
+        let user_frames = stack_frame_list.dap_stack_frames(cx);
+        assert_eq!(user_frames.len(), 2, "Should only see 2 user frames");
+        assert_eq!(user_frames[0].name, "main");
+        assert_eq!(user_frames[1].name, "doSomething");
+
+        // Toggle back to all frames
+        stack_frame_list
+            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+        assert_eq!(stack_frame_list.list_filter(), StackFrameFilter::All);
+    });
+
+    stack_frame_list.update(cx, |stack_frame_list, cx| {
+        let all_frames_again = stack_frame_list.flatten_entries(true, false);
+        assert_eq!(
+            all_frames_again.len(),
+            5,
+            "Should see all 5 frames after toggling back"
+        );
+
+        // Test 3: Verify collapsed entries stay expanded
+        stack_frame_list.expand_collapsed_entry(1, cx);
+        assert_eq!(
+            stack_frame_list.entries(),
+            &vec![
+                StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
+            ]
+        );
+
+        stack_frame_list
+            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+        assert_eq!(
+            stack_frame_list.list_filter(),
+            StackFrameFilter::OnlyUserFrames
+        );
+    });
+
+    stack_frame_list.update(cx, |stack_frame_list, cx| {
+        stack_frame_list
+            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+        assert_eq!(stack_frame_list.list_filter(), StackFrameFilter::All);
+    });
+
+    stack_frame_list.update(cx, |stack_frame_list, cx| {
+        stack_frame_list
+            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+        assert_eq!(
+            stack_frame_list.list_filter(),
+            StackFrameFilter::OnlyUserFrames
+        );
+
+        assert_eq!(
+            stack_frame_list.dap_stack_frames(cx).as_slice(),
+            &[
+                stack_frames_for_assertions[0].clone(),
+                stack_frames_for_assertions[4].clone()
+            ]
+        );
+
+        // Verify entries remain expanded
+        assert_eq!(
+            stack_frame_list.entries(),
+            &vec![
+                StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
+            ],
+            "Expanded entries should remain expanded after toggling filter"
+        );
     });
 }

From 9e111054837ef27e3a95709867215e54d3e52ac6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 14:07:50 -0400
Subject: [PATCH 608/823] toml: Extract to zed-extensions/toml repository
 (#37558)

This PR extracts the TOML extension to the
[zed-extensions/toml](https://github.com/zed-extensions/toml)
repository.

Release Notes:

- N/A
---
 .config/hakari.toml                           |   1 -
 Cargo.lock                                    |   7 -
 Cargo.toml                                    |   1 -
 docs/src/languages/toml.md                    |   2 +-
 extensions/toml/Cargo.toml                    |  16 --
 extensions/toml/LICENSE-APACHE                |   1 -
 extensions/toml/extension.toml                |  18 ---
 extensions/toml/languages/toml/brackets.scm   |   3 -
 extensions/toml/languages/toml/config.toml    |  11 --
 extensions/toml/languages/toml/highlights.scm |  38 -----
 extensions/toml/languages/toml/indents.scm    |   0
 extensions/toml/languages/toml/outline.scm    |  15 --
 extensions/toml/languages/toml/overrides.scm  |   2 -
 extensions/toml/languages/toml/redactions.scm |   1 -
 .../toml/languages/toml/textobjects.scm       |   6 -
 extensions/toml/src/toml.rs                   | 152 ------------------
 16 files changed, 1 insertion(+), 273 deletions(-)
 delete mode 100644 extensions/toml/Cargo.toml
 delete mode 120000 extensions/toml/LICENSE-APACHE
 delete mode 100644 extensions/toml/extension.toml
 delete mode 100644 extensions/toml/languages/toml/brackets.scm
 delete mode 100644 extensions/toml/languages/toml/config.toml
 delete mode 100644 extensions/toml/languages/toml/highlights.scm
 delete mode 100644 extensions/toml/languages/toml/indents.scm
 delete mode 100644 extensions/toml/languages/toml/outline.scm
 delete mode 100644 extensions/toml/languages/toml/overrides.scm
 delete mode 100644 extensions/toml/languages/toml/redactions.scm
 delete mode 100644 extensions/toml/languages/toml/textobjects.scm
 delete mode 100644 extensions/toml/src/toml.rs

diff --git a/.config/hakari.toml b/.config/hakari.toml
index 8ce0b77490..e8f094e618 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -41,5 +41,4 @@ workspace-members = [
     "slash_commands_example",
     "zed_snippets",
     "zed_test_extension",
-    "zed_toml",
 ]
diff --git a/Cargo.lock b/Cargo.lock
index 50632ef0a4..1a15d11e66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20653,13 +20653,6 @@ dependencies = [
  "zed_extension_api 0.6.0",
 ]
 
-[[package]]
-name = "zed_toml"
-version = "0.1.4"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "zeno"
 version = "0.3.2"
diff --git a/Cargo.toml b/Cargo.toml
index 6c9ca3b4a6..f389153efe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -211,7 +211,6 @@ members = [
     "extensions/slash-commands-example",
     "extensions/snippets",
     "extensions/test-extension",
-    "extensions/toml",
 
     #
     # Tooling
diff --git a/docs/src/languages/toml.md b/docs/src/languages/toml.md
index eb51dbb93b..40a6b880fc 100644
--- a/docs/src/languages/toml.md
+++ b/docs/src/languages/toml.md
@@ -1,6 +1,6 @@
 # TOML
 
-TOML support is available through the [TOML extension](https://github.com/zed-industries/zed/tree/main/extensions/toml).
+TOML support is available through the [TOML extension](https://github.com/zed-extensions/toml).
 
 - Tree-sitter: [tree-sitter/tree-sitter-toml](https://github.com/tree-sitter/tree-sitter-toml)
 - Language Server: [tamasfe/taplo](https://github.com/tamasfe/taplo)
diff --git a/extensions/toml/Cargo.toml b/extensions/toml/Cargo.toml
deleted file mode 100644
index 25c2c41808..0000000000
--- a/extensions/toml/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zed_toml"
-version = "0.1.4"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/toml.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
diff --git a/extensions/toml/LICENSE-APACHE b/extensions/toml/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/toml/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/toml/extension.toml b/extensions/toml/extension.toml
deleted file mode 100644
index 5be7213c40..0000000000
--- a/extensions/toml/extension.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-id = "toml"
-name = "TOML"
-description = "TOML support."
-version = "0.1.4"
-schema_version = 1
-authors = [
-    "Max Brunsfeld <max@zed.dev>",
-    "Ammar Arif <evergreenkary@gmail.com>"
-]
-repository = "https://github.com/zed-industries/zed"
-
-[language_servers.taplo]
-name = "Taplo"
-language = "TOML"
-
-[grammars.toml]
-repository = "https://github.com/tree-sitter/tree-sitter-toml"
-commit = "342d9be207c2dba869b9967124c679b5e6fd0ebe"
diff --git a/extensions/toml/languages/toml/brackets.scm b/extensions/toml/languages/toml/brackets.scm
deleted file mode 100644
index 9e8c9cd93c..0000000000
--- a/extensions/toml/languages/toml/brackets.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-("[" @open "]" @close)
-("{" @open "}" @close)
-("\"" @open "\"" @close)
diff --git a/extensions/toml/languages/toml/config.toml b/extensions/toml/languages/toml/config.toml
deleted file mode 100644
index f62290d9e9..0000000000
--- a/extensions/toml/languages/toml/config.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-name = "TOML"
-grammar = "toml"
-path_suffixes = ["Cargo.lock", "toml", "Pipfile", "uv.lock"]
-line_comments = ["# "]
-autoclose_before = ",]}"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
-]
diff --git a/extensions/toml/languages/toml/highlights.scm b/extensions/toml/languages/toml/highlights.scm
deleted file mode 100644
index 4be265cce7..0000000000
--- a/extensions/toml/languages/toml/highlights.scm
+++ /dev/null
@@ -1,38 +0,0 @@
-; Properties
-;-----------
-
-(bare_key) @property
-(quoted_key) @property
-
-; Literals
-;---------
-
-(boolean) @constant
-(comment) @comment
-(integer) @number
-(float) @number
-(string) @string
-(escape_sequence) @string.escape
-(offset_date_time) @string.special
-(local_date_time) @string.special
-(local_date) @string.special
-(local_time) @string.special
-
-; Punctuation
-;------------
-
-[
-  "."
-  ","
-] @punctuation.delimiter
-
-"=" @operator
-
-[
-  "["
-  "]"
-  "[["
-  "]]"
-  "{"
-  "}"
-]  @punctuation.bracket
diff --git a/extensions/toml/languages/toml/indents.scm b/extensions/toml/languages/toml/indents.scm
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/extensions/toml/languages/toml/outline.scm b/extensions/toml/languages/toml/outline.scm
deleted file mode 100644
index 0b37949628..0000000000
--- a/extensions/toml/languages/toml/outline.scm
+++ /dev/null
@@ -1,15 +0,0 @@
-(table
-  .
-  "["
-  .
-  (_) @name) @item
-
-(table_array_element
-  .
-  "[["
-  .
-  (_) @name) @item
-
-(pair
-  .
-  (_) @name) @item
diff --git a/extensions/toml/languages/toml/overrides.scm b/extensions/toml/languages/toml/overrides.scm
deleted file mode 100644
index 81fec9a5f5..0000000000
--- a/extensions/toml/languages/toml/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string) @string
diff --git a/extensions/toml/languages/toml/redactions.scm b/extensions/toml/languages/toml/redactions.scm
deleted file mode 100644
index a906e9ac7b..0000000000
--- a/extensions/toml/languages/toml/redactions.scm
+++ /dev/null
@@ -1 +0,0 @@
-(pair (bare_key) "=" (_) @redact)
diff --git a/extensions/toml/languages/toml/textobjects.scm b/extensions/toml/languages/toml/textobjects.scm
deleted file mode 100644
index f5b4856e27..0000000000
--- a/extensions/toml/languages/toml/textobjects.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-(comment)+ @comment
-(table "[" (_) "]"
-    (_)* @class.inside) @class.around
-
-(table_array_element "[[" (_) "]]"
-    (_)* @class.inside) @class.around
diff --git a/extensions/toml/src/toml.rs b/extensions/toml/src/toml.rs
deleted file mode 100644
index c9b96aecac..0000000000
--- a/extensions/toml/src/toml.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use std::fs;
-use zed::LanguageServerId;
-use zed_extension_api::settings::LspSettings;
-use zed_extension_api::{self as zed, Result};
-
-struct TaploBinary {
-    path: String,
-    args: Option<Vec<String>>,
-}
-
-struct TomlExtension {
-    cached_binary_path: Option<String>,
-}
-
-impl TomlExtension {
-    fn language_server_binary(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<TaploBinary> {
-        let binary_settings = LspSettings::for_worktree("taplo", worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.binary);
-        let binary_args = binary_settings
-            .as_ref()
-            .and_then(|binary_settings| binary_settings.arguments.clone());
-
-        if let Some(path) = binary_settings.and_then(|binary_settings| binary_settings.path) {
-            return Ok(TaploBinary {
-                path,
-                args: binary_args,
-            });
-        }
-
-        if let Some(path) = worktree.which("taplo") {
-            return Ok(TaploBinary {
-                path,
-                args: binary_args,
-            });
-        }
-
-        if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
-        {
-            return Ok(TaploBinary {
-                path: path.clone(),
-                args: binary_args,
-            });
-        }
-
-        zed::set_language_server_installation_status(
-            language_server_id,
-            &zed::LanguageServerInstallationStatus::CheckingForUpdate,
-        );
-        let release = zed::latest_github_release(
-            "tamasfe/taplo",
-            zed::GithubReleaseOptions {
-                require_assets: true,
-                pre_release: false,
-            },
-        )?;
-
-        let (platform, arch) = zed::current_platform();
-        let asset_name = format!(
-            "taplo-{os}-{arch}.gz",
-            arch = match arch {
-                zed::Architecture::Aarch64 => "aarch64",
-                zed::Architecture::X86 => "x86",
-                zed::Architecture::X8664 => "x86_64",
-            },
-            os = match platform {
-                zed::Os::Mac => "darwin",
-                zed::Os::Linux => "linux",
-                zed::Os::Windows => "windows",
-            },
-        );
-
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| asset.name == asset_name)
-            .ok_or_else(|| format!("no asset found matching {:?}", asset_name))?;
-
-        let version_dir = format!("taplo-{}", release.version);
-        fs::create_dir_all(&version_dir)
-            .map_err(|err| format!("failed to create directory '{version_dir}': {err}"))?;
-
-        let binary_path = format!(
-            "{version_dir}/{bin_name}",
-            bin_name = match platform {
-                zed::Os::Windows => "taplo.exe",
-                zed::Os::Mac | zed::Os::Linux => "taplo",
-            }
-        );
-
-        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
-            zed::set_language_server_installation_status(
-                language_server_id,
-                &zed::LanguageServerInstallationStatus::Downloading,
-            );
-
-            zed::download_file(
-                &asset.download_url,
-                &binary_path,
-                zed::DownloadedFileType::Gzip,
-            )
-            .map_err(|err| format!("failed to download file: {err}"))?;
-
-            zed::make_file_executable(&binary_path)?;
-
-            let entries = fs::read_dir(".")
-                .map_err(|err| format!("failed to list working directory {err}"))?;
-            for entry in entries {
-                let entry = entry.map_err(|err| format!("failed to load directory entry {err}"))?;
-                if entry.file_name().to_str() != Some(&version_dir) {
-                    fs::remove_dir_all(entry.path()).ok();
-                }
-            }
-        }
-
-        self.cached_binary_path = Some(binary_path.clone());
-        Ok(TaploBinary {
-            path: binary_path,
-            args: binary_args,
-        })
-    }
-}
-
-impl zed::Extension for TomlExtension {
-    fn new() -> Self {
-        Self {
-            cached_binary_path: None,
-        }
-    }
-
-    fn language_server_command(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<zed::Command> {
-        let taplo_binary = self.language_server_binary(language_server_id, worktree)?;
-        Ok(zed::Command {
-            command: taplo_binary.path,
-            args: taplo_binary
-                .args
-                .unwrap_or_else(|| vec!["lsp".to_string(), "stdio".to_string()]),
-            env: Default::default(),
-        })
-    }
-}
-
-zed::register_extension!(TomlExtension);

From 9d943589713f20767a355ba6f0d108d59bc31482 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 4 Sep 2025 14:33:56 -0400
Subject: [PATCH 609/823] acp: Keep diff editors in sync with `AgentFontSize`
 global (#37559)

Release Notes:

- agent: Fixed `cmd-+` and `cmd--` not affecting the font size of diffs.
---
 crates/agent_ui/src/acp/entry_view_state.rs |  2 +-
 crates/agent_ui/src/acp/thread_view.rs      | 11 ++++++-----
 crates/theme/src/settings.rs                |  3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index e60b923ca7..ec57ea7e6d 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -207,7 +207,7 @@ impl EntryViewState {
         self.entries.drain(range);
     }
 
-    pub fn settings_changed(&mut self, cx: &mut App) {
+    pub fn agent_font_size_changed(&mut self, cx: &mut App) {
         for entry in self.entries.iter() {
             match entry {
                 Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 3407f4e878..b4d56ad05b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -43,7 +43,7 @@ use std::{collections::BTreeMap, rc::Rc, time::Duration};
 use task::SpawnInTerminal;
 use terminal_view::terminal_panel::TerminalPanel;
 use text::Anchor;
-use theme::ThemeSettings;
+use theme::{AgentFontSize, ThemeSettings};
 use ui::{
     Callout, CommonAnimationExt, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding,
     PopoverMenuHandle, Scrollbar, ScrollbarState, SpinnerLabel, TintColor, Tooltip, prelude::*,
@@ -290,7 +290,7 @@ pub struct AcpThreadView {
     is_loading_contents: bool,
     new_server_version_available: Option<SharedString>,
     _cancel_task: Option<Task<()>>,
-    _subscriptions: [Subscription; 3],
+    _subscriptions: [Subscription; 4],
 }
 
 enum ThreadState {
@@ -380,7 +380,8 @@ impl AcpThreadView {
         });
 
         let subscriptions = [
-            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
+            cx.observe_global_in::<SettingsStore>(window, Self::agent_font_size_changed),
+            cx.observe_global_in::<AgentFontSize>(window, Self::agent_font_size_changed),
             cx.subscribe_in(&message_editor, window, Self::handle_message_editor_event),
             cx.subscribe_in(&entry_view_state, window, Self::handle_entry_view_event),
         ];
@@ -4735,9 +4736,9 @@ impl AcpThreadView {
         )
     }
 
-    fn settings_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+    fn agent_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
         self.entry_view_state.update(cx, |entry_view_state, cx| {
-            entry_view_state.settings_changed(cx);
+            entry_view_state.agent_font_size_changed(cx);
         });
     }
 
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 11db22d974..825176a2a0 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -253,8 +253,9 @@ pub(crate) struct UiFontSize(Pixels);
 
 impl Global for UiFontSize {}
 
+/// In-memory override for the font size in the agent panel.
 #[derive(Default)]
-pub(crate) struct AgentFontSize(Pixels);
+pub struct AgentFontSize(Pixels);
 
 impl Global for AgentFontSize {}
 

From a85946eba8cd2791a716f90b49df71c81002c3d3 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 14:54:32 -0400
Subject: [PATCH 610/823] docs: Update TOML docs (#37561)

This PR updates the TOML docs to remove references to Taplo and suggest
the Tombi extension for users wanting language server support.

Relates to https://github.com/zed-industries/zed/issues/36766.

Release Notes:

- N/A
---
 docs/src/languages/toml.md | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/docs/src/languages/toml.md b/docs/src/languages/toml.md
index 40a6b880fc..46b93b67eb 100644
--- a/docs/src/languages/toml.md
+++ b/docs/src/languages/toml.md
@@ -1,22 +1,7 @@
 # TOML
 
-TOML support is available through the [TOML extension](https://github.com/zed-extensions/toml).
+TOML support is available through the [TOML extension](https://zed.dev/extensions/toml).
 
 - Tree-sitter: [tree-sitter/tree-sitter-toml](https://github.com/tree-sitter/tree-sitter-toml)
-- Language Server: [tamasfe/taplo](https://github.com/tamasfe/taplo)
 
-## Configuration
-
-You can control the behavior of the Taplo TOML language server by adding a `.taplo.toml` file to the root of your project. See the [Taplo Configuration File](https://taplo.tamasfe.dev/configuration/file.html#configuration-file) and [Taplo Formatter Options](https://taplo.tamasfe.dev/configuration/formatter-options.html) documentation for more.
-
-```toml
-# .taplo.toml
-[formatting]
-align_comments = false
-reorder_keys = true
-
-include = ["Cargo.toml", "some_directory/**/*.toml"]
-# exclude = ["vendor/**/*.toml"]
-```
-
-Note: The taplo language server will not automatically pickup changes to `.taplo.toml`. You must manually trigger {#action editor::RestartLanguageServer} or reload Zed for it to pickup changes.
+A TOML language server is available in the [Tombi extension](https://zed.dev/extensions/tombi).

From 223fda2fe221e5c6b3bd90b61b8e1f444203a6f6 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 4 Sep 2025 22:05:21 +0300
Subject: [PATCH 611/823] Make remote projects to sync in local user settings
 (#37560)

Closes https://github.com/zed-industries/zed/issues/20024
Closes https://github.com/zed-industries/zed/issues/23489



https://github.com/user-attachments/assets/6466e0c1-4188-4980-8bb6-52ef6e7591c9


Release Notes:

- Made remote projects to sync in local user settings
---
 crates/project/src/project.rs                 |  9 ++-
 crates/project/src/project_settings.rs        | 55 +++++++++++++++++--
 crates/proto/proto/worktree.proto             |  5 ++
 crates/proto/proto/zed.proto                  |  4 +-
 crates/proto/src/proto.rs                     |  2 +
 .../remote_server/src/remote_editing_tests.rs |  6 +-
 crates/remote_server/src/unix.rs              | 48 ++++++++--------
 crates/settings/src/settings_store.rs         | 21 +++----
 8 files changed, 105 insertions(+), 45 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 46dd3b7d9e..4adebabc5a 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1271,6 +1271,7 @@ impl Project {
                     fs.clone(),
                     worktree_store.clone(),
                     task_store.clone(),
+                    Some(remote_proto.clone()),
                     cx,
                 )
             });
@@ -1521,7 +1522,13 @@ impl Project {
         })?;
 
         let settings_observer = cx.new(|cx| {
-            SettingsObserver::new_remote(fs.clone(), worktree_store.clone(), task_store.clone(), cx)
+            SettingsObserver::new_remote(
+                fs.clone(),
+                worktree_store.clone(),
+                task_store.clone(),
+                None,
+                cx,
+            )
         })?;
 
         let git_store = cx.new(|cx| {
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index c98065116e..57969ec993 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -4,7 +4,7 @@ use context_server::ContextServerCommand;
 use dap::adapters::DebugAdapterName;
 use fs::Fs;
 use futures::StreamExt as _;
-use gpui::{App, AsyncApp, BorrowAppContext, Context, Entity, EventEmitter, Task};
+use gpui::{App, AsyncApp, BorrowAppContext, Context, Entity, EventEmitter, Subscription, Task};
 use lsp::LanguageServerName;
 use paths::{
     EDITORCONFIG_NAME, local_debug_file_relative_path, local_settings_file_relative_path,
@@ -13,7 +13,7 @@ use paths::{
 };
 use rpc::{
     AnyProtoClient, TypedEnvelope,
-    proto::{self, FromProto, ToProto},
+    proto::{self, FromProto, REMOTE_SERVER_PROJECT_ID, ToProto},
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -658,6 +658,7 @@ pub struct SettingsObserver {
     worktree_store: Entity<WorktreeStore>,
     project_id: u64,
     task_store: Entity<TaskStore>,
+    _user_settings_watcher: Option<Subscription>,
     _global_task_config_watcher: Task<()>,
     _global_debug_config_watcher: Task<()>,
 }
@@ -670,6 +671,7 @@ pub struct SettingsObserver {
 impl SettingsObserver {
     pub fn init(client: &AnyProtoClient) {
         client.add_entity_message_handler(Self::handle_update_worktree_settings);
+        client.add_entity_message_handler(Self::handle_update_user_settings);
     }
 
     pub fn new_local(
@@ -686,7 +688,8 @@ impl SettingsObserver {
             task_store,
             mode: SettingsObserverMode::Local(fs.clone()),
             downstream_client: None,
-            project_id: 0,
+            _user_settings_watcher: None,
+            project_id: REMOTE_SERVER_PROJECT_ID,
             _global_task_config_watcher: Self::subscribe_to_global_task_file_changes(
                 fs.clone(),
                 paths::tasks_file().clone(),
@@ -704,14 +707,38 @@ impl SettingsObserver {
         fs: Arc<dyn Fs>,
         worktree_store: Entity<WorktreeStore>,
         task_store: Entity<TaskStore>,
+        upstream_client: Option<AnyProtoClient>,
         cx: &mut Context<Self>,
     ) -> Self {
+        let mut user_settings_watcher = None;
+        if cx.try_global::<SettingsStore>().is_some() {
+            if let Some(upstream_client) = upstream_client {
+                let mut user_settings = None;
+                user_settings_watcher = Some(cx.observe_global::<SettingsStore>(move |_, cx| {
+                    let new_settings = cx.global::<SettingsStore>().raw_user_settings();
+                    if Some(new_settings) != user_settings.as_ref() {
+                        if let Some(new_settings_string) = serde_json::to_string(new_settings).ok()
+                        {
+                            user_settings = Some(new_settings.clone());
+                            upstream_client
+                                .send(proto::UpdateUserSettings {
+                                    project_id: REMOTE_SERVER_PROJECT_ID,
+                                    contents: new_settings_string,
+                                })
+                                .log_err();
+                        }
+                    }
+                }));
+            }
+        };
+
         Self {
             worktree_store,
             task_store,
             mode: SettingsObserverMode::Remote,
             downstream_client: None,
-            project_id: 0,
+            project_id: REMOTE_SERVER_PROJECT_ID,
+            _user_settings_watcher: user_settings_watcher,
             _global_task_config_watcher: Self::subscribe_to_global_task_file_changes(
                 fs.clone(),
                 paths::tasks_file().clone(),
@@ -803,6 +830,24 @@ impl SettingsObserver {
         Ok(())
     }
 
+    async fn handle_update_user_settings(
+        _: Entity<Self>,
+        envelope: TypedEnvelope<proto::UpdateUserSettings>,
+        cx: AsyncApp,
+    ) -> anyhow::Result<()> {
+        let new_settings = serde_json::from_str::<serde_json::Value>(&envelope.payload.contents)
+            .with_context(|| {
+                format!("deserializing {} user settings", envelope.payload.contents)
+            })?;
+        cx.update_global(|settings_store: &mut SettingsStore, cx| {
+            settings_store
+                .set_raw_user_settings(new_settings, cx)
+                .context("setting new user settings")?;
+            anyhow::Ok(())
+        })??;
+        Ok(())
+    }
+
     fn on_worktree_store_event(
         &mut self,
         _: Entity<WorktreeStore>,
@@ -1089,7 +1134,7 @@ impl SettingsObserver {
                         project_id: self.project_id,
                         worktree_id: remote_worktree_id.to_proto(),
                         path: directory.to_proto(),
-                        content: file_content,
+                        content: file_content.clone(),
                         kind: Some(local_settings_kind_to_proto(kind).into()),
                     })
                     .log_err();
diff --git a/crates/proto/proto/worktree.proto b/crates/proto/proto/worktree.proto
index 67bd1925b5..19a61cc4bc 100644
--- a/crates/proto/proto/worktree.proto
+++ b/crates/proto/proto/worktree.proto
@@ -150,3 +150,8 @@ enum LocalSettingsKind {
     Editorconfig = 2;
     Debug = 3;
 }
+
+message UpdateUserSettings {
+    uint64 project_id = 1;
+    string contents = 2;
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 2222bdec08..4133b4b5ee 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -397,7 +397,9 @@ message Envelope {
 
         LspQuery lsp_query = 365;
         LspQueryResponse lsp_query_response = 366;
-        ToggleLspLogs toggle_lsp_logs = 367; // current max
+        ToggleLspLogs toggle_lsp_logs = 367;
+
+        UpdateUserSettings update_user_settings = 368; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 04495fb898..8f4e836b20 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -278,6 +278,7 @@ messages!(
     (UpdateUserChannels, Foreground),
     (UpdateWorktree, Foreground),
     (UpdateWorktreeSettings, Foreground),
+    (UpdateUserSettings, Background),
     (UpdateRepository, Foreground),
     (RemoveRepository, Foreground),
     (UsersResponse, Foreground),
@@ -583,6 +584,7 @@ entity_messages!(
     UpdateRepository,
     RemoveRepository,
     UpdateWorktreeSettings,
+    UpdateUserSettings,
     LspExtExpandMacro,
     LspExtOpenDocs,
     LspExtRunnables,
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
index 353857f587..c0ccaf900d 100644
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ b/crates/remote_server/src/remote_editing_tests.rs
@@ -280,7 +280,8 @@ async fn test_remote_settings(cx: &mut TestAppContext, server_cx: &mut TestAppCo
             AllLanguageSettings::get_global(cx)
                 .language(None, Some(&"Rust".into()), cx)
                 .language_servers,
-            ["..."] // local settings are ignored
+            ["from-local-settings"],
+            "User language settings should be synchronized with the server settings"
         )
     });
 
@@ -300,7 +301,8 @@ async fn test_remote_settings(cx: &mut TestAppContext, server_cx: &mut TestAppCo
             AllLanguageSettings::get_global(cx)
                 .language(None, Some(&"Rust".into()), cx)
                 .language_servers,
-            ["from-server-settings".to_string()]
+            ["from-server-settings".to_string()],
+            "Server language settings should take precedence over the user settings"
         )
     });
 
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index cb671a72d9..4aef536f0a 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -918,29 +918,33 @@ fn initialize_settings(
     });
 
     let (mut tx, rx) = watch::channel(None);
+    let mut node_settings = None;
     cx.observe_global::<SettingsStore>(move |cx| {
-        let settings = &ProjectSettings::get_global(cx).node;
-        log::info!("Got new node settings: {:?}", settings);
-        let options = NodeBinaryOptions {
-            allow_path_lookup: !settings.ignore_system_version,
-            // TODO: Implement this setting
-            allow_binary_download: true,
-            use_paths: settings.path.as_ref().map(|node_path| {
-                let node_path = PathBuf::from(shellexpand::tilde(node_path).as_ref());
-                let npm_path = settings
-                    .npm_path
-                    .as_ref()
-                    .map(|path| PathBuf::from(shellexpand::tilde(&path).as_ref()));
-                (
-                    node_path.clone(),
-                    npm_path.unwrap_or_else(|| {
-                        let base_path = PathBuf::new();
-                        node_path.parent().unwrap_or(&base_path).join("npm")
-                    }),
-                )
-            }),
-        };
-        tx.send(Some(options)).log_err();
+        let new_node_settings = &ProjectSettings::get_global(cx).node;
+        if Some(new_node_settings) != node_settings.as_ref() {
+            log::info!("Got new node settings: {new_node_settings:?}");
+            let options = NodeBinaryOptions {
+                allow_path_lookup: !new_node_settings.ignore_system_version,
+                // TODO: Implement this setting
+                allow_binary_download: true,
+                use_paths: new_node_settings.path.as_ref().map(|node_path| {
+                    let node_path = PathBuf::from(shellexpand::tilde(node_path).as_ref());
+                    let npm_path = new_node_settings
+                        .npm_path
+                        .as_ref()
+                        .map(|path| PathBuf::from(shellexpand::tilde(&path).as_ref()));
+                    (
+                        node_path.clone(),
+                        npm_path.unwrap_or_else(|| {
+                            let base_path = PathBuf::new();
+                            node_path.parent().unwrap_or(&base_path).join("npm")
+                        }),
+                    )
+                }),
+            };
+            node_settings = Some(new_node_settings.clone());
+            tx.send(Some(options)).ok();
+        }
     })
     .detach();
 
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 60eb132ad8..72df08d14f 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -467,6 +467,13 @@ impl SettingsStore {
         &self.raw_user_settings
     }
 
+    /// Replaces current settings with the values from the given JSON.
+    pub fn set_raw_user_settings(&mut self, new_settings: Value, cx: &mut App) -> Result<()> {
+        self.raw_user_settings = new_settings;
+        self.recompute_values(None, cx)?;
+        Ok(())
+    }
+
     /// Get the configured settings profile names.
     pub fn configured_settings_profiles(&self) -> impl Iterator<Item = &str> {
         self.raw_user_settings
@@ -525,20 +532,6 @@ impl SettingsStore {
         }
     }
 
-    pub async fn load_global_settings(fs: &Arc<dyn Fs>) -> Result<String> {
-        match fs.load(paths::global_settings_file()).await {
-            result @ Ok(_) => result,
-            Err(err) => {
-                if let Some(e) = err.downcast_ref::<std::io::Error>()
-                    && e.kind() == std::io::ErrorKind::NotFound
-                {
-                    return Ok("{}".to_string());
-                }
-                Err(err)
-            }
-        }
-    }
-
     fn update_settings_file_inner(
         &self,
         fs: Arc<dyn Fs>,

From 5f03202b5cda0baff80212af07f80454c8aca1cd Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 4 Sep 2025 15:19:02 -0400
Subject: [PATCH 612/823] settings ui: Create settings key trait (#37489)

This PR separates out the associated constant `KEY` from the `Settings`
trait into a new trait `SettingsKey`. This allows for the key trait to
be derived using attributes to specify the path so that the new
`SettingsUi` derive macro can use the same attributes to determine top
level settings paths thereby removing the need to duplicate the path in
both `Settings::KEY` and `#[settings_ui(path = "...")]`

Co-authored-by: Ben Kunkle <ben@zed.dev>

Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 Cargo.lock                                    |   2 +
 crates/agent_servers/src/settings.rs          |   7 +-
 crates/agent_settings/src/agent_settings.rs   |   9 +-
 crates/agent_ui/src/slash_command_settings.rs |   7 +-
 crates/audio/src/audio_settings.rs            |   9 +-
 crates/auto_update/src/auto_update.rs         |   7 +-
 crates/call/src/call_settings.rs              |   7 +-
 crates/client/src/client.rs                   |  17 +--
 crates/collab_ui/src/panel_settings.rs        |  22 ++-
 crates/dap/src/debugger_settings.rs           |   9 +-
 crates/editor/src/editor_settings.rs          |   7 +-
 .../extension_host/src/extension_settings.rs  |   7 +-
 crates/extensions_ui/src/extensions_ui.rs     |   2 +-
 .../file_finder/src/file_finder_settings.rs   |   7 +-
 crates/git_hosting_providers/src/settings.rs  |   7 +-
 crates/git_ui/src/git_panel_settings.rs       |   7 +-
 crates/go_to_line/src/cursor_position.rs      |   7 +-
 .../image_viewer/src/image_viewer_settings.rs |   7 +-
 crates/journal/src/journal.rs                 |   7 +-
 crates/language/src/language_settings.rs      |  10 +-
 crates/language_models/src/settings.rs        |   9 +-
 crates/onboarding/src/ai_setup_page.rs        |  10 +-
 crates/onboarding/src/basics_page.rs          |   2 +-
 .../src/outline_panel_settings.rs             |   7 +-
 crates/project/src/project.rs                 |  79 +++++++----
 crates/project/src/project_settings.rs        |   9 +-
 .../src/project_panel_settings.rs             |   7 +-
 .../recent_projects/src/remote_connections.rs |   7 +-
 crates/repl/src/jupyter_settings.rs           |   7 +-
 crates/settings/src/base_keymap_setting.rs    |  19 ++-
 crates/settings/src/settings.rs               |   6 +-
 crates/settings/src/settings_store.rs         |  95 +++++++++----
 .../src/settings_ui_macros.rs                 | 134 +++++++++++++++++-
 crates/terminal/src/terminal_settings.rs      |   7 +-
 crates/theme/src/settings.rs                  |   7 +-
 crates/title_bar/src/title_bar_settings.rs    |  11 +-
 crates/vim/src/test/vim_test_context.rs       |   8 +-
 crates/vim/src/vim.rs                         |  11 +-
 crates/vim_mode_setting/Cargo.toml            |   2 +
 .../vim_mode_setting/src/vim_mode_setting.rs  |  78 +++++++---
 crates/workspace/src/item.rs                  |  12 +-
 crates/workspace/src/workspace_settings.rs    |  12 +-
 crates/worktree/src/worktree_settings.rs      |   7 +-
 crates/zlog_settings/src/zlog_settings.rs     |  18 ++-
 44 files changed, 473 insertions(+), 255 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a15d11e66..a99c59a189 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17995,6 +17995,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "gpui",
+ "schemars",
+ "serde",
  "settings",
  "workspace-hack",
 ]
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
index 693d7d7b70..167753296a 100644
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -6,13 +6,14 @@ use collections::HashMap;
 use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 pub fn init(cx: &mut App) {
     AllAgentServersSettings::register(cx);
 }
 
-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi)]
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "agent_servers")]
 pub struct AllAgentServersSettings {
     pub gemini: Option<BuiltinAgentServerSettings>,
     pub claude: Option<CustomAgentServerSettings>,
@@ -75,8 +76,6 @@ pub struct CustomAgentServerSettings {
 }
 
 impl settings::Settings for AllAgentServersSettings {
-    const KEY: Option<&'static str> = Some("agent_servers");
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 8aebdcd288..8c4a190e1c 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -8,7 +8,7 @@ use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::borrow::Cow;
 
 pub use crate::agent_profile::*;
@@ -223,7 +223,8 @@ impl AgentSettingsContent {
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default, SettingsUi)]
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default, SettingsUi, SettingsKey)]
+#[settings_key(key = "agent", fallback_key = "assistant")]
 pub struct AgentSettingsContent {
     /// Whether the Agent is enabled.
     ///
@@ -399,10 +400,6 @@ pub struct ContextServerPresetContent {
 }
 
 impl Settings for AgentSettings {
-    const KEY: Option<&'static str> = Some("agent");
-
-    const FALLBACK_KEY: Option<&'static str> = Some("assistant");
-
     const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);
 
     type FileContent = AgentSettingsContent;
diff --git a/crates/agent_ui/src/slash_command_settings.rs b/crates/agent_ui/src/slash_command_settings.rs
index c54a10ed49..9580ffef0f 100644
--- a/crates/agent_ui/src/slash_command_settings.rs
+++ b/crates/agent_ui/src/slash_command_settings.rs
@@ -2,10 +2,11 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 /// Settings for slash commands.
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi)]
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "slash_commands")]
 pub struct SlashCommandSettings {
     /// Settings for the `/cargo-workspace` slash command.
     #[serde(default)]
@@ -21,8 +22,6 @@ pub struct CargoWorkspaceCommandSettings {
 }
 
 impl Settings for SlashCommandSettings {
-    const KEY: Option<&'static str> = Some("slash_commands");
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
index d30d950273..168519030b 100644
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -2,9 +2,9 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct AudioSettings {
     /// Opt into the new audio system.
     #[serde(rename = "experimental.rodio_audio", default)]
@@ -12,8 +12,9 @@ pub struct AudioSettings {
 }
 
 /// Configuration of audio in Zed.
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
 #[serde(default)]
+#[settings_key(key = "audio")]
 pub struct AudioSettingsContent {
     /// Whether to use the experimental audio system
     #[serde(rename = "experimental.rodio_audio", default)]
@@ -21,8 +22,6 @@ pub struct AudioSettingsContent {
 }
 
 impl Settings for AudioSettings {
-    const KEY: Option<&'static str> = Some("audio");
-
     type FileContent = AudioSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index f0ae3fdb1c..f5d4533a9e 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -10,7 +10,7 @@ use paths::remote_servers_dir;
 use release_channel::{AppCommitSha, ReleaseChannel};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsStore, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi};
 use smol::{fs, io::AsyncReadExt};
 use smol::{fs::File, process::Command};
 use std::{
@@ -118,13 +118,12 @@ struct AutoUpdateSetting(bool);
 /// Whether or not to automatically check for updates.
 ///
 /// Default: true
-#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi)]
+#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi, SettingsKey)]
 #[serde(transparent)]
+#[settings_key(key = "auto_update")]
 struct AutoUpdateSettingContent(bool);
 
 impl Settings for AutoUpdateSetting {
-    const KEY: Option<&'static str> = Some("auto_update");
-
     type FileContent = AutoUpdateSettingContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/call/src/call_settings.rs b/crates/call/src/call_settings.rs
index 7b0838e3a9..b0677e3c3b 100644
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Deserialize, Debug)]
 pub struct CallSettings {
@@ -11,7 +11,8 @@ pub struct CallSettings {
 }
 
 /// Configuration of voice calls in Zed.
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "calls")]
 pub struct CallSettingsContent {
     /// Whether the microphone should be muted when joining a channel or a call.
     ///
@@ -25,8 +26,6 @@ pub struct CallSettingsContent {
 }
 
 impl Settings for CallSettings {
-    const KEY: Option<&'static str> = Some("calls");
-
     type FileContent = CallSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 85f6aeade6..cb8185c7ed 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -31,7 +31,7 @@ use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::{
     any::TypeId,
     convert::TryFrom,
@@ -96,7 +96,8 @@ actions!(
     ]
 );
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct ClientSettingsContent {
     server_url: Option<String>,
 }
@@ -107,8 +108,6 @@ pub struct ClientSettings {
 }
 
 impl Settings for ClientSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = ClientSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -122,7 +121,8 @@ impl Settings for ClientSettings {
     fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
 
-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct ProxySettingsContent {
     proxy: Option<String>,
 }
@@ -133,8 +133,6 @@ pub struct ProxySettings {
 }
 
 impl Settings for ProxySettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = ProxySettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -527,7 +525,8 @@ pub struct TelemetrySettings {
 }
 
 /// Control what info is collected by Zed.
-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "telemetry")]
 pub struct TelemetrySettingsContent {
     /// Send debug info like crash reports.
     ///
@@ -540,8 +539,6 @@ pub struct TelemetrySettingsContent {
 }
 
 impl settings::Settings for TelemetrySettings {
-    const KEY: Option<&'static str> = Some("telemetry");
-
     type FileContent = TelemetrySettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/collab_ui/src/panel_settings.rs b/crates/collab_ui/src/panel_settings.rs
index 64f0a9366d..bae118d819 100644
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -1,7 +1,7 @@
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use workspace::dock::DockPosition;
 
 #[derive(Deserialize, Debug)]
@@ -27,7 +27,8 @@ pub struct ChatPanelSettings {
     pub default_width: Pixels,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "chat_panel")]
 pub struct ChatPanelSettingsContent {
     /// When to show the panel button in the status bar.
     ///
@@ -43,14 +44,16 @@ pub struct ChatPanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, SettingsKey)]
+#[settings_key(key = "notification_panel")]
 pub struct NotificationPanelSettings {
     pub button: bool,
     pub dock: DockPosition,
     pub default_width: Pixels,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "collaboration_panel")]
 pub struct PanelSettingsContent {
     /// Whether to show the panel button in the status bar.
     ///
@@ -66,7 +69,8 @@ pub struct PanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "message_editor")]
 pub struct MessageEditorSettings {
     /// Whether to automatically replace emoji shortcodes with emoji characters.
     /// For example: typing `:wave:` gets replaced with `👋`.
@@ -76,8 +80,6 @@ pub struct MessageEditorSettings {
 }
 
 impl Settings for CollaborationPanelSettings {
-    const KEY: Option<&'static str> = Some("collaboration_panel");
-
     type FileContent = PanelSettingsContent;
 
     fn load(
@@ -91,8 +93,6 @@ impl Settings for CollaborationPanelSettings {
 }
 
 impl Settings for ChatPanelSettings {
-    const KEY: Option<&'static str> = Some("chat_panel");
-
     type FileContent = ChatPanelSettingsContent;
 
     fn load(
@@ -106,8 +106,6 @@ impl Settings for ChatPanelSettings {
 }
 
 impl Settings for NotificationPanelSettings {
-    const KEY: Option<&'static str> = Some("notification_panel");
-
     type FileContent = PanelSettingsContent;
 
     fn load(
@@ -121,8 +119,6 @@ impl Settings for NotificationPanelSettings {
 }
 
 impl Settings for MessageEditorSettings {
-    const KEY: Option<&'static str> = Some("message_editor");
-
     type FileContent = MessageEditorSettings;
 
     fn load(
diff --git a/crates/dap/src/debugger_settings.rs b/crates/dap/src/debugger_settings.rs
index 929bff747e..8d53fdea86 100644
--- a/crates/dap/src/debugger_settings.rs
+++ b/crates/dap/src/debugger_settings.rs
@@ -2,7 +2,7 @@ use dap_types::SteppingGranularity;
 use gpui::{App, Global};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 #[serde(rename_all = "snake_case")]
@@ -12,11 +12,12 @@ pub enum DebugPanelDockPosition {
     Right,
 }
 
-#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi)]
+#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi, SettingsKey)]
 #[serde(default)]
 // todo(settings_ui) @ben: I'm pretty sure not having the fields be optional here is a bug,
 // it means the defaults will override previously set values if a single key is missing
-#[settings_ui(group = "Debugger", path = "debugger")]
+#[settings_ui(group = "Debugger")]
+#[settings_key(key = "debugger")]
 pub struct DebuggerSettings {
     /// Determines the stepping granularity.
     ///
@@ -64,8 +65,6 @@ impl Default for DebuggerSettings {
 }
 
 impl Settings for DebuggerSettings {
-    const KEY: Option<&'static str> = Some("debugger");
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 44cb074976..d74244131e 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -6,7 +6,7 @@ use language::CursorShape;
 use project::project_settings::DiagnosticSeverity;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi, VsCodeSettings};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi, VsCodeSettings};
 use util::serde::default_true;
 
 /// Imports from the VSCode settings at
@@ -431,8 +431,9 @@ pub enum SnippetSortOrder {
     None,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
 #[settings_ui(group = "Editor")]
+#[settings_key(None)]
 pub struct EditorSettingsContent {
     /// Whether the cursor blinks in the editor.
     ///
@@ -777,8 +778,6 @@ impl EditorSettings {
 }
 
 impl Settings for EditorSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = EditorSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/extension_host/src/extension_settings.rs b/crates/extension_host/src/extension_settings.rs
index 6bd760795c..fa5a613c55 100644
--- a/crates/extension_host/src/extension_settings.rs
+++ b/crates/extension_host/src/extension_settings.rs
@@ -3,10 +3,11 @@ use collections::HashMap;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::sync::Arc;
 
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi)]
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct ExtensionSettings {
     /// The extensions that should be automatically installed by Zed.
     ///
@@ -38,8 +39,6 @@ impl ExtensionSettings {
 }
 
 impl Settings for ExtensionSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index fd504764b6..0b925dceb1 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -1345,7 +1345,7 @@ impl ExtensionsPage {
                             this.update_settings::<VimModeSetting>(
                                 selection,
                                 cx,
-                                |setting, value| *setting = Some(value),
+                                |setting, value| setting.vim_mode = Some(value),
                             );
                         }),
                     )),
diff --git a/crates/file_finder/src/file_finder_settings.rs b/crates/file_finder/src/file_finder_settings.rs
index 007af53b11..6a6b98b8ea 100644
--- a/crates/file_finder/src/file_finder_settings.rs
+++ b/crates/file_finder/src/file_finder_settings.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Deserialize, Debug, Clone, Copy, PartialEq)]
 pub struct FileFinderSettings {
@@ -11,7 +11,8 @@ pub struct FileFinderSettings {
     pub include_ignored: Option<bool>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "file_finder")]
 pub struct FileFinderSettingsContent {
     /// Whether to show file icons in the file finder.
     ///
@@ -42,8 +43,6 @@ pub struct FileFinderSettingsContent {
 }
 
 impl Settings for FileFinderSettings {
-    const KEY: Option<&'static str> = Some("file_finder");
-
     type FileContent = FileFinderSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut gpui::App) -> Result<Self> {
diff --git a/crates/git_hosting_providers/src/settings.rs b/crates/git_hosting_providers/src/settings.rs
index 34e3805a39..3249981db9 100644
--- a/crates/git_hosting_providers/src/settings.rs
+++ b/crates/git_hosting_providers/src/settings.rs
@@ -5,7 +5,7 @@ use git::GitHostingProviderRegistry;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsStore, SettingsUi};
 use url::Url;
 use util::ResultExt as _;
 
@@ -78,7 +78,8 @@ pub struct GitHostingProviderConfig {
     pub name: String,
 }
 
-#[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct GitHostingProviderSettings {
     /// The list of custom Git hosting providers.
     #[serde(default)]
@@ -86,8 +87,6 @@ pub struct GitHostingProviderSettings {
 }
 
 impl Settings for GitHostingProviderSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = Self;
 
     fn load(sources: settings::SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/git_ui/src/git_panel_settings.rs b/crates/git_ui/src/git_panel_settings.rs
index 39d6540db5..be207314ac 100644
--- a/crates/git_ui/src/git_panel_settings.rs
+++ b/crates/git_ui/src/git_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::ShowScrollbar;
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use workspace::dock::DockPosition;
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
@@ -36,7 +36,8 @@ pub enum StatusStyle {
     LabelColor,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "git_panel")]
 pub struct GitPanelSettingsContent {
     /// Whether to show the panel button in the status bar.
     ///
@@ -90,8 +91,6 @@ pub struct GitPanelSettings {
 }
 
 impl Settings for GitPanelSettings {
-    const KEY: Option<&'static str> = Some("git_panel");
-
     type FileContent = GitPanelSettingsContent;
 
     fn load(
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
index 5840993ece..6af8c79fe9 100644
--- a/crates/go_to_line/src/cursor_position.rs
+++ b/crates/go_to_line/src/cursor_position.rs
@@ -2,7 +2,7 @@ use editor::{Editor, EditorSettings, MultiBufferSnapshot};
 use gpui::{App, Entity, FocusHandle, Focusable, Subscription, Task, WeakEntity};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::{fmt::Write, num::NonZeroU32, time::Duration};
 use text::{Point, Selection};
 use ui::{
@@ -301,13 +301,12 @@ pub(crate) enum LineIndicatorFormat {
     Long,
 }
 
-#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi)]
+#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi, SettingsKey)]
 #[serde(transparent)]
+#[settings_key(key = "line_indicator_format")]
 pub(crate) struct LineIndicatorFormatContent(LineIndicatorFormat);
 
 impl Settings for LineIndicatorFormat {
-    const KEY: Option<&'static str> = Some("line_indicator_format");
-
     type FileContent = LineIndicatorFormatContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/image_viewer/src/image_viewer_settings.rs b/crates/image_viewer/src/image_viewer_settings.rs
index 4949b266b4..510de69b52 100644
--- a/crates/image_viewer/src/image_viewer_settings.rs
+++ b/crates/image_viewer/src/image_viewer_settings.rs
@@ -1,10 +1,11 @@
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 /// The settings for the image viewer.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Default, SettingsUi)]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Default, SettingsUi, SettingsKey)]
+#[settings_key(key = "image_viewer")]
 pub struct ImageViewerSettings {
     /// The unit to use for displaying image file sizes.
     ///
@@ -24,8 +25,6 @@ pub enum ImageFileSizeUnit {
 }
 
 impl Settings for ImageViewerSettings {
-    const KEY: Option<&'static str> = Some("image_viewer");
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs
index ffa24571c8..5cdfa6c1df 100644
--- a/crates/journal/src/journal.rs
+++ b/crates/journal/src/journal.rs
@@ -5,7 +5,7 @@ use editor::{Editor, SelectionEffects};
 use gpui::{App, AppContext as _, Context, Window, actions};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::{
     fs::OpenOptions,
     path::{Path, PathBuf},
@@ -22,7 +22,8 @@ actions!(
 );
 
 /// Settings specific to journaling
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "journal")]
 pub struct JournalSettings {
     /// The path of the directory where journal entries are stored.
     ///
@@ -52,8 +53,6 @@ pub enum HourFormat {
 }
 
 impl settings::Settings for JournalSettings {
-    const KEY: Option<&'static str> = Some("journal");
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index f04b83bc73..3443ccf592 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -17,7 +17,8 @@ use serde::{
 };
 
 use settings::{
-    ParameterizedJsonSchema, Settings, SettingsLocation, SettingsSources, SettingsStore, SettingsUi,
+    ParameterizedJsonSchema, Settings, SettingsKey, SettingsLocation, SettingsSources,
+    SettingsStore, SettingsUi,
 };
 use shellexpand;
 use std::{borrow::Cow, num::NonZeroU32, path::Path, slice, sync::Arc};
@@ -292,7 +293,10 @@ pub struct CopilotSettings {
 }
 
 /// The settings for all languages.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(
+    Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey,
+)]
+#[settings_key(None)]
 pub struct AllLanguageSettingsContent {
     /// The settings for enabling/disabling features.
     #[serde(default)]
@@ -1213,8 +1217,6 @@ impl InlayHintKind {
 }
 
 impl settings::Settings for AllLanguageSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = AllLanguageSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/language_models/src/settings.rs b/crates/language_models/src/settings.rs
index 8b7ab5fc25..cfe66c91a3 100644
--- a/crates/language_models/src/settings.rs
+++ b/crates/language_models/src/settings.rs
@@ -5,7 +5,7 @@ use collections::HashMap;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 use crate::provider::{
     self,
@@ -46,7 +46,10 @@ pub struct AllLanguageModelSettings {
     pub zed_dot_dev: ZedDotDevSettings,
 }
 
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, SettingsUi)]
+#[derive(
+    Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, SettingsUi, SettingsKey,
+)]
+#[settings_key(key = "language_models")]
 pub struct AllLanguageModelSettingsContent {
     pub anthropic: Option<AnthropicSettingsContent>,
     pub bedrock: Option<AmazonBedrockSettingsContent>,
@@ -145,8 +148,6 @@ pub struct OpenRouterSettingsContent {
 }
 
 impl settings::Settings for AllLanguageModelSettings {
-    const KEY: Option<&'static str> = Some("language_models");
-
     const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);
 
     type FileContent = AllLanguageModelSettingsContent;
diff --git a/crates/onboarding/src/ai_setup_page.rs b/crates/onboarding/src/ai_setup_page.rs
index 54c49bc72a..3631ad00df 100644
--- a/crates/onboarding/src/ai_setup_page.rs
+++ b/crates/onboarding/src/ai_setup_page.rs
@@ -264,13 +264,9 @@ pub(crate) fn render_ai_setup_page(
                     );
 
                     let fs = <dyn Fs>::global(cx);
-                    update_settings_file::<DisableAiSettings>(
-                        fs,
-                        cx,
-                        move |ai_settings: &mut Option<bool>, _| {
-                            *ai_settings = Some(enabled);
-                        },
-                    );
+                    update_settings_file::<DisableAiSettings>(fs, cx, move |ai_settings, _| {
+                        ai_settings.disable_ai = Some(enabled);
+                    });
                 },
             )
             .tab_index({
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
index 59ec437dcf..aef9dcca86 100644
--- a/crates/onboarding/src/basics_page.rs
+++ b/crates/onboarding/src/basics_page.rs
@@ -388,7 +388,7 @@ fn render_vim_mode_switch(tab_index: &mut isize, cx: &mut App) -> impl IntoEleme
                     }
                 };
                 update_settings_file::<VimModeSetting>(fs.clone(), cx, move |setting, _| {
-                    *setting = Some(vim_mode);
+                    setting.vim_mode = Some(vim_mode);
                 });
 
                 telemetry::event!(
diff --git a/crates/outline_panel/src/outline_panel_settings.rs b/crates/outline_panel/src/outline_panel_settings.rs
index 48c6621e35..dc123f2ba5 100644
--- a/crates/outline_panel/src/outline_panel_settings.rs
+++ b/crates/outline_panel/src/outline_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::ShowScrollbar;
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Copy, PartialEq)]
 #[serde(rename_all = "snake_case")]
@@ -61,7 +61,8 @@ pub struct IndentGuidesSettingsContent {
     pub show: Option<ShowIndentGuides>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "outline_panel")]
 pub struct OutlinePanelSettingsContent {
     /// Whether to show the outline panel button in the status bar.
     ///
@@ -116,8 +117,6 @@ pub struct OutlinePanelSettingsContent {
 }
 
 impl Settings for OutlinePanelSettings {
-    const KEY: Option<&'static str> = Some("outline_panel");
-
     type FileContent = OutlinePanelSettingsContent;
 
     fn load(
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 4adebabc5a..1e2e52c120 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -28,6 +28,7 @@ use context_server_store::ContextServerStore;
 pub use environment::{EnvironmentErrorMessage, ProjectEnvironmentEvent};
 use git::repository::get_git_committer;
 use git_store::{Repository, RepositoryId};
+use schemars::JsonSchema;
 pub mod search_history;
 mod yarn;
 
@@ -94,7 +95,10 @@ use rpc::{
 };
 use search::{SearchInputKind, SearchQuery, SearchResult};
 use search_history::SearchHistory;
-use settings::{InvalidSettingsError, Settings, SettingsLocation, SettingsSources, SettingsStore};
+use settings::{
+    InvalidSettingsError, Settings, SettingsKey, SettingsLocation, SettingsSources, SettingsStore,
+    SettingsUi,
+};
 use smol::channel::Receiver;
 use snippet::Snippet;
 use snippet_provider::SnippetProvider;
@@ -968,10 +972,26 @@ pub struct DisableAiSettings {
     pub disable_ai: bool,
 }
 
-impl settings::Settings for DisableAiSettings {
-    const KEY: Option<&'static str> = Some("disable_ai");
+#[derive(
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    Debug,
+    Default,
+    serde::Serialize,
+    serde::Deserialize,
+    SettingsUi,
+    SettingsKey,
+    JsonSchema,
+)]
+#[settings_key(None)]
+pub struct DisableAiSettingContent {
+    pub disable_ai: Option<bool>,
+}
 
-    type FileContent = Option<bool>;
+impl settings::Settings for DisableAiSettings {
+    type FileContent = DisableAiSettingContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         // For security reasons, settings can only make AI restrictions MORE strict, not less.
@@ -984,7 +1004,7 @@ impl settings::Settings for DisableAiSettings {
             .iter()
             .chain(sources.user.iter())
             .chain(sources.server.iter())
-            .any(|disabled| **disabled == Some(true));
+            .any(|disabled| disabled.disable_ai == Some(true));
 
         Ok(Self { disable_ai })
     }
@@ -5550,10 +5570,15 @@ mod disable_ai_settings_tests {
 
     #[gpui::test]
     async fn test_disable_ai_settings_security(cx: &mut TestAppContext) {
+        fn disable_setting(value: Option<bool>) -> DisableAiSettingContent {
+            DisableAiSettingContent { disable_ai: value }
+        }
         cx.update(|cx| {
             // Test 1: Default is false (AI enabled)
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &DisableAiSettingContent {
+                    disable_ai: Some(false),
+                },
                 global: None,
                 extensions: None,
                 user: None,
@@ -5567,10 +5592,10 @@ mod disable_ai_settings_tests {
             assert!(!settings.disable_ai, "Default should allow AI");
 
             // Test 2: Global true, local false -> still disabled (local cannot re-enable)
-            let global_true = Some(true);
-            let local_false = Some(false);
+            let global_true = disable_setting(Some(true));
+            let local_false = disable_setting(Some(false));
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &disable_setting(Some(false)),
                 global: None,
                 extensions: None,
                 user: Some(&global_true),
@@ -5587,10 +5612,10 @@ mod disable_ai_settings_tests {
             );
 
             // Test 3: Global false, local true -> disabled (local can make more restrictive)
-            let global_false = Some(false);
-            let local_true = Some(true);
+            let global_false = disable_setting(Some(false));
+            let local_true = disable_setting(Some(true));
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &disable_setting(Some(false)),
                 global: None,
                 extensions: None,
                 user: Some(&global_false),
@@ -5604,10 +5629,10 @@ mod disable_ai_settings_tests {
             assert!(settings.disable_ai, "Local true can override global false");
 
             // Test 4: Server can only make more restrictive (set to true)
-            let user_false = Some(false);
-            let server_true = Some(true);
+            let user_false = disable_setting(Some(false));
+            let server_true = disable_setting(Some(true));
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &disable_setting(Some(false)),
                 global: None,
                 extensions: None,
                 user: Some(&user_false),
@@ -5624,10 +5649,10 @@ mod disable_ai_settings_tests {
             );
 
             // Test 5: Server false cannot override user true
-            let user_true = Some(true);
-            let server_false = Some(false);
+            let user_true = disable_setting(Some(true));
+            let server_false = disable_setting(Some(false));
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &disable_setting(Some(false)),
                 global: None,
                 extensions: None,
                 user: Some(&user_true),
@@ -5644,12 +5669,12 @@ mod disable_ai_settings_tests {
             );
 
             // Test 6: Multiple local settings, any true disables AI
-            let global_false = Some(false);
-            let local_false3 = Some(false);
-            let local_true2 = Some(true);
-            let local_false4 = Some(false);
+            let global_false = disable_setting(Some(false));
+            let local_false3 = disable_setting(Some(false));
+            let local_true2 = disable_setting(Some(true));
+            let local_false4 = disable_setting(Some(false));
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &disable_setting(Some(false)),
                 global: None,
                 extensions: None,
                 user: Some(&global_false),
@@ -5663,11 +5688,11 @@ mod disable_ai_settings_tests {
             assert!(settings.disable_ai, "Any local true should disable AI");
 
             // Test 7: All three sources can independently disable AI
-            let user_false2 = Some(false);
-            let server_false2 = Some(false);
-            let local_true3 = Some(true);
+            let user_false2 = disable_setting(Some(false));
+            let server_false2 = disable_setting(Some(false));
+            let local_true3 = disable_setting(Some(true));
             let sources = SettingsSources {
-                default: &Some(false),
+                default: &disable_setting(Some(false)),
                 global: None,
                 extensions: None,
                 user: Some(&user_false2),
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 57969ec993..694e244e63 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -18,8 +18,8 @@ use rpc::{
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{
-    InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation, SettingsSources,
-    SettingsStore, SettingsUi, parse_json_with_comments, watch_config_file,
+    InvalidSettingsError, LocalSettingsKind, Settings, SettingsKey, SettingsLocation,
+    SettingsSources, SettingsStore, SettingsUi, parse_json_with_comments, watch_config_file,
 };
 use std::{
     collections::BTreeMap,
@@ -36,7 +36,8 @@ use crate::{
     worktree_store::{WorktreeStore, WorktreeStoreEvent},
 };
 
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct ProjectSettings {
     /// Configuration for language servers.
     ///
@@ -568,8 +569,6 @@ impl Default for SessionSettings {
 }
 
 impl Settings for ProjectSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = Self;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs
index db9b2b85d5..6c812c2946 100644
--- a/crates/project_panel/src/project_panel_settings.rs
+++ b/crates/project_panel/src/project_panel_settings.rs
@@ -2,7 +2,7 @@ use editor::ShowScrollbar;
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Copy, PartialEq)]
 #[serde(rename_all = "snake_case")]
@@ -92,7 +92,8 @@ pub enum ShowDiagnostics {
     All,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "project_panel")]
 pub struct ProjectPanelSettingsContent {
     /// Whether to show the project panel button in the status bar.
     ///
@@ -168,8 +169,6 @@ pub struct ProjectPanelSettingsContent {
 }
 
 impl Settings for ProjectPanelSettings {
-    const KEY: Option<&'static str> = Some("project_panel");
-
     type FileContent = ProjectPanelSettingsContent;
 
     fn load(
diff --git a/crates/recent_projects/src/remote_connections.rs b/crates/recent_projects/src/remote_connections.rs
index a7f915301f..3e6810239c 100644
--- a/crates/recent_projects/src/remote_connections.rs
+++ b/crates/recent_projects/src/remote_connections.rs
@@ -21,7 +21,7 @@ use remote::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use theme::ThemeSettings;
 use ui::{
     ActiveTheme, Color, CommonAnimationExt, Context, Icon, IconName, IconSize, InteractiveElement,
@@ -121,15 +121,14 @@ pub struct SshProject {
     pub paths: Vec<String>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct RemoteSettingsContent {
     pub ssh_connections: Option<Vec<SshConnection>>,
     pub read_ssh_config: Option<bool>,
 }
 
 impl Settings for SshSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = RemoteSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/repl/src/jupyter_settings.rs b/crates/repl/src/jupyter_settings.rs
index 6f3d6b1db6..c89736a03d 100644
--- a/crates/repl/src/jupyter_settings.rs
+++ b/crates/repl/src/jupyter_settings.rs
@@ -4,7 +4,7 @@ use editor::EditorSettings;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Debug, Default)]
 pub struct JupyterSettings {
@@ -20,7 +20,8 @@ impl JupyterSettings {
     }
 }
 
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "jupyter")]
 pub struct JupyterSettingsContent {
     /// Default kernels to select for each language.
     ///
@@ -37,8 +38,6 @@ impl Default for JupyterSettingsContent {
 }
 
 impl Settings for JupyterSettings {
-    const KEY: Option<&'static str> = Some("jupyter");
-
     type FileContent = JupyterSettingsContent;
 
     fn load(
diff --git a/crates/settings/src/base_keymap_setting.rs b/crates/settings/src/base_keymap_setting.rs
index fb5b445b49..a6bfeecbc3 100644
--- a/crates/settings/src/base_keymap_setting.rs
+++ b/crates/settings/src/base_keymap_setting.rs
@@ -1,10 +1,10 @@
 use std::fmt::{Display, Formatter};
 
-use crate as settings;
+use crate::{self as settings};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, VsCodeSettings};
-use settings_ui_macros::SettingsUi;
+use settings_ui_macros::{SettingsKey, SettingsUi};
 
 /// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
 ///
@@ -101,16 +101,25 @@ impl BaseKeymap {
 }
 
 #[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default, SettingsUi,
+    Copy,
+    Clone,
+    Debug,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    PartialEq,
+    Eq,
+    Default,
+    SettingsUi,
+    SettingsKey,
 )]
 // extracted so that it can be an option, and still work with derive(SettingsUi)
+#[settings_key(None)]
 pub struct BaseKeymapSetting {
     pub base_keymap: Option<BaseKeymap>,
 }
 
 impl Settings for BaseKeymap {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = BaseKeymapSetting;
 
     fn load(
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 7e567cc085..8a50b1afe5 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -21,12 +21,12 @@ pub use keymap_file::{
 pub use settings_file::*;
 pub use settings_json::*;
 pub use settings_store::{
-    InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation, SettingsSources,
-    SettingsStore,
+    InvalidSettingsError, LocalSettingsKind, Settings, SettingsKey, SettingsLocation,
+    SettingsSources, SettingsStore,
 };
 pub use settings_ui_core::*;
 // Re-export the derive macro
-pub use settings_ui_macros::SettingsUi;
+pub use settings_ui_macros::{SettingsKey, SettingsUi};
 pub use vscode_import::{VsCodeSettings, VsCodeSettingsSource};
 
 #[derive(Clone, Debug, PartialEq)]
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 72df08d14f..cc0ebf10cd 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -36,17 +36,19 @@ use crate::{
     settings_ui_core::SettingsUi, update_value_in_json_text,
 };
 
-/// A value that can be defined as a user setting.
-///
-/// Settings can be loaded from a combination of multiple JSON files.
-pub trait Settings: 'static + Send + Sync {
+pub trait SettingsKey: 'static + Send + Sync {
     /// The name of a key within the JSON file from which this setting should
     /// be deserialized. If this is `None`, then the setting will be deserialized
     /// from the root object.
     const KEY: Option<&'static str>;
 
     const FALLBACK_KEY: Option<&'static str> = None;
+}
 
+/// A value that can be defined as a user setting.
+///
+/// Settings can be loaded from a combination of multiple JSON files.
+pub trait Settings: 'static + Send + Sync {
     /// The name of the keys in the [`FileContent`](Self::FileContent) that should
     /// always be written to a settings file, even if their value matches the default
     /// value.
@@ -57,8 +59,19 @@ pub trait Settings: 'static + Send + Sync {
     const PRESERVED_KEYS: Option<&'static [&'static str]> = None;
 
     /// The type that is stored in an individual JSON file.
-    type FileContent: Clone + Default + Serialize + DeserializeOwned + JsonSchema + SettingsUi;
+    type FileContent: Clone
+        + Default
+        + Serialize
+        + DeserializeOwned
+        + JsonSchema
+        + SettingsUi
+        + SettingsKey;
 
+    /*
+     *  let path = Settings
+     *
+     *
+     */
     /// The logic for combining together values from one or more JSON files into the
     /// final value for this setting.
     ///
@@ -71,7 +84,7 @@ pub trait Settings: 'static + Send + Sync {
         Self: Sized;
 
     fn missing_default() -> anyhow::Error {
-        anyhow::anyhow!("missing default")
+        anyhow::anyhow!("missing default for: {}", std::any::type_name::<Self>())
     }
 
     /// Use [the helpers in the vscode_import module](crate::vscode_import) to apply known
@@ -1393,7 +1406,7 @@ impl Debug for SettingsStore {
 
 impl<T: Settings> AnySettingValue for SettingValue<T> {
     fn key(&self) -> Option<&'static str> {
-        T::KEY
+        T::FileContent::KEY
     }
 
     fn setting_type_name(&self) -> &'static str {
@@ -1445,16 +1458,21 @@ impl<T: Settings> AnySettingValue for SettingValue<T> {
         mut json: &Value,
     ) -> (Option<&'static str>, Result<DeserializedSetting>) {
         let mut key = None;
-        if let Some(k) = T::KEY {
+        if let Some(k) = T::FileContent::KEY {
             if let Some(value) = json.get(k) {
                 json = value;
                 key = Some(k);
-            } else if let Some((k, value)) = T::FALLBACK_KEY.and_then(|k| Some((k, json.get(k)?))) {
+            } else if let Some((k, value)) =
+                T::FileContent::FALLBACK_KEY.and_then(|k| Some((k, json.get(k)?)))
+            {
                 json = value;
                 key = Some(k);
             } else {
                 let value = T::FileContent::default();
-                return (T::KEY, Ok(DeserializedSetting(Box::new(value))));
+                return (
+                    T::FileContent::KEY,
+                    Ok(DeserializedSetting(Box::new(value))),
+                );
             }
         }
         let value = serde_path_to_error::deserialize::<_, T::FileContent>(json)
@@ -1498,6 +1516,7 @@ impl<T: Settings> AnySettingValue for SettingValue<T> {
                 }
             }
         }
+
         self.global_value
             .as_ref()
             .unwrap_or_else(|| panic!("no default value for setting {}", self.setting_type_name()))
@@ -1570,7 +1589,7 @@ mod tests {
     // This is so the SettingsUi macro can still work properly
     use crate as settings;
     use serde_derive::Deserialize;
-    use settings_ui_macros::SettingsUi;
+    use settings_ui_macros::{SettingsKey, SettingsUi};
     use unindent::Unindent;
 
     #[gpui::test]
@@ -2120,7 +2139,8 @@ mod tests {
         staff: bool,
     }
 
-    #[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
+    #[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+    #[settings_key(key = "user")]
     struct UserSettingsContent {
         name: Option<String>,
         age: Option<u32>,
@@ -2128,7 +2148,6 @@ mod tests {
     }
 
     impl Settings for UserSettings {
-        const KEY: Option<&'static str> = Some("user");
         type FileContent = UserSettingsContent;
 
         fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -2143,12 +2162,37 @@ mod tests {
     #[derive(Debug, Deserialize, PartialEq)]
     struct TurboSetting(bool);
 
+    #[derive(
+        Copy,
+        Clone,
+        PartialEq,
+        Eq,
+        Debug,
+        Default,
+        serde::Serialize,
+        serde::Deserialize,
+        SettingsUi,
+        SettingsKey,
+        JsonSchema,
+    )]
+    #[serde(default)]
+    #[settings_key(None)]
+    pub struct TurboSettingContent {
+        turbo: Option<bool>,
+    }
+
     impl Settings for TurboSetting {
-        const KEY: Option<&'static str> = Some("turbo");
-        type FileContent = bool;
+        type FileContent = TurboSettingContent;
 
         fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
-            sources.json_merge()
+            Ok(Self(
+                sources
+                    .user
+                    .or(sources.server)
+                    .unwrap_or(sources.default)
+                    .turbo
+                    .unwrap_or_default(),
+            ))
         }
 
         fn import_from_vscode(_vscode: &VsCodeSettings, _current: &mut Self::FileContent) {}
@@ -2162,15 +2206,14 @@ mod tests {
         key2: String,
     }
 
-    #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+    #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+    #[settings_key(None)]
     struct MultiKeySettingsJson {
         key1: Option<String>,
         key2: Option<String>,
     }
 
     impl Settings for MultiKeySettings {
-        const KEY: Option<&'static str> = None;
-
         type FileContent = MultiKeySettingsJson;
 
         fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -2200,15 +2243,16 @@ mod tests {
         Hour24,
     }
 
-    #[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, SettingsUi)]
+    #[derive(
+        Clone, Default, Debug, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey,
+    )]
+    #[settings_key(key = "journal")]
     struct JournalSettingsJson {
         pub path: Option<String>,
         pub hour_format: Option<HourFormat>,
     }
 
     impl Settings for JournalSettings {
-        const KEY: Option<&'static str> = Some("journal");
-
         type FileContent = JournalSettingsJson;
 
         fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -2288,7 +2332,10 @@ mod tests {
         );
     }
 
-    #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+    #[derive(
+        Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey,
+    )]
+    #[settings_key(None)]
     struct LanguageSettings {
         #[serde(default)]
         languages: HashMap<String, LanguageSettingEntry>,
@@ -2301,8 +2348,6 @@ mod tests {
     }
 
     impl Settings for LanguageSettings {
-        const KEY: Option<&'static str> = None;
-
         type FileContent = Self;
 
         fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index c98705d5f8..1895083508 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -43,10 +43,9 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
                     let lit: LitStr = meta.input.parse()?;
                     group_name = Some(lit.value());
                 } else if meta.path.is_ident("path") {
-                    // todo(settings_ui) try get KEY from Settings if possible, and once we do,
-                    // if can get key from settings, throw error if path also passed
+                    // todo(settings_ui) rely entirely on settings_key, remove path attribute
                     if path_name.is_some() {
-                        return Err(meta.error("Only one 'path' can be specified"));
+                        return Err(meta.error("Only one 'path' can be specified, either with `path` in `settings_ui` or with `settings_key`"));
                     }
                     meta.input.parse::<Token![=]>()?;
                     let lit: LitStr = meta.input.parse()?;
@@ -55,6 +54,12 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
                 Ok(())
             })
             .unwrap_or_else(|e| panic!("in #[settings_ui] attribute: {}", e));
+        } else if let Some(settings_key) = parse_setting_key_attr(attr) {
+            // todo(settings_ui) either remove fallback key or handle it here
+            if path_name.is_some() && settings_key.key.is_some() {
+                panic!("Both 'path' and 'settings_key' are specified. Must specify only one");
+            }
+            path_name = settings_key.key;
         }
     }
 
@@ -212,3 +217,126 @@ fn generate_ui_item_body(
         },
     }
 }
+
+struct SettingsKey {
+    key: Option<String>,
+    fallback_key: Option<String>,
+}
+
+fn parse_setting_key_attr(attr: &syn::Attribute) -> Option<SettingsKey> {
+    if !attr.path().is_ident("settings_key") {
+        return None;
+    }
+
+    let mut settings_key = SettingsKey {
+        key: None,
+        fallback_key: None,
+    };
+
+    let mut found_none = false;
+
+    attr.parse_nested_meta(|meta| {
+        if meta.path.is_ident("None") {
+            found_none = true;
+        } else if meta.path.is_ident("key") {
+            if settings_key.key.is_some() {
+                return Err(meta.error("Only one 'group' path can be specified"));
+            }
+            meta.input.parse::<Token![=]>()?;
+            let lit: LitStr = meta.input.parse()?;
+            settings_key.key = Some(lit.value());
+        } else if meta.path.is_ident("fallback_key") {
+            if found_none {
+                return Err(meta.error("Cannot specify 'fallback_key' and 'None'"));
+            }
+
+            if settings_key.fallback_key.is_some() {
+                return Err(meta.error("Only one 'fallback_key' can be specified"));
+            }
+
+            meta.input.parse::<Token![=]>()?;
+            let lit: LitStr = meta.input.parse()?;
+            settings_key.fallback_key = Some(lit.value());
+        }
+        Ok(())
+    })
+    .unwrap_or_else(|e| panic!("in #[settings_key] attribute: {}", e));
+
+    if found_none && settings_key.fallback_key.is_some() {
+        panic!("in #[settings_key] attribute: Cannot specify 'None' and 'fallback_key'");
+    }
+    if found_none && settings_key.key.is_some() {
+        panic!("in #[settings_key] attribute: Cannot specify 'None' and 'key'");
+    }
+    if !found_none && settings_key.key.is_none() {
+        panic!("in #[settings_key] attribute: 'key' must be specified");
+    }
+
+    return Some(settings_key);
+}
+
+#[proc_macro_derive(SettingsKey, attributes(settings_key))]
+pub fn derive_settings_key(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+    let name = &input.ident;
+
+    // Handle generic parameters if present
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let mut settings_key = Option::<SettingsKey>::None;
+
+    for attr in &input.attrs {
+        let parsed_settings_key = parse_setting_key_attr(attr);
+        if parsed_settings_key.is_some() && settings_key.is_some() {
+            panic!("Duplicate #[settings_key] attribute");
+        }
+        settings_key = parsed_settings_key;
+    }
+
+    let Some(SettingsKey { key, fallback_key }) = settings_key else {
+        panic!("Missing #[settings_key] attribute");
+    };
+
+    let key = key.map_or_else(|| quote! {None}, |key| quote! {Some(#key)});
+    let fallback_key = fallback_key.map_or_else(
+        || quote! {None},
+        |fallback_key| quote! {Some(#fallback_key)},
+    );
+
+    let expanded = quote! {
+        impl #impl_generics settings::SettingsKey for #name #ty_generics #where_clause {
+            const KEY: Option<&'static str> = #key;
+
+            const FALLBACK_KEY: Option<&'static str> = #fallback_key;
+        };
+    };
+
+    proc_macro::TokenStream::from(expanded)
+}
+
+#[cfg(test)]
+mod tests {
+    use syn::{Attribute, parse_quote};
+
+    use super::*;
+
+    #[test]
+    fn test_extract_key() {
+        let input: Attribute = parse_quote!(
+            #[settings_key(key = "my_key")]
+        );
+        let settings_key = parse_setting_key_attr(&input).unwrap();
+        assert_eq!(settings_key.key, Some("my_key".to_string()));
+        assert_eq!(settings_key.fallback_key, None);
+    }
+
+    #[test]
+    fn test_empty_key() {
+        let input: Attribute = parse_quote!(
+            #[settings_key(None)]
+        );
+        let settings_key = parse_setting_key_attr(&input).unwrap();
+        assert_eq!(settings_key.key, None);
+        assert_eq!(settings_key.fallback_key, None);
+    }
+}
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index c3051e089c..0ab92a0f26 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -6,7 +6,7 @@ use gpui::{AbsoluteLength, App, FontFallbacks, FontFeatures, FontWeight, Pixels,
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
 
-use settings::{SettingsSources, SettingsUi};
+use settings::{SettingsKey, SettingsSources, SettingsUi};
 use std::path::PathBuf;
 use task::Shell;
 use theme::FontFamilyName;
@@ -135,7 +135,8 @@ pub enum ActivateScript {
     Pyenv,
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "terminal")]
 pub struct TerminalSettingsContent {
     /// What shell to use when opening a terminal.
     ///
@@ -253,8 +254,6 @@ pub struct TerminalSettingsContent {
 }
 
 impl settings::Settings for TerminalSettings {
-    const KEY: Option<&'static str> = Some("terminal");
-
     type FileContent = TerminalSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 825176a2a0..8409c60b22 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -13,7 +13,7 @@ use gpui::{
 use refineable::Refineable;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
-use settings::{ParameterizedJsonSchema, Settings, SettingsSources, SettingsUi};
+use settings::{ParameterizedJsonSchema, Settings, SettingsKey, SettingsSources, SettingsUi};
 use std::sync::Arc;
 use util::ResultExt as _;
 use util::schemars::replace_subschema;
@@ -366,7 +366,8 @@ impl IconThemeSelection {
 }
 
 /// Settings for rendering text in UI and text buffers.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct ThemeSettingsContent {
     /// The default font size for text in the UI.
     #[serde(default)]
@@ -818,8 +819,6 @@ fn clamp_font_weight(weight: f32) -> FontWeight {
 }
 
 impl settings::Settings for ThemeSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = ThemeSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, cx: &mut App) -> Result<Self> {
diff --git a/crates/title_bar/src/title_bar_settings.rs b/crates/title_bar/src/title_bar_settings.rs
index 0dc301f7ee..38e529098b 100644
--- a/crates/title_bar/src/title_bar_settings.rs
+++ b/crates/title_bar/src/title_bar_settings.rs
@@ -1,7 +1,7 @@
 use db::anyhow;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Copy, Clone, Deserialize, Debug)]
 pub struct TitleBarSettings {
@@ -14,8 +14,11 @@ pub struct TitleBarSettings {
     pub show_menus: bool,
 }
 
-#[derive(Copy, Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
-#[settings_ui(group = "Title Bar", path = "title_bar")]
+#[derive(
+    Copy, Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey,
+)]
+#[settings_ui(group = "Title Bar")]
+#[settings_key(key = "title_bar")]
 pub struct TitleBarSettingsContent {
     /// Whether to show the branch icon beside branch switcher in the title bar.
     ///
@@ -48,8 +51,6 @@ pub struct TitleBarSettingsContent {
 }
 
 impl Settings for TitleBarSettings {
-    const KEY: Option<&'static str> = Some("title_bar");
-
     type FileContent = TitleBarSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut gpui::App) -> anyhow::Result<Self>
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index ef9588acae..4f1173a188 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -68,7 +68,7 @@ impl VimTestContext {
 
     pub fn init_keybindings(enabled: bool, cx: &mut App) {
         SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings::<VimModeSetting>(cx, |s| *s = Some(enabled));
+            store.update_user_settings::<VimModeSetting>(cx, |s| s.vim_mode = Some(enabled));
         });
         let default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
             "keymaps/default-macos.json",
@@ -134,7 +134,7 @@ impl VimTestContext {
     pub fn enable_vim(&mut self) {
         self.cx.update(|_, cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<VimModeSetting>(cx, |s| *s = Some(true));
+                store.update_user_settings::<VimModeSetting>(cx, |s| s.vim_mode = Some(true));
             });
         })
     }
@@ -142,7 +142,7 @@ impl VimTestContext {
     pub fn disable_vim(&mut self) {
         self.cx.update(|_, cx| {
             SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<VimModeSetting>(cx, |s| *s = Some(false));
+                store.update_user_settings::<VimModeSetting>(cx, |s| s.vim_mode = Some(false));
             });
         })
     }
@@ -151,7 +151,7 @@ impl VimTestContext {
         self.cx.update(|_, cx| {
             SettingsStore::update_global(cx, |store, cx| {
                 store.update_user_settings::<vim_mode_setting::HelixModeSetting>(cx, |s| {
-                    *s = Some(true)
+                    s.helix_mode = Some(true)
                 });
             });
         })
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 5a4ac42518..f4f8de2e78 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -39,7 +39,9 @@ use object::Object;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde_derive::Serialize;
-use settings::{Settings, SettingsSources, SettingsStore, SettingsUi, update_settings_file};
+use settings::{
+    Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi, update_settings_file,
+};
 use state::{Mode, Operator, RecordedSelection, SearchState, VimGlobals};
 use std::{mem, ops::Range, sync::Arc};
 use surrounds::SurroundsType;
@@ -247,7 +249,7 @@ pub fn init(cx: &mut App) {
             let fs = workspace.app_state().fs.clone();
             let currently_enabled = Vim::enabled(cx);
             update_settings_file::<VimModeSetting>(fs, cx, move |setting, _| {
-                *setting = Some(!currently_enabled)
+                setting.vim_mode = Some(!currently_enabled)
             })
         });
 
@@ -1785,7 +1787,8 @@ struct VimSettings {
     pub cursor_shape: CursorShapeSettings,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "vim")]
 struct VimSettingsContent {
     pub default_mode: Option<ModeContent>,
     pub toggle_relative_line_numbers: Option<bool>,
@@ -1824,8 +1827,6 @@ impl From<ModeContent> for Mode {
 }
 
 impl Settings for VimSettings {
-    const KEY: Option<&'static str> = Some("vim");
-
     type FileContent = VimSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/vim_mode_setting/Cargo.toml b/crates/vim_mode_setting/Cargo.toml
index fbb7f30b4c..61d265b958 100644
--- a/crates/vim_mode_setting/Cargo.toml
+++ b/crates/vim_mode_setting/Cargo.toml
@@ -14,5 +14,7 @@ path = "src/vim_mode_setting.rs"
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+schemars.workspace = true
+serde.workspace = true
 settings.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/vim_mode_setting/src/vim_mode_setting.rs b/crates/vim_mode_setting/src/vim_mode_setting.rs
index 7fb39ef4f6..660520a307 100644
--- a/crates/vim_mode_setting/src/vim_mode_setting.rs
+++ b/crates/vim_mode_setting/src/vim_mode_setting.rs
@@ -6,7 +6,8 @@
 
 use anyhow::Result;
 use gpui::App;
-use settings::{Settings, SettingsSources, SettingsUi};
+use schemars::JsonSchema;
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 /// Initializes the `vim_mode_setting` crate.
 pub fn init(cx: &mut App) {
@@ -14,25 +15,40 @@ pub fn init(cx: &mut App) {
     HelixModeSetting::register(cx);
 }
 
-/// Whether or not to enable Vim mode.
-///
-/// Default: false
-#[derive(SettingsUi)]
 pub struct VimModeSetting(pub bool);
 
-impl Settings for VimModeSetting {
-    const KEY: Option<&'static str> = Some("vim_mode");
+#[derive(
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    Debug,
+    Default,
+    serde::Serialize,
+    serde::Deserialize,
+    SettingsUi,
+    SettingsKey,
+    JsonSchema,
+)]
+#[settings_key(None)]
+pub struct VimModeSettingContent {
+    /// Whether or not to enable Vim mode.
+    ///
+    /// Default: false
+    pub vim_mode: Option<bool>,
+}
 
-    type FileContent = Option<bool>;
+impl Settings for VimModeSetting {
+    type FileContent = VimModeSettingContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         Ok(Self(
             sources
                 .user
-                .or(sources.server)
-                .copied()
-                .flatten()
-                .unwrap_or(sources.default.ok_or_else(Self::missing_default)?),
+                .and_then(|mode| mode.vim_mode)
+                .or(sources.server.and_then(|mode| mode.vim_mode))
+                .or(sources.default.vim_mode)
+                .ok_or_else(Self::missing_default)?,
         ))
     }
 
@@ -41,25 +57,41 @@ impl Settings for VimModeSetting {
     }
 }
 
-/// Whether or not to enable Helix mode.
-///
-/// Default: false
-#[derive(SettingsUi)]
+#[derive(Debug)]
 pub struct HelixModeSetting(pub bool);
 
-impl Settings for HelixModeSetting {
-    const KEY: Option<&'static str> = Some("helix_mode");
+#[derive(
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    Debug,
+    Default,
+    serde::Serialize,
+    serde::Deserialize,
+    SettingsUi,
+    SettingsKey,
+    JsonSchema,
+)]
+#[settings_key(None)]
+pub struct HelixModeSettingContent {
+    /// Whether or not to enable Helix mode.
+    ///
+    /// Default: false
+    pub helix_mode: Option<bool>,
+}
 
-    type FileContent = Option<bool>;
+impl Settings for HelixModeSetting {
+    type FileContent = HelixModeSettingContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         Ok(Self(
             sources
                 .user
-                .or(sources.server)
-                .copied()
-                .flatten()
-                .unwrap_or(sources.default.ok_or_else(Self::missing_default)?),
+                .and_then(|mode| mode.helix_mode)
+                .or(sources.server.and_then(|mode| mode.helix_mode))
+                .or(sources.default.helix_mode)
+                .ok_or_else(Self::missing_default)?,
         ))
     }
 
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index f37be0f154..23fbec470c 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -17,7 +17,7 @@ use gpui::{
 use project::{Project, ProjectEntryId, ProjectPath};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsLocation, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsLocation, SettingsSources, SettingsUi};
 use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId},
@@ -101,7 +101,8 @@ pub enum ActivateOnClose {
     LeftNeighbour,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "tabs")]
 pub struct ItemSettingsContent {
     /// Whether to show the Git file status on a tab item.
     ///
@@ -130,7 +131,8 @@ pub struct ItemSettingsContent {
     show_close_button: Option<ShowCloseButton>,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "preview_tabs")]
 pub struct PreviewTabsSettingsContent {
     /// Whether to show opened editors as preview tabs.
     /// Preview tabs do not stay open, are reused until explicitly set to be kept open opened (via double-click or editing) and show file names in italic.
@@ -148,8 +150,6 @@ pub struct PreviewTabsSettingsContent {
 }
 
 impl Settings for ItemSettings {
-    const KEY: Option<&'static str> = Some("tabs");
-
     type FileContent = ItemSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -187,8 +187,6 @@ impl Settings for ItemSettings {
 }
 
 impl Settings for PreviewTabsSettings {
-    const KEY: Option<&'static str> = Some("preview_tabs");
-
     type FileContent = PreviewTabsSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 1a7e548e4e..8868f31905 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -6,7 +6,7 @@ use collections::HashMap;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 
 #[derive(Deserialize)]
 pub struct WorkspaceSettings {
@@ -118,7 +118,8 @@ pub enum RestoreOnStartupBehavior {
     LastSession,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct WorkspaceSettingsContent {
     /// Active pane styling settings.
     pub active_pane_modifiers: Option<ActivePanelModifiers>,
@@ -223,7 +224,8 @@ pub struct TabBarSettings {
     pub show_tab_bar_buttons: bool,
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(key = "tab_bar")]
 pub struct TabBarSettingsContent {
     /// Whether or not to show the tab bar in the editor.
     ///
@@ -282,8 +284,6 @@ pub struct CenteredLayoutSettings {
 }
 
 impl Settings for WorkspaceSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = WorkspaceSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -373,8 +373,6 @@ impl Settings for WorkspaceSettings {
 }
 
 impl Settings for TabBarSettings {
-    const KEY: Option<&'static str> = Some("tab_bar");
-
     type FileContent = TabBarSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
index 6a8e2b5d89..41eb3ab6f6 100644
--- a/crates/worktree/src/worktree_settings.rs
+++ b/crates/worktree/src/worktree_settings.rs
@@ -4,7 +4,7 @@ use anyhow::Context as _;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
 use util::paths::PathMatcher;
 
 #[derive(Clone, PartialEq, Eq)]
@@ -31,7 +31,8 @@ impl WorktreeSettings {
     }
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
+#[settings_key(None)]
 pub struct WorktreeSettingsContent {
     /// Completely ignore files matching globs from `file_scan_exclusions`. Overrides
     /// `file_scan_inclusions`.
@@ -65,8 +66,6 @@ pub struct WorktreeSettingsContent {
 }
 
 impl Settings for WorktreeSettings {
-    const KEY: Option<&'static str> = None;
-
     type FileContent = WorktreeSettingsContent;
 
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
diff --git a/crates/zlog_settings/src/zlog_settings.rs b/crates/zlog_settings/src/zlog_settings.rs
index 0cdc784489..dd74fc574f 100644
--- a/crates/zlog_settings/src/zlog_settings.rs
+++ b/crates/zlog_settings/src/zlog_settings.rs
@@ -3,7 +3,7 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsStore, SettingsUi};
 
 pub fn init(cx: &mut App) {
     ZlogSettings::register(cx);
@@ -15,15 +15,25 @@ pub fn init(cx: &mut App) {
     .detach();
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
+#[derive(
+    Clone,
+    Debug,
+    Default,
+    Serialize,
+    Deserialize,
+    PartialEq,
+    Eq,
+    JsonSchema,
+    SettingsUi,
+    SettingsKey,
+)]
+#[settings_key(key = "log")]
 pub struct ZlogSettings {
     #[serde(default, flatten)]
     pub scopes: std::collections::HashMap<String, String>,
 }
 
 impl Settings for ZlogSettings {
-    const KEY: Option<&'static str> = Some("log");
-
     type FileContent = Self;
 
     fn load(sources: settings::SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self>

From c2fa9d79814c2124da0d4f8a0c3dfcf075505ac0 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 15:25:52 -0400
Subject: [PATCH 613/823] docs: Add configuration example for
 `simple-completion-language-server` (#37566)

This PR adds a configuration example for the
`simple-completion-language-server`.

We show the user how to re-enable the `feature_paths` option, as we're
now disabling it by default
(https://github.com/zed-industries/zed/pull/37565).

Release Notes:

- N/A
---
 docs/src/snippets.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/src/snippets.md b/docs/src/snippets.md
index 3514d08340..b5d09c6c37 100644
--- a/docs/src/snippets.md
+++ b/docs/src/snippets.md
@@ -40,4 +40,20 @@ To create JSX snippets you have to use `javascript.json` snippets file, instead
 
 ## See also
 
+The `feature_paths` option in `simple-completion-language-server` is disabled by default.
+
+If you want to enable it you can add the following to your `settings.json`:
+
+```json
+{
+  "lsp": {
+    "snippet-completion-server": {
+      "settings": {
+        "feature_paths": true
+      }
+    }
+  }
+}
+```
+
 For more configuration information, see the [`simple-completion-language-server` instructions](https://github.com/zed-industries/simple-completion-language-server/tree/main).

From ccae033d8519cffa7f61a265f05837f2ecf599de Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 4 Sep 2025 22:34:23 +0300
Subject: [PATCH 614/823] Make fallback open picker more intuitive (#37564)

Closes https://github.com/zed-industries/zed/issues/34991

Before, the picker did not allow to open the current directory that was
just completed:

<img width="553" height="354" alt="image"
src="https://github.com/user-attachments/assets/e77793c8-763e-416f-9728-18d5a39b467f"
/>

pressing `enter` here would open `assets`; pressing `tab` would append
the `assets/` segment to the query.
Only backspace, removing `/` would allow to open the current directory.

After:
<img width="574" height="349" alt="image"
src="https://github.com/user-attachments/assets/bdbb3e23-7c7a-4e12-8092-51a6a0ea9f87"
/>

The first item is now a placeholder for opening the current directory
with `enter`.
Any time a fuzzy query is appended, the placeholder goes away; `tab`
selects the entry below the placeholder.

Release Notes:

- Made fallback open picker more intuitive

---------

Co-authored-by: Peter Tripp <petertripp@gmail.com>
Co-authored-by: David Kleingeld <davidsk@zed.dev>
---
 crates/file_finder/src/open_path_prompt.rs    |  66 +++++++++-
 .../file_finder/src/open_path_prompt_tests.rs | 118 ++++++++++++------
 2 files changed, 146 insertions(+), 38 deletions(-)

diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index 4625872e46..51e8f5c437 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -1,7 +1,7 @@
 use crate::file_finder_settings::FileFinderSettings;
 use file_icons::FileIcons;
 use futures::channel::oneshot;
-use fuzzy::{StringMatch, StringMatchCandidate};
+use fuzzy::{CharBag, StringMatch, StringMatchCandidate};
 use gpui::{HighlightStyle, StyledText, Task};
 use picker::{Picker, PickerDelegate};
 use project::{DirectoryItem, DirectoryLister};
@@ -125,6 +125,13 @@ impl OpenPathDelegate {
             DirectoryState::None { .. } => Vec::new(),
         }
     }
+
+    fn current_dir(&self) -> &'static str {
+        match self.path_style {
+            PathStyle::Posix => "./",
+            PathStyle::Windows => ".\\",
+        }
+    }
 }
 
 #[derive(Debug)]
@@ -233,6 +240,7 @@ impl PickerDelegate for OpenPathDelegate {
         cx: &mut Context<Picker<Self>>,
     ) -> Task<()> {
         let lister = &self.lister;
+        let input_is_empty = query.is_empty();
         let (dir, suffix) = get_dir_and_suffix(query, self.path_style);
 
         let query = match &self.directory_state {
@@ -263,6 +271,7 @@ impl PickerDelegate for OpenPathDelegate {
         let cancel_flag = self.cancel_flag.clone();
 
         let parent_path_is_root = self.prompt_root == dir;
+        let current_dir = self.current_dir();
         cx.spawn_in(window, async move |this, cx| {
             if let Some(query) = query {
                 let paths = query.await;
@@ -353,10 +362,38 @@ impl PickerDelegate for OpenPathDelegate {
                 return;
             };
 
+            let mut max_id = 0;
             if !suffix.starts_with('.') {
-                new_entries.retain(|entry| !entry.path.string.starts_with('.'));
+                new_entries.retain(|entry| {
+                    max_id = max_id.max(entry.path.id);
+                    !entry.path.string.starts_with('.')
+                });
             }
+
             if suffix.is_empty() {
+                let should_prepend_with_current_dir = this
+                    .read_with(cx, |picker, _| {
+                        !input_is_empty
+                            && !matches!(
+                                picker.delegate.directory_state,
+                                DirectoryState::Create { .. }
+                            )
+                    })
+                    .unwrap_or(false);
+                if should_prepend_with_current_dir {
+                    new_entries.insert(
+                        0,
+                        CandidateInfo {
+                            path: StringMatchCandidate {
+                                id: max_id + 1,
+                                string: current_dir.to_string(),
+                                char_bag: CharBag::from(current_dir),
+                            },
+                            is_dir: true,
+                        },
+                    );
+                }
+
                 this.update(cx, |this, cx| {
                     this.delegate.selected_index = 0;
                     this.delegate.string_matches = new_entries
@@ -485,6 +522,10 @@ impl PickerDelegate for OpenPathDelegate {
         _: &mut Context<Picker<Self>>,
     ) -> Option<String> {
         let candidate = self.get_entry(self.selected_index)?;
+        if candidate.path.string.is_empty() || candidate.path.string == self.current_dir() {
+            return None;
+        }
+
         let path_style = self.path_style;
         Some(
             maybe!({
@@ -629,12 +670,18 @@ impl PickerDelegate for OpenPathDelegate {
             DirectoryState::None { .. } => Vec::new(),
         };
 
+        let is_current_dir_candidate = candidate.path.string == self.current_dir();
+
         let file_icon = maybe!({
             if !settings.file_icons {
                 return None;
             }
             let icon = if candidate.is_dir {
-                FileIcons::get_folder_icon(false, cx)?
+                if is_current_dir_candidate {
+                    return Some(Icon::new(IconName::ReplyArrowRight).color(Color::Muted));
+                } else {
+                    FileIcons::get_folder_icon(false, cx)?
+                }
             } else {
                 let path = path::Path::new(&candidate.path.string);
                 FileIcons::get_icon(path, cx)?
@@ -652,6 +699,8 @@ impl PickerDelegate for OpenPathDelegate {
                     .child(HighlightedLabel::new(
                         if parent_path == &self.prompt_root {
                             format!("{}{}", self.prompt_root, candidate.path.string)
+                        } else if is_current_dir_candidate {
+                            "open this directory".to_string()
                         } else {
                             candidate.path.string
                         },
@@ -747,6 +796,17 @@ impl PickerDelegate for OpenPathDelegate {
     fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
         Arc::from(format!("[directory{MAIN_SEPARATOR_STR}]filename.ext"))
     }
+
+    fn separators_after_indices(&self) -> Vec<usize> {
+        let Some(m) = self.string_matches.first() else {
+            return Vec::new();
+        };
+        if m.string == self.current_dir() {
+            vec![0]
+        } else {
+            Vec::new()
+        }
+    }
 }
 
 fn path_candidates(
diff --git a/crates/file_finder/src/open_path_prompt_tests.rs b/crates/file_finder/src/open_path_prompt_tests.rs
index a69ac6992d..1f47c4e80a 100644
--- a/crates/file_finder/src/open_path_prompt_tests.rs
+++ b/crates/file_finder/src/open_path_prompt_tests.rs
@@ -43,12 +43,17 @@ async fn test_open_path_prompt(cx: &mut TestAppContext) {
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["root"]);
 
+    #[cfg(not(windows))]
+    let expected_separator = "./";
+    #[cfg(windows)]
+    let expected_separator = ".\\";
+
     // If the query ends with a slash, the picker should show the contents of the directory.
     let query = path!("/root/");
     insert_query(query, &picker, cx).await;
     assert_eq!(
         collect_match_candidates(&picker, cx),
-        vec!["a1", "a2", "a3", "dir1", "dir2"]
+        vec![expected_separator, "a1", "a2", "a3", "dir1", "dir2"]
     );
 
     // Show candidates for the query "a".
@@ -72,7 +77,7 @@ async fn test_open_path_prompt(cx: &mut TestAppContext) {
     insert_query(query, &picker, cx).await;
     assert_eq!(
         collect_match_candidates(&picker, cx),
-        vec!["c", "d1", "d2", "d3", "dir3", "dir4"]
+        vec![expected_separator, "c", "d1", "d2", "d3", "dir3", "dir4"]
     );
 
     // Show candidates for the query "d".
@@ -116,71 +121,86 @@ async fn test_open_path_prompt_completion(cx: &mut TestAppContext) {
     // Confirm completion for the query "/root", since it's a directory, it should add a trailing slash.
     let query = path!("/root");
     insert_query(query, &picker, cx).await;
-    assert_eq!(confirm_completion(query, 0, &picker, cx), path!("/root/"));
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx).unwrap(),
+        path!("/root/")
+    );
 
     // Confirm completion for the query "/root/", selecting the first candidate "a", since it's a file, it should not add a trailing slash.
     let query = path!("/root/");
     insert_query(query, &picker, cx).await;
-    assert_eq!(confirm_completion(query, 0, &picker, cx), path!("/root/a"));
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx),
+        None,
+        "First entry is `./` and when we confirm completion, it is tabbed below"
+    );
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        path!("/root/a"),
+        "Second entry is the first entry of a directory that we want to be completed"
+    );
 
     // Confirm completion for the query "/root/", selecting the second candidate "dir1", since it's a directory, it should add a trailing slash.
     let query = path!("/root/");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 1, &picker, cx),
+        confirm_completion(query, 2, &picker, cx).unwrap(),
         path!("/root/dir1/")
     );
 
     let query = path!("/root/a");
     insert_query(query, &picker, cx).await;
-    assert_eq!(confirm_completion(query, 0, &picker, cx), path!("/root/a"));
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx).unwrap(),
+        path!("/root/a")
+    );
 
     let query = path!("/root/d");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 1, &picker, cx),
+        confirm_completion(query, 1, &picker, cx).unwrap(),
         path!("/root/dir2/")
     );
 
     let query = path!("/root/dir2");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 0, &picker, cx),
+        confirm_completion(query, 0, &picker, cx).unwrap(),
         path!("/root/dir2/")
     );
 
     let query = path!("/root/dir2/");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 0, &picker, cx),
+        confirm_completion(query, 1, &picker, cx).unwrap(),
         path!("/root/dir2/c")
     );
 
     let query = path!("/root/dir2/");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 2, &picker, cx),
+        confirm_completion(query, 3, &picker, cx).unwrap(),
         path!("/root/dir2/dir3/")
     );
 
     let query = path!("/root/dir2/d");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 0, &picker, cx),
+        confirm_completion(query, 0, &picker, cx).unwrap(),
         path!("/root/dir2/d")
     );
 
     let query = path!("/root/dir2/d");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 1, &picker, cx),
+        confirm_completion(query, 1, &picker, cx).unwrap(),
         path!("/root/dir2/dir3/")
     );
 
     let query = path!("/root/dir2/di");
     insert_query(query, &picker, cx).await;
     assert_eq!(
-        confirm_completion(query, 1, &picker, cx),
+        confirm_completion(query, 1, &picker, cx).unwrap(),
         path!("/root/dir2/dir4/")
     );
 }
@@ -211,42 +231,63 @@ async fn test_open_path_prompt_on_windows(cx: &mut TestAppContext) {
     insert_query(query, &picker, cx).await;
     assert_eq!(
         collect_match_candidates(&picker, cx),
-        vec!["a", "dir1", "dir2"]
+        vec![".\\", "a", "dir1", "dir2"]
+    );
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx),
+        None,
+        "First entry is `.\\` and when we confirm completion, it is tabbed below"
+    );
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        "C:/root/a",
+        "Second entry is the first entry of a directory that we want to be completed"
     );
-    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:/root/a");
 
     let query = "C:\\root/";
     insert_query(query, &picker, cx).await;
     assert_eq!(
         collect_match_candidates(&picker, cx),
-        vec!["a", "dir1", "dir2"]
+        vec![".\\", "a", "dir1", "dir2"]
+    );
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        "C:\\root/a"
     );
-    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:\\root/a");
 
     let query = "C:\\root\\";
     insert_query(query, &picker, cx).await;
     assert_eq!(
         collect_match_candidates(&picker, cx),
-        vec!["a", "dir1", "dir2"]
+        vec![".\\", "a", "dir1", "dir2"]
+    );
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        "C:\\root\\a"
     );
-    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:\\root\\a");
 
     // Confirm completion for the query "C:/root/d", selecting the second candidate "dir2", since it's a directory, it should add a trailing slash.
     let query = "C:/root/d";
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(confirm_completion(query, 1, &picker, cx), "C:/root/dir2\\");
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        "C:/root/dir2\\"
+    );
 
     let query = "C:\\root/d";
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:\\root/dir1\\");
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx).unwrap(),
+        "C:\\root/dir1\\"
+    );
 
     let query = "C:\\root\\d";
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
     assert_eq!(
-        confirm_completion(query, 0, &picker, cx),
+        confirm_completion(query, 0, &picker, cx).unwrap(),
         "C:\\root\\dir1\\"
     );
 }
@@ -276,20 +317,29 @@ async fn test_open_path_prompt_on_windows_with_remote(cx: &mut TestAppContext) {
     insert_query(query, &picker, cx).await;
     assert_eq!(
         collect_match_candidates(&picker, cx),
-        vec!["a", "dir1", "dir2"]
+        vec!["./", "a", "dir1", "dir2"]
+    );
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        "/root/a"
     );
-    assert_eq!(confirm_completion(query, 0, &picker, cx), "/root/a");
 
     // Confirm completion for the query "/root/d", selecting the second candidate "dir2", since it's a directory, it should add a trailing slash.
     let query = "/root/d";
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(confirm_completion(query, 1, &picker, cx), "/root/dir2/");
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx).unwrap(),
+        "/root/dir2/"
+    );
 
     let query = "/root/d";
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(confirm_completion(query, 0, &picker, cx), "/root/dir1/");
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx).unwrap(),
+        "/root/dir1/"
+    );
 }
 
 #[gpui::test]
@@ -396,15 +446,13 @@ fn confirm_completion(
     select: usize,
     picker: &Entity<Picker<OpenPathDelegate>>,
     cx: &mut VisualTestContext,
-) -> String {
-    picker
-        .update_in(cx, |f, window, cx| {
-            if f.delegate.selected_index() != select {
-                f.delegate.set_selected_index(select, window, cx);
-            }
-            f.delegate.confirm_completion(query.to_string(), window, cx)
-        })
-        .unwrap()
+) -> Option<String> {
+    picker.update_in(cx, |f, window, cx| {
+        if f.delegate.selected_index() != select {
+            f.delegate.set_selected_index(select, window, cx);
+        }
+        f.delegate.confirm_completion(query.to_string(), window, cx)
+    })
 }
 
 fn collect_match_candidates(

From 4c32d5bf138171a52b00dc5f2be233c718c800ae Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 15:35:48 -0400
Subject: [PATCH 615/823] snippets: Disable `feature_paths` by default (#37565)

This PR updates the default configuration of the `snippets` extension to
disable suggesting paths (`feature_paths`).

If users want to enable it, it can be done via the settings:

```json
{
  "lsp": {
    "snippet-completion-server": {
      "settings": {
        "feature_paths": true
      }
    }
  }
}
```

Release Notes:

- N/A
---
 extensions/snippets/src/snippets.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/snippets/src/snippets.rs b/extensions/snippets/src/snippets.rs
index 05e1ebca38..1efe4c2340 100644
--- a/extensions/snippets/src/snippets.rs
+++ b/extensions/snippets/src/snippets.rs
@@ -120,7 +120,9 @@ impl zed::Extension for SnippetExtension {
                     "snippets_first": true,
                     "feature_words": false,
                     "feature_snippets": true,
-                    "feature_paths": true
+                    // We disable `feature_paths` by default, because it's bad UX to assume that any `/` that is typed
+                    // is the start of a path.
+                    "feature_paths": false
                 })
             });
         Ok(Some(settings))

From 1b865a60f854eb7dbc0aad98718d1785adceb8b6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 4 Sep 2025 16:08:49 -0400
Subject: [PATCH 616/823] snippets: Bump to v0.0.6 (#37567)

This PR bumps the snippets extension to v0.0.6.

Changes:

- https://github.com/zed-industries/zed/pull/37565

Release Notes:

- N/A
---
 Cargo.lock                         | 2 +-
 extensions/snippets/Cargo.toml     | 2 +-
 extensions/snippets/extension.toml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a99c59a189..c5e6c85881 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20642,7 +20642,7 @@ dependencies = [
 
 [[package]]
 name = "zed_snippets"
-version = "0.0.5"
+version = "0.0.6"
 dependencies = [
  "serde_json",
  "zed_extension_api 0.1.0",
diff --git a/extensions/snippets/Cargo.toml b/extensions/snippets/Cargo.toml
index 80a3d4f31e..ab5ac7244a 100644
--- a/extensions/snippets/Cargo.toml
+++ b/extensions/snippets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zed_snippets"
-version = "0.0.5"
+version = "0.0.6"
 edition.workspace = true
 publish.workspace = true
 license = "Apache-2.0"
diff --git a/extensions/snippets/extension.toml b/extensions/snippets/extension.toml
index c2b4178a61..01dc587d77 100644
--- a/extensions/snippets/extension.toml
+++ b/extensions/snippets/extension.toml
@@ -1,9 +1,9 @@
 id = "snippets"
 name = "Snippets"
 description = "Support for language-agnostic snippets, provided by simple-completion-language-server"
-version = "0.0.5"
+version = "0.0.6"
 schema_version = 1
-authors = []
+authors = ["Zed Industries <hi@zed.dev>"]
 repository = "https://github.com/zed-industries/zed"
 
 [language_servers.snippet-completion-server]

From e982cb824a94abc32392861c0753373a8df1684e Mon Sep 17 00:00:00 2001
From: morgankrey <morgan@zed.dev>
Date: Thu, 4 Sep 2025 15:57:00 -0500
Subject: [PATCH 617/823] docs: Claude Authentication (#37573)

Release Notes:

- N/A
---
 docs/src/ai/agent-panel.md     | 2 +-
 docs/src/ai/external-agents.md | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
index ce91ca3401..b6b748e2f5 100644
--- a/docs/src/ai/agent-panel.md
+++ b/docs/src/ai/agent-panel.md
@@ -23,7 +23,7 @@ From this point on, you can interact with the many supported features outlined b
 
 > Note that for external agents, like [Gemini CLI](./external-agents.md#gemini-cli) or [Claude Code](./external-agents.md#claude-code), some of the features outlined below are _not_ currently supported—for example, _restoring threads from history_, _checkpoints_, _token usage display_, _model selection_, and others. All of them should hopefully be supported in the future.
 
-### Creating New Threads
+### Creating New Threads {#new-thread}
 
 By default, the Agent Panel uses Zed's first-party agent.
 
diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index 963e41d42f..e05849ef1a 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -85,6 +85,12 @@ If you'd like to bind this to a keyboard shortcut, you can do so by editing your
 ]
 ```
 
+### Authentication
+
+As of version `0.202.7` (stable) and `0.203.2` (preview), authentication to Zed's Claude Code installation is decoupled entirely from Zed's agent. That is to say, an Anthropic API key added via the [Zed Agent's settings](./llm-providers.md#anthropic) will _not_ be utilized by Claude Code for authentication and billing.
+
+To ensure you're using your billing method of choice, [open a new Claude Code thread](./agent-panel.md#new-thread)`. Then, run `/login`, and authenticate either via API key, or via `Log in with Claude Code` to use a Claude Pro/Max subscription.
+
 #### Installation
 
 The first time you create a Claude Code thread, Zed will install [@zed-industries/claude-code-acp](https://github.com/zed-industries/claude-code-acp). This installation is only available to Zed and is kept up to date as you use the agent.

From 3c0183fa5e8fda26d300974a19ae229e251ed4fa Mon Sep 17 00:00:00 2001
From: morgankrey <morgan@zed.dev>
Date: Thu, 4 Sep 2025 16:14:57 -0500
Subject: [PATCH 618/823] Extraneous backtick (#37576)

Release Notes:

- N/A
---
 docs/src/ai/external-agents.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
index e05849ef1a..bc7768c608 100644
--- a/docs/src/ai/external-agents.md
+++ b/docs/src/ai/external-agents.md
@@ -89,7 +89,7 @@ If you'd like to bind this to a keyboard shortcut, you can do so by editing your
 
 As of version `0.202.7` (stable) and `0.203.2` (preview), authentication to Zed's Claude Code installation is decoupled entirely from Zed's agent. That is to say, an Anthropic API key added via the [Zed Agent's settings](./llm-providers.md#anthropic) will _not_ be utilized by Claude Code for authentication and billing.
 
-To ensure you're using your billing method of choice, [open a new Claude Code thread](./agent-panel.md#new-thread)`. Then, run `/login`, and authenticate either via API key, or via `Log in with Claude Code` to use a Claude Pro/Max subscription.
+To ensure you're using your billing method of choice, [open a new Claude Code thread](./agent-panel.md#new-thread). Then, run `/login`, and authenticate either via API key, or via `Log in with Claude Code` to use a Claude Pro/Max subscription.
 
 #### Installation
 

From c7902478c18a42138c6129aa3fc50aa0165337c8 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 4 Sep 2025 18:16:25 -0400
Subject: [PATCH 619/823] acp: Pass project environment to external agent
 servers (#37568)

Closes #37469

Release Notes:

- agent: The project shell environment is now passed to external agent
processes.

Co-authored-by: Richard Feldman <oss@rtfeldman.com>
Co-authored-by: Nia Espera <nia-e@haecceity.cc>
---
 crates/agent_servers/src/claude.rs |  9 +++++++++
 crates/agent_servers/src/gemini.rs | 14 ++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 48d3e33775..15352ce216 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -80,8 +80,15 @@ impl AgentServer for ClaudeCode {
         let settings = cx.read_global(|settings: &SettingsStore, _| {
             settings.get::<AllAgentServersSettings>(None).claude.clone()
         });
+        let project = delegate.project().clone();
 
         cx.spawn(async move |cx| {
+            let mut project_env = project
+                .update(cx, |project, cx| {
+                    project.directory_environment(root_dir.as_path().into(), cx)
+                })?
+                .await
+                .unwrap_or_default();
             let mut command = if let Some(settings) = settings {
                 settings.command
             } else {
@@ -97,6 +104,8 @@ impl AgentServer for ClaudeCode {
                 })?
                 .await?
             };
+            project_env.extend(command.env.take().unwrap_or_default());
+            command.env = Some(project_env);
 
             command
                 .env
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index b58ad703cd..7e40d85767 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -41,12 +41,19 @@ impl AgentServer for Gemini {
         let settings = cx.read_global(|settings: &SettingsStore, _| {
             settings.get::<AllAgentServersSettings>(None).gemini.clone()
         });
+        let project = delegate.project().clone();
 
         cx.spawn(async move |cx| {
             let ignore_system_version = settings
                 .as_ref()
                 .and_then(|settings| settings.ignore_system_version)
                 .unwrap_or(true);
+            let mut project_env = project
+                .update(cx, |project, cx| {
+                    project.directory_environment(root_dir.as_path().into(), cx)
+                })?
+                .await
+                .unwrap_or_default();
             let mut command = if let Some(settings) = settings
                 && let Some(command) = settings.custom_command()
             {
@@ -67,13 +74,12 @@ impl AgentServer for Gemini {
             if !command.args.contains(&ACP_ARG.into()) {
                 command.args.push(ACP_ARG.into());
             }
-
             if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
-                command
-                    .env
-                    .get_or_insert_default()
+                project_env
                     .insert("GEMINI_API_KEY".to_owned(), api_key.key);
             }
+            project_env.extend(command.env.take().unwrap_or_default());
+            command.env = Some(project_env);
 
             let root_dir_exists = fs.is_dir(&root_dir).await;
             anyhow::ensure!(

From 0cb8a8983cef1f3e015fa0f2fc37e8325f3d201d Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 4 Sep 2025 18:30:48 -0400
Subject: [PATCH 620/823] settings ui: Improve setting proc macro and add
 scroll to UI (#37581)

This PR improves the settings_ui proc macro by taking into account more
serde attributes
1. rename_all
2. rename
3. flatten

We also pass field documentation to the UI layer now too. This allows ui
elements to have more information like the switch field description.

We got the scrollbar working and started getting language settings to
show up.

Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
---
 crates/editor/src/editor_settings.rs          |   1 +
 crates/language/src/language_settings.rs      |  38 ++--
 crates/settings/src/settings_ui_core.rs       |   9 +
 crates/settings_ui/src/settings_ui.rs         | 121 ++++++++-----
 .../src/settings_ui_macros.rs                 | 170 +++++++++++++++---
 5 files changed, 257 insertions(+), 82 deletions(-)

diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index d74244131e..7f4d024e57 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -748,6 +748,7 @@ pub struct ScrollbarAxesContent {
 #[derive(
     Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi,
 )]
+#[settings_ui(group = "Gutter")]
 pub struct GutterContent {
     /// Whether to show line numbers in the gutter.
     ///
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 3443ccf592..cb519e32ec 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -208,7 +208,9 @@ impl LanguageSettings {
 }
 
 /// The provider that supplies edit predictions.
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum EditPredictionProvider {
     None,
@@ -231,13 +233,14 @@ impl EditPredictionProvider {
 
 /// The settings for edit predictions, such as [GitHub Copilot](https://github.com/features/copilot)
 /// or [Supermaven](https://supermaven.com).
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug, Default, SettingsUi)]
 pub struct EditPredictionSettings {
     /// The provider that supplies edit predictions.
     pub provider: EditPredictionProvider,
     /// A list of globs representing files that edit predictions should be disabled for.
     /// This list adds to a pre-existing, sensible default set of globs.
     /// Any additional ones you add are combined with them.
+    #[settings_ui(skip)]
     pub disabled_globs: Vec<DisabledGlob>,
     /// Configures how edit predictions are displayed in the buffer.
     pub mode: EditPredictionsMode,
@@ -269,7 +272,9 @@ pub struct DisabledGlob {
 }
 
 /// The mode in which edit predictions should be displayed.
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(
+    Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum EditPredictionsMode {
     /// If provider supports it, display inline when holding modifier key (e.g., alt).
@@ -282,13 +287,15 @@ pub enum EditPredictionsMode {
     Eager,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug, Default, SettingsUi)]
 pub struct CopilotSettings {
     /// HTTP/HTTPS proxy to use for Copilot.
+    #[settings_ui(skip)]
     pub proxy: Option<String>,
     /// Disable certificate verification for proxy (not recommended).
     pub proxy_no_verify: Option<bool>,
     /// Enterprise URI for Copilot.
+    #[settings_ui(skip)]
     pub enterprise_uri: Option<String>,
 }
 
@@ -297,6 +304,7 @@ pub struct CopilotSettings {
     Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey,
 )]
 #[settings_key(None)]
+#[settings_ui(group = "Default Language Settings")]
 pub struct AllLanguageSettingsContent {
     /// The settings for enabling/disabling features.
     #[serde(default)]
@@ -309,10 +317,12 @@ pub struct AllLanguageSettingsContent {
     pub defaults: LanguageSettingsContent,
     /// The settings for individual languages.
     #[serde(default)]
+    #[settings_ui(skip)]
     pub languages: LanguageToSettingsMap,
     /// Settings for associating file extensions and filenames
     /// with languages.
     #[serde(default)]
+    #[settings_ui(skip)]
     pub file_types: HashMap<Arc<str>, Vec<String>>,
 }
 
@@ -345,7 +355,7 @@ inventory::submit! {
 }
 
 /// Controls how completions are processed for this language.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub struct CompletionSettings {
     /// Controls how words are completed.
@@ -420,7 +430,7 @@ fn default_3() -> usize {
 }
 
 /// The settings for a particular language.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct LanguageSettingsContent {
     /// How many columns a tab should occupy.
     ///
@@ -617,12 +627,13 @@ pub enum RewrapBehavior {
 }
 
 /// The contents of the edit prediction settings.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, SettingsUi)]
 pub struct EditPredictionSettingsContent {
     /// A list of globs representing files that edit predictions should be disabled for.
     /// This list adds to a pre-existing, sensible default set of globs.
     /// Any additional ones you add are combined with them.
     #[serde(default)]
+    #[settings_ui(skip)]
     pub disabled_globs: Option<Vec<String>>,
     /// The mode used to display edit predictions in the buffer.
     /// Provider support required.
@@ -637,12 +648,13 @@ pub struct EditPredictionSettingsContent {
     pub enabled_in_text_threads: bool,
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, SettingsUi)]
 pub struct CopilotSettingsContent {
     /// HTTP/HTTPS proxy to use for Copilot.
     ///
     /// Default: none
     #[serde(default)]
+    #[settings_ui(skip)]
     pub proxy: Option<String>,
     /// Disable certificate verification for the proxy (not recommended).
     ///
@@ -653,19 +665,21 @@ pub struct CopilotSettingsContent {
     ///
     /// Default: none
     #[serde(default)]
+    #[settings_ui(skip)]
     pub enterprise_uri: Option<String>,
 }
 
 /// The settings for enabling/disabling features.
-#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
+#[settings_ui(group = "Features")]
 pub struct FeaturesContent {
     /// Determines which edit prediction provider to use.
     pub edit_prediction_provider: Option<EditPredictionProvider>,
 }
 
 /// Controls the soft-wrapping behavior in the editor.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum SoftWrap {
     /// Prefer a single line generally, unless an overly long line is encountered.
@@ -934,7 +948,9 @@ pub enum Formatter {
 }
 
 /// The settings for indent guides.
-#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[derive(
+    Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, SettingsUi,
+)]
 pub struct IndentGuideSettings {
     /// Whether to display indent guides in the editor.
     ///
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index 9086d3c745..896a8bc038 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -19,6 +19,7 @@ pub trait SettingsUi {
             path: None,
             title: "None entry",
             item: SettingsUiItem::None,
+            documentation: None,
         }
     }
 }
@@ -29,6 +30,8 @@ pub struct SettingsUiEntry {
     pub path: Option<&'static str>,
     /// What is displayed for the text for this entry
     pub title: &'static str,
+    /// documentation for this entry. Constructed from the documentation comment above the struct or field
+    pub documentation: Option<&'static str>,
     pub item: SettingsUiItem,
 }
 
@@ -54,6 +57,7 @@ pub enum SettingsUiItemSingle {
 
 pub struct SettingsValue<T> {
     pub title: &'static str,
+    pub documentation: Option<&'static str>,
     pub path: SmallVec<[&'static str; 1]>,
     pub value: Option<T>,
     pub default_value: T,
@@ -128,7 +132,9 @@ pub enum NumType {
     U64 = 0,
     U32 = 1,
     F32 = 2,
+    USIZE = 3,
 }
+
 pub static NUM_TYPE_NAMES: std::sync::LazyLock<[&'static str; NumType::COUNT]> =
     std::sync::LazyLock::new(|| NumType::ALL.map(NumType::type_name));
 pub static NUM_TYPE_IDS: std::sync::LazyLock<[TypeId; NumType::COUNT]> =
@@ -143,6 +149,7 @@ impl NumType {
             NumType::U64 => TypeId::of::<u64>(),
             NumType::U32 => TypeId::of::<u32>(),
             NumType::F32 => TypeId::of::<f32>(),
+            NumType::USIZE => TypeId::of::<usize>(),
         }
     }
 
@@ -151,6 +158,7 @@ impl NumType {
             NumType::U64 => std::any::type_name::<u64>(),
             NumType::U32 => std::any::type_name::<u32>(),
             NumType::F32 => std::any::type_name::<f32>(),
+            NumType::USIZE => std::any::type_name::<usize>(),
         }
     }
 }
@@ -175,3 +183,4 @@ numeric_stepper_for_num_type!(u64, U64);
 numeric_stepper_for_num_type!(u32, U32);
 // todo(settings_ui) is there a better ui for f32?
 numeric_stepper_for_num_type!(f32, F32);
+numeric_stepper_for_num_type!(usize, USIZE);
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index f316a31878..d736f0e174 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -1,14 +1,13 @@
 mod appearance_settings_controls;
 
 use std::any::TypeId;
-use std::collections::VecDeque;
 use std::ops::{Not, Range};
 
 use anyhow::Context as _;
 use command_palette_hooks::CommandPaletteFilter;
 use editor::EditorSettingsControls;
 use feature_flags::{FeatureFlag, FeatureFlagViewExt};
-use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, actions};
+use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, ScrollHandle, actions};
 use settings::{
     NumType, SettingsStore, SettingsUiEntry, SettingsUiItem, SettingsUiItemDynamic,
     SettingsUiItemGroup, SettingsUiItemSingle, SettingsValue,
@@ -138,6 +137,7 @@ impl Item for SettingsPage {
 struct UiEntry {
     title: &'static str,
     path: Option<&'static str>,
+    documentation: Option<&'static str>,
     _depth: usize,
     // a
     //  b     < a descendant range < a total descendant range
@@ -195,6 +195,7 @@ fn build_tree_item(
     tree.push(UiEntry {
         title: entry.title,
         path: entry.path,
+        documentation: entry.documentation,
         _depth: depth,
         descendant_range: index + 1..index + 1,
         total_descendant_range: index + 1..index + 1,
@@ -354,32 +355,29 @@ fn render_content(
     tree: &SettingsUiTree,
     window: &mut Window,
     cx: &mut Context<SettingsPage>,
-) -> impl IntoElement {
-    let Some(active_entry) = tree.entries.get(tree.active_entry_index) else {
-        return div()
-            .size_full()
-            .child(Label::new(SharedString::new_static("No settings found")).color(Color::Error));
-    };
-    let mut content = v_flex().size_full().gap_4().overflow_hidden();
+) -> Div {
+    let content = v_flex().size_full().gap_4();
 
     let mut path = smallvec::smallvec![];
-    if let Some(active_entry_path) = active_entry.path {
-        path.push(active_entry_path);
-    }
-    let mut entry_index_queue = VecDeque::new();
 
-    if let Some(child_index) = active_entry.first_descendant_index() {
-        entry_index_queue.push_back(child_index);
-        let mut index = child_index;
-        while let Some(next_sibling_index) = tree.entries[index].next_sibling {
-            entry_index_queue.push_back(next_sibling_index);
-            index = next_sibling_index;
-        }
-    };
+    fn render_recursive(
+        tree: &SettingsUiTree,
+        index: usize,
+        path: &mut SmallVec<[&'static str; 1]>,
+        mut element: Div,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Div {
+        let Some(child) = tree.entries.get(index) else {
+            return element.child(
+                Label::new(SharedString::new_static("No settings found")).color(Color::Error),
+            );
+        };
+
+        element =
+            element.child(Label::new(SharedString::new_static(child.title)).size(LabelSize::Large));
 
-    while let Some(index) = entry_index_queue.pop_front() {
         // todo(settings_ui): subgroups?
-        let child = &tree.entries[index];
         let mut pushed_path = false;
         if let Some(child_path) = child.path {
             path.push(child_path);
@@ -388,37 +386,56 @@ fn render_content(
         let settings_value = settings_value_from_settings_and_path(
             path.clone(),
             child.title,
+            child.documentation,
             // PERF: how to structure this better? There feels like there's a way to avoid the clone
             // and every value lookup
             SettingsStore::global(cx).raw_user_settings(),
             SettingsStore::global(cx).raw_default_settings(),
         );
         if let Some(select_descendant) = child.select_descendant {
-            let selected_descendant = select_descendant(settings_value.read(), cx);
-            if let Some(descendant_index) =
-                child.nth_descendant_index(&tree.entries, selected_descendant)
-            {
-                entry_index_queue.push_front(descendant_index);
+            let selected_descendant = child
+                .nth_descendant_index(&tree.entries, select_descendant(settings_value.read(), cx));
+            if let Some(descendant_index) = selected_descendant {
+                element = render_recursive(&tree, descendant_index, path, element, window, cx);
             }
         }
+        if let Some(child_render) = child.render.as_ref() {
+            element = element.child(div().child(render_item_single(
+                settings_value,
+                child_render,
+                window,
+                cx,
+            )));
+        } else if let Some(child_index) = child.first_descendant_index() {
+            let mut index = Some(child_index);
+            while let Some(sub_child_index) = index {
+                element = render_recursive(tree, sub_child_index, path, element, window, cx);
+                index = tree.entries[sub_child_index].next_sibling;
+            }
+        } else {
+            element =
+                element.child(div().child(Label::new("// skipped (for now)").color(Color::Muted)))
+        }
+
         if pushed_path {
             path.pop();
         }
-        let Some(child_render) = child.render.as_ref() else {
-            continue;
-        };
-        content = content.child(
-            div()
-                .child(Label::new(SharedString::new_static(child.title)).size(LabelSize::Large))
-                .child(render_item_single(settings_value, child_render, window, cx)),
-        );
+        return element;
     }
 
-    return content;
+    return render_recursive(
+        tree,
+        tree.active_entry_index,
+        &mut path,
+        content,
+        window,
+        cx,
+    );
 }
 
 impl Render for SettingsPage {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let scroll_handle = window.use_state(cx, |_, _| ScrollHandle::new());
         div()
             .grid()
             .grid_cols(16)
@@ -427,15 +444,19 @@ impl Render for SettingsPage {
             .size_full()
             .child(
                 div()
+                    .id("settings-ui-nav")
                     .col_span(2)
                     .h_full()
                     .child(render_nav(&self.settings_tree, window, cx)),
             )
-            .child(div().col_span(4).h_full().child(render_content(
-                &self.settings_tree,
-                window,
-                cx,
-            )))
+            .child(
+                div().col_span(6).h_full().child(
+                    render_content(&self.settings_tree, window, cx)
+                        .id("settings-ui-content")
+                        .track_scroll(scroll_handle.read(cx))
+                        .overflow_y_scroll(),
+                ),
+            )
     }
 }
 
@@ -530,6 +551,7 @@ fn downcast_any_item<T: serde::de::DeserializeOwned>(
     let deserialized_setting_value = SettingsValue {
         title: settings_value.title,
         path: settings_value.path,
+        documentation: settings_value.documentation,
         value,
         default_value,
     };
@@ -586,6 +608,17 @@ fn render_any_numeric_stepper(
             window,
             cx,
         ),
+        NumType::USIZE => render_numeric_stepper::<usize>(
+            downcast_any_item(settings_value),
+            usize::saturating_sub,
+            usize::saturating_add,
+            |n| {
+                serde_json::Number::try_from(n)
+                    .context("Failed to convert usize to serde_json::Number")
+            },
+            window,
+            cx,
+        ),
     }
 }
 
@@ -640,7 +673,7 @@ fn render_switch_field(
     SwitchField::new(
         id,
         SharedString::new_static(value.title),
-        None,
+        value.documentation.map(SharedString::new_static),
         match value.read() {
             true => ToggleState::Selected,
             false => ToggleState::Unselected,
@@ -731,6 +764,7 @@ fn render_toggle_button_group(
 fn settings_value_from_settings_and_path(
     path: SmallVec<[&'static str; 1]>,
     title: &'static str,
+    documentation: Option<&'static str>,
     user_settings: &serde_json::Value,
     default_settings: &serde_json::Value,
 ) -> SettingsValue<serde_json::Value> {
@@ -743,6 +777,7 @@ fn settings_value_from_settings_and_path(
     let settings_value = SettingsValue {
         default_value,
         value,
+        documentation,
         path: path.clone(),
         // todo(settings_ui) is title required inside SettingsValue?
         title,
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index 1895083508..076f9c0f04 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -1,3 +1,5 @@
+use std::ops::Not;
+
 use heck::{ToSnakeCase as _, ToTitleCase as _};
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
@@ -63,12 +65,19 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
         }
     }
 
+    let doc_str = parse_documentation_from_attrs(&input.attrs);
+
     let ui_item_fn_body = generate_ui_item_body(group_name.as_ref(), path_name.as_ref(), &input);
 
     // todo(settings_ui): make group name optional, repurpose group as tag indicating item is group, and have "title" tag for custom title
     let title = group_name.unwrap_or(input.ident.to_string().to_title_case());
 
-    let ui_entry_fn_body = map_ui_item_to_entry(path_name.as_deref(), &title, quote! { Self });
+    let ui_entry_fn_body = map_ui_item_to_entry(
+        path_name.as_deref(),
+        &title,
+        doc_str.as_deref(),
+        quote! { Self },
+    );
 
     let expanded = quote! {
         impl #impl_generics settings::SettingsUi for #name #ty_generics #where_clause {
@@ -111,14 +120,22 @@ fn option_inner_type(ty: TokenStream) -> Option<TokenStream> {
     return Some(ty.to_token_stream());
 }
 
-fn map_ui_item_to_entry(path: Option<&str>, title: &str, ty: TokenStream) -> TokenStream {
+fn map_ui_item_to_entry(
+    path: Option<&str>,
+    title: &str,
+    doc_str: Option<&str>,
+    ty: TokenStream,
+) -> TokenStream {
     let ty = extract_type_from_option(ty);
+    // todo(settings_ui): does quote! just work with options?
     let path = path.map_or_else(|| quote! {None}, |path| quote! {Some(#path)});
+    let doc_str = doc_str.map_or_else(|| quote! {None}, |doc_str| quote! {Some(#doc_str)});
     quote! {
         settings::SettingsUiEntry {
             title: #title,
             path: #path,
             item: #ty::settings_ui_item(),
+            documentation: #doc_str,
         }
     }
 }
@@ -134,6 +151,7 @@ fn generate_ui_item_body(
             settings::SettingsUiItem::None
         },
         (Some(_), _, Data::Struct(data_struct)) => {
+            let struct_serde_attrs = parse_serde_attributes(&input.attrs);
             let fields = data_struct
                 .fields
                 .iter()
@@ -153,48 +171,37 @@ fn generate_ui_item_body(
                     })
                 })
                 .map(|field| {
+                    let field_serde_attrs = parse_serde_attributes(&field.attrs);
+                    let name = field.ident.clone().expect("tuple fields").to_string();
+                    let doc_str = parse_documentation_from_attrs(&field.attrs);
+
                     (
-                        field.ident.clone().expect("tuple fields").to_string(),
+                        name.to_title_case(),
+                        doc_str,
+                        field_serde_attrs.flatten.not().then(|| {
+                            struct_serde_attrs.apply_rename_to_field(&field_serde_attrs, &name)
+                        }),
                         field.ty.to_token_stream(),
                     )
                 })
                 // todo(settings_ui): Re-format field name as nice title, and support setting different title with attr
-                .map(|(name, ty)| map_ui_item_to_entry(Some(&name), &name.to_title_case(), ty));
+                .map(|(title, doc_str, path, ty)| {
+                    map_ui_item_to_entry(path.as_deref(), &title, doc_str.as_deref(), ty)
+                });
 
             quote! {
                 settings::SettingsUiItem::Group(settings::SettingsUiItemGroup{ items: vec![#(#fields),*] })
             }
         }
         (None, _, Data::Enum(data_enum)) => {
-            let mut lowercase = false;
-            let mut snake_case = false;
-            for attr in &input.attrs {
-                if attr.path().is_ident("serde") {
-                    attr.parse_nested_meta(|meta| {
-                        if meta.path.is_ident("rename_all") {
-                            meta.input.parse::<Token![=]>()?;
-                            let lit = meta.input.parse::<LitStr>()?.value();
-                            lowercase = lit == "lowercase";
-                            snake_case = lit == "snake_case";
-                        }
-                        Ok(())
-                    })
-                    .ok();
-                }
-            }
+            let serde_attrs = parse_serde_attributes(&input.attrs);
             let length = data_enum.variants.len();
 
             let variants = data_enum.variants.iter().map(|variant| {
                 let string = variant.ident.clone().to_string();
 
                 let title = string.to_title_case();
-                let string = if lowercase {
-                    string.to_lowercase()
-                } else if snake_case {
-                    string.to_snake_case()
-                } else {
-                    string
-                };
+                let string = serde_attrs.rename_all.apply(&string);
 
                 (string, title)
             });
@@ -218,6 +225,113 @@ fn generate_ui_item_body(
     }
 }
 
+struct SerdeOptions {
+    rename_all: SerdeRenameAll,
+    rename: Option<String>,
+    flatten: bool,
+    _alias: Option<String>, // todo(settings_ui)
+}
+
+#[derive(PartialEq)]
+enum SerdeRenameAll {
+    Lowercase,
+    SnakeCase,
+    None,
+}
+
+impl SerdeRenameAll {
+    fn apply(&self, name: &str) -> String {
+        match self {
+            SerdeRenameAll::Lowercase => name.to_lowercase(),
+            SerdeRenameAll::SnakeCase => name.to_snake_case(),
+            SerdeRenameAll::None => name.to_string(),
+        }
+    }
+}
+
+impl SerdeOptions {
+    fn apply_rename_to_field(&self, field_options: &Self, name: &str) -> String {
+        // field renames take precedence over struct rename all cases
+        if let Some(rename) = &field_options.rename {
+            return rename.clone();
+        }
+        return self.rename_all.apply(name);
+    }
+}
+
+fn parse_serde_attributes(attrs: &[syn::Attribute]) -> SerdeOptions {
+    let mut options = SerdeOptions {
+        rename_all: SerdeRenameAll::None,
+        rename: None,
+        flatten: false,
+        _alias: None,
+    };
+
+    for attr in attrs {
+        if !attr.path().is_ident("serde") {
+            continue;
+        }
+        attr.parse_nested_meta(|meta| {
+            if meta.path.is_ident("rename_all") {
+                meta.input.parse::<Token![=]>()?;
+                let lit = meta.input.parse::<LitStr>()?.value();
+
+                if options.rename_all != SerdeRenameAll::None {
+                    return Err(meta.error("duplicate `rename_all` attribute"));
+                } else if lit == "lowercase" {
+                    options.rename_all = SerdeRenameAll::Lowercase;
+                } else if lit == "snake_case" {
+                    options.rename_all = SerdeRenameAll::SnakeCase;
+                } else {
+                    return Err(meta.error(format!("invalid `rename_all` attribute: {}", lit)));
+                }
+                // todo(settings_ui): Other options?
+            } else if meta.path.is_ident("flatten") {
+                options.flatten = true;
+            } else if meta.path.is_ident("rename") {
+                if options.rename.is_some() {
+                    return Err(meta.error("Can only have one rename attribute"));
+                }
+
+                meta.input.parse::<Token![=]>()?;
+                let lit = meta.input.parse::<LitStr>()?.value();
+                options.rename = Some(lit);
+            }
+            Ok(())
+        })
+        .unwrap();
+    }
+
+    return options;
+}
+
+fn parse_documentation_from_attrs(attrs: &[syn::Attribute]) -> Option<String> {
+    let mut doc_str = Option::<String>::None;
+    for attr in attrs {
+        if attr.path().is_ident("doc") {
+            // /// ...
+            // becomes
+            // #[doc = "..."]
+            use syn::{Expr::Lit, ExprLit, Lit::Str, Meta, MetaNameValue};
+            if let Meta::NameValue(MetaNameValue {
+                value:
+                    Lit(ExprLit {
+                        lit: Str(ref lit_str),
+                        ..
+                    }),
+                ..
+            }) = attr.meta
+            {
+                let doc = lit_str.value();
+                let doc_str = doc_str.get_or_insert_default();
+                doc_str.push_str(doc.trim());
+                doc_str.push('\n');
+            }
+        }
+    }
+    return doc_str;
+}
+
 struct SettingsKey {
     key: Option<String>,
     fallback_key: Option<String>,
@@ -290,7 +404,7 @@ pub fn derive_settings_key(input: proc_macro::TokenStream) -> proc_macro::TokenS
         if parsed_settings_key.is_some() && settings_key.is_some() {
             panic!("Duplicate #[settings_key] attribute");
         }
-        settings_key = parsed_settings_key;
+        settings_key = settings_key.or(parsed_settings_key);
     }
 
     let Some(SettingsKey { key, fallback_key }) = settings_key else {

From a6605270365e7db0ced654c290d62643d6d84672 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Thu, 4 Sep 2025 18:26:37 -0600
Subject: [PATCH 621/823] Make entry_for_path return a reference instead of
 cloning (#37591)

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/message_editor.rs |  7 +++----
 crates/agent_ui/src/acp/thread_view.rs    | 14 ++++++--------
 crates/agent_ui/src/context_picker.rs     |  3 ++-
 crates/project/src/project.rs             |  2 +-
 crates/project/src/worktree_store.rs      |  3 +--
 crates/repl/src/notebook/notebook_ui.rs   |  7 ++++---
 crates/search/src/project_search.rs       |  1 +
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index da121bb7a4..4f57c6161d 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -493,14 +493,13 @@ impl MessageEditor {
         let Some(entry) = self.project.read(cx).entry_for_path(&project_path, cx) else {
             return Task::ready(Err(anyhow!("project entry not found")));
         };
-        let Some(worktree) = self.project.read(cx).worktree_for_entry(entry.id, cx) else {
+        let directory_path = entry.path.clone();
+        let worktree_id = project_path.worktree_id;
+        let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx) else {
             return Task::ready(Err(anyhow!("worktree not found")));
         };
         let project = self.project.clone();
         cx.spawn(async move |_, cx| {
-            let directory_path = entry.path.clone();
-
-            let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id())?;
             let file_paths = worktree.read_with(cx, |worktree, _cx| {
                 collect_files_in_path(worktree, &directory_path)
             })?;
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index b4d56ad05b..441b4aa06f 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4070,15 +4070,15 @@ impl AcpThreadView {
                 MentionUri::PastedImage => {}
                 MentionUri::Directory { abs_path } => {
                     let project = workspace.project();
-                    let Some(entry) = project.update(cx, |project, cx| {
+                    let Some(entry_id) = project.update(cx, |project, cx| {
                         let path = project.find_project_path(abs_path, cx)?;
-                        project.entry_for_path(&path, cx)
+                        project.entry_for_path(&path, cx).map(|entry| entry.id)
                     }) else {
                         return;
                     };
 
                     project.update(cx, |_, cx| {
-                        cx.emit(project::Event::RevealInProjectPanel(entry.id));
+                        cx.emit(project::Event::RevealInProjectPanel(entry_id));
                     });
                 }
                 MentionUri::Symbol {
@@ -4091,11 +4091,9 @@ impl AcpThreadView {
                     line_range,
                 } => {
                     let project = workspace.project();
-                    let Some((path, _)) = project.update(cx, |project, cx| {
-                        let path = project.find_project_path(path, cx)?;
-                        let entry = project.entry_for_path(&path, cx)?;
-                        Some((path, entry))
-                    }) else {
+                    let Some(path) =
+                        project.update(cx, |project, cx| project.find_project_path(path, cx))
+                    else {
                         return;
                     };
 
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index 405b5ed90b..b225fbf340 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -987,7 +987,8 @@ impl MentionLink {
                     .read(cx)
                     .project()
                     .read(cx)
-                    .entry_for_path(&project_path, cx)?;
+                    .entry_for_path(&project_path, cx)?
+                    .clone();
                 Some(MentionLink::File(project_path, entry))
             }
             Self::SYMBOL => {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 1e2e52c120..66924f159a 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -4352,7 +4352,7 @@ impl Project {
         self.active_entry
     }
 
-    pub fn entry_for_path(&self, path: &ProjectPath, cx: &App) -> Option<Entry> {
+    pub fn entry_for_path<'a>(&'a self, path: &ProjectPath, cx: &'a App) -> Option<&'a Entry> {
         self.worktree_store.read(cx).entry_for_path(path, cx)
     }
 
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
index 1eeeefc40a..b37e1ef802 100644
--- a/crates/project/src/worktree_store.rs
+++ b/crates/project/src/worktree_store.rs
@@ -203,11 +203,10 @@ impl WorktreeStore {
         })
     }
 
-    pub fn entry_for_path(&self, path: &ProjectPath, cx: &App) -> Option<Entry> {
+    pub fn entry_for_path<'a>(&'a self, path: &ProjectPath, cx: &'a App) -> Option<&'a Entry> {
         self.worktree_for_id(path.worktree_id, cx)?
             .read(cx)
             .entry_for_path(&path.path)
-            .cloned()
     }
 
     pub fn create_worktree(
diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rs
index 325d262d9e..081c474cda 100644
--- a/crates/repl/src/notebook/notebook_ui.rs
+++ b/crates/repl/src/notebook/notebook_ui.rs
@@ -594,9 +594,10 @@ impl project::ProjectItem for NotebookItem {
                 };
 
                 let id = project
-                    .update(cx, |project, cx| project.entry_for_path(&path, cx))?
-                    .context("Entry not found")?
-                    .id;
+                    .update(cx, |project, cx| {
+                        project.entry_for_path(&path, cx).map(|entry| entry.id)
+                    })?
+                    .context("Entry not found")?;
 
                 cx.new(|_| NotebookItem {
                     path: abs_path,
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 4a2dbf31fc..33458a3a88 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -3201,6 +3201,7 @@ pub mod tests {
                 .read(cx)
                 .entry_for_path(&(worktree_id, "a").into(), cx)
                 .expect("no entry for /a/ directory")
+                .clone()
         });
         assert!(a_dir_entry.is_dir());
         window

From fded3fbcdb6861e0913bda8c86adaab6256ed254 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Thu, 4 Sep 2025 19:15:59 -0600
Subject: [PATCH 622/823] zeta: Scope edit prediction event history to current
 project (#37595)

This change also causes Zeta to not do anything for editors that are not
associated with a project. In practice, this shouldn't affect any
behavior - those editors shouldn't have edit predictions anyway.

Release Notes:

- Edit Prediction: Requests no longer include recent edits from other
projects (other Zed windows).
---
 .../zed/src/zed/edit_prediction_registry.rs   |   3 +-
 crates/zeta/src/zeta.rs                       | 349 ++++++------------
 crates/zeta_cli/src/main.rs                   |  58 +--
 3 files changed, 150 insertions(+), 260 deletions(-)

diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index 7b8b98018e..4f009ccb0b 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -207,9 +207,10 @@ fn assign_edit_prediction_provider(
 
                 if let Some(buffer) = &singleton_buffer
                     && buffer.read(cx).file().is_some()
+                    && let Some(project) = editor.project()
                 {
                     zeta.update(cx, |zeta, cx| {
-                        zeta.register_buffer(buffer, cx);
+                        zeta.register_buffer(buffer, project, cx);
                     });
                 }
 
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index e0cfd23dd2..3851d16755 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -35,12 +35,13 @@ use language_model::{LlmApiToken, RefreshLlmTokenListener};
 use project::{Project, ProjectPath};
 use release_channel::AppVersion;
 use settings::WorktreeId;
+use std::collections::hash_map;
+use std::mem;
 use std::str::FromStr;
 use std::{
     cmp,
     fmt::Write,
     future::Future,
-    mem,
     ops::Range,
     path::Path,
     rc::Rc,
@@ -211,9 +212,8 @@ impl std::fmt::Debug for EditPrediction {
 }
 
 pub struct Zeta {
+    projects: HashMap<EntityId, ZetaProject>,
     client: Arc<Client>,
-    events: VecDeque<Event>,
-    registered_buffers: HashMap<gpui::EntityId, RegisteredBuffer>,
     shown_completions: VecDeque<EditPrediction>,
     rated_completions: HashSet<EditPredictionId>,
     data_collection_choice: Entity<DataCollectionChoice>,
@@ -225,6 +225,11 @@ pub struct Zeta {
     license_detection_watchers: HashMap<WorktreeId, Rc<LicenseDetectionWatcher>>,
 }
 
+struct ZetaProject {
+    events: VecDeque<Event>,
+    registered_buffers: HashMap<gpui::EntityId, RegisteredBuffer>,
+}
+
 impl Zeta {
     pub fn global(cx: &mut App) -> Option<Entity<Self>> {
         cx.try_global::<ZetaGlobal>().map(|global| global.0.clone())
@@ -255,7 +260,9 @@ impl Zeta {
     }
 
     pub fn clear_history(&mut self) {
-        self.events.clear();
+        for zeta_project in self.projects.values_mut() {
+            zeta_project.events.clear();
+        }
     }
 
     pub fn usage(&self, cx: &App) -> Option<EditPredictionUsage> {
@@ -269,11 +276,10 @@ impl Zeta {
         let data_collection_choice = cx.new(|_| data_collection_choice);
 
         Self {
+            projects: HashMap::default(),
             client,
-            events: VecDeque::new(),
             shown_completions: VecDeque::new(),
             rated_completions: HashSet::default(),
-            registered_buffers: HashMap::default(),
             data_collection_choice,
             llm_token: LlmApiToken::default(),
             _llm_token_subscription: cx.subscribe(
@@ -294,12 +300,35 @@ impl Zeta {
         }
     }
 
-    fn push_event(&mut self, event: Event) {
+    fn get_or_init_zeta_project(
+        &mut self,
+        project: &Entity<Project>,
+        cx: &mut Context<Self>,
+    ) -> &mut ZetaProject {
+        let project_id = project.entity_id();
+        match self.projects.entry(project_id) {
+            hash_map::Entry::Occupied(entry) => entry.into_mut(),
+            hash_map::Entry::Vacant(entry) => {
+                cx.observe_release(project, move |this, _, _cx| {
+                    this.projects.remove(&project_id);
+                })
+                .detach();
+                entry.insert(ZetaProject {
+                    events: VecDeque::with_capacity(MAX_EVENT_COUNT),
+                    registered_buffers: HashMap::default(),
+                })
+            }
+        }
+    }
+
+    fn push_event(zeta_project: &mut ZetaProject, event: Event) {
+        let events = &mut zeta_project.events;
+
         if let Some(Event::BufferChange {
             new_snapshot: last_new_snapshot,
             timestamp: last_timestamp,
             ..
-        }) = self.events.back_mut()
+        }) = events.back_mut()
         {
             // Coalesce edits for the same buffer when they happen one after the other.
             let Event::BufferChange {
@@ -318,50 +347,65 @@ impl Zeta {
             }
         }
 
-        self.events.push_back(event);
-        if self.events.len() >= MAX_EVENT_COUNT {
+        if events.len() >= MAX_EVENT_COUNT {
             // These are halved instead of popping to improve prompt caching.
-            self.events.drain(..MAX_EVENT_COUNT / 2);
+            events.drain(..MAX_EVENT_COUNT / 2);
         }
+
+        events.push_back(event);
     }
 
-    pub fn register_buffer(&mut self, buffer: &Entity<Buffer>, cx: &mut Context<Self>) {
-        let buffer_id = buffer.entity_id();
-        let weak_buffer = buffer.downgrade();
-
-        if let std::collections::hash_map::Entry::Vacant(entry) =
-            self.registered_buffers.entry(buffer_id)
-        {
-            let snapshot = buffer.read(cx).snapshot();
-
-            entry.insert(RegisteredBuffer {
-                snapshot,
-                _subscriptions: [
-                    cx.subscribe(buffer, move |this, buffer, event, cx| {
-                        this.handle_buffer_event(buffer, event, cx);
-                    }),
-                    cx.observe_release(buffer, move |this, _buffer, _cx| {
-                        this.registered_buffers.remove(&weak_buffer.entity_id());
-                    }),
-                ],
-            });
-        };
-    }
-
-    fn handle_buffer_event(
+    pub fn register_buffer(
         &mut self,
-        buffer: Entity<Buffer>,
-        event: &language::BufferEvent,
+        buffer: &Entity<Buffer>,
+        project: &Entity<Project>,
         cx: &mut Context<Self>,
     ) {
-        if let language::BufferEvent::Edited = event {
-            self.report_changes_for_buffer(&buffer, cx);
+        let zeta_project = self.get_or_init_zeta_project(project, cx);
+        Self::register_buffer_impl(zeta_project, buffer, project, cx);
+    }
+
+    fn register_buffer_impl<'a>(
+        zeta_project: &'a mut ZetaProject,
+        buffer: &Entity<Buffer>,
+        project: &Entity<Project>,
+        cx: &mut Context<Self>,
+    ) -> &'a mut RegisteredBuffer {
+        let buffer_id = buffer.entity_id();
+        match zeta_project.registered_buffers.entry(buffer_id) {
+            hash_map::Entry::Occupied(entry) => entry.into_mut(),
+            hash_map::Entry::Vacant(entry) => {
+                let snapshot = buffer.read(cx).snapshot();
+                let project_entity_id = project.entity_id();
+                entry.insert(RegisteredBuffer {
+                    snapshot,
+                    _subscriptions: [
+                        cx.subscribe(buffer, {
+                            let project = project.downgrade();
+                            move |this, buffer, event, cx| {
+                                if let language::BufferEvent::Edited = event
+                                    && let Some(project) = project.upgrade()
+                                {
+                                    this.report_changes_for_buffer(&buffer, &project, cx);
+                                }
+                            }
+                        }),
+                        cx.observe_release(buffer, move |this, _buffer, _cx| {
+                            let Some(zeta_project) = this.projects.get_mut(&project_entity_id)
+                            else {
+                                return;
+                            };
+                            zeta_project.registered_buffers.remove(&buffer_id);
+                        }),
+                    ],
+                })
+            }
         }
     }
 
     fn request_completion_impl<F, R>(
         &mut self,
-        project: Option<&Entity<Project>>,
+        project: &Entity<Project>,
         buffer: &Entity<Buffer>,
         cursor: language::Anchor,
         can_collect_data: bool,
@@ -376,16 +420,14 @@ impl Zeta {
     {
         let buffer = buffer.clone();
         let buffer_snapshotted_at = Instant::now();
-        let snapshot = self.report_changes_for_buffer(&buffer, cx);
+        let snapshot = self.report_changes_for_buffer(&buffer, project, cx);
         let zeta = cx.entity();
-        let events = self.events.clone();
+        let events = self.get_or_init_zeta_project(project, cx).events.clone();
         let client = self.client.clone();
         let llm_token = self.llm_token.clone();
         let app_version = AppVersion::global(cx);
 
-        let git_info = if let (true, Some(project), Some(file)) =
-            (can_collect_data, project, snapshot.file())
-        {
+        let git_info = if let (true, Some(file)) = (can_collect_data, snapshot.file()) {
             git_info_for_file(project, &ProjectPath::from_file(file.as_ref(), cx), cx)
         } else {
             None
@@ -512,163 +554,10 @@ impl Zeta {
         })
     }
 
-    // Generates several example completions of various states to fill the Zeta completion modal
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn fill_with_fake_completions(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        use language::Point;
-
-        let test_buffer_text = indoc::indoc! {r#"a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-            And maybe a short line
-
-            Then a few lines
-
-            and then another
-            "#};
-
-        let project = None;
-        let buffer = cx.new(|cx| Buffer::local(test_buffer_text, cx));
-        let position = buffer.read(cx).anchor_before(Point::new(1, 0));
-
-        let completion_tasks = vec![
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("e7861db5-0cea-4761-b1c5-ad083ac53a80").unwrap(),
-                    output_excerpt: format!("{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-[here's an edit]
-And maybe a short line
-Then a few lines
-and then another
-{EDITABLE_REGION_END_MARKER}
-                        ", ),
-                },
-                cx,
-            ),
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("077c556a-2c49-44e2-bbc6-dafc09032a5e").unwrap(),
-                    output_excerpt: format!(r#"{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-And maybe a short line
-[and another edit]
-Then a few lines
-and then another
-{EDITABLE_REGION_END_MARKER}
-                        "#),
-                },
-                cx,
-            ),
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("df8c7b23-3d1d-4f99-a306-1f6264a41277").unwrap(),
-                    output_excerpt: format!(r#"{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-And maybe a short line
-
-Then a few lines
-
-and then another
-{EDITABLE_REGION_END_MARKER}
-                        "#),
-                },
-                cx,
-            ),
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("c743958d-e4d8-44a8-aa5b-eb1e305c5f5c").unwrap(),
-                    output_excerpt: format!(r#"{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-And maybe a short line
-
-Then a few lines
-
-and then another
-{EDITABLE_REGION_END_MARKER}
-                        "#),
-                },
-                cx,
-            ),
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("ff5cd7ab-ad06-4808-986e-d3391e7b8355").unwrap(),
-                    output_excerpt: format!(r#"{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-And maybe a short line
-Then a few lines
-[a third completion]
-and then another
-{EDITABLE_REGION_END_MARKER}
-                        "#),
-                },
-                cx,
-            ),
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("83cafa55-cdba-4b27-8474-1865ea06be94").unwrap(),
-                    output_excerpt: format!(r#"{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-And maybe a short line
-and then another
-[fourth completion example]
-{EDITABLE_REGION_END_MARKER}
-                        "#),
-                },
-                cx,
-            ),
-            self.fake_completion(
-                project,
-                &buffer,
-                position,
-                PredictEditsResponse {
-                    request_id: Uuid::parse_str("d5bd3afd-8723-47c7-bd77-15a3a926867b").unwrap(),
-                    output_excerpt: format!(r#"{EDITABLE_REGION_START_MARKER}
-a longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line
-And maybe a short line
-Then a few lines
-and then another
-[fifth and final completion]
-{EDITABLE_REGION_END_MARKER}
-                        "#),
-                },
-                cx,
-            ),
-        ];
-
-        cx.spawn(async move |zeta, cx| {
-            for task in completion_tasks {
-                task.await.unwrap();
-            }
-
-            zeta.update(cx, |zeta, _cx| {
-                zeta.shown_completions.get_mut(2).unwrap().edits = Arc::new([]);
-                zeta.shown_completions.get_mut(3).unwrap().edits = Arc::new([]);
-            })
-            .ok();
-        })
-    }
-
     #[cfg(any(test, feature = "test-support"))]
     pub fn fake_completion(
         &mut self,
-        project: Option<&Entity<Project>>,
+        project: &Entity<Project>,
         buffer: &Entity<Buffer>,
         position: language::Anchor,
         response: PredictEditsResponse,
@@ -683,7 +572,7 @@ and then another
 
     pub fn request_completion(
         &mut self,
-        project: Option<&Entity<Project>>,
+        project: &Entity<Project>,
         buffer: &Entity<Buffer>,
         position: language::Anchor,
         can_collect_data: bool,
@@ -1043,23 +932,23 @@ and then another
     fn report_changes_for_buffer(
         &mut self,
         buffer: &Entity<Buffer>,
+        project: &Entity<Project>,
         cx: &mut Context<Self>,
     ) -> BufferSnapshot {
-        self.register_buffer(buffer, cx);
+        let zeta_project = self.get_or_init_zeta_project(project, cx);
+        let registered_buffer = Self::register_buffer_impl(zeta_project, buffer, project, cx);
 
-        let registered_buffer = self
-            .registered_buffers
-            .get_mut(&buffer.entity_id())
-            .unwrap();
         let new_snapshot = buffer.read(cx).snapshot();
-
         if new_snapshot.version != registered_buffer.snapshot.version {
             let old_snapshot = mem::replace(&mut registered_buffer.snapshot, new_snapshot.clone());
-            self.push_event(Event::BufferChange {
-                old_snapshot,
-                new_snapshot: new_snapshot.clone(),
-                timestamp: Instant::now(),
-            });
+            Self::push_event(
+                zeta_project,
+                Event::BufferChange {
+                    old_snapshot,
+                    new_snapshot: new_snapshot.clone(),
+                    timestamp: Instant::now(),
+                },
+            );
         }
 
         new_snapshot
@@ -1140,7 +1029,7 @@ pub struct GatherContextOutput {
 }
 
 pub fn gather_context(
-    project: Option<&Entity<Project>>,
+    project: &Entity<Project>,
     full_path_str: String,
     snapshot: &BufferSnapshot,
     cursor_point: language::Point,
@@ -1149,8 +1038,7 @@ pub fn gather_context(
     git_info: Option<PredictEditsGitInfo>,
     cx: &App,
 ) -> Task<Result<GatherContextOutput>> {
-    let local_lsp_store =
-        project.and_then(|project| project.read(cx).lsp_store().read(cx).as_local());
+    let local_lsp_store = project.read(cx).lsp_store().read(cx).as_local();
     let diagnostic_groups: Vec<(String, serde_json::Value)> =
         if can_collect_data && let Some(local_lsp_store) = local_lsp_store {
             snapshot
@@ -1540,6 +1428,9 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
         if self.zeta.read(cx).update_required {
             return;
         }
+        let Some(project) = project else {
+            return;
+        };
 
         if self
             .zeta
@@ -1578,13 +1469,7 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
             let completion_request = this.update(cx, |this, cx| {
                 this.last_request_timestamp = Instant::now();
                 this.zeta.update(cx, |zeta, cx| {
-                    zeta.request_completion(
-                        project.as_ref(),
-                        &buffer,
-                        position,
-                        can_collect_data,
-                        cx,
-                    )
+                    zeta.request_completion(&project, &buffer, position, can_collect_data, cx)
                 })
             });
 
@@ -1762,7 +1647,6 @@ fn tokens_for_bytes(bytes: usize) -> usize {
 
 #[cfg(test)]
 mod tests {
-    use client::UserStore;
     use client::test::FakeServer;
     use clock::FakeSystemClock;
     use cloud_api_types::{CreateLlmTokenResponse, LlmToken};
@@ -1771,6 +1655,7 @@ mod tests {
     use indoc::indoc;
     use language::Point;
     use settings::SettingsStore;
+    use util::path;
 
     use super::*;
 
@@ -1897,6 +1782,7 @@ mod tests {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
             client::init_settings(cx);
+            Project::init_settings(cx);
         });
 
         let edits = edits_for_prediction(
@@ -1961,6 +1847,7 @@ mod tests {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
             client::init_settings(cx);
+            Project::init_settings(cx);
         });
 
         let buffer_content = "lorem\n";
@@ -2010,13 +1897,14 @@ mod tests {
         });
         // Construct the fake server to authenticate.
         let _server = FakeServer::for_client(42, &client, cx).await;
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let zeta = cx.new(|cx| Zeta::new(client, user_store.clone(), cx));
-
+        let fs = project::FakeFs::new(cx.executor());
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
         let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
         let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
+
+        let zeta = cx.new(|cx| Zeta::new(client, project.read(cx).user_store(), cx));
         let completion_task = zeta.update(cx, |zeta, cx| {
-            zeta.request_completion(None, &buffer, cursor, false, cx)
+            zeta.request_completion(&project, &buffer, cursor, false, cx)
         });
 
         let completion = completion_task.await.unwrap().unwrap();
@@ -2074,14 +1962,15 @@ mod tests {
         });
         // Construct the fake server to authenticate.
         let _server = FakeServer::for_client(42, &client, cx).await;
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let zeta = cx.new(|cx| Zeta::new(client, user_store.clone(), cx));
-
+        let fs = project::FakeFs::new(cx.executor());
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
         let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
         let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
         let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
+
+        let zeta = cx.new(|cx| Zeta::new(client, project.read(cx).user_store(), cx));
         let completion_task = zeta.update(cx, |zeta, cx| {
-            zeta.request_completion(None, &buffer, cursor, false, cx)
+            zeta.request_completion(&project, &buffer, cursor, false, cx)
         });
 
         let completion = completion_task.await.unwrap().unwrap();
diff --git a/crates/zeta_cli/src/main.rs b/crates/zeta_cli/src/main.rs
index 5b2d4cf615..e66eeed809 100644
--- a/crates/zeta_cli/src/main.rs
+++ b/crates/zeta_cli/src/main.rs
@@ -10,7 +10,7 @@ use language::Bias;
 use language::Buffer;
 use language::Point;
 use language_model::LlmApiToken;
-use project::{Project, ProjectPath};
+use project::{Project, ProjectPath, Worktree};
 use release_channel::AppVersion;
 use reqwest_client::ReqwestClient;
 use std::path::{Path, PathBuf};
@@ -129,15 +129,33 @@ async fn get_context(
         return Err(anyhow!("Absolute paths are not supported in --cursor"));
     }
 
-    let (project, _lsp_open_handle, buffer) = if use_language_server {
-        let (project, lsp_open_handle, buffer) =
-            open_buffer_with_language_server(&worktree_path, &cursor.path, app_state, cx).await?;
-        (Some(project), Some(lsp_open_handle), buffer)
+    let project = cx.update(|cx| {
+        Project::local(
+            app_state.client.clone(),
+            app_state.node_runtime.clone(),
+            app_state.user_store.clone(),
+            app_state.languages.clone(),
+            app_state.fs.clone(),
+            None,
+            cx,
+        )
+    })?;
+
+    let worktree = project
+        .update(cx, |project, cx| {
+            project.create_worktree(&worktree_path, true, cx)
+        })?
+        .await?;
+
+    let (_lsp_open_handle, buffer) = if use_language_server {
+        let (lsp_open_handle, buffer) =
+            open_buffer_with_language_server(&project, &worktree, &cursor.path, cx).await?;
+        (Some(lsp_open_handle), buffer)
     } else {
         let abs_path = worktree_path.join(&cursor.path);
         let content = smol::fs::read_to_string(&abs_path).await?;
         let buffer = cx.new(|cx| Buffer::local(content, cx))?;
-        (None, None, buffer)
+        (None, buffer)
     };
 
     let worktree_name = worktree_path
@@ -177,7 +195,7 @@ async fn get_context(
     let mut gather_context_output = cx
         .update(|cx| {
             gather_context(
-                project.as_ref(),
+                &project,
                 full_path_str,
                 &snapshot,
                 clipped_cursor,
@@ -198,29 +216,11 @@ async fn get_context(
 }
 
 pub async fn open_buffer_with_language_server(
-    worktree_path: &Path,
+    project: &Entity<Project>,
+    worktree: &Entity<Worktree>,
     path: &Path,
-    app_state: &Arc<ZetaCliAppState>,
     cx: &mut AsyncApp,
-) -> Result<(Entity<Project>, Entity<Entity<Buffer>>, Entity<Buffer>)> {
-    let project = cx.update(|cx| {
-        Project::local(
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            app_state.user_store.clone(),
-            app_state.languages.clone(),
-            app_state.fs.clone(),
-            None,
-            cx,
-        )
-    })?;
-
-    let worktree = project
-        .update(cx, |project, cx| {
-            project.create_worktree(worktree_path, true, cx)
-        })?
-        .await?;
-
+) -> Result<(Entity<Entity<Buffer>>, Entity<Buffer>)> {
     let project_path = worktree.read_with(cx, |worktree, _cx| ProjectPath {
         worktree_id: worktree.id(),
         path: path.to_path_buf().into(),
@@ -237,7 +237,7 @@ pub async fn open_buffer_with_language_server(
     let log_prefix = path.to_string_lossy().to_string();
     wait_for_lang_server(&project, &buffer, log_prefix, cx).await?;
 
-    Ok((project, lsp_open_handle, buffer))
+    Ok((lsp_open_handle, buffer))
 }
 
 // TODO: Dedupe with similar function in crates/eval/src/instance.rs

From 57c6dbd71e483646cd0409894547e97f664ebed3 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 5 Sep 2025 09:10:50 +0530
Subject: [PATCH 623/823] linux: Fix IME positioning on scaled display on
 Wayland (#37600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes IME bounds scaling on Wayland since it uses logical pixels,
unlike X11. We now scale only on X11. Windows and macOS don’t use these
bounds for IME anyway.

Release Notes:

- Fixed an issue where the IME popover could appear outside the window
or fail to show on Wayland.
---
 crates/gpui/src/platform.rs                   |  8 +++----
 .../gpui/src/platform/linux/wayland/client.rs |  6 ++---
 .../gpui/src/platform/linux/wayland/window.rs |  7 +++---
 crates/gpui/src/platform/linux/x11/client.rs  | 22 +++++++++----------
 crates/gpui/src/platform/linux/x11/window.rs  |  7 +++---
 crates/gpui/src/platform/mac/window.rs        |  9 ++++----
 crates/gpui/src/platform/test/window.rs       |  6 ++---
 crates/gpui/src/platform/windows/window.rs    |  2 +-
 crates/gpui/src/window.rs                     |  4 +---
 9 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index d3425c8835..444b60ac15 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -39,9 +39,9 @@ use crate::{
     Action, AnyWindowHandle, App, AsyncWindowContext, BackgroundExecutor, Bounds,
     DEFAULT_WINDOW_SIZE, DevicePixels, DispatchEventResult, Font, FontId, FontMetrics, FontRun,
     ForegroundExecutor, GlyphId, GpuSpecs, ImageSource, Keymap, LineLayout, Pixels, PlatformInput,
-    Point, RenderGlyphParams, RenderImage, RenderImageParams, RenderSvgParams, ScaledPixels, Scene,
-    ShapedGlyph, ShapedRun, SharedString, Size, SvgRenderer, SvgSize, SystemWindowTab, Task,
-    TaskLabel, Window, WindowControlArea, hash, point, px, size,
+    Point, RenderGlyphParams, RenderImage, RenderImageParams, RenderSvgParams, Scene, ShapedGlyph,
+    ShapedRun, SharedString, Size, SvgRenderer, SvgSize, SystemWindowTab, Task, TaskLabel, Window,
+    WindowControlArea, hash, point, px, size,
 };
 use anyhow::Result;
 use async_task::Runnable;
@@ -548,7 +548,7 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn set_client_inset(&self, _inset: Pixels) {}
     fn gpu_specs(&self) -> Option<GpuSpecs>;
 
-    fn update_ime_position(&self, _bounds: Bounds<ScaledPixels>);
+    fn update_ime_position(&self, _bounds: Bounds<Pixels>);
 
     #[cfg(any(test, feature = "test-support"))]
     fn as_test(&mut self) -> Option<&mut TestWindow> {
diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs
index 189cfa1954..8596bddc8d 100644
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -75,8 +75,8 @@ use crate::{
     FileDropEvent, ForegroundExecutor, KeyDownEvent, KeyUpEvent, Keystroke, LinuxCommon,
     LinuxKeyboardLayout, Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent,
     MouseExitEvent, MouseMoveEvent, MouseUpEvent, NavigationDirection, Pixels, PlatformDisplay,
-    PlatformInput, PlatformKeyboardLayout, Point, SCROLL_LINES, ScaledPixels, ScrollDelta,
-    ScrollWheelEvent, Size, TouchPhase, WindowParams, point, px, size,
+    PlatformInput, PlatformKeyboardLayout, Point, SCROLL_LINES, ScrollDelta, ScrollWheelEvent,
+    Size, TouchPhase, WindowParams, point, px, size,
 };
 use crate::{
     SharedString,
@@ -323,7 +323,7 @@ impl WaylandClientStatePtr {
         }
     }
 
-    pub fn update_ime_position(&self, bounds: Bounds<ScaledPixels>) {
+    pub fn update_ime_position(&self, bounds: Bounds<Pixels>) {
         let client = self.get_client();
         let mut state = client.borrow_mut();
         if state.composing || state.text_input.is_none() || state.pre_edit_text.is_some() {
diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs
index 7570c58c09..76dd89c940 100644
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -25,9 +25,8 @@ use crate::scene::Scene;
 use crate::{
     AnyWindowHandle, Bounds, Decorations, Globals, GpuSpecs, Modifiers, Output, Pixels,
     PlatformDisplay, PlatformInput, Point, PromptButton, PromptLevel, RequestFrameOptions,
-    ResizeEdge, ScaledPixels, Size, Tiling, WaylandClientStatePtr, WindowAppearance,
-    WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowControls, WindowDecorations,
-    WindowParams, px, size,
+    ResizeEdge, Size, Tiling, WaylandClientStatePtr, WindowAppearance, WindowBackgroundAppearance,
+    WindowBounds, WindowControlArea, WindowControls, WindowDecorations, WindowParams, px, size,
 };
 use crate::{
     Capslock,
@@ -1078,7 +1077,7 @@ impl PlatformWindow for WaylandWindow {
         }
     }
 
-    fn update_ime_position(&self, bounds: Bounds<ScaledPixels>) {
+    fn update_ime_position(&self, bounds: Bounds<Pixels>) {
         let state = self.borrow();
         state.client.update_ime_position(bounds);
     }
diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 9a43bd6470..42c59701d3 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -62,8 +62,7 @@ use crate::{
     AnyWindowHandle, Bounds, ClipboardItem, CursorStyle, DisplayId, FileDropEvent, Keystroke,
     LinuxKeyboardLayout, Modifiers, ModifiersChangedEvent, MouseButton, Pixels, Platform,
     PlatformDisplay, PlatformInput, PlatformKeyboardLayout, Point, RequestFrameOptions,
-    ScaledPixels, ScrollDelta, Size, TouchPhase, WindowParams, X11Window,
-    modifiers_from_xinput_info, point, px,
+    ScrollDelta, Size, TouchPhase, WindowParams, X11Window, modifiers_from_xinput_info, point, px,
 };
 
 /// Value for DeviceId parameters which selects all devices.
@@ -252,7 +251,7 @@ impl X11ClientStatePtr {
         }
     }
 
-    pub fn update_ime_position(&self, bounds: Bounds<ScaledPixels>) {
+    pub fn update_ime_position(&self, bounds: Bounds<Pixels>) {
         let Some(client) = self.get_client() else {
             return;
         };
@@ -270,6 +269,7 @@ impl X11ClientStatePtr {
             state.ximc = Some(ximc);
             return;
         };
+        let scaled_bounds = bounds.scale(state.scale_factor);
         let ic_attributes = ximc
             .build_ic_attributes()
             .push(
@@ -282,8 +282,8 @@ impl X11ClientStatePtr {
                 b.push(
                     xim::AttributeName::SpotLocation,
                     xim::Point {
-                        x: u32::from(bounds.origin.x + bounds.size.width) as i16,
-                        y: u32::from(bounds.origin.y + bounds.size.height) as i16,
+                        x: u32::from(scaled_bounds.origin.x + scaled_bounds.size.width) as i16,
+                        y: u32::from(scaled_bounds.origin.y + scaled_bounds.size.height) as i16,
                     },
                 );
             })
@@ -703,14 +703,14 @@ impl X11Client {
                 state.xim_handler = Some(xim_handler);
                 return;
             };
-            if let Some(area) = window.get_ime_area() {
+            if let Some(scaled_area) = window.get_ime_area() {
                 ic_attributes =
                     ic_attributes.nested_list(xim::AttributeName::PreeditAttributes, |b| {
                         b.push(
                             xim::AttributeName::SpotLocation,
                             xim::Point {
-                                x: u32::from(area.origin.x + area.size.width) as i16,
-                                y: u32::from(area.origin.y + area.size.height) as i16,
+                                x: u32::from(scaled_area.origin.x + scaled_area.size.width) as i16,
+                                y: u32::from(scaled_area.origin.y + scaled_area.size.height) as i16,
                             },
                         );
                     });
@@ -1351,7 +1351,7 @@ impl X11Client {
         drop(state);
         window.handle_ime_preedit(text);
 
-        if let Some(area) = window.get_ime_area() {
+        if let Some(scaled_area) = window.get_ime_area() {
             let ic_attributes = ximc
                 .build_ic_attributes()
                 .push(
@@ -1364,8 +1364,8 @@ impl X11Client {
                     b.push(
                         xim::AttributeName::SpotLocation,
                         xim::Point {
-                            x: u32::from(area.origin.x + area.size.width) as i16,
-                            y: u32::from(area.origin.y + area.size.height) as i16,
+                            x: u32::from(scaled_area.origin.x + scaled_area.size.width) as i16,
+                            y: u32::from(scaled_area.origin.y + scaled_area.size.height) as i16,
                         },
                     );
                 })
diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs
index 6af943b317..79a4383725 100644
--- a/crates/gpui/src/platform/linux/x11/window.rs
+++ b/crates/gpui/src/platform/linux/x11/window.rs
@@ -1019,8 +1019,9 @@ impl X11WindowStatePtr {
         }
     }
 
-    pub fn get_ime_area(&self) -> Option<Bounds<Pixels>> {
+    pub fn get_ime_area(&self) -> Option<Bounds<ScaledPixels>> {
         let mut state = self.state.borrow_mut();
+        let scale_factor = state.scale_factor;
         let mut bounds: Option<Bounds<Pixels>> = None;
         if let Some(mut input_handler) = state.input_handler.take() {
             drop(state);
@@ -1030,7 +1031,7 @@ impl X11WindowStatePtr {
             let mut state = self.state.borrow_mut();
             state.input_handler = Some(input_handler);
         };
-        bounds
+        bounds.map(|b| b.scale(scale_factor))
     }
 
     pub fn set_bounds(&self, bounds: Bounds<i32>) -> anyhow::Result<()> {
@@ -1618,7 +1619,7 @@ impl PlatformWindow for X11Window {
         }
     }
 
-    fn update_ime_position(&self, bounds: Bounds<ScaledPixels>) {
+    fn update_ime_position(&self, bounds: Bounds<Pixels>) {
         let mut state = self.0.state.borrow_mut();
         let client = state.client.clone();
         drop(state);
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 686cfb314e..1230a70406 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -4,10 +4,9 @@ use crate::{
     ForegroundExecutor, KeyDownEvent, Keystroke, Modifiers, ModifiersChangedEvent, MouseButton,
     MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay,
     PlatformInput, PlatformWindow, Point, PromptButton, PromptLevel, RequestFrameOptions,
-    ScaledPixels, SharedString, Size, SystemWindowTab, Timer, WindowAppearance,
-    WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowKind, WindowParams,
-    dispatch_get_main_queue, dispatch_sys::dispatch_async_f, platform::PlatformInputHandler, point,
-    px, size,
+    SharedString, Size, SystemWindowTab, Timer, WindowAppearance, WindowBackgroundAppearance,
+    WindowBounds, WindowControlArea, WindowKind, WindowParams, dispatch_get_main_queue,
+    dispatch_sys::dispatch_async_f, platform::PlatformInputHandler, point, px, size,
 };
 use block::ConcreteBlock;
 use cocoa::{
@@ -1480,7 +1479,7 @@ impl PlatformWindow for MacWindow {
         None
     }
 
-    fn update_ime_position(&self, _bounds: Bounds<ScaledPixels>) {
+    fn update_ime_position(&self, _bounds: Bounds<Pixels>) {
         let executor = self.0.lock().executor.clone();
         executor
             .spawn(async move {
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index e15bd7aeec..9e87f4504d 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -1,8 +1,8 @@
 use crate::{
     AnyWindowHandle, AtlasKey, AtlasTextureId, AtlasTile, Bounds, DispatchEventResult, GpuSpecs,
     Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow,
-    Point, PromptButton, RequestFrameOptions, ScaledPixels, Size, TestPlatform, TileId,
-    WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowParams,
+    Point, PromptButton, RequestFrameOptions, Size, TestPlatform, TileId, WindowAppearance,
+    WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowParams,
 };
 use collections::HashMap;
 use parking_lot::Mutex;
@@ -289,7 +289,7 @@ impl PlatformWindow for TestWindow {
         unimplemented!()
     }
 
-    fn update_ime_position(&self, _bounds: Bounds<ScaledPixels>) {}
+    fn update_ime_position(&self, _bounds: Bounds<Pixels>) {}
 
     fn gpu_specs(&self) -> Option<GpuSpecs> {
         None
diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs
index 9d001da822..aa907c8d73 100644
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -839,7 +839,7 @@ impl PlatformWindow for WindowsWindow {
         self.0.state.borrow().renderer.gpu_specs().log_err()
     }
 
-    fn update_ime_position(&self, _bounds: Bounds<ScaledPixels>) {
+    fn update_ime_position(&self, _bounds: Bounds<Pixels>) {
         // There is no such thing on Windows.
     }
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 0ec73c4b00..61d15cb3ed 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -4096,9 +4096,7 @@ impl Window {
         self.on_next_frame(|window, cx| {
             if let Some(mut input_handler) = window.platform_window.take_input_handler() {
                 if let Some(bounds) = input_handler.selected_bounds(window, cx) {
-                    window
-                        .platform_window
-                        .update_ime_position(bounds.scale(window.scale_factor()));
+                    window.platform_window.update_ime_position(bounds);
                 }
                 window.platform_window.set_input_handler(input_handler);
             }

From 4124bedab796d2ac0a1e57f8b94f72500969797a Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 5 Sep 2025 08:54:08 +0200
Subject: [PATCH 624/823] gpui: Skip `test` attribute expansion for
 rust-analyzer (#37611)

The `test` attribute doesn't really matter to rust-analyzer, so we can
make use of its cfg to have it think its just the standard test
attribute which should make rust-analyzer slightly less resource
intensive in zed. It also should prevent some IDE features from possibly
failing within tests.

Notably this has no effect outside of this repo, as the `rust-analyzer`
cfg only takes effect on workspace member crates.

Ideally we'd use the ignored proc macro config here but rust-analyzer
still doesn't have toml configs working unfortunately.

Release Notes:

- N/A
---
 crates/gpui/src/gpui.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 3c4ee41c16..0858cb014e 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -121,6 +121,14 @@ mod seal {
     pub trait Sealed {}
 }
 
+// This allows r-a to skip expanding the gpui test macro which should
+// reduce resource usage a bit as the test attribute is special cased
+// to be treated as a no-op.
+#[cfg(rust_analyzer)]
+pub use core::prelude::v1::test;
+#[cfg(not(rust_analyzer))]
+pub use gpui_macros::test;
+
 pub use action::*;
 pub use anyhow::Result;
 pub use app::*;
@@ -134,7 +142,7 @@ pub use elements::*;
 pub use executor::*;
 pub use geometry::*;
 pub use global::*;
-pub use gpui_macros::{AppContext, IntoElement, Render, VisualContext, register_action, test};
+pub use gpui_macros::{AppContext, IntoElement, Render, VisualContext, register_action};
 pub use http_client;
 pub use input::*;
 pub use inspector::*;

From bed358718b6693fb32e63ea5d6f3c4d41cbf1277 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 5 Sep 2025 09:56:53 +0200
Subject: [PATCH 625/823] agent_ui: Fix index panic in
 `SlashCommandCompletion::try_parse` (#37612)

Release Notes:

- N/A
---
 .../agent_ui/src/acp/completion_provider.rs   | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 44e81433ab..ecaa9cd450 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1025,43 +1025,31 @@ impl SlashCommandCompletion {
             return None;
         }
 
-        let last_command_start = line.rfind('/')?;
-        if last_command_start >= line.len() {
-            return Some(Self::default());
-        }
-        if last_command_start > 0
-            && line
-                .chars()
-                .nth(last_command_start - 1)
-                .is_some_and(|c| !c.is_whitespace())
+        let (prefix, last_command) = line.rsplit_once('/')?;
+        if prefix.chars().last().is_some_and(|c| !c.is_whitespace())
+            || last_command.starts_with(char::is_whitespace)
         {
             return None;
         }
 
-        let rest_of_line = &line[last_command_start + 1..];
-
-        let mut command = None;
         let mut argument = None;
-        let mut end = last_command_start + 1;
-
-        if let Some(command_text) = rest_of_line.split_whitespace().next() {
-            command = Some(command_text.to_string());
-            end += command_text.len();
-
-            // Find the start of arguments after the command
-            if let Some(args_start) =
-                rest_of_line[command_text.len()..].find(|c: char| !c.is_whitespace())
-            {
-                let args = &rest_of_line[command_text.len() + args_start..].trim_end();
-                if !args.is_empty() {
-                    argument = Some(args.to_string());
-                    end += args.len() + 1;
-                }
+        let mut command = None;
+        if let Some((command_text, args)) = last_command.split_once(char::is_whitespace) {
+            if !args.is_empty() {
+                argument = Some(args.trim_end().to_string());
             }
-        }
+            command = Some(command_text.to_string());
+        } else if !last_command.is_empty() {
+            command = Some(last_command.to_string());
+        };
 
         Some(Self {
-            source_range: last_command_start + offset_to_line..end + offset_to_line,
+            source_range: prefix.len() + offset_to_line
+                ..line
+                    .rfind(|c: char| !c.is_whitespace())
+                    .unwrap_or_else(|| line.len())
+                    + 1
+                    + offset_to_line,
             command,
             argument,
         })
@@ -1180,6 +1168,15 @@ mod tests {
             })
         );
 
+        assert_eq!(
+            SlashCommandCompletion::try_parse("/拿不到命令 拿不到命令 ", 0),
+            Some(SlashCommandCompletion {
+                source_range: 0..30,
+                command: Some("拿不到命令".to_string()),
+                argument: Some("拿不到命令".to_string()),
+            })
+        );
+
         assert_eq!(SlashCommandCompletion::try_parse("Lorem Ipsum", 0), None);
 
         assert_eq!(SlashCommandCompletion::try_parse("Lorem /", 0), None);
@@ -1187,6 +1184,8 @@ mod tests {
         assert_eq!(SlashCommandCompletion::try_parse("Lorem /help", 0), None);
 
         assert_eq!(SlashCommandCompletion::try_parse("Lorem/", 0), None);
+
+        assert_eq!(SlashCommandCompletion::try_parse("/ ", 0), None);
     }
 
     #[test]

From ec58adca131ce2232ccd186947213e6255e6987d Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 5 Sep 2025 13:16:15 +0200
Subject: [PATCH 626/823] languages: Invoke conda activate in conda
 environments (#37627)

This isn't quite right, but using the env manager path causes conda to
scream and I am not yet sure why, either way this is an improvement over
the status quo

Release Notes:

- N/A\
---
 crates/languages/src/python.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 5e6f5e414f..06fb49293f 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -902,6 +902,13 @@ impl ToolchainLister for PythonToolchainProvider {
                 let env = toolchain.name.as_deref().unwrap_or("default");
                 activation_script.push(format!("pixi shell -e {env}"))
             }
+            Some(PythonEnvironmentKind::Conda) => {
+                if let Some(name) = &toolchain.name {
+                    activation_script.push(format!("conda activate {name}"));
+                } else {
+                    activation_script.push("conda activate".to_string());
+                }
+            }
             Some(PythonEnvironmentKind::Venv | PythonEnvironmentKind::VirtualEnv) => {
                 if let Some(prefix) = &toolchain.prefix {
                     let activate_keyword = match shell {

From 16c4fd4fc563eeedc645a50931129908bc3bfb07 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Fri, 5 Sep 2025 13:19:57 +0200
Subject: [PATCH 627/823] gpui: move Option -> Result conversion out of closure
 in App::update_window_id (#37624)

Doesn't fix anything, but it seems that we do not need to assert and
convert into an error until after the closure run to completion,
especially since this is the only error we throw.

Release Notes:

- N/A
---
 crates/gpui/src/app.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 69d5c0ee43..8b0b404d1d 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1358,12 +1358,7 @@ impl App {
         F: FnOnce(AnyView, &mut Window, &mut App) -> T,
     {
         self.update(|cx| {
-            let mut window = cx
-                .windows
-                .get_mut(id)
-                .context("window not found")?
-                .take()
-                .context("window not found")?;
+            let mut window = cx.windows.get_mut(id)?.take()?;
 
             let root_view = window.root.clone().unwrap();
 
@@ -1380,15 +1375,14 @@ impl App {
                     true
                 });
             } else {
-                cx.windows
-                    .get_mut(id)
-                    .context("window not found")?
-                    .replace(window);
+                cx.windows.get_mut(id)?.replace(window);
             }
 
-            Ok(result)
+            Some(result)
         })
+        .context("window not found")
     }
+
     /// Creates an `AsyncApp`, which can be cloned and has a static lifetime
     /// so it can be held across `await` points.
     pub fn to_async(&self) -> AsyncApp {

From e30f45cf64dcac1943cf726fad2ff55f8018057b Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 5 Sep 2025 14:22:32 +0200
Subject: [PATCH 628/823] Syntax tree view improvements (#37570)

In an effort to improve the experience while developing extensions and
improving themes, this PR updates the syntax tree views behavior
slightly.

Before, the view would always update to the current active editor whilst
being used. This was quite painful for improving extension scheme files,
as you would always have to change back and forth between editors to
have a view at the relevant syntax tree.

With this PR, the syntax tree view will now stay attached to the editor
it was opened in, similar to preview views. Once the view is shown, the
`UseActiveEditor` will become available in the command palette and
enable the user to update the view to the last focused editor. On file
close, the view will also be updated accordingly.



https://github.com/user-attachments/assets/922075e5-9da0-4c1d-9e1a-51e024bf41ea

A button is also shown whenever switching is possible.

Futhermore, improved the empty state of the view.

Lastly, a drive-by cleanup of the `show_action_types` method so there is
no need to call `iter()` when calling the method.


Release Notes:

- The syntax tree view will now stay attached to the buffer it was
opened in, similar to the Markdown preview. Use the `UseActiveEditor`
action when the view is shown to change it to the last focused editor.
---
 Cargo.lock                                    |   1 +
 crates/agent_ui/src/agent_ui.rs               |   3 +-
 .../src/command_palette_hooks.rs              |   4 +-
 crates/copilot/src/copilot.rs                 |   2 +-
 crates/language_tools/Cargo.toml              |   1 +
 crates/language_tools/src/syntax_tree_view.rs | 393 +++++++++++++-----
 crates/settings_ui/src/settings_ui.rs         |   2 +-
 crates/workspace/src/workspace.rs             |   6 +
 crates/zed/src/zed.rs                         |   3 +-
 crates/zeta/src/init.rs                       |   4 +-
 10 files changed, 301 insertions(+), 118 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c5e6c85881..b0fb3b6f49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9247,6 +9247,7 @@ dependencies = [
  "anyhow",
  "client",
  "collections",
+ "command_palette_hooks",
  "copilot",
  "editor",
  "futures 0.3.31",
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 93a4a8f748..e60c0baff9 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -337,8 +337,7 @@ fn update_command_palette_filter(cx: &mut App) {
             ];
             filter.show_action_types(edit_prediction_actions.iter());
 
-            filter
-                .show_action_types([TypeId::of::<zed_actions::OpenZedPredictOnboarding>()].iter());
+            filter.show_action_types(&[TypeId::of::<zed_actions::OpenZedPredictOnboarding>()]);
         }
     });
 }
diff --git a/crates/command_palette_hooks/src/command_palette_hooks.rs b/crates/command_palette_hooks/src/command_palette_hooks.rs
index df64d53874..f1344c5ba6 100644
--- a/crates/command_palette_hooks/src/command_palette_hooks.rs
+++ b/crates/command_palette_hooks/src/command_palette_hooks.rs
@@ -76,7 +76,7 @@ impl CommandPaletteFilter {
     }
 
     /// Hides all actions with the given types.
-    pub fn hide_action_types(&mut self, action_types: &[TypeId]) {
+    pub fn hide_action_types<'a>(&mut self, action_types: impl IntoIterator<Item = &'a TypeId>) {
         for action_type in action_types {
             self.hidden_action_types.insert(*action_type);
             self.shown_action_types.remove(action_type);
@@ -84,7 +84,7 @@ impl CommandPaletteFilter {
     }
 
     /// Shows all actions with the given types.
-    pub fn show_action_types<'a>(&mut self, action_types: impl Iterator<Item = &'a TypeId>) {
+    pub fn show_action_types<'a>(&mut self, action_types: impl IntoIterator<Item = &'a TypeId>) {
         for action_type in action_types {
             self.shown_action_types.insert(*action_type);
             self.hidden_action_types.remove(action_type);
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index d0a57735ab..61b7a4e18e 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -1095,7 +1095,7 @@ impl Copilot {
                 _ => {
                     filter.hide_action_types(&signed_in_actions);
                     filter.hide_action_types(&auth_actions);
-                    filter.show_action_types(no_auth_actions.iter());
+                    filter.show_action_types(&no_auth_actions);
                 }
             }
         }
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index b8f85d8d90..bbac900cde 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -16,6 +16,7 @@ doctest = false
 anyhow.workspace = true
 client.workspace = true
 collections.workspace = true
+command_palette_hooks.workspace = true
 copilot.workspace = true
 editor.workspace = true
 futures.workspace = true
diff --git a/crates/language_tools/src/syntax_tree_view.rs b/crates/language_tools/src/syntax_tree_view.rs
index cf84ac34c4..5700d8d487 100644
--- a/crates/language_tools/src/syntax_tree_view.rs
+++ b/crates/language_tools/src/syntax_tree_view.rs
@@ -1,17 +1,22 @@
+use command_palette_hooks::CommandPaletteFilter;
 use editor::{Anchor, Editor, ExcerptId, SelectionEffects, scroll::Autoscroll};
 use gpui::{
-    App, AppContext as _, Context, Div, Entity, EventEmitter, FocusHandle, Focusable, Hsla,
-    InteractiveElement, IntoElement, MouseButton, MouseDownEvent, MouseMoveEvent, ParentElement,
-    Render, ScrollStrategy, SharedString, Styled, UniformListScrollHandle, WeakEntity, Window,
-    actions, div, rems, uniform_list,
+    App, AppContext as _, Context, Div, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
+    Hsla, InteractiveElement, IntoElement, MouseButton, MouseDownEvent, MouseMoveEvent,
+    ParentElement, Render, ScrollStrategy, SharedString, Styled, UniformListScrollHandle,
+    WeakEntity, Window, actions, div, rems, uniform_list,
 };
 use language::{Buffer, OwnedSyntaxLayer};
-use std::{mem, ops::Range};
+use std::{any::TypeId, mem, ops::Range};
 use theme::ActiveTheme;
 use tree_sitter::{Node, TreeCursor};
-use ui::{ButtonLike, Color, ContextMenu, Label, LabelCommon, PopoverMenu, h_flex};
+use ui::{
+    ButtonCommon, ButtonLike, Clickable, Color, ContextMenu, FluentBuilder as _, IconButton,
+    IconName, Label, LabelCommon, LabelSize, PopoverMenu, StyledExt, Tooltip, h_flex, v_flex,
+};
 use workspace::{
-    SplitDirection, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
+    Event as WorkspaceEvent, SplitDirection, ToolbarItemEvent, ToolbarItemLocation,
+    ToolbarItemView, Workspace,
     item::{Item, ItemHandle},
 };
 
@@ -19,17 +24,51 @@ actions!(
     dev,
     [
         /// Opens the syntax tree view for the current file.
-        OpenSyntaxTreeView
+        OpenSyntaxTreeView,
+    ]
+);
+
+actions!(
+    syntax_tree_view,
+    [
+        /// Update the syntax tree view to show the last focused file.
+        UseActiveEditor
     ]
 );
 
 pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &OpenSyntaxTreeView, window, cx| {
+    let syntax_tree_actions = [TypeId::of::<UseActiveEditor>()];
+
+    CommandPaletteFilter::update_global(cx, |this, _| {
+        this.hide_action_types(&syntax_tree_actions);
+    });
+
+    cx.observe_new(move |workspace: &mut Workspace, _, _| {
+        workspace.register_action(move |workspace, _: &OpenSyntaxTreeView, window, cx| {
+            CommandPaletteFilter::update_global(cx, |this, _| {
+                this.show_action_types(&syntax_tree_actions);
+            });
+
             let active_item = workspace.active_item(cx);
             let workspace_handle = workspace.weak_handle();
-            let syntax_tree_view =
-                cx.new(|cx| SyntaxTreeView::new(workspace_handle, active_item, window, cx));
+            let syntax_tree_view = cx.new(|cx| {
+                cx.on_release(move |view: &mut SyntaxTreeView, cx| {
+                    if view
+                        .workspace_handle
+                        .read_with(cx, |workspace, cx| {
+                            workspace.item_of_type::<SyntaxTreeView>(cx).is_none()
+                        })
+                        .unwrap_or_default()
+                    {
+                        CommandPaletteFilter::update_global(cx, |this, _| {
+                            this.hide_action_types(&syntax_tree_actions);
+                        });
+                    }
+                })
+                .detach();
+
+                SyntaxTreeView::new(workspace_handle, active_item, window, cx)
+            });
             workspace.split_item(
                 SplitDirection::Right,
                 Box::new(syntax_tree_view),
@@ -37,6 +76,13 @@ pub fn init(cx: &mut App) {
                 cx,
             )
         });
+        workspace.register_action(|workspace, _: &UseActiveEditor, window, cx| {
+            if let Some(tree_view) = workspace.item_of_type::<SyntaxTreeView>(cx) {
+                tree_view.update(cx, |view, cx| {
+                    view.update_active_editor(&Default::default(), window, cx)
+                })
+            }
+        });
     })
     .detach();
 }
@@ -45,6 +91,9 @@ pub struct SyntaxTreeView {
     workspace_handle: WeakEntity<Workspace>,
     editor: Option<EditorState>,
     list_scroll_handle: UniformListScrollHandle,
+    /// The last active editor in the workspace. Note that this is specifically not the
+    /// currently shown editor.
+    last_active_editor: Option<Entity<Editor>>,
     selected_descendant_ix: Option<usize>,
     hovered_descendant_ix: Option<usize>,
     focus_handle: FocusHandle,
@@ -61,6 +110,14 @@ struct EditorState {
     _subscription: gpui::Subscription,
 }
 
+impl EditorState {
+    fn has_language(&self) -> bool {
+        self.active_buffer
+            .as_ref()
+            .is_some_and(|buffer| buffer.active_layer.is_some())
+    }
+}
+
 #[derive(Clone)]
 struct BufferState {
     buffer: Entity<Buffer>,
@@ -79,17 +136,25 @@ impl SyntaxTreeView {
             workspace_handle: workspace_handle.clone(),
             list_scroll_handle: UniformListScrollHandle::new(),
             editor: None,
+            last_active_editor: None,
             hovered_descendant_ix: None,
             selected_descendant_ix: None,
             focus_handle: cx.focus_handle(),
         };
 
-        this.workspace_updated(active_item, window, cx);
-        cx.observe_in(
+        this.handle_item_updated(active_item, window, cx);
+
+        cx.subscribe_in(
             &workspace_handle.upgrade().unwrap(),
             window,
-            |this, workspace, window, cx| {
-                this.workspace_updated(workspace.read(cx).active_item(cx), window, cx);
+            move |this, workspace, event, window, cx| match event {
+                WorkspaceEvent::ItemAdded { .. } | WorkspaceEvent::ActiveItemChanged => {
+                    this.handle_item_updated(workspace.read(cx).active_item(cx), window, cx)
+                }
+                WorkspaceEvent::ItemRemoved { item_id } => {
+                    this.handle_item_removed(item_id, window, cx);
+                }
+                _ => {}
             },
         )
         .detach();
@@ -97,20 +162,56 @@ impl SyntaxTreeView {
         this
     }
 
-    fn workspace_updated(
+    fn handle_item_updated(
         &mut self,
         active_item: Option<Box<dyn ItemHandle>>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if let Some(item) = active_item
-            && item.item_id() != cx.entity_id()
-            && let Some(editor) = item.act_as::<Editor>(cx)
-        {
+        let Some(editor) = active_item
+            .filter(|item| item.item_id() != cx.entity_id())
+            .and_then(|item| item.act_as::<Editor>(cx))
+        else {
+            return;
+        };
+
+        if let Some(editor_state) = self.editor.as_ref().filter(|state| state.has_language()) {
+            self.last_active_editor = (editor_state.editor != editor).then_some(editor);
+        } else {
             self.set_editor(editor, window, cx);
         }
     }
 
+    fn handle_item_removed(
+        &mut self,
+        item_id: &EntityId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if self
+            .editor
+            .as_ref()
+            .is_some_and(|state| state.editor.entity_id() == *item_id)
+        {
+            self.editor = None;
+            // Try activating the last active editor if there is one
+            self.update_active_editor(&Default::default(), window, cx);
+            cx.notify();
+        }
+    }
+
+    fn update_active_editor(
+        &mut self,
+        _: &UseActiveEditor,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(editor) = self.last_active_editor.take() else {
+            return;
+        };
+        self.set_editor(editor, window, cx);
+    }
+
     fn set_editor(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(state) = &self.editor {
             if state.editor == editor {
@@ -294,101 +395,153 @@ impl SyntaxTreeView {
         .pl(rems(depth as f32))
         .hover(|style| style.bg(colors.element_hover))
     }
+
+    fn compute_items(
+        &mut self,
+        layer: &OwnedSyntaxLayer,
+        range: Range<usize>,
+        cx: &Context<Self>,
+    ) -> Vec<Div> {
+        let mut items = Vec::new();
+        let mut cursor = layer.node().walk();
+        let mut descendant_ix = range.start;
+        cursor.goto_descendant(descendant_ix);
+        let mut depth = cursor.depth();
+        let mut visited_children = false;
+        while descendant_ix < range.end {
+            if visited_children {
+                if cursor.goto_next_sibling() {
+                    visited_children = false;
+                } else if cursor.goto_parent() {
+                    depth -= 1;
+                } else {
+                    break;
+                }
+            } else {
+                items.push(
+                    Self::render_node(
+                        &cursor,
+                        depth,
+                        Some(descendant_ix) == self.selected_descendant_ix,
+                        cx,
+                    )
+                    .on_mouse_down(
+                        MouseButton::Left,
+                        cx.listener(move |tree_view, _: &MouseDownEvent, window, cx| {
+                            tree_view.update_editor_with_range_for_descendant_ix(
+                                descendant_ix,
+                                window,
+                                cx,
+                                |editor, mut range, window, cx| {
+                                    // Put the cursor at the beginning of the node.
+                                    mem::swap(&mut range.start, &mut range.end);
+
+                                    editor.change_selections(
+                                        SelectionEffects::scroll(Autoscroll::newest()),
+                                        window,
+                                        cx,
+                                        |selections| {
+                                            selections.select_ranges(vec![range]);
+                                        },
+                                    );
+                                },
+                            );
+                        }),
+                    )
+                    .on_mouse_move(cx.listener(
+                        move |tree_view, _: &MouseMoveEvent, window, cx| {
+                            if tree_view.hovered_descendant_ix != Some(descendant_ix) {
+                                tree_view.hovered_descendant_ix = Some(descendant_ix);
+                                tree_view.update_editor_with_range_for_descendant_ix(
+                                    descendant_ix,
+                                    window,
+                                    cx,
+                                    |editor, range, _, cx| {
+                                        editor.clear_background_highlights::<Self>(cx);
+                                        editor.highlight_background::<Self>(
+                                            &[range],
+                                            |theme| {
+                                                theme
+                                                    .colors()
+                                                    .editor_document_highlight_write_background
+                                            },
+                                            cx,
+                                        );
+                                    },
+                                );
+                                cx.notify();
+                            }
+                        },
+                    )),
+                );
+                descendant_ix += 1;
+                if cursor.goto_first_child() {
+                    depth += 1;
+                } else {
+                    visited_children = true;
+                }
+            }
+        }
+        items
+    }
 }
 
 impl Render for SyntaxTreeView {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut rendered = div().flex_1().bg(cx.theme().colors().editor_background);
+        div()
+            .flex_1()
+            .bg(cx.theme().colors().editor_background)
+            .map(|this| {
+                let editor_state = self.editor.as_ref();
 
-        if let Some(layer) = self
-            .editor
-            .as_ref()
-            .and_then(|editor| editor.active_buffer.as_ref())
-            .and_then(|buffer| buffer.active_layer.as_ref())
-        {
-            let layer = layer.clone();
-            rendered = rendered.child(uniform_list(
-                "SyntaxTreeView",
-                layer.node().descendant_count(),
-                cx.processor(move |this, range: Range<usize>, _, cx| {
-                    let mut items = Vec::new();
-                    let mut cursor = layer.node().walk();
-                    let mut descendant_ix = range.start;
-                    cursor.goto_descendant(descendant_ix);
-                    let mut depth = cursor.depth();
-                    let mut visited_children = false;
-                    while descendant_ix < range.end {
-                        if visited_children {
-                            if cursor.goto_next_sibling() {
-                                visited_children = false;
-                            } else if cursor.goto_parent() {
-                                depth -= 1;
+                if let Some(layer) = editor_state
+                    .and_then(|editor| editor.active_buffer.as_ref())
+                    .and_then(|buffer| buffer.active_layer.as_ref())
+                {
+                    let layer = layer.clone();
+                    this.child(
+                        uniform_list(
+                            "SyntaxTreeView",
+                            layer.node().descendant_count(),
+                            cx.processor(move |this, range: Range<usize>, _, cx| {
+                                this.compute_items(&layer, range, cx)
+                            }),
+                        )
+                        .size_full()
+                        .track_scroll(self.list_scroll_handle.clone())
+                        .text_bg(cx.theme().colors().background)
+                        .into_any_element(),
+                    )
+                } else {
+                    let inner_content = v_flex()
+                        .items_center()
+                        .text_center()
+                        .gap_2()
+                        .max_w_3_5()
+                        .map(|this| {
+                            if editor_state.is_some_and(|state| !state.has_language()) {
+                                this.child(Label::new("Current editor has no associated language"))
+                                    .child(
+                                        Label::new(concat!(
+                                            "Try assigning a language or",
+                                            "switching to a different buffer"
+                                        ))
+                                        .size(LabelSize::Small),
+                                    )
                             } else {
-                                break;
-                            }
-                        } else {
-                            items.push(
-                                Self::render_node(
-                                    &cursor,
-                                    depth,
-                                    Some(descendant_ix) == this.selected_descendant_ix,
-                                    cx,
+                                this.child(Label::new("Not attached to an editor")).child(
+                                    Label::new("Focus an editor to show a new tree view")
+                                        .size(LabelSize::Small),
                                 )
-                                .on_mouse_down(
-                                    MouseButton::Left,
-                                    cx.listener(move |tree_view, _: &MouseDownEvent, window, cx| {
-                                        tree_view.update_editor_with_range_for_descendant_ix(
-                                            descendant_ix,
-                                            window, cx,
-                                            |editor, mut range, window, cx| {
-                                                // Put the cursor at the beginning of the node.
-                                                mem::swap(&mut range.start, &mut range.end);
-
-                                                editor.change_selections(
-                                                    SelectionEffects::scroll(Autoscroll::newest()),
-                                                    window, cx,
-                                                    |selections| {
-                                                        selections.select_ranges(vec![range]);
-                                                    },
-                                                );
-                                            },
-                                        );
-                                    }),
-                                )
-                                .on_mouse_move(cx.listener(
-                                    move |tree_view, _: &MouseMoveEvent, window, cx| {
-                                        if tree_view.hovered_descendant_ix != Some(descendant_ix) {
-                                            tree_view.hovered_descendant_ix = Some(descendant_ix);
-                                            tree_view.update_editor_with_range_for_descendant_ix(descendant_ix, window, cx, |editor, range, _, cx| {
-                                                editor.clear_background_highlights::<Self>( cx);
-                                                editor.highlight_background::<Self>(
-                                                    &[range],
-                                                    |theme| theme.colors().editor_document_highlight_write_background,
-                                                     cx,
-                                                );
-                                            });
-                                            cx.notify();
-                                        }
-                                    },
-                                )),
-                            );
-                            descendant_ix += 1;
-                            if cursor.goto_first_child() {
-                                depth += 1;
-                            } else {
-                                visited_children = true;
                             }
-                        }
-                    }
-                    items
-                }),
-            )
-            .size_full()
-            .track_scroll(self.list_scroll_handle.clone())
-            .text_bg(cx.theme().colors().background).into_any_element());
-        }
+                        });
 
-        rendered
+                    this.h_flex()
+                        .size_full()
+                        .justify_center()
+                        .child(inner_content)
+                }
+            })
     }
 }
 
@@ -506,6 +659,26 @@ impl SyntaxTreeToolbarItemView {
             .child(Label::new(active_layer.language.name()))
             .child(Label::new(format_node_range(active_layer.node())))
     }
+
+    fn render_update_button(&mut self, cx: &mut Context<Self>) -> Option<IconButton> {
+        self.tree_view.as_ref().and_then(|view| {
+            view.update(cx, |view, cx| {
+                view.last_active_editor.as_ref().map(|editor| {
+                    IconButton::new("syntax-view-update", IconName::RotateCw)
+                        .tooltip({
+                            let active_tab_name = editor.read_with(cx, |editor, cx| {
+                                editor.tab_content_text(Default::default(), cx)
+                            });
+
+                            Tooltip::text(format!("Update view to '{active_tab_name}'"))
+                        })
+                        .on_click(cx.listener(|this, _, window, cx| {
+                            this.update_active_editor(&Default::default(), window, cx);
+                        }))
+                })
+            })
+        })
+    }
 }
 
 fn format_node_range(node: Node) -> String {
@@ -522,8 +695,10 @@ fn format_node_range(node: Node) -> String {
 
 impl Render for SyntaxTreeToolbarItemView {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        self.render_menu(cx)
-            .unwrap_or_else(|| PopoverMenu::new("Empty Syntax Tree"))
+        h_flex()
+            .gap_1()
+            .children(self.render_menu(cx))
+            .children(self.render_update_button(cx))
     }
 }
 
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index d736f0e174..5fea6dfceb 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -70,7 +70,7 @@ pub fn init(cx: &mut App) {
             move |is_enabled, _workspace, _, cx| {
                 if is_enabled {
                     CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                        filter.show_action_types(settings_ui_actions.iter());
+                        filter.show_action_types(&settings_ui_actions);
                     });
                 } else {
                     CommandPaletteFilter::update_global(cx, |filter, _cx| {
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index af86517bb4..0bfcaaf593 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1031,6 +1031,9 @@ pub enum Event {
         item: Box<dyn ItemHandle>,
     },
     ActiveItemChanged,
+    ItemRemoved {
+        item_id: EntityId,
+    },
     UserSavedItem {
         pane: WeakEntity<Pane>,
         item: Box<dyn WeakItemHandle>,
@@ -3945,6 +3948,9 @@ impl Workspace {
                 {
                     entry.remove();
                 }
+                cx.emit(Event::ItemRemoved {
+                    item_id: item.item_id(),
+                });
             }
             pane::Event::Focus => {
                 window.invalidate_character_coordinates();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 96f0f261dc..864f6badeb 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4502,6 +4502,7 @@ mod tests {
                 "snippets",
                 "supermaven",
                 "svg",
+                "syntax_tree_view",
                 "tab_switcher",
                 "task",
                 "terminal",
@@ -4511,11 +4512,11 @@ mod tests {
                 "toolchain",
                 "variable_list",
                 "vim",
+                "window",
                 "workspace",
                 "zed",
                 "zed_predict_onboarding",
                 "zeta",
-                "window",
             ];
             assert_eq!(
                 all_namespaces,
diff --git a/crates/zeta/src/init.rs b/crates/zeta/src/init.rs
index 6e5b31f99a..f27667de63 100644
--- a/crates/zeta/src/init.rs
+++ b/crates/zeta/src/init.rs
@@ -86,7 +86,7 @@ fn feature_gate_predict_edits_actions(cx: &mut App) {
             if is_ai_disabled {
                 filter.hide_action_types(&zeta_all_action_types);
             } else if has_feature_flag {
-                filter.show_action_types(rate_completion_action_types.iter());
+                filter.show_action_types(&rate_completion_action_types);
             } else {
                 filter.hide_action_types(&rate_completion_action_types);
             }
@@ -98,7 +98,7 @@ fn feature_gate_predict_edits_actions(cx: &mut App) {
         if !DisableAiSettings::get_global(cx).disable_ai {
             if is_enabled {
                 CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                    filter.show_action_types(rate_completion_action_types.iter());
+                    filter.show_action_types(&rate_completion_action_types);
                 });
             } else {
                 CommandPaletteFilter::update_global(cx, |filter, _cx| {

From 74e8afe9a8f72b1ff0a1f5fd62d78f2eb15f7e15 Mon Sep 17 00:00:00 2001
From: Isaac Hales <ihales@users.noreply.github.com>
Date: Fri, 5 Sep 2025 08:57:58 -0600
Subject: [PATCH 629/823] Fix logic for default values for task variables
 (#37588)

This is a small fix for default values in task variables. The
[documentation](https://zed.dev/docs/tasks) states

> You can also use verbose syntax that allows specifying a default if a
given variable is not available: ${ZED_FILE:default_value}

I found, however, that this doesn't actually work. Instead, the Zed
variable and the default value are just appended in the output. For
example, if I run a task `echo ${ZED_ROW:100}` the result I get is
`447:100` (in this case it should just be `447`).

This PR fixes that. I also added a new test case for handling default
values.
I also tested the fix in a dev build and it seems to work.

There are no UI adjustments.

AI disclosure: I used Claude Code to write the code, including the fix
and the tests.

This is actually my first open-source PR ever, so if I did something
wrong, I'd appreciate any tips and I'll make it right!


Release Notes:

- Fixed task variable substitution always appending the default
---
 crates/task/src/task_template.rs | 94 +++++++++++++++++++++++++++++---
 1 file changed, 86 insertions(+), 8 deletions(-)

diff --git a/crates/task/src/task_template.rs b/crates/task/src/task_template.rs
index 3d1d180557..a57f5a175a 100644
--- a/crates/task/src/task_template.rs
+++ b/crates/task/src/task_template.rs
@@ -333,15 +333,16 @@ fn substitute_all_template_variables_in_str<A: AsRef<str>>(
             if let Some(substituted_variable) = variable_names.get(variable_name) {
                 substituted_variables.insert(substituted_variable.clone());
             }
-
-            let mut name = name.as_ref().to_owned();
-            // Got a task variable hit
-            if !default.is_empty() {
-                name.push_str(default);
-            }
-            return Ok(Some(name));
+            // Got a task variable hit - use the variable value, ignore default
+            return Ok(Some(name.as_ref().to_owned()));
         } else if variable_name.starts_with(ZED_VARIABLE_NAME_PREFIX) {
-            bail!("Unknown variable name: {variable_name}");
+            // Unknown ZED variable - use default if available
+            if !default.is_empty() {
+                // Strip the colon and return the default value
+                return Ok(Some(default[1..].to_owned()));
+            } else {
+                bail!("Unknown variable name: {variable_name}");
+            }
         }
         // This is an unknown variable.
         // We should not error out, as they may come from user environment (e.g. $PATH). That means that the variable substitution might not be perfect.
@@ -892,4 +893,81 @@ mod tests {
             "overwritten"
         );
     }
+
+    #[test]
+    fn test_variable_default_values() {
+        let task_with_defaults = TaskTemplate {
+            label: "test with defaults".to_string(),
+            command: format!(
+                "echo ${{{}}}",
+                VariableName::File.to_string() + ":fallback.txt"
+            ),
+            args: vec![
+                "${ZED_MISSING_VAR:default_value}".to_string(),
+                format!("${{{}}}", VariableName::Row.to_string() + ":42"),
+            ],
+            ..TaskTemplate::default()
+        };
+
+        // Test 1: When ZED_FILE exists, should use actual value and ignore default
+        let context_with_file = TaskContext {
+            cwd: None,
+            task_variables: TaskVariables::from_iter(vec![
+                (VariableName::File, "actual_file.rs".to_string()),
+                (VariableName::Row, "123".to_string()),
+            ]),
+            project_env: HashMap::default(),
+        };
+
+        let resolved = task_with_defaults
+            .resolve_task(TEST_ID_BASE, &context_with_file)
+            .expect("Should resolve task with existing variables");
+
+        assert_eq!(
+            resolved.resolved.command.unwrap(),
+            "echo actual_file.rs",
+            "Should use actual ZED_FILE value, not default"
+        );
+        assert_eq!(
+            resolved.resolved.args,
+            vec!["default_value", "123"],
+            "Should use default for missing var, actual value for existing var"
+        );
+
+        // Test 2: When ZED_FILE doesn't exist, should use default value
+        let context_without_file = TaskContext {
+            cwd: None,
+            task_variables: TaskVariables::from_iter(vec![(VariableName::Row, "456".to_string())]),
+            project_env: HashMap::default(),
+        };
+
+        let resolved = task_with_defaults
+            .resolve_task(TEST_ID_BASE, &context_without_file)
+            .expect("Should resolve task using default values");
+
+        assert_eq!(
+            resolved.resolved.command.unwrap(),
+            "echo fallback.txt",
+            "Should use default value when ZED_FILE is missing"
+        );
+        assert_eq!(
+            resolved.resolved.args,
+            vec!["default_value", "456"],
+            "Should use defaults for missing vars"
+        );
+
+        // Test 3: Missing ZED variable without default should fail
+        let task_no_default = TaskTemplate {
+            label: "test no default".to_string(),
+            command: "${ZED_MISSING_NO_DEFAULT}".to_string(),
+            ..TaskTemplate::default()
+        };
+
+        assert!(
+            task_no_default
+                .resolve_task(TEST_ID_BASE, &TaskContext::default())
+                .is_none(),
+            "Should fail when ZED variable has no default and doesn't exist"
+        );
+    }
 }

From 360e372b57d2913ed670bd0edbca73adfe5956f4 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 5 Sep 2025 11:09:32 -0400
Subject: [PATCH 630/823] linux: Restore ctrl-escape to keymap (#37636)

Closes: https://github.com/zed-industries/zed/issues/37628
Follow-up to: https://github.com/zed-industries/zed/pull/36712

Release Notes:

- linux: Fix for ctrl-escape not escaping the tab switcher.
---
 assets/keymaps/default-linux.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 28518490cc..44234b819a 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -16,6 +16,7 @@
       "up": "menu::SelectPrevious",
       "enter": "menu::Confirm",
       "ctrl-enter": "menu::SecondaryConfirm",
+      "ctrl-escape": "menu::Cancel",
       "ctrl-c": "menu::Cancel",
       "escape": "menu::Cancel",
       "alt-shift-enter": "menu::Restart",

From 3d37611b6f20b158454014b5d886805a06902e71 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Fri, 5 Sep 2025 17:43:39 +0200
Subject: [PATCH 631/823] cli: Rename script zed-wsl to zed, and enable on
 non-WSL (#37631)

Closes #23026

With this hotfix, git committing from the built-in Zed terminal (well,
PowerShell), now works.

Release Notes:

- N/A
---
 .gitattributes                                   | 2 +-
 crates/zed/resources/windows/{zed-wsl => zed.sh} | 4 ++--
 script/bundle-windows.ps1                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename crates/zed/resources/windows/{zed-wsl => zed.sh} (88%)

diff --git a/.gitattributes b/.gitattributes
index 0dedc2d567..37d2899330 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,4 @@
 *.json linguist-language=JSON-with-Comments
 
 # Ensure the WSL script always has LF line endings, even on Windows
-crates/zed/resources/windows/zed-wsl text eol=lf
+crates/zed/resources/windows/zed text eol=lf
diff --git a/crates/zed/resources/windows/zed-wsl b/crates/zed/resources/windows/zed.sh
similarity index 88%
rename from crates/zed/resources/windows/zed-wsl
rename to crates/zed/resources/windows/zed.sh
index d3cbb93af6..734b1a7eb0 100644
--- a/crates/zed/resources/windows/zed-wsl
+++ b/crates/zed/resources/windows/zed.sh
@@ -20,6 +20,6 @@ if [ $IN_WSL = true ]; then
     "$ZED_PATH/zed.exe" --wsl "$WSL_USER@$WSL_DISTRO_NAME" "$@"
     exit $?
 else
-    echo "Only WSL is supported for now" >&2
-    exit 1
+    "$ZED_PATH/zed.exe" "$@"
+    exit $?
 fi
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
index 84ad39fb70..a26abf8413 100644
--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@@ -150,7 +150,7 @@ function CollectFiles {
     Move-Item -Path "$innoDir\zed_explorer_command_injector.appx" -Destination "$innoDir\appx\zed_explorer_command_injector.appx" -Force
     Move-Item -Path "$innoDir\zed_explorer_command_injector.dll" -Destination "$innoDir\appx\zed_explorer_command_injector.dll" -Force
     Move-Item -Path "$innoDir\cli.exe" -Destination "$innoDir\bin\zed.exe" -Force
-    Move-Item -Path "$innoDir\zed-wsl" -Destination "$innoDir\bin\zed" -Force
+    Move-Item -Path "$innoDir\zed.sh" -Destination "$innoDir\bin\zed" -Force
     Move-Item -Path "$innoDir\auto_update_helper.exe" -Destination "$innoDir\tools\auto_update_helper.exe" -Force
     Move-Item -Path ".\AGS_SDK-6.3.0\ags_lib\lib\amd_ags_x64.dll" -Destination "$innoDir\amd_ags_x64.dll" -Force
 }

From fb6cc8794f360acf0c0671502bb456ae7233fc88 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <6893840+yacinehmito@users.noreply.github.com>
Date: Fri, 5 Sep 2025 17:56:40 +0200
Subject: [PATCH 632/823] Fix typo in development docs for macOS (#37607)

Release Notes:

- N/A
---
 docs/src/development/macos.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md
index c7e92623d4..851e2efdd7 100644
--- a/docs/src/development/macos.md
+++ b/docs/src/development/macos.md
@@ -33,7 +33,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
 
 ### Backend Dependencies (optional) {#backend-dependencies}
 
-If you are looking to develop Zed collaboration features using a local collabortation server, please see: [Local Collaboration](./local-collaboration.md) docs.
+If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
 
 ## Building Zed from Source
 

From 91ab0636ec6ed5a3df39a61bb56d24f715865c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Sat, 6 Sep 2025 00:25:55 +0800
Subject: [PATCH 633/823] windows: Make sure `zed.sh` using the correct line
 ending (#37650)

This got missed in the changes from #37631

Release Notes:

- N/A
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 37d2899330..57afd4ea69 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,4 @@
 *.json linguist-language=JSON-with-Comments
 
 # Ensure the WSL script always has LF line endings, even on Windows
-crates/zed/resources/windows/zed text eol=lf
+crates/zed/resources/windows/zed.sh text eol=lf

From 638320b21e8a893a8da0ee23c438127cf82f5f85 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 5 Sep 2025 12:40:47 -0400
Subject: [PATCH 634/823] Improve macOS version information in telemetry
 (#37185)

macOS versions are currently reported as `macOS 26.0.0`.
But this makes it impossible to differentiate amongst macOS Beta
releases which have the same version number (`X.0.0`) but are different
builds.

This PR adds build number info to `os_version` for macOS Betas and
[Rapid Security Response](https://support.apple.com/en-us/102657)
release that have identical version numbers to stable release, but have
different builds numbers. We can differentiate them because the build
numbers end with a letter.

| Version | Before | After |
| - | - | - |
| macOS Sonoma 14.7.8 | 14.7.8 | 14.7.8 |
| macOS Sequoia 15.6.1 | 15.6.1 | 15.6.1 |
| mcOS Ventura 13.3.1 | 13.3.1 | 13.3.1 |
| macOS Ventura 13.3.1 (a) |  13.3.1 | 13.3.1 (Build 22E772610a) |
| macOS Tahoe 26.0.0 (Beta1) | 26.0.0 | 26.0.0 (Build 25A5316a) |
| macOS Tahoe 26.0.0 (Beta5) | 26.0.0 | 26.0.0 (Build 25A5349a) |

This should cause minimal telemetry changes and only impacting a macOS
betas and a couple specific older macOS versions, but will allow
differentiation between macOS beta releases in GitHub issues.

Alternatives:
1. Leave as-is (can't differentiate between macOS beta builds)
2. Always include build number info (impacts telemetry; more consistent
going forward; differentiates non-final Release Candidates which don't
include a trailing letter)

I couldn't find a cocoa method to retrieve macOS build number, so I
switched dependencies from `cocoa` to `objc2-foundation` in the client
crate. We already depend upon this crate as a dependency of
`blade-graphics` so I matched the features of that and so workspace-hack
doesn't change.

https://github.com/zed-industries/zed/blob/1ebc69a44708f344449c0c9d47e33b414277adec/tooling/workspace-hack/Cargo.toml#L355

Release Notes:

- N/A
---
 Cargo.lock                     |  2 +-
 Cargo.toml                     | 25 +++++++++++++++++++++++++
 crates/client/Cargo.toml       |  2 +-
 crates/client/src/telemetry.rs | 25 +++++++++++++------------
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b0fb3b6f49..975e762ddd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3070,7 +3070,6 @@ dependencies = [
  "clock",
  "cloud_api_client",
  "cloud_llm_client",
- "cocoa 0.26.0",
  "collections",
  "credentials_provider",
  "derive_more",
@@ -3083,6 +3082,7 @@ dependencies = [
  "http_client_tls",
  "httparse",
  "log",
+ "objc2-foundation",
  "parking_lot",
  "paths",
  "postage",
diff --git a/Cargo.toml b/Cargo.toml
index f389153efe..1de877334f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -537,6 +537,31 @@ nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c80421
 nix = "0.29"
 num-format = "0.4.4"
 objc = "0.2"
+objc2-foundation = { version = "0.3", default-features = false, features = [
+    "NSArray",
+    "NSAttributedString",
+    "NSBundle",
+    "NSCoder",
+    "NSData",
+    "NSDate",
+    "NSDictionary",
+    "NSEnumerator",
+    "NSError",
+    "NSGeometry",
+    "NSNotification",
+    "NSNull",
+    "NSObjCRuntime",
+    "NSObject",
+    "NSProcessInfo",
+    "NSRange",
+    "NSRunLoop",
+    "NSString",
+    "NSURL",
+    "NSUndoManager",
+    "NSValue",
+    "objc2-core-foundation",
+    "std"
+] }
 open = "5.0.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 5c6d1157fd..01007cdc66 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -75,7 +75,7 @@ util = { workspace = true, features = ["test-support"] }
 windows.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-cocoa.workspace = true
+objc2-foundation.workspace = true
 
 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
 tokio-native-tls = "0.3"
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index a5c1532c75..e312340086 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -84,6 +84,10 @@ static DOTNET_PROJECT_FILES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r"^(global\.json|Directory\.Build\.props|.*\.(csproj|fsproj|vbproj|sln))$").unwrap()
 });
 
+#[cfg(target_os = "macos")]
+static MACOS_VERSION_REGEX: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"(\s*\(Build [^)]*[0-9]\))").unwrap());
+
 pub fn os_name() -> String {
     #[cfg(target_os = "macos")]
     {
@@ -108,19 +112,16 @@ pub fn os_name() -> String {
 pub fn os_version() -> String {
     #[cfg(target_os = "macos")]
     {
-        use cocoa::base::nil;
-        use cocoa::foundation::NSProcessInfo;
-
-        unsafe {
-            let process_info = cocoa::foundation::NSProcessInfo::processInfo(nil);
-            let version = process_info.operatingSystemVersion();
-            gpui::SemanticVersion::new(
-                version.majorVersion as usize,
-                version.minorVersion as usize,
-                version.patchVersion as usize,
-            )
+        use objc2_foundation::NSProcessInfo;
+        let process_info = NSProcessInfo::processInfo();
+        let version_nsstring = unsafe { process_info.operatingSystemVersionString() };
+        // "Version 15.6.1 (Build 24G90)" -> "15.6.1 (Build 24G90)"
+        let version_string = version_nsstring.to_string().replace("Version ", "");
+        // "15.6.1 (Build 24G90)" -> "15.6.1"
+        // "26.0.0 (Build 25A5349a)" -> unchanged (Beta or Rapid Security Response; ends with letter)
+        MACOS_VERSION_REGEX
+            .replace_all(&version_string, "")
             .to_string()
-        }
     }
     #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     {

From b3405c3bd18749f3f7acda52670ee03528d655b8 Mon Sep 17 00:00:00 2001
From: Matin Aniss <76515905+MatinAniss@users.noreply.github.com>
Date: Sat, 6 Sep 2025 02:52:57 +1000
Subject: [PATCH 635/823] Add line ending selector (#35392)

Partially addresses this issue #5294

Adds a selector between `LF` and `CRLF` for the buffer's line endings,
the checkmark denotes the currently selected line ending.

Selector
<img width="487" height="66" alt="image"
src="https://github.com/user-attachments/assets/13f2480f-4d2d-4afe-adf5-385aeb421393"
/>

Release Notes:

- Added line ending selector.

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 Cargo.lock                                    |  16 ++
 Cargo.toml                                    |   2 +
 crates/language/src/buffer.rs                 |  35 +++-
 crates/language/src/buffer_tests.rs           |  72 +++++++
 crates/language/src/proto.rs                  |  25 +++
 crates/line_ending_selector/Cargo.toml        |  24 +++
 crates/line_ending_selector/LICENSE-GPL       |   1 +
 .../src/line_ending_selector.rs               | 192 ++++++++++++++++++
 crates/proto/proto/buffer.proto               |   7 +
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/main.rs                        |   1 +
 crates/zed/src/zed.rs                         |   1 +
 12 files changed, 376 insertions(+), 1 deletion(-)
 create mode 100644 crates/line_ending_selector/Cargo.toml
 create mode 120000 crates/line_ending_selector/LICENSE-GPL
 create mode 100644 crates/line_ending_selector/src/line_ending_selector.rs

diff --git a/Cargo.lock b/Cargo.lock
index 975e762ddd..fbdf0e848c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9518,6 +9518,21 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "line_ending_selector"
+version = "0.1.0"
+dependencies = [
+ "editor",
+ "gpui",
+ "language",
+ "picker",
+ "project",
+ "ui",
+ "util",
+ "workspace",
+ "workspace-hack",
+]
+
 [[package]]
 name = "link-cplusplus"
 version = "1.0.10"
@@ -20492,6 +20507,7 @@ dependencies = [
  "language_tools",
  "languages",
  "libc",
+ "line_ending_selector",
  "livekit_client",
  "log",
  "markdown",
diff --git a/Cargo.toml b/Cargo.toml
index 1de877334f..d8e8040cd9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,6 +97,7 @@ members = [
     "crates/language_selector",
     "crates/language_tools",
     "crates/languages",
+    "crates/line_ending_selector",
     "crates/livekit_api",
     "crates/livekit_client",
     "crates/lmstudio",
@@ -323,6 +324,7 @@ language_models = { path = "crates/language_models" }
 language_selector = { path = "crates/language_selector" }
 language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
+line_ending_selector = { path = "crates/line_ending_selector" }
 livekit_api = { path = "crates/livekit_api" }
 livekit_client = { path = "crates/livekit_client" }
 lmstudio = { path = "crates/lmstudio" }
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index c86787e1f9..2a303bb9a0 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -284,6 +284,14 @@ pub enum Operation {
         /// The language server ID.
         server_id: LanguageServerId,
     },
+
+    /// An update to the line ending type of this buffer.
+    UpdateLineEnding {
+        /// The line ending type.
+        line_ending: LineEnding,
+        /// The buffer's lamport timestamp.
+        lamport_timestamp: clock::Lamport,
+    },
 }
 
 /// An event that occurs in a buffer.
@@ -1240,6 +1248,21 @@ impl Buffer {
         self.syntax_map.lock().language_registry()
     }
 
+    /// Assign the line ending type to the buffer.
+    pub fn set_line_ending(&mut self, line_ending: LineEnding, cx: &mut Context<Self>) {
+        self.text.set_line_ending(line_ending);
+
+        let lamport_timestamp = self.text.lamport_clock.tick();
+        self.send_operation(
+            Operation::UpdateLineEnding {
+                line_ending,
+                lamport_timestamp,
+            },
+            true,
+            cx,
+        );
+    }
+
     /// Assign the buffer a new [`Capability`].
     pub fn set_capability(&mut self, capability: Capability, cx: &mut Context<Self>) {
         if self.capability != capability {
@@ -2557,7 +2580,7 @@ impl Buffer {
             Operation::UpdateSelections { selections, .. } => selections
                 .iter()
                 .all(|s| self.can_resolve(&s.start) && self.can_resolve(&s.end)),
-            Operation::UpdateCompletionTriggers { .. } => true,
+            Operation::UpdateCompletionTriggers { .. } | Operation::UpdateLineEnding { .. } => true,
         }
     }
 
@@ -2623,6 +2646,13 @@ impl Buffer {
                 }
                 self.text.lamport_clock.observe(lamport_timestamp);
             }
+            Operation::UpdateLineEnding {
+                line_ending,
+                lamport_timestamp,
+            } => {
+                self.text.set_line_ending(line_ending);
+                self.text.lamport_clock.observe(lamport_timestamp);
+            }
         }
     }
 
@@ -4814,6 +4844,9 @@ impl operation_queue::Operation for Operation {
             }
             | Operation::UpdateCompletionTriggers {
                 lamport_timestamp, ..
+            }
+            | Operation::UpdateLineEnding {
+                lamport_timestamp, ..
             } => *lamport_timestamp,
         }
     }
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 5b88112c95..050ec457df 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -67,6 +67,78 @@ fn test_line_endings(cx: &mut gpui::App) {
     });
 }
 
+#[gpui::test]
+fn test_set_line_ending(cx: &mut TestAppContext) {
+    let base = cx.new(|cx| Buffer::local("one\ntwo\nthree\n", cx));
+    let base_replica = cx.new(|cx| {
+        Buffer::from_proto(1, Capability::ReadWrite, base.read(cx).to_proto(cx), None).unwrap()
+    });
+    base.update(cx, |_buffer, cx| {
+        cx.subscribe(&base_replica, |this, _, event, cx| {
+            if let BufferEvent::Operation {
+                operation,
+                is_local: true,
+            } = event
+            {
+                this.apply_ops([operation.clone()], cx);
+            }
+        })
+        .detach();
+    });
+    base_replica.update(cx, |_buffer, cx| {
+        cx.subscribe(&base, |this, _, event, cx| {
+            if let BufferEvent::Operation {
+                operation,
+                is_local: true,
+            } = event
+            {
+                this.apply_ops([operation.clone()], cx);
+            }
+        })
+        .detach();
+    });
+
+    // Base
+    base_replica.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+    });
+    base.update(cx, |buffer, cx| {
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+        buffer.set_line_ending(LineEnding::Windows, cx);
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+    });
+    base_replica.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+    });
+    base.update(cx, |buffer, cx| {
+        buffer.set_line_ending(LineEnding::Unix, cx);
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+    });
+    base_replica.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+    });
+
+    // Replica
+    base.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+    });
+    base_replica.update(cx, |buffer, cx| {
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+        buffer.set_line_ending(LineEnding::Windows, cx);
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+    });
+    base.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.line_ending(), LineEnding::Windows);
+    });
+    base_replica.update(cx, |buffer, cx| {
+        buffer.set_line_ending(LineEnding::Unix, cx);
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+    });
+    base.read_with(cx, |buffer, _| {
+        assert_eq!(buffer.line_ending(), LineEnding::Unix);
+    });
+}
+
 #[gpui::test]
 fn test_select_language(cx: &mut App) {
     init_settings(cx, |_| {});
diff --git a/crates/language/src/proto.rs b/crates/language/src/proto.rs
index 0d5a8e916c..bc85b10859 100644
--- a/crates/language/src/proto.rs
+++ b/crates/language/src/proto.rs
@@ -90,6 +90,15 @@ pub fn serialize_operation(operation: &crate::Operation) -> proto::Operation {
                     language_server_id: server_id.to_proto(),
                 },
             ),
+
+            crate::Operation::UpdateLineEnding {
+                line_ending,
+                lamport_timestamp,
+            } => proto::operation::Variant::UpdateLineEnding(proto::operation::UpdateLineEnding {
+                replica_id: lamport_timestamp.replica_id as u32,
+                lamport_timestamp: lamport_timestamp.value,
+                line_ending: serialize_line_ending(*line_ending) as i32,
+            }),
         }),
     }
 }
@@ -341,6 +350,18 @@ pub fn deserialize_operation(message: proto::Operation) -> Result<crate::Operati
                     server_id: LanguageServerId::from_proto(message.language_server_id),
                 }
             }
+            proto::operation::Variant::UpdateLineEnding(message) => {
+                crate::Operation::UpdateLineEnding {
+                    lamport_timestamp: clock::Lamport {
+                        replica_id: message.replica_id as ReplicaId,
+                        value: message.lamport_timestamp,
+                    },
+                    line_ending: deserialize_line_ending(
+                        proto::LineEnding::from_i32(message.line_ending)
+                            .context("missing line_ending")?,
+                    ),
+                }
+            }
         },
     )
 }
@@ -496,6 +517,10 @@ pub fn lamport_timestamp_for_operation(operation: &proto::Operation) -> Option<c
             replica_id = op.replica_id;
             value = op.lamport_timestamp;
         }
+        proto::operation::Variant::UpdateLineEnding(op) => {
+            replica_id = op.replica_id;
+            value = op.lamport_timestamp;
+        }
     }
 
     Some(clock::Lamport {
diff --git a/crates/line_ending_selector/Cargo.toml b/crates/line_ending_selector/Cargo.toml
new file mode 100644
index 0000000000..7c5c8f6d8f
--- /dev/null
+++ b/crates/line_ending_selector/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "line_ending_selector"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/line_ending_selector.rs"
+doctest = false
+
+[dependencies]
+editor.workspace = true
+gpui.workspace = true
+language.workspace = true
+picker.workspace = true
+project.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/line_ending_selector/LICENSE-GPL b/crates/line_ending_selector/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/line_ending_selector/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/line_ending_selector/src/line_ending_selector.rs b/crates/line_ending_selector/src/line_ending_selector.rs
new file mode 100644
index 0000000000..532f0b051d
--- /dev/null
+++ b/crates/line_ending_selector/src/line_ending_selector.rs
@@ -0,0 +1,192 @@
+use editor::Editor;
+use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity, actions};
+use language::{Buffer, LineEnding};
+use picker::{Picker, PickerDelegate};
+use project::Project;
+use std::sync::Arc;
+use ui::{ListItem, ListItemSpacing, prelude::*};
+use util::ResultExt;
+use workspace::ModalView;
+
+actions!(
+    line_ending,
+    [
+        /// Toggles the line ending selector modal.
+        Toggle
+    ]
+);
+
+pub fn init(cx: &mut App) {
+    cx.observe_new(LineEndingSelector::register).detach();
+}
+
+pub struct LineEndingSelector {
+    picker: Entity<Picker<LineEndingSelectorDelegate>>,
+}
+
+impl LineEndingSelector {
+    fn register(editor: &mut Editor, _window: Option<&mut Window>, cx: &mut Context<Editor>) {
+        let editor_handle = cx.weak_entity();
+        editor
+            .register_action(move |_: &Toggle, window, cx| {
+                Self::toggle(&editor_handle, window, cx);
+            })
+            .detach();
+    }
+
+    fn toggle(editor: &WeakEntity<Editor>, window: &mut Window, cx: &mut App) {
+        let Some((workspace, buffer)) = editor
+            .update(cx, |editor, cx| {
+                Some((editor.workspace()?, editor.active_excerpt(cx)?.1))
+            })
+            .ok()
+            .flatten()
+        else {
+            return;
+        };
+
+        workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().clone();
+            workspace.toggle_modal(window, cx, move |window, cx| {
+                LineEndingSelector::new(buffer, project, window, cx)
+            });
+        })
+    }
+
+    fn new(
+        buffer: Entity<Buffer>,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let line_ending = buffer.read(cx).line_ending();
+        let delegate =
+            LineEndingSelectorDelegate::new(cx.entity().downgrade(), buffer, project, line_ending);
+        let picker = cx.new(|cx| Picker::nonsearchable_uniform_list(delegate, window, cx));
+        Self { picker }
+    }
+}
+
+impl Render for LineEndingSelector {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex().w(rems(34.)).child(self.picker.clone())
+    }
+}
+
+impl Focusable for LineEndingSelector {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.picker.focus_handle(cx)
+    }
+}
+
+impl EventEmitter<DismissEvent> for LineEndingSelector {}
+impl ModalView for LineEndingSelector {}
+
+struct LineEndingSelectorDelegate {
+    line_ending_selector: WeakEntity<LineEndingSelector>,
+    buffer: Entity<Buffer>,
+    project: Entity<Project>,
+    line_ending: LineEnding,
+    matches: Vec<LineEnding>,
+    selected_index: usize,
+}
+
+impl LineEndingSelectorDelegate {
+    fn new(
+        line_ending_selector: WeakEntity<LineEndingSelector>,
+        buffer: Entity<Buffer>,
+        project: Entity<Project>,
+        line_ending: LineEnding,
+    ) -> Self {
+        Self {
+            line_ending_selector,
+            buffer,
+            project,
+            line_ending,
+            matches: vec![LineEnding::Unix, LineEnding::Windows],
+            selected_index: 0,
+        }
+    }
+}
+
+impl PickerDelegate for LineEndingSelectorDelegate {
+    type ListItem = ListItem;
+
+    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
+        "Select a line ending…".into()
+    }
+
+    fn match_count(&self) -> usize {
+        self.matches.len()
+    }
+
+    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        if let Some(line_ending) = self.matches.get(self.selected_index) {
+            self.buffer.update(cx, |this, cx| {
+                this.set_line_ending(*line_ending, cx);
+            });
+            let buffer = self.buffer.clone();
+            let project = self.project.clone();
+            cx.defer(move |cx| {
+                project.update(cx, |this, cx| {
+                    this.save_buffer(buffer, cx).detach();
+                });
+            });
+        }
+        self.dismissed(window, cx);
+    }
+
+    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
+        self.line_ending_selector
+            .update(cx, |_, cx| cx.emit(DismissEvent))
+            .log_err();
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        _: &mut Context<Picker<Self>>,
+    ) {
+        self.selected_index = ix;
+    }
+
+    fn update_matches(
+        &mut self,
+        _query: String,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) -> gpui::Task<()> {
+        return Task::ready(());
+    }
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _: &mut Window,
+        _: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        let line_ending = self.matches[ix];
+        let label = match line_ending {
+            LineEnding::Unix => "LF",
+            LineEnding::Windows => "CRLF",
+        };
+
+        let mut list_item = ListItem::new(ix)
+            .inset(true)
+            .spacing(ListItemSpacing::Sparse)
+            .toggle_state(selected)
+            .child(Label::new(label));
+
+        if self.line_ending == line_ending {
+            list_item = list_item.end_slot(Icon::new(IconName::Check).color(Color::Muted));
+        }
+
+        Some(list_item)
+    }
+}
diff --git a/crates/proto/proto/buffer.proto b/crates/proto/proto/buffer.proto
index f4dacf2fdc..4580fd8e9d 100644
--- a/crates/proto/proto/buffer.proto
+++ b/crates/proto/proto/buffer.proto
@@ -143,6 +143,7 @@ message Operation {
         UpdateSelections update_selections = 3;
         UpdateDiagnostics update_diagnostics = 4;
         UpdateCompletionTriggers update_completion_triggers = 5;
+        UpdateLineEnding update_line_ending = 6;
     }
 
     message Edit {
@@ -174,6 +175,12 @@ message Operation {
         repeated string triggers = 3;
         uint64 language_server_id = 4;
     }
+
+    message UpdateLineEnding {
+        uint32 replica_id = 1;
+        uint32 lamport_timestamp = 2;
+        LineEnding line_ending = 3;
+    }
 }
 
 message ProjectTransaction {
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index f2295d5fa7..bee6c87670 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -93,6 +93,7 @@ language_models.workspace = true
 language_selector.workspace = true
 language_tools.workspace = true
 languages = { workspace = true, features = ["load-grammars"] }
+line_ending_selector.workspace = true
 libc.workspace = true
 log.workspace = true
 markdown.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 9582e7a2ab..3287e866e4 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -620,6 +620,7 @@ pub fn main() {
         terminal_view::init(cx);
         journal::init(app_state.clone(), cx);
         language_selector::init(cx);
+        line_ending_selector::init(cx);
         toolchain_selector::init(cx);
         theme_selector::init(cx);
         settings_profile_selector::init(cx);
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 864f6badeb..fda43a10ba 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4480,6 +4480,7 @@ mod tests {
                 "keymap_editor",
                 "keystroke_input",
                 "language_selector",
+                "line_ending",
                 "lsp_tool",
                 "markdown",
                 "menu",

From b65fb0626491be66a26718ea43f29e7d89f74c9f Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Fri, 5 Sep 2025 18:12:51 +0100
Subject: [PATCH 636/823] editor: Fix text manipulation on line mode selections
 (#37646)

This commit updates the implementation for
`editor::Editor.manipulate_text` to use
`editor::selections_collection::SelectionsCollection.all_adjusted`
instead of `editor::selections_collection::SelectionsCollection.all`, as
the former takes into account the selection's `line_mode`, fixing the
issue where, if an user was in vim's visual line mode, running the
`editor: convert to upper case` command would not work as expected.

Closes #36953

Release Notes:

- Fixed bug where using the editor's convert case commands while in
vim's Visual Line mode would not work as expected
---
 crates/editor/src/editor.rs       | 10 +++++++---
 crates/editor/src/editor_tests.rs | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 37951074d1..fd2299f37d 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -11391,14 +11391,17 @@ impl Editor {
         let mut edits = Vec::new();
         let mut selection_adjustment = 0i32;
 
-        for selection in self.selections.all::<usize>(cx) {
+        for selection in self.selections.all_adjusted(cx) {
             let selection_is_empty = selection.is_empty();
 
             let (start, end) = if selection_is_empty {
                 let (word_range, _) = buffer.surrounding_word(selection.start, false);
                 (word_range.start, word_range.end)
             } else {
-                (selection.start, selection.end)
+                (
+                    buffer.point_to_offset(selection.start),
+                    buffer.point_to_offset(selection.end),
+                )
             };
 
             let text = buffer.text_for_range(start..end).collect::<String>();
@@ -11409,7 +11412,8 @@ impl Editor {
                 start: (start as i32 - selection_adjustment) as usize,
                 end: ((start + text.len()) as i32 - selection_adjustment) as usize,
                 goal: SelectionGoal::None,
-                ..selection
+                id: selection.id,
+                reversed: selection.reversed,
             });
 
             selection_adjustment += old_length - text.len() as i32;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 90e488368f..f4569b4364 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -5363,6 +5363,20 @@ async fn test_manipulate_text(cx: &mut TestAppContext) {
     cx.assert_editor_state(indoc! {"
         «HeLlO, wOrLD!ˇ»
     "});
+
+    // Test selections with `line_mode = true`.
+    cx.update_editor(|editor, _window, _cx| editor.selections.line_mode = true);
+    cx.set_state(indoc! {"
+        «The quick brown
+        fox jumps over
+        tˇ»he lazy dog
+    "});
+    cx.update_editor(|e, window, cx| e.convert_to_upper_case(&ConvertToUpperCase, window, cx));
+    cx.assert_editor_state(indoc! {"
+        «THE QUICK BROWN
+        FOX JUMPS OVER
+        THE LAZY DOGˇ»
+    "});
 }
 
 #[gpui::test]

From 5d374193bb7493b993b661ea1231f113946b784b Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 5 Sep 2025 10:34:39 -0700
Subject: [PATCH 637/823] Add terminal::Toggle (#37585)

Co-Authored-By: Brandan <b5@n0.computer>

Release Notes:

- Added a new action `terminal::Toggle` that is by default bound to
'ctrl-\`'. This copies the default behaviour from VSCode and Jetbrains
where the terminal opens and closes correctly. If you'd like the old
behaviour you can rebind 'ctrl-\`' to `terminal::ToggleFocus`

Co-authored-by: Brandan <b5@n0.computer>
---
 assets/keymaps/default-linux.json          |  2 +-
 assets/keymaps/default-macos.json          |  2 +-
 assets/keymaps/default-windows.json        |  2 +-
 assets/keymaps/linux/jetbrains.json        |  2 +-
 assets/keymaps/macos/jetbrains.json        |  2 +-
 crates/terminal_view/src/terminal_panel.rs |  9 +++++++++
 crates/vim/src/command.rs                  |  4 ++--
 crates/workspace/src/workspace.rs          | 10 ++++++++++
 8 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 44234b819a..70a002cf08 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -583,7 +583,7 @@
       "ctrl-n": "workspace::NewFile",
       "shift-new": "workspace::NewWindow",
       "ctrl-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::ToggleFocus",
+      "ctrl-`": "terminal_panel::Toggle",
       "f10": ["app_menu::OpenApplicationMenu", "Zed"],
       "alt-1": ["workspace::ActivatePane", 0],
       "alt-2": ["workspace::ActivatePane", 1],
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 954684c826..21504c7e62 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -649,7 +649,7 @@
       "alt-shift-enter": "toast::RunAction",
       "cmd-shift-s": "workspace::SaveAs",
       "cmd-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::ToggleFocus",
+      "ctrl-`": "terminal_panel::Toggle",
       "cmd-1": ["workspace::ActivatePane", 0],
       "cmd-2": ["workspace::ActivatePane", 1],
       "cmd-3": ["workspace::ActivatePane", 2],
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 728907e60c..1c9f128188 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -599,7 +599,7 @@
       "ctrl-n": "workspace::NewFile",
       "shift-new": "workspace::NewWindow",
       "ctrl-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::ToggleFocus",
+      "ctrl-`": "terminal_panel::Toggle",
       "f10": ["app_menu::OpenApplicationMenu", "Zed"],
       "alt-1": ["workspace::ActivatePane", 0],
       "alt-2": ["workspace::ActivatePane", 1],
diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json
index 3df1243fed..59a182a968 100644
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -125,7 +125,7 @@
   {
     "context": "Workspace || Editor",
     "bindings": {
-      "alt-f12": "terminal_panel::ToggleFocus",
+      "alt-f12": "terminal_panel::Toggle",
       "ctrl-shift-k": "git::Push"
     }
   },
diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json
index 66962811f4..2c757c3a30 100644
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -127,7 +127,7 @@
   {
     "context": "Workspace || Editor",
     "bindings": {
-      "alt-f12": "terminal_panel::ToggleFocus",
+      "alt-f12": "terminal_panel::Toggle",
       "cmd-shift-k": "git::Push"
     }
   },
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 2ba7f617bf..44d64c5fe3 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -49,6 +49,8 @@ const TERMINAL_PANEL_KEY: &str = "TerminalPanel";
 actions!(
     terminal_panel,
     [
+        /// Toggles the terminal panel.
+        Toggle,
         /// Toggles focus on the terminal panel.
         ToggleFocus
     ]
@@ -64,6 +66,13 @@ pub fn init(cx: &mut App) {
                     workspace.toggle_panel_focus::<TerminalPanel>(window, cx);
                 }
             });
+            workspace.register_action(|workspace, _: &Toggle, window, cx| {
+                if is_enabled_in_workspace(workspace, cx) {
+                    if !workspace.toggle_panel_focus::<TerminalPanel>(window, cx) {
+                        workspace.close_panel::<TerminalPanel>(window, cx);
+                    }
+                }
+            });
         },
     )
     .detach();
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 29fe6aae02..eda483988b 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1265,8 +1265,8 @@ fn generate_commands(_: &App) -> Vec<VimCommand> {
         VimCommand::str(("L", "explore"), "project_panel::ToggleFocus"),
         VimCommand::str(("S", "explore"), "project_panel::ToggleFocus"),
         VimCommand::str(("Ve", "xplore"), "project_panel::ToggleFocus"),
-        VimCommand::str(("te", "rm"), "terminal_panel::ToggleFocus"),
-        VimCommand::str(("T", "erm"), "terminal_panel::ToggleFocus"),
+        VimCommand::str(("te", "rm"), "terminal_panel::Toggle"),
+        VimCommand::str(("T", "erm"), "terminal_panel::Toggle"),
         VimCommand::str(("C", "ollab"), "collab_panel::ToggleFocus"),
         VimCommand::str(("Ch", "at"), "chat_panel::ToggleFocus"),
         VimCommand::str(("No", "tifications"), "notification_panel::ToggleFocus"),
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 0bfcaaf593..6b4e7c1731 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3093,6 +3093,16 @@ impl Workspace {
         }
     }
 
+    pub fn close_panel<T: Panel>(&self, window: &mut Window, cx: &mut Context<Self>) {
+        for dock in self.all_docks().iter() {
+            dock.update(cx, |dock, cx| {
+                if dock.panel::<T>().is_some() {
+                    dock.set_open(false, window, cx)
+                }
+            })
+        }
+    }
+
     pub fn panel<T: Panel>(&self, cx: &App) -> Option<Entity<T>> {
         self.all_docks()
             .iter()

From 1c5c8552f2d00d442a0975a76d3231ab94004ea4 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 5 Sep 2025 12:03:26 -0700
Subject: [PATCH 638/823] Show actual error in InvalidBufferView (#37657)

Release Notes:

- Update error view to show the error
---
 crates/workspace/src/invalid_buffer_view.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/workspace/src/invalid_buffer_view.rs b/crates/workspace/src/invalid_buffer_view.rs
index b8c0db29d3..05f409653b 100644
--- a/crates/workspace/src/invalid_buffer_view.rs
+++ b/crates/workspace/src/invalid_buffer_view.rs
@@ -3,7 +3,8 @@ use std::{path::Path, sync::Arc};
 use gpui::{EventEmitter, FocusHandle, Focusable};
 use ui::{
     App, Button, ButtonCommon, ButtonStyle, Clickable, Context, FluentBuilder, InteractiveElement,
-    KeyBinding, ParentElement, Render, SharedString, Styled as _, Window, h_flex, v_flex,
+    KeyBinding, Label, LabelCommon, LabelSize, ParentElement, Render, SharedString, Styled as _,
+    Window, h_flex, v_flex,
 };
 use zed_actions::workspace::OpenWithSystem;
 
@@ -30,7 +31,7 @@ impl InvalidBufferView {
         Self {
             is_local,
             abs_path: Arc::from(abs_path),
-            error: format!("{e}").into(),
+            error: format!("{}", e.root_cause()).into(),
             focus_handle: cx.focus_handle(),
         }
     }
@@ -88,7 +89,12 @@ impl Render for InvalidBufferView {
                     v_flex()
                         .justify_center()
                         .gap_2()
-                        .child(h_flex().justify_center().child("Unsupported file type"))
+                        .child(h_flex().justify_center().child("Could not open file"))
+                        .child(
+                            h_flex()
+                                .justify_center()
+                                .child(Label::new(self.error.clone()).size(LabelSize::Small)),
+                        )
                         .when(self.is_local, |contents| {
                             contents.child(
                                 h_flex().justify_center().child(

From 45fa03410796db8ac488b781b915e4c80a588f1a Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 5 Sep 2025 21:50:51 +0200
Subject: [PATCH 639/823] Restore notification panel settings (#37661)

Follow-up to https://github.com/zed-industries/zed/pull/37489

Notification panel settings were always missing the content, hence this
PR adds it. After #37489, the use of the same content twice broke
things, which currently makes the notification panel non-configurable on
Nightly. This PR fixes this.

There once was an issue about the documentation for the panel being
wrong as well. However, I was just unable to find that sadly.

Release Notes:

- N/A
---
 crates/collab_ui/src/panel_settings.rs | 34 +++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/crates/collab_ui/src/panel_settings.rs b/crates/collab_ui/src/panel_settings.rs
index bae118d819..81d441167c 100644
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -44,14 +44,6 @@ pub struct ChatPanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
-#[derive(Deserialize, Debug, SettingsKey)]
-#[settings_key(key = "notification_panel")]
-pub struct NotificationPanelSettings {
-    pub button: bool,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-}
-
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
 #[settings_key(key = "collaboration_panel")]
 pub struct PanelSettingsContent {
@@ -69,6 +61,30 @@ pub struct PanelSettingsContent {
     pub default_width: Option<f32>,
 }
 
+#[derive(Deserialize, Debug)]
+pub struct NotificationPanelSettings {
+    pub button: bool,
+    pub dock: DockPosition,
+    pub default_width: Pixels,
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "notification_panel")]
+pub struct NotificationPanelSettingsContent {
+    /// Whether to show the panel button in the status bar.
+    ///
+    /// Default: true
+    pub button: Option<bool>,
+    /// Where to dock the panel.
+    ///
+    /// Default: right
+    pub dock: Option<DockPosition>,
+    /// Default width of the panel in pixels.
+    ///
+    /// Default: 300
+    pub default_width: Option<f32>,
+}
+
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
 #[settings_key(key = "message_editor")]
 pub struct MessageEditorSettings {
@@ -106,7 +122,7 @@ impl Settings for ChatPanelSettings {
 }
 
 impl Settings for NotificationPanelSettings {
-    type FileContent = PanelSettingsContent;
+    type FileContent = NotificationPanelSettingsContent;
 
     fn load(
         sources: SettingsSources<Self::FileContent>,

From c45177e2963c285a19db2cc2424df53041d48640 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Sat, 6 Sep 2025 02:05:42 +0530
Subject: [PATCH 640/823] editor: Fix fold placeholder hover width smaller than
 marker (#37663)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug:
<img width="196" height="95" alt="Screenshot 2025-09-06 at 1 21 39 AM"
src="https://github.com/user-attachments/assets/66ec0fc9-961e-4289-bd75-68b24dad485e"
/>

The fold marker we use, `⋯`, isn’t rendered at the same size as the
editor’s font. Notice how the fold marker appears larger than the same
character typed directly in the editor buffer.

<img width="146" height="82" alt="image"
src="https://github.com/user-attachments/assets/a059d221-6b55-4cf9-bc1e-898ff5444006"
/>

When we shape the line, we use the editor’s font size, and it ends up
determining the element’s width. To fix this, we should treat the
ellipsis as a UI element rather than a buffer character, since current
visual size looks good to me.

<img width="196" height="95" alt="Screenshot 2025-09-06 at 1 29 28 AM"
src="https://github.com/user-attachments/assets/1b766d46-00ab-40c7-b98a-95ea2d4b29bf"
/>

Release Notes:

- Fixed an issue where the fold placeholder’s hover area was smaller
than the marker.
---
 crates/editor/src/editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index fd2299f37d..2374c8d687 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1794,7 +1794,7 @@ impl Editor {
         let font_size = style.font_size.to_pixels(window.rem_size());
         let editor = cx.entity().downgrade();
         let fold_placeholder = FoldPlaceholder {
-            constrain_width: true,
+            constrain_width: false,
             render: Arc::new(move |fold_id, fold_range, cx| {
                 let editor = editor.clone();
                 div()

From ea363466aa8e5ca9553820c3bde2746c56dfc6ea Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Fri, 5 Sep 2025 17:03:42 -0400
Subject: [PATCH 641/823] Fix attach modal showing local processes in SSH
 sessions (#37608)

Closes #37520

This change makes the attach modal load processes from the remote server
when connecting via SSH, rather than showing local processes from the
client machine.

This works by using the new GetProcessesRequest RPC message to allow
downstream clients to get the correct processes to display. It also only
works with downstream ssh clients because the message handler is only
registered on headless projects.

Release Notes:

- debugger: Fix bug where SSH attach modal showed local processes
instead of processes from the server
---
 crates/debugger_ui/src/attach_modal.rs       | 92 +++++++++++++++-----
 crates/debugger_ui/src/new_process_modal.rs  |  9 +-
 crates/proto/proto/debugger.proto            | 14 +++
 crates/proto/proto/zed.proto                 |  5 +-
 crates/proto/src/proto.rs                    |  4 +
 crates/remote_server/src/headless_project.rs | 30 +++++++
 6 files changed, 130 insertions(+), 24 deletions(-)

diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rs
index 662a98c820..3e3bc3ec27 100644
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -1,8 +1,10 @@
 use dap::{DapRegistry, DebugRequest};
 use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render};
+use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render, Task};
 use gpui::{Subscription, WeakEntity};
 use picker::{Picker, PickerDelegate};
+use project::Project;
+use rpc::proto;
 use task::ZedDebugConfig;
 use util::debug_panic;
 
@@ -56,29 +58,28 @@ impl AttachModal {
     pub fn new(
         definition: ZedDebugConfig,
         workspace: WeakEntity<Workspace>,
+        project: Entity<Project>,
         modal: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let mut processes: Box<[_]> = System::new_all()
-            .processes()
-            .values()
-            .map(|process| {
-                let name = process.name().to_string_lossy().into_owned();
-                Candidate {
-                    name: name.into(),
-                    pid: process.pid().as_u32(),
-                    command: process
-                        .cmd()
-                        .iter()
-                        .map(|s| s.to_string_lossy().to_string())
-                        .collect::<Vec<_>>(),
-                }
-            })
-            .collect();
-        processes.sort_by_key(|k| k.name.clone());
-        let processes = processes.into_iter().collect();
-        Self::with_processes(workspace, definition, processes, modal, window, cx)
+        let processes_task = get_processes_for_project(&project, cx);
+
+        let modal = Self::with_processes(workspace, definition, Arc::new([]), modal, window, cx);
+
+        cx.spawn_in(window, async move |this, cx| {
+            let processes = processes_task.await;
+            this.update_in(cx, |modal, window, cx| {
+                modal.picker.update(cx, |picker, cx| {
+                    picker.delegate.candidates = processes;
+                    picker.refresh(window, cx);
+                });
+            })?;
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+
+        modal
     }
 
     pub(super) fn with_processes(
@@ -332,6 +333,57 @@ impl PickerDelegate for AttachModalDelegate {
     }
 }
 
+fn get_processes_for_project(project: &Entity<Project>, cx: &mut App) -> Task<Arc<[Candidate]>> {
+    let project = project.read(cx);
+
+    if let Some(remote_client) = project.remote_client() {
+        let proto_client = remote_client.read(cx).proto_client();
+        cx.spawn(async move |_cx| {
+            let response = proto_client
+                .request(proto::GetProcesses {
+                    project_id: proto::REMOTE_SERVER_PROJECT_ID,
+                })
+                .await
+                .unwrap_or_else(|_| proto::GetProcessesResponse {
+                    processes: Vec::new(),
+                });
+
+            let mut processes: Vec<Candidate> = response
+                .processes
+                .into_iter()
+                .map(|p| Candidate {
+                    pid: p.pid,
+                    name: p.name.into(),
+                    command: p.command,
+                })
+                .collect();
+
+            processes.sort_by_key(|k| k.name.clone());
+            Arc::from(processes.into_boxed_slice())
+        })
+    } else {
+        let mut processes: Box<[_]> = System::new_all()
+            .processes()
+            .values()
+            .map(|process| {
+                let name = process.name().to_string_lossy().into_owned();
+                Candidate {
+                    name: name.into(),
+                    pid: process.pid().as_u32(),
+                    command: process
+                        .cmd()
+                        .iter()
+                        .map(|s| s.to_string_lossy().to_string())
+                        .collect::<Vec<_>>(),
+                }
+            })
+            .collect();
+        processes.sort_by_key(|k| k.name.clone());
+        let processes = processes.into_iter().collect();
+        Task::ready(processes)
+    }
+}
+
 #[cfg(any(test, feature = "test-support"))]
 pub(crate) fn _process_names(modal: &AttachModal, cx: &mut Context<AttachModal>) -> Vec<String> {
     modal.picker.read_with(cx, |picker, _| {
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index 68770bc8b1..ee6289187b 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -20,7 +20,7 @@ use gpui::{
 };
 use itertools::Itertools as _;
 use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};
-use project::{DebugScenarioContext, TaskContexts, TaskSourceKind, task_store::TaskStore};
+use project::{DebugScenarioContext, Project, TaskContexts, TaskSourceKind, task_store::TaskStore};
 use settings::Settings;
 use task::{DebugScenario, RevealTarget, ZedDebugConfig};
 use theme::ThemeSettings;
@@ -88,8 +88,10 @@ impl NewProcessModal {
             })?;
             workspace.update_in(cx, |workspace, window, cx| {
                 let workspace_handle = workspace.weak_handle();
+                let project = workspace.project().clone();
                 workspace.toggle_modal(window, cx, |window, cx| {
-                    let attach_mode = AttachMode::new(None, workspace_handle.clone(), window, cx);
+                    let attach_mode =
+                        AttachMode::new(None, workspace_handle.clone(), project, window, cx);
 
                     let debug_picker = cx.new(|cx| {
                         let delegate =
@@ -940,6 +942,7 @@ impl AttachMode {
     pub(super) fn new(
         debugger: Option<DebugAdapterName>,
         workspace: WeakEntity<Workspace>,
+        project: Entity<Project>,
         window: &mut Window,
         cx: &mut Context<NewProcessModal>,
     ) -> Entity<Self> {
@@ -950,7 +953,7 @@ impl AttachMode {
             stop_on_entry: Some(false),
         };
         let attach_picker = cx.new(|cx| {
-            let modal = AttachModal::new(definition.clone(), workspace, false, window, cx);
+            let modal = AttachModal::new(definition.clone(), workspace, project, false, window, cx);
             window.focus(&modal.focus_handle(cx));
 
             modal
diff --git a/crates/proto/proto/debugger.proto b/crates/proto/proto/debugger.proto
index c6f9c9f134..e3cb5ebbce 100644
--- a/crates/proto/proto/debugger.proto
+++ b/crates/proto/proto/debugger.proto
@@ -546,3 +546,17 @@ message LogToDebugConsole {
     uint64 session_id = 2;
     string message = 3;
 }
+
+message GetProcesses {
+    uint64 project_id = 1;
+}
+
+message GetProcessesResponse {
+    repeated ProcessInfo processes = 1;
+}
+
+message ProcessInfo {
+    uint32 pid = 1;
+    string name = 2;
+    repeated string command = 3;
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 4133b4b5ee..3763671a7a 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -399,7 +399,10 @@ message Envelope {
         LspQueryResponse lsp_query_response = 366;
         ToggleLspLogs toggle_lsp_logs = 367;
 
-        UpdateUserSettings update_user_settings = 368; // current max
+        UpdateUserSettings update_user_settings = 368;
+
+        GetProcesses get_processes = 369;
+        GetProcessesResponse get_processes_response = 370; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 8f4e836b20..3c98ae62e7 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -102,6 +102,8 @@ messages!(
     (GetPathMetadata, Background),
     (GetPathMetadataResponse, Background),
     (GetPermalinkToLine, Foreground),
+    (GetProcesses, Background),
+    (GetProcessesResponse, Background),
     (GetPermalinkToLineResponse, Foreground),
     (GetProjectSymbols, Background),
     (GetProjectSymbolsResponse, Background),
@@ -485,6 +487,7 @@ request_messages!(
     (GetDefaultBranch, GetDefaultBranchResponse),
     (GitClone, GitCloneResponse),
     (ToggleLspLogs, Ack),
+    (GetProcesses, GetProcessesResponse),
 );
 
 lsp_messages!(
@@ -610,6 +613,7 @@ entity_messages!(
     ActivateToolchain,
     ActiveToolchain,
     GetPathMetadata,
+    GetProcesses,
     CancelLanguageServerWork,
     RegisterBufferWithLanguageServers,
     GitShow,
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index f55826631b..7fb5ac8498 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -32,6 +32,7 @@ use std::{
     path::{Path, PathBuf},
     sync::{Arc, atomic::AtomicUsize},
 };
+use sysinfo::System;
 use util::ResultExt;
 use worktree::Worktree;
 
@@ -230,6 +231,7 @@ impl HeadlessProject {
         session.add_request_handler(cx.weak_entity(), Self::handle_get_path_metadata);
         session.add_request_handler(cx.weak_entity(), Self::handle_shutdown_remote_server);
         session.add_request_handler(cx.weak_entity(), Self::handle_ping);
+        session.add_request_handler(cx.weak_entity(), Self::handle_get_processes);
 
         session.add_entity_request_handler(Self::handle_add_worktree);
         session.add_request_handler(cx.weak_entity(), Self::handle_remove_worktree);
@@ -719,6 +721,34 @@ impl HeadlessProject {
         log::debug!("Received ping from client");
         Ok(proto::Ack {})
     }
+
+    async fn handle_get_processes(
+        _this: Entity<Self>,
+        _envelope: TypedEnvelope<proto::GetProcesses>,
+        _cx: AsyncApp,
+    ) -> Result<proto::GetProcessesResponse> {
+        let mut processes = Vec::new();
+        let system = System::new_all();
+
+        for (_pid, process) in system.processes() {
+            let name = process.name().to_string_lossy().into_owned();
+            let command = process
+                .cmd()
+                .iter()
+                .map(|s| s.to_string_lossy().to_string())
+                .collect::<Vec<_>>();
+
+            processes.push(proto::ProcessInfo {
+                pid: process.pid().as_u32(),
+                name,
+                command,
+            });
+        }
+
+        processes.sort_by_key(|p| p.name.clone());
+
+        Ok(proto::GetProcessesResponse { processes })
+    }
 }
 
 fn prompt_to_proto(

From 236b3e546e484647c491323d733c299af518c7a0 Mon Sep 17 00:00:00 2001
From: morgankrey <morgan@zed.dev>
Date: Fri, 5 Sep 2025 14:34:13 -0700
Subject: [PATCH 642/823] Update Link (#37671)

Documentation fix

Release Notes:

- N/A
---
 docs/src/configuring-languages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/configuring-languages.md b/docs/src/configuring-languages.md
index 52b7a3f7b8..9da44fb53d 100644
--- a/docs/src/configuring-languages.md
+++ b/docs/src/configuring-languages.md
@@ -251,7 +251,7 @@ You can toggle language server support globally or per-language:
   }
 ```
 
-This disables the language server for Markdown files, which can be useful for performance in large documentation projects. You can configure this globally in your `~/.zed/settings.json` or inside a `.zed/settings.json` in your project directory.
+This disables the language server for Markdown files, which can be useful for performance in large documentation projects. You can configure this globally in your `~/.config/zed/settings.json` or inside a `.zed/settings.json` in your project directory.
 
 ## Formatting and Linting
 

From 64b6e8ba0fd47828b6cf2917f520ca9962c15df5 Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Fri, 5 Sep 2025 23:35:28 +0200
Subject: [PATCH 643/823] debugger: Fix allow showing more than 1 compact
 session item (#37036)

Closes #36978

This PR fixes an issue that we would only show the first `root -> child`
session in compact mode, but the session that came after it, we would
only show the child session label instead of also adding the parent
label due to compact mode.

## Before
<img width="348" height="173" alt="Screenshot 2025-08-27 at 22 18 39"
src="https://github.com/user-attachments/assets/ad6afd3a-196d-497f-812a-00698676ee90"
/>

## After
<img width="563" height="211" alt="Screenshot 2025-08-27 at 21 57 16"
src="https://github.com/user-attachments/assets/a953ef2a-a796-4160-b868-96e96f81c858"
/>

With 3 parent + child sessions and one parent session only.
<img width="484" height="223" alt="Screenshot 2025-08-27 at 22 22 13"
src="https://github.com/user-attachments/assets/a26f79a4-63a5-43d0-a714-d62cb1995e6e"
/>

cc @cole-miller I know we hacked on this some while ago, so figured you
might be the best guy to ask for a review.

Release Notes:

- Debugger: Fix to allow showing more than 1 compact session item

---------

Co-authored-by: Anthony <anthony@zed.dev>
---
 crates/debugger_ui/src/dropdown_menus.rs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/crates/debugger_ui/src/dropdown_menus.rs b/crates/debugger_ui/src/dropdown_menus.rs
index c611d5d44f..376a4a41ce 100644
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ b/crates/debugger_ui/src/dropdown_menus.rs
@@ -113,23 +113,6 @@ impl DebugPanel {
                 }
             };
             session_entries.push(root_entry);
-
-            session_entries.extend(
-                sessions_with_children
-                    .by_ref()
-                    .take_while(|(session, _)| {
-                        session
-                            .read(cx)
-                            .session(cx)
-                            .read(cx)
-                            .parent_id(cx)
-                            .is_some()
-                    })
-                    .map(|(session, _)| SessionListEntry {
-                        leaf: session.clone(),
-                        ancestors: vec![],
-                    }),
-            );
         }
 
         let weak = cx.weak_entity();

From 59bdbf5a5dfc465f6327da4048d72f6536fdd841 Mon Sep 17 00:00:00 2001
From: Nia <nia@zed.dev>
Date: Sat, 6 Sep 2025 00:27:14 +0200
Subject: [PATCH 644/823] Various fixups to unsafe code (#37651)

A collection of fixups of possibly-unsound code and removing some small
useless writes.

Release Notes:

- N/A
---
 crates/fs/src/fs.rs            |  15 ++-
 crates/gpui/src/arena.rs       |  27 ++---
 crates/gpui/src/util.rs        |   6 +-
 crates/sqlez/src/connection.rs | 174 +++++++++++++++++----------------
 crates/sqlez/src/statement.rs  |  78 +++++++--------
 crates/util/src/util.rs        |   4 +-
 crates/zlog/src/filter.rs      |  14 +--
 crates/zlog/src/sink.rs        |  38 ++++---
 8 files changed, 183 insertions(+), 173 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index a5cf9b8825..98c8dc9054 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -20,6 +20,9 @@ use std::os::fd::{AsFd, AsRawFd};
 #[cfg(unix)]
 use std::os::unix::fs::{FileTypeExt, MetadataExt};
 
+#[cfg(any(target_os = "macos", target_os = "freebsd"))]
+use std::mem::MaybeUninit;
+
 use async_tar::Archive;
 use futures::{AsyncRead, Stream, StreamExt, future::BoxFuture};
 use git::repository::{GitRepository, RealGitRepository};
@@ -261,14 +264,15 @@ impl FileHandle for std::fs::File {
         };
 
         let fd = self.as_fd();
-        let mut path_buf: [libc::c_char; libc::PATH_MAX as usize] = [0; libc::PATH_MAX as usize];
+        let mut path_buf = MaybeUninit::<[u8; libc::PATH_MAX as usize]>::uninit();
 
         let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_GETPATH, path_buf.as_mut_ptr()) };
         if result == -1 {
             anyhow::bail!("fcntl returned -1".to_string());
         }
 
-        let c_str = unsafe { CStr::from_ptr(path_buf.as_ptr()) };
+        // SAFETY: `fcntl` will initialize the path buffer.
+        let c_str = unsafe { CStr::from_ptr(path_buf.as_ptr().cast()) };
         let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
         Ok(path)
     }
@@ -296,15 +300,16 @@ impl FileHandle for std::fs::File {
         };
 
         let fd = self.as_fd();
-        let mut kif: libc::kinfo_file = unsafe { std::mem::zeroed() };
+        let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
         kif.kf_structsize = libc::KINFO_FILE_SIZE;
 
-        let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, &mut kif) };
+        let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
         if result == -1 {
             anyhow::bail!("fcntl returned -1".to_string());
         }
 
-        let c_str = unsafe { CStr::from_ptr(kif.kf_path.as_ptr()) };
+        // SAFETY: `fcntl` will initialize the kif.
+        let c_str = unsafe { CStr::from_ptr(kif.assume_init().kf_path.as_ptr()) };
         let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
         Ok(path)
     }
diff --git a/crates/gpui/src/arena.rs b/crates/gpui/src/arena.rs
index 0983bd2345..a0d0c23987 100644
--- a/crates/gpui/src/arena.rs
+++ b/crates/gpui/src/arena.rs
@@ -1,8 +1,9 @@
 use std::{
     alloc::{self, handle_alloc_error},
     cell::Cell,
+    num::NonZeroUsize,
     ops::{Deref, DerefMut},
-    ptr,
+    ptr::{self, NonNull},
     rc::Rc,
 };
 
@@ -30,23 +31,23 @@ impl Drop for Chunk {
     fn drop(&mut self) {
         unsafe {
             let chunk_size = self.end.offset_from_unsigned(self.start);
-            // this never fails as it succeeded during allocation
-            let layout = alloc::Layout::from_size_align(chunk_size, 1).unwrap();
+            // SAFETY: This succeeded during allocation.
+            let layout = alloc::Layout::from_size_align_unchecked(chunk_size, 1);
             alloc::dealloc(self.start, layout);
         }
     }
 }
 
 impl Chunk {
-    fn new(chunk_size: usize) -> Self {
+    fn new(chunk_size: NonZeroUsize) -> Self {
         unsafe {
             // this only fails if chunk_size is unreasonably huge
-            let layout = alloc::Layout::from_size_align(chunk_size, 1).unwrap();
+            let layout = alloc::Layout::from_size_align(chunk_size.get(), 1).unwrap();
             let start = alloc::alloc(layout);
             if start.is_null() {
                 handle_alloc_error(layout);
             }
-            let end = start.add(chunk_size);
+            let end = start.add(chunk_size.get());
             Self {
                 start,
                 end,
@@ -55,14 +56,14 @@ impl Chunk {
         }
     }
 
-    fn allocate(&mut self, layout: alloc::Layout) -> Option<*mut u8> {
+    fn allocate(&mut self, layout: alloc::Layout) -> Option<NonNull<u8>> {
         unsafe {
             let aligned = self.offset.add(self.offset.align_offset(layout.align()));
             let next = aligned.add(layout.size());
 
             if next <= self.end {
                 self.offset = next;
-                Some(aligned)
+                NonNull::new(aligned)
             } else {
                 None
             }
@@ -79,7 +80,7 @@ pub struct Arena {
     elements: Vec<ArenaElement>,
     valid: Rc<Cell<bool>>,
     current_chunk_index: usize,
-    chunk_size: usize,
+    chunk_size: NonZeroUsize,
 }
 
 impl Drop for Arena {
@@ -90,7 +91,7 @@ impl Drop for Arena {
 
 impl Arena {
     pub fn new(chunk_size: usize) -> Self {
-        assert!(chunk_size > 0);
+        let chunk_size = NonZeroUsize::try_from(chunk_size).unwrap();
         Self {
             chunks: vec![Chunk::new(chunk_size)],
             elements: Vec::new(),
@@ -101,7 +102,7 @@ impl Arena {
     }
 
     pub fn capacity(&self) -> usize {
-        self.chunks.len() * self.chunk_size
+        self.chunks.len() * self.chunk_size.get()
     }
 
     pub fn clear(&mut self) {
@@ -136,7 +137,7 @@ impl Arena {
             let layout = alloc::Layout::new::<T>();
             let mut current_chunk = &mut self.chunks[self.current_chunk_index];
             let ptr = if let Some(ptr) = current_chunk.allocate(layout) {
-                ptr
+                ptr.as_ptr()
             } else {
                 self.current_chunk_index += 1;
                 if self.current_chunk_index >= self.chunks.len() {
@@ -149,7 +150,7 @@ impl Arena {
                 }
                 current_chunk = &mut self.chunks[self.current_chunk_index];
                 if let Some(ptr) = current_chunk.allocate(layout) {
-                    ptr
+                    ptr.as_ptr()
                 } else {
                     panic!(
                         "Arena chunk_size of {} is too small to allocate {} bytes",
diff --git a/crates/gpui/src/util.rs b/crates/gpui/src/util.rs
index 3d7fa06e6c..3704784a95 100644
--- a/crates/gpui/src/util.rs
+++ b/crates/gpui/src/util.rs
@@ -99,9 +99,9 @@ impl<T: Future> Future for WithTimeout<T> {
     fn poll(self: Pin<&mut Self>, cx: &mut task::Context) -> task::Poll<Self::Output> {
         // SAFETY: the fields of Timeout are private and we never move the future ourselves
         // And its already pinned since we are being polled (all futures need to be pinned to be polled)
-        let this = unsafe { self.get_unchecked_mut() };
-        let future = unsafe { Pin::new_unchecked(&mut this.future) };
-        let timer = unsafe { Pin::new_unchecked(&mut this.timer) };
+        let this = unsafe { &raw mut *self.get_unchecked_mut() };
+        let future = unsafe { Pin::new_unchecked(&mut (*this).future) };
+        let timer = unsafe { Pin::new_unchecked(&mut (*this).timer) };
 
         if let task::Poll::Ready(output) = future.poll(cx) {
             task::Poll::Ready(Ok(output))
diff --git a/crates/sqlez/src/connection.rs b/crates/sqlez/src/connection.rs
index 228bd4c6a2..53f0d4e261 100644
--- a/crates/sqlez/src/connection.rs
+++ b/crates/sqlez/src/connection.rs
@@ -92,91 +92,97 @@ impl Connection {
         let mut remaining_sql = sql.as_c_str();
         let sql_start = remaining_sql.as_ptr();
 
-        unsafe {
-            let mut alter_table = None;
-            while {
-                let remaining_sql_str = remaining_sql.to_str().unwrap().trim();
-                let any_remaining_sql = remaining_sql_str != ";" && !remaining_sql_str.is_empty();
-                if any_remaining_sql {
-                    alter_table = parse_alter_table(remaining_sql_str);
-                }
-                any_remaining_sql
-            } {
-                let mut raw_statement = ptr::null_mut::<sqlite3_stmt>();
-                let mut remaining_sql_ptr = ptr::null();
-
-                let (res, offset, message, _conn) =
-                    if let Some((table_to_alter, column)) = alter_table {
-                        // ALTER TABLE is a weird statement. When preparing the statement the table's
-                        // existence is checked *before* syntax checking any other part of the statement.
-                        // Therefore, we need to make sure that the table has been created before calling
-                        // prepare. As we don't want to trash whatever database this is connected to, we
-                        // create a new in-memory DB to test.
-
-                        let temp_connection = Connection::open_memory(None);
-                        //This should always succeed, if it doesn't then you really should know about it
-                        temp_connection
-                            .exec(&format!("CREATE TABLE {table_to_alter}({column})"))
-                            .unwrap()()
-                        .unwrap();
-
-                        sqlite3_prepare_v2(
-                            temp_connection.sqlite3,
-                            remaining_sql.as_ptr(),
-                            -1,
-                            &mut raw_statement,
-                            &mut remaining_sql_ptr,
-                        );
-
-                        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-                        let offset = sqlite3_error_offset(temp_connection.sqlite3);
-
-                        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                        let offset = 0;
-
-                        (
-                            sqlite3_errcode(temp_connection.sqlite3),
-                            offset,
-                            sqlite3_errmsg(temp_connection.sqlite3),
-                            Some(temp_connection),
-                        )
-                    } else {
-                        sqlite3_prepare_v2(
-                            self.sqlite3,
-                            remaining_sql.as_ptr(),
-                            -1,
-                            &mut raw_statement,
-                            &mut remaining_sql_ptr,
-                        );
-
-                        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-                        let offset = sqlite3_error_offset(self.sqlite3);
-
-                        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                        let offset = 0;
-
-                        (
-                            sqlite3_errcode(self.sqlite3),
-                            offset,
-                            sqlite3_errmsg(self.sqlite3),
-                            None,
-                        )
-                    };
-
-                sqlite3_finalize(raw_statement);
-
-                if res == 1 && offset >= 0 {
-                    let sub_statement_correction =
-                        remaining_sql.as_ptr() as usize - sql_start as usize;
-                    let err_msg =
-                        String::from_utf8_lossy(CStr::from_ptr(message as *const _).to_bytes())
-                            .into_owned();
-
-                    return Some((err_msg, offset as usize + sub_statement_correction));
-                }
-                remaining_sql = CStr::from_ptr(remaining_sql_ptr);
-                alter_table = None;
+        let mut alter_table = None;
+        while {
+            let remaining_sql_str = remaining_sql.to_str().unwrap().trim();
+            let any_remaining_sql = remaining_sql_str != ";" && !remaining_sql_str.is_empty();
+            if any_remaining_sql {
+                alter_table = parse_alter_table(remaining_sql_str);
             }
+            any_remaining_sql
+        } {
+            let mut raw_statement = ptr::null_mut::<sqlite3_stmt>();
+            let mut remaining_sql_ptr = ptr::null();
+
+            let (res, offset, message, _conn) = if let Some((table_to_alter, column)) = alter_table
+            {
+                // ALTER TABLE is a weird statement. When preparing the statement the table's
+                // existence is checked *before* syntax checking any other part of the statement.
+                // Therefore, we need to make sure that the table has been created before calling
+                // prepare. As we don't want to trash whatever database this is connected to, we
+                // create a new in-memory DB to test.
+
+                let temp_connection = Connection::open_memory(None);
+                //This should always succeed, if it doesn't then you really should know about it
+                temp_connection
+                    .exec(&format!("CREATE TABLE {table_to_alter}({column})"))
+                    .unwrap()()
+                .unwrap();
+
+                unsafe {
+                    sqlite3_prepare_v2(
+                        temp_connection.sqlite3,
+                        remaining_sql.as_ptr(),
+                        -1,
+                        &mut raw_statement,
+                        &mut remaining_sql_ptr,
+                    )
+                };
+
+                #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
+                let offset = unsafe { sqlite3_error_offset(temp_connection.sqlite3) };
+
+                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+                let offset = 0;
+
+                unsafe {
+                    (
+                        sqlite3_errcode(temp_connection.sqlite3),
+                        offset,
+                        sqlite3_errmsg(temp_connection.sqlite3),
+                        Some(temp_connection),
+                    )
+                }
+            } else {
+                unsafe {
+                    sqlite3_prepare_v2(
+                        self.sqlite3,
+                        remaining_sql.as_ptr(),
+                        -1,
+                        &mut raw_statement,
+                        &mut remaining_sql_ptr,
+                    )
+                };
+
+                #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
+                let offset = unsafe { sqlite3_error_offset(self.sqlite3) };
+
+                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+                let offset = 0;
+
+                unsafe {
+                    (
+                        sqlite3_errcode(self.sqlite3),
+                        offset,
+                        sqlite3_errmsg(self.sqlite3),
+                        None,
+                    )
+                }
+            };
+
+            unsafe { sqlite3_finalize(raw_statement) };
+
+            if res == 1 && offset >= 0 {
+                let sub_statement_correction = remaining_sql.as_ptr() as usize - sql_start as usize;
+                let err_msg = String::from_utf8_lossy(unsafe {
+                    CStr::from_ptr(message as *const _).to_bytes()
+                })
+                .into_owned();
+
+                return Some((err_msg, offset as usize + sub_statement_correction));
+            }
+            remaining_sql = unsafe { CStr::from_ptr(remaining_sql_ptr) };
+            alter_table = None;
         }
         None
     }
diff --git a/crates/sqlez/src/statement.rs b/crates/sqlez/src/statement.rs
index eb7553f862..d08e58a6f9 100644
--- a/crates/sqlez/src/statement.rs
+++ b/crates/sqlez/src/statement.rs
@@ -44,41 +44,41 @@ impl<'a> Statement<'a> {
             connection,
             phantom: PhantomData,
         };
-        unsafe {
-            let sql = CString::new(query.as_ref()).context("Error creating cstr")?;
-            let mut remaining_sql = sql.as_c_str();
-            while {
-                let remaining_sql_str = remaining_sql
-                    .to_str()
-                    .context("Parsing remaining sql")?
-                    .trim();
-                remaining_sql_str != ";" && !remaining_sql_str.is_empty()
-            } {
-                let mut raw_statement = ptr::null_mut::<sqlite3_stmt>();
-                let mut remaining_sql_ptr = ptr::null();
+        let sql = CString::new(query.as_ref()).context("Error creating cstr")?;
+        let mut remaining_sql = sql.as_c_str();
+        while {
+            let remaining_sql_str = remaining_sql
+                .to_str()
+                .context("Parsing remaining sql")?
+                .trim();
+            remaining_sql_str != ";" && !remaining_sql_str.is_empty()
+        } {
+            let mut raw_statement = ptr::null_mut::<sqlite3_stmt>();
+            let mut remaining_sql_ptr = ptr::null();
+            unsafe {
                 sqlite3_prepare_v2(
                     connection.sqlite3,
                     remaining_sql.as_ptr(),
                     -1,
                     &mut raw_statement,
                     &mut remaining_sql_ptr,
-                );
+                )
+            };
 
-                connection.last_error().with_context(|| {
-                    format!("Prepare call failed for query:\n{}", query.as_ref())
-                })?;
+            connection
+                .last_error()
+                .with_context(|| format!("Prepare call failed for query:\n{}", query.as_ref()))?;
 
-                remaining_sql = CStr::from_ptr(remaining_sql_ptr);
-                statement.raw_statements.push(raw_statement);
+            remaining_sql = unsafe { CStr::from_ptr(remaining_sql_ptr) };
+            statement.raw_statements.push(raw_statement);
 
-                if !connection.can_write() && sqlite3_stmt_readonly(raw_statement) == 0 {
-                    let sql = CStr::from_ptr(sqlite3_sql(raw_statement));
+            if !connection.can_write() && unsafe { sqlite3_stmt_readonly(raw_statement) == 0 } {
+                let sql = unsafe { CStr::from_ptr(sqlite3_sql(raw_statement)) };
 
-                    bail!(
-                        "Write statement prepared with connection that is not write capable. SQL:\n{} ",
-                        sql.to_str()?
-                    )
-                }
+                bail!(
+                    "Write statement prepared with connection that is not write capable. SQL:\n{} ",
+                    sql.to_str()?
+                )
             }
         }
 
@@ -271,23 +271,21 @@ impl<'a> Statement<'a> {
     }
 
     fn step(&mut self) -> Result<StepResult> {
-        unsafe {
-            match sqlite3_step(self.current_statement()) {
-                SQLITE_ROW => Ok(StepResult::Row),
-                SQLITE_DONE => {
-                    if self.current_statement >= self.raw_statements.len() - 1 {
-                        Ok(StepResult::Done)
-                    } else {
-                        self.current_statement += 1;
-                        self.step()
-                    }
-                }
-                SQLITE_MISUSE => anyhow::bail!("Statement step returned SQLITE_MISUSE"),
-                _other_error => {
-                    self.connection.last_error()?;
-                    unreachable!("Step returned error code and last error failed to catch it");
+        match unsafe { sqlite3_step(self.current_statement()) } {
+            SQLITE_ROW => Ok(StepResult::Row),
+            SQLITE_DONE => {
+                if self.current_statement >= self.raw_statements.len() - 1 {
+                    Ok(StepResult::Done)
+                } else {
+                    self.current_statement += 1;
+                    self.step()
                 }
             }
+            SQLITE_MISUSE => anyhow::bail!("Statement step returned SQLITE_MISUSE"),
+            _other_error => {
+                self.connection.last_error()?;
+                unreachable!("Step returned error code and last error failed to catch it");
+            }
         }
     }
 
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index db44e39451..90f5be1c92 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -256,6 +256,9 @@ fn load_shell_from_passwd() -> Result<()> {
             &mut result,
         )
     };
+    anyhow::ensure!(!result.is_null(), "passwd entry for uid {} not found", uid);
+
+    // SAFETY: If `getpwuid_r` doesn't error, we have the entry here.
     let entry = unsafe { pwd.assume_init() };
 
     anyhow::ensure!(
@@ -264,7 +267,6 @@ fn load_shell_from_passwd() -> Result<()> {
         uid,
         status
     );
-    anyhow::ensure!(!result.is_null(), "passwd entry for uid {} not found", uid);
     anyhow::ensure!(
         entry.pw_uid == uid,
         "passwd entry has different uid ({}) than getuid ({}) returned",
diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
index ee3c241079..31a5889477 100644
--- a/crates/zlog/src/filter.rs
+++ b/crates/zlog/src/filter.rs
@@ -22,7 +22,7 @@ pub const LEVEL_ENABLED_MAX_DEFAULT: log::LevelFilter = log::LevelFilter::Info;
 /// crate that the max level is everything, so that we can dynamically enable
 /// logs that are more verbose than this level without the `log` crate throwing
 /// them away before we see them
-static mut LEVEL_ENABLED_MAX_STATIC: log::LevelFilter = LEVEL_ENABLED_MAX_DEFAULT;
+static LEVEL_ENABLED_MAX_STATIC: AtomicU8 = AtomicU8::new(LEVEL_ENABLED_MAX_DEFAULT as u8);
 
 /// A cache of the true maximum log level that _could_ be printed. This is based
 /// on the maximally verbose level that is configured by the user, and is used
@@ -46,7 +46,7 @@ const DEFAULT_FILTERS: &[(&str, log::LevelFilter)] = &[
 
 pub fn init_env_filter(filter: env_config::EnvFilter) {
     if let Some(level_max) = filter.level_global {
-        unsafe { LEVEL_ENABLED_MAX_STATIC = level_max }
+        LEVEL_ENABLED_MAX_STATIC.store(level_max as u8, Ordering::Release)
     }
     if ENV_FILTER.set(filter).is_err() {
         panic!("Environment filter cannot be initialized twice");
@@ -54,7 +54,7 @@ pub fn init_env_filter(filter: env_config::EnvFilter) {
 }
 
 pub fn is_possibly_enabled_level(level: log::Level) -> bool {
-    level as u8 <= LEVEL_ENABLED_MAX_CONFIG.load(Ordering::Relaxed)
+    level as u8 <= LEVEL_ENABLED_MAX_CONFIG.load(Ordering::Acquire)
 }
 
 pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Level) -> bool {
@@ -66,7 +66,7 @@ pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Le
         // scope map
         return false;
     }
-    let is_enabled_by_default = level <= unsafe { LEVEL_ENABLED_MAX_STATIC };
+    let is_enabled_by_default = level as u8 <= LEVEL_ENABLED_MAX_STATIC.load(Ordering::Acquire);
     let global_scope_map = SCOPE_MAP.read().unwrap_or_else(|err| {
         SCOPE_MAP.clear_poison();
         err.into_inner()
@@ -92,13 +92,13 @@ pub fn is_scope_enabled(scope: &Scope, module_path: Option<&str>, level: log::Le
 pub fn refresh_from_settings(settings: &HashMap<String, String>) {
     let env_config = ENV_FILTER.get();
     let map_new = ScopeMap::new_from_settings_and_env(settings, env_config, DEFAULT_FILTERS);
-    let mut level_enabled_max = unsafe { LEVEL_ENABLED_MAX_STATIC };
+    let mut level_enabled_max = LEVEL_ENABLED_MAX_STATIC.load(Ordering::Acquire);
     for entry in &map_new.entries {
         if let Some(level) = entry.enabled {
-            level_enabled_max = level_enabled_max.max(level);
+            level_enabled_max = level_enabled_max.max(level as u8);
         }
     }
-    LEVEL_ENABLED_MAX_CONFIG.store(level_enabled_max as u8, Ordering::Release);
+    LEVEL_ENABLED_MAX_CONFIG.store(level_enabled_max, Ordering::Release);
 
     {
         let mut global_map = SCOPE_MAP.write().unwrap_or_else(|err| {
diff --git a/crates/zlog/src/sink.rs b/crates/zlog/src/sink.rs
index 3ac85d4bbf..afbdf37bf9 100644
--- a/crates/zlog/src/sink.rs
+++ b/crates/zlog/src/sink.rs
@@ -4,7 +4,7 @@ use std::{
     path::PathBuf,
     sync::{
         Mutex, OnceLock,
-        atomic::{AtomicU64, Ordering},
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
 };
 
@@ -19,17 +19,17 @@ const ANSI_GREEN: &str = "\x1b[32m";
 const ANSI_BLUE: &str = "\x1b[34m";
 const ANSI_MAGENTA: &str = "\x1b[35m";
 
-/// Whether stdout output is enabled.
-static mut ENABLED_SINKS_STDOUT: bool = false;
-/// Whether stderr output is enabled.
-static mut ENABLED_SINKS_STDERR: bool = false;
-
 /// Is Some(file) if file output is enabled.
 static ENABLED_SINKS_FILE: Mutex<Option<std::fs::File>> = Mutex::new(None);
 static SINK_FILE_PATH: OnceLock<&'static PathBuf> = OnceLock::new();
 static SINK_FILE_PATH_ROTATE: OnceLock<&'static PathBuf> = OnceLock::new();
+
+// NB: Since this can be accessed in tests, we probably should stick to atomics here.
+/// Whether stdout output is enabled.
+static ENABLED_SINKS_STDOUT: AtomicBool = AtomicBool::new(false);
+/// Whether stderr output is enabled.
+static ENABLED_SINKS_STDERR: AtomicBool = AtomicBool::new(false);
 /// Atomic counter for the size of the log file in bytes.
-// TODO: make non-atomic if writing single threaded
 static SINK_FILE_SIZE_BYTES: AtomicU64 = AtomicU64::new(0);
 /// Maximum size of the log file before it will be rotated, in bytes.
 const SINK_FILE_SIZE_BYTES_MAX: u64 = 1024 * 1024; // 1 MB
@@ -42,15 +42,13 @@ pub struct Record<'a> {
 }
 
 pub fn init_output_stdout() {
-    unsafe {
-        ENABLED_SINKS_STDOUT = true;
-    }
+    // Use atomics here instead of just a `static mut`, since in the context
+    // of tests these accesses can be multi-threaded.
+    ENABLED_SINKS_STDOUT.store(true, Ordering::Release);
 }
 
 pub fn init_output_stderr() {
-    unsafe {
-        ENABLED_SINKS_STDERR = true;
-    }
+    ENABLED_SINKS_STDERR.store(true, Ordering::Release);
 }
 
 pub fn init_output_file(
@@ -79,7 +77,7 @@ pub fn init_output_file(
     if size_bytes >= SINK_FILE_SIZE_BYTES_MAX {
         rotate_log_file(&mut file, Some(path), path_rotate, &SINK_FILE_SIZE_BYTES);
     } else {
-        SINK_FILE_SIZE_BYTES.store(size_bytes, Ordering::Relaxed);
+        SINK_FILE_SIZE_BYTES.store(size_bytes, Ordering::Release);
     }
 
     *enabled_sinks_file = Some(file);
@@ -108,7 +106,7 @@ static LEVEL_ANSI_COLORS: [&str; 6] = [
 
 // PERF: batching
 pub fn submit(record: Record) {
-    if unsafe { ENABLED_SINKS_STDOUT } {
+    if ENABLED_SINKS_STDOUT.load(Ordering::Acquire) {
         let mut stdout = std::io::stdout().lock();
         _ = writeln!(
             &mut stdout,
@@ -123,7 +121,7 @@ pub fn submit(record: Record) {
             },
             record.message
         );
-    } else if unsafe { ENABLED_SINKS_STDERR } {
+    } else if ENABLED_SINKS_STDERR.load(Ordering::Acquire) {
         let mut stdout = std::io::stderr().lock();
         _ = writeln!(
             &mut stdout,
@@ -173,7 +171,7 @@ pub fn submit(record: Record) {
                 },
                 record.message
             );
-            SINK_FILE_SIZE_BYTES.fetch_add(writer.written, Ordering::Relaxed) + writer.written
+            SINK_FILE_SIZE_BYTES.fetch_add(writer.written, Ordering::AcqRel) + writer.written
         };
         if file_size_bytes > SINK_FILE_SIZE_BYTES_MAX {
             rotate_log_file(
@@ -187,7 +185,7 @@ pub fn submit(record: Record) {
 }
 
 pub fn flush() {
-    if unsafe { ENABLED_SINKS_STDOUT } {
+    if ENABLED_SINKS_STDOUT.load(Ordering::Acquire) {
         _ = std::io::stdout().lock().flush();
     }
     let mut file = ENABLED_SINKS_FILE.lock().unwrap_or_else(|handle| {
@@ -265,7 +263,7 @@ fn rotate_log_file<PathRef>(
     // according to the documentation, it only fails if:
     // - the file is not writeable: should never happen,
     // - the size would cause an overflow (implementation specific): 0 should never cause an overflow
-    atomic_size.store(0, Ordering::Relaxed);
+    atomic_size.store(0, Ordering::Release);
 }
 
 #[cfg(test)]
@@ -298,7 +296,7 @@ mod tests {
             std::fs::read_to_string(&rotation_log_file_path).unwrap(),
             contents,
         );
-        assert_eq!(size.load(Ordering::Relaxed), 0);
+        assert_eq!(size.load(Ordering::Acquire), 0);
     }
 
     /// Regression test, ensuring that if log level values change we are made aware

From 6a7b84eb87ab6764b2ee1152a714c4f00aced8f2 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Sat, 6 Sep 2025 00:47:39 +0200
Subject: [PATCH 645/823] toolchains: Allow users to provide custom paths to
 toolchains (#37009)

- **toolchains: Add new state to toolchain selector**
- **Use toolchain term for Add Toolchain button**
- **Hoist out a meta function for toolchain listers**

Closes #27332

Release Notes:

- python: Users can now specify a custom path to their virtual
environment from within the picker.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 Cargo.lock                                    |   5 +
 assets/keymaps/default-linux.json             |   8 +
 assets/keymaps/default-macos.json             |   8 +
 crates/file_finder/src/open_path_prompt.rs    |  32 +-
 crates/language/src/language.rs               |   1 +
 crates/language/src/toolchain.rs              |  62 +-
 crates/languages/src/lib.rs                   |   2 +-
 crates/languages/src/python.rs                | 100 ++-
 crates/project/src/lsp_store.rs               |   4 +-
 crates/project/src/project.rs                 |  74 +-
 crates/project/src/project_tests.rs           |  29 +-
 crates/project/src/toolchain_store.rs         | 286 ++++++-
 crates/proto/proto/toolchain.proto            |  13 +
 crates/proto/proto/zed.proto                  |   5 +-
 crates/proto/src/proto.rs                     |   4 +
 crates/repl/src/kernels/mod.rs                |  83 +-
 crates/toolchain_selector/Cargo.toml          |   5 +
 .../src/active_toolchain.rs                   |  34 +-
 .../src/toolchain_selector.rs                 | 802 +++++++++++++++++-
 crates/workspace/src/persistence.rs           | 148 +++-
 crates/workspace/src/persistence/model.rs     |   3 +
 crates/workspace/src/workspace.rs             |  31 +
 22 files changed, 1506 insertions(+), 233 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fbdf0e848c..295c3a83c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17000,10 +17000,15 @@ checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 name = "toolchain_selector"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
+ "convert_case 0.8.0",
  "editor",
+ "file_finder",
+ "futures 0.3.31",
  "fuzzy",
  "gpui",
  "language",
+ "menu",
  "picker",
  "project",
  "ui",
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 70a002cf08..ac44b3f1ae 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -628,6 +628,7 @@
       "alt-save": "workspace::SaveAll",
       "ctrl-alt-s": "workspace::SaveAll",
       "ctrl-k m": "language_selector::Toggle",
+      "ctrl-k ctrl-m": "toolchain::AddToolchain",
       "escape": "workspace::Unfollow",
       "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
       "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
@@ -1028,6 +1029,13 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
+  {
+    "context": "ToolchainSelector",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-a": "toolchain::AddToolchain"
+    }
+  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor)",
     "bindings": {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 21504c7e62..337915527c 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -690,6 +690,7 @@
       "cmd-?": "agent::ToggleFocus",
       "cmd-alt-s": "workspace::SaveAll",
       "cmd-k m": "language_selector::Toggle",
+      "cmd-k cmd-m": "toolchain::AddToolchain",
       "escape": "workspace::Unfollow",
       "cmd-k cmd-left": "workspace::ActivatePaneLeft",
       "cmd-k cmd-right": "workspace::ActivatePaneRight",
@@ -1094,6 +1095,13 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
+  {
+    "context": "ToolchainSelector",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-shift-a": "toolchain::AddToolchain"
+    }
+  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor)",
     "use_key_equivalents": true,
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index 51e8f5c437..c0abb372b2 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -23,7 +23,6 @@ use workspace::Workspace;
 
 pub(crate) struct OpenPathPrompt;
 
-#[derive(Debug)]
 pub struct OpenPathDelegate {
     tx: Option<oneshot::Sender<Option<Vec<PathBuf>>>>,
     lister: DirectoryLister,
@@ -35,6 +34,9 @@ pub struct OpenPathDelegate {
     prompt_root: String,
     path_style: PathStyle,
     replace_prompt: Task<()>,
+    render_footer:
+        Arc<dyn Fn(&mut Window, &mut Context<Picker<Self>>) -> Option<AnyElement> + 'static>,
+    hidden_entries: bool,
 }
 
 impl OpenPathDelegate {
@@ -60,9 +62,25 @@ impl OpenPathDelegate {
             },
             path_style,
             replace_prompt: Task::ready(()),
+            render_footer: Arc::new(|_, _| None),
+            hidden_entries: false,
         }
     }
 
+    pub fn with_footer(
+        mut self,
+        footer: Arc<
+            dyn Fn(&mut Window, &mut Context<Picker<Self>>) -> Option<AnyElement> + 'static,
+        >,
+    ) -> Self {
+        self.render_footer = footer;
+        self
+    }
+
+    pub fn show_hidden(mut self) -> Self {
+        self.hidden_entries = true;
+        self
+    }
     fn get_entry(&self, selected_match_index: usize) -> Option<CandidateInfo> {
         match &self.directory_state {
             DirectoryState::List { entries, .. } => {
@@ -269,7 +287,7 @@ impl PickerDelegate for OpenPathDelegate {
         self.cancel_flag.store(true, atomic::Ordering::Release);
         self.cancel_flag = Arc::new(AtomicBool::new(false));
         let cancel_flag = self.cancel_flag.clone();
-
+        let hidden_entries = self.hidden_entries;
         let parent_path_is_root = self.prompt_root == dir;
         let current_dir = self.current_dir();
         cx.spawn_in(window, async move |this, cx| {
@@ -363,7 +381,7 @@ impl PickerDelegate for OpenPathDelegate {
             };
 
             let mut max_id = 0;
-            if !suffix.starts_with('.') {
+            if !suffix.starts_with('.') && !hidden_entries {
                 new_entries.retain(|entry| {
                     max_id = max_id.max(entry.path.id);
                     !entry.path.string.starts_with('.')
@@ -781,6 +799,14 @@ impl PickerDelegate for OpenPathDelegate {
         }
     }
 
+    fn render_footer(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        (self.render_footer)(window, cx)
+    }
+
     fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
         Some(match &self.directory_state {
             DirectoryState::Create { .. } => SharedString::from("Type a path…"),
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index e4a1510d7d..86faf2b9d3 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -69,6 +69,7 @@ pub use text_diff::{
 use theme::SyntaxTheme;
 pub use toolchain::{
     LanguageToolchainStore, LocalLanguageToolchainStore, Toolchain, ToolchainList, ToolchainLister,
+    ToolchainMetadata, ToolchainScope,
 };
 use tree_sitter::{self, Query, QueryCursor, WasmStore, wasmtime};
 use util::serde::default_true;
diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
index 84b10c7961..2cc86881fb 100644
--- a/crates/language/src/toolchain.rs
+++ b/crates/language/src/toolchain.rs
@@ -29,6 +29,40 @@ pub struct Toolchain {
     pub as_json: serde_json::Value,
 }
 
+/// Declares a scope of a toolchain added by user.
+///
+/// When the user adds a toolchain, we give them an option to see that toolchain in:
+/// - All of their projects
+/// - A project they're currently in.
+/// - Only in the subproject they're currently in.
+#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub enum ToolchainScope {
+    Subproject(WorktreeId, Arc<Path>),
+    Project,
+    /// Available in all projects on this box. It wouldn't make sense to show suggestions across machines.
+    Global,
+}
+
+impl ToolchainScope {
+    pub fn label(&self) -> &'static str {
+        match self {
+            ToolchainScope::Subproject(_, _) => "Subproject",
+            ToolchainScope::Project => "Project",
+            ToolchainScope::Global => "Global",
+        }
+    }
+
+    pub fn description(&self) -> &'static str {
+        match self {
+            ToolchainScope::Subproject(_, _) => {
+                "Available only in the subproject you're currently in."
+            }
+            ToolchainScope::Project => "Available in all locations in your current project.",
+            ToolchainScope::Global => "Available in all of your projects on this machine.",
+        }
+    }
+}
+
 impl std::hash::Hash for Toolchain {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
         let Self {
@@ -58,23 +92,41 @@ impl PartialEq for Toolchain {
 }
 
 #[async_trait]
-pub trait ToolchainLister: Send + Sync {
+pub trait ToolchainLister: Send + Sync + 'static {
+    /// List all available toolchains for a given path.
     async fn list(
         &self,
         worktree_root: PathBuf,
         subroot_relative_path: Arc<Path>,
         project_env: Option<HashMap<String, String>>,
     ) -> ToolchainList;
-    // Returns a term which we should use in UI to refer to a toolchain.
-    fn term(&self) -> SharedString;
-    /// Returns the name of the manifest file for this toolchain.
-    fn manifest_name(&self) -> ManifestName;
+
+    /// Given a user-created toolchain, resolve lister-specific details.
+    /// Put another way: fill in the details of the toolchain so the user does not have to.
+    async fn resolve(
+        &self,
+        path: PathBuf,
+        project_env: Option<HashMap<String, String>>,
+    ) -> anyhow::Result<Toolchain>;
+
     async fn activation_script(
         &self,
         toolchain: &Toolchain,
         shell: ShellKind,
         fs: &dyn Fs,
     ) -> Vec<String>;
+    /// Returns various "static" bits of information about this toolchain lister. This function should be pure.
+    fn meta(&self) -> ToolchainMetadata;
+}
+
+#[derive(Clone, PartialEq, Eq, Hash)]
+pub struct ToolchainMetadata {
+    /// Returns a term which we should use in UI to refer to toolchains produced by a given `[ToolchainLister]`.
+    pub term: SharedString,
+    /// A user-facing placeholder describing the semantic meaning of a path to a new toolchain.
+    pub new_toolchain_placeholder: SharedString,
+    /// The name of the manifest file for this toolchain.
+    pub manifest_name: ManifestName,
 }
 
 #[async_trait(?Send)]
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 168cf8f57c..33fb2af061 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -97,7 +97,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
     let python_context_provider = Arc::new(python::PythonContextProvider);
     let python_lsp_adapter = Arc::new(python::PythonLspAdapter::new(node.clone()));
     let basedpyright_lsp_adapter = Arc::new(BasedPyrightLspAdapter::new());
-    let python_toolchain_provider = Arc::new(python::PythonToolchainProvider::default());
+    let python_toolchain_provider = Arc::new(python::PythonToolchainProvider);
     let rust_context_provider = Arc::new(rust::RustContextProvider);
     let rust_lsp_adapter = Arc::new(rust::RustLspAdapter);
     let tailwind_adapter = Arc::new(tailwind::TailwindLspAdapter::new(node.clone()));
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 06fb49293f..d1f40a8233 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -5,19 +5,19 @@ use collections::HashMap;
 use futures::AsyncBufReadExt;
 use gpui::{App, Task};
 use gpui::{AsyncApp, SharedString};
-use language::Toolchain;
 use language::ToolchainList;
 use language::ToolchainLister;
 use language::language_settings::language_settings;
 use language::{ContextLocation, LanguageToolchainStore};
 use language::{ContextProvider, LspAdapter, LspAdapterDelegate};
 use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
+use language::{Toolchain, ToolchainMetadata};
 use lsp::LanguageServerBinary;
 use lsp::LanguageServerName;
 use node_runtime::{NodeRuntime, VersionStrategy};
 use pet_core::Configuration;
 use pet_core::os_environment::Environment;
-use pet_core::python_environment::PythonEnvironmentKind;
+use pet_core::python_environment::{PythonEnvironment, PythonEnvironmentKind};
 use project::Fs;
 use project::lsp_store::language_server_settings;
 use serde_json::{Value, json};
@@ -688,17 +688,7 @@ fn python_env_kind_display(k: &PythonEnvironmentKind) -> &'static str {
     }
 }
 
-pub(crate) struct PythonToolchainProvider {
-    term: SharedString,
-}
-
-impl Default for PythonToolchainProvider {
-    fn default() -> Self {
-        Self {
-            term: SharedString::new_static("Virtual Environment"),
-        }
-    }
-}
+pub(crate) struct PythonToolchainProvider;
 
 static ENV_PRIORITY_LIST: &[PythonEnvironmentKind] = &[
     // Prioritize non-Conda environments.
@@ -744,9 +734,6 @@ async fn get_worktree_venv_declaration(worktree_root: &Path) -> Option<String> {
 
 #[async_trait]
 impl ToolchainLister for PythonToolchainProvider {
-    fn manifest_name(&self) -> language::ManifestName {
-        ManifestName::from(SharedString::new_static("pyproject.toml"))
-    }
     async fn list(
         &self,
         worktree_root: PathBuf,
@@ -847,32 +834,7 @@ impl ToolchainLister for PythonToolchainProvider {
 
         let mut toolchains: Vec<_> = toolchains
             .into_iter()
-            .filter_map(|toolchain| {
-                let mut name = String::from("Python");
-                if let Some(version) = &toolchain.version {
-                    _ = write!(name, " {version}");
-                }
-
-                let name_and_kind = match (&toolchain.name, &toolchain.kind) {
-                    (Some(name), Some(kind)) => {
-                        Some(format!("({name}; {})", python_env_kind_display(kind)))
-                    }
-                    (Some(name), None) => Some(format!("({name})")),
-                    (None, Some(kind)) => Some(format!("({})", python_env_kind_display(kind))),
-                    (None, None) => None,
-                };
-
-                if let Some(nk) = name_and_kind {
-                    _ = write!(name, " {nk}");
-                }
-
-                Some(Toolchain {
-                    name: name.into(),
-                    path: toolchain.executable.as_ref()?.to_str()?.to_owned().into(),
-                    language_name: LanguageName::new("Python"),
-                    as_json: serde_json::to_value(toolchain.clone()).ok()?,
-                })
-            })
+            .filter_map(venv_to_toolchain)
             .collect();
         toolchains.dedup();
         ToolchainList {
@@ -881,9 +843,34 @@ impl ToolchainLister for PythonToolchainProvider {
             groups: Default::default(),
         }
     }
-    fn term(&self) -> SharedString {
-        self.term.clone()
+    fn meta(&self) -> ToolchainMetadata {
+        ToolchainMetadata {
+            term: SharedString::new_static("Virtual Environment"),
+            new_toolchain_placeholder: SharedString::new_static(
+                "A path to the python3 executable within a virtual environment, or path to virtual environment itself",
+            ),
+            manifest_name: ManifestName::from(SharedString::new_static("pyproject.toml")),
+        }
     }
+
+    async fn resolve(
+        &self,
+        path: PathBuf,
+        env: Option<HashMap<String, String>>,
+    ) -> anyhow::Result<Toolchain> {
+        let env = env.unwrap_or_default();
+        let environment = EnvironmentApi::from_env(&env);
+        let locators = pet::locators::create_locators(
+            Arc::new(pet_conda::Conda::from(&environment)),
+            Arc::new(pet_poetry::Poetry::from(&environment)),
+            &environment,
+        );
+        let toolchain = pet::resolve::resolve_environment(&path, &locators, &environment)
+            .context("Could not find a virtual environment in provided path")?;
+        let venv = toolchain.resolved.unwrap_or(toolchain.discovered);
+        venv_to_toolchain(venv).context("Could not convert a venv into a toolchain")
+    }
+
     async fn activation_script(
         &self,
         toolchain: &Toolchain,
@@ -956,6 +943,31 @@ impl ToolchainLister for PythonToolchainProvider {
     }
 }
 
+fn venv_to_toolchain(venv: PythonEnvironment) -> Option<Toolchain> {
+    let mut name = String::from("Python");
+    if let Some(ref version) = venv.version {
+        _ = write!(name, " {version}");
+    }
+
+    let name_and_kind = match (&venv.name, &venv.kind) {
+        (Some(name), Some(kind)) => Some(format!("({name}; {})", python_env_kind_display(kind))),
+        (Some(name), None) => Some(format!("({name})")),
+        (None, Some(kind)) => Some(format!("({})", python_env_kind_display(kind))),
+        (None, None) => None,
+    };
+
+    if let Some(nk) = name_and_kind {
+        _ = write!(name, " {nk}");
+    }
+
+    Some(Toolchain {
+        name: name.into(),
+        path: venv.executable.as_ref()?.to_str()?.to_owned().into(),
+        language_name: LanguageName::new("Python"),
+        as_json: serde_json::to_value(venv).ok()?,
+    })
+}
+
 pub struct EnvironmentApi<'a> {
     global_search_locations: Arc<Mutex<Vec<PathBuf>>>,
     project_env: &'a HashMap<String, String>,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 7f7e759b27..a247c07c91 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3933,8 +3933,8 @@ impl LspStore {
         event: &ToolchainStoreEvent,
         _: &mut Context<Self>,
     ) {
-        match event {
-            ToolchainStoreEvent::ToolchainActivated => self.request_workspace_config_refresh(),
+        if let ToolchainStoreEvent::ToolchainActivated = event {
+            self.request_workspace_config_refresh()
         }
     }
 
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 66924f159a..0ebfd83f4e 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -48,7 +48,7 @@ use clock::ReplicaId;
 
 use dap::client::DebugAdapterClient;
 
-use collections::{BTreeSet, HashMap, HashSet};
+use collections::{BTreeSet, HashMap, HashSet, IndexSet};
 use debounced_delay::DebouncedDelay;
 pub use debugger::breakpoint_store::BreakpointWithPosition;
 use debugger::{
@@ -74,8 +74,9 @@ use gpui::{
 };
 use language::{
     Buffer, BufferEvent, Capability, CodeLabel, CursorShape, Language, LanguageName,
-    LanguageRegistry, PointUtf16, ToOffset, ToPointUtf16, Toolchain, ToolchainList, Transaction,
-    Unclipped, language_settings::InlayHintKind, proto::split_operations,
+    LanguageRegistry, PointUtf16, ToOffset, ToPointUtf16, Toolchain, ToolchainMetadata,
+    ToolchainScope, Transaction, Unclipped, language_settings::InlayHintKind,
+    proto::split_operations,
 };
 use lsp::{
     CodeActionKind, CompletionContext, CompletionItemKind, DocumentHighlightKind, InsertTextMode,
@@ -104,6 +105,7 @@ use snippet::Snippet;
 use snippet_provider::SnippetProvider;
 use std::{
     borrow::Cow,
+    collections::BTreeMap,
     ops::Range,
     path::{Component, Path, PathBuf},
     pin::pin,
@@ -117,7 +119,7 @@ use terminals::Terminals;
 use text::{Anchor, BufferId, OffsetRangeExt, Point, Rope};
 use toolchain_store::EmptyToolchainStore;
 use util::{
-    ResultExt as _,
+    ResultExt as _, maybe,
     paths::{PathStyle, RemotePathBuf, SanitizedPath, compare_paths},
 };
 use worktree::{CreatedEntry, Snapshot, Traversal};
@@ -142,7 +144,7 @@ pub use lsp_store::{
     LanguageServerStatus, LanguageServerToQuery, LspStore, LspStoreEvent,
     SERVER_PROGRESS_THROTTLE_TIMEOUT,
 };
-pub use toolchain_store::ToolchainStore;
+pub use toolchain_store::{ToolchainStore, Toolchains};
 const MAX_PROJECT_SEARCH_HISTORY_SIZE: usize = 500;
 const MAX_SEARCH_RESULT_FILES: usize = 5_000;
 const MAX_SEARCH_RESULT_RANGES: usize = 10_000;
@@ -3370,7 +3372,7 @@ impl Project {
         path: ProjectPath,
         language_name: LanguageName,
         cx: &App,
-    ) -> Task<Option<(ToolchainList, Arc<Path>)>> {
+    ) -> Task<Option<Toolchains>> {
         if let Some(toolchain_store) = self.toolchain_store.as_ref().map(Entity::downgrade) {
             cx.spawn(async move |cx| {
                 toolchain_store
@@ -3383,16 +3385,70 @@ impl Project {
         }
     }
 
-    pub async fn toolchain_term(
+    pub async fn toolchain_metadata(
         languages: Arc<LanguageRegistry>,
         language_name: LanguageName,
-    ) -> Option<SharedString> {
+    ) -> Option<ToolchainMetadata> {
         languages
             .language_for_name(language_name.as_ref())
             .await
             .ok()?
             .toolchain_lister()
-            .map(|lister| lister.term())
+            .map(|lister| lister.meta())
+    }
+
+    pub fn add_toolchain(
+        &self,
+        toolchain: Toolchain,
+        scope: ToolchainScope,
+        cx: &mut Context<Self>,
+    ) {
+        maybe!({
+            self.toolchain_store.as_ref()?.update(cx, |this, cx| {
+                this.add_toolchain(toolchain, scope, cx);
+            });
+            Some(())
+        });
+    }
+
+    pub fn remove_toolchain(
+        &self,
+        toolchain: Toolchain,
+        scope: ToolchainScope,
+        cx: &mut Context<Self>,
+    ) {
+        maybe!({
+            self.toolchain_store.as_ref()?.update(cx, |this, cx| {
+                this.remove_toolchain(toolchain, scope, cx);
+            });
+            Some(())
+        });
+    }
+
+    pub fn user_toolchains(
+        &self,
+        cx: &App,
+    ) -> Option<BTreeMap<ToolchainScope, IndexSet<Toolchain>>> {
+        Some(self.toolchain_store.as_ref()?.read(cx).user_toolchains())
+    }
+
+    pub fn resolve_toolchain(
+        &self,
+        path: PathBuf,
+        language_name: LanguageName,
+        cx: &App,
+    ) -> Task<Result<Toolchain>> {
+        if let Some(toolchain_store) = self.toolchain_store.as_ref().map(Entity::downgrade) {
+            cx.spawn(async move |cx| {
+                toolchain_store
+                    .update(cx, |this, cx| {
+                        this.resolve_toolchain(path, language_name, cx)
+                    })?
+                    .await
+            })
+        } else {
+            Task::ready(Err(anyhow!("This project does not support toolchains")))
+        }
     }
 
     pub fn toolchain_store(&self) -> Option<Entity<ToolchainStore>> {
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 969e18f6d4..e65da3acd4 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -22,7 +22,7 @@ use itertools::Itertools;
 use language::{
     Diagnostic, DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, DiskState, FakeLspAdapter,
     LanguageConfig, LanguageMatcher, LanguageName, LineEnding, ManifestName, ManifestProvider,
-    ManifestQuery, OffsetRangeExt, Point, ToPoint, ToolchainLister,
+    ManifestQuery, OffsetRangeExt, Point, ToPoint, ToolchainList, ToolchainLister,
     language_settings::{AllLanguageSettings, LanguageSettingsContent, language_settings},
     tree_sitter_rust, tree_sitter_typescript,
 };
@@ -727,7 +727,12 @@ async fn test_running_multiple_instances_of_a_single_server_in_one_worktree(
     // We're not using venvs at all here, so both folders should fall under the same root.
     assert_eq!(server.server_id(), LanguageServerId(0));
     // Now, let's select a different toolchain for one of subprojects.
-    let (available_toolchains_for_b, root_path) = project
+
+    let Toolchains {
+        toolchains: available_toolchains_for_b,
+        root_path,
+        ..
+    } = project
         .update(cx, |this, cx| {
             let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
             this.available_toolchains(
@@ -9213,13 +9218,21 @@ fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
                 ..Default::default()
             }
         }
-        // Returns a term which we should use in UI to refer to a toolchain.
-        fn term(&self) -> SharedString {
-            SharedString::new_static("virtual environment")
+        async fn resolve(
+            &self,
+            _: PathBuf,
+            _: Option<HashMap<String, String>>,
+        ) -> anyhow::Result<Toolchain> {
+            Err(anyhow::anyhow!("Not implemented"))
         }
-        /// Returns the name of the manifest file for this toolchain.
-        fn manifest_name(&self) -> ManifestName {
-            SharedString::new_static("pyproject.toml").into()
+        fn meta(&self) -> ToolchainMetadata {
+            ToolchainMetadata {
+                term: SharedString::new_static("Virtual Environment"),
+                new_toolchain_placeholder: SharedString::new_static(
+                    "A path to the python3 executable within a virtual environment, or path to virtual environment itself",
+                ),
+                manifest_name: ManifestName::from(SharedString::new_static("pyproject.toml")),
+            }
         }
         async fn activation_script(&self, _: &Toolchain, _: ShellKind, _: &dyn Fs) -> Vec<String> {
             vec![]
diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
index 57d492e26f..e76b98f697 100644
--- a/crates/project/src/toolchain_store.rs
+++ b/crates/project/src/toolchain_store.rs
@@ -4,20 +4,23 @@ use std::{
     sync::Arc,
 };
 
-use anyhow::{Result, bail};
+use anyhow::{Context as _, Result, bail};
 
 use async_trait::async_trait;
-use collections::BTreeMap;
+use collections::{BTreeMap, IndexSet};
 use gpui::{
     App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,
 };
 use language::{
     LanguageName, LanguageRegistry, LanguageToolchainStore, ManifestDelegate, Toolchain,
-    ToolchainList,
+    ToolchainList, ToolchainScope,
 };
 use rpc::{
     AnyProtoClient, TypedEnvelope,
-    proto::{self, FromProto, ToProto},
+    proto::{
+        self, FromProto, ResolveToolchainResponse, ToProto,
+        resolve_toolchain_response::Response as ResolveResponsePayload,
+    },
 };
 use settings::WorktreeId;
 use util::ResultExt as _;
@@ -28,24 +31,31 @@ use crate::{
     worktree_store::WorktreeStore,
 };
 
-pub struct ToolchainStore(ToolchainStoreInner);
-enum ToolchainStoreInner {
-    Local(
-        Entity<LocalToolchainStore>,
-        #[allow(dead_code)] Subscription,
-    ),
-    Remote(
-        Entity<RemoteToolchainStore>,
-        #[allow(dead_code)] Subscription,
-    ),
+pub struct ToolchainStore {
+    mode: ToolchainStoreInner,
+    user_toolchains: BTreeMap<ToolchainScope, IndexSet<Toolchain>>,
+    _sub: Subscription,
 }
 
+enum ToolchainStoreInner {
+    Local(Entity<LocalToolchainStore>),
+    Remote(Entity<RemoteToolchainStore>),
+}
+
+pub struct Toolchains {
+    /// Auto-detected toolchains.
+    pub toolchains: ToolchainList,
+    /// Path of the project root at which we ran the automatic toolchain detection.
+    pub root_path: Arc<Path>,
+    pub user_toolchains: BTreeMap<ToolchainScope, IndexSet<Toolchain>>,
+}
 impl EventEmitter<ToolchainStoreEvent> for ToolchainStore {}
 impl ToolchainStore {
     pub fn init(client: &AnyProtoClient) {
         client.add_entity_request_handler(Self::handle_activate_toolchain);
         client.add_entity_request_handler(Self::handle_list_toolchains);
         client.add_entity_request_handler(Self::handle_active_toolchain);
+        client.add_entity_request_handler(Self::handle_resolve_toolchain);
     }
 
     pub fn local(
@@ -62,18 +72,26 @@ impl ToolchainStore {
             active_toolchains: Default::default(),
             manifest_tree,
         });
-        let subscription = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
+        let _sub = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
             cx.emit(e.clone())
         });
-        Self(ToolchainStoreInner::Local(entity, subscription))
+        Self {
+            mode: ToolchainStoreInner::Local(entity),
+            user_toolchains: Default::default(),
+            _sub,
+        }
     }
 
     pub(super) fn remote(project_id: u64, client: AnyProtoClient, cx: &mut Context<Self>) -> Self {
         let entity = cx.new(|_| RemoteToolchainStore { client, project_id });
-        let _subscription = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
+        let _sub = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
             cx.emit(e.clone())
         });
-        Self(ToolchainStoreInner::Remote(entity, _subscription))
+        Self {
+            mode: ToolchainStoreInner::Remote(entity),
+            user_toolchains: Default::default(),
+            _sub,
+        }
     }
     pub(crate) fn activate_toolchain(
         &self,
@@ -81,43 +99,130 @@ impl ToolchainStore {
         toolchain: Toolchain,
         cx: &mut App,
     ) -> Task<Option<()>> {
-        match &self.0 {
-            ToolchainStoreInner::Local(local, _) => {
+        match &self.mode {
+            ToolchainStoreInner::Local(local) => {
                 local.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
             }
-            ToolchainStoreInner::Remote(remote, _) => {
+            ToolchainStoreInner::Remote(remote) => {
                 remote.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
             }
         }
     }
+
+    pub(crate) fn user_toolchains(&self) -> BTreeMap<ToolchainScope, IndexSet<Toolchain>> {
+        self.user_toolchains.clone()
+    }
+    pub(crate) fn add_toolchain(
+        &mut self,
+        toolchain: Toolchain,
+        scope: ToolchainScope,
+        cx: &mut Context<Self>,
+    ) {
+        let did_insert = self
+            .user_toolchains
+            .entry(scope)
+            .or_default()
+            .insert(toolchain);
+        if did_insert {
+            cx.emit(ToolchainStoreEvent::CustomToolchainsModified);
+        }
+    }
+
+    pub(crate) fn remove_toolchain(
+        &mut self,
+        toolchain: Toolchain,
+        scope: ToolchainScope,
+        cx: &mut Context<Self>,
+    ) {
+        let mut did_remove = false;
+        self.user_toolchains
+            .entry(scope)
+            .and_modify(|toolchains| did_remove = toolchains.shift_remove(&toolchain));
+        if did_remove {
+            cx.emit(ToolchainStoreEvent::CustomToolchainsModified);
+        }
+    }
+
+    pub(crate) fn resolve_toolchain(
+        &self,
+        abs_path: PathBuf,
+        language_name: LanguageName,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Toolchain>> {
+        debug_assert!(abs_path.is_absolute());
+        match &self.mode {
+            ToolchainStoreInner::Local(local) => local.update(cx, |this, cx| {
+                this.resolve_toolchain(abs_path, language_name, cx)
+            }),
+            ToolchainStoreInner::Remote(remote) => remote.update(cx, |this, cx| {
+                this.resolve_toolchain(abs_path, language_name, cx)
+            }),
+        }
+    }
     pub(crate) fn list_toolchains(
         &self,
         path: ProjectPath,
         language_name: LanguageName,
         cx: &mut Context<Self>,
-    ) -> Task<Option<(ToolchainList, Arc<Path>)>> {
-        match &self.0 {
-            ToolchainStoreInner::Local(local, _) => {
+    ) -> Task<Option<Toolchains>> {
+        let user_toolchains = self
+            .user_toolchains
+            .iter()
+            .filter(|(scope, _)| {
+                if let ToolchainScope::Subproject(worktree_id, relative_path) = scope {
+                    path.worktree_id == *worktree_id && relative_path.starts_with(&path.path)
+                } else {
+                    true
+                }
+            })
+            .map(|(scope, toolchains)| {
+                (
+                    scope.clone(),
+                    toolchains
+                        .iter()
+                        .filter(|toolchain| toolchain.language_name == language_name)
+                        .cloned()
+                        .collect::<IndexSet<_>>(),
+                )
+            })
+            .collect::<BTreeMap<_, _>>();
+        let task = match &self.mode {
+            ToolchainStoreInner::Local(local) => {
                 local.update(cx, |this, cx| this.list_toolchains(path, language_name, cx))
             }
-            ToolchainStoreInner::Remote(remote, _) => {
+            ToolchainStoreInner::Remote(remote) => {
                 remote.read(cx).list_toolchains(path, language_name, cx)
             }
-        }
+        };
+        cx.spawn(async move |_, _| {
+            let (mut toolchains, root_path) = task.await?;
+            toolchains.toolchains.retain(|toolchain| {
+                !user_toolchains
+                    .values()
+                    .any(|toolchains| toolchains.contains(toolchain))
+            });
+
+            Some(Toolchains {
+                toolchains,
+                root_path,
+                user_toolchains,
+            })
+        })
     }
+
     pub(crate) fn active_toolchain(
         &self,
         path: ProjectPath,
         language_name: LanguageName,
         cx: &App,
     ) -> Task<Option<Toolchain>> {
-        match &self.0 {
-            ToolchainStoreInner::Local(local, _) => Task::ready(local.read(cx).active_toolchain(
+        match &self.mode {
+            ToolchainStoreInner::Local(local) => Task::ready(local.read(cx).active_toolchain(
                 path.worktree_id,
                 &path.path,
                 language_name,
             )),
-            ToolchainStoreInner::Remote(remote, _) => {
+            ToolchainStoreInner::Remote(remote) => {
                 remote.read(cx).active_toolchain(path, language_name, cx)
             }
         }
@@ -197,7 +302,7 @@ impl ToolchainStore {
             })?
             .await;
         let has_values = toolchains.is_some();
-        let groups = if let Some((toolchains, _)) = &toolchains {
+        let groups = if let Some(Toolchains { toolchains, .. }) = &toolchains {
             toolchains
                 .groups
                 .iter()
@@ -211,7 +316,12 @@ impl ToolchainStore {
         } else {
             vec![]
         };
-        let (toolchains, relative_path) = if let Some((toolchains, relative_path)) = toolchains {
+        let (toolchains, relative_path) = if let Some(Toolchains {
+            toolchains,
+            root_path: relative_path,
+            ..
+        }) = toolchains
+        {
             let toolchains = toolchains
                 .toolchains
                 .into_iter()
@@ -236,16 +346,45 @@ impl ToolchainStore {
             relative_worktree_path: Some(relative_path.to_string_lossy().into_owned()),
         })
     }
+
+    async fn handle_resolve_toolchain(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::ResolveToolchain>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::ResolveToolchainResponse> {
+        let toolchain = this
+            .update(&mut cx, |this, cx| {
+                let language_name = LanguageName::from_proto(envelope.payload.language_name);
+                let path = PathBuf::from(envelope.payload.abs_path);
+                this.resolve_toolchain(path, language_name, cx)
+            })?
+            .await;
+        let response = match toolchain {
+            Ok(toolchain) => {
+                let toolchain = proto::Toolchain {
+                    name: toolchain.name.to_string(),
+                    path: toolchain.path.to_string(),
+                    raw_json: toolchain.as_json.to_string(),
+                };
+                ResolveResponsePayload::Toolchain(toolchain)
+            }
+            Err(e) => ResolveResponsePayload::Error(e.to_string()),
+        };
+        Ok(ResolveToolchainResponse {
+            response: Some(response),
+        })
+    }
+
     pub fn as_language_toolchain_store(&self) -> Arc<dyn LanguageToolchainStore> {
-        match &self.0 {
-            ToolchainStoreInner::Local(local, _) => Arc::new(LocalStore(local.downgrade())),
-            ToolchainStoreInner::Remote(remote, _) => Arc::new(RemoteStore(remote.downgrade())),
+        match &self.mode {
+            ToolchainStoreInner::Local(local) => Arc::new(LocalStore(local.downgrade())),
+            ToolchainStoreInner::Remote(remote) => Arc::new(RemoteStore(remote.downgrade())),
         }
     }
     pub fn as_local_store(&self) -> Option<&Entity<LocalToolchainStore>> {
-        match &self.0 {
-            ToolchainStoreInner::Local(local, _) => Some(local),
-            ToolchainStoreInner::Remote(_, _) => None,
+        match &self.mode {
+            ToolchainStoreInner::Local(local) => Some(local),
+            ToolchainStoreInner::Remote(_) => None,
         }
     }
 }
@@ -311,6 +450,7 @@ struct RemoteStore(WeakEntity<RemoteToolchainStore>);
 #[derive(Clone)]
 pub enum ToolchainStoreEvent {
     ToolchainActivated,
+    CustomToolchainsModified,
 }
 
 impl EventEmitter<ToolchainStoreEvent> for LocalToolchainStore {}
@@ -351,7 +491,7 @@ impl LocalToolchainStore {
                 .await
                 .ok()?;
             let toolchains = language.toolchain_lister()?;
-            let manifest_name = toolchains.manifest_name();
+            let manifest_name = toolchains.meta().manifest_name;
             let (snapshot, worktree) = this
                 .update(cx, |this, cx| {
                     this.worktree_store
@@ -414,6 +554,33 @@ impl LocalToolchainStore {
             })
             .cloned()
     }
+
+    fn resolve_toolchain(
+        &self,
+        path: PathBuf,
+        language_name: LanguageName,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Toolchain>> {
+        let registry = self.languages.clone();
+        let environment = self.project_environment.clone();
+        cx.spawn(async move |_, cx| {
+            let language = cx
+                .background_spawn(registry.language_for_name(&language_name.0))
+                .await
+                .with_context(|| format!("Language {} not found", language_name.0))?;
+            let toolchain_lister = language.toolchain_lister().with_context(|| {
+                format!("Language {} does not support toolchains", language_name.0)
+            })?;
+
+            let project_env = environment
+                .update(cx, |environment, cx| {
+                    environment.get_directory_environment(path.as_path().into(), cx)
+                })?
+                .await;
+            cx.background_spawn(async move { toolchain_lister.resolve(path, project_env).await })
+                .await
+        })
+    }
 }
 
 impl EventEmitter<ToolchainStoreEvent> for RemoteToolchainStore {}
@@ -556,4 +723,47 @@ impl RemoteToolchainStore {
             })
         })
     }
+
+    fn resolve_toolchain(
+        &self,
+        abs_path: PathBuf,
+        language_name: LanguageName,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Toolchain>> {
+        let project_id = self.project_id;
+        let client = self.client.clone();
+        cx.background_spawn(async move {
+            let response: proto::ResolveToolchainResponse = client
+                .request(proto::ResolveToolchain {
+                    project_id,
+                    language_name: language_name.clone().into(),
+                    abs_path: abs_path.to_string_lossy().into_owned(),
+                })
+                .await?;
+
+            let response = response
+                .response
+                .context("Failed to resolve toolchain via RPC")?;
+            use proto::resolve_toolchain_response::Response;
+            match response {
+                Response::Toolchain(toolchain) => {
+                    Ok(Toolchain {
+                        language_name: language_name.clone(),
+                        name: toolchain.name.into(),
+                        // todo(windows)
+                        // Do we need to convert path to native string?
+                        path: PathBuf::from_proto(toolchain.path)
+                            .to_string_lossy()
+                            .to_string()
+                            .into(),
+                        as_json: serde_json::Value::from_str(&toolchain.raw_json)
+                            .context("Deserializing ResolveToolchain LSP response")?,
+                    })
+                }
+                Response::Error(error) => {
+                    anyhow::bail!("{error}");
+                }
+            }
+        })
+    }
 }
diff --git a/crates/proto/proto/toolchain.proto b/crates/proto/proto/toolchain.proto
index 08844a307a..b190322ca0 100644
--- a/crates/proto/proto/toolchain.proto
+++ b/crates/proto/proto/toolchain.proto
@@ -44,3 +44,16 @@ message ActiveToolchain {
 message ActiveToolchainResponse {
     optional Toolchain toolchain = 1;
 }
+
+message ResolveToolchain {
+    uint64 project_id = 1;
+    string abs_path = 2;
+    string language_name = 3;
+}
+
+message ResolveToolchainResponse {
+    oneof response {
+        Toolchain toolchain = 1;
+        string error = 2;
+    }
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 3763671a7a..39fa1fdd53 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -402,7 +402,10 @@ message Envelope {
         UpdateUserSettings update_user_settings = 368;
 
         GetProcesses get_processes = 369;
-        GetProcessesResponse get_processes_response = 370; // current max
+        GetProcessesResponse get_processes_response = 370;
+
+        ResolveToolchain resolve_toolchain = 371;
+        ResolveToolchainResponse resolve_toolchain_response = 372; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 3c98ae62e7..4c0fc3dc98 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -26,6 +26,8 @@ messages!(
     (ActivateToolchain, Foreground),
     (ActiveToolchain, Foreground),
     (ActiveToolchainResponse, Foreground),
+    (ResolveToolchain, Background),
+    (ResolveToolchainResponse, Background),
     (AddNotification, Foreground),
     (AddProjectCollaborator, Foreground),
     (AddWorktree, Foreground),
@@ -459,6 +461,7 @@ request_messages!(
     (ListToolchains, ListToolchainsResponse),
     (ActivateToolchain, Ack),
     (ActiveToolchain, ActiveToolchainResponse),
+    (ResolveToolchain, ResolveToolchainResponse),
     (GetPathMetadata, GetPathMetadataResponse),
     (GetCrashFiles, GetCrashFilesResponse),
     (CancelLanguageServerWork, Ack),
@@ -612,6 +615,7 @@ entity_messages!(
     ListToolchains,
     ActivateToolchain,
     ActiveToolchain,
+    ResolveToolchain,
     GetPathMetadata,
     GetProcesses,
     CancelLanguageServerWork,
diff --git a/crates/repl/src/kernels/mod.rs b/crates/repl/src/kernels/mod.rs
index 52188a39c4..fb16cb1ea3 100644
--- a/crates/repl/src/kernels/mod.rs
+++ b/crates/repl/src/kernels/mod.rs
@@ -11,7 +11,7 @@ use language::LanguageName;
 pub use native_kernel::*;
 
 mod remote_kernels;
-use project::{Project, ProjectPath, WorktreeId};
+use project::{Project, ProjectPath, Toolchains, WorktreeId};
 pub use remote_kernels::*;
 
 use anyhow::Result;
@@ -92,49 +92,58 @@ pub fn python_env_kernel_specifications(
     let background_executor = cx.background_executor().clone();
 
     async move {
-        let toolchains = if let Some((toolchains, _)) = toolchains.await {
-            toolchains
+        let (toolchains, user_toolchains) = if let Some(Toolchains {
+            toolchains,
+            root_path: _,
+            user_toolchains,
+        }) = toolchains.await
+        {
+            (toolchains, user_toolchains)
         } else {
             return Ok(Vec::new());
         };
 
-        let kernelspecs = toolchains.toolchains.into_iter().map(|toolchain| {
-            background_executor.spawn(async move {
-                let python_path = toolchain.path.to_string();
+        let kernelspecs = user_toolchains
+            .into_values()
+            .flatten()
+            .chain(toolchains.toolchains)
+            .map(|toolchain| {
+                background_executor.spawn(async move {
+                    let python_path = toolchain.path.to_string();
 
-                // Check if ipykernel is installed
-                let ipykernel_check = util::command::new_smol_command(&python_path)
-                    .args(&["-c", "import ipykernel"])
-                    .output()
-                    .await;
+                    // Check if ipykernel is installed
+                    let ipykernel_check = util::command::new_smol_command(&python_path)
+                        .args(&["-c", "import ipykernel"])
+                        .output()
+                        .await;
 
-                if ipykernel_check.is_ok() && ipykernel_check.unwrap().status.success() {
-                    // Create a default kernelspec for this environment
-                    let default_kernelspec = JupyterKernelspec {
-                        argv: vec![
-                            python_path.clone(),
-                            "-m".to_string(),
-                            "ipykernel_launcher".to_string(),
-                            "-f".to_string(),
-                            "{connection_file}".to_string(),
-                        ],
-                        display_name: toolchain.name.to_string(),
-                        language: "python".to_string(),
-                        interrupt_mode: None,
-                        metadata: None,
-                        env: None,
-                    };
+                    if ipykernel_check.is_ok() && ipykernel_check.unwrap().status.success() {
+                        // Create a default kernelspec for this environment
+                        let default_kernelspec = JupyterKernelspec {
+                            argv: vec![
+                                python_path.clone(),
+                                "-m".to_string(),
+                                "ipykernel_launcher".to_string(),
+                                "-f".to_string(),
+                                "{connection_file}".to_string(),
+                            ],
+                            display_name: toolchain.name.to_string(),
+                            language: "python".to_string(),
+                            interrupt_mode: None,
+                            metadata: None,
+                            env: None,
+                        };
 
-                    Some(KernelSpecification::PythonEnv(LocalKernelSpecification {
-                        name: toolchain.name.to_string(),
-                        path: PathBuf::from(&python_path),
-                        kernelspec: default_kernelspec,
-                    }))
-                } else {
-                    None
-                }
-            })
-        });
+                        Some(KernelSpecification::PythonEnv(LocalKernelSpecification {
+                            name: toolchain.name.to_string(),
+                            path: PathBuf::from(&python_path),
+                            kernelspec: default_kernelspec,
+                        }))
+                    } else {
+                        None
+                    }
+                })
+            });
 
         let kernel_specs = futures::future::join_all(kernelspecs)
             .await
diff --git a/crates/toolchain_selector/Cargo.toml b/crates/toolchain_selector/Cargo.toml
index 46b88594fd..a17f825640 100644
--- a/crates/toolchain_selector/Cargo.toml
+++ b/crates/toolchain_selector/Cargo.toml
@@ -6,10 +6,15 @@ publish.workspace = true
 license = "GPL-3.0-or-later"
 
 [dependencies]
+anyhow.workspace = true
+convert_case.workspace = true
 editor.workspace = true
+file_finder.workspace = true
+futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
 language.workspace = true
+menu.workspace = true
 picker.workspace = true
 project.workspace = true
 ui.workspace = true
diff --git a/crates/toolchain_selector/src/active_toolchain.rs b/crates/toolchain_selector/src/active_toolchain.rs
index bf45bffea3..3e26f3ad6c 100644
--- a/crates/toolchain_selector/src/active_toolchain.rs
+++ b/crates/toolchain_selector/src/active_toolchain.rs
@@ -5,8 +5,8 @@ use gpui::{
     AsyncWindowContext, Context, Entity, IntoElement, ParentElement, Render, Subscription, Task,
     WeakEntity, Window, div,
 };
-use language::{Buffer, BufferEvent, LanguageName, Toolchain};
-use project::{Project, ProjectPath, WorktreeId, toolchain_store::ToolchainStoreEvent};
+use language::{Buffer, BufferEvent, LanguageName, Toolchain, ToolchainScope};
+use project::{Project, ProjectPath, Toolchains, WorktreeId, toolchain_store::ToolchainStoreEvent};
 use ui::{Button, ButtonCommon, Clickable, FluentBuilder, LabelSize, SharedString, Tooltip};
 use util::maybe;
 use workspace::{StatusItemView, Workspace, item::ItemHandle};
@@ -69,15 +69,15 @@ impl ActiveToolchain {
                     .read_with(cx, |this, _| Some(this.language()?.name()))
                     .ok()
                     .flatten()?;
-                let term = workspace
+                let meta = workspace
                     .update(cx, |workspace, cx| {
                         let languages = workspace.project().read(cx).languages();
-                        Project::toolchain_term(languages.clone(), language_name.clone())
+                        Project::toolchain_metadata(languages.clone(), language_name.clone())
                     })
                     .ok()?
                     .await?;
                 let _ = this.update(cx, |this, cx| {
-                    this.term = term;
+                    this.term = meta.term;
                     cx.notify();
                 });
                 let (worktree_id, path) = active_file
@@ -170,7 +170,11 @@ impl ActiveToolchain {
                 let project = workspace
                     .read_with(cx, |this, _| this.project().clone())
                     .ok()?;
-                let (toolchains, relative_path) = cx
+                let Toolchains {
+                    toolchains,
+                    root_path: relative_path,
+                    user_toolchains,
+                } = cx
                     .update(|_, cx| {
                         project.read(cx).available_toolchains(
                             ProjectPath {
@@ -183,8 +187,20 @@ impl ActiveToolchain {
                     })
                     .ok()?
                     .await?;
-                if let Some(toolchain) = toolchains.toolchains.first() {
-                    // Since we don't have a selected toolchain, pick one for user here.
+                // Since we don't have a selected toolchain, pick one for user here.
+                let default_choice = user_toolchains
+                    .iter()
+                    .find_map(|(scope, toolchains)| {
+                        if scope == &ToolchainScope::Global {
+                            // Ignore global toolchains when making a default choice. They're unlikely to be the right choice.
+                            None
+                        } else {
+                            toolchains.first()
+                        }
+                    })
+                    .or_else(|| toolchains.toolchains.first())
+                    .cloned();
+                if let Some(toolchain) = &default_choice {
                     workspace::WORKSPACE_DB
                         .set_toolchain(
                             workspace_id,
@@ -209,7 +225,7 @@ impl ActiveToolchain {
                         .await;
                 }
 
-                toolchains.toolchains.first().cloned()
+                default_choice
             }
         })
     }
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index feeca8cf52..2f946a6915 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -1,25 +1,39 @@
 mod active_toolchain;
 
 pub use active_toolchain::ActiveToolchain;
+use convert_case::Casing as _;
 use editor::Editor;
+use file_finder::OpenPathDelegate;
+use futures::channel::oneshot;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ParentElement,
-    Render, Styled, Task, WeakEntity, Window, actions,
+    Action, Animation, AnimationExt, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle,
+    Focusable, KeyContext, ParentElement, Render, Styled, Subscription, Task, WeakEntity, Window,
+    actions, pulsating_between,
 };
-use language::{LanguageName, Toolchain, ToolchainList};
+use language::{Language, LanguageName, Toolchain, ToolchainScope};
 use picker::{Picker, PickerDelegate};
-use project::{Project, ProjectPath, WorktreeId};
-use std::{borrow::Cow, path::Path, sync::Arc};
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
+use project::{DirectoryLister, Project, ProjectPath, Toolchains, WorktreeId};
+use std::{
+    borrow::Cow,
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::Duration,
+};
+use ui::{
+    Divider, HighlightedLabel, KeyBinding, List, ListItem, ListItemSpacing, Navigable,
+    NavigableEntry, prelude::*,
+};
+use util::{ResultExt, maybe, paths::PathStyle};
 use workspace::{ModalView, Workspace};
 
 actions!(
     toolchain,
     [
         /// Selects a toolchain for the current project.
-        Select
+        Select,
+        /// Adds a new toolchain for the current project.
+        AddToolchain
     ]
 );
 
@@ -28,9 +42,513 @@ pub fn init(cx: &mut App) {
 }
 
 pub struct ToolchainSelector {
+    state: State,
+    create_search_state: Arc<dyn Fn(&mut Window, &mut Context<Self>) -> SearchState + 'static>,
+    language: Option<Arc<Language>>,
+    project: Entity<Project>,
+    language_name: LanguageName,
+    worktree_id: WorktreeId,
+    relative_path: Arc<Path>,
+}
+
+#[derive(Clone)]
+struct SearchState {
     picker: Entity<Picker<ToolchainSelectorDelegate>>,
 }
 
+struct AddToolchainState {
+    state: AddState,
+    project: Entity<Project>,
+    language_name: LanguageName,
+    root_path: ProjectPath,
+    weak: WeakEntity<ToolchainSelector>,
+}
+
+struct ScopePickerState {
+    entries: [NavigableEntry; 3],
+    selected_scope: ToolchainScope,
+}
+
+#[expect(
+    dead_code,
+    reason = "These tasks have to be kept alive to run to completion"
+)]
+enum PathInputState {
+    WaitingForPath(Task<()>),
+    Resolving(Task<()>),
+}
+
+enum AddState {
+    Path {
+        picker: Entity<Picker<file_finder::OpenPathDelegate>>,
+        error: Option<Arc<str>>,
+        input_state: PathInputState,
+        _subscription: Subscription,
+    },
+    Name {
+        toolchain: Toolchain,
+        editor: Entity<Editor>,
+        scope_picker: ScopePickerState,
+    },
+}
+
+impl AddToolchainState {
+    fn new(
+        project: Entity<Project>,
+        language_name: LanguageName,
+        root_path: ProjectPath,
+        window: &mut Window,
+        cx: &mut Context<ToolchainSelector>,
+    ) -> Entity<Self> {
+        let weak = cx.weak_entity();
+
+        cx.new(|cx| {
+            let (lister, rx) = Self::create_path_browser_delegate(project.clone(), cx);
+            let picker = cx.new(|cx| Picker::uniform_list(lister, window, cx));
+            Self {
+                state: AddState::Path {
+                    _subscription: cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
+                        cx.stop_propagation();
+                    }),
+                    picker,
+                    error: None,
+                    input_state: Self::wait_for_path(rx, window, cx),
+                },
+                project,
+                language_name,
+                root_path,
+                weak,
+            }
+        })
+    }
+
+    fn create_path_browser_delegate(
+        project: Entity<Project>,
+        cx: &mut Context<Self>,
+    ) -> (OpenPathDelegate, oneshot::Receiver<Option<Vec<PathBuf>>>) {
+        let (tx, rx) = oneshot::channel();
+        let weak = cx.weak_entity();
+        let lister = OpenPathDelegate::new(
+            tx,
+            DirectoryLister::Project(project),
+            false,
+            PathStyle::current(),
+        )
+        .show_hidden()
+        .with_footer(Arc::new(move |_, cx| {
+            let error = weak
+                .read_with(cx, |this, _| {
+                    if let AddState::Path { error, .. } = &this.state {
+                        error.clone()
+                    } else {
+                        None
+                    }
+                })
+                .ok()
+                .flatten();
+            let is_loading = weak
+                .read_with(cx, |this, _| {
+                    matches!(
+                        this.state,
+                        AddState::Path {
+                            input_state: PathInputState::Resolving(_),
+                            ..
+                        }
+                    )
+                })
+                .unwrap_or_default();
+            Some(
+                v_flex()
+                    .child(Divider::horizontal())
+                    .child(
+                        h_flex()
+                            .p_1()
+                            .justify_between()
+                            .gap_2()
+                            .child(Label::new("Select Toolchain Path").color(Color::Muted).map(
+                                |this| {
+                                    if is_loading {
+                                        this.with_animation(
+                                            "select-toolchain-label",
+                                            Animation::new(Duration::from_secs(2))
+                                                .repeat()
+                                                .with_easing(pulsating_between(0.4, 0.8)),
+                                            |label, delta| label.alpha(delta),
+                                        )
+                                        .into_any()
+                                    } else {
+                                        this.into_any_element()
+                                    }
+                                },
+                            ))
+                            .when_some(error, |this, error| {
+                                this.child(Label::new(error).color(Color::Error))
+                            }),
+                    )
+                    .into_any(),
+            )
+        }));
+
+        (lister, rx)
+    }
+    fn resolve_path(
+        path: PathBuf,
+        root_path: ProjectPath,
+        language_name: LanguageName,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> PathInputState {
+        PathInputState::Resolving(cx.spawn_in(window, async move |this, cx| {
+            _ = maybe!(async move {
+                let toolchain = project
+                    .update(cx, |this, cx| {
+                        this.resolve_toolchain(path.clone(), language_name, cx)
+                    })?
+                    .await;
+                let Ok(toolchain) = toolchain else {
+                    // Go back to the path input state
+                    _ = this.update_in(cx, |this, window, cx| {
+                        if let AddState::Path {
+                            input_state,
+                            picker,
+                            error,
+                            ..
+                        } = &mut this.state
+                            && matches!(input_state, PathInputState::Resolving(_))
+                        {
+                            let Err(e) = toolchain else { unreachable!() };
+                            *error = Some(Arc::from(e.to_string()));
+                            let (delegate, rx) =
+                                Self::create_path_browser_delegate(this.project.clone(), cx);
+                            picker.update(cx, |picker, cx| {
+                                *picker = Picker::uniform_list(delegate, window, cx);
+                                picker.set_query(
+                                    Arc::from(path.to_string_lossy().as_ref()),
+                                    window,
+                                    cx,
+                                );
+                            });
+                            *input_state = Self::wait_for_path(rx, window, cx);
+                            this.focus_handle(cx).focus(window);
+                        }
+                    });
+                    return Err(anyhow::anyhow!("Failed to resolve toolchain"));
+                };
+                let resolved_toolchain_path = project.read_with(cx, |this, cx| {
+                    this.find_project_path(&toolchain.path.as_ref(), cx)
+                })?;
+
+                // Suggest a default scope based on the applicability.
+                let scope = if let Some(project_path) = resolved_toolchain_path {
+                    if root_path.path.as_ref() != Path::new("")
+                        && project_path.starts_with(&root_path)
+                    {
+                        ToolchainScope::Subproject(root_path.worktree_id, root_path.path)
+                    } else {
+                        ToolchainScope::Project
+                    }
+                } else {
+                    // This path lies outside of the project.
+                    ToolchainScope::Global
+                };
+
+                _ = this.update_in(cx, |this, window, cx| {
+                    let scope_picker = ScopePickerState {
+                        entries: std::array::from_fn(|_| NavigableEntry::focusable(cx)),
+                        selected_scope: scope,
+                    };
+                    this.state = AddState::Name {
+                        editor: cx.new(|cx| {
+                            let mut editor = Editor::single_line(window, cx);
+                            editor.set_text(toolchain.name.as_ref(), window, cx);
+                            editor
+                        }),
+                        toolchain,
+                        scope_picker,
+                    };
+                    this.focus_handle(cx).focus(window);
+                });
+
+                Result::<_, anyhow::Error>::Ok(())
+            })
+            .await;
+        }))
+    }
+
+    fn wait_for_path(
+        rx: oneshot::Receiver<Option<Vec<PathBuf>>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> PathInputState {
+        let task = cx.spawn_in(window, async move |this, cx| {
+            maybe!(async move {
+                let result = rx.await.log_err()?;
+
+                let path = result
+                    .into_iter()
+                    .flat_map(|paths| paths.into_iter())
+                    .next()?;
+                this.update_in(cx, |this, window, cx| {
+                    if let AddState::Path {
+                        input_state, error, ..
+                    } = &mut this.state
+                        && matches!(input_state, PathInputState::WaitingForPath(_))
+                    {
+                        error.take();
+                        *input_state = Self::resolve_path(
+                            path,
+                            this.root_path.clone(),
+                            this.language_name.clone(),
+                            this.project.clone(),
+                            window,
+                            cx,
+                        );
+                    }
+                })
+                .ok()?;
+                Some(())
+            })
+            .await;
+        });
+        PathInputState::WaitingForPath(task)
+    }
+
+    fn confirm_toolchain(
+        &mut self,
+        _: &menu::Confirm,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let AddState::Name {
+            toolchain,
+            editor,
+            scope_picker,
+        } = &mut self.state
+        else {
+            return;
+        };
+
+        let text = editor.read(cx).text(cx);
+        if text.is_empty() {
+            return;
+        }
+
+        toolchain.name = SharedString::from(text);
+        self.project.update(cx, |this, cx| {
+            this.add_toolchain(toolchain.clone(), scope_picker.selected_scope.clone(), cx);
+        });
+        _ = self.weak.update(cx, |this, cx| {
+            this.state = State::Search((this.create_search_state)(window, cx));
+            this.focus_handle(cx).focus(window);
+            cx.notify();
+        });
+    }
+}
+impl Focusable for AddToolchainState {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        match &self.state {
+            AddState::Path { picker, .. } => picker.focus_handle(cx),
+            AddState::Name { editor, .. } => editor.focus_handle(cx),
+        }
+    }
+}
+
+impl AddToolchainState {
+    fn select_scope(&mut self, scope: ToolchainScope, cx: &mut Context<Self>) {
+        if let AddState::Name { scope_picker, .. } = &mut self.state {
+            scope_picker.selected_scope = scope;
+            cx.notify();
+        }
+    }
+}
+
+impl Focusable for State {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        match self {
+            State::Search(state) => state.picker.focus_handle(cx),
+            State::AddToolchain(state) => state.focus_handle(cx),
+        }
+    }
+}
+impl Render for AddToolchainState {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let theme = cx.theme().clone();
+        let weak = self.weak.upgrade();
+        let label = SharedString::new_static("Add");
+
+        v_flex()
+            .size_full()
+            // todo: These modal styles shouldn't be needed as the modal picker already has `elevation_3`
+            // They get duplicated in the middle state of adding a virtual env, but then are needed for this last state
+            .bg(cx.theme().colors().elevated_surface_background)
+            .border_1()
+            .border_color(cx.theme().colors().border_variant)
+            .rounded_lg()
+            .when_some(weak, |this, weak| {
+                this.on_action(window.listener_for(
+                    &weak,
+                    |this: &mut ToolchainSelector, _: &menu::Cancel, window, cx| {
+                        this.state = State::Search((this.create_search_state)(window, cx));
+                        this.state.focus_handle(cx).focus(window);
+                        cx.notify();
+                    },
+                ))
+            })
+            .on_action(cx.listener(Self::confirm_toolchain))
+            .map(|this| match &self.state {
+                AddState::Path { picker, .. } => this.child(picker.clone()),
+                AddState::Name {
+                    editor,
+                    scope_picker,
+                    ..
+                } => {
+                    let scope_options = [
+                        ToolchainScope::Global,
+                        ToolchainScope::Project,
+                        ToolchainScope::Subproject(
+                            self.root_path.worktree_id,
+                            self.root_path.path.clone(),
+                        ),
+                    ];
+
+                    let mut navigable_scope_picker = Navigable::new(
+                        v_flex()
+                            .child(
+                                h_flex()
+                                    .w_full()
+                                    .p_2()
+                                    .border_b_1()
+                                    .border_color(theme.colors().border)
+                                    .child(editor.clone()),
+                            )
+                            .child(
+                                v_flex()
+                                    .child(
+                                        Label::new("Scope")
+                                            .size(LabelSize::Small)
+                                            .color(Color::Muted)
+                                            .mt_1()
+                                            .ml_2(),
+                                    )
+                                    .child(List::new().children(
+                                        scope_options.iter().enumerate().map(|(i, scope)| {
+                                            let is_selected = *scope == scope_picker.selected_scope;
+                                            let label = scope.label();
+                                            let description = scope.description();
+                                            let scope_clone_for_action = scope.clone();
+                                            let scope_clone_for_click = scope.clone();
+
+                                            div()
+                                                .id(SharedString::from(format!("scope-option-{i}")))
+                                                .track_focus(&scope_picker.entries[i].focus_handle)
+                                                .on_action(cx.listener(
+                                                    move |this, _: &menu::Confirm, _, cx| {
+                                                        this.select_scope(
+                                                            scope_clone_for_action.clone(),
+                                                            cx,
+                                                        );
+                                                    },
+                                                ))
+                                                .child(
+                                                    ListItem::new(SharedString::from(format!(
+                                                        "scope-{i}"
+                                                    )))
+                                                    .toggle_state(
+                                                        is_selected
+                                                            || scope_picker.entries[i]
+                                                                .focus_handle
+                                                                .contains_focused(window, cx),
+                                                    )
+                                                    .inset(true)
+                                                    .spacing(ListItemSpacing::Sparse)
+                                                    .child(
+                                                        h_flex()
+                                                            .gap_2()
+                                                            .child(Label::new(label))
+                                                            .child(
+                                                                Label::new(description)
+                                                                    .size(LabelSize::Small)
+                                                                    .color(Color::Muted),
+                                                            ),
+                                                    )
+                                                    .on_click(cx.listener(move |this, _, _, cx| {
+                                                        this.select_scope(
+                                                            scope_clone_for_click.clone(),
+                                                            cx,
+                                                        );
+                                                    })),
+                                                )
+                                        }),
+                                    ))
+                                    .child(Divider::horizontal())
+                                    .child(h_flex().p_1p5().justify_end().map(|this| {
+                                        let is_disabled = editor.read(cx).is_empty(cx);
+                                        let handle = self.focus_handle(cx);
+                                        this.child(
+                                            Button::new("add-toolchain", label)
+                                                .disabled(is_disabled)
+                                                .key_binding(KeyBinding::for_action_in(
+                                                    &menu::Confirm,
+                                                    &handle,
+                                                    window,
+                                                    cx,
+                                                ))
+                                                .on_click(cx.listener(|this, _, window, cx| {
+                                                    this.confirm_toolchain(
+                                                        &menu::Confirm,
+                                                        window,
+                                                        cx,
+                                                    );
+                                                }))
+                                                .map(|this| {
+                                                    if false {
+                                                        this.with_animation(
+                                                            "inspecting-user-toolchain",
+                                                            Animation::new(Duration::from_millis(
+                                                                500,
+                                                            ))
+                                                            .repeat()
+                                                            .with_easing(pulsating_between(
+                                                                0.4, 0.8,
+                                                            )),
+                                                            |label, delta| label.alpha(delta),
+                                                        )
+                                                        .into_any()
+                                                    } else {
+                                                        this.into_any_element()
+                                                    }
+                                                }),
+                                        )
+                                    })),
+                            )
+                            .into_any_element(),
+                    );
+
+                    for entry in &scope_picker.entries {
+                        navigable_scope_picker = navigable_scope_picker.entry(entry.clone());
+                    }
+
+                    this.child(navigable_scope_picker.render(window, cx))
+                }
+            })
+    }
+}
+
+#[derive(Clone)]
+enum State {
+    Search(SearchState),
+    AddToolchain(Entity<AddToolchainState>),
+}
+
+impl RenderOnce for State {
+    fn render(self, _: &mut Window, _: &mut App) -> impl IntoElement {
+        match self {
+            State::Search(state) => state.picker.into_any_element(),
+            State::AddToolchain(state) => state.into_any_element(),
+        }
+    }
+}
 impl ToolchainSelector {
     fn register(
         workspace: &mut Workspace,
@@ -40,6 +558,16 @@ impl ToolchainSelector {
         workspace.register_action(move |workspace, _: &Select, window, cx| {
             Self::toggle(workspace, window, cx);
         });
+        workspace.register_action(move |workspace, _: &AddToolchain, window, cx| {
+            let Some(toolchain_selector) = workspace.active_modal::<Self>(cx) else {
+                Self::toggle(workspace, window, cx);
+                return;
+            };
+
+            toolchain_selector.update(cx, |toolchain_selector, cx| {
+                toolchain_selector.handle_add_toolchain(&AddToolchain, window, cx);
+            });
+        });
     }
 
     fn toggle(
@@ -105,35 +633,100 @@ impl ToolchainSelector {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let toolchain_selector = cx.entity().downgrade();
-        let picker = cx.new(|cx| {
-            let delegate = ToolchainSelectorDelegate::new(
-                active_toolchain,
-                toolchain_selector,
-                workspace,
-                worktree_id,
-                worktree_root,
-                project,
-                relative_path,
-                language_name,
+        let language_registry = project.read(cx).languages().clone();
+        cx.spawn({
+            let language_name = language_name.clone();
+            async move |this, cx| {
+                let language = language_registry
+                    .language_for_name(&language_name.0)
+                    .await
+                    .ok();
+                this.update(cx, |this, cx| {
+                    this.language = language;
+                    cx.notify();
+                })
+                .ok();
+            }
+        })
+        .detach();
+        let project_clone = project.clone();
+        let language_name_clone = language_name.clone();
+        let relative_path_clone = relative_path.clone();
+
+        let create_search_state = Arc::new(move |window: &mut Window, cx: &mut Context<Self>| {
+            let toolchain_selector = cx.entity().downgrade();
+            let picker = cx.new(|cx| {
+                let delegate = ToolchainSelectorDelegate::new(
+                    active_toolchain.clone(),
+                    toolchain_selector,
+                    workspace.clone(),
+                    worktree_id,
+                    worktree_root.clone(),
+                    project_clone.clone(),
+                    relative_path_clone.clone(),
+                    language_name_clone.clone(),
+                    window,
+                    cx,
+                );
+                Picker::uniform_list(delegate, window, cx)
+            });
+            let picker_focus_handle = picker.focus_handle(cx);
+            picker.update(cx, |picker, _| {
+                picker.delegate.focus_handle = picker_focus_handle.clone();
+            });
+            SearchState { picker }
+        });
+
+        Self {
+            state: State::Search(create_search_state(window, cx)),
+            create_search_state,
+            language: None,
+            project,
+            language_name,
+            worktree_id,
+            relative_path,
+        }
+    }
+
+    fn handle_add_toolchain(
+        &mut self,
+        _: &AddToolchain,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if matches!(self.state, State::Search(_)) {
+            self.state = State::AddToolchain(AddToolchainState::new(
+                self.project.clone(),
+                self.language_name.clone(),
+                ProjectPath {
+                    worktree_id: self.worktree_id,
+                    path: self.relative_path.clone(),
+                },
                 window,
                 cx,
-            );
-            Picker::uniform_list(delegate, window, cx)
-        });
-        Self { picker }
+            ));
+            self.state.focus_handle(cx).focus(window);
+            cx.notify();
+        }
     }
 }
 
 impl Render for ToolchainSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let mut key_context = KeyContext::new_with_defaults();
+        key_context.add("ToolchainSelector");
+
+        v_flex()
+            .key_context(key_context)
+            .w(rems(34.))
+            .on_action(cx.listener(Self::handle_add_toolchain))
+            .child(self.state.clone().render(window, cx))
     }
 }
 
 impl Focusable for ToolchainSelector {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
+        self.state.focus_handle(cx)
     }
 }
 
@@ -142,7 +735,7 @@ impl ModalView for ToolchainSelector {}
 
 pub struct ToolchainSelectorDelegate {
     toolchain_selector: WeakEntity<ToolchainSelector>,
-    candidates: ToolchainList,
+    candidates: Arc<[(Toolchain, Option<ToolchainScope>)]>,
     matches: Vec<StringMatch>,
     selected_index: usize,
     workspace: WeakEntity<Workspace>,
@@ -150,6 +743,9 @@ pub struct ToolchainSelectorDelegate {
     worktree_abs_path_root: Arc<Path>,
     relative_path: Arc<Path>,
     placeholder_text: Arc<str>,
+    add_toolchain_text: Arc<str>,
+    project: Entity<Project>,
+    focus_handle: FocusHandle,
     _fetch_candidates_task: Task<Option<()>>,
 }
 
@@ -166,19 +762,33 @@ impl ToolchainSelectorDelegate {
         window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Self {
+        let _project = project.clone();
+
         let _fetch_candidates_task = cx.spawn_in(window, {
             async move |this, cx| {
-                let term = project
+                let meta = _project
                     .read_with(cx, |this, _| {
-                        Project::toolchain_term(this.languages().clone(), language_name.clone())
+                        Project::toolchain_metadata(this.languages().clone(), language_name.clone())
                     })
                     .ok()?
                     .await?;
                 let relative_path = this
-                    .read_with(cx, |this, _| this.delegate.relative_path.clone())
+                    .update(cx, |this, cx| {
+                        this.delegate.add_toolchain_text = format!(
+                            "Add {}",
+                            meta.term.as_ref().to_case(convert_case::Case::Title)
+                        )
+                        .into();
+                        cx.notify();
+                        this.delegate.relative_path.clone()
+                    })
                     .ok()?;
 
-                let (available_toolchains, relative_path) = project
+                let Toolchains {
+                    toolchains: available_toolchains,
+                    root_path: relative_path,
+                    user_toolchains,
+                } = _project
                     .update(cx, |this, cx| {
                         this.available_toolchains(
                             ProjectPath {
@@ -200,7 +810,7 @@ impl ToolchainSelectorDelegate {
                     }
                 };
                 let placeholder_text =
-                    format!("Select a {} for {pretty_path}…", term.to_lowercase(),).into();
+                    format!("Select a {} for {pretty_path}…", meta.term.to_lowercase(),).into();
                 let _ = this.update_in(cx, move |this, window, cx| {
                     this.delegate.relative_path = relative_path;
                     this.delegate.placeholder_text = placeholder_text;
@@ -208,15 +818,27 @@ impl ToolchainSelectorDelegate {
                 });
 
                 let _ = this.update_in(cx, move |this, window, cx| {
-                    this.delegate.candidates = available_toolchains;
+                    this.delegate.candidates = user_toolchains
+                        .into_iter()
+                        .flat_map(|(scope, toolchains)| {
+                            toolchains
+                                .into_iter()
+                                .map(move |toolchain| (toolchain, Some(scope.clone())))
+                        })
+                        .chain(
+                            available_toolchains
+                                .toolchains
+                                .into_iter()
+                                .map(|toolchain| (toolchain, None)),
+                        )
+                        .collect();
 
                     if let Some(active_toolchain) = active_toolchain
                         && let Some(position) = this
                             .delegate
                             .candidates
-                            .toolchains
                             .iter()
-                            .position(|toolchain| *toolchain == active_toolchain)
+                            .position(|(toolchain, _)| *toolchain == active_toolchain)
                     {
                         this.delegate.set_selected_index(position, window, cx);
                     }
@@ -238,6 +860,9 @@ impl ToolchainSelectorDelegate {
             placeholder_text,
             relative_path,
             _fetch_candidates_task,
+            project,
+            focus_handle: cx.focus_handle(),
+            add_toolchain_text: Arc::from("Add Toolchain"),
         }
     }
     fn relativize_path(path: SharedString, worktree_root: &Path) -> SharedString {
@@ -263,7 +888,7 @@ impl PickerDelegate for ToolchainSelectorDelegate {
 
     fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
         if let Some(string_match) = self.matches.get(self.selected_index) {
-            let toolchain = self.candidates.toolchains[string_match.candidate_id].clone();
+            let (toolchain, _) = self.candidates[string_match.candidate_id].clone();
             if let Some(workspace_id) = self
                 .workspace
                 .read_with(cx, |this, _| this.database_id())
@@ -330,11 +955,11 @@ impl PickerDelegate for ToolchainSelectorDelegate {
         cx.spawn_in(window, async move |this, cx| {
             let matches = if query.is_empty() {
                 candidates
-                    .toolchains
                     .into_iter()
                     .enumerate()
-                    .map(|(index, candidate)| {
-                        let path = Self::relativize_path(candidate.path, &worktree_root_path);
+                    .map(|(index, (candidate, _))| {
+                        let path =
+                            Self::relativize_path(candidate.path.clone(), &worktree_root_path);
                         let string = format!("{}{}", candidate.name, path);
                         StringMatch {
                             candidate_id: index,
@@ -346,11 +971,11 @@ impl PickerDelegate for ToolchainSelectorDelegate {
                     .collect()
             } else {
                 let candidates = candidates
-                    .toolchains
                     .into_iter()
                     .enumerate()
-                    .map(|(candidate_id, toolchain)| {
-                        let path = Self::relativize_path(toolchain.path, &worktree_root_path);
+                    .map(|(candidate_id, (toolchain, _))| {
+                        let path =
+                            Self::relativize_path(toolchain.path.clone(), &worktree_root_path);
                         let string = format!("{}{}", toolchain.name, path);
                         StringMatchCandidate::new(candidate_id, &string)
                     })
@@ -383,11 +1008,11 @@ impl PickerDelegate for ToolchainSelectorDelegate {
         &self,
         ix: usize,
         selected: bool,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
+        _: &mut Window,
+        cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
         let mat = &self.matches[ix];
-        let toolchain = &self.candidates.toolchains[mat.candidate_id];
+        let (toolchain, scope) = &self.candidates[mat.candidate_id];
 
         let label = toolchain.name.clone();
         let path = Self::relativize_path(toolchain.path.clone(), &self.worktree_abs_path_root);
@@ -399,8 +1024,9 @@ impl PickerDelegate for ToolchainSelectorDelegate {
         path_highlights.iter_mut().for_each(|index| {
             *index -= label.len();
         });
+        let id: SharedString = format!("toolchain-{ix}",).into();
         Some(
-            ListItem::new(ix)
+            ListItem::new(id)
                 .inset(true)
                 .spacing(ListItemSpacing::Sparse)
                 .toggle_state(selected)
@@ -409,7 +1035,89 @@ impl PickerDelegate for ToolchainSelectorDelegate {
                     HighlightedLabel::new(path, path_highlights)
                         .size(LabelSize::Small)
                         .color(Color::Muted),
-                ),
+                )
+                .when_some(scope.as_ref(), |this, scope| {
+                    let id: SharedString = format!(
+                        "delete-custom-toolchain-{}-{}",
+                        toolchain.name, toolchain.path
+                    )
+                    .into();
+                    let toolchain = toolchain.clone();
+                    let scope = scope.clone();
+
+                    this.end_slot(IconButton::new(id, IconName::Trash))
+                        .on_click(cx.listener(move |this, _, _, cx| {
+                            this.delegate.project.update(cx, |this, cx| {
+                                this.remove_toolchain(toolchain.clone(), scope.clone(), cx)
+                            });
+
+                            this.delegate.matches.retain_mut(|m| {
+                                if m.candidate_id == ix {
+                                    return false;
+                                } else if m.candidate_id > ix {
+                                    m.candidate_id -= 1;
+                                }
+                                true
+                            });
+
+                            this.delegate.candidates = this
+                                .delegate
+                                .candidates
+                                .iter()
+                                .enumerate()
+                                .filter_map(|(i, toolchain)| (ix != i).then_some(toolchain.clone()))
+                                .collect();
+
+                            if this.delegate.selected_index >= ix {
+                                this.delegate.selected_index =
+                                    this.delegate.selected_index.saturating_sub(1);
+                            }
+                            cx.stop_propagation();
+                            cx.notify();
+                        }))
+                }),
+        )
+    }
+    fn render_footer(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<AnyElement> {
+        Some(
+            v_flex()
+                .rounded_b_md()
+                .child(Divider::horizontal())
+                .child(
+                    h_flex()
+                        .p_1p5()
+                        .gap_0p5()
+                        .justify_end()
+                        .child(
+                            Button::new("xd", self.add_toolchain_text.clone())
+                                .key_binding(KeyBinding::for_action_in(
+                                    &AddToolchain,
+                                    &self.focus_handle,
+                                    _window,
+                                    cx,
+                                ))
+                                .on_click(|_, window, cx| {
+                                    window.dispatch_action(Box::new(AddToolchain), cx)
+                                }),
+                        )
+                        .child(
+                            Button::new("select", "Select")
+                                .key_binding(KeyBinding::for_action_in(
+                                    &menu::Confirm,
+                                    &self.focus_handle,
+                                    _window,
+                                    cx,
+                                ))
+                                .on_click(|_, window, cx| {
+                                    window.dispatch_action(menu::Confirm.boxed_clone(), cx)
+                                }),
+                        ),
+                )
+                .into_any_element(),
         )
     }
 }
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index ef5a86a276..d674f6dd4d 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -9,7 +9,7 @@ use std::{
 };
 
 use anyhow::{Context as _, Result, bail};
-use collections::HashMap;
+use collections::{HashMap, IndexSet};
 use db::{
     query,
     sqlez::{connection::Connection, domain::Domain},
@@ -18,16 +18,16 @@ use db::{
 use gpui::{Axis, Bounds, Task, WindowBounds, WindowId, point, size};
 use project::debugger::breakpoint_store::{BreakpointState, SourceBreakpoint};
 
-use language::{LanguageName, Toolchain};
+use language::{LanguageName, Toolchain, ToolchainScope};
 use project::WorktreeId;
 use remote::{RemoteConnectionOptions, SshConnectionOptions, WslConnectionOptions};
 use sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
-    statement::{SqlType, Statement},
+    statement::Statement,
     thread_safe_connection::ThreadSafeConnection,
 };
 
-use ui::{App, px};
+use ui::{App, SharedString, px};
 use util::{ResultExt, maybe};
 use uuid::Uuid;
 
@@ -169,6 +169,7 @@ impl From<BreakpointState> for BreakpointStateWrapper<'static> {
         BreakpointStateWrapper(Cow::Owned(kind))
     }
 }
+
 impl StaticColumnCount for BreakpointStateWrapper<'_> {
     fn column_count() -> usize {
         1
@@ -193,11 +194,6 @@ impl Column for BreakpointStateWrapper<'_> {
     }
 }
 
-/// This struct is used to implement traits on Vec<breakpoint>
-#[derive(Debug)]
-#[allow(dead_code)]
-struct Breakpoints(Vec<Breakpoint>);
-
 impl sqlez::bindable::StaticColumnCount for Breakpoint {
     fn column_count() -> usize {
         // Position, log message, condition message, and hit condition message
@@ -246,26 +242,6 @@ impl Column for Breakpoint {
     }
 }
 
-impl Column for Breakpoints {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let mut breakpoints = Vec::new();
-        let mut index = start_index;
-
-        loop {
-            match statement.column_type(index) {
-                Ok(SqlType::Null) => break,
-                _ => {
-                    let (breakpoint, next_index) = Breakpoint::column(statement, index)?;
-
-                    breakpoints.push(breakpoint);
-                    index = next_index;
-                }
-            }
-        }
-        Ok((Breakpoints(breakpoints), index))
-    }
-}
-
 #[derive(Clone, Debug, PartialEq)]
 struct SerializedPixels(gpui::Pixels);
 impl sqlez::bindable::StaticColumnCount for SerializedPixels {}
@@ -711,6 +687,18 @@ impl Domain for WorkspaceDb {
 
             CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(remote_connection_id, paths);
         ),
+        sql!(CREATE TABLE user_toolchains (
+            remote_connection_id INTEGER,
+            workspace_id INTEGER NOT NULL,
+            worktree_id INTEGER NOT NULL,
+            relative_worktree_path TEXT NOT NULL,
+            language_name TEXT NOT NULL,
+            name TEXT NOT NULL,
+            path TEXT NOT NULL,
+            raw_json TEXT NOT NULL,
+
+            PRIMARY KEY (workspace_id, worktree_id, relative_worktree_path, language_name, name, path, raw_json)
+        ) STRICT;),
     ];
 
     // Allow recovering from bad migration that was initially shipped to nightly
@@ -831,6 +819,7 @@ impl WorkspaceDb {
             session_id: None,
             breakpoints: self.breakpoints(workspace_id),
             window_id,
+            user_toolchains: self.user_toolchains(workspace_id, remote_connection_id),
         })
     }
 
@@ -880,6 +869,73 @@ impl WorkspaceDb {
         }
     }
 
+    fn user_toolchains(
+        &self,
+        workspace_id: WorkspaceId,
+        remote_connection_id: Option<RemoteConnectionId>,
+    ) -> BTreeMap<ToolchainScope, IndexSet<Toolchain>> {
+        type RowKind = (WorkspaceId, u64, String, String, String, String, String);
+
+        let toolchains: Vec<RowKind> = self
+            .select_bound(sql! {
+                SELECT workspace_id, worktree_id, relative_worktree_path,
+                language_name, name, path, raw_json
+                FROM user_toolchains WHERE remote_connection_id IS ?1 AND (
+                      workspace_id IN (0, ?2)
+                )
+            })
+            .and_then(|mut statement| {
+                (statement)((remote_connection_id.map(|id| id.0), workspace_id))
+            })
+            .unwrap_or_default();
+        let mut ret = BTreeMap::<_, IndexSet<_>>::default();
+
+        for (
+            _workspace_id,
+            worktree_id,
+            relative_worktree_path,
+            language_name,
+            name,
+            path,
+            raw_json,
+        ) in toolchains
+        {
+            // INTEGER's that are primary keys (like workspace ids, remote connection ids and such) start at 1, so we're safe to
+            let scope = if _workspace_id == WorkspaceId(0) {
+                debug_assert_eq!(worktree_id, u64::MAX);
+                debug_assert_eq!(relative_worktree_path, String::default());
+                ToolchainScope::Global
+            } else {
+                debug_assert_eq!(workspace_id, _workspace_id);
+                debug_assert_eq!(
+                    worktree_id == u64::MAX,
+                    relative_worktree_path == String::default()
+                );
+
+                if worktree_id != u64::MAX && relative_worktree_path != String::default() {
+                    ToolchainScope::Subproject(
+                        WorktreeId::from_usize(worktree_id as usize),
+                        Arc::from(relative_worktree_path.as_ref()),
+                    )
+                } else {
+                    ToolchainScope::Project
+                }
+            };
+            let Ok(as_json) = serde_json::from_str(&raw_json) else {
+                continue;
+            };
+            let toolchain = Toolchain {
+                name: SharedString::from(name),
+                path: SharedString::from(path),
+                language_name: LanguageName::from_proto(language_name),
+                as_json,
+            };
+            ret.entry(scope).or_default().insert(toolchain);
+        }
+
+        ret
+    }
+
     /// Saves a workspace using the worktree roots. Will garbage collect any workspaces
     /// that used this workspace previously
     pub(crate) async fn save_workspace(&self, workspace: SerializedWorkspace) {
@@ -935,6 +991,22 @@ impl WorkspaceDb {
                         }
                     }
                 }
+                for (scope, toolchains) in workspace.user_toolchains {
+                    for toolchain in toolchains {
+                        let query = sql!(INSERT OR REPLACE INTO user_toolchains(remote_connection_id, workspace_id, worktree_id, relative_worktree_path, language_name, name, path, raw_json) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8));
+                        let (workspace_id, worktree_id, relative_worktree_path) = match scope {
+                            ToolchainScope::Subproject(worktree_id, ref path) => (Some(workspace.id), Some(worktree_id), Some(path.to_string_lossy().into_owned())),
+                            ToolchainScope::Project => (Some(workspace.id), None, None),
+                            ToolchainScope::Global => (None, None, None),
+                        };
+                        let args = (remote_connection_id, workspace_id.unwrap_or(WorkspaceId(0)), worktree_id.map_or(usize::MAX,|id| id.to_usize()), relative_worktree_path.unwrap_or_default(),
+                        toolchain.language_name.as_ref().to_owned(), toolchain.name.to_string(), toolchain.path.to_string(), toolchain.as_json.to_string());
+                        if let Err(err) = conn.exec_bound(query)?(args) {
+                            log::error!("{err}");
+                            continue;
+                        }
+                    }
+                }
 
                 conn.exec_bound(sql!(
                     DELETE
@@ -1797,6 +1869,7 @@ mod tests {
             },
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace.clone()).await;
@@ -1917,6 +1990,7 @@ mod tests {
             },
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace.clone()).await;
@@ -1950,6 +2024,7 @@ mod tests {
             breakpoints: collections::BTreeMap::default(),
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace_without_breakpoint.clone())
@@ -2047,6 +2122,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         };
 
         let workspace_2 = SerializedWorkspace {
@@ -2061,6 +2137,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace_1.clone()).await;
@@ -2167,6 +2244,7 @@ mod tests {
             centered_layout: false,
             session_id: None,
             window_id: Some(999),
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace.clone()).await;
@@ -2200,6 +2278,7 @@ mod tests {
             centered_layout: false,
             session_id: None,
             window_id: Some(1),
+            user_toolchains: Default::default(),
         };
 
         let mut workspace_2 = SerializedWorkspace {
@@ -2214,6 +2293,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: None,
             window_id: Some(2),
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace_1.clone()).await;
@@ -2255,6 +2335,7 @@ mod tests {
             centered_layout: false,
             session_id: None,
             window_id: Some(3),
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace_3.clone()).await;
@@ -2292,6 +2373,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: Some("session-id-1".to_owned()),
             window_id: Some(10),
+            user_toolchains: Default::default(),
         };
 
         let workspace_2 = SerializedWorkspace {
@@ -2306,6 +2388,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: Some("session-id-1".to_owned()),
             window_id: Some(20),
+            user_toolchains: Default::default(),
         };
 
         let workspace_3 = SerializedWorkspace {
@@ -2320,6 +2403,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: Some("session-id-2".to_owned()),
             window_id: Some(30),
+            user_toolchains: Default::default(),
         };
 
         let workspace_4 = SerializedWorkspace {
@@ -2334,6 +2418,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         };
 
         let connection_id = db
@@ -2359,6 +2444,7 @@ mod tests {
             breakpoints: Default::default(),
             session_id: Some("session-id-2".to_owned()),
             window_id: Some(50),
+            user_toolchains: Default::default(),
         };
 
         let workspace_6 = SerializedWorkspace {
@@ -2373,6 +2459,7 @@ mod tests {
             centered_layout: false,
             session_id: Some("session-id-3".to_owned()),
             window_id: Some(60),
+            user_toolchains: Default::default(),
         };
 
         db.save_workspace(workspace_1.clone()).await;
@@ -2424,6 +2511,7 @@ mod tests {
             centered_layout: false,
             session_id: None,
             window_id: None,
+            user_toolchains: Default::default(),
         }
     }
 
@@ -2458,6 +2546,7 @@ mod tests {
             session_id: Some("one-session".to_owned()),
             breakpoints: Default::default(),
             window_id: Some(window_id),
+            user_toolchains: Default::default(),
         })
         .collect::<Vec<_>>();
 
@@ -2555,6 +2644,7 @@ mod tests {
             session_id: Some("one-session".to_owned()),
             breakpoints: Default::default(),
             window_id: Some(window_id),
+            user_toolchains: Default::default(),
         })
         .collect::<Vec<_>>();
 
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index 005a1ba234..08a2f2e38d 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -5,12 +5,14 @@ use crate::{
 };
 use anyhow::Result;
 use async_recursion::async_recursion;
+use collections::IndexSet;
 use db::sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
     statement::Statement,
 };
 use gpui::{AsyncWindowContext, Entity, WeakEntity};
 
+use language::{Toolchain, ToolchainScope};
 use project::{Project, debugger::breakpoint_store::SourceBreakpoint};
 use remote::RemoteConnectionOptions;
 use std::{
@@ -57,6 +59,7 @@ pub(crate) struct SerializedWorkspace {
     pub(crate) docks: DockStructure,
     pub(crate) session_id: Option<String>,
     pub(crate) breakpoints: BTreeMap<Arc<Path>, Vec<SourceBreakpoint>>,
+    pub(crate) user_toolchains: BTreeMap<ToolchainScope, IndexSet<Toolchain>>,
     pub(crate) window_id: Option<u64>,
 }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 6b4e7c1731..58373b5d1a 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -73,6 +73,7 @@ use postage::stream::Stream;
 use project::{
     DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
     debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
+    toolchain_store::ToolchainStoreEvent,
 };
 use remote::{RemoteClientDelegate, RemoteConnectionOptions, remote_client::ConnectionIdentifier};
 use schemars::JsonSchema;
@@ -1275,6 +1276,19 @@ impl Workspace {
             },
         )
         .detach();
+        if let Some(toolchain_store) = project.read(cx).toolchain_store() {
+            cx.subscribe_in(
+                &toolchain_store,
+                window,
+                |workspace, _, event, window, cx| match event {
+                    ToolchainStoreEvent::CustomToolchainsModified => {
+                        workspace.serialize_workspace(window, cx);
+                    }
+                    _ => {}
+                },
+            )
+            .detach();
+        }
 
         cx.on_focus_lost(window, |this, window, cx| {
             let focus_handle = this.focus_handle(cx);
@@ -1565,6 +1579,16 @@ impl Workspace {
                     })?
                     .await;
             }
+            if let Some(workspace) = serialized_workspace.as_ref() {
+                project_handle.update(cx, |this, cx| {
+                    for (scope, toolchains) in &workspace.user_toolchains {
+                        for toolchain in toolchains {
+                            this.add_toolchain(toolchain.clone(), scope.clone(), cx);
+                        }
+                    }
+                })?;
+            }
+
             let window = if let Some(window) = requesting_window {
                 let centered_layout = serialized_workspace
                     .as_ref()
@@ -5240,10 +5264,16 @@ impl Workspace {
                         .read(cx)
                         .all_source_breakpoints(cx)
                 });
+                let user_toolchains = self
+                    .project
+                    .read(cx)
+                    .user_toolchains(cx)
+                    .unwrap_or_default();
 
                 let center_group = build_serialized_pane_group(&self.center.root, window, cx);
                 let docks = build_serialized_docks(self, window, cx);
                 let window_bounds = Some(SerializedWindowBounds(window.window_bounds()));
+
                 let serialized_workspace = SerializedWorkspace {
                     id: database_id,
                     location,
@@ -5256,6 +5286,7 @@ impl Workspace {
                     session_id: self.session_id.clone(),
                     breakpoints,
                     window_id: Some(window.window_handle().window_id().as_u64()),
+                    user_toolchains,
                 };
 
                 window.spawn(cx, async move |_| {

From a6a111cadd34d79ef55d5b70d563178bbaffd965 Mon Sep 17 00:00:00 2001
From: chbk <chbk.git@gmail.com>
Date: Sat, 6 Sep 2025 01:36:36 +0200
Subject: [PATCH 646/823] Highlight labels in Go (#37673)

Release Notes:

- Highlight labels in Go

| Zed 0.202.7 | With this PR |
| --- | --- |
| <img width="160" height="50" alt="go-0 202 7"
src="https://github.com/user-attachments/assets/1a1b3b3c-52ae-41e3-a52b-c2a9bb7589d2"
/> | <img width="160" height="50" alt="go-pr"
src="https://github.com/user-attachments/assets/29020b9f-ed03-4298-aa5b-0201a81fd5e6"
/> |
---
 crates/languages/src/go/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/languages/src/go/highlights.scm b/crates/languages/src/go/highlights.scm
index bb0eaab88a..5d630cbdfc 100644
--- a/crates/languages/src/go/highlights.scm
+++ b/crates/languages/src/go/highlights.scm
@@ -4,6 +4,8 @@
 (field_identifier) @property
 (package_identifier) @namespace
 
+(label_name) @label
+
 (keyed_element
   .
   (literal_element

From 23dc1f5ea4061591ed44121e8a4ba191f7e7b647 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 5 Sep 2025 18:09:50 -0700
Subject: [PATCH 647/823] Disable foreign keys in sqlite when running
 migrations (#37572)

Closes #37473

### Background

Previously, we enabled foreign keys at all times for our sqlite database
that we use for client-side state.
The problem with this is that In sqlite, `alter table` is somewhat
limited, so for many migrations, you must *recreate* the table: create a
new table called e.g. `workspace__2`, then copy all of the data from
`workspaces` into `workspace__2`, then delete the old `workspaces` table
and rename `workspaces__2` to `workspaces`. The way foreign keys work in
sqlite, when we delete the old table, all of its associated records in
other tables will be deleted due to `on delete cascade` clauses.

Unfortunately, one of the types of associated records that can be
deleted are `editors`, which sometimes store unsaved text. It is very
bad to delete these records, as they are the *only* place that this
unsaved text is stored.

This has already happened multiple times as we have migrated tables as
we develop Zed, but I caused it to happened again in
https://github.com/zed-industries/zed/pull/36714.

### The Fix

The Sqlite docs recommend a multi-step approach to migrations where you:

* disable foreign keys
* start a transaction
* create a new table
* populate the new table with data from the old table
* delete the old table
* rename the new table to the old name
* run a foreign key check
* if it passes, commit the transaction
* enable foreign keys

In this PR, I've adjusted our sqlite migration code path to follow this
pattern more closely. Specifically, we disable foreign key checks before
running migrations, run a foreign key check before committing, and then
enable foreign key checks after the migrations are done.

In addition, I've added a generic query that we run *before* running the
foreign key check that explicitly deletes any rows that have dangling
foreign keys. This way, we avoid failing the migration (and breaking the
app) if a migration deletes data that *does* cause associated records to
need to be deleted.

But now, in the common case where we migrate old data in the new table
and keep the ids, all of the associated data will be preserved.

Release Notes:

- Fixed a bug where workspace state would be lost when upgrading from
Zed 0.201.x. or below.
---
 Cargo.lock                                 |  1 +
 crates/sqlez/Cargo.toml                    |  1 +
 crates/sqlez/src/migrations.rs             | 51 ++++++++++++++++++++--
 crates/sqlez/src/thread_safe_connection.rs | 11 +++++
 crates/workspace/src/persistence.rs        |  3 ++
 5 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 295c3a83c5..f4c94f8078 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15347,6 +15347,7 @@ dependencies = [
  "futures 0.3.31",
  "indoc",
  "libsqlite3-sys",
+ "log",
  "parking_lot",
  "smol",
  "sqlformat",
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 16a3adebae..6eb75aa171 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -14,6 +14,7 @@ collections.workspace = true
 futures.workspace = true
 indoc.workspace = true
 libsqlite3-sys.workspace = true
+log.workspace = true
 parking_lot.workspace = true
 smol.workspace = true
 sqlformat.workspace = true
diff --git a/crates/sqlez/src/migrations.rs b/crates/sqlez/src/migrations.rs
index 2429ddeb41..567d82f9af 100644
--- a/crates/sqlez/src/migrations.rs
+++ b/crates/sqlez/src/migrations.rs
@@ -59,6 +59,7 @@ impl Connection {
             let mut store_completed_migration = self
                 .exec_bound("INSERT INTO migrations (domain, step, migration) VALUES (?, ?, ?)")?;
 
+            let mut did_migrate = false;
             for (index, migration) in migrations.iter().enumerate() {
                 let migration =
                     sqlformat::format(migration, &sqlformat::QueryParams::None, Default::default());
@@ -70,9 +71,7 @@ impl Connection {
                         &sqlformat::QueryParams::None,
                         Default::default(),
                     );
-                    if completed_migration == migration
-                        || migration.trim().starts_with("-- ALLOW_MIGRATION_CHANGE")
-                    {
+                    if completed_migration == migration {
                         // Migration already run. Continue
                         continue;
                     } else if should_allow_migration_change(index, &completed_migration, &migration)
@@ -91,12 +90,58 @@ impl Connection {
                 }
 
                 self.eager_exec(&migration)?;
+                did_migrate = true;
                 store_completed_migration((domain, index, migration))?;
             }
 
+            if did_migrate {
+                self.delete_rows_with_orphaned_foreign_key_references()?;
+                self.exec("PRAGMA foreign_key_check;")?()?;
+            }
+
             Ok(())
         })
     }
+
+    /// Delete any rows that were orphaned by a migration. This is needed
+    /// because we disable foreign key constraints during migrations, so
+    /// that it's possible to re-create a table with the same name, without
+    /// deleting all associated data.
+    fn delete_rows_with_orphaned_foreign_key_references(&self) -> Result<()> {
+        let foreign_key_info: Vec<(String, String, String, String)> = self.select(
+            r#"
+                SELECT DISTINCT
+                    schema.name as child_table,
+                    foreign_keys.[from] as child_key,
+                    foreign_keys.[table] as parent_table,
+                    foreign_keys.[to] as parent_key
+                FROM sqlite_schema schema
+                JOIN pragma_foreign_key_list(schema.name) foreign_keys
+                WHERE
+                    schema.type = 'table' AND
+                    schema.name NOT LIKE "sqlite_%"
+            "#,
+        )?()?;
+
+        if !foreign_key_info.is_empty() {
+            log::info!(
+                "Found {} foreign key relationships to check",
+                foreign_key_info.len()
+            );
+        }
+
+        for (child_table, child_key, parent_table, parent_key) in foreign_key_info {
+            self.exec(&format!(
+                "
+                DELETE FROM {child_table}
+                WHERE {child_key} IS NOT NULL and {child_key} NOT IN
+                (SELECT {parent_key} FROM {parent_table})
+                "
+            ))?()?;
+        }
+
+        Ok(())
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
index 58d3afe78f..482905ac81 100644
--- a/crates/sqlez/src/thread_safe_connection.rs
+++ b/crates/sqlez/src/thread_safe_connection.rs
@@ -95,6 +95,14 @@ impl<M: Migrator> ThreadSafeConnectionBuilder<M> {
                 let mut migration_result =
                     anyhow::Result::<()>::Err(anyhow::anyhow!("Migration never run"));
 
+                let foreign_keys_enabled: bool =
+                    connection.select_row::<i32>("PRAGMA foreign_keys")?()
+                        .unwrap_or(None)
+                        .map(|enabled| enabled != 0)
+                        .unwrap_or(false);
+
+                connection.exec("PRAGMA foreign_keys = OFF;")?()?;
+
                 for _ in 0..MIGRATION_RETRIES {
                     migration_result = connection
                         .with_savepoint("thread_safe_multi_migration", || M::migrate(connection));
@@ -104,6 +112,9 @@ impl<M: Migrator> ThreadSafeConnectionBuilder<M> {
                     }
                 }
 
+                if foreign_keys_enabled {
+                    connection.exec("PRAGMA foreign_keys = ON;")?()?;
+                }
                 migration_result
             })
             .await?;
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
index d674f6dd4d..797c479683 100644
--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
@@ -699,6 +699,9 @@ impl Domain for WorkspaceDb {
 
             PRIMARY KEY (workspace_id, worktree_id, relative_worktree_path, language_name, name, path, raw_json)
         ) STRICT;),
+        sql!(
+            DROP TABLE ssh_connections;
+        ),
     ];
 
     // Allow recovering from bad migration that was initially shipped to nightly

From 47a475681f43718d750b484af9c3cc189c1ac58e Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Fri, 5 Sep 2025 22:22:55 -0600
Subject: [PATCH 648/823] Optimize Chunks::seek when offset is in current chunk
 (#37659)

Release Notes:

- N/A
---
 crates/rope/src/rope.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
index 3388685422..9185b5baa3 100644
--- a/crates/rope/src/rope.rs
+++ b/crates/rope/src/rope.rs
@@ -639,18 +639,20 @@ impl<'a> Chunks<'a> {
     pub fn seek(&mut self, mut offset: usize) {
         offset = offset.clamp(self.range.start, self.range.end);
 
-        let bias = if self.reversed {
-            Bias::Left
+        if self.reversed {
+            if offset > self.chunks.end() {
+                self.chunks.seek_forward(&offset, Bias::Left);
+            } else if offset <= *self.chunks.start() {
+                self.chunks.seek(&offset, Bias::Left);
+            }
         } else {
-            Bias::Right
+            if offset >= self.chunks.end() {
+                self.chunks.seek_forward(&offset, Bias::Right);
+            } else if offset < *self.chunks.start() {
+                self.chunks.seek(&offset, Bias::Right);
+            }
         };
 
-        if offset >= self.chunks.end() {
-            self.chunks.seek_forward(&offset, bias);
-        } else {
-            self.chunks.seek(&offset, bias);
-        }
-
         self.offset = offset;
     }
 

From 8c9442ad11691004278607d83a4205807c644e82 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Sat, 6 Sep 2025 10:46:08 +0530
Subject: [PATCH 649/823] language_models: Skip empty delta text content in
 OpenAI and OpenAI compatible provider (#37626)

Closes #37302

Related: #37614

In case of open_ai_compatible providers like Zhipu AI and z.ai they
return empty content along with usage data. below is the example json
captured from z.ai. We now ignore empty content returned by providers
now to avoid this issue where we would return the same empty content
back to provider which would error out.

```
OpenAI Stream Response JSON:
{
  "id": "2025090518465610d80dc21e66426d",
  "created": 1757069216,
  "model": "glm-4.5",
  "choices": [
    {
      "index": 0,
      "finish_reason": "tool_calls",
      "delta": {
        "role": "assistant",
        "content": ""
      }
    }
  ],
  "usage": {
    "prompt_tokens": 7882,
    "completion_tokens": 150,
    "total_tokens": 8032,
    "prompt_tokens_details": {
      "cached_tokens": 7881
    }
  }
}
```

Release Notes:

- Skip empty delta text content in OpenAI and OpenAI compatible provider

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 crates/language_models/src/provider/open_ai.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index 4348fd4211..cfd4303351 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -586,7 +586,9 @@ impl OpenAiEventMapper {
         };
 
         if let Some(content) = choice.delta.content.clone() {
-            events.push(Ok(LanguageModelCompletionEvent::Text(content)));
+            if !content.is_empty() {
+                events.push(Ok(LanguageModelCompletionEvent::Text(content)));
+            }
         }
 
         if let Some(tool_calls) = choice.delta.tool_calls.as_ref() {

From 1f37fbd0511fcafd6b39e9de4d6d6db7244453dd Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Sat, 6 Sep 2025 11:12:15 +0530
Subject: [PATCH 650/823] language_models: Use `/models/user` for fetching
 OpenRouter models (#37534)

This PR switches the OpenRouter integration from fetching all models to
fetching only the models specified in the user's account preferences.
This will help improve the experience

**The Problem**

The previous implementation used the `/models` endpoint, which returned
an exhaustive list of all models supported by OpenRouter. This resulted
in a long and cluttered model selection dropdown in Zed, making it
difficult for users to find the models they actually use.

**The Solution**

We now use the `/models/user` endpoint. This API call returns a curated
list based on the models and providers the user has selected in their
[OpenRouter dashboard](https://openrouter.ai/models).

Ref: [OpenRouter API Docs for User-Filtered
Models](https://openrouter.ai/docs/api-reference/list-models-filtered-by-user-provider-preferences)

Release Notes:

- language_models: Support OpenRouter user preferences for available
models
---
 .../src/provider/open_router.rs               | 25 +++++++++++++++----
 crates/open_router/src/open_router.rs         |  8 ++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 9138f6b82e..f73a97e642 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -92,7 +92,7 @@ pub struct State {
     api_key_from_env: bool,
     http_client: Arc<dyn HttpClient>,
     available_models: Vec<open_router::Model>,
-    fetch_models_task: Option<Task<Result<()>>>,
+    fetch_models_task: Option<Task<Result<(), LanguageModelCompletionError>>>,
     settings: OpenRouterSettings,
     _subscription: Subscription,
 }
@@ -178,20 +178,35 @@ impl State {
         })
     }
 
-    fn fetch_models(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
+    fn fetch_models(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<(), LanguageModelCompletionError>> {
         let settings = &AllLanguageModelSettings::get_global(cx).open_router;
         let http_client = self.http_client.clone();
         let api_url = settings.api_url.clone();
-
+        let Some(api_key) = self.api_key.clone() else {
+            return Task::ready(Err(LanguageModelCompletionError::NoApiKey {
+                provider: PROVIDER_NAME,
+            }));
+        };
         cx.spawn(async move |this, cx| {
-            let models = list_models(http_client.as_ref(), &api_url)
+            let models = list_models(http_client.as_ref(), &api_url, &api_key)
                 .await
-                .map_err(|e| anyhow::anyhow!("OpenRouter error: {:?}", e))?;
+                .map_err(|e| {
+                    LanguageModelCompletionError::Other(anyhow::anyhow!(
+                        "OpenRouter error: {:?}",
+                        e
+                    ))
+                })?;
 
             this.update(cx, |this, cx| {
                 this.available_models = models;
                 cx.notify();
             })
+            .map_err(|e| LanguageModelCompletionError::Other(e))?;
+
+            Ok(())
         })
     }
 
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index dfaa49746d..cbc6c243d8 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -529,12 +529,16 @@ pub async fn stream_completion(
 pub async fn list_models(
     client: &dyn HttpClient,
     api_url: &str,
+    api_key: &str,
 ) -> Result<Vec<Model>, OpenRouterError> {
-    let uri = format!("{api_url}/models");
+    let uri = format!("{api_url}/models/user");
     let request_builder = HttpRequest::builder()
         .method(Method::GET)
         .uri(uri)
-        .header("Accept", "application/json");
+        .header("Accept", "application/json")
+        .header("Authorization", format!("Bearer {}", api_key))
+        .header("HTTP-Referer", "https://zed.dev")
+        .header("X-Title", "Zed Editor");
 
     let request = request_builder
         .body(AsyncBody::default())

From 777ce7cc97b161feef64f67481b76415a2d848b4 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 6 Sep 2025 10:37:59 +0300
Subject: [PATCH 651/823] Fixed LSP binary info not being shown in full
 (#37682)

Follow-up of https://github.com/zed-industries/zed/pull/37083
Closes https://github.com/zed-industries/zed/issues/37677

Release Notes:

- Fixed LSP binary info not being shown in full
---
 crates/language_tools/src/lsp_log_view.rs | 18 ++++++++++++------
 crates/project/src/lsp_store/log_store.rs | 14 --------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/crates/language_tools/src/lsp_log_view.rs b/crates/language_tools/src/lsp_log_view.rs
index b1f1e5c4f6..fb63ab9a99 100644
--- a/crates/language_tools/src/lsp_log_view.rs
+++ b/crates/language_tools/src/lsp_log_view.rs
@@ -325,7 +325,7 @@ impl LspLogView {
         let server_info = format!(
             "* Server: {NAME} (id {ID})
 
-* Binary: {BINARY:#?}
+* Binary: {BINARY}
 
 * Registered workspace folders:
 {WORKSPACE_FOLDERS}
@@ -335,10 +335,10 @@ impl LspLogView {
 * Configuration: {CONFIGURATION}",
             NAME = info.name,
             ID = info.id,
-            BINARY = info.binary.as_ref().map_or_else(
-                || "Unknown".to_string(),
-                |bin| bin.path.as_path().to_string_lossy().to_string()
-            ),
+            BINARY = info
+                .binary
+                .as_ref()
+                .map_or_else(|| "Unknown".to_string(), |binary| format!("{binary:#?}")),
             WORKSPACE_FOLDERS = info.workspace_folders.join(", "),
             CAPABILITIES = serde_json::to_string_pretty(&info.capabilities)
                 .unwrap_or_else(|e| format!("Failed to serialize capabilities: {e}")),
@@ -990,10 +990,16 @@ impl Render for LspLogToolbarItemView {
             let server_id = server.server_id;
             let rpc_trace_enabled = server.rpc_trace_enabled;
             let log_view = log_view.clone();
+            let label = match server.selected_entry {
+                LogKind::Rpc => RPC_MESSAGES,
+                LogKind::Trace => SERVER_TRACE,
+                LogKind::Logs => SERVER_LOGS,
+                LogKind::ServerInfo => SERVER_INFO,
+            };
             PopoverMenu::new("LspViewSelector")
                 .anchor(Corner::TopLeft)
                 .trigger(
-                    Button::new("language_server_menu_header", server.selected_entry.label())
+                    Button::new("language_server_menu_header", label)
                         .icon(IconName::ChevronDown)
                         .icon_size(IconSize::Small)
                         .icon_color(Color::Muted),
diff --git a/crates/project/src/lsp_store/log_store.rs b/crates/project/src/lsp_store/log_store.rs
index 67a20dd6cd..00098712bf 100644
--- a/crates/project/src/lsp_store/log_store.rs
+++ b/crates/project/src/lsp_store/log_store.rs
@@ -16,11 +16,6 @@ const SEND_LINE: &str = "\n// Send:";
 const RECEIVE_LINE: &str = "\n// Receive:";
 const MAX_STORED_LOG_ENTRIES: usize = 2000;
 
-const RPC_MESSAGES: &str = "RPC Messages";
-const SERVER_LOGS: &str = "Server Logs";
-const SERVER_TRACE: &str = "Server Trace";
-const SERVER_INFO: &str = "Server Info";
-
 pub fn init(on_headless_host: bool, cx: &mut App) -> Entity<LogStore> {
     let log_store = cx.new(|cx| LogStore::new(on_headless_host, cx));
     cx.set_global(GlobalLogStore(log_store.clone()));
@@ -216,15 +211,6 @@ impl LogKind {
             LanguageServerLogType::Rpc { .. } => Self::Rpc,
         }
     }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            LogKind::Rpc => RPC_MESSAGES,
-            LogKind::Trace => SERVER_TRACE,
-            LogKind::Logs => SERVER_LOGS,
-            LogKind::ServerInfo => SERVER_INFO,
-        }
-    }
 }
 
 impl LogStore {

From 1d828b6ac6028e5ffa421a14b08172ec86bd175d Mon Sep 17 00:00:00 2001
From: Marco Groot <60631182+marcogroot@users.noreply.github.com>
Date: Sat, 6 Sep 2025 20:29:34 +1000
Subject: [PATCH 652/823] Fix broken link in `CONTRIBUTING.md` (#37688)

Can see currently the link is dead currently, but this changes fixes
locally


https://github.com/user-attachments/assets/e01d9c47-e91e-4c24-8285-01e3b45583b9


Release Notes:

- N/A
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 407ba002c7..1c0b1e363e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,7 +65,7 @@ If you would like to add a new icon to the Zed icon theme, [open a Discussion](h
 
 ## Bird's-eye view of Zed
 
-We suggest you keep the [zed glossary](docs/src/development/GLOSSARY.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
+We suggest you keep the [zed glossary](docs/src/development/glossary.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
 
 Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
 

From 065518577eb589cad60945c69428494f0ed01757 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 6 Sep 2025 16:37:21 +0300
Subject: [PATCH 653/823] Fix the tasks docs (#37699)

Closes https://github.com/zed-industries/zed/issues/37698

Release Notes:

- N/A
---
 docs/src/tasks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/tasks.md b/docs/src/tasks.md
index bff3eac860..e530f568cd 100644
--- a/docs/src/tasks.md
+++ b/docs/src/tasks.md
@@ -45,7 +45,7 @@ Zed supports ways to spawn (and rerun) commands using its integrated terminal to
     // Whether to show the task line in the output of the spawned task, defaults to `true`.
     "show_summary": true,
     // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_output": true
+    "show_command": true
     // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
     // "tags": []
   }

From 84f166fc85e1675fb76183ad6f212891d596c38d Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 6 Sep 2025 16:39:21 +0300
Subject: [PATCH 654/823] Tweak word completions more (#37697)

Follow-up of https://github.com/zed-industries/zed/pull/37352
Closes https://github.com/zed-industries/zed/issues/37132

* disabled word completions in the agent panel's editor
* if not disabled, allow to trigger word completions with an action even
if the completions threshold is not reached

Release Notes:

- Fixed word completions appearing in the agent panel's editor and not
appearing when triggered with the action before the completion threshold
is reached
---
 crates/agent_ui/src/message_editor.rs   |  1 +
 crates/editor/src/code_context_menus.rs |  2 +-
 crates/editor/src/editor.rs             | 42 ++++++++++++----
 crates/editor/src/editor_tests.rs       | 64 +++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 45e7529ec2..6f0ad2767a 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -125,6 +125,7 @@ pub(crate) fn create_editor(
             cx,
         );
         editor.set_placeholder_text("Message the agent – @ to include context", cx);
+        editor.disable_word_completions();
         editor.set_show_indent_guides(false, cx);
         editor.set_soft_wrap();
         editor.set_use_modal_editing(true);
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 6d57048985..18fce84dbc 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -251,7 +251,7 @@ enum MarkdownCacheKey {
 pub enum CompletionsMenuSource {
     Normal,
     SnippetChoices,
-    Words,
+    Words { ignore_threshold: bool },
 }
 
 // TODO: There should really be a wrapper around fuzzy match tasks that does this.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2374c8d687..b1f9bde6dd 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1030,6 +1030,7 @@ pub struct Editor {
     inline_diagnostics_update: Task<()>,
     inline_diagnostics_enabled: bool,
     diagnostics_enabled: bool,
+    word_completions_enabled: bool,
     inline_diagnostics: Vec<(Anchor, InlineDiagnostic)>,
     soft_wrap_mode_override: Option<language_settings::SoftWrap>,
     hard_wrap: Option<usize>,
@@ -2163,6 +2164,7 @@ impl Editor {
             },
             inline_diagnostics_enabled: full_mode,
             diagnostics_enabled: full_mode,
+            word_completions_enabled: full_mode,
             inline_value_cache: InlineValueCache::new(inlay_hint_settings.show_value_hints),
             inlay_hint_cache: InlayHintCache::new(inlay_hint_settings),
             gutter_hovered: false,
@@ -4892,8 +4894,15 @@ impl Editor {
             });
 
         match completions_source {
-            Some(CompletionsMenuSource::Words) => {
-                self.show_word_completions(&ShowWordCompletions, window, cx)
+            Some(CompletionsMenuSource::Words { .. }) => {
+                self.open_or_update_completions_menu(
+                    Some(CompletionsMenuSource::Words {
+                        ignore_threshold: false,
+                    }),
+                    None,
+                    window,
+                    cx,
+                );
             }
             Some(CompletionsMenuSource::Normal)
             | Some(CompletionsMenuSource::SnippetChoices)
@@ -5401,7 +5410,14 @@ impl Editor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.open_or_update_completions_menu(Some(CompletionsMenuSource::Words), None, window, cx);
+        self.open_or_update_completions_menu(
+            Some(CompletionsMenuSource::Words {
+                ignore_threshold: true,
+            }),
+            None,
+            window,
+            cx,
+        );
     }
 
     pub fn show_completions(
@@ -5450,9 +5466,13 @@ impl Editor {
 
         drop(multibuffer_snapshot);
 
+        let mut ignore_word_threshold = false;
         let provider = match requested_source {
             Some(CompletionsMenuSource::Normal) | None => self.completion_provider.clone(),
-            Some(CompletionsMenuSource::Words) => None,
+            Some(CompletionsMenuSource::Words { ignore_threshold }) => {
+                ignore_word_threshold = ignore_threshold;
+                None
+            }
             Some(CompletionsMenuSource::SnippetChoices) => {
                 log::error!("bug: SnippetChoices requested_source is not handled");
                 None
@@ -5573,10 +5593,12 @@ impl Editor {
             .as_ref()
             .is_none_or(|query| !query.chars().any(|c| c.is_digit(10)));
 
-        let omit_word_completions = match &query {
-            Some(query) => query.chars().count() < completion_settings.words_min_length,
-            None => completion_settings.words_min_length != 0,
-        };
+        let omit_word_completions = !self.word_completions_enabled
+            || (!ignore_word_threshold
+                && match &query {
+                    Some(query) => query.chars().count() < completion_settings.words_min_length,
+                    None => completion_settings.words_min_length != 0,
+                });
 
         let (mut words, provider_responses) = match &provider {
             Some(provider) => {
@@ -17121,6 +17143,10 @@ impl Editor {
         self.inline_diagnostics.clear();
     }
 
+    pub fn disable_word_completions(&mut self) {
+        self.word_completions_enabled = false;
+    }
+
     pub fn diagnostics_enabled(&self) -> bool {
         self.diagnostics_enabled && self.mode.is_full()
     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index f4569b4364..36405079b8 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -14278,6 +14278,26 @@ async fn test_word_completions_do_not_show_before_threshold(cx: &mut TestAppCont
         }
     });
 
+    cx.update_editor(|editor, window, cx| {
+        editor.show_word_completions(&ShowWordCompletions, window, cx);
+    });
+    cx.executor().run_until_parked();
+    cx.update_editor(|editor, window, cx| {
+        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
+        {
+            assert_eq!(completion_menu_entries(menu), &["wowser", "wowen", "wow"], "Even though the threshold is not met, invoking word completions with an action should provide the completions");
+        } else {
+            panic!("expected completion menu to be open after the word completions are called with an action");
+        }
+
+        editor.cancel(&Cancel, window, cx);
+    });
+    cx.update_editor(|editor, _, _| {
+        if editor.context_menu.borrow_mut().is_some() {
+            panic!("expected completion menu to be hidden after canceling");
+        }
+    });
+
     cx.simulate_keystroke("o");
     cx.executor().run_until_parked();
     cx.update_editor(|editor, _, _| {
@@ -14300,6 +14320,50 @@ async fn test_word_completions_do_not_show_before_threshold(cx: &mut TestAppCont
     });
 }
 
+#[gpui::test]
+async fn test_word_completions_disabled(cx: &mut TestAppContext) {
+    init_test(cx, |language_settings| {
+        language_settings.defaults.completions = Some(CompletionSettings {
+            words: WordsCompletionMode::Enabled,
+            words_min_length: 0,
+            lsp: true,
+            lsp_fetch_timeout_ms: 0,
+            lsp_insert_mode: LspInsertMode::Insert,
+        });
+    });
+
+    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
+    cx.update_editor(|editor, _, _| {
+        editor.disable_word_completions();
+    });
+    cx.set_state(indoc! {"ˇ
+        wow
+        wowen
+        wowser
+    "});
+    cx.simulate_keystroke("w");
+    cx.executor().run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        if editor.context_menu.borrow_mut().is_some() {
+            panic!(
+                "expected completion menu to be hidden, as words completion are disabled for this editor"
+            );
+        }
+    });
+
+    cx.update_editor(|editor, window, cx| {
+        editor.show_word_completions(&ShowWordCompletions, window, cx);
+    });
+    cx.executor().run_until_parked();
+    cx.update_editor(|editor, _, _| {
+        if editor.context_menu.borrow_mut().is_some() {
+            panic!(
+                "expected completion menu to be hidden even if called for explicitly, as words completion are disabled for this editor"
+            );
+        }
+    });
+}
+
 fn gen_text_edit(params: &CompletionParams, text: &str) -> Option<lsp::CompletionTextEdit> {
     let position = || lsp::Position {
         line: params.text_document_position.position.line,

From e04473dd2612a63504aca730b3f5a51ad72fdc2c Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 6 Sep 2025 19:51:51 +0300
Subject: [PATCH 655/823] Revert "gpui: Skip `test` attribute expansion for
 rust-analyzer (#37611)" (#37705)

This reverts commit 4124bedab796d2ac0a1e57f8b94f72500969797a.

With the new annotation, r-a starts to skip the tasks that are marked
with `gpui::test` and when it fully loads, it starts to return
module-only tasks:


https://github.com/user-attachments/assets/5af3e3e4-91b7-4f19-aab0-ed7f186e5f74


Release Notes:

- N/A
---
 crates/gpui/src/gpui.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 0858cb014e..3c4ee41c16 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -121,14 +121,6 @@ mod seal {
     pub trait Sealed {}
 }
 
-// This allows r-a to skip expanding the gpui test macro which should
-// reduce resource usage a bit as the test attribute is special cased
-// to be treated as a no-op.
-#[cfg(rust_analyzer)]
-pub use core::prelude::v1::test;
-#[cfg(not(rust_analyzer))]
-pub use gpui_macros::test;
-
 pub use action::*;
 pub use anyhow::Result;
 pub use app::*;
@@ -142,7 +134,7 @@ pub use elements::*;
 pub use executor::*;
 pub use geometry::*;
 pub use global::*;
-pub use gpui_macros::{AppContext, IntoElement, Render, VisualContext, register_action};
+pub use gpui_macros::{AppContext, IntoElement, Render, VisualContext, register_action, test};
 pub use http_client;
 pub use input::*;
 pub use inspector::*;

From 1552afd8bf8da873e43e31088e2c56bfdaf691c7 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Sat, 6 Sep 2025 15:38:48 -0400
Subject: [PATCH 656/823] docs: Use `#action` throughout `configuring-zed.md`
 (#37709)

Release Notes:

- N/A
---
 docs/src/configuring-zed.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index e245b3ca2f..56b4de8328 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -116,7 +116,7 @@ Non-negative `float` values
 
 ## Allow Rewrap
 
-- Description: Controls where the `editor::Rewrap` action is allowed in the current language scope
+- Description: Controls where the {#action editor::Rewrap} action is allowed in the current language scope
 - Setting: `allow_rewrap`
 - Default: `"in_comments"`
 
@@ -2192,7 +2192,7 @@ Example:
 
 ## Go to Definition Fallback
 
-- Description: What to do when the "go to definition" action fails to find a definition
+- Description: What to do when the {#action editor::GoToDefinition} action fails to find a definition
 - Setting: `go_to_definition_fallback`
 - Default: `"find_all_references"`
 
@@ -2383,7 +2383,7 @@ Example:
 
 **Options**
 
-Run the `icon theme selector: toggle` action in the command palette to see a current list of valid icon themes names.
+Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon themes names.
 
 ### Light
 
@@ -2393,7 +2393,7 @@ Run the `icon theme selector: toggle` action in the command palette to see a cur
 
 **Options**
 
-Run the `icon theme selector: toggle` action in the command palette to see a current list of valid icon themes names.
+Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon themes names.
 
 ## Image Viewer
 
@@ -2832,7 +2832,7 @@ Configuration object for defining settings profiles. Example:
 
   - Double-clicking on the file
   - Double-clicking on the tab header
-  - Using the `project_panel::OpenPermanent` action
+  - Using the {#action project_panel::OpenPermanent} action
   - Editing the file
   - Dragging the file to a different pane
 
@@ -4053,7 +4053,7 @@ Example command to set the title: `echo -e "\e]2;New Title\007";`
 
 **Options**
 
-Run the `theme selector: toggle` action in the command palette to see a current list of valid themes names.
+Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid themes names.
 
 ### Light
 
@@ -4063,7 +4063,7 @@ Run the `theme selector: toggle` action in the command palette to see a current
 
 **Options**
 
-Run the `theme selector: toggle` action in the command palette to see a current list of valid themes names.
+Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid themes names.
 
 ## Title Bar
 

From 5c30578c4961d3766ee991b119658b02741b85e5 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Sun, 7 Sep 2025 02:01:55 +0530
Subject: [PATCH 657/823] linux: Fix IME preedit text not showing in Terminal
 on Wayland (#37701)

Closes https://github.com/zed-industries/zed/issues/37268

Release Notes:

- Fixed an issue where IME preedit text was not showing in the Terminal
on Wayland.
---
 crates/terminal_view/src/terminal_element.rs | 12 ++++-----
 crates/terminal_view/src/terminal_view.rs    | 28 ++++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 5bbf5ad36b..a786aa20e6 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -1192,8 +1192,8 @@ impl Element for TerminalElement {
                 bounds.origin + Point::new(layout.gutter, px(0.)) - Point::new(px(0.), scroll_top);
 
             let marked_text_cloned: Option<String> = {
-                let ime_state = self.terminal_view.read(cx);
-                ime_state.marked_text.clone()
+                let ime_state = &self.terminal_view.read(cx).ime_state;
+                ime_state.as_ref().map(|state| state.marked_text.clone())
             };
 
             let terminal_input_handler = TerminalInputHandler {
@@ -1421,11 +1421,9 @@ impl InputHandler for TerminalInputHandler {
         _window: &mut Window,
         cx: &mut App,
     ) {
-        if let Some(range) = new_marked_range {
-            self.terminal_view.update(cx, |view, view_cx| {
-                view.set_marked_text(new_text.to_string(), range, view_cx);
-            });
-        }
+        self.terminal_view.update(cx, |view, view_cx| {
+            view.set_marked_text(new_text.to_string(), new_marked_range, view_cx);
+        });
     }
 
     fn unmark_text(&mut self, _window: &mut Window, cx: &mut App) {
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 2548a7c244..08caf9a4ef 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -62,6 +62,11 @@ use std::{
     time::Duration,
 };
 
+struct ImeState {
+    marked_text: String,
+    marked_range_utf16: Option<Range<usize>>,
+}
+
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 const TERMINAL_SCROLLBAR_WIDTH: Pixels = px(12.);
 
@@ -138,8 +143,7 @@ pub struct TerminalView {
     scroll_handle: TerminalScrollHandle,
     show_scrollbar: bool,
     hide_scrollbar_task: Option<Task<()>>,
-    marked_text: Option<String>,
-    marked_range_utf16: Option<Range<usize>>,
+    ime_state: Option<ImeState>,
     _subscriptions: Vec<Subscription>,
     _terminal_subscriptions: Vec<Subscription>,
 }
@@ -263,8 +267,7 @@ impl TerminalView {
             show_scrollbar: !Self::should_autohide_scrollbar(cx),
             hide_scrollbar_task: None,
             cwd_serialized: false,
-            marked_text: None,
-            marked_range_utf16: None,
+            ime_state: None,
             _subscriptions: vec![
                 focus_in,
                 focus_out,
@@ -323,24 +326,27 @@ impl TerminalView {
     pub(crate) fn set_marked_text(
         &mut self,
         text: String,
-        range: Range<usize>,
+        range: Option<Range<usize>>,
         cx: &mut Context<Self>,
     ) {
-        self.marked_text = Some(text);
-        self.marked_range_utf16 = Some(range);
+        self.ime_state = Some(ImeState {
+            marked_text: text,
+            marked_range_utf16: range,
+        });
         cx.notify();
     }
 
     /// Gets the current marked range (UTF-16).
     pub(crate) fn marked_text_range(&self) -> Option<Range<usize>> {
-        self.marked_range_utf16.clone()
+        self.ime_state
+            .as_ref()
+            .and_then(|state| state.marked_range_utf16.clone())
     }
 
     /// Clears the marked (pre-edit) text state.
     pub(crate) fn clear_marked_text(&mut self, cx: &mut Context<Self>) {
-        if self.marked_text.is_some() {
-            self.marked_text = None;
-            self.marked_range_utf16 = None;
+        if self.ime_state.is_some() {
+            self.ime_state = None;
             cx.notify();
         }
     }

From 29def012a18af534d17ded2febc77841ce3af601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Sun, 7 Sep 2025 14:09:35 +0800
Subject: [PATCH 658/823] windows: Update Windows keymap (#37721)

Pickup the changes from #37009

Release Notes:

- N/A
---
 assets/keymaps/default-windows.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 1c9f128188..d10451ac85 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -644,6 +644,7 @@
       "alt-save": "workspace::SaveAll",
       "ctrl-k s": "workspace::SaveAll",
       "ctrl-k m": "language_selector::Toggle",
+      "ctrl-m ctrl-m": "toolchain::AddToolchain",
       "escape": "workspace::Unfollow",
       "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
       "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
@@ -1075,6 +1076,13 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
+  {
+    "context": "ToolchainSelector",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-shift-a": "toolchain::AddToolchain"
+    }
+  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor)",
     "use_key_equivalents": true,

From 0ef7ee172fd8dd4d0638a9731140cb3a74344918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Sun, 7 Sep 2025 14:45:41 +0800
Subject: [PATCH 659/823] windows: Remove some unused keys from the keymap
 (#37722)

AFAIK, we dont handle these keys on Windows.

Release Notes:

- N/A
---
 assets/keymaps/default-windows.json | 37 -----------------------------
 1 file changed, 37 deletions(-)

diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index d10451ac85..de0d97b52e 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -25,7 +25,6 @@
       "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
       "ctrl-shift-w": "workspace::CloseWindow",
       "shift-escape": "workspace::ToggleZoom",
-      "open": "workspace::Open",
       "ctrl-o": "workspace::Open",
       "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
       "ctrl-shift-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
@@ -68,18 +67,13 @@
       "ctrl-k q": "editor::Rewrap",
       "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
       "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "cut": "editor::Cut",
       "shift-delete": "editor::Cut",
       "ctrl-x": "editor::Cut",
-      "copy": "editor::Copy",
       "ctrl-insert": "editor::Copy",
       "ctrl-c": "editor::Copy",
-      "paste": "editor::Paste",
       "shift-insert": "editor::Paste",
       "ctrl-v": "editor::Paste",
-      "undo": "editor::Undo",
       "ctrl-z": "editor::Undo",
-      "redo": "editor::Redo",
       "ctrl-y": "editor::Redo",
       "ctrl-shift-z": "editor::Redo",
       "up": "editor::MoveUp",
@@ -138,7 +132,6 @@
       "ctrl-shift-enter": "editor::NewlineAbove",
       "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
       "ctrl-k z": "editor::ToggleSoftWrap",
-      "find": "buffer_search::Deploy",
       "ctrl-f": "buffer_search::Deploy",
       "ctrl-h": "buffer_search::DeployReplace",
       "ctrl-shift-.": "assistant::QuoteSelection",
@@ -177,7 +170,6 @@
     "context": "Markdown",
     "use_key_equivalents": true,
     "bindings": {
-      "copy": "markdown::Copy",
       "ctrl-c": "markdown::Copy"
     }
   },
@@ -225,7 +217,6 @@
     "bindings": {
       "ctrl-enter": "assistant::Assist",
       "ctrl-s": "workspace::Save",
-      "save": "workspace::Save",
       "ctrl-shift-,": "assistant::InsertIntoEditor",
       "shift-enter": "assistant::Split",
       "ctrl-r": "assistant::CycleMessageRole",
@@ -272,7 +263,6 @@
     "context": "AgentPanel > Markdown",
     "use_key_equivalents": true,
     "bindings": {
-      "copy": "markdown::CopyAsMarkdown",
       "ctrl-c": "markdown::CopyAsMarkdown"
     }
   },
@@ -367,7 +357,6 @@
     "context": "PromptLibrary",
     "use_key_equivalents": true,
     "bindings": {
-      "new": "rules_library::NewRule",
       "ctrl-n": "rules_library::NewRule",
       "ctrl-shift-s": "rules_library::ToggleDefaultRule"
     }
@@ -381,7 +370,6 @@
       "enter": "search::SelectNextMatch",
       "shift-enter": "search::SelectPreviousMatch",
       "alt-enter": "search::SelectAllMatches",
-      "find": "search::FocusSearch",
       "ctrl-f": "search::FocusSearch",
       "ctrl-h": "search::ToggleReplace",
       "ctrl-l": "search::ToggleSelection"
@@ -408,7 +396,6 @@
     "use_key_equivalents": true,
     "bindings": {
       "escape": "project_search::ToggleFocus",
-      "shift-find": "search::FocusSearch",
       "ctrl-shift-f": "search::FocusSearch",
       "ctrl-shift-h": "search::ToggleReplace",
       "alt-r": "search::ToggleRegex" // vscode
@@ -472,14 +459,12 @@
       "forward": "pane::GoForward",
       "f3": "search::SelectNextMatch",
       "shift-f3": "search::SelectPreviousMatch",
-      "shift-find": "project_search::ToggleFocus",
       "ctrl-shift-f": "project_search::ToggleFocus",
       "shift-alt-h": "search::ToggleReplace",
       "alt-l": "search::ToggleSelection",
       "alt-enter": "search::SelectAllMatches",
       "alt-c": "search::ToggleCaseSensitive",
       "alt-w": "search::ToggleWholeWord",
-      "alt-find": "project_search::ToggleFilters",
       "alt-f": "project_search::ToggleFilters",
       "alt-r": "search::ToggleRegex",
       // "ctrl-shift-alt-x": "search::ToggleRegex",
@@ -579,25 +564,19 @@
     "context": "Workspace",
     "use_key_equivalents": true,
     "bindings": {
-      "alt-open": ["projects::OpenRecent", { "create_new_window": false }],
       // Change the default action on `menu::Confirm` by setting the parameter
       // "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
       "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
-      "shift-alt-open": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
       // Change to open path modal for existing remote connection by setting the parameter
       // "ctrl-shift-alt-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
       "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
       "shift-alt-b": "branches::OpenRecent",
       "shift-alt-enter": "toast::RunAction",
       "ctrl-shift-`": "workspace::NewTerminal",
-      "save": "workspace::Save",
       "ctrl-s": "workspace::Save",
       "ctrl-k ctrl-shift-s": "workspace::SaveWithoutFormat",
-      "shift-save": "workspace::SaveAs",
       "ctrl-shift-s": "workspace::SaveAs",
-      "new": "workspace::NewFile",
       "ctrl-n": "workspace::NewFile",
-      "shift-new": "workspace::NewWindow",
       "ctrl-shift-n": "workspace::NewWindow",
       "ctrl-`": "terminal_panel::Toggle",
       "f10": ["app_menu::OpenApplicationMenu", "Zed"],
@@ -621,7 +600,6 @@
       "shift-alt-0": "workspace::ResetOpenDocksSize",
       "ctrl-shift-alt--": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
       "ctrl-shift-alt-=": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
-      "shift-find": "pane::DeploySearch",
       "ctrl-shift-f": "pane::DeploySearch",
       "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
       "ctrl-shift-t": "pane::ReopenClosedItem",
@@ -641,7 +619,6 @@
       "ctrl-shift-g": "git_panel::ToggleFocus",
       "ctrl-shift-d": "debug_panel::ToggleFocus",
       "ctrl-shift-/": "agent::ToggleFocus",
-      "alt-save": "workspace::SaveAll",
       "ctrl-k s": "workspace::SaveAll",
       "ctrl-k m": "language_selector::Toggle",
       "ctrl-m ctrl-m": "toolchain::AddToolchain",
@@ -849,9 +826,7 @@
     "bindings": {
       "left": "outline_panel::CollapseSelectedEntry",
       "right": "outline_panel::ExpandSelectedEntry",
-      "alt-copy": "outline_panel::CopyPath",
       "shift-alt-c": "outline_panel::CopyPath",
-      "shift-alt-copy": "workspace::CopyRelativePath",
       "ctrl-shift-alt-c": "workspace::CopyRelativePath",
       "ctrl-alt-r": "outline_panel::RevealInFileManager",
       "space": "outline_panel::OpenSelectedEntry",
@@ -867,21 +842,14 @@
     "bindings": {
       "left": "project_panel::CollapseSelectedEntry",
       "right": "project_panel::ExpandSelectedEntry",
-      "new": "project_panel::NewFile",
       "ctrl-n": "project_panel::NewFile",
-      "alt-new": "project_panel::NewDirectory",
       "alt-n": "project_panel::NewDirectory",
-      "cut": "project_panel::Cut",
       "ctrl-x": "project_panel::Cut",
-      "copy": "project_panel::Copy",
       "ctrl-insert": "project_panel::Copy",
       "ctrl-c": "project_panel::Copy",
-      "paste": "project_panel::Paste",
       "shift-insert": "project_panel::Paste",
       "ctrl-v": "project_panel::Paste",
-      "alt-copy": "project_panel::CopyPath",
       "shift-alt-c": "project_panel::CopyPath",
-      "shift-alt-copy": "workspace::CopyRelativePath",
       "ctrl-k ctrl-shift-c": "workspace::CopyRelativePath",
       "enter": "project_panel::Rename",
       "f2": "project_panel::Rename",
@@ -893,7 +861,6 @@
       "ctrl-alt-r": "project_panel::RevealInFileManager",
       "ctrl-shift-enter": "project_panel::OpenWithSystem",
       "alt-d": "project_panel::CompareMarkedFiles",
-      "shift-find": "project_panel::NewSearchInDirectory",
       "ctrl-k ctrl-shift-f": "project_panel::NewSearchInDirectory",
       "shift-down": "menu::SelectNext",
       "shift-up": "menu::SelectPrevious",
@@ -1118,10 +1085,8 @@
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-alt-space": "terminal::ShowCharacterPalette",
-      "copy": "terminal::Copy",
       "ctrl-insert": "terminal::Copy",
       "ctrl-shift-c": "terminal::Copy",
-      "paste": "terminal::Paste",
       "shift-insert": "terminal::Paste",
       "ctrl-shift-v": "terminal::Paste",
       "ctrl-enter": "assistant::InlineAssist",
@@ -1137,7 +1102,6 @@
       "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
       "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
       "ctrl-shift-a": "editor::SelectAll",
-      "find": "buffer_search::Deploy",
       "ctrl-shift-f": "buffer_search::Deploy",
       "ctrl-shift-l": "terminal::Clear",
       "ctrl-shift-w": "pane::CloseActiveItem",
@@ -1218,7 +1182,6 @@
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-f": "search::FocusSearch",
-      "alt-find": "keymap_editor::ToggleKeystrokeSearch",
       "alt-f": "keymap_editor::ToggleKeystrokeSearch",
       "alt-c": "keymap_editor::ToggleConflictFilter",
       "enter": "keymap_editor::EditBinding",

From 76aaf6a8fe1992ec57114633e022c9771756bfaa Mon Sep 17 00:00:00 2001
From: Bruno Taschenbier <139721757+tastenbier@users.noreply.github.com>
Date: Sun, 7 Sep 2025 17:00:58 +0000
Subject: [PATCH 660/823] Fix docs for `tabs.close_position` in `default.json`
 (#37729)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Minor docs fix.
Seems like 0a4ff2f47536c872ebd1ac3e672538a6251832e8 accidentally added
"hidden" to the docs of both – `close_position` and `show_close_button`.

Release Notes:

- N/A

Co-authored-by: tastenbier <>
---
 assets/settings/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 0b5481bd4e..63a11403d3 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -962,7 +962,7 @@
     // Show git status colors in the editor tabs.
     "git_status": false,
     // Position of the close button on the editor tabs.
-    // One of: ["right", "left", "hidden"]
+    // One of: ["right", "left"]
     "close_position": "right",
     // Whether to show the file icon for a tab.
     "file_icons": false,

From 0e33a3afe0f37b1a7a37fec6b068abe9dd984009 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Sun, 7 Sep 2025 11:16:49 -0600
Subject: [PATCH 661/823] zeta: Check whether data collection is allowed for
 recent edit history (#37680)

Also:

* Adds tests for can_collect_data.
* Temporarily removes collection of diagnostics.

Release Notes:

- Edit Prediction: Fixed a bug where requests were marked eligible for
data collection despite the recent edit history in the request involving
files that may not be open source. The requests affected by this bug
will not be used in training data.
---
 Cargo.lock                                    |   1 +
 .../zed/src/zed/edit_prediction_registry.rs   |   7 +-
 crates/zeta/Cargo.toml                        |   1 +
 crates/zeta/src/input_excerpt.rs              |   8 +-
 crates/zeta/src/license_detection.rs          |   1 -
 crates/zeta/src/zeta.rs                       | 900 ++++++++++++------
 crates/zeta_cli/src/main.rs                   |  35 +-
 7 files changed, 604 insertions(+), 349 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4c94f8078..dbcea05ea9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20841,6 +20841,7 @@ dependencies = [
  "language_model",
  "log",
  "menu",
+ "parking_lot",
  "postage",
  "project",
  "rand 0.9.1",
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
index 4f009ccb0b..ae26427fc6 100644
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ b/crates/zed/src/zed/edit_prediction_registry.rs
@@ -8,7 +8,7 @@ use settings::SettingsStore;
 use std::{cell::RefCell, rc::Rc, sync::Arc};
 use supermaven::{Supermaven, SupermavenCompletionProvider};
 use ui::Window;
-use zeta::{ProviderDataCollection, ZetaEditPredictionProvider};
+use zeta::ZetaEditPredictionProvider;
 
 pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
     let editors: Rc<RefCell<HashMap<WeakEntity<Editor>, AnyWindowHandle>>> = Rc::default();
@@ -214,11 +214,8 @@ fn assign_edit_prediction_provider(
                     });
                 }
 
-                let data_collection =
-                    ProviderDataCollection::new(zeta.clone(), singleton_buffer, cx);
-
                 let provider =
-                    cx.new(|_| zeta::ZetaEditPredictionProvider::new(zeta, data_collection));
+                    cx.new(|_| zeta::ZetaEditPredictionProvider::new(zeta, singleton_buffer));
 
                 editor.set_edit_prediction_provider(Some(provider), window, cx);
             }
diff --git a/crates/zeta/Cargo.toml b/crates/zeta/Cargo.toml
index a9c2a7619f..09bcfa7f54 100644
--- a/crates/zeta/Cargo.toml
+++ b/crates/zeta/Cargo.toml
@@ -72,6 +72,7 @@ gpui = { workspace = true, features = ["test-support"] }
 http_client = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
 language = { workspace = true, features = ["test-support"] }
+parking_lot.workspace = true
 reqwest_client = { workspace = true, features = ["test-support"] }
 rpc = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
diff --git a/crates/zeta/src/input_excerpt.rs b/crates/zeta/src/input_excerpt.rs
index dd1bbed1d7..06bff5b1be 100644
--- a/crates/zeta/src/input_excerpt.rs
+++ b/crates/zeta/src/input_excerpt.rs
@@ -1,6 +1,6 @@
 use crate::{
     CURSOR_MARKER, EDITABLE_REGION_END_MARKER, EDITABLE_REGION_START_MARKER, START_OF_FILE_MARKER,
-    tokens_for_bytes,
+    guess_token_count,
 };
 use language::{BufferSnapshot, Point};
 use std::{fmt::Write, ops::Range};
@@ -22,7 +22,7 @@ pub fn excerpt_for_cursor_position(
     let mut remaining_edit_tokens = editable_region_token_limit;
 
     while let Some(parent) = snapshot.syntax_ancestor(scope_range.clone()) {
-        let parent_tokens = tokens_for_bytes(parent.byte_range().len());
+        let parent_tokens = guess_token_count(parent.byte_range().len());
         let parent_point_range = Point::new(
             parent.start_position().row as u32,
             parent.start_position().column as u32,
@@ -99,7 +99,7 @@ fn expand_range(
         if remaining_tokens > 0 && expanded_range.start.row > 0 {
             expanded_range.start.row -= 1;
             let line_tokens =
-                tokens_for_bytes(snapshot.line_len(expanded_range.start.row) as usize);
+                guess_token_count(snapshot.line_len(expanded_range.start.row) as usize);
             remaining_tokens = remaining_tokens.saturating_sub(line_tokens);
             expanded = true;
         }
@@ -107,7 +107,7 @@ fn expand_range(
         if remaining_tokens > 0 && expanded_range.end.row < snapshot.max_point().row {
             expanded_range.end.row += 1;
             expanded_range.end.column = snapshot.line_len(expanded_range.end.row);
-            let line_tokens = tokens_for_bytes(expanded_range.end.column as usize);
+            let line_tokens = guess_token_count(expanded_range.end.column as usize);
             remaining_tokens = remaining_tokens.saturating_sub(line_tokens);
             expanded = true;
         }
diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index 5f207a44e8..e06e1577a6 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -358,7 +358,6 @@ impl LicenseDetectionWatcher {
 
 #[cfg(test)]
 mod tests {
-
     use fs::FakeFs;
     use gpui::TestAppContext;
     use serde_json::json;
diff --git a/crates/zeta/src/zeta.rs b/crates/zeta/src/zeta.rs
index 3851d16755..dfcf98f025 100644
--- a/crates/zeta/src/zeta.rs
+++ b/crates/zeta/src/zeta.rs
@@ -29,7 +29,7 @@ use gpui::{
 use http_client::{AsyncBody, HttpClient, Method, Request, Response};
 use input_excerpt::excerpt_for_cursor_position;
 use language::{
-    Anchor, Buffer, BufferSnapshot, EditPreview, OffsetRangeExt, ToOffset, ToPoint, text_diff,
+    Anchor, Buffer, BufferSnapshot, EditPreview, File, OffsetRangeExt, ToOffset, ToPoint, text_diff,
 };
 use language_model::{LlmApiToken, RefreshLlmTokenListener};
 use project::{Project, ProjectPath};
@@ -65,7 +65,6 @@ const ZED_PREDICT_DATA_COLLECTION_CHOICE: &str = "zed_predict_data_collection_ch
 const MAX_CONTEXT_TOKENS: usize = 150;
 const MAX_REWRITE_TOKENS: usize = 350;
 const MAX_EVENT_TOKENS: usize = 500;
-const MAX_DIAGNOSTIC_GROUPS: usize = 10;
 
 /// Maximum number of events to track.
 const MAX_EVENT_COUNT: usize = 16;
@@ -216,7 +215,7 @@ pub struct Zeta {
     client: Arc<Client>,
     shown_completions: VecDeque<EditPrediction>,
     rated_completions: HashSet<EditPredictionId>,
-    data_collection_choice: Entity<DataCollectionChoice>,
+    data_collection_choice: DataCollectionChoice,
     llm_token: LlmApiToken,
     _llm_token_subscription: Subscription,
     /// Whether an update to a newer version of Zed is required to continue using Zeta.
@@ -271,10 +270,7 @@ impl Zeta {
 
     fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
         let refresh_llm_token_listener = RefreshLlmTokenListener::global(cx);
-
-        let data_collection_choice = Self::load_data_collection_choices();
-        let data_collection_choice = cx.new(|_| data_collection_choice);
-
+        let data_collection_choice = Self::load_data_collection_choice();
         Self {
             projects: HashMap::default(),
             client,
@@ -408,7 +404,6 @@ impl Zeta {
         project: &Entity<Project>,
         buffer: &Entity<Buffer>,
         cursor: language::Anchor,
-        can_collect_data: bool,
         cx: &mut Context<Self>,
         perform_predict_edits: F,
     ) -> Task<Result<Option<EditPrediction>>>
@@ -422,15 +417,25 @@ impl Zeta {
         let buffer_snapshotted_at = Instant::now();
         let snapshot = self.report_changes_for_buffer(&buffer, project, cx);
         let zeta = cx.entity();
-        let events = self.get_or_init_zeta_project(project, cx).events.clone();
         let client = self.client.clone();
         let llm_token = self.llm_token.clone();
         let app_version = AppVersion::global(cx);
 
-        let git_info = if let (true, Some(file)) = (can_collect_data, snapshot.file()) {
-            git_info_for_file(project, &ProjectPath::from_file(file.as_ref(), cx), cx)
+        let zeta_project = self.get_or_init_zeta_project(project, cx);
+        let mut events = Vec::with_capacity(zeta_project.events.len());
+        events.extend(zeta_project.events.iter().cloned());
+        let events = Arc::new(events);
+
+        let (git_info, can_collect_file) = if let Some(file) = snapshot.file() {
+            let can_collect_file = self.can_collect_file(file, cx);
+            let git_info = if can_collect_file {
+                git_info_for_file(project, &ProjectPath::from_file(file.as_ref(), cx), cx)
+            } else {
+                None
+            };
+            (git_info, can_collect_file)
         } else {
-            None
+            (None, false)
         };
 
         let full_path: Arc<Path> = snapshot
@@ -440,25 +445,35 @@ impl Zeta {
         let full_path_str = full_path.to_string_lossy().to_string();
         let cursor_point = cursor.to_point(&snapshot);
         let cursor_offset = cursor_point.to_offset(&snapshot);
-        let make_events_prompt = move || prompt_for_events(&events, MAX_EVENT_TOKENS);
+        let prompt_for_events = {
+            let events = events.clone();
+            move || prompt_for_events_impl(&events, MAX_EVENT_TOKENS)
+        };
         let gather_task = gather_context(
-            project,
             full_path_str,
             &snapshot,
             cursor_point,
-            make_events_prompt,
-            can_collect_data,
-            git_info,
+            prompt_for_events,
             cx,
         );
 
         cx.spawn(async move |this, cx| {
             let GatherContextOutput {
-                body,
+                mut body,
                 editable_range,
+                included_events_count,
             } = gather_task.await?;
             let done_gathering_context_at = Instant::now();
 
+            let included_events = &events[events.len() - included_events_count..events.len()];
+            body.can_collect_data = can_collect_file
+                && this
+                    .read_with(cx, |this, cx| this.can_collect_events(included_events, cx))
+                    .unwrap_or(false);
+            if body.can_collect_data {
+                body.git_info = git_info;
+            }
+
             log::debug!(
                 "Events:\n{}\nExcerpt:\n{:?}",
                 body.input_events,
@@ -563,10 +578,8 @@ impl Zeta {
         response: PredictEditsResponse,
         cx: &mut Context<Self>,
     ) -> Task<Result<Option<EditPrediction>>> {
-        use std::future::ready;
-
-        self.request_completion_impl(project, buffer, position, false, cx, |_params| {
-            ready(Ok((response, None)))
+        self.request_completion_impl(project, buffer, position, cx, |_params| {
+            std::future::ready(Ok((response, None)))
         })
     }
 
@@ -575,17 +588,9 @@ impl Zeta {
         project: &Entity<Project>,
         buffer: &Entity<Buffer>,
         position: language::Anchor,
-        can_collect_data: bool,
         cx: &mut Context<Self>,
     ) -> Task<Result<Option<EditPrediction>>> {
-        self.request_completion_impl(
-            project,
-            buffer,
-            position,
-            can_collect_data,
-            cx,
-            Self::perform_predict_edits,
-        )
+        self.request_completion_impl(project, buffer, position, cx, Self::perform_predict_edits)
     }
 
     pub fn perform_predict_edits(
@@ -954,7 +959,58 @@ impl Zeta {
         new_snapshot
     }
 
-    fn load_data_collection_choices() -> DataCollectionChoice {
+    fn can_collect_file(&self, file: &Arc<dyn File>, cx: &App) -> bool {
+        self.data_collection_choice.is_enabled() && self.is_file_open_source(file, cx)
+    }
+
+    fn can_collect_events(&self, events: &[Event], cx: &App) -> bool {
+        if !self.data_collection_choice.is_enabled() {
+            return false;
+        }
+        let mut last_checked_file = None;
+        for event in events {
+            match event {
+                Event::BufferChange {
+                    old_snapshot,
+                    new_snapshot,
+                    ..
+                } => {
+                    if let Some(old_file) = old_snapshot.file()
+                        && let Some(new_file) = new_snapshot.file()
+                    {
+                        if let Some(last_checked_file) = last_checked_file
+                            && Arc::ptr_eq(last_checked_file, old_file)
+                            && Arc::ptr_eq(last_checked_file, new_file)
+                        {
+                            continue;
+                        }
+                        if !self.can_collect_file(old_file, cx) {
+                            return false;
+                        }
+                        if !Arc::ptr_eq(old_file, new_file) && !self.can_collect_file(new_file, cx)
+                        {
+                            return false;
+                        }
+                        last_checked_file = Some(new_file);
+                    } else {
+                        return false;
+                    }
+                }
+            }
+        }
+        true
+    }
+
+    fn is_file_open_source(&self, file: &Arc<dyn File>, cx: &App) -> bool {
+        if !file.is_local() || file.is_private() {
+            return false;
+        }
+        self.license_detection_watchers
+            .get(&file.worktree_id(cx))
+            .is_some_and(|watcher| watcher.is_project_open_source())
+    }
+
+    fn load_data_collection_choice() -> DataCollectionChoice {
         let choice = KEY_VALUE_STORE
             .read_kvp(ZED_PREDICT_DATA_COLLECTION_CHOICE)
             .log_err()
@@ -970,6 +1026,17 @@ impl Zeta {
             None => DataCollectionChoice::NotAnswered,
         }
     }
+
+    fn toggle_data_collection_choice(&mut self, cx: &mut Context<Self>) {
+        self.data_collection_choice = self.data_collection_choice.toggle();
+        let new_choice = self.data_collection_choice;
+        db::write_and_log(cx, move || {
+            KEY_VALUE_STORE.write_kvp(
+                ZED_PREDICT_DATA_COLLECTION_CHOICE.into(),
+                new_choice.is_enabled().to_string(),
+            )
+        });
+    }
 }
 
 pub struct PerformPredictEditsParams {
@@ -1026,48 +1093,19 @@ fn git_info_for_file(
 pub struct GatherContextOutput {
     pub body: PredictEditsBody,
     pub editable_range: Range<usize>,
+    pub included_events_count: usize,
 }
 
 pub fn gather_context(
-    project: &Entity<Project>,
     full_path_str: String,
     snapshot: &BufferSnapshot,
     cursor_point: language::Point,
-    make_events_prompt: impl FnOnce() -> String + Send + 'static,
-    can_collect_data: bool,
-    git_info: Option<PredictEditsGitInfo>,
+    prompt_for_events: impl FnOnce() -> (String, usize) + Send + 'static,
     cx: &App,
 ) -> Task<Result<GatherContextOutput>> {
-    let local_lsp_store = project.read(cx).lsp_store().read(cx).as_local();
-    let diagnostic_groups: Vec<(String, serde_json::Value)> =
-        if can_collect_data && let Some(local_lsp_store) = local_lsp_store {
-            snapshot
-                .diagnostic_groups(None)
-                .into_iter()
-                .filter_map(|(language_server_id, diagnostic_group)| {
-                    let language_server =
-                        local_lsp_store.running_language_server_for_id(language_server_id)?;
-                    let diagnostic_group = diagnostic_group.resolve::<usize>(snapshot);
-                    let language_server_name = language_server.name().to_string();
-                    let serialized = serde_json::to_value(diagnostic_group).unwrap();
-                    Some((language_server_name, serialized))
-                })
-                .collect::<Vec<_>>()
-        } else {
-            Vec::new()
-        };
-
     cx.background_spawn({
         let snapshot = snapshot.clone();
         async move {
-            let diagnostic_groups = if diagnostic_groups.is_empty()
-                || diagnostic_groups.len() >= MAX_DIAGNOSTIC_GROUPS
-            {
-                None
-            } else {
-                Some(diagnostic_groups)
-            };
-
             let input_excerpt = excerpt_for_cursor_position(
                 cursor_point,
                 &full_path_str,
@@ -1075,15 +1113,15 @@ pub fn gather_context(
                 MAX_REWRITE_TOKENS,
                 MAX_CONTEXT_TOKENS,
             );
-            let input_events = make_events_prompt();
+            let (input_events, included_events_count) = prompt_for_events();
             let editable_range = input_excerpt.editable_range.to_offset(&snapshot);
 
             let body = PredictEditsBody {
                 input_events,
                 input_excerpt: input_excerpt.prompt,
-                can_collect_data,
-                diagnostic_groups,
-                git_info,
+                can_collect_data: false,
+                diagnostic_groups: None,
+                git_info: None,
                 outline: None,
                 speculated_output: None,
             };
@@ -1091,18 +1129,19 @@ pub fn gather_context(
             Ok(GatherContextOutput {
                 body,
                 editable_range,
+                included_events_count,
             })
         }
     })
 }
 
-fn prompt_for_events(events: &VecDeque<Event>, mut remaining_tokens: usize) -> String {
+fn prompt_for_events_impl(events: &[Event], mut remaining_tokens: usize) -> (String, usize) {
     let mut result = String::new();
-    for event in events.iter().rev() {
+    for (ix, event) in events.iter().rev().enumerate() {
         let event_string = event.to_prompt();
-        let event_tokens = tokens_for_bytes(event_string.len());
+        let event_tokens = guess_token_count(event_string.len());
         if event_tokens > remaining_tokens {
-            break;
+            return (result, ix);
         }
 
         if !result.is_empty() {
@@ -1111,7 +1150,7 @@ fn prompt_for_events(events: &VecDeque<Event>, mut remaining_tokens: usize) -> S
         result.insert_str(0, &event_string);
         remaining_tokens -= event_tokens;
     }
-    result
+    return (result, events.len());
 }
 
 struct RegisteredBuffer {
@@ -1222,6 +1261,7 @@ impl DataCollectionChoice {
         }
     }
 
+    #[must_use]
     pub fn toggle(&self) -> DataCollectionChoice {
         match self {
             Self::Enabled => Self::Disabled,
@@ -1240,79 +1280,6 @@ impl From<bool> for DataCollectionChoice {
     }
 }
 
-pub struct ProviderDataCollection {
-    /// When set to None, data collection is not possible in the provider buffer
-    choice: Option<Entity<DataCollectionChoice>>,
-    license_detection_watcher: Option<Rc<LicenseDetectionWatcher>>,
-}
-
-impl ProviderDataCollection {
-    pub fn new(zeta: Entity<Zeta>, buffer: Option<Entity<Buffer>>, cx: &mut App) -> Self {
-        let choice_and_watcher = buffer.and_then(|buffer| {
-            let file = buffer.read(cx).file()?;
-
-            if !file.is_local() || file.is_private() {
-                return None;
-            }
-
-            let zeta = zeta.read(cx);
-            let choice = zeta.data_collection_choice.clone();
-
-            let license_detection_watcher = zeta
-                .license_detection_watchers
-                .get(&file.worktree_id(cx))
-                .cloned()?;
-
-            Some((choice, license_detection_watcher))
-        });
-
-        if let Some((choice, watcher)) = choice_and_watcher {
-            ProviderDataCollection {
-                choice: Some(choice),
-                license_detection_watcher: Some(watcher),
-            }
-        } else {
-            ProviderDataCollection {
-                choice: None,
-                license_detection_watcher: None,
-            }
-        }
-    }
-
-    pub fn can_collect_data(&self, cx: &App) -> bool {
-        self.is_data_collection_enabled(cx) && self.is_project_open_source()
-    }
-
-    pub fn is_data_collection_enabled(&self, cx: &App) -> bool {
-        self.choice
-            .as_ref()
-            .is_some_and(|choice| choice.read(cx).is_enabled())
-    }
-
-    fn is_project_open_source(&self) -> bool {
-        self.license_detection_watcher
-            .as_ref()
-            .is_some_and(|watcher| watcher.is_project_open_source())
-    }
-
-    pub fn toggle(&mut self, cx: &mut App) {
-        if let Some(choice) = self.choice.as_mut() {
-            let new_choice = choice.update(cx, |choice, _cx| {
-                let new_choice = choice.toggle();
-                *choice = new_choice;
-                new_choice
-            });
-
-            db::write_and_log(cx, move || {
-                KEY_VALUE_STORE.write_kvp(
-                    ZED_PREDICT_DATA_COLLECTION_CHOICE.into(),
-                    new_choice.is_enabled().to_string(),
-                )
-            });
-        }
-    }
-}
-
 async fn llm_token_retry(
     llm_token: &LlmApiToken,
     client: &Arc<Client>,
@@ -1343,24 +1310,23 @@ async fn llm_token_retry(
 
 pub struct ZetaEditPredictionProvider {
     zeta: Entity<Zeta>,
+    singleton_buffer: Option<Entity<Buffer>>,
     pending_completions: ArrayVec<PendingCompletion, 2>,
     next_pending_completion_id: usize,
     current_completion: Option<CurrentEditPrediction>,
-    /// None if this is entirely disabled for this provider
-    provider_data_collection: ProviderDataCollection,
     last_request_timestamp: Instant,
 }
 
 impl ZetaEditPredictionProvider {
     pub const THROTTLE_TIMEOUT: Duration = Duration::from_millis(300);
 
-    pub fn new(zeta: Entity<Zeta>, provider_data_collection: ProviderDataCollection) -> Self {
+    pub fn new(zeta: Entity<Zeta>, singleton_buffer: Option<Entity<Buffer>>) -> Self {
         Self {
             zeta,
+            singleton_buffer,
             pending_completions: ArrayVec::new(),
             next_pending_completion_id: 0,
             current_completion: None,
-            provider_data_collection,
             last_request_timestamp: Instant::now(),
         }
     }
@@ -1384,21 +1350,29 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
     }
 
     fn data_collection_state(&self, cx: &App) -> DataCollectionState {
-        let is_project_open_source = self.provider_data_collection.is_project_open_source();
-
-        if self.provider_data_collection.is_data_collection_enabled(cx) {
-            DataCollectionState::Enabled {
-                is_project_open_source,
+        if let Some(buffer) = &self.singleton_buffer
+            && let Some(file) = buffer.read(cx).file()
+        {
+            let is_project_open_source = self.zeta.read(cx).is_file_open_source(file, cx);
+            if self.zeta.read(cx).data_collection_choice.is_enabled() {
+                DataCollectionState::Enabled {
+                    is_project_open_source,
+                }
+            } else {
+                DataCollectionState::Disabled {
+                    is_project_open_source,
+                }
             }
         } else {
-            DataCollectionState::Disabled {
-                is_project_open_source,
-            }
+            return DataCollectionState::Disabled {
+                is_project_open_source: false,
+            };
         }
     }
 
     fn toggle_data_collection(&mut self, cx: &mut App) {
-        self.provider_data_collection.toggle(cx);
+        self.zeta
+            .update(cx, |zeta, cx| zeta.toggle_data_collection_choice(cx));
     }
 
     fn usage(&self, cx: &App) -> Option<EditPredictionUsage> {
@@ -1456,7 +1430,6 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
 
         let pending_completion_id = self.next_pending_completion_id;
         self.next_pending_completion_id += 1;
-        let can_collect_data = self.provider_data_collection.can_collect_data(cx);
         let last_request_timestamp = self.last_request_timestamp;
 
         let task = cx.spawn(async move |this, cx| {
@@ -1469,7 +1442,7 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
             let completion_request = this.update(cx, |this, cx| {
                 this.last_request_timestamp = Instant::now();
                 this.zeta.update(cx, |zeta, cx| {
-                    zeta.request_completion(&project, &buffer, position, can_collect_data, cx)
+                    zeta.request_completion(&project, &buffer, position, cx)
                 })
             });
 
@@ -1638,10 +1611,11 @@ impl edit_prediction::EditPredictionProvider for ZetaEditPredictionProvider {
     }
 }
 
-fn tokens_for_bytes(bytes: usize) -> usize {
-    /// Typical number of string bytes per token for the purposes of limiting model input. This is
-    /// intentionally low to err on the side of underestimating limits.
-    const BYTES_PER_TOKEN_GUESS: usize = 3;
+/// Typical number of string bytes per token for the purposes of limiting model input. This is
+/// intentionally low to err on the side of underestimating limits.
+const BYTES_PER_TOKEN_GUESS: usize = 3;
+
+fn guess_token_count(bytes: usize) -> usize {
     bytes / BYTES_PER_TOKEN_GUESS
 }
 
@@ -1654,11 +1628,15 @@ mod tests {
     use http_client::FakeHttpClient;
     use indoc::indoc;
     use language::Point;
+    use parking_lot::Mutex;
+    use serde_json::json;
     use settings::SettingsStore;
     use util::path;
 
     use super::*;
 
+    const BSD_0_TXT: &str = include_str!("../license_examples/0bsd.txt");
+
     #[gpui::test]
     async fn test_edit_prediction_basic_interpolation(cx: &mut TestAppContext) {
         let buffer = cx.new(|cx| Buffer::local("Lorem ipsum dolor", cx));
@@ -1778,77 +1756,65 @@ mod tests {
 
     #[gpui::test]
     async fn test_clean_up_diff(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            client::init_settings(cx);
-            Project::init_settings(cx);
-        });
+        init_test(cx);
 
-        let edits = edits_for_prediction(
+        assert_eq!(
+            apply_edit_prediction(
+                indoc! {"
+                    fn main() {
+                        let word_1 = \"lorem\";
+                        let range = word.len()..word.len();
+                    }
+                "},
+                indoc! {"
+                    <|editable_region_start|>
+                    fn main() {
+                        let word_1 = \"lorem\";
+                        let range = word_1.len()..word_1.len();
+                    }
+
+                    <|editable_region_end|>
+                "},
+                cx,
+            )
+            .await,
             indoc! {"
-                fn main() {
-                    let word_1 = \"lorem\";
-                    let range = word.len()..word.len();
-                }
-            "},
-            indoc! {"
-                <|editable_region_start|>
                 fn main() {
                     let word_1 = \"lorem\";
                     let range = word_1.len()..word_1.len();
                 }
-
-                <|editable_region_end|>
             "},
-            cx,
-        )
-        .await;
-        assert_eq!(
-            edits,
-            [
-                (Point::new(2, 20)..Point::new(2, 20), "_1".to_string()),
-                (Point::new(2, 32)..Point::new(2, 32), "_1".to_string()),
-            ]
         );
 
-        let edits = edits_for_prediction(
+        assert_eq!(
+            apply_edit_prediction(
+                indoc! {"
+                    fn main() {
+                        let story = \"the quick\"
+                    }
+                "},
+                indoc! {"
+                    <|editable_region_start|>
+                    fn main() {
+                        let story = \"the quick brown fox jumps over the lazy dog\";
+                    }
+
+                    <|editable_region_end|>
+                "},
+                cx,
+            )
+            .await,
             indoc! {"
-                fn main() {
-                    let story = \"the quick\"
-                }
-            "},
-            indoc! {"
-                <|editable_region_start|>
                 fn main() {
                     let story = \"the quick brown fox jumps over the lazy dog\";
                 }
-
-                <|editable_region_end|>
             "},
-            cx,
-        )
-        .await;
-        assert_eq!(
-            edits,
-            [
-                (
-                    Point::new(1, 26)..Point::new(1, 26),
-                    " brown fox jumps over the lazy dog".to_string()
-                ),
-                (Point::new(1, 27)..Point::new(1, 27), ";".to_string()),
-            ]
         );
     }
 
     #[gpui::test]
     async fn test_edit_prediction_end_of_buffer(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            client::init_settings(cx);
-            Project::init_settings(cx);
-        });
+        init_test(cx);
 
         let buffer_content = "lorem\n";
         let completion_response = indoc! {"
@@ -1860,98 +1826,404 @@ mod tests {
             <|editable_region_end|>
             ```"};
 
-        let http_client = FakeHttpClient::create(move |req| async move {
-            match (req.method(), req.uri().path()) {
-                (&Method::POST, "/client/llm_tokens") => Ok(http_client::Response::builder()
-                    .status(200)
-                    .body(
-                        serde_json::to_string(&CreateLlmTokenResponse {
-                            token: LlmToken("the-llm-token".to_string()),
-                        })
-                        .unwrap()
-                        .into(),
-                    )
-                    .unwrap()),
-                (&Method::POST, "/predict_edits/v2") => Ok(http_client::Response::builder()
-                    .status(200)
-                    .body(
-                        serde_json::to_string(&PredictEditsResponse {
-                            request_id: Uuid::parse_str("7e86480f-3536-4d2c-9334-8213e3445d45")
-                                .unwrap(),
-                            output_excerpt: completion_response.to_string(),
-                        })
-                        .unwrap()
-                        .into(),
-                    )
-                    .unwrap()),
-                _ => Ok(http_client::Response::builder()
-                    .status(404)
-                    .body("Not Found".into())
-                    .unwrap()),
-            }
-        });
-
-        let client = cx.update(|cx| Client::new(Arc::new(FakeSystemClock::new()), http_client, cx));
-        cx.update(|cx| {
-            RefreshLlmTokenListener::register(client.clone(), cx);
-        });
-        // Construct the fake server to authenticate.
-        let _server = FakeServer::for_client(42, &client, cx).await;
-        let fs = project::FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
-        let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
-
-        let zeta = cx.new(|cx| Zeta::new(client, project.read(cx).user_store(), cx));
-        let completion_task = zeta.update(cx, |zeta, cx| {
-            zeta.request_completion(&project, &buffer, cursor, false, cx)
-        });
-
-        let completion = completion_task.await.unwrap().unwrap();
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(completion.edits.iter().cloned(), None, cx)
-        });
         assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
+            apply_edit_prediction(buffer_content, completion_response, cx).await,
             "lorem\nipsum"
         );
     }
 
-    async fn edits_for_prediction(
+    #[gpui::test]
+    async fn test_can_collect_data(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/project"), json!({ "LICENSE": BSD_0_TXT }))
+            .await;
+
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/project/src/main.rs"), cx)
+            })
+            .await
+            .unwrap();
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            true
+        );
+
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Disabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+    }
+
+    #[gpui::test]
+    async fn test_no_data_collection_for_remote_file(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        let project = Project::test(fs.clone(), [], cx).await;
+
+        let buffer = cx.new(|_cx| {
+            Buffer::remote(
+                language::BufferId::new(1).unwrap(),
+                1,
+                language::Capability::ReadWrite,
+                "fn main() {\n    println!(\"Hello\");\n}",
+            )
+        });
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+    }
+
+    #[gpui::test]
+    async fn test_no_data_collection_for_private_file(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/project"),
+            json!({
+                "LICENSE": BSD_0_TXT,
+                ".env": "SECRET_KEY=secret"
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer("/project/.env", cx)
+            })
+            .await
+            .unwrap();
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+    }
+
+    #[gpui::test]
+    async fn test_no_data_collection_for_untitled_buffer(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        let project = Project::test(fs.clone(), [], cx).await;
+        let buffer = cx.new(|cx| Buffer::local("", cx));
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+    }
+
+    #[gpui::test]
+    async fn test_no_data_collection_when_closed_source(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/project"), json!({ "main.rs": "fn main() {}" }))
+            .await;
+
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer("/project/main.rs", cx)
+            })
+            .await
+            .unwrap();
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+    }
+
+    #[gpui::test]
+    async fn test_data_collection_status_changes_on_move(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/open_source_worktree"),
+            json!({ "LICENSE": BSD_0_TXT, "main.rs": "" }),
+        )
+        .await;
+        fs.insert_tree(path!("/closed_source_worktree"), json!({ "main.rs": "" }))
+            .await;
+
+        let project = Project::test(
+            fs.clone(),
+            [
+                path!("/open_source_worktree").as_ref(),
+                path!("/closed_source_worktree").as_ref(),
+            ],
+            cx,
+        )
+        .await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/open_source_worktree/main.rs"), cx)
+            })
+            .await
+            .unwrap();
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            true
+        );
+
+        let closed_source_file = project
+            .update(cx, |project, cx| {
+                let worktree2 = project
+                    .worktree_for_root_name("closed_source_worktree", cx)
+                    .unwrap();
+                worktree2.update(cx, |worktree2, cx| {
+                    worktree2.load_file(Path::new("main.rs"), cx)
+                })
+            })
+            .await
+            .unwrap()
+            .file;
+
+        buffer.update(cx, |buffer, cx| {
+            buffer.file_updated(closed_source_file, cx);
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+    }
+
+    #[gpui::test]
+    async fn test_no_data_collection_for_events_in_uncollectable_buffers(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = project::FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/worktree1"),
+            json!({ "LICENSE": BSD_0_TXT, "main.rs": "", "other.rs": "" }),
+        )
+        .await;
+        fs.insert_tree(path!("/worktree2"), json!({ "private.rs": "" }))
+            .await;
+
+        let project = Project::test(
+            fs.clone(),
+            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
+            cx,
+        )
+        .await;
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/worktree1/main.rs"), cx)
+            })
+            .await
+            .unwrap();
+        let private_buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer(path!("/worktree2/file.rs"), cx)
+            })
+            .await
+            .unwrap();
+
+        let (zeta, captured_request, _) = make_test_zeta(&project, cx).await;
+        zeta.update(cx, |zeta, _cx| {
+            zeta.data_collection_choice = DataCollectionChoice::Enabled
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            true
+        );
+
+        // this has a side effect of registering the buffer to watch for edits
+        run_edit_prediction(&private_buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+
+        private_buffer.update(cx, |private_buffer, cx| {
+            private_buffer.edit([(0..0, "An edit for the history!")], None, cx);
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            false
+        );
+
+        // make an edit that uses too many bytes, causing private_buffer edit to not be able to be
+        // included
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit(
+                [(0..0, " ".repeat(MAX_EVENT_TOKENS * BYTES_PER_TOKEN_GUESS))],
+                None,
+                cx,
+            );
+        });
+
+        run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        assert_eq!(
+            captured_request.lock().clone().unwrap().can_collect_data,
+            true
+        );
+    }
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            language::init(cx);
+            client::init_settings(cx);
+            Project::init_settings(cx);
+        });
+    }
+
+    async fn apply_edit_prediction(
         buffer_content: &str,
         completion_response: &str,
         cx: &mut TestAppContext,
-    ) -> Vec<(Range<Point>, String)> {
-        let completion_response = completion_response.to_string();
-        let http_client = FakeHttpClient::create(move |req| {
-            let completion = completion_response.clone();
-            async move {
-                match (req.method(), req.uri().path()) {
-                    (&Method::POST, "/client/llm_tokens") => Ok(http_client::Response::builder()
-                        .status(200)
-                        .body(
-                            serde_json::to_string(&CreateLlmTokenResponse {
-                                token: LlmToken("the-llm-token".to_string()),
-                            })
-                            .unwrap()
-                            .into(),
-                        )
-                        .unwrap()),
-                    (&Method::POST, "/predict_edits/v2") => Ok(http_client::Response::builder()
-                        .status(200)
-                        .body(
-                            serde_json::to_string(&PredictEditsResponse {
-                                request_id: Uuid::new_v4(),
-                                output_excerpt: completion,
-                            })
-                            .unwrap()
-                            .into(),
-                        )
-                        .unwrap()),
-                    _ => Ok(http_client::Response::builder()
-                        .status(404)
-                        .body("Not Found".into())
-                        .unwrap()),
+    ) -> String {
+        let fs = project::FakeFs::new(cx.executor());
+        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+        let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
+        let (zeta, _, response) = make_test_zeta(&project, cx).await;
+        *response.lock() = completion_response.to_string();
+        let edit_prediction = run_edit_prediction(&buffer, &project, &zeta, cx).await;
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit(edit_prediction.edits.iter().cloned(), None, cx)
+        });
+        buffer.read_with(cx, |buffer, _| buffer.text())
+    }
+
+    async fn run_edit_prediction(
+        buffer: &Entity<Buffer>,
+        project: &Entity<Project>,
+        zeta: &Entity<Zeta>,
+        cx: &mut TestAppContext,
+    ) -> EditPrediction {
+        let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
+        zeta.update(cx, |zeta, cx| zeta.register_buffer(buffer, &project, cx));
+        cx.background_executor.run_until_parked();
+        let completion_task = zeta.update(cx, |zeta, cx| {
+            zeta.request_completion(&project, buffer, cursor, cx)
+        });
+        completion_task.await.unwrap().unwrap()
+    }
+
+    async fn make_test_zeta(
+        project: &Entity<Project>,
+        cx: &mut TestAppContext,
+    ) -> (
+        Entity<Zeta>,
+        Arc<Mutex<Option<PredictEditsBody>>>,
+        Arc<Mutex<String>>,
+    ) {
+        let default_response = indoc! {"
+            ```main.rs
+            <|start_of_file|>
+            <|editable_region_start|>
+            hello world
+            <|editable_region_end|>
+            ```"
+        };
+        let captured_request: Arc<Mutex<Option<PredictEditsBody>>> = Arc::new(Mutex::new(None));
+        let completion_response: Arc<Mutex<String>> =
+            Arc::new(Mutex::new(default_response.to_string()));
+        let http_client = FakeHttpClient::create({
+            let captured_request = captured_request.clone();
+            let completion_response = completion_response.clone();
+            move |req| {
+                let captured_request = captured_request.clone();
+                let completion_response = completion_response.clone();
+                async move {
+                    match (req.method(), req.uri().path()) {
+                        (&Method::POST, "/client/llm_tokens") => {
+                            Ok(http_client::Response::builder()
+                                .status(200)
+                                .body(
+                                    serde_json::to_string(&CreateLlmTokenResponse {
+                                        token: LlmToken("the-llm-token".to_string()),
+                                    })
+                                    .unwrap()
+                                    .into(),
+                                )
+                                .unwrap())
+                        }
+                        (&Method::POST, "/predict_edits/v2") => {
+                            let mut request_body = String::new();
+                            req.into_body().read_to_string(&mut request_body).await?;
+                            *captured_request.lock() =
+                                Some(serde_json::from_str(&request_body).unwrap());
+                            Ok(http_client::Response::builder()
+                                .status(200)
+                                .body(
+                                    serde_json::to_string(&PredictEditsResponse {
+                                        request_id: Uuid::new_v4(),
+                                        output_excerpt: completion_response.lock().clone(),
+                                    })
+                                    .unwrap()
+                                    .into(),
+                                )
+                                .unwrap())
+                        }
+                        _ => Ok(http_client::Response::builder()
+                            .status(404)
+                            .body("Not Found".into())
+                            .unwrap()),
+                    }
                 }
             }
         });
@@ -1960,25 +2232,23 @@ mod tests {
         cx.update(|cx| {
             RefreshLlmTokenListener::register(client.clone(), cx);
         });
-        // Construct the fake server to authenticate.
         let _server = FakeServer::for_client(42, &client, cx).await;
-        let fs = project::FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
-        let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-        let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
 
-        let zeta = cx.new(|cx| Zeta::new(client, project.read(cx).user_store(), cx));
-        let completion_task = zeta.update(cx, |zeta, cx| {
-            zeta.request_completion(&project, &buffer, cursor, false, cx)
+        let zeta = cx.new(|cx| {
+            let mut zeta = Zeta::new(client, project.read(cx).user_store(), cx);
+
+            let worktrees = project.read(cx).worktrees(cx).collect::<Vec<_>>();
+            for worktree in worktrees {
+                let worktree_id = worktree.read(cx).id();
+                zeta.license_detection_watchers
+                    .entry(worktree_id)
+                    .or_insert_with(|| Rc::new(LicenseDetectionWatcher::new(&worktree, cx)));
+            }
+
+            zeta
         });
 
-        let completion = completion_task.await.unwrap().unwrap();
-        completion
-            .edits
-            .iter()
-            .map(|(old_range, new_text)| (old_range.to_point(&snapshot), new_text.clone()))
-            .collect::<Vec<_>>()
+        (zeta, captured_request, completion_response)
     }
 
     fn to_completion_edits(
diff --git a/crates/zeta_cli/src/main.rs b/crates/zeta_cli/src/main.rs
index e66eeed809..e7cec26b19 100644
--- a/crates/zeta_cli/src/main.rs
+++ b/crates/zeta_cli/src/main.rs
@@ -189,30 +189,17 @@ async fn get_context(
         Some(events) => events.read_to_string().await?,
         None => String::new(),
     };
-    // Enable gathering extra data not currently needed for edit predictions
-    let can_collect_data = true;
-    let git_info = None;
-    let mut gather_context_output = cx
-        .update(|cx| {
-            gather_context(
-                &project,
-                full_path_str,
-                &snapshot,
-                clipped_cursor,
-                move || events,
-                can_collect_data,
-                git_info,
-                cx,
-            )
-        })?
-        .await;
-
-    // Disable data collection for these requests, as this is currently just used for evals
-    if let Ok(gather_context_output) = gather_context_output.as_mut() {
-        gather_context_output.body.can_collect_data = false
-    }
-
-    gather_context_output
+    let prompt_for_events = move || (events, 0);
+    cx.update(|cx| {
+        gather_context(
+            full_path_str,
+            &snapshot,
+            clipped_cursor,
+            prompt_for_events,
+            cx,
+        )
+    })?
+    .await
 }
 
 pub async fn open_buffer_with_language_server(

From 69bdef38ecef673609e1acf1e7a6d79f5d4d44d3 Mon Sep 17 00:00:00 2001
From: Liu Jinyi <kkkzoz@qq.com>
Date: Mon, 8 Sep 2025 02:33:17 +0800
Subject: [PATCH 662/823] editor: Fix inconsistent search behavior for
 untitled/temporary tabs (#37086)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #37597

Release Notes:

- N/A

---


## Problem

When using "Tab Switcher: Toggle All", temporary files (untitled buffers
without associated file paths) cannot be searched by their displayed
content. This creates an inconsistent user experience where:

- **UI Display**: Shows dynamic titles based on the first line of
content (up to 40 characters)
- **Search Text**: Only searches for the static text "untitled"

### Example
- A temporary file containing `Hello World` is displayed as "Hello
World" in the tab
- However, searching for "Hello" in Tab Switcher returns no results
- Only searching for "untitled" will find this temporary file

## Root Cause

The issue stems from inconsistent title generation logic between display
and search:

1. **Display Title** (`items.rs:724`): Uses `self.title(cx)` →
`MultiBuffer::title()` → `buffer_content_title()`
- Returns the first line of content (max 40 chars) for temporary files

2. **Search Text** (`items.rs:650-656`): Uses `tab_content_text()`
method
   - Returns hardcoded "untitled" for files without paths

## Solution

Modified the `tab_content_text()` method in `crates/editor/src/items.rs`
to use the same logic as the displayed title for consistency:

```rust
fn tab_content_text(&self, detail: usize, cx: &App) -> SharedString {
    if let Some(path) = path_for_buffer(&self.buffer, detail, true, cx) {
        path.to_string_lossy().to_string().into()
    } else {
        // Use the same logic as the displayed title for consistency
        self.buffer.read(cx).title(cx).to_string().into()
    }
}
```
---
 crates/editor/src/items.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 8a07939cf4..48c3a8a41a 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -651,7 +651,8 @@ impl Item for Editor {
         if let Some(path) = path_for_buffer(&self.buffer, detail, true, cx) {
             path.to_string_lossy().to_string().into()
         } else {
-            "untitled".into()
+            // Use the same logic as the displayed title for consistency
+            self.buffer.read(cx).title(cx).to_string().into()
         }
     }
 

From 9450bcad25156f373e3b81a7a13d3ae5211a0537 Mon Sep 17 00:00:00 2001
From: marius851000 <git@mariusdavid.fr>
Date: Mon, 8 Sep 2025 06:26:01 +0200
Subject: [PATCH 663/823] ollama: Properly format tool calls fed back to the
 model (#34750)

Fix an issue that resulted in Ollama models not being able to not being
able to access the input of the commands they executed (only being able
to access the result).

This properly return the function history as shown in
https://github.com/ollama/ollama/blob/main/docs/api.md#chat-request-with-history-with-tools

Previously, function input where not returned and result where returned
as a "user" role.

Release Notes:

- ollama: Improved format when returning tool results to the models
---
 crates/language_models/src/provider/ollama.rs | 123 +++++++++++-------
 crates/ollama/src/ollama.rs                   |   4 +
 2 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 8975115d90..a80cacfc4a 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -11,8 +11,8 @@ use language_model::{
     LanguageModelToolUseId, MessageContent, RateLimiter, Role, StopReason, TokenUsage,
 };
 use ollama::{
-    ChatMessage, ChatOptions, ChatRequest, ChatResponseDelta, KeepAlive, OllamaFunctionTool,
-    OllamaToolCall, get_models, show_model, stream_chat_completion,
+    ChatMessage, ChatOptions, ChatRequest, ChatResponseDelta, KeepAlive, OllamaFunctionCall,
+    OllamaFunctionTool, OllamaToolCall, get_models, show_model, stream_chat_completion,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -282,59 +282,85 @@ impl OllamaLanguageModel {
     fn to_ollama_request(&self, request: LanguageModelRequest) -> ChatRequest {
         let supports_vision = self.model.supports_vision.unwrap_or(false);
 
-        ChatRequest {
-            model: self.model.name.clone(),
-            messages: request
-                .messages
-                .into_iter()
-                .map(|msg| {
-                    let images = if supports_vision {
-                        msg.content
-                            .iter()
-                            .filter_map(|content| match content {
-                                MessageContent::Image(image) => Some(image.source.to_string()),
-                                _ => None,
-                            })
-                            .collect::<Vec<String>>()
-                    } else {
-                        vec![]
-                    };
+        let mut messages = Vec::with_capacity(request.messages.len());
 
-                    match msg.role {
-                        Role::User => ChatMessage::User {
+        for mut msg in request.messages.into_iter() {
+            let images = if supports_vision {
+                msg.content
+                    .iter()
+                    .filter_map(|content| match content {
+                        MessageContent::Image(image) => Some(image.source.to_string()),
+                        _ => None,
+                    })
+                    .collect::<Vec<String>>()
+            } else {
+                vec![]
+            };
+
+            match msg.role {
+                Role::User => {
+                    for tool_result in msg
+                        .content
+                        .extract_if(.., |x| matches!(x, MessageContent::ToolResult(..)))
+                    {
+                        match tool_result {
+                            MessageContent::ToolResult(tool_result) => {
+                                messages.push(ChatMessage::Tool {
+                                    tool_name: tool_result.tool_name.to_string(),
+                                    content: tool_result.content.to_str().unwrap_or("").to_string(),
+                                })
+                            }
+                            _ => unreachable!("Only tool result should be extracted"),
+                        }
+                    }
+                    if !msg.content.is_empty() {
+                        messages.push(ChatMessage::User {
                             content: msg.string_contents(),
                             images: if images.is_empty() {
                                 None
                             } else {
                                 Some(images)
                             },
-                        },
-                        Role::Assistant => {
-                            let content = msg.string_contents();
-                            let thinking =
-                                msg.content.into_iter().find_map(|content| match content {
-                                    MessageContent::Thinking { text, .. } if !text.is_empty() => {
-                                        Some(text)
-                                    }
-                                    _ => None,
-                                });
-                            ChatMessage::Assistant {
-                                content,
-                                tool_calls: None,
-                                images: if images.is_empty() {
-                                    None
-                                } else {
-                                    Some(images)
-                                },
-                                thinking,
-                            }
-                        }
-                        Role::System => ChatMessage::System {
-                            content: msg.string_contents(),
-                        },
+                        })
                     }
-                })
-                .collect(),
+                }
+                Role::Assistant => {
+                    let content = msg.string_contents();
+                    let mut thinking = None;
+                    let mut tool_calls = Vec::new();
+                    for content in msg.content.into_iter() {
+                        match content {
+                            MessageContent::Thinking { text, .. } if !text.is_empty() => {
+                                thinking = Some(text)
+                            }
+                            MessageContent::ToolUse(tool_use) => {
+                                tool_calls.push(OllamaToolCall::Function(OllamaFunctionCall {
+                                    name: tool_use.name.to_string(),
+                                    arguments: tool_use.input,
+                                }));
+                            }
+                            _ => (),
+                        }
+                    }
+                    messages.push(ChatMessage::Assistant {
+                        content,
+                        tool_calls: Some(tool_calls),
+                        images: if images.is_empty() {
+                            None
+                        } else {
+                            Some(images)
+                        },
+                        thinking,
+                    })
+                }
+                Role::System => messages.push(ChatMessage::System {
+                    content: msg.string_contents(),
+                }),
+            }
+        }
+        ChatRequest {
+            model: self.model.name.clone(),
+            messages,
             keep_alive: self.model.keep_alive.clone().unwrap_or_default(),
             stream: true,
             options: Some(ChatOptions {
@@ -483,6 +509,9 @@ fn map_to_language_model_completion_events(
                 ChatMessage::System { content } => {
                     events.push(Ok(LanguageModelCompletionEvent::Text(content)));
                 }
+                ChatMessage::Tool { content, .. } => {
+                    events.push(Ok(LanguageModelCompletionEvent::Text(content)));
+                }
                 ChatMessage::Assistant {
                     content,
                     tool_calls,
diff --git a/crates/ollama/src/ollama.rs b/crates/ollama/src/ollama.rs
index 64cd1cc0cb..3c935d2152 100644
--- a/crates/ollama/src/ollama.rs
+++ b/crates/ollama/src/ollama.rs
@@ -117,6 +117,10 @@ pub enum ChatMessage {
     System {
         content: String,
     },
+    Tool {
+        tool_name: String,
+        content: String,
+    },
 }
 
 #[derive(Serialize, Deserialize, Debug)]

From b35959f4c2e5b1550a32ce8fc0dff57415eb11bc Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Mon, 8 Sep 2025 10:20:26 +0530
Subject: [PATCH 664/823] agent_ui: Fix `context_server` duplication when name
 is updated (#35403)

Closes #35400

| Before | After |
|--------|--------|
| <video
src="https://github.com/user-attachments/assets/6aae34ca-e022-457a-9b66-47b85c976b23"/>
| <video
src="https://github.com/user-attachments/assets/ae058988-8f70-4605-b537-e045175d2e75"
/> |

Release Notes:

- agent: Fix `context_server` duplication when name is updated

---------

Signed-off-by: Umesh Yadav <git@umesh.dev>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 .../configure_context_server_modal.rs         | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
index e5027b876a..4d33884014 100644
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -251,6 +251,7 @@ pub struct ConfigureContextServerModal {
     workspace: WeakEntity<Workspace>,
     source: ConfigurationSource,
     state: State,
+    original_server_id: Option<ContextServerId>,
 }
 
 impl ConfigureContextServerModal {
@@ -348,6 +349,11 @@ impl ConfigureContextServerModal {
                     context_server_store,
                     workspace: workspace_handle,
                     state: State::Idle,
+                    original_server_id: match &target {
+                        ConfigurationTarget::Existing { id, .. } => Some(id.clone()),
+                        ConfigurationTarget::Extension { id, .. } => Some(id.clone()),
+                        ConfigurationTarget::New => None,
+                    },
                     source: ConfigurationSource::from_target(
                         target,
                         language_registry,
@@ -415,9 +421,19 @@ impl ConfigureContextServerModal {
             // When we write the settings to the file, the context server will be restarted.
             workspace.update(cx, |workspace, cx| {
                 let fs = workspace.app_state().fs.clone();
-                update_settings_file::<ProjectSettings>(fs.clone(), cx, |project_settings, _| {
-                    project_settings.context_servers.insert(id.0, settings);
-                });
+                let original_server_id = self.original_server_id.clone();
+                update_settings_file::<ProjectSettings>(
+                    fs.clone(),
+                    cx,
+                    move |project_settings, _| {
+                        if let Some(original_id) = original_server_id {
+                            if original_id != id {
+                                project_settings.context_servers.remove(&original_id.0);
+                            }
+                        }
+                        project_settings.context_servers.insert(id.0, settings);
+                    },
+                );
             });
         } else if let Some(existing_server) = existing_server {
             self.context_server_store

From 36364b16a037f5c60a078ca92c58df341fa4ea68 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Mon, 8 Sep 2025 10:22:57 +0530
Subject: [PATCH 665/823] agent_ui: Clear model selector query on dismiss
 (#37569)

Closes #36756

| Before | After |
|--------|--------|
| <video src
="https://github.com/user-attachments/assets/1d022ac6-0aea-4e98-a717-9988420c9683"/>
| <video
src="https://github.com/user-attachments/assets/78d19012-1224-4c92-a6c8-47ae4c13ca31"/>
|

Release Notes:

- agent: Clear model selector query on dismiss in agent panel

---------

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 crates/agent_ui/src/acp/model_selector.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
index cbb513696d..95c0478aa3 100644
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -192,8 +192,10 @@ impl PickerDelegate for AcpModelPickerDelegate {
         }
     }
 
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.emit(DismissEvent);
+    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        cx.defer_in(window, |picker, window, cx| {
+            picker.set_query("", window, cx);
+        });
     }
 
     fn render_match(

From 7ae8f81d742c1eee3faed5b2d4558e32a77fea1b Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Mon, 8 Sep 2025 10:27:16 +0530
Subject: [PATCH 666/823] language_models: Clear cached credentials when OpenAI
 and OpenAI Compatible provider `api_url` change (#37610)

Closes #37093

Also check this: #37099.

So currently in zed for both OpenAI and OpenAI Compatible provider when
the url is changed from settings the api_key stored in the provider
state is not cleared and it is still used. But if you restart zed the
api_key is cleared. Currently zed uses the api_url to store and fetch
the api key from credential provider. The behaviour is not changed
overall, it's just that we have made it consistent it with the zed
restart logic where it re-authenticates and fetches the api_key again. I
have attached the video below to show case before and after of this.

So all in all the problem was we were not re-authenticating the in case
api_url change while zed is still running. Now we trigger a
re-authentication and clear the state in case authentication fails.

OpenAI Compatible Provider:

| Before | After |
|--------|--------|
| <video
src="https://github.com/user-attachments/assets/324d2707-ea72-4119-8981-6b596a9f40a3"
/> | <video
src="https://github.com/user-attachments/assets/cc7fdb73-8975-4aaf-a642-809bb03ce319"
/> |

OpenAI Provider:

| Before | After |
|--------|--------|
| <video
src="https://github.com/user-attachments/assets/a1c07d1b-1909-4b49-b33c-fc05123e92e7"
/> | <video
src="https://github.com/user-attachments/assets/d78aeccd-5cd3-4d0c-8b9f-6f98e499d7c8"
/> |

Release Notes:

- Fixed OpenAI and OpenAI Compatible provide API keys being persisted
when changing the API URL setting. Authentication is now properly
revalidated when settings change.

---------

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 .../language_models/src/provider/open_ai.rs   | 48 ++++++++++++++++---
 .../src/provider/open_ai_compatible.rs        | 36 ++++++++++----
 2 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index cfd4303351..fca1cf977c 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -56,13 +56,13 @@ pub struct OpenAiLanguageModelProvider {
 pub struct State {
     api_key: Option<String>,
     api_key_from_env: bool,
+    last_api_url: String,
     _subscription: Subscription,
 }
 
 const OPENAI_API_KEY_VAR: &str = "OPENAI_API_KEY";
 
 impl State {
-    //
     fn is_authenticated(&self) -> bool {
         self.api_key.is_some()
     }
@@ -104,11 +104,7 @@ impl State {
         })
     }
 
-    fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        if self.is_authenticated() {
-            return Task::ready(Ok(()));
-        }
-
+    fn get_api_key(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
         let credentials_provider = <dyn CredentialsProvider>::global(cx);
         let api_url = AllLanguageModelSettings::get_global(cx)
             .openai
@@ -136,14 +132,52 @@ impl State {
             Ok(())
         })
     }
+
+    fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
+        if self.is_authenticated() {
+            return Task::ready(Ok(()));
+        }
+
+        self.get_api_key(cx)
+    }
 }
 
 impl OpenAiLanguageModelProvider {
     pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
+        let initial_api_url = AllLanguageModelSettings::get_global(cx)
+            .openai
+            .api_url
+            .clone();
+
         let state = cx.new(|cx| State {
             api_key: None,
             api_key_from_env: false,
-            _subscription: cx.observe_global::<SettingsStore>(|_this: &mut State, cx| {
+            last_api_url: initial_api_url.clone(),
+            _subscription: cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
+                let current_api_url = AllLanguageModelSettings::get_global(cx)
+                    .openai
+                    .api_url
+                    .clone();
+
+                if this.last_api_url != current_api_url {
+                    this.last_api_url = current_api_url;
+                    if !this.api_key_from_env {
+                        this.api_key = None;
+                        let spawn_task = cx.spawn(async move |handle, cx| {
+                            if let Ok(task) = handle.update(cx, |this, cx| this.get_api_key(cx)) {
+                                if let Err(_) = task.await {
+                                    handle
+                                        .update(cx, |this, _| {
+                                            this.api_key = None;
+                                            this.api_key_from_env = false;
+                                        })
+                                        .ok();
+                                }
+                            }
+                        });
+                        spawn_task.detach();
+                    }
+                }
                 cx.notify();
             }),
         });
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
index 789eb00a57..4ebb11a07b 100644
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ b/crates/language_models/src/provider/open_ai_compatible.rs
@@ -113,11 +113,7 @@ impl State {
         })
     }
 
-    fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        if self.is_authenticated() {
-            return Task::ready(Ok(()));
-        }
-
+    fn get_api_key(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
         let credentials_provider = <dyn CredentialsProvider>::global(cx);
         let env_var_name = self.env_var_name.clone();
         let api_url = self.settings.api_url.clone();
@@ -143,6 +139,14 @@ impl State {
             Ok(())
         })
     }
+
+    fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
+        if self.is_authenticated() {
+            return Task::ready(Ok(()));
+        }
+
+        self.get_api_key(cx)
+    }
 }
 
 impl OpenAiCompatibleLanguageModelProvider {
@@ -160,11 +164,27 @@ impl OpenAiCompatibleLanguageModelProvider {
             api_key: None,
             api_key_from_env: false,
             _subscription: cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let Some(settings) = resolve_settings(&this.id, cx) else {
+                let Some(settings) = resolve_settings(&this.id, cx).cloned() else {
                     return;
                 };
-                if &this.settings != settings {
-                    this.settings = settings.clone();
+                if &this.settings != &settings {
+                    if settings.api_url != this.settings.api_url && !this.api_key_from_env {
+                        let spawn_task = cx.spawn(async move |handle, cx| {
+                            if let Ok(task) = handle.update(cx, |this, cx| this.get_api_key(cx)) {
+                                if let Err(_) = task.await {
+                                    handle
+                                        .update(cx, |this, _| {
+                                            this.api_key = None;
+                                            this.api_key_from_env = false;
+                                        })
+                                        .ok();
+                                }
+                            }
+                        });
+                        spawn_task.detach();
+                    }
+
+                    this.settings = settings;
                     cx.notify();
                 }
             }),

From d342da4e9af01c8810d4ee89c5206ab7769e5a77 Mon Sep 17 00:00:00 2001
From: HE7086 <me@heyi7086.com>
Date: Mon, 8 Sep 2025 10:44:46 +0200
Subject: [PATCH 667/823] docs: Fix typos in language configurations (#37740)

Fixes several typos in the docs. I think there are more but I have only
read what I actually needed :)

Release Notes:

- N/A
---
 docs/src/languages/c.md    | 4 ++--
 docs/src/languages/cpp.md  | 2 +-
 docs/src/languages/rust.md | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/src/languages/c.md b/docs/src/languages/c.md
index 8db1bb6712..849ce6a662 100644
--- a/docs/src/languages/c.md
+++ b/docs/src/languages/c.md
@@ -8,14 +8,14 @@ C support is available natively in Zed.
 
 ## Clangd: Force detect as C
 
-Clangd out of the box assumes mixed C++/C projects. If you have a C-only project you may wish to instruct clangd to all files as C using the `-xc` flag. To do this, create a `.clangd` file in the root of your project with the following:
+Clangd out of the box assumes mixed C++/C projects. If you have a C-only project you may wish to instruct clangd to treat all files as C using the `-xc` flag. To do this, create a `.clangd` file in the root of your project with the following:
 
 ```yaml
 CompileFlags:
   Add: [-xc]
 ```
 
-By default clang and gcc by will recognize `*.C` and `*.H` (uppercase extensions) as C++ and not C and so Zed too follows this convention. If you are working with a C-only project (perhaps one with legacy uppercase pathing like `FILENAME.C`) you can override this behavior by adding this to your settings:
+By default clang and gcc will recognize `*.C` and `*.H` (uppercase extensions) as C++ and not C and so Zed too follows this convention. If you are working with a C-only project (perhaps one with legacy uppercase pathing like `FILENAME.C`) you can override this behavior by adding this to your settings:
 
 ```json
 {
diff --git a/docs/src/languages/cpp.md b/docs/src/languages/cpp.md
index 91395b5a94..fe2eb9c1f9 100644
--- a/docs/src/languages/cpp.md
+++ b/docs/src/languages/cpp.md
@@ -44,7 +44,7 @@ If you want to use a binary in a custom location, you can specify a `path` and o
 ```json
 {
   "lsp": {
-    "cangd": {
+    "clangd": {
       "binary": {
         "path": "/path/to/clangd",
         "arguments": []
diff --git a/docs/src/languages/rust.md b/docs/src/languages/rust.md
index c8dd1ac550..359af77371 100644
--- a/docs/src/languages/rust.md
+++ b/docs/src/languages/rust.md
@@ -112,7 +112,7 @@ This `"path"` has to be an absolute path.
 
 ## Alternate Targets
 
-If want rust-analyzer to provide diagnostics for a target other than you current platform (e.g. for windows when running on macOS) you can use the following Zed lsp settings:
+If you want rust-analyzer to provide diagnostics for a target other than your current platform (e.g. for windows when running on macOS) you can use the following Zed lsp settings:
 
 ```json
 {
@@ -128,7 +128,7 @@ If want rust-analyzer to provide diagnostics for a target other than you current
 }
 ```
 
-If you are using `rustup` and you can find a list of available target triples (`aarch64-apple-darwin`, `x86_64-unknown-linux-gnu`, etc) by running:
+If you are using `rustup`, you can find a list of available target triples (`aarch64-apple-darwin`, `x86_64-unknown-linux-gnu`, etc) by running:
 
 ```sh
 rustup target list --installed
@@ -239,7 +239,7 @@ you can list them in `linkedProjects` in the local project settings:
 
 ### Snippets
 
-There's a way get custom completion items from rust-analyzer, that will transform the code according to the snippet body:
+There's a way to get custom completion items from rust-analyzer, that will transform the code according to the snippet body:
 
 ```json
 {

From e1a5d299721bf14a7cdd41a5ae1bd03ea948c00e Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Mon, 8 Sep 2025 10:49:32 +0200
Subject: [PATCH 668/823] markdown: Add support for inline HTML `img` tags
 inside text (#37264)

Follow-up: #36700

This PR adds basic support for showing images inline inside a text.

As you can see inside the before screenshot, the image was displayed
right below the `Some inline text` text. This was because we didn't
consider the image to be inline with the text (paragraph). Now we do :)

All the test changes are making sure it is not more than 1 element
parsed, instead of only checking for the first parsed element. This
could work out bad when we return more than 1 result.

**Before**
<img width="1717" height="1344" alt="Screenshot 2025-08-31 at 13 49 45"
src="https://github.com/user-attachments/assets/13c5f9dd-0e0a-4e08-b2a6-28e9a4e0cab8"
/>

**After**
<img width="1719" height="1343" alt="Screenshot 2025-08-31 at 13 42 14"
src="https://github.com/user-attachments/assets/bf7aa82f-3743-4fb3-87aa-4a97a550c4d1"
/>


**Code example**:
```markdown
<p>some inline text <img src="https://picsum.photos/200/300" alt="Description of image" style="height: 100px" /> asdjkflsadjfl</p>

# Html Tag
<img src="https://picsum.photos/200/300" alt="Description of image" />

# Html Tag with width and height
<img src="https://picsum.photos/200/300" alt="Description of image" width="100" height="200" />

# Html Tag with style attribute with width and height
<img src="https://picsum.photos/200/300" alt="Description of image" style="width: 100px; height: 200px" />

# Normal Tag
![alt text](https://picsum.photos/200/300)
```

Release Notes:

- Markdown: Added support for inline HTML `img` tags inside paragraphs
---
 .../markdown_preview/src/markdown_elements.rs |   2 +-
 .../markdown_preview/src/markdown_parser.rs   | 250 ++++++++++++------
 .../markdown_preview/src/markdown_renderer.rs |   6 +-
 3 files changed, 172 insertions(+), 86 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_elements.rs b/crates/markdown_preview/src/markdown_elements.rs
index 560e468439..b7ec68951e 100644
--- a/crates/markdown_preview/src/markdown_elements.rs
+++ b/crates/markdown_preview/src/markdown_elements.rs
@@ -155,7 +155,7 @@ pub struct ParsedMarkdownText {
     /// Where the text is located in the source Markdown document.
     pub source_range: Range<usize>,
     /// The text content stripped of any formatting symbols.
-    pub contents: String,
+    pub contents: SharedString,
     /// The list of highlights contained in the Markdown document.
     pub highlights: Vec<(Range<usize>, MarkdownHighlight)>,
     /// The regions of the various ranges in the Markdown document.
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
index 1b116c50d9..d47db4dfe4 100644
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -353,7 +353,7 @@ impl<'a> MarkdownParser<'a> {
                         if !text.is_empty() {
                             let parsed_regions = MarkdownParagraphChunk::Text(ParsedMarkdownText {
                                 source_range: source_range.clone(),
-                                contents: text.clone(),
+                                contents: text.into(),
                                 highlights: highlights.clone(),
                                 region_ranges: region_ranges.clone(),
                                 regions: regions.clone(),
@@ -408,7 +408,7 @@ impl<'a> MarkdownParser<'a> {
         if !text.is_empty() {
             markdown_text_like.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
                 source_range,
-                contents: text,
+                contents: text.into(),
                 highlights,
                 regions,
                 region_ranges,
@@ -808,15 +808,14 @@ impl<'a> MarkdownParser<'a> {
             markup5ever_rcdom::NodeData::Document => {
                 self.consume_children(source_range, node, elements);
             }
-            markup5ever_rcdom::NodeData::Doctype { .. } => {}
             markup5ever_rcdom::NodeData::Text { contents } => {
                 elements.push(ParsedMarkdownElement::Paragraph(vec![
                     MarkdownParagraphChunk::Text(ParsedMarkdownText {
                         source_range,
-                        contents: contents.borrow().to_string(),
-                        highlights: Vec::default(),
-                        region_ranges: Vec::default(),
                         regions: Vec::default(),
+                        region_ranges: Vec::default(),
+                        highlights: Vec::default(),
+                        contents: contents.borrow().to_string().into(),
                     }),
                 ]));
             }
@@ -826,11 +825,64 @@ impl<'a> MarkdownParser<'a> {
                     if let Some(image) = self.extract_image(source_range, attrs) {
                         elements.push(ParsedMarkdownElement::Image(image));
                     }
+                } else if local_name!("p") == name.local {
+                    self.parse_paragraph(
+                        source_range,
+                        node,
+                        &mut MarkdownParagraph::new(),
+                        elements,
+                    );
                 } else {
                     self.consume_children(source_range, node, elements);
                 }
             }
-            markup5ever_rcdom::NodeData::ProcessingInstruction { .. } => {}
+            _ => {}
+        }
+    }
+
+    fn parse_paragraph(
+        &self,
+        source_range: Range<usize>,
+        node: &Rc<markup5ever_rcdom::Node>,
+        paragraph: &mut MarkdownParagraph,
+        elements: &mut Vec<ParsedMarkdownElement>,
+    ) {
+        match &node.data {
+            markup5ever_rcdom::NodeData::Text { contents } => {
+                paragraph.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
+                    source_range,
+                    regions: Vec::default(),
+                    region_ranges: Vec::default(),
+                    highlights: Vec::default(),
+                    contents: contents.borrow().to_string().into(),
+                }));
+            }
+            markup5ever_rcdom::NodeData::Element { name, attrs, .. } => {
+                if local_name!("img") == name.local {
+                    if let Some(image) = self.extract_image(source_range, attrs) {
+                        paragraph.push(MarkdownParagraphChunk::Image(image));
+                    }
+                } else {
+                    self.consume_paragraph(source_range, node, paragraph, elements);
+
+                    if !paragraph.is_empty() {
+                        elements.push(ParsedMarkdownElement::Paragraph(std::mem::take(paragraph)));
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    fn consume_paragraph(
+        &self,
+        source_range: Range<usize>,
+        node: &Rc<markup5ever_rcdom::Node>,
+        paragraph: &mut MarkdownParagraph,
+        elements: &mut Vec<ParsedMarkdownElement>,
+    ) {
+        for node in node.children.borrow().iter() {
+            self.parse_paragraph(source_range.clone(), node, paragraph, elements);
         }
     }
 
@@ -895,14 +947,14 @@ impl<'a> MarkdownParser<'a> {
 
         if let Some(width) = Self::attr_value(attrs, local_name!("width"))
             .or_else(|| styles.get("width").cloned())
-            .and_then(|width| Self::parse_length(&width))
+            .and_then(|width| Self::parse_html_element_dimension(&width))
         {
             image.set_width(width);
         }
 
         if let Some(height) = Self::attr_value(attrs, local_name!("height"))
             .or_else(|| styles.get("height").cloned())
-            .and_then(|height| Self::parse_length(&height))
+            .and_then(|height| Self::parse_html_element_dimension(&height))
         {
             image.set_height(height);
         }
@@ -910,8 +962,7 @@ impl<'a> MarkdownParser<'a> {
         Some(image)
     }
 
-    /// Parses the width/height attribute value of an html element (e.g. img element)
-    fn parse_length(value: &str) -> Option<DefiniteLength> {
+    fn parse_html_element_dimension(value: &str) -> Option<DefiniteLength> {
         if value.ends_with("%") {
             value
                 .trim_end_matches("%")
@@ -1010,7 +1061,7 @@ mod tests {
             ParsedMarkdownElement::Paragraph(vec![MarkdownParagraphChunk::Text(
                 ParsedMarkdownText {
                     source_range: 0..35,
-                    contents: "Some bostrikethroughld text".to_string(),
+                    contents: "Some bostrikethroughld text".into(),
                     highlights: Vec::new(),
                     region_ranges: Vec::new(),
                     regions: Vec::new(),
@@ -1184,7 +1235,7 @@ mod tests {
                 }),
                 MarkdownParagraphChunk::Text(ParsedMarkdownText {
                     source_range: 0..81,
-                    contents: " Lorem Ipsum ".to_string(),
+                    contents: " Lorem Ipsum ".into(),
                     highlights: Vec::new(),
                     region_ranges: Vec::new(),
                     regions: Vec::new(),
@@ -1203,90 +1254,130 @@ mod tests {
     }
 
     #[test]
-    fn test_parse_length() {
+    fn test_parse_html_element_dimension() {
         // Test percentage values
         assert_eq!(
-            MarkdownParser::parse_length("50%"),
+            MarkdownParser::parse_html_element_dimension("50%"),
             Some(DefiniteLength::Fraction(0.5))
         );
         assert_eq!(
-            MarkdownParser::parse_length("100%"),
+            MarkdownParser::parse_html_element_dimension("100%"),
             Some(DefiniteLength::Fraction(1.0))
         );
         assert_eq!(
-            MarkdownParser::parse_length("25%"),
+            MarkdownParser::parse_html_element_dimension("25%"),
             Some(DefiniteLength::Fraction(0.25))
         );
         assert_eq!(
-            MarkdownParser::parse_length("0%"),
+            MarkdownParser::parse_html_element_dimension("0%"),
             Some(DefiniteLength::Fraction(0.0))
         );
 
         // Test pixel values
         assert_eq!(
-            MarkdownParser::parse_length("100px"),
+            MarkdownParser::parse_html_element_dimension("100px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
         );
         assert_eq!(
-            MarkdownParser::parse_length("50px"),
+            MarkdownParser::parse_html_element_dimension("50px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(50.0))))
         );
         assert_eq!(
-            MarkdownParser::parse_length("0px"),
+            MarkdownParser::parse_html_element_dimension("0px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(0.0))))
         );
 
         // Test values without units (should be treated as pixels)
         assert_eq!(
-            MarkdownParser::parse_length("100"),
+            MarkdownParser::parse_html_element_dimension("100"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
         );
         assert_eq!(
-            MarkdownParser::parse_length("42"),
+            MarkdownParser::parse_html_element_dimension("42"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
         );
 
         // Test invalid values
-        assert_eq!(MarkdownParser::parse_length("invalid"), None);
-        assert_eq!(MarkdownParser::parse_length("px"), None);
-        assert_eq!(MarkdownParser::parse_length("%"), None);
-        assert_eq!(MarkdownParser::parse_length(""), None);
-        assert_eq!(MarkdownParser::parse_length("abc%"), None);
-        assert_eq!(MarkdownParser::parse_length("abcpx"), None);
+        assert_eq!(
+            MarkdownParser::parse_html_element_dimension("invalid"),
+            None
+        );
+        assert_eq!(MarkdownParser::parse_html_element_dimension("px"), None);
+        assert_eq!(MarkdownParser::parse_html_element_dimension("%"), None);
+        assert_eq!(MarkdownParser::parse_html_element_dimension(""), None);
+        assert_eq!(MarkdownParser::parse_html_element_dimension("abc%"), None);
+        assert_eq!(MarkdownParser::parse_html_element_dimension("abcpx"), None);
 
         // Test decimal values
         assert_eq!(
-            MarkdownParser::parse_length("50.5%"),
+            MarkdownParser::parse_html_element_dimension("50.5%"),
             Some(DefiniteLength::Fraction(0.505))
         );
         assert_eq!(
-            MarkdownParser::parse_length("100.25px"),
+            MarkdownParser::parse_html_element_dimension("100.25px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.25))))
         );
         assert_eq!(
-            MarkdownParser::parse_length("42.0"),
+            MarkdownParser::parse_html_element_dimension("42.0"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
         );
     }
 
+    #[gpui::test]
+    async fn test_inline_html_image_tag() {
+        let parsed =
+            parse("<p>Some text<img src=\"http://example.com/foo.png\" /> some more text</p>")
+                .await;
+
+        assert_eq!(
+            ParsedMarkdown {
+                children: vec![ParsedMarkdownElement::Paragraph(vec![
+                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
+                        source_range: 0..71,
+                        contents: "Some text".into(),
+                        highlights: Default::default(),
+                        region_ranges: Default::default(),
+                        regions: Default::default()
+                    }),
+                    MarkdownParagraphChunk::Image(Image {
+                        source_range: 0..71,
+                        link: Link::Web {
+                            url: "http://example.com/foo.png".to_string(),
+                        },
+                        alt_text: None,
+                        height: None,
+                        width: None,
+                    }),
+                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
+                        source_range: 0..71,
+                        contents: " some more text".into(),
+                        highlights: Default::default(),
+                        region_ranges: Default::default(),
+                        regions: Default::default()
+                    }),
+                ])]
+            },
+            parsed
+        );
+    }
+
     #[gpui::test]
     async fn test_html_image_tag() {
         let parsed = parse("<img src=\"http://example.com/foo.png\" />").await;
 
-        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
-            panic!("Expected a image element");
-        };
         assert_eq!(
-            image.clone(),
-            Image {
-                source_range: 0..40,
-                link: Link::Web {
-                    url: "http://example.com/foo.png".to_string(),
-                },
-                alt_text: None,
-                height: None,
-                width: None,
+            ParsedMarkdown {
+                children: vec![ParsedMarkdownElement::Image(Image {
+                    source_range: 0..40,
+                    link: Link::Web {
+                        url: "http://example.com/foo.png".to_string(),
+                    },
+                    alt_text: None,
+                    height: None,
+                    width: None,
+                })]
             },
+            parsed
         );
     }
 
@@ -1294,20 +1385,19 @@ mod tests {
     async fn test_html_image_tag_with_alt_text() {
         let parsed = parse("<img src=\"http://example.com/foo.png\" alt=\"Foo\" />").await;
 
-        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
-            panic!("Expected a image element");
-        };
         assert_eq!(
-            image.clone(),
-            Image {
-                source_range: 0..50,
-                link: Link::Web {
-                    url: "http://example.com/foo.png".to_string(),
-                },
-                alt_text: Some("Foo".into()),
-                height: None,
-                width: None,
+            ParsedMarkdown {
+                children: vec![ParsedMarkdownElement::Image(Image {
+                    source_range: 0..50,
+                    link: Link::Web {
+                        url: "http://example.com/foo.png".to_string(),
+                    },
+                    alt_text: Some("Foo".into()),
+                    height: None,
+                    width: None,
+                })]
             },
+            parsed
         );
     }
 
@@ -1316,20 +1406,19 @@ mod tests {
         let parsed =
             parse("<img src=\"http://example.com/foo.png\" height=\"100\" width=\"200\" />").await;
 
-        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
-            panic!("Expected a image element");
-        };
         assert_eq!(
-            image.clone(),
-            Image {
-                source_range: 0..65,
-                link: Link::Web {
-                    url: "http://example.com/foo.png".to_string(),
-                },
-                alt_text: None,
-                height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
-                width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
+            ParsedMarkdown {
+                children: vec![ParsedMarkdownElement::Image(Image {
+                    source_range: 0..65,
+                    link: Link::Web {
+                        url: "http://example.com/foo.png".to_string(),
+                    },
+                    alt_text: None,
+                    height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
+                    width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
+                })]
             },
+            parsed
         );
     }
 
@@ -1340,20 +1429,19 @@ mod tests {
         )
         .await;
 
-        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
-            panic!("Expected a image element");
-        };
         assert_eq!(
-            image.clone(),
-            Image {
-                source_range: 0..75,
-                link: Link::Web {
-                    url: "http://example.com/foo.png".to_string(),
-                },
-                alt_text: None,
-                height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
-                width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
+            ParsedMarkdown {
+                children: vec![ParsedMarkdownElement::Image(Image {
+                    source_range: 0..75,
+                    link: Link::Web {
+                        url: "http://example.com/foo.png".to_string(),
+                    },
+                    alt_text: None,
+                    height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
+                    width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
+                })]
             },
+            parsed
         );
     }
 
@@ -1804,7 +1892,7 @@ fn main() {
             region_ranges: Vec::new(),
             regions: Vec::new(),
             source_range,
-            contents: contents.to_string(),
+            contents: contents.to_string().into(),
         })]
     }
 
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index b07b4686a4..1e679b42cb 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -624,15 +624,13 @@ fn render_markdown_code_block(
 }
 
 fn render_markdown_paragraph(parsed: &MarkdownParagraph, cx: &mut RenderContext) -> AnyElement {
-    cx.with_common_p(div())
+    cx.with_common_p(h_flex().flex_wrap())
         .children(render_markdown_text(parsed, cx))
-        .flex()
-        .flex_col()
         .into_any_element()
 }
 
 fn render_markdown_text(parsed_new: &MarkdownParagraph, cx: &mut RenderContext) -> Vec<AnyElement> {
-    let mut any_element = vec![];
+    let mut any_element = Vec::with_capacity(parsed_new.len());
     // these values are cloned in-order satisfy borrow checker
     let syntax_theme = cx.syntax_theme.clone();
     let workspace_clone = cx.workspace.clone();

From c3d065cecc107c5e88778301345ec2f181f9cbf6 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Mon, 8 Sep 2025 11:05:04 +0200
Subject: [PATCH 669/823] git: Use self.git_binary_path instead raw git string
 (#37757)

Release Notes:

- N/A
---
 crates/git/src/repository.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index fd12dafa98..d171743e99 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1205,9 +1205,10 @@ impl GitRepository for RealGitRepository {
         env: Arc<HashMap<String, String>>,
     ) -> BoxFuture<'_, Result<()>> {
         let working_directory = self.working_directory();
+        let git_binary_path = self.git_binary_path.clone();
         self.executor
             .spawn(async move {
-                let mut cmd = new_smol_command("git");
+                let mut cmd = new_smol_command(&git_binary_path);
                 cmd.current_dir(&working_directory?)
                     .envs(env.iter())
                     .args(["stash", "push", "--quiet"])
@@ -1229,9 +1230,10 @@ impl GitRepository for RealGitRepository {
 
     fn stash_pop(&self, env: Arc<HashMap<String, String>>) -> BoxFuture<'_, Result<()>> {
         let working_directory = self.working_directory();
+        let git_binary_path = self.git_binary_path.clone();
         self.executor
             .spawn(async move {
-                let mut cmd = new_smol_command("git");
+                let mut cmd = new_smol_command(&git_binary_path);
                 cmd.current_dir(&working_directory?)
                     .envs(env.iter())
                     .args(["stash", "pop"]);
@@ -1256,9 +1258,10 @@ impl GitRepository for RealGitRepository {
         env: Arc<HashMap<String, String>>,
     ) -> BoxFuture<'_, Result<()>> {
         let working_directory = self.working_directory();
+        let git_binary_path = self.git_binary_path.clone();
         self.executor
             .spawn(async move {
-                let mut cmd = new_smol_command("git");
+                let mut cmd = new_smol_command(&git_binary_path);
                 cmd.current_dir(&working_directory?)
                     .envs(env.iter())
                     .args(["commit", "--quiet", "-m"])
@@ -1302,7 +1305,7 @@ impl GitRepository for RealGitRepository {
         let executor = cx.background_executor().clone();
         async move {
             let working_directory = working_directory?;
-            let mut command = new_smol_command("git");
+            let mut command = new_smol_command(&self.git_binary_path);
             command
                 .envs(env.iter())
                 .current_dir(&working_directory)
@@ -1333,7 +1336,7 @@ impl GitRepository for RealGitRepository {
         let working_directory = self.working_directory();
         let executor = cx.background_executor().clone();
         async move {
-            let mut command = new_smol_command("git");
+            let mut command = new_smol_command(&self.git_binary_path);
             command
                 .envs(env.iter())
                 .current_dir(&working_directory?)
@@ -1359,7 +1362,7 @@ impl GitRepository for RealGitRepository {
         let remote_name = format!("{}", fetch_options);
         let executor = cx.background_executor().clone();
         async move {
-            let mut command = new_smol_command("git");
+            let mut command = new_smol_command(&self.git_binary_path);
             command
                 .envs(env.iter())
                 .current_dir(&working_directory?)

From abac87c2f891c48ac0652e343d58642a88cc165f Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@sourcefrog.net>
Date: Mon, 8 Sep 2025 02:23:33 -0700
Subject: [PATCH 670/823] tests: Fix doctests in crates/component (#37716)

Previously, `cargo test --package component` failed due to missing
imports for a doctest:


```

   Doc-tests component

running 1 test
test crates/component/src/component.rs - Component::description (line 229) ... FAILED

failures:

---- crates/component/src/component.rs - Component::description (line 229) stdout ----
error: cannot find derive macro `Documented` in this scope
 --> crates/component/src/component.rs:231:10
  |
4 | #[derive(Documented)]
  |          ^^^^^^^^^^

error[E0599]: no associated item named `DOCS` found for struct `MyComponent` in the current scope
 --> crates/component/src/component.rs:236:20
  |
5 | struct MyComponent;
  | ------------------ associated item `DOCS` not found for this struct
...
9 |         Some(Self::DOCS)
  |                    ^^^^ associated item not found in `MyComponent`

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0599`.
Couldn't compile the test.

failures:
    crates/component/src/component.rs - Component::description (line 229)

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.29s

error: doctest failed, to rerun pass `-p component --doc`
bobcat ~/src/zed (doctests) 18:33

```

This might be unnoticed if you mostly run nextest, as it does not run
doctests.

Release Notes:

- N/A
---
 Cargo.lock                        | 1 +
 crates/component/Cargo.toml       | 3 +++
 crates/component/src/component.rs | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index dbcea05ea9..5ca8375fef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3515,6 +3515,7 @@ name = "component"
 version = "0.1.0"
 dependencies = [
  "collections",
+ "documented",
  "gpui",
  "inventory",
  "parking_lot",
diff --git a/crates/component/Cargo.toml b/crates/component/Cargo.toml
index 92249de454..74481834f1 100644
--- a/crates/component/Cargo.toml
+++ b/crates/component/Cargo.toml
@@ -20,5 +20,8 @@ strum.workspace = true
 theme.workspace = true
 workspace-hack.workspace = true
 
+[dev-dependencies]
+documented.workspace = true
+
 [features]
 default = []
diff --git a/crates/component/src/component.rs b/crates/component/src/component.rs
index 0c05ba4a97..8c7b7ea4d7 100644
--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -227,6 +227,8 @@ pub trait Component {
     /// Example:
     ///
     /// ```
+    /// use documented::Documented;
+    ///
     /// /// This is a doc comment.
     /// #[derive(Documented)]
     /// struct MyComponent;

From 5a8603bebb262f9d6ece90e133eeca98de3f84a7 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@sourcefrog.net>
Date: Mon, 8 Sep 2025 02:29:17 -0700
Subject: [PATCH 671/823] Install mold from the OS on Debian 13 (Trixie)
 (#37712)

I ran `scripts/linux` on Debian Trixie 13. It suggested manually
installing Mold, but [mold](http://packages.debian.org/mold) is packaged
on Debian and so we could install it automatically.

The version packaged there seems to work well enough for `cargo t` to
pass, at least.

## Tested

```
; sudo apt remove mold libstdc++-14-dev
... uninstalls them
; ./script/linux
The following NEW packages will be installed:
  build-essential clang clang-19 clang-tools-19 g++ g++-14 g++-14-x86-64-linux-gnu g++-x86-64-linux-gnu libstdc++-14-dev mold
; cargo t
(passes)
```

Release Notes:

- N/A
---
 script/linux | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/script/linux b/script/linux
index 029278bea3..47f58c0bc5 100755
--- a/script/linux
+++ b/script/linux
@@ -47,7 +47,10 @@ if [[ -n $apt ]]; then
     musl-dev
     build-essential
   )
-  if (grep -qP 'PRETTY_NAME="(Linux Mint 22|.+24\.(04|10))' /etc/os-release); then
+  if (grep -qP 'PRETTY_NAME="((Debian|Raspbian).+13|' /etc/os-release); then
+      # libstdc++-14-dev is in build-essential
+      deps+=( mold )
+  elif (grep -qP 'PRETTY_NAME="(Linux Mint 22|.+24\.(04|10))' /etc/os-release); then
     deps+=( mold libstdc++-14-dev )
   elif (grep -qP 'PRETTY_NAME="((Debian|Raspbian).+12|Linux Mint 21|.+22\.04)' /etc/os-release); then
     deps+=( mold libstdc++-12-dev )

From f52282398864858e35e045679282fe3a94b4094d Mon Sep 17 00:00:00 2001
From: chbk <chbk.git@gmail.com>
Date: Mon, 8 Sep 2025 11:32:08 +0200
Subject: [PATCH 672/823] Highlight shorthand fields in Rust (#37674)

Release Notes:

- Highlight shorthand fields in Rust

| Zed 0.202.7 | With this PR |
| --- | --- |
| <img width="370" height="50" alt="rust-0 202 7"
src="https://github.com/user-attachments/assets/856a4d82-3ad0-4248-ad51-0472a0b6531a"
/> | <img width="370" height="50" alt="rust-pr"
src="https://github.com/user-attachments/assets/25b8e357-8519-4533-9026-3f2874b42ddb"
/> |
---
 crates/languages/src/rust/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
index ec7e2d4251..b0daac71a0 100644
--- a/crates/languages/src/rust/highlights.scm
+++ b/crates/languages/src/rust/highlights.scm
@@ -5,6 +5,7 @@
 (primitive_type) @type.builtin
 (self) @variable.special
 (field_identifier) @property
+(shorthand_field_identifier) @property
 
 (trait_item name: (type_identifier) @type.interface)
 (impl_item trait: (type_identifier) @type.interface)

From a0081dd69304ed5624d4f701a8eb3d21a76a8de2 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 8 Sep 2025 12:06:43 +0200
Subject: [PATCH 673/823] project: Consider all worktrees for activation script
 search (#37764)

Should fix https://github.com/zed-industries/zed/issues/37734

Release Notes:

- Fixed venv not always activating correctly
---
 crates/project/src/terminals.rs | 99 ++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 39 deletions(-)

diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 8789366d1d..e7733e5380 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -49,14 +49,6 @@ impl Project {
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Terminal>>> {
         let is_via_remote = self.remote_client.is_some();
-        let project_path_context = self
-            .active_entry()
-            .and_then(|entry_id| self.worktree_id_for_entry(entry_id, cx))
-            .or_else(|| self.visible_worktrees(cx).next().map(|wt| wt.read(cx).id()))
-            .map(|worktree_id| ProjectPath {
-                worktree_id,
-                path: Arc::from(Path::new("")),
-            });
 
         let path: Option<Arc<Path>> = if let Some(cwd) = &spawn_task.cwd {
             if is_via_remote {
@@ -124,23 +116,42 @@ impl Project {
             },
         };
 
-        let toolchain = project_path_context
+        let project_path_contexts = self
+            .active_entry()
+            .and_then(|entry_id| self.path_for_entry(entry_id, cx))
+            .into_iter()
+            .chain(
+                self.visible_worktrees(cx)
+                    .map(|wt| wt.read(cx).id())
+                    .map(|worktree_id| ProjectPath {
+                        worktree_id,
+                        path: Arc::from(Path::new("")),
+                    }),
+            );
+        let toolchains = project_path_contexts
             .filter(|_| detect_venv)
-            .map(|p| self.active_toolchain(p, LanguageName::new("Python"), cx));
+            .map(|p| self.active_toolchain(p, LanguageName::new("Python"), cx))
+            .collect::<Vec<_>>();
         let lang_registry = self.languages.clone();
         let fs = self.fs.clone();
         cx.spawn(async move |project, cx| {
             let activation_script = maybe!(async {
-                let toolchain = toolchain?.await?;
-                Some(
-                    lang_registry
+                for toolchain in toolchains {
+                    let Some(toolchain) = toolchain.await else {
+                        continue;
+                    };
+                    let language = lang_registry
                         .language_for_name(&toolchain.language_name.0)
                         .await
-                        .ok()?
-                        .toolchain_lister()?
-                        .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
-                        .await,
-                )
+                        .ok();
+                    let lister = language?.toolchain_lister();
+                    return Some(
+                        lister?
+                            .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
+                            .await,
+                    );
+                }
+                None
             })
             .await
             .unwrap_or_default();
@@ -268,14 +279,6 @@ impl Project {
         cwd: Option<PathBuf>,
         cx: &mut Context<Self>,
     ) -> Task<Result<Entity<Terminal>>> {
-        let project_path_context = self
-            .active_entry()
-            .and_then(|entry_id| self.worktree_id_for_entry(entry_id, cx))
-            .or_else(|| self.visible_worktrees(cx).next().map(|wt| wt.read(cx).id()))
-            .map(|worktree_id| ProjectPath {
-                worktree_id,
-                path: Arc::from(Path::new("")),
-            });
         let path = cwd.map(|p| Arc::from(&*p));
         let is_via_remote = self.remote_client.is_some();
 
@@ -303,9 +306,22 @@ impl Project {
 
         let local_path = if is_via_remote { None } else { path.clone() };
 
-        let toolchain = project_path_context
+        let project_path_contexts = self
+            .active_entry()
+            .and_then(|entry_id| self.path_for_entry(entry_id, cx))
+            .into_iter()
+            .chain(
+                self.visible_worktrees(cx)
+                    .map(|wt| wt.read(cx).id())
+                    .map(|worktree_id| ProjectPath {
+                        worktree_id,
+                        path: Arc::from(Path::new("")),
+                    }),
+            );
+        let toolchains = project_path_contexts
             .filter(|_| detect_venv)
-            .map(|p| self.active_toolchain(p, LanguageName::new("Python"), cx));
+            .map(|p| self.active_toolchain(p, LanguageName::new("Python"), cx))
+            .collect::<Vec<_>>();
         let remote_client = self.remote_client.clone();
         let shell = match &remote_client {
             Some(remote_client) => remote_client
@@ -327,17 +343,22 @@ impl Project {
         let fs = self.fs.clone();
         cx.spawn(async move |project, cx| {
             let activation_script = maybe!(async {
-                let toolchain = toolchain?.await?;
-                let language = lang_registry
-                    .language_for_name(&toolchain.language_name.0)
-                    .await
-                    .ok();
-                let lister = language?.toolchain_lister();
-                Some(
-                    lister?
-                        .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
-                        .await,
-                )
+                for toolchain in toolchains {
+                    let Some(toolchain) = toolchain.await else {
+                        continue;
+                    };
+                    let language = lang_registry
+                        .language_for_name(&toolchain.language_name.0)
+                        .await
+                        .ok();
+                    let lister = language?.toolchain_lister();
+                    return Some(
+                        lister?
+                            .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
+                            .await,
+                    );
+                }
+                None
             })
             .await
             .unwrap_or_default();

From 01f5b73e3b6e90f3972a344b68e04f57b00855b5 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Mon, 8 Sep 2025 12:43:56 +0200
Subject: [PATCH 674/823] cargo: Remove unused -fuse-ld=lld flag from Win
 config (#37769)

It is unused and generates a warning

```
 LINK : warning LNK4044: unrecognized option '/fuse-ld=lld'; ignored
```

If in the future we want to give `lld-link.exe` a try, we can set

```toml
linker = "lld-link.exe"
```

instead. At the time of writing, my tests have shown that there is no
real difference between `lld-link` and `link` in terms of linking speed.

Release Notes:

- N/A
---
 .cargo/config.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 8db58d2380..717c5e18c8 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -19,8 +19,6 @@ rustflags = [
     "windows_slim_errors",        # This cfg will reduce the size of `windows::core::Error` from 16 bytes to 4 bytes
     "-C",
     "target-feature=+crt-static", # This fixes the linking issue when compiling livekit on Windows
-    "-C",
-    "link-arg=-fuse-ld=lld",
 ]
 
 [env]

From 80a4746a46a7874975acedfda6157bfbaa44bd9c Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Mon, 8 Sep 2025 13:22:36 +0200
Subject: [PATCH 675/823] project: Be explicit about project-searchability for
 buffers (#37773)

Closes https://github.com/zed-industries/zed/issues/28830

Release Notes:

- Fixed builtin buffers and log views showing up in project search
---
 .../src/activity_indicator.rs                 |  3 +-
 crates/agent_ui/src/acp/thread_view.rs        |  2 +-
 crates/agent_ui/src/active_thread.rs          |  2 +-
 crates/auto_update_ui/src/auto_update_ui.rs   |  5 +--
 crates/collab/src/tests/following_tests.rs    |  2 +-
 crates/collab/src/tests/integration_tests.rs  |  2 +-
 crates/editor/src/editor.rs                   |  4 +-
 crates/editor/src/editor_tests.rs             |  6 +--
 crates/editor/src/items.rs                    |  4 +-
 crates/editor/src/rust_analyzer_ext.rs        |  2 +-
 crates/git_ui/src/git_panel.rs                |  3 --
 crates/language_tools/src/lsp_button.rs       |  2 +-
 crates/project/src/buffer_store.rs            | 44 ++++++++++++++-----
 crates/project/src/git_store.rs               |  2 +-
 crates/project/src/project.rs                 | 22 +++++-----
 crates/project/src/project_tests.rs           | 10 ++---
 crates/remote_server/src/headless_project.rs  |  2 +-
 crates/zed/src/zed.rs                         |  7 +--
 18 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 1f4c10b060..1870ab74db 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -212,7 +212,8 @@ impl ActivityIndicator {
                 server_name,
                 status,
             } => {
-                let create_buffer = project.update(cx, |project, cx| project.create_buffer(cx));
+                let create_buffer =
+                    project.update(cx, |project, cx| project.create_buffer(false, cx));
                 let status = status.clone();
                 let server_name = server_name.clone();
                 cx.spawn_in(window, async move |workspace, cx| {
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 441b4aa06f..d635918c19 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -4255,7 +4255,7 @@ impl AcpThreadView {
                 }
 
                 let buffer = project.update(cx, |project, cx| {
-                    project.create_local_buffer(&markdown, Some(markdown_language), cx)
+                    project.create_local_buffer(&markdown, Some(markdown_language), true, cx)
                 });
                 let buffer = cx.new(|cx| {
                     MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone())
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index fbba3eaffd..dad2e282a5 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -3585,7 +3585,7 @@ pub(crate) fn open_active_thread_as_markdown(
             }
 
             let buffer = project.update(cx, |project, cx| {
-                project.create_local_buffer(&markdown, Some(markdown_language), cx)
+                project.create_local_buffer(&markdown, Some(markdown_language), true, cx)
             });
             let buffer =
                 cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone()));
diff --git a/crates/auto_update_ui/src/auto_update_ui.rs b/crates/auto_update_ui/src/auto_update_ui.rs
index 7063dffd6d..729ab425d0 100644
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -88,10 +88,7 @@ fn view_release_notes_locally(
                         .update_in(cx, |workspace, window, cx| {
                             let project = workspace.project().clone();
                             let buffer = project.update(cx, |project, cx| {
-                                let buffer = project.create_local_buffer("", markdown, cx);
-                                project
-                                    .mark_buffer_as_non_searchable(buffer.read(cx).remote_id(), cx);
-                                buffer
+                                project.create_local_buffer("", markdown, false, cx)
                             });
                             buffer.update(cx, |buffer, cx| {
                                 buffer.edit([(0..0, body.release_notes)], None, cx)
diff --git a/crates/collab/src/tests/following_tests.rs b/crates/collab/src/tests/following_tests.rs
index 1e0c915bcb..0a9a69bfca 100644
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -2098,7 +2098,7 @@ async fn test_following_after_replacement(cx_a: &mut TestAppContext, cx_b: &mut
     share_workspace(&workspace, cx_a).await.unwrap();
     let buffer = workspace.update(cx_a, |workspace, cx| {
         workspace.project().update(cx, |project, cx| {
-            project.create_local_buffer(&sample_text(26, 5, 'a'), None, cx)
+            project.create_local_buffer(&sample_text(26, 5, 'a'), None, false, cx)
         })
     });
     let multibuffer = cx_a.new(|cx| {
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 07bd162e66..646dbfbd15 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -2506,7 +2506,7 @@ async fn test_propagate_saves_and_fs_changes(
     });
 
     let new_buffer_a = project_a
-        .update(cx_a, |p, cx| p.create_buffer(cx))
+        .update(cx_a, |p, cx| p.create_buffer(false, cx))
         .await
         .unwrap();
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index b1f9bde6dd..2fc885e3fd 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2619,7 +2619,7 @@ impl Editor {
         cx: &mut Context<Workspace>,
     ) -> Task<Result<Entity<Editor>>> {
         let project = workspace.project().clone();
-        let create = project.update(cx, |project, cx| project.create_buffer(cx));
+        let create = project.update(cx, |project, cx| project.create_buffer(true, cx));
 
         cx.spawn_in(window, async move |workspace, cx| {
             let buffer = create.await?;
@@ -2657,7 +2657,7 @@ impl Editor {
         cx: &mut Context<Workspace>,
     ) {
         let project = workspace.project().clone();
-        let create = project.update(cx, |project, cx| project.create_buffer(cx));
+        let create = project.update(cx, |project, cx| project.create_buffer(true, cx));
 
         cx.spawn_in(window, async move |workspace, cx| {
             let buffer = create.await?;
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 36405079b8..5be6f685d1 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -15913,7 +15913,7 @@ async fn test_following(cx: &mut TestAppContext) {
     let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
 
     let buffer = project.update(cx, |project, cx| {
-        let buffer = project.create_local_buffer(&sample_text(16, 8, 'a'), None, cx);
+        let buffer = project.create_local_buffer(&sample_text(16, 8, 'a'), None, false, cx);
         cx.new(|cx| MultiBuffer::singleton(buffer, cx))
     });
     let leader = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
@@ -16165,8 +16165,8 @@ async fn test_following_with_multiple_excerpts(cx: &mut TestAppContext) {
 
     let (buffer_1, buffer_2) = project.update(cx, |project, cx| {
         (
-            project.create_local_buffer("abc\ndef\nghi\njkl\n", None, cx),
-            project.create_local_buffer("mno\npqr\nstu\nvwx\n", None, cx),
+            project.create_local_buffer("abc\ndef\nghi\njkl\n", None, false, cx),
+            project.create_local_buffer("mno\npqr\nstu\nvwx\n", None, false, cx),
         )
     });
 
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 48c3a8a41a..253d0c2751 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1130,7 +1130,7 @@ impl SerializableItem for Editor {
 
                     // First create the empty buffer
                     let buffer = project
-                        .update(cx, |project, cx| project.create_buffer(cx))?
+                        .update(cx, |project, cx| project.create_buffer(true, cx))?
                         .await?;
 
                     // Then set the text so that the dirty bit is set correctly
@@ -1238,7 +1238,7 @@ impl SerializableItem for Editor {
                 ..
             } => window.spawn(cx, async move |cx| {
                 let buffer = project
-                    .update(cx, |project, cx| project.create_buffer(cx))?
+                    .update(cx, |project, cx| project.create_buffer(true, cx))?
                     .await?;
 
                 cx.update(|window, cx| {
diff --git a/crates/editor/src/rust_analyzer_ext.rs b/crates/editor/src/rust_analyzer_ext.rs
index cf74ee0a9e..f4059ca03d 100644
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@@ -200,7 +200,7 @@ pub fn expand_macro_recursively(
         }
 
         let buffer = project
-            .update(cx, |project, cx| project.create_buffer(cx))?
+            .update(cx, |project, cx| project.create_buffer(false, cx))?
             .await?;
         workspace.update_in(cx, |workspace, window, cx| {
             buffer.update(cx, |buffer, cx| {
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 64163b0ebc..02a60d8fe3 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -388,9 +388,6 @@ pub(crate) fn commit_message_editor(
     window: &mut Window,
     cx: &mut Context<Editor>,
 ) -> Editor {
-    project.update(cx, |this, cx| {
-        this.mark_buffer_as_non_searchable(commit_message_buffer.read(cx).remote_id(), cx);
-    });
     let buffer = cx.new(|cx| MultiBuffer::singleton(commit_message_buffer, cx));
     let max_lines = if in_panel { MAX_PANEL_EDITOR_LINES } else { 18 };
     let mut commit_editor = Editor::new(
diff --git a/crates/language_tools/src/lsp_button.rs b/crates/language_tools/src/lsp_button.rs
index f91c4cc61c..59beceff98 100644
--- a/crates/language_tools/src/lsp_button.rs
+++ b/crates/language_tools/src/lsp_button.rs
@@ -296,7 +296,7 @@ impl LanguageServerState {
                                 .update(cx, |workspace, cx| {
                                     workspace
                                         .project()
-                                        .update(cx, |project, cx| project.create_buffer(cx))
+                                        .update(cx, |project, cx| project.create_buffer(false, cx))
                                 })
                                 .ok()
                             else {
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index 89bd4b27c9..c2b6145b36 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -319,7 +319,11 @@ impl RemoteBufferStore {
         })
     }
 
-    fn create_buffer(&self, cx: &mut Context<BufferStore>) -> Task<Result<Entity<Buffer>>> {
+    fn create_buffer(
+        &self,
+        project_searchable: bool,
+        cx: &mut Context<BufferStore>,
+    ) -> Task<Result<Entity<Buffer>>> {
         let create = self.upstream_client.request(proto::OpenNewBuffer {
             project_id: self.project_id,
         });
@@ -327,8 +331,13 @@ impl RemoteBufferStore {
             let response = create.await?;
             let buffer_id = BufferId::new(response.buffer_id)?;
 
-            this.update(cx, |this, cx| this.wait_for_remote_buffer(buffer_id, cx))?
-                .await
+            this.update(cx, |this, cx| {
+                if !project_searchable {
+                    this.non_searchable_buffers.insert(buffer_id);
+                }
+                this.wait_for_remote_buffer(buffer_id, cx)
+            })?
+            .await
         })
     }
 
@@ -670,12 +679,21 @@ impl LocalBufferStore {
         })
     }
 
-    fn create_buffer(&self, cx: &mut Context<BufferStore>) -> Task<Result<Entity<Buffer>>> {
+    fn create_buffer(
+        &self,
+        project_searchable: bool,
+        cx: &mut Context<BufferStore>,
+    ) -> Task<Result<Entity<Buffer>>> {
         cx.spawn(async move |buffer_store, cx| {
             let buffer =
                 cx.new(|cx| Buffer::local("", cx).with_language(language::PLAIN_TEXT.clone(), cx))?;
             buffer_store.update(cx, |buffer_store, cx| {
                 buffer_store.add_buffer(buffer.clone(), cx).log_err();
+                if !project_searchable {
+                    buffer_store
+                        .non_searchable_buffers
+                        .insert(buffer.read(cx).remote_id());
+                }
             })?;
             Ok(buffer)
         })
@@ -848,10 +866,14 @@ impl BufferStore {
         })
     }
 
-    pub fn create_buffer(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<Buffer>>> {
+    pub fn create_buffer(
+        &mut self,
+        project_searchable: bool,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Entity<Buffer>>> {
         match &self.state {
-            BufferStoreState::Local(this) => this.create_buffer(cx),
-            BufferStoreState::Remote(this) => this.create_buffer(cx),
+            BufferStoreState::Local(this) => this.create_buffer(project_searchable, cx),
+            BufferStoreState::Remote(this) => this.create_buffer(project_searchable, cx),
         }
     }
 
@@ -1610,6 +1632,7 @@ impl BufferStore {
         &mut self,
         text: &str,
         language: Option<Arc<Language>>,
+        project_searchable: bool,
         cx: &mut Context<Self>,
     ) -> Entity<Buffer> {
         let buffer = cx.new(|cx| {
@@ -1619,6 +1642,9 @@ impl BufferStore {
 
         self.add_buffer(buffer.clone(), cx).log_err();
         let buffer_id = buffer.read(cx).remote_id();
+        if !project_searchable {
+            self.non_searchable_buffers.insert(buffer_id);
+        }
 
         if let Some(file) = File::from_dyn(buffer.read(cx).file()) {
             self.path_to_buffer_id.insert(
@@ -1688,10 +1714,6 @@ impl BufferStore {
         }
         serialized_transaction
     }
-
-    pub(crate) fn mark_buffer_as_non_searchable(&mut self, buffer_id: BufferId) {
-        self.non_searchable_buffers.insert(buffer_id);
-    }
 }
 
 impl OpenBuffer {
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index b7ff3e7fef..92c68f6646 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -3317,7 +3317,7 @@ impl Repository {
     ) -> Task<Result<Entity<Buffer>>> {
         cx.spawn(async move |repository, cx| {
             let buffer = buffer_store
-                .update(cx, |buffer_store, cx| buffer_store.create_buffer(cx))?
+                .update(cx, |buffer_store, cx| buffer_store.create_buffer(false, cx))?
                 .await?;
 
             if let Some(language_registry) = language_registry {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 0ebfd83f4e..04001e9e3b 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2540,22 +2540,28 @@ impl Project {
         }
     }
 
-    pub fn create_buffer(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<Buffer>>> {
-        self.buffer_store
-            .update(cx, |buffer_store, cx| buffer_store.create_buffer(cx))
+    pub fn create_buffer(
+        &mut self,
+        searchable: bool,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<Entity<Buffer>>> {
+        self.buffer_store.update(cx, |buffer_store, cx| {
+            buffer_store.create_buffer(searchable, cx)
+        })
     }
 
     pub fn create_local_buffer(
         &mut self,
         text: &str,
         language: Option<Arc<Language>>,
+        project_searchable: bool,
         cx: &mut Context<Self>,
     ) -> Entity<Buffer> {
         if self.is_via_collab() || self.is_via_remote_server() {
             panic!("called create_local_buffer on a remote project")
         }
         self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.create_local_buffer(text, language, cx)
+            buffer_store.create_local_buffer(text, language, project_searchable, cx)
         })
     }
 
@@ -4913,7 +4919,7 @@ impl Project {
         mut cx: AsyncApp,
     ) -> Result<proto::OpenBufferResponse> {
         let buffer = this
-            .update(&mut cx, |this, cx| this.create_buffer(cx))?
+            .update(&mut cx, |this, cx| this.create_buffer(true, cx))?
             .await?;
         let peer_id = envelope.original_sender_id()?;
 
@@ -5244,12 +5250,6 @@ impl Project {
     pub fn agent_location(&self) -> Option<AgentLocation> {
         self.agent_location.clone()
     }
-
-    pub fn mark_buffer_as_non_searchable(&self, buffer_id: BufferId, cx: &mut Context<Project>) {
-        self.buffer_store.update(cx, |buffer_store, _| {
-            buffer_store.mark_buffer_as_non_searchable(buffer_id)
-        });
-    }
 }
 
 pub struct PathMatchCandidateSet {
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index e65da3acd4..c72f35833b 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -3876,7 +3876,7 @@ async fn test_save_file_spawns_language_server(cx: &mut gpui::TestAppContext) {
     );
 
     let buffer = project
-        .update(cx, |this, cx| this.create_buffer(cx))
+        .update(cx, |this, cx| this.create_buffer(false, cx))
         .unwrap()
         .await;
     project.update(cx, |this, cx| {
@@ -4088,7 +4088,9 @@ async fn test_save_as(cx: &mut gpui::TestAppContext) {
     let languages = project.update(cx, |project, _| project.languages().clone());
     languages.add(rust_lang());
 
-    let buffer = project.update(cx, |project, cx| project.create_local_buffer("", None, cx));
+    let buffer = project.update(cx, |project, cx| {
+        project.create_local_buffer("", None, false, cx)
+    });
     buffer.update(cx, |buffer, cx| {
         buffer.edit([(0..0, "abc")], None, cx);
         assert!(buffer.is_dirty());
@@ -5585,9 +5587,7 @@ async fn test_search_with_buffer_exclusions(cx: &mut gpui::TestAppContext) {
 
     let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
     let _buffer = project.update(cx, |project, cx| {
-        let buffer = project.create_local_buffer("file", None, cx);
-        project.mark_buffer_as_non_searchable(buffer.read(cx).remote_id(), cx);
-        buffer
+        project.create_local_buffer("file", None, false, cx)
     });
 
     assert_eq!(
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 7fb5ac8498..2714e9ff79 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -517,7 +517,7 @@ impl HeadlessProject {
             let buffer_store = this.buffer_store.clone();
             let buffer = this
                 .buffer_store
-                .update(cx, |buffer_store, cx| buffer_store.create_buffer(cx));
+                .update(cx, |buffer_store, cx| buffer_store.create_buffer(true, cx));
             anyhow::Ok((buffer_store, buffer))
         })??;
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index fda43a10ba..cb5cfea81a 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1167,7 +1167,7 @@ fn open_log_file(workspace: &mut Workspace, window: &mut Window, cx: &mut Contex
                         };
                         let project = workspace.project().clone();
                         let buffer = project.update(cx, |project, cx| {
-                            project.create_local_buffer(&log, None, cx)
+                            project.create_local_buffer(&log, None, false, cx)
                         });
 
                         let buffer = cx
@@ -1733,7 +1733,7 @@ fn open_telemetry_log_file(
 
             workspace.update_in( cx, |workspace, window, cx| {
                 let project = workspace.project().clone();
-                let buffer = project.update(cx, |project, cx| project.create_local_buffer(&content, json, cx));
+                let buffer = project.update(cx, |project, cx| project.create_local_buffer(&content, json,false, cx));
                 let buffer = cx.new(|cx| {
                     MultiBuffer::singleton(buffer, cx).with_title("Telemetry Log".into())
                 });
@@ -1772,7 +1772,8 @@ fn open_bundled_file(
                 workspace.with_local_workspace(window, cx, |workspace, window, cx| {
                     let project = workspace.project();
                     let buffer = project.update(cx, move |project, cx| {
-                        let buffer = project.create_local_buffer(text.as_ref(), language, cx);
+                        let buffer =
+                            project.create_local_buffer(text.as_ref(), language, false, cx);
                         buffer.update(cx, |buffer, cx| {
                             buffer.set_capability(Capability::ReadOnly, cx);
                         });

From 17499453f64811f10f307c26e3df2f3fa7a8f0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Mon, 8 Sep 2025 20:22:57 +0800
Subject: [PATCH 676/823] windows: Check required GPU/driver feature
 `StructuredBuffer` (#37776)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Check whether the GPU/driver supports the StructuredBuffer feature
required by our shaders. If it doesn’t, log an error and skip that
GPU/driver, so Windows can fall back to the software renderer.

Release Notes:

- N/A
---
 .../src/platform/windows/directx_devices.rs   | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/crates/gpui/src/platform/windows/directx_devices.rs b/crates/gpui/src/platform/windows/directx_devices.rs
index 005737ca20..4fa4db8274 100644
--- a/crates/gpui/src/platform/windows/directx_devices.rs
+++ b/crates/gpui/src/platform/windows/directx_devices.rs
@@ -8,8 +8,9 @@ use windows::Win32::{
             D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_11_1,
         },
         Direct3D11::{
-            D3D11_CREATE_DEVICE_BGRA_SUPPORT, D3D11_CREATE_DEVICE_DEBUG, D3D11_SDK_VERSION,
-            D3D11CreateDevice, ID3D11Device, ID3D11DeviceContext,
+            D3D11_CREATE_DEVICE_BGRA_SUPPORT, D3D11_CREATE_DEVICE_DEBUG,
+            D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS,
+            D3D11_SDK_VERSION, D3D11CreateDevice, ID3D11Device, ID3D11DeviceContext,
         },
         Dxgi::{
             CreateDXGIFactory2, DXGI_CREATE_FACTORY_DEBUG, DXGI_CREATE_FACTORY_FLAGS,
@@ -54,12 +55,10 @@ impl DirectXDevices {
         let adapter =
             get_adapter(&dxgi_factory, debug_layer_available).context("Getting DXGI adapter")?;
         let (device, device_context) = {
-            let mut device: Option<ID3D11Device> = None;
             let mut context: Option<ID3D11DeviceContext> = None;
             let mut feature_level = D3D_FEATURE_LEVEL::default();
-            get_device(
+            let device = get_device(
                 &adapter,
-                Some(&mut device),
                 Some(&mut context),
                 Some(&mut feature_level),
                 debug_layer_available,
@@ -77,7 +76,7 @@ impl DirectXDevices {
                 }
                 _ => unreachable!(),
             }
-            (device.unwrap(), context.unwrap())
+            (device, context.unwrap())
         };
 
         Ok(Self {
@@ -134,7 +133,7 @@ fn get_adapter(dxgi_factory: &IDXGIFactory6, debug_layer_available: bool) -> Res
         }
         // Check to see whether the adapter supports Direct3D 11, but don't
         // create the actual device yet.
-        if get_device(&adapter, None, None, None, debug_layer_available)
+        if get_device(&adapter, None, None, debug_layer_available)
             .log_err()
             .is_some()
         {
@@ -148,11 +147,11 @@ fn get_adapter(dxgi_factory: &IDXGIFactory6, debug_layer_available: bool) -> Res
 #[inline]
 fn get_device(
     adapter: &IDXGIAdapter1,
-    device: Option<*mut Option<ID3D11Device>>,
     context: Option<*mut Option<ID3D11DeviceContext>>,
     feature_level: Option<*mut D3D_FEATURE_LEVEL>,
     debug_layer_available: bool,
-) -> Result<()> {
+) -> Result<ID3D11Device> {
+    let mut device: Option<ID3D11Device> = None;
     let device_flags = if debug_layer_available {
         D3D11_CREATE_DEVICE_BGRA_SUPPORT | D3D11_CREATE_DEVICE_DEBUG
     } else {
@@ -171,10 +170,30 @@ fn get_device(
                 D3D_FEATURE_LEVEL_10_1,
             ]),
             D3D11_SDK_VERSION,
-            device,
+            Some(&mut device),
             feature_level,
             context,
         )?;
     }
-    Ok(())
+    let device = device.unwrap();
+    let mut data = D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS::default();
+    unsafe {
+        device
+            .CheckFeatureSupport(
+                D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS,
+                &mut data as *mut _ as _,
+                std::mem::size_of::<D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS>() as u32,
+            )
+            .context("Checking GPU device feature support")?;
+    }
+    if data
+        .ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x
+        .as_bool()
+    {
+        Ok(device)
+    } else {
+        Err(anyhow::anyhow!(
+            "Required feature StructuredBuffer is not supported by GPU/driver"
+        ))
+    }
 }

From 40eec32cb8e0cbc2a1e7955a94ca7c80014c2781 Mon Sep 17 00:00:00 2001
From: Eduardo Alba <eduardoandresalba@gmail.com>
Date: Mon, 8 Sep 2025 08:37:11 -0400
Subject: [PATCH 677/823] markdown_preview: Fix trimming of leading whitespace
 in Markdown lists (#35750)

Closes #35712

Release Notes:

- Fixed white-space trimming leading to disconnect between list items
and content in markdown previews.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
---
 crates/markdown_preview/src/markdown_renderer.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index 1e679b42cb..4525db3835 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -277,7 +277,11 @@ fn render_markdown_list_item(
         .items_start()
         .children(vec![
             bullet,
-            div().children(contents).pr(cx.scaled_rems(1.0)).w_full(),
+            v_flex()
+                .children(contents)
+                .gap(cx.scaled_rems(1.0))
+                .pr(cx.scaled_rems(1.0))
+                .w_full(),
         ]);
 
     cx.with_common_p(item).into_any()

From 4f1634f95cd2722ad7aa3abce5f67d35351d5b54 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Mon, 8 Sep 2025 15:38:31 +0200
Subject: [PATCH 678/823] Remove unused `semantic_index` crate (#37780)

Release Notes:

- N/A
---
 Cargo.lock                                    |  81 +-
 Cargo.toml                                    |   2 -
 crates/semantic_index/Cargo.toml              |  69 --
 crates/semantic_index/LICENSE-GPL             |   1 -
 crates/semantic_index/examples/index.rs       | 140 ----
 crates/semantic_index/fixture/main.rs         |   3 -
 crates/semantic_index/fixture/needle.md       |  43 --
 crates/semantic_index/src/chunking.rs         | 415 -----------
 crates/semantic_index/src/embedding.rs        | 134 ----
 .../semantic_index/src/embedding/lmstudio.rs  |  70 --
 crates/semantic_index/src/embedding/ollama.rs |  74 --
 .../semantic_index/src/embedding/open_ai.rs   |  55 --
 crates/semantic_index/src/embedding_index.rs  | 470 ------------
 crates/semantic_index/src/indexing.rs         |  49 --
 crates/semantic_index/src/project_index.rs    | 548 --------------
 .../src/project_index_debug_view.rs           | 306 --------
 crates/semantic_index/src/semantic_index.rs   | 632 ----------------
 crates/semantic_index/src/summary_backlog.rs  |  49 --
 crates/semantic_index/src/summary_index.rs    | 696 ------------------
 crates/semantic_index/src/worktree_index.rs   | 205 ------
 20 files changed, 1 insertion(+), 4041 deletions(-)
 delete mode 100644 crates/semantic_index/Cargo.toml
 delete mode 120000 crates/semantic_index/LICENSE-GPL
 delete mode 100644 crates/semantic_index/examples/index.rs
 delete mode 100644 crates/semantic_index/fixture/main.rs
 delete mode 100644 crates/semantic_index/fixture/needle.md
 delete mode 100644 crates/semantic_index/src/chunking.rs
 delete mode 100644 crates/semantic_index/src/embedding.rs
 delete mode 100644 crates/semantic_index/src/embedding/lmstudio.rs
 delete mode 100644 crates/semantic_index/src/embedding/ollama.rs
 delete mode 100644 crates/semantic_index/src/embedding/open_ai.rs
 delete mode 100644 crates/semantic_index/src/embedding_index.rs
 delete mode 100644 crates/semantic_index/src/indexing.rs
 delete mode 100644 crates/semantic_index/src/project_index.rs
 delete mode 100644 crates/semantic_index/src/project_index_debug_view.rs
 delete mode 100644 crates/semantic_index/src/semantic_index.rs
 delete mode 100644 crates/semantic_index/src/summary_backlog.rs
 delete mode 100644 crates/semantic_index/src/summary_index.rs
 delete mode 100644 crates/semantic_index/src/worktree_index.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5ca8375fef..49dcb57ef1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2351,19 +2351,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "blake3"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if",
- "constant_time_eq 0.3.1",
-]
-
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -3578,12 +3565,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
 [[package]]
 name = "context_server"
 version = "0.1.0"
@@ -6164,17 +6145,6 @@ dependencies = [
  "futures-util",
 ]
 
-[[package]]
-name = "futures-batch"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a"
-dependencies = [
- "futures 0.3.31",
- "futures-timer",
- "pin-utils",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -6270,12 +6240,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -14688,49 +14652,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
 
-[[package]]
-name = "semantic_index"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "arrayvec",
- "blake3",
- "client",
- "clock",
- "collections",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "futures-batch",
- "gpui",
- "heed",
- "http_client",
- "language",
- "language_model",
- "languages",
- "log",
- "open_ai",
- "parking_lot",
- "project",
- "reqwest_client",
- "serde",
- "serde_json",
- "settings",
- "sha2",
- "smol",
- "streaming-iterator",
- "tempfile",
- "theme",
- "tree-sitter",
- "ui",
- "unindent",
- "util",
- "workspace",
- "workspace-hack",
- "worktree",
- "zlog",
-]
-
 [[package]]
 name = "semantic_version"
 version = "0.1.0"
@@ -20915,7 +20836,7 @@ dependencies = [
  "aes",
  "byteorder",
  "bzip2",
- "constant_time_eq 0.1.5",
+ "constant_time_eq",
  "crc32fast",
  "crossbeam-utils",
  "flate2",
diff --git a/Cargo.toml b/Cargo.toml
index d8e8040cd9..c8d555a242 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -143,7 +143,6 @@ members = [
     "crates/rules_library",
     "crates/schema_generator",
     "crates/search",
-    "crates/semantic_index",
     "crates/semantic_version",
     "crates/session",
     "crates/settings",
@@ -373,7 +372,6 @@ rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
 search = { path = "crates/search" }
-semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
deleted file mode 100644
index c5fe14d9cf..0000000000
--- a/crates/semantic_index/Cargo.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-[package]
-name = "semantic_index"
-description = "Process, chunk, and embed text as vectors for semantic search."
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/semantic_index.rs"
-
-[[example]]
-name = "index"
-path = "examples/index.rs"
-crate-type = ["bin"]
-
-[dependencies]
-anyhow.workspace = true
-arrayvec.workspace = true
-blake3.workspace = true
-client.workspace = true
-clock.workspace = true
-collections.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures-batch.workspace = true
-futures.workspace = true
-gpui.workspace = true
-heed.workspace = true
-http_client.workspace = true
-language.workspace = true
-language_model.workspace = true
-log.workspace = true
-open_ai.workspace = true
-parking_lot.workspace = true
-project.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-sha2.workspace = true
-smol.workspace = true
-streaming-iterator.workspace = true
-theme.workspace = true
-tree-sitter.workspace = true
-ui.workspace = true
-unindent.workspace = true
-util.workspace = true
-workspace.workspace = true
-worktree.workspace = true
-workspace-hack.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-futures.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-languages.workspace = true
-project = { workspace = true, features = ["test-support"] }
-tempfile.workspace = true
-reqwest_client.workspace = true
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-worktree = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/semantic_index/LICENSE-GPL b/crates/semantic_index/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/semantic_index/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/semantic_index/examples/index.rs b/crates/semantic_index/examples/index.rs
deleted file mode 100644
index 86f1e53a60..0000000000
--- a/crates/semantic_index/examples/index.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use client::Client;
-use futures::channel::oneshot;
-use gpui::Application;
-use http_client::HttpClientWithUrl;
-use language::language_settings::AllLanguageSettings;
-use project::Project;
-use semantic_index::{OpenAiEmbeddingModel, OpenAiEmbeddingProvider, SemanticDb};
-use settings::SettingsStore;
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-fn main() {
-    zlog::init();
-
-    use clock::FakeSystemClock;
-
-    Application::new().run(|cx| {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        language::init(cx);
-        Project::init_settings(cx);
-        SettingsStore::update(cx, |store, cx| {
-            store.update_user_settings::<AllLanguageSettings>(cx, |_| {});
-        });
-
-        let clock = Arc::new(FakeSystemClock::new());
-
-        let http = Arc::new(HttpClientWithUrl::new(
-            Arc::new(
-                reqwest_client::ReqwestClient::user_agent("Zed semantic index example").unwrap(),
-            ),
-            "http://localhost:11434",
-            None,
-        ));
-        let client = client::Client::new(clock, http.clone(), cx);
-        Client::set_global(client, cx);
-
-        let args: Vec<String> = std::env::args().collect();
-        if args.len() < 2 {
-            eprintln!("Usage: cargo run --example index -p semantic_index -- <project_path>");
-            cx.quit();
-            return;
-        }
-
-        // let embedding_provider = semantic_index::FakeEmbeddingProvider;
-
-        let api_key = std::env::var("OPENAI_API_KEY").expect("OPENAI_API_KEY not set");
-
-        let embedding_provider = Arc::new(OpenAiEmbeddingProvider::new(
-            http,
-            OpenAiEmbeddingModel::TextEmbedding3Small,
-            open_ai::OPEN_AI_API_URL.to_string(),
-            api_key,
-        ));
-
-        cx.spawn(async move |cx| {
-            let semantic_index = SemanticDb::new(
-                PathBuf::from("/tmp/semantic-index-db.mdb"),
-                embedding_provider,
-                cx,
-            );
-
-            let mut semantic_index = semantic_index.await.unwrap();
-
-            let project_path = Path::new(&args[1]);
-
-            let project = Project::example([project_path], cx).await;
-
-            cx.update(|cx| {
-                let language_registry = project.read(cx).languages().clone();
-                let node_runtime = project.read(cx).node_runtime().unwrap().clone();
-                languages::init(language_registry, node_runtime, cx);
-            })
-            .unwrap();
-
-            let project_index = cx
-                .update(|cx| semantic_index.project_index(project.clone(), cx))
-                .unwrap()
-                .unwrap();
-
-            let (tx, rx) = oneshot::channel();
-            let mut tx = Some(tx);
-            let subscription = cx.update(|cx| {
-                cx.subscribe(&project_index, move |_, event, _| {
-                    if let Some(tx) = tx.take() {
-                        _ = tx.send(*event);
-                    }
-                })
-            });
-
-            let index_start = std::time::Instant::now();
-            rx.await.expect("no event emitted");
-            drop(subscription);
-            println!("Index time: {:?}", index_start.elapsed());
-
-            let results = cx
-                .update(|cx| {
-                    let project_index = project_index.read(cx);
-                    let query = "converting an anchor to a point";
-                    project_index.search(vec![query.into()], 4, cx)
-                })
-                .unwrap()
-                .await
-                .unwrap();
-
-            for search_result in results {
-                let path = search_result.path.clone();
-
-                let content = cx
-                    .update(|cx| {
-                        let worktree = search_result.worktree.read(cx);
-                        let entry_abs_path = worktree.abs_path().join(search_result.path.clone());
-                        let fs = project.read(cx).fs().clone();
-                        cx.spawn(async move |_| fs.load(&entry_abs_path).await.unwrap())
-                    })
-                    .unwrap()
-                    .await;
-
-                let range = search_result.range.clone();
-                let content = content[search_result.range].to_owned();
-
-                println!(
-                    "✄✄✄✄✄✄✄✄✄✄✄✄✄✄ {:?} @ {} ✄✄✄✄✄✄✄✄✄✄✄✄✄✄",
-                    path, search_result.score
-                );
-                println!("{:?}:{:?}:{:?}", path, range.start, range.end);
-                println!("{}", content);
-            }
-
-            cx.background_executor()
-                .timer(std::time::Duration::from_secs(100000))
-                .await;
-
-            cx.update(|cx| cx.quit()).unwrap();
-        })
-        .detach();
-    });
-}
diff --git a/crates/semantic_index/fixture/main.rs b/crates/semantic_index/fixture/main.rs
deleted file mode 100644
index f8796c8f45..0000000000
--- a/crates/semantic_index/fixture/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    println!("Hello Indexer!");
-}
diff --git a/crates/semantic_index/fixture/needle.md b/crates/semantic_index/fixture/needle.md
deleted file mode 100644
index 80487c9983..0000000000
--- a/crates/semantic_index/fixture/needle.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Searching for a needle in a haystack
-
-When you have a large amount of text, it can be useful to search for a specific word or phrase. This is often referred to as "finding a needle in a haystack." In this markdown document, we're "hiding" a key phrase for our text search to find. Can you find it?
-
-## Instructions
-
-1. Use the search functionality in your text editor or markdown viewer to find the hidden phrase in this document.
-
-2. Once you've found the **phrase**, write it down and proceed to the next step.
-
-Honestly, I just want to fill up plenty of characters so that we chunk this markdown into several chunks.
-
-## Tips
-
-- Relax
-- Take a deep breath
-- Focus on the task at hand
-- Don't get distracted by other text
-- Use the search functionality to your advantage
-
-## Example code
-
-```python
-def search_for_needle(haystack, needle):
-    if needle in haystack:
-        return True
-    else:
-        return False
-```
-
-```javascript
-function searchForNeedle(haystack, needle) {
-  return haystack.includes(needle);
-}
-```
-
-## Background
-
-When creating an index for a book or searching for a specific term in a large document, the ability to quickly find a specific word or phrase is essential. This is where search functionality comes in handy. However, one should _remember_ that the search is only as good as the index that was built. As they say, garbage in, garbage out!
-
-## Conclusion
-
-Searching for a needle in a haystack can be a challenging task, but with the right tools and techniques, it becomes much easier. Whether you're looking for a specific word in a document or trying to find a key piece of information in a large dataset, the ability to search efficiently is a valuable skill to have.
diff --git a/crates/semantic_index/src/chunking.rs b/crates/semantic_index/src/chunking.rs
deleted file mode 100644
index c1dfb6ccb5..0000000000
--- a/crates/semantic_index/src/chunking.rs
+++ /dev/null
@@ -1,415 +0,0 @@
-use language::{Language, with_parser, with_query_cursor};
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-use std::{
-    cmp::{self, Reverse},
-    ops::Range,
-    path::Path,
-    sync::Arc,
-};
-use streaming_iterator::StreamingIterator;
-use tree_sitter::QueryCapture;
-use util::ResultExt as _;
-
-#[derive(Copy, Clone)]
-struct ChunkSizeRange {
-    min: usize,
-    max: usize,
-}
-
-const CHUNK_SIZE_RANGE: ChunkSizeRange = ChunkSizeRange {
-    min: 1024,
-    max: 8192,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Chunk {
-    pub range: Range<usize>,
-    pub digest: [u8; 32],
-}
-
-pub fn chunk_text(text: &str, language: Option<&Arc<Language>>, path: &Path) -> Vec<Chunk> {
-    chunk_text_with_size_range(text, language, path, CHUNK_SIZE_RANGE)
-}
-
-fn chunk_text_with_size_range(
-    text: &str,
-    language: Option<&Arc<Language>>,
-    path: &Path,
-    size_config: ChunkSizeRange,
-) -> Vec<Chunk> {
-    let ranges = syntactic_ranges(text, language, path).unwrap_or_default();
-    chunk_text_with_syntactic_ranges(text, &ranges, size_config)
-}
-
-fn syntactic_ranges(
-    text: &str,
-    language: Option<&Arc<Language>>,
-    path: &Path,
-) -> Option<Vec<Range<usize>>> {
-    let language = language?;
-    let grammar = language.grammar()?;
-    let outline = grammar.outline_config.as_ref()?;
-    let tree = with_parser(|parser| {
-        parser.set_language(&grammar.ts_language).log_err()?;
-        parser.parse(text, None)
-    });
-
-    let Some(tree) = tree else {
-        log::error!("failed to parse file {path:?} for chunking");
-        return None;
-    };
-
-    struct RowInfo {
-        offset: usize,
-        is_comment: bool,
-    }
-
-    let scope = language.default_scope();
-    let line_comment_prefixes = scope.line_comment_prefixes();
-    let row_infos = text
-        .split('\n')
-        .map({
-            let mut offset = 0;
-            move |line| {
-                let line = line.trim_start();
-                let is_comment = line_comment_prefixes
-                    .iter()
-                    .any(|prefix| line.starts_with(prefix.as_ref()));
-                let result = RowInfo { offset, is_comment };
-                offset += line.len() + 1;
-                result
-            }
-        })
-        .collect::<Vec<_>>();
-
-    // Retrieve a list of ranges of outline items (types, functions, etc) in the document.
-    // Omit single-line outline items (e.g. struct fields, constant declarations), because
-    // we'll already be attempting to split on lines.
-    let mut ranges = with_query_cursor(|cursor| {
-        cursor
-            .matches(&outline.query, tree.root_node(), text.as_bytes())
-            .filter_map_deref(|mat| {
-                mat.captures
-                    .iter()
-                    .find_map(|QueryCapture { node, index }| {
-                        if *index == outline.item_capture_ix {
-                            let mut start_offset = node.start_byte();
-                            let mut start_row = node.start_position().row;
-                            let end_offset = node.end_byte();
-                            let end_row = node.end_position().row;
-
-                            // Expand the range to include any preceding comments.
-                            while start_row > 0 && row_infos[start_row - 1].is_comment {
-                                start_offset = row_infos[start_row - 1].offset;
-                                start_row -= 1;
-                            }
-
-                            if end_row > start_row {
-                                return Some(start_offset..end_offset);
-                            }
-                        }
-                        None
-                    })
-            })
-            .collect::<Vec<_>>()
-    });
-
-    ranges.sort_unstable_by_key(|range| (range.start, Reverse(range.end)));
-    Some(ranges)
-}
-
-fn chunk_text_with_syntactic_ranges(
-    text: &str,
-    mut syntactic_ranges: &[Range<usize>],
-    size_config: ChunkSizeRange,
-) -> Vec<Chunk> {
-    let mut chunks = Vec::new();
-    let mut range = 0..0;
-    let mut range_end_nesting_depth = 0;
-
-    // Try to split the text at line boundaries.
-    let mut line_ixs = text
-        .match_indices('\n')
-        .map(|(ix, _)| ix + 1)
-        .chain(if text.ends_with('\n') {
-            None
-        } else {
-            Some(text.len())
-        })
-        .peekable();
-
-    while let Some(&line_ix) = line_ixs.peek() {
-        // If the current position is beyond the maximum chunk size, then
-        // start a new chunk.
-        if line_ix - range.start > size_config.max {
-            if range.is_empty() {
-                range.end = cmp::min(range.start + size_config.max, line_ix);
-                while !text.is_char_boundary(range.end) {
-                    range.end -= 1;
-                }
-            }
-
-            chunks.push(Chunk {
-                range: range.clone(),
-                digest: Sha256::digest(&text[range.clone()]).into(),
-            });
-            range_end_nesting_depth = 0;
-            range.start = range.end;
-            continue;
-        }
-
-        // Discard any syntactic ranges that end before the current position.
-        while let Some(first_item) = syntactic_ranges.first() {
-            if first_item.end < line_ix {
-                syntactic_ranges = &syntactic_ranges[1..];
-                continue;
-            } else {
-                break;
-            }
-        }
-
-        // Count how many syntactic ranges contain the current position.
-        let mut nesting_depth = 0;
-        for range in syntactic_ranges {
-            if range.start > line_ix {
-                break;
-            }
-            if range.start < line_ix && range.end > line_ix {
-                nesting_depth += 1;
-            }
-        }
-
-        // Extend the current range to this position, unless an earlier candidate
-        // end position was less nested syntactically.
-        if range.len() < size_config.min || nesting_depth <= range_end_nesting_depth {
-            range.end = line_ix;
-            range_end_nesting_depth = nesting_depth;
-        }
-
-        line_ixs.next();
-    }
-
-    if !range.is_empty() {
-        chunks.push(Chunk {
-            range: range.clone(),
-            digest: Sha256::digest(&text[range]).into(),
-        });
-    }
-
-    chunks
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
-    use unindent::Unindent as _;
-
-    #[test]
-    fn test_chunk_text_with_syntax() {
-        let language = rust_language();
-
-        let text = "
-            struct Person {
-                first_name: String,
-                last_name: String,
-                age: u32,
-            }
-
-            impl Person {
-                fn new(first_name: String, last_name: String, age: u32) -> Self {
-                    Self { first_name, last_name, age }
-                }
-
-                /// Returns the first name
-                /// something something something
-                fn first_name(&self) -> &str {
-                    &self.first_name
-                }
-
-                fn last_name(&self) -> &str {
-                    &self.last_name
-                }
-
-                fn age(&self) -> u32 {
-                    self.age
-                }
-            }
-        "
-        .unindent();
-
-        let chunks = chunk_text_with_size_range(
-            &text,
-            Some(&language),
-            Path::new("lib.rs"),
-            ChunkSizeRange {
-                min: text.find('}').unwrap(),
-                max: text.find("Self {").unwrap(),
-            },
-        );
-
-        // The entire impl cannot fit in a chunk, so it is split.
-        // Within the impl, two methods can fit in a chunk.
-        assert_chunks(
-            &text,
-            &chunks,
-            &[
-                "struct Person {", // ...
-                "impl Person {",
-                "    /// Returns the first name",
-                "    fn last_name",
-            ],
-        );
-
-        let text = "
-            struct T {}
-            struct U {}
-            struct V {}
-            struct W {
-                a: T,
-                b: U,
-            }
-        "
-        .unindent();
-
-        let chunks = chunk_text_with_size_range(
-            &text,
-            Some(&language),
-            Path::new("lib.rs"),
-            ChunkSizeRange {
-                min: text.find('{').unwrap(),
-                max: text.find('V').unwrap(),
-            },
-        );
-
-        // Two single-line structs can fit in a chunk.
-        // The last struct cannot fit in a chunk together
-        // with the previous single-line struct.
-        assert_chunks(
-            &text,
-            &chunks,
-            &[
-                "struct T", // ...
-                "struct V", // ...
-                "struct W", // ...
-                "}",
-            ],
-        );
-    }
-
-    #[test]
-    fn test_chunk_with_long_lines() {
-        let language = rust_language();
-
-        let text = "
-            struct S { a: u32 }
-            struct T { a: u64 }
-            struct U { a: u64, b: u64, c: u64, d: u64, e: u64, f: u64, g: u64, h: u64, i: u64, j: u64 }
-            struct W { a: u64, b: u64, c: u64, d: u64, e: u64, f: u64, g: u64, h: u64, i: u64, j: u64 }
-        "
-        .unindent();
-
-        let chunks = chunk_text_with_size_range(
-            &text,
-            Some(&language),
-            Path::new("lib.rs"),
-            ChunkSizeRange { min: 32, max: 64 },
-        );
-
-        // The line is too long to fit in one chunk
-        assert_chunks(
-            &text,
-            &chunks,
-            &[
-                "struct S {", // ...
-                "struct U",
-                "4, h: u64, i: u64", // ...
-                "struct W",
-                "4, h: u64, i: u64", // ...
-            ],
-        );
-    }
-
-    #[track_caller]
-    fn assert_chunks(text: &str, chunks: &[Chunk], expected_chunk_text_prefixes: &[&str]) {
-        check_chunk_invariants(text, chunks);
-
-        assert_eq!(
-            chunks.len(),
-            expected_chunk_text_prefixes.len(),
-            "unexpected number of chunks: {chunks:?}",
-        );
-
-        let mut prev_chunk_end = 0;
-        for (ix, chunk) in chunks.iter().enumerate() {
-            let expected_prefix = expected_chunk_text_prefixes[ix];
-            let chunk_text = &text[chunk.range.clone()];
-            if !chunk_text.starts_with(expected_prefix) {
-                let chunk_prefix_offset = text[prev_chunk_end..].find(expected_prefix);
-                if let Some(chunk_prefix_offset) = chunk_prefix_offset {
-                    panic!(
-                        "chunk {ix} starts at unexpected offset {}. expected {}",
-                        chunk.range.start,
-                        chunk_prefix_offset + prev_chunk_end
-                    );
-                } else {
-                    panic!("invalid expected chunk prefix {ix}: {expected_prefix:?}");
-                }
-            }
-            prev_chunk_end = chunk.range.end;
-        }
-    }
-
-    #[track_caller]
-    fn check_chunk_invariants(text: &str, chunks: &[Chunk]) {
-        for (ix, chunk) in chunks.iter().enumerate() {
-            if ix > 0 && chunk.range.start != chunks[ix - 1].range.end {
-                panic!("chunk ranges are not contiguous: {:?}", chunks);
-            }
-        }
-
-        if text.is_empty() {
-            assert!(chunks.is_empty())
-        } else if chunks.first().unwrap().range.start != 0
-            || chunks.last().unwrap().range.end != text.len()
-        {
-            panic!("chunks don't cover entire text {:?}", chunks);
-        }
-    }
-
-    #[test]
-    fn test_chunk_text() {
-        let text = "a\n".repeat(1000);
-        let chunks = chunk_text(&text, None, Path::new("lib.rs"));
-        assert_eq!(
-            chunks.len(),
-            ((2000_f64) / (CHUNK_SIZE_RANGE.max as f64)).ceil() as usize
-        );
-    }
-
-    fn rust_language() -> Arc<Language> {
-        Arc::new(
-            Language::new(
-                LanguageConfig {
-                    name: "Rust".into(),
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec!["rs".to_string()],
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_outline_query(
-                "
-            (function_item name: (_) @name) @item
-            (impl_item type: (_) @name) @item
-            (struct_item name: (_) @name) @item
-            (field_declaration name: (_) @name) @item
-        ",
-            )
-            .unwrap(),
-        )
-    }
-}
diff --git a/crates/semantic_index/src/embedding.rs b/crates/semantic_index/src/embedding.rs
deleted file mode 100644
index 8ca47a4023..0000000000
--- a/crates/semantic_index/src/embedding.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-mod lmstudio;
-mod ollama;
-mod open_ai;
-
-pub use lmstudio::*;
-pub use ollama::*;
-pub use open_ai::*;
-use sha2::{Digest, Sha256};
-
-use anyhow::Result;
-use futures::{FutureExt, future::BoxFuture};
-use serde::{Deserialize, Serialize};
-use std::{fmt, future};
-
-/// Trait for embedding providers. Texts in, vectors out.
-pub trait EmbeddingProvider: Sync + Send {
-    fn embed<'a>(&'a self, texts: &'a [TextToEmbed<'a>]) -> BoxFuture<'a, Result<Vec<Embedding>>>;
-    fn batch_size(&self) -> usize;
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
-pub struct Embedding(Vec<f32>);
-
-impl Embedding {
-    pub fn new(mut embedding: Vec<f32>) -> Self {
-        let len = embedding.len();
-        let mut norm = 0f32;
-
-        for i in 0..len {
-            norm += embedding[i] * embedding[i];
-        }
-
-        norm = norm.sqrt();
-        for dimension in &mut embedding {
-            *dimension /= norm;
-        }
-
-        Self(embedding)
-    }
-
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    pub fn similarity(&self, others: &[Embedding]) -> (f32, usize) {
-        debug_assert!(others.iter().all(|other| self.0.len() == other.0.len()));
-        others
-            .iter()
-            .enumerate()
-            .map(|(index, other)| {
-                let dot_product: f32 = self
-                    .0
-                    .iter()
-                    .copied()
-                    .zip(other.0.iter().copied())
-                    .map(|(a, b)| a * b)
-                    .sum();
-                (dot_product, index)
-            })
-            .max_by(|a, b| a.0.partial_cmp(&b.0).unwrap_or(std::cmp::Ordering::Equal))
-            .unwrap_or((0.0, 0))
-    }
-}
-
-impl fmt::Display for Embedding {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let digits_to_display = 3;
-
-        // Start the Embedding display format
-        write!(f, "Embedding(sized: {}; values: [", self.len())?;
-
-        for (index, value) in self.0.iter().enumerate().take(digits_to_display) {
-            // Lead with comma if not the first element
-            if index != 0 {
-                write!(f, ", ")?;
-            }
-            write!(f, "{:.3}", value)?;
-        }
-        if self.len() > digits_to_display {
-            write!(f, "...")?;
-        }
-        write!(f, "])")
-    }
-}
-
-#[derive(Debug)]
-pub struct TextToEmbed<'a> {
-    pub text: &'a str,
-    pub digest: [u8; 32],
-}
-
-impl<'a> TextToEmbed<'a> {
-    pub fn new(text: &'a str) -> Self {
-        let digest = Sha256::digest(text.as_bytes());
-        Self {
-            text,
-            digest: digest.into(),
-        }
-    }
-}
-
-pub struct FakeEmbeddingProvider;
-
-impl EmbeddingProvider for FakeEmbeddingProvider {
-    fn embed<'a>(&'a self, texts: &'a [TextToEmbed<'a>]) -> BoxFuture<'a, Result<Vec<Embedding>>> {
-        let embeddings = texts
-            .iter()
-            .map(|_text| {
-                let mut embedding = vec![0f32; 1536];
-                for i in 0..embedding.len() {
-                    embedding[i] = i as f32;
-                }
-                Embedding::new(embedding)
-            })
-            .collect();
-        future::ready(Ok(embeddings)).boxed()
-    }
-
-    fn batch_size(&self) -> usize {
-        16
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[gpui::test]
-    fn test_normalize_embedding() {
-        let normalized = Embedding::new(vec![1.0, 1.0, 1.0]);
-        let value: f32 = 1.0 / 3.0_f32.sqrt();
-        assert_eq!(normalized, Embedding(vec![value; 3]));
-    }
-}
diff --git a/crates/semantic_index/src/embedding/lmstudio.rs b/crates/semantic_index/src/embedding/lmstudio.rs
deleted file mode 100644
index 73e52aa0bf..0000000000
--- a/crates/semantic_index/src/embedding/lmstudio.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use anyhow::{Context as _, Result};
-use futures::{AsyncReadExt as _, FutureExt, future::BoxFuture};
-use http_client::HttpClient;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-use crate::{Embedding, EmbeddingProvider, TextToEmbed};
-
-pub enum LmStudioEmbeddingModel {
-    NomicEmbedText,
-}
-
-pub struct LmStudioEmbeddingProvider {
-    client: Arc<dyn HttpClient>,
-    model: LmStudioEmbeddingModel,
-}
-
-#[derive(Serialize)]
-struct LmStudioEmbeddingRequest {
-    model: String,
-    prompt: String,
-}
-
-#[derive(Deserialize)]
-struct LmStudioEmbeddingResponse {
-    embedding: Vec<f32>,
-}
-
-impl LmStudioEmbeddingProvider {
-    pub fn new(client: Arc<dyn HttpClient>, model: LmStudioEmbeddingModel) -> Self {
-        Self { client, model }
-    }
-}
-
-impl EmbeddingProvider for LmStudioEmbeddingProvider {
-    fn embed<'a>(&'a self, texts: &'a [TextToEmbed<'a>]) -> BoxFuture<'a, Result<Vec<Embedding>>> {
-        let model = match self.model {
-            LmStudioEmbeddingModel::NomicEmbedText => "nomic-embed-text",
-        };
-
-        futures::future::try_join_all(texts.iter().map(|to_embed| {
-            let request = LmStudioEmbeddingRequest {
-                model: model.to_string(),
-                prompt: to_embed.text.to_string(),
-            };
-
-            let request = serde_json::to_string(&request).unwrap();
-
-            async {
-                let response = self
-                    .client
-                    .post_json("http://localhost:1234/api/v0/embeddings", request.into())
-                    .await?;
-
-                let mut body = String::new();
-                response.into_body().read_to_string(&mut body).await?;
-
-                let response: LmStudioEmbeddingResponse =
-                    serde_json::from_str(&body).context("Unable to parse response")?;
-
-                Ok(Embedding::new(response.embedding))
-            }
-        }))
-        .boxed()
-    }
-
-    fn batch_size(&self) -> usize {
-        256
-    }
-}
diff --git a/crates/semantic_index/src/embedding/ollama.rs b/crates/semantic_index/src/embedding/ollama.rs
deleted file mode 100644
index 5737609e24..0000000000
--- a/crates/semantic_index/src/embedding/ollama.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use anyhow::{Context as _, Result};
-use futures::{AsyncReadExt as _, FutureExt, future::BoxFuture};
-use http_client::HttpClient;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-use crate::{Embedding, EmbeddingProvider, TextToEmbed};
-
-pub enum OllamaEmbeddingModel {
-    NomicEmbedText,
-    MxbaiEmbedLarge,
-}
-
-pub struct OllamaEmbeddingProvider {
-    client: Arc<dyn HttpClient>,
-    model: OllamaEmbeddingModel,
-}
-
-#[derive(Serialize)]
-struct OllamaEmbeddingRequest {
-    model: String,
-    prompt: String,
-}
-
-#[derive(Deserialize)]
-struct OllamaEmbeddingResponse {
-    embedding: Vec<f32>,
-}
-
-impl OllamaEmbeddingProvider {
-    pub fn new(client: Arc<dyn HttpClient>, model: OllamaEmbeddingModel) -> Self {
-        Self { client, model }
-    }
-}
-
-impl EmbeddingProvider for OllamaEmbeddingProvider {
-    fn embed<'a>(&'a self, texts: &'a [TextToEmbed<'a>]) -> BoxFuture<'a, Result<Vec<Embedding>>> {
-        //
-        let model = match self.model {
-            OllamaEmbeddingModel::NomicEmbedText => "nomic-embed-text",
-            OllamaEmbeddingModel::MxbaiEmbedLarge => "mxbai-embed-large",
-        };
-
-        futures::future::try_join_all(texts.iter().map(|to_embed| {
-            let request = OllamaEmbeddingRequest {
-                model: model.to_string(),
-                prompt: to_embed.text.to_string(),
-            };
-
-            let request = serde_json::to_string(&request).unwrap();
-
-            async {
-                let response = self
-                    .client
-                    .post_json("http://localhost:11434/api/embeddings", request.into())
-                    .await?;
-
-                let mut body = String::new();
-                response.into_body().read_to_string(&mut body).await?;
-
-                let response: OllamaEmbeddingResponse =
-                    serde_json::from_str(&body).context("Unable to pull response")?;
-
-                Ok(Embedding::new(response.embedding))
-            }
-        }))
-        .boxed()
-    }
-
-    fn batch_size(&self) -> usize {
-        // TODO: Figure out decent value
-        10
-    }
-}
diff --git a/crates/semantic_index/src/embedding/open_ai.rs b/crates/semantic_index/src/embedding/open_ai.rs
deleted file mode 100644
index da2b3bd2e4..0000000000
--- a/crates/semantic_index/src/embedding/open_ai.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use crate::{Embedding, EmbeddingProvider, TextToEmbed};
-use anyhow::Result;
-use futures::{FutureExt, future::BoxFuture};
-use http_client::HttpClient;
-pub use open_ai::OpenAiEmbeddingModel;
-use std::sync::Arc;
-
-pub struct OpenAiEmbeddingProvider {
-    client: Arc<dyn HttpClient>,
-    model: OpenAiEmbeddingModel,
-    api_url: String,
-    api_key: String,
-}
-
-impl OpenAiEmbeddingProvider {
-    pub fn new(
-        client: Arc<dyn HttpClient>,
-        model: OpenAiEmbeddingModel,
-        api_url: String,
-        api_key: String,
-    ) -> Self {
-        Self {
-            client,
-            model,
-            api_url,
-            api_key,
-        }
-    }
-}
-
-impl EmbeddingProvider for OpenAiEmbeddingProvider {
-    fn embed<'a>(&'a self, texts: &'a [TextToEmbed<'a>]) -> BoxFuture<'a, Result<Vec<Embedding>>> {
-        let embed = open_ai::embed(
-            self.client.as_ref(),
-            &self.api_url,
-            &self.api_key,
-            self.model,
-            texts.iter().map(|to_embed| to_embed.text),
-        );
-        async move {
-            let response = embed.await?;
-            Ok(response
-                .data
-                .into_iter()
-                .map(|data| Embedding::new(data.embedding))
-                .collect())
-        }
-        .boxed()
-    }
-
-    fn batch_size(&self) -> usize {
-        // From https://platform.openai.com/docs/api-reference/embeddings/create
-        2048
-    }
-}
diff --git a/crates/semantic_index/src/embedding_index.rs b/crates/semantic_index/src/embedding_index.rs
deleted file mode 100644
index c54cd9d3c3..0000000000
--- a/crates/semantic_index/src/embedding_index.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-use crate::{
-    chunking::{self, Chunk},
-    embedding::{Embedding, EmbeddingProvider, TextToEmbed},
-    indexing::{IndexingEntryHandle, IndexingEntrySet},
-};
-use anyhow::{Context as _, Result};
-use collections::Bound;
-use feature_flags::FeatureFlagAppExt;
-use fs::Fs;
-use fs::MTime;
-use futures::{FutureExt as _, stream::StreamExt};
-use futures_batch::ChunksTimeoutStreamExt;
-use gpui::{App, AppContext as _, Entity, Task};
-use heed::types::{SerdeBincode, Str};
-use language::LanguageRegistry;
-use log;
-use project::{Entry, UpdatedEntriesSet, Worktree};
-use serde::{Deserialize, Serialize};
-use smol::channel;
-use std::{cmp::Ordering, future::Future, iter, path::Path, pin::pin, sync::Arc, time::Duration};
-use util::ResultExt;
-use worktree::Snapshot;
-
-pub struct EmbeddingIndex {
-    worktree: Entity<Worktree>,
-    db_connection: heed::Env,
-    db: heed::Database<Str, SerdeBincode<EmbeddedFile>>,
-    fs: Arc<dyn Fs>,
-    language_registry: Arc<LanguageRegistry>,
-    embedding_provider: Arc<dyn EmbeddingProvider>,
-    entry_ids_being_indexed: Arc<IndexingEntrySet>,
-}
-
-impl EmbeddingIndex {
-    pub fn new(
-        worktree: Entity<Worktree>,
-        fs: Arc<dyn Fs>,
-        db_connection: heed::Env,
-        embedding_db: heed::Database<Str, SerdeBincode<EmbeddedFile>>,
-        language_registry: Arc<LanguageRegistry>,
-        embedding_provider: Arc<dyn EmbeddingProvider>,
-        entry_ids_being_indexed: Arc<IndexingEntrySet>,
-    ) -> Self {
-        Self {
-            worktree,
-            fs,
-            db_connection,
-            db: embedding_db,
-            language_registry,
-            embedding_provider,
-            entry_ids_being_indexed,
-        }
-    }
-
-    pub fn db(&self) -> &heed::Database<Str, SerdeBincode<EmbeddedFile>> {
-        &self.db
-    }
-
-    pub fn index_entries_changed_on_disk(
-        &self,
-        cx: &App,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        if !cx.is_staff() {
-            return async move { Ok(()) }.boxed();
-        }
-
-        let worktree = self.worktree.read(cx).snapshot();
-        let worktree_abs_path = worktree.abs_path().clone();
-        let scan = self.scan_entries(worktree, cx);
-        let chunk = self.chunk_files(worktree_abs_path, scan.updated_entries, cx);
-        let embed = Self::embed_files(self.embedding_provider.clone(), chunk.files, cx);
-        let persist = self.persist_embeddings(scan.deleted_entry_ranges, embed.files, cx);
-        async move {
-            futures::try_join!(scan.task, chunk.task, embed.task, persist)?;
-            Ok(())
-        }
-        .boxed()
-    }
-
-    pub fn index_updated_entries(
-        &self,
-        updated_entries: UpdatedEntriesSet,
-        cx: &App,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        if !cx.is_staff() {
-            return async move { Ok(()) }.boxed();
-        }
-
-        let worktree = self.worktree.read(cx).snapshot();
-        let worktree_abs_path = worktree.abs_path().clone();
-        let scan = self.scan_updated_entries(worktree, updated_entries, cx);
-        let chunk = self.chunk_files(worktree_abs_path, scan.updated_entries, cx);
-        let embed = Self::embed_files(self.embedding_provider.clone(), chunk.files, cx);
-        let persist = self.persist_embeddings(scan.deleted_entry_ranges, embed.files, cx);
-        async move {
-            futures::try_join!(scan.task, chunk.task, embed.task, persist)?;
-            Ok(())
-        }
-        .boxed()
-    }
-
-    fn scan_entries(&self, worktree: Snapshot, cx: &App) -> ScanEntries {
-        let (updated_entries_tx, updated_entries_rx) = channel::bounded(512);
-        let (deleted_entry_ranges_tx, deleted_entry_ranges_rx) = channel::bounded(128);
-        let db_connection = self.db_connection.clone();
-        let db = self.db;
-        let entries_being_indexed = self.entry_ids_being_indexed.clone();
-        let task = cx.background_spawn(async move {
-            let txn = db_connection
-                .read_txn()
-                .context("failed to create read transaction")?;
-            let mut db_entries = db
-                .iter(&txn)
-                .context("failed to create iterator")?
-                .move_between_keys()
-                .peekable();
-
-            let mut deletion_range: Option<(Bound<&str>, Bound<&str>)> = None;
-            for entry in worktree.files(false, 0) {
-                log::trace!("scanning for embedding index: {:?}", &entry.path);
-
-                let entry_db_key = db_key_for_path(&entry.path);
-
-                let mut saved_mtime = None;
-                while let Some(db_entry) = db_entries.peek() {
-                    match db_entry {
-                        Ok((db_path, db_embedded_file)) => match (*db_path).cmp(&entry_db_key) {
-                            Ordering::Less => {
-                                if let Some(deletion_range) = deletion_range.as_mut() {
-                                    deletion_range.1 = Bound::Included(db_path);
-                                } else {
-                                    deletion_range =
-                                        Some((Bound::Included(db_path), Bound::Included(db_path)));
-                                }
-
-                                db_entries.next();
-                            }
-                            Ordering::Equal => {
-                                if let Some(deletion_range) = deletion_range.take() {
-                                    deleted_entry_ranges_tx
-                                        .send((
-                                            deletion_range.0.map(ToString::to_string),
-                                            deletion_range.1.map(ToString::to_string),
-                                        ))
-                                        .await?;
-                                }
-                                saved_mtime = db_embedded_file.mtime;
-                                db_entries.next();
-                                break;
-                            }
-                            Ordering::Greater => {
-                                break;
-                            }
-                        },
-                        Err(_) => return Err(db_entries.next().unwrap().unwrap_err())?,
-                    }
-                }
-
-                if entry.mtime != saved_mtime {
-                    let handle = entries_being_indexed.insert(entry.id);
-                    updated_entries_tx.send((entry.clone(), handle)).await?;
-                }
-            }
-
-            if let Some(db_entry) = db_entries.next() {
-                let (db_path, _) = db_entry?;
-                deleted_entry_ranges_tx
-                    .send((Bound::Included(db_path.to_string()), Bound::Unbounded))
-                    .await?;
-            }
-
-            Ok(())
-        });
-
-        ScanEntries {
-            updated_entries: updated_entries_rx,
-            deleted_entry_ranges: deleted_entry_ranges_rx,
-            task,
-        }
-    }
-
-    fn scan_updated_entries(
-        &self,
-        worktree: Snapshot,
-        updated_entries: UpdatedEntriesSet,
-        cx: &App,
-    ) -> ScanEntries {
-        let (updated_entries_tx, updated_entries_rx) = channel::bounded(512);
-        let (deleted_entry_ranges_tx, deleted_entry_ranges_rx) = channel::bounded(128);
-        let entries_being_indexed = self.entry_ids_being_indexed.clone();
-        let task = cx.background_spawn(async move {
-            for (path, entry_id, status) in updated_entries.iter() {
-                match status {
-                    project::PathChange::Added
-                    | project::PathChange::Updated
-                    | project::PathChange::AddedOrUpdated => {
-                        if let Some(entry) = worktree.entry_for_id(*entry_id)
-                            && entry.is_file()
-                        {
-                            let handle = entries_being_indexed.insert(entry.id);
-                            updated_entries_tx.send((entry.clone(), handle)).await?;
-                        }
-                    }
-                    project::PathChange::Removed => {
-                        let db_path = db_key_for_path(path);
-                        deleted_entry_ranges_tx
-                            .send((Bound::Included(db_path.clone()), Bound::Included(db_path)))
-                            .await?;
-                    }
-                    project::PathChange::Loaded => {
-                        // Do nothing.
-                    }
-                }
-            }
-
-            Ok(())
-        });
-
-        ScanEntries {
-            updated_entries: updated_entries_rx,
-            deleted_entry_ranges: deleted_entry_ranges_rx,
-            task,
-        }
-    }
-
-    fn chunk_files(
-        &self,
-        worktree_abs_path: Arc<Path>,
-        entries: channel::Receiver<(Entry, IndexingEntryHandle)>,
-        cx: &App,
-    ) -> ChunkFiles {
-        let language_registry = self.language_registry.clone();
-        let fs = self.fs.clone();
-        let (chunked_files_tx, chunked_files_rx) = channel::bounded(2048);
-        let task = cx.spawn(async move |cx| {
-            cx.background_executor()
-                .scoped(|cx| {
-                    for _ in 0..cx.num_cpus() {
-                        cx.spawn(async {
-                            while let Ok((entry, handle)) = entries.recv().await {
-                                let entry_abs_path = worktree_abs_path.join(&entry.path);
-                                if let Some(text) = fs.load(&entry_abs_path).await.ok() {
-                                    let language = language_registry
-                                        .language_for_file_path(&entry.path)
-                                        .await
-                                        .ok();
-                                    let chunked_file = ChunkedFile {
-                                        chunks: chunking::chunk_text(
-                                            &text,
-                                            language.as_ref(),
-                                            &entry.path,
-                                        ),
-                                        handle,
-                                        path: entry.path,
-                                        mtime: entry.mtime,
-                                        text,
-                                    };
-
-                                    if chunked_files_tx.send(chunked_file).await.is_err() {
-                                        return;
-                                    }
-                                }
-                            }
-                        });
-                    }
-                })
-                .await;
-            Ok(())
-        });
-
-        ChunkFiles {
-            files: chunked_files_rx,
-            task,
-        }
-    }
-
-    pub fn embed_files(
-        embedding_provider: Arc<dyn EmbeddingProvider>,
-        chunked_files: channel::Receiver<ChunkedFile>,
-        cx: &App,
-    ) -> EmbedFiles {
-        let embedding_provider = embedding_provider.clone();
-        let (embedded_files_tx, embedded_files_rx) = channel::bounded(512);
-        let task = cx.background_spawn(async move {
-            let mut chunked_file_batches =
-                pin!(chunked_files.chunks_timeout(512, Duration::from_secs(2)));
-            while let Some(chunked_files) = chunked_file_batches.next().await {
-                // View the batch of files as a vec of chunks
-                // Flatten out to a vec of chunks that we can subdivide into batch sized pieces
-                // Once those are done, reassemble them back into the files in which they belong
-                // If any embeddings fail for a file, the entire file is discarded
-
-                let chunks: Vec<TextToEmbed> = chunked_files
-                    .iter()
-                    .flat_map(|file| {
-                        file.chunks.iter().map(|chunk| TextToEmbed {
-                            text: &file.text[chunk.range.clone()],
-                            digest: chunk.digest,
-                        })
-                    })
-                    .collect::<Vec<_>>();
-
-                let mut embeddings: Vec<Option<Embedding>> = Vec::new();
-                for embedding_batch in chunks.chunks(embedding_provider.batch_size()) {
-                    if let Some(batch_embeddings) =
-                        embedding_provider.embed(embedding_batch).await.log_err()
-                    {
-                        if batch_embeddings.len() == embedding_batch.len() {
-                            embeddings.extend(batch_embeddings.into_iter().map(Some));
-                            continue;
-                        }
-                        log::error!(
-                            "embedding provider returned unexpected embedding count {}, expected {}",
-                            batch_embeddings.len(), embedding_batch.len()
-                        );
-                    }
-
-                    embeddings.extend(iter::repeat(None).take(embedding_batch.len()));
-                }
-
-                let mut embeddings = embeddings.into_iter();
-                for chunked_file in chunked_files {
-                    let mut embedded_file = EmbeddedFile {
-                        path: chunked_file.path,
-                        mtime: chunked_file.mtime,
-                        chunks: Vec::new(),
-                    };
-
-                    let mut embedded_all_chunks = true;
-                    for (chunk, embedding) in
-                        chunked_file.chunks.into_iter().zip(embeddings.by_ref())
-                    {
-                        if let Some(embedding) = embedding {
-                            embedded_file
-                                .chunks
-                                .push(EmbeddedChunk { chunk, embedding });
-                        } else {
-                            embedded_all_chunks = false;
-                        }
-                    }
-
-                    if embedded_all_chunks {
-                        embedded_files_tx
-                            .send((embedded_file, chunked_file.handle))
-                            .await?;
-                    }
-                }
-            }
-            Ok(())
-        });
-
-        EmbedFiles {
-            files: embedded_files_rx,
-            task,
-        }
-    }
-
-    fn persist_embeddings(
-        &self,
-        deleted_entry_ranges: channel::Receiver<(Bound<String>, Bound<String>)>,
-        embedded_files: channel::Receiver<(EmbeddedFile, IndexingEntryHandle)>,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let db_connection = self.db_connection.clone();
-        let db = self.db;
-
-        cx.background_spawn(async move {
-            let mut deleted_entry_ranges = pin!(deleted_entry_ranges);
-            let mut embedded_files = pin!(embedded_files);
-            loop {
-                // Interleave deletions and persists of embedded files
-                futures::select_biased! {
-                    deletion_range = deleted_entry_ranges.next() => {
-                        if let Some(deletion_range) = deletion_range {
-                            let mut txn = db_connection.write_txn()?;
-                            let start = deletion_range.0.as_ref().map(|start| start.as_str());
-                            let end = deletion_range.1.as_ref().map(|end| end.as_str());
-                            log::debug!("deleting embeddings in range {:?}", &(start, end));
-                            db.delete_range(&mut txn, &(start, end))?;
-                            txn.commit()?;
-                        }
-                    },
-                    file = embedded_files.next() => {
-                        if let Some((file, _)) = file {
-                            let mut txn = db_connection.write_txn()?;
-                            log::debug!("saving embedding for file {:?}", file.path);
-                            let key = db_key_for_path(&file.path);
-                            db.put(&mut txn, &key, &file)?;
-                            txn.commit()?;
-                        }
-                    },
-                    complete => break,
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    pub fn paths(&self, cx: &App) -> Task<Result<Vec<Arc<Path>>>> {
-        let connection = self.db_connection.clone();
-        let db = self.db;
-        cx.background_spawn(async move {
-            let tx = connection
-                .read_txn()
-                .context("failed to create read transaction")?;
-            let result = db
-                .iter(&tx)?
-                .map(|entry| Ok(entry?.1.path))
-                .collect::<Result<Vec<Arc<Path>>>>();
-            drop(tx);
-            result
-        })
-    }
-
-    pub fn chunks_for_path(&self, path: Arc<Path>, cx: &App) -> Task<Result<Vec<EmbeddedChunk>>> {
-        let connection = self.db_connection.clone();
-        let db = self.db;
-        cx.background_spawn(async move {
-            let tx = connection
-                .read_txn()
-                .context("failed to create read transaction")?;
-            Ok(db
-                .get(&tx, &db_key_for_path(&path))?
-                .context("no such path")?
-                .chunks)
-        })
-    }
-}
-
-struct ScanEntries {
-    updated_entries: channel::Receiver<(Entry, IndexingEntryHandle)>,
-    deleted_entry_ranges: channel::Receiver<(Bound<String>, Bound<String>)>,
-    task: Task<Result<()>>,
-}
-
-struct ChunkFiles {
-    files: channel::Receiver<ChunkedFile>,
-    task: Task<Result<()>>,
-}
-
-pub struct ChunkedFile {
-    pub path: Arc<Path>,
-    pub mtime: Option<MTime>,
-    pub handle: IndexingEntryHandle,
-    pub text: String,
-    pub chunks: Vec<Chunk>,
-}
-
-pub struct EmbedFiles {
-    pub files: channel::Receiver<(EmbeddedFile, IndexingEntryHandle)>,
-    pub task: Task<Result<()>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct EmbeddedFile {
-    pub path: Arc<Path>,
-    pub mtime: Option<MTime>,
-    pub chunks: Vec<EmbeddedChunk>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct EmbeddedChunk {
-    pub chunk: Chunk,
-    pub embedding: Embedding,
-}
-
-fn db_key_for_path(path: &Arc<Path>) -> String {
-    path.to_string_lossy().replace('/', "\0")
-}
diff --git a/crates/semantic_index/src/indexing.rs b/crates/semantic_index/src/indexing.rs
deleted file mode 100644
index aca9504891..0000000000
--- a/crates/semantic_index/src/indexing.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use collections::HashSet;
-use parking_lot::Mutex;
-use project::ProjectEntryId;
-use smol::channel;
-use std::sync::{Arc, Weak};
-
-/// The set of entries that are currently being indexed.
-pub struct IndexingEntrySet {
-    entry_ids: Mutex<HashSet<ProjectEntryId>>,
-    tx: channel::Sender<()>,
-}
-
-/// When dropped, removes the entry from the set of entries that are being indexed.
-#[derive(Clone)]
-pub(crate) struct IndexingEntryHandle {
-    entry_id: ProjectEntryId,
-    set: Weak<IndexingEntrySet>,
-}
-
-impl IndexingEntrySet {
-    pub fn new(tx: channel::Sender<()>) -> Self {
-        Self {
-            entry_ids: Default::default(),
-            tx,
-        }
-    }
-
-    pub fn insert(self: &Arc<Self>, entry_id: ProjectEntryId) -> IndexingEntryHandle {
-        self.entry_ids.lock().insert(entry_id);
-        self.tx.send_blocking(()).ok();
-        IndexingEntryHandle {
-            entry_id,
-            set: Arc::downgrade(self),
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.entry_ids.lock().len()
-    }
-}
-
-impl Drop for IndexingEntryHandle {
-    fn drop(&mut self) {
-        if let Some(set) = self.set.upgrade() {
-            set.tx.send_blocking(()).ok();
-            set.entry_ids.lock().remove(&self.entry_id);
-        }
-    }
-}
diff --git a/crates/semantic_index/src/project_index.rs b/crates/semantic_index/src/project_index.rs
deleted file mode 100644
index 60b2770dd3..0000000000
--- a/crates/semantic_index/src/project_index.rs
+++ /dev/null
@@ -1,548 +0,0 @@
-use crate::{
-    embedding::{EmbeddingProvider, TextToEmbed},
-    summary_index::FileSummary,
-    worktree_index::{WorktreeIndex, WorktreeIndexHandle},
-};
-use anyhow::{Context as _, Result, anyhow};
-use collections::HashMap;
-use fs::Fs;
-use futures::FutureExt;
-use gpui::{
-    App, AppContext as _, Context, Entity, EntityId, EventEmitter, Subscription, Task, WeakEntity,
-};
-use language::LanguageRegistry;
-use log;
-use project::{Project, Worktree, WorktreeId};
-use serde::{Deserialize, Serialize};
-use smol::channel;
-use std::{
-    cmp::Ordering,
-    future::Future,
-    num::NonZeroUsize,
-    ops::{Range, RangeInclusive},
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::ResultExt;
-
-#[derive(Debug)]
-pub struct SearchResult {
-    pub worktree: Entity<Worktree>,
-    pub path: Arc<Path>,
-    pub range: Range<usize>,
-    pub score: f32,
-    pub query_index: usize,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct LoadedSearchResult {
-    pub path: Arc<Path>,
-    pub full_path: PathBuf,
-    pub excerpt_content: String,
-    pub row_range: RangeInclusive<u32>,
-    pub query_index: usize,
-}
-
-pub struct WorktreeSearchResult {
-    pub worktree_id: WorktreeId,
-    pub path: Arc<Path>,
-    pub range: Range<usize>,
-    pub query_index: usize,
-    pub score: f32,
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub enum Status {
-    Idle,
-    Loading,
-    Scanning { remaining_count: NonZeroUsize },
-}
-
-pub struct ProjectIndex {
-    db_connection: heed::Env,
-    project: WeakEntity<Project>,
-    worktree_indices: HashMap<EntityId, WorktreeIndexHandle>,
-    language_registry: Arc<LanguageRegistry>,
-    fs: Arc<dyn Fs>,
-    last_status: Status,
-    status_tx: channel::Sender<()>,
-    embedding_provider: Arc<dyn EmbeddingProvider>,
-    _maintain_status: Task<()>,
-    _subscription: Subscription,
-}
-
-impl ProjectIndex {
-    pub fn new(
-        project: Entity<Project>,
-        db_connection: heed::Env,
-        embedding_provider: Arc<dyn EmbeddingProvider>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let language_registry = project.read(cx).languages().clone();
-        let fs = project.read(cx).fs().clone();
-        let (status_tx, status_rx) = channel::unbounded();
-        let mut this = ProjectIndex {
-            db_connection,
-            project: project.downgrade(),
-            worktree_indices: HashMap::default(),
-            language_registry,
-            fs,
-            status_tx,
-            last_status: Status::Idle,
-            embedding_provider,
-            _subscription: cx.subscribe(&project, Self::handle_project_event),
-            _maintain_status: cx.spawn(async move |this, cx| {
-                while status_rx.recv().await.is_ok() {
-                    if this.update(cx, |this, cx| this.update_status(cx)).is_err() {
-                        break;
-                    }
-                }
-            }),
-        };
-        this.update_worktree_indices(cx);
-        this
-    }
-
-    pub fn status(&self) -> Status {
-        self.last_status
-    }
-
-    pub fn project(&self) -> WeakEntity<Project> {
-        self.project.clone()
-    }
-
-    pub fn fs(&self) -> Arc<dyn Fs> {
-        self.fs.clone()
-    }
-
-    fn handle_project_event(
-        &mut self,
-        _: Entity<Project>,
-        event: &project::Event,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::Event::WorktreeAdded(_) | project::Event::WorktreeRemoved(_) => {
-                self.update_worktree_indices(cx);
-            }
-            _ => {}
-        }
-    }
-
-    fn update_worktree_indices(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-
-        let worktrees = project
-            .read(cx)
-            .visible_worktrees(cx)
-            .filter_map(|worktree| {
-                if worktree.read(cx).is_local() {
-                    Some((worktree.entity_id(), worktree))
-                } else {
-                    None
-                }
-            })
-            .collect::<HashMap<_, _>>();
-
-        self.worktree_indices
-            .retain(|worktree_id, _| worktrees.contains_key(worktree_id));
-        for (worktree_id, worktree) in worktrees {
-            self.worktree_indices.entry(worktree_id).or_insert_with(|| {
-                let worktree_index = WorktreeIndex::load(
-                    worktree.clone(),
-                    self.db_connection.clone(),
-                    self.language_registry.clone(),
-                    self.fs.clone(),
-                    self.status_tx.clone(),
-                    self.embedding_provider.clone(),
-                    cx,
-                );
-
-                let load_worktree = cx.spawn(async move |this, cx| {
-                    let result = match worktree_index.await {
-                        Ok(worktree_index) => {
-                            this.update(cx, |this, _| {
-                                this.worktree_indices.insert(
-                                    worktree_id,
-                                    WorktreeIndexHandle::Loaded {
-                                        index: worktree_index.clone(),
-                                    },
-                                );
-                            })?;
-                            Ok(worktree_index)
-                        }
-                        Err(error) => {
-                            this.update(cx, |this, _cx| {
-                                this.worktree_indices.remove(&worktree_id)
-                            })?;
-                            Err(Arc::new(error))
-                        }
-                    };
-
-                    this.update(cx, |this, cx| this.update_status(cx))?;
-
-                    result
-                });
-
-                WorktreeIndexHandle::Loading {
-                    index: load_worktree.shared(),
-                }
-            });
-        }
-
-        self.update_status(cx);
-    }
-
-    fn update_status(&mut self, cx: &mut Context<Self>) {
-        let mut indexing_count = 0;
-        let mut any_loading = false;
-
-        for index in self.worktree_indices.values_mut() {
-            match index {
-                WorktreeIndexHandle::Loading { .. } => {
-                    any_loading = true;
-                    break;
-                }
-                WorktreeIndexHandle::Loaded { index, .. } => {
-                    indexing_count += index.read(cx).entry_ids_being_indexed().len();
-                }
-            }
-        }
-
-        let status = if any_loading {
-            Status::Loading
-        } else if let Some(remaining_count) = NonZeroUsize::new(indexing_count) {
-            Status::Scanning { remaining_count }
-        } else {
-            Status::Idle
-        };
-
-        if status != self.last_status {
-            self.last_status = status;
-            cx.emit(status);
-        }
-    }
-
-    pub fn search(
-        &self,
-        queries: Vec<String>,
-        limit: usize,
-        cx: &App,
-    ) -> Task<Result<Vec<SearchResult>>> {
-        let (chunks_tx, chunks_rx) = channel::bounded(1024);
-        let mut worktree_scan_tasks = Vec::new();
-        for worktree_index in self.worktree_indices.values() {
-            let worktree_index = worktree_index.clone();
-            let chunks_tx = chunks_tx.clone();
-            worktree_scan_tasks.push(cx.spawn(async move |cx| {
-                let index = match worktree_index {
-                    WorktreeIndexHandle::Loading { index } => {
-                        index.clone().await.map_err(|error| anyhow!(error))?
-                    }
-                    WorktreeIndexHandle::Loaded { index } => index.clone(),
-                };
-
-                index
-                    .read_with(cx, |index, cx| {
-                        let worktree_id = index.worktree().read(cx).id();
-                        let db_connection = index.db_connection().clone();
-                        let db = *index.embedding_index().db();
-                        cx.background_spawn(async move {
-                            let txn = db_connection
-                                .read_txn()
-                                .context("failed to create read transaction")?;
-                            let db_entries = db.iter(&txn).context("failed to iterate database")?;
-                            for db_entry in db_entries {
-                                let (_key, db_embedded_file) = db_entry?;
-                                for chunk in db_embedded_file.chunks {
-                                    chunks_tx
-                                        .send((worktree_id, db_embedded_file.path.clone(), chunk))
-                                        .await?;
-                                }
-                            }
-                            anyhow::Ok(())
-                        })
-                    })?
-                    .await
-            }));
-        }
-        drop(chunks_tx);
-
-        let project = self.project.clone();
-        let embedding_provider = self.embedding_provider.clone();
-        cx.spawn(async move |cx| {
-            #[cfg(debug_assertions)]
-            let embedding_query_start = std::time::Instant::now();
-            log::info!("Searching for {queries:?}");
-            let queries: Vec<TextToEmbed> = queries
-                .iter()
-                .map(|s| TextToEmbed::new(s.as_str()))
-                .collect();
-
-            let query_embeddings = embedding_provider.embed(&queries[..]).await?;
-            anyhow::ensure!(
-                query_embeddings.len() == queries.len(),
-                "The number of query embeddings does not match the number of queries"
-            );
-
-            let mut results_by_worker = Vec::new();
-            for _ in 0..cx.background_executor().num_cpus() {
-                results_by_worker.push(Vec::<WorktreeSearchResult>::new());
-            }
-
-            #[cfg(debug_assertions)]
-            let search_start = std::time::Instant::now();
-            cx.background_executor()
-                .scoped(|cx| {
-                    for results in results_by_worker.iter_mut() {
-                        cx.spawn(async {
-                            while let Ok((worktree_id, path, chunk)) = chunks_rx.recv().await {
-                                let (score, query_index) =
-                                    chunk.embedding.similarity(&query_embeddings);
-
-                                let ix = match results.binary_search_by(|probe| {
-                                    score.partial_cmp(&probe.score).unwrap_or(Ordering::Equal)
-                                }) {
-                                    Ok(ix) | Err(ix) => ix,
-                                };
-                                if ix < limit {
-                                    results.insert(
-                                        ix,
-                                        WorktreeSearchResult {
-                                            worktree_id,
-                                            path: path.clone(),
-                                            range: chunk.chunk.range.clone(),
-                                            query_index,
-                                            score,
-                                        },
-                                    );
-                                    if results.len() > limit {
-                                        results.pop();
-                                    }
-                                }
-                            }
-                        });
-                    }
-                })
-                .await;
-
-            for scan_task in futures::future::join_all(worktree_scan_tasks).await {
-                scan_task.log_err();
-            }
-
-            project.read_with(cx, |project, cx| {
-                let mut search_results = Vec::with_capacity(results_by_worker.len() * limit);
-                for worker_results in results_by_worker {
-                    search_results.extend(worker_results.into_iter().filter_map(|result| {
-                        Some(SearchResult {
-                            worktree: project.worktree_for_id(result.worktree_id, cx)?,
-                            path: result.path,
-                            range: result.range,
-                            score: result.score,
-                            query_index: result.query_index,
-                        })
-                    }));
-                }
-                search_results.sort_unstable_by(|a, b| {
-                    b.score.partial_cmp(&a.score).unwrap_or(Ordering::Equal)
-                });
-                search_results.truncate(limit);
-
-                #[cfg(debug_assertions)]
-                {
-                    let search_elapsed = search_start.elapsed();
-                    log::debug!(
-                        "searched {} entries in {:?}",
-                        search_results.len(),
-                        search_elapsed
-                    );
-                    let embedding_query_elapsed = embedding_query_start.elapsed();
-                    log::debug!("embedding query took {:?}", embedding_query_elapsed);
-                }
-
-                search_results
-            })
-        })
-    }
-
-    #[cfg(test)]
-    pub fn path_count(&self, cx: &App) -> Result<u64> {
-        let mut result = 0;
-        for worktree_index in self.worktree_indices.values() {
-            if let WorktreeIndexHandle::Loaded { index, .. } = worktree_index {
-                result += index.read(cx).path_count()?;
-            }
-        }
-        Ok(result)
-    }
-
-    pub(crate) fn worktree_index(
-        &self,
-        worktree_id: WorktreeId,
-        cx: &App,
-    ) -> Option<Entity<WorktreeIndex>> {
-        for index in self.worktree_indices.values() {
-            if let WorktreeIndexHandle::Loaded { index, .. } = index
-                && index.read(cx).worktree().read(cx).id() == worktree_id
-            {
-                return Some(index.clone());
-            }
-        }
-        None
-    }
-
-    pub(crate) fn worktree_indices(&self, cx: &App) -> Vec<Entity<WorktreeIndex>> {
-        let mut result = self
-            .worktree_indices
-            .values()
-            .filter_map(|index| {
-                if let WorktreeIndexHandle::Loaded { index, .. } = index {
-                    Some(index.clone())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        result.sort_by_key(|index| index.read(cx).worktree().read(cx).id());
-        result
-    }
-
-    pub fn all_summaries(&self, cx: &App) -> Task<Result<Vec<FileSummary>>> {
-        let (summaries_tx, summaries_rx) = channel::bounded(1024);
-        let mut worktree_scan_tasks = Vec::new();
-        for worktree_index in self.worktree_indices.values() {
-            let worktree_index = worktree_index.clone();
-            let summaries_tx: channel::Sender<(String, String)> = summaries_tx.clone();
-            worktree_scan_tasks.push(cx.spawn(async move |cx| {
-                let index = match worktree_index {
-                    WorktreeIndexHandle::Loading { index } => {
-                        index.clone().await.map_err(|error| anyhow!(error))?
-                    }
-                    WorktreeIndexHandle::Loaded { index } => index.clone(),
-                };
-
-                index
-                    .read_with(cx, |index, cx| {
-                        let db_connection = index.db_connection().clone();
-                        let summary_index = index.summary_index();
-                        let file_digest_db = summary_index.file_digest_db();
-                        let summary_db = summary_index.summary_db();
-
-                        cx.background_spawn(async move {
-                            let txn = db_connection
-                                .read_txn()
-                                .context("failed to create db read transaction")?;
-                            let db_entries = file_digest_db
-                                .iter(&txn)
-                                .context("failed to iterate database")?;
-                            for db_entry in db_entries {
-                                let (file_path, db_file) = db_entry?;
-
-                                match summary_db.get(&txn, &db_file.digest) {
-                                    Ok(opt_summary) => {
-                                        // Currently, we only use summaries we already have. If the file hasn't been
-                                        // summarized yet, then we skip it and don't include it in the inferred context.
-                                        // If we want to do just-in-time summarization, this would be the place to do it!
-                                        if let Some(summary) = opt_summary {
-                                            summaries_tx
-                                                .send((file_path.to_string(), summary.to_string()))
-                                                .await?;
-                                        } else {
-                                            log::warn!("No summary found for {:?}", &db_file);
-                                        }
-                                    }
-                                    Err(err) => {
-                                        log::error!(
-                                            "Error reading from summary database: {:?}",
-                                            err
-                                        );
-                                    }
-                                }
-                            }
-                            anyhow::Ok(())
-                        })
-                    })?
-                    .await
-            }));
-        }
-        drop(summaries_tx);
-
-        let project = self.project.clone();
-        cx.spawn(async move |cx| {
-            let mut results_by_worker = Vec::new();
-            for _ in 0..cx.background_executor().num_cpus() {
-                results_by_worker.push(Vec::<FileSummary>::new());
-            }
-
-            cx.background_executor()
-                .scoped(|cx| {
-                    for results in results_by_worker.iter_mut() {
-                        cx.spawn(async {
-                            while let Ok((filename, summary)) = summaries_rx.recv().await {
-                                results.push(FileSummary { filename, summary });
-                            }
-                        });
-                    }
-                })
-                .await;
-
-            for scan_task in futures::future::join_all(worktree_scan_tasks).await {
-                scan_task.log_err();
-            }
-
-            project.read_with(cx, |_project, _cx| {
-                results_by_worker.into_iter().flatten().collect()
-            })
-        })
-    }
-
-    /// Empty out the backlogs of all the worktrees in the project
-    pub fn flush_summary_backlogs(&self, cx: &App) -> impl Future<Output = ()> {
-        let flush_start = std::time::Instant::now();
-
-        futures::future::join_all(self.worktree_indices.values().map(|worktree_index| {
-            let worktree_index = worktree_index.clone();
-
-            cx.spawn(async move |cx| {
-                let index = match worktree_index {
-                    WorktreeIndexHandle::Loading { index } => {
-                        index.clone().await.map_err(|error| anyhow!(error))?
-                    }
-                    WorktreeIndexHandle::Loaded { index } => index.clone(),
-                };
-                let worktree_abs_path =
-                    cx.update(|cx| index.read(cx).worktree().read(cx).abs_path())?;
-
-                index
-                    .read_with(cx, |index, cx| {
-                        cx.background_spawn(
-                            index.summary_index().flush_backlog(worktree_abs_path, cx),
-                        )
-                    })?
-                    .await
-            })
-        }))
-        .map(move |results| {
-            // Log any errors, but don't block the user. These summaries are supposed to
-            // improve quality by providing extra context, but they aren't hard requirements!
-            for result in results {
-                if let Err(err) = result {
-                    log::error!("Error flushing summary backlog: {:?}", err);
-                }
-            }
-
-            log::info!("Summary backlog flushed in {:?}", flush_start.elapsed());
-        })
-    }
-
-    pub fn remaining_summaries(&self, cx: &mut Context<Self>) -> usize {
-        self.worktree_indices(cx)
-            .iter()
-            .map(|index| index.read(cx).summary_index().backlog_len())
-            .sum()
-    }
-}
-
-impl EventEmitter<Status> for ProjectIndex {}
diff --git a/crates/semantic_index/src/project_index_debug_view.rs b/crates/semantic_index/src/project_index_debug_view.rs
deleted file mode 100644
index 8d6a49c45c..0000000000
--- a/crates/semantic_index/src/project_index_debug_view.rs
+++ /dev/null
@@ -1,306 +0,0 @@
-use crate::ProjectIndex;
-use gpui::{
-    AnyElement, App, CursorStyle, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
-    ListOffset, ListState, MouseMoveEvent, Render, UniformListScrollHandle, canvas, div, list,
-    uniform_list,
-};
-use project::WorktreeId;
-use settings::Settings;
-use std::{ops::Range, path::Path, sync::Arc};
-use theme::ThemeSettings;
-use ui::prelude::*;
-use workspace::item::Item;
-
-pub struct ProjectIndexDebugView {
-    index: Entity<ProjectIndex>,
-    rows: Vec<Row>,
-    selected_path: Option<PathState>,
-    hovered_row_ix: Option<usize>,
-    focus_handle: FocusHandle,
-    list_scroll_handle: UniformListScrollHandle,
-    _subscription: gpui::Subscription,
-}
-
-struct PathState {
-    path: Arc<Path>,
-    chunks: Vec<SharedString>,
-    list_state: ListState,
-}
-
-enum Row {
-    Worktree(Arc<Path>),
-    Entry(WorktreeId, Arc<Path>),
-}
-
-impl ProjectIndexDebugView {
-    pub fn new(index: Entity<ProjectIndex>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let mut this = Self {
-            rows: Vec::new(),
-            list_scroll_handle: UniformListScrollHandle::new(),
-            selected_path: None,
-            hovered_row_ix: None,
-            focus_handle: cx.focus_handle(),
-            _subscription: cx.subscribe_in(&index, window, |this, _, _, window, cx| {
-                this.update_rows(window, cx)
-            }),
-            index,
-        };
-        this.update_rows(window, cx);
-        this
-    }
-
-    fn update_rows(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let worktree_indices = self.index.read(cx).worktree_indices(cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let mut rows = Vec::new();
-
-            for index in worktree_indices {
-                let (root_path, worktree_id, worktree_paths) =
-                    index.read_with(cx, |index, cx| {
-                        let worktree = index.worktree().read(cx);
-                        (
-                            worktree.abs_path(),
-                            worktree.id(),
-                            index.embedding_index().paths(cx),
-                        )
-                    })?;
-                rows.push(Row::Worktree(root_path));
-                rows.extend(
-                    worktree_paths
-                        .await?
-                        .into_iter()
-                        .map(|path| Row::Entry(worktree_id, path)),
-                );
-            }
-
-            this.update(cx, |this, cx| {
-                this.rows = rows;
-                cx.notify();
-            })
-        })
-        .detach();
-    }
-
-    fn handle_path_click(
-        &mut self,
-        worktree_id: WorktreeId,
-        file_path: Arc<Path>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let project_index = self.index.read(cx);
-        let fs = project_index.fs().clone();
-        let worktree_index = project_index.worktree_index(worktree_id, cx)?.read(cx);
-        let root_path = worktree_index.worktree().read(cx).abs_path();
-        let chunks = worktree_index
-            .embedding_index()
-            .chunks_for_path(file_path.clone(), cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            let chunks = chunks.await?;
-            let content = fs.load(&root_path.join(&file_path)).await?;
-            let chunks = chunks
-                .into_iter()
-                .map(|chunk| {
-                    let mut start = chunk.chunk.range.start.min(content.len());
-                    let mut end = chunk.chunk.range.end.min(content.len());
-                    while !content.is_char_boundary(start) {
-                        start += 1;
-                    }
-                    while !content.is_char_boundary(end) {
-                        end -= 1;
-                    }
-                    content[start..end].to_string().into()
-                })
-                .collect::<Vec<_>>();
-
-            this.update(cx, |this, cx| {
-                this.selected_path = Some(PathState {
-                    path: file_path,
-                    list_state: ListState::new(chunks.len(), gpui::ListAlignment::Top, px(100.)),
-                    chunks,
-                });
-                cx.notify();
-            })
-        })
-        .detach();
-        None
-    }
-
-    fn render_chunk(&mut self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
-        let buffer_font = ThemeSettings::get_global(cx).buffer_font.clone();
-        let Some(state) = &self.selected_path else {
-            return div().into_any();
-        };
-
-        let colors = cx.theme().colors();
-        let chunk = &state.chunks[ix];
-
-        div()
-            .text_ui(cx)
-            .w_full()
-            .font(buffer_font)
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(format!(
-                        "chunk {} of {}. length: {}",
-                        ix + 1,
-                        state.chunks.len(),
-                        chunk.len(),
-                    ))
-                    .child(
-                        h_flex()
-                            .child(
-                                Button::new(("prev", ix), "prev")
-                                    .disabled(ix == 0)
-                                    .on_click(cx.listener(move |this, _, _, _| {
-                                        this.scroll_to_chunk(ix.saturating_sub(1))
-                                    })),
-                            )
-                            .child(
-                                Button::new(("next", ix), "next")
-                                    .disabled(ix + 1 == state.chunks.len())
-                                    .on_click(cx.listener(move |this, _, _, _| {
-                                        this.scroll_to_chunk(ix + 1)
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                div()
-                    .bg(colors.editor_background)
-                    .text_xs()
-                    .child(chunk.clone()),
-            )
-            .into_any_element()
-    }
-
-    fn scroll_to_chunk(&mut self, ix: usize) {
-        if let Some(state) = self.selected_path.as_mut() {
-            state.list_state.scroll_to(ListOffset {
-                item_ix: ix,
-                offset_in_item: px(0.),
-            })
-        }
-    }
-}
-
-impl Render for ProjectIndexDebugView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if let Some(selected_path) = self.selected_path.as_ref() {
-            v_flex()
-                .child(
-                    div()
-                        .id("selected-path-name")
-                        .child(
-                            h_flex()
-                                .justify_between()
-                                .child(selected_path.path.to_string_lossy().to_string())
-                                .child("x"),
-                        )
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border)
-                        .cursor(CursorStyle::PointingHand)
-                        .on_click(cx.listener(|this, _, _, cx| {
-                            this.selected_path.take();
-                            cx.notify();
-                        })),
-                )
-                .child(
-                    list(
-                        selected_path.list_state.clone(),
-                        cx.processor(|this, ix, _, cx| this.render_chunk(ix, cx)),
-                    )
-                    .size_full(),
-                )
-                .size_full()
-                .into_any_element()
-        } else {
-            let mut list = uniform_list(
-                "ProjectIndexDebugView",
-                self.rows.len(),
-                cx.processor(move |this, range: Range<usize>, _, cx| {
-                    this.rows[range]
-                        .iter()
-                        .enumerate()
-                        .map(|(ix, row)| match row {
-                            Row::Worktree(root_path) => div()
-                                .id(ix)
-                                .child(Label::new(root_path.to_string_lossy().to_string())),
-                            Row::Entry(worktree_id, file_path) => div()
-                                .id(ix)
-                                .pl_8()
-                                .child(Label::new(file_path.to_string_lossy().to_string()))
-                                .on_mouse_move(cx.listener(
-                                    move |this, _: &MouseMoveEvent, _, cx| {
-                                        if this.hovered_row_ix != Some(ix) {
-                                            this.hovered_row_ix = Some(ix);
-                                            cx.notify();
-                                        }
-                                    },
-                                ))
-                                .cursor(CursorStyle::PointingHand)
-                                .on_click(cx.listener({
-                                    let worktree_id = *worktree_id;
-                                    let file_path = file_path.clone();
-                                    move |this, _, window, cx| {
-                                        this.handle_path_click(
-                                            worktree_id,
-                                            file_path.clone(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                })),
-                        })
-                        .collect()
-                }),
-            )
-            .track_scroll(self.list_scroll_handle.clone())
-            .size_full()
-            .text_bg(cx.theme().colors().background)
-            .into_any_element();
-
-            canvas(
-                move |bounds, window, cx| {
-                    list.prepaint_as_root(bounds.origin, bounds.size.into(), window, cx);
-                    list
-                },
-                |_, mut list, window, cx| {
-                    list.paint(window, cx);
-                },
-            )
-            .size_full()
-            .into_any_element()
-        }
-    }
-}
-
-impl EventEmitter<()> for ProjectIndexDebugView {}
-
-impl Item for ProjectIndexDebugView {
-    type Event = ();
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Project Index (Debug)".into()
-    }
-
-    fn clone_on_split(
-        &self,
-        _: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Entity<Self>>
-    where
-        Self: Sized,
-    {
-        Some(cx.new(|cx| Self::new(self.index.clone(), window, cx)))
-    }
-}
-
-impl Focusable for ProjectIndexDebugView {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
deleted file mode 100644
index 439791047a..0000000000
--- a/crates/semantic_index/src/semantic_index.rs
+++ /dev/null
@@ -1,632 +0,0 @@
-mod chunking;
-mod embedding;
-mod embedding_index;
-mod indexing;
-mod project_index;
-mod project_index_debug_view;
-mod summary_backlog;
-mod summary_index;
-mod worktree_index;
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use fs::Fs;
-use gpui::{App, AppContext as _, AsyncApp, BorrowAppContext, Context, Entity, Global, WeakEntity};
-use language::LineEnding;
-use project::{Project, Worktree};
-use std::{
-    cmp::Ordering,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::ResultExt as _;
-use workspace::Workspace;
-
-pub use embedding::*;
-pub use project_index::{LoadedSearchResult, ProjectIndex, SearchResult, Status};
-pub use project_index_debug_view::ProjectIndexDebugView;
-pub use summary_index::FileSummary;
-
-pub struct SemanticDb {
-    embedding_provider: Arc<dyn EmbeddingProvider>,
-    db_connection: Option<heed::Env>,
-    project_indices: HashMap<WeakEntity<Project>, Entity<ProjectIndex>>,
-}
-
-impl Global for SemanticDb {}
-
-impl SemanticDb {
-    pub async fn new(
-        db_path: PathBuf,
-        embedding_provider: Arc<dyn EmbeddingProvider>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let db_connection = cx
-            .background_spawn(async move {
-                std::fs::create_dir_all(&db_path)?;
-                unsafe {
-                    heed::EnvOpenOptions::new()
-                        .map_size(1024 * 1024 * 1024)
-                        .max_dbs(3000)
-                        .open(db_path)
-                }
-            })
-            .await
-            .context("opening database connection")?;
-
-        cx.update(|cx| {
-            cx.observe_new(
-                |workspace: &mut Workspace, _window, cx: &mut Context<Workspace>| {
-                    let project = workspace.project().clone();
-
-                    if cx.has_global::<SemanticDb>() {
-                        cx.update_global::<SemanticDb, _>(|this, cx| {
-                            this.create_project_index(project, cx);
-                        })
-                    } else {
-                        log::info!("No SemanticDb, skipping project index")
-                    }
-                },
-            )
-            .detach();
-        })
-        .ok();
-
-        Ok(SemanticDb {
-            db_connection: Some(db_connection),
-            embedding_provider,
-            project_indices: HashMap::default(),
-        })
-    }
-
-    pub async fn load_results(
-        mut results: Vec<SearchResult>,
-        fs: &Arc<dyn Fs>,
-        cx: &AsyncApp,
-    ) -> Result<Vec<LoadedSearchResult>> {
-        let mut max_scores_by_path = HashMap::<_, (f32, usize)>::default();
-        for result in &results {
-            let (score, query_index) = max_scores_by_path
-                .entry((result.worktree.clone(), result.path.clone()))
-                .or_default();
-            if result.score > *score {
-                *score = result.score;
-                *query_index = result.query_index;
-            }
-        }
-
-        results.sort_by(|a, b| {
-            let max_score_a = max_scores_by_path[&(a.worktree.clone(), a.path.clone())].0;
-            let max_score_b = max_scores_by_path[&(b.worktree.clone(), b.path.clone())].0;
-            max_score_b
-                .partial_cmp(&max_score_a)
-                .unwrap_or(Ordering::Equal)
-                .then_with(|| a.worktree.entity_id().cmp(&b.worktree.entity_id()))
-                .then_with(|| a.path.cmp(&b.path))
-                .then_with(|| a.range.start.cmp(&b.range.start))
-        });
-
-        let mut last_loaded_file: Option<(Entity<Worktree>, Arc<Path>, PathBuf, String)> = None;
-        let mut loaded_results = Vec::<LoadedSearchResult>::new();
-        for result in results {
-            let full_path;
-            let file_content;
-            if let Some(last_loaded_file) =
-                last_loaded_file
-                    .as_ref()
-                    .filter(|(last_worktree, last_path, _, _)| {
-                        last_worktree == &result.worktree && last_path == &result.path
-                    })
-            {
-                full_path = last_loaded_file.2.clone();
-                file_content = &last_loaded_file.3;
-            } else {
-                let output = result.worktree.read_with(cx, |worktree, _cx| {
-                    let entry_abs_path = worktree.abs_path().join(&result.path);
-                    let mut entry_full_path = PathBuf::from(worktree.root_name());
-                    entry_full_path.push(&result.path);
-                    let file_content = async {
-                        let entry_abs_path = entry_abs_path;
-                        fs.load(&entry_abs_path).await
-                    };
-                    (entry_full_path, file_content)
-                })?;
-                full_path = output.0;
-                let Some(content) = output.1.await.log_err() else {
-                    continue;
-                };
-                last_loaded_file = Some((
-                    result.worktree.clone(),
-                    result.path.clone(),
-                    full_path.clone(),
-                    content,
-                ));
-                file_content = &last_loaded_file.as_ref().unwrap().3;
-            };
-
-            let query_index = max_scores_by_path[&(result.worktree.clone(), result.path.clone())].1;
-
-            let mut range_start = result.range.start.min(file_content.len());
-            let mut range_end = result.range.end.min(file_content.len());
-            while !file_content.is_char_boundary(range_start) {
-                range_start += 1;
-            }
-            while !file_content.is_char_boundary(range_end) {
-                range_end += 1;
-            }
-
-            let start_row = file_content[0..range_start].matches('\n').count() as u32;
-            let mut end_row = file_content[0..range_end].matches('\n').count() as u32;
-            let start_line_byte_offset = file_content[0..range_start]
-                .rfind('\n')
-                .map(|pos| pos + 1)
-                .unwrap_or_default();
-            let mut end_line_byte_offset = range_end;
-            if file_content[..end_line_byte_offset].ends_with('\n') {
-                end_row -= 1;
-            } else {
-                end_line_byte_offset = file_content[range_end..]
-                    .find('\n')
-                    .map(|pos| range_end + pos + 1)
-                    .unwrap_or_else(|| file_content.len());
-            }
-            let mut excerpt_content =
-                file_content[start_line_byte_offset..end_line_byte_offset].to_string();
-            LineEnding::normalize(&mut excerpt_content);
-
-            if let Some(prev_result) = loaded_results.last_mut()
-                && prev_result.full_path == full_path
-                && *prev_result.row_range.end() + 1 == start_row
-            {
-                prev_result.row_range = *prev_result.row_range.start()..=end_row;
-                prev_result.excerpt_content.push_str(&excerpt_content);
-                continue;
-            }
-
-            loaded_results.push(LoadedSearchResult {
-                path: result.path,
-                full_path,
-                excerpt_content,
-                row_range: start_row..=end_row,
-                query_index,
-            });
-        }
-
-        for result in &mut loaded_results {
-            while result.excerpt_content.ends_with("\n\n") {
-                result.excerpt_content.pop();
-                result.row_range =
-                    *result.row_range.start()..=result.row_range.end().saturating_sub(1)
-            }
-        }
-
-        Ok(loaded_results)
-    }
-
-    pub fn project_index(
-        &mut self,
-        project: Entity<Project>,
-        _cx: &mut App,
-    ) -> Option<Entity<ProjectIndex>> {
-        self.project_indices.get(&project.downgrade()).cloned()
-    }
-
-    pub fn remaining_summaries(
-        &self,
-        project: &WeakEntity<Project>,
-        cx: &mut App,
-    ) -> Option<usize> {
-        self.project_indices.get(project).map(|project_index| {
-            project_index.update(cx, |project_index, cx| {
-                project_index.remaining_summaries(cx)
-            })
-        })
-    }
-
-    pub fn create_project_index(
-        &mut self,
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Entity<ProjectIndex> {
-        let project_index = cx.new(|cx| {
-            ProjectIndex::new(
-                project.clone(),
-                self.db_connection.clone().unwrap(),
-                self.embedding_provider.clone(),
-                cx,
-            )
-        });
-
-        let project_weak = project.downgrade();
-        self.project_indices
-            .insert(project_weak.clone(), project_index.clone());
-
-        cx.observe_release(&project, move |_, cx| {
-            if cx.has_global::<SemanticDb>() {
-                cx.update_global::<SemanticDb, _>(|this, _| {
-                    this.project_indices.remove(&project_weak);
-                })
-            }
-        })
-        .detach();
-
-        project_index
-    }
-}
-
-impl Drop for SemanticDb {
-    fn drop(&mut self) {
-        self.db_connection.take().unwrap().prepare_for_closing();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chunking::Chunk;
-    use embedding_index::{ChunkedFile, EmbeddingIndex};
-    use feature_flags::FeatureFlagAppExt;
-    use fs::FakeFs;
-    use futures::{FutureExt, future::BoxFuture};
-    use gpui::TestAppContext;
-    use indexing::IndexingEntrySet;
-    use language::language_settings::AllLanguageSettings;
-    use project::{Project, ProjectEntryId};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use smol::channel;
-    use std::{future, path::Path, sync::Arc};
-    use util::path;
-
-    fn init_test(cx: &mut TestAppContext) {
-        zlog::init_test();
-
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            language::init(cx);
-            cx.update_flags(false, vec![]);
-            Project::init_settings(cx);
-            SettingsStore::update(cx, |store, cx| {
-                store.update_user_settings::<AllLanguageSettings>(cx, |_| {});
-            });
-        });
-    }
-
-    pub struct TestEmbeddingProvider {
-        batch_size: usize,
-        compute_embedding: Box<dyn Fn(&str) -> Result<Embedding> + Send + Sync>,
-    }
-
-    impl TestEmbeddingProvider {
-        pub fn new(
-            batch_size: usize,
-            compute_embedding: impl 'static + Fn(&str) -> Result<Embedding> + Send + Sync,
-        ) -> Self {
-            Self {
-                batch_size,
-                compute_embedding: Box::new(compute_embedding),
-            }
-        }
-    }
-
-    impl EmbeddingProvider for TestEmbeddingProvider {
-        fn embed<'a>(
-            &'a self,
-            texts: &'a [TextToEmbed<'a>],
-        ) -> BoxFuture<'a, Result<Vec<Embedding>>> {
-            let embeddings = texts
-                .iter()
-                .map(|to_embed| (self.compute_embedding)(to_embed.text))
-                .collect();
-            future::ready(embeddings).boxed()
-        }
-
-        fn batch_size(&self) -> usize {
-            self.batch_size
-        }
-    }
-
-    #[gpui::test]
-    async fn test_search(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        init_test(cx);
-
-        cx.update(|cx| {
-            // This functionality is staff-flagged.
-            cx.update_flags(true, vec![]);
-        });
-
-        let temp_dir = tempfile::tempdir().unwrap();
-
-        let mut semantic_index = SemanticDb::new(
-            temp_dir.path().into(),
-            Arc::new(TestEmbeddingProvider::new(16, |text| {
-                let mut embedding = vec![0f32; 2];
-                // if the text contains garbage, give it a 1 in the first dimension
-                if text.contains("garbage in") {
-                    embedding[0] = 0.9;
-                } else {
-                    embedding[0] = -0.9;
-                }
-
-                if text.contains("garbage out") {
-                    embedding[1] = 0.9;
-                } else {
-                    embedding[1] = -0.9;
-                }
-
-                Ok(Embedding::new(embedding))
-            })),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        let fs = FakeFs::new(cx.executor());
-        let project_path = Path::new("/fake_project");
-
-        fs.insert_tree(
-            project_path,
-            json!({
-                "fixture": {
-                    "main.rs": include_str!("../fixture/main.rs"),
-                    "needle.md": include_str!("../fixture/needle.md"),
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [project_path], cx).await;
-
-        let project_index = cx.update(|cx| {
-            let language_registry = project.read(cx).languages().clone();
-            let node_runtime = project.read(cx).node_runtime().unwrap().clone();
-            languages::init(language_registry, node_runtime, cx);
-            semantic_index.create_project_index(project.clone(), cx)
-        });
-
-        cx.run_until_parked();
-        while cx
-            .update(|cx| semantic_index.remaining_summaries(&project.downgrade(), cx))
-            .unwrap()
-            > 0
-        {
-            cx.run_until_parked();
-        }
-
-        let results = cx
-            .update(|cx| {
-                let project_index = project_index.read(cx);
-                let query = "garbage in, garbage out";
-                project_index.search(vec![query.into()], 4, cx)
-            })
-            .await
-            .unwrap();
-
-        assert!(
-            results.len() > 1,
-            "should have found some results, but only found {:?}",
-            results
-        );
-
-        for result in &results {
-            println!("result: {:?}", result.path);
-            println!("score: {:?}", result.score);
-        }
-
-        // Find result that is greater than 0.5
-        let search_result = results.iter().find(|result| result.score > 0.9).unwrap();
-
-        assert_eq!(
-            search_result.path.to_string_lossy(),
-            path!("fixture/needle.md")
-        );
-
-        let content = cx
-            .update(|cx| {
-                let worktree = search_result.worktree.read(cx);
-                let entry_abs_path = worktree.abs_path().join(&search_result.path);
-                let fs = project.read(cx).fs().clone();
-                cx.background_spawn(async move { fs.load(&entry_abs_path).await.unwrap() })
-            })
-            .await;
-
-        let range = search_result.range.clone();
-        let content = content[range].to_owned();
-
-        assert!(content.contains("garbage in, garbage out"));
-    }
-
-    #[gpui::test]
-    async fn test_embed_files(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        let provider = Arc::new(TestEmbeddingProvider::new(3, |text| {
-            anyhow::ensure!(
-                !text.contains('g'),
-                "cannot embed text containing a 'g' character"
-            );
-            Ok(Embedding::new(
-                ('a'..='z')
-                    .map(|char| text.chars().filter(|c| *c == char).count() as f32)
-                    .collect(),
-            ))
-        }));
-
-        let (indexing_progress_tx, _) = channel::unbounded();
-        let indexing_entries = Arc::new(IndexingEntrySet::new(indexing_progress_tx));
-
-        let (chunked_files_tx, chunked_files_rx) = channel::unbounded::<ChunkedFile>();
-        chunked_files_tx
-            .send_blocking(ChunkedFile {
-                path: Path::new("test1.md").into(),
-                mtime: None,
-                handle: indexing_entries.insert(ProjectEntryId::from_proto(0)),
-                text: "abcdefghijklmnop".to_string(),
-                chunks: [0..4, 4..8, 8..12, 12..16]
-                    .into_iter()
-                    .map(|range| Chunk {
-                        range,
-                        digest: Default::default(),
-                    })
-                    .collect(),
-            })
-            .unwrap();
-        chunked_files_tx
-            .send_blocking(ChunkedFile {
-                path: Path::new("test2.md").into(),
-                mtime: None,
-                handle: indexing_entries.insert(ProjectEntryId::from_proto(1)),
-                text: "qrstuvwxyz".to_string(),
-                chunks: [0..4, 4..8, 8..10]
-                    .into_iter()
-                    .map(|range| Chunk {
-                        range,
-                        digest: Default::default(),
-                    })
-                    .collect(),
-            })
-            .unwrap();
-        chunked_files_tx.close();
-
-        let embed_files_task =
-            cx.update(|cx| EmbeddingIndex::embed_files(provider.clone(), chunked_files_rx, cx));
-        embed_files_task.task.await.unwrap();
-
-        let embedded_files_rx = embed_files_task.files;
-        let mut embedded_files = Vec::new();
-        while let Ok((embedded_file, _)) = embedded_files_rx.recv().await {
-            embedded_files.push(embedded_file);
-        }
-
-        assert_eq!(embedded_files.len(), 1);
-        assert_eq!(embedded_files[0].path.as_ref(), Path::new("test2.md"));
-        assert_eq!(
-            embedded_files[0]
-                .chunks
-                .iter()
-                .map(|embedded_chunk| { embedded_chunk.embedding.clone() })
-                .collect::<Vec<Embedding>>(),
-            vec![
-                (provider.compute_embedding)("qrst").unwrap(),
-                (provider.compute_embedding)("uvwx").unwrap(),
-                (provider.compute_embedding)("yz").unwrap(),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_load_search_results(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project_path = Path::new("/fake_project");
-
-        let file1_content = "one\ntwo\nthree\nfour\nfive\n";
-        let file2_content = "aaa\nbbb\nccc\nddd\neee\n";
-
-        fs.insert_tree(
-            project_path,
-            json!({
-                "file1.txt": file1_content,
-                "file2.txt": file2_content,
-            }),
-        )
-        .await;
-
-        let fs = fs as Arc<dyn Fs>;
-        let project = Project::test(fs.clone(), [project_path], cx).await;
-        let worktree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-
-        // chunk that is already newline-aligned
-        let search_results = vec![SearchResult {
-            worktree: worktree.clone(),
-            path: Path::new("file1.txt").into(),
-            range: 0..file1_content.find("four").unwrap(),
-            score: 0.5,
-            query_index: 0,
-        }];
-        assert_eq!(
-            SemanticDb::load_results(search_results, &fs, &cx.to_async())
-                .await
-                .unwrap(),
-            &[LoadedSearchResult {
-                path: Path::new("file1.txt").into(),
-                full_path: "fake_project/file1.txt".into(),
-                excerpt_content: "one\ntwo\nthree\n".into(),
-                row_range: 0..=2,
-                query_index: 0,
-            }]
-        );
-
-        // chunk that is *not* newline-aligned
-        let search_results = vec![SearchResult {
-            worktree: worktree.clone(),
-            path: Path::new("file1.txt").into(),
-            range: file1_content.find("two").unwrap() + 1..file1_content.find("four").unwrap() + 2,
-            score: 0.5,
-            query_index: 0,
-        }];
-        assert_eq!(
-            SemanticDb::load_results(search_results, &fs, &cx.to_async())
-                .await
-                .unwrap(),
-            &[LoadedSearchResult {
-                path: Path::new("file1.txt").into(),
-                full_path: "fake_project/file1.txt".into(),
-                excerpt_content: "two\nthree\nfour\n".into(),
-                row_range: 1..=3,
-                query_index: 0,
-            }]
-        );
-
-        // chunks that are adjacent
-
-        let search_results = vec![
-            SearchResult {
-                worktree: worktree.clone(),
-                path: Path::new("file1.txt").into(),
-                range: file1_content.find("two").unwrap()..file1_content.len(),
-                score: 0.6,
-                query_index: 0,
-            },
-            SearchResult {
-                worktree: worktree.clone(),
-                path: Path::new("file1.txt").into(),
-                range: 0..file1_content.find("two").unwrap(),
-                score: 0.5,
-                query_index: 1,
-            },
-            SearchResult {
-                worktree: worktree.clone(),
-                path: Path::new("file2.txt").into(),
-                range: 0..file2_content.len(),
-                score: 0.8,
-                query_index: 1,
-            },
-        ];
-        assert_eq!(
-            SemanticDb::load_results(search_results, &fs, &cx.to_async())
-                .await
-                .unwrap(),
-            &[
-                LoadedSearchResult {
-                    path: Path::new("file2.txt").into(),
-                    full_path: "fake_project/file2.txt".into(),
-                    excerpt_content: file2_content.into(),
-                    row_range: 0..=4,
-                    query_index: 1,
-                },
-                LoadedSearchResult {
-                    path: Path::new("file1.txt").into(),
-                    full_path: "fake_project/file1.txt".into(),
-                    excerpt_content: file1_content.into(),
-                    row_range: 0..=4,
-                    query_index: 0,
-                }
-            ]
-        );
-    }
-}
diff --git a/crates/semantic_index/src/summary_backlog.rs b/crates/semantic_index/src/summary_backlog.rs
deleted file mode 100644
index e77fa4862f..0000000000
--- a/crates/semantic_index/src/summary_backlog.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use collections::HashMap;
-use fs::MTime;
-use std::{path::Path, sync::Arc};
-
-const MAX_FILES_BEFORE_RESUMMARIZE: usize = 4;
-const MAX_BYTES_BEFORE_RESUMMARIZE: u64 = 1_000_000; // 1 MB
-
-#[derive(Default, Debug)]
-pub struct SummaryBacklog {
-    /// Key: path to a file that needs summarization, but that we haven't summarized yet. Value: that file's size on disk, in bytes, and its mtime.
-    files: HashMap<Arc<Path>, (u64, Option<MTime>)>,
-    /// Cache of the sum of all values in `files`, so we don't have to traverse the whole map to check if we're over the byte limit.
-    total_bytes: u64,
-}
-
-impl SummaryBacklog {
-    /// Store the given path in the backlog, along with how many bytes are in it.
-    pub fn insert(&mut self, path: Arc<Path>, bytes_on_disk: u64, mtime: Option<MTime>) {
-        let (prev_bytes, _) = self
-            .files
-            .insert(path, (bytes_on_disk, mtime))
-            .unwrap_or_default(); // Default to 0 prev_bytes
-
-        // Update the cached total by subtracting out the old amount and adding the new one.
-        self.total_bytes = self.total_bytes - prev_bytes + bytes_on_disk;
-    }
-
-    /// Returns true if the total number of bytes in the backlog exceeds a predefined threshold.
-    pub fn needs_drain(&self) -> bool {
-        self.files.len() > MAX_FILES_BEFORE_RESUMMARIZE ||
-        // The whole purpose of the cached total_bytes is to make this comparison cheap.
-        // Otherwise we'd have to traverse the entire dictionary every time we wanted this answer.
-        self.total_bytes > MAX_BYTES_BEFORE_RESUMMARIZE
-    }
-
-    /// Remove all the entries in the backlog and return the file paths as an iterator.
-    #[allow(clippy::needless_lifetimes)] // Clippy thinks this 'a can be elided, but eliding it gives a compile error
-    pub fn drain<'a>(&'a mut self) -> impl Iterator<Item = (Arc<Path>, Option<MTime>)> + 'a {
-        self.total_bytes = 0;
-
-        self.files
-            .drain()
-            .map(|(path, (_size, mtime))| (path, mtime))
-    }
-
-    pub fn len(&self) -> usize {
-        self.files.len()
-    }
-}
diff --git a/crates/semantic_index/src/summary_index.rs b/crates/semantic_index/src/summary_index.rs
deleted file mode 100644
index 9a3eb302ed..0000000000
--- a/crates/semantic_index/src/summary_index.rs
+++ /dev/null
@@ -1,696 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use arrayvec::ArrayString;
-use fs::{Fs, MTime};
-use futures::{TryFutureExt, stream::StreamExt};
-use futures_batch::ChunksTimeoutStreamExt;
-use gpui::{App, AppContext as _, Entity, Task};
-use heed::{
-    RoTxn,
-    types::{SerdeBincode, Str},
-};
-use language_model::{
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
-};
-use log;
-use parking_lot::Mutex;
-use project::{Entry, UpdatedEntriesSet, Worktree};
-use serde::{Deserialize, Serialize};
-use smol::channel;
-use std::{
-    future::Future,
-    path::Path,
-    pin::pin,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use util::ResultExt;
-use worktree::Snapshot;
-
-use crate::{indexing::IndexingEntrySet, summary_backlog::SummaryBacklog};
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct FileSummary {
-    pub filename: String,
-    pub summary: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct UnsummarizedFile {
-    // Path to the file on disk
-    path: Arc<Path>,
-    // The mtime of the file on disk
-    mtime: Option<MTime>,
-    // BLAKE3 hash of the source file's contents
-    digest: Blake3Digest,
-    // The source file's contents
-    contents: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct SummarizedFile {
-    // Path to the file on disk
-    path: String,
-    // The mtime of the file on disk
-    mtime: Option<MTime>,
-    // BLAKE3 hash of the source file's contents
-    digest: Blake3Digest,
-    // The LLM's summary of the file's contents
-    summary: String,
-}
-
-/// This is what blake3's to_hex() method returns - see https://docs.rs/blake3/1.5.3/src/blake3/lib.rs.html#246
-pub type Blake3Digest = ArrayString<{ blake3::OUT_LEN * 2 }>;
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FileDigest {
-    pub mtime: Option<MTime>,
-    pub digest: Blake3Digest,
-}
-
-struct NeedsSummary {
-    files: channel::Receiver<UnsummarizedFile>,
-    task: Task<Result<()>>,
-}
-
-struct SummarizeFiles {
-    files: channel::Receiver<SummarizedFile>,
-    task: Task<Result<()>>,
-}
-
-pub struct SummaryIndex {
-    worktree: Entity<Worktree>,
-    fs: Arc<dyn Fs>,
-    db_connection: heed::Env,
-    file_digest_db: heed::Database<Str, SerdeBincode<FileDigest>>, // Key: file path. Val: BLAKE3 digest of its contents.
-    summary_db: heed::Database<SerdeBincode<Blake3Digest>, Str>, // Key: BLAKE3 digest of a file's contents. Val: LLM summary of those contents.
-    backlog: Arc<Mutex<SummaryBacklog>>,
-    _entry_ids_being_indexed: Arc<IndexingEntrySet>, // TODO can this be removed?
-}
-
-struct Backlogged {
-    paths_to_digest: channel::Receiver<Vec<(Arc<Path>, Option<MTime>)>>,
-    task: Task<Result<()>>,
-}
-
-struct MightNeedSummaryFiles {
-    files: channel::Receiver<UnsummarizedFile>,
-    task: Task<Result<()>>,
-}
-
-impl SummaryIndex {
-    pub fn new(
-        worktree: Entity<Worktree>,
-        fs: Arc<dyn Fs>,
-        db_connection: heed::Env,
-        file_digest_db: heed::Database<Str, SerdeBincode<FileDigest>>,
-        summary_db: heed::Database<SerdeBincode<Blake3Digest>, Str>,
-        _entry_ids_being_indexed: Arc<IndexingEntrySet>,
-    ) -> Self {
-        Self {
-            worktree,
-            fs,
-            db_connection,
-            file_digest_db,
-            summary_db,
-            _entry_ids_being_indexed,
-            backlog: Default::default(),
-        }
-    }
-
-    pub fn file_digest_db(&self) -> heed::Database<Str, SerdeBincode<FileDigest>> {
-        self.file_digest_db
-    }
-
-    pub fn summary_db(&self) -> heed::Database<SerdeBincode<Blake3Digest>, Str> {
-        self.summary_db
-    }
-
-    pub fn index_entries_changed_on_disk(
-        &self,
-        is_auto_available: bool,
-        cx: &App,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        let start = Instant::now();
-        let backlogged;
-        let digest;
-        let needs_summary;
-        let summaries;
-        let persist;
-
-        if is_auto_available {
-            let worktree = self.worktree.read(cx).snapshot();
-            let worktree_abs_path = worktree.abs_path().clone();
-
-            backlogged = self.scan_entries(worktree, cx);
-            digest = self.digest_files(backlogged.paths_to_digest, worktree_abs_path, cx);
-            needs_summary = self.check_summary_cache(digest.files, cx);
-            summaries = self.summarize_files(needs_summary.files, cx);
-            persist = self.persist_summaries(summaries.files, cx);
-        } else {
-            // This feature is only staff-shipped, so make the rest of these no-ops.
-            backlogged = Backlogged {
-                paths_to_digest: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            digest = MightNeedSummaryFiles {
-                files: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            needs_summary = NeedsSummary {
-                files: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            summaries = SummarizeFiles {
-                files: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            persist = Task::ready(Ok(()));
-        }
-
-        async move {
-            futures::try_join!(
-                backlogged.task,
-                digest.task,
-                needs_summary.task,
-                summaries.task,
-                persist
-            )?;
-
-            if is_auto_available {
-                log::info!(
-                    "Summarizing everything that changed on disk took {:?}",
-                    start.elapsed()
-                );
-            }
-
-            Ok(())
-        }
-    }
-
-    pub fn index_updated_entries(
-        &mut self,
-        updated_entries: UpdatedEntriesSet,
-        is_auto_available: bool,
-        cx: &App,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        let start = Instant::now();
-        let backlogged;
-        let digest;
-        let needs_summary;
-        let summaries;
-        let persist;
-
-        if is_auto_available {
-            let worktree = self.worktree.read(cx).snapshot();
-            let worktree_abs_path = worktree.abs_path().clone();
-
-            backlogged = self.scan_updated_entries(worktree, updated_entries, cx);
-            digest = self.digest_files(backlogged.paths_to_digest, worktree_abs_path, cx);
-            needs_summary = self.check_summary_cache(digest.files, cx);
-            summaries = self.summarize_files(needs_summary.files, cx);
-            persist = self.persist_summaries(summaries.files, cx);
-        } else {
-            // This feature is only staff-shipped, so make the rest of these no-ops.
-            backlogged = Backlogged {
-                paths_to_digest: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            digest = MightNeedSummaryFiles {
-                files: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            needs_summary = NeedsSummary {
-                files: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            summaries = SummarizeFiles {
-                files: channel::unbounded().1,
-                task: Task::ready(Ok(())),
-            };
-            persist = Task::ready(Ok(()));
-        }
-
-        async move {
-            futures::try_join!(
-                backlogged.task,
-                digest.task,
-                needs_summary.task,
-                summaries.task,
-                persist
-            )?;
-
-            log::debug!("Summarizing updated entries took {:?}", start.elapsed());
-
-            Ok(())
-        }
-    }
-
-    fn check_summary_cache(
-        &self,
-        might_need_summary: channel::Receiver<UnsummarizedFile>,
-        cx: &App,
-    ) -> NeedsSummary {
-        let db_connection = self.db_connection.clone();
-        let db = self.summary_db;
-        let (needs_summary_tx, needs_summary_rx) = channel::bounded(512);
-        let task = cx.background_spawn(async move {
-            let mut might_need_summary = pin!(might_need_summary);
-            while let Some(file) = might_need_summary.next().await {
-                let tx = db_connection
-                    .read_txn()
-                    .context("Failed to create read transaction for checking which hashes are in summary cache")?;
-
-                match db.get(&tx, &file.digest) {
-                    Ok(opt_answer) => {
-                        if opt_answer.is_none() {
-                            // It's not in the summary cache db, so we need to summarize it.
-                            log::debug!("File {:?} (digest {:?}) was NOT in the db cache and needs to be resummarized.", file.path.display(), &file.digest);
-                            needs_summary_tx.send(file).await?;
-                        } else {
-                            log::debug!("File {:?} (digest {:?}) was in the db cache and does not need to be resummarized.", file.path.display(), &file.digest);
-                        }
-                    }
-                    Err(err) => {
-                        log::error!("Reading from the summaries database failed: {:?}", err);
-                    }
-                }
-            }
-
-            Ok(())
-        });
-
-        NeedsSummary {
-            files: needs_summary_rx,
-            task,
-        }
-    }
-
-    fn scan_entries(&self, worktree: Snapshot, cx: &App) -> Backlogged {
-        let (tx, rx) = channel::bounded(512);
-        let db_connection = self.db_connection.clone();
-        let digest_db = self.file_digest_db;
-        let backlog = Arc::clone(&self.backlog);
-        let task = cx.background_spawn(async move {
-            let txn = db_connection
-                .read_txn()
-                .context("failed to create read transaction")?;
-
-            for entry in worktree.files(false, 0) {
-                let needs_summary =
-                    Self::add_to_backlog(Arc::clone(&backlog), digest_db, &txn, entry);
-
-                if !needs_summary.is_empty() {
-                    tx.send(needs_summary).await?;
-                }
-            }
-
-            // TODO delete db entries for deleted files
-
-            Ok(())
-        });
-
-        Backlogged {
-            paths_to_digest: rx,
-            task,
-        }
-    }
-
-    fn add_to_backlog(
-        backlog: Arc<Mutex<SummaryBacklog>>,
-        digest_db: heed::Database<Str, SerdeBincode<FileDigest>>,
-        txn: &RoTxn<'_>,
-        entry: &Entry,
-    ) -> Vec<(Arc<Path>, Option<MTime>)> {
-        let entry_db_key = db_key_for_path(&entry.path);
-
-        match digest_db.get(txn, &entry_db_key) {
-            Ok(opt_saved_digest) => {
-                // The file path is the same, but the mtime is different. (Or there was no mtime.)
-                // It needs updating, so add it to the backlog! Then, if the backlog is full, drain it and summarize its contents.
-                if entry.mtime != opt_saved_digest.and_then(|digest| digest.mtime) {
-                    let mut backlog = backlog.lock();
-
-                    log::info!(
-                        "Inserting {:?} ({:?} bytes) into backlog",
-                        &entry.path,
-                        entry.size,
-                    );
-                    backlog.insert(Arc::clone(&entry.path), entry.size, entry.mtime);
-
-                    if backlog.needs_drain() {
-                        log::info!("Draining summary backlog...");
-                        return backlog.drain().collect();
-                    }
-                }
-            }
-            Err(err) => {
-                log::error!(
-                    "Error trying to get file digest db entry {:?}: {:?}",
-                    &entry_db_key,
-                    err
-                );
-            }
-        }
-
-        Vec::new()
-    }
-
-    fn scan_updated_entries(
-        &self,
-        worktree: Snapshot,
-        updated_entries: UpdatedEntriesSet,
-        cx: &App,
-    ) -> Backlogged {
-        log::info!("Scanning for updated entries that might need summarization...");
-        let (tx, rx) = channel::bounded(512);
-        // let (deleted_entry_ranges_tx, deleted_entry_ranges_rx) = channel::bounded(128);
-        let db_connection = self.db_connection.clone();
-        let digest_db = self.file_digest_db;
-        let backlog = Arc::clone(&self.backlog);
-        let task = cx.background_spawn(async move {
-            let txn = db_connection
-                .read_txn()
-                .context("failed to create read transaction")?;
-
-            for (path, entry_id, status) in updated_entries.iter() {
-                match status {
-                    project::PathChange::Loaded
-                    | project::PathChange::Added
-                    | project::PathChange::Updated
-                    | project::PathChange::AddedOrUpdated => {
-                        if let Some(entry) = worktree.entry_for_id(*entry_id)
-                            && entry.is_file()
-                        {
-                            let needs_summary =
-                                Self::add_to_backlog(Arc::clone(&backlog), digest_db, &txn, entry);
-
-                            if !needs_summary.is_empty() {
-                                tx.send(needs_summary).await?;
-                            }
-                        }
-                    }
-                    project::PathChange::Removed => {
-                        let _db_path = db_key_for_path(path);
-                        // TODO delete db entries for deleted files
-                        // deleted_entry_ranges_tx
-                        //     .send((Bound::Included(db_path.clone()), Bound::Included(db_path)))
-                        //     .await?;
-                    }
-                }
-            }
-
-            Ok(())
-        });
-
-        Backlogged {
-            paths_to_digest: rx,
-            // deleted_entry_ranges: deleted_entry_ranges_rx,
-            task,
-        }
-    }
-
-    fn digest_files(
-        &self,
-        paths: channel::Receiver<Vec<(Arc<Path>, Option<MTime>)>>,
-        worktree_abs_path: Arc<Path>,
-        cx: &App,
-    ) -> MightNeedSummaryFiles {
-        let fs = self.fs.clone();
-        let (rx, tx) = channel::bounded(2048);
-        let task = cx.spawn(async move |cx| {
-            cx.background_executor()
-                .scoped(|cx| {
-                    for _ in 0..cx.num_cpus() {
-                        cx.spawn(async {
-                            while let Ok(pairs) = paths.recv().await {
-                                // Note: we could process all these files concurrently if desired. Might or might not speed things up.
-                                for (path, mtime) in pairs {
-                                    let entry_abs_path = worktree_abs_path.join(&path);
-
-                                    // Load the file's contents and compute its hash digest.
-                                    let unsummarized_file = {
-                                        let Some(contents) = fs
-                                            .load(&entry_abs_path)
-                                            .await
-                                            .with_context(|| {
-                                                format!("failed to read path {entry_abs_path:?}")
-                                            })
-                                            .log_err()
-                                        else {
-                                            continue;
-                                        };
-
-                                        let digest = {
-                                            let mut hasher = blake3::Hasher::new();
-                                            // Incorporate both the (relative) file path as well as the contents of the file into the hash.
-                                            // This is because in some languages and frameworks, identical files can do different things
-                                            // depending on their paths (e.g. Rails controllers). It's also why we send the path to the model.
-                                            hasher.update(path.display().to_string().as_bytes());
-                                            hasher.update(contents.as_bytes());
-                                            hasher.finalize().to_hex()
-                                        };
-
-                                        UnsummarizedFile {
-                                            digest,
-                                            contents,
-                                            path,
-                                            mtime,
-                                        }
-                                    };
-
-                                    if let Err(err) = rx
-                                        .send(unsummarized_file)
-                                        .map_err(|error| anyhow!(error))
-                                        .await
-                                    {
-                                        log::error!("Error: {:?}", err);
-
-                                        return;
-                                    }
-                                }
-                            }
-                        });
-                    }
-                })
-                .await;
-            Ok(())
-        });
-
-        MightNeedSummaryFiles { files: tx, task }
-    }
-
-    fn summarize_files(
-        &self,
-        unsummarized_files: channel::Receiver<UnsummarizedFile>,
-        cx: &App,
-    ) -> SummarizeFiles {
-        let (summarized_tx, summarized_rx) = channel::bounded(512);
-        let task = cx.spawn(async move |cx| {
-            while let Ok(file) = unsummarized_files.recv().await {
-                log::debug!("Summarizing {:?}", file);
-                let summary = cx
-                    .update(|cx| Self::summarize_code(&file.contents, &file.path, cx))?
-                    .await
-                    .unwrap_or_else(|err| {
-                        // Log a warning because we'll continue anyway.
-                        // In the future, we may want to try splitting it up into multiple requests and concatenating the summaries,
-                        // but this might give bad summaries due to cutting off source code files in the middle.
-                        log::warn!("Failed to summarize {} - {:?}", file.path.display(), err);
-
-                        String::new()
-                    });
-
-                // Note that the summary could be empty because of an error talking to a cloud provider,
-                // e.g. because the context limit was exceeded. In that case, we return Ok(String::new()).
-                if !summary.is_empty() {
-                    summarized_tx
-                        .send(SummarizedFile {
-                            path: file.path.display().to_string(),
-                            digest: file.digest,
-                            summary,
-                            mtime: file.mtime,
-                        })
-                        .await?
-                }
-            }
-
-            Ok(())
-        });
-
-        SummarizeFiles {
-            files: summarized_rx,
-            task,
-        }
-    }
-
-    fn summarize_code(
-        code: &str,
-        path: &Path,
-        cx: &App,
-    ) -> impl Future<Output = Result<String>> + use<> {
-        let start = Instant::now();
-        let (summary_model_id, use_cache): (LanguageModelId, bool) = (
-            "Qwen/Qwen2-7B-Instruct".to_string().into(), // TODO read this from the user's settings.
-            false, // qwen2 doesn't have a cache, but we should probably infer this from the model
-        );
-        let Some(model) = LanguageModelRegistry::read_global(cx)
-            .available_models(cx)
-            .find(|model| &model.id() == &summary_model_id)
-        else {
-            return cx.background_spawn(async move {
-                anyhow::bail!("Couldn't find the preferred summarization model ({summary_model_id:?}) in the language registry's available models")
-            });
-        };
-        let utf8_path = path.to_string_lossy();
-        const PROMPT_BEFORE_CODE: &str = "Summarize what the code in this file does in 3 sentences, using no newlines or bullet points in the summary:";
-        let prompt = format!("{PROMPT_BEFORE_CODE}\n{utf8_path}:\n{code}");
-
-        log::debug!(
-            "Summarizing code by sending this prompt to {:?}: {:?}",
-            model.name(),
-            &prompt
-        );
-
-        let request = LanguageModelRequest {
-            thread_id: None,
-            prompt_id: None,
-            mode: None,
-            intent: None,
-            messages: vec![LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![prompt.into()],
-                cache: use_cache,
-            }],
-            tools: Vec::new(),
-            tool_choice: None,
-            stop: Vec::new(),
-            temperature: None,
-            thinking_allowed: true,
-        };
-
-        let code_len = code.len();
-        cx.spawn(async move |cx| {
-            let stream = model.stream_completion(request, cx);
-            cx.background_spawn(async move {
-                let answer: String = stream
-                    .await?
-                    .filter_map(|event| async {
-                        if let Ok(LanguageModelCompletionEvent::Text(text)) = event {
-                            Some(text)
-                        } else {
-                            None
-                        }
-                    })
-                    .collect()
-                    .await;
-
-                log::info!(
-                    "It took {:?} to summarize {:?} bytes of code.",
-                    start.elapsed(),
-                    code_len
-                );
-
-                log::debug!("Summary was: {:?}", &answer);
-
-                Ok(answer)
-            })
-            .await
-
-            // TODO if summarization failed, put it back in the backlog!
-        })
-    }
-
-    fn persist_summaries(
-        &self,
-        summaries: channel::Receiver<SummarizedFile>,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let db_connection = self.db_connection.clone();
-        let digest_db = self.file_digest_db;
-        let summary_db = self.summary_db;
-        cx.background_spawn(async move {
-            let mut summaries = pin!(summaries.chunks_timeout(4096, Duration::from_secs(2)));
-            while let Some(summaries) = summaries.next().await {
-                let mut txn = db_connection.write_txn()?;
-                for file in &summaries {
-                    log::debug!(
-                        "Saving summary of {:?} - which is {} bytes of summary for content digest {:?}",
-                        &file.path,
-                        file.summary.len(),
-                        file.digest
-                    );
-                    digest_db.put(
-                        &mut txn,
-                        &file.path,
-                        &FileDigest {
-                            mtime: file.mtime,
-                            digest: file.digest,
-                        },
-                    )?;
-                    summary_db.put(&mut txn, &file.digest, &file.summary)?;
-                }
-                txn.commit()?;
-
-                drop(summaries);
-                log::debug!("committed summaries");
-            }
-
-            Ok(())
-        })
-    }
-
-    /// Empty out the backlog of files that haven't been resummarized, and resummarize them immediately.
-    pub(crate) fn flush_backlog(
-        &self,
-        worktree_abs_path: Arc<Path>,
-        cx: &App,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        let start = Instant::now();
-        let backlogged = {
-            let (tx, rx) = channel::bounded(512);
-            let needs_summary: Vec<(Arc<Path>, Option<MTime>)> = {
-                let mut backlog = self.backlog.lock();
-
-                backlog.drain().collect()
-            };
-
-            let task = cx.background_spawn(async move {
-                tx.send(needs_summary).await?;
-                Ok(())
-            });
-
-            Backlogged {
-                paths_to_digest: rx,
-                task,
-            }
-        };
-
-        let digest = self.digest_files(backlogged.paths_to_digest, worktree_abs_path, cx);
-        let needs_summary = self.check_summary_cache(digest.files, cx);
-        let summaries = self.summarize_files(needs_summary.files, cx);
-        let persist = self.persist_summaries(summaries.files, cx);
-
-        async move {
-            futures::try_join!(
-                backlogged.task,
-                digest.task,
-                needs_summary.task,
-                summaries.task,
-                persist
-            )?;
-
-            log::info!("Summarizing backlogged entries took {:?}", start.elapsed());
-
-            Ok(())
-        }
-    }
-
-    pub(crate) fn backlog_len(&self) -> usize {
-        self.backlog.lock().len()
-    }
-}
-
-fn db_key_for_path(path: &Arc<Path>) -> String {
-    path.to_string_lossy().replace('/', "\0")
-}
diff --git a/crates/semantic_index/src/worktree_index.rs b/crates/semantic_index/src/worktree_index.rs
deleted file mode 100644
index 84b932d296..0000000000
--- a/crates/semantic_index/src/worktree_index.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use crate::embedding::EmbeddingProvider;
-use crate::embedding_index::EmbeddingIndex;
-use crate::indexing::IndexingEntrySet;
-use crate::summary_index::SummaryIndex;
-use anyhow::Result;
-use fs::Fs;
-use futures::future::Shared;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
-use language::LanguageRegistry;
-use log;
-use project::{UpdatedEntriesSet, Worktree};
-use smol::channel;
-use std::sync::Arc;
-use util::ResultExt;
-
-#[derive(Clone)]
-pub enum WorktreeIndexHandle {
-    Loading {
-        index: Shared<Task<Result<Entity<WorktreeIndex>, Arc<anyhow::Error>>>>,
-    },
-    Loaded {
-        index: Entity<WorktreeIndex>,
-    },
-}
-
-pub struct WorktreeIndex {
-    worktree: Entity<Worktree>,
-    db_connection: heed::Env,
-    embedding_index: EmbeddingIndex,
-    summary_index: SummaryIndex,
-    entry_ids_being_indexed: Arc<IndexingEntrySet>,
-    _index_entries: Task<Result<()>>,
-    _subscription: Subscription,
-}
-
-impl WorktreeIndex {
-    pub fn load(
-        worktree: Entity<Worktree>,
-        db_connection: heed::Env,
-        language_registry: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        status_tx: channel::Sender<()>,
-        embedding_provider: Arc<dyn EmbeddingProvider>,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let worktree_for_index = worktree.clone();
-        let worktree_for_summary = worktree.clone();
-        let worktree_abs_path = worktree.read(cx).abs_path();
-        let embedding_fs = Arc::clone(&fs);
-        let summary_fs = fs;
-        cx.spawn(async move |cx| {
-            let entries_being_indexed = Arc::new(IndexingEntrySet::new(status_tx));
-            let (embedding_index, summary_index) = cx
-                .background_spawn({
-                    let entries_being_indexed = Arc::clone(&entries_being_indexed);
-                    let db_connection = db_connection.clone();
-                    async move {
-                        let mut txn = db_connection.write_txn()?;
-                        let embedding_index = {
-                            let db_name = worktree_abs_path.to_string_lossy();
-                            let db = db_connection.create_database(&mut txn, Some(&db_name))?;
-
-                            EmbeddingIndex::new(
-                                worktree_for_index,
-                                embedding_fs,
-                                db_connection.clone(),
-                                db,
-                                language_registry,
-                                embedding_provider,
-                                Arc::clone(&entries_being_indexed),
-                            )
-                        };
-                        let summary_index = {
-                            let file_digest_db = {
-                                let db_name =
-                                // Prepend something that wouldn't be found at the beginning of an
-                                // absolute path, so we don't get db key namespace conflicts with
-                                // embeddings, which use the abs path as a key.
-                                format!("digests-{}", worktree_abs_path.to_string_lossy());
-                                db_connection.create_database(&mut txn, Some(&db_name))?
-                            };
-                            let summary_db = {
-                                let db_name =
-                                // Prepend something that wouldn't be found at the beginning of an
-                                // absolute path, so we don't get db key namespace conflicts with
-                                // embeddings, which use the abs path as a key.
-                                format!("summaries-{}", worktree_abs_path.to_string_lossy());
-                                db_connection.create_database(&mut txn, Some(&db_name))?
-                            };
-                            SummaryIndex::new(
-                                worktree_for_summary,
-                                summary_fs,
-                                db_connection.clone(),
-                                file_digest_db,
-                                summary_db,
-                                Arc::clone(&entries_being_indexed),
-                            )
-                        };
-                        txn.commit()?;
-                        anyhow::Ok((embedding_index, summary_index))
-                    }
-                })
-                .await?;
-
-            cx.new(|cx| {
-                Self::new(
-                    worktree,
-                    db_connection,
-                    embedding_index,
-                    summary_index,
-                    entries_being_indexed,
-                    cx,
-                )
-            })
-        })
-    }
-
-    pub fn new(
-        worktree: Entity<Worktree>,
-        db_connection: heed::Env,
-        embedding_index: EmbeddingIndex,
-        summary_index: SummaryIndex,
-        entry_ids_being_indexed: Arc<IndexingEntrySet>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let (updated_entries_tx, updated_entries_rx) = channel::unbounded();
-        let _subscription = cx.subscribe(&worktree, move |_this, _worktree, event, _cx| {
-            if let worktree::Event::UpdatedEntries(update) = event {
-                log::debug!("Updating entries...");
-                _ = updated_entries_tx.try_send(update.clone());
-            }
-        });
-
-        Self {
-            db_connection,
-            embedding_index,
-            summary_index,
-            worktree,
-            entry_ids_being_indexed,
-            _index_entries: cx.spawn(async move |this, cx| {
-                Self::index_entries(this, updated_entries_rx, cx).await
-            }),
-            _subscription,
-        }
-    }
-
-    pub fn entry_ids_being_indexed(&self) -> &IndexingEntrySet {
-        self.entry_ids_being_indexed.as_ref()
-    }
-
-    pub fn worktree(&self) -> &Entity<Worktree> {
-        &self.worktree
-    }
-
-    pub fn db_connection(&self) -> &heed::Env {
-        &self.db_connection
-    }
-
-    pub fn embedding_index(&self) -> &EmbeddingIndex {
-        &self.embedding_index
-    }
-
-    pub fn summary_index(&self) -> &SummaryIndex {
-        &self.summary_index
-    }
-
-    async fn index_entries(
-        this: WeakEntity<Self>,
-        updated_entries: channel::Receiver<UpdatedEntriesSet>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let index = this.update(cx, |this, cx| {
-            futures::future::try_join(
-                this.embedding_index.index_entries_changed_on_disk(cx),
-                this.summary_index.index_entries_changed_on_disk(false, cx),
-            )
-        })?;
-        index.await.log_err();
-
-        while let Ok(updated_entries) = updated_entries.recv().await {
-            let index = this.update(cx, |this, cx| {
-                futures::future::try_join(
-                    this.embedding_index
-                        .index_updated_entries(updated_entries.clone(), cx),
-                    this.summary_index
-                        .index_updated_entries(updated_entries, false, cx),
-                )
-            })?;
-            index.await.log_err();
-        }
-
-        Ok(())
-    }
-
-    #[cfg(test)]
-    pub fn path_count(&self) -> Result<u64> {
-        use anyhow::Context as _;
-
-        let txn = self
-            .db_connection
-            .read_txn()
-            .context("failed to create read transaction")?;
-        Ok(self.embedding_index().db().len(&txn)?)
-    }
-}

From 3f80ac01278b273b5ebc6a4956ad1c215b185e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com>
Date: Mon, 8 Sep 2025 22:44:19 +0800
Subject: [PATCH 679/823] macos: Fix menu bar flickering (#37707)

Closes #37526

Release Notes:

- Fixed menu bar flickering when using some IMEs on macOS.
---
 crates/zed/src/zed.rs | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index cb5cfea81a..91ec021c44 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1317,15 +1317,31 @@ pub fn handle_keymap_file_changes(
     })
     .detach();
 
-    let mut current_layout_id = cx.keyboard_layout().id().to_string();
-    cx.on_keyboard_layout_change(move |cx| {
-        let next_layout_id = cx.keyboard_layout().id();
-        if next_layout_id != current_layout_id {
-            current_layout_id = next_layout_id.to_string();
-            keyboard_layout_tx.unbounded_send(()).ok();
-        }
-    })
-    .detach();
+    #[cfg(target_os = "windows")]
+    {
+        let mut current_layout_id = cx.keyboard_layout().id().to_string();
+        cx.on_keyboard_layout_change(move |cx| {
+            let next_layout_id = cx.keyboard_layout().id();
+            if next_layout_id != current_layout_id {
+                current_layout_id = next_layout_id.to_string();
+                keyboard_layout_tx.unbounded_send(()).ok();
+            }
+        })
+        .detach();
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        let mut current_mapping = cx.keyboard_mapper().get_key_equivalents().cloned();
+        cx.on_keyboard_layout_change(move |cx| {
+            let next_mapping = cx.keyboard_mapper().get_key_equivalents();
+            if current_mapping.as_ref() != next_mapping {
+                current_mapping = next_mapping.cloned();
+                keyboard_layout_tx.unbounded_send(()).ok();
+            }
+        })
+        .detach();
+    }
 
     load_default_keymap(cx);
 

From 10989c702ca708cf9eb9ef45126351e9bad944b3 Mon Sep 17 00:00:00 2001
From: fantacell <ghub@giggo.de>
Date: Mon, 8 Sep 2025 16:48:47 +0200
Subject: [PATCH 680/823] helix: Add match operator (#34060)

This is an implementation of matching like "m i (", as well as "] (" and
"[ (" in `helix_mode` with a few supported objects and a basis for more.

Release Notes:

- Added helix operators for selecting text objects

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/keymaps/vim.json          | 137 +++---
 crates/editor/src/movement.rs    |  33 +-
 crates/vim/src/helix.rs          |   4 +
 crates/vim/src/helix/boundary.rs | 740 +++++++++++++++++++++++++++++++
 crates/vim/src/helix/object.rs   | 182 ++++++++
 crates/vim/src/helix/select.rs   |  84 ++++
 crates/vim/src/normal.rs         |   9 +
 crates/vim/src/object.rs         |   6 +-
 crates/vim/src/state.rs          |  25 +-
 crates/vim/src/vim.rs            |  39 ++
 crates/zed/src/zed.rs            |   2 +
 docs/src/helix.md                |   4 +
 12 files changed, 1196 insertions(+), 69 deletions(-)
 create mode 100644 crates/vim/src/helix/boundary.rs
 create mode 100644 crates/vim/src/helix/object.rs
 create mode 100644 crates/vim/src/helix/select.rs

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index fa7f82e103..508d8949d2 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -32,34 +32,6 @@
       "(": "vim::SentenceBackward",
       ")": "vim::SentenceForward",
       "|": "vim::GoToColumn",
-      "] ]": "vim::NextSectionStart",
-      "] [": "vim::NextSectionEnd",
-      "[ [": "vim::PreviousSectionStart",
-      "[ ]": "vim::PreviousSectionEnd",
-      "] m": "vim::NextMethodStart",
-      "] shift-m": "vim::NextMethodEnd",
-      "[ m": "vim::PreviousMethodStart",
-      "[ shift-m": "vim::PreviousMethodEnd",
-      "[ *": "vim::PreviousComment",
-      "[ /": "vim::PreviousComment",
-      "] *": "vim::NextComment",
-      "] /": "vim::NextComment",
-      "[ -": "vim::PreviousLesserIndent",
-      "[ +": "vim::PreviousGreaterIndent",
-      "[ =": "vim::PreviousSameIndent",
-      "] -": "vim::NextLesserIndent",
-      "] +": "vim::NextGreaterIndent",
-      "] =": "vim::NextSameIndent",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0],
-      "] space": "vim::InsertEmptyLineBelow",
-      "[ space": "vim::InsertEmptyLineAbove",
-      "[ e": "editor::MoveLineUp",
-      "] e": "editor::MoveLineDown",
-      "[ f": "workspace::FollowNextCollaborator",
-      "] f": "workspace::FollowNextCollaborator",
 
       // Word motions
       "w": "vim::NextWordStart",
@@ -83,10 +55,6 @@
       "n": "vim::MoveToNextMatch",
       "shift-n": "vim::MoveToPreviousMatch",
       "%": "vim::Matching",
-      "] }": ["vim::UnmatchedForward", { "char": "}" }],
-      "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
-      "] )": ["vim::UnmatchedForward", { "char": ")" }],
-      "[ (": ["vim::UnmatchedBackward", { "char": "(" }],
       "f": ["vim::PushFindForward", { "before": false, "multiline": false }],
       "t": ["vim::PushFindForward", { "before": true, "multiline": false }],
       "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": false }],
@@ -219,6 +187,46 @@
       ".": "vim::Repeat"
     }
   },
+  {
+    "context": "vim_mode == normal || vim_mode == visual || vim_mode == operator",
+    "bindings": {
+      "] ]": "vim::NextSectionStart",
+      "] [": "vim::NextSectionEnd",
+      "[ [": "vim::PreviousSectionStart",
+      "[ ]": "vim::PreviousSectionEnd",
+      "] m": "vim::NextMethodStart",
+      "] shift-m": "vim::NextMethodEnd",
+      "[ m": "vim::PreviousMethodStart",
+      "[ shift-m": "vim::PreviousMethodEnd",
+      "[ *": "vim::PreviousComment",
+      "[ /": "vim::PreviousComment",
+      "] *": "vim::NextComment",
+      "] /": "vim::NextComment",
+      "[ -": "vim::PreviousLesserIndent",
+      "[ +": "vim::PreviousGreaterIndent",
+      "[ =": "vim::PreviousSameIndent",
+      "] -": "vim::NextLesserIndent",
+      "] +": "vim::NextGreaterIndent",
+      "] =": "vim::NextSameIndent",
+      "] b": "pane::ActivateNextItem",
+      "[ b": "pane::ActivatePreviousItem",
+      "] shift-b": "pane::ActivateLastItem",
+      "[ shift-b": ["pane::ActivateItem", 0],
+      "] space": "vim::InsertEmptyLineBelow",
+      "[ space": "vim::InsertEmptyLineAbove",
+      "[ e": "editor::MoveLineUp",
+      "] e": "editor::MoveLineDown",
+      "[ f": "workspace::FollowNextCollaborator",
+      "] f": "workspace::FollowNextCollaborator",
+      "] }": ["vim::UnmatchedForward", { "char": "}" }],
+      "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
+      "] )": ["vim::UnmatchedForward", { "char": ")" }],
+      "[ (": ["vim::UnmatchedBackward", { "char": "(" }],
+      // tree-sitter related commands
+      "[ x": "vim::SelectLargerSyntaxNode",
+      "] x": "vim::SelectSmallerSyntaxNode"
+    }
+  },
   {
     "context": "vim_mode == normal",
     "bindings": {
@@ -249,9 +257,6 @@
       "g w": "vim::PushRewrap",
       "g q": "vim::PushRewrap",
       "insert": "vim::InsertBefore",
-      // tree-sitter related commands
-      "[ x": "vim::SelectLargerSyntaxNode",
-      "] x": "vim::SelectSmallerSyntaxNode",
       "] d": "editor::GoToDiagnostic",
       "[ d": "editor::GoToPreviousDiagnostic",
       "] c": "editor::GoToHunk",
@@ -317,10 +322,7 @@
       "g w": "vim::Rewrap",
       "g ?": "vim::ConvertToRot13",
       // "g ?": "vim::ConvertToRot47",
-      "\"": "vim::PushRegister",
-      // tree-sitter related commands
-      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode"
+      "\"": "vim::PushRegister"
     }
   },
   {
@@ -397,6 +399,9 @@
       "ctrl-[": "editor::Cancel",
       ";": "vim::HelixCollapseSelection",
       ":": "command_palette::Toggle",
+      "m": "vim::PushHelixMatch",
+      "]": ["vim::PushHelixNext", { "around": true }],
+      "[": ["vim::PushHelixPrevious", { "around": true }],
       "left": "vim::WrappingLeft",
       "right": "vim::WrappingRight",
       "h": "vim::WrappingLeft",
@@ -419,13 +424,6 @@
       "insert": "vim::InsertBefore",
       "alt-.": "vim::RepeatFind",
       "alt-s": ["editor::SplitSelectionIntoLines", { "keep_selections": true }],
-      // tree-sitter related commands
-      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode",
-      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPreviousDiagnostic",
-      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPreviousHunk",
       // Goto mode
       "g n": "pane::ActivateNextItem",
       "g p": "pane::ActivatePreviousItem",
@@ -469,9 +467,6 @@
       "space c": "editor::ToggleComments",
       "space y": "editor::Copy",
       "space p": "editor::Paste",
-      // Match mode
-      "m m": "vim::Matching",
-      "m i w": ["workspace::SendKeystrokes", "v i w"],
       "shift-u": "editor::Redo",
       "ctrl-c": "editor::ToggleComments",
       "d": "vim::HelixDelete",
@@ -540,7 +535,7 @@
     }
   },
   {
-    "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
+    "context": "vim_operator == a || vim_operator == i || vim_operator == cs || vim_operator == helix_next || vim_operator == helix_previous",
     "bindings": {
       "w": "vim::Word",
       "shift-w": ["vim::Word", { "ignore_punctuation": true }],
@@ -577,6 +572,48 @@
       "e": "vim::EntireFile"
     }
   },
+  {
+    "context": "vim_operator == helix_m",
+    "bindings": {
+      "m": "vim::Matching"
+    }
+  },
+  {
+    "context": "vim_operator == helix_next",
+    "bindings": {
+      "z": "vim::NextSectionStart",
+      "shift-z": "vim::NextSectionEnd",
+      "*": "vim::NextComment",
+      "/": "vim::NextComment",
+      "-": "vim::NextLesserIndent",
+      "+": "vim::NextGreaterIndent",
+      "=": "vim::NextSameIndent",
+      "b": "pane::ActivateNextItem",
+      "shift-b": "pane::ActivateLastItem",
+      "x": "editor::SelectSmallerSyntaxNode",
+      "d": "editor::GoToDiagnostic",
+      "c": "editor::GoToHunk",
+      "space": "vim::InsertEmptyLineBelow"
+    }
+  },
+  {
+    "context": "vim_operator == helix_previous",
+    "bindings": {
+      "z": "vim::PreviousSectionStart",
+      "shift-z": "vim::PreviousSectionEnd",
+      "*": "vim::PreviousComment",
+      "/": "vim::PreviousComment",
+      "-": "vim::PreviousLesserIndent",
+      "+": "vim::PreviousGreaterIndent",
+      "=": "vim::PreviousSameIndent",
+      "b": "pane::ActivatePreviousItem",
+      "shift-b": ["pane::ActivateItem", 0],
+      "x": "editor::SelectLargerSyntaxNode",
+      "d": "editor::GoToPreviousDiagnostic",
+      "c": "editor::GoToPreviousHunk",
+      "space": "vim::InsertEmptyLineAbove"
+    }
+  },
   {
     "context": "vim_operator == c",
     "bindings": {
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 216bea1696..4bd353a287 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -4,7 +4,7 @@
 use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
 use crate::{DisplayRow, EditorStyle, ToOffset, ToPoint, scroll::ScrollAnchor};
 use gpui::{Pixels, WindowTextSystem};
-use language::Point;
+use language::{CharClassifier, Point};
 use multi_buffer::{MultiBufferRow, MultiBufferSnapshot};
 use serde::Deserialize;
 use workspace::searchable::Direction;
@@ -405,15 +405,18 @@ pub fn previous_subword_start(map: &DisplaySnapshot, point: DisplayPoint) -> Dis
     let classifier = map.buffer_snapshot.char_classifier_at(raw_point);
 
     find_preceding_boundary_display_point(map, point, FindRange::MultiLine, |left, right| {
-        let is_word_start =
-            classifier.kind(left) != classifier.kind(right) && !right.is_whitespace();
-        let is_subword_start = classifier.is_word('-') && left == '-' && right != '-'
-            || left == '_' && right != '_'
-            || left.is_lowercase() && right.is_uppercase();
-        is_word_start || is_subword_start || left == '\n'
+        is_subword_start(left, right, &classifier) || left == '\n'
     })
 }
 
+pub fn is_subword_start(left: char, right: char, classifier: &CharClassifier) -> bool {
+    let is_word_start = classifier.kind(left) != classifier.kind(right) && !right.is_whitespace();
+    let is_subword_start = classifier.is_word('-') && left == '-' && right != '-'
+        || left == '_' && right != '_'
+        || left.is_lowercase() && right.is_uppercase();
+    is_word_start || is_subword_start
+}
+
 /// Returns a position of the next word boundary, where a word character is defined as either
 /// uppercase letter, lowercase letter, '_' character or language-specific word character (like '-' in CSS).
 pub fn next_word_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
@@ -463,15 +466,19 @@ pub fn next_subword_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPo
     let classifier = map.buffer_snapshot.char_classifier_at(raw_point);
 
     find_boundary(map, point, FindRange::MultiLine, |left, right| {
-        let is_word_end =
-            (classifier.kind(left) != classifier.kind(right)) && !classifier.is_whitespace(left);
-        let is_subword_end = classifier.is_word('-') && left != '-' && right == '-'
-            || left != '_' && right == '_'
-            || left.is_lowercase() && right.is_uppercase();
-        is_word_end || is_subword_end || right == '\n'
+        is_subword_end(left, right, &classifier) || right == '\n'
     })
 }
 
+pub fn is_subword_end(left: char, right: char, classifier: &CharClassifier) -> bool {
+    let is_word_end =
+        (classifier.kind(left) != classifier.kind(right)) && !classifier.is_whitespace(left);
+    let is_subword_end = classifier.is_word('-') && left != '-' && right == '-'
+        || left != '_' && right == '_'
+        || left.is_lowercase() && right.is_uppercase();
+    is_word_end || is_subword_end
+}
+
 /// Returns a position of the start of the current paragraph, where a paragraph
 /// is defined as a run of non-blank lines.
 pub fn start_of_paragraph(
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index abde3a8ce6..34ef2b40ec 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -1,3 +1,7 @@
+mod boundary;
+mod object;
+mod select;
+
 use editor::display_map::DisplaySnapshot;
 use editor::{
     DisplayPoint, Editor, HideMouseCursorOrigin, SelectionEffects, ToOffset, ToPoint, movement,
diff --git a/crates/vim/src/helix/boundary.rs b/crates/vim/src/helix/boundary.rs
new file mode 100644
index 0000000000..77d31eea33
--- /dev/null
+++ b/crates/vim/src/helix/boundary.rs
@@ -0,0 +1,740 @@
+use std::{
+    cmp::Ordering,
+    ops::{Deref, DerefMut, Range},
+};
+
+use editor::{
+    DisplayPoint,
+    display_map::{DisplaySnapshot, ToDisplayPoint},
+    movement,
+};
+use language::{CharClassifier, CharKind};
+use text::Bias;
+
+use crate::helix::object::HelixTextObject;
+
+/// Text objects (after helix definition) that can easily be
+/// found by reading a buffer and comparing two neighboring chars
+/// until a start / end is found
+trait BoundedObject {
+    /// The next start since `from` (inclusive).
+    /// If outer is true it is the start of "a" object (m a) rather than "inner" object (m i).
+    fn next_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
+    /// The next end since `from` (inclusive).
+    /// If outer is true it is the end of "a" object (m a) rather than "inner" object (m i).
+    fn next_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
+    /// The previous start since `from` (inclusive).
+    /// If outer is true it is the start of "a" object (m a) rather than "inner" object (m i).
+    fn previous_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
+    /// The previous end since `from` (inclusive).
+    /// If outer is true it is the end of "a" object (m a) rather than "inner" object (m i).
+    fn previous_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
+
+    /// Whether the range inside the object can be zero characters wide.
+    /// If so, the trait assumes that these ranges can't be directly adjacent to each other.
+    fn inner_range_can_be_zero_width(&self) -> bool;
+    /// Whether the "ma" can exceed the "mi" range on both sides at the same time
+    fn surround_on_both_sides(&self) -> bool;
+    /// Whether the outer range of an object could overlap with the outer range of the neighboring
+    /// object. If so, they can't be nested.
+    fn ambiguous_outer(&self) -> bool;
+
+    fn can_be_zero_width(&self, around: bool) -> bool {
+        if around {
+            false
+        } else {
+            self.inner_range_can_be_zero_width()
+        }
+    }
+
+    /// Switches from an "mi" range to an "ma" one.
+    /// Assumes the inner range is valid.
+    fn around(&self, map: &DisplaySnapshot, inner_range: Range<Offset>) -> Range<Offset> {
+        if self.surround_on_both_sides() {
+            let start = self
+                .previous_start(map, inner_range.start, true)
+                .unwrap_or(inner_range.start);
+            let end = self
+                .next_end(map, inner_range.end, true)
+                .unwrap_or(inner_range.end);
+
+            return start..end;
+        }
+
+        let mut start = inner_range.start;
+        let end = self
+            .next_end(map, inner_range.end, true)
+            .unwrap_or(inner_range.end);
+        if end == inner_range.end {
+            start = self
+                .previous_start(map, inner_range.start, true)
+                .unwrap_or(inner_range.start)
+        }
+
+        start..end
+    }
+    /// Switches from an "ma" range to an "mi" one.
+    /// Assumes the inner range is valid.
+    fn inside(&self, map: &DisplaySnapshot, outer_range: Range<Offset>) -> Range<Offset> {
+        let inner_start = self
+            .next_start(map, outer_range.start, false)
+            .unwrap_or_else(|| {
+                log::warn!("The motion might not have found the text object correctly");
+                outer_range.start
+            });
+        let inner_end = self
+            .previous_end(map, outer_range.end, false)
+            .unwrap_or_else(|| {
+                log::warn!("The motion might not have found the text object correctly");
+                outer_range.end
+            });
+        inner_start..inner_end
+    }
+
+    /// The next end since `start` (inclusive) on the same nesting level.
+    fn close_at_end(&self, start: Offset, map: &DisplaySnapshot, outer: bool) -> Option<Offset> {
+        let mut end_search_start = if self.can_be_zero_width(outer) {
+            start
+        } else {
+            start.next(map)?
+        };
+        let mut start_search_start = start.next(map)?;
+
+        loop {
+            let next_end = self.next_end(map, end_search_start, outer)?;
+            let maybe_next_start = self.next_start(map, start_search_start, outer);
+            if let Some(next_start) = maybe_next_start
+                && (*next_start < *next_end
+                    || *next_start == *next_end && self.can_be_zero_width(outer))
+                && !self.ambiguous_outer()
+            {
+                let closing = self.close_at_end(next_start, map, outer)?;
+                end_search_start = closing.next(map)?;
+                start_search_start = if self.can_be_zero_width(outer) {
+                    closing.next(map)?
+                } else {
+                    closing
+                };
+            } else {
+                return Some(next_end);
+            }
+        }
+    }
+    /// The previous start since `end` (inclusive) on the same nesting level.
+    fn close_at_start(&self, end: Offset, map: &DisplaySnapshot, outer: bool) -> Option<Offset> {
+        let mut start_search_end = if self.can_be_zero_width(outer) {
+            end
+        } else {
+            end.previous(map)?
+        };
+        let mut end_search_end = end.previous(map)?;
+
+        loop {
+            let previous_start = self.previous_start(map, start_search_end, outer)?;
+            let maybe_previous_end = self.previous_end(map, end_search_end, outer);
+            if let Some(previous_end) = maybe_previous_end
+                && (*previous_end > *previous_start
+                    || *previous_end == *previous_start && self.can_be_zero_width(outer))
+                && !self.ambiguous_outer()
+            {
+                let closing = self.close_at_start(previous_end, map, outer)?;
+                start_search_end = closing.previous(map)?;
+                end_search_end = if self.can_be_zero_width(outer) {
+                    closing.previous(map)?
+                } else {
+                    closing
+                };
+            } else {
+                return Some(previous_start);
+            }
+        }
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, Debug)]
+struct Offset(usize);
+impl Deref for Offset {
+    type Target = usize;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl DerefMut for Offset {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+impl Offset {
+    fn next(self, map: &DisplaySnapshot) -> Option<Self> {
+        let next = Self(map.buffer_snapshot.clip_offset(*self + 1, Bias::Right));
+        (*next > *self).then(|| next)
+    }
+    fn previous(self, map: &DisplaySnapshot) -> Option<Self> {
+        if *self == 0 {
+            return None;
+        }
+        Some(Self(map.buffer_snapshot.clip_offset(*self - 1, Bias::Left)))
+    }
+    fn range(
+        start: (DisplayPoint, Bias),
+        end: (DisplayPoint, Bias),
+        map: &DisplaySnapshot,
+    ) -> Range<Self> {
+        Self(start.0.to_offset(map, start.1))..Self(end.0.to_offset(map, end.1))
+    }
+}
+
+impl<B: BoundedObject> HelixTextObject for B {
+    fn range(
+        &self,
+        map: &DisplaySnapshot,
+        relative_to: Range<DisplayPoint>,
+        around: bool,
+    ) -> Option<Range<DisplayPoint>> {
+        let relative_to = Offset::range(
+            (relative_to.start, Bias::Left),
+            (relative_to.end, Bias::Left),
+            map,
+        );
+
+        relative_range(self, around, map, |find_outer| {
+            let search_start = if self.can_be_zero_width(find_outer) {
+                relative_to.end
+            } else {
+                // If the objects can be directly next to each other an object end the
+                // cursor (relative_to) end would not count for close_at_end, so the search
+                // needs to start one character to the left.
+                relative_to.end.previous(map)?
+            };
+            let max_end = self.close_at_end(search_start, map, find_outer)?;
+            let min_start = self.close_at_start(max_end, map, find_outer)?;
+
+            (*min_start <= *relative_to.start).then(|| min_start..max_end)
+        })
+    }
+
+    fn next_range(
+        &self,
+        map: &DisplaySnapshot,
+        relative_to: Range<DisplayPoint>,
+        around: bool,
+    ) -> Option<Range<DisplayPoint>> {
+        let relative_to = Offset::range(
+            (relative_to.start, Bias::Left),
+            (relative_to.end, Bias::Left),
+            map,
+        );
+
+        relative_range(self, around, map, |find_outer| {
+            let min_start = self.next_start(map, relative_to.end, find_outer)?;
+            let max_end = self.close_at_end(min_start, map, find_outer)?;
+
+            Some(min_start..max_end)
+        })
+    }
+
+    fn previous_range(
+        &self,
+        map: &DisplaySnapshot,
+        relative_to: Range<DisplayPoint>,
+        around: bool,
+    ) -> Option<Range<DisplayPoint>> {
+        let relative_to = Offset::range(
+            (relative_to.start, Bias::Left),
+            (relative_to.end, Bias::Left),
+            map,
+        );
+
+        relative_range(self, around, map, |find_outer| {
+            let max_end = self.previous_end(map, relative_to.start, find_outer)?;
+            let min_start = self.close_at_start(max_end, map, find_outer)?;
+
+            Some(min_start..max_end)
+        })
+    }
+}
+
+fn relative_range<B: BoundedObject>(
+    object: &B,
+    outer: bool,
+    map: &DisplaySnapshot,
+    find_range: impl Fn(bool) -> Option<Range<Offset>>,
+) -> Option<Range<DisplayPoint>> {
+    // The cursor could be inside the outer range, but not the inner range.
+    // Whether that should count as found.
+    let find_outer = object.surround_on_both_sides() && !object.ambiguous_outer();
+    let range = find_range(find_outer)?;
+    let min_start = range.start;
+    let max_end = range.end;
+
+    let wanted_range = if outer && !find_outer {
+        // max_end is not yet the outer end
+        object.around(map, min_start..max_end)
+    } else if !outer && find_outer {
+        // max_end is the outer end, but the final result should have the inner end
+        object.inside(map, min_start..max_end)
+    } else {
+        min_start..max_end
+    };
+
+    let start = wanted_range.start.clone().to_display_point(map);
+    let end = wanted_range.end.clone().to_display_point(map);
+
+    Some(start..end)
+}
+
+/// A textobject whose boundaries can easily be found between two chars
+pub enum ImmediateBoundary {
+    Word { ignore_punctuation: bool },
+    Subword { ignore_punctuation: bool },
+    AngleBrackets,
+    BackQuotes,
+    CurlyBrackets,
+    DoubleQuotes,
+    Parentheses,
+    SingleQuotes,
+    SquareBrackets,
+    VerticalBars,
+}
+
+/// A textobject whose start and end can be found from an easy-to-find
+/// boundary between two chars by following a simple path from there
+pub enum FuzzyBoundary {
+    Sentence,
+    Paragraph,
+}
+
+impl ImmediateBoundary {
+    fn is_inner_start(&self, left: char, right: char, classifier: CharClassifier) -> bool {
+        match self {
+            Self::Word { ignore_punctuation } => {
+                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
+                is_word_start(left, right, &classifier)
+                    || (is_buffer_start(left) && classifier.kind(right) != CharKind::Whitespace)
+            }
+            Self::Subword { ignore_punctuation } => {
+                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
+                movement::is_subword_start(left, right, &classifier)
+                    || (is_buffer_start(left) && classifier.kind(right) != CharKind::Whitespace)
+            }
+            Self::AngleBrackets => left == '<',
+            Self::BackQuotes => left == '`',
+            Self::CurlyBrackets => left == '{',
+            Self::DoubleQuotes => left == '"',
+            Self::Parentheses => left == '(',
+            Self::SingleQuotes => left == '\'',
+            Self::SquareBrackets => left == '[',
+            Self::VerticalBars => left == '|',
+        }
+    }
+    fn is_inner_end(&self, left: char, right: char, classifier: CharClassifier) -> bool {
+        match self {
+            Self::Word { ignore_punctuation } => {
+                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
+                is_word_end(left, right, &classifier)
+                    || (is_buffer_end(right) && classifier.kind(left) != CharKind::Whitespace)
+            }
+            Self::Subword { ignore_punctuation } => {
+                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
+                movement::is_subword_start(left, right, &classifier)
+                    || (is_buffer_end(right) && classifier.kind(left) != CharKind::Whitespace)
+            }
+            Self::AngleBrackets => right == '>',
+            Self::BackQuotes => right == '`',
+            Self::CurlyBrackets => right == '}',
+            Self::DoubleQuotes => right == '"',
+            Self::Parentheses => right == ')',
+            Self::SingleQuotes => right == '\'',
+            Self::SquareBrackets => right == ']',
+            Self::VerticalBars => right == '|',
+        }
+    }
+    fn is_outer_start(&self, left: char, right: char, classifier: CharClassifier) -> bool {
+        match self {
+            word @ Self::Word { .. } => word.is_inner_end(left, right, classifier) || left == '\n',
+            subword @ Self::Subword { .. } => {
+                subword.is_inner_end(left, right, classifier) || left == '\n'
+            }
+            Self::AngleBrackets => right == '<',
+            Self::BackQuotes => right == '`',
+            Self::CurlyBrackets => right == '{',
+            Self::DoubleQuotes => right == '"',
+            Self::Parentheses => right == '(',
+            Self::SingleQuotes => right == '\'',
+            Self::SquareBrackets => right == '[',
+            Self::VerticalBars => right == '|',
+        }
+    }
+    fn is_outer_end(&self, left: char, right: char, classifier: CharClassifier) -> bool {
+        match self {
+            word @ Self::Word { .. } => {
+                word.is_inner_start(left, right, classifier) || right == '\n'
+            }
+            subword @ Self::Subword { .. } => {
+                subword.is_inner_start(left, right, classifier) || right == '\n'
+            }
+            Self::AngleBrackets => left == '>',
+            Self::BackQuotes => left == '`',
+            Self::CurlyBrackets => left == '}',
+            Self::DoubleQuotes => left == '"',
+            Self::Parentheses => left == ')',
+            Self::SingleQuotes => left == '\'',
+            Self::SquareBrackets => left == ']',
+            Self::VerticalBars => left == '|',
+        }
+    }
+}
+
+impl BoundedObject for ImmediateBoundary {
+    fn next_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        try_find_boundary(map, from, |left, right| {
+            let classifier = map.buffer_snapshot.char_classifier_at(*from);
+            if outer {
+                self.is_outer_start(left, right, classifier)
+            } else {
+                self.is_inner_start(left, right, classifier)
+            }
+        })
+    }
+    fn next_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        try_find_boundary(map, from, |left, right| {
+            let classifier = map.buffer_snapshot.char_classifier_at(*from);
+            if outer {
+                self.is_outer_end(left, right, classifier)
+            } else {
+                self.is_inner_end(left, right, classifier)
+            }
+        })
+    }
+    fn previous_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        try_find_preceding_boundary(map, from, |left, right| {
+            let classifier = map.buffer_snapshot.char_classifier_at(*from);
+            if outer {
+                self.is_outer_start(left, right, classifier)
+            } else {
+                self.is_inner_start(left, right, classifier)
+            }
+        })
+    }
+    fn previous_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        try_find_preceding_boundary(map, from, |left, right| {
+            let classifier = map.buffer_snapshot.char_classifier_at(*from);
+            if outer {
+                self.is_outer_end(left, right, classifier)
+            } else {
+                self.is_inner_end(left, right, classifier)
+            }
+        })
+    }
+    fn inner_range_can_be_zero_width(&self) -> bool {
+        match self {
+            Self::Subword { .. } | Self::Word { .. } => false,
+            _ => true,
+        }
+    }
+    fn surround_on_both_sides(&self) -> bool {
+        match self {
+            Self::Subword { .. } | Self::Word { .. } => false,
+            _ => true,
+        }
+    }
+    fn ambiguous_outer(&self) -> bool {
+        match self {
+            Self::BackQuotes
+            | Self::DoubleQuotes
+            | Self::SingleQuotes
+            | Self::VerticalBars
+            | Self::Subword { .. }
+            | Self::Word { .. } => true,
+            _ => false,
+        }
+    }
+}
+
+impl FuzzyBoundary {
+    /// When between two chars that form an easy-to-find identifier boundary,
+    /// what's the way to get to the actual start of the object, if any
+    fn is_near_potential_inner_start<'a>(
+        &self,
+        left: char,
+        right: char,
+        classifier: &CharClassifier,
+    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
+        if is_buffer_start(left) {
+            return Some(Box::new(|identifier, _| Some(identifier)));
+        }
+        match self {
+            Self::Paragraph => {
+                if left != '\n' || right != '\n' {
+                    return None;
+                }
+                Some(Box::new(|identifier, map| {
+                    try_find_boundary(map, identifier, |left, right| left == '\n' && right != '\n')
+                }))
+            }
+            Self::Sentence => {
+                if let Some(find_paragraph_start) =
+                    Self::Paragraph.is_near_potential_inner_start(left, right, classifier)
+                {
+                    return Some(find_paragraph_start);
+                } else if !is_sentence_end(left, right, classifier) {
+                    return None;
+                }
+                Some(Box::new(|identifier, map| {
+                    let word = ImmediateBoundary::Word {
+                        ignore_punctuation: false,
+                    };
+                    word.next_start(map, identifier, false)
+                }))
+            }
+        }
+    }
+    /// When between two chars that form an easy-to-find identifier boundary,
+    /// what's the way to get to the actual end of the object, if any
+    fn is_near_potential_inner_end<'a>(
+        &self,
+        left: char,
+        right: char,
+        classifier: &CharClassifier,
+    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
+        if is_buffer_end(right) {
+            return Some(Box::new(|identifier, _| Some(identifier)));
+        }
+        match self {
+            Self::Paragraph => {
+                if left != '\n' || right != '\n' {
+                    return None;
+                }
+                Some(Box::new(|identifier, map| {
+                    try_find_preceding_boundary(map, identifier, |left, right| {
+                        left != '\n' && right == '\n'
+                    })
+                }))
+            }
+            Self::Sentence => {
+                if let Some(find_paragraph_end) =
+                    Self::Paragraph.is_near_potential_inner_end(left, right, classifier)
+                {
+                    return Some(find_paragraph_end);
+                } else if !is_sentence_end(left, right, classifier) {
+                    return None;
+                }
+                Some(Box::new(|identifier, _| Some(identifier)))
+            }
+        }
+    }
+    /// When between two chars that form an easy-to-find identifier boundary,
+    /// what's the way to get to the actual end of the object, if any
+    fn is_near_potential_outer_start<'a>(
+        &self,
+        left: char,
+        right: char,
+        classifier: &CharClassifier,
+    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
+        match self {
+            paragraph @ Self::Paragraph => {
+                paragraph.is_near_potential_inner_end(left, right, classifier)
+            }
+            sentence @ Self::Sentence => {
+                sentence.is_near_potential_inner_end(left, right, classifier)
+            }
+        }
+    }
+    /// When between two chars that form an easy-to-find identifier boundary,
+    /// what's the way to get to the actual end of the object, if any
+    fn is_near_potential_outer_end<'a>(
+        &self,
+        left: char,
+        right: char,
+        classifier: &CharClassifier,
+    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
+        match self {
+            paragraph @ Self::Paragraph => {
+                paragraph.is_near_potential_inner_start(left, right, classifier)
+            }
+            sentence @ Self::Sentence => {
+                sentence.is_near_potential_inner_start(left, right, classifier)
+            }
+        }
+    }
+
+    // The boundary can be on the other side of `from` than the identifier, so the search needs to go both ways.
+    // Also, the distance (and direction) between identifier and boundary could vary, so a few ones need to be
+    // compared, even if one boundary was already found on the right side of `from`.
+    fn to_boundary(
+        &self,
+        map: &DisplaySnapshot,
+        from: Offset,
+        outer: bool,
+        backward: bool,
+        boundary_kind: Boundary,
+    ) -> Option<Offset> {
+        let generate_boundary_data = |left, right, point: Offset| {
+            let classifier = map.buffer_snapshot.char_classifier_at(*from);
+            let reach_boundary = if outer && boundary_kind == Boundary::Start {
+                self.is_near_potential_outer_start(left, right, &classifier)
+            } else if !outer && boundary_kind == Boundary::Start {
+                self.is_near_potential_inner_start(left, right, &classifier)
+            } else if outer && boundary_kind == Boundary::End {
+                self.is_near_potential_outer_end(left, right, &classifier)
+            } else {
+                self.is_near_potential_inner_end(left, right, &classifier)
+            };
+
+            reach_boundary.map(|reach_start| (point, reach_start))
+        };
+
+        let forwards = try_find_boundary_data(map, from, generate_boundary_data);
+        let backwards = try_find_preceding_boundary_data(map, from, generate_boundary_data);
+        let boundaries = [forwards, backwards]
+            .into_iter()
+            .flatten()
+            .filter_map(|(identifier, reach_boundary)| reach_boundary(identifier, map))
+            .filter(|boundary| match boundary.cmp(&from) {
+                Ordering::Equal => true,
+                Ordering::Less => backward,
+                Ordering::Greater => !backward,
+            });
+        if backward {
+            boundaries.max_by_key(|boundary| **boundary)
+        } else {
+            boundaries.min_by_key(|boundary| **boundary)
+        }
+    }
+}
+
+#[derive(PartialEq)]
+enum Boundary {
+    Start,
+    End,
+}
+
+impl BoundedObject for FuzzyBoundary {
+    fn next_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        self.to_boundary(map, from, outer, false, Boundary::Start)
+    }
+    fn next_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        self.to_boundary(map, from, outer, false, Boundary::End)
+    }
+    fn previous_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        self.to_boundary(map, from, outer, true, Boundary::Start)
+    }
+    fn previous_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
+        self.to_boundary(map, from, outer, true, Boundary::End)
+    }
+    fn inner_range_can_be_zero_width(&self) -> bool {
+        false
+    }
+    fn surround_on_both_sides(&self) -> bool {
+        false
+    }
+    fn ambiguous_outer(&self) -> bool {
+        false
+    }
+}
+
+/// Returns the first boundary after or at `from` in text direction.
+/// The start and end of the file are the chars `'\0'`.
+fn try_find_boundary(
+    map: &DisplaySnapshot,
+    from: Offset,
+    is_boundary: impl Fn(char, char) -> bool,
+) -> Option<Offset> {
+    let boundary = try_find_boundary_data(map, from, |left, right, point| {
+        if is_boundary(left, right) {
+            Some(point)
+        } else {
+            None
+        }
+    })?;
+    Some(boundary)
+}
+
+/// Returns some information about it (of type `T`) as soon as
+/// there is a boundary after or at `from` in text direction
+/// The start and end of the file are the chars `'\0'`.
+fn try_find_boundary_data<T>(
+    map: &DisplaySnapshot,
+    mut from: Offset,
+    boundary_information: impl Fn(char, char, Offset) -> Option<T>,
+) -> Option<T> {
+    let mut prev_ch = map
+        .buffer_snapshot
+        .reversed_chars_at(*from)
+        .next()
+        .unwrap_or('\0');
+
+    for ch in map.buffer_snapshot.chars_at(*from).chain(['\0']) {
+        if let Some(boundary_information) = boundary_information(prev_ch, ch, from) {
+            return Some(boundary_information);
+        }
+        *from += ch.len_utf8();
+        prev_ch = ch;
+    }
+
+    None
+}
+
+/// Returns the first boundary after or at `from` in text direction.
+/// The start and end of the file are the chars `'\0'`.
+fn try_find_preceding_boundary(
+    map: &DisplaySnapshot,
+    from: Offset,
+    is_boundary: impl Fn(char, char) -> bool,
+) -> Option<Offset> {
+    let boundary = try_find_preceding_boundary_data(map, from, |left, right, point| {
+        if is_boundary(left, right) {
+            Some(point)
+        } else {
+            None
+        }
+    })?;
+    Some(boundary)
+}
+
+/// Returns some information about it (of type `T`) as soon as
+/// there is a boundary before or at `from` in opposite text direction
+/// The start and end of the file are the chars `'\0'`.
+fn try_find_preceding_boundary_data<T>(
+    map: &DisplaySnapshot,
+    mut from: Offset,
+    is_boundary: impl Fn(char, char, Offset) -> Option<T>,
+) -> Option<T> {
+    let mut prev_ch = map.buffer_snapshot.chars_at(*from).next().unwrap_or('\0');
+
+    for ch in map.buffer_snapshot.reversed_chars_at(*from).chain(['\0']) {
+        if let Some(boundary_information) = is_boundary(ch, prev_ch, from) {
+            return Some(boundary_information);
+        }
+        from.0 = from.0.saturating_sub(ch.len_utf8());
+        prev_ch = ch;
+    }
+
+    None
+}
+
+fn is_buffer_start(left: char) -> bool {
+    left == '\0'
+}
+
+fn is_buffer_end(right: char) -> bool {
+    right == '\0'
+}
+
+fn is_word_start(left: char, right: char, classifier: &CharClassifier) -> bool {
+    classifier.kind(left) != classifier.kind(right)
+        && classifier.kind(right) != CharKind::Whitespace
+}
+
+fn is_word_end(left: char, right: char, classifier: &CharClassifier) -> bool {
+    classifier.kind(left) != classifier.kind(right) && classifier.kind(left) != CharKind::Whitespace
+}
+
+fn is_sentence_end(left: char, right: char, classifier: &CharClassifier) -> bool {
+    const ENDS: [char; 1] = ['.'];
+
+    if classifier.kind(right) != CharKind::Whitespace {
+        return false;
+    }
+    ENDS.into_iter().any(|end| left == end)
+}
diff --git a/crates/vim/src/helix/object.rs b/crates/vim/src/helix/object.rs
new file mode 100644
index 0000000000..798cd7162e
--- /dev/null
+++ b/crates/vim/src/helix/object.rs
@@ -0,0 +1,182 @@
+use std::{
+    error::Error,
+    fmt::{self, Display},
+    ops::Range,
+};
+
+use editor::{DisplayPoint, display_map::DisplaySnapshot, movement};
+use text::Selection;
+
+use crate::{
+    helix::boundary::{FuzzyBoundary, ImmediateBoundary},
+    object::Object as VimObject,
+};
+
+/// A text object from helix or an extra one
+pub trait HelixTextObject {
+    fn range(
+        &self,
+        map: &DisplaySnapshot,
+        relative_to: Range<DisplayPoint>,
+        around: bool,
+    ) -> Option<Range<DisplayPoint>>;
+
+    fn next_range(
+        &self,
+        map: &DisplaySnapshot,
+        relative_to: Range<DisplayPoint>,
+        around: bool,
+    ) -> Option<Range<DisplayPoint>>;
+
+    fn previous_range(
+        &self,
+        map: &DisplaySnapshot,
+        relative_to: Range<DisplayPoint>,
+        around: bool,
+    ) -> Option<Range<DisplayPoint>>;
+}
+
+impl VimObject {
+    /// Returns the range of the object the cursor is over.
+    /// Follows helix convention.
+    pub fn helix_range(
+        self,
+        map: &DisplaySnapshot,
+        selection: Selection<DisplayPoint>,
+        around: bool,
+    ) -> Result<Option<Range<DisplayPoint>>, VimToHelixError> {
+        let cursor = cursor_range(&selection, map);
+        if let Some(helix_object) = self.to_helix_object() {
+            Ok(helix_object.range(map, cursor, around))
+        } else {
+            Err(VimToHelixError)
+        }
+    }
+    /// Returns the range of the next object the cursor is not over.
+    /// Follows helix convention.
+    pub fn helix_next_range(
+        self,
+        map: &DisplaySnapshot,
+        selection: Selection<DisplayPoint>,
+        around: bool,
+    ) -> Result<Option<Range<DisplayPoint>>, VimToHelixError> {
+        let cursor = cursor_range(&selection, map);
+        if let Some(helix_object) = self.to_helix_object() {
+            Ok(helix_object.next_range(map, cursor, around))
+        } else {
+            Err(VimToHelixError)
+        }
+    }
+    /// Returns the range of the previous object the cursor is not over.
+    /// Follows helix convention.
+    pub fn helix_previous_range(
+        self,
+        map: &DisplaySnapshot,
+        selection: Selection<DisplayPoint>,
+        around: bool,
+    ) -> Result<Option<Range<DisplayPoint>>, VimToHelixError> {
+        let cursor = cursor_range(&selection, map);
+        if let Some(helix_object) = self.to_helix_object() {
+            Ok(helix_object.previous_range(map, cursor, around))
+        } else {
+            Err(VimToHelixError)
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct VimToHelixError;
+impl Display for VimToHelixError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "Not all vim text objects have an implemented helix equivalent"
+        )
+    }
+}
+impl Error for VimToHelixError {}
+
+impl VimObject {
+    fn to_helix_object(self) -> Option<Box<dyn HelixTextObject>> {
+        Some(match self {
+            Self::AngleBrackets => Box::new(ImmediateBoundary::AngleBrackets),
+            Self::BackQuotes => Box::new(ImmediateBoundary::BackQuotes),
+            Self::CurlyBrackets => Box::new(ImmediateBoundary::CurlyBrackets),
+            Self::DoubleQuotes => Box::new(ImmediateBoundary::DoubleQuotes),
+            Self::Paragraph => Box::new(FuzzyBoundary::Paragraph),
+            Self::Parentheses => Box::new(ImmediateBoundary::Parentheses),
+            Self::Quotes => Box::new(ImmediateBoundary::SingleQuotes),
+            Self::Sentence => Box::new(FuzzyBoundary::Sentence),
+            Self::SquareBrackets => Box::new(ImmediateBoundary::SquareBrackets),
+            Self::Subword { ignore_punctuation } => {
+                Box::new(ImmediateBoundary::Subword { ignore_punctuation })
+            }
+            Self::VerticalBars => Box::new(ImmediateBoundary::VerticalBars),
+            Self::Word { ignore_punctuation } => {
+                Box::new(ImmediateBoundary::Word { ignore_punctuation })
+            }
+            _ => return None,
+        })
+    }
+}
+
+/// Returns the start of the cursor of a selection, whether that is collapsed or not.
+pub(crate) fn cursor_range(
+    selection: &Selection<DisplayPoint>,
+    map: &DisplaySnapshot,
+) -> Range<DisplayPoint> {
+    if selection.is_empty() | selection.reversed {
+        selection.head()..movement::right(map, selection.head())
+    } else {
+        movement::left(map, selection.head())..selection.head()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use db::indoc;
+
+    use crate::{state::Mode, test::VimTestContext};
+
+    #[gpui::test]
+    async fn test_select_word_object(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        let start = indoc! {"
+                The quick brˇowˇnˇ
+                fox «ˇjumps» ov«er
+                the laˇ»zy dogˇ
+
+                "
+        };
+
+        cx.set_state(start, Mode::HelixNormal);
+
+        cx.simulate_keystrokes("m i w");
+
+        cx.assert_state(
+            indoc! {"
+            The quick «brownˇ»
+            fox «jumpsˇ» over
+            the «lazyˇ» dogˇ
+
+            "
+            },
+            Mode::HelixNormal,
+        );
+
+        cx.set_state(start, Mode::HelixNormal);
+
+        cx.simulate_keystrokes("m a w");
+
+        cx.assert_state(
+            indoc! {"
+            The quick« brownˇ»
+            fox «jumps ˇ»over
+            the «lazy ˇ»dogˇ
+
+            "
+            },
+            Mode::HelixNormal,
+        );
+    }
+}
diff --git a/crates/vim/src/helix/select.rs b/crates/vim/src/helix/select.rs
new file mode 100644
index 0000000000..d782e8b450
--- /dev/null
+++ b/crates/vim/src/helix/select.rs
@@ -0,0 +1,84 @@
+use text::SelectionGoal;
+use ui::{Context, Window};
+
+use crate::{Vim, helix::object::cursor_range, object::Object};
+
+impl Vim {
+    /// Selects the object each cursor is over.
+    /// Follows helix convention.
+    pub fn select_current_object(
+        &mut self,
+        object: Object,
+        around: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.stop_recording(cx);
+        self.update_editor(cx, |_, editor, cx| {
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.move_with(|map, selection| {
+                    let Some(range) = object
+                        .helix_range(map, selection.clone(), around)
+                        .unwrap_or({
+                            let vim_range = object.range(map, selection.clone(), around, None);
+                            vim_range.filter(|r| r.start <= cursor_range(selection, map).start)
+                        })
+                    else {
+                        return;
+                    };
+
+                    selection.set_head_tail(range.end, range.start, SelectionGoal::None);
+                });
+            });
+        });
+    }
+
+    /// Selects the next object from each cursor which the cursor is not over.
+    /// Follows helix convention.
+    pub fn select_next_object(
+        &mut self,
+        object: Object,
+        around: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.stop_recording(cx);
+        self.update_editor(cx, |_, editor, cx| {
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.move_with(|map, selection| {
+                    let Ok(Some(range)) = object.helix_next_range(map, selection.clone(), around)
+                    else {
+                        return;
+                    };
+
+                    selection.set_head_tail(range.end, range.start, SelectionGoal::None);
+                });
+            });
+        });
+    }
+
+    /// Selects the previous object from each cursor which the cursor is not over.
+    /// Follows helix convention.
+    pub fn select_previous_object(
+        &mut self,
+        object: Object,
+        around: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.stop_recording(cx);
+        self.update_editor(cx, |_, editor, cx| {
+            editor.change_selections(Default::default(), window, cx, |s| {
+                s.move_with(|map, selection| {
+                    let Ok(Some(range)) =
+                        object.helix_previous_range(map, selection.clone(), around)
+                    else {
+                        return;
+                    };
+
+                    selection.set_head_tail(range.start, range.end, SelectionGoal::None);
+                });
+            });
+        });
+    }
+}
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 0c7b6e55a1..b8d1325a8b 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -495,10 +495,19 @@ impl Vim {
                     self.replace_with_register_object(object, around, window, cx)
                 }
                 Some(Operator::Exchange) => self.exchange_object(object, around, window, cx),
+                Some(Operator::HelixMatch) => {
+                    self.select_current_object(object, around, window, cx)
+                }
                 _ => {
                     // Can't do anything for namespace operators. Ignoring
                 }
             },
+            Some(Operator::HelixNext { around }) => {
+                self.select_next_object(object, around, window, cx);
+            }
+            Some(Operator::HelixPrevious { around }) => {
+                self.select_previous_object(object, around, window, cx);
+            }
             Some(Operator::DeleteSurrounds) => {
                 waiting_operator = Some(Operator::DeleteSurrounds);
             }
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
index 366acb740b..430149cada 100644
--- a/crates/vim/src/object.rs
+++ b/crates/vim/src/object.rs
@@ -397,11 +397,11 @@ impl Vim {
         let count = Self::take_count(cx);
 
         match self.mode {
-            Mode::Normal => self.normal_object(object, count, window, cx),
+            Mode::Normal | Mode::HelixNormal => self.normal_object(object, count, window, cx),
             Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
                 self.visual_object(object, count, window, cx)
             }
-            Mode::Insert | Mode::Replace | Mode::HelixNormal => {
+            Mode::Insert | Mode::Replace => {
                 // Shouldn't execute a text object in insert mode. Ignoring
             }
         }
@@ -1364,7 +1364,7 @@ fn is_sentence_end(map: &DisplaySnapshot, offset: usize) -> bool {
 
 /// Expands the passed range to include whitespace on one side or the other in a line. Attempts to add the
 /// whitespace to the end first and falls back to the start if there was none.
-fn expand_to_include_whitespace(
+pub fn expand_to_include_whitespace(
     map: &DisplaySnapshot,
     range: Range<DisplayPoint>,
     stop_at_newline: bool,
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index fe4bc7433d..8503bffca6 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -134,6 +134,13 @@ pub enum Operator {
     ToggleComments,
     ReplaceWithRegister,
     Exchange,
+    HelixMatch,
+    HelixNext {
+        around: bool,
+    },
+    HelixPrevious {
+        around: bool,
+    },
 }
 
 #[derive(Default, Clone, Debug)]
@@ -1020,6 +1027,9 @@ impl Operator {
             Operator::RecordRegister => "q",
             Operator::ReplayRegister => "@",
             Operator::ToggleComments => "gc",
+            Operator::HelixMatch => "helix_m",
+            Operator::HelixNext { .. } => "helix_next",
+            Operator::HelixPrevious { .. } => "helix_previous",
         }
     }
 
@@ -1041,6 +1051,9 @@ impl Operator {
             } => format!("^V{}", make_visible(prefix)),
             Operator::AutoIndent => "=".to_string(),
             Operator::ShellCommand => "=".to_string(),
+            Operator::HelixMatch => "m".to_string(),
+            Operator::HelixNext { .. } => "]".to_string(),
+            Operator::HelixPrevious { .. } => "[".to_string(),
             _ => self.id().to_string(),
         }
     }
@@ -1079,7 +1092,10 @@ impl Operator {
             | Operator::Object { .. }
             | Operator::ChangeSurrounds { target: None }
             | Operator::OppositeCase
-            | Operator::ToggleComments => false,
+            | Operator::ToggleComments
+            | Operator::HelixMatch
+            | Operator::HelixNext { .. }
+            | Operator::HelixPrevious { .. } => false,
         }
     }
 
@@ -1103,7 +1119,9 @@ impl Operator {
             | Operator::AddSurrounds { target: None }
             | Operator::ChangeSurrounds { target: None }
             | Operator::DeleteSurrounds
-            | Operator::Exchange => true,
+            | Operator::Exchange
+            | Operator::HelixNext { .. }
+            | Operator::HelixPrevious { .. } => true,
             Operator::Yank
             | Operator::Object { .. }
             | Operator::FindForward { .. }
@@ -1118,7 +1136,8 @@ impl Operator {
             | Operator::Jump { .. }
             | Operator::Register
             | Operator::RecordRegister
-            | Operator::ReplayRegister => false,
+            | Operator::ReplayRegister
+            | Operator::HelixMatch => false,
         }
     }
 }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index f4f8de2e78..fdf18dfef9 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -86,6 +86,22 @@ struct PushFindBackward {
     multiline: bool,
 }
 
+#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
+#[action(namespace = vim)]
+#[serde(deny_unknown_fields)]
+/// Selects the next object.
+struct PushHelixNext {
+    around: bool,
+}
+
+#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
+#[action(namespace = vim)]
+#[serde(deny_unknown_fields)]
+/// Selects the previous object.
+struct PushHelixPrevious {
+    around: bool,
+}
+
 #[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
 #[action(namespace = vim)]
 #[serde(deny_unknown_fields)]
@@ -224,6 +240,8 @@ actions!(
         PushReplaceWithRegister,
         /// Toggles comments.
         PushToggleComments,
+        /// Starts a match operation.
+        PushHelixMatch,
     ]
 );
 
@@ -761,6 +779,27 @@ impl Vim {
             Vim::action(editor, cx, |vim, _: &Enter, window, cx| {
                 vim.input_ignored("\n".into(), window, cx)
             });
+            Vim::action(editor, cx, |vim, _: &PushHelixMatch, window, cx| {
+                vim.push_operator(Operator::HelixMatch, window, cx)
+            });
+            Vim::action(editor, cx, |vim, action: &PushHelixNext, window, cx| {
+                vim.push_operator(
+                    Operator::HelixNext {
+                        around: action.around,
+                    },
+                    window,
+                    cx,
+                );
+            });
+            Vim::action(editor, cx, |vim, action: &PushHelixPrevious, window, cx| {
+                vim.push_operator(
+                    Operator::HelixPrevious {
+                        around: action.around,
+                    },
+                    window,
+                    cx,
+                );
+            });
 
             normal::register(editor, cx);
             insert::register(editor, cx);
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 91ec021c44..efe2d031a6 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4382,6 +4382,8 @@ mod tests {
                     | "vim::PushJump"
                     | "vim::PushDigraph"
                     | "vim::PushLiteral"
+                    | "vim::PushHelixNext"
+                    | "vim::PushHelixPrevious"
                     | "vim::Number"
                     | "vim::SelectRegister"
                     | "git::StageAndNext"
diff --git a/docs/src/helix.md b/docs/src/helix.md
index ddf997d3f0..467a2fac7c 100644
--- a/docs/src/helix.md
+++ b/docs/src/helix.md
@@ -9,3 +9,7 @@ For a guide on Vim-related features that are also available in Helix mode, pleas
 To check the current status of Helix mode, or to request a missing Helix feature, checkout out the ["Are we Helix yet?" discussion](https://github.com/zed-industries/zed/discussions/33580).
 
 For a detailed list of Helix's default keybindings, please visit the [official Helix documentation](https://docs.helix-editor.com/keymap.html).
+
+## Core differences
+
+Any text object that works with `m i` or `m a` also works with `]` and `[`, so for example `] (` selects the next pair of parentheses after the cursor.

From fe2aa3f4cb07d836249aa57891e6c391191d4d36 Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 8 Sep 2025 10:09:54 -0500
Subject: [PATCH 681/823] onboarding: Fix font loading frame delay (#37668)

Closes #ISSUE

Fixed an issue where the first frame of the `Editing` page in onboarding
would have a slight delay before rendering the first time it was
navigated to. This was caused by listing the OS fonts on the main
thread, blocking rendering. This PR fixes the issue by adding a new
method to the font family cache to prefill the cache on a background
thread.

Release Notes:

- N/A *or* Added/Fixed/Improved ...

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Co-authored-by: Anthony <anthony@zed.dev>
---
 crates/onboarding/src/editing_page.rs   | 32 +++++++++----------
 crates/onboarding/src/onboarding.rs     | 25 +++++++++++----
 crates/settings/src/settings_ui_core.rs |  1 +
 crates/theme/src/font_family_cache.rs   | 42 ++++++++++++++++++++++++-
 4 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/crates/onboarding/src/editing_page.rs b/crates/onboarding/src/editing_page.rs
index 47dfd84894..297016abd4 100644
--- a/crates/onboarding/src/editing_page.rs
+++ b/crates/onboarding/src/editing_page.rs
@@ -449,28 +449,28 @@ impl FontPickerDelegate {
     ) -> Self {
         let font_family_cache = FontFamilyCache::global(cx);
 
-        let fonts: Vec<SharedString> = font_family_cache
-            .list_font_families(cx)
-            .into_iter()
-            .collect();
-
+        let fonts = font_family_cache
+            .try_list_font_families()
+            .unwrap_or_else(|| vec![current_font.clone()]);
         let selected_index = fonts
             .iter()
             .position(|font| *font == current_font)
             .unwrap_or(0);
 
+        let filtered_fonts = fonts
+            .iter()
+            .enumerate()
+            .map(|(index, font)| StringMatch {
+                candidate_id: index,
+                string: font.to_string(),
+                positions: Vec::new(),
+                score: 0.0,
+            })
+            .collect();
+
         Self {
-            fonts: fonts.clone(),
-            filtered_fonts: fonts
-                .iter()
-                .enumerate()
-                .map(|(index, font)| StringMatch {
-                    candidate_id: index,
-                    string: font.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect(),
+            fonts,
+            filtered_fonts,
             selected_index,
             current_font,
             on_font_changed: Arc::new(on_font_changed),
diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs
index 7f1bb81d4d..9dcf27c7cb 100644
--- a/crates/onboarding/src/onboarding.rs
+++ b/crates/onboarding/src/onboarding.rs
@@ -242,12 +242,25 @@ struct Onboarding {
 
 impl Onboarding {
     fn new(workspace: &Workspace, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self {
-            workspace: workspace.weak_handle(),
-            focus_handle: cx.focus_handle(),
-            selected_page: SelectedPage::Basics,
-            user_store: workspace.user_store().clone(),
-            _settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
+        let font_family_cache = theme::FontFamilyCache::global(cx);
+
+        cx.new(|cx| {
+            cx.spawn(async move |this, cx| {
+                font_family_cache.prefetch(cx).await;
+                this.update(cx, |_, cx| {
+                    cx.notify();
+                })
+            })
+            .detach();
+
+            Self {
+                workspace: workspace.weak_handle(),
+                focus_handle: cx.focus_handle(),
+                selected_page: SelectedPage::Basics,
+                user_store: workspace.user_store().clone(),
+                _settings_subscription: cx
+                    .observe_global::<SettingsStore>(move |_, cx| cx.notify()),
+            }
         })
     }
 
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index 896a8bc038..e056dfbd5a 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -78,6 +78,7 @@ impl SettingsValue<serde_json::Value> {
         let fs = <dyn Fs>::global(cx);
 
         let rx = settings_store.update_settings_file_at_path(fs.clone(), path.as_slice(), value);
+
         let path = path.clone();
         cx.background_spawn(async move {
             rx.await?
diff --git a/crates/theme/src/font_family_cache.rs b/crates/theme/src/font_family_cache.rs
index fecaf5b360..411cf9b4d4 100644
--- a/crates/theme/src/font_family_cache.rs
+++ b/crates/theme/src/font_family_cache.rs
@@ -16,7 +16,7 @@ struct FontFamilyCacheState {
 /// so we do it once and then use the cached values each render.
 #[derive(Default)]
 pub struct FontFamilyCache {
-    state: RwLock<FontFamilyCacheState>,
+    state: Arc<RwLock<FontFamilyCacheState>>,
 }
 
 #[derive(Default)]
@@ -52,4 +52,44 @@ impl FontFamilyCache {
 
         lock.font_families.clone()
     }
+
+    /// Returns the list of font families if they have been loaded
+    pub fn try_list_font_families(&self) -> Option<Vec<SharedString>> {
+        self.state
+            .try_read()
+            .filter(|state| state.loaded_at.is_some())
+            .map(|state| state.font_families.clone())
+    }
+
+    /// Prefetch all font names in the background
+    pub async fn prefetch(&self, cx: &gpui::AsyncApp) {
+        if self
+            .state
+            .try_read()
+            .is_none_or(|state| state.loaded_at.is_some())
+        {
+            return;
+        }
+
+        let Ok(text_system) = cx.update(|cx| App::text_system(cx).clone()) else {
+            return;
+        };
+
+        let state = self.state.clone();
+
+        cx.background_executor()
+            .spawn(async move {
+                // We take this lock in the background executor to ensure that synchronous calls to `list_font_families` are blocked while we are prefetching,
+                // while not blocking the main thread and risking deadlocks
+                let mut lock = state.write();
+                let all_font_names = text_system
+                    .all_font_names()
+                    .into_iter()
+                    .map(SharedString::from)
+                    .collect();
+                lock.font_families = all_font_names;
+                lock.loaded_at = Some(Instant::now());
+            })
+            .await;
+    }
 }

From 2325f14713d46b347423e90a79e63d425e503354 Mon Sep 17 00:00:00 2001
From: Dino <dinojoaocosta@gmail.com>
Date: Mon, 8 Sep 2025 16:14:24 +0100
Subject: [PATCH 682/823] diagnostics: Current file diagnostics view (#34430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These changes introduce a new command to the Diagnostics panel,
`diagnostics: deploy current file`, which allows the user to view the
diagnostics only for the currently opened file.

Here's a screen recording showing these changes in action 🔽

[diagnostics: deploy current
file](https://github.com/user-attachments/assets/b0e87eea-3b3a-4888-95f8-9e21aff8ea97)

Closes #4739

Release Notes:

- Added new `diagnostics: deploy current file` command to view
diagnostics for the currently open file

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/diagnostics/src/buffer_diagnostics.rs  | 982 ++++++++++++++++++
 crates/diagnostics/src/diagnostic_renderer.rs |  29 +-
 crates/diagnostics/src/diagnostics.rs         |  98 +-
 crates/diagnostics/src/diagnostics_tests.rs   | 434 ++++++++
 crates/diagnostics/src/toolbar_controls.rs    |  95 +-
 crates/editor/src/editor.rs                   |   2 +
 crates/project/src/lsp_store.rs               |  31 +-
 crates/project/src/project.rs                 |   7 +
 8 files changed, 1613 insertions(+), 65 deletions(-)
 create mode 100644 crates/diagnostics/src/buffer_diagnostics.rs

diff --git a/crates/diagnostics/src/buffer_diagnostics.rs b/crates/diagnostics/src/buffer_diagnostics.rs
new file mode 100644
index 0000000000..3a24516382
--- /dev/null
+++ b/crates/diagnostics/src/buffer_diagnostics.rs
@@ -0,0 +1,982 @@
+use crate::{
+    DIAGNOSTICS_UPDATE_DELAY, IncludeWarnings, ToggleWarnings, context_range_for_entry,
+    diagnostic_renderer::{DiagnosticBlock, DiagnosticRenderer},
+    toolbar_controls::DiagnosticsToolbarEditor,
+};
+use anyhow::Result;
+use collections::HashMap;
+use editor::{
+    Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
+    display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
+    multibuffer_context_lines,
+};
+use gpui::{
+    AnyElement, App, AppContext, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
+    Task, WeakEntity, Window, actions, div,
+};
+use language::{Buffer, DiagnosticEntry, Point};
+use project::{
+    DiagnosticSummary, Event, Project, ProjectItem, ProjectPath,
+    project_settings::{DiagnosticSeverity, ProjectSettings},
+};
+use settings::Settings;
+use std::{
+    any::{Any, TypeId},
+    cmp::Ordering,
+    sync::Arc,
+};
+use text::{Anchor, BufferSnapshot, OffsetRangeExt};
+use ui::{Button, ButtonStyle, Icon, IconName, Label, Tooltip, h_flex, prelude::*};
+use util::paths::PathExt;
+use workspace::{
+    ItemHandle, ItemNavHistory, ToolbarItemLocation, Workspace,
+    item::{BreadcrumbText, Item, ItemEvent, TabContentParams},
+};
+
+actions!(
+    diagnostics,
+    [
+        /// Opens the project diagnostics view for the currently focused file.
+        DeployCurrentFile,
+    ]
+);
+
+/// The `BufferDiagnosticsEditor` is meant to be used when dealing specifically
+/// with diagnostics for a single buffer, as only the excerpts of the buffer
+/// where diagnostics are available are displayed.
+pub(crate) struct BufferDiagnosticsEditor {
+    pub project: Entity<Project>,
+    focus_handle: FocusHandle,
+    editor: Entity<Editor>,
+    /// The current diagnostic entries in the `BufferDiagnosticsEditor`. Used to
+    /// allow quick comparison of updated diagnostics, to confirm if anything
+    /// has changed.
+    pub(crate) diagnostics: Vec<DiagnosticEntry<Anchor>>,
+    /// The blocks used to display the diagnostics' content in the editor, next
+    /// to the excerpts where the diagnostic originated.
+    blocks: Vec<CustomBlockId>,
+    /// Multibuffer to contain all excerpts that contain diagnostics, which are
+    /// to be rendered in the editor.
+    multibuffer: Entity<MultiBuffer>,
+    /// The buffer for which the editor is displaying diagnostics and excerpts
+    /// for.
+    buffer: Option<Entity<Buffer>>,
+    /// The path for which the editor is displaying diagnostics for.
+    project_path: ProjectPath,
+    /// Summary of the number of warnings and errors for the path. Used to
+    /// display the number of warnings and errors in the tab's content.
+    summary: DiagnosticSummary,
+    /// Whether to include warnings in the list of diagnostics shown in the
+    /// editor.
+    pub(crate) include_warnings: bool,
+    /// Keeps track of whether there's a background task already running to
+    /// update the excerpts, in order to avoid firing multiple tasks for this purpose.
+    pub(crate) update_excerpts_task: Option<Task<Result<()>>>,
+    /// The project's subscription, responsible for processing events related to
+    /// diagnostics.
+    _subscription: Subscription,
+}
+
+impl BufferDiagnosticsEditor {
+    /// Creates new instance of the `BufferDiagnosticsEditor` which can then be
+    /// displayed by adding it to a pane.
+    pub fn new(
+        project_path: ProjectPath,
+        project_handle: Entity<Project>,
+        buffer: Option<Entity<Buffer>>,
+        include_warnings: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        // Subscribe to project events related to diagnostics so the
+        // `BufferDiagnosticsEditor` can update its state accordingly.
+        let project_event_subscription = cx.subscribe_in(
+            &project_handle,
+            window,
+            |buffer_diagnostics_editor, _project, event, window, cx| match event {
+                Event::DiskBasedDiagnosticsStarted { .. } => {
+                    cx.notify();
+                }
+                Event::DiskBasedDiagnosticsFinished { .. } => {
+                    buffer_diagnostics_editor.update_all_excerpts(window, cx);
+                }
+                Event::DiagnosticsUpdated {
+                    paths,
+                    language_server_id,
+                } => {
+                    // When diagnostics have been updated, the
+                    // `BufferDiagnosticsEditor` should update its state only if
+                    // one of the paths matches its `project_path`, otherwise
+                    // the event should be ignored.
+                    if paths.contains(&buffer_diagnostics_editor.project_path) {
+                        buffer_diagnostics_editor.update_diagnostic_summary(cx);
+
+                        if buffer_diagnostics_editor.editor.focus_handle(cx).contains_focused(window, cx) || buffer_diagnostics_editor.focus_handle.contains_focused(window, cx) {
+                            log::debug!("diagnostics updated for server {language_server_id}. recording change");
+                        } else {
+                            log::debug!("diagnostics updated for server {language_server_id}. updating excerpts");
+                            buffer_diagnostics_editor.update_all_excerpts(window, cx);
+                        }
+                    }
+                }
+                _ => {}
+            },
+        );
+
+        let focus_handle = cx.focus_handle();
+
+        cx.on_focus_in(
+            &focus_handle,
+            window,
+            |buffer_diagnostics_editor, window, cx| buffer_diagnostics_editor.focus_in(window, cx),
+        )
+        .detach();
+
+        cx.on_focus_out(
+            &focus_handle,
+            window,
+            |buffer_diagnostics_editor, _event, window, cx| {
+                buffer_diagnostics_editor.focus_out(window, cx)
+            },
+        )
+        .detach();
+
+        let summary = project_handle
+            .read(cx)
+            .diagnostic_summary_for_path(&project_path, cx);
+
+        let multibuffer = cx.new(|cx| MultiBuffer::new(project_handle.read(cx).capability()));
+        let max_severity = Self::max_diagnostics_severity(include_warnings);
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::for_multibuffer(
+                multibuffer.clone(),
+                Some(project_handle.clone()),
+                window,
+                cx,
+            );
+            editor.set_vertical_scroll_margin(5, cx);
+            editor.disable_inline_diagnostics();
+            editor.set_max_diagnostics_severity(max_severity, cx);
+            editor.set_all_diagnostics_active(cx);
+            editor
+        });
+
+        // Subscribe to events triggered by the editor in order to correctly
+        // update the buffer's excerpts.
+        cx.subscribe_in(
+            &editor,
+            window,
+            |buffer_diagnostics_editor, _editor, event: &EditorEvent, window, cx| {
+                cx.emit(event.clone());
+
+                match event {
+                    // If the user tries to focus on the editor but there's actually
+                    // no excerpts for the buffer, focus back on the
+                    // `BufferDiagnosticsEditor` instance.
+                    EditorEvent::Focused => {
+                        if buffer_diagnostics_editor.multibuffer.read(cx).is_empty() {
+                            window.focus(&buffer_diagnostics_editor.focus_handle);
+                        }
+                    }
+                    EditorEvent::Blurred => {
+                        buffer_diagnostics_editor.update_all_excerpts(window, cx)
+                    }
+                    _ => {}
+                }
+            },
+        )
+        .detach();
+
+        let diagnostics = vec![];
+        let update_excerpts_task = None;
+        let mut buffer_diagnostics_editor = Self {
+            project: project_handle,
+            focus_handle,
+            editor,
+            diagnostics,
+            blocks: Default::default(),
+            multibuffer,
+            buffer,
+            project_path,
+            summary,
+            include_warnings,
+            update_excerpts_task,
+            _subscription: project_event_subscription,
+        };
+
+        buffer_diagnostics_editor.update_all_diagnostics(window, cx);
+        buffer_diagnostics_editor
+    }
+
+    fn deploy(
+        workspace: &mut Workspace,
+        _: &DeployCurrentFile,
+        window: &mut Window,
+        cx: &mut Context<Workspace>,
+    ) {
+        // Determine the currently opened path by finding the active editor and
+        // finding the project path for the buffer.
+        // If there's no active editor with a project path, avoiding deploying
+        // the buffer diagnostics view.
+        if let Some(editor) = workspace.active_item_as::<Editor>(cx)
+            && let Some(project_path) = editor.project_path(cx)
+        {
+            // Check if there's already a `BufferDiagnosticsEditor` tab for this
+            // same path, and if so, focus on that one instead of creating a new
+            // one.
+            let existing_editor = workspace
+                .items_of_type::<BufferDiagnosticsEditor>(cx)
+                .find(|editor| editor.read(cx).project_path == project_path);
+
+            if let Some(editor) = existing_editor {
+                workspace.activate_item(&editor, true, true, window, cx);
+            } else {
+                let include_warnings = match cx.try_global::<IncludeWarnings>() {
+                    Some(include_warnings) => include_warnings.0,
+                    None => ProjectSettings::get_global(cx).diagnostics.include_warnings,
+                };
+
+                let item = cx.new(|cx| {
+                    Self::new(
+                        project_path,
+                        workspace.project().clone(),
+                        editor.read(cx).buffer().read(cx).as_singleton(),
+                        include_warnings,
+                        window,
+                        cx,
+                    )
+                });
+
+                workspace.add_item_to_active_pane(Box::new(item), None, true, window, cx);
+            }
+        }
+    }
+
+    pub fn register(
+        workspace: &mut Workspace,
+        _window: Option<&mut Window>,
+        _: &mut Context<Workspace>,
+    ) {
+        workspace.register_action(Self::deploy);
+    }
+
+    fn update_all_diagnostics(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.update_all_excerpts(window, cx);
+    }
+
+    fn update_diagnostic_summary(&mut self, cx: &mut Context<Self>) {
+        let project = self.project.read(cx);
+
+        self.summary = project.diagnostic_summary_for_path(&self.project_path, cx);
+    }
+
+    /// Enqueue an update to the excerpts and diagnostic blocks being shown in
+    /// the editor.
+    pub(crate) fn update_all_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        // If there's already a task updating the excerpts, early return and let
+        // the other task finish.
+        if self.update_excerpts_task.is_some() {
+            return;
+        }
+
+        let buffer = self.buffer.clone();
+
+        self.update_excerpts_task = Some(cx.spawn_in(window, async move |editor, cx| {
+            cx.background_executor()
+                .timer(DIAGNOSTICS_UPDATE_DELAY)
+                .await;
+
+            if let Some(buffer) = buffer {
+                editor
+                    .update_in(cx, |editor, window, cx| {
+                        editor.update_excerpts(buffer, window, cx)
+                    })?
+                    .await?;
+            };
+
+            let _ = editor.update(cx, |editor, cx| {
+                editor.update_excerpts_task = None;
+                cx.notify();
+            });
+
+            Ok(())
+        }));
+    }
+
+    /// Updates the excerpts in the `BufferDiagnosticsEditor` for a single
+    /// buffer.
+    fn update_excerpts(
+        &mut self,
+        buffer: Entity<Buffer>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        let was_empty = self.multibuffer.read(cx).is_empty();
+        let multibuffer_context = multibuffer_context_lines(cx);
+        let buffer_snapshot = buffer.read(cx).snapshot();
+        let buffer_snapshot_max = buffer_snapshot.max_point();
+        let max_severity = Self::max_diagnostics_severity(self.include_warnings)
+            .into_lsp()
+            .unwrap_or(lsp::DiagnosticSeverity::WARNING);
+
+        cx.spawn_in(window, async move |buffer_diagnostics_editor, mut cx| {
+            // Fetch the diagnostics for the whole of the buffer
+            // (`Point::zero()..buffer_snapshot.max_point()`) so we can confirm
+            // if the diagnostics changed, if it didn't, early return as there's
+            // nothing to update.
+            let diagnostics = buffer_snapshot
+                .diagnostics_in_range::<_, Anchor>(Point::zero()..buffer_snapshot_max, false)
+                .collect::<Vec<_>>();
+
+            let unchanged =
+                buffer_diagnostics_editor.update(cx, |buffer_diagnostics_editor, _cx| {
+                    if buffer_diagnostics_editor
+                        .diagnostics_are_unchanged(&diagnostics, &buffer_snapshot)
+                    {
+                        return true;
+                    }
+
+                    buffer_diagnostics_editor.set_diagnostics(&diagnostics);
+                    return false;
+                })?;
+
+            if unchanged {
+                return Ok(());
+            }
+
+            // Mapping between the Group ID and a vector of DiagnosticEntry.
+            let mut grouped: HashMap<usize, Vec<_>> = HashMap::default();
+            for entry in diagnostics {
+                grouped
+                    .entry(entry.diagnostic.group_id)
+                    .or_default()
+                    .push(DiagnosticEntry {
+                        range: entry.range.to_point(&buffer_snapshot),
+                        diagnostic: entry.diagnostic,
+                    })
+            }
+
+            let mut blocks: Vec<DiagnosticBlock> = Vec::new();
+            for (_, group) in grouped {
+                // If the minimum severity of the group is higher than the
+                // maximum severity, or it doesn't even have severity, skip this
+                // group.
+                if group
+                    .iter()
+                    .map(|d| d.diagnostic.severity)
+                    .min()
+                    .is_none_or(|severity| severity > max_severity)
+                {
+                    continue;
+                }
+
+                let diagnostic_blocks = cx.update(|_window, cx| {
+                    DiagnosticRenderer::diagnostic_blocks_for_group(
+                        group,
+                        buffer_snapshot.remote_id(),
+                        Some(Arc::new(buffer_diagnostics_editor.clone())),
+                        cx,
+                    )
+                })?;
+
+                // For each of the diagnostic blocks to be displayed in the
+                // editor, figure out its index in the list of blocks.
+                //
+                // The following rules are used to determine the order:
+                // 1. Blocks with a lower start position should come first.
+                // 2. If two blocks have the same start position, the one with
+                // the higher end position should come first.
+                for diagnostic_block in diagnostic_blocks {
+                    let index = blocks.partition_point(|probe| {
+                        match probe
+                            .initial_range
+                            .start
+                            .cmp(&diagnostic_block.initial_range.start)
+                        {
+                            Ordering::Less => true,
+                            Ordering::Greater => false,
+                            Ordering::Equal => {
+                                probe.initial_range.end > diagnostic_block.initial_range.end
+                            }
+                        }
+                    });
+
+                    blocks.insert(index, diagnostic_block);
+                }
+            }
+
+            // Build the excerpt ranges for this specific buffer's diagnostics,
+            // so those excerpts can later be used to update the excerpts shown
+            // in the editor.
+            // This is done by iterating over the list of diagnostic blocks and
+            // determine what range does the diagnostic block span.
+            let mut excerpt_ranges: Vec<ExcerptRange<Point>> = Vec::new();
+
+            for diagnostic_block in blocks.iter() {
+                let excerpt_range = context_range_for_entry(
+                    diagnostic_block.initial_range.clone(),
+                    multibuffer_context,
+                    buffer_snapshot.clone(),
+                    &mut cx,
+                )
+                .await;
+
+                let index = excerpt_ranges
+                    .binary_search_by(|probe| {
+                        probe
+                            .context
+                            .start
+                            .cmp(&excerpt_range.start)
+                            .then(probe.context.end.cmp(&excerpt_range.end))
+                            .then(
+                                probe
+                                    .primary
+                                    .start
+                                    .cmp(&diagnostic_block.initial_range.start),
+                            )
+                            .then(probe.primary.end.cmp(&diagnostic_block.initial_range.end))
+                            .then(Ordering::Greater)
+                    })
+                    .unwrap_or_else(|index| index);
+
+                excerpt_ranges.insert(
+                    index,
+                    ExcerptRange {
+                        context: excerpt_range,
+                        primary: diagnostic_block.initial_range.clone(),
+                    },
+                )
+            }
+
+            // Finally, update the editor's content with the new excerpt ranges
+            // for this editor, as well as the diagnostic blocks.
+            buffer_diagnostics_editor.update_in(cx, |buffer_diagnostics_editor, window, cx| {
+                // Remove the list of `CustomBlockId` from the editor's display
+                // map, ensuring that if any diagnostics have been solved, the
+                // associated block stops being shown.
+                let block_ids = buffer_diagnostics_editor.blocks.clone();
+
+                buffer_diagnostics_editor.editor.update(cx, |editor, cx| {
+                    editor.display_map.update(cx, |display_map, cx| {
+                        display_map.remove_blocks(block_ids.into_iter().collect(), cx);
+                    })
+                });
+
+                let (anchor_ranges, _) =
+                    buffer_diagnostics_editor
+                        .multibuffer
+                        .update(cx, |multibuffer, cx| {
+                            multibuffer.set_excerpt_ranges_for_path(
+                                PathKey::for_buffer(&buffer, cx),
+                                buffer.clone(),
+                                &buffer_snapshot,
+                                excerpt_ranges,
+                                cx,
+                            )
+                        });
+
+                if was_empty {
+                    if let Some(anchor_range) = anchor_ranges.first() {
+                        let range_to_select = anchor_range.start..anchor_range.start;
+
+                        buffer_diagnostics_editor.editor.update(cx, |editor, cx| {
+                            editor.change_selections(Default::default(), window, cx, |selection| {
+                                selection.select_anchor_ranges([range_to_select])
+                            })
+                        });
+
+                        // If the `BufferDiagnosticsEditor` is currently
+                        // focused, move focus to its editor.
+                        if buffer_diagnostics_editor.focus_handle.is_focused(window) {
+                            buffer_diagnostics_editor
+                                .editor
+                                .read(cx)
+                                .focus_handle(cx)
+                                .focus(window);
+                        }
+                    }
+                }
+
+                // Cloning the blocks before moving ownership so these can later
+                // be used to set the block contents for testing purposes.
+                #[cfg(test)]
+                let cloned_blocks = blocks.clone();
+
+                // Build new diagnostic blocks to be added to the editor's
+                // display map for the new diagnostics. Update the `blocks`
+                // property before finishing, to ensure the blocks are removed
+                // on the next execution.
+                let editor_blocks =
+                    anchor_ranges
+                        .into_iter()
+                        .zip(blocks.into_iter())
+                        .map(|(anchor, block)| {
+                            let editor = buffer_diagnostics_editor.editor.downgrade();
+
+                            BlockProperties {
+                                placement: BlockPlacement::Near(anchor.start),
+                                height: Some(1),
+                                style: BlockStyle::Flex,
+                                render: Arc::new(move |block_context| {
+                                    block.render_block(editor.clone(), block_context)
+                                }),
+                                priority: 1,
+                            }
+                        });
+
+                let block_ids = buffer_diagnostics_editor.editor.update(cx, |editor, cx| {
+                    editor.display_map.update(cx, |display_map, cx| {
+                        display_map.insert_blocks(editor_blocks, cx)
+                    })
+                });
+
+                // In order to be able to verify which diagnostic blocks are
+                // rendered in the editor, the `set_block_content_for_tests`
+                // function must be used, so that the
+                // `editor::test::editor_content_with_blocks` function can then
+                // be called to fetch these blocks.
+                #[cfg(test)]
+                {
+                    for (block_id, block) in block_ids.iter().zip(cloned_blocks.iter()) {
+                        let markdown = block.markdown.clone();
+                        editor::test::set_block_content_for_tests(
+                            &buffer_diagnostics_editor.editor,
+                            *block_id,
+                            cx,
+                            move |cx| {
+                                markdown::MarkdownElement::rendered_text(
+                                    markdown.clone(),
+                                    cx,
+                                    editor::hover_popover::diagnostics_markdown_style,
+                                )
+                            },
+                        );
+                    }
+                }
+
+                buffer_diagnostics_editor.blocks = block_ids;
+                cx.notify()
+            })
+        })
+    }
+
+    fn set_diagnostics(&mut self, diagnostics: &Vec<DiagnosticEntry<Anchor>>) {
+        self.diagnostics = diagnostics.clone();
+    }
+
+    fn diagnostics_are_unchanged(
+        &self,
+        diagnostics: &Vec<DiagnosticEntry<Anchor>>,
+        snapshot: &BufferSnapshot,
+    ) -> bool {
+        if self.diagnostics.len() != diagnostics.len() {
+            return false;
+        }
+
+        self.diagnostics
+            .iter()
+            .zip(diagnostics.iter())
+            .all(|(existing, new)| {
+                existing.diagnostic.message == new.diagnostic.message
+                    && existing.diagnostic.severity == new.diagnostic.severity
+                    && existing.diagnostic.is_primary == new.diagnostic.is_primary
+                    && existing.range.to_offset(snapshot) == new.range.to_offset(snapshot)
+            })
+    }
+
+    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        // If the `BufferDiagnosticsEditor` is focused and the multibuffer is
+        // not empty, focus on the editor instead, which will allow the user to
+        // start interacting and editing the buffer's contents.
+        if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
+            self.editor.focus_handle(cx).focus(window)
+        }
+    }
+
+    fn focus_out(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if !self.focus_handle.is_focused(window) && !self.editor.focus_handle(cx).is_focused(window)
+        {
+            self.update_all_excerpts(window, cx);
+        }
+    }
+
+    pub fn toggle_warnings(
+        &mut self,
+        _: &ToggleWarnings,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let include_warnings = !self.include_warnings;
+        let max_severity = Self::max_diagnostics_severity(include_warnings);
+
+        self.editor.update(cx, |editor, cx| {
+            editor.set_max_diagnostics_severity(max_severity, cx);
+        });
+
+        self.include_warnings = include_warnings;
+        self.diagnostics.clear();
+        self.update_all_diagnostics(window, cx);
+    }
+
+    fn max_diagnostics_severity(include_warnings: bool) -> DiagnosticSeverity {
+        match include_warnings {
+            true => DiagnosticSeverity::Warning,
+            false => DiagnosticSeverity::Error,
+        }
+    }
+
+    #[cfg(test)]
+    pub fn editor(&self) -> &Entity<Editor> {
+        &self.editor
+    }
+
+    #[cfg(test)]
+    pub fn summary(&self) -> &DiagnosticSummary {
+        &self.summary
+    }
+}
+
+impl Focusable for BufferDiagnosticsEditor {
+    fn focus_handle(&self, _: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl EventEmitter<EditorEvent> for BufferDiagnosticsEditor {}
+
+impl Item for BufferDiagnosticsEditor {
+    type Event = EditorEvent;
+
+    fn act_as_type<'a>(
+        &'a self,
+        type_id: std::any::TypeId,
+        self_handle: &'a Entity<Self>,
+        _: &'a App,
+    ) -> Option<gpui::AnyView> {
+        if type_id == TypeId::of::<Self>() {
+            Some(self_handle.to_any())
+        } else if type_id == TypeId::of::<Editor>() {
+            Some(self.editor.to_any())
+        } else {
+            None
+        }
+    }
+
+    fn added_to_workspace(
+        &mut self,
+        workspace: &mut Workspace,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.editor.update(cx, |editor, cx| {
+            editor.added_to_workspace(workspace, window, cx)
+        });
+    }
+
+    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
+        ToolbarItemLocation::PrimaryLeft
+    }
+
+    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
+        self.editor.breadcrumbs(theme, cx)
+    }
+
+    fn can_save(&self, _cx: &App) -> bool {
+        true
+    }
+
+    fn clone_on_split(
+        &self,
+        _workspace_id: Option<workspace::WorkspaceId>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<Entity<Self>>
+    where
+        Self: Sized,
+    {
+        Some(cx.new(|cx| {
+            BufferDiagnosticsEditor::new(
+                self.project_path.clone(),
+                self.project.clone(),
+                self.buffer.clone(),
+                self.include_warnings,
+                window,
+                cx,
+            )
+        }))
+    }
+
+    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.editor
+            .update(cx, |editor, cx| editor.deactivated(window, cx));
+    }
+
+    fn for_each_project_item(&self, cx: &App, f: &mut dyn FnMut(EntityId, &dyn ProjectItem)) {
+        self.editor.for_each_project_item(cx, f);
+    }
+
+    fn has_conflict(&self, cx: &App) -> bool {
+        self.multibuffer.read(cx).has_conflict(cx)
+    }
+
+    fn has_deleted_file(&self, cx: &App) -> bool {
+        self.multibuffer.read(cx).has_deleted_file(cx)
+    }
+
+    fn is_dirty(&self, cx: &App) -> bool {
+        self.multibuffer.read(cx).is_dirty(cx)
+    }
+
+    fn is_singleton(&self, _cx: &App) -> bool {
+        false
+    }
+
+    fn navigate(
+        &mut self,
+        data: Box<dyn Any>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        self.editor
+            .update(cx, |editor, cx| editor.navigate(data, window, cx))
+    }
+
+    fn reload(
+        &mut self,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.editor.reload(project, window, cx)
+    }
+
+    fn save(
+        &mut self,
+        options: workspace::item::SaveOptions,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.editor.save(options, project, window, cx)
+    }
+
+    fn save_as(
+        &mut self,
+        _project: Entity<Project>,
+        _path: ProjectPath,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        unreachable!()
+    }
+
+    fn set_nav_history(
+        &mut self,
+        nav_history: ItemNavHistory,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.editor.update(cx, |editor, _| {
+            editor.set_nav_history(Some(nav_history));
+        })
+    }
+
+    // Builds the content to be displayed in the tab.
+    fn tab_content(&self, params: TabContentParams, _window: &Window, _cx: &App) -> AnyElement {
+        let error_count = self.summary.error_count;
+        let warning_count = self.summary.warning_count;
+        let label = Label::new(
+            self.project_path
+                .path
+                .file_name()
+                .map(|f| f.to_sanitized_string())
+                .unwrap_or_else(|| self.project_path.path.to_sanitized_string()),
+        );
+
+        h_flex()
+            .gap_1()
+            .child(label)
+            .when(error_count == 0 && warning_count == 0, |parent| {
+                parent.child(
+                    h_flex()
+                        .gap_1()
+                        .child(Icon::new(IconName::Check).color(Color::Success)),
+                )
+            })
+            .when(error_count > 0, |parent| {
+                parent.child(
+                    h_flex()
+                        .gap_1()
+                        .child(Icon::new(IconName::XCircle).color(Color::Error))
+                        .child(Label::new(error_count.to_string()).color(params.text_color())),
+                )
+            })
+            .when(warning_count > 0, |parent| {
+                parent.child(
+                    h_flex()
+                        .gap_1()
+                        .child(Icon::new(IconName::Warning).color(Color::Warning))
+                        .child(Label::new(warning_count.to_string()).color(params.text_color())),
+                )
+            })
+            .into_any_element()
+    }
+
+    fn tab_content_text(&self, _detail: usize, _app: &App) -> SharedString {
+        "Buffer Diagnostics".into()
+    }
+
+    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
+        Some(
+            format!(
+                "Buffer Diagnostics - {}",
+                self.project_path.path.to_sanitized_string()
+            )
+            .into(),
+        )
+    }
+
+    fn telemetry_event_text(&self) -> Option<&'static str> {
+        Some("Buffer Diagnostics Opened")
+    }
+
+    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
+        Editor::to_item_events(event, f)
+    }
+}
+
+impl Render for BufferDiagnosticsEditor {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let filename = self.project_path.path.to_sanitized_string();
+        let error_count = self.summary.error_count;
+        let warning_count = match self.include_warnings {
+            true => self.summary.warning_count,
+            false => 0,
+        };
+
+        let child = if error_count + warning_count == 0 {
+            let label = match warning_count {
+                0 => "No problems in",
+                _ => "No errors in",
+            };
+
+            v_flex()
+                .key_context("EmptyPane")
+                .size_full()
+                .gap_1()
+                .justify_center()
+                .items_center()
+                .text_center()
+                .bg(cx.theme().colors().editor_background)
+                .child(
+                    div()
+                        .h_flex()
+                        .child(Label::new(label).color(Color::Muted))
+                        .child(
+                            Button::new("open-file", filename)
+                                .style(ButtonStyle::Transparent)
+                                .tooltip(Tooltip::text("Open File"))
+                                .on_click(cx.listener(|buffer_diagnostics, _, window, cx| {
+                                    if let Some(workspace) = window.root::<Workspace>().flatten() {
+                                        workspace.update(cx, |workspace, cx| {
+                                            workspace
+                                                .open_path(
+                                                    buffer_diagnostics.project_path.clone(),
+                                                    None,
+                                                    true,
+                                                    window,
+                                                    cx,
+                                                )
+                                                .detach_and_log_err(cx);
+                                        })
+                                    }
+                                })),
+                        ),
+                )
+                .when(self.summary.warning_count > 0, |div| {
+                    let label = match self.summary.warning_count {
+                        1 => "Show 1 warning".into(),
+                        warning_count => format!("Show {} warnings", warning_count),
+                    };
+
+                    div.child(
+                        Button::new("diagnostics-show-warning-label", label).on_click(cx.listener(
+                            |buffer_diagnostics_editor, _, window, cx| {
+                                buffer_diagnostics_editor.toggle_warnings(
+                                    &Default::default(),
+                                    window,
+                                    cx,
+                                );
+                                cx.notify();
+                            },
+                        )),
+                    )
+                })
+        } else {
+            div().size_full().child(self.editor.clone())
+        };
+
+        div()
+            .key_context("Diagnostics")
+            .track_focus(&self.focus_handle(cx))
+            .size_full()
+            .child(child)
+    }
+}
+
+impl DiagnosticsToolbarEditor for WeakEntity<BufferDiagnosticsEditor> {
+    fn include_warnings(&self, cx: &App) -> bool {
+        self.read_with(cx, |buffer_diagnostics_editor, _cx| {
+            buffer_diagnostics_editor.include_warnings
+        })
+        .unwrap_or(false)
+    }
+
+    fn has_stale_excerpts(&self, _cx: &App) -> bool {
+        false
+    }
+
+    fn is_updating(&self, cx: &App) -> bool {
+        self.read_with(cx, |buffer_diagnostics_editor, cx| {
+            buffer_diagnostics_editor.update_excerpts_task.is_some()
+                || buffer_diagnostics_editor
+                    .project
+                    .read(cx)
+                    .language_servers_running_disk_based_diagnostics(cx)
+                    .next()
+                    .is_some()
+        })
+        .unwrap_or(false)
+    }
+
+    fn stop_updating(&self, cx: &mut App) {
+        let _ = self.update(cx, |buffer_diagnostics_editor, cx| {
+            buffer_diagnostics_editor.update_excerpts_task = None;
+            cx.notify();
+        });
+    }
+
+    fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App) {
+        let _ = self.update(cx, |buffer_diagnostics_editor, cx| {
+            buffer_diagnostics_editor.update_all_excerpts(window, cx);
+        });
+    }
+
+    fn toggle_warnings(&self, window: &mut Window, cx: &mut App) {
+        let _ = self.update(cx, |buffer_diagnostics_editor, cx| {
+            buffer_diagnostics_editor.toggle_warnings(&Default::default(), window, cx);
+        });
+    }
+
+    fn get_diagnostics_for_buffer(
+        &self,
+        _buffer_id: text::BufferId,
+        cx: &App,
+    ) -> Vec<language::DiagnosticEntry<text::Anchor>> {
+        self.read_with(cx, |buffer_diagnostics_editor, _cx| {
+            buffer_diagnostics_editor.diagnostics.clone()
+        })
+        .unwrap_or_default()
+    }
+}
diff --git a/crates/diagnostics/src/diagnostic_renderer.rs b/crates/diagnostics/src/diagnostic_renderer.rs
index e9731f84ce..e22065afa5 100644
--- a/crates/diagnostics/src/diagnostic_renderer.rs
+++ b/crates/diagnostics/src/diagnostic_renderer.rs
@@ -18,7 +18,7 @@ use ui::{
 };
 use util::maybe;
 
-use crate::ProjectDiagnosticsEditor;
+use crate::toolbar_controls::DiagnosticsToolbarEditor;
 
 pub struct DiagnosticRenderer;
 
@@ -26,7 +26,7 @@ impl DiagnosticRenderer {
     pub fn diagnostic_blocks_for_group(
         diagnostic_group: Vec<DiagnosticEntry<Point>>,
         buffer_id: BufferId,
-        diagnostics_editor: Option<WeakEntity<ProjectDiagnosticsEditor>>,
+        diagnostics_editor: Option<Arc<dyn DiagnosticsToolbarEditor>>,
         cx: &mut App,
     ) -> Vec<DiagnosticBlock> {
         let Some(primary_ix) = diagnostic_group
@@ -130,6 +130,7 @@ impl editor::DiagnosticRenderer for DiagnosticRenderer {
         cx: &mut App,
     ) -> Vec<BlockProperties<Anchor>> {
         let blocks = Self::diagnostic_blocks_for_group(diagnostic_group, buffer_id, None, cx);
+
         blocks
             .into_iter()
             .map(|block| {
@@ -182,7 +183,7 @@ pub(crate) struct DiagnosticBlock {
     pub(crate) initial_range: Range<Point>,
     pub(crate) severity: DiagnosticSeverity,
     pub(crate) markdown: Entity<Markdown>,
-    pub(crate) diagnostics_editor: Option<WeakEntity<ProjectDiagnosticsEditor>>,
+    pub(crate) diagnostics_editor: Option<Arc<dyn DiagnosticsToolbarEditor>>,
 }
 
 impl DiagnosticBlock {
@@ -233,7 +234,7 @@ impl DiagnosticBlock {
 
     pub fn open_link(
         editor: &mut Editor,
-        diagnostics_editor: &Option<WeakEntity<ProjectDiagnosticsEditor>>,
+        diagnostics_editor: &Option<Arc<dyn DiagnosticsToolbarEditor>>,
         link: SharedString,
         window: &mut Window,
         cx: &mut Context<Editor>,
@@ -254,18 +255,10 @@ impl DiagnosticBlock {
 
         if let Some(diagnostics_editor) = diagnostics_editor {
             if let Some(diagnostic) = diagnostics_editor
-                .read_with(cx, |diagnostics, _| {
-                    diagnostics
-                        .diagnostics
-                        .get(&buffer_id)
-                        .cloned()
-                        .unwrap_or_default()
-                        .into_iter()
-                        .filter(|d| d.diagnostic.group_id == group_id)
-                        .nth(ix)
-                })
-                .ok()
-                .flatten()
+                .get_diagnostics_for_buffer(buffer_id, cx)
+                .into_iter()
+                .filter(|d| d.diagnostic.group_id == group_id)
+                .nth(ix)
             {
                 let multibuffer = editor.buffer().read(cx);
                 let Some(snapshot) = multibuffer
@@ -297,9 +290,9 @@ impl DiagnosticBlock {
         };
     }
 
-    fn jump_to<T: ToOffset>(
+    fn jump_to<I: ToOffset>(
         editor: &mut Editor,
-        range: Range<T>,
+        range: Range<I>,
         window: &mut Window,
         cx: &mut Context<Editor>,
     ) {
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 20e8a86133..ef4d6ec439 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -1,12 +1,14 @@
 pub mod items;
 mod toolbar_controls;
 
+mod buffer_diagnostics;
 mod diagnostic_renderer;
 
 #[cfg(test)]
 mod diagnostics_tests;
 
 use anyhow::Result;
+use buffer_diagnostics::BufferDiagnosticsEditor;
 use collections::{BTreeSet, HashMap};
 use diagnostic_renderer::DiagnosticBlock;
 use editor::{
@@ -36,6 +38,7 @@ use std::{
 };
 use text::{BufferId, OffsetRangeExt};
 use theme::ActiveTheme;
+use toolbar_controls::DiagnosticsToolbarEditor;
 pub use toolbar_controls::ToolbarControls;
 use ui::{Icon, IconName, Label, h_flex, prelude::*};
 use util::ResultExt;
@@ -64,6 +67,7 @@ impl Global for IncludeWarnings {}
 pub fn init(cx: &mut App) {
     editor::set_diagnostic_renderer(diagnostic_renderer::DiagnosticRenderer {}, cx);
     cx.observe_new(ProjectDiagnosticsEditor::register).detach();
+    cx.observe_new(BufferDiagnosticsEditor::register).detach();
 }
 
 pub(crate) struct ProjectDiagnosticsEditor {
@@ -85,6 +89,7 @@ pub(crate) struct ProjectDiagnosticsEditor {
 impl EventEmitter<EditorEvent> for ProjectDiagnosticsEditor {}
 
 const DIAGNOSTICS_UPDATE_DELAY: Duration = Duration::from_millis(50);
+const DIAGNOSTICS_SUMMARY_UPDATE_DELAY: Duration = Duration::from_millis(30);
 
 impl Render for ProjectDiagnosticsEditor {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
@@ -144,7 +149,7 @@ impl Render for ProjectDiagnosticsEditor {
 }
 
 impl ProjectDiagnosticsEditor {
-    fn register(
+    pub fn register(
         workspace: &mut Workspace,
         _window: Option<&mut Window>,
         _: &mut Context<Workspace>,
@@ -160,7 +165,7 @@ impl ProjectDiagnosticsEditor {
         cx: &mut Context<Self>,
     ) -> Self {
         let project_event_subscription =
-            cx.subscribe_in(&project_handle, window, |this, project, event, window, cx| match event {
+            cx.subscribe_in(&project_handle, window, |this, _project, event, window, cx| match event {
                 project::Event::DiskBasedDiagnosticsStarted { .. } => {
                     cx.notify();
                 }
@@ -173,13 +178,12 @@ impl ProjectDiagnosticsEditor {
                     paths,
                 } => {
                     this.paths_to_update.extend(paths.clone());
-                    let project = project.clone();
                     this.diagnostic_summary_update = cx.spawn(async move |this, cx| {
                         cx.background_executor()
-                            .timer(Duration::from_millis(30))
+                            .timer(DIAGNOSTICS_SUMMARY_UPDATE_DELAY)
                             .await;
                         this.update(cx, |this, cx| {
-                            this.summary = project.read(cx).diagnostic_summary(false, cx);
+                            this.update_diagnostic_summary(cx);
                         })
                         .log_err();
                     });
@@ -326,6 +330,7 @@ impl ProjectDiagnosticsEditor {
             let is_active = workspace
                 .active_item(cx)
                 .is_some_and(|item| item.item_id() == existing.item_id());
+
             workspace.activate_item(&existing, true, !is_active, window, cx);
         } else {
             let workspace_handle = cx.entity().downgrade();
@@ -383,22 +388,25 @@ impl ProjectDiagnosticsEditor {
     /// currently have diagnostics or are currently present in this view.
     fn update_all_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         self.project.update(cx, |project, cx| {
-            let mut paths = project
+            let mut project_paths = project
                 .diagnostic_summaries(false, cx)
-                .map(|(path, _, _)| path)
+                .map(|(project_path, _, _)| project_path)
                 .collect::<BTreeSet<_>>();
+
             self.multibuffer.update(cx, |multibuffer, cx| {
                 for buffer in multibuffer.all_buffers() {
                     if let Some(file) = buffer.read(cx).file() {
-                        paths.insert(ProjectPath {
+                        project_paths.insert(ProjectPath {
                             path: file.path().clone(),
                             worktree_id: file.worktree_id(cx),
                         });
                     }
                 }
             });
-            self.paths_to_update = paths;
+
+            self.paths_to_update = project_paths;
         });
+
         self.update_stale_excerpts(window, cx);
     }
 
@@ -428,6 +436,7 @@ impl ProjectDiagnosticsEditor {
         let was_empty = self.multibuffer.read(cx).is_empty();
         let buffer_snapshot = buffer.read(cx).snapshot();
         let buffer_id = buffer_snapshot.remote_id();
+
         let max_severity = if self.include_warnings {
             lsp::DiagnosticSeverity::WARNING
         } else {
@@ -441,6 +450,7 @@ impl ProjectDiagnosticsEditor {
                     false,
                 )
                 .collect::<Vec<_>>();
+
             let unchanged = this.update(cx, |this, _| {
                 if this.diagnostics.get(&buffer_id).is_some_and(|existing| {
                     this.diagnostics_are_unchanged(existing, &diagnostics, &buffer_snapshot)
@@ -475,7 +485,7 @@ impl ProjectDiagnosticsEditor {
                     crate::diagnostic_renderer::DiagnosticRenderer::diagnostic_blocks_for_group(
                         group,
                         buffer_snapshot.remote_id(),
-                        Some(this.clone()),
+                        Some(Arc::new(this.clone())),
                         cx,
                     )
                 })?;
@@ -505,6 +515,7 @@ impl ProjectDiagnosticsEditor {
                     cx,
                 )
                 .await;
+
                 let i = excerpt_ranges
                     .binary_search_by(|probe| {
                         probe
@@ -574,6 +585,7 @@ impl ProjectDiagnosticsEditor {
                                 priority: 1,
                             }
                         });
+
                 let block_ids = this.editor.update(cx, |editor, cx| {
                     editor.display_map.update(cx, |display_map, cx| {
                         display_map.insert_blocks(editor_blocks, cx)
@@ -604,6 +616,10 @@ impl ProjectDiagnosticsEditor {
             })
         })
     }
+
+    fn update_diagnostic_summary(&mut self, cx: &mut Context<Self>) {
+        self.summary = self.project.read(cx).diagnostic_summary(false, cx);
+    }
 }
 
 impl Focusable for ProjectDiagnosticsEditor {
@@ -812,6 +828,68 @@ impl Item for ProjectDiagnosticsEditor {
     }
 }
 
+impl DiagnosticsToolbarEditor for WeakEntity<ProjectDiagnosticsEditor> {
+    fn include_warnings(&self, cx: &App) -> bool {
+        self.read_with(cx, |project_diagnostics_editor, _cx| {
+            project_diagnostics_editor.include_warnings
+        })
+        .unwrap_or(false)
+    }
+
+    fn has_stale_excerpts(&self, cx: &App) -> bool {
+        self.read_with(cx, |project_diagnostics_editor, _cx| {
+            !project_diagnostics_editor.paths_to_update.is_empty()
+        })
+        .unwrap_or(false)
+    }
+
+    fn is_updating(&self, cx: &App) -> bool {
+        self.read_with(cx, |project_diagnostics_editor, cx| {
+            project_diagnostics_editor.update_excerpts_task.is_some()
+                || project_diagnostics_editor
+                    .project
+                    .read(cx)
+                    .language_servers_running_disk_based_diagnostics(cx)
+                    .next()
+                    .is_some()
+        })
+        .unwrap_or(false)
+    }
+
+    fn stop_updating(&self, cx: &mut App) {
+        let _ = self.update(cx, |project_diagnostics_editor, cx| {
+            project_diagnostics_editor.update_excerpts_task = None;
+            cx.notify();
+        });
+    }
+
+    fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App) {
+        let _ = self.update(cx, |project_diagnostics_editor, cx| {
+            project_diagnostics_editor.update_all_excerpts(window, cx);
+        });
+    }
+
+    fn toggle_warnings(&self, window: &mut Window, cx: &mut App) {
+        let _ = self.update(cx, |project_diagnostics_editor, cx| {
+            project_diagnostics_editor.toggle_warnings(&Default::default(), window, cx);
+        });
+    }
+
+    fn get_diagnostics_for_buffer(
+        &self,
+        buffer_id: text::BufferId,
+        cx: &App,
+    ) -> Vec<language::DiagnosticEntry<text::Anchor>> {
+        self.read_with(cx, |project_diagnostics_editor, _cx| {
+            project_diagnostics_editor
+                .diagnostics
+                .get(&buffer_id)
+                .cloned()
+                .unwrap_or_default()
+        })
+        .unwrap_or_default()
+    }
+}
 const DIAGNOSTIC_EXPANSION_ROW_LIMIT: u32 = 32;
 
 async fn context_range_for_entry(
diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index 6a8baecdb3..a50e20f579 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -1567,6 +1567,440 @@ async fn go_to_diagnostic_with_severity(cx: &mut TestAppContext) {
     cx.assert_editor_state(indoc! {"error ˇwarning info hint"});
 }
 
+#[gpui::test]
+async fn test_buffer_diagnostics(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    // We'll be creating two different files, both with diagnostics, so we can
+    // later verify that, since the `BufferDiagnosticsEditor` only shows
+    // diagnostics for the provided path, the diagnostics for the other file
+    // will not be shown, contrary to what happens with
+    // `ProjectDiagnosticsEditor`.
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/test"),
+        json!({
+            "main.rs": "
+                fn main() {
+                    let x = vec![];
+                    let y = vec![];
+                    a(x);
+                    b(y);
+                    c(y);
+                    d(x);
+                }
+            "
+            .unindent(),
+            "other.rs": "
+                fn other() {
+                    let unused = 42;
+                    undefined_function();
+                }
+            "
+            .unindent(),
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+    let project_path = project::ProjectPath {
+        worktree_id: project.read_with(cx, |project, cx| {
+            project.worktrees(cx).next().unwrap().read(cx).id()
+        }),
+        path: Arc::from(Path::new("main.rs")),
+    };
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_buffer(project_path.clone(), cx)
+        })
+        .await
+        .ok();
+
+    // Create the diagnostics for `main.rs`.
+    let language_server_id = LanguageServerId(0);
+    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+
+    lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
+            uri: uri.clone(),
+            diagnostics: vec![
+                lsp::Diagnostic{
+                    range: lsp::Range::new(lsp::Position::new(5, 6), lsp::Position::new(5, 7)),
+                    severity: Some(lsp::DiagnosticSeverity::WARNING),
+                    message: "use of moved value\nvalue used here after move".to_string(),
+                    related_information: Some(vec![
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 9))),
+                            message: "move occurs because `y` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
+                        },
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(4, 6), lsp::Position::new(4, 7))),
+                            message: "value moved here".to_string()
+                        },
+                    ]),
+                    ..Default::default()
+                },
+                lsp::Diagnostic{
+                    range: lsp::Range::new(lsp::Position::new(6, 6), lsp::Position::new(6, 7)),
+                    severity: Some(lsp::DiagnosticSeverity::ERROR),
+                    message: "use of moved value\nvalue used here after move".to_string(),
+                    related_information: Some(vec![
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9))),
+                            message: "move occurs because `x` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
+                        },
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(3, 6), lsp::Position::new(3, 7))),
+                            message: "value moved here".to_string()
+                        },
+                    ]),
+                    ..Default::default()
+                }
+            ],
+            version: None
+        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
+
+        // Create diagnostics for other.rs to ensure that the file and
+        // diagnostics are not included in `BufferDiagnosticsEditor` when it is
+        // deployed for main.rs.
+        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
+            uri: lsp::Uri::from_file_path(path!("/test/other.rs")).unwrap(),
+            diagnostics: vec![
+                lsp::Diagnostic{
+                    range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 14)),
+                    severity: Some(lsp::DiagnosticSeverity::WARNING),
+                    message: "unused variable: `unused`".to_string(),
+                    ..Default::default()
+                },
+                lsp::Diagnostic{
+                    range: lsp::Range::new(lsp::Position::new(2, 4), lsp::Position::new(2, 22)),
+                    severity: Some(lsp::DiagnosticSeverity::ERROR),
+                    message: "cannot find function `undefined_function` in this scope".to_string(),
+                    ..Default::default()
+                }
+            ],
+            version: None
+        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
+    });
+
+    let buffer_diagnostics = window.build_entity(cx, |window, cx| {
+        BufferDiagnosticsEditor::new(
+            project_path.clone(),
+            project.clone(),
+            buffer,
+            true,
+            window,
+            cx,
+        )
+    });
+    let editor = buffer_diagnostics.update(cx, |buffer_diagnostics, _| {
+        buffer_diagnostics.editor().clone()
+    });
+
+    // Since the excerpt updates is handled by a background task, we need to
+    // wait a little bit to ensure that the buffer diagnostic's editor content
+    // is rendered.
+    cx.executor()
+        .advance_clock(DIAGNOSTICS_UPDATE_DELAY + Duration::from_millis(10));
+
+    pretty_assertions::assert_eq!(
+        editor_content_with_blocks(&editor, cx),
+        indoc::indoc! {
+            "§ main.rs
+             § -----
+             fn main() {
+                 let x = vec![];
+             § move occurs because `x` has type `Vec<char>`, which does not implement
+             § the `Copy` trait (back)
+                 let y = vec![];
+             § move occurs because `y` has type `Vec<char>`, which does not implement
+             § the `Copy` trait
+                 a(x); § value moved here
+                 b(y); § value moved here
+                 c(y);
+             § use of moved value
+             § value used here after move
+                 d(x);
+             § use of moved value
+             § value used here after move
+             § hint: move occurs because `x` has type `Vec<char>`, which does not
+             § implement the `Copy` trait
+             }"
+        }
+    );
+}
+
+#[gpui::test]
+async fn test_buffer_diagnostics_without_warnings(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/test"),
+        json!({
+            "main.rs": "
+                fn main() {
+                    let x = vec![];
+                    let y = vec![];
+                    a(x);
+                    b(y);
+                    c(y);
+                    d(x);
+                }
+            "
+            .unindent(),
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+    let project_path = project::ProjectPath {
+        worktree_id: project.read_with(cx, |project, cx| {
+            project.worktrees(cx).next().unwrap().read(cx).id()
+        }),
+        path: Arc::from(Path::new("main.rs")),
+    };
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_buffer(project_path.clone(), cx)
+        })
+        .await
+        .ok();
+
+    let language_server_id = LanguageServerId(0);
+    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+
+    lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
+            uri: uri.clone(),
+            diagnostics: vec![
+                lsp::Diagnostic{
+                    range: lsp::Range::new(lsp::Position::new(5, 6), lsp::Position::new(5, 7)),
+                    severity: Some(lsp::DiagnosticSeverity::WARNING),
+                    message: "use of moved value\nvalue used here after move".to_string(),
+                    related_information: Some(vec![
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 9))),
+                            message: "move occurs because `y` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
+                        },
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(4, 6), lsp::Position::new(4, 7))),
+                            message: "value moved here".to_string()
+                        },
+                    ]),
+                    ..Default::default()
+                },
+                lsp::Diagnostic{
+                    range: lsp::Range::new(lsp::Position::new(6, 6), lsp::Position::new(6, 7)),
+                    severity: Some(lsp::DiagnosticSeverity::ERROR),
+                    message: "use of moved value\nvalue used here after move".to_string(),
+                    related_information: Some(vec![
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9))),
+                            message: "move occurs because `x` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
+                        },
+                        lsp::DiagnosticRelatedInformation {
+                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(3, 6), lsp::Position::new(3, 7))),
+                            message: "value moved here".to_string()
+                        },
+                    ]),
+                    ..Default::default()
+                }
+            ],
+            version: None
+        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
+    });
+
+    let include_warnings = false;
+    let buffer_diagnostics = window.build_entity(cx, |window, cx| {
+        BufferDiagnosticsEditor::new(
+            project_path.clone(),
+            project.clone(),
+            buffer,
+            include_warnings,
+            window,
+            cx,
+        )
+    });
+
+    let editor = buffer_diagnostics.update(cx, |buffer_diagnostics, _cx| {
+        buffer_diagnostics.editor().clone()
+    });
+
+    // Since the excerpt updates is handled by a background task, we need to
+    // wait a little bit to ensure that the buffer diagnostic's editor content
+    // is rendered.
+    cx.executor()
+        .advance_clock(DIAGNOSTICS_UPDATE_DELAY + Duration::from_millis(10));
+
+    pretty_assertions::assert_eq!(
+        editor_content_with_blocks(&editor, cx),
+        indoc::indoc! {
+            "§ main.rs
+             § -----
+             fn main() {
+                 let x = vec![];
+             § move occurs because `x` has type `Vec<char>`, which does not implement
+             § the `Copy` trait (back)
+                 let y = vec![];
+                 a(x); § value moved here
+                 b(y);
+                 c(y);
+                 d(x);
+             § use of moved value
+             § value used here after move
+             § hint: move occurs because `x` has type `Vec<char>`, which does not
+             § implement the `Copy` trait
+             }"
+        }
+    );
+}
+
+#[gpui::test]
+async fn test_buffer_diagnostics_multiple_servers(cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        path!("/test"),
+        json!({
+            "main.rs": "
+                fn main() {
+                    let x = vec![];
+                    let y = vec![];
+                    a(x);
+                    b(y);
+                    c(y);
+                    d(x);
+                }
+            "
+            .unindent(),
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
+    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*window, cx);
+    let project_path = project::ProjectPath {
+        worktree_id: project.read_with(cx, |project, cx| {
+            project.worktrees(cx).next().unwrap().read(cx).id()
+        }),
+        path: Arc::from(Path::new("main.rs")),
+    };
+    let buffer = project
+        .update(cx, |project, cx| {
+            project.open_buffer(project_path.clone(), cx)
+        })
+        .await
+        .ok();
+
+    // Create the diagnostics for `main.rs`.
+    // Two warnings are being created, one for each language server, in order to
+    // assert that both warnings are rendered in the editor.
+    let language_server_id_a = LanguageServerId(0);
+    let language_server_id_b = LanguageServerId(1);
+    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
+    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
+
+    lsp_store.update(cx, |lsp_store, cx| {
+        lsp_store
+            .update_diagnostics(
+                language_server_id_a,
+                lsp::PublishDiagnosticsParams {
+                    uri: uri.clone(),
+                    diagnostics: vec![lsp::Diagnostic {
+                        range: lsp::Range::new(lsp::Position::new(5, 6), lsp::Position::new(5, 7)),
+                        severity: Some(lsp::DiagnosticSeverity::WARNING),
+                        message: "use of moved value\nvalue used here after move".to_string(),
+                        related_information: None,
+                        ..Default::default()
+                    }],
+                    version: None,
+                },
+                None,
+                DiagnosticSourceKind::Pushed,
+                &[],
+                cx,
+            )
+            .unwrap();
+
+        lsp_store
+            .update_diagnostics(
+                language_server_id_b,
+                lsp::PublishDiagnosticsParams {
+                    uri: uri.clone(),
+                    diagnostics: vec![lsp::Diagnostic {
+                        range: lsp::Range::new(lsp::Position::new(6, 6), lsp::Position::new(6, 7)),
+                        severity: Some(lsp::DiagnosticSeverity::WARNING),
+                        message: "use of moved value\nvalue used here after move".to_string(),
+                        related_information: None,
+                        ..Default::default()
+                    }],
+                    version: None,
+                },
+                None,
+                DiagnosticSourceKind::Pushed,
+                &[],
+                cx,
+            )
+            .unwrap();
+    });
+
+    let buffer_diagnostics = window.build_entity(cx, |window, cx| {
+        BufferDiagnosticsEditor::new(
+            project_path.clone(),
+            project.clone(),
+            buffer,
+            true,
+            window,
+            cx,
+        )
+    });
+    let editor = buffer_diagnostics.update(cx, |buffer_diagnostics, _| {
+        buffer_diagnostics.editor().clone()
+    });
+
+    // Since the excerpt updates is handled by a background task, we need to
+    // wait a little bit to ensure that the buffer diagnostic's editor content
+    // is rendered.
+    cx.executor()
+        .advance_clock(DIAGNOSTICS_UPDATE_DELAY + Duration::from_millis(10));
+
+    pretty_assertions::assert_eq!(
+        editor_content_with_blocks(&editor, cx),
+        indoc::indoc! {
+            "§ main.rs
+             § -----
+                 a(x);
+                 b(y);
+                 c(y);
+             § use of moved value
+             § value used here after move
+                 d(x);
+             § use of moved value
+             § value used here after move
+             }"
+        }
+    );
+
+    buffer_diagnostics.update(cx, |buffer_diagnostics, _cx| {
+        assert_eq!(
+            *buffer_diagnostics.summary(),
+            DiagnosticSummary {
+                warning_count: 2,
+                error_count: 0
+            }
+        );
+    })
+}
+
 fn init_test(cx: &mut TestAppContext) {
     cx.update(|cx| {
         zlog::init_test();
diff --git a/crates/diagnostics/src/toolbar_controls.rs b/crates/diagnostics/src/toolbar_controls.rs
index 404db39164..ac7bfb0f69 100644
--- a/crates/diagnostics/src/toolbar_controls.rs
+++ b/crates/diagnostics/src/toolbar_controls.rs
@@ -1,33 +1,56 @@
-use crate::{ProjectDiagnosticsEditor, ToggleDiagnosticsRefresh};
-use gpui::{Context, Entity, EventEmitter, ParentElement, Render, WeakEntity, Window};
+use crate::{BufferDiagnosticsEditor, ProjectDiagnosticsEditor, ToggleDiagnosticsRefresh};
+use gpui::{Context, EventEmitter, ParentElement, Render, Window};
+use language::DiagnosticEntry;
+use text::{Anchor, BufferId};
 use ui::prelude::*;
 use ui::{IconButton, IconButtonShape, IconName, Tooltip};
 use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, item::ItemHandle};
 
 pub struct ToolbarControls {
-    editor: Option<WeakEntity<ProjectDiagnosticsEditor>>,
+    editor: Option<Box<dyn DiagnosticsToolbarEditor>>,
+}
+
+pub(crate) trait DiagnosticsToolbarEditor: Send + Sync {
+    /// Informs the toolbar whether warnings are included in the diagnostics.
+    fn include_warnings(&self, cx: &App) -> bool;
+    /// Toggles whether warning diagnostics should be displayed by the
+    /// diagnostics editor.
+    fn toggle_warnings(&self, window: &mut Window, cx: &mut App);
+    /// Indicates whether any of the excerpts displayed by the diagnostics
+    /// editor are stale.
+    fn has_stale_excerpts(&self, cx: &App) -> bool;
+    /// Indicates whether the diagnostics editor is currently updating the
+    /// diagnostics.
+    fn is_updating(&self, cx: &App) -> bool;
+    /// Requests that the diagnostics editor stop updating the diagnostics.
+    fn stop_updating(&self, cx: &mut App);
+    /// Requests that the diagnostics editor updates the displayed diagnostics
+    /// with the latest information.
+    fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App);
+    /// Returns a list of diagnostics for the provided buffer id.
+    fn get_diagnostics_for_buffer(
+        &self,
+        buffer_id: BufferId,
+        cx: &App,
+    ) -> Vec<DiagnosticEntry<Anchor>>;
 }
 
 impl Render for ToolbarControls {
     fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut include_warnings = false;
         let mut has_stale_excerpts = false;
+        let mut include_warnings = false;
         let mut is_updating = false;
 
-        if let Some(editor) = self.diagnostics() {
-            let diagnostics = editor.read(cx);
-            include_warnings = diagnostics.include_warnings;
-            has_stale_excerpts = !diagnostics.paths_to_update.is_empty();
-            is_updating = diagnostics.update_excerpts_task.is_some()
-                || diagnostics
-                    .project
-                    .read(cx)
-                    .language_servers_running_disk_based_diagnostics(cx)
-                    .next()
-                    .is_some();
+        match &self.editor {
+            Some(editor) => {
+                include_warnings = editor.include_warnings(cx);
+                has_stale_excerpts = editor.has_stale_excerpts(cx);
+                is_updating = editor.is_updating(cx);
+            }
+            None => {}
         }
 
-        let tooltip = if include_warnings {
+        let warning_tooltip = if include_warnings {
             "Exclude Warnings"
         } else {
             "Include Warnings"
@@ -52,11 +75,12 @@ impl Render for ToolbarControls {
                                 &ToggleDiagnosticsRefresh,
                             ))
                             .on_click(cx.listener(move |toolbar_controls, _, _, cx| {
-                                if let Some(diagnostics) = toolbar_controls.diagnostics() {
-                                    diagnostics.update(cx, |diagnostics, cx| {
-                                        diagnostics.update_excerpts_task = None;
+                                match toolbar_controls.editor() {
+                                    Some(editor) => {
+                                        editor.stop_updating(cx);
                                         cx.notify();
-                                    });
+                                    }
+                                    None => {}
                                 }
                             })),
                     )
@@ -71,12 +95,11 @@ impl Render for ToolbarControls {
                                 &ToggleDiagnosticsRefresh,
                             ))
                             .on_click(cx.listener({
-                                move |toolbar_controls, _, window, cx| {
-                                    if let Some(diagnostics) = toolbar_controls.diagnostics() {
-                                        diagnostics.update(cx, move |diagnostics, cx| {
-                                            diagnostics.update_all_excerpts(window, cx);
-                                        });
-                                    }
+                                move |toolbar_controls, _, window, cx| match toolbar_controls
+                                    .editor()
+                                {
+                                    Some(editor) => editor.refresh_diagnostics(window, cx),
+                                    None => {}
                                 }
                             })),
                     )
@@ -86,13 +109,10 @@ impl Render for ToolbarControls {
                 IconButton::new("toggle-warnings", IconName::Warning)
                     .icon_color(warning_color)
                     .shape(IconButtonShape::Square)
-                    .tooltip(Tooltip::text(tooltip))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(editor) = this.diagnostics() {
-                            editor.update(cx, |editor, cx| {
-                                editor.toggle_warnings(&Default::default(), window, cx);
-                            });
-                        }
+                    .tooltip(Tooltip::text(warning_tooltip))
+                    .on_click(cx.listener(|this, _, window, cx| match &this.editor {
+                        Some(editor) => editor.toggle_warnings(window, cx),
+                        None => {}
                     })),
             )
     }
@@ -109,7 +129,10 @@ impl ToolbarItemView for ToolbarControls {
     ) -> ToolbarItemLocation {
         if let Some(pane_item) = active_pane_item.as_ref() {
             if let Some(editor) = pane_item.downcast::<ProjectDiagnosticsEditor>() {
-                self.editor = Some(editor.downgrade());
+                self.editor = Some(Box::new(editor.downgrade()));
+                ToolbarItemLocation::PrimaryRight
+            } else if let Some(editor) = pane_item.downcast::<BufferDiagnosticsEditor>() {
+                self.editor = Some(Box::new(editor.downgrade()));
                 ToolbarItemLocation::PrimaryRight
             } else {
                 ToolbarItemLocation::Hidden
@@ -131,7 +154,7 @@ impl ToolbarControls {
         ToolbarControls { editor: None }
     }
 
-    fn diagnostics(&self) -> Option<Entity<ProjectDiagnosticsEditor>> {
-        self.editor.as_ref()?.upgrade()
+    fn editor(&self) -> Option<&dyn DiagnosticsToolbarEditor> {
+        self.editor.as_deref()
     }
 }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2fc885e3fd..4580cd8a34 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -18998,6 +18998,8 @@ impl Editor {
         }
     }
 
+    /// Returns the project path for the editor's buffer, if any buffer is
+    /// opened in the editor.
     pub fn project_path(&self, cx: &App) -> Option<ProjectPath> {
         if let Some(buffer) = self.buffer.read(cx).as_singleton() {
             buffer.read(cx).project_path(cx)
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index a247c07c91..d17188bfbf 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -86,7 +86,6 @@ use node_runtime::read_package_installed_version;
 use parking_lot::Mutex;
 use postage::{mpsc, sink::Sink, stream::Stream, watch};
 use rand::prelude::*;
-
 use rpc::{
     AnyProtoClient,
     proto::{FromProto, LspRequestId, LspRequestMessage as _, ToProto},
@@ -7124,6 +7123,36 @@ impl LspStore {
         summary
     }
 
+    /// Returns the diagnostic summary for a specific project path.
+    pub fn diagnostic_summary_for_path(
+        &self,
+        project_path: &ProjectPath,
+        _: &App,
+    ) -> DiagnosticSummary {
+        if let Some(summaries) = self
+            .diagnostic_summaries
+            .get(&project_path.worktree_id)
+            .and_then(|map| map.get(&project_path.path))
+        {
+            let (error_count, warning_count) = summaries.iter().fold(
+                (0, 0),
+                |(error_count, warning_count), (_language_server_id, summary)| {
+                    (
+                        error_count + summary.error_count,
+                        warning_count + summary.warning_count,
+                    )
+                },
+            );
+
+            DiagnosticSummary {
+                error_count,
+                warning_count,
+            }
+        } else {
+            DiagnosticSummary::default()
+        }
+    }
+
     pub fn diagnostic_summaries<'a>(
         &'a self,
         include_ignored: bool,
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 04001e9e3b..6b85726aed 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -4400,6 +4400,13 @@ impl Project {
             .diagnostic_summary(include_ignored, cx)
     }
 
+    /// Returns a summary of the diagnostics for the provided project path only.
+    pub fn diagnostic_summary_for_path(&self, path: &ProjectPath, cx: &App) -> DiagnosticSummary {
+        self.lsp_store
+            .read(cx)
+            .diagnostic_summary_for_path(path, cx)
+    }
+
     pub fn diagnostic_summaries<'a>(
         &'a self,
         include_ignored: bool,

From 8d05bb090c9a02c813e342cb19add2eb7be0e088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iha=20Shin=20=28=EC=8B=A0=EC=9D=98=ED=95=98=29?=
 <me@xiniha.dev>
Date: Tue, 9 Sep 2025 01:04:37 +0900
Subject: [PATCH 683/823] Add injections for Isograph function calls in
 JavaScript and TypeScript (#36320)

Required for https://github.com/isographlabs/isograph/pull/568 to work
properly. Tested with a local build and made sure everything's working
great!

Release Notes:

- JavaScript/TypeScript/JSX: Added support for injecting Isograph language support into `iso`
function calls
---
 crates/languages/src/javascript/injections.scm | 6 ++++++
 crates/languages/src/tsx/injections.scm        | 6 ++++++
 crates/languages/src/typescript/injections.scm | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/crates/languages/src/javascript/injections.scm b/crates/languages/src/javascript/injections.scm
index dbec1937b1..987be660d3 100644
--- a/crates/languages/src/javascript/injections.scm
+++ b/crates/languages/src/javascript/injections.scm
@@ -73,3 +73,9 @@
   arguments: (arguments (template_string (string_fragment) @injection.content
                               (#set! injection.language "graphql")))
 )
+
+(call_expression
+  function: (identifier) @_name(#match? @_name "^iso$")
+  arguments: (arguments (template_string (string_fragment) @injection.content
+                              (#set! injection.language "isograph")))
+)
diff --git a/crates/languages/src/tsx/injections.scm b/crates/languages/src/tsx/injections.scm
index 9eec01cc89..f749aac43a 100644
--- a/crates/languages/src/tsx/injections.scm
+++ b/crates/languages/src/tsx/injections.scm
@@ -73,3 +73,9 @@
   arguments: (arguments (template_string (string_fragment) @injection.content
                               (#set! injection.language "graphql")))
 )
+
+(call_expression
+  function: (identifier) @_name(#match? @_name "^iso$")
+  arguments: (arguments (template_string (string_fragment) @injection.content
+                              (#set! injection.language "isograph")))
+)
diff --git a/crates/languages/src/typescript/injections.scm b/crates/languages/src/typescript/injections.scm
index 1ca1e9ad59..331f42fa91 100644
--- a/crates/languages/src/typescript/injections.scm
+++ b/crates/languages/src/typescript/injections.scm
@@ -78,6 +78,12 @@
                               (#set! injection.language "graphql")))
 )
 
+(call_expression
+  function: (identifier) @_name(#match? @_name "^iso$")
+  arguments: (arguments (template_string (string_fragment) @injection.content
+                              (#set! injection.language "isograph")))
+)
+
 ;; Angular Component template injection
 (call_expression
   function: [

From f07da9d9f2a24ee91aa14b9af15d282b26bae373 Mon Sep 17 00:00:00 2001
From: hong jihwan <124516776+flareseek@users.noreply.github.com>
Date: Tue, 9 Sep 2025 01:17:48 +0900
Subject: [PATCH 684/823] Correctly parse backslash character on replacement
 (#37014)

When a keybind contains a backslash character (\\), it is parsed
incorrectly, which results in an invalid keybind configuration.


This patch fixes the issue by ensuring that backslashes are properly
escaped during the parsing process. This allows them to be used as
intended in keybind definitions.

Release Notes:

- Fixed an issue where keybinds containing a backslash character (\\)
failed to be replaced correctly


## Screenshots
<img width="912" height="530" alt="SCR-20250828-borp"
src="https://github.com/user-attachments/assets/561a040f-575b-4222-ac75-17ab4fa71d07"
/>
<img width="912" height="530" alt="SCR-20250828-bosx"
src="https://github.com/user-attachments/assets/b8e0fb99-549e-4fc9-8609-9b9aa2004656"
/>
---
 crates/settings/src/keymap_file.rs   | 122 +++++++++++++++++++++++++++
 crates/settings/src/settings_json.rs |  10 ++-
 2 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index 91fcca8d5c..5dddff28d8 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -1100,6 +1100,24 @@ mod tests {
             .unindent(),
         );
 
+        check_keymap_update(
+            "[]",
+            KeybindUpdateOperation::add(KeybindUpdateTarget {
+                keystrokes: &parse_keystrokes("\\ a"),
+                action_name: "zed::SomeAction",
+                context: None,
+                action_arguments: None,
+            }),
+            r#"[
+                {
+                    "bindings": {
+                        "\\ a": "zed::SomeAction"
+                    }
+                }
+            ]"#
+            .unindent(),
+        );
+
         check_keymap_update(
             "[]",
             KeybindUpdateOperation::add(KeybindUpdateTarget {
@@ -1302,6 +1320,79 @@ mod tests {
             .unindent(),
         );
 
+        check_keymap_update(
+            r#"[
+                {
+                    "bindings": {
+                        "\\ a": "zed::SomeAction"
+                    }
+                }
+            ]"#
+            .unindent(),
+            KeybindUpdateOperation::Replace {
+                target: KeybindUpdateTarget {
+                    keystrokes: &parse_keystrokes("\\ a"),
+                    action_name: "zed::SomeAction",
+                    context: None,
+                    action_arguments: None,
+                },
+                source: KeybindUpdateTarget {
+                    keystrokes: &parse_keystrokes("\\ b"),
+                    action_name: "zed::SomeOtherAction",
+                    context: None,
+                    action_arguments: Some(r#"{"foo": "bar"}"#),
+                },
+                target_keybind_source: KeybindSource::User,
+            },
+            r#"[
+                {
+                    "bindings": {
+                        "\\ b": [
+                            "zed::SomeOtherAction",
+                            {
+                                "foo": "bar"
+                            }
+                        ]
+                    }
+                }
+            ]"#
+            .unindent(),
+        );
+
+        check_keymap_update(
+            r#"[
+                {
+                    "bindings": {
+                        "\\ a": "zed::SomeAction"
+                    }
+                }
+            ]"#
+            .unindent(),
+            KeybindUpdateOperation::Replace {
+                target: KeybindUpdateTarget {
+                    keystrokes: &parse_keystrokes("\\ a"),
+                    action_name: "zed::SomeAction",
+                    context: None,
+                    action_arguments: None,
+                },
+                source: KeybindUpdateTarget {
+                    keystrokes: &parse_keystrokes("\\ a"),
+                    action_name: "zed::SomeAction",
+                    context: None,
+                    action_arguments: None,
+                },
+                target_keybind_source: KeybindSource::User,
+            },
+            r#"[
+                {
+                    "bindings": {
+                        "\\ a": "zed::SomeAction"
+                    }
+                }
+            ]"#
+            .unindent(),
+        );
+
         check_keymap_update(
             r#"[
                 {
@@ -1494,6 +1585,37 @@ mod tests {
             .unindent(),
         );
 
+        check_keymap_update(
+            r#"[
+                {
+                    "context": "SomeContext",
+                    "bindings": {
+                        "\\ a": "foo::bar",
+                        "c": "foo::baz",
+                    }
+                },
+            ]"#
+            .unindent(),
+            KeybindUpdateOperation::Remove {
+                target: KeybindUpdateTarget {
+                    context: Some("SomeContext"),
+                    keystrokes: &parse_keystrokes("\\ a"),
+                    action_name: "foo::bar",
+                    action_arguments: None,
+                },
+                target_keybind_source: KeybindSource::User,
+            },
+            r#"[
+                {
+                    "context": "SomeContext",
+                    "bindings": {
+                        "c": "foo::baz",
+                    }
+                },
+            ]"#
+            .unindent(),
+        );
+
         check_keymap_update(
             r#"[
                 {
diff --git a/crates/settings/src/settings_json.rs b/crates/settings/src/settings_json.rs
index 480fe057ea..70c76e23c4 100644
--- a/crates/settings/src/settings_json.rs
+++ b/crates/settings/src/settings_json.rs
@@ -140,8 +140,10 @@ pub fn replace_value_in_json_text<T: AsRef<str>>(
 
         let found_key = text
             .get(key_range.clone())
-            .map(|key_text| {
-                depth < key_path.len() && key_text == format!("\"{}\"", key_path[depth].as_ref())
+            .and_then(|key_text| {
+                serde_json::to_string(key_path[depth].as_ref())
+                    .ok()
+                    .map(|key_path| depth < key_path.len() && key_text == key_path)
             })
             .unwrap_or(false);
 
@@ -163,8 +165,8 @@ pub fn replace_value_in_json_text<T: AsRef<str>>(
     if depth == key_path.len() {
         if let Some(new_value) = new_value {
             let new_val = to_pretty_json(new_value, tab_size, tab_size * depth);
-            if let Some(replace_key) = replace_key {
-                let new_key = format!("\"{}\": ", replace_key);
+            if let Some(replace_key) = replace_key.and_then(|str| serde_json::to_string(str).ok()) {
+                let new_key = format!("{}: ", replace_key);
                 if let Some(key_start) = text[..existing_value_range.start].rfind('"') {
                     if let Some(prev_key_start) = text[..key_start].rfind('"') {
                         existing_value_range.start = prev_key_start;

From a66cd820b3c32edea1ece3e81475d5d47fa79ed7 Mon Sep 17 00:00:00 2001
From: Dave Waggoner <waggoner.dave@gmail.com>
Date: Mon, 8 Sep 2025 09:21:47 -0700
Subject: [PATCH 685/823] Fix line endings in `terminal_hyperlinks.rs` (#37654)

Fixes Windows line endings in `terminal_hyperlinks.rs`, which was
accidentally originally added with them.

Release Notes:

- N/A
---
 crates/terminal/src/terminal_hyperlinks.rs | 2442 ++++++++++----------
 1 file changed, 1221 insertions(+), 1221 deletions(-)

diff --git a/crates/terminal/src/terminal_hyperlinks.rs b/crates/terminal/src/terminal_hyperlinks.rs
index 9f565bd306..4126b3d948 100644
--- a/crates/terminal/src/terminal_hyperlinks.rs
+++ b/crates/terminal/src/terminal_hyperlinks.rs
@@ -1,1221 +1,1221 @@
-use alacritty_terminal::{
-    Term,
-    event::EventListener,
-    grid::Dimensions,
-    index::{Boundary, Column, Direction as AlacDirection, Line, Point as AlacPoint},
-    term::search::{Match, RegexIter, RegexSearch},
-};
-use regex::Regex;
-use std::{ops::Index, sync::LazyLock};
-
-const URL_REGEX: &str = r#"(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file://|git://|ssh:|ftp://)[^\u{0000}-\u{001F}\u{007F}-\u{009F}<>"\s{-}\^⟨⟩`']+"#;
-// Optional suffix matches MSBuild diagnostic suffixes for path parsing in PathLikeWithPosition
-// https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-diagnostic-format-for-tasks
-const WORD_REGEX: &str =
-    r#"[\$\+\w.\[\]:/\\@\-~()]+(?:\((?:\d+|\d+,\d+)\))|[\$\+\w.\[\]:/\\@\-~()]+"#;
-
-const PYTHON_FILE_LINE_REGEX: &str = r#"File "(?P<file>[^"]+)", line (?P<line>\d+)"#;
-
-static PYTHON_FILE_LINE_MATCHER: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(PYTHON_FILE_LINE_REGEX).unwrap());
-
-fn python_extract_path_and_line(input: &str) -> Option<(&str, u32)> {
-    if let Some(captures) = PYTHON_FILE_LINE_MATCHER.captures(input) {
-        let path_part = captures.name("file")?.as_str();
-
-        let line_number: u32 = captures.name("line")?.as_str().parse().ok()?;
-        return Some((path_part, line_number));
-    }
-    None
-}
-
-pub(super) struct RegexSearches {
-    url_regex: RegexSearch,
-    word_regex: RegexSearch,
-    python_file_line_regex: RegexSearch,
-}
-
-impl RegexSearches {
-    pub(super) fn new() -> Self {
-        Self {
-            url_regex: RegexSearch::new(URL_REGEX).unwrap(),
-            word_regex: RegexSearch::new(WORD_REGEX).unwrap(),
-            python_file_line_regex: RegexSearch::new(PYTHON_FILE_LINE_REGEX).unwrap(),
-        }
-    }
-}
-
-pub(super) fn find_from_grid_point<T: EventListener>(
-    term: &Term<T>,
-    point: AlacPoint,
-    regex_searches: &mut RegexSearches,
-) -> Option<(String, bool, Match)> {
-    let grid = term.grid();
-    let link = grid.index(point).hyperlink();
-    let found_word = if let Some(ref url) = link {
-        let mut min_index = point;
-        loop {
-            let new_min_index = min_index.sub(term, Boundary::Cursor, 1);
-            if new_min_index == min_index || grid.index(new_min_index).hyperlink() != link {
-                break;
-            } else {
-                min_index = new_min_index
-            }
-        }
-
-        let mut max_index = point;
-        loop {
-            let new_max_index = max_index.add(term, Boundary::Cursor, 1);
-            if new_max_index == max_index || grid.index(new_max_index).hyperlink() != link {
-                break;
-            } else {
-                max_index = new_max_index
-            }
-        }
-
-        let url = url.uri().to_owned();
-        let url_match = min_index..=max_index;
-
-        Some((url, true, url_match))
-    } else if let Some(url_match) = regex_match_at(term, point, &mut regex_searches.url_regex) {
-        let url = term.bounds_to_string(*url_match.start(), *url_match.end());
-        Some((url, true, url_match))
-    } else if let Some(python_match) =
-        regex_match_at(term, point, &mut regex_searches.python_file_line_regex)
-    {
-        let matching_line = term.bounds_to_string(*python_match.start(), *python_match.end());
-        python_extract_path_and_line(&matching_line).map(|(file_path, line_number)| {
-            (format!("{file_path}:{line_number}"), false, python_match)
-        })
-    } else if let Some(word_match) = regex_match_at(term, point, &mut regex_searches.word_regex) {
-        let file_path = term.bounds_to_string(*word_match.start(), *word_match.end());
-
-        let (sanitized_match, sanitized_word) = 'sanitize: {
-            let mut word_match = word_match;
-            let mut file_path = file_path;
-
-            if is_path_surrounded_by_common_symbols(&file_path) {
-                word_match = Match::new(
-                    word_match.start().add(term, Boundary::Grid, 1),
-                    word_match.end().sub(term, Boundary::Grid, 1),
-                );
-                file_path = file_path[1..file_path.len() - 1].to_owned();
-            }
-
-            while file_path.ends_with(':') {
-                file_path.pop();
-                word_match = Match::new(
-                    *word_match.start(),
-                    word_match.end().sub(term, Boundary::Grid, 1),
-                );
-            }
-            let mut colon_count = 0;
-            for c in file_path.chars() {
-                if c == ':' {
-                    colon_count += 1;
-                }
-            }
-            // strip trailing comment after colon in case of
-            // file/at/path.rs:row:column:description or error message
-            // so that the file path is `file/at/path.rs:row:column`
-            if colon_count > 2 {
-                let last_index = file_path.rfind(':').unwrap();
-                let prev_is_digit = last_index > 0
-                    && file_path
-                        .chars()
-                        .nth(last_index - 1)
-                        .is_some_and(|c| c.is_ascii_digit());
-                let next_is_digit = last_index < file_path.len() - 1
-                    && file_path
-                        .chars()
-                        .nth(last_index + 1)
-                        .is_none_or(|c| c.is_ascii_digit());
-                if prev_is_digit && !next_is_digit {
-                    let stripped_len = file_path.len() - last_index;
-                    word_match = Match::new(
-                        *word_match.start(),
-                        word_match.end().sub(term, Boundary::Grid, stripped_len),
-                    );
-                    file_path = file_path[0..last_index].to_owned();
-                }
-            }
-
-            break 'sanitize (word_match, file_path);
-        };
-
-        Some((sanitized_word, false, sanitized_match))
-    } else {
-        None
-    };
-
-    found_word.map(|(maybe_url_or_path, is_url, word_match)| {
-        if is_url {
-            // Treat "file://" IRIs like file paths to ensure
-            // that line numbers at the end of the path are
-            // handled correctly
-            if let Some(path) = maybe_url_or_path.strip_prefix("file://") {
-                (path.to_string(), false, word_match)
-            } else {
-                (maybe_url_or_path, true, word_match)
-            }
-        } else {
-            (maybe_url_or_path, false, word_match)
-        }
-    })
-}
-
-fn is_path_surrounded_by_common_symbols(path: &str) -> bool {
-    // Avoid detecting `[]` or `()` strings as paths, surrounded by common symbols
-    path.len() > 2
-        // The rest of the brackets and various quotes cannot be matched by the [`WORD_REGEX`] hence not checked for.
-        && (path.starts_with('[') && path.ends_with(']')
-            || path.starts_with('(') && path.ends_with(')'))
-}
-
-/// Based on alacritty/src/display/hint.rs > regex_match_at
-/// Retrieve the match, if the specified point is inside the content matching the regex.
-fn regex_match_at<T>(term: &Term<T>, point: AlacPoint, regex: &mut RegexSearch) -> Option<Match> {
-    visible_regex_match_iter(term, regex).find(|rm| rm.contains(&point))
-}
-
-/// Copied from alacritty/src/display/hint.rs:
-/// Iterate over all visible regex matches.
-fn visible_regex_match_iter<'a, T>(
-    term: &'a Term<T>,
-    regex: &'a mut RegexSearch,
-) -> impl Iterator<Item = Match> + 'a {
-    const MAX_SEARCH_LINES: usize = 100;
-
-    let viewport_start = Line(-(term.grid().display_offset() as i32));
-    let viewport_end = viewport_start + term.bottommost_line();
-    let mut start = term.line_search_left(AlacPoint::new(viewport_start, Column(0)));
-    let mut end = term.line_search_right(AlacPoint::new(viewport_end, Column(0)));
-    start.line = start.line.max(viewport_start - MAX_SEARCH_LINES);
-    end.line = end.line.min(viewport_end + MAX_SEARCH_LINES);
-
-    RegexIter::new(start, end, AlacDirection::Right, term, regex)
-        .skip_while(move |rm| rm.end().line < viewport_start)
-        .take_while(move |rm| rm.start().line <= viewport_end)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use alacritty_terminal::{
-        event::VoidListener,
-        index::{Boundary, Point as AlacPoint},
-        term::{Config, cell::Flags, test::TermSize},
-        vte::ansi::Handler,
-    };
-    use std::{cell::RefCell, ops::RangeInclusive, path::PathBuf};
-    use url::Url;
-    use util::paths::PathWithPosition;
-
-    fn re_test(re: &str, hay: &str, expected: Vec<&str>) {
-        let results: Vec<_> = regex::Regex::new(re)
-            .unwrap()
-            .find_iter(hay)
-            .map(|m| m.as_str())
-            .collect();
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_url_regex() {
-        re_test(
-            URL_REGEX,
-            "test http://example.com test 'https://website1.com' test mailto:bob@example.com train",
-            vec![
-                "http://example.com",
-                "https://website1.com",
-                "mailto:bob@example.com",
-            ],
-        );
-    }
-
-    #[test]
-    fn test_word_regex() {
-        re_test(
-            WORD_REGEX,
-            "hello, world! \"What\" is this?",
-            vec!["hello", "world", "What", "is", "this"],
-        );
-    }
-
-    #[test]
-    fn test_word_regex_with_linenum() {
-        // filename(line) and filename(line,col) as used in MSBuild output
-        // should be considered a single "word", even though comma is
-        // usually a word separator
-        re_test(WORD_REGEX, "a Main.cs(20) b", vec!["a", "Main.cs(20)", "b"]);
-        re_test(
-            WORD_REGEX,
-            "Main.cs(20,5) Error desc",
-            vec!["Main.cs(20,5)", "Error", "desc"],
-        );
-        // filename:line:col is a popular format for unix tools
-        re_test(
-            WORD_REGEX,
-            "a Main.cs:20:5 b",
-            vec!["a", "Main.cs:20:5", "b"],
-        );
-        // Some tools output "filename:line:col:message", which currently isn't
-        // handled correctly, but might be in the future
-        re_test(
-            WORD_REGEX,
-            "Main.cs:20:5:Error desc",
-            vec!["Main.cs:20:5:Error", "desc"],
-        );
-    }
-
-    #[test]
-    fn test_python_file_line_regex() {
-        re_test(
-            PYTHON_FILE_LINE_REGEX,
-            "hay File \"/zed/bad_py.py\", line 8 stack",
-            vec!["File \"/zed/bad_py.py\", line 8"],
-        );
-        re_test(PYTHON_FILE_LINE_REGEX, "unrelated", vec![]);
-    }
-
-    #[test]
-    fn test_python_file_line() {
-        let inputs: Vec<(&str, Option<(&str, u32)>)> = vec![
-            (
-                "File \"/zed/bad_py.py\", line 8",
-                Some(("/zed/bad_py.py", 8u32)),
-            ),
-            ("File \"path/to/zed/bad_py.py\"", None),
-            ("unrelated", None),
-            ("", None),
-        ];
-        let actual = inputs
-            .iter()
-            .map(|input| python_extract_path_and_line(input.0))
-            .collect::<Vec<_>>();
-        let expected = inputs.iter().map(|(_, output)| *output).collect::<Vec<_>>();
-        assert_eq!(actual, expected);
-    }
-
-    // We use custom columns in many tests to workaround this issue by ensuring a wrapped
-    // line never ends on a wide char:
-    //
-    // <https://github.com/alacritty/alacritty/issues/8586>
-    //
-    // This issue was recently fixed, as soon as we update to a version containing the fix we
-    // can remove all the custom columns from these tests.
-    //
-    macro_rules! test_hyperlink {
-        ($($lines:expr),+; $hyperlink_kind:ident) => { {
-            use crate::terminal_hyperlinks::tests::line_cells_count;
-            use std::cmp;
-
-            let test_lines = vec![$($lines),+];
-            let (total_cells, longest_line_cells) =
-                test_lines.iter().copied()
-                    .map(line_cells_count)
-                    .fold((0, 0), |state, cells| (state.0 + cells, cmp::max(state.1, cells)));
-
-            test_hyperlink!(
-                // Alacritty has issues with 2 columns, use 3 as the minimum for now.
-                [3, longest_line_cells / 2, longest_line_cells + 1];
-                total_cells;
-                test_lines.iter().copied();
-                $hyperlink_kind
-            )
-        } };
-
-        ($($columns:literal),+; $($lines:expr),+; $hyperlink_kind:ident) => { {
-            use crate::terminal_hyperlinks::tests::line_cells_count;
-
-            let test_lines = vec![$($lines),+];
-            let total_cells = test_lines.iter().copied().map(line_cells_count).sum();
-
-            test_hyperlink!(
-                [ $($columns),+ ]; total_cells; test_lines.iter().copied(); $hyperlink_kind
-            )
-        } };
-
-        ([ $($columns:expr),+ ]; $total_cells:expr; $lines:expr; $hyperlink_kind:ident) => { {
-            use crate::terminal_hyperlinks::tests::{ test_hyperlink, HyperlinkKind };
-
-            let source_location = format!("{}:{}", std::file!(), std::line!());
-            for columns in vec![ $($columns),+] {
-                test_hyperlink(columns, $total_cells, $lines, HyperlinkKind::$hyperlink_kind,
-                    &source_location);
-            }
-        } };
-    }
-
-    mod path {
-        /// 👉 := **hovered** on following char
-        ///
-        /// 👈 := **hovered** on wide char spacer of previous full width char
-        ///
-        /// **`‹›`** := expected **hyperlink** match
-        ///
-        /// **`«»`** := expected **path**, **row**, and **column** capture groups
-        ///
-        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
-        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
-        ///
-        macro_rules! test_path {
-            ($($lines:literal),+) => { test_hyperlink!($($lines),+; Path) };
-            ($($columns:literal),+; $($lines:literal),+) => {
-                test_hyperlink!($($columns),+; $($lines),+; Path)
-            };
-        }
-
-        #[test]
-        fn simple() {
-            // Rust paths
-            // Just the path
-            test_path!("‹«/👉test/cool.rs»›");
-            test_path!("‹«/test/cool👉.rs»›");
-
-            // path and line
-            test_path!("‹«/👉test/cool.rs»:«4»›");
-            test_path!("‹«/test/cool.rs»👉:«4»›");
-            test_path!("‹«/test/cool.rs»:«👉4»›");
-            test_path!("‹«/👉test/cool.rs»(«4»)›");
-            test_path!("‹«/test/cool.rs»👉(«4»)›");
-            test_path!("‹«/test/cool.rs»(«👉4»)›");
-            test_path!("‹«/test/cool.rs»(«4»👉)›");
-
-            // path, line, and column
-            test_path!("‹«/👉test/cool.rs»:«4»:«2»›");
-            test_path!("‹«/test/cool.rs»:«4»:«👉2»›");
-            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›");
-            test_path!("‹«/test/cool.rs»(«4»👉,«2»)›");
-
-            // path, line, column, and ':' suffix
-            test_path!("‹«/👉test/cool.rs»:«4»:«2»›:");
-            test_path!("‹«/test/cool.rs»:«4»:«👉2»›:");
-            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›:");
-            test_path!("‹«/test/cool.rs»(«4»,«2»👉)›:");
-
-            // path, line, column, and description
-            test_path!("‹«/test/cool.rs»:«4»:«2»›👉:Error!");
-            test_path!("‹«/test/cool.rs»:«4»:«2»›:👉Error!");
-            test_path!("‹«/test/co👉ol.rs»(«4»,«2»)›:Error!");
-
-            // Cargo output
-            test_path!("    Compiling Cool 👉(‹«/test/Cool»›)");
-            test_path!("    Compiling Cool (‹«/👉test/Cool»›)");
-            test_path!("    Compiling Cool (‹«/test/Cool»›👉)");
-
-            // Python
-            test_path!("‹«awe👉some.py»›");
-
-            test_path!("    ‹F👉ile \"«/awesome.py»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awe👉some.py»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awesome.py»👉\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awesome.py»\", line «4👉2»›: Wat?");
-        }
-
-        #[test]
-        fn colons_galore() {
-            test_path!("‹«/test/co👉ol.rs»:«4»›");
-            test_path!("‹«/test/co👉ol.rs»:«4»›:");
-            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›");
-            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›:");
-            test_path!("‹«/test/co👉ol.rs»(«1»)›");
-            test_path!("‹«/test/co👉ol.rs»(«1»)›:");
-            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›");
-            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›:");
-            test_path!("‹«/test/co👉ol.rs»::«42»›");
-            test_path!("‹«/test/co👉ol.rs»::«42»›:");
-            test_path!("‹«/test/co👉ol.rs:4:2»(«1»,«618»)›");
-            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›::");
-        }
-
-        #[test]
-        fn word_wide_chars() {
-            // Rust paths
-            test_path!(4, 6, 12; "‹«/👉例/cool.rs»›");
-            test_path!(4, 6, 12; "‹«/例👈/cool.rs»›");
-            test_path!(4, 8, 16; "‹«/例/cool.rs»:«👉4»›");
-            test_path!(4, 8, 16; "‹«/例/cool.rs»:«4»:«👉2»›");
-
-            // Cargo output
-            test_path!(4, 27, 30; "    Compiling Cool (‹«/👉例/Cool»›)");
-            test_path!(4, 27, 30; "    Compiling Cool (‹«/例👈/Cool»›)");
-
-            // Python
-            test_path!(4, 11; "‹«👉例wesome.py»›");
-            test_path!(4, 11; "‹«例👈wesome.py»›");
-            test_path!(6, 17, 40; "    ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
-            test_path!(6, 17, 40; "    ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
-        }
-
-        #[test]
-        fn non_word_wide_chars() {
-            // Mojo diagnostic message
-            test_path!(4, 18, 38; "    ‹File \"«/awe👉some.🔥»\", line «42»›: Wat?");
-            test_path!(4, 18, 38; "    ‹File \"«/awesome👉.🔥»\", line «42»›: Wat?");
-            test_path!(4, 18, 38; "    ‹File \"«/awesome.👉🔥»\", line «42»›: Wat?");
-            test_path!(4, 18, 38; "    ‹File \"«/awesome.🔥👈»\", line «42»›: Wat?");
-        }
-
-        /// These likely rise to the level of being worth fixing.
-        mod issues {
-            #[test]
-            #[cfg_attr(not(target_os = "windows"), should_panic(expected = "Path = «例»"))]
-            #[cfg_attr(target_os = "windows", should_panic(expected = r#"Path = «C:\\例»"#))]
-            // <https://github.com/alacritty/alacritty/issues/8586>
-            fn issue_alacritty_8586() {
-                // Rust paths
-                test_path!("‹«/👉例/cool.rs»›");
-                test_path!("‹«/例👈/cool.rs»›");
-                test_path!("‹«/例/cool.rs»:«👉4»›");
-                test_path!("‹«/例/cool.rs»:«4»:«👉2»›");
-
-                // Cargo output
-                test_path!("    Compiling Cool (‹«/👉例/Cool»›)");
-                test_path!("    Compiling Cool (‹«/例👈/Cool»›)");
-
-                // Python
-                test_path!("‹«👉例wesome.py»›");
-                test_path!("‹«例👈wesome.py»›");
-                test_path!("    ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
-                test_path!("    ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
-            }
-
-            #[test]
-            #[should_panic(expected = "No hyperlink found")]
-            // <https://github.com/zed-industries/zed/issues/12338>
-            fn issue_12338() {
-                // Issue #12338
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test👉、2.txt»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test、👈2.txt»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test👉。3.txt»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test。👈3.txt»›");
-
-                // Rust paths
-                test_path!("‹«/👉🏃/🦀.rs»›");
-                test_path!("‹«/🏃👈/🦀.rs»›");
-                test_path!("‹«/🏃/👉🦀.rs»:«4»›");
-                test_path!("‹«/🏃/🦀👈.rs»:«4»:«2»›");
-
-                // Cargo output
-                test_path!("    Compiling Cool (‹«/👉🏃/Cool»›)");
-                test_path!("    Compiling Cool (‹«/🏃👈/Cool»›)");
-
-                // Python
-                test_path!("‹«👉🏃wesome.py»›");
-                test_path!("‹«🏃👈wesome.py»›");
-                test_path!("    ‹File \"«/👉🏃wesome.py»\", line «42»›: Wat?");
-                test_path!("    ‹File \"«/🏃👈wesome.py»\", line «42»›: Wat?");
-
-                // Mojo
-                test_path!("‹«/awe👉some.🔥»› is some good Mojo!");
-                test_path!("‹«/awesome👉.🔥»› is some good Mojo!");
-                test_path!("‹«/awesome.👉🔥»› is some good Mojo!");
-                test_path!("‹«/awesome.🔥👈»› is some good Mojo!");
-                test_path!("    ‹File \"«/👉🏃wesome.🔥»\", line «42»›: Wat?");
-                test_path!("    ‹File \"«/🏃👈wesome.🔥»\", line «42»›: Wat?");
-            }
-
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(
-                    expected = "Path = «test/controllers/template_items_controller_test.rb», line = 20, at grid cells (0, 0)..=(17, 1)"
-                )
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(
-                    expected = r#"Path = «test\\controllers\\template_items_controller_test.rb», line = 20, at grid cells (0, 0)..=(17, 1)"#
-                )
-            )]
-            // <https://github.com/zed-industries/zed/issues/28194>
-            //
-            // #28194 was closed, but the link includes the description part (":in" here), which
-            // seems wrong...
-            fn issue_28194() {
-                test_path!(
-                    "‹«test/c👉ontrollers/template_items_controller_test.rb»:«20»›:in 'block (2 levels) in <class:TemplateItemsControllerTest>'"
-                );
-                test_path!(
-                    "‹«test/controllers/template_items_controller_test.rb»:«19»›:i👉n 'block in <class:TemplateItemsControllerTest>'"
-                );
-            }
-        }
-
-        /// Minor issues arguably not important enough to fix/workaround...
-        mod nits {
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(expected = "Path = «/test/cool.rs(4»")
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(expected = r#"Path = «C:\\test\\cool.rs(4»"#)
-            )]
-            fn alacritty_bugs_with_two_columns() {
-                test_path!(2; "‹«/👉test/cool.rs»(«4»)›");
-                test_path!(2; "‹«/test/cool.rs»(«👉4»)›");
-                test_path!(2; "‹«/test/cool.rs»(«4»,«👉2»)›");
-
-                // Python
-                test_path!(2; "‹«awe👉some.py»›");
-            }
-
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(
-                    expected = "Path = «/test/cool.rs», line = 1, at grid cells (0, 0)..=(9, 0)"
-                )
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(
-                    expected = r#"Path = «C:\\test\\cool.rs», line = 1, at grid cells (0, 0)..=(9, 2)"#
-                )
-            )]
-            fn invalid_row_column_should_be_part_of_path() {
-                test_path!("‹«/👉test/cool.rs:1:618033988749»›");
-                test_path!("‹«/👉test/cool.rs(1,618033988749)»›");
-            }
-
-            #[test]
-            #[should_panic(expected = "Path = «»")]
-            fn colon_suffix_succeeds_in_finding_an_empty_maybe_path() {
-                test_path!("‹«/test/cool.rs»:«4»:«2»›👉:", "What is this?");
-                test_path!("‹«/test/cool.rs»(«4»,«2»)›👉:", "What is this?");
-            }
-
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(expected = "Path = «/test/cool.rs»")
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(expected = r#"Path = «C:\\test\\cool.rs»"#)
-            )]
-            fn many_trailing_colons_should_be_parsed_as_part_of_the_path() {
-                test_path!("‹«/test/cool.rs:::👉:»›");
-                test_path!("‹«/te:st/👉co:ol.r:s:4:2::::::»›");
-            }
-        }
-
-        #[cfg(target_os = "windows")]
-        mod windows {
-            // Lots of fun to be had with long file paths (verbatim) and UNC paths on Windows.
-            // See <https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation>
-            // See <https://users.rust-lang.org/t/understanding-windows-paths/58583>
-            // See <https://github.com/rust-lang/cargo/issues/13919>
-
-            #[test]
-            fn unc() {
-                test_path!(r#"‹«\\server\share\👉test\cool.rs»›"#);
-                test_path!(r#"‹«\\server\share\test\cool👉.rs»›"#);
-            }
-
-            mod issues {
-                #[test]
-                #[should_panic(
-                    expected = r#"Path = «C:\\test\\cool.rs», at grid cells (0, 0)..=(6, 0)"#
-                )]
-                fn issue_verbatim() {
-                    test_path!(r#"‹«\\?\C:\👉test\cool.rs»›"#);
-                    test_path!(r#"‹«\\?\C:\test\cool👉.rs»›"#);
-                }
-
-                #[test]
-                #[should_panic(
-                    expected = r#"Path = «\\\\server\\share\\test\\cool.rs», at grid cells (0, 0)..=(10, 2)"#
-                )]
-                fn issue_verbatim_unc() {
-                    test_path!(r#"‹«\\?\UNC\server\share\👉test\cool.rs»›"#);
-                    test_path!(r#"‹«\\?\UNC\server\share\test\cool👉.rs»›"#);
-                }
-            }
-        }
-    }
-
-    mod file_iri {
-        // File IRIs have a ton of use cases, most of which we currently do not support. A few of
-        // those cases are documented here as tests which are expected to fail.
-        // See https://en.wikipedia.org/wiki/File_URI_scheme
-
-        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
-        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
-        ///
-        macro_rules! test_file_iri {
-            ($file_iri:literal) => { { test_hyperlink!(concat!("‹«👉", $file_iri, "»›"); FileIri) } };
-            ($($columns:literal),+; $file_iri:literal) => { {
-                test_hyperlink!($($columns),+; concat!("‹«👉", $file_iri, "»›"); FileIri)
-            } };
-        }
-
-        #[cfg(not(target_os = "windows"))]
-        #[test]
-        fn absolute_file_iri() {
-            test_file_iri!("file:///test/cool/index.rs");
-            test_file_iri!("file:///test/cool/");
-        }
-
-        mod issues {
-            #[cfg(not(target_os = "windows"))]
-            #[test]
-            #[should_panic(expected = "Path = «/test/Ῥόδος/», at grid cells (0, 0)..=(15, 1)")]
-            fn issue_file_iri_with_percent_encoded_characters() {
-                // Non-space characters
-                // file:///test/Ῥόδος/
-                test_file_iri!("file:///test/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82/"); // URI
-
-                // Spaces
-                test_file_iri!("file:///te%20st/co%20ol/index.rs");
-                test_file_iri!("file:///te%20st/co%20ol/");
-            }
-        }
-
-        #[cfg(target_os = "windows")]
-        mod windows {
-            mod issues {
-                // The test uses Url::to_file_path(), but it seems that the Url crate doesn't
-                // support relative file IRIs.
-                #[test]
-                #[should_panic(
-                    expected = r#"Failed to interpret file IRI `file:/test/cool/index.rs` as a path"#
-                )]
-                fn issue_relative_file_iri() {
-                    test_file_iri!("file:/test/cool/index.rs");
-                    test_file_iri!("file:/test/cool/");
-                }
-
-                // See https://en.wikipedia.org/wiki/File_URI_scheme
-                #[test]
-                #[should_panic(
-                    expected = r#"Path = «C:\\test\\cool\\index.rs», at grid cells (0, 0)..=(9, 1)"#
-                )]
-                fn issue_absolute_file_iri() {
-                    test_file_iri!("file:///C:/test/cool/index.rs");
-                    test_file_iri!("file:///C:/test/cool/");
-                }
-
-                #[test]
-                #[should_panic(
-                    expected = r#"Path = «C:\\test\\Ῥόδος\\», at grid cells (0, 0)..=(16, 1)"#
-                )]
-                fn issue_file_iri_with_percent_encoded_characters() {
-                    // Non-space characters
-                    // file:///test/Ῥόδος/
-                    test_file_iri!("file:///C:/test/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82/"); // URI
-
-                    // Spaces
-                    test_file_iri!("file:///C:/te%20st/co%20ol/index.rs");
-                    test_file_iri!("file:///C:/te%20st/co%20ol/");
-                }
-            }
-        }
-    }
-
-    mod iri {
-        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
-        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
-        ///
-        macro_rules! test_iri {
-            ($iri:literal) => { { test_hyperlink!(concat!("‹«👉", $iri, "»›"); Iri) } };
-            ($($columns:literal),+; $iri:literal) => { {
-                test_hyperlink!($($columns),+; concat!("‹«👉", $iri, "»›"); Iri)
-            } };
-        }
-
-        #[test]
-        fn simple() {
-            // In the order they appear in URL_REGEX, except 'file://' which is treated as a path
-            test_iri!("ipfs://test/cool.ipfs");
-            test_iri!("ipns://test/cool.ipns");
-            test_iri!("magnet://test/cool.git");
-            test_iri!("mailto:someone@somewhere.here");
-            test_iri!("gemini://somewhere.here");
-            test_iri!("gopher://somewhere.here");
-            test_iri!("http://test/cool/index.html");
-            test_iri!("http://10.10.10.10:1111/cool.html");
-            test_iri!("http://test/cool/index.html?amazing=1");
-            test_iri!("http://test/cool/index.html#right%20here");
-            test_iri!("http://test/cool/index.html?amazing=1#right%20here");
-            test_iri!("https://test/cool/index.html");
-            test_iri!("https://10.10.10.10:1111/cool.html");
-            test_iri!("https://test/cool/index.html?amazing=1");
-            test_iri!("https://test/cool/index.html#right%20here");
-            test_iri!("https://test/cool/index.html?amazing=1#right%20here");
-            test_iri!("news://test/cool.news");
-            test_iri!("git://test/cool.git");
-            test_iri!("ssh://user@somewhere.over.here:12345/test/cool.git");
-            test_iri!("ftp://test/cool.ftp");
-        }
-
-        #[test]
-        fn wide_chars() {
-            // In the order they appear in URL_REGEX, except 'file://' which is treated as a path
-            test_iri!(4, 20; "ipfs://例🏃🦀/cool.ipfs");
-            test_iri!(4, 20; "ipns://例🏃🦀/cool.ipns");
-            test_iri!(6, 20; "magnet://例🏃🦀/cool.git");
-            test_iri!(4, 20; "mailto:someone@somewhere.here");
-            test_iri!(4, 20; "gemini://somewhere.here");
-            test_iri!(4, 20; "gopher://somewhere.here");
-            test_iri!(4, 20; "http://例🏃🦀/cool/index.html");
-            test_iri!(4, 20; "http://10.10.10.10:1111/cool.html");
-            test_iri!(4, 20; "http://例🏃🦀/cool/index.html?amazing=1");
-            test_iri!(4, 20; "http://例🏃🦀/cool/index.html#right%20here");
-            test_iri!(4, 20; "http://例🏃🦀/cool/index.html?amazing=1#right%20here");
-            test_iri!(4, 20; "https://例🏃🦀/cool/index.html");
-            test_iri!(4, 20; "https://10.10.10.10:1111/cool.html");
-            test_iri!(4, 20; "https://例🏃🦀/cool/index.html?amazing=1");
-            test_iri!(4, 20; "https://例🏃🦀/cool/index.html#right%20here");
-            test_iri!(4, 20; "https://例🏃🦀/cool/index.html?amazing=1#right%20here");
-            test_iri!(4, 20; "news://例🏃🦀/cool.news");
-            test_iri!(5, 20; "git://例/cool.git");
-            test_iri!(5, 20; "ssh://user@somewhere.over.here:12345/例🏃🦀/cool.git");
-            test_iri!(7, 20; "ftp://例🏃🦀/cool.ftp");
-        }
-
-        // There are likely more tests needed for IRI vs URI
-        #[test]
-        fn iris() {
-            // These refer to the same location, see example here:
-            // <https://en.wikipedia.org/wiki/Internationalized_Resource_Identifier#Compatibility>
-            test_iri!("https://en.wiktionary.org/wiki/Ῥόδος"); // IRI
-            test_iri!("https://en.wiktionary.org/wiki/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82"); // URI
-        }
-
-        #[test]
-        #[should_panic(expected = "Expected a path, but was a iri")]
-        fn file_is_a_path() {
-            test_iri!("file://test/cool/index.rs");
-        }
-    }
-
-    #[derive(Debug, PartialEq)]
-    enum HyperlinkKind {
-        FileIri,
-        Iri,
-        Path,
-    }
-
-    struct ExpectedHyperlink {
-        hovered_grid_point: AlacPoint,
-        hovered_char: char,
-        hyperlink_kind: HyperlinkKind,
-        iri_or_path: String,
-        row: Option<u32>,
-        column: Option<u32>,
-        hyperlink_match: RangeInclusive<AlacPoint>,
-    }
-
-    /// Converts to Windows style paths on Windows, like path!(), but at runtime for improved test
-    /// readability.
-    fn build_term_from_test_lines<'a>(
-        hyperlink_kind: HyperlinkKind,
-        term_size: TermSize,
-        test_lines: impl Iterator<Item = &'a str>,
-    ) -> (Term<VoidListener>, ExpectedHyperlink) {
-        #[derive(Default, Eq, PartialEq)]
-        enum HoveredState {
-            #[default]
-            HoveredScan,
-            HoveredNextChar,
-            Done,
-        }
-
-        #[derive(Default, Eq, PartialEq)]
-        enum MatchState {
-            #[default]
-            MatchScan,
-            MatchNextChar,
-            Match(AlacPoint),
-            Done,
-        }
-
-        #[derive(Default, Eq, PartialEq)]
-        enum CapturesState {
-            #[default]
-            PathScan,
-            PathNextChar,
-            Path(AlacPoint),
-            RowScan,
-            Row(String),
-            ColumnScan,
-            Column(String),
-            Done,
-        }
-
-        fn prev_input_point_from_term(term: &Term<VoidListener>) -> AlacPoint {
-            let grid = term.grid();
-            let cursor = &grid.cursor;
-            let mut point = cursor.point;
-
-            if !cursor.input_needs_wrap {
-                point.column -= 1;
-            }
-
-            if grid.index(point).flags.contains(Flags::WIDE_CHAR_SPACER) {
-                point.column -= 1;
-            }
-
-            point
-        }
-
-        let mut hovered_grid_point: Option<AlacPoint> = None;
-        let mut hyperlink_match = AlacPoint::default()..=AlacPoint::default();
-        let mut iri_or_path = String::default();
-        let mut row = None;
-        let mut column = None;
-        let mut prev_input_point = AlacPoint::default();
-        let mut hovered_state = HoveredState::default();
-        let mut match_state = MatchState::default();
-        let mut captures_state = CapturesState::default();
-        let mut term = Term::new(Config::default(), &term_size, VoidListener);
-
-        for text in test_lines {
-            let chars: Box<dyn Iterator<Item = char>> =
-                if cfg!(windows) && hyperlink_kind == HyperlinkKind::Path {
-                    Box::new(text.chars().map(|c| if c == '/' { '\\' } else { c })) as _
-                } else {
-                    Box::new(text.chars()) as _
-                };
-            let mut chars = chars.peekable();
-            while let Some(c) = chars.next() {
-                match c {
-                    '👉' => {
-                        hovered_state = HoveredState::HoveredNextChar;
-                    }
-                    '👈' => {
-                        hovered_grid_point = Some(prev_input_point.add(&term, Boundary::Grid, 1));
-                    }
-                    '«' | '»' => {
-                        captures_state = match captures_state {
-                            CapturesState::PathScan => CapturesState::PathNextChar,
-                            CapturesState::PathNextChar => {
-                                panic!("Should have been handled by char input")
-                            }
-                            CapturesState::Path(start_point) => {
-                                iri_or_path = term.bounds_to_string(start_point, prev_input_point);
-                                CapturesState::RowScan
-                            }
-                            CapturesState::RowScan => CapturesState::Row(String::new()),
-                            CapturesState::Row(number) => {
-                                row = Some(number.parse::<u32>().unwrap());
-                                CapturesState::ColumnScan
-                            }
-                            CapturesState::ColumnScan => CapturesState::Column(String::new()),
-                            CapturesState::Column(number) => {
-                                column = Some(number.parse::<u32>().unwrap());
-                                CapturesState::Done
-                            }
-                            CapturesState::Done => {
-                                panic!("Extra '«', '»'")
-                            }
-                        }
-                    }
-                    '‹' | '›' => {
-                        match_state = match match_state {
-                            MatchState::MatchScan => MatchState::MatchNextChar,
-                            MatchState::MatchNextChar => {
-                                panic!("Should have been handled by char input")
-                            }
-                            MatchState::Match(start_point) => {
-                                hyperlink_match = start_point..=prev_input_point;
-                                MatchState::Done
-                            }
-                            MatchState::Done => {
-                                panic!("Extra '‹', '›'")
-                            }
-                        }
-                    }
-                    _ => {
-                        if let CapturesState::Row(number) | CapturesState::Column(number) =
-                            &mut captures_state
-                        {
-                            number.push(c)
-                        }
-
-                        let is_windows_abs_path_start = captures_state
-                            == CapturesState::PathNextChar
-                            && cfg!(windows)
-                            && hyperlink_kind == HyperlinkKind::Path
-                            && c == '\\'
-                            && chars.peek().is_some_and(|c| *c != '\\');
-
-                        if is_windows_abs_path_start {
-                            // Convert Unix abs path start into Windows abs path start so that the
-                            // same test can be used for both OSes.
-                            term.input('C');
-                            prev_input_point = prev_input_point_from_term(&term);
-                            term.input(':');
-                            term.input(c);
-                        } else {
-                            term.input(c);
-                            prev_input_point = prev_input_point_from_term(&term);
-                        }
-
-                        if hovered_state == HoveredState::HoveredNextChar {
-                            hovered_grid_point = Some(prev_input_point);
-                            hovered_state = HoveredState::Done;
-                        }
-                        if captures_state == CapturesState::PathNextChar {
-                            captures_state = CapturesState::Path(prev_input_point);
-                        }
-                        if match_state == MatchState::MatchNextChar {
-                            match_state = MatchState::Match(prev_input_point);
-                        }
-                    }
-                }
-            }
-            term.move_down_and_cr(1);
-        }
-
-        if hyperlink_kind == HyperlinkKind::FileIri {
-            let Ok(url) = Url::parse(&iri_or_path) else {
-                panic!("Failed to parse file IRI `{iri_or_path}`");
-            };
-            let Ok(path) = url.to_file_path() else {
-                panic!("Failed to interpret file IRI `{iri_or_path}` as a path");
-            };
-            iri_or_path = path.to_string_lossy().to_string();
-        }
-
-        if cfg!(windows) {
-            // Handle verbatim and UNC paths for Windows
-            if let Some(stripped) = iri_or_path.strip_prefix(r#"\\?\UNC\"#) {
-                iri_or_path = format!(r#"\\{stripped}"#);
-            } else if let Some(stripped) = iri_or_path.strip_prefix(r#"\\?\"#) {
-                iri_or_path = stripped.to_string();
-            }
-        }
-
-        let hovered_grid_point = hovered_grid_point.expect("Missing hovered point (👉 or 👈)");
-        let hovered_char = term.grid().index(hovered_grid_point).c;
-        (
-            term,
-            ExpectedHyperlink {
-                hovered_grid_point,
-                hovered_char,
-                hyperlink_kind,
-                iri_or_path,
-                row,
-                column,
-                hyperlink_match,
-            },
-        )
-    }
-
-    fn line_cells_count(line: &str) -> usize {
-        // This avoids taking a dependency on the unicode-width crate
-        fn width(c: char) -> usize {
-            match c {
-                // Fullwidth unicode characters used in tests
-                '例' | '🏃' | '🦀' | '🔥' => 2,
-                _ => 1,
-            }
-        }
-        const CONTROL_CHARS: &str = "‹«👉👈»›";
-        line.chars()
-            .filter(|c| !CONTROL_CHARS.contains(*c))
-            .map(width)
-            .sum::<usize>()
-    }
-
-    struct CheckHyperlinkMatch<'a> {
-        term: &'a Term<VoidListener>,
-        expected_hyperlink: &'a ExpectedHyperlink,
-        source_location: &'a str,
-    }
-
-    impl<'a> CheckHyperlinkMatch<'a> {
-        fn new(
-            term: &'a Term<VoidListener>,
-            expected_hyperlink: &'a ExpectedHyperlink,
-            source_location: &'a str,
-        ) -> Self {
-            Self {
-                term,
-                expected_hyperlink,
-                source_location,
-            }
-        }
-
-        fn check_path_with_position_and_match(
-            &self,
-            path_with_position: PathWithPosition,
-            hyperlink_match: &Match,
-        ) {
-            let format_path_with_position_and_match =
-                |path_with_position: &PathWithPosition, hyperlink_match: &Match| {
-                    let mut result =
-                        format!("Path = «{}»", &path_with_position.path.to_string_lossy());
-                    if let Some(row) = path_with_position.row {
-                        result += &format!(", line = {row}");
-                        if let Some(column) = path_with_position.column {
-                            result += &format!(", column = {column}");
-                        }
-                    }
-
-                    result += &format!(
-                        ", at grid cells {}",
-                        Self::format_hyperlink_match(hyperlink_match)
-                    );
-                    result
-                };
-
-            assert_ne!(
-                self.expected_hyperlink.hyperlink_kind,
-                HyperlinkKind::Iri,
-                "\n    at {}\nExpected a path, but was a iri:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-
-            assert_eq!(
-                format_path_with_position_and_match(
-                    &PathWithPosition {
-                        path: PathBuf::from(self.expected_hyperlink.iri_or_path.clone()),
-                        row: self.expected_hyperlink.row,
-                        column: self.expected_hyperlink.column
-                    },
-                    &self.expected_hyperlink.hyperlink_match
-                ),
-                format_path_with_position_and_match(&path_with_position, hyperlink_match),
-                "\n    at {}:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-        }
-
-        fn check_iri_and_match(&self, iri: String, hyperlink_match: &Match) {
-            let format_iri_and_match = |iri: &String, hyperlink_match: &Match| {
-                format!(
-                    "Url = «{iri}», at grid cells {}",
-                    Self::format_hyperlink_match(hyperlink_match)
-                )
-            };
-
-            assert_eq!(
-                self.expected_hyperlink.hyperlink_kind,
-                HyperlinkKind::Iri,
-                "\n    at {}\nExpected a iri, but was a path:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-
-            assert_eq!(
-                format_iri_and_match(
-                    &self.expected_hyperlink.iri_or_path,
-                    &self.expected_hyperlink.hyperlink_match
-                ),
-                format_iri_and_match(&iri, hyperlink_match),
-                "\n    at {}:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-        }
-
-        fn format_hyperlink_match(hyperlink_match: &Match) -> String {
-            format!(
-                "({}, {})..=({}, {})",
-                hyperlink_match.start().line.0,
-                hyperlink_match.start().column.0,
-                hyperlink_match.end().line.0,
-                hyperlink_match.end().column.0
-            )
-        }
-
-        fn format_renderable_content(&self) -> String {
-            let mut result = format!("\nHovered on '{}'\n", self.expected_hyperlink.hovered_char);
-
-            let mut first_header_row = String::new();
-            let mut second_header_row = String::new();
-            let mut marker_header_row = String::new();
-            for index in 0..self.term.columns() {
-                let remainder = index % 10;
-                first_header_row.push_str(
-                    &(index > 0 && remainder == 0)
-                        .then_some((index / 10).to_string())
-                        .unwrap_or(" ".into()),
-                );
-                second_header_row += &remainder.to_string();
-                if index == self.expected_hyperlink.hovered_grid_point.column.0 {
-                    marker_header_row.push('↓');
-                } else {
-                    marker_header_row.push(' ');
-                }
-            }
-
-            result += &format!("\n      [{}]\n", first_header_row);
-            result += &format!("      [{}]\n", second_header_row);
-            result += &format!("       {}", marker_header_row);
-
-            let spacers: Flags = Flags::LEADING_WIDE_CHAR_SPACER | Flags::WIDE_CHAR_SPACER;
-            for cell in self
-                .term
-                .renderable_content()
-                .display_iter
-                .filter(|cell| !cell.flags.intersects(spacers))
-            {
-                if cell.point.column.0 == 0 {
-                    let prefix =
-                        if cell.point.line == self.expected_hyperlink.hovered_grid_point.line {
-                            '→'
-                        } else {
-                            ' '
-                        };
-                    result += &format!("\n{prefix}[{:>3}] ", cell.point.line.to_string());
-                }
-
-                result.push(cell.c);
-            }
-
-            result
-        }
-    }
-
-    fn test_hyperlink<'a>(
-        columns: usize,
-        total_cells: usize,
-        test_lines: impl Iterator<Item = &'a str>,
-        hyperlink_kind: HyperlinkKind,
-        source_location: &str,
-    ) {
-        thread_local! {
-            static TEST_REGEX_SEARCHES: RefCell<RegexSearches> = RefCell::new(RegexSearches::new());
-        }
-
-        let term_size = TermSize::new(columns, total_cells / columns + 2);
-        let (term, expected_hyperlink) =
-            build_term_from_test_lines(hyperlink_kind, term_size, test_lines);
-        let hyperlink_found = TEST_REGEX_SEARCHES.with(|regex_searches| {
-            find_from_grid_point(
-                &term,
-                expected_hyperlink.hovered_grid_point,
-                &mut regex_searches.borrow_mut(),
-            )
-        });
-        let check_hyperlink_match =
-            CheckHyperlinkMatch::new(&term, &expected_hyperlink, source_location);
-        match hyperlink_found {
-            Some((hyperlink_word, false, hyperlink_match)) => {
-                check_hyperlink_match.check_path_with_position_and_match(
-                    PathWithPosition::parse_str(&hyperlink_word),
-                    &hyperlink_match,
-                );
-            }
-            Some((hyperlink_word, true, hyperlink_match)) => {
-                check_hyperlink_match.check_iri_and_match(hyperlink_word, &hyperlink_match);
-            }
-            _ => {
-                assert!(
-                    false,
-                    "No hyperlink found\n     at {source_location}:\n{}",
-                    check_hyperlink_match.format_renderable_content()
-                )
-            }
-        }
-    }
-}
+use alacritty_terminal::{
+    Term,
+    event::EventListener,
+    grid::Dimensions,
+    index::{Boundary, Column, Direction as AlacDirection, Line, Point as AlacPoint},
+    term::search::{Match, RegexIter, RegexSearch},
+};
+use regex::Regex;
+use std::{ops::Index, sync::LazyLock};
+
+const URL_REGEX: &str = r#"(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file://|git://|ssh:|ftp://)[^\u{0000}-\u{001F}\u{007F}-\u{009F}<>"\s{-}\^⟨⟩`']+"#;
+// Optional suffix matches MSBuild diagnostic suffixes for path parsing in PathLikeWithPosition
+// https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-diagnostic-format-for-tasks
+const WORD_REGEX: &str =
+    r#"[\$\+\w.\[\]:/\\@\-~()]+(?:\((?:\d+|\d+,\d+)\))|[\$\+\w.\[\]:/\\@\-~()]+"#;
+
+const PYTHON_FILE_LINE_REGEX: &str = r#"File "(?P<file>[^"]+)", line (?P<line>\d+)"#;
+
+static PYTHON_FILE_LINE_MATCHER: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(PYTHON_FILE_LINE_REGEX).unwrap());
+
+fn python_extract_path_and_line(input: &str) -> Option<(&str, u32)> {
+    if let Some(captures) = PYTHON_FILE_LINE_MATCHER.captures(input) {
+        let path_part = captures.name("file")?.as_str();
+
+        let line_number: u32 = captures.name("line")?.as_str().parse().ok()?;
+        return Some((path_part, line_number));
+    }
+    None
+}
+
+pub(super) struct RegexSearches {
+    url_regex: RegexSearch,
+    word_regex: RegexSearch,
+    python_file_line_regex: RegexSearch,
+}
+
+impl RegexSearches {
+    pub(super) fn new() -> Self {
+        Self {
+            url_regex: RegexSearch::new(URL_REGEX).unwrap(),
+            word_regex: RegexSearch::new(WORD_REGEX).unwrap(),
+            python_file_line_regex: RegexSearch::new(PYTHON_FILE_LINE_REGEX).unwrap(),
+        }
+    }
+}
+
+pub(super) fn find_from_grid_point<T: EventListener>(
+    term: &Term<T>,
+    point: AlacPoint,
+    regex_searches: &mut RegexSearches,
+) -> Option<(String, bool, Match)> {
+    let grid = term.grid();
+    let link = grid.index(point).hyperlink();
+    let found_word = if let Some(ref url) = link {
+        let mut min_index = point;
+        loop {
+            let new_min_index = min_index.sub(term, Boundary::Cursor, 1);
+            if new_min_index == min_index || grid.index(new_min_index).hyperlink() != link {
+                break;
+            } else {
+                min_index = new_min_index
+            }
+        }
+
+        let mut max_index = point;
+        loop {
+            let new_max_index = max_index.add(term, Boundary::Cursor, 1);
+            if new_max_index == max_index || grid.index(new_max_index).hyperlink() != link {
+                break;
+            } else {
+                max_index = new_max_index
+            }
+        }
+
+        let url = url.uri().to_owned();
+        let url_match = min_index..=max_index;
+
+        Some((url, true, url_match))
+    } else if let Some(url_match) = regex_match_at(term, point, &mut regex_searches.url_regex) {
+        let url = term.bounds_to_string(*url_match.start(), *url_match.end());
+        Some((url, true, url_match))
+    } else if let Some(python_match) =
+        regex_match_at(term, point, &mut regex_searches.python_file_line_regex)
+    {
+        let matching_line = term.bounds_to_string(*python_match.start(), *python_match.end());
+        python_extract_path_and_line(&matching_line).map(|(file_path, line_number)| {
+            (format!("{file_path}:{line_number}"), false, python_match)
+        })
+    } else if let Some(word_match) = regex_match_at(term, point, &mut regex_searches.word_regex) {
+        let file_path = term.bounds_to_string(*word_match.start(), *word_match.end());
+
+        let (sanitized_match, sanitized_word) = 'sanitize: {
+            let mut word_match = word_match;
+            let mut file_path = file_path;
+
+            if is_path_surrounded_by_common_symbols(&file_path) {
+                word_match = Match::new(
+                    word_match.start().add(term, Boundary::Grid, 1),
+                    word_match.end().sub(term, Boundary::Grid, 1),
+                );
+                file_path = file_path[1..file_path.len() - 1].to_owned();
+            }
+
+            while file_path.ends_with(':') {
+                file_path.pop();
+                word_match = Match::new(
+                    *word_match.start(),
+                    word_match.end().sub(term, Boundary::Grid, 1),
+                );
+            }
+            let mut colon_count = 0;
+            for c in file_path.chars() {
+                if c == ':' {
+                    colon_count += 1;
+                }
+            }
+            // strip trailing comment after colon in case of
+            // file/at/path.rs:row:column:description or error message
+            // so that the file path is `file/at/path.rs:row:column`
+            if colon_count > 2 {
+                let last_index = file_path.rfind(':').unwrap();
+                let prev_is_digit = last_index > 0
+                    && file_path
+                        .chars()
+                        .nth(last_index - 1)
+                        .is_some_and(|c| c.is_ascii_digit());
+                let next_is_digit = last_index < file_path.len() - 1
+                    && file_path
+                        .chars()
+                        .nth(last_index + 1)
+                        .is_none_or(|c| c.is_ascii_digit());
+                if prev_is_digit && !next_is_digit {
+                    let stripped_len = file_path.len() - last_index;
+                    word_match = Match::new(
+                        *word_match.start(),
+                        word_match.end().sub(term, Boundary::Grid, stripped_len),
+                    );
+                    file_path = file_path[0..last_index].to_owned();
+                }
+            }
+
+            break 'sanitize (word_match, file_path);
+        };
+
+        Some((sanitized_word, false, sanitized_match))
+    } else {
+        None
+    };
+
+    found_word.map(|(maybe_url_or_path, is_url, word_match)| {
+        if is_url {
+            // Treat "file://" IRIs like file paths to ensure
+            // that line numbers at the end of the path are
+            // handled correctly
+            if let Some(path) = maybe_url_or_path.strip_prefix("file://") {
+                (path.to_string(), false, word_match)
+            } else {
+                (maybe_url_or_path, true, word_match)
+            }
+        } else {
+            (maybe_url_or_path, false, word_match)
+        }
+    })
+}
+
+fn is_path_surrounded_by_common_symbols(path: &str) -> bool {
+    // Avoid detecting `[]` or `()` strings as paths, surrounded by common symbols
+    path.len() > 2
+        // The rest of the brackets and various quotes cannot be matched by the [`WORD_REGEX`] hence not checked for.
+        && (path.starts_with('[') && path.ends_with(']')
+            || path.starts_with('(') && path.ends_with(')'))
+}
+
+/// Based on alacritty/src/display/hint.rs > regex_match_at
+/// Retrieve the match, if the specified point is inside the content matching the regex.
+fn regex_match_at<T>(term: &Term<T>, point: AlacPoint, regex: &mut RegexSearch) -> Option<Match> {
+    visible_regex_match_iter(term, regex).find(|rm| rm.contains(&point))
+}
+
+/// Copied from alacritty/src/display/hint.rs:
+/// Iterate over all visible regex matches.
+fn visible_regex_match_iter<'a, T>(
+    term: &'a Term<T>,
+    regex: &'a mut RegexSearch,
+) -> impl Iterator<Item = Match> + 'a {
+    const MAX_SEARCH_LINES: usize = 100;
+
+    let viewport_start = Line(-(term.grid().display_offset() as i32));
+    let viewport_end = viewport_start + term.bottommost_line();
+    let mut start = term.line_search_left(AlacPoint::new(viewport_start, Column(0)));
+    let mut end = term.line_search_right(AlacPoint::new(viewport_end, Column(0)));
+    start.line = start.line.max(viewport_start - MAX_SEARCH_LINES);
+    end.line = end.line.min(viewport_end + MAX_SEARCH_LINES);
+
+    RegexIter::new(start, end, AlacDirection::Right, term, regex)
+        .skip_while(move |rm| rm.end().line < viewport_start)
+        .take_while(move |rm| rm.start().line <= viewport_end)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use alacritty_terminal::{
+        event::VoidListener,
+        index::{Boundary, Point as AlacPoint},
+        term::{Config, cell::Flags, test::TermSize},
+        vte::ansi::Handler,
+    };
+    use std::{cell::RefCell, ops::RangeInclusive, path::PathBuf};
+    use url::Url;
+    use util::paths::PathWithPosition;
+
+    fn re_test(re: &str, hay: &str, expected: Vec<&str>) {
+        let results: Vec<_> = regex::Regex::new(re)
+            .unwrap()
+            .find_iter(hay)
+            .map(|m| m.as_str())
+            .collect();
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_url_regex() {
+        re_test(
+            URL_REGEX,
+            "test http://example.com test 'https://website1.com' test mailto:bob@example.com train",
+            vec![
+                "http://example.com",
+                "https://website1.com",
+                "mailto:bob@example.com",
+            ],
+        );
+    }
+
+    #[test]
+    fn test_word_regex() {
+        re_test(
+            WORD_REGEX,
+            "hello, world! \"What\" is this?",
+            vec!["hello", "world", "What", "is", "this"],
+        );
+    }
+
+    #[test]
+    fn test_word_regex_with_linenum() {
+        // filename(line) and filename(line,col) as used in MSBuild output
+        // should be considered a single "word", even though comma is
+        // usually a word separator
+        re_test(WORD_REGEX, "a Main.cs(20) b", vec!["a", "Main.cs(20)", "b"]);
+        re_test(
+            WORD_REGEX,
+            "Main.cs(20,5) Error desc",
+            vec!["Main.cs(20,5)", "Error", "desc"],
+        );
+        // filename:line:col is a popular format for unix tools
+        re_test(
+            WORD_REGEX,
+            "a Main.cs:20:5 b",
+            vec!["a", "Main.cs:20:5", "b"],
+        );
+        // Some tools output "filename:line:col:message", which currently isn't
+        // handled correctly, but might be in the future
+        re_test(
+            WORD_REGEX,
+            "Main.cs:20:5:Error desc",
+            vec!["Main.cs:20:5:Error", "desc"],
+        );
+    }
+
+    #[test]
+    fn test_python_file_line_regex() {
+        re_test(
+            PYTHON_FILE_LINE_REGEX,
+            "hay File \"/zed/bad_py.py\", line 8 stack",
+            vec!["File \"/zed/bad_py.py\", line 8"],
+        );
+        re_test(PYTHON_FILE_LINE_REGEX, "unrelated", vec![]);
+    }
+
+    #[test]
+    fn test_python_file_line() {
+        let inputs: Vec<(&str, Option<(&str, u32)>)> = vec![
+            (
+                "File \"/zed/bad_py.py\", line 8",
+                Some(("/zed/bad_py.py", 8u32)),
+            ),
+            ("File \"path/to/zed/bad_py.py\"", None),
+            ("unrelated", None),
+            ("", None),
+        ];
+        let actual = inputs
+            .iter()
+            .map(|input| python_extract_path_and_line(input.0))
+            .collect::<Vec<_>>();
+        let expected = inputs.iter().map(|(_, output)| *output).collect::<Vec<_>>();
+        assert_eq!(actual, expected);
+    }
+
+    // We use custom columns in many tests to workaround this issue by ensuring a wrapped
+    // line never ends on a wide char:
+    //
+    // <https://github.com/alacritty/alacritty/issues/8586>
+    //
+    // This issue was recently fixed, as soon as we update to a version containing the fix we
+    // can remove all the custom columns from these tests.
+    //
+    macro_rules! test_hyperlink {
+        ($($lines:expr),+; $hyperlink_kind:ident) => { {
+            use crate::terminal_hyperlinks::tests::line_cells_count;
+            use std::cmp;
+
+            let test_lines = vec![$($lines),+];
+            let (total_cells, longest_line_cells) =
+                test_lines.iter().copied()
+                    .map(line_cells_count)
+                    .fold((0, 0), |state, cells| (state.0 + cells, cmp::max(state.1, cells)));
+
+            test_hyperlink!(
+                // Alacritty has issues with 2 columns, use 3 as the minimum for now.
+                [3, longest_line_cells / 2, longest_line_cells + 1];
+                total_cells;
+                test_lines.iter().copied();
+                $hyperlink_kind
+            )
+        } };
+
+        ($($columns:literal),+; $($lines:expr),+; $hyperlink_kind:ident) => { {
+            use crate::terminal_hyperlinks::tests::line_cells_count;
+
+            let test_lines = vec![$($lines),+];
+            let total_cells = test_lines.iter().copied().map(line_cells_count).sum();
+
+            test_hyperlink!(
+                [ $($columns),+ ]; total_cells; test_lines.iter().copied(); $hyperlink_kind
+            )
+        } };
+
+        ([ $($columns:expr),+ ]; $total_cells:expr; $lines:expr; $hyperlink_kind:ident) => { {
+            use crate::terminal_hyperlinks::tests::{ test_hyperlink, HyperlinkKind };
+
+            let source_location = format!("{}:{}", std::file!(), std::line!());
+            for columns in vec![ $($columns),+] {
+                test_hyperlink(columns, $total_cells, $lines, HyperlinkKind::$hyperlink_kind,
+                    &source_location);
+            }
+        } };
+    }
+
+    mod path {
+        /// 👉 := **hovered** on following char
+        ///
+        /// 👈 := **hovered** on wide char spacer of previous full width char
+        ///
+        /// **`‹›`** := expected **hyperlink** match
+        ///
+        /// **`«»`** := expected **path**, **row**, and **column** capture groups
+        ///
+        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
+        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
+        ///
+        macro_rules! test_path {
+            ($($lines:literal),+) => { test_hyperlink!($($lines),+; Path) };
+            ($($columns:literal),+; $($lines:literal),+) => {
+                test_hyperlink!($($columns),+; $($lines),+; Path)
+            };
+        }
+
+        #[test]
+        fn simple() {
+            // Rust paths
+            // Just the path
+            test_path!("‹«/👉test/cool.rs»›");
+            test_path!("‹«/test/cool👉.rs»›");
+
+            // path and line
+            test_path!("‹«/👉test/cool.rs»:«4»›");
+            test_path!("‹«/test/cool.rs»👉:«4»›");
+            test_path!("‹«/test/cool.rs»:«👉4»›");
+            test_path!("‹«/👉test/cool.rs»(«4»)›");
+            test_path!("‹«/test/cool.rs»👉(«4»)›");
+            test_path!("‹«/test/cool.rs»(«👉4»)›");
+            test_path!("‹«/test/cool.rs»(«4»👉)›");
+
+            // path, line, and column
+            test_path!("‹«/👉test/cool.rs»:«4»:«2»›");
+            test_path!("‹«/test/cool.rs»:«4»:«👉2»›");
+            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›");
+            test_path!("‹«/test/cool.rs»(«4»👉,«2»)›");
+
+            // path, line, column, and ':' suffix
+            test_path!("‹«/👉test/cool.rs»:«4»:«2»›:");
+            test_path!("‹«/test/cool.rs»:«4»:«👉2»›:");
+            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›:");
+            test_path!("‹«/test/cool.rs»(«4»,«2»👉)›:");
+
+            // path, line, column, and description
+            test_path!("‹«/test/cool.rs»:«4»:«2»›👉:Error!");
+            test_path!("‹«/test/cool.rs»:«4»:«2»›:👉Error!");
+            test_path!("‹«/test/co👉ol.rs»(«4»,«2»)›:Error!");
+
+            // Cargo output
+            test_path!("    Compiling Cool 👉(‹«/test/Cool»›)");
+            test_path!("    Compiling Cool (‹«/👉test/Cool»›)");
+            test_path!("    Compiling Cool (‹«/test/Cool»›👉)");
+
+            // Python
+            test_path!("‹«awe👉some.py»›");
+
+            test_path!("    ‹F👉ile \"«/awesome.py»\", line «42»›: Wat?");
+            test_path!("    ‹File \"«/awe👉some.py»\", line «42»›: Wat?");
+            test_path!("    ‹File \"«/awesome.py»👉\", line «42»›: Wat?");
+            test_path!("    ‹File \"«/awesome.py»\", line «4👉2»›: Wat?");
+        }
+
+        #[test]
+        fn colons_galore() {
+            test_path!("‹«/test/co👉ol.rs»:«4»›");
+            test_path!("‹«/test/co👉ol.rs»:«4»›:");
+            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›");
+            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›:");
+            test_path!("‹«/test/co👉ol.rs»(«1»)›");
+            test_path!("‹«/test/co👉ol.rs»(«1»)›:");
+            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›");
+            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›:");
+            test_path!("‹«/test/co👉ol.rs»::«42»›");
+            test_path!("‹«/test/co👉ol.rs»::«42»›:");
+            test_path!("‹«/test/co👉ol.rs:4:2»(«1»,«618»)›");
+            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›::");
+        }
+
+        #[test]
+        fn word_wide_chars() {
+            // Rust paths
+            test_path!(4, 6, 12; "‹«/👉例/cool.rs»›");
+            test_path!(4, 6, 12; "‹«/例👈/cool.rs»›");
+            test_path!(4, 8, 16; "‹«/例/cool.rs»:«👉4»›");
+            test_path!(4, 8, 16; "‹«/例/cool.rs»:«4»:«👉2»›");
+
+            // Cargo output
+            test_path!(4, 27, 30; "    Compiling Cool (‹«/👉例/Cool»›)");
+            test_path!(4, 27, 30; "    Compiling Cool (‹«/例👈/Cool»›)");
+
+            // Python
+            test_path!(4, 11; "‹«👉例wesome.py»›");
+            test_path!(4, 11; "‹«例👈wesome.py»›");
+            test_path!(6, 17, 40; "    ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
+            test_path!(6, 17, 40; "    ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
+        }
+
+        #[test]
+        fn non_word_wide_chars() {
+            // Mojo diagnostic message
+            test_path!(4, 18, 38; "    ‹File \"«/awe👉some.🔥»\", line «42»›: Wat?");
+            test_path!(4, 18, 38; "    ‹File \"«/awesome👉.🔥»\", line «42»›: Wat?");
+            test_path!(4, 18, 38; "    ‹File \"«/awesome.👉🔥»\", line «42»›: Wat?");
+            test_path!(4, 18, 38; "    ‹File \"«/awesome.🔥👈»\", line «42»›: Wat?");
+        }
+
+        /// These likely rise to the level of being worth fixing.
+        mod issues {
+            #[test]
+            #[cfg_attr(not(target_os = "windows"), should_panic(expected = "Path = «例»"))]
+            #[cfg_attr(target_os = "windows", should_panic(expected = r#"Path = «C:\\例»"#))]
+            // <https://github.com/alacritty/alacritty/issues/8586>
+            fn issue_alacritty_8586() {
+                // Rust paths
+                test_path!("‹«/👉例/cool.rs»›");
+                test_path!("‹«/例👈/cool.rs»›");
+                test_path!("‹«/例/cool.rs»:«👉4»›");
+                test_path!("‹«/例/cool.rs»:«4»:«👉2»›");
+
+                // Cargo output
+                test_path!("    Compiling Cool (‹«/👉例/Cool»›)");
+                test_path!("    Compiling Cool (‹«/例👈/Cool»›)");
+
+                // Python
+                test_path!("‹«👉例wesome.py»›");
+                test_path!("‹«例👈wesome.py»›");
+                test_path!("    ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
+                test_path!("    ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
+            }
+
+            #[test]
+            #[should_panic(expected = "No hyperlink found")]
+            // <https://github.com/zed-industries/zed/issues/12338>
+            fn issue_12338() {
+                // Issue #12338
+                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test👉、2.txt»›");
+                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test、👈2.txt»›");
+                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test👉。3.txt»›");
+                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test。👈3.txt»›");
+
+                // Rust paths
+                test_path!("‹«/👉🏃/🦀.rs»›");
+                test_path!("‹«/🏃👈/🦀.rs»›");
+                test_path!("‹«/🏃/👉🦀.rs»:«4»›");
+                test_path!("‹«/🏃/🦀👈.rs»:«4»:«2»›");
+
+                // Cargo output
+                test_path!("    Compiling Cool (‹«/👉🏃/Cool»›)");
+                test_path!("    Compiling Cool (‹«/🏃👈/Cool»›)");
+
+                // Python
+                test_path!("‹«👉🏃wesome.py»›");
+                test_path!("‹«🏃👈wesome.py»›");
+                test_path!("    ‹File \"«/👉🏃wesome.py»\", line «42»›: Wat?");
+                test_path!("    ‹File \"«/🏃👈wesome.py»\", line «42»›: Wat?");
+
+                // Mojo
+                test_path!("‹«/awe👉some.🔥»› is some good Mojo!");
+                test_path!("‹«/awesome👉.🔥»› is some good Mojo!");
+                test_path!("‹«/awesome.👉🔥»› is some good Mojo!");
+                test_path!("‹«/awesome.🔥👈»› is some good Mojo!");
+                test_path!("    ‹File \"«/👉🏃wesome.🔥»\", line «42»›: Wat?");
+                test_path!("    ‹File \"«/🏃👈wesome.🔥»\", line «42»›: Wat?");
+            }
+
+            #[test]
+            #[cfg_attr(
+                not(target_os = "windows"),
+                should_panic(
+                    expected = "Path = «test/controllers/template_items_controller_test.rb», line = 20, at grid cells (0, 0)..=(17, 1)"
+                )
+            )]
+            #[cfg_attr(
+                target_os = "windows",
+                should_panic(
+                    expected = r#"Path = «test\\controllers\\template_items_controller_test.rb», line = 20, at grid cells (0, 0)..=(17, 1)"#
+                )
+            )]
+            // <https://github.com/zed-industries/zed/issues/28194>
+            //
+            // #28194 was closed, but the link includes the description part (":in" here), which
+            // seems wrong...
+            fn issue_28194() {
+                test_path!(
+                    "‹«test/c👉ontrollers/template_items_controller_test.rb»:«20»›:in 'block (2 levels) in <class:TemplateItemsControllerTest>'"
+                );
+                test_path!(
+                    "‹«test/controllers/template_items_controller_test.rb»:«19»›:i👉n 'block in <class:TemplateItemsControllerTest>'"
+                );
+            }
+        }
+
+        /// Minor issues arguably not important enough to fix/workaround...
+        mod nits {
+            #[test]
+            #[cfg_attr(
+                not(target_os = "windows"),
+                should_panic(expected = "Path = «/test/cool.rs(4»")
+            )]
+            #[cfg_attr(
+                target_os = "windows",
+                should_panic(expected = r#"Path = «C:\\test\\cool.rs(4»"#)
+            )]
+            fn alacritty_bugs_with_two_columns() {
+                test_path!(2; "‹«/👉test/cool.rs»(«4»)›");
+                test_path!(2; "‹«/test/cool.rs»(«👉4»)›");
+                test_path!(2; "‹«/test/cool.rs»(«4»,«👉2»)›");
+
+                // Python
+                test_path!(2; "‹«awe👉some.py»›");
+            }
+
+            #[test]
+            #[cfg_attr(
+                not(target_os = "windows"),
+                should_panic(
+                    expected = "Path = «/test/cool.rs», line = 1, at grid cells (0, 0)..=(9, 0)"
+                )
+            )]
+            #[cfg_attr(
+                target_os = "windows",
+                should_panic(
+                    expected = r#"Path = «C:\\test\\cool.rs», line = 1, at grid cells (0, 0)..=(9, 2)"#
+                )
+            )]
+            fn invalid_row_column_should_be_part_of_path() {
+                test_path!("‹«/👉test/cool.rs:1:618033988749»›");
+                test_path!("‹«/👉test/cool.rs(1,618033988749)»›");
+            }
+
+            #[test]
+            #[should_panic(expected = "Path = «»")]
+            fn colon_suffix_succeeds_in_finding_an_empty_maybe_path() {
+                test_path!("‹«/test/cool.rs»:«4»:«2»›👉:", "What is this?");
+                test_path!("‹«/test/cool.rs»(«4»,«2»)›👉:", "What is this?");
+            }
+
+            #[test]
+            #[cfg_attr(
+                not(target_os = "windows"),
+                should_panic(expected = "Path = «/test/cool.rs»")
+            )]
+            #[cfg_attr(
+                target_os = "windows",
+                should_panic(expected = r#"Path = «C:\\test\\cool.rs»"#)
+            )]
+            fn many_trailing_colons_should_be_parsed_as_part_of_the_path() {
+                test_path!("‹«/test/cool.rs:::👉:»›");
+                test_path!("‹«/te:st/👉co:ol.r:s:4:2::::::»›");
+            }
+        }
+
+        #[cfg(target_os = "windows")]
+        mod windows {
+            // Lots of fun to be had with long file paths (verbatim) and UNC paths on Windows.
+            // See <https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation>
+            // See <https://users.rust-lang.org/t/understanding-windows-paths/58583>
+            // See <https://github.com/rust-lang/cargo/issues/13919>
+
+            #[test]
+            fn unc() {
+                test_path!(r#"‹«\\server\share\👉test\cool.rs»›"#);
+                test_path!(r#"‹«\\server\share\test\cool👉.rs»›"#);
+            }
+
+            mod issues {
+                #[test]
+                #[should_panic(
+                    expected = r#"Path = «C:\\test\\cool.rs», at grid cells (0, 0)..=(6, 0)"#
+                )]
+                fn issue_verbatim() {
+                    test_path!(r#"‹«\\?\C:\👉test\cool.rs»›"#);
+                    test_path!(r#"‹«\\?\C:\test\cool👉.rs»›"#);
+                }
+
+                #[test]
+                #[should_panic(
+                    expected = r#"Path = «\\\\server\\share\\test\\cool.rs», at grid cells (0, 0)..=(10, 2)"#
+                )]
+                fn issue_verbatim_unc() {
+                    test_path!(r#"‹«\\?\UNC\server\share\👉test\cool.rs»›"#);
+                    test_path!(r#"‹«\\?\UNC\server\share\test\cool👉.rs»›"#);
+                }
+            }
+        }
+    }
+
+    mod file_iri {
+        // File IRIs have a ton of use cases, most of which we currently do not support. A few of
+        // those cases are documented here as tests which are expected to fail.
+        // See https://en.wikipedia.org/wiki/File_URI_scheme
+
+        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
+        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
+        ///
+        macro_rules! test_file_iri {
+            ($file_iri:literal) => { { test_hyperlink!(concat!("‹«👉", $file_iri, "»›"); FileIri) } };
+            ($($columns:literal),+; $file_iri:literal) => { {
+                test_hyperlink!($($columns),+; concat!("‹«👉", $file_iri, "»›"); FileIri)
+            } };
+        }
+
+        #[cfg(not(target_os = "windows"))]
+        #[test]
+        fn absolute_file_iri() {
+            test_file_iri!("file:///test/cool/index.rs");
+            test_file_iri!("file:///test/cool/");
+        }
+
+        mod issues {
+            #[cfg(not(target_os = "windows"))]
+            #[test]
+            #[should_panic(expected = "Path = «/test/Ῥόδος/», at grid cells (0, 0)..=(15, 1)")]
+            fn issue_file_iri_with_percent_encoded_characters() {
+                // Non-space characters
+                // file:///test/Ῥόδος/
+                test_file_iri!("file:///test/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82/"); // URI
+
+                // Spaces
+                test_file_iri!("file:///te%20st/co%20ol/index.rs");
+                test_file_iri!("file:///te%20st/co%20ol/");
+            }
+        }
+
+        #[cfg(target_os = "windows")]
+        mod windows {
+            mod issues {
+                // The test uses Url::to_file_path(), but it seems that the Url crate doesn't
+                // support relative file IRIs.
+                #[test]
+                #[should_panic(
+                    expected = r#"Failed to interpret file IRI `file:/test/cool/index.rs` as a path"#
+                )]
+                fn issue_relative_file_iri() {
+                    test_file_iri!("file:/test/cool/index.rs");
+                    test_file_iri!("file:/test/cool/");
+                }
+
+                // See https://en.wikipedia.org/wiki/File_URI_scheme
+                #[test]
+                #[should_panic(
+                    expected = r#"Path = «C:\\test\\cool\\index.rs», at grid cells (0, 0)..=(9, 1)"#
+                )]
+                fn issue_absolute_file_iri() {
+                    test_file_iri!("file:///C:/test/cool/index.rs");
+                    test_file_iri!("file:///C:/test/cool/");
+                }
+
+                #[test]
+                #[should_panic(
+                    expected = r#"Path = «C:\\test\\Ῥόδος\\», at grid cells (0, 0)..=(16, 1)"#
+                )]
+                fn issue_file_iri_with_percent_encoded_characters() {
+                    // Non-space characters
+                    // file:///test/Ῥόδος/
+                    test_file_iri!("file:///C:/test/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82/"); // URI
+
+                    // Spaces
+                    test_file_iri!("file:///C:/te%20st/co%20ol/index.rs");
+                    test_file_iri!("file:///C:/te%20st/co%20ol/");
+                }
+            }
+        }
+    }
+
+    mod iri {
+        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
+        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
+        ///
+        macro_rules! test_iri {
+            ($iri:literal) => { { test_hyperlink!(concat!("‹«👉", $iri, "»›"); Iri) } };
+            ($($columns:literal),+; $iri:literal) => { {
+                test_hyperlink!($($columns),+; concat!("‹«👉", $iri, "»›"); Iri)
+            } };
+        }
+
+        #[test]
+        fn simple() {
+            // In the order they appear in URL_REGEX, except 'file://' which is treated as a path
+            test_iri!("ipfs://test/cool.ipfs");
+            test_iri!("ipns://test/cool.ipns");
+            test_iri!("magnet://test/cool.git");
+            test_iri!("mailto:someone@somewhere.here");
+            test_iri!("gemini://somewhere.here");
+            test_iri!("gopher://somewhere.here");
+            test_iri!("http://test/cool/index.html");
+            test_iri!("http://10.10.10.10:1111/cool.html");
+            test_iri!("http://test/cool/index.html?amazing=1");
+            test_iri!("http://test/cool/index.html#right%20here");
+            test_iri!("http://test/cool/index.html?amazing=1#right%20here");
+            test_iri!("https://test/cool/index.html");
+            test_iri!("https://10.10.10.10:1111/cool.html");
+            test_iri!("https://test/cool/index.html?amazing=1");
+            test_iri!("https://test/cool/index.html#right%20here");
+            test_iri!("https://test/cool/index.html?amazing=1#right%20here");
+            test_iri!("news://test/cool.news");
+            test_iri!("git://test/cool.git");
+            test_iri!("ssh://user@somewhere.over.here:12345/test/cool.git");
+            test_iri!("ftp://test/cool.ftp");
+        }
+
+        #[test]
+        fn wide_chars() {
+            // In the order they appear in URL_REGEX, except 'file://' which is treated as a path
+            test_iri!(4, 20; "ipfs://例🏃🦀/cool.ipfs");
+            test_iri!(4, 20; "ipns://例🏃🦀/cool.ipns");
+            test_iri!(6, 20; "magnet://例🏃🦀/cool.git");
+            test_iri!(4, 20; "mailto:someone@somewhere.here");
+            test_iri!(4, 20; "gemini://somewhere.here");
+            test_iri!(4, 20; "gopher://somewhere.here");
+            test_iri!(4, 20; "http://例🏃🦀/cool/index.html");
+            test_iri!(4, 20; "http://10.10.10.10:1111/cool.html");
+            test_iri!(4, 20; "http://例🏃🦀/cool/index.html?amazing=1");
+            test_iri!(4, 20; "http://例🏃🦀/cool/index.html#right%20here");
+            test_iri!(4, 20; "http://例🏃🦀/cool/index.html?amazing=1#right%20here");
+            test_iri!(4, 20; "https://例🏃🦀/cool/index.html");
+            test_iri!(4, 20; "https://10.10.10.10:1111/cool.html");
+            test_iri!(4, 20; "https://例🏃🦀/cool/index.html?amazing=1");
+            test_iri!(4, 20; "https://例🏃🦀/cool/index.html#right%20here");
+            test_iri!(4, 20; "https://例🏃🦀/cool/index.html?amazing=1#right%20here");
+            test_iri!(4, 20; "news://例🏃🦀/cool.news");
+            test_iri!(5, 20; "git://例/cool.git");
+            test_iri!(5, 20; "ssh://user@somewhere.over.here:12345/例🏃🦀/cool.git");
+            test_iri!(7, 20; "ftp://例🏃🦀/cool.ftp");
+        }
+
+        // There are likely more tests needed for IRI vs URI
+        #[test]
+        fn iris() {
+            // These refer to the same location, see example here:
+            // <https://en.wikipedia.org/wiki/Internationalized_Resource_Identifier#Compatibility>
+            test_iri!("https://en.wiktionary.org/wiki/Ῥόδος"); // IRI
+            test_iri!("https://en.wiktionary.org/wiki/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82"); // URI
+        }
+
+        #[test]
+        #[should_panic(expected = "Expected a path, but was a iri")]
+        fn file_is_a_path() {
+            test_iri!("file://test/cool/index.rs");
+        }
+    }
+
+    #[derive(Debug, PartialEq)]
+    enum HyperlinkKind {
+        FileIri,
+        Iri,
+        Path,
+    }
+
+    struct ExpectedHyperlink {
+        hovered_grid_point: AlacPoint,
+        hovered_char: char,
+        hyperlink_kind: HyperlinkKind,
+        iri_or_path: String,
+        row: Option<u32>,
+        column: Option<u32>,
+        hyperlink_match: RangeInclusive<AlacPoint>,
+    }
+
+    /// Converts to Windows style paths on Windows, like path!(), but at runtime for improved test
+    /// readability.
+    fn build_term_from_test_lines<'a>(
+        hyperlink_kind: HyperlinkKind,
+        term_size: TermSize,
+        test_lines: impl Iterator<Item = &'a str>,
+    ) -> (Term<VoidListener>, ExpectedHyperlink) {
+        #[derive(Default, Eq, PartialEq)]
+        enum HoveredState {
+            #[default]
+            HoveredScan,
+            HoveredNextChar,
+            Done,
+        }
+
+        #[derive(Default, Eq, PartialEq)]
+        enum MatchState {
+            #[default]
+            MatchScan,
+            MatchNextChar,
+            Match(AlacPoint),
+            Done,
+        }
+
+        #[derive(Default, Eq, PartialEq)]
+        enum CapturesState {
+            #[default]
+            PathScan,
+            PathNextChar,
+            Path(AlacPoint),
+            RowScan,
+            Row(String),
+            ColumnScan,
+            Column(String),
+            Done,
+        }
+
+        fn prev_input_point_from_term(term: &Term<VoidListener>) -> AlacPoint {
+            let grid = term.grid();
+            let cursor = &grid.cursor;
+            let mut point = cursor.point;
+
+            if !cursor.input_needs_wrap {
+                point.column -= 1;
+            }
+
+            if grid.index(point).flags.contains(Flags::WIDE_CHAR_SPACER) {
+                point.column -= 1;
+            }
+
+            point
+        }
+
+        let mut hovered_grid_point: Option<AlacPoint> = None;
+        let mut hyperlink_match = AlacPoint::default()..=AlacPoint::default();
+        let mut iri_or_path = String::default();
+        let mut row = None;
+        let mut column = None;
+        let mut prev_input_point = AlacPoint::default();
+        let mut hovered_state = HoveredState::default();
+        let mut match_state = MatchState::default();
+        let mut captures_state = CapturesState::default();
+        let mut term = Term::new(Config::default(), &term_size, VoidListener);
+
+        for text in test_lines {
+            let chars: Box<dyn Iterator<Item = char>> =
+                if cfg!(windows) && hyperlink_kind == HyperlinkKind::Path {
+                    Box::new(text.chars().map(|c| if c == '/' { '\\' } else { c })) as _
+                } else {
+                    Box::new(text.chars()) as _
+                };
+            let mut chars = chars.peekable();
+            while let Some(c) = chars.next() {
+                match c {
+                    '👉' => {
+                        hovered_state = HoveredState::HoveredNextChar;
+                    }
+                    '👈' => {
+                        hovered_grid_point = Some(prev_input_point.add(&term, Boundary::Grid, 1));
+                    }
+                    '«' | '»' => {
+                        captures_state = match captures_state {
+                            CapturesState::PathScan => CapturesState::PathNextChar,
+                            CapturesState::PathNextChar => {
+                                panic!("Should have been handled by char input")
+                            }
+                            CapturesState::Path(start_point) => {
+                                iri_or_path = term.bounds_to_string(start_point, prev_input_point);
+                                CapturesState::RowScan
+                            }
+                            CapturesState::RowScan => CapturesState::Row(String::new()),
+                            CapturesState::Row(number) => {
+                                row = Some(number.parse::<u32>().unwrap());
+                                CapturesState::ColumnScan
+                            }
+                            CapturesState::ColumnScan => CapturesState::Column(String::new()),
+                            CapturesState::Column(number) => {
+                                column = Some(number.parse::<u32>().unwrap());
+                                CapturesState::Done
+                            }
+                            CapturesState::Done => {
+                                panic!("Extra '«', '»'")
+                            }
+                        }
+                    }
+                    '‹' | '›' => {
+                        match_state = match match_state {
+                            MatchState::MatchScan => MatchState::MatchNextChar,
+                            MatchState::MatchNextChar => {
+                                panic!("Should have been handled by char input")
+                            }
+                            MatchState::Match(start_point) => {
+                                hyperlink_match = start_point..=prev_input_point;
+                                MatchState::Done
+                            }
+                            MatchState::Done => {
+                                panic!("Extra '‹', '›'")
+                            }
+                        }
+                    }
+                    _ => {
+                        if let CapturesState::Row(number) | CapturesState::Column(number) =
+                            &mut captures_state
+                        {
+                            number.push(c)
+                        }
+
+                        let is_windows_abs_path_start = captures_state
+                            == CapturesState::PathNextChar
+                            && cfg!(windows)
+                            && hyperlink_kind == HyperlinkKind::Path
+                            && c == '\\'
+                            && chars.peek().is_some_and(|c| *c != '\\');
+
+                        if is_windows_abs_path_start {
+                            // Convert Unix abs path start into Windows abs path start so that the
+                            // same test can be used for both OSes.
+                            term.input('C');
+                            prev_input_point = prev_input_point_from_term(&term);
+                            term.input(':');
+                            term.input(c);
+                        } else {
+                            term.input(c);
+                            prev_input_point = prev_input_point_from_term(&term);
+                        }
+
+                        if hovered_state == HoveredState::HoveredNextChar {
+                            hovered_grid_point = Some(prev_input_point);
+                            hovered_state = HoveredState::Done;
+                        }
+                        if captures_state == CapturesState::PathNextChar {
+                            captures_state = CapturesState::Path(prev_input_point);
+                        }
+                        if match_state == MatchState::MatchNextChar {
+                            match_state = MatchState::Match(prev_input_point);
+                        }
+                    }
+                }
+            }
+            term.move_down_and_cr(1);
+        }
+
+        if hyperlink_kind == HyperlinkKind::FileIri {
+            let Ok(url) = Url::parse(&iri_or_path) else {
+                panic!("Failed to parse file IRI `{iri_or_path}`");
+            };
+            let Ok(path) = url.to_file_path() else {
+                panic!("Failed to interpret file IRI `{iri_or_path}` as a path");
+            };
+            iri_or_path = path.to_string_lossy().to_string();
+        }
+
+        if cfg!(windows) {
+            // Handle verbatim and UNC paths for Windows
+            if let Some(stripped) = iri_or_path.strip_prefix(r#"\\?\UNC\"#) {
+                iri_or_path = format!(r#"\\{stripped}"#);
+            } else if let Some(stripped) = iri_or_path.strip_prefix(r#"\\?\"#) {
+                iri_or_path = stripped.to_string();
+            }
+        }
+
+        let hovered_grid_point = hovered_grid_point.expect("Missing hovered point (👉 or 👈)");
+        let hovered_char = term.grid().index(hovered_grid_point).c;
+        (
+            term,
+            ExpectedHyperlink {
+                hovered_grid_point,
+                hovered_char,
+                hyperlink_kind,
+                iri_or_path,
+                row,
+                column,
+                hyperlink_match,
+            },
+        )
+    }
+
+    fn line_cells_count(line: &str) -> usize {
+        // This avoids taking a dependency on the unicode-width crate
+        fn width(c: char) -> usize {
+            match c {
+                // Fullwidth unicode characters used in tests
+                '例' | '🏃' | '🦀' | '🔥' => 2,
+                _ => 1,
+            }
+        }
+        const CONTROL_CHARS: &str = "‹«👉👈»›";
+        line.chars()
+            .filter(|c| !CONTROL_CHARS.contains(*c))
+            .map(width)
+            .sum::<usize>()
+    }
+
+    struct CheckHyperlinkMatch<'a> {
+        term: &'a Term<VoidListener>,
+        expected_hyperlink: &'a ExpectedHyperlink,
+        source_location: &'a str,
+    }
+
+    impl<'a> CheckHyperlinkMatch<'a> {
+        fn new(
+            term: &'a Term<VoidListener>,
+            expected_hyperlink: &'a ExpectedHyperlink,
+            source_location: &'a str,
+        ) -> Self {
+            Self {
+                term,
+                expected_hyperlink,
+                source_location,
+            }
+        }
+
+        fn check_path_with_position_and_match(
+            &self,
+            path_with_position: PathWithPosition,
+            hyperlink_match: &Match,
+        ) {
+            let format_path_with_position_and_match =
+                |path_with_position: &PathWithPosition, hyperlink_match: &Match| {
+                    let mut result =
+                        format!("Path = «{}»", &path_with_position.path.to_string_lossy());
+                    if let Some(row) = path_with_position.row {
+                        result += &format!(", line = {row}");
+                        if let Some(column) = path_with_position.column {
+                            result += &format!(", column = {column}");
+                        }
+                    }
+
+                    result += &format!(
+                        ", at grid cells {}",
+                        Self::format_hyperlink_match(hyperlink_match)
+                    );
+                    result
+                };
+
+            assert_ne!(
+                self.expected_hyperlink.hyperlink_kind,
+                HyperlinkKind::Iri,
+                "\n    at {}\nExpected a path, but was a iri:\n{}",
+                self.source_location,
+                self.format_renderable_content()
+            );
+
+            assert_eq!(
+                format_path_with_position_and_match(
+                    &PathWithPosition {
+                        path: PathBuf::from(self.expected_hyperlink.iri_or_path.clone()),
+                        row: self.expected_hyperlink.row,
+                        column: self.expected_hyperlink.column
+                    },
+                    &self.expected_hyperlink.hyperlink_match
+                ),
+                format_path_with_position_and_match(&path_with_position, hyperlink_match),
+                "\n    at {}:\n{}",
+                self.source_location,
+                self.format_renderable_content()
+            );
+        }
+
+        fn check_iri_and_match(&self, iri: String, hyperlink_match: &Match) {
+            let format_iri_and_match = |iri: &String, hyperlink_match: &Match| {
+                format!(
+                    "Url = «{iri}», at grid cells {}",
+                    Self::format_hyperlink_match(hyperlink_match)
+                )
+            };
+
+            assert_eq!(
+                self.expected_hyperlink.hyperlink_kind,
+                HyperlinkKind::Iri,
+                "\n    at {}\nExpected a iri, but was a path:\n{}",
+                self.source_location,
+                self.format_renderable_content()
+            );
+
+            assert_eq!(
+                format_iri_and_match(
+                    &self.expected_hyperlink.iri_or_path,
+                    &self.expected_hyperlink.hyperlink_match
+                ),
+                format_iri_and_match(&iri, hyperlink_match),
+                "\n    at {}:\n{}",
+                self.source_location,
+                self.format_renderable_content()
+            );
+        }
+
+        fn format_hyperlink_match(hyperlink_match: &Match) -> String {
+            format!(
+                "({}, {})..=({}, {})",
+                hyperlink_match.start().line.0,
+                hyperlink_match.start().column.0,
+                hyperlink_match.end().line.0,
+                hyperlink_match.end().column.0
+            )
+        }
+
+        fn format_renderable_content(&self) -> String {
+            let mut result = format!("\nHovered on '{}'\n", self.expected_hyperlink.hovered_char);
+
+            let mut first_header_row = String::new();
+            let mut second_header_row = String::new();
+            let mut marker_header_row = String::new();
+            for index in 0..self.term.columns() {
+                let remainder = index % 10;
+                first_header_row.push_str(
+                    &(index > 0 && remainder == 0)
+                        .then_some((index / 10).to_string())
+                        .unwrap_or(" ".into()),
+                );
+                second_header_row += &remainder.to_string();
+                if index == self.expected_hyperlink.hovered_grid_point.column.0 {
+                    marker_header_row.push('↓');
+                } else {
+                    marker_header_row.push(' ');
+                }
+            }
+
+            result += &format!("\n      [{}]\n", first_header_row);
+            result += &format!("      [{}]\n", second_header_row);
+            result += &format!("       {}", marker_header_row);
+
+            let spacers: Flags = Flags::LEADING_WIDE_CHAR_SPACER | Flags::WIDE_CHAR_SPACER;
+            for cell in self
+                .term
+                .renderable_content()
+                .display_iter
+                .filter(|cell| !cell.flags.intersects(spacers))
+            {
+                if cell.point.column.0 == 0 {
+                    let prefix =
+                        if cell.point.line == self.expected_hyperlink.hovered_grid_point.line {
+                            '→'
+                        } else {
+                            ' '
+                        };
+                    result += &format!("\n{prefix}[{:>3}] ", cell.point.line.to_string());
+                }
+
+                result.push(cell.c);
+            }
+
+            result
+        }
+    }
+
+    fn test_hyperlink<'a>(
+        columns: usize,
+        total_cells: usize,
+        test_lines: impl Iterator<Item = &'a str>,
+        hyperlink_kind: HyperlinkKind,
+        source_location: &str,
+    ) {
+        thread_local! {
+            static TEST_REGEX_SEARCHES: RefCell<RegexSearches> = RefCell::new(RegexSearches::new());
+        }
+
+        let term_size = TermSize::new(columns, total_cells / columns + 2);
+        let (term, expected_hyperlink) =
+            build_term_from_test_lines(hyperlink_kind, term_size, test_lines);
+        let hyperlink_found = TEST_REGEX_SEARCHES.with(|regex_searches| {
+            find_from_grid_point(
+                &term,
+                expected_hyperlink.hovered_grid_point,
+                &mut regex_searches.borrow_mut(),
+            )
+        });
+        let check_hyperlink_match =
+            CheckHyperlinkMatch::new(&term, &expected_hyperlink, source_location);
+        match hyperlink_found {
+            Some((hyperlink_word, false, hyperlink_match)) => {
+                check_hyperlink_match.check_path_with_position_and_match(
+                    PathWithPosition::parse_str(&hyperlink_word),
+                    &hyperlink_match,
+                );
+            }
+            Some((hyperlink_word, true, hyperlink_match)) => {
+                check_hyperlink_match.check_iri_and_match(hyperlink_word, &hyperlink_match);
+            }
+            _ => {
+                assert!(
+                    false,
+                    "No hyperlink found\n     at {source_location}:\n{}",
+                    check_hyperlink_match.format_renderable_content()
+                )
+            }
+        }
+    }
+}

From 5f01f6d75fafce8012974f961645bc01e318c45f Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 8 Sep 2025 12:57:22 -0400
Subject: [PATCH 686/823] agent: Make read_file and edit_file tool call titles
 more specific (#37639)

For read_file and edit_file, show the worktree-relative path if there's
only one visible worktree, and the "full path" otherwise. Also restores
the display of line numbers for read_file calls.

Release Notes:

- N/A
---
 crates/agent2/src/tests/test_tools.rs         |  30 ++-
 crates/agent2/src/thread.rs                   |  22 +-
 .../src/tools/context_server_registry.rs      |   4 +-
 crates/agent2/src/tools/copy_path_tool.rs     |   6 +-
 .../agent2/src/tools/create_directory_tool.rs |   6 +-
 crates/agent2/src/tools/delete_path_tool.rs   |   6 +-
 crates/agent2/src/tools/diagnostics_tool.rs   |   6 +-
 crates/agent2/src/tools/edit_file_tool.rs     | 244 ++++++++++++------
 crates/agent2/src/tools/fetch_tool.rs         |   6 +-
 crates/agent2/src/tools/find_path_tool.rs     |   6 +-
 crates/agent2/src/tools/grep_tool.rs          |   6 +-
 .../agent2/src/tools/list_directory_tool.rs   |   6 +-
 crates/agent2/src/tools/move_path_tool.rs     |   6 +-
 crates/agent2/src/tools/now_tool.rs           |   6 +-
 crates/agent2/src/tools/open_tool.rs          |   8 +-
 crates/agent2/src/tools/read_file_tool.rs     |  89 ++++---
 crates/agent2/src/tools/terminal_tool.rs      |   8 +-
 crates/agent2/src/tools/thinking_tool.rs      |   6 +-
 crates/agent2/src/tools/web_search_tool.rs    |   6 +-
 crates/agent_ui/src/acp/thread_view.rs        |  56 ++--
 crates/markdown/src/markdown.rs               |  16 +-
 crates/project/src/project.rs                 |  17 ++
 22 files changed, 393 insertions(+), 173 deletions(-)

diff --git a/crates/agent2/src/tests/test_tools.rs b/crates/agent2/src/tests/test_tools.rs
index 27be7b6ac3..2275d23c2f 100644
--- a/crates/agent2/src/tests/test_tools.rs
+++ b/crates/agent2/src/tests/test_tools.rs
@@ -24,7 +24,11 @@ impl AgentTool for EchoTool {
         acp::ToolKind::Other
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "Echo".into()
     }
 
@@ -55,7 +59,11 @@ impl AgentTool for DelayTool {
         "delay"
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             format!("Delay {}ms", input.ms).into()
         } else {
@@ -100,7 +108,11 @@ impl AgentTool for ToolRequiringPermission {
         acp::ToolKind::Other
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "This tool requires permission".into()
     }
 
@@ -135,7 +147,11 @@ impl AgentTool for InfiniteTool {
         acp::ToolKind::Other
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "Infinite Tool".into()
     }
 
@@ -186,7 +202,11 @@ impl AgentTool for WordListTool {
         acp::ToolKind::Other
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "List of random words".into()
     }
 
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 6421e4982e..20c4cd0753 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -741,7 +741,7 @@ impl Thread {
             return;
         };
 
-        let title = tool.initial_title(tool_use.input.clone());
+        let title = tool.initial_title(tool_use.input.clone(), cx);
         let kind = tool.kind();
         stream.send_tool_call(&tool_use.id, title, kind, tool_use.input.clone());
 
@@ -1062,7 +1062,11 @@ impl Thread {
             self.action_log.clone(),
         ));
         self.add_tool(DiagnosticsTool::new(self.project.clone()));
-        self.add_tool(EditFileTool::new(cx.weak_entity(), language_registry));
+        self.add_tool(EditFileTool::new(
+            self.project.clone(),
+            cx.weak_entity(),
+            language_registry,
+        ));
         self.add_tool(FetchTool::new(self.project.read(cx).client().http_client()));
         self.add_tool(FindPathTool::new(self.project.clone()));
         self.add_tool(GrepTool::new(self.project.clone()));
@@ -1514,7 +1518,7 @@ impl Thread {
         let mut title = SharedString::from(&tool_use.name);
         let mut kind = acp::ToolKind::Other;
         if let Some(tool) = tool.as_ref() {
-            title = tool.initial_title(tool_use.input.clone());
+            title = tool.initial_title(tool_use.input.clone(), cx);
             kind = tool.kind();
         }
 
@@ -2148,7 +2152,11 @@ where
     fn kind() -> acp::ToolKind;
 
     /// The initial tool title to display. Can be updated during the tool run.
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString;
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        cx: &mut App,
+    ) -> SharedString;
 
     /// Returns the JSON schema that describes the tool's input.
     fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Schema {
@@ -2196,7 +2204,7 @@ pub trait AnyAgentTool {
     fn name(&self) -> SharedString;
     fn description(&self) -> SharedString;
     fn kind(&self) -> acp::ToolKind;
-    fn initial_title(&self, input: serde_json::Value) -> SharedString;
+    fn initial_title(&self, input: serde_json::Value, _cx: &mut App) -> SharedString;
     fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value>;
     fn supported_provider(&self, _provider: &LanguageModelProviderId) -> bool {
         true
@@ -2232,9 +2240,9 @@ where
         T::kind()
     }
 
-    fn initial_title(&self, input: serde_json::Value) -> SharedString {
+    fn initial_title(&self, input: serde_json::Value, _cx: &mut App) -> SharedString {
         let parsed_input = serde_json::from_value(input.clone()).map_err(|_| input);
-        self.0.initial_title(parsed_input)
+        self.0.initial_title(parsed_input, _cx)
     }
 
     fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
diff --git a/crates/agent2/src/tools/context_server_registry.rs b/crates/agent2/src/tools/context_server_registry.rs
index e13f47fb23..46fa029804 100644
--- a/crates/agent2/src/tools/context_server_registry.rs
+++ b/crates/agent2/src/tools/context_server_registry.rs
@@ -145,7 +145,7 @@ impl AnyAgentTool for ContextServerTool {
         ToolKind::Other
     }
 
-    fn initial_title(&self, _input: serde_json::Value) -> SharedString {
+    fn initial_title(&self, _input: serde_json::Value, _cx: &mut App) -> SharedString {
         format!("Run MCP tool `{}`", self.tool.name).into()
     }
 
@@ -176,7 +176,7 @@ impl AnyAgentTool for ContextServerTool {
             return Task::ready(Err(anyhow!("Context server not found")));
         };
         let tool_name = self.tool.name.clone();
-        let authorize = event_stream.authorize(self.initial_title(input.clone()), cx);
+        let authorize = event_stream.authorize(self.initial_title(input.clone(), cx), cx);
 
         cx.spawn(async move |_cx| {
             authorize.await?;
diff --git a/crates/agent2/src/tools/copy_path_tool.rs b/crates/agent2/src/tools/copy_path_tool.rs
index 819a6ff209..8fcd80391f 100644
--- a/crates/agent2/src/tools/copy_path_tool.rs
+++ b/crates/agent2/src/tools/copy_path_tool.rs
@@ -58,7 +58,11 @@ impl AgentTool for CopyPathTool {
         ToolKind::Move
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> ui::SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> ui::SharedString {
         if let Ok(input) = input {
             let src = MarkdownInlineCode(&input.source_path);
             let dest = MarkdownInlineCode(&input.destination_path);
diff --git a/crates/agent2/src/tools/create_directory_tool.rs b/crates/agent2/src/tools/create_directory_tool.rs
index 652363d5fa..30bd6418db 100644
--- a/crates/agent2/src/tools/create_directory_tool.rs
+++ b/crates/agent2/src/tools/create_directory_tool.rs
@@ -49,7 +49,11 @@ impl AgentTool for CreateDirectoryTool {
         ToolKind::Read
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             format!("Create directory {}", MarkdownInlineCode(&input.path)).into()
         } else {
diff --git a/crates/agent2/src/tools/delete_path_tool.rs b/crates/agent2/src/tools/delete_path_tool.rs
index 0f9641127f..01a77f5d81 100644
--- a/crates/agent2/src/tools/delete_path_tool.rs
+++ b/crates/agent2/src/tools/delete_path_tool.rs
@@ -52,7 +52,11 @@ impl AgentTool for DeletePathTool {
         ToolKind::Delete
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             format!("Delete “`{}`”", input.path).into()
         } else {
diff --git a/crates/agent2/src/tools/diagnostics_tool.rs b/crates/agent2/src/tools/diagnostics_tool.rs
index 558bb918ce..a38e317d43 100644
--- a/crates/agent2/src/tools/diagnostics_tool.rs
+++ b/crates/agent2/src/tools/diagnostics_tool.rs
@@ -71,7 +71,11 @@ impl AgentTool for DiagnosticsTool {
         acp::ToolKind::Read
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Some(path) = input.ok().and_then(|input| match input.path {
             Some(path) if !path.is_empty() => Some(path),
             _ => None,
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index ae37dc1f13..9237961bce 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -120,11 +120,17 @@ impl From<EditFileToolOutput> for LanguageModelToolResultContent {
 pub struct EditFileTool {
     thread: WeakEntity<Thread>,
     language_registry: Arc<LanguageRegistry>,
+    project: Entity<Project>,
 }
 
 impl EditFileTool {
-    pub fn new(thread: WeakEntity<Thread>, language_registry: Arc<LanguageRegistry>) -> Self {
+    pub fn new(
+        project: Entity<Project>,
+        thread: WeakEntity<Thread>,
+        language_registry: Arc<LanguageRegistry>,
+    ) -> Self {
         Self {
+            project,
             thread,
             language_registry,
         }
@@ -195,22 +201,50 @@ impl AgentTool for EditFileTool {
         acp::ToolKind::Edit
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        cx: &mut App,
+    ) -> SharedString {
         match input {
-            Ok(input) => input.display_description.into(),
+            Ok(input) => self
+                .project
+                .read(cx)
+                .find_project_path(&input.path, cx)
+                .and_then(|project_path| {
+                    self.project
+                        .read(cx)
+                        .short_full_path_for_project_path(&project_path, cx)
+                })
+                .unwrap_or(Path::new(&input.path).into())
+                .to_string_lossy()
+                .to_string()
+                .into(),
             Err(raw_input) => {
                 if let Some(input) =
                     serde_json::from_value::<EditFileToolPartialInput>(raw_input).ok()
                 {
+                    let path = input.path.trim();
+                    if !path.is_empty() {
+                        return self
+                            .project
+                            .read(cx)
+                            .find_project_path(&input.path, cx)
+                            .and_then(|project_path| {
+                                self.project
+                                    .read(cx)
+                                    .short_full_path_for_project_path(&project_path, cx)
+                            })
+                            .unwrap_or(Path::new(&input.path).into())
+                            .to_string_lossy()
+                            .to_string()
+                            .into();
+                    }
+
                     let description = input.display_description.trim();
                     if !description.is_empty() {
                         return description.to_string().into();
                     }
-
-                    let path = input.path.trim().to_string();
-                    if !path.is_empty() {
-                        return path.into();
-                    }
                 }
 
                 DEFAULT_UI_TEXT.into()
@@ -545,7 +579,7 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
-                project,
+                project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 Templates::new(),
@@ -560,11 +594,12 @@ mod tests {
                     path: "root/nonexistent_file.txt".into(),
                     mode: EditFileMode::Edit,
                 };
-                Arc::new(EditFileTool::new(thread.downgrade(), language_registry)).run(
-                    input,
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
+                Arc::new(EditFileTool::new(
+                    project,
+                    thread.downgrade(),
+                    language_registry,
+                ))
+                .run(input, ToolCallEventStream::test().0, cx)
             })
             .await;
         assert_eq!(
@@ -743,7 +778,7 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
-                project,
+                project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 Templates::new(),
@@ -775,6 +810,7 @@ mod tests {
                     mode: EditFileMode::Overwrite,
                 };
                 Arc::new(EditFileTool::new(
+                    project.clone(),
                     thread.downgrade(),
                     language_registry.clone(),
                 ))
@@ -833,11 +869,12 @@ mod tests {
                     path: "root/src/main.rs".into(),
                     mode: EditFileMode::Overwrite,
                 };
-                Arc::new(EditFileTool::new(thread.downgrade(), language_registry)).run(
-                    input,
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
+                Arc::new(EditFileTool::new(
+                    project.clone(),
+                    thread.downgrade(),
+                    language_registry,
+                ))
+                .run(input, ToolCallEventStream::test().0, cx)
             });
 
             // Stream the unformatted content
@@ -885,7 +922,7 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
-                project,
+                project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 Templates::new(),
@@ -918,6 +955,7 @@ mod tests {
                     mode: EditFileMode::Overwrite,
                 };
                 Arc::new(EditFileTool::new(
+                    project.clone(),
                     thread.downgrade(),
                     language_registry.clone(),
                 ))
@@ -969,11 +1007,12 @@ mod tests {
                     path: "root/src/main.rs".into(),
                     mode: EditFileMode::Overwrite,
                 };
-                Arc::new(EditFileTool::new(thread.downgrade(), language_registry)).run(
-                    input,
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
+                Arc::new(EditFileTool::new(
+                    project.clone(),
+                    thread.downgrade(),
+                    language_registry,
+                ))
+                .run(input, ToolCallEventStream::test().0, cx)
             });
 
             // Stream the content with trailing whitespace
@@ -1012,7 +1051,7 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
-                project,
+                project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 Templates::new(),
@@ -1020,7 +1059,11 @@ mod tests {
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
+        let tool = Arc::new(EditFileTool::new(
+            project.clone(),
+            thread.downgrade(),
+            language_registry,
+        ));
         fs.insert_tree("/root", json!({})).await;
 
         // Test 1: Path with .zed component should require confirmation
@@ -1148,7 +1191,7 @@ mod tests {
         let model = Arc::new(FakeLanguageModel::default());
         let thread = cx.new(|cx| {
             Thread::new(
-                project,
+                project.clone(),
                 cx.new(|_cx| ProjectContext::default()),
                 context_server_registry,
                 Templates::new(),
@@ -1156,7 +1199,11 @@ mod tests {
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
+        let tool = Arc::new(EditFileTool::new(
+            project.clone(),
+            thread.downgrade(),
+            language_registry,
+        ));
 
         // Test global config paths - these should require confirmation if they exist and are outside the project
         let test_cases = vec![
@@ -1264,7 +1311,11 @@ mod tests {
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
+        let tool = Arc::new(EditFileTool::new(
+            project.clone(),
+            thread.downgrade(),
+            language_registry,
+        ));
 
         // Test files in different worktrees
         let test_cases = vec![
@@ -1344,7 +1395,11 @@ mod tests {
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
+        let tool = Arc::new(EditFileTool::new(
+            project.clone(),
+            thread.downgrade(),
+            language_registry,
+        ));
 
         // Test edge cases
         let test_cases = vec![
@@ -1427,7 +1482,11 @@ mod tests {
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
+        let tool = Arc::new(EditFileTool::new(
+            project.clone(),
+            thread.downgrade(),
+            language_registry,
+        ));
 
         // Test different EditFileMode values
         let modes = vec![
@@ -1507,48 +1566,67 @@ mod tests {
                 cx,
             )
         });
-        let tool = Arc::new(EditFileTool::new(thread.downgrade(), language_registry));
+        let tool = Arc::new(EditFileTool::new(
+            project,
+            thread.downgrade(),
+            language_registry,
+        ));
 
-        assert_eq!(
-            tool.initial_title(Err(json!({
-                "path": "src/main.rs",
-                "display_description": "",
-                "old_string": "old code",
-                "new_string": "new code"
-            }))),
-            "src/main.rs"
-        );
-        assert_eq!(
-            tool.initial_title(Err(json!({
-                "path": "",
-                "display_description": "Fix error handling",
-                "old_string": "old code",
-                "new_string": "new code"
-            }))),
-            "Fix error handling"
-        );
-        assert_eq!(
-            tool.initial_title(Err(json!({
-                "path": "src/main.rs",
-                "display_description": "Fix error handling",
-                "old_string": "old code",
-                "new_string": "new code"
-            }))),
-            "Fix error handling"
-        );
-        assert_eq!(
-            tool.initial_title(Err(json!({
-                "path": "",
-                "display_description": "",
-                "old_string": "old code",
-                "new_string": "new code"
-            }))),
-            DEFAULT_UI_TEXT
-        );
-        assert_eq!(
-            tool.initial_title(Err(serde_json::Value::Null)),
-            DEFAULT_UI_TEXT
-        );
+        cx.update(|cx| {
+            // ...
+            assert_eq!(
+                tool.initial_title(
+                    Err(json!({
+                        "path": "src/main.rs",
+                        "display_description": "",
+                        "old_string": "old code",
+                        "new_string": "new code"
+                    })),
+                    cx
+                ),
+                "src/main.rs"
+            );
+            assert_eq!(
+                tool.initial_title(
+                    Err(json!({
+                        "path": "",
+                        "display_description": "Fix error handling",
+                        "old_string": "old code",
+                        "new_string": "new code"
+                    })),
+                    cx
+                ),
+                "Fix error handling"
+            );
+            assert_eq!(
+                tool.initial_title(
+                    Err(json!({
+                        "path": "src/main.rs",
+                        "display_description": "Fix error handling",
+                        "old_string": "old code",
+                        "new_string": "new code"
+                    })),
+                    cx
+                ),
+                "src/main.rs"
+            );
+            assert_eq!(
+                tool.initial_title(
+                    Err(json!({
+                        "path": "",
+                        "display_description": "",
+                        "old_string": "old code",
+                        "new_string": "new code"
+                    })),
+                    cx
+                ),
+                DEFAULT_UI_TEXT
+            );
+            assert_eq!(
+                tool.initial_title(Err(serde_json::Value::Null), cx),
+                DEFAULT_UI_TEXT
+            );
+        });
     }
 
     #[gpui::test]
@@ -1575,7 +1653,11 @@ mod tests {
 
         // Ensure the diff is finalized after the edit completes.
         {
-            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
+            let tool = Arc::new(EditFileTool::new(
+                project.clone(),
+                thread.downgrade(),
+                languages.clone(),
+            ));
             let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
             let edit = cx.update(|cx| {
                 tool.run(
@@ -1600,7 +1682,11 @@ mod tests {
         // Ensure the diff is finalized if an error occurs while editing.
         {
             model.forbid_requests();
-            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
+            let tool = Arc::new(EditFileTool::new(
+                project.clone(),
+                thread.downgrade(),
+                languages.clone(),
+            ));
             let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
             let edit = cx.update(|cx| {
                 tool.run(
@@ -1623,7 +1709,11 @@ mod tests {
 
         // Ensure the diff is finalized if the tool call gets dropped.
         {
-            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
+            let tool = Arc::new(EditFileTool::new(
+                project.clone(),
+                thread.downgrade(),
+                languages.clone(),
+            ));
             let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
             let edit = cx.update(|cx| {
                 tool.run(
diff --git a/crates/agent2/src/tools/fetch_tool.rs b/crates/agent2/src/tools/fetch_tool.rs
index dd97271a79..60654ac863 100644
--- a/crates/agent2/src/tools/fetch_tool.rs
+++ b/crates/agent2/src/tools/fetch_tool.rs
@@ -126,7 +126,11 @@ impl AgentTool for FetchTool {
         acp::ToolKind::Fetch
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         match input {
             Ok(input) => format!("Fetch {}", MarkdownEscaped(&input.url)).into(),
             Err(_) => "Fetch URL".into(),
diff --git a/crates/agent2/src/tools/find_path_tool.rs b/crates/agent2/src/tools/find_path_tool.rs
index 384bd56e77..735ec67cff 100644
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -93,7 +93,11 @@ impl AgentTool for FindPathTool {
         acp::ToolKind::Search
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         let mut title = "Find paths".to_string();
         if let Ok(input) = input {
             title.push_str(&format!(" matching “`{}`”", input.glob));
diff --git a/crates/agent2/src/tools/grep_tool.rs b/crates/agent2/src/tools/grep_tool.rs
index b24e773903..e76a16bcc7 100644
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -75,7 +75,11 @@ impl AgentTool for GrepTool {
         acp::ToolKind::Search
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         match input {
             Ok(input) => {
                 let page = input.page();
diff --git a/crates/agent2/src/tools/list_directory_tool.rs b/crates/agent2/src/tools/list_directory_tool.rs
index e6fa8d7431..0fbe23fe20 100644
--- a/crates/agent2/src/tools/list_directory_tool.rs
+++ b/crates/agent2/src/tools/list_directory_tool.rs
@@ -59,7 +59,11 @@ impl AgentTool for ListDirectoryTool {
         ToolKind::Read
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             let path = MarkdownInlineCode(&input.path);
             format!("List the {path} directory's contents").into()
diff --git a/crates/agent2/src/tools/move_path_tool.rs b/crates/agent2/src/tools/move_path_tool.rs
index d9fb60651b..91880c1243 100644
--- a/crates/agent2/src/tools/move_path_tool.rs
+++ b/crates/agent2/src/tools/move_path_tool.rs
@@ -60,7 +60,11 @@ impl AgentTool for MovePathTool {
         ToolKind::Move
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             let src = MarkdownInlineCode(&input.source_path);
             let dest = MarkdownInlineCode(&input.destination_path);
diff --git a/crates/agent2/src/tools/now_tool.rs b/crates/agent2/src/tools/now_tool.rs
index 49068be0dd..3387c0a617 100644
--- a/crates/agent2/src/tools/now_tool.rs
+++ b/crates/agent2/src/tools/now_tool.rs
@@ -41,7 +41,11 @@ impl AgentTool for NowTool {
         acp::ToolKind::Other
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "Get current time".into()
     }
 
diff --git a/crates/agent2/src/tools/open_tool.rs b/crates/agent2/src/tools/open_tool.rs
index df7b04c787..595a9f380b 100644
--- a/crates/agent2/src/tools/open_tool.rs
+++ b/crates/agent2/src/tools/open_tool.rs
@@ -45,7 +45,11 @@ impl AgentTool for OpenTool {
         ToolKind::Execute
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             format!("Open `{}`", MarkdownEscaped(&input.path_or_url)).into()
         } else {
@@ -61,7 +65,7 @@ impl AgentTool for OpenTool {
     ) -> Task<Result<Self::Output>> {
         // If path_or_url turns out to be a path in the project, make it absolute.
         let abs_path = to_absolute_path(&input.path_or_url, self.project.clone(), cx);
-        let authorize = event_stream.authorize(self.initial_title(Ok(input.clone())), cx);
+        let authorize = event_stream.authorize(self.initial_title(Ok(input.clone()), cx), cx);
         cx.background_spawn(async move {
             authorize.await?;
 
diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index e771c26eca..99f145901c 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -10,7 +10,7 @@ use project::{AgentLocation, ImageItem, Project, WorktreeSettings, image_store};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
-use std::{path::Path, sync::Arc};
+use std::sync::Arc;
 use util::markdown::MarkdownCodeBlock;
 
 use crate::{AgentTool, ToolCallEventStream};
@@ -68,13 +68,31 @@ impl AgentTool for ReadFileTool {
         acp::ToolKind::Read
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
-        input
-            .ok()
-            .as_ref()
-            .and_then(|input| Path::new(&input.path).file_name())
-            .map(|file_name| file_name.to_string_lossy().to_string().into())
-            .unwrap_or_default()
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        cx: &mut App,
+    ) -> SharedString {
+        if let Ok(input) = input
+            && let Some(project_path) = self.project.read(cx).find_project_path(&input.path, cx)
+            && let Some(path) = self
+                .project
+                .read(cx)
+                .short_full_path_for_project_path(&project_path, cx)
+        {
+            match (input.start_line, input.end_line) {
+                (Some(start), Some(end)) => {
+                    format!("Read file `{}` (lines {}-{})", path.display(), start, end,)
+                }
+                (Some(start), None) => {
+                    format!("Read file `{}` (from line {})", path.display(), start)
+                }
+                _ => format!("Read file `{}`", path.display()),
+            }
+            .into()
+        } else {
+            "Read file".into()
+        }
     }
 
     fn run(
@@ -86,6 +104,12 @@ impl AgentTool for ReadFileTool {
         let Some(project_path) = self.project.read(cx).find_project_path(&input.path, cx) else {
             return Task::ready(Err(anyhow!("Path {} not found in project", &input.path)));
         };
+        let Some(abs_path) = self.project.read(cx).absolute_path(&project_path, cx) else {
+            return Task::ready(Err(anyhow!(
+                "Failed to convert {} to absolute path",
+                &input.path
+            )));
+        };
 
         // Error out if this path is either excluded or private in global settings
         let global_settings = WorktreeSettings::get_global(cx);
@@ -121,6 +145,14 @@ impl AgentTool for ReadFileTool {
 
         let file_path = input.path.clone();
 
+        event_stream.update_fields(ToolCallUpdateFields {
+            locations: Some(vec![acp::ToolCallLocation {
+                path: abs_path,
+                line: input.start_line.map(|line| line.saturating_sub(1)),
+            }]),
+            ..Default::default()
+        });
+
         if image_store::is_image_file(&self.project, &project_path, cx) {
             return cx.spawn(async move |cx| {
                 let image_entity: Entity<ImageItem> = cx
@@ -229,34 +261,25 @@ impl AgentTool for ReadFileTool {
             };
 
             project.update(cx, |project, cx| {
-                if let Some(abs_path) = project.absolute_path(&project_path, cx) {
-                    project.set_agent_location(
-                        Some(AgentLocation {
-                            buffer: buffer.downgrade(),
-                            position: anchor.unwrap_or(text::Anchor::MIN),
-                        }),
-                        cx,
-                    );
+                project.set_agent_location(
+                    Some(AgentLocation {
+                        buffer: buffer.downgrade(),
+                        position: anchor.unwrap_or(text::Anchor::MIN),
+                    }),
+                    cx,
+                );
+                if let Ok(LanguageModelToolResultContent::Text(text)) = &result {
+                    let markdown = MarkdownCodeBlock {
+                        tag: &input.path,
+                        text,
+                    }
+                    .to_string();
                     event_stream.update_fields(ToolCallUpdateFields {
-                        locations: Some(vec![acp::ToolCallLocation {
-                            path: abs_path,
-                            line: input.start_line.map(|line| line.saturating_sub(1)),
+                        content: Some(vec![acp::ToolCallContent::Content {
+                            content: markdown.into(),
                         }]),
                         ..Default::default()
-                    });
-                    if let Ok(LanguageModelToolResultContent::Text(text)) = &result {
-                        let markdown = MarkdownCodeBlock {
-                            tag: &input.path,
-                            text,
-                        }
-                        .to_string();
-                        event_stream.update_fields(ToolCallUpdateFields {
-                            content: Some(vec![acp::ToolCallContent::Content {
-                                content: markdown.into(),
-                            }]),
-                            ..Default::default()
-                        })
-                    }
+                    })
                 }
             })?;
 
diff --git a/crates/agent2/src/tools/terminal_tool.rs b/crates/agent2/src/tools/terminal_tool.rs
index 9ed585b138..7acfc24550 100644
--- a/crates/agent2/src/tools/terminal_tool.rs
+++ b/crates/agent2/src/tools/terminal_tool.rs
@@ -60,7 +60,11 @@ impl AgentTool for TerminalTool {
         acp::ToolKind::Execute
     }
 
-    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         if let Ok(input) = input {
             let mut lines = input.command.lines();
             let first_line = lines.next().unwrap_or_default();
@@ -93,7 +97,7 @@ impl AgentTool for TerminalTool {
             Err(err) => return Task::ready(Err(err)),
         };
 
-        let authorize = event_stream.authorize(self.initial_title(Ok(input.clone())), cx);
+        let authorize = event_stream.authorize(self.initial_title(Ok(input.clone()), cx), cx);
         cx.spawn(async move |cx| {
             authorize.await?;
 
diff --git a/crates/agent2/src/tools/thinking_tool.rs b/crates/agent2/src/tools/thinking_tool.rs
index 61fb9eb0d6..0a68f7545f 100644
--- a/crates/agent2/src/tools/thinking_tool.rs
+++ b/crates/agent2/src/tools/thinking_tool.rs
@@ -29,7 +29,11 @@ impl AgentTool for ThinkingTool {
         acp::ToolKind::Think
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "Thinking".into()
     }
 
diff --git a/crates/agent2/src/tools/web_search_tool.rs b/crates/agent2/src/tools/web_search_tool.rs
index d7a34bec29..ce26bccdde 100644
--- a/crates/agent2/src/tools/web_search_tool.rs
+++ b/crates/agent2/src/tools/web_search_tool.rs
@@ -48,7 +48,11 @@ impl AgentTool for WebSearchTool {
         acp::ToolKind::Fetch
     }
 
-    fn initial_title(&self, _input: Result<Self::Input, serde_json::Value>) -> SharedString {
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
         "Searching the Web".into()
     }
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index d635918c19..bd7a9a1479 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -2024,35 +2024,34 @@ impl AcpThreadView {
         window: &Window,
         cx: &Context<Self>,
     ) -> Div {
+        let has_location = tool_call.locations.len() == 1;
         let card_header_id = SharedString::from("inner-tool-call-header");
 
-        let tool_icon =
-            if tool_call.kind == acp::ToolKind::Edit && tool_call.locations.len() == 1 {
-                FileIcons::get_icon(&tool_call.locations[0].path, cx)
-                    .map(Icon::from_path)
-                    .unwrap_or(Icon::new(IconName::ToolPencil))
-            } else {
-                Icon::new(match tool_call.kind {
-                    acp::ToolKind::Read => IconName::ToolSearch,
-                    acp::ToolKind::Edit => IconName::ToolPencil,
-                    acp::ToolKind::Delete => IconName::ToolDeleteFile,
-                    acp::ToolKind::Move => IconName::ArrowRightLeft,
-                    acp::ToolKind::Search => IconName::ToolSearch,
-                    acp::ToolKind::Execute => IconName::ToolTerminal,
-                    acp::ToolKind::Think => IconName::ToolThink,
-                    acp::ToolKind::Fetch => IconName::ToolWeb,
-                    acp::ToolKind::Other => IconName::ToolHammer,
-                })
-            }
-            .size(IconSize::Small)
-            .color(Color::Muted);
+        let tool_icon = if tool_call.kind == acp::ToolKind::Edit && has_location {
+            FileIcons::get_icon(&tool_call.locations[0].path, cx)
+                .map(Icon::from_path)
+                .unwrap_or(Icon::new(IconName::ToolPencil))
+        } else {
+            Icon::new(match tool_call.kind {
+                acp::ToolKind::Read => IconName::ToolSearch,
+                acp::ToolKind::Edit => IconName::ToolPencil,
+                acp::ToolKind::Delete => IconName::ToolDeleteFile,
+                acp::ToolKind::Move => IconName::ArrowRightLeft,
+                acp::ToolKind::Search => IconName::ToolSearch,
+                acp::ToolKind::Execute => IconName::ToolTerminal,
+                acp::ToolKind::Think => IconName::ToolThink,
+                acp::ToolKind::Fetch => IconName::ToolWeb,
+                acp::ToolKind::Other => IconName::ToolHammer,
+            })
+        }
+        .size(IconSize::Small)
+        .color(Color::Muted);
 
         let failed_or_canceled = match &tool_call.status {
             ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
             _ => false,
         };
 
-        let has_location = tool_call.locations.len() == 1;
         let needs_confirmation = matches!(
             tool_call.status,
             ToolCallStatus::WaitingForConfirmation { .. }
@@ -2195,13 +2194,6 @@ impl AcpThreadView {
                             .overflow_hidden()
                             .child(tool_icon)
                             .child(if has_location {
-                                let name = tool_call.locations[0]
-                                    .path
-                                    .file_name()
-                                    .unwrap_or_default()
-                                    .display()
-                                    .to_string();
-
                                 h_flex()
                                     .id(("open-tool-call-location", entry_ix))
                                     .w_full()
@@ -2212,7 +2204,13 @@ impl AcpThreadView {
                                             this.text_color(cx.theme().colors().text_muted)
                                         }
                                     })
-                                    .child(name)
+                                    .child(self.render_markdown(
+                                        tool_call.label.clone(),
+                                        MarkdownStyle {
+                                            prevent_mouse_interaction: true,
+                                            ..default_markdown_style(false, true, window, cx)
+                                        },
+                                    ))
                                     .tooltip(Tooltip::text("Jump to File"))
                                     .on_click(cx.listener(move |this, _, window, cx| {
                                         this.open_tool_call_location(entry_ix, 0, window, cx);
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
index 1f607a033a..4e1d3ac51e 100644
--- a/crates/markdown/src/markdown.rs
+++ b/crates/markdown/src/markdown.rs
@@ -69,6 +69,7 @@ pub struct MarkdownStyle {
     pub heading_level_styles: Option<HeadingLevelStyles>,
     pub table_overflow_x_scroll: bool,
     pub height_is_multiple_of_line_height: bool,
+    pub prevent_mouse_interaction: bool,
 }
 
 impl Default for MarkdownStyle {
@@ -89,6 +90,7 @@ impl Default for MarkdownStyle {
             heading_level_styles: None,
             table_overflow_x_scroll: false,
             height_is_multiple_of_line_height: false,
+            prevent_mouse_interaction: false,
         }
     }
 }
@@ -575,16 +577,22 @@ impl MarkdownElement {
         window: &mut Window,
         cx: &mut App,
     ) {
+        if self.style.prevent_mouse_interaction {
+            return;
+        }
+
         let is_hovering_link = hitbox.is_hovered(window)
             && !self.markdown.read(cx).selection.pending
             && rendered_text
                 .link_for_position(window.mouse_position())
                 .is_some();
 
-        if is_hovering_link {
-            window.set_cursor_style(CursorStyle::PointingHand, hitbox);
-        } else {
-            window.set_cursor_style(CursorStyle::IBeam, hitbox);
+        if !self.style.prevent_mouse_interaction {
+            if is_hovering_link {
+                window.set_cursor_style(CursorStyle::PointingHand, hitbox);
+            } else {
+                window.set_cursor_style(CursorStyle::IBeam, hitbox);
+            }
         }
 
         let on_open_url = self.on_url_click.take();
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 6b85726aed..a2bd4ee7b7 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -4497,6 +4497,23 @@ impl Project {
         None
     }
 
+    /// If there's only one visible worktree, returns the given worktree-relative path with no prefix.
+    ///
+    /// Otherwise, returns the full path for the project path (obtained by prefixing the worktree-relative path with the name of the worktree).
+    pub fn short_full_path_for_project_path(
+        &self,
+        project_path: &ProjectPath,
+        cx: &App,
+    ) -> Option<PathBuf> {
+        if self.visible_worktrees(cx).take(2).count() < 2 {
+            return Some(project_path.path.to_path_buf());
+        }
+        self.worktree_for_id(project_path.worktree_id, cx)
+            .and_then(|worktree| {
+                Some(Path::new(worktree.read(cx).abs_path().file_name()?).join(&project_path.path))
+            })
+    }
+
     pub fn project_path_for_absolute_path(&self, abs_path: &Path, cx: &App) -> Option<ProjectPath> {
         self.find_worktree(abs_path, cx)
             .map(|(worktree, relative_path)| ProjectPath {

From 99102a84fa30b235f6e383b20246a96f5a6a103f Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 8 Sep 2025 14:19:41 -0400
Subject: [PATCH 687/823] ACP over SSH (#37725)

This PR adds support for using external agents in SSH projects via ACP,
including automatic installation of Gemini CLI and Claude Code,
authentication with API keys (for Gemini) and CLI login, and custom
agents from user configuration.

Co-authored-by: maan2003 <manmeetmann2003@gmail.com>

Release Notes:

- agent: Gemini CLI, Claude Code, and custom external agents can now be
used in SSH projects.

---------

Co-authored-by: maan2003 <manmeetmann2003@gmail.com>
---
 Cargo.lock                                   |    9 +-
 crates/acp_thread/src/acp_thread.rs          |    2 +-
 crates/agent2/src/native_agent_server.rs     |   14 +-
 crates/agent_servers/Cargo.toml              |    6 +-
 crates/agent_servers/src/acp.rs              |   75 +-
 crates/agent_servers/src/agent_servers.rs    |  337 +-----
 crates/agent_servers/src/claude.rs           |  117 +-
 crates/agent_servers/src/custom.rs           |   46 +-
 crates/agent_servers/src/e2e_tests.rs        |   20 +-
 crates/agent_servers/src/gemini.rs           |  164 +--
 crates/agent_servers/src/settings.rs         |  110 --
 crates/agent_ui/src/acp/message_editor.rs    |   11 +-
 crates/agent_ui/src/acp/thread_view.rs       |  155 +--
 crates/agent_ui/src/agent_configuration.rs   |   34 +-
 crates/agent_ui/src/agent_panel.rs           |   52 +-
 crates/agent_ui/src/agent_ui.rs              |   17 +-
 crates/project/Cargo.toml                    |    2 +
 crates/project/src/agent_server_store.rs     | 1091 ++++++++++++++++++
 crates/project/src/project.rs                |   27 +-
 crates/proto/proto/ai.proto                  |   33 +
 crates/proto/proto/debugger.proto            |    9 +-
 crates/proto/proto/task.proto                |    8 +
 crates/proto/proto/zed.proto                 |   10 +-
 crates/proto/src/proto.rs                    |   12 +-
 crates/remote_server/src/headless_project.rs |   14 +-
 crates/zed/Cargo.toml                        |    1 -
 crates/zed/src/main.rs                       |    1 -
 27 files changed, 1538 insertions(+), 839 deletions(-)
 delete mode 100644 crates/agent_servers/src/settings.rs
 create mode 100644 crates/project/src/agent_server_store.rs

diff --git a/Cargo.lock b/Cargo.lock
index 49dcb57ef1..09106277c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -308,22 +308,18 @@ dependencies = [
  "libc",
  "log",
  "nix 0.29.0",
- "node_runtime",
- "paths",
  "project",
  "reqwest_client",
- "schemars",
- "semver",
  "serde",
  "serde_json",
  "settings",
  "smol",
+ "task",
  "tempfile",
  "thiserror 2.0.12",
  "ui",
  "util",
  "watch",
- "which 6.0.3",
  "workspace-hack",
 ]
 
@@ -12605,6 +12601,7 @@ dependencies = [
  "remote",
  "rpc",
  "schemars",
+ "semver",
  "serde",
  "serde_json",
  "settings",
@@ -12624,6 +12621,7 @@ dependencies = [
  "unindent",
  "url",
  "util",
+ "watch",
  "which 6.0.3",
  "workspace-hack",
  "worktree",
@@ -20367,7 +20365,6 @@ dependencies = [
  "acp_tools",
  "activity_indicator",
  "agent",
- "agent_servers",
  "agent_settings",
  "agent_ui",
  "anyhow",
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index a3a8e31230..8afa466bb6 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2758,7 +2758,7 @@ mod tests {
         }));
 
         let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new("/test"), cx))
+            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
             .await
             .unwrap();
 
diff --git a/crates/agent2/src/native_agent_server.rs b/crates/agent2/src/native_agent_server.rs
index 030d2cce74..0dde0ff985 100644
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@@ -35,10 +35,15 @@ impl AgentServer for NativeAgentServer {
 
     fn connect(
         &self,
-        _root_dir: &Path,
+        _root_dir: Option<&Path>,
         delegate: AgentServerDelegate,
         cx: &mut App,
-    ) -> Task<Result<Rc<dyn acp_thread::AgentConnection>>> {
+    ) -> Task<
+        Result<(
+            Rc<dyn acp_thread::AgentConnection>,
+            Option<task::SpawnInTerminal>,
+        )>,
+    > {
         log::debug!(
             "NativeAgentServer::connect called for path: {:?}",
             _root_dir
@@ -60,7 +65,10 @@ impl AgentServer for NativeAgentServer {
             let connection = NativeAgentConnection(agent);
             log::debug!("NativeAgentServer connection established successfully");
 
-            Ok(Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>)
+            Ok((
+                Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>,
+                None,
+            ))
         })
     }
 
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 222feb9aaa..2a601dcb16 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -35,22 +35,18 @@ language.workspace = true
 language_model.workspace = true
 language_models.workspace = true
 log.workspace = true
-node_runtime.workspace = true
-paths.workspace = true
 project.workspace = true
 reqwest_client = { workspace = true, optional = true }
-schemars.workspace = true
-semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+task.workspace = true
 tempfile.workspace = true
 thiserror.workspace = true
 ui.workspace = true
 util.workspace = true
 watch.workspace = true
-which.workspace = true
 workspace-hack.workspace = true
 
 [target.'cfg(unix)'.dependencies]
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 7991c1e3cc..191bae066c 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -1,4 +1,3 @@
-use crate::AgentServerCommand;
 use acp_thread::AgentConnection;
 use acp_tools::AcpConnectionRegistry;
 use action_log::ActionLog;
@@ -8,8 +7,10 @@ use collections::HashMap;
 use futures::AsyncBufReadExt as _;
 use futures::io::BufReader;
 use project::Project;
+use project::agent_server_store::AgentServerCommand;
 use serde::Deserialize;
 
+use std::path::PathBuf;
 use std::{any::Any, cell::RefCell};
 use std::{path::Path, rc::Rc};
 use thiserror::Error;
@@ -29,6 +30,7 @@ pub struct AcpConnection {
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
     agent_capabilities: acp::AgentCapabilities,
+    root_dir: PathBuf,
     _io_task: Task<Result<()>>,
     _wait_task: Task<Result<()>>,
     _stderr_task: Task<Result<()>>,
@@ -43,9 +45,10 @@ pub async fn connect(
     server_name: SharedString,
     command: AgentServerCommand,
     root_dir: &Path,
+    is_remote: bool,
     cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
-    let conn = AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await?;
+    let conn = AcpConnection::stdio(server_name, command.clone(), root_dir, is_remote, cx).await?;
     Ok(Rc::new(conn) as _)
 }
 
@@ -56,17 +59,21 @@ impl AcpConnection {
         server_name: SharedString,
         command: AgentServerCommand,
         root_dir: &Path,
+        is_remote: bool,
         cx: &mut AsyncApp,
     ) -> Result<Self> {
-        let mut child = util::command::new_smol_command(command.path)
+        let mut child = util::command::new_smol_command(command.path);
+        child
             .args(command.args.iter().map(|arg| arg.as_str()))
             .envs(command.env.iter().flatten())
-            .current_dir(root_dir)
             .stdin(std::process::Stdio::piped())
             .stdout(std::process::Stdio::piped())
             .stderr(std::process::Stdio::piped())
-            .kill_on_drop(true)
-            .spawn()?;
+            .kill_on_drop(true);
+        if !is_remote {
+            child.current_dir(root_dir);
+        }
+        let mut child = child.spawn()?;
 
         let stdout = child.stdout.take().context("Failed to take stdout")?;
         let stdin = child.stdin.take().context("Failed to take stdin")?;
@@ -145,6 +152,7 @@ impl AcpConnection {
 
         Ok(Self {
             auth_methods: response.auth_methods,
+            root_dir: root_dir.to_owned(),
             connection,
             server_name,
             sessions,
@@ -158,6 +166,10 @@ impl AcpConnection {
     pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {
         &self.agent_capabilities.prompt_capabilities
     }
+
+    pub fn root_dir(&self) -> &Path {
+        &self.root_dir
+    }
 }
 
 impl AgentConnection for AcpConnection {
@@ -171,29 +183,36 @@ impl AgentConnection for AcpConnection {
         let sessions = self.sessions.clone();
         let cwd = cwd.to_path_buf();
         let context_server_store = project.read(cx).context_server_store().read(cx);
-        let mcp_servers = context_server_store
-            .configured_server_ids()
-            .iter()
-            .filter_map(|id| {
-                let configuration = context_server_store.configuration_for_server(id)?;
-                let command = configuration.command();
-                Some(acp::McpServer {
-                    name: id.0.to_string(),
-                    command: command.path.clone(),
-                    args: command.args.clone(),
-                    env: if let Some(env) = command.env.as_ref() {
-                        env.iter()
-                            .map(|(name, value)| acp::EnvVariable {
-                                name: name.clone(),
-                                value: value.clone(),
-                            })
-                            .collect()
-                    } else {
-                        vec![]
-                    },
+        let mcp_servers = if project.read(cx).is_local() {
+            context_server_store
+                .configured_server_ids()
+                .iter()
+                .filter_map(|id| {
+                    let configuration = context_server_store.configuration_for_server(id)?;
+                    let command = configuration.command();
+                    Some(acp::McpServer {
+                        name: id.0.to_string(),
+                        command: command.path.clone(),
+                        args: command.args.clone(),
+                        env: if let Some(env) = command.env.as_ref() {
+                            env.iter()
+                                .map(|(name, value)| acp::EnvVariable {
+                                    name: name.clone(),
+                                    value: value.clone(),
+                                })
+                                .collect()
+                        } else {
+                            vec![]
+                        },
+                    })
                 })
-            })
-            .collect();
+                .collect()
+        } else {
+            // In SSH projects, the external agent is running on the remote
+            // machine, and currently we only run MCP servers on the local
+            // machine. So don't pass any MCP servers to the agent in that case.
+            Vec::new()
+        };
 
         cx.spawn(async move |cx| {
             let response = conn
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index e214dabfc7..7f11d8ce93 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -2,47 +2,25 @@ mod acp;
 mod claude;
 mod custom;
 mod gemini;
-mod settings;
 
 #[cfg(any(test, feature = "test-support"))]
 pub mod e2e_tests;
 
-use anyhow::Context as _;
 pub use claude::*;
 pub use custom::*;
-use fs::Fs;
-use fs::RemoveOptions;
-use fs::RenameOptions;
-use futures::StreamExt as _;
 pub use gemini::*;
-use gpui::AppContext;
-use node_runtime::NodeRuntime;
-pub use settings::*;
+use project::agent_server_store::AgentServerStore;
 
 use acp_thread::AgentConnection;
-use acp_thread::LoadError;
 use anyhow::Result;
-use anyhow::anyhow;
-use collections::HashMap;
-use gpui::{App, AsyncApp, Entity, SharedString, Task};
+use gpui::{App, Entity, SharedString, Task};
 use project::Project;
-use schemars::JsonSchema;
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use std::str::FromStr as _;
-use std::{
-    any::Any,
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-};
-use util::ResultExt as _;
+use std::{any::Any, path::Path, rc::Rc};
 
-pub fn init(cx: &mut App) {
-    settings::init(cx);
-}
+pub use acp::AcpConnection;
 
 pub struct AgentServerDelegate {
+    store: Entity<AgentServerStore>,
     project: Entity<Project>,
     status_tx: Option<watch::Sender<SharedString>>,
     new_version_available: Option<watch::Sender<Option<String>>>,
@@ -50,11 +28,13 @@ pub struct AgentServerDelegate {
 
 impl AgentServerDelegate {
     pub fn new(
+        store: Entity<AgentServerStore>,
         project: Entity<Project>,
         status_tx: Option<watch::Sender<SharedString>>,
         new_version_tx: Option<watch::Sender<Option<String>>>,
     ) -> Self {
         Self {
+            store,
             project,
             status_tx,
             new_version_available: new_version_tx,
@@ -64,188 +44,6 @@ impl AgentServerDelegate {
     pub fn project(&self) -> &Entity<Project> {
         &self.project
     }
-
-    fn get_or_npm_install_builtin_agent(
-        self,
-        binary_name: SharedString,
-        package_name: SharedString,
-        entrypoint_path: PathBuf,
-        ignore_system_version: bool,
-        minimum_version: Option<Version>,
-        cx: &mut App,
-    ) -> Task<Result<AgentServerCommand>> {
-        let project = self.project;
-        let fs = project.read(cx).fs().clone();
-        let Some(node_runtime) = project.read(cx).node_runtime().cloned() else {
-            return Task::ready(Err(anyhow!(
-                "External agents are not yet available in remote projects."
-            )));
-        };
-        let status_tx = self.status_tx;
-        let new_version_available = self.new_version_available;
-
-        cx.spawn(async move |cx| {
-            if !ignore_system_version {
-                if let Some(bin) = find_bin_in_path(binary_name.clone(), &project, cx).await {
-                    return Ok(AgentServerCommand {
-                        path: bin,
-                        args: Vec::new(),
-                        env: Default::default(),
-                    });
-                }
-            }
-
-            cx.spawn(async move |cx| {
-                let node_path = node_runtime.binary_path().await?;
-                let dir = paths::data_dir()
-                    .join("external_agents")
-                    .join(binary_name.as_str());
-                fs.create_dir(&dir).await?;
-
-                let mut stream = fs.read_dir(&dir).await?;
-                let mut versions = Vec::new();
-                let mut to_delete = Vec::new();
-                while let Some(entry) = stream.next().await {
-                    let Ok(entry) = entry else { continue };
-                    let Some(file_name) = entry.file_name() else {
-                        continue;
-                    };
-
-                    if let Some(name) = file_name.to_str()
-                        && let Some(version) = semver::Version::from_str(name).ok()
-                        && fs
-                            .is_file(&dir.join(file_name).join(&entrypoint_path))
-                            .await
-                    {
-                        versions.push((version, file_name.to_owned()));
-                    } else {
-                        to_delete.push(file_name.to_owned())
-                    }
-                }
-
-                versions.sort();
-                let newest_version = if let Some((version, file_name)) = versions.last().cloned()
-                    && minimum_version.is_none_or(|minimum_version| version >= minimum_version)
-                {
-                    versions.pop();
-                    Some(file_name)
-                } else {
-                    None
-                };
-                log::debug!("existing version of {package_name}: {newest_version:?}");
-                to_delete.extend(versions.into_iter().map(|(_, file_name)| file_name));
-
-                cx.background_spawn({
-                    let fs = fs.clone();
-                    let dir = dir.clone();
-                    async move {
-                        for file_name in to_delete {
-                            fs.remove_dir(
-                                &dir.join(file_name),
-                                RemoveOptions {
-                                    recursive: true,
-                                    ignore_if_not_exists: false,
-                                },
-                            )
-                            .await
-                            .ok();
-                        }
-                    }
-                })
-                .detach();
-
-                let version = if let Some(file_name) = newest_version {
-                    cx.background_spawn({
-                        let file_name = file_name.clone();
-                        let dir = dir.clone();
-                        let fs = fs.clone();
-                        async move {
-                            let latest_version =
-                                node_runtime.npm_package_latest_version(&package_name).await;
-                            if let Ok(latest_version) = latest_version
-                                && &latest_version != &file_name.to_string_lossy()
-                            {
-                                Self::download_latest_version(
-                                    fs,
-                                    dir.clone(),
-                                    node_runtime,
-                                    package_name,
-                                )
-                                .await
-                                .log_err();
-                                if let Some(mut new_version_available) = new_version_available {
-                                    new_version_available.send(Some(latest_version)).ok();
-                                }
-                            }
-                        }
-                    })
-                    .detach();
-                    file_name
-                } else {
-                    if let Some(mut status_tx) = status_tx {
-                        status_tx.send("Installing…".into()).ok();
-                    }
-                    let dir = dir.clone();
-                    cx.background_spawn(Self::download_latest_version(
-                        fs.clone(),
-                        dir.clone(),
-                        node_runtime,
-                        package_name,
-                    ))
-                    .await?
-                    .into()
-                };
-
-                let agent_server_path = dir.join(version).join(entrypoint_path);
-                let agent_server_path_exists = fs.is_file(&agent_server_path).await;
-                anyhow::ensure!(
-                    agent_server_path_exists,
-                    "Missing entrypoint path {} after installation",
-                    agent_server_path.to_string_lossy()
-                );
-
-                anyhow::Ok(AgentServerCommand {
-                    path: node_path,
-                    args: vec![agent_server_path.to_string_lossy().to_string()],
-                    env: Default::default(),
-                })
-            })
-            .await
-            .map_err(|e| LoadError::FailedToInstall(e.to_string().into()).into())
-        })
-    }
-
-    async fn download_latest_version(
-        fs: Arc<dyn Fs>,
-        dir: PathBuf,
-        node_runtime: NodeRuntime,
-        package_name: SharedString,
-    ) -> Result<String> {
-        log::debug!("downloading latest version of {package_name}");
-
-        let tmp_dir = tempfile::tempdir_in(&dir)?;
-
-        node_runtime
-            .npm_install_packages(tmp_dir.path(), &[(&package_name, "latest")])
-            .await?;
-
-        let version = node_runtime
-            .npm_package_installed_version(tmp_dir.path(), &package_name)
-            .await?
-            .context("expected package to be installed")?;
-
-        fs.rename(
-            &tmp_dir.keep(),
-            &dir.join(&version),
-            RenameOptions {
-                ignore_if_exists: true,
-                overwrite: false,
-            },
-        )
-        .await?;
-
-        anyhow::Ok(version)
-    }
 }
 
 pub trait AgentServer: Send {
@@ -255,10 +53,10 @@ pub trait AgentServer: Send {
 
     fn connect(
         &self,
-        root_dir: &Path,
+        root_dir: Option<&Path>,
         delegate: AgentServerDelegate,
         cx: &mut App,
-    ) -> Task<Result<Rc<dyn AgentConnection>>>;
+    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>>;
 
     fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
 }
@@ -268,120 +66,3 @@ impl dyn AgentServer {
         self.into_any().downcast().ok()
     }
 }
-
-impl std::fmt::Debug for AgentServerCommand {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let filtered_env = self.env.as_ref().map(|env| {
-            env.iter()
-                .map(|(k, v)| {
-                    (
-                        k,
-                        if util::redact::should_redact(k) {
-                            "[REDACTED]"
-                        } else {
-                            v
-                        },
-                    )
-                })
-                .collect::<Vec<_>>()
-        });
-
-        f.debug_struct("AgentServerCommand")
-            .field("path", &self.path)
-            .field("args", &self.args)
-            .field("env", &filtered_env)
-            .finish()
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema)]
-pub struct AgentServerCommand {
-    #[serde(rename = "command")]
-    pub path: PathBuf,
-    #[serde(default)]
-    pub args: Vec<String>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-impl AgentServerCommand {
-    pub async fn resolve(
-        path_bin_name: &'static str,
-        extra_args: &[&'static str],
-        fallback_path: Option<&Path>,
-        settings: Option<BuiltinAgentServerSettings>,
-        project: &Entity<Project>,
-        cx: &mut AsyncApp,
-    ) -> Option<Self> {
-        if let Some(settings) = settings
-            && let Some(command) = settings.custom_command()
-        {
-            Some(command)
-        } else {
-            match find_bin_in_path(path_bin_name.into(), project, cx).await {
-                Some(path) => Some(Self {
-                    path,
-                    args: extra_args.iter().map(|arg| arg.to_string()).collect(),
-                    env: None,
-                }),
-                None => fallback_path.and_then(|path| {
-                    if path.exists() {
-                        Some(Self {
-                            path: path.to_path_buf(),
-                            args: extra_args.iter().map(|arg| arg.to_string()).collect(),
-                            env: None,
-                        })
-                    } else {
-                        None
-                    }
-                }),
-            }
-        }
-    }
-}
-
-async fn find_bin_in_path(
-    bin_name: SharedString,
-    project: &Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Option<PathBuf> {
-    let (env_task, root_dir) = project
-        .update(cx, |project, cx| {
-            let worktree = project.visible_worktrees(cx).next();
-            match worktree {
-                Some(worktree) => {
-                    let env_task = project.environment().update(cx, |env, cx| {
-                        env.get_worktree_environment(worktree.clone(), cx)
-                    });
-
-                    let path = worktree.read(cx).abs_path();
-                    (env_task, path)
-                }
-                None => {
-                    let path: Arc<Path> = paths::home_dir().as_path().into();
-                    let env_task = project.environment().update(cx, |env, cx| {
-                        env.get_directory_environment(path.clone(), cx)
-                    });
-                    (env_task, path)
-                }
-            }
-        })
-        .log_err()?;
-
-    cx.background_executor()
-        .spawn(async move {
-            let which_result = if cfg!(windows) {
-                which::which(bin_name.as_str())
-            } else {
-                let env = env_task.await.unwrap_or_default();
-                let shell_path = env.get("PATH").cloned();
-                which::which_in(bin_name.as_str(), shell_path.as_ref(), root_dir.as_ref())
-            };
-
-            if let Err(which::Error::CannotFindBinaryPath) = which_result {
-                return None;
-            }
-
-            which_result.log_err()
-        })
-        .await
-}
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 15352ce216..0cb2dead3b 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,60 +1,22 @@
-use settings::SettingsStore;
 use std::path::Path;
 use std::rc::Rc;
 use std::{any::Any, path::PathBuf};
 
-use anyhow::Result;
-use gpui::{App, AppContext as _, SharedString, Task};
+use anyhow::{Context as _, Result};
+use gpui::{App, SharedString, Task};
+use project::agent_server_store::CLAUDE_CODE_NAME;
 
-use crate::{AgentServer, AgentServerDelegate, AllAgentServersSettings};
+use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::AgentConnection;
 
 #[derive(Clone)]
 pub struct ClaudeCode;
 
-pub struct ClaudeCodeLoginCommand {
+pub struct AgentServerLoginCommand {
     pub path: PathBuf,
     pub arguments: Vec<String>,
 }
 
-impl ClaudeCode {
-    const BINARY_NAME: &'static str = "claude-code-acp";
-    const PACKAGE_NAME: &'static str = "@zed-industries/claude-code-acp";
-
-    pub fn login_command(
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<ClaudeCodeLoginCommand>> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).claude.clone()
-        });
-
-        cx.spawn(async move |cx| {
-            let mut command = if let Some(settings) = settings {
-                settings.command
-            } else {
-                cx.update(|cx| {
-                    delegate.get_or_npm_install_builtin_agent(
-                        Self::BINARY_NAME.into(),
-                        Self::PACKAGE_NAME.into(),
-                        "node_modules/@anthropic-ai/claude-code/cli.js".into(),
-                        true,
-                        Some("0.2.5".parse().unwrap()),
-                        cx,
-                    )
-                })?
-                .await?
-            };
-            command.args.push("/login".into());
-
-            Ok(ClaudeCodeLoginCommand {
-                path: command.path,
-                arguments: command.args,
-            })
-        })
-    }
-}
-
 impl AgentServer for ClaudeCode {
     fn telemetry_id(&self) -> &'static str {
         "claude-code"
@@ -70,56 +32,33 @@ impl AgentServer for ClaudeCode {
 
     fn connect(
         &self,
-        root_dir: &Path,
+        root_dir: Option<&Path>,
         delegate: AgentServerDelegate,
         cx: &mut App,
-    ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        let root_dir = root_dir.to_path_buf();
-        let fs = delegate.project().read(cx).fs().clone();
-        let server_name = self.name();
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).claude.clone()
-        });
-        let project = delegate.project().clone();
+    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
+        let name = self.name();
+        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
+        let is_remote = delegate.project.read(cx).is_via_remote_server();
+        let store = delegate.store.downgrade();
 
         cx.spawn(async move |cx| {
-            let mut project_env = project
-                .update(cx, |project, cx| {
-                    project.directory_environment(root_dir.as_path().into(), cx)
-                })?
-                .await
-                .unwrap_or_default();
-            let mut command = if let Some(settings) = settings {
-                settings.command
-            } else {
-                cx.update(|cx| {
-                    delegate.get_or_npm_install_builtin_agent(
-                        Self::BINARY_NAME.into(),
-                        Self::PACKAGE_NAME.into(),
-                        format!("node_modules/{}/dist/index.js", Self::PACKAGE_NAME).into(),
-                        true,
-                        None,
-                        cx,
-                    )
-                })?
-                .await?
-            };
-            project_env.extend(command.env.take().unwrap_or_default());
-            command.env = Some(project_env);
-
-            command
-                .env
-                .get_or_insert_default()
-                .insert("ANTHROPIC_API_KEY".to_owned(), "".to_owned());
-
-            let root_dir_exists = fs.is_dir(&root_dir).await;
-            anyhow::ensure!(
-                root_dir_exists,
-                "Session root {} does not exist or is not a directory",
-                root_dir.to_string_lossy()
-            );
-
-            crate::acp::connect(server_name, command.clone(), &root_dir, cx).await
+            let (command, root_dir, login) = store
+                .update(cx, |store, cx| {
+                    let agent = store
+                        .get_external_agent(&CLAUDE_CODE_NAME.into())
+                        .context("Claude Code is not registered")?;
+                    anyhow::Ok(agent.get_command(
+                        root_dir.as_deref(),
+                        Default::default(),
+                        delegate.status_tx,
+                        delegate.new_version_available,
+                        &mut cx.to_async(),
+                    ))
+                })??
+                .await?;
+            let connection =
+                crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
+            Ok((connection, login))
         })
     }
 
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 8d9670473a..0fb595ff02 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,19 +1,19 @@
-use crate::{AgentServerCommand, AgentServerDelegate};
+use crate::AgentServerDelegate;
 use acp_thread::AgentConnection;
-use anyhow::Result;
+use anyhow::{Context as _, Result};
 use gpui::{App, SharedString, Task};
+use project::agent_server_store::ExternalAgentServerName;
 use std::{path::Path, rc::Rc};
 use ui::IconName;
 
 /// A generic agent server implementation for custom user-defined agents
 pub struct CustomAgentServer {
     name: SharedString,
-    command: AgentServerCommand,
 }
 
 impl CustomAgentServer {
-    pub fn new(name: SharedString, command: AgentServerCommand) -> Self {
-        Self { name, command }
+    pub fn new(name: SharedString) -> Self {
+        Self { name }
     }
 }
 
@@ -32,14 +32,36 @@ impl crate::AgentServer for CustomAgentServer {
 
     fn connect(
         &self,
-        root_dir: &Path,
-        _delegate: AgentServerDelegate,
+        root_dir: Option<&Path>,
+        delegate: AgentServerDelegate,
         cx: &mut App,
-    ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        let server_name = self.name();
-        let command = self.command.clone();
-        let root_dir = root_dir.to_path_buf();
-        cx.spawn(async move |cx| crate::acp::connect(server_name, command, &root_dir, cx).await)
+    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
+        let name = self.name();
+        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
+        let is_remote = delegate.project.read(cx).is_via_remote_server();
+        let store = delegate.store.downgrade();
+
+        cx.spawn(async move |cx| {
+            let (command, root_dir, login) = store
+                .update(cx, |store, cx| {
+                    let agent = store
+                        .get_external_agent(&ExternalAgentServerName(name.clone()))
+                        .with_context(|| {
+                            format!("Custom agent server `{}` is not registered", name)
+                        })?;
+                    anyhow::Ok(agent.get_command(
+                        root_dir.as_deref(),
+                        Default::default(),
+                        delegate.status_tx,
+                        delegate.new_version_available,
+                        &mut cx.to_async(),
+                    ))
+                })??
+                .await?;
+            let connection =
+                crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
+            Ok((connection, login))
+        })
     }
 
     fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index f801ef2468..eda55a596a 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,12 +1,12 @@
 use crate::{AgentServer, AgentServerDelegate};
-#[cfg(test)]
-use crate::{AgentServerCommand, CustomAgentServerSettings};
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
 use agent_client_protocol as acp;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::{AppContext, Entity, TestAppContext};
 use indoc::indoc;
-use project::{FakeFs, Project};
+#[cfg(test)]
+use project::agent_server_store::{AgentServerCommand, CustomAgentServerSettings};
+use project::{FakeFs, Project, agent_server_store::AllAgentServersSettings};
 use std::{
     path::{Path, PathBuf},
     sync::Arc,
@@ -449,7 +449,6 @@ pub use common_e2e_tests;
 // Helpers
 
 pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
-    #[cfg(test)]
     use settings::Settings;
 
     env_logger::try_init().ok();
@@ -468,11 +467,11 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
         language_model::init(client.clone(), cx);
         language_models::init(user_store, client, cx);
         agent_settings::init(cx);
-        crate::settings::init(cx);
+        AllAgentServersSettings::register(cx);
 
         #[cfg(test)]
-        crate::AllAgentServersSettings::override_global(
-            crate::AllAgentServersSettings {
+        AllAgentServersSettings::override_global(
+            AllAgentServersSettings {
                 claude: Some(CustomAgentServerSettings {
                     command: AgentServerCommand {
                         path: "claude-code-acp".into(),
@@ -498,10 +497,11 @@ pub async fn new_test_thread(
     current_dir: impl AsRef<Path>,
     cx: &mut TestAppContext,
 ) -> Entity<AcpThread> {
-    let delegate = AgentServerDelegate::new(project.clone(), None, None);
+    let store = project.read_with(cx, |project, _| project.agent_server_store().clone());
+    let delegate = AgentServerDelegate::new(store, project.clone(), None, None);
 
-    let connection = cx
-        .update(|cx| server.connect(current_dir.as_ref(), delegate, cx))
+    let (connection, _) = cx
+        .update(|cx| server.connect(Some(current_dir.as_ref()), delegate, cx))
         .await
         .unwrap();
 
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 7e40d85767..20a18dfd33 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -1,21 +1,17 @@
 use std::rc::Rc;
 use std::{any::Any, path::Path};
 
-use crate::acp::AcpConnection;
 use crate::{AgentServer, AgentServerDelegate};
-use acp_thread::{AgentConnection, LoadError};
-use anyhow::Result;
-use gpui::{App, AppContext as _, SharedString, Task};
+use acp_thread::AgentConnection;
+use anyhow::{Context as _, Result};
+use collections::HashMap;
+use gpui::{App, SharedString, Task};
 use language_models::provider::google::GoogleLanguageModelProvider;
-use settings::SettingsStore;
-
-use crate::AllAgentServersSettings;
+use project::agent_server_store::GEMINI_NAME;
 
 #[derive(Clone)]
 pub struct Gemini;
 
-const ACP_ARG: &str = "--experimental-acp";
-
 impl AgentServer for Gemini {
     fn telemetry_id(&self) -> &'static str {
         "gemini-cli"
@@ -31,126 +27,37 @@ impl AgentServer for Gemini {
 
     fn connect(
         &self,
-        root_dir: &Path,
+        root_dir: Option<&Path>,
         delegate: AgentServerDelegate,
         cx: &mut App,
-    ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        let root_dir = root_dir.to_path_buf();
-        let fs = delegate.project().read(cx).fs().clone();
-        let server_name = self.name();
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).gemini.clone()
-        });
-        let project = delegate.project().clone();
+    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
+        let name = self.name();
+        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
+        let is_remote = delegate.project.read(cx).is_via_remote_server();
+        let store = delegate.store.downgrade();
 
         cx.spawn(async move |cx| {
-            let ignore_system_version = settings
-                .as_ref()
-                .and_then(|settings| settings.ignore_system_version)
-                .unwrap_or(true);
-            let mut project_env = project
-                .update(cx, |project, cx| {
-                    project.directory_environment(root_dir.as_path().into(), cx)
-                })?
-                .await
-                .unwrap_or_default();
-            let mut command = if let Some(settings) = settings
-                && let Some(command) = settings.custom_command()
-            {
-                command
-            } else {
-                cx.update(|cx| {
-                    delegate.get_or_npm_install_builtin_agent(
-                        Self::BINARY_NAME.into(),
-                        Self::PACKAGE_NAME.into(),
-                        format!("node_modules/{}/dist/index.js", Self::PACKAGE_NAME).into(),
-                        ignore_system_version,
-                        Some(Self::MINIMUM_VERSION.parse().unwrap()),
-                        cx,
-                    )
-                })?
-                .await?
-            };
-            if !command.args.contains(&ACP_ARG.into()) {
-                command.args.push(ACP_ARG.into());
-            }
+            let mut extra_env = HashMap::default();
             if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
-                project_env
-                    .insert("GEMINI_API_KEY".to_owned(), api_key.key);
+                extra_env.insert("GEMINI_API_KEY".into(), api_key.key);
             }
-            project_env.extend(command.env.take().unwrap_or_default());
-            command.env = Some(project_env);
-
-            let root_dir_exists = fs.is_dir(&root_dir).await;
-            anyhow::ensure!(
-                root_dir_exists,
-                "Session root {} does not exist or is not a directory",
-                root_dir.to_string_lossy()
-            );
-
-            let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
-            match &result {
-                Ok(connection) => {
-                    if let Some(connection) = connection.clone().downcast::<AcpConnection>()
-                        && !connection.prompt_capabilities().image
-                    {
-                        let version_output = util::command::new_smol_command(&command.path)
-                            .args(command.args.iter())
-                            .arg("--version")
-                            .kill_on_drop(true)
-                            .output()
-                            .await;
-                        let current_version =
-                            String::from_utf8(version_output?.stdout)?.trim().to_owned();
-
-                        log::error!("connected to gemini, but missing prompt_capabilities.image (version is {current_version})");
-                        return Err(LoadError::Unsupported {
-                            current_version: current_version.into(),
-                            command: (command.path.to_string_lossy().to_string() + " " + &command.args.join(" ")).into(),
-                            minimum_version: Self::MINIMUM_VERSION.into(),
-                        }
-                        .into());
-                    }
-                }
-                Err(e) => {
-                    let version_fut = util::command::new_smol_command(&command.path)
-                        .args(command.args.iter())
-                        .arg("--version")
-                        .kill_on_drop(true)
-                        .output();
-
-                    let help_fut = util::command::new_smol_command(&command.path)
-                        .args(command.args.iter())
-                        .arg("--help")
-                        .kill_on_drop(true)
-                        .output();
-
-                    let (version_output, help_output) =
-                        futures::future::join(version_fut, help_fut).await;
-                    let Some(version_output) = version_output.ok().and_then(|output| String::from_utf8(output.stdout).ok()) else {
-                        return result;
-                    };
-                    let Some((help_stdout, help_stderr)) = help_output.ok().and_then(|output| String::from_utf8(output.stdout).ok().zip(String::from_utf8(output.stderr).ok())) else  {
-                        return result;
-                    };
-
-                    let current_version = version_output.trim().to_string();
-                    let supported = help_stdout.contains(ACP_ARG) || current_version.parse::<semver::Version>().is_ok_and(|version| version >= Self::MINIMUM_VERSION.parse::<semver::Version>().unwrap());
-
-                    log::error!("failed to create ACP connection to gemini (version is {current_version}, supported: {supported}): {e}");
-                    log::debug!("gemini --help stdout: {help_stdout:?}");
-                    log::debug!("gemini --help stderr: {help_stderr:?}");
-                    if !supported {
-                        return Err(LoadError::Unsupported {
-                            current_version: current_version.into(),
-                            command: (command.path.to_string_lossy().to_string() + " " + &command.args.join(" ")).into(),
-                            minimum_version: Self::MINIMUM_VERSION.into(),
-                        }
-                        .into());
-                    }
-                }
-            }
-            result
+            let (command, root_dir, login) = store
+                .update(cx, |store, cx| {
+                    let agent = store
+                        .get_external_agent(&GEMINI_NAME.into())
+                        .context("Gemini CLI is not registered")?;
+                    anyhow::Ok(agent.get_command(
+                        root_dir.as_deref(),
+                        extra_env,
+                        delegate.status_tx,
+                        delegate.new_version_available,
+                        &mut cx.to_async(),
+                    ))
+                })??
+                .await?;
+            let connection =
+                crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
+            Ok((connection, login))
         })
     }
 
@@ -159,18 +66,11 @@ impl AgentServer for Gemini {
     }
 }
 
-impl Gemini {
-    const PACKAGE_NAME: &str = "@google/gemini-cli";
-
-    const MINIMUM_VERSION: &str = "0.2.1";
-
-    const BINARY_NAME: &str = "gemini";
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
+    use project::agent_server_store::AgentServerCommand;
+
     use super::*;
-    use crate::AgentServerCommand;
     use std::path::Path;
 
     crate::common_e2e_tests!(async |_, _, _| Gemini, allow_option_id = "proceed_once");
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
deleted file mode 100644
index 167753296a..0000000000
--- a/crates/agent_servers/src/settings.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use std::path::PathBuf;
-
-use crate::AgentServerCommand;
-use anyhow::Result;
-use collections::HashMap;
-use gpui::{App, SharedString};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
-
-pub fn init(cx: &mut App) {
-    AllAgentServersSettings::register(cx);
-}
-
-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "agent_servers")]
-pub struct AllAgentServersSettings {
-    pub gemini: Option<BuiltinAgentServerSettings>,
-    pub claude: Option<CustomAgentServerSettings>,
-
-    /// Custom agent servers configured by the user
-    #[serde(flatten)]
-    pub custom: HashMap<SharedString, CustomAgentServerSettings>,
-}
-
-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
-pub struct BuiltinAgentServerSettings {
-    /// Absolute path to a binary to be used when launching this agent.
-    ///
-    /// This can be used to run a specific binary without automatic downloads or searching `$PATH`.
-    #[serde(rename = "command")]
-    pub path: Option<PathBuf>,
-    /// If a binary is specified in `command`, it will be passed these arguments.
-    pub args: Option<Vec<String>>,
-    /// If a binary is specified in `command`, it will be passed these environment variables.
-    pub env: Option<HashMap<String, String>>,
-    /// Whether to skip searching `$PATH` for an agent server binary when
-    /// launching this agent.
-    ///
-    /// This has no effect if a `command` is specified. Otherwise, when this is
-    /// `false`, Zed will search `$PATH` for an agent server binary and, if one
-    /// is found, use it for threads with this agent. If no agent binary is
-    /// found on `$PATH`, Zed will automatically install and use its own binary.
-    /// When this is `true`, Zed will not search `$PATH`, and will always use
-    /// its own binary.
-    ///
-    /// Default: true
-    pub ignore_system_version: Option<bool>,
-}
-
-impl BuiltinAgentServerSettings {
-    pub(crate) fn custom_command(self) -> Option<AgentServerCommand> {
-        self.path.map(|path| AgentServerCommand {
-            path,
-            args: self.args.unwrap_or_default(),
-            env: self.env,
-        })
-    }
-}
-
-impl From<AgentServerCommand> for BuiltinAgentServerSettings {
-    fn from(value: AgentServerCommand) -> Self {
-        BuiltinAgentServerSettings {
-            path: Some(value.path),
-            args: Some(value.args),
-            env: value.env,
-            ..Default::default()
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
-pub struct CustomAgentServerSettings {
-    #[serde(flatten)]
-    pub command: AgentServerCommand,
-}
-
-impl settings::Settings for AllAgentServersSettings {
-    type FileContent = Self;
-
-    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
-        let mut settings = AllAgentServersSettings::default();
-
-        for AllAgentServersSettings {
-            gemini,
-            claude,
-            custom,
-        } in sources.defaults_and_customizations()
-        {
-            if gemini.is_some() {
-                settings.gemini = gemini.clone();
-            }
-            if claude.is_some() {
-                settings.claude = claude.clone();
-            }
-
-            // Merge custom agents
-            for (name, config) in custom {
-                // Skip built-in agent names to avoid conflicts
-                if name != "gemini" && name != "claude" {
-                    settings.custom.insert(name.clone(), config.clone());
-                }
-            }
-        }
-
-        Ok(settings)
-    }
-
-    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
-}
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 4f57c6161d..de5421c090 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -699,10 +699,15 @@ impl MessageEditor {
             self.project.read(cx).fs().clone(),
             self.history_store.clone(),
         ));
-        let delegate = AgentServerDelegate::new(self.project.clone(), None, None);
-        let connection = server.connect(Path::new(""), delegate, cx);
+        let delegate = AgentServerDelegate::new(
+            self.project.read(cx).agent_server_store().clone(),
+            self.project.clone(),
+            None,
+            None,
+        );
+        let connection = server.connect(None, delegate, cx);
         cx.spawn(async move |_, cx| {
-            let agent = connection.await?;
+            let (agent, _) = connection.await?;
             let agent = agent.downcast::<agent2::NativeAgentConnection>().unwrap();
             let summary = agent
                 .0
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index bd7a9a1479..8e8d5493cf 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -6,7 +6,7 @@ use acp_thread::{
 use acp_thread::{AgentConnection, Plan};
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, PromptCapabilities};
-use agent_servers::{AgentServer, AgentServerDelegate, ClaudeCode};
+use agent_servers::{AgentServer, AgentServerDelegate};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
 use anyhow::{Context as _, Result, anyhow, bail};
@@ -40,7 +40,6 @@ use std::path::Path;
 use std::sync::Arc;
 use std::time::Instant;
 use std::{collections::BTreeMap, rc::Rc, time::Duration};
-use task::SpawnInTerminal;
 use terminal_view::terminal_panel::TerminalPanel;
 use text::Anchor;
 use theme::{AgentFontSize, ThemeSettings};
@@ -263,6 +262,7 @@ pub struct AcpThreadView {
     workspace: WeakEntity<Workspace>,
     project: Entity<Project>,
     thread_state: ThreadState,
+    login: Option<task::SpawnInTerminal>,
     history_store: Entity<HistoryStore>,
     hovered_recent_history_item: Option<usize>,
     entry_view_state: Entity<EntryViewState>,
@@ -392,6 +392,7 @@ impl AcpThreadView {
             project: project.clone(),
             entry_view_state,
             thread_state: Self::initial_state(agent, resume_thread, workspace, project, window, cx),
+            login: None,
             message_editor,
             model_selector: None,
             profile_selector: None,
@@ -444,9 +445,11 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> ThreadState {
-        if !project.read(cx).is_local() && agent.clone().downcast::<NativeAgentServer>().is_none() {
+        if project.read(cx).is_via_collab()
+            && agent.clone().downcast::<NativeAgentServer>().is_none()
+        {
             return ThreadState::LoadError(LoadError::Other(
-                "External agents are not yet supported for remote projects.".into(),
+                "External agents are not yet supported in shared projects.".into(),
             ));
         }
         let mut worktrees = project.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
@@ -466,20 +469,23 @@ impl AcpThreadView {
                     Some(worktree.read(cx).abs_path())
                 }
             })
-            .next()
-            .unwrap_or_else(|| paths::home_dir().as_path().into());
+            .next();
         let (status_tx, mut status_rx) = watch::channel("Loading…".into());
         let (new_version_available_tx, mut new_version_available_rx) = watch::channel(None);
         let delegate = AgentServerDelegate::new(
+            project.read(cx).agent_server_store().clone(),
             project.clone(),
             Some(status_tx),
             Some(new_version_available_tx),
         );
 
-        let connect_task = agent.connect(&root_dir, delegate, cx);
+        let connect_task = agent.connect(root_dir.as_deref(), delegate, cx);
         let load_task = cx.spawn_in(window, async move |this, cx| {
             let connection = match connect_task.await {
-                Ok(connection) => connection,
+                Ok((connection, login)) => {
+                    this.update(cx, |this, _| this.login = login).ok();
+                    connection
+                }
                 Err(err) => {
                     this.update_in(cx, |this, window, cx| {
                         if err.downcast_ref::<LoadError>().is_some() {
@@ -506,6 +512,14 @@ impl AcpThreadView {
                 })
                 .log_err()
             } else {
+                let root_dir = if let Some(acp_agent) = connection
+                    .clone()
+                    .downcast::<agent_servers::AcpConnection>()
+                {
+                    acp_agent.root_dir().into()
+                } else {
+                    root_dir.unwrap_or(paths::home_dir().as_path().into())
+                };
                 cx.update(|_, cx| {
                     connection
                         .clone()
@@ -1462,9 +1476,12 @@ impl AcpThreadView {
         self.thread_error.take();
         configuration_view.take();
         pending_auth_method.replace(method.clone());
-        let authenticate = if method.0.as_ref() == "claude-login" {
+        let authenticate = if (method.0.as_ref() == "claude-login"
+            || method.0.as_ref() == "spawn-gemini-cli")
+            && let Some(login) = self.login.clone()
+        {
             if let Some(workspace) = self.workspace.upgrade() {
-                Self::spawn_claude_login(&workspace, window, cx)
+                Self::spawn_external_agent_login(login, workspace, false, window, cx)
             } else {
                 Task::ready(Ok(()))
             }
@@ -1511,31 +1528,28 @@ impl AcpThreadView {
             }));
     }
 
-    fn spawn_claude_login(
-        workspace: &Entity<Workspace>,
+    fn spawn_external_agent_login(
+        login: task::SpawnInTerminal,
+        workspace: Entity<Workspace>,
+        previous_attempt: bool,
         window: &mut Window,
         cx: &mut App,
     ) -> Task<Result<()>> {
         let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
             return Task::ready(Ok(()));
         };
-        let project_entity = workspace.read(cx).project();
-        let project = project_entity.read(cx);
-        let cwd = project.first_project_directory(cx);
-        let shell = project.terminal_settings(&cwd, cx).shell.clone();
-
-        let delegate = AgentServerDelegate::new(project_entity.clone(), None, None);
-        let command = ClaudeCode::login_command(delegate, cx);
+        let project = workspace.read(cx).project().clone();
+        let cwd = project.read(cx).first_project_directory(cx);
+        let shell = project.read(cx).terminal_settings(&cwd, cx).shell.clone();
 
         window.spawn(cx, async move |cx| {
-            let login_command = command.await?;
-            let command = login_command
-                .path
-                .to_str()
-                .with_context(|| format!("invalid login command: {:?}", login_command.path))?;
-            let command = shlex::try_quote(command)?;
-            let args = login_command
-                .arguments
+            let mut task = login.clone();
+            task.command = task
+                .command
+                .map(|command| anyhow::Ok(shlex::try_quote(&command)?.to_string()))
+                .transpose()?;
+            task.args = task
+                .args
                 .iter()
                 .map(|arg| {
                     Ok(shlex::try_quote(arg)
@@ -1543,26 +1557,16 @@ impl AcpThreadView {
                         .to_string())
                 })
                 .collect::<Result<Vec<_>>>()?;
+            task.full_label = task.label.clone();
+            task.id = task::TaskId(format!("external-agent-{}-login", task.label));
+            task.command_label = task.label.clone();
+            task.use_new_terminal = true;
+            task.allow_concurrent_runs = true;
+            task.hide = task::HideStrategy::Always;
+            task.shell = shell;
 
             let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                terminal_panel.spawn_task(
-                    &SpawnInTerminal {
-                        id: task::TaskId("claude-login".into()),
-                        full_label: "claude /login".to_owned(),
-                        label: "claude /login".to_owned(),
-                        command: Some(command.into()),
-                        args,
-                        command_label: "claude /login".to_owned(),
-                        cwd,
-                        use_new_terminal: true,
-                        allow_concurrent_runs: true,
-                        hide: task::HideStrategy::Always,
-                        shell,
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
+                terminal_panel.spawn_task(&login, window, cx)
             })?;
 
             let terminal = terminal.await?;
@@ -1578,7 +1582,9 @@ impl AcpThreadView {
                             cx.background_executor().timer(Duration::from_secs(1)).await;
                             let content =
                                 terminal.update(cx, |terminal, _cx| terminal.get_content())?;
-                            if content.contains("Login successful") {
+                            if content.contains("Login successful")
+                                || content.contains("Type your message")
+                            {
                                 return anyhow::Ok(());
                             }
                         }
@@ -1594,6 +1600,9 @@ impl AcpThreadView {
                     }
                 }
                 _ = exit_status => {
+                    if !previous_attempt && project.read_with(cx, |project, _| project.is_via_remote_server())? && login.label.contains("gemini") {
+                        return cx.update(|window, cx| Self::spawn_external_agent_login(login, workspace, true, window, cx))?.await
+                    }
                     return Err(anyhow!("exited before logging in"));
                 }
             }
@@ -3088,26 +3097,38 @@ impl AcpThreadView {
                             })
                             .children(connection.auth_methods().iter().enumerate().rev().map(
                                 |(ix, method)| {
-                                    Button::new(
-                                        SharedString::from(method.id.0.clone()),
-                                        method.name.clone(),
-                                    )
-                                    .when(ix == 0, |el| {
-                                        el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                    })
-                                    .label_size(LabelSize::Small)
-                                    .on_click({
-                                        let method_id = method.id.clone();
-                                        cx.listener(move |this, _, window, cx| {
-                                            telemetry::event!(
-                                                "Authenticate Agent Started",
-                                                agent = this.agent.telemetry_id(),
-                                                method = method_id
-                                            );
+                                    let (method_id, name) = if self
+                                        .project
+                                        .read(cx)
+                                        .is_via_remote_server()
+                                        && method.id.0.as_ref() == "oauth-personal"
+                                        && method.name == "Log in with Google"
+                                    {
+                                        ("spawn-gemini-cli".into(), "Log in with Gemini CLI".into())
+                                    } else {
+                                        (method.id.0.clone(), method.name.clone())
+                                    };
 
-                                            this.authenticate(method_id.clone(), window, cx)
+                                    Button::new(SharedString::from(method_id.clone()), name)
+                                        .when(ix == 0, |el| {
+                                            el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
+                                        })
+                                        .label_size(LabelSize::Small)
+                                        .on_click({
+                                            cx.listener(move |this, _, window, cx| {
+                                                telemetry::event!(
+                                                    "Authenticate Agent Started",
+                                                    agent = this.agent.telemetry_id(),
+                                                    method = method_id
+                                                );
+
+                                                this.authenticate(
+                                                    acp::AuthMethodId(method_id.clone()),
+                                                    window,
+                                                    cx,
+                                                )
+                                            })
                                         })
-                                    })
                                 },
                             )),
                     )
@@ -5710,11 +5731,11 @@ pub(crate) mod tests {
 
         fn connect(
             &self,
-            _root_dir: &Path,
+            _root_dir: Option<&Path>,
             _delegate: AgentServerDelegate,
             _cx: &mut App,
-        ) -> Task<gpui::Result<Rc<dyn AgentConnection>>> {
-            Task::ready(Ok(Rc::new(self.connection.clone())))
+        ) -> Task<gpui::Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
+            Task::ready(Ok((Rc::new(self.connection.clone()), None)))
         }
 
         fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 5981a3c52b..8ae21841fc 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -5,7 +5,6 @@ mod tool_picker;
 
 use std::{ops::Range, sync::Arc};
 
-use agent_servers::{AgentServerCommand, AllAgentServersSettings, CustomAgentServerSettings};
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use assistant_tool::{ToolSource, ToolWorkingSet};
@@ -26,6 +25,10 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
+    agent_server_store::{
+        AgentServerCommand, AgentServerStore, AllAgentServersSettings, CLAUDE_CODE_NAME,
+        CustomAgentServerSettings, GEMINI_NAME,
+    },
     context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
     project_settings::{ContextServerSettings, ProjectSettings},
 };
@@ -45,11 +48,13 @@ pub(crate) use manage_profiles_modal::ManageProfilesModal;
 use crate::{
     AddContextServer, ExternalAgent, NewExternalAgentThread,
     agent_configuration::add_llm_provider_modal::{AddLlmProviderModal, LlmCompatibleProvider},
+    placeholder_command,
 };
 
 pub struct AgentConfiguration {
     fs: Arc<dyn Fs>,
     language_registry: Arc<LanguageRegistry>,
+    agent_server_store: Entity<AgentServerStore>,
     workspace: WeakEntity<Workspace>,
     focus_handle: FocusHandle,
     configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
@@ -66,6 +71,7 @@ pub struct AgentConfiguration {
 impl AgentConfiguration {
     pub fn new(
         fs: Arc<dyn Fs>,
+        agent_server_store: Entity<AgentServerStore>,
         context_server_store: Entity<ContextServerStore>,
         tools: Entity<ToolWorkingSet>,
         language_registry: Arc<LanguageRegistry>,
@@ -104,6 +110,7 @@ impl AgentConfiguration {
             workspace,
             focus_handle,
             configuration_views_by_provider: HashMap::default(),
+            agent_server_store,
             context_server_store,
             expanded_context_server_tools: HashMap::default(),
             expanded_provider_configurations: HashMap::default(),
@@ -991,17 +998,30 @@ impl AgentConfiguration {
     }
 
     fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = AllAgentServersSettings::get_global(cx).clone();
-        let user_defined_agents = settings
+        let custom_settings = cx
+            .global::<SettingsStore>()
+            .get::<AllAgentServersSettings>(None)
             .custom
-            .iter()
-            .map(|(name, settings)| {
+            .clone();
+        let user_defined_agents = self
+            .agent_server_store
+            .read(cx)
+            .external_agents()
+            .filter(|name| name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME)
+            .cloned()
+            .collect::<Vec<_>>();
+        let user_defined_agents = user_defined_agents
+            .into_iter()
+            .map(|name| {
                 self.render_agent_server(
                     IconName::Ai,
                     name.clone(),
                     ExternalAgent::Custom {
-                        name: name.clone(),
-                        command: settings.command.clone(),
+                        name: name.clone().into(),
+                        command: custom_settings
+                            .get(&name.0)
+                            .map(|settings| settings.command.clone())
+                            .unwrap_or(placeholder_command()),
                     },
                     cx,
                 )
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index d021eaefb5..ad42b0001d 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -5,9 +5,11 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use acp_thread::AcpThread;
-use agent_servers::AgentServerCommand;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
+use project::agent_server_store::{
+    AgentServerCommand, AllAgentServersSettings, CLAUDE_CODE_NAME, GEMINI_NAME,
+};
 use serde::{Deserialize, Serialize};
 use zed_actions::OpenBrowser;
 use zed_actions::agent::{OpenClaudeCodeOnboardingModal, ReauthenticateAgent};
@@ -33,7 +35,9 @@ use crate::{
     thread_history::{HistoryEntryElement, ThreadHistory},
     ui::{AgentOnboardingModal, EndTrialUpsell},
 };
-use crate::{ExternalAgent, NewExternalAgentThread, NewNativeAgentThreadFromSummary};
+use crate::{
+    ExternalAgent, NewExternalAgentThread, NewNativeAgentThreadFromSummary, placeholder_command,
+};
 use agent::{
     Thread, ThreadError, ThreadEvent, ThreadId, ThreadSummary, TokenUsageRatio,
     context_store::ContextStore,
@@ -62,7 +66,7 @@ use project::{DisableAiSettings, Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use rules_library::{RulesLibrary, open_rules_library};
 use search::{BufferSearchBar, buffer_search};
-use settings::{Settings, update_settings_file};
+use settings::{Settings, SettingsStore, update_settings_file};
 use theme::ThemeSettings;
 use time::UtcOffset;
 use ui::utils::WithRemSize;
@@ -1094,7 +1098,7 @@ impl AgentPanel {
         let workspace = self.workspace.clone();
         let project = self.project.clone();
         let fs = self.fs.clone();
-        let is_not_local = !self.project.read(cx).is_local();
+        let is_via_collab = self.project.read(cx).is_via_collab();
 
         const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
 
@@ -1126,7 +1130,7 @@ impl AgentPanel {
                     agent
                 }
                 None => {
-                    if is_not_local {
+                    if is_via_collab {
                         ExternalAgent::NativeAgent
                     } else {
                         cx.background_spawn(async move {
@@ -1503,6 +1507,7 @@ impl AgentPanel {
     }
 
     pub(crate) fn open_configuration(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let agent_server_store = self.project.read(cx).agent_server_store().clone();
         let context_server_store = self.project.read(cx).context_server_store();
         let tools = self.thread_store.read(cx).tools();
         let fs = self.fs.clone();
@@ -1511,6 +1516,7 @@ impl AgentPanel {
         self.configuration = Some(cx.new(|cx| {
             AgentConfiguration::new(
                 fs,
+                agent_server_store,
                 context_server_store,
                 tools,
                 self.language_registry.clone(),
@@ -2503,6 +2509,7 @@ impl AgentPanel {
     }
 
     fn render_toolbar_new(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let agent_server_store = self.project.read(cx).agent_server_store().clone();
         let focus_handle = self.focus_handle(cx);
 
         let active_thread = match &self.active_view {
@@ -2535,8 +2542,10 @@ impl AgentPanel {
             .with_handle(self.new_thread_menu_handle.clone())
             .menu({
                 let workspace = self.workspace.clone();
-                let is_not_local = workspace
-                    .update(cx, |workspace, cx| !workspace.project().read(cx).is_local())
+                let is_via_collab = workspace
+                    .update(cx, |workspace, cx| {
+                        workspace.project().read(cx).is_via_collab()
+                    })
                     .unwrap_or_default();
 
                 move |window, cx| {
@@ -2628,7 +2637,7 @@ impl AgentPanel {
                                     ContextMenuEntry::new("New Gemini CLI Thread")
                                         .icon(IconName::AiGemini)
                                         .icon_color(Color::Muted)
-                                        .disabled(is_not_local)
+                                        .disabled(is_via_collab)
                                         .handler({
                                             let workspace = workspace.clone();
                                             move |window, cx| {
@@ -2655,7 +2664,7 @@ impl AgentPanel {
                                 menu.item(
                                     ContextMenuEntry::new("New Claude Code Thread")
                                         .icon(IconName::AiClaude)
-                                        .disabled(is_not_local)
+                                        .disabled(is_via_collab)
                                         .icon_color(Color::Muted)
                                         .handler({
                                             let workspace = workspace.clone();
@@ -2680,19 +2689,25 @@ impl AgentPanel {
                                 )
                             })
                             .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |mut menu| {
-                                // Add custom agents from settings
-                                let settings =
-                                    agent_servers::AllAgentServersSettings::get_global(cx);
-                                for (agent_name, agent_settings) in &settings.custom {
+                                let agent_names = agent_server_store
+                                    .read(cx)
+                                    .external_agents()
+                                    .filter(|name| {
+                                        name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME
+                                    })
+                                    .cloned()
+                                    .collect::<Vec<_>>();
+                                let custom_settings = cx.global::<SettingsStore>().get::<AllAgentServersSettings>(None).custom.clone();
+                                for agent_name in agent_names {
                                     menu = menu.item(
                                         ContextMenuEntry::new(format!("New {} Thread", agent_name))
                                             .icon(IconName::Terminal)
                                             .icon_color(Color::Muted)
-                                            .disabled(is_not_local)
+                                            .disabled(is_via_collab)
                                             .handler({
                                                 let workspace = workspace.clone();
                                                 let agent_name = agent_name.clone();
-                                                let agent_settings = agent_settings.clone();
+                                                let custom_settings = custom_settings.clone();
                                                 move |window, cx| {
                                                     if let Some(workspace) = workspace.upgrade() {
                                                         workspace.update(cx, |workspace, cx| {
@@ -2703,10 +2718,9 @@ impl AgentPanel {
                                                                     panel.new_agent_thread(
                                                                         AgentType::Custom {
                                                                             name: agent_name
-                                                                                .clone(),
-                                                                            command: agent_settings
-                                                                                .command
-                                                                                .clone(),
+                                                                                .clone()
+                                                                                .into(),
+                                                                            command: custom_settings.get(&agent_name.0).map(|settings| settings.command.clone()).unwrap_or(placeholder_command())
                                                                         },
                                                                         window,
                                                                         cx,
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index e60c0baff9..b16643854e 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -28,7 +28,6 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use agent::{Thread, ThreadId};
-use agent_servers::AgentServerCommand;
 use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
@@ -41,6 +40,7 @@ use language_model::{
     ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
 };
 use project::DisableAiSettings;
+use project::agent_server_store::AgentServerCommand;
 use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -174,6 +174,14 @@ enum ExternalAgent {
     },
 }
 
+fn placeholder_command() -> AgentServerCommand {
+    AgentServerCommand {
+        path: "/placeholder".into(),
+        args: vec![],
+        env: None,
+    }
+}
+
 impl ExternalAgent {
     fn name(&self) -> &'static str {
         match self {
@@ -193,10 +201,9 @@ impl ExternalAgent {
             Self::Gemini => Rc::new(agent_servers::Gemini),
             Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
             Self::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
-            Self::Custom { name, command } => Rc::new(agent_servers::CustomAgentServer::new(
-                name.clone(),
-                command.clone(),
-            )),
+            Self::Custom { name, command: _ } => {
+                Rc::new(agent_servers::CustomAgentServer::new(name.clone()))
+            }
         }
     }
 }
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index 57d6d6ca28..3d46a44770 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -67,6 +67,7 @@ regex.workspace = true
 remote.workspace = true
 rpc.workspace = true
 schemars.workspace = true
+semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
@@ -85,6 +86,7 @@ text.workspace = true
 toml.workspace = true
 url.workspace = true
 util.workspace = true
+watch.workspace = true
 which.workspace = true
 worktree.workspace = true
 zlog.workspace = true
diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
new file mode 100644
index 0000000000..5f9342c893
--- /dev/null
+++ b/crates/project/src/agent_server_store.rs
@@ -0,0 +1,1091 @@
+use std::{
+    any::Any,
+    borrow::Borrow,
+    path::{Path, PathBuf},
+    str::FromStr as _,
+    sync::Arc,
+    time::Duration,
+};
+
+use anyhow::{Context as _, Result, bail};
+use collections::HashMap;
+use fs::{Fs, RemoveOptions, RenameOptions};
+use futures::StreamExt as _;
+use gpui::{
+    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, SharedString, Subscription, Task,
+};
+use node_runtime::NodeRuntime;
+use remote::RemoteClient;
+use rpc::{
+    AnyProtoClient, TypedEnvelope,
+    proto::{self, ToProto},
+};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{SettingsKey, SettingsSources, SettingsStore, SettingsUi};
+use util::{ResultExt as _, debug_panic};
+
+use crate::ProjectEnvironment;
+
+#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema)]
+pub struct AgentServerCommand {
+    #[serde(rename = "command")]
+    pub path: PathBuf,
+    #[serde(default)]
+    pub args: Vec<String>,
+    pub env: Option<HashMap<String, String>>,
+}
+
+impl std::fmt::Debug for AgentServerCommand {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let filtered_env = self.env.as_ref().map(|env| {
+            env.iter()
+                .map(|(k, v)| {
+                    (
+                        k,
+                        if util::redact::should_redact(k) {
+                            "[REDACTED]"
+                        } else {
+                            v
+                        },
+                    )
+                })
+                .collect::<Vec<_>>()
+        });
+
+        f.debug_struct("AgentServerCommand")
+            .field("path", &self.path)
+            .field("args", &self.args)
+            .field("env", &filtered_env)
+            .finish()
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct ExternalAgentServerName(pub SharedString);
+
+impl std::fmt::Display for ExternalAgentServerName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<&'static str> for ExternalAgentServerName {
+    fn from(value: &'static str) -> Self {
+        ExternalAgentServerName(value.into())
+    }
+}
+
+impl From<ExternalAgentServerName> for SharedString {
+    fn from(value: ExternalAgentServerName) -> Self {
+        value.0
+    }
+}
+
+impl Borrow<str> for ExternalAgentServerName {
+    fn borrow(&self) -> &str {
+        &self.0
+    }
+}
+
+pub trait ExternalAgentServer {
+    fn get_command(
+        &mut self,
+        root_dir: Option<&str>,
+        extra_env: HashMap<String, String>,
+        status_tx: Option<watch::Sender<SharedString>>,
+        new_version_available_tx: Option<watch::Sender<Option<String>>>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>>;
+
+    fn as_any_mut(&mut self) -> &mut dyn Any;
+}
+
+impl dyn ExternalAgentServer {
+    fn downcast_mut<T: ExternalAgentServer + 'static>(&mut self) -> Option<&mut T> {
+        self.as_any_mut().downcast_mut()
+    }
+}
+
+enum AgentServerStoreState {
+    Local {
+        node_runtime: NodeRuntime,
+        fs: Arc<dyn Fs>,
+        project_environment: Entity<ProjectEnvironment>,
+        downstream_client: Option<(u64, AnyProtoClient)>,
+        settings: Option<AllAgentServersSettings>,
+        _subscriptions: [Subscription; 1],
+    },
+    Remote {
+        project_id: u64,
+        upstream_client: Entity<RemoteClient>,
+    },
+    Collab,
+}
+
+pub struct AgentServerStore {
+    state: AgentServerStoreState,
+    external_agents: HashMap<ExternalAgentServerName, Box<dyn ExternalAgentServer>>,
+}
+
+pub struct AgentServersUpdated;
+
+impl EventEmitter<AgentServersUpdated> for AgentServerStore {}
+
+impl AgentServerStore {
+    pub fn init_remote(session: &AnyProtoClient) {
+        session.add_entity_message_handler(Self::handle_external_agents_updated);
+        session.add_entity_message_handler(Self::handle_loading_status_updated);
+        session.add_entity_message_handler(Self::handle_new_version_available);
+    }
+
+    pub fn init_headless(session: &AnyProtoClient) {
+        session.add_entity_request_handler(Self::handle_get_agent_server_command);
+    }
+
+    fn agent_servers_settings_changed(&mut self, cx: &mut Context<Self>) {
+        let AgentServerStoreState::Local {
+            node_runtime,
+            fs,
+            project_environment,
+            downstream_client,
+            settings: old_settings,
+            ..
+        } = &mut self.state
+        else {
+            debug_panic!(
+                "should not be subscribed to agent server settings changes in non-local project"
+            );
+            return;
+        };
+
+        let new_settings = cx
+            .global::<SettingsStore>()
+            .get::<AllAgentServersSettings>(None)
+            .clone();
+        if Some(&new_settings) == old_settings.as_ref() {
+            return;
+        }
+
+        self.external_agents.clear();
+        self.external_agents.insert(
+            GEMINI_NAME.into(),
+            Box::new(LocalGemini {
+                fs: fs.clone(),
+                node_runtime: node_runtime.clone(),
+                project_environment: project_environment.clone(),
+                custom_command: new_settings
+                    .gemini
+                    .clone()
+                    .and_then(|settings| settings.custom_command()),
+                ignore_system_version: new_settings
+                    .gemini
+                    .as_ref()
+                    .and_then(|settings| settings.ignore_system_version)
+                    .unwrap_or(true),
+            }),
+        );
+        self.external_agents.insert(
+            CLAUDE_CODE_NAME.into(),
+            Box::new(LocalClaudeCode {
+                fs: fs.clone(),
+                node_runtime: node_runtime.clone(),
+                project_environment: project_environment.clone(),
+                custom_command: new_settings.claude.clone().map(|settings| settings.command),
+            }),
+        );
+        self.external_agents
+            .extend(new_settings.custom.iter().map(|(name, settings)| {
+                (
+                    ExternalAgentServerName(name.clone()),
+                    Box::new(LocalCustomAgent {
+                        command: settings.command.clone(),
+                        project_environment: project_environment.clone(),
+                    }) as Box<dyn ExternalAgentServer>,
+                )
+            }));
+
+        *old_settings = Some(new_settings.clone());
+
+        if let Some((project_id, downstream_client)) = downstream_client {
+            downstream_client
+                .send(proto::ExternalAgentsUpdated {
+                    project_id: *project_id,
+                    names: self
+                        .external_agents
+                        .keys()
+                        .map(|name| name.to_string())
+                        .collect(),
+                })
+                .log_err();
+        }
+        cx.emit(AgentServersUpdated);
+    }
+
+    pub fn local(
+        node_runtime: NodeRuntime,
+        fs: Arc<dyn Fs>,
+        project_environment: Entity<ProjectEnvironment>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let subscription = cx.observe_global::<SettingsStore>(|this, cx| {
+            this.agent_servers_settings_changed(cx);
+        });
+        let this = Self {
+            state: AgentServerStoreState::Local {
+                node_runtime,
+                fs,
+                project_environment,
+                downstream_client: None,
+                settings: None,
+                _subscriptions: [subscription],
+            },
+            external_agents: Default::default(),
+        };
+        cx.spawn(async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(1)).await;
+            this.update(cx, |this, cx| {
+                this.agent_servers_settings_changed(cx);
+            })
+            .ok();
+        })
+        .detach();
+        this
+    }
+
+    pub(crate) fn remote(
+        project_id: u64,
+        upstream_client: Entity<RemoteClient>,
+        _cx: &mut Context<Self>,
+    ) -> Self {
+        // Set up the builtin agents here so they're immediately available in
+        // remote projects--we know that the HeadlessProject on the other end
+        // will have them.
+        let external_agents = [
+            (
+                GEMINI_NAME.into(),
+                Box::new(RemoteExternalAgentServer {
+                    project_id,
+                    upstream_client: upstream_client.clone(),
+                    name: GEMINI_NAME.into(),
+                    status_tx: None,
+                    new_version_available_tx: None,
+                }) as Box<dyn ExternalAgentServer>,
+            ),
+            (
+                CLAUDE_CODE_NAME.into(),
+                Box::new(RemoteExternalAgentServer {
+                    project_id,
+                    upstream_client: upstream_client.clone(),
+                    name: CLAUDE_CODE_NAME.into(),
+                    status_tx: None,
+                    new_version_available_tx: None,
+                }) as Box<dyn ExternalAgentServer>,
+            ),
+        ]
+        .into_iter()
+        .collect();
+
+        Self {
+            state: AgentServerStoreState::Remote {
+                project_id,
+                upstream_client,
+            },
+            external_agents,
+        }
+    }
+
+    pub(crate) fn collab(_cx: &mut Context<Self>) -> Self {
+        Self {
+            state: AgentServerStoreState::Collab,
+            external_agents: Default::default(),
+        }
+    }
+
+    pub fn shared(&mut self, project_id: u64, client: AnyProtoClient) {
+        match &mut self.state {
+            AgentServerStoreState::Local {
+                downstream_client, ..
+            } => {
+                client
+                    .send(proto::ExternalAgentsUpdated {
+                        project_id,
+                        names: self
+                            .external_agents
+                            .keys()
+                            .map(|name| name.to_string())
+                            .collect(),
+                    })
+                    .log_err();
+                *downstream_client = Some((project_id, client));
+            }
+            AgentServerStoreState::Remote { .. } => {
+                debug_panic!(
+                    "external agents over collab not implemented, remote project should not be shared"
+                );
+            }
+            AgentServerStoreState::Collab => {
+                debug_panic!("external agents over collab not implemented, should not be shared");
+            }
+        }
+    }
+
+    pub fn get_external_agent(
+        &mut self,
+        name: &ExternalAgentServerName,
+    ) -> Option<&mut (dyn ExternalAgentServer + 'static)> {
+        self.external_agents
+            .get_mut(name)
+            .map(|agent| agent.as_mut())
+    }
+
+    pub fn external_agents(&self) -> impl Iterator<Item = &ExternalAgentServerName> {
+        self.external_agents.keys()
+    }
+
+    async fn handle_get_agent_server_command(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::GetAgentServerCommand>,
+        mut cx: AsyncApp,
+    ) -> Result<proto::AgentServerCommand> {
+        let (command, root_dir, login) = this
+            .update(&mut cx, |this, cx| {
+                let AgentServerStoreState::Local {
+                    downstream_client, ..
+                } = &this.state
+                else {
+                    debug_panic!("should not receive GetAgentServerCommand in a non-local project");
+                    bail!("unexpected GetAgentServerCommand request in a non-local project");
+                };
+                let agent = this
+                    .external_agents
+                    .get_mut(&*envelope.payload.name)
+                    .with_context(|| format!("agent `{}` not found", envelope.payload.name))?;
+                let (status_tx, new_version_available_tx) = downstream_client
+                    .clone()
+                    .map(|(project_id, downstream_client)| {
+                        let (status_tx, mut status_rx) = watch::channel(SharedString::from(""));
+                        let (new_version_available_tx, mut new_version_available_rx) =
+                            watch::channel(None);
+                        cx.spawn({
+                            let downstream_client = downstream_client.clone();
+                            let name = envelope.payload.name.clone();
+                            async move |_, _| {
+                                while let Some(status) = status_rx.recv().await.ok() {
+                                    downstream_client.send(
+                                        proto::ExternalAgentLoadingStatusUpdated {
+                                            project_id,
+                                            name: name.clone(),
+                                            status: status.to_string(),
+                                        },
+                                    )?;
+                                }
+                                anyhow::Ok(())
+                            }
+                        })
+                        .detach_and_log_err(cx);
+                        cx.spawn({
+                            let name = envelope.payload.name.clone();
+                            async move |_, _| {
+                                if let Some(version) =
+                                    new_version_available_rx.recv().await.ok().flatten()
+                                {
+                                    downstream_client.send(
+                                        proto::NewExternalAgentVersionAvailable {
+                                            project_id,
+                                            name: name.clone(),
+                                            version,
+                                        },
+                                    )?;
+                                }
+                                anyhow::Ok(())
+                            }
+                        })
+                        .detach_and_log_err(cx);
+                        (status_tx, new_version_available_tx)
+                    })
+                    .unzip();
+                anyhow::Ok(agent.get_command(
+                    envelope.payload.root_dir.as_deref(),
+                    HashMap::default(),
+                    status_tx,
+                    new_version_available_tx,
+                    &mut cx.to_async(),
+                ))
+            })??
+            .await?;
+        Ok(proto::AgentServerCommand {
+            path: command.path.to_string_lossy().to_string(),
+            args: command.args,
+            env: command
+                .env
+                .map(|env| env.into_iter().collect())
+                .unwrap_or_default(),
+            root_dir: root_dir,
+            login: login.map(|login| login.to_proto()),
+        })
+    }
+
+    async fn handle_external_agents_updated(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::ExternalAgentsUpdated>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        this.update(&mut cx, |this, cx| {
+            let AgentServerStoreState::Remote {
+                project_id,
+                upstream_client,
+            } = &this.state
+            else {
+                debug_panic!(
+                    "handle_external_agents_updated should not be called for a non-remote project"
+                );
+                bail!("unexpected ExternalAgentsUpdated message")
+            };
+
+            let mut status_txs = this
+                .external_agents
+                .iter_mut()
+                .filter_map(|(name, agent)| {
+                    Some((
+                        name.clone(),
+                        agent
+                            .downcast_mut::<RemoteExternalAgentServer>()?
+                            .status_tx
+                            .take(),
+                    ))
+                })
+                .collect::<HashMap<_, _>>();
+            let mut new_version_available_txs = this
+                .external_agents
+                .iter_mut()
+                .filter_map(|(name, agent)| {
+                    Some((
+                        name.clone(),
+                        agent
+                            .downcast_mut::<RemoteExternalAgentServer>()?
+                            .new_version_available_tx
+                            .take(),
+                    ))
+                })
+                .collect::<HashMap<_, _>>();
+
+            this.external_agents = envelope
+                .payload
+                .names
+                .into_iter()
+                .map(|name| {
+                    let agent = RemoteExternalAgentServer {
+                        project_id: *project_id,
+                        upstream_client: upstream_client.clone(),
+                        name: ExternalAgentServerName(name.clone().into()),
+                        status_tx: status_txs.remove(&*name).flatten(),
+                        new_version_available_tx: new_version_available_txs
+                            .remove(&*name)
+                            .flatten(),
+                    };
+                    (
+                        ExternalAgentServerName(name.into()),
+                        Box::new(agent) as Box<dyn ExternalAgentServer>,
+                    )
+                })
+                .collect();
+            cx.emit(AgentServersUpdated);
+            Ok(())
+        })?
+    }
+
+    async fn handle_loading_status_updated(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::ExternalAgentLoadingStatusUpdated>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        this.update(&mut cx, |this, _| {
+            if let Some(agent) = this.external_agents.get_mut(&*envelope.payload.name)
+                && let Some(agent) = agent.downcast_mut::<RemoteExternalAgentServer>()
+                && let Some(status_tx) = &mut agent.status_tx
+            {
+                status_tx.send(envelope.payload.status.into()).ok();
+            }
+        })
+    }
+
+    async fn handle_new_version_available(
+        this: Entity<Self>,
+        envelope: TypedEnvelope<proto::NewExternalAgentVersionAvailable>,
+        mut cx: AsyncApp,
+    ) -> Result<()> {
+        this.update(&mut cx, |this, _| {
+            if let Some(agent) = this.external_agents.get_mut(&*envelope.payload.name)
+                && let Some(agent) = agent.downcast_mut::<RemoteExternalAgentServer>()
+                && let Some(new_version_available_tx) = &mut agent.new_version_available_tx
+            {
+                new_version_available_tx
+                    .send(Some(envelope.payload.version))
+                    .ok();
+            }
+        })
+    }
+}
+
+fn get_or_npm_install_builtin_agent(
+    binary_name: SharedString,
+    package_name: SharedString,
+    entrypoint_path: PathBuf,
+    minimum_version: Option<semver::Version>,
+    status_tx: Option<watch::Sender<SharedString>>,
+    new_version_available: Option<watch::Sender<Option<String>>>,
+    fs: Arc<dyn Fs>,
+    node_runtime: NodeRuntime,
+    cx: &mut AsyncApp,
+) -> Task<std::result::Result<AgentServerCommand, anyhow::Error>> {
+    cx.spawn(async move |cx| {
+        let node_path = node_runtime.binary_path().await?;
+        let dir = paths::data_dir()
+            .join("external_agents")
+            .join(binary_name.as_str());
+        fs.create_dir(&dir).await?;
+
+        let mut stream = fs.read_dir(&dir).await?;
+        let mut versions = Vec::new();
+        let mut to_delete = Vec::new();
+        while let Some(entry) = stream.next().await {
+            let Ok(entry) = entry else { continue };
+            let Some(file_name) = entry.file_name() else {
+                continue;
+            };
+
+            if let Some(name) = file_name.to_str()
+                && let Some(version) = semver::Version::from_str(name).ok()
+                && fs
+                    .is_file(&dir.join(file_name).join(&entrypoint_path))
+                    .await
+            {
+                versions.push((version, file_name.to_owned()));
+            } else {
+                to_delete.push(file_name.to_owned())
+            }
+        }
+
+        versions.sort();
+        let newest_version = if let Some((version, file_name)) = versions.last().cloned()
+            && minimum_version.is_none_or(|minimum_version| version >= minimum_version)
+        {
+            versions.pop();
+            Some(file_name)
+        } else {
+            None
+        };
+        log::debug!("existing version of {package_name}: {newest_version:?}");
+        to_delete.extend(versions.into_iter().map(|(_, file_name)| file_name));
+
+        cx.background_spawn({
+            let fs = fs.clone();
+            let dir = dir.clone();
+            async move {
+                for file_name in to_delete {
+                    fs.remove_dir(
+                        &dir.join(file_name),
+                        RemoveOptions {
+                            recursive: true,
+                            ignore_if_not_exists: false,
+                        },
+                    )
+                    .await
+                    .ok();
+                }
+            }
+        })
+        .detach();
+
+        let version = if let Some(file_name) = newest_version {
+            cx.background_spawn({
+                let file_name = file_name.clone();
+                let dir = dir.clone();
+                let fs = fs.clone();
+                async move {
+                    let latest_version =
+                        node_runtime.npm_package_latest_version(&package_name).await;
+                    if let Ok(latest_version) = latest_version
+                        && &latest_version != &file_name.to_string_lossy()
+                    {
+                        download_latest_version(
+                            fs,
+                            dir.clone(),
+                            node_runtime,
+                            package_name.clone(),
+                        )
+                        .await
+                        .log_err();
+                        if let Some(mut new_version_available) = new_version_available {
+                            new_version_available.send(Some(latest_version)).ok();
+                        }
+                    }
+                }
+            })
+            .detach();
+            file_name
+        } else {
+            if let Some(mut status_tx) = status_tx {
+                status_tx.send("Installing…".into()).ok();
+            }
+            let dir = dir.clone();
+            cx.background_spawn(download_latest_version(
+                fs.clone(),
+                dir.clone(),
+                node_runtime,
+                package_name.clone(),
+            ))
+            .await?
+            .into()
+        };
+
+        let agent_server_path = dir.join(version).join(entrypoint_path);
+        let agent_server_path_exists = fs.is_file(&agent_server_path).await;
+        anyhow::ensure!(
+            agent_server_path_exists,
+            "Missing entrypoint path {} after installation",
+            agent_server_path.to_string_lossy()
+        );
+
+        anyhow::Ok(AgentServerCommand {
+            path: node_path,
+            args: vec![agent_server_path.to_string_lossy().to_string()],
+            env: None,
+        })
+    })
+}
+
+fn find_bin_in_path(
+    bin_name: SharedString,
+    root_dir: PathBuf,
+    env: HashMap<String, String>,
+    cx: &mut AsyncApp,
+) -> Task<Option<PathBuf>> {
+    cx.background_executor().spawn(async move {
+        let which_result = if cfg!(windows) {
+            which::which(bin_name.as_str())
+        } else {
+            let shell_path = env.get("PATH").cloned();
+            which::which_in(bin_name.as_str(), shell_path.as_ref(), &root_dir)
+        };
+
+        if let Err(which::Error::CannotFindBinaryPath) = which_result {
+            return None;
+        }
+
+        which_result.log_err()
+    })
+}
+
+async fn download_latest_version(
+    fs: Arc<dyn Fs>,
+    dir: PathBuf,
+    node_runtime: NodeRuntime,
+    package_name: SharedString,
+) -> Result<String> {
+    log::debug!("downloading latest version of {package_name}");
+
+    let tmp_dir = tempfile::tempdir_in(&dir)?;
+
+    node_runtime
+        .npm_install_packages(tmp_dir.path(), &[(&package_name, "latest")])
+        .await?;
+
+    let version = node_runtime
+        .npm_package_installed_version(tmp_dir.path(), &package_name)
+        .await?
+        .context("expected package to be installed")?;
+
+    fs.rename(
+        &tmp_dir.keep(),
+        &dir.join(&version),
+        RenameOptions {
+            ignore_if_exists: true,
+            overwrite: false,
+        },
+    )
+    .await?;
+
+    anyhow::Ok(version)
+}
+
+struct RemoteExternalAgentServer {
+    project_id: u64,
+    upstream_client: Entity<RemoteClient>,
+    name: ExternalAgentServerName,
+    status_tx: Option<watch::Sender<SharedString>>,
+    new_version_available_tx: Option<watch::Sender<Option<String>>>,
+}
+
+// new method: status_updated
+// does nothing in the all-local case
+// for RemoteExternalAgentServer, sends on the stored tx
+// etc.
+
+impl ExternalAgentServer for RemoteExternalAgentServer {
+    fn get_command(
+        &mut self,
+        root_dir: Option<&str>,
+        extra_env: HashMap<String, String>,
+        status_tx: Option<watch::Sender<SharedString>>,
+        new_version_available_tx: Option<watch::Sender<Option<String>>>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
+        let project_id = self.project_id;
+        let name = self.name.to_string();
+        let upstream_client = self.upstream_client.downgrade();
+        let root_dir = root_dir.map(|root_dir| root_dir.to_owned());
+        self.status_tx = status_tx;
+        self.new_version_available_tx = new_version_available_tx;
+        cx.spawn(async move |cx| {
+            let mut response = upstream_client
+                .update(cx, |upstream_client, _| {
+                    upstream_client
+                        .proto_client()
+                        .request(proto::GetAgentServerCommand {
+                            project_id,
+                            name,
+                            root_dir: root_dir.clone(),
+                        })
+                })?
+                .await?;
+            let root_dir = response.root_dir;
+            response.env.extend(extra_env);
+            let command = upstream_client.update(cx, |client, _| {
+                client.build_command(
+                    Some(response.path),
+                    &response.args,
+                    &response.env.into_iter().collect(),
+                    Some(root_dir.clone()),
+                    None,
+                )
+            })??;
+            Ok((
+                AgentServerCommand {
+                    path: command.program.into(),
+                    args: command.args,
+                    env: Some(command.env),
+                },
+                root_dir,
+                response
+                    .login
+                    .map(|login| task::SpawnInTerminal::from_proto(login)),
+            ))
+        })
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+struct LocalGemini {
+    fs: Arc<dyn Fs>,
+    node_runtime: NodeRuntime,
+    project_environment: Entity<ProjectEnvironment>,
+    custom_command: Option<AgentServerCommand>,
+    ignore_system_version: bool,
+}
+
+impl ExternalAgentServer for LocalGemini {
+    fn get_command(
+        &mut self,
+        root_dir: Option<&str>,
+        extra_env: HashMap<String, String>,
+        status_tx: Option<watch::Sender<SharedString>>,
+        new_version_available_tx: Option<watch::Sender<Option<String>>>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
+        let fs = self.fs.clone();
+        let node_runtime = self.node_runtime.clone();
+        let project_environment = self.project_environment.downgrade();
+        let custom_command = self.custom_command.clone();
+        let ignore_system_version = self.ignore_system_version;
+        let root_dir: Arc<Path> = root_dir
+            .map(|root_dir| Path::new(root_dir))
+            .unwrap_or(paths::home_dir())
+            .into();
+
+        cx.spawn(async move |cx| {
+            let mut env = project_environment
+                .update(cx, |project_environment, cx| {
+                    project_environment.get_directory_environment(root_dir.clone(), cx)
+                })?
+                .await
+                .unwrap_or_default();
+
+            let mut command = if let Some(mut custom_command) = custom_command {
+                env.extend(custom_command.env.unwrap_or_default());
+                custom_command.env = Some(env);
+                custom_command
+            } else if !ignore_system_version
+                && let Some(bin) =
+                    find_bin_in_path("gemini".into(), root_dir.to_path_buf(), env.clone(), cx).await
+            {
+                AgentServerCommand {
+                    path: bin,
+                    args: Vec::new(),
+                    env: Some(env),
+                }
+            } else {
+                let mut command = get_or_npm_install_builtin_agent(
+                    GEMINI_NAME.into(),
+                    "@google/gemini-cli".into(),
+                    "node_modules/@google/gemini-cli/dist/index.js".into(),
+                    Some("0.2.1".parse().unwrap()),
+                    status_tx,
+                    new_version_available_tx,
+                    fs,
+                    node_runtime,
+                    cx,
+                )
+                .await?;
+                command.env = Some(env);
+                command
+            };
+
+            // Gemini CLI doesn't seem to have a dedicated invocation for logging in--we just run it normally without any arguments.
+            let login = task::SpawnInTerminal {
+                command: Some(command.path.clone().to_proto()),
+                args: command.args.clone(),
+                env: command.env.clone().unwrap_or_default(),
+                label: "gemini /auth".into(),
+                ..Default::default()
+            };
+
+            command.env.get_or_insert_default().extend(extra_env);
+            command.args.push("--experimental-acp".into());
+            Ok((command, root_dir.to_proto(), Some(login)))
+        })
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+struct LocalClaudeCode {
+    fs: Arc<dyn Fs>,
+    node_runtime: NodeRuntime,
+    project_environment: Entity<ProjectEnvironment>,
+    custom_command: Option<AgentServerCommand>,
+}
+
+impl ExternalAgentServer for LocalClaudeCode {
+    fn get_command(
+        &mut self,
+        root_dir: Option<&str>,
+        extra_env: HashMap<String, String>,
+        status_tx: Option<watch::Sender<SharedString>>,
+        new_version_available_tx: Option<watch::Sender<Option<String>>>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
+        let fs = self.fs.clone();
+        let node_runtime = self.node_runtime.clone();
+        let project_environment = self.project_environment.downgrade();
+        let custom_command = self.custom_command.clone();
+        let root_dir: Arc<Path> = root_dir
+            .map(|root_dir| Path::new(root_dir))
+            .unwrap_or(paths::home_dir())
+            .into();
+
+        cx.spawn(async move |cx| {
+            let mut env = project_environment
+                .update(cx, |project_environment, cx| {
+                    project_environment.get_directory_environment(root_dir.clone(), cx)
+                })?
+                .await
+                .unwrap_or_default();
+            env.insert("ANTHROPIC_API_KEY".into(), "".into());
+
+            let (mut command, login) = if let Some(mut custom_command) = custom_command {
+                env.extend(custom_command.env.unwrap_or_default());
+                custom_command.env = Some(env);
+                (custom_command, None)
+            } else {
+                let mut command = get_or_npm_install_builtin_agent(
+                    "claude-code-acp".into(),
+                    "@zed-industries/claude-code-acp".into(),
+                    "node_modules/@zed-industries/claude-code-acp/dist/index.js".into(),
+                    Some("0.2.5".parse().unwrap()),
+                    status_tx,
+                    new_version_available_tx,
+                    fs,
+                    node_runtime,
+                    cx,
+                )
+                .await?;
+                command.env = Some(env);
+                let login = command
+                    .args
+                    .first()
+                    .and_then(|path| {
+                        path.strip_suffix("/@zed-industries/claude-code-acp/dist/index.js")
+                    })
+                    .map(|path_prefix| task::SpawnInTerminal {
+                        command: Some(command.path.clone().to_proto()),
+                        args: vec![
+                            Path::new(path_prefix)
+                                .join("@anthropic-ai/claude-code/cli.js")
+                                .to_string_lossy()
+                                .to_string(),
+                            "/login".into(),
+                        ],
+                        env: command.env.clone().unwrap_or_default(),
+                        label: "claude /login".into(),
+                        ..Default::default()
+                    });
+                (command, login)
+            };
+
+            command.env.get_or_insert_default().extend(extra_env);
+            Ok((command, root_dir.to_proto(), login))
+        })
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+struct LocalCustomAgent {
+    project_environment: Entity<ProjectEnvironment>,
+    command: AgentServerCommand,
+}
+
+impl ExternalAgentServer for LocalCustomAgent {
+    fn get_command(
+        &mut self,
+        root_dir: Option<&str>,
+        extra_env: HashMap<String, String>,
+        _status_tx: Option<watch::Sender<SharedString>>,
+        _new_version_available_tx: Option<watch::Sender<Option<String>>>,
+        cx: &mut AsyncApp,
+    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
+        let mut command = self.command.clone();
+        let root_dir: Arc<Path> = root_dir
+            .map(|root_dir| Path::new(root_dir))
+            .unwrap_or(paths::home_dir())
+            .into();
+        let project_environment = self.project_environment.downgrade();
+        cx.spawn(async move |cx| {
+            let mut env = project_environment
+                .update(cx, |project_environment, cx| {
+                    project_environment.get_directory_environment(root_dir.clone(), cx)
+                })?
+                .await
+                .unwrap_or_default();
+            env.extend(command.env.unwrap_or_default());
+            env.extend(extra_env);
+            command.env = Some(env);
+            Ok((command, root_dir.to_proto(), None))
+        })
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+pub const GEMINI_NAME: &'static str = "gemini";
+pub const CLAUDE_CODE_NAME: &'static str = "claude";
+
+#[derive(
+    Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi, SettingsKey, PartialEq,
+)]
+#[settings_key(key = "agent_servers")]
+pub struct AllAgentServersSettings {
+    pub gemini: Option<BuiltinAgentServerSettings>,
+    pub claude: Option<CustomAgentServerSettings>,
+
+    /// Custom agent servers configured by the user
+    #[serde(flatten)]
+    pub custom: HashMap<SharedString, CustomAgentServerSettings>,
+}
+
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
+pub struct BuiltinAgentServerSettings {
+    /// Absolute path to a binary to be used when launching this agent.
+    ///
+    /// This can be used to run a specific binary without automatic downloads or searching `$PATH`.
+    #[serde(rename = "command")]
+    pub path: Option<PathBuf>,
+    /// If a binary is specified in `command`, it will be passed these arguments.
+    pub args: Option<Vec<String>>,
+    /// If a binary is specified in `command`, it will be passed these environment variables.
+    pub env: Option<HashMap<String, String>>,
+    /// Whether to skip searching `$PATH` for an agent server binary when
+    /// launching this agent.
+    ///
+    /// This has no effect if a `command` is specified. Otherwise, when this is
+    /// `false`, Zed will search `$PATH` for an agent server binary and, if one
+    /// is found, use it for threads with this agent. If no agent binary is
+    /// found on `$PATH`, Zed will automatically install and use its own binary.
+    /// When this is `true`, Zed will not search `$PATH`, and will always use
+    /// its own binary.
+    ///
+    /// Default: true
+    pub ignore_system_version: Option<bool>,
+}
+
+impl BuiltinAgentServerSettings {
+    pub(crate) fn custom_command(self) -> Option<AgentServerCommand> {
+        self.path.map(|path| AgentServerCommand {
+            path,
+            args: self.args.unwrap_or_default(),
+            env: self.env,
+        })
+    }
+}
+
+impl From<AgentServerCommand> for BuiltinAgentServerSettings {
+    fn from(value: AgentServerCommand) -> Self {
+        BuiltinAgentServerSettings {
+            path: Some(value.path),
+            args: Some(value.args),
+            env: value.env,
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
+pub struct CustomAgentServerSettings {
+    #[serde(flatten)]
+    pub command: AgentServerCommand,
+}
+
+impl settings::Settings for AllAgentServersSettings {
+    type FileContent = Self;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        let mut settings = AllAgentServersSettings::default();
+
+        for AllAgentServersSettings {
+            gemini,
+            claude,
+            custom,
+        } in sources.defaults_and_customizations()
+        {
+            if gemini.is_some() {
+                settings.gemini = gemini.clone();
+            }
+            if claude.is_some() {
+                settings.claude = claude.clone();
+            }
+
+            // Merge custom agents
+            for (name, config) in custom {
+                // Skip built-in agent names to avoid conflicts
+                if name != GEMINI_NAME && name != CLAUDE_CODE_NAME {
+                    settings.custom.insert(name.clone(), config.clone());
+                }
+            }
+        }
+
+        Ok(settings)
+    }
+
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
+}
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index a2bd4ee7b7..1ef3de7a16 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1,3 +1,4 @@
+pub mod agent_server_store;
 pub mod buffer_store;
 mod color_extractor;
 pub mod connection_manager;
@@ -34,7 +35,11 @@ mod yarn;
 
 use dap::inline_value::{InlineValueLocation, VariableLookupKind, VariableScope};
 
-use crate::{git_store::GitStore, lsp_store::log_store::LogKind};
+use crate::{
+    agent_server_store::{AgentServerStore, AllAgentServersSettings},
+    git_store::GitStore,
+    lsp_store::log_store::LogKind,
+};
 pub use git_store::{
     ConflictRegion, ConflictSet, ConflictSetSnapshot, ConflictSetUpdate,
     git_traversal::{ChildEntriesGitIter, GitEntry, GitEntryRef, GitTraversal},
@@ -179,6 +184,7 @@ pub struct Project {
     buffer_ordered_messages_tx: mpsc::UnboundedSender<BufferOrderedMessage>,
     languages: Arc<LanguageRegistry>,
     dap_store: Entity<DapStore>,
+    agent_server_store: Entity<AgentServerStore>,
 
     breakpoint_store: Entity<BreakpointStore>,
     collab_client: Arc<client::Client>,
@@ -1019,6 +1025,7 @@ impl Project {
         WorktreeSettings::register(cx);
         ProjectSettings::register(cx);
         DisableAiSettings::register(cx);
+        AllAgentServersSettings::register(cx);
     }
 
     pub fn init(client: &Arc<Client>, cx: &mut App) {
@@ -1174,6 +1181,10 @@ impl Project {
                 )
             });
 
+            let agent_server_store = cx.new(|cx| {
+                AgentServerStore::local(node.clone(), fs.clone(), environment.clone(), cx)
+            });
+
             cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
 
             Self {
@@ -1200,6 +1211,7 @@ impl Project {
                 remote_client: None,
                 breakpoint_store,
                 dap_store,
+                agent_server_store,
 
                 buffers_needing_diff: Default::default(),
                 git_diff_debouncer: DebouncedDelay::new(),
@@ -1338,6 +1350,9 @@ impl Project {
                 )
             });
 
+            let agent_server_store =
+                cx.new(|cx| AgentServerStore::remote(REMOTE_SERVER_PROJECT_ID, remote.clone(), cx));
+
             cx.subscribe(&remote, Self::on_remote_client_event).detach();
 
             let this = Self {
@@ -1353,6 +1368,7 @@ impl Project {
                 join_project_response_message_id: 0,
                 client_state: ProjectClientState::Local,
                 git_store,
+                agent_server_store,
                 client_subscriptions: Vec::new(),
                 _subscriptions: vec![
                     cx.on_release(Self::release),
@@ -1407,6 +1423,7 @@ impl Project {
             remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.dap_store);
             remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.settings_observer);
             remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.git_store);
+            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.agent_server_store);
 
             remote_proto.add_entity_message_handler(Self::handle_create_buffer_for_peer);
             remote_proto.add_entity_message_handler(Self::handle_update_worktree);
@@ -1422,6 +1439,7 @@ impl Project {
             ToolchainStore::init(&remote_proto);
             DapStore::init(&remote_proto, cx);
             GitStore::init(&remote_proto);
+            AgentServerStore::init_remote(&remote_proto);
 
             this
         })
@@ -1564,6 +1582,8 @@ impl Project {
             )
         })?;
 
+        let agent_server_store = cx.new(|cx| AgentServerStore::collab(cx))?;
+
         let project = cx.new(|cx| {
             let replica_id = response.payload.replica_id as ReplicaId;
 
@@ -1624,6 +1644,7 @@ impl Project {
                 breakpoint_store,
                 dap_store: dap_store.clone(),
                 git_store: git_store.clone(),
+                agent_server_store,
                 buffers_needing_diff: Default::default(),
                 git_diff_debouncer: DebouncedDelay::new(),
                 terminals: Terminals {
@@ -5199,6 +5220,10 @@ impl Project {
         &self.git_store
     }
 
+    pub fn agent_server_store(&self) -> &Entity<AgentServerStore> {
+        &self.agent_server_store
+    }
+
     #[cfg(test)]
     fn git_scans_complete(&self, cx: &Context<Self>) -> Task<()> {
         cx.spawn(async move |this, cx| {
diff --git a/crates/proto/proto/ai.proto b/crates/proto/proto/ai.proto
index 1064ed2f8d..9b4cc27dcb 100644
--- a/crates/proto/proto/ai.proto
+++ b/crates/proto/proto/ai.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package zed.messages;
 
 import "buffer.proto";
+import "task.proto";
 
 message Context {
     repeated ContextOperation operations = 1;
@@ -164,3 +165,35 @@ enum LanguageModelRole {
     LanguageModelSystem = 2;
     reserved 3;
 }
+
+message GetAgentServerCommand {
+    uint64 project_id = 1;
+    string name = 2;
+    optional string root_dir = 3;
+}
+
+message AgentServerCommand {
+    string path = 1;
+    repeated string args = 2;
+    map<string, string> env = 3;
+    string root_dir = 4;
+
+    optional SpawnInTerminal login = 5;
+}
+
+message ExternalAgentsUpdated {
+    uint64 project_id = 1;
+    repeated string names = 2;
+}
+
+message ExternalAgentLoadingStatusUpdated {
+    uint64 project_id = 1;
+    string name = 2;
+    string status = 3;
+}
+
+message NewExternalAgentVersionAvailable {
+    uint64 project_id = 1;
+    string name = 2;
+    string version = 3;
+}
diff --git a/crates/proto/proto/debugger.proto b/crates/proto/proto/debugger.proto
index e3cb5ebbce..dcfb91c77d 100644
--- a/crates/proto/proto/debugger.proto
+++ b/crates/proto/proto/debugger.proto
@@ -3,6 +3,7 @@ package zed.messages;
 
 import "core.proto";
 import "buffer.proto";
+import "task.proto";
 
 enum BreakpointState {
     Enabled = 0;
@@ -533,14 +534,6 @@ message DebugScenario {
     optional string configuration = 7;
 }
 
-message SpawnInTerminal {
-    string label = 1;
-    optional string command = 2;
-    repeated string args = 3;
-    map<string, string> env = 4;
-    optional string cwd = 5;
-}
-
 message LogToDebugConsole {
     uint64 project_id = 1;
     uint64 session_id = 2;
diff --git a/crates/proto/proto/task.proto b/crates/proto/proto/task.proto
index e6fa192ab5..8fc3a6d18e 100644
--- a/crates/proto/proto/task.proto
+++ b/crates/proto/proto/task.proto
@@ -40,3 +40,11 @@ enum HideStrategy {
     HideNever = 1;
     HideOnSuccess = 2;
 }
+
+message SpawnInTerminal {
+    string label = 1;
+    optional string command = 2;
+    repeated string args = 3;
+    map<string, string> env = 4;
+    optional string cwd = 5;
+}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 39fa1fdd53..3286b9e752 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -405,7 +405,15 @@ message Envelope {
         GetProcessesResponse get_processes_response = 370;
 
         ResolveToolchain resolve_toolchain = 371;
-        ResolveToolchainResponse resolve_toolchain_response = 372; // current max
+        ResolveToolchainResponse resolve_toolchain_response = 372;
+
+        GetAgentServerCommand get_agent_server_command = 373;
+        AgentServerCommand agent_server_command = 374;
+
+        ExternalAgentsUpdated external_agents_updated = 375;
+
+        ExternalAgentLoadingStatusUpdated external_agent_loading_status_updated = 376;
+        NewExternalAgentVersionAvailable new_external_agent_version_available = 377; // current max
     }
 
     reserved 87 to 88;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 4c0fc3dc98..79e6b414ef 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -319,6 +319,11 @@ messages!(
     (GitClone, Background),
     (GitCloneResponse, Background),
     (ToggleLspLogs, Background),
+    (GetAgentServerCommand, Background),
+    (AgentServerCommand, Background),
+    (ExternalAgentsUpdated, Background),
+    (ExternalAgentLoadingStatusUpdated, Background),
+    (NewExternalAgentVersionAvailable, Background),
 );
 
 request_messages!(
@@ -491,6 +496,7 @@ request_messages!(
     (GitClone, GitCloneResponse),
     (ToggleLspLogs, Ack),
     (GetProcesses, GetProcessesResponse),
+    (GetAgentServerCommand, AgentServerCommand)
 );
 
 lsp_messages!(
@@ -644,7 +650,11 @@ entity_messages!(
     GetDocumentDiagnostics,
     PullWorkspaceDiagnostics,
     GetDefaultBranch,
-    GitClone
+    GitClone,
+    GetAgentServerCommand,
+    ExternalAgentsUpdated,
+    ExternalAgentLoadingStatusUpdated,
+    NewExternalAgentVersionAvailable,
 );
 
 entity_messages!(
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 2714e9ff79..bdfd46002e 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -12,6 +12,7 @@ use node_runtime::NodeRuntime;
 use project::{
     LspStore, LspStoreEvent, ManifestTree, PrettierStore, ProjectEnvironment, ProjectPath,
     ToolchainStore, WorktreeId,
+    agent_server_store::AgentServerStore,
     buffer_store::{BufferStore, BufferStoreEvent},
     debugger::{breakpoint_store::BreakpointStore, dap_store::DapStore},
     git_store::GitStore,
@@ -44,6 +45,7 @@ pub struct HeadlessProject {
     pub lsp_store: Entity<LspStore>,
     pub task_store: Entity<TaskStore>,
     pub dap_store: Entity<DapStore>,
+    pub agent_server_store: Entity<AgentServerStore>,
     pub settings_observer: Entity<SettingsObserver>,
     pub next_entry_id: Arc<AtomicUsize>,
     pub languages: Arc<LanguageRegistry>,
@@ -182,7 +184,7 @@ impl HeadlessProject {
                     .as_local_store()
                     .expect("Toolchain store to be local")
                     .clone(),
-                environment,
+                environment.clone(),
                 manifest_tree,
                 languages.clone(),
                 http_client.clone(),
@@ -193,6 +195,13 @@ impl HeadlessProject {
             lsp_store
         });
 
+        let agent_server_store = cx.new(|cx| {
+            let mut agent_server_store =
+                AgentServerStore::local(node_runtime.clone(), fs.clone(), environment, cx);
+            agent_server_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone());
+            agent_server_store
+        });
+
         cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
         language_extension::init(
             language_extension::LspAccess::ViaLspStore(lsp_store.clone()),
@@ -226,6 +235,7 @@ impl HeadlessProject {
         session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &dap_store);
         session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &settings_observer);
         session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &git_store);
+        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &agent_server_store);
 
         session.add_request_handler(cx.weak_entity(), Self::handle_list_remote_directory);
         session.add_request_handler(cx.weak_entity(), Self::handle_get_path_metadata);
@@ -264,6 +274,7 @@ impl HeadlessProject {
         // todo(debugger): Re init breakpoint store when we set it up for collab
         // BreakpointStore::init(&client);
         GitStore::init(&session);
+        AgentServerStore::init_headless(&session);
 
         HeadlessProject {
             next_entry_id: Default::default(),
@@ -275,6 +286,7 @@ impl HeadlessProject {
             lsp_store,
             task_store,
             dap_store,
+            agent_server_store,
             languages,
             extensions,
             git_store,
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index bee6c87670..6f1934456d 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -24,7 +24,6 @@ acp_tools.workspace = true
 agent.workspace = true
 agent_ui.workspace = true
 agent_settings.workspace = true
-agent_servers.workspace = true
 anyhow.workspace = true
 askpass.workspace = true
 assets.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 3287e866e4..ab24224119 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -567,7 +567,6 @@ pub fn main() {
         language_model::init(app_state.client.clone(), cx);
         language_models::init(app_state.user_store.clone(), app_state.client.clone(), cx);
         agent_settings::init(cx);
-        agent_servers::init(cx);
         acp_tools::init(cx);
         web_search::init(cx);
         web_search_providers::init(app_state.client.clone(), cx);

From fa0df6da1c2c6ab4394826c035183fdf1804f7e2 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 8 Sep 2025 15:15:17 -0400
Subject: [PATCH 688/823] python: Replace pyright with basedpyright (#35362)

Follow-up to #35250. Let's experiment with having this by default on
nightly.

Release Notes:

- Added built-in support for the basedpyright language server for Python
code. basedpyright is now enabled by default, and pyright (previously
the primary Python language server) remains available but is disabled by
default. This supersedes the basedpyright extension, which can be
uninstalled. Advantages of basedpyright over pyright include support for
inlay hints, semantic highlighting, auto-import code actions, and
stricter type checking. To switch back to pyright, add the following
configuration to settings.json:

```json
{
  "languages": {
    "Python": {
      "language_servers": ["pyright", "pylsp", "!basedpyright"]
    }
  }
}
```

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 Cargo.lock                                    | 15 ++-
 Cargo.toml                                    |  2 +
 crates/language/src/language.rs               |  9 ++
 crates/language/src/language_registry.rs      | 43 ++++++---
 .../src/extension_lsp_adapter.rs              |  4 +
 crates/language_onboarding/Cargo.toml         | 30 ++++++
 crates/language_onboarding/LICENSE-GPL        |  1 +
 crates/language_onboarding/src/python.rs      | 95 +++++++++++++++++++
 crates/languages/Cargo.toml                   |  1 -
 crates/languages/src/lib.rs                   | 46 ++-------
 crates/languages/src/python.rs                | 44 ++++++---
 crates/lsp/src/lsp.rs                         |  6 ++
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/zed.rs                         |  3 +
 14 files changed, 233 insertions(+), 67 deletions(-)
 create mode 100644 crates/language_onboarding/Cargo.toml
 create mode 120000 crates/language_onboarding/LICENSE-GPL
 create mode 100644 crates/language_onboarding/src/python.rs

diff --git a/Cargo.lock b/Cargo.lock
index 09106277c7..47281f51fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9181,6 +9181,19 @@ dependencies = [
  "x_ai",
 ]
 
+[[package]]
+name = "language_onboarding"
+version = "0.1.0"
+dependencies = [
+ "db",
+ "editor",
+ "gpui",
+ "project",
+ "ui",
+ "workspace",
+ "workspace-hack",
+]
+
 [[package]]
 name = "language_selector"
 version = "0.1.0"
@@ -9243,7 +9256,6 @@ dependencies = [
  "chrono",
  "collections",
  "dap",
- "feature_flags",
  "futures 0.3.31",
  "gpui",
  "http_client",
@@ -20428,6 +20440,7 @@ dependencies = [
  "language_extension",
  "language_model",
  "language_models",
+ "language_onboarding",
  "language_selector",
  "language_tools",
  "languages",
diff --git a/Cargo.toml b/Cargo.toml
index c8d555a242..0f13835f0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,6 +94,7 @@ members = [
     "crates/language_extension",
     "crates/language_model",
     "crates/language_models",
+    "crates/language_onboarding",
     "crates/language_selector",
     "crates/language_tools",
     "crates/languages",
@@ -320,6 +321,7 @@ language = { path = "crates/language" }
 language_extension = { path = "crates/language_extension" }
 language_model = { path = "crates/language_model" }
 language_models = { path = "crates/language_models" }
+language_onboarding = { path = "crates/language_onboarding" }
 language_selector = { path = "crates/language_selector" }
 language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 86faf2b9d3..256f6d4573 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -590,6 +590,11 @@ pub trait LspAdapter: 'static + Send + Sync {
             "Not implemented for this adapter. This method should only be called on the default JSON language server adapter"
         );
     }
+
+    /// True for the extension adapter and false otherwise.
+    fn is_extension(&self) -> bool {
+        false
+    }
 }
 
 async fn try_fetch_server_binary<L: LspAdapter + 'static + Send + Sync + ?Sized>(
@@ -2270,6 +2275,10 @@ impl LspAdapter for FakeLspAdapter {
         let label_for_completion = self.label_for_completion.as_ref()?;
         label_for_completion(item, language)
     }
+
+    fn is_extension(&self) -> bool {
+        false
+    }
 }
 
 fn get_capture_indices(query: &Query, captures: &mut [(&str, &mut Option<u32>)]) {
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index 4f07240e44..5d9d5529c1 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -374,14 +374,23 @@ impl LanguageRegistry {
     pub fn register_available_lsp_adapter(
         &self,
         name: LanguageServerName,
-        load: impl Fn() -> Arc<dyn LspAdapter> + 'static + Send + Sync,
+        adapter: Arc<dyn LspAdapter>,
     ) {
-        self.state.write().available_lsp_adapters.insert(
+        let mut state = self.state.write();
+
+        if adapter.is_extension()
+            && let Some(existing_adapter) = state.all_lsp_adapters.get(&name)
+            && !existing_adapter.adapter.is_extension()
+        {
+            log::warn!(
+                "not registering extension-provided language server {name:?}, since a builtin language server exists with that name",
+            );
+            return;
+        }
+
+        state.available_lsp_adapters.insert(
             name,
-            Arc::new(move || {
-                let lsp_adapter = load();
-                CachedLspAdapter::new(lsp_adapter)
-            }),
+            Arc::new(move || CachedLspAdapter::new(adapter.clone())),
         );
     }
 
@@ -396,13 +405,21 @@ impl LanguageRegistry {
         Some(load_lsp_adapter())
     }
 
-    pub fn register_lsp_adapter(
-        &self,
-        language_name: LanguageName,
-        adapter: Arc<dyn LspAdapter>,
-    ) -> Arc<CachedLspAdapter> {
-        let cached = CachedLspAdapter::new(adapter);
+    pub fn register_lsp_adapter(&self, language_name: LanguageName, adapter: Arc<dyn LspAdapter>) {
         let mut state = self.state.write();
+
+        if adapter.is_extension()
+            && let Some(existing_adapter) = state.all_lsp_adapters.get(&adapter.name())
+            && !existing_adapter.adapter.is_extension()
+        {
+            log::warn!(
+                "not registering extension-provided language server {:?} for language {language_name:?}, since a builtin language server exists with that name",
+                adapter.name(),
+            );
+            return;
+        }
+
+        let cached = CachedLspAdapter::new(adapter);
         state
             .lsp_adapters
             .entry(language_name)
@@ -411,8 +428,6 @@ impl LanguageRegistry {
         state
             .all_lsp_adapters
             .insert(cached.name.clone(), cached.clone());
-
-        cached
     }
 
     /// Register a fake language server and adapter
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 9b6e467f2f..c1bc058a34 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -398,6 +398,10 @@ impl LspAdapter for ExtensionLspAdapter {
 
         Ok(labels_from_extension(labels, language))
     }
+
+    fn is_extension(&self) -> bool {
+        true
+    }
 }
 
 fn labels_from_extension(
diff --git a/crates/language_onboarding/Cargo.toml b/crates/language_onboarding/Cargo.toml
new file mode 100644
index 0000000000..a437adf119
--- /dev/null
+++ b/crates/language_onboarding/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "language_onboarding"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/python.rs"
+
+[features]
+default = []
+
+[dependencies]
+db.workspace = true
+editor.workspace = true
+gpui.workspace = true
+project.workspace = true
+ui.workspace = true
+workspace.workspace = true
+workspace-hack.workspace = true
+
+# Uncomment other workspace dependencies as needed
+# assistant.workspace = true
+# client.workspace = true
+# project.workspace = true
+# settings.workspace = true
diff --git a/crates/language_onboarding/LICENSE-GPL b/crates/language_onboarding/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/language_onboarding/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_onboarding/src/python.rs b/crates/language_onboarding/src/python.rs
new file mode 100644
index 0000000000..405a265db9
--- /dev/null
+++ b/crates/language_onboarding/src/python.rs
@@ -0,0 +1,95 @@
+use db::kvp::Dismissable;
+use editor::Editor;
+use gpui::{Context, EventEmitter, Subscription};
+use ui::{
+    Banner, Button, Clickable, Color, FluentBuilder as _, IconButton, IconName,
+    InteractiveElement as _, IntoElement, Label, LabelCommon, LabelSize, ParentElement as _,
+    Render, Styled as _, Window, div, h_flex, v_flex,
+};
+use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace};
+
+pub struct BasedPyrightBanner {
+    dismissed: bool,
+    have_basedpyright: bool,
+    _subscriptions: [Subscription; 1],
+}
+
+impl Dismissable for BasedPyrightBanner {
+    const KEY: &str = "basedpyright-banner";
+}
+
+impl BasedPyrightBanner {
+    pub fn new(workspace: &Workspace, cx: &mut Context<Self>) -> Self {
+        let subscription = cx.subscribe(workspace.project(), |this, _, event, _| {
+            if let project::Event::LanguageServerAdded(_, name, _) = event
+                && name == "basedpyright"
+            {
+                this.have_basedpyright = true;
+            }
+        });
+        let dismissed = Self::dismissed();
+        Self {
+            dismissed,
+            have_basedpyright: false,
+            _subscriptions: [subscription],
+        }
+    }
+}
+
+impl EventEmitter<ToolbarItemEvent> for BasedPyrightBanner {}
+
+impl Render for BasedPyrightBanner {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .id("basedpyright-banner")
+            .when(!self.dismissed && self.have_basedpyright, |el| {
+                el.child(
+                    Banner::new()
+                        .severity(ui::Severity::Info)
+                        .child(
+                            h_flex()
+                                .gap_2()
+                                .child(v_flex()
+                                    .child("Basedpyright is now the only default language server for Python")
+                                    .child(Label::new("We have disabled PyRight and pylsp by default. They can be re-enabled in your settings.").size(LabelSize::XSmall).color(Color::Muted))
+                                )
+                                .child(
+                                    Button::new("learn-more", "Learn More")
+                                        .icon(IconName::ArrowUpRight)
+                                        .on_click(|_, _, cx| {
+                                            cx.open_url("https://zed.dev/docs/languages/python")
+                                        }),
+                                ),
+                        )
+                        .action_slot(IconButton::new("dismiss", IconName::Close).on_click(
+                            cx.listener(|this, _, _, cx| {
+                                this.dismissed = true;
+                                Self::set_dismissed(true, cx);
+                                cx.notify();
+                            }),
+                        ))
+                        .into_any_element(),
+                )
+            })
+    }
+}
+
+impl ToolbarItemView for BasedPyrightBanner {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn workspace::ItemHandle>,
+        _window: &mut ui::Window,
+        cx: &mut Context<Self>,
+    ) -> ToolbarItemLocation {
+        if let Some(item) = active_pane_item
+            && let Some(editor) = item.act_as::<Editor>(cx)
+            && let Some(path) = editor.update(cx, |editor, cx| editor.target_file_abs_path(cx))
+            && let Some(file_name) = path.file_name()
+            && file_name.as_encoded_bytes().ends_with(".py".as_bytes())
+        {
+            return ToolbarItemLocation::Secondary;
+        }
+
+        ToolbarItemLocation::Hidden
+    }
+}
diff --git a/crates/languages/Cargo.toml b/crates/languages/Cargo.toml
index 8e25818070..e09b27d474 100644
--- a/crates/languages/Cargo.toml
+++ b/crates/languages/Cargo.toml
@@ -42,7 +42,6 @@ async-trait.workspace = true
 chrono.workspace = true
 collections.workspace = true
 dap.workspace = true
-feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
 http_client.workspace = true
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 33fb2af061..95fe131218 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -1,5 +1,4 @@
 use anyhow::Context as _;
-use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
 use gpui::{App, SharedString, UpdateGlobal};
 use node_runtime::NodeRuntime;
 use python::PyprojectTomlManifestProvider;
@@ -54,12 +53,6 @@ pub static LANGUAGE_GIT_COMMIT: std::sync::LazyLock<Arc<Language>> =
         ))
     });
 
-struct BasedPyrightFeatureFlag;
-
-impl FeatureFlag for BasedPyrightFeatureFlag {
-    const NAME: &'static str = "basedpyright";
-}
-
 pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
     #[cfg(feature = "load-grammars")]
     languages.register_native_grammars([
@@ -174,7 +167,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         },
         LanguageInfo {
             name: "python",
-            adapters: vec![python_lsp_adapter, py_lsp_adapter],
+            adapters: vec![basedpyright_lsp_adapter],
             context: Some(python_context_provider),
             toolchain: Some(python_toolchain_provider),
             manifest_name: Some(SharedString::new_static("pyproject.toml").into()),
@@ -240,17 +233,6 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
         );
     }
 
-    let mut basedpyright_lsp_adapter = Some(basedpyright_lsp_adapter);
-    cx.observe_flag::<BasedPyrightFeatureFlag, _>({
-        let languages = languages.clone();
-        move |enabled, _| {
-            if enabled && let Some(adapter) = basedpyright_lsp_adapter.take() {
-                languages.register_available_lsp_adapter(adapter.name(), move || adapter.clone());
-            }
-        }
-    })
-    .detach();
-
     // Register globally available language servers.
     //
     // This will allow users to add support for a built-in language server (e.g., Tailwind)
@@ -267,27 +249,19 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
     // ```
     languages.register_available_lsp_adapter(
         LanguageServerName("tailwindcss-language-server".into()),
-        {
-            let adapter = tailwind_adapter.clone();
-            move || adapter.clone()
-        },
+        tailwind_adapter.clone(),
     );
-    languages.register_available_lsp_adapter(LanguageServerName("eslint".into()), {
-        let adapter = eslint_adapter.clone();
-        move || adapter.clone()
-    });
-    languages.register_available_lsp_adapter(LanguageServerName("vtsls".into()), {
-        let adapter = vtsls_adapter;
-        move || adapter.clone()
-    });
+    languages.register_available_lsp_adapter(
+        LanguageServerName("eslint".into()),
+        eslint_adapter.clone(),
+    );
+    languages.register_available_lsp_adapter(LanguageServerName("vtsls".into()), vtsls_adapter);
     languages.register_available_lsp_adapter(
         LanguageServerName("typescript-language-server".into()),
-        {
-            let adapter = typescript_lsp_adapter;
-            move || adapter.clone()
-        },
+        typescript_lsp_adapter,
     );
-
+    languages.register_available_lsp_adapter(python_lsp_adapter.name(), python_lsp_adapter);
+    languages.register_available_lsp_adapter(py_lsp_adapter.name(), py_lsp_adapter);
     // Register Tailwind for the existing languages that should have it by default.
     //
     // This can be driven by the `language_servers` setting once we have a way for
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index d1f40a8233..978f22d91c 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -35,7 +35,7 @@ use std::{
     sync::Arc,
 };
 use task::{ShellKind, TaskTemplate, TaskTemplates, VariableName};
-use util::ResultExt;
+use util::{ResultExt, maybe};
 
 pub(crate) struct PyprojectTomlManifestProvider;
 
@@ -1619,23 +1619,37 @@ impl LspAdapter for BasedPyrightLspAdapter {
                     }
                 }
 
-                // Always set the python interpreter path
-                // Get or create the python section
-                let python = object
+                // Set both pythonPath and defaultInterpreterPath for compatibility
+                if let Some(python) = object
                     .entry("python")
                     .or_insert(Value::Object(serde_json::Map::default()))
                     .as_object_mut()
-                    .unwrap();
-
-                // Set both pythonPath and defaultInterpreterPath for compatibility
-                python.insert(
-                    "pythonPath".to_owned(),
-                    Value::String(interpreter_path.clone()),
-                );
-                python.insert(
-                    "defaultInterpreterPath".to_owned(),
-                    Value::String(interpreter_path),
-                );
+                {
+                    python.insert(
+                        "pythonPath".to_owned(),
+                        Value::String(interpreter_path.clone()),
+                    );
+                    python.insert(
+                        "defaultInterpreterPath".to_owned(),
+                        Value::String(interpreter_path),
+                    );
+                }
+                // Basedpyright by default uses `strict` type checking, we tone it down as to not surpris users
+                maybe!({
+                    let basedpyright = object
+                        .entry("basedpyright")
+                        .or_insert(Value::Object(serde_json::Map::default()));
+                    let analysis = basedpyright
+                        .as_object_mut()?
+                        .entry("analysis")
+                        .or_insert(Value::Object(serde_json::Map::default()));
+                    if let serde_json::map::Entry::Vacant(v) =
+                        analysis.as_object_mut()?.entry("typeCheckingMode")
+                    {
+                        v.insert(Value::String("standard".to_owned()));
+                    }
+                    Some(())
+                });
             }
 
             user_settings
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 943bdab5ff..7af51ef6ff 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -166,6 +166,12 @@ impl<'a> From<&'a str> for LanguageServerName {
     }
 }
 
+impl PartialEq<str> for LanguageServerName {
+    fn eq(&self, other: &str) -> bool {
+        self.0 == other
+    }
+}
+
 /// Handle to a language server RPC activity subscription.
 pub enum Subscription {
     Notification {
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 6f1934456d..4341a77fc7 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -89,6 +89,7 @@ language.workspace = true
 language_extension.workspace = true
 language_model.workspace = true
 language_models.workspace = true
+language_onboarding.workspace = true
 language_selector.workspace = true
 language_tools.workspace = true
 languages = { workspace = true, features = ["load-grammars"] }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index efe2d031a6..355925d228 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -32,6 +32,7 @@ use gpui::{
 };
 use image_viewer::ImageInfo;
 use language::Capability;
+use language_onboarding::BasedPyrightBanner;
 use language_tools::lsp_button::{self, LspButton};
 use language_tools::lsp_log_view::LspLogToolbarItemView;
 use migrate::{MigrationBanner, MigrationEvent, MigrationNotification, MigrationType};
@@ -1001,6 +1002,8 @@ fn initialize_pane(
             toolbar.add_item(project_diff_toolbar, window, cx);
             let agent_diff_toolbar = cx.new(AgentDiffToolbar::new);
             toolbar.add_item(agent_diff_toolbar, window, cx);
+            let basedpyright_banner = cx.new(|cx| BasedPyrightBanner::new(workspace, cx));
+            toolbar.add_item(basedpyright_banner, window, cx);
         })
     });
 }

From 7091c70a1e200e5093a726bc573f23cd7d2a2fce Mon Sep 17 00:00:00 2001
From: ZhangJun <geekard@qq.com>
Date: Tue, 9 Sep 2025 04:01:55 +0800
Subject: [PATCH 689/823] open_ai: Trim newline before "data:" prefix and
 account for the possibility of no space after ":" (#37644)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I'am using an openai compatible model, but got nothing in agent thread
panel, and Zed log has "Model generated an empty summary" line.

I add one log to open_ai.rs:
<img width="2454" height="626" alt="图片"
src="https://github.com/user-attachments/assets/85354c7d-a0cc-4bba-86fd-2a640038a13e"
/>

and got:

<img width="3456" height="278" alt="图片"
src="https://github.com/user-attachments/assets/7746aedd-5d76-44b5-90f2-e129a1507178"
/>

It appear that `let line = line.strip_prefix("data: ")?;` can not handle
correctly.

Release Notes:

- N/A

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
---
 crates/open_ai/src/open_ai.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 279245c0b7..fda0544be1 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -473,7 +473,7 @@ pub async fn stream_completion(
             .filter_map(|line| async move {
                 match line {
                     Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
+                        let line = line.strip_prefix("data: ").or_else(|| line.strip_prefix("data:"))?;
                         if line == "[DONE]" {
                             None
                         } else {

From e4de26e5dcb75e3c12cac99ca18a0299db16a291 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 8 Sep 2025 16:42:42 -0400
Subject: [PATCH 690/823] cloud_llm_client: Remove unused code (#37799)

This PR removes some unused code from the `cloud_llm_client`.

This was only used on the server, so we can move it there.

Release Notes:

- N/A
---
 .../cloud_llm_client/src/cloud_llm_client.rs  | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 741945af10..d5a21bfe20 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -86,32 +86,6 @@ pub enum Plan {
     ZedProTrial,
 }
 
-impl Plan {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Plan::ZedFree => "zed_free",
-            Plan::ZedPro => "zed_pro",
-            Plan::ZedProTrial => "zed_pro_trial",
-        }
-    }
-
-    pub fn model_requests_limit(&self) -> UsageLimit {
-        match self {
-            Plan::ZedPro => UsageLimit::Limited(500),
-            Plan::ZedProTrial => UsageLimit::Limited(150),
-            Plan::ZedFree => UsageLimit::Limited(50),
-        }
-    }
-
-    pub fn edit_predictions_limit(&self) -> UsageLimit {
-        match self {
-            Plan::ZedPro => UsageLimit::Unlimited,
-            Plan::ZedProTrial => UsageLimit::Unlimited,
-            Plan::ZedFree => UsageLimit::Limited(2_000),
-        }
-    }
-}
-
 impl FromStr for Plan {
     type Err = anyhow::Error;
 

From 246c644316238295a5022120ef9451d40751ea59 Mon Sep 17 00:00:00 2001
From: Patsakula Nikita <nikita.patsakula@gmail.com>
Date: Mon, 8 Sep 2025 23:44:40 +0300
Subject: [PATCH 691/823] agent_servers: Fix proxy configuration for Gemini
 (#37790)

Closes #37487

Proxy settings are now taken from the Zed configuration and passed to
Gemini via the "--proxy" flag.

Release Notes:

- acp: Gemini ACP server now uses proxy settings from Zed configuration.
---
 crates/agent_servers/Cargo.toml    |  2 +-
 crates/agent_servers/src/gemini.rs | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
index 2a601dcb16..bb3fe6ff90 100644
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -23,7 +23,7 @@ action_log.workspace = true
 agent-client-protocol.workspace = true
 agent_settings.workspace = true
 anyhow.workspace = true
-client = { workspace = true, optional = true }
+client.workspace = true
 collections.workspace = true
 env_logger = { workspace = true, optional = true }
 fs.workspace = true
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 20a18dfd33..cf553273db 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -4,10 +4,12 @@ use std::{any::Any, path::Path};
 use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::AgentConnection;
 use anyhow::{Context as _, Result};
+use client::ProxySettings;
 use collections::HashMap;
-use gpui::{App, SharedString, Task};
+use gpui::{App, AppContext, SharedString, Task};
 use language_models::provider::google::GoogleLanguageModelProvider;
 use project::agent_server_store::GEMINI_NAME;
+use settings::SettingsStore;
 
 #[derive(Clone)]
 pub struct Gemini;
@@ -35,13 +37,16 @@ impl AgentServer for Gemini {
         let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
         let is_remote = delegate.project.read(cx).is_via_remote_server();
         let store = delegate.store.downgrade();
+        let proxy_url = cx.read_global(|settings: &SettingsStore, _| {
+            settings.get::<ProxySettings>(None).proxy.clone()
+        });
 
         cx.spawn(async move |cx| {
             let mut extra_env = HashMap::default();
             if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
                 extra_env.insert("GEMINI_API_KEY".into(), api_key.key);
             }
-            let (command, root_dir, login) = store
+            let (mut command, root_dir, login) = store
                 .update(cx, |store, cx| {
                     let agent = store
                         .get_external_agent(&GEMINI_NAME.into())
@@ -55,6 +60,15 @@ impl AgentServer for Gemini {
                     ))
                 })??
                 .await?;
+
+            // Add proxy flag if proxy settings are configured in Zed and not in the args
+            if let Some(proxy_url_value) = &proxy_url
+                && !command.args.iter().any(|arg| arg.contains("--proxy"))
+            {
+                command.args.push("--proxy".into());
+                command.args.push(proxy_url_value.clone());
+            }
+
             let connection =
                 crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
             Ok((connection, login))

From acde79dae79b5ba009eea88442fe396397152a97 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:39:49 -0300
Subject: [PATCH 692/823] agent: Improve popover trigger styles (#37800)

This PR mostly adds some style treatment to popover button triggers in
the agent panel, either making them better aligned with their trigger or
adjusting the color to better clarify which button is triggering the
currently opened menu.

Moving forward, I think the selected styles at least should probably be
tackled at the component level, whether that's a context menu or a
popover, so we don't have to ever do this manually (and running the risk
of forgetting to do it).

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/model_selector_popover.rs | 14 +++++++++++---
 crates/agent_ui/src/agent_panel.rs                |  2 +-
 crates/agent_ui/src/profile_selector.rs           | 11 ++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/crates/agent_ui/src/acp/model_selector_popover.rs b/crates/agent_ui/src/acp/model_selector_popover.rs
index e8e0d4be7f..fa771c695e 100644
--- a/crates/agent_ui/src/acp/model_selector_popover.rs
+++ b/crates/agent_ui/src/acp/model_selector_popover.rs
@@ -5,7 +5,8 @@ use agent_client_protocol as acp;
 use gpui::{Entity, FocusHandle};
 use picker::popover_menu::PickerPopoverMenu;
 use ui::{
-    ButtonLike, Context, IntoElement, PopoverMenuHandle, SharedString, Tooltip, Window, prelude::*,
+    ButtonLike, Context, IntoElement, PopoverMenuHandle, SharedString, TintColor, Tooltip, Window,
+    prelude::*,
 };
 use zed_actions::agent::ToggleModelSelector;
 
@@ -58,15 +59,22 @@ impl Render for AcpModelSelectorPopover {
 
         let focus_handle = self.focus_handle.clone();
 
+        let color = if self.menu_handle.is_deployed() {
+            Color::Accent
+        } else {
+            Color::Muted
+        };
+
         PickerPopoverMenu::new(
             self.selector.clone(),
             ButtonLike::new("active-model")
                 .when_some(model_icon, |this, icon| {
-                    this.child(Icon::new(icon).color(Color::Muted).size(IconSize::XSmall))
+                    this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
                 })
+                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                 .child(
                     Label::new(model_name)
-                        .color(Color::Muted)
+                        .color(color)
                         .size(LabelSize::Small)
                         .ml_0p5(),
                 )
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index ad42b0001d..e1ac67f1c8 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2538,7 +2538,7 @@ impl AgentPanel {
                     }
                 },
             )
-            .anchor(Corner::TopLeft)
+            .anchor(Corner::TopRight)
             .with_handle(self.new_thread_menu_handle.clone())
             .menu({
                 let workspace = self.workspace.clone();
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index f0f53b96b2..6ae4a73598 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -6,8 +6,8 @@ use gpui::{Action, Entity, FocusHandle, Subscription, prelude::*};
 use settings::{Settings as _, SettingsStore, update_settings_file};
 use std::sync::Arc;
 use ui::{
-    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, Tooltip,
-    prelude::*,
+    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, TintColor,
+    Tooltip, prelude::*,
 };
 
 /// Trait for types that can provide and manage agent profiles
@@ -170,7 +170,8 @@ impl Render for ProfileSelector {
                 .icon(IconName::ChevronDown)
                 .icon_size(IconSize::XSmall)
                 .icon_position(IconPosition::End)
-                .icon_color(Color::Muted);
+                .icon_color(Color::Muted)
+                .selected_style(ButtonStyle::Tinted(TintColor::Accent));
 
             PopoverMenu::new("profile-selector")
                 .trigger_with_tooltip(trigger_button, {
@@ -195,6 +196,10 @@ impl Render for ProfileSelector {
                 .menu(move |window, cx| {
                     Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
                 })
+                .offset(gpui::Point {
+                    x: px(0.0),
+                    y: px(-2.0),
+                })
                 .into_any_element()
         } else {
             Button::new("tools-not-supported-button", "Tools Unsupported")

From 5934d3789be0cb5594717ba8baf70f5e2b4a381e Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:51:13 -0300
Subject: [PATCH 693/823] python: Improve Basedpyright banner styles (#37802)

Just tidying this up a bit.

Release Notes:

- N/A
---
 crates/language_onboarding/src/python.rs | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/crates/language_onboarding/src/python.rs b/crates/language_onboarding/src/python.rs
index 405a265db9..6b83b841e0 100644
--- a/crates/language_onboarding/src/python.rs
+++ b/crates/language_onboarding/src/python.rs
@@ -1,11 +1,7 @@
 use db::kvp::Dismissable;
 use editor::Editor;
 use gpui::{Context, EventEmitter, Subscription};
-use ui::{
-    Banner, Button, Clickable, Color, FluentBuilder as _, IconButton, IconName,
-    InteractiveElement as _, IntoElement, Label, LabelCommon, LabelSize, ParentElement as _,
-    Render, Styled as _, Window, div, h_flex, v_flex,
-};
+use ui::{Banner, FluentBuilder as _, prelude::*};
 use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace};
 
 pub struct BasedPyrightBanner {
@@ -45,29 +41,33 @@ impl Render for BasedPyrightBanner {
             .when(!self.dismissed && self.have_basedpyright, |el| {
                 el.child(
                     Banner::new()
-                        .severity(ui::Severity::Info)
                         .child(
+                            v_flex()
+                                .gap_0p5()
+                                .child(Label::new("Basedpyright is now the only default language server for Python").mt_0p5())
+                                .child(Label::new("We have disabled PyRight and pylsp by default. They can be re-enabled in your settings.").size(LabelSize::Small).color(Color::Muted))
+                        )
+                        .action_slot(
                             h_flex()
-                                .gap_2()
-                                .child(v_flex()
-                                    .child("Basedpyright is now the only default language server for Python")
-                                    .child(Label::new("We have disabled PyRight and pylsp by default. They can be re-enabled in your settings.").size(LabelSize::XSmall).color(Color::Muted))
-                                )
+                                .gap_0p5()
                                 .child(
                                     Button::new("learn-more", "Learn More")
                                         .icon(IconName::ArrowUpRight)
+                                        .label_size(LabelSize::Small)
+                                        .icon_size(IconSize::XSmall)
+                                        .icon_color(Color::Muted)
                                         .on_click(|_, _, cx| {
                                             cx.open_url("https://zed.dev/docs/languages/python")
                                         }),
-                                ),
+                                )
+                                .child(IconButton::new("dismiss", IconName::Close).icon_size(IconSize::Small).on_click(
+                                    cx.listener(|this, _, _, cx| {
+                                        this.dismissed = true;
+                                        Self::set_dismissed(true, cx);
+                                        cx.notify();
+                                    }),
+                                ))
                         )
-                        .action_slot(IconButton::new("dismiss", IconName::Close).on_click(
-                            cx.listener(|this, _, _, cx| {
-                                this.dismissed = true;
-                                Self::set_dismissed(true, cx);
-                                cx.notify();
-                            }),
-                        ))
                         .into_any_element(),
                 )
             })

From 4a0a7d1d274abf618e4cf941e7ed3458230214bf Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Mon, 8 Sep 2025 19:19:10 -0300
Subject: [PATCH 694/823] Add item for the debugger panel in the app view menu
 (#37805)

Release Notes:

- Enabled the debugger panel to be opened via the app's "View" menu
option
---
 crates/zed/src/zed/app_menus.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 342fd26cb7..935c340038 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -1,6 +1,7 @@
 use collab_ui::collab_panel;
 use gpui::{Menu, MenuItem, OsAction};
 use terminal_view::terminal_panel;
+use zed_actions::ToggleFocus as ToggleDebugPanel;
 
 pub fn app_menus() -> Vec<Menu> {
     use zed_actions::Quit;
@@ -175,6 +176,7 @@ pub fn app_menus() -> Vec<Menu> {
                 MenuItem::action("Outline Panel", outline_panel::ToggleFocus),
                 MenuItem::action("Collab Panel", collab_panel::ToggleFocus),
                 MenuItem::action("Terminal Panel", terminal_panel::ToggleFocus),
+                MenuItem::action("Debugger Panel", ToggleDebugPanel),
                 MenuItem::separator(),
                 MenuItem::action("Diagnostics", diagnostics::Deploy),
                 MenuItem::separator(),

From ae54a4e1b8e50e5f96f58702c8347e56dcd82fb5 Mon Sep 17 00:00:00 2001
From: Ivan Danov <idanov@users.noreply.github.com>
Date: Tue, 9 Sep 2025 00:11:53 +0100
Subject: [PATCH 695/823] Add commands to select next/previous siblings in the
 syntax tree (#35053)

Closes #5133 and discussion
https://github.com/zed-industries/zed/discussions/33493

This PR adds two new commands to select next/previous siblings in the
syntax tree. These commands were modelled after the existing ones about
expand/shrink selection. With this PR I've added new key bindings
inspired by `helix` for previous / next / expand / shrink selections.



https://github.com/user-attachments/assets/4ef7fadb-0b82-4897-95c7-1737827bf4ac


Release Notes:

- Add commands to select next/previous siblings in the syntax tree

---------

Co-authored-by: Joseph T. Lyons <JosephTLyons@gmail.com>
---
 crates/editor/src/actions.rs            |   4 +
 crates/editor/src/editor.rs             |  98 +++++++++++++
 crates/editor/src/editor_tests.rs       |  95 +++++++++++++
 crates/editor/src/element.rs            |   2 +
 crates/language/src/buffer.rs           | 180 ++++++++++++++++++++----
 crates/multi_buffer/src/multi_buffer.rs |  22 +++
 crates/vim/src/visual.rs                |  61 ++++++++
 crates/zed/src/zed/app_menus.rs         |   5 +
 8 files changed, 440 insertions(+), 27 deletions(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 5b92f138c7..df467c4d5d 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -640,6 +640,10 @@ actions!(
         SelectEnclosingSymbol,
         /// Selects the next larger syntax node.
         SelectLargerSyntaxNode,
+        /// Selects the next syntax node sibling.
+        SelectNextSyntaxNode,
+        /// Selects the previous syntax node sibling.
+        SelectPreviousSyntaxNode,
         /// Extends selection left.
         SelectLeft,
         /// Selects the current line.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 4580cd8a34..b54c2c11b1 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -15138,6 +15138,104 @@ impl Editor {
         });
     }
 
+    pub fn select_next_syntax_node(
+        &mut self,
+        _: &SelectNextSyntaxNode,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let old_selections: Box<[_]> = self.selections.all::<usize>(cx).into();
+        if old_selections.is_empty() {
+            return;
+        }
+
+        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
+
+        let buffer = self.buffer.read(cx).snapshot(cx);
+        let mut selected_sibling = false;
+
+        let new_selections = old_selections
+            .iter()
+            .map(|selection| {
+                let old_range = selection.start..selection.end;
+
+                if let Some(node) = buffer.syntax_next_sibling(old_range) {
+                    let new_range = node.byte_range();
+                    selected_sibling = true;
+                    Selection {
+                        id: selection.id,
+                        start: new_range.start,
+                        end: new_range.end,
+                        goal: SelectionGoal::None,
+                        reversed: selection.reversed,
+                    }
+                } else {
+                    selection.clone()
+                }
+            })
+            .collect::<Vec<_>>();
+
+        if selected_sibling {
+            self.change_selections(
+                SelectionEffects::scroll(Autoscroll::fit()),
+                window,
+                cx,
+                |s| {
+                    s.select(new_selections);
+                },
+            );
+        }
+    }
+
+    pub fn select_prev_syntax_node(
+        &mut self,
+        _: &SelectPreviousSyntaxNode,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let old_selections: Box<[_]> = self.selections.all::<usize>(cx).into();
+        if old_selections.is_empty() {
+            return;
+        }
+
+        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
+
+        let buffer = self.buffer.read(cx).snapshot(cx);
+        let mut selected_sibling = false;
+
+        let new_selections = old_selections
+            .iter()
+            .map(|selection| {
+                let old_range = selection.start..selection.end;
+
+                if let Some(node) = buffer.syntax_prev_sibling(old_range) {
+                    let new_range = node.byte_range();
+                    selected_sibling = true;
+                    Selection {
+                        id: selection.id,
+                        start: new_range.start,
+                        end: new_range.end,
+                        goal: SelectionGoal::None,
+                        reversed: selection.reversed,
+                    }
+                } else {
+                    selection.clone()
+                }
+            })
+            .collect::<Vec<_>>();
+
+        if selected_sibling {
+            self.change_selections(
+                SelectionEffects::scroll(Autoscroll::fit()),
+                window,
+                cx,
+                |s| {
+                    s.select(new_selections);
+                },
+            );
+        }
+    }
+
     fn refresh_runnables(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
         if !EditorSettings::get_global(cx).gutter.runnables {
             self.clear_tasks();
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 5be6f685d1..9f578b8b9d 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -25330,6 +25330,101 @@ async fn test_non_utf_8_opens(cx: &mut TestAppContext) {
     );
 }
 
+#[gpui::test]
+async fn test_select_next_prev_syntax_node(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let language = Arc::new(Language::new(
+        LanguageConfig::default(),
+        Some(tree_sitter_rust::LANGUAGE.into()),
+    ));
+
+    // Test hierarchical sibling navigation
+    let text = r#"
+        fn outer() {
+            if condition {
+                let a = 1;
+            }
+            let b = 2;
+        }
+
+        fn another() {
+            let c = 3;
+        }
+    "#;
+
+    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
+
+    // Wait for parsing to complete
+    editor
+        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
+        .await;
+
+    editor.update_in(cx, |editor, window, cx| {
+        // Start by selecting "let a = 1;" inside the if block
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(3), 16)..DisplayPoint::new(DisplayRow(3), 26)
+            ]);
+        });
+
+        let initial_selection = editor.selections.display_ranges(cx);
+        assert_eq!(initial_selection.len(), 1, "Should have one selection");
+
+        // Test select next sibling - should move up levels to find the next sibling
+        // Since "let a = 1;" has no siblings in the if block, it should move up
+        // to find "let b = 2;" which is a sibling of the if block
+        editor.select_next_syntax_node(&SelectNextSyntaxNode, window, cx);
+        let next_selection = editor.selections.display_ranges(cx);
+
+        // Should have a selection and it should be different from the initial
+        assert_eq!(
+            next_selection.len(),
+            1,
+            "Should have one selection after next"
+        );
+        assert_ne!(
+            next_selection[0], initial_selection[0],
+            "Next sibling selection should be different"
+        );
+
+        // Test hierarchical navigation by going to the end of the current function
+        // and trying to navigate to the next function
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(5), 12)..DisplayPoint::new(DisplayRow(5), 22)
+            ]);
+        });
+
+        editor.select_next_syntax_node(&SelectNextSyntaxNode, window, cx);
+        let function_next_selection = editor.selections.display_ranges(cx);
+
+        // Should move to the next function
+        assert_eq!(
+            function_next_selection.len(),
+            1,
+            "Should have one selection after function next"
+        );
+
+        // Test select previous sibling navigation
+        editor.select_prev_syntax_node(&SelectPreviousSyntaxNode, window, cx);
+        let prev_selection = editor.selections.display_ranges(cx);
+
+        // Should have a selection and it should be different
+        assert_eq!(
+            prev_selection.len(),
+            1,
+            "Should have one selection after prev"
+        );
+        assert_ne!(
+            prev_selection[0], function_next_selection[0],
+            "Previous sibling selection should be different from next"
+        );
+    });
+}
+
 #[track_caller]
 fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
     editor
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 9822ec23d5..d8260dd239 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -365,6 +365,8 @@ impl EditorElement {
         register_action(editor, window, Editor::toggle_comments);
         register_action(editor, window, Editor::select_larger_syntax_node);
         register_action(editor, window, Editor::select_smaller_syntax_node);
+        register_action(editor, window, Editor::select_next_syntax_node);
+        register_action(editor, window, Editor::select_prev_syntax_node);
         register_action(editor, window, Editor::unwrap_syntax_node);
         register_action(editor, window, Editor::select_enclosing_symbol);
         register_action(editor, window, Editor::move_to_enclosing_bracket);
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 2a303bb9a0..496f9d60d1 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -3459,46 +3459,66 @@ impl BufferSnapshot {
     }
 
     /// Returns the closest syntax node enclosing the given range.
+    /// Positions a tree cursor at the leaf node that contains or touches the given range.
+    /// This is shared logic used by syntax navigation methods.
+    fn position_cursor_at_range(cursor: &mut tree_sitter::TreeCursor, range: &Range<usize>) {
+        // Descend to the first leaf that touches the start of the range.
+        //
+        // If the range is non-empty and the current node ends exactly at the start,
+        // move to the next sibling to find a node that extends beyond the start.
+        //
+        // If the range is empty and the current node starts after the range position,
+        // move to the previous sibling to find the node that contains the position.
+        while cursor.goto_first_child_for_byte(range.start).is_some() {
+            if !range.is_empty() && cursor.node().end_byte() == range.start {
+                cursor.goto_next_sibling();
+            }
+            if range.is_empty() && cursor.node().start_byte() > range.start {
+                cursor.goto_previous_sibling();
+            }
+        }
+    }
+
+    /// Moves the cursor to find a node that contains the given range.
+    /// Returns true if such a node is found, false otherwise.
+    /// This is shared logic used by syntax navigation methods.
+    fn find_containing_node(
+        cursor: &mut tree_sitter::TreeCursor,
+        range: &Range<usize>,
+        strict: bool,
+    ) -> bool {
+        loop {
+            let node_range = cursor.node().byte_range();
+
+            if node_range.start <= range.start
+                && node_range.end >= range.end
+                && (!strict || node_range.len() > range.len())
+            {
+                return true;
+            }
+            if !cursor.goto_parent() {
+                return false;
+            }
+        }
+    }
+
     pub fn syntax_ancestor<'a, T: ToOffset>(
         &'a self,
         range: Range<T>,
     ) -> Option<tree_sitter::Node<'a>> {
         let range = range.start.to_offset(self)..range.end.to_offset(self);
         let mut result: Option<tree_sitter::Node<'a>> = None;
-        'outer: for layer in self
+        for layer in self
             .syntax
             .layers_for_range(range.clone(), &self.text, true)
         {
             let mut cursor = layer.node().walk();
 
-            // Descend to the first leaf that touches the start of the range.
-            //
-            // If the range is non-empty and the current node ends exactly at the start,
-            // move to the next sibling to find a node that extends beyond the start.
-            //
-            // If the range is empty and the current node starts after the range position,
-            // move to the previous sibling to find the node that contains the position.
-            while cursor.goto_first_child_for_byte(range.start).is_some() {
-                if !range.is_empty() && cursor.node().end_byte() == range.start {
-                    cursor.goto_next_sibling();
-                }
-                if range.is_empty() && cursor.node().start_byte() > range.start {
-                    cursor.goto_previous_sibling();
-                }
-            }
+            Self::position_cursor_at_range(&mut cursor, &range);
 
             // Ascend to the smallest ancestor that strictly contains the range.
-            loop {
-                let node_range = cursor.node().byte_range();
-                if node_range.start <= range.start
-                    && node_range.end >= range.end
-                    && node_range.len() > range.len()
-                {
-                    break;
-                }
-                if !cursor.goto_parent() {
-                    continue 'outer;
-                }
+            if !Self::find_containing_node(&mut cursor, &range, true) {
+                continue;
             }
 
             let left_node = cursor.node();
@@ -3541,6 +3561,112 @@ impl BufferSnapshot {
         result
     }
 
+    /// Find the previous sibling syntax node at the given range.
+    ///
+    /// This function locates the syntax node that precedes the node containing
+    /// the given range. It searches hierarchically by:
+    /// 1. Finding the node that contains the given range
+    /// 2. Looking for the previous sibling at the same tree level
+    /// 3. If no sibling is found, moving up to parent levels and searching for siblings
+    ///
+    /// Returns `None` if there is no previous sibling at any ancestor level.
+    pub fn syntax_prev_sibling<'a, T: ToOffset>(
+        &'a self,
+        range: Range<T>,
+    ) -> Option<tree_sitter::Node<'a>> {
+        let range = range.start.to_offset(self)..range.end.to_offset(self);
+        let mut result: Option<tree_sitter::Node<'a>> = None;
+
+        for layer in self
+            .syntax
+            .layers_for_range(range.clone(), &self.text, true)
+        {
+            let mut cursor = layer.node().walk();
+
+            Self::position_cursor_at_range(&mut cursor, &range);
+
+            // Find the node that contains the range
+            if !Self::find_containing_node(&mut cursor, &range, false) {
+                continue;
+            }
+
+            // Look for the previous sibling, moving up ancestor levels if needed
+            loop {
+                if cursor.goto_previous_sibling() {
+                    let layer_result = cursor.node();
+
+                    if let Some(previous_result) = &result {
+                        if previous_result.byte_range().end < layer_result.byte_range().end {
+                            continue;
+                        }
+                    }
+                    result = Some(layer_result);
+                    break;
+                }
+
+                // No sibling found at this level, try moving up to parent
+                if !cursor.goto_parent() {
+                    break;
+                }
+            }
+        }
+
+        result
+    }
+
+    /// Find the next sibling syntax node at the given range.
+    ///
+    /// This function locates the syntax node that follows the node containing
+    /// the given range. It searches hierarchically by:
+    /// 1. Finding the node that contains the given range
+    /// 2. Looking for the next sibling at the same tree level
+    /// 3. If no sibling is found, moving up to parent levels and searching for siblings
+    ///
+    /// Returns `None` if there is no next sibling at any ancestor level.
+    pub fn syntax_next_sibling<'a, T: ToOffset>(
+        &'a self,
+        range: Range<T>,
+    ) -> Option<tree_sitter::Node<'a>> {
+        let range = range.start.to_offset(self)..range.end.to_offset(self);
+        let mut result: Option<tree_sitter::Node<'a>> = None;
+
+        for layer in self
+            .syntax
+            .layers_for_range(range.clone(), &self.text, true)
+        {
+            let mut cursor = layer.node().walk();
+
+            Self::position_cursor_at_range(&mut cursor, &range);
+
+            // Find the node that contains the range
+            if !Self::find_containing_node(&mut cursor, &range, false) {
+                continue;
+            }
+
+            // Look for the next sibling, moving up ancestor levels if needed
+            loop {
+                if cursor.goto_next_sibling() {
+                    let layer_result = cursor.node();
+
+                    if let Some(previous_result) = &result {
+                        if previous_result.byte_range().start > layer_result.byte_range().start {
+                            continue;
+                        }
+                    }
+                    result = Some(layer_result);
+                    break;
+                }
+
+                // No sibling found at this level, try moving up to parent
+                if !cursor.goto_parent() {
+                    break;
+                }
+            }
+        }
+
+        result
+    }
+
     /// Returns the root syntax node within the given row
     pub fn syntax_root_ancestor(&self, position: Anchor) -> Option<tree_sitter::Node<'_>> {
         let start_offset = position.to_offset(self);
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 4535d57d77..f5955ec176 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -6095,6 +6095,28 @@ impl MultiBufferSnapshot {
         Some((node, range))
     }
 
+    pub fn syntax_next_sibling<T: ToOffset>(
+        &self,
+        range: Range<T>,
+    ) -> Option<tree_sitter::Node<'_>> {
+        let range = range.start.to_offset(self)..range.end.to_offset(self);
+        let mut excerpt = self.excerpt_containing(range.clone())?;
+        excerpt
+            .buffer()
+            .syntax_next_sibling(excerpt.map_range_to_buffer(range))
+    }
+
+    pub fn syntax_prev_sibling<T: ToOffset>(
+        &self,
+        range: Range<T>,
+    ) -> Option<tree_sitter::Node<'_>> {
+        let range = range.start.to_offset(self)..range.end.to_offset(self);
+        let mut excerpt = self.excerpt_containing(range.clone())?;
+        excerpt
+            .buffer()
+            .syntax_prev_sibling(excerpt.map_range_to_buffer(range))
+    }
+
     pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Option<Outline<Anchor>> {
         let (excerpt_id, _, buffer) = self.as_singleton()?;
         let outline = buffer.outline(theme)?;
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index c62712af31..5fbc04fbee 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -53,6 +53,10 @@ actions!(
         SelectSmallerSyntaxNode,
         /// Selects the next larger syntax node.
         SelectLargerSyntaxNode,
+        /// Selects the next syntax node sibling.
+        SelectNextSyntaxNode,
+        /// Selects the previous syntax node sibling.
+        SelectPreviousSyntaxNode,
         /// Restores the previous visual selection.
         RestoreVisualSelection,
         /// Inserts at the end of each line in visual selection.
@@ -110,6 +114,30 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
         }
     });
 
+    Vim::action(editor, cx, |vim, _: &SelectNextSyntaxNode, window, cx| {
+        let count = Vim::take_count(cx).unwrap_or(1);
+        Vim::take_forced_motion(cx);
+        for _ in 0..count {
+            vim.update_editor(cx, |_, editor, cx| {
+                editor.select_next_syntax_node(&Default::default(), window, cx);
+            });
+        }
+    });
+
+    Vim::action(
+        editor,
+        cx,
+        |vim, _: &SelectPreviousSyntaxNode, window, cx| {
+            let count = Vim::take_count(cx).unwrap_or(1);
+            Vim::take_forced_motion(cx);
+            for _ in 0..count {
+                vim.update_editor(cx, |_, editor, cx| {
+                    editor.select_prev_syntax_node(&Default::default(), window, cx);
+                });
+            }
+        },
+    );
+
     Vim::action(
         editor,
         cx,
@@ -1839,4 +1867,37 @@ mod test {
             fˇ»ox"
         });
     }
+
+    #[gpui::test]
+    async fn test_visual_syntax_sibling_selection(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        cx.set_state(
+            indoc! {"
+                fn test() {
+                    let ˇa = 1;
+                    let b = 2;
+                    let c = 3;
+                }
+            "},
+            Mode::Normal,
+        );
+
+        // Enter visual mode and select the statement
+        cx.simulate_keystrokes("v w w w");
+        cx.assert_state(
+            indoc! {"
+                fn test() {
+                    let «a = 1;ˇ»
+                    let b = 2;
+                    let c = 3;
+                }
+            "},
+            Mode::Visual,
+        );
+
+        // The specific behavior of syntax sibling selection in vim mode
+        // would depend on the key bindings configured, but the actions
+        // are now available for use
+    }
 }
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 935c340038..50b88dd4ed 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -127,6 +127,11 @@ pub fn app_menus() -> Vec<Menu> {
                 ),
                 MenuItem::action("Expand Selection", editor::actions::SelectLargerSyntaxNode),
                 MenuItem::action("Shrink Selection", editor::actions::SelectSmallerSyntaxNode),
+                MenuItem::action("Select Next Sibling", editor::actions::SelectNextSyntaxNode),
+                MenuItem::action(
+                    "Select Previous Sibling",
+                    editor::actions::SelectPreviousSyntaxNode,
+                ),
                 MenuItem::separator(),
                 MenuItem::action("Add Cursor Above", editor::actions::AddSelectionAbove),
                 MenuItem::action("Add Cursor Below", editor::actions::AddSelectionBelow),

From 1feffad5e8ff1413a4f3c3e31d09265e7a46cbf5 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 8 Sep 2025 19:23:16 -0400
Subject: [PATCH 696/823] Remove `zed-pro` feature flag (#37807)

This PR removes the `zed-pro` feature flag, as it was not being used.

Release Notes:

- N/A
---
 crates/agent_ui/src/inline_prompt_editor.rs   | 163 +++---------------
 .../agent_ui/src/language_model_selector.rs   |  32 +---
 crates/feature_flags/src/feature_flags.rs     |   5 -
 3 files changed, 24 insertions(+), 176 deletions(-)

diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index d268c2f211..b6517a5433 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -1,29 +1,18 @@
-use crate::agent_model_selector::AgentModelSelector;
-use crate::buffer_codegen::BufferCodegen;
-use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
-use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::message_editor::{ContextCreasesAddon, extract_message_creases, insert_message_creases};
-use crate::terminal_codegen::TerminalCodegen;
-use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};
-use crate::{RemoveAllContext, ToggleContextPicker};
 use agent::{
     context_store::ContextStore,
     thread_store::{TextThreadStore, ThreadStore},
 };
-use client::ErrorExt;
 use collections::VecDeque;
-use db::kvp::Dismissable;
 use editor::actions::Paste;
 use editor::display_map::EditorMargins;
 use editor::{
     ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
     actions::{MoveDown, MoveUp},
 };
-use feature_flags::{FeatureFlagAppExt as _, ZedProFeatureFlag};
 use fs::Fs;
 use gpui::{
-    AnyElement, App, ClickEvent, Context, CursorStyle, Entity, EventEmitter, FocusHandle,
-    Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window, anchored, deferred, point,
+    AnyElement, App, Context, CursorStyle, Entity, EventEmitter, FocusHandle, Focusable,
+    Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
 use parking_lot::Mutex;
@@ -33,12 +22,19 @@ use std::rc::Rc;
 use std::sync::Arc;
 use theme::ThemeSettings;
 use ui::utils::WithRemSize;
-use ui::{
-    CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, PopoverMenuHandle, Tooltip, prelude::*,
-};
+use ui::{IconButtonShape, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
 use workspace::Workspace;
 use zed_actions::agent::ToggleModelSelector;
 
+use crate::agent_model_selector::AgentModelSelector;
+use crate::buffer_codegen::BufferCodegen;
+use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
+use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
+use crate::message_editor::{ContextCreasesAddon, extract_message_creases, insert_message_creases};
+use crate::terminal_codegen::TerminalCodegen;
+use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};
+use crate::{RemoveAllContext, ToggleContextPicker};
+
 pub struct PromptEditor<T> {
     pub editor: Entity<Editor>,
     mode: PromptEditorMode,
@@ -144,47 +140,16 @@ impl<T: 'static> Render for PromptEditor<T> {
                                 };
 
                                 let error_message = SharedString::from(error.to_string());
-                                if error.error_code() == proto::ErrorCode::RateLimitExceeded
-                                    && cx.has_flag::<ZedProFeatureFlag>()
-                                {
-                                    el.child(
-                                        v_flex()
-                                            .child(
-                                                IconButton::new(
-                                                    "rate-limit-error",
-                                                    IconName::XCircle,
-                                                )
-                                                .toggle_state(self.show_rate_limit_notice)
-                                                .shape(IconButtonShape::Square)
-                                                .icon_size(IconSize::Small)
-                                                .on_click(
-                                                    cx.listener(Self::toggle_rate_limit_notice),
-                                                ),
-                                            )
-                                            .children(self.show_rate_limit_notice.then(|| {
-                                                deferred(
-                                                    anchored()
-                                                        .position_mode(
-                                                            gpui::AnchoredPositionMode::Local,
-                                                        )
-                                                        .position(point(px(0.), px(24.)))
-                                                        .anchor(gpui::Corner::TopLeft)
-                                                        .child(self.render_rate_limit_notice(cx)),
-                                                )
-                                            })),
-                                    )
-                                } else {
-                                    el.child(
-                                        div()
-                                            .id("error")
-                                            .tooltip(Tooltip::text(error_message))
-                                            .child(
-                                                Icon::new(IconName::XCircle)
-                                                    .size(IconSize::Small)
-                                                    .color(Color::Error),
-                                            ),
-                                    )
-                                }
+                                el.child(
+                                    div()
+                                        .id("error")
+                                        .tooltip(Tooltip::text(error_message))
+                                        .child(
+                                            Icon::new(IconName::XCircle)
+                                                .size(IconSize::Small)
+                                                .color(Color::Error),
+                                        ),
+                                )
                             }),
                     )
                     .child(
@@ -310,19 +275,6 @@ impl<T: 'static> PromptEditor<T> {
         crate::active_thread::attach_pasted_images_as_context(&self.context_store, cx);
     }
 
-    fn toggle_rate_limit_notice(
-        &mut self,
-        _: &ClickEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_rate_limit_notice = !self.show_rate_limit_notice;
-        if self.show_rate_limit_notice {
-            window.focus(&self.editor.focus_handle(cx));
-        }
-        cx.notify();
-    }
-
     fn handle_prompt_editor_events(
         &mut self,
         _: &Entity<Editor>,
@@ -707,61 +659,6 @@ impl<T: 'static> PromptEditor<T> {
             .into_any_element()
     }
 
-    fn render_rate_limit_notice(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        Popover::new().child(
-            v_flex()
-                .occlude()
-                .p_2()
-                .child(
-                    Label::new("Out of Tokens")
-                        .size(LabelSize::Small)
-                        .weight(FontWeight::BOLD),
-                )
-                .child(Label::new(
-                    "Try Zed Pro for higher limits, a wider range of models, and more.",
-                ))
-                .child(
-                    h_flex()
-                        .justify_between()
-                        .child(CheckboxWithLabel::new(
-                            "dont-show-again",
-                            Label::new("Don't show again"),
-                            if RateLimitNotice::dismissed() {
-                                ui::ToggleState::Selected
-                            } else {
-                                ui::ToggleState::Unselected
-                            },
-                            |selection, _, cx| {
-                                let is_dismissed = match selection {
-                                    ui::ToggleState::Unselected => false,
-                                    ui::ToggleState::Indeterminate => return,
-                                    ui::ToggleState::Selected => true,
-                                };
-
-                                RateLimitNotice::set_dismissed(is_dismissed, cx);
-                            },
-                        ))
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(
-                                    Button::new("dismiss", "Dismiss")
-                                        .style(ButtonStyle::Transparent)
-                                        .on_click(cx.listener(Self::toggle_rate_limit_notice)),
-                                )
-                                .child(Button::new("more-info", "More Info").on_click(
-                                    |_event, window, cx| {
-                                        window.dispatch_action(
-                                            Box::new(zed_actions::OpenAccountSettings),
-                                            cx,
-                                        )
-                                    },
-                                )),
-                        ),
-                ),
-        )
-    }
-
     fn render_editor(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
         let colors = cx.theme().colors();
 
@@ -978,15 +875,7 @@ impl PromptEditor<BufferCodegen> {
                 self.editor
                     .update(cx, |editor, _| editor.set_read_only(false));
             }
-            CodegenStatus::Error(error) => {
-                if cx.has_flag::<ZedProFeatureFlag>()
-                    && error.error_code() == proto::ErrorCode::RateLimitExceeded
-                    && !RateLimitNotice::dismissed()
-                {
-                    self.show_rate_limit_notice = true;
-                    cx.notify();
-                }
-
+            CodegenStatus::Error(_error) => {
                 self.edited_since_done = false;
                 self.editor
                     .update(cx, |editor, _| editor.set_read_only(false));
@@ -1189,12 +1078,6 @@ impl PromptEditor<TerminalCodegen> {
     }
 }
 
-struct RateLimitNotice;
-
-impl Dismissable for RateLimitNotice {
-    const KEY: &'static str = "dismissed-rate-limit-notice";
-}
-
 pub enum CodegenStatus {
     Idle,
     Pending,
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
index 3633e533da..eb5a734b4c 100644
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -1,8 +1,6 @@
 use std::{cmp::Reverse, sync::Arc};
 
-use cloud_llm_client::Plan;
 use collections::{HashSet, IndexMap};
-use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task};
 use language_model::{
@@ -13,8 +11,6 @@ use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
 use ui::{ListItem, ListItemSpacing, prelude::*};
 
-const TRY_ZED_PRO_URL: &str = "https://zed.dev/pro";
-
 type OnModelChanged = Arc<dyn Fn(Arc<dyn LanguageModel>, &mut App) + 'static>;
 type GetActiveModel = Arc<dyn Fn(&App) -> Option<ConfiguredModel> + 'static>;
 
@@ -531,13 +527,9 @@ impl PickerDelegate for LanguageModelPickerDelegate {
 
     fn render_footer(
         &self,
-        _: &mut Window,
+        _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<gpui::AnyElement> {
-        use feature_flags::FeatureFlagAppExt;
-
-        let plan = Plan::ZedPro;
-
         Some(
             h_flex()
                 .w_full()
@@ -546,28 +538,6 @@ impl PickerDelegate for LanguageModelPickerDelegate {
                 .p_1()
                 .gap_4()
                 .justify_between()
-                .when(cx.has_flag::<ZedProFeatureFlag>(), |this| {
-                    this.child(match plan {
-                        Plan::ZedPro => Button::new("zed-pro", "Zed Pro")
-                            .icon(IconName::ZedAssistant)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .icon_position(IconPosition::Start)
-                            .on_click(|_, window, cx| {
-                                window
-                                    .dispatch_action(Box::new(zed_actions::OpenAccountSettings), cx)
-                            }),
-                        Plan::ZedFree | Plan::ZedProTrial => Button::new(
-                            "try-pro",
-                            if plan == Plan::ZedProTrial {
-                                "Upgrade to Pro"
-                            } else {
-                                "Try Pro"
-                            },
-                        )
-                        .on_click(|_, _, cx| cx.open_url(TRY_ZED_PRO_URL)),
-                    })
-                })
                 .child(
                     Button::new("configure", "Configure")
                         .icon(IconName::Settings)
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index b9e9f3ae9f..2f609f51ab 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -66,11 +66,6 @@ impl FeatureFlag for LlmClosedBetaFeatureFlag {
     const NAME: &'static str = "llm-closed-beta";
 }
 
-pub struct ZedProFeatureFlag {}
-impl FeatureFlag for ZedProFeatureFlag {
-    const NAME: &'static str = "zed-pro";
-}
-
 pub struct NotebookFeatureFlag;
 
 impl FeatureFlag for NotebookFeatureFlag {

From 8c9311286903c4e5e6ec26e8b226a86f16b5fa4e Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Mon, 8 Sep 2025 19:14:36 -0500
Subject: [PATCH 697/823] settings_ui: Add Basic Implementation of Language
 Settings (#37803)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...

---------

Co-authored-by: Anthony <anthony@zed.dev>
---
 crates/language/src/language_settings.rs      |  60 ++++-
 crates/settings/src/settings_store.rs         |   4 +-
 crates/settings/src/settings_ui_core.rs       |  47 +++-
 crates/settings_ui/src/settings_ui.rs         | 244 +++++++++++++-----
 .../ui/src/components/button/toggle_button.rs |  17 +-
 5 files changed, 278 insertions(+), 94 deletions(-)

diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index cb519e32ec..33dd6208a8 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -317,7 +317,6 @@ pub struct AllLanguageSettingsContent {
     pub defaults: LanguageSettingsContent,
     /// The settings for individual languages.
     #[serde(default)]
-    #[settings_ui(skip)]
     pub languages: LanguageToSettingsMap,
     /// Settings for associating file extensions and filenames
     /// with languages.
@@ -331,6 +330,37 @@ pub struct AllLanguageSettingsContent {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
 pub struct LanguageToSettingsMap(pub HashMap<LanguageName, LanguageSettingsContent>);
 
+impl SettingsUi for LanguageToSettingsMap {
+    fn settings_ui_item() -> settings::SettingsUiItem {
+        settings::SettingsUiItem::DynamicMap(settings::SettingsUiItemDynamicMap {
+            item: LanguageSettingsContent::settings_ui_item,
+            defaults_path: &[],
+            determine_items: |settings_value, cx| {
+                use settings::SettingsUiEntryMetaData;
+
+                // todo(settings_ui): We should be using a global LanguageRegistry, but it's not implemented yet
+                _ = cx;
+
+                let Some(settings_language_map) = settings_value.as_object() else {
+                    return Vec::new();
+                };
+                let mut languages = Vec::with_capacity(settings_language_map.len());
+
+                for language_name in settings_language_map.keys().map(gpui::SharedString::from) {
+                    languages.push(SettingsUiEntryMetaData {
+                        title: language_name.clone(),
+                        path: language_name,
+                        // todo(settings_ui): Implement documentation for each language
+                        // ideally based on the language's official docs from extension or builtin info
+                        documentation: None,
+                    });
+                }
+                return languages;
+            },
+        })
+    }
+}
+
 inventory::submit! {
     ParameterizedJsonSchema {
         add_and_get_ref: |generator, params, _cx| {
@@ -431,11 +461,13 @@ fn default_3() -> usize {
 
 /// The settings for a particular language.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, SettingsUi)]
+#[settings_ui(group = "Default")]
 pub struct LanguageSettingsContent {
     /// How many columns a tab should occupy.
     ///
     /// Default: 4
     #[serde(default)]
+    #[settings_ui(skip)]
     pub tab_size: Option<NonZeroU32>,
     /// Whether to indent lines using tab characters, as opposed to multiple
     /// spaces.
@@ -466,6 +498,7 @@ pub struct LanguageSettingsContent {
     ///
     /// Default: []
     #[serde(default)]
+    #[settings_ui(skip)]
     pub wrap_guides: Option<Vec<usize>>,
     /// Indent guide related settings.
     #[serde(default)]
@@ -491,6 +524,7 @@ pub struct LanguageSettingsContent {
     ///
     /// Default: auto
     #[serde(default)]
+    #[settings_ui(skip)]
     pub formatter: Option<SelectedFormatter>,
     /// Zed's Prettier integration settings.
     /// Allows to enable/disable formatting with Prettier
@@ -516,6 +550,7 @@ pub struct LanguageSettingsContent {
     ///
     /// Default: ["..."]
     #[serde(default)]
+    #[settings_ui(skip)]
     pub language_servers: Option<Vec<String>>,
     /// Controls where the `editor::Rewrap` action is allowed for this language.
     ///
@@ -538,6 +573,7 @@ pub struct LanguageSettingsContent {
     ///
     /// Default: []
     #[serde(default)]
+    #[settings_ui(skip)]
     pub edit_predictions_disabled_in: Option<Vec<String>>,
     /// Whether to show tabs and spaces in the editor.
     #[serde(default)]
@@ -577,6 +613,7 @@ pub struct LanguageSettingsContent {
     /// These are not run if formatting is off.
     ///
     /// Default: {} (or {"source.organizeImports": true} for Go).
+    #[settings_ui(skip)]
     pub code_actions_on_format: Option<HashMap<String, bool>>,
     /// Whether to perform linked edits of associated ranges, if the language server supports it.
     /// For example, when editing opening <html> tag, the contents of the closing </html> tag will be edited as well.
@@ -610,11 +647,14 @@ pub struct LanguageSettingsContent {
     /// Preferred debuggers for this language.
     ///
     /// Default: []
+    #[settings_ui(skip)]
     pub debuggers: Option<Vec<String>>,
 }
 
 /// The behavior of `editor::Rewrap`.
-#[derive(Debug, PartialEq, Clone, Copy, Default, Serialize, Deserialize, JsonSchema)]
+#[derive(
+    Debug, PartialEq, Clone, Copy, Default, Serialize, Deserialize, JsonSchema, SettingsUi,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum RewrapBehavior {
     /// Only rewrap within comments.
@@ -696,7 +736,7 @@ pub enum SoftWrap {
 }
 
 /// Controls the behavior of formatting files when they are saved.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, SettingsUi)]
 pub enum FormatOnSave {
     /// Files should be formatted on save.
     On,
@@ -795,7 +835,7 @@ impl<'de> Deserialize<'de> for FormatOnSave {
 }
 
 /// Controls how whitespace should be displayedin the editor.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum ShowWhitespaceSetting {
     /// Draw whitespace only for the selected text.
@@ -816,7 +856,7 @@ pub enum ShowWhitespaceSetting {
 }
 
 /// Controls which formatter should be used when formatting code.
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, SettingsUi)]
 pub enum SelectedFormatter {
     /// Format files using Zed's Prettier integration (if applicable),
     /// or falling back to formatting via language server.
@@ -1012,7 +1052,7 @@ pub enum IndentGuideBackgroundColoring {
 }
 
 /// The settings for inlay hints.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 pub struct InlayHintSettings {
     /// Global switch to toggle hints on and off.
     ///
@@ -1079,7 +1119,7 @@ fn scroll_debounce_ms() -> u64 {
 }
 
 /// The task settings for a particular language.
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Debug, Clone, Deserialize, PartialEq, Serialize, JsonSchema, SettingsUi)]
 pub struct LanguageTaskConfig {
     /// Extra task variables to set for a particular language.
     #[serde(default)]
@@ -1622,7 +1662,7 @@ fn merge_settings(settings: &mut LanguageSettings, src: &LanguageSettingsContent
 /// Allows to enable/disable formatting with Prettier
 /// and configure default Prettier, used when no project-level Prettier installation is found.
 /// Prettier formatting is disabled by default.
-#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct PrettierSettings {
     /// Enables or disables formatting with Prettier for a given language.
     #[serde(default)]
@@ -1635,15 +1675,17 @@ pub struct PrettierSettings {
     /// Forces Prettier integration to use specific plugins when formatting files with the language.
     /// The default Prettier will be installed with these plugins.
     #[serde(default)]
+    #[settings_ui(skip)]
     pub plugins: HashSet<String>,
 
     /// Default Prettier options, in the format as in package.json section for Prettier.
     /// If project installs Prettier via its package.json, these options will be ignored.
     #[serde(flatten)]
+    #[settings_ui(skip)]
     pub options: HashMap<String, serde_json::Value>,
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct JsxTagAutoCloseSettings {
     /// Enables or disables auto-closing of JSX tags.
     #[serde(default)]
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index cc0ebf10cd..f227071193 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -601,12 +601,12 @@ impl SettingsStore {
     pub fn update_settings_file_at_path(
         &self,
         fs: Arc<dyn Fs>,
-        path: &[&str],
+        path: &[impl AsRef<str>],
         new_value: serde_json::Value,
     ) -> oneshot::Receiver<Result<()>> {
         let key_path = path
             .into_iter()
-            .cloned()
+            .map(AsRef::as_ref)
             .map(SharedString::new)
             .collect::<Vec<_>>();
         let update = move |mut old_text: String, cx: AsyncApp| {
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index e056dfbd5a..09505e63a3 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -1,8 +1,12 @@
-use std::any::TypeId;
+use std::{
+    any::TypeId,
+    num::{NonZeroU32, NonZeroUsize},
+    rc::Rc,
+};
 
 use anyhow::Context as _;
 use fs::Fs;
-use gpui::{AnyElement, App, AppContext as _, ReadGlobal as _, Window};
+use gpui::{AnyElement, App, AppContext as _, ReadGlobal as _, SharedString, Window};
 use smallvec::SmallVec;
 
 use crate::SettingsStore;
@@ -24,6 +28,7 @@ pub trait SettingsUi {
     }
 }
 
+#[derive(Clone)]
 pub struct SettingsUiEntry {
     /// The path in the settings JSON file for this setting. Relative to parent
     /// None implies `#[serde(flatten)]` or `Settings::KEY.is_none()` for top level settings
@@ -35,6 +40,7 @@ pub struct SettingsUiEntry {
     pub item: SettingsUiItem,
 }
 
+#[derive(Clone)]
 pub enum SettingsUiItemSingle {
     SwitchField,
     /// A numeric stepper for a specific type of number
@@ -52,13 +58,13 @@ pub enum SettingsUiItemSingle {
         /// Must be the same length as `variants`
         labels: &'static [&'static str],
     },
-    Custom(Box<dyn Fn(SettingsValue<serde_json::Value>, &mut Window, &mut App) -> AnyElement>),
+    Custom(Rc<dyn Fn(SettingsValue<serde_json::Value>, &mut Window, &mut App) -> AnyElement>),
 }
 
 pub struct SettingsValue<T> {
-    pub title: &'static str,
-    pub documentation: Option<&'static str>,
-    pub path: SmallVec<[&'static str; 1]>,
+    pub title: SharedString,
+    pub documentation: Option<SharedString>,
+    pub path: SmallVec<[SharedString; 1]>,
     pub value: Option<T>,
     pub default_value: T,
 }
@@ -73,7 +79,7 @@ impl<T> SettingsValue<T> {
 }
 
 impl SettingsValue<serde_json::Value> {
-    pub fn write_value(path: &SmallVec<[&'static str; 1]>, value: serde_json::Value, cx: &mut App) {
+    pub fn write_value(path: &SmallVec<[SharedString; 1]>, value: serde_json::Value, cx: &mut App) {
         let settings_store = SettingsStore::global(cx);
         let fs = <dyn Fs>::global(cx);
 
@@ -90,7 +96,7 @@ impl SettingsValue<serde_json::Value> {
 
 impl<T: serde::Serialize> SettingsValue<T> {
     pub fn write(
-        path: &SmallVec<[&'static str; 1]>,
+        path: &SmallVec<[SharedString; 1]>,
         value: T,
         cx: &mut App,
     ) -> Result<(), serde_json::Error> {
@@ -99,19 +105,36 @@ impl<T: serde::Serialize> SettingsValue<T> {
     }
 }
 
-pub struct SettingsUiItemDynamic {
+#[derive(Clone)]
+pub struct SettingsUiItemUnion {
     pub options: Vec<SettingsUiEntry>,
     pub determine_option: fn(&serde_json::Value, &App) -> usize,
 }
 
+pub struct SettingsUiEntryMetaData {
+    pub title: SharedString,
+    pub path: SharedString,
+    pub documentation: Option<SharedString>,
+}
+
+#[derive(Clone)]
+pub struct SettingsUiItemDynamicMap {
+    pub item: fn() -> SettingsUiItem,
+    pub determine_items: fn(&serde_json::Value, &App) -> Vec<SettingsUiEntryMetaData>,
+    pub defaults_path: &'static [&'static str],
+}
+
+#[derive(Clone)]
 pub struct SettingsUiItemGroup {
     pub items: Vec<SettingsUiEntry>,
 }
 
+#[derive(Clone)]
 pub enum SettingsUiItem {
     Group(SettingsUiItemGroup),
     Single(SettingsUiItemSingle),
-    Dynamic(SettingsUiItemDynamic),
+    Union(SettingsUiItemUnion),
+    DynamicMap(SettingsUiItemDynamicMap),
     None,
 }
 
@@ -134,6 +157,7 @@ pub enum NumType {
     U32 = 1,
     F32 = 2,
     USIZE = 3,
+    U32NONZERO = 4,
 }
 
 pub static NUM_TYPE_NAMES: std::sync::LazyLock<[&'static str; NumType::COUNT]> =
@@ -151,6 +175,7 @@ impl NumType {
             NumType::U32 => TypeId::of::<u32>(),
             NumType::F32 => TypeId::of::<f32>(),
             NumType::USIZE => TypeId::of::<usize>(),
+            NumType::U32NONZERO => TypeId::of::<NonZeroU32>(),
         }
     }
 
@@ -160,6 +185,7 @@ impl NumType {
             NumType::U32 => std::any::type_name::<u32>(),
             NumType::F32 => std::any::type_name::<f32>(),
             NumType::USIZE => std::any::type_name::<usize>(),
+            NumType::U32NONZERO => std::any::type_name::<NonZeroU32>(),
         }
     }
 }
@@ -185,3 +211,4 @@ numeric_stepper_for_num_type!(u32, U32);
 // todo(settings_ui) is there a better ui for f32?
 numeric_stepper_for_num_type!(f32, F32);
 numeric_stepper_for_num_type!(usize, USIZE);
+numeric_stepper_for_num_type!(NonZeroUsize, U32NONZERO);
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 5fea6dfceb..9866dcdb3e 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -1,6 +1,7 @@
 mod appearance_settings_controls;
 
 use std::any::TypeId;
+use std::num::NonZeroU32;
 use std::ops::{Not, Range};
 
 use anyhow::Context as _;
@@ -9,8 +10,9 @@ use editor::EditorSettingsControls;
 use feature_flags::{FeatureFlag, FeatureFlagViewExt};
 use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, ScrollHandle, actions};
 use settings::{
-    NumType, SettingsStore, SettingsUiEntry, SettingsUiItem, SettingsUiItemDynamic,
-    SettingsUiItemGroup, SettingsUiItemSingle, SettingsValue,
+    NumType, SettingsStore, SettingsUiEntry, SettingsUiEntryMetaData, SettingsUiItem,
+    SettingsUiItemDynamicMap, SettingsUiItemGroup, SettingsUiItemSingle, SettingsUiItemUnion,
+    SettingsValue,
 };
 use smallvec::SmallVec;
 use ui::{NumericStepper, SwitchField, ToggleButtonGroup, ToggleButtonSimple, prelude::*};
@@ -135,9 +137,9 @@ impl Item for SettingsPage {
 //   - Do we want to show the parent groups when a item is matched?
 
 struct UiEntry {
-    title: &'static str,
-    path: Option<&'static str>,
-    documentation: Option<&'static str>,
+    title: SharedString,
+    path: Option<SharedString>,
+    documentation: Option<SharedString>,
     _depth: usize,
     // a
     //  b     < a descendant range < a total descendant range
@@ -154,6 +156,11 @@ struct UiEntry {
     /// For dynamic items this is a way to select a value from a list of values
     /// this is always none for non-dynamic items
     select_descendant: Option<fn(&serde_json::Value, &App) -> usize>,
+    generate_items: Option<(
+        SettingsUiItem,
+        fn(&serde_json::Value, &App) -> Vec<SettingsUiEntryMetaData>,
+        SmallVec<[SharedString; 1]>,
+    )>,
 }
 
 impl UiEntry {
@@ -193,15 +200,16 @@ fn build_tree_item(
 ) {
     let index = tree.len();
     tree.push(UiEntry {
-        title: entry.title,
-        path: entry.path,
-        documentation: entry.documentation,
+        title: entry.title.into(),
+        path: entry.path.map(SharedString::new_static),
+        documentation: entry.documentation.map(SharedString::new_static),
         _depth: depth,
         descendant_range: index + 1..index + 1,
         total_descendant_range: index + 1..index + 1,
         render: None,
         next_sibling: None,
         select_descendant: None,
+        generate_items: None,
     });
     if let Some(prev_index) = prev_index {
         tree[prev_index].next_sibling = Some(index);
@@ -222,7 +230,7 @@ fn build_tree_item(
         SettingsUiItem::Single(item) => {
             tree[index].render = Some(item);
         }
-        SettingsUiItem::Dynamic(SettingsUiItemDynamic {
+        SettingsUiItem::Union(SettingsUiItemUnion {
             options,
             determine_option,
         }) => {
@@ -238,6 +246,21 @@ fn build_tree_item(
                 tree[index].total_descendant_range.end = tree.len();
             }
         }
+        SettingsUiItem::DynamicMap(SettingsUiItemDynamicMap {
+            item: generate_settings_ui_item,
+            determine_items,
+            defaults_path,
+        }) => {
+            tree[index].generate_items = Some((
+                generate_settings_ui_item(),
+                determine_items,
+                defaults_path
+                    .into_iter()
+                    .copied()
+                    .map(SharedString::new_static)
+                    .collect(),
+            ));
+        }
         SettingsUiItem::None => {
             return;
         }
@@ -263,7 +286,7 @@ impl SettingsUiTree {
             build_tree_item(&mut tree, item, 0, prev_root_entry_index);
         }
 
-        root_entry_indices.sort_by_key(|i| tree[*i].title);
+        root_entry_indices.sort_by_key(|i| &tree[*i].title);
 
         let active_entry_index = root_entry_indices[0];
         Self {
@@ -276,18 +299,18 @@ impl SettingsUiTree {
     // todo(settings_ui): Make sure `Item::None` paths are added to the paths tree,
     // so that we can keep none/skip and still test in CI that all settings have
     #[cfg(feature = "test-support")]
-    pub fn all_paths(&self, cx: &App) -> Vec<Vec<&'static str>> {
+    pub fn all_paths(&self, cx: &App) -> Vec<Vec<SharedString>> {
         fn all_paths_rec(
             tree: &[UiEntry],
-            paths: &mut Vec<Vec<&'static str>>,
-            current_path: &mut Vec<&'static str>,
+            paths: &mut Vec<Vec<SharedString>>,
+            current_path: &mut Vec<SharedString>,
             idx: usize,
             cx: &App,
         ) {
             let child = &tree[idx];
             let mut pushed_path = false;
             if let Some(path) = child.path.as_ref() {
-                current_path.push(path);
+                current_path.push(path.clone());
                 paths.push(current_path.clone());
                 pushed_path = true;
             }
@@ -340,7 +363,7 @@ fn render_nav(tree: &SettingsUiTree, _window: &mut Window, cx: &mut Context<Sett
                     settings.settings_tree.active_entry_index = index;
                 }))
                 .child(
-                    Label::new(SharedString::new_static(tree.entries[index].title))
+                    Label::new(tree.entries[index].title.clone())
                         .size(LabelSize::Large)
                         .when(tree.active_entry_index == index, |this| {
                             this.color(Color::Selected)
@@ -361,45 +384,102 @@ fn render_content(
     let mut path = smallvec::smallvec![];
 
     fn render_recursive(
-        tree: &SettingsUiTree,
+        tree: &[UiEntry],
         index: usize,
-        path: &mut SmallVec<[&'static str; 1]>,
+        path: &mut SmallVec<[SharedString; 1]>,
         mut element: Div,
+        // todo(settings_ui): can this be a ref without cx borrow issues?
+        fallback_path: &mut Option<SmallVec<[SharedString; 1]>>,
         window: &mut Window,
         cx: &mut App,
     ) -> Div {
-        let Some(child) = tree.entries.get(index) else {
+        let Some(child) = tree.get(index) else {
             return element.child(
                 Label::new(SharedString::new_static("No settings found")).color(Color::Error),
             );
         };
 
-        element =
-            element.child(Label::new(SharedString::new_static(child.title)).size(LabelSize::Large));
+        element = element.child(Label::new(child.title.clone()).size(LabelSize::Large));
 
         // todo(settings_ui): subgroups?
         let mut pushed_path = false;
-        if let Some(child_path) = child.path {
-            path.push(child_path);
+        if let Some(child_path) = child.path.as_ref() {
+            path.push(child_path.clone());
+            if let Some(fallback_path) = fallback_path.as_mut() {
+                fallback_path.push(child_path.clone());
+            }
             pushed_path = true;
         }
+        // let fallback_path_copy = fallback_path.cloned();
         let settings_value = settings_value_from_settings_and_path(
             path.clone(),
-            child.title,
-            child.documentation,
+            fallback_path.as_ref().map(|path| path.as_slice()),
+            child.title.clone(),
+            child.documentation.clone(),
             // PERF: how to structure this better? There feels like there's a way to avoid the clone
             // and every value lookup
             SettingsStore::global(cx).raw_user_settings(),
             SettingsStore::global(cx).raw_default_settings(),
         );
         if let Some(select_descendant) = child.select_descendant {
-            let selected_descendant = child
-                .nth_descendant_index(&tree.entries, select_descendant(settings_value.read(), cx));
+            let selected_descendant =
+                child.nth_descendant_index(tree, select_descendant(settings_value.read(), cx));
             if let Some(descendant_index) = selected_descendant {
-                element = render_recursive(&tree, descendant_index, path, element, window, cx);
+                element = render_recursive(
+                    tree,
+                    descendant_index,
+                    path,
+                    element,
+                    fallback_path,
+                    window,
+                    cx,
+                );
             }
-        }
-        if let Some(child_render) = child.render.as_ref() {
+        } else if let Some((settings_ui_item, generate_items, defaults_path)) =
+            child.generate_items.as_ref()
+        {
+            let generated_items = generate_items(settings_value.read(), cx);
+            let mut ui_items = Vec::with_capacity(generated_items.len());
+            for item in generated_items {
+                let settings_ui_entry = SettingsUiEntry {
+                    path: None,
+                    title: "",
+                    documentation: None,
+                    item: settings_ui_item.clone(),
+                };
+                let prev_index = if ui_items.is_empty() {
+                    None
+                } else {
+                    Some(ui_items.len() - 1)
+                };
+                let item_index = ui_items.len();
+                build_tree_item(
+                    &mut ui_items,
+                    settings_ui_entry,
+                    child._depth + 1,
+                    prev_index,
+                );
+                if item_index < ui_items.len() {
+                    ui_items[item_index].path = None;
+                    ui_items[item_index].title = item.title.clone();
+                    ui_items[item_index].documentation = item.documentation.clone();
+
+                    // push path instead of setting path on ui item so that the path isn't pushed to default_path as well
+                    // when we recurse
+                    path.push(item.path.clone());
+                    element = render_recursive(
+                        &ui_items,
+                        item_index,
+                        path,
+                        element,
+                        &mut Some(defaults_path.clone()),
+                        window,
+                        cx,
+                    );
+                    path.pop();
+                }
+            }
+        } else if let Some(child_render) = child.render.as_ref() {
             element = element.child(div().child(render_item_single(
                 settings_value,
                 child_render,
@@ -409,8 +489,16 @@ fn render_content(
         } else if let Some(child_index) = child.first_descendant_index() {
             let mut index = Some(child_index);
             while let Some(sub_child_index) = index {
-                element = render_recursive(tree, sub_child_index, path, element, window, cx);
-                index = tree.entries[sub_child_index].next_sibling;
+                element = render_recursive(
+                    tree,
+                    sub_child_index,
+                    path,
+                    element,
+                    fallback_path,
+                    window,
+                    cx,
+                );
+                index = tree[sub_child_index].next_sibling;
             }
         } else {
             element =
@@ -419,15 +507,19 @@ fn render_content(
 
         if pushed_path {
             path.pop();
+            if let Some(fallback_path) = fallback_path.as_mut() {
+                fallback_path.pop();
+            }
         }
         return element;
     }
 
     return render_recursive(
-        tree,
+        &tree.entries,
         tree.active_entry_index,
         &mut path,
         content,
+        &mut None,
         window,
         cx,
     );
@@ -484,15 +576,15 @@ fn render_old_appearance_settings(cx: &mut App) -> impl IntoElement {
         )
 }
 
-fn element_id_from_path(path: &[&'static str]) -> ElementId {
+fn element_id_from_path(path: &[SharedString]) -> ElementId {
     if path.len() == 0 {
         panic!("Path length must not be zero");
     } else if path.len() == 1 {
-        ElementId::Name(SharedString::new_static(path[0]))
+        ElementId::Name(path[0].clone())
     } else {
         ElementId::from((
-            ElementId::from(SharedString::new_static(path[path.len() - 2])),
-            SharedString::new_static(path[path.len() - 1]),
+            ElementId::from(path[path.len() - 2].clone()),
+            path[path.len() - 1].clone(),
         ))
     }
 }
@@ -525,13 +617,13 @@ fn render_item_single(
 
 pub fn read_settings_value_from_path<'a>(
     settings_contents: &'a serde_json::Value,
-    path: &[&str],
+    path: &[impl AsRef<str>],
 ) -> Option<&'a serde_json::Value> {
     // todo(settings_ui) make non recursive, and move to `settings` alongside SettingsValue, and add method to SettingsValue to get nested
     let Some((key, remaining)) = path.split_first() else {
         return Some(settings_contents);
     };
-    let Some(value) = settings_contents.get(key) else {
+    let Some(value) = settings_contents.get(key.as_ref()) else {
         return None;
     };
 
@@ -541,13 +633,17 @@ pub fn read_settings_value_from_path<'a>(
 fn downcast_any_item<T: serde::de::DeserializeOwned>(
     settings_value: SettingsValue<serde_json::Value>,
 ) -> SettingsValue<T> {
-    let value = settings_value
-        .value
-        .map(|value| serde_json::from_value::<T>(value).expect("value is not a T"));
+    let value = settings_value.value.map(|value| {
+        serde_json::from_value::<T>(value.clone())
+            .with_context(|| format!("path: {:?}", settings_value.path.join(".")))
+            .with_context(|| format!("value is not a {}: {}", std::any::type_name::<T>(), value))
+            .unwrap()
+    });
     // todo(settings_ui) Create test that constructs UI tree, and asserts that all elements have default values
     let default_value = serde_json::from_value::<T>(settings_value.default_value)
         .with_context(|| format!("path: {:?}", settings_value.path.join(".")))
-        .expect("default value is not an Option<T>");
+        .with_context(|| format!("value is not a {}", std::any::type_name::<T>()))
+        .unwrap();
     let deserialized_setting_value = SettingsValue {
         title: settings_value.title,
         path: settings_value.path,
@@ -577,8 +673,8 @@ fn render_any_numeric_stepper(
     match num_type {
         NumType::U64 => render_numeric_stepper::<u64>(
             downcast_any_item(settings_value),
-            u64::saturating_sub,
-            u64::saturating_add,
+            |n| u64::saturating_sub(n, 1),
+            |n| u64::saturating_add(n, 1),
             |n| {
                 serde_json::Number::try_from(n)
                     .context("Failed to convert u64 to serde_json::Number")
@@ -588,8 +684,8 @@ fn render_any_numeric_stepper(
         ),
         NumType::U32 => render_numeric_stepper::<u32>(
             downcast_any_item(settings_value),
-            u32::saturating_sub,
-            u32::saturating_add,
+            |n| u32::saturating_sub(n, 1),
+            |n| u32::saturating_add(n, 1),
             |n| {
                 serde_json::Number::try_from(n)
                     .context("Failed to convert u32 to serde_json::Number")
@@ -599,8 +695,8 @@ fn render_any_numeric_stepper(
         ),
         NumType::F32 => render_numeric_stepper::<f32>(
             downcast_any_item(settings_value),
-            |a, b| a - b,
-            |a, b| a + b,
+            |a| a - 1.0,
+            |a| a + 1.0,
             |n| {
                 serde_json::Number::from_f64(n as f64)
                     .context("Failed to convert f32 to serde_json::Number")
@@ -610,8 +706,8 @@ fn render_any_numeric_stepper(
         ),
         NumType::USIZE => render_numeric_stepper::<usize>(
             downcast_any_item(settings_value),
-            usize::saturating_sub,
-            usize::saturating_add,
+            |n| usize::saturating_sub(n, 1),
+            |n| usize::saturating_add(n, 1),
             |n| {
                 serde_json::Number::try_from(n)
                     .context("Failed to convert usize to serde_json::Number")
@@ -619,15 +715,24 @@ fn render_any_numeric_stepper(
             window,
             cx,
         ),
+        NumType::U32NONZERO => render_numeric_stepper::<NonZeroU32>(
+            downcast_any_item(settings_value),
+            |a| NonZeroU32::new(u32::saturating_sub(a.get(), 1)).unwrap_or(NonZeroU32::MIN),
+            |a| NonZeroU32::new(u32::saturating_add(a.get(), 1)).unwrap_or(NonZeroU32::MAX),
+            |n| {
+                serde_json::Number::try_from(n.get())
+                    .context("Failed to convert usize to serde_json::Number")
+            },
+            window,
+            cx,
+        ),
     }
 }
 
-fn render_numeric_stepper<
-    T: serde::de::DeserializeOwned + std::fmt::Display + Copy + From<u8> + 'static,
->(
+fn render_numeric_stepper<T: serde::de::DeserializeOwned + std::fmt::Display + Copy + 'static>(
     value: SettingsValue<T>,
-    saturating_sub: fn(T, T) -> T,
-    saturating_add: fn(T, T) -> T,
+    saturating_sub_1: fn(T) -> T,
+    saturating_add_1: fn(T) -> T,
     to_serde_number: fn(T) -> anyhow::Result<serde_json::Number>,
     _window: &mut Window,
     _cx: &mut App,
@@ -640,9 +745,9 @@ fn render_numeric_stepper<
         id,
         num.to_string(),
         {
-            let path = value.path.clone();
+            let path = value.path;
             move |_, _, cx| {
-                let Some(number) = to_serde_number(saturating_sub(num, 1.into())).ok() else {
+                let Some(number) = to_serde_number(saturating_sub_1(num)).ok() else {
                     return;
                 };
                 let new_value = serde_json::Value::Number(number);
@@ -650,7 +755,7 @@ fn render_numeric_stepper<
             }
         },
         move |_, _, cx| {
-            let Some(number) = to_serde_number(saturating_add(num, 1.into())).ok() else {
+            let Some(number) = to_serde_number(saturating_add_1(num)).ok() else {
                 return;
             };
 
@@ -672,8 +777,8 @@ fn render_switch_field(
     let path = value.path.clone();
     SwitchField::new(
         id,
-        SharedString::new_static(value.title),
-        value.documentation.map(SharedString::new_static),
+        value.title.clone(),
+        value.documentation.clone(),
         match value.read() {
             true => ToggleState::Selected,
             false => ToggleState::Unselected,
@@ -703,7 +808,6 @@ fn render_toggle_button_group(
     let value = downcast_any_item::<String>(value);
 
     fn make_toggle_group<const LEN: usize>(
-        group_name: &'static str,
         value: SettingsValue<String>,
         variants: &'static [&'static str],
         labels: &'static [&'static str],
@@ -727,7 +831,7 @@ fn render_toggle_button_group(
 
         let mut idx = 0;
         ToggleButtonGroup::single_row(
-            group_name,
+            value.title.clone(),
             variants_array.map(|(variant, label)| {
                 let path = value.path.clone();
                 idx += 1;
@@ -748,7 +852,7 @@ fn render_toggle_button_group(
     macro_rules! templ_toggl_with_const_param {
         ($len:expr) => {
             if variants.len() == $len {
-                return make_toggle_group::<$len>(value.title, value, variants, labels);
+                return make_toggle_group::<$len>(value, variants, labels);
             }
         };
     }
@@ -762,13 +866,19 @@ fn render_toggle_button_group(
 }
 
 fn settings_value_from_settings_and_path(
-    path: SmallVec<[&'static str; 1]>,
-    title: &'static str,
-    documentation: Option<&'static str>,
+    path: SmallVec<[SharedString; 1]>,
+    fallback_path: Option<&[SharedString]>,
+    title: SharedString,
+    documentation: Option<SharedString>,
     user_settings: &serde_json::Value,
     default_settings: &serde_json::Value,
 ) -> SettingsValue<serde_json::Value> {
     let default_value = read_settings_value_from_path(default_settings, &path)
+        .or_else(|| {
+            fallback_path.and_then(|fallback_path| {
+                read_settings_value_from_path(default_settings, fallback_path)
+            })
+        })
         .with_context(|| format!("No default value for item at path {:?}", path.join(".")))
         .expect("Default value set for item")
         .clone();
@@ -778,7 +888,7 @@ fn settings_value_from_settings_and_path(
         default_value,
         value,
         documentation,
-        path: path.clone(),
+        path,
         // todo(settings_ui) is title required inside SettingsValue?
         title,
     };
diff --git a/crates/ui/src/components/button/toggle_button.rs b/crates/ui/src/components/button/toggle_button.rs
index 2a862f4876..a50918b109 100644
--- a/crates/ui/src/components/button/toggle_button.rs
+++ b/crates/ui/src/components/button/toggle_button.rs
@@ -425,7 +425,7 @@ pub struct ToggleButtonGroup<T, const COLS: usize = 3, const ROWS: usize = 1>
 where
     T: ButtonBuilder,
 {
-    group_name: &'static str,
+    group_name: SharedString,
     rows: [[T; COLS]; ROWS],
     style: ToggleButtonGroupStyle,
     size: ToggleButtonGroupSize,
@@ -435,9 +435,9 @@ where
 }
 
 impl<T: ButtonBuilder, const COLS: usize> ToggleButtonGroup<T, COLS> {
-    pub fn single_row(group_name: &'static str, buttons: [T; COLS]) -> Self {
+    pub fn single_row(group_name: impl Into<SharedString>, buttons: [T; COLS]) -> Self {
         Self {
-            group_name,
+            group_name: group_name.into(),
             rows: [buttons],
             style: ToggleButtonGroupStyle::Transparent,
             size: ToggleButtonGroupSize::Default,
@@ -449,9 +449,13 @@ impl<T: ButtonBuilder, const COLS: usize> ToggleButtonGroup<T, COLS> {
 }
 
 impl<T: ButtonBuilder, const COLS: usize> ToggleButtonGroup<T, COLS, 2> {
-    pub fn two_rows(group_name: &'static str, first_row: [T; COLS], second_row: [T; COLS]) -> Self {
+    pub fn two_rows(
+        group_name: impl Into<SharedString>,
+        first_row: [T; COLS],
+        second_row: [T; COLS],
+    ) -> Self {
         Self {
-            group_name,
+            group_name: group_name.into(),
             rows: [first_row, second_row],
             style: ToggleButtonGroupStyle::Transparent,
             size: ToggleButtonGroupSize::Default,
@@ -512,6 +516,7 @@ impl<T: ButtonBuilder, const COLS: usize, const ROWS: usize> RenderOnce
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
         let entries =
             self.rows.into_iter().enumerate().map(|(row_index, row)| {
+                let group_name = self.group_name.clone();
                 row.into_iter().enumerate().map(move |(col_index, button)| {
                     let ButtonConfiguration {
                         label,
@@ -523,7 +528,7 @@ impl<T: ButtonBuilder, const COLS: usize, const ROWS: usize> RenderOnce
 
                     let entry_index = row_index * COLS + col_index;
 
-                    ButtonLike::new((self.group_name, entry_index))
+                    ButtonLike::new((group_name.clone(), entry_index))
                         .full_width()
                         .rounding(None)
                         .when_some(self.tab_index, |this, tab_index| {

From ea4073e50e3f21f46bc64c2f3864398b3946e22a Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Mon, 8 Sep 2025 20:18:43 -0400
Subject: [PATCH 698/823] cloud_llm_client: Add new `Plan` variants (#37810)

This PR adds new variants to the `Plan` enum.

Release Notes:

- N/A
---
 Cargo.lock                                    |  1 +
 crates/agent_ui/src/acp/thread_view.rs        |  1 +
 crates/agent_ui/src/agent_configuration.rs    |  6 ++-
 crates/agent_ui/src/agent_panel.rs            |  1 +
 crates/agent_ui/src/ui/end_trial_upsell.rs    |  7 ++--
 .../agent_ui/src/ui/preview/usage_callouts.rs |  4 +-
 crates/ai_onboarding/Cargo.toml               |  1 +
 crates/ai_onboarding/src/ai_onboarding.rs     | 39 +++++++++----------
 crates/ai_onboarding/src/ai_upsell_card.rs    | 23 +++++------
 crates/ai_onboarding/src/plan_definitions.rs  |  6 +--
 .../cloud_llm_client/src/cloud_llm_client.rs  |  8 ++++
 crates/feature_flags/src/feature_flags.rs     |  6 +++
 .../language_model/src/model/cloud_model.rs   |  1 +
 crates/title_bar/src/title_bar.rs             |  8 +++-
 14 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47281f51fa..eee80226fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -482,6 +482,7 @@ dependencies = [
  "client",
  "cloud_llm_client",
  "component",
+ "feature_flags",
  "gpui",
  "language_model",
  "serde",
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 8e8d5493cf..e9794160a2 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -5005,6 +5005,7 @@ impl AcpThreadView {
             cloud_llm_client::Plan::ZedProTrial | cloud_llm_client::Plan::ZedFree => {
                 "Upgrade to Zed Pro for more prompts."
             }
+            cloud_llm_client::Plan::ZedProV2 | cloud_llm_client::Plan::ZedProTrialV2 => "",
         };
 
         Callout::new()
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 8ae21841fc..bc7dd1d552 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -516,8 +516,10 @@ impl AgentConfiguration {
 
             let (plan_name, label_color, bg_color) = match plan {
                 Plan::ZedFree => ("Free", Color::Default, free_chip_bg),
-                Plan::ZedProTrial => ("Pro Trial", Color::Accent, pro_chip_bg),
-                Plan::ZedPro => ("Pro", Color::Accent, pro_chip_bg),
+                Plan::ZedProTrial | Plan::ZedProTrialV2 => {
+                    ("Pro Trial", Color::Accent, pro_chip_bg)
+                }
+                Plan::ZedPro | Plan::ZedProV2 => ("Pro", Color::Accent, pro_chip_bg),
             };
 
             Chip::new(plan_name.to_string())
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index e1ac67f1c8..67a0988f7f 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -3518,6 +3518,7 @@ impl AgentPanel {
         let error_message = match plan {
             Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
             Plan::ZedProTrial | Plan::ZedFree => "Upgrade to Zed Pro for more prompts.",
+            Plan::ZedProV2 | Plan::ZedProTrialV2 => "",
         };
 
         Callout::new()
diff --git a/crates/agent_ui/src/ui/end_trial_upsell.rs b/crates/agent_ui/src/ui/end_trial_upsell.rs
index 3a8a119800..55164aef71 100644
--- a/crates/agent_ui/src/ui/end_trial_upsell.rs
+++ b/crates/agent_ui/src/ui/end_trial_upsell.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use ai_onboarding::{AgentPanelOnboardingCard, PlanDefinitions};
 use client::zed_urls;
+use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt as _};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use ui::{Divider, Tooltip, prelude::*};
 
@@ -18,8 +19,6 @@ impl EndTrialUpsell {
 
 impl RenderOnce for EndTrialUpsell {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let plan_definitions = PlanDefinitions;
-
         let pro_section = v_flex()
             .gap_1()
             .child(
@@ -33,7 +32,7 @@ impl RenderOnce for EndTrialUpsell {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(plan_definitions.pro_plan(false))
+            .child(PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), false))
             .child(
                 Button::new("cta-button", "Upgrade to Zed Pro")
                     .full_width()
@@ -64,7 +63,7 @@ impl RenderOnce for EndTrialUpsell {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(plan_definitions.free_plan());
+            .child(PlanDefinitions.free_plan(cx.has_flag::<BillingV2FeatureFlag>()));
 
         AgentPanelOnboardingCard::new()
             .child(Headline::new("Your Zed Pro Trial has expired"))
diff --git a/crates/agent_ui/src/ui/preview/usage_callouts.rs b/crates/agent_ui/src/ui/preview/usage_callouts.rs
index d4d037b976..7c080f075a 100644
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -45,13 +45,13 @@ impl RenderOnce for UsageCallout {
                     "Upgrade",
                     zed_urls::account_url(cx),
                 ),
-                Plan::ZedProTrial => (
+                Plan::ZedProTrial | Plan::ZedProTrialV2 => (
                     "Out of trial prompts",
                     "Upgrade to Zed Pro to continue, or switch to API key.".to_string(),
                     "Upgrade",
                     zed_urls::account_url(cx),
                 ),
-                Plan::ZedPro => (
+                Plan::ZedPro | Plan::ZedProV2 => (
                     "Out of included prompts",
                     "Enable usage-based billing to continue.".to_string(),
                     "Manage",
diff --git a/crates/ai_onboarding/Cargo.toml b/crates/ai_onboarding/Cargo.toml
index 95a45b1a6f..cf3e6e9cd6 100644
--- a/crates/ai_onboarding/Cargo.toml
+++ b/crates/ai_onboarding/Cargo.toml
@@ -18,6 +18,7 @@ default = []
 client.workspace = true
 cloud_llm_client.workspace = true
 component.workspace = true
+feature_flags.workspace = true
 gpui.workspace = true
 language_model.workspace = true
 serde.workspace = true
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index 6d8ac64725..60b8fa89ff 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -18,6 +18,7 @@ pub use young_account_banner::YoungAccountBanner;
 use std::sync::Arc;
 
 use client::{Client, UserStore, zed_urls};
+use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt as _};
 use gpui::{AnyElement, Entity, IntoElement, ParentElement};
 use ui::{Divider, RegisterComponent, Tooltip, prelude::*};
 
@@ -84,9 +85,8 @@ impl ZedAiOnboarding {
         self
     }
 
-    fn render_sign_in_disclaimer(&self, _cx: &mut App) -> AnyElement {
+    fn render_sign_in_disclaimer(&self, cx: &mut App) -> AnyElement {
         let signing_in = matches!(self.sign_in_status, SignInStatus::SigningIn);
-        let plan_definitions = PlanDefinitions;
 
         v_flex()
             .gap_1()
@@ -96,7 +96,7 @@ impl ZedAiOnboarding {
                     .color(Color::Muted)
                     .mb_2(),
             )
-            .child(plan_definitions.pro_plan(false))
+            .child(PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), false))
             .child(
                 Button::new("sign_in", "Try Zed Pro for Free")
                     .disabled(signing_in)
@@ -114,16 +114,13 @@ impl ZedAiOnboarding {
     }
 
     fn render_free_plan_state(&self, cx: &mut App) -> AnyElement {
-        let young_account_banner = YoungAccountBanner;
-        let plan_definitions = PlanDefinitions;
-
         if self.account_too_young {
             v_flex()
                 .relative()
                 .max_w_full()
                 .gap_1()
                 .child(Headline::new("Welcome to Zed AI"))
-                .child(young_account_banner)
+                .child(YoungAccountBanner)
                 .child(
                     v_flex()
                         .mt_2()
@@ -139,7 +136,9 @@ impl ZedAiOnboarding {
                                 )
                                 .child(Divider::horizontal()),
                         )
-                        .child(plan_definitions.pro_plan(true))
+                        .child(
+                            PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), true),
+                        )
                         .child(
                             Button::new("pro", "Get Started")
                                 .full_width()
@@ -182,7 +181,7 @@ impl ZedAiOnboarding {
                                 )
                                 .child(Divider::horizontal()),
                         )
-                        .child(plan_definitions.free_plan()),
+                        .child(PlanDefinitions.free_plan(cx.has_flag::<BillingV2FeatureFlag>())),
                 )
                 .when_some(
                     self.dismiss_onboarding.as_ref(),
@@ -220,7 +219,9 @@ impl ZedAiOnboarding {
                                 )
                                 .child(Divider::horizontal()),
                         )
-                        .child(plan_definitions.pro_trial(true))
+                        .child(
+                            PlanDefinitions.pro_trial(cx.has_flag::<BillingV2FeatureFlag>(), true),
+                        )
                         .child(
                             Button::new("pro", "Start Free Trial")
                                 .full_width()
@@ -238,9 +239,7 @@ impl ZedAiOnboarding {
         }
     }
 
-    fn render_trial_state(&self, _cx: &mut App) -> AnyElement {
-        let plan_definitions = PlanDefinitions;
-
+    fn render_trial_state(&self, is_v2: bool, _cx: &mut App) -> AnyElement {
         v_flex()
             .relative()
             .gap_1()
@@ -250,7 +249,7 @@ impl ZedAiOnboarding {
                     .color(Color::Muted)
                     .mb_2(),
             )
-            .child(plan_definitions.pro_trial(false))
+            .child(PlanDefinitions.pro_trial(is_v2, false))
             .when_some(
                 self.dismiss_onboarding.as_ref(),
                 |this, dismiss_callback| {
@@ -274,9 +273,7 @@ impl ZedAiOnboarding {
             .into_any_element()
     }
 
-    fn render_pro_plan_state(&self, _cx: &mut App) -> AnyElement {
-        let plan_definitions = PlanDefinitions;
-
+    fn render_pro_plan_state(&self, is_v2: bool, _cx: &mut App) -> AnyElement {
         v_flex()
             .gap_1()
             .child(Headline::new("Welcome to Zed Pro"))
@@ -285,7 +282,7 @@ impl ZedAiOnboarding {
                     .color(Color::Muted)
                     .mb_2(),
             )
-            .child(plan_definitions.pro_plan(false))
+            .child(PlanDefinitions.pro_plan(is_v2, false))
             .when_some(
                 self.dismiss_onboarding.as_ref(),
                 |this, dismiss_callback| {
@@ -315,8 +312,10 @@ impl RenderOnce for ZedAiOnboarding {
         if matches!(self.sign_in_status, SignInStatus::SignedIn) {
             match self.plan {
                 None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
-                Some(Plan::ZedProTrial) => self.render_trial_state(cx),
-                Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
+                Some(Plan::ZedProTrial) => self.render_trial_state(false, cx),
+                Some(Plan::ZedProTrialV2) => self.render_trial_state(true, cx),
+                Some(Plan::ZedPro) => self.render_pro_plan_state(false, cx),
+                Some(Plan::ZedProV2) => self.render_pro_plan_state(true, cx),
             }
         } else {
             self.render_sign_in_disclaimer(cx)
diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index d6e7a0bbad..6a797d8437 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use client::{Client, UserStore, zed_urls};
 use cloud_llm_client::Plan;
+use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt};
 use gpui::{AnyElement, App, Entity, IntoElement, RenderOnce, Window};
 use ui::{CommonAnimationExt, Divider, Vector, VectorName, prelude::*};
 
@@ -49,9 +50,6 @@ impl AiUpsellCard {
 
 impl RenderOnce for AiUpsellCard {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let plan_definitions = PlanDefinitions;
-        let young_account_banner = YoungAccountBanner;
-
         let pro_section = v_flex()
             .flex_grow()
             .w_full()
@@ -67,7 +65,7 @@ impl RenderOnce for AiUpsellCard {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(plan_definitions.pro_plan(false));
+            .child(PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), false));
 
         let free_section = v_flex()
             .flex_grow()
@@ -84,7 +82,7 @@ impl RenderOnce for AiUpsellCard {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(plan_definitions.free_plan());
+            .child(PlanDefinitions.free_plan(cx.has_flag::<BillingV2FeatureFlag>()));
 
         let grid_bg = h_flex()
             .absolute()
@@ -173,7 +171,7 @@ impl RenderOnce for AiUpsellCard {
                     .child(Label::new("Try Zed AI").size(LabelSize::Large))
                     .map(|this| {
                         if self.account_too_young {
-                            this.child(young_account_banner).child(
+                            this.child(YoungAccountBanner).child(
                                 v_flex()
                                     .mt_2()
                                     .gap_1()
@@ -188,7 +186,10 @@ impl RenderOnce for AiUpsellCard {
                                             )
                                             .child(Divider::horizontal()),
                                     )
-                                    .child(plan_definitions.pro_plan(true))
+                                    .child(
+                                        PlanDefinitions
+                                            .pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), true),
+                                    )
                                     .child(
                                         Button::new("pro", "Get Started")
                                             .full_width()
@@ -235,7 +236,7 @@ impl RenderOnce for AiUpsellCard {
                             )
                         }
                     }),
-                Some(Plan::ZedProTrial) => card
+                Some(plan @ Plan::ZedProTrial | plan @ Plan::ZedProTrialV2) => card
                     .child(pro_trial_stamp)
                     .child(Label::new("You're in the Zed Pro Trial").size(LabelSize::Large))
                     .child(
@@ -243,8 +244,8 @@ impl RenderOnce for AiUpsellCard {
                             .color(Color::Muted)
                             .mb_2(),
                     )
-                    .child(plan_definitions.pro_trial(false)),
-                Some(Plan::ZedPro) => card
+                    .child(PlanDefinitions.pro_trial(plan == Plan::ZedProTrialV2, false)),
+                Some(plan @ Plan::ZedPro | plan @ Plan::ZedProV2) => card
                     .child(certified_user_stamp)
                     .child(Label::new("You're in the Zed Pro plan").size(LabelSize::Large))
                     .child(
@@ -252,7 +253,7 @@ impl RenderOnce for AiUpsellCard {
                             .color(Color::Muted)
                             .mb_2(),
                     )
-                    .child(plan_definitions.pro_plan(false)),
+                    .child(PlanDefinitions.pro_plan(plan == Plan::ZedProV2, false)),
             },
             // Signed Out State
             _ => card
diff --git a/crates/ai_onboarding/src/plan_definitions.rs b/crates/ai_onboarding/src/plan_definitions.rs
index 8d66f6c356..dce67d4210 100644
--- a/crates/ai_onboarding/src/plan_definitions.rs
+++ b/crates/ai_onboarding/src/plan_definitions.rs
@@ -7,13 +7,13 @@ pub struct PlanDefinitions;
 impl PlanDefinitions {
     pub const AI_DESCRIPTION: &'static str = "Zed offers a complete agentic experience, with robust editing and reviewing features to collaborate with AI.";
 
-    pub fn free_plan(&self) -> impl IntoElement {
+    pub fn free_plan(&self, _is_v2: bool) -> impl IntoElement {
         List::new()
             .child(ListBulletItem::new("50 prompts with Claude models"))
             .child(ListBulletItem::new("2,000 accepted edit predictions"))
     }
 
-    pub fn pro_trial(&self, period: bool) -> impl IntoElement {
+    pub fn pro_trial(&self, _is_v2: bool, period: bool) -> impl IntoElement {
         List::new()
             .child(ListBulletItem::new("150 prompts with Claude models"))
             .child(ListBulletItem::new(
@@ -26,7 +26,7 @@ impl PlanDefinitions {
             })
     }
 
-    pub fn pro_plan(&self, price: bool) -> impl IntoElement {
+    pub fn pro_plan(&self, _is_v2: bool, price: bool) -> impl IntoElement {
         List::new()
             .child(ListBulletItem::new("500 prompts with Claude models"))
             .child(ListBulletItem::new(
diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index d5a21bfe20..4bc33079da 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -82,8 +82,10 @@ pub enum Plan {
     ZedFree,
     #[serde(alias = "ZedPro")]
     ZedPro,
+    ZedProV2,
     #[serde(alias = "ZedProTrial")]
     ZedProTrial,
+    ZedProTrialV2,
 }
 
 impl FromStr for Plan {
@@ -327,6 +329,12 @@ mod tests {
 
         let plan = serde_json::from_value::<Plan>(json!("zed_pro_trial")).unwrap();
         assert_eq!(plan, Plan::ZedProTrial);
+
+        let plan = serde_json::from_value::<Plan>(json!("zed_pro_v2")).unwrap();
+        assert_eq!(plan, Plan::ZedProV2);
+
+        let plan = serde_json::from_value::<Plan>(json!("zed_pro_trial_v2")).unwrap();
+        assert_eq!(plan, Plan::ZedProTrialV2);
     }
 
     #[test]
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 2f609f51ab..8a50b7ec9b 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -66,6 +66,12 @@ impl FeatureFlag for LlmClosedBetaFeatureFlag {
     const NAME: &'static str = "llm-closed-beta";
 }
 
+pub struct BillingV2FeatureFlag {}
+
+impl FeatureFlag for BillingV2FeatureFlag {
+    const NAME: &'static str = "billing-v2";
+}
+
 pub struct NotebookFeatureFlag;
 
 impl FeatureFlag for NotebookFeatureFlag {
diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs
index 8a7f3456fb..c6e146e6b3 100644
--- a/crates/language_model/src/model/cloud_model.rs
+++ b/crates/language_model/src/model/cloud_model.rs
@@ -36,6 +36,7 @@ impl fmt::Display for ModelRequestLimitReachedError {
             Plan::ZedProTrial => {
                 "Model request limit reached. Upgrade to Zed Pro for more requests."
             }
+            Plan::ZedProV2 | Plan::ZedProTrialV2 => "Model request limit reached.",
         };
 
         write!(f, "{message}")
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index f031b8394a..0090929937 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -660,8 +660,12 @@ impl TitleBar {
 
                         let (plan_name, label_color, bg_color) = match plan {
                             None | Some(Plan::ZedFree) => ("Free", Color::Default, free_chip_bg),
-                            Some(Plan::ZedProTrial) => ("Pro Trial", Color::Accent, pro_chip_bg),
-                            Some(Plan::ZedPro) => ("Pro", Color::Accent, pro_chip_bg),
+                            Some(Plan::ZedProTrial | Plan::ZedProTrialV2) => {
+                                ("Pro Trial", Color::Accent, pro_chip_bg)
+                            }
+                            Some(Plan::ZedPro | Plan::ZedProV2) => {
+                                ("Pro", Color::Accent, pro_chip_bg)
+                            }
                         };
 
                         menu.custom_entry(

From 96c429d2c3b09739eda0a5acd3fe34c4321a7dbf Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 8 Sep 2025 20:18:40 -0600
Subject: [PATCH 699/823] Only reject agent actions, don't restore checkpoint
 on revert (#37801)

Updates #37623

Release Notes:

- Changed the behaviour when editing an old message in a native agent
thread.
Prior to this, it would automatically restore the checkpoint (which
could
lead to a surprising amount of work being discarded). Now it will just
reject
any unaccepted agent edits, and you can use the "restore checkpoint"
button
  for the original behavior.
---
 crates/acp_thread/src/acp_thread.rs    | 55 ++++++++++++++------------
 crates/agent_ui/src/acp/thread_view.rs | 33 +++++++++-------
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 8afa466bb6..f36ed6e7a0 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1640,13 +1640,13 @@ impl AcpThread {
         cx.foreground_executor().spawn(send_task)
     }
 
-    /// Rewinds this thread to before the entry at `index`, removing it and all
-    /// subsequent entries while reverting any changes made from that point.
-    pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let Some(truncate) = self.connection.truncate(&self.session_id, cx) else {
-            return Task::ready(Err(anyhow!("not supported")));
-        };
-        let Some(message) = self.user_message(&id) else {
+    /// Restores the git working tree to the state at the given checkpoint (if one exists)
+    pub fn restore_checkpoint(
+        &mut self,
+        id: UserMessageId,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        let Some((_, message)) = self.user_message_mut(&id) else {
             return Task::ready(Err(anyhow!("message not found")));
         };
 
@@ -1654,15 +1654,30 @@ impl AcpThread {
             .checkpoint
             .as_ref()
             .map(|c| c.git_checkpoint.clone());
-
+        let rewind = self.rewind(id.clone(), cx);
         let git_store = self.project.read(cx).git_store().clone();
-        cx.spawn(async move |this, cx| {
+
+        cx.spawn(async move |_, cx| {
+            rewind.await?;
             if let Some(checkpoint) = checkpoint {
                 git_store
                     .update(cx, |git, cx| git.restore_checkpoint(checkpoint, cx))?
                     .await?;
             }
 
+            Ok(())
+        })
+    }
+
+    /// Rewinds this thread to before the entry at `index`, removing it and all
+    /// subsequent entries while rejecting any action_log changes made from that point.
+    /// Unlike `restore_checkpoint`, this method does not restore from git.
+    pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let Some(truncate) = self.connection.truncate(&self.session_id, cx) else {
+            return Task::ready(Err(anyhow!("not supported")));
+        };
+
+        cx.spawn(async move |this, cx| {
             cx.update(|cx| truncate.run(id.clone(), cx))?.await?;
             this.update(cx, |this, cx| {
                 if let Some((ix, _)) = this.user_message_mut(&id) {
@@ -1670,7 +1685,11 @@ impl AcpThread {
                     this.entries.truncate(ix);
                     cx.emit(AcpThreadEvent::EntriesRemoved(range));
                 }
-            })
+                this.action_log()
+                    .update(cx, |action_log, cx| action_log.reject_all_edits(cx))
+            })?
+            .await;
+            Ok(())
         })
     }
 
@@ -1727,20 +1746,6 @@ impl AcpThread {
             })
     }
 
-    fn user_message(&self, id: &UserMessageId) -> Option<&UserMessage> {
-        self.entries.iter().find_map(|entry| {
-            if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(id) {
-                    Some(message)
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        })
-    }
-
     fn user_message_mut(&mut self, id: &UserMessageId) -> Option<(usize, &mut UserMessage)> {
         self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
             if let AgentThreadEntry::UserMessage(message) = entry {
@@ -2684,7 +2689,7 @@ mod tests {
                 let AgentThreadEntry::UserMessage(message) = &thread.entries[2] else {
                     panic!("unexpected entries {:?}", thread.entries)
                 };
-                thread.rewind(message.id.clone().unwrap(), cx)
+                thread.restore_checkpoint(message.id.clone().unwrap(), cx)
             })
             .await
             .unwrap();
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index e9794160a2..8627455b4f 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -927,7 +927,7 @@ impl AcpThreadView {
                 }
             }
             ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::Send) => {
-                self.regenerate(event.entry_index, editor, window, cx);
+                self.regenerate(event.entry_index, editor.clone(), window, cx);
             }
             ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Cancel) => {
                 self.cancel_editing(&Default::default(), window, cx);
@@ -1151,7 +1151,7 @@ impl AcpThreadView {
     fn regenerate(
         &mut self,
         entry_ix: usize,
-        message_editor: &Entity<MessageEditor>,
+        message_editor: Entity<MessageEditor>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1168,16 +1168,18 @@ impl AcpThreadView {
             return;
         };
 
-        let contents = message_editor.update(cx, |message_editor, cx| message_editor.contents(cx));
-
-        let task = cx.spawn(async move |_, cx| {
-            let contents = contents.await?;
+        cx.spawn_in(window, async move |this, cx| {
             thread
                 .update(cx, |thread, cx| thread.rewind(user_message_id, cx))?
                 .await?;
-            Ok(contents)
-        });
-        self.send_impl(task, window, cx);
+            let contents =
+                message_editor.update(cx, |message_editor, cx| message_editor.contents(cx))?;
+            this.update_in(cx, |this, window, cx| {
+                this.send_impl(contents, window, cx);
+            })?;
+            anyhow::Ok(())
+        })
+        .detach();
     }
 
     fn open_agent_diff(&mut self, _: &OpenAgentDiff, window: &mut Window, cx: &mut Context<Self>) {
@@ -1635,14 +1637,16 @@ impl AcpThreadView {
         cx.notify();
     }
 
-    fn rewind(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
+    fn restore_checkpoint(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
         let Some(thread) = self.thread() else {
             return;
         };
+
         thread
-            .update(cx, |thread, cx| thread.rewind(message_id.clone(), cx))
+            .update(cx, |thread, cx| {
+                thread.restore_checkpoint(message_id.clone(), cx)
+            })
             .detach_and_log_err(cx);
-        cx.notify();
     }
 
     fn render_entry(
@@ -1712,8 +1716,9 @@ impl AcpThreadView {
                                         .label_size(LabelSize::XSmall)
                                         .icon_color(Color::Muted)
                                         .color(Color::Muted)
+                                        .tooltip(Tooltip::text("Restores all files in the project to the content they had at this point in the conversation."))
                                         .on_click(cx.listener(move |this, _, _window, cx| {
-                                            this.rewind(&message_id, cx);
+                                            this.restore_checkpoint(&message_id, cx);
                                         }))
                                 )
                                 .child(Divider::horizontal())
@@ -1784,7 +1789,7 @@ impl AcpThreadView {
                                                             let editor = editor.clone();
                                                             move |this, _, window, cx| {
                                                                 this.regenerate(
-                                                                    entry_ix, &editor, window, cx,
+                                                                    entry_ix, editor.clone(), window, cx,
                                                                 );
                                                             }
                                                         })).into_any_element()

From 3a437fd888ad584970445854d8ad94af0f2a6fe6 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 8 Sep 2025 21:53:17 -0600
Subject: [PATCH 700/823] Remove Chat (#37789)

At RustConf we were demo'ing zed, and it continually popped open the
chat panel.

We're usually inured to this because the Chat panel doesn't open unless
a Guest
is in the channel, but it made me sad that we were showing a long stream
of
vacuous comments and unresponded to questions on every demo screen.

We may bring chat back in the future, but we need more thought on the
UX, and
we need to rebuild the backend to not use the existing collab server
that we're
trying to move off of.

Release Notes:

- Removed the chat feature from Zed (Sorry to the 5 of you who use this
on the regular!)
---
 Cargo.lock                                    |    5 -
 assets/settings/default.json                  |   10 -
 crates/auto_update_ui/src/auto_update_ui.rs   |    3 +-
 crates/channel/Cargo.toml                     |    2 -
 crates/channel/src/channel.rs                 |    6 -
 crates/channel/src/channel_chat.rs            |  861 ----------
 crates/channel/src/channel_store.rs           |  149 +-
 crates/channel/src/channel_store_tests.rs     |  201 +--
 crates/collab/src/db.rs                       |    3 -
 crates/collab/src/db/queries.rs               |    1 -
 crates/collab/src/db/queries/channels.rs      |    8 -
 crates/collab/src/db/queries/messages.rs      |  725 ---------
 crates/collab/src/db/queries/rooms.rs         |    1 -
 crates/collab/src/db/tests.rs                 |   11 +-
 crates/collab/src/db/tests/channel_tests.rs   |   37 +-
 crates/collab/src/db/tests/message_tests.rs   |  421 -----
 crates/collab/src/rpc.rs                      |  318 +---
 crates/collab/src/tests.rs                    |    1 -
 .../collab/src/tests/channel_message_tests.rs |  725 ---------
 crates/collab_ui/Cargo.toml                   |    3 -
 crates/collab_ui/src/chat_panel.rs            | 1380 -----------------
 .../src/chat_panel/message_editor.rs          |  548 -------
 crates/collab_ui/src/collab_panel.rs          |  100 +-
 crates/collab_ui/src/collab_ui.rs             |    7 +-
 crates/collab_ui/src/notification_panel.rs    |  118 +-
 crates/collab_ui/src/panel_settings.rs        |   46 -
 crates/notifications/Cargo.toml               |    1 -
 .../notifications/src/notification_store.rs   |   68 +-
 crates/proto/proto/channel.proto              |    5 +-
 crates/rpc/src/notification.rs                |   11 -
 crates/vim/src/command.rs                     |    1 -
 crates/zed/src/zed.rs                         |   14 -
 docs/src/configuring-zed.md                   |   22 -
 docs/src/visual-customization.md              |    8 -
 34 files changed, 54 insertions(+), 5766 deletions(-)
 delete mode 100644 crates/channel/src/channel_chat.rs
 delete mode 100644 crates/collab/src/db/queries/messages.rs
 delete mode 100644 crates/collab/src/db/tests/message_tests.rs
 delete mode 100644 crates/collab/src/tests/channel_message_tests.rs
 delete mode 100644 crates/collab_ui/src/chat_panel.rs
 delete mode 100644 crates/collab_ui/src/chat_panel/message_editor.rs

diff --git a/Cargo.lock b/Cargo.lock
index eee80226fa..3c25fc5b00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2883,11 +2883,9 @@ dependencies = [
  "language",
  "log",
  "postage",
- "rand 0.9.1",
  "release_channel",
  "rpc",
  "settings",
- "sum_tree",
  "text",
  "time",
  "util",
@@ -3375,12 +3373,10 @@ dependencies = [
  "collections",
  "db",
  "editor",
- "emojis",
  "futures 0.3.31",
  "fuzzy",
  "gpui",
  "http_client",
- "language",
  "log",
  "menu",
  "notifications",
@@ -3388,7 +3384,6 @@ dependencies = [
  "pretty_assertions",
  "project",
  "release_channel",
- "rich_text",
  "rpc",
  "schemars",
  "serde",
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 63a11403d3..2f04687925 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -740,16 +740,6 @@
     // Default width of the collaboration panel.
     "default_width": 240
   },
-  "chat_panel": {
-    // When to show the chat panel button in the status bar.
-    // Can be 'never', 'always', or 'when_in_call',
-    // or a boolean (interpreted as 'never'/'always').
-    "button": "when_in_call",
-    // Where to dock the chat panel. Can be 'left' or 'right'.
-    "dock": "right",
-    // Default width of the chat panel.
-    "default_width": 240
-  },
   "git_panel": {
     // Whether to show the git panel button in the status bar.
     "button": true,
diff --git a/crates/auto_update_ui/src/auto_update_ui.rs b/crates/auto_update_ui/src/auto_update_ui.rs
index 729ab425d0..efac14968e 100644
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -1,5 +1,4 @@
 use auto_update::AutoUpdater;
-use client::proto::UpdateNotification;
 use editor::{Editor, MultiBuffer};
 use gpui::{App, Context, DismissEvent, Entity, Window, actions, prelude::*};
 use http_client::HttpClient;
@@ -138,6 +137,8 @@ pub fn notify_if_app_was_updated(cx: &mut App) {
         return;
     }
 
+    struct UpdateNotification;
+
     let should_show_notification = updater.read(cx).should_show_update_notification(cx);
     cx.spawn(async move |cx| {
         let should_show_notification = should_show_notification.await?;
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
index 962847f3f1..ab6e1dfc2b 100644
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -25,11 +25,9 @@ gpui.workspace = true
 language.workspace = true
 log.workspace = true
 postage.workspace = true
-rand.workspace = true
 release_channel.workspace = true
 rpc.workspace = true
 settings.workspace = true
-sum_tree.workspace = true
 text.workspace = true
 time.workspace = true
 util.workspace = true
diff --git a/crates/channel/src/channel.rs b/crates/channel/src/channel.rs
index 63865c574e..6cc5a0e881 100644
--- a/crates/channel/src/channel.rs
+++ b/crates/channel/src/channel.rs
@@ -1,5 +1,4 @@
 mod channel_buffer;
-mod channel_chat;
 mod channel_store;
 
 use client::{Client, UserStore};
@@ -7,10 +6,6 @@ use gpui::{App, Entity};
 use std::sync::Arc;
 
 pub use channel_buffer::{ACKNOWLEDGE_DEBOUNCE_INTERVAL, ChannelBuffer, ChannelBufferEvent};
-pub use channel_chat::{
-    ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId, MessageParams,
-    mentions_to_proto,
-};
 pub use channel_store::{Channel, ChannelEvent, ChannelMembership, ChannelStore};
 
 #[cfg(test)]
@@ -19,5 +14,4 @@ mod channel_store_tests;
 pub fn init(client: &Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
     channel_store::init(client, user_store, cx);
     channel_buffer::init(&client.clone().into());
-    channel_chat::init(&client.clone().into());
 }
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
deleted file mode 100644
index 776499c876..0000000000
--- a/crates/channel/src/channel_chat.rs
+++ /dev/null
@@ -1,861 +0,0 @@
-use crate::{Channel, ChannelStore};
-use anyhow::{Context as _, Result};
-use client::{
-    ChannelId, Client, Subscription, TypedEnvelope, UserId, proto,
-    user::{User, UserStore},
-};
-use collections::HashSet;
-use futures::lock::Mutex;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
-use rand::prelude::*;
-use rpc::AnyProtoClient;
-use std::{
-    ops::{ControlFlow, Range},
-    sync::Arc,
-};
-use sum_tree::{Bias, Dimensions, SumTree};
-use time::OffsetDateTime;
-use util::{ResultExt as _, TryFutureExt, post_inc};
-
-pub struct ChannelChat {
-    pub channel_id: ChannelId,
-    messages: SumTree<ChannelMessage>,
-    acknowledged_message_ids: HashSet<u64>,
-    channel_store: Entity<ChannelStore>,
-    loaded_all_messages: bool,
-    last_acknowledged_id: Option<u64>,
-    next_pending_message_id: usize,
-    first_loaded_message_id: Option<u64>,
-    user_store: Entity<UserStore>,
-    rpc: Arc<Client>,
-    outgoing_messages_lock: Arc<Mutex<()>>,
-    rng: StdRng,
-    _subscription: Subscription,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct MessageParams {
-    pub text: String,
-    pub mentions: Vec<(Range<usize>, UserId)>,
-    pub reply_to_message_id: Option<u64>,
-}
-
-#[derive(Clone, Debug)]
-pub struct ChannelMessage {
-    pub id: ChannelMessageId,
-    pub body: String,
-    pub timestamp: OffsetDateTime,
-    pub sender: Arc<User>,
-    pub nonce: u128,
-    pub mentions: Vec<(Range<usize>, UserId)>,
-    pub reply_to_message_id: Option<u64>,
-    pub edited_at: Option<OffsetDateTime>,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum ChannelMessageId {
-    Saved(u64),
-    Pending(usize),
-}
-
-impl From<ChannelMessageId> for Option<u64> {
-    fn from(val: ChannelMessageId) -> Self {
-        match val {
-            ChannelMessageId::Saved(id) => Some(id),
-            ChannelMessageId::Pending(_) => None,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ChannelMessageSummary {
-    max_id: ChannelMessageId,
-    count: usize,
-}
-
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-struct Count(usize);
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ChannelChatEvent {
-    MessagesUpdated {
-        old_range: Range<usize>,
-        new_count: usize,
-    },
-    UpdateMessage {
-        message_id: ChannelMessageId,
-        message_ix: usize,
-    },
-    NewMessage {
-        channel_id: ChannelId,
-        message_id: u64,
-    },
-}
-
-impl EventEmitter<ChannelChatEvent> for ChannelChat {}
-pub fn init(client: &AnyProtoClient) {
-    client.add_entity_message_handler(ChannelChat::handle_message_sent);
-    client.add_entity_message_handler(ChannelChat::handle_message_removed);
-    client.add_entity_message_handler(ChannelChat::handle_message_updated);
-}
-
-impl ChannelChat {
-    pub async fn new(
-        channel: Arc<Channel>,
-        channel_store: Entity<ChannelStore>,
-        user_store: Entity<UserStore>,
-        client: Arc<Client>,
-        cx: &mut AsyncApp,
-    ) -> Result<Entity<Self>> {
-        let channel_id = channel.id;
-        let subscription = client.subscribe_to_entity(channel_id.0).unwrap();
-
-        let response = client
-            .request(proto::JoinChannelChat {
-                channel_id: channel_id.0,
-            })
-            .await?;
-
-        let handle = cx.new(|cx| {
-            cx.on_release(Self::release).detach();
-            Self {
-                channel_id: channel.id,
-                user_store: user_store.clone(),
-                channel_store,
-                rpc: client.clone(),
-                outgoing_messages_lock: Default::default(),
-                messages: Default::default(),
-                acknowledged_message_ids: Default::default(),
-                loaded_all_messages: false,
-                next_pending_message_id: 0,
-                last_acknowledged_id: None,
-                rng: StdRng::from_os_rng(),
-                first_loaded_message_id: None,
-                _subscription: subscription.set_entity(&cx.entity(), &cx.to_async()),
-            }
-        })?;
-        Self::handle_loaded_messages(
-            handle.downgrade(),
-            user_store,
-            client,
-            response.messages,
-            response.done,
-            cx,
-        )
-        .await?;
-        Ok(handle)
-    }
-
-    fn release(&mut self, _: &mut App) {
-        self.rpc
-            .send(proto::LeaveChannelChat {
-                channel_id: self.channel_id.0,
-            })
-            .log_err();
-    }
-
-    pub fn channel(&self, cx: &App) -> Option<Arc<Channel>> {
-        self.channel_store
-            .read(cx)
-            .channel_for_id(self.channel_id)
-            .cloned()
-    }
-
-    pub fn client(&self) -> &Arc<Client> {
-        &self.rpc
-    }
-
-    pub fn send_message(
-        &mut self,
-        message: MessageParams,
-        cx: &mut Context<Self>,
-    ) -> Result<Task<Result<u64>>> {
-        anyhow::ensure!(
-            !message.text.trim().is_empty(),
-            "message body can't be empty"
-        );
-
-        let current_user = self
-            .user_store
-            .read(cx)
-            .current_user()
-            .context("current_user is not present")?;
-
-        let channel_id = self.channel_id;
-        let pending_id = ChannelMessageId::Pending(post_inc(&mut self.next_pending_message_id));
-        let nonce = self.rng.random();
-        self.insert_messages(
-            SumTree::from_item(
-                ChannelMessage {
-                    id: pending_id,
-                    body: message.text.clone(),
-                    sender: current_user,
-                    timestamp: OffsetDateTime::now_utc(),
-                    mentions: message.mentions.clone(),
-                    nonce,
-                    reply_to_message_id: message.reply_to_message_id,
-                    edited_at: None,
-                },
-                &(),
-            ),
-            cx,
-        );
-        let user_store = self.user_store.clone();
-        let rpc = self.rpc.clone();
-        let outgoing_messages_lock = self.outgoing_messages_lock.clone();
-
-        // todo - handle messages that fail to send (e.g. >1024 chars)
-        Ok(cx.spawn(async move |this, cx| {
-            let outgoing_message_guard = outgoing_messages_lock.lock().await;
-            let request = rpc.request(proto::SendChannelMessage {
-                channel_id: channel_id.0,
-                body: message.text,
-                nonce: Some(nonce.into()),
-                mentions: mentions_to_proto(&message.mentions),
-                reply_to_message_id: message.reply_to_message_id,
-            });
-            let response = request.await?;
-            drop(outgoing_message_guard);
-            let response = response.message.context("invalid message")?;
-            let id = response.id;
-            let message = ChannelMessage::from_proto(response, &user_store, cx).await?;
-            this.update(cx, |this, cx| {
-                this.insert_messages(SumTree::from_item(message, &()), cx);
-                if this.first_loaded_message_id.is_none() {
-                    this.first_loaded_message_id = Some(id);
-                }
-            })?;
-            Ok(id)
-        }))
-    }
-
-    pub fn remove_message(&mut self, id: u64, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let response = self.rpc.request(proto::RemoveChannelMessage {
-            channel_id: self.channel_id.0,
-            message_id: id,
-        });
-        cx.spawn(async move |this, cx| {
-            response.await?;
-            this.update(cx, |this, cx| {
-                this.message_removed(id, cx);
-            })?;
-            Ok(())
-        })
-    }
-
-    pub fn update_message(
-        &mut self,
-        id: u64,
-        message: MessageParams,
-        cx: &mut Context<Self>,
-    ) -> Result<Task<Result<()>>> {
-        self.message_update(
-            ChannelMessageId::Saved(id),
-            message.text.clone(),
-            message.mentions.clone(),
-            Some(OffsetDateTime::now_utc()),
-            cx,
-        );
-
-        let nonce: u128 = self.rng.random();
-
-        let request = self.rpc.request(proto::UpdateChannelMessage {
-            channel_id: self.channel_id.0,
-            message_id: id,
-            body: message.text,
-            nonce: Some(nonce.into()),
-            mentions: mentions_to_proto(&message.mentions),
-        });
-        Ok(cx.spawn(async move |_, _| {
-            request.await?;
-            Ok(())
-        }))
-    }
-
-    pub fn load_more_messages(&mut self, cx: &mut Context<Self>) -> Option<Task<Option<()>>> {
-        if self.loaded_all_messages {
-            return None;
-        }
-
-        let rpc = self.rpc.clone();
-        let user_store = self.user_store.clone();
-        let channel_id = self.channel_id;
-        let before_message_id = self.first_loaded_message_id()?;
-        Some(cx.spawn(async move |this, cx| {
-            async move {
-                let response = rpc
-                    .request(proto::GetChannelMessages {
-                        channel_id: channel_id.0,
-                        before_message_id,
-                    })
-                    .await?;
-                Self::handle_loaded_messages(
-                    this,
-                    user_store,
-                    rpc,
-                    response.messages,
-                    response.done,
-                    cx,
-                )
-                .await?;
-
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await
-        }))
-    }
-
-    pub fn first_loaded_message_id(&mut self) -> Option<u64> {
-        self.first_loaded_message_id
-    }
-
-    /// Load a message by its id, if it's already stored locally.
-    pub fn find_loaded_message(&self, id: u64) -> Option<&ChannelMessage> {
-        self.messages.iter().find(|message| match message.id {
-            ChannelMessageId::Saved(message_id) => message_id == id,
-            ChannelMessageId::Pending(_) => false,
-        })
-    }
-
-    /// Load all of the chat messages since a certain message id.
-    ///
-    /// For now, we always maintain a suffix of the channel's messages.
-    pub async fn load_history_since_message(
-        chat: Entity<Self>,
-        message_id: u64,
-        mut cx: AsyncApp,
-    ) -> Option<usize> {
-        loop {
-            let step = chat
-                .update(&mut cx, |chat, cx| {
-                    if let Some(first_id) = chat.first_loaded_message_id()
-                        && first_id <= message_id
-                    {
-                        let mut cursor = chat
-                            .messages
-                            .cursor::<Dimensions<ChannelMessageId, Count>>(&());
-                        let message_id = ChannelMessageId::Saved(message_id);
-                        cursor.seek(&message_id, Bias::Left);
-                        return ControlFlow::Break(
-                            if cursor
-                                .item()
-                                .is_some_and(|message| message.id == message_id)
-                            {
-                                Some(cursor.start().1.0)
-                            } else {
-                                None
-                            },
-                        );
-                    }
-                    ControlFlow::Continue(chat.load_more_messages(cx))
-                })
-                .log_err()?;
-            match step {
-                ControlFlow::Break(ix) => return ix,
-                ControlFlow::Continue(task) => task?.await?,
-            }
-        }
-    }
-
-    pub fn acknowledge_last_message(&mut self, cx: &mut Context<Self>) {
-        if let ChannelMessageId::Saved(latest_message_id) = self.messages.summary().max_id
-            && self
-                .last_acknowledged_id
-                .is_none_or(|acknowledged_id| acknowledged_id < latest_message_id)
-        {
-            self.rpc
-                .send(proto::AckChannelMessage {
-                    channel_id: self.channel_id.0,
-                    message_id: latest_message_id,
-                })
-                .ok();
-            self.last_acknowledged_id = Some(latest_message_id);
-            self.channel_store.update(cx, |store, cx| {
-                store.acknowledge_message_id(self.channel_id, latest_message_id, cx);
-            });
-        }
-    }
-
-    async fn handle_loaded_messages(
-        this: WeakEntity<Self>,
-        user_store: Entity<UserStore>,
-        rpc: Arc<Client>,
-        proto_messages: Vec<proto::ChannelMessage>,
-        loaded_all_messages: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let loaded_messages = messages_from_proto(proto_messages, &user_store, cx).await?;
-
-        let first_loaded_message_id = loaded_messages.first().map(|m| m.id);
-        let loaded_message_ids = this.read_with(cx, |this, _| {
-            let mut loaded_message_ids: HashSet<u64> = HashSet::default();
-            for message in loaded_messages.iter() {
-                if let Some(saved_message_id) = message.id.into() {
-                    loaded_message_ids.insert(saved_message_id);
-                }
-            }
-            for message in this.messages.iter() {
-                if let Some(saved_message_id) = message.id.into() {
-                    loaded_message_ids.insert(saved_message_id);
-                }
-            }
-            loaded_message_ids
-        })?;
-
-        let missing_ancestors = loaded_messages
-            .iter()
-            .filter_map(|message| {
-                if let Some(ancestor_id) = message.reply_to_message_id
-                    && !loaded_message_ids.contains(&ancestor_id)
-                {
-                    return Some(ancestor_id);
-                }
-                None
-            })
-            .collect::<Vec<_>>();
-
-        let loaded_ancestors = if missing_ancestors.is_empty() {
-            None
-        } else {
-            let response = rpc
-                .request(proto::GetChannelMessagesById {
-                    message_ids: missing_ancestors,
-                })
-                .await?;
-            Some(messages_from_proto(response.messages, &user_store, cx).await?)
-        };
-        this.update(cx, |this, cx| {
-            this.first_loaded_message_id = first_loaded_message_id.and_then(|msg_id| msg_id.into());
-            this.loaded_all_messages = loaded_all_messages;
-            this.insert_messages(loaded_messages, cx);
-            if let Some(loaded_ancestors) = loaded_ancestors {
-                this.insert_messages(loaded_ancestors, cx);
-            }
-        })?;
-
-        Ok(())
-    }
-
-    pub fn rejoin(&mut self, cx: &mut Context<Self>) {
-        let user_store = self.user_store.clone();
-        let rpc = self.rpc.clone();
-        let channel_id = self.channel_id;
-        cx.spawn(async move |this, cx| {
-            async move {
-                let response = rpc
-                    .request(proto::JoinChannelChat {
-                        channel_id: channel_id.0,
-                    })
-                    .await?;
-                Self::handle_loaded_messages(
-                    this.clone(),
-                    user_store.clone(),
-                    rpc.clone(),
-                    response.messages,
-                    response.done,
-                    cx,
-                )
-                .await?;
-
-                let pending_messages = this.read_with(cx, |this, _| {
-                    this.pending_messages().cloned().collect::<Vec<_>>()
-                })?;
-
-                for pending_message in pending_messages {
-                    let request = rpc.request(proto::SendChannelMessage {
-                        channel_id: channel_id.0,
-                        body: pending_message.body,
-                        mentions: mentions_to_proto(&pending_message.mentions),
-                        nonce: Some(pending_message.nonce.into()),
-                        reply_to_message_id: pending_message.reply_to_message_id,
-                    });
-                    let response = request.await?;
-                    let message = ChannelMessage::from_proto(
-                        response.message.context("invalid message")?,
-                        &user_store,
-                        cx,
-                    )
-                    .await?;
-                    this.update(cx, |this, cx| {
-                        this.insert_messages(SumTree::from_item(message, &()), cx);
-                    })?;
-                }
-
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await
-        })
-        .detach();
-    }
-
-    pub fn message_count(&self) -> usize {
-        self.messages.summary().count
-    }
-
-    pub fn messages(&self) -> &SumTree<ChannelMessage> {
-        &self.messages
-    }
-
-    pub fn message(&self, ix: usize) -> &ChannelMessage {
-        let mut cursor = self.messages.cursor::<Count>(&());
-        cursor.seek(&Count(ix), Bias::Right);
-        cursor.item().unwrap()
-    }
-
-    pub fn acknowledge_message(&mut self, id: u64) {
-        if self.acknowledged_message_ids.insert(id) {
-            self.rpc
-                .send(proto::AckChannelMessage {
-                    channel_id: self.channel_id.0,
-                    message_id: id,
-                })
-                .ok();
-        }
-    }
-
-    pub fn messages_in_range(&self, range: Range<usize>) -> impl Iterator<Item = &ChannelMessage> {
-        let mut cursor = self.messages.cursor::<Count>(&());
-        cursor.seek(&Count(range.start), Bias::Right);
-        cursor.take(range.len())
-    }
-
-    pub fn pending_messages(&self) -> impl Iterator<Item = &ChannelMessage> {
-        let mut cursor = self.messages.cursor::<ChannelMessageId>(&());
-        cursor.seek(&ChannelMessageId::Pending(0), Bias::Left);
-        cursor
-    }
-
-    async fn handle_message_sent(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::ChannelMessageSent>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let user_store = this.read_with(&cx, |this, _| this.user_store.clone())?;
-        let message = message.payload.message.context("empty message")?;
-        let message_id = message.id;
-
-        let message = ChannelMessage::from_proto(message, &user_store, &mut cx).await?;
-        this.update(&mut cx, |this, cx| {
-            this.insert_messages(SumTree::from_item(message, &()), cx);
-            cx.emit(ChannelChatEvent::NewMessage {
-                channel_id: this.channel_id,
-                message_id,
-            })
-        })?;
-
-        Ok(())
-    }
-
-    async fn handle_message_removed(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::RemoveChannelMessage>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.message_removed(message.payload.message_id, cx)
-        })?;
-        Ok(())
-    }
-
-    async fn handle_message_updated(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::ChannelMessageUpdate>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let user_store = this.read_with(&cx, |this, _| this.user_store.clone())?;
-        let message = message.payload.message.context("empty message")?;
-
-        let message = ChannelMessage::from_proto(message, &user_store, &mut cx).await?;
-
-        this.update(&mut cx, |this, cx| {
-            this.message_update(
-                message.id,
-                message.body,
-                message.mentions,
-                message.edited_at,
-                cx,
-            )
-        })?;
-        Ok(())
-    }
-
-    fn insert_messages(&mut self, messages: SumTree<ChannelMessage>, cx: &mut Context<Self>) {
-        if let Some((first_message, last_message)) = messages.first().zip(messages.last()) {
-            let nonces = messages
-                .cursor::<()>(&())
-                .map(|m| m.nonce)
-                .collect::<HashSet<_>>();
-
-            let mut old_cursor = self
-                .messages
-                .cursor::<Dimensions<ChannelMessageId, Count>>(&());
-            let mut new_messages = old_cursor.slice(&first_message.id, Bias::Left);
-            let start_ix = old_cursor.start().1.0;
-            let removed_messages = old_cursor.slice(&last_message.id, Bias::Right);
-            let removed_count = removed_messages.summary().count;
-            let new_count = messages.summary().count;
-            let end_ix = start_ix + removed_count;
-
-            new_messages.append(messages, &());
-
-            let mut ranges = Vec::<Range<usize>>::new();
-            if new_messages.last().unwrap().is_pending() {
-                new_messages.append(old_cursor.suffix(), &());
-            } else {
-                new_messages.append(
-                    old_cursor.slice(&ChannelMessageId::Pending(0), Bias::Left),
-                    &(),
-                );
-
-                while let Some(message) = old_cursor.item() {
-                    let message_ix = old_cursor.start().1.0;
-                    if nonces.contains(&message.nonce) {
-                        if ranges.last().is_some_and(|r| r.end == message_ix) {
-                            ranges.last_mut().unwrap().end += 1;
-                        } else {
-                            ranges.push(message_ix..message_ix + 1);
-                        }
-                    } else {
-                        new_messages.push(message.clone(), &());
-                    }
-                    old_cursor.next();
-                }
-            }
-
-            drop(old_cursor);
-            self.messages = new_messages;
-
-            for range in ranges.into_iter().rev() {
-                cx.emit(ChannelChatEvent::MessagesUpdated {
-                    old_range: range,
-                    new_count: 0,
-                });
-            }
-            cx.emit(ChannelChatEvent::MessagesUpdated {
-                old_range: start_ix..end_ix,
-                new_count,
-            });
-
-            cx.notify();
-        }
-    }
-
-    fn message_removed(&mut self, id: u64, cx: &mut Context<Self>) {
-        let mut cursor = self.messages.cursor::<ChannelMessageId>(&());
-        let mut messages = cursor.slice(&ChannelMessageId::Saved(id), Bias::Left);
-        if let Some(item) = cursor.item()
-            && item.id == ChannelMessageId::Saved(id)
-        {
-            let deleted_message_ix = messages.summary().count;
-            cursor.next();
-            messages.append(cursor.suffix(), &());
-            drop(cursor);
-            self.messages = messages;
-
-            // If the message that was deleted was the last acknowledged message,
-            // replace the acknowledged message with an earlier one.
-            self.channel_store.update(cx, |store, _| {
-                let summary = self.messages.summary();
-                if summary.count == 0 {
-                    store.set_acknowledged_message_id(self.channel_id, None);
-                } else if deleted_message_ix == summary.count
-                    && let ChannelMessageId::Saved(id) = summary.max_id
-                {
-                    store.set_acknowledged_message_id(self.channel_id, Some(id));
-                }
-            });
-
-            cx.emit(ChannelChatEvent::MessagesUpdated {
-                old_range: deleted_message_ix..deleted_message_ix + 1,
-                new_count: 0,
-            });
-        }
-    }
-
-    fn message_update(
-        &mut self,
-        id: ChannelMessageId,
-        body: String,
-        mentions: Vec<(Range<usize>, u64)>,
-        edited_at: Option<OffsetDateTime>,
-        cx: &mut Context<Self>,
-    ) {
-        let mut cursor = self.messages.cursor::<ChannelMessageId>(&());
-        let mut messages = cursor.slice(&id, Bias::Left);
-        let ix = messages.summary().count;
-
-        if let Some(mut message_to_update) = cursor.item().cloned() {
-            message_to_update.body = body;
-            message_to_update.mentions = mentions;
-            message_to_update.edited_at = edited_at;
-            messages.push(message_to_update, &());
-            cursor.next();
-        }
-
-        messages.append(cursor.suffix(), &());
-        drop(cursor);
-        self.messages = messages;
-
-        cx.emit(ChannelChatEvent::UpdateMessage {
-            message_ix: ix,
-            message_id: id,
-        });
-
-        cx.notify();
-    }
-}
-
-async fn messages_from_proto(
-    proto_messages: Vec<proto::ChannelMessage>,
-    user_store: &Entity<UserStore>,
-    cx: &mut AsyncApp,
-) -> Result<SumTree<ChannelMessage>> {
-    let messages = ChannelMessage::from_proto_vec(proto_messages, user_store, cx).await?;
-    let mut result = SumTree::default();
-    result.extend(messages, &());
-    Ok(result)
-}
-
-impl ChannelMessage {
-    pub async fn from_proto(
-        message: proto::ChannelMessage,
-        user_store: &Entity<UserStore>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let sender = user_store
-            .update(cx, |user_store, cx| {
-                user_store.get_user(message.sender_id, cx)
-            })?
-            .await?;
-
-        let edited_at = message.edited_at.and_then(|t| -> Option<OffsetDateTime> {
-            if let Ok(a) = OffsetDateTime::from_unix_timestamp(t as i64) {
-                return Some(a);
-            }
-
-            None
-        });
-
-        Ok(ChannelMessage {
-            id: ChannelMessageId::Saved(message.id),
-            body: message.body,
-            mentions: message
-                .mentions
-                .into_iter()
-                .filter_map(|mention| {
-                    let range = mention.range?;
-                    Some((range.start as usize..range.end as usize, mention.user_id))
-                })
-                .collect(),
-            timestamp: OffsetDateTime::from_unix_timestamp(message.timestamp as i64)?,
-            sender,
-            nonce: message.nonce.context("nonce is required")?.into(),
-            reply_to_message_id: message.reply_to_message_id,
-            edited_at,
-        })
-    }
-
-    pub fn is_pending(&self) -> bool {
-        matches!(self.id, ChannelMessageId::Pending(_))
-    }
-
-    pub async fn from_proto_vec(
-        proto_messages: Vec<proto::ChannelMessage>,
-        user_store: &Entity<UserStore>,
-        cx: &mut AsyncApp,
-    ) -> Result<Vec<Self>> {
-        let unique_user_ids = proto_messages
-            .iter()
-            .map(|m| m.sender_id)
-            .collect::<HashSet<_>>()
-            .into_iter()
-            .collect();
-        user_store
-            .update(cx, |user_store, cx| {
-                user_store.get_users(unique_user_ids, cx)
-            })?
-            .await?;
-
-        let mut messages = Vec::with_capacity(proto_messages.len());
-        for message in proto_messages {
-            messages.push(ChannelMessage::from_proto(message, user_store, cx).await?);
-        }
-        Ok(messages)
-    }
-}
-
-pub fn mentions_to_proto(mentions: &[(Range<usize>, UserId)]) -> Vec<proto::ChatMention> {
-    mentions
-        .iter()
-        .map(|(range, user_id)| proto::ChatMention {
-            range: Some(proto::Range {
-                start: range.start as u64,
-                end: range.end as u64,
-            }),
-            user_id: *user_id,
-        })
-        .collect()
-}
-
-impl sum_tree::Item for ChannelMessage {
-    type Summary = ChannelMessageSummary;
-
-    fn summary(&self, _cx: &()) -> Self::Summary {
-        ChannelMessageSummary {
-            max_id: self.id,
-            count: 1,
-        }
-    }
-}
-
-impl Default for ChannelMessageId {
-    fn default() -> Self {
-        Self::Saved(0)
-    }
-}
-
-impl sum_tree::Summary for ChannelMessageSummary {
-    type Context = ();
-
-    fn zero(_cx: &Self::Context) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self, _: &()) {
-        self.max_id = summary.max_id;
-        self.count += summary.count;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChannelMessageSummary> for ChannelMessageId {
-    fn zero(_cx: &()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChannelMessageSummary, _: &()) {
-        debug_assert!(summary.max_id > *self);
-        *self = summary.max_id;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChannelMessageSummary> for Count {
-    fn zero(_cx: &()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChannelMessageSummary, _: &()) {
-        self.0 += summary.count;
-    }
-}
-
-impl<'a> From<&'a str> for MessageParams {
-    fn from(value: &'a str) -> Self {
-        Self {
-            text: value.into(),
-            mentions: Vec::new(),
-            reply_to_message_id: None,
-        }
-    }
-}
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index daa8a91c7c..e983d03e0d 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -1,6 +1,6 @@
 mod channel_index;
 
-use crate::{ChannelMessage, channel_buffer::ChannelBuffer, channel_chat::ChannelChat};
+use crate::channel_buffer::ChannelBuffer;
 use anyhow::{Context as _, Result, anyhow};
 use channel_index::ChannelIndex;
 use client::{ChannelId, Client, ClientSettings, Subscription, User, UserId, UserStore};
@@ -41,7 +41,6 @@ pub struct ChannelStore {
     outgoing_invites: HashSet<(ChannelId, UserId)>,
     update_channels_tx: mpsc::UnboundedSender<proto::UpdateChannels>,
     opened_buffers: HashMap<ChannelId, OpenEntityHandle<ChannelBuffer>>,
-    opened_chats: HashMap<ChannelId, OpenEntityHandle<ChannelChat>>,
     client: Arc<Client>,
     did_subscribe: bool,
     channels_loaded: (watch::Sender<bool>, watch::Receiver<bool>),
@@ -63,10 +62,8 @@ pub struct Channel {
 
 #[derive(Default, Debug)]
 pub struct ChannelState {
-    latest_chat_message: Option<u64>,
     latest_notes_version: NotesVersion,
     observed_notes_version: NotesVersion,
-    observed_chat_message: Option<u64>,
     role: Option<ChannelRole>,
 }
 
@@ -196,7 +193,6 @@ impl ChannelStore {
             channel_participants: Default::default(),
             outgoing_invites: Default::default(),
             opened_buffers: Default::default(),
-            opened_chats: Default::default(),
             update_channels_tx,
             client,
             user_store,
@@ -362,89 +358,12 @@ impl ChannelStore {
         )
     }
 
-    pub fn fetch_channel_messages(
-        &self,
-        message_ids: Vec<u64>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<ChannelMessage>>> {
-        let request = if message_ids.is_empty() {
-            None
-        } else {
-            Some(
-                self.client
-                    .request(proto::GetChannelMessagesById { message_ids }),
-            )
-        };
-        cx.spawn(async move |this, cx| {
-            if let Some(request) = request {
-                let response = request.await?;
-                let this = this.upgrade().context("channel store dropped")?;
-                let user_store = this.read_with(cx, |this, _| this.user_store.clone())?;
-                ChannelMessage::from_proto_vec(response.messages, &user_store, cx).await
-            } else {
-                Ok(Vec::new())
-            }
-        })
-    }
-
     pub fn has_channel_buffer_changed(&self, channel_id: ChannelId) -> bool {
         self.channel_states
             .get(&channel_id)
             .is_some_and(|state| state.has_channel_buffer_changed())
     }
 
-    pub fn has_new_messages(&self, channel_id: ChannelId) -> bool {
-        self.channel_states
-            .get(&channel_id)
-            .is_some_and(|state| state.has_new_messages())
-    }
-
-    pub fn set_acknowledged_message_id(&mut self, channel_id: ChannelId, message_id: Option<u64>) {
-        if let Some(state) = self.channel_states.get_mut(&channel_id) {
-            state.latest_chat_message = message_id;
-        }
-    }
-
-    pub fn last_acknowledge_message_id(&self, channel_id: ChannelId) -> Option<u64> {
-        self.channel_states.get(&channel_id).and_then(|state| {
-            if let Some(last_message_id) = state.latest_chat_message
-                && state
-                    .last_acknowledged_message_id()
-                    .is_some_and(|id| id < last_message_id)
-            {
-                return state.last_acknowledged_message_id();
-            }
-
-            None
-        })
-    }
-
-    pub fn acknowledge_message_id(
-        &mut self,
-        channel_id: ChannelId,
-        message_id: u64,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_states
-            .entry(channel_id)
-            .or_default()
-            .acknowledge_message_id(message_id);
-        cx.notify();
-    }
-
-    pub fn update_latest_message_id(
-        &mut self,
-        channel_id: ChannelId,
-        message_id: u64,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_states
-            .entry(channel_id)
-            .or_default()
-            .update_latest_message_id(message_id);
-        cx.notify();
-    }
-
     pub fn acknowledge_notes_version(
         &mut self,
         channel_id: ChannelId,
@@ -473,23 +392,6 @@ impl ChannelStore {
         cx.notify()
     }
 
-    pub fn open_channel_chat(
-        &mut self,
-        channel_id: ChannelId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<ChannelChat>>> {
-        let client = self.client.clone();
-        let user_store = self.user_store.clone();
-        let this = cx.entity();
-        self.open_channel_resource(
-            channel_id,
-            "chat",
-            |this| &mut this.opened_chats,
-            async move |channel, cx| ChannelChat::new(channel, this, user_store, client, cx).await,
-            cx,
-        )
-    }
-
     /// Asynchronously open a given resource associated with a channel.
     ///
     /// Make sure that the resource is only opened once, even if this method
@@ -931,13 +833,6 @@ impl ChannelStore {
                     cx,
                 );
             }
-            for message_id in message.payload.observed_channel_message_id {
-                this.acknowledge_message_id(
-                    ChannelId(message_id.channel_id),
-                    message_id.message_id,
-                    cx,
-                );
-            }
             for membership in message.payload.channel_memberships {
                 if let Some(role) = ChannelRole::from_i32(membership.role) {
                     this.channel_states
@@ -957,16 +852,6 @@ impl ChannelStore {
         self.outgoing_invites.clear();
         self.disconnect_channel_buffers_task.take();
 
-        for chat in self.opened_chats.values() {
-            if let OpenEntityHandle::Open(chat) = chat
-                && let Some(chat) = chat.upgrade()
-            {
-                chat.update(cx, |chat, cx| {
-                    chat.rejoin(cx);
-                });
-            }
-        }
-
         let mut buffer_versions = Vec::new();
         for buffer in self.opened_buffers.values() {
             if let OpenEntityHandle::Open(buffer) = buffer
@@ -1094,7 +979,6 @@ impl ChannelStore {
         self.channel_participants.clear();
         self.outgoing_invites.clear();
         self.opened_buffers.clear();
-        self.opened_chats.clear();
         self.disconnect_channel_buffers_task = None;
         self.channel_states.clear();
     }
@@ -1131,7 +1015,6 @@ impl ChannelStore {
 
         let channels_changed = !payload.channels.is_empty()
             || !payload.delete_channels.is_empty()
-            || !payload.latest_channel_message_ids.is_empty()
             || !payload.latest_channel_buffer_versions.is_empty();
 
         if channels_changed {
@@ -1181,13 +1064,6 @@ impl ChannelStore {
                     .update_latest_notes_version(latest_buffer_version.epoch, &version)
             }
 
-            for latest_channel_message in payload.latest_channel_message_ids {
-                self.channel_states
-                    .entry(ChannelId(latest_channel_message.channel_id))
-                    .or_default()
-                    .update_latest_message_id(latest_channel_message.message_id);
-            }
-
             self.channels_loaded.0.try_send(true).log_err();
         }
 
@@ -1251,29 +1127,6 @@ impl ChannelState {
                     .changed_since(&self.observed_notes_version.version))
     }
 
-    fn has_new_messages(&self) -> bool {
-        let latest_message_id = self.latest_chat_message;
-        let observed_message_id = self.observed_chat_message;
-
-        latest_message_id.is_some_and(|latest_message_id| {
-            latest_message_id > observed_message_id.unwrap_or_default()
-        })
-    }
-
-    fn last_acknowledged_message_id(&self) -> Option<u64> {
-        self.observed_chat_message
-    }
-
-    fn acknowledge_message_id(&mut self, message_id: u64) {
-        let observed = self.observed_chat_message.get_or_insert(message_id);
-        *observed = (*observed).max(message_id);
-    }
-
-    fn update_latest_message_id(&mut self, message_id: u64) {
-        self.latest_chat_message =
-            Some(message_id.max(self.latest_chat_message.unwrap_or_default()));
-    }
-
     fn acknowledge_notes_version(&mut self, epoch: u64, version: &clock::Global) {
         if self.observed_notes_version.epoch == epoch {
             self.observed_notes_version.version.join(version);
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
index 2a91433084..fbdfe9f8b5 100644
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -1,9 +1,7 @@
-use crate::channel_chat::ChannelChatEvent;
-
 use super::*;
-use client::{Client, UserStore, test::FakeServer};
+use client::{Client, UserStore};
 use clock::FakeSystemClock;
-use gpui::{App, AppContext as _, Entity, SemanticVersion, TestAppContext};
+use gpui::{App, AppContext as _, Entity, SemanticVersion};
 use http_client::FakeHttpClient;
 use rpc::proto::{self};
 use settings::SettingsStore;
@@ -235,201 +233,6 @@ fn test_dangling_channel_paths(cx: &mut App) {
     assert_channels(&channel_store, &[(0, "a".to_string())], cx);
 }
 
-#[gpui::test]
-async fn test_channel_messages(cx: &mut TestAppContext) {
-    let user_id = 5;
-    let channel_id = 5;
-    let channel_store = cx.update(init_test);
-    let client = channel_store.read_with(cx, |s, _| s.client());
-    let server = FakeServer::for_client(user_id, &client, cx).await;
-
-    // Get the available channels.
-    server.send(proto::UpdateChannels {
-        channels: vec![proto::Channel {
-            id: channel_id,
-            name: "the-channel".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: vec![],
-            channel_order: 1,
-        }],
-        ..Default::default()
-    });
-    cx.executor().run_until_parked();
-    cx.update(|cx| {
-        assert_channels(&channel_store, &[(0, "the-channel".to_string())], cx);
-    });
-
-    // Join a channel and populate its existing messages.
-    let channel = channel_store.update(cx, |store, cx| {
-        let channel_id = store.ordered_channels().next().unwrap().1.id;
-        store.open_channel_chat(channel_id, cx)
-    });
-    let join_channel = server.receive::<proto::JoinChannelChat>().await.unwrap();
-    server.respond(
-        join_channel.receipt(),
-        proto::JoinChannelChatResponse {
-            messages: vec![
-                proto::ChannelMessage {
-                    id: 10,
-                    body: "a".into(),
-                    timestamp: 1000,
-                    sender_id: 5,
-                    mentions: vec![],
-                    nonce: Some(1.into()),
-                    reply_to_message_id: None,
-                    edited_at: None,
-                },
-                proto::ChannelMessage {
-                    id: 11,
-                    body: "b".into(),
-                    timestamp: 1001,
-                    sender_id: 6,
-                    mentions: vec![],
-                    nonce: Some(2.into()),
-                    reply_to_message_id: None,
-                    edited_at: None,
-                },
-            ],
-            done: false,
-        },
-    );
-
-    cx.executor().start_waiting();
-
-    // Client requests all users for the received messages
-    let mut get_users = server.receive::<proto::GetUsers>().await.unwrap();
-    get_users.payload.user_ids.sort();
-    assert_eq!(get_users.payload.user_ids, vec![6]);
-    server.respond(
-        get_users.receipt(),
-        proto::UsersResponse {
-            users: vec![proto::User {
-                id: 6,
-                github_login: "maxbrunsfeld".into(),
-                avatar_url: "http://avatar.com/maxbrunsfeld".into(),
-                name: None,
-            }],
-        },
-    );
-
-    let channel = channel.await.unwrap();
-    channel.update(cx, |channel, _| {
-        assert_eq!(
-            channel
-                .messages_in_range(0..2)
-                .map(|message| (message.sender.github_login.clone(), message.body.clone()))
-                .collect::<Vec<_>>(),
-            &[
-                ("user-5".into(), "a".into()),
-                ("maxbrunsfeld".into(), "b".into())
-            ]
-        );
-    });
-
-    // Receive a new message.
-    server.send(proto::ChannelMessageSent {
-        channel_id,
-        message: Some(proto::ChannelMessage {
-            id: 12,
-            body: "c".into(),
-            timestamp: 1002,
-            sender_id: 7,
-            mentions: vec![],
-            nonce: Some(3.into()),
-            reply_to_message_id: None,
-            edited_at: None,
-        }),
-    });
-
-    // Client requests user for message since they haven't seen them yet
-    let get_users = server.receive::<proto::GetUsers>().await.unwrap();
-    assert_eq!(get_users.payload.user_ids, vec![7]);
-    server.respond(
-        get_users.receipt(),
-        proto::UsersResponse {
-            users: vec![proto::User {
-                id: 7,
-                github_login: "as-cii".into(),
-                avatar_url: "http://avatar.com/as-cii".into(),
-                name: None,
-            }],
-        },
-    );
-
-    assert_eq!(
-        channel.next_event(cx).await,
-        ChannelChatEvent::MessagesUpdated {
-            old_range: 2..2,
-            new_count: 1,
-        }
-    );
-    channel.update(cx, |channel, _| {
-        assert_eq!(
-            channel
-                .messages_in_range(2..3)
-                .map(|message| (message.sender.github_login.clone(), message.body.clone()))
-                .collect::<Vec<_>>(),
-            &[("as-cii".into(), "c".into())]
-        )
-    });
-
-    // Scroll up to view older messages.
-    channel.update(cx, |channel, cx| {
-        channel.load_more_messages(cx).unwrap().detach();
-    });
-    let get_messages = server.receive::<proto::GetChannelMessages>().await.unwrap();
-    assert_eq!(get_messages.payload.channel_id, 5);
-    assert_eq!(get_messages.payload.before_message_id, 10);
-    server.respond(
-        get_messages.receipt(),
-        proto::GetChannelMessagesResponse {
-            done: true,
-            messages: vec![
-                proto::ChannelMessage {
-                    id: 8,
-                    body: "y".into(),
-                    timestamp: 998,
-                    sender_id: 5,
-                    nonce: Some(4.into()),
-                    mentions: vec![],
-                    reply_to_message_id: None,
-                    edited_at: None,
-                },
-                proto::ChannelMessage {
-                    id: 9,
-                    body: "z".into(),
-                    timestamp: 999,
-                    sender_id: 6,
-                    nonce: Some(5.into()),
-                    mentions: vec![],
-                    reply_to_message_id: None,
-                    edited_at: None,
-                },
-            ],
-        },
-    );
-
-    assert_eq!(
-        channel.next_event(cx).await,
-        ChannelChatEvent::MessagesUpdated {
-            old_range: 0..0,
-            new_count: 2,
-        }
-    );
-    channel.update(cx, |channel, _| {
-        assert_eq!(
-            channel
-                .messages_in_range(0..2)
-                .map(|message| (message.sender.github_login.clone(), message.body.clone()))
-                .collect::<Vec<_>>(),
-            &[
-                ("user-5".into(), "y".into()),
-                ("maxbrunsfeld".into(), "z".into())
-            ]
-        );
-    });
-}
-
 fn init_test(cx: &mut App) -> Entity<ChannelStore> {
     let settings_store = SettingsStore::test(cx);
     cx.set_global(settings_store);
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index f39da309dd..6ec57ce95e 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -26,7 +26,6 @@ use semantic_version::SemanticVersion;
 use serde::{Deserialize, Serialize};
 use std::ops::RangeInclusive;
 use std::{
-    fmt::Write as _,
     future::Future,
     marker::PhantomData,
     ops::{Deref, DerefMut},
@@ -486,9 +485,7 @@ pub struct ChannelsForUser {
     pub invited_channels: Vec<Channel>,
 
     pub observed_buffer_versions: Vec<proto::ChannelBufferVersion>,
-    pub observed_channel_messages: Vec<proto::ChannelMessageId>,
     pub latest_buffer_versions: Vec<proto::ChannelBufferVersion>,
-    pub latest_channel_messages: Vec<proto::ChannelMessageId>,
 }
 
 #[derive(Debug)]
diff --git a/crates/collab/src/db/queries.rs b/crates/collab/src/db/queries.rs
index 95e45dc004..7b457a5da4 100644
--- a/crates/collab/src/db/queries.rs
+++ b/crates/collab/src/db/queries.rs
@@ -7,7 +7,6 @@ pub mod contacts;
 pub mod contributors;
 pub mod embeddings;
 pub mod extensions;
-pub mod messages;
 pub mod notifications;
 pub mod projects;
 pub mod rooms;
diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
index 5e296e0a3b..4bb82865e7 100644
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -618,25 +618,17 @@ impl Database {
         }
         drop(rows);
 
-        let latest_channel_messages = self.latest_channel_messages(&channel_ids, tx).await?;
-
         let observed_buffer_versions = self
             .observed_channel_buffer_changes(&channel_ids_by_buffer_id, user_id, tx)
             .await?;
 
-        let observed_channel_messages = self
-            .observed_channel_messages(&channel_ids, user_id, tx)
-            .await?;
-
         Ok(ChannelsForUser {
             channel_memberships,
             channels,
             invited_channels,
             channel_participants,
             latest_buffer_versions,
-            latest_channel_messages,
             observed_buffer_versions,
-            observed_channel_messages,
         })
     }
 
diff --git a/crates/collab/src/db/queries/messages.rs b/crates/collab/src/db/queries/messages.rs
deleted file mode 100644
index 38e100053c..0000000000
--- a/crates/collab/src/db/queries/messages.rs
+++ /dev/null
@@ -1,725 +0,0 @@
-use super::*;
-use anyhow::Context as _;
-use rpc::Notification;
-use sea_orm::{SelectColumns, TryInsertResult};
-use time::OffsetDateTime;
-use util::ResultExt;
-
-impl Database {
-    /// Inserts a record representing a user joining the chat for a given channel.
-    pub async fn join_channel_chat(
-        &self,
-        channel_id: ChannelId,
-        connection_id: ConnectionId,
-        user_id: UserId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_participant(&channel, user_id, &tx)
-                .await?;
-            channel_chat_participant::ActiveModel {
-                id: ActiveValue::NotSet,
-                channel_id: ActiveValue::Set(channel_id),
-                user_id: ActiveValue::Set(user_id),
-                connection_id: ActiveValue::Set(connection_id.id as i32),
-                connection_server_id: ActiveValue::Set(ServerId(connection_id.owner_id as i32)),
-            }
-            .insert(&*tx)
-            .await?;
-            Ok(())
-        })
-        .await
-    }
-
-    /// Removes `channel_chat_participant` records associated with the given connection ID.
-    pub async fn channel_chat_connection_lost(
-        &self,
-        connection_id: ConnectionId,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        channel_chat_participant::Entity::delete_many()
-            .filter(
-                Condition::all()
-                    .add(
-                        channel_chat_participant::Column::ConnectionServerId
-                            .eq(connection_id.owner_id),
-                    )
-                    .add(channel_chat_participant::Column::ConnectionId.eq(connection_id.id)),
-            )
-            .exec(tx)
-            .await?;
-        Ok(())
-    }
-
-    /// Removes `channel_chat_participant` records associated with the given user ID so they
-    /// will no longer get chat notifications.
-    pub async fn leave_channel_chat(
-        &self,
-        channel_id: ChannelId,
-        connection_id: ConnectionId,
-        _user_id: UserId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            channel_chat_participant::Entity::delete_many()
-                .filter(
-                    Condition::all()
-                        .add(
-                            channel_chat_participant::Column::ConnectionServerId
-                                .eq(connection_id.owner_id),
-                        )
-                        .add(channel_chat_participant::Column::ConnectionId.eq(connection_id.id))
-                        .add(channel_chat_participant::Column::ChannelId.eq(channel_id)),
-                )
-                .exec(&*tx)
-                .await?;
-
-            Ok(())
-        })
-        .await
-    }
-
-    /// Retrieves the messages in the specified channel.
-    ///
-    /// Use `before_message_id` to paginate through the channel's messages.
-    pub async fn get_channel_messages(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        count: usize,
-        before_message_id: Option<MessageId>,
-    ) -> Result<Vec<proto::ChannelMessage>> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_participant(&channel, user_id, &tx)
-                .await?;
-
-            let mut condition =
-                Condition::all().add(channel_message::Column::ChannelId.eq(channel_id));
-
-            if let Some(before_message_id) = before_message_id {
-                condition = condition.add(channel_message::Column::Id.lt(before_message_id));
-            }
-
-            let rows = channel_message::Entity::find()
-                .filter(condition)
-                .order_by_desc(channel_message::Column::Id)
-                .limit(count as u64)
-                .all(&*tx)
-                .await?;
-
-            self.load_channel_messages(rows, &tx).await
-        })
-        .await
-    }
-
-    /// Returns the channel messages with the given IDs.
-    pub async fn get_channel_messages_by_id(
-        &self,
-        user_id: UserId,
-        message_ids: &[MessageId],
-    ) -> Result<Vec<proto::ChannelMessage>> {
-        self.transaction(|tx| async move {
-            let rows = channel_message::Entity::find()
-                .filter(channel_message::Column::Id.is_in(message_ids.iter().copied()))
-                .order_by_desc(channel_message::Column::Id)
-                .all(&*tx)
-                .await?;
-
-            let mut channels = HashMap::<ChannelId, channel::Model>::default();
-            for row in &rows {
-                channels.insert(
-                    row.channel_id,
-                    self.get_channel_internal(row.channel_id, &tx).await?,
-                );
-            }
-
-            for (_, channel) in channels {
-                self.check_user_is_channel_participant(&channel, user_id, &tx)
-                    .await?;
-            }
-
-            let messages = self.load_channel_messages(rows, &tx).await?;
-            Ok(messages)
-        })
-        .await
-    }
-
-    async fn load_channel_messages(
-        &self,
-        rows: Vec<channel_message::Model>,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<proto::ChannelMessage>> {
-        let mut messages = rows
-            .into_iter()
-            .map(|row| {
-                let nonce = row.nonce.as_u64_pair();
-                proto::ChannelMessage {
-                    id: row.id.to_proto(),
-                    sender_id: row.sender_id.to_proto(),
-                    body: row.body,
-                    timestamp: row.sent_at.assume_utc().unix_timestamp() as u64,
-                    mentions: vec![],
-                    nonce: Some(proto::Nonce {
-                        upper_half: nonce.0,
-                        lower_half: nonce.1,
-                    }),
-                    reply_to_message_id: row.reply_to_message_id.map(|id| id.to_proto()),
-                    edited_at: row
-                        .edited_at
-                        .map(|t| t.assume_utc().unix_timestamp() as u64),
-                }
-            })
-            .collect::<Vec<_>>();
-        messages.reverse();
-
-        let mut mentions = channel_message_mention::Entity::find()
-            .filter(channel_message_mention::Column::MessageId.is_in(messages.iter().map(|m| m.id)))
-            .order_by_asc(channel_message_mention::Column::MessageId)
-            .order_by_asc(channel_message_mention::Column::StartOffset)
-            .stream(tx)
-            .await?;
-
-        let mut message_ix = 0;
-        while let Some(mention) = mentions.next().await {
-            let mention = mention?;
-            let message_id = mention.message_id.to_proto();
-            while let Some(message) = messages.get_mut(message_ix) {
-                if message.id < message_id {
-                    message_ix += 1;
-                } else {
-                    if message.id == message_id {
-                        message.mentions.push(proto::ChatMention {
-                            range: Some(proto::Range {
-                                start: mention.start_offset as u64,
-                                end: mention.end_offset as u64,
-                            }),
-                            user_id: mention.user_id.to_proto(),
-                        });
-                    }
-                    break;
-                }
-            }
-        }
-
-        Ok(messages)
-    }
-
-    fn format_mentions_to_entities(
-        &self,
-        message_id: MessageId,
-        body: &str,
-        mentions: &[proto::ChatMention],
-    ) -> Result<Vec<tables::channel_message_mention::ActiveModel>> {
-        Ok(mentions
-            .iter()
-            .filter_map(|mention| {
-                let range = mention.range.as_ref()?;
-                if !body.is_char_boundary(range.start as usize)
-                    || !body.is_char_boundary(range.end as usize)
-                {
-                    return None;
-                }
-                Some(channel_message_mention::ActiveModel {
-                    message_id: ActiveValue::Set(message_id),
-                    start_offset: ActiveValue::Set(range.start as i32),
-                    end_offset: ActiveValue::Set(range.end as i32),
-                    user_id: ActiveValue::Set(UserId::from_proto(mention.user_id)),
-                })
-            })
-            .collect::<Vec<_>>())
-    }
-
-    /// Creates a new channel message.
-    pub async fn create_channel_message(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        body: &str,
-        mentions: &[proto::ChatMention],
-        timestamp: OffsetDateTime,
-        nonce: u128,
-        reply_to_message_id: Option<MessageId>,
-    ) -> Result<CreatedChannelMessage> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_participant(&channel, user_id, &tx)
-                .await?;
-
-            let mut rows = channel_chat_participant::Entity::find()
-                .filter(channel_chat_participant::Column::ChannelId.eq(channel_id))
-                .stream(&*tx)
-                .await?;
-
-            let mut is_participant = false;
-            let mut participant_connection_ids = HashSet::default();
-            let mut participant_user_ids = Vec::new();
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                if row.user_id == user_id {
-                    is_participant = true;
-                }
-                participant_user_ids.push(row.user_id);
-                participant_connection_ids.insert(row.connection());
-            }
-            drop(rows);
-
-            if !is_participant {
-                Err(anyhow!("not a chat participant"))?;
-            }
-
-            let timestamp = timestamp.to_offset(time::UtcOffset::UTC);
-            let timestamp = time::PrimitiveDateTime::new(timestamp.date(), timestamp.time());
-
-            let result = channel_message::Entity::insert(channel_message::ActiveModel {
-                channel_id: ActiveValue::Set(channel_id),
-                sender_id: ActiveValue::Set(user_id),
-                body: ActiveValue::Set(body.to_string()),
-                sent_at: ActiveValue::Set(timestamp),
-                nonce: ActiveValue::Set(Uuid::from_u128(nonce)),
-                id: ActiveValue::NotSet,
-                reply_to_message_id: ActiveValue::Set(reply_to_message_id),
-                edited_at: ActiveValue::NotSet,
-            })
-            .on_conflict(
-                OnConflict::columns([
-                    channel_message::Column::SenderId,
-                    channel_message::Column::Nonce,
-                ])
-                .do_nothing()
-                .to_owned(),
-            )
-            .do_nothing()
-            .exec(&*tx)
-            .await?;
-
-            let message_id;
-            let mut notifications = Vec::new();
-            match result {
-                TryInsertResult::Inserted(result) => {
-                    message_id = result.last_insert_id;
-                    let mentioned_user_ids =
-                        mentions.iter().map(|m| m.user_id).collect::<HashSet<_>>();
-
-                    let mentions = self.format_mentions_to_entities(message_id, body, mentions)?;
-                    if !mentions.is_empty() {
-                        channel_message_mention::Entity::insert_many(mentions)
-                            .exec(&*tx)
-                            .await?;
-                    }
-
-                    for mentioned_user in mentioned_user_ids {
-                        notifications.extend(
-                            self.create_notification(
-                                UserId::from_proto(mentioned_user),
-                                rpc::Notification::ChannelMessageMention {
-                                    message_id: message_id.to_proto(),
-                                    sender_id: user_id.to_proto(),
-                                    channel_id: channel_id.to_proto(),
-                                },
-                                false,
-                                &tx,
-                            )
-                            .await?,
-                        );
-                    }
-
-                    self.observe_channel_message_internal(channel_id, user_id, message_id, &tx)
-                        .await?;
-                }
-                _ => {
-                    message_id = channel_message::Entity::find()
-                        .filter(channel_message::Column::Nonce.eq(Uuid::from_u128(nonce)))
-                        .one(&*tx)
-                        .await?
-                        .context("failed to insert message")?
-                        .id;
-                }
-            }
-
-            Ok(CreatedChannelMessage {
-                message_id,
-                participant_connection_ids,
-                notifications,
-            })
-        })
-        .await
-    }
-
-    pub async fn observe_channel_message(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        message_id: MessageId,
-    ) -> Result<NotificationBatch> {
-        self.transaction(|tx| async move {
-            self.observe_channel_message_internal(channel_id, user_id, message_id, &tx)
-                .await?;
-            let mut batch = NotificationBatch::default();
-            batch.extend(
-                self.mark_notification_as_read(
-                    user_id,
-                    &Notification::ChannelMessageMention {
-                        message_id: message_id.to_proto(),
-                        sender_id: Default::default(),
-                        channel_id: Default::default(),
-                    },
-                    &tx,
-                )
-                .await?,
-            );
-            Ok(batch)
-        })
-        .await
-    }
-
-    async fn observe_channel_message_internal(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        message_id: MessageId,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        observed_channel_messages::Entity::insert(observed_channel_messages::ActiveModel {
-            user_id: ActiveValue::Set(user_id),
-            channel_id: ActiveValue::Set(channel_id),
-            channel_message_id: ActiveValue::Set(message_id),
-        })
-        .on_conflict(
-            OnConflict::columns([
-                observed_channel_messages::Column::ChannelId,
-                observed_channel_messages::Column::UserId,
-            ])
-            .update_column(observed_channel_messages::Column::ChannelMessageId)
-            .action_cond_where(observed_channel_messages::Column::ChannelMessageId.lt(message_id))
-            .to_owned(),
-        )
-        // TODO: Try to upgrade SeaORM so we don't have to do this hack around their bug
-        .exec_without_returning(tx)
-        .await?;
-        Ok(())
-    }
-
-    pub async fn observed_channel_messages(
-        &self,
-        channel_ids: &[ChannelId],
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<proto::ChannelMessageId>> {
-        let rows = observed_channel_messages::Entity::find()
-            .filter(observed_channel_messages::Column::UserId.eq(user_id))
-            .filter(
-                observed_channel_messages::Column::ChannelId
-                    .is_in(channel_ids.iter().map(|id| id.0)),
-            )
-            .all(tx)
-            .await?;
-
-        Ok(rows
-            .into_iter()
-            .map(|message| proto::ChannelMessageId {
-                channel_id: message.channel_id.to_proto(),
-                message_id: message.channel_message_id.to_proto(),
-            })
-            .collect())
-    }
-
-    pub async fn latest_channel_messages(
-        &self,
-        channel_ids: &[ChannelId],
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<proto::ChannelMessageId>> {
-        let mut values = String::new();
-        for id in channel_ids {
-            if !values.is_empty() {
-                values.push_str(", ");
-            }
-            write!(&mut values, "({})", id).unwrap();
-        }
-
-        if values.is_empty() {
-            return Ok(Vec::default());
-        }
-
-        let sql = format!(
-            r#"
-            SELECT
-                *
-            FROM (
-                SELECT
-                    *,
-                    row_number() OVER (
-                        PARTITION BY channel_id
-                        ORDER BY id DESC
-                    ) as row_number
-                FROM channel_messages
-                WHERE
-                    channel_id in ({values})
-            ) AS messages
-            WHERE
-                row_number = 1
-            "#,
-        );
-
-        let stmt = Statement::from_string(self.pool.get_database_backend(), sql);
-        let mut last_messages = channel_message::Model::find_by_statement(stmt)
-            .stream(tx)
-            .await?;
-
-        let mut results = Vec::new();
-        while let Some(result) = last_messages.next().await {
-            let message = result?;
-            results.push(proto::ChannelMessageId {
-                channel_id: message.channel_id.to_proto(),
-                message_id: message.id.to_proto(),
-            });
-        }
-
-        Ok(results)
-    }
-
-    fn get_notification_kind_id_by_name(&self, notification_kind: &str) -> Option<i32> {
-        self.notification_kinds_by_id
-            .iter()
-            .find(|(_, kind)| **kind == notification_kind)
-            .map(|kind| kind.0.0)
-    }
-
-    /// Removes the channel message with the given ID.
-    pub async fn remove_channel_message(
-        &self,
-        channel_id: ChannelId,
-        message_id: MessageId,
-        user_id: UserId,
-    ) -> Result<(Vec<ConnectionId>, Vec<NotificationId>)> {
-        self.transaction(|tx| async move {
-            let mut rows = channel_chat_participant::Entity::find()
-                .filter(channel_chat_participant::Column::ChannelId.eq(channel_id))
-                .stream(&*tx)
-                .await?;
-
-            let mut is_participant = false;
-            let mut participant_connection_ids = Vec::new();
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                if row.user_id == user_id {
-                    is_participant = true;
-                }
-                participant_connection_ids.push(row.connection());
-            }
-            drop(rows);
-
-            if !is_participant {
-                Err(anyhow!("not a chat participant"))?;
-            }
-
-            let result = channel_message::Entity::delete_by_id(message_id)
-                .filter(channel_message::Column::SenderId.eq(user_id))
-                .exec(&*tx)
-                .await?;
-
-            if result.rows_affected == 0 {
-                let channel = self.get_channel_internal(channel_id, &tx).await?;
-                if self
-                    .check_user_is_channel_admin(&channel, user_id, &tx)
-                    .await
-                    .is_ok()
-                {
-                    let result = channel_message::Entity::delete_by_id(message_id)
-                        .exec(&*tx)
-                        .await?;
-                    if result.rows_affected == 0 {
-                        Err(anyhow!("no such message"))?;
-                    }
-                } else {
-                    Err(anyhow!("operation could not be completed"))?;
-                }
-            }
-
-            let notification_kind_id =
-                self.get_notification_kind_id_by_name("ChannelMessageMention");
-
-            let existing_notifications = notification::Entity::find()
-                .filter(notification::Column::EntityId.eq(message_id))
-                .filter(notification::Column::Kind.eq(notification_kind_id))
-                .select_column(notification::Column::Id)
-                .all(&*tx)
-                .await?;
-
-            let existing_notification_ids = existing_notifications
-                .into_iter()
-                .map(|notification| notification.id)
-                .collect();
-
-            // remove all the mention notifications for this message
-            notification::Entity::delete_many()
-                .filter(notification::Column::EntityId.eq(message_id))
-                .filter(notification::Column::Kind.eq(notification_kind_id))
-                .exec(&*tx)
-                .await?;
-
-            Ok((participant_connection_ids, existing_notification_ids))
-        })
-        .await
-    }
-
-    /// Updates the channel message with the given ID, body and timestamp(edited_at).
-    pub async fn update_channel_message(
-        &self,
-        channel_id: ChannelId,
-        message_id: MessageId,
-        user_id: UserId,
-        body: &str,
-        mentions: &[proto::ChatMention],
-        edited_at: OffsetDateTime,
-    ) -> Result<UpdatedChannelMessage> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_participant(&channel, user_id, &tx)
-                .await?;
-
-            let mut rows = channel_chat_participant::Entity::find()
-                .filter(channel_chat_participant::Column::ChannelId.eq(channel_id))
-                .stream(&*tx)
-                .await?;
-
-            let mut is_participant = false;
-            let mut participant_connection_ids = Vec::new();
-            let mut participant_user_ids = Vec::new();
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                if row.user_id == user_id {
-                    is_participant = true;
-                }
-                participant_user_ids.push(row.user_id);
-                participant_connection_ids.push(row.connection());
-            }
-            drop(rows);
-
-            if !is_participant {
-                Err(anyhow!("not a chat participant"))?;
-            }
-
-            let channel_message = channel_message::Entity::find_by_id(message_id)
-                .filter(channel_message::Column::SenderId.eq(user_id))
-                .one(&*tx)
-                .await?;
-
-            let Some(channel_message) = channel_message else {
-                Err(anyhow!("Channel message not found"))?
-            };
-
-            let edited_at = edited_at.to_offset(time::UtcOffset::UTC);
-            let edited_at = time::PrimitiveDateTime::new(edited_at.date(), edited_at.time());
-
-            let updated_message = channel_message::ActiveModel {
-                body: ActiveValue::Set(body.to_string()),
-                edited_at: ActiveValue::Set(Some(edited_at)),
-                reply_to_message_id: ActiveValue::Unchanged(channel_message.reply_to_message_id),
-                id: ActiveValue::Unchanged(message_id),
-                channel_id: ActiveValue::Unchanged(channel_id),
-                sender_id: ActiveValue::Unchanged(user_id),
-                sent_at: ActiveValue::Unchanged(channel_message.sent_at),
-                nonce: ActiveValue::Unchanged(channel_message.nonce),
-            };
-
-            let result = channel_message::Entity::update_many()
-                .set(updated_message)
-                .filter(channel_message::Column::Id.eq(message_id))
-                .filter(channel_message::Column::SenderId.eq(user_id))
-                .exec(&*tx)
-                .await?;
-            if result.rows_affected == 0 {
-                return Err(anyhow!(
-                    "Attempted to edit a message (id: {message_id}) which does not exist anymore."
-                ))?;
-            }
-
-            // we have to fetch the old mentions,
-            // so we don't send a notification when the message has been edited that you are mentioned in
-            let old_mentions = channel_message_mention::Entity::find()
-                .filter(channel_message_mention::Column::MessageId.eq(message_id))
-                .all(&*tx)
-                .await?;
-
-            // remove all existing mentions
-            channel_message_mention::Entity::delete_many()
-                .filter(channel_message_mention::Column::MessageId.eq(message_id))
-                .exec(&*tx)
-                .await?;
-
-            let new_mentions = self.format_mentions_to_entities(message_id, body, mentions)?;
-            if !new_mentions.is_empty() {
-                // insert new mentions
-                channel_message_mention::Entity::insert_many(new_mentions)
-                    .exec(&*tx)
-                    .await?;
-            }
-
-            let mut update_mention_user_ids = HashSet::default();
-            let mut new_mention_user_ids =
-                mentions.iter().map(|m| m.user_id).collect::<HashSet<_>>();
-            // Filter out users that were mentioned before
-            for mention in &old_mentions {
-                if new_mention_user_ids.contains(&mention.user_id.to_proto()) {
-                    update_mention_user_ids.insert(mention.user_id.to_proto());
-                }
-
-                new_mention_user_ids.remove(&mention.user_id.to_proto());
-            }
-
-            let notification_kind_id =
-                self.get_notification_kind_id_by_name("ChannelMessageMention");
-
-            let existing_notifications = notification::Entity::find()
-                .filter(notification::Column::EntityId.eq(message_id))
-                .filter(notification::Column::Kind.eq(notification_kind_id))
-                .all(&*tx)
-                .await?;
-
-            // determine which notifications should be updated or deleted
-            let mut deleted_notification_ids = HashSet::default();
-            let mut updated_mention_notifications = Vec::new();
-            for notification in existing_notifications {
-                if update_mention_user_ids.contains(&notification.recipient_id.to_proto()) {
-                    if let Some(notification) =
-                        self::notifications::model_to_proto(self, notification).log_err()
-                    {
-                        updated_mention_notifications.push(notification);
-                    }
-                } else {
-                    deleted_notification_ids.insert(notification.id);
-                }
-            }
-
-            let mut notifications = Vec::new();
-            for mentioned_user in new_mention_user_ids {
-                notifications.extend(
-                    self.create_notification(
-                        UserId::from_proto(mentioned_user),
-                        rpc::Notification::ChannelMessageMention {
-                            message_id: message_id.to_proto(),
-                            sender_id: user_id.to_proto(),
-                            channel_id: channel_id.to_proto(),
-                        },
-                        false,
-                        &tx,
-                    )
-                    .await?,
-                );
-            }
-
-            Ok(UpdatedChannelMessage {
-                message_id,
-                participant_connection_ids,
-                notifications,
-                reply_to_message_id: channel_message.reply_to_message_id,
-                timestamp: channel_message.sent_at,
-                deleted_mention_notification_ids: deleted_notification_ids
-                    .into_iter()
-                    .collect::<Vec<_>>(),
-                updated_mention_notifications,
-            })
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index 0713ac2cb2..b4cca2a2b1 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -1193,7 +1193,6 @@ impl Database {
         self.transaction(|tx| async move {
             self.room_connection_lost(connection, &tx).await?;
             self.channel_buffer_connection_lost(connection, &tx).await?;
-            self.channel_chat_connection_lost(connection, &tx).await?;
             Ok(())
         })
         .await
diff --git a/crates/collab/src/db/tests.rs b/crates/collab/src/db/tests.rs
index f8560edda7..25e03f1320 100644
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -7,7 +7,6 @@ mod db_tests;
 mod embedding_tests;
 mod extension_tests;
 mod feature_flag_tests;
-mod message_tests;
 mod user_tests;
 
 use crate::migrations::run_database_migrations;
@@ -21,7 +20,7 @@ use sqlx::migrate::MigrateDatabase;
 use std::{
     sync::{
         Arc,
-        atomic::{AtomicI32, AtomicU32, Ordering::SeqCst},
+        atomic::{AtomicI32, Ordering::SeqCst},
     },
     time::Duration,
 };
@@ -224,11 +223,3 @@ async fn new_test_user(db: &Arc<Database>, email: &str) -> UserId {
     .unwrap()
     .user_id
 }
-
-static TEST_CONNECTION_ID: AtomicU32 = AtomicU32::new(1);
-fn new_test_connection(server: ServerId) -> ConnectionId {
-    ConnectionId {
-        id: TEST_CONNECTION_ID.fetch_add(1, SeqCst),
-        owner_id: server.0 as u32,
-    }
-}
diff --git a/crates/collab/src/db/tests/channel_tests.rs b/crates/collab/src/db/tests/channel_tests.rs
index 1dd16fb50a..705dbba5ea 100644
--- a/crates/collab/src/db/tests/channel_tests.rs
+++ b/crates/collab/src/db/tests/channel_tests.rs
@@ -1,7 +1,7 @@
 use crate::{
     db::{
         Channel, ChannelId, ChannelRole, Database, NewUserParams, RoomId, UserId,
-        tests::{assert_channel_tree_matches, channel_tree, new_test_connection, new_test_user},
+        tests::{assert_channel_tree_matches, channel_tree, new_test_user},
     },
     test_both_dbs,
 };
@@ -949,41 +949,6 @@ async fn test_user_is_channel_participant(db: &Arc<Database>) {
     )
 }
 
-test_both_dbs!(
-    test_guest_access,
-    test_guest_access_postgres,
-    test_guest_access_sqlite
-);
-
-async fn test_guest_access(db: &Arc<Database>) {
-    let server = db.create_server("test").await.unwrap();
-
-    let admin = new_test_user(db, "admin@example.com").await;
-    let guest = new_test_user(db, "guest@example.com").await;
-    let guest_connection = new_test_connection(server);
-
-    let zed_channel = db.create_root_channel("zed", admin).await.unwrap();
-    db.set_channel_visibility(zed_channel, crate::db::ChannelVisibility::Public, admin)
-        .await
-        .unwrap();
-
-    assert!(
-        db.join_channel_chat(zed_channel, guest_connection, guest)
-            .await
-            .is_err()
-    );
-
-    db.join_channel(zed_channel, guest, guest_connection)
-        .await
-        .unwrap();
-
-    assert!(
-        db.join_channel_chat(zed_channel, guest_connection, guest)
-            .await
-            .is_ok()
-    )
-}
-
 #[track_caller]
 fn assert_channel_tree(actual: Vec<Channel>, expected: &[(ChannelId, &[ChannelId])]) {
     let actual = actual
diff --git a/crates/collab/src/db/tests/message_tests.rs b/crates/collab/src/db/tests/message_tests.rs
deleted file mode 100644
index e20473d3bd..0000000000
--- a/crates/collab/src/db/tests/message_tests.rs
+++ /dev/null
@@ -1,421 +0,0 @@
-use super::new_test_user;
-use crate::{
-    db::{ChannelRole, Database, MessageId},
-    test_both_dbs,
-};
-use channel::mentions_to_proto;
-use std::sync::Arc;
-use time::OffsetDateTime;
-
-test_both_dbs!(
-    test_channel_message_retrieval,
-    test_channel_message_retrieval_postgres,
-    test_channel_message_retrieval_sqlite
-);
-
-async fn test_channel_message_retrieval(db: &Arc<Database>) {
-    let user = new_test_user(db, "user@example.com").await;
-    let channel = db.create_channel("channel", None, user).await.unwrap().0;
-
-    let owner_id = db.create_server("test").await.unwrap().0 as u32;
-    db.join_channel_chat(channel.id, rpc::ConnectionId { owner_id, id: 0 }, user)
-        .await
-        .unwrap();
-
-    let mut all_messages = Vec::new();
-    for i in 0..10 {
-        all_messages.push(
-            db.create_channel_message(
-                channel.id,
-                user,
-                &i.to_string(),
-                &[],
-                OffsetDateTime::now_utc(),
-                i,
-                None,
-            )
-            .await
-            .unwrap()
-            .message_id
-            .to_proto(),
-        );
-    }
-
-    let messages = db
-        .get_channel_messages(channel.id, user, 3, None)
-        .await
-        .unwrap()
-        .into_iter()
-        .map(|message| message.id)
-        .collect::<Vec<_>>();
-    assert_eq!(messages, &all_messages[7..10]);
-
-    let messages = db
-        .get_channel_messages(
-            channel.id,
-            user,
-            4,
-            Some(MessageId::from_proto(all_messages[6])),
-        )
-        .await
-        .unwrap()
-        .into_iter()
-        .map(|message| message.id)
-        .collect::<Vec<_>>();
-    assert_eq!(messages, &all_messages[2..6]);
-}
-
-test_both_dbs!(
-    test_channel_message_nonces,
-    test_channel_message_nonces_postgres,
-    test_channel_message_nonces_sqlite
-);
-
-async fn test_channel_message_nonces(db: &Arc<Database>) {
-    let user_a = new_test_user(db, "user_a@example.com").await;
-    let user_b = new_test_user(db, "user_b@example.com").await;
-    let user_c = new_test_user(db, "user_c@example.com").await;
-    let channel = db.create_root_channel("channel", user_a).await.unwrap();
-    db.invite_channel_member(channel, user_b, user_a, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.invite_channel_member(channel, user_c, user_a, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.respond_to_channel_invite(channel, user_b, true)
-        .await
-        .unwrap();
-    db.respond_to_channel_invite(channel, user_c, true)
-        .await
-        .unwrap();
-
-    let owner_id = db.create_server("test").await.unwrap().0 as u32;
-    db.join_channel_chat(channel, rpc::ConnectionId { owner_id, id: 0 }, user_a)
-        .await
-        .unwrap();
-    db.join_channel_chat(channel, rpc::ConnectionId { owner_id, id: 1 }, user_b)
-        .await
-        .unwrap();
-
-    // As user A, create messages that reuse the same nonces. The requests
-    // succeed, but return the same ids.
-    let id1 = db
-        .create_channel_message(
-            channel,
-            user_a,
-            "hi @user_b",
-            &mentions_to_proto(&[(3..10, user_b.to_proto())]),
-            OffsetDateTime::now_utc(),
-            100,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-    let id2 = db
-        .create_channel_message(
-            channel,
-            user_a,
-            "hello, fellow users",
-            &mentions_to_proto(&[]),
-            OffsetDateTime::now_utc(),
-            200,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-    let id3 = db
-        .create_channel_message(
-            channel,
-            user_a,
-            "bye @user_c (same nonce as first message)",
-            &mentions_to_proto(&[(4..11, user_c.to_proto())]),
-            OffsetDateTime::now_utc(),
-            100,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-    let id4 = db
-        .create_channel_message(
-            channel,
-            user_a,
-            "omg (same nonce as second message)",
-            &mentions_to_proto(&[]),
-            OffsetDateTime::now_utc(),
-            200,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-
-    // As a different user, reuse one of the same nonces. This request succeeds
-    // and returns a different id.
-    let id5 = db
-        .create_channel_message(
-            channel,
-            user_b,
-            "omg @user_a (same nonce as user_a's first message)",
-            &mentions_to_proto(&[(4..11, user_a.to_proto())]),
-            OffsetDateTime::now_utc(),
-            100,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-
-    assert_ne!(id1, id2);
-    assert_eq!(id1, id3);
-    assert_eq!(id2, id4);
-    assert_ne!(id5, id1);
-
-    let messages = db
-        .get_channel_messages(channel, user_a, 5, None)
-        .await
-        .unwrap()
-        .into_iter()
-        .map(|m| (m.id, m.body, m.mentions))
-        .collect::<Vec<_>>();
-    assert_eq!(
-        messages,
-        &[
-            (
-                id1.to_proto(),
-                "hi @user_b".into(),
-                mentions_to_proto(&[(3..10, user_b.to_proto())]),
-            ),
-            (
-                id2.to_proto(),
-                "hello, fellow users".into(),
-                mentions_to_proto(&[])
-            ),
-            (
-                id5.to_proto(),
-                "omg @user_a (same nonce as user_a's first message)".into(),
-                mentions_to_proto(&[(4..11, user_a.to_proto())]),
-            ),
-        ]
-    );
-}
-
-test_both_dbs!(
-    test_unseen_channel_messages,
-    test_unseen_channel_messages_postgres,
-    test_unseen_channel_messages_sqlite
-);
-
-async fn test_unseen_channel_messages(db: &Arc<Database>) {
-    let user = new_test_user(db, "user_a@example.com").await;
-    let observer = new_test_user(db, "user_b@example.com").await;
-
-    let channel_1 = db.create_root_channel("channel", user).await.unwrap();
-    let channel_2 = db.create_root_channel("channel-2", user).await.unwrap();
-
-    db.invite_channel_member(channel_1, observer, user, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.invite_channel_member(channel_2, observer, user, ChannelRole::Member)
-        .await
-        .unwrap();
-
-    db.respond_to_channel_invite(channel_1, observer, true)
-        .await
-        .unwrap();
-    db.respond_to_channel_invite(channel_2, observer, true)
-        .await
-        .unwrap();
-
-    let owner_id = db.create_server("test").await.unwrap().0 as u32;
-    let user_connection_id = rpc::ConnectionId { owner_id, id: 0 };
-
-    db.join_channel_chat(channel_1, user_connection_id, user)
-        .await
-        .unwrap();
-
-    let _ = db
-        .create_channel_message(
-            channel_1,
-            user,
-            "1_1",
-            &[],
-            OffsetDateTime::now_utc(),
-            1,
-            None,
-        )
-        .await
-        .unwrap();
-
-    let _ = db
-        .create_channel_message(
-            channel_1,
-            user,
-            "1_2",
-            &[],
-            OffsetDateTime::now_utc(),
-            2,
-            None,
-        )
-        .await
-        .unwrap();
-
-    let third_message = db
-        .create_channel_message(
-            channel_1,
-            user,
-            "1_3",
-            &[],
-            OffsetDateTime::now_utc(),
-            3,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-
-    db.join_channel_chat(channel_2, user_connection_id, user)
-        .await
-        .unwrap();
-
-    let fourth_message = db
-        .create_channel_message(
-            channel_2,
-            user,
-            "2_1",
-            &[],
-            OffsetDateTime::now_utc(),
-            4,
-            None,
-        )
-        .await
-        .unwrap()
-        .message_id;
-
-    // Check that observer has new messages
-    let latest_messages = db
-        .transaction(|tx| async move {
-            db.latest_channel_messages(&[channel_1, channel_2], &tx)
-                .await
-        })
-        .await
-        .unwrap();
-
-    assert_eq!(
-        latest_messages,
-        [
-            rpc::proto::ChannelMessageId {
-                channel_id: channel_1.to_proto(),
-                message_id: third_message.to_proto(),
-            },
-            rpc::proto::ChannelMessageId {
-                channel_id: channel_2.to_proto(),
-                message_id: fourth_message.to_proto(),
-            },
-        ]
-    );
-}
-
-test_both_dbs!(
-    test_channel_message_mentions,
-    test_channel_message_mentions_postgres,
-    test_channel_message_mentions_sqlite
-);
-
-async fn test_channel_message_mentions(db: &Arc<Database>) {
-    let user_a = new_test_user(db, "user_a@example.com").await;
-    let user_b = new_test_user(db, "user_b@example.com").await;
-    let user_c = new_test_user(db, "user_c@example.com").await;
-
-    let channel = db
-        .create_channel("channel", None, user_a)
-        .await
-        .unwrap()
-        .0
-        .id;
-    db.invite_channel_member(channel, user_b, user_a, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.respond_to_channel_invite(channel, user_b, true)
-        .await
-        .unwrap();
-
-    let owner_id = db.create_server("test").await.unwrap().0 as u32;
-    let connection_id = rpc::ConnectionId { owner_id, id: 0 };
-    db.join_channel_chat(channel, connection_id, user_a)
-        .await
-        .unwrap();
-
-    db.create_channel_message(
-        channel,
-        user_a,
-        "hi @user_b and @user_c",
-        &mentions_to_proto(&[(3..10, user_b.to_proto()), (15..22, user_c.to_proto())]),
-        OffsetDateTime::now_utc(),
-        1,
-        None,
-    )
-    .await
-    .unwrap();
-    db.create_channel_message(
-        channel,
-        user_a,
-        "bye @user_c",
-        &mentions_to_proto(&[(4..11, user_c.to_proto())]),
-        OffsetDateTime::now_utc(),
-        2,
-        None,
-    )
-    .await
-    .unwrap();
-    db.create_channel_message(
-        channel,
-        user_a,
-        "umm",
-        &mentions_to_proto(&[]),
-        OffsetDateTime::now_utc(),
-        3,
-        None,
-    )
-    .await
-    .unwrap();
-    db.create_channel_message(
-        channel,
-        user_a,
-        "@user_b, stop.",
-        &mentions_to_proto(&[(0..7, user_b.to_proto())]),
-        OffsetDateTime::now_utc(),
-        4,
-        None,
-    )
-    .await
-    .unwrap();
-
-    let messages = db
-        .get_channel_messages(channel, user_b, 5, None)
-        .await
-        .unwrap()
-        .into_iter()
-        .map(|m| (m.body, m.mentions))
-        .collect::<Vec<_>>();
-    assert_eq!(
-        &messages,
-        &[
-            (
-                "hi @user_b and @user_c".into(),
-                mentions_to_proto(&[(3..10, user_b.to_proto()), (15..22, user_c.to_proto())]),
-            ),
-            (
-                "bye @user_c".into(),
-                mentions_to_proto(&[(4..11, user_c.to_proto())]),
-            ),
-            ("umm".into(), mentions_to_proto(&[]),),
-            (
-                "@user_b, stop.".into(),
-                mentions_to_proto(&[(0..7, user_b.to_proto())]),
-            ),
-        ]
-    );
-}
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 9e4dfd4854..e19c59f997 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -4,10 +4,9 @@ use crate::api::{CloudflareIpCountryHeader, SystemIdHeader};
 use crate::{
     AppState, Error, Result, auth,
     db::{
-        self, BufferId, Capability, Channel, ChannelId, ChannelRole, ChannelsForUser,
-        CreatedChannelMessage, Database, InviteMemberResult, MembershipUpdated, MessageId,
-        NotificationId, ProjectId, RejoinedProject, RemoveChannelMemberResult,
-        RespondToChannelInvite, RoomId, ServerId, UpdatedChannelMessage, User, UserId,
+        self, BufferId, Capability, Channel, ChannelId, ChannelRole, ChannelsForUser, Database,
+        InviteMemberResult, MembershipUpdated, NotificationId, ProjectId, RejoinedProject,
+        RemoveChannelMemberResult, RespondToChannelInvite, RoomId, ServerId, User, UserId,
     },
     executor::Executor,
 };
@@ -66,7 +65,6 @@ use std::{
     },
     time::{Duration, Instant},
 };
-use time::OffsetDateTime;
 use tokio::sync::{Semaphore, watch};
 use tower::ServiceBuilder;
 use tracing::{
@@ -80,8 +78,6 @@ pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
 // kubernetes gives terminated pods 10s to shutdown gracefully. After they're gone, we can clean up old resources.
 pub const CLEANUP_TIMEOUT: Duration = Duration::from_secs(15);
 
-const MESSAGE_COUNT_PER_PAGE: usize = 100;
-const MAX_MESSAGE_LEN: usize = 1024;
 const NOTIFICATION_COUNT_PER_PAGE: usize = 50;
 const MAX_CONCURRENT_CONNECTIONS: usize = 512;
 
@@ -3597,235 +3593,36 @@ fn send_notifications(
 
 /// Send a message to the channel
 async fn send_channel_message(
-    request: proto::SendChannelMessage,
-    response: Response<proto::SendChannelMessage>,
-    session: MessageContext,
+    _request: proto::SendChannelMessage,
+    _response: Response<proto::SendChannelMessage>,
+    _session: MessageContext,
 ) -> Result<()> {
-    // Validate the message body.
-    let body = request.body.trim().to_string();
-    if body.len() > MAX_MESSAGE_LEN {
-        return Err(anyhow!("message is too long"))?;
-    }
-    if body.is_empty() {
-        return Err(anyhow!("message can't be blank"))?;
-    }
-
-    // TODO: adjust mentions if body is trimmed
-
-    let timestamp = OffsetDateTime::now_utc();
-    let nonce = request.nonce.context("nonce can't be blank")?;
-
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let CreatedChannelMessage {
-        message_id,
-        participant_connection_ids,
-        notifications,
-    } = session
-        .db()
-        .await
-        .create_channel_message(
-            channel_id,
-            session.user_id(),
-            &body,
-            &request.mentions,
-            timestamp,
-            nonce.clone().into(),
-            request.reply_to_message_id.map(MessageId::from_proto),
-        )
-        .await?;
-
-    let message = proto::ChannelMessage {
-        sender_id: session.user_id().to_proto(),
-        id: message_id.to_proto(),
-        body,
-        mentions: request.mentions,
-        timestamp: timestamp.unix_timestamp() as u64,
-        nonce: Some(nonce),
-        reply_to_message_id: request.reply_to_message_id,
-        edited_at: None,
-    };
-    broadcast(
-        Some(session.connection_id),
-        participant_connection_ids.clone(),
-        |connection| {
-            session.peer.send(
-                connection,
-                proto::ChannelMessageSent {
-                    channel_id: channel_id.to_proto(),
-                    message: Some(message.clone()),
-                },
-            )
-        },
-    );
-    response.send(proto::SendChannelMessageResponse {
-        message: Some(message),
-    })?;
-
-    let pool = &*session.connection_pool().await;
-    let non_participants =
-        pool.channel_connection_ids(channel_id)
-            .filter_map(|(connection_id, _)| {
-                if participant_connection_ids.contains(&connection_id) {
-                    None
-                } else {
-                    Some(connection_id)
-                }
-            });
-    broadcast(None, non_participants, |peer_id| {
-        session.peer.send(
-            peer_id,
-            proto::UpdateChannels {
-                latest_channel_message_ids: vec![proto::ChannelMessageId {
-                    channel_id: channel_id.to_proto(),
-                    message_id: message_id.to_proto(),
-                }],
-                ..Default::default()
-            },
-        )
-    });
-    send_notifications(pool, &session.peer, notifications);
-
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Delete a channel message
 async fn remove_channel_message(
-    request: proto::RemoveChannelMessage,
-    response: Response<proto::RemoveChannelMessage>,
-    session: MessageContext,
+    _request: proto::RemoveChannelMessage,
+    _response: Response<proto::RemoveChannelMessage>,
+    _session: MessageContext,
 ) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let message_id = MessageId::from_proto(request.message_id);
-    let (connection_ids, existing_notification_ids) = session
-        .db()
-        .await
-        .remove_channel_message(channel_id, message_id, session.user_id())
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        connection_ids,
-        move |connection| {
-            session.peer.send(connection, request.clone())?;
-
-            for notification_id in &existing_notification_ids {
-                session.peer.send(
-                    connection,
-                    proto::DeleteNotification {
-                        notification_id: (*notification_id).to_proto(),
-                    },
-                )?;
-            }
-
-            Ok(())
-        },
-    );
-    response.send(proto::Ack {})?;
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 async fn update_channel_message(
-    request: proto::UpdateChannelMessage,
-    response: Response<proto::UpdateChannelMessage>,
-    session: MessageContext,
+    _request: proto::UpdateChannelMessage,
+    _response: Response<proto::UpdateChannelMessage>,
+    _session: MessageContext,
 ) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let message_id = MessageId::from_proto(request.message_id);
-    let updated_at = OffsetDateTime::now_utc();
-    let UpdatedChannelMessage {
-        message_id,
-        participant_connection_ids,
-        notifications,
-        reply_to_message_id,
-        timestamp,
-        deleted_mention_notification_ids,
-        updated_mention_notifications,
-    } = session
-        .db()
-        .await
-        .update_channel_message(
-            channel_id,
-            message_id,
-            session.user_id(),
-            request.body.as_str(),
-            &request.mentions,
-            updated_at,
-        )
-        .await?;
-
-    let nonce = request.nonce.clone().context("nonce can't be blank")?;
-
-    let message = proto::ChannelMessage {
-        sender_id: session.user_id().to_proto(),
-        id: message_id.to_proto(),
-        body: request.body.clone(),
-        mentions: request.mentions.clone(),
-        timestamp: timestamp.assume_utc().unix_timestamp() as u64,
-        nonce: Some(nonce),
-        reply_to_message_id: reply_to_message_id.map(|id| id.to_proto()),
-        edited_at: Some(updated_at.unix_timestamp() as u64),
-    };
-
-    response.send(proto::Ack {})?;
-
-    let pool = &*session.connection_pool().await;
-    broadcast(
-        Some(session.connection_id),
-        participant_connection_ids,
-        |connection| {
-            session.peer.send(
-                connection,
-                proto::ChannelMessageUpdate {
-                    channel_id: channel_id.to_proto(),
-                    message: Some(message.clone()),
-                },
-            )?;
-
-            for notification_id in &deleted_mention_notification_ids {
-                session.peer.send(
-                    connection,
-                    proto::DeleteNotification {
-                        notification_id: (*notification_id).to_proto(),
-                    },
-                )?;
-            }
-
-            for notification in &updated_mention_notifications {
-                session.peer.send(
-                    connection,
-                    proto::UpdateNotification {
-                        notification: Some(notification.clone()),
-                    },
-                )?;
-            }
-
-            Ok(())
-        },
-    );
-
-    send_notifications(pool, &session.peer, notifications);
-
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Mark a channel message as read
 async fn acknowledge_channel_message(
-    request: proto::AckChannelMessage,
-    session: MessageContext,
+    _request: proto::AckChannelMessage,
+    _session: MessageContext,
 ) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let message_id = MessageId::from_proto(request.message_id);
-    let notifications = session
-        .db()
-        .await
-        .observe_channel_message(channel_id, session.user_id(), message_id)
-        .await?;
-    send_notifications(
-        &*session.connection_pool().await,
-        &session.peer,
-        notifications,
-    );
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Mark a buffer version as synced
@@ -3878,84 +3675,37 @@ async fn get_supermaven_api_key(
 
 /// Start receiving chat updates for a channel
 async fn join_channel_chat(
-    request: proto::JoinChannelChat,
-    response: Response<proto::JoinChannelChat>,
-    session: MessageContext,
+    _request: proto::JoinChannelChat,
+    _response: Response<proto::JoinChannelChat>,
+    _session: MessageContext,
 ) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-
-    let db = session.db().await;
-    db.join_channel_chat(channel_id, session.connection_id, session.user_id())
-        .await?;
-    let messages = db
-        .get_channel_messages(channel_id, session.user_id(), MESSAGE_COUNT_PER_PAGE, None)
-        .await?;
-    response.send(proto::JoinChannelChatResponse {
-        done: messages.len() < MESSAGE_COUNT_PER_PAGE,
-        messages,
-    })?;
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Stop receiving chat updates for a channel
 async fn leave_channel_chat(
-    request: proto::LeaveChannelChat,
-    session: MessageContext,
+    _request: proto::LeaveChannelChat,
+    _session: MessageContext,
 ) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    session
-        .db()
-        .await
-        .leave_channel_chat(channel_id, session.connection_id, session.user_id())
-        .await?;
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Retrieve the chat history for a channel
 async fn get_channel_messages(
-    request: proto::GetChannelMessages,
-    response: Response<proto::GetChannelMessages>,
-    session: MessageContext,
+    _request: proto::GetChannelMessages,
+    _response: Response<proto::GetChannelMessages>,
+    _session: MessageContext,
 ) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let messages = session
-        .db()
-        .await
-        .get_channel_messages(
-            channel_id,
-            session.user_id(),
-            MESSAGE_COUNT_PER_PAGE,
-            Some(MessageId::from_proto(request.before_message_id)),
-        )
-        .await?;
-    response.send(proto::GetChannelMessagesResponse {
-        done: messages.len() < MESSAGE_COUNT_PER_PAGE,
-        messages,
-    })?;
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Retrieve specific chat messages
 async fn get_channel_messages_by_id(
-    request: proto::GetChannelMessagesById,
-    response: Response<proto::GetChannelMessagesById>,
-    session: MessageContext,
+    _request: proto::GetChannelMessagesById,
+    _response: Response<proto::GetChannelMessagesById>,
+    _session: MessageContext,
 ) -> Result<()> {
-    let message_ids = request
-        .message_ids
-        .iter()
-        .map(|id| MessageId::from_proto(*id))
-        .collect::<Vec<_>>();
-    let messages = session
-        .db()
-        .await
-        .get_channel_messages_by_id(session.user_id(), &message_ids)
-        .await?;
-    response.send(proto::GetChannelMessagesResponse {
-        done: messages.len() < MESSAGE_COUNT_PER_PAGE,
-        messages,
-    })?;
-    Ok(())
+    Err(anyhow!("chat has been removed in the latest version of Zed").into())
 }
 
 /// Retrieve the current users notifications
@@ -4095,7 +3845,6 @@ fn build_update_user_channels(channels: &ChannelsForUser) -> proto::UpdateUserCh
             })
             .collect(),
         observed_channel_buffer_version: channels.observed_buffer_versions.clone(),
-        observed_channel_message_id: channels.observed_channel_messages.clone(),
     }
 }
 
@@ -4107,7 +3856,6 @@ fn build_channels_update(channels: ChannelsForUser) -> proto::UpdateChannels {
     }
 
     update.latest_channel_buffer_versions = channels.latest_buffer_versions;
-    update.latest_channel_message_ids = channels.latest_channel_messages;
 
     for (channel_id, participants) in channels.channel_participants {
         update
diff --git a/crates/collab/src/tests.rs b/crates/collab/src/tests.rs
index ddf245b06f..7d07360b80 100644
--- a/crates/collab/src/tests.rs
+++ b/crates/collab/src/tests.rs
@@ -6,7 +6,6 @@ use gpui::{Entity, TestAppContext};
 
 mod channel_buffer_tests;
 mod channel_guest_tests;
-mod channel_message_tests;
 mod channel_tests;
 mod editor_tests;
 mod following_tests;
diff --git a/crates/collab/src/tests/channel_message_tests.rs b/crates/collab/src/tests/channel_message_tests.rs
deleted file mode 100644
index dbc5cd86c2..0000000000
--- a/crates/collab/src/tests/channel_message_tests.rs
+++ /dev/null
@@ -1,725 +0,0 @@
-use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
-use channel::{ChannelChat, ChannelMessageId, MessageParams};
-use collab_ui::chat_panel::ChatPanel;
-use gpui::{BackgroundExecutor, Entity, TestAppContext};
-use rpc::Notification;
-use workspace::dock::Panel;
-
-#[gpui::test]
-async fn test_basic_channel_messages(
-    executor: BackgroundExecutor,
-    mut cx_a: &mut TestAppContext,
-    mut cx_b: &mut TestAppContext,
-    mut cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let channel_chat_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-    let channel_chat_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    let message_id = channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.send_message(
-                MessageParams {
-                    text: "hi @user_c!".into(),
-                    mentions: vec![(3..10, client_c.id())],
-                    reply_to_message_id: None,
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("two".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    channel_chat_b
-        .update(cx_b, |c, cx| c.send_message("three".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let channel_chat_c = client_c
-        .channel_store()
-        .update(cx_c, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    for (chat, cx) in [
-        (&channel_chat_a, &mut cx_a),
-        (&channel_chat_b, &mut cx_b),
-        (&channel_chat_c, &mut cx_c),
-    ] {
-        chat.update(*cx, |c, _| {
-            assert_eq!(
-                c.messages()
-                    .iter()
-                    .map(|m| (m.body.as_str(), m.mentions.as_slice()))
-                    .collect::<Vec<_>>(),
-                vec![
-                    ("hi @user_c!", [(3..10, client_c.id())].as_slice()),
-                    ("two", &[]),
-                    ("three", &[])
-                ],
-                "results for user {}",
-                c.client().id(),
-            );
-        });
-    }
-
-    client_c.notification_store().update(cx_c, |store, _| {
-        assert_eq!(store.notification_count(), 2);
-        assert_eq!(store.unread_notification_count(), 1);
-        assert_eq!(
-            store.notification_at(0).unwrap().notification,
-            Notification::ChannelMessageMention {
-                message_id,
-                sender_id: client_a.id(),
-                channel_id: channel_id.0,
-            }
-        );
-        assert_eq!(
-            store.notification_at(1).unwrap().notification,
-            Notification::ChannelInvitation {
-                channel_id: channel_id.0,
-                channel_name: "the-channel".to_string(),
-                inviter_id: client_a.id()
-            }
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_rejoin_channel_chat(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    let channel_chat_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-    let channel_chat_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
-        .await
-        .unwrap();
-    channel_chat_b
-        .update(cx_b, |c, cx| c.send_message("two".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-
-    // While client A is disconnected, clients A and B both send new messages.
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("three".into(), cx).unwrap())
-        .await
-        .unwrap_err();
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("four".into(), cx).unwrap())
-        .await
-        .unwrap_err();
-    channel_chat_b
-        .update(cx_b, |c, cx| c.send_message("five".into(), cx).unwrap())
-        .await
-        .unwrap();
-    channel_chat_b
-        .update(cx_b, |c, cx| c.send_message("six".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    // Client A reconnects.
-    server.allow_connections();
-    executor.advance_clock(RECONNECT_TIMEOUT);
-
-    // Client A fetches the messages that were sent while they were disconnected
-    // and resends their own messages which failed to send.
-    let expected_messages = &["one", "two", "five", "six", "three", "four"];
-    assert_messages(&channel_chat_a, expected_messages, cx_a);
-    assert_messages(&channel_chat_b, expected_messages, cx_b);
-}
-
-#[gpui::test]
-async fn test_remove_channel_message(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let channel_chat_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-    let channel_chat_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    // Client A sends some messages.
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
-        .await
-        .unwrap();
-    let msg_id_2 = channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.send_message(
-                MessageParams {
-                    text: "two @user_b".to_string(),
-                    mentions: vec![(4..12, client_b.id())],
-                    reply_to_message_id: None,
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("three".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    // Clients A and B see all of the messages.
-    executor.run_until_parked();
-    let expected_messages = &["one", "two @user_b", "three"];
-    assert_messages(&channel_chat_a, expected_messages, cx_a);
-    assert_messages(&channel_chat_b, expected_messages, cx_b);
-
-    // Ensure that client B received a notification for the mention.
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        assert_eq!(store.notification_count(), 2);
-        let entry = store.notification_at(0).unwrap();
-        assert_eq!(
-            entry.notification,
-            Notification::ChannelMessageMention {
-                message_id: msg_id_2,
-                sender_id: client_a.id(),
-                channel_id: channel_id.0,
-            }
-        );
-    });
-
-    // Client A deletes one of their messages.
-    channel_chat_a
-        .update(cx_a, |c, cx| {
-            let ChannelMessageId::Saved(id) = c.message(1).id else {
-                panic!("message not saved")
-            };
-            c.remove_message(id, cx)
-        })
-        .await
-        .unwrap();
-
-    // Client B sees that the message is gone.
-    executor.run_until_parked();
-    let expected_messages = &["one", "three"];
-    assert_messages(&channel_chat_a, expected_messages, cx_a);
-    assert_messages(&channel_chat_b, expected_messages, cx_b);
-
-    // Client C joins the channel chat, and does not see the deleted message.
-    let channel_chat_c = client_c
-        .channel_store()
-        .update(cx_c, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-    assert_messages(&channel_chat_c, expected_messages, cx_c);
-
-    // Ensure we remove the notifications when the message is removed
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        // First notification is the channel invitation, second would be the mention
-        // notification, which should now be removed.
-        assert_eq!(store.notification_count(), 1);
-    });
-}
-
-#[track_caller]
-fn assert_messages(chat: &Entity<ChannelChat>, messages: &[&str], cx: &mut TestAppContext) {
-    assert_eq!(
-        chat.read_with(cx, |chat, _| {
-            chat.messages()
-                .iter()
-                .map(|m| m.body.clone())
-                .collect::<Vec<_>>()
-        }),
-        messages
-    );
-}
-
-#[gpui::test]
-async fn test_channel_message_changes(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    // Client A sends a message, client B should see that there is a new message.
-    let channel_chat_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let b_has_messages = cx_b.update(|cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_new_messages(channel_id)
-    });
-
-    assert!(b_has_messages);
-
-    // Opening the chat should clear the changed flag.
-    cx_b.update(|cx| {
-        collab_ui::init(&client_b.app_state, cx);
-    });
-    let project_b = client_b.build_empty_local_project(cx_b);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    let chat_panel_b = workspace_b.update_in(cx_b, ChatPanel::new);
-    chat_panel_b
-        .update_in(cx_b, |chat_panel, window, cx| {
-            chat_panel.set_active(true, window, cx);
-            chat_panel.select_channel(channel_id, None, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let b_has_messages = cx_b.update(|_, cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_new_messages(channel_id)
-    });
-
-    assert!(!b_has_messages);
-
-    // Sending a message while the chat is open should not change the flag.
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("two".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let b_has_messages = cx_b.update(|_, cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_new_messages(channel_id)
-    });
-
-    assert!(!b_has_messages);
-
-    // Sending a message while the chat is closed should change the flag.
-    chat_panel_b.update_in(cx_b, |chat_panel, window, cx| {
-        chat_panel.set_active(false, window, cx);
-    });
-
-    // Sending a message while the chat is open should not change the flag.
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("three".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let b_has_messages = cx_b.update(|_, cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_new_messages(channel_id)
-    });
-
-    assert!(b_has_messages);
-
-    // Closing the chat should re-enable change tracking
-    cx_b.update(|_, _| drop(chat_panel_b));
-
-    channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("four".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let b_has_messages = cx_b.update(|_, cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_new_messages(channel_id)
-    });
-
-    assert!(b_has_messages);
-}
-
-#[gpui::test]
-async fn test_chat_replies(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    // Client A sends a message, client B should see that there is a new message.
-    let channel_chat_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    let channel_chat_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    let msg_id = channel_chat_a
-        .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-
-    let reply_id = channel_chat_b
-        .update(cx_b, |c, cx| {
-            c.send_message(
-                MessageParams {
-                    text: "reply".into(),
-                    reply_to_message_id: Some(msg_id),
-                    mentions: Vec::new(),
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-
-    channel_chat_a.update(cx_a, |channel_chat, _| {
-        assert_eq!(
-            channel_chat
-                .find_loaded_message(reply_id)
-                .unwrap()
-                .reply_to_message_id,
-            Some(msg_id),
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_chat_editing(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    // Client A sends a message, client B should see that there is a new message.
-    let channel_chat_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    let channel_chat_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
-        .await
-        .unwrap();
-
-    let msg_id = channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.send_message(
-                MessageParams {
-                    text: "Initial message".into(),
-                    reply_to_message_id: None,
-                    mentions: Vec::new(),
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-
-    channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.update_message(
-                msg_id,
-                MessageParams {
-                    text: "Updated body".into(),
-                    reply_to_message_id: None,
-                    mentions: Vec::new(),
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    channel_chat_a.update(cx_a, |channel_chat, _| {
-        let update_message = channel_chat.find_loaded_message(msg_id).unwrap();
-
-        assert_eq!(update_message.body, "Updated body");
-        assert_eq!(update_message.mentions, Vec::new());
-    });
-    channel_chat_b.update(cx_b, |channel_chat, _| {
-        let update_message = channel_chat.find_loaded_message(msg_id).unwrap();
-
-        assert_eq!(update_message.body, "Updated body");
-        assert_eq!(update_message.mentions, Vec::new());
-    });
-
-    // test mentions are updated correctly
-
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        assert_eq!(store.notification_count(), 1);
-        let entry = store.notification_at(0).unwrap();
-        assert!(matches!(
-            entry.notification,
-            Notification::ChannelInvitation { .. }
-        ),);
-    });
-
-    channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.update_message(
-                msg_id,
-                MessageParams {
-                    text: "Updated body including a mention for @user_b".into(),
-                    reply_to_message_id: None,
-                    mentions: vec![(37..45, client_b.id())],
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    channel_chat_a.update(cx_a, |channel_chat, _| {
-        assert_eq!(
-            channel_chat.find_loaded_message(msg_id).unwrap().body,
-            "Updated body including a mention for @user_b",
-        )
-    });
-    channel_chat_b.update(cx_b, |channel_chat, _| {
-        assert_eq!(
-            channel_chat.find_loaded_message(msg_id).unwrap().body,
-            "Updated body including a mention for @user_b",
-        )
-    });
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        assert_eq!(store.notification_count(), 2);
-        let entry = store.notification_at(0).unwrap();
-        assert_eq!(
-            entry.notification,
-            Notification::ChannelMessageMention {
-                message_id: msg_id,
-                sender_id: client_a.id(),
-                channel_id: channel_id.0,
-            }
-        );
-    });
-
-    // Test update message and keep the mention and check that the body is updated correctly
-
-    channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.update_message(
-                msg_id,
-                MessageParams {
-                    text: "Updated body v2 including a mention for @user_b".into(),
-                    reply_to_message_id: None,
-                    mentions: vec![(37..45, client_b.id())],
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    channel_chat_a.update(cx_a, |channel_chat, _| {
-        assert_eq!(
-            channel_chat.find_loaded_message(msg_id).unwrap().body,
-            "Updated body v2 including a mention for @user_b",
-        )
-    });
-    channel_chat_b.update(cx_b, |channel_chat, _| {
-        assert_eq!(
-            channel_chat.find_loaded_message(msg_id).unwrap().body,
-            "Updated body v2 including a mention for @user_b",
-        )
-    });
-
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        let message = store.channel_message_for_id(msg_id);
-        assert!(message.is_some());
-        assert_eq!(
-            message.unwrap().body,
-            "Updated body v2 including a mention for @user_b"
-        );
-        assert_eq!(store.notification_count(), 2);
-        let entry = store.notification_at(0).unwrap();
-        assert_eq!(
-            entry.notification,
-            Notification::ChannelMessageMention {
-                message_id: msg_id,
-                sender_id: client_a.id(),
-                channel_id: channel_id.0,
-            }
-        );
-    });
-
-    // If we remove a mention from a message the corresponding mention notification
-    // should also be removed.
-
-    channel_chat_a
-        .update(cx_a, |c, cx| {
-            c.update_message(
-                msg_id,
-                MessageParams {
-                    text: "Updated body without a mention".into(),
-                    reply_to_message_id: None,
-                    mentions: vec![],
-                },
-                cx,
-            )
-            .unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    channel_chat_a.update(cx_a, |channel_chat, _| {
-        assert_eq!(
-            channel_chat.find_loaded_message(msg_id).unwrap().body,
-            "Updated body without a mention",
-        )
-    });
-    channel_chat_b.update(cx_b, |channel_chat, _| {
-        assert_eq!(
-            channel_chat.find_loaded_message(msg_id).unwrap().body,
-            "Updated body without a mention",
-        )
-    });
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        // First notification is the channel invitation, second would be the mention
-        // notification, which should now be removed.
-        assert_eq!(store.notification_count(), 1);
-    });
-}
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index 46ba3ae496..34e40d767e 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -37,18 +37,15 @@ client.workspace = true
 collections.workspace = true
 db.workspace = true
 editor.workspace = true
-emojis.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
-language.workspace = true
 log.workspace = true
 menu.workspace = true
 notifications.workspace = true
 picker.workspace = true
 project.workspace = true
 release_channel.workspace = true
-rich_text.workspace = true
 rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
deleted file mode 100644
index 8aaf6c0aa2..0000000000
--- a/crates/collab_ui/src/chat_panel.rs
+++ /dev/null
@@ -1,1380 +0,0 @@
-use crate::{ChatPanelButton, ChatPanelSettings, collab_panel};
-use anyhow::Result;
-use call::{ActiveCall, room};
-use channel::{ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId, ChannelStore};
-use client::{ChannelId, Client};
-use collections::HashMap;
-use db::kvp::KEY_VALUE_STORE;
-use editor::{Editor, actions};
-use gpui::{
-    Action, App, AsyncWindowContext, ClipboardItem, Context, CursorStyle, DismissEvent, ElementId,
-    Entity, EventEmitter, FocusHandle, Focusable, FontWeight, HighlightStyle, ListOffset,
-    ListScrollEvent, ListState, Render, Stateful, Subscription, Task, WeakEntity, Window, actions,
-    div, list, prelude::*, px,
-};
-use language::LanguageRegistry;
-use menu::Confirm;
-use message_editor::MessageEditor;
-use project::Fs;
-use rich_text::{Highlight, RichText};
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use std::{sync::Arc, time::Duration};
-use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    Avatar, Button, ContextMenu, IconButton, IconName, KeyBinding, Label, PopoverMenu, Tab, TabBar,
-    Tooltip, prelude::*,
-};
-use util::{ResultExt, TryFutureExt};
-use workspace::{
-    Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-};
-
-mod message_editor;
-
-const MESSAGE_LOADING_THRESHOLD: usize = 50;
-const CHAT_PANEL_KEY: &str = "ChatPanel";
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-            workspace.toggle_panel_focus::<ChatPanel>(window, cx);
-        });
-    })
-    .detach();
-}
-
-pub struct ChatPanel {
-    client: Arc<Client>,
-    channel_store: Entity<ChannelStore>,
-    languages: Arc<LanguageRegistry>,
-    message_list: ListState,
-    active_chat: Option<(Entity<ChannelChat>, Subscription)>,
-    message_editor: Entity<MessageEditor>,
-    local_timezone: UtcOffset,
-    fs: Arc<dyn Fs>,
-    width: Option<Pixels>,
-    active: bool,
-    pending_serialization: Task<Option<()>>,
-    subscriptions: Vec<gpui::Subscription>,
-    is_scrolled_to_bottom: bool,
-    markdown_data: HashMap<ChannelMessageId, RichText>,
-    focus_handle: FocusHandle,
-    open_context_menu: Option<(u64, Subscription)>,
-    highlighted_message: Option<(u64, Task<()>)>,
-    last_acknowledged_message_id: Option<u64>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SerializedChatPanel {
-    width: Option<Pixels>,
-}
-
-actions!(
-    chat_panel,
-    [
-        /// Toggles focus on the chat panel.
-        ToggleFocus
-    ]
-);
-
-impl ChatPanel {
-    pub fn new(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let fs = workspace.app_state().fs.clone();
-        let client = workspace.app_state().client.clone();
-        let channel_store = ChannelStore::global(cx);
-        let user_store = workspace.app_state().user_store.clone();
-        let languages = workspace.app_state().languages.clone();
-
-        let input_editor = cx.new(|cx| {
-            MessageEditor::new(
-                languages.clone(),
-                user_store.clone(),
-                None,
-                cx.new(|cx| Editor::auto_height(1, 4, window, cx)),
-                window,
-                cx,
-            )
-        });
-
-        cx.new(|cx| {
-            let message_list = ListState::new(0, gpui::ListAlignment::Bottom, px(1000.));
-
-            message_list.set_scroll_handler(cx.listener(
-                |this: &mut Self, event: &ListScrollEvent, _, cx| {
-                    if event.visible_range.start < MESSAGE_LOADING_THRESHOLD {
-                        this.load_more_messages(cx);
-                    }
-                    this.is_scrolled_to_bottom = !event.is_scrolled;
-                },
-            ));
-
-            let local_offset = chrono::Local::now().offset().local_minus_utc();
-            let mut this = Self {
-                fs,
-                client,
-                channel_store,
-                languages,
-                message_list,
-                active_chat: Default::default(),
-                pending_serialization: Task::ready(None),
-                message_editor: input_editor,
-                local_timezone: UtcOffset::from_whole_seconds(local_offset).unwrap(),
-                subscriptions: Vec::new(),
-                is_scrolled_to_bottom: true,
-                active: false,
-                width: None,
-                markdown_data: Default::default(),
-                focus_handle: cx.focus_handle(),
-                open_context_menu: None,
-                highlighted_message: None,
-                last_acknowledged_message_id: None,
-            };
-
-            if let Some(channel_id) = ActiveCall::global(cx)
-                .read(cx)
-                .room()
-                .and_then(|room| room.read(cx).channel_id())
-            {
-                this.select_channel(channel_id, None, cx)
-                    .detach_and_log_err(cx);
-            }
-
-            this.subscriptions.push(cx.subscribe(
-                &ActiveCall::global(cx),
-                move |this: &mut Self, call, event: &room::Event, cx| match event {
-                    room::Event::RoomJoined { channel_id } => {
-                        if let Some(channel_id) = channel_id {
-                            this.select_channel(*channel_id, None, cx)
-                                .detach_and_log_err(cx);
-
-                            if call
-                                .read(cx)
-                                .room()
-                                .is_some_and(|room| room.read(cx).contains_guests())
-                            {
-                                cx.emit(PanelEvent::Activate)
-                            }
-                        }
-                    }
-                    room::Event::RoomLeft { channel_id } => {
-                        if channel_id == &this.channel_id(cx) {
-                            cx.emit(PanelEvent::Close)
-                        }
-                    }
-                    _ => {}
-                },
-            ));
-
-            this
-        })
-    }
-
-    pub fn channel_id(&self, cx: &App) -> Option<ChannelId> {
-        self.active_chat
-            .as_ref()
-            .map(|(chat, _)| chat.read(cx).channel_id)
-    }
-
-    pub fn is_scrolled_to_bottom(&self) -> bool {
-        self.is_scrolled_to_bottom
-    }
-
-    pub fn active_chat(&self) -> Option<Entity<ChannelChat>> {
-        self.active_chat.as_ref().map(|(chat, _)| chat.clone())
-    }
-
-    pub fn load(
-        workspace: WeakEntity<Workspace>,
-        cx: AsyncWindowContext,
-    ) -> Task<Result<Entity<Self>>> {
-        cx.spawn(async move |cx| {
-            let serialized_panel = if let Some(panel) = cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(CHAT_PANEL_KEY) })
-                .await
-                .log_err()
-                .flatten()
-            {
-                Some(serde_json::from_str::<SerializedChatPanel>(&panel)?)
-            } else {
-                None
-            };
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let panel = Self::new(workspace, window, cx);
-                if let Some(serialized_panel) = serialized_panel {
-                    panel.update(cx, |panel, cx| {
-                        panel.width = serialized_panel.width.map(|r| r.round());
-                        cx.notify();
-                    });
-                }
-                panel
-            })
-        })
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let width = self.width;
-        self.pending_serialization = cx.background_spawn(
-            async move {
-                KEY_VALUE_STORE
-                    .write_kvp(
-                        CHAT_PANEL_KEY.into(),
-                        serde_json::to_string(&SerializedChatPanel { width })?,
-                    )
-                    .await?;
-                anyhow::Ok(())
-            }
-            .log_err(),
-        );
-    }
-
-    fn set_active_chat(&mut self, chat: Entity<ChannelChat>, cx: &mut Context<Self>) {
-        if self.active_chat.as_ref().map(|e| &e.0) != Some(&chat) {
-            self.markdown_data.clear();
-            self.message_list.reset(chat.read(cx).message_count());
-            self.message_editor.update(cx, |editor, cx| {
-                editor.set_channel_chat(chat.clone(), cx);
-                editor.clear_reply_to_message_id();
-            });
-            let subscription = cx.subscribe(&chat, Self::channel_did_change);
-            self.active_chat = Some((chat, subscription));
-            self.acknowledge_last_message(cx);
-            cx.notify();
-        }
-    }
-
-    fn channel_did_change(
-        &mut self,
-        _: Entity<ChannelChat>,
-        event: &ChannelChatEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ChannelChatEvent::MessagesUpdated {
-                old_range,
-                new_count,
-            } => {
-                self.message_list.splice(old_range.clone(), *new_count);
-                if self.active {
-                    self.acknowledge_last_message(cx);
-                }
-            }
-            ChannelChatEvent::UpdateMessage {
-                message_id,
-                message_ix,
-            } => {
-                self.message_list.splice(*message_ix..*message_ix + 1, 1);
-                self.markdown_data.remove(message_id);
-            }
-            ChannelChatEvent::NewMessage {
-                channel_id,
-                message_id,
-            } => {
-                if !self.active {
-                    self.channel_store.update(cx, |store, cx| {
-                        store.update_latest_message_id(*channel_id, *message_id, cx)
-                    })
-                }
-            }
-        }
-        cx.notify();
-    }
-
-    fn acknowledge_last_message(&mut self, cx: &mut Context<Self>) {
-        if self.active
-            && self.is_scrolled_to_bottom
-            && let Some((chat, _)) = &self.active_chat
-        {
-            if let Some(channel_id) = self.channel_id(cx) {
-                self.last_acknowledged_message_id = self
-                    .channel_store
-                    .read(cx)
-                    .last_acknowledge_message_id(channel_id);
-            }
-
-            chat.update(cx, |chat, cx| {
-                chat.acknowledge_last_message(cx);
-            });
-        }
-    }
-
-    fn render_replied_to_message(
-        &mut self,
-        message_id: Option<ChannelMessageId>,
-        reply_to_message: &Option<ChannelMessage>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let reply_to_message = match reply_to_message {
-            None => {
-                return div().child(
-                    h_flex()
-                        .text_ui_xs(cx)
-                        .my_0p5()
-                        .px_0p5()
-                        .gap_x_1()
-                        .rounded_sm()
-                        .child(Icon::new(IconName::ReplyArrowRight).color(Color::Muted))
-                        .when(reply_to_message.is_none(), |el| {
-                            el.child(
-                                Label::new("Message has been deleted...")
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                        }),
-                );
-            }
-            Some(val) => val,
-        };
-
-        let user_being_replied_to = reply_to_message.sender.clone();
-        let message_being_replied_to = reply_to_message.clone();
-
-        let message_element_id: ElementId = match message_id {
-            Some(ChannelMessageId::Saved(id)) => ("reply-to-saved-message-container", id).into(),
-            Some(ChannelMessageId::Pending(id)) => {
-                ("reply-to-pending-message-container", id).into()
-            } // This should never happen
-            None => ("composing-reply-container").into(),
-        };
-
-        let current_channel_id = self.channel_id(cx);
-        let reply_to_message_id = reply_to_message.id;
-
-        div().child(
-            h_flex()
-                .id(message_element_id)
-                .text_ui_xs(cx)
-                .my_0p5()
-                .px_0p5()
-                .gap_x_1()
-                .rounded_sm()
-                .overflow_hidden()
-                .hover(|style| style.bg(cx.theme().colors().element_background))
-                .child(Icon::new(IconName::ReplyArrowRight).color(Color::Muted))
-                .child(Avatar::new(user_being_replied_to.avatar_uri.clone()).size(rems(0.7)))
-                .child(
-                    Label::new(format!("@{}", user_being_replied_to.github_login))
-                        .size(LabelSize::XSmall)
-                        .weight(FontWeight::SEMIBOLD)
-                        .color(Color::Muted),
-                )
-                .child(
-                    div().overflow_y_hidden().child(
-                        Label::new(message_being_replied_to.body.replace('\n', " "))
-                            .size(LabelSize::XSmall)
-                            .color(Color::Default),
-                    ),
-                )
-                .cursor(CursorStyle::PointingHand)
-                .tooltip(Tooltip::text("Go to message"))
-                .on_click(cx.listener(move |chat_panel, _, _, cx| {
-                    if let Some(channel_id) = current_channel_id {
-                        chat_panel
-                            .select_channel(channel_id, reply_to_message_id.into(), cx)
-                            .detach_and_log_err(cx)
-                    }
-                })),
-        )
-    }
-
-    fn render_message(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let active_chat = &self.active_chat.as_ref().unwrap().0;
-        let (message, is_continuation_from_previous, is_admin) =
-            active_chat.update(cx, |active_chat, cx| {
-                let is_admin = self
-                    .channel_store
-                    .read(cx)
-                    .is_channel_admin(active_chat.channel_id);
-
-                let last_message = active_chat.message(ix.saturating_sub(1));
-                let this_message = active_chat.message(ix).clone();
-
-                let duration_since_last_message = this_message.timestamp - last_message.timestamp;
-                let is_continuation_from_previous = last_message.sender.id
-                    == this_message.sender.id
-                    && last_message.id != this_message.id
-                    && duration_since_last_message < Duration::from_secs(5 * 60);
-
-                if let ChannelMessageId::Saved(id) = this_message.id
-                    && this_message
-                        .mentions
-                        .iter()
-                        .any(|(_, user_id)| Some(*user_id) == self.client.user_id())
-                {
-                    active_chat.acknowledge_message(id);
-                }
-
-                (this_message, is_continuation_from_previous, is_admin)
-            });
-
-        let _is_pending = message.is_pending();
-
-        let belongs_to_user = Some(message.sender.id) == self.client.user_id();
-        let can_delete_message = belongs_to_user || is_admin;
-        let can_edit_message = belongs_to_user;
-
-        let element_id: ElementId = match message.id {
-            ChannelMessageId::Saved(id) => ("saved-message", id).into(),
-            ChannelMessageId::Pending(id) => ("pending-message", id).into(),
-        };
-
-        let mentioning_you = message
-            .mentions
-            .iter()
-            .any(|m| Some(m.1) == self.client.user_id());
-
-        let message_id = match message.id {
-            ChannelMessageId::Saved(id) => Some(id),
-            ChannelMessageId::Pending(_) => None,
-        };
-
-        let reply_to_message = message
-            .reply_to_message_id
-            .and_then(|id| active_chat.read(cx).find_loaded_message(id))
-            .cloned();
-
-        let replied_to_you =
-            reply_to_message.as_ref().map(|m| m.sender.id) == self.client.user_id();
-
-        let is_highlighted_message = self
-            .highlighted_message
-            .as_ref()
-            .is_some_and(|(id, _)| Some(id) == message_id.as_ref());
-        let background = if is_highlighted_message {
-            cx.theme().status().info_background
-        } else if mentioning_you || replied_to_you {
-            cx.theme().colors().background
-        } else {
-            cx.theme().colors().panel_background
-        };
-
-        let reply_to_message_id = self.message_editor.read(cx).reply_to_message_id();
-
-        v_flex()
-            .w_full()
-            .relative()
-            .group("")
-            .when(!is_continuation_from_previous, |this| this.pt_2())
-            .child(
-                div()
-                    .group("")
-                    .bg(background)
-                    .rounded_sm()
-                    .overflow_hidden()
-                    .px_1p5()
-                    .py_0p5()
-                    .when_some(reply_to_message_id, |el, reply_id| {
-                        el.when_some(message_id, |el, message_id| {
-                            el.when(reply_id == message_id, |el| {
-                                el.bg(cx.theme().colors().element_selected)
-                            })
-                        })
-                    })
-                    .when(!self.has_open_menu(message_id), |this| {
-                        this.hover(|style| style.bg(cx.theme().colors().element_hover))
-                    })
-                    .when(message.reply_to_message_id.is_some(), |el| {
-                        el.child(self.render_replied_to_message(
-                            Some(message.id),
-                            &reply_to_message,
-                            cx,
-                        ))
-                        .when(is_continuation_from_previous, |this| this.mt_2())
-                    })
-                    .when(
-                        !is_continuation_from_previous || message.reply_to_message_id.is_some(),
-                        |this| {
-                            this.child(
-                                h_flex()
-                                    .gap_2()
-                                    .text_ui_sm(cx)
-                                    .child(
-                                        Avatar::new(message.sender.avatar_uri.clone())
-                                            .size(rems(1.)),
-                                    )
-                                    .child(
-                                        Label::new(message.sender.github_login.clone())
-                                            .size(LabelSize::Small)
-                                            .weight(FontWeight::BOLD),
-                                    )
-                                    .child(
-                                        Label::new(time_format::format_localized_timestamp(
-                                            message.timestamp,
-                                            OffsetDateTime::now_utc(),
-                                            self.local_timezone,
-                                            time_format::TimestampFormat::EnhancedAbsolute,
-                                        ))
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                    ),
-                            )
-                        },
-                    )
-                    .when(mentioning_you || replied_to_you, |this| this.my_0p5())
-                    .map(|el| {
-                        let text = self.markdown_data.entry(message.id).or_insert_with(|| {
-                            Self::render_markdown_with_mentions(
-                                &self.languages,
-                                self.client.id(),
-                                &message,
-                                self.local_timezone,
-                                cx,
-                            )
-                        });
-                        el.child(
-                            v_flex()
-                                .w_full()
-                                .text_ui_sm(cx)
-                                .id(element_id)
-                                .child(text.element("body".into(), window, cx)),
-                        )
-                        .when(self.has_open_menu(message_id), |el| {
-                            el.bg(cx.theme().colors().element_selected)
-                        })
-                    }),
-            )
-            .when(
-                self.last_acknowledged_message_id
-                    .is_some_and(|l| Some(l) == message_id),
-                |this| {
-                    this.child(
-                        h_flex()
-                            .py_2()
-                            .gap_1()
-                            .items_center()
-                            .child(div().w_full().h_0p5().bg(cx.theme().colors().border))
-                            .child(
-                                div()
-                                    .px_1()
-                                    .rounded_sm()
-                                    .text_ui_xs(cx)
-                                    .bg(cx.theme().colors().background)
-                                    .child("New messages"),
-                            )
-                            .child(div().w_full().h_0p5().bg(cx.theme().colors().border)),
-                    )
-                },
-            )
-            .child(
-                self.render_popover_buttons(message_id, can_delete_message, can_edit_message, cx)
-                    .mt_neg_2p5(),
-            )
-            .into_any_element()
-    }
-
-    fn has_open_menu(&self, message_id: Option<u64>) -> bool {
-        match self.open_context_menu.as_ref() {
-            Some((id, _)) => Some(*id) == message_id,
-            None => false,
-        }
-    }
-
-    fn render_popover_button(&self, cx: &mut Context<Self>, child: Stateful<Div>) -> Div {
-        div()
-            .w_6()
-            .bg(cx.theme().colors().element_background)
-            .hover(|style| style.bg(cx.theme().colors().element_hover).rounded_sm())
-            .child(child)
-    }
-
-    fn render_popover_buttons(
-        &self,
-        message_id: Option<u64>,
-        can_delete_message: bool,
-        can_edit_message: bool,
-        cx: &mut Context<Self>,
-    ) -> Div {
-        h_flex()
-            .absolute()
-            .right_2()
-            .overflow_hidden()
-            .rounded_sm()
-            .border_color(cx.theme().colors().element_selected)
-            .border_1()
-            .when(!self.has_open_menu(message_id), |el| {
-                el.visible_on_hover("")
-            })
-            .bg(cx.theme().colors().element_background)
-            .when_some(message_id, |el, message_id| {
-                el.child(
-                    self.render_popover_button(
-                        cx,
-                        div()
-                            .id("reply")
-                            .child(
-                                IconButton::new(("reply", message_id), IconName::ReplyArrowRight)
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        this.cancel_edit_message(cx);
-
-                                        this.message_editor.update(cx, |editor, cx| {
-                                            editor.set_reply_to_message_id(message_id);
-                                            window.focus(&editor.focus_handle(cx));
-                                        })
-                                    })),
-                            )
-                            .tooltip(Tooltip::text("Reply")),
-                    ),
-                )
-            })
-            .when_some(message_id, |el, message_id| {
-                el.when(can_edit_message, |el| {
-                    el.child(
-                        self.render_popover_button(
-                            cx,
-                            div()
-                                .id("edit")
-                                .child(
-                                    IconButton::new(("edit", message_id), IconName::Pencil)
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            this.message_editor.update(cx, |editor, cx| {
-                                                editor.clear_reply_to_message_id();
-
-                                                let message = this
-                                                    .active_chat()
-                                                    .and_then(|active_chat| {
-                                                        active_chat
-                                                            .read(cx)
-                                                            .find_loaded_message(message_id)
-                                                    })
-                                                    .cloned();
-
-                                                if let Some(message) = message {
-                                                    let buffer = editor
-                                                        .editor
-                                                        .read(cx)
-                                                        .buffer()
-                                                        .read(cx)
-                                                        .as_singleton()
-                                                        .expect("message editor must be singleton");
-
-                                                    buffer.update(cx, |buffer, cx| {
-                                                        buffer.set_text(message.body.clone(), cx)
-                                                    });
-
-                                                    editor.set_edit_message_id(message_id);
-                                                    editor.focus_handle(cx).focus(window);
-                                                }
-                                            })
-                                        })),
-                                )
-                                .tooltip(Tooltip::text("Edit")),
-                        ),
-                    )
-                })
-            })
-            .when_some(message_id, |el, message_id| {
-                let this = cx.entity();
-
-                el.child(
-                    self.render_popover_button(
-                        cx,
-                        div()
-                            .child(
-                                PopoverMenu::new(("menu", message_id))
-                                    .trigger(IconButton::new(
-                                        ("trigger", message_id),
-                                        IconName::Ellipsis,
-                                    ))
-                                    .menu(move |window, cx| {
-                                        Some(Self::render_message_menu(
-                                            &this,
-                                            message_id,
-                                            can_delete_message,
-                                            window,
-                                            cx,
-                                        ))
-                                    }),
-                            )
-                            .id("more")
-                            .tooltip(Tooltip::text("More")),
-                    ),
-                )
-            })
-    }
-
-    fn render_message_menu(
-        this: &Entity<Self>,
-        message_id: u64,
-        can_delete_message: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<ContextMenu> {
-        let menu = {
-            ContextMenu::build(window, cx, move |menu, window, _| {
-                menu.entry(
-                    "Copy message text",
-                    None,
-                    window.handler_for(this, move |this, _, cx| {
-                        if let Some(message) = this.active_chat().and_then(|active_chat| {
-                            active_chat.read(cx).find_loaded_message(message_id)
-                        }) {
-                            let text = message.body.clone();
-                            cx.write_to_clipboard(ClipboardItem::new_string(text))
-                        }
-                    }),
-                )
-                .when(can_delete_message, |menu| {
-                    menu.entry(
-                        "Delete message",
-                        None,
-                        window.handler_for(this, move |this, _, cx| {
-                            this.remove_message(message_id, cx)
-                        }),
-                    )
-                })
-            })
-        };
-        this.update(cx, |this, cx| {
-            let subscription = cx.subscribe_in(
-                &menu,
-                window,
-                |this: &mut Self, _, _: &DismissEvent, _, _| {
-                    this.open_context_menu = None;
-                },
-            );
-            this.open_context_menu = Some((message_id, subscription));
-        });
-        menu
-    }
-
-    fn render_markdown_with_mentions(
-        language_registry: &Arc<LanguageRegistry>,
-        current_user_id: u64,
-        message: &channel::ChannelMessage,
-        local_timezone: UtcOffset,
-        cx: &App,
-    ) -> RichText {
-        let mentions = message
-            .mentions
-            .iter()
-            .map(|(range, user_id)| rich_text::Mention {
-                range: range.clone(),
-                is_self_mention: *user_id == current_user_id,
-            })
-            .collect::<Vec<_>>();
-
-        const MESSAGE_EDITED: &str = " (edited)";
-
-        let mut body = message.body.clone();
-
-        if message.edited_at.is_some() {
-            body.push_str(MESSAGE_EDITED);
-        }
-
-        let mut rich_text = RichText::new(body, &mentions, language_registry);
-
-        if message.edited_at.is_some() {
-            let range = (rich_text.text.len() - MESSAGE_EDITED.len())..rich_text.text.len();
-            rich_text.highlights.push((
-                range.clone(),
-                Highlight::Highlight(HighlightStyle {
-                    color: Some(cx.theme().colors().text_muted),
-                    ..Default::default()
-                }),
-            ));
-
-            if let Some(edit_timestamp) = message.edited_at {
-                let edit_timestamp_text = time_format::format_localized_timestamp(
-                    edit_timestamp,
-                    OffsetDateTime::now_utc(),
-                    local_timezone,
-                    time_format::TimestampFormat::Absolute,
-                );
-
-                rich_text.custom_ranges.push(range);
-                rich_text.set_tooltip_builder_for_custom_ranges(move |_, _, _, cx| {
-                    Some(Tooltip::simple(edit_timestamp_text.clone(), cx))
-                })
-            }
-        }
-        rich_text
-    }
-
-    fn send(&mut self, _: &Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((chat, _)) = self.active_chat.as_ref() {
-            let message = self
-                .message_editor
-                .update(cx, |editor, cx| editor.take_message(window, cx));
-
-            if let Some(id) = self.message_editor.read(cx).edit_message_id() {
-                self.message_editor.update(cx, |editor, _| {
-                    editor.clear_edit_message_id();
-                });
-
-                if let Some(task) = chat
-                    .update(cx, |chat, cx| chat.update_message(id, message, cx))
-                    .log_err()
-                {
-                    task.detach();
-                }
-            } else if let Some(task) = chat
-                .update(cx, |chat, cx| chat.send_message(message, cx))
-                .log_err()
-            {
-                task.detach();
-            }
-        }
-    }
-
-    fn remove_message(&mut self, id: u64, cx: &mut Context<Self>) {
-        if let Some((chat, _)) = self.active_chat.as_ref() {
-            chat.update(cx, |chat, cx| chat.remove_message(id, cx).detach())
-        }
-    }
-
-    fn load_more_messages(&mut self, cx: &mut Context<Self>) {
-        if let Some((chat, _)) = self.active_chat.as_ref() {
-            chat.update(cx, |channel, cx| {
-                if let Some(task) = channel.load_more_messages(cx) {
-                    task.detach();
-                }
-            })
-        }
-    }
-
-    pub fn select_channel(
-        &mut self,
-        selected_channel_id: ChannelId,
-        scroll_to_message_id: Option<u64>,
-        cx: &mut Context<ChatPanel>,
-    ) -> Task<Result<()>> {
-        let open_chat = self
-            .active_chat
-            .as_ref()
-            .and_then(|(chat, _)| {
-                (chat.read(cx).channel_id == selected_channel_id)
-                    .then(|| Task::ready(anyhow::Ok(chat.clone())))
-            })
-            .unwrap_or_else(|| {
-                self.channel_store.update(cx, |store, cx| {
-                    store.open_channel_chat(selected_channel_id, cx)
-                })
-            });
-
-        cx.spawn(async move |this, cx| {
-            let chat = open_chat.await?;
-            let highlight_message_id = scroll_to_message_id;
-            let scroll_to_message_id = this.update(cx, |this, cx| {
-                this.set_active_chat(chat.clone(), cx);
-
-                scroll_to_message_id.or(this.last_acknowledged_message_id)
-            })?;
-
-            if let Some(message_id) = scroll_to_message_id
-                && let Some(item_ix) =
-                    ChannelChat::load_history_since_message(chat.clone(), message_id, cx.clone())
-                        .await
-            {
-                this.update(cx, |this, cx| {
-                    if let Some(highlight_message_id) = highlight_message_id {
-                        let task = cx.spawn(async move |this, cx| {
-                            cx.background_executor().timer(Duration::from_secs(2)).await;
-                            this.update(cx, |this, cx| {
-                                this.highlighted_message.take();
-                                cx.notify();
-                            })
-                            .ok();
-                        });
-
-                        this.highlighted_message = Some((highlight_message_id, task));
-                    }
-
-                    if this.active_chat.as_ref().is_some_and(|(c, _)| *c == chat) {
-                        this.message_list.scroll_to(ListOffset {
-                            item_ix,
-                            offset_in_item: px(0.0),
-                        });
-                        cx.notify();
-                    }
-                })?;
-            }
-
-            Ok(())
-        })
-    }
-
-    fn close_reply_preview(&mut self, cx: &mut Context<Self>) {
-        self.message_editor
-            .update(cx, |editor, _| editor.clear_reply_to_message_id());
-    }
-
-    fn cancel_edit_message(&mut self, cx: &mut Context<Self>) {
-        self.message_editor.update(cx, |editor, cx| {
-            // only clear the editor input if we were editing a message
-            if editor.edit_message_id().is_none() {
-                return;
-            }
-
-            editor.clear_edit_message_id();
-
-            let buffer = editor
-                .editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("message editor must be singleton");
-
-            buffer.update(cx, |buffer, cx| buffer.set_text("", cx));
-        });
-    }
-}
-
-impl Render for ChatPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let channel_id = self
-            .active_chat
-            .as_ref()
-            .map(|(c, _)| c.read(cx).channel_id);
-        let message_editor = self.message_editor.read(cx);
-
-        let reply_to_message_id = message_editor.reply_to_message_id();
-        let edit_message_id = message_editor.edit_message_id();
-
-        v_flex()
-            .key_context("ChatPanel")
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .on_action(cx.listener(Self::send))
-            .child(
-                h_flex().child(
-                    TabBar::new("chat_header").child(
-                        h_flex()
-                            .w_full()
-                            .h(Tab::container_height(cx))
-                            .px_2()
-                            .child(Label::new(
-                                self.active_chat
-                                    .as_ref()
-                                    .and_then(|c| {
-                                        Some(format!("#{}", c.0.read(cx).channel(cx)?.name))
-                                    })
-                                    .unwrap_or("Chat".to_string()),
-                            )),
-                    ),
-                ),
-            )
-            .child(div().flex_grow().px_2().map(|this| {
-                if self.active_chat.is_some() {
-                    this.child(
-                        list(
-                            self.message_list.clone(),
-                            cx.processor(Self::render_message),
-                        )
-                        .size_full(),
-                    )
-                } else {
-                    this.child(
-                        div()
-                            .size_full()
-                            .p_4()
-                            .child(
-                                Label::new("Select a channel to chat in.")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                div().pt_1().w_full().items_center().child(
-                                    Button::new("toggle-collab", "Open")
-                                        .full_width()
-                                        .key_binding(KeyBinding::for_action(
-                                            &collab_panel::ToggleFocus,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(|_, window, cx| {
-                                            window.dispatch_action(
-                                                collab_panel::ToggleFocus.boxed_clone(),
-                                                cx,
-                                            )
-                                        }),
-                                ),
-                            ),
-                    )
-                }
-            }))
-            .when(!self.is_scrolled_to_bottom, |el| {
-                el.child(div().border_t_1().border_color(cx.theme().colors().border))
-            })
-            .when_some(edit_message_id, |el, _| {
-                el.child(
-                    h_flex()
-                        .px_2()
-                        .text_ui_xs(cx)
-                        .justify_between()
-                        .border_t_1()
-                        .border_color(cx.theme().colors().border)
-                        .bg(cx.theme().colors().background)
-                        .child("Editing message")
-                        .child(
-                            IconButton::new("cancel-edit-message", IconName::Close)
-                                .shape(ui::IconButtonShape::Square)
-                                .tooltip(Tooltip::text("Cancel edit message"))
-                                .on_click(cx.listener(move |this, _, _, cx| {
-                                    this.cancel_edit_message(cx);
-                                })),
-                        ),
-                )
-            })
-            .when_some(reply_to_message_id, |el, reply_to_message_id| {
-                let reply_message = self
-                    .active_chat()
-                    .and_then(|active_chat| {
-                        active_chat
-                            .read(cx)
-                            .find_loaded_message(reply_to_message_id)
-                    })
-                    .cloned();
-
-                el.when_some(reply_message, |el, reply_message| {
-                    let user_being_replied_to = reply_message.sender;
-
-                    el.child(
-                        h_flex()
-                            .when(!self.is_scrolled_to_bottom, |el| {
-                                el.border_t_1().border_color(cx.theme().colors().border)
-                            })
-                            .justify_between()
-                            .overflow_hidden()
-                            .items_start()
-                            .py_1()
-                            .px_2()
-                            .bg(cx.theme().colors().background)
-                            .child(
-                                div().flex_shrink().overflow_hidden().child(
-                                    h_flex()
-                                        .id(("reply-preview", reply_to_message_id))
-                                        .child(Label::new("Replying to ").size(LabelSize::Small))
-                                        .child(
-                                            Label::new(format!(
-                                                "@{}",
-                                                user_being_replied_to.github_login
-                                            ))
-                                            .size(LabelSize::Small)
-                                            .weight(FontWeight::BOLD),
-                                        )
-                                        .when_some(channel_id, |this, channel_id| {
-                                            this.cursor_pointer().on_click(cx.listener(
-                                                move |chat_panel, _, _, cx| {
-                                                    chat_panel
-                                                        .select_channel(
-                                                            channel_id,
-                                                            reply_to_message_id.into(),
-                                                            cx,
-                                                        )
-                                                        .detach_and_log_err(cx)
-                                                },
-                                            ))
-                                        }),
-                                ),
-                            )
-                            .child(
-                                IconButton::new("close-reply-preview", IconName::Close)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .tooltip(Tooltip::text("Close reply"))
-                                    .on_click(cx.listener(move |this, _, _, cx| {
-                                        this.close_reply_preview(cx);
-                                    })),
-                            ),
-                    )
-                })
-            })
-            .children(
-                Some(
-                    h_flex()
-                        .p_2()
-                        .on_action(cx.listener(|this, _: &actions::Cancel, _, cx| {
-                            this.cancel_edit_message(cx);
-                            this.close_reply_preview(cx);
-                        }))
-                        .map(|el| el.child(self.message_editor.clone())),
-                )
-                .filter(|_| self.active_chat.is_some()),
-            )
-            .into_any()
-    }
-}
-
-impl Focusable for ChatPanel {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        if self.active_chat.is_some() {
-            self.message_editor.read(cx).focus_handle(cx)
-        } else {
-            self.focus_handle.clone()
-        }
-    }
-}
-
-impl Panel for ChatPanel {
-    fn position(&self, _: &Window, cx: &App) -> DockPosition {
-        ChatPanelSettings::get_global(cx).dock
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        matches!(position, DockPosition::Left | DockPosition::Right)
-    }
-
-    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file::<ChatPanelSettings>(
-            self.fs.clone(),
-            cx,
-            move |settings, _| settings.dock = Some(position),
-        );
-    }
-
-    fn size(&self, _: &Window, cx: &App) -> Pixels {
-        self.width
-            .unwrap_or_else(|| ChatPanelSettings::get_global(cx).default_width)
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
-        self.width = size;
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn set_active(&mut self, active: bool, _: &mut Window, cx: &mut Context<Self>) {
-        self.active = active;
-        if active {
-            self.acknowledge_last_message(cx);
-        }
-    }
-
-    fn persistent_name() -> &'static str {
-        "ChatPanel"
-    }
-
-    fn icon(&self, _window: &Window, cx: &App) -> Option<ui::IconName> {
-        self.enabled(cx).then(|| ui::IconName::Chat)
-    }
-
-    fn icon_tooltip(&self, _: &Window, _: &App) -> Option<&'static str> {
-        Some("Chat Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn gpui::Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn starts_open(&self, _: &Window, cx: &App) -> bool {
-        ActiveCall::global(cx)
-            .read(cx)
-            .room()
-            .is_some_and(|room| room.read(cx).contains_guests())
-    }
-
-    fn activation_priority(&self) -> u32 {
-        7
-    }
-
-    fn enabled(&self, cx: &App) -> bool {
-        match ChatPanelSettings::get_global(cx).button {
-            ChatPanelButton::Never => false,
-            ChatPanelButton::Always => true,
-            ChatPanelButton::WhenInCall => {
-                let is_in_call = ActiveCall::global(cx)
-                    .read(cx)
-                    .room()
-                    .is_some_and(|room| room.read(cx).contains_guests());
-
-                self.active || is_in_call
-            }
-        }
-    }
-}
-
-impl EventEmitter<PanelEvent> for ChatPanel {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::HighlightStyle;
-    use pretty_assertions::assert_eq;
-    use rich_text::Highlight;
-    use time::OffsetDateTime;
-    use util::test::marked_text_ranges;
-
-    #[gpui::test]
-    fn test_render_markdown_with_mentions(cx: &mut App) {
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        let (body, ranges) = marked_text_ranges("*hi*, «@abc», let's **call** «@fgh»", false);
-        let message = channel::ChannelMessage {
-            id: ChannelMessageId::Saved(0),
-            body,
-            timestamp: OffsetDateTime::now_utc(),
-            sender: Arc::new(client::User {
-                github_login: "fgh".into(),
-                avatar_uri: "avatar_fgh".into(),
-                id: 103,
-                name: None,
-            }),
-            nonce: 5,
-            mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
-            reply_to_message_id: None,
-            edited_at: None,
-        };
-
-        let message = ChatPanel::render_markdown_with_mentions(
-            &language_registry,
-            102,
-            &message,
-            UtcOffset::UTC,
-            cx,
-        );
-
-        // Note that the "'" was replaced with ’ due to smart punctuation.
-        let (body, ranges) = marked_text_ranges("«hi», «@abc», let’s «call» «@fgh»", false);
-        assert_eq!(message.text, body);
-        assert_eq!(
-            message.highlights,
-            vec![
-                (
-                    ranges[0].clone(),
-                    HighlightStyle {
-                        font_style: Some(gpui::FontStyle::Italic),
-                        ..Default::default()
-                    }
-                    .into()
-                ),
-                (ranges[1].clone(), Highlight::Mention),
-                (
-                    ranges[2].clone(),
-                    HighlightStyle {
-                        font_weight: Some(gpui::FontWeight::BOLD),
-                        ..Default::default()
-                    }
-                    .into()
-                ),
-                (ranges[3].clone(), Highlight::SelfMention)
-            ]
-        );
-    }
-
-    #[gpui::test]
-    fn test_render_markdown_with_auto_detect_links(cx: &mut App) {
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        let message = channel::ChannelMessage {
-            id: ChannelMessageId::Saved(0),
-            body: "Here is a link https://zed.dev to zeds website".to_string(),
-            timestamp: OffsetDateTime::now_utc(),
-            sender: Arc::new(client::User {
-                github_login: "fgh".into(),
-                avatar_uri: "avatar_fgh".into(),
-                id: 103,
-                name: None,
-            }),
-            nonce: 5,
-            mentions: Vec::new(),
-            reply_to_message_id: None,
-            edited_at: None,
-        };
-
-        let message = ChatPanel::render_markdown_with_mentions(
-            &language_registry,
-            102,
-            &message,
-            UtcOffset::UTC,
-            cx,
-        );
-
-        // Note that the "'" was replaced with ’ due to smart punctuation.
-        let (body, ranges) =
-            marked_text_ranges("Here is a link «https://zed.dev» to zeds website", false);
-        assert_eq!(message.text, body);
-        assert_eq!(1, ranges.len());
-        assert_eq!(
-            message.highlights,
-            vec![(
-                ranges[0].clone(),
-                HighlightStyle {
-                    underline: Some(gpui::UnderlineStyle {
-                        thickness: 1.0.into(),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                }
-                .into()
-            ),]
-        );
-    }
-
-    #[gpui::test]
-    fn test_render_markdown_with_auto_detect_links_and_additional_formatting(cx: &mut App) {
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        let message = channel::ChannelMessage {
-            id: ChannelMessageId::Saved(0),
-            body: "**Here is a link https://zed.dev to zeds website**".to_string(),
-            timestamp: OffsetDateTime::now_utc(),
-            sender: Arc::new(client::User {
-                github_login: "fgh".into(),
-                avatar_uri: "avatar_fgh".into(),
-                id: 103,
-                name: None,
-            }),
-            nonce: 5,
-            mentions: Vec::new(),
-            reply_to_message_id: None,
-            edited_at: None,
-        };
-
-        let message = ChatPanel::render_markdown_with_mentions(
-            &language_registry,
-            102,
-            &message,
-            UtcOffset::UTC,
-            cx,
-        );
-
-        // Note that the "'" was replaced with ’ due to smart punctuation.
-        let (body, ranges) = marked_text_ranges(
-            "«Here is a link »«https://zed.dev»« to zeds website»",
-            false,
-        );
-        assert_eq!(message.text, body);
-        assert_eq!(3, ranges.len());
-        assert_eq!(
-            message.highlights,
-            vec![
-                (
-                    ranges[0].clone(),
-                    HighlightStyle {
-                        font_weight: Some(gpui::FontWeight::BOLD),
-                        ..Default::default()
-                    }
-                    .into()
-                ),
-                (
-                    ranges[1].clone(),
-                    HighlightStyle {
-                        font_weight: Some(gpui::FontWeight::BOLD),
-                        underline: Some(gpui::UnderlineStyle {
-                            thickness: 1.0.into(),
-                            ..Default::default()
-                        }),
-                        ..Default::default()
-                    }
-                    .into()
-                ),
-                (
-                    ranges[2].clone(),
-                    HighlightStyle {
-                        font_weight: Some(gpui::FontWeight::BOLD),
-                        ..Default::default()
-                    }
-                    .into()
-                ),
-            ]
-        );
-    }
-}
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
deleted file mode 100644
index 3864ca69d8..0000000000
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ /dev/null
@@ -1,548 +0,0 @@
-use anyhow::{Context as _, Result};
-use channel::{ChannelChat, ChannelStore, MessageParams};
-use client::{UserId, UserStore};
-use collections::HashSet;
-use editor::{AnchorRangeExt, CompletionProvider, Editor, EditorElement, EditorStyle, ExcerptId};
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    AsyncApp, AsyncWindowContext, Context, Entity, Focusable, FontStyle, FontWeight,
-    HighlightStyle, IntoElement, Render, Task, TextStyle, WeakEntity, Window,
-};
-use language::{
-    Anchor, Buffer, BufferSnapshot, CodeLabel, LanguageRegistry, ToOffset,
-    language_settings::SoftWrap,
-};
-use project::{
-    Completion, CompletionDisplayOptions, CompletionResponse, CompletionSource, search::SearchQuery,
-};
-use settings::Settings;
-use std::{
-    ops::Range,
-    rc::Rc,
-    sync::{Arc, LazyLock},
-    time::Duration,
-};
-use theme::ThemeSettings;
-use ui::{TextSize, prelude::*};
-
-use crate::panel_settings::MessageEditorSettings;
-
-const MENTIONS_DEBOUNCE_INTERVAL: Duration = Duration::from_millis(50);
-
-static MENTIONS_SEARCH: LazyLock<SearchQuery> = LazyLock::new(|| {
-    SearchQuery::regex(
-        "@[-_\\w]+",
-        false,
-        false,
-        false,
-        false,
-        Default::default(),
-        Default::default(),
-        false,
-        None,
-    )
-    .unwrap()
-});
-
-pub struct MessageEditor {
-    pub editor: Entity<Editor>,
-    user_store: Entity<UserStore>,
-    channel_chat: Option<Entity<ChannelChat>>,
-    mentions: Vec<UserId>,
-    mentions_task: Option<Task<()>>,
-    reply_to_message_id: Option<u64>,
-    edit_message_id: Option<u64>,
-}
-
-struct MessageEditorCompletionProvider(WeakEntity<MessageEditor>);
-
-impl CompletionProvider for MessageEditorCompletionProvider {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        _: editor::CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let Some(handle) = self.0.upgrade() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-        handle.update(cx, |message_editor, cx| {
-            message_editor.completions(buffer, buffer_position, cx)
-        })
-    }
-
-    fn is_completion_trigger(
-        &self,
-        _buffer: &Entity<Buffer>,
-        _position: language::Anchor,
-        text: &str,
-        _trigger_in_words: bool,
-        _menu_is_open: bool,
-        _cx: &mut Context<Editor>,
-    ) -> bool {
-        text == "@"
-    }
-}
-
-impl MessageEditor {
-    pub fn new(
-        language_registry: Arc<LanguageRegistry>,
-        user_store: Entity<UserStore>,
-        channel_chat: Option<Entity<ChannelChat>>,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let this = cx.entity().downgrade();
-        editor.update(cx, |editor, cx| {
-            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
-            editor.set_offset_content(false, cx);
-            editor.set_use_autoclose(false);
-            editor.set_show_gutter(false, cx);
-            editor.set_show_wrap_guides(false, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_completion_provider(Some(Rc::new(MessageEditorCompletionProvider(this))));
-            editor.set_auto_replace_emoji_shortcode(
-                MessageEditorSettings::get_global(cx)
-                    .auto_replace_emoji_shortcode
-                    .unwrap_or_default(),
-            );
-        });
-
-        let buffer = editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .expect("message editor must be singleton");
-
-        cx.subscribe_in(&buffer, window, Self::on_buffer_event)
-            .detach();
-        cx.observe_global::<settings::SettingsStore>(|this, cx| {
-            this.editor.update(cx, |editor, cx| {
-                editor.set_auto_replace_emoji_shortcode(
-                    MessageEditorSettings::get_global(cx)
-                        .auto_replace_emoji_shortcode
-                        .unwrap_or_default(),
-                )
-            })
-        })
-        .detach();
-
-        let markdown = language_registry.language_for_name("Markdown");
-        cx.spawn_in(window, async move |_, cx| {
-            let markdown = markdown.await.context("failed to load Markdown language")?;
-            buffer.update(cx, |buffer, cx| buffer.set_language(Some(markdown), cx))
-        })
-        .detach_and_log_err(cx);
-
-        Self {
-            editor,
-            user_store,
-            channel_chat,
-            mentions: Vec::new(),
-            mentions_task: None,
-            reply_to_message_id: None,
-            edit_message_id: None,
-        }
-    }
-
-    pub fn reply_to_message_id(&self) -> Option<u64> {
-        self.reply_to_message_id
-    }
-
-    pub fn set_reply_to_message_id(&mut self, reply_to_message_id: u64) {
-        self.reply_to_message_id = Some(reply_to_message_id);
-    }
-
-    pub fn clear_reply_to_message_id(&mut self) {
-        self.reply_to_message_id = None;
-    }
-
-    pub fn edit_message_id(&self) -> Option<u64> {
-        self.edit_message_id
-    }
-
-    pub fn set_edit_message_id(&mut self, edit_message_id: u64) {
-        self.edit_message_id = Some(edit_message_id);
-    }
-
-    pub fn clear_edit_message_id(&mut self) {
-        self.edit_message_id = None;
-    }
-
-    pub fn set_channel_chat(&mut self, chat: Entity<ChannelChat>, cx: &mut Context<Self>) {
-        let channel_id = chat.read(cx).channel_id;
-        self.channel_chat = Some(chat);
-        let channel_name = ChannelStore::global(cx)
-            .read(cx)
-            .channel_for_id(channel_id)
-            .map(|channel| channel.name.clone());
-        self.editor.update(cx, |editor, cx| {
-            if let Some(channel_name) = channel_name {
-                editor.set_placeholder_text(format!("Message #{channel_name}"), cx);
-            } else {
-                editor.set_placeholder_text("Message Channel", cx);
-            }
-        });
-    }
-
-    pub fn take_message(&mut self, window: &mut Window, cx: &mut Context<Self>) -> MessageParams {
-        self.editor.update(cx, |editor, cx| {
-            let highlights = editor.text_highlights::<Self>(cx);
-            let text = editor.text(cx);
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let mentions = if let Some((_, ranges)) = highlights {
-                ranges
-                    .iter()
-                    .map(|range| range.to_offset(&snapshot))
-                    .zip(self.mentions.iter().copied())
-                    .collect()
-            } else {
-                Vec::new()
-            };
-
-            editor.clear(window, cx);
-            self.mentions.clear();
-            let reply_to_message_id = std::mem::take(&mut self.reply_to_message_id);
-
-            MessageParams {
-                text,
-                mentions,
-                reply_to_message_id,
-            }
-        })
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        event: &language::BufferEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let language::BufferEvent::Reparsed | language::BufferEvent::Edited = event {
-            let buffer = buffer.read(cx).snapshot();
-            self.mentions_task = Some(cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor()
-                    .timer(MENTIONS_DEBOUNCE_INTERVAL)
-                    .await;
-                Self::find_mentions(this, buffer, cx).await;
-            }));
-        }
-    }
-
-    fn completions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        end_anchor: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        if let Some((start_anchor, query, candidates)) =
-            self.collect_mention_candidates(buffer, end_anchor, cx)
-            && !candidates.is_empty()
-        {
-            return cx.spawn(async move |_, cx| {
-                let completion_response = Self::completions_for_candidates(
-                    cx,
-                    query.as_str(),
-                    &candidates,
-                    start_anchor..end_anchor,
-                    Self::completion_for_mention,
-                )
-                .await;
-                Ok(vec![completion_response])
-            });
-        }
-
-        if let Some((start_anchor, query, candidates)) =
-            self.collect_emoji_candidates(buffer, end_anchor, cx)
-            && !candidates.is_empty()
-        {
-            return cx.spawn(async move |_, cx| {
-                let completion_response = Self::completions_for_candidates(
-                    cx,
-                    query.as_str(),
-                    candidates,
-                    start_anchor..end_anchor,
-                    Self::completion_for_emoji,
-                )
-                .await;
-                Ok(vec![completion_response])
-            });
-        }
-
-        Task::ready(Ok(vec![CompletionResponse {
-            completions: Vec::new(),
-            display_options: CompletionDisplayOptions::default(),
-            is_incomplete: false,
-        }]))
-    }
-
-    async fn completions_for_candidates(
-        cx: &AsyncApp,
-        query: &str,
-        candidates: &[StringMatchCandidate],
-        range: Range<Anchor>,
-        completion_fn: impl Fn(&StringMatch) -> (String, CodeLabel),
-    ) -> CompletionResponse {
-        const LIMIT: usize = 10;
-        let matches = fuzzy::match_strings(
-            candidates,
-            query,
-            true,
-            true,
-            LIMIT,
-            &Default::default(),
-            cx.background_executor().clone(),
-        )
-        .await;
-
-        let completions = matches
-            .into_iter()
-            .map(|mat| {
-                let (new_text, label) = completion_fn(&mat);
-                Completion {
-                    replace_range: range.clone(),
-                    new_text,
-                    label,
-                    icon_path: None,
-                    confirm: None,
-                    documentation: None,
-                    insert_text_mode: None,
-                    source: CompletionSource::Custom,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        CompletionResponse {
-            is_incomplete: completions.len() >= LIMIT,
-            display_options: CompletionDisplayOptions::default(),
-            completions,
-        }
-    }
-
-    fn completion_for_mention(mat: &StringMatch) -> (String, CodeLabel) {
-        let label = CodeLabel {
-            filter_range: 1..mat.string.len() + 1,
-            text: format!("@{}", mat.string),
-            runs: Vec::new(),
-        };
-        (mat.string.clone(), label)
-    }
-
-    fn completion_for_emoji(mat: &StringMatch) -> (String, CodeLabel) {
-        let emoji = emojis::get_by_shortcode(&mat.string).unwrap();
-        let label = CodeLabel {
-            filter_range: 1..mat.string.len() + 1,
-            text: format!(":{}: {}", mat.string, emoji),
-            runs: Vec::new(),
-        };
-        (emoji.to_string(), label)
-    }
-
-    fn collect_mention_candidates(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        end_anchor: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<(Anchor, String, Vec<StringMatchCandidate>)> {
-        let end_offset = end_anchor.to_offset(buffer.read(cx));
-
-        let query = buffer.read_with(cx, |buffer, _| {
-            let mut query = String::new();
-            for ch in buffer.reversed_chars_at(end_offset).take(100) {
-                if ch == '@' {
-                    return Some(query.chars().rev().collect::<String>());
-                }
-                if ch.is_whitespace() || !ch.is_ascii() {
-                    break;
-                }
-                query.push(ch);
-            }
-            None
-        })?;
-
-        let start_offset = end_offset - query.len();
-        let start_anchor = buffer.read(cx).anchor_before(start_offset);
-
-        let mut names = HashSet::default();
-        if let Some(chat) = self.channel_chat.as_ref() {
-            let chat = chat.read(cx);
-            for participant in ChannelStore::global(cx)
-                .read(cx)
-                .channel_participants(chat.channel_id)
-            {
-                names.insert(participant.github_login.clone());
-            }
-            for message in chat
-                .messages_in_range(chat.message_count().saturating_sub(100)..chat.message_count())
-            {
-                names.insert(message.sender.github_login.clone());
-            }
-        }
-
-        let candidates = names
-            .into_iter()
-            .map(|user| StringMatchCandidate::new(0, &user))
-            .collect::<Vec<_>>();
-
-        Some((start_anchor, query, candidates))
-    }
-
-    fn collect_emoji_candidates(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        end_anchor: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<(Anchor, String, &'static [StringMatchCandidate])> {
-        static EMOJI_FUZZY_MATCH_CANDIDATES: LazyLock<Vec<StringMatchCandidate>> =
-            LazyLock::new(|| {
-                emojis::iter()
-                    .flat_map(|s| s.shortcodes())
-                    .map(|emoji| StringMatchCandidate::new(0, emoji))
-                    .collect::<Vec<_>>()
-            });
-
-        let end_offset = end_anchor.to_offset(buffer.read(cx));
-
-        let query = buffer.read_with(cx, |buffer, _| {
-            let mut query = String::new();
-            for ch in buffer.reversed_chars_at(end_offset).take(100) {
-                if ch == ':' {
-                    let next_char = buffer
-                        .reversed_chars_at(end_offset - query.len() - 1)
-                        .next();
-                    // Ensure we are at the start of the message or that the previous character is a whitespace
-                    if next_char.is_none() || next_char.unwrap().is_whitespace() {
-                        return Some(query.chars().rev().collect::<String>());
-                    }
-
-                    // If the previous character is not a whitespace, we are in the middle of a word
-                    // and we only want to complete the shortcode if the word is made up of other emojis
-                    let mut containing_word = String::new();
-                    for ch in buffer
-                        .reversed_chars_at(end_offset - query.len() - 1)
-                        .take(100)
-                    {
-                        if ch.is_whitespace() {
-                            break;
-                        }
-                        containing_word.push(ch);
-                    }
-                    let containing_word = containing_word.chars().rev().collect::<String>();
-                    if util::word_consists_of_emojis(containing_word.as_str()) {
-                        return Some(query.chars().rev().collect::<String>());
-                    }
-                    break;
-                }
-                if ch.is_whitespace() || !ch.is_ascii() {
-                    break;
-                }
-                query.push(ch);
-            }
-            None
-        })?;
-
-        let start_offset = end_offset - query.len() - 1;
-        let start_anchor = buffer.read(cx).anchor_before(start_offset);
-
-        Some((start_anchor, query, &EMOJI_FUZZY_MATCH_CANDIDATES))
-    }
-
-    async fn find_mentions(
-        this: WeakEntity<MessageEditor>,
-        buffer: BufferSnapshot,
-        cx: &mut AsyncWindowContext,
-    ) {
-        let (buffer, ranges) = cx
-            .background_spawn(async move {
-                let ranges = MENTIONS_SEARCH.search(&buffer, None).await;
-                (buffer, ranges)
-            })
-            .await;
-
-        this.update(cx, |this, cx| {
-            let mut anchor_ranges = Vec::new();
-            let mut mentioned_user_ids = Vec::new();
-            let mut text = String::new();
-
-            this.editor.update(cx, |editor, cx| {
-                let multi_buffer = editor.buffer().read(cx).snapshot(cx);
-                for range in ranges {
-                    text.clear();
-                    text.extend(buffer.text_for_range(range.clone()));
-                    if let Some(username) = text.strip_prefix('@')
-                        && let Some(user) = this
-                            .user_store
-                            .read(cx)
-                            .cached_user_by_github_login(username)
-                    {
-                        let start = multi_buffer.anchor_after(range.start);
-                        let end = multi_buffer.anchor_after(range.end);
-
-                        mentioned_user_ids.push(user.id);
-                        anchor_ranges.push(start..end);
-                    }
-                }
-
-                editor.clear_highlights::<Self>(cx);
-                editor.highlight_text::<Self>(
-                    anchor_ranges,
-                    HighlightStyle {
-                        font_weight: Some(FontWeight::BOLD),
-                        ..Default::default()
-                    },
-                    cx,
-                )
-            });
-
-            this.mentions = mentioned_user_ids;
-            this.mentions_task.take();
-        })
-        .ok();
-    }
-
-    pub(crate) fn focus_handle(&self, cx: &gpui::App) -> gpui::FocusHandle {
-        self.editor.read(cx).focus_handle(cx)
-    }
-}
-
-impl Render for MessageEditor {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: if self.editor.read(cx).read_only(cx) {
-                cx.theme().colors().text_disabled
-            } else {
-                cx.theme().colors().text
-            },
-            font_family: settings.ui_font.family.clone(),
-            font_features: settings.ui_font.features.clone(),
-            font_fallbacks: settings.ui_font.fallbacks.clone(),
-            font_size: TextSize::Small.rems(cx).into(),
-            font_weight: settings.ui_font.weight,
-            font_style: FontStyle::Normal,
-            line_height: relative(1.3),
-            ..Default::default()
-        };
-
-        div()
-            .w_full()
-            .px_2()
-            .py_1()
-            .bg(cx.theme().colors().editor_background)
-            .rounded_sm()
-            .child(EditorElement::new(
-                &self.editor,
-                EditorStyle {
-                    local_player: cx.theme().players().local(),
-                    text: text_style,
-                    ..Default::default()
-                },
-            ))
-    }
-}
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 9009654294..b9ef535f1d 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2,7 +2,7 @@ mod channel_modal;
 mod contact_finder;
 
 use self::channel_modal::ChannelModal;
-use crate::{CollaborationPanelSettings, channel_view::ChannelView, chat_panel::ChatPanel};
+use crate::{CollaborationPanelSettings, channel_view::ChannelView};
 use anyhow::Context as _;
 use call::ActiveCall;
 use channel::{Channel, ChannelEvent, ChannelStore};
@@ -38,7 +38,7 @@ use util::{ResultExt, TryFutureExt, maybe};
 use workspace::{
     Deafen, LeaveCall, Mute, OpenChannelNotes, ScreenShare, ShareProject, Workspace,
     dock::{DockPosition, Panel, PanelEvent},
-    notifications::{DetachAndPromptErr, NotifyResultExt, NotifyTaskExt},
+    notifications::{DetachAndPromptErr, NotifyResultExt},
 };
 
 actions!(
@@ -261,9 +261,6 @@ enum ListEntry {
     ChannelNotes {
         channel_id: ChannelId,
     },
-    ChannelChat {
-        channel_id: ChannelId,
-    },
     ChannelEditor {
         depth: usize,
     },
@@ -495,7 +492,6 @@ impl CollabPanel {
                     && let Some(channel_id) = room.channel_id()
                 {
                     self.entries.push(ListEntry::ChannelNotes { channel_id });
-                    self.entries.push(ListEntry::ChannelChat { channel_id });
                 }
 
                 // Populate the active user.
@@ -1089,39 +1085,6 @@ impl CollabPanel {
             .tooltip(Tooltip::text("Open Channel Notes"))
     }
 
-    fn render_channel_chat(
-        &self,
-        channel_id: ChannelId,
-        is_selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let channel_store = self.channel_store.read(cx);
-        let has_messages_notification = channel_store.has_new_messages(channel_id);
-        ListItem::new("channel-chat")
-            .toggle_state(is_selected)
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.join_channel_chat(channel_id, window, cx);
-            }))
-            .start_slot(
-                h_flex()
-                    .relative()
-                    .gap_1()
-                    .child(render_tree_branch(false, false, window, cx))
-                    .child(IconButton::new(0, IconName::Chat))
-                    .children(has_messages_notification.then(|| {
-                        div()
-                            .w_1p5()
-                            .absolute()
-                            .right(px(2.))
-                            .top(px(4.))
-                            .child(Indicator::dot().color(Color::Info))
-                    })),
-            )
-            .child(Label::new("chat"))
-            .tooltip(Tooltip::text("Open Chat"))
-    }
-
     fn has_subchannels(&self, ix: usize) -> bool {
         self.entries.get(ix).is_some_and(|entry| {
             if let ListEntry::Channel { has_children, .. } = entry {
@@ -1296,13 +1259,6 @@ impl CollabPanel {
                         this.open_channel_notes(channel_id, window, cx)
                     }),
                 )
-                .entry(
-                    "Open Chat",
-                    None,
-                    window.handler_for(&this, move |this, window, cx| {
-                        this.join_channel_chat(channel_id, window, cx)
-                    }),
-                )
                 .entry(
                     "Copy Channel Link",
                     None,
@@ -1632,9 +1588,6 @@ impl CollabPanel {
                 ListEntry::ChannelNotes { channel_id } => {
                     self.open_channel_notes(*channel_id, window, cx)
                 }
-                ListEntry::ChannelChat { channel_id } => {
-                    self.join_channel_chat(*channel_id, window, cx)
-                }
                 ListEntry::OutgoingRequest(_) => {}
                 ListEntry::ChannelEditor { .. } => {}
             }
@@ -2258,28 +2211,6 @@ impl CollabPanel {
         .detach_and_prompt_err("Failed to join channel", window, cx, |_, _, _| None)
     }
 
-    fn join_channel_chat(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        window.defer(cx, move |window, cx| {
-            workspace.update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.focus_panel::<ChatPanel>(window, cx) {
-                    panel.update(cx, |panel, cx| {
-                        panel
-                            .select_channel(channel_id, None, cx)
-                            .detach_and_notify_err(window, cx);
-                    });
-                }
-            });
-        });
-    }
-
     fn copy_channel_link(&mut self, channel_id: ChannelId, cx: &mut Context<Self>) {
         let channel_store = self.channel_store.read(cx);
         let Some(channel) = channel_store.channel_for_id(channel_id) else {
@@ -2398,9 +2329,6 @@ impl CollabPanel {
             ListEntry::ChannelNotes { channel_id } => self
                 .render_channel_notes(*channel_id, is_selected, window, cx)
                 .into_any_element(),
-            ListEntry::ChannelChat { channel_id } => self
-                .render_channel_chat(*channel_id, is_selected, window, cx)
-                .into_any_element(),
         }
     }
 
@@ -2781,7 +2709,6 @@ impl CollabPanel {
         let disclosed =
             has_children.then(|| self.collapsed_channels.binary_search(&channel.id).is_err());
 
-        let has_messages_notification = channel_store.has_new_messages(channel_id);
         let has_notes_notification = channel_store.has_channel_buffer_changed(channel_id);
 
         const FACEPILE_LIMIT: usize = 3;
@@ -2909,21 +2836,6 @@ impl CollabPanel {
                         .rounded_l_sm()
                         .gap_1()
                         .px_1()
-                        .child(
-                            IconButton::new("channel_chat", IconName::Chat)
-                                .style(ButtonStyle::Filled)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .icon_color(if has_messages_notification {
-                                    Color::Default
-                                } else {
-                                    Color::Muted
-                                })
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.join_channel_chat(channel_id, window, cx)
-                                }))
-                                .tooltip(Tooltip::text("Open channel chat")),
-                        )
                         .child(
                             IconButton::new("channel_notes", IconName::Reader)
                                 .style(ButtonStyle::Filled)
@@ -3183,14 +3095,6 @@ impl PartialEq for ListEntry {
                     return channel_id == other_id;
                 }
             }
-            ListEntry::ChannelChat { channel_id } => {
-                if let ListEntry::ChannelChat {
-                    channel_id: other_id,
-                } = other
-                {
-                    return channel_id == other_id;
-                }
-            }
             ListEntry::ChannelInvite(channel_1) => {
                 if let ListEntry::ChannelInvite(channel_2) = other {
                     return channel_1.id == channel_2.id;
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index b369d324ad..f75dd663c8 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -1,5 +1,4 @@
 pub mod channel_view;
-pub mod chat_panel;
 pub mod collab_panel;
 pub mod notification_panel;
 pub mod notifications;
@@ -13,9 +12,7 @@ use gpui::{
     WindowDecorations, WindowKind, WindowOptions, point,
 };
 use panel_settings::MessageEditorSettings;
-pub use panel_settings::{
-    ChatPanelButton, ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings,
-};
+pub use panel_settings::{CollaborationPanelSettings, NotificationPanelSettings};
 use release_channel::ReleaseChannel;
 use settings::Settings;
 use ui::px;
@@ -23,12 +20,10 @@ use workspace::AppState;
 
 pub fn init(app_state: &Arc<AppState>, cx: &mut App) {
     CollaborationPanelSettings::register(cx);
-    ChatPanelSettings::register(cx);
     NotificationPanelSettings::register(cx);
     MessageEditorSettings::register(cx);
 
     channel_view::init(cx);
-    chat_panel::init(cx);
     collab_panel::init(cx);
     notification_panel::init(cx);
     notifications::init(app_state, cx);
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
index bf6fc3b224..9731b89521 100644
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -1,4 +1,4 @@
-use crate::{NotificationPanelSettings, chat_panel::ChatPanel};
+use crate::NotificationPanelSettings;
 use anyhow::Result;
 use channel::ChannelStore;
 use client::{ChannelId, Client, Notification, User, UserStore};
@@ -6,8 +6,8 @@ use collections::HashMap;
 use db::kvp::KEY_VALUE_STORE;
 use futures::StreamExt;
 use gpui::{
-    AnyElement, App, AsyncWindowContext, ClickEvent, Context, CursorStyle, DismissEvent, Element,
-    Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ListAlignment,
+    AnyElement, App, AsyncWindowContext, ClickEvent, Context, DismissEvent, Element, Entity,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ListAlignment,
     ListScrollEvent, ListState, ParentElement, Render, StatefulInteractiveElement, Styled, Task,
     WeakEntity, Window, actions, div, img, list, px,
 };
@@ -71,7 +71,6 @@ pub struct NotificationPresenter {
     pub text: String,
     pub icon: &'static str,
     pub needs_response: bool,
-    pub can_navigate: bool,
 }
 
 actions!(
@@ -234,7 +233,6 @@ impl NotificationPanel {
             actor,
             text,
             needs_response,
-            can_navigate,
             ..
         } = self.present_notification(entry, cx)?;
 
@@ -269,14 +267,6 @@ impl NotificationPanel {
                 .py_1()
                 .gap_2()
                 .hover(|style| style.bg(cx.theme().colors().element_hover))
-                .when(can_navigate, |el| {
-                    el.cursor(CursorStyle::PointingHand).on_click({
-                        let notification = notification.clone();
-                        cx.listener(move |this, _, window, cx| {
-                            this.did_click_notification(&notification, window, cx)
-                        })
-                    })
-                })
                 .children(actor.map(|actor| {
                     img(actor.avatar_uri.clone())
                         .flex_none()
@@ -369,7 +359,6 @@ impl NotificationPanel {
                     text: format!("{} wants to add you as a contact", requester.github_login),
                     needs_response: user_store.has_incoming_contact_request(requester.id),
                     actor: Some(requester),
-                    can_navigate: false,
                 })
             }
             Notification::ContactRequestAccepted { responder_id } => {
@@ -379,7 +368,6 @@ impl NotificationPanel {
                     text: format!("{} accepted your contact invite", responder.github_login),
                     needs_response: false,
                     actor: Some(responder),
-                    can_navigate: false,
                 })
             }
             Notification::ChannelInvitation {
@@ -396,29 +384,6 @@ impl NotificationPanel {
                     ),
                     needs_response: channel_store.has_channel_invitation(ChannelId(channel_id)),
                     actor: Some(inviter),
-                    can_navigate: false,
-                })
-            }
-            Notification::ChannelMessageMention {
-                sender_id,
-                channel_id,
-                message_id,
-            } => {
-                let sender = user_store.get_cached_user(sender_id)?;
-                let channel = channel_store.channel_for_id(ChannelId(channel_id))?;
-                let message = self
-                    .notification_store
-                    .read(cx)
-                    .channel_message_for_id(message_id)?;
-                Some(NotificationPresenter {
-                    icon: "icons/conversations.svg",
-                    text: format!(
-                        "{} mentioned you in #{}:\n{}",
-                        sender.github_login, channel.name, message.body,
-                    ),
-                    needs_response: false,
-                    actor: Some(sender),
-                    can_navigate: true,
                 })
             }
         }
@@ -433,9 +398,7 @@ impl NotificationPanel {
     ) {
         let should_mark_as_read = match notification {
             Notification::ContactRequestAccepted { .. } => true,
-            Notification::ContactRequest { .. }
-            | Notification::ChannelInvitation { .. }
-            | Notification::ChannelMessageMention { .. } => false,
+            Notification::ContactRequest { .. } | Notification::ChannelInvitation { .. } => false,
         };
 
         if should_mark_as_read {
@@ -457,55 +420,6 @@ impl NotificationPanel {
         }
     }
 
-    fn did_click_notification(
-        &mut self,
-        notification: &Notification,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Notification::ChannelMessageMention {
-            message_id,
-            channel_id,
-            ..
-        } = notification.clone()
-            && let Some(workspace) = self.workspace.upgrade()
-        {
-            window.defer(cx, move |window, cx| {
-                workspace.update(cx, |workspace, cx| {
-                    if let Some(panel) = workspace.focus_panel::<ChatPanel>(window, cx) {
-                        panel.update(cx, |panel, cx| {
-                            panel
-                                .select_channel(ChannelId(channel_id), Some(message_id), cx)
-                                .detach_and_log_err(cx);
-                        });
-                    }
-                });
-            });
-        }
-    }
-
-    fn is_showing_notification(&self, notification: &Notification, cx: &mut Context<Self>) -> bool {
-        if !self.active {
-            return false;
-        }
-
-        if let Notification::ChannelMessageMention { channel_id, .. } = &notification
-            && let Some(workspace) = self.workspace.upgrade()
-        {
-            return if let Some(panel) = workspace.read(cx).panel::<ChatPanel>(cx) {
-                let panel = panel.read(cx);
-                panel.is_scrolled_to_bottom()
-                    && panel
-                        .active_chat()
-                        .is_some_and(|chat| chat.read(cx).channel_id.0 == *channel_id)
-            } else {
-                false
-            };
-        }
-
-        false
-    }
-
     fn on_notification_event(
         &mut self,
         _: &Entity<NotificationStore>,
@@ -515,9 +429,7 @@ impl NotificationPanel {
     ) {
         match event {
             NotificationEvent::NewNotification { entry } => {
-                if !self.is_showing_notification(&entry.notification, cx) {
-                    self.unseen_notifications.push(entry.clone());
-                }
+                self.unseen_notifications.push(entry.clone());
                 self.add_toast(entry, window, cx);
             }
             NotificationEvent::NotificationRemoved { entry }
@@ -541,10 +453,6 @@ impl NotificationPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.is_showing_notification(&entry.notification, cx) {
-            return;
-        }
-
         let Some(NotificationPresenter { actor, text, .. }) = self.present_notification(entry, cx)
         else {
             return;
@@ -568,7 +476,6 @@ impl NotificationPanel {
                 workspace.show_notification(id, cx, |cx| {
                     let workspace = cx.entity().downgrade();
                     cx.new(|cx| NotificationToast {
-                        notification_id,
                         actor,
                         text,
                         workspace,
@@ -781,7 +688,6 @@ impl Panel for NotificationPanel {
 }
 
 pub struct NotificationToast {
-    notification_id: u64,
     actor: Option<Arc<User>>,
     text: String,
     workspace: WeakEntity<Workspace>,
@@ -799,22 +705,10 @@ impl WorkspaceNotification for NotificationToast {}
 impl NotificationToast {
     fn focus_notification_panel(&self, window: &mut Window, cx: &mut Context<Self>) {
         let workspace = self.workspace.clone();
-        let notification_id = self.notification_id;
         window.defer(cx, move |window, cx| {
             workspace
                 .update(cx, |workspace, cx| {
-                    if let Some(panel) = workspace.focus_panel::<NotificationPanel>(window, cx) {
-                        panel.update(cx, |panel, cx| {
-                            let store = panel.notification_store.read(cx);
-                            if let Some(entry) = store.notification_for_id(notification_id) {
-                                panel.did_click_notification(
-                                    &entry.clone().notification,
-                                    window,
-                                    cx,
-                                );
-                            }
-                        });
-                    }
+                    workspace.focus_panel::<NotificationPanel>(window, cx)
                 })
                 .ok();
         })
diff --git a/crates/collab_ui/src/panel_settings.rs b/crates/collab_ui/src/panel_settings.rs
index 81d441167c..98559ffd34 100644
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -11,39 +11,6 @@ pub struct CollaborationPanelSettings {
     pub default_width: Pixels,
 }
 
-#[derive(Clone, Copy, Default, Serialize, Deserialize, JsonSchema, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum ChatPanelButton {
-    Never,
-    Always,
-    #[default]
-    WhenInCall,
-}
-
-#[derive(Deserialize, Debug)]
-pub struct ChatPanelSettings {
-    pub button: ChatPanelButton,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-}
-
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "chat_panel")]
-pub struct ChatPanelSettingsContent {
-    /// When to show the panel button in the status bar.
-    ///
-    /// Default: only when in a call
-    pub button: Option<ChatPanelButton>,
-    /// Where to dock the panel.
-    ///
-    /// Default: right
-    pub dock: Option<DockPosition>,
-    /// Default width of the panel in pixels.
-    ///
-    /// Default: 240
-    pub default_width: Option<f32>,
-}
-
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
 #[settings_key(key = "collaboration_panel")]
 pub struct PanelSettingsContent {
@@ -108,19 +75,6 @@ impl Settings for CollaborationPanelSettings {
     fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
 
-impl Settings for ChatPanelSettings {
-    type FileContent = ChatPanelSettingsContent;
-
-    fn load(
-        sources: SettingsSources<Self::FileContent>,
-        _: &mut gpui::App,
-    ) -> anyhow::Result<Self> {
-        sources.json_merge()
-    }
-
-    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
-}
-
 impl Settings for NotificationPanelSettings {
     type FileContent = NotificationPanelSettingsContent;
 
diff --git a/crates/notifications/Cargo.toml b/crates/notifications/Cargo.toml
index baf5444ef4..39acfe2b38 100644
--- a/crates/notifications/Cargo.toml
+++ b/crates/notifications/Cargo.toml
@@ -24,7 +24,6 @@ test-support = [
 anyhow.workspace = true
 channel.workspace = true
 client.workspace = true
-collections.workspace = true
 component.workspace = true
 db.workspace = true
 gpui.workspace = true
diff --git a/crates/notifications/src/notification_store.rs b/crates/notifications/src/notification_store.rs
index af2601bd18..7db17da9ff 100644
--- a/crates/notifications/src/notification_store.rs
+++ b/crates/notifications/src/notification_store.rs
@@ -1,7 +1,6 @@
 use anyhow::{Context as _, Result};
-use channel::{ChannelMessage, ChannelMessageId, ChannelStore};
+use channel::ChannelStore;
 use client::{ChannelId, Client, UserStore};
-use collections::HashMap;
 use db::smol::stream::StreamExt;
 use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Task};
 use rpc::{Notification, TypedEnvelope, proto};
@@ -22,7 +21,6 @@ impl Global for GlobalNotificationStore {}
 pub struct NotificationStore {
     client: Arc<Client>,
     user_store: Entity<UserStore>,
-    channel_messages: HashMap<u64, ChannelMessage>,
     channel_store: Entity<ChannelStore>,
     notifications: SumTree<NotificationEntry>,
     loaded_all_notifications: bool,
@@ -100,12 +98,10 @@ impl NotificationStore {
             channel_store: ChannelStore::global(cx),
             notifications: Default::default(),
             loaded_all_notifications: false,
-            channel_messages: Default::default(),
             _watch_connection_status: watch_connection_status,
             _subscriptions: vec![
                 client.add_message_handler(cx.weak_entity(), Self::handle_new_notification),
                 client.add_message_handler(cx.weak_entity(), Self::handle_delete_notification),
-                client.add_message_handler(cx.weak_entity(), Self::handle_update_notification),
             ],
             user_store,
             client,
@@ -120,10 +116,6 @@ impl NotificationStore {
         self.notifications.summary().unread_count
     }
 
-    pub fn channel_message_for_id(&self, id: u64) -> Option<&ChannelMessage> {
-        self.channel_messages.get(&id)
-    }
-
     // Get the nth newest notification.
     pub fn notification_at(&self, ix: usize) -> Option<&NotificationEntry> {
         let count = self.notifications.summary().count;
@@ -185,7 +177,6 @@ impl NotificationStore {
 
     fn handle_connect(&mut self, cx: &mut Context<Self>) -> Option<Task<Result<()>>> {
         self.notifications = Default::default();
-        self.channel_messages = Default::default();
         cx.notify();
         self.load_more_notifications(true, cx)
     }
@@ -223,35 +214,6 @@ impl NotificationStore {
         })?
     }
 
-    async fn handle_update_notification(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateNotification>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            if let Some(notification) = envelope.payload.notification
-                && let Some(rpc::Notification::ChannelMessageMention { message_id, .. }) =
-                    Notification::from_proto(&notification)
-            {
-                let fetch_message_task = this.channel_store.update(cx, |this, cx| {
-                    this.fetch_channel_messages(vec![message_id], cx)
-                });
-
-                cx.spawn(async move |this, cx| {
-                    let messages = fetch_message_task.await?;
-                    this.update(cx, move |this, cx| {
-                        for message in messages {
-                            this.channel_messages.insert(message_id, message);
-                        }
-                        cx.notify();
-                    })
-                })
-                .detach_and_log_err(cx)
-            }
-            Ok(())
-        })?
-    }
-
     async fn add_notifications(
         this: Entity<Self>,
         notifications: Vec<proto::Notification>,
@@ -259,7 +221,6 @@ impl NotificationStore {
         cx: &mut AsyncApp,
     ) -> Result<()> {
         let mut user_ids = Vec::new();
-        let mut message_ids = Vec::new();
 
         let notifications = notifications
             .into_iter()
@@ -293,29 +254,14 @@ impl NotificationStore {
                 } => {
                     user_ids.push(contact_id);
                 }
-                Notification::ChannelMessageMention {
-                    sender_id,
-                    message_id,
-                    ..
-                } => {
-                    user_ids.push(sender_id);
-                    message_ids.push(message_id);
-                }
             }
         }
 
-        let (user_store, channel_store) = this.read_with(cx, |this, _| {
-            (this.user_store.clone(), this.channel_store.clone())
-        })?;
+        let user_store = this.read_with(cx, |this, _| this.user_store.clone())?;
 
         user_store
             .update(cx, |store, cx| store.get_users(user_ids, cx))?
             .await?;
-        let messages = channel_store
-            .update(cx, |store, cx| {
-                store.fetch_channel_messages(message_ids, cx)
-            })?
-            .await?;
         this.update(cx, |this, cx| {
             if options.clear_old {
                 cx.emit(NotificationEvent::NotificationsUpdated {
@@ -323,7 +269,6 @@ impl NotificationStore {
                     new_count: 0,
                 });
                 this.notifications = SumTree::default();
-                this.channel_messages.clear();
                 this.loaded_all_notifications = false;
             }
 
@@ -331,15 +276,6 @@ impl NotificationStore {
                 this.loaded_all_notifications = true;
             }
 
-            this.channel_messages
-                .extend(messages.into_iter().filter_map(|message| {
-                    if let ChannelMessageId::Saved(id) = message.id {
-                        Some((id, message))
-                    } else {
-                        None
-                    }
-                }));
-
             this.splice_notifications(
                 notifications
                     .into_iter()
diff --git a/crates/proto/proto/channel.proto b/crates/proto/proto/channel.proto
index 324380048a..cada21cd5b 100644
--- a/crates/proto/proto/channel.proto
+++ b/crates/proto/proto/channel.proto
@@ -23,16 +23,17 @@ message UpdateChannels {
     repeated Channel channel_invitations = 5;
     repeated uint64 remove_channel_invitations = 6;
     repeated ChannelParticipants channel_participants = 7;
-    repeated ChannelMessageId latest_channel_message_ids = 8;
     repeated ChannelBufferVersion latest_channel_buffer_versions = 9;
 
+    reserved 8;
     reserved 10 to 15;
 }
 
 message UpdateUserChannels {
-    repeated ChannelMessageId observed_channel_message_id = 1;
     repeated ChannelBufferVersion observed_channel_buffer_version = 2;
     repeated ChannelMembership channel_memberships = 3;
+
+    reserved 1;
 }
 
 message ChannelMembership {
diff --git a/crates/rpc/src/notification.rs b/crates/rpc/src/notification.rs
index 338ef33c8a..50364c7387 100644
--- a/crates/rpc/src/notification.rs
+++ b/crates/rpc/src/notification.rs
@@ -32,12 +32,6 @@ pub enum Notification {
         channel_name: String,
         inviter_id: u64,
     },
-    ChannelMessageMention {
-        #[serde(rename = "entity_id")]
-        message_id: u64,
-        sender_id: u64,
-        channel_id: u64,
-    },
 }
 
 impl Notification {
@@ -91,11 +85,6 @@ mod tests {
                 channel_name: "the-channel".into(),
                 inviter_id: 50,
             },
-            Notification::ChannelMessageMention {
-                sender_id: 200,
-                channel_id: 30,
-                message_id: 1,
-            },
         ] {
             let message = notification.to_proto();
             let deserialized = Notification::from_proto(&message).unwrap();
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index eda483988b..576fe5f634 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1268,7 +1268,6 @@ fn generate_commands(_: &App) -> Vec<VimCommand> {
         VimCommand::str(("te", "rm"), "terminal_panel::Toggle"),
         VimCommand::str(("T", "erm"), "terminal_panel::Toggle"),
         VimCommand::str(("C", "ollab"), "collab_panel::ToggleFocus"),
-        VimCommand::str(("Ch", "at"), "chat_panel::ToggleFocus"),
         VimCommand::str(("No", "tifications"), "notification_panel::ToggleFocus"),
         VimCommand::str(("A", "I"), "agent::ToggleFocus"),
         VimCommand::str(("G", "it"), "git_panel::ToggleFocus"),
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 355925d228..e14cbb10e8 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -553,8 +553,6 @@ fn initialize_panels(
         let git_panel = GitPanel::load(workspace_handle.clone(), cx.clone());
         let channels_panel =
             collab_ui::collab_panel::CollabPanel::load(workspace_handle.clone(), cx.clone());
-        let chat_panel =
-            collab_ui::chat_panel::ChatPanel::load(workspace_handle.clone(), cx.clone());
         let notification_panel = collab_ui::notification_panel::NotificationPanel::load(
             workspace_handle.clone(),
             cx.clone(),
@@ -567,7 +565,6 @@ fn initialize_panels(
             terminal_panel,
             git_panel,
             channels_panel,
-            chat_panel,
             notification_panel,
             debug_panel,
         ) = futures::try_join!(
@@ -576,7 +573,6 @@ fn initialize_panels(
             git_panel,
             terminal_panel,
             channels_panel,
-            chat_panel,
             notification_panel,
             debug_panel,
         )?;
@@ -587,7 +583,6 @@ fn initialize_panels(
             workspace.add_panel(terminal_panel, window, cx);
             workspace.add_panel(git_panel, window, cx);
             workspace.add_panel(channels_panel, window, cx);
-            workspace.add_panel(chat_panel, window, cx);
             workspace.add_panel(notification_panel, window, cx);
             workspace.add_panel(debug_panel, window, cx);
         })?;
@@ -865,14 +860,6 @@ fn register_actions(
                 workspace.toggle_panel_focus::<collab_ui::collab_panel::CollabPanel>(window, cx);
             },
         )
-        .register_action(
-            |workspace: &mut Workspace,
-             _: &collab_ui::chat_panel::ToggleFocus,
-             window: &mut Window,
-             cx: &mut Context<Workspace>| {
-                workspace.toggle_panel_focus::<collab_ui::chat_panel::ChatPanel>(window, cx);
-            },
-        )
         .register_action(
             |workspace: &mut Workspace,
              _: &collab_ui::notification_panel::ToggleFocus,
@@ -4475,7 +4462,6 @@ mod tests {
                 "branches",
                 "buffer_search",
                 "channel_modal",
-                "chat_panel",
                 "cli",
                 "client",
                 "collab",
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 56b4de8328..dd6a74d1d0 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -4395,28 +4395,6 @@ Visit [the Configuration page](./ai/configuration.md) under the AI section to le
 - `dock`: Where to dock the collaboration panel. Can be `left` or `right`
 - `default_width`: Default width of the collaboration panel
 
-## Chat Panel
-
-- Description: Customizations for the chat panel.
-- Setting: `chat_panel`
-- Default:
-
-```json
-{
-  "chat_panel": {
-    "button": "when_in_call",
-    "dock": "right",
-    "default_width": 240
-  }
-}
-```
-
-**Options**
-
-- `button`: When to show the chat panel button in the status bar. Can be `never`, `always`, or `when_in_call`.
-- `dock`: Where to dock the chat panel. Can be 'left' or 'right'
-- `default_width`: Default width of the chat panel
-
 ## Debugger
 
 - Description: Configuration for debugger panel and settings
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 47c72e80f5..073911fd60 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -94,7 +94,6 @@ To disable this behavior use:
   // "project_panel": {"button": false },
   // "outline_panel": {"button": false },
   // "collaboration_panel": {"button": false },
-  // "chat_panel": {"button": "never" },
   // "git_panel": {"button": false },
   // "notification_panel": {"button": false },
   // "agent": {"button": false },
@@ -554,13 +553,6 @@ See [Terminal settings](./configuring-zed.md#terminal) for additional non-visual
   },
   "show_call_status_icon": true,  // Shown call status in the OS status bar.
 
-  // Chat Panel
-  "chat_panel": {
-    "button": "when_in_call",     // status bar icon (true, false, when_in_call)
-    "dock": "right",              // Where to dock: left, right
-    "default_width": 240          // Default width of the chat panel
-  },
-
   // Notification Panel
   "notification_panel": {
     // Whether to show the notification panel button in the status bar.

From 82b11bf77c1d73927849d35fe4afc2ce4f9bee05 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 9 Sep 2025 01:39:52 -0300
Subject: [PATCH 701/823] docs: Include Cursor in the list of supported base
 keymaps (#37821)

We were missing that in the /key-bindings page. Also took advantage of
the opportunity to add a bunch of small writing tweaks.

Release Notes:

- N/A
---
 docs/src/key-bindings.md | 78 ++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/docs/src/key-bindings.md b/docs/src/key-bindings.md
index 838dceaa86..e8ddbc46b2 100644
--- a/docs/src/key-bindings.md
+++ b/docs/src/key-bindings.md
@@ -1,28 +1,34 @@
 # Key bindings
 
-Zed has a very customizable key binding system — you can tweak everything to work exactly how your fingers expect!
+Zed has a very customizable key binding system—you can tweak everything to work exactly how your fingers expect!
 
 ## Predefined keymaps
 
-If you're used to a specific editor's defaults you can set a `base_keymap` in your [settings file](./configuring-zed.md). We currently have:
+If you're used to a specific editor's defaults, you can set a `base_keymap` in your [settings file](./configuring-zed.md).
+We currently support:
 
-- VSCode (default)
+- VS Code (default)
 - Atom
 - Emacs (Beta)
 - JetBrains
-- SublimeText
+- Sublime Text
 - TextMate
+- Cursor
 - None (disables _all_ key bindings)
 
-You can also enable `vim_mode` or `helix_mode`, which add modal bindings. For more information, see the documentation for [Vim mode](./vim.md) and [Helix mode](./helix.md).
+This setting can also be changed via the command palette through the `zed: toggle base keymap selector` action.
+
+You can also enable `vim_mode` or `helix_mode`, which add modal bindings.
+For more information, see the documentation for [Vim mode](./vim.md) and [Helix mode](./helix.md).
 
 ## User keymaps
 
-Zed reads your keymap from `~/.config/zed/keymap.json`. You can open the file within Zed with {#action zed::OpenKeymap} from the command palette or to spawn the Zed Keymap Editor ({#action zed::OpenKeymapEditor}) use {#kb zed::OpenKeymapEditor}.
+Zed reads your keymap from `~/.config/zed/keymap.json`, which you can open with the {#action zed::OpenKeymap} action from the command palette.
+You can also edit your keymap through the Zed Keymap Editor, accessible via the {#action zed::OpenKeymapEditor} action or the {#kb zed::OpenKeymapEditor} keybinding.
 
-The file contains a JSON array of objects with `"bindings"`. If no `"context"` is set the bindings are always active. If it is set the binding is only active when the [context matches](#contexts).
+The `keymap.json` file contains a JSON array of objects with `"bindings"`. If no `"context"` is set, the bindings are always active. If it is set, the binding is only active when the [context matches](#contexts).
 
-Within each binding section a [key sequence](#keybinding-syntax) is mapped to an [action](#actions). If conflicts are detected they are resolved as [described below](#precedence).
+Within each binding section, a [key sequence](#keybinding-syntax) is mapped to [an action](#actions). If conflicts are detected, they are resolved as [described below](#precedence).
 
 If you are using a non-QWERTY, Latin-character keyboard, you may want to set `use_key_equivalents` to `true`. See [Non-QWERTY keyboards](#non-qwerty-keyboards) for more information.
 
@@ -45,9 +51,9 @@ For example:
 ]
 ```
 
-You can see all of Zed's default bindings in the default keymaps for [MacOS](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json) or [Linux](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-linux.json).
+You can see all of Zed's default bindings in the default keymaps for [macOS](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json) or [Linux](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-linux.json).
 
-If you want to debug problems with custom keymaps you can use `dev: Open Key Context View` from the command palette. Please file [an issue](https://github.com/zed-industries/zed) if you run into something you think should work but isn't.
+If you want to debug problems with custom keymaps, you can use `dev: Open Key Context View` from the command palette. Please file [an issue](https://github.com/zed-industries/zed) if you run into something you think should work but isn't.
 
 ### Keybinding syntax
 
@@ -62,7 +68,7 @@ Each keypress is a sequence of modifiers followed by a key. The modifiers are:
 - `fn-` The function key
 - `secondary-` Equivalent to `cmd` when Zed is running on macOS and `ctrl` when on Windows and Linux
 
-The keys can be any single unicode codepoint that your keyboard generates (for example `a`, `0`, `£` or `ç`), or any named key (`tab`, `f1`, `shift`, or `cmd`). If you are using a non-Latin layout (e.g. Cyrillic), you can bind either to the cyrillic character, or the latin character that key generates with `cmd` pressed.
+The keys can be any single Unicode codepoint that your keyboard generates (for example `a`, `0`, `£` or `ç`), or any named key (`tab`, `f1`, `shift`, or `cmd`). If you are using a non-Latin layout (e.g. Cyrillic), you can bind either to the Cyrillic character or the Latin character that key generates with `cmd` pressed.
 
 A few examples:
 
@@ -75,17 +81,17 @@ A few examples:
  }
 ```
 
-The `shift-` modifier can only be used in combination with a letter to indicate the uppercase version. For example `shift-g` matches typing `G`. Although on many keyboards shift is used to type punctuation characters like `(`, the keypress is not considered to be modified and so `shift-(` does not match.
+The `shift-` modifier can only be used in combination with a letter to indicate the uppercase version. For example, `shift-g` matches typing `G`. Although on many keyboards shift is used to type punctuation characters like `(`, the keypress is not considered to be modified, and so `shift-(` does not match.
 
-The `alt-` modifier can be used on many layouts to generate a different key. For example on macOS US keyboard the combination `alt-c` types `ç`. You can match against either in your keymap file, though by convention Zed spells this combination as `alt-c`.
+The `alt-` modifier can be used on many layouts to generate a different key. For example, on a macOS US keyboard, the combination `alt-c` types `ç`. You can match against either in your keymap file, though by convention, Zed spells this combination as `alt-c`.
 
-It is possible to match against typing a modifier key on its own. For example `shift shift` can be used to implement JetBrains search everywhere shortcut. In this case the binding happens on key release instead of keypress.
+It is possible to match against typing a modifier key on its own. For example, `shift shift` can be used to implement JetBrains' 'Search Everywhere' shortcut. In this case, the binding happens on key release instead of on keypress.
 
 ### Contexts
 
-If a binding group has a `"context"` key it will be matched against the currently active contexts in Zed.
+If a binding group has a `"context"` key, it will be matched against the currently active contexts in Zed.
 
-Zed's contexts make up a tree, with the root being `Workspace`. Workspaces contain Panes and Panels, and Panes contain Editors, etc. The easiest way to see what contexts are active at a given moment is the key context view, which you can get to with `dev: Open Key Context View` in the command palette.
+Zed's contexts make up a tree, with the root being `Workspace`. Workspaces contain Panes and Panels, and Panes contain Editors, etc. The easiest way to see what contexts are active at a given moment is the key context view, which you can get to with the `dev: open key context view` command in the command palette.
 
 For example:
 
@@ -117,29 +123,25 @@ For example:
 
 It's worth noting that attributes are only available on the node they are defined on. This means that if you want to (for example) only enable a keybinding when the debugger is stopped in vim normal mode, you need to do `debugger_stopped > vim_mode == normal`.
 
-Note: Before Zed v0.197.x, the ! operator only looked at one node at a time, and `>` meant "parent" not "ancestor". This meant that `!Editor` would match the context `Workspace > Pane > Editor`, because (confusingly) the Pane matches `!Editor`, and that `os=macos > Editor` did not match the context `Workspace > Pane > Editor` because of the intermediate `Pane` node.
+> Note: Before Zed v0.197.x, the `!` operator only looked at one node at a time, and `>` meant "parent" not "ancestor". This meant that `!Editor` would match the context `Workspace > Pane > Editor`, because (confusingly) the Pane matches `!Editor`, and that `os=macos > Editor` did not match the context `Workspace > Pane > Editor` because of the intermediate `Pane` node.
 
 If you're using Vim mode, we have information on how [vim modes influence the context](./vim.md#contexts). Helix mode is built on top of Vim mode and uses the same contexts.
 
 ### Actions
 
-Pretty much all of Zed's functionality is exposed as actions. Although there is
-no explicitly documented list, you can find most of them by searching in the
-command palette, by looking in the default keymaps for
-[MacOS](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json)
-or
-[Linux](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-linux.json), or by using Zed's autocomplete in your keymap file.
+Almost all of Zed's functionality is exposed as actions.
+Although there is no explicitly documented list, you can find most of them by searching in the command palette, by looking in the default keymaps for [macOS](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json) or [Linux](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-linux.json), or by using Zed's autocomplete in your keymap file.
 
-Most actions do not require any arguments, and so you can bind them as strings: `"ctrl-a": "language_selector::Toggle"`. Some require a single argument, and must be bound as an array: `"cmd-1": ["workspace::ActivatePane", 0]`. Some actions require multiple arguments, and are bound as an array of a string and an object: `"ctrl-a": ["pane::DeploySearch", { "replace_enabled": true }]`.
+Most actions do not require any arguments, and so you can bind them as strings: `"ctrl-a": "language_selector::Toggle"`. Some require a single argument and must be bound as an array: `"cmd-1": ["workspace::ActivatePane", 0]`. Some actions require multiple arguments and are bound as an array of a string and an object: `"ctrl-a": ["pane::DeploySearch", { "replace_enabled": true }]`.
 
 ### Precedence
 
 When multiple keybindings have the same keystroke and are active at the same time, precedence is resolved in two ways:
 
-- Bindings that match on lower nodes in the context tree win. This means that if you have a binding with a context of `Editor` it will take precedence over a binding with a context of `Workspace`. Bindings with no context match at the lowest level in the tree.
-- If there are multiple bindings that match at the same level in the tree, then the binding defined later takes precedence. As user keybindings are loaded after system keybindings, this allows user bindings to take precedence over builtin keybindings.
+- Bindings that match on lower nodes in the context tree win. This means that if you have a binding with a context of `Editor`, it will take precedence over a binding with a context of `Workspace`. Bindings with no context match at the lowest level in the tree.
+- If there are multiple bindings that match at the same level in the tree, then the binding defined later takes precedence. As user keybindings are loaded after system keybindings, this allows user bindings to take precedence over built-in keybindings.
 
-The other kind of conflict that arises is when you have two bindings, one of which is a prefix of the other. For example if you have `"ctrl-w":"editor::DeleteToNextWordEnd"` and `"ctrl-w left":"editor::DeleteToEndOfLine"`.
+The other kind of conflict that arises is when you have two bindings, one of which is a prefix of the other. For example, if you have `"ctrl-w":"editor::DeleteToNextWordEnd"` and `"ctrl-w left":"editor::DeleteToEndOfLine"`.
 
 When this happens, and both bindings are active in the current context, Zed will wait for 1 second after you type `ctrl-w` to see if you're about to type `left`. If you don't type anything, or if you type a different key, then `DeleteToNextWordEnd` will be triggered. If you do, then `DeleteToEndOfLine` will be triggered.
 
@@ -147,15 +149,15 @@ When this happens, and both bindings are active in the current context, Zed will
 
 Zed's support for non-QWERTY keyboards is still a work in progress.
 
-If your keyboard can type the full ASCII ranges (DVORAK, COLEMAK, etc.) then shortcuts should work as you expect.
+If your keyboard can type the full ASCII range (DVORAK, COLEMAK, etc.), then shortcuts should work as you expect.
 
 Otherwise, read on...
 
 #### macOS
 
-On Cyrillic, Hebrew, Armenian, and other keyboards that are mostly non-ASCII; macOS automatically maps keys to the ASCII range when `cmd` is held. Zed takes this a step further and it can always match key-presses against either the ASCII layout, or the real layout regardless of modifiers, and regardless of the `use_key_equivalents` setting. For example in Thai, pressing `ctrl-ๆ` will match bindings associated with `ctrl-q` or `ctrl-ๆ`
+On Cyrillic, Hebrew, Armenian, and other keyboards that are mostly non-ASCII, macOS automatically maps keys to the ASCII range when `cmd` is held. Zed takes this a step further, and it can always match key-presses against either the ASCII layout or the real layout, regardless of modifiers and the `use_key_equivalents` setting. For example, in Thai, pressing `ctrl-ๆ` will match bindings associated with `ctrl-q` or `ctrl-ๆ`.
 
-On keyboards that support extended Latin alphabets (French AZERTY, German QWERTZ, etc.) it is often not possible to type the entire ASCII range without `option`. This introduces an ambiguity, `option-2` produces `@`. To ensure that all the builtin keyboard shortcuts can still be typed on these keyboards we move key-bindings around. For example, shortcuts bound to `@` on QWERTY are moved to `"` on a Spanish layout. This mapping is based on the macOS system defaults and can be seen by running `dev: Open Key Context View` from the command palette.
+On keyboards that support extended Latin alphabets (French AZERTY, German QWERTZ, etc.), it is often not possible to type the entire ASCII range without `option`. This introduces an ambiguity: `option-2` produces `@`. To ensure that all the built-in keyboard shortcuts can still be typed on these keyboards, we move key bindings around. For example, shortcuts bound to `@` on QWERTY are moved to `"` on a Spanish layout. This mapping is based on the macOS system defaults and can be seen by running `dev: open key context view` from the command palette.
 
 If you are defining shortcuts in your personal keymap, you can opt into the key equivalent mapping by setting `use_key_equivalents` to `true` in your keymap:
 
@@ -172,16 +174,16 @@ If you are defining shortcuts in your personal keymap, you can opt into the key
 
 ### Linux
 
-Since v0.196.0 on Linux if the key that you type doesn't produce an ASCII character then we use the QWERTY-layout equivalent key for keyboard shortcuts. This means that many shortcuts can be typed on many layouts.
+Since v0.196.0, on Linux, if the key that you type doesn't produce an ASCII character, then we use the QWERTY-layout equivalent key for keyboard shortcuts. This means that many shortcuts can be typed on many layouts.
 
-We do not yet move shortcuts around to ensure that all the builtin shortcuts can be typed on every layout; so if there are some ASCII characters that cannot be typed, and your keyboard layout has different ASCII characters on the same keys as would be needed to type them, you may need to add custom key bindings to make this work. We do intend to fix this at some point, and help is very much wanted!
+We do not yet move shortcuts around to ensure that all the built-in shortcuts can be typed on every layout, so if there are some ASCII characters that cannot be typed, and your keyboard layout has different ASCII characters on the same keys as would be needed to type them, you may need to add custom key bindings to make this work. We do intend to fix this at some point, and help is very much appreciated!
 
 ## Tips and tricks
 
 ### Disabling a binding
 
-If you'd like a given binding to do nothing in a given context you can use
-`null` as the action. This is useful if you hit the keybinding by accident and
+If you'd like a given binding to do nothing in a given context, you can use
+`null` as the action. This is useful if you hit the key binding by accident and
 want to disable it, or if you want to type the character that would be typed by
 the sequence, or if you want to disable multikey bindings starting with that key.
 
@@ -196,9 +198,9 @@ the sequence, or if you want to disable multikey bindings starting with that key
 ]
 ```
 
-A `null` binding follows the same precedence rules as normal actions. So disables all bindings that would match further up in the tree too. If you'd like a binding that matches further up in the tree to take precedence over a lower binding, you need to rebind it to the action you want in the context you want.
+A `null` binding follows the same precedence rules as normal actions, so it disables all bindings that would match further up in the tree too. If you'd like a binding that matches further up in the tree to take precedence over a lower binding, you need to rebind it to the action you want in the context you want.
 
-This is useful for preventing Zed from falling back to a default keybinding when the action you specified is conditional and propagates. For example, `buffer_search::DeployReplace` only triggers when the search bar is not in view. If the search bar is in view, it would propagate and trigger the default action set for that binding, such as opening the right dock. To prevent this from happening:
+This is useful for preventing Zed from falling back to a default key binding when the action you specified is conditional and propagates. For example, `buffer_search::DeployReplace` only triggers when the search bar is not in view. If the search bar is in view, it would propagate and trigger the default action set for that key binding, such as opening the right dock. To prevent this from happening:
 
 ```json
 [
@@ -246,7 +248,7 @@ A common request is to be able to map from a single keystroke to a sequence. You
 
 There are some limitations to this, notably:
 
-- Any asynchronous operation will not happen until after all your key bindings have been dispatched. For example this means that while you can use a binding to open a file (as in the `cmd-alt-r` example) you cannot send further keystrokes and hope to have them interpreted by the new view.
+- Any asynchronous operation will not happen until after all your key bindings have been dispatched. For example, this means that while you can use a binding to open a file (as in the `cmd-alt-r` example), you cannot send further keystrokes and hope to have them interpreted by the new view.
 - Other examples of asynchronous things are: opening the command palette, communicating with a language server, changing the language of a buffer, anything that hits the network.
 - There is a limit of 100 simulated keys at a time.
 
@@ -271,5 +273,5 @@ For example, `ctrl-n` creates a new tab in Zed on Linux. If you want to send `ct
 
 ### Task Key bindings
 
-You can also bind keys to launch Zed Tasks defined in your tasks.json.
+You can also bind keys to launch Zed Tasks defined in your `tasks.json`.
 See the [tasks documentation](tasks.md#custom-keybindings-for-tasks) for more.

From 3e605c2c4b768e12cfd5c3220b864fa87eab8f2d Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 9 Sep 2025 01:45:55 -0300
Subject: [PATCH 702/823] docs: Fix casing on mentions to some brand names
 (#37822)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MacOS → macOS
- VSCode → VS Code
- SublimeText → Sublime Text
- Javascript/Typescript → JavaScript/TypeScript

Release Notes:

- N/A
---
 docs/src/configuring-zed.md       | 12 ++++++------
 docs/src/development/debuggers.md |  4 ++--
 docs/src/extensions/languages.md  |  2 +-
 docs/src/globs.md                 |  4 ++--
 docs/src/languages/deno.md        |  2 +-
 docs/src/languages/gdscript.md    |  2 +-
 docs/src/languages/java.md        |  4 ++--
 docs/src/languages/lua.md         |  2 +-
 docs/src/languages/yarn.md        |  2 +-
 docs/src/repl.md                  |  2 +-
 docs/src/snippets.md              |  2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index dd6a74d1d0..c83dd84b88 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -178,7 +178,7 @@ Note: This setting has no effect in Vim mode, as rewrap is already allowed every
 
 You can find the names of your currently installed extensions by listing the subfolders under the [extension installation location](./extensions/installing-extensions.md#installation-location):
 
-On MacOS:
+On macOS:
 
 ```sh
 ls ~/Library/Application\ Support/Zed/extensions/installed/
@@ -294,7 +294,7 @@ Define extensions which should be installed (`true`) or never installed (`false`
 
 **Options**
 
-1. VSCode
+1. VS Code
 
 ```json
 {
@@ -326,7 +326,7 @@ Define extensions which should be installed (`true`) or never installed (`false`
 }
 ```
 
-5. SublimeText
+5. Sublime Text
 
 ```json
 {
@@ -2469,7 +2469,7 @@ The following languages have inlay hints preconfigured by Zed:
 - [Go](https://docs.zed.dev/languages/go)
 - [Rust](https://docs.zed.dev/languages/rust)
 - [Svelte](https://docs.zed.dev/languages/svelte)
-- [Typescript](https://docs.zed.dev/languages/typescript)
+- [TypeScript](https://docs.zed.dev/languages/typescript)
 
 Use the `lsp` section for the server configuration. Examples are provided in the corresponding language documentation.
 
@@ -2699,7 +2699,7 @@ Positive `integer` values or `null` for unlimited tabs
 
 **Options**
 
-1. Maps to `Alt` on Linux and Windows and to `Option` on MacOS:
+1. Maps to `Alt` on Linux and Windows and to `Option` on macOS:
 
 ```json
 {
@@ -2707,7 +2707,7 @@ Positive `integer` values or `null` for unlimited tabs
 }
 ```
 
-2. Maps `Control` on Linux and Windows and to `Command` on MacOS:
+2. Maps `Control` on Linux and Windows and to `Command` on macOS:
 
 ```json
 {
diff --git a/docs/src/development/debuggers.md b/docs/src/development/debuggers.md
index 1a0efd86d5..a5713f6c8a 100644
--- a/docs/src/development/debuggers.md
+++ b/docs/src/development/debuggers.md
@@ -93,9 +93,9 @@ rust-lldb -p <pid>
 
 Where `<pid>` is the process ID of the Zed instance you want to attach to.
 
-To get the process ID of a running Zed instance, you can use your systems process management tools such as `Task Manager` on windows or `Activity Monitor` on MacOS.
+To get the process ID of a running Zed instance, you can use your systems process management tools such as `Task Manager` on windows or `Activity Monitor` on macOS.
 
-Alternatively, you can run the `ps aux | grep zed` command on MacOS and Linux or `Get-Process | Select-Object Id, ProcessName` in an instance of PowerShell on Windows.
+Alternatively, you can run the `ps aux | grep zed` command on macOS and Linux or `Get-Process | Select-Object Id, ProcessName` in an instance of PowerShell on Windows.
 
 #### Debugging Panics and Crashes
 
diff --git a/docs/src/extensions/languages.md b/docs/src/extensions/languages.md
index 6756cb8a23..376ac342f8 100644
--- a/docs/src/extensions/languages.md
+++ b/docs/src/extensions/languages.md
@@ -269,7 +269,7 @@ The `textobjects.scm` file defines rules for navigating by text objects. This wa
 
 Vim provides two levels of granularity for navigating around files. Section-by-section with `[]` etc., and method-by-method with `]m` etc. Even languages that don't support functions and classes can work well by defining similar concepts. For example CSS defines a rule-set as a method, and a media-query as a class.
 
-For languages with closures, these typically should not count as functions in Zed. This is best-effort however, as languages like Javascript do not syntactically differentiate syntactically between closures and top-level function declarations.
+For languages with closures, these typically should not count as functions in Zed. This is best-effort however, as languages like JavaScript do not syntactically differentiate syntactically between closures and top-level function declarations.
 
 For languages with declarations like C, provide queries that match `@class.around` or `@function.around`. The `if` and `ic` text objects will default to these if there is no inside.
 
diff --git a/docs/src/globs.md b/docs/src/globs.md
index f3dfbc0acd..4039d7c455 100644
--- a/docs/src/globs.md
+++ b/docs/src/globs.md
@@ -43,7 +43,7 @@ If you wanted to only search Markdown files add `*.md` to the "Include" search f
 
 ### Case insensitive matching
 
-Globs in Zed are case-sensitive, so `*.c` will not match `main.C` (even on case-insensitive filesystems like HFS+/APFS on MacOS). Instead use brackets to match characters. So instead of `*.c` use `*.[cC]`.
+Globs in Zed are case-sensitive, so `*.c` will not match `main.C` (even on case-insensitive filesystems like HFS+/APFS on macOS). Instead use brackets to match characters. So instead of `*.c` use `*.[cC]`.
 
 ### Matching directories
 
@@ -70,7 +70,7 @@ Alternatively, if in your Zed settings you wanted a [`file_types`](./configuring
 
 While globs in Zed are implemented as described above, when writing code using globs in other languages, please reference your platform's glob documentation:
 
-- [MacOS fnmatch](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/fnmatch.3.html) (BSD C Standard Library)
+- [macOS fnmatch](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/fnmatch.3.html) (BSD C Standard Library)
 - [Linux fnmatch](https://www.gnu.org/software/libc/manual/html_node/Wildcard-Matching.html) (GNU C Standard Library)
 - [POSIX fnmatch](https://pubs.opengroup.org/onlinepubs/9699919799/functions/fnmatch.html) (POSIX Specification)
 - [node-glob](https://github.com/isaacs/node-glob) (Node.js `glob` package)
diff --git a/docs/src/languages/deno.md b/docs/src/languages/deno.md
index c40b6531e6..12d36b9ef8 100644
--- a/docs/src/languages/deno.md
+++ b/docs/src/languages/deno.md
@@ -54,7 +54,7 @@ To use the Deno Language Server with TypeScript and TSX files, you will likely w
 See [Configuring supported languages](../configuring-languages.md) in the Zed documentation for more information.
 
 <!--
-TBD: Deno Typescript REPL instructions [docs/repl#typescript-deno](../repl.md#typescript-deno)
+TBD: Deno TypeScript REPL instructions [docs/repl#typescript-deno](../repl.md#typescript-deno)
 -->
 
 ## DAP support
diff --git a/docs/src/languages/gdscript.md b/docs/src/languages/gdscript.md
index 3786518b20..3b779fc890 100644
--- a/docs/src/languages/gdscript.md
+++ b/docs/src/languages/gdscript.md
@@ -8,7 +8,7 @@ Report issues to: [https://github.com/grndctrl/zed-gdscript/issues](https://gith
 
 ## Setup
 
-1. Download and install [Godot for MacOS](https://godotengine.org/download/macos/).
+1. Download and install [Godot for macOS](https://godotengine.org/download/macos/).
 2. Unzip the Godot.app and drag it into your /Applications folder.
 3. Open Godot.app and open your project (an example project is fine)
 4. In Godot, Editor Menu -> Editor Settings; scroll down the left sidebar to `Text Editor -> External`
diff --git a/docs/src/languages/java.md b/docs/src/languages/java.md
index 0312cb3bd7..3117767685 100644
--- a/docs/src/languages/java.md
+++ b/docs/src/languages/java.md
@@ -10,7 +10,7 @@ Java language support in Zed is provided by:
 
 You will need to install a Java runtime (OpenJDK).
 
-- MacOS: `brew install openjdk`
+- macOS: `brew install openjdk`
 - Ubuntu: `sudo add-apt-repository ppa:openjdk-23 && sudo apt-get install openjdk-23`
 - Windows: `choco install openjdk`
 - Arch Linux: `sudo pacman -S jre-openjdk-headless`
@@ -154,7 +154,7 @@ There are also many more options you can pass directly to the language server, f
 
 If you prefer, you can install JDTLS yourself and the extension can be configured to use that instead.
 
-- MacOS: `brew install jdtls`
+- macOS: `brew install jdtls`
 - Arch: [`jdtls` from AUR](https://aur.archlinux.org/packages/jdtls)
 
 Or manually download install:
diff --git a/docs/src/languages/lua.md b/docs/src/languages/lua.md
index 8fdaaafedb..7e92b12b91 100644
--- a/docs/src/languages/lua.md
+++ b/docs/src/languages/lua.md
@@ -18,7 +18,7 @@ To configure LuaLS you can create a `.luarc.json` file in the root of your works
 }
 ```
 
-See [LuaLS Settings Documentation](https://luals.github.io/wiki/settings/) for all available configuration options, or when editing this file in Zed available settings options will autocomplete, (e.g `runtime.version` will show `"Lua 5.1"`, `"Lua 5.2"`, `"Lua 5.3"`, `"Lua 5.4"` and `"LuaJIT"` as allowed values). Note when importing settings options from VSCode, remove the `Lua.` prefix. (e.g. `runtime.version` instead of `Lua.runtime.version`).
+See [LuaLS Settings Documentation](https://luals.github.io/wiki/settings/) for all available configuration options, or when editing this file in Zed available settings options will autocomplete, (e.g `runtime.version` will show `"Lua 5.1"`, `"Lua 5.2"`, `"Lua 5.3"`, `"Lua 5.4"` and `"LuaJIT"` as allowed values). Note when importing settings options from VS Code, remove the `Lua.` prefix. (e.g. `runtime.version` instead of `Lua.runtime.version`).
 
 ### LuaCATS Definitions
 
diff --git a/docs/src/languages/yarn.md b/docs/src/languages/yarn.md
index 57e2ce2aa4..3bb7bd6ae9 100644
--- a/docs/src/languages/yarn.md
+++ b/docs/src/languages/yarn.md
@@ -5,5 +5,5 @@
 ## Setup
 
 1. Run `yarn dlx @yarnpkg/sdks base` to generate a `.yarn/sdks` directory.
-2. Set your language server (e.g. VTSLS) to use Typescript SDK from `.yarn/sdks/typescript/lib` directory in [LSP initialization options](../configuring-zed.md#lsp). The actual setting for that depends on language server; for example, for VTSLS you should set [`typescript.tsdk`](https://github.com/yioneko/vtsls/blob/6adfb5d3889ad4b82c5e238446b27ae3ee1e3767/packages/service/configuration.schema.json#L5).
+2. Set your language server (e.g. VTSLS) to use TypeScript SDK from `.yarn/sdks/typescript/lib` directory in [LSP initialization options](../configuring-zed.md#lsp). The actual setting for that depends on language server; for example, for VTSLS you should set [`typescript.tsdk`](https://github.com/yioneko/vtsls/blob/6adfb5d3889ad4b82c5e238446b27ae3ee1e3767/packages/service/configuration.schema.json#L5).
 3. Voilla! Language server functionalities such as Go to Definition, Code Completions and On Hover documentation should work.
diff --git a/docs/src/repl.md b/docs/src/repl.md
index 9c14ff925f..92b3d81f24 100644
--- a/docs/src/repl.md
+++ b/docs/src/repl.md
@@ -114,7 +114,7 @@ ark --install
 TBD: Improve R REPL (Ark Kernel) instructions
 -->
 
-### Typescript: Deno {#typescript-deno}
+### TypeScript: Deno {#typescript-deno}
 
 - [Install Deno](https://docs.deno.com/runtime/manual/getting_started/installation/) and then install the Deno jupyter kernel:
 
diff --git a/docs/src/snippets.md b/docs/src/snippets.md
index b5d09c6c37..6dc5355907 100644
--- a/docs/src/snippets.md
+++ b/docs/src/snippets.md
@@ -31,7 +31,7 @@ The scope is determined by the language name in lowercase e.g. `python.json` for
 | JSX        | javascript.json |
 | Plain Text | plaintext.json  |
 
-To create JSX snippets you have to use `javascript.json` snippets file, instead of `jsx.json`, but this does not apply to TSX and Typescript which follow the above rule.
+To create JSX snippets you have to use `javascript.json` snippets file, instead of `jsx.json`, but this does not apply to TSX and TypeScript which follow the above rule.
 
 ## Known Limitations
 

From 849424740fdd830afe324f9e7ee81eebae141599 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 9 Sep 2025 02:20:23 -0300
Subject: [PATCH 703/823] Fix code action menu items font size in toolbar
 (#37824)

Closes https://github.com/zed-industries/zed/issues/36478

Release Notes:

- N/A
---
 crates/editor/src/code_context_menus.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 18fce84dbc..eef4e86439 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1502,6 +1502,7 @@ impl CodeActionsMenu {
                                     this.child(
                                         h_flex()
                                             .overflow_hidden()
+                                            .text_sm()
                                             .child(
                                                 // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here.
                                                 action.lsp_action.title().replace("\n", ""),

From 4b3b2acf752dd5fa0b75e70154208f943bbbb5ac Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Mon, 8 Sep 2025 23:55:28 -0600
Subject: [PATCH 704/823] Fix hot reload of builtin TreeSitter queries on Linux
 (#37825)

`fs.watch` is recursive on mac and non-recursive on Linux.

Release Notes:

- N/A
---
 crates/zed/src/main.rs | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index ab24224119..b5fc8943eb 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -1419,30 +1419,35 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut App) {
 fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>, cx: &mut App) {
     use std::time::Duration;
 
-    let path = {
-        let p = Path::new("crates/languages/src");
-        let Ok(full_path) = p.canonicalize() else {
+    cx.background_spawn(async move {
+        let languages_src = Path::new("crates/languages/src");
+        let Some(languages_src) = fs.canonicalize(languages_src).await.log_err() else {
             return;
         };
-        full_path
-    };
 
-    cx.spawn(async move |_| {
-        let (mut events, _) = fs.watch(path.as_path(), Duration::from_millis(100)).await;
+        let (mut events, watcher) = fs.watch(&languages_src, Duration::from_millis(100)).await;
+
+        // add subdirectories since fs.watch is not recursive on Linux
+        if let Some(mut paths) = fs.read_dir(&languages_src).await.log_err() {
+            while let Some(path) = paths.next().await {
+                if let Some(path) = path.log_err()
+                    && fs.is_dir(&path).await
+                {
+                    watcher.add(&path).log_err();
+                }
+            }
+        }
+
         while let Some(event) = events.next().await {
-            let has_language_file = event.iter().any(|event| {
-                event
-                    .path
-                    .extension()
-                    .map(|ext| ext.to_string_lossy().as_ref() == "scm")
-                    .unwrap_or(false)
-            });
+            let has_language_file = event
+                .iter()
+                .any(|event| event.path.extension().is_some_and(|ext| ext == "scm"));
             if has_language_file {
                 languages.reload();
             }
         }
     })
-    .detach()
+    .detach();
 }
 
 #[cfg(not(debug_assertions))]

From 11d81b95d45f73d277e17b9df53e9ad359937175 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Tue, 9 Sep 2025 08:36:25 +0200
Subject: [PATCH 705/823] Revert "git: Use self.git_binary_path instead raw git
 string" (#37828)

Reverts zed-industries/zed#37757
---
 crates/git/src/repository.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index d171743e99..fd12dafa98 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1205,10 +1205,9 @@ impl GitRepository for RealGitRepository {
         env: Arc<HashMap<String, String>>,
     ) -> BoxFuture<'_, Result<()>> {
         let working_directory = self.working_directory();
-        let git_binary_path = self.git_binary_path.clone();
         self.executor
             .spawn(async move {
-                let mut cmd = new_smol_command(&git_binary_path);
+                let mut cmd = new_smol_command("git");
                 cmd.current_dir(&working_directory?)
                     .envs(env.iter())
                     .args(["stash", "push", "--quiet"])
@@ -1230,10 +1229,9 @@ impl GitRepository for RealGitRepository {
 
     fn stash_pop(&self, env: Arc<HashMap<String, String>>) -> BoxFuture<'_, Result<()>> {
         let working_directory = self.working_directory();
-        let git_binary_path = self.git_binary_path.clone();
         self.executor
             .spawn(async move {
-                let mut cmd = new_smol_command(&git_binary_path);
+                let mut cmd = new_smol_command("git");
                 cmd.current_dir(&working_directory?)
                     .envs(env.iter())
                     .args(["stash", "pop"]);
@@ -1258,10 +1256,9 @@ impl GitRepository for RealGitRepository {
         env: Arc<HashMap<String, String>>,
     ) -> BoxFuture<'_, Result<()>> {
         let working_directory = self.working_directory();
-        let git_binary_path = self.git_binary_path.clone();
         self.executor
             .spawn(async move {
-                let mut cmd = new_smol_command(&git_binary_path);
+                let mut cmd = new_smol_command("git");
                 cmd.current_dir(&working_directory?)
                     .envs(env.iter())
                     .args(["commit", "--quiet", "-m"])
@@ -1305,7 +1302,7 @@ impl GitRepository for RealGitRepository {
         let executor = cx.background_executor().clone();
         async move {
             let working_directory = working_directory?;
-            let mut command = new_smol_command(&self.git_binary_path);
+            let mut command = new_smol_command("git");
             command
                 .envs(env.iter())
                 .current_dir(&working_directory)
@@ -1336,7 +1333,7 @@ impl GitRepository for RealGitRepository {
         let working_directory = self.working_directory();
         let executor = cx.background_executor().clone();
         async move {
-            let mut command = new_smol_command(&self.git_binary_path);
+            let mut command = new_smol_command("git");
             command
                 .envs(env.iter())
                 .current_dir(&working_directory?)
@@ -1362,7 +1359,7 @@ impl GitRepository for RealGitRepository {
         let remote_name = format!("{}", fetch_options);
         let executor = cx.background_executor().clone();
         async move {
-            let mut command = new_smol_command(&self.git_binary_path);
+            let mut command = new_smol_command("git");
             command
                 .envs(env.iter())
                 .current_dir(&working_directory?)

From 365c5ab45ffdc3d94a3d89dfbe32fb6bf45d3010 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Tue, 9 Sep 2025 10:04:27 +0200
Subject: [PATCH 706/823] editor: Remove unnecessary clone (#37833)

The style is taken by reference everywhere, so no need to clone it at
the start of every `prepaint`.

Release Notes:

- N/A
---
 crates/editor/src/element.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index d8260dd239..a702d5b74f 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -8298,7 +8298,7 @@ impl Element for EditorElement {
                     let (mut snapshot, is_read_only) = self.editor.update(cx, |editor, cx| {
                         (editor.snapshot(window, cx), editor.read_only(cx))
                     });
-                    let style = self.style.clone();
+                    let style = &self.style;
 
                     let rem_size = window.rem_size();
                     let font_id = window.text_system().resolve_font(&style.text.font());
@@ -8773,7 +8773,7 @@ impl Element for EditorElement {
                                     blame.blame_for_rows(&[row_infos], cx).next()
                                 })
                                 .flatten()?;
-                            let mut element = render_inline_blame_entry(blame_entry, &style, cx)?;
+                            let mut element = render_inline_blame_entry(blame_entry, style, cx)?;
                             let inline_blame_padding = ProjectSettings::get_global(cx)
                                 .git
                                 .inline_blame
@@ -8793,7 +8793,7 @@ impl Element for EditorElement {
                     let longest_line_width = layout_line(
                         snapshot.longest_row(),
                         &snapshot,
-                        &style,
+                        style,
                         editor_width,
                         is_row_soft_wrapped,
                         window,
@@ -8951,7 +8951,7 @@ impl Element for EditorElement {
                                 scroll_pixel_position,
                                 newest_selection_head,
                                 editor_width,
-                                &style,
+                                style,
                                 window,
                                 cx,
                             )
@@ -8969,7 +8969,7 @@ impl Element for EditorElement {
                         end_row,
                         line_height,
                         em_width,
-                        &style,
+                        style,
                         window,
                         cx,
                     );
@@ -9114,7 +9114,7 @@ impl Element for EditorElement {
                                     &line_layouts,
                                     newest_selection_head,
                                     newest_selection_point,
-                                    &style,
+                                    style,
                                     window,
                                     cx,
                                 )

From 466a2e22d5722ba2222753bf9587c8b682fd4b68 Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Tue, 9 Sep 2025 12:46:59 +0200
Subject: [PATCH 707/823] Improve font rendering on macOS (#37622)

Part of https://github.com/zed-industries/zed/issues/7992

Release Notes:

- N/A
---
 crates/gpui/src/platform/mac/text_system.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index 72a0f2e565..9144b2a23a 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -16,7 +16,7 @@ use core_foundation::{
 use core_graphics::{
     base::{CGGlyph, kCGImageAlphaPremultipliedLast},
     color_space::CGColorSpace,
-    context::CGContext,
+    context::{CGContext, CGTextDrawingMode},
     display::CGPoint,
 };
 use core_text::{
@@ -396,6 +396,12 @@ impl MacTextSystemState {
             let subpixel_shift = params
                 .subpixel_variant
                 .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
+            cx.set_allows_font_smoothing(true);
+            cx.set_should_smooth_fonts(true);
+            cx.set_text_drawing_mode(CGTextDrawingMode::CGTextFill);
+            cx.set_gray_fill_color(0.0, 1.0);
+            cx.set_allows_antialiasing(true);
+            cx.set_should_antialias(true);
             cx.set_allows_font_subpixel_positioning(true);
             cx.set_should_subpixel_position_fonts(true);
             cx.set_allows_font_subpixel_quantization(false);

From adf43d691a1c28434c90de75ce1b5642db257383 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 9 Sep 2025 13:21:51 +0200
Subject: [PATCH 708/823] project: Remove non searchable buffer entries on
 buffer close (#37841)

Release Notes:

- N/A
---
 crates/project/src/buffer_store.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
index c2b6145b36..07f8e0c95c 100644
--- a/crates/project/src/buffer_store.rs
+++ b/crates/project/src/buffer_store.rs
@@ -482,6 +482,7 @@ impl LocalBufferStore {
             Some(buffer)
         } else {
             this.opened_buffers.remove(&buffer_id);
+            this.non_searchable_buffers.remove(&buffer_id);
             None
         };
 

From 136468a4df71d31806276f56f9e0448cea6c13e6 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 9 Sep 2025 09:36:12 -0300
Subject: [PATCH 709/823] keymap editor: Add some adjustments to the UI
 (#37819)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Makes the keymap editor search container more consistent with the
project & file search corresponding elements
- Changes the keymap editor menu item in the user menu be called "Keymap
Editor", as opposed to "Key Binding", to match with the tab and action
name

Design note: Still a bit unsure about the extra space on the right for
the keymap editor. This makes it way more consistent with the other
search views, but it also just feels like space that could be used. On
the other hand, though, it's very unlikely anyone will ever use more
than 30% of the search bar width as search queries here are likely
pretty short; definitely much shorter than project search queries.

<img width="600" height="552" alt="Screenshot 2025-09-09 at 1  02@2x"
src="https://github.com/user-attachments/assets/9825a129-2c5a-4852-9837-c586b88e9332"
/>


Release Notes:

- N/A
---
 crates/keymap_editor/src/keymap_editor.rs     | 283 ++++++++++--------
 .../src/ui_components/keystroke_input.rs      |  30 +-
 crates/search/src/project_search.rs           |   5 +-
 crates/search/src/search_bar.rs               |   4 +-
 crates/title_bar/src/title_bar.rs             |   2 +-
 crates/ui_input/src/ui_input.rs               |   2 +-
 6 files changed, 178 insertions(+), 148 deletions(-)

diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index a8e356276b..7e0a96d47a 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -1576,33 +1576,6 @@ impl Render for KeymapEditor {
                     .child(
                         h_flex()
                             .gap_2()
-                            .child(
-                                right_click_menu("open-keymap-menu")
-                                    .menu(|window, cx| {
-                                        ContextMenu::build(window, cx, |menu, _, _| {
-                                            menu.header("Open Keymap JSON")
-                                                .action("User", zed_actions::OpenKeymap.boxed_clone())
-                                                .action("Zed Default", zed_actions::OpenDefaultKeymap.boxed_clone())
-                                                .action("Vim Default", vim::OpenDefaultKeymap.boxed_clone())
-                                        })
-                                    })
-                                    .anchor(gpui::Corner::TopLeft)
-                                    .trigger(|open, _, _|
-                                        IconButton::new(
-                                            "OpenKeymapJsonButton",
-                                            IconName::Json
-                                        )
-                                        .shape(ui::IconButtonShape::Square)
-                                        .when(!open, |this|
-                                            this.tooltip(move |window, cx| {
-                                                Tooltip::with_meta("Open Keymap JSON", Some(&zed_actions::OpenKeymap),"Right click to view more options", window, cx)
-                                            })
-                                        )
-                                        .on_click(|_, window, cx| {
-                                            window.dispatch_action(zed_actions::OpenKeymap.boxed_clone(), cx);
-                                        })
-                                    )
-                            )
                             .child(
                                 div()
                                     .key_context({
@@ -1617,73 +1590,139 @@ impl Render for KeymapEditor {
                                     .py_1()
                                     .border_1()
                                     .border_color(theme.colors().border)
-                                    .rounded_lg()
+                                    .rounded_md()
                                     .child(self.filter_editor.clone()),
                             )
                             .child(
-                                IconButton::new(
-                                    "KeymapEditorToggleFiltersIcon",
-                                    IconName::Keyboard,
-                                )
-                                .shape(ui::IconButtonShape::Square)
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-
-                                    move |window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Search by Keystroke",
-                                            &ToggleKeystrokeSearch,
-                                            &focus_handle.clone(),
-                                            window,
-                                            cx,
+                                h_flex()
+                                    .gap_1()
+                                    .min_w_64()
+                                    .child(
+                                        IconButton::new(
+                                            "KeymapEditorToggleFiltersIcon",
+                                            IconName::Keyboard,
                                         )
-                                    }
-                                })
-                                .toggle_state(matches!(
-                                    self.search_mode,
-                                    SearchMode::KeyStroke { .. }
-                                ))
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(ToggleKeystrokeSearch.boxed_clone(), cx);
-                                }),
-                            )
-                            .child(
-                                IconButton::new("KeymapEditorConflictIcon", IconName::Warning)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .when(
-                                        self.keybinding_conflict_state.any_user_binding_conflicts(),
-                                        |this| {
-                                            this.indicator(Indicator::dot().color(Color::Warning))
-                                        },
-                                    )
-                                    .tooltip({
-                                        let filter_state = self.filter_state;
-                                        let focus_handle = focus_handle.clone();
+                                        .icon_size(IconSize::Small)
+                                        .tooltip({
+                                            let focus_handle = focus_handle.clone();
 
-                                        move |window, cx| {
-                                            Tooltip::for_action_in(
-                                                match filter_state {
-                                                    FilterState::All => "Show Conflicts",
-                                                    FilterState::Conflicts => "Hide Conflicts",
-                                                },
-                                                &ToggleConflictFilter,
-                                                &focus_handle.clone(),
-                                                window,
+                                            move |window, cx| {
+                                                Tooltip::for_action_in(
+                                                    "Search by Keystroke",
+                                                    &ToggleKeystrokeSearch,
+                                                    &focus_handle.clone(),
+                                                    window,
+                                                    cx,
+                                                )
+                                            }
+                                        })
+                                        .toggle_state(matches!(
+                                            self.search_mode,
+                                            SearchMode::KeyStroke { .. }
+                                        ))
+                                        .on_click(|_, window, cx| {
+                                            window.dispatch_action(
+                                                ToggleKeystrokeSearch.boxed_clone(),
                                                 cx,
+                                            );
+                                        }),
+                                    )
+                                    .child(
+                                        IconButton::new("KeymapEditorConflictIcon", IconName::Warning)
+                                            .icon_size(IconSize::Small)
+                                            .when(
+                                                self.keybinding_conflict_state
+                                                    .any_user_binding_conflicts(),
+                                                |this| {
+                                                    this.indicator(
+                                                        Indicator::dot().color(Color::Warning),
+                                                    )
+                                                },
                                             )
-                                        }
-                                    })
-                                    .selected_icon_color(Color::Warning)
-                                    .toggle_state(matches!(
-                                        self.filter_state,
-                                        FilterState::Conflicts
-                                    ))
-                                    .on_click(|_, window, cx| {
-                                        window.dispatch_action(
-                                            ToggleConflictFilter.boxed_clone(),
-                                            cx,
-                                        );
-                                    }),
+                                            .tooltip({
+                                                let filter_state = self.filter_state;
+                                                let focus_handle = focus_handle.clone();
+
+                                                move |window, cx| {
+                                                    Tooltip::for_action_in(
+                                                        match filter_state {
+                                                            FilterState::All => "Show Conflicts",
+                                                            FilterState::Conflicts => {
+                                                                "Hide Conflicts"
+                                                            }
+                                                        },
+                                                        &ToggleConflictFilter,
+                                                        &focus_handle.clone(),
+                                                        window,
+                                                        cx,
+                                                    )
+                                                }
+                                            })
+                                            .selected_icon_color(Color::Warning)
+                                            .toggle_state(matches!(
+                                                self.filter_state,
+                                                FilterState::Conflicts
+                                            ))
+                                            .on_click(|_, window, cx| {
+                                                window.dispatch_action(
+                                                    ToggleConflictFilter.boxed_clone(),
+                                                    cx,
+                                                );
+                                            }),
+                                    )
+                                    .child(
+                                        div()
+                                            .ml_1()
+                                            .pl_2()
+                                            .border_l_1()
+                                            .border_color(cx.theme().colors().border_variant)
+                                            .child(
+                                                right_click_menu("open-keymap-menu")
+                                                    .menu(|window, cx| {
+                                                        ContextMenu::build(window, cx, |menu, _, _| {
+                                                            menu.header("Open Keymap JSON")
+                                                                .action(
+                                                                    "User",
+                                                                    zed_actions::OpenKeymap.boxed_clone(),
+                                                                )
+                                                                .action(
+                                                                    "Zed Default",
+                                                                    zed_actions::OpenDefaultKeymap
+                                                                        .boxed_clone(),
+                                                                )
+                                                                .action(
+                                                                    "Vim Default",
+                                                                    vim::OpenDefaultKeymap.boxed_clone(),
+                                                                )
+                                                        })
+                                                    })
+                                                    .anchor(gpui::Corner::TopLeft)
+                                                    .trigger(|open, _, _| {
+                                                        IconButton::new(
+                                                            "OpenKeymapJsonButton",
+                                                            IconName::Json,
+                                                        )
+                                                        .icon_size(IconSize::Small)
+                                                        .when(!open, |this| {
+                                                            this.tooltip(move |window, cx| {
+                                                                Tooltip::with_meta(
+                                                                    "Open keymap.json",
+                                                                    Some(&zed_actions::OpenKeymap),
+                                                                    "Right click to view more options",
+                                                                    window,
+                                                                    cx,
+                                                                )
+                                                            })
+                                                        })
+                                                        .on_click(|_, window, cx| {
+                                                            window.dispatch_action(
+                                                                zed_actions::OpenKeymap.boxed_clone(),
+                                                                cx,
+                                                            );
+                                                        })
+                                                    }),
+                                            ),
+                                    )
                             ),
                     )
                     .when_some(
@@ -1694,48 +1733,42 @@ impl Render for KeymapEditor {
                         |this, exact_match| {
                             this.child(
                                 h_flex()
-                                    .map(|this| {
-                                        if self
-                                            .keybinding_conflict_state
-                                            .any_user_binding_conflicts()
-                                        {
-                                            this.pr(rems_from_px(54.))
-                                        } else {
-                                            this.pr_7()
-                                        }
-                                    })
                                     .gap_2()
                                     .child(self.keystroke_editor.clone())
                                     .child(
-                                        IconButton::new(
-                                            "keystrokes-exact-match",
-                                            IconName::CaseSensitive,
-                                        )
-                                        .tooltip({
-                                            let keystroke_focus_handle =
-                                                self.keystroke_editor.read(cx).focus_handle(cx);
-
-                                            move |window, cx| {
-                                                Tooltip::for_action_in(
-                                                    "Toggle Exact Match Mode",
-                                                    &ToggleExactKeystrokeMatching,
-                                                    &keystroke_focus_handle,
-                                                    window,
-                                                    cx,
+                                        h_flex()
+                                            .min_w_64()
+                                            .child(
+                                                IconButton::new(
+                                                    "keystrokes-exact-match",
+                                                    IconName::CaseSensitive,
                                                 )
-                                            }
-                                        })
-                                        .shape(IconButtonShape::Square)
-                                        .toggle_state(exact_match)
-                                        .on_click(
-                                            cx.listener(|_, _, window, cx| {
-                                                window.dispatch_action(
-                                                    ToggleExactKeystrokeMatching.boxed_clone(),
-                                                    cx,
-                                                );
-                                            }),
-                                        ),
-                                    ),
+                                                .tooltip({
+                                                    let keystroke_focus_handle =
+                                                        self.keystroke_editor.read(cx).focus_handle(cx);
+
+                                                    move |window, cx| {
+                                                        Tooltip::for_action_in(
+                                                            "Toggle Exact Match Mode",
+                                                            &ToggleExactKeystrokeMatching,
+                                                            &keystroke_focus_handle,
+                                                            window,
+                                                            cx,
+                                                        )
+                                                    }
+                                                })
+                                                .shape(IconButtonShape::Square)
+                                                .toggle_state(exact_match)
+                                                .on_click(
+                                                    cx.listener(|_, _, window, cx| {
+                                                        window.dispatch_action(
+                                                            ToggleExactKeystrokeMatching.boxed_clone(),
+                                                            cx,
+                                                        );
+                                                    }),
+                                                ),
+                                            ),
+                                    )
                             )
                         },
                     ),
diff --git a/crates/keymap_editor/src/ui_components/keystroke_input.rs b/crates/keymap_editor/src/ui_components/keystroke_input.rs
index e6b2ff7105..e264df3b62 100644
--- a/crates/keymap_editor/src/ui_components/keystroke_input.rs
+++ b/crates/keymap_editor/src/ui_components/keystroke_input.rs
@@ -461,7 +461,7 @@ impl Render for KeystrokeInput {
         let is_focused = self.outer_focus_handle.contains_focused(window, cx);
         let is_recording = self.is_recording(window);
 
-        let horizontal_padding = rems_from_px(64.);
+        let width = rems_from_px(64.);
 
         let recording_bg_color = colors
             .editor_background
@@ -528,6 +528,9 @@ impl Render for KeystrokeInput {
         h_flex()
             .id("keystroke-input")
             .track_focus(&self.outer_focus_handle)
+            .key_context(Self::key_context())
+            .on_action(cx.listener(Self::start_recording))
+            .on_action(cx.listener(Self::clear_keystrokes))
             .py_2()
             .px_3()
             .gap_2()
@@ -535,7 +538,7 @@ impl Render for KeystrokeInput {
             .w_full()
             .flex_1()
             .justify_between()
-            .rounded_sm()
+            .rounded_md()
             .overflow_hidden()
             .map(|this| {
                 if is_recording {
@@ -545,16 +548,16 @@ impl Render for KeystrokeInput {
                 }
             })
             .border_1()
-            .border_color(colors.border_variant)
-            .when(is_focused, |parent| {
-                parent.border_color(colors.border_focused)
+            .map(|this| {
+                if is_focused {
+                    this.border_color(colors.border_focused)
+                } else {
+                    this.border_color(colors.border_variant)
+                }
             })
-            .key_context(Self::key_context())
-            .on_action(cx.listener(Self::start_recording))
-            .on_action(cx.listener(Self::clear_keystrokes))
             .child(
                 h_flex()
-                    .w(horizontal_padding)
+                    .w(width)
                     .gap_0p5()
                     .justify_start()
                     .flex_none()
@@ -573,14 +576,13 @@ impl Render for KeystrokeInput {
                     .id("keystroke-input-inner")
                     .track_focus(&self.inner_focus_handle)
                     .on_modifiers_changed(cx.listener(Self::on_modifiers_changed))
-                    .size_full()
                     .when(!self.search, |this| {
                         this.focus(|mut style| {
                             style.border_color = Some(colors.border_focused);
                             style
                         })
                     })
-                    .w_full()
+                    .size_full()
                     .min_w_0()
                     .justify_center()
                     .flex_wrap()
@@ -589,7 +591,7 @@ impl Render for KeystrokeInput {
             )
             .child(
                 h_flex()
-                    .w(horizontal_padding)
+                    .w(width)
                     .gap_0p5()
                     .justify_end()
                     .flex_none()
@@ -641,9 +643,7 @@ impl Render for KeystrokeInput {
                                 "Clear Keystrokes",
                                 &ClearKeystrokes,
                             ))
-                            .when(!is_recording || !is_focused, |this| {
-                                this.icon_color(Color::Muted)
-                            })
+                            .when(!is_focused, |this| this.icon_color(Color::Muted))
                             .on_click(cx.listener(|this, _event, window, cx| {
                                 this.clear_keystrokes(&ClearKeystrokes, window, cx);
                             })),
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 33458a3a88..80ed0958b7 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -36,10 +36,7 @@ use std::{
     pin::pin,
     sync::Arc,
 };
-use ui::{
-    Icon, IconButton, IconButtonShape, IconName, KeyBinding, Label, LabelCommon, LabelSize,
-    Toggleable, Tooltip, h_flex, prelude::*, utils::SearchInputWidth, v_flex,
-};
+use ui::{IconButtonShape, KeyBinding, Toggleable, Tooltip, prelude::*, utils::SearchInputWidth};
 use util::{ResultExt as _, paths::PathMatcher};
 use workspace::{
     DeploySearch, ItemNavHistory, NewSearch, ToolbarItemEvent, ToolbarItemLocation,
diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs
index 44f6b3fdd2..631b96b69f 100644
--- a/crates/search/src/search_bar.rs
+++ b/crates/search/src/search_bar.rs
@@ -41,15 +41,15 @@ pub(super) fn render_action_button(
 
 pub(crate) fn input_base_styles(border_color: Hsla, map: impl FnOnce(Div) -> Div) -> Div {
     h_flex()
-        .min_w_32()
         .map(map)
+        .min_w_32()
         .h_8()
         .pl_2()
         .pr_1()
         .py_1()
         .border_1()
         .border_color(border_color)
-        .rounded_lg()
+        .rounded_md()
 }
 
 pub(crate) fn render_text_input(
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 0090929937..e15e7ad46d 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -693,7 +693,7 @@ impl TitleBar {
                             "Settings Profiles",
                             zed_actions::settings_profile_selector::Toggle.boxed_clone(),
                         )
-                        .action("Key Bindings", Box::new(keymap_editor::OpenKeymapEditor))
+                        .action("Keymap Editor", Box::new(keymap_editor::OpenKeymapEditor))
                         .action(
                             "Themes…",
                             zed_actions::theme_selector::Toggle::default().boxed_clone(),
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index 02f8ef89f3..39a701c8e8 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -168,7 +168,7 @@ impl Render for SingleLineInput {
                     .py_1p5()
                     .flex_grow()
                     .text_color(style.text_color)
-                    .rounded_sm()
+                    .rounded_md()
                     .bg(style.background_color)
                     .border_1()
                     .border_color(style.border_color)

From 734f94b71c48b138235538abb2eced9e5da5691f Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Tue, 9 Sep 2025 19:16:22 +0530
Subject: [PATCH 710/823] agent_ui: Fix crash when typing multibyte character
 after mention (#37847)

Closes #36333

Release Notes:

- Fixed a crash that occurred when typing an IME character right after a
mention in the Agent Panel.
---
 .../agent_ui/src/acp/completion_provider.rs   | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index ecaa9cd450..f4bc6eaf7f 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1066,13 +1066,21 @@ struct MentionCompletion {
 impl MentionCompletion {
     fn try_parse(allow_non_file_mentions: bool, line: &str, offset_to_line: usize) -> Option<Self> {
         let last_mention_start = line.rfind('@')?;
-        if last_mention_start >= line.len() {
-            return Some(Self::default());
+
+        // No whitespace immediately after '@'
+        if line[last_mention_start + 1..]
+            .chars()
+            .next()
+            .is_some_and(|c| c.is_whitespace())
+        {
+            return None;
         }
+
+        //  Must be a word boundary before '@'
         if last_mention_start > 0
-            && line
+            && line[..last_mention_start]
                 .chars()
-                .nth(last_mention_start - 1)
+                .last()
                 .is_some_and(|c| !c.is_whitespace())
         {
             return None;
@@ -1085,7 +1093,9 @@ impl MentionCompletion {
 
         let mut parts = rest_of_line.split_whitespace();
         let mut end = last_mention_start + 1;
+
         if let Some(mode_text) = parts.next() {
+            // Safe since we check no leading whitespace above
             end += mode_text.len();
 
             if let Some(parsed_mode) = ContextPickerMode::try_from(mode_text).ok()
@@ -1278,5 +1288,23 @@ mod tests {
                 argument: Some("main".to_string()),
             })
         );
+
+        assert_eq!(
+            MentionCompletion::try_parse(true, "Lorem@symbol", 0),
+            None,
+            "Should not parse mention inside word"
+        );
+
+        assert_eq!(
+            MentionCompletion::try_parse(true, "Lorem @ file", 0),
+            None,
+            "Should not parse with a space after @"
+        );
+
+        assert_eq!(
+            MentionCompletion::try_parse(true, "@ file", 0),
+            None,
+            "Should not parse with a space after @ at the start of the line"
+        );
     }
 }

From af1875f91ce1573939626dd4450fbc9c26163821 Mon Sep 17 00:00:00 2001
From: Dave Waggoner <waggoner.dave@gmail.com>
Date: Tue, 9 Sep 2025 07:31:37 -0700
Subject: [PATCH 711/823] terminal_view: Improve path hyperlink navigation by
 considering the terminal working directory (#36962)

Closes #34027

Release Notes:

- Improved terminal path hyperlink navigation by considering the
terminal working directory
---
 .../src/terminal_path_like_target.rs          | 794 ++++++++++++++----
 1 file changed, 649 insertions(+), 145 deletions(-)

diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
index 226a8f4c3d..22d4de73a8 100644
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -4,38 +4,63 @@ use editor::Editor;
 use gpui::{App, AppContext, Context, Task, WeakEntity, Window};
 use itertools::Itertools;
 use project::{Entry, Metadata};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use terminal::PathLikeTarget;
 use util::{ResultExt, debug_panic, paths::PathWithPosition};
 use workspace::{OpenOptions, OpenVisible, Workspace};
 
+/// The way we found the open target. This is important to have for test assertions.
+/// For example, remote projects never look in the file system.
+#[cfg(test)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+enum OpenTargetFoundBy {
+    WorktreeExact,
+    WorktreeScan,
+    FileSystemBackground,
+}
+
+#[cfg(test)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+enum BackgroundFsChecks {
+    Enabled,
+    Disabled,
+}
+
 #[derive(Debug, Clone)]
 enum OpenTarget {
-    Worktree(PathWithPosition, Entry),
+    Worktree(PathWithPosition, Entry, #[cfg(test)] OpenTargetFoundBy),
     File(PathWithPosition, Metadata),
 }
 
 impl OpenTarget {
     fn is_file(&self) -> bool {
         match self {
-            OpenTarget::Worktree(_, entry) => entry.is_file(),
+            OpenTarget::Worktree(_, entry, ..) => entry.is_file(),
             OpenTarget::File(_, metadata) => !metadata.is_dir,
         }
     }
 
     fn is_dir(&self) -> bool {
         match self {
-            OpenTarget::Worktree(_, entry) => entry.is_dir(),
+            OpenTarget::Worktree(_, entry, ..) => entry.is_dir(),
             OpenTarget::File(_, metadata) => metadata.is_dir,
         }
     }
 
     fn path(&self) -> &PathWithPosition {
         match self {
-            OpenTarget::Worktree(path, _) => path,
+            OpenTarget::Worktree(path, ..) => path,
             OpenTarget::File(path, _) => path,
         }
     }
+
+    #[cfg(test)]
+    fn found_by(&self) -> OpenTargetFoundBy {
+        match self {
+            OpenTarget::Worktree(.., found_by) => *found_by,
+            OpenTarget::File(..) => OpenTargetFoundBy::FileSystemBackground,
+        }
+    }
 }
 
 pub(super) fn hover_path_like_target(
@@ -44,12 +69,41 @@ pub(super) fn hover_path_like_target(
     path_like_target: &PathLikeTarget,
     cx: &mut Context<TerminalView>,
 ) -> Task<()> {
-    let file_to_open_task = possible_open_target(workspace, path_like_target, cx);
+    #[cfg(not(test))]
+    {
+        possible_hover_target(workspace, hovered_word, path_like_target, cx)
+    }
+    #[cfg(test)]
+    {
+        possible_hover_target(
+            workspace,
+            hovered_word,
+            path_like_target,
+            cx,
+            BackgroundFsChecks::Enabled,
+        )
+    }
+}
+
+fn possible_hover_target(
+    workspace: &WeakEntity<Workspace>,
+    hovered_word: HoveredWord,
+    path_like_target: &PathLikeTarget,
+    cx: &mut Context<TerminalView>,
+    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
+) -> Task<()> {
+    let file_to_open_task = possible_open_target(
+        workspace,
+        path_like_target,
+        cx,
+        #[cfg(test)]
+        background_fs_checks,
+    );
     cx.spawn(async move |terminal_view, cx| {
         let file_to_open = file_to_open_task.await;
         terminal_view
             .update(cx, |terminal_view, _| match file_to_open {
-                Some(OpenTarget::File(path, _) | OpenTarget::Worktree(path, _)) => {
+                Some(OpenTarget::File(path, _) | OpenTarget::Worktree(path, ..)) => {
                     terminal_view.hover = Some(HoverTarget {
                         tooltip: path.to_string(|path| path.to_string_lossy().to_string()),
                         hovered_word,
@@ -67,6 +121,7 @@ fn possible_open_target(
     workspace: &WeakEntity<Workspace>,
     path_like_target: &PathLikeTarget,
     cx: &App,
+    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
 ) -> Task<Option<OpenTarget>> {
     let Some(workspace) = workspace.upgrade() else {
         return Task::ready(None);
@@ -117,9 +172,19 @@ fn possible_open_target(
     // If we won't find paths "easily", we can traverse the entire worktree to look what ends with the potential path suffix.
     // That will be slow, though, so do the fast checks first.
     let mut worktree_paths_to_check = Vec::new();
-    for worktree in &worktree_candidates {
+    let mut is_cwd_in_worktree = false;
+    let mut open_target = None;
+    'worktree_loop: for worktree in &worktree_candidates {
         let worktree_root = worktree.read(cx).abs_path();
         let mut paths_to_check = Vec::with_capacity(potential_paths.len());
+        let relative_cwd = cwd
+            .and_then(|cwd| cwd.strip_prefix(&worktree_root).ok())
+            .and_then(|cwd_stripped| {
+                (cwd_stripped != Path::new("")).then(|| {
+                    is_cwd_in_worktree = true;
+                    cwd_stripped
+                })
+            });
 
         for path_with_position in &potential_paths {
             let path_to_check = if worktree_root.ends_with(&path_with_position.path) {
@@ -130,10 +195,13 @@ fn possible_open_target(
                 };
                 match worktree.read(cx).root_entry() {
                     Some(root_entry) => {
-                        return Task::ready(Some(OpenTarget::Worktree(
+                        open_target = Some(OpenTarget::Worktree(
                             root_path_with_position,
                             root_entry.clone(),
-                        )));
+                            #[cfg(test)]
+                            OpenTargetFoundBy::WorktreeExact,
+                        ));
+                        break 'worktree_loop;
                     }
                     None => root_path_with_position,
                 }
@@ -150,16 +218,26 @@ fn possible_open_target(
             };
 
             if path_to_check.path.is_relative()
-                && let Some(entry) = worktree.read(cx).entry_for_path(&path_to_check.path)
+                && !worktree.read(cx).is_single_file()
+                && let Some(entry) = relative_cwd
+                    .and_then(|relative_cwd| {
+                        worktree
+                            .read(cx)
+                            .entry_for_path(&relative_cwd.join(&path_to_check.path))
+                    })
+                    .or_else(|| worktree.read(cx).entry_for_path(&path_to_check.path))
             {
-                return Task::ready(Some(OpenTarget::Worktree(
+                open_target = Some(OpenTarget::Worktree(
                     PathWithPosition {
                         path: worktree_root.join(&entry.path),
                         row: path_to_check.row,
                         column: path_to_check.column,
                     },
                     entry.clone(),
-                )));
+                    #[cfg(test)]
+                    OpenTargetFoundBy::WorktreeExact,
+                ));
+                break 'worktree_loop;
             }
 
             paths_to_check.push(path_to_check);
@@ -170,101 +248,143 @@ fn possible_open_target(
         }
     }
 
-    // Before entire worktree traversal(s), make an attempt to do FS checks if available.
-    let fs_paths_to_check = if workspace.read(cx).project().read(cx).is_local() {
-        potential_paths
-            .into_iter()
-            .flat_map(|path_to_check| {
-                let mut paths_to_check = Vec::new();
-                let maybe_path = &path_to_check.path;
-                if maybe_path.starts_with("~") {
-                    if let Some(home_path) =
-                        maybe_path
-                            .strip_prefix("~")
-                            .ok()
-                            .and_then(|stripped_maybe_path| {
-                                Some(dirs::home_dir()?.join(stripped_maybe_path))
-                            })
-                    {
-                        paths_to_check.push(PathWithPosition {
-                            path: home_path,
-                            row: path_to_check.row,
-                            column: path_to_check.column,
-                        });
-                    }
-                } else {
-                    paths_to_check.push(PathWithPosition {
-                        path: maybe_path.clone(),
-                        row: path_to_check.row,
-                        column: path_to_check.column,
-                    });
-                    if maybe_path.is_relative() {
-                        if let Some(cwd) = &cwd {
-                            paths_to_check.push(PathWithPosition {
-                                path: cwd.join(maybe_path),
-                                row: path_to_check.row,
-                                column: path_to_check.column,
-                            });
-                        }
-                        for worktree in &worktree_candidates {
-                            paths_to_check.push(PathWithPosition {
-                                path: worktree.read(cx).abs_path().join(maybe_path),
-                                row: path_to_check.row,
-                                column: path_to_check.column,
-                            });
-                        }
-                    }
-                }
-                paths_to_check
-            })
-            .collect()
-    } else {
-        Vec::new()
-    };
+    #[cfg(not(test))]
+    let enable_background_fs_checks = workspace.read(cx).project().read(cx).is_local();
+    #[cfg(test)]
+    let enable_background_fs_checks = background_fs_checks == BackgroundFsChecks::Enabled;
 
-    let worktree_check_task = cx.spawn(async move |cx| {
-        for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
-            let found_entry = worktree
-                .update(cx, |worktree, _| {
-                    let worktree_root = worktree.abs_path();
-                    let traversal = worktree.traverse_from_path(true, true, false, "".as_ref());
-                    for entry in traversal {
-                        if let Some(path_in_worktree) = worktree_paths_to_check
-                            .iter()
-                            .find(|path_to_check| entry.path.ends_with(&path_to_check.path))
-                        {
-                            return Some(OpenTarget::Worktree(
-                                PathWithPosition {
-                                    path: worktree_root.join(&entry.path),
-                                    row: path_in_worktree.row,
-                                    column: path_in_worktree.column,
-                                },
-                                entry.clone(),
-                            ));
+    if open_target.is_some() {
+        // We we want to prefer open targets found via background fs checks over worktree matches,
+        // however we can return early if either:
+        //   - This is a remote project, or
+        //   - If the terminal working directory is inside of at least one worktree
+        if !enable_background_fs_checks || is_cwd_in_worktree {
+            return Task::ready(open_target);
+        }
+    }
+
+    // Before entire worktree traversal(s), make an attempt to do FS checks if available.
+    let fs_paths_to_check =
+        if enable_background_fs_checks {
+            let fs_cwd_paths_to_check = cwd
+                .iter()
+                .flat_map(|cwd| {
+                    let mut paths_to_check = Vec::new();
+                    for path_to_check in &potential_paths {
+                        let maybe_path = &path_to_check.path;
+                        if path_to_check.path.is_relative() {
+                            paths_to_check.push(PathWithPosition {
+                                path: cwd.join(&maybe_path),
+                                row: path_to_check.row,
+                                column: path_to_check.column,
+                            });
                         }
                     }
-                    None
+                    paths_to_check
                 })
-                .ok()?;
-            if let Some(found_entry) = found_entry {
-                return Some(found_entry);
-            }
-        }
-        None
-    });
+                .collect::<Vec<_>>();
+            fs_cwd_paths_to_check
+                .into_iter()
+                .chain(
+                    potential_paths
+                        .into_iter()
+                        .flat_map(|path_to_check| {
+                            let mut paths_to_check = Vec::new();
+                            let maybe_path = &path_to_check.path;
+                            if maybe_path.starts_with("~") {
+                                if let Some(home_path) = maybe_path.strip_prefix("~").ok().and_then(
+                                    |stripped_maybe_path| {
+                                        Some(dirs::home_dir()?.join(stripped_maybe_path))
+                                    },
+                                ) {
+                                    paths_to_check.push(PathWithPosition {
+                                        path: home_path,
+                                        row: path_to_check.row,
+                                        column: path_to_check.column,
+                                    });
+                                }
+                            } else {
+                                paths_to_check.push(PathWithPosition {
+                                    path: maybe_path.clone(),
+                                    row: path_to_check.row,
+                                    column: path_to_check.column,
+                                });
+                                if maybe_path.is_relative() {
+                                    for worktree in &worktree_candidates {
+                                        if !worktree.read(cx).is_single_file() {
+                                            paths_to_check.push(PathWithPosition {
+                                                path: worktree.read(cx).abs_path().join(maybe_path),
+                                                row: path_to_check.row,
+                                                column: path_to_check.column,
+                                            });
+                                        }
+                                    }
+                                }
+                            }
+                            paths_to_check
+                        })
+                        .collect::<Vec<_>>(),
+                )
+                .collect()
+        } else {
+            Vec::new()
+        };
 
     let fs = workspace.read(cx).project().read(cx).fs().clone();
-    cx.background_spawn(async move {
+    let background_fs_checks_task = cx.background_spawn(async move {
         for mut path_to_check in fs_paths_to_check {
             if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
                 && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
             {
-                path_to_check.path = fs_path_to_check;
-                return Some(OpenTarget::File(path_to_check, metadata));
+                if open_target
+                    .as_ref()
+                    .map(|open_target| open_target.path().path != fs_path_to_check)
+                    .unwrap_or(true)
+                {
+                    path_to_check.path = fs_path_to_check;
+                    return Some(OpenTarget::File(path_to_check, metadata));
+                }
+
+                break;
             }
         }
 
-        worktree_check_task.await
+        open_target
+    });
+
+    cx.spawn(async move |cx| {
+        background_fs_checks_task.await.or_else(|| {
+            for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
+                let found_entry = worktree
+                    .update(cx, |worktree, _| -> Option<OpenTarget> {
+                        let worktree_root = worktree.abs_path();
+                        let traversal = worktree.traverse_from_path(true, true, false, "".as_ref());
+                        for entry in traversal {
+                            if let Some(path_in_worktree) = worktree_paths_to_check
+                                .iter()
+                                .find(|path_to_check| entry.path.ends_with(&path_to_check.path))
+                            {
+                                return Some(OpenTarget::Worktree(
+                                    PathWithPosition {
+                                        path: worktree_root.join(&entry.path),
+                                        row: path_in_worktree.row,
+                                        column: path_in_worktree.column,
+                                    },
+                                    entry.clone(),
+                                    #[cfg(test)]
+                                    OpenTargetFoundBy::WorktreeScan,
+                                ));
+                            }
+                        }
+                        None
+                    })
+                    .ok()?;
+                if let Some(found_entry) = found_entry {
+                    return Some(found_entry);
+                }
+            }
+            None
+        })
     })
 }
 
@@ -275,8 +395,23 @@ pub(super) fn open_path_like_target(
     window: &mut Window,
     cx: &mut Context<TerminalView>,
 ) {
-    possibly_open_target(workspace, terminal_view, path_like_target, window, cx)
+    #[cfg(not(test))]
+    {
+        possibly_open_target(workspace, terminal_view, path_like_target, window, cx)
+            .detach_and_log_err(cx)
+    }
+    #[cfg(test)]
+    {
+        possibly_open_target(
+            workspace,
+            terminal_view,
+            path_like_target,
+            window,
+            cx,
+            BackgroundFsChecks::Enabled,
+        )
         .detach_and_log_err(cx)
+    }
 }
 
 fn possibly_open_target(
@@ -285,6 +420,7 @@ fn possibly_open_target(
     path_like_target: &PathLikeTarget,
     window: &mut Window,
     cx: &mut Context<TerminalView>,
+    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
 ) -> Task<Result<Option<OpenTarget>>> {
     if terminal_view.hover.is_none() {
         return Task::ready(Ok(None));
@@ -294,7 +430,13 @@ fn possibly_open_target(
     cx.spawn_in(window, async move |terminal_view, cx| {
         let Some(open_target) = terminal_view
             .update(cx, |_, cx| {
-                possible_open_target(&workspace, &path_like_target, cx)
+                possible_open_target(
+                    &workspace,
+                    &path_like_target,
+                    cx,
+                    #[cfg(test)]
+                    background_fs_checks,
+                )
             })?
             .await
         else {
@@ -375,8 +517,11 @@ mod tests {
         app_cx: &mut TestAppContext,
         trees: impl IntoIterator<Item = (&str, serde_json::Value)>,
         worktree_roots: impl IntoIterator<Item = &str>,
-    ) -> impl AsyncFnMut(HoveredWord, PathLikeTarget) -> (Option<HoverTarget>, Option<OpenTarget>)
-    {
+    ) -> impl AsyncFnMut(
+        HoveredWord,
+        PathLikeTarget,
+        BackgroundFsChecks,
+    ) -> (Option<HoverTarget>, Option<OpenTarget>) {
         let fs = app_cx.update(AppState::test).fs.as_fake().clone();
 
         app_cx.update(|cx| {
@@ -393,10 +538,7 @@ mod tests {
 
         let project = Project::test(
             fs.clone(),
-            worktree_roots
-                .into_iter()
-                .map(Path::new)
-                .collect::<Vec<_>>(),
+            worktree_roots.into_iter().map(Path::new),
             app_cx,
         )
         .await;
@@ -424,16 +566,18 @@ mod tests {
         });
 
         async move |hovered_word: HoveredWord,
-                    path_like_target: PathLikeTarget|
+                    path_like_target: PathLikeTarget,
+                    background_fs_checks: BackgroundFsChecks|
                     -> (Option<HoverTarget>, Option<OpenTarget>) {
             let workspace_a = workspace.clone();
             terminal_view
                 .update(cx, |_, cx| {
-                    hover_path_like_target(
+                    possible_hover_target(
                         &workspace_a.downgrade(),
                         hovered_word,
                         &path_like_target,
                         cx,
+                        background_fs_checks,
                     )
                 })
                 .await;
@@ -449,6 +593,7 @@ mod tests {
                         &path_like_target,
                         window,
                         cx,
+                        background_fs_checks,
                     )
                 })
                 .await
@@ -462,10 +607,13 @@ mod tests {
         test_path_like: &mut impl AsyncFnMut(
             HoveredWord,
             PathLikeTarget,
+            BackgroundFsChecks,
         ) -> (Option<HoverTarget>, Option<OpenTarget>),
         maybe_path: &str,
         tooltip: &str,
         terminal_dir: Option<PathBuf>,
+        background_fs_checks: BackgroundFsChecks,
+        mut open_target_found_by: OpenTargetFoundBy,
         file: &str,
         line: u32,
     ) {
@@ -479,6 +627,7 @@ mod tests {
                 maybe_path: maybe_path.to_string(),
                 terminal_dir,
             },
+            background_fs_checks,
         )
         .await;
 
@@ -512,24 +661,70 @@ mod tests {
             Path::new(tooltip),
             "Open target path mismatch at {file}:{line}:"
         );
+
+        if background_fs_checks == BackgroundFsChecks::Disabled
+            && open_target_found_by == OpenTargetFoundBy::FileSystemBackground
+        {
+            open_target_found_by = OpenTargetFoundBy::WorktreeScan;
+        }
+
+        assert_eq!(
+            open_target.found_by(),
+            open_target_found_by,
+            "Open target found by mismatch at {file}:{line}:"
+        );
     }
 
-    macro_rules! none_or_some {
-        () => {
+    macro_rules! none_or_some_pathbuf {
+        (None) => {
             None
         };
-        ($some:expr) => {
-            Some($some)
+        ($cwd:literal) => {
+            Some($crate::PathBuf::from(path!($cwd)))
         };
     }
 
     macro_rules! test_path_like {
-        ($test_path_like:expr, $maybe_path:literal, $tooltip:literal $(, $cwd:literal)?) => {
+        (
+            $test_path_like:expr,
+            $maybe_path:literal,
+            $tooltip:literal,
+            $cwd:tt,
+            $found_by:expr
+        ) => {{
+            test_path_like!(
+                $test_path_like,
+                $maybe_path,
+                $tooltip,
+                $cwd,
+                BackgroundFsChecks::Enabled,
+                $found_by
+            );
+            test_path_like!(
+                $test_path_like,
+                $maybe_path,
+                $tooltip,
+                $cwd,
+                BackgroundFsChecks::Disabled,
+                $found_by
+            );
+        }};
+
+        (
+            $test_path_like:expr,
+            $maybe_path:literal,
+            $tooltip:literal,
+            $cwd:tt,
+            $background_fs_checks:path,
+            $found_by:expr
+        ) => {
             test_path_like_simple(
                 &mut $test_path_like,
                 path!($maybe_path),
                 path!($tooltip),
-                none_or_some!($($crate::PathBuf::from(path!($cwd)))?),
+                none_or_some_pathbuf!($cwd),
+                $background_fs_checks,
+                $found_by,
                 std::file!(),
                 std::line!(),
             )
@@ -537,17 +732,84 @@ mod tests {
         };
     }
 
+    // Note the arms of `test`, `test_local`, and `test_remote` should be collapsed once macro
+    // metavariable expressions (#![feature(macro_metavar_expr)]) are stabilized.
+    // See https://github.com/rust-lang/rust/issues/83527
     #[doc = "test_path_likes!(<cx>, <trees>, <worktrees>, { $(<tests>;)+ })"]
     macro_rules! test_path_likes {
         ($cx:expr, $trees:expr, $worktrees:expr, { $($tests:expr;)+ }) => { {
             let mut test_path_like = init_test($cx, $trees, $worktrees).await;
-            #[doc ="test!(<hovered maybe_path>, <expected tooltip>, <terminal cwd>)"]
+            #[doc ="test!(<hovered maybe_path>, <expected tooltip>, <terminal cwd> "]
+            #[doc ="\\[, found by \\])"]
+            #[allow(unused_macros)]
             macro_rules! test {
-                ($maybe_path:literal, $tooltip:literal) => {
-                    test_path_like!(test_path_like, $maybe_path, $tooltip)
+                ($maybe_path:literal, $tooltip:literal, $cwd:tt) => {
+                    test_path_like!(
+                        test_path_like,
+                        $maybe_path,
+                        $tooltip,
+                        $cwd,
+                        OpenTargetFoundBy::WorktreeExact
+                    )
                 };
-                ($maybe_path:literal, $tooltip:literal, $cwd:literal) => {
-                    test_path_like!(test_path_like, $maybe_path, $tooltip, $cwd)
+                ($maybe_path:literal, $tooltip:literal, $cwd:tt, $found_by:ident) => {
+                    test_path_like!(
+                        test_path_like,
+                        $maybe_path,
+                        $tooltip,
+                        $cwd,
+                        OpenTargetFoundBy::$found_by
+                    )
+                }
+            }
+            #[doc ="test_local!(<hovered maybe_path>, <expected tooltip>, <terminal cwd> "]
+            #[doc ="\\[, found by \\])"]
+            #[allow(unused_macros)]
+            macro_rules! test_local {
+                ($maybe_path:literal, $tooltip:literal, $cwd:tt) => {
+                    test_path_like!(
+                        test_path_like,
+                        $maybe_path,
+                        $tooltip,
+                        $cwd,
+                        BackgroundFsChecks::Enabled,
+                        OpenTargetFoundBy::WorktreeExact
+                    )
+                };
+                ($maybe_path:literal, $tooltip:literal, $cwd:tt, $found_by:ident) => {
+                    test_path_like!(
+                        test_path_like,
+                        $maybe_path,
+                        $tooltip,
+                        $cwd,
+                        BackgroundFsChecks::Enabled,
+                        OpenTargetFoundBy::$found_by
+                    )
+                }
+            }
+            #[doc ="test_remote!(<hovered maybe_path>, <expected tooltip>, <terminal cwd> "]
+            #[doc ="\\[, found by \\])"]
+            #[allow(unused_macros)]
+            macro_rules! test_remote {
+                ($maybe_path:literal, $tooltip:literal, $cwd:tt) => {
+                    test_path_like!(
+                        test_path_like,
+                        $maybe_path,
+                        $tooltip,
+                        $cwd,
+                        BackgroundFsChecks::Disabled,
+                        OpenTargetFoundBy::WorktreeExact
+                    )
+                };
+                ($maybe_path:literal, $tooltip:literal, $cwd:tt, $found_by:ident) => {
+                    test_path_like!(
+                        test_path_like,
+                        $maybe_path,
+                        $tooltip,
+                        $cwd,
+                        BackgroundFsChecks::Disabled,
+                        OpenTargetFoundBy::$found_by
+                    )
                 }
             }
             $($tests);+
@@ -567,8 +829,10 @@ mod tests {
             )],
             vec![path!("/test")],
             {
-                test!("lib.rs", "/test/lib.rs");
-                test!("test.rs", "/test/test.rs");
+                test!("lib.rs", "/test/lib.rs", None);
+                test!("/test/lib.rs", "/test/lib.rs", None);
+                test!("test.rs", "/test/test.rs", None);
+                test!("/test/test.rs", "/test/test.rs", None);
             }
         )
     }
@@ -596,9 +860,15 @@ mod tests {
             vec![path!("/file.txt"), path!("/test")],
             {
                 test!("file.txt", "/file.txt", "/");
+                test!("/file.txt", "/file.txt", "/");
+
                 test!("lib.rs", "/test/lib.rs", "/test");
                 test!("test.rs", "/test/test.rs", "/test");
                 test!("file.txt", "/test/file.txt", "/test");
+
+                test!("/test/lib.rs", "/test/lib.rs", "/test");
+                test!("/test/test.rs", "/test/test.rs", "/test");
+                test!("/test/file.txt", "/test/file.txt", "/test");
             }
         )
     }
@@ -649,7 +919,7 @@ mod tests {
                 )],
                 vec![path!("/dir1")],
                 {
-                    test!("C.py", "/dir1/dir 2/C.py", "/dir1");
+                    test!("C.py", "/dir1/dir 2/C.py", "/dir1", WorktreeScan);
                     test!("C.py", "/dir1/dir 2/C.py", "/dir1/dir 2");
                     test!("C.py", "/dir1/dir 3/C.py", "/dir1/dir 3");
                 }
@@ -660,7 +930,6 @@ mod tests {
         // See https://github.com/zed-industries/zed/issues/34027
         // See https://github.com/zed-industries/zed/issues/33498
         #[gpui::test]
-        #[should_panic(expected = "Tooltip mismatch")]
         async fn issue_28407_nesting(cx: &mut TestAppContext) {
             test_path_likes!(
                 cx,
@@ -669,7 +938,8 @@ mod tests {
                     json!({
                         "lib": {
                             "src": {
-                                "main.rs": ""
+                                "main.rs": "",
+                                "only_in_lib.rs": ""
                             },
                         },
                         "src": {
@@ -679,22 +949,12 @@ mod tests {
                 )],
                 vec![path!("/project")],
                 {
-                    // Failing currently
-                    test!("main.rs", "/project/src/main.rs", "/project");
                     test!("main.rs", "/project/src/main.rs", "/project/src");
-                    test!("main.rs", "/project/lib/src/main.rs", "/project/lib");
                     test!("main.rs", "/project/lib/src/main.rs", "/project/lib/src");
 
                     test!("src/main.rs", "/project/src/main.rs", "/project");
                     test!("src/main.rs", "/project/src/main.rs", "/project/src");
-                    // Failing currently
                     test!("src/main.rs", "/project/lib/src/main.rs", "/project/lib");
-                    // Failing currently
-                    test!(
-                        "src/main.rs",
-                        "/project/lib/src/main.rs",
-                        "/project/lib/src"
-                    );
 
                     test!("lib/src/main.rs", "/project/lib/src/main.rs", "/project");
                     test!(
@@ -712,11 +972,19 @@ mod tests {
                         "/project/lib/src/main.rs",
                         "/project/lib/src"
                     );
+                    test!(
+                        "src/only_in_lib.rs",
+                        "/project/lib/src/only_in_lib.rs",
+                        "/project/lib/src",
+                        WorktreeScan
+                    );
                 }
             )
         }
 
         // https://github.com/zed-industries/zed/issues/28339
+        // Note: These could all be found by WorktreeExact if we used
+        // `fs::normalize_path(&maybe_path)`
         #[gpui::test]
         async fn issue_28339(cx: &mut TestAppContext) {
             test_path_likes!(
@@ -733,32 +1001,90 @@ mod tests {
                 )],
                 vec![path!("/tmp")],
                 {
-                    test!(
+                    test_local!(
                         "foo/./bar.txt",
                         "/tmp/issue28339/foo/bar.txt",
                         "/tmp/issue28339"
                     );
-                    test!(
+                    test_local!(
                         "foo/../foo/bar.txt",
                         "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
+                        "/tmp/issue28339",
+                        FileSystemBackground
                     );
-                    test!(
+                    test_local!(
                         "foo/..///foo/bar.txt",
                         "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
+                        "/tmp/issue28339",
+                        FileSystemBackground
                     );
-                    test!(
+                    test_local!(
                         "issue28339/../issue28339/foo/../foo/bar.txt",
                         "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
+                        "/tmp/issue28339",
+                        FileSystemBackground
                     );
-                    test!(
+                    test_local!(
                         "./bar.txt",
                         "/tmp/issue28339/foo/bar.txt",
                         "/tmp/issue28339/foo"
                     );
-                    test!(
+                    test_local!(
+                        "../foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339/foo",
+                        FileSystemBackground
+                    );
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/28339
+        // Note: These could all be found by WorktreeExact if we used
+        // `fs::normalize_path(&maybe_path)`
+        #[gpui::test]
+        #[should_panic(expected = "Hover target should not be `None`")]
+        async fn issue_28339_remote(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/tmp"),
+                    json!({
+                        "issue28339": {
+                            "foo": {
+                                "bar.txt": ""
+                            },
+                        },
+                    }),
+                )],
+                vec![path!("/tmp")],
+                {
+                    test_remote!(
+                        "foo/./bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test_remote!(
+                        "foo/../foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test_remote!(
+                        "foo/..///foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test_remote!(
+                        "issue28339/../issue28339/foo/../foo/bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339"
+                    );
+                    test_remote!(
+                        "./bar.txt",
+                        "/tmp/issue28339/foo/bar.txt",
+                        "/tmp/issue28339/foo"
+                    );
+                    test_remote!(
                         "../foo/bar.txt",
                         "/tmp/issue28339/foo/bar.txt",
                         "/tmp/issue28339/foo"
@@ -769,7 +1095,6 @@ mod tests {
 
         // https://github.com/zed-industries/zed/issues/34027
         #[gpui::test]
-        #[should_panic(expected = "Tooltip mismatch")]
         async fn issue_34027(cx: &mut TestAppContext) {
             test_path_likes!(
                 cx,
@@ -796,8 +1121,101 @@ mod tests {
 
         // https://github.com/zed-industries/zed/issues/34027
         #[gpui::test]
-        #[should_panic(expected = "Tooltip mismatch")]
-        async fn issue_34027_non_worktree_file(cx: &mut TestAppContext) {
+        async fn issue_34027_siblings(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/test"),
+                    json!({
+                        "sub1": {
+                            "file.txt": "",
+                        },
+                        "sub2": {
+                            "file.txt": "",
+                        }
+                    }),
+                ),],
+                vec![path!("/test")],
+                {
+                    test!("file.txt", "/test/sub1/file.txt", "/test/sub1");
+                    test!("file.txt", "/test/sub2/file.txt", "/test/sub2");
+                    test!("sub1/file.txt", "/test/sub1/file.txt", "/test/sub1");
+                    test!("sub2/file.txt", "/test/sub2/file.txt", "/test/sub2");
+                    test!("sub1/file.txt", "/test/sub1/file.txt", "/test/sub2");
+                    test!("sub2/file.txt", "/test/sub2/file.txt", "/test/sub1");
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        async fn issue_34027_nesting(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/test"),
+                    json!({
+                        "sub1": {
+                            "file.txt": "",
+                            "subsub1": {
+                                "file.txt": "",
+                            }
+                        },
+                        "sub2": {
+                            "file.txt": "",
+                            "subsub1": {
+                                "file.txt": "",
+                            }
+                        }
+                    }),
+                ),],
+                vec![path!("/test")],
+                {
+                    test!(
+                        "file.txt",
+                        "/test/sub1/subsub1/file.txt",
+                        "/test/sub1/subsub1"
+                    );
+                    test!(
+                        "file.txt",
+                        "/test/sub2/subsub1/file.txt",
+                        "/test/sub2/subsub1"
+                    );
+                    test!(
+                        "subsub1/file.txt",
+                        "/test/sub1/subsub1/file.txt",
+                        "/test",
+                        WorktreeScan
+                    );
+                    test!(
+                        "subsub1/file.txt",
+                        "/test/sub1/subsub1/file.txt",
+                        "/test",
+                        WorktreeScan
+                    );
+                    test!(
+                        "subsub1/file.txt",
+                        "/test/sub1/subsub1/file.txt",
+                        "/test/sub1"
+                    );
+                    test!(
+                        "subsub1/file.txt",
+                        "/test/sub2/subsub1/file.txt",
+                        "/test/sub2"
+                    );
+                    test!(
+                        "subsub1/file.txt",
+                        "/test/sub1/subsub1/file.txt",
+                        "/test/sub1/subsub1",
+                        WorktreeScan
+                    );
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        async fn issue_34027_non_worktree_local_file(cx: &mut TestAppContext) {
             test_path_likes!(
                 cx,
                 vec![
@@ -816,8 +1234,94 @@ mod tests {
                 ],
                 vec![path!("/test")],
                 {
-                    test!("file.txt", "/file.txt", "/");
-                    test!("file.txt", "/test/file.txt", "/test");
+                    // Note: Opening a non-worktree file adds that file as a single file worktree.
+                    test_local!("file.txt", "/file.txt", "/", FileSystemBackground);
+                }
+            )
+        }
+
+        // https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        async fn issue_34027_non_worktree_remote_file(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![
+                    (
+                        path!("/"),
+                        json!({
+                            "file.txt": "",
+                        }),
+                    ),
+                    (
+                        path!("/test"),
+                        json!({
+                            "file.txt": "",
+                        }),
+                    ),
+                ],
+                vec![path!("/test")],
+                {
+                    // Note: Opening a non-worktree file adds that file as a single file worktree.
+                    test_remote!("file.txt", "/test/file.txt", "/");
+                    test_remote!("/test/file.txt", "/test/file.txt", "/");
+                }
+            )
+        }
+
+        // See https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        #[should_panic(expected = "Tooltip mismatch")]
+        async fn issue_34027_gaps(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/project"),
+                    json!({
+                        "lib": {
+                            "src": {
+                                "main.rs": ""
+                            },
+                        },
+                        "src": {
+                            "main.rs": ""
+                        },
+                    }),
+                )],
+                vec![path!("/project")],
+                {
+                    test!("main.rs", "/project/src/main.rs", "/project");
+                    test!("main.rs", "/project/lib/src/main.rs", "/project/lib");
+                }
+            )
+        }
+
+        // See https://github.com/zed-industries/zed/issues/34027
+        #[gpui::test]
+        #[should_panic(expected = "Tooltip mismatch")]
+        async fn issue_34027_overlap(cx: &mut TestAppContext) {
+            test_path_likes!(
+                cx,
+                vec![(
+                    path!("/project"),
+                    json!({
+                        "lib": {
+                            "src": {
+                                "main.rs": ""
+                            },
+                        },
+                        "src": {
+                            "main.rs": ""
+                        },
+                    }),
+                )],
+                vec![path!("/project")],
+                {
+                    // Finds "/project/src/main.rs"
+                    test!(
+                        "src/main.rs",
+                        "/project/lib/src/main.rs",
+                        "/project/lib/src"
+                    );
                 }
             )
         }

From 0ac17526687bf11007f0fbb5c3b2ff463ce47293 Mon Sep 17 00:00:00 2001
From: Joseph Mearman <joseph@mearman.co.uk>
Date: Tue, 9 Sep 2025 15:39:09 +0100
Subject: [PATCH 712/823] terminal: Sanitize trailing periods in URL detection
 (#37684)

Fixes #12338, related to #37616

This change improves URL detection in the terminal by removing trailing
periods that appear to be sentence punctuation rather than part of the
URL structure. It builds upon the parentheses sanitization work from
#37076 by consolidating both approaches into a unified
`sanitize_url_punctuation` function.

## Changes
- Combines parentheses and period sanitization into a single
`sanitize_url_punctuation` function
- Uses optimized single traversal with `fold()` for parentheses counting
(addressing code review feedback)
- Removes trailing periods using heuristics to distinguish sentence
punctuation from legitimate URL components
- Removes multiple trailing periods (always considered punctuation)
- Removes single trailing periods when they appear after alphanumeric
characters or slashes
- Preserves periods that are part of legitimate URL structure (e.g.,
version numbers, IP addresses, subdomains)
- Maintains existing parentheses balancing logic from #37076

## Implementation Details
- **Parentheses handling**: Counts opening and closing parentheses,
removes trailing `)` when unbalanced
- **Period handling**: Uses `take_while()` iterator for efficient period
counting
- **Performance**: Single pass counting with optimized loop to avoid
redundant work
- **Code clarity**: Uses let-else pattern for readable conditional logic

## Testing
- Added comprehensive test coverage for both parentheses and period
sanitization
- Tests cover balanced vs unbalanced parentheses cases
- Tests cover various period scenarios including legitimate URL periods
vs sentence punctuation
- All existing tests continue to pass

## Release Notes

- Improved terminal URL detection by further trimming trailing
punctuation. URLs ending with periods (like
`https://example.com.`) and unbalanced parentheses (like
`https://example.com/path)`) are now properly detected without including
the trailing punctuation.
---
 crates/terminal/src/terminal_hyperlinks.rs | 149 ++++++++++++++++++++-
 1 file changed, 146 insertions(+), 3 deletions(-)

diff --git a/crates/terminal/src/terminal_hyperlinks.rs b/crates/terminal/src/terminal_hyperlinks.rs
index 4126b3d948..2d3d356b46 100644
--- a/crates/terminal/src/terminal_hyperlinks.rs
+++ b/crates/terminal/src/terminal_hyperlinks.rs
@@ -79,7 +79,8 @@ pub(super) fn find_from_grid_point<T: EventListener>(
         Some((url, true, url_match))
     } else if let Some(url_match) = regex_match_at(term, point, &mut regex_searches.url_regex) {
         let url = term.bounds_to_string(*url_match.start(), *url_match.end());
-        Some((url, true, url_match))
+        let (sanitized_url, sanitized_match) = sanitize_url_punctuation(url, url_match, term);
+        Some((sanitized_url, true, sanitized_match))
     } else if let Some(python_match) =
         regex_match_at(term, point, &mut regex_searches.python_file_line_regex)
     {
@@ -164,6 +165,63 @@ pub(super) fn find_from_grid_point<T: EventListener>(
     })
 }
 
+fn sanitize_url_punctuation<T: EventListener>(
+    url: String,
+    url_match: Match,
+    term: &Term<T>,
+) -> (String, Match) {
+    let mut sanitized_url = url;
+    let mut chars_trimmed = 0;
+
+    // First, handle parentheses balancing using single traversal
+    let (open_parens, close_parens) =
+        sanitized_url
+            .chars()
+            .fold((0, 0), |(opens, closes), c| match c {
+                '(' => (opens + 1, closes),
+                ')' => (opens, closes + 1),
+                _ => (opens, closes),
+            });
+
+    // Trim unbalanced closing parentheses
+    if close_parens > open_parens {
+        let mut remaining_close = close_parens;
+        while sanitized_url.ends_with(')') && remaining_close > open_parens {
+            sanitized_url.pop();
+            chars_trimmed += 1;
+            remaining_close -= 1;
+        }
+    }
+
+    // Handle trailing periods
+    if sanitized_url.ends_with('.') {
+        let trailing_periods = sanitized_url
+            .chars()
+            .rev()
+            .take_while(|&c| c == '.')
+            .count();
+
+        if trailing_periods > 1 {
+            sanitized_url.truncate(sanitized_url.len() - trailing_periods);
+            chars_trimmed += trailing_periods;
+        } else if trailing_periods == 1
+            && let Some(second_last_char) = sanitized_url.chars().rev().nth(1)
+            && (second_last_char.is_alphanumeric() || second_last_char == '/')
+        {
+            sanitized_url.pop();
+            chars_trimmed += 1;
+        }
+    }
+
+    if chars_trimmed > 0 {
+        let new_end = url_match.end().sub(term, Boundary::Grid, chars_trimmed);
+        let sanitized_match = Match::new(*url_match.start(), new_end);
+        (sanitized_url, sanitized_match)
+    } else {
+        (sanitized_url, url_match)
+    }
+}
+
 fn is_path_surrounded_by_common_symbols(path: &str) -> bool {
     // Avoid detecting `[]` or `()` strings as paths, surrounded by common symbols
     path.len() > 2
@@ -203,8 +261,8 @@ mod tests {
     use super::*;
     use alacritty_terminal::{
         event::VoidListener,
-        index::{Boundary, Point as AlacPoint},
-        term::{Config, cell::Flags, test::TermSize},
+        index::{Boundary, Column, Line, Point as AlacPoint},
+        term::{Config, cell::Flags, search::Match, test::TermSize},
         vte::ansi::Handler,
     };
     use std::{cell::RefCell, ops::RangeInclusive, path::PathBuf};
@@ -233,6 +291,91 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_url_parentheses_sanitization() {
+        // Test our sanitize_url_parentheses function directly
+        let test_cases = vec![
+            // Cases that should be sanitized (unbalanced parentheses)
+            ("https://www.google.com/)", "https://www.google.com/"),
+            ("https://example.com/path)", "https://example.com/path"),
+            ("https://test.com/))", "https://test.com/"),
+            // Cases that should NOT be sanitized (balanced parentheses)
+            (
+                "https://en.wikipedia.org/wiki/Example_(disambiguation)",
+                "https://en.wikipedia.org/wiki/Example_(disambiguation)",
+            ),
+            ("https://test.com/(hello)", "https://test.com/(hello)"),
+            (
+                "https://example.com/path(1)(2)",
+                "https://example.com/path(1)(2)",
+            ),
+            // Edge cases
+            ("https://test.com/", "https://test.com/"),
+            ("https://example.com", "https://example.com"),
+        ];
+
+        for (input, expected) in test_cases {
+            // Create a minimal terminal for testing
+            let term = Term::new(Config::default(), &TermSize::new(80, 24), VoidListener);
+
+            // Create a dummy match that spans the entire input
+            let start_point = AlacPoint::new(Line(0), Column(0));
+            let end_point = AlacPoint::new(Line(0), Column(input.len()));
+            let dummy_match = Match::new(start_point, end_point);
+
+            let (result, _) = sanitize_url_punctuation(input.to_string(), dummy_match, &term);
+            assert_eq!(result, expected, "Failed for input: {}", input);
+        }
+    }
+
+    #[test]
+    fn test_url_periods_sanitization() {
+        // Test URLs with trailing periods (sentence punctuation)
+        let test_cases = vec![
+            // Cases that should be sanitized (trailing periods likely punctuation)
+            ("https://example.com.", "https://example.com"),
+            (
+                "https://github.com/zed-industries/zed.",
+                "https://github.com/zed-industries/zed",
+            ),
+            (
+                "https://example.com/path/file.html.",
+                "https://example.com/path/file.html",
+            ),
+            (
+                "https://example.com/file.pdf.",
+                "https://example.com/file.pdf",
+            ),
+            ("https://example.com:8080.", "https://example.com:8080"),
+            ("https://example.com..", "https://example.com"),
+            (
+                "https://en.wikipedia.org/wiki/C.E.O.",
+                "https://en.wikipedia.org/wiki/C.E.O",
+            ),
+            // Cases that should NOT be sanitized (periods are part of URL structure)
+            (
+                "https://example.com/v1.0/api",
+                "https://example.com/v1.0/api",
+            ),
+            ("https://192.168.1.1", "https://192.168.1.1"),
+            ("https://sub.domain.com", "https://sub.domain.com"),
+        ];
+
+        for (input, expected) in test_cases {
+            // Create a minimal terminal for testing
+            let term = Term::new(Config::default(), &TermSize::new(80, 24), VoidListener);
+
+            // Create a dummy match that spans the entire input
+            let start_point = AlacPoint::new(Line(0), Column(0));
+            let end_point = AlacPoint::new(Line(0), Column(input.len()));
+            let dummy_match = Match::new(start_point, end_point);
+
+            // This test should initially fail since we haven't implemented period sanitization yet
+            let (result, _) = sanitize_url_punctuation(input.to_string(), dummy_match, &term);
+            assert_eq!(result, expected, "Failed for input: {}", input);
+        }
+    }
+
     #[test]
     fn test_word_regex() {
         re_test(

From 2e7607c0e73778e53a506c57d60850f1641b95a0 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 9 Sep 2025 17:34:57 +0200
Subject: [PATCH 713/823] python: Fix instability of Pyright/BasedPyright code
 completions (#37850)

Pyright sets different `sortText` based on whether a given completion
item was recently resolved. This probably lines up with VSCode's way of
resolving items, but it's a no-no for us, as it makes completions
unstable.

Closes #9983

Release Notes:

- python: Fixed code completions having arbitrary order when using
Pyright/basedpyright
---
 crates/languages/src/python.rs | 54 +++++++++-------------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 978f22d91c..659a6b017c 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -87,6 +87,18 @@ fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
     vec![server_path.into(), "--stdio".into()]
 }
 
+/// Pyright assigns each completion item a `sortText` of the form `XX.YYYY.name`.
+/// Where `XX` is the sorting category, `YYYY` is based on most recent usage,
+/// and `name` is the symbol name itself.
+///
+/// The problem with it is that Pyright adjusts the sort text based on previous resolutions (items for which we've issued `completion/resolve` call have their sortText adjusted),
+/// which - long story short - makes completion items list non-stable. Pyright probably relies on VSCode's implementation detail.
+/// see https://github.com/microsoft/pyright/blob/95ef4e103b9b2f129c9320427e51b73ea7cf78bd/packages/pyright-internal/src/languageService/completionProvider.ts#LL2873
+fn process_pyright_completions(items: &mut [lsp::CompletionItem]) {
+    for item in items {
+        item.sort_text.take();
+    }
+}
 pub struct PythonLspAdapter {
     node: NodeRuntime,
 }
@@ -232,26 +244,7 @@ impl LspAdapter for PythonLspAdapter {
     }
 
     async fn process_completions(&self, items: &mut [lsp::CompletionItem]) {
-        // Pyright assigns each completion item a `sortText` of the form `XX.YYYY.name`.
-        // Where `XX` is the sorting category, `YYYY` is based on most recent usage,
-        // and `name` is the symbol name itself.
-        //
-        // Because the symbol name is included, there generally are not ties when
-        // sorting by the `sortText`, so the symbol's fuzzy match score is not taken
-        // into account. Here, we remove the symbol name from the sortText in order
-        // to allow our own fuzzy score to be used to break ties.
-        //
-        // see https://github.com/microsoft/pyright/blob/95ef4e103b9b2f129c9320427e51b73ea7cf78bd/packages/pyright-internal/src/languageService/completionProvider.ts#LL2873
-        for item in items {
-            let Some(sort_text) = &mut item.sort_text else {
-                continue;
-            };
-            let mut parts = sort_text.split('.');
-            let Some(first) = parts.next() else { continue };
-            let Some(second) = parts.next() else { continue };
-            let Some(_) = parts.next() else { continue };
-            sort_text.replace_range(first.len() + second.len() + 1.., "");
-        }
+        process_pyright_completions(items);
     }
 
     async fn label_for_completion(
@@ -1490,26 +1483,7 @@ impl LspAdapter for BasedPyrightLspAdapter {
     }
 
     async fn process_completions(&self, items: &mut [lsp::CompletionItem]) {
-        // Pyright assigns each completion item a `sortText` of the form `XX.YYYY.name`.
-        // Where `XX` is the sorting category, `YYYY` is based on most recent usage,
-        // and `name` is the symbol name itself.
-        //
-        // Because the symbol name is included, there generally are not ties when
-        // sorting by the `sortText`, so the symbol's fuzzy match score is not taken
-        // into account. Here, we remove the symbol name from the sortText in order
-        // to allow our own fuzzy score to be used to break ties.
-        //
-        // see https://github.com/microsoft/pyright/blob/95ef4e103b9b2f129c9320427e51b73ea7cf78bd/packages/pyright-internal/src/languageService/completionProvider.ts#LL2873
-        for item in items {
-            let Some(sort_text) = &mut item.sort_text else {
-                continue;
-            };
-            let mut parts = sort_text.split('.');
-            let Some(first) = parts.next() else { continue };
-            let Some(second) = parts.next() else { continue };
-            let Some(_) = parts.next() else { continue };
-            sort_text.replace_range(first.len() + second.len() + 1.., "");
-        }
+        process_pyright_completions(items);
     }
 
     async fn label_for_completion(

From ad02f6b9e3dbf7e49138bb83af9ed3812d6625dc Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Tue, 9 Sep 2025 11:51:22 -0400
Subject: [PATCH 714/823] cloud_llm_client: Add another `Plan` variant (#37852)

This PR adds a corresponding `FreeV2` variant to the `Plan`.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs        |  4 ++-
 crates/agent_ui/src/agent_configuration.rs    |  2 +-
 crates/agent_ui/src/agent_panel.rs            | 25 ++++++++++-------
 crates/agent_ui/src/ui/end_trial_upsell.rs    | 15 +++++++----
 .../agent_ui/src/ui/preview/usage_callouts.rs |  2 +-
 crates/ai_onboarding/src/ai_onboarding.rs     | 27 ++++++++++---------
 crates/ai_onboarding/src/ai_upsell_card.rs    | 23 ++++++++--------
 .../cloud_llm_client/src/cloud_llm_client.rs  | 10 +++++++
 .../language_model/src/model/cloud_model.rs   |  4 ++-
 crates/title_bar/src/title_bar.rs             |  4 ++-
 10 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 8627455b4f..35fd0f5a1d 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -5010,7 +5010,9 @@ impl AcpThreadView {
             cloud_llm_client::Plan::ZedProTrial | cloud_llm_client::Plan::ZedFree => {
                 "Upgrade to Zed Pro for more prompts."
             }
-            cloud_llm_client::Plan::ZedProV2 | cloud_llm_client::Plan::ZedProTrialV2 => "",
+            cloud_llm_client::Plan::ZedProV2
+            | cloud_llm_client::Plan::ZedProTrialV2
+            | cloud_llm_client::Plan::ZedFreeV2 => "",
         };
 
         Callout::new()
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index bc7dd1d552..91ae3f0005 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -515,7 +515,7 @@ impl AgentConfiguration {
                 .blend(cx.theme().colors().text_accent.opacity(0.2));
 
             let (plan_name, label_color, bg_color) = match plan {
-                Plan::ZedFree => ("Free", Color::Default, free_chip_bg),
+                Plan::ZedFree | Plan::ZedFreeV2 => ("Free", Color::Default, free_chip_bg),
                 Plan::ZedProTrial | Plan::ZedProTrialV2 => {
                     ("Pro Trial", Color::Accent, pro_chip_bg)
                 }
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 67a0988f7f..55d48319c3 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -3066,6 +3066,8 @@ impl AgentPanel {
             return None;
         }
 
+        let plan = self.user_store.read(cx).plan()?;
+
         Some(
             v_flex()
                 .absolute()
@@ -3074,15 +3076,18 @@ impl AgentPanel {
                 .bg(cx.theme().colors().panel_background)
                 .opacity(0.85)
                 .block_mouse_except_scroll()
-                .child(EndTrialUpsell::new(Arc::new({
-                    let this = cx.entity();
-                    move |_, cx| {
-                        this.update(cx, |_this, cx| {
-                            TrialEndUpsell::set_dismissed(true, cx);
-                            cx.notify();
-                        });
-                    }
-                }))),
+                .child(EndTrialUpsell::new(
+                    plan,
+                    Arc::new({
+                        let this = cx.entity();
+                        move |_, cx| {
+                            this.update(cx, |_this, cx| {
+                                TrialEndUpsell::set_dismissed(true, cx);
+                                cx.notify();
+                            });
+                        }
+                    }),
+                )),
         )
     }
 
@@ -3518,7 +3523,7 @@ impl AgentPanel {
         let error_message = match plan {
             Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
             Plan::ZedProTrial | Plan::ZedFree => "Upgrade to Zed Pro for more prompts.",
-            Plan::ZedProV2 | Plan::ZedProTrialV2 => "",
+            Plan::ZedProV2 | Plan::ZedProTrialV2 | Plan::ZedFreeV2 => "",
         };
 
         Callout::new()
diff --git a/crates/agent_ui/src/ui/end_trial_upsell.rs b/crates/agent_ui/src/ui/end_trial_upsell.rs
index 55164aef71..e31334296f 100644
--- a/crates/agent_ui/src/ui/end_trial_upsell.rs
+++ b/crates/agent_ui/src/ui/end_trial_upsell.rs
@@ -2,18 +2,22 @@ use std::sync::Arc;
 
 use ai_onboarding::{AgentPanelOnboardingCard, PlanDefinitions};
 use client::zed_urls;
-use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt as _};
+use cloud_llm_client::Plan;
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use ui::{Divider, Tooltip, prelude::*};
 
 #[derive(IntoElement, RegisterComponent)]
 pub struct EndTrialUpsell {
+    plan: Plan,
     dismiss_upsell: Arc<dyn Fn(&mut Window, &mut App)>,
 }
 
 impl EndTrialUpsell {
-    pub fn new(dismiss_upsell: Arc<dyn Fn(&mut Window, &mut App)>) -> Self {
-        Self { dismiss_upsell }
+    pub fn new(plan: Plan, dismiss_upsell: Arc<dyn Fn(&mut Window, &mut App)>) -> Self {
+        Self {
+            plan,
+            dismiss_upsell,
+        }
     }
 }
 
@@ -32,7 +36,7 @@ impl RenderOnce for EndTrialUpsell {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), false))
+            .child(PlanDefinitions.pro_plan(self.plan.is_v2(), false))
             .child(
                 Button::new("cta-button", "Upgrade to Zed Pro")
                     .full_width()
@@ -63,7 +67,7 @@ impl RenderOnce for EndTrialUpsell {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(PlanDefinitions.free_plan(cx.has_flag::<BillingV2FeatureFlag>()));
+            .child(PlanDefinitions.free_plan(self.plan.is_v2()));
 
         AgentPanelOnboardingCard::new()
             .child(Headline::new("Your Zed Pro Trial has expired"))
@@ -108,6 +112,7 @@ impl Component for EndTrialUpsell {
         Some(
             v_flex()
                 .child(EndTrialUpsell {
+                    plan: Plan::ZedFree,
                     dismiss_upsell: Arc::new(|_, _| {}),
                 })
                 .into_any_element(),
diff --git a/crates/agent_ui/src/ui/preview/usage_callouts.rs b/crates/agent_ui/src/ui/preview/usage_callouts.rs
index 7c080f075a..6f40171281 100644
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -38,7 +38,7 @@ impl RenderOnce for UsageCallout {
 
         let (title, message, button_text, url) = if is_limit_reached {
             match self.plan {
-                Plan::ZedFree => (
+                Plan::ZedFree | Plan::ZedFreeV2 => (
                     "Out of free prompts",
                     "Upgrade to continue, wait for the next reset, or switch to API key."
                         .to_string(),
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index 60b8fa89ff..d16969ba77 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -113,7 +113,7 @@ impl ZedAiOnboarding {
             .into_any_element()
     }
 
-    fn render_free_plan_state(&self, cx: &mut App) -> AnyElement {
+    fn render_free_plan_state(&self, is_v2: bool, cx: &mut App) -> AnyElement {
         if self.account_too_young {
             v_flex()
                 .relative()
@@ -136,9 +136,7 @@ impl ZedAiOnboarding {
                                 )
                                 .child(Divider::horizontal()),
                         )
-                        .child(
-                            PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), true),
-                        )
+                        .child(PlanDefinitions.pro_plan(is_v2, true))
                         .child(
                             Button::new("pro", "Get Started")
                                 .full_width()
@@ -181,7 +179,7 @@ impl ZedAiOnboarding {
                                 )
                                 .child(Divider::horizontal()),
                         )
-                        .child(PlanDefinitions.free_plan(cx.has_flag::<BillingV2FeatureFlag>())),
+                        .child(PlanDefinitions.free_plan(is_v2)),
                 )
                 .when_some(
                     self.dismiss_onboarding.as_ref(),
@@ -219,9 +217,7 @@ impl ZedAiOnboarding {
                                 )
                                 .child(Divider::horizontal()),
                         )
-                        .child(
-                            PlanDefinitions.pro_trial(cx.has_flag::<BillingV2FeatureFlag>(), true),
-                        )
+                        .child(PlanDefinitions.pro_trial(is_v2, true))
                         .child(
                             Button::new("pro", "Start Free Trial")
                                 .full_width()
@@ -311,11 +307,16 @@ impl RenderOnce for ZedAiOnboarding {
     fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
         if matches!(self.sign_in_status, SignInStatus::SignedIn) {
             match self.plan {
-                None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
-                Some(Plan::ZedProTrial) => self.render_trial_state(false, cx),
-                Some(Plan::ZedProTrialV2) => self.render_trial_state(true, cx),
-                Some(Plan::ZedPro) => self.render_pro_plan_state(false, cx),
-                Some(Plan::ZedProV2) => self.render_pro_plan_state(true, cx),
+                None => self.render_free_plan_state(cx.has_flag::<BillingV2FeatureFlag>(), cx),
+                Some(plan @ (Plan::ZedFree | Plan::ZedFreeV2)) => {
+                    self.render_free_plan_state(plan.is_v2(), cx)
+                }
+                Some(plan @ (Plan::ZedProTrial | Plan::ZedProTrialV2)) => {
+                    self.render_trial_state(plan.is_v2(), cx)
+                }
+                Some(plan @ (Plan::ZedPro | Plan::ZedProV2)) => {
+                    self.render_pro_plan_state(plan.is_v2(), cx)
+                }
             }
         } else {
             self.render_sign_in_disclaimer(cx)
diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index 6a797d8437..1e4fafd50d 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -50,6 +50,10 @@ impl AiUpsellCard {
 
 impl RenderOnce for AiUpsellCard {
     fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let is_v2_plan = self
+            .user_plan
+            .map_or(cx.has_flag::<BillingV2FeatureFlag>(), |plan| plan.is_v2());
+
         let pro_section = v_flex()
             .flex_grow()
             .w_full()
@@ -65,7 +69,7 @@ impl RenderOnce for AiUpsellCard {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(PlanDefinitions.pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), false));
+            .child(PlanDefinitions.pro_plan(is_v2_plan, false));
 
         let free_section = v_flex()
             .flex_grow()
@@ -82,7 +86,7 @@ impl RenderOnce for AiUpsellCard {
                     )
                     .child(Divider::horizontal()),
             )
-            .child(PlanDefinitions.free_plan(cx.has_flag::<BillingV2FeatureFlag>()));
+            .child(PlanDefinitions.free_plan(is_v2_plan));
 
         let grid_bg = h_flex()
             .absolute()
@@ -167,7 +171,7 @@ impl RenderOnce for AiUpsellCard {
 
         match self.sign_in_status {
             SignInStatus::SignedIn => match self.user_plan {
-                None | Some(Plan::ZedFree) => card
+                None | Some(Plan::ZedFree | Plan::ZedFreeV2) => card
                     .child(Label::new("Try Zed AI").size(LabelSize::Large))
                     .map(|this| {
                         if self.account_too_young {
@@ -186,10 +190,7 @@ impl RenderOnce for AiUpsellCard {
                                             )
                                             .child(Divider::horizontal()),
                                     )
-                                    .child(
-                                        PlanDefinitions
-                                            .pro_plan(cx.has_flag::<BillingV2FeatureFlag>(), true),
-                                    )
+                                    .child(PlanDefinitions.pro_plan(is_v2_plan, true))
                                     .child(
                                         Button::new("pro", "Get Started")
                                             .full_width()
@@ -236,7 +237,7 @@ impl RenderOnce for AiUpsellCard {
                             )
                         }
                     }),
-                Some(plan @ Plan::ZedProTrial | plan @ Plan::ZedProTrialV2) => card
+                Some(plan @ (Plan::ZedProTrial | Plan::ZedProTrialV2)) => card
                     .child(pro_trial_stamp)
                     .child(Label::new("You're in the Zed Pro Trial").size(LabelSize::Large))
                     .child(
@@ -244,8 +245,8 @@ impl RenderOnce for AiUpsellCard {
                             .color(Color::Muted)
                             .mb_2(),
                     )
-                    .child(PlanDefinitions.pro_trial(plan == Plan::ZedProTrialV2, false)),
-                Some(plan @ Plan::ZedPro | plan @ Plan::ZedProV2) => card
+                    .child(PlanDefinitions.pro_trial(plan.is_v2(), false)),
+                Some(plan @ (Plan::ZedPro | Plan::ZedProV2)) => card
                     .child(certified_user_stamp)
                     .child(Label::new("You're in the Zed Pro plan").size(LabelSize::Large))
                     .child(
@@ -253,7 +254,7 @@ impl RenderOnce for AiUpsellCard {
                             .color(Color::Muted)
                             .mb_2(),
                     )
-                    .child(PlanDefinitions.pro_plan(plan == Plan::ZedProV2, false)),
+                    .child(PlanDefinitions.pro_plan(plan.is_v2(), false)),
             },
             // Signed Out State
             _ => card
diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 4bc33079da..99f77f4ef3 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -80,6 +80,7 @@ pub enum Plan {
     #[default]
     #[serde(alias = "Free")]
     ZedFree,
+    ZedFreeV2,
     #[serde(alias = "ZedPro")]
     ZedPro,
     ZedProV2,
@@ -88,14 +89,23 @@ pub enum Plan {
     ZedProTrialV2,
 }
 
+impl Plan {
+    pub fn is_v2(&self) -> bool {
+        matches!(self, Plan::ZedFreeV2 | Plan::ZedProV2 | Plan::ZedProTrialV2)
+    }
+}
+
 impl FromStr for Plan {
     type Err = anyhow::Error;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "zed_free" => Ok(Plan::ZedFree),
+            "zed_free_v2" => Ok(Plan::ZedFreeV2),
             "zed_pro" => Ok(Plan::ZedPro),
+            "zed_pro_v2" => Ok(Plan::ZedProV2),
             "zed_pro_trial" => Ok(Plan::ZedProTrial),
+            "zed_pro_trial_v2" => Ok(Plan::ZedProTrialV2),
             plan => Err(anyhow::anyhow!("invalid plan: {plan:?}")),
         }
     }
diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs
index c6e146e6b3..409bef2c82 100644
--- a/crates/language_model/src/model/cloud_model.rs
+++ b/crates/language_model/src/model/cloud_model.rs
@@ -36,7 +36,9 @@ impl fmt::Display for ModelRequestLimitReachedError {
             Plan::ZedProTrial => {
                 "Model request limit reached. Upgrade to Zed Pro for more requests."
             }
-            Plan::ZedProV2 | Plan::ZedProTrialV2 => "Model request limit reached.",
+            Plan::ZedFreeV2 | Plan::ZedProV2 | Plan::ZedProTrialV2 => {
+                "Model request limit reached."
+            }
         };
 
         write!(f, "{message}")
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index e15e7ad46d..70a09793df 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -659,7 +659,9 @@ impl TitleBar {
                         let user_login = user.github_login.clone();
 
                         let (plan_name, label_color, bg_color) = match plan {
-                            None | Some(Plan::ZedFree) => ("Free", Color::Default, free_chip_bg),
+                            None | Some(Plan::ZedFree | Plan::ZedFreeV2) => {
+                                ("Free", Color::Default, free_chip_bg)
+                            }
                             Some(Plan::ZedProTrial | Plan::ZedProTrialV2) => {
                                 ("Pro Trial", Color::Accent, pro_chip_bg)
                             }

From 5e397e85b10fc55fa979236290b46f2a0bd29ec4 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 9 Sep 2025 13:28:02 -0300
Subject: [PATCH 715/823] acp: Support session modes (e.g. CC plan mode)
 (#37632)

Adds support for [ACP session
modes](https://github.com/zed-industries/agent-client-protocol/pull/67)
enabling plan and other permission modes in CC:


https://github.com/user-attachments/assets/dea18d82-4da6-465e-983b-02b77c6dcf15


Release Notes:

- Claude Code: Add support for plan mode, and all other permission modes

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Richard Feldman <oss@rtfeldman.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
---
 Cargo.lock                                  |   4 +-
 Cargo.toml                                  |   2 +-
 assets/keymaps/default-linux.json           |  11 +-
 assets/keymaps/default-macos.json           |  12 +-
 assets/keymaps/default-windows.json         |   9 +-
 assets/settings/default.json                |   3 +
 crates/acp_thread/Cargo.toml                |   2 +-
 crates/acp_thread/src/acp_thread.rs         |   7 +-
 crates/acp_thread/src/connection.rs         |  18 ++
 crates/agent2/src/agent.rs                  |   4 +-
 crates/agent_servers/src/acp.rs             | 180 +++++++++++++-
 crates/agent_servers/src/agent_servers.rs   |  13 +-
 crates/agent_servers/src/claude.rs          |  36 ++-
 crates/agent_servers/src/custom.rs          |  42 +++-
 crates/agent_servers/src/e2e_tests.rs       |  14 +-
 crates/agent_servers/src/gemini.rs          |  12 +-
 crates/agent_servers/src/settings.rs        | 125 ++++++++++
 crates/agent_settings/src/agent_settings.rs |   4 +
 crates/agent_ui/src/acp.rs                  |   2 +
 crates/agent_ui/src/acp/mode_selector.rs    | 230 +++++++++++++++++
 crates/agent_ui/src/acp/thread_view.rs      | 261 +++++++++++++-------
 crates/agent_ui/src/agent_configuration.rs  |   1 +
 crates/agent_ui/src/agent_diff.rs           |   3 +-
 crates/agent_ui/src/agent_panel.rs          |  11 +-
 crates/agent_ui/src/agent_ui.rs             |   4 +-
 crates/project/src/agent_server_store.rs    |  19 +-
 26 files changed, 886 insertions(+), 143 deletions(-)
 create mode 100644 crates/agent_servers/src/settings.rs
 create mode 100644 crates/agent_ui/src/acp/mode_selector.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3c25fc5b00..1c8f49103f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.2.0-alpha.6"
+version = "0.2.0-alpha.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d02292efd75080932b6466471d428c70e2ac06908ae24792fc7c36ecbaf67ca"
+checksum = "08539e8d6b2ccca6cd00afdd42211698f7677adef09108a09414c11f1f45fdaf"
 dependencies = [
  "anyhow",
  "async-broadcast",
diff --git a/Cargo.toml b/Cargo.toml
index 0f13835f0c..b5fd14087b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -433,7 +433,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol = { version = "0.2.0-alpha.6", features = ["unstable"]}
+agent-client-protocol = { version = "0.2.0-alpha.8", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index ac44b3f1ae..07539e9cbf 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -328,6 +328,12 @@
       "enter": "agent::AcceptSuggestedContext"
     }
   },
+  {
+    "context": "AcpThread > ModeSelector",
+    "bindings": {
+      "ctrl-enter": "menu::Confirm"
+    }
+  },
   {
     "context": "AcpThread > Editor && !use_modifier_to_send",
     "use_key_equivalents": true,
@@ -335,7 +341,7 @@
       "enter": "agent::Chat",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
+      "ctrl-shift-n": "agent::RejectAll",
     }
   },
   {
@@ -345,7 +351,8 @@
       "ctrl-enter": "agent::Chat",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
+      "ctrl-shift-n": "agent::RejectAll",
+      "shift-tab": "agent::CycleModeSelector"
     }
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 337915527c..8cf1217fb0 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -378,6 +378,12 @@
       "ctrl--": "pane::GoBack"
     }
   },
+  {
+    "context": "AcpThread > ModeSelector",
+    "bindings": {
+      "cmd-enter": "menu::Confirm"
+    }
+  },
   {
     "context": "AcpThread > Editor && !use_modifier_to_send",
     "use_key_equivalents": true,
@@ -385,7 +391,8 @@
       "enter": "agent::Chat",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
+      "cmd-shift-n": "agent::RejectAll",
+      "shift-tab": "agent::CycleModeSelector"
     }
   },
   {
@@ -395,7 +402,8 @@
       "cmd-enter": "agent::Chat",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
+      "cmd-shift-n": "agent::RejectAll",
+      "shift-tab": "agent::CycleModeSelector"
     }
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index de0d97b52e..b10ac96433 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -336,6 +336,12 @@
       "enter": "agent::AcceptSuggestedContext"
     }
   },
+  {
+    "context": "AcpThread > ModeSelector",
+    "bindings": {
+      "ctrl-enter": "menu::Confirm"
+    }
+  },
   {
     "context": "AcpThread > Editor",
     "use_key_equivalents": true,
@@ -343,7 +349,8 @@
       "enter": "agent::Chat",
       "ctrl-shift-r": "agent::OpenAgentDiff",
       "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
+      "ctrl-shift-n": "agent::RejectAll",
+      "shift-tab": "agent::CycleModeSelector"
     }
   },
   {
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 2f04687925..802e6fd585 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -828,6 +828,9 @@
       // }
     ],
     // When enabled, the agent can run potentially destructive actions without asking for your confirmation.
+    //
+    // Note: This setting has no effect on external agents that support permission modes, such as Claude Code.
+    //       You can set `agent_servers.claude.default_mode` to `bypassPermissions` to skip all permission requests.
     "always_allow_tool_actions": false,
     // When enabled, the agent will stream edits.
     "stream_edits": false,
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 8d7bea8659..a0bbda848f 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -18,8 +18,8 @@ test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot"]
 [dependencies]
 action_log.workspace = true
 agent-client-protocol.workspace = true
-anyhow.workspace = true
 agent_settings.workspace = true
+anyhow.workspace = true
 buffer_diff.workspace = true
 collections.workspace = true
 editor.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index f36ed6e7a0..085ddfc50d 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -805,6 +805,7 @@ pub enum AcpThreadEvent {
     PromptCapabilitiesUpdated,
     Refusal,
     AvailableCommandsUpdated(Vec<acp::AvailableCommand>),
+    ModeUpdated(acp::SessionModeId),
 }
 
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -1007,6 +1008,9 @@ impl AcpThread {
             acp::SessionUpdate::AvailableCommandsUpdate { available_commands } => {
                 cx.emit(AcpThreadEvent::AvailableCommandsUpdated(available_commands))
             }
+            acp::SessionUpdate::CurrentModeUpdate { current_mode_id } => {
+                cx.emit(AcpThreadEvent::ModeUpdated(current_mode_id))
+            }
         }
         Ok(())
     }
@@ -1303,11 +1307,12 @@ impl AcpThread {
         &mut self,
         tool_call: acp::ToolCallUpdate,
         options: Vec<acp::PermissionOption>,
+        respect_always_allow_setting: bool,
         cx: &mut Context<Self>,
     ) -> Result<BoxFuture<'static, acp::RequestPermissionOutcome>> {
         let (tx, rx) = oneshot::channel();
 
-        if AgentSettings::get_global(cx).always_allow_tool_actions {
+        if respect_always_allow_setting && AgentSettings::get_global(cx).always_allow_tool_actions {
             // Don't use AllowAlways, because then if you were to turn off always_allow_tool_actions,
             // some tools would (incorrectly) continue to auto-accept.
             if let Some(allow_once_option) = options.iter().find_map(|option| {
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 1c465a4cdd..dfb1e3763d 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -75,6 +75,15 @@ pub trait AgentConnection {
     fn telemetry(&self) -> Option<Rc<dyn AgentTelemetry>> {
         None
     }
+
+    fn session_modes(
+        &self,
+        _session_id: &acp::SessionId,
+        _cx: &App,
+    ) -> Option<Rc<dyn AgentSessionModes>> {
+        None
+    }
+
     fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
 }
 
@@ -109,6 +118,14 @@ pub trait AgentTelemetry {
     ) -> Task<Result<serde_json::Value>>;
 }
 
+pub trait AgentSessionModes {
+    fn current_mode(&self) -> acp::SessionModeId;
+
+    fn all_modes(&self) -> Vec<acp::SessionMode>;
+
+    fn set_mode(&self, mode: acp::SessionModeId, cx: &mut App) -> Task<Result<()>>;
+}
+
 #[derive(Debug)]
 pub struct AuthRequired {
     pub description: Option<String>,
@@ -397,6 +414,7 @@ mod test_support {
                                     thread.request_tool_call_authorization(
                                         tool_call.clone().into(),
                                         options.clone(),
+                                        false,
                                         cx,
                                     )
                                 })??
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index e96b4c0cfa..6e0df0cffd 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -771,7 +771,9 @@ impl NativeAgentConnection {
                                 response,
                             }) => {
                                 let outcome_task = acp_thread.update(cx, |thread, cx| {
-                                    thread.request_tool_call_authorization(tool_call, options, cx)
+                                    thread.request_tool_call_authorization(
+                                        tool_call, options, true, cx,
+                                    )
                                 })??;
                                 cx.background_spawn(async move {
                                     if let acp::RequestPermissionOutcome::Selected { option_id } =
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 191bae066c..0664b43750 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -9,6 +9,7 @@ use futures::io::BufReader;
 use project::Project;
 use project::agent_server_store::AgentServerCommand;
 use serde::Deserialize;
+use util::ResultExt;
 
 use std::path::PathBuf;
 use std::{any::Any, cell::RefCell};
@@ -30,6 +31,7 @@ pub struct AcpConnection {
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
     agent_capabilities: acp::AgentCapabilities,
+    default_mode: Option<acp::SessionModeId>,
     root_dir: PathBuf,
     _io_task: Task<Result<()>>,
     _wait_task: Task<Result<()>>,
@@ -39,16 +41,26 @@ pub struct AcpConnection {
 pub struct AcpSession {
     thread: WeakEntity<AcpThread>,
     suppress_abort_err: bool,
+    session_modes: Option<Rc<RefCell<acp::SessionModeState>>>,
 }
 
 pub async fn connect(
     server_name: SharedString,
     command: AgentServerCommand,
     root_dir: &Path,
+    default_mode: Option<acp::SessionModeId>,
     is_remote: bool,
     cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
-    let conn = AcpConnection::stdio(server_name, command.clone(), root_dir, is_remote, cx).await?;
+    let conn = AcpConnection::stdio(
+        server_name,
+        command.clone(),
+        root_dir,
+        default_mode,
+        is_remote,
+        cx,
+    )
+    .await?;
     Ok(Rc::new(conn) as _)
 }
 
@@ -59,6 +71,7 @@ impl AcpConnection {
         server_name: SharedString,
         command: AgentServerCommand,
         root_dir: &Path,
+        default_mode: Option<acp::SessionModeId>,
         is_remote: bool,
         cx: &mut AsyncApp,
     ) -> Result<Self> {
@@ -157,6 +170,7 @@ impl AcpConnection {
             server_name,
             sessions,
             agent_capabilities: response.agent_capabilities,
+            default_mode,
             _io_task: io_task,
             _wait_task: wait_task,
             _stderr_task: stderr_task,
@@ -179,8 +193,10 @@ impl AgentConnection for AcpConnection {
         cwd: &Path,
         cx: &mut App,
     ) -> Task<Result<Entity<AcpThread>>> {
+        let name = self.server_name.clone();
         let conn = self.connection.clone();
         let sessions = self.sessions.clone();
+        let default_mode = self.default_mode.clone();
         let cwd = cwd.to_path_buf();
         let context_server_store = project.read(cx).context_server_store().read(cx);
         let mcp_servers = if project.read(cx).is_local() {
@@ -190,7 +206,7 @@ impl AgentConnection for AcpConnection {
                 .filter_map(|id| {
                     let configuration = context_server_store.configuration_for_server(id)?;
                     let command = configuration.command();
-                    Some(acp::McpServer {
+                    Some(acp::McpServer::Stdio {
                         name: id.0.to_string(),
                         command: command.path.clone(),
                         args: command.args.clone(),
@@ -232,6 +248,53 @@ impl AgentConnection for AcpConnection {
                     }
                 })?;
 
+            let modes = response.modes.map(|modes| Rc::new(RefCell::new(modes)));
+
+            if let Some(default_mode) = default_mode {
+                if let Some(modes) = modes.as_ref() {
+                    let mut modes_ref = modes.borrow_mut();
+                    let has_mode = modes_ref.available_modes.iter().any(|mode| mode.id == default_mode);
+
+                    if has_mode {
+                        let initial_mode_id = modes_ref.current_mode_id.clone();
+
+                        cx.spawn({
+                            let default_mode = default_mode.clone();
+                            let session_id = response.session_id.clone();
+                            let modes = modes.clone();
+                            async move |_| {
+                                let result = conn.set_session_mode(acp::SetSessionModeRequest {
+                                    session_id,
+                                    mode_id: default_mode,
+                                })
+                                .await.log_err();
+
+                                if result.is_none() {
+                                    modes.borrow_mut().current_mode_id = initial_mode_id;
+                                }
+                            }
+                        }).detach();
+
+                        modes_ref.current_mode_id = default_mode;
+                    } else {
+                        let available_modes = modes_ref
+                            .available_modes
+                            .iter()
+                            .map(|mode| format!("- `{}`: {}", mode.id, mode.name))
+                            .collect::<Vec<_>>()
+                            .join("\n");
+
+                        log::warn!(
+                            "`{default_mode}` is not valid {name} mode. Available options:\n{available_modes}",
+                        );
+                    }
+                } else {
+                    log::warn!(
+                        "`{name}` does not support modes, but `default_mode` was set in settings.",
+                    );
+                }
+            }
+
             let session_id = response.session_id;
             let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
             let thread = cx.new(|cx| {
@@ -250,6 +313,7 @@ impl AgentConnection for AcpConnection {
             let session = AcpSession {
                 thread: thread.downgrade(),
                 suppress_abort_err: false,
+                session_modes: modes
             };
             sessions.borrow_mut().insert(session_id, session);
 
@@ -346,11 +410,77 @@ impl AgentConnection for AcpConnection {
             .detach();
     }
 
+    fn session_modes(
+        &self,
+        session_id: &acp::SessionId,
+        _cx: &App,
+    ) -> Option<Rc<dyn acp_thread::AgentSessionModes>> {
+        let sessions = self.sessions.clone();
+        let sessions_ref = sessions.borrow();
+        let Some(session) = sessions_ref.get(session_id) else {
+            return None;
+        };
+
+        if let Some(modes) = session.session_modes.as_ref() {
+            Some(Rc::new(AcpSessionModes {
+                connection: self.connection.clone(),
+                session_id: session_id.clone(),
+                state: modes.clone(),
+            }) as _)
+        } else {
+            None
+        }
+    }
+
     fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
         self
     }
 }
 
+struct AcpSessionModes {
+    session_id: acp::SessionId,
+    connection: Rc<acp::ClientSideConnection>,
+    state: Rc<RefCell<acp::SessionModeState>>,
+}
+
+impl acp_thread::AgentSessionModes for AcpSessionModes {
+    fn current_mode(&self) -> acp::SessionModeId {
+        self.state.borrow().current_mode_id.clone()
+    }
+
+    fn all_modes(&self) -> Vec<acp::SessionMode> {
+        self.state.borrow().available_modes.clone()
+    }
+
+    fn set_mode(&self, mode_id: acp::SessionModeId, cx: &mut App) -> Task<Result<()>> {
+        let connection = self.connection.clone();
+        let session_id = self.session_id.clone();
+        let old_mode_id;
+        {
+            let mut state = self.state.borrow_mut();
+            old_mode_id = state.current_mode_id.clone();
+            state.current_mode_id = mode_id.clone();
+        };
+        let state = self.state.clone();
+        cx.foreground_executor().spawn(async move {
+            let result = connection
+                .set_session_mode(acp::SetSessionModeRequest {
+                    session_id,
+                    mode_id,
+                })
+                .await;
+
+            if result.is_err() {
+                state.borrow_mut().current_mode_id = old_mode_id;
+            }
+
+            result?;
+
+            Ok(())
+        })
+    }
+}
+
 struct ClientDelegate {
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     cx: AsyncApp,
@@ -361,13 +491,27 @@ impl acp::Client for ClientDelegate {
         &self,
         arguments: acp::RequestPermissionRequest,
     ) -> Result<acp::RequestPermissionResponse, acp::Error> {
+        let respect_always_allow_setting;
+        let thread;
+        {
+            let sessions_ref = self.sessions.borrow();
+            let session = sessions_ref
+                .get(&arguments.session_id)
+                .context("Failed to get session")?;
+            respect_always_allow_setting = session.session_modes.is_none();
+            thread = session.thread.clone();
+        }
+
         let cx = &mut self.cx.clone();
 
-        let task = self
-            .session_thread(&arguments.session_id)?
-            .update(cx, |thread, cx| {
-                thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
-            })??;
+        let task = thread.update(cx, |thread, cx| {
+            thread.request_tool_call_authorization(
+                arguments.tool_call,
+                arguments.options,
+                respect_always_allow_setting,
+                cx,
+            )
+        })??;
 
         let outcome = task.await;
 
@@ -410,10 +554,24 @@ impl acp::Client for ClientDelegate {
         &self,
         notification: acp::SessionNotification,
     ) -> Result<(), acp::Error> {
-        self.session_thread(&notification.session_id)?
-            .update(&mut self.cx.clone(), |thread, cx| {
-                thread.handle_session_update(notification.update, cx)
-            })??;
+        let sessions = self.sessions.borrow();
+        let session = sessions
+            .get(&notification.session_id)
+            .context("Failed to get session")?;
+
+        if let acp::SessionUpdate::CurrentModeUpdate { current_mode_id } = &notification.update {
+            if let Some(session_modes) = &session.session_modes {
+                session_modes.borrow_mut().current_mode_id = current_mode_id.clone();
+            } else {
+                log::error!(
+                    "Got a `CurrentModeUpdate` notification, but they agent didn't specify `modes` during setting setup."
+                );
+            }
+        }
+
+        session.thread.update(&mut self.cx.clone(), |thread, cx| {
+            thread.handle_session_update(notification.update, cx)
+        })??;
 
         Ok(())
     }
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index 7f11d8ce93..2c2900cb79 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -8,6 +8,7 @@ pub mod e2e_tests;
 
 pub use claude::*;
 pub use custom::*;
+use fs::Fs;
 pub use gemini::*;
 use project::agent_server_store::AgentServerStore;
 
@@ -15,7 +16,7 @@ use acp_thread::AgentConnection;
 use anyhow::Result;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
-use std::{any::Any, path::Path, rc::Rc};
+use std::{any::Any, path::Path, rc::Rc, sync::Arc};
 
 pub use acp::AcpConnection;
 
@@ -50,6 +51,16 @@ pub trait AgentServer: Send {
     fn logo(&self) -> ui::IconName;
     fn name(&self) -> SharedString;
     fn telemetry_id(&self) -> &'static str;
+    fn default_mode(&self, _cx: &mut App) -> Option<agent_client_protocol::SessionModeId> {
+        None
+    }
+    fn set_default_mode(
+        &self,
+        _mode_id: Option<agent_client_protocol::SessionModeId>,
+        _fs: Arc<dyn Fs>,
+        _cx: &mut App,
+    ) {
+    }
 
     fn connect(
         &self,
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 0cb2dead3b..c75c9539ab 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,10 +1,14 @@
+use agent_client_protocol as acp;
+use fs::Fs;
+use settings::{SettingsStore, update_settings_file};
 use std::path::Path;
 use std::rc::Rc;
+use std::sync::Arc;
 use std::{any::Any, path::PathBuf};
 
 use anyhow::{Context as _, Result};
-use gpui::{App, SharedString, Task};
-use project::agent_server_store::CLAUDE_CODE_NAME;
+use gpui::{App, AppContext as _, SharedString, Task};
+use project::agent_server_store::{AllAgentServersSettings, CLAUDE_CODE_NAME};
 
 use crate::{AgentServer, AgentServerDelegate};
 use acp_thread::AgentConnection;
@@ -30,6 +34,22 @@ impl AgentServer for ClaudeCode {
         ui::IconName::AiClaude
     }
 
+    fn default_mode(&self, cx: &mut App) -> Option<acp::SessionModeId> {
+        let settings = cx.read_global(|settings: &SettingsStore, _| {
+            settings.get::<AllAgentServersSettings>(None).claude.clone()
+        });
+
+        settings
+            .as_ref()
+            .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
+    }
+
+    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
+        update_settings_file::<AllAgentServersSettings>(fs, cx, |settings, _| {
+            settings.claude.get_or_insert_default().default_mode = mode_id.map(|m| m.to_string())
+        });
+    }
+
     fn connect(
         &self,
         root_dir: Option<&Path>,
@@ -40,6 +60,7 @@ impl AgentServer for ClaudeCode {
         let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
         let is_remote = delegate.project.read(cx).is_via_remote_server();
         let store = delegate.store.downgrade();
+        let default_mode = self.default_mode(cx);
 
         cx.spawn(async move |cx| {
             let (command, root_dir, login) = store
@@ -56,8 +77,15 @@ impl AgentServer for ClaudeCode {
                     ))
                 })??
                 .await?;
-            let connection =
-                crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
+            let connection = crate::acp::connect(
+                name,
+                command,
+                root_dir.as_ref(),
+                default_mode,
+                is_remote,
+                cx,
+            )
+            .await?;
             Ok((connection, login))
         })
     }
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index 0fb595ff02..f035952a79 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,9 +1,12 @@
 use crate::AgentServerDelegate;
 use acp_thread::AgentConnection;
+use agent_client_protocol as acp;
 use anyhow::{Context as _, Result};
-use gpui::{App, SharedString, Task};
-use project::agent_server_store::ExternalAgentServerName;
-use std::{path::Path, rc::Rc};
+use fs::Fs;
+use gpui::{App, AppContext as _, SharedString, Task};
+use project::agent_server_store::{AllAgentServersSettings, ExternalAgentServerName};
+use settings::{SettingsStore, update_settings_file};
+use std::{path::Path, rc::Rc, sync::Arc};
 use ui::IconName;
 
 /// A generic agent server implementation for custom user-defined agents
@@ -30,6 +33,27 @@ impl crate::AgentServer for CustomAgentServer {
         IconName::Terminal
     }
 
+    fn default_mode(&self, cx: &mut App) -> Option<acp::SessionModeId> {
+        let settings = cx.read_global(|settings: &SettingsStore, _| {
+            settings
+                .get::<AllAgentServersSettings>(None)
+                .custom
+                .get(&self.name())
+                .cloned()
+        });
+
+        settings
+            .as_ref()
+            .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
+    }
+
+    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
+        let name = self.name();
+        update_settings_file::<AllAgentServersSettings>(fs, cx, move |settings, _| {
+            settings.custom.get_mut(&name).unwrap().default_mode = mode_id.map(|m| m.to_string())
+        });
+    }
+
     fn connect(
         &self,
         root_dir: Option<&Path>,
@@ -39,6 +63,7 @@ impl crate::AgentServer for CustomAgentServer {
         let name = self.name();
         let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().to_string());
         let is_remote = delegate.project.read(cx).is_via_remote_server();
+        let default_mode = self.default_mode(cx);
         let store = delegate.store.downgrade();
 
         cx.spawn(async move |cx| {
@@ -58,8 +83,15 @@ impl crate::AgentServer for CustomAgentServer {
                     ))
                 })??
                 .await?;
-            let connection =
-                crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
+            let connection = crate::acp::connect(
+                name,
+                command,
+                root_dir.as_ref(),
+                default_mode,
+                is_remote,
+                cx,
+            )
+            .await?;
             Ok((connection, login))
         })
     }
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index eda55a596a..a4af1b6ad5 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -5,7 +5,7 @@ use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::{AppContext, Entity, TestAppContext};
 use indoc::indoc;
 #[cfg(test)]
-use project::agent_server_store::{AgentServerCommand, CustomAgentServerSettings};
+use project::agent_server_store::BuiltinAgentServerSettings;
 use project::{FakeFs, Project, agent_server_store::AllAgentServersSettings};
 use std::{
     path::{Path, PathBuf},
@@ -472,12 +472,12 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
         #[cfg(test)]
         AllAgentServersSettings::override_global(
             AllAgentServersSettings {
-                claude: Some(CustomAgentServerSettings {
-                    command: AgentServerCommand {
-                        path: "claude-code-acp".into(),
-                        args: vec![],
-                        env: None,
-                    },
+                claude: Some(BuiltinAgentServerSettings {
+                    path: Some("claude-code-acp".into()),
+                    args: None,
+                    env: None,
+                    ignore_system_version: None,
+                    default_mode: None,
                 }),
                 gemini: Some(crate::gemini::tests::local_command().into()),
                 custom: collections::HashMap::default(),
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index cf553273db..01f1555789 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -40,6 +40,7 @@ impl AgentServer for Gemini {
         let proxy_url = cx.read_global(|settings: &SettingsStore, _| {
             settings.get::<ProxySettings>(None).proxy.clone()
         });
+        let default_mode = self.default_mode(cx);
 
         cx.spawn(async move |cx| {
             let mut extra_env = HashMap::default();
@@ -69,8 +70,15 @@ impl AgentServer for Gemini {
                 command.args.push(proxy_url_value.clone());
             }
 
-            let connection =
-                crate::acp::connect(name, command, root_dir.as_ref(), is_remote, cx).await?;
+            let connection = crate::acp::connect(
+                name,
+                command,
+                root_dir.as_ref(),
+                default_mode,
+                is_remote,
+                cx,
+            )
+            .await?;
             Ok((connection, login))
         })
     }
diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
new file mode 100644
index 0000000000..9a610465be
--- /dev/null
+++ b/crates/agent_servers/src/settings.rs
@@ -0,0 +1,125 @@
+use agent_client_protocol as acp;
+use std::path::PathBuf;
+
+use crate::AgentServerCommand;
+use anyhow::Result;
+use collections::HashMap;
+use gpui::{App, SharedString};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+
+pub fn init(cx: &mut App) {
+    AllAgentServersSettings::register(cx);
+}
+
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[settings_key(key = "agent_servers")]
+pub struct AllAgentServersSettings {
+    pub gemini: Option<BuiltinAgentServerSettings>,
+    pub claude: Option<BuiltinAgentServerSettings>,
+
+    /// Custom agent servers configured by the user
+    #[serde(flatten)]
+    pub custom: HashMap<SharedString, CustomAgentServerSettings>,
+}
+
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
+pub struct BuiltinAgentServerSettings {
+    /// Absolute path to a binary to be used when launching this agent.
+    ///
+    /// This can be used to run a specific binary without automatic downloads or searching `$PATH`.
+    #[serde(rename = "command")]
+    pub path: Option<PathBuf>,
+    /// If a binary is specified in `command`, it will be passed these arguments.
+    pub args: Option<Vec<String>>,
+    /// If a binary is specified in `command`, it will be passed these environment variables.
+    pub env: Option<HashMap<String, String>>,
+    /// Whether to skip searching `$PATH` for an agent server binary when
+    /// launching this agent.
+    ///
+    /// This has no effect if a `command` is specified. Otherwise, when this is
+    /// `false`, Zed will search `$PATH` for an agent server binary and, if one
+    /// is found, use it for threads with this agent. If no agent binary is
+    /// found on `$PATH`, Zed will automatically install and use its own binary.
+    /// When this is `true`, Zed will not search `$PATH`, and will always use
+    /// its own binary.
+    ///
+    /// Default: true
+    pub ignore_system_version: Option<bool>,
+    /// The default mode for new threads.
+    ///
+    /// Note: Not all agents support modes.
+    ///
+    /// Default: None
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default_mode: Option<acp::SessionModeId>,
+}
+
+impl BuiltinAgentServerSettings {
+    pub(crate) fn custom_command(self) -> Option<AgentServerCommand> {
+        self.path.map(|path| AgentServerCommand {
+            path,
+            args: self.args.unwrap_or_default(),
+            env: self.env,
+        })
+    }
+}
+
+impl From<AgentServerCommand> for BuiltinAgentServerSettings {
+    fn from(value: AgentServerCommand) -> Self {
+        BuiltinAgentServerSettings {
+            path: Some(value.path),
+            args: Some(value.args),
+            env: value.env,
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
+pub struct CustomAgentServerSettings {
+    #[serde(flatten)]
+    pub command: AgentServerCommand,
+    /// The default mode for new threads.
+    ///
+    /// Note: Not all agents support modes.
+    ///
+    /// Default: None
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub default_mode: Option<acp::SessionModeId>,
+}
+
+impl settings::Settings for AllAgentServersSettings {
+    type FileContent = Self;
+
+    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
+        let mut settings = AllAgentServersSettings::default();
+
+        for AllAgentServersSettings {
+            gemini,
+            claude,
+            custom,
+        } in sources.defaults_and_customizations()
+        {
+            if gemini.is_some() {
+                settings.gemini = gemini.clone();
+            }
+            if claude.is_some() {
+                settings.claude = claude.clone();
+            }
+
+            // Merge custom agents
+            for (name, config) in custom {
+                // Skip built-in agent names to avoid conflicts
+                if name != "gemini" && name != "claude" {
+                    settings.custom.insert(name.clone(), config.clone());
+                }
+            }
+        }
+
+        Ok(settings)
+    }
+
+    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
+}
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 8c4a190e1c..e850945a40 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -269,6 +269,10 @@ pub struct AgentSettingsContent {
     /// Whenever a tool action would normally wait for your confirmation
     /// that you allow it, always choose to allow it.
     ///
+    /// This setting has no effect on external agents that support permission modes, such as Claude Code.
+    ///
+    /// Set `agent_servers.claude.default_mode` to `bypassPermissions`, to disable all permission requests when using Claude Code.
+    ///
     /// Default: false
     always_allow_tool_actions: Option<bool>,
     /// Where to show a popup notification when the agent is waiting for user input.
diff --git a/crates/agent_ui/src/acp.rs b/crates/agent_ui/src/acp.rs
index 6f228b91d6..2e15cd424d 100644
--- a/crates/agent_ui/src/acp.rs
+++ b/crates/agent_ui/src/acp.rs
@@ -1,11 +1,13 @@
 mod completion_provider;
 mod entry_view_state;
 mod message_editor;
+mod mode_selector;
 mod model_selector;
 mod model_selector_popover;
 mod thread_history;
 mod thread_view;
 
+pub use mode_selector::ModeSelector;
 pub use model_selector::AcpModelSelector;
 pub use model_selector_popover::AcpModelSelectorPopover;
 pub use thread_history::*;
diff --git a/crates/agent_ui/src/acp/mode_selector.rs b/crates/agent_ui/src/acp/mode_selector.rs
new file mode 100644
index 0000000000..b68643859e
--- /dev/null
+++ b/crates/agent_ui/src/acp/mode_selector.rs
@@ -0,0 +1,230 @@
+use acp_thread::AgentSessionModes;
+use agent_client_protocol as acp;
+use agent_servers::AgentServer;
+use fs::Fs;
+use gpui::{Context, Entity, FocusHandle, WeakEntity, Window, prelude::*};
+use std::{rc::Rc, sync::Arc};
+use ui::{
+    Button, ContextMenu, ContextMenuEntry, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip,
+    prelude::*,
+};
+
+use crate::{CycleModeSelector, ToggleProfileSelector};
+
+pub struct ModeSelector {
+    connection: Rc<dyn AgentSessionModes>,
+    agent_server: Rc<dyn AgentServer>,
+    menu_handle: PopoverMenuHandle<ContextMenu>,
+    focus_handle: FocusHandle,
+    fs: Arc<dyn Fs>,
+    setting_mode: bool,
+}
+
+impl ModeSelector {
+    pub fn new(
+        session_modes: Rc<dyn AgentSessionModes>,
+        agent_server: Rc<dyn AgentServer>,
+        fs: Arc<dyn Fs>,
+        focus_handle: FocusHandle,
+    ) -> Self {
+        Self {
+            connection: session_modes,
+            agent_server,
+            menu_handle: PopoverMenuHandle::default(),
+            fs,
+            setting_mode: false,
+            focus_handle,
+        }
+    }
+
+    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
+        self.menu_handle.clone()
+    }
+
+    pub fn cycle_mode(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        let all_modes = self.connection.all_modes();
+        let current_mode = self.connection.current_mode();
+
+        let current_index = all_modes
+            .iter()
+            .position(|mode| mode.id.0 == current_mode.0)
+            .unwrap_or(0);
+
+        let next_index = (current_index + 1) % all_modes.len();
+        self.set_mode(all_modes[next_index].id.clone(), cx);
+    }
+
+    pub fn set_mode(&mut self, mode: acp::SessionModeId, cx: &mut Context<Self>) {
+        let task = self.connection.set_mode(mode, cx);
+        self.setting_mode = true;
+        cx.notify();
+
+        cx.spawn(async move |this: WeakEntity<ModeSelector>, cx| {
+            if let Err(err) = task.await {
+                log::error!("Failed to set session mode: {:?}", err);
+            }
+            this.update(cx, |this, cx| {
+                this.setting_mode = false;
+                cx.notify();
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn build_context_menu(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<ContextMenu> {
+        let weak_self = cx.weak_entity();
+
+        ContextMenu::build(window, cx, move |mut menu, _window, cx| {
+            let all_modes = self.connection.all_modes();
+            let current_mode = self.connection.current_mode();
+            let default_mode = self.agent_server.default_mode(cx);
+
+            for mode in all_modes {
+                let is_selected = &mode.id == &current_mode;
+                let is_default = Some(&mode.id) == default_mode.as_ref();
+                let entry = ContextMenuEntry::new(mode.name.clone())
+                    .toggleable(IconPosition::End, is_selected);
+
+                let entry = if let Some(description) = &mode.description {
+                    entry.documentation_aside(ui::DocumentationSide::Left, {
+                        let description = description.clone();
+
+                        move |cx| {
+                            v_flex()
+                                .gap_1()
+                                .child(Label::new(description.clone()))
+                                .child(
+                                    h_flex()
+                                        .pt_1()
+                                        .border_t_1()
+                                        .border_color(cx.theme().colors().border_variant)
+                                        .gap_0p5()
+                                        .text_sm()
+                                        .text_color(Color::Muted.color(cx))
+                                        .child("Hold")
+                                        .child(div().pt_0p5().children(ui::render_modifiers(
+                                            &gpui::Modifiers::secondary_key(),
+                                            PlatformStyle::platform(),
+                                            None,
+                                            Some(ui::TextSize::Default.rems(cx).into()),
+                                            true,
+                                        )))
+                                        .child(div().map(|this| {
+                                            if is_default {
+                                                this.child("to also unset as default")
+                                            } else {
+                                                this.child("to also set as default")
+                                            }
+                                        })),
+                                )
+                                .into_any_element()
+                        }
+                    })
+                } else {
+                    entry
+                };
+
+                menu.push_item(entry.handler({
+                    let mode_id = mode.id.clone();
+                    let weak_self = weak_self.clone();
+                    move |window, cx| {
+                        weak_self
+                            .update(cx, |this, cx| {
+                                if window.modifiers().secondary() {
+                                    this.agent_server.set_default_mode(
+                                        if is_default {
+                                            None
+                                        } else {
+                                            Some(mode_id.clone())
+                                        },
+                                        this.fs.clone(),
+                                        cx,
+                                    );
+                                }
+
+                                this.set_mode(mode_id.clone(), cx);
+                            })
+                            .ok();
+                    }
+                }));
+            }
+
+            menu.key_context("ModeSelector")
+        })
+    }
+}
+
+impl Render for ModeSelector {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let current_mode_id = self.connection.current_mode();
+        let current_mode_name = self
+            .connection
+            .all_modes()
+            .iter()
+            .find(|mode| mode.id == current_mode_id)
+            .map(|mode| mode.name.clone())
+            .unwrap_or_else(|| "Unknown".into());
+
+        let this = cx.entity();
+
+        let trigger_button = Button::new("mode-selector-trigger", current_mode_name)
+            .label_size(LabelSize::Small)
+            .style(ButtonStyle::Subtle)
+            .color(Color::Muted)
+            .icon(IconName::ChevronDown)
+            .icon_size(IconSize::XSmall)
+            .icon_position(IconPosition::End)
+            .icon_color(Color::Muted)
+            .disabled(self.setting_mode);
+
+        PopoverMenu::new("mode-selector")
+            .trigger_with_tooltip(
+                trigger_button,
+                Tooltip::element({
+                    let focus_handle = self.focus_handle.clone();
+                    move |window, cx| {
+                        v_flex()
+                            .gap_1()
+                            .child(
+                                h_flex()
+                                    .pb_1()
+                                    .gap_2()
+                                    .justify_between()
+                                    .border_b_1()
+                                    .border_color(cx.theme().colors().border_variant)
+                                    .child(Label::new("Cycle Through Modes"))
+                                    .children(KeyBinding::for_action_in(
+                                        &CycleModeSelector,
+                                        &focus_handle,
+                                        window,
+                                        cx,
+                                    )),
+                            )
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .justify_between()
+                                    .child(Label::new("Toggle Mode Menu"))
+                                    .children(KeyBinding::for_action_in(
+                                        &ToggleProfileSelector,
+                                        &focus_handle,
+                                        window,
+                                        cx,
+                                    )),
+                            )
+                            .into_any()
+                    }
+                }),
+            )
+            .anchor(gpui::Corner::BottomRight)
+            .with_handle(self.menu_handle.clone())
+            .menu(move |window, cx| {
+                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
+            })
+    }
+}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 35fd0f5a1d..5c21ab81ea 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -54,6 +54,7 @@ use zed_actions::assistant::OpenRulesLibrary;
 
 use super::entry_view_state::EntryViewState;
 use crate::acp::AcpModelSelectorPopover;
+use crate::acp::ModeSelector;
 use crate::acp::entry_view_state::{EntryViewEvent, ViewEvent};
 use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
@@ -64,8 +65,9 @@ use crate::ui::{
     AgentNotification, AgentNotificationEvent, BurnModeTooltip, UnavailableEditingTooltip,
 };
 use crate::{
-    AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, ExpandMessageEditor, Follow,
-    KeepAll, OpenAgentDiff, OpenHistory, RejectAll, ToggleBurnMode, ToggleProfileSelector,
+    AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, CycleModeSelector,
+    ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, OpenHistory, RejectAll, ToggleBurnMode,
+    ToggleProfileSelector,
 };
 
 pub const MIN_EDITOR_LINES: usize = 4;
@@ -298,6 +300,7 @@ enum ThreadState {
     Ready {
         thread: Entity<AcpThread>,
         title_editor: Option<Entity<Editor>>,
+        mode_selector: Option<Entity<ModeSelector>>,
         _subscriptions: Vec<Subscription>,
     },
     LoadError(LoadError),
@@ -396,6 +399,7 @@ impl AcpThreadView {
             message_editor,
             model_selector: None,
             profile_selector: None,
+
             notifications: Vec::new(),
             notification_subscriptions: HashMap::default(),
             list_state: list_state.clone(),
@@ -594,6 +598,23 @@ impl AcpThreadView {
                                     })
                                 });
 
+                        let mode_selector = thread
+                            .read(cx)
+                            .connection()
+                            .session_modes(thread.read(cx).session_id(), cx)
+                            .map(|session_modes| {
+                                let fs = this.project.read(cx).fs().clone();
+                                let focus_handle = this.focus_handle(cx);
+                                cx.new(|_cx| {
+                                    ModeSelector::new(
+                                        session_modes,
+                                        this.agent.clone(),
+                                        fs,
+                                        focus_handle,
+                                    )
+                                })
+                            });
+
                         let mut subscriptions = vec![
                             cx.subscribe_in(&thread, window, Self::handle_thread_event),
                             cx.observe(&action_log, |_, _, cx| cx.notify()),
@@ -615,9 +636,11 @@ impl AcpThreadView {
                             } else {
                                 None
                             };
+
                         this.thread_state = ThreadState::Ready {
                             thread,
                             title_editor,
+                            mode_selector,
                             _subscriptions: subscriptions,
                         };
                         this.message_editor.focus_handle(cx).focus(window);
@@ -770,6 +793,15 @@ impl AcpThreadView {
         }
     }
 
+    pub fn mode_selector(&self) -> Option<&Entity<ModeSelector>> {
+        match &self.thread_state {
+            ThreadState::Ready { mode_selector, .. } => mode_selector.as_ref(),
+            ThreadState::Unauthenticated { .. }
+            | ThreadState::Loading { .. }
+            | ThreadState::LoadError { .. } => None,
+        }
+    }
+
     pub fn title(&self, cx: &App) -> SharedString {
         match &self.thread_state {
             ThreadState::Ready { .. } | ThreadState::Unauthenticated { .. } => "New Thread".into(),
@@ -1365,6 +1397,10 @@ impl AcpThreadView {
 
                 self.available_commands.replace(available_commands);
             }
+            AcpThreadEvent::ModeUpdated(_mode) => {
+                // The connection keeps track of the mode
+                cx.notify();
+            }
         }
         cx.notify();
     }
@@ -2055,6 +2091,7 @@ impl AcpThreadView {
                 acp::ToolKind::Execute => IconName::ToolTerminal,
                 acp::ToolKind::Think => IconName::ToolThink,
                 acp::ToolKind::Fetch => IconName::ToolWeb,
+                acp::ToolKind::SwitchMode => IconName::ArrowRightLeft,
                 acp::ToolKind::Other => IconName::ToolHammer,
             })
         }
@@ -2105,59 +2142,67 @@ impl AcpThreadView {
                 })
         };
 
-        let tool_output_display = if is_open {
-            match &tool_call.status {
-                ToolCallStatus::WaitingForConfirmation { options, .. } => v_flex()
-                    .w_full()
-                    .children(tool_call.content.iter().map(|content| {
-                        div()
-                            .child(self.render_tool_call_content(
-                                entry_ix,
-                                content,
-                                tool_call,
-                                use_card_layout,
-                                window,
-                                cx,
-                            ))
-                            .into_any_element()
-                    }))
-                    .child(self.render_permission_buttons(
-                        options,
-                        entry_ix,
-                        tool_call.id.clone(),
-                        cx,
-                    ))
-                    .into_any(),
-                ToolCallStatus::Pending | ToolCallStatus::InProgress
-                    if is_edit
-                        && tool_call.content.is_empty()
-                        && self.as_native_connection(cx).is_some() =>
-                {
-                    self.render_diff_loading(cx).into_any()
-                }
-                ToolCallStatus::Pending
-                | ToolCallStatus::InProgress
-                | ToolCallStatus::Completed
-                | ToolCallStatus::Failed
-                | ToolCallStatus::Canceled => v_flex()
-                    .w_full()
-                    .children(tool_call.content.iter().map(|content| {
-                        div().child(self.render_tool_call_content(
+        let tool_output_display =
+            if is_open {
+                match &tool_call.status {
+                    ToolCallStatus::WaitingForConfirmation { options, .. } => v_flex()
+                        .w_full()
+                        .children(tool_call.content.iter().enumerate().map(
+                            |(content_ix, content)| {
+                                div()
+                                    .child(self.render_tool_call_content(
+                                        entry_ix,
+                                        content,
+                                        content_ix,
+                                        tool_call,
+                                        use_card_layout,
+                                        window,
+                                        cx,
+                                    ))
+                                    .into_any_element()
+                            },
+                        ))
+                        .child(self.render_permission_buttons(
+                            tool_call.kind,
+                            options,
                             entry_ix,
-                            content,
-                            tool_call,
-                            use_card_layout,
-                            window,
+                            tool_call.id.clone(),
                             cx,
                         ))
-                    }))
-                    .into_any(),
-                ToolCallStatus::Rejected => Empty.into_any(),
-            }
-            .into()
-        } else {
-            None
-        };
+                        .into_any(),
+                    ToolCallStatus::Pending | ToolCallStatus::InProgress
+                        if is_edit
+                            && tool_call.content.is_empty()
+                            && self.as_native_connection(cx).is_some() =>
+                    {
+                        self.render_diff_loading(cx).into_any()
+                    }
+                    ToolCallStatus::Pending
+                    | ToolCallStatus::InProgress
+                    | ToolCallStatus::Completed
+                    | ToolCallStatus::Failed
+                    | ToolCallStatus::Canceled => v_flex()
+                        .w_full()
+                        .children(tool_call.content.iter().enumerate().map(
+                            |(content_ix, content)| {
+                                div().child(self.render_tool_call_content(
+                                    entry_ix,
+                                    content,
+                                    content_ix,
+                                    tool_call,
+                                    use_card_layout,
+                                    window,
+                                    cx,
+                                ))
+                            },
+                        ))
+                        .into_any(),
+                    ToolCallStatus::Rejected => Empty.into_any(),
+                }
+                .into()
+            } else {
+                None
+            };
 
         v_flex()
             .map(|this| {
@@ -2282,6 +2327,7 @@ impl AcpThreadView {
         &self,
         entry_ix: usize,
         content: &ToolCallContent,
+        context_ix: usize,
         tool_call: &ToolCall,
         card_layout: bool,
         window: &Window,
@@ -2295,6 +2341,7 @@ impl AcpThreadView {
                     self.render_markdown_output(
                         markdown.clone(),
                         tool_call.id.clone(),
+                        context_ix,
                         card_layout,
                         window,
                         cx,
@@ -2314,6 +2361,7 @@ impl AcpThreadView {
         &self,
         markdown: Entity<Markdown>,
         tool_call_id: acp::ToolCallId,
+        context_ix: usize,
         card_layout: bool,
         window: &Window,
         cx: &Context<Self>,
@@ -2330,11 +2378,13 @@ impl AcpThreadView {
                     .border_color(self.tool_card_border_color(cx))
             })
             .when(card_layout, |this| {
-                this.p_2()
-                    .border_t_1()
-                    .border_color(self.tool_card_border_color(cx))
+                this.px_2().pb_2().when(context_ix > 0, |this| {
+                    this.border_t_1()
+                        .pt_2()
+                        .border_color(self.tool_card_border_color(cx))
+                })
             })
-            .text_sm()
+            .text_xs()
             .text_color(cx.theme().colors().text_muted)
             .child(self.render_markdown(markdown, default_markdown_style(false, false, window, cx)))
             .when(!card_layout, |this| {
@@ -2415,6 +2465,7 @@ impl AcpThreadView {
 
     fn render_permission_buttons(
         &self,
+        kind: acp::ToolKind,
         options: &[acp::PermissionOption],
         entry_ix: usize,
         tool_call_id: acp::ToolCallId,
@@ -2422,53 +2473,65 @@ impl AcpThreadView {
     ) -> Div {
         h_flex()
             .py_1()
-            .pl_2()
-            .pr_1()
+            .px_1()
             .gap_1()
             .justify_between()
             .flex_wrap()
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
-            .child(
+            .when(kind != acp::ToolKind::SwitchMode, |this| {
+                this.pl_2().child(
+                    div().min_w(rems_from_px(145.)).child(
+                        LoadingLabel::new("Waiting for Confirmation").size(LabelSize::Small),
+                    ),
+                )
+            })
+            .child({
                 div()
-                    .min_w(rems_from_px(145.))
-                    .child(LoadingLabel::new("Waiting for Confirmation").size(LabelSize::Small)),
-            )
-            .child(h_flex().gap_0p5().children(options.iter().map(|option| {
-                let option_id = SharedString::from(option.id.0.clone());
-                Button::new((option_id, entry_ix), option.name.clone())
-                    .map(|this| match option.kind {
-                        acp::PermissionOptionKind::AllowOnce => {
-                            this.icon(IconName::Check).icon_color(Color::Success)
-                        }
-                        acp::PermissionOptionKind::AllowAlways => {
-                            this.icon(IconName::CheckDouble).icon_color(Color::Success)
-                        }
-                        acp::PermissionOptionKind::RejectOnce => {
-                            this.icon(IconName::Close).icon_color(Color::Error)
-                        }
-                        acp::PermissionOptionKind::RejectAlways => {
-                            this.icon(IconName::Close).icon_color(Color::Error)
+                    .map(|this| {
+                        if kind == acp::ToolKind::SwitchMode {
+                            this.w_full().v_flex()
+                        } else {
+                            this.h_flex()
                         }
                     })
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::XSmall)
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener({
-                        let tool_call_id = tool_call_id.clone();
-                        let option_id = option.id.clone();
-                        let option_kind = option.kind;
-                        move |this, _, window, cx| {
-                            this.authorize_tool_call(
-                                tool_call_id.clone(),
-                                option_id.clone(),
-                                option_kind,
-                                window,
-                                cx,
-                            );
-                        }
+                    .gap_0p5()
+                    .children(options.iter().map(|option| {
+                        let option_id = SharedString::from(option.id.0.clone());
+                        Button::new((option_id, entry_ix), option.name.clone())
+                            .map(|this| match option.kind {
+                                acp::PermissionOptionKind::AllowOnce => {
+                                    this.icon(IconName::Check).icon_color(Color::Success)
+                                }
+                                acp::PermissionOptionKind::AllowAlways => {
+                                    this.icon(IconName::CheckDouble).icon_color(Color::Success)
+                                }
+                                acp::PermissionOptionKind::RejectOnce => {
+                                    this.icon(IconName::Close).icon_color(Color::Error)
+                                }
+                                acp::PermissionOptionKind::RejectAlways => {
+                                    this.icon(IconName::Close).icon_color(Color::Error)
+                                }
+                            })
+                            .icon_position(IconPosition::Start)
+                            .icon_size(IconSize::XSmall)
+                            .label_size(LabelSize::Small)
+                            .on_click(cx.listener({
+                                let tool_call_id = tool_call_id.clone();
+                                let option_id = option.id.clone();
+                                let option_kind = option.kind;
+                                move |this, _, window, cx| {
+                                    this.authorize_tool_call(
+                                        tool_call_id.clone(),
+                                        option_id.clone(),
+                                        option_kind,
+                                        window,
+                                        cx,
+                                    );
+                                }
+                            }))
                     }))
-            })))
+            })
     }
 
     fn render_diff_loading(&self, cx: &Context<Self>) -> AnyElement {
@@ -3729,6 +3792,15 @@ impl AcpThreadView {
             .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
                 if let Some(profile_selector) = this.profile_selector.as_ref() {
                     profile_selector.read(cx).menu_handle().toggle(window, cx);
+                } else if let Some(mode_selector) = this.mode_selector() {
+                    mode_selector.read(cx).menu_handle().toggle(window, cx);
+                }
+            }))
+            .on_action(cx.listener(|this, _: &CycleModeSelector, window, cx| {
+                if let Some(mode_selector) = this.mode_selector() {
+                    mode_selector.update(cx, |mode_selector, cx| {
+                        mode_selector.cycle_mode(window, cx);
+                    });
                 }
             }))
             .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
@@ -3795,6 +3867,7 @@ impl AcpThreadView {
                             .gap_1()
                             .children(self.render_token_usage(cx))
                             .children(self.profile_selector.clone())
+                            .children(self.mode_selector().cloned())
                             .children(self.model_selector.clone())
                             .child(self.render_send_button(cx)),
                     ),
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 91ae3f0005..ad6ab13e9f 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -1322,6 +1322,7 @@ async fn open_new_agent_servers_entry_in_settings_editor(
                                 args: vec![],
                                 env: Some(HashMap::default()),
                             },
+                            default_mode: None,
                         },
                     );
                 }
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index e3688dccce..14a60b3014 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1529,7 +1529,8 @@ impl AgentDiff {
             | AcpThreadEvent::ToolAuthorizationRequired
             | AcpThreadEvent::PromptCapabilitiesUpdated
             | AcpThreadEvent::AvailableCommandsUpdated(_)
-            | AcpThreadEvent::Retry(_) => {}
+            | AcpThreadEvent::Retry(_)
+            | AcpThreadEvent::ModeUpdated(_) => {}
         }
     }
 
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 55d48319c3..a35ed6be42 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2717,10 +2717,13 @@ impl AgentPanel {
                                                                 panel.update(cx, |panel, cx| {
                                                                     panel.new_agent_thread(
                                                                         AgentType::Custom {
-                                                                            name: agent_name
-                                                                                .clone()
-                                                                                .into(),
-                                                                            command: custom_settings.get(&agent_name.0).map(|settings| settings.command.clone()).unwrap_or(placeholder_command())
+                                                                            name: agent_name.clone().into(),
+                                                                            command: custom_settings
+                                                                                .get(&agent_name.0)
+                                                                                .map(|settings| {
+                                                                                    settings.command.clone()
+                                                                                })
+                                                                                .unwrap_or(placeholder_command()),
                                                                         },
                                                                         window,
                                                                         cx,
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index b16643854e..67330e5ea0 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -72,8 +72,10 @@ actions!(
         ToggleOptionsMenu,
         /// Deletes the recently opened thread from history.
         DeleteRecentlyOpenThread,
-        /// Toggles the profile selector for switching between agent profiles.
+        /// Toggles the profile or mode selector for switching between agent profiles.
         ToggleProfileSelector,
+        /// Cycles through available session modes.
+        CycleModeSelector,
         /// Removes all added context from the current conversation.
         RemoveAllContext,
         /// Expands the message editor to full size.
diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
index 5f9342c893..bdb2297624 100644
--- a/crates/project/src/agent_server_store.rs
+++ b/crates/project/src/agent_server_store.rs
@@ -191,7 +191,10 @@ impl AgentServerStore {
                 fs: fs.clone(),
                 node_runtime: node_runtime.clone(),
                 project_environment: project_environment.clone(),
-                custom_command: new_settings.claude.clone().map(|settings| settings.command),
+                custom_command: new_settings
+                    .claude
+                    .clone()
+                    .and_then(|settings| settings.custom_command()),
             }),
         );
         self.external_agents
@@ -997,7 +1000,7 @@ pub const CLAUDE_CODE_NAME: &'static str = "claude";
 #[settings_key(key = "agent_servers")]
 pub struct AllAgentServersSettings {
     pub gemini: Option<BuiltinAgentServerSettings>,
-    pub claude: Option<CustomAgentServerSettings>,
+    pub claude: Option<BuiltinAgentServerSettings>,
 
     /// Custom agent servers configured by the user
     #[serde(flatten)]
@@ -1027,6 +1030,12 @@ pub struct BuiltinAgentServerSettings {
     ///
     /// Default: true
     pub ignore_system_version: Option<bool>,
+    /// The default mode to use for this agent.
+    ///
+    /// Note: Not only all agents support modes.
+    ///
+    /// Default: None
+    pub default_mode: Option<String>,
 }
 
 impl BuiltinAgentServerSettings {
@@ -1054,6 +1063,12 @@ impl From<AgentServerCommand> for BuiltinAgentServerSettings {
 pub struct CustomAgentServerSettings {
     #[serde(flatten)]
     pub command: AgentServerCommand,
+    /// The default mode to use for this agent.
+    ///
+    /// Note: Not only all agents support modes.
+    ///
+    /// Default: None
+    pub default_mode: Option<String>,
 }
 
 impl settings::Settings for AllAgentServersSettings {

From 7f607a9b7d93ba07ab1f66330df0b28524bc239c Mon Sep 17 00:00:00 2001
From: Guillaume Launay <guillaume.launay@paylead.fr>
Date: Tue, 9 Sep 2025 18:36:26 +0200
Subject: [PATCH 716/823] git_ui: Show current branch first in branch picker
 (#35138)

Closes #ISSUE

Release Notes:

- Put current branch first in branch picker
---
 crates/git_ui/src/branch_picker.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 2b5a543e93..d90f2c0408 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -122,10 +122,13 @@ impl BranchList {
                     all_branches.retain(|branch| !remote_upstreams.contains(&branch.ref_name));
 
                     all_branches.sort_by_key(|branch| {
-                        branch
-                            .most_recent_commit
-                            .as_ref()
-                            .map(|commit| 0 - commit.commit_timestamp)
+                        (
+                            !branch.is_head, // Current branch (is_head=true) comes first
+                            branch
+                                .most_recent_commit
+                                .as_ref()
+                                .map(|commit| 0 - commit.commit_timestamp),
+                        )
                     });
 
                     all_branches

From 8527dcfc652776d3c5d7ade5151c0fdd96801679 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Tue, 9 Sep 2025 22:07:53 +0530
Subject: [PATCH 717/823] git_ui: Better handle commit message amend (#35268)

Follow up to this: #35114

* Previously we were still showing the commit message even after
cancelling amend which was the old commit message.
* This PR fixes that by restoring the commit message to the old state
before the amend begin so that in case user typed a commit message it's
shown if not then it's not.

Before:


https://github.com/user-attachments/assets/e0edcfff-863d-4367-a7c4-8a2998e702ca

After:



https://github.com/user-attachments/assets/9daf9be0-8a3d-4914-91a4-567693711b6b




Release Notes:

- Resolved an issue where cancelling an amend commit would incorrectly
leave the old commit message in the input field. The commit message box
now properly reverts to its pre-amend state.
---
 crates/git_ui/src/git_panel.rs | 88 ++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 02a60d8fe3..87a573a7a8 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -351,6 +351,7 @@ pub struct GitPanel {
     pending: Vec<PendingOperation>,
     pending_commit: Option<Task<()>>,
     amend_pending: bool,
+    original_commit_message: Option<String>,
     signoff_enabled: bool,
     pending_serialization: Task<()>,
     pub(crate) project: Entity<Project>,
@@ -532,6 +533,7 @@ impl GitPanel {
                 pending: Vec::new(),
                 pending_commit: None,
                 amend_pending: false,
+                original_commit_message: None,
                 signoff_enabled: false,
                 pending_serialization: Task::ready(()),
                 single_staged_entry: None,
@@ -1713,6 +1715,7 @@ impl GitPanel {
                     Ok(()) => {
                         this.commit_editor
                             .update(cx, |editor, cx| editor.clear(window, cx));
+                        this.original_commit_message = None;
                     }
                     Err(e) => this.show_error_toast("commit", e, cx),
                 }
@@ -4345,6 +4348,22 @@ impl GitPanel {
     }
 
     pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
+        if value && !self.amend_pending {
+            let current_message = self.commit_message_buffer(cx).read(cx).text();
+            self.original_commit_message = if current_message.trim().is_empty() {
+                None
+            } else {
+                Some(current_message)
+            };
+        } else if !value && self.amend_pending {
+            let message = self.original_commit_message.take().unwrap_or_default();
+            self.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, message)], None, cx);
+            });
+        }
+
         self.amend_pending = value;
         self.serialize(cx);
         cx.notify();
@@ -5490,4 +5509,73 @@ mod tests {
             ],
         );
     }
+
+    #[gpui::test]
+    async fn test_amend_commit_message_handling(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.background_executor.clone());
+        fs.insert_tree(
+            "/root",
+            json!({
+                "project": {
+                    ".git": {},
+                    "src": {
+                        "main.rs": "fn main() {}"
+                    }
+                }
+            }),
+        )
+        .await;
+
+        fs.set_status_for_repo(
+            Path::new(path!("/root/project/.git")),
+            &[(Path::new("src/main.rs"), StatusCode::Modified.worktree())],
+        );
+
+        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
+        let workspace =
+            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+        let cx = &mut VisualTestContext::from_window(*workspace, cx);
+
+        let panel = workspace.update(cx, GitPanel::new).unwrap();
+
+        // Test: User has commit message, enables amend (saves message), then disables (restores message)
+        panel.update(cx, |panel, cx| {
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "Initial commit message")], None, cx);
+            });
+
+            panel.set_amend_pending(true, cx);
+            assert!(panel.original_commit_message.is_some());
+
+            panel.set_amend_pending(false, cx);
+            let current_message = panel.commit_message_buffer(cx).read(cx).text();
+            assert_eq!(current_message, "Initial commit message");
+            assert!(panel.original_commit_message.is_none());
+        });
+
+        // Test: User has empty commit message, enables amend, then disables (clears message)
+        panel.update(cx, |panel, cx| {
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "")], None, cx);
+            });
+
+            panel.set_amend_pending(true, cx);
+            assert!(panel.original_commit_message.is_none());
+
+            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
+                let start = buffer.anchor_before(0);
+                let end = buffer.anchor_after(buffer.len());
+                buffer.edit([(start..end, "Previous commit message")], None, cx);
+            });
+
+            panel.set_amend_pending(false, cx);
+            let current_message = panel.commit_message_buffer(cx).read(cx).text();
+            assert_eq!(current_message, "");
+        });
+    }
 }

From f39729464052b41abc9d3a5783cbdb8b898fe0d5 Mon Sep 17 00:00:00 2001
From: localcc <kate@zed.dev>
Date: Tue, 9 Sep 2025 18:50:26 +0200
Subject: [PATCH 718/823] Fix git staging in a subfolder (#37860)

Closes #37418

Ideal fix for this would be #37855 but that is a large refactor so
implementing this as a workaround.

Release Notes:

- N/A
---
 crates/worktree/src/worktree.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 7af86d3364..2db380fa2f 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -4777,8 +4777,10 @@ impl BackgroundScanner {
                     .git_repositories
                     .iter()
                     .find_map(|(_, repo)| {
-                        if repo.common_dir_abs_path.as_ref() == &dot_git_dir
-                            || repo.repository_dir_abs_path.as_ref() == &dot_git_dir
+                        let dot_git_dir = SanitizedPath::new(&dot_git_dir);
+                        if SanitizedPath::new(repo.common_dir_abs_path.as_ref()) == dot_git_dir
+                            || SanitizedPath::new(repo.repository_dir_abs_path.as_ref())
+                                == dot_git_dir
                         {
                             Some(repo.clone())
                         } else {

From cdbddc21708419287c4d249b34199b9fef0a280d Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 9 Sep 2025 11:05:49 -0600
Subject: [PATCH 719/823] Allow unauthenticated commit models to show (#37857)

Closes #37462
Closes #37814

Release Notes:

- Fixed a bug where the commit generation message would not always show
---
 crates/git_ui/src/git_panel.rs | 68 +++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 87a573a7a8..b816976557 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -40,8 +40,7 @@ use gpui::{
 use itertools::Itertools;
 use language::{Buffer, File};
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
+    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
 use menu::{Confirm, SecondaryConfirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
 use multi_buffer::ExcerptInfo;
@@ -1860,13 +1859,17 @@ impl GitPanel {
 
     /// Generates a commit message using an LLM.
     pub fn generate_commit_message(&mut self, cx: &mut Context<Self>) {
-        if !self.can_commit() || DisableAiSettings::get_global(cx).disable_ai {
+        if !self.can_commit()
+            || DisableAiSettings::get_global(cx).disable_ai
+            || !agent_settings::AgentSettings::get_global(cx).enabled
+        {
             return;
         }
 
-        let model = match current_language_model(cx) {
-            Some(value) => value,
-            None => return,
+        let Some(ConfiguredModel { provider, model }) =
+            LanguageModelRegistry::read_global(cx).commit_message_model()
+        else {
+            return;
         };
 
         let Some(repo) = self.active_repository.as_ref() else {
@@ -1891,6 +1894,16 @@ impl GitPanel {
                     this.generate_commit_message_task.take();
                 });
 
+                if let Some(task) = cx.update(|cx| {
+                    if !provider.is_authenticated(cx) {
+                        Some(provider.authenticate(cx))
+                    } else {
+                        None
+                    }
+                })? {
+                    task.await.log_err();
+                };
+
                 let mut diff_text = match diff.await {
                     Ok(result) => match result {
                         Ok(text) => text,
@@ -3080,9 +3093,18 @@ impl GitPanel {
         &self,
         cx: &Context<Self>,
     ) -> Option<AnyElement> {
-        current_language_model(cx).is_some().then(|| {
-            if self.generate_commit_message_task.is_some() {
-                return h_flex()
+        if !agent_settings::AgentSettings::get_global(cx).enabled
+            || DisableAiSettings::get_global(cx).disable_ai
+            || LanguageModelRegistry::read_global(cx)
+                .commit_message_model()
+                .is_none()
+        {
+            return None;
+        }
+
+        if self.generate_commit_message_task.is_some() {
+            return Some(
+                h_flex()
                     .gap_1()
                     .child(
                         Icon::new(IconName::ArrowCircle)
@@ -3095,11 +3117,13 @@ impl GitPanel {
                             .size(LabelSize::Small)
                             .color(Color::Muted),
                     )
-                    .into_any_element();
-            }
+                    .into_any_element(),
+            );
+        }
 
-            let can_commit = self.can_commit();
-            let editor_focus_handle = self.commit_editor.focus_handle(cx);
+        let can_commit = self.can_commit();
+        let editor_focus_handle = self.commit_editor.focus_handle(cx);
+        Some(
             IconButton::new("generate-commit-message", IconName::AiEdit)
                 .shape(ui::IconButtonShape::Square)
                 .icon_color(Color::Muted)
@@ -3120,8 +3144,8 @@ impl GitPanel {
                 .on_click(cx.listener(move |this, _event, _window, cx| {
                     this.generate_commit_message(cx);
                 }))
-                .into_any_element()
-        })
+                .into_any_element(),
+        )
     }
 
     pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
@@ -4469,20 +4493,6 @@ impl GitPanel {
     }
 }
 
-fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn LanguageModel>> {
-    let is_enabled = agent_settings::AgentSettings::get_global(cx).enabled
-        && !DisableAiSettings::get_global(cx).disable_ai;
-
-    is_enabled
-        .then(|| {
-            let ConfiguredModel { provider, model } =
-                LanguageModelRegistry::read_global(cx).commit_message_model()?;
-
-            provider.is_authenticated(cx).then(|| model)
-        })
-        .flatten()
-}
-
 impl Render for GitPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let project = self.project.read(cx);

From d7a9be03d193b744a1d16e089f78e2be3d6d8f73 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Tue, 9 Sep 2025 14:22:19 -0300
Subject: [PATCH 720/823] acp: Ensure connection subprocess gets killed on drop
 (#37858)

It appears that in macOS, the `AcpConnection._wait_task` doesn't always
get dropped when quitting the app. In these cases, the subprocess would
be kept alive because we move the `child` into it.

Instead, we will now explicitly kill it when `AcpConnection` is dropped.
It's ok to do this because when the connection is dropped, the thread is
also dropped, so there's no need to report the exit status to it.

Closes #37741

Release Notes:

- Claude Code: Fix subprocess leak on app quit
---
 crates/agent_servers/src/acp.rs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 0664b43750..97bc172a41 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -9,7 +9,7 @@ use futures::io::BufReader;
 use project::Project;
 use project::agent_server_store::AgentServerCommand;
 use serde::Deserialize;
-use util::ResultExt;
+use util::ResultExt as _;
 
 use std::path::PathBuf;
 use std::{any::Any, cell::RefCell};
@@ -33,6 +33,9 @@ pub struct AcpConnection {
     agent_capabilities: acp::AgentCapabilities,
     default_mode: Option<acp::SessionModeId>,
     root_dir: PathBuf,
+    // NB: Don't move this into the wait_task, since we need to ensure the process is
+    // killed on drop (setting kill_on_drop on the command seems to not always work).
+    child: smol::process::Child,
     _io_task: Task<Result<()>>,
     _wait_task: Task<Result<()>>,
     _stderr_task: Task<Result<()>>,
@@ -81,8 +84,7 @@ impl AcpConnection {
             .envs(command.env.iter().flatten())
             .stdin(std::process::Stdio::piped())
             .stdout(std::process::Stdio::piped())
-            .stderr(std::process::Stdio::piped())
-            .kill_on_drop(true);
+            .stderr(std::process::Stdio::piped());
         if !is_remote {
             child.current_dir(root_dir);
         }
@@ -122,8 +124,9 @@ impl AcpConnection {
 
         let wait_task = cx.spawn({
             let sessions = sessions.clone();
+            let status_fut = child.status();
             async move |cx| {
-                let status = child.status().await?;
+                let status = status_fut.await?;
 
                 for session in sessions.borrow().values() {
                     session
@@ -174,6 +177,7 @@ impl AcpConnection {
             _io_task: io_task,
             _wait_task: wait_task,
             _stderr_task: stderr_task,
+            child,
         })
     }
 
@@ -186,6 +190,13 @@ impl AcpConnection {
     }
 }
 
+impl Drop for AcpConnection {
+    fn drop(&mut self) {
+        // See the comment on the child field.
+        self.child.kill().log_err();
+    }
+}
+
 impl AgentConnection for AcpConnection {
     fn new_thread(
         self: Rc<Self>,

From a2edd56587065dfe6747f8b176ceeae60f180b45 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 9 Sep 2025 19:50:18 +0200
Subject: [PATCH 721/823] python: Add import paths to Pyright/BasedPyright
 completion items (#37865)

Release Notes:

- python: Added package origin to completions from Pyright/BasedPyright
---
 crates/languages/src/python.rs | 56 +++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 659a6b017c..b05f290197 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -255,20 +255,34 @@ impl LspAdapter for PythonLspAdapter {
         let label = &item.label;
         let grammar = language.grammar()?;
         let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method")?,
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function")?,
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type")?,
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant")?,
-            _ => return None,
+            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
+            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
+            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
+            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
+            lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
+            _ => {
+                return None;
+            }
         };
         let filter_range = item
             .filter_text
             .as_deref()
             .and_then(|filter| label.find(filter).map(|ix| ix..ix + filter.len()))
             .unwrap_or(0..label.len());
+        let mut text = label.clone();
+        if let Some(completion_details) = item
+            .label_details
+            .as_ref()
+            .and_then(|details| details.description.as_ref())
+        {
+            write!(&mut text, " {}", completion_details).ok();
+        }
         Some(language::CodeLabel {
-            text: label.clone(),
-            runs: vec![(0..label.len(), highlight_id)],
+            runs: highlight_id
+                .map(|id| (0..label.len(), id))
+                .into_iter()
+                .collect(),
+            text,
             filter_range,
         })
     }
@@ -1494,20 +1508,34 @@ impl LspAdapter for BasedPyrightLspAdapter {
         let label = &item.label;
         let grammar = language.grammar()?;
         let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method")?,
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function")?,
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type")?,
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant")?,
-            _ => return None,
+            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
+            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
+            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
+            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
+            lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
+            _ => {
+                return None;
+            }
         };
         let filter_range = item
             .filter_text
             .as_deref()
             .and_then(|filter| label.find(filter).map(|ix| ix..ix + filter.len()))
             .unwrap_or(0..label.len());
+        let mut text = label.clone();
+        if let Some(completion_details) = item
+            .label_details
+            .as_ref()
+            .and_then(|details| details.description.as_ref())
+        {
+            write!(&mut text, " {}", completion_details).ok();
+        }
         Some(language::CodeLabel {
-            text: label.clone(),
-            runs: vec![(0..label.len(), highlight_id)],
+            runs: highlight_id
+                .map(|id| (0..label.len(), id))
+                .into_iter()
+                .collect(),
+            text,
             filter_range,
         })
     }

From d81479ee573568e8df5253486a6fcfebf093583b Mon Sep 17 00:00:00 2001
From: Warpten <vertozor@gmail.com>
Date: Tue, 9 Sep 2025 19:50:58 +0200
Subject: [PATCH 722/823] Allow user-defined worktree names in title bar and
 platform windows (#36713)

Closes #36637

Release Notes:
- Adds the ability to specify a human-readable project name for each
worktree.


https://github.com/user-attachments/assets/ce980fa6-65cf-46d7-9343-d08c800914fd
---
 assets/settings/default.json             |  1 +
 crates/title_bar/src/title_bar.rs        | 28 ++++++++++++++++--------
 crates/workspace/src/workspace.rs        | 17 ++++++++++++--
 crates/worktree/src/worktree_settings.rs |  9 ++++++++
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 802e6fd585..6919578dc7 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1,4 +1,5 @@
 {
+  "project_name": null,
   // The name of the Zed theme to use for the UI.
   //
   // `mode` is one of:
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 70a09793df..0211568b5a 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -31,10 +31,10 @@ use gpui::{
 };
 use keymap_editor;
 use onboarding_banner::OnboardingBanner;
-use project::Project;
+use project::{Project, WorktreeSettings};
 use remote::RemoteConnectionOptions;
-use settings::Settings as _;
-use std::sync::Arc;
+use settings::{Settings, SettingsLocation};
+use std::{path::Path, sync::Arc};
 use theme::ActiveTheme;
 use title_bar_settings::TitleBarSettings;
 use ui::{
@@ -433,14 +433,24 @@ impl TitleBar {
     }
 
     pub fn render_project_name(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let name = {
-            let mut names = self.project.read(cx).visible_worktrees(cx).map(|worktree| {
+        let name = self
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .map(|worktree| {
                 let worktree = worktree.read(cx);
-                worktree.root_name()
-            });
+                let settings_location = SettingsLocation {
+                    worktree_id: worktree.id(),
+                    path: Path::new(""),
+                };
 
-            names.next()
-        };
+                let settings = WorktreeSettings::get(Some(settings_location), cx);
+                match &settings.project_name {
+                    Some(name) => name.as_str(),
+                    None => worktree.root_name(),
+                }
+            })
+            .next();
         let is_project_selected = name.is_some();
         let name = if let Some(name) = name {
             util::truncate_and_trailoff(name, MAX_PROJECT_NAME_LENGTH)
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 58373b5d1a..49b00d26d4 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -72,6 +72,7 @@ pub use persistence::{
 use postage::stream::Stream;
 use project::{
     DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
+    WorktreeSettings,
     debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
     toolchain_store::ToolchainStoreEvent,
 };
@@ -79,7 +80,7 @@ use remote::{RemoteClientDelegate, RemoteConnectionOptions, remote_client::Conne
 use schemars::JsonSchema;
 use serde::Deserialize;
 use session::AppSession;
-use settings::{Settings, update_settings_file};
+use settings::{Settings, SettingsLocation, update_settings_file};
 use shared_screen::SharedScreen;
 use sqlez::{
     bindable::{Bind, Column, StaticColumnCount},
@@ -4376,7 +4377,19 @@ impl Workspace {
         let project = self.project().read(cx);
         let mut title = String::new();
 
-        for (i, name) in project.worktree_root_names(cx).enumerate() {
+        for (i, worktree) in project.worktrees(cx).enumerate() {
+            let name = {
+                let settings_location = SettingsLocation {
+                    worktree_id: worktree.read(cx).id(),
+                    path: Path::new(""),
+                };
+
+                let settings = WorktreeSettings::get(Some(settings_location), cx);
+                match &settings.project_name {
+                    Some(name) => name.as_str(),
+                    None => worktree.read(cx).root_name(),
+                }
+            };
             if i > 0 {
                 title.push_str(", ");
             }
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
index 41eb3ab6f6..ca7714fa73 100644
--- a/crates/worktree/src/worktree_settings.rs
+++ b/crates/worktree/src/worktree_settings.rs
@@ -9,6 +9,7 @@ use util::paths::PathMatcher;
 
 #[derive(Clone, PartialEq, Eq)]
 pub struct WorktreeSettings {
+    pub project_name: Option<String>,
     pub file_scan_inclusions: PathMatcher,
     pub file_scan_exclusions: PathMatcher,
     pub private_files: PathMatcher,
@@ -34,6 +35,13 @@ impl WorktreeSettings {
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
 #[settings_key(None)]
 pub struct WorktreeSettingsContent {
+    /// The displayed name of this project. If not set, the root directory name
+    /// will be displayed.
+    ///
+    /// Default: none
+    #[serde(default)]
+    pub project_name: Option<String>,
+
     /// Completely ignore files matching globs from `file_scan_exclusions`. Overrides
     /// `file_scan_inclusions`.
     ///
@@ -93,6 +101,7 @@ impl Settings for WorktreeSettings {
                 &parsed_file_scan_inclusions,
                 "file_scan_inclusions",
             )?,
+            project_name: result.project_name,
         })
     }
 

From 9e903c9fd18ed2bb7bb1d87de334874f2a19dbc2 Mon Sep 17 00:00:00 2001
From: nick-kilian <126953672+nick-kilian@users.noreply.github.com>
Date: Tue, 9 Sep 2025 18:55:25 +0100
Subject: [PATCH 723/823] Add path/status sorting toggle to git panel menu
 (#35704)

Adds a new menu option to toggle between sorting git entries by path or
status, with settings integration

Release Notes:

- Git Panel: Added toggle to switch between sorting git panel entries by
path or by status (available in git panel ellipsis menu)

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/git_ui/src/git_panel.rs | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index b816976557..d558d21d2e 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -90,6 +90,8 @@ actions!(
         FocusChanges,
         /// Toggles automatic co-author suggestions.
         ToggleFillCoAuthors,
+        /// Toggles sorting entries by path vs status.
+        ToggleSortByPath,
     ]
 );
 
@@ -118,6 +120,7 @@ struct GitMenuState {
     has_staged_changes: bool,
     has_unstaged_changes: bool,
     has_new_changes: bool,
+    sort_by_path: bool,
 }
 
 fn git_panel_context_menu(
@@ -159,6 +162,16 @@ fn git_panel_context_menu(
                 "Trash Untracked Files",
                 TrashUntrackedFiles.boxed_clone(),
             )
+            .separator()
+            .entry(
+                if state.sort_by_path {
+                    "Sort by Status"
+                } else {
+                    "Sort by Path"
+                },
+                Some(Box::new(ToggleSortByPath)),
+                move |window, cx| window.dispatch_action(Box::new(ToggleSortByPath), cx),
+            )
     })
 }
 
@@ -2547,6 +2560,24 @@ impl GitPanel {
         cx.notify();
     }
 
+    fn toggle_sort_by_path(
+        &mut self,
+        _: &ToggleSortByPath,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let current_setting = GitPanelSettings::get_global(cx).sort_by_path;
+        if let Some(workspace) = self.workspace.upgrade() {
+            let workspace = workspace.read(cx);
+            let fs = workspace.app_state().fs.clone();
+            cx.update_global::<SettingsStore, _>(|store, _cx| {
+                store.update_settings_file::<GitPanelSettings>(fs, move |settings, _cx| {
+                    settings.sort_by_path = Some(!current_setting);
+                });
+            });
+        }
+    }
+
     fn fill_co_authors(&mut self, message: &mut String, cx: &mut Context<Self>) {
         const CO_AUTHOR_PREFIX: &str = "Co-authored-by: ";
 
@@ -3081,6 +3112,7 @@ impl GitPanel {
                         has_staged_changes,
                         has_unstaged_changes,
                         has_new_changes,
+                        sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
                     },
                     window,
                     cx,
@@ -4133,6 +4165,7 @@ impl GitPanel {
                 has_staged_changes: self.has_staged_changes(),
                 has_unstaged_changes: self.has_unstaged_changes(),
                 has_new_changes: self.new_count > 0,
+                sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
             },
             window,
             cx,
@@ -4546,6 +4579,7 @@ impl Render for GitPanel {
             .when(has_write_access && has_co_authors, |git_panel| {
                 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
             })
+            .on_action(cx.listener(Self::toggle_sort_by_path))
             .on_hover(cx.listener(move |this, hovered, window, cx| {
                 if *hovered {
                     this.horizontal_scrollbar.show(cx);

From 61d4718f2b1f53e267b99e84cdb3e8d411094bf5 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 9 Sep 2025 20:10:03 +0200
Subject: [PATCH 724/823] Make it possible to support GPUI in the scheduler
 crate (#37849)

Added features that weren't needed in our cloud code.

Release Notes:

- N/A

---------

Co-authored-by: Nathan <nathan@zed.dev>
---
 Cargo.lock                             |   2 +-
 Cargo.toml                             |   2 +-
 crates/scheduler/Cargo.toml            |   2 +-
 crates/scheduler/src/clock.rs          |  38 ++-
 crates/scheduler/src/executor.rs       | 148 ++++++++--
 crates/scheduler/src/scheduler.rs      |  44 +--
 crates/scheduler/src/test_scheduler.rs | 374 ++++++++++++++++++-------
 crates/scheduler/src/tests.rs          |  88 ++++--
 8 files changed, 499 insertions(+), 199 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1c8f49103f..cfb2ba816a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14348,9 +14348,9 @@ name = "scheduler"
 version = "0.1.0"
 dependencies = [
  "async-task",
+ "backtrace",
  "chrono",
  "futures 0.3.31",
- "parking",
  "parking_lot",
  "rand 0.9.1",
  "workspace-hack",
diff --git a/Cargo.toml b/Cargo.toml
index b5fd14087b..f44a1061f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -460,6 +460,7 @@ aws-sdk-bedrockruntime = { version = "1.80.0", features = [
 ] }
 aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
+backtrace = "0.3"
 base64 = "0.22"
 bincode = "1.2.1"
 bitflags = "2.6.0"
@@ -567,7 +568,6 @@ objc2-foundation = { version = "0.3", default-features = false, features = [
 open = "5.0.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
-parking = "2.0"
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
index 0446c67914..44436b34d4 100644
--- a/crates/scheduler/Cargo.toml
+++ b/crates/scheduler/Cargo.toml
@@ -17,9 +17,9 @@ test-support = []
 
 [dependencies]
 async-task.workspace = true
+backtrace.workspace = true
 chrono.workspace = true
 futures.workspace = true
-parking.workspace = true
 parking_lot.workspace = true
 rand.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/scheduler/src/clock.rs b/crates/scheduler/src/clock.rs
index c035c6b7db..447d76b584 100644
--- a/crates/scheduler/src/clock.rs
+++ b/crates/scheduler/src/clock.rs
@@ -1,34 +1,42 @@
-use chrono::{DateTime, Duration, Utc};
+use chrono::{DateTime, Utc};
 use parking_lot::Mutex;
+use std::time::{Duration, Instant};
 
 pub trait Clock {
-    fn now(&self) -> DateTime<Utc>;
+    fn utc_now(&self) -> DateTime<Utc>;
+    fn now(&self) -> Instant;
 }
 
-pub struct TestClock {
-    now: Mutex<DateTime<Utc>>,
+pub struct TestClock(Mutex<TestClockState>);
+
+struct TestClockState {
+    now: Instant,
+    utc_now: DateTime<Utc>,
 }
 
 impl TestClock {
     pub fn new() -> Self {
         const START_TIME: &str = "2025-07-01T23:59:58-00:00";
-        let now = DateTime::parse_from_rfc3339(START_TIME).unwrap().to_utc();
-        Self {
-            now: Mutex::new(now),
-        }
-    }
-
-    pub fn set_now(&self, now: DateTime<Utc>) {
-        *self.now.lock() = now;
+        let utc_now = DateTime::parse_from_rfc3339(START_TIME).unwrap().to_utc();
+        Self(Mutex::new(TestClockState {
+            now: Instant::now(),
+            utc_now,
+        }))
     }
 
     pub fn advance(&self, duration: Duration) {
-        *self.now.lock() += duration;
+        let mut state = self.0.lock();
+        state.now += duration;
+        state.utc_now += duration;
     }
 }
 
 impl Clock for TestClock {
-    fn now(&self) -> DateTime<Utc> {
-        *self.now.lock()
+    fn utc_now(&self) -> DateTime<Utc> {
+        self.0.lock().utc_now
+    }
+
+    fn now(&self) -> Instant {
+        self.0.lock().now
     }
 }
diff --git a/crates/scheduler/src/executor.rs b/crates/scheduler/src/executor.rs
index 03f91ae551..a5a0126860 100644
--- a/crates/scheduler/src/executor.rs
+++ b/crates/scheduler/src/executor.rs
@@ -1,11 +1,15 @@
 use crate::{Scheduler, SessionId, Timer};
+use futures::FutureExt as _;
 use std::{
     future::Future,
     marker::PhantomData,
+    mem::ManuallyDrop,
+    panic::Location,
     pin::Pin,
     rc::Rc,
     sync::Arc,
     task::{Context, Poll},
+    thread::{self, ThreadId},
     time::Duration,
 };
 
@@ -17,6 +21,15 @@ pub struct ForegroundExecutor {
 }
 
 impl ForegroundExecutor {
+    pub fn new(session_id: SessionId, scheduler: Arc<dyn Scheduler>) -> Self {
+        Self {
+            session_id,
+            scheduler,
+            not_send: PhantomData,
+        }
+    }
+
+    #[track_caller]
     pub fn spawn<F>(&self, future: F) -> Task<F::Output>
     where
         F: Future + 'static,
@@ -24,43 +37,52 @@ impl ForegroundExecutor {
     {
         let session_id = self.session_id;
         let scheduler = Arc::clone(&self.scheduler);
-        let (runnable, task) = async_task::spawn_local(future, move |runnable| {
+        let (runnable, task) = spawn_local_with_source_location(future, move |runnable| {
             scheduler.schedule_foreground(session_id, runnable);
         });
         runnable.schedule();
         Task(TaskState::Spawned(task))
     }
 
+    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
+        let mut output = None;
+        self.scheduler.block(
+            Some(self.session_id),
+            async { output = Some(future.await) }.boxed_local(),
+            None,
+        );
+        output.unwrap()
+    }
+
+    pub fn block_with_timeout<Fut: Unpin + Future>(
+        &self,
+        timeout: Duration,
+        mut future: Fut,
+    ) -> Result<Fut::Output, Fut> {
+        let mut output = None;
+        self.scheduler.block(
+            Some(self.session_id),
+            async { output = Some((&mut future).await) }.boxed_local(),
+            Some(timeout),
+        );
+        output.ok_or(future)
+    }
+
     pub fn timer(&self, duration: Duration) -> Timer {
         self.scheduler.timer(duration)
     }
 }
 
-impl ForegroundExecutor {
-    pub fn new(session_id: SessionId, scheduler: Arc<dyn Scheduler>) -> Self {
-        assert!(
-            scheduler.is_main_thread(),
-            "ForegroundExecutor must be created on the same thread as the Scheduler"
-        );
-        Self {
-            session_id,
-            scheduler,
-            not_send: PhantomData,
-        }
-    }
+#[derive(Clone)]
+pub struct BackgroundExecutor {
+    scheduler: Arc<dyn Scheduler>,
 }
 
 impl BackgroundExecutor {
     pub fn new(scheduler: Arc<dyn Scheduler>) -> Self {
         Self { scheduler }
     }
-}
 
-pub struct BackgroundExecutor {
-    scheduler: Arc<dyn Scheduler>,
-}
-
-impl BackgroundExecutor {
     pub fn spawn<F>(&self, future: F) -> Task<F::Output>
     where
         F: Future + Send + 'static,
@@ -74,21 +96,13 @@ impl BackgroundExecutor {
         Task(TaskState::Spawned(task))
     }
 
-    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
-        self.scheduler.block_on(future)
-    }
-
-    pub fn block_with_timeout<Fut: Unpin + Future>(
-        &self,
-        future: &mut Fut,
-        timeout: Duration,
-    ) -> Option<Fut::Output> {
-        self.scheduler.block_with_timeout(future, timeout)
-    }
-
     pub fn timer(&self, duration: Duration) -> Timer {
         self.scheduler.timer(duration)
     }
+
+    pub fn scheduler(&self) -> &Arc<dyn Scheduler> {
+        &self.scheduler
+    }
 }
 
 /// Task is a primitive that allows work to happen in the background.
@@ -116,6 +130,13 @@ impl<T> Task<T> {
         Task(TaskState::Ready(Some(val)))
     }
 
+    pub fn is_ready(&self) -> bool {
+        match &self.0 {
+            TaskState::Ready(_) => true,
+            TaskState::Spawned(task) => task.is_finished(),
+        }
+    }
+
     /// Detaching a task runs it to completion in the background
     pub fn detach(self) {
         match self {
@@ -135,3 +156,68 @@ impl<T> Future for Task<T> {
         }
     }
 }
+
+/// Variant of `async_task::spawn_local` that includes the source location of the spawn in panics.
+///
+/// Copy-modified from:
+/// <https://github.com/smol-rs/async-task/blob/ca9dbe1db9c422fd765847fa91306e30a6bb58a9/src/runnable.rs#L405>
+#[track_caller]
+fn spawn_local_with_source_location<Fut, S>(
+    future: Fut,
+    schedule: S,
+) -> (async_task::Runnable, async_task::Task<Fut::Output, ()>)
+where
+    Fut: Future + 'static,
+    Fut::Output: 'static,
+    S: async_task::Schedule + Send + Sync + 'static,
+{
+    #[inline]
+    fn thread_id() -> ThreadId {
+        std::thread_local! {
+            static ID: ThreadId = thread::current().id();
+        }
+        ID.try_with(|id| *id)
+            .unwrap_or_else(|_| thread::current().id())
+    }
+
+    struct Checked<F> {
+        id: ThreadId,
+        inner: ManuallyDrop<F>,
+        location: &'static Location<'static>,
+    }
+
+    impl<F> Drop for Checked<F> {
+        fn drop(&mut self) {
+            assert!(
+                self.id == thread_id(),
+                "local task dropped by a thread that didn't spawn it. Task spawned at {}",
+                self.location
+            );
+            unsafe {
+                ManuallyDrop::drop(&mut self.inner);
+            }
+        }
+    }
+
+    impl<F: Future> Future for Checked<F> {
+        type Output = F::Output;
+
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            assert!(
+                self.id == thread_id(),
+                "local task polled by a thread that didn't spawn it. Task spawned at {}",
+                self.location
+            );
+            unsafe { self.map_unchecked_mut(|c| &mut *c.inner).poll(cx) }
+        }
+    }
+
+    // Wrap the future into one that checks which thread it's on.
+    let future = Checked {
+        id: thread_id(),
+        inner: ManuallyDrop::new(future),
+        location: Location::caller(),
+    };
+
+    unsafe { async_task::spawn_unchecked(future, schedule) }
+}
diff --git a/crates/scheduler/src/scheduler.rs b/crates/scheduler/src/scheduler.rs
index ee19647845..8d485e009c 100644
--- a/crates/scheduler/src/scheduler.rs
+++ b/crates/scheduler/src/scheduler.rs
@@ -13,44 +13,44 @@ use futures::{FutureExt as _, channel::oneshot, future::LocalBoxFuture};
 use std::{
     future::Future,
     pin::Pin,
+    sync::Arc,
     task::{Context, Poll},
     time::Duration,
 };
 
 pub trait Scheduler: Send + Sync {
-    fn block(&self, future: LocalBoxFuture<()>, timeout: Option<Duration>);
+    fn block(
+        &self,
+        session_id: Option<SessionId>,
+        future: LocalBoxFuture<()>,
+        timeout: Option<Duration>,
+    );
     fn schedule_foreground(&self, session_id: SessionId, runnable: Runnable);
     fn schedule_background(&self, runnable: Runnable);
     fn timer(&self, timeout: Duration) -> Timer;
-    fn is_main_thread(&self) -> bool;
-}
-
-impl dyn Scheduler {
-    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
-        let mut output = None;
-        self.block(async { output = Some(future.await) }.boxed_local(), None);
-        output.unwrap()
-    }
-
-    pub fn block_with_timeout<Fut: Unpin + Future>(
-        &self,
-        future: &mut Fut,
-        timeout: Duration,
-    ) -> Option<Fut::Output> {
-        let mut output = None;
-        self.block(
-            async { output = Some(future.await) }.boxed_local(),
-            Some(timeout),
-        );
-        output
+    fn clock(&self) -> Arc<dyn Clock>;
+    fn as_test(&self) -> &TestScheduler {
+        panic!("this is not a test scheduler")
     }
 }
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
 pub struct SessionId(u16);
 
+impl SessionId {
+    pub fn new(id: u16) -> Self {
+        SessionId(id)
+    }
+}
+
 pub struct Timer(oneshot::Receiver<()>);
 
+impl Timer {
+    pub fn new(rx: oneshot::Receiver<()>) -> Self {
+        Timer(rx)
+    }
+}
+
 impl Future for Timer {
     type Output = ();
 
diff --git a/crates/scheduler/src/test_scheduler.rs b/crates/scheduler/src/test_scheduler.rs
index 479759d9bd..243f6f756d 100644
--- a/crates/scheduler/src/test_scheduler.rs
+++ b/crates/scheduler/src/test_scheduler.rs
@@ -1,31 +1,37 @@
 use crate::{
-    BackgroundExecutor, Clock as _, ForegroundExecutor, Scheduler, SessionId, TestClock, Timer,
+    BackgroundExecutor, Clock, ForegroundExecutor, Scheduler, SessionId, TestClock, Timer,
 };
 use async_task::Runnable;
-use chrono::{DateTime, Duration as ChronoDuration, Utc};
+use backtrace::{Backtrace, BacktraceFrame};
 use futures::{FutureExt as _, channel::oneshot, future::LocalBoxFuture};
 use parking_lot::Mutex;
 use rand::prelude::*;
 use std::{
-    collections::VecDeque,
+    any::type_name_of_val,
+    collections::{BTreeMap, VecDeque},
+    env,
+    fmt::Write,
     future::Future,
+    mem,
+    ops::RangeInclusive,
     panic::{self, AssertUnwindSafe},
     pin::Pin,
     sync::{
         Arc,
         atomic::{AtomicBool, Ordering::SeqCst},
     },
-    task::{Context, Poll, Wake, Waker},
-    thread,
+    task::{Context, Poll, RawWaker, RawWakerVTable, Waker},
+    thread::{self, Thread},
     time::{Duration, Instant},
 };
 
+const PENDING_TRACES_VAR_NAME: &str = "PENDING_TRACES";
+
 pub struct TestScheduler {
     clock: Arc<TestClock>,
     rng: Arc<Mutex<StdRng>>,
-    state: Mutex<SchedulerState>,
-    pub thread_id: thread::ThreadId,
-    pub config: SchedulerConfig,
+    state: Arc<Mutex<SchedulerState>>,
+    thread: Thread,
 }
 
 impl TestScheduler {
@@ -52,26 +58,30 @@ impl TestScheduler {
 
     /// Run a test once with a specific seed
     pub fn with_seed<R>(seed: u64, f: impl AsyncFnOnce(Arc<TestScheduler>) -> R) -> R {
-        let scheduler = Arc::new(TestScheduler::new(SchedulerConfig::with_seed(seed)));
+        let scheduler = Arc::new(TestScheduler::new(TestSchedulerConfig::with_seed(seed)));
         let future = f(scheduler.clone());
-        let result = scheduler.block_on(future);
-        scheduler.run();
+        let result = scheduler.foreground().block_on(future);
+        scheduler.run(); // Ensure spawned tasks finish up before returning in tests
         result
     }
 
-    pub fn new(config: SchedulerConfig) -> Self {
+    pub fn new(config: TestSchedulerConfig) -> Self {
         Self {
             rng: Arc::new(Mutex::new(StdRng::seed_from_u64(config.seed))),
-            state: Mutex::new(SchedulerState {
+            state: Arc::new(Mutex::new(SchedulerState {
                 runnables: VecDeque::new(),
                 timers: Vec::new(),
+                blocked_sessions: Vec::new(),
                 randomize_order: config.randomize_order,
                 allow_parking: config.allow_parking,
+                timeout_ticks: config.timeout_ticks,
                 next_session_id: SessionId(0),
-            }),
-            thread_id: thread::current().id(),
+                capture_pending_traces: config.capture_pending_traces,
+                pending_traces: BTreeMap::new(),
+                next_trace_id: TraceId(0),
+            })),
             clock: Arc::new(TestClock::new()),
-            config,
+            thread: thread::current(),
         }
     }
 
@@ -83,6 +93,18 @@ impl TestScheduler {
         self.rng.clone()
     }
 
+    pub fn set_timeout_ticks(&self, timeout_ticks: RangeInclusive<usize>) {
+        self.state.lock().timeout_ticks = timeout_ticks;
+    }
+
+    pub fn allow_parking(&self) {
+        self.state.lock().allow_parking = true;
+    }
+
+    pub fn forbid_parking(&self) {
+        self.state.lock().allow_parking = false;
+    }
+
     /// Create a foreground executor for this scheduler
     pub fn foreground(self: &Arc<Self>) -> ForegroundExecutor {
         let session_id = {
@@ -98,16 +120,17 @@ impl TestScheduler {
         BackgroundExecutor::new(self.clone())
     }
 
-    pub fn block_on<Fut: Future>(&self, future: Fut) -> Fut::Output {
-        (self as &dyn Scheduler).block_on(future)
-    }
-
     pub fn yield_random(&self) -> Yield {
-        Yield(self.rng.lock().random_range(0..20))
+        let rng = &mut *self.rng.lock();
+        if rng.random_bool(0.1) {
+            Yield(rng.random_range(10..20))
+        } else {
+            Yield(rng.random_range(0..2))
+        }
     }
 
     pub fn run(&self) {
-        while self.step() || self.advance_clock() {
+        while self.step() {
             // Continue until no work remains
         }
     }
@@ -125,7 +148,16 @@ impl TestScheduler {
             return true;
         }
 
-        let runnable = self.state.lock().runnables.pop_front();
+        let runnable = {
+            let state = &mut *self.state.lock();
+            let ix = state.runnables.iter().position(|runnable| {
+                runnable
+                    .session_id
+                    .is_none_or(|session_id| !state.blocked_sessions.contains(&session_id))
+            });
+            ix.and_then(|ix| state.runnables.remove(ix))
+        };
+
         if let Some(runnable) = runnable {
             runnable.run();
             return true;
@@ -134,19 +166,120 @@ impl TestScheduler {
         false
     }
 
-    fn advance_clock(&self) -> bool {
+    fn advance_clock_to_next_timer(&self) -> bool {
         if let Some(timer) = self.state.lock().timers.first() {
-            self.clock.set_now(timer.expiration);
+            self.clock.advance(timer.expiration - self.clock.now());
             true
         } else {
             false
         }
     }
+
+    pub fn advance_clock(&self, duration: Duration) {
+        let next_now = self.clock.now() + duration;
+        loop {
+            self.run();
+            if let Some(timer) = self.state.lock().timers.first()
+                && timer.expiration <= next_now
+            {
+                self.clock.advance(timer.expiration - self.clock.now());
+            } else {
+                break;
+            }
+        }
+        self.clock.advance(next_now - self.clock.now());
+    }
+
+    fn park(&self, deadline: Option<Instant>) -> bool {
+        if self.state.lock().allow_parking {
+            if let Some(deadline) = deadline {
+                let now = Instant::now();
+                let timeout = deadline.saturating_duration_since(now);
+                thread::park_timeout(timeout);
+                now.elapsed() < timeout
+            } else {
+                thread::park();
+                true
+            }
+        } else if deadline.is_some() {
+            false
+        } else if self.state.lock().capture_pending_traces {
+            let mut pending_traces = String::new();
+            for (_, trace) in mem::take(&mut self.state.lock().pending_traces) {
+                writeln!(pending_traces, "{:?}", exclude_wakers_from_trace(trace)).unwrap();
+            }
+            panic!("Parking forbidden. Pending traces:\n{}", pending_traces);
+        } else {
+            panic!(
+                "Parking forbidden. Re-run with {PENDING_TRACES_VAR_NAME}=1 to show pending traces"
+            );
+        }
+    }
 }
 
 impl Scheduler for TestScheduler {
-    fn is_main_thread(&self) -> bool {
-        thread::current().id() == self.thread_id
+    /// Block until the given future completes, with an optional timeout. If the
+    /// future is unable to make progress at any moment before the timeout and
+    /// no other tasks or timers remain, we panic unless parking is allowed. If
+    /// parking is allowed, we block up to the timeout or indefinitely if none
+    /// is provided. This is to allow testing a mix of deterministic and
+    /// non-deterministic async behavior, such as when interacting with I/O in
+    /// an otherwise deterministic test.
+    fn block(
+        &self,
+        session_id: Option<SessionId>,
+        mut future: LocalBoxFuture<()>,
+        timeout: Option<Duration>,
+    ) {
+        if let Some(session_id) = session_id {
+            self.state.lock().blocked_sessions.push(session_id);
+        }
+
+        let deadline = timeout.map(|timeout| Instant::now() + timeout);
+        let awoken = Arc::new(AtomicBool::new(false));
+        let waker = Box::new(TracingWaker {
+            id: None,
+            awoken: awoken.clone(),
+            thread: self.thread.clone(),
+            state: self.state.clone(),
+        });
+        let waker = unsafe { Waker::new(Box::into_raw(waker) as *const (), &WAKER_VTABLE) };
+        let max_ticks = if timeout.is_some() {
+            self.rng
+                .lock()
+                .random_range(self.state.lock().timeout_ticks.clone())
+        } else {
+            usize::MAX
+        };
+        let mut cx = Context::from_waker(&waker);
+
+        for _ in 0..max_ticks {
+            let Poll::Pending = future.poll_unpin(&mut cx) else {
+                break;
+            };
+
+            let mut stepped = None;
+            while self.rng.lock().random() {
+                let stepped = stepped.get_or_insert(false);
+                if self.step() {
+                    *stepped = true;
+                } else {
+                    break;
+                }
+            }
+
+            let stepped = stepped.unwrap_or(true);
+            let awoken = awoken.swap(false, SeqCst);
+            if !stepped && !awoken && !self.advance_clock_to_next_timer() {
+                if !self.park(deadline) {
+                    break;
+                }
+            }
+        }
+
+        if session_id.is_some() {
+            self.state.lock().blocked_sessions.pop();
+        }
     }
 
     fn schedule_foreground(&self, session_id: SessionId, runnable: Runnable) {
@@ -170,6 +303,8 @@ impl Scheduler for TestScheduler {
                 runnable,
             },
         );
+        drop(state);
+        self.thread.unpark();
     }
 
     fn schedule_background(&self, runnable: Runnable) {
@@ -186,83 +321,40 @@ impl Scheduler for TestScheduler {
                 runnable,
             },
         );
+        drop(state);
+        self.thread.unpark();
     }
 
     fn timer(&self, duration: Duration) -> Timer {
         let (tx, rx) = oneshot::channel();
-        let expiration = self.clock.now() + ChronoDuration::from_std(duration).unwrap();
         let state = &mut *self.state.lock();
         state.timers.push(ScheduledTimer {
-            expiration,
+            expiration: self.clock.now() + duration,
             _notify: tx,
         });
         state.timers.sort_by_key(|timer| timer.expiration);
         Timer(rx)
     }
 
-    /// Block until the given future completes, with an optional timeout. If the
-    /// future is unable to make progress at any moment before the timeout and
-    /// no other tasks or timers remain, we panic unless parking is allowed. If
-    /// parking is allowed, we block up to the timeout or indefinitely if none
-    /// is provided. This is to allow testing a mix of deterministic and
-    /// non-deterministic async behavior, such as when interacting with I/O in
-    /// an otherwise deterministic test.
-    fn block(&self, mut future: LocalBoxFuture<()>, timeout: Option<Duration>) {
-        let (parker, unparker) = parking::pair();
-        let deadline = timeout.map(|timeout| Instant::now() + timeout);
-        let awoken = Arc::new(AtomicBool::new(false));
-        let waker = Waker::from(Arc::new(WakerFn::new({
-            let awoken = awoken.clone();
-            move || {
-                awoken.store(true, SeqCst);
-                unparker.unpark();
-            }
-        })));
-        let max_ticks = if timeout.is_some() {
-            self.rng
-                .lock()
-                .random_range(0..=self.config.max_timeout_ticks)
-        } else {
-            usize::MAX
-        };
-        let mut cx = Context::from_waker(&waker);
+    fn clock(&self) -> Arc<dyn Clock> {
+        self.clock.clone()
+    }
 
-        for _ in 0..max_ticks {
-            let Poll::Pending = future.poll_unpin(&mut cx) else {
-                break;
-            };
-
-            let mut stepped = None;
-            while self.rng.lock().random() && stepped.unwrap_or(true) {
-                *stepped.get_or_insert(false) |= self.step();
-            }
-
-            let stepped = stepped.unwrap_or(true);
-            let awoken = awoken.swap(false, SeqCst);
-            if !stepped && !awoken && !self.advance_clock() {
-                if self.state.lock().allow_parking {
-                    if !park(&parker, deadline) {
-                        break;
-                    }
-                } else if deadline.is_some() {
-                    break;
-                } else {
-                    panic!("Parking forbidden");
-                }
-            }
-        }
+    fn as_test(&self) -> &TestScheduler {
+        self
     }
 }
 
 #[derive(Clone, Debug)]
-pub struct SchedulerConfig {
+pub struct TestSchedulerConfig {
     pub seed: u64,
     pub randomize_order: bool,
     pub allow_parking: bool,
-    pub max_timeout_ticks: usize,
+    pub capture_pending_traces: bool,
+    pub timeout_ticks: RangeInclusive<usize>,
 }
 
-impl SchedulerConfig {
+impl TestSchedulerConfig {
     pub fn with_seed(seed: u64) -> Self {
         Self {
             seed,
@@ -271,13 +363,15 @@ impl SchedulerConfig {
     }
 }
 
-impl Default for SchedulerConfig {
+impl Default for TestSchedulerConfig {
     fn default() -> Self {
         Self {
             seed: 0,
             randomize_order: true,
             allow_parking: false,
-            max_timeout_ticks: 1000,
+            capture_pending_traces: env::var(PENDING_TRACES_VAR_NAME)
+                .map_or(false, |var| var == "1" || var == "true"),
+            timeout_ticks: 0..=1000,
         }
     }
 }
@@ -294,35 +388,104 @@ impl ScheduledRunnable {
 }
 
 struct ScheduledTimer {
-    expiration: DateTime<Utc>,
+    expiration: Instant,
     _notify: oneshot::Sender<()>,
 }
 
 struct SchedulerState {
     runnables: VecDeque<ScheduledRunnable>,
     timers: Vec<ScheduledTimer>,
+    blocked_sessions: Vec<SessionId>,
     randomize_order: bool,
     allow_parking: bool,
+    timeout_ticks: RangeInclusive<usize>,
     next_session_id: SessionId,
+    capture_pending_traces: bool,
+    next_trace_id: TraceId,
+    pending_traces: BTreeMap<TraceId, Backtrace>,
 }
 
-struct WakerFn<F> {
-    f: F,
+const WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(
+    TracingWaker::clone_raw,
+    TracingWaker::wake_raw,
+    TracingWaker::wake_by_ref_raw,
+    TracingWaker::drop_raw,
+);
+
+#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord)]
+struct TraceId(usize);
+
+struct TracingWaker {
+    id: Option<TraceId>,
+    awoken: Arc<AtomicBool>,
+    thread: Thread,
+    state: Arc<Mutex<SchedulerState>>,
 }
 
-impl<F: Fn()> WakerFn<F> {
-    fn new(f: F) -> Self {
-        Self { f }
+impl Clone for TracingWaker {
+    fn clone(&self) -> Self {
+        let mut state = self.state.lock();
+        let id = if state.capture_pending_traces {
+            let id = state.next_trace_id;
+            state.next_trace_id.0 += 1;
+            state.pending_traces.insert(id, Backtrace::new_unresolved());
+            Some(id)
+        } else {
+            None
+        };
+        Self {
+            id,
+            awoken: self.awoken.clone(),
+            thread: self.thread.clone(),
+            state: self.state.clone(),
+        }
     }
 }
 
-impl<F: Fn()> Wake for WakerFn<F> {
-    fn wake(self: Arc<Self>) {
-        (self.f)();
+impl Drop for TracingWaker {
+    fn drop(&mut self) {
+        if let Some(id) = self.id {
+            self.state.lock().pending_traces.remove(&id);
+        }
+    }
+}
+
+impl TracingWaker {
+    fn wake(self) {
+        self.wake_by_ref();
     }
 
-    fn wake_by_ref(self: &Arc<Self>) {
-        (self.f)();
+    fn wake_by_ref(&self) {
+        if let Some(id) = self.id {
+            self.state.lock().pending_traces.remove(&id);
+        }
+        self.awoken.store(true, SeqCst);
+        self.thread.unpark();
+    }
+
+    fn clone_raw(waker: *const ()) -> RawWaker {
+        let waker = waker as *const TracingWaker;
+        let waker = unsafe { &*waker };
+        RawWaker::new(
+            Box::into_raw(Box::new(waker.clone())) as *const (),
+            &WAKER_VTABLE,
+        )
+    }
+
+    fn wake_raw(waker: *const ()) {
+        let waker = unsafe { Box::from_raw(waker as *mut TracingWaker) };
+        waker.wake();
+    }
+
+    fn wake_by_ref_raw(waker: *const ()) {
+        let waker = waker as *const TracingWaker;
+        let waker = unsafe { &*waker };
+        waker.wake_by_ref();
+    }
+
+    fn drop_raw(waker: *const ()) {
+        let waker = unsafe { Box::from_raw(waker as *mut TracingWaker) };
+        drop(waker);
     }
 }
 
@@ -342,11 +505,20 @@ impl Future for Yield {
     }
 }
 
-fn park(parker: &parking::Parker, deadline: Option<Instant>) -> bool {
-    if let Some(deadline) = deadline {
-        parker.park_deadline(deadline)
-    } else {
-        parker.park();
-        true
+fn exclude_wakers_from_trace(mut trace: Backtrace) -> Backtrace {
+    trace.resolve();
+    let mut frames: Vec<BacktraceFrame> = trace.into();
+    let waker_clone_frame_ix = frames.iter().position(|frame| {
+        frame.symbols().iter().any(|symbol| {
+            symbol
+                .name()
+                .is_some_and(|name| format!("{name:#?}") == type_name_of_val(&Waker::clone))
+        })
+    });
+
+    if let Some(waker_clone_frame_ix) = waker_clone_frame_ix {
+        frames.drain(..waker_clone_frame_ix + 1);
     }
+
+    Backtrace::from(frames)
 }
diff --git a/crates/scheduler/src/tests.rs b/crates/scheduler/src/tests.rs
index 19eb354e97..54ce84e884 100644
--- a/crates/scheduler/src/tests.rs
+++ b/crates/scheduler/src/tests.rs
@@ -153,7 +153,7 @@ fn test_randomize_order() {
     // Test deterministic mode: different seeds should produce same execution order
     let mut deterministic_results = HashSet::new();
     for seed in 0..10 {
-        let config = SchedulerConfig {
+        let config = TestSchedulerConfig {
             seed,
             randomize_order: false,
             ..Default::default()
@@ -173,7 +173,7 @@ fn test_randomize_order() {
     // Test randomized mode: different seeds can produce different execution orders
     let mut randomized_results = HashSet::new();
     for seed in 0..20 {
-        let config = SchedulerConfig::with_seed(seed);
+        let config = TestSchedulerConfig::with_seed(seed);
         let order = block_on(capture_execution_order(config));
         assert_eq!(order.len(), 6);
         randomized_results.insert(order);
@@ -186,7 +186,7 @@ fn test_randomize_order() {
     );
 }
 
-async fn capture_execution_order(config: SchedulerConfig) -> Vec<String> {
+async fn capture_execution_order(config: TestSchedulerConfig) -> Vec<String> {
     let scheduler = Arc::new(TestScheduler::new(config));
     let foreground = scheduler.foreground();
     let background = scheduler.background();
@@ -221,49 +221,55 @@ async fn capture_execution_order(config: SchedulerConfig) -> Vec<String> {
 
 #[test]
 fn test_block() {
-    let scheduler = Arc::new(TestScheduler::new(SchedulerConfig::default()));
-    let executor = BackgroundExecutor::new(scheduler);
+    let scheduler = Arc::new(TestScheduler::new(TestSchedulerConfig::default()));
     let (tx, rx) = oneshot::channel();
 
     // Spawn background task to send value
-    let _ = executor
+    let _ = scheduler
+        .background()
         .spawn(async move {
             tx.send(42).unwrap();
         })
         .detach();
 
     // Block on receiving the value
-    let result = executor.block_on(async { rx.await.unwrap() });
+    let result = scheduler.foreground().block_on(async { rx.await.unwrap() });
     assert_eq!(result, 42);
 }
 
 #[test]
-#[should_panic(expected = "Parking forbidden")]
+#[should_panic(expected = "futures_channel::oneshot::Inner")]
 fn test_parking_panics() {
-    let scheduler = Arc::new(TestScheduler::new(SchedulerConfig::default()));
-    let executor = BackgroundExecutor::new(scheduler);
-    executor.block_on(future::pending::<()>());
+    let config = TestSchedulerConfig {
+        capture_pending_traces: true,
+        ..Default::default()
+    };
+    let scheduler = Arc::new(TestScheduler::new(config));
+    scheduler.foreground().block_on(async {
+        let (_tx, rx) = oneshot::channel::<()>();
+        rx.await.unwrap(); // This will never complete
+    });
 }
 
 #[test]
 fn test_block_with_parking() {
-    let config = SchedulerConfig {
+    let config = TestSchedulerConfig {
         allow_parking: true,
         ..Default::default()
     };
     let scheduler = Arc::new(TestScheduler::new(config));
-    let executor = BackgroundExecutor::new(scheduler);
     let (tx, rx) = oneshot::channel();
 
     // Spawn background task to send value
-    let _ = executor
+    let _ = scheduler
+        .background()
         .spawn(async move {
             tx.send(42).unwrap();
         })
         .detach();
 
     // Block on receiving the value (will park if needed)
-    let result = executor.block_on(async { rx.await.unwrap() });
+    let result = scheduler.foreground().block_on(async { rx.await.unwrap() });
     assert_eq!(result, 42);
 }
 
@@ -298,30 +304,31 @@ fn test_helper_methods() {
 fn test_block_with_timeout() {
     // Test case: future completes within timeout
     TestScheduler::once(async |scheduler| {
-        let background = scheduler.background();
-        let mut future = future::ready(42);
-        let output = background.block_with_timeout(&mut future, Duration::from_millis(100));
-        assert_eq!(output, Some(42));
+        let foreground = scheduler.foreground();
+        let future = future::ready(42);
+        let output = foreground.block_with_timeout(Duration::from_millis(100), future);
+        assert_eq!(output.unwrap(), 42);
     });
 
     // Test case: future times out
     TestScheduler::once(async |scheduler| {
-        let background = scheduler.background();
-        let mut future = future::pending::<()>();
-        let output = background.block_with_timeout(&mut future, Duration::from_millis(50));
-        assert_eq!(output, None);
+        let foreground = scheduler.foreground();
+        let future = future::pending::<()>();
+        let output = foreground.block_with_timeout(Duration::from_millis(50), future);
+        let _ = output.expect_err("future should not have finished");
     });
 
     // Test case: future makes progress via timer but still times out
     let mut results = BTreeSet::new();
     TestScheduler::many(100, async |scheduler| {
-        let background = scheduler.background();
-        let mut task = background.spawn(async move {
+        let task = scheduler.background().spawn(async move {
             Yield { polls: 10 }.await;
             42
         });
-        let output = background.block_with_timeout(&mut task, Duration::from_millis(50));
-        results.insert(output);
+        let output = scheduler
+            .foreground()
+            .block_with_timeout(Duration::from_millis(50), task);
+        results.insert(output.ok());
     });
     assert_eq!(
         results.into_iter().collect::<Vec<_>>(),
@@ -329,6 +336,33 @@ fn test_block_with_timeout() {
     );
 }
 
+// When calling block, we shouldn't make progress on foreground-spawned futures with the same session id.
+#[test]
+fn test_block_does_not_progress_same_session_foreground() {
+    let mut task2_made_progress_once = false;
+    TestScheduler::many(1000, async |scheduler| {
+        let foreground1 = scheduler.foreground();
+        let foreground2 = scheduler.foreground();
+
+        let task1 = foreground1.spawn(async move {});
+        let task2 = foreground2.spawn(async move {});
+
+        foreground1.block_on(async {
+            scheduler.yield_random().await;
+            assert!(!task1.is_ready());
+            task2_made_progress_once |= task2.is_ready();
+        });
+
+        task1.await;
+        task2.await;
+    });
+
+    assert!(
+        task2_made_progress_once,
+        "Expected task from different foreground executor to make progress (at least once)"
+    );
+}
+
 struct Yield {
     polls: usize,
 }

From b2d7e34e80d8a7c06db7b399f7110b11cf097bc7 Mon Sep 17 00:00:00 2001
From: Paul Sadauskas <psadauskas@gmail.com>
Date: Tue, 9 Sep 2025 12:13:20 -0600
Subject: [PATCH 725/823] Update Editor::select_larger_syntax_node (#36971)

When the cursor was sitting on a syntactically insignificant character,
like a `{` or `,`, this function was selecting only that character, when
what the user likely wanted was to select the next larger syntax node.

Those punctuation characters all seemed to be not "named", in
tree-sitter terminology, so I updated the function to walk up the node
tree until it found a node where `is_named()` is true.

Closes #4555

Also, while writing the tests, the output of a failing test with the
wrong thing selected was harder to read than it needed to be.

It used to output a diff of ranges, like this:

<img width="217" height="111" alt="image"
src="https://github.com/user-attachments/assets/00de53a8-8776-47aa-8101-5a5b5bc3fa5e"
/>

I leveraged the existing `generate_marked_text` helper function and
updated the assertion to output a diff of the text with the selection
markers:

<img width="211" height="116" alt="image"
src="https://github.com/user-attachments/assets/53b2b882-2676-4c70-8718-e2e2ba6f254e"
/>

Happy to make that a separate PR, if needed.

Release Notes:

- Fixed Editor select_larger_syntax_node to be smart about punctuation.
---
 crates/editor/src/editor.rs         |   8 +-
 crates/editor/src/editor_tests.rs   | 186 +++++++++++++++++++++++++++-
 crates/editor/src/test.rs           |  13 +-
 crates/util/src/test/marked_text.rs |  11 +-
 4 files changed, 204 insertions(+), 14 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index b54c2c11b1..2991c47856 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -14946,9 +14946,13 @@ impl Editor {
                 }
 
                 let mut new_range = old_range.clone();
-                while let Some((_node, containing_range)) =
-                    buffer.syntax_ancestor(new_range.clone())
+                while let Some((node, containing_range)) = buffer.syntax_ancestor(new_range.clone())
                 {
+                    if !node.is_named() {
+                        new_range = node.start_byte()..node.end_byte();
+                        continue;
+                    }
+
                     new_range = match containing_range {
                         MultiOrSingleBufferOffsetRange::Single(_) => break,
                         MultiOrSingleBufferOffsetRange::Multi(range) => range,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 9f578b8b9d..567018baaf 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8591,10 +8591,10 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut TestAppContext) {
         assert_text_with_selections(
             editor,
             indoc! {r#"
-                use mod1::mod2::{mod3, mo«ˇ»d4};
+                use mod1::mod2::{mod3, moˇd4};
 
                 fn fn_1(para«ˇm1: bool, pa»ram2: &str) {
-                    let var1 = "te«ˇ»xt";
+                    let var1 = "teˇxt";
                 }
             "#},
             cx,
@@ -8609,10 +8609,10 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut TestAppContext) {
         assert_text_with_selections(
             editor,
             indoc! {r#"
-                use mod1::mod2::{mod3, mo«ˇ»d4};
+                use mod1::mod2::{mod3, moˇd4};
 
                 fn fn_1(para«ˇm1: bool, pa»ram2: &str) {
-                    let var1 = "te«ˇ»xt";
+                    let var1 = "teˇxt";
                 }
             "#},
             cx,
@@ -8716,6 +8716,184 @@ async fn test_select_larger_syntax_node_for_cursor_at_end(cx: &mut TestAppContex
     });
 }
 
+#[gpui::test]
+async fn test_select_larger_syntax_node_for_cursor_at_symbol(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let language = Arc::new(Language::new(
+        LanguageConfig {
+            name: "JavaScript".into(),
+            ..Default::default()
+        },
+        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
+    ));
+
+    let text = r#"
+        let a = {
+            key: "value",
+        };
+    "#
+    .unindent();
+
+    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
+    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
+    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
+
+    editor
+        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
+        .await;
+
+    // Test case 1: Cursor after '{'
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(0), 9)..DisplayPoint::new(DisplayRow(0), 9)
+            ]);
+        });
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = {ˇ
+                    key: "value",
+                };
+            "#},
+            cx,
+        );
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = «ˇ{
+                    key: "value",
+                }»;
+            "#},
+            cx,
+        );
+    });
+
+    // Test case 2: Cursor after ':'
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(1), 8)..DisplayPoint::new(DisplayRow(1), 8)
+            ]);
+        });
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = {
+                    key:ˇ "value",
+                };
+            "#},
+            cx,
+        );
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = {
+                    «ˇkey: "value"»,
+                };
+            "#},
+            cx,
+        );
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = «ˇ{
+                    key: "value",
+                }»;
+            "#},
+            cx,
+        );
+    });
+
+    // Test case 3: Cursor after ','
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(1), 17)..DisplayPoint::new(DisplayRow(1), 17)
+            ]);
+        });
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = {
+                    key: "value",ˇ
+                };
+            "#},
+            cx,
+        );
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = «ˇ{
+                    key: "value",
+                }»;
+            "#},
+            cx,
+        );
+    });
+
+    // Test case 4: Cursor after ';'
+    editor.update_in(cx, |editor, window, cx| {
+        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            s.select_display_ranges([
+                DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)
+            ]);
+        });
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                let a = {
+                    key: "value",
+                };ˇ
+            "#},
+            cx,
+        );
+    });
+    editor.update_in(cx, |editor, window, cx| {
+        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
+    });
+    editor.update(cx, |editor, cx| {
+        assert_text_with_selections(
+            editor,
+            indoc! {r#"
+                «ˇlet a = {
+                    key: "value",
+                };
+                »"#},
+            cx,
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_select_larger_smaller_syntax_node_for_string(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index 960fecf59a..03e99b9fff 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -20,7 +20,7 @@ use multi_buffer::ToPoint;
 use pretty_assertions::assert_eq;
 use project::{Project, project_settings::DiagnosticSeverity};
 use ui::{App, BorrowAppContext, px};
-use util::test::{marked_text_offsets, marked_text_ranges};
+use util::test::{generate_marked_text, marked_text_offsets, marked_text_ranges};
 
 #[cfg(test)]
 #[ctor::ctor]
@@ -104,13 +104,14 @@ pub fn assert_text_with_selections(
     marked_text: &str,
     cx: &mut Context<Editor>,
 ) {
-    let (unmarked_text, text_ranges) = marked_text_ranges(marked_text, true);
+    let (unmarked_text, _text_ranges) = marked_text_ranges(marked_text, true);
     assert_eq!(editor.text(cx), unmarked_text, "text doesn't match");
-    assert_eq!(
-        editor.selections.ranges(cx),
-        text_ranges,
-        "selections don't match",
+    let actual = generate_marked_text(
+        &editor.text(cx),
+        &editor.selections.ranges(cx),
+        marked_text.contains("«"),
     );
+    assert_eq!(actual, marked_text, "Selections don't match");
 }
 
 // RA thinks this is dead code even though it is used in a whole lot of tests
diff --git a/crates/util/src/test/marked_text.rs b/crates/util/src/test/marked_text.rs
index d885e5920f..282a477935 100644
--- a/crates/util/src/test/marked_text.rs
+++ b/crates/util/src/test/marked_text.rs
@@ -214,8 +214,15 @@ pub fn generate_marked_text(
                 }
             }
         } else {
-            marked_text.insert(range.end, '»');
-            marked_text.insert(range.start, '«');
+            match range.start.cmp(&range.end) {
+                Ordering::Equal => {
+                    marked_text.insert(range.start, 'ˇ');
+                }
+                _ => {
+                    marked_text.insert(range.end, '»');
+                    marked_text.insert(range.start, '«');
+                }
+            }
         }
     }
     marked_text

From 9431c6573318dde690bc4e61b3b82d97a69030b8 Mon Sep 17 00:00:00 2001
From: Jacob <33708767+jacobtread@users.noreply.github.com>
Date: Wed, 10 Sep 2025 06:16:29 +1200
Subject: [PATCH 726/823] git: Improve error messages (#35946)

Release Notes:

- Improved git error messages

Includes stderr in the error message for git commands, provides better
output for things like errors when switching branches.

Before:
<img width="702" height="330" alt="image"
src="https://github.com/user-attachments/assets/f32402ae-b85c-4b0b-aae8-789607e8ec9e"
/>

After:
<img width="650" height="575" alt="image"
src="https://github.com/user-attachments/assets/308dbe3c-1ff9-40b9-a187-1e12d2488c80"
/>

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/git/src/repository.rs          | 4 +++-
 crates/workspace/src/notifications.rs | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index fd12dafa98..6d053e1855 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -1814,6 +1814,7 @@ impl GitBinary {
             output.status.success(),
             GitBinaryCommandError {
                 stdout: String::from_utf8_lossy(&output.stdout).to_string(),
+                stderr: String::from_utf8_lossy(&output.stderr).to_string(),
                 status: output.status,
             }
         );
@@ -1836,9 +1837,10 @@ impl GitBinary {
 }
 
 #[derive(Error, Debug)]
-#[error("Git command failed: {stdout}")]
+#[error("Git command failed:\n{stdout}{stderr}\n")]
 struct GitBinaryCommandError {
     stdout: String,
+    stderr: String,
     status: ExitStatus,
 }
 
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 039aec5199..768b10abe4 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -1077,8 +1077,13 @@ where
             if let Err(err) = result.as_ref() {
                 log::error!("{err:?}");
                 if let Ok(prompt) = cx.update(|window, cx| {
+                    let mut display = format!("{err}");
+                    if !display.ends_with('\n') {
+                        display.push('.');
+                        display.push(' ')
+                    }
                     let detail =
-                        f(err, window, cx).unwrap_or_else(|| format!("{err}. Please try again."));
+                        f(err, window, cx).unwrap_or_else(|| format!("{display}Please try again."));
                     window.prompt(PromptLevel::Critical, &msg, Some(&detail), &["Ok"], cx)
                 }) {
                     prompt.await.ok();

From 14ffd7b53fb69cbee6e979efe5fc0ea5ece101f7 Mon Sep 17 00:00:00 2001
From: Marco Munizaga <marco@marcopolo.io>
Date: Tue, 9 Sep 2025 11:38:38 -0700
Subject: [PATCH 727/823] editor: Implement Go to next/prev Document Highlight
 (#35994)

Closes #21193
Closes #14703

Having the ability to navigate directly to the next
symbolHighlight/reference lets you follow the data flow of a variable.
If you highlight the function itself (depending on the LSP), you can
also navigate to all returns.

Note that this is a different feature from navigating to the next match,
as that is not language-context aware. For example, if you have a var
named foo it would also navigate to an unrelated variable fooBar.

Here's how this patch works:

- The editor struct has a background_highlights.
- Collect all highlights with the keys [DocumentHighlightRead,
DocumentHighlightWrite]
- Depending on the direction, move the cursor to the next or previous
highlight relative to the current position.

Release Notes:

- Added `editor::GoToNextDocumentHighlight` and
`editor::GoToPreviousDocumentHighlight` to navigate to the next LSP
document highlight. Useful for navigating to the next usage of a certain
symbol.
---
 crates/editor/src/actions.rs      |  4 ++
 crates/editor/src/editor.rs       | 81 ++++++++++++++++++++++++++
 crates/editor/src/editor_tests.rs | 95 +++++++++++++++++++++++++++++++
 crates/editor/src/element.rs      |  2 +
 4 files changed, 182 insertions(+)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index df467c4d5d..35510b36e9 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -493,6 +493,10 @@ actions!(
         GoToTypeDefinition,
         /// Goes to type definition in a split pane.
         GoToTypeDefinitionSplit,
+        /// Goes to the next document highlight.
+        GoToNextDocumentHighlight,
+        /// Goes to the previous document highlight.
+        GoToPreviousDocumentHighlight,
         /// Scrolls down by half a page.
         HalfPageDown,
         /// Scrolls up by half a page.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2991c47856..34134ad001 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -15948,6 +15948,87 @@ impl Editor {
         }
     }
 
+    pub fn go_to_next_document_highlight(
+        &mut self,
+        _: &GoToNextDocumentHighlight,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.go_to_document_highlight_before_or_after_position(Direction::Next, window, cx);
+    }
+
+    pub fn go_to_prev_document_highlight(
+        &mut self,
+        _: &GoToPreviousDocumentHighlight,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.go_to_document_highlight_before_or_after_position(Direction::Prev, window, cx);
+    }
+
+    pub fn go_to_document_highlight_before_or_after_position(
+        &mut self,
+        direction: Direction,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) {
+        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
+        let snapshot = self.snapshot(window, cx);
+        let buffer = &snapshot.buffer_snapshot;
+        let position = self.selections.newest::<Point>(cx).head();
+        let anchor_position = buffer.anchor_after(position);
+
+        // Get all document highlights (both read and write)
+        let mut all_highlights = Vec::new();
+
+        if let Some((_, read_highlights)) = self
+            .background_highlights
+            .get(&HighlightKey::Type(TypeId::of::<DocumentHighlightRead>()))
+        {
+            all_highlights.extend(read_highlights.iter());
+        }
+
+        if let Some((_, write_highlights)) = self
+            .background_highlights
+            .get(&HighlightKey::Type(TypeId::of::<DocumentHighlightWrite>()))
+        {
+            all_highlights.extend(write_highlights.iter());
+        }
+
+        if all_highlights.is_empty() {
+            return;
+        }
+
+        // Sort highlights by position
+        all_highlights.sort_by(|a, b| a.start.cmp(&b.start, buffer));
+
+        let target_highlight = match direction {
+            Direction::Next => {
+                // Find the first highlight after the current position
+                all_highlights
+                    .iter()
+                    .find(|highlight| highlight.start.cmp(&anchor_position, buffer).is_gt())
+            }
+            Direction::Prev => {
+                // Find the last highlight before the current position
+                all_highlights
+                    .iter()
+                    .rev()
+                    .find(|highlight| highlight.end.cmp(&anchor_position, buffer).is_lt())
+            }
+        };
+
+        if let Some(highlight) = target_highlight {
+            let destination = highlight.start.to_point(buffer);
+            let autoscroll = Autoscroll::center();
+
+            self.unfold_ranges(&[destination..destination], false, false, cx);
+            self.change_selections(SelectionEffects::scroll(autoscroll), window, cx, |s| {
+                s.select_ranges([destination..destination]);
+            });
+        }
+    }
+
     fn go_to_line<T: 'static>(
         &mut self,
         position: Anchor,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 567018baaf..6cf911fb4c 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -25603,6 +25603,101 @@ async fn test_select_next_prev_syntax_node(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_next_prev_document_highlight(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+    cx.set_state(
+        "let ˇvariable = 42;
+let another = variable + 1;
+let result = variable * 2;",
+    );
+
+    // Set up document highlights manually (simulating LSP response)
+    cx.update_editor(|editor, _window, cx| {
+        let buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
+
+        // Create highlights for "variable" occurrences
+        let highlight_ranges = [
+            Point::new(0, 4)..Point::new(0, 12),  // First "variable"
+            Point::new(1, 14)..Point::new(1, 22), // Second "variable"
+            Point::new(2, 13)..Point::new(2, 21), // Third "variable"
+        ];
+
+        let anchor_ranges: Vec<_> = highlight_ranges
+            .iter()
+            .map(|range| range.clone().to_anchors(&buffer_snapshot))
+            .collect();
+
+        editor.highlight_background::<DocumentHighlightRead>(
+            &anchor_ranges,
+            |theme| theme.colors().editor_document_highlight_read_background,
+            cx,
+        );
+    });
+
+    // Go to next highlight - should move to second "variable"
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_next_document_highlight(&GoToNextDocumentHighlight, window, cx);
+    });
+    cx.assert_editor_state(
+        "let variable = 42;
+let another = ˇvariable + 1;
+let result = variable * 2;",
+    );
+
+    // Go to next highlight - should move to third "variable"
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_next_document_highlight(&GoToNextDocumentHighlight, window, cx);
+    });
+    cx.assert_editor_state(
+        "let variable = 42;
+let another = variable + 1;
+let result = ˇvariable * 2;",
+    );
+
+    // Go to next highlight - should stay at third "variable" (no wrap-around)
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_next_document_highlight(&GoToNextDocumentHighlight, window, cx);
+    });
+    cx.assert_editor_state(
+        "let variable = 42;
+let another = variable + 1;
+let result = ˇvariable * 2;",
+    );
+
+    // Now test going backwards from third position
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_prev_document_highlight(&GoToPreviousDocumentHighlight, window, cx);
+    });
+    cx.assert_editor_state(
+        "let variable = 42;
+let another = ˇvariable + 1;
+let result = variable * 2;",
+    );
+
+    // Go to previous highlight - should move to first "variable"
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_prev_document_highlight(&GoToPreviousDocumentHighlight, window, cx);
+    });
+    cx.assert_editor_state(
+        "let ˇvariable = 42;
+let another = variable + 1;
+let result = variable * 2;",
+    );
+
+    // Go to previous highlight - should stay on first "variable"
+    cx.update_editor(|editor, window, cx| {
+        editor.go_to_prev_document_highlight(&GoToPreviousDocumentHighlight, window, cx);
+    });
+    cx.assert_editor_state(
+        "let ˇvariable = 42;
+let another = variable + 1;
+let result = variable * 2;",
+    );
+}
+
 #[track_caller]
 fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
     editor
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index a702d5b74f..d25cf2e611 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -381,6 +381,8 @@ impl EditorElement {
         register_action(editor, window, Editor::go_to_prev_diagnostic);
         register_action(editor, window, Editor::go_to_next_hunk);
         register_action(editor, window, Editor::go_to_prev_hunk);
+        register_action(editor, window, Editor::go_to_next_document_highlight);
+        register_action(editor, window, Editor::go_to_prev_document_highlight);
         register_action(editor, window, |editor, action, window, cx| {
             editor
                 .go_to_definition(action, window, cx)

From 9529cd18d19dbc4acd101097d1c8959486743609 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Tue, 9 Sep 2025 21:44:15 +0300
Subject: [PATCH 728/823] project_panel: Add action to open file in split pane
 (#36973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #18605

Related:
- https://github.com/zed-industries/zed/discussions/16901
- https://github.com/zed-industries/zed/issues/10549

Adds an action to open file in split pane. Also updates vim keybindings
for better compatibility with netrw:
[“v”](https://github.com/vim/vim/blob/bc461f952d854ffbde83eb74044efc3b329ea10e/runtime/pack/dist/opt/netrw/doc/netrw.txt#L1091)
and
[“o”](https://github.com/vim/vim/blob/bc461f952d854ffbde83eb74044efc3b329ea10e/runtime/pack/dist/opt/netrw/doc/netrw.txt#L1075)
keys should open file in splits.

<table>
<tr>
<td><video
src="https://github.com/user-attachments/assets/e24c6fd4-4eb0-407a-bdd1-5300908ea2a1">
<td><video
src="https://github.com/user-attachments/assets/fa0b8105-41a9-4421-a3cc-89244a90d67a">
</table>


Release Notes:

- Added `project_panel::OpenSplitVertical` and
`project_panel::OpenSplitHorizontal` actions for opening file in a
splits.
---
 assets/keymaps/vim.json                   |  4 +-
 crates/project_panel/src/project_panel.rs | 72 ++++++++++++++++++++---
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 508d8949d2..78d4b3e707 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -860,11 +860,11 @@
       "j": "menu::SelectNext",
       "k": "menu::SelectPrevious",
       "l": "project_panel::ExpandSelectedEntry",
-      "o": "project_panel::OpenPermanent",
       "shift-d": "project_panel::Delete",
       "shift-r": "project_panel::Rename",
       "t": "project_panel::OpenPermanent",
-      "v": "project_panel::OpenPermanent",
+      "v": "project_panel::OpenSplitVertical",
+      "o": "project_panel::OpenSplitHorizontal",
       "p": "project_panel::Open",
       "x": "project_panel::RevealInFileManager",
       "s": "workspace::OpenWithSystem",
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index eeb2f7a49b..06f3fe15b7 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -64,7 +64,7 @@ use ui::{
 use util::{ResultExt, TakeUntilExt, TryFutureExt, maybe, paths::compare_paths};
 use workspace::{
     DraggedSelection, OpenInTerminal, OpenOptions, OpenVisible, PreviewTabsSettings, SelectedEntry,
-    Workspace,
+    SplitDirection, Workspace,
     dock::{DockPosition, Panel, PanelEvent},
     notifications::{DetachAndPromptErr, NotifyTaskExt},
 };
@@ -266,6 +266,10 @@ actions!(
         Open,
         /// Opens the selected file in a permanent tab.
         OpenPermanent,
+        /// Opens the selected file in a vertical split.
+        OpenSplitVertical,
+        /// Opens the selected file in a horizontal split.
+        OpenSplitHorizontal,
         /// Toggles focus on the project panel.
         ToggleFocus,
         /// Toggles visibility of git-ignored files.
@@ -371,6 +375,8 @@ pub enum Event {
     },
     SplitEntry {
         entry_id: ProjectEntryId,
+        allow_preview: bool,
+        split_direction: Option<SplitDirection>,
     },
     Focus,
 }
@@ -700,15 +706,21 @@ impl ProjectPanel {
                             }
                         }
                 }
-                &Event::SplitEntry { entry_id } => {
+                &Event::SplitEntry {
+                    entry_id,
+                    allow_preview,
+                    split_direction,
+                } => {
                     if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx)
                         && let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
                             workspace
-                                .split_path(
+                                .split_path_preview(
                                     ProjectPath {
                                         worktree_id: worktree.read(cx).id(),
                                         path: entry.path.clone(),
                                     },
+                                    allow_preview,
+                                    split_direction,
                                     window, cx,
                                 )
                                 .detach_and_log_err(cx);
@@ -1300,23 +1312,52 @@ impl ProjectPanel {
 
     fn open(&mut self, _: &Open, window: &mut Window, cx: &mut Context<Self>) {
         let preview_tabs_enabled = PreviewTabsSettings::get_global(cx).enabled;
-        self.open_internal(true, !preview_tabs_enabled, window, cx);
+        self.open_internal(true, !preview_tabs_enabled, None, window, cx);
     }
 
     fn open_permanent(&mut self, _: &OpenPermanent, window: &mut Window, cx: &mut Context<Self>) {
-        self.open_internal(false, true, window, cx);
+        self.open_internal(false, true, None, window, cx);
+    }
+
+    fn open_split_vertical(
+        &mut self,
+        _: &OpenSplitVertical,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.open_internal(false, true, Some(SplitDirection::vertical(cx)), window, cx);
+    }
+
+    fn open_split_horizontal(
+        &mut self,
+        _: &OpenSplitHorizontal,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.open_internal(
+            false,
+            true,
+            Some(SplitDirection::horizontal(cx)),
+            window,
+            cx,
+        );
     }
 
     fn open_internal(
         &mut self,
         allow_preview: bool,
         focus_opened_item: bool,
+        split_direction: Option<SplitDirection>,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         if let Some((_, entry)) = self.selected_entry(cx) {
             if entry.is_file() {
-                self.open_entry(entry.id, focus_opened_item, allow_preview, cx);
+                if split_direction.is_some() {
+                    self.split_entry(entry.id, allow_preview, split_direction, cx);
+                } else {
+                    self.open_entry(entry.id, focus_opened_item, allow_preview, cx);
+                }
                 cx.notify();
             } else {
                 self.toggle_expanded(entry.id, window, cx);
@@ -1554,8 +1595,19 @@ impl ProjectPanel {
         });
     }
 
-    fn split_entry(&mut self, entry_id: ProjectEntryId, cx: &mut Context<Self>) {
-        cx.emit(Event::SplitEntry { entry_id });
+    fn split_entry(
+        &mut self,
+        entry_id: ProjectEntryId,
+        allow_preview: bool,
+        split_direction: Option<SplitDirection>,
+
+        cx: &mut Context<Self>,
+    ) {
+        cx.emit(Event::SplitEntry {
+            entry_id,
+            allow_preview,
+            split_direction,
+        });
     }
 
     fn new_file(&mut self, _: &NewFile, window: &mut Window, cx: &mut Context<Self>) {
@@ -4282,7 +4334,7 @@ impl ProjectPanel {
                         }
                     } else if event.modifiers().secondary() {
                         if event.click_count() > 1 {
-                            project_panel.split_entry(entry_id, cx);
+                            project_panel.split_entry(entry_id, false, None, cx);
                         } else {
                             project_panel.selection = Some(selection);
                             if let Some(position) = project_panel.marked_entries.iter().position(|e| *e == selection) {
@@ -5254,6 +5306,8 @@ impl Render for ProjectPanel {
                 .on_action(cx.listener(Self::collapse_all_entries))
                 .on_action(cx.listener(Self::open))
                 .on_action(cx.listener(Self::open_permanent))
+                .on_action(cx.listener(Self::open_split_vertical))
+                .on_action(cx.listener(Self::open_split_horizontal))
                 .on_action(cx.listener(Self::confirm))
                 .on_action(cx.listener(Self::cancel))
                 .on_action(cx.listener(Self::copy_path))

From 46fb5213331e3d5b931bab705f5a326f8553a547 Mon Sep 17 00:00:00 2001
From: Lev Zakharov <l.j.zakharov@gmail.com>
Date: Tue, 9 Sep 2025 21:44:46 +0300
Subject: [PATCH 729/823] git_ui: Show author name on commits in branch picker
 (#36812)

See related discussion
https://github.com/zed-industries/zed/discussions/36511.

<img alt="zed"
src="https://github.com/user-attachments/assets/da7fc30d-2504-48f4-a392-7c8d5cd8acb1"
/>

Release Notes:

- Added option to show the author name in a branch picker commit
information

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/settings/default.json           |  4 ++++
 crates/git/src/repository.rs           |  7 +++++-
 crates/git_ui/src/blame_ui.rs          |  7 ++++++
 crates/git_ui/src/branch_picker.rs     | 23 ++++++++++++++----
 crates/git_ui/src/commit_tooltip.rs    |  1 +
 crates/git_ui/src/git_panel.rs         |  2 ++
 crates/git_ui/src/project_diff.rs      |  1 +
 crates/project/src/git_store.rs        |  2 ++
 crates/project/src/project_settings.rs | 22 +++++++++++++++++
 crates/proto/proto/git.proto           |  1 +
 docs/src/configuring-zed.md            | 33 ++++++++++++++++++++++++++
 11 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 6919578dc7..1902aa5e87 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1199,6 +1199,10 @@
       // The minimum column number to show the inline blame information at
       "min_column": 0
     },
+    // Control which information is shown in the branch picker.
+    "branch_picker": {
+      "show_author_name": true
+    },
     // How git hunks are displayed visually in the editor.
     // This setting can take two values:
     //
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index 6d053e1855..1beaadbefd 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -150,6 +150,7 @@ pub struct CommitSummary {
     pub subject: SharedString,
     /// This is a unix timestamp
     pub commit_timestamp: i64,
+    pub author_name: SharedString,
     pub has_parent: bool,
 }
 
@@ -987,6 +988,7 @@ impl GitRepository for RealGitRepository {
                     "%(upstream)",
                     "%(upstream:track)",
                     "%(committerdate:unix)",
+                    "%(authorname)",
                     "%(contents:subject)",
                 ]
                 .join("%00");
@@ -2022,6 +2024,7 @@ fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
         let upstream_name = fields.next().context("no upstream")?.to_string();
         let upstream_tracking = parse_upstream_track(fields.next().context("no upstream:track")?)?;
         let commiterdate = fields.next().context("no committerdate")?.parse::<i64>()?;
+        let author_name = fields.next().context("no authorname")?.to_string().into();
         let subject: SharedString = fields
             .next()
             .context("no contents:subject")?
@@ -2035,6 +2038,7 @@ fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
                 sha: head_sha,
                 subject,
                 commit_timestamp: commiterdate,
+                author_name: author_name,
                 has_parent: !parent_sha.is_empty(),
             }),
             upstream: if upstream_name.is_empty() {
@@ -2345,7 +2349,7 @@ mod tests {
     fn test_branches_parsing() {
         // suppress "help: octal escapes are not supported, `\0` is always null"
         #[allow(clippy::octal_escapes)]
-        let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0generated protobuf\n";
+        let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0John Doe\0generated protobuf\n";
         assert_eq!(
             parse_branch_input(input).unwrap(),
             vec![Branch {
@@ -2362,6 +2366,7 @@ mod tests {
                     sha: "060964da10574cd9bf06463a53bf6e0769c5c45e".into(),
                     subject: "generated protobuf".into(),
                     commit_timestamp: 1733187470,
+                    author_name: SharedString::new("John Doe"),
                     has_parent: false,
                 })
             }]
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
index 2768e3dc68..ad5823c167 100644
--- a/crates/git_ui/src/blame_ui.rs
+++ b/crates/git_ui/src/blame_ui.rs
@@ -90,6 +90,11 @@ impl BlameRenderer for GitBlameRenderer {
                                 sha: blame_entry.sha.to_string().into(),
                                 subject: blame_entry.summary.clone().unwrap_or_default().into(),
                                 commit_timestamp: blame_entry.committer_time.unwrap_or_default(),
+                                author_name: blame_entry
+                                    .committer_name
+                                    .clone()
+                                    .unwrap_or_default()
+                                    .into(),
                                 has_parent: true,
                             },
                             repository.downgrade(),
@@ -229,6 +234,7 @@ impl BlameRenderer for GitBlameRenderer {
                         .into()
                 }),
             commit_timestamp: commit_details.commit_time.unix_timestamp(),
+            author_name: commit_details.author_name.clone(),
             has_parent: false,
         };
 
@@ -374,6 +380,7 @@ impl BlameRenderer for GitBlameRenderer {
                 sha: blame_entry.sha.to_string().into(),
                 subject: blame_entry.summary.clone().unwrap_or_default().into(),
                 commit_timestamp: blame_entry.committer_time.unwrap_or_default(),
+                author_name: blame_entry.committer_name.unwrap_or_default().into(),
                 has_parent: true,
             },
             repository.downgrade(),
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index d90f2c0408..e5bdce7722 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -10,6 +10,8 @@ use gpui::{
 };
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::git_store::Repository;
+use project::project_settings::ProjectSettings;
+use settings::Settings;
 use std::sync::Arc;
 use time::OffsetDateTime;
 use time_format::format_local_timestamp;
@@ -454,7 +456,7 @@ impl PickerDelegate for BranchListDelegate {
     ) -> Option<Self::ListItem> {
         let entry = &self.matches[ix];
 
-        let (commit_time, subject) = entry
+        let (commit_time, author_name, subject) = entry
             .branch
             .most_recent_commit
             .as_ref()
@@ -467,9 +469,10 @@ impl PickerDelegate for BranchListDelegate {
                     OffsetDateTime::now_utc(),
                     time_format::TimestampFormat::Relative,
                 );
-                (Some(formatted_time), Some(subject))
+                let author = commit.author_name.clone();
+                (Some(formatted_time), Some(author), Some(subject))
             })
-            .unwrap_or_else(|| (None, None));
+            .unwrap_or_else(|| (None, None, None));
 
         let icon = if let Some(default_branch) = self.default_branch.clone()
             && entry.is_new
@@ -550,7 +553,19 @@ impl PickerDelegate for BranchListDelegate {
                                         "based off the current branch".to_string()
                                     }
                                 } else {
-                                    subject.unwrap_or("no commits found".into()).to_string()
+                                    let show_author_name = ProjectSettings::get_global(cx)
+                                        .git
+                                        .branch_picker
+                                        .unwrap_or_default()
+                                        .show_author_name;
+
+                                    subject.map_or("no commits found".into(), |subject| {
+                                        if show_author_name && author_name.is_some() {
+                                            format!("{} • {}", author_name.unwrap(), subject)
+                                        } else {
+                                            subject.to_string()
+                                        }
+                                    })
                                 };
                                 Label::new(message)
                                     .size(LabelSize::Small)
diff --git a/crates/git_ui/src/commit_tooltip.rs b/crates/git_ui/src/commit_tooltip.rs
index a470bc6925..809274beae 100644
--- a/crates/git_ui/src/commit_tooltip.rs
+++ b/crates/git_ui/src/commit_tooltip.rs
@@ -229,6 +229,7 @@ impl Render for CommitTooltip {
                         .into()
                 }),
             commit_timestamp: self.commit.commit_time.unix_timestamp(),
+            author_name: self.commit.author_name.clone(),
             has_parent: false,
         };
 
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d558d21d2e..07a59de02a 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -5017,6 +5017,7 @@ impl Component for PanelRepoFooter {
                     sha: "abc123".into(),
                     subject: "Modify stuff".into(),
                     commit_timestamp: 1710932954,
+                    author_name: "John Doe".into(),
                     has_parent: true,
                 }),
             }
@@ -5034,6 +5035,7 @@ impl Component for PanelRepoFooter {
                     sha: "abc123".into(),
                     subject: "Modify stuff".into(),
                     commit_timestamp: 1710932954,
+                    author_name: "John Doe".into(),
                     has_parent: true,
                 }),
             }
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 69ebd83ea8..9d0a575247 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -1220,6 +1220,7 @@ mod preview {
                         sha: "abc123".into(),
                         subject: "Modify stuff".into(),
                         commit_timestamp: 1710932954,
+                        author_name: "John Doe".into(),
                         has_parent: true,
                     }),
                 }
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 92c68f6646..4e54cd0798 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -4752,6 +4752,7 @@ fn branch_to_proto(branch: &git::repository::Branch) -> proto::Branch {
                 sha: commit.sha.to_string(),
                 subject: commit.subject.to_string(),
                 commit_timestamp: commit.commit_timestamp,
+                author_name: commit.author_name.to_string(),
             }),
     }
 }
@@ -4781,6 +4782,7 @@ fn proto_to_branch(proto: &proto::Branch) -> git::repository::Branch {
                 sha: commit.sha.to_string().into(),
                 subject: commit.subject.to_string().into(),
                 commit_timestamp: commit.commit_timestamp,
+                author_name: commit.author_name.to_string().into(),
                 has_parent: true,
             }
         }),
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 694e244e63..0d3cda3b8f 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -405,6 +405,10 @@ pub struct GitSettings {
     ///
     /// Default: on
     pub inline_blame: Option<InlineBlameSettings>,
+    /// Which information to show in the branch picker.
+    ///
+    /// Default: on
+    pub branch_picker: Option<BranchPickerSettings>,
     /// How hunks are displayed visually in the editor.
     ///
     /// Default: staged_hollow
@@ -509,6 +513,24 @@ impl Default for InlineBlameSettings {
     }
 }
 
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct BranchPickerSettings {
+    /// Whether to show author name as part of the commit information.
+    ///
+    /// Default: false
+    #[serde(default)]
+    pub show_author_name: bool,
+}
+
+impl Default for BranchPickerSettings {
+    fn default() -> Self {
+        Self {
+            show_author_name: true,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, Hash)]
 pub struct BinarySettings {
     pub path: Option<String>,
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index cfb0369875..ef4d7aea63 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -95,6 +95,7 @@ message CommitSummary {
     string sha = 1;
     string subject = 2;
     int64 commit_timestamp = 3;
+    string author_name = 4;
 }
 
 message GitBranches {
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index c83dd84b88..552dc97e45 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -2023,6 +2023,9 @@ To interpret all `.c` files as C++, files called `MyLockFile` as TOML and files
     "inline_blame": {
       "enabled": true
     },
+    "branch_picker": {
+      "show_author_name": true
+    },
     "hunk_style": "staged_hollow"
   }
 }
@@ -2154,6 +2157,36 @@ Example:
 }
 ```
 
+### Branch Picker
+
+- Description: Configuration related to the branch picker.
+- Setting: `branch_picker`
+- Default:
+
+```json
+{
+  "git": {
+    "branch_picker": {
+      "show_author_name": false
+    }
+  }
+}
+```
+
+**Options**
+
+1. Show the author name in the branch picker:
+
+```json
+{
+  "git": {
+    "branch_picker": {
+      "show_author_name": true
+    }
+  }
+}
+```
+
 ### Hunk Style
 
 - Description: What styling we should use for the diff hunks.

From 707d0e6ebd75e91111b57485bb2e5b6014055200 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:48:22 -0400
Subject: [PATCH 730/823] settings ui: Add text field support to ui layer
 (#37868)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is an initial implementation that isn't used for any settings yet,
but will be used once `Vec<String>` is implemented.

I also updated the window.with_state api to grant access to a
`Context<S>` app reference instead of just an App.

## Example

<img width="603" height="83" alt="Screenshot 2025-09-09 at 2 15 56 PM"
src="https://github.com/user-attachments/assets/7b3fc350-a157-431f-a4bc-80a1806a3147"
/>


Release Notes:

- N/A
---
 Cargo.lock                              |  1 +
 assets/keymaps/default-linux.json       |  2 +-
 crates/dap/src/debugger_settings.rs     |  2 +-
 crates/gpui/src/window.rs               |  4 +-
 crates/settings/src/settings_ui_core.rs | 13 +++++++
 crates/settings_ui/Cargo.toml           |  3 +-
 crates/settings_ui/src/settings_ui.rs   | 51 ++++++++++++++++++++++++-
 7 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cfb2ba816a..6dd0ba8451 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14871,6 +14871,7 @@ dependencies = [
  "editor",
  "feature_flags",
  "gpui",
+ "menu",
  "serde",
  "serde_json",
  "settings",
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 07539e9cbf..7c7692ac46 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -341,7 +341,7 @@
       "enter": "agent::Chat",
       "shift-ctrl-r": "agent::OpenAgentDiff",
       "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "ctrl-shift-n": "agent::RejectAll"
     }
   },
   {
diff --git a/crates/dap/src/debugger_settings.rs b/crates/dap/src/debugger_settings.rs
index 8d53fdea86..4b84145046 100644
--- a/crates/dap/src/debugger_settings.rs
+++ b/crates/dap/src/debugger_settings.rs
@@ -12,7 +12,7 @@ pub enum DebugPanelDockPosition {
     Right,
 }
 
-#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi, SettingsKey)]
+#[derive(Serialize, Deserialize, JsonSchema, Clone, SettingsUi, SettingsKey)]
 #[serde(default)]
 // todo(settings_ui) @ben: I'm pretty sure not having the fields be optional here is a bug,
 // it means the defaults will override previously set values if a single key is missing
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 61d15cb3ed..c230a4c7aa 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2578,7 +2578,7 @@ impl Window {
         &mut self,
         key: impl Into<ElementId>,
         cx: &mut App,
-        init: impl FnOnce(&mut Self, &mut App) -> S,
+        init: impl FnOnce(&mut Self, &mut Context<S>) -> S,
     ) -> Entity<S> {
         let current_view = self.current_view();
         self.with_global_id(key.into(), |global_id, window| {
@@ -2611,7 +2611,7 @@ impl Window {
     pub fn use_state<S: 'static>(
         &mut self,
         cx: &mut App,
-        init: impl FnOnce(&mut Self, &mut App) -> S,
+        init: impl FnOnce(&mut Self, &mut Context<S>) -> S,
     ) -> Entity<S> {
         self.use_keyed_state(
             ElementId::CodeLocation(*core::panic::Location::caller()),
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index 09505e63a3..c3366641a8 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -43,6 +43,7 @@ pub struct SettingsUiEntry {
 #[derive(Clone)]
 pub enum SettingsUiItemSingle {
     SwitchField,
+    TextField,
     /// A numeric stepper for a specific type of number
     NumericStepper(NumType),
     ToggleGroup {
@@ -150,6 +151,18 @@ impl SettingsUi for Option<bool> {
     }
 }
 
+impl SettingsUi for String {
+    fn settings_ui_item() -> SettingsUiItem {
+        SettingsUiItem::Single(SettingsUiItemSingle::TextField)
+    }
+}
+
+impl SettingsUi for SettingsUiItem {
+    fn settings_ui_item() -> SettingsUiItem {
+        SettingsUiItem::Single(SettingsUiItemSingle::TextField)
+    }
+}
+
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum NumType {
diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml
index 3ecef880d2..1d8e5e1122 100644
--- a/crates/settings_ui/Cargo.toml
+++ b/crates/settings_ui/Cargo.toml
@@ -21,8 +21,9 @@ command_palette_hooks.workspace = true
 editor.workspace = true
 feature_flags.workspace = true
 gpui.workspace = true
-serde_json.workspace = true
+menu.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 theme.workspace = true
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 9866dcdb3e..4c9419491c 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -6,7 +6,7 @@ use std::ops::{Not, Range};
 
 use anyhow::Context as _;
 use command_palette_hooks::CommandPaletteFilter;
-use editor::EditorSettingsControls;
+use editor::{Editor, EditorSettingsControls};
 use feature_flags::{FeatureFlag, FeatureFlagViewExt};
 use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, ScrollHandle, actions};
 use settings::{
@@ -612,6 +612,7 @@ fn render_item_single(
         SettingsUiItemSingle::DropDown { .. } => {
             unimplemented!("This")
         }
+        SettingsUiItemSingle::TextField => render_text_field(settings_value, window, cx),
     }
 }
 
@@ -798,6 +799,54 @@ fn render_switch_field(
     .into_any_element()
 }
 
+fn render_text_field(
+    value: SettingsValue<serde_json::Value>,
+    window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    let value = downcast_any_item::<String>(value);
+    let path = value.path.clone();
+    let editor = window.use_state(cx, {
+        let path = path.clone();
+        move |window, cx| {
+            let mut editor = Editor::single_line(window, cx);
+
+            cx.observe_global_in::<SettingsStore>(window, move |editor, window, cx| {
+                let user_settings = SettingsStore::global(cx).raw_user_settings();
+                if let Some(value) = read_settings_value_from_path(&user_settings, &path).cloned()
+                    && let Some(value) = value.as_str()
+                {
+                    editor.set_text(value, window, cx);
+                }
+            })
+            .detach();
+
+            editor.set_text(value.read().clone(), window, cx);
+            editor
+        }
+    });
+
+    let weak_editor = editor.downgrade();
+    let theme_colors = cx.theme().colors();
+
+    div()
+        .child(editor)
+        .bg(theme_colors.editor_background)
+        .border_1()
+        .rounded_lg()
+        .border_color(theme_colors.border)
+        .on_action::<menu::Confirm>({
+            move |_, _, cx| {
+                let new_value = weak_editor.read_with(cx, |editor, cx| editor.text(cx)).ok();
+
+                if let Some(new_value) = new_value {
+                    SettingsValue::write_value(&path, serde_json::Value::String(new_value), cx);
+                }
+            }
+        })
+        .into_any_element()
+}
+
 fn render_toggle_button_group(
     value: SettingsValue<serde_json::Value>,
     variants: &'static [&'static str],

From d8085d3ac06b699af1980e3f46da475b558cc01a Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Tue, 9 Sep 2025 20:56:08 +0200
Subject: [PATCH 731/823] zed: Hide Install CLI menu button on Windows (#37843)

The "Install CLI" menu button and `install_cli::Install` action are
effectively no-op on Windows since the CLI is directly available in
Windows Terminal (CMD prompt, PowerShell, etc.) after the user runs Zed
installer package.

Release Notes:

- N/A

Co-authored-by: Peter Tripp <peter@zed.dev>
---
 crates/install_cli/src/install_cli.rs         | 117 +-----------------
 crates/install_cli/src/install_cli_binary.rs  | 101 +++++++++++++++
 crates/install_cli/src/register_zed_scheme.rs |  15 +++
 crates/zed/src/zed.rs                         |   9 +-
 crates/zed/src/zed/app_menus.rs               |   3 +-
 5 files changed, 130 insertions(+), 115 deletions(-)
 create mode 100644 crates/install_cli/src/install_cli_binary.rs
 create mode 100644 crates/install_cli/src/register_zed_scheme.rs

diff --git a/crates/install_cli/src/install_cli.rs b/crates/install_cli/src/install_cli.rs
index dc9e0e31ab..281069020a 100644
--- a/crates/install_cli/src/install_cli.rs
+++ b/crates/install_cli/src/install_cli.rs
@@ -1,112 +1,7 @@
-use anyhow::{Context as _, Result};
-use client::ZED_URL_SCHEME;
-use gpui::{AppContext as _, AsyncApp, Context, PromptLevel, Window, actions};
-use release_channel::ReleaseChannel;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use util::ResultExt;
-use workspace::notifications::{DetachAndPromptErr, NotificationId};
-use workspace::{Toast, Workspace};
+#[cfg(not(target_os = "windows"))]
+mod install_cli_binary;
+mod register_zed_scheme;
 
-actions!(
-    cli,
-    [
-        /// Installs the Zed CLI tool to the system PATH.
-        Install,
-        /// Registers the zed:// URL scheme handler.
-        RegisterZedScheme
-    ]
-);
-
-async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
-    let cli_path = cx.update(|cx| cx.path_for_auxiliary_executable("cli"))??;
-    let link_path = Path::new("/usr/local/bin/zed");
-    let bin_dir_path = link_path.parent().unwrap();
-
-    // Don't re-create symlink if it points to the same CLI binary.
-    if smol::fs::read_link(link_path).await.ok().as_ref() == Some(&cli_path) {
-        return Ok(link_path.into());
-    }
-
-    // If the symlink is not there or is outdated, first try replacing it
-    // without escalating.
-    smol::fs::remove_file(link_path).await.log_err();
-    // todo("windows")
-    #[cfg(not(windows))]
-    {
-        if smol::fs::unix::symlink(&cli_path, link_path)
-            .await
-            .log_err()
-            .is_some()
-        {
-            return Ok(link_path.into());
-        }
-    }
-
-    // The symlink could not be created, so use osascript with admin privileges
-    // to create it.
-    let status = smol::process::Command::new("/usr/bin/osascript")
-        .args([
-            "-e",
-            &format!(
-                "do shell script \" \
-                    mkdir -p \'{}\' && \
-                    ln -sf \'{}\' \'{}\' \
-                \" with administrator privileges",
-                bin_dir_path.to_string_lossy(),
-                cli_path.to_string_lossy(),
-                link_path.to_string_lossy(),
-            ),
-        ])
-        .stdout(smol::process::Stdio::inherit())
-        .stderr(smol::process::Stdio::inherit())
-        .output()
-        .await?
-        .status;
-    anyhow::ensure!(status.success(), "error running osascript");
-    Ok(link_path.into())
-}
-
-pub async fn register_zed_scheme(cx: &AsyncApp) -> anyhow::Result<()> {
-    cx.update(|cx| cx.register_url_scheme(ZED_URL_SCHEME))?
-        .await
-}
-
-pub fn install_cli(window: &mut Window, cx: &mut Context<Workspace>) {
-    const LINUX_PROMPT_DETAIL: &str = "If you installed Zed from our official release add ~/.local/bin to your PATH.\n\nIf you installed Zed from a different source like your package manager, then you may need to create an alias/symlink manually.\n\nDepending on your package manager, the CLI might be named zeditor, zedit, zed-editor or something else.";
-
-    cx.spawn_in(window, async move |workspace, cx| {
-        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            let prompt = cx.prompt(
-                PromptLevel::Warning,
-                "CLI should already be installed",
-                Some(LINUX_PROMPT_DETAIL),
-                &["Ok"],
-            );
-            cx.background_spawn(prompt).detach();
-            return Ok(());
-        }
-        let path = install_script(cx.deref())
-            .await
-            .context("error creating CLI symlink")?;
-
-        workspace.update_in(cx, |workspace, _, cx| {
-            struct InstalledZedCli;
-
-            workspace.show_toast(
-                Toast::new(
-                    NotificationId::unique::<InstalledZedCli>(),
-                    format!(
-                        "Installed `zed` to {}. You can launch {} from your terminal.",
-                        path.to_string_lossy(),
-                        ReleaseChannel::global(cx).display_name()
-                    ),
-                ),
-                cx,
-            )
-        })?;
-        register_zed_scheme(cx).await.log_err();
-        Ok(())
-    })
-    .detach_and_prompt_err("Error installing zed cli", window, cx, |_, _, _| None);
-}
+#[cfg(not(target_os = "windows"))]
+pub use install_cli_binary::{InstallCliBinary, install_cli_binary};
+pub use register_zed_scheme::{RegisterZedScheme, register_zed_scheme};
diff --git a/crates/install_cli/src/install_cli_binary.rs b/crates/install_cli/src/install_cli_binary.rs
new file mode 100644
index 0000000000..414bdabc70
--- /dev/null
+++ b/crates/install_cli/src/install_cli_binary.rs
@@ -0,0 +1,101 @@
+use super::register_zed_scheme;
+use anyhow::{Context as _, Result};
+use gpui::{AppContext as _, AsyncApp, Context, PromptLevel, Window, actions};
+use release_channel::ReleaseChannel;
+use std::ops::Deref;
+use std::path::{Path, PathBuf};
+use util::ResultExt;
+use workspace::notifications::{DetachAndPromptErr, NotificationId};
+use workspace::{Toast, Workspace};
+
+actions!(
+    cli,
+    [
+        /// Installs the Zed CLI tool to the system PATH.
+        InstallCliBinary,
+    ]
+);
+
+async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
+    let cli_path = cx.update(|cx| cx.path_for_auxiliary_executable("cli"))??;
+    let link_path = Path::new("/usr/local/bin/zed");
+    let bin_dir_path = link_path.parent().unwrap();
+
+    // Don't re-create symlink if it points to the same CLI binary.
+    if smol::fs::read_link(link_path).await.ok().as_ref() == Some(&cli_path) {
+        return Ok(link_path.into());
+    }
+
+    // If the symlink is not there or is outdated, first try replacing it
+    // without escalating.
+    smol::fs::remove_file(link_path).await.log_err();
+    if smol::fs::unix::symlink(&cli_path, link_path)
+        .await
+        .log_err()
+        .is_some()
+    {
+        return Ok(link_path.into());
+    }
+
+    // The symlink could not be created, so use osascript with admin privileges
+    // to create it.
+    let status = smol::process::Command::new("/usr/bin/osascript")
+        .args([
+            "-e",
+            &format!(
+                "do shell script \" \
+                    mkdir -p \'{}\' && \
+                    ln -sf \'{}\' \'{}\' \
+                \" with administrator privileges",
+                bin_dir_path.to_string_lossy(),
+                cli_path.to_string_lossy(),
+                link_path.to_string_lossy(),
+            ),
+        ])
+        .stdout(smol::process::Stdio::inherit())
+        .stderr(smol::process::Stdio::inherit())
+        .output()
+        .await?
+        .status;
+    anyhow::ensure!(status.success(), "error running osascript");
+    Ok(link_path.into())
+}
+
+pub fn install_cli_binary(window: &mut Window, cx: &mut Context<Workspace>) {
+    const LINUX_PROMPT_DETAIL: &str = "If you installed Zed from our official release add ~/.local/bin to your PATH.\n\nIf you installed Zed from a different source like your package manager, then you may need to create an alias/symlink manually.\n\nDepending on your package manager, the CLI might be named zeditor, zedit, zed-editor or something else.";
+
+    cx.spawn_in(window, async move |workspace, cx| {
+        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
+            let prompt = cx.prompt(
+                PromptLevel::Warning,
+                "CLI should already be installed",
+                Some(LINUX_PROMPT_DETAIL),
+                &["Ok"],
+            );
+            cx.background_spawn(prompt).detach();
+            return Ok(());
+        }
+        let path = install_script(cx.deref())
+            .await
+            .context("error creating CLI symlink")?;
+
+        workspace.update_in(cx, |workspace, _, cx| {
+            struct InstalledZedCli;
+
+            workspace.show_toast(
+                Toast::new(
+                    NotificationId::unique::<InstalledZedCli>(),
+                    format!(
+                        "Installed `zed` to {}. You can launch {} from your terminal.",
+                        path.to_string_lossy(),
+                        ReleaseChannel::global(cx).display_name()
+                    ),
+                ),
+                cx,
+            )
+        })?;
+        register_zed_scheme(cx).await.log_err();
+        Ok(())
+    })
+    .detach_and_prompt_err("Error installing zed cli", window, cx, |_, _, _| None);
+}
diff --git a/crates/install_cli/src/register_zed_scheme.rs b/crates/install_cli/src/register_zed_scheme.rs
new file mode 100644
index 0000000000..819287c5d0
--- /dev/null
+++ b/crates/install_cli/src/register_zed_scheme.rs
@@ -0,0 +1,15 @@
+use client::ZED_URL_SCHEME;
+use gpui::{AsyncApp, actions};
+
+actions!(
+    cli,
+    [
+        /// Registers the zed:// URL scheme handler.
+        RegisterZedScheme
+    ]
+);
+
+pub async fn register_zed_scheme(cx: &AsyncApp) -> anyhow::Result<()> {
+    cx.update(|cx| cx.register_url_scheme(ZED_URL_SCHEME))?
+        .await
+}
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index e14cbb10e8..2412a26862 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -806,7 +806,6 @@ fn register_actions(
                 }
             }
         })
-        .register_action(install_cli)
         .register_action(|_, _: &install_cli::RegisterZedScheme, window, cx| {
             cx.spawn_in(window, async move |workspace, cx| {
                 install_cli::register_zed_scheme(cx).await?;
@@ -915,6 +914,9 @@ fn register_actions(
             capture_audio(workspace, window, cx);
         });
 
+    #[cfg(not(target_os = "windows"))]
+    workspace.register_action(install_cli);
+
     if workspace.project().read(cx).is_via_remote_server() {
         workspace.register_action({
             move |workspace, _: &OpenServerSettings, window, cx| {
@@ -1030,13 +1032,14 @@ fn about(
     .detach();
 }
 
+#[cfg(not(target_os = "windows"))]
 fn install_cli(
     _: &mut Workspace,
-    _: &install_cli::Install,
+    _: &install_cli::InstallCliBinary,
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
-    install_cli::install_cli(window, cx);
+    install_cli::install_cli_binary(window, cx)
 }
 
 static WAITING_QUIT_CONFIRMATION: AtomicBool = AtomicBool::new(false);
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 50b88dd4ed..89d54503ce 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -39,7 +39,8 @@ pub fn app_menus() -> Vec<Menu> {
                 MenuItem::os_submenu("Services", gpui::SystemMenuType::Services),
                 MenuItem::separator(),
                 MenuItem::action("Extensions", zed_actions::Extensions::default()),
-                MenuItem::action("Install CLI", install_cli::Install),
+                #[cfg(not(target_os = "windows"))]
+                MenuItem::action("Install CLI", install_cli::InstallCliBinary),
                 MenuItem::separator(),
                 #[cfg(target_os = "macos")]
                 MenuItem::action("Hide Zed", super::Hide),

From 5e58f44d85fb7c9ee7e914dae9d39862a5f251c4 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Tue, 9 Sep 2025 12:00:24 -0700
Subject: [PATCH 732/823] Fix auth in edit_agent evals (#37869)

Somehow we have a regression where the auth wasn't being called, so the
model didn't exist.

Looking at the code, it is likely this was relying on some other part of
the code doing the auth, since the order wouldn't have worked before
without that happening. This new order of doing auth before checking for
available models should fix it going forward.

Release Notes:

- N/A
---
 crates/assistant_tools/src/edit_agent/evals.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/crates/assistant_tools/src/edit_agent/evals.rs b/crates/assistant_tools/src/edit_agent/evals.rs
index e78d43f56b..515e22d5f8 100644
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1520,7 +1520,15 @@ impl EditAgentTest {
         selected_model: &SelectedModel,
         cx: &mut AsyncApp,
     ) -> Result<Arc<dyn LanguageModel>> {
-        let (provider, model) = cx.update(|cx| {
+        cx.update(|cx| {
+            let registry = LanguageModelRegistry::read_global(cx);
+            let provider = registry
+                .provider(&selected_model.provider)
+                .expect("Provider not found");
+            provider.authenticate(cx)
+        })?
+        .await?;
+        cx.update(|cx| {
             let models = LanguageModelRegistry::read_global(cx);
             let model = models
                 .available_models(cx)
@@ -1529,11 +1537,8 @@ impl EditAgentTest {
                         && model.id() == selected_model.model
                 })
                 .expect("Model not found");
-            let provider = models.provider(&model.provider_id()).unwrap();
-            (provider, model)
-        })?;
-        cx.update(|cx| provider.authenticate(cx))?.await?;
-        Ok(model)
+            model
+        })
     }
 
     async fn eval(&self, eval: EvalInput, cx: &mut TestAppContext) -> Result<EvalOutput> {

From 1ae3d25aedea0766e4a5e390b87f6fa892d8c12f Mon Sep 17 00:00:00 2001
From: chbk <chbk.git@gmail.com>
Date: Tue, 9 Sep 2025 21:05:07 +0200
Subject: [PATCH 733/823] Improve Markdown highlighting (#37669)

Release Notes:

  - Improved Markdown syntax highlighting


PR #25330 raised concerns about breaking changes, so I split it into two
PRs:
- This PR improves highlighting without deprecating existing selectors.
- PR #37670 is based on this PR and introduces new Markdown selectors.

| Zed 0.202.7 | With this PR |
| --- | --- |
| <img width="800" height="1080" alt="md-0 202 7"
src="https://github.com/user-attachments/assets/0b0b5920-32ed-454f-bc3b-bf5cd0a9086a"
/> | <img width="800" height="1080" alt="md-pr"
src="https://github.com/user-attachments/assets/a5923a2e-391e-4e09-a60b-1a142f9378f3"
/> |

Changes to include the `markup` selector, conforming to
[Neovim](https://github.com/nvim-treesitter/nvim-treesitter/blob/38e46a6d7ade5c8718f77b2b9fd98a0f7ab32c1e/queries/markdown/highlights.scm#L59),
[VS
Code](https://github.com/microsoft/vscode/blob/dfad570d15959a6ce7210a313a1190e76e8fe2e2/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json#L60),
[Atom](https://github.com/atom/language-gfm/blob/6686ac6ccca2632af24d5c200f85bcd80b9fa752/grammars/gfm.json#L147),
and [Zed
itself](https://github.com/zed-industries/zed/blob/1e255e41ccfdb88e2266469f1ccfe0d41533280b/crates/languages/src/gitcommit/highlights.scm#L1).

- `paragraph`, `indented_code_block`, `pipe_table`: `text`
- `# Heading`: `title` -> `title.markup`
- `-`, `1.`, `>`, `|`: `punctuation.markup`
- ```` ``` ````: `punctuation.embedded.markup`
- `[1]: url.com`, `[link](url.com)`: `link_text.markup`
- `url.com`: `link_uri` -> `link_uri.markup`
- `*italic*`: `emphasis` -> `emphasis.markup`
- `**bold**`: `emphasis.strong` -> `emphasis.strong.markup`
- ``` `raw` ```: `text.literal` -> `text.literal.markup`
- `~~strikethrough~~`: `strikethrough.markup`

````md

# Heading

Some stylized text:
- `raw`
- *italic*
- ~strike~
- **strong**

> quoted

```python
print("some code")
```

1. Here is an ![image](image.jpg)
2. A [link](https://github.com/zed-industries)
3. And even a [referenced link][1]

[1]: https://zed.dev

| tables | are |
| --- | --- |
| properly | scoped |

````
---
 assets/themes/ayu/ayu.json                    | 15 ++++++++++
 assets/themes/gruvbox/gruvbox.json            | 30 +++++++++++++++++++
 assets/themes/one/one.json                    | 10 +++++++
 .../src/markdown-inline/highlights.scm        | 28 +++++++++++++----
 crates/languages/src/markdown/highlights.scm  | 28 +++++++++++++----
 5 files changed, 100 insertions(+), 11 deletions(-)

diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index 0ffbb9f61e..f71048caaf 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -316,6 +316,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#a6a5a0ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#d2a6ffff",
             "font_style": null,
@@ -702,6 +707,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#73777bff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#a37accff",
             "font_style": null,
@@ -1088,6 +1098,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#b4b3aeff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#dfbfffff",
             "font_style": null,
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index f0f0358b76..fc11cac55f 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -325,6 +325,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#e5d5adff",
             "font_style": null,
@@ -725,6 +730,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#e5d5adff",
             "font_style": null,
@@ -1125,6 +1135,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#e5d5adff",
             "font_style": null,
@@ -1525,6 +1540,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#413d3aff",
             "font_style": null,
@@ -1925,6 +1945,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#413d3aff",
             "font_style": null,
@@ -2325,6 +2350,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#413d3aff",
             "font_style": null,
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index 33f6d3c622..7cc8c96a23 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -321,6 +321,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#d07277ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#b1574bff",
             "font_style": null,
@@ -715,6 +720,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "punctuation.markup": {
+            "color": "#d3604fff",
+            "font_style": null,
+            "font_weight": null
+          },
           "punctuation.special": {
             "color": "#b92b46ff",
             "font_style": null,
diff --git a/crates/languages/src/markdown-inline/highlights.scm b/crates/languages/src/markdown-inline/highlights.scm
index 61c3e34c62..3c9f6fbcc3 100644
--- a/crates/languages/src/markdown-inline/highlights.scm
+++ b/crates/languages/src/markdown-inline/highlights.scm
@@ -1,6 +1,22 @@
-(emphasis) @emphasis
-(strong_emphasis) @emphasis.strong
-(code_span) @text.literal
-(link_text) @link_text
-(link_label) @link_text
-(link_destination) @link_uri
+(emphasis) @emphasis.markup
+(strong_emphasis) @emphasis.strong.markup
+(code_span) @text.literal.markup
+(strikethrough) @strikethrough.markup
+
+[
+  (inline_link)
+  (shortcut_link)
+  (collapsed_reference_link)
+  (full_reference_link)
+  (image)
+  (link_text)
+  (link_label)
+] @link_text.markup
+
+(inline_link ["(" ")"] @link_uri.markup)
+(image ["(" ")"] @link_uri.markup)
+[
+  (link_destination)
+  (uri_autolink)
+  (email_autolink)
+] @link_uri.markup
diff --git a/crates/languages/src/markdown/highlights.scm b/crates/languages/src/markdown/highlights.scm
index 6b9fa34822..707bcc0816 100644
--- a/crates/languages/src/markdown/highlights.scm
+++ b/crates/languages/src/markdown/highlights.scm
@@ -1,7 +1,15 @@
+[
+  (paragraph)
+  (indented_code_block)
+  (pipe_table)
+] @text
+
 [
   (atx_heading)
   (setext_heading)
-] @title
+  (thematic_break)
+] @title.markup
+(setext_heading (paragraph) @title.markup)
 
 [
   (list_marker_plus)
@@ -9,8 +17,18 @@
   (list_marker_star)
   (list_marker_dot)
   (list_marker_parenthesis)
-] @punctuation.list_marker
+] @punctuation.list_marker.markup
 
-(fenced_code_block
-  (info_string
-    (language) @text.literal))
+(block_quote_marker) @punctuation.markup
+(pipe_table_header "|" @punctuation.markup)
+(pipe_table_row "|" @punctuation.markup)
+(pipe_table_delimiter_row "|" @punctuation.markup)
+(pipe_table_delimiter_cell "-" @punctuation.markup)
+
+[
+  (fenced_code_block_delimiter)
+  (info_string)
+] @punctuation.embedded.markup
+
+(link_reference_definition) @link_text.markup
+(link_destination) @link_uri.markup

From 2fae4c7c724c1ee81b5fc7444ed79b4eade36504 Mon Sep 17 00:00:00 2001
From: Jonathan Hart <43473765+Quplet@users.noreply.github.com>
Date: Tue, 9 Sep 2025 15:18:22 -0400
Subject: [PATCH 734/823] vim: Make indenting selected lines with `>` and `<`
 in Helix mode no longer deselect them (#37665)

Improves Helix compatibility by making the Indent keybinds `<` and `>`
no longer deselect lines if they're selected.

Post Indent action current Zed release:
<img width="485" height="271" alt="image"
src="https://github.com/user-attachments/assets/41fd3d94-9c89-49dd-adc5-f696dbd79827"
/>
(Cursor is on the beginning of the first line)

Post Indent action in Helix:
<img width="376" height="144" alt="image"
src="https://github.com/user-attachments/assets/fdd1a489-cf3a-4638-9199-3adffa63ef61"
/>

Post Indent action in this PR:
<img width="463" height="300" alt="image"
src="https://github.com/user-attachments/assets/8edd3b81-e446-4b55-bc90-61cac3661ed7"
/>

Release Notes:

- Fixed selected lines indented with `<` and `>` deselecting in Helix
mode
---
 crates/vim/src/indent.rs | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/crates/vim/src/indent.rs b/crates/vim/src/indent.rs
index 7ef204de0f..927edf4d9a 100644
--- a/crates/vim/src/indent.rs
+++ b/crates/vim/src/indent.rs
@@ -5,6 +5,8 @@ use editor::{Bias, Editor, display_map::ToDisplayPoint};
 use gpui::actions;
 use gpui::{Context, Window};
 use language::SelectionGoal;
+use settings::Settings;
+use vim_mode_setting::HelixModeSetting;
 
 #[derive(PartialEq, Eq)]
 pub(crate) enum IndentDirection {
@@ -37,7 +39,9 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
                 for _ in 0..count {
                     editor.indent(&Default::default(), window, cx);
                 }
-                vim.restore_selection_cursors(editor, window, cx, original_positions);
+                if !HelixModeSetting::get_global(cx).0 {
+                    vim.restore_selection_cursors(editor, window, cx, original_positions);
+                }
             });
         });
         if vim.mode.is_visual() {
@@ -56,7 +60,9 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
                 for _ in 0..count {
                     editor.outdent(&Default::default(), window, cx);
                 }
-                vim.restore_selection_cursors(editor, window, cx, original_positions);
+                if !HelixModeSetting::get_global(cx).0 {
+                    vim.restore_selection_cursors(editor, window, cx, original_positions);
+                }
             });
         });
         if vim.mode.is_visual() {
@@ -183,6 +189,20 @@ mod test {
             .assert_eq("«    hello\n ˇ»   world\n");
     }
 
+    #[gpui::test]
+    async fn test_indent_hx(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+        cx.enable_helix();
+
+        cx.set_state("«Hello\nWorldˇ»\n", Mode::HelixNormal);
+
+        cx.simulate_keystrokes(">");
+        cx.assert_state("    «Hello\n    Worldˇ»\n", Mode::HelixNormal);
+
+        cx.simulate_keystrokes("<");
+        cx.assert_state("«Hello\nWorldˇ»\n", Mode::HelixNormal);
+    }
+
     #[gpui::test]
     async fn test_autoindent_op(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;

From 1751bf4cdbe8b6a55546d290c7f2a0f47721b041 Mon Sep 17 00:00:00 2001
From: "Mitch (a.k.a Voz)" <mitch@voz.dev>
Date: Tue, 9 Sep 2025 14:26:35 -0500
Subject: [PATCH 735/823] Allow outline modal toggling (#37575)

Closes #37511

The outline modal seems to have a bug where if it's open and the
`outline::Toggle` is triggered, it would not close if there was another
command with the same keybind. So instead, if the outline modal is open
and an `outline::Toggle` is triggered, we dismiss the modal.

Release Notes:

- Fixed a bug where `outline::Toggle` would sometimes not close outline
modal
---
 crates/outline/src/outline.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index 8c5e78d77b..1f85d08cee 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -81,8 +81,19 @@ impl ModalView for OutlineView {
 }
 
 impl Render for OutlineView {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .w(rems(34.))
+            .on_action(cx.listener(
+                |_this: &mut OutlineView,
+                 _: &zed_actions::outline::ToggleOutline,
+                 _window: &mut Window,
+                 cx: &mut Context<OutlineView>| {
+                    // When outline::Toggle is triggered while the outline is open, dismiss it
+                    cx.emit(DismissEvent);
+                },
+            ))
+            .child(self.picker.clone())
     }
 }
 

From 2e36e9782ee2235e97d765387ceb0fed57a406af Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 10 Sep 2025 00:58:26 +0530
Subject: [PATCH 736/823] language_models: Make Copilot Chat resilient to new
 model vendors and add tokenizer-based token counting (#37118)

While working on fixing this: #37116. I reliased the current
implementation of github copilot is not truly resilient to upstream
changes.

This PR enhances GitHub Copilot Chat to be forward-compatible with new
AI model vendors and improves token counting accuracy by using
vendor-specific tokenizers from the GitHub Copilot API. The system
previously failed when GitHub added new model vendors like xAI with
deserialization errors, and token counting wasn't utilizing the
vendor-specific tokenizer information provided by the API. The solution
adds an Unknown variant to the ModelVendor enum with serde other
attribute to gracefully handle any new vendors GitHub introduces,
implements tokenizer-aware token counting that uses the model's
specified tokenizer mapping o200k_base to gpt-4o with fallback, adds
explicit support for xAI models with proper tool input format handling,
and includes comprehensive test coverage for unknown vendor scenarios.
Key changes include adding the tokenizer field to model capabilities,
implementing the tokenizer method on models, updating tool input format
logic to handle unknown vendors, and simplifying token counting to use
the vendor's specified tokenizer or fall back to gpt-4o. This ensures
Zed's Copilot Chat integration remains robust and accurate as GitHub
continues expanding their AI model provider ecosystem.

Release Notes:

- Enhanced model vendor compatibility to automatically support future AI
providers and improved token counting accuracy using vendor-specific
tokenizers from the GitHub Copilot

---------

Signed-off-by: Umesh Yadav <git@umesh.dev>
---
 crates/copilot/src/copilot_chat.rs            | 50 +++++++++++++++++
 .../src/provider/copilot_chat.rs              | 53 ++++++++++++-------
 2 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/crates/copilot/src/copilot_chat.rs b/crates/copilot/src/copilot_chat.rs
index 9b9d6e19b8..ccd8f09613 100644
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -128,6 +128,8 @@ struct ModelCapabilities {
     supports: ModelSupportedFeatures,
     #[serde(rename = "type")]
     model_type: String,
+    #[serde(default)]
+    tokenizer: Option<String>,
 }
 
 #[derive(Default, Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
@@ -166,6 +168,9 @@ pub enum ModelVendor {
     Anthropic,
     #[serde(rename = "xAI")]
     XAI,
+    /// Unknown vendor that we don't explicitly support yet
+    #[serde(other)]
+    Unknown,
 }
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
@@ -214,6 +219,10 @@ impl Model {
     pub fn supports_parallel_tool_calls(&self) -> bool {
         self.capabilities.supports.parallel_tool_calls
     }
+
+    pub fn tokenizer(&self) -> Option<&str> {
+        self.capabilities.tokenizer.as_deref()
+    }
 }
 
 #[derive(Serialize, Deserialize)]
@@ -901,4 +910,45 @@ mod tests {
         assert_eq!(schema.data[0].id, "gpt-4");
         assert_eq!(schema.data[1].id, "claude-3.7-sonnet");
     }
+
+    #[test]
+    fn test_unknown_vendor_resilience() {
+        let json = r#"{
+              "data": [
+                {
+                  "billing": {
+                    "is_premium": false,
+                    "multiplier": 1
+                  },
+                  "capabilities": {
+                    "family": "future-model",
+                    "limits": {
+                      "max_context_window_tokens": 128000,
+                      "max_output_tokens": 8192,
+                      "max_prompt_tokens": 120000
+                    },
+                    "object": "model_capabilities",
+                    "supports": { "streaming": true, "tool_calls": true },
+                    "type": "chat"
+                  },
+                  "id": "future-model-v1",
+                  "is_chat_default": false,
+                  "is_chat_fallback": false,
+                  "model_picker_enabled": true,
+                  "name": "Future Model v1",
+                  "object": "model",
+                  "preview": false,
+                  "vendor": "SomeNewVendor",
+                  "version": "v1.0"
+                }
+              ],
+              "object": "list"
+            }"#;
+
+        let schema: ModelSchema = serde_json::from_str(json).unwrap();
+
+        assert_eq!(schema.data.len(), 1);
+        assert_eq!(schema.data[0].id, "future-model-v1");
+        assert_eq!(schema.data[0].vendor, ModelVendor::Unknown);
+    }
 }
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
index 071424eabe..b7ece55fed 100644
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -28,12 +28,6 @@ use settings::SettingsStore;
 use ui::{CommonAnimationExt, prelude::*};
 use util::debug_panic;
 
-use crate::provider::x_ai::count_xai_tokens;
-
-use super::anthropic::count_anthropic_tokens;
-use super::google::count_google_tokens;
-use super::open_ai::count_open_ai_tokens;
-
 const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("copilot_chat");
 const PROVIDER_NAME: LanguageModelProviderName =
     LanguageModelProviderName::new("GitHub Copilot Chat");
@@ -191,6 +185,25 @@ impl LanguageModelProvider for CopilotChatLanguageModelProvider {
     }
 }
 
+fn collect_tiktoken_messages(
+    request: LanguageModelRequest,
+) -> Vec<tiktoken_rs::ChatCompletionRequestMessage> {
+    request
+        .messages
+        .into_iter()
+        .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
+            role: match message.role {
+                Role::User => "user".into(),
+                Role::Assistant => "assistant".into(),
+                Role::System => "system".into(),
+            },
+            content: Some(message.string_contents()),
+            name: None,
+            function_call: None,
+        })
+        .collect::<Vec<_>>()
+}
+
 pub struct CopilotChatLanguageModel {
     model: CopilotChatModel,
     request_limiter: RateLimiter,
@@ -226,7 +239,7 @@ impl LanguageModel for CopilotChatLanguageModel {
             ModelVendor::OpenAI | ModelVendor::Anthropic => {
                 LanguageModelToolSchemaFormat::JsonSchema
             }
-            ModelVendor::Google | ModelVendor::XAI => {
+            ModelVendor::Google | ModelVendor::XAI | ModelVendor::Unknown => {
                 LanguageModelToolSchemaFormat::JsonSchemaSubset
             }
         }
@@ -253,18 +266,20 @@ impl LanguageModel for CopilotChatLanguageModel {
         request: LanguageModelRequest,
         cx: &App,
     ) -> BoxFuture<'static, Result<u64>> {
-        match self.model.vendor() {
-            ModelVendor::Anthropic => count_anthropic_tokens(request, cx),
-            ModelVendor::Google => count_google_tokens(request, cx),
-            ModelVendor::XAI => {
-                let model = x_ai::Model::from_id(self.model.id()).unwrap_or_default();
-                count_xai_tokens(request, model, cx)
-            }
-            ModelVendor::OpenAI => {
-                let model = open_ai::Model::from_id(self.model.id()).unwrap_or_default();
-                count_open_ai_tokens(request, model, cx)
-            }
-        }
+        let model = self.model.clone();
+        cx.background_spawn(async move {
+            let messages = collect_tiktoken_messages(request);
+            // Copilot uses OpenAI tiktoken tokenizer for all it's model irrespective of the underlying provider(vendor).
+            let tokenizer_model = match model.tokenizer() {
+                Some("o200k_base") => "gpt-4o",
+                Some("cl100k_base") => "gpt-4",
+                _ => "gpt-4o",
+            };
+
+            tiktoken_rs::num_tokens_from_messages(tokenizer_model, &messages)
+                .map(|tokens| tokens as u64)
+        })
+        .boxed()
     }
 
     fn stream_completion(

From 0862a0b6661b3dd9b59d5151fd7852a73bc7784b Mon Sep 17 00:00:00 2001
From: Alvaro Parker <64918109+AlvaroParker@users.noreply.github.com>
Date: Tue, 9 Sep 2025 16:29:49 -0300
Subject: [PATCH 737/823] git: Add uncommit action (#37031)

Closes #36767

Release Notes:

- Add uncommit action for git
---
 crates/git_ui/src/git_panel.rs | 2 +-
 crates/git_ui/src/git_ui.rs    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 07a59de02a..f64f001241 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1738,7 +1738,7 @@ impl GitPanel {
         self.pending_commit = Some(task);
     }
 
-    fn uncommit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    pub(crate) fn uncommit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let Some(repo) = self.active_repository.clone() else {
             return;
         };
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index 5369b8b404..ffb1a74728 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -149,6 +149,14 @@ pub fn init(cx: &mut App) {
                 panel.unstage_all(action, window, cx);
             });
         });
+        workspace.register_action(|workspace, _: &git::Uncommit, window, cx| {
+            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
+                return;
+            };
+            panel.update(cx, |panel, cx| {
+                panel.uncommit(window, cx);
+            })
+        });
         CommandPaletteFilter::update_global(cx, |filter, _cx| {
             filter.hide_action_types(&[
                 zed_actions::OpenGitIntegrationOnboarding.type_id(),

From 414d3be437355072ae751179db4e57e28163031a Mon Sep 17 00:00:00 2001
From: "Mitch (a.k.a Voz)" <mitch@voz.dev>
Date: Tue, 9 Sep 2025 14:32:45 -0500
Subject: [PATCH 738/823] Set usePlaceholders to match Go default (#37551)

Closes #33629

Release Notes:

- changed gopls default to match what Go specifies
https://github.com/golang/tools/blob/master/gopls/doc/settings.md#useplaceholders-bool
---
 crates/languages/src/go.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 8c116c899f..55441c33b8 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -204,7 +204,7 @@ impl super::LspAdapter for GoLspAdapter {
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         Ok(Some(json!({
-            "usePlaceholders": true,
+            "usePlaceholders": false,
             "hints": {
                 "assignVariableTypes": true,
                 "compositeLiteralFields": true,

From 18c6d9d394f99fa0e2e95dff385bff117a1ef5cb Mon Sep 17 00:00:00 2001
From: 0xshadow <issahil404@gmail.com>
Date: Wed, 10 Sep 2025 01:06:35 +0530
Subject: [PATCH 739/823] Fix SVG preview not refreshing on external file
 changes (#37316)

Closes #37208

## Release Notes:

- Fixed: SVG preview now refreshes automatically when files are modified
by external programs

## Summary

Previously, SVG preview would only refresh when files were saved within
the Zed editor, but not when modified by external programs (like
scripts, other editors, etc.)

## What Changed

The SVG preview now subscribes to file system events through the
worktree system. When an external program modifies an SVG file, the
worktree detects the change and notifies the preview. The preview then
clears its cache and refreshes to show the updated content.

## Before the fix



https://github.com/user-attachments/assets/e7f9a2b2-50f9-4b43-95e9-93a0720749f5


## After the fix


https://github.com/user-attachments/assets/b23511e3-8e59-45a1-b29b-d5105d32bd2c

AI Usage:
Used Cursor for code generation
---
 Cargo.lock                                 |  2 +
 crates/svg_preview/Cargo.toml              |  2 +
 crates/svg_preview/src/svg_preview_view.rs | 79 +++++++++++++++++++++-
 3 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6dd0ba8451..8aaea1a1f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15870,9 +15870,11 @@ dependencies = [
  "editor",
  "file_icons",
  "gpui",
+ "project",
  "ui",
  "workspace",
  "workspace-hack",
+ "worktree",
 ]
 
 [[package]]
diff --git a/crates/svg_preview/Cargo.toml b/crates/svg_preview/Cargo.toml
index b783d7192c..1054aee23f 100644
--- a/crates/svg_preview/Cargo.toml
+++ b/crates/svg_preview/Cargo.toml
@@ -15,6 +15,8 @@ path = "src/svg_preview.rs"
 editor.workspace = true
 file_icons.workspace = true
 gpui.workspace = true
+project.workspace = true
 ui.workspace = true
 workspace.workspace = true
+worktree.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/svg_preview/src/svg_preview_view.rs b/crates/svg_preview/src/svg_preview_view.rs
index 12dd97f0c8..d021f94856 100644
--- a/crates/svg_preview/src/svg_preview_view.rs
+++ b/crates/svg_preview/src/svg_preview_view.rs
@@ -7,18 +7,23 @@ use gpui::{
     ParentElement, Render, Resource, RetainAllImageCache, Styled, Subscription, WeakEntity, Window,
     div, img,
 };
+use project::ProjectPath;
 use ui::prelude::*;
 use workspace::item::Item;
 use workspace::{Pane, Workspace};
+use worktree::Event as WorktreeEvent;
 
 use crate::{OpenFollowingPreview, OpenPreview, OpenPreviewToTheSide};
 
 pub struct SvgPreviewView {
     focus_handle: FocusHandle,
     svg_path: Option<PathBuf>,
+    project_path: Option<ProjectPath>,
     image_cache: Entity<RetainAllImageCache>,
+    workspace_handle: WeakEntity<Workspace>,
     _editor_subscription: Subscription,
     _workspace_subscription: Option<Subscription>,
+    _project_subscription: Option<Subscription>,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -151,6 +156,7 @@ impl SvgPreviewView {
     ) -> Entity<Self> {
         cx.new(|cx| {
             let svg_path = Self::get_svg_path(&active_editor, cx);
+            let project_path = Self::get_project_path(&active_editor, cx);
             let image_cache = RetainAllImageCache::new(cx);
 
             let subscription = cx.subscribe_in(
@@ -201,16 +207,66 @@ impl SvgPreviewView {
                 None
             };
 
-            Self {
+            // We'll set up the project subscription after the entity is created
+            let project_subscription = None;
+
+            let view = Self {
                 focus_handle: cx.focus_handle(),
                 svg_path,
+                project_path,
                 image_cache,
+                workspace_handle,
                 _editor_subscription: subscription,
                 _workspace_subscription: workspace_subscription,
-            }
+                _project_subscription: project_subscription,
+            };
+
+            view
         })
     }
 
+    fn setup_project_subscription(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if let (Some(workspace), Some(project_path)) =
+            (self.workspace_handle.upgrade(), &self.project_path)
+        {
+            let project = workspace.read(cx).project().clone();
+            let worktree_id = project_path.worktree_id;
+            let worktree = {
+                let project_read = project.read(cx);
+                project_read
+                    .worktrees(cx)
+                    .find(|worktree| worktree.read(cx).id() == worktree_id)
+            };
+
+            if let Some(worktree) = worktree {
+                self._project_subscription = Some(cx.subscribe_in(
+                    &worktree,
+                    window,
+                    |this: &mut SvgPreviewView, _worktree, event: &WorktreeEvent, window, cx| {
+                        if let WorktreeEvent::UpdatedEntries(changes) = event {
+                            if let Some(project_path) = &this.project_path {
+                                // Check if our SVG file was modified
+                                for (path, _entry_id, _change) in changes.iter() {
+                                    if path.as_ref() == project_path.path.as_ref() {
+                                        // File was modified externally, clear cache and refresh
+                                        if let Some(svg_path) = &this.svg_path {
+                                            let resource = Resource::Path(svg_path.clone().into());
+                                            this.image_cache.update(cx, |cache, cx| {
+                                                cache.remove(&resource, window, cx);
+                                            });
+                                        }
+                                        cx.notify();
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    },
+                ));
+            }
+        }
+    }
+
     pub fn is_svg_file<C>(editor: &Entity<Editor>, cx: &C) -> bool
     where
         C: std::borrow::Borrow<App>,
@@ -240,10 +296,27 @@ impl SvgPreviewView {
         let local_file = file.as_local()?;
         Some(local_file.abs_path(app))
     }
+
+    fn get_project_path<C>(editor: &Entity<Editor>, cx: &C) -> Option<ProjectPath>
+    where
+        C: std::borrow::Borrow<App>,
+    {
+        let app = cx.borrow();
+        let buffer = editor.read(app).buffer().read(app).as_singleton()?;
+        let file = buffer.read(app).file()?;
+        Some(ProjectPath {
+            worktree_id: file.worktree_id(app),
+            path: file.path().clone(),
+        })
+    }
 }
 
 impl Render for SvgPreviewView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        // Set up project subscription on first render if not already done
+        if self._project_subscription.is_none() {
+            self.setup_project_subscription(window, cx);
+        }
         v_flex()
             .id("SvgPreview")
             .key_context("SvgPreview")

From eb7154d099a8fd503b0260a7c89422d6e0e97bdb Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 9 Sep 2025 22:53:03 +0300
Subject: [PATCH 740/823] Skip "open this directory" menu entry in case of
 errors (#37872)

Follow-up of https://github.com/zed-industries/zed/pull/37564

Release Notes:

- N/A
---
 crates/file_finder/src/open_path_prompt.rs       | 9 +++++----
 crates/file_finder/src/open_path_prompt_tests.rs | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
index c0abb372b2..ab00f943b8 100644
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -392,10 +392,11 @@ impl PickerDelegate for OpenPathDelegate {
                 let should_prepend_with_current_dir = this
                     .read_with(cx, |picker, _| {
                         !input_is_empty
-                            && !matches!(
-                                picker.delegate.directory_state,
-                                DirectoryState::Create { .. }
-                            )
+                            && match &picker.delegate.directory_state {
+                                DirectoryState::List { error, .. } => error.is_none(),
+                                DirectoryState::Create { .. } => false,
+                                DirectoryState::None { .. } => false,
+                            }
                     })
                     .unwrap_or(false);
                 if should_prepend_with_current_dir {
diff --git a/crates/file_finder/src/open_path_prompt_tests.rs b/crates/file_finder/src/open_path_prompt_tests.rs
index 1f47c4e80a..fd7cc1c6c6 100644
--- a/crates/file_finder/src/open_path_prompt_tests.rs
+++ b/crates/file_finder/src/open_path_prompt_tests.rs
@@ -39,6 +39,9 @@ async fn test_open_path_prompt(cx: &mut TestAppContext) {
 
     let (picker, cx) = build_open_path_prompt(project, false, PathStyle::current(), cx);
 
+    insert_query(path!("sadjaoislkdjasldj"), &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), Vec::<String>::new());
+
     let query = path!("/root");
     insert_query(query, &picker, cx).await;
     assert_eq!(collect_match_candidates(&picker, cx), vec!["root"]);

From cffb883108ec07ec2f51446cb35eac19b89e625f Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Tue, 9 Sep 2025 16:07:42 -0400
Subject: [PATCH 741/823] Consistently map syntax node navigation actions on
 macOS (#37874)

Skipping Linux and Windows keymaps here, as it's hard to find a
consistent base-binding for all 4 actions across all platforms that
don't break important actions for each keymap. Someone else can think on
that and make a proposal.

Release Notes:

- Added bindings for navigating between sibling nodes in the syntax tree
on macOS (`cmd-ctrl-{up/down}` for `SelectPreviousSyntaxNode` and
`SelectNextSyntaxNode`). Breaking change: the existing syntax tree
parent/child navigation bindings have moved from
`ctrl-shift-{left/right}` to `cmd-ctrl-{left/right}` to create a unified
four-directional navigation pattern where all syntax tree operations use
the same modifier combination. We could not use the previous base
modifiers without breaking more bindings.
---
 assets/keymaps/default-linux.json   | 4 ++--
 assets/keymaps/default-macos.json   | 6 ++++--
 assets/keymaps/default-windows.json | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 7c7692ac46..6ad2244fa8 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -493,8 +493,8 @@
       "alt-down": "editor::MoveLineDown",
       "ctrl-alt-shift-up": "editor::DuplicateLineUp",
       "ctrl-alt-shift-down": "editor::DuplicateLineDown",
-      "alt-shift-right": "editor::SelectLargerSyntaxNode", // Expand Selection
-      "alt-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
+      "alt-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection
+      "alt-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
       "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
       "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
       "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 8cf1217fb0..9f13fc3079 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -544,8 +544,10 @@
       "alt-down": "editor::MoveLineDown",
       "alt-shift-up": "editor::DuplicateLineUp",
       "alt-shift-down": "editor::DuplicateLineDown",
-      "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand Selection
-      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
+      "cmd-ctrl-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
+      "cmd-ctrl-right": "editor::SelectLargerSyntaxNode", // Expand selection
+      "cmd-ctrl-up": "editor::SelectPreviousSyntaxNode", // Move selection up
+      "cmd-ctrl-down": "editor::SelectNextSyntaxNode", // Move selection down
       "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand
       "cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
       "cmd-f2": "editor::SelectAllMatches", // Select all occurrences of current word
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index b10ac96433..9d040372c6 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -492,8 +492,8 @@
       "alt-down": "editor::MoveLineDown",
       "shift-alt-up": "editor::DuplicateLineUp",
       "shift-alt-down": "editor::DuplicateLineDown",
-      "shift-alt-right": "editor::SelectLargerSyntaxNode", // Expand Selection
-      "shift-alt-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
+      "shift-alt-right": "editor::SelectLargerSyntaxNode", // Expand selection
+      "shift-alt-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
       "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
       "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
       "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand

From d2886d606b4a02e79b2e6b3c320c6a736d5c5f62 Mon Sep 17 00:00:00 2001
From: Santiago Bernhardt <23391642+sbe-arg@users.noreply.github.com>
Date: Wed, 10 Sep 2025 08:08:05 +1200
Subject: [PATCH 742/823] ollama: Add mistral-nemo (#37723)

Adding mistral nemo, sorting by name and adding comment about clamp
sizing

Release Notes:

- Added support for mistral-nemo

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/ollama/src/ollama.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/ollama/src/ollama.rs b/crates/ollama/src/ollama.rs
index 3c935d2152..c61108d8bd 100644
--- a/crates/ollama/src/ollama.rs
+++ b/crates/ollama/src/ollama.rs
@@ -46,19 +46,19 @@ fn get_max_tokens(name: &str) -> u64 {
     /// Default context length for unknown models.
     const DEFAULT_TOKENS: u64 = 4096;
     /// Magic number. Lets many Ollama models work with ~16GB of ram.
+    /// Models that support context beyond 16k such as codestral (32k) or devstral (128k) will be clamped down to 16k
     const MAXIMUM_TOKENS: u64 = 16384;
 
     match name.split(':').next().unwrap() {
-        "phi" | "tinyllama" | "granite-code" => 2048,
-        "llama2" | "yi" | "vicuna" | "stablelm2" => 4096,
-        "llama3" | "gemma2" | "gemma" | "codegemma" | "starcoder" | "aya" => 8192,
+        "granite-code" | "phi" | "tinyllama" => 2048,
+        "llama2" | "stablelm2" | "vicuna" | "yi" => 4096,
+        "aya" | "codegemma" | "gemma" | "gemma2" | "llama3" | "starcoder" => 8192,
         "codellama" | "starcoder2" => 16384,
-        "mistral" | "codestral" | "mixstral" | "llava" | "qwen2" | "qwen2.5-coder"
-        | "dolphin-mixtral" => 32768,
-        "magistral" => 40000,
-        "llama3.1" | "llama3.2" | "llama3.3" | "phi3" | "phi3.5" | "phi4" | "command-r"
-        | "qwen3" | "gemma3" | "deepseek-coder-v2" | "deepseek-v3" | "deepseek-r1" | "yi-coder"
-        | "devstral" | "gpt-oss" => 128000,
+        "codestral" | "dolphin-mixtral" | "llava" | "magistral" | "mistral" | "mixstral"
+        | "qwen2" | "qwen2.5-coder" => 32768,
+        "cogito" | "command-r" | "deepseek-coder-v2" | "deepseek-r1" | "deepseek-v3"
+        | "devstral" | "gemma3" | "gpt-oss" | "granite3.3" | "llama3.1" | "llama3.2"
+        | "llama3.3" | "mistral-nemo" | "phi3" | "phi3.5" | "phi4" | "qwen3" | "yi-coder" => 128000,
         _ => DEFAULT_TOKENS,
     }
     .clamp(1, MAXIMUM_TOKENS)

From 304af661a04afbf1fed310ade4d446284f495cdc Mon Sep 17 00:00:00 2001
From: "Mitch (a.k.a Voz)" <mitch@voz.dev>
Date: Tue, 9 Sep 2025 15:18:27 -0500
Subject: [PATCH 743/823] Fix import not working on first column first row of
 file (#37746)

Closes #26136

Release Notes:

- fixed auto import not working on first column, first row of file
---
 crates/project/src/lsp_store.rs | 36 +++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index d17188bfbf..7430aa016f 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -60,7 +60,7 @@ use language::{
     Bias, BinaryStatus, Buffer, BufferSnapshot, CachedLspAdapter, CodeLabel, Diagnostic,
     DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, Diff, File as _, Language, LanguageName,
     LanguageRegistry, LocalFile, LspAdapter, LspAdapterDelegate, ManifestDelegate, ManifestName,
-    Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPointUtf16, Toolchain, Transaction,
+    Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPoint, ToPointUtf16, Toolchain, Transaction,
     Unclipped,
     language_settings::{
         FormatOnSave, Formatter, LanguageSettings, SelectedFormatter, language_settings,
@@ -6356,14 +6356,38 @@ impl LspStore {
 
                         for (range, text) in edits {
                             let primary = &completion.replace_range;
-                            let start_within = primary.start.cmp(&range.start, buffer).is_le()
-                                && primary.end.cmp(&range.start, buffer).is_ge();
-                            let end_within = range.start.cmp(&primary.end, buffer).is_le()
-                                && range.end.cmp(&primary.end, buffer).is_ge();
+
+                            // Special case: if both ranges start at the very beginning of the file (line 0, column 0),
+                            // and the primary completion is just an insertion (empty range), then this is likely
+                            // an auto-import scenario and should not be considered overlapping
+                            // https://github.com/zed-industries/zed/issues/26136
+                            let is_file_start_auto_import = {
+                                let snapshot = buffer.snapshot();
+                                let primary_start_point = primary.start.to_point(&snapshot);
+                                let range_start_point = range.start.to_point(&snapshot);
+
+                                let result = primary_start_point.row == 0
+                                    && primary_start_point.column == 0
+                                    && range_start_point.row == 0
+                                    && range_start_point.column == 0;
+
+                                result
+                            };
+
+                            let has_overlap = if is_file_start_auto_import {
+                                false
+                            } else {
+                                let start_within = primary.start.cmp(&range.start, buffer).is_le()
+                                    && primary.end.cmp(&range.start, buffer).is_ge();
+                                let end_within = range.start.cmp(&primary.end, buffer).is_le()
+                                    && range.end.cmp(&primary.end, buffer).is_ge();
+                                let result = start_within || end_within;
+                                result
+                            };
 
                             //Skip additional edits which overlap with the primary completion edit
                             //https://github.com/zed-industries/zed/pull/1871
-                            if !start_within && !end_within {
+                            if !has_overlap {
                                 buffer.edit([(range, text)], None, cx);
                             }
                         }

From 2f40a3bdfaa6e3b1ae994b078d79e4ebd96becef Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Tue, 9 Sep 2025 14:56:29 -0600
Subject: [PATCH 744/823] keymap validation: Improve message for action that
 takes no input (#37877)

See
https://github.com/zed-industries/zed/issues/26370#issuecomment-3200022302

Before (user screenshot):

<img width="650" height="127" alt="Image"
src="https://github.com/user-attachments/assets/9548ce43-657e-46ef-b6be-b95489167ac2"
/>

After (my screenshot):

<img width="616" height="229" alt="image"
src="https://github.com/user-attachments/assets/09028305-e7bb-4a31-bb87-55effbec26f3"
/>

Release Notes:

- N/A
---
 crates/settings/src/keymap_file.rs | 58 +++++++++++++++++++-----------
 docs/src/vim.md                    |  2 +-
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
index 5dddff28d8..be44d51944 100644
--- a/crates/settings/src/keymap_file.rs
+++ b/crates/settings/src/keymap_file.rs
@@ -463,8 +463,11 @@ impl KeymapFile {
             add_deprecation(schema, format!("Deprecated, use {new_name}"));
         }
 
-        fn add_description(schema: &mut schemars::Schema, description: String) {
-            schema.insert("description".to_string(), Value::String(description));
+        fn add_description(schema: &mut schemars::Schema, description: &str) {
+            schema.insert(
+                "description".to_string(),
+                Value::String(description.to_string()),
+            );
         }
 
         let empty_object = json_schema!({
@@ -476,32 +479,25 @@ impl KeymapFile {
         //
         // In the case of the array validations, it would even provide an error saying that the name
         // must match the name of the first alternative.
-        let mut plain_action = json_schema!({
+        let mut empty_action_name = json_schema!({
             "type": "string",
             "const": ""
         });
         let no_action_message = "No action named this.";
-        add_description(&mut plain_action, no_action_message.to_owned());
-        add_deprecation(&mut plain_action, no_action_message.to_owned());
-
-        let mut matches_action_name = json_schema!({
-            "const": ""
-        });
-        let no_action_message_input = "No action named this that takes input.";
-        add_description(&mut matches_action_name, no_action_message_input.to_owned());
-        add_deprecation(&mut matches_action_name, no_action_message_input.to_owned());
-
-        let action_with_input = json_schema!({
+        add_description(&mut empty_action_name, no_action_message);
+        add_deprecation(&mut empty_action_name, no_action_message.to_string());
+        let empty_action_name_with_input = json_schema!({
             "type": "array",
             "items": [
-                matches_action_name,
+                empty_action_name,
                 true
             ],
             "minItems": 2,
             "maxItems": 2
         });
-        let mut keymap_action_alternatives = vec![plain_action, action_with_input];
+        let mut keymap_action_alternatives = vec![empty_action_name, empty_action_name_with_input];
 
+        let mut empty_schema_action_names = vec![];
         for (name, action_schema) in action_schemas.into_iter() {
             let description = action_schema.as_ref().and_then(|schema| {
                 schema
@@ -527,8 +523,8 @@ impl KeymapFile {
             } else if let Some(new_name) = deprecation {
                 add_deprecation_preferred_name(&mut plain_action, new_name);
             }
-            if let Some(desc) = description.clone() {
-                add_description(&mut plain_action, desc);
+            if let Some(description) = &description {
+                add_description(&mut plain_action, description);
             }
             keymap_action_alternatives.push(plain_action);
 
@@ -542,8 +538,8 @@ impl KeymapFile {
                 let mut matches_action_name = json_schema!({
                     "const": name
                 });
-                if let Some(desc) = description.clone() {
-                    add_description(&mut matches_action_name, desc);
+                if let Some(description) = &description {
+                    add_description(&mut matches_action_name, description);
                 }
                 if let Some(message) = deprecation_messages.get(name) {
                     add_deprecation(&mut matches_action_name, message.to_string());
@@ -557,9 +553,31 @@ impl KeymapFile {
                     "maxItems": 2
                 });
                 keymap_action_alternatives.push(action_with_input);
+            } else {
+                empty_schema_action_names.push(name);
             }
         }
 
+        if !empty_schema_action_names.is_empty() {
+            let action_names = json_schema!({ "enum": empty_schema_action_names });
+            let no_properties_allowed = json_schema!({
+                "type": "object",
+                "additionalProperties": false
+            });
+            let mut actions_with_empty_input = json_schema!({
+                "type": "array",
+                "items": [action_names, no_properties_allowed],
+                "minItems": 2,
+                "maxItems": 2
+            });
+            add_deprecation(
+                &mut actions_with_empty_input,
+                "This action does not take input - just the action name string should be used."
+                    .to_string(),
+            );
+            keymap_action_alternatives.push(actions_with_empty_input);
+        }
+
         // Placing null first causes json-language-server to default assuming actions should be
         // null, so place it last.
         keymap_action_alternatives.push(json_schema!({
diff --git a/docs/src/vim.md b/docs/src/vim.md
index a1c79b531d..b55faaf3b6 100644
--- a/docs/src/vim.md
+++ b/docs/src/vim.md
@@ -490,7 +490,7 @@ Vim mode comes with shortcuts to surround the selection in normal mode (`ys`), b
 {
   "context": "vim_mode == visual",
   "bindings": {
-    "shift-s": ["vim::PushAddSurrounds", {}]
+    "shift-s": "vim::PushAddSurrounds"
   }
 }
 ```

From bd0a5dd6649631d6fa346e49427cc7a70c3c15c6 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Tue, 9 Sep 2025 15:13:12 -0600
Subject: [PATCH 745/823] Potentially fix welcome banner in agent panel not
 going away (#37879)

Potentially fixes #37367. Just going ahead with the change even though
it's unclear whether this is the fix, since it is quite low risk.

Release Notes:

- N/A
---
 crates/agent_ui/src/agent_panel.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index a35ed6be42..3cba74aeae 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -3008,6 +3008,9 @@ impl AgentPanel {
             _ => {
                 let history_is_empty = if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                     self.acp_history_store.read(cx).is_empty(cx)
+                        && self
+                            .history_store
+                            .update(cx, |store, cx| store.recent_entries(1, cx).is_empty())
                 } else {
                     self.history_store
                         .update(cx, |store, cx| store.recent_entries(1, cx).is_empty())

From 9c548a0ec6d8b84e2b3b1ee2a78add5fae7a8ba7 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 10 Sep 2025 05:17:36 +0530
Subject: [PATCH 746/823] workspace: Fix tab bar drop target height when no
 unpinned tabs present (#37884)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before:
<img width="846" height="192" alt="Screenshot 2025-09-10 at 4 44 18 AM"
src="https://github.com/user-attachments/assets/3c79e140-e2b2-4e50-9fce-cb182e46d878"
/>

After:
<img width="846" height="192" alt="Screenshot 2025-09-10 at 4 43 13 AM"
src="https://github.com/user-attachments/assets/b5fa853d-ce39-4c81-9773-1d84eebc8cbb"
/>

Release Notes:

- Fixed height of the drop background in the tab bar when no unpinned
tabs are present.
---
 crates/workspace/src/pane.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index b3b16acd4f..71a9b89f0a 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2997,7 +2997,8 @@ impl Pane {
                             // HACK: This empty child is currently necessary to force the drop target to appear
                             // despite us setting a min width above.
                             .child("")
-                            .h_full()
+                            // HACK: h_full doesn't occupy the complete height, using fixed height instead
+                            .h(Tab::container_height(cx))
                             .flex_grow()
                             .drag_over::<DraggedTab>(|bar, _, _, cx| {
                                 bar.bg(cx.theme().colors().drop_target_background)

From fcdd427cf8ab2f8e536aeca7c2c515e19b377b9c Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 10 Sep 2025 08:34:42 +0300
Subject: [PATCH 747/823] Revert "markdown: Add support for inline HTML `img`
 tags inside text (#37264)" (#37893)

This reverts commit e1a5d299721bf14a7cdd41a5ae1bd03ea948c00e.

This have regressed Zed release notes' wrapping which we do not want to
do on a release day:
https://github.com/zed-industries/zed/pull/37264#issuecomment-3265420442

Release Notes:

- N/A
---
 .../markdown_preview/src/markdown_elements.rs |   2 +-
 .../markdown_preview/src/markdown_parser.rs   | 250 ++++++------------
 .../markdown_preview/src/markdown_renderer.rs |   6 +-
 3 files changed, 86 insertions(+), 172 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_elements.rs b/crates/markdown_preview/src/markdown_elements.rs
index b7ec68951e..560e468439 100644
--- a/crates/markdown_preview/src/markdown_elements.rs
+++ b/crates/markdown_preview/src/markdown_elements.rs
@@ -155,7 +155,7 @@ pub struct ParsedMarkdownText {
     /// Where the text is located in the source Markdown document.
     pub source_range: Range<usize>,
     /// The text content stripped of any formatting symbols.
-    pub contents: SharedString,
+    pub contents: String,
     /// The list of highlights contained in the Markdown document.
     pub highlights: Vec<(Range<usize>, MarkdownHighlight)>,
     /// The regions of the various ranges in the Markdown document.
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
index d47db4dfe4..1b116c50d9 100644
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -353,7 +353,7 @@ impl<'a> MarkdownParser<'a> {
                         if !text.is_empty() {
                             let parsed_regions = MarkdownParagraphChunk::Text(ParsedMarkdownText {
                                 source_range: source_range.clone(),
-                                contents: text.into(),
+                                contents: text.clone(),
                                 highlights: highlights.clone(),
                                 region_ranges: region_ranges.clone(),
                                 regions: regions.clone(),
@@ -408,7 +408,7 @@ impl<'a> MarkdownParser<'a> {
         if !text.is_empty() {
             markdown_text_like.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
                 source_range,
-                contents: text.into(),
+                contents: text,
                 highlights,
                 regions,
                 region_ranges,
@@ -808,14 +808,15 @@ impl<'a> MarkdownParser<'a> {
             markup5ever_rcdom::NodeData::Document => {
                 self.consume_children(source_range, node, elements);
             }
+            markup5ever_rcdom::NodeData::Doctype { .. } => {}
             markup5ever_rcdom::NodeData::Text { contents } => {
                 elements.push(ParsedMarkdownElement::Paragraph(vec![
                     MarkdownParagraphChunk::Text(ParsedMarkdownText {
                         source_range,
-                        regions: Vec::default(),
-                        region_ranges: Vec::default(),
+                        contents: contents.borrow().to_string(),
                         highlights: Vec::default(),
-                        contents: contents.borrow().to_string().into(),
+                        region_ranges: Vec::default(),
+                        regions: Vec::default(),
                     }),
                 ]));
             }
@@ -825,64 +826,11 @@ impl<'a> MarkdownParser<'a> {
                     if let Some(image) = self.extract_image(source_range, attrs) {
                         elements.push(ParsedMarkdownElement::Image(image));
                     }
-                } else if local_name!("p") == name.local {
-                    self.parse_paragraph(
-                        source_range,
-                        node,
-                        &mut MarkdownParagraph::new(),
-                        elements,
-                    );
                 } else {
                     self.consume_children(source_range, node, elements);
                 }
             }
-            _ => {}
-        }
-    }
-
-    fn parse_paragraph(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-        paragraph: &mut MarkdownParagraph,
-        elements: &mut Vec<ParsedMarkdownElement>,
-    ) {
-        match &node.data {
-            markup5ever_rcdom::NodeData::Text { contents } => {
-                paragraph.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                    source_range,
-                    regions: Vec::default(),
-                    region_ranges: Vec::default(),
-                    highlights: Vec::default(),
-                    contents: contents.borrow().to_string().into(),
-                }));
-            }
-            markup5ever_rcdom::NodeData::Element { name, attrs, .. } => {
-                if local_name!("img") == name.local {
-                    if let Some(image) = self.extract_image(source_range, attrs) {
-                        paragraph.push(MarkdownParagraphChunk::Image(image));
-                    }
-                } else {
-                    self.consume_paragraph(source_range, node, paragraph, elements);
-
-                    if !paragraph.is_empty() {
-                        elements.push(ParsedMarkdownElement::Paragraph(std::mem::take(paragraph)));
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn consume_paragraph(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-        paragraph: &mut MarkdownParagraph,
-        elements: &mut Vec<ParsedMarkdownElement>,
-    ) {
-        for node in node.children.borrow().iter() {
-            self.parse_paragraph(source_range.clone(), node, paragraph, elements);
+            markup5ever_rcdom::NodeData::ProcessingInstruction { .. } => {}
         }
     }
 
@@ -947,14 +895,14 @@ impl<'a> MarkdownParser<'a> {
 
         if let Some(width) = Self::attr_value(attrs, local_name!("width"))
             .or_else(|| styles.get("width").cloned())
-            .and_then(|width| Self::parse_html_element_dimension(&width))
+            .and_then(|width| Self::parse_length(&width))
         {
             image.set_width(width);
         }
 
         if let Some(height) = Self::attr_value(attrs, local_name!("height"))
             .or_else(|| styles.get("height").cloned())
-            .and_then(|height| Self::parse_html_element_dimension(&height))
+            .and_then(|height| Self::parse_length(&height))
         {
             image.set_height(height);
         }
@@ -962,7 +910,8 @@ impl<'a> MarkdownParser<'a> {
         Some(image)
     }
 
-    fn parse_html_element_dimension(value: &str) -> Option<DefiniteLength> {
+    /// Parses the width/height attribute value of an html element (e.g. img element)
+    fn parse_length(value: &str) -> Option<DefiniteLength> {
         if value.ends_with("%") {
             value
                 .trim_end_matches("%")
@@ -1061,7 +1010,7 @@ mod tests {
             ParsedMarkdownElement::Paragraph(vec![MarkdownParagraphChunk::Text(
                 ParsedMarkdownText {
                     source_range: 0..35,
-                    contents: "Some bostrikethroughld text".into(),
+                    contents: "Some bostrikethroughld text".to_string(),
                     highlights: Vec::new(),
                     region_ranges: Vec::new(),
                     regions: Vec::new(),
@@ -1235,7 +1184,7 @@ mod tests {
                 }),
                 MarkdownParagraphChunk::Text(ParsedMarkdownText {
                     source_range: 0..81,
-                    contents: " Lorem Ipsum ".into(),
+                    contents: " Lorem Ipsum ".to_string(),
                     highlights: Vec::new(),
                     region_ranges: Vec::new(),
                     regions: Vec::new(),
@@ -1254,130 +1203,90 @@ mod tests {
     }
 
     #[test]
-    fn test_parse_html_element_dimension() {
+    fn test_parse_length() {
         // Test percentage values
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("50%"),
+            MarkdownParser::parse_length("50%"),
             Some(DefiniteLength::Fraction(0.5))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100%"),
+            MarkdownParser::parse_length("100%"),
             Some(DefiniteLength::Fraction(1.0))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("25%"),
+            MarkdownParser::parse_length("25%"),
             Some(DefiniteLength::Fraction(0.25))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("0%"),
+            MarkdownParser::parse_length("0%"),
             Some(DefiniteLength::Fraction(0.0))
         );
 
         // Test pixel values
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100px"),
+            MarkdownParser::parse_length("100px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("50px"),
+            MarkdownParser::parse_length("50px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(50.0))))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("0px"),
+            MarkdownParser::parse_length("0px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(0.0))))
         );
 
         // Test values without units (should be treated as pixels)
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100"),
+            MarkdownParser::parse_length("100"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("42"),
+            MarkdownParser::parse_length("42"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
         );
 
         // Test invalid values
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("invalid"),
-            None
-        );
-        assert_eq!(MarkdownParser::parse_html_element_dimension("px"), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension("%"), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension(""), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension("abc%"), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension("abcpx"), None);
+        assert_eq!(MarkdownParser::parse_length("invalid"), None);
+        assert_eq!(MarkdownParser::parse_length("px"), None);
+        assert_eq!(MarkdownParser::parse_length("%"), None);
+        assert_eq!(MarkdownParser::parse_length(""), None);
+        assert_eq!(MarkdownParser::parse_length("abc%"), None);
+        assert_eq!(MarkdownParser::parse_length("abcpx"), None);
 
         // Test decimal values
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("50.5%"),
+            MarkdownParser::parse_length("50.5%"),
             Some(DefiniteLength::Fraction(0.505))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100.25px"),
+            MarkdownParser::parse_length("100.25px"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.25))))
         );
         assert_eq!(
-            MarkdownParser::parse_html_element_dimension("42.0"),
+            MarkdownParser::parse_length("42.0"),
             Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
         );
     }
 
-    #[gpui::test]
-    async fn test_inline_html_image_tag() {
-        let parsed =
-            parse("<p>Some text<img src=\"http://example.com/foo.png\" /> some more text</p>")
-                .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Paragraph(vec![
-                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range: 0..71,
-                        contents: "Some text".into(),
-                        highlights: Default::default(),
-                        region_ranges: Default::default(),
-                        regions: Default::default()
-                    }),
-                    MarkdownParagraphChunk::Image(Image {
-                        source_range: 0..71,
-                        link: Link::Web {
-                            url: "http://example.com/foo.png".to_string(),
-                        },
-                        alt_text: None,
-                        height: None,
-                        width: None,
-                    }),
-                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range: 0..71,
-                        contents: " some more text".into(),
-                        highlights: Default::default(),
-                        region_ranges: Default::default(),
-                        regions: Default::default()
-                    }),
-                ])]
-            },
-            parsed
-        );
-    }
-
     #[gpui::test]
     async fn test_html_image_tag() {
         let parsed = parse("<img src=\"http://example.com/foo.png\" />").await;
 
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
         assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..40,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: None,
-                    height: None,
-                    width: None,
-                })]
+            image.clone(),
+            Image {
+                source_range: 0..40,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: None,
+                height: None,
+                width: None,
             },
-            parsed
         );
     }
 
@@ -1385,19 +1294,20 @@ mod tests {
     async fn test_html_image_tag_with_alt_text() {
         let parsed = parse("<img src=\"http://example.com/foo.png\" alt=\"Foo\" />").await;
 
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
         assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..50,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: Some("Foo".into()),
-                    height: None,
-                    width: None,
-                })]
+            image.clone(),
+            Image {
+                source_range: 0..50,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: Some("Foo".into()),
+                height: None,
+                width: None,
             },
-            parsed
         );
     }
 
@@ -1406,19 +1316,20 @@ mod tests {
         let parsed =
             parse("<img src=\"http://example.com/foo.png\" height=\"100\" width=\"200\" />").await;
 
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
         assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..65,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: None,
-                    height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
-                    width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
-                })]
+            image.clone(),
+            Image {
+                source_range: 0..65,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: None,
+                height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
+                width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
             },
-            parsed
         );
     }
 
@@ -1429,19 +1340,20 @@ mod tests {
         )
         .await;
 
+        let ParsedMarkdownElement::Image(image) = &parsed.children[0] else {
+            panic!("Expected a image element");
+        };
         assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..75,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: None,
-                    height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
-                    width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
-                })]
+            image.clone(),
+            Image {
+                source_range: 0..75,
+                link: Link::Web {
+                    url: "http://example.com/foo.png".to_string(),
+                },
+                alt_text: None,
+                height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
+                width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
             },
-            parsed
         );
     }
 
@@ -1892,7 +1804,7 @@ fn main() {
             region_ranges: Vec::new(),
             regions: Vec::new(),
             source_range,
-            contents: contents.to_string().into(),
+            contents: contents.to_string(),
         })]
     }
 
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index 4525db3835..5835797d9e 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -628,13 +628,15 @@ fn render_markdown_code_block(
 }
 
 fn render_markdown_paragraph(parsed: &MarkdownParagraph, cx: &mut RenderContext) -> AnyElement {
-    cx.with_common_p(h_flex().flex_wrap())
+    cx.with_common_p(div())
         .children(render_markdown_text(parsed, cx))
+        .flex()
+        .flex_col()
         .into_any_element()
 }
 
 fn render_markdown_text(parsed_new: &MarkdownParagraph, cx: &mut RenderContext) -> Vec<AnyElement> {
-    let mut any_element = Vec::with_capacity(parsed_new.len());
+    let mut any_element = vec![];
     // these values are cloned in-order satisfy borrow checker
     let syntax_theme = cx.syntax_theme.clone();
     let workspace_clone = cx.workspace.clone();

From df2d097dc51e3cc9387553b501fc4c44fa609841 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 10 Sep 2025 15:08:32 +0200
Subject: [PATCH 748/823] editor: Fix adjacent custom highlights interfering
 with each other (#37912)

Release Notes:

- Fixed matching bracket highlighting not highlighting closing brackets
when adjacent to each other

Co-authored-by: Finn Evers <finn@zed.dev>
---
 crates/editor/src/display_map.rs              |  4 ++--
 .../src/display_map/custom_highlights.rs      | 24 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 3a07ee45af..fd4e762fb2 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -2609,7 +2609,7 @@ pub mod tests {
         );
         language.set_theme(&theme);
 
-        let (text, highlighted_ranges) = marked_text_ranges(r#"constˇ «a»: B = "c «d»""#, false);
+        let (text, highlighted_ranges) = marked_text_ranges(r#"constˇ «a»«:» B = "c «d»""#, false);
 
         let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
         cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
@@ -2658,7 +2658,7 @@ pub mod tests {
             [
                 ("const ".to_string(), None, None),
                 ("a".to_string(), None, Some(Hsla::blue())),
-                (":".to_string(), Some(Hsla::red()), None),
+                (":".to_string(), Some(Hsla::red()), Some(Hsla::blue())),
                 (" B = ".to_string(), None, None),
                 ("\"c ".to_string(), Some(Hsla::green()), None),
                 ("d".to_string(), Some(Hsla::green()), Some(Hsla::blue())),
diff --git a/crates/editor/src/display_map/custom_highlights.rs b/crates/editor/src/display_map/custom_highlights.rs
index f3737ea4b7..0fb2a893d9 100644
--- a/crates/editor/src/display_map/custom_highlights.rs
+++ b/crates/editor/src/display_map/custom_highlights.rs
@@ -25,9 +25,8 @@ pub struct CustomHighlightsChunks<'a> {
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 struct HighlightEndpoint {
     offset: usize,
-    is_start: bool,
     tag: HighlightKey,
-    style: HighlightStyle,
+    style: Option<HighlightStyle>,
 }
 
 impl<'a> CustomHighlightsChunks<'a> {
@@ -92,17 +91,20 @@ fn create_highlight_endpoints(
                     break;
                 }
 
+                let start = range.start.to_offset(buffer);
+                let end = range.end.to_offset(buffer);
+                if start == end {
+                    continue;
+                }
                 highlight_endpoints.push(HighlightEndpoint {
-                    offset: range.start.to_offset(buffer),
-                    is_start: true,
+                    offset: start,
                     tag,
-                    style,
+                    style: Some(style),
                 });
                 highlight_endpoints.push(HighlightEndpoint {
-                    offset: range.end.to_offset(buffer),
-                    is_start: false,
+                    offset: end,
                     tag,
-                    style,
+                    style: None,
                 });
             }
         }
@@ -118,8 +120,8 @@ impl<'a> Iterator for CustomHighlightsChunks<'a> {
         let mut next_highlight_endpoint = usize::MAX;
         while let Some(endpoint) = self.highlight_endpoints.peek().copied() {
             if endpoint.offset <= self.offset {
-                if endpoint.is_start {
-                    self.active_highlights.insert(endpoint.tag, endpoint.style);
+                if let Some(style) = endpoint.style {
+                    self.active_highlights.insert(endpoint.tag, style);
                 } else {
                     self.active_highlights.remove(&endpoint.tag);
                 }
@@ -168,6 +170,6 @@ impl Ord for HighlightEndpoint {
     fn cmp(&self, other: &Self) -> cmp::Ordering {
         self.offset
             .cmp(&other.offset)
-            .then_with(|| other.is_start.cmp(&self.is_start))
+            .then_with(|| self.style.is_some().cmp(&other.style.is_some()))
     }
 }

From 2cf3def716a714aa3585a94751f91fc977e107c5 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 10 Sep 2025 15:23:46 +0200
Subject: [PATCH 749/823] acp: Add keybindings for authorizing tool calls
 (#37876)

TODO:
- [x] Double-check if we like the naming of the new actions
- [x] Only show keybinding hint once per option (e.g. if there are two
`allow_once` buttons only show it on the first one)
- [x] If there are multiple tool calls that need authorisation, only
show keybindings on the first tool call
- [x] Figure out which keybindings to use
- [x] Add linux keybindings
- [x] Add windows keybindings
- [x] Bug: long keybindings can make the buttons overflow


Release Notes:

- Add keybindings for authorizing tool calls (`agent: Allow once`,
`agent: Allow always`, `agent: Reject once`) in the agent panel

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 Cargo.lock                             |   1 +
 assets/keymaps/default-linux.json      |   5 +-
 assets/keymaps/default-macos.json      |   7 +-
 assets/keymaps/default-windows.json    |   5 +-
 crates/acp_thread/src/acp_thread.rs    |  36 +++---
 crates/agent_ui/Cargo.toml             |   1 +
 crates/agent_ui/src/acp/thread_view.rs | 171 ++++++++++++++++---------
 crates/agent_ui/src/agent_ui.rs        |   6 +
 8 files changed, 151 insertions(+), 81 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8aaea1a1f8..0adb517ad0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -355,6 +355,7 @@ dependencies = [
  "agent_settings",
  "ai_onboarding",
  "anyhow",
+ "arrayvec",
  "assistant_context",
  "assistant_slash_command",
  "assistant_slash_commands",
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 6ad2244fa8..700c7e8d8c 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -247,7 +247,10 @@
       "ctrl-shift-e": "project_panel::ToggleFocus",
       "ctrl-shift-enter": "agent::ContinueThread",
       "super-ctrl-b": "agent::ToggleBurnMode",
-      "alt-enter": "agent::ContinueWithBurnMode"
+      "alt-enter": "agent::ContinueWithBurnMode",
+      "ctrl-y": "agent::AllowOnce",
+      "ctrl-alt-y": "agent::AllowAlways",
+      "ctrl-d": "agent::RejectOnce"
     }
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 9f13fc3079..7c85e6e582 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -218,7 +218,7 @@
     }
   },
   {
-    "context": "Editor && !agent_diff",
+    "context": "Editor && !agent_diff && !AgentPanel",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-alt-z": "git::Restore",
@@ -286,7 +286,10 @@
       "cmd-shift-e": "project_panel::ToggleFocus",
       "cmd-ctrl-b": "agent::ToggleBurnMode",
       "cmd-shift-enter": "agent::ContinueThread",
-      "alt-enter": "agent::ContinueWithBurnMode"
+      "alt-enter": "agent::ContinueWithBurnMode",
+      "cmd-y": "agent::AllowOnce",
+      "cmd-alt-y": "agent::AllowAlways",
+      "cmd-d": "agent::RejectOnce"
     }
   },
   {
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 9d040372c6..0e9f193bd1 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -249,7 +249,10 @@
       "ctrl-shift-e": "project_panel::ToggleFocus",
       "ctrl-shift-enter": "agent::ContinueThread",
       "super-ctrl-b": "agent::ToggleBurnMode",
-      "alt-enter": "agent::ContinueWithBurnMode"
+      "alt-enter": "agent::ContinueWithBurnMode",
+      "ctrl-y": "agent::AllowOnce",
+      "ctrl-alt-y": "agent::AllowAlways",
+      "ctrl-d": "agent::RejectOnce"
     }
   },
   {
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 085ddfc50d..c7279abdc6 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -813,7 +813,6 @@ impl EventEmitter<AcpThreadEvent> for AcpThread {}
 #[derive(PartialEq, Eq, Debug)]
 pub enum ThreadStatus {
     Idle,
-    WaitingForToolConfirmation,
     Generating,
 }
 
@@ -936,11 +935,7 @@ impl AcpThread {
 
     pub fn status(&self) -> ThreadStatus {
         if self.send_task.is_some() {
-            if self.waiting_for_tool_confirmation() {
-                ThreadStatus::WaitingForToolConfirmation
-            } else {
-                ThreadStatus::Generating
-            }
+            ThreadStatus::Generating
         } else {
             ThreadStatus::Idle
         }
@@ -1382,26 +1377,27 @@ impl AcpThread {
         cx.emit(AcpThreadEvent::EntryUpdated(ix));
     }
 
-    /// Returns true if the last turn is awaiting tool authorization
-    pub fn waiting_for_tool_confirmation(&self) -> bool {
+    pub fn first_tool_awaiting_confirmation(&self) -> Option<&ToolCall> {
+        let mut first_tool_call = None;
+
         for entry in self.entries.iter().rev() {
             match &entry {
-                AgentThreadEntry::ToolCall(call) => match call.status {
-                    ToolCallStatus::WaitingForConfirmation { .. } => return true,
-                    ToolCallStatus::Pending
-                    | ToolCallStatus::InProgress
-                    | ToolCallStatus::Completed
-                    | ToolCallStatus::Failed
-                    | ToolCallStatus::Rejected
-                    | ToolCallStatus::Canceled => continue,
-                },
+                AgentThreadEntry::ToolCall(call) => {
+                    if let ToolCallStatus::WaitingForConfirmation { .. } = call.status {
+                        first_tool_call = Some(call);
+                    } else {
+                        continue;
+                    }
+                }
                 AgentThreadEntry::UserMessage(_) | AgentThreadEntry::AssistantMessage(_) => {
-                    // Reached the beginning of the turn
-                    return false;
+                    // Reached the beginning of the turn.
+                    // If we had pending permission requests in the previous turn, they have been cancelled.
+                    break;
                 }
             }
         }
-        false
+
+        first_tool_call
     }
 
     pub fn plan(&self) -> &Plan {
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 6c8b952880..eaa058467f 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -25,6 +25,7 @@ agent_servers.workspace = true
 agent_settings.workspace = true
 ai_onboarding.workspace = true
 anyhow.workspace = true
+arrayvec.workspace = true
 assistant_context.workspace = true
 assistant_slash_command.workspace = true
 assistant_slash_commands.workspace = true
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 5c21ab81ea..dc427dfd37 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -10,6 +10,7 @@ use agent_servers::{AgentServer, AgentServerDelegate};
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode, NotifyWhenAgentWaiting};
 use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
 use anyhow::{Context as _, Result, anyhow, bail};
+use arrayvec::ArrayVec;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use client::zed_urls;
@@ -65,9 +66,9 @@ use crate::ui::{
     AgentNotification, AgentNotificationEvent, BurnModeTooltip, UnavailableEditingTooltip,
 };
 use crate::{
-    AgentDiffPane, AgentPanel, ContinueThread, ContinueWithBurnMode, CycleModeSelector,
-    ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, OpenHistory, RejectAll, ToggleBurnMode,
-    ToggleProfileSelector,
+    AgentDiffPane, AgentPanel, AllowAlways, AllowOnce, ContinueThread, ContinueWithBurnMode,
+    CycleModeSelector, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, OpenHistory, RejectAll,
+    RejectOnce, ToggleBurnMode, ToggleProfileSelector,
 };
 
 pub const MIN_EDITOR_LINES: usize = 4;
@@ -2167,6 +2168,7 @@ impl AcpThreadView {
                             options,
                             entry_ix,
                             tool_call.id.clone(),
+                            window,
                             cx,
                         ))
                         .into_any(),
@@ -2469,69 +2471,85 @@ impl AcpThreadView {
         options: &[acp::PermissionOption],
         entry_ix: usize,
         tool_call_id: acp::ToolCallId,
+        window: &Window,
         cx: &Context<Self>,
     ) -> Div {
-        h_flex()
-            .py_1()
-            .px_1()
-            .gap_1()
-            .justify_between()
-            .flex_wrap()
+        let is_first = self.thread().is_some_and(|thread| {
+            thread
+                .read(cx)
+                .first_tool_awaiting_confirmation()
+                .is_some_and(|call| call.id == tool_call_id)
+        });
+        let mut seen_kinds: ArrayVec<acp::PermissionOptionKind, 3> = ArrayVec::new();
+
+        div()
+            .p_1()
             .border_t_1()
             .border_color(self.tool_card_border_color(cx))
-            .when(kind != acp::ToolKind::SwitchMode, |this| {
-                this.pl_2().child(
-                    div().min_w(rems_from_px(145.)).child(
-                        LoadingLabel::new("Waiting for Confirmation").size(LabelSize::Small),
-                    ),
-                )
+            .w_full()
+            .map(|this| {
+                if kind == acp::ToolKind::SwitchMode {
+                    this.v_flex()
+                } else {
+                    this.h_flex().justify_end().flex_wrap()
+                }
             })
-            .child({
-                div()
+            .gap_0p5()
+            .children(options.iter().map(move |option| {
+                let option_id = SharedString::from(option.id.0.clone());
+                Button::new((option_id, entry_ix), option.name.clone())
                     .map(|this| {
-                        if kind == acp::ToolKind::SwitchMode {
-                            this.w_full().v_flex()
-                        } else {
-                            this.h_flex()
+                        let (this, action) = match option.kind {
+                            acp::PermissionOptionKind::AllowOnce => (
+                                this.icon(IconName::Check).icon_color(Color::Success),
+                                Some(&AllowOnce as &dyn Action),
+                            ),
+                            acp::PermissionOptionKind::AllowAlways => (
+                                this.icon(IconName::CheckDouble).icon_color(Color::Success),
+                                Some(&AllowAlways as &dyn Action),
+                            ),
+                            acp::PermissionOptionKind::RejectOnce => (
+                                this.icon(IconName::Close).icon_color(Color::Error),
+                                Some(&RejectOnce as &dyn Action),
+                            ),
+                            acp::PermissionOptionKind::RejectAlways => {
+                                (this.icon(IconName::Close).icon_color(Color::Error), None)
+                            }
+                        };
+
+                        let Some(action) = action else {
+                            return this;
+                        };
+
+                        if !is_first || seen_kinds.contains(&option.kind) {
+                            return this;
                         }
+
+                        seen_kinds.push(option.kind);
+
+                        this.key_binding(
+                            KeyBinding::for_action_in(action, &self.focus_handle, window, cx)
+                                .map(|kb| kb.size(rems_from_px(10.))),
+                        )
                     })
-                    .gap_0p5()
-                    .children(options.iter().map(|option| {
-                        let option_id = SharedString::from(option.id.0.clone());
-                        Button::new((option_id, entry_ix), option.name.clone())
-                            .map(|this| match option.kind {
-                                acp::PermissionOptionKind::AllowOnce => {
-                                    this.icon(IconName::Check).icon_color(Color::Success)
-                                }
-                                acp::PermissionOptionKind::AllowAlways => {
-                                    this.icon(IconName::CheckDouble).icon_color(Color::Success)
-                                }
-                                acp::PermissionOptionKind::RejectOnce => {
-                                    this.icon(IconName::Close).icon_color(Color::Error)
-                                }
-                                acp::PermissionOptionKind::RejectAlways => {
-                                    this.icon(IconName::Close).icon_color(Color::Error)
-                                }
-                            })
-                            .icon_position(IconPosition::Start)
-                            .icon_size(IconSize::XSmall)
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener({
-                                let tool_call_id = tool_call_id.clone();
-                                let option_id = option.id.clone();
-                                let option_kind = option.kind;
-                                move |this, _, window, cx| {
-                                    this.authorize_tool_call(
-                                        tool_call_id.clone(),
-                                        option_id.clone(),
-                                        option_kind,
-                                        window,
-                                        cx,
-                                    );
-                                }
-                            }))
+                    .icon_position(IconPosition::Start)
+                    .icon_size(IconSize::XSmall)
+                    .label_size(LabelSize::Small)
+                    .on_click(cx.listener({
+                        let tool_call_id = tool_call_id.clone();
+                        let option_id = option.id.clone();
+                        let option_kind = option.kind;
+                        move |this, _, window, cx| {
+                            this.authorize_tool_call(
+                                tool_call_id.clone(),
+                                option_id.clone(),
+                                option_kind,
+                                window,
+                                cx,
+                            );
+                        }
                     }))
-            })
+            }))
     }
 
     fn render_diff_loading(&self, cx: &Context<Self>) -> AnyElement {
@@ -3978,6 +3996,42 @@ impl AcpThreadView {
             .detach();
     }
 
+    fn allow_always(&mut self, _: &AllowAlways, window: &mut Window, cx: &mut Context<Self>) {
+        self.authorize_pending_tool_call(acp::PermissionOptionKind::AllowAlways, window, cx);
+    }
+
+    fn allow_once(&mut self, _: &AllowOnce, window: &mut Window, cx: &mut Context<Self>) {
+        self.authorize_pending_tool_call(acp::PermissionOptionKind::AllowOnce, window, cx);
+    }
+
+    fn reject_once(&mut self, _: &RejectOnce, window: &mut Window, cx: &mut Context<Self>) {
+        self.authorize_pending_tool_call(acp::PermissionOptionKind::RejectOnce, window, cx);
+    }
+
+    fn authorize_pending_tool_call(
+        &mut self,
+        kind: acp::PermissionOptionKind,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<()> {
+        let thread = self.thread()?.read(cx);
+        let tool_call = thread.first_tool_awaiting_confirmation()?;
+        let ToolCallStatus::WaitingForConfirmation { options, .. } = &tool_call.status else {
+            return None;
+        };
+        let option = options.iter().find(|o| o.kind == kind)?;
+
+        self.authorize_tool_call(
+            tool_call.id.clone(),
+            option.id.clone(),
+            option.kind,
+            window,
+            cx,
+        );
+
+        Some(())
+    }
+
     fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let thread = self.as_native_thread(cx)?.read(cx);
 
@@ -5299,6 +5353,9 @@ impl Render for AcpThreadView {
             .on_action(cx.listener(Self::toggle_burn_mode))
             .on_action(cx.listener(Self::keep_all))
             .on_action(cx.listener(Self::reject_all))
+            .on_action(cx.listener(Self::allow_always))
+            .on_action(cx.listener(Self::allow_once))
+            .on_action(cx.listener(Self::reject_once))
             .track_focus(&self.focus_handle)
             .bg(cx.theme().colors().panel_background)
             .child(match &self.thread_state {
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 67330e5ea0..09d2179fc3 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -116,6 +116,12 @@ actions!(
         RejectAll,
         /// Keeps all suggestions or changes.
         KeepAll,
+        /// Allow this operation only this time.
+        AllowOnce,
+        /// Allow this operation and remember the choice.
+        AllowAlways,
+        /// Reject this operation only this time.
+        RejectOnce,
         /// Follows the agent's suggestions.
         Follow,
         /// Resets the trial upsell notification.

From d110d325d403c6b7d99f226961cc6405e49a332c Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Wed, 10 Sep 2025 15:35:16 +0200
Subject: [PATCH 750/823] languages: Remove broken pixi environment activation
 (#37915)

Closes [#ISSUE](https://github.com/zed-industries/zed/issues/37895)

This needs more thought behind it to be implemented properly

Release Notes:

- N/A
---
 crates/languages/src/python.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index b05f290197..ede46b38e5 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -892,10 +892,6 @@ impl ToolchainLister for PythonToolchainProvider {
         let mut activation_script = vec![];
 
         match toolchain.kind {
-            Some(PythonEnvironmentKind::Pixi) => {
-                let env = toolchain.name.as_deref().unwrap_or("default");
-                activation_script.push(format!("pixi shell -e {env}"))
-            }
             Some(PythonEnvironmentKind::Conda) => {
                 if let Some(name) = &toolchain.name {
                     activation_script.push(format!("conda activate {name}"));

From fb3c9911121cea46ea845f2f532c15b89cf69b8e Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 10 Sep 2025 10:39:37 -0400
Subject: [PATCH 751/823] Bump Zed to v0.205 (#37917)

Release Notes:

-N/A
---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0adb517ad0..90bae2b491 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20372,7 +20372,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.204.0"
+version = "0.205.0"
 dependencies = [
  "acp_tools",
  "activity_indicator",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 4341a77fc7..fd8350e8df 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition.workspace = true
 name = "zed"
-version = "0.204.0"
+version = "0.205.0"
 publish.workspace = true
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]

From acb3406eb883929a28317356d6296ff5b1621091 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 10 Sep 2025 17:38:19 +0200
Subject: [PATCH 752/823] editor: Wrap placeholder if text overflows (#37919)

This fixes an issue where long placeholders would be cut off, e.g. in a
Claude Code thread:

<img width="387" height="115" alt="image"
src="https://github.com/user-attachments/assets/831a54aa-cf2b-4d87-af86-e368a5936f6b"
/>

Now:

<img width="354" height="115" alt="image"
src="https://github.com/user-attachments/assets/e5df5e05-0869-4db2-8dee-38611263191c"
/>


Most of the changes in this PR are caused by us requiring `&mut Window`
in `set_placeholder_text`.

Release Notes:

- Fixed an issue where placeholders inside editors would not wrap

---------

Co-authored-by: Agus Zubiaga <agus@zed.dev>
---
 crates/agent_ui/src/acp/message_editor.rs     |  4 +-
 crates/agent_ui/src/acp/thread_history.rs     |  2 +-
 crates/agent_ui/src/acp/thread_view.rs        |  3 +-
 crates/agent_ui/src/active_thread.rs          |  1 +
 .../manage_profiles_modal.rs                  |  2 +-
 crates/agent_ui/src/inline_prompt_editor.rs   |  6 +-
 crates/agent_ui/src/message_editor.rs         |  2 +-
 crates/agent_ui/src/thread_history.rs         |  2 +-
 crates/collab_ui/src/collab_panel.rs          |  2 +-
 crates/debugger_ui/src/new_process_modal.rs   |  4 +-
 .../src/session/running/breakpoint_list.rs    |  2 +-
 .../src/session/running/console.rs            |  2 +-
 .../src/session/running/memory_view.rs        |  4 +-
 crates/editor/src/editor.rs                   | 63 ++++++++++++++-----
 crates/editor/src/element.rs                  | 13 ++--
 crates/extensions_ui/src/extensions_ui.rs     |  2 +-
 crates/git_ui/src/commit_modal.rs             |  2 +-
 crates/git_ui/src/git_panel.rs                | 35 ++++++-----
 crates/git_ui/src/git_ui.rs                   |  2 +-
 crates/go_to_line/src/go_to_line.rs           | 19 +++---
 crates/keymap_editor/src/keymap_editor.rs     |  4 +-
 .../language_models/src/provider/anthropic.rs |  2 +-
 .../language_models/src/provider/bedrock.rs   |  8 +--
 .../language_models/src/provider/deepseek.rs  |  2 +-
 crates/language_models/src/provider/google.rs |  2 +-
 .../language_models/src/provider/mistral.rs   |  2 +-
 .../src/provider/open_router.rs               |  7 ++-
 crates/outline_panel/src/outline_panel.rs     |  2 +-
 crates/picker/src/head.rs                     |  2 +-
 crates/picker/src/picker.rs                   |  2 +-
 crates/recent_projects/src/remote_servers.rs  |  7 ++-
 crates/rules_library/src/rules_library.rs     |  2 +-
 crates/search/src/buffer_search.rs            | 14 ++---
 crates/search/src/project_search.rs           |  8 +--
 crates/ui_input/src/ui_input.rs               |  2 +-
 crates/zeta/src/rate_completion_modal.rs      |  2 +-
 36 files changed, 143 insertions(+), 97 deletions(-)

diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index de5421c090..02ee46e840 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -91,7 +91,7 @@ impl MessageEditor {
         prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
         available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
         agent_name: SharedString,
-        placeholder: impl Into<Arc<str>>,
+        placeholder: &str,
         mode: EditorMode,
         window: &mut Window,
         cx: &mut Context<Self>,
@@ -117,7 +117,7 @@ impl MessageEditor {
             let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
 
             let mut editor = Editor::new(mode, buffer, None, window, cx);
-            editor.set_placeholder_text(placeholder, cx);
+            editor.set_placeholder_text(placeholder, window, cx);
             editor.set_show_indent_guides(false, cx);
             editor.set_soft_wrap();
             editor.set_use_modal_editing(true);
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
index a49dae25b3..015a2548d5 100644
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@@ -70,7 +70,7 @@ impl AcpThreadHistory {
     ) -> Self {
         let search_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", cx);
+            editor.set_placeholder_text("Search threads...", window, cx);
             editor
         });
 
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index dc427dfd37..370e070d7c 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -250,6 +250,7 @@ impl ThreadFeedbackState {
             );
             editor.set_placeholder_text(
                 "What went wrong? Share your feedback so we can improve.",
+                window,
                 cx,
             );
             editor
@@ -355,7 +356,7 @@ impl AcpThreadView {
                 prompt_capabilities.clone(),
                 available_commands.clone(),
                 agent.name(),
-                placeholder,
+                &placeholder,
                 editor::EditorMode::AutoHeight {
                     min_lines: MIN_EDITOR_LINES,
                     max_lines: Some(MAX_EDITOR_LINES),
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index dad2e282a5..6dfadb691f 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1742,6 +1742,7 @@ impl ActiveThread {
             );
             editor.set_placeholder_text(
                 "What went wrong? Share your feedback so we can improve.",
+                window,
                 cx,
             );
             editor
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
index 7fcf76d1cb..3bd5ed40d2 100644
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -156,7 +156,7 @@ impl ManageProfilesModal {
     ) {
         let name_editor = cx.new(|cx| Editor::single_line(window, cx));
         name_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text("Profile name", cx);
+            editor.set_placeholder_text("Profile name", window, cx);
         });
 
         self.mode = Mode::NewProfile(NewProfileMode {
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index b6517a5433..0e817ca807 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -229,7 +229,7 @@ impl<T: 'static> PromptEditor<T> {
         self.editor = cx.new(|cx| {
             let mut editor = Editor::auto_height(1, Self::MAX_LINES as usize, window, cx);
             editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text("Add a prompt…", cx);
+            editor.set_placeholder_text("Add a prompt…", window, cx);
             editor.set_text(prompt, window, cx);
             insert_message_creases(
                 &mut editor,
@@ -782,7 +782,7 @@ impl PromptEditor<BufferCodegen> {
             // always show the cursor (even when it isn't focused) because
             // typing in one will make what you typed appear in all of them.
             editor.set_show_cursor_when_unfocused(true, cx);
-            editor.set_placeholder_text(Self::placeholder_text(&mode, window, cx), cx);
+            editor.set_placeholder_text(&Self::placeholder_text(&mode, window, cx), window, cx);
             editor.register_addon(ContextCreasesAddon::new());
             editor.set_context_menu_options(ContextMenuOptions {
                 min_entries_visible: 12,
@@ -949,7 +949,7 @@ impl PromptEditor<TerminalCodegen> {
                 cx,
             );
             editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text(Self::placeholder_text(&mode, window, cx), cx);
+            editor.set_placeholder_text(&Self::placeholder_text(&mode, window, cx), window, cx);
             editor.set_context_menu_options(ContextMenuOptions {
                 min_entries_visible: 12,
                 max_entries_visible: 12,
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index 6f0ad2767a..f08ff6f24b 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -124,7 +124,7 @@ pub(crate) fn create_editor(
             window,
             cx,
         );
-        editor.set_placeholder_text("Message the agent – @ to include context", cx);
+        editor.set_placeholder_text("Message the agent – @ to include context", window, cx);
         editor.disable_word_completions();
         editor.set_show_indent_guides(false, cx);
         editor.set_soft_wrap();
diff --git a/crates/agent_ui/src/thread_history.rs b/crates/agent_ui/src/thread_history.rs
index 4ec2078e5d..73d3b705b7 100644
--- a/crates/agent_ui/src/thread_history.rs
+++ b/crates/agent_ui/src/thread_history.rs
@@ -73,7 +73,7 @@ impl ThreadHistory {
     ) -> Self {
         let search_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", cx);
+            editor.set_placeholder_text("Search threads...", window, cx);
             editor
         });
 
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index b9ef535f1d..82e0f84105 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -280,7 +280,7 @@ impl CollabPanel {
         cx.new(|cx| {
             let filter_editor = cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text("Filter...", cx);
+                editor.set_placeholder_text("Filter...", window, cx);
                 editor
             });
 
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index ee6289187b..efa5e4700a 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -803,12 +803,12 @@ impl ConfigureMode {
     pub(super) fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
         let program = cx.new(|cx| Editor::single_line(window, cx));
         program.update(cx, |this, cx| {
-            this.set_placeholder_text("ENV=Zed ~/bin/program --option", cx);
+            this.set_placeholder_text("ENV=Zed ~/bin/program --option", window, cx);
         });
 
         let cwd = cx.new(|cx| Editor::single_line(window, cx));
         cwd.update(cx, |this, cx| {
-            this.set_placeholder_text("Ex: $ZED_WORKTREE_ROOT", cx);
+            this.set_placeholder_text("Ex: $ZED_WORKTREE_ROOT", window, cx);
         });
 
         cx.new(|_| Self {
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
index 233dba4c52..9fc952a2ea 100644
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -219,7 +219,7 @@ impl BreakpointList {
         });
 
         self.input.update(cx, |this, cx| {
-            this.set_placeholder_text(placeholder, cx);
+            this.set_placeholder_text(placeholder, window, cx);
             this.set_read_only(is_exception_breakpoint);
             this.set_text(active_value.as_deref().unwrap_or(""), window, cx);
         });
diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs
index 43d86d95c4..92c5ace8f0 100644
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -83,7 +83,7 @@ impl Console {
         let this = cx.weak_entity();
         let query_bar = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Evaluate an expression", cx);
+            editor.set_placeholder_text("Evaluate an expression", window, cx);
             editor.set_use_autoclose(false);
             editor.set_show_gutter(false, cx);
             editor.set_show_wrap_guides(false, cx);
diff --git a/crates/debugger_ui/src/session/running/memory_view.rs b/crates/debugger_ui/src/session/running/memory_view.rs
index e7b7963d3f..a134b916a2 100644
--- a/crates/debugger_ui/src/session/running/memory_view.rs
+++ b/crates/debugger_ui/src/session/running/memory_view.rs
@@ -428,14 +428,14 @@ impl MemoryView {
         if !self.is_writing_memory {
             self.query_editor.update(cx, |this, cx| {
                 this.clear(window, cx);
-                this.set_placeholder_text("Write to Selected Memory Range", cx);
+                this.set_placeholder_text("Write to Selected Memory Range", window, cx);
             });
             self.is_writing_memory = true;
             self.query_editor.focus_handle(cx).focus(window);
         } else {
             self.query_editor.update(cx, |this, cx| {
                 this.clear(window, cx);
-                this.set_placeholder_text("Go to Memory Address / Expression", cx);
+                this.set_placeholder_text("Go to Memory Address / Expression", window, cx);
             });
             self.is_writing_memory = false;
         }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 34134ad001..217b3d4bf3 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1008,6 +1008,7 @@ pub struct Editor {
     /// Map of how text in the buffer should be displayed.
     /// Handles soft wraps, folds, fake inlay text insertions, etc.
     pub display_map: Entity<DisplayMap>,
+    placeholder_display_map: Option<Entity<DisplayMap>>,
     pub selections: SelectionsCollection,
     pub scroll_manager: ScrollManager,
     /// When inline assist editors are linked, they all render cursors because
@@ -1057,7 +1058,6 @@ pub struct Editor {
     show_breakpoints: Option<bool>,
     show_wrap_guides: Option<bool>,
     show_indent_guides: Option<bool>,
-    placeholder_text: Option<Arc<str>>,
     highlight_order: usize,
     highlighted_rows: HashMap<TypeId, Vec<RowHighlight>>,
     background_highlights: HashMap<HighlightKey, BackgroundHighlight>,
@@ -1209,7 +1209,7 @@ pub struct EditorSnapshot {
     show_breakpoints: Option<bool>,
     git_blame_gutter_max_author_length: Option<usize>,
     pub display_snapshot: DisplaySnapshot,
-    pub placeholder_text: Option<Arc<str>>,
+    pub placeholder_display_snapshot: Option<DisplaySnapshot>,
     is_focused: bool,
     scroll_anchor: ScrollAnchor,
     ongoing_scroll: OngoingScroll,
@@ -2066,6 +2066,7 @@ impl Editor {
             last_focused_descendant: None,
             buffer: buffer.clone(),
             display_map: display_map.clone(),
+            placeholder_display_map: None,
             selections,
             scroll_manager: ScrollManager::new(cx),
             columnar_selection_state: None,
@@ -2109,7 +2110,6 @@ impl Editor {
             show_breakpoints: None,
             show_wrap_guides: None,
             show_indent_guides,
-            placeholder_text: None,
             highlight_order: 0,
             highlighted_rows: HashMap::default(),
             background_highlights: HashMap::default(),
@@ -2728,9 +2728,12 @@ impl Editor {
             show_breakpoints: self.show_breakpoints,
             git_blame_gutter_max_author_length,
             display_snapshot: self.display_map.update(cx, |map, cx| map.snapshot(cx)),
+            placeholder_display_snapshot: self
+                .placeholder_display_map
+                .as_ref()
+                .map(|display_map| display_map.update(cx, |map, cx| map.snapshot(cx))),
             scroll_anchor: self.scroll_manager.anchor(),
             ongoing_scroll: self.scroll_manager.ongoing_scroll(),
-            placeholder_text: self.placeholder_text.clone(),
             is_focused: self.focus_handle.is_focused(window),
             current_line_highlight: self
                 .current_line_highlight
@@ -2826,20 +2829,37 @@ impl Editor {
         self.refresh_edit_prediction(false, false, window, cx);
     }
 
-    pub fn placeholder_text(&self) -> Option<&str> {
-        self.placeholder_text.as_deref()
+    pub fn placeholder_text(&self, cx: &mut App) -> Option<String> {
+        self.placeholder_display_map
+            .as_ref()
+            .map(|display_map| display_map.update(cx, |map, cx| map.snapshot(cx)).text())
     }
 
     pub fn set_placeholder_text(
         &mut self,
-        placeholder_text: impl Into<Arc<str>>,
+        placeholder_text: &str,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let placeholder_text = Some(placeholder_text.into());
-        if self.placeholder_text != placeholder_text {
-            self.placeholder_text = placeholder_text;
-            cx.notify();
-        }
+        let multibuffer = cx
+            .new(|cx| MultiBuffer::singleton(cx.new(|cx| Buffer::local(placeholder_text, cx)), cx));
+
+        let style = window.text_style();
+
+        self.placeholder_display_map = Some(cx.new(|cx| {
+            DisplayMap::new(
+                multibuffer,
+                style.font(),
+                style.font_size.to_pixels(window.rem_size()),
+                None,
+                FILE_HEADER_HEIGHT,
+                MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
+                Default::default(),
+                DiagnosticSeverity::Off,
+                cx,
+            )
+        }));
+        cx.notify();
     }
 
     pub fn set_cursor_shape(&mut self, cursor_shape: CursorShape, cx: &mut Context<Self>) {
@@ -18895,8 +18915,16 @@ impl Editor {
     // Called by the element. This method is not designed to be called outside of the editor
     // element's layout code because it does not notify when rewrapping is computed synchronously.
     pub(crate) fn set_wrap_width(&self, width: Option<Pixels>, cx: &mut App) -> bool {
-        self.display_map
-            .update(cx, |map, cx| map.set_wrap_width(width, cx))
+        if self.is_empty(cx) {
+            self.placeholder_display_map
+                .as_ref()
+                .map_or(false, |display_map| {
+                    display_map.update(cx, |map, cx| map.set_wrap_width(width, cx))
+                })
+        } else {
+            self.display_map
+                .update(cx, |map, cx| map.set_wrap_width(width, cx))
+        }
     }
 
     pub fn set_soft_wrap(&mut self) {
@@ -23011,8 +23039,10 @@ impl EditorSnapshot {
         self.is_focused
     }
 
-    pub fn placeholder_text(&self) -> Option<&Arc<str>> {
-        self.placeholder_text.as_ref()
+    pub fn placeholder_text(&self) -> Option<String> {
+        self.placeholder_display_snapshot
+            .as_ref()
+            .map(|display_map| display_map.text())
     }
 
     pub fn scroll_position(&self) -> gpui::Point<f32> {
@@ -24003,6 +24033,7 @@ impl BreakpointPromptEditor {
                     BreakpointPromptEditAction::Condition => "Condition when a breakpoint is hit. Expressions within {} are interpolated.",
                     BreakpointPromptEditAction::HitCondition => "How many breakpoint hits to ignore",
                 },
+                window,
                 cx,
             );
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index d25cf2e611..ff7816afe1 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3453,12 +3453,15 @@ impl EditorElement {
 
             let placeholder_lines = placeholder_text
                 .as_ref()
-                .map_or("", AsRef::as_ref)
-                .split('\n')
+                .map_or(Vec::new(), |text| text.split('\n').collect::<Vec<_>>());
+
+            let placeholder_line_count = placeholder_lines.len();
+
+            placeholder_lines
+                .into_iter()
                 .skip(rows.start.0 as usize)
                 .chain(iter::repeat(""))
-                .take(rows.len());
-            placeholder_lines
+                .take(cmp::max(rows.len(), placeholder_line_count))
                 .map(move |line| {
                     let run = TextRun {
                         len: line.len(),
@@ -10743,7 +10746,7 @@ mod tests {
         let style = cx.update(|_, cx| editor.read(cx).style().unwrap().clone());
         window
             .update(cx, |editor, window, cx| {
-                editor.set_placeholder_text("hello", cx);
+                editor.set_placeholder_text("hello", window, cx);
                 editor.insert_blocks(
                     [BlockProperties {
                         style: BlockStyle::Fixed,
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 0b925dceb1..82ee541745 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -327,7 +327,7 @@ impl ExtensionsPage {
 
             let query_editor = cx.new(|cx| {
                 let mut input = Editor::single_line(window, cx);
-                input.set_placeholder_text("Search extensions...", cx);
+                input.set_placeholder_text("Search extensions...", window, cx);
                 if let Some(id) = focus_extension_id {
                     input.set_text(format!("id:{id}"), window, cx);
                 }
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index cae4d28a83..a2f8472654 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -198,7 +198,7 @@ impl CommitModal {
             && commit_message.is_empty()
         {
             commit_editor.update(cx, |editor, cx| {
-                editor.set_placeholder_text(suggested_commit_message, cx);
+                editor.set_placeholder_text(&suggested_commit_message, window, cx);
             });
         }
 
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index f64f001241..31c3f5e77a 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -420,7 +420,7 @@ pub(crate) fn commit_message_editor(
     commit_editor.set_show_wrap_guides(false, cx);
     commit_editor.set_show_indent_guides(false, cx);
     let placeholder = placeholder.unwrap_or("Enter commit message".into());
-    commit_editor.set_placeholder_text(placeholder, cx);
+    commit_editor.set_placeholder_text(&placeholder, window, cx);
     commit_editor
 }
 
@@ -445,10 +445,10 @@ impl GitPanel {
             .detach();
 
             let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-            cx.observe_global::<SettingsStore>(move |this, cx| {
+            cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
                 let is_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
                 if is_sort_by_path != was_sort_by_path {
-                    this.update_visible_entries(cx);
+                    this.update_visible_entries(window, cx);
                 }
                 was_sort_by_path = is_sort_by_path
             })
@@ -1053,7 +1053,7 @@ impl GitPanel {
             let filename = path.path.file_name()?.to_string_lossy();
 
             if !entry.status.is_created() {
-                self.perform_checkout(vec![entry.clone()], cx);
+                self.perform_checkout(vec![entry.clone()], window, cx);
             } else {
                 let prompt = prompt(&format!("Trash {}?", filename), None, window, cx);
                 cx.spawn_in(window, async move |_, cx| {
@@ -1082,7 +1082,12 @@ impl GitPanel {
         });
     }
 
-    fn perform_checkout(&mut self, entries: Vec<GitStatusEntry>, cx: &mut Context<Self>) {
+    fn perform_checkout(
+        &mut self,
+        entries: Vec<GitStatusEntry>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         let workspace = self.workspace.clone();
         let Some(active_repository) = self.active_repository.clone() else {
             return;
@@ -1095,7 +1100,7 @@ impl GitPanel {
             entries: entries.clone(),
             finished: false,
         });
-        self.update_visible_entries(cx);
+        self.update_visible_entries(window, cx);
         let task = cx.spawn(async move |_, cx| {
             let tasks: Vec<_> = workspace.update(cx, |workspace, cx| {
                 workspace.project().update(cx, |project, cx| {
@@ -1142,16 +1147,16 @@ impl GitPanel {
             Ok(())
         });
 
-        cx.spawn(async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
             let result = task.await;
 
-            this.update(cx, |this, cx| {
+            this.update_in(cx, |this, window, cx| {
                 for pending in this.pending.iter_mut() {
                     if pending.op_id == op_id {
                         pending.finished = true;
                         if result.is_err() {
                             pending.target_status = TargetStatus::Unchanged;
-                            this.update_visible_entries(cx);
+                            this.update_visible_entries(window, cx);
                         }
                         break;
                     }
@@ -1207,10 +1212,10 @@ impl GitPanel {
             window,
             cx,
         );
-        cx.spawn(async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
             if let Ok(RestoreCancel::RestoreTrackedFiles) = prompt.await {
-                this.update(cx, |this, cx| {
-                    this.perform_checkout(entries, cx);
+                this.update_in(cx, |this, window, cx| {
+                    this.perform_checkout(entries, window, cx);
                 })
                 .ok();
             }
@@ -2642,7 +2647,7 @@ impl GitPanel {
                         if clear_pending {
                             git_panel.clear_pending();
                         }
-                        git_panel.update_visible_entries(cx);
+                        git_panel.update_visible_entries(window, cx);
                         git_panel.update_scrollbar_properties(window, cx);
                     })
                     .ok();
@@ -2695,7 +2700,7 @@ impl GitPanel {
         self.pending.retain(|v| !v.finished)
     }
 
-    fn update_visible_entries(&mut self, cx: &mut Context<Self>) {
+    fn update_visible_entries(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let bulk_staging = self.bulk_staging.take();
         let last_staged_path_prev_index = bulk_staging
             .as_ref()
@@ -2870,7 +2875,7 @@ impl GitPanel {
         let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());
 
         self.commit_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text(Arc::from(placeholder_text), cx)
+            editor.set_placeholder_text(&placeholder_text, window, cx)
         });
 
         cx.notify();
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
index ffb1a74728..fcb2be0bd4 100644
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -637,7 +637,7 @@ impl GitCloneModal {
     pub fn show(panel: Entity<GitPanel>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let repo_input = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Enter repository URL…", cx);
+            editor.set_placeholder_text("Enter repository URL…", window, cx);
             editor
         });
         let focus_handle = repo_input.focus_handle(cx);
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
index 2afc72e989..9b573d7071 100644
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -103,17 +103,20 @@ impl GoToLine {
                             return;
                         };
                         editor.update(cx, |editor, cx| {
-                            if let Some(placeholder_text) = editor.placeholder_text()
+                            if let Some(placeholder_text) = editor.placeholder_text(cx)
                                 && editor.text(cx).is_empty()
                             {
-                                let placeholder_text = placeholder_text.to_string();
                                 editor.set_text(placeholder_text, window, cx);
                             }
                         });
                     }
                 })
                 .detach();
-            editor.set_placeholder_text(format!("{line}{FILE_ROW_COLUMN_DELIMITER}{column}"), cx);
+            editor.set_placeholder_text(
+                &format!("{line}{FILE_ROW_COLUMN_DELIMITER}{column}"),
+                window,
+                cx,
+            );
             editor
         });
         let line_editor_change = cx.subscribe_in(&line_editor, window, Self::on_line_editor_event);
@@ -691,11 +694,11 @@ mod tests {
         let go_to_line_view = open_go_to_line_view(workspace, cx);
         go_to_line_view.update(cx, |go_to_line_view, cx| {
             assert_eq!(
-                go_to_line_view
-                    .line_editor
-                    .read(cx)
-                    .placeholder_text()
-                    .expect("No placeholder text"),
+                go_to_line_view.line_editor.update(cx, |line_editor, cx| {
+                    line_editor
+                        .placeholder_text(cx)
+                        .expect("No placeholder text")
+                }),
                 format!(
                     "{}:{}",
                     expected_placeholder.line, expected_placeholder.character
diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index 7e0a96d47a..4040ac2e2f 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -442,7 +442,7 @@ impl KeymapEditor {
 
         let filter_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Filter action names…", cx);
+            editor.set_placeholder_text("Filter action names…", window, cx);
             editor
         });
 
@@ -2804,7 +2804,7 @@ impl ActionArgumentsEditor {
             editor.set_text(arguments, window, cx);
         } else {
             // TODO: default value from schema?
-            editor.set_placeholder_text("Action Arguments", cx);
+            editor.set_placeholder_text("Action Arguments", window, cx);
         }
     }
 
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
index d246976cda..ca7763e2c5 100644
--- a/crates/language_models/src/provider/anthropic.rs
+++ b/crates/language_models/src/provider/anthropic.rs
@@ -969,7 +969,7 @@ impl ConfigurationView {
         Self {
             api_key_editor: cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text(Self::PLACEHOLDER_TEXT, cx);
+                editor.set_placeholder_text(Self::PLACEHOLDER_TEXT, window, cx);
                 editor
             }),
             state,
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
index 178c767950..49a976d5b1 100644
--- a/crates/language_models/src/provider/bedrock.rs
+++ b/crates/language_models/src/provider/bedrock.rs
@@ -1053,22 +1053,22 @@ impl ConfigurationView {
         Self {
             access_key_id_editor: cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text(Self::PLACEHOLDER_ACCESS_KEY_ID_TEXT, cx);
+                editor.set_placeholder_text(Self::PLACEHOLDER_ACCESS_KEY_ID_TEXT, window, cx);
                 editor
             }),
             secret_access_key_editor: cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text(Self::PLACEHOLDER_SECRET_ACCESS_KEY_TEXT, cx);
+                editor.set_placeholder_text(Self::PLACEHOLDER_SECRET_ACCESS_KEY_TEXT, window, cx);
                 editor
             }),
             session_token_editor: cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text(Self::PLACEHOLDER_SESSION_TOKEN_TEXT, cx);
+                editor.set_placeholder_text(Self::PLACEHOLDER_SESSION_TOKEN_TEXT, window, cx);
                 editor
             }),
             region_editor: cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text(Self::PLACEHOLDER_REGION, cx);
+                editor.set_placeholder_text(Self::PLACEHOLDER_REGION, window, cx);
                 editor
             }),
             state,
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
index 8c7f8bcc35..82bf067cd4 100644
--- a/crates/language_models/src/provider/deepseek.rs
+++ b/crates/language_models/src/provider/deepseek.rs
@@ -575,7 +575,7 @@ impl ConfigurationView {
     fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let api_key_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("sk-00000000000000000000000000000000", cx);
+            editor.set_placeholder_text("sk-00000000000000000000000000000000", window, cx);
             editor
         });
 
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index f252ab7aa3..939cf0ca60 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -842,7 +842,7 @@ impl ConfigurationView {
         Self {
             api_key_editor: cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text("AIzaSy...", cx);
+                editor.set_placeholder_text("AIzaSy...", window, cx);
                 editor
             }),
             target_agent,
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
index 3f8c2e2a67..c9824bf89e 100644
--- a/crates/language_models/src/provider/mistral.rs
+++ b/crates/language_models/src/provider/mistral.rs
@@ -744,7 +744,7 @@ impl ConfigurationView {
     fn new(state: gpui::Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let api_key_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("0aBCDEFGhIjKLmNOpqrSTUVwxyzabCDE1f2", cx);
+            editor.set_placeholder_text("0aBCDEFGhIjKLmNOpqrSTUVwxyzabCDE1f2", window, cx);
             editor
         });
 
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index f73a97e642..698e9d23cc 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -787,8 +787,11 @@ impl ConfigurationView {
     fn new(state: gpui::Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let api_key_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor
-                .set_placeholder_text("sk_or_000000000000000000000000000000000000000000000000", cx);
+            editor.set_placeholder_text(
+                "sk_or_000000000000000000000000000000000000000000000000",
+                window,
+                cx,
+            );
             editor
         });
 
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index a8d5046f90..2491c65a7f 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -737,7 +737,7 @@ impl OutlinePanel {
         cx.new(|cx| {
             let filter_editor = cx.new(|cx| {
                 let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text("Filter...", cx);
+                editor.set_placeholder_text("Filter...", window, cx);
                 editor
             });
             let filter_update_subscription = cx.subscribe_in(
diff --git a/crates/picker/src/head.rs b/crates/picker/src/head.rs
index aba7b8a1d0..700896e341 100644
--- a/crates/picker/src/head.rs
+++ b/crates/picker/src/head.rs
@@ -23,7 +23,7 @@ impl Head {
     ) -> Self {
         let editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text(placeholder_text, cx);
+            editor.set_placeholder_text(placeholder_text.as_ref(), window, cx);
             editor
         });
         cx.subscribe_in(&editor, window, edit_handler).detach();
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 34af5fed02..4bd8ac99cb 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -615,7 +615,7 @@ impl<D: PickerDelegate> Picker<D> {
             Head::Editor(editor) => {
                 let placeholder = self.delegate.placeholder_text(window, cx);
                 editor.update(cx, |editor, cx| {
-                    editor.set_placeholder_text(placeholder, cx);
+                    editor.set_placeholder_text(placeholder.as_ref(), window, cx);
                     cx.notify();
                 });
             }
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 3cf084bef7..99a1695a3f 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -104,7 +104,7 @@ impl EditNicknameState {
             .and_then(|state| state.nickname)
             .filter(|text| !text.is_empty());
         this.editor.update(cx, |this, cx| {
-            this.set_placeholder_text("Add a nickname for this server", cx);
+            this.set_placeholder_text("Add a nickname for this server", window, cx);
             if let Some(starting_text) = starting_text {
                 this.set_text(starting_text, window, cx);
             }
@@ -1038,13 +1038,14 @@ impl RemoteServerProjects {
     fn render_create_remote_server(
         &self,
         state: &CreateRemoteServer,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let ssh_prompt = state.ssh_prompt.clone();
 
         state.address_editor.update(cx, |editor, cx| {
             if editor.text(cx).is_empty() {
-                editor.set_placeholder_text("ssh user@example -p 2222", cx);
+                editor.set_placeholder_text("ssh user@example -p 2222", window, cx);
             }
         });
 
@@ -1731,7 +1732,7 @@ impl Render for RemoteServerProjects {
                     .into_any_element(),
                 Mode::ProjectPicker(element) => element.clone().into_any_element(),
                 Mode::CreateRemoteServer(state) => self
-                    .render_create_remote_server(state, cx)
+                    .render_create_remote_server(state, window, cx)
                     .into_any_element(),
                 Mode::EditNickname(state) => self
                     .render_edit_nickname(state, window, cx)
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
index 3d7962fa17..c11dde072f 100644
--- a/crates/rules_library/src/rules_library.rs
+++ b/crates/rules_library/src/rules_library.rs
@@ -612,7 +612,7 @@ impl RulesLibrary {
                     Ok(rule) => {
                         let title_editor = cx.new(|cx| {
                             let mut editor = Editor::single_line(window, cx);
-                            editor.set_placeholder_text("Untitled", cx);
+                            editor.set_placeholder_text("Untitled", window, cx);
                             editor.set_text(rule_metadata.title.unwrap_or_default(), window, cx);
                             if prompt_id.is_built_in() {
                                 editor.set_read_only(true);
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 92992dced6..c8e16e256c 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -154,16 +154,14 @@ impl Render for BufferSearchBar {
             find_in_results,
         } = self.supported_options(cx);
 
-        if self.query_editor.update(cx, |query_editor, _cx| {
-            query_editor.placeholder_text().is_none()
-        }) {
-            self.query_editor.update(cx, |editor, cx| {
-                editor.set_placeholder_text("Search…", cx);
-            });
-        }
+        self.query_editor.update(cx, |query_editor, cx| {
+            if query_editor.placeholder_text(cx).is_none() {
+                query_editor.set_placeholder_text("Search…", window, cx);
+            }
+        });
 
         self.replacement_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text("Replace with…", cx);
+            editor.set_placeholder_text("Replace with…", window, cx);
         });
 
         let mut color_override = None;
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 80ed0958b7..834967902f 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -766,7 +766,7 @@ impl ProjectSearchView {
 
         let query_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search all files…", cx);
+            editor.set_placeholder_text("Search all files…", window, cx);
             editor.set_text(query_text, window, cx);
             editor
         });
@@ -789,7 +789,7 @@ impl ProjectSearchView {
         );
         let replacement_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Replace in project…", cx);
+            editor.set_placeholder_text("Replace in project…", window, cx);
             if let Some(text) = replacement_text {
                 editor.set_text(text, window, cx);
             }
@@ -815,7 +815,7 @@ impl ProjectSearchView {
 
         let included_files_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Include: crates/**/*.toml", cx);
+            editor.set_placeholder_text("Include: crates/**/*.toml", window, cx);
 
             editor
         });
@@ -828,7 +828,7 @@ impl ProjectSearchView {
 
         let excluded_files_editor = cx.new(|cx| {
             let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Exclude: vendor/*, *.lock", cx);
+            editor.set_placeholder_text("Exclude: vendor/*, *.lock", window, cx);
 
             editor
         });
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index 39a701c8e8..86a569b532 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -55,7 +55,7 @@ impl SingleLineInput {
 
         let editor = cx.new(|cx| {
             let mut input = Editor::single_line(window, cx);
-            input.set_placeholder_text(placeholder_text.clone(), cx);
+            input.set_placeholder_text(&placeholder_text, window, cx);
             input
         });
 
diff --git a/crates/zeta/src/rate_completion_modal.rs b/crates/zeta/src/rate_completion_modal.rs
index 0cd814388a..f572a0a1aa 100644
--- a/crates/zeta/src/rate_completion_modal.rs
+++ b/crates/zeta/src/rate_completion_modal.rs
@@ -291,7 +291,7 @@ impl RateCompletionModal {
                 editor.set_show_wrap_guides(false, cx);
                 editor.set_show_indent_guides(false, cx);
                 editor.set_show_edit_predictions(Some(false), window, cx);
-                editor.set_placeholder_text("Add your feedback…", cx);
+                editor.set_placeholder_text("Add your feedback…", window, cx);
                 if focus {
                     cx.focus_self(window);
                 }

From 630340d6596da6ded5e18bd86868b79263b7ff97 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Wed, 10 Sep 2025 17:58:04 +0200
Subject: [PATCH 753/823] agent: Fix mention completion sometimes not
 dismissing on space (#37922)

Previously we would still show a completion menu even when the user
typed an unrecognised mode with an argument,
e.g. `@something word`.
This PR ensures that we only show the completion menu, when the part
after the `@` is a known mode (e.g. `file`/`symbol`/`rule`/...)

Release Notes:

- Fix an issue where completions for `@mentions` in the agent panel
would sometimes not be dismissed when typing a space
---
 .../agent_ui/src/acp/completion_provider.rs   | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index f4bc6eaf7f..5ef2e222d0 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1108,6 +1108,12 @@ impl MentionCompletion {
             match rest_of_line[mode_text.len()..].find(|c: char| !c.is_whitespace()) {
                 Some(whitespace_count) => {
                     if let Some(argument_text) = parts.next() {
+                        // If mode wasn't recognized but we have an argument, don't suggest completions
+                        // (e.g. '@something word')
+                        if mode.is_none() && !argument_text.is_empty() {
+                            return None;
+                        }
+
                         argument = Some(argument_text.to_string());
                         end += whitespace_count + argument_text.len();
                     }
@@ -1265,6 +1271,17 @@ mod tests {
             })
         );
 
+        assert_eq!(
+            MentionCompletion::try_parse(true, "Lorem @main ", 0),
+            Some(MentionCompletion {
+                source_range: 6..12,
+                mode: None,
+                argument: Some("main".to_string()),
+            })
+        );
+
+        assert_eq!(MentionCompletion::try_parse(true, "Lorem @main m", 0), None);
+
         assert_eq!(MentionCompletion::try_parse(true, "test@", 0), None);
 
         // Allowed non-file mentions
@@ -1279,14 +1296,9 @@ mod tests {
         );
 
         // Disallowed non-file mentions
-
         assert_eq!(
             MentionCompletion::try_parse(false, "Lorem @symbol main", 0),
-            Some(MentionCompletion {
-                source_range: 6..18,
-                mode: None,
-                argument: Some("main".to_string()),
-            })
+            None
         );
 
         assert_eq!(

From 611b96627b873c1dcfd9ad5f87124c8c019d8be3 Mon Sep 17 00:00:00 2001
From: Andy Brauninger <43097655+abrauninger@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:43:50 -0700
Subject: [PATCH 754/823] Fix typo in development docs for Windows and Linux
 (#37925)

Fixes same typo ("collabortation") as #37607 but for the Windows and
Linux dev docs.

Release Notes:

- N/A
---
 docs/src/development/linux.md   | 2 +-
 docs/src/development/windows.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/development/linux.md b/docs/src/development/linux.md
index d7b586be34..a0f9af5f26 100644
--- a/docs/src/development/linux.md
+++ b/docs/src/development/linux.md
@@ -18,7 +18,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
 
 ### Backend Dependencies (optional) {#backend-dependencies}
 
-If you are looking to develop Zed collaboration features using a local collabortation server, please see: [Local Collaboration](./local-collaboration.md) docs.
+If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
 
 ## Building from source
 
diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
index 65e65f4cc1..ccbc17b708 100644
--- a/docs/src/development/windows.md
+++ b/docs/src/development/windows.md
@@ -68,7 +68,7 @@ The list can be obtained as follows:
 
 ### Backend Dependencies (optional) {#backend-dependencies}
 
-If you are looking to develop Zed collaboration features using a local collabortation server, please see: [Local Collaboration](./local-collaboration.md) docs.
+If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
 
 ### Notes
 

From 6441099a67c6c6a16aa4bdef884aa64f5e562cc8 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Wed, 10 Sep 2025 18:56:49 +0200
Subject: [PATCH 755/823] gpui: Fix blending of colors in
 `HighlightStyle::highlight` (#37666)

Whilst looking into adding support for RainbowBrackes, we stumbled upon
this: Whereas for all properties during this blending, we take the value
of `other` if it is set, for the color we actually take `self.color`
instead of `other.color` if `self.color` is at full opacity.
`Hsla::blend` returns the latter color if it is at full opacity, which
seems wrong for this case. Hence, this PR swaps these.

Will not merge before the next release, to ensure that we don't break
something somewhere unexpected.

Release Notes:

- N/A
---
 crates/editor/src/display_map.rs              | 101 ++++++-----
 .../src/display_map/custom_highlights.rs      |  10 +-
 crates/editor/src/display_map/inlay_map.rs    |   6 +-
 crates/editor/src/editor.rs                   |   3 +-
 crates/gpui/src/style.rs                      | 163 +++++++++++++-----
 crates/language/src/buffer.rs                 |   8 +-
 6 files changed, 180 insertions(+), 111 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index fd4e762fb2..7b2bd2eb41 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -703,9 +703,8 @@ impl<'a> HighlightedChunk<'a> {
                         }),
                         ..Default::default()
                     };
-                    let invisible_style = if let Some(mut style) = style {
-                        style.highlight(invisible_highlight);
-                        style
+                    let invisible_style = if let Some(style) = style {
+                        style.highlight(invisible_highlight)
                     } else {
                         invisible_highlight
                     };
@@ -726,9 +725,8 @@ impl<'a> HighlightedChunk<'a> {
                         }),
                         ..Default::default()
                     };
-                    let invisible_style = if let Some(mut style) = style {
-                        style.highlight(invisible_highlight);
-                        style
+                    let invisible_style = if let Some(style) = style {
+                        style.highlight(invisible_highlight)
                     } else {
                         invisible_highlight
                     };
@@ -962,62 +960,59 @@ impl DisplaySnapshot {
             },
         )
         .flat_map(|chunk| {
-            let mut highlight_style = chunk
+            let highlight_style = chunk
                 .syntax_highlight_id
                 .and_then(|id| id.style(&editor_style.syntax));
 
-            if let Some(chunk_highlight) = chunk.highlight_style {
-                // For color inlays, blend the color with the editor background
-                let mut processed_highlight = chunk_highlight;
-                if chunk.is_inlay
-                    && let Some(inlay_color) = chunk_highlight.color
-                {
-                    // Only blend if the color has transparency (alpha < 1.0)
-                    if inlay_color.a < 1.0 {
-                        let blended_color = editor_style.background.blend(inlay_color);
-                        processed_highlight.color = Some(blended_color);
-                    }
+            let chunk_highlight = chunk.highlight_style.map(|chunk_highlight| {
+                HighlightStyle {
+                    // For color inlays, blend the color with the editor background
+                    // if the color has transparency (alpha < 1.0)
+                    color: chunk_highlight.color.map(|color| {
+                        if chunk.is_inlay && !color.is_opaque() {
+                            editor_style.background.blend(color)
+                        } else {
+                            color
+                        }
+                    }),
+                    ..chunk_highlight
                 }
+            });
 
-                if let Some(highlight_style) = highlight_style.as_mut() {
-                    highlight_style.highlight(processed_highlight);
-                } else {
-                    highlight_style = Some(processed_highlight);
-                }
-            }
+            let diagnostic_highlight = chunk
+                .diagnostic_severity
+                .filter(|severity| {
+                    self.diagnostics_max_severity
+                        .into_lsp()
+                        .is_some_and(|max_severity| severity <= &max_severity)
+                })
+                .map(|severity| HighlightStyle {
+                    fade_out: chunk
+                        .is_unnecessary
+                        .then_some(editor_style.unnecessary_code_fade),
+                    underline: (chunk.underline
+                        && editor_style.show_underlines
+                        && !(chunk.is_unnecessary && severity > lsp::DiagnosticSeverity::WARNING))
+                        .then(|| {
+                            let diagnostic_color =
+                                super::diagnostic_style(severity, &editor_style.status);
+                            UnderlineStyle {
+                                color: Some(diagnostic_color),
+                                thickness: 1.0.into(),
+                                wavy: true,
+                            }
+                        }),
+                    ..Default::default()
+                });
 
-            let mut diagnostic_highlight = HighlightStyle::default();
-
-            if let Some(severity) = chunk.diagnostic_severity.filter(|severity| {
-                self.diagnostics_max_severity
-                    .into_lsp()
-                    .is_some_and(|max_severity| severity <= &max_severity)
-            }) {
-                if chunk.is_unnecessary {
-                    diagnostic_highlight.fade_out = Some(editor_style.unnecessary_code_fade);
-                }
-                if chunk.underline
-                    && editor_style.show_underlines
-                    && !(chunk.is_unnecessary && severity > lsp::DiagnosticSeverity::WARNING)
-                {
-                    let diagnostic_color = super::diagnostic_style(severity, &editor_style.status);
-                    diagnostic_highlight.underline = Some(UnderlineStyle {
-                        color: Some(diagnostic_color),
-                        thickness: 1.0.into(),
-                        wavy: true,
-                    });
-                }
-            }
-
-            if let Some(highlight_style) = highlight_style.as_mut() {
-                highlight_style.highlight(diagnostic_highlight);
-            } else {
-                highlight_style = Some(diagnostic_highlight);
-            }
+            let style = [highlight_style, chunk_highlight, diagnostic_highlight]
+                .into_iter()
+                .flatten()
+                .reduce(|acc, highlight| acc.highlight(highlight));
 
             HighlightedChunk {
                 text: chunk.text,
-                style: highlight_style,
+                style,
                 is_tab: chunk.is_tab,
                 is_inlay: chunk.is_inlay,
                 replacement: chunk.renderer.map(ChunkReplacement::Renderer),
diff --git a/crates/editor/src/display_map/custom_highlights.rs b/crates/editor/src/display_map/custom_highlights.rs
index 0fb2a893d9..e4af453f89 100644
--- a/crates/editor/src/display_map/custom_highlights.rs
+++ b/crates/editor/src/display_map/custom_highlights.rs
@@ -150,11 +150,11 @@ impl<'a> Iterator for CustomHighlightsChunks<'a> {
             ..chunk.clone()
         };
         if !self.active_highlights.is_empty() {
-            let mut highlight_style = HighlightStyle::default();
-            for active_highlight in self.active_highlights.values() {
-                highlight_style.highlight(*active_highlight);
-            }
-            prefix.highlight_style = Some(highlight_style);
+            prefix.highlight_style = self
+                .active_highlights
+                .values()
+                .copied()
+                .reduce(|acc, active_highlight| acc.highlight(active_highlight));
         }
         Some(prefix)
     }
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index e00ffdbf2c..62c16f5a1e 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -385,9 +385,9 @@ impl<'a> Iterator for InlayChunks<'a> {
                         next_inlay_highlight_endpoint = usize::MAX;
                     } else {
                         next_inlay_highlight_endpoint = range.end - offset_in_inlay.0;
-                        highlight_style
-                            .get_or_insert_with(Default::default)
-                            .highlight(*style);
+                        highlight_style = highlight_style
+                            .map(|highlight| highlight.highlight(*style))
+                            .or_else(|| Some(*style));
                     }
                 } else {
                     next_inlay_highlight_endpoint = usize::MAX;
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 217b3d4bf3..46f28f0789 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -23817,8 +23817,7 @@ pub fn styled_runs_for_code_label<'a>(
             } else {
                 return Default::default();
             };
-            let mut muted_style = style;
-            muted_style.highlight(fade_out);
+            let muted_style = style.highlight(fade_out);
 
             let mut runs = SmallVec::<[(Range<usize>, HighlightStyle); 3]>::new();
             if range.start >= label.filter_range.end {
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 5b69ce7fa6..53ca6508bc 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -886,43 +886,32 @@ impl HighlightStyle {
     }
     /// Blend this highlight style with another.
     /// Non-continuous properties, like font_weight and font_style, are overwritten.
-    pub fn highlight(&mut self, other: HighlightStyle) {
-        match (self.color, other.color) {
-            (Some(self_color), Some(other_color)) => {
-                self.color = Some(Hsla::blend(other_color, self_color));
-            }
-            (None, Some(other_color)) => {
-                self.color = Some(other_color);
-            }
-            _ => {}
-        }
-
-        if other.font_weight.is_some() {
-            self.font_weight = other.font_weight;
-        }
-
-        if other.font_style.is_some() {
-            self.font_style = other.font_style;
-        }
-
-        if other.background_color.is_some() {
-            self.background_color = other.background_color;
-        }
-
-        if other.underline.is_some() {
-            self.underline = other.underline;
-        }
-
-        if other.strikethrough.is_some() {
-            self.strikethrough = other.strikethrough;
-        }
-
-        match (other.fade_out, self.fade_out) {
-            (Some(source_fade), None) => self.fade_out = Some(source_fade),
-            (Some(source_fade), Some(dest_fade)) => {
-                self.fade_out = Some((dest_fade * (1. + source_fade)).clamp(0., 1.));
-            }
-            _ => {}
+    #[must_use]
+    pub fn highlight(self, other: HighlightStyle) -> Self {
+        Self {
+            color: other
+                .color
+                .map(|other_color| {
+                    if let Some(color) = self.color {
+                        color.blend(other_color)
+                    } else {
+                        other_color
+                    }
+                })
+                .or(self.color),
+            font_weight: other.font_weight.or(self.font_weight),
+            font_style: other.font_style.or(self.font_style),
+            background_color: other.background_color.or(self.background_color),
+            underline: other.underline.or(self.underline),
+            strikethrough: other.strikethrough.or(self.strikethrough),
+            fade_out: other
+                .fade_out
+                .map(|source_fade| {
+                    self.fade_out
+                        .map(|dest_fade| (dest_fade * (1. + source_fade)).clamp(0., 1.))
+                        .unwrap_or(source_fade)
+                })
+                .or(self.fade_out),
         }
     }
 }
@@ -987,10 +976,11 @@ pub fn combine_highlights(
         while let Some((endpoint_ix, highlight_id, is_start)) = endpoints.peek() {
             let prev_index = mem::replace(&mut ix, *endpoint_ix);
             if ix > prev_index && !active_styles.is_empty() {
-                let mut current_style = HighlightStyle::default();
-                for highlight_id in &active_styles {
-                    current_style.highlight(highlights[*highlight_id]);
-                }
+                let current_style = active_styles
+                    .iter()
+                    .fold(HighlightStyle::default(), |acc, highlight_id| {
+                        acc.highlight(highlights[*highlight_id])
+                    });
                 return Some((prev_index..ix, current_style));
             }
 
@@ -1306,10 +1296,95 @@ impl From<Position> for taffy::style::Position {
 
 #[cfg(test)]
 mod tests {
-    use crate::{blue, green, red, yellow};
+    use crate::{blue, green, px, red, yellow};
 
     use super::*;
 
+    #[test]
+    fn test_basic_highlight_style_combination() {
+        let style_a = HighlightStyle::default();
+        let style_b = HighlightStyle::default();
+        let style_a = style_a.highlight(style_b);
+        assert_eq!(
+            style_a,
+            HighlightStyle::default(),
+            "Combining empty styles should not produce a non-empty style."
+        );
+
+        let mut style_b = HighlightStyle {
+            color: Some(red()),
+            strikethrough: Some(StrikethroughStyle {
+                thickness: px(2.),
+                color: Some(blue()),
+            }),
+            fade_out: Some(0.),
+            font_style: Some(FontStyle::Italic),
+            font_weight: Some(FontWeight(300.)),
+            background_color: Some(yellow()),
+            underline: Some(UnderlineStyle {
+                thickness: px(2.),
+                color: Some(red()),
+                wavy: true,
+            }),
+        };
+        let expected_style = style_b;
+
+        let style_a = style_a.highlight(style_b);
+        assert_eq!(
+            style_a, expected_style,
+            "Blending an empty style with another style should return the other style"
+        );
+
+        let style_b = style_b.highlight(Default::default());
+        assert_eq!(
+            style_b, expected_style,
+            "Blending a style with an empty style should not change the style."
+        );
+
+        let mut style_c = expected_style;
+
+        let style_d = HighlightStyle {
+            color: Some(blue().alpha(0.7)),
+            strikethrough: Some(StrikethroughStyle {
+                thickness: px(4.),
+                color: Some(crate::red()),
+            }),
+            fade_out: Some(0.),
+            font_style: Some(FontStyle::Oblique),
+            font_weight: Some(FontWeight(800.)),
+            background_color: Some(green()),
+            underline: Some(UnderlineStyle {
+                thickness: px(4.),
+                color: None,
+                wavy: false,
+            }),
+        };
+
+        let expected_style = HighlightStyle {
+            color: Some(red().blend(blue().alpha(0.7))),
+            strikethrough: Some(StrikethroughStyle {
+                thickness: px(4.),
+                color: Some(red()),
+            }),
+            // TODO this does not seem right
+            fade_out: Some(0.),
+            font_style: Some(FontStyle::Oblique),
+            font_weight: Some(FontWeight(800.)),
+            background_color: Some(green()),
+            underline: Some(UnderlineStyle {
+                thickness: px(4.),
+                color: None,
+                wavy: false,
+            }),
+        };
+
+        let style_c = style_c.highlight(style_d);
+        assert_eq!(
+            style_c, expected_style,
+            "Blending styles should blend properties where possible and override all others"
+        );
+    }
+
     #[test]
     fn test_combine_highlights() {
         assert_eq!(
@@ -1337,14 +1412,14 @@ mod tests {
                 (
                     1..2,
                     HighlightStyle {
-                        color: Some(green()),
+                        color: Some(blue()),
                         ..Default::default()
                     }
                 ),
                 (
                     2..3,
                     HighlightStyle {
-                        color: Some(green()),
+                        color: Some(blue()),
                         font_style: Some(FontStyle::Italic),
                         ..Default::default()
                     }
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 496f9d60d1..363040e2fc 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -635,13 +635,13 @@ impl HighlightedTextBuilder {
             self.text.push_str(chunk.text);
             let end = self.text.len();
 
-            if let Some(mut highlight_style) = chunk
+            if let Some(highlight_style) = chunk
                 .syntax_highlight_id
                 .and_then(|id| id.style(syntax_theme))
             {
-                if let Some(override_style) = override_style {
-                    highlight_style.highlight(override_style);
-                }
+                let highlight_style = override_style.map_or(highlight_style, |override_style| {
+                    highlight_style.highlight(override_style)
+                });
                 self.highlights.push((start..end, highlight_style));
             } else if let Some(override_style) = override_style {
                 self.highlights.push((start..end, override_style));

From c0b583c9efe81fc0abf66180e5742d926f5e7916 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Wed, 10 Sep 2025 18:57:05 +0200
Subject: [PATCH 756/823] keymap_editor: Move OpenKeymapEditor action into
 zed_actions (#37928)

This lets us remove title_bar's dependency on keymap_editor, which in
turns improves dev build times by ~0.5s for me

Release Notes:

- N/A
---
 Cargo.lock                                | 1 -
 crates/keymap_editor/src/keymap_editor.rs | 9 +--------
 crates/title_bar/Cargo.toml               | 1 -
 crates/title_bar/src/title_bar.rs         | 5 ++---
 crates/zed/src/zed/app_menus.rs           | 2 +-
 crates/zed_actions/src/lib.rs             | 2 ++
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 90bae2b491..39b8885eae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16710,7 +16710,6 @@ dependencies = [
  "db",
  "gpui",
  "http_client",
- "keymap_editor",
  "notifications",
  "pretty_assertions",
  "project",
diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
index 4040ac2e2f..7aa8a0c284 100644
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ b/crates/keymap_editor/src/keymap_editor.rs
@@ -37,6 +37,7 @@ use workspace::{
 };
 
 pub use ui_components::*;
+use zed_actions::OpenKeymapEditor;
 
 use crate::{
     persistence::KEYBINDING_EDITORS,
@@ -48,14 +49,6 @@ use crate::{
 
 const NO_ACTION_ARGUMENTS_TEXT: SharedString = SharedString::new_static("<no arguments>");
 
-actions!(
-    zed,
-    [
-        /// Opens the keymap editor.
-        OpenKeymapEditor
-    ]
-);
-
 actions!(
     keymap_editor,
     [
diff --git a/crates/title_bar/Cargo.toml b/crates/title_bar/Cargo.toml
index f60ac7c301..127fad3d8b 100644
--- a/crates/title_bar/Cargo.toml
+++ b/crates/title_bar/Cargo.toml
@@ -42,7 +42,6 @@ rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
-keymap_editor.workspace = true
 smallvec.workspace = true
 story = { workspace = true, optional = true }
 telemetry.workspace = true
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 0211568b5a..3e098b3660 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -29,7 +29,6 @@ use gpui::{
     IntoElement, MouseButton, ParentElement, Render, StatefulInteractiveElement, Styled,
     Subscription, WeakEntity, Window, actions, div,
 };
-use keymap_editor;
 use onboarding_banner::OnboardingBanner;
 use project::{Project, WorktreeSettings};
 use remote::RemoteConnectionOptions;
@@ -705,7 +704,7 @@ impl TitleBar {
                             "Settings Profiles",
                             zed_actions::settings_profile_selector::Toggle.boxed_clone(),
                         )
-                        .action("Keymap Editor", Box::new(keymap_editor::OpenKeymapEditor))
+                        .action("Keymap Editor", Box::new(zed_actions::OpenKeymapEditor))
                         .action(
                             "Themes…",
                             zed_actions::theme_selector::Toggle::default().boxed_clone(),
@@ -753,7 +752,7 @@ impl TitleBar {
                                 "Settings Profiles",
                                 zed_actions::settings_profile_selector::Toggle.boxed_clone(),
                             )
-                            .action("Key Bindings", Box::new(keymap_editor::OpenKeymapEditor))
+                            .action("Key Bindings", Box::new(zed_actions::OpenKeymapEditor))
                             .action(
                                 "Themes…",
                                 zed_actions::theme_selector::Toggle::default().boxed_clone(),
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index 89d54503ce..dea36e3ea2 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -17,7 +17,7 @@ pub fn app_menus() -> Vec<Menu> {
                     name: "Settings".into(),
                     items: vec![
                         MenuItem::action("Open Settings", super::OpenSettings),
-                        MenuItem::action("Open Key Bindings", keymap_editor::OpenKeymapEditor),
+                        MenuItem::action("Open Key Bindings", zed_actions::OpenKeymapEditor),
                         MenuItem::action("Open Default Settings", super::OpenDefaultSettings),
                         MenuItem::action(
                             "Open Default Key Bindings",
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index bc47b8f1e4..23bae89b68 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -36,6 +36,8 @@ actions!(
         OpenDefaultKeymap,
         /// Opens account settings.
         OpenAccountSettings,
+        /// Opens the keymap editor.
+        OpenKeymapEditor,
         /// Opens server settings.
         OpenServerSettings,
         /// Quits the application.

From 22e31a0d410dc22d2fbeabe8530b6836d107bf78 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Wed, 10 Sep 2025 23:06:09 +0530
Subject: [PATCH 757/823] Fix crash when filtering items in Picker (#37929)

Closes #37617

We're already using `get` in a bunch of places, this PR updates the
remaining spots to follow the same pattern. Note that the `ix` we read
in `render_match` can sometimes be stale.

The likely reason is that we run the match-update logic asynchronously
(see
[here](https://github.com/zed-industries/zed/blob/138117e0b15664079f5526cb56168750382b49b9/crates/picker/src/picker.rs#L643)).
That means it's possible to render items after the list's [data
update](https://github.com/zed-industries/zed/blob/138117e0b15664079f5526cb56168750382b49b9/crates/picker/src/picker.rs#L652)
but before the [list
reset](https://github.com/zed-industries/zed/blob/138117e0b15664079f5526cb56168750382b49b9/crates/picker/src/picker.rs#L662),
in which case the `ix` can be greater than that of our updated data.

Release Notes:

- Fixed crash when filtering MCP tools.
---
 crates/agent_ui/src/agent_configuration/tool_picker.rs |  2 +-
 .../agent_ui/src/context_picker/file_context_picker.rs |  2 +-
 .../src/context_picker/rules_context_picker.rs         |  2 +-
 .../src/context_picker/symbol_context_picker.rs        |  2 +-
 .../src/context_picker/thread_context_picker.rs        |  2 +-
 crates/collab_ui/src/collab_panel/contact_finder.rs    |  2 +-
 crates/debugger_ui/src/attach_modal.rs                 |  2 +-
 crates/debugger_ui/src/new_process_modal.rs            |  2 +-
 crates/extensions_ui/src/extension_version_selector.rs |  4 ++--
 crates/file_finder/src/file_finder.rs                  |  5 +----
 crates/git_ui/src/branch_picker.rs                     |  2 +-
 crates/git_ui/src/picker_prompt.rs                     |  2 +-
 crates/jj_ui/src/bookmark_picker.rs                    |  2 +-
 crates/language_selector/src/language_selector.rs      |  2 +-
 .../line_ending_selector/src/line_ending_selector.rs   |  4 ++--
 crates/onboarding/src/base_keymap_picker.rs            |  2 +-
 crates/project_symbols/src/project_symbols.rs          |  4 ++--
 .../src/settings_profile_selector.rs                   |  4 ++--
 crates/snippets_ui/src/snippets_ui.rs                  |  2 +-
 crates/tab_switcher/src/tab_switcher.rs                |  5 +----
 crates/tasks_ui/src/modal.rs                           |  2 +-
 crates/theme_selector/src/icon_theme_selector.rs       |  2 +-
 crates/theme_selector/src/theme_selector.rs            |  2 +-
 crates/toolchain_selector/src/toolchain_selector.rs    |  4 ++--
 crates/vim/src/state.rs                                | 10 ++--------
 25 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/crates/agent_ui/src/agent_configuration/tool_picker.rs b/crates/agent_ui/src/agent_configuration/tool_picker.rs
index 25947a1e58..2ba92fa6b7 100644
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/crates/agent_ui/src/agent_configuration/tool_picker.rs
@@ -318,7 +318,7 @@ impl PickerDelegate for ToolPickerDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let item = &self.filtered_items[ix];
+        let item = &self.filtered_items.get(ix)?;
         match item {
             PickerItem::ContextServer { server_id, .. } => Some(
                 div()
diff --git a/crates/agent_ui/src/context_picker/file_context_picker.rs b/crates/agent_ui/src/context_picker/file_context_picker.rs
index 6c224caf4c..43b1fa5e92 100644
--- a/crates/agent_ui/src/context_picker/file_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/file_context_picker.rs
@@ -160,7 +160,7 @@ impl PickerDelegate for FileContextPickerDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let FileMatch { mat, .. } = &self.matches[ix];
+        let FileMatch { mat, .. } = &self.matches.get(ix)?;
 
         Some(
             ListItem::new(ix)
diff --git a/crates/agent_ui/src/context_picker/rules_context_picker.rs b/crates/agent_ui/src/context_picker/rules_context_picker.rs
index f3982f61cb..677011577a 100644
--- a/crates/agent_ui/src/context_picker/rules_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/rules_context_picker.rs
@@ -146,7 +146,7 @@ impl PickerDelegate for RulesContextPickerDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let thread = &self.matches[ix];
+        let thread = &self.matches.get(ix)?;
 
         Some(ListItem::new(ix).inset(true).toggle_state(selected).child(
             render_thread_context_entry(thread, self.context_store.clone(), cx),
diff --git a/crates/agent_ui/src/context_picker/symbol_context_picker.rs b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
index b00d4e3693..993d65bd12 100644
--- a/crates/agent_ui/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
@@ -169,7 +169,7 @@ impl PickerDelegate for SymbolContextPickerDelegate {
         _window: &mut Window,
         _: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let mat = &self.matches[ix];
+        let mat = &self.matches.get(ix)?;
 
         Some(ListItem::new(ix).inset(true).toggle_state(selected).child(
             render_symbol_context_entry(ElementId::named_usize("symbol-ctx-picker", ix), mat),
diff --git a/crates/agent_ui/src/context_picker/thread_context_picker.rs b/crates/agent_ui/src/context_picker/thread_context_picker.rs
index 66654f3d8c..9e843779c2 100644
--- a/crates/agent_ui/src/context_picker/thread_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/thread_context_picker.rs
@@ -220,7 +220,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let thread = &self.matches[ix];
+        let thread = &self.matches.get(ix)?;
 
         Some(ListItem::new(ix).inset(true).toggle_state(selected).child(
             render_thread_context_entry(thread, self.context_store.clone(), cx),
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
index 3c23ccc017..e5823d0e78 100644
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ b/crates/collab_ui/src/collab_panel/contact_finder.rs
@@ -148,7 +148,7 @@ impl PickerDelegate for ContactFinderDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let user = &self.potential_contacts[ix];
+        let user = &self.potential_contacts.get(ix)?;
         let request_status = self.user_store.read(cx).contact_request_status(user);
 
         let icon_path = match request_status {
diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rs
index 3e3bc3ec27..8926b3bb6f 100644
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -289,7 +289,7 @@ impl PickerDelegate for AttachModalDelegate {
         _window: &mut Window,
         _: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let hit = &self.matches[ix];
+        let hit = &self.matches.get(ix)?;
         let candidate = self.candidates.get(hit.candidate_id)?;
 
         Some(
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index efa5e4700a..eeed36ac1d 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -1446,7 +1446,7 @@ impl PickerDelegate for DebugDelegate {
         window: &mut Window,
         cx: &mut Context<picker::Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let hit = &self.matches[ix];
+        let hit = &self.matches.get(ix)?;
 
         let highlighted_location = HighlightedMatch {
             text: hit.string.clone(),
diff --git a/crates/extensions_ui/src/extension_version_selector.rs b/crates/extensions_ui/src/extension_version_selector.rs
index aaf5d5e8eb..fe7a419fbe 100644
--- a/crates/extensions_ui/src/extension_version_selector.rs
+++ b/crates/extensions_ui/src/extension_version_selector.rs
@@ -207,8 +207,8 @@ impl PickerDelegate for ExtensionVersionSelectorDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let version_match = &self.matches[ix];
-        let extension_version = &self.extension_versions[version_match.candidate_id];
+        let version_match = &self.matches.get(ix)?;
+        let extension_version = &self.extension_versions.get(version_match.candidate_id)?;
 
         let is_version_compatible =
             extension_host::is_version_compatible(ReleaseChannel::global(cx), extension_version);
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index e2f8d55cf2..53cf0552f2 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1599,10 +1599,7 @@ impl PickerDelegate for FileFinderDelegate {
     ) -> Option<Self::ListItem> {
         let settings = FileFinderSettings::get_global(cx);
 
-        let path_match = self
-            .matches
-            .get(ix)
-            .expect("Invalid matches state: no element for index {ix}");
+        let path_match = self.matches.get(ix)?;
 
         let history_icon = match &path_match {
             Match::History { .. } => Icon::new(IconName::HistoryRerun)
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index e5bdce7722..42558b7b79 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -454,7 +454,7 @@ impl PickerDelegate for BranchListDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let entry = &self.matches[ix];
+        let entry = &self.matches.get(ix)?;
 
         let (commit_time, author_name, subject) = entry
             .branch
diff --git a/crates/git_ui/src/picker_prompt.rs b/crates/git_ui/src/picker_prompt.rs
index 3f1d507c42..9997b0590c 100644
--- a/crates/git_ui/src/picker_prompt.rs
+++ b/crates/git_ui/src/picker_prompt.rs
@@ -216,7 +216,7 @@ impl PickerDelegate for PickerPromptDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let hit = &self.matches[ix];
+        let hit = &self.matches.get(ix)?;
         let shortened_option = util::truncate_and_trailoff(&hit.string, self.max_match_length);
 
         Some(
diff --git a/crates/jj_ui/src/bookmark_picker.rs b/crates/jj_ui/src/bookmark_picker.rs
index f6121fb9fc..95c23e73f5 100644
--- a/crates/jj_ui/src/bookmark_picker.rs
+++ b/crates/jj_ui/src/bookmark_picker.rs
@@ -182,7 +182,7 @@ impl PickerDelegate for BookmarkPickerDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let entry = &self.matches[ix];
+        let entry = &self.matches.get(ix)?;
 
         Some(
             ListItem::new(ix)
diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs
index f6e2d75015..991cce50ba 100644
--- a/crates/language_selector/src/language_selector.rs
+++ b/crates/language_selector/src/language_selector.rs
@@ -283,7 +283,7 @@ impl PickerDelegate for LanguageSelectorDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let mat = &self.matches[ix];
+        let mat = &self.matches.get(ix)?;
         let (label, language_icon) = self.language_data_for_match(mat, cx);
         Some(
             ListItem::new(ix)
diff --git a/crates/line_ending_selector/src/line_ending_selector.rs b/crates/line_ending_selector/src/line_ending_selector.rs
index 532f0b051d..7f75a1ebe3 100644
--- a/crates/line_ending_selector/src/line_ending_selector.rs
+++ b/crates/line_ending_selector/src/line_ending_selector.rs
@@ -171,7 +171,7 @@ impl PickerDelegate for LineEndingSelectorDelegate {
         _: &mut Window,
         _: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let line_ending = self.matches[ix];
+        let line_ending = self.matches.get(ix)?;
         let label = match line_ending {
             LineEnding::Unix => "LF",
             LineEnding::Windows => "CRLF",
@@ -183,7 +183,7 @@ impl PickerDelegate for LineEndingSelectorDelegate {
             .toggle_state(selected)
             .child(Label::new(label));
 
-        if self.line_ending == line_ending {
+        if &self.line_ending == line_ending {
             list_item = list_item.end_slot(Icon::new(IconName::Check).color(Color::Muted));
         }
 
diff --git a/crates/onboarding/src/base_keymap_picker.rs b/crates/onboarding/src/base_keymap_picker.rs
index 79a716cc9e..950ed1d313 100644
--- a/crates/onboarding/src/base_keymap_picker.rs
+++ b/crates/onboarding/src/base_keymap_picker.rs
@@ -213,7 +213,7 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let keymap_match = &self.matches[ix];
+        let keymap_match = &self.matches.get(ix)?;
 
         Some(
             ListItem::new(ix)
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index ea67499acb..cec7729252 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -217,8 +217,8 @@ impl PickerDelegate for ProjectSymbolsDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let string_match = &self.matches[ix];
-        let symbol = &self.symbols[string_match.candidate_id];
+        let string_match = &self.matches.get(ix)?;
+        let symbol = &self.symbols.get(string_match.candidate_id)?;
         let syntax_runs = styled_runs_for_code_label(&symbol.label, cx.theme().syntax());
 
         let mut path = symbol.path.path.to_string_lossy();
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
index d7ebd6488d..0bba83beaf 100644
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ b/crates/settings_profile_selector/src/settings_profile_selector.rs
@@ -257,8 +257,8 @@ impl PickerDelegate for SettingsProfileSelectorDelegate {
         _: &mut Window,
         _: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let mat = &self.matches[ix];
-        let profile_name = &self.profile_names[mat.candidate_id];
+        let mat = &self.matches.get(ix)?;
+        let profile_name = &self.profile_names.get(mat.candidate_id)?;
 
         Some(
             ListItem::new(ix)
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
index db76ab6f9a..7f2689f0be 100644
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ b/crates/snippets_ui/src/snippets_ui.rs
@@ -310,7 +310,7 @@ impl PickerDelegate for ScopeSelectorDelegate {
         _window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let mat = &self.matches[ix];
+        let mat = &self.matches.get(ix)?;
         let name_label = mat.string.clone();
 
         let scope_name = ScopeName(Cow::Owned(
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 241642115a..2923ee6dd4 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -649,10 +649,7 @@ impl PickerDelegate for TabSwitcherDelegate {
         window: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let tab_match = self
-            .matches
-            .get(ix)
-            .expect("Invalid matches state: no element for index {ix}");
+        let tab_match = self.matches.get(ix)?;
 
         let params = TabContentParams {
             detail: Some(tab_match.detail),
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
index 423c28c710..e14b42af2b 100644
--- a/crates/tasks_ui/src/modal.rs
+++ b/crates/tasks_ui/src/modal.rs
@@ -443,7 +443,7 @@ impl PickerDelegate for TasksModalDelegate {
         cx: &mut Context<picker::Picker<Self>>,
     ) -> Option<Self::ListItem> {
         let candidates = self.candidates.as_ref()?;
-        let hit = &self.matches[ix];
+        let hit = &self.matches.get(ix)?;
         let (source_kind, resolved_task) = &candidates.get(hit.candidate_id)?;
         let template = resolved_task.original_task();
         let display_label = resolved_task.display_label();
diff --git a/crates/theme_selector/src/icon_theme_selector.rs b/crates/theme_selector/src/icon_theme_selector.rs
index af7abdee62..5b26124079 100644
--- a/crates/theme_selector/src/icon_theme_selector.rs
+++ b/crates/theme_selector/src/icon_theme_selector.rs
@@ -287,7 +287,7 @@ impl PickerDelegate for IconThemeSelectorDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let theme_match = &self.matches[ix];
+        let theme_match = &self.matches.get(ix)?;
 
         Some(
             ListItem::new(ix)
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 8c48f295dd..8cc450c97f 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -345,7 +345,7 @@ impl PickerDelegate for ThemeSelectorDelegate {
         _window: &mut Window,
         _cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let theme_match = &self.matches[ix];
+        let theme_match = &self.matches.get(ix)?;
 
         Some(
             ListItem::new(ix)
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
index 2f946a6915..3804238634 100644
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ b/crates/toolchain_selector/src/toolchain_selector.rs
@@ -1011,8 +1011,8 @@ impl PickerDelegate for ToolchainSelectorDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let mat = &self.matches[ix];
-        let (toolchain, scope) = &self.candidates[mat.candidate_id];
+        let mat = &self.matches.get(ix)?;
+        let (toolchain, scope) = &self.candidates.get(mat.candidate_id)?;
 
         let label = toolchain.name.clone();
         let path = Self::relativize_path(toolchain.path.clone(), &self.worktree_abs_path_root);
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 8503bffca6..cd9382da46 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -1192,10 +1192,7 @@ impl PickerDelegate for RegistersViewDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let register_match = self
-            .matches
-            .get(ix)
-            .expect("Invalid matches state: no element for index {ix}");
+        let register_match = self.matches.get(ix)?;
 
         let mut output = String::new();
         let mut runs = Vec::new();
@@ -1584,10 +1581,7 @@ impl PickerDelegate for MarksViewDelegate {
         _: &mut Window,
         cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
-        let mark_match = self
-            .matches
-            .get(ix)
-            .expect("Invalid matches state: no element for index {ix}");
+        let mark_match = self.matches.get(ix)?;
 
         let mut left_output = String::new();
         let mut left_runs = Vec::new();

From b28c979aae5416703d9b3f21b399b74f46bc6ecd Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed, 10 Sep 2025 20:19:24 +0200
Subject: [PATCH 758/823] language_settings: Add whitespace_map setting
 (#37704)

This setting controls which visible characters are used to render
whitespace when the show_whitespace setting is enabled.

Release Notes:

- Added `whitespace_map` setting to control which visible characters are
used to render whitespace when the `show_whitespace` setting is enabled.

---------

Co-authored-by: Nia Espera <nia@zed.dev>
---
 assets/settings/default.json             |  5 ++++
 crates/editor/src/element.rs             | 21 +++++++++++++---
 crates/language/src/language_settings.rs | 32 +++++++++++++++++++++++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 1902aa5e87..94df7a62cc 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -362,6 +362,11 @@
   // - It is adjacent to an edge (start or end)
   // - It is adjacent to a whitespace (left or right)
   "show_whitespaces": "selection",
+  // Visible characters used to render whitespace when show_whitespaces is enabled.
+  "whitespace_map": {
+    "space": "•",
+    "tab": "→"
+  },
   // Settings related to calls in Zed
   "calls": {
     // Join calls with the microphone live by default
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index ff7816afe1..673557a2c6 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -9259,11 +9259,21 @@ impl Element for EditorElement {
                     });
 
                     let invisible_symbol_font_size = font_size / 2.;
+                    let whitespace_map = &self
+                        .editor
+                        .read(cx)
+                        .buffer
+                        .read(cx)
+                        .language_settings(cx)
+                        .whitespace_map;
+
+                    let tab_char = whitespace_map.tab();
+                    let tab_len = tab_char.len();
                     let tab_invisible = window.text_system().shape_line(
-                        "→".into(),
+                        tab_char,
                         invisible_symbol_font_size,
                         &[TextRun {
-                            len: "→".len(),
+                            len: tab_len,
                             font: self.style.text.font(),
                             color: cx.theme().colors().editor_invisible,
                             background_color: None,
@@ -9272,11 +9282,14 @@ impl Element for EditorElement {
                         }],
                         None,
                     );
+
+                    let space_char = whitespace_map.space();
+                    let space_len = space_char.len();
                     let space_invisible = window.text_system().shape_line(
-                        "•".into(),
+                        space_char,
                         invisible_symbol_font_size,
                         &[TextRun {
-                            len: "•".len(),
+                            len: space_len,
                             font: self.style.text.font(),
                             color: cx.theme().colors().editor_invisible,
                             background_color: None,
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 33dd6208a8..cb193960ae 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -8,7 +8,7 @@ use ec4rs::{
     property::{FinalNewline, IndentSize, IndentStyle, MaxLineLen, TabWidth, TrimTrailingWs},
 };
 use globset::{Glob, GlobMatcher, GlobSet, GlobSetBuilder};
-use gpui::{App, Modifiers};
+use gpui::{App, Modifiers, SharedString};
 use itertools::{Either, Itertools};
 use schemars::{JsonSchema, json_schema};
 use serde::{
@@ -123,6 +123,8 @@ pub struct LanguageSettings {
     pub edit_predictions_disabled_in: Vec<String>,
     /// Whether to show tabs and spaces in the editor.
     pub show_whitespaces: ShowWhitespaceSetting,
+    /// Visible characters used to render whitespace when show_whitespaces is enabled.
+    pub whitespace_map: WhitespaceMap,
     /// Whether to start a new line with a comment when a previous line is a comment as well.
     pub extend_comment_on_newline: bool,
     /// Inlay hint related settings.
@@ -578,6 +580,11 @@ pub struct LanguageSettingsContent {
     /// Whether to show tabs and spaces in the editor.
     #[serde(default)]
     pub show_whitespaces: Option<ShowWhitespaceSetting>,
+    /// Visible characters used to render whitespace when show_whitespaces is enabled.
+    ///
+    /// Default: "•" for spaces, "→" for tabs.
+    #[serde(default)]
+    pub whitespace_map: Option<WhitespaceMap>,
     /// Whether to start a new line with a comment when a previous line is a comment as well.
     ///
     /// Default: true
@@ -855,6 +862,28 @@ pub enum ShowWhitespaceSetting {
     Trailing,
 }
 
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, SettingsUi)]
+pub struct WhitespaceMap {
+    #[serde(default)]
+    pub space: Option<String>,
+    #[serde(default)]
+    pub tab: Option<String>,
+}
+
+impl WhitespaceMap {
+    pub fn space(&self) -> SharedString {
+        self.space
+            .as_ref()
+            .map_or_else(|| SharedString::from("•"), |s| SharedString::from(s))
+    }
+
+    pub fn tab(&self) -> SharedString {
+        self.tab
+            .as_ref()
+            .map_or_else(|| SharedString::from("→"), |s| SharedString::from(s))
+    }
+}
+
 /// Controls which formatter should be used when formatting code.
 #[derive(Clone, Debug, Default, PartialEq, Eq, SettingsUi)]
 pub enum SelectedFormatter {
@@ -1643,6 +1672,7 @@ fn merge_settings(settings: &mut LanguageSettings, src: &LanguageSettingsContent
         src.edit_predictions_disabled_in.clone(),
     );
     merge(&mut settings.show_whitespaces, src.show_whitespaces);
+    merge(&mut settings.whitespace_map, src.whitespace_map.clone());
     merge(
         &mut settings.extend_comment_on_newline,
         src.extend_comment_on_newline,

From 441a934d8433730b779af848c05d7b1fb566ea3f Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Wed, 10 Sep 2025 12:21:51 -0600
Subject: [PATCH 759/823] Remove unnecessary `Option` from functions querying
 buffer outline (#37935)

`None` case wasn't being used

Release Notes:

- N/A
---
 crates/agent/src/context.rs                   |  7 +++---
 crates/agent2/src/tools/grep_tool.rs          |  6 ++---
 crates/agent_ui/src/inline_assistant.rs       | 11 +++-----
 .../src/symbols_command.rs                    |  6 ++---
 crates/assistant_tool/src/outline.rs          |  4 +--
 crates/assistant_tools/src/grep_tool.rs       |  6 ++---
 crates/language/src/buffer.rs                 | 25 ++++++++-----------
 crates/language/src/buffer_tests.rs           | 17 ++++---------
 crates/languages/src/css.rs                   |  2 +-
 crates/languages/src/typescript.rs            |  4 +--
 crates/multi_buffer/src/multi_buffer.rs       |  3 +--
 crates/outline_panel/src/outline_panel.rs     | 12 ++++-----
 crates/project/src/task_inventory.rs          |  2 +-
 13 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/crates/agent/src/context.rs b/crates/agent/src/context.rs
index a94a933d86..71fa8176a0 100644
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -201,10 +201,9 @@ impl FileContextHandle {
                         parse_status.changed().await.log_err();
                     }
 
-                    if let Ok(snapshot) = buffer.read_with(cx, |buffer, _| buffer.snapshot())
-                        && let Some(outline) = snapshot.outline(None)
-                    {
-                        let items = outline
+                    if let Ok(snapshot) = buffer.read_with(cx, |buffer, _| buffer.snapshot()) {
+                        let items = snapshot
+                            .outline(None)
                             .items
                             .into_iter()
                             .map(|item| item.to_point(&snapshot));
diff --git a/crates/agent2/src/tools/grep_tool.rs b/crates/agent2/src/tools/grep_tool.rs
index e76a16bcc7..2bcfbd711b 100644
--- a/crates/agent2/src/tools/grep_tool.rs
+++ b/crates/agent2/src/tools/grep_tool.rs
@@ -261,10 +261,8 @@ impl AgentTool for GrepTool {
                     let end_row = range.end.row;
                     output.push_str("\n### ");
 
-                    if let Some(parent_symbols) = &parent_symbols {
-                        for symbol in parent_symbols {
-                            write!(output, "{} › ", symbol.text)?;
-                        }
+                    for symbol in parent_symbols {
+                        write!(output, "{} › ", symbol.text)?;
                     }
 
                     if range.start.row == end_row {
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 7beb2f8ff8..4ac88e6daa 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1813,16 +1813,13 @@ impl CodeActionProvider for AssistantCodeActionProvider {
             has_diagnostics = true;
         }
         if has_diagnostics {
-            if let Some(symbols_containing_start) = snapshot.symbols_containing(range.start, None)
-                && let Some(symbol) = symbols_containing_start.last()
-            {
+            let symbols_containing_start = snapshot.symbols_containing(range.start, None);
+            if let Some(symbol) = symbols_containing_start.last() {
                 range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
                 range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
             }
-
-            if let Some(symbols_containing_end) = snapshot.symbols_containing(range.end, None)
-                && let Some(symbol) = symbols_containing_end.last()
-            {
+            let symbols_containing_end = snapshot.symbols_containing(range.end, None);
+            if let Some(symbol) = symbols_containing_end.last() {
                 range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
                 range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
             }
diff --git a/crates/assistant_slash_commands/src/symbols_command.rs b/crates/assistant_slash_commands/src/symbols_command.rs
index 3028709144..c700319800 100644
--- a/crates/assistant_slash_commands/src/symbols_command.rs
+++ b/crates/assistant_slash_commands/src/symbols_command.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
@@ -70,9 +70,7 @@ impl SlashCommand for OutlineSlashCommand {
             let path = snapshot.resolve_file_path(cx, true);
 
             cx.background_spawn(async move {
-                let outline = snapshot
-                    .outline(None)
-                    .context("no symbols for active tab")?;
+                let outline = snapshot.outline(None);
 
                 let path = path.as_deref().unwrap_or(Path::new("untitled"));
                 let mut outline_text = format!("Symbols for {}:\n", path.display());
diff --git a/crates/assistant_tool/src/outline.rs b/crates/assistant_tool/src/outline.rs
index 4f8bde5456..d9bf64cf05 100644
--- a/crates/assistant_tool/src/outline.rs
+++ b/crates/assistant_tool/src/outline.rs
@@ -41,9 +41,7 @@ pub async fn file_outline(
     }
 
     let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-    let outline = snapshot
-        .outline(None)
-        .context("No outline information available for this file at path {path}")?;
+    let outline = snapshot.outline(None);
 
     render_outline(
         outline
diff --git a/crates/assistant_tools/src/grep_tool.rs b/crates/assistant_tools/src/grep_tool.rs
index 41dde5bbfe..e43a54661c 100644
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -267,10 +267,8 @@ impl Tool for GrepTool {
                     let end_row = range.end.row;
                     output.push_str("\n### ");
 
-                    if let Some(parent_symbols) = &parent_symbols {
-                        for symbol in parent_symbols {
-                            write!(output, "{} › ", symbol.text)?;
-                        }
+                    for symbol in parent_symbols {
+                        write!(output, "{} › ", symbol.text)?;
                     }
 
                     if range.start.row == end_row {
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 363040e2fc..0a8d62845a 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -3701,9 +3701,8 @@ impl BufferSnapshot {
     ///
     /// This method allows passing an optional [`SyntaxTheme`] to
     /// syntax-highlight the returned symbols.
-    pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Option<Outline<Anchor>> {
-        self.outline_items_containing(0..self.len(), true, theme)
-            .map(Outline::new)
+    pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Outline<Anchor> {
+        Outline::new(self.outline_items_containing(0..self.len(), true, theme))
     }
 
     /// Returns all the symbols that contain the given position.
@@ -3714,20 +3713,20 @@ impl BufferSnapshot {
         &self,
         position: T,
         theme: Option<&SyntaxTheme>,
-    ) -> Option<Vec<OutlineItem<Anchor>>> {
+    ) -> Vec<OutlineItem<Anchor>> {
         let position = position.to_offset(self);
         let mut items = self.outline_items_containing(
             position.saturating_sub(1)..self.len().min(position + 1),
             false,
             theme,
-        )?;
+        );
         let mut prev_depth = None;
         items.retain(|item| {
             let result = prev_depth.is_none_or(|prev_depth| item.depth > prev_depth);
             prev_depth = Some(item.depth);
             result
         });
-        Some(items)
+        items
     }
 
     pub fn outline_range_containing<T: ToOffset>(&self, range: Range<T>) -> Option<Range<Point>> {
@@ -3777,21 +3776,19 @@ impl BufferSnapshot {
         range: Range<T>,
         include_extra_context: bool,
         theme: Option<&SyntaxTheme>,
-    ) -> Option<Vec<OutlineItem<Anchor>>> {
+    ) -> Vec<OutlineItem<Anchor>> {
         let range = range.to_offset(self);
         let mut matches = self.syntax.matches(range.clone(), &self.text, |grammar| {
             grammar.outline_config.as_ref().map(|c| &c.query)
         });
-        let configs = matches
-            .grammars()
-            .iter()
-            .map(|g| g.outline_config.as_ref().unwrap())
-            .collect::<Vec<_>>();
 
         let mut items = Vec::new();
         let mut annotation_row_ranges: Vec<Range<u32>> = Vec::new();
         while let Some(mat) = matches.peek() {
-            let config = &configs[mat.grammar_index];
+            let config = matches.grammars()[mat.grammar_index]
+                .outline_config
+                .as_ref()
+                .unwrap();
             if let Some(item) =
                 self.next_outline_item(config, &mat, &range, include_extra_context, theme)
             {
@@ -3870,7 +3867,7 @@ impl BufferSnapshot {
             item_ends_stack.push(item.range.end);
         }
 
-        Some(anchor_items)
+        anchor_items
     }
 
     fn next_outline_item(
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 050ec457df..8f3f15cacd 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -779,9 +779,7 @@ async fn test_outline(cx: &mut gpui::TestAppContext) {
     .unindent();
 
     let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
-    let outline = buffer
-        .update(cx, |buffer, _| buffer.snapshot().outline(None))
-        .unwrap();
+    let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None));
 
     assert_eq!(
         outline
@@ -863,9 +861,7 @@ async fn test_outline_nodes_with_newlines(cx: &mut gpui::TestAppContext) {
     .unindent();
 
     let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
-    let outline = buffer
-        .update(cx, |buffer, _| buffer.snapshot().outline(None))
-        .unwrap();
+    let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None));
 
     assert_eq!(
         outline
@@ -902,7 +898,7 @@ async fn test_outline_with_extra_context(cx: &mut gpui::TestAppContext) {
     let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
 
     // extra context nodes are included in the outline.
-    let outline = snapshot.outline(None).unwrap();
+    let outline = snapshot.outline(None);
     assert_eq!(
         outline
             .items
@@ -913,7 +909,7 @@ async fn test_outline_with_extra_context(cx: &mut gpui::TestAppContext) {
     );
 
     // extra context nodes do not appear in breadcrumbs.
-    let symbols = snapshot.symbols_containing(3, None).unwrap();
+    let symbols = snapshot.symbols_containing(3, None);
     assert_eq!(
         symbols
             .iter()
@@ -945,9 +941,7 @@ fn test_outline_annotations(cx: &mut App) {
     .unindent();
 
     let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
-    let outline = buffer
-        .update(cx, |buffer, _| buffer.snapshot().outline(None))
-        .unwrap();
+    let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None));
 
     assert_eq!(
         outline
@@ -1051,7 +1045,6 @@ async fn test_symbols_containing(cx: &mut gpui::TestAppContext) {
     ) -> Vec<(String, Range<Point>)> {
         snapshot
             .symbols_containing(position, None)
-            .unwrap()
             .into_iter()
             .map(|item| {
                 (
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index 5cea35084d..79e3a62a34 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -237,7 +237,7 @@ mod tests {
         .unindent();
 
         let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None).unwrap());
+        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
         assert_eq!(
             outline
                 .items
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index 15adea6070..d8f18f5f04 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -1030,7 +1030,7 @@ mod tests {
         .unindent();
 
         let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None).unwrap());
+        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
         assert_eq!(
             outline
                 .items
@@ -1084,7 +1084,7 @@ mod tests {
         .unindent();
 
         let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None).unwrap());
+        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
         assert_eq!(
             outline
                 .items
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index f5955ec176..0bcfa2f4d3 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -6119,7 +6119,7 @@ impl MultiBufferSnapshot {
 
     pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Option<Outline<Anchor>> {
         let (excerpt_id, _, buffer) = self.as_singleton()?;
-        let outline = buffer.outline(theme)?;
+        let outline = buffer.outline(theme);
         Some(Outline::new(
             outline
                 .items
@@ -6164,7 +6164,6 @@ impl MultiBufferSnapshot {
                 .buffer
                 .symbols_containing(anchor.text_anchor, theme)
                 .into_iter()
-                .flatten()
                 .flat_map(|item| {
                     Some(OutlineItem {
                         depth: item.depth,
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
index 2491c65a7f..a8485248db 100644
--- a/crates/outline_panel/src/outline_panel.rs
+++ b/crates/outline_panel/src/outline_panel.rs
@@ -3350,13 +3350,11 @@ impl OutlinePanel {
                         let buffer_language = buffer_snapshot.language().cloned();
                         let fetched_outlines = cx
                             .background_spawn(async move {
-                                let mut outlines = buffer_snapshot
-                                    .outline_items_containing(
-                                        excerpt_range.context,
-                                        false,
-                                        Some(&syntax_theme),
-                                    )
-                                    .unwrap_or_default();
+                                let mut outlines = buffer_snapshot.outline_items_containing(
+                                    excerpt_range.context,
+                                    false,
+                                    Some(&syntax_theme),
+                                );
                                 outlines.retain(|outline| {
                                     buffer_language.is_none()
                                         || buffer_language.as_ref()
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
index 15e6024808..20dce218f4 100644
--- a/crates/project/src/task_inventory.rs
+++ b/crates/project/src/task_inventory.rs
@@ -986,7 +986,7 @@ impl ContextProvider for BasicContextProvider {
         let buffer = location.buffer.read(cx);
         let buffer_snapshot = buffer.snapshot();
         let symbols = buffer_snapshot.symbols_containing(location.range.start, None);
-        let symbol = symbols.unwrap_or_default().last().map(|symbol| {
+        let symbol = symbols.last().map(|symbol| {
             let range = symbol
                 .name_ranges
                 .last()

From a94b0931c7394cee09438176fee20986fd929aee Mon Sep 17 00:00:00 2001
From: AidanV <84053180+AidanV@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:40:00 -0700
Subject: [PATCH 760/823] editor: Fix cuts on end of line cutting whole line
 (#34553)

Closes #19816

Release Notes:

- Improved `ctrl-k` (`editor::CutToEndOfLine`) behavior when used at the
end of lines
- Add option to make `editor::CutToEndOfLine` not gobble newlines.
   ```json
   {
     "context": "Editor",
"bindings": { "ctrl-k": ["editor::CutToEndOfLine", { "stop_at_newlines":
true }] }
   },
   ```

---------

Co-authored-by: Peter Tripp <peter@zed.dev>
---
 crates/editor/src/actions.rs      | 11 +++++--
 crates/editor/src/editor.rs       | 34 +++++++++++++++-----
 crates/editor/src/editor_tests.rs | 52 +++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 35510b36e9..9dac77970a 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -253,6 +253,15 @@ pub struct DeleteToPreviousWordStart {
     pub ignore_brackets: bool,
 }
 
+/// Cuts from cursor to end of line.
+#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
+#[action(namespace = editor)]
+#[serde(deny_unknown_fields)]
+pub struct CutToEndOfLine {
+    #[serde(default)]
+    pub stop_at_newlines: bool,
+}
+
 /// Folds all code blocks at the specified indentation level.
 #[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
 #[action(namespace = editor)]
@@ -412,8 +421,6 @@ actions!(
         CopyPermalinkToLine,
         /// Cuts selected text to the clipboard.
         Cut,
-        /// Cuts from cursor to end of line.
-        CutToEndOfLine,
         /// Deletes the character after the cursor.
         Delete,
         /// Deletes the current line.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 46f28f0789..aacf6d4f28 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -12249,7 +12249,12 @@ impl Editor {
             .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
     }
 
-    pub fn cut_common(&mut self, window: &mut Window, cx: &mut Context<Self>) -> ClipboardItem {
+    pub fn cut_common(
+        &mut self,
+        cut_no_selection_line: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ClipboardItem {
         let mut text = String::new();
         let buffer = self.buffer.read(cx).snapshot(cx);
         let mut selections = self.selections.all::<Point>(cx);
@@ -12258,7 +12263,8 @@ impl Editor {
             let max_point = buffer.max_point();
             let mut is_first = true;
             for selection in &mut selections {
-                let is_entire_line = selection.is_empty() || self.selections.line_mode;
+                let is_entire_line =
+                    (selection.is_empty() && cut_no_selection_line) || self.selections.line_mode;
                 if is_entire_line {
                     selection.start = Point::new(selection.start.row, 0);
                     if !selection.is_empty() && selection.end.column == 0 {
@@ -12299,7 +12305,7 @@ impl Editor {
 
     pub fn cut(&mut self, _: &Cut, window: &mut Window, cx: &mut Context<Self>) {
         self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let item = self.cut_common(window, cx);
+        let item = self.cut_common(true, window, cx);
         cx.write_to_clipboard(item);
     }
 
@@ -12308,11 +12314,14 @@ impl Editor {
         self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
             s.move_with(|snapshot, sel| {
                 if sel.is_empty() {
-                    sel.end = DisplayPoint::new(sel.end.row(), snapshot.line_len(sel.end.row()))
+                    sel.end = DisplayPoint::new(sel.end.row(), snapshot.line_len(sel.end.row()));
+                }
+                if sel.is_empty() {
+                    sel.end = DisplayPoint::new(sel.end.row() + 1_u32, 0);
                 }
             });
         });
-        let item = self.cut_common(window, cx);
+        let item = self.cut_common(true, window, cx);
         cx.set_global(KillRing(item))
     }
 
@@ -13474,7 +13483,7 @@ impl Editor {
 
     pub fn cut_to_end_of_line(
         &mut self,
-        _: &CutToEndOfLine,
+        action: &CutToEndOfLine,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -13487,7 +13496,18 @@ impl Editor {
                 window,
                 cx,
             );
-            this.cut(&Cut, window, cx);
+            if !action.stop_at_newlines {
+                this.change_selections(Default::default(), window, cx, |s| {
+                    s.move_with(|_, sel| {
+                        if sel.is_empty() {
+                            sel.end = DisplayPoint::new(sel.end.row() + 1_u32, 0);
+                        }
+                    });
+                });
+            }
+            this.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
+            let item = this.cut_common(false, window, cx);
+            cx.write_to_clipboard(item);
         });
     }
 
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 6cf911fb4c..4e3c5012e1 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -6730,6 +6730,58 @@ async fn test_hard_wrap(cx: &mut TestAppContext) {
     ));
 }
 
+#[gpui::test]
+async fn test_cut_line_ends(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state(indoc! {"
+        The quick« brownˇ»
+        fox jumps overˇ
+        the lazy dog"});
+    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
+    cx.assert_editor_state(indoc! {"
+        The quickˇ
+        ˇthe lazy dog"});
+
+    cx.set_state(indoc! {"
+        The quick« brownˇ»
+        fox jumps overˇ
+        the lazy dog"});
+    cx.update_editor(|e, window, cx| e.cut_to_end_of_line(&CutToEndOfLine::default(), window, cx));
+    cx.assert_editor_state(indoc! {"
+        The quickˇ
+        fox jumps overˇthe lazy dog"});
+
+    cx.set_state(indoc! {"
+        The quick« brownˇ»
+        fox jumps overˇ
+        the lazy dog"});
+    cx.update_editor(|e, window, cx| {
+        e.cut_to_end_of_line(
+            &CutToEndOfLine {
+                stop_at_newlines: true,
+            },
+            window,
+            cx,
+        )
+    });
+    cx.assert_editor_state(indoc! {"
+        The quickˇ
+        fox jumps overˇ
+        the lazy dog"});
+
+    cx.set_state(indoc! {"
+        The quick« brownˇ»
+        fox jumps overˇ
+        the lazy dog"});
+    cx.update_editor(|e, window, cx| e.kill_ring_cut(&KillRingCut, window, cx));
+    cx.assert_editor_state(indoc! {"
+        The quickˇ
+        fox jumps overˇthe lazy dog"});
+}
+
 #[gpui::test]
 async fn test_clipboard(cx: &mut TestAppContext) {
     init_test(cx, |_| {});

From 2c29eac29fdb073f3ea56cfd68007aa0db29b0b9 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 10 Sep 2025 16:05:51 -0400
Subject: [PATCH 761/823] Fetch all staff in get-preview-channel-changes script
 (#37940)

Release Notes:

- N/A
---
 script/get-preview-channel-changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/get-preview-channel-changes b/script/get-preview-channel-changes
index 14cd80f155..d1ca705736 100755
--- a/script/get-preview-channel-changes
+++ b/script/get-preview-channel-changes
@@ -24,7 +24,7 @@ async function main() {
   const STAFF_MEMBERS = new Set(
     (
       await (
-        await fetch("https://api.github.com/orgs/zed-industries/teams/staff/members", {
+        await fetch("https://api.github.com/orgs/zed-industries/teams/staff/members?per_page=100", {
           headers: {
             Authorization: `token ${GITHUB_ACCESS_TOKEN}`,
             Accept: "application/vnd.github+json",

From cb75c2aeb7293b7ca92842664db96dd4ebc60c5b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Wed, 10 Sep 2025 16:11:07 -0400
Subject: [PATCH 762/823] Make plans backwards compatible (#37941)

This PR fixes the backwards compatibility of the new `Plan` variants.

We can't add new variants to the wire representation, as old clients
won't be able to understand them.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/thread_view.rs        |  16 +--
 crates/agent_ui/src/agent_configuration.rs    |  12 +-
 crates/agent_ui/src/agent_panel.rs            |  17 ++-
 crates/agent_ui/src/debug.rs                  |   4 +-
 crates/agent_ui/src/message_editor.rs         |   6 +-
 crates/agent_ui/src/ui/end_trial_upsell.rs    |   4 +-
 .../agent_ui/src/ui/preview/usage_callouts.rs |  24 ++--
 .../src/agent_panel_onboarding_content.rs     |  13 ++-
 crates/ai_onboarding/src/ai_onboarding.rs     |  26 +++--
 crates/ai_onboarding/src/ai_upsell_card.rs    |  33 +++---
 .../src/edit_prediction_onboarding_content.rs |   6 +-
 crates/client/src/test.rs                     |   5 +-
 crates/client/src/user.rs                     |  15 ++-
 crates/cloud_api_types/src/cloud_api_types.rs |  11 +-
 .../cloud_llm_client/src/cloud_llm_client.rs  | 110 +++++++++++-------
 .../language_model/src/model/cloud_model.rs   |  16 +--
 crates/language_models/src/provider/cloud.rs  |  24 ++--
 crates/title_bar/src/title_bar.rs             |   8 +-
 18 files changed, 215 insertions(+), 135 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index 370e070d7c..f8bc6c353b 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -14,6 +14,7 @@ use arrayvec::ArrayVec;
 use audio::{Audio, Sound};
 use buffer_diff::BufferDiff;
 use client::zed_urls;
+use cloud_llm_client::PlanV1;
 use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
 use editor::{Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects};
@@ -4875,7 +4876,9 @@ impl AcpThreadView {
             return None;
         }
 
-        let plan = user_store.plan().unwrap_or(cloud_llm_client::Plan::ZedFree);
+        let plan = user_store
+            .plan()
+            .unwrap_or(cloud_llm_client::Plan::V1(PlanV1::ZedFree));
 
         let usage = user_store.model_request_usage()?;
 
@@ -5134,13 +5137,12 @@ impl AcpThreadView {
         cx: &mut Context<Self>,
     ) -> Callout {
         let error_message = match plan {
-            cloud_llm_client::Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
-            cloud_llm_client::Plan::ZedProTrial | cloud_llm_client::Plan::ZedFree => {
-                "Upgrade to Zed Pro for more prompts."
+            cloud_llm_client::Plan::V1(PlanV1::ZedPro) => {
+                "Upgrade to usage-based billing for more prompts."
             }
-            cloud_llm_client::Plan::ZedProV2
-            | cloud_llm_client::Plan::ZedProTrialV2
-            | cloud_llm_client::Plan::ZedFreeV2 => "",
+            cloud_llm_client::Plan::V1(PlanV1::ZedProTrial)
+            | cloud_llm_client::Plan::V1(PlanV1::ZedFree) => "Upgrade to Zed Pro for more prompts.",
+            cloud_llm_client::Plan::V2(_) => "",
         };
 
         Callout::new()
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index ad6ab13e9f..4ad5b2d8e8 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -8,7 +8,7 @@ use std::{ops::Range, sync::Arc};
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use assistant_tool::{ToolSource, ToolWorkingSet};
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1, PlanV2};
 use collections::HashMap;
 use context_server::ContextServerId;
 use editor::{Editor, SelectionEffects, scroll::Autoscroll};
@@ -515,11 +515,15 @@ impl AgentConfiguration {
                 .blend(cx.theme().colors().text_accent.opacity(0.2));
 
             let (plan_name, label_color, bg_color) = match plan {
-                Plan::ZedFree | Plan::ZedFreeV2 => ("Free", Color::Default, free_chip_bg),
-                Plan::ZedProTrial | Plan::ZedProTrialV2 => {
+                Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree) => {
+                    ("Free", Color::Default, free_chip_bg)
+                }
+                Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial) => {
                     ("Pro Trial", Color::Accent, pro_chip_bg)
                 }
-                Plan::ZedPro | Plan::ZedProV2 => ("Pro", Color::Accent, pro_chip_bg),
+                Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro) => {
+                    ("Pro", Color::Accent, pro_chip_bg)
+                }
             };
 
             Chip::new(plan_name.to_string())
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 3cba74aeae..2ace7096c2 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -51,7 +51,7 @@ use assistant_context::{AssistantContext, ContextEvent, ContextSummary};
 use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
 use client::{UserStore, zed_urls};
-use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
+use cloud_llm_client::{CompletionIntent, Plan, PlanV1, PlanV2, UsageLimit};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
 use feature_flags::{self, ClaudeCodeFeatureFlag, FeatureFlagAppExt, GeminiAndNativeFeatureFlag};
 use fs::Fs;
@@ -2976,7 +2976,10 @@ impl AgentPanel {
         let plan = self.user_store.read(cx).plan();
         let has_previous_trial = self.user_store.read(cx).trial_started_at().is_some();
 
-        matches!(plan, Some(Plan::ZedFree)) && has_previous_trial
+        matches!(
+            plan,
+            Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))
+        ) && has_previous_trial
     }
 
     fn should_render_onboarding(&self, cx: &mut Context<Self>) -> bool {
@@ -2988,7 +2991,7 @@ impl AgentPanel {
 
         if user_store
             .plan()
-            .is_some_and(|plan| matches!(plan, Plan::ZedPro))
+            .is_some_and(|plan| matches!(plan, Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro)))
             && user_store
                 .subscription_period()
                 .and_then(|period| period.0.checked_add_days(chrono::Days::new(1)))
@@ -3527,9 +3530,11 @@ impl AgentPanel {
         cx: &mut Context<Self>,
     ) -> AnyElement {
         let error_message = match plan {
-            Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
-            Plan::ZedProTrial | Plan::ZedFree => "Upgrade to Zed Pro for more prompts.",
-            Plan::ZedProV2 | Plan::ZedProTrialV2 | Plan::ZedFreeV2 => "",
+            Plan::V1(PlanV1::ZedPro) => "Upgrade to usage-based billing for more prompts.",
+            Plan::V1(PlanV1::ZedProTrial) | Plan::V1(PlanV1::ZedFree) => {
+                "Upgrade to Zed Pro for more prompts."
+            }
+            Plan::V2(_) => "",
         };
 
         Callout::new()
diff --git a/crates/agent_ui/src/debug.rs b/crates/agent_ui/src/debug.rs
index bd34659210..227528e8ae 100644
--- a/crates/agent_ui/src/debug.rs
+++ b/crates/agent_ui/src/debug.rs
@@ -1,7 +1,7 @@
 #![allow(unused, dead_code)]
 
 use client::{ModelRequestUsage, RequestUsage};
-use cloud_llm_client::{Plan, UsageLimit};
+use cloud_llm_client::{Plan, PlanV1, UsageLimit};
 use gpui::Global;
 use std::ops::{Deref, DerefMut};
 use ui::prelude::*;
@@ -75,7 +75,7 @@ impl Default for DebugAccountState {
         Self {
             enabled: false,
             trial_expired: false,
-            plan: Plan::ZedFree,
+            plan: Plan::V1(PlanV1::ZedFree),
             custom_prompt_usage: ModelRequestUsage(RequestUsage {
                 limit: UsageLimit::Unlimited,
                 amount: 0,
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index f08ff6f24b..e9a482c5f4 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -17,7 +17,7 @@ use agent::{
 use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
 use ai_onboarding::ApiKeysWithProviders;
 use buffer_diff::BufferDiff;
-use cloud_llm_client::CompletionIntent;
+use cloud_llm_client::{CompletionIntent, PlanV1};
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
 use editor::display_map::CreaseId;
@@ -1298,7 +1298,9 @@ impl MessageEditor {
             return None;
         }
 
-        let plan = user_store.plan().unwrap_or(cloud_llm_client::Plan::ZedFree);
+        let plan = user_store
+            .plan()
+            .unwrap_or(cloud_llm_client::Plan::V1(PlanV1::ZedFree));
 
         let usage = user_store.model_request_usage()?;
 
diff --git a/crates/agent_ui/src/ui/end_trial_upsell.rs b/crates/agent_ui/src/ui/end_trial_upsell.rs
index e31334296f..4db9244469 100644
--- a/crates/agent_ui/src/ui/end_trial_upsell.rs
+++ b/crates/agent_ui/src/ui/end_trial_upsell.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use ai_onboarding::{AgentPanelOnboardingCard, PlanDefinitions};
 use client::zed_urls;
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use ui::{Divider, Tooltip, prelude::*};
 
@@ -112,7 +112,7 @@ impl Component for EndTrialUpsell {
         Some(
             v_flex()
                 .child(EndTrialUpsell {
-                    plan: Plan::ZedFree,
+                    plan: Plan::V1(PlanV1::ZedFree),
                     dismiss_upsell: Arc::new(|_, _| {}),
                 })
                 .into_any_element(),
diff --git a/crates/agent_ui/src/ui/preview/usage_callouts.rs b/crates/agent_ui/src/ui/preview/usage_callouts.rs
index 6f40171281..e31af9f49a 100644
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -1,5 +1,5 @@
 use client::{ModelRequestUsage, RequestUsage, zed_urls};
-use cloud_llm_client::{Plan, UsageLimit};
+use cloud_llm_client::{Plan, PlanV1, PlanV2, UsageLimit};
 use component::{empty_example, example_group_with_title, single_example};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use ui::{Callout, prelude::*};
@@ -38,20 +38,20 @@ impl RenderOnce for UsageCallout {
 
         let (title, message, button_text, url) = if is_limit_reached {
             match self.plan {
-                Plan::ZedFree | Plan::ZedFreeV2 => (
+                Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree) => (
                     "Out of free prompts",
                     "Upgrade to continue, wait for the next reset, or switch to API key."
                         .to_string(),
                     "Upgrade",
                     zed_urls::account_url(cx),
                 ),
-                Plan::ZedProTrial | Plan::ZedProTrialV2 => (
+                Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial) => (
                     "Out of trial prompts",
                     "Upgrade to Zed Pro to continue, or switch to API key.".to_string(),
                     "Upgrade",
                     zed_urls::account_url(cx),
                 ),
-                Plan::ZedPro | Plan::ZedProV2 => (
+                Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro) => (
                     "Out of included prompts",
                     "Enable usage-based billing to continue.".to_string(),
                     "Manage",
@@ -60,7 +60,7 @@ impl RenderOnce for UsageCallout {
             }
         } else {
             match self.plan {
-                Plan::ZedFree => (
+                Plan::V1(PlanV1::ZedFree) => (
                     "Reaching free plan limit soon",
                     format!(
                         "{remaining} remaining - Upgrade to increase limit, or switch providers",
@@ -68,7 +68,7 @@ impl RenderOnce for UsageCallout {
                     "Upgrade",
                     zed_urls::account_url(cx),
                 ),
-                Plan::ZedProTrial => (
+                Plan::V1(PlanV1::ZedProTrial) => (
                     "Reaching trial limit soon",
                     format!(
                         "{remaining} remaining - Upgrade to increase limit, or switch providers",
@@ -76,7 +76,7 @@ impl RenderOnce for UsageCallout {
                     "Upgrade",
                     zed_urls::account_url(cx),
                 ),
-                _ => return div().into_any_element(),
+                Plan::V1(PlanV1::ZedPro) | Plan::V2(_) => return div().into_any_element(),
             }
         };
 
@@ -119,7 +119,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Approaching limit (90%)",
                     UsageCallout::new(
-                        Plan::ZedFree,
+                        Plan::V1(PlanV1::ZedFree),
                         ModelRequestUsage(RequestUsage {
                             limit: UsageLimit::Limited(50),
                             amount: 45, // 90% of limit
@@ -130,7 +130,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Limit reached (100%)",
                     UsageCallout::new(
-                        Plan::ZedFree,
+                        Plan::V1(PlanV1::ZedFree),
                         ModelRequestUsage(RequestUsage {
                             limit: UsageLimit::Limited(50),
                             amount: 50, // 100% of limit
@@ -147,7 +147,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Approaching limit (90%)",
                     UsageCallout::new(
-                        Plan::ZedProTrial,
+                        Plan::V1(PlanV1::ZedProTrial),
                         ModelRequestUsage(RequestUsage {
                             limit: UsageLimit::Limited(150),
                             amount: 135, // 90% of limit
@@ -158,7 +158,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Limit reached (100%)",
                     UsageCallout::new(
-                        Plan::ZedProTrial,
+                        Plan::V1(PlanV1::ZedProTrial),
                         ModelRequestUsage(RequestUsage {
                             limit: UsageLimit::Limited(150),
                             amount: 150, // 100% of limit
@@ -175,7 +175,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Limit reached (100%)",
                     UsageCallout::new(
-                        Plan::ZedPro,
+                        Plan::V1(PlanV1::ZedPro),
                         ModelRequestUsage(RequestUsage {
                             limit: UsageLimit::Limited(500),
                             amount: 500, // 100% of limit
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
index 77f41d1a73..3c8ffc1663 100644
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use client::{Client, UserStore};
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1, PlanV2};
 use gpui::{Entity, IntoElement, ParentElement};
 use language_model::{LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
 use ui::prelude::*;
@@ -57,8 +57,15 @@ impl AgentPanelOnboarding {
 
 impl Render for AgentPanelOnboarding {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let enrolled_in_trial = self.user_store.read(cx).plan() == Some(Plan::ZedProTrial);
-        let is_pro_user = self.user_store.read(cx).plan() == Some(Plan::ZedPro);
+        let enrolled_in_trial = self.user_store.read(cx).plan().is_some_and(|plan| {
+            matches!(
+                plan,
+                Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial)
+            )
+        });
+        let is_pro_user = self.user_store.read(cx).plan().is_some_and(|plan| {
+            matches!(plan, Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))
+        });
 
         AgentPanelOnboardingCard::new()
             .child(
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
index d16969ba77..e131a60b12 100644
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -10,7 +10,7 @@ pub use agent_api_keys_onboarding::{ApiKeysWithProviders, ApiKeysWithoutProvider
 pub use agent_panel_onboarding_card::AgentPanelOnboardingCard;
 pub use agent_panel_onboarding_content::AgentPanelOnboarding;
 pub use ai_upsell_card::AiUpsellCard;
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1, PlanV2};
 pub use edit_prediction_onboarding_content::EditPredictionOnboarding;
 pub use plan_definitions::PlanDefinitions;
 pub use young_account_banner::YoungAccountBanner;
@@ -308,13 +308,13 @@ impl RenderOnce for ZedAiOnboarding {
         if matches!(self.sign_in_status, SignInStatus::SignedIn) {
             match self.plan {
                 None => self.render_free_plan_state(cx.has_flag::<BillingV2FeatureFlag>(), cx),
-                Some(plan @ (Plan::ZedFree | Plan::ZedFreeV2)) => {
+                Some(plan @ (Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))) => {
                     self.render_free_plan_state(plan.is_v2(), cx)
                 }
-                Some(plan @ (Plan::ZedProTrial | Plan::ZedProTrialV2)) => {
+                Some(plan @ (Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial))) => {
                     self.render_trial_state(plan.is_v2(), cx)
                 }
-                Some(plan @ (Plan::ZedPro | Plan::ZedProV2)) => {
+                Some(plan @ (Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))) => {
                     self.render_pro_plan_state(plan.is_v2(), cx)
                 }
             }
@@ -370,15 +370,27 @@ impl Component for ZedAiOnboarding {
                     ),
                     single_example(
                         "Free Plan",
-                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedFree), false),
+                        onboarding(
+                            SignInStatus::SignedIn,
+                            Some(Plan::V1(PlanV1::ZedFree)),
+                            false,
+                        ),
                     ),
                     single_example(
                         "Pro Trial",
-                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedProTrial), false),
+                        onboarding(
+                            SignInStatus::SignedIn,
+                            Some(Plan::V1(PlanV1::ZedProTrial)),
+                            false,
+                        ),
                     ),
                     single_example(
                         "Pro Plan",
-                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedPro), false),
+                        onboarding(
+                            SignInStatus::SignedIn,
+                            Some(Plan::V1(PlanV1::ZedPro)),
+                            false,
+                        ),
                     ),
                 ])
                 .into_any_element(),
diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
index 1e4fafd50d..51758dd9ac 100644
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use client::{Client, UserStore, zed_urls};
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1, PlanV2};
 use feature_flags::{BillingV2FeatureFlag, FeatureFlagAppExt};
 use gpui::{AnyElement, App, Entity, IntoElement, RenderOnce, Window};
 use ui::{CommonAnimationExt, Divider, Vector, VectorName, prelude::*};
@@ -171,7 +171,7 @@ impl RenderOnce for AiUpsellCard {
 
         match self.sign_in_status {
             SignInStatus::SignedIn => match self.user_plan {
-                None | Some(Plan::ZedFree | Plan::ZedFreeV2) => card
+                None | Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree)) => card
                     .child(Label::new("Try Zed AI").size(LabelSize::Large))
                     .map(|this| {
                         if self.account_too_young {
@@ -237,16 +237,17 @@ impl RenderOnce for AiUpsellCard {
                             )
                         }
                     }),
-                Some(plan @ (Plan::ZedProTrial | Plan::ZedProTrialV2)) => card
-                    .child(pro_trial_stamp)
-                    .child(Label::new("You're in the Zed Pro Trial").size(LabelSize::Large))
-                    .child(
-                        Label::new("Here's what you get for the next 14 days:")
-                            .color(Color::Muted)
-                            .mb_2(),
-                    )
-                    .child(PlanDefinitions.pro_trial(plan.is_v2(), false)),
-                Some(plan @ (Plan::ZedPro | Plan::ZedProV2)) => card
+                Some(plan @ (Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial))) => {
+                    card.child(pro_trial_stamp)
+                        .child(Label::new("You're in the Zed Pro Trial").size(LabelSize::Large))
+                        .child(
+                            Label::new("Here's what you get for the next 14 days:")
+                                .color(Color::Muted)
+                                .mb_2(),
+                        )
+                        .child(PlanDefinitions.pro_trial(plan.is_v2(), false))
+                }
+                Some(plan @ (Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))) => card
                     .child(certified_user_stamp)
                     .child(Label::new("You're in the Zed Pro plan").size(LabelSize::Large))
                     .child(
@@ -326,7 +327,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: false,
-                                user_plan: Some(Plan::ZedFree),
+                                user_plan: Some(Plan::V1(PlanV1::ZedFree)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
@@ -337,7 +338,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: true,
-                                user_plan: Some(Plan::ZedFree),
+                                user_plan: Some(Plan::V1(PlanV1::ZedFree)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
@@ -348,7 +349,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: false,
-                                user_plan: Some(Plan::ZedProTrial),
+                                user_plan: Some(Plan::V1(PlanV1::ZedProTrial)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
@@ -359,7 +360,7 @@ impl Component for AiUpsellCard {
                                 sign_in_status: SignInStatus::SignedIn,
                                 sign_in: Arc::new(|_, _| {}),
                                 account_too_young: false,
-                                user_plan: Some(Plan::ZedPro),
+                                user_plan: Some(Plan::V1(PlanV1::ZedPro)),
                                 tab_index: Some(1),
                             }
                             .into_any_element(),
diff --git a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs b/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
index 50b729c37e..571f0f8e45 100644
--- a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
+++ b/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use client::{Client, UserStore};
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1, PlanV2};
 use gpui::{Entity, IntoElement, ParentElement};
 use ui::prelude::*;
 
@@ -36,7 +36,9 @@ impl EditPredictionOnboarding {
 
 impl Render for EditPredictionOnboarding {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_free_plan = self.user_store.read(cx).plan() == Some(Plan::ZedFree);
+        let is_free_plan = self.user_store.read(cx).plan().is_some_and(|plan| {
+            matches!(plan, Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))
+        });
 
         let github_copilot = v_flex()
             .gap_1()
diff --git a/crates/client/src/test.rs b/crates/client/src/test.rs
index 3c451fcb01..da0e8a0f55 100644
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -1,7 +1,7 @@
 use crate::{Client, Connection, Credentials, EstablishConnectionError, UserStore};
 use anyhow::{Context as _, Result, anyhow};
 use cloud_api_client::{AuthenticatedUser, GetAuthenticatedUserResponse, PlanInfo};
-use cloud_llm_client::{CurrentUsage, Plan, UsageData, UsageLimit};
+use cloud_llm_client::{CurrentUsage, PlanV1, UsageData, UsageLimit};
 use futures::{StreamExt, stream::BoxStream};
 use gpui::{AppContext as _, BackgroundExecutor, Entity, TestAppContext};
 use http_client::{AsyncBody, Method, Request, http};
@@ -269,7 +269,8 @@ pub fn make_get_authenticated_user_response(
         },
         feature_flags: vec![],
         plan: PlanInfo {
-            plan: Plan::ZedPro,
+            plan: PlanV1::ZedPro,
+            plan_v2: None,
             subscription_period: None,
             usage: CurrentUsage {
                 model_requests: UsageData {
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index a4c66e582c..63626e8ce1 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -5,7 +5,8 @@ use cloud_api_client::websocket_protocol::MessageToClient;
 use cloud_api_client::{GetAuthenticatedUserResponse, PlanInfo};
 use cloud_llm_client::{
     EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME, EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME,
-    MODEL_REQUESTS_USAGE_AMOUNT_HEADER_NAME, MODEL_REQUESTS_USAGE_LIMIT_HEADER_NAME, UsageLimit,
+    MODEL_REQUESTS_USAGE_AMOUNT_HEADER_NAME, MODEL_REQUESTS_USAGE_LIMIT_HEADER_NAME, Plan,
+    UsageLimit,
 };
 use collections::{HashMap, HashSet, hash_map::Entry};
 use derive_more::Deref;
@@ -692,20 +693,22 @@ impl UserStore {
         self.current_user.borrow().clone()
     }
 
-    pub fn plan(&self) -> Option<cloud_llm_client::Plan> {
+    pub fn plan(&self) -> Option<Plan> {
         #[cfg(debug_assertions)]
         if let Ok(plan) = std::env::var("ZED_SIMULATE_PLAN").as_ref() {
+            use cloud_llm_client::PlanV1;
+
             return match plan.as_str() {
-                "free" => Some(cloud_llm_client::Plan::ZedFree),
-                "trial" => Some(cloud_llm_client::Plan::ZedProTrial),
-                "pro" => Some(cloud_llm_client::Plan::ZedPro),
+                "free" => Some(Plan::V1(PlanV1::ZedFree)),
+                "trial" => Some(Plan::V1(PlanV1::ZedProTrial)),
+                "pro" => Some(Plan::V1(PlanV1::ZedPro)),
                 _ => {
                     panic!("ZED_SIMULATE_PLAN must be one of 'free', 'trial', or 'pro'");
                 }
             };
         }
 
-        self.plan_info.as_ref().map(|info| info.plan)
+        self.plan_info.as_ref().map(|info| info.plan())
     }
 
     pub fn subscription_period(&self) -> Option<(DateTime<Utc>, DateTime<Utc>)> {
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index fa189cd3b5..fddf505f10 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -1,6 +1,7 @@
 mod timestamp;
 pub mod websocket_protocol;
 
+use cloud_llm_client::Plan;
 use serde::{Deserialize, Serialize};
 
 pub use crate::timestamp::Timestamp;
@@ -27,7 +28,9 @@ pub struct AuthenticatedUser {
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct PlanInfo {
-    pub plan: cloud_llm_client::Plan,
+    pub plan: cloud_llm_client::PlanV1,
+    #[serde(default)]
+    pub plan_v2: Option<cloud_llm_client::PlanV2>,
     pub subscription_period: Option<SubscriptionPeriod>,
     pub usage: cloud_llm_client::CurrentUsage,
     pub trial_started_at: Option<Timestamp>,
@@ -36,6 +39,12 @@ pub struct PlanInfo {
     pub has_overdue_invoices: bool,
 }
 
+impl PlanInfo {
+    pub fn plan(&self) -> Plan {
+        self.plan_v2.map(Plan::V2).unwrap_or(Plan::V1(self.plan))
+    }
+}
+
 #[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub struct SubscriptionPeriod {
     pub started_at: Timestamp,
diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
index 99f77f4ef3..16267d86d8 100644
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -74,38 +74,60 @@ impl FromStr for UsageLimit {
     }
 }
 
-#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Plan {
-    #[default]
-    #[serde(alias = "Free")]
-    ZedFree,
-    ZedFreeV2,
-    #[serde(alias = "ZedPro")]
-    ZedPro,
-    ZedProV2,
-    #[serde(alias = "ZedProTrial")]
-    ZedProTrial,
-    ZedProTrialV2,
+    V1(PlanV1),
+    V2(PlanV2),
 }
 
 impl Plan {
     pub fn is_v2(&self) -> bool {
-        matches!(self, Plan::ZedFreeV2 | Plan::ZedProV2 | Plan::ZedProTrialV2)
+        matches!(self, Self::V2(_))
     }
 }
 
-impl FromStr for Plan {
+#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum PlanV1 {
+    #[default]
+    #[serde(alias = "Free")]
+    ZedFree,
+    #[serde(alias = "ZedPro")]
+    ZedPro,
+    #[serde(alias = "ZedProTrial")]
+    ZedProTrial,
+}
+
+impl FromStr for PlanV1 {
     type Err = anyhow::Error;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
-            "zed_free" => Ok(Plan::ZedFree),
-            "zed_free_v2" => Ok(Plan::ZedFreeV2),
-            "zed_pro" => Ok(Plan::ZedPro),
-            "zed_pro_v2" => Ok(Plan::ZedProV2),
-            "zed_pro_trial" => Ok(Plan::ZedProTrial),
-            "zed_pro_trial_v2" => Ok(Plan::ZedProTrialV2),
+            "zed_free" => Ok(Self::ZedFree),
+            "zed_pro" => Ok(Self::ZedPro),
+            "zed_pro_trial" => Ok(Self::ZedProTrial),
+            plan => Err(anyhow::anyhow!("invalid plan: {plan:?}")),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum PlanV2 {
+    #[default]
+    ZedFree,
+    ZedPro,
+    ZedProTrial,
+}
+
+impl FromStr for PlanV2 {
+    type Err = anyhow::Error;
+
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
+        match value {
+            "zed_free" => Ok(Self::ZedFree),
+            "zed_pro" => Ok(Self::ZedPro),
+            "zed_pro_trial" => Ok(Self::ZedProTrial),
             plan => Err(anyhow::anyhow!("invalid plan: {plan:?}")),
         }
     }
@@ -306,7 +328,7 @@ pub struct ListModelsResponse {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct GetSubscriptionResponse {
-    pub plan: Plan,
+    pub plan: PlanV1,
     pub usage: Option<CurrentUsage>,
 }
 
@@ -330,33 +352,39 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_plan_deserialize_snake_case() {
-        let plan = serde_json::from_value::<Plan>(json!("zed_free")).unwrap();
-        assert_eq!(plan, Plan::ZedFree);
+    fn test_plan_v1_deserialize_snake_case() {
+        let plan = serde_json::from_value::<PlanV1>(json!("zed_free")).unwrap();
+        assert_eq!(plan, PlanV1::ZedFree);
 
-        let plan = serde_json::from_value::<Plan>(json!("zed_pro")).unwrap();
-        assert_eq!(plan, Plan::ZedPro);
+        let plan = serde_json::from_value::<PlanV1>(json!("zed_pro")).unwrap();
+        assert_eq!(plan, PlanV1::ZedPro);
 
-        let plan = serde_json::from_value::<Plan>(json!("zed_pro_trial")).unwrap();
-        assert_eq!(plan, Plan::ZedProTrial);
-
-        let plan = serde_json::from_value::<Plan>(json!("zed_pro_v2")).unwrap();
-        assert_eq!(plan, Plan::ZedProV2);
-
-        let plan = serde_json::from_value::<Plan>(json!("zed_pro_trial_v2")).unwrap();
-        assert_eq!(plan, Plan::ZedProTrialV2);
+        let plan = serde_json::from_value::<PlanV1>(json!("zed_pro_trial")).unwrap();
+        assert_eq!(plan, PlanV1::ZedProTrial);
     }
 
     #[test]
-    fn test_plan_deserialize_aliases() {
-        let plan = serde_json::from_value::<Plan>(json!("Free")).unwrap();
-        assert_eq!(plan, Plan::ZedFree);
+    fn test_plan_v1_deserialize_aliases() {
+        let plan = serde_json::from_value::<PlanV1>(json!("Free")).unwrap();
+        assert_eq!(plan, PlanV1::ZedFree);
 
-        let plan = serde_json::from_value::<Plan>(json!("ZedPro")).unwrap();
-        assert_eq!(plan, Plan::ZedPro);
+        let plan = serde_json::from_value::<PlanV1>(json!("ZedPro")).unwrap();
+        assert_eq!(plan, PlanV1::ZedPro);
 
-        let plan = serde_json::from_value::<Plan>(json!("ZedProTrial")).unwrap();
-        assert_eq!(plan, Plan::ZedProTrial);
+        let plan = serde_json::from_value::<PlanV1>(json!("ZedProTrial")).unwrap();
+        assert_eq!(plan, PlanV1::ZedProTrial);
+    }
+
+    #[test]
+    fn test_plan_v2_deserialize_snake_case() {
+        let plan = serde_json::from_value::<PlanV2>(json!("zed_free")).unwrap();
+        assert_eq!(plan, PlanV2::ZedFree);
+
+        let plan = serde_json::from_value::<PlanV2>(json!("zed_pro")).unwrap();
+        assert_eq!(plan, PlanV2::ZedPro);
+
+        let plan = serde_json::from_value::<PlanV2>(json!("zed_pro_trial")).unwrap();
+        assert_eq!(plan, PlanV2::ZedProTrial);
     }
 
     #[test]
diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs
index 409bef2c82..e25ed0de50 100644
--- a/crates/language_model/src/model/cloud_model.rs
+++ b/crates/language_model/src/model/cloud_model.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use anyhow::Result;
 use client::Client;
 use cloud_api_types::websocket_protocol::MessageToClient;
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global, ReadGlobal as _};
 use smol::lock::{RwLock, RwLockUpgradableReadGuard, RwLockWriteGuard};
 use thiserror::Error;
@@ -29,16 +29,16 @@ pub struct ModelRequestLimitReachedError {
 impl fmt::Display for ModelRequestLimitReachedError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let message = match self.plan {
-            Plan::ZedFree => "Model request limit reached. Upgrade to Zed Pro for more requests.",
-            Plan::ZedPro => {
-                "Model request limit reached. Upgrade to usage-based billing for more requests."
-            }
-            Plan::ZedProTrial => {
+            Plan::V1(PlanV1::ZedFree) => {
                 "Model request limit reached. Upgrade to Zed Pro for more requests."
             }
-            Plan::ZedFreeV2 | Plan::ZedProV2 | Plan::ZedProTrialV2 => {
-                "Model request limit reached."
+            Plan::V1(PlanV1::ZedPro) => {
+                "Model request limit reached. Upgrade to usage-based billing for more requests."
             }
+            Plan::V1(PlanV1::ZedProTrial) => {
+                "Model request limit reached. Upgrade to Zed Pro for more requests."
+            }
+            Plan::V2(_) => "Model request limit reached.",
         };
 
         write!(f, "{message}")
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index b473d06357..421e34e658 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -7,8 +7,9 @@ use cloud_llm_client::{
     CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, CURRENT_PLAN_HEADER_NAME, CompletionBody,
     CompletionEvent, CompletionRequestStatus, CountTokensBody, CountTokensResponse,
     EXPIRED_LLM_TOKEN_HEADER_NAME, ListModelsResponse, MODEL_REQUESTS_RESOURCE_HEADER_VALUE, Plan,
-    SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME,
-    TOOL_USE_LIMIT_REACHED_HEADER_NAME, ZED_VERSION_HEADER_NAME,
+    PlanV1, PlanV2, SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME,
+    SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME, TOOL_USE_LIMIT_REACHED_HEADER_NAME,
+    ZED_VERSION_HEADER_NAME,
 };
 use futures::{
     AsyncBufReadExt, FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream,
@@ -480,7 +481,8 @@ impl CloudLanguageModel {
                         .headers()
                         .get(CURRENT_PLAN_HEADER_NAME)
                         .and_then(|plan| plan.to_str().ok())
-                        .and_then(|plan| cloud_llm_client::Plan::from_str(plan).ok())
+                        .and_then(|plan| cloud_llm_client::PlanV1::from_str(plan).ok())
+                        .map(Plan::V1)
                 {
                     return Err(anyhow!(ModelRequestLimitReachedError { plan }));
                 }
@@ -994,15 +996,17 @@ impl RenderOnce for ZedAiConfiguration {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
         let young_account_banner = YoungAccountBanner;
 
-        let is_pro = self.plan == Some(Plan::ZedPro);
+        let is_pro = self.plan.is_some_and(|plan| {
+            matches!(plan, Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))
+        });
         let subscription_text = match (self.plan, self.subscription_period) {
-            (Some(Plan::ZedPro), Some(_)) => {
+            (Some(Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro)), Some(_)) => {
                 "You have access to Zed's hosted models through your Pro subscription."
             }
-            (Some(Plan::ZedProTrial), Some(_)) => {
+            (Some(Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial)), Some(_)) => {
                 "You have access to Zed's hosted models through your Pro trial."
             }
-            (Some(Plan::ZedFree), Some(_)) => {
+            (Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree)), Some(_)) => {
                 "You have basic access to Zed's hosted models through the Free plan."
             }
             _ => {
@@ -1161,15 +1165,15 @@ impl Component for ZedAiConfiguration {
                     ),
                     single_example(
                         "Free Plan",
-                        configuration(true, Some(Plan::ZedFree), true, false),
+                        configuration(true, Some(Plan::V1(PlanV1::ZedFree)), true, false),
                     ),
                     single_example(
                         "Zed Pro Trial Plan",
-                        configuration(true, Some(Plan::ZedProTrial), true, false),
+                        configuration(true, Some(Plan::V1(PlanV1::ZedProTrial)), true, false),
                     ),
                     single_example(
                         "Zed Pro Plan",
-                        configuration(true, Some(Plan::ZedPro), true, false),
+                        configuration(true, Some(Plan::V1(PlanV1::ZedPro)), true, false),
                     ),
                 ])
                 .into_any_element(),
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 3e098b3660..4d451dd41f 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -23,7 +23,7 @@ use crate::application_menu::{
 use auto_update::AutoUpdateStatus;
 use call::ActiveCall;
 use client::{Client, UserStore, zed_urls};
-use cloud_llm_client::Plan;
+use cloud_llm_client::{Plan, PlanV1, PlanV2};
 use gpui::{
     Action, AnyElement, App, Context, Corner, Element, Entity, Focusable, InteractiveElement,
     IntoElement, MouseButton, ParentElement, Render, StatefulInteractiveElement, Styled,
@@ -668,13 +668,13 @@ impl TitleBar {
                         let user_login = user.github_login.clone();
 
                         let (plan_name, label_color, bg_color) = match plan {
-                            None | Some(Plan::ZedFree | Plan::ZedFreeV2) => {
+                            None | Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree)) => {
                                 ("Free", Color::Default, free_chip_bg)
                             }
-                            Some(Plan::ZedProTrial | Plan::ZedProTrialV2) => {
+                            Some(Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial)) => {
                                 ("Pro Trial", Color::Accent, pro_chip_bg)
                             }
-                            Some(Plan::ZedPro | Plan::ZedProV2) => {
+                            Some(Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro)) => {
                                 ("Pro", Color::Accent, pro_chip_bg)
                             }
                         };

From b8c30f448fc56a6edff5c35f9e84ab53da968058 Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Wed, 10 Sep 2025 16:13:41 -0400
Subject: [PATCH 763/823] Improve Tab Map performance (#32243)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Context

While looking into: #32051 and #16120 with instruments, I noticed that
`TabSnapshot::to_tab_point` and `TabSnapshot::to_fold_point` are a
common bottleneck between the two issues. This PR takes the first steps
into closing the stated issues by improving the performance of both
those functions.

### Method

`to_tab_point` and `to_fold_point` iterate through each character in
their rows to find tab characters and translate those characters into
their respective transformations. This PR changes this iteration to take
advantage of the tab character bitmap in the `Rope` data structure and
goes directly to each tab character when iterating.

The tab bitmap is now passed from each layer in-between the `Rope` to
the `TabMap`.

### Testing

I added several randomized tests to ensure that the new `to_tab_point`
and `to_fold_point` functions have the same behavior as the old methods
they're replacing. I also added `test_random_chunk_bitmap` on each layer
the tab bitmap is passed up to the `TabMap` to make sure that the bitmap
being passed is transformed correctly between the layers of
`DisplayMap`.

`test_random_chunk_bitmap` was added to these layers:
- buffer
- multi buffer
- custom_highlights
- inlay_map
- fold_map

## Benchmarking

I setup benchmarks with criterion that is runnable via `cargo bench -p
editor --profile=release-fast`. When benchmarking I had my laptop
plugged in and did so from the terminal with a minimal amount of
processes running. I'm also on a m4 max

### Results

#### To Tab Point

Went from completing 6.8M iterations in 5s with an average time of
`736.13 ns` to `683.38 ns` which is a `-7.1875%` improvement

#### To Fold Point

Went from completing 6.8M iterations in 5s with an average time of
`736.55 ns` to `682.40 ns` which is a `-7.1659%` improvement

#### Editor render

Went from having an average render time of `62.561 µs` to `57.216 µs`
which is a `-8.8248%` improvement

#### Build Buffer with one long line

Went from having an average buffer build time of `3.2549 ms` to `3.2635
ms` which is a `+0.2151%` regression within the margin of error

#### Editor with 1000 multi cursor input

Went from having an average edit time of `133.05 ms` to `122.96 ms`
which is a `-7.5776%` improvement

Release Notes:

- N/A

---------

Co-authored-by: Remco Smits <djsmits12@gmail.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
---
 Cargo.lock                                    |   1 +
 crates/editor/Cargo.toml                      |  10 +
 crates/editor/benches/display_map.rs          | 102 ++
 crates/editor/benches/editor_render.rs        | 172 ++++
 crates/editor/src/display_map.rs              |   8 +-
 crates/editor/src/display_map/block_map.rs    |  14 +-
 .../src/display_map/custom_highlights.rs      | 161 +++-
 crates/editor/src/display_map/fold_map.rs     | 124 ++-
 crates/editor/src/display_map/inlay_map.rs    | 143 ++-
 crates/editor/src/display_map/tab_map.rs      | 896 ++++++++++++++++--
 crates/editor/src/display_map/wrap_map.rs     |  16 +
 crates/editor/src/editor.rs                   |   7 +-
 crates/language/src/buffer.rs                 |  24 +-
 crates/language/src/buffer_tests.rs           |  77 ++
 crates/multi_buffer/src/multi_buffer.rs       |  16 +-
 crates/multi_buffer/src/multi_buffer_tests.rs | 233 +++++
 crates/rope/src/chunk.rs                      |   7 +-
 crates/rope/src/rope.rs                       |  93 ++
 18 files changed, 2015 insertions(+), 89 deletions(-)
 create mode 100644 crates/editor/benches/display_map.rs
 create mode 100644 crates/editor/benches/editor_render.rs

diff --git a/Cargo.lock b/Cargo.lock
index 39b8885eae..f3927c6c95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5017,6 +5017,7 @@ dependencies = [
  "clock",
  "collections",
  "convert_case 0.8.0",
+ "criterion",
  "ctor",
  "dap",
  "db",
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index 339f98ae8b..be06cc04df 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -94,6 +94,7 @@ zed_actions.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
+criterion.workspace = true
 ctor.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
@@ -119,3 +120,12 @@ util = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
 http_client = { workspace = true, features = ["test-support"] }
 zlog.workspace = true
+
+
+[[bench]]
+name = "editor_render"
+harness = false
+
+[[bench]]
+name = "display_map"
+harness = false
diff --git a/crates/editor/benches/display_map.rs b/crates/editor/benches/display_map.rs
new file mode 100644
index 0000000000..919249ad01
--- /dev/null
+++ b/crates/editor/benches/display_map.rs
@@ -0,0 +1,102 @@
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
+use editor::MultiBuffer;
+use gpui::TestDispatcher;
+use itertools::Itertools;
+use rand::{Rng, SeedableRng, rngs::StdRng};
+use std::num::NonZeroU32;
+use text::Bias;
+use util::RandomCharIter;
+
+fn to_tab_point_benchmark(c: &mut Criterion) {
+    let rng = StdRng::seed_from_u64(1);
+    let dispatcher = TestDispatcher::new(rng);
+    let cx = gpui::TestAppContext::build(dispatcher, None);
+
+    let create_tab_map = |length: usize| {
+        let mut rng = StdRng::seed_from_u64(1);
+        let text = RandomCharIter::new(&mut rng)
+            .take(length)
+            .collect::<String>();
+        let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
+
+        let buffer_snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
+        use editor::display_map::*;
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
+        let fold_point = fold_snapshot.to_fold_point(
+            inlay_snapshot.to_point(InlayOffset(rng.random_range(0..length))),
+            Bias::Left,
+        );
+        let (_, snapshot) = TabMap::new(fold_snapshot, NonZeroU32::new(4).unwrap());
+
+        (length, snapshot, fold_point)
+    };
+
+    let inputs = [1024].into_iter().map(create_tab_map).collect_vec();
+
+    let mut group = c.benchmark_group("To tab point");
+
+    for (batch_size, snapshot, fold_point) in inputs {
+        group.bench_with_input(
+            BenchmarkId::new("to_tab_point", batch_size),
+            &snapshot,
+            |bench, snapshot| {
+                bench.iter(|| {
+                    snapshot.to_tab_point(fold_point);
+                });
+            },
+        );
+    }
+
+    group.finish();
+}
+
+fn to_fold_point_benchmark(c: &mut Criterion) {
+    let rng = StdRng::seed_from_u64(1);
+    let dispatcher = TestDispatcher::new(rng);
+    let cx = gpui::TestAppContext::build(dispatcher, None);
+
+    let create_tab_map = |length: usize| {
+        let mut rng = StdRng::seed_from_u64(1);
+        let text = RandomCharIter::new(&mut rng)
+            .take(length)
+            .collect::<String>();
+        let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
+
+        let buffer_snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
+        use editor::display_map::*;
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
+
+        let fold_point = fold_snapshot.to_fold_point(
+            inlay_snapshot.to_point(InlayOffset(rng.random_range(0..length))),
+            Bias::Left,
+        );
+
+        let (_, snapshot) = TabMap::new(fold_snapshot, NonZeroU32::new(4).unwrap());
+        let tab_point = snapshot.to_tab_point(fold_point);
+
+        (length, snapshot, tab_point)
+    };
+
+    let inputs = [1024].into_iter().map(create_tab_map).collect_vec();
+
+    let mut group = c.benchmark_group("To fold point");
+
+    for (batch_size, snapshot, tab_point) in inputs {
+        group.bench_with_input(
+            BenchmarkId::new("to_fold_point", batch_size),
+            &snapshot,
+            |bench, snapshot| {
+                bench.iter(|| {
+                    snapshot.to_fold_point(tab_point, Bias::Left);
+                });
+            },
+        );
+    }
+
+    group.finish();
+}
+
+criterion_group!(benches, to_tab_point_benchmark, to_fold_point_benchmark);
+criterion_main!(benches);
diff --git a/crates/editor/benches/editor_render.rs b/crates/editor/benches/editor_render.rs
new file mode 100644
index 0000000000..0ae1af5537
--- /dev/null
+++ b/crates/editor/benches/editor_render.rs
@@ -0,0 +1,172 @@
+use criterion::{Bencher, BenchmarkId};
+use editor::{
+    Editor, EditorMode, MultiBuffer,
+    actions::{DeleteToPreviousWordStart, SelectAll, SplitSelectionIntoLines},
+};
+use gpui::{AppContext, Focusable as _, TestAppContext, TestDispatcher};
+use project::Project;
+use rand::{Rng as _, SeedableRng as _, rngs::StdRng};
+use settings::SettingsStore;
+use ui::IntoElement;
+use util::RandomCharIter;
+
+fn editor_input_with_1000_cursors(bencher: &mut Bencher<'_>, cx: &TestAppContext) {
+    let mut cx = cx.clone();
+    let text = String::from_iter(["line:\n"; 1000]);
+    let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
+
+    let cx = cx.add_empty_window();
+    let editor = cx.update(|window, cx| {
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
+            editor.set_style(editor::EditorStyle::default(), window, cx);
+            editor.select_all(&SelectAll, window, cx);
+            editor.split_selection_into_lines(
+                &SplitSelectionIntoLines {
+                    keep_selections: true,
+                },
+                window,
+                cx,
+            );
+            editor
+        });
+        window.focus(&editor.focus_handle(cx));
+        editor
+    });
+
+    bencher.iter(|| {
+        cx.update(|window, cx| {
+            editor.update(cx, |editor, cx| {
+                editor.handle_input("hello world", window, cx);
+                editor.delete_to_previous_word_start(
+                    &DeleteToPreviousWordStart {
+                        ignore_newlines: false,
+                        ignore_brackets: false,
+                    },
+                    window,
+                    cx,
+                );
+                editor.delete_to_previous_word_start(
+                    &DeleteToPreviousWordStart {
+                        ignore_newlines: false,
+                        ignore_brackets: false,
+                    },
+                    window,
+                    cx,
+                );
+            });
+        })
+    });
+}
+
+fn open_editor_with_one_long_line(bencher: &mut Bencher<'_>, args: &(String, TestAppContext)) {
+    let (text, cx) = args;
+    let mut cx = cx.clone();
+
+    bencher.iter(|| {
+        let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
+
+        let cx = cx.add_empty_window();
+        let _ = cx.update(|window, cx| {
+            let editor = cx.new(|cx| {
+                let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
+                editor.set_style(editor::EditorStyle::default(), window, cx);
+                editor
+            });
+            window.focus(&editor.focus_handle(cx));
+            editor
+        });
+    });
+}
+
+fn editor_render(bencher: &mut Bencher<'_>, cx: &TestAppContext) {
+    let mut cx = cx.clone();
+    let buffer = cx.update(|cx| {
+        let mut rng = StdRng::seed_from_u64(1);
+        let text_len = rng.random_range(10000..90000);
+        if rng.random() {
+            let text = RandomCharIter::new(&mut rng)
+                .take(text_len)
+                .collect::<String>();
+            MultiBuffer::build_simple(&text, cx)
+        } else {
+            MultiBuffer::build_random(&mut rng, cx)
+        }
+    });
+
+    let cx = cx.add_empty_window();
+    let editor = cx.update(|window, cx| {
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
+            editor.set_style(editor::EditorStyle::default(), window, cx);
+            editor
+        });
+        window.focus(&editor.focus_handle(cx));
+        editor
+    });
+
+    bencher.iter(|| {
+        cx.update(|window, cx| {
+            // editor.update(cx, |editor, cx| editor.move_down(&MoveDown, window, cx));
+            let mut view = editor.clone().into_any_element();
+            let _ = view.request_layout(window, cx);
+            let _ = view.prepaint(window, cx);
+            view.paint(window, cx);
+        });
+    })
+}
+
+pub fn benches() {
+    let dispatcher = TestDispatcher::new(StdRng::seed_from_u64(1));
+    let cx = gpui::TestAppContext::build(dispatcher, None);
+    cx.update(|cx| {
+        let store = SettingsStore::test(cx);
+        cx.set_global(store);
+        assets::Assets.load_test_fonts(cx);
+        theme::init(theme::LoadThemes::JustBase, cx);
+        // release_channel::init(SemanticVersion::default(), cx);
+        client::init_settings(cx);
+        language::init(cx);
+        workspace::init_settings(cx);
+        Project::init_settings(cx);
+        editor::init(cx);
+    });
+
+    let mut criterion: criterion::Criterion<_> =
+        (criterion::Criterion::default()).configure_from_args();
+
+    // setup app context
+    let mut group = criterion.benchmark_group("Time to render");
+    group.bench_with_input(
+        BenchmarkId::new("editor_render", "TestAppContext"),
+        &cx,
+        editor_render,
+    );
+
+    group.finish();
+
+    let text = String::from_iter(["char"; 1000]);
+    let mut group = criterion.benchmark_group("Build buffer with one long line");
+    group.bench_with_input(
+        BenchmarkId::new("editor_with_one_long_line", "(String, TestAppContext )"),
+        &(text, cx.clone()),
+        open_editor_with_one_long_line,
+    );
+
+    group.finish();
+
+    let mut group = criterion.benchmark_group("multi cursor edits");
+    group.bench_with_input(
+        BenchmarkId::new("editor_input_with_1000_cursors", "TestAppContext"),
+        &cx,
+        editor_input_with_1000_cursors,
+    );
+    group.finish();
+}
+
+fn main() {
+    benches();
+    criterion::Criterion::default()
+        .configure_from_args()
+        .final_summary();
+}
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 7b2bd2eb41..1acbdab7a6 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -37,13 +37,13 @@ pub use block_map::{
 use block_map::{BlockRow, BlockSnapshot};
 use collections::{HashMap, HashSet};
 pub use crease_map::*;
+use fold_map::FoldSnapshot;
 pub use fold_map::{
     ChunkRenderer, ChunkRendererContext, ChunkRendererId, Fold, FoldId, FoldPlaceholder, FoldPoint,
 };
-use fold_map::{FoldMap, FoldSnapshot};
 use gpui::{App, Context, Entity, Font, HighlightStyle, LineLayout, Pixels, UnderlineStyle};
 pub use inlay_map::Inlay;
-use inlay_map::{InlayMap, InlaySnapshot};
+use inlay_map::InlaySnapshot;
 pub use inlay_map::{InlayOffset, InlayPoint};
 pub use invisibles::{is_invisible, replacement};
 use language::{
@@ -66,12 +66,14 @@ use std::{
     sync::Arc,
 };
 use sum_tree::{Bias, TreeMap};
-use tab_map::{TabMap, TabSnapshot};
+use tab_map::TabSnapshot;
 use text::{BufferId, LineIndent};
 use ui::{SharedString, px};
 use unicode_segmentation::UnicodeSegmentation;
 use wrap_map::{WrapMap, WrapSnapshot};
 
+pub use crate::display_map::{fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap};
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum FoldStatus {
     Folded,
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index de734e5ea6..03d04e7010 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -1737,6 +1737,7 @@ impl<'a> Iterator for BlockChunks<'a> {
 
             return Some(Chunk {
                 text: unsafe { std::str::from_utf8_unchecked(&NEWLINES[..line_count as usize]) },
+                chars: (1 << line_count) - 1,
                 ..Default::default()
             });
         }
@@ -1766,17 +1767,26 @@ impl<'a> Iterator for BlockChunks<'a> {
 
         let (mut prefix, suffix) = self.input_chunk.text.split_at(prefix_bytes);
         self.input_chunk.text = suffix;
+        self.input_chunk.tabs >>= prefix_bytes.saturating_sub(1);
+        self.input_chunk.chars >>= prefix_bytes.saturating_sub(1);
+
+        let mut tabs = self.input_chunk.tabs;
+        let mut chars = self.input_chunk.chars;
 
         if self.masked {
             // Not great for multibyte text because to keep cursor math correct we
             // need to have the same number of bytes in the input as output.
-            let chars = prefix.chars().count();
-            let bullet_len = chars;
+            let chars_count = prefix.chars().count();
+            let bullet_len = chars_count;
             prefix = &BULLETS[..bullet_len];
+            chars = (1 << bullet_len) - 1;
+            tabs = 0;
         }
 
         let chunk = Chunk {
             text: prefix,
+            tabs,
+            chars,
             ..self.input_chunk.clone()
         };
 
diff --git a/crates/editor/src/display_map/custom_highlights.rs b/crates/editor/src/display_map/custom_highlights.rs
index e4af453f89..b7518af59c 100644
--- a/crates/editor/src/display_map/custom_highlights.rs
+++ b/crates/editor/src/display_map/custom_highlights.rs
@@ -134,19 +134,33 @@ impl<'a> Iterator for CustomHighlightsChunks<'a> {
 
         let chunk = self
             .buffer_chunk
-            .get_or_insert_with(|| self.buffer_chunks.next().unwrap());
+            .get_or_insert_with(|| self.buffer_chunks.next().unwrap_or_default());
         if chunk.text.is_empty() {
-            *chunk = self.buffer_chunks.next().unwrap();
+            *chunk = self.buffer_chunks.next()?;
         }
 
-        let (prefix, suffix) = chunk
-            .text
-            .split_at(chunk.text.len().min(next_highlight_endpoint - self.offset));
+        let split_idx = chunk.text.len().min(next_highlight_endpoint - self.offset);
+        let (prefix, suffix) = chunk.text.split_at(split_idx);
+
+        let (chars, tabs) = if split_idx == 128 {
+            let output = (chunk.chars, chunk.tabs);
+            chunk.chars = 0;
+            chunk.tabs = 0;
+            output
+        } else {
+            let mask = (1 << split_idx) - 1;
+            let output = (chunk.chars & mask, chunk.tabs & mask);
+            chunk.chars = chunk.chars >> split_idx;
+            chunk.tabs = chunk.tabs >> split_idx;
+            output
+        };
 
         chunk.text = suffix;
         self.offset += prefix.len();
         let mut prefix = Chunk {
             text: prefix,
+            chars,
+            tabs,
             ..chunk.clone()
         };
         if !self.active_highlights.is_empty() {
@@ -173,3 +187,140 @@ impl Ord for HighlightEndpoint {
             .then_with(|| self.style.is_some().cmp(&other.style.is_some()))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::{any::TypeId, sync::Arc};
+
+    use super::*;
+    use crate::MultiBuffer;
+    use gpui::App;
+    use rand::prelude::*;
+    use util::RandomCharIter;
+
+    #[gpui::test(iterations = 100)]
+    fn test_random_chunk_bitmaps(cx: &mut App, mut rng: StdRng) {
+        // Generate random buffer using existing test infrastructure
+        let len = rng.random_range(10..10000);
+        let buffer = if rng.random() {
+            let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
+            MultiBuffer::build_simple(&text, cx)
+        } else {
+            MultiBuffer::build_random(&mut rng, cx)
+        };
+
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+
+        // Create random highlights
+        let mut highlights = sum_tree::TreeMap::default();
+        let highlight_count = rng.random_range(1..10);
+
+        for _i in 0..highlight_count {
+            let style = HighlightStyle {
+                color: Some(gpui::Hsla {
+                    h: rng.random::<f32>(),
+                    s: rng.random::<f32>(),
+                    l: rng.random::<f32>(),
+                    a: 1.0,
+                }),
+                ..Default::default()
+            };
+
+            let mut ranges = Vec::new();
+            let range_count = rng.random_range(1..10);
+            let text = buffer_snapshot.text();
+            for _ in 0..range_count {
+                if buffer_snapshot.len() == 0 {
+                    continue;
+                }
+
+                let mut start = rng.random_range(0..=buffer_snapshot.len().saturating_sub(10));
+
+                while !text.is_char_boundary(start) {
+                    start = start.saturating_sub(1);
+                }
+
+                let end_end = buffer_snapshot.len().min(start + 100);
+                let mut end = rng.random_range(start..=end_end);
+                while !text.is_char_boundary(end) {
+                    end = end.saturating_sub(1);
+                }
+
+                if start < end {
+                    start = end;
+                }
+                let start_anchor = buffer_snapshot.anchor_before(start);
+                let end_anchor = buffer_snapshot.anchor_after(end);
+                ranges.push(start_anchor..end_anchor);
+            }
+
+            let type_id = TypeId::of::<()>(); // Simple type ID for testing
+            highlights.insert(HighlightKey::Type(type_id), Arc::new((style, ranges)));
+        }
+
+        // Get all chunks and verify their bitmaps
+        let chunks =
+            CustomHighlightsChunks::new(0..buffer_snapshot.len(), false, None, &buffer_snapshot);
+
+        for chunk in chunks {
+            let chunk_text = chunk.text;
+            let chars_bitmap = chunk.chars;
+            let tabs_bitmap = chunk.tabs;
+
+            // Check empty chunks have empty bitmaps
+            if chunk_text.is_empty() {
+                assert_eq!(
+                    chars_bitmap, 0,
+                    "Empty chunk should have empty chars bitmap"
+                );
+                assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
+                continue;
+            }
+
+            // Verify that chunk text doesn't exceed 128 bytes
+            assert!(
+                chunk_text.len() <= 128,
+                "Chunk text length {} exceeds 128 bytes",
+                chunk_text.len()
+            );
+
+            // Verify chars bitmap
+            let char_indices = chunk_text
+                .char_indices()
+                .map(|(i, _)| i)
+                .collect::<Vec<_>>();
+
+            for byte_idx in 0..chunk_text.len() {
+                let should_have_bit = char_indices.contains(&byte_idx);
+                let has_bit = chars_bitmap & (1 << byte_idx) != 0;
+
+                if has_bit != should_have_bit {
+                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                    eprintln!("Char indices: {:?}", char_indices);
+                    eprintln!("Chars bitmap: {:#b}", chars_bitmap);
+                    assert_eq!(
+                        has_bit, should_have_bit,
+                        "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
+                        byte_idx, chunk_text, should_have_bit, has_bit
+                    );
+                }
+            }
+
+            // Verify tabs bitmap
+            for (byte_idx, byte) in chunk_text.bytes().enumerate() {
+                let is_tab = byte == b'\t';
+                let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
+
+                if has_bit != is_tab {
+                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                    eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
+                    assert_eq!(
+                        has_bit, is_tab,
+                        "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
+                        byte_idx, chunk_text, byte as char, is_tab, has_bit
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs
index 6d160d0d6d..405f25219f 100644
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -320,13 +320,13 @@ impl FoldMapWriter<'_> {
 /// Decides where the fold indicators should be; also tracks parts of a source file that are currently folded.
 ///
 /// See the [`display_map` module documentation](crate::display_map) for more information.
-pub(crate) struct FoldMap {
+pub struct FoldMap {
     snapshot: FoldSnapshot,
     next_fold_id: FoldId,
 }
 
 impl FoldMap {
-    pub(crate) fn new(inlay_snapshot: InlaySnapshot) -> (Self, FoldSnapshot) {
+    pub fn new(inlay_snapshot: InlaySnapshot) -> (Self, FoldSnapshot) {
         let this = Self {
             snapshot: FoldSnapshot {
                 folds: SumTree::new(&inlay_snapshot.buffer),
@@ -360,7 +360,7 @@ impl FoldMap {
         (self.snapshot.clone(), edits)
     }
 
-    pub fn write(
+    pub(crate) fn write(
         &mut self,
         inlay_snapshot: InlaySnapshot,
         edits: Vec<InlayEdit>,
@@ -529,6 +529,7 @@ impl FoldMap {
                                 },
                                 placeholder: Some(TransformPlaceholder {
                                     text: ELLIPSIS,
+                                    chars: 1,
                                     renderer: ChunkRenderer {
                                         id: ChunkRendererId::Fold(fold.id),
                                         render: Arc::new(move |cx| {
@@ -872,6 +873,14 @@ impl FoldSnapshot {
         .flat_map(|chunk| chunk.text.chars())
     }
 
+    pub fn chunks_at(&self, start: FoldPoint) -> FoldChunks<'_> {
+        self.chunks(
+            start.to_offset(self)..self.len(),
+            false,
+            Highlights::default(),
+        )
+    }
+
     #[cfg(test)]
     pub fn clip_offset(&self, offset: FoldOffset, bias: Bias) -> FoldOffset {
         if offset > self.len() {
@@ -1034,6 +1043,7 @@ struct Transform {
 #[derive(Clone, Debug)]
 struct TransformPlaceholder {
     text: &'static str,
+    chars: u128,
     renderer: ChunkRenderer,
 }
 
@@ -1274,6 +1284,10 @@ pub struct Chunk<'a> {
     pub is_inlay: bool,
     /// An optional recipe for how the chunk should be presented.
     pub renderer: Option<ChunkRenderer>,
+    /// Bitmap of tab character locations in chunk
+    pub tabs: u128,
+    /// Bitmap of character locations in chunk
+    pub chars: u128,
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
@@ -1391,6 +1405,7 @@ impl<'a> Iterator for FoldChunks<'a> {
             self.output_offset.0 += placeholder.text.len();
             return Some(Chunk {
                 text: placeholder.text,
+                chars: placeholder.chars,
                 renderer: Some(placeholder.renderer.clone()),
                 ..Default::default()
             });
@@ -1429,6 +1444,16 @@ impl<'a> Iterator for FoldChunks<'a> {
             chunk.text = &chunk.text
                 [(self.inlay_offset - buffer_chunk_start).0..(chunk_end - buffer_chunk_start).0];
 
+            let bit_end = (chunk_end - buffer_chunk_start).0;
+            let mask = if bit_end >= 128 {
+                u128::MAX
+            } else {
+                (1u128 << bit_end) - 1
+            };
+
+            chunk.tabs = (chunk.tabs >> (self.inlay_offset - buffer_chunk_start).0) & mask;
+            chunk.chars = (chunk.chars >> (self.inlay_offset - buffer_chunk_start).0) & mask;
+
             if chunk_end == transform_end {
                 self.transform_cursor.next();
             } else if chunk_end == buffer_chunk_end {
@@ -1439,6 +1464,8 @@ impl<'a> Iterator for FoldChunks<'a> {
             self.output_offset.0 += chunk.text.len();
             return Some(Chunk {
                 text: chunk.text,
+                tabs: chunk.tabs,
+                chars: chunk.chars,
                 syntax_highlight_id: chunk.syntax_highlight_id,
                 highlight_style: chunk.highlight_style,
                 diagnostic_severity: chunk.diagnostic_severity,
@@ -2072,6 +2099,97 @@ mod tests {
         );
     }
 
+    #[gpui::test(iterations = 100)]
+    fn test_random_chunk_bitmaps(cx: &mut gpui::App, mut rng: StdRng) {
+        init_test(cx);
+
+        // Generate random buffer using existing test infrastructure
+        let text_len = rng.random_range(0..10000);
+        let buffer = if rng.random() {
+            let text = RandomCharIter::new(&mut rng)
+                .take(text_len)
+                .collect::<String>();
+            MultiBuffer::build_simple(&text, cx)
+        } else {
+            MultiBuffer::build_random(&mut rng, cx)
+        };
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (mut fold_map, _) = FoldMap::new(inlay_snapshot.clone());
+
+        // Perform random mutations
+        let mutation_count = rng.random_range(1..10);
+        for _ in 0..mutation_count {
+            fold_map.randomly_mutate(&mut rng);
+        }
+
+        let (snapshot, _) = fold_map.read(inlay_snapshot, vec![]);
+
+        // Get all chunks and verify their bitmaps
+        let chunks = snapshot.chunks(
+            FoldOffset(0)..FoldOffset(snapshot.len().0),
+            false,
+            Highlights::default(),
+        );
+
+        for chunk in chunks {
+            let chunk_text = chunk.text;
+            let chars_bitmap = chunk.chars;
+            let tabs_bitmap = chunk.tabs;
+
+            // Check empty chunks have empty bitmaps
+            if chunk_text.is_empty() {
+                assert_eq!(
+                    chars_bitmap, 0,
+                    "Empty chunk should have empty chars bitmap"
+                );
+                assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
+                continue;
+            }
+
+            // Verify that chunk text doesn't exceed 128 bytes
+            assert!(
+                chunk_text.len() <= 128,
+                "Chunk text length {} exceeds 128 bytes",
+                chunk_text.len()
+            );
+
+            // Verify chars bitmap
+            let char_indices = chunk_text
+                .char_indices()
+                .map(|(i, _)| i)
+                .collect::<Vec<_>>();
+
+            for byte_idx in 0..chunk_text.len() {
+                let should_have_bit = char_indices.contains(&byte_idx);
+                let has_bit = chars_bitmap & (1 << byte_idx) != 0;
+
+                if has_bit != should_have_bit {
+                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                    eprintln!("Char indices: {:?}", char_indices);
+                    eprintln!("Chars bitmap: {:#b}", chars_bitmap);
+                    assert_eq!(
+                        has_bit, should_have_bit,
+                        "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
+                        byte_idx, chunk_text, should_have_bit, has_bit
+                    );
+                }
+            }
+
+            // Verify tabs bitmap
+            for (byte_idx, byte) in chunk_text.bytes().enumerate() {
+                let is_tab = byte == b'\t';
+                let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
+
+                assert_eq!(
+                    has_bit, is_tab,
+                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
+                    byte_idx, chunk_text, byte as char, is_tab, has_bit
+                );
+            }
+        }
+    }
+
     fn init_test(cx: &mut gpui::App) {
         let store = SettingsStore::test(cx);
         cx.set_global(store);
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index 62c16f5a1e..9ceb0897d2 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -11,7 +11,7 @@ use std::{
     sync::Arc,
 };
 use sum_tree::{Bias, Cursor, Dimensions, SumTree};
-use text::{Patch, Rope};
+use text::{ChunkBitmaps, Patch, Rope};
 use ui::{ActiveTheme, IntoElement as _, ParentElement as _, Styled as _, div};
 
 use super::{Highlights, custom_highlights::CustomHighlightsChunks, fold_map::ChunkRendererId};
@@ -245,8 +245,9 @@ pub struct InlayChunks<'a> {
     transforms: Cursor<'a, Transform, Dimensions<InlayOffset, usize>>,
     buffer_chunks: CustomHighlightsChunks<'a>,
     buffer_chunk: Option<Chunk<'a>>,
-    inlay_chunks: Option<text::Chunks<'a>>,
-    inlay_chunk: Option<&'a str>,
+    inlay_chunks: Option<text::ChunkWithBitmaps<'a>>,
+    /// text, char bitmap, tabs bitmap
+    inlay_chunk: Option<ChunkBitmaps<'a>>,
     output_offset: InlayOffset,
     max_output_offset: InlayOffset,
     highlight_styles: HighlightStyles,
@@ -316,11 +317,25 @@ impl<'a> Iterator for InlayChunks<'a> {
 
                 let (prefix, suffix) = chunk.text.split_at(split_index);
 
+                let (chars, tabs) = if split_index == 128 {
+                    let output = (chunk.chars, chunk.tabs);
+                    chunk.chars = 0;
+                    chunk.tabs = 0;
+                    output
+                } else {
+                    let mask = (1 << split_index) - 1;
+                    let output = (chunk.chars & mask, chunk.tabs & mask);
+                    chunk.chars = chunk.chars >> split_index;
+                    chunk.tabs = chunk.tabs >> split_index;
+                    output
+                };
                 chunk.text = suffix;
                 self.output_offset.0 += prefix.len();
                 InlayChunk {
                     chunk: Chunk {
                         text: prefix,
+                        chars,
+                        tabs,
                         ..chunk.clone()
                     },
                     renderer: None,
@@ -397,9 +412,14 @@ impl<'a> Iterator for InlayChunks<'a> {
                     let start = offset_in_inlay;
                     let end = cmp::min(self.max_output_offset, self.transforms.end().0)
                         - self.transforms.start().0;
-                    inlay.text.chunks_in_range(start.0..end.0)
+                    let chunks = inlay.text.chunks_in_range(start.0..end.0);
+                    text::ChunkWithBitmaps(chunks)
                 });
-                let inlay_chunk = self
+                let ChunkBitmaps {
+                    text: inlay_chunk,
+                    chars,
+                    tabs,
+                } = self
                     .inlay_chunk
                     .get_or_insert_with(|| inlay_chunks.next().unwrap());
 
@@ -421,6 +441,20 @@ impl<'a> Iterator for InlayChunks<'a> {
 
                 let (chunk, remainder) = inlay_chunk.split_at(split_index);
                 *inlay_chunk = remainder;
+
+                let (chars, tabs) = if split_index == 128 {
+                    let output = (*chars, *tabs);
+                    *chars = 0;
+                    *tabs = 0;
+                    output
+                } else {
+                    let mask = (1 << split_index as u32) - 1;
+                    let output = (*chars & mask, *tabs & mask);
+                    *chars = *chars >> split_index;
+                    *tabs = *tabs >> split_index;
+                    output
+                };
+
                 if inlay_chunk.is_empty() {
                     self.inlay_chunk = None;
                 }
@@ -430,6 +464,8 @@ impl<'a> Iterator for InlayChunks<'a> {
                 InlayChunk {
                     chunk: Chunk {
                         text: chunk,
+                        chars,
+                        tabs,
                         highlight_style,
                         is_inlay: true,
                         ..Chunk::default()
@@ -1224,6 +1260,7 @@ mod tests {
     use std::{any::TypeId, cmp::Reverse, env, sync::Arc};
     use sum_tree::TreeMap;
     use text::Patch;
+    use util::RandomCharIter;
     use util::post_inc;
 
     #[test]
@@ -1966,6 +2003,102 @@ mod tests {
         }
     }
 
+    #[gpui::test(iterations = 100)]
+    fn test_random_chunk_bitmaps(cx: &mut gpui::App, mut rng: StdRng) {
+        init_test(cx);
+
+        // Generate random buffer using existing test infrastructure
+        let text_len = rng.random_range(0..10000);
+        let buffer = if rng.random() {
+            let text = RandomCharIter::new(&mut rng)
+                .take(text_len)
+                .collect::<String>();
+            MultiBuffer::build_simple(&text, cx)
+        } else {
+            MultiBuffer::build_random(&mut rng, cx)
+        };
+
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (mut inlay_map, _) = InlayMap::new(buffer_snapshot.clone());
+
+        // Perform random mutations to add inlays
+        let mut next_inlay_id = 0;
+        let mutation_count = rng.random_range(1..10);
+        for _ in 0..mutation_count {
+            inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
+        }
+
+        let (snapshot, _) = inlay_map.sync(buffer_snapshot, vec![]);
+
+        // Get all chunks and verify their bitmaps
+        let chunks = snapshot.chunks(
+            InlayOffset(0)..InlayOffset(snapshot.len().0),
+            false,
+            Highlights::default(),
+        );
+
+        for chunk in chunks.into_iter().map(|inlay_chunk| inlay_chunk.chunk) {
+            let chunk_text = chunk.text;
+            let chars_bitmap = chunk.chars;
+            let tabs_bitmap = chunk.tabs;
+
+            // Check empty chunks have empty bitmaps
+            if chunk_text.is_empty() {
+                assert_eq!(
+                    chars_bitmap, 0,
+                    "Empty chunk should have empty chars bitmap"
+                );
+                assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
+                continue;
+            }
+
+            // Verify that chunk text doesn't exceed 128 bytes
+            assert!(
+                chunk_text.len() <= 128,
+                "Chunk text length {} exceeds 128 bytes",
+                chunk_text.len()
+            );
+
+            // Verify chars bitmap
+            let char_indices = chunk_text
+                .char_indices()
+                .map(|(i, _)| i)
+                .collect::<Vec<_>>();
+
+            for byte_idx in 0..chunk_text.len() {
+                let should_have_bit = char_indices.contains(&byte_idx);
+                let has_bit = chars_bitmap & (1 << byte_idx) != 0;
+
+                if has_bit != should_have_bit {
+                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                    eprintln!("Char indices: {:?}", char_indices);
+                    eprintln!("Chars bitmap: {:#b}", chars_bitmap);
+                    assert_eq!(
+                        has_bit, should_have_bit,
+                        "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
+                        byte_idx, chunk_text, should_have_bit, has_bit
+                    );
+                }
+            }
+
+            // Verify tabs bitmap
+            for (byte_idx, byte) in chunk_text.bytes().enumerate() {
+                let is_tab = byte == b'\t';
+                let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
+
+                if has_bit != is_tab {
+                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                    eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
+                    assert_eq!(
+                        has_bit, is_tab,
+                        "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
+                        byte_idx, chunk_text, byte as char, is_tab, has_bit
+                    );
+                }
+            }
+        }
+    }
+
     fn init_test(cx: &mut App) {
         let store = SettingsStore::test(cx);
         cx.set_global(store);
diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs
index 523e777d91..e42d17123d 100644
--- a/crates/editor/src/display_map/tab_map.rs
+++ b/crates/editor/src/display_map/tab_map.rs
@@ -2,6 +2,7 @@ use super::{
     Highlights,
     fold_map::{self, Chunk, FoldChunks, FoldEdit, FoldPoint, FoldSnapshot},
 };
+
 use language::Point;
 use multi_buffer::MultiBufferSnapshot;
 use std::{cmp, mem, num::NonZeroU32, ops::Range};
@@ -72,6 +73,7 @@ impl TabMap {
                     false,
                     Highlights::default(),
                 ) {
+                    // todo(performance use tabs bitmask)
                     for (ix, _) in chunk.text.match_indices('\t') {
                         let offset_from_edit = offset_from_edit + (ix as u32);
                         if first_tab_offset.is_none() {
@@ -230,7 +232,7 @@ impl TabSnapshot {
         }
     }
 
-    pub fn chunks<'a>(
+    pub(crate) fn chunks<'a>(
         &'a self,
         range: Range<TabPoint>,
         language_aware: bool,
@@ -299,21 +301,29 @@ impl TabSnapshot {
     }
 
     pub fn to_tab_point(&self, input: FoldPoint) -> TabPoint {
-        let chars = self.fold_snapshot.chars_at(FoldPoint::new(input.row(), 0));
-        let expanded = self.expand_tabs(chars, input.column());
+        let chunks = self.fold_snapshot.chunks_at(FoldPoint::new(input.row(), 0));
+        let tab_cursor = TabStopCursor::new(chunks);
+        let expanded = self.expand_tabs(tab_cursor, input.column());
         TabPoint::new(input.row(), expanded)
     }
 
     pub fn to_fold_point(&self, output: TabPoint, bias: Bias) -> (FoldPoint, u32, u32) {
-        let chars = self.fold_snapshot.chars_at(FoldPoint::new(output.row(), 0));
+        let chunks = self
+            .fold_snapshot
+            .chunks_at(FoldPoint::new(output.row(), 0));
+
+        let tab_cursor = TabStopCursor::new(chunks);
         let expanded = output.column();
         let (collapsed, expanded_char_column, to_next_stop) =
-            self.collapse_tabs(chars, expanded, bias);
-        (
+            self.collapse_tabs(tab_cursor, expanded, bias);
+
+        let result = (
             FoldPoint::new(output.row(), collapsed),
             expanded_char_column,
             to_next_stop,
-        )
+        );
+
+        result
     }
 
     pub fn make_tab_point(&self, point: Point, bias: Bias) -> TabPoint {
@@ -330,72 +340,90 @@ impl TabSnapshot {
             .to_buffer_point(inlay_point)
     }
 
-    fn expand_tabs(&self, chars: impl Iterator<Item = char>, column: u32) -> u32 {
+    fn expand_tabs<'a, I>(&self, mut cursor: TabStopCursor<'a, I>, column: u32) -> u32
+    where
+        I: Iterator<Item = Chunk<'a>>,
+    {
         let tab_size = self.tab_size.get();
 
-        let mut expanded_chars = 0;
-        let mut expanded_bytes = 0;
-        let mut collapsed_bytes = 0;
         let end_column = column.min(self.max_expansion_column);
-        for c in chars {
-            if collapsed_bytes >= end_column {
-                break;
-            }
-            if c == '\t' {
-                let tab_len = tab_size - expanded_chars % tab_size;
-                expanded_bytes += tab_len;
-                expanded_chars += tab_len;
-            } else {
-                expanded_bytes += c.len_utf8() as u32;
-                expanded_chars += 1;
-            }
-            collapsed_bytes += c.len_utf8() as u32;
+        let mut seek_target = end_column;
+        let mut tab_count = 0;
+        let mut expanded_tab_len = 0;
+
+        while let Some(tab_stop) = cursor.seek(seek_target) {
+            let expanded_chars_old = tab_stop.char_offset + expanded_tab_len - tab_count;
+            let tab_len = tab_size - ((expanded_chars_old - 1) % tab_size);
+            tab_count += 1;
+            expanded_tab_len += tab_len;
+
+            seek_target = end_column - cursor.byte_offset;
         }
+
+        let left_over_char_bytes = if !cursor.is_char_boundary() {
+            cursor.bytes_until_next_char().unwrap_or(0) as u32
+        } else {
+            0
+        };
+
+        let collapsed_bytes = cursor.byte_offset() + left_over_char_bytes;
+        let expanded_bytes =
+            cursor.byte_offset() + expanded_tab_len - tab_count + left_over_char_bytes;
+
         expanded_bytes + column.saturating_sub(collapsed_bytes)
     }
 
-    fn collapse_tabs(
+    fn collapse_tabs<'a, I>(
         &self,
-        chars: impl Iterator<Item = char>,
+        mut cursor: TabStopCursor<'a, I>,
         column: u32,
         bias: Bias,
-    ) -> (u32, u32, u32) {
+    ) -> (u32, u32, u32)
+    where
+        I: Iterator<Item = Chunk<'a>>,
+    {
         let tab_size = self.tab_size.get();
+        let mut collapsed_column = column;
+        let mut seek_target = column.min(self.max_expansion_column);
+        let mut tab_count = 0;
+        let mut expanded_tab_len = 0;
 
-        let mut expanded_bytes = 0;
-        let mut expanded_chars = 0;
-        let mut collapsed_bytes = 0;
-        for c in chars {
-            if expanded_bytes >= column {
-                break;
-            }
-            if collapsed_bytes >= self.max_expansion_column {
-                break;
-            }
+        while let Some(tab_stop) = cursor.seek(seek_target) {
+            // Calculate how much we want to expand this tab stop (into spaces)
+            let expanded_chars_old = tab_stop.char_offset + expanded_tab_len - tab_count;
+            let tab_len = tab_size - ((expanded_chars_old - 1) % tab_size);
+            // Increment tab count
+            tab_count += 1;
+            // The count of how many spaces we've added to this line in place of tab bytes
+            expanded_tab_len += tab_len;
 
-            if c == '\t' {
-                let tab_len = tab_size - (expanded_chars % tab_size);
-                expanded_chars += tab_len;
-                expanded_bytes += tab_len;
-                if expanded_bytes > column {
-                    expanded_chars -= expanded_bytes - column;
-                    return match bias {
-                        Bias::Left => (collapsed_bytes, expanded_chars, expanded_bytes - column),
-                        Bias::Right => (collapsed_bytes + 1, expanded_chars, 0),
-                    };
-                }
+            // The count of bytes at this point in the iteration while considering tab_count and previous expansions
+            let expanded_bytes = tab_stop.byte_offset + expanded_tab_len - tab_count;
+
+            // Did we expand past the search target?
+            if expanded_bytes > column {
+                let mut expanded_chars = tab_stop.char_offset + expanded_tab_len - tab_count;
+                // We expanded past the search target, so need to account for the offshoot
+                expanded_chars -= expanded_bytes - column;
+                return match bias {
+                    Bias::Left => (
+                        cursor.byte_offset() - 1,
+                        expanded_chars,
+                        expanded_bytes - column,
+                    ),
+                    Bias::Right => (cursor.byte_offset(), expanded_chars, 0),
+                };
             } else {
-                expanded_chars += 1;
-                expanded_bytes += c.len_utf8() as u32;
+                // otherwise we only want to move the cursor collapse column forward
+                collapsed_column = collapsed_column - tab_len + 1;
+                seek_target = (collapsed_column - cursor.byte_offset)
+                    .min(self.max_expansion_column - cursor.byte_offset);
             }
-
-            if expanded_bytes > column && matches!(bias, Bias::Left) {
-                expanded_chars -= 1;
-                break;
-            }
-
-            collapsed_bytes += c.len_utf8() as u32;
         }
+
+        let collapsed_bytes = cursor.byte_offset();
+        let expanded_bytes = cursor.byte_offset() + expanded_tab_len - tab_count;
+        let expanded_chars = cursor.char_offset() + expanded_tab_len - tab_count;
         (
             collapsed_bytes + column.saturating_sub(expanded_bytes),
             expanded_chars,
@@ -523,6 +551,7 @@ impl TabChunks<'_> {
         self.chunk = Chunk {
             text: &SPACES[0..(to_next_stop as usize)],
             is_tab: true,
+            chars: (1u128 << to_next_stop) - 1,
             ..Default::default()
         };
         self.inside_leading_tab = to_next_stop > 0;
@@ -546,18 +575,37 @@ impl<'a> Iterator for TabChunks<'a> {
             }
         }
 
+        //todo(improve performance by using tab cursor)
         for (ix, c) in self.chunk.text.char_indices() {
             match c {
                 '\t' => {
                     if ix > 0 {
                         let (prefix, suffix) = self.chunk.text.split_at(ix);
+
+                        let (chars, tabs) = if ix == 128 {
+                            let output = (self.chunk.chars, self.chunk.tabs);
+                            self.chunk.chars = 0;
+                            self.chunk.tabs = 0;
+                            output
+                        } else {
+                            let mask = (1 << ix) - 1;
+                            let output = (self.chunk.chars & mask, self.chunk.tabs & mask);
+                            self.chunk.chars = self.chunk.chars >> ix;
+                            self.chunk.tabs = self.chunk.tabs >> ix;
+                            output
+                        };
+
                         self.chunk.text = suffix;
                         return Some(Chunk {
                             text: prefix,
+                            chars,
+                            tabs,
                             ..self.chunk.clone()
                         });
                     } else {
                         self.chunk.text = &self.chunk.text[1..];
+                        self.chunk.tabs >>= 1;
+                        self.chunk.chars >>= 1;
                         let tab_size = if self.input_column < self.max_expansion_column {
                             self.tab_size.get()
                         } else {
@@ -575,6 +623,8 @@ impl<'a> Iterator for TabChunks<'a> {
                         return Some(Chunk {
                             text: &SPACES[..len as usize],
                             is_tab: true,
+                            chars: (1 << len) - 1,
+                            tabs: 0,
                             ..self.chunk.clone()
                         });
                     }
@@ -603,21 +653,270 @@ mod tests {
     use super::*;
     use crate::{
         MultiBuffer,
-        display_map::{fold_map::FoldMap, inlay_map::InlayMap},
+        display_map::{
+            fold_map::{FoldMap, FoldOffset},
+            inlay_map::InlayMap,
+        },
     };
     use rand::{Rng, prelude::StdRng};
+    use util;
+
+    impl TabSnapshot {
+        fn expected_collapse_tabs(
+            &self,
+            chars: impl Iterator<Item = char>,
+            column: u32,
+            bias: Bias,
+        ) -> (u32, u32, u32) {
+            let tab_size = self.tab_size.get();
+
+            let mut expanded_bytes = 0;
+            let mut expanded_chars = 0;
+            let mut collapsed_bytes = 0;
+            for c in chars {
+                if expanded_bytes >= column {
+                    break;
+                }
+                if collapsed_bytes >= self.max_expansion_column {
+                    break;
+                }
+
+                if c == '\t' {
+                    let tab_len = tab_size - (expanded_chars % tab_size);
+                    expanded_chars += tab_len;
+                    expanded_bytes += tab_len;
+                    if expanded_bytes > column {
+                        expanded_chars -= expanded_bytes - column;
+                        return match bias {
+                            Bias::Left => {
+                                (collapsed_bytes, expanded_chars, expanded_bytes - column)
+                            }
+                            Bias::Right => (collapsed_bytes + 1, expanded_chars, 0),
+                        };
+                    }
+                } else {
+                    expanded_chars += 1;
+                    expanded_bytes += c.len_utf8() as u32;
+                }
+
+                if expanded_bytes > column && matches!(bias, Bias::Left) {
+                    expanded_chars -= 1;
+                    break;
+                }
+
+                collapsed_bytes += c.len_utf8() as u32;
+            }
+
+            (
+                collapsed_bytes + column.saturating_sub(expanded_bytes),
+                expanded_chars,
+                0,
+            )
+        }
+
+        pub fn expected_to_tab_point(&self, input: FoldPoint) -> TabPoint {
+            let chars = self.fold_snapshot.chars_at(FoldPoint::new(input.row(), 0));
+            let expanded = self.expected_expand_tabs(chars, input.column());
+            TabPoint::new(input.row(), expanded)
+        }
+
+        fn expected_expand_tabs(&self, chars: impl Iterator<Item = char>, column: u32) -> u32 {
+            let tab_size = self.tab_size.get();
+
+            let mut expanded_chars = 0;
+            let mut expanded_bytes = 0;
+            let mut collapsed_bytes = 0;
+            let end_column = column.min(self.max_expansion_column);
+            for c in chars {
+                if collapsed_bytes >= end_column {
+                    break;
+                }
+                if c == '\t' {
+                    let tab_len = tab_size - expanded_chars % tab_size;
+                    expanded_bytes += tab_len;
+                    expanded_chars += tab_len;
+                } else {
+                    expanded_bytes += c.len_utf8() as u32;
+                    expanded_chars += 1;
+                }
+                collapsed_bytes += c.len_utf8() as u32;
+            }
+
+            expanded_bytes + column.saturating_sub(collapsed_bytes)
+        }
+
+        fn expected_to_fold_point(&self, output: TabPoint, bias: Bias) -> (FoldPoint, u32, u32) {
+            let chars = self.fold_snapshot.chars_at(FoldPoint::new(output.row(), 0));
+            let expanded = output.column();
+            let (collapsed, expanded_char_column, to_next_stop) =
+                self.expected_collapse_tabs(chars, expanded, bias);
+            (
+                FoldPoint::new(output.row(), collapsed),
+                expanded_char_column,
+                to_next_stop,
+            )
+        }
+    }
 
     #[gpui::test]
     fn test_expand_tabs(cx: &mut gpui::App) {
+        let test_values = [
+            ("κg🏀 f\nwo🏀❌by🍐❎β🍗c\tβ❎ \ncλ🎉", 17),
+            (" \twςe", 4),
+            ("fε", 1),
+            ("i❎\t", 3),
+        ];
         let buffer = MultiBuffer::build_simple("", cx);
         let buffer_snapshot = buffer.read(cx).snapshot(cx);
         let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
         let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
 
-        assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 0), 0);
-        assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 1), 4);
-        assert_eq!(tab_snapshot.expand_tabs("\ta".chars(), 2), 5);
+        for (text, column) in test_values {
+            let mut tabs = 0u128;
+            let mut chars = 0u128;
+            for (idx, c) in text.char_indices() {
+                if c == '\t' {
+                    tabs |= 1 << idx;
+                }
+                chars |= 1 << idx;
+            }
+
+            let chunks = [Chunk {
+                text,
+                tabs,
+                chars,
+                ..Default::default()
+            }];
+
+            let cursor = TabStopCursor::new(chunks);
+
+            assert_eq!(
+                tab_snapshot.expected_expand_tabs(text.chars(), column),
+                tab_snapshot.expand_tabs(cursor, column)
+            );
+        }
+    }
+
+    #[gpui::test]
+    fn test_collapse_tabs(cx: &mut gpui::App) {
+        let input = "A\tBC\tDEF\tG\tHI\tJ\tK\tL\tM";
+
+        let buffer = MultiBuffer::build_simple(input, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
+
+        for (ix, _) in input.char_indices() {
+            let range = TabPoint::new(0, ix as u32)..tab_snapshot.max_point();
+
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.start, Bias::Left),
+                tab_snapshot.to_fold_point(range.start, Bias::Left),
+                "Failed with tab_point at column {ix}"
+            );
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.start, Bias::Right),
+                tab_snapshot.to_fold_point(range.start, Bias::Right),
+                "Failed with tab_point at column {ix}"
+            );
+
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.end, Bias::Left),
+                tab_snapshot.to_fold_point(range.end, Bias::Left),
+                "Failed with tab_point at column {ix}"
+            );
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.end, Bias::Right),
+                tab_snapshot.to_fold_point(range.end, Bias::Right),
+                "Failed with tab_point at column {ix}"
+            );
+        }
+    }
+
+    #[gpui::test]
+    fn test_to_fold_point_panic_reproduction(cx: &mut gpui::App) {
+        // This test reproduces a specific panic where to_fold_point returns incorrect results
+        let _text = "use macro_rules_attribute::apply;\nuse serde_json::Value;\nuse smol::{\n    io::AsyncReadExt,\n    process::{Command, Stdio},\n};\nuse smol_macros::main;\nuse std::io;\n\nfn test_random() {\n    // Generate a random value\n    let random_value = std::time::SystemTime::now()\n        .duration_since(std::time::UNIX_EPOCH)\n        .unwrap()\n        .as_secs()\n        % 100;\n\n    // Create some complex nested data structures\n    let mut vector = Vec::new();\n    for i in 0..random_value {\n        vector.push(i);\n    }\n    ";
+
+        let text = "γ\tw⭐\n🍐🍗 \t";
+        let buffer = MultiBuffer::build_simple(text, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
+
+        // This should panic with the expected vs actual mismatch
+        let tab_point = TabPoint::new(0, 9);
+        let result = tab_snapshot.to_fold_point(tab_point, Bias::Left);
+        let expected = tab_snapshot.expected_to_fold_point(tab_point, Bias::Left);
+
+        assert_eq!(result, expected);
+    }
+
+    #[gpui::test(iterations = 100)]
+    fn test_collapse_tabs_random(cx: &mut gpui::App, mut rng: StdRng) {
+        // Generate random input string with up to 200 characters including tabs
+        // to stay within the MAX_EXPANSION_COLUMN limit of 256
+        let len = rng.random_range(0..=2048);
+        let tab_size = NonZeroU32::new(rng.random_range(1..=4)).unwrap();
+        let mut input = String::with_capacity(len);
+
+        for _ in 0..len {
+            if rng.random_bool(0.1) {
+                // 10% chance of inserting a tab
+                input.push('\t');
+            } else {
+                // 90% chance of inserting a random ASCII character (excluding tab, newline, carriage return)
+                let ch = loop {
+                    let ascii_code = rng.random_range(32..=126); // printable ASCII range
+                    let ch = ascii_code as u8 as char;
+                    if ch != '\t' {
+                        break ch;
+                    }
+                };
+                input.push(ch);
+            }
+        }
+
+        let buffer = MultiBuffer::build_simple(&input, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
+        tab_snapshot.max_expansion_column = rng.random_range(0..323);
+        tab_snapshot.tab_size = tab_size;
+
+        for (ix, _) in input.char_indices() {
+            let range = TabPoint::new(0, ix as u32)..tab_snapshot.max_point();
+
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.start, Bias::Left),
+                tab_snapshot.to_fold_point(range.start, Bias::Left),
+                "Failed with input: {}, with idx: {ix}",
+                input
+            );
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.start, Bias::Right),
+                tab_snapshot.to_fold_point(range.start, Bias::Right),
+                "Failed with input: {}, with idx: {ix}",
+                input
+            );
+
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.end, Bias::Left),
+                tab_snapshot.to_fold_point(range.end, Bias::Left),
+                "Failed with input: {}, with idx: {ix}",
+                input
+            );
+            assert_eq!(
+                tab_snapshot.expected_to_fold_point(range.end, Bias::Right),
+                tab_snapshot.to_fold_point(range.end, Bias::Right),
+                "Failed with input: {}, with idx: {ix}",
+                input
+            );
+        }
     }
 
     #[gpui::test]
@@ -811,4 +1110,479 @@ mod tests {
             );
         }
     }
+
+    #[gpui::test(iterations = 100)]
+    fn test_to_tab_point_random(cx: &mut gpui::App, mut rng: StdRng) {
+        let tab_size = NonZeroU32::new(rng.random_range(1..=16)).unwrap();
+        let len = rng.random_range(0..=2000);
+
+        // Generate random text using RandomCharIter
+        let text = util::RandomCharIter::new(&mut rng)
+            .take(len)
+            .collect::<String>();
+
+        // Create buffer and tab map
+        let buffer = MultiBuffer::build_simple(&text, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let (mut tab_map, _) = TabMap::new(fold_snapshot, tab_size);
+
+        let mut next_inlay_id = 0;
+        let (inlay_snapshot, inlay_edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
+        let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
+        let max_fold_point = fold_snapshot.max_point();
+        let (mut tab_snapshot, _) = tab_map.sync(fold_snapshot.clone(), fold_edits, tab_size);
+
+        // Test random fold points
+        for _ in 0..50 {
+            tab_snapshot.max_expansion_column = rng.random_range(0..=256);
+            // Generate random fold point
+            let row = rng.random_range(0..=max_fold_point.row());
+            let max_column = if row < max_fold_point.row() {
+                fold_snapshot.line_len(row)
+            } else {
+                max_fold_point.column()
+            };
+            let column = rng.random_range(0..=max_column + 10);
+            let fold_point = FoldPoint::new(row, column);
+
+            let actual = tab_snapshot.to_tab_point(fold_point);
+            let expected = tab_snapshot.expected_to_tab_point(fold_point);
+
+            assert_eq!(
+                actual, expected,
+                "to_tab_point mismatch for fold_point {:?} in text {:?}",
+                fold_point, text
+            );
+        }
+    }
+
+    #[gpui::test]
+    fn test_tab_stop_cursor_utf8(cx: &mut gpui::App) {
+        let text = "\tfoo\tbarbarbar\t\tbaz\n";
+        let buffer = MultiBuffer::build_simple(text, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let chunks = fold_snapshot.chunks(
+            FoldOffset(0)..fold_snapshot.len(),
+            false,
+            Default::default(),
+        );
+        let mut cursor = TabStopCursor::new(chunks);
+        assert!(cursor.seek(0).is_none());
+        let mut tab_stops = Vec::new();
+
+        let mut all_tab_stops = Vec::new();
+        let mut byte_offset = 0;
+        for (offset, ch) in buffer.read(cx).snapshot(cx).text().char_indices() {
+            byte_offset += ch.len_utf8() as u32;
+
+            if ch == '\t' {
+                all_tab_stops.push(TabStop {
+                    byte_offset,
+                    char_offset: offset as u32 + 1,
+                });
+            }
+        }
+
+        while let Some(tab_stop) = cursor.seek(u32::MAX) {
+            tab_stops.push(tab_stop);
+        }
+        pretty_assertions::assert_eq!(tab_stops.as_slice(), all_tab_stops.as_slice(),);
+
+        assert_eq!(cursor.byte_offset(), byte_offset);
+    }
+
+    #[gpui::test]
+    fn test_tab_stop_with_end_range_utf8(cx: &mut gpui::App) {
+        let input = "A\tBC\t"; // DEF\tG\tHI\tJ\tK\tL\tM
+
+        let buffer = MultiBuffer::build_simple(input, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+
+        let chunks = fold_snapshot.chunks_at(FoldPoint::new(0, 0));
+        let mut cursor = TabStopCursor::new(chunks);
+
+        let mut actual_tab_stops = Vec::new();
+
+        let mut expected_tab_stops = Vec::new();
+        let mut byte_offset = 0;
+        for (offset, ch) in buffer.read(cx).snapshot(cx).text().char_indices() {
+            byte_offset += ch.len_utf8() as u32;
+
+            if ch == '\t' {
+                expected_tab_stops.push(TabStop {
+                    byte_offset,
+                    char_offset: offset as u32 + 1,
+                });
+            }
+        }
+
+        while let Some(tab_stop) = cursor.seek(u32::MAX) {
+            actual_tab_stops.push(tab_stop);
+        }
+        pretty_assertions::assert_eq!(actual_tab_stops.as_slice(), expected_tab_stops.as_slice(),);
+
+        assert_eq!(cursor.byte_offset(), byte_offset);
+    }
+
+    #[gpui::test(iterations = 100)]
+    fn test_tab_stop_cursor_random_utf8(cx: &mut gpui::App, mut rng: StdRng) {
+        // Generate random input string with up to 512 characters including tabs
+        let len = rng.random_range(0..=2048);
+        let mut input = String::with_capacity(len);
+
+        let mut skip_tabs = rng.random_bool(0.10);
+        for idx in 0..len {
+            if idx % 128 == 0 {
+                skip_tabs = rng.random_bool(0.10);
+            }
+
+            if rng.random_bool(0.15) && !skip_tabs {
+                input.push('\t');
+            } else {
+                let ch = loop {
+                    let ascii_code = rng.random_range(32..=126); // printable ASCII range
+                    let ch = ascii_code as u8 as char;
+                    if ch != '\t' {
+                        break ch;
+                    }
+                };
+                input.push(ch);
+            }
+        }
+
+        // Build the buffer and create cursor
+        let buffer = MultiBuffer::build_simple(&input, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+
+        // First, collect all expected tab positions
+        let mut all_tab_stops = Vec::new();
+        let mut byte_offset = 1;
+        let mut char_offset = 1;
+        for ch in buffer_snapshot.text().chars() {
+            if ch == '\t' {
+                all_tab_stops.push(TabStop {
+                    byte_offset,
+                    char_offset,
+                });
+            }
+            byte_offset += ch.len_utf8() as u32;
+            char_offset += 1;
+        }
+
+        // Test with various distances
+        let distances = vec![1, 5, 10, 50, 100, u32::MAX];
+        // let distances = vec![150];
+
+        for distance in distances {
+            let chunks = fold_snapshot.chunks_at(FoldPoint::new(0, 0));
+            let mut cursor = TabStopCursor::new(chunks);
+
+            let mut found_tab_stops = Vec::new();
+            let mut position = distance;
+            while let Some(tab_stop) = cursor.seek(position) {
+                found_tab_stops.push(tab_stop);
+                position = distance - tab_stop.byte_offset;
+            }
+
+            let expected_found_tab_stops: Vec<_> = all_tab_stops
+                .iter()
+                .take_while(|tab_stop| tab_stop.byte_offset <= distance)
+                .cloned()
+                .collect();
+
+            pretty_assertions::assert_eq!(
+                found_tab_stops,
+                expected_found_tab_stops,
+                "TabStopCursor output mismatch for distance {}. Input: {:?}",
+                distance,
+                input
+            );
+
+            let final_position = cursor.byte_offset();
+            if !found_tab_stops.is_empty() {
+                let last_tab_stop = found_tab_stops.last().unwrap();
+                assert!(
+                    final_position >= last_tab_stop.byte_offset,
+                    "Cursor final position {} is before last tab stop {}. Input: {:?}",
+                    final_position,
+                    last_tab_stop.byte_offset,
+                    input
+                );
+            }
+        }
+    }
+
+    #[gpui::test]
+    fn test_tab_stop_cursor_utf16(cx: &mut gpui::App) {
+        let text = "\r\t😁foo\tb😀arbar🤯bar\t\tbaz\n";
+        let buffer = MultiBuffer::build_simple(text, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+        let chunks = fold_snapshot.chunks(
+            FoldOffset(0)..fold_snapshot.len(),
+            false,
+            Default::default(),
+        );
+        let mut cursor = TabStopCursor::new(chunks);
+        assert!(cursor.seek(0).is_none());
+
+        let mut expected_tab_stops = Vec::new();
+        let mut byte_offset = 0;
+        for (i, ch) in fold_snapshot.chars_at(FoldPoint::new(0, 0)).enumerate() {
+            byte_offset += ch.len_utf8() as u32;
+
+            if ch == '\t' {
+                expected_tab_stops.push(TabStop {
+                    byte_offset,
+                    char_offset: i as u32 + 1,
+                });
+            }
+        }
+
+        let mut actual_tab_stops = Vec::new();
+        while let Some(tab_stop) = cursor.seek(u32::MAX) {
+            actual_tab_stops.push(tab_stop);
+        }
+
+        pretty_assertions::assert_eq!(actual_tab_stops.as_slice(), expected_tab_stops.as_slice(),);
+
+        assert_eq!(cursor.byte_offset(), byte_offset);
+    }
+
+    #[gpui::test(iterations = 100)]
+    fn test_tab_stop_cursor_random_utf16(cx: &mut gpui::App, mut rng: StdRng) {
+        // Generate random input string with up to 512 characters including tabs
+        let len = rng.random_range(0..=2048);
+        let input = util::RandomCharIter::new(&mut rng)
+            .take(len)
+            .collect::<String>();
+
+        // Build the buffer and create cursor
+        let buffer = MultiBuffer::build_simple(&input, cx);
+        let buffer_snapshot = buffer.read(cx).snapshot(cx);
+        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
+
+        // First, collect all expected tab positions
+        let mut all_tab_stops = Vec::new();
+        let mut byte_offset = 0;
+        for (i, ch) in buffer_snapshot.text().chars().enumerate() {
+            byte_offset += ch.len_utf8() as u32;
+            if ch == '\t' {
+                all_tab_stops.push(TabStop {
+                    byte_offset,
+                    char_offset: i as u32 + 1,
+                });
+            }
+        }
+
+        // Test with various distances
+        // let distances = vec![1, 5, 10, 50, 100, u32::MAX];
+        let distances = vec![150];
+
+        for distance in distances {
+            let chunks = fold_snapshot.chunks_at(FoldPoint::new(0, 0));
+            let mut cursor = TabStopCursor::new(chunks);
+
+            let mut found_tab_stops = Vec::new();
+            let mut position = distance;
+            while let Some(tab_stop) = cursor.seek(position) {
+                found_tab_stops.push(tab_stop);
+                position = distance - tab_stop.byte_offset;
+            }
+
+            let expected_found_tab_stops: Vec<_> = all_tab_stops
+                .iter()
+                .take_while(|tab_stop| tab_stop.byte_offset <= distance)
+                .cloned()
+                .collect();
+
+            pretty_assertions::assert_eq!(
+                found_tab_stops,
+                expected_found_tab_stops,
+                "TabStopCursor output mismatch for distance {}. Input: {:?}",
+                distance,
+                input
+            );
+
+            let final_position = cursor.byte_offset();
+            if !found_tab_stops.is_empty() {
+                let last_tab_stop = found_tab_stops.last().unwrap();
+                assert!(
+                    final_position >= last_tab_stop.byte_offset,
+                    "Cursor final position {} is before last tab stop {}. Input: {:?}",
+                    final_position,
+                    last_tab_stop.byte_offset,
+                    input
+                );
+            }
+        }
+    }
+}
+
+struct TabStopCursor<'a, I>
+where
+    I: Iterator<Item = Chunk<'a>>,
+{
+    chunks: I,
+    byte_offset: u32,
+    char_offset: u32,
+    /// Chunk
+    /// last tab position iterated through
+    current_chunk: Option<(Chunk<'a>, u32)>,
+}
+
+impl<'a, I> TabStopCursor<'a, I>
+where
+    I: Iterator<Item = Chunk<'a>>,
+{
+    fn new(chunks: impl IntoIterator<Item = Chunk<'a>, IntoIter = I>) -> Self {
+        Self {
+            chunks: chunks.into_iter(),
+            byte_offset: 0,
+            char_offset: 0,
+            current_chunk: None,
+        }
+    }
+
+    fn bytes_until_next_char(&self) -> Option<usize> {
+        self.current_chunk.as_ref().and_then(|(chunk, idx)| {
+            let mut idx = *idx;
+            let mut diff = 0;
+            while idx > 0 && chunk.chars & (1 << idx) == 0 {
+                idx -= 1;
+                diff += 1;
+            }
+
+            if chunk.chars & (1 << idx) != 0 {
+                Some(
+                    (chunk.text[idx as usize..].chars().next()?)
+                        .len_utf8()
+                        .saturating_sub(diff),
+                )
+            } else {
+                None
+            }
+        })
+    }
+
+    fn is_char_boundary(&self) -> bool {
+        self.current_chunk
+            .as_ref()
+            .is_some_and(|(chunk, idx)| (chunk.chars & (1 << *idx.min(&127))) != 0)
+    }
+
+    /// distance: length to move forward while searching for the next tab stop
+    fn seek(&mut self, distance: u32) -> Option<TabStop> {
+        if distance == 0 {
+            return None;
+        }
+
+        let mut distance_traversed = 0;
+
+        while let Some((mut chunk, chunk_position)) = self
+            .current_chunk
+            .take()
+            .or_else(|| self.chunks.next().zip(Some(0)))
+        {
+            if chunk.tabs == 0 {
+                let chunk_distance = chunk.text.len() as u32 - chunk_position;
+                if chunk_distance + distance_traversed >= distance {
+                    let overshoot = distance_traversed.abs_diff(distance);
+
+                    self.byte_offset += overshoot;
+                    self.char_offset += get_char_offset(
+                        chunk_position..(chunk_position + overshoot).saturating_sub(1).min(127),
+                        chunk.chars,
+                    );
+
+                    self.current_chunk = Some((chunk, chunk_position + overshoot));
+
+                    return None;
+                }
+
+                self.byte_offset += chunk_distance;
+                self.char_offset += get_char_offset(
+                    chunk_position..(chunk_position + chunk_distance).saturating_sub(1).min(127),
+                    chunk.chars,
+                );
+                distance_traversed += chunk_distance;
+                continue;
+            }
+            let tab_position = chunk.tabs.trailing_zeros() + 1;
+
+            if distance_traversed + tab_position - chunk_position > distance {
+                let cursor_position = distance_traversed.abs_diff(distance);
+
+                self.char_offset += get_char_offset(
+                    chunk_position..(chunk_position + cursor_position - 1),
+                    chunk.chars,
+                );
+                self.current_chunk = Some((chunk, cursor_position + chunk_position));
+                self.byte_offset += cursor_position;
+
+                return None;
+            }
+
+            self.byte_offset += tab_position - chunk_position;
+            self.char_offset += get_char_offset(chunk_position..(tab_position - 1), chunk.chars);
+
+            let tabstop = TabStop {
+                char_offset: self.char_offset,
+                byte_offset: self.byte_offset,
+            };
+
+            chunk.tabs = (chunk.tabs - 1) & chunk.tabs;
+
+            if tab_position as usize != chunk.text.len() {
+                self.current_chunk = Some((chunk, tab_position));
+            }
+
+            return Some(tabstop);
+        }
+
+        None
+    }
+
+    fn byte_offset(&self) -> u32 {
+        self.byte_offset
+    }
+
+    fn char_offset(&self) -> u32 {
+        self.char_offset
+    }
+}
+
+#[inline(always)]
+fn get_char_offset(range: Range<u32>, bit_map: u128) -> u32 {
+    // This edge case can happen when we're at chunk position 128
+
+    if range.start == range.end {
+        return if (1u128 << range.start) & bit_map == 0 {
+            0
+        } else {
+            1
+        };
+    }
+    let end_shift: u128 = 127u128 - range.end.min(127) as u128;
+    let mut bit_mask = (u128::MAX >> range.start) << range.start;
+    bit_mask = (bit_mask << end_shift) >> end_shift;
+    let bit_map = bit_map & bit_mask;
+
+    bit_map.count_ones()
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct TabStop {
+    char_offset: u32,
+    byte_offset: u32,
 }
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
index 127293726a..cd354d8229 100644
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -970,9 +970,25 @@ impl<'a> Iterator for WrapChunks<'a> {
         }
 
         let (prefix, suffix) = self.input_chunk.text.split_at(input_len);
+
+        let (chars, tabs) = if input_len == 128 {
+            let output = (self.input_chunk.chars, self.input_chunk.tabs);
+            self.input_chunk.chars = 0;
+            self.input_chunk.tabs = 0;
+            output
+        } else {
+            let mask = (1 << input_len) - 1;
+            let output = (self.input_chunk.chars & mask, self.input_chunk.tabs & mask);
+            self.input_chunk.chars = self.input_chunk.chars >> input_len;
+            self.input_chunk.tabs = self.input_chunk.tabs >> input_len;
+            output
+        };
+
         self.input_chunk.text = suffix;
         Some(Chunk {
             text: prefix,
+            chars,
+            tabs,
             ..self.input_chunk.clone()
         })
     }
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index aacf6d4f28..b731006a62 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -18906,12 +18906,7 @@ impl Editor {
     }
 
     /// called by the Element so we know what style we were most recently rendered with.
-    pub(crate) fn set_style(
-        &mut self,
-        style: EditorStyle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn set_style(&mut self, style: EditorStyle, window: &mut Window, cx: &mut Context<Self>) {
         // We intentionally do not inform the display map about the minimap style
         // so that wrapping is not recalculated and stays consistent for the editor
         // and its linked minimap.
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 0a8d62845a..51e6b6d1e0 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -27,6 +27,7 @@ use gpui::{
     App, AppContext as _, Context, Entity, EventEmitter, HighlightStyle, SharedString, StyledText,
     Task, TaskLabel, TextStyle,
 };
+
 use lsp::{LanguageServerId, NumberOrString};
 use parking_lot::Mutex;
 use schemars::JsonSchema;
@@ -500,6 +501,10 @@ pub struct Chunk<'a> {
     pub is_unnecessary: bool,
     /// Whether this chunk of text was originally a tab character.
     pub is_tab: bool,
+    /// A bitset of which characters are tabs in this string.
+    pub tabs: u128,
+    /// Bitmap of character indices in this chunk
+    pub chars: u128,
     /// Whether this chunk of text was originally a tab character.
     pub is_inlay: bool,
     /// Whether to underline the corresponding text range in the editor.
@@ -4919,7 +4924,12 @@ impl<'a> Iterator for BufferChunks<'a> {
         }
         self.diagnostic_endpoints = diagnostic_endpoints;
 
-        if let Some(chunk) = self.chunks.peek() {
+        if let Some(ChunkBitmaps {
+            text: chunk,
+            chars: chars_map,
+            tabs,
+        }) = self.chunks.peek_tabs()
+        {
             let chunk_start = self.range.start;
             let mut chunk_end = (self.chunks.offset() + chunk.len())
                 .min(next_capture_start)
@@ -4934,6 +4944,16 @@ impl<'a> Iterator for BufferChunks<'a> {
 
             let slice =
                 &chunk[chunk_start - self.chunks.offset()..chunk_end - self.chunks.offset()];
+            let bit_end = chunk_end - self.chunks.offset();
+
+            let mask = if bit_end >= 128 {
+                u128::MAX
+            } else {
+                (1u128 << bit_end) - 1
+            };
+            let tabs = (tabs >> (chunk_start - self.chunks.offset())) & mask;
+            let chars_map = (chars_map >> (chunk_start - self.chunks.offset())) & mask;
+
             self.range.start = chunk_end;
             if self.range.start == self.chunks.offset() + chunk.len() {
                 self.chunks.next().unwrap();
@@ -4945,6 +4965,8 @@ impl<'a> Iterator for BufferChunks<'a> {
                 underline: self.underline,
                 diagnostic_severity: self.current_diagnostic_severity(),
                 is_unnecessary: self.current_code_is_unnecessary(),
+                tabs,
+                chars: chars_map,
                 ..Chunk::default()
             })
         } else {
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 8f3f15cacd..fcd93390c8 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -3852,3 +3852,80 @@ fn init_settings(cx: &mut App, f: fn(&mut AllLanguageSettingsContent)) {
         settings.update_user_settings::<AllLanguageSettings>(cx, f);
     });
 }
+
+#[gpui::test(iterations = 100)]
+fn test_random_chunk_bitmaps(cx: &mut App, mut rng: StdRng) {
+    use util::RandomCharIter;
+
+    // Generate random text
+    let len = rng.random_range(0..10000);
+    let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
+
+    let buffer = cx.new(|cx| Buffer::local(text, cx));
+    let snapshot = buffer.read(cx).snapshot();
+
+    // Get all chunks and verify their bitmaps
+    let chunks = snapshot.chunks(0..snapshot.len(), false);
+
+    for chunk in chunks {
+        let chunk_text = chunk.text;
+        let chars_bitmap = chunk.chars;
+        let tabs_bitmap = chunk.tabs;
+
+        // Check empty chunks have empty bitmaps
+        if chunk_text.is_empty() {
+            assert_eq!(
+                chars_bitmap, 0,
+                "Empty chunk should have empty chars bitmap"
+            );
+            assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
+            continue;
+        }
+
+        // Verify that chunk text doesn't exceed 128 bytes
+        assert!(
+            chunk_text.len() <= 128,
+            "Chunk text length {} exceeds 128 bytes",
+            chunk_text.len()
+        );
+
+        // Verify chars bitmap
+        let char_indices = chunk_text
+            .char_indices()
+            .map(|(i, _)| i)
+            .collect::<Vec<_>>();
+
+        for byte_idx in 0..chunk_text.len() {
+            let should_have_bit = char_indices.contains(&byte_idx);
+            let has_bit = chars_bitmap & (1 << byte_idx) != 0;
+
+            if has_bit != should_have_bit {
+                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                eprintln!("Char indices: {:?}", char_indices);
+                eprintln!("Chars bitmap: {:#b}", chars_bitmap);
+            }
+
+            assert_eq!(
+                has_bit, should_have_bit,
+                "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
+                byte_idx, chunk_text, should_have_bit, has_bit
+            );
+        }
+
+        // Verify tabs bitmap
+        for (byte_idx, byte) in chunk_text.bytes().enumerate() {
+            let is_tab = byte == b'\t';
+            let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
+
+            if has_bit != is_tab {
+                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
+                assert_eq!(
+                    has_bit, is_tab,
+                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
+                    byte_idx, chunk_text, byte as char, is_tab, has_bit
+                );
+            }
+        }
+    }
+}
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 0bcfa2f4d3..8fa8c2c08c 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -7740,12 +7740,21 @@ impl<'a> Iterator for MultiBufferChunks<'a> {
                 let diff_transform_end = diff_transform_end.min(self.range.end);
 
                 if diff_transform_end < chunk_end {
-                    let (before, after) =
-                        chunk.text.split_at(diff_transform_end - self.range.start);
+                    let split_idx = diff_transform_end - self.range.start;
+                    let (before, after) = chunk.text.split_at(split_idx);
                     self.range.start = diff_transform_end;
+                    let mask = (1 << split_idx) - 1;
+                    let chars = chunk.chars & mask;
+                    let tabs = chunk.tabs & mask;
+
                     chunk.text = after;
+                    chunk.chars = chunk.chars >> split_idx;
+                    chunk.tabs = chunk.tabs >> split_idx;
+
                     Some(Chunk {
                         text: before,
+                        chars,
+                        tabs,
                         ..chunk.clone()
                     })
                 } else {
@@ -7789,6 +7798,7 @@ impl<'a> Iterator for MultiBufferChunks<'a> {
                     self.range.start += "\n".len();
                     Chunk {
                         text: "\n",
+                        chars: 1u128,
                         ..Default::default()
                     }
                 };
@@ -7885,9 +7895,11 @@ impl<'a> Iterator for ExcerptChunks<'a> {
 
         if self.footer_height > 0 {
             let text = unsafe { str::from_utf8_unchecked(&NEWLINES[..self.footer_height]) };
+            let chars = (1 << self.footer_height) - 1;
             self.footer_height = 0;
             return Some(Chunk {
                 text,
+                chars,
                 ..Default::default()
             });
         }
diff --git a/crates/multi_buffer/src/multi_buffer_tests.rs b/crates/multi_buffer/src/multi_buffer_tests.rs
index efc622b017..1be8250078 100644
--- a/crates/multi_buffer/src/multi_buffer_tests.rs
+++ b/crates/multi_buffer/src/multi_buffer_tests.rs
@@ -7,6 +7,7 @@ use parking_lot::RwLock;
 use rand::prelude::*;
 use settings::SettingsStore;
 use std::env;
+use util::RandomCharIter;
 use util::test::sample_text;
 
 #[ctor::ctor]
@@ -3716,3 +3717,235 @@ fn test_new_empty_buffers_title_can_be_set(cx: &mut App) {
     });
     assert_eq!(multibuffer.read(cx).title(cx), "Hey");
 }
+
+#[gpui::test(iterations = 100)]
+fn test_random_chunk_bitmaps(cx: &mut App, mut rng: StdRng) {
+    let multibuffer = if rng.random() {
+        let len = rng.random_range(0..10000);
+        let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
+        let buffer = cx.new(|cx| Buffer::local(text, cx));
+        cx.new(|cx| MultiBuffer::singleton(buffer, cx))
+    } else {
+        MultiBuffer::build_random(&mut rng, cx)
+    };
+
+    let snapshot = multibuffer.read(cx).snapshot(cx);
+
+    let chunks = snapshot.chunks(0..snapshot.len(), false);
+
+    for chunk in chunks {
+        let chunk_text = chunk.text;
+        let chars_bitmap = chunk.chars;
+        let tabs_bitmap = chunk.tabs;
+
+        if chunk_text.is_empty() {
+            assert_eq!(
+                chars_bitmap, 0,
+                "Empty chunk should have empty chars bitmap"
+            );
+            assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
+            continue;
+        }
+
+        assert!(
+            chunk_text.len() <= 128,
+            "Chunk text length {} exceeds 128 bytes",
+            chunk_text.len()
+        );
+
+        // Verify chars bitmap
+        let char_indices = chunk_text
+            .char_indices()
+            .map(|(i, _)| i)
+            .collect::<Vec<_>>();
+
+        for byte_idx in 0..chunk_text.len() {
+            let should_have_bit = char_indices.contains(&byte_idx);
+            let has_bit = chars_bitmap & (1 << byte_idx) != 0;
+
+            if has_bit != should_have_bit {
+                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                eprintln!("Char indices: {:?}", char_indices);
+                eprintln!("Chars bitmap: {:#b}", chars_bitmap);
+            }
+
+            assert_eq!(
+                has_bit, should_have_bit,
+                "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
+                byte_idx, chunk_text, should_have_bit, has_bit
+            );
+        }
+
+        for (byte_idx, byte) in chunk_text.bytes().enumerate() {
+            let is_tab = byte == b'\t';
+            let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
+
+            if has_bit != is_tab {
+                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
+                assert_eq!(
+                    has_bit, is_tab,
+                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
+                    byte_idx, chunk_text, byte as char, is_tab, has_bit
+                );
+            }
+        }
+    }
+}
+
+#[gpui::test(iterations = 100)]
+fn test_random_chunk_bitmaps_with_diffs(cx: &mut App, mut rng: StdRng) {
+    use buffer_diff::BufferDiff;
+    use util::RandomCharIter;
+
+    let multibuffer = if rng.random() {
+        let len = rng.random_range(100..10000);
+        let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
+        let buffer = cx.new(|cx| Buffer::local(text, cx));
+        cx.new(|cx| MultiBuffer::singleton(buffer, cx))
+    } else {
+        MultiBuffer::build_random(&mut rng, cx)
+    };
+
+    let _diff_count = rng.random_range(1..5);
+    let mut diffs = Vec::new();
+
+    multibuffer.update(cx, |multibuffer, cx| {
+        for buffer_id in multibuffer.excerpt_buffer_ids() {
+            if rng.random_bool(0.7) {
+                if let Some(buffer_handle) = multibuffer.buffer(buffer_id) {
+                    let buffer_text = buffer_handle.read(cx).text();
+                    let mut base_text = String::new();
+
+                    for line in buffer_text.lines() {
+                        if rng.random_bool(0.3) {
+                            continue;
+                        } else if rng.random_bool(0.3) {
+                            let line_len = rng.random_range(0..50);
+                            let modified_line = RandomCharIter::new(&mut rng)
+                                .take(line_len)
+                                .collect::<String>();
+                            base_text.push_str(&modified_line);
+                            base_text.push('\n');
+                        } else {
+                            base_text.push_str(line);
+                            base_text.push('\n');
+                        }
+                    }
+
+                    if rng.random_bool(0.5) {
+                        let extra_lines = rng.random_range(1..5);
+                        for _ in 0..extra_lines {
+                            let line_len = rng.random_range(0..50);
+                            let extra_line = RandomCharIter::new(&mut rng)
+                                .take(line_len)
+                                .collect::<String>();
+                            base_text.push_str(&extra_line);
+                            base_text.push('\n');
+                        }
+                    }
+
+                    let diff =
+                        cx.new(|cx| BufferDiff::new_with_base_text(&base_text, &buffer_handle, cx));
+                    diffs.push(diff.clone());
+                    multibuffer.add_diff(diff, cx);
+                }
+            }
+        }
+    });
+
+    multibuffer.update(cx, |multibuffer, cx| {
+        if rng.random_bool(0.5) {
+            multibuffer.set_all_diff_hunks_expanded(cx);
+        } else {
+            let snapshot = multibuffer.snapshot(cx);
+            let text = snapshot.text();
+
+            let mut ranges = Vec::new();
+            for _ in 0..rng.random_range(1..5) {
+                if snapshot.len() == 0 {
+                    break;
+                }
+
+                let diff_size = rng.random_range(5..1000);
+                let mut start = rng.random_range(0..snapshot.len());
+
+                while !text.is_char_boundary(start) {
+                    start = start.saturating_sub(1);
+                }
+
+                let mut end = rng.random_range(start..snapshot.len().min(start + diff_size));
+
+                while !text.is_char_boundary(end) {
+                    end = end.saturating_add(1);
+                }
+                let start_anchor = snapshot.anchor_after(start);
+                let end_anchor = snapshot.anchor_before(end);
+                ranges.push(start_anchor..end_anchor);
+            }
+            multibuffer.expand_diff_hunks(ranges, cx);
+        }
+    });
+
+    let snapshot = multibuffer.read(cx).snapshot(cx);
+
+    let chunks = snapshot.chunks(0..snapshot.len(), false);
+
+    for chunk in chunks {
+        let chunk_text = chunk.text;
+        let chars_bitmap = chunk.chars;
+        let tabs_bitmap = chunk.tabs;
+
+        if chunk_text.is_empty() {
+            assert_eq!(
+                chars_bitmap, 0,
+                "Empty chunk should have empty chars bitmap"
+            );
+            assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
+            continue;
+        }
+
+        assert!(
+            chunk_text.len() <= 128,
+            "Chunk text length {} exceeds 128 bytes",
+            chunk_text.len()
+        );
+
+        let char_indices = chunk_text
+            .char_indices()
+            .map(|(i, _)| i)
+            .collect::<Vec<_>>();
+
+        for byte_idx in 0..chunk_text.len() {
+            let should_have_bit = char_indices.contains(&byte_idx);
+            let has_bit = chars_bitmap & (1 << byte_idx) != 0;
+
+            if has_bit != should_have_bit {
+                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                eprintln!("Char indices: {:?}", char_indices);
+                eprintln!("Chars bitmap: {:#b}", chars_bitmap);
+            }
+
+            assert_eq!(
+                has_bit, should_have_bit,
+                "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
+                byte_idx, chunk_text, should_have_bit, has_bit
+            );
+        }
+
+        for (byte_idx, byte) in chunk_text.bytes().enumerate() {
+            let is_tab = byte == b'\t';
+            let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
+
+            if has_bit != is_tab {
+                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
+                eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
+                assert_eq!(
+                    has_bit, is_tab,
+                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
+                    byte_idx, chunk_text, byte as char, is_tab, has_bit
+                );
+            }
+        }
+    }
+}
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
index 689875274a..6b1f290852 100644
--- a/crates/rope/src/chunk.rs
+++ b/crates/rope/src/chunk.rs
@@ -13,7 +13,7 @@ pub struct Chunk {
     chars: u128,
     chars_utf16: u128,
     newlines: u128,
-    tabs: u128,
+    pub tabs: u128,
     pub text: ArrayString<MAX_BASE>,
 }
 
@@ -67,6 +67,11 @@ impl Chunk {
     pub fn slice(&self, range: Range<usize>) -> ChunkSlice<'_> {
         self.as_slice().slice(range)
     }
+
+    #[inline(always)]
+    pub fn chars(&self) -> u128 {
+        self.chars
+    }
 }
 
 #[derive(Clone, Copy, Debug)]
diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
index 9185b5baa3..8bcaef20ca 100644
--- a/crates/rope/src/rope.rs
+++ b/crates/rope/src/rope.rs
@@ -594,6 +594,15 @@ impl<'a> Cursor<'a> {
     }
 }
 
+pub struct ChunkBitmaps<'a> {
+    /// A slice of text up to 128 bytes in size
+    pub text: &'a str,
+    /// Bitmap of character locations in text. LSB ordered
+    pub chars: u128,
+    /// Bitmap of tab locations in text. LSB ordered
+    pub tabs: u128,
+}
+
 #[derive(Clone)]
 pub struct Chunks<'a> {
     chunks: sum_tree::Cursor<'a, Chunk, usize>,
@@ -757,6 +766,36 @@ impl<'a> Chunks<'a> {
         self.offset < initial_offset && self.offset == 0
     }
 
+    /// Returns bitmaps that represent character positions and tab positions
+    pub fn peak_with_bitmaps(&self) -> Option<ChunkBitmaps<'a>> {
+        if !self.offset_is_valid() {
+            return None;
+        }
+
+        let chunk = self.chunks.item()?;
+        let chunk_start = *self.chunks.start();
+        let slice_range = if self.reversed {
+            let slice_start = cmp::max(chunk_start, self.range.start) - chunk_start;
+            let slice_end = self.offset - chunk_start;
+            slice_start..slice_end
+        } else {
+            let slice_start = self.offset - chunk_start;
+            let slice_end = cmp::min(self.chunks.end(), self.range.end) - chunk_start;
+            slice_start..slice_end
+        };
+
+        let bitmask = (1u128 << slice_range.end as u128).saturating_sub(1);
+
+        let chars = (chunk.chars() & bitmask) >> slice_range.start;
+        let tabs = (chunk.tabs & bitmask) >> slice_range.start;
+
+        Some(ChunkBitmaps {
+            text: &chunk.text[slice_range],
+            chars,
+            tabs,
+        })
+    }
+
     pub fn peek(&self) -> Option<&'a str> {
         if !self.offset_is_valid() {
             return None;
@@ -777,6 +816,36 @@ impl<'a> Chunks<'a> {
         Some(&chunk.text[slice_range])
     }
 
+    pub fn peek_tabs(&self) -> Option<ChunkBitmaps<'a>> {
+        if !self.offset_is_valid() {
+            return None;
+        }
+
+        let chunk = self.chunks.item()?;
+        let chunk_start = *self.chunks.start();
+        let slice_range = if self.reversed {
+            let slice_start = cmp::max(chunk_start, self.range.start) - chunk_start;
+            let slice_end = self.offset - chunk_start;
+            slice_start..slice_end
+        } else {
+            let slice_start = self.offset - chunk_start;
+            let slice_end = cmp::min(self.chunks.end(), self.range.end) - chunk_start;
+            slice_start..slice_end
+        };
+        let chunk_start_offset = slice_range.start;
+        let slice_text = &chunk.text[slice_range];
+
+        // Shift the tabs to align with our slice window
+        let shifted_tabs = chunk.tabs >> chunk_start_offset;
+        let shifted_chars = chunk.chars() >> chunk_start_offset;
+
+        Some(ChunkBitmaps {
+            text: slice_text,
+            chars: shifted_chars,
+            tabs: shifted_tabs,
+        })
+    }
+
     pub fn lines(self) -> Lines<'a> {
         let reversed = self.reversed;
         Lines {
@@ -822,6 +891,30 @@ impl<'a> Chunks<'a> {
     }
 }
 
+pub struct ChunkWithBitmaps<'a>(pub Chunks<'a>);
+
+impl<'a> Iterator for ChunkWithBitmaps<'a> {
+    /// text, chars bitmap, tabs bitmap
+    type Item = ChunkBitmaps<'a>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let chunk_bitmaps = self.0.peak_with_bitmaps()?;
+        if self.0.reversed {
+            self.0.offset -= chunk_bitmaps.text.len();
+            if self.0.offset <= *self.0.chunks.start() {
+                self.0.chunks.prev();
+            }
+        } else {
+            self.0.offset += chunk_bitmaps.text.len();
+            if self.0.offset >= self.0.chunks.end() {
+                self.0.chunks.next();
+            }
+        }
+
+        Some(chunk_bitmaps)
+    }
+}
+
 impl<'a> Iterator for Chunks<'a> {
     type Item = &'a str;
 

From 14de161d06a681fe46b174a2515ed39ee2e5c7bc Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Wed, 10 Sep 2025 15:22:54 -0500
Subject: [PATCH 764/823] Compress minidumps (#37797)

@notpeter this should fix that issue you were seeing where a generated
minidump was too big to upload with the sentry api.

Release Notes:

- N/A
---
 Cargo.lock                    |  1 +
 crates/crashes/Cargo.toml     |  1 +
 crates/crashes/src/crashes.rs | 11 +++++++++--
 crates/zed/src/reliability.rs |  4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f3927c6c95..6025f75abd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4043,6 +4043,7 @@ dependencies = [
  "smol",
  "system_specs",
  "workspace-hack",
+ "zstd",
 ]
 
 [[package]]
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index 370f0bb5f6..9af416cbb0 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -17,6 +17,7 @@ serde.workspace = true
 serde_json.workspace = true
 system_specs.workspace = true
 workspace-hack.workspace = true
+zstd.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
 mach2.workspace = true
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index f7bc96bff9..f867f6cbdd 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -172,9 +172,16 @@ impl minidumper::ServerHandler for CrashServer {
 
     fn on_minidump_created(&self, result: Result<MinidumpBinary, minidumper::Error>) -> LoopAction {
         let minidump_error = match result {
-            Ok(mut md_bin) => {
+            Ok(MinidumpBinary { mut file, path, .. }) => {
                 use io::Write;
-                let _ = md_bin.file.flush();
+                file.flush().ok();
+                // TODO: clean this up once https://github.com/EmbarkStudios/crash-handling/issues/101 is addressed
+                drop(file);
+                let original_file = File::open(&path).unwrap();
+                let compressed_path = path.with_extension("zstd");
+                let compressed_file = File::create(&compressed_path).unwrap();
+                zstd::stream::copy_encode(original_file, compressed_file, 0).ok();
+                fs::rename(&compressed_path, path).unwrap();
                 None
             }
             Err(e) => Some(format!("{e:?}")),
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index 9c12a5f146..544fac226e 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -60,7 +60,9 @@ pub fn init_panic_hook(
             .or_else(|| info.payload().downcast_ref::<String>().cloned())
             .unwrap_or_else(|| "Box<Any>".to_string());
 
-        if *release_channel::RELEASE_CHANNEL != ReleaseChannel::Dev {
+        if *release_channel::RELEASE_CHANNEL != ReleaseChannel::Dev
+            || env::var("ZED_GENERATE_MINIDUMPS").is_ok()
+        {
             crashes::handle_panic(payload.clone(), info.location());
         }
 

From 95ccce3095899ff3afd045e2bc4347865de60d73 Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Wed, 10 Sep 2025 22:48:33 +0200
Subject: [PATCH 765/823] Rodio audio (#37786)

Adds input to the experimental rodio_audio pipeline.

Enable with:
```json
"audio": {
  "experimental.rodio_audio": true
}
```

Additionally enables automatic volume
control for incoming audio:
```json
"audio": {
  "experimental.control_output_volume": true
}
```

Release Notes:

- N/A
---
 .config/hakari.toml                           |   2 +-
 Cargo.lock                                    | 123 +++-
 Cargo.toml                                    |   3 +-
 crates/audio/Cargo.toml                       |  12 +-
 crates/audio/src/audio.rs                     | 193 +++++-
 crates/audio/src/audio_settings.rs            |  70 ++-
 crates/audio/src/replays.rs                   |  77 +++
 crates/audio/src/rodio_ext.rs                 | 593 ++++++++++++++++++
 crates/call/Cargo.toml                        |   1 +
 crates/call/src/call_impl/room.rs             |  13 +-
 crates/gpui/src/app/async_context.rs          |  17 +
 crates/livekit_client/Cargo.toml              |   9 +-
 crates/livekit_client/examples/test_app.rs    |   5 +-
 crates/livekit_client/src/livekit_client.rs   |   8 +-
 .../src/livekit_client/playback.rs            |  98 ++-
 .../src/livekit_client/playback/source.rs     |  31 +-
 crates/livekit_client/src/record.rs           |   9 +-
 crates/livekit_client/src/test.rs             |   2 +
 crates/zed/Cargo.toml                         |   1 -
 crates/zed/src/zed.rs                         | 132 ++--
 tooling/workspace-hack/Cargo.toml             |  14 +
 21 files changed, 1274 insertions(+), 139 deletions(-)
 create mode 100644 crates/audio/src/replays.rs
 create mode 100644 crates/audio/src/rodio_ext.rs

diff --git a/.config/hakari.toml b/.config/hakari.toml
index e8f094e618..b1e2954743 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -26,7 +26,7 @@ third-party = [
     # build of remote_server should not include scap / its x11 dependency
     { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
     # build of remote_server should not need to include on libalsa through rodio
-    { name = "rodio" },
+    { name = "rodio", git = "https://github.com/RustAudio/rodio", branch = "better_wav_output"},
 ]
 
 [final-excludes]
diff --git a/Cargo.lock b/Cargo.lock
index 6025f75abd..c1c7e0b2ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1383,12 +1383,18 @@ name = "audio"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "async-tar",
  "collections",
+ "crossbeam",
  "gpui",
+ "libwebrtc",
+ "log",
+ "parking_lot",
  "rodio",
  "schemars",
  "serde",
  "settings",
+ "smol",
  "util",
  "workspace-hack",
 ]
@@ -2609,6 +2615,7 @@ dependencies = [
  "audio",
  "client",
  "collections",
+ "feature_flags",
  "fs",
  "futures 0.3.31",
  "gpui",
@@ -4138,6 +4145,19 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -9659,6 +9679,7 @@ dependencies = [
  "scap",
  "serde",
  "serde_json",
+ "serde_urlencoded",
  "settings",
  "sha2",
  "simplelog",
@@ -13862,15 +13883,15 @@ dependencies = [
 [[package]]
 name = "rodio"
 version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
+source = "git+https://github.com/RustAudio/rodio?branch=better_wav_output#82514bd1f2c6cfd9a1a885019b26a8ffea75bc5c"
 dependencies = [
  "cpal",
  "dasp_sample",
  "hound",
  "num-rational",
+ "rtrb",
  "symphonia",
- "tracing",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -13944,6 +13965,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rtrb"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8388ea1a9e0ea807e442e8263a699e7edcb320ecbcd21b4fa8ff859acce3ba"
+
 [[package]]
 name = "rules_library"
 version = "0.1.0"
@@ -15908,12 +15935,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
 dependencies = [
  "lazy_static",
+ "symphonia-bundle-flac",
+ "symphonia-bundle-mp3",
+ "symphonia-codec-aac",
  "symphonia-codec-pcm",
+ "symphonia-codec-vorbis",
  "symphonia-core",
+ "symphonia-format-isomp4",
+ "symphonia-format-ogg",
  "symphonia-format-riff",
  "symphonia-metadata",
 ]
 
+[[package]]
+name = "symphonia-bundle-flac"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-bundle-mp3"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
+dependencies = [
+ "lazy_static",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-codec-aac"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70"
+dependencies = [
+ "lazy_static",
+ "log",
+ "symphonia-core",
+]
+
 [[package]]
 name = "symphonia-codec-pcm"
 version = "0.5.4"
@@ -15924,6 +15992,17 @@ dependencies = [
  "symphonia-core",
 ]
 
+[[package]]
+name = "symphonia-codec-vorbis"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-utils-xiph",
+]
+
 [[package]]
 name = "symphonia-core"
 version = "0.5.4"
@@ -15937,6 +16016,31 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "symphonia-format-isomp4"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844"
+dependencies = [
+ "encoding_rs",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-format-ogg"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
 [[package]]
 name = "symphonia-format-riff"
 version = "0.5.4"
@@ -15961,6 +16065,16 @@ dependencies = [
  "symphonia-core",
 ]
 
+[[package]]
+name = "symphonia-utils-xiph"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
+dependencies = [
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -19850,6 +19964,7 @@ dependencies = [
  "core-foundation-sys",
  "cranelift-codegen",
  "crc32fast",
+ "crossbeam-channel",
  "crossbeam-epoch",
  "crossbeam-utils",
  "crypto-common",
@@ -19893,6 +20008,7 @@ dependencies = [
  "libsqlite3-sys",
  "linux-raw-sys 0.4.15",
  "linux-raw-sys 0.9.4",
+ "livekit-runtime",
  "log",
  "lyon",
  "lyon_path",
@@ -20447,7 +20563,6 @@ dependencies = [
  "languages",
  "libc",
  "line_ending_selector",
- "livekit_client",
  "log",
  "markdown",
  "markdown_preview",
diff --git a/Cargo.toml b/Cargo.toml
index f44a1061f4..e1eca76374 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -277,6 +277,7 @@ context_server = { path = "crates/context_server" }
 copilot = { path = "crates/copilot" }
 crashes = { path = "crates/crashes" }
 credentials_provider = { path = "crates/credentials_provider" }
+crossbeam = "0.8.4"
 dap = { path = "crates/dap" }
 dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
@@ -369,7 +370,7 @@ remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
-rodio = { version = "0.21.1", default-features = false }
+rodio = { git = "https://github.com/RustAudio/rodio", branch = "better_wav_output"}
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index ae7eb52fd3..08e0df424d 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -14,11 +14,19 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
+async-tar.workspace = true
 collections.workspace = true
+crossbeam.workspace = true
 gpui.workspace = true
-settings.workspace = true
+log.workspace = true
+parking_lot.workspace = true
+rodio = { workspace = true, features = [ "wav", "playback", "wav_output" ] }
 schemars.workspace = true
 serde.workspace = true
-rodio = { workspace = true, features = [ "wav", "playback", "tracing" ] }
+settings.workspace = true
+smol.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
+
+[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
+libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index b4f2c24fef..511d00671a 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,19 +1,54 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, Result};
 use collections::HashMap;
-use gpui::{App, BorrowAppContext, Global};
-use rodio::{Decoder, OutputStream, OutputStreamBuilder, Source, source::Buffered};
+use gpui::{App, AsyncApp, BackgroundExecutor, BorrowAppContext, Global};
+use libwebrtc::native::apm;
+use log::info;
+use parking_lot::Mutex;
+use rodio::{
+    Decoder, OutputStream, OutputStreamBuilder, Source,
+    cpal::Sample,
+    mixer::Mixer,
+    nz,
+    source::{Buffered, LimitSettings, UniformSourceIterator},
+};
 use settings::Settings;
-use std::io::Cursor;
+use std::{
+    io::Cursor,
+    num::NonZero,
+    path::PathBuf,
+    sync::{Arc, atomic::Ordering},
+    time::Duration,
+};
 use util::ResultExt;
 
 mod audio_settings;
+mod replays;
+mod rodio_ext;
 pub use audio_settings::AudioSettings;
+pub use rodio_ext::RodioExt;
+
+use crate::audio_settings::LIVE_SETTINGS;
+
+// NOTE: We used to use WebRTC's mixer which only supported
+// 16kHz, 32kHz and 48kHz. As 48 is the most common "next step up"
+// for audio output devices like speakers/bluetooth, we just hard-code
+// this; and downsample when we need to.
+//
+// Since most noise cancelling requires 16kHz we will move to
+// that in the future.
+pub const SAMPLE_RATE: NonZero<u32> = nz!(48000);
+pub const CHANNEL_COUNT: NonZero<u16> = nz!(2);
+pub const BUFFER_SIZE: usize = // echo canceller and livekit want 10ms of audio
+    (SAMPLE_RATE.get() as usize / 100) * CHANNEL_COUNT.get() as usize;
+
+pub const REPLAY_DURATION: Duration = Duration::from_secs(30);
 
 pub fn init(cx: &mut App) {
     AudioSettings::register(cx);
+    LIVE_SETTINGS.initialize(cx);
 }
 
-#[derive(Copy, Clone, Eq, Hash, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq)]
 pub enum Sound {
     Joined,
     Leave,
@@ -38,32 +73,138 @@ impl Sound {
     }
 }
 
-#[derive(Default)]
 pub struct Audio {
     output_handle: Option<OutputStream>,
+    output_mixer: Option<Mixer>,
+    pub echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
     source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
+    replays: replays::Replays,
+}
+
+impl Default for Audio {
+    fn default() -> Self {
+        Self {
+            output_handle: Default::default(),
+            output_mixer: Default::default(),
+            echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
+                true, false, false, false,
+            ))),
+            source_cache: Default::default(),
+            replays: Default::default(),
+        }
+    }
 }
 
 impl Global for Audio {}
 
 impl Audio {
-    fn ensure_output_exists(&mut self) -> Option<&OutputStream> {
+    fn ensure_output_exists(&mut self) -> Result<&Mixer> {
         if self.output_handle.is_none() {
-            self.output_handle = OutputStreamBuilder::open_default_stream().log_err();
+            self.output_handle = Some(
+                OutputStreamBuilder::open_default_stream()
+                    .context("Could not open default output stream")?,
+            );
+            if let Some(output_handle) = &self.output_handle {
+                let (mixer, source) = rodio::mixer::mixer(CHANNEL_COUNT, SAMPLE_RATE);
+                // or the mixer will end immediately as its empty.
+                mixer.add(rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE));
+                self.output_mixer = Some(mixer);
+
+                let echo_canceller = Arc::clone(&self.echo_canceller);
+                let source = source.inspect_buffer::<BUFFER_SIZE, _>(move |buffer| {
+                    let mut buf: [i16; _] = buffer.map(|s| s.to_sample());
+                    echo_canceller
+                        .lock()
+                        .process_reverse_stream(
+                            &mut buf,
+                            SAMPLE_RATE.get() as i32,
+                            CHANNEL_COUNT.get().into(),
+                        )
+                        .expect("Audio input and output threads should not panic");
+                });
+                output_handle.mixer().add(source);
+            }
         }
 
-        self.output_handle.as_ref()
+        Ok(self
+            .output_mixer
+            .as_ref()
+            .expect("we only get here if opening the outputstream succeeded"))
     }
 
-    pub fn play_source(
+    pub fn save_replays(
+        &self,
+        executor: BackgroundExecutor,
+    ) -> gpui::Task<anyhow::Result<(PathBuf, Duration)>> {
+        self.replays.replays_to_tar(executor)
+    }
+
+    pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
+        let stream = rodio::microphone::MicrophoneBuilder::new()
+            .default_device()?
+            .default_config()?
+            .prefer_sample_rates([SAMPLE_RATE, SAMPLE_RATE.saturating_mul(nz!(2))])
+            .prefer_channel_counts([nz!(1), nz!(2)])
+            .prefer_buffer_sizes(512..)
+            .open_stream()?;
+        info!("Opened microphone: {:?}", stream.config());
+
+        let (replay, stream) = UniformSourceIterator::new(stream, CHANNEL_COUNT, SAMPLE_RATE)
+            .limit(LimitSettings::live_performance())
+            .process_buffer::<BUFFER_SIZE, _>(move |buffer| {
+                let mut int_buffer: [i16; _] = buffer.map(|s| s.to_sample());
+                if voip_parts
+                    .echo_canceller
+                    .lock()
+                    .process_stream(
+                        &mut int_buffer,
+                        SAMPLE_RATE.get() as i32,
+                        CHANNEL_COUNT.get() as i32,
+                    )
+                    .context("livekit audio processor error")
+                    .log_err()
+                    .is_some()
+                {
+                    for (sample, processed) in buffer.iter_mut().zip(&int_buffer) {
+                        *sample = (*processed).to_sample();
+                    }
+                }
+            })
+            .automatic_gain_control(1.0, 4.0, 0.0, 5.0)
+            .periodic_access(Duration::from_millis(100), move |agc_source| {
+                agc_source.set_enabled(LIVE_SETTINGS.control_input_volume.load(Ordering::Relaxed));
+            })
+            .replayable(REPLAY_DURATION)
+            .expect("REPLAY_DURATION is longer then 100ms");
+
+        voip_parts
+            .replays
+            .add_voip_stream("local microphone".to_string(), replay);
+        Ok(stream)
+    }
+
+    pub fn play_voip_stream(
         source: impl rodio::Source + Send + 'static,
+        speaker_name: String,
+        is_staff: bool,
         cx: &mut App,
     ) -> anyhow::Result<()> {
+        let (replay_source, source) = source
+            .automatic_gain_control(1.0, 4.0, 0.0, 5.0)
+            .periodic_access(Duration::from_millis(100), move |agc_source| {
+                agc_source.set_enabled(LIVE_SETTINGS.control_input_volume.load(Ordering::Relaxed));
+            })
+            .replayable(REPLAY_DURATION)
+            .expect("REPLAY_DURATION is longer then 100ms");
+
         cx.update_default_global(|this: &mut Self, _cx| {
-            let output_handle = this
+            let output_mixer = this
                 .ensure_output_exists()
-                .ok_or_else(|| anyhow!("Could not open audio output"))?;
-            output_handle.mixer().add(source);
+                .context("Could not get output mixer")?;
+            output_mixer.add(source);
+            if is_staff {
+                this.replays.add_voip_stream(speaker_name, replay_source);
+            }
             Ok(())
         })
     }
@@ -71,8 +212,12 @@ impl Audio {
     pub fn play_sound(sound: Sound, cx: &mut App) {
         cx.update_default_global(|this: &mut Self, cx| {
             let source = this.sound_source(sound, cx).log_err()?;
-            let output_handle = this.ensure_output_exists()?;
-            output_handle.mixer().add(source);
+            let output_mixer = this
+                .ensure_output_exists()
+                .context("Could not get output mixer")
+                .log_err()?;
+
+            output_mixer.add(source);
             Some(())
         });
     }
@@ -103,3 +248,21 @@ impl Audio {
         Ok(source)
     }
 }
+
+pub struct VoipParts {
+    echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
+    replays: replays::Replays,
+}
+
+impl VoipParts {
+    pub fn new(cx: &AsyncApp) -> anyhow::Result<Self> {
+        let (apm, replays) = cx.try_read_default_global::<Audio, _>(|audio, _| {
+            (Arc::clone(&audio.echo_canceller), audio.replays.clone())
+        })?;
+
+        Ok(Self {
+            echo_canceller: apm,
+            replays,
+        })
+    }
+}
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
index 168519030b..43edb8d60d 100644
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -1,14 +1,29 @@
+use std::sync::atomic::{AtomicBool, Ordering};
+
 use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi};
 
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct AudioSettings {
     /// Opt into the new audio system.
     #[serde(rename = "experimental.rodio_audio", default)]
     pub rodio_audio: bool, // default is false
+    /// Requires 'rodio_audio: true'
+    ///
+    /// Use the new audio systems automatic gain control for your microphone.
+    /// This affects how loud you sound to others.
+    #[serde(rename = "experimental.control_input_volume", default)]
+    pub control_input_volume: bool,
+    /// Requires 'rodio_audio: true'
+    ///
+    /// Use the new audio systems automatic gain control on everyone in the
+    /// call. This makes call members who are too quite louder and those who are
+    /// too loud quieter. This only affects how things sound for you.
+    #[serde(rename = "experimental.control_output_volume", default)]
+    pub control_output_volume: bool,
 }
 
 /// Configuration of audio in Zed.
@@ -16,9 +31,22 @@ pub struct AudioSettings {
 #[serde(default)]
 #[settings_key(key = "audio")]
 pub struct AudioSettingsContent {
-    /// Whether to use the experimental audio system
+    /// Opt into the new audio system.
     #[serde(rename = "experimental.rodio_audio", default)]
-    pub rodio_audio: bool,
+    pub rodio_audio: bool, // default is false
+    /// Requires 'rodio_audio: true'
+    ///
+    /// Use the new audio systems automatic gain control for your microphone.
+    /// This affects how loud you sound to others.
+    #[serde(rename = "experimental.control_input_volume", default)]
+    pub control_input_volume: bool,
+    /// Requires 'rodio_audio: true'
+    ///
+    /// Use the new audio systems automatic gain control on everyone in the
+    /// call. This makes call members who are too quite louder and those who are
+    /// too loud quieter. This only affects how things sound for you.
+    #[serde(rename = "experimental.control_output_volume", default)]
+    pub control_output_volume: bool,
 }
 
 impl Settings for AudioSettings {
@@ -30,3 +58,39 @@ impl Settings for AudioSettings {
 
     fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
+
+pub(crate) struct LiveSettings {
+    pub(crate) control_input_volume: AtomicBool,
+    pub(crate) control_output_volume: AtomicBool,
+}
+
+impl LiveSettings {
+    pub(crate) fn initialize(&self, cx: &mut App) {
+        cx.observe_global::<SettingsStore>(move |cx| {
+            LIVE_SETTINGS.control_input_volume.store(
+                AudioSettings::get_global(cx).control_input_volume,
+                Ordering::Relaxed,
+            );
+            LIVE_SETTINGS.control_output_volume.store(
+                AudioSettings::get_global(cx).control_output_volume,
+                Ordering::Relaxed,
+            );
+        })
+        .detach();
+
+        let init_settings = AudioSettings::get_global(cx);
+        LIVE_SETTINGS
+            .control_input_volume
+            .store(init_settings.control_input_volume, Ordering::Relaxed);
+        LIVE_SETTINGS
+            .control_output_volume
+            .store(init_settings.control_output_volume, Ordering::Relaxed);
+    }
+}
+
+/// Allows access to settings from the audio thread. Updated by
+/// observer of SettingsStore.
+pub(crate) static LIVE_SETTINGS: LiveSettings = LiveSettings {
+    control_input_volume: AtomicBool::new(true),
+    control_output_volume: AtomicBool::new(true),
+};
diff --git a/crates/audio/src/replays.rs b/crates/audio/src/replays.rs
new file mode 100644
index 0000000000..bb21df51e5
--- /dev/null
+++ b/crates/audio/src/replays.rs
@@ -0,0 +1,77 @@
+use anyhow::{Context, anyhow};
+use async_tar::{Builder, Header};
+use gpui::{BackgroundExecutor, Task};
+
+use collections::HashMap;
+use parking_lot::Mutex;
+use rodio::Source;
+use smol::fs::File;
+use std::{io, path::PathBuf, sync::Arc, time::Duration};
+
+use crate::{REPLAY_DURATION, rodio_ext::Replay};
+
+#[derive(Default, Clone)]
+pub(crate) struct Replays(Arc<Mutex<HashMap<String, Replay>>>);
+
+impl Replays {
+    pub(crate) fn add_voip_stream(&self, stream_name: String, source: Replay) {
+        let mut map = self.0.lock();
+        map.retain(|_, replay| replay.source_is_active());
+        map.insert(stream_name, source);
+    }
+
+    pub(crate) fn replays_to_tar(
+        &self,
+        executor: BackgroundExecutor,
+    ) -> Task<anyhow::Result<(PathBuf, Duration)>> {
+        let map = Arc::clone(&self.0);
+        executor.spawn(async move {
+            let recordings: Vec<_> = map
+                .lock()
+                .iter_mut()
+                .map(|(name, replay)| {
+                    let queued = REPLAY_DURATION.min(replay.duration_ready());
+                    (name.clone(), replay.take_duration(queued).record())
+                })
+                .collect();
+            let longest = recordings
+                .iter()
+                .map(|(_, r)| {
+                    r.total_duration()
+                        .expect("SamplesBuffer always returns a total duration")
+                })
+                .max()
+                .ok_or(anyhow!("There is no audio to capture"))?;
+
+            let path = std::env::current_dir()
+                .context("Could not get current dir")?
+                .join("replays.tar");
+            let tar = File::create(&path)
+                .await
+                .context("Could not create file for tar")?;
+
+            let mut tar = Builder::new(tar);
+
+            for (name, recording) in recordings {
+                let mut writer = io::Cursor::new(Vec::new());
+                rodio::wav_to_writer(recording, &mut writer).context("failed to encode wav")?;
+                let wav_data = writer.into_inner();
+                let path = name.replace(' ', "_") + ".wav";
+                let mut header = Header::new_gnu();
+                // rw permissions for everyone
+                header.set_mode(0o666);
+                header.set_size(wav_data.len() as u64);
+                tar.append_data(&mut header, path, wav_data.as_slice())
+                    .await
+                    .context("failed to apped wav to tar")?;
+            }
+            tar.into_inner()
+                .await
+                .context("Could not finish writing tar")?
+                .sync_all()
+                .await
+                .context("Could not flush tar file to disk")?;
+            Ok((path, longest))
+        })
+    }
+}
diff --git a/crates/audio/src/rodio_ext.rs b/crates/audio/src/rodio_ext.rs
new file mode 100644
index 0000000000..4e9430a0b9
--- /dev/null
+++ b/crates/audio/src/rodio_ext.rs
@@ -0,0 +1,593 @@
+use std::{
+    sync::{
+        Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
+    },
+    time::Duration,
+};
+
+use crossbeam::queue::ArrayQueue;
+use rodio::{ChannelCount, Sample, SampleRate, Source};
+
+#[derive(Debug)]
+pub struct ReplayDurationTooShort;
+
+pub trait RodioExt: Source + Sized {
+    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
+    where
+        F: FnMut(&mut [Sample; N]);
+    fn inspect_buffer<const N: usize, F>(self, callback: F) -> InspectBuffer<N, Self, F>
+    where
+        F: FnMut(&[Sample; N]);
+    fn replayable(
+        self,
+        duration: Duration,
+    ) -> Result<(Replay, Replayable<Self>), ReplayDurationTooShort>;
+    fn take_samples(self, n: usize) -> TakeSamples<Self>;
+}
+
+impl<S: Source> RodioExt for S {
+    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
+    where
+        F: FnMut(&mut [Sample; N]),
+    {
+        ProcessBuffer {
+            inner: self,
+            callback,
+            buffer: [0.0; N],
+            next: N,
+        }
+    }
+    fn inspect_buffer<const N: usize, F>(self, callback: F) -> InspectBuffer<N, Self, F>
+    where
+        F: FnMut(&[Sample; N]),
+    {
+        InspectBuffer {
+            inner: self,
+            callback,
+            buffer: [0.0; N],
+            free: 0,
+        }
+    }
+    /// Maintains a live replay with a history of at least `duration` seconds.
+    ///
+    /// Note:
+    /// History can be 100ms longer if the source drops before or while the
+    /// replay is being read
+    ///
+    /// # Errors
+    /// If duration is smaller then 100ms
+    fn replayable(
+        self,
+        duration: Duration,
+    ) -> Result<(Replay, Replayable<Self>), ReplayDurationTooShort> {
+        if duration < Duration::from_millis(100) {
+            return Err(ReplayDurationTooShort);
+        }
+
+        let samples_per_second = self.sample_rate().get() as usize * self.channels().get() as usize;
+        let samples_to_queue = duration.as_secs_f64() * samples_per_second as f64;
+        let samples_to_queue =
+            (samples_to_queue as usize).next_multiple_of(self.channels().get().into());
+
+        let chunk_size =
+            (samples_per_second.div_ceil(10)).next_multiple_of(self.channels().get() as usize);
+        let chunks_to_queue = samples_to_queue.div_ceil(chunk_size);
+
+        let is_active = Arc::new(AtomicBool::new(true));
+        let queue = Arc::new(ReplayQueue::new(chunks_to_queue, chunk_size));
+        Ok((
+            Replay {
+                rx: Arc::clone(&queue),
+                buffer: Vec::new().into_iter(),
+                sleep_duration: duration / 2,
+                sample_rate: self.sample_rate(),
+                channel_count: self.channels(),
+                source_is_active: is_active.clone(),
+            },
+            Replayable {
+                tx: queue,
+                inner: self,
+                buffer: Vec::with_capacity(chunk_size),
+                chunk_size,
+                is_active,
+            },
+        ))
+    }
+    fn take_samples(self, n: usize) -> TakeSamples<S> {
+        TakeSamples {
+            inner: self,
+            left_to_take: n,
+        }
+    }
+}
+
+pub struct TakeSamples<S> {
+    inner: S,
+    left_to_take: usize,
+}
+
+impl<S: Source> Iterator for TakeSamples<S> {
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.left_to_take == 0 {
+            None
+        } else {
+            self.left_to_take -= 1;
+            self.inner.next()
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, Some(self.left_to_take))
+    }
+}
+
+impl<S: Source> Source for TakeSamples<S> {
+    fn current_span_len(&self) -> Option<usize> {
+        None // does not support spans
+    }
+
+    fn channels(&self) -> ChannelCount {
+        self.inner.channels()
+    }
+
+    fn sample_rate(&self) -> SampleRate {
+        self.inner.sample_rate()
+    }
+
+    fn total_duration(&self) -> Option<Duration> {
+        Some(Duration::from_secs_f64(
+            self.left_to_take as f64
+                / self.sample_rate().get() as f64
+                / self.channels().get() as f64,
+        ))
+    }
+}
+
+#[derive(Debug)]
+struct ReplayQueue {
+    inner: ArrayQueue<Vec<Sample>>,
+    normal_chunk_len: usize,
+    /// The last chunk in the queue may be smaller then
+    /// the normal chunk size. This is always equal to the
+    /// size of the last element in the queue.
+    /// (so normally chunk_size)
+    last_chunk: Mutex<Vec<Sample>>,
+}
+
+impl ReplayQueue {
+    fn new(queue_len: usize, chunk_size: usize) -> Self {
+        Self {
+            inner: ArrayQueue::new(queue_len),
+            normal_chunk_len: chunk_size,
+            last_chunk: Mutex::new(Vec::new()),
+        }
+    }
+    /// Returns the length in samples
+    fn len(&self) -> usize {
+        self.inner.len().saturating_sub(1) * self.normal_chunk_len
+            + self
+                .last_chunk
+                .lock()
+                .expect("Self::push_last can not poison this lock")
+                .len()
+    }
+
+    fn pop(&self) -> Option<Vec<Sample>> {
+        self.inner.pop() // removes element that was inserted first
+    }
+
+    fn push_last(&self, mut samples: Vec<Sample>) {
+        let mut last_chunk = self
+            .last_chunk
+            .lock()
+            .expect("Self::len can not poison this lock");
+        std::mem::swap(&mut *last_chunk, &mut samples);
+    }
+
+    fn push_normal(&self, samples: Vec<Sample>) {
+        let _pushed_out_of_ringbuf = self.inner.force_push(samples);
+    }
+}
+
+pub struct ProcessBuffer<const N: usize, S, F>
+where
+    S: Source + Sized,
+    F: FnMut(&mut [Sample; N]),
+{
+    inner: S,
+    callback: F,
+    /// Buffer used for both input and output.
+    buffer: [Sample; N],
+    /// Next already processed sample is at this index
+    /// in buffer.
+    ///
+    /// If this is equal to the length of the buffer we have no more samples and
+    /// we must get new ones and process them
+    next: usize,
+}
+
+impl<const N: usize, S, F> Iterator for ProcessBuffer<N, S, F>
+where
+    S: Source + Sized,
+    F: FnMut(&mut [Sample; N]),
+{
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.next += 1;
+        if self.next < self.buffer.len() {
+            let sample = self.buffer[self.next];
+            return Some(sample);
+        }
+
+        for sample in &mut self.buffer {
+            *sample = self.inner.next()?
+        }
+        (self.callback)(&mut self.buffer);
+
+        self.next = 0;
+        Some(self.buffer[0])
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
+}
+
+impl<const N: usize, S, F> Source for ProcessBuffer<N, S, F>
+where
+    S: Source + Sized,
+    F: FnMut(&mut [Sample; N]),
+{
+    fn current_span_len(&self) -> Option<usize> {
+        None
+    }
+
+    fn channels(&self) -> rodio::ChannelCount {
+        self.inner.channels()
+    }
+
+    fn sample_rate(&self) -> rodio::SampleRate {
+        self.inner.sample_rate()
+    }
+
+    fn total_duration(&self) -> Option<std::time::Duration> {
+        self.inner.total_duration()
+    }
+}
+
+pub struct InspectBuffer<const N: usize, S, F>
+where
+    S: Source + Sized,
+    F: FnMut(&[Sample; N]),
+{
+    inner: S,
+    callback: F,
+    /// Stores already emitted samples, once its full we call the callback.
+    buffer: [Sample; N],
+    /// Next free element in buffer. If this is equal to the buffer length
+    /// we have no more free lements.
+    free: usize,
+}
+
+impl<const N: usize, S, F> Iterator for InspectBuffer<N, S, F>
+where
+    S: Source + Sized,
+    F: FnMut(&[Sample; N]),
+{
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let Some(sample) = self.inner.next() else {
+            return None;
+        };
+
+        self.buffer[self.free] = sample;
+        self.free += 1;
+
+        if self.free == self.buffer.len() {
+            (self.callback)(&self.buffer);
+            self.free = 0
+        }
+
+        Some(sample)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
+}
+
+impl<const N: usize, S, F> Source for InspectBuffer<N, S, F>
+where
+    S: Source + Sized,
+    F: FnMut(&[Sample; N]),
+{
+    fn current_span_len(&self) -> Option<usize> {
+        None
+    }
+
+    fn channels(&self) -> rodio::ChannelCount {
+        self.inner.channels()
+    }
+
+    fn sample_rate(&self) -> rodio::SampleRate {
+        self.inner.sample_rate()
+    }
+
+    fn total_duration(&self) -> Option<std::time::Duration> {
+        self.inner.total_duration()
+    }
+}
+
+#[derive(Debug)]
+pub struct Replayable<S: Source> {
+    inner: S,
+    buffer: Vec<Sample>,
+    chunk_size: usize,
+    tx: Arc<ReplayQueue>,
+    is_active: Arc<AtomicBool>,
+}
+
+impl<S: Source> Iterator for Replayable<S> {
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(sample) = self.inner.next() {
+            self.buffer.push(sample);
+            if self.buffer.len() == self.chunk_size {
+                self.tx.push_normal(std::mem::take(&mut self.buffer));
+            }
+            Some(sample)
+        } else {
+            let last_chunk = std::mem::take(&mut self.buffer);
+            self.tx.push_last(last_chunk);
+            self.is_active.store(false, Ordering::Relaxed);
+            None
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
+}
+
+impl<S: Source> Source for Replayable<S> {
+    fn current_span_len(&self) -> Option<usize> {
+        self.inner.current_span_len()
+    }
+
+    fn channels(&self) -> ChannelCount {
+        self.inner.channels()
+    }
+
+    fn sample_rate(&self) -> SampleRate {
+        self.inner.sample_rate()
+    }
+
+    fn total_duration(&self) -> Option<Duration> {
+        self.inner.total_duration()
+    }
+}
+
+#[derive(Debug)]
+pub struct Replay {
+    rx: Arc<ReplayQueue>,
+    buffer: std::vec::IntoIter<Sample>,
+    sleep_duration: Duration,
+    sample_rate: SampleRate,
+    channel_count: ChannelCount,
+    source_is_active: Arc<AtomicBool>,
+}
+
+impl Replay {
+    pub fn source_is_active(&self) -> bool {
+        // - source could return None and not drop
+        // - source could be dropped before returning None
+        self.source_is_active.load(Ordering::Relaxed) && Arc::strong_count(&self.rx) < 2
+    }
+
+    /// Duration of what is in the buffer and can be returned without blocking.
+    pub fn duration_ready(&self) -> Duration {
+        let samples_per_second = self.channels().get() as u32 * self.sample_rate().get();
+
+        let seconds_queued = self.samples_ready() as f64 / samples_per_second as f64;
+        Duration::from_secs_f64(seconds_queued)
+    }
+
+    /// Number of samples in the buffer and can be returned without blocking.
+    pub fn samples_ready(&self) -> usize {
+        self.rx.len() + self.buffer.len()
+    }
+}
+
+impl Iterator for Replay {
+    type Item = Sample;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(sample) = self.buffer.next() {
+            return Some(sample);
+        }
+
+        loop {
+            if let Some(new_buffer) = self.rx.pop() {
+                self.buffer = new_buffer.into_iter();
+                return self.buffer.next();
+            }
+
+            if !self.source_is_active() {
+                return None;
+            }
+
+            std::thread::sleep(self.sleep_duration);
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        ((self.rx.len() + self.buffer.len()), None)
+    }
+}
+
+impl Source for Replay {
+    fn current_span_len(&self) -> Option<usize> {
+        None // source is not compatible with spans
+    }
+
+    fn channels(&self) -> ChannelCount {
+        self.channel_count
+    }
+
+    fn sample_rate(&self) -> SampleRate {
+        self.sample_rate
+    }
+
+    fn total_duration(&self) -> Option<Duration> {
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rodio::{nz, static_buffer::StaticSamplesBuffer};
+
+    use super::*;
+
+    const SAMPLES: [Sample; 5] = [0.0, 1.0, 2.0, 3.0, 4.0];
+
+    fn test_source() -> StaticSamplesBuffer {
+        StaticSamplesBuffer::new(nz!(1), nz!(1), &SAMPLES)
+    }
+
+    mod process_buffer {
+        use super::*;
+
+        #[test]
+        fn callback_gets_all_samples() {
+            let input = test_source();
+
+            let _ = input
+                .process_buffer::<{ SAMPLES.len() }, _>(|buffer| assert_eq!(*buffer, SAMPLES))
+                .count();
+        }
+        #[test]
+        fn callback_modifies_yielded() {
+            let input = test_source();
+
+            let yielded: Vec<_> = input
+                .process_buffer::<{ SAMPLES.len() }, _>(|buffer| {
+                    for sample in buffer {
+                        *sample += 1.0;
+                    }
+                })
+                .collect();
+            assert_eq!(
+                yielded,
+                SAMPLES.into_iter().map(|s| s + 1.0).collect::<Vec<_>>()
+            )
+        }
+        #[test]
+        fn source_truncates_to_whole_buffers() {
+            let input = test_source();
+
+            let yielded = input
+                .process_buffer::<3, _>(|buffer| assert_eq!(buffer, &SAMPLES[..3]))
+                .count();
+            assert_eq!(yielded, 3)
+        }
+    }
+
+    mod inspect_buffer {
+        use super::*;
+
+        #[test]
+        fn callback_gets_all_samples() {
+            let input = test_source();
+
+            let _ = input
+                .inspect_buffer::<{ SAMPLES.len() }, _>(|buffer| assert_eq!(*buffer, SAMPLES))
+                .count();
+        }
+        #[test]
+        fn source_does_not_truncate() {
+            let input = test_source();
+
+            let yielded = input
+                .inspect_buffer::<3, _>(|buffer| assert_eq!(buffer, &SAMPLES[..3]))
+                .count();
+            assert_eq!(yielded, SAMPLES.len())
+        }
+    }
+
+    mod instant_replay {
+        use super::*;
+
+        #[test]
+        fn continues_after_history() {
+            let input = test_source();
+
+            let (mut replay, mut source) = input
+                .replayable(Duration::from_secs(3))
+                .expect("longer then 100ms");
+
+            source.by_ref().take(3).count();
+            let yielded: Vec<Sample> = replay.by_ref().take(3).collect();
+            assert_eq!(&yielded, &SAMPLES[0..3],);
+
+            source.count();
+            let yielded: Vec<Sample> = replay.collect();
+            assert_eq!(&yielded, &SAMPLES[3..5],);
+        }
+
+        #[test]
+        fn keeps_only_latest() {
+            let input = test_source();
+
+            let (mut replay, mut source) = input
+                .replayable(Duration::from_secs(2))
+                .expect("longer then 100ms");
+
+            source.by_ref().take(5).count(); // get all items but do not end the source
+            let yielded: Vec<Sample> = replay.by_ref().take(2).collect();
+            assert_eq!(&yielded, &SAMPLES[3..5]);
+            source.count(); // exhaust source
+            assert_eq!(replay.next(), None);
+        }
+
+        #[test]
+        fn keeps_correct_amount_of_seconds() {
+            let input = StaticSamplesBuffer::new(nz!(1), nz!(16_000), &[0.0; 40_000]);
+
+            let (replay, mut source) = input
+                .replayable(Duration::from_secs(2))
+                .expect("longer then 100ms");
+
+            // exhaust but do not yet end source
+            source.by_ref().take(40_000).count();
+
+            // take all samples we can without blocking
+            let ready = replay.samples_ready();
+            let n_yielded = replay.take_samples(ready).count();
+
+            let max = source.sample_rate().get() * source.channels().get() as u32 * 2;
+            let margin = 16_000 / 10; // 100ms
+            assert!(n_yielded as u32 >= max - margin);
+        }
+
+        #[test]
+        fn samples_ready() {
+            let input = StaticSamplesBuffer::new(nz!(1), nz!(16_000), &[0.0; 40_000]);
+            let (mut replay, source) = input
+                .replayable(Duration::from_secs(2))
+                .expect("longer then 100ms");
+            assert_eq!(replay.by_ref().samples_ready(), 0);
+
+            source.take(8000).count(); // half a second
+            let margin = 16_000 / 10; // 100ms
+            let ready = replay.samples_ready();
+            assert!(ready >= 8000 - margin);
+        }
+    }
+}
diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml
index 30e2943af3..ad3d569d61 100644
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -29,6 +29,7 @@ client.workspace = true
 collections.workspace = true
 fs.workspace = true
 futures.workspace = true
+feature_flags.workspace = true
 gpui = { workspace = true, features = ["screen-capture"] }
 language.workspace = true
 log.workspace = true
diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
index c31a458c64..930846ab8f 100644
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -9,6 +9,7 @@ use client::{
     proto::{self, PeerId},
 };
 use collections::{BTreeMap, HashMap, HashSet};
+use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
 use futures::StreamExt;
 use gpui::{
@@ -1322,8 +1323,18 @@ impl Room {
             return Task::ready(Err(anyhow!("live-kit was not initialized")));
         };
 
+        let is_staff = cx.is_staff();
+        let user_name = self
+            .user_store
+            .read(cx)
+            .current_user()
+            .and_then(|user| user.name.clone())
+            .unwrap_or_else(|| "unknown".to_string());
+
         cx.spawn(async move |this, cx| {
-            let publication = room.publish_local_microphone_track(cx).await;
+            let publication = room
+                .publish_local_microphone_track(user_name, is_staff, cx)
+                .await;
             this.update(cx, |this, cx| {
                 let live_kit = this
                     .live_kit
diff --git a/crates/gpui/src/app/async_context.rs b/crates/gpui/src/app/async_context.rs
index f3b8c0ce77..cfe7a5a75c 100644
--- a/crates/gpui/src/app/async_context.rs
+++ b/crates/gpui/src/app/async_context.rs
@@ -218,6 +218,23 @@ impl AsyncApp {
         Some(read(app.try_global()?, &app))
     }
 
+    /// Reads the global state of the specified type, passing it to the given callback.
+    /// A default value is assigned if a global of this type has not yet been assigned.
+    ///
+    /// # Errors
+    /// If the app has ben dropped this returns an error.
+    pub fn try_read_default_global<G: Global + Default, R>(
+        &self,
+        read: impl FnOnce(&G, &App) -> R,
+    ) -> Result<R> {
+        let app = self.app.upgrade().context("app was released")?;
+        let mut app = app.borrow_mut();
+        app.update(|cx| {
+            cx.default_global::<G>();
+        });
+        Ok(read(app.try_global().context("app was released")?, &app))
+    }
+
     /// A convenience method for [`App::update_global`](BorrowAppContext::update_global)
     /// for updating the global state of the specified type.
     pub fn update_global<G: Global, R>(
diff --git a/crates/livekit_client/Cargo.toml b/crates/livekit_client/Cargo.toml
index 3575325ac0..80e4960c0d 100644
--- a/crates/livekit_client/Cargo.toml
+++ b/crates/livekit_client/Cargo.toml
@@ -22,10 +22,10 @@ test-support = ["collections/test-support", "gpui/test-support"]
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
+audio.workspace = true
 collections.workspace = true
 cpal.workspace = true
 futures.workspace = true
-audio.workspace = true
 gpui = { workspace = true, features = ["screen-capture", "x11", "wayland", "windows-manifest"] }
 gpui_tokio.workspace = true
 http_client_tls.workspace = true
@@ -35,14 +35,15 @@ log.workspace = true
 nanoid.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-smallvec.workspace = true
+rodio = { workspace = true, features = ["wav_output", "recording"] }
+serde.workspace = true
+serde_urlencoded.workspace = true
 settings.workspace = true
+smallvec.workspace = true
 tokio-tungstenite.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
 
-rodio = { workspace = true, features = ["wav_output"] }
-
 [target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
 libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
 livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = [
diff --git a/crates/livekit_client/examples/test_app.rs b/crates/livekit_client/examples/test_app.rs
index 7580642990..c99abb292e 100644
--- a/crates/livekit_client/examples/test_app.rs
+++ b/crates/livekit_client/examples/test_app.rs
@@ -255,7 +255,10 @@ impl LivekitWindow {
         } else {
             let room = self.room.clone();
             cx.spawn_in(window, async move |this, cx| {
-                let (publication, stream) = room.publish_local_microphone_track(cx).await.unwrap();
+                let (publication, stream) = room
+                    .publish_local_microphone_track("test_user".to_string(), false, cx)
+                    .await
+                    .unwrap();
                 this.update(cx, |this, cx| {
                     this.microphone_track = Some(publication);
                     this.microphone_stream = Some(stream);
diff --git a/crates/livekit_client/src/livekit_client.rs b/crates/livekit_client/src/livekit_client.rs
index 0751b014f4..45e929cb2e 100644
--- a/crates/livekit_client/src/livekit_client.rs
+++ b/crates/livekit_client/src/livekit_client.rs
@@ -97,9 +97,13 @@ impl Room {
 
     pub async fn publish_local_microphone_track(
         &self,
+        user_name: String,
+        is_staff: bool,
         cx: &mut AsyncApp,
     ) -> Result<(LocalTrackPublication, playback::AudioStream)> {
-        let (track, stream) = self.playback.capture_local_microphone_track()?;
+        let (track, stream) = self
+            .playback
+            .capture_local_microphone_track(user_name, is_staff, &cx)?;
         let publication = self
             .local_participant()
             .publish_track(
@@ -129,7 +133,7 @@ impl Room {
         cx: &mut App,
     ) -> Result<playback::AudioStream> {
         if AudioSettings::get_global(cx).rodio_audio {
-            info!("Using experimental.rodio_audio audio pipeline");
+            info!("Using experimental.rodio_audio audio pipeline for output");
             playback::play_remote_audio_track(&track.0, cx)
         } else {
             Ok(self.playback.play_remote_audio_track(&track.0))
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
index d6b64dbaca..d1b2cee4aa 100644
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ b/crates/livekit_client/src/livekit_client/playback.rs
@@ -1,10 +1,12 @@
 use anyhow::{Context as _, Result};
 
+use audio::{AudioSettings, CHANNEL_COUNT, SAMPLE_RATE};
 use cpal::traits::{DeviceTrait, StreamTrait as _};
 use futures::channel::mpsc::UnboundedSender;
 use futures::{Stream, StreamExt as _};
 use gpui::{
-    BackgroundExecutor, ScreenCaptureFrame, ScreenCaptureSource, ScreenCaptureStream, Task,
+    AsyncApp, BackgroundExecutor, ScreenCaptureFrame, ScreenCaptureSource, ScreenCaptureStream,
+    Task,
 };
 use libwebrtc::native::{apm, audio_mixer, audio_resampler};
 use livekit::track;
@@ -17,8 +19,11 @@ use livekit::webrtc::{
     video_source::{RtcVideoSource, VideoResolution, native::NativeVideoSource},
     video_stream::native::NativeVideoStream,
 };
+use log::info;
 use parking_lot::Mutex;
 use rodio::Source;
+use serde::{Deserialize, Serialize};
+use settings::Settings;
 use std::cell::RefCell;
 use std::sync::Weak;
 use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
@@ -36,27 +41,28 @@ pub(crate) struct AudioStack {
     next_ssrc: AtomicI32,
 }
 
-// NOTE: We use WebRTC's mixer which only supports
-// 16kHz, 32kHz and 48kHz. As 48 is the most common "next step up"
-// for audio output devices like speakers/bluetooth, we just hard-code
-// this; and downsample when we need to.
-const SAMPLE_RATE: u32 = 48000;
-const NUM_CHANNELS: u32 = 2;
-
 pub(crate) fn play_remote_audio_track(
     track: &livekit::track::RemoteAudioTrack,
     cx: &mut gpui::App,
 ) -> Result<AudioStream> {
     let stop_handle = Arc::new(AtomicBool::new(false));
     let stop_handle_clone = stop_handle.clone();
-    let stream = source::LiveKitStream::new(cx.background_executor(), track)
+    let stream = source::LiveKitStream::new(cx.background_executor(), track);
+
+    let stream = stream
         .stoppable()
         .periodic_access(Duration::from_millis(50), move |s| {
             if stop_handle.load(Ordering::Relaxed) {
                 s.stop();
             }
         });
-    audio::Audio::play_source(stream, cx).context("Could not play audio")?;
+
+    let speaker: Speaker = serde_urlencoded::from_str(&track.name()).unwrap_or_else(|_| Speaker {
+        name: track.name(),
+        is_staff: false,
+    });
+    audio::Audio::play_voip_stream(stream, speaker.name, speaker.is_staff, cx)
+        .context("Could not play audio")?;
 
     let on_drop = util::defer(move || {
         stop_handle_clone.store(true, Ordering::Relaxed);
@@ -90,8 +96,8 @@ impl AudioStack {
         let next_ssrc = self.next_ssrc.fetch_add(1, Ordering::Relaxed);
         let source = AudioMixerSource {
             ssrc: next_ssrc,
-            sample_rate: SAMPLE_RATE,
-            num_channels: NUM_CHANNELS,
+            sample_rate: SAMPLE_RATE.get(),
+            num_channels: CHANNEL_COUNT.get() as u32,
             buffer: Arc::default(),
         };
         self.mixer.lock().add_source(source.clone());
@@ -131,7 +137,7 @@ impl AudioStack {
             let apm = self.apm.clone();
             let mixer = self.mixer.clone();
             async move {
-                Self::play_output(apm, mixer, SAMPLE_RATE, NUM_CHANNELS)
+                Self::play_output(apm, mixer, SAMPLE_RATE.get(), CHANNEL_COUNT.get().into())
                     .await
                     .log_err();
             }
@@ -142,17 +148,26 @@ impl AudioStack {
 
     pub(crate) fn capture_local_microphone_track(
         &self,
+        user_name: String,
+        is_staff: bool,
+        cx: &AsyncApp,
     ) -> Result<(crate::LocalAudioTrack, AudioStream)> {
         let source = NativeAudioSource::new(
             // n.b. this struct's options are always ignored, noise cancellation is provided by apm.
             AudioSourceOptions::default(),
-            SAMPLE_RATE,
-            NUM_CHANNELS,
+            SAMPLE_RATE.get(),
+            CHANNEL_COUNT.get().into(),
             10,
         );
 
+        let track_name = serde_urlencoded::to_string(Speaker {
+            name: user_name,
+            is_staff,
+        })
+        .context("Could not encode user information in track name")?;
+
         let track = track::LocalAudioTrack::create_audio_track(
-            "microphone",
+            &track_name,
             RtcAudioSource::Native(source.clone()),
         );
 
@@ -166,9 +181,24 @@ impl AudioStack {
                 }
             }
         });
-        let capture_task = self.executor.spawn(async move {
-            Self::capture_input(apm, frame_tx, SAMPLE_RATE, NUM_CHANNELS).await
-        });
+        let rodio_pipeline =
+            AudioSettings::try_read_global(cx, |setting| setting.rodio_audio).unwrap_or_default();
+        let capture_task = if rodio_pipeline {
+            info!("Using experimental.rodio_audio audio pipeline");
+            let voip_parts = audio::VoipParts::new(cx)?;
+            thread::spawn(move || {
+                // microphone is non send on mac
+                let microphone = audio::Audio::open_microphone(voip_parts)?;
+                send_to_livekit(frame_tx, microphone);
+                Ok::<(), anyhow::Error>(())
+            });
+            Task::ready(Ok(()))
+        } else {
+            self.executor.spawn(async move {
+                Self::capture_input(apm, frame_tx, SAMPLE_RATE.get(), CHANNEL_COUNT.get().into())
+                    .await
+            })
+        };
 
         let on_drop = util::defer(|| {
             drop(transmit_task);
@@ -346,6 +376,36 @@ impl AudioStack {
     }
 }
 
+#[derive(Serialize, Deserialize)]
+struct Speaker {
+    name: String,
+    is_staff: bool,
+}
+
+fn send_to_livekit(frame_tx: UnboundedSender<AudioFrame<'static>>, mut microphone: impl Source) {
+    use cpal::Sample;
+    loop {
+        let sampled: Vec<_> = microphone
+            .by_ref()
+            .take(audio::BUFFER_SIZE)
+            .map(|s| s.to_sample())
+            .collect();
+
+        if frame_tx
+            .unbounded_send(AudioFrame {
+                sample_rate: SAMPLE_RATE.get(),
+                num_channels: CHANNEL_COUNT.get() as u32,
+                samples_per_channel: sampled.len() as u32 / CHANNEL_COUNT.get() as u32,
+                data: Cow::Owned(sampled),
+            })
+            .is_err()
+        {
+            // must rx has dropped or is not consuming
+            break;
+        }
+    }
+}
+
 use super::LocalVideoTrack;
 
 pub enum AudioStream {
diff --git a/crates/livekit_client/src/livekit_client/playback/source.rs b/crates/livekit_client/src/livekit_client/playback/source.rs
index 021640247d..67bfe79390 100644
--- a/crates/livekit_client/src/livekit_client/playback/source.rs
+++ b/crates/livekit_client/src/livekit_client/playback/source.rs
@@ -1,15 +1,23 @@
+use std::num::NonZero;
+
 use futures::StreamExt;
 use libwebrtc::{audio_stream::native::NativeAudioStream, prelude::AudioFrame};
 use livekit::track::RemoteAudioTrack;
-use rodio::{Source, buffer::SamplesBuffer, conversions::SampleTypeConverter};
+use rodio::{Source, buffer::SamplesBuffer, conversions::SampleTypeConverter, nz};
 
-use crate::livekit_client::playback::{NUM_CHANNELS, SAMPLE_RATE};
+use audio::{CHANNEL_COUNT, SAMPLE_RATE};
 
 fn frame_to_samplesbuffer(frame: AudioFrame) -> SamplesBuffer {
     let samples = frame.data.iter().copied();
     let samples = SampleTypeConverter::<_, _>::new(samples);
     let samples: Vec<f32> = samples.collect();
-    SamplesBuffer::new(frame.num_channels as u16, frame.sample_rate, samples)
+    SamplesBuffer::new(
+        // here be dragons
+        // NonZero::new(frame.num_channels as u16).expect("audio frame channels is nonzero"),
+        nz!(2),
+        NonZero::new(frame.sample_rate).expect("audio frame sample rate is nonzero"),
+        samples,
+    )
 }
 
 pub struct LiveKitStream {
@@ -20,8 +28,11 @@ pub struct LiveKitStream {
 
 impl LiveKitStream {
     pub fn new(executor: &gpui::BackgroundExecutor, track: &RemoteAudioTrack) -> Self {
-        let mut stream =
-            NativeAudioStream::new(track.rtc_track(), SAMPLE_RATE as i32, NUM_CHANNELS as i32);
+        let mut stream = NativeAudioStream::new(
+            track.rtc_track(),
+            SAMPLE_RATE.get() as i32,
+            CHANNEL_COUNT.get().into(),
+        );
         let (queue_input, queue_output) = rodio::queue::queue(true);
         // spawn rtc stream
         let receiver_task = executor.spawn({
@@ -54,11 +65,17 @@ impl Source for LiveKitStream {
     }
 
     fn channels(&self) -> rodio::ChannelCount {
-        self.inner.channels()
+        // This must be hardcoded because the playback source assumes constant
+        // sample rate and channel count. The queue upon which this is build
+        // will however report different counts and rates. Even though we put in
+        // only items with our (constant) CHANNEL_COUNT & SAMPLE_RATE this will
+        // play silence on one channel and at 44100 which is not what our
+        // constants are.
+        CHANNEL_COUNT
     }
 
     fn sample_rate(&self) -> rodio::SampleRate {
-        self.inner.sample_rate()
+        SAMPLE_RATE // see comment on channels
     }
 
     fn total_duration(&self) -> Option<std::time::Duration> {
diff --git a/crates/livekit_client/src/record.rs b/crates/livekit_client/src/record.rs
index 925c0d4c67..24e260e716 100644
--- a/crates/livekit_client/src/record.rs
+++ b/crates/livekit_client/src/record.rs
@@ -1,5 +1,6 @@
 use std::{
     env,
+    num::NonZero,
     path::{Path, PathBuf},
     sync::{Arc, Mutex},
     time::Duration,
@@ -83,8 +84,12 @@ fn write_out(
             .expect("Stream has ended, callback cant hold the lock"),
     );
     let samples: Vec<f32> = SampleTypeConverter::<_, f32>::new(samples.into_iter()).collect();
-    let mut samples = SamplesBuffer::new(config.channels(), config.sample_rate().0, samples);
-    match rodio::output_to_wav(&mut samples, path) {
+    let mut samples = SamplesBuffer::new(
+        NonZero::new(config.channels()).expect("config channel is never zero"),
+        NonZero::new(config.sample_rate().0).expect("config sample_rate is never zero"),
+        samples,
+    );
+    match rodio::wav_to_file(&mut samples, path) {
         Ok(_) => Ok(()),
         Err(e) => Err(anyhow::anyhow!("Failed to write wav file: {}", e)),
     }
diff --git a/crates/livekit_client/src/test.rs b/crates/livekit_client/src/test.rs
index 873e0222d0..fd31635982 100644
--- a/crates/livekit_client/src/test.rs
+++ b/crates/livekit_client/src/test.rs
@@ -728,6 +728,8 @@ impl Room {
 
     pub async fn publish_local_microphone_track(
         &self,
+        _track_name: String,
+        _is_staff: bool,
         cx: &mut AsyncApp,
     ) -> Result<(LocalTrackPublication, AudioStream)> {
         self.local_participant().publish_microphone_track(cx).await
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index fd8350e8df..7913b46421 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -84,7 +84,6 @@ inspector_ui.workspace = true
 install_cli.workspace = true
 jj_ui.workspace = true
 journal.workspace = true
-livekit_client.workspace = true
 language.workspace = true
 language_extension.workspace = true
 language_model.workspace = true
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 2412a26862..0041bba6d0 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -13,6 +13,7 @@ use agent_ui::{AgentDiffToolbar, AgentPanelDelegate};
 use anyhow::Context as _;
 pub use app_menus::*;
 use assets::Assets;
+use audio::{AudioSettings, REPLAY_DURATION};
 use breadcrumbs::Breadcrumbs;
 use client::zed_urls;
 use collections::VecDeque;
@@ -59,7 +60,7 @@ use settings::{
     initial_local_debug_tasks_content, initial_project_settings_content, initial_tasks_content,
     update_settings_file,
 };
-use std::time::{Duration, Instant};
+use std::time::Duration;
 use std::{
     borrow::Cow,
     path::{Path, PathBuf},
@@ -128,8 +129,10 @@ actions!(
 actions!(
     dev,
     [
-        /// Record 10s of audio from your current microphone
-        CaptureAudio
+        /// Stores last 30s of audio from zed staff using the experimental rodio
+        /// audio system (including yourself) on the current call in a tar file
+        /// in the current working directory.
+        CaptureRecentAudio,
     ]
 );
 
@@ -910,8 +913,8 @@ fn register_actions(
                 }
             }
         })
-        .register_action(|workspace, _: &CaptureAudio, window, cx| {
-            capture_audio(workspace, window, cx);
+        .register_action(|workspace, _: &CaptureRecentAudio, window, cx| {
+            capture_recent_audio(workspace, window, cx);
         });
 
     #[cfg(not(target_os = "windows"))]
@@ -1845,50 +1848,39 @@ fn open_settings_file(
     .detach_and_log_err(cx);
 }
 
-fn capture_audio(workspace: &mut Workspace, _: &mut Window, cx: &mut Context<Workspace>) {
-    #[derive(Default)]
-    enum State {
-        Recording(livekit_client::CaptureInput),
-        Failed(String),
-        Finished(PathBuf),
-        // Used during state switch. Should never occur naturally.
-        #[default]
-        Invalid,
-    }
-
-    struct CaptureAudioNotification {
+fn capture_recent_audio(workspace: &mut Workspace, _: &mut Window, cx: &mut Context<Workspace>) {
+    struct CaptureRecentAudioNotification {
         focus_handle: gpui::FocusHandle,
-        start_time: Instant,
-        state: State,
+        save_result: Option<Result<(PathBuf, Duration), anyhow::Error>>,
+        _save_task: Task<anyhow::Result<()>>,
     }
 
-    impl gpui::EventEmitter<DismissEvent> for CaptureAudioNotification {}
-    impl gpui::EventEmitter<SuppressEvent> for CaptureAudioNotification {}
-    impl gpui::Focusable for CaptureAudioNotification {
+    impl gpui::EventEmitter<DismissEvent> for CaptureRecentAudioNotification {}
+    impl gpui::EventEmitter<SuppressEvent> for CaptureRecentAudioNotification {}
+    impl gpui::Focusable for CaptureRecentAudioNotification {
         fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
             self.focus_handle.clone()
         }
     }
-    impl workspace::notifications::Notification for CaptureAudioNotification {}
+    impl workspace::notifications::Notification for CaptureRecentAudioNotification {}
 
-    const AUDIO_RECORDING_TIME_SECS: u64 = 10;
-
-    impl Render for CaptureAudioNotification {
+    impl Render for CaptureRecentAudioNotification {
         fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            let elapsed = self.start_time.elapsed().as_secs();
-            let message = match &self.state {
-                State::Recording(capture) => format!(
-                    "Recording {} seconds of audio from input: '{}'",
-                    AUDIO_RECORDING_TIME_SECS - elapsed,
-                    capture.name,
+            let message = match &self.save_result {
+                None => format!(
+                    "Saving up to {} seconds of recent audio",
+                    REPLAY_DURATION.as_secs(),
                 ),
-                State::Failed(e) => format!("Error capturing audio: {e}"),
-                State::Finished(path) => format!("Audio recorded to {}", path.display()),
-                State::Invalid => "Error invalid state".to_string(),
+                Some(Ok((path, duration))) => format!(
+                    "Saved {} seconds of all audio to {}",
+                    duration.as_secs(),
+                    path.display(),
+                ),
+                Some(Err(e)) => format!("Error saving audio replays: {e:?}"),
             };
 
             NotificationFrame::new()
-                .with_title(Some("Recording Audio"))
+                .with_title(Some("Saved Audio"))
                 .show_suppress_button(false)
                 .on_close(cx.listener(|_, _, _, cx| {
                     cx.emit(DismissEvent);
@@ -1897,53 +1889,41 @@ fn capture_audio(workspace: &mut Workspace, _: &mut Window, cx: &mut Context<Wor
         }
     }
 
-    impl CaptureAudioNotification {
-        fn finish(&mut self) {
-            let state = std::mem::take(&mut self.state);
-            self.state = if let State::Recording(capture) = state {
-                match capture.finish() {
-                    Ok(path) => State::Finished(path),
-                    Err(e) => State::Failed(e.to_string()),
+    impl CaptureRecentAudioNotification {
+        fn new(cx: &mut Context<Self>) -> Self {
+            if AudioSettings::get_global(cx).rodio_audio {
+                let executor = cx.background_executor().clone();
+                let save_task = cx.default_global::<audio::Audio>().save_replays(executor);
+                let _save_task = cx.spawn(async move |this, cx| {
+                    let res = save_task.await;
+                    this.update(cx, |this, cx| {
+                        this.save_result = Some(res);
+                        cx.notify();
+                    })
+                });
+
+                Self {
+                    focus_handle: cx.focus_handle(),
+                    _save_task,
+                    save_result: None,
                 }
             } else {
-                state
-            };
-        }
-
-        fn new(cx: &mut Context<Self>) -> Self {
-            cx.spawn(async move |this, cx| {
-                for _ in 0..10 {
-                    cx.background_executor().timer(Duration::from_secs(1)).await;
-                    this.update(cx, |_, cx| {
-                        cx.notify();
-                    })?;
+                Self {
+                    focus_handle: cx.focus_handle(),
+                    _save_task: Task::ready(Ok(())),
+                    save_result: Some(Err(anyhow::anyhow!(
+                        "Capturing recent audio is only supported on the experimental rodio audio pipeline"
+                    ))),
                 }
-
-                this.update(cx, |this, cx| {
-                    this.finish();
-                    cx.notify();
-                })?;
-
-                anyhow::Ok(())
-            })
-            .detach();
-
-            let state = match livekit_client::CaptureInput::start() {
-                Ok(capture_input) => State::Recording(capture_input),
-                Err(err) => State::Failed(format!("Error starting audio capture: {}", err)),
-            };
-
-            Self {
-                focus_handle: cx.focus_handle(),
-                start_time: Instant::now(),
-                state,
             }
         }
     }
 
-    workspace.show_notification(NotificationId::unique::<CaptureAudio>(), cx, |cx| {
-        cx.new(CaptureAudioNotification::new)
-    });
+    workspace.show_notification(
+        NotificationId::unique::<CaptureRecentAudioNotification>(),
+        cx,
+        |cx| cx.new(CaptureRecentAudioNotification::new),
+    );
 }
 
 #[cfg(test)]
diff --git a/tooling/workspace-hack/Cargo.toml b/tooling/workspace-hack/Cargo.toml
index 9bcaabb8cc..1393ac54f3 100644
--- a/tooling/workspace-hack/Cargo.toml
+++ b/tooling/workspace-hack/Cargo.toml
@@ -47,6 +47,7 @@ clap_builder = { version = "4", default-features = false, features = ["cargo", "
 concurrent-queue = { version = "2" }
 cranelift-codegen = { version = "0.116", default-features = false, features = ["host-arch", "incremental-cache", "std", "timing", "unwind"] }
 crc32fast = { version = "1" }
+crossbeam-channel = { version = "0.5" }
 crossbeam-epoch = { version = "0.9" }
 crossbeam-utils = { version = "0.8" }
 deranged = { version = "0.4", default-features = false, features = ["powerfmt", "serde", "std"] }
@@ -176,6 +177,7 @@ clap_builder = { version = "4", default-features = false, features = ["cargo", "
 concurrent-queue = { version = "2" }
 cranelift-codegen = { version = "0.116", default-features = false, features = ["host-arch", "incremental-cache", "std", "timing", "unwind"] }
 crc32fast = { version = "1" }
+crossbeam-channel = { version = "0.5" }
 crossbeam-epoch = { version = "0.9" }
 crossbeam-utils = { version = "0.8" }
 deranged = { version = "0.4", default-features = false, features = ["powerfmt", "serde", "std"] }
@@ -291,6 +293,7 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-f
 gimli = { version = "0.31", default-features = false, features = ["read", "std", "write"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 naga = { version = "25", features = ["msl-out", "wgsl-in"] }
 nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
 objc2 = { version = "0.6" }
@@ -319,6 +322,7 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-f
 gimli = { version = "0.31", default-features = false, features = ["read", "std", "write"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 naga = { version = "25", features = ["msl-out", "wgsl-in"] }
 nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
 objc2 = { version = "0.6" }
@@ -348,6 +352,7 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-f
 gimli = { version = "0.31", default-features = false, features = ["read", "std", "write"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 naga = { version = "25", features = ["msl-out", "wgsl-in"] }
 nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
 objc2 = { version = "0.6" }
@@ -376,6 +381,7 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-f
 gimli = { version = "0.31", default-features = false, features = ["read", "std", "write"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 naga = { version = "25", features = ["msl-out", "wgsl-in"] }
 nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
 objc2 = { version = "0.6" }
@@ -413,6 +419,7 @@ inout = { version = "0.1", default-features = false, features = ["block-padding"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 linux-raw-sys-274715c4dabd11b0 = { package = "linux-raw-sys", version = "0.9", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "xdp"] }
 linux-raw-sys-9fbad63c4bcf4a8f = { package = "linux-raw-sys", version = "0.4", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
@@ -453,6 +460,7 @@ inout = { version = "0.1", default-features = false, features = ["block-padding"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 linux-raw-sys-274715c4dabd11b0 = { package = "linux-raw-sys", version = "0.9", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "xdp"] }
 linux-raw-sys-9fbad63c4bcf4a8f = { package = "linux-raw-sys", version = "0.4", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
@@ -491,6 +499,7 @@ inout = { version = "0.1", default-features = false, features = ["block-padding"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 linux-raw-sys-274715c4dabd11b0 = { package = "linux-raw-sys", version = "0.9", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "xdp"] }
 linux-raw-sys-9fbad63c4bcf4a8f = { package = "linux-raw-sys", version = "0.4", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
@@ -531,6 +540,7 @@ inout = { version = "0.1", default-features = false, features = ["block-padding"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 linux-raw-sys-274715c4dabd11b0 = { package = "linux-raw-sys", version = "0.9", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "xdp"] }
 linux-raw-sys-9fbad63c4bcf4a8f = { package = "linux-raw-sys", version = "0.4", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
@@ -560,6 +570,7 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-f
 getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["js", "rdrand"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 ring = { version = "0.17", features = ["std"] }
 rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event"] }
 scopeguard = { version = "1" }
@@ -583,6 +594,7 @@ getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-f
 getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["js", "rdrand"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "native-tokio", "ring", "tls12"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 ring = { version = "0.17", features = ["std"] }
 rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event"] }
@@ -616,6 +628,7 @@ inout = { version = "0.1", default-features = false, features = ["block-padding"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 linux-raw-sys-274715c4dabd11b0 = { package = "linux-raw-sys", version = "0.9", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "xdp"] }
 linux-raw-sys-9fbad63c4bcf4a8f = { package = "linux-raw-sys", version = "0.4", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
@@ -656,6 +669,7 @@ inout = { version = "0.1", default-features = false, features = ["block-padding"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 linux-raw-sys-274715c4dabd11b0 = { package = "linux-raw-sys", version = "0.9", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "xdp"] }
 linux-raw-sys-9fbad63c4bcf4a8f = { package = "linux-raw-sys", version = "0.4", default-features = false, features = ["elf", "errno", "general", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] }
+livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }

From 2ce0641fe073f56cdbd27c6496032a985b9036ec Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Wed, 10 Sep 2025 17:02:08 -0500
Subject: [PATCH 766/823] settings_ui: Handle enums with fields (#37945)

Closes #ISSUE

Adds handling for Enums with fields (i.e. not `enum Foo { Yes, No }`) in
Settings UI. Accomplished by creating default values for each element
with fields (in the derive macro), and rendering a toggle button group
with a button for each variant where switching the active variant sets
the value in the settings JSON to the default for the new active
variant.

Release Notes:

- N/A *or* Added/Fixed/Improved ...

---------

Co-authored-by: Conrad <conrad@zed.dev>
---
 crates/feature_flags/src/feature_flags.rs     |   7 +-
 crates/language/src/language_settings.rs      |  22 +-
 crates/settings/src/settings_ui_core.rs       |  12 +-
 crates/settings_ui/src/settings_ui.rs         | 468 ++++++++++--------
 .../src/settings_ui_macros.rs                 | 259 +++++++---
 docs/src/visual-customization.md              |   4 +-
 6 files changed, 472 insertions(+), 300 deletions(-)

diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 8a50b7ec9b..4afeb32235 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -23,7 +23,7 @@ impl FeatureFlags {
             return true;
         }
 
-        if self.staff && T::enabled_for_staff() {
+        if (cfg!(debug_assertions) || self.staff) && !*ZED_DISABLE_STAFF && T::enabled_for_staff() {
             return true;
         }
 
@@ -210,7 +210,10 @@ impl FeatureFlagAppExt for App {
     fn has_flag<T: FeatureFlag>(&self) -> bool {
         self.try_global::<FeatureFlags>()
             .map(|flags| flags.has_flag::<T>())
-            .unwrap_or(T::enabled_for_all())
+            .unwrap_or_else(|| {
+                (cfg!(debug_assertions) && T::enabled_for_staff() && !*ZED_DISABLE_STAFF)
+                    || T::enabled_for_all()
+            })
     }
 
     fn is_staff(&self) -> bool {
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index cb193960ae..af9e6edbfa 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -981,11 +981,17 @@ impl<'de> Deserialize<'de> for SelectedFormatter {
 }
 
 /// Controls which formatters should be used when formatting code.
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(untagged)]
 pub enum FormatterList {
     Single(Formatter),
-    Vec(Vec<Formatter>),
+    Vec(#[settings_ui(skip)] Vec<Formatter>),
+}
+
+impl Default for FormatterList {
+    fn default() -> Self {
+        Self::Single(Formatter::default())
+    }
 }
 
 impl AsRef<[Formatter]> for FormatterList {
@@ -998,22 +1004,28 @@ impl AsRef<[Formatter]> for FormatterList {
 }
 
 /// Controls which formatter should be used when formatting code. If there are multiple formatters, they are executed in the order of declaration.
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, SettingsUi)]
 #[serde(rename_all = "snake_case")]
 pub enum Formatter {
     /// Format code using the current language server.
-    LanguageServer { name: Option<String> },
+    LanguageServer {
+        #[settings_ui(skip)]
+        name: Option<String>,
+    },
     /// Format code using Zed's Prettier integration.
+    #[default]
     Prettier,
     /// Format code using an external command.
     External {
         /// The external program to run.
+        #[settings_ui(skip)]
         command: Arc<str>,
         /// The arguments to pass to the program.
+        #[settings_ui(skip)]
         arguments: Option<Arc<[String]>>,
     },
     /// Files should be formatted using code actions executed by language servers.
-    CodeActions(HashMap<String, bool>),
+    CodeActions(#[settings_ui(skip)] HashMap<String, bool>),
 }
 
 /// The settings for indent guides.
diff --git a/crates/settings/src/settings_ui_core.rs b/crates/settings/src/settings_ui_core.rs
index c3366641a8..d4f49785a6 100644
--- a/crates/settings/src/settings_ui_core.rs
+++ b/crates/settings/src/settings_ui_core.rs
@@ -108,10 +108,19 @@ impl<T: serde::Serialize> SettingsValue<T> {
 
 #[derive(Clone)]
 pub struct SettingsUiItemUnion {
-    pub options: Vec<SettingsUiEntry>,
+    /// Must be the same length as `labels` and `options`
+    pub defaults: Box<[serde_json::Value]>,
+    /// Must be the same length as defaults` and `options`
+    pub labels: &'static [&'static str],
+    /// Must be the same length as `defaults` and `labels`
+    pub options: Box<[Option<SettingsUiEntry>]>,
     pub determine_option: fn(&serde_json::Value, &App) -> usize,
 }
 
+// todo(settings_ui): use in ToggleGroup and Dropdown
+#[derive(Clone)]
+pub struct SettingsEnumVariants {}
+
 pub struct SettingsUiEntryMetaData {
     pub title: SharedString,
     pub path: SharedString,
@@ -136,6 +145,7 @@ pub enum SettingsUiItem {
     Single(SettingsUiItemSingle),
     Union(SettingsUiItemUnion),
     DynamicMap(SettingsUiItemDynamicMap),
+    // Array(SettingsUiItemArray), // code-actions: array of objects, array of string
     None,
 }
 
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 4c9419491c..345a997527 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -1,13 +1,14 @@
 mod appearance_settings_controls;
 
-use std::any::TypeId;
-use std::num::NonZeroU32;
-use std::ops::{Not, Range};
+use std::{
+    num::NonZeroU32,
+    ops::{Not, Range},
+    rc::Rc,
+};
 
 use anyhow::Context as _;
-use command_palette_hooks::CommandPaletteFilter;
 use editor::{Editor, EditorSettingsControls};
-use feature_flags::{FeatureFlag, FeatureFlagViewExt};
+use feature_flags::{FeatureFlag, FeatureFlagAppExt};
 use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, ReadGlobal, ScrollHandle, actions};
 use settings::{
     NumType, SettingsStore, SettingsUiEntry, SettingsUiEntryMetaData, SettingsUiItem,
@@ -19,7 +20,6 @@ use ui::{NumericStepper, SwitchField, ToggleButtonGroup, ToggleButtonSimple, pre
 use workspace::{
     Workspace,
     item::{Item, ItemEvent},
-    with_active_or_new_workspace,
 };
 
 use crate::appearance_settings_controls::AppearanceSettingsControls;
@@ -38,50 +38,45 @@ actions!(
     ]
 );
 
-pub fn init(cx: &mut App) {
-    cx.on_action(|_: &OpenSettingsEditor, cx| {
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            let existing = workspace
-                .active_pane()
-                .read(cx)
-                .items()
-                .find_map(|item| item.downcast::<SettingsPage>());
+pub fn open_settings_editor(
+    workspace: &mut Workspace,
+    _: &OpenSettingsEditor,
+    window: &mut Window,
+    cx: &mut Context<Workspace>,
+) {
+    // todo(settings_ui) open in a local workspace if this is remote.
+    let existing = workspace
+        .active_pane()
+        .read(cx)
+        .items()
+        .find_map(|item| item.downcast::<SettingsPage>());
 
-            if let Some(existing) = existing {
-                workspace.activate_item(&existing, true, true, window, cx);
+    if let Some(existing) = existing {
+        workspace.activate_item(&existing, true, true, window, cx);
+    } else {
+        let settings_page = SettingsPage::new(workspace, cx);
+        workspace.add_item_to_active_pane(Box::new(settings_page), None, true, window, cx)
+    }
+}
+
+pub fn init(cx: &mut App) {
+    cx.observe_new(|workspace: &mut Workspace, _, _| {
+        workspace.register_action_renderer(|div, _, _, cx| {
+            let settings_ui_actions = [std::any::TypeId::of::<OpenSettingsEditor>()];
+            let has_flag = cx.has_flag::<SettingsUiFeatureFlag>();
+            command_palette_hooks::CommandPaletteFilter::update_global(cx, |filter, _| {
+                if has_flag {
+                    filter.show_action_types(&settings_ui_actions);
+                } else {
+                    filter.hide_action_types(&settings_ui_actions);
+                }
+            });
+            if has_flag {
+                div.on_action(cx.listener(open_settings_editor))
             } else {
-                let settings_page = SettingsPage::new(workspace, cx);
-                workspace.add_item_to_active_pane(Box::new(settings_page), None, true, window, cx)
+                div
             }
         });
-    });
-
-    cx.observe_new(|_workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-
-        let settings_ui_actions = [TypeId::of::<OpenSettingsEditor>()];
-
-        CommandPaletteFilter::update_global(cx, |filter, _cx| {
-            filter.hide_action_types(&settings_ui_actions);
-        });
-
-        cx.observe_flag::<SettingsUiFeatureFlag, _>(
-            window,
-            move |is_enabled, _workspace, _, cx| {
-                if is_enabled {
-                    CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                        filter.show_action_types(&settings_ui_actions);
-                    });
-                } else {
-                    CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                        filter.hide_action_types(&settings_ui_actions);
-                    });
-                }
-            },
-        )
-        .detach();
     })
     .detach();
 }
@@ -153,9 +148,7 @@ struct UiEntry {
     next_sibling: Option<usize>,
     // expanded: bool,
     render: Option<SettingsUiItemSingle>,
-    /// For dynamic items this is a way to select a value from a list of values
-    /// this is always none for non-dynamic items
-    select_descendant: Option<fn(&serde_json::Value, &App) -> usize>,
+    dynamic_render: Option<SettingsUiItemUnion>,
     generate_items: Option<(
         SettingsUiItem,
         fn(&serde_json::Value, &App) -> Vec<SettingsUiEntryMetaData>,
@@ -198,6 +191,7 @@ fn build_tree_item(
     depth: usize,
     prev_index: Option<usize>,
 ) {
+    // let tree: HashMap<Path, UiEntry>;
     let index = tree.len();
     tree.push(UiEntry {
         title: entry.title.into(),
@@ -208,7 +202,7 @@ fn build_tree_item(
         total_descendant_range: index + 1..index + 1,
         render: None,
         next_sibling: None,
-        select_descendant: None,
+        dynamic_render: None,
         generate_items: None,
     });
     if let Some(prev_index) = prev_index {
@@ -230,12 +224,14 @@ fn build_tree_item(
         SettingsUiItem::Single(item) => {
             tree[index].render = Some(item);
         }
-        SettingsUiItem::Union(SettingsUiItemUnion {
-            options,
-            determine_option,
-        }) => {
-            tree[index].select_descendant = Some(determine_option);
+        SettingsUiItem::Union(dynamic_render) => {
+            // todo(settings_ui) take from item and store other fields instead of clone
+            // will also require replacing usage in render_recursive so it can know
+            // which options were actually rendered
+            let options = dynamic_render.options.clone();
+            tree[index].dynamic_render = Some(dynamic_render);
             for option in options {
+                let Some(option) = option else { continue };
                 let prev_index = tree[index]
                     .descendant_range
                     .is_empty()
@@ -316,13 +312,14 @@ impl SettingsUiTree {
             }
             // todo(settings_ui): handle dynamic nodes here
             let selected_descendant_index = child
-                .select_descendant
-                .map(|select_descendant| {
+                .dynamic_render
+                .as_ref()
+                .map(|dynamic_render| {
                     read_settings_value_from_path(
                         SettingsStore::global(cx).raw_default_settings(),
                         &current_path,
                     )
-                    .map(|value| select_descendant(value, cx))
+                    .map(|value| (dynamic_render.determine_option)(value, cx))
                 })
                 .and_then(|selected_descendant_index| {
                     selected_descendant_index.map(|index| child.nth_descendant_index(tree, index))
@@ -383,148 +380,177 @@ fn render_content(
 
     let mut path = smallvec::smallvec![];
 
-    fn render_recursive(
-        tree: &[UiEntry],
-        index: usize,
-        path: &mut SmallVec<[SharedString; 1]>,
-        mut element: Div,
-        // todo(settings_ui): can this be a ref without cx borrow issues?
-        fallback_path: &mut Option<SmallVec<[SharedString; 1]>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Div {
-        let Some(child) = tree.get(index) else {
-            return element.child(
-                Label::new(SharedString::new_static("No settings found")).color(Color::Error),
-            );
-        };
-
-        element = element.child(Label::new(child.title.clone()).size(LabelSize::Large));
-
-        // todo(settings_ui): subgroups?
-        let mut pushed_path = false;
-        if let Some(child_path) = child.path.as_ref() {
-            path.push(child_path.clone());
-            if let Some(fallback_path) = fallback_path.as_mut() {
-                fallback_path.push(child_path.clone());
-            }
-            pushed_path = true;
-        }
-        // let fallback_path_copy = fallback_path.cloned();
-        let settings_value = settings_value_from_settings_and_path(
-            path.clone(),
-            fallback_path.as_ref().map(|path| path.as_slice()),
-            child.title.clone(),
-            child.documentation.clone(),
-            // PERF: how to structure this better? There feels like there's a way to avoid the clone
-            // and every value lookup
-            SettingsStore::global(cx).raw_user_settings(),
-            SettingsStore::global(cx).raw_default_settings(),
-        );
-        if let Some(select_descendant) = child.select_descendant {
-            let selected_descendant =
-                child.nth_descendant_index(tree, select_descendant(settings_value.read(), cx));
-            if let Some(descendant_index) = selected_descendant {
-                element = render_recursive(
-                    tree,
-                    descendant_index,
-                    path,
-                    element,
-                    fallback_path,
-                    window,
-                    cx,
-                );
-            }
-        } else if let Some((settings_ui_item, generate_items, defaults_path)) =
-            child.generate_items.as_ref()
-        {
-            let generated_items = generate_items(settings_value.read(), cx);
-            let mut ui_items = Vec::with_capacity(generated_items.len());
-            for item in generated_items {
-                let settings_ui_entry = SettingsUiEntry {
-                    path: None,
-                    title: "",
-                    documentation: None,
-                    item: settings_ui_item.clone(),
-                };
-                let prev_index = if ui_items.is_empty() {
-                    None
-                } else {
-                    Some(ui_items.len() - 1)
-                };
-                let item_index = ui_items.len();
-                build_tree_item(
-                    &mut ui_items,
-                    settings_ui_entry,
-                    child._depth + 1,
-                    prev_index,
-                );
-                if item_index < ui_items.len() {
-                    ui_items[item_index].path = None;
-                    ui_items[item_index].title = item.title.clone();
-                    ui_items[item_index].documentation = item.documentation.clone();
-
-                    // push path instead of setting path on ui item so that the path isn't pushed to default_path as well
-                    // when we recurse
-                    path.push(item.path.clone());
-                    element = render_recursive(
-                        &ui_items,
-                        item_index,
-                        path,
-                        element,
-                        &mut Some(defaults_path.clone()),
-                        window,
-                        cx,
-                    );
-                    path.pop();
-                }
-            }
-        } else if let Some(child_render) = child.render.as_ref() {
-            element = element.child(div().child(render_item_single(
-                settings_value,
-                child_render,
-                window,
-                cx,
-            )));
-        } else if let Some(child_index) = child.first_descendant_index() {
-            let mut index = Some(child_index);
-            while let Some(sub_child_index) = index {
-                element = render_recursive(
-                    tree,
-                    sub_child_index,
-                    path,
-                    element,
-                    fallback_path,
-                    window,
-                    cx,
-                );
-                index = tree[sub_child_index].next_sibling;
-            }
-        } else {
-            element =
-                element.child(div().child(Label::new("// skipped (for now)").color(Color::Muted)))
-        }
-
-        if pushed_path {
-            path.pop();
-            if let Some(fallback_path) = fallback_path.as_mut() {
-                fallback_path.pop();
-            }
-        }
-        return element;
-    }
-
     return render_recursive(
         &tree.entries,
         tree.active_entry_index,
         &mut path,
         content,
         &mut None,
+        true,
         window,
         cx,
     );
 }
 
+fn render_recursive(
+    tree: &[UiEntry],
+    index: usize,
+    path: &mut SmallVec<[SharedString; 1]>,
+    mut element: Div,
+    fallback_path: &mut Option<SmallVec<[SharedString; 1]>>,
+    render_next_title: bool,
+    window: &mut Window,
+    cx: &mut App,
+) -> Div {
+    let Some(child) = tree.get(index) else {
+        return element
+            .child(Label::new(SharedString::new_static("No settings found")).color(Color::Error));
+    };
+
+    if render_next_title {
+        element = element.child(Label::new(child.title.clone()).size(LabelSize::Large));
+    }
+
+    // todo(settings_ui): subgroups?
+    let mut pushed_path = false;
+    if let Some(child_path) = child.path.as_ref() {
+        path.push(child_path.clone());
+        if let Some(fallback_path) = fallback_path.as_mut() {
+            fallback_path.push(child_path.clone());
+        }
+        pushed_path = true;
+    }
+    let settings_value = settings_value_from_settings_and_path(
+        path.clone(),
+        fallback_path.as_ref().map(|path| path.as_slice()),
+        child.title.clone(),
+        child.documentation.clone(),
+        // PERF: how to structure this better? There feels like there's a way to avoid the clone
+        // and every value lookup
+        SettingsStore::global(cx).raw_user_settings(),
+        SettingsStore::global(cx).raw_default_settings(),
+    );
+    if let Some(dynamic_render) = child.dynamic_render.as_ref() {
+        let value = settings_value.read();
+        let selected_index = (dynamic_render.determine_option)(value, cx);
+        element = element.child(div().child(render_toggle_button_group_inner(
+            settings_value.title.clone(),
+            dynamic_render.labels,
+            Some(selected_index),
+            {
+                let path = settings_value.path.clone();
+                let defaults = dynamic_render.defaults.clone();
+                move |idx, cx| {
+                    if idx == selected_index {
+                        return;
+                    }
+                    let default = defaults.get(idx).cloned().unwrap_or_default();
+                    SettingsValue::write_value(&path, default, cx);
+                }
+            },
+        )));
+        // we don't add descendants for unit options, so we adjust the selected index
+        // by the number of options we didn't add descendants for, to get the descendant index
+        let selected_descendant_index = selected_index
+            - dynamic_render.options[..selected_index]
+                .iter()
+                .filter(|option| option.is_none())
+                .count();
+        if dynamic_render.options[selected_index].is_some()
+            && let Some(descendant_index) =
+                child.nth_descendant_index(tree, selected_descendant_index)
+        {
+            element = render_recursive(
+                tree,
+                descendant_index,
+                path,
+                element,
+                fallback_path,
+                false,
+                window,
+                cx,
+            );
+        }
+    } else if let Some((settings_ui_item, generate_items, defaults_path)) =
+        child.generate_items.as_ref()
+    {
+        let generated_items = generate_items(settings_value.read(), cx);
+        let mut ui_items = Vec::with_capacity(generated_items.len());
+        for item in generated_items {
+            let settings_ui_entry = SettingsUiEntry {
+                path: None,
+                title: "",
+                documentation: None,
+                item: settings_ui_item.clone(),
+            };
+            let prev_index = if ui_items.is_empty() {
+                None
+            } else {
+                Some(ui_items.len() - 1)
+            };
+            let item_index = ui_items.len();
+            build_tree_item(
+                &mut ui_items,
+                settings_ui_entry,
+                child._depth + 1,
+                prev_index,
+            );
+            if item_index < ui_items.len() {
+                ui_items[item_index].path = None;
+                ui_items[item_index].title = item.title.clone();
+                ui_items[item_index].documentation = item.documentation.clone();
+
+                // push path instead of setting path on ui item so that the path isn't pushed to default_path as well
+                // when we recurse
+                path.push(item.path.clone());
+                element = render_recursive(
+                    &ui_items,
+                    item_index,
+                    path,
+                    element,
+                    &mut Some(defaults_path.clone()),
+                    true,
+                    window,
+                    cx,
+                );
+                path.pop();
+            }
+        }
+    } else if let Some(child_render) = child.render.as_ref() {
+        element = element.child(div().child(render_item_single(
+            settings_value,
+            child_render,
+            window,
+            cx,
+        )));
+    } else if let Some(child_index) = child.first_descendant_index() {
+        let mut index = Some(child_index);
+        while let Some(sub_child_index) = index {
+            element = render_recursive(
+                tree,
+                sub_child_index,
+                path,
+                element,
+                fallback_path,
+                true,
+                window,
+                cx,
+            );
+            index = tree[sub_child_index].next_sibling;
+        }
+    } else {
+        element = element.child(div().child(Label::new("// skipped (for now)").color(Color::Muted)))
+    }
+
+    if pushed_path {
+        path.pop();
+        if let Some(fallback_path) = fallback_path.as_mut() {
+            fallback_path.pop();
+        }
+    }
+    return element;
+}
+
 impl Render for SettingsPage {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let scroll_handle = window.use_state(cx, |_, _| ScrollHandle::new());
@@ -855,41 +881,47 @@ fn render_toggle_button_group(
     _: &mut App,
 ) -> AnyElement {
     let value = downcast_any_item::<String>(value);
+    let active_value = value.read();
+    let selected_idx = variants.iter().position(|v| v == &active_value);
 
+    return render_toggle_button_group_inner(value.title, labels, selected_idx, {
+        let path = value.path.clone();
+        move |variant_index, cx| {
+            SettingsValue::write_value(
+                &path,
+                serde_json::Value::String(variants[variant_index].to_string()),
+                cx,
+            );
+        }
+    });
+}
+
+fn render_toggle_button_group_inner(
+    title: SharedString,
+    labels: &'static [&'static str],
+    selected_idx: Option<usize>,
+    on_write: impl Fn(usize, &mut App) + 'static,
+) -> AnyElement {
     fn make_toggle_group<const LEN: usize>(
-        value: SettingsValue<String>,
-        variants: &'static [&'static str],
+        title: SharedString,
+        selected_idx: Option<usize>,
+        on_write: Rc<dyn Fn(usize, &mut App)>,
         labels: &'static [&'static str],
     ) -> AnyElement {
-        let mut variants_array: [(&'static str, &'static str); LEN] = [("unused", "unused"); LEN];
-        for i in 0..LEN {
-            variants_array[i] = (variants[i], labels[i]);
-        }
-        let active_value = value.read();
-
-        let selected_idx = variants_array
-            .iter()
-            .enumerate()
-            .find_map(|(idx, (variant, _))| {
-                if variant == &active_value {
-                    Some(idx)
-                } else {
-                    None
-                }
-            });
+        let labels_array: [&'static str; LEN] = {
+            let mut arr = ["unused"; LEN];
+            arr.copy_from_slice(labels);
+            arr
+        };
 
         let mut idx = 0;
         ToggleButtonGroup::single_row(
-            value.title.clone(),
-            variants_array.map(|(variant, label)| {
-                let path = value.path.clone();
+            title,
+            labels_array.map(|label| {
                 idx += 1;
+                let on_write = on_write.clone();
                 ToggleButtonSimple::new(label, move |_, _, cx| {
-                    SettingsValue::write_value(
-                        &path,
-                        serde_json::Value::String(variant.to_string()),
-                        cx,
-                    );
+                    on_write(idx - 1, cx);
                 })
             }),
         )
@@ -898,10 +930,12 @@ fn render_toggle_button_group(
         .into_any_element()
     }
 
+    let on_write = Rc::new(on_write);
+
     macro_rules! templ_toggl_with_const_param {
         ($len:expr) => {
-            if variants.len() == $len {
-                return make_toggle_group::<$len>(value, variants, labels);
+            if labels.len() == $len {
+                return make_toggle_group::<$len>(title.clone(), selected_idx, on_write, labels);
             }
         };
     }
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index 076f9c0f04..fcff230ef8 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -1,5 +1,3 @@
-use std::ops::Not;
-
 use heck::{ToSnakeCase as _, ToTitleCase as _};
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
@@ -67,7 +65,7 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
 
     let doc_str = parse_documentation_from_attrs(&input.attrs);
 
-    let ui_item_fn_body = generate_ui_item_body(group_name.as_ref(), path_name.as_ref(), &input);
+    let ui_item_fn_body = generate_ui_item_body(group_name.as_ref(), &input);
 
     // todo(settings_ui): make group name optional, repurpose group as tag indicating item is group, and have "title" tag for custom title
     let title = group_name.unwrap_or(input.ident.to_string().to_title_case());
@@ -126,109 +124,221 @@ fn map_ui_item_to_entry(
     doc_str: Option<&str>,
     ty: TokenStream,
 ) -> TokenStream {
-    let ty = extract_type_from_option(ty);
     // todo(settings_ui): does quote! just work with options?
     let path = path.map_or_else(|| quote! {None}, |path| quote! {Some(#path)});
     let doc_str = doc_str.map_or_else(|| quote! {None}, |doc_str| quote! {Some(#doc_str)});
+    let item = ui_item_from_type(ty);
     quote! {
         settings::SettingsUiEntry {
             title: #title,
             path: #path,
-            item: #ty::settings_ui_item(),
+            item: #item,
             documentation: #doc_str,
         }
     }
 }
 
-fn generate_ui_item_body(
-    group_name: Option<&String>,
-    path_name: Option<&String>,
-    input: &syn::DeriveInput,
+fn ui_item_from_type(ty: TokenStream) -> TokenStream {
+    let ty = extract_type_from_option(ty);
+    return trait_method_call(ty, quote! {settings::SettingsUi}, quote! {settings_ui_item});
+}
+
+fn trait_method_call(
+    ty: TokenStream,
+    trait_name: TokenStream,
+    method_name: TokenStream,
 ) -> TokenStream {
-    match (group_name, path_name, &input.data) {
-        (_, _, Data::Union(_)) => unimplemented!("Derive SettingsUi for Unions"),
-        (None, _, Data::Struct(_)) => quote! {
+    // doing the <ty as settings::SettingsUi> makes the error message better:
+    //  -> "#ty Doesn't implement settings::SettingsUi" instead of "no item "settings_ui_item" for #ty"
+    // and ensures safety against name conflicts
+    //
+    // todo(settings_ui): Turn `Vec<T>` into `Vec::<T>` here as well
+    quote! {
+        <#ty as #trait_name>::#method_name()
+    }
+}
+
+fn generate_ui_item_body(group_name: Option<&String>, input: &syn::DeriveInput) -> TokenStream {
+    match (group_name, &input.data) {
+        (_, Data::Union(_)) => unimplemented!("Derive SettingsUi for Unions"),
+        (None, Data::Struct(_)) => quote! {
             settings::SettingsUiItem::None
         },
-        (Some(_), _, Data::Struct(data_struct)) => {
-            let struct_serde_attrs = parse_serde_attributes(&input.attrs);
-            let fields = data_struct
-                .fields
-                .iter()
-                .filter(|field| {
-                    !field.attrs.iter().any(|attr| {
-                        let mut has_skip = false;
-                        if attr.path().is_ident("settings_ui") {
-                            let _ = attr.parse_nested_meta(|meta| {
-                                if meta.path.is_ident("skip") {
-                                    has_skip = true;
-                                }
-                                Ok(())
-                            });
-                        }
-
-                        has_skip
-                    })
-                })
-                .map(|field| {
-                    let field_serde_attrs = parse_serde_attributes(&field.attrs);
-                    let name = field.ident.clone().expect("tuple fields").to_string();
-                    let doc_str = parse_documentation_from_attrs(&field.attrs);
-
-                    (
-                        name.to_title_case(),
-                        doc_str,
-                        field_serde_attrs.flatten.not().then(|| {
-                            struct_serde_attrs.apply_rename_to_field(&field_serde_attrs, &name)
-                        }),
-                        field.ty.to_token_stream(),
-                    )
-                })
-                // todo(settings_ui): Re-format field name as nice title, and support setting different title with attr
-                .map(|(title, doc_str, path, ty)| {
-                    map_ui_item_to_entry(path.as_deref(), &title, doc_str.as_deref(), ty)
-                });
-
-            quote! {
-                settings::SettingsUiItem::Group(settings::SettingsUiItemGroup{ items: vec![#(#fields),*] })
-            }
+        (Some(_), Data::Struct(data_struct)) => {
+            let parent_serde_attrs = parse_serde_attributes(&input.attrs);
+            item_group_from_fields(&data_struct.fields, &parent_serde_attrs)
         }
-        (None, _, Data::Enum(data_enum)) => {
+        (None, Data::Enum(data_enum)) => {
             let serde_attrs = parse_serde_attributes(&input.attrs);
             let length = data_enum.variants.len();
 
-            let variants = data_enum.variants.iter().map(|variant| {
-                let string = variant.ident.clone().to_string();
+            let mut variants = Vec::with_capacity(length);
+            let mut labels = Vec::with_capacity(length);
 
-                let title = string.to_title_case();
-                let string = serde_attrs.rename_all.apply(&string);
+            for variant in &data_enum.variants {
+                // todo(settings_ui): Can #[serde(rename = )] be on enum variants?
+                let ident = variant.ident.clone().to_string();
+                let variant_name = serde_attrs.rename_all.apply(&ident);
+                let title = variant_name.to_title_case();
 
-                (string, title)
-            });
-
-            let (variants, labels): (Vec<_>, Vec<_>) = variants.unzip();
-
-            if length > 6 {
-                quote! {
-                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
-                }
-            } else {
-                quote! {
-                    settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
-                }
+                variants.push(variant_name);
+                labels.push(title);
             }
+
+            let is_not_union = data_enum.variants.iter().all(|v| v.fields.is_empty());
+            if is_not_union {
+                return if length > 6 {
+                    quote! {
+                        settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
+                    }
+                } else {
+                    quote! {
+                        settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
+                    }
+                };
+            }
+            // else: Union!
+            let enum_name = &input.ident;
+
+            let options = data_enum.variants.iter().map(|variant| {
+                if variant.fields.is_empty() {
+                    return quote! {None};
+                }
+                let name = &variant.ident;
+                let item = item_group_from_fields(&variant.fields, &serde_attrs);
+                // todo(settings_ui): documentation
+                return quote! {
+                    Some(settings::SettingsUiEntry {
+                        path: None,
+                        title: stringify!(#name),
+                        documentation: None,
+                        item: #item,
+                    })
+                };
+            });
+            let defaults = data_enum.variants.iter().map(|variant| {
+                let variant_name = &variant.ident;
+                if variant.fields.is_empty() {
+                    quote! {
+                        serde_json::to_value(#enum_name::#variant_name).expect("Failed to serialize default value for #enum_name::#variant_name")
+                    }
+                } else {
+                    let fields = variant.fields.iter().enumerate().map(|(index, field)| {
+                        let field_name = field.ident.as_ref().map_or_else(|| syn::Index::from(index).into_token_stream(), |ident| ident.to_token_stream());
+                        let field_type_is_option = option_inner_type(field.ty.to_token_stream()).is_some();
+                        let field_default = if field_type_is_option {
+                            quote! {
+                                None
+                            }
+                        } else {
+                            quote! {
+                                ::std::default::Default::default()
+                            }
+                        };
+
+                        quote!{
+                            #field_name: #field_default
+                        }
+                    });
+                    quote! {
+                        serde_json::to_value(#enum_name::#variant_name {
+                            #(#fields),*
+                        }).expect("Failed to serialize default value for #enum_name::#variant_name")
+                    }
+                }
+            });
+            // todo(settings_ui): Identify #[default] attr and use it for index, defaulting to 0
+            let default_variant_index: usize = 0;
+            let determine_option_fn = {
+                let match_arms = data_enum
+                    .variants
+                    .iter()
+                    .enumerate()
+                    .map(|(index, variant)| {
+                        let variant_name = &variant.ident;
+                        quote! {
+                            Ok(#variant_name {..}) => #index
+                        }
+                    });
+                quote! {
+                    |value: &serde_json::Value, _cx: &gpui::App| -> usize {
+                        use #enum_name::*;
+                        match serde_json::from_value::<#enum_name>(value.clone()) {
+                            #(#match_arms),*,
+                            Err(_) => #default_variant_index,
+                        }
+                    }
+                }
+            };
+            // todo(settings_ui) should probably always use toggle group for unions, dropdown makes less sense
+            return quote! {
+                settings::SettingsUiItem::Union(settings::SettingsUiItemUnion {
+                    defaults: Box::new([#(#defaults),*]),
+                    labels: &[#(#labels),*],
+                    options: Box::new([#(#options),*]),
+                    determine_option: #determine_option_fn,
+                })
+            };
+            // panic!("Unhandled");
         }
         // todo(settings_ui) discriminated unions
-        (_, _, Data::Enum(_)) => quote! {
+        (_, Data::Enum(_)) => quote! {
             settings::SettingsUiItem::None
         },
     }
 }
 
+fn item_group_from_fields(fields: &syn::Fields, parent_serde_attrs: &SerdeOptions) -> TokenStream {
+    let group_items = fields
+        .iter()
+        .filter(|field| {
+            !field.attrs.iter().any(|attr| {
+                let mut has_skip = false;
+                if attr.path().is_ident("settings_ui") {
+                    let _ = attr.parse_nested_meta(|meta| {
+                        if meta.path.is_ident("skip") {
+                            has_skip = true;
+                        }
+                        Ok(())
+                    });
+                }
+
+                has_skip
+            })
+        })
+        .map(|field| {
+            let field_serde_attrs = parse_serde_attributes(&field.attrs);
+            let name = field.ident.as_ref().map(ToString::to_string);
+            let title = name.as_ref().map_or_else(
+                || "todo(settings_ui): Titles for tuple fields".to_string(),
+                |name| name.to_title_case(),
+            );
+            let doc_str = parse_documentation_from_attrs(&field.attrs);
+
+            (
+                title,
+                doc_str,
+                name.filter(|_| !field_serde_attrs.flatten).map(|name| {
+                    parent_serde_attrs.apply_rename_to_field(&field_serde_attrs, &name)
+                }),
+                field.ty.to_token_stream(),
+            )
+        })
+        // todo(settings_ui): Re-format field name as nice title, and support setting different title with attr
+        .map(|(title, doc_str, path, ty)| {
+            map_ui_item_to_entry(path.as_deref(), &title, doc_str.as_deref(), ty)
+        });
+
+    quote! {
+        settings::SettingsUiItem::Group(settings::SettingsUiItemGroup{ items: vec![#(#group_items),*] })
+    }
+}
+
 struct SerdeOptions {
     rename_all: SerdeRenameAll,
     rename: Option<String>,
     flatten: bool,
+    untagged: bool,
     _alias: Option<String>, // todo(settings_ui)
 }
 
@@ -264,6 +374,7 @@ fn parse_serde_attributes(attrs: &[syn::Attribute]) -> SerdeOptions {
         rename_all: SerdeRenameAll::None,
         rename: None,
         flatten: false,
+        untagged: false,
         _alias: None,
     };
 
@@ -296,6 +407,8 @@ fn parse_serde_attributes(attrs: &[syn::Attribute]) -> SerdeOptions {
                 meta.input.parse::<Token![=]>()?;
                 let lit = meta.input.parse::<LitStr>()?.value();
                 options.rename = Some(lit);
+            } else if meta.path.is_ident("untagged") {
+                options.untagged = true;
             }
             Ok(())
         })
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
index 073911fd60..27802888c9 100644
--- a/docs/src/visual-customization.md
+++ b/docs/src/visual-customization.md
@@ -456,7 +456,7 @@ Project panel can be shown/hidden with {#action project_panel::ToggleFocus} ({#k
     "button": true,         // Show/hide the icon in the status bar
     "dock": "right",        // Where to dock: left, right, bottom
     "default_width": 640,   // Default width (left/right docked)
-    "default_height": 320,  // Default height (bottom dockeed)
+    "default_height": 320,  // Default height (bottom docked)
   },
   "agent_font_size": 16
 ```
@@ -471,7 +471,7 @@ See [Zed AI Documentation](./ai/overview.md) for additional non-visual AI settin
     "dock": "bottom",                   // Where to dock: left, right, bottom
     "button": true,                     // Show/hide status bar icon
     "default_width": 640,               // Default width (left/right docked)
-    "default_height": 320,              // Default height (bottom dockeed)
+    "default_height": 320,              // Default height (bottom docked)
 
     // Set the cursor blinking behavior in the terminal (on, off, terminal_controlled)
     "blinking": "terminal_controlled",

From db367cc6bfeb2218c7b21f76a51c54ee7a36d500 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Wed, 10 Sep 2025 18:02:23 -0400
Subject: [PATCH 767/823] scheduler: Add missing constructs for Cloud (#37948)

This PR adds some missing constructs that are needed by Cloud to the
scheduler.

Release Notes:

- N/A
---
 crates/scheduler/src/clock.rs          | 5 +++++
 crates/scheduler/src/test_scheduler.rs | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/crates/scheduler/src/clock.rs b/crates/scheduler/src/clock.rs
index 447d76b584..017643c4eb 100644
--- a/crates/scheduler/src/clock.rs
+++ b/crates/scheduler/src/clock.rs
@@ -24,6 +24,11 @@ impl TestClock {
         }))
     }
 
+    pub fn set_utc_now(&self, now: DateTime<Utc>) {
+        let mut state = self.0.lock();
+        state.utc_now = now;
+    }
+
     pub fn advance(&self, duration: Duration) {
         let mut state = self.0.lock();
         state.now += duration;
diff --git a/crates/scheduler/src/test_scheduler.rs b/crates/scheduler/src/test_scheduler.rs
index 243f6f756d..d9523640f4 100644
--- a/crates/scheduler/src/test_scheduler.rs
+++ b/crates/scheduler/src/test_scheduler.rs
@@ -135,6 +135,12 @@ impl TestScheduler {
         }
     }
 
+    pub fn run_with_clock_advancement(&self) {
+        while self.step() || self.advance_clock_to_next_timer() {
+            // Continue until no work remains
+        }
+    }
+
     fn step(&self) -> bool {
         let elapsed_timers = {
             let mut state = self.state.lock();

From 0f9232a10df808f46f504f6cb57a34b4ad2d8947 Mon Sep 17 00:00:00 2001
From: Dima <dbutemann@gmail.com>
Date: Thu, 11 Sep 2025 01:05:23 +0200
Subject: [PATCH 768/823] Fix wrong cursor shape description in Configuring Zed
 page (#37933)

It was previously copied incorrectly from `Terminal: Copy On Select`.

Release Notes:

- Fixed wrong description in `Terminal: Cursor Shape` in `Configuring
Zed` document
---
 docs/src/configuring-zed.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 552dc97e45..5c12b6aaa4 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -3627,7 +3627,7 @@ List of `integer` column numbers
 
 ### Terminal: Cursor Shape
 
-- Description: Whether or not selecting text in the terminal will automatically copy to the system clipboard.
+- Description: Controls the visual shape of the cursor in the terminal. When not explicitly set, it defaults to a block shape.
 - Setting: `cursor_shape`
 - Default: `null` (defaults to block)
 

From 816c4817d000a358c4d0d623bcbdcd278a8e28e1 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Wed, 10 Sep 2025 20:16:51 -0300
Subject: [PATCH 769/823] Fix code actions menu item font size (#37951)

Follow up to https://github.com/zed-industries/zed/pull/37824, which
made items be cut-off in the _editor_ instance of the code actions menu.
This PR applies the default UI font size for the code action menu items
only when the origin is the quick actions bar.

Release Notes:

- Fix code actions menu items being cut-off in the editor.
---
 crates/editor/src/code_context_menus.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index eef4e86439..9384e2efed 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1481,6 +1481,8 @@ impl CodeActionsMenu {
     ) -> AnyElement {
         let actions = self.actions.clone();
         let selected_item = self.selected_item;
+        let is_quick_action_bar = matches!(self.origin(), ContextMenuOrigin::QuickActionBar);
+
         let list = uniform_list(
             "code_actions_menu",
             self.actions.len(),
@@ -1502,7 +1504,7 @@ impl CodeActionsMenu {
                                     this.child(
                                         h_flex()
                                             .overflow_hidden()
-                                            .text_sm()
+                                            .when(is_quick_action_bar, |this| this.text_ui(cx))
                                             .child(
                                                 // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here.
                                                 action.lsp_action.title().replace("\n", ""),

From aee21ca17f5408f0fddb839ba60f79485eae385d Mon Sep 17 00:00:00 2001
From: Ryan Hawkins <ryanlarryhawkins@gmail.com>
Date: Wed, 10 Sep 2025 18:20:32 -0600
Subject: [PATCH 770/823] Allow for commit amends with no file changes (#37256)

This will users to change the wording of the most recent commit,
something they might want to do if they realize they made a small typo
of some kind or if the formatting of their commit message is wrong, but
don't have any other changes they need to make.

Release Notes:

- Commit messages can now be amended in the UI without any other changes
needing to be made.

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/git_ui/src/git_panel.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 31c3f5e77a..d746c1dc60 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1709,7 +1709,7 @@ impl GitPanel {
                 .map(|status_entry| status_entry.repo_path.clone())
                 .collect::<Vec<_>>();
 
-            if changed_files.is_empty() {
+            if changed_files.is_empty() && !options.amend {
                 error_spawn("No changes to commit", window, cx);
                 return;
             }
@@ -3295,7 +3295,7 @@ impl GitPanel {
     pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
         if self.has_unstaged_conflicts() {
             (false, "You must resolve conflicts before committing")
-        } else if !self.has_staged_changes() && !self.has_tracked_changes() {
+        } else if !self.has_staged_changes() && !self.has_tracked_changes() && !self.amend_pending {
             (false, "No changes to commit")
         } else if self.pending_commit.is_some() {
             (false, "Commit in progress")
@@ -3312,8 +3312,10 @@ impl GitPanel {
         if self.amend_pending {
             if self.has_staged_changes() {
                 "Amend"
-            } else {
+            } else if self.has_tracked_changes() {
                 "Amend Tracked"
+            } else {
+                "Amend"
             }
         } else if self.has_staged_changes() {
             "Commit"

From f205732074292ff9ba9b13f101165100e109a0f5 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Wed, 10 Sep 2025 22:23:18 -0400
Subject: [PATCH 771/823] feature_flags: Remove unused `llm-closed-beta`
 feature flag (#37955)

This PR removes the `llm-closed-beta` feature flag, as it is no longer
used.

Release Notes:

- N/A
---
 crates/feature_flags/src/feature_flags.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 4afeb32235..b97abac59c 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -61,11 +61,6 @@ impl FeatureFlag for PredictEditsRateCompletionsFeatureFlag {
     const NAME: &'static str = "predict-edits-rate-completions";
 }
 
-pub struct LlmClosedBetaFeatureFlag {}
-impl FeatureFlag for LlmClosedBetaFeatureFlag {
-    const NAME: &'static str = "llm-closed-beta";
-}
-
 pub struct BillingV2FeatureFlag {}
 
 impl FeatureFlag for BillingV2FeatureFlag {

From 9708c8d5079774b2d1e78408098278033471c420 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Wed, 10 Sep 2025 22:43:19 -0400
Subject: [PATCH 772/823] feature_flags: Move feature flag definitions to their
 own module (#37956)

This PR moves the feature flag definitions to their own module so that
they aren't intermingled with the feature flag infrastructure itself.

Release Notes:

- N/A
---
 crates/feature_flags/src/feature_flags.rs | 65 +++--------------------
 crates/feature_flags/src/flags.rs         | 56 +++++++++++++++++++
 2 files changed, 64 insertions(+), 57 deletions(-)
 create mode 100644 crates/feature_flags/src/flags.rs

diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index b97abac59c..1b66b291b5 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -1,12 +1,17 @@
-use futures::channel::oneshot;
-use futures::{FutureExt, select_biased};
-use gpui::{App, Context, Global, Subscription, Task, Window};
+mod flags;
+
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::LazyLock;
 use std::time::Duration;
 use std::{future::Future, pin::Pin, task::Poll};
 
+use futures::channel::oneshot;
+use futures::{FutureExt, select_biased};
+use gpui::{App, Context, Global, Subscription, Task, Window};
+
+pub use flags::*;
+
 #[derive(Default)]
 struct FeatureFlags {
     flags: Vec<String>,
@@ -56,60 +61,6 @@ pub trait FeatureFlag {
     }
 }
 
-pub struct PredictEditsRateCompletionsFeatureFlag;
-impl FeatureFlag for PredictEditsRateCompletionsFeatureFlag {
-    const NAME: &'static str = "predict-edits-rate-completions";
-}
-
-pub struct BillingV2FeatureFlag {}
-
-impl FeatureFlag for BillingV2FeatureFlag {
-    const NAME: &'static str = "billing-v2";
-}
-
-pub struct NotebookFeatureFlag;
-
-impl FeatureFlag for NotebookFeatureFlag {
-    const NAME: &'static str = "notebooks";
-}
-
-pub struct PanicFeatureFlag;
-
-impl FeatureFlag for PanicFeatureFlag {
-    const NAME: &'static str = "panic";
-}
-
-pub struct JjUiFeatureFlag {}
-
-impl FeatureFlag for JjUiFeatureFlag {
-    const NAME: &'static str = "jj-ui";
-}
-
-pub struct GeminiAndNativeFeatureFlag;
-
-impl FeatureFlag for GeminiAndNativeFeatureFlag {
-    // This was previously called "acp".
-    //
-    // We renamed it because existing builds used it to enable the Claude Code
-    // integration too, and we'd like to turn Gemini/Native on in new builds
-    // without enabling Claude Code in old builds.
-    const NAME: &'static str = "gemini-and-native";
-
-    fn enabled_for_all() -> bool {
-        true
-    }
-}
-
-pub struct ClaudeCodeFeatureFlag;
-
-impl FeatureFlag for ClaudeCodeFeatureFlag {
-    const NAME: &'static str = "claude-code";
-
-    fn enabled_for_all() -> bool {
-        true
-    }
-}
-
 pub trait FeatureFlagViewExt<V: 'static> {
     fn observe_flag<T: FeatureFlag, F>(&mut self, window: &Window, callback: F) -> Subscription
     where
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
new file mode 100644
index 0000000000..2278848a19
--- /dev/null
+++ b/crates/feature_flags/src/flags.rs
@@ -0,0 +1,56 @@
+use crate::FeatureFlag;
+
+pub struct PredictEditsRateCompletionsFeatureFlag;
+
+impl FeatureFlag for PredictEditsRateCompletionsFeatureFlag {
+    const NAME: &'static str = "predict-edits-rate-completions";
+}
+
+pub struct BillingV2FeatureFlag {}
+
+impl FeatureFlag for BillingV2FeatureFlag {
+    const NAME: &'static str = "billing-v2";
+}
+
+pub struct NotebookFeatureFlag;
+
+impl FeatureFlag for NotebookFeatureFlag {
+    const NAME: &'static str = "notebooks";
+}
+
+pub struct PanicFeatureFlag;
+
+impl FeatureFlag for PanicFeatureFlag {
+    const NAME: &'static str = "panic";
+}
+
+pub struct JjUiFeatureFlag {}
+
+impl FeatureFlag for JjUiFeatureFlag {
+    const NAME: &'static str = "jj-ui";
+}
+
+pub struct GeminiAndNativeFeatureFlag;
+
+impl FeatureFlag for GeminiAndNativeFeatureFlag {
+    // This was previously called "acp".
+    //
+    // We renamed it because existing builds used it to enable the Claude Code
+    // integration too, and we'd like to turn Gemini/Native on in new builds
+    // without enabling Claude Code in old builds.
+    const NAME: &'static str = "gemini-and-native";
+
+    fn enabled_for_all() -> bool {
+        true
+    }
+}
+
+pub struct ClaudeCodeFeatureFlag;
+
+impl FeatureFlag for ClaudeCodeFeatureFlag {
+    const NAME: &'static str = "claude-code";
+
+    fn enabled_for_all() -> bool {
+        true
+    }
+}

From f76407702028a7ca6f09981223db5f1d2993a028 Mon Sep 17 00:00:00 2001
From: "Mitch (a.k.a Voz)" <mitch@voz.dev>
Date: Thu, 11 Sep 2025 01:29:31 -0500
Subject: [PATCH 773/823] Change keymap precedence to favor user (#37557)

Closes #35623

Previously if a base keymap had a `null` set to an action, leading to a
`NoAction` being assigned to the keymap, if a user wanted to take
advantage of that keymap (in this particular case, `cmd-2`), the keymap
binding check would favor the `NoAction` over the user, since
technically the context depth matched better. Instead, we should always
prefer the user's settings over whatever base or default.

Release Notes:

- Fixed keymap precedence by favoring user settings over base keymap /
configs.
---
 crates/gpui/src/keymap.rs               | 69 ++++++++++++++++++++++++-
 crates/vim/src/test/vim_test_context.rs |  5 +-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index 12f082eb60..e26123339b 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -168,9 +168,21 @@ impl Keymap {
 
         let mut bindings: SmallVec<[_; 1]> = SmallVec::new();
         let mut first_binding_index = None;
+
         for (_, ix, binding) in matched_bindings {
             if is_no_action(&*binding.action) {
-                break;
+                // Only break if this is a user-defined NoAction binding
+                // This allows user keymaps to override base keymap NoAction bindings
+                if let Some(meta) = binding.meta {
+                    if meta.0 == 0 {
+                        break;
+                    }
+                } else {
+                    // If no meta is set, assume it's a user binding for safety
+                    break;
+                }
+                // For non-user NoAction bindings, continue searching for user overrides
+                continue;
             }
             bindings.push(binding.clone());
             first_binding_index.get_or_insert(ix);
@@ -617,6 +629,33 @@ mod tests {
         assert!(!matched.1);
     }
 
+    #[test]
+    fn test_context_precedence_with_same_source() {
+        // Test case: User has both Workspace and Editor bindings for the same key
+        // Editor binding should take precedence over Workspace binding
+        let bindings = [
+            KeyBinding::new("cmd-r", ActionAlpha {}, Some("Workspace")),
+            KeyBinding::new("cmd-r", ActionBeta {}, Some("Editor")),
+        ];
+
+        let mut keymap = Keymap::default();
+        keymap.add_bindings(bindings);
+
+        // Test with context stack: [Workspace, Editor] (Editor is deeper)
+        let (result, _) = keymap.bindings_for_input(
+            &[Keystroke::parse("cmd-r").unwrap()],
+            &[
+                KeyContext::parse("Workspace").unwrap(),
+                KeyContext::parse("Editor").unwrap(),
+            ],
+        );
+
+        // Both bindings should be returned, but Editor binding should be first (highest precedence)
+        assert_eq!(result.len(), 2);
+        assert!(result[0].action.partial_eq(&ActionBeta {})); // Editor binding first
+        assert!(result[1].action.partial_eq(&ActionAlpha {})); // Workspace binding second
+    }
+
     #[test]
     fn test_bindings_for_action() {
         let bindings = [
@@ -643,4 +682,32 @@ mod tests {
             assert_eq!(actual, expected, "{:?}", action);
         }
     }
+
+    #[test]
+    fn test_source_precedence_sorting() {
+        // KeybindSource precedence: User (0) > Vim (1) > Base (2) > Default (3)
+        // Test that user keymaps take precedence over default keymaps at the same context depth
+        let mut keymap = Keymap::default();
+
+        // Add a default keymap binding first
+        let mut default_binding = KeyBinding::new("cmd-r", ActionAlpha {}, Some("Editor"));
+        default_binding.set_meta(KeyBindingMetaIndex(3)); // Default source
+        keymap.add_bindings([default_binding]);
+
+        // Add a user keymap binding
+        let mut user_binding = KeyBinding::new("cmd-r", ActionBeta {}, Some("Editor"));
+        user_binding.set_meta(KeyBindingMetaIndex(0)); // User source
+        keymap.add_bindings([user_binding]);
+
+        // Test with Editor context stack
+        let (result, _) = keymap.bindings_for_input(
+            &[Keystroke::parse("cmd-r").unwrap()],
+            &[KeyContext::parse("Editor").unwrap()],
+        );
+
+        // User binding should take precedence over default binding
+        assert_eq!(result.len(), 2);
+        assert!(result[0].action.partial_eq(&ActionBeta {}));
+        assert!(result[1].action.partial_eq(&ActionAlpha {}));
+    }
 }
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index 4f1173a188..3e6c96ac72 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -70,11 +70,14 @@ impl VimTestContext {
         SettingsStore::update_global(cx, |store, cx| {
             store.update_user_settings::<VimModeSetting>(cx, |s| s.vim_mode = Some(enabled));
         });
-        let default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
+        let mut default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
             "keymaps/default-macos.json",
             cx,
         )
         .unwrap();
+        for key_binding in &mut default_key_bindings {
+            key_binding.set_meta(settings::KeybindSource::Default.meta());
+        }
         cx.bind_keys(default_key_bindings);
         if enabled {
             let vim_key_bindings = settings::KeymapFile::load_asset(

From 59502289e7bead0c7a7b0e530cc11ad691b3b373 Mon Sep 17 00:00:00 2001
From: David Matter <davidmatter@users.noreply.github.com>
Date: Thu, 11 Sep 2025 09:16:36 +0200
Subject: [PATCH 774/823] Document Tailwind CSS language server configuration
 (#37970)

Added configuration instructions for Tailwind CSS language server.

Release Notes:

- N/A
---
 docs/src/languages/tailwindcss.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/src/languages/tailwindcss.md b/docs/src/languages/tailwindcss.md
index bf15829b4f..83b0177402 100644
--- a/docs/src/languages/tailwindcss.md
+++ b/docs/src/languages/tailwindcss.md
@@ -6,9 +6,21 @@ Zed has built-in support for Tailwind CSS autocomplete, linting, and hover previ
 
 ## Configuration
 
-<!--
-TBD: Document Tailwind CSS Configuration
--->
+To configure the Tailwind CSS language server, refer [to the extension settings](https://github.com/tailwindlabs/tailwindcss-intellisense?tab=readme-ov-file#extension-settings) and add them to the `lsp` section of your `settings.json`:
+
+```jsonc
+{
+  "lsp": {
+    "tailwindcss-language-server": {
+      "settings": {
+        "experimental": {
+          "classRegex": ["[cls|className]\\s\\:\\=\\s\"([^\"]*)"],
+        },
+      },
+    },
+  },
+}
+```
 
 Languages which can be used with Tailwind CSS in Zed:
 

From 9875969cba1f82d9a3f08caee928602691816334 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 11 Sep 2025 11:42:18 +0200
Subject: [PATCH 775/823] editor: Allow no context for the
 `excerpt_context_lines` setting (#37982)

Closes #37980

There seems to be no reason to hard limit this to 1, and we even have
existing UX for this case already:

<img width="1530" height="748" alt="Bildschirmfoto 2025-09-11 um 11 22
57"
src="https://github.com/user-attachments/assets/d6498318-c905-4d3c-90ab-60e4f2bb6c48"
/>

(Notice the different arrows in the gutter area for single lines)

Hence, allowing the value to honor the request from the issue

Release Notes:

- Allowed `0` as a value for the `excerpt_context_lines` setting
---
 crates/editor/src/editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index b731006a62..f2d5fd5762 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -24432,5 +24432,5 @@ pub fn multibuffer_context_lines(cx: &App) -> u32 {
     EditorSettings::try_get(cx)
         .map(|settings| settings.excerpt_context_lines)
         .unwrap_or(2)
-        .clamp(1, 32)
+        .min(32)
 }

From eec6bfebbbc6a8e94c7084824fb1a868be7e42c6 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 11 Sep 2025 12:58:24 +0200
Subject: [PATCH 776/823] extension_host: Fix operation status whilst
 installing dev extension (#37985)

This fixes a minor issue where we would show "Removing extension ..." in
the status bar when we would actually be installing it.

Release Notes:

- Fixed an issue where installing a dev extension would show the
installation status as "removing" in the activity indicator.
---
 crates/extension_host/src/extension_host.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index b114ad9f4c..0b7dd00870 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -937,7 +937,7 @@ impl ExtensionStore {
             if !this.update(cx, |this, cx| {
                 match this.outstanding_operations.entry(extension_id.clone()) {
                     btree_map::Entry::Occupied(_) => return false,
-                    btree_map::Entry::Vacant(e) => e.insert(ExtensionOperation::Remove),
+                    btree_map::Entry::Vacant(e) => e.insert(ExtensionOperation::Install),
                 };
                 cx.notify();
                 true

From 6ae83b474079263273d512b68e4bf2b9b390a17d Mon Sep 17 00:00:00 2001
From: ImFeH2 <i@feh2.im>
Date: Thu, 11 Sep 2025 19:39:39 +0800
Subject: [PATCH 777/823] Support indent regex with inline comments in Python
 (#37903)

Closes #36491

This issue is caused by the Python language configuration treating
compound statements (such as for loops and if statements) that end with
an inline comment as not requiring an increased indent.

Release Notes:

- python: Correctly indent lines starting the blocks (for, finally, if,
else, try) that have trailing comments.
---
 crates/languages/src/python.rs          | 20 ++++++++++++++++++++
 crates/languages/src/python/config.toml | 10 +++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index ede46b38e5..fd887d1be5 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -1761,6 +1761,26 @@ mod tests {
                 "def a():\n  \n  if a:\n    b()\n  else:\n    foo(\n    )\n\n"
             );
 
+            // reset to a for loop statement
+            let statement = "for i in range(10):\n  print(i)\n";
+            buffer.edit([(0..buffer.len(), statement)], None, cx);
+
+            // insert single line comment after each line
+            let eol_ixs = statement
+                .char_indices()
+                .filter_map(|(ix, c)| if c == '\n' { Some(ix) } else { None })
+                .collect::<Vec<usize>>();
+            let editions = eol_ixs
+                .iter()
+                .enumerate()
+                .map(|(i, &eol_ix)| (eol_ix..eol_ix, format!(" # comment {}", i + 1)))
+                .collect::<Vec<(std::ops::Range<usize>, String)>>();
+            buffer.edit(editions, Some(AutoindentMode::EachLine), cx);
+            assert_eq!(
+                buffer.text(),
+                "for i in range(10): # comment 1\n  print(i) # comment 2\n"
+            );
+
             // reset to a simple if statement
             buffer.edit([(0..buffer.len(), "if a:\n  b(\n  )")], None, cx);
 
diff --git a/crates/languages/src/python/config.toml b/crates/languages/src/python/config.toml
index 8728dfeaf1..3e8b9b550a 100644
--- a/crates/languages/src/python/config.toml
+++ b/crates/languages/src/python/config.toml
@@ -28,10 +28,10 @@ brackets = [
 
 auto_indent_using_last_non_empty_line = false
 debuggers = ["Debugpy"]
-increase_indent_pattern = "^[^#].*:\\s*$"
+increase_indent_pattern = "^[^#].*:\\s*(#.*)?$"
 decrease_indent_patterns = [
-  { pattern = "^\\s*elif\\b.*:",    valid_after = ["if", "elif"] },
-  { pattern = "^\\s*else\\b.*:",    valid_after = ["if", "elif", "for", "while", "except"] },
-  { pattern = "^\\s*except\\b.*:",  valid_after = ["try", "except"] },
-  { pattern = "^\\s*finally\\b.*:", valid_after = ["try", "except", "else"] },
+  { pattern = "^\\s*elif\\b.*:\\s*(#.*)?",    valid_after = ["if", "elif"] },
+  { pattern = "^\\s*else\\b.*:\\s*(#.*)?",    valid_after = ["if", "elif", "for", "while", "except"] },
+  { pattern = "^\\s*except\\b.*:\\s*(#.*)?",  valid_after = ["try", "except"] },
+  { pattern = "^\\s*finally\\b.*:\\s*(#.*)?", valid_after = ["try", "except", "else"] },
 ]

From 4002602a8926b7fe799acf50fcee6bcffb36d376 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 11 Sep 2025 14:16:08 +0200
Subject: [PATCH 778/823] project: Fix terminal activation scripts failing on
 Windows for new shells (#37986)

Tasks are still disabled as there seem to be more issues with it

Release Notes:

- N/A
---
 Cargo.lock                                 |  1 +
 crates/agent_ui/src/acp/thread_view.rs     |  2 +-
 crates/languages/Cargo.toml                |  1 +
 crates/languages/src/python.rs             |  9 +++--
 crates/project/src/terminals.rs            | 22 +++++++++++--
 crates/terminal/src/terminal.rs            |  8 +++--
 crates/terminal_view/src/terminal_panel.rs | 38 ++--------------------
 7 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c1c7e0b2ec..1488874d6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9301,6 +9301,7 @@ dependencies = [
  "serde_json_lenient",
  "settings",
  "sha2",
+ "shlex",
  "smol",
  "snippet_provider",
  "task",
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index f8bc6c353b..a25b957015 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1607,7 +1607,7 @@ impl AcpThreadView {
             task.shell = shell;
 
             let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                terminal_panel.spawn_task(&login, window, cx)
+                terminal_panel.spawn_task(login.clone(), window, cx)
             })?;
 
             let terminal = terminal.await?;
diff --git a/crates/languages/Cargo.toml b/crates/languages/Cargo.toml
index e09b27d474..9390c785f1 100644
--- a/crates/languages/Cargo.toml
+++ b/crates/languages/Cargo.toml
@@ -92,6 +92,7 @@ tree-sitter-typescript = { workspace = true, optional = true }
 tree-sitter-yaml = { workspace = true, optional = true }
 util.workspace = true
 workspace-hack.workspace = true
+shlex.workspace = true
 
 [dev-dependencies]
 pretty_assertions.workspace = true
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index fd887d1be5..f5ce2cee5e 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -918,9 +918,12 @@ impl ToolchainLister for PythonToolchainProvider {
                         ShellKind::Cmd => "activate.bat",
                     };
                     let path = prefix.join(BINARY_DIR).join(activate_script_name);
-                    if fs.is_file(&path).await {
-                        activation_script
-                            .push(format!("{activate_keyword} \"{}\"", path.display()));
+
+                    if let Ok(quoted) =
+                        shlex::try_quote(&path.to_string_lossy()).map(Cow::into_owned)
+                        && fs.is_file(&path).await
+                    {
+                        activation_script.push(format!("{activate_keyword} {quoted}"));
                     }
                 }
             }
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index e7733e5380..3dffe85420 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -197,7 +197,7 @@ impl Project {
                             )?,
                         },
                         None => match activation_script.clone() {
-                            #[cfg(not(target_os = "windows"))]
+                            #[cfg(not(windows))]
                             activation_script if !activation_script.is_empty() => {
                                 let activation_script = activation_script.join("; ");
                                 let to_run = if let Some(command) = spawn_task.command {
@@ -214,7 +214,25 @@ impl Project {
                                     program: shell,
                                     args: vec![
                                         "-c".to_owned(),
-                                        format!("{activation_script}; {to_run}",),
+                                        // alacritty formats all args into a single string literally without extra quoting before handing it off to powershell
+                                        // so we work around this here
+                                        if cfg!(windows) {
+                                            println!(
+                                                "{}",
+                                                shlex::try_quote(&format!(
+                                                    "{activation_script}; {to_run}",
+                                                ))
+                                                .unwrap()
+                                                .into_owned()
+                                            );
+                                            shlex::try_quote(&format!(
+                                                "{activation_script}; {to_run}",
+                                            ))
+                                            .unwrap()
+                                            .into_owned()
+                                        } else {
+                                            format!("{activation_script}; {to_run}",)
+                                        },
                                     ],
                                     title_override: None,
                                 }
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 96271ea771..b119485408 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -531,10 +531,14 @@ impl TerminalBuilder {
             },
         };
 
-        if cfg!(not(target_os = "windows")) && !activation_script.is_empty() && no_task {
+        if !activation_script.is_empty() && no_task {
             for activation_script in activation_script {
                 terminal.input(activation_script.into_bytes());
-                terminal.write_to_pty(b"\n");
+                terminal.write_to_pty(if cfg!(windows) {
+                    &b"\r\n"[..]
+                } else {
+                    &b"\n"[..]
+                });
             }
             terminal.clear();
         }
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index 44d64c5fe3..e72175572b 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -19,7 +19,7 @@ use itertools::Itertools;
 use project::{Fs, Project, ProjectEntryId};
 use search::{BufferSearchBar, buffer_search::DivRegistrar};
 use settings::Settings;
-use task::{RevealStrategy, RevealTarget, ShellBuilder, SpawnInTerminal, TaskId};
+use task::{RevealStrategy, RevealTarget, SpawnInTerminal, TaskId};
 use terminal::{
     Terminal,
     terminal_settings::{TerminalDockPosition, TerminalSettings},
@@ -496,42 +496,10 @@ impl TerminalPanel {
 
     pub fn spawn_task(
         &mut self,
-        task: &SpawnInTerminal,
+        task: SpawnInTerminal,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Task<Result<WeakEntity<Terminal>>> {
-        let remote_client = self
-            .workspace
-            .update(cx, |workspace, cx| {
-                let project = workspace.project().read(cx);
-                if project.is_via_collab() {
-                    Err(anyhow!("cannot spawn tasks as a guest"))
-                } else {
-                    Ok(project.remote_client())
-                }
-            })
-            .flatten();
-
-        let remote_client = match remote_client {
-            Ok(remote_client) => remote_client,
-            Err(e) => return Task::ready(Err(e)),
-        };
-
-        let remote_shell = remote_client
-            .as_ref()
-            .and_then(|remote_client| remote_client.read(cx).shell());
-
-        let builder = ShellBuilder::new(remote_shell.as_deref(), &task.shell);
-        let command_label = builder.command_label(&task.command_label);
-        let (command, args) = builder.build(task.command.clone(), &task.args);
-
-        let task = SpawnInTerminal {
-            command_label,
-            command: Some(command),
-            args,
-            ..task.clone()
-        };
-
         if task.allow_concurrent_runs && task.use_new_terminal {
             return self.spawn_in_new_terminal(task, window, cx);
         }
@@ -1565,7 +1533,7 @@ impl workspace::TerminalProvider for TerminalProvider {
         window.spawn(cx, async move |cx| {
             let terminal = terminal_panel
                 .update_in(cx, |terminal_panel, window, cx| {
-                    terminal_panel.spawn_task(&task, window, cx)
+                    terminal_panel.spawn_task(task, window, cx)
                 })
                 .ok()?
                 .await;

From c4e8fe1fb740be525f776a059f30b0518a4889e4 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 11 Sep 2025 05:34:40 -0700
Subject: [PATCH 779/823] theme: Ensure opaque for overlay fallback (#37987)

Closes #37965

Release Notes:

- N/A
---
 crates/theme/src/schema.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/theme/src/schema.rs b/crates/theme/src/schema.rs
index 425fedbc71..d2bdbb616a 100644
--- a/crates/theme/src/schema.rs
+++ b/crates/theme/src/schema.rs
@@ -38,6 +38,10 @@ fn ensure_non_opaque(color: Hsla) -> Hsla {
     }
 }
 
+fn ensure_opaque(color: Hsla) -> Hsla {
+    Hsla { a: 1.0, ..color }
+}
+
 #[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum AppearanceContent {
@@ -872,12 +876,15 @@ impl ThemeColorsContent {
                 .panel_overlay_background
                 .as_ref()
                 .and_then(|color| try_parse_color(color).ok())
-                .or(panel_background),
+                .or(panel_background.map(ensure_opaque)),
             panel_overlay_hover: self
                 .panel_overlay_hover
                 .as_ref()
                 .and_then(|color| try_parse_color(color).ok())
-                .or(element_hover),
+                .or(panel_background
+                    .zip(element_hover)
+                    .map(|(panel_bg, hover_bg)| panel_bg.blend(hover_bg))
+                    .map(ensure_opaque)),
             pane_focused_border: self
                 .pane_focused_border
                 .as_ref()

From 4db19a3a962bae5f39fe6b71093c61cc69d61b8e Mon Sep 17 00:00:00 2001
From: tidely <43219534+tidely@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:55:14 +0300
Subject: [PATCH 780/823] search: Fix buffer search history navigation (#37924)

Closes #36109

Adds an additional option to `search` and `update_matches` to specify
whether the update should affect the search history.

Release Notes:

- Fix navigating buffer search history
---
 crates/search/src/buffer_search.rs  | 124 ++++++++++++++++------------
 crates/search/src/project_search.rs |   2 +-
 crates/vim/src/command.rs           |   1 +
 crates/vim/src/normal/search.rs     |  10 +--
 4 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index c8e16e256c..86e5ab67c4 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -489,7 +489,7 @@ impl ToolbarItemView for BufferSearchBar {
 
             let is_project_search = searchable_item_handle.supported_options(cx).find_in_results;
             self.active_searchable_item = Some(searchable_item_handle);
-            drop(self.update_matches(true, window, cx));
+            drop(self.update_matches(true, false, window, cx));
             if !self.dismissed {
                 if is_project_search {
                     self.dismiss(&Default::default(), window, cx);
@@ -778,9 +778,9 @@ impl BufferSearchBar {
     }
 
     pub fn search_suggested(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let search = self
-            .query_suggestion(window, cx)
-            .map(|suggestion| self.search(&suggestion, Some(self.default_options), window, cx));
+        let search = self.query_suggestion(window, cx).map(|suggestion| {
+            self.search(&suggestion, Some(self.default_options), true, window, cx)
+        });
 
         if let Some(search) = search {
             cx.spawn_in(window, async move |this, cx| {
@@ -855,6 +855,7 @@ impl BufferSearchBar {
         &mut self,
         query: &str,
         options: Option<SearchOptions>,
+        add_to_history: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> oneshot::Receiver<()> {
@@ -871,7 +872,7 @@ impl BufferSearchBar {
             self.clear_matches(window, cx);
             cx.notify();
         }
-        self.update_matches(!updated, window, cx)
+        self.update_matches(!updated, add_to_history, window, cx)
     }
 
     pub fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {
@@ -889,7 +890,7 @@ impl BufferSearchBar {
     ) {
         self.search_options.toggle(search_option);
         self.default_options = self.search_options;
-        drop(self.update_matches(false, window, cx));
+        drop(self.update_matches(false, false, window, cx));
         self.adjust_query_regex_language(cx);
         cx.notify();
     }
@@ -1033,7 +1034,7 @@ impl BufferSearchBar {
             editor::EditorEvent::Edited { .. } => {
                 self.smartcase(window, cx);
                 self.clear_matches(window, cx);
-                let search = self.update_matches(false, window, cx);
+                let search = self.update_matches(false, true, window, cx);
 
                 let width = editor.update(cx, |editor, cx| {
                     let text_layout_details = editor.text_layout_details(window);
@@ -1078,7 +1079,7 @@ impl BufferSearchBar {
     ) {
         match event {
             SearchEvent::MatchesInvalidated => {
-                drop(self.update_matches(false, window, cx));
+                drop(self.update_matches(false, false, window, cx));
             }
             SearchEvent::ActiveMatchChanged => self.update_match_index(window, cx),
         }
@@ -1111,7 +1112,7 @@ impl BufferSearchBar {
         if let Some(active_item) = self.active_searchable_item.as_mut() {
             self.selection_search_enabled = !self.selection_search_enabled;
             active_item.toggle_filtered_search_ranges(self.selection_search_enabled, window, cx);
-            drop(self.update_matches(false, window, cx));
+            drop(self.update_matches(false, false, window, cx));
             cx.notify();
         }
     }
@@ -1154,6 +1155,7 @@ impl BufferSearchBar {
     fn update_matches(
         &mut self,
         reuse_existing_query: bool,
+        add_to_history: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> oneshot::Receiver<()> {
@@ -1234,8 +1236,10 @@ impl BufferSearchBar {
                                 .insert(active_searchable_item.downgrade(), matches);
 
                             this.update_match_index(window, cx);
-                            this.search_history
-                                .add(&mut this.search_history_cursor, query_text);
+                            if add_to_history {
+                                this.search_history
+                                    .add(&mut this.search_history_cursor, query_text);
+                            }
                             if !this.dismissed {
                                 let matches = this
                                     .searchable_items_with_matches
@@ -1324,10 +1328,10 @@ impl BufferSearchBar {
             .next(&mut self.search_history_cursor)
             .map(str::to_string)
         {
-            drop(self.search(&new_query, Some(self.search_options), window, cx));
+            drop(self.search(&new_query, Some(self.search_options), false, window, cx));
         } else {
             self.search_history_cursor.reset();
-            drop(self.search("", Some(self.search_options), window, cx));
+            drop(self.search("", Some(self.search_options), false, window, cx));
         }
     }
 
@@ -1343,7 +1347,7 @@ impl BufferSearchBar {
                 .current(&self.search_history_cursor)
                 .map(str::to_string)
         {
-            drop(self.search(&new_query, Some(self.search_options), window, cx));
+            drop(self.search(&new_query, Some(self.search_options), false, window, cx));
             return;
         }
 
@@ -1352,7 +1356,7 @@ impl BufferSearchBar {
             .previous(&mut self.search_history_cursor)
             .map(str::to_string)
         {
-            drop(self.search(&new_query, Some(self.search_options), window, cx));
+            drop(self.search(&new_query, Some(self.search_options), false, window, cx));
         }
     }
 
@@ -1548,7 +1552,7 @@ mod tests {
         // By default, search is case-insensitive.
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("us", None, window, cx)
+                search_bar.search("us", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -1579,7 +1583,7 @@ mod tests {
         // within other words. By default, all results are found.
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("or", None, window, cx)
+                search_bar.search("or", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -1823,7 +1827,7 @@ mod tests {
         search_bar
             .update_in(cx, |search_bar, window, cx| {
                 search_bar.show(window, cx);
-                search_bar.search("us", Some(SearchOptions::CASE_SENSITIVE), window, cx)
+                search_bar.search("us", Some(SearchOptions::CASE_SENSITIVE), true, window, cx)
             })
             .await
             .unwrap();
@@ -1843,7 +1847,13 @@ mod tests {
         // toggling a search option should update the defaults
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("regex", Some(SearchOptions::CASE_SENSITIVE), window, cx)
+                search_bar.search(
+                    "regex",
+                    Some(SearchOptions::CASE_SENSITIVE),
+                    true,
+                    window,
+                    cx,
+                )
             })
             .await
             .unwrap();
@@ -1904,7 +1914,7 @@ mod tests {
         window
             .update(cx, |_, window, cx| {
                 search_bar.update(cx, |search_bar, cx| {
-                    search_bar.search("a", None, window, cx)
+                    search_bar.search("a", None, true, window, cx)
                 })
             })
             .unwrap()
@@ -2046,7 +2056,7 @@ mod tests {
                 search_bar.update(cx, |search_bar, cx| {
                     let handle = search_bar.query_editor.focus_handle(cx);
                     window.focus(&handle);
-                    search_bar.search("abas_nonexistent_match", None, window, cx)
+                    search_bar.search("abas_nonexistent_match", None, true, window, cx)
                 })
             })
             .unwrap()
@@ -2114,6 +2124,7 @@ mod tests {
                 search_bar.search(
                     "edit\\(",
                     Some(SearchOptions::WHOLE_WORD | SearchOptions::REGEX),
+                    true,
                     window,
                     cx,
                 )
@@ -2139,6 +2150,7 @@ mod tests {
                 search_bar.search(
                     "edit(",
                     Some(SearchOptions::WHOLE_WORD | SearchOptions::CASE_SENSITIVE),
+                    true,
                     window,
                     cx,
                 )
@@ -2162,43 +2174,24 @@ mod tests {
 
     #[gpui::test]
     async fn test_search_query_history(cx: &mut TestAppContext) {
-        init_globals(cx);
-        let buffer_text = r#"
-        A regular expression (shortened as regex or regexp;[1] also referred to as
-        rational expression[2][3]) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching algorithms
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-        .unindent();
-        let buffer = cx.new(|cx| Buffer::local(buffer_text, cx));
-        let cx = cx.add_empty_window();
-
-        let editor =
-            cx.new_window_entity(|window, cx| Editor::for_buffer(buffer.clone(), None, window, cx));
-
-        let search_bar = cx.new_window_entity(|window, cx| {
-            let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
+        let (_editor, search_bar, cx) = init_test(cx);
 
         // Add 3 search items into the history.
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("a", None, window, cx)
+                search_bar.search("a", None, true, window, cx)
             })
             .await
             .unwrap();
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("b", None, window, cx)
+                search_bar.search("b", None, true, window, cx)
             })
             .await
             .unwrap();
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("c", Some(SearchOptions::CASE_SENSITIVE), window, cx)
+                search_bar.search("c", Some(SearchOptions::CASE_SENSITIVE), true, window, cx)
             })
             .await
             .unwrap();
@@ -2212,6 +2205,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.next_history_query(&NextHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2219,6 +2213,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.next_history_query(&NextHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2228,6 +2223,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "c");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2237,6 +2233,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "b");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2246,6 +2243,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "a");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2253,6 +2251,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "a");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2262,6 +2261,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.next_history_query(&NextHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "b");
             assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
@@ -2269,7 +2269,7 @@ mod tests {
 
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("ba", None, window, cx)
+                search_bar.search("ba", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -2282,6 +2282,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "c");
             assert_eq!(search_bar.search_options, SearchOptions::NONE);
@@ -2289,6 +2290,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "b");
             assert_eq!(search_bar.search_options, SearchOptions::NONE);
@@ -2296,6 +2298,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.next_history_query(&NextHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "c");
             assert_eq!(search_bar.search_options, SearchOptions::NONE);
@@ -2303,6 +2306,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.next_history_query(&NextHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "ba");
             assert_eq!(search_bar.search_options, SearchOptions::NONE);
@@ -2310,6 +2314,7 @@ mod tests {
         search_bar.update_in(cx, |search_bar, window, cx| {
             search_bar.next_history_query(&NextHistoryQuery, window, cx);
         });
+        cx.background_executor.run_until_parked();
         search_bar.update(cx, |search_bar, cx| {
             assert_eq!(search_bar.query(cx), "");
             assert_eq!(search_bar.search_options, SearchOptions::NONE);
@@ -2322,7 +2327,7 @@ mod tests {
 
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("expression", None, window, cx)
+                search_bar.search("expression", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -2348,7 +2353,7 @@ mod tests {
         // Search for word boundaries and replace just a single one.
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("or", Some(SearchOptions::WHOLE_WORD), window, cx)
+                search_bar.search("or", Some(SearchOptions::WHOLE_WORD), true, window, cx)
             })
             .await
             .unwrap();
@@ -2373,7 +2378,13 @@ mod tests {
         // Let's turn on regex mode.
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("\\[([^\\]]+)\\]", Some(SearchOptions::REGEX), window, cx)
+                search_bar.search(
+                    "\\[([^\\]]+)\\]",
+                    Some(SearchOptions::REGEX),
+                    true,
+                    window,
+                    cx,
+                )
             })
             .await
             .unwrap();
@@ -2399,6 +2410,7 @@ mod tests {
                 search_bar.search(
                     "a\\w+s",
                     Some(SearchOptions::REGEX | SearchOptions::WHOLE_WORD),
+                    true,
                     window,
                     cx,
                 )
@@ -2443,7 +2455,13 @@ mod tests {
                 if let Some(options) = options.search_options {
                     search_bar.set_search_options(options, cx);
                 }
-                search_bar.search(options.search_text, options.search_options, window, cx)
+                search_bar.search(
+                    options.search_text,
+                    options.search_options,
+                    true,
+                    window,
+                    cx,
+                )
             })
             .await
             .unwrap();
@@ -2582,7 +2600,7 @@ mod tests {
 
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("aaa", None, window, cx)
+                search_bar.search("aaa", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -2668,7 +2686,7 @@ mod tests {
 
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("aaa", None, window, cx)
+                search_bar.search("aaa", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -2692,7 +2710,7 @@ mod tests {
         search_bar
             .update_in(cx, |search_bar, window, cx| {
                 search_bar.enable_search_option(SearchOptions::REGEX, window, cx);
-                search_bar.search("expression", None, window, cx)
+                search_bar.search("expression", None, true, window, cx)
             })
             .await
             .unwrap();
@@ -2709,7 +2727,7 @@ mod tests {
         // Now, the expression is invalid
         search_bar
             .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("expression (", None, window, cx)
+                search_bar.search("expression (", None, true, window, cx)
             })
             .await
             .unwrap_err();
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 834967902f..3d9248e3c7 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -4114,7 +4114,7 @@ pub mod tests {
         buffer_search_bar
             .update_in(&mut cx, |buffer_search_bar, window, cx| {
                 buffer_search_bar.focus_handle(cx).focus(window);
-                buffer_search_bar.search(buffer_search_query, None, window, cx)
+                buffer_search_bar.search(buffer_search_query, None, true, window, cx)
             })
             .await
             .unwrap();
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 576fe5f634..5fee0b95f1 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -1585,6 +1585,7 @@ impl OnMatchingLines {
                             let _ = search_bar.search(
                                 &last_pattern,
                                 Some(SearchOptions::REGEX | SearchOptions::CASE_SENSITIVE),
+                                false,
                                 window,
                                 cx,
                             );
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index dba003ec5f..43ec12d9cd 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -360,12 +360,12 @@ impl Vim {
                     .query_suggestion(window, cx)
                     .or_else(|| cursor_word)
                 else {
-                    drop(search_bar.search("", None, window, cx));
+                    drop(search_bar.search("", None, false, window, cx));
                     return None;
                 };
 
                 let query = regex::escape(&query);
-                Some(search_bar.search(&query, Some(options), window, cx))
+                Some(search_bar.search(&query, Some(options), true, window, cx))
             });
 
             let Some(search) = search else { return false };
@@ -425,7 +425,7 @@ impl Vim {
                         );
                     }
 
-                    Some(search_bar.search(&query, Some(options), window, cx))
+                    Some(search_bar.search(&query, Some(options), true, window, cx))
                 });
                 let Some(search) = search else { return };
                 let search_bar = search_bar.downgrade();
@@ -509,7 +509,7 @@ impl Vim {
             if replacement.flag_c {
                 search_bar.focus_replace(window, cx);
             }
-            Some(search_bar.search(&search, Some(options), window, cx))
+            Some(search_bar.search(&search, Some(options), true, window, cx))
         });
         if replacement.flag_n {
             self.move_cursor(
@@ -534,7 +534,7 @@ impl Vim {
                 search_bar.select_last_match(window, cx);
                 search_bar.replace_all(&Default::default(), window, cx);
                 editor.update(cx, |editor, cx| editor.clear_search_within_ranges(cx));
-                let _ = search_bar.search(&search_bar.query(cx), None, window, cx);
+                let _ = search_bar.search(&search_bar.query(cx), None, false, window, cx);
                 vim.update(cx, |vim, cx| {
                     vim.move_cursor(
                         Motion::StartOfLine {

From d7f3d08c59344876613f0fed2f23575b5e1febb9 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Thu, 11 Sep 2025 15:20:05 +0200
Subject: [PATCH 781/823] editor: Ensure placeholder text wraps properly after
 font size change (#37992)

Follow-up of https://github.com/zed-industries/zed/pull/37919

This fixes an issue where the placeholder text in editors would not wrap
properly in cases where the font size was changed.

Before:


https://github.com/user-attachments/assets/479c919f-5815-4164-b46d-75f31b5dc56f

After:


https://github.com/user-attachments/assets/9f63ab9f-eac2-4f3e-864c-2b96b58f2d71


Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f2d5fd5762..c5ea6d4ee2 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -18911,14 +18911,15 @@ impl Editor {
         // so that wrapping is not recalculated and stays consistent for the editor
         // and its linked minimap.
         if !self.mode.is_minimap() {
-            let rem_size = window.rem_size();
-            self.display_map.update(cx, |map, cx| {
-                map.set_font(
-                    style.text.font(),
-                    style.text.font_size.to_pixels(rem_size),
-                    cx,
-                )
-            });
+            let font = style.text.font();
+            let font_size = style.text.font_size.to_pixels(window.rem_size());
+            let display_map = self
+                .placeholder_display_map
+                .as_ref()
+                .filter(|_| self.is_empty(cx))
+                .unwrap_or(&self.display_map);
+
+            display_map.update(cx, |map, cx| map.set_font(font, font_size, cx));
         }
         self.style = Some(style);
     }

From d1c6c9d035cd622ed3e7881ed1c8d095eeef35c4 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 11 Sep 2025 17:07:04 +0300
Subject: [PATCH 782/823] Remove old LSP definitions (#37995)

Last time MultiLspQuery was used in Zed was 0.201.x and Nightly is of
0.205.x version, hence it's time to clean up the old code.

Release Notes:

- N/A
---
 crates/collab/src/rpc.rs        |  23 +-
 crates/project/src/lsp_store.rs | 471 --------------------------------
 crates/proto/proto/lsp.proto    |  27 --
 crates/proto/proto/zed.proto    |   4 +-
 crates/proto/src/proto.rs       |  27 --
 5 files changed, 2 insertions(+), 550 deletions(-)

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index e19c59f997..873aee5473 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -33,7 +33,7 @@ pub use connection_pool::{ConnectionPool, ZedVersion};
 use core::fmt::{self, Debug, Formatter};
 use futures::TryFutureExt as _;
 use reqwest_client::ReqwestClient;
-use rpc::proto::{MultiLspQuery, split_repository_update};
+use rpc::proto::split_repository_update;
 use supermaven_api::{CreateExternalUserRequest, SupermavenAdminApi};
 use tracing::Span;
 
@@ -335,10 +335,6 @@ impl Server {
             .add_message_handler(update_language_server)
             .add_message_handler(update_diagnostic_summary)
             .add_message_handler(update_worktree_settings)
-            .add_request_handler(forward_read_only_project_request::<proto::GetHover>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetDefinition>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetTypeDefinition>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetReferences>)
             .add_request_handler(forward_read_only_project_request::<proto::FindSearchCandidates>)
             .add_request_handler(forward_read_only_project_request::<proto::GetDocumentHighlights>)
             .add_request_handler(forward_read_only_project_request::<proto::GetDocumentSymbols>)
@@ -349,7 +345,6 @@ impl Server {
             .add_request_handler(forward_read_only_project_request::<proto::InlayHints>)
             .add_request_handler(forward_read_only_project_request::<proto::ResolveInlayHint>)
             .add_request_handler(forward_read_only_project_request::<proto::GetColorPresentation>)
-            .add_request_handler(forward_mutating_project_request::<proto::GetCodeLens>)
             .add_request_handler(forward_read_only_project_request::<proto::OpenBufferByPath>)
             .add_request_handler(forward_read_only_project_request::<proto::GitGetBranches>)
             .add_request_handler(forward_read_only_project_request::<proto::OpenUnstagedDiff>)
@@ -364,7 +359,6 @@ impl Server {
             .add_request_handler(forward_read_only_project_request::<proto::LspExtCancelFlycheck>)
             .add_request_handler(forward_read_only_project_request::<proto::LspExtRunFlycheck>)
             .add_request_handler(forward_read_only_project_request::<proto::LspExtClearFlycheck>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetDocumentDiagnostics>)
             .add_request_handler(
                 forward_mutating_project_request::<proto::RegisterBufferWithLanguageServers>,
             )
@@ -377,7 +371,6 @@ impl Server {
             .add_request_handler(
                 forward_mutating_project_request::<proto::ResolveCompletionDocumentation>,
             )
-            .add_request_handler(forward_mutating_project_request::<proto::GetCodeActions>)
             .add_request_handler(forward_mutating_project_request::<proto::ApplyCodeAction>)
             .add_request_handler(forward_mutating_project_request::<proto::PrepareRename>)
             .add_request_handler(forward_mutating_project_request::<proto::PerformRename>)
@@ -395,7 +388,6 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::OnTypeFormatting>)
             .add_request_handler(forward_mutating_project_request::<proto::SaveBuffer>)
             .add_request_handler(forward_mutating_project_request::<proto::BlameBuffer>)
-            .add_request_handler(multi_lsp_query)
             .add_request_handler(lsp_query)
             .add_message_handler(broadcast_project_message_from_host::<proto::LspQueryResponse>)
             .add_request_handler(forward_mutating_project_request::<proto::RestartLanguageServers>)
@@ -910,8 +902,6 @@ impl Server {
                                 user_id=field::Empty,
                                 login=field::Empty,
                                 impersonator=field::Empty,
-                                // todo(lsp) remove after Zed Stable hits v0.204.x
-                                multi_lsp_query_request=field::Empty,
                                 lsp_query_request=field::Empty,
                                 release_channel=field::Empty,
                                 { TOTAL_DURATION_MS }=field::Empty,
@@ -2358,17 +2348,6 @@ where
     Ok(())
 }
 
-// todo(lsp) remove after Zed Stable hits v0.204.x
-async fn multi_lsp_query(
-    request: MultiLspQuery,
-    response: Response<MultiLspQuery>,
-    session: MessageContext,
-) -> Result<()> {
-    tracing::Span::current().record("multi_lsp_query_request", request.request_str());
-    tracing::info!("multi_lsp_query message received");
-    forward_mutating_project_request(request, response, session).await
-}
-
 async fn lsp_query(
     request: proto::LspQuery,
     response: Response<proto::LspQuery>,
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 7430aa016f..1ba5dc4f90 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -3586,7 +3586,6 @@ impl LspStore {
     pub fn init(client: &AnyProtoClient) {
         client.add_entity_request_handler(Self::handle_lsp_query);
         client.add_entity_message_handler(Self::handle_lsp_query_response);
-        client.add_entity_request_handler(Self::handle_multi_lsp_query);
         client.add_entity_request_handler(Self::handle_restart_language_servers);
         client.add_entity_request_handler(Self::handle_stop_language_servers);
         client.add_entity_request_handler(Self::handle_cancel_language_server_work);
@@ -3610,9 +3609,7 @@ impl LspStore {
         client.add_entity_request_handler(Self::handle_register_buffer_with_language_servers);
         client.add_entity_request_handler(Self::handle_rename_project_entry);
         client.add_entity_request_handler(Self::handle_pull_workspace_diagnostics);
-        client.add_entity_request_handler(Self::handle_lsp_command::<GetCodeActions>);
         client.add_entity_request_handler(Self::handle_lsp_command::<GetCompletions>);
-        client.add_entity_request_handler(Self::handle_lsp_command::<GetHover>);
         client.add_entity_request_handler(Self::handle_lsp_command::<GetDocumentHighlights>);
         client.add_entity_request_handler(Self::handle_lsp_command::<GetDocumentSymbols>);
         client.add_entity_request_handler(Self::handle_lsp_command::<PrepareRename>);
@@ -3633,7 +3630,6 @@ impl LspStore {
         client.add_entity_request_handler(
             Self::handle_lsp_command::<lsp_ext_command::SwitchSourceHeader>,
         );
-        client.add_entity_request_handler(Self::handle_lsp_command::<GetDocumentDiagnostics>);
     }
 
     pub fn as_remote(&self) -> Option<&RemoteLspStore> {
@@ -8269,473 +8265,6 @@ impl LspStore {
         Ok(())
     }
 
-    // todo(lsp) remove after Zed Stable hits v0.204.x
-    async fn handle_multi_lsp_query(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::MultiLspQuery>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::MultiLspQueryResponse> {
-        let response_from_ssh = lsp_store.read_with(&cx, |this, _| {
-            let (upstream_client, project_id) = this.upstream_client()?;
-            let mut payload = envelope.payload.clone();
-            payload.project_id = project_id;
-
-            Some(upstream_client.request(payload))
-        })?;
-        if let Some(response_from_ssh) = response_from_ssh {
-            return response_from_ssh.await;
-        }
-
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let version = deserialize_version(&envelope.payload.version);
-        let buffer = lsp_store.update(&mut cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(version.clone())
-            })?
-            .await?;
-        let buffer_version = buffer.read_with(&cx, |buffer, _| buffer.version())?;
-        match envelope
-            .payload
-            .strategy
-            .context("invalid request without the strategy")?
-        {
-            proto::multi_lsp_query::Strategy::All(_) => {
-                // currently, there's only one multiple language servers query strategy,
-                // so just ensure it's specified correctly
-            }
-        }
-        match envelope.payload.request {
-            Some(proto::multi_lsp_query::Request::GetHover(message)) => {
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(deserialize_version(&message.version))
-                    })?
-                    .await?;
-                let get_hover =
-                    GetHover::from_proto(message, lsp_store.clone(), buffer.clone(), cx.clone())
-                        .await?;
-                let all_hovers = lsp_store
-                    .update(&mut cx, |this, cx| {
-                        this.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_hover.position),
-                            get_hover,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter()
-                    .filter_map(|(server_id, hover)| {
-                        Some((server_id, remove_empty_hover_blocks(hover?)?))
-                    });
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: all_hovers
-                        .map(|(server_id, hover)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(proto::lsp_response::Response::GetHoverResponse(
-                                GetHover::response_to_proto(
-                                    Some(hover),
-                                    project,
-                                    sender_id,
-                                    &buffer_version,
-                                    cx,
-                                ),
-                            )),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetCodeActions(message)) => {
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(deserialize_version(&message.version))
-                    })?
-                    .await?;
-                let get_code_actions = GetCodeActions::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let all_actions = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_code_actions.range.start),
-                            get_code_actions,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: all_actions
-                        .map(|(server_id, code_actions)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(proto::lsp_response::Response::GetCodeActionsResponse(
-                                GetCodeActions::response_to_proto(
-                                    code_actions,
-                                    project,
-                                    sender_id,
-                                    &buffer_version,
-                                    cx,
-                                ),
-                            )),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetSignatureHelp(message)) => {
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(deserialize_version(&message.version))
-                    })?
-                    .await?;
-                let get_signature_help = GetSignatureHelp::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let all_signatures = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_signature_help.position),
-                            get_signature_help,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: all_signatures
-                        .map(|(server_id, signature_help)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(
-                                proto::lsp_response::Response::GetSignatureHelpResponse(
-                                    GetSignatureHelp::response_to_proto(
-                                        signature_help,
-                                        project,
-                                        sender_id,
-                                        &buffer_version,
-                                        cx,
-                                    ),
-                                ),
-                            ),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetCodeLens(message)) => {
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(deserialize_version(&message.version))
-                    })?
-                    .await?;
-                let get_code_lens =
-                    GetCodeLens::from_proto(message, lsp_store.clone(), buffer.clone(), cx.clone())
-                        .await?;
-
-                let code_lens_actions = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            None::<usize>,
-                            get_code_lens,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: code_lens_actions
-                        .map(|(server_id, actions)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(proto::lsp_response::Response::GetCodeLensResponse(
-                                GetCodeLens::response_to_proto(
-                                    actions,
-                                    project,
-                                    sender_id,
-                                    &buffer_version,
-                                    cx,
-                                ),
-                            )),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetDocumentDiagnostics(message)) => {
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(deserialize_version(&message.version))
-                    })?
-                    .await?;
-                lsp_store
-                    .update(&mut cx, |lsp_store, cx| {
-                        lsp_store.pull_diagnostics_for_buffer(buffer, cx)
-                    })?
-                    .await?;
-                // `pull_diagnostics_for_buffer` will merge in the new diagnostics and send them to the client.
-                // The client cannot merge anything into its non-local LspStore, so we do not need to return anything.
-                Ok(proto::MultiLspQueryResponse {
-                    responses: Vec::new(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetDocumentColor(message)) => {
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(deserialize_version(&message.version))
-                    })?
-                    .await?;
-                let get_document_color = GetDocumentColor::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let all_colors = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            None::<usize>,
-                            get_document_color,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: all_colors
-                        .map(|(server_id, colors)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(
-                                proto::lsp_response::Response::GetDocumentColorResponse(
-                                    GetDocumentColor::response_to_proto(
-                                        colors,
-                                        project,
-                                        sender_id,
-                                        &buffer_version,
-                                        cx,
-                                    ),
-                                ),
-                            ),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetDefinition(message)) => {
-                let get_definitions = GetDefinitions::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let definitions = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_definitions.position),
-                            get_definitions,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: definitions
-                        .map(|(server_id, definitions)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(proto::lsp_response::Response::GetDefinitionResponse(
-                                GetDefinitions::response_to_proto(
-                                    definitions,
-                                    project,
-                                    sender_id,
-                                    &buffer_version,
-                                    cx,
-                                ),
-                            )),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetDeclaration(message)) => {
-                let get_declarations = GetDeclarations::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let declarations = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_declarations.position),
-                            get_declarations,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: declarations
-                        .map(|(server_id, declarations)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(proto::lsp_response::Response::GetDeclarationResponse(
-                                GetDeclarations::response_to_proto(
-                                    declarations,
-                                    project,
-                                    sender_id,
-                                    &buffer_version,
-                                    cx,
-                                ),
-                            )),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetTypeDefinition(message)) => {
-                let get_type_definitions = GetTypeDefinitions::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let type_definitions = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_type_definitions.position),
-                            get_type_definitions,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: type_definitions
-                        .map(|(server_id, type_definitions)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(
-                                proto::lsp_response::Response::GetTypeDefinitionResponse(
-                                    GetTypeDefinitions::response_to_proto(
-                                        type_definitions,
-                                        project,
-                                        sender_id,
-                                        &buffer_version,
-                                        cx,
-                                    ),
-                                ),
-                            ),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetImplementation(message)) => {
-                let get_implementations = GetImplementations::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let implementations = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_implementations.position),
-                            get_implementations,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: implementations
-                        .map(|(server_id, implementations)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(
-                                proto::lsp_response::Response::GetImplementationResponse(
-                                    GetImplementations::response_to_proto(
-                                        implementations,
-                                        project,
-                                        sender_id,
-                                        &buffer_version,
-                                        cx,
-                                    ),
-                                ),
-                            ),
-                        })
-                        .collect(),
-                })
-            }
-            Some(proto::multi_lsp_query::Request::GetReferences(message)) => {
-                let get_references = GetReferences::from_proto(
-                    message,
-                    lsp_store.clone(),
-                    buffer.clone(),
-                    cx.clone(),
-                )
-                .await?;
-
-                let references = lsp_store
-                    .update(&mut cx, |project, cx| {
-                        project.request_multiple_lsp_locally(
-                            &buffer,
-                            Some(get_references.position),
-                            get_references,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .into_iter();
-
-                lsp_store.update(&mut cx, |project, cx| proto::MultiLspQueryResponse {
-                    responses: references
-                        .map(|(server_id, references)| proto::LspResponse {
-                            server_id: server_id.to_proto(),
-                            response: Some(proto::lsp_response::Response::GetReferencesResponse(
-                                GetReferences::response_to_proto(
-                                    references,
-                                    project,
-                                    sender_id,
-                                    &buffer_version,
-                                    cx,
-                                ),
-                            )),
-                        })
-                        .collect(),
-                })
-            }
-            None => anyhow::bail!("empty multi lsp query request"),
-        }
-    }
-
     async fn handle_apply_code_action(
         this: Entity<Self>,
         envelope: TypedEnvelope<proto::ApplyCodeAction>,
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
index 16f6217b29..d50c1924cd 100644
--- a/crates/proto/proto/lsp.proto
+++ b/crates/proto/proto/lsp.proto
@@ -931,33 +931,6 @@ message PullWorkspaceDiagnostics {
     uint64 server_id = 2;
 }
 
-// todo(lsp) remove after Zed Stable hits v0.204.x
-message MultiLspQuery {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-    oneof strategy {
-        AllLanguageServers all = 4;
-    }
-    oneof request {
-        GetHover get_hover = 5;
-        GetCodeActions get_code_actions = 6;
-        GetSignatureHelp get_signature_help = 7;
-        GetCodeLens get_code_lens = 8;
-        GetDocumentDiagnostics get_document_diagnostics = 9;
-        GetDocumentColor get_document_color = 10;
-        GetDefinition get_definition = 11;
-        GetDeclaration get_declaration = 12;
-        GetTypeDefinition get_type_definition = 13;
-        GetImplementation get_implementation = 14;
-        GetReferences get_references = 15;
-    }
-}
-
-message MultiLspQueryResponse {
-    repeated LspResponse responses = 1;
-}
-
 message ToggleLspLogs {
     uint64 project_id = 1;
     LogType log_type = 2;
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
index 3286b9e752..7fdf108e12 100644
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -210,8 +210,6 @@ message Envelope {
 
         UpdateNotification update_notification = 174;
 
-        MultiLspQuery multi_lsp_query = 175;
-        MultiLspQueryResponse multi_lsp_query_response = 176;
         RestartLanguageServers restart_language_servers = 208;
 
         RejoinRemoteProjects rejoin_remote_projects = 186;
@@ -421,7 +419,7 @@ message Envelope {
     reserved 158 to 161;
     reserved 164;
     reserved 166 to 169;
-    reserved 177 to 185;
+    reserved 175 to 185;
     reserved 188;
     reserved 189 to 192;
     reserved 193 to 195;
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
index 79e6b414ef..16bd86146c 100644
--- a/crates/proto/src/proto.rs
+++ b/crates/proto/src/proto.rs
@@ -175,9 +175,6 @@ messages!(
     (ReorderChannel, Foreground),
     (LspQuery, Background),
     (LspQueryResponse, Background),
-    // todo(lsp) remove after Zed Stable hits v0.204.x
-    (MultiLspQuery, Background),
-    (MultiLspQueryResponse, Background),
     (OnTypeFormatting, Background),
     (OnTypeFormattingResponse, Background),
     (OpenBufferById, Background),
@@ -440,8 +437,6 @@ request_messages!(
     (SetRoomParticipantRole, Ack),
     (BlameBuffer, BlameBufferResponse),
     (RejoinRemoteProjects, RejoinRemoteProjectsResponse),
-    // todo(lsp) remove after Zed Stable hits v0.204.x
-    (MultiLspQuery, MultiLspQueryResponse),
     (LspQuery, Ack),
     (LspQueryResponse, Ack),
     (RestartLanguageServers, Ack),
@@ -557,8 +552,6 @@ entity_messages!(
     LoadCommitDiff,
     LspQuery,
     LspQueryResponse,
-    // todo(lsp) remove after Zed Stable hits v0.204.x
-    MultiLspQuery,
     RestartLanguageServers,
     StopLanguageServers,
     OnTypeFormatting,
@@ -844,26 +837,6 @@ impl LspQuery {
     }
 }
 
-// todo(lsp) remove after Zed Stable hits v0.204.x
-impl MultiLspQuery {
-    pub fn request_str(&self) -> &str {
-        match self.request {
-            Some(multi_lsp_query::Request::GetHover(_)) => "GetHover",
-            Some(multi_lsp_query::Request::GetCodeActions(_)) => "GetCodeActions",
-            Some(multi_lsp_query::Request::GetSignatureHelp(_)) => "GetSignatureHelp",
-            Some(multi_lsp_query::Request::GetCodeLens(_)) => "GetCodeLens",
-            Some(multi_lsp_query::Request::GetDocumentDiagnostics(_)) => "GetDocumentDiagnostics",
-            Some(multi_lsp_query::Request::GetDocumentColor(_)) => "GetDocumentColor",
-            Some(multi_lsp_query::Request::GetDefinition(_)) => "GetDefinition",
-            Some(multi_lsp_query::Request::GetDeclaration(_)) => "GetDeclaration",
-            Some(multi_lsp_query::Request::GetTypeDefinition(_)) => "GetTypeDefinition",
-            Some(multi_lsp_query::Request::GetImplementation(_)) => "GetImplementation",
-            Some(multi_lsp_query::Request::GetReferences(_)) => "GetReferences",
-            None => "<unknown>",
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

From 238dab4a9ca74304c0c358d035cd42db571c8369 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 10:22:24 -0400
Subject: [PATCH 783/823] Adjust release notes Discord webhook name (#37997)

Release Notes:

- N/A
---
 .github/workflows/community_release_actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/community_release_actions.yml b/.github/workflows/community_release_actions.yml
index 31dda1fa6d..37ade90574 100644
--- a/.github/workflows/community_release_actions.yml
+++ b/.github/workflows/community_release_actions.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Discord Webhook Action
         uses: tsickert/discord-webhook@c840d45a03a323fbc3f7507ac7769dbd91bfb164 # v5.3.0
         with:
-          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_RELEASE_NOTES }}
           content: ${{ steps.get-content.outputs.string }}
 
   send_release_notes_email:

From f6b6d4a9feb244a8a9ead12b1063556fc2529d99 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 10:29:44 -0400
Subject: [PATCH 784/823] Add congratsbot (#37998)

Release Notes:

- N/A
---
 .github/workflows/congrats.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/workflows/congrats.yml

diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml
new file mode 100644
index 0000000000..c5dfc12264
--- /dev/null
+++ b/.github/workflows/congrats.yml
@@ -0,0 +1,12 @@
+name: Congratsbot
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  congrats:
+    if: ${{ github.repository_owner == 'zed-industries' }}
+    uses: withastro/automation/.github/workflows/congratsbot.yml@main
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}

From a066794e8d19af9f63bf46a7c9ac4c8738f422f9 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 11 Sep 2025 17:41:02 +0300
Subject: [PATCH 785/823] Document two task rerun modes better (#37996)

Part of https://github.com/zed-industries/zed/issues/37720

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json   |  4 +++-
 assets/keymaps/default-macos.json   |  4 +++-
 assets/keymaps/default-windows.json |  4 +++-
 docs/src/tasks.md                   | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 700c7e8d8c..ea5f64c822 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -649,7 +649,9 @@
       "ctrl-k shift-up": "workspace::SwapPaneUp",
       "ctrl-k shift-down": "workspace::SwapPaneDown",
       "ctrl-shift-x": "zed::Extensions",
-      "ctrl-shift-r": "task::Rerun",
+      // All task parameters are captured and unchanged between reruns by default.
+      // Use the `"reevaluate_context"` parameter to control this.
+      "ctrl-shift-r": ["task::Rerun", { "reevaluate_context": false }],
       "ctrl-alt-r": "task::Rerun",
       "alt-t": "task::Rerun",
       "alt-shift-t": "task::Spawn",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 7c85e6e582..bc870400e9 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -724,7 +724,9 @@
     "bindings": {
       "cmd-n": "workspace::NewFile",
       "cmd-shift-r": "task::Spawn",
-      "cmd-alt-r": "task::Rerun",
+      // All task parameters are captured and unchanged between reruns by default.
+      // Use the `"reevaluate_context"` parameter to control this.
+      "cmd-alt-r": ["task::Rerun", { "reevaluate_context": false }],
       "ctrl-alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
       // also possible to spawn tasks by name:
       // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 0e9f193bd1..3f465d883d 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -642,7 +642,9 @@
       "ctrl-k shift-up": "workspace::SwapPaneUp",
       "ctrl-k shift-down": "workspace::SwapPaneDown",
       "ctrl-shift-x": "zed::Extensions",
-      "ctrl-shift-r": "task::Rerun",
+      // All task parameters are captured and unchanged between reruns by default.
+      // Use the `"reevaluate_context"` parameter to control this.
+      "ctrl-shift-r": ["task::Rerun", { "reevaluate_context": false }],
       "alt-t": "task::Rerun",
       "shift-alt-t": "task::Spawn",
       "shift-alt-r": ["task::Spawn", { "reveal_target": "center" }],
diff --git a/docs/src/tasks.md b/docs/src/tasks.md
index e530f568cd..b30b722007 100644
--- a/docs/src/tasks.md
+++ b/docs/src/tasks.md
@@ -145,6 +145,21 @@ You can also adjust the currently selected task in a modal (`tab` is the default
 You can use the `cmd` modifier when spawning a task via a modal; tasks spawned this way will not have their usage count increased (thus, they will not be respawned with `task: rerun` and they won't have a high rank in the task modal).
 The intended use of ephemeral tasks is to stay in the flow with continuous `task: rerun` usage.
 
+### More task rerun control
+
+By default, tasks capture their variables into a context once, and this "resolved task" is being rerun always.
+
+This can be controlled with the `"reevaluate_context"` argument to the task: setting it to `true` will force the task to be reevaluated before each run.
+
+```json
+{
+  "context": "Workspace",
+  "bindings": {
+    "alt-t": ["task::Rerun", { "reevaluate_context": true }]
+  }
+}
+```
+
 ## Custom keybindings for tasks
 
 You can define your own keybindings for your tasks via an additional argument to `task::Spawn`. If you wanted to bind the aforementioned `echo current file's path` task to `alt-g`, you would add the following snippet in your [`keymap.json`](./key-bindings.md) file:

From e5c03730115e5578567d0f99edf374dc1296f3ee Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Thu, 11 Sep 2025 16:45:42 +0200
Subject: [PATCH 786/823] Make rodio audio input compile under windows (#37999)

Follow up on https://github.com/zed-industries/zed/pull/37786

adds conditional cmp removing use of libwebrtc on windows/freebsd

They cant compile livekit yet. This removes microphone and echo
cancellation on those platforms however they can not join calls due to
the same cause so it does not matter.

Documentation and error handing improvements

Release Notes:

- N/A

---------

Co-authored-by: Richard <richard@zed.dev>
---
 Cargo.lock                                    |  1 +
 crates/audio/Cargo.toml                       |  1 +
 crates/audio/src/audio.rs                     | 54 ++++++++++++-------
 crates/audio/src/audio_settings.rs            |  5 +-
 crates/audio/src/rodio_ext.rs                 |  7 ++-
 .../src/livekit_client/playback.rs            |  2 +
 .../src/livekit_client/playback/source.rs     |  4 +-
 7 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1488874d6b..82e1b202cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1395,6 +1395,7 @@ dependencies = [
  "serde",
  "settings",
  "smol",
+ "thiserror 2.0.12",
  "util",
  "workspace-hack",
 ]
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 08e0df424d..85274f6514 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -25,6 +25,7 @@ schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 smol.workspace = true
+thiserror.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
 
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index 511d00671a..44f2d5e07d 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,24 +1,26 @@
 use anyhow::{Context as _, Result};
 use collections::HashMap;
-use gpui::{App, AsyncApp, BackgroundExecutor, BorrowAppContext, Global};
-use libwebrtc::native::apm;
-use log::info;
-use parking_lot::Mutex;
+use gpui::{App, BackgroundExecutor, BorrowAppContext, Global};
+
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+mod non_windows_and_freebsd_deps {
+    pub(super) use gpui::AsyncApp;
+    pub(super) use libwebrtc::native::apm;
+    pub(super) use log::info;
+    pub(super) use parking_lot::Mutex;
+    pub(super) use rodio::cpal::Sample;
+    pub(super) use rodio::source::{LimitSettings, UniformSourceIterator};
+    pub(super) use std::sync::Arc;
+}
+
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+use non_windows_and_freebsd_deps::*;
+
 use rodio::{
-    Decoder, OutputStream, OutputStreamBuilder, Source,
-    cpal::Sample,
-    mixer::Mixer,
-    nz,
-    source::{Buffered, LimitSettings, UniformSourceIterator},
+    Decoder, OutputStream, OutputStreamBuilder, Source, mixer::Mixer, nz, source::Buffered,
 };
 use settings::Settings;
-use std::{
-    io::Cursor,
-    num::NonZero,
-    path::PathBuf,
-    sync::{Arc, atomic::Ordering},
-    time::Duration,
-};
+use std::{io::Cursor, num::NonZero, path::PathBuf, sync::atomic::Ordering, time::Duration};
 use util::ResultExt;
 
 mod audio_settings;
@@ -76,6 +78,7 @@ impl Sound {
 pub struct Audio {
     output_handle: Option<OutputStream>,
     output_mixer: Option<Mixer>,
+    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
     pub echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
     source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
     replays: replays::Replays,
@@ -86,6 +89,10 @@ impl Default for Audio {
         Self {
             output_handle: Default::default(),
             output_mixer: Default::default(),
+            #[cfg(not(any(
+                all(target_os = "windows", target_env = "gnu"),
+                target_os = "freebsd"
+            )))]
             echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
                 true, false, false, false,
             ))),
@@ -110,7 +117,16 @@ impl Audio {
                 mixer.add(rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE));
                 self.output_mixer = Some(mixer);
 
+                // The webrtc apm is not yet compiling for windows & freebsd
+                #[cfg(not(any(
+                    any(all(target_os = "windows", target_env = "gnu")),
+                    target_os = "freebsd"
+                )))]
                 let echo_canceller = Arc::clone(&self.echo_canceller);
+                #[cfg(not(any(
+                    any(all(target_os = "windows", target_env = "gnu")),
+                    target_os = "freebsd"
+                )))]
                 let source = source.inspect_buffer::<BUFFER_SIZE, _>(move |buffer| {
                     let mut buf: [i16; _] = buffer.map(|s| s.to_sample());
                     echo_canceller
@@ -139,6 +155,7 @@ impl Audio {
         self.replays.replays_to_tar(executor)
     }
 
+    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
     pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
         let stream = rodio::microphone::MicrophoneBuilder::new()
             .default_device()?
@@ -174,8 +191,7 @@ impl Audio {
             .periodic_access(Duration::from_millis(100), move |agc_source| {
                 agc_source.set_enabled(LIVE_SETTINGS.control_input_volume.load(Ordering::Relaxed));
             })
-            .replayable(REPLAY_DURATION)
-            .expect("REPLAY_DURATION is longer then 100ms");
+            .replayable(REPLAY_DURATION)?;
 
         voip_parts
             .replays
@@ -249,11 +265,13 @@ impl Audio {
     }
 }
 
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
 pub struct VoipParts {
     echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
     replays: replays::Replays,
 }
 
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
 impl VoipParts {
     pub fn new(cx: &AsyncApp) -> anyhow::Result<Self> {
         let (apm, replays) = cx.try_read_default_global::<Audio, _>(|audio, _| {
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
index 43edb8d60d..ea0ea5f355 100644
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -59,6 +59,7 @@ impl Settings for AudioSettings {
     fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
 
+/// See docs on [LIVE_SETTINGS]
 pub(crate) struct LiveSettings {
     pub(crate) control_input_volume: AtomicBool,
     pub(crate) control_output_volume: AtomicBool,
@@ -89,7 +90,9 @@ impl LiveSettings {
 }
 
 /// Allows access to settings from the audio thread. Updated by
-/// observer of SettingsStore.
+/// observer of SettingsStore. Needed because audio playback and recording are
+/// real time and must each run in a dedicated OS thread, therefore we can not
+/// use the background executor.
 pub(crate) static LIVE_SETTINGS: LiveSettings = LiveSettings {
     control_input_volume: AtomicBool::new(true),
     control_output_volume: AtomicBool::new(true),
diff --git a/crates/audio/src/rodio_ext.rs b/crates/audio/src/rodio_ext.rs
index 4e9430a0b9..ba4e4ff055 100644
--- a/crates/audio/src/rodio_ext.rs
+++ b/crates/audio/src/rodio_ext.rs
@@ -9,7 +9,8 @@ use std::{
 use crossbeam::queue::ArrayQueue;
 use rodio::{ChannelCount, Sample, SampleRate, Source};
 
-#[derive(Debug)]
+#[derive(Debug, thiserror::Error)]
+#[error("Replay duration is too short must be >= 100ms")]
 pub struct ReplayDurationTooShort;
 
 pub trait RodioExt: Source + Sized {
@@ -338,6 +339,7 @@ impl<S: Source> Iterator for Replayable<S> {
     fn next(&mut self) -> Option<Self::Item> {
         if let Some(sample) = self.inner.next() {
             self.buffer.push(sample);
+            // If the buffer is full send it
             if self.buffer.len() == self.chunk_size {
                 self.tx.push_normal(std::mem::take(&mut self.buffer));
             }
@@ -422,6 +424,9 @@ impl Iterator for Replay {
                 return None;
             }
 
+            // The queue does not support blocking on a next item. We want this queue as it
+            // is quite fast and provides a fixed size. We know how many samples are in a
+            // buffer so if we do not get one now we must be getting one after `sleep_duration`.
             std::thread::sleep(self.sleep_duration);
         }
     }
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
index d1b2cee4aa..7c86611310 100644
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ b/crates/livekit_client/src/livekit_client/playback.rs
@@ -186,6 +186,8 @@ impl AudioStack {
         let capture_task = if rodio_pipeline {
             info!("Using experimental.rodio_audio audio pipeline");
             let voip_parts = audio::VoipParts::new(cx)?;
+            // Audio needs to run real-time and should never be paused. That is why we are using a
+            // normal std::thread and not a background task
             thread::spawn(move || {
                 // microphone is non send on mac
                 let microphone = audio::Audio::open_microphone(voip_parts)?;
diff --git a/crates/livekit_client/src/livekit_client/playback/source.rs b/crates/livekit_client/src/livekit_client/playback/source.rs
index 67bfe79390..f605b3d517 100644
--- a/crates/livekit_client/src/livekit_client/playback/source.rs
+++ b/crates/livekit_client/src/livekit_client/playback/source.rs
@@ -12,9 +12,7 @@ fn frame_to_samplesbuffer(frame: AudioFrame) -> SamplesBuffer {
     let samples = SampleTypeConverter::<_, _>::new(samples);
     let samples: Vec<f32> = samples.collect();
     SamplesBuffer::new(
-        // here be dragons
-        // NonZero::new(frame.num_channels as u16).expect("audio frame channels is nonzero"),
-        nz!(2),
+        nz!(2), // frame always has two channels
         NonZero::new(frame.sample_rate).expect("audio frame sample rate is nonzero"),
         samples,
     )

From 462293667b8173880c750bb959350d8a80512145 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 11 Sep 2025 16:58:11 +0200
Subject: [PATCH 787/823] editor: Re-use multibuffers when opening the same
 locations again (#37994)

A very primitive attempt, we just key the editor with the locations and
re-use the editor if we open a new buffer with the same initial
locations and title.

Release Notes:

- Added reusing of reference search buffers when applicable
---
 crates/editor/src/editor.rs             |  71 +++++++----
 crates/editor/src/editor_tests.rs       | 153 ++++++++++++++++++++++++
 crates/multi_buffer/src/multi_buffer.rs |  19 ++-
 crates/text/src/locator.rs              |  24 ++--
 4 files changed, 218 insertions(+), 49 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c5ea6d4ee2..007fdd52d7 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -175,16 +175,14 @@ use settings::{Settings, SettingsLocation, SettingsStore, update_settings_file};
 use smallvec::{SmallVec, smallvec};
 use snippet::Snippet;
 use std::{
-    any::TypeId,
+    any::{Any, TypeId},
     borrow::Cow,
-    cell::OnceCell,
-    cell::RefCell,
+    cell::{OnceCell, RefCell},
     cmp::{self, Ordering, Reverse},
     iter::Peekable,
     mem,
     num::NonZeroU32,
-    ops::Not,
-    ops::{ControlFlow, Deref, DerefMut, Range, RangeInclusive},
+    ops::{ControlFlow, Deref, DerefMut, Not, Range, RangeInclusive},
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
@@ -850,7 +848,7 @@ pub struct ResolvedTasks {
 #[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
 struct BufferOffset(usize);
 
-// Addons allow storing per-editor state in other crates (e.g. Vim)
+/// Addons allow storing per-editor state in other crates (e.g. Vim)
 pub trait Addon: 'static {
     fn extend_key_context(&self, _: &mut KeyContext, _: &App) {}
 
@@ -1178,6 +1176,7 @@ pub struct Editor {
     next_color_inlay_id: usize,
     colors: Option<LspColorData>,
     folding_newlines: Task<()>,
+    pub lookup_key: Option<Box<dyn Any + Send + Sync>>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Default)]
@@ -2257,6 +2256,7 @@ impl Editor {
             mode,
             selection_drag_state: SelectionDragState::None,
             folding_newlines: Task::ready(()),
+            lookup_key: None,
         };
 
         if is_minimap {
@@ -16396,7 +16396,7 @@ impl Editor {
 
                 anyhow::Ok(Navigated::from_bool(opened))
             } else if locations.is_empty() {
-                // If there is one definition, just open it directly
+                // If there is one url or file, open it directly
                 match first_url_or_file {
                     Some(Either::Left(url)) => {
                         acx.update(|_, cx| cx.open_url(&url))?;
@@ -16423,8 +16423,6 @@ impl Editor {
 
                 let target = locations.pop().unwrap();
                 editor.update_in(acx, |editor, window, cx| {
-                    let pane = workspace.read(cx).active_pane().clone();
-
                     let range = target.range.to_point(target.buffer.read(cx));
                     let range = editor.range_for_match(&range);
                     let range = collapse_multiline_range(range);
@@ -16434,6 +16432,7 @@ impl Editor {
                     {
                         editor.go_to_singleton_buffer_range(range, window, cx);
                     } else {
+                        let pane = workspace.read(cx).active_pane().clone();
                         window.defer(cx, move |window, cx| {
                             let target_editor: Entity<Self> =
                                 workspace.update(cx, |workspace, cx| {
@@ -16607,13 +16606,17 @@ impl Editor {
             return;
         }
 
-        // If there are multiple definitions, open them in a multibuffer
         locations.sort_by_key(|location| location.buffer.read(cx).remote_id());
+
         let mut locations = locations.into_iter().peekable();
         let mut ranges: Vec<Range<Anchor>> = Vec::new();
         let capability = workspace.project().read(cx).capability();
 
+        // a key to find existing multibuffer editors with the same set of locations
+        // to prevent us from opening more and more multibuffer tabs for searches and the like
+        let mut key = (title.clone(), vec![]);
         let excerpt_buffer = cx.new(|cx| {
+            let key = &mut key.1;
             let mut multibuffer = MultiBuffer::new(capability);
             while let Some(location) = locations.next() {
                 let buffer = location.buffer.read(cx);
@@ -16621,16 +16624,17 @@ impl Editor {
                 let range = location.range.to_point(buffer);
                 ranges_for_buffer.push(range.clone());
 
-                while let Some(next_location) = locations.peek() {
-                    if next_location.buffer == location.buffer {
-                        ranges_for_buffer.push(next_location.range.to_point(buffer));
-                        locations.next();
-                    } else {
-                        break;
-                    }
+                while let Some(next_location) =
+                    locations.next_if(|next_location| next_location.buffer == location.buffer)
+                {
+                    ranges_for_buffer.push(next_location.range.to_point(buffer));
                 }
 
                 ranges_for_buffer.sort_by_key(|range| (range.start, Reverse(range.end)));
+                key.push((
+                    location.buffer.read(cx).remote_id(),
+                    ranges_for_buffer.clone(),
+                ));
                 let (new_ranges, _) = multibuffer.set_excerpts_for_path(
                     PathKey::for_buffer(&location.buffer, cx),
                     location.buffer.clone(),
@@ -16643,14 +16647,31 @@ impl Editor {
 
             multibuffer.with_title(title)
         });
-
-        let editor = cx.new(|cx| {
-            Editor::for_multibuffer(
-                excerpt_buffer,
-                Some(workspace.project().clone()),
-                window,
-                cx,
-            )
+        let existing = workspace.active_pane().update(cx, |pane, cx| {
+            pane.items()
+                .filter_map(|item| item.downcast::<Editor>())
+                .find(|editor| {
+                    editor
+                        .read(cx)
+                        .lookup_key
+                        .as_ref()
+                        .and_then(|it| {
+                            it.downcast_ref::<(String, Vec<(BufferId, Vec<Range<Point>>)>)>()
+                        })
+                        .is_some_and(|it| *it == key)
+                })
+        });
+        let editor = existing.unwrap_or_else(|| {
+            cx.new(|cx| {
+                let mut editor = Editor::for_multibuffer(
+                    excerpt_buffer,
+                    Some(workspace.project().clone()),
+                    window,
+                    cx,
+                );
+                editor.lookup_key = Some(Box::new(key));
+                editor
+            })
         });
         editor.update(cx, |editor, cx| {
             match multibuffer_selection_mode {
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 4e3c5012e1..131b03c61b 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -21402,6 +21402,159 @@ async fn test_goto_definition_no_fallback(cx: &mut TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_find_all_references_editor_reuse(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    let mut cx = EditorLspTestContext::new_rust(
+        lsp::ServerCapabilities {
+            references_provider: Some(lsp::OneOf::Left(true)),
+            ..lsp::ServerCapabilities::default()
+        },
+        cx,
+    )
+    .await;
+
+    cx.set_state(
+        &r#"
+        fn one() {
+            let mut a = two();
+        }
+
+        fn ˇtwo() {}"#
+            .unindent(),
+    );
+    cx.lsp
+        .set_request_handler::<lsp::request::References, _, _>(move |params, _| async move {
+            Ok(Some(vec![
+                lsp::Location {
+                    uri: params.text_document_position.text_document.uri.clone(),
+                    range: lsp::Range::new(lsp::Position::new(0, 16), lsp::Position::new(0, 19)),
+                },
+                lsp::Location {
+                    uri: params.text_document_position.text_document.uri,
+                    range: lsp::Range::new(lsp::Position::new(4, 4), lsp::Position::new(4, 7)),
+                },
+            ]))
+        });
+    let navigated = cx
+        .update_editor(|editor, window, cx| {
+            editor.find_all_references(&FindAllReferences, window, cx)
+        })
+        .unwrap()
+        .await
+        .expect("Failed to navigate to references");
+    assert_eq!(
+        navigated,
+        Navigated::Yes,
+        "Should have navigated to references from the FindAllReferences response"
+    );
+    cx.assert_editor_state(
+        &r#"fn one() {
+            let mut a = two();
+        }
+
+        fn ˇtwo() {}"#
+            .unindent(),
+    );
+
+    let editors = cx.update_workspace(|workspace, _, cx| {
+        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
+    });
+    cx.update_editor(|_, _, _| {
+        assert_eq!(editors.len(), 2, "We should have opened a new multibuffer");
+    });
+
+    cx.set_state(
+        &r#"fn one() {
+            let mut a = ˇtwo();
+        }
+
+        fn two() {}"#
+            .unindent(),
+    );
+    let navigated = cx
+        .update_editor(|editor, window, cx| {
+            editor.find_all_references(&FindAllReferences, window, cx)
+        })
+        .unwrap()
+        .await
+        .expect("Failed to navigate to references");
+    assert_eq!(
+        navigated,
+        Navigated::Yes,
+        "Should have navigated to references from the FindAllReferences response"
+    );
+    cx.assert_editor_state(
+        &r#"fn one() {
+            let mut a = ˇtwo();
+        }
+
+        fn two() {}"#
+            .unindent(),
+    );
+    let editors = cx.update_workspace(|workspace, _, cx| {
+        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
+    });
+    cx.update_editor(|_, _, _| {
+        assert_eq!(
+            editors.len(),
+            2,
+            "should have re-used the previous multibuffer"
+        );
+    });
+
+    cx.set_state(
+        &r#"fn one() {
+            let mut a = ˇtwo();
+        }
+        fn three() {}
+        fn two() {}"#
+            .unindent(),
+    );
+    cx.lsp
+        .set_request_handler::<lsp::request::References, _, _>(move |params, _| async move {
+            Ok(Some(vec![
+                lsp::Location {
+                    uri: params.text_document_position.text_document.uri.clone(),
+                    range: lsp::Range::new(lsp::Position::new(0, 16), lsp::Position::new(0, 19)),
+                },
+                lsp::Location {
+                    uri: params.text_document_position.text_document.uri,
+                    range: lsp::Range::new(lsp::Position::new(5, 4), lsp::Position::new(5, 7)),
+                },
+            ]))
+        });
+    let navigated = cx
+        .update_editor(|editor, window, cx| {
+            editor.find_all_references(&FindAllReferences, window, cx)
+        })
+        .unwrap()
+        .await
+        .expect("Failed to navigate to references");
+    assert_eq!(
+        navigated,
+        Navigated::Yes,
+        "Should have navigated to references from the FindAllReferences response"
+    );
+    cx.assert_editor_state(
+        &r#"fn one() {
+                let mut a = ˇtwo();
+            }
+            fn three() {}
+            fn two() {}"#
+            .unindent(),
+    );
+    let editors = cx.update_workspace(|workspace, _, cx| {
+        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
+    });
+    cx.update_editor(|_, _, _| {
+        assert_eq!(
+            editors.len(),
+            3,
+            "should have used a new multibuffer as offsets changed"
+        );
+    });
+}
 #[gpui::test]
 async fn test_find_enclosing_node_with_task(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 8fa8c2c08c..5637f9af1a 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2092,17 +2092,14 @@ impl MultiBuffer {
         let snapshot = self.read(cx);
         let buffers = self.buffers.borrow();
         let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>(&());
-        for locator in buffers
-            .get(&buffer_id)
-            .map(|state| &state.excerpts)
-            .into_iter()
-            .flatten()
-        {
-            cursor.seek_forward(&Some(locator), Bias::Left);
-            if let Some(excerpt) = cursor.item()
-                && excerpt.locator == *locator
-            {
-                excerpts.push((excerpt.id, excerpt.range.clone()));
+        if let Some(locators) = buffers.get(&buffer_id).map(|state| &state.excerpts) {
+            for locator in locators {
+                cursor.seek_forward(&Some(locator), Bias::Left);
+                if let Some(excerpt) = cursor.item()
+                    && excerpt.locator == *locator
+                {
+                    excerpts.push((excerpt.id, excerpt.range.clone()));
+                }
             }
         }
 
diff --git a/crates/text/src/locator.rs b/crates/text/src/locator.rs
index 9b89cf21c7..7363d5bdd3 100644
--- a/crates/text/src/locator.rs
+++ b/crates/text/src/locator.rs
@@ -1,9 +1,5 @@
-use smallvec::{SmallVec, smallvec};
+use smallvec::SmallVec;
 use std::iter;
-use std::sync::LazyLock;
-
-static MIN: LazyLock<Locator> = LazyLock::new(Locator::min);
-static MAX: LazyLock<Locator> = LazyLock::new(Locator::max);
 
 /// An identifier for a position in a ordered collection.
 ///
@@ -16,20 +12,22 @@ static MAX: LazyLock<Locator> = LazyLock::new(Locator::max);
 pub struct Locator(SmallVec<[u64; 4]>);
 
 impl Locator {
-    pub fn min() -> Self {
-        Self(smallvec![u64::MIN])
+    pub const fn min() -> Self {
+        // SAFETY: 1 is <= 4
+        Self(unsafe { SmallVec::from_const_with_len_unchecked([u64::MIN; 4], 1) })
     }
 
-    pub fn max() -> Self {
-        Self(smallvec![u64::MAX])
+    pub const fn max() -> Self {
+        // SAFETY: 1 is <= 4
+        Self(unsafe { SmallVec::from_const_with_len_unchecked([u64::MAX; 4], 1) })
     }
 
-    pub fn min_ref() -> &'static Self {
-        &MIN
+    pub const fn min_ref() -> &'static Self {
+        const { &Self::min() }
     }
 
-    pub fn max_ref() -> &'static Self {
-        &MAX
+    pub const fn max_ref() -> &'static Self {
+        const { &Self::max() }
     }
 
     pub fn assign(&mut self, other: &Self) {

From 2b04186b0fe9ff204cfd7873b6796d9d55797cdd Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 11:07:11 -0400
Subject: [PATCH 788/823] Only run congratsbot for non-staff (#38000)

Release Notes:

- N/A
---
 .github/workflows/congrats.yml | 45 +++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml
index c5dfc12264..e8af621c44 100644
--- a/.github/workflows/congrats.yml
+++ b/.github/workflows/congrats.yml
@@ -5,8 +5,51 @@ on:
     branches: [main]
 
 jobs:
-  congrats:
+  check-author:
     if: ${{ github.repository_owner == 'zed-industries' }}
+    runs-on: ubuntu-latest
+    outputs:
+      should_congratulate: ${{ steps.check.outputs.should_congratulate }}
+    steps:
+      - name: Get PR info and check if author is external
+        id: check
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              commit_sha: context.sha
+            });
+
+            if (prs.length === 0) {
+              core.setOutput('should_congratulate', 'false');
+              return;
+            }
+
+            const mergedPR = prs.find(pr => pr.merged_at !== null) || prs[0];
+            const prAuthor = mergedPR.user.login;
+
+            try {
+              await github.rest.teams.getMembershipForUserInOrg({
+                org: 'zed-industries',
+                team_slug: 'staff',
+                username: prAuthor
+              });
+              core.setOutput('should_congratulate', 'false');
+            } catch (error) {
+              if (error.status === 404) {
+                core.setOutput('should_congratulate', 'true');
+              } else {
+                console.error(`Error checking team membership: ${error.message}`);
+                core.setOutput('should_congratulate', 'false');
+              }
+            }
+
+  congrats:
+    needs: check-author
+    if: needs.check-author.outputs.should_congratulate == 'true'
     uses: withastro/automation/.github/workflows/congratsbot.yml@main
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}

From da8c7a1256649a1e1bac146e1d1732c8856116c8 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 12:04:09 -0400
Subject: [PATCH 789/823] Polish congratsbot (#38005)

Release Notes:

- N/A
---
 .github/workflows/congrats.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml
index e8af621c44..a5ca37bcf1 100644
--- a/.github/workflows/congrats.yml
+++ b/.github/workflows/congrats.yml
@@ -51,5 +51,16 @@ jobs:
     needs: check-author
     if: needs.check-author.outputs.should_congratulate == 'true'
     uses: withastro/automation/.github/workflows/congratsbot.yml@main
+    with:
+      EMOJIS: 🎉,🎊,🧑‍🚀,🥳,🙌,🚀,🦀,🔥,🚢
+      COAUTHOR_TEMPLATES: >
+        [
+          "Thank you for making Zed better, <names>! In Rust we trust!",
+          "Successfully moved this PR into main! No lifetime errors here, thanks <names>!",
+          "Ferris approves! Thanks <names>!",
+          "Crab rave time! Code from <names> has been oxidized and merged!",
+          "The borrow checker is happy, and so are we! Welcome to the cargo club, <names>!",
+          "Crabs can live up to 100 years, but this PR from <names> will live forever in our git history!"
+        ]
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}

From 116c6549f67335bf7e9469fd22ad2899f07cd91f Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Thu, 11 Sep 2025 10:55:10 -0700
Subject: [PATCH 790/823] project_panel: Make rest of the project panel drag
 and drop target (#38008)

Closes #25854

You can now drag-and-drop on the remaining space in the project panel to
drop entries/external paths in the last worktree.


https://github.com/user-attachments/assets/a7e14518-6065-4b0f-ba2c-823c70f154f4

Release Notes:

- Added support for drag-and-drop files and external paths into the
empty space of the project panel, placing them in the last folder you
have added to the project.
---
 crates/project_panel/src/project_panel.rs     | 557 ++++++++++++------
 .../project_panel/src/project_panel_tests.rs  | 235 ++++++++
 2 files changed, 609 insertions(+), 183 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 06f3fe15b7..f82901595b 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -95,7 +95,7 @@ pub struct ProjectPanel {
     ancestors: HashMap<ProjectEntryId, FoldedAncestors>,
     folded_directory_drag_target: Option<FoldedDirectoryDragTarget>,
     last_worktree_root_id: Option<ProjectEntryId>,
-    drag_target_entry: Option<DragTargetEntry>,
+    drag_target_entry: Option<DragTarget>,
     expanded_dir_ids: HashMap<WorktreeId, Vec<ProjectEntryId>>,
     unfolded_dir_ids: HashSet<ProjectEntryId>,
     // Currently selected leaf entry (see auto-folding for a definition of that) in a file tree
@@ -125,11 +125,16 @@ pub struct ProjectPanel {
     last_reported_update: Instant,
 }
 
-struct DragTargetEntry {
-    /// The entry currently under the mouse cursor during a drag operation
-    entry_id: ProjectEntryId,
-    /// Highlight this entry along with all of its children
-    highlight_entry_id: Option<ProjectEntryId>,
+enum DragTarget {
+    /// Dragging on an entry
+    Entry {
+        /// The entry currently under the mouse cursor during a drag operation
+        entry_id: ProjectEntryId,
+        /// Highlight this entry along with all of its children
+        highlight_entry_id: ProjectEntryId,
+    },
+    /// Dragging on background
+    Background,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -3966,7 +3971,9 @@ impl ProjectPanel {
 
         // In case of single item drag, we do not highlight existing
         // directory which item belongs too
-        if drag_state.items().count() == 1 {
+        if drag_state.items().count() == 1
+            && drag_state.active_selection.worktree_id == target_worktree.id()
+        {
             let active_entry_path = self
                 .project
                 .read(cx)
@@ -3995,6 +4002,44 @@ impl ProjectPanel {
         }
     }
 
+    fn should_highlight_background_for_selection_drag(
+        &self,
+        drag_state: &DraggedSelection,
+        last_root_id: ProjectEntryId,
+        cx: &App,
+    ) -> bool {
+        // Always highlight for multiple entries
+        if drag_state.items().count() > 1 {
+            return true;
+        }
+
+        // Since root will always have empty relative path
+        if let Some(entry_path) = self
+            .project
+            .read(cx)
+            .path_for_entry(drag_state.active_selection.entry_id, cx)
+        {
+            if let Some(parent_path) = entry_path.path.parent() {
+                if !parent_path.as_os_str().is_empty() {
+                    return true;
+                }
+            }
+        }
+
+        // If parent is empty, check if different worktree
+        if let Some(last_root_worktree_id) = self
+            .project
+            .read(cx)
+            .worktree_id_for_entry(last_root_id, cx)
+        {
+            if drag_state.active_selection.worktree_id != last_root_worktree_id {
+                return true;
+            }
+        }
+
+        false
+    }
+
     fn render_entry(
         &self,
         entry_id: ProjectEntryId,
@@ -4097,10 +4142,15 @@ impl ProjectPanel {
 
         let folded_directory_drag_target = self.folded_directory_drag_target;
         let is_highlighted = {
-            if let Some(highlight_entry_id) = self
-                .drag_target_entry
-                .as_ref()
-                .and_then(|drag_target| drag_target.highlight_entry_id)
+            if let Some(highlight_entry_id) =
+                self.drag_target_entry
+                    .as_ref()
+                    .and_then(|drag_target| match drag_target {
+                        DragTarget::Entry {
+                            highlight_entry_id, ..
+                        } => Some(*highlight_entry_id),
+                        DragTarget::Background => self.last_worktree_root_id,
+                    })
             {
                 // Highlight if same entry or it's children
                 if entry_id == highlight_entry_id {
@@ -4145,7 +4195,10 @@ impl ProjectPanel {
                 .on_drag_move::<ExternalPaths>(cx.listener(
                     move |this, event: &DragMoveEvent<ExternalPaths>, _, cx| {
                         let is_current_target = this.drag_target_entry.as_ref()
-                             .map(|entry| entry.entry_id) == Some(entry_id);
+                             .and_then(|entry| match entry {
+                                 DragTarget::Entry { entry_id: target_id, .. } => Some(*target_id),
+                                 DragTarget::Background { .. } => None,
+                             }) == Some(entry_id);
 
                         if !event.bounds.contains(&event.event.position) {
                             // Entry responsible for setting drag target is also responsible to
@@ -4160,20 +4213,22 @@ impl ProjectPanel {
                             return;
                         }
 
+                        this.marked_entries.clear();
+
                         let Some((entry_id, highlight_entry_id)) = maybe!({
                             let target_worktree = this.project.read(cx).worktree_for_id(selection.worktree_id, cx)?.read(cx);
                             let target_entry = target_worktree.entry_for_path(&path_for_external_paths)?;
-                            let highlight_entry_id = this.highlight_entry_for_external_drag(target_entry, target_worktree);
+                            let highlight_entry_id = this.highlight_entry_for_external_drag(target_entry, target_worktree)?;
                             Some((target_entry.id, highlight_entry_id))
                         }) else {
                             return;
                         };
 
-                        this.drag_target_entry = Some(DragTargetEntry {
+                        this.drag_target_entry = Some(DragTarget::Entry {
                             entry_id,
                             highlight_entry_id,
                         });
-                        this.marked_entries.clear();
+
                     },
                 ))
                 .on_drop(cx.listener(
@@ -4187,7 +4242,10 @@ impl ProjectPanel {
                 .on_drag_move::<DraggedSelection>(cx.listener(
                     move |this, event: &DragMoveEvent<DraggedSelection>, window, cx| {
                         let is_current_target = this.drag_target_entry.as_ref()
-                             .map(|entry| entry.entry_id) == Some(entry_id);
+                             .and_then(|entry| match entry {
+                                 DragTarget::Entry { entry_id: target_id, .. } => Some(*target_id),
+                                 DragTarget::Background { .. } => None,
+                             }) == Some(entry_id);
 
                         if !event.bounds.contains(&event.event.position) {
                             // Entry responsible for setting drag target is also responsible to
@@ -4203,23 +4261,26 @@ impl ProjectPanel {
                         }
 
                         let drag_state = event.drag(cx);
+
+                        if drag_state.items().count() == 1 {
+                            this.marked_entries.clear();
+                            this.marked_entries.push(drag_state.active_selection);
+                        }
+
                         let Some((entry_id, highlight_entry_id)) = maybe!({
                             let target_worktree = this.project.read(cx).worktree_for_id(selection.worktree_id, cx)?.read(cx);
                             let target_entry = target_worktree.entry_for_path(&path_for_dragged_selection)?;
-                            let highlight_entry_id = this.highlight_entry_for_selection_drag(target_entry, target_worktree, drag_state, cx);
+                            let highlight_entry_id = this.highlight_entry_for_selection_drag(target_entry, target_worktree, drag_state, cx)?;
                             Some((target_entry.id, highlight_entry_id))
                         }) else {
                             return;
                         };
 
-                        this.drag_target_entry = Some(DragTargetEntry {
+                        this.drag_target_entry = Some(DragTarget::Entry {
                             entry_id,
                             highlight_entry_id,
                         });
-                        if drag_state.items().count() == 1 {
-                            this.marked_entries.clear();
-                            this.marked_entries.push(drag_state.active_selection);
-                        }
+
                         this.hover_expand_task.take();
 
                         if !kind.is_dir()
@@ -4239,7 +4300,10 @@ impl ProjectPanel {
                                     .await;
                                 this.update_in(cx, |this, window, cx| {
                                     this.hover_expand_task.take();
-                                    if this.drag_target_entry.as_ref().map(|entry| entry.entry_id) == Some(entry_id)
+                                    if this.drag_target_entry.as_ref().and_then(|entry| match entry {
+                                        DragTarget::Entry { entry_id: target_id, .. } => Some(*target_id),
+                                        DragTarget::Background { .. } => None,
+                                    }) == Some(entry_id)
                                         && bounds.contains(&window.mouse_position())
                                     {
                                         this.expand_entry(worktree_id, entry_id, cx);
@@ -4270,7 +4334,7 @@ impl ProjectPanel {
                         this.drag_target_entry = None;
                         this.hover_scroll_task.take();
                         this.hover_expand_task.take();
-                        if  folded_directory_drag_target.is_some() {
+                        if folded_directory_drag_target.is_some() {
                             return;
                         }
                         this.drag_onto(selections, entry_id, kind.is_file(), window, cx);
@@ -5370,178 +5434,305 @@ impl Render for ProjectPanel {
                 )
                 .track_focus(&self.focus_handle(cx))
                 .child(
-                    uniform_list("entries", item_count, {
-                        cx.processor(|this, range: Range<usize>, window, cx| {
-                            let mut items = Vec::with_capacity(range.end - range.start);
-                            this.for_each_visible_entry(
-                                range,
-                                window,
-                                cx,
-                                |id, details, window, cx| {
-                                    items.push(this.render_entry(id, details, window, cx));
-                                },
-                            );
-                            items
-                        })
-                    })
-                    .when(show_indent_guides, |list| {
-                        list.with_decoration(
-                            ui::indent_guides(px(indent_size), IndentGuideColors::panel(cx))
-                                .with_compute_indents_fn(cx.entity(), |this, range, window, cx| {
-                                    let mut items =
-                                        SmallVec::with_capacity(range.end - range.start);
-                                    this.iter_visible_entries(
+                    v_flex()
+                        .child(
+                            uniform_list("entries", item_count, {
+                                cx.processor(|this, range: Range<usize>, window, cx| {
+                                    let mut items = Vec::with_capacity(range.end - range.start);
+                                    this.for_each_visible_entry(
                                         range,
                                         window,
                                         cx,
-                                        |entry, _, entries, _, _| {
-                                            let (depth, _) = Self::calculate_depth_and_difference(
-                                                entry, entries,
-                                            );
-                                            items.push(depth);
+                                        |id, details, window, cx| {
+                                            items.push(this.render_entry(id, details, window, cx));
                                         },
                                     );
                                     items
                                 })
-                                .on_click(cx.listener(
-                                    |this, active_indent_guide: &IndentGuideLayout, window, cx| {
-                                        if window.modifiers().secondary() {
-                                            let ix = active_indent_guide.offset.y;
-                                            let Some((target_entry, worktree)) = maybe!({
-                                                let (worktree_id, entry) =
-                                                    this.entry_at_index(ix)?;
-                                                let worktree = this
-                                                    .project
-                                                    .read(cx)
-                                                    .worktree_for_id(worktree_id, cx)?;
-                                                let target_entry = worktree
-                                                    .read(cx)
-                                                    .entry_for_path(&entry.path.parent()?)?;
-                                                Some((target_entry, worktree))
-                                            }) else {
-                                                return;
-                                            };
+                            })
+                            .when(show_indent_guides, |list| {
+                                list.with_decoration(
+                                    ui::indent_guides(
+                                        px(indent_size),
+                                        IndentGuideColors::panel(cx),
+                                    )
+                                    .with_compute_indents_fn(
+                                        cx.entity(),
+                                        |this, range, window, cx| {
+                                            let mut items =
+                                                SmallVec::with_capacity(range.end - range.start);
+                                            this.iter_visible_entries(
+                                                range,
+                                                window,
+                                                cx,
+                                                |entry, _, entries, _, _| {
+                                                    let (depth, _) =
+                                                        Self::calculate_depth_and_difference(
+                                                            entry, entries,
+                                                        );
+                                                    items.push(depth);
+                                                },
+                                            );
+                                            items
+                                        },
+                                    )
+                                    .on_click(cx.listener(
+                                        |this,
+                                         active_indent_guide: &IndentGuideLayout,
+                                         window,
+                                         cx| {
+                                            if window.modifiers().secondary() {
+                                                let ix = active_indent_guide.offset.y;
+                                                let Some((target_entry, worktree)) = maybe!({
+                                                    let (worktree_id, entry) =
+                                                        this.entry_at_index(ix)?;
+                                                    let worktree = this
+                                                        .project
+                                                        .read(cx)
+                                                        .worktree_for_id(worktree_id, cx)?;
+                                                    let target_entry = worktree
+                                                        .read(cx)
+                                                        .entry_for_path(&entry.path.parent()?)?;
+                                                    Some((target_entry, worktree))
+                                                }) else {
+                                                    return;
+                                                };
 
-                                            this.collapse_entry(target_entry.clone(), worktree, cx);
+                                                this.collapse_entry(
+                                                    target_entry.clone(),
+                                                    worktree,
+                                                    cx,
+                                                );
+                                            }
+                                        },
+                                    ))
+                                    .with_render_fn(
+                                        cx.entity(),
+                                        move |this, params, _, cx| {
+                                            const LEFT_OFFSET: Pixels = px(14.);
+                                            const PADDING_Y: Pixels = px(4.);
+                                            const HITBOX_OVERDRAW: Pixels = px(3.);
+
+                                            let active_indent_guide_index = this
+                                                .find_active_indent_guide(
+                                                    &params.indent_guides,
+                                                    cx,
+                                                );
+
+                                            let indent_size = params.indent_size;
+                                            let item_height = params.item_height;
+
+                                            params
+                                                .indent_guides
+                                                .into_iter()
+                                                .enumerate()
+                                                .map(|(idx, layout)| {
+                                                    let offset = if layout.continues_offscreen {
+                                                        px(0.)
+                                                    } else {
+                                                        PADDING_Y
+                                                    };
+                                                    let bounds = Bounds::new(
+                                                        point(
+                                                            layout.offset.x * indent_size
+                                                                + LEFT_OFFSET,
+                                                            layout.offset.y * item_height + offset,
+                                                        ),
+                                                        size(
+                                                            px(1.),
+                                                            layout.length * item_height
+                                                                - offset * 2.,
+                                                        ),
+                                                    );
+                                                    ui::RenderedIndentGuide {
+                                                        bounds,
+                                                        layout,
+                                                        is_active: Some(idx)
+                                                            == active_indent_guide_index,
+                                                        hitbox: Some(Bounds::new(
+                                                            point(
+                                                                bounds.origin.x - HITBOX_OVERDRAW,
+                                                                bounds.origin.y,
+                                                            ),
+                                                            size(
+                                                                bounds.size.width
+                                                                    + HITBOX_OVERDRAW * 2.,
+                                                                bounds.size.height,
+                                                            ),
+                                                        )),
+                                                    }
+                                                })
+                                                .collect()
+                                        },
+                                    ),
+                                )
+                            })
+                            .when(show_sticky_entries, |list| {
+                                let sticky_items = ui::sticky_items(
+                                    cx.entity(),
+                                    |this, range, window, cx| {
+                                        let mut items =
+                                            SmallVec::with_capacity(range.end - range.start);
+                                        this.iter_visible_entries(
+                                            range,
+                                            window,
+                                            cx,
+                                            |entry, index, entries, _, _| {
+                                                let (depth, _) =
+                                                    Self::calculate_depth_and_difference(
+                                                        entry, entries,
+                                                    );
+                                                let candidate =
+                                                    StickyProjectPanelCandidate { index, depth };
+                                                items.push(candidate);
+                                            },
+                                        );
+                                        items
+                                    },
+                                    |this, marker_entry, window, cx| {
+                                        let sticky_entries =
+                                            this.render_sticky_entries(marker_entry, window, cx);
+                                        this.sticky_items_count = sticky_entries.len();
+                                        sticky_entries
+                                    },
+                                );
+                                list.with_decoration(if show_indent_guides {
+                                    sticky_items.with_decoration(
+                                        ui::indent_guides(
+                                            px(indent_size),
+                                            IndentGuideColors::panel(cx),
+                                        )
+                                        .with_render_fn(
+                                            cx.entity(),
+                                            move |_, params, _, _| {
+                                                const LEFT_OFFSET: Pixels = px(14.);
+
+                                                let indent_size = params.indent_size;
+                                                let item_height = params.item_height;
+
+                                                params
+                                                    .indent_guides
+                                                    .into_iter()
+                                                    .map(|layout| {
+                                                        let bounds = Bounds::new(
+                                                            point(
+                                                                layout.offset.x * indent_size
+                                                                    + LEFT_OFFSET,
+                                                                layout.offset.y * item_height,
+                                                            ),
+                                                            size(
+                                                                px(1.),
+                                                                layout.length * item_height,
+                                                            ),
+                                                        );
+                                                        ui::RenderedIndentGuide {
+                                                            bounds,
+                                                            layout,
+                                                            is_active: false,
+                                                            hitbox: None,
+                                                        }
+                                                    })
+                                                    .collect()
+                                            },
+                                        ),
+                                    )
+                                } else {
+                                    sticky_items
+                                })
+                            })
+                            .with_sizing_behavior(ListSizingBehavior::Infer)
+                            .with_horizontal_sizing_behavior(
+                                ListHorizontalSizingBehavior::Unconstrained,
+                            )
+                            .with_width_from_item(self.max_width_item_index)
+                            .track_scroll(self.scroll_handle.clone()),
+                        )
+                        .child(
+                            div()
+                                .block_mouse_except_scroll()
+                                .flex_grow()
+                                .when(
+                                    self.drag_target_entry.as_ref().is_some_and(
+                                        |entry| match entry {
+                                            DragTarget::Background => true,
+                                            DragTarget::Entry {
+                                                highlight_entry_id, ..
+                                            } => {
+                                                self.last_worktree_root_id.is_some_and(|root_id| {
+                                                    *highlight_entry_id == root_id
+                                                })
+                                            }
+                                        },
+                                    ),
+                                    |div| div.bg(cx.theme().colors().drop_target_background),
+                                )
+                                .on_drag_move::<ExternalPaths>(cx.listener(
+                                    move |this, event: &DragMoveEvent<ExternalPaths>, _, _| {
+                                        let Some(_last_root_id) = this.last_worktree_root_id else {
+                                            return;
+                                        };
+                                        if event.bounds.contains(&event.event.position) {
+                                            this.drag_target_entry = Some(DragTarget::Background);
+                                        } else {
+                                            if this.drag_target_entry.as_ref().is_some_and(|e| {
+                                                matches!(e, DragTarget::Background)
+                                            }) {
+                                                this.drag_target_entry = None;
+                                            }
                                         }
                                     },
                                 ))
-                                .with_render_fn(cx.entity(), move |this, params, _, cx| {
-                                    const LEFT_OFFSET: Pixels = px(14.);
-                                    const PADDING_Y: Pixels = px(4.);
-                                    const HITBOX_OVERDRAW: Pixels = px(3.);
-
-                                    let active_indent_guide_index =
-                                        this.find_active_indent_guide(&params.indent_guides, cx);
-
-                                    let indent_size = params.indent_size;
-                                    let item_height = params.item_height;
-
-                                    params
-                                        .indent_guides
-                                        .into_iter()
-                                        .enumerate()
-                                        .map(|(idx, layout)| {
-                                            let offset = if layout.continues_offscreen {
-                                                px(0.)
-                                            } else {
-                                                PADDING_Y
-                                            };
-                                            let bounds = Bounds::new(
-                                                point(
-                                                    layout.offset.x * indent_size + LEFT_OFFSET,
-                                                    layout.offset.y * item_height + offset,
-                                                ),
-                                                size(
-                                                    px(1.),
-                                                    layout.length * item_height - offset * 2.,
-                                                ),
-                                            );
-                                            ui::RenderedIndentGuide {
-                                                bounds,
-                                                layout,
-                                                is_active: Some(idx) == active_indent_guide_index,
-                                                hitbox: Some(Bounds::new(
-                                                    point(
-                                                        bounds.origin.x - HITBOX_OVERDRAW,
-                                                        bounds.origin.y,
-                                                    ),
-                                                    size(
-                                                        bounds.size.width + HITBOX_OVERDRAW * 2.,
-                                                        bounds.size.height,
-                                                    ),
-                                                )),
+                                .on_drag_move::<DraggedSelection>(cx.listener(
+                                    move |this, event: &DragMoveEvent<DraggedSelection>, _, cx| {
+                                        let Some(last_root_id) = this.last_worktree_root_id else {
+                                            return;
+                                        };
+                                        if event.bounds.contains(&event.event.position) {
+                                            let drag_state = event.drag(cx);
+                                            if this.should_highlight_background_for_selection_drag(
+                                                &drag_state,
+                                                last_root_id,
+                                                cx,
+                                            ) {
+                                                this.drag_target_entry =
+                                                    Some(DragTarget::Background);
                                             }
-                                        })
-                                        .collect()
-                                }),
-                        )
-                    })
-                    .when(show_sticky_entries, |list| {
-                        let sticky_items = ui::sticky_items(
-                            cx.entity(),
-                            |this, range, window, cx| {
-                                let mut items = SmallVec::with_capacity(range.end - range.start);
-                                this.iter_visible_entries(
-                                    range,
-                                    window,
-                                    cx,
-                                    |entry, index, entries, _, _| {
-                                        let (depth, _) =
-                                            Self::calculate_depth_and_difference(entry, entries);
-                                        let candidate =
-                                            StickyProjectPanelCandidate { index, depth };
-                                        items.push(candidate);
+                                        } else {
+                                            if this.drag_target_entry.as_ref().is_some_and(|e| {
+                                                matches!(e, DragTarget::Background)
+                                            }) {
+                                                this.drag_target_entry = None;
+                                            }
+                                        }
                                     },
-                                );
-                                items
-                            },
-                            |this, marker_entry, window, cx| {
-                                let sticky_entries =
-                                    this.render_sticky_entries(marker_entry, window, cx);
-                                this.sticky_items_count = sticky_entries.len();
-                                sticky_entries
-                            },
-                        );
-                        list.with_decoration(if show_indent_guides {
-                            sticky_items.with_decoration(
-                                ui::indent_guides(px(indent_size), IndentGuideColors::panel(cx))
-                                    .with_render_fn(cx.entity(), move |_, params, _, _| {
-                                        const LEFT_OFFSET: Pixels = px(14.);
-
-                                        let indent_size = params.indent_size;
-                                        let item_height = params.item_height;
-
-                                        params
-                                            .indent_guides
-                                            .into_iter()
-                                            .map(|layout| {
-                                                let bounds = Bounds::new(
-                                                    point(
-                                                        layout.offset.x * indent_size + LEFT_OFFSET,
-                                                        layout.offset.y * item_height,
-                                                    ),
-                                                    size(px(1.), layout.length * item_height),
-                                                );
-                                                ui::RenderedIndentGuide {
-                                                    bounds,
-                                                    layout,
-                                                    is_active: false,
-                                                    hitbox: None,
-                                                }
-                                            })
-                                            .collect()
-                                    }),
-                            )
-                        } else {
-                            sticky_items
-                        })
-                    })
-                    .size_full()
-                    .with_sizing_behavior(ListSizingBehavior::Infer)
-                    .with_horizontal_sizing_behavior(ListHorizontalSizingBehavior::Unconstrained)
-                    .with_width_from_item(self.max_width_item_index)
-                    .track_scroll(self.scroll_handle.clone()),
+                                ))
+                                .on_drop(cx.listener(
+                                    move |this, external_paths: &ExternalPaths, window, cx| {
+                                        this.drag_target_entry = None;
+                                        this.hover_scroll_task.take();
+                                        if let Some(entry_id) = this.last_worktree_root_id {
+                                            this.drop_external_files(
+                                                external_paths.paths(),
+                                                entry_id,
+                                                window,
+                                                cx,
+                                            );
+                                        }
+                                        cx.stop_propagation();
+                                    },
+                                ))
+                                .on_drop(cx.listener(
+                                    move |this, selections: &DraggedSelection, window, cx| {
+                                        this.drag_target_entry = None;
+                                        this.hover_scroll_task.take();
+                                        if let Some(entry_id) = this.last_worktree_root_id {
+                                            this.drag_onto(selections, entry_id, false, window, cx);
+                                        }
+                                        cx.stop_propagation();
+                                    },
+                                )),
+                        )
+                        .size_full(),
                 )
                 .children(self.render_vertical_scrollbar(cx))
                 .when_some(self.render_horizontal_scrollbar(cx), |this, scrollbar| {
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index 49b482e02c..f1132226cb 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -5643,6 +5643,241 @@ async fn test_highlight_entry_for_selection_drag(cx: &mut gpui::TestAppContext)
     });
 }
 
+#[gpui::test]
+async fn test_highlight_entry_for_selection_drag_cross_worktree(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        "/root1",
+        json!({
+            "src": {
+                "main.rs": "",
+                "lib.rs": ""
+            }
+        }),
+    )
+    .await;
+    fs.insert_tree(
+        "/root2",
+        json!({
+            "src": {
+                "main.rs": "",
+                "test.rs": ""
+            }
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
+    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*workspace, cx);
+    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
+
+    panel.update(cx, |panel, cx| {
+        let project = panel.project.read(cx);
+        let worktrees: Vec<_> = project.visible_worktrees(cx).collect();
+
+        let worktree_a = &worktrees[0];
+        let main_rs_from_a = worktree_a.read(cx).entry_for_path("src/main.rs").unwrap();
+
+        let worktree_b = &worktrees[1];
+        let src_dir_from_b = worktree_b.read(cx).entry_for_path("src").unwrap();
+        let main_rs_from_b = worktree_b.read(cx).entry_for_path("src/main.rs").unwrap();
+
+        // Test dragging file from worktree A onto parent of file with same relative path in worktree B
+        let dragged_selection = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: worktree_a.read(cx).id(),
+                entry_id: main_rs_from_a.id,
+            },
+            marked_selections: Arc::new([SelectedEntry {
+                worktree_id: worktree_a.read(cx).id(),
+                entry_id: main_rs_from_a.id,
+            }]),
+        };
+
+        let result = panel.highlight_entry_for_selection_drag(
+            src_dir_from_b,
+            worktree_b.read(cx),
+            &dragged_selection,
+            cx,
+        );
+        assert_eq!(
+            result,
+            Some(src_dir_from_b.id),
+            "Should highlight target directory from different worktree even with same relative path"
+        );
+
+        // Test dragging file from worktree A onto file with same relative path in worktree B
+        let result = panel.highlight_entry_for_selection_drag(
+            main_rs_from_b,
+            worktree_b.read(cx),
+            &dragged_selection,
+            cx,
+        );
+        assert_eq!(
+            result,
+            Some(src_dir_from_b.id),
+            "Should highlight parent of target file from different worktree"
+        );
+    });
+}
+
+#[gpui::test]
+async fn test_should_highlight_background_for_selection_drag(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        "/root1",
+        json!({
+            "parent_dir": {
+                "child_file.txt": "",
+                "nested_dir": {
+                    "nested_file.txt": ""
+                }
+            },
+            "root_file.txt": ""
+        }),
+    )
+    .await;
+
+    fs.insert_tree(
+        "/root2",
+        json!({
+            "other_dir": {
+                "other_file.txt": ""
+            }
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
+    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*workspace, cx);
+    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
+
+    panel.update(cx, |panel, cx| {
+        let project = panel.project.read(cx);
+        let worktrees: Vec<_> = project.visible_worktrees(cx).collect();
+        let worktree1 = worktrees[0].read(cx);
+        let worktree2 = worktrees[1].read(cx);
+        let worktree1_id = worktree1.id();
+        let _worktree2_id = worktree2.id();
+
+        let root1_entry = worktree1.root_entry().unwrap();
+        let root2_entry = worktree2.root_entry().unwrap();
+        let _parent_dir = worktree1.entry_for_path("parent_dir").unwrap();
+        let child_file = worktree1
+            .entry_for_path("parent_dir/child_file.txt")
+            .unwrap();
+        let nested_file = worktree1
+            .entry_for_path("parent_dir/nested_dir/nested_file.txt")
+            .unwrap();
+        let root_file = worktree1.entry_for_path("root_file.txt").unwrap();
+
+        // Test 1: Multiple entries - should always highlight background
+        let multiple_dragged_selection = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: child_file.id,
+            },
+            marked_selections: Arc::new([
+                SelectedEntry {
+                    worktree_id: worktree1_id,
+                    entry_id: child_file.id,
+                },
+                SelectedEntry {
+                    worktree_id: worktree1_id,
+                    entry_id: nested_file.id,
+                },
+            ]),
+        };
+
+        let result = panel.should_highlight_background_for_selection_drag(
+            &multiple_dragged_selection,
+            root1_entry.id,
+            cx,
+        );
+        assert!(result, "Should highlight background for multiple entries");
+
+        // Test 2: Single entry with non-empty parent path - should highlight background
+        let nested_dragged_selection = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: nested_file.id,
+            },
+            marked_selections: Arc::new([SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: nested_file.id,
+            }]),
+        };
+
+        let result = panel.should_highlight_background_for_selection_drag(
+            &nested_dragged_selection,
+            root1_entry.id,
+            cx,
+        );
+        assert!(result, "Should highlight background for nested file");
+
+        // Test 3: Single entry at root level, same worktree - should NOT highlight background
+        let root_file_dragged_selection = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: root_file.id,
+            },
+            marked_selections: Arc::new([SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: root_file.id,
+            }]),
+        };
+
+        let result = panel.should_highlight_background_for_selection_drag(
+            &root_file_dragged_selection,
+            root1_entry.id,
+            cx,
+        );
+        assert!(
+            !result,
+            "Should NOT highlight background for root file in same worktree"
+        );
+
+        // Test 4: Single entry at root level, different worktree - should highlight background
+        let result = panel.should_highlight_background_for_selection_drag(
+            &root_file_dragged_selection,
+            root2_entry.id,
+            cx,
+        );
+        assert!(
+            result,
+            "Should highlight background for root file from different worktree"
+        );
+
+        // Test 5: Single entry in subdirectory - should highlight background
+        let child_file_dragged_selection = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: child_file.id,
+            },
+            marked_selections: Arc::new([SelectedEntry {
+                worktree_id: worktree1_id,
+                entry_id: child_file.id,
+            }]),
+        };
+
+        let result = panel.should_highlight_background_for_selection_drag(
+            &child_file_dragged_selection,
+            root1_entry.id,
+            cx,
+        );
+        assert!(
+            result,
+            "Should highlight background for file with non-empty parent path"
+        );
+    });
+}
+
 #[gpui::test]
 async fn test_hide_root(cx: &mut gpui::TestAppContext) {
     init_test(cx);

From a33af4e9c0c5276cae6f673323714801084d65ea Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 11 Sep 2025 13:06:04 -0500
Subject: [PATCH 791/823] Remove legacy panic handling (#37947)

@maxdeviant We can eventually turn down the panic telemetry endpoint,
but should probably leave it up while there's still a bunch of stable
users hitting it.

@maxbrunsfeld We're optimistic that this change also fixed the macos
crashed-thread misreporting. We think it was because the
`CrashContext::exception` was getting set to `None` only on macos, while
on linux it was getting a real exception value from the sigtrap. Now
we've unified and it uses `SIGABRT` on both platforms (I need to double
check that this works as expected for windows).

We unconditionally set `RUST_BACKTRACE=1` for the current process so
that we see backtraces when running in a terminal by default. This
should be fine but I just wanted to note it since it's a bit abnormal.

Release Notes:

- N/A

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 Cargo.lock                       |  10 +-
 Cargo.toml                       |   1 +
 crates/crashes/Cargo.toml        |   1 +
 crates/crashes/src/crashes.rs    |  43 +++-
 crates/proto/proto/app.proto     |   2 +-
 crates/remote_server/Cargo.toml  |   3 -
 crates/remote_server/src/unix.rs | 119 ++-------
 crates/zed/Cargo.toml            |   2 -
 crates/zed/src/main.rs           |   9 -
 crates/zed/src/reliability.rs    | 423 ++-----------------------------
 10 files changed, 69 insertions(+), 544 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 82e1b202cb..6afd973460 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2853,9 +2853,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "cfg_aliases"
@@ -4040,6 +4040,7 @@ name = "crashes"
 version = "0.1.0"
 dependencies = [
  "bincode",
+ "cfg-if",
  "crash-handler",
  "log",
  "mach2 0.5.0",
@@ -13502,9 +13503,7 @@ dependencies = [
  "askpass",
  "assistant_tool",
  "assistant_tools",
- "backtrace",
  "cargo_toml",
- "chrono",
  "clap",
  "client",
  "clock",
@@ -13549,7 +13548,6 @@ dependencies = [
  "shellexpand 2.1.2",
  "smol",
  "sysinfo",
- "telemetry_events",
  "thiserror 2.0.12",
  "toml 0.8.20",
  "unindent",
@@ -20512,7 +20510,6 @@ dependencies = [
  "breadcrumbs",
  "call",
  "channel",
- "chrono",
  "clap",
  "cli",
  "client",
@@ -20563,7 +20560,6 @@ dependencies = [
  "language_selector",
  "language_tools",
  "languages",
- "libc",
  "line_ending_selector",
  "log",
  "markdown",
diff --git a/Cargo.toml b/Cargo.toml
index e1eca76374..c8983efc77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -472,6 +472,7 @@ blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
 cargo_toml = "0.21"
+cfg-if = "1.0.3"
 chrono = { version = "0.4", features = ["serde"] }
 ciborium = "0.2"
 circular-buffer = "1.0"
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
index 9af416cbb0..0f8147038d 100644
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -7,6 +7,7 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 bincode.workspace = true
+cfg-if.workspace = true
 crash-handler.workspace = true
 log.workspace = true
 minidumper.workspace = true
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
index f867f6cbdd..98db4bfc73 100644
--- a/crates/crashes/src/crashes.rs
+++ b/crates/crashes/src/crashes.rs
@@ -1,4 +1,4 @@
-use crash_handler::CrashHandler;
+use crash_handler::{CrashEventResult, CrashHandler};
 use log::info;
 use minidumper::{Client, LoopAction, MinidumpBinary};
 use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
@@ -10,7 +10,7 @@ use std::{
     env,
     fs::{self, File},
     io,
-    panic::Location,
+    panic::{self, PanicHookInfo},
     path::{Path, PathBuf},
     process::{self, Command},
     sync::{
@@ -33,7 +33,16 @@ static PANIC_THREAD_ID: AtomicU32 = AtomicU32::new(0);
 
 pub async fn init(crash_init: InitCrashHandler) {
     if *RELEASE_CHANNEL == ReleaseChannel::Dev && env::var("ZED_GENERATE_MINIDUMPS").is_err() {
+        let old_hook = panic::take_hook();
+        panic::set_hook(Box::new(move |info| {
+            unsafe { env::set_var("RUST_BACKTRACE", "1") };
+            old_hook(info);
+            // prevent the macOS crash dialog from popping up
+            std::process::exit(1);
+        }));
         return;
+    } else {
+        panic::set_hook(Box::new(panic_hook));
     }
 
     let exe = env::current_exe().expect("unable to find ourselves");
@@ -71,7 +80,7 @@ pub async fn init(crash_init: InitCrashHandler) {
         .unwrap();
 
     let client = Arc::new(client);
-    let handler = crash_handler::CrashHandler::attach(unsafe {
+    let handler = CrashHandler::attach(unsafe {
         let client = client.clone();
         crash_handler::make_crash_event(move |crash_context: &crash_handler::CrashContext| {
             // only request a minidump once
@@ -87,7 +96,7 @@ pub async fn init(crash_init: InitCrashHandler) {
             } else {
                 true
             };
-            crash_handler::CrashEventResult::Handled(res)
+            CrashEventResult::Handled(res)
         })
     })
     .expect("failed to attach signal handler");
@@ -257,8 +266,16 @@ impl minidumper::ServerHandler for CrashServer {
     }
 }
 
-pub fn handle_panic(message: String, span: Option<&Location>) {
-    let span = span
+pub fn panic_hook(info: &PanicHookInfo) {
+    let message = info
+        .payload()
+        .downcast_ref::<&str>()
+        .map(|s| s.to_string())
+        .or_else(|| info.payload().downcast_ref::<String>().cloned())
+        .unwrap_or_else(|| "Box<Any>".to_string());
+
+    let span = info
+        .location()
         .map(|loc| format!("{}:{}", loc.file(), loc.line()))
         .unwrap_or_default();
 
@@ -281,11 +298,15 @@ pub fn handle_panic(message: String, span: Option<&Location>) {
                 Ordering::SeqCst,
             );
 
-            #[cfg(target_os = "linux")]
-            CrashHandler.simulate_signal(crash_handler::Signal::Trap as u32);
-            #[cfg(not(target_os = "linux"))]
-            CrashHandler.simulate_exception(None);
-            break;
+            cfg_if::cfg_if! {
+                if #[cfg(target_os = "windows")] {
+                    // https://learn.microsoft.com/en-us/windows/win32/debug/system-error-codes--0-499-
+                    CrashHandler.simulate_exception(Some(234)); // (MORE_DATA_AVAILABLE)
+                    break;
+                } else {
+                    std::process::abort();
+                }
+            }
         }
         thread::sleep(retry_frequency);
     }
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
index 66f8da44f2..889086e200 100644
--- a/crates/proto/proto/app.proto
+++ b/crates/proto/proto/app.proto
@@ -28,7 +28,7 @@ message GetCrashFiles {
 
 message GetCrashFilesResponse {
     repeated CrashReport crashes = 1;
-    repeated string legacy_panics = 2;
+    reserved 2; // old panics
 }
 
 message CrashReport {
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
index 5dbb9a2771..59b2af0f41 100644
--- a/crates/remote_server/Cargo.toml
+++ b/crates/remote_server/Cargo.toml
@@ -24,8 +24,6 @@ test-support = ["fs/test-support"]
 [dependencies]
 anyhow.workspace = true
 askpass.workspace = true
-backtrace = "0.3"
-chrono.workspace = true
 clap.workspace = true
 client.workspace = true
 dap_adapters.workspace = true
@@ -61,7 +59,6 @@ settings.workspace = true
 shellexpand.workspace = true
 smol.workspace = true
 sysinfo.workspace = true
-telemetry_events.workspace = true
 util.workspace = true
 watch.workspace = true
 worktree.workspace = true
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
index 4aef536f0a..d6b730e6d6 100644
--- a/crates/remote_server/src/unix.rs
+++ b/crates/remote_server/src/unix.rs
@@ -1,8 +1,8 @@
 use crate::HeadlessProject;
 use crate::headless_project::HeadlessAppState;
 use anyhow::{Context as _, Result, anyhow};
-use chrono::Utc;
-use client::{ProxySettings, telemetry};
+use client::ProxySettings;
+use util::ResultExt;
 
 use extension::ExtensionHostProxy;
 use fs::{Fs, RealFs};
@@ -29,26 +29,23 @@ use reqwest_client::ReqwestClient;
 use rpc::proto::{self, Envelope, REMOTE_SERVER_PROJECT_ID};
 use rpc::{AnyProtoClient, TypedEnvelope};
 use settings::{Settings, SettingsStore, watch_config_file};
+use smol::Async;
 use smol::channel::{Receiver, Sender};
 use smol::io::AsyncReadExt;
-
-use smol::Async;
 use smol::{net::unix::UnixListener, stream::StreamExt as _};
-use std::ffi::OsStr;
-use std::ops::ControlFlow;
-use std::process::ExitStatus;
-use std::str::FromStr;
-use std::sync::LazyLock;
-use std::{env, thread};
 use std::{
+    env,
+    ffi::OsStr,
+    fs::File,
     io::Write,
     mem,
+    ops::ControlFlow,
     path::{Path, PathBuf},
-    sync::Arc,
+    process::ExitStatus,
+    str::FromStr,
+    sync::{Arc, LazyLock},
 };
-use telemetry_events::LocationData;
 use thiserror::Error;
-use util::ResultExt;
 
 pub static VERSION: LazyLock<&str> = LazyLock::new(|| match *RELEASE_CHANNEL {
     ReleaseChannel::Stable | ReleaseChannel::Preview => env!("ZED_PKG_VERSION"),
@@ -71,12 +68,12 @@ fn init_logging_proxy() {
 
 fn init_logging_server(log_file_path: PathBuf) -> Result<Receiver<Vec<u8>>> {
     struct MultiWrite {
-        file: std::fs::File,
+        file: File,
         channel: Sender<Vec<u8>>,
         buffer: Vec<u8>,
     }
 
-    impl std::io::Write for MultiWrite {
+    impl Write for MultiWrite {
         fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
             let written = self.file.write(buf)?;
             self.buffer.extend_from_slice(&buf[..written]);
@@ -120,87 +117,6 @@ fn init_logging_server(log_file_path: PathBuf) -> Result<Receiver<Vec<u8>>> {
     Ok(rx)
 }
 
-fn init_panic_hook(session_id: String) {
-    std::panic::set_hook(Box::new(move |info| {
-        let payload = info
-            .payload()
-            .downcast_ref::<&str>()
-            .map(|s| s.to_string())
-            .or_else(|| info.payload().downcast_ref::<String>().cloned())
-            .unwrap_or_else(|| "Box<Any>".to_string());
-
-        crashes::handle_panic(payload.clone(), info.location());
-
-        let backtrace = backtrace::Backtrace::new();
-        let mut backtrace = backtrace
-            .frames()
-            .iter()
-            .flat_map(|frame| {
-                frame
-                    .symbols()
-                    .iter()
-                    .filter_map(|frame| Some(format!("{:#}", frame.name()?)))
-            })
-            .collect::<Vec<_>>();
-
-        // Strip out leading stack frames for rust panic-handling.
-        if let Some(ix) = backtrace
-            .iter()
-            .position(|name| name == "rust_begin_unwind")
-        {
-            backtrace.drain(0..=ix);
-        }
-
-        let thread = thread::current();
-        let thread_name = thread.name().unwrap_or("<unnamed>");
-
-        log::error!(
-            "panic occurred: {}\nBacktrace:\n{}",
-            &payload,
-            backtrace.join("\n")
-        );
-
-        let panic_data = telemetry_events::Panic {
-            thread: thread_name.into(),
-            payload,
-            location_data: info.location().map(|location| LocationData {
-                file: location.file().into(),
-                line: location.line(),
-            }),
-            app_version: format!("remote-server-{}", *VERSION),
-            app_commit_sha: option_env!("ZED_COMMIT_SHA").map(|sha| sha.into()),
-            release_channel: RELEASE_CHANNEL.dev_name().into(),
-            target: env!("TARGET").to_owned().into(),
-            os_name: telemetry::os_name(),
-            os_version: Some(telemetry::os_version()),
-            architecture: env::consts::ARCH.into(),
-            panicked_on: Utc::now().timestamp_millis(),
-            backtrace,
-            system_id: None,       // Set on SSH client
-            installation_id: None, // Set on SSH client
-
-            // used on this end to associate panics with minidumps, but will be replaced on the SSH client
-            session_id: session_id.clone(),
-        };
-
-        if let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err() {
-            let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
-            let panic_file_path = paths::logs_dir().join(format!("zed-{timestamp}.panic"));
-            let panic_file = std::fs::OpenOptions::new()
-                .append(true)
-                .create(true)
-                .open(&panic_file_path)
-                .log_err();
-            if let Some(mut panic_file) = panic_file {
-                writeln!(&mut panic_file, "{panic_data_json}").log_err();
-                panic_file.flush().log_err();
-            }
-        }
-
-        std::process::abort();
-    }));
-}
-
 fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &AnyProtoClient) {
     client.add_request_handler(
         project.downgrade(),
@@ -249,10 +165,7 @@ fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &AnyPr
                 }
             }
 
-            anyhow::Ok(proto::GetCrashFilesResponse {
-                crashes,
-                legacy_panics,
-            })
+            anyhow::Ok(proto::GetCrashFilesResponse { crashes })
         },
     );
 }
@@ -434,13 +347,12 @@ pub fn execute_run(
     let id = std::process::id().to_string();
     app.background_executor()
         .spawn(crashes::init(crashes::InitCrashHandler {
-            session_id: id.clone(),
+            session_id: id,
             zed_version: VERSION.to_owned(),
             release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
             commit_sha: option_env!("ZED_COMMIT_SHA").unwrap_or("no_sha").to_owned(),
         }))
         .detach();
-    init_panic_hook(id);
     let log_rx = init_logging_server(log_file)?;
     log::info!(
         "starting up. pid_file: {:?}, stdin_socket: {:?}, stdout_socket: {:?}, stderr_socket: {:?}",
@@ -627,13 +539,12 @@ pub(crate) fn execute_proxy(
 
     let id = std::process::id().to_string();
     smol::spawn(crashes::init(crashes::InitCrashHandler {
-        session_id: id.clone(),
+        session_id: id,
         zed_version: VERSION.to_owned(),
         release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
         commit_sha: option_env!("ZED_COMMIT_SHA").unwrap_or("no_sha").to_owned(),
     }))
     .detach();
-    init_panic_hook(id);
 
     log::info!("starting proxy process. PID: {}", std::process::id());
 
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 7913b46421..cc18e50a9c 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -37,7 +37,6 @@ bincode.workspace = true
 breadcrumbs.workspace = true
 call.workspace = true
 channel.workspace = true
-chrono.workspace = true
 clap.workspace = true
 cli.workspace = true
 client.workspace = true
@@ -93,7 +92,6 @@ language_selector.workspace = true
 language_tools.workspace = true
 languages = { workspace = true, features = ["load-grammars"] }
 line_ending_selector.workspace = true
-libc.workspace = true
 log.workspace = true
 markdown.workspace = true
 markdown_preview.workspace = true
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index b5fc8943eb..b5dbbba865 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -278,13 +278,6 @@ pub fn main() {
                 .unwrap_or_else(|| "no sha".to_owned()),
         }))
         .detach();
-    reliability::init_panic_hook(
-        app_version,
-        app_commit_sha.clone(),
-        system_id.as_ref().map(|id| id.to_string()),
-        installation_id.as_ref().map(|id| id.to_string()),
-        session_id.clone(),
-    );
 
     let (open_listener, mut open_rx) = OpenListener::new();
 
@@ -542,8 +535,6 @@ pub fn main() {
         reliability::init(
             client.http_client(),
             system_id.as_ref().map(|id| id.to_string()),
-            installation_id.clone().map(|id| id.to_string()),
-            session_id.clone(),
             cx,
         );
 
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
index 544fac226e..4297f4c1c6 100644
--- a/crates/zed/src/reliability.rs
+++ b/crates/zed/src/reliability.rs
@@ -1,226 +1,32 @@
-use crate::stdout_is_a_pty;
 use anyhow::{Context as _, Result};
-use backtrace::{self, Backtrace};
-use chrono::Utc;
-use client::{
-    TelemetrySettings,
-    telemetry::{self, MINIDUMP_ENDPOINT},
-};
-use db::kvp::KEY_VALUE_STORE;
+use client::{TelemetrySettings, telemetry::MINIDUMP_ENDPOINT};
 use futures::AsyncReadExt;
-use gpui::{App, AppContext as _, SemanticVersion};
-use http_client::{self, HttpClient, HttpClientWithUrl, HttpRequestExt, Method};
-use paths::{crashes_dir, crashes_retired_dir};
+use gpui::{App, AppContext as _};
+use http_client::{self, HttpClient, HttpClientWithUrl};
 use project::Project;
 use proto::{CrashReport, GetCrashFilesResponse};
-use release_channel::{AppCommitSha, RELEASE_CHANNEL, ReleaseChannel};
 use reqwest::multipart::{Form, Part};
 use settings::Settings;
 use smol::stream::StreamExt;
-use std::{
-    env,
-    ffi::{OsStr, c_void},
-    fs,
-    io::Write,
-    panic,
-    sync::{
-        Arc,
-        atomic::{AtomicU32, Ordering},
-    },
-    thread,
-};
-use telemetry_events::{LocationData, Panic, PanicRequest};
-use url::Url;
+use std::{ffi::OsStr, fs, sync::Arc};
 use util::ResultExt;
 
-static PANIC_COUNT: AtomicU32 = AtomicU32::new(0);
-
-pub fn init_panic_hook(
-    app_version: SemanticVersion,
-    app_commit_sha: Option<AppCommitSha>,
-    system_id: Option<String>,
-    installation_id: Option<String>,
-    session_id: String,
-) {
-    let is_pty = stdout_is_a_pty();
-
-    panic::set_hook(Box::new(move |info| {
-        let prior_panic_count = PANIC_COUNT.fetch_add(1, Ordering::SeqCst);
-        if prior_panic_count > 0 {
-            // Give the panic-ing thread time to write the panic file
-            loop {
-                thread::yield_now();
-            }
-        }
-
-        let payload = info
-            .payload()
-            .downcast_ref::<&str>()
-            .map(|s| s.to_string())
-            .or_else(|| info.payload().downcast_ref::<String>().cloned())
-            .unwrap_or_else(|| "Box<Any>".to_string());
-
-        if *release_channel::RELEASE_CHANNEL != ReleaseChannel::Dev
-            || env::var("ZED_GENERATE_MINIDUMPS").is_ok()
-        {
-            crashes::handle_panic(payload.clone(), info.location());
-        }
-
-        let thread = thread::current();
-        let thread_name = thread.name().unwrap_or("<unnamed>");
-
-        if *release_channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
-            let location = info.location().unwrap();
-            let backtrace = Backtrace::new();
-            eprintln!(
-                "Thread {:?} panicked with {:?} at {}:{}:{}\n{}{:?}",
-                thread_name,
-                payload,
-                location.file(),
-                location.line(),
-                location.column(),
-                match app_commit_sha.as_ref() {
-                    Some(commit_sha) => format!(
-                        "https://github.com/zed-industries/zed/blob/{}/{}#L{} \
-                        (may not be uploaded, line may be incorrect if files modified)\n",
-                        commit_sha.full(),
-                        location.file(),
-                        location.line()
-                    ),
-                    None => "".to_string(),
-                },
-                backtrace,
-            );
-            if MINIDUMP_ENDPOINT.is_none() {
-                std::process::exit(-1);
-            }
-        }
-        let main_module_base_address = get_main_module_base_address();
-
-        let backtrace = Backtrace::new();
-        let mut symbols = backtrace
-            .frames()
-            .iter()
-            .flat_map(|frame| {
-                let base = frame
-                    .module_base_address()
-                    .unwrap_or(main_module_base_address);
-                frame.symbols().iter().map(move |symbol| {
-                    format!(
-                        "{}+{}",
-                        symbol
-                            .name()
-                            .as_ref()
-                            .map_or("<unknown>".to_owned(), <_>::to_string),
-                        (frame.ip() as isize).saturating_sub(base as isize)
-                    )
-                })
-            })
-            .collect::<Vec<_>>();
-
-        // Strip out leading stack frames for rust panic-handling.
-        if let Some(ix) = symbols
-            .iter()
-            .position(|name| name == "rust_begin_unwind" || name == "_rust_begin_unwind")
-        {
-            symbols.drain(0..=ix);
-        }
-
-        let panic_data = telemetry_events::Panic {
-            thread: thread_name.into(),
-            payload,
-            location_data: info.location().map(|location| LocationData {
-                file: location.file().into(),
-                line: location.line(),
-            }),
-            app_version: app_version.to_string(),
-            app_commit_sha: app_commit_sha.as_ref().map(|sha| sha.full()),
-            release_channel: RELEASE_CHANNEL.dev_name().into(),
-            target: env!("TARGET").to_owned().into(),
-            os_name: telemetry::os_name(),
-            os_version: Some(telemetry::os_version()),
-            architecture: env::consts::ARCH.into(),
-            panicked_on: Utc::now().timestamp_millis(),
-            backtrace: symbols,
-            system_id: system_id.clone(),
-            installation_id: installation_id.clone(),
-            session_id: session_id.clone(),
-        };
-
-        if let Some(panic_data_json) = serde_json::to_string_pretty(&panic_data).log_err() {
-            log::error!("{}", panic_data_json);
-        }
-        zlog::flush();
-
-        if (!is_pty || MINIDUMP_ENDPOINT.is_some())
-            && let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err()
-        {
-            let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
-            let panic_file_path = paths::logs_dir().join(format!("zed-{timestamp}.panic"));
-            let panic_file = fs::OpenOptions::new()
-                .write(true)
-                .create_new(true)
-                .open(&panic_file_path)
-                .log_err();
-            if let Some(mut panic_file) = panic_file {
-                writeln!(&mut panic_file, "{panic_data_json}").log_err();
-                panic_file.flush().log_err();
-            }
-        }
-
-        std::process::abort();
-    }));
-}
-
-#[cfg(not(target_os = "windows"))]
-fn get_main_module_base_address() -> *mut c_void {
-    let mut dl_info = libc::Dl_info {
-        dli_fname: std::ptr::null(),
-        dli_fbase: std::ptr::null_mut(),
-        dli_sname: std::ptr::null(),
-        dli_saddr: std::ptr::null_mut(),
-    };
-    unsafe {
-        libc::dladdr(get_main_module_base_address as _, &mut dl_info);
-    }
-    dl_info.dli_fbase
-}
-
-#[cfg(target_os = "windows")]
-fn get_main_module_base_address() -> *mut c_void {
-    std::ptr::null_mut()
-}
-
-pub fn init(
-    http_client: Arc<HttpClientWithUrl>,
-    system_id: Option<String>,
-    installation_id: Option<String>,
-    session_id: String,
-    cx: &mut App,
-) {
+pub fn init(http_client: Arc<HttpClientWithUrl>, installation_id: Option<String>, cx: &mut App) {
     #[cfg(target_os = "macos")]
     monitor_main_thread_hangs(http_client.clone(), installation_id.clone(), cx);
 
-    let Some(panic_report_url) = http_client
-        .build_zed_api_url("/telemetry/panics", &[])
-        .log_err()
-    else {
-        return;
-    };
-
-    upload_panics_and_crashes(
-        http_client.clone(),
-        panic_report_url.clone(),
-        installation_id.clone(),
-        cx,
-    );
+    if client::TelemetrySettings::get_global(cx).diagnostics {
+        let client = http_client.clone();
+        let id = installation_id.clone();
+        cx.background_spawn(async move {
+            upload_previous_minidumps(client, id).await.warn_on_err();
+        })
+        .detach()
+    }
 
     cx.observe_new(move |project: &mut Project, _, cx| {
         let http_client = http_client.clone();
-        let panic_report_url = panic_report_url.clone();
-        let session_id = session_id.clone();
         let installation_id = installation_id.clone();
-        let system_id = system_id.clone();
 
         let Some(remote_client) = project.remote_client() else {
             return;
@@ -231,19 +37,7 @@ pub fn init(
             }
             let request = client.proto_client().request(proto::GetCrashFiles {});
             cx.background_spawn(async move {
-                let GetCrashFilesResponse {
-                    legacy_panics,
-                    crashes,
-                } = request.await?;
-
-                for panic in legacy_panics {
-                    if let Some(mut panic) = serde_json::from_str::<Panic>(&panic).log_err() {
-                        panic.session_id = session_id.clone();
-                        panic.system_id = system_id.clone();
-                        panic.installation_id = installation_id.clone();
-                        upload_panic(&http_client, &panic_report_url, panic, &mut None).await?;
-                    }
-                }
+                let GetCrashFilesResponse { crashes } = request.await?;
 
                 let Some(endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
                     return Ok(());
@@ -297,6 +91,7 @@ pub fn monitor_main_thread_hangs(
     use parking_lot::Mutex;
 
     use http_client::Method;
+    use release_channel::ReleaseChannel;
     use std::{
         ffi::c_int,
         sync::{OnceLock, mpsc},
@@ -440,7 +235,7 @@ pub fn monitor_main_thread_hangs(
                         app_version: Some(app_version),
                         os_name: os_name.clone(),
                         os_version: Some(os_version.clone()),
-                        architecture: env::consts::ARCH.into(),
+                        architecture: std::env::consts::ARCH.into(),
                         installation_id: installation_id.clone(),
                     };
 
@@ -477,86 +272,6 @@ pub fn monitor_main_thread_hangs(
         .detach()
 }
 
-fn upload_panics_and_crashes(
-    http: Arc<HttpClientWithUrl>,
-    panic_report_url: Url,
-    installation_id: Option<String>,
-    cx: &App,
-) {
-    if !client::TelemetrySettings::get_global(cx).diagnostics {
-        return;
-    }
-    cx.background_spawn(async move {
-        upload_previous_minidumps(http.clone(), installation_id.clone())
-            .await
-            .warn_on_err();
-        let most_recent_panic = upload_previous_panics(http.clone(), &panic_report_url)
-            .await
-            .log_err()
-            .flatten();
-        upload_previous_crashes(http, most_recent_panic, installation_id)
-            .await
-            .log_err();
-    })
-    .detach()
-}
-
-/// Uploads panics via `zed.dev`.
-async fn upload_previous_panics(
-    http: Arc<HttpClientWithUrl>,
-    panic_report_url: &Url,
-) -> anyhow::Result<Option<(i64, String)>> {
-    let mut children = smol::fs::read_dir(paths::logs_dir()).await?;
-
-    let mut most_recent_panic = None;
-
-    while let Some(child) = children.next().await {
-        let child = child?;
-        let child_path = child.path();
-
-        if child_path.extension() != Some(OsStr::new("panic")) {
-            continue;
-        }
-        let filename = if let Some(filename) = child_path.file_name() {
-            filename.to_string_lossy()
-        } else {
-            continue;
-        };
-
-        if !filename.starts_with("zed") {
-            continue;
-        }
-
-        let panic_file_content = smol::fs::read_to_string(&child_path)
-            .await
-            .context("error reading panic file")?;
-
-        let panic: Option<Panic> = serde_json::from_str(&panic_file_content)
-            .log_err()
-            .or_else(|| {
-                panic_file_content
-                    .lines()
-                    .next()
-                    .and_then(|line| serde_json::from_str(line).ok())
-            })
-            .unwrap_or_else(|| {
-                log::error!("failed to deserialize panic file {:?}", panic_file_content);
-                None
-            });
-
-        if let Some(panic) = panic
-            && upload_panic(&http, panic_report_url, panic, &mut most_recent_panic).await?
-        {
-            // We've done what we can, delete the file
-            fs::remove_file(child_path)
-                .context("error removing panic")
-                .log_err();
-        }
-    }
-
-    Ok(most_recent_panic)
-}
-
 pub async fn upload_previous_minidumps(
     http: Arc<HttpClientWithUrl>,
     installation_id: Option<String>,
@@ -728,109 +443,3 @@ impl FormExt for Form {
         }
     }
 }
-
-async fn upload_panic(
-    http: &Arc<HttpClientWithUrl>,
-    panic_report_url: &Url,
-    panic: telemetry_events::Panic,
-    most_recent_panic: &mut Option<(i64, String)>,
-) -> Result<bool> {
-    *most_recent_panic = Some((panic.panicked_on, panic.payload.clone()));
-
-    let json_bytes = serde_json::to_vec(&PanicRequest { panic }).unwrap();
-
-    let Some(checksum) = client::telemetry::calculate_json_checksum(&json_bytes) else {
-        return Ok(false);
-    };
-
-    let Ok(request) = http_client::Request::builder()
-        .method(Method::POST)
-        .uri(panic_report_url.as_ref())
-        .header("x-zed-checksum", checksum)
-        .body(json_bytes.into())
-    else {
-        return Ok(false);
-    };
-
-    let response = http.send(request).await.context("error sending panic")?;
-    if !response.status().is_success() {
-        log::error!("Error uploading panic to server: {}", response.status());
-    }
-
-    Ok(true)
-}
-const LAST_CRASH_UPLOADED: &str = "LAST_CRASH_UPLOADED";
-
-/// upload crashes from apple's diagnostic reports to our server.
-/// (only if telemetry is enabled)
-async fn upload_previous_crashes(
-    http: Arc<HttpClientWithUrl>,
-    most_recent_panic: Option<(i64, String)>,
-    installation_id: Option<String>,
-) -> Result<()> {
-    let last_uploaded = KEY_VALUE_STORE
-        .read_kvp(LAST_CRASH_UPLOADED)?
-        .unwrap_or("zed-2024-01-17-221900.ips".to_string()); // don't upload old crash reports from before we had this.
-    let mut uploaded = last_uploaded.clone();
-
-    let crash_report_url = http.build_zed_api_url("/telemetry/crashes", &[])?;
-
-    // Crash directories are only set on macOS.
-    for dir in [crashes_dir(), crashes_retired_dir()]
-        .iter()
-        .filter_map(|d| d.as_deref())
-    {
-        let mut children = smol::fs::read_dir(&dir).await?;
-        while let Some(child) = children.next().await {
-            let child = child?;
-            let Some(filename) = child
-                .path()
-                .file_name()
-                .map(|f| f.to_string_lossy().to_lowercase())
-            else {
-                continue;
-            };
-
-            if !filename.starts_with("zed-") || !filename.ends_with(".ips") {
-                continue;
-            }
-
-            if filename <= last_uploaded {
-                continue;
-            }
-
-            let body = smol::fs::read_to_string(&child.path())
-                .await
-                .context("error reading crash file")?;
-
-            let mut request = http_client::Request::post(&crash_report_url.to_string())
-                .follow_redirects(http_client::RedirectPolicy::FollowAll)
-                .header("Content-Type", "text/plain");
-
-            if let Some((panicked_on, payload)) = most_recent_panic.as_ref() {
-                request = request
-                    .header("x-zed-panicked-on", format!("{panicked_on}"))
-                    .header("x-zed-panic", payload)
-            }
-            if let Some(installation_id) = installation_id.as_ref() {
-                request = request.header("x-zed-installation-id", installation_id);
-            }
-
-            let request = request.body(body.into())?;
-
-            let response = http.send(request).await.context("error sending crash")?;
-            if !response.status().is_success() {
-                log::error!("Error uploading crash to server: {}", response.status());
-            }
-
-            if uploaded < filename {
-                uploaded.clone_from(&filename);
-                KEY_VALUE_STORE
-                    .write_kvp(LAST_CRASH_UPLOADED.to_string(), filename)
-                    .await?;
-            }
-        }
-    }
-
-    Ok(())
-}

From 46aa05e2403ec436e334d90e8317a4ca728dc661 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@sourcefrog.net>
Date: Thu, 11 Sep 2025 11:22:55 -0700
Subject: [PATCH 792/823] Fix regex syntax in matching os-release (#38010)

From
https://github.com/zed-industries/zed/pull/37712#issuecomment-3281970712,
thank you @zywo

Release Notes:

- N/A
---
 script/linux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/linux b/script/linux
index 47f58c0bc5..5523d87687 100755
--- a/script/linux
+++ b/script/linux
@@ -47,7 +47,7 @@ if [[ -n $apt ]]; then
     musl-dev
     build-essential
   )
-  if (grep -qP 'PRETTY_NAME="((Debian|Raspbian).+13|' /etc/os-release); then
+  if (grep -qP 'PRETTY_NAME="(Debian|Raspbian).+13' /etc/os-release); then
       # libstdc++-14-dev is in build-essential
       deps+=( mold )
   elif (grep -qP 'PRETTY_NAME="(Linux Mint 22|.+24\.(04|10))' /etc/os-release); then

From 3cb3f0140624bf35b2d6e5a09c5016440797fa9f Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Thu, 11 Sep 2025 21:00:51 +0200
Subject: [PATCH 793/823] languages: Pass fs into the init function (#38007)

Release Notes:

- N/A

---------

Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock                                    |  1 +
 crates/eval/src/eval.rs                       |  2 +-
 crates/language/src/language.rs               |  6 ---
 crates/language/src/task_context.rs           |  7 +--
 .../src/extension_lsp_adapter.rs              |  6 +--
 crates/languages/src/css.rs                   |  4 +-
 crates/languages/src/go.rs                    | 10 +---
 crates/languages/src/json.rs                  |  5 +-
 crates/languages/src/lib.rs                   | 12 +++--
 crates/languages/src/python.rs                |  7 +--
 crates/languages/src/rust.rs                  |  2 -
 crates/languages/src/tailwind.rs              |  4 +-
 crates/languages/src/typescript.rs            | 32 ++++++-----
 crates/languages/src/vtsls.rs                 | 13 ++---
 crates/languages/src/yaml.rs                  |  4 +-
 crates/markdown/Cargo.toml                    |  1 +
 crates/markdown/examples/markdown.rs          |  3 +-
 crates/markdown/examples/markdown_as_child.rs |  3 +-
 crates/project/src/lsp_store.rs               | 54 ++++---------------
 crates/project/src/project.rs                 |  5 --
 crates/project/src/task_inventory.rs          | 28 +++-------
 crates/project/src/task_store.rs              |  6 +--
 crates/remote_server/src/headless_project.rs  |  3 +-
 crates/zed/src/main.rs                        |  2 +-
 crates/zed/src/zed.rs                         |  3 +-
 crates/zeta_cli/src/headless.rs               |  2 +-
 26 files changed, 75 insertions(+), 150 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6afd973460..a1a747adeb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9945,6 +9945,7 @@ dependencies = [
  "assets",
  "base64 0.22.1",
  "env_logger 0.11.8",
+ "fs",
  "futures 0.3.31",
  "gpui",
  "language",
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index 9e0504abca..32399e26c0 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -419,7 +419,7 @@ pub fn init(cx: &mut App) -> Arc<AgentAppState> {
     language_extension::init(LspAccess::Noop, extension_host_proxy, languages.clone());
     language_model::init(client.clone(), cx);
     language_models::init(user_store.clone(), client.clone(), cx);
-    languages::init(languages.clone(), node_runtime.clone(), cx);
+    languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
     prompt_store::init(cx);
     terminal_view::init(cx);
     let stdout_is_a_pty = false;
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 256f6d4573..aa07524ea9 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -27,7 +27,6 @@ use crate::language_settings::SoftWrap;
 use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use collections::{HashMap, HashSet, IndexSet};
-use fs::Fs;
 use futures::Future;
 use gpui::{App, AsyncApp, Entity, SharedString, Task};
 pub use highlight_map::HighlightMap;
@@ -511,7 +510,6 @@ pub trait LspAdapter: 'static + Send + Sync {
     /// Returns initialization options that are going to be sent to a LSP server as a part of [`lsp::InitializeParams`]
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<Value>> {
         Ok(None)
@@ -519,7 +517,6 @@ pub trait LspAdapter: 'static + Send + Sync {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         _cx: &mut AsyncApp,
@@ -530,7 +527,6 @@ pub trait LspAdapter: 'static + Send + Sync {
     async fn additional_initialization_options(
         self: Arc<Self>,
         _target_language_server_id: LanguageServerName,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<Value>> {
         Ok(None)
@@ -539,7 +535,6 @@ pub trait LspAdapter: 'static + Send + Sync {
     async fn additional_workspace_configuration(
         self: Arc<Self>,
         _target_language_server_id: LanguageServerName,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
         _cx: &mut AsyncApp,
     ) -> Result<Option<Value>> {
@@ -2261,7 +2256,6 @@ impl LspAdapter for FakeLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<Value>> {
         Ok(self.initialization_options.clone())
diff --git a/crates/language/src/task_context.rs b/crates/language/src/task_context.rs
index 5bede45cdb..b8cc6d13ff 100644
--- a/crates/language/src/task_context.rs
+++ b/crates/language/src/task_context.rs
@@ -37,12 +37,7 @@ pub trait ContextProvider: Send + Sync {
     }
 
     /// Provides all tasks, associated with the current language.
-    fn associated_tasks(
-        &self,
-        _: Arc<dyn Fs>,
-        _: Option<Arc<dyn File>>,
-        _: &App,
-    ) -> Task<Option<TaskTemplates>> {
+    fn associated_tasks(&self, _: Option<Arc<dyn File>>, _: &App) -> Task<Option<TaskTemplates>> {
         Task::ready(None)
     }
 
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index c1bc058a34..318f5e62d8 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -8,7 +8,6 @@ use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use collections::{HashMap, HashSet};
 use extension::{Extension, ExtensionLanguageServerProxy, WorktreeDelegate};
-use fs::Fs;
 use futures::{Future, FutureExt, future::join_all};
 use gpui::{App, AppContext, AsyncApp, Task};
 use language::{
@@ -264,7 +263,6 @@ impl LspAdapter for ExtensionLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
@@ -287,7 +285,6 @@ impl LspAdapter for ExtensionLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         _cx: &mut AsyncApp,
@@ -309,7 +306,6 @@ impl LspAdapter for ExtensionLspAdapter {
     async fn additional_initialization_options(
         self: Arc<Self>,
         target_language_server_id: LanguageServerName,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
@@ -335,7 +331,7 @@ impl LspAdapter for ExtensionLspAdapter {
     async fn additional_workspace_configuration(
         self: Arc<Self>,
         target_language_server_id: LanguageServerName,
-        _: &dyn Fs,
+
         delegate: &Arc<dyn LspAdapterDelegate>,
 
         _cx: &mut AsyncApp,
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index 79e3a62a34..37955b31c5 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -5,7 +5,7 @@ use gpui::AsyncApp;
 use language::{LspAdapter, LspAdapterDelegate, Toolchain};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
-use project::{Fs, lsp_store::language_server_settings};
+use project::lsp_store::language_server_settings;
 use serde_json::json;
 use smol::fs;
 use std::{
@@ -133,7 +133,6 @@ impl LspAdapter for CssLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         Ok(Some(json!({
@@ -143,7 +142,6 @@ impl LspAdapter for CssLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index 55441c33b8..ff98f7bc86 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -6,7 +6,7 @@ use gpui::{App, AsyncApp, Task};
 use http_client::github::latest_github_release;
 pub use language::*;
 use lsp::{LanguageServerBinary, LanguageServerName};
-use project::Fs;
+
 use regex::Regex;
 use serde_json::json;
 use smol::fs;
@@ -200,7 +200,6 @@ impl super::LspAdapter for GoLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         Ok(Some(json!({
@@ -568,12 +567,7 @@ impl ContextProvider for GoContextProvider {
         )))
     }
 
-    fn associated_tasks(
-        &self,
-        _: Arc<dyn Fs>,
-        _: Option<Arc<dyn File>>,
-        _: &App,
-    ) -> Task<Option<TaskTemplates>> {
+    fn associated_tasks(&self, _: Option<Arc<dyn File>>, _: &App) -> Task<Option<TaskTemplates>> {
         let package_cwd = if GO_PACKAGE_TASK_VARIABLE.template_value() == "." {
             None
         } else {
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index a33f5c9836..0d5d21de0b 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -13,7 +13,7 @@ use language::{
 };
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
-use project::{Fs, lsp_store::language_server_settings};
+use project::lsp_store::language_server_settings;
 use serde_json::{Value, json};
 use settings::{KeymapFile, SettingsJsonSchemaParams, SettingsStore};
 use smol::{
@@ -46,7 +46,6 @@ pub(crate) struct JsonTaskProvider;
 impl ContextProvider for JsonTaskProvider {
     fn associated_tasks(
         &self,
-        _: Arc<dyn Fs>,
         file: Option<Arc<dyn language::File>>,
         cx: &App,
     ) -> gpui::Task<Option<TaskTemplates>> {
@@ -393,7 +392,6 @@ impl LspAdapter for JsonLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         Ok(Some(json!({
@@ -403,7 +401,6 @@ impl LspAdapter for JsonLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 95fe131218..8dd2a6b9fd 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -1,6 +1,7 @@
 use anyhow::Context as _;
 use gpui::{App, SharedString, UpdateGlobal};
 use node_runtime::NodeRuntime;
+use project::Fs;
 use python::PyprojectTomlManifestProvider;
 use rust::CargoManifestProvider;
 use rust_embed::RustEmbed;
@@ -53,7 +54,7 @@ pub static LANGUAGE_GIT_COMMIT: std::sync::LazyLock<Arc<Language>> =
         ))
     });
 
-pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
+pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime, cx: &mut App) {
     #[cfg(feature = "load-grammars")]
     languages.register_native_grammars([
         ("bash", tree_sitter_bash::LANGUAGE),
@@ -94,9 +95,12 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
     let rust_context_provider = Arc::new(rust::RustContextProvider);
     let rust_lsp_adapter = Arc::new(rust::RustLspAdapter);
     let tailwind_adapter = Arc::new(tailwind::TailwindLspAdapter::new(node.clone()));
-    let typescript_context = Arc::new(typescript::TypeScriptContextProvider::new());
-    let typescript_lsp_adapter = Arc::new(typescript::TypeScriptLspAdapter::new(node.clone()));
-    let vtsls_adapter = Arc::new(vtsls::VtslsLspAdapter::new(node.clone()));
+    let typescript_context = Arc::new(typescript::TypeScriptContextProvider::new(fs.clone()));
+    let typescript_lsp_adapter = Arc::new(typescript::TypeScriptLspAdapter::new(
+        node.clone(),
+        fs.clone(),
+    ));
+    let vtsls_adapter = Arc::new(vtsls::VtslsLspAdapter::new(node.clone(), fs.clone()));
     let yaml_lsp_adapter = Arc::new(yaml::YamlLspAdapter::new(node));
 
     let built_in_languages = [
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index f5ce2cee5e..c8738a7000 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -119,7 +119,6 @@ impl LspAdapter for PythonLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<Value>> {
         // Provide minimal initialization options
@@ -324,7 +323,7 @@ impl LspAdapter for PythonLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
+
         adapter: &Arc<dyn LspAdapterDelegate>,
         toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
@@ -471,7 +470,6 @@ impl ContextProvider for PythonContextProvider {
 
     fn associated_tasks(
         &self,
-        _: Arc<dyn Fs>,
         file: Option<Arc<dyn language::File>>,
         cx: &App,
     ) -> Task<Option<TaskTemplates>> {
@@ -1270,7 +1268,6 @@ impl LspAdapter for PyLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         adapter: &Arc<dyn LspAdapterDelegate>,
         toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
@@ -1405,7 +1402,6 @@ impl LspAdapter for BasedPyrightLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<Value>> {
         // Provide minimal initialization options
@@ -1576,7 +1572,6 @@ impl LspAdapter for BasedPyrightLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         adapter: &Arc<dyn LspAdapterDelegate>,
         toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index 3d5ff1cd06..ce73c70c0c 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -7,7 +7,6 @@ use http_client::github::AssetKind;
 use http_client::github::{GitHubLspBinaryVersion, latest_github_release};
 pub use language::*;
 use lsp::{InitializeParams, LanguageServerBinary};
-use project::Fs;
 use project::lsp_store::rust_analyzer_ext::CARGO_DIAGNOSTICS_SOURCE_NAME;
 use project::project_settings::ProjectSettings;
 use regex::Regex;
@@ -632,7 +631,6 @@ impl ContextProvider for RustContextProvider {
 
     fn associated_tasks(
         &self,
-        _: Arc<dyn Fs>,
         file: Option<Arc<dyn language::File>>,
         cx: &App,
     ) -> Task<Option<TaskTemplates>> {
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index af7653ea9e..1d8b3db212 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -6,7 +6,7 @@ use gpui::AsyncApp;
 use language::{LanguageName, LspAdapter, LspAdapterDelegate, Toolchain};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
-use project::{Fs, lsp_store::language_server_settings};
+use project::lsp_store::language_server_settings;
 use serde_json::{Value, json};
 use smol::fs;
 use std::{
@@ -138,7 +138,6 @@ impl LspAdapter for TailwindLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         Ok(Some(json!({
@@ -154,7 +153,6 @@ impl LspAdapter for TailwindLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index d8f18f5f04..8f9d362c0d 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -27,8 +27,8 @@ use util::{ResultExt, fs::remove_matching, maybe};
 
 use crate::{PackageJson, PackageJsonData, github_download::download_server_binary};
 
-#[derive(Debug)]
 pub(crate) struct TypeScriptContextProvider {
+    fs: Arc<dyn Fs>,
     last_package_json: PackageJsonContents,
 }
 
@@ -253,8 +253,9 @@ impl PackageJsonData {
 }
 
 impl TypeScriptContextProvider {
-    pub fn new() -> Self {
+    pub fn new(fs: Arc<dyn Fs>) -> Self {
         Self {
+            fs,
             last_package_json: PackageJsonContents::default(),
         }
     }
@@ -358,7 +359,6 @@ async fn detect_package_manager(
 impl ContextProvider for TypeScriptContextProvider {
     fn associated_tasks(
         &self,
-        fs: Arc<dyn Fs>,
         file: Option<Arc<dyn File>>,
         cx: &App,
     ) -> Task<Option<TaskTemplates>> {
@@ -369,8 +369,12 @@ impl ContextProvider for TypeScriptContextProvider {
             return Task::ready(None);
         };
         let file_relative_path = file.path().clone();
-        let package_json_data =
-            self.combined_package_json_data(fs.clone(), &worktree_root, &file_relative_path, cx);
+        let package_json_data = self.combined_package_json_data(
+            self.fs.clone(),
+            &worktree_root,
+            &file_relative_path,
+            cx,
+        );
 
         cx.background_spawn(async move {
             let mut task_templates = TaskTemplates(Vec::new());
@@ -514,6 +518,7 @@ fn replace_test_name_parameters(test_name: &str) -> String {
 }
 
 pub struct TypeScriptLspAdapter {
+    fs: Arc<dyn Fs>,
     node: NodeRuntime,
 }
 
@@ -523,10 +528,10 @@ impl TypeScriptLspAdapter {
     const SERVER_NAME: LanguageServerName =
         LanguageServerName::new_static("typescript-language-server");
     const PACKAGE_NAME: &str = "typescript";
-    pub fn new(node: NodeRuntime) -> Self {
-        TypeScriptLspAdapter { node }
+    pub fn new(node: NodeRuntime, fs: Arc<dyn Fs>) -> Self {
+        TypeScriptLspAdapter { fs, node }
     }
-    async fn tsdk_path(fs: &dyn Fs, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
+    async fn tsdk_path(&self, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
         let is_yarn = adapter
             .read_text_file(PathBuf::from(".yarn/sdks/typescript/lib/typescript.js"))
             .await
@@ -538,7 +543,8 @@ impl TypeScriptLspAdapter {
             "node_modules/typescript/lib"
         };
 
-        if fs
+        if self
+            .fs
             .is_dir(&adapter.worktree_root_path().join(tsdk_path))
             .await
         {
@@ -696,10 +702,9 @@ impl LspAdapter for TypeScriptLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        fs: &dyn Fs,
         adapter: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
-        let tsdk_path = Self::tsdk_path(fs, adapter).await;
+        let tsdk_path = self.tsdk_path(adapter).await;
         Ok(Some(json!({
             "provideFormatter": true,
             "hostInfo": "zed",
@@ -721,7 +726,7 @@ impl LspAdapter for TypeScriptLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
+
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
@@ -821,7 +826,6 @@ impl LspAdapter for EsLintLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
@@ -1145,7 +1149,7 @@ mod tests {
         )
         .await;
 
-        let provider = TypeScriptContextProvider::new();
+        let provider = TypeScriptContextProvider::new(fs.clone());
         let package_json_data = cx
             .update(|cx| {
                 provider.combined_package_json_data(
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 1cf3c8aa52..32554fe651 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -21,6 +21,7 @@ fn typescript_server_binary_arguments(server_path: &Path) -> Vec<OsString> {
 
 pub struct VtslsLspAdapter {
     node: NodeRuntime,
+    fs: Arc<dyn Fs>,
 }
 
 impl VtslsLspAdapter {
@@ -30,11 +31,11 @@ impl VtslsLspAdapter {
     const TYPESCRIPT_PACKAGE_NAME: &'static str = "typescript";
     const TYPESCRIPT_TSDK_PATH: &'static str = "node_modules/typescript/lib";
 
-    pub fn new(node: NodeRuntime) -> Self {
-        VtslsLspAdapter { node }
+    pub fn new(node: NodeRuntime, fs: Arc<dyn Fs>) -> Self {
+        VtslsLspAdapter { node, fs }
     }
 
-    async fn tsdk_path(fs: &dyn Fs, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
+    async fn tsdk_path(&self, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
         let is_yarn = adapter
             .read_text_file(PathBuf::from(".yarn/sdks/typescript/lib/typescript.js"))
             .await
@@ -46,7 +47,8 @@ impl VtslsLspAdapter {
             Self::TYPESCRIPT_TSDK_PATH
         };
 
-        if fs
+        if self
+            .fs
             .is_dir(&adapter.worktree_root_path().join(tsdk_path))
             .await
         {
@@ -210,12 +212,11 @@ impl LspAdapter for VtslsLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        fs: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<Value> {
-        let tsdk_path = Self::tsdk_path(fs, delegate).await;
+        let tsdk_path = self.tsdk_path(delegate).await;
         let config = serde_json::json!({
             "tsdk": tsdk_path,
             "suggest": {
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index bf634aafba..39c30a3714 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -5,7 +5,7 @@ use gpui::AsyncApp;
 use language::{LspAdapter, LspAdapterDelegate, Toolchain, language_settings::AllLanguageSettings};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
-use project::{Fs, lsp_store::language_server_settings};
+use project::lsp_store::language_server_settings;
 use serde_json::Value;
 use settings::{Settings, SettingsLocation};
 use smol::fs;
@@ -132,7 +132,7 @@ impl LspAdapter for YamlLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &dyn Fs,
+
         delegate: &Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         cx: &mut AsyncApp,
diff --git a/crates/markdown/Cargo.toml b/crates/markdown/Cargo.toml
index b278ef1cd4..9dfb3fdcd6 100644
--- a/crates/markdown/Cargo.toml
+++ b/crates/markdown/Cargo.toml
@@ -35,6 +35,7 @@ workspace-hack.workspace = true
 [dev-dependencies]
 assets.workspace = true
 env_logger.workspace = true
+fs = {workspace = true, features = ["test-support"]}
 gpui = { workspace = true, features = ["test-support"] }
 languages = { workspace = true, features = ["load-grammars"] }
 node_runtime.workspace = true
diff --git a/crates/markdown/examples/markdown.rs b/crates/markdown/examples/markdown.rs
index c651c7921d..c019bad1d0 100644
--- a/crates/markdown/examples/markdown.rs
+++ b/crates/markdown/examples/markdown.rs
@@ -47,10 +47,11 @@ pub fn main() {
         let node_runtime = NodeRuntime::unavailable();
         theme::init(LoadThemes::JustBase, cx);
 
+        let fs = fs::FakeFs::new(cx.background_executor().clone());
         let language_registry = LanguageRegistry::new(cx.background_executor().clone());
         language_registry.set_theme(cx.theme().clone());
         let language_registry = Arc::new(language_registry);
-        languages::init(language_registry.clone(), node_runtime, cx);
+        languages::init(language_registry.clone(), fs, node_runtime, cx);
         Assets.load_fonts(cx).unwrap();
 
         cx.activate(true);
diff --git a/crates/markdown/examples/markdown_as_child.rs b/crates/markdown/examples/markdown_as_child.rs
index 16c198601a..6c0960c88b 100644
--- a/crates/markdown/examples/markdown_as_child.rs
+++ b/crates/markdown/examples/markdown_as_child.rs
@@ -30,7 +30,8 @@ pub fn main() {
 
         let node_runtime = NodeRuntime::unavailable();
         let language_registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-        languages::init(language_registry, node_runtime, cx);
+        let fs = fs::FakeFs::new(cx.background_executor().clone());
+        languages::init(language_registry, fs, node_runtime, cx);
         theme::init(LoadThemes::JustBase, cx);
         Assets.load_fonts(cx).unwrap();
 
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index 1ba5dc4f90..e719c9e4fb 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -361,7 +361,7 @@ impl LocalLspStore {
             let adapter = adapter.clone();
             let lsp_store = self.weak.clone();
             let pending_workspace_folders = pending_workspace_folders.clone();
-            let fs = self.fs.clone();
+
             let pull_diagnostics = ProjectSettings::get_global(cx)
                 .diagnostics
                 .lsp_pull_diagnostics
@@ -372,7 +372,6 @@ impl LocalLspStore {
 
                     let workspace_config = Self::workspace_configuration_for_adapter(
                         adapter.adapter.clone(),
-                        fs.as_ref(),
                         &delegate,
                         toolchain,
                         cx,
@@ -381,7 +380,6 @@ impl LocalLspStore {
 
                     let mut initialization_options = Self::initialization_options_for_adapter(
                         adapter.adapter.clone(),
-                        fs.as_ref(),
                         &delegate,
                     )
                     .await?;
@@ -403,7 +401,6 @@ impl LocalLspStore {
 
                     Self::setup_lsp_messages(
                         lsp_store.clone(),
-                        fs,
                         &language_server,
                         delegate.clone(),
                         adapter.clone(),
@@ -568,7 +565,7 @@ impl LocalLspStore {
 
     fn setup_lsp_messages(
         this: WeakEntity<LspStore>,
-        fs: Arc<dyn Fs>,
+
         language_server: &LanguageServer,
         delegate: Arc<dyn LspAdapterDelegate>,
         adapter: Arc<CachedLspAdapter>,
@@ -623,12 +620,11 @@ impl LocalLspStore {
                 let adapter = adapter.adapter.clone();
                 let delegate = delegate.clone();
                 let this = this.clone();
-                let fs = fs.clone();
+
                 move |params, cx| {
                     let adapter = adapter.clone();
                     let delegate = delegate.clone();
                     let this = this.clone();
-                    let fs = fs.clone();
                     let mut cx = cx.clone();
                     async move {
                         let toolchain_for_id = this
@@ -642,7 +638,6 @@ impl LocalLspStore {
                             .context("Expected the LSP store to be in a local mode")?;
                         let workspace_config = Self::workspace_configuration_for_adapter(
                             adapter.clone(),
-                            fs.as_ref(),
                             &delegate,
                             toolchain_for_id,
                             &mut cx,
@@ -3370,11 +3365,10 @@ impl LocalLspStore {
 
     async fn initialization_options_for_adapter(
         adapter: Arc<dyn LspAdapter>,
-        fs: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         let Some(mut initialization_config) =
-            adapter.clone().initialization_options(fs, delegate).await?
+            adapter.clone().initialization_options(delegate).await?
         else {
             return Ok(None);
         };
@@ -3385,7 +3379,7 @@ impl LocalLspStore {
             }
             if let Ok(Some(target_config)) = other_adapter
                 .clone()
-                .additional_initialization_options(adapter.name(), fs, delegate)
+                .additional_initialization_options(adapter.name(), delegate)
                 .await
             {
                 merge_json_value_into(target_config.clone(), &mut initialization_config);
@@ -3395,20 +3389,15 @@ impl LocalLspStore {
         Ok(Some(initialization_config))
     }
 
-    fn toolchain_store(&self) -> &Entity<LocalToolchainStore> {
-        &self.toolchain_store
-    }
-
     async fn workspace_configuration_for_adapter(
         adapter: Arc<dyn LspAdapter>,
-        fs: &dyn Fs,
         delegate: &Arc<dyn LspAdapterDelegate>,
         toolchain: Option<Toolchain>,
         cx: &mut AsyncApp,
     ) -> Result<serde_json::Value> {
         let mut workspace_config = adapter
             .clone()
-            .workspace_configuration(fs, delegate, toolchain, cx)
+            .workspace_configuration(delegate, toolchain, cx)
             .await?;
 
         for other_adapter in delegate.registered_lsp_adapters() {
@@ -3417,7 +3406,7 @@ impl LocalLspStore {
             }
             if let Ok(Some(target_config)) = other_adapter
                 .clone()
-                .additional_workspace_configuration(adapter.name(), fs, delegate, cx)
+                .additional_workspace_configuration(adapter.name(), delegate, cx)
                 .await
             {
                 merge_json_value_into(target_config.clone(), &mut workspace_config);
@@ -3705,10 +3694,7 @@ impl LspStore {
 
         let _maintain_workspace_config = {
             let (sender, receiver) = watch::channel();
-            (
-                Self::maintain_workspace_config(fs.clone(), receiver, cx),
-                sender,
-            )
+            (Self::maintain_workspace_config(receiver, cx), sender)
         };
 
         Self {
@@ -3795,7 +3781,6 @@ impl LspStore {
         languages: Arc<LanguageRegistry>,
         upstream_client: AnyProtoClient,
         project_id: u64,
-        fs: Arc<dyn Fs>,
         cx: &mut Context<Self>,
     ) -> Self {
         cx.subscribe(&buffer_store, Self::on_buffer_store_event)
@@ -3805,7 +3790,7 @@ impl LspStore {
         subscribe_to_binary_statuses(&languages, cx).detach();
         let _maintain_workspace_config = {
             let (sender, receiver) = watch::channel();
-            (Self::maintain_workspace_config(fs, receiver, cx), sender)
+            (Self::maintain_workspace_config(receiver, cx), sender)
         };
         Self {
             mode: LspStoreMode::Remote(RemoteLspStore {
@@ -4045,19 +4030,11 @@ impl LspStore {
                 return;
             };
 
-            let Ok(Some((fs, _))) = this.read_with(cx, |this, _| {
-                let local = this.as_local()?;
-                let toolchain_store = local.toolchain_store().clone();
-                Some((local.fs.clone(), toolchain_store))
-            }) else {
-                return;
-            };
             for (adapter, server, delegate) in servers {
                 adapter.clear_zed_json_schema_cache().await;
 
                 let Some(json_workspace_config) = LocalLspStore::workspace_configuration_for_adapter(
                         adapter,
-                        fs.as_ref(),
                         &delegate,
                         None,
                         cx,
@@ -7358,11 +7335,7 @@ impl LspStore {
         None
     }
 
-    async fn refresh_workspace_configurations(
-        lsp_store: &WeakEntity<Self>,
-        fs: Arc<dyn Fs>,
-        cx: &mut AsyncApp,
-    ) {
+    async fn refresh_workspace_configurations(lsp_store: &WeakEntity<Self>, cx: &mut AsyncApp) {
         maybe!(async move {
             let mut refreshed_servers = HashSet::default();
             let servers = lsp_store
@@ -7398,8 +7371,6 @@ impl LspStore {
                                 LanguageServerState::Running {
                                     adapter, server, ..
                                 } => {
-                                    let fs = fs.clone();
-
                                     let adapter = adapter.clone();
                                     let server = server.clone();
                                     refreshed_servers.insert(server.name());
@@ -7408,7 +7379,6 @@ impl LspStore {
                                         let settings =
                                             LocalLspStore::workspace_configuration_for_adapter(
                                                 adapter.adapter.clone(),
-                                                fs.as_ref(),
                                                 &delegate,
                                                 toolchain,
                                                 cx,
@@ -7445,7 +7415,6 @@ impl LspStore {
     }
 
     fn maintain_workspace_config(
-        fs: Arc<dyn Fs>,
         external_refresh_requests: watch::Receiver<()>,
         cx: &mut Context<Self>,
     ) -> Task<Result<()>> {
@@ -7471,7 +7440,7 @@ impl LspStore {
                 })
                 .ok();
 
-                Self::refresh_workspace_configurations(&this, fs.clone(), cx).await;
+                Self::refresh_workspace_configurations(&this, cx).await;
             }
 
             drop(settings_observation);
@@ -12618,7 +12587,6 @@ impl LspAdapter for SshLspAdapter {
 
     async fn initialization_options(
         self: Arc<Self>,
-        _: &dyn Fs,
         _: &Arc<dyn LspAdapterDelegate>,
     ) -> Result<Option<serde_json::Value>> {
         let Some(options) = &self.initialization_options else {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 1ef3de7a16..b39e84e7c0 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1132,7 +1132,6 @@ impl Project {
 
             let task_store = cx.new(|cx| {
                 TaskStore::local(
-                    fs.clone(),
                     buffer_store.downgrade(),
                     worktree_store.clone(),
                     toolchain_store.read(cx).as_language_toolchain_store(),
@@ -1290,7 +1289,6 @@ impl Project {
             });
             let task_store = cx.new(|cx| {
                 TaskStore::remote(
-                    fs.clone(),
                     buffer_store.downgrade(),
                     worktree_store.clone(),
                     toolchain_store.read(cx).as_language_toolchain_store(),
@@ -1321,7 +1319,6 @@ impl Project {
                     languages.clone(),
                     remote_proto.clone(),
                     REMOTE_SERVER_PROJECT_ID,
-                    fs.clone(),
                     cx,
                 )
             });
@@ -1540,7 +1537,6 @@ impl Project {
                 languages.clone(),
                 client.clone().into(),
                 remote_id,
-                fs.clone(),
                 cx,
             )
         })?;
@@ -1548,7 +1544,6 @@ impl Project {
         let task_store = cx.new(|cx| {
             if run_tasks {
                 TaskStore::remote(
-                    fs.clone(),
                     buffer_store.downgrade(),
                     worktree_store.clone(),
                     Arc::new(EmptyToolchainStore),
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
index 20dce218f4..818a5c58cf 100644
--- a/crates/project/src/task_inventory.rs
+++ b/crates/project/src/task_inventory.rs
@@ -11,7 +11,6 @@ use std::{
 use anyhow::Result;
 use collections::{HashMap, HashSet, VecDeque};
 use dap::DapRegistry;
-use fs::Fs;
 use gpui::{App, AppContext as _, Context, Entity, SharedString, Task, WeakEntity};
 use itertools::Itertools;
 use language::{
@@ -40,7 +39,6 @@ pub struct DebugScenarioContext {
 
 /// Inventory tracks available tasks for a given project.
 pub struct Inventory {
-    fs: Arc<dyn Fs>,
     last_scheduled_tasks: VecDeque<(TaskSourceKind, ResolvedTask)>,
     last_scheduled_scenarios: VecDeque<(DebugScenario, DebugScenarioContext)>,
     templates_from_settings: InventoryFor<TaskTemplate>,
@@ -242,9 +240,8 @@ impl TaskSourceKind {
 }
 
 impl Inventory {
-    pub fn new(fs: Arc<dyn Fs>, cx: &mut App) -> Entity<Self> {
+    pub fn new(cx: &mut App) -> Entity<Self> {
         cx.new(|_| Self {
-            fs,
             last_scheduled_tasks: VecDeque::default(),
             last_scheduled_scenarios: VecDeque::default(),
             templates_from_settings: InventoryFor::default(),
@@ -387,7 +384,6 @@ impl Inventory {
         cx: &App,
     ) -> Task<Vec<(TaskSourceKind, TaskTemplate)>> {
         let global_tasks = self.global_templates_from_settings().collect::<Vec<_>>();
-        let fs = self.fs.clone();
         let mut worktree_tasks = worktree
             .into_iter()
             .flat_map(|worktree| self.worktree_templates_from_settings(worktree))
@@ -404,7 +400,7 @@ impl Inventory {
             .and_then(|language| {
                 language
                     .context_provider()
-                    .map(|provider| provider.associated_tasks(fs, file, cx))
+                    .map(|provider| provider.associated_tasks(file, cx))
             });
         cx.background_spawn(async move {
             if let Some(t) = language_tasks {
@@ -432,7 +428,6 @@ impl Inventory {
         Vec<(TaskSourceKind, ResolvedTask)>,
         Vec<(TaskSourceKind, ResolvedTask)>,
     )> {
-        let fs = self.fs.clone();
         let worktree = task_contexts.worktree();
         let location = task_contexts.location();
         let language = location.and_then(|location| location.buffer.read(cx).language());
@@ -489,7 +484,7 @@ impl Inventory {
             .and_then(|language| {
                 language
                     .context_provider()
-                    .map(|provider| provider.associated_tasks(fs, file, cx))
+                    .map(|provider| provider.associated_tasks(file, cx))
             });
         let worktree_tasks = worktree
             .into_iter()
@@ -1088,19 +1083,13 @@ impl ContextProviderWithTasks {
 }
 
 impl ContextProvider for ContextProviderWithTasks {
-    fn associated_tasks(
-        &self,
-        _: Arc<dyn Fs>,
-        _: Option<Arc<dyn File>>,
-        _: &App,
-    ) -> Task<Option<TaskTemplates>> {
+    fn associated_tasks(&self, _: Option<Arc<dyn File>>, _: &App) -> Task<Option<TaskTemplates>> {
         Task::ready(Some(self.templates.clone()))
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use fs::FakeFs;
     use gpui::TestAppContext;
     use paths::tasks_file;
     use pretty_assertions::assert_eq;
@@ -1115,8 +1104,7 @@ mod tests {
     #[gpui::test]
     async fn test_task_list_sorting(cx: &mut TestAppContext) {
         init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let inventory = cx.update(|cx| Inventory::new(fs, cx));
+        let inventory = cx.update(|cx| Inventory::new(cx));
         let initial_tasks = resolved_task_names(&inventory, None, cx).await;
         assert!(
             initial_tasks.is_empty(),
@@ -1296,8 +1284,7 @@ mod tests {
     #[gpui::test]
     async fn test_reloading_debug_scenarios(cx: &mut TestAppContext) {
         init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let inventory = cx.update(|cx| Inventory::new(fs, cx));
+        let inventory = cx.update(|cx| Inventory::new(cx));
         inventory.update(cx, |inventory, _| {
             inventory
                 .update_file_based_scenarios(
@@ -1406,8 +1393,7 @@ mod tests {
     #[gpui::test]
     async fn test_inventory_static_task_filters(cx: &mut TestAppContext) {
         init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let inventory = cx.update(|cx| Inventory::new(fs, cx));
+        let inventory = cx.update(|cx| Inventory::new(cx));
         let common_name = "common_task_name";
         let worktree_1 = WorktreeId::from_usize(1);
         let worktree_2 = WorktreeId::from_usize(2);
diff --git a/crates/project/src/task_store.rs b/crates/project/src/task_store.rs
index ae49ce5b4d..6a62209b54 100644
--- a/crates/project/src/task_store.rs
+++ b/crates/project/src/task_store.rs
@@ -159,7 +159,6 @@ impl TaskStore {
     }
 
     pub fn local(
-        fs: Arc<dyn Fs>,
         buffer_store: WeakEntity<BufferStore>,
         worktree_store: Entity<WorktreeStore>,
         toolchain_store: Arc<dyn LanguageToolchainStore>,
@@ -171,7 +170,7 @@ impl TaskStore {
                 downstream_client: None,
                 environment,
             },
-            task_inventory: Inventory::new(fs, cx),
+            task_inventory: Inventory::new(cx),
             buffer_store,
             toolchain_store,
             worktree_store,
@@ -179,7 +178,6 @@ impl TaskStore {
     }
 
     pub fn remote(
-        fs: Arc<dyn Fs>,
         buffer_store: WeakEntity<BufferStore>,
         worktree_store: Entity<WorktreeStore>,
         toolchain_store: Arc<dyn LanguageToolchainStore>,
@@ -192,7 +190,7 @@ impl TaskStore {
                 upstream_client,
                 project_id,
             },
-            task_inventory: Inventory::new(fs, cx),
+            task_inventory: Inventory::new(cx),
             buffer_store,
             toolchain_store,
             worktree_store,
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index bdfd46002e..f107ff2c8f 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -85,7 +85,7 @@ impl HeadlessProject {
         cx: &mut Context<Self>,
     ) -> Self {
         debug_adapter_extension::init(proxy.clone(), cx);
-        languages::init(languages.clone(), node_runtime.clone(), cx);
+        languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
 
         let worktree_store = cx.new(|cx| {
             let mut store = WorktreeStore::local(true, fs.clone());
@@ -153,7 +153,6 @@ impl HeadlessProject {
 
         let task_store = cx.new(|cx| {
             let mut task_store = TaskStore::local(
-                fs.clone(),
                 buffer_store.downgrade(),
                 worktree_store.clone(),
                 toolchain_store.read(cx).as_language_toolchain_store(),
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index b5dbbba865..63ee30043b 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -460,7 +460,7 @@ pub fn main() {
 
         debug_adapter_extension::init(extension_host_proxy.clone(), cx);
         language::init(cx);
-        languages::init(languages.clone(), node_runtime.clone(), cx);
+        languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
         let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 0041bba6d0..49a803e1ee 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -4589,6 +4589,7 @@ mod tests {
 
     #[gpui::test]
     async fn test_bundled_languages(cx: &mut TestAppContext) {
+        let fs = fs::FakeFs::new(cx.background_executor.clone());
         env_logger::builder().is_test(true).try_init().ok();
         let settings = cx.update(SettingsStore::test);
         cx.set_global(settings);
@@ -4596,7 +4597,7 @@ mod tests {
         let languages = Arc::new(languages);
         let node_runtime = node_runtime::NodeRuntime::unavailable();
         cx.update(|cx| {
-            languages::init(languages.clone(), node_runtime, cx);
+            languages::init(languages.clone(), fs, node_runtime, cx);
         });
         for name in languages.language_names() {
             languages
diff --git a/crates/zeta_cli/src/headless.rs b/crates/zeta_cli/src/headless.rs
index cfa7d606ba..a11fd70759 100644
--- a/crates/zeta_cli/src/headless.rs
+++ b/crates/zeta_cli/src/headless.rs
@@ -110,7 +110,7 @@ pub fn init(cx: &mut App) -> ZetaCliAppState {
     language_extension::init(LspAccess::Noop, extension_host_proxy, languages.clone());
     language_model::init(client.clone(), cx);
     language_models::init(user_store.clone(), client.clone(), cx);
-    languages::init(languages.clone(), node_runtime.clone(), cx);
+    languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
     prompt_store::init(cx);
     terminal_view::init(cx);
 

From 7a83a7fbd0becf48b82631dc93d1ee10d3dda397 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 15:30:37 -0400
Subject: [PATCH 794/823] Fix congratsbot (#38013)

We need a PAT to have permission to check team information. Also, the
COAUTHOR_TEMPLATES didn't feel quite right. Skipping this for now.

Release Notes:

- N/A
---
 .github/workflows/congrats.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml
index a5ca37bcf1..efd9812d80 100644
--- a/.github/workflows/congrats.yml
+++ b/.github/workflows/congrats.yml
@@ -15,7 +15,7 @@ jobs:
         id: check
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.CONGRATSBOT_GITHUB_TOKEN }}
           script: |
             const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
               owner: context.repo.owner,
@@ -53,14 +53,5 @@ jobs:
     uses: withastro/automation/.github/workflows/congratsbot.yml@main
     with:
       EMOJIS: 🎉,🎊,🧑‍🚀,🥳,🙌,🚀,🦀,🔥,🚢
-      COAUTHOR_TEMPLATES: >
-        [
-          "Thank you for making Zed better, <names>! In Rust we trust!",
-          "Successfully moved this PR into main! No lifetime errors here, thanks <names>!",
-          "Ferris approves! Thanks <names>!",
-          "Crab rave time! Code from <names> has been oxidized and merged!",
-          "The borrow checker is happy, and so are we! Welcome to the cargo club, <names>!",
-          "Crabs can live up to 100 years, but this PR from <names> will live forever in our git history!"
-        ]
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}

From 7655e22ff5941682cc58cfce8d5f121efb029e5a Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Thu, 11 Sep 2025 13:57:24 -0600
Subject: [PATCH 795/823] Fix panics from unicode slicing in license detection
 (#38015)

Closes #37954

Release Notes:

- N/A
---
 crates/zeta/src/license_detection.rs | 80 +++++++++++++++++++++++++---
 1 file changed, 73 insertions(+), 7 deletions(-)

diff --git a/crates/zeta/src/license_detection.rs b/crates/zeta/src/license_detection.rs
index e06e1577a6..6f27e00022 100644
--- a/crates/zeta/src/license_detection.rs
+++ b/crates/zeta/src/license_detection.rs
@@ -202,22 +202,48 @@ fn check_pattern(pattern: &[PatternPart], input: &str) -> bool {
             match_any_chars.end += part.match_any_chars.end;
             continue;
         }
-        let search_range_start = input_ix.saturating_sub(match_any_chars.end + part.text.len());
-        let search_range_end = input_ix.saturating_sub(match_any_chars.start);
-        let found_ix = &input[search_range_start..search_range_end].rfind(&part.text);
+
+        let search_range_end = n_chars_before_offset(match_any_chars.start, input_ix, input);
+        let search_range_start = n_chars_before_offset(
+            match_any_chars.len() + part.text.len(),
+            search_range_end,
+            input,
+        );
+        let found_ix = input[search_range_start..search_range_end].rfind(&part.text);
+
         if let Some(found_ix) = found_ix {
             input_ix = search_range_start + found_ix;
             match_any_chars = part.match_any_chars.clone();
         } else if !part.optional {
             log::trace!(
-                "Failed to match pattern `...{}` against input `...{}`",
-                &part.text[part.text.len().saturating_sub(128)..],
-                &input[input_ix.saturating_sub(128)..]
+                "Failed to match pattern\n`...{}`\nagainst input\n`...{}`",
+                &part.text[n_chars_before_offset(128, part.text.len(), &part.text)..],
+                &input[n_chars_before_offset(128, search_range_end, input)..search_range_end],
             );
             return false;
         }
     }
-    match_any_chars.contains(&input_ix)
+    is_char_count_within_range(&input[..input_ix], match_any_chars)
+}
+
+fn n_chars_before_offset(char_count: usize, offset: usize, string: &str) -> usize {
+    if char_count == 0 {
+        return offset;
+    }
+    string[..offset]
+        .char_indices()
+        .nth_back(char_count.saturating_sub(1))
+        .map_or(0, |(byte_ix, _)| byte_ix)
+}
+
+fn is_char_count_within_range(string: &str, char_count_range: Range<usize>) -> bool {
+    if string.len() >= char_count_range.start * 4 && string.len() < char_count_range.end {
+        return true;
+    }
+    if string.len() < char_count_range.start || string.len() >= char_count_range.end * 4 {
+        return false;
+    }
+    char_count_range.contains(&string.chars().count())
 }
 
 /// Canonicalizes license text by removing all non-alphanumeric characters, lowercasing, and turning
@@ -360,6 +386,7 @@ impl LicenseDetectionWatcher {
 mod tests {
     use fs::FakeFs;
     use gpui::TestAppContext;
+    use rand::Rng as _;
     use serde_json::json;
     use settings::{Settings as _, SettingsStore};
     use worktree::WorktreeSettings;
@@ -578,6 +605,45 @@ mod tests {
         );
     }
 
+    #[test]
+    fn random_strings_negative_detection() {
+        for _i in 0..20 {
+            let random_string = rand::rng()
+                .sample_iter::<char, _>(rand::distr::StandardUniform)
+                .take(512)
+                .collect::<String>();
+            assert_eq!(detect_license(&random_string), None);
+        }
+    }
+
+    #[test]
+    fn test_n_chars_before_offset() {
+        assert_eq!(n_chars_before_offset(2, 4, "hello"), 2);
+
+        let input = "ㄒ乇丂ㄒ";
+        assert_eq!(n_chars_before_offset(2, input.len(), input), "ㄒ乇".len());
+    }
+
+    #[test]
+    fn test_is_char_count_within_range() {
+        // TODO: make this into a proper property test.
+        for _i in 0..20 {
+            let mut rng = rand::rng();
+            let random_char_count = rng.random_range(0..64);
+            let random_string = rand::rng()
+                .sample_iter::<char, _>(rand::distr::StandardUniform)
+                .take(random_char_count)
+                .collect::<String>();
+            let min_chars = rng.random_range(0..10);
+            let max_chars = rng.random_range(min_chars..32);
+            let char_count_range = min_chars..max_chars;
+            assert_eq!(
+                is_char_count_within_range(&random_string, char_count_range.clone()),
+                char_count_range.contains(&random_char_count),
+            );
+        }
+    }
+
     #[test]
     fn test_license_file_name_regex() {
         // Test basic license file names

From d5d30b5c4413cb843aca8a1c3d496dcb90f23baf Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 11 Sep 2025 16:52:07 -0400
Subject: [PATCH 796/823] python: Add built-in support for Ruff (#37804)

Release Notes:

- python: The Ruff native language server is now available without
installing an extension.

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
---
 assets/settings/default.json   |   5 +
 crates/languages/src/lib.rs    |   8 +-
 crates/languages/src/python.rs | 236 ++++++++++++++++++++++++++++++++-
 3 files changed, 246 insertions(+), 3 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 94df7a62cc..b83025116c 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1692,6 +1692,11 @@
       "allow_rewrap": "anywhere"
     },
     "Python": {
+      "formatter": {
+        "language_server": {
+          "name": "ruff"
+        }
+      },
       "debuggers": ["Debugpy"]
     },
     "Ruby": {
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 8dd2a6b9fd..c89e462d59 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -12,7 +12,10 @@ use util::{ResultExt, asset_str};
 
 pub use language::*;
 
-use crate::{json::JsonTaskProvider, python::BasedPyrightLspAdapter};
+use crate::{
+    json::JsonTaskProvider,
+    python::{BasedPyrightLspAdapter, RuffLspAdapter},
+};
 
 mod bash;
 mod c;
@@ -91,6 +94,7 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
     let python_context_provider = Arc::new(python::PythonContextProvider);
     let python_lsp_adapter = Arc::new(python::PythonLspAdapter::new(node.clone()));
     let basedpyright_lsp_adapter = Arc::new(BasedPyrightLspAdapter::new());
+    let ruff_lsp_adapter = Arc::new(RuffLspAdapter::new(fs.clone()));
     let python_toolchain_provider = Arc::new(python::PythonToolchainProvider);
     let rust_context_provider = Arc::new(rust::RustContextProvider);
     let rust_lsp_adapter = Arc::new(rust::RustLspAdapter);
@@ -171,7 +175,7 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
         },
         LanguageInfo {
             name: "python",
-            adapters: vec![basedpyright_lsp_adapter],
+            adapters: vec![basedpyright_lsp_adapter, ruff_lsp_adapter],
             context: Some(python_context_provider),
             toolchain: Some(python_toolchain_provider),
             manifest_name: Some(SharedString::new_static("pyproject.toml").into()),
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index c8738a7000..c5abf07069 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -2,9 +2,12 @@ use anyhow::{Context as _, ensure};
 use anyhow::{Result, anyhow};
 use async_trait::async_trait;
 use collections::HashMap;
-use futures::AsyncBufReadExt;
+use dap::adapters::latest_github_release;
+use futures::{AsyncBufReadExt, StreamExt as _};
 use gpui::{App, Task};
 use gpui::{AsyncApp, SharedString};
+use http_client::github::AssetKind;
+use http_client::github::GitHubLspBinaryVersion;
 use language::ToolchainList;
 use language::ToolchainLister;
 use language::language_settings::language_settings;
@@ -23,6 +26,8 @@ use project::lsp_store::language_server_settings;
 use serde_json::{Value, json};
 use smol::lock::OnceCell;
 use std::cmp::Ordering;
+use std::env::consts;
+use util::fs::{make_file_executable, remove_matching};
 
 use parking_lot::Mutex;
 use std::str::FromStr;
@@ -37,6 +42,8 @@ use std::{
 use task::{ShellKind, TaskTemplate, TaskTemplates, VariableName};
 use util::{ResultExt, maybe};
 
+use crate::github_download::{GithubBinaryMetadata, download_server_binary};
+
 pub(crate) struct PyprojectTomlManifestProvider;
 
 impl ManifestProvider for PyprojectTomlManifestProvider {
@@ -1653,6 +1660,233 @@ impl LspAdapter for BasedPyrightLspAdapter {
     }
 }
 
+pub(crate) struct RuffLspAdapter {
+    fs: Arc<dyn Fs>,
+}
+
+#[cfg(target_os = "macos")]
+impl RuffLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
+    const ARCH_SERVER_NAME: &str = "apple-darwin";
+}
+
+#[cfg(target_os = "linux")]
+impl RuffLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
+    const ARCH_SERVER_NAME: &str = "unknown-linux-gnu";
+}
+
+#[cfg(target_os = "freebsd")]
+impl RuffLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
+    const ARCH_SERVER_NAME: &str = "unknown-freebsd";
+}
+
+#[cfg(target_os = "windows")]
+impl RuffLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Zip;
+    const ARCH_SERVER_NAME: &str = "pc-windows-msvc";
+}
+
+impl RuffLspAdapter {
+    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("ruff");
+
+    pub fn new(fs: Arc<dyn Fs>) -> RuffLspAdapter {
+        RuffLspAdapter { fs }
+    }
+
+    fn build_asset_name() -> Result<(String, String)> {
+        let arch = match consts::ARCH {
+            "x86" => "i686",
+            _ => consts::ARCH,
+        };
+        let os = Self::ARCH_SERVER_NAME;
+        let suffix = match consts::OS {
+            "windows" => "zip",
+            _ => "tar.gz",
+        };
+        let asset_name = format!("ruff-{arch}-{os}.{suffix}");
+        let asset_stem = format!("ruff-{arch}-{os}");
+        Ok((asset_stem, asset_name))
+    }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for RuffLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
+
+    async fn check_if_user_installed(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        toolchain: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> Option<LanguageServerBinary> {
+        let ruff_in_venv = if let Some(toolchain) = toolchain
+            && toolchain.language_name.as_ref() == "Python"
+        {
+            Path::new(toolchain.path.as_str())
+                .parent()
+                .map(|path| path.join("ruff"))
+        } else {
+            None
+        };
+
+        for path in ruff_in_venv.into_iter().chain(["ruff".into()]) {
+            if let Some(ruff_bin) = delegate.which(path.as_os_str()).await {
+                let env = delegate.shell_env().await;
+                return Some(LanguageServerBinary {
+                    path: ruff_bin,
+                    env: Some(env),
+                    arguments: vec!["server".into()],
+                });
+            }
+        }
+
+        None
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        let release =
+            latest_github_release("astral-sh/ruff", true, false, delegate.http_client()).await?;
+        let (_, asset_name) = Self::build_asset_name()?;
+        let asset = release
+            .assets
+            .into_iter()
+            .find(|asset| asset.name == asset_name)
+            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
+        Ok(Box::new(GitHubLspBinaryVersion {
+            name: release.tag_name,
+            url: asset.browser_download_url,
+            digest: asset.digest,
+        }))
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        latest_version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let GitHubLspBinaryVersion {
+            name,
+            url,
+            digest: expected_digest,
+        } = *latest_version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        let destination_path = container_dir.join(format!("ruff-{name}"));
+        let server_path = match Self::GITHUB_ASSET_KIND {
+            AssetKind::TarGz | AssetKind::Gz => destination_path
+                .join(Self::build_asset_name()?.0)
+                .join("ruff"),
+            AssetKind::Zip => destination_path.clone().join("ruff.exe"),
+        };
+
+        let binary = LanguageServerBinary {
+            path: server_path.clone(),
+            env: None,
+            arguments: vec!["server".into()],
+        };
+
+        let metadata_path = destination_path.with_extension("metadata");
+        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
+            .await
+            .ok();
+        if let Some(metadata) = metadata {
+            let validity_check = async || {
+                delegate
+                    .try_exec(LanguageServerBinary {
+                        path: server_path.clone(),
+                        arguments: vec!["--version".into()],
+                        env: None,
+                    })
+                    .await
+                    .inspect_err(|err| {
+                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
+                    })
+            };
+            if let (Some(actual_digest), Some(expected_digest)) =
+                (&metadata.digest, &expected_digest)
+            {
+                if actual_digest == expected_digest {
+                    if validity_check().await.is_ok() {
+                        return Ok(binary);
+                    }
+                } else {
+                    log::info!(
+                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
+                    );
+                }
+            } else if validity_check().await.is_ok() {
+                return Ok(binary);
+            }
+        }
+
+        download_server_binary(
+            delegate,
+            &url,
+            expected_digest.as_deref(),
+            &destination_path,
+            Self::GITHUB_ASSET_KIND,
+        )
+        .await?;
+        make_file_executable(&server_path).await?;
+        remove_matching(&container_dir, |path| path != destination_path).await;
+        GithubBinaryMetadata::write_to_file(
+            &GithubBinaryMetadata {
+                metadata_version: 1,
+                digest: expected_digest,
+            },
+            &metadata_path,
+        )
+        .await?;
+
+        Ok(LanguageServerBinary {
+            path: server_path,
+            env: None,
+            arguments: vec!["server".into()],
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        maybe!(async {
+            let mut last = None;
+            let mut entries = self.fs.read_dir(&container_dir).await?;
+            while let Some(entry) = entries.next().await {
+                let path = entry?;
+                if path.extension().is_some_and(|ext| ext == "metadata") {
+                    continue;
+                }
+                last = Some(path);
+            }
+
+            let path = last.context("no cached binary")?;
+            let path = match Self::GITHUB_ASSET_KIND {
+                AssetKind::TarGz | AssetKind::Gz => {
+                    path.join(Self::build_asset_name()?.0).join("ruff")
+                }
+                AssetKind::Zip => path.join("ruff.exe"),
+            };
+
+            anyhow::Ok(LanguageServerBinary {
+                path,
+                env: None,
+                arguments: vec!["server".into()],
+            })
+        })
+        .await
+        .log_err()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use gpui::{AppContext as _, BorrowAppContext, Context, TestAppContext};

From c4d75ea6d5887aee82e67888a1ac21e3bf9ccbdb Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 11 Sep 2025 13:56:06 -0700
Subject: [PATCH 797/823] Windows: Fix issues with paths in extensions (#37811)

### Background

Zed extensions use WASI to access the file-system. They only have
read-write access to one specific folder called their work dir. But
extensions do need to be able to *refer* to other arbitrary files on the
user's machine. For instance, extensions need to be able to look up
existing binaries on the user's `PATH`, and request that Zed invoke them
as language servers. Similarly, extensions can create paths to files in
the user's project, and use them as arguments in commands that Zed
should run. For these reasons, we pass *real* paths back and forth
between the host and extensions; we don't try to abstract over the
file-system with some virtualization scheme.

On Windows, this results in a bit of mismatch, because `wasi-libc` uses
*unix-like* path conventions (and thus, so does the Rust standard
library when compiling to WASI).

### Change 1 - Fixing `current_dir`

In order to keep the extension API minimal, extensions use the standard
library function`env::current_dir()` to query the location of their
"work" directory. Previously, when initializing extensions, we used the
`env::set_current_dir` function to set their work directory, but on
Windows, where absolute paths typically begin with a drive letter, like
`C:`, the [`wasi-libc` implementation of
`chdir`](https://github.com/WebAssembly/wasi-libc/blob/d1793637d8afcdc730408e7b6a19a050c3336ce7/libc-bottom-half/sources/chdir.c#L21)
was prepending an extra forward slash to the path, which caused
`current_dir()` to return an invalid path.

See https://github.com/bytecodealliance/wasmtime/issues/10415

In this PR, I've switched our extension initialization function to
*bypass* wasi-libc's `chdir` function, and instead write directly to
wasi-libc's private, internal state. This is a bit of a hack, but it
causes the `current_dir()` function to do what we want on Windows
without any changes to extensions' source code.

### Change 2 - Working around WASI's relative path handling

Once `current_dir` was fixed (giving us correct absolute paths on
Windows), @kubkon and I discovered that without the spurious leading `/`
character, windows absolute paths were no longer accepted by Rust's
`std::fs` APIs, because they were now recognized as relative paths, and
were being appended to the working directory.

We first tried to override the `__wasilibc_find_abspath` function in
`wasi-libc` to make it recognize windows absolute paths as being
absolute, but that functionality is difficult to override. Eventually
@kubkon realized that we could prevent WASI-libc's CWD handling from
being linked into the WASM file by overriding the `chdir` function.
wasi-libc is designed so that if you don't use their `chdir` function,
then all paths will be interpreted as relative to `/`. This makes
absolute paths behave correctly. Then, in order to make *relative* paths
work again, we simply add a preopen for `.`. Relative paths will match
that.

### Next Steps

This is a change to `zed-extension-api`, so we do need to update every
Zed extension to use the new version, in order for them to work on
windows.

Release Notes:

- N/A

---------

Co-authored-by: Jakub Konka <kubkon@jakubkonka.com>
---
 Cargo.lock                                    |  5 +-
 crates/extension_api/Cargo.toml               |  2 +-
 crates/extension_api/src/extension_api.rs     | 36 ++++++++++-
 crates/extension_host/src/extension_host.rs   |  4 ++
 .../src/extension_store_test.rs               | 25 +++++---
 crates/extension_host/src/wasm_host.rs        | 24 ++++---
 crates/fs/src/fs.rs                           | 14 ++++-
 crates/language_extension/Cargo.toml          |  1 +
 .../src/extension_lsp_adapter.rs              |  5 ++
 extensions/test-extension/extension.toml      |  7 ++-
 .../test-extension/src/test_extension.rs      | 62 +++++++++++++++----
 11 files changed, 147 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a1a747adeb..1523063409 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9108,6 +9108,7 @@ dependencies = [
  "futures 0.3.31",
  "gpui",
  "language",
+ "log",
  "lsp",
  "project",
  "serde",
@@ -20675,7 +20676,7 @@ dependencies = [
 
 [[package]]
 name = "zed_extension_api"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -20722,7 +20723,7 @@ dependencies = [
 name = "zed_test_extension"
 version = "0.1.0"
 dependencies = [
- "zed_extension_api 0.6.0",
+ "zed_extension_api 0.7.0",
 ]
 
 [[package]]
diff --git a/crates/extension_api/Cargo.toml b/crates/extension_api/Cargo.toml
index 001df34e7a..318a0024bf 100644
--- a/crates/extension_api/Cargo.toml
+++ b/crates/extension_api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zed_extension_api"
-version = "0.6.0"
+version = "0.7.0"
 description = "APIs for creating Zed extensions in Rust"
 repository = "https://github.com/zed-industries/zed"
 documentation = "https://docs.rs/zed_extension_api"
diff --git a/crates/extension_api/src/extension_api.rs b/crates/extension_api/src/extension_api.rs
index 72327179ee..723e544209 100644
--- a/crates/extension_api/src/extension_api.rs
+++ b/crates/extension_api/src/extension_api.rs
@@ -267,9 +267,43 @@ pub trait Extension: Send + Sync {
 #[macro_export]
 macro_rules! register_extension {
     ($extension_type:ty) => {
+        #[cfg(target_os = "wasi")]
+        mod wasi_ext {
+            unsafe extern "C" {
+                static mut errno: i32;
+                pub static mut __wasilibc_cwd: *mut std::ffi::c_char;
+            }
+
+            pub fn init_cwd() {
+                unsafe {
+                    // Ensure that our chdir function is linked, instead of the
+                    // one from wasi-libc in the chdir.o translation unit. Otherwise
+                    // we risk linking in `__wasilibc_find_relpath_alloc` which
+                    // is a weak symbol and is being used by
+                    // `__wasilibc_find_relpath`, which we do not want on
+                    // Windows.
+                    chdir(std::ptr::null());
+
+                    __wasilibc_cwd = std::ffi::CString::new(std::env::var("PWD").unwrap())
+                        .unwrap()
+                        .into_raw()
+                        .cast();
+                }
+            }
+
+            #[unsafe(no_mangle)]
+            pub unsafe extern "C" fn chdir(raw_path: *const std::ffi::c_char) -> i32 {
+                // Forbid extensions from changing CWD and so return an appropriate error code.
+                errno = 58; // NOTSUP
+                return -1;
+            }
+        }
+
         #[unsafe(export_name = "init-extension")]
         pub extern "C" fn __init_extension() {
-            std::env::set_current_dir(std::env::var("PWD").unwrap()).unwrap();
+            #[cfg(target_os = "wasi")]
+            wasi_ext::init_cwd();
+
             zed_extension_api::register_extension(|| {
                 Box::new(<$extension_type as zed_extension_api::Extension>::new())
             });
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
index 0b7dd00870..e6c0c128f9 100644
--- a/crates/extension_host/src/extension_host.rs
+++ b/crates/extension_host/src/extension_host.rs
@@ -587,6 +587,10 @@ impl ExtensionStore {
     /// This can be used to make certain functionality provided by extensions
     /// available out-of-the-box.
     pub fn auto_install_extensions(&mut self, cx: &mut Context<Self>) {
+        if cfg!(test) {
+            return;
+        }
+
         let extension_settings = ExtensionSettings::get_global(cx);
 
         let extensions_to_install = extension_settings
diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
index 347a610439..855077bcf8 100644
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -531,7 +531,6 @@ async fn test_extension_store(cx: &mut TestAppContext) {
 // `let fake_server = fake_servers.next().await.unwrap();`.
 // Reenable this test when we figure out why.
 #[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)]
 async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
     init_test(cx);
     cx.executor().allow_parking();
@@ -546,7 +545,7 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
     let test_extension_dir = root_dir.join("extensions").join(test_extension_id);
 
     let fs = Arc::new(RealFs::new(None, cx.executor()));
-    let extensions_dir = TempTree::new(json!({
+    let extensions_tree = TempTree::new(json!({
         "installed": {},
         "work": {}
     }));
@@ -554,7 +553,7 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
         "test.gleam": ""
     }));
 
-    let extensions_dir = extensions_dir.path().canonicalize().unwrap();
+    let extensions_dir = extensions_tree.path().canonicalize().unwrap();
     let project_dir = project_dir.path().canonicalize().unwrap();
 
     let project = Project::test(fs.clone(), [project_dir.as_path()], cx).await;
@@ -618,6 +617,10 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
                                     {
                                         "name": format!("gleam-{version}-aarch64-unknown-linux-musl.tar.gz"),
                                         "browser_download_url": asset_download_uri
+                                    },
+                                    {
+                                        "name": format!("gleam-{version}-x86_64-pc-windows-msvc.tar.gz"),
+                                        "browser_download_url": asset_download_uri
                                     }
                                 ]
                             }
@@ -714,13 +717,17 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
         .await
         .unwrap();
 
-    // todo(windows)
-    // This test hangs here on Windows.
     let fake_server = fake_servers.next().await.unwrap();
-    let expected_server_path =
-        extensions_dir.join(format!("work/{test_extension_id}/gleam-v1.2.3/gleam"));
+    let work_dir = extensions_dir.join(format!("work/{test_extension_id}"));
+    let expected_server_path = work_dir.join("gleam-v1.2.3/gleam");
     let expected_binary_contents = language_server_version.lock().binary_contents.clone();
 
+    // check that IO operations in extension work correctly
+    assert!(work_dir.join("dir-created-with-rel-path").exists());
+    assert!(work_dir.join("dir-created-with-abs-path").exists());
+    assert!(work_dir.join("file-created-with-abs-path").exists());
+    assert!(work_dir.join("file-created-with-rel-path").exists());
+
     assert_eq!(fake_server.binary.path, expected_server_path);
     assert_eq!(fake_server.binary.arguments, [OsString::from("lsp")]);
     assert_eq!(
@@ -826,7 +833,9 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
     // Reload the extension, clearing its cache.
     // Start a new instance of the language server.
     extension_store
-        .update(cx, |store, cx| store.reload(Some("gleam".into()), cx))
+        .update(cx, |store, cx| {
+            store.reload(Some("test-extension".into()), cx)
+        })
         .await;
     cx.executor().run_until_parked();
     project.update(cx, |project, cx| {
diff --git a/crates/extension_host/src/wasm_host.rs b/crates/extension_host/src/wasm_host.rs
index c5bc21fc1c..3ff8fcf7a4 100644
--- a/crates/extension_host/src/wasm_host.rs
+++ b/crates/extension_host/src/wasm_host.rs
@@ -37,6 +37,7 @@ use std::{
     sync::Arc,
 };
 use task::{DebugScenario, SpawnInTerminal, TaskTemplate, ZedDebugConfig};
+use util::paths::SanitizedPath;
 use wasmtime::{
     CacheStore, Engine, Store,
     component::{Component, ResourceTable},
@@ -607,7 +608,6 @@ impl WasmHost {
 
             let component = Component::from_binary(&this.engine, &wasm_bytes)
                 .context("failed to compile wasm component")?;
-
             let mut store = wasmtime::Store::new(
                 &this.engine,
                 WasmState {
@@ -666,19 +666,17 @@ impl WasmHost {
 
         let file_perms = wasi::FilePerms::all();
         let dir_perms = wasi::DirPerms::all();
+        let path = SanitizedPath::new(&extension_work_dir);
 
-        Ok(wasi::WasiCtxBuilder::new()
-            .inherit_stdio()
-            .preopened_dir(&extension_work_dir, ".", dir_perms, file_perms)?
-            .preopened_dir(
-                &extension_work_dir,
-                extension_work_dir.to_string_lossy(),
-                dir_perms,
-                file_perms,
-            )?
-            .env("PWD", extension_work_dir.to_string_lossy())
-            .env("RUST_BACKTRACE", "full")
-            .build())
+        let mut ctx = wasi::WasiCtxBuilder::new();
+        ctx.inherit_stdio()
+            .env("PWD", path.to_string())
+            .env("RUST_BACKTRACE", "full");
+
+        ctx.preopened_dir(&path, ".", dir_perms, file_perms)?;
+        ctx.preopened_dir(&path, path.to_string(), dir_perms, file_perms)?;
+
+        Ok(ctx.build())
     }
 
     pub fn writeable_path_from_extension(&self, id: &Arc<str>, path: &Path) -> Result<PathBuf> {
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 98c8dc9054..846d1f75d8 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -343,7 +343,19 @@ impl Fs for RealFs {
 
         #[cfg(windows)]
         if smol::fs::metadata(&target).await?.is_dir() {
-            smol::fs::windows::symlink_dir(target, path).await?
+            let status = smol::process::Command::new("cmd")
+                .args(["/C", "mklink", "/J"])
+                .args([path, target.as_path()])
+                .status()
+                .await?;
+
+            if !status.success() {
+                return Err(anyhow::anyhow!(
+                    "Failed to create junction from {:?} to {:?}",
+                    path,
+                    target
+                ));
+            }
         } else {
             smol::fs::windows::symlink_file(target, path).await?
         }
diff --git a/crates/language_extension/Cargo.toml b/crates/language_extension/Cargo.toml
index cc73b1f923..565563611e 100644
--- a/crates/language_extension/Cargo.toml
+++ b/crates/language_extension/Cargo.toml
@@ -20,6 +20,7 @@ futures.workspace = true
 fs.workspace = true
 gpui.workspace = true
 language.workspace = true
+log.workspace = true
 lsp.workspace = true
 project.workspace = true
 serde.workspace = true
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 318f5e62d8..2c7cc9b7b1 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -124,6 +124,11 @@ impl ExtensionLanguageServerProxy for LanguageServerRegistryProxy {
         language_server_id: LanguageServerName,
         status: BinaryStatus,
     ) {
+        log::debug!(
+            "updating binary status for {} to {:?}",
+            language_server_id,
+            status
+        );
         self.language_registry
             .update_lsp_binary_status(language_server_id, status);
     }
diff --git a/extensions/test-extension/extension.toml b/extensions/test-extension/extension.toml
index 0ba9eeaadf..0cb5afac7f 100644
--- a/extensions/test-extension/extension.toml
+++ b/extensions/test-extension/extension.toml
@@ -17,4 +17,9 @@ commit = "8432ffe32ccd360534837256747beb5b1c82fca1"
 [[capabilities]]
 kind = "process:exec"
 command = "echo"
-args = ["hello!"]
+args = ["hello from a child process!"]
+
+[[capabilities]]
+kind = "process:exec"
+command = "cmd"
+args = ["/C", "echo", "hello from a child process!"]
diff --git a/extensions/test-extension/src/test_extension.rs b/extensions/test-extension/src/test_extension.rs
index ee0b1b36a1..8c7737ba7f 100644
--- a/extensions/test-extension/src/test_extension.rs
+++ b/extensions/test-extension/src/test_extension.rs
@@ -14,9 +14,37 @@ impl TestExtension {
         language_server_id: &LanguageServerId,
         _worktree: &zed::Worktree,
     ) -> Result<String> {
-        let echo_output = Command::new("echo").arg("hello!").output()?;
+        let (platform, arch) = zed::current_platform();
 
-        println!("{}", String::from_utf8_lossy(&echo_output.stdout));
+        let current_dir = std::env::current_dir().unwrap();
+        println!("current_dir: {}", current_dir.display());
+
+        fs::create_dir_all(current_dir.join("dir-created-with-abs-path")).unwrap();
+        fs::create_dir_all("./dir-created-with-rel-path").unwrap();
+        fs::write("file-created-with-rel-path", b"contents 1").unwrap();
+        fs::write(
+            current_dir.join("file-created-with-abs-path"),
+            b"contents 2",
+        )
+        .unwrap();
+        assert_eq!(
+            fs::read("file-created-with-rel-path").unwrap(),
+            b"contents 1"
+        );
+        assert_eq!(
+            fs::read("file-created-with-abs-path").unwrap(),
+            b"contents 2"
+        );
+
+        let command = match platform {
+            zed::Os::Linux | zed::Os::Mac => Command::new("echo"),
+            zed::Os::Windows => Command::new("cmd").args(["/C", "echo"]),
+        };
+        let output = command.arg("hello from a child process!").output()?;
+        println!(
+            "command output: {}",
+            String::from_utf8_lossy(&output.stdout).trim()
+        );
 
         if let Some(path) = &self.cached_binary_path
             && fs::metadata(path).is_ok_and(|stat| stat.is_file())
@@ -36,9 +64,18 @@ impl TestExtension {
             },
         )?;
 
-        let (platform, arch) = zed::current_platform();
+        let ext = "tar.gz";
+        let download_type = zed::DownloadedFileType::GzipTar;
+
+        // Do this if you want to actually run this extension -
+        // the actual asset is a .zip. But the integration test is simpler
+        // if every platform uses .tar.gz.
+        //
+        // ext = "zip";
+        // download_type = zed::DownloadedFileType::Zip;
+
         let asset_name = format!(
-            "gleam-{version}-{arch}-{os}.tar.gz",
+            "gleam-{version}-{arch}-{os}.{ext}",
             version = release.version,
             arch = match arch {
                 zed::Architecture::Aarch64 => "aarch64",
@@ -67,18 +104,21 @@ impl TestExtension {
                 &zed::LanguageServerInstallationStatus::Downloading,
             );
 
-            zed::download_file(
-                &asset.download_url,
-                &version_dir,
-                zed::DownloadedFileType::GzipTar,
-            )
-            .map_err(|e| format!("failed to download file: {e}"))?;
+            zed::download_file(&asset.download_url, &version_dir, download_type)
+                .map_err(|e| format!("failed to download file: {e}"))?;
+
+            zed::set_language_server_installation_status(
+                language_server_id,
+                &zed::LanguageServerInstallationStatus::None,
+            );
 
             let entries =
                 fs::read_dir(".").map_err(|e| format!("failed to list working directory {e}"))?;
             for entry in entries {
                 let entry = entry.map_err(|e| format!("failed to load directory entry {e}"))?;
-                if entry.file_name().to_str() != Some(&version_dir) {
+                let filename = entry.file_name();
+                let filename = filename.to_str().unwrap();
+                if filename.starts_with("gleam-") && filename != version_dir {
                     fs::remove_dir_all(entry.path()).ok();
                 }
             }

From ff2eebf5222af47a9acf1abb7193731cd102824d Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 11 Sep 2025 17:16:16 -0400
Subject: [PATCH 798/823] settings ui: Add basic support for drop down menus
 (#38019)

Enums with six or less fields can still use toggle groups by adding a
definition.

I also renamed the `OpenSettingsEditor` action to `OpenSettingsUi`

Release Notes:

- N/A
---
 crates/settings_ui/src/settings_ui.rs         | 52 +++++++++++++++---
 .../src/settings_ui_macros.rs                 | 55 +++++++++++++++++--
 2 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 345a997527..f448508971 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -16,7 +16,10 @@ use settings::{
     SettingsValue,
 };
 use smallvec::SmallVec;
-use ui::{NumericStepper, SwitchField, ToggleButtonGroup, ToggleButtonSimple, prelude::*};
+use ui::{
+    ContextMenu, DropdownMenu, NumericStepper, SwitchField, ToggleButtonGroup, ToggleButtonSimple,
+    prelude::*,
+};
 use workspace::{
     Workspace,
     item::{Item, ItemEvent},
@@ -33,14 +36,14 @@ impl FeatureFlag for SettingsUiFeatureFlag {
 actions!(
     zed,
     [
-        /// Opens the settings editor.
-        OpenSettingsEditor
+        /// Opens settings UI.
+        OpenSettingsUi
     ]
 );
 
 pub fn open_settings_editor(
     workspace: &mut Workspace,
-    _: &OpenSettingsEditor,
+    _: &OpenSettingsUi,
     window: &mut Window,
     cx: &mut Context<Workspace>,
 ) {
@@ -62,7 +65,7 @@ pub fn open_settings_editor(
 pub fn init(cx: &mut App) {
     cx.observe_new(|workspace: &mut Workspace, _, _| {
         workspace.register_action_renderer(|div, _, _, cx| {
-            let settings_ui_actions = [std::any::TypeId::of::<OpenSettingsEditor>()];
+            let settings_ui_actions = [std::any::TypeId::of::<OpenSettingsUi>()];
             let has_flag = cx.has_flag::<SettingsUiFeatureFlag>();
             command_palette_hooks::CommandPaletteFilter::update_global(cx, |filter, _| {
                 if has_flag {
@@ -635,8 +638,8 @@ fn render_item_single(
             variants: values,
             labels: titles,
         } => render_toggle_button_group(settings_value, values, titles, window, cx),
-        SettingsUiItemSingle::DropDown { .. } => {
-            unimplemented!("This")
+        SettingsUiItemSingle::DropDown { variants, labels } => {
+            render_dropdown(settings_value, variants, labels, window, cx)
         }
         SettingsUiItemSingle::TextField => render_text_field(settings_value, window, cx),
     }
@@ -896,6 +899,41 @@ fn render_toggle_button_group(
     });
 }
 
+fn render_dropdown(
+    value: SettingsValue<serde_json::Value>,
+    variants: &'static [&'static str],
+    labels: &'static [&'static str],
+    window: &mut Window,
+    cx: &mut App,
+) -> AnyElement {
+    let value = downcast_any_item::<String>(value);
+    let id = element_id_from_path(&value.path);
+
+    let menu = window.use_state(cx, |window, cx| {
+        let path = value.path.clone();
+        let handler = Rc::new(move |variant: &'static str, cx: &mut App| {
+            SettingsValue::write_value(&path, serde_json::Value::String(variant.to_string()), cx);
+        });
+
+        ContextMenu::build(window, cx, |mut menu, _, _| {
+            for (label, variant) in labels.iter().zip(variants) {
+                menu = menu.entry(*label, None, {
+                    let handler = handler.clone();
+                    move |_, cx| {
+                        handler(variant, cx);
+                    }
+                });
+            }
+
+            menu
+        })
+    });
+
+    DropdownMenu::new(id, value.read(), menu.read(cx).clone())
+        .style(ui::DropdownStyle::Outlined)
+        .into_any_element()
+}
+
 fn render_toggle_button_group_inner(
     title: SharedString,
     labels: &'static [&'static str],
diff --git a/crates/settings_ui_macros/src/settings_ui_macros.rs b/crates/settings_ui_macros/src/settings_ui_macros.rs
index fcff230ef8..7dea9fc879 100644
--- a/crates/settings_ui_macros/src/settings_ui_macros.rs
+++ b/crates/settings_ui_macros/src/settings_ui_macros.rs
@@ -50,6 +50,10 @@ pub fn derive_settings_ui(input: proc_macro::TokenStream) -> proc_macro::TokenSt
                     meta.input.parse::<Token![=]>()?;
                     let lit: LitStr = meta.input.parse()?;
                     path_name = Some(lit.value());
+                } else if meta.path.is_ident("render") {
+                    // Just consume the tokens even if we don't use them here
+                    meta.input.parse::<Token![=]>()?;
+                    let _lit: LitStr = meta.input.parse()?;
                 }
                 Ok(())
             })
@@ -170,6 +174,7 @@ fn generate_ui_item_body(group_name: Option<&String>, input: &syn::DeriveInput)
         }
         (None, Data::Enum(data_enum)) => {
             let serde_attrs = parse_serde_attributes(&input.attrs);
+            let render_as = parse_render_as(&input.attrs);
             let length = data_enum.variants.len();
 
             let mut variants = Vec::with_capacity(length);
@@ -187,13 +192,19 @@ fn generate_ui_item_body(group_name: Option<&String>, input: &syn::DeriveInput)
 
             let is_not_union = data_enum.variants.iter().all(|v| v.fields.is_empty());
             if is_not_union {
-                return if length > 6 {
-                    quote! {
-                        settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
+                return match render_as {
+                    RenderAs::ToggleGroup if length > 6 => {
+                        panic!("Can't set toggle group with more than six entries");
                     }
-                } else {
-                    quote! {
-                        settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
+                    RenderAs::ToggleGroup => {
+                        quote! {
+                            settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::ToggleGroup{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
+                        }
+                    }
+                    RenderAs::Default => {
+                        quote! {
+                            settings::SettingsUiItem::Single(settings::SettingsUiItemSingle::DropDown{ variants: &[#(#variants),*], labels: &[#(#labels),*] })
+                        }
                     }
                 };
             }
@@ -369,6 +380,38 @@ impl SerdeOptions {
     }
 }
 
+enum RenderAs {
+    ToggleGroup,
+    Default,
+}
+
+fn parse_render_as(attrs: &[syn::Attribute]) -> RenderAs {
+    let mut render_as = RenderAs::Default;
+
+    for attr in attrs {
+        if !attr.path().is_ident("settings_ui") {
+            continue;
+        }
+
+        attr.parse_nested_meta(|meta| {
+            if meta.path.is_ident("render") {
+                meta.input.parse::<Token![=]>()?;
+                let lit = meta.input.parse::<LitStr>()?.value();
+
+                if lit == "toggle_group" {
+                    render_as = RenderAs::ToggleGroup;
+                } else {
+                    return Err(meta.error(format!("invalid `render` attribute: {}", lit)));
+                }
+            }
+            Ok(())
+        })
+        .unwrap();
+    }
+
+    render_as
+}
+
 fn parse_serde_attributes(attrs: &[syn::Attribute]) -> SerdeOptions {
     let mut options = SerdeOptions {
         rename_all: SerdeRenameAll::None,

From 11b7913956829997a2ce6551e55d6280a173dd55 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Thu, 11 Sep 2025 15:42:09 -0600
Subject: [PATCH 799/823] Refactor/optimize tree-sitter utilities for finding
 nodes enclosing ranges (#37943)

#35053 split out these utility functions. I found the names / doc
comments a bit confusing so this improves that. Before that PR there was
also a mild inefficiency - it would walk the cursor all the way down to
a leaf and then back up to an ancestor.

Release Notes:

- N/A
---
 crates/language/src/buffer.rs | 89 ++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 51e6b6d1e0..f03df08a55 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -3463,46 +3463,53 @@ impl BufferSnapshot {
         (start..end, word_kind)
     }
 
-    /// Returns the closest syntax node enclosing the given range.
-    /// Positions a tree cursor at the leaf node that contains or touches the given range.
-    /// This is shared logic used by syntax navigation methods.
-    fn position_cursor_at_range(cursor: &mut tree_sitter::TreeCursor, range: &Range<usize>) {
-        // Descend to the first leaf that touches the start of the range.
-        //
-        // If the range is non-empty and the current node ends exactly at the start,
-        // move to the next sibling to find a node that extends beyond the start.
-        //
-        // If the range is empty and the current node starts after the range position,
-        // move to the previous sibling to find the node that contains the position.
-        while cursor.goto_first_child_for_byte(range.start).is_some() {
-            if !range.is_empty() && cursor.node().end_byte() == range.start {
-                cursor.goto_next_sibling();
-            }
-            if range.is_empty() && cursor.node().start_byte() > range.start {
-                cursor.goto_previous_sibling();
-            }
-        }
-    }
-
-    /// Moves the cursor to find a node that contains the given range.
-    /// Returns true if such a node is found, false otherwise.
-    /// This is shared logic used by syntax navigation methods.
-    fn find_containing_node(
+    /// Moves the TreeCursor to the smallest descendant or ancestor syntax node enclosing the given
+    /// range. When `require_larger` is true, the node found must be larger than the query range.
+    ///
+    /// Returns true if a node was found, and false otherwise. In the `false` case the cursor will
+    /// be moved to the root of the tree.
+    fn goto_node_enclosing_range(
         cursor: &mut tree_sitter::TreeCursor,
-        range: &Range<usize>,
-        strict: bool,
+        query_range: &Range<usize>,
+        require_larger: bool,
     ) -> bool {
+        let mut ascending = false;
         loop {
-            let node_range = cursor.node().byte_range();
+            let mut range = cursor.node().byte_range();
+            if query_range.is_empty() {
+                // When the query range is empty and the current node starts after it, move to the
+                // previous sibling to find the node the containing node.
+                if range.start > query_range.start {
+                    cursor.goto_previous_sibling();
+                    range = cursor.node().byte_range();
+                }
+            } else {
+                // When the query range is non-empty and the current node ends exactly at the start,
+                // move to the next sibling to find a node that extends beyond the start.
+                if range.end == query_range.start {
+                    cursor.goto_next_sibling();
+                    range = cursor.node().byte_range();
+                }
+            }
 
-            if node_range.start <= range.start
-                && node_range.end >= range.end
-                && (!strict || node_range.len() > range.len())
-            {
+            let encloses = range.contains_inclusive(query_range)
+                && (!require_larger || range.len() > query_range.len());
+            if !encloses {
+                ascending = true;
+                if !cursor.goto_parent() {
+                    return false;
+                }
+                continue;
+            } else if ascending {
                 return true;
             }
-            if !cursor.goto_parent() {
-                return false;
+
+            // Descend into the current node.
+            if cursor
+                .goto_first_child_for_byte(query_range.start)
+                .is_none()
+            {
+                return true;
             }
         }
     }
@@ -3519,10 +3526,8 @@ impl BufferSnapshot {
         {
             let mut cursor = layer.node().walk();
 
-            Self::position_cursor_at_range(&mut cursor, &range);
-
-            // Ascend to the smallest ancestor that strictly contains the range.
-            if !Self::find_containing_node(&mut cursor, &range, true) {
+            // Find the node that both contains the range and is larger than it.
+            if !Self::goto_node_enclosing_range(&mut cursor, &range, true) {
                 continue;
             }
 
@@ -3588,10 +3593,8 @@ impl BufferSnapshot {
         {
             let mut cursor = layer.node().walk();
 
-            Self::position_cursor_at_range(&mut cursor, &range);
-
             // Find the node that contains the range
-            if !Self::find_containing_node(&mut cursor, &range, false) {
+            if !Self::goto_node_enclosing_range(&mut cursor, &range, false) {
                 continue;
             }
 
@@ -3641,10 +3644,8 @@ impl BufferSnapshot {
         {
             let mut cursor = layer.node().walk();
 
-            Self::position_cursor_at_range(&mut cursor, &range);
-
             // Find the node that contains the range
-            if !Self::find_containing_node(&mut cursor, &range, false) {
+            if !Self::goto_node_enclosing_range(&mut cursor, &range, false) {
                 continue;
             }
 

From 87f5e72fc02da296440f38e8bc6da2bc7d48f633 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Thu, 11 Sep 2025 23:52:05 +0200
Subject: [PATCH 800/823] python: Add built-in support for Ty (#37580)

- **Rename PythonLSPAdapter to PyrightLspAdapter**
- **ah damn**
- **Ah damn x2**

Release Notes:

- Python: Added built-in support for [ty](https://docs.astral.sh/ty/)
language server (disabled by default).

---------

Co-authored-by: Lukas Wirth <lukas@zed.dev>
Co-authored-by: Zsolt Dollenstein <zsol.zsol@gmail.com>
Co-authored-by: Cole Miller <cole@zed.dev>
---
 Cargo.lock                     |   1 +
 crates/languages/Cargo.toml    |   1 +
 crates/languages/src/lib.rs    |   5 +-
 crates/languages/src/python.rs | 248 +++++++++++++++++++++++++++++++--
 4 files changed, 239 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1523063409..0351fb336e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9331,6 +9331,7 @@ dependencies = [
  "tree-sitter-typescript",
  "tree-sitter-yaml",
  "unindent",
+ "url",
  "util",
  "workspace",
  "workspace-hack",
diff --git a/crates/languages/Cargo.toml b/crates/languages/Cargo.toml
index 9390c785f1..44b0cb5865 100644
--- a/crates/languages/Cargo.toml
+++ b/crates/languages/Cargo.toml
@@ -69,6 +69,7 @@ serde_json_lenient.workspace = true
 settings.workspace = true
 smol.workspace = true
 snippet_provider.workspace = true
+url.workspace = true
 task.workspace = true
 tempfile.workspace = true
 toml.workspace = true
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index c89e462d59..f71234a7d5 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -91,8 +91,9 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
     let json_lsp_adapter = Arc::new(json::JsonLspAdapter::new(node.clone(), languages.clone()));
     let node_version_lsp_adapter = Arc::new(json::NodeVersionAdapter);
     let py_lsp_adapter = Arc::new(python::PyLspAdapter::new());
+    let ty_lsp_adapter = Arc::new(python::TyLspAdapter::new(fs.clone()));
     let python_context_provider = Arc::new(python::PythonContextProvider);
-    let python_lsp_adapter = Arc::new(python::PythonLspAdapter::new(node.clone()));
+    let python_lsp_adapter = Arc::new(python::PyrightLspAdapter::new(node.clone()));
     let basedpyright_lsp_adapter = Arc::new(BasedPyrightLspAdapter::new());
     let ruff_lsp_adapter = Arc::new(RuffLspAdapter::new(fs.clone()));
     let python_toolchain_provider = Arc::new(python::PythonToolchainProvider);
@@ -268,8 +269,10 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
         LanguageServerName("typescript-language-server".into()),
         typescript_lsp_adapter,
     );
+
     languages.register_available_lsp_adapter(python_lsp_adapter.name(), python_lsp_adapter);
     languages.register_available_lsp_adapter(py_lsp_adapter.name(), py_lsp_adapter);
+    languages.register_available_lsp_adapter(ty_lsp_adapter.name(), ty_lsp_adapter);
     // Register Tailwind for the existing languages that should have it by default.
     //
     // This can be driven by the `language_servers` setting once we have a way for
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index c5abf07069..71d847d9f2 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -2,19 +2,14 @@ use anyhow::{Context as _, ensure};
 use anyhow::{Result, anyhow};
 use async_trait::async_trait;
 use collections::HashMap;
-use dap::adapters::latest_github_release;
 use futures::{AsyncBufReadExt, StreamExt as _};
-use gpui::{App, Task};
-use gpui::{AsyncApp, SharedString};
-use http_client::github::AssetKind;
-use http_client::github::GitHubLspBinaryVersion;
-use language::ToolchainList;
-use language::ToolchainLister;
+use gpui::{App, AsyncApp, SharedString, Task};
+use http_client::github::{AssetKind, GitHubLspBinaryVersion, latest_github_release};
 use language::language_settings::language_settings;
 use language::{ContextLocation, LanguageToolchainStore};
 use language::{ContextProvider, LspAdapter, LspAdapterDelegate};
 use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
-use language::{Toolchain, ToolchainMetadata};
+use language::{Toolchain, ToolchainList, ToolchainLister, ToolchainMetadata};
 use lsp::LanguageServerBinary;
 use lsp::LanguageServerName;
 use node_runtime::{NodeRuntime, VersionStrategy};
@@ -106,20 +101,243 @@ fn process_pyright_completions(items: &mut [lsp::CompletionItem]) {
         item.sort_text.take();
     }
 }
-pub struct PythonLspAdapter {
-    node: NodeRuntime,
+
+pub struct TyLspAdapter {
+    fs: Arc<dyn Fs>,
 }
 
-impl PythonLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("pyright");
+#[cfg(target_os = "macos")]
+impl TyLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
+    const ARCH_SERVER_NAME: &str = "apple-darwin";
+}
 
-    pub fn new(node: NodeRuntime) -> Self {
-        PythonLspAdapter { node }
+#[cfg(target_os = "linux")]
+impl TyLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
+    const ARCH_SERVER_NAME: &str = "unknown-linux-gnu";
+}
+
+#[cfg(target_os = "freebsd")]
+impl TyLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
+    const ARCH_SERVER_NAME: &str = "unknown-freebsd";
+}
+
+#[cfg(target_os = "windows")]
+impl TyLspAdapter {
+    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Zip;
+    const ARCH_SERVER_NAME: &str = "pc-windows-msvc";
+}
+
+impl TyLspAdapter {
+    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("ty");
+
+    pub fn new(fs: Arc<dyn Fs>) -> TyLspAdapter {
+        TyLspAdapter { fs }
+    }
+
+    fn build_asset_name() -> Result<(String, String)> {
+        let arch = match consts::ARCH {
+            "x86" => "i686",
+            _ => consts::ARCH,
+        };
+        let os = Self::ARCH_SERVER_NAME;
+        let suffix = match consts::OS {
+            "windows" => "zip",
+            _ => "tar.gz",
+        };
+        let asset_name = format!("ty-{arch}-{os}.{suffix}");
+        let asset_stem = format!("ty-{arch}-{os}");
+        Ok((asset_stem, asset_name))
     }
 }
 
 #[async_trait(?Send)]
-impl LspAdapter for PythonLspAdapter {
+impl LspAdapter for TyLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        _: &AsyncApp,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        let release =
+            latest_github_release("astral-sh/ty", true, true, delegate.http_client()).await?;
+        let (_, asset_name) = Self::build_asset_name()?;
+        let asset = release
+            .assets
+            .into_iter()
+            .find(|asset| asset.name == asset_name)
+            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
+        Ok(Box::new(GitHubLspBinaryVersion {
+            name: release.tag_name,
+            url: asset.browser_download_url,
+            digest: asset.digest,
+        }))
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        latest_version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let GitHubLspBinaryVersion {
+            name,
+            url,
+            digest: expected_digest,
+        } = *latest_version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        let destination_path = container_dir.join(format!("ty-{name}"));
+        let server_path = match Self::GITHUB_ASSET_KIND {
+            AssetKind::TarGz | AssetKind::Gz => destination_path.clone(), // Tar and gzip extract in place.
+            AssetKind::Zip => destination_path.clone().join("ty.exe"),    // zip contains a .exe
+        };
+
+        let binary = LanguageServerBinary {
+            path: server_path.clone(),
+            env: None,
+            arguments: Default::default(),
+        };
+
+        let metadata_path = destination_path.with_extension("metadata");
+        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
+            .await
+            .ok();
+        if let Some(metadata) = metadata {
+            let validity_check = async || {
+                delegate
+                    .try_exec(LanguageServerBinary {
+                        path: server_path.clone(),
+                        arguments: vec!["--version".into()],
+                        env: None,
+                    })
+                    .await
+                    .inspect_err(|err| {
+                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
+                    })
+            };
+            if let (Some(actual_digest), Some(expected_digest)) =
+                (&metadata.digest, &expected_digest)
+            {
+                if actual_digest == expected_digest {
+                    if validity_check().await.is_ok() {
+                        return Ok(binary);
+                    }
+                } else {
+                    log::info!(
+                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
+                    );
+                }
+            } else if validity_check().await.is_ok() {
+                return Ok(binary);
+            }
+        }
+
+        download_server_binary(
+            delegate,
+            &url,
+            expected_digest.as_deref(),
+            &destination_path,
+            Self::GITHUB_ASSET_KIND,
+        )
+        .await?;
+        make_file_executable(&server_path).await?;
+        remove_matching(&container_dir, |path| path != destination_path).await;
+        GithubBinaryMetadata::write_to_file(
+            &GithubBinaryMetadata {
+                metadata_version: 1,
+                digest: expected_digest,
+            },
+            &metadata_path,
+        )
+        .await?;
+
+        Ok(LanguageServerBinary {
+            path: server_path,
+            env: None,
+            arguments: Default::default(),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        maybe!(async {
+            let mut last = None;
+            let mut entries = self.fs.read_dir(&container_dir).await?;
+            while let Some(entry) = entries.next().await {
+                let path = entry?;
+                if path.extension().is_some_and(|ext| ext == "metadata") {
+                    continue;
+                }
+                last = Some(path);
+            }
+
+            let path = last.context("no cached binary")?;
+            let path = match TyLspAdapter::GITHUB_ASSET_KIND {
+                AssetKind::TarGz | AssetKind::Gz => path, // Tar and gzip extract in place.
+                AssetKind::Zip => path.join("ty.exe"),    // zip contains a .exe
+            };
+
+            anyhow::Ok(LanguageServerBinary {
+                path,
+                env: None,
+                arguments: Default::default(),
+            })
+        })
+        .await
+        .log_err()
+    }
+
+    async fn workspace_configuration(
+        self: Arc<Self>,
+        _: &Arc<dyn LspAdapterDelegate>,
+        toolchain: Option<Toolchain>,
+        _cx: &mut AsyncApp,
+    ) -> Result<Value> {
+        let mut ret = json!({});
+        if let Some(toolchain) = toolchain.and_then(|toolchain| {
+            serde_json::from_value::<PythonEnvironment>(toolchain.as_json).ok()
+        }) {
+            _ = maybe!({
+                let uri = url::Url::from_file_path(toolchain.executable?).ok()?;
+                let sys_prefix = toolchain.prefix.clone()?;
+                let environment = json!({
+                    "executable": {
+                        "uri": uri,
+                        "sysPrefix": sys_prefix
+                    }
+                });
+                ret.as_object_mut()?.insert(
+                    "pythonExtension".into(),
+                    json!({ "activeEnvironment": environment }),
+                );
+                Some(())
+            });
+        }
+        Ok(json!({"ty": ret}))
+    }
+}
+
+pub struct PyrightLspAdapter {
+    node: NodeRuntime,
+}
+
+impl PyrightLspAdapter {
+    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("pyright");
+
+    pub fn new(node: NodeRuntime) -> Self {
+        PyrightLspAdapter { node }
+    }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for PyrightLspAdapter {
     fn name(&self) -> LanguageServerName {
         Self::SERVER_NAME
     }

From 2bb50acb584bbd459790e1bcda7a218b2fdd732f Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 17:54:33 -0400
Subject: [PATCH 801/823] Add action to send good first issues to discord
 (#38021)

Release Notes:

- N/A
---
 .../workflows/good_first_issue_notifier.yml   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/workflows/good_first_issue_notifier.yml

diff --git a/.github/workflows/good_first_issue_notifier.yml b/.github/workflows/good_first_issue_notifier.yml
new file mode 100644
index 0000000000..abb451600d
--- /dev/null
+++ b/.github/workflows/good_first_issue_notifier.yml
@@ -0,0 +1,36 @@
+name: Good First Issue Notifier
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  handle-good-first-issue:
+    if: github.event.label.name == 'good first issue' && github.repository_owner == 'zed-industries'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Prepare Discord message
+        id: prepare-message
+        env:
+          ISSUE_TITLE: ${{ github.event.issue.title }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          ISSUE_URL: ${{ github.event.issue.html_url }}
+          ISSUE_AUTHOR: ${{ github.event.issue.user.login }}
+        run: |
+          MESSAGE="[${ISSUE_TITLE} (#${ISSUE_NUMBER})](${ISSUE_URL})"
+
+          {
+            echo "message<<EOF"
+            echo "$MESSAGE"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@c840d45a03a323fbc3f7507ac7769dbd91bfb164 # v5.3.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_GOOD_FIRST_ISSUE }}
+          content: ${{ steps.prepare-message.outputs.message }}

From b60e70578281aec2dd399a2af1d40ad1433db3de Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Thu, 11 Sep 2025 18:29:06 -0400
Subject: [PATCH 802/823] Fix auto update not defaulting to true (#38022)

#37337 Made `AutoUpdateSetting` `FileContent =
AutoUpdateSettingsContent` which caused a deserialization bug to occur
because the field it was wrapping wasn't optional. Thus serde would
deserialize the wrapped type `bool` to its default value `false`
stopping the settings load function from reading the correct default
value from `default.json`

I also added a log message that states when the auto updater struct is
checking for updates to make this easier to test.

Release Notes:

- fix auto update defaulting to false
---
 crates/auto_update/src/auto_update.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index f5d4533a9e..c1e318ee84 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -119,9 +119,11 @@ struct AutoUpdateSetting(bool);
 ///
 /// Default: true
 #[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi, SettingsKey)]
-#[serde(transparent)]
-#[settings_key(key = "auto_update")]
-struct AutoUpdateSettingContent(bool);
+#[settings_key(None)]
+#[settings_ui(group = "Auto Update")]
+struct AutoUpdateSettingContent {
+    pub auto_update: Option<bool>,
+}
 
 impl Settings for AutoUpdateSetting {
     type FileContent = AutoUpdateSettingContent;
@@ -134,17 +136,22 @@ impl Settings for AutoUpdateSetting {
             sources.user,
         ]
         .into_iter()
-        .find_map(|value| value.copied())
-        .unwrap_or(*sources.default);
+        .find_map(|value| value.and_then(|val| val.auto_update))
+        .or(sources.default.auto_update)
+        .ok_or_else(Self::missing_default)?;
 
-        Ok(Self(auto_update.0))
+        Ok(Self(auto_update))
     }
 
     fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
         let mut cur = &mut Some(*current);
         vscode.enum_setting("update.mode", &mut cur, |s| match s {
-            "none" | "manual" => Some(AutoUpdateSettingContent(false)),
-            _ => Some(AutoUpdateSettingContent(true)),
+            "none" | "manual" => Some(AutoUpdateSettingContent {
+                auto_update: Some(false),
+            }),
+            _ => Some(AutoUpdateSettingContent {
+                auto_update: Some(true),
+            }),
         });
         *current = cur.unwrap();
     }
@@ -557,6 +564,7 @@ impl AutoUpdater {
 
         this.update(&mut cx, |this, cx| {
             this.status = AutoUpdateStatus::Checking;
+            log::info!("Auto Update: checking for updates");
             cx.notify();
         })?;
 

From 45ee1327a4b4cdef8d90c567f947a34a9962a2a6 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Thu, 11 Sep 2025 21:00:03 -0400
Subject: [PATCH 803/823] Add handling of git's core.excludesFile (#33592)

Taking over from #28314.

Part of https://github.com/zed-industries/zed/issues/4824

Co-authored-by: Paul Nameless <reacsdas@gmail.com>

Release Notes:

- Zed now respects git's `core.excludesFile` (~/.config/git/ignore) in
addition to .gitignore.

---------

Co-authored-by: Paul Nameless <reacsdas@gmail.com>
---
 Cargo.lock                                    |   2 +-
 crates/agent2/src/db.rs                       |   4 +
 crates/client/src/telemetry.rs                |   4 +-
 crates/fs/src/fs.rs                           |  15 -
 crates/paths/Cargo.toml                       |   4 +
 crates/paths/src/paths.rs                     |  13 +
 crates/project/src/project_tests.rs           |  24 +-
 crates/terminal/Cargo.toml                    |   1 -
 crates/terminal/src/terminal.rs               |  14 +-
 .../src/terminal_path_like_target.rs          |   3 +-
 crates/util/src/paths.rs                      |  24 +-
 crates/worktree/Cargo.toml                    |   1 +
 crates/worktree/src/ignore.rs                 |  80 ++++-
 crates/worktree/src/worktree.rs               | 289 +++++++++++++-----
 crates/worktree/src/worktree_tests.rs         | 112 ++++++-
 15 files changed, 454 insertions(+), 136 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0351fb336e..c8bde05dd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11598,6 +11598,7 @@ name = "paths"
 version = "0.1.0"
 dependencies = [
  "dirs 4.0.0",
+ "ignore",
  "util",
  "workspace-hack",
 ]
@@ -16437,7 +16438,6 @@ dependencies = [
  "alacritty_terminal",
  "anyhow",
  "collections",
- "dirs 4.0.0",
  "futures 0.3.31",
  "gpui",
  "libc",
diff --git a/crates/agent2/src/db.rs b/crates/agent2/src/db.rs
index c78725138f..3be37bbb55 100644
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -428,7 +428,9 @@ mod tests {
     use http_client::FakeHttpClient;
     use language_model::Role;
     use project::Project;
+    use serde_json::json;
     use settings::SettingsStore;
+    use util::test::TempTree;
 
     fn init_test(cx: &mut TestAppContext) {
         env_logger::try_init().ok();
@@ -449,6 +451,8 @@ mod tests {
 
     #[gpui::test]
     async fn test_retrieving_old_thread(cx: &mut TestAppContext) {
+        let tree = TempTree::new(json!({}));
+        util::paths::set_home_dir(tree.path().into());
         init_test(cx);
         let fs = FakeFs::new(cx.executor());
         let project = Project::test(fs, [], cx).await;
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index e312340086..7ab289a0ec 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -19,7 +19,7 @@ use std::sync::LazyLock;
 use std::time::Instant;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use telemetry_events::{AssistantEventData, AssistantPhase, Event, EventRequestBody, EventWrapper};
-use util::{ResultExt, TryFutureExt};
+use util::TryFutureExt;
 use worktree::{UpdatedEntriesSet, WorktreeId};
 
 use self::event_coalescer::EventCoalescer;
@@ -209,7 +209,7 @@ impl Telemetry {
             let os_version = os_version();
             state.lock().os_version = Some(os_version);
             async move {
-                if let Some(tempfile) = File::create(Self::log_file_path()).log_err() {
+                if let Some(tempfile) = File::create(Self::log_file_path()).ok() {
                     state.lock().log_file = Some(tempfile);
                 }
             }
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 846d1f75d8..bd7c94c1d7 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -134,7 +134,6 @@ pub trait Fs: Send + Sync {
         Arc<dyn Watcher>,
     );
 
-    fn home_dir(&self) -> Option<PathBuf>;
     fn open_repo(&self, abs_dot_git: &Path) -> Option<Arc<dyn GitRepository>>;
     fn git_init(&self, abs_work_directory: &Path, fallback_branch_name: String) -> Result<()>;
     async fn git_clone(&self, repo_url: &str, abs_work_directory: &Path) -> Result<()>;
@@ -916,10 +915,6 @@ impl Fs for RealFs {
         temp_dir.close()?;
         case_sensitive
     }
-
-    fn home_dir(&self) -> Option<PathBuf> {
-        Some(paths::home_dir().clone())
-    }
 }
 
 #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
@@ -954,7 +949,6 @@ struct FakeFsState {
     read_dir_call_count: usize,
     path_write_counts: std::collections::HashMap<PathBuf, usize>,
     moves: std::collections::HashMap<u64, PathBuf>,
-    home_dir: Option<PathBuf>,
 }
 
 #[cfg(any(test, feature = "test-support"))]
@@ -1239,7 +1233,6 @@ impl FakeFs {
                 metadata_call_count: 0,
                 path_write_counts: Default::default(),
                 moves: Default::default(),
-                home_dir: None,
             })),
         });
 
@@ -1902,10 +1895,6 @@ impl FakeFs {
     fn simulate_random_delay(&self) -> impl futures::Future<Output = ()> {
         self.executor.simulate_random_delay()
     }
-
-    pub fn set_home_dir(&self, home_dir: PathBuf) {
-        self.state.lock().home_dir = Some(home_dir);
-    }
 }
 
 #[cfg(any(test, feature = "test-support"))]
@@ -2499,10 +2488,6 @@ impl Fs for FakeFs {
     fn as_fake(&self) -> Arc<FakeFs> {
         self.this.upgrade().unwrap()
     }
-
-    fn home_dir(&self) -> Option<PathBuf> {
-        self.state.lock().home_dir.clone()
-    }
 }
 
 fn chunks(rope: &Rope, line_ending: LineEnding) -> impl Iterator<Item = &str> {
diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml
index cf6dabf0e1..44bb0953e2 100644
--- a/crates/paths/Cargo.toml
+++ b/crates/paths/Cargo.toml
@@ -8,10 +8,14 @@ license = "GPL-3.0-or-later"
 [lints]
 workspace = true
 
+[features]
+test-support = []
+
 [lib]
 path = "src/paths.rs"
 
 [dependencies]
 dirs.workspace = true
+ignore.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs
index ede42af027..af1b97c1cb 100644
--- a/crates/paths/src/paths.rs
+++ b/crates/paths/src/paths.rs
@@ -520,3 +520,16 @@ fn add_vscode_user_data_paths(paths: &mut Vec<PathBuf>, product_name: &str) {
         );
     }
 }
+
+#[cfg(any(test, feature = "test-support"))]
+pub fn global_gitignore_path() -> Option<PathBuf> {
+    Some(home_dir().join(".config").join("git").join("ignore"))
+}
+
+#[cfg(not(any(test, feature = "test-support")))]
+pub fn global_gitignore_path() -> Option<PathBuf> {
+    static GLOBAL_GITIGNORE_PATH: OnceLock<Option<PathBuf>> = OnceLock::new();
+    GLOBAL_GITIGNORE_PATH
+        .get_or_init(::ignore::gitignore::gitconfig_excludes_path)
+        .clone()
+}
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index c72f35833b..3745b1fdd0 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -31,7 +31,7 @@ use lsp::{
     Uri, WillRenameFiles, notification::DidRenameFiles,
 };
 use parking_lot::Mutex;
-use paths::{config_dir, tasks_file};
+use paths::{config_dir, global_gitignore_path, tasks_file};
 use postage::stream::Stream as _;
 use pretty_assertions::{assert_eq, assert_matches};
 use rand::{Rng as _, rngs::StdRng};
@@ -1391,7 +1391,9 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
     assert_eq!(fs.read_dir_call_count() - prev_read_dir_count, 5);
 
     let mut new_watched_paths = fs.watched_paths();
-    new_watched_paths.retain(|path| !path.starts_with(config_dir()));
+    new_watched_paths.retain(|path| {
+        !path.starts_with(config_dir()) && !path.starts_with(global_gitignore_path().unwrap())
+    });
     assert_eq!(
         &new_watched_paths,
         &[
@@ -7942,21 +7944,19 @@ async fn test_repository_and_path_for_project_path(
 async fn test_home_dir_as_git_repository(cx: &mut gpui::TestAppContext) {
     init_test(cx);
     let fs = FakeFs::new(cx.background_executor.clone());
+    let home = paths::home_dir();
     fs.insert_tree(
-        path!("/root"),
+        home,
         json!({
-            "home": {
-                ".git": {},
-                "project": {
-                    "a.txt": "A"
-                },
+            ".git": {},
+            "project": {
+                "a.txt": "A"
             },
         }),
     )
     .await;
-    fs.set_home_dir(Path::new(path!("/root/home")).to_owned());
 
-    let project = Project::test(fs.clone(), [path!("/root/home/project").as_ref()], cx).await;
+    let project = Project::test(fs.clone(), [home.join("project").as_ref()], cx).await;
     let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
     let tree_id = tree.read_with(cx, |tree, _| tree.id());
 
@@ -7973,7 +7973,7 @@ async fn test_home_dir_as_git_repository(cx: &mut gpui::TestAppContext) {
         assert!(containing.is_none());
     });
 
-    let project = Project::test(fs.clone(), [path!("/root/home").as_ref()], cx).await;
+    let project = Project::test(fs.clone(), [home.as_ref()], cx).await;
     let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
     let tree_id = tree.read_with(cx, |tree, _| tree.id());
     project
@@ -7993,7 +7993,7 @@ async fn test_home_dir_as_git_repository(cx: &mut gpui::TestAppContext) {
                 .read(cx)
                 .work_directory_abs_path
                 .as_ref(),
-            Path::new(path!("/root/home"))
+            home,
         );
     });
 }
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index b1c0dd693f..6c8c785915 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -23,7 +23,6 @@ doctest = false
 alacritty_terminal.workspace = true
 anyhow.workspace = true
 collections.workspace = true
-dirs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 libc.workspace = true
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index b119485408..b66c85b097 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -48,7 +48,10 @@ use terminal_hyperlinks::RegexSearches;
 use terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
 use theme::{ActiveTheme, Theme};
 use urlencoding;
-use util::{paths::home_dir, truncate_and_trailoff};
+use util::{
+    paths::{self, home_dir},
+    truncate_and_trailoff,
+};
 
 use std::{
     borrow::Cow,
@@ -291,12 +294,11 @@ impl TerminalError {
                     Err(s) => s,
                 }
             })
-            .unwrap_or_else(|| match dirs::home_dir() {
-                Some(dir) => format!(
+            .unwrap_or_else(|| {
+                format!(
                     "<none specified, using home directory> {}",
-                    dir.into_os_string().to_string_lossy()
-                ),
-                None => "<none specified, could not find home directory>".to_string(),
+                    paths::home_dir().to_string_lossy()
+                )
             })
     }
 
diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
index 22d4de73a8..eb236125a9 100644
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ b/crates/terminal_view/src/terminal_path_like_target.rs
@@ -546,9 +546,10 @@ mod tests {
         let (workspace, cx) =
             app_cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
+        let cwd = std::env::current_dir().expect("Failed to get working directory");
         let terminal = project
             .update(cx, |project: &mut Project, cx| {
-                project.create_terminal_shell(None, cx)
+                project.create_terminal_shell(Some(cwd), cx)
             })
             .await
             .expect("Failed to create a terminal");
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 318900d540..1658052e6f 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -12,10 +12,30 @@ use std::{
     sync::LazyLock,
 };
 
+static HOME_DIR: OnceLock<PathBuf> = OnceLock::new();
+
 /// Returns the path to the user's home directory.
 pub fn home_dir() -> &'static PathBuf {
-    static HOME_DIR: OnceLock<PathBuf> = OnceLock::new();
-    HOME_DIR.get_or_init(|| dirs::home_dir().expect("failed to determine home directory"))
+    HOME_DIR.get_or_init(|| {
+        if cfg!(any(test, feature = "test-support")) {
+            if cfg!(target_os = "macos") {
+                PathBuf::from("/Users/zed")
+            } else if cfg!(target_os = "windows") {
+                PathBuf::from("C:\\Users\\zed")
+            } else {
+                PathBuf::from("/home/zed")
+            }
+        } else {
+            dirs::home_dir().expect("failed to determine home directory")
+        }
+    })
+}
+
+#[cfg(any(test, feature = "test-support"))]
+pub fn set_home_dir(path: PathBuf) {
+    HOME_DIR
+        .set(path)
+        .expect("set_home_dir called after home_dir was already accessed");
 }
 
 pub trait PathExt {
diff --git a/crates/worktree/Cargo.toml b/crates/worktree/Cargo.toml
index db264fe3aa..507b95c00d 100644
--- a/crates/worktree/Cargo.toml
+++ b/crates/worktree/Cargo.toml
@@ -55,6 +55,7 @@ collections = { workspace = true, features = ["test-support"] }
 git2.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 http_client.workspace = true
+paths = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 rand.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
diff --git a/crates/worktree/src/ignore.rs b/crates/worktree/src/ignore.rs
index e8ba9192be..17c362e2d7 100644
--- a/crates/worktree/src/ignore.rs
+++ b/crates/worktree/src/ignore.rs
@@ -1,34 +1,60 @@
 use ignore::gitignore::Gitignore;
 use std::{ffi::OsStr, path::Path, sync::Arc};
 
+#[derive(Clone, Debug)]
+pub struct IgnoreStack {
+    pub repo_root: Option<Arc<Path>>,
+    pub top: Arc<IgnoreStackEntry>,
+}
+
 #[derive(Debug)]
-pub enum IgnoreStack {
+pub enum IgnoreStackEntry {
     None,
+    Global {
+        ignore: Arc<Gitignore>,
+    },
     Some {
         abs_base_path: Arc<Path>,
         ignore: Arc<Gitignore>,
-        parent: Arc<IgnoreStack>,
+        parent: Arc<IgnoreStackEntry>,
     },
     All,
 }
 
 impl IgnoreStack {
-    pub fn none() -> Arc<Self> {
-        Arc::new(Self::None)
+    pub fn none() -> Self {
+        Self {
+            repo_root: None,
+            top: Arc::new(IgnoreStackEntry::None),
+        }
     }
 
-    pub fn all() -> Arc<Self> {
-        Arc::new(Self::All)
+    pub fn all() -> Self {
+        Self {
+            repo_root: None,
+            top: Arc::new(IgnoreStackEntry::All),
+        }
     }
 
-    pub fn append(self: Arc<Self>, abs_base_path: Arc<Path>, ignore: Arc<Gitignore>) -> Arc<Self> {
-        match self.as_ref() {
-            IgnoreStack::All => self,
-            _ => Arc::new(Self::Some {
+    pub fn global(ignore: Arc<Gitignore>) -> Self {
+        Self {
+            repo_root: None,
+            top: Arc::new(IgnoreStackEntry::Global { ignore }),
+        }
+    }
+
+    pub fn append(self, abs_base_path: Arc<Path>, ignore: Arc<Gitignore>) -> Self {
+        let top = match self.top.as_ref() {
+            IgnoreStackEntry::All => self.top.clone(),
+            _ => Arc::new(IgnoreStackEntry::Some {
                 abs_base_path,
                 ignore,
-                parent: self,
+                parent: self.top.clone(),
             }),
+        };
+        Self {
+            repo_root: self.repo_root,
+            top,
         }
     }
 
@@ -37,15 +63,37 @@ impl IgnoreStack {
             return true;
         }
 
-        match self {
-            Self::None => false,
-            Self::All => true,
-            Self::Some {
+        match self.top.as_ref() {
+            IgnoreStackEntry::None => false,
+            IgnoreStackEntry::All => true,
+            IgnoreStackEntry::Global { ignore } => {
+                let combined_path;
+                let abs_path = if let Some(repo_root) = self.repo_root.as_ref() {
+                    combined_path = ignore.path().join(
+                        abs_path
+                            .strip_prefix(repo_root)
+                            .expect("repo root should be a parent of matched path"),
+                    );
+                    &combined_path
+                } else {
+                    abs_path
+                };
+                match ignore.matched(abs_path, is_dir) {
+                    ignore::Match::None => false,
+                    ignore::Match::Ignore(_) => true,
+                    ignore::Match::Whitelist(_) => false,
+                }
+            }
+            IgnoreStackEntry::Some {
                 abs_base_path,
                 ignore,
                 parent: prev,
             } => match ignore.matched(abs_path.strip_prefix(abs_base_path).unwrap(), is_dir) {
-                ignore::Match::None => prev.is_abs_path_ignored(abs_path, is_dir),
+                ignore::Match::None => IgnoreStack {
+                    repo_root: self.repo_root.clone(),
+                    top: prev.clone(),
+                }
+                .is_abs_path_ignored(abs_path, is_dir),
                 ignore::Match::Ignore(_) => true,
                 ignore::Match::Whitelist(_) => false,
             },
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 2db380fa2f..a0a48782ed 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -65,7 +65,7 @@ use std::{
 use sum_tree::{Bias, Dimensions, Edit, KeyedItem, SeekTarget, SumTree, Summary, TreeMap, TreeSet};
 use text::{LineEnding, Rope};
 use util::{
-    ResultExt,
+    ResultExt, debug_panic,
     paths::{PathMatcher, SanitizedPath, home_dir},
 };
 pub use worktree_settings::WorktreeSettings;
@@ -336,26 +336,10 @@ impl Default for WorkDirectory {
     }
 }
 
-#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
-pub struct WorkDirectoryEntry(ProjectEntryId);
-
-impl Deref for WorkDirectoryEntry {
-    type Target = ProjectEntryId;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl From<ProjectEntryId> for WorkDirectoryEntry {
-    fn from(value: ProjectEntryId) -> Self {
-        WorkDirectoryEntry(value)
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct LocalSnapshot {
     snapshot: Snapshot,
+    global_gitignore: Option<Arc<Gitignore>>,
     /// All of the gitignore files in the worktree, indexed by their relative path.
     /// The boolean indicates whether the gitignore needs to be updated.
     ignores_by_parent_abs_path: HashMap<Arc<Path>, (Arc<Gitignore>, bool)>,
@@ -504,6 +488,7 @@ impl Worktree {
         cx.new(move |cx: &mut Context<Worktree>| {
             let mut snapshot = LocalSnapshot {
                 ignores_by_parent_abs_path: Default::default(),
+                global_gitignore: Default::default(),
                 git_repositories: Default::default(),
                 snapshot: Snapshot::new(
                     cx.entity_id().as_u64(),
@@ -2807,8 +2792,9 @@ impl LocalSnapshot {
         inodes
     }
 
-    fn ignore_stack_for_abs_path(&self, abs_path: &Path, is_dir: bool) -> Arc<IgnoreStack> {
+    fn ignore_stack_for_abs_path(&self, abs_path: &Path, is_dir: bool, fs: &dyn Fs) -> IgnoreStack {
         let mut new_ignores = Vec::new();
+        let mut repo_root = None;
         for (index, ancestor) in abs_path.ancestors().enumerate() {
             if index > 0 {
                 if let Some((ignore, _)) = self.ignores_by_parent_abs_path.get(ancestor) {
@@ -2817,12 +2803,21 @@ impl LocalSnapshot {
                     new_ignores.push((ancestor, None));
                 }
             }
-            if ancestor.join(*DOT_GIT).exists() {
+            let metadata = smol::block_on(fs.metadata(&ancestor.join(*DOT_GIT)))
+                .ok()
+                .flatten();
+            if metadata.is_some() {
+                repo_root = Some(Arc::from(ancestor));
                 break;
             }
         }
 
-        let mut ignore_stack = IgnoreStack::none();
+        let mut ignore_stack = if let Some(global_gitignore) = self.global_gitignore.clone() {
+            IgnoreStack::global(global_gitignore)
+        } else {
+            IgnoreStack::none()
+        };
+        ignore_stack.repo_root = repo_root;
         for (parent_abs_path, ignore) in new_ignores.into_iter().rev() {
             if ignore_stack.is_abs_path_ignored(parent_abs_path, true) {
                 ignore_stack = IgnoreStack::all();
@@ -2949,9 +2944,15 @@ impl BackgroundScannerState {
                 .any(|p| entry.path.starts_with(p))
     }
 
-    fn enqueue_scan_dir(&self, abs_path: Arc<Path>, entry: &Entry, scan_job_tx: &Sender<ScanJob>) {
+    fn enqueue_scan_dir(
+        &self,
+        abs_path: Arc<Path>,
+        entry: &Entry,
+        scan_job_tx: &Sender<ScanJob>,
+        fs: &dyn Fs,
+    ) {
         let path = entry.path.clone();
-        let ignore_stack = self.snapshot.ignore_stack_for_abs_path(&abs_path, true);
+        let ignore_stack = self.snapshot.ignore_stack_for_abs_path(&abs_path, true, fs);
         let mut ancestor_inodes = self.snapshot.ancestor_inodes_for_path(&path);
 
         if !ancestor_inodes.contains(&entry.inode) {
@@ -3860,14 +3861,36 @@ impl BackgroundScanner {
 
         log::trace!("containing git repository: {containing_git_repository:?}");
 
+        let global_gitignore_path = paths::global_gitignore_path();
+        self.state.lock().snapshot.global_gitignore =
+            if let Some(global_gitignore_path) = global_gitignore_path.as_ref() {
+                build_gitignore(global_gitignore_path, self.fs.as_ref())
+                    .await
+                    .log_err()
+                    .map(Arc::new)
+            } else {
+                None
+            };
+        let mut global_gitignore_events = if let Some(global_gitignore_path) = global_gitignore_path
+        {
+            self.fs
+                .watch(&global_gitignore_path, FS_WATCH_LATENCY)
+                .await
+                .0
+        } else {
+            Box::pin(futures::stream::empty())
+        };
+
         let (scan_job_tx, scan_job_rx) = channel::unbounded();
         {
             let mut state = self.state.lock();
             state.snapshot.scan_id += 1;
             if let Some(mut root_entry) = state.snapshot.root_entry().cloned() {
-                let ignore_stack = state
-                    .snapshot
-                    .ignore_stack_for_abs_path(root_abs_path.as_path(), true);
+                let ignore_stack = state.snapshot.ignore_stack_for_abs_path(
+                    root_abs_path.as_path(),
+                    true,
+                    self.fs.as_ref(),
+                );
                 if ignore_stack.is_abs_path_ignored(root_abs_path.as_path(), true) {
                     root_entry.is_ignored = true;
                     state.insert_entry(root_entry.clone(), self.fs.as_ref(), self.watcher.as_ref());
@@ -3876,6 +3899,7 @@ impl BackgroundScanner {
                     SanitizedPath::cast_arc(root_abs_path),
                     &root_entry,
                     &scan_job_tx,
+                    self.fs.as_ref(),
                 );
             }
         };
@@ -3946,6 +3970,15 @@ impl BackgroundScanner {
                     }
                     self.process_events(paths.into_iter().map(Into::into).collect()).await;
                 }
+
+                paths = global_gitignore_events.next().fuse() => {
+                    match paths.as_deref() {
+                        Some([event, ..]) => {
+                            self.update_global_gitignore(&event.path).await;
+                        }
+                        _ => {},
+                    }
+                }
             }
         }
     }
@@ -4130,11 +4163,20 @@ impl BackgroundScanner {
         )
         .await;
 
-        self.update_ignore_statuses(scan_job_tx).await;
-        self.scan_dirs(false, scan_job_rx).await;
+        let affected_repo_roots = if !dot_git_abs_paths.is_empty() {
+            self.update_git_repositories(dot_git_abs_paths)
+        } else {
+            Vec::new()
+        };
 
-        if !dot_git_abs_paths.is_empty() {
-            self.update_git_repositories(dot_git_abs_paths);
+        {
+            let mut ignores_to_update = self.ignores_needing_update();
+            ignores_to_update.extend(affected_repo_roots);
+            let ignores_to_update = self.order_ignores(ignores_to_update);
+            let snapshot = self.state.lock().snapshot.clone();
+            self.update_ignore_statuses_for_paths(scan_job_tx, snapshot, ignores_to_update)
+                .await;
+            self.scan_dirs(false, scan_job_rx).await;
         }
 
         {
@@ -4147,6 +4189,32 @@ impl BackgroundScanner {
         self.send_status_update(false, SmallVec::new());
     }
 
+    async fn update_global_gitignore(&self, abs_path: &Path) {
+        let ignore = build_gitignore(abs_path, self.fs.as_ref())
+            .await
+            .log_err()
+            .map(Arc::new);
+        let (prev_snapshot, ignore_stack, abs_path) = {
+            let mut state = self.state.lock();
+            state.snapshot.global_gitignore = ignore;
+            let abs_path = state.snapshot.abs_path().clone();
+            let ignore_stack =
+                state
+                    .snapshot
+                    .ignore_stack_for_abs_path(&abs_path, true, self.fs.as_ref());
+            (state.snapshot.clone(), ignore_stack, abs_path)
+        };
+        let (scan_job_tx, scan_job_rx) = channel::unbounded();
+        self.update_ignore_statuses_for_paths(
+            scan_job_tx,
+            prev_snapshot,
+            vec![(abs_path, ignore_stack)].into_iter(),
+        )
+        .await;
+        self.scan_dirs(false, scan_job_rx).await;
+        self.send_status_update(false, SmallVec::new());
+    }
+
     async fn forcibly_load_paths(&self, paths: &[Arc<Path>]) -> bool {
         let (scan_job_tx, scan_job_rx) = channel::unbounded();
         {
@@ -4158,7 +4226,12 @@ impl BackgroundScanner {
                         && entry.kind == EntryKind::UnloadedDir
                     {
                         let abs_path = root_path.as_path().join(ancestor);
-                        state.enqueue_scan_dir(abs_path.into(), entry, &scan_job_tx);
+                        state.enqueue_scan_dir(
+                            abs_path.into(),
+                            entry,
+                            &scan_job_tx,
+                            self.fs.as_ref(),
+                        );
                         state.paths_to_scan.insert(path.clone());
                         break;
                     }
@@ -4309,6 +4382,12 @@ impl BackgroundScanner {
         swap_to_front(&mut child_paths, *GITIGNORE);
         swap_to_front(&mut child_paths, *DOT_GIT);
 
+        if let Some(path) = child_paths.first()
+            && path.ends_with(*DOT_GIT)
+        {
+            ignore_stack.repo_root = Some(job.abs_path.clone());
+        }
+
         for child_abs_path in child_paths {
             let child_abs_path: Arc<Path> = child_abs_path.into();
             let child_name = child_abs_path.file_name().unwrap();
@@ -4534,9 +4613,11 @@ impl BackgroundScanner {
             let abs_path: Arc<Path> = root_abs_path.as_path().join(path).into();
             match metadata {
                 Ok(Some((metadata, canonical_path))) => {
-                    let ignore_stack = state
-                        .snapshot
-                        .ignore_stack_for_abs_path(&abs_path, metadata.is_dir);
+                    let ignore_stack = state.snapshot.ignore_stack_for_abs_path(
+                        &abs_path,
+                        metadata.is_dir,
+                        self.fs.as_ref(),
+                    );
                     let is_external = !canonical_path.starts_with(&root_canonical_path);
                     let mut fs_entry = Entry::new(
                         path.clone(),
@@ -4561,7 +4642,12 @@ impl BackgroundScanner {
                             || (fs_entry.path.as_os_str().is_empty()
                                 && abs_path.file_name() == Some(*DOT_GIT))
                         {
-                            state.enqueue_scan_dir(abs_path, &fs_entry, scan_queue_tx);
+                            state.enqueue_scan_dir(
+                                abs_path,
+                                &fs_entry,
+                                scan_queue_tx,
+                                self.fs.as_ref(),
+                            );
                         } else {
                             fs_entry.kind = EntryKind::UnloadedDir;
                         }
@@ -4616,43 +4702,15 @@ impl BackgroundScanner {
         Some(())
     }
 
-    async fn update_ignore_statuses(&self, scan_job_tx: Sender<ScanJob>) {
-        let mut ignores_to_update = Vec::new();
+    async fn update_ignore_statuses_for_paths(
+        &self,
+        scan_job_tx: Sender<ScanJob>,
+        prev_snapshot: LocalSnapshot,
+        mut ignores_to_update: impl Iterator<Item = (Arc<Path>, IgnoreStack)>,
+    ) {
         let (ignore_queue_tx, ignore_queue_rx) = channel::unbounded();
-        let prev_snapshot;
         {
-            let snapshot = &mut self.state.lock().snapshot;
-            let abs_path = snapshot.abs_path.clone();
-            snapshot
-                .ignores_by_parent_abs_path
-                .retain(|parent_abs_path, (_, needs_update)| {
-                    if let Ok(parent_path) = parent_abs_path.strip_prefix(abs_path.as_path()) {
-                        if *needs_update {
-                            *needs_update = false;
-                            if snapshot.snapshot.entry_for_path(parent_path).is_some() {
-                                ignores_to_update.push(parent_abs_path.clone());
-                            }
-                        }
-
-                        let ignore_path = parent_path.join(*GITIGNORE);
-                        if snapshot.snapshot.entry_for_path(ignore_path).is_none() {
-                            return false;
-                        }
-                    }
-                    true
-                });
-
-            ignores_to_update.sort_unstable();
-            let mut ignores_to_update = ignores_to_update.into_iter().peekable();
-            while let Some(parent_abs_path) = ignores_to_update.next() {
-                while ignores_to_update
-                    .peek()
-                    .is_some_and(|p| p.starts_with(&parent_abs_path))
-                {
-                    ignores_to_update.next().unwrap();
-                }
-
-                let ignore_stack = snapshot.ignore_stack_for_abs_path(&parent_abs_path, true);
+            while let Some((parent_abs_path, ignore_stack)) = ignores_to_update.next() {
                 ignore_queue_tx
                     .send_blocking(UpdateIgnoreStatusJob {
                         abs_path: parent_abs_path,
@@ -4662,8 +4720,6 @@ impl BackgroundScanner {
                     })
                     .unwrap();
             }
-
-            prev_snapshot = snapshot.clone();
         }
         drop(ignore_queue_tx);
 
@@ -4695,6 +4751,57 @@ impl BackgroundScanner {
             .await;
     }
 
+    fn ignores_needing_update(&self) -> Vec<Arc<Path>> {
+        let mut ignores_to_update = Vec::new();
+
+        {
+            let snapshot = &mut self.state.lock().snapshot;
+            let abs_path = snapshot.abs_path.clone();
+            snapshot
+                .ignores_by_parent_abs_path
+                .retain(|parent_abs_path, (_, needs_update)| {
+                    if let Ok(parent_path) = parent_abs_path.strip_prefix(abs_path.as_path()) {
+                        if *needs_update {
+                            *needs_update = false;
+                            if snapshot.snapshot.entry_for_path(parent_path).is_some() {
+                                ignores_to_update.push(parent_abs_path.clone());
+                            }
+                        }
+
+                        let ignore_path = parent_path.join(*GITIGNORE);
+                        if snapshot.snapshot.entry_for_path(ignore_path).is_none() {
+                            return false;
+                        }
+                    }
+                    true
+                });
+        }
+
+        ignores_to_update
+    }
+
+    fn order_ignores(
+        &self,
+        mut ignores: Vec<Arc<Path>>,
+    ) -> impl use<> + Iterator<Item = (Arc<Path>, IgnoreStack)> {
+        let fs = self.fs.clone();
+        let snapshot = self.state.lock().snapshot.clone();
+        ignores.sort_unstable();
+        let mut ignores_to_update = ignores.into_iter().peekable();
+        std::iter::from_fn(move || {
+            let parent_abs_path = ignores_to_update.next()?;
+            while ignores_to_update
+                .peek()
+                .map_or(false, |p| p.starts_with(&parent_abs_path))
+            {
+                ignores_to_update.next().unwrap();
+            }
+            let ignore_stack =
+                snapshot.ignore_stack_for_abs_path(&parent_abs_path, true, fs.as_ref());
+            Some((parent_abs_path, ignore_stack))
+        })
+    }
+
     async fn update_ignore_status(&self, job: UpdateIgnoreStatusJob, snapshot: &LocalSnapshot) {
         log::trace!("update ignore status {:?}", job.abs_path);
 
@@ -4710,6 +4817,12 @@ impl BackgroundScanner {
             .strip_prefix(snapshot.abs_path.as_path())
             .unwrap();
 
+        if let Ok(Some(metadata)) = smol::block_on(self.fs.metadata(&job.abs_path.join(*DOT_GIT)))
+            && metadata.is_dir
+        {
+            ignore_stack.repo_root = Some(job.abs_path.clone());
+        }
+
         for mut entry in snapshot.child_entries(path).cloned() {
             let was_ignored = entry.is_ignored;
             let abs_path: Arc<Path> = snapshot.abs_path().join(&entry.path).into();
@@ -4726,7 +4839,12 @@ impl BackgroundScanner {
                 if was_ignored && !entry.is_ignored && entry.kind.is_unloaded() {
                     let state = self.state.lock();
                     if state.should_scan_directory(&entry) {
-                        state.enqueue_scan_dir(abs_path.clone(), &entry, &job.scan_queue);
+                        state.enqueue_scan_dir(
+                            abs_path.clone(),
+                            &entry,
+                            &job.scan_queue,
+                            self.fs.as_ref(),
+                        );
                     }
                 }
 
@@ -4766,10 +4884,11 @@ impl BackgroundScanner {
         state.snapshot.entries_by_id.edit(entries_by_id_edits, &());
     }
 
-    fn update_git_repositories(&self, dot_git_paths: Vec<PathBuf>) {
+    fn update_git_repositories(&self, dot_git_paths: Vec<PathBuf>) -> Vec<Arc<Path>> {
         log::trace!("reloading repositories: {dot_git_paths:?}");
         let mut state = self.state.lock();
         let scan_id = state.snapshot.scan_id;
+        let mut affected_repo_roots = Vec::new();
         for dot_git_dir in dot_git_paths {
             let existing_repository_entry =
                 state
@@ -4791,8 +4910,12 @@ impl BackgroundScanner {
             match existing_repository_entry {
                 None => {
                     let Ok(relative) = dot_git_dir.strip_prefix(state.snapshot.abs_path()) else {
-                        return;
+                        debug_panic!(
+                            "update_git_repositories called with .git directory outside the worktree root"
+                        );
+                        return Vec::new();
                     };
+                    affected_repo_roots.push(dot_git_dir.parent().unwrap().into());
                     state.insert_git_repository(
                         relative.into(),
                         self.fs.as_ref(),
@@ -4830,7 +4953,15 @@ impl BackgroundScanner {
 
         snapshot
             .git_repositories
-            .retain(|work_directory_id, _| ids_to_preserve.contains(work_directory_id));
+            .retain(|work_directory_id, entry| {
+                let preserve = ids_to_preserve.contains(work_directory_id);
+                if !preserve {
+                    affected_repo_roots.push(entry.dot_git_abs_path.parent().unwrap().into());
+                }
+                preserve
+            });
+
+        affected_repo_roots
     }
 
     async fn progress_timer(&self, running: bool) {
@@ -4870,7 +5001,7 @@ async fn discover_ancestor_git_repo(
     let mut ignores = HashMap::default();
     for (index, ancestor) in root_abs_path.as_path().ancestors().enumerate() {
         if index != 0 {
-            if Some(ancestor) == fs.home_dir().as_deref() {
+            if ancestor == paths::home_dir() {
                 // Unless $HOME is itself the worktree root, don't consider it as a
                 // containing git repository---expensive and likely unwanted.
                 break;
@@ -5052,7 +5183,7 @@ fn char_bag_for_path(root_char_bag: CharBag, path: &Path) -> CharBag {
 struct ScanJob {
     abs_path: Arc<Path>,
     path: Arc<Path>,
-    ignore_stack: Arc<IgnoreStack>,
+    ignore_stack: IgnoreStack,
     scan_queue: Sender<ScanJob>,
     ancestor_inodes: TreeSet<u64>,
     is_external: bool,
@@ -5060,7 +5191,7 @@ struct ScanJob {
 
 struct UpdateIgnoreStatusJob {
     abs_path: Arc<Path>,
-    ignore_stack: Arc<IgnoreStack>,
+    ignore_stack: IgnoreStack,
     ignore_queue: Sender<UpdateIgnoreStatusJob>,
     scan_queue: Sender<ScanJob>,
 }
diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs
index 92569e0f81..796840367a 100644
--- a/crates/worktree/src/worktree_tests.rs
+++ b/crates/worktree/src/worktree_tests.rs
@@ -2120,7 +2120,6 @@ async fn test_repository_above_root(executor: BackgroundExecutor, cx: &mut TestA
     });
     pretty_assertions::assert_eq!(repos, [Path::new(path!("/root")).into()]);
 
-    eprintln!(">>>>>>>>>> touch");
     fs.touch_path(path!("/root/subproject")).await;
     worktree
         .update(cx, |worktree, _| {
@@ -2141,6 +2140,117 @@ async fn test_repository_above_root(executor: BackgroundExecutor, cx: &mut TestA
     pretty_assertions::assert_eq!(repos, [Path::new(path!("/root")).into()]);
 }
 
+#[gpui::test]
+async fn test_global_gitignore(executor: BackgroundExecutor, cx: &mut TestAppContext) {
+    init_test(cx);
+
+    let home = paths::home_dir();
+    let fs = FakeFs::new(executor);
+    fs.insert_tree(
+        home,
+        json!({
+            ".config": {
+                "git": {
+                    "ignore": "foo\n/bar\nbaz\n"
+                }
+            },
+            "project": {
+                ".git": {},
+                ".gitignore": "!baz",
+                "foo": "",
+                "bar": "",
+                "sub": {
+                    "bar": "",
+                },
+                "subrepo": {
+                    ".git": {},
+                    "bar": ""
+                },
+                "baz": ""
+            }
+        }),
+    )
+    .await;
+    let worktree = Worktree::local(
+        home.join("project"),
+        true,
+        fs.clone(),
+        Arc::default(),
+        &mut cx.to_async(),
+    )
+    .await
+    .unwrap();
+    worktree
+        .update(cx, |worktree, _| {
+            worktree.as_local().unwrap().scan_complete()
+        })
+        .await;
+    cx.run_until_parked();
+
+    // .gitignore overrides excludesFile, and anchored paths in excludesFile are resolved
+    // relative to the nearest containing repository
+    worktree.update(cx, |worktree, _cx| {
+        check_worktree_entries(
+            worktree,
+            &[],
+            &["foo", "bar", "subrepo/bar"],
+            &["sub/bar", "baz"],
+            &[],
+        );
+    });
+
+    // Ignore statuses are updated when excludesFile changes
+    fs.write(
+        &home.join(".config").join("git").join("ignore"),
+        "/bar\nbaz\n".as_bytes(),
+    )
+    .await
+    .unwrap();
+    worktree
+        .update(cx, |worktree, _| {
+            worktree.as_local().unwrap().scan_complete()
+        })
+        .await;
+    cx.run_until_parked();
+
+    worktree.update(cx, |worktree, _cx| {
+        check_worktree_entries(
+            worktree,
+            &[],
+            &["bar", "subrepo/bar"],
+            &["foo", "sub/bar", "baz"],
+            &[],
+        );
+    });
+
+    // Statuses are updated when .git added/removed
+    fs.remove_dir(
+        &home.join("project").join("subrepo").join(".git"),
+        RemoveOptions {
+            recursive: true,
+            ..Default::default()
+        },
+    )
+    .await
+    .unwrap();
+    worktree
+        .update(cx, |worktree, _| {
+            worktree.as_local().unwrap().scan_complete()
+        })
+        .await;
+    cx.run_until_parked();
+
+    worktree.update(cx, |worktree, _cx| {
+        check_worktree_entries(
+            worktree,
+            &[],
+            &["bar"],
+            &["foo", "sub/bar", "baz", "subrepo/bar"],
+            &[],
+        );
+    });
+}
+
 #[track_caller]
 fn check_worktree_entries(
     tree: &Worktree,

From bdf44e55aaa15fd3fee4889adae08e903023ec5f Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Thu, 11 Sep 2025 21:16:51 -0400
Subject: [PATCH 804/823] Prevent Discord URL preview in good first issue
 notifications (#38030)

Release Notes:

- N/A
---
 .github/workflows/good_first_issue_notifier.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/good_first_issue_notifier.yml b/.github/workflows/good_first_issue_notifier.yml
index abb451600d..1db992502b 100644
--- a/.github/workflows/good_first_issue_notifier.yml
+++ b/.github/workflows/good_first_issue_notifier.yml
@@ -21,7 +21,7 @@ jobs:
           ISSUE_URL: ${{ github.event.issue.html_url }}
           ISSUE_AUTHOR: ${{ github.event.issue.user.login }}
         run: |
-          MESSAGE="[${ISSUE_TITLE} (#${ISSUE_NUMBER})](${ISSUE_URL})"
+          MESSAGE="[${ISSUE_TITLE} (#${ISSUE_NUMBER})](<${ISSUE_URL}>)"
 
           {
             echo "message<<EOF"

From 405d7d74761e594db0a51ecd26a968f9e185aaa0 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Thu, 11 Sep 2025 22:18:42 -0400
Subject: [PATCH 805/823] Don't send contents of large `@mention`-ed files
 (#38032)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<img width="598" height="311" alt="Screenshot 2025-09-11 at 9 39 12 PM"
src="https://github.com/user-attachments/assets/b526e648-37cf-4412-83a0-42037b9fc94d"
/>

This is for both ACP and the regular agent. Previously we would always
include the whole file, which can easily blow the context window on huge
files.

Release Notes:

- When `@mention`ing large files, the Agent Panel now send an outline of
the file instead of the whole thing.
---
 crates/agent/src/context.rs                  |  46 ++----
 crates/agent2/src/tools/read_file_tool.rs    |  32 ++---
 crates/agent_ui/src/acp/message_editor.rs    | 139 +++++++++++++++++--
 crates/assistant_tool/src/outline.rs         |  67 ++++++++-
 crates/assistant_tools/src/read_file_tool.rs |  30 ++--
 5 files changed, 224 insertions(+), 90 deletions(-)

diff --git a/crates/agent/src/context.rs b/crates/agent/src/context.rs
index 71fa8176a0..4510b0d3d3 100644
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -6,7 +6,7 @@ use futures::future;
 use futures::{FutureExt, future::Shared};
 use gpui::{App, AppContext as _, ElementId, Entity, SharedString, Task};
 use icons::IconName;
-use language::{Buffer, ParseStatus};
+use language::Buffer;
 use language_model::{LanguageModelImage, LanguageModelRequestMessage, MessageContent};
 use project::{Project, ProjectEntryId, ProjectPath, Worktree};
 use prompt_store::{PromptStore, UserPromptId};
@@ -191,45 +191,19 @@ impl FileContextHandle {
         let buffer = self.buffer.clone();
 
         cx.spawn(async move |cx| {
-            // For large files, use outline instead of full content
-            if rope.len() > outline::AUTO_OUTLINE_SIZE {
-                // Wait until the buffer has been fully parsed, so we can read its outline
-                if let Ok(mut parse_status) =
-                    buffer.read_with(cx, |buffer, _| buffer.parse_status())
-                {
-                    while *parse_status.borrow() != ParseStatus::Idle {
-                        parse_status.changed().await.log_err();
-                    }
+            let buffer_content =
+                outline::get_buffer_content_or_outline(buffer.clone(), Some(&full_path), &cx)
+                    .await
+                    .unwrap_or_else(|_| outline::BufferContent {
+                        text: rope.to_string(),
+                        is_outline: false,
+                    });
 
-                    if let Ok(snapshot) = buffer.read_with(cx, |buffer, _| buffer.snapshot()) {
-                        let items = snapshot
-                            .outline(None)
-                            .items
-                            .into_iter()
-                            .map(|item| item.to_point(&snapshot));
-
-                        if let Ok(outline_text) =
-                            outline::render_outline(items, None, 0, usize::MAX).await
-                        {
-                            let context = AgentContext::File(FileContext {
-                                handle: self,
-                                full_path,
-                                text: outline_text.into(),
-                                is_outline: true,
-                            });
-                            return Some((context, vec![buffer]));
-                        }
-                    }
-                }
-            }
-
-            // Fallback to full content if we couldn't build an outline
-            // (or didn't need to because the file was small enough)
             let context = AgentContext::File(FileContext {
                 handle: self,
                 full_path,
-                text: rope.to_string().into(),
-                is_outline: false,
+                text: buffer_content.text.into(),
+                is_outline: buffer_content.is_outline,
             });
             Some((context, vec![buffer]))
         })
diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index 99f145901c..09f2ff3ca9 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -147,7 +147,7 @@ impl AgentTool for ReadFileTool {
 
         event_stream.update_fields(ToolCallUpdateFields {
             locations: Some(vec![acp::ToolCallLocation {
-                path: abs_path,
+                path: abs_path.clone(),
                 line: input.start_line.map(|line| line.saturating_sub(1)),
             }]),
             ..Default::default()
@@ -225,38 +225,30 @@ impl AgentTool for ReadFileTool {
                 Ok(result.into())
             } else {
                 // No line ranges specified, so check file size to see if it's too big.
-                let file_size = buffer.read_with(cx, |buffer, _cx| buffer.text().len())?;
+                let buffer_content =
+                    outline::get_buffer_content_or_outline(buffer.clone(), Some(&abs_path), cx)
+                        .await?;
 
-                if file_size <= outline::AUTO_OUTLINE_SIZE {
-                    // File is small enough, so return its contents.
-                    let result = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+                action_log.update(cx, |log, cx| {
+                    log.buffer_read(buffer.clone(), cx);
+                })?;
 
-                    action_log.update(cx, |log, cx| {
-                        log.buffer_read(buffer.clone(), cx);
-                    })?;
-
-                    Ok(result.into())
-                } else {
-                    // File is too big, so return the outline
-                    // and a suggestion to read again with line numbers.
-                    let outline =
-                        outline::file_outline(project.clone(), file_path, action_log, None, cx)
-                            .await?;
+                if buffer_content.is_outline {
                     Ok(formatdoc! {"
                         This file was too big to read all at once.
 
-                        Here is an outline of its symbols:
-
-                        {outline}
+                        {}
 
                         Using the line numbers in this outline, you can call this tool again
                         while specifying the start_line and end_line fields to see the
                         implementations of symbols in the outline.
 
                         Alternatively, you can fall back to the `grep` tool (if available)
-                        to search the file for specific content."
+                        to search the file for specific content.", buffer_content.text
                     }
                     .into())
+                } else {
+                    Ok(buffer_content.text.into())
                 }
             };
 
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 02ee46e840..2c14e284d7 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -8,6 +8,7 @@ use agent_servers::{AgentServer, AgentServerDelegate};
 use agent2::HistoryStore;
 use anyhow::{Result, anyhow};
 use assistant_slash_commands::codeblock_fence_for_path;
+use assistant_tool::outline;
 use collections::{HashMap, HashSet};
 use editor::{
     Addon, Anchor, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
@@ -456,11 +457,14 @@ impl MessageEditor {
             .update(cx, |project, cx| project.open_buffer(project_path, cx));
         cx.spawn(async move |_, cx| {
             let buffer = buffer.await?;
-            let mention = buffer.update(cx, |buffer, cx| Mention::Text {
-                content: buffer.text(),
-                tracked_buffers: vec![cx.entity()],
-            })?;
-            anyhow::Ok(mention)
+            let buffer_content =
+                outline::get_buffer_content_or_outline(buffer.clone(), Some(&abs_path), &cx)
+                    .await?;
+
+            Ok(Mention::Text {
+                content: buffer_content.text,
+                tracked_buffers: vec![buffer],
+            })
         })
     }
 
@@ -520,18 +524,17 @@ impl MessageEditor {
                         })
                     });
 
-                    // TODO: report load errors instead of just logging
-                    let rope_task = cx.spawn(async move |cx| {
+                    cx.spawn(async move |cx| {
                         let buffer = open_task.await.log_err()?;
-                        let rope = buffer
-                            .read_with(cx, |buffer, _cx| buffer.as_rope().clone())
-                            .log_err()?;
-                        Some((rope, buffer))
-                    });
+                        let buffer_content = outline::get_buffer_content_or_outline(
+                            buffer.clone(),
+                            Some(&full_path),
+                            &cx,
+                        )
+                        .await
+                        .ok()?;
 
-                    cx.background_spawn(async move {
-                        let (rope, buffer) = rope_task.await?;
-                        Some((rel_path, full_path, rope.to_string(), buffer))
+                        Some((rel_path, full_path, buffer_content.text, buffer))
                     })
                 }))
             })?;
@@ -1580,6 +1583,7 @@ mod tests {
     use agent_client_protocol as acp;
     use agent2::HistoryStore;
     use assistant_context::ContextStore;
+    use assistant_tool::outline;
     use editor::{AnchorRangeExt as _, Editor, EditorMode};
     use fs::FakeFs;
     use futures::StreamExt as _;
@@ -2584,4 +2588,109 @@ mod tests {
             })
             .collect::<Vec<_>>()
     }
+
+    #[gpui::test]
+    async fn test_large_file_mention_uses_outline(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+
+        // Create a large file that exceeds AUTO_OUTLINE_SIZE
+        const LINE: &str = "fn example_function() { /* some code */ }\n";
+        let large_content = LINE.repeat(2 * (outline::AUTO_OUTLINE_SIZE / LINE.len()));
+        assert!(large_content.len() > outline::AUTO_OUTLINE_SIZE);
+
+        // Create a small file that doesn't exceed AUTO_OUTLINE_SIZE
+        let small_content = "fn small_function() { /* small */ }\n";
+        assert!(small_content.len() < outline::AUTO_OUTLINE_SIZE);
+
+        fs.insert_tree(
+            "/project",
+            json!({
+                "large_file.rs": large_content.clone(),
+                "small_file.rs": small_content,
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
+
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+        let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
+        let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
+
+        let message_editor = cx.update(|window, cx| {
+            cx.new(|cx| {
+                let editor = MessageEditor::new(
+                    workspace.downgrade(),
+                    project.clone(),
+                    history_store.clone(),
+                    None,
+                    Default::default(),
+                    Default::default(),
+                    "Test Agent".into(),
+                    "Test",
+                    EditorMode::AutoHeight {
+                        min_lines: 1,
+                        max_lines: None,
+                    },
+                    window,
+                    cx,
+                );
+                // Enable embedded context so files are actually included
+                editor.prompt_capabilities.set(acp::PromptCapabilities {
+                    embedded_context: true,
+                    ..Default::default()
+                });
+                editor
+            })
+        });
+
+        // Test large file mention
+        // Get the absolute path using the project's worktree
+        let large_file_abs_path = project.read_with(cx, |project, cx| {
+            let worktree = project.worktrees(cx).next().unwrap();
+            let worktree_root = worktree.read(cx).abs_path();
+            worktree_root.join("large_file.rs")
+        });
+        let large_file_task = message_editor.update(cx, |editor, cx| {
+            editor.confirm_mention_for_file(large_file_abs_path, cx)
+        });
+
+        let large_file_mention = large_file_task.await.unwrap();
+        match large_file_mention {
+            Mention::Text { content, .. } => {
+                // Should contain outline header for large files
+                assert!(content.contains("File outline for"));
+                assert!(content.contains("file too large to show full content"));
+                // Should not contain the full repeated content
+                assert!(!content.contains(&LINE.repeat(100)));
+            }
+            _ => panic!("Expected Text mention for large file"),
+        }
+
+        // Test small file mention
+        // Get the absolute path using the project's worktree
+        let small_file_abs_path = project.read_with(cx, |project, cx| {
+            let worktree = project.worktrees(cx).next().unwrap();
+            let worktree_root = worktree.read(cx).abs_path();
+            worktree_root.join("small_file.rs")
+        });
+        let small_file_task = message_editor.update(cx, |editor, cx| {
+            editor.confirm_mention_for_file(small_file_abs_path, cx)
+        });
+
+        let small_file_mention = small_file_task.await.unwrap();
+        match small_file_mention {
+            Mention::Text { content, .. } => {
+                // Should contain the actual content
+                assert_eq!(content, small_content);
+                // Should not contain outline header
+                assert!(!content.contains("File outline for"));
+            }
+            _ => panic!("Expected Text mention for small file"),
+        }
+    }
 }
diff --git a/crates/assistant_tool/src/outline.rs b/crates/assistant_tool/src/outline.rs
index d9bf64cf05..fa5ad561ee 100644
--- a/crates/assistant_tool/src/outline.rs
+++ b/crates/assistant_tool/src/outline.rs
@@ -1,10 +1,11 @@
 use action_log::ActionLog;
 use anyhow::{Context as _, Result};
 use gpui::{AsyncApp, Entity};
-use language::{OutlineItem, ParseStatus};
+use language::{Buffer, OutlineItem, ParseStatus};
 use project::Project;
 use regex::Regex;
 use std::fmt::Write;
+use std::path::Path;
 use text::Point;
 
 /// For files over this size, instead of reading them (or including them in context),
@@ -128,3 +129,67 @@ fn render_entries(
 
     entries_rendered
 }
+
+/// Result of getting buffer content, which can be either full content or an outline.
+pub struct BufferContent {
+    /// The actual content (either full text or outline)
+    pub text: String,
+    /// Whether this is an outline (true) or full content (false)
+    pub is_outline: bool,
+}
+
+/// Returns either the full content of a buffer or its outline, depending on size.
+/// For files larger than AUTO_OUTLINE_SIZE, returns an outline with a header.
+/// For smaller files, returns the full content.
+pub async fn get_buffer_content_or_outline(
+    buffer: Entity<Buffer>,
+    path: Option<&Path>,
+    cx: &AsyncApp,
+) -> Result<BufferContent> {
+    let file_size = buffer.read_with(cx, |buffer, _| buffer.text().len())?;
+
+    if file_size > AUTO_OUTLINE_SIZE {
+        // For large files, use outline instead of full content
+        // Wait until the buffer has been fully parsed, so we can read its outline
+        let mut parse_status = buffer.read_with(cx, |buffer, _| buffer.parse_status())?;
+        while *parse_status.borrow() != ParseStatus::Idle {
+            parse_status.changed().await?;
+        }
+
+        let outline_items = buffer.read_with(cx, |buffer, _| {
+            let snapshot = buffer.snapshot();
+            snapshot
+                .outline(None)
+                .items
+                .into_iter()
+                .map(|item| item.to_point(&snapshot))
+                .collect::<Vec<_>>()
+        })?;
+
+        let outline_text = render_outline(outline_items, None, 0, usize::MAX).await?;
+
+        let text = if let Some(path) = path {
+            format!(
+                "# File outline for {} (file too large to show full content)\n\n{}",
+                path.display(),
+                outline_text
+            )
+        } else {
+            format!(
+                "# File outline (file too large to show full content)\n\n{}",
+                outline_text
+            )
+        };
+        Ok(BufferContent {
+            text,
+            is_outline: true,
+        })
+    } else {
+        // File is small enough, return full content
+        let text = buffer.read_with(cx, |buffer, _| buffer.text())?;
+        Ok(BufferContent {
+            text,
+            is_outline: false,
+        })
+    }
+}
diff --git a/crates/assistant_tools/src/read_file_tool.rs b/crates/assistant_tools/src/read_file_tool.rs
index a6e984fca6..7222f061c7 100644
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -261,37 +261,31 @@ impl Tool for ReadFileTool {
                 Ok(result)
             } else {
                 // No line ranges specified, so check file size to see if it's too big.
-                let file_size = buffer.read_with(cx, |buffer, _cx| buffer.text().len())?;
+                let path_buf = std::path::PathBuf::from(&file_path);
+                let buffer_content =
+                    outline::get_buffer_content_or_outline(buffer.clone(), Some(&path_buf), cx)
+                        .await?;
 
-                if file_size <= outline::AUTO_OUTLINE_SIZE {
-                    // File is small enough, so return its contents.
-                    let result = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+                action_log.update(cx, |log, cx| {
+                    log.buffer_read(buffer, cx);
+                })?;
 
-                    action_log.update(cx, |log, cx| {
-                        log.buffer_read(buffer, cx);
-                    })?;
-
-                    Ok(result.into())
-                } else {
-                    // File is too big, so return the outline
-                    // and a suggestion to read again with line numbers.
-                    let outline =
-                        outline::file_outline(project, file_path, action_log, None, cx).await?;
+                if buffer_content.is_outline {
                     Ok(formatdoc! {"
                         This file was too big to read all at once.
 
-                        Here is an outline of its symbols:
-
-                        {outline}
+                        {}
 
                         Using the line numbers in this outline, you can call this tool again
                         while specifying the start_line and end_line fields to see the
                         implementations of symbols in the outline.
 
                         Alternatively, you can fall back to the `grep` tool (if available)
-                        to search the file for specific content."
+                        to search the file for specific content.", buffer_content.text
                     }
                     .into())
+                } else {
+                    Ok(buffer_content.text.into())
                 }
             }
         })

From ffb85d7e812bc2f6b1a49ff23987538ec5414319 Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Thu, 11 Sep 2025 22:00:35 -0500
Subject: [PATCH 806/823] Update crash handling docs (#38026)

Also removed the symbolicate script, which we could replace with a
`minidump-stackwalk` wrapper that downloaded sources/unstripped binaries
from github releases if that's helpful for folks.

Release Notes:

- N/A
---
 docs/src/development/debugging-crashes.md | 33 +++-------
 script/symbolicate                        | 77 -----------------------
 2 files changed, 7 insertions(+), 103 deletions(-)
 delete mode 100755 script/symbolicate

diff --git a/docs/src/development/debugging-crashes.md b/docs/src/development/debugging-crashes.md
index ed0a5807a3..9da3f88066 100644
--- a/docs/src/development/debugging-crashes.md
+++ b/docs/src/development/debugging-crashes.md
@@ -1,39 +1,20 @@
 # Debugging Crashes
 
-## Crashes
+When Zed panics or otherwise crashes, Zed sends a message to a sidecar process which inspects the memory of the crashing editor to create a [minidump](https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/getting_started_with_breakpad.md#the-minidump-file-format) file in `~/Library/Logs/Zed` or `$XDG_DATA_HOME/zed/logs`. This minidump can be used to generate backtraces for the stacks of all threads.
 
-When an app crashes,
+If you have enabled Zed's telemetry these will be uploaded to us when you restart the app. They end up in a [Slack channel](https://zed-industries.slack.com/archives/C0977J9MA1Y) and in [Sentry](https://zed-dev.sentry.io/issues) (both of which are Zed-staff-only).
 
-- macOS creates a `.ips` file in `~/Library/Logs/DiagnosticReports`. You can view these using the built in Console app (`cmd-space Console`) under "Crash Reports".
-- Linux creates a core dump. See the [man pages](https://man7.org/linux/man-pages/man5/core.5.html) for pointers to how your system might be configured to manage core dumps.
-- Windows doesn't create crash reports by default, but can be configured to create "minidump" memory dumps upon applications crashing.
-
-If you have enabled Zed's telemetry these will be uploaded to us when you restart the app. They end up in a [Slack channel (internal only)](https://zed-industries.slack.com/archives/C04S6T1T7TQ).
-
-These crash reports are generated by the crashing binary, and contain a wealth of information; but they are hard to read for a few reasons:
-
-- They don't contain source files and line numbers
-- The symbols are [mangled](https://doc.rust-lang.org/rustc/symbol-mangling/index.html)
-- Inlined functions are elided
-
-On macOS, to get a better sense of the backtrace of a crash you can download the `.ips` file locally and run:
+These crash reports contain rich information; but they are hard to read because they don't contain spans or symbol information. You can still work with them locally by downloading sources and an unstripped binary (or separate symbols file) for your Zed release and running:
 
 ```sh
-./script/symbolicate ~/path/zed-XXX-XXX.ips
+zstd -d ~/.local/share/zed/<uuid>.dmp -o minidump.dmp
+minidump-stackwalk minidump.dmp
 ```
 
-This will download the correct debug symbols from our public [digital ocean bucket](https://zed-debug-symbols.nyc3.digitaloceanspaces.com), and run [symbolicate](https://crates.io/crates/symbolicate) for you.
-
-The output contains the source file and line number, and the demangled symbol information for every inlined frame.
-
-## Panics
-
-When the app panics at the rust level, Zed creates a file in `~/Library/Logs/Zed` or `$XDG_DATA_HOME/zed/logs` with the text of the panic, and a summary of the backtrace. On boot, if you have telemetry enabled, we upload these panics so we can keep track of them.
-
-A panic is also considered a crash, and so for most panics we get both the crash report and the panic.
+Alongside the minidump file in your logs dir, there should be a `<uuid>.json` which contains additional metadata like the panic message, span, and system specs.
 
 ## Using a Debugger
 
-If you can reproduce the crash consistently, a debugger can be used to inspect the state of the program at the time of the crash, often providing very useful insights into the cause of the crash.
+If you can reproduce the crash consistently, a debugger can be used to inspect the state of the program at the time of the crash, often providing useful insights into the cause of the crash.
 
 You can read more about setting up and using a debugger with Zed, and specifically for debugging crashes [here](./debuggers.md#debugging-panics-and-crashes)
diff --git a/script/symbolicate b/script/symbolicate
deleted file mode 100755
index 5e818626fa..0000000000
--- a/script/symbolicate
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-if [[ $# -eq 0 ]] || [[ "$1" == "--help" ]]; then
-  echo "Usage: $(basename $0) <path_to_ips_file_or_json>"
-  echo "This script symbolicates the provided .ips file or .json panic report using the appropriate debug symbols from DigitalOcean"
-  echo ""
-  exit 1
-fi
-
-input_file=$1;
-
-if [[ "$input_file" == *.json ]]; then
-    version=$(cat $input_file | jq -r .panic.app_version)
-    channel=$(cat $input_file | jq -r .panic.release_channel)
-    target_triple=$(cat $input_file | jq -r .panic.target)
-
-    which llvm-symbolizer rustfilt >/dev/null || (echo Need to install llvm-symbolizer and rustfilt && exit 1)
-
-    echo $channel;
-
-    mkdir -p target/dsyms/$channel
-
-    if [[ "$version" == "remote-server-"* ]]; then
-        version="${version#remote-server-}"
-        dsym="$channel/remote_server-$version-$target_triple.dbg"
-    else
-        dsym="$channel/zed-$version-$target_triple.dbg"
-    fi
-    if [[ ! -f target/dsyms/$dsym ]]; then
-        echo "Downloading $dsym..."
-        curl -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/$dsym.gz"
-        gunzip  target/dsyms/$dsym.gz
-    fi
-
-    cat $input_file | jq -r .panic.backtrace[] | sed s'/.*+//' | llvm-symbolizer --no-demangle --obj=target/dsyms/$dsym | rustfilt
-
-else # ips file
-
-    version=$(cat $input_file | head -n 1 | jq -r .app_version)
-    bundle_id=$(cat $input_file | head -n 1 | jq -r .bundleID)
-    cpu_type=$(cat $input_file | tail -n+2 | jq -r .cpuType)
-
-    which symbolicate >/dev/null || cargo install symbolicate
-
-    arch="x86_64-apple-darwin"
-    if [[ "$cpu_type" == *ARM-64* ]]; then
-        arch="aarch64-apple-darwin"
-    fi
-    echo $bundle_id;
-
-    channel="stable"
-    if [[ "$bundle_id" == *Nightly* ]]; then
-        channel="nightly"
-    elif [[ "$bundle_id" == *Preview* ]]; then
-        channel="preview"
-    fi
-
-    mkdir -p target/dsyms/$channel
-
-    # NOTE: if you see "no such file --uuid", you need to update your symbolicate
-    uuid=$(symbolicate $input_file --uuid || true)
-    if [[ $? -ne 0 ]]; then
-        echo "You need to update your symbolicate: cargo install symbolicate"
-        exit 1
-    fi
-    dsym="$uuid.dwarf"
-    if [[ ! -f target/dsyms/$dsym ]]; then
-        echo "Downloading $dsym..."
-        curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/by-uuid/${uuid}.dwarf.gz" ||
-            curl -f -o target/dsyms/$dsym.gz "https://zed-debug-symbols.nyc3.digitaloceanspaces.com/$channel/Zed-$version-$arch.dwarf.gz"
-        gunzip  target/dsyms/$dsym.gz
-    fi
-
-    symbolicate $input_file target/dsyms/$dsym
-
-fi

From fcfc54c515da6b1a5c06673fdf6c39ae798e6473 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 11 Sep 2025 21:18:28 -0600
Subject: [PATCH 807/823] Allow SplitAndMove on panes (#38034)

Updates #19350

Release Notes:

- Add `pane::SplitAndMove{Up,Down,Left,Right}` to allow creating a split
without cloning the current buffer.
---
 crates/terminal_view/src/terminal_panel.rs | 45 ++++++++++++----
 crates/workspace/src/pane.rs               | 63 +++++++++++++++++++---
 crates/workspace/src/workspace.rs          | 29 +++++++++-
 3 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
index e72175572b..5308b230f7 100644
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@@ -385,19 +385,44 @@ impl TerminalPanel {
                 }
                 self.serialize(cx);
             }
-            &pane::Event::Split(direction) => {
-                let fut = self.new_pane_with_cloned_active_terminal(window, cx);
-                let pane = pane.clone();
-                cx.spawn_in(window, async move |panel, cx| {
-                    let Some(new_pane) = fut.await else {
+            &pane::Event::Split {
+                direction,
+                clone_active_item,
+            } => {
+                if clone_active_item {
+                    let fut = self.new_pane_with_cloned_active_terminal(window, cx);
+                    let pane = pane.clone();
+                    cx.spawn_in(window, async move |panel, cx| {
+                        let Some(new_pane) = fut.await else {
+                            return;
+                        };
+                        panel
+                            .update_in(cx, |panel, window, cx| {
+                                panel.center.split(&pane, &new_pane, direction).log_err();
+                                window.focus(&new_pane.focus_handle(cx));
+                            })
+                            .ok();
+                    })
+                    .detach();
+                } else {
+                    let Some(item) = pane.update(cx, |pane, cx| pane.take_active_item(window, cx))
+                    else {
                         return;
                     };
-                    _ = panel.update_in(cx, |panel, window, cx| {
-                        panel.center.split(&pane, &new_pane, direction).log_err();
-                        window.focus(&new_pane.focus_handle(cx));
+                    let Ok(project) = self
+                        .workspace
+                        .update(cx, |workspace, _| workspace.project().clone())
+                    else {
+                        return;
+                    };
+                    let new_pane =
+                        new_terminal_pane(self.workspace.clone(), project, false, window, cx);
+                    new_pane.update(cx, |pane, cx| {
+                        pane.add_item(item, true, true, None, window, cx);
                     });
-                })
-                .detach();
+                    self.center.split(&pane, &new_pane, direction).log_err();
+                    window.focus(&new_pane.focus_handle(cx));
+                }
             }
             pane::Event::Focus => {
                 self.active_pane = pane.clone();
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 71a9b89f0a..4ce8a89023 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -206,14 +206,22 @@ actions!(
         JoinAll,
         /// Reopens the most recently closed item.
         ReopenClosedItem,
-        /// Splits the pane to the left.
+        /// Splits the pane to the left, cloning the current item.
         SplitLeft,
-        /// Splits the pane upward.
+        /// Splits the pane upward, cloning the current item.
         SplitUp,
-        /// Splits the pane to the right.
+        /// Splits the pane to the right, cloning the current item.
         SplitRight,
-        /// Splits the pane downward.
+        /// Splits the pane downward, cloning the current item.
         SplitDown,
+        /// Splits the pane to the left, moving the current item.
+        SplitAndMoveLeft,
+        /// Splits the pane upward, moving the current item.
+        SplitAndMoveUp,
+        /// Splits the pane to the right, moving the current item.
+        SplitAndMoveRight,
+        /// Splits the pane downward, moving the current item.
+        SplitAndMoveDown,
         /// Splits the pane horizontally.
         SplitHorizontal,
         /// Splits the pane vertically.
@@ -257,7 +265,10 @@ pub enum Event {
     RemovedItem {
         item: Box<dyn ItemHandle>,
     },
-    Split(SplitDirection),
+    Split {
+        direction: SplitDirection,
+        clone_active_item: bool,
+    },
     ItemPinned,
     ItemUnpinned,
     JoinAll,
@@ -288,9 +299,13 @@ impl fmt::Debug for Event {
                 .debug_struct("RemovedItem")
                 .field("item", &item.item_id())
                 .finish(),
-            Event::Split(direction) => f
+            Event::Split {
+                direction,
+                clone_active_item,
+            } => f
                 .debug_struct("Split")
                 .field("direction", direction)
+                .field("clone_active_item", clone_active_item)
                 .finish(),
             Event::JoinAll => f.write_str("JoinAll"),
             Event::JoinIntoNext => f.write_str("JoinIntoNext"),
@@ -1776,6 +1791,16 @@ impl Pane {
         })
     }
 
+    pub fn take_active_item(
+        &mut self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<Box<dyn ItemHandle>> {
+        let item = self.active_item()?;
+        self.remove_item(item.item_id(), false, false, window, cx);
+        Some(item)
+    }
+
     pub fn remove_item(
         &mut self,
         item_id: EntityId,
@@ -2222,7 +2247,19 @@ impl Pane {
     }
 
     pub fn split(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        cx.emit(Event::Split(direction));
+        cx.emit(Event::Split {
+            direction,
+            clone_active_item: true,
+        });
+    }
+
+    pub fn split_and_move(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
+        if self.items.len() > 1 {
+            cx.emit(Event::Split {
+                direction,
+                clone_active_item: false,
+            });
+        }
     }
 
     pub fn toolbar(&self) -> &Entity<Toolbar> {
@@ -3566,6 +3603,18 @@ impl Render for Pane {
             .on_action(
                 cx.listener(|pane, _: &SplitDown, _, cx| pane.split(SplitDirection::Down, cx)),
             )
+            .on_action(cx.listener(|pane, _: &SplitAndMoveUp, _, cx| {
+                pane.split_and_move(SplitDirection::Up, cx)
+            }))
+            .on_action(cx.listener(|pane, _: &SplitAndMoveDown, _, cx| {
+                pane.split_and_move(SplitDirection::Down, cx)
+            }))
+            .on_action(cx.listener(|pane, _: &SplitAndMoveLeft, _, cx| {
+                pane.split_and_move(SplitDirection::Left, cx)
+            }))
+            .on_action(cx.listener(|pane, _: &SplitAndMoveRight, _, cx| {
+                pane.split_and_move(SplitDirection::Right, cx)
+            }))
             .on_action(cx.listener(|_, _: &JoinIntoNext, _, cx| {
                 cx.emit(Event::JoinIntoNext);
             }))
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 49b00d26d4..e6a30e92d9 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3929,8 +3929,15 @@ impl Workspace {
                     item: item.boxed_clone(),
                 });
             }
-            pane::Event::Split(direction) => {
-                self.split_and_clone(pane.clone(), *direction, window, cx);
+            pane::Event::Split {
+                direction,
+                clone_active_item,
+            } => {
+                if *clone_active_item {
+                    self.split_and_clone(pane.clone(), *direction, window, cx);
+                } else {
+                    self.split_and_move(pane.clone(), *direction, window, cx);
+                }
             }
             pane::Event::JoinIntoNext => {
                 self.join_pane_into_next(pane.clone(), window, cx);
@@ -4044,6 +4051,24 @@ impl Workspace {
         new_pane
     }
 
+    pub fn split_and_move(
+        &mut self,
+        pane: Entity<Pane>,
+        direction: SplitDirection,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(item) = pane.update(cx, |pane, cx| pane.take_active_item(window, cx)) else {
+            return;
+        };
+        let new_pane = self.add_pane(window, cx);
+        new_pane.update(cx, |pane, cx| {
+            pane.add_item(item, true, true, None, window, cx)
+        });
+        self.center.split(&pane, &new_pane, direction).unwrap();
+        cx.notify();
+    }
+
     pub fn split_and_clone(
         &mut self,
         pane: Entity<Pane>,

From 8201f3d72f4ec7b68d34400e8b424fdf01a7ef41 Mon Sep 17 00:00:00 2001
From: Alvaro Parker <64918109+AlvaroParker@users.noreply.github.com>
Date: Fri, 12 Sep 2025 02:29:20 -0300
Subject: [PATCH 808/823] Use \x00 representation instead of literal null
 characters (#38033)

When working on the git stash picker PR (#35927) I notice that my test
was detected as a binary file on the git diff view and on GitHub. This
was due to the fact that I was using the literal char \0 (instead of a
proper representation like `\x00` or `\u{0000}`) character in my test
strings. This causes problems with git diff and GitHub's diff viewer,
and a reviewer might even assume that the file is corrupted, not
viewable or even malicious.

Looking at the rest of the codebase, only at `crates/git/src/commit.rs`
this character was used, so I replaced it with `\x00` which is a more
common representation of the null character in Rust strings.

It can also be seen that the PR that introduced this code, can't be
viewed properly on Github:
https://github.com/zed-industries/zed/pull/27636/files#diff-31114f0b22306b467482573446f71c638277510b442a10e60dd9a8667ccd93c3

Closes #ISSUE

Release Notes:

- Use `\x00` representation instead of literal null character in strings
to improve compatibility with git diff and GitHub's diff viewer.

Since the file is not viewable from the "Files changed" tab on Github,
this is the changed code:


https://github.com/zed-industries/zed/blob/dcd743aca494ec0217a2d7751150ca9e456012f4/crates/git/src/commit.rs#L66-L74
---
 crates/git/src/commit.rs | Bin 3571 -> 3625 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/crates/git/src/commit.rs b/crates/git/src/commit.rs
index aaacdc038a803a51c02e941daafbe68929333706..1a2aa7b43331aca97e6d9d26bac3569448aafc4a 100644
GIT binary patch
delta 339
zcmew?y;5d_C3|E{g@J){Vo`d&UQT{;Hi)OB!=-=(lzc&g$wi4Jsm1yQMfq8&$tC&_
z9VPj>IXHDpw&qgu#wP26#k}I8Wc~Ea61}2gY&sl4f|F&r<t6dS%1l1SE$EL;1vVdm
gY=rs-hpk{;liN5{u-Xcd-OHiL0<v-Qa}FL>0AnpyvH$=8

delta 245
zcmZ1}^I3X>CA%Dhb7E0?zFtm#ayEmK4wnKFQ1WG%oWL$Aj7_|dO9@llg<*0bm+<5V
z>};5Fj$k?Y^vsg@;*$KLRK22N409oBCVO#6Vd@9E1!VRF4lbN>vb=&=<vws|GBRwI
I<>X-n0M{NZIRF3v


From 11424086756ba0f790ed061720b9bf2950d0782d Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Fri, 12 Sep 2025 14:47:55 +0530
Subject: [PATCH 809/823] language_models: Add provider options for OpenRouter
 models (#37979)

Supersedes: #34500

Also this will allow to fix this: #35386 without the UX changes but
providers can now be control through settings as well within zed.

Just rebased the latest main and docs added. Added @AurelienTollard as
co-author as it was started by him everything else remains the same from
original PR.

Release Notes:

- Added ability to control Provider Routing for OpenRouter models from
settings.

Co-authored-by: Aurelien Tollard <tollard.aurelien1999@gmail.com>
---
 Cargo.lock                                    |  1 +
 .../src/provider/open_router.rs               |  6 ++-
 crates/open_router/Cargo.toml                 |  1 +
 crates/open_router/src/open_router.rs         | 42 +++++++++++++++++
 docs/src/ai/llm-providers.md                  | 47 +++++++++++++++++++
 5 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8bde05dd8..227e4127b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11244,6 +11244,7 @@ dependencies = [
  "serde_json",
  "strum 0.27.1",
  "thiserror 2.0.12",
+ "util",
  "workspace-hack",
 ]
 
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
index 698e9d23cc..0ebf379b39 100644
--- a/crates/language_models/src/provider/open_router.rs
+++ b/crates/language_models/src/provider/open_router.rs
@@ -15,7 +15,8 @@ use language_model::{
     LanguageModelToolUse, MessageContent, RateLimiter, Role, StopReason, TokenUsage,
 };
 use open_router::{
-    Model, ModelMode as OpenRouterModelMode, ResponseStreamEvent, list_models, stream_completion,
+    Model, ModelMode as OpenRouterModelMode, Provider, ResponseStreamEvent, list_models,
+    stream_completion,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -48,6 +49,7 @@ pub struct AvailableModel {
     pub supports_tools: Option<bool>,
     pub supports_images: Option<bool>,
     pub mode: Option<ModelMode>,
+    pub provider: Option<Provider>,
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
@@ -296,6 +298,7 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
                 supports_tools: model.supports_tools,
                 supports_images: model.supports_images,
                 mode: model.mode.clone().unwrap_or_default().into(),
+                provider: model.provider.clone(),
             });
         }
 
@@ -584,6 +587,7 @@ pub fn into_open_router(
             LanguageModelToolChoice::Any => open_router::ToolChoice::Required,
             LanguageModelToolChoice::None => open_router::ToolChoice::None,
         }),
+        provider: model.provider.clone(),
     }
 }
 
diff --git a/crates/open_router/Cargo.toml b/crates/open_router/Cargo.toml
index 8920c157dc..54348ea5a5 100644
--- a/crates/open_router/Cargo.toml
+++ b/crates/open_router/Cargo.toml
@@ -24,4 +24,5 @@ serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 strum.workspace = true
+util.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
index cbc6c243d8..2e5f33b161 100644
--- a/crates/open_router/src/open_router.rs
+++ b/crates/open_router/src/open_router.rs
@@ -6,6 +6,7 @@ use serde_json::Value;
 use std::{convert::TryFrom, io, time::Duration};
 use strum::EnumString;
 use thiserror::Error;
+use util::serde::default_true;
 
 pub const OPEN_ROUTER_API_URL: &str = "https://openrouter.ai/api/v1";
 
@@ -64,6 +65,41 @@ impl From<Role> for String {
     }
 }
 
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum DataCollection {
+    Allow,
+    Disallow,
+}
+
+impl Default for DataCollection {
+    fn default() -> Self {
+        Self::Allow
+    }
+}
+
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Provider {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    order: Option<Vec<String>>,
+    #[serde(default = "default_true")]
+    allow_fallbacks: bool,
+    #[serde(default)]
+    require_parameters: bool,
+    #[serde(default)]
+    data_collection: DataCollection,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    only: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    ignore: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    quantizations: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    sort: Option<String>,
+}
+
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
 pub struct Model {
@@ -74,6 +110,7 @@ pub struct Model {
     pub supports_images: Option<bool>,
     #[serde(default)]
     pub mode: ModelMode,
+    pub provider: Option<Provider>,
 }
 
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
@@ -95,6 +132,7 @@ impl Model {
             Some(true),
             Some(false),
             Some(ModelMode::Default),
+            None,
         )
     }
 
@@ -109,6 +147,7 @@ impl Model {
         supports_tools: Option<bool>,
         supports_images: Option<bool>,
         mode: Option<ModelMode>,
+        provider: Option<Provider>,
     ) -> Self {
         Self {
             name: name.to_owned(),
@@ -117,6 +156,7 @@ impl Model {
             supports_tools,
             supports_images,
             mode: mode.unwrap_or(ModelMode::Default),
+            provider,
         }
     }
 
@@ -164,6 +204,7 @@ pub struct Request {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub reasoning: Option<Reasoning>,
     pub usage: RequestUsage,
+    pub provider: Option<Provider>,
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
@@ -597,6 +638,7 @@ pub async fn list_models(
                 } else {
                     ModelMode::Default
                 },
+                provider: None,
             })
             .collect();
 
diff --git a/docs/src/ai/llm-providers.md b/docs/src/ai/llm-providers.md
index 2846ab2f2f..98aaeef212 100644
--- a/docs/src/ai/llm-providers.md
+++ b/docs/src/ai/llm-providers.md
@@ -524,6 +524,53 @@ You can find available models and their specifications on the [OpenRouter models
 
 Custom models will be listed in the model dropdown in the Agent Panel.
 
+#### Provider Routing
+
+You can optionally control how OpenRouter routes a given custom model request among underlying upstream providers via the `provider` object on each model entry.
+
+Supported fields (all optional):
+
+- `order`: Array of provider slugs to try first, in order (e.g. `["anthropic", "openai"]`)
+- `allow_fallbacks` (default: `true`): Whether fallback providers may be used if preferred ones are unavailable
+- `require_parameters` (default: `false`): Only use providers that support every parameter you supplied
+- `data_collection` (default: `allow`): `"allow"` or `"disallow"` (controls use of providers that may store data)
+- `only`: Whitelist of provider slugs allowed for this request
+- `ignore`: Provider slugs to skip
+- `quantizations`: Restrict to specific quantization variants (e.g. `["int4","int8"]`)
+- `sort`: Sort strategy for candidate providers (e.g. `"price"` or `"throughput"`)
+
+Example adding routing preferences to a model:
+
+```json
+{
+  "language_models": {
+    "open_router": {
+      "api_url": "https://openrouter.ai/api/v1",
+      "available_models": [
+        {
+          "name": "openrouter/auto",
+          "display_name": "Auto Router (Tools Preferred)",
+          "max_tokens": 2000000,
+          "supports_tools": true,
+          "provider": {
+            "order": ["anthropic", "openai"],
+            "allow_fallbacks": true,
+            "require_parameters": true,
+            "only": ["anthropic", "openai", "google"],
+            "ignore": ["cohere"],
+            "quantizations": ["int8"],
+            "sort": "price",
+            "data_collection": "allow"
+          }
+        }
+      ]
+    }
+  }
+}
+```
+
+These routing controls let you fine‑tune cost, capability, and reliability trade‑offs without changing the model name you select in the UI.
+
 ### Vercel v0 {#vercel-v0}
 
 [Vercel v0](https://vercel.com/docs/v0/api) is an expert model for generating full-stack apps, with framework-aware completions optimized for modern stacks like Next.js and Vercel.

From 592b013013e74d5ad44f2c04ef5afeb3be21249e Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 12 Sep 2025 11:37:45 +0200
Subject: [PATCH 810/823] language: Split LSP installation handling into a
 separate trait (#38046)

Part of reworking our installation handling to allow for multiple
different versions to be handled

Release Notes:

- Fixed pre-release lsp fetching setting not having an affect until
restarting Zed
---
 crates/language/src/language.rs               | 393 ++++++-----
 .../src/extension_lsp_adapter.rs              |  39 +-
 crates/languages/src/c.rs                     |  72 +-
 crates/languages/src/css.rs                   |  44 +-
 crates/languages/src/go.rs                    |  86 +--
 crates/languages/src/json.rs                  |  71 +-
 crates/languages/src/python.rs                | 657 +++++++++---------
 crates/languages/src/rust.rs                  | 311 +++++----
 crates/languages/src/tailwind.rs              |  44 +-
 crates/languages/src/typescript.rs            | 216 +++---
 crates/languages/src/vtsls.rs                 |  31 +-
 crates/languages/src/yaml.rs                  |  38 +-
 crates/lsp/src/lsp.rs                         |   6 +-
 crates/project/src/lsp_store.rs               |  67 +-
 14 files changed, 1064 insertions(+), 1011 deletions(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index aa07524ea9..4832e5e602 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -28,7 +28,7 @@ use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use collections::{HashMap, HashSet, IndexSet};
 use futures::Future;
-use gpui::{App, AsyncApp, Entity, SharedString, Task};
+use gpui::{App, AsyncApp, Entity, SharedString};
 pub use highlight_map::HighlightMap;
 use http_client::HttpClient;
 pub use language_registry::{
@@ -45,7 +45,6 @@ use settings::WorktreeId;
 use smol::future::FutureExt as _;
 use std::num::NonZeroU32;
 use std::{
-    any::Any,
     ffi::OsStr,
     fmt::Debug,
     hash::Hash,
@@ -156,6 +155,8 @@ pub struct Location {
     pub range: Range<Anchor>,
 }
 
+type ServerBinaryCache = futures::lock::Mutex<Option<(bool, LanguageServerBinary)>>;
+
 /// Represents a Language Server, with certain cached sync properties.
 /// Uses [`LspAdapter`] under the hood, but calls all 'static' methods
 /// once at startup, and caches the results.
@@ -166,7 +167,7 @@ pub struct CachedLspAdapter {
     language_ids: HashMap<LanguageName, String>,
     pub adapter: Arc<dyn LspAdapter>,
     pub reinstall_attempt_count: AtomicU64,
-    cached_binary: futures::lock::Mutex<Option<LanguageServerBinary>>,
+    cached_binary: ServerBinaryCache,
 }
 
 impl Debug for CachedLspAdapter {
@@ -216,10 +217,16 @@ impl CachedLspAdapter {
         binary_options: LanguageServerBinaryOptions,
         cx: &mut AsyncApp,
     ) -> Result<LanguageServerBinary> {
-        let cached_binary = self.cached_binary.lock().await;
+        let mut cached_binary = self.cached_binary.lock().await;
         self.adapter
             .clone()
-            .get_language_server_command(delegate, toolchains, binary_options, cached_binary, cx)
+            .get_language_server_command(
+                delegate,
+                toolchains,
+                binary_options,
+                &mut cached_binary,
+                cx,
+            )
             .await
     }
 
@@ -306,128 +313,9 @@ pub trait LspAdapterDelegate: Send + Sync {
 }
 
 #[async_trait(?Send)]
-pub trait LspAdapter: 'static + Send + Sync {
+pub trait LspAdapter: 'static + Send + Sync + DynLspInstaller {
     fn name(&self) -> LanguageServerName;
 
-    fn get_language_server_command<'a>(
-        self: Arc<Self>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        toolchains: Option<Toolchain>,
-        binary_options: LanguageServerBinaryOptions,
-        mut cached_binary: futures::lock::MutexGuard<'a, Option<LanguageServerBinary>>,
-        cx: &'a mut AsyncApp,
-    ) -> Pin<Box<dyn 'a + Future<Output = Result<LanguageServerBinary>>>> {
-        async move {
-            // First we check whether the adapter can give us a user-installed binary.
-            // If so, we do *not* want to cache that, because each worktree might give us a different
-            // binary:
-            //
-            //      worktree 1: user-installed at `.bin/gopls`
-            //      worktree 2: user-installed at `~/bin/gopls`
-            //      worktree 3: no gopls found in PATH -> fallback to Zed installation
-            //
-            // We only want to cache when we fall back to the global one,
-            // because we don't want to download and overwrite our global one
-            // for each worktree we might have open.
-            if binary_options.allow_path_lookup
-                && let Some(binary) = self.check_if_user_installed(delegate.as_ref(), toolchains, cx).await {
-                    log::debug!(
-                        "found user-installed language server for {}. path: {:?}, arguments: {:?}",
-                        self.name().0,
-                        binary.path,
-                        binary.arguments
-                    );
-                    return Ok(binary);
-                }
-
-            anyhow::ensure!(binary_options.allow_binary_download, "downloading language servers disabled");
-
-            if let Some(cached_binary) = cached_binary.as_ref() {
-                return Ok(cached_binary.clone());
-            }
-
-            let Some(container_dir) = delegate.language_server_download_dir(&self.name()).await else {
-                anyhow::bail!("no language server download dir defined")
-            };
-
-            let mut binary = try_fetch_server_binary(self.as_ref(), &delegate, container_dir.to_path_buf(), cx).await;
-
-            if let Err(error) = binary.as_ref() {
-                if let Some(prev_downloaded_binary) = self
-                    .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
-                    .await
-                {
-                    log::info!(
-                        "failed to fetch newest version of language server {:?}. error: {:?}, falling back to using {:?}",
-                        self.name(),
-                        error,
-                        prev_downloaded_binary.path
-                    );
-                    binary = Ok(prev_downloaded_binary);
-                } else {
-                    delegate.update_status(
-                        self.name(),
-                        BinaryStatus::Failed {
-                            error: format!("{error:?}"),
-                        },
-                    );
-                }
-            }
-
-            if let Ok(binary) = &binary {
-                *cached_binary = Some(binary.clone());
-            }
-
-            binary
-        }
-        .boxed_local()
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        None
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        cx: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>>;
-
-    fn will_fetch_server(
-        &self,
-        _: &Arc<dyn LspAdapterDelegate>,
-        _: &mut AsyncApp,
-    ) -> Option<Task<Result<()>>> {
-        None
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        _version: &(dyn 'static + Send + Any),
-        _container_dir: &PathBuf,
-        _delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        None
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: Box<dyn 'static + Send + Any>,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary>;
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary>;
-
     fn process_diagnostics(
         &self,
         _: &mut lsp::PublishDiagnosticsParams,
@@ -592,40 +480,194 @@ pub trait LspAdapter: 'static + Send + Sync {
     }
 }
 
-async fn try_fetch_server_binary<L: LspAdapter + 'static + Send + Sync + ?Sized>(
-    adapter: &L,
-    delegate: &Arc<dyn LspAdapterDelegate>,
-    container_dir: PathBuf,
-    cx: &mut AsyncApp,
-) -> Result<LanguageServerBinary> {
-    if let Some(task) = adapter.will_fetch_server(delegate, cx) {
-        task.await?;
+pub trait LspInstaller {
+    type BinaryVersion;
+    fn check_if_user_installed(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> impl Future<Output = Option<LanguageServerBinary>> {
+        async { None }
     }
 
-    let name = adapter.name();
-    log::debug!("fetching latest version of language server {:?}", name.0);
-    delegate.update_status(name.clone(), BinaryStatus::CheckingForUpdate);
+    fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        pre_release: bool,
+        cx: &mut AsyncApp,
+    ) -> impl Future<Output = Result<Self::BinaryVersion>>;
 
-    let latest_version = adapter
-        .fetch_latest_server_version(delegate.as_ref(), cx)
-        .await?;
+    fn check_if_version_installed(
+        &self,
+        _version: &Self::BinaryVersion,
+        _container_dir: &PathBuf,
+        _delegate: &dyn LspAdapterDelegate,
+    ) -> impl Future<Output = Option<LanguageServerBinary>> {
+        async { None }
+    }
 
-    if let Some(binary) = adapter
-        .check_if_version_installed(latest_version.as_ref(), &container_dir, delegate.as_ref())
-        .await
-    {
-        log::debug!("language server {:?} is already installed", name.0);
-        delegate.update_status(name.clone(), BinaryStatus::None);
-        Ok(binary)
-    } else {
-        log::info!("downloading language server {:?}", name.0);
-        delegate.update_status(adapter.name(), BinaryStatus::Downloading);
-        let binary = adapter
-            .fetch_server_binary(latest_version, container_dir, delegate.as_ref())
-            .await;
+    fn fetch_server_binary(
+        &self,
+        latest_version: Self::BinaryVersion,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> impl Future<Output = Result<LanguageServerBinary>>;
 
-        delegate.update_status(name.clone(), BinaryStatus::None);
-        binary
+    fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> impl Future<Output = Option<LanguageServerBinary>>;
+}
+
+#[async_trait(?Send)]
+pub trait DynLspInstaller {
+    async fn try_fetch_server_binary(
+        &self,
+        delegate: &Arc<dyn LspAdapterDelegate>,
+        container_dir: PathBuf,
+        pre_release: bool,
+        cx: &mut AsyncApp,
+    ) -> Result<LanguageServerBinary>;
+    fn get_language_server_command<'a>(
+        self: Arc<Self>,
+        delegate: Arc<dyn LspAdapterDelegate>,
+        toolchains: Option<Toolchain>,
+        binary_options: LanguageServerBinaryOptions,
+        cached_binary: &'a mut Option<(bool, LanguageServerBinary)>,
+        cx: &'a mut AsyncApp,
+    ) -> Pin<Box<dyn 'a + Future<Output = Result<LanguageServerBinary>>>>;
+}
+
+#[async_trait(?Send)]
+impl<LI, BinaryVersion> DynLspInstaller for LI
+where
+    LI: LspInstaller<BinaryVersion = BinaryVersion> + LspAdapter,
+{
+    async fn try_fetch_server_binary(
+        &self,
+        delegate: &Arc<dyn LspAdapterDelegate>,
+        container_dir: PathBuf,
+        pre_release: bool,
+        cx: &mut AsyncApp,
+    ) -> Result<LanguageServerBinary> {
+        let name = self.name();
+
+        log::debug!("fetching latest version of language server {:?}", name.0);
+        delegate.update_status(name.clone(), BinaryStatus::CheckingForUpdate);
+
+        let latest_version = self
+            .fetch_latest_server_version(delegate.as_ref(), pre_release, cx)
+            .await?;
+
+        if let Some(binary) = self
+            .check_if_version_installed(&latest_version, &container_dir, delegate.as_ref())
+            .await
+        {
+            log::debug!("language server {:?} is already installed", name.0);
+            delegate.update_status(name.clone(), BinaryStatus::None);
+            Ok(binary)
+        } else {
+            log::debug!("downloading language server {:?}", name.0);
+            delegate.update_status(name.clone(), BinaryStatus::Downloading);
+            let binary = self
+                .fetch_server_binary(latest_version, container_dir, delegate.as_ref())
+                .await;
+
+            delegate.update_status(name.clone(), BinaryStatus::None);
+            binary
+        }
+    }
+    fn get_language_server_command<'a>(
+        self: Arc<Self>,
+        delegate: Arc<dyn LspAdapterDelegate>,
+        toolchain: Option<Toolchain>,
+        binary_options: LanguageServerBinaryOptions,
+        cached_binary: &'a mut Option<(bool, LanguageServerBinary)>,
+        cx: &'a mut AsyncApp,
+    ) -> Pin<Box<dyn 'a + Future<Output = Result<LanguageServerBinary>>>> {
+        async move {
+            // First we check whether the adapter can give us a user-installed binary.
+            // If so, we do *not* want to cache that, because each worktree might give us a different
+            // binary:
+            //
+            //      worktree 1: user-installed at `.bin/gopls`
+            //      worktree 2: user-installed at `~/bin/gopls`
+            //      worktree 3: no gopls found in PATH -> fallback to Zed installation
+            //
+            // We only want to cache when we fall back to the global one,
+            // because we don't want to download and overwrite our global one
+            // for each worktree we might have open.
+            if binary_options.allow_path_lookup
+                && let Some(binary) = self
+                    .check_if_user_installed(delegate.as_ref(), toolchain, cx)
+                    .await
+            {
+                log::info!(
+                    "found user-installed language server for {}. path: {:?}, arguments: {:?}",
+                    self.name().0,
+                    binary.path,
+                    binary.arguments
+                );
+                return Ok(binary);
+            }
+
+            anyhow::ensure!(
+                binary_options.allow_binary_download,
+                "downloading language servers disabled"
+            );
+
+            if let Some((pre_release, cached_binary)) = cached_binary
+                && *pre_release == binary_options.pre_release
+            {
+                return Ok(cached_binary.clone());
+            }
+
+            let Some(container_dir) = delegate.language_server_download_dir(&self.name()).await
+            else {
+                anyhow::bail!("no language server download dir defined")
+            };
+
+            let mut binary = self
+                .try_fetch_server_binary(
+                    &delegate,
+                    container_dir.to_path_buf(),
+                    binary_options.pre_release,
+                    cx,
+                )
+                .await;
+
+            if let Err(error) = binary.as_ref() {
+                if let Some(prev_downloaded_binary) = self
+                    .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
+                    .await
+                {
+                    log::info!(
+                        "failed to fetch newest version of language server {:?}. \
+                        error: {:?}, falling back to using {:?}",
+                        self.name(),
+                        error,
+                        prev_downloaded_binary.path
+                    );
+                    binary = Ok(prev_downloaded_binary);
+                } else {
+                    delegate.update_status(
+                        self.name(),
+                        BinaryStatus::Failed {
+                            error: format!("{error:?}"),
+                        },
+                    );
+                }
+            }
+
+            if let Ok(binary) = &binary {
+                *cached_binary = Some((binary_options.pre_release, binary.clone()));
+            }
+
+            binary
+        }
+        .boxed_local()
     }
 }
 
@@ -2195,10 +2237,16 @@ impl Default for FakeLspAdapter {
 }
 
 #[cfg(any(test, feature = "test-support"))]
-#[async_trait(?Send)]
-impl LspAdapter for FakeLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName(self.name.into())
+impl LspInstaller for FakeLspAdapter {
+    type BinaryVersion = ();
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<Self::BinaryVersion> {
+        unreachable!()
     }
 
     async fn check_if_user_installed(
@@ -2210,28 +2258,9 @@ impl LspAdapter for FakeLspAdapter {
         Some(self.language_server_binary.clone())
     }
 
-    fn get_language_server_command<'a>(
-        self: Arc<Self>,
-        _: Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: LanguageServerBinaryOptions,
-        _: futures::lock::MutexGuard<'a, Option<LanguageServerBinary>>,
-        _: &'a mut AsyncApp,
-    ) -> Pin<Box<dyn 'a + Future<Output = Result<LanguageServerBinary>>>> {
-        async move { Ok(self.language_server_binary.clone()) }.boxed_local()
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        unreachable!();
-    }
-
     async fn fetch_server_binary(
         &self,
-        _: Box<dyn 'static + Send + Any>,
+        _: (),
         _: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
@@ -2245,6 +2274,14 @@ impl LspAdapter for FakeLspAdapter {
     ) -> Option<LanguageServerBinary> {
         unreachable!();
     }
+}
+
+#[cfg(any(test, feature = "test-support"))]
+#[async_trait(?Send)]
+impl LspAdapter for FakeLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName(self.name.into())
+    }
 
     fn disk_based_diagnostic_sources(&self) -> Vec<String> {
         self.disk_based_diagnostics_sources.clone()
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 2c7cc9b7b1..dccd33ffb6 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -1,4 +1,3 @@
-use std::any::Any;
 use std::ops::Range;
 use std::path::PathBuf;
 use std::pin::Pin;
@@ -11,8 +10,8 @@ use extension::{Extension, ExtensionLanguageServerProxy, WorktreeDelegate};
 use futures::{Future, FutureExt, future::join_all};
 use gpui::{App, AppContext, AsyncApp, Task};
 use language::{
-    BinaryStatus, CodeLabel, HighlightId, Language, LanguageName, LspAdapter, LspAdapterDelegate,
-    Toolchain,
+    BinaryStatus, CodeLabel, DynLspInstaller, HighlightId, Language, LanguageName, LspAdapter,
+    LspAdapterDelegate, Toolchain,
 };
 use lsp::{
     CodeActionKind, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerName,
@@ -155,17 +154,13 @@ impl ExtensionLspAdapter {
 }
 
 #[async_trait(?Send)]
-impl LspAdapter for ExtensionLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        self.language_server_id.clone()
-    }
-
+impl DynLspInstaller for ExtensionLspAdapter {
     fn get_language_server_command<'a>(
         self: Arc<Self>,
         delegate: Arc<dyn LspAdapterDelegate>,
         _: Option<Toolchain>,
         _: LanguageServerBinaryOptions,
-        _: futures::lock::MutexGuard<'a, Option<LanguageServerBinary>>,
+        _: &'a mut Option<(bool, LanguageServerBinary)>,
         _: &'a mut AsyncApp,
     ) -> Pin<Box<dyn 'a + Future<Output = Result<LanguageServerBinary>>>> {
         async move {
@@ -205,29 +200,21 @@ impl LspAdapter for ExtensionLspAdapter {
         .boxed_local()
     }
 
-    async fn fetch_latest_server_version(
+    async fn try_fetch_server_binary(
         &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        unreachable!("get_language_server_command is overridden")
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        _: Box<dyn 'static + Send + Any>,
+        _: &Arc<dyn LspAdapterDelegate>,
         _: PathBuf,
-        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
     ) -> Result<LanguageServerBinary> {
         unreachable!("get_language_server_command is overridden")
     }
+}
 
-    async fn cached_server_binary(
-        &self,
-        _: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        unreachable!("get_language_server_command is overridden")
+#[async_trait(?Send)]
+impl LspAdapter for ExtensionLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        self.language_server_id.clone()
     }
 
     fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index afdf49e66e..1e3a1f8058 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -5,11 +5,10 @@ use gpui::{App, AsyncApp};
 use http_client::github::{AssetKind, GitHubLspBinaryVersion, latest_github_release};
 pub use language::*;
 use lsp::{InitializeParams, LanguageServerBinary, LanguageServerName};
-use project::{lsp_store::clangd_ext, project_settings::ProjectSettings};
+use project::lsp_store::clangd_ext;
 use serde_json::json;
-use settings::Settings as _;
 use smol::fs;
-use std::{any::Any, env::consts, path::PathBuf, sync::Arc};
+use std::{env::consts, path::PathBuf, sync::Arc};
 use util::{ResultExt, fs::remove_matching, maybe, merge_json_value_into};
 
 use crate::github_download::{GithubBinaryMetadata, download_server_binary};
@@ -20,42 +19,18 @@ impl CLspAdapter {
     const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("clangd");
 }
 
-#[async_trait(?Send)]
-impl super::LspAdapter for CLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
-        Some(LanguageServerBinary {
-            path,
-            arguments: Vec::new(),
-            env: None,
-        })
-    }
+impl LspInstaller for CLspAdapter {
+    type BinaryVersion = GitHubLspBinaryVersion;
 
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        cx: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release(
-            "clangd/clangd",
-            true,
-            ProjectSettings::try_read_global(cx, |s| {
-                s.lsp.get(&Self::SERVER_NAME)?.fetch.as_ref()?.pre_release
-            })
-            .flatten()
-            .unwrap_or(false),
-            delegate.http_client(),
-        )
-        .await?;
+        pre_release: bool,
+        _: &mut AsyncApp,
+    ) -> Result<GitHubLspBinaryVersion> {
+        let release =
+            latest_github_release("clangd/clangd", true, pre_release, delegate.http_client())
+                .await?;
         let os_suffix = match consts::OS {
             "macos" => "mac",
             "linux" => "linux",
@@ -73,12 +48,26 @@ impl super::LspAdapter for CLspAdapter {
             url: asset.browser_download_url.clone(),
             digest: asset.digest.clone(),
         };
-        Ok(Box::new(version) as Box<_>)
+        Ok(version)
+    }
+
+    async fn check_if_user_installed(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        _: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> Option<LanguageServerBinary> {
+        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
+        Some(LanguageServerBinary {
+            path,
+            arguments: Vec::new(),
+            env: None,
+        })
     }
 
     async fn fetch_server_binary(
         &self,
-        version: Box<dyn 'static + Send + Any>,
+        version: GitHubLspBinaryVersion,
         container_dir: PathBuf,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
@@ -86,7 +75,7 @@ impl super::LspAdapter for CLspAdapter {
             name,
             url,
             digest: expected_digest,
-        } = *version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        } = version;
         let version_dir = container_dir.join(format!("clangd_{name}"));
         let binary_path = version_dir.join("bin/clangd");
 
@@ -157,6 +146,13 @@ impl super::LspAdapter for CLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_server_binary(container_dir).await
     }
+}
+
+#[async_trait(?Send)]
+impl super::LspAdapter for CLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
 
     async fn label_for_completion(
         &self,
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
index 37955b31c5..035a2c693d 100644
--- a/crates/languages/src/css.rs
+++ b/crates/languages/src/css.rs
@@ -2,14 +2,13 @@ use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use futures::StreamExt;
 use gpui::AsyncApp;
-use language::{LspAdapter, LspAdapterDelegate, Toolchain};
+use language::{LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::lsp_store::language_server_settings;
 use serde_json::json;
 use smol::fs;
 use std::{
-    any::Any,
     ffi::OsString,
     path::{Path, PathBuf},
     sync::Arc,
@@ -34,10 +33,18 @@ impl CssLspAdapter {
     }
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for CssLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName("vscode-css-language-server".into())
+impl LspInstaller for CssLspAdapter {
+    type BinaryVersion = String;
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<String> {
+        self.node
+            .npm_package_latest_version("vscode-langservers-extracted")
+            .await
     }
 
     async fn check_if_user_installed(
@@ -58,25 +65,12 @@ impl LspAdapter for CssLspAdapter {
         })
     }
 
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(
-            self.node
-                .npm_package_latest_version("vscode-langservers-extracted")
-                .await?,
-        ) as Box<_>)
-    }
-
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: String,
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         self.node
@@ -95,11 +89,10 @@ impl LspAdapter for CssLspAdapter {
 
     async fn check_if_version_installed(
         &self,
-        version: &(dyn 'static + Send + Any),
+        version: &String,
         container_dir: &PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Option<LanguageServerBinary> {
-        let version = version.downcast_ref::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         let should_install_language_server = self
@@ -130,6 +123,13 @@ impl LspAdapter for CssLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_server_binary(container_dir, &self.node).await
     }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for CssLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("vscode-css-language-server".into())
+    }
 
     async fn initialization_options(
         self: Arc<Self>,
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
index ff98f7bc86..60c6d98d21 100644
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -5,17 +5,17 @@ use futures::StreamExt;
 use gpui::{App, AsyncApp, Task};
 use http_client::github::latest_github_release;
 pub use language::*;
+use language::{LanguageToolchainStore, LspAdapterDelegate, LspInstaller};
 use lsp::{LanguageServerBinary, LanguageServerName};
 
 use regex::Regex;
 use serde_json::json;
 use smol::fs;
 use std::{
-    any::Any,
     borrow::Cow,
     ffi::{OsStr, OsString},
     ops::Range,
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::Output,
     str,
     sync::{
@@ -50,17 +50,32 @@ const BINARY: &str = if cfg!(target_os = "windows") {
     "gopls"
 };
 
-#[async_trait(?Send)]
-impl super::LspAdapter for GoLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
+impl LspInstaller for GoLspAdapter {
+    type BinaryVersion = Option<String>;
 
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
+        _: bool,
+        cx: &mut AsyncApp,
+    ) -> Result<Option<String>> {
+        static DID_SHOW_NOTIFICATION: AtomicBool = AtomicBool::new(false);
+
+        const NOTIFICATION_MESSAGE: &str =
+            "Could not install the Go language server `gopls`, because `go` was not found.";
+
+        if delegate.which("go".as_ref()).await.is_none() {
+            if DID_SHOW_NOTIFICATION
+                .compare_exchange(false, true, SeqCst, SeqCst)
+                .is_ok()
+            {
+                cx.update(|cx| {
+                    delegate.show_notification(NOTIFICATION_MESSAGE, cx);
+                })?
+            }
+            anyhow::bail!("cannot install gopls");
+        }
+
         let release =
             latest_github_release("golang/tools", false, false, delegate.http_client()).await?;
         let version: Option<String> = release.tag_name.strip_prefix("gopls/v").map(str::to_string);
@@ -70,7 +85,7 @@ impl super::LspAdapter for GoLspAdapter {
                 release.tag_name
             );
         }
-        Ok(Box::new(version) as Box<_>)
+        Ok(version)
     }
 
     async fn check_if_user_installed(
@@ -87,36 +102,9 @@ impl super::LspAdapter for GoLspAdapter {
         })
     }
 
-    fn will_fetch_server(
-        &self,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Option<Task<Result<()>>> {
-        static DID_SHOW_NOTIFICATION: AtomicBool = AtomicBool::new(false);
-
-        const NOTIFICATION_MESSAGE: &str =
-            "Could not install the Go language server `gopls`, because `go` was not found.";
-
-        let delegate = delegate.clone();
-        Some(cx.spawn(async move |cx| {
-            if delegate.which("go".as_ref()).await.is_none() {
-                if DID_SHOW_NOTIFICATION
-                    .compare_exchange(false, true, SeqCst, SeqCst)
-                    .is_ok()
-                {
-                    cx.update(|cx| {
-                        delegate.show_notification(NOTIFICATION_MESSAGE, cx);
-                    })?
-                }
-                anyhow::bail!("cannot install gopls");
-            }
-            Ok(())
-        }))
-    }
-
     async fn fetch_server_binary(
         &self,
-        version: Box<dyn 'static + Send + Any>,
+        version: Option<String>,
         container_dir: PathBuf,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
@@ -127,10 +115,8 @@ impl super::LspAdapter for GoLspAdapter {
             .await
             .context("failed to get go version via `go version` command`")?;
         let go_version = parse_version_output(&go_version_output)?;
-        let version = version.downcast::<Option<String>>().unwrap();
-        let this = *self;
 
-        if let Some(version) = *version {
+        if let Some(version) = version {
             let binary_path = container_dir.join(format!("gopls_{version}_go_{go_version}"));
             if let Ok(metadata) = fs::metadata(&binary_path).await
                 && metadata.is_file()
@@ -146,10 +132,7 @@ impl super::LspAdapter for GoLspAdapter {
                     env: None,
                 });
             }
-        } else if let Some(path) = this
-            .cached_server_binary(container_dir.clone(), delegate)
-            .await
-        {
+        } else if let Some(path) = get_cached_server_binary(&container_dir).await {
             return Ok(path);
         }
 
@@ -195,7 +178,14 @@ impl super::LspAdapter for GoLspAdapter {
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir).await
+        get_cached_server_binary(&container_dir).await
+    }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for GoLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
     }
 
     async fn initialization_options(
@@ -442,10 +432,10 @@ fn parse_version_output(output: &Output) -> Result<&str> {
     Ok(version)
 }
 
-async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
+async fn get_cached_server_binary(container_dir: &Path) -> Option<LanguageServerBinary> {
     maybe!(async {
         let mut last_binary_path = None;
-        let mut entries = fs::read_dir(&container_dir).await?;
+        let mut entries = fs::read_dir(container_dir).await?;
         while let Some(entry) = entries.next().await {
             let entry = entry?;
             if entry.file_type().await?.is_file()
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index 0d5d21de0b..df4a0d1146 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -9,7 +9,7 @@ use gpui::{App, AsyncApp, Task};
 use http_client::github::{GitHubLspBinaryVersion, latest_github_release};
 use language::{
     ContextProvider, LanguageName, LanguageRegistry, LocalFile as _, LspAdapter,
-    LspAdapterDelegate, Toolchain,
+    LspAdapterDelegate, LspInstaller, Toolchain,
 };
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
@@ -22,7 +22,6 @@ use smol::{
     lock::RwLock,
 };
 use std::{
-    any::Any,
     env::consts,
     ffi::OsString,
     path::{Path, PathBuf},
@@ -293,10 +292,18 @@ fn generate_inspector_style_schema() -> serde_json_lenient::Value {
     serde_json_lenient::to_value(schema).unwrap()
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for JsonLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName("json-language-server".into())
+impl LspInstaller for JsonLspAdapter {
+    type BinaryVersion = String;
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<String> {
+        self.node
+            .npm_package_latest_version(Self::PACKAGE_NAME)
+            .await
     }
 
     async fn check_if_user_installed(
@@ -317,25 +324,12 @@ impl LspAdapter for JsonLspAdapter {
         })
     }
 
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        Ok(Box::new(
-            self.node
-                .npm_package_latest_version(Self::PACKAGE_NAME)
-                .await?,
-        ) as Box<_>)
-    }
-
     async fn check_if_version_installed(
         &self,
-        version: &(dyn 'static + Send + Any),
+        version: &String,
         container_dir: &PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Option<LanguageServerBinary> {
-        let version = version.downcast_ref::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         let should_install_language_server = self
@@ -361,11 +355,10 @@ impl LspAdapter for JsonLspAdapter {
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: String,
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         self.node
@@ -389,6 +382,13 @@ impl LspAdapter for JsonLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_server_binary(container_dir, &self.node).await
     }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for JsonLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("json-language-server".into())
+    }
 
     async fn initialization_options(
         self: Arc<Self>,
@@ -483,17 +483,15 @@ impl NodeVersionAdapter {
         LanguageServerName::new_static("package-version-server");
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for NodeVersionAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
+impl LspInstaller for NodeVersionAdapter {
+    type BinaryVersion = GitHubLspBinaryVersion;
 
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<GitHubLspBinaryVersion> {
         let release = latest_github_release(
             "zed-industries/package-version-server",
             true,
@@ -518,11 +516,11 @@ impl LspAdapter for NodeVersionAdapter {
             .iter()
             .find(|asset| asset.name == asset_name)
             .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(Box::new(GitHubLspBinaryVersion {
+        Ok(GitHubLspBinaryVersion {
             name: release.tag_name,
             url: asset.browser_download_url.clone(),
             digest: asset.digest.clone(),
-        }))
+        })
     }
 
     async fn check_if_user_installed(
@@ -541,11 +539,11 @@ impl LspAdapter for NodeVersionAdapter {
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: GitHubLspBinaryVersion,
         container_dir: PathBuf,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let version = latest_version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        let version = &latest_version;
         let destination_path = container_dir.join(format!(
             "{}-{}{}",
             Self::SERVER_NAME,
@@ -595,6 +593,13 @@ impl LspAdapter for NodeVersionAdapter {
     }
 }
 
+#[async_trait(?Send)]
+impl LspAdapter for NodeVersionAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
+}
+
 async fn get_cached_version_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
     maybe!(async {
         let mut last = None;
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index 71d847d9f2..eaf536d8b2 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -6,7 +6,7 @@ use futures::{AsyncBufReadExt, StreamExt as _};
 use gpui::{App, AsyncApp, SharedString, Task};
 use http_client::github::{AssetKind, GitHubLspBinaryVersion, latest_github_release};
 use language::language_settings::language_settings;
-use language::{ContextLocation, LanguageToolchainStore};
+use language::{ContextLocation, LanguageToolchainStore, LspInstaller};
 use language::{ContextProvider, LspAdapter, LspAdapterDelegate};
 use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
 use language::{Toolchain, ToolchainList, ToolchainLister, ToolchainMetadata};
@@ -27,7 +27,6 @@ use util::fs::{make_file_executable, remove_matching};
 use parking_lot::Mutex;
 use std::str::FromStr;
 use std::{
-    any::Any,
     borrow::Cow,
     ffi::OsString,
     fmt::Write,
@@ -159,11 +158,44 @@ impl LspAdapter for TyLspAdapter {
         Self::SERVER_NAME
     }
 
+    async fn workspace_configuration(
+        self: Arc<Self>,
+        _: &Arc<dyn LspAdapterDelegate>,
+        toolchain: Option<Toolchain>,
+        _cx: &mut AsyncApp,
+    ) -> Result<Value> {
+        let mut ret = json!({});
+        if let Some(toolchain) = toolchain.and_then(|toolchain| {
+            serde_json::from_value::<PythonEnvironment>(toolchain.as_json).ok()
+        }) {
+            _ = maybe!({
+                let uri = url::Url::from_file_path(toolchain.executable?).ok()?;
+                let sys_prefix = toolchain.prefix.clone()?;
+                let environment = json!({
+                    "executable": {
+                        "uri": uri,
+                        "sysPrefix": sys_prefix
+                    }
+                });
+                ret.as_object_mut()?.insert(
+                    "pythonExtension".into(),
+                    json!({ "activeEnvironment": environment }),
+                );
+                Some(())
+            });
+        }
+        Ok(json!({"ty": ret}))
+    }
+}
+
+impl LspInstaller for TyLspAdapter {
+    type BinaryVersion = GitHubLspBinaryVersion;
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<Self::BinaryVersion> {
         let release =
             latest_github_release("astral-sh/ty", true, true, delegate.http_client()).await?;
         let (_, asset_name) = Self::build_asset_name()?;
@@ -172,16 +204,16 @@ impl LspAdapter for TyLspAdapter {
             .into_iter()
             .find(|asset| asset.name == asset_name)
             .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(Box::new(GitHubLspBinaryVersion {
+        Ok(GitHubLspBinaryVersion {
             name: release.tag_name,
             url: asset.browser_download_url,
             digest: asset.digest,
-        }))
+        })
     }
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: Self::BinaryVersion,
         container_dir: PathBuf,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
@@ -189,7 +221,7 @@ impl LspAdapter for TyLspAdapter {
             name,
             url,
             digest: expected_digest,
-        } = *latest_version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        } = latest_version;
         let destination_path = container_dir.join(format!("ty-{name}"));
         let server_path = match Self::GITHUB_ASSET_KIND {
             AssetKind::TarGz | AssetKind::Gz => destination_path.clone(), // Tar and gzip extract in place.
@@ -293,35 +325,6 @@ impl LspAdapter for TyLspAdapter {
         .await
         .log_err()
     }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        _cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let mut ret = json!({});
-        if let Some(toolchain) = toolchain.and_then(|toolchain| {
-            serde_json::from_value::<PythonEnvironment>(toolchain.as_json).ok()
-        }) {
-            _ = maybe!({
-                let uri = url::Url::from_file_path(toolchain.executable?).ok()?;
-                let sys_prefix = toolchain.prefix.clone()?;
-                let environment = json!({
-                    "executable": {
-                        "uri": uri,
-                        "sysPrefix": sys_prefix
-                    }
-                });
-                ret.as_object_mut()?.insert(
-                    "pythonExtension".into(),
-                    json!({ "activeEnvironment": environment }),
-                );
-                Some(())
-            });
-        }
-        Ok(json!({"ty": ret}))
-    }
 }
 
 pub struct PyrightLspAdapter {
@@ -359,114 +362,6 @@ impl LspAdapter for PyrightLspAdapter {
         })))
     }
 
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        if let Some(pyright_bin) = delegate.which("pyright-langserver".as_ref()).await {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: pyright_bin,
-                env: Some(env),
-                arguments: vec!["--stdio".into()],
-            })
-        } else {
-            let node = delegate.which("node".as_ref()).await?;
-            let (node_modules_path, _) = delegate
-                .npm_package_installed_version(Self::SERVER_NAME.as_ref())
-                .await
-                .log_err()??;
-
-            let path = node_modules_path.join(NODE_MODULE_RELATIVE_SERVER_PATH);
-
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: node,
-                env: Some(env),
-                arguments: server_binary_arguments(&path),
-            })
-        }
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(
-            self.node
-                .npm_package_latest_version(Self::SERVER_NAME.as_ref())
-                .await?,
-        ) as Box<_>)
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: Box<dyn 'static + Send + Any>,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<String>().unwrap();
-        let server_path = container_dir.join(SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::SERVER_NAME.as_ref(), latest_version.as_str())],
-            )
-            .await?;
-
-        let env = delegate.shell_env().await;
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: Some(env),
-            arguments: server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &(dyn 'static + Send + Any),
-        container_dir: &PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let version = version.downcast_ref::<String>().unwrap();
-        let server_path = container_dir.join(SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::SERVER_NAME.as_ref(),
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: Some(env),
-                arguments: server_binary_arguments(&server_path),
-            })
-        }
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let mut binary = get_cached_server_binary(container_dir, &self.node).await?;
-        binary.env = Some(delegate.shell_env().await);
-        Some(binary)
-    }
-
     async fn process_completions(&self, items: &mut [lsp::CompletionItem]) {
         process_pyright_completions(items);
     }
@@ -616,6 +511,115 @@ impl LspAdapter for PyrightLspAdapter {
     }
 }
 
+impl LspInstaller for PyrightLspAdapter {
+    type BinaryVersion = String;
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<String> {
+        self.node
+            .npm_package_latest_version(Self::SERVER_NAME.as_ref())
+            .await
+    }
+
+    async fn check_if_user_installed(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        _: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> Option<LanguageServerBinary> {
+        if let Some(pyright_bin) = delegate.which("pyright-langserver".as_ref()).await {
+            let env = delegate.shell_env().await;
+            Some(LanguageServerBinary {
+                path: pyright_bin,
+                env: Some(env),
+                arguments: vec!["--stdio".into()],
+            })
+        } else {
+            let node = delegate.which("node".as_ref()).await?;
+            let (node_modules_path, _) = delegate
+                .npm_package_installed_version(Self::SERVER_NAME.as_ref())
+                .await
+                .log_err()??;
+
+            let path = node_modules_path.join(NODE_MODULE_RELATIVE_SERVER_PATH);
+
+            let env = delegate.shell_env().await;
+            Some(LanguageServerBinary {
+                path: node,
+                env: Some(env),
+                arguments: server_binary_arguments(&path),
+            })
+        }
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        latest_version: Self::BinaryVersion,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let server_path = container_dir.join(SERVER_PATH);
+
+        self.node
+            .npm_install_packages(
+                &container_dir,
+                &[(Self::SERVER_NAME.as_ref(), latest_version.as_str())],
+            )
+            .await?;
+
+        let env = delegate.shell_env().await;
+        Ok(LanguageServerBinary {
+            path: self.node.binary_path().await?,
+            env: Some(env),
+            arguments: server_binary_arguments(&server_path),
+        })
+    }
+
+    async fn check_if_version_installed(
+        &self,
+        version: &Self::BinaryVersion,
+        container_dir: &PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        let server_path = container_dir.join(SERVER_PATH);
+
+        let should_install_language_server = self
+            .node
+            .should_install_npm_package(
+                Self::SERVER_NAME.as_ref(),
+                &server_path,
+                container_dir,
+                VersionStrategy::Latest(version),
+            )
+            .await;
+
+        if should_install_language_server {
+            None
+        } else {
+            let env = delegate.shell_env().await;
+            Some(LanguageServerBinary {
+                path: self.node.binary_path().await.ok()?,
+                env: Some(env),
+                arguments: server_binary_arguments(&server_path),
+            })
+        }
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        let mut binary = get_cached_server_binary(container_dir, &self.node).await?;
+        binary.env = Some(delegate.shell_env().await);
+        Some(binary)
+    }
+}
+
 async fn get_cached_server_binary(
     container_dir: PathBuf,
     node: &NodeRuntime,
@@ -1333,101 +1337,6 @@ impl LspAdapter for PyLspAdapter {
         Self::SERVER_NAME
     }
 
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        toolchain: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        if let Some(pylsp_bin) = delegate.which(Self::SERVER_NAME.as_ref()).await {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: pylsp_bin,
-                env: Some(env),
-                arguments: vec![],
-            })
-        } else {
-            let toolchain = toolchain?;
-            let pylsp_path = Path::new(toolchain.path.as_ref()).parent()?.join("pylsp");
-            pylsp_path.exists().then(|| LanguageServerBinary {
-                path: toolchain.path.to_string().into(),
-                arguments: vec![pylsp_path.into()],
-                env: None,
-            })
-        }
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(()) as Box<_>)
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        _: Box<dyn 'static + Send + Any>,
-        _: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let venv = self.base_venv(delegate).await.map_err(|e| anyhow!(e))?;
-        let pip_path = venv.join(BINARY_DIR).join("pip3");
-        ensure!(
-            util::command::new_smol_command(pip_path.as_path())
-                .arg("install")
-                .arg("python-lsp-server")
-                .arg("-U")
-                .output()
-                .await?
-                .status
-                .success(),
-            "python-lsp-server installation failed"
-        );
-        ensure!(
-            util::command::new_smol_command(pip_path.as_path())
-                .arg("install")
-                .arg("python-lsp-server[all]")
-                .arg("-U")
-                .output()
-                .await?
-                .status
-                .success(),
-            "python-lsp-server[all] installation failed"
-        );
-        ensure!(
-            util::command::new_smol_command(pip_path)
-                .arg("install")
-                .arg("pylsp-mypy")
-                .arg("-U")
-                .output()
-                .await?
-                .status
-                .success(),
-            "pylsp-mypy installation failed"
-        );
-        let pylsp = venv.join(BINARY_DIR).join("pylsp");
-        Ok(LanguageServerBinary {
-            path: pylsp,
-            env: None,
-            arguments: vec![],
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        _: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let venv = self.base_venv(delegate).await.ok()?;
-        let pylsp = venv.join(BINARY_DIR).join("pylsp");
-        Some(LanguageServerBinary {
-            path: pylsp,
-            env: None,
-            arguments: vec![],
-        })
-    }
-
     async fn process_completions(&self, _items: &mut [lsp::CompletionItem]) {}
 
     async fn label_for_completion(
@@ -1559,6 +1468,105 @@ impl LspAdapter for PyLspAdapter {
     }
 }
 
+impl LspInstaller for PyLspAdapter {
+    type BinaryVersion = ();
+    async fn check_if_user_installed(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        toolchain: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> Option<LanguageServerBinary> {
+        if let Some(pylsp_bin) = delegate.which(Self::SERVER_NAME.as_ref()).await {
+            let env = delegate.shell_env().await;
+            Some(LanguageServerBinary {
+                path: pylsp_bin,
+                env: Some(env),
+                arguments: vec![],
+            })
+        } else {
+            let toolchain = toolchain?;
+            let pylsp_path = Path::new(toolchain.path.as_ref()).parent()?.join("pylsp");
+            pylsp_path.exists().then(|| LanguageServerBinary {
+                path: toolchain.path.to_string().into(),
+                arguments: vec![pylsp_path.into()],
+                env: None,
+            })
+        }
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<()> {
+        Ok(())
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        _: (),
+        _: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let venv = self.base_venv(delegate).await.map_err(|e| anyhow!(e))?;
+        let pip_path = venv.join(BINARY_DIR).join("pip3");
+        ensure!(
+            util::command::new_smol_command(pip_path.as_path())
+                .arg("install")
+                .arg("python-lsp-server")
+                .arg("-U")
+                .output()
+                .await?
+                .status
+                .success(),
+            "python-lsp-server installation failed"
+        );
+        ensure!(
+            util::command::new_smol_command(pip_path.as_path())
+                .arg("install")
+                .arg("python-lsp-server[all]")
+                .arg("-U")
+                .output()
+                .await?
+                .status
+                .success(),
+            "python-lsp-server[all] installation failed"
+        );
+        ensure!(
+            util::command::new_smol_command(pip_path)
+                .arg("install")
+                .arg("pylsp-mypy")
+                .arg("-U")
+                .output()
+                .await?
+                .status
+                .success(),
+            "pylsp-mypy installation failed"
+        );
+        let pylsp = venv.join(BINARY_DIR).join("pylsp");
+        Ok(LanguageServerBinary {
+            path: pylsp,
+            env: None,
+            arguments: vec![],
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        _: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        let venv = self.base_venv(delegate).await.ok()?;
+        let pylsp = venv.join(BINARY_DIR).join("pylsp");
+        Some(LanguageServerBinary {
+            path: pylsp,
+            env: None,
+            arguments: vec![],
+        })
+    }
+}
+
 pub(crate) struct BasedPyrightLspAdapter {
     python_venv_base: OnceCell<Result<Arc<Path>, String>>,
 }
@@ -1642,80 +1650,6 @@ impl LspAdapter for BasedPyrightLspAdapter {
         })))
     }
 
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        toolchain: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        if let Some(bin) = delegate.which(Self::BINARY_NAME.as_ref()).await {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: bin,
-                env: Some(env),
-                arguments: vec!["--stdio".into()],
-            })
-        } else {
-            let path = Path::new(toolchain?.path.as_ref())
-                .parent()?
-                .join(Self::BINARY_NAME);
-            path.exists().then(|| LanguageServerBinary {
-                path,
-                arguments: vec!["--stdio".into()],
-                env: None,
-            })
-        }
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(()) as Box<_>)
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        _latest_version: Box<dyn 'static + Send + Any>,
-        _container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let venv = self.base_venv(delegate).await.map_err(|e| anyhow!(e))?;
-        let pip_path = venv.join(BINARY_DIR).join("pip3");
-        ensure!(
-            util::command::new_smol_command(pip_path.as_path())
-                .arg("install")
-                .arg("basedpyright")
-                .arg("-U")
-                .output()
-                .await?
-                .status
-                .success(),
-            "basedpyright installation failed"
-        );
-        let pylsp = venv.join(BINARY_DIR).join(Self::BINARY_NAME);
-        Ok(LanguageServerBinary {
-            path: pylsp,
-            env: None,
-            arguments: vec!["--stdio".into()],
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        _container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let venv = self.base_venv(delegate).await.ok()?;
-        let pylsp = venv.join(BINARY_DIR).join(Self::BINARY_NAME);
-        Some(LanguageServerBinary {
-            path: pylsp,
-            env: None,
-            arguments: vec!["--stdio".into()],
-        })
-    }
-
     async fn process_completions(&self, items: &mut [lsp::CompletionItem]) {
         process_pyright_completions(items);
     }
@@ -1878,6 +1812,85 @@ impl LspAdapter for BasedPyrightLspAdapter {
     }
 }
 
+impl LspInstaller for BasedPyrightLspAdapter {
+    type BinaryVersion = ();
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<()> {
+        Ok(())
+    }
+
+    async fn check_if_user_installed(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        toolchain: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> Option<LanguageServerBinary> {
+        if let Some(bin) = delegate.which(Self::BINARY_NAME.as_ref()).await {
+            let env = delegate.shell_env().await;
+            Some(LanguageServerBinary {
+                path: bin,
+                env: Some(env),
+                arguments: vec!["--stdio".into()],
+            })
+        } else {
+            let path = Path::new(toolchain?.path.as_ref())
+                .parent()?
+                .join(Self::BINARY_NAME);
+            path.exists().then(|| LanguageServerBinary {
+                path,
+                arguments: vec!["--stdio".into()],
+                env: None,
+            })
+        }
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        _latest_version: (),
+        _container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let venv = self.base_venv(delegate).await.map_err(|e| anyhow!(e))?;
+        let pip_path = venv.join(BINARY_DIR).join("pip3");
+        ensure!(
+            util::command::new_smol_command(pip_path.as_path())
+                .arg("install")
+                .arg("basedpyright")
+                .arg("-U")
+                .output()
+                .await?
+                .status
+                .success(),
+            "basedpyright installation failed"
+        );
+        let pylsp = venv.join(BINARY_DIR).join(Self::BINARY_NAME);
+        Ok(LanguageServerBinary {
+            path: pylsp,
+            env: None,
+            arguments: vec!["--stdio".into()],
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        _container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        let venv = self.base_venv(delegate).await.ok()?;
+        let pylsp = venv.join(BINARY_DIR).join(Self::BINARY_NAME);
+        Some(LanguageServerBinary {
+            path: pylsp,
+            env: None,
+            arguments: vec!["--stdio".into()],
+        })
+    }
+}
+
 pub(crate) struct RuffLspAdapter {
     fs: Arc<dyn Fs>,
 }
@@ -1934,7 +1947,10 @@ impl LspAdapter for RuffLspAdapter {
     fn name(&self) -> LanguageServerName {
         Self::SERVER_NAME
     }
+}
 
+impl LspInstaller for RuffLspAdapter {
+    type BinaryVersion = GitHubLspBinaryVersion;
     async fn check_if_user_installed(
         &self,
         delegate: &dyn LspAdapterDelegate,
@@ -1968,8 +1984,9 @@ impl LspAdapter for RuffLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         delegate: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<GitHubLspBinaryVersion> {
         let release =
             latest_github_release("astral-sh/ruff", true, false, delegate.http_client()).await?;
         let (_, asset_name) = Self::build_asset_name()?;
@@ -1978,16 +1995,16 @@ impl LspAdapter for RuffLspAdapter {
             .into_iter()
             .find(|asset| asset.name == asset_name)
             .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(Box::new(GitHubLspBinaryVersion {
+        Ok(GitHubLspBinaryVersion {
             name: release.tag_name,
             url: asset.browser_download_url,
             digest: asset.digest,
-        }))
+        })
     }
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: GitHubLspBinaryVersion,
         container_dir: PathBuf,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
@@ -1995,7 +2012,7 @@ impl LspAdapter for RuffLspAdapter {
             name,
             url,
             digest: expected_digest,
-        } = *latest_version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        } = latest_version;
         let destination_path = container_dir.join(format!("ruff-{name}"));
         let server_path = match Self::GITHUB_ASSET_KIND {
             AssetKind::TarGz | AssetKind::Gz => destination_path
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
index ce73c70c0c..e35d870610 100644
--- a/crates/languages/src/rust.rs
+++ b/crates/languages/src/rust.rs
@@ -16,7 +16,6 @@ use smol::fs::{self};
 use std::fmt::Display;
 use std::ops::Range;
 use std::{
-    any::Any,
     borrow::Cow,
     path::{Path, PathBuf},
     sync::{Arc, LazyLock},
@@ -108,161 +107,6 @@ impl LspAdapter for RustLspAdapter {
         SERVER_NAME
     }
 
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which("rust-analyzer".as_ref()).await?;
-        let env = delegate.shell_env().await;
-
-        // It is surprisingly common for ~/.cargo/bin/rust-analyzer to be a symlink to
-        // /usr/bin/rust-analyzer that fails when you run it; so we need to test it.
-        log::info!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`");
-        let result = delegate
-            .try_exec(LanguageServerBinary {
-                path: path.clone(),
-                arguments: vec!["--help".into()],
-                env: Some(env.clone()),
-            })
-            .await;
-        if let Err(err) = result {
-            log::debug!(
-                "failed to run rust-analyzer after detecting it in PATH: binary: {:?}: {}",
-                path,
-                err
-            );
-            return None;
-        }
-
-        Some(LanguageServerBinary {
-            path,
-            env: Some(env),
-            arguments: vec![],
-        })
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        cx: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release(
-            "rust-lang/rust-analyzer",
-            true,
-            ProjectSettings::try_read_global(cx, |s| {
-                s.lsp.get(&SERVER_NAME)?.fetch.as_ref()?.pre_release
-            })
-            .flatten()
-            .unwrap_or(false),
-            delegate.http_client(),
-        )
-        .await?;
-        let asset_name = Self::build_asset_name();
-        let asset = release
-            .assets
-            .into_iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(Box::new(GitHubLspBinaryVersion {
-            name: release.tag_name,
-            url: asset.browser_download_url,
-            digest: asset.digest,
-        }))
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        version: Box<dyn 'static + Send + Any>,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let GitHubLspBinaryVersion {
-            name,
-            url,
-            digest: expected_digest,
-        } = *version.downcast::<GitHubLspBinaryVersion>().unwrap();
-        let destination_path = container_dir.join(format!("rust-analyzer-{name}"));
-        let server_path = match Self::GITHUB_ASSET_KIND {
-            AssetKind::TarGz | AssetKind::Gz => destination_path.clone(), // Tar and gzip extract in place.
-            AssetKind::Zip => destination_path.clone().join("rust-analyzer.exe"), // zip contains a .exe
-        };
-
-        let binary = LanguageServerBinary {
-            path: server_path.clone(),
-            env: None,
-            arguments: Default::default(),
-        };
-
-        let metadata_path = destination_path.with_extension("metadata");
-        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
-            .await
-            .ok();
-        if let Some(metadata) = metadata {
-            let validity_check = async || {
-                delegate
-                    .try_exec(LanguageServerBinary {
-                        path: server_path.clone(),
-                        arguments: vec!["--version".into()],
-                        env: None,
-                    })
-                    .await
-                    .inspect_err(|err| {
-                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
-                    })
-            };
-            if let (Some(actual_digest), Some(expected_digest)) =
-                (&metadata.digest, &expected_digest)
-            {
-                if actual_digest == expected_digest {
-                    if validity_check().await.is_ok() {
-                        return Ok(binary);
-                    }
-                } else {
-                    log::info!(
-                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
-                    );
-                }
-            } else if validity_check().await.is_ok() {
-                return Ok(binary);
-            }
-        }
-
-        download_server_binary(
-            delegate,
-            &url,
-            expected_digest.as_deref(),
-            &destination_path,
-            Self::GITHUB_ASSET_KIND,
-        )
-        .await?;
-        make_file_executable(&server_path).await?;
-        remove_matching(&container_dir, |path| path != destination_path).await;
-        GithubBinaryMetadata::write_to_file(
-            &GithubBinaryMetadata {
-                metadata_version: 1,
-                digest: expected_digest,
-            },
-            &metadata_path,
-        )
-        .await?;
-
-        Ok(LanguageServerBinary {
-            path: server_path,
-            env: None,
-            arguments: Default::default(),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir).await
-    }
-
     fn disk_based_diagnostic_sources(&self) -> Vec<String> {
         vec![CARGO_DIAGNOSTICS_SOURCE_NAME.to_owned()]
     }
@@ -518,6 +362,161 @@ impl LspAdapter for RustLspAdapter {
     }
 }
 
+impl LspInstaller for RustLspAdapter {
+    type BinaryVersion = GitHubLspBinaryVersion;
+    async fn check_if_user_installed(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        _: Option<Toolchain>,
+        _: &AsyncApp,
+    ) -> Option<LanguageServerBinary> {
+        let path = delegate.which("rust-analyzer".as_ref()).await?;
+        let env = delegate.shell_env().await;
+
+        // It is surprisingly common for ~/.cargo/bin/rust-analyzer to be a symlink to
+        // /usr/bin/rust-analyzer that fails when you run it; so we need to test it.
+        log::info!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`");
+        let result = delegate
+            .try_exec(LanguageServerBinary {
+                path: path.clone(),
+                arguments: vec!["--help".into()],
+                env: Some(env.clone()),
+            })
+            .await;
+        if let Err(err) = result {
+            log::debug!(
+                "failed to run rust-analyzer after detecting it in PATH: binary: {:?}: {}",
+                path,
+                err
+            );
+            return None;
+        }
+
+        Some(LanguageServerBinary {
+            path,
+            env: Some(env),
+            arguments: vec![],
+        })
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+        pre_release: bool,
+        _: &mut AsyncApp,
+    ) -> Result<GitHubLspBinaryVersion> {
+        let release = latest_github_release(
+            "rust-lang/rust-analyzer",
+            true,
+            pre_release,
+            delegate.http_client(),
+        )
+        .await?;
+        let asset_name = Self::build_asset_name();
+        let asset = release
+            .assets
+            .into_iter()
+            .find(|asset| asset.name == asset_name)
+            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
+        Ok(GitHubLspBinaryVersion {
+            name: release.tag_name,
+            url: asset.browser_download_url,
+            digest: asset.digest,
+        })
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: GitHubLspBinaryVersion,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let GitHubLspBinaryVersion {
+            name,
+            url,
+            digest: expected_digest,
+        } = version;
+        let destination_path = container_dir.join(format!("rust-analyzer-{name}"));
+        let server_path = match Self::GITHUB_ASSET_KIND {
+            AssetKind::TarGz | AssetKind::Gz => destination_path.clone(), // Tar and gzip extract in place.
+            AssetKind::Zip => destination_path.clone().join("rust-analyzer.exe"), // zip contains a .exe
+        };
+
+        let binary = LanguageServerBinary {
+            path: server_path.clone(),
+            env: None,
+            arguments: Default::default(),
+        };
+
+        let metadata_path = destination_path.with_extension("metadata");
+        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
+            .await
+            .ok();
+        if let Some(metadata) = metadata {
+            let validity_check = async || {
+                delegate
+                    .try_exec(LanguageServerBinary {
+                        path: server_path.clone(),
+                        arguments: vec!["--version".into()],
+                        env: None,
+                    })
+                    .await
+                    .inspect_err(|err| {
+                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
+                    })
+            };
+            if let (Some(actual_digest), Some(expected_digest)) =
+                (&metadata.digest, &expected_digest)
+            {
+                if actual_digest == expected_digest {
+                    if validity_check().await.is_ok() {
+                        return Ok(binary);
+                    }
+                } else {
+                    log::info!(
+                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
+                    );
+                }
+            } else if validity_check().await.is_ok() {
+                return Ok(binary);
+            }
+        }
+
+        download_server_binary(
+            delegate,
+            &url,
+            expected_digest.as_deref(),
+            &destination_path,
+            Self::GITHUB_ASSET_KIND,
+        )
+        .await?;
+        make_file_executable(&server_path).await?;
+        remove_matching(&container_dir, |path| path != destination_path).await;
+        GithubBinaryMetadata::write_to_file(
+            &GithubBinaryMetadata {
+                metadata_version: 1,
+                digest: expected_digest,
+            },
+            &metadata_path,
+        )
+        .await?;
+
+        Ok(LanguageServerBinary {
+            path: server_path,
+            env: None,
+            arguments: Default::default(),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir).await
+    }
+}
+
 pub(crate) struct RustContextProvider;
 
 const RUST_PACKAGE_TASK_VARIABLE: VariableName =
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
index 1d8b3db212..db539edabb 100644
--- a/crates/languages/src/tailwind.rs
+++ b/crates/languages/src/tailwind.rs
@@ -3,14 +3,13 @@ use async_trait::async_trait;
 use collections::HashMap;
 use futures::StreamExt;
 use gpui::AsyncApp;
-use language::{LanguageName, LspAdapter, LspAdapterDelegate, Toolchain};
+use language::{LanguageName, LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::lsp_store::language_server_settings;
 use serde_json::{Value, json};
 use smol::fs;
 use std::{
-    any::Any,
     ffi::OsString,
     path::{Path, PathBuf},
     sync::Arc,
@@ -41,10 +40,18 @@ impl TailwindLspAdapter {
     }
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for TailwindLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
+impl LspInstaller for TailwindLspAdapter {
+    type BinaryVersion = String;
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<String> {
+        self.node
+            .npm_package_latest_version(Self::PACKAGE_NAME)
+            .await
     }
 
     async fn check_if_user_installed(
@@ -63,25 +70,12 @@ impl LspAdapter for TailwindLspAdapter {
         })
     }
 
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(
-            self.node
-                .npm_package_latest_version(Self::PACKAGE_NAME)
-                .await?,
-        ) as Box<_>)
-    }
-
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: String,
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         self.node
@@ -100,11 +94,10 @@ impl LspAdapter for TailwindLspAdapter {
 
     async fn check_if_version_installed(
         &self,
-        version: &(dyn 'static + Send + Any),
+        version: &String,
         container_dir: &PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Option<LanguageServerBinary> {
-        let version = version.downcast_ref::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         let should_install_language_server = self
@@ -135,6 +128,13 @@ impl LspAdapter for TailwindLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_server_binary(container_dir, &self.node).await
     }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for TailwindLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
 
     async fn initialization_options(
         self: Arc<Self>,
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index 8f9d362c0d..bc939f0b72 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -7,7 +7,7 @@ use gpui::{App, AppContext, AsyncApp, Task};
 use http_client::github::{AssetKind, GitHubLspBinaryVersion, build_asset_url};
 use language::{
     ContextLocation, ContextProvider, File, LanguageName, LanguageToolchainStore, LspAdapter,
-    LspAdapterDelegate, Toolchain,
+    LspAdapterDelegate, LspInstaller, Toolchain,
 };
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
@@ -15,7 +15,6 @@ use project::{Fs, lsp_store::language_server_settings};
 use serde_json::{Value, json};
 use smol::{fs, lock::RwLock, stream::StreamExt};
 use std::{
-    any::Any,
     borrow::Cow,
     ffi::OsString,
     path::{Path, PathBuf},
@@ -555,38 +554,35 @@ impl TypeScriptLspAdapter {
     }
 }
 
-struct TypeScriptVersions {
+pub struct TypeScriptVersions {
     typescript_version: String,
     server_version: String,
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for TypeScriptLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
+impl LspInstaller for TypeScriptLspAdapter {
+    type BinaryVersion = TypeScriptVersions;
 
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        Ok(Box::new(TypeScriptVersions {
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<TypeScriptVersions> {
+        Ok(TypeScriptVersions {
             typescript_version: self.node.npm_package_latest_version("typescript").await?,
             server_version: self
                 .node
                 .npm_package_latest_version("typescript-language-server")
                 .await?,
-        }) as Box<_>)
+        })
     }
 
     async fn check_if_version_installed(
         &self,
-        version: &(dyn 'static + Send + Any),
+        version: &TypeScriptVersions,
         container_dir: &PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Option<LanguageServerBinary> {
-        let version = version.downcast_ref::<TypeScriptVersions>().unwrap();
         let server_path = container_dir.join(Self::NEW_SERVER_PATH);
 
         let should_install_language_server = self
@@ -612,11 +608,10 @@ impl LspAdapter for TypeScriptLspAdapter {
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: TypeScriptVersions,
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<TypeScriptVersions>().unwrap();
         let server_path = container_dir.join(Self::NEW_SERVER_PATH);
 
         self.node
@@ -649,6 +644,13 @@ impl LspAdapter for TypeScriptLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_ts_server_binary(container_dir, &self.node).await
     }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for TypeScriptLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
 
     fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
         Some(vec![
@@ -815,6 +817,99 @@ impl EsLintLspAdapter {
     }
 }
 
+impl LspInstaller for EsLintLspAdapter {
+    type BinaryVersion = GitHubLspBinaryVersion;
+
+    async fn fetch_latest_server_version(
+        &self,
+        _delegate: &dyn LspAdapterDelegate,
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<GitHubLspBinaryVersion> {
+        let url = build_asset_url(
+            "zed-industries/vscode-eslint",
+            Self::CURRENT_VERSION_TAG_NAME,
+            Self::GITHUB_ASSET_KIND,
+        )?;
+
+        Ok(GitHubLspBinaryVersion {
+            name: Self::CURRENT_VERSION.into(),
+            digest: None,
+            url,
+        })
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: GitHubLspBinaryVersion,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let destination_path = Self::build_destination_path(&container_dir);
+        let server_path = destination_path.join(Self::SERVER_PATH);
+
+        if fs::metadata(&server_path).await.is_err() {
+            remove_matching(&container_dir, |_| true).await;
+
+            download_server_binary(
+                delegate,
+                &version.url,
+                None,
+                &destination_path,
+                Self::GITHUB_ASSET_KIND,
+            )
+            .await?;
+
+            let mut dir = fs::read_dir(&destination_path).await?;
+            let first = dir.next().await.context("missing first file")??;
+            let repo_root = destination_path.join("vscode-eslint");
+            fs::rename(first.path(), &repo_root).await?;
+
+            #[cfg(target_os = "windows")]
+            {
+                handle_symlink(
+                    repo_root.join("$shared"),
+                    repo_root.join("client").join("src").join("shared"),
+                )
+                .await?;
+                handle_symlink(
+                    repo_root.join("$shared"),
+                    repo_root.join("server").join("src").join("shared"),
+                )
+                .await?;
+            }
+
+            self.node
+                .run_npm_subcommand(&repo_root, "install", &[])
+                .await?;
+
+            self.node
+                .run_npm_subcommand(&repo_root, "run-script", &["compile"])
+                .await?;
+        }
+
+        Ok(LanguageServerBinary {
+            path: self.node.binary_path().await?,
+            env: None,
+            arguments: eslint_server_binary_arguments(&server_path),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        let server_path =
+            Self::build_destination_path(&container_dir).join(EsLintLspAdapter::SERVER_PATH);
+        Some(LanguageServerBinary {
+            path: self.node.binary_path().await.ok()?,
+            env: None,
+            arguments: eslint_server_binary_arguments(&server_path),
+        })
+    }
+}
+
 #[async_trait(?Send)]
 impl LspAdapter for EsLintLspAdapter {
     fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
@@ -886,95 +981,6 @@ impl LspAdapter for EsLintLspAdapter {
     fn name(&self) -> LanguageServerName {
         Self::SERVER_NAME
     }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _delegate: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        let url = build_asset_url(
-            "zed-industries/vscode-eslint",
-            Self::CURRENT_VERSION_TAG_NAME,
-            Self::GITHUB_ASSET_KIND,
-        )?;
-
-        Ok(Box::new(GitHubLspBinaryVersion {
-            name: Self::CURRENT_VERSION.into(),
-            digest: None,
-            url,
-        }))
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        version: Box<dyn 'static + Send + Any>,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let version = version.downcast::<GitHubLspBinaryVersion>().unwrap();
-        let destination_path = Self::build_destination_path(&container_dir);
-        let server_path = destination_path.join(Self::SERVER_PATH);
-
-        if fs::metadata(&server_path).await.is_err() {
-            remove_matching(&container_dir, |_| true).await;
-
-            download_server_binary(
-                delegate,
-                &version.url,
-                None,
-                &destination_path,
-                Self::GITHUB_ASSET_KIND,
-            )
-            .await?;
-
-            let mut dir = fs::read_dir(&destination_path).await?;
-            let first = dir.next().await.context("missing first file")??;
-            let repo_root = destination_path.join("vscode-eslint");
-            fs::rename(first.path(), &repo_root).await?;
-
-            #[cfg(target_os = "windows")]
-            {
-                handle_symlink(
-                    repo_root.join("$shared"),
-                    repo_root.join("client").join("src").join("shared"),
-                )
-                .await?;
-                handle_symlink(
-                    repo_root.join("$shared"),
-                    repo_root.join("server").join("src").join("shared"),
-                )
-                .await?;
-            }
-
-            self.node
-                .run_npm_subcommand(&repo_root, "install", &[])
-                .await?;
-
-            self.node
-                .run_npm_subcommand(&repo_root, "run-script", &["compile"])
-                .await?;
-        }
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: eslint_server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path =
-            Self::build_destination_path(&container_dir).join(EsLintLspAdapter::SERVER_PATH);
-        Some(LanguageServerBinary {
-            path: self.node.binary_path().await.ok()?,
-            env: None,
-            arguments: eslint_server_binary_arguments(&server_path),
-        })
-    }
 }
 
 #[cfg(target_os = "windows")]
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 32554fe651..763a0d5a5e 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -2,13 +2,12 @@ use anyhow::Result;
 use async_trait::async_trait;
 use collections::HashMap;
 use gpui::AsyncApp;
-use language::{LanguageName, LspAdapter, LspAdapterDelegate, Toolchain};
+use language::{LanguageName, LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
 use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::{Fs, lsp_store::language_server_settings};
 use serde_json::Value;
 use std::{
-    any::Any,
     ffi::OsString,
     path::{Path, PathBuf},
     sync::Arc,
@@ -59,31 +58,29 @@ impl VtslsLspAdapter {
     }
 }
 
-struct TypeScriptVersions {
+pub struct TypeScriptVersions {
     typescript_version: String,
     server_version: String,
 }
 
 const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("vtsls");
 
-#[async_trait(?Send)]
-impl LspAdapter for VtslsLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        SERVER_NAME
-    }
+impl LspInstaller for VtslsLspAdapter {
+    type BinaryVersion = TypeScriptVersions;
 
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
-        Ok(Box::new(TypeScriptVersions {
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<TypeScriptVersions> {
+        Ok(TypeScriptVersions {
             typescript_version: self.node.npm_package_latest_version("typescript").await?,
             server_version: self
                 .node
                 .npm_package_latest_version("@vtsls/language-server")
                 .await?,
-        }) as Box<_>)
+        })
     }
 
     async fn check_if_user_installed(
@@ -103,11 +100,10 @@ impl LspAdapter for VtslsLspAdapter {
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: TypeScriptVersions,
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<TypeScriptVersions>().unwrap();
         let server_path = container_dir.join(Self::SERVER_PATH);
 
         let mut packages_to_install = Vec::new();
@@ -159,6 +155,13 @@ impl LspAdapter for VtslsLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_ts_server_binary(container_dir, &self.node).await
     }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for VtslsLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        SERVER_NAME
+    }
 
     fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
         Some(vec![
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index 39c30a3714..c629756324 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -2,7 +2,9 @@ use anyhow::{Context as _, Result};
 use async_trait::async_trait;
 use futures::StreamExt;
 use gpui::AsyncApp;
-use language::{LspAdapter, LspAdapterDelegate, Toolchain, language_settings::AllLanguageSettings};
+use language::{
+    LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain, language_settings::AllLanguageSettings,
+};
 use lsp::{LanguageServerBinary, LanguageServerName};
 use node_runtime::{NodeRuntime, VersionStrategy};
 use project::lsp_store::language_server_settings;
@@ -10,7 +12,6 @@ use serde_json::Value;
 use settings::{Settings, SettingsLocation};
 use smol::fs;
 use std::{
-    any::Any,
     ffi::OsString,
     path::{Path, PathBuf},
     sync::Arc,
@@ -35,22 +36,18 @@ impl YamlLspAdapter {
     }
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for YamlLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
+impl LspInstaller for YamlLspAdapter {
+    type BinaryVersion = String;
 
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(
-            self.node
-                .npm_package_latest_version("yaml-language-server")
-                .await?,
-        ) as Box<_>)
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<String> {
+        self.node
+            .npm_package_latest_version("yaml-language-server")
+            .await
     }
 
     async fn check_if_user_installed(
@@ -71,11 +68,10 @@ impl LspAdapter for YamlLspAdapter {
 
     async fn fetch_server_binary(
         &self,
-        latest_version: Box<dyn 'static + Send + Any>,
+        latest_version: String,
         container_dir: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         self.node
@@ -94,11 +90,10 @@ impl LspAdapter for YamlLspAdapter {
 
     async fn check_if_version_installed(
         &self,
-        version: &(dyn 'static + Send + Any),
+        version: &String,
         container_dir: &PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Option<LanguageServerBinary> {
-        let version = version.downcast_ref::<String>().unwrap();
         let server_path = container_dir.join(SERVER_PATH);
 
         let should_install_language_server = self
@@ -129,6 +124,13 @@ impl LspAdapter for YamlLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_server_binary(container_dir, &self.node).await
     }
+}
+
+#[async_trait(?Send)]
+impl LspAdapter for YamlLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        Self::SERVER_NAME
+    }
 
     async fn workspace_configuration(
         self: Arc<Self>,
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 7af51ef6ff..fda188be8b 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -62,7 +62,7 @@ pub enum IoKind {
 
 /// Represents a launchable language server. This can either be a standalone binary or the path
 /// to a runtime with arguments to instruct it to launch the actual language server file.
-#[derive(Clone, Deserialize)]
+#[derive(Clone)]
 pub struct LanguageServerBinary {
     pub path: PathBuf,
     pub arguments: Vec<OsString>,
@@ -70,12 +70,14 @@ pub struct LanguageServerBinary {
 }
 
 /// Configures the search (and installation) of language servers.
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone)]
 pub struct LanguageServerBinaryOptions {
     /// Whether the adapter should look at the users system
     pub allow_path_lookup: bool,
     /// Whether the adapter should download its own version
     pub allow_binary_download: bool,
+    /// Whether the adapter should download a pre-release version
+    pub pre_release: bool,
 }
 
 /// A running language server process.
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
index e719c9e4fb..2040b10bb3 100644
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -59,9 +59,9 @@ use itertools::Itertools as _;
 use language::{
     Bias, BinaryStatus, Buffer, BufferSnapshot, CachedLspAdapter, CodeLabel, Diagnostic,
     DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, Diff, File as _, Language, LanguageName,
-    LanguageRegistry, LocalFile, LspAdapter, LspAdapterDelegate, ManifestDelegate, ManifestName,
-    Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPoint, ToPointUtf16, Toolchain, Transaction,
-    Unclipped,
+    LanguageRegistry, LocalFile, LspAdapter, LspAdapterDelegate, LspInstaller, ManifestDelegate,
+    ManifestName, Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPointUtf16, Toolchain,
+    Transaction, Unclipped,
     language_settings::{
         FormatOnSave, Formatter, LanguageSettings, SelectedFormatter, language_settings,
     },
@@ -96,7 +96,7 @@ use sha2::{Digest, Sha256};
 use smol::channel::Sender;
 use snippet::Snippet;
 use std::{
-    any::{Any, TypeId},
+    any::TypeId,
     borrow::Cow,
     cell::RefCell,
     cmp::{Ordering, Reverse},
@@ -112,7 +112,7 @@ use std::{
     time::{Duration, Instant},
 };
 use sum_tree::Dimensions;
-use text::{Anchor, BufferId, LineEnding, OffsetRangeExt};
+use text::{Anchor, BufferId, LineEnding, OffsetRangeExt, ToPoint as _};
 
 use util::{
     ConnectionResult, ResultExt as _, debug_panic, defer, maybe, merge_json_value_into,
@@ -534,6 +534,11 @@ impl LocalLspStore {
                 .and_then(|b| b.ignore_system_version)
                 .unwrap_or_default(),
             allow_binary_download,
+            pre_release: settings
+                .fetch
+                .as_ref()
+                .and_then(|f| f.pre_release)
+                .unwrap_or(false),
         };
 
         cx.spawn(async move |cx| {
@@ -12579,27 +12584,8 @@ impl SshLspAdapter {
     }
 }
 
-#[async_trait(?Send)]
-impl LspAdapter for SshLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        self.name.clone()
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        let Some(options) = &self.initialization_options else {
-            return Ok(None);
-        };
-        let result = serde_json::from_str(options)?;
-        Ok(result)
-    }
-
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        self.code_action_kinds.clone()
-    }
-
+impl LspInstaller for SshLspAdapter {
+    type BinaryVersion = ();
     async fn check_if_user_installed(
         &self,
         _: &dyn LspAdapterDelegate,
@@ -12620,14 +12606,15 @@ impl LspAdapter for SshLspAdapter {
     async fn fetch_latest_server_version(
         &self,
         _: &dyn LspAdapterDelegate,
-        _: &AsyncApp,
-    ) -> Result<Box<dyn 'static + Send + Any>> {
+        _: bool,
+        _: &mut AsyncApp,
+    ) -> Result<()> {
         anyhow::bail!("SshLspAdapter does not support fetch_latest_server_version")
     }
 
     async fn fetch_server_binary(
         &self,
-        _: Box<dyn 'static + Send + Any>,
+        _: (),
         _: PathBuf,
         _: &dyn LspAdapterDelegate,
     ) -> Result<LanguageServerBinary> {
@@ -12635,6 +12622,28 @@ impl LspAdapter for SshLspAdapter {
     }
 }
 
+#[async_trait(?Send)]
+impl LspAdapter for SshLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        self.name.clone()
+    }
+
+    async fn initialization_options(
+        self: Arc<Self>,
+        _: &Arc<dyn LspAdapterDelegate>,
+    ) -> Result<Option<serde_json::Value>> {
+        let Some(options) = &self.initialization_options else {
+            return Ok(None);
+        };
+        let result = serde_json::from_str(options)?;
+        Ok(result)
+    }
+
+    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
+        self.code_action_kinds.clone()
+    }
+}
+
 pub fn language_server_settings<'a>(
     delegate: &'a dyn LspAdapterDelegate,
     language: &LanguageServerName,

From e68aa18fd4ed3551e960b19963440d906a1cb7de Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 12 Sep 2025 14:02:39 +0200
Subject: [PATCH 811/823] project: Fix task arguments being quoted incorrectly
 for nushell and powershell (#38056)

Release Notes:

- Fixed task arguments being quoted incorrectly for nushell and
powershell

Co-authored-by: Piotr Osiewicz <piotr@zed.dev>
---
 crates/languages/src/python.rs   |  16 ++---
 crates/project/src/terminals.rs  | 116 ++++++++++++++++++-------------
 crates/task/src/shell_builder.rs |   8 +++
 3 files changed, 84 insertions(+), 56 deletions(-)

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
index eaf536d8b2..34dfe4a428 100644
--- a/crates/languages/src/python.rs
+++ b/crates/languages/src/python.rs
@@ -708,7 +708,7 @@ impl ContextProvider for PythonContextProvider {
             // Execute a selection
             TaskTemplate {
                 label: "execute selection".to_owned(),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                 args: vec![
                     "-c".to_owned(),
                     VariableName::SelectedText.template_value_with_whitespace(),
@@ -719,7 +719,7 @@ impl ContextProvider for PythonContextProvider {
             // Execute an entire file
             TaskTemplate {
                 label: format!("run '{}'", VariableName::File.template_value()),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                 args: vec![VariableName::File.template_value_with_whitespace()],
                 cwd: Some(VariableName::WorktreeRoot.template_value()),
                 ..TaskTemplate::default()
@@ -727,10 +727,10 @@ impl ContextProvider for PythonContextProvider {
             // Execute a file as module
             TaskTemplate {
                 label: format!("run module '{}'", VariableName::File.template_value()),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                 args: vec![
                     "-m".to_owned(),
-                    PYTHON_MODULE_NAME_TASK_VARIABLE.template_value_with_whitespace(),
+                    PYTHON_MODULE_NAME_TASK_VARIABLE.template_value(),
                 ],
                 cwd: Some(VariableName::WorktreeRoot.template_value()),
                 tags: vec!["python-module-main-method".to_owned()],
@@ -744,7 +744,7 @@ impl ContextProvider for PythonContextProvider {
                     // Run tests for an entire file
                     TaskTemplate {
                         label: format!("unittest '{}'", VariableName::File.template_value()),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                         args: vec![
                             "-m".to_owned(),
                             "unittest".to_owned(),
@@ -756,7 +756,7 @@ impl ContextProvider for PythonContextProvider {
                     // Run test(s) for a specific target within a file
                     TaskTemplate {
                         label: "unittest $ZED_CUSTOM_PYTHON_TEST_TARGET".to_owned(),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                         args: vec![
                             "-m".to_owned(),
                             "unittest".to_owned(),
@@ -776,7 +776,7 @@ impl ContextProvider for PythonContextProvider {
                     // Run tests for an entire file
                     TaskTemplate {
                         label: format!("pytest '{}'", VariableName::File.template_value()),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                         args: vec![
                             "-m".to_owned(),
                             "pytest".to_owned(),
@@ -788,7 +788,7 @@ impl ContextProvider for PythonContextProvider {
                     // Run test(s) for a specific target within a file
                     TaskTemplate {
                         label: "pytest $ZED_CUSTOM_PYTHON_TEST_TARGET".to_owned(),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value_with_whitespace(),
+                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
                         args: vec![
                             "-m".to_owned(),
                             "pytest".to_owned(),
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 3dffe85420..04f98d6dba 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -135,6 +135,7 @@ impl Project {
         let lang_registry = self.languages.clone();
         let fs = self.fs.clone();
         cx.spawn(async move |project, cx| {
+            let shell_kind = ShellKind::new(&shell);
             let activation_script = maybe!(async {
                 for toolchain in toolchains {
                     let Some(toolchain) = toolchain.await else {
@@ -147,7 +148,7 @@ impl Project {
                     let lister = language?.toolchain_lister();
                     return Some(
                         lister?
-                            .activation_script(&toolchain, ShellKind::new(&shell), fs.as_ref())
+                            .activation_script(&toolchain, shell_kind, fs.as_ref())
                             .await,
                     );
                 }
@@ -157,26 +158,36 @@ impl Project {
             .unwrap_or_default();
 
             project.update(cx, move |this, cx| {
+                let format_to_run = || {
+                    if let Some(command) = &spawn_task.command {
+                        let mut command: Option<Cow<str>> = shlex::try_quote(command).ok();
+                        if let Some(command) = &mut command
+                            && command.starts_with('"')
+                            && let Some(prefix) = shell_kind.command_prefix()
+                        {
+                            *command = Cow::Owned(format!("{prefix}{command}"));
+                        }
+
+                        let args = spawn_task
+                            .args
+                            .iter()
+                            .filter_map(|arg| shlex::try_quote(arg).ok());
+                        command.into_iter().chain(args).join(" ")
+                    } else {
+                        // todo: this breaks for remotes to windows
+                        format!("exec {shell} -l")
+                    }
+                };
+
                 let shell = {
                     env.extend(spawn_task.env);
                     match remote_client {
                         Some(remote_client) => match activation_script.clone() {
                             activation_script if !activation_script.is_empty() => {
                                 let activation_script = activation_script.join("; ");
-                                let to_run = if let Some(command) = spawn_task.command {
-                                    let command: Option<Cow<str>> = shlex::try_quote(&command).ok();
-                                    let args = spawn_task
-                                        .args
-                                        .iter()
-                                        .filter_map(|arg| shlex::try_quote(arg).ok());
-                                    command.into_iter().chain(args).join(" ")
-                                } else {
-                                    format!("exec {shell} -l")
-                                };
-                                let args = vec![
-                                    "-c".to_owned(),
-                                    format!("{activation_script}; {to_run}",),
-                                ];
+                                let to_run = format_to_run();
+                                let args =
+                                    vec!["-c".to_owned(), format!("{activation_script}; {to_run}")];
                                 create_remote_shell(
                                     Some((&shell, &args)),
                                     &mut env,
@@ -197,43 +208,21 @@ impl Project {
                             )?,
                         },
                         None => match activation_script.clone() {
-                            #[cfg(not(windows))]
                             activation_script if !activation_script.is_empty() => {
                                 let activation_script = activation_script.join("; ");
-                                let to_run = if let Some(command) = spawn_task.command {
-                                    let command: Option<Cow<str>> = shlex::try_quote(&command).ok();
-                                    let args = spawn_task
-                                        .args
-                                        .iter()
-                                        .filter_map(|arg| shlex::try_quote(arg).ok());
-                                    command.into_iter().chain(args).join(" ")
-                                } else {
-                                    format!("exec {shell} -l")
-                                };
+                                let to_run = format_to_run();
+
+                                // todo(lw): Alacritty uses `CreateProcessW` on windows with the entire command and arg sequence merged into a single string,
+                                // without quoting the arguments
+                                #[cfg(windows)]
+                                let arg =
+                                    quote_arg(&format!("{activation_script}; {to_run}"), true);
+                                #[cfg(not(windows))]
+                                let arg = format!("{activation_script}; {to_run}");
+
                                 Shell::WithArguments {
                                     program: shell,
-                                    args: vec![
-                                        "-c".to_owned(),
-                                        // alacritty formats all args into a single string literally without extra quoting before handing it off to powershell
-                                        // so we work around this here
-                                        if cfg!(windows) {
-                                            println!(
-                                                "{}",
-                                                shlex::try_quote(&format!(
-                                                    "{activation_script}; {to_run}",
-                                                ))
-                                                .unwrap()
-                                                .into_owned()
-                                            );
-                                            shlex::try_quote(&format!(
-                                                "{activation_script}; {to_run}",
-                                            ))
-                                            .unwrap()
-                                            .into_owned()
-                                        } else {
-                                            format!("{activation_script}; {to_run}",)
-                                        },
-                                    ],
+                                    args: vec!["-c".to_owned(), arg],
                                     title_override: None,
                                 }
                             }
@@ -523,6 +512,37 @@ impl Project {
     }
 }
 
+/// We're not using shlex for windows as it is overly eager with escaping some of the special characters (^) we need for nu. Hence, we took
+/// that quote impl straight from Rust stdlib (Command API).
+#[cfg(windows)]
+fn quote_arg(argument: &str, quote: bool) -> String {
+    let mut arg = String::new();
+    if quote {
+        arg.push('"');
+    }
+
+    let mut backslashes: usize = 0;
+    for x in argument.chars() {
+        if x == '\\' {
+            backslashes += 1;
+        } else {
+            if x == '"' {
+                // Add n+1 backslashes to total 2n+1 before internal '"'.
+                arg.extend((0..=backslashes).map(|_| '\\'));
+            }
+            backslashes = 0;
+        }
+        arg.push(x);
+    }
+
+    if quote {
+        // Add n backslashes to total 2n before ending '"'.
+        arg.extend((0..backslashes).map(|_| '\\'));
+        arg.push('"');
+    }
+    arg
+}
+
 fn create_remote_shell(
     spawn_command: Option<(&String, &Vec<String>)>,
     env: &mut HashMap<String, String>,
diff --git a/crates/task/src/shell_builder.rs b/crates/task/src/shell_builder.rs
index 38a5a970b7..4688ac0eb9 100644
--- a/crates/task/src/shell_builder.rs
+++ b/crates/task/src/shell_builder.rs
@@ -193,6 +193,14 @@ impl ShellKind {
                 .collect(),
         }
     }
+
+    pub fn command_prefix(&self) -> Option<char> {
+        match self {
+            ShellKind::Powershell => Some('&'),
+            ShellKind::Nushell => Some('^'),
+            _ => None,
+        }
+    }
 }
 
 /// ShellBuilder is used to turn a user-requested task into a

From 2a03b6b80c864e5a10fe3a23ef6b98cc287aac38 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 12 Sep 2025 15:13:23 +0200
Subject: [PATCH 812/823] terminal: Fix `test_basic_terminal` test (#38059)

`echo` isn't a program on windows, so we need to spawn a shell that
executes it for the test

Release Notes:

- N/A
---
 Cargo.lock                      |  1 +
 crates/terminal/Cargo.toml      |  1 +
 crates/terminal/src/terminal.rs | 67 ++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 227e4127b6..0667a62f8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16441,6 +16441,7 @@ dependencies = [
  "collections",
  "futures 0.3.31",
  "gpui",
+ "itertools 0.14.0",
  "libc",
  "rand 0.9.1",
  "regex",
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index 6c8c785915..de27b5e117 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -40,6 +40,7 @@ util.workspace = true
 regex.workspace = true
 urlencoding.workspace = true
 workspace-hack.workspace = true
+itertools.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 windows.workspace = true
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index b66c85b097..bec91a787d 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -32,6 +32,7 @@ use futures::{
     channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
 };
 
+use itertools::Itertools as _;
 use mappings::mouse::{
     alt_scroll, grid_point, grid_point_and_side, mouse_button_report, mouse_moved_report,
     scroll_report,
@@ -48,10 +49,7 @@ use terminal_hyperlinks::RegexSearches;
 use terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
 use theme::{ActiveTheme, Theme};
 use urlencoding;
-use util::{
-    paths::{self, home_dir},
-    truncate_and_trailoff,
-};
+use util::truncate_and_trailoff;
 
 use std::{
     borrow::Cow,
@@ -276,7 +274,9 @@ impl Dimensions for TerminalBounds {
 #[derive(Error, Debug)]
 pub struct TerminalError {
     pub directory: Option<PathBuf>,
-    pub shell: Shell,
+    pub program: Option<String>,
+    pub args: Option<Vec<String>>,
+    pub title_override: Option<SharedString>,
     pub source: std::io::Error,
 }
 
@@ -294,29 +294,23 @@ impl TerminalError {
                     Err(s) => s,
                 }
             })
-            .unwrap_or_else(|| {
-                format!(
-                    "<none specified, using home directory> {}",
-                    paths::home_dir().to_string_lossy()
-                )
-            })
+            .unwrap_or_else(|| "<none specified>".to_string())
     }
 
     pub fn fmt_shell(&self) -> String {
-        match &self.shell {
-            Shell::System => "<system defined shell>".to_string(),
-            Shell::Program(s) => s.to_string(),
-            Shell::WithArguments {
-                program,
-                args,
-                title_override,
-            } => {
-                if let Some(title_override) = title_override {
-                    format!("{} {} ({})", program, args.join(" "), title_override)
-                } else {
-                    format!("{} {}", program, args.join(" "))
-                }
-            }
+        if let Some(title_override) = &self.title_override {
+            format!(
+                "{} {} ({})",
+                self.program.as_deref().unwrap_or("<system defined shell>"),
+                self.args.as_ref().into_iter().flatten().format(" "),
+                title_override
+            )
+        } else {
+            format!(
+                "{} {}",
+                self.program.as_deref().unwrap_or("<system defined shell>"),
+                self.args.as_ref().into_iter().flatten().format(" ")
+            )
         }
     }
 }
@@ -420,15 +414,16 @@ impl TerminalBuilder {
         });
 
         let pty_options = {
-            let alac_shell = shell_params.map(|params| {
-                alacritty_terminal::tty::Shell::new(params.program, params.args.unwrap_or_default())
+            let alac_shell = shell_params.as_ref().map(|params| {
+                alacritty_terminal::tty::Shell::new(
+                    params.program.clone(),
+                    params.args.clone().unwrap_or_default(),
+                )
             });
 
             alacritty_terminal::tty::Options {
                 shell: alac_shell,
-                working_directory: working_directory
-                    .clone()
-                    .or_else(|| Some(home_dir().to_path_buf())),
+                working_directory: working_directory.clone(),
                 drain_on_exit: true,
                 env: env.clone().into_iter().collect(),
             }
@@ -474,7 +469,9 @@ impl TerminalBuilder {
             Err(error) => {
                 bail!(TerminalError {
                     directory: working_directory,
-                    shell,
+                    program: shell_params.as_ref().map(|params| params.program.clone()),
+                    args: shell_params.as_ref().and_then(|params| params.args.clone()),
+                    title_override: terminal_title_override,
                     source: error,
                 });
             }
@@ -2205,20 +2202,22 @@ mod tests {
     use collections::HashMap;
     use gpui::{Pixels, Point, TestAppContext, bounds, point, size};
     use rand::{Rng, distr, rngs::ThreadRng};
+    use task::ShellBuilder;
 
-    #[ignore = "Test is flaky on macOS, and doesn't run on Windows"]
     #[gpui::test]
     async fn test_basic_terminal(cx: &mut TestAppContext) {
         cx.executor().allow_parking();
 
         let (completion_tx, completion_rx) = smol::channel::unbounded();
+        let (program, args) = ShellBuilder::new(None, &Shell::System)
+            .build(Some("echo".to_owned()), &["hello".to_owned()]);
         let terminal = cx.new(|cx| {
             TerminalBuilder::new(
                 None,
                 None,
                 task::Shell::WithArguments {
-                    program: "echo".into(),
-                    args: vec!["hello".into()],
+                    program,
+                    args,
                     title_override: None,
                 },
                 HashMap::default(),

From 687c2c88c7ee404598e23363f0e638e17faf0a1a Mon Sep 17 00:00:00 2001
From: David Kleingeld <davidsk@zed.dev>
Date: Fri, 12 Sep 2025 15:56:48 +0200
Subject: [PATCH 813/823] Fix experimental audio volume being significantly too
 low (#38062)

The rodio channelcount convertor halves the volume. This addresses that
in most cases by using the default channelcount for the system
microphone which is usually 2.

A proper fix will follow later as part of the de-noising PR

Release Notes:

- N/A
---
 crates/audio/src/audio.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index 44f2d5e07d..ab8d85cdaa 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -161,7 +161,7 @@ impl Audio {
             .default_device()?
             .default_config()?
             .prefer_sample_rates([SAMPLE_RATE, SAMPLE_RATE.saturating_mul(nz!(2))])
-            .prefer_channel_counts([nz!(1), nz!(2)])
+            // .prefer_channel_counts([nz!(1), nz!(2)])
             .prefer_buffer_sizes(512..)
             .open_stream()?;
         info!("Opened microphone: {:?}", stream.config());

From a577128163f06643a2a16f8527993b0c52760682 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Fri, 12 Sep 2025 12:22:51 -0300
Subject: [PATCH 814/823] Update acp to 0.2.1 (#38068)

Release Notes:

- N/A
---
 Cargo.lock                                    |  4 +-
 Cargo.toml                                    |  2 +-
 crates/acp_thread/src/acp_thread.rs           | 33 +++++++-
 crates/acp_thread/src/connection.rs           |  7 +-
 crates/acp_thread/src/terminal.rs             |  4 +
 crates/agent2/src/agent.rs                    |  9 ++-
 crates/agent2/src/tests/mod.rs                |  7 ++
 crates/agent2/src/thread.rs                   | 12 +++
 crates/agent2/src/tools/edit_file_tool.rs     |  3 +-
 crates/agent2/src/tools/find_path_tool.rs     |  1 +
 crates/agent2/src/tools/read_file_tool.rs     |  1 +
 crates/agent2/src/tools/web_search_tool.rs    |  1 +
 crates/agent_servers/src/acp.rs               | 76 ++++++++++++++-----
 crates/agent_servers/src/e2e_tests.rs         |  3 +
 .../agent_ui/src/acp/completion_provider.rs   | 14 ++--
 crates/agent_ui/src/acp/entry_view_state.rs   | 12 ++-
 crates/agent_ui/src/acp/message_editor.rs     | 41 +++++-----
 crates/agent_ui/src/acp/thread_view.rs        | 25 ++++--
 18 files changed, 191 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0667a62f8e..b408833661 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "agent-client-protocol"
-version = "0.2.0-alpha.8"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08539e8d6b2ccca6cd00afdd42211698f7677adef09108a09414c11f1f45fdaf"
+checksum = "003fb91bf1b8d6e15f72c45fb9171839af8241e81e3839fbb73536af113b7a79"
 dependencies = [
  "anyhow",
  "async-broadcast",
diff --git a/Cargo.toml b/Cargo.toml
index c8983efc77..042bd8cf42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -434,7 +434,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
 
-agent-client-protocol = { version = "0.2.0-alpha.8", features = ["unstable"] }
+agent-client-protocol = { version = "0.2.1", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index c7279abdc6..afbb4781f6 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -862,7 +862,7 @@ impl AcpThread {
         mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
         cx: &mut Context<Self>,
     ) -> Self {
-        let prompt_capabilities = *prompt_capabilities_rx.borrow();
+        let prompt_capabilities = prompt_capabilities_rx.borrow().clone();
         let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
             loop {
                 let caps = prompt_capabilities_rx.recv().await?;
@@ -906,7 +906,7 @@ impl AcpThread {
     }
 
     pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        self.prompt_capabilities
+        self.prompt_capabilities.clone()
     }
 
     pub fn connection(&self) -> &Rc<dyn AgentConnection> {
@@ -1446,6 +1446,7 @@ impl AcpThread {
             vec![acp::ContentBlock::Text(acp::TextContent {
                 text: message.to_string(),
                 annotations: None,
+                meta: None,
             })],
             cx,
         )
@@ -1464,6 +1465,7 @@ impl AcpThread {
         let request = acp::PromptRequest {
             prompt: message.clone(),
             session_id: self.session_id.clone(),
+            meta: None,
         };
         let git_store = self.project.read(cx).git_store().clone();
 
@@ -1555,7 +1557,8 @@ impl AcpThread {
                         let canceled = matches!(
                             result,
                             Ok(Ok(acp::PromptResponse {
-                                stop_reason: acp::StopReason::Cancelled
+                                stop_reason: acp::StopReason::Cancelled,
+                                meta: None,
                             }))
                         );
 
@@ -1571,6 +1574,7 @@ impl AcpThread {
                         // Handle refusal - distinguish between user prompt and tool call refusals
                         if let Ok(Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::Refusal,
+                            meta: _,
                         })) = result
                         {
                             if let Some((user_msg_ix, _)) = this.last_user_message() {
@@ -2163,6 +2167,7 @@ mod tests {
                 acp::ContentBlock::Text(acp::TextContent {
                     annotations: None,
                     text: "Hello, ".to_string(),
+                    meta: None,
                 }),
                 cx,
             );
@@ -2186,6 +2191,7 @@ mod tests {
                 acp::ContentBlock::Text(acp::TextContent {
                     annotations: None,
                     text: "world!".to_string(),
+                    meta: None,
                 }),
                 cx,
             );
@@ -2207,6 +2213,7 @@ mod tests {
                 acp::ContentBlock::Text(acp::TextContent {
                     annotations: None,
                     text: "Assistant response".to_string(),
+                    meta: None,
                 }),
                 false,
                 cx,
@@ -2220,6 +2227,7 @@ mod tests {
                 acp::ContentBlock::Text(acp::TextContent {
                     annotations: None,
                     text: "New user message".to_string(),
+                    meta: None,
                 }),
                 cx,
             );
@@ -2265,6 +2273,7 @@ mod tests {
                     })?;
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 }
                 .boxed_local()
@@ -2335,6 +2344,7 @@ mod tests {
                         .unwrap();
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 }
                 .boxed_local()
@@ -2403,6 +2413,7 @@ mod tests {
                                     locations: vec![],
                                     raw_input: None,
                                     raw_output: None,
+                                    meta: None,
                                 }),
                                 cx,
                             )
@@ -2411,6 +2422,7 @@ mod tests {
                         .unwrap();
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 }
                 .boxed_local()
@@ -2459,6 +2471,7 @@ mod tests {
                             status: Some(acp::ToolCallStatus::Completed),
                             ..Default::default()
                         },
+                        meta: None,
                     }),
                     cx,
                 )
@@ -2501,11 +2514,13 @@ mod tests {
                                             path: "/test/test.txt".into(),
                                             old_text: None,
                                             new_text: "foo".into(),
+                                            meta: None,
                                         },
                                     }],
                                     locations: vec![],
                                     raw_input: None,
                                     raw_output: None,
+                                    meta: None,
                                 }),
                                 cx,
                             )
@@ -2514,6 +2529,7 @@ mod tests {
                         .unwrap();
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 }
                 .boxed_local()
@@ -2576,6 +2592,7 @@ mod tests {
                     })?;
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 }
                 .boxed_local()
@@ -2743,6 +2760,7 @@ mod tests {
                                         raw_output: Some(
                                             serde_json::json!({"result": "inappropriate content"}),
                                         ),
+                                        meta: None,
                                     }),
                                     cx,
                                 )
@@ -2752,10 +2770,12 @@ mod tests {
                         // Now return refusal because of the tool result
                         Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::Refusal,
+                            meta: None,
                         })
                     } else {
                         Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::EndTurn,
+                            meta: None,
                         })
                     }
                 }
@@ -2789,6 +2809,7 @@ mod tests {
                 vec![acp::ContentBlock::Text(acp::TextContent {
                     text: "Hello".into(),
                     annotations: None,
+                    meta: None,
                 })],
                 cx,
             )
@@ -2841,6 +2862,7 @@ mod tests {
                     async move {
                         Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::Refusal,
+                            meta: None,
                         })
                     }
                     .boxed_local()
@@ -2848,6 +2870,7 @@ mod tests {
                     async move {
                         Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::EndTurn,
+                            meta: None,
                         })
                     }
                     .boxed_local()
@@ -2909,6 +2932,7 @@ mod tests {
                     if refuse_next.load(SeqCst) {
                         return Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::Refusal,
+                            meta: None,
                         });
                     }
 
@@ -2927,6 +2951,7 @@ mod tests {
                     })?;
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 }
                 .boxed_local()
@@ -3082,6 +3107,7 @@ mod tests {
                         image: true,
                         audio: true,
                         embedded_context: true,
+                        meta: None,
                     }),
                     cx,
                 )
@@ -3113,6 +3139,7 @@ mod tests {
             } else {
                 Task::ready(Ok(acp::PromptResponse {
                     stop_reason: acp::StopReason::EndTurn,
+                    meta: None,
                 }))
             }
         }
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index dfb1e3763d..10c9dd22b6 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -354,6 +354,7 @@ mod test_support {
                         image: true,
                         audio: true,
                         embedded_context: true,
+                        meta: None,
                     }),
                     cx,
                 )
@@ -393,7 +394,10 @@ mod test_support {
                 response_tx.replace(tx);
                 cx.spawn(async move |_| {
                     let stop_reason = rx.await?;
-                    Ok(acp::PromptResponse { stop_reason })
+                    Ok(acp::PromptResponse {
+                        stop_reason,
+                        meta: None,
+                    })
                 })
             } else {
                 for update in self.next_prompt_updates.lock().drain(..) {
@@ -432,6 +436,7 @@ mod test_support {
                     try_join_all(tasks).await?;
                     Ok(acp::PromptResponse {
                         stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
                     })
                 })
             }
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 6b4cdb7346..a927083b0b 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -75,6 +75,7 @@ impl Terminal {
                     acp::TerminalExitStatus {
                         exit_code: exit_status.as_ref().map(|e| e.exit_code()),
                         signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                        meta: None,
                     }
                 })
                 .shared(),
@@ -105,7 +106,9 @@ impl Terminal {
                 exit_status: Some(acp::TerminalExitStatus {
                     exit_code: exit_status.as_ref().map(|e| e.exit_code()),
                     signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                    meta: None,
                 }),
+                meta: None,
             }
         } else {
             let (current_content, original_len) = self.truncated_output(cx);
@@ -114,6 +117,7 @@ impl Terminal {
                 truncated: current_content.len() < original_len,
                 output: current_content,
                 exit_status: None,
+                meta: None,
             }
         }
     }
diff --git a/crates/agent2/src/agent.rs b/crates/agent2/src/agent.rs
index 6e0df0cffd..d722162087 100644
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -747,6 +747,7 @@ impl NativeAgentConnection {
                                         acp::ContentBlock::Text(acp::TextContent {
                                             text,
                                             annotations: None,
+                                            meta: None,
                                         }),
                                         false,
                                         cx,
@@ -759,6 +760,7 @@ impl NativeAgentConnection {
                                         acp::ContentBlock::Text(acp::TextContent {
                                             text,
                                             annotations: None,
+                                            meta: None,
                                         }),
                                         true,
                                         cx,
@@ -804,7 +806,10 @@ impl NativeAgentConnection {
                             }
                             ThreadEvent::Stop(stop_reason) => {
                                 log::debug!("Assistant message complete: {:?}", stop_reason);
-                                return Ok(acp::PromptResponse { stop_reason });
+                                return Ok(acp::PromptResponse {
+                                    stop_reason,
+                                    meta: None,
+                                });
                             }
                         }
                     }
@@ -818,6 +823,7 @@ impl NativeAgentConnection {
             log::debug!("Response stream completed");
             anyhow::Ok(acp::PromptResponse {
                 stop_reason: acp::StopReason::EndTurn,
+                meta: None,
             })
         })
     }
@@ -1441,6 +1447,7 @@ mod tests {
                         mime_type: None,
                         size: None,
                         title: None,
+                        meta: None,
                     }),
                     " mean?".into(),
                 ],
diff --git a/crates/agent2/src/tests/mod.rs b/crates/agent2/src/tests/mod.rs
index 884580ed69..c0f693afe6 100644
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@@ -1299,6 +1299,7 @@ async fn test_cancellation(cx: &mut TestAppContext) {
                             status: Some(acp::ToolCallStatus::Completed),
                             ..
                         },
+                    meta: None,
                 },
             )) if Some(&id) == echo_id.as_ref() => {
                 echo_completed = true;
@@ -1926,6 +1927,7 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
                 acp::PromptRequest {
                     session_id: session_id.clone(),
                     prompt: vec!["ghi".into()],
+                    meta: None,
                 },
                 cx,
             )
@@ -1990,6 +1992,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
             locations: vec![],
             raw_input: Some(json!({})),
             raw_output: None,
+            meta: None,
         }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
@@ -2003,6 +2006,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
                 raw_input: Some(json!({ "content": "Thinking hard!" })),
                 ..Default::default()
             },
+            meta: None,
         }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
@@ -2014,6 +2018,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
                 status: Some(acp::ToolCallStatus::InProgress),
                 ..Default::default()
             },
+            meta: None,
         }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
@@ -2025,6 +2030,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
                 content: Some(vec!["Thinking hard!".into()]),
                 ..Default::default()
             },
+            meta: None,
         }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
@@ -2037,6 +2043,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
                 raw_output: Some("Finished thinking.".into()),
                 ..Default::default()
             },
+            meta: None,
         }
     );
 }
diff --git a/crates/agent2/src/thread.rs b/crates/agent2/src/thread.rs
index 20c4cd0753..b19d34adaf 100644
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@@ -614,6 +614,7 @@ impl Thread {
     fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
         let image = model.map_or(true, |model| model.supports_images());
         acp::PromptCapabilities {
+            meta: None,
             image,
             audio: false,
             embedded_context: true,
@@ -728,6 +729,7 @@ impl Thread {
             stream
                 .0
                 .unbounded_send(Ok(ThreadEvent::ToolCall(acp::ToolCall {
+                    meta: None,
                     id: acp::ToolCallId(tool_use.id.to_string().into()),
                     title: tool_use.name.to_string(),
                     kind: acp::ToolKind::Other,
@@ -2333,6 +2335,7 @@ impl ThreadEventStream {
         input: serde_json::Value,
     ) -> acp::ToolCall {
         acp::ToolCall {
+            meta: None,
             id: acp::ToolCallId(id.to_string().into()),
             title,
             kind,
@@ -2352,6 +2355,7 @@ impl ThreadEventStream {
         self.0
             .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                 acp::ToolCallUpdate {
+                    meta: None,
                     id: acp::ToolCallId(tool_use_id.to_string().into()),
                     fields,
                 }
@@ -2437,6 +2441,7 @@ impl ToolCallEventStream {
             .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                 ToolCallAuthorization {
                     tool_call: acp::ToolCallUpdate {
+                        meta: None,
                         id: acp::ToolCallId(self.tool_use_id.to_string().into()),
                         fields: acp::ToolCallUpdateFields {
                             title: Some(title.into()),
@@ -2448,16 +2453,19 @@ impl ToolCallEventStream {
                             id: acp::PermissionOptionId("always_allow".into()),
                             name: "Always Allow".into(),
                             kind: acp::PermissionOptionKind::AllowAlways,
+                            meta: None,
                         },
                         acp::PermissionOption {
                             id: acp::PermissionOptionId("allow".into()),
                             name: "Allow".into(),
                             kind: acp::PermissionOptionKind::AllowOnce,
+                            meta: None,
                         },
                         acp::PermissionOption {
                             id: acp::PermissionOptionId("deny".into()),
                             name: "Deny".into(),
                             kind: acp::PermissionOptionKind::RejectOnce,
+                            meta: None,
                         },
                     ],
                     response: response_tx,
@@ -2611,17 +2619,21 @@ impl From<UserMessageContent> for acp::ContentBlock {
             UserMessageContent::Text(text) => acp::ContentBlock::Text(acp::TextContent {
                 text,
                 annotations: None,
+                meta: None,
             }),
             UserMessageContent::Image(image) => acp::ContentBlock::Image(acp::ImageContent {
                 data: image.source.to_string(),
                 mime_type: "image/png".to_string(),
+                meta: None,
                 annotations: None,
                 uri: None,
             }),
             UserMessageContent::Mention { uri, content } => {
                 acp::ContentBlock::Resource(acp::EmbeddedResource {
+                    meta: None,
                     resource: acp::EmbeddedResourceResource::TextResourceContents(
                         acp::TextResourceContents {
+                            meta: None,
                             mime_type: None,
                             text: content,
                             uri: uri.to_uri().to_string(),
diff --git a/crates/agent2/src/tools/edit_file_tool.rs b/crates/agent2/src/tools/edit_file_tool.rs
index 9237961bce..1e725b8f59 100644
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -274,6 +274,7 @@ impl AgentTool for EditFileTool {
                 locations: Some(vec![acp::ToolCallLocation {
                     path: abs_path,
                     line: None,
+                    meta: None,
                 }]),
                 ..Default::default()
             });
@@ -353,7 +354,7 @@ impl AgentTool for EditFileTool {
                             }).ok();
                             if let Some(abs_path) = abs_path.clone() {
                                 event_stream.update_fields(ToolCallUpdateFields {
-                                    locations: Some(vec![ToolCallLocation { path: abs_path, line }]),
+                                    locations: Some(vec![ToolCallLocation { path: abs_path, line, meta: None }]),
                                     ..Default::default()
                                 });
                             }
diff --git a/crates/agent2/src/tools/find_path_tool.rs b/crates/agent2/src/tools/find_path_tool.rs
index 735ec67cff..b8b60f79f4 100644
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@@ -138,6 +138,7 @@ impl AgentTool for FindPathTool {
                                 mime_type: None,
                                 size: None,
                                 title: None,
+                                meta: None,
                             }),
                         })
                         .collect(),
diff --git a/crates/agent2/src/tools/read_file_tool.rs b/crates/agent2/src/tools/read_file_tool.rs
index 09f2ff3ca9..87163e769c 100644
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@@ -149,6 +149,7 @@ impl AgentTool for ReadFileTool {
             locations: Some(vec![acp::ToolCallLocation {
                 path: abs_path.clone(),
                 line: input.start_line.map(|line| line.saturating_sub(1)),
+                meta: None,
             }]),
             ..Default::default()
         });
diff --git a/crates/agent2/src/tools/web_search_tool.rs b/crates/agent2/src/tools/web_search_tool.rs
index ce26bccdde..b65c89167d 100644
--- a/crates/agent2/src/tools/web_search_tool.rs
+++ b/crates/agent2/src/tools/web_search_tool.rs
@@ -122,6 +122,7 @@ fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream)
                         mime_type: None,
                         annotations: None,
                         size: None,
+                        meta: None,
                     }),
                 })
                 .collect(),
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 97bc172a41..cc897d85e7 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -13,7 +13,7 @@ use util::ResultExt as _;
 
 use std::path::PathBuf;
 use std::{any::Any, cell::RefCell};
-use std::{path::Path, rc::Rc};
+use std::{path::Path, rc::Rc, sync::Arc};
 use thiserror::Error;
 
 use anyhow::{Context as _, Result};
@@ -156,9 +156,12 @@ impl AcpConnection {
                     fs: acp::FileSystemCapability {
                         read_text_file: true,
                         write_text_file: true,
+                        meta: None,
                     },
                     terminal: true,
+                    meta: None,
                 },
+                meta: None,
             })
             .await?;
 
@@ -226,6 +229,7 @@ impl AgentConnection for AcpConnection {
                                 .map(|(name, value)| acp::EnvVariable {
                                     name: name.clone(),
                                     value: value.clone(),
+                                    meta: None,
                                 })
                                 .collect()
                         } else {
@@ -243,7 +247,7 @@ impl AgentConnection for AcpConnection {
 
         cx.spawn(async move |cx| {
             let response = conn
-                .new_session(acp::NewSessionRequest { mcp_servers, cwd })
+                .new_session(acp::NewSessionRequest { mcp_servers, cwd, meta: None })
                 .await
                 .map_err(|err| {
                     if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
@@ -277,6 +281,7 @@ impl AgentConnection for AcpConnection {
                                 let result = conn.set_session_mode(acp::SetSessionModeRequest {
                                     session_id,
                                     mode_id: default_mode,
+                                    meta: None,
                                 })
                                 .await.log_err();
 
@@ -316,7 +321,7 @@ impl AgentConnection for AcpConnection {
                     action_log,
                     session_id.clone(),
                     // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
-                    watch::Receiver::constant(self.agent_capabilities.prompt_capabilities),
+                    watch::Receiver::constant(self.agent_capabilities.prompt_capabilities.clone()),
                     cx,
                 )
             })?;
@@ -339,13 +344,13 @@ impl AgentConnection for AcpConnection {
     fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
         let conn = self.connection.clone();
         cx.foreground_executor().spawn(async move {
-            let result = conn
-                .authenticate(acp::AuthenticateRequest {
-                    method_id: method_id.clone(),
-                })
-                .await?;
+            conn.authenticate(acp::AuthenticateRequest {
+                method_id: method_id.clone(),
+                meta: None,
+            })
+            .await?;
 
-            Ok(result)
+            Ok(())
         })
     }
 
@@ -396,6 +401,7 @@ impl AgentConnection for AcpConnection {
                             {
                                 Ok(acp::PromptResponse {
                                     stop_reason: acp::StopReason::Cancelled,
+                                    meta: None,
                                 })
                             } else {
                                 Err(anyhow!(details))
@@ -415,6 +421,7 @@ impl AgentConnection for AcpConnection {
         let conn = self.connection.clone();
         let params = acp::CancelNotification {
             session_id: session_id.clone(),
+            meta: None,
         };
         cx.foreground_executor()
             .spawn(async move { conn.cancel(params).await })
@@ -478,6 +485,7 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
                 .set_session_mode(acp::SetSessionModeRequest {
                     session_id,
                     mode_id,
+                    meta: None,
                 })
                 .await;
 
@@ -526,13 +534,16 @@ impl acp::Client for ClientDelegate {
 
         let outcome = task.await;
 
-        Ok(acp::RequestPermissionResponse { outcome })
+        Ok(acp::RequestPermissionResponse {
+            outcome,
+            meta: None,
+        })
     }
 
     async fn write_text_file(
         &self,
         arguments: acp::WriteTextFileRequest,
-    ) -> Result<(), acp::Error> {
+    ) -> Result<acp::WriteTextFileResponse, acp::Error> {
         let cx = &mut self.cx.clone();
         let task = self
             .session_thread(&arguments.session_id)?
@@ -542,7 +553,7 @@ impl acp::Client for ClientDelegate {
 
         task.await?;
 
-        Ok(())
+        Ok(Default::default())
     }
 
     async fn read_text_file(
@@ -558,7 +569,10 @@ impl acp::Client for ClientDelegate {
 
         let content = task.await?;
 
-        Ok(acp::ReadTextFileResponse { content })
+        Ok(acp::ReadTextFileResponse {
+            content,
+            meta: None,
+        })
     }
 
     async fn session_notification(
@@ -607,26 +621,49 @@ impl acp::Client for ClientDelegate {
         Ok(
             terminal.read_with(&self.cx, |terminal, _| acp::CreateTerminalResponse {
                 terminal_id: terminal.id().clone(),
+                meta: None,
             })?,
         )
     }
 
-    async fn kill_terminal(&self, args: acp::KillTerminalRequest) -> Result<(), acp::Error> {
+    async fn kill_terminal_command(
+        &self,
+        args: acp::KillTerminalCommandRequest,
+    ) -> Result<acp::KillTerminalCommandResponse, acp::Error> {
         self.session_thread(&args.session_id)?
             .update(&mut self.cx.clone(), |thread, cx| {
                 thread.kill_terminal(args.terminal_id, cx)
             })??;
 
-        Ok(())
+        Ok(Default::default())
     }
 
-    async fn release_terminal(&self, args: acp::ReleaseTerminalRequest) -> Result<(), acp::Error> {
+    async fn ext_method(
+        &self,
+        _name: Arc<str>,
+        _params: Arc<serde_json::value::RawValue>,
+    ) -> Result<Arc<serde_json::value::RawValue>, acp::Error> {
+        Err(acp::Error::method_not_found())
+    }
+
+    async fn ext_notification(
+        &self,
+        _name: Arc<str>,
+        _params: Arc<serde_json::value::RawValue>,
+    ) -> Result<(), acp::Error> {
+        Err(acp::Error::method_not_found())
+    }
+
+    async fn release_terminal(
+        &self,
+        args: acp::ReleaseTerminalRequest,
+    ) -> Result<acp::ReleaseTerminalResponse, acp::Error> {
         self.session_thread(&args.session_id)?
             .update(&mut self.cx.clone(), |thread, cx| {
                 thread.release_terminal(args.terminal_id, cx)
             })??;
 
-        Ok(())
+        Ok(Default::default())
     }
 
     async fn terminal_output(
@@ -655,7 +692,10 @@ impl acp::Client for ClientDelegate {
             })??
             .await;
 
-        Ok(acp::WaitForTerminalExitResponse { exit_status })
+        Ok(acp::WaitForTerminalExitResponse {
+            exit_status,
+            meta: None,
+        })
     }
 }
 
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index a4af1b6ad5..1ee2e099f0 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -83,6 +83,7 @@ where
                     acp::ContentBlock::Text(acp::TextContent {
                         text: "Read the file ".into(),
                         annotations: None,
+                        meta: None,
                     }),
                     acp::ContentBlock::ResourceLink(acp::ResourceLink {
                         uri: "foo.rs".into(),
@@ -92,10 +93,12 @@ where
                         mime_type: None,
                         size: None,
                         title: None,
+                        meta: None,
                     }),
                     acp::ContentBlock::Text(acp::TextContent {
                         text: " and tell me what the content of the println! is".into(),
                         annotations: None,
+                        meta: None,
                     }),
                 ],
                 cx,
diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 5ef2e222d0..8c14bd1642 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,4 +1,4 @@
-use std::cell::{Cell, RefCell};
+use std::cell::RefCell;
 use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -68,7 +68,7 @@ pub struct ContextPickerCompletionProvider {
     workspace: WeakEntity<Workspace>,
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
-    prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
 }
 
@@ -78,7 +78,7 @@ impl ContextPickerCompletionProvider {
         workspace: WeakEntity<Workspace>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
         available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     ) -> Self {
         Self {
@@ -600,7 +600,7 @@ impl ContextPickerCompletionProvider {
                 }),
         );
 
-        if self.prompt_capabilities.get().embedded_context {
+        if self.prompt_capabilities.borrow().embedded_context {
             const RECENT_COUNT: usize = 2;
             let threads = self
                 .history_store
@@ -622,7 +622,7 @@ impl ContextPickerCompletionProvider {
         workspace: &Entity<Workspace>,
         cx: &mut App,
     ) -> Vec<ContextPickerEntry> {
-        let embedded_context = self.prompt_capabilities.get().embedded_context;
+        let embedded_context = self.prompt_capabilities.borrow().embedded_context;
         let mut entries = if embedded_context {
             vec![
                 ContextPickerEntry::Mode(ContextPickerMode::File),
@@ -694,7 +694,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             ContextCompletion::try_parse(
                 line,
                 offset_to_line,
-                self.prompt_capabilities.get().embedded_context,
+                self.prompt_capabilities.borrow().embedded_context,
             )
         });
         let Some(state) = state else {
@@ -896,7 +896,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             ContextCompletion::try_parse(
                 line,
                 offset_to_line,
-                self.prompt_capabilities.get().embedded_context,
+                self.prompt_capabilities.borrow().embedded_context,
             )
             .map(|completion| {
                 completion.source_range().start <= offset_to_line + position.column as usize
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index ec57ea7e6d..0d4dfb0c20 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -1,8 +1,4 @@
-use std::{
-    cell::{Cell, RefCell},
-    ops::Range,
-    rc::Rc,
-};
+use std::{cell::RefCell, ops::Range, rc::Rc};
 
 use acp_thread::{AcpThread, AgentThreadEntry};
 use agent_client_protocol::{self as acp, ToolCallId};
@@ -30,7 +26,7 @@ pub struct EntryViewState {
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
     entries: Vec<Entry>,
-    prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     agent_name: SharedString,
 }
@@ -41,7 +37,7 @@ impl EntryViewState {
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
         available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
         agent_name: SharedString,
     ) -> Self {
@@ -448,11 +444,13 @@ mod tests {
                     path: "/project/hello.txt".into(),
                     old_text: Some("hi world".into()),
                     new_text: "hello world".into(),
+                    meta: None,
                 },
             }],
             locations: vec![],
             raw_input: None,
             raw_output: None,
+            meta: None,
         };
         let connection = Rc::new(StubAgentConnection::new());
         let thread = cx
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 2c14e284d7..ab4e8d6809 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -36,7 +36,7 @@ use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::Settings;
 use std::{
-    cell::{Cell, RefCell},
+    cell::RefCell,
     ffi::OsStr,
     fmt::Write,
     ops::{Range, RangeInclusive},
@@ -64,7 +64,7 @@ pub struct MessageEditor {
     workspace: WeakEntity<Workspace>,
     history_store: Entity<HistoryStore>,
     prompt_store: Option<Entity<PromptStore>>,
-    prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     agent_name: SharedString,
     _subscriptions: Vec<Subscription>,
@@ -89,7 +89,7 @@ impl MessageEditor {
         project: Entity<Project>,
         history_store: Entity<HistoryStore>,
         prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<Cell<acp::PromptCapabilities>>,
+        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
         available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
         agent_name: SharedString,
         placeholder: &str,
@@ -428,7 +428,7 @@ impl MessageEditor {
             .unwrap_or_default();
 
         if Img::extensions().contains(&extension) && !extension.contains("svg") {
-            if !self.prompt_capabilities.get().image {
+            if !self.prompt_capabilities.borrow().image {
                 return Task::ready(Err(anyhow!("This model does not support images yet")));
             }
             let task = self
@@ -789,7 +789,7 @@ impl MessageEditor {
 
         let contents = self
             .mention_set
-            .contents(&self.prompt_capabilities.get(), cx);
+            .contents(&self.prompt_capabilities.borrow(), cx);
         let editor = self.editor.clone();
 
         cx.spawn(async move |_, cx| {
@@ -834,8 +834,10 @@ impl MessageEditor {
                                             mime_type: None,
                                             text: content.clone(),
                                             uri: uri.to_uri().to_string(),
+                                            meta: None,
                                         },
                                     ),
+                                    meta: None,
                                 })
                             }
                             Mention::Image(mention_image) => {
@@ -855,6 +857,7 @@ impl MessageEditor {
                                     data: mention_image.data.to_string(),
                                     mime_type: mention_image.format.mime_type().into(),
                                     uri,
+                                    meta: None,
                                 })
                             }
                             Mention::UriOnly => {
@@ -866,6 +869,7 @@ impl MessageEditor {
                                     mime_type: None,
                                     size: None,
                                     title: None,
+                                    meta: None,
                                 })
                             }
                         };
@@ -920,7 +924,7 @@ impl MessageEditor {
     }
 
     fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.prompt_capabilities.get().image {
+        if !self.prompt_capabilities.borrow().image {
             return;
         }
 
@@ -1188,6 +1192,7 @@ impl MessageEditor {
                     data,
                     mime_type,
                     annotations: _,
+                    meta: _,
                 }) => {
                     let mention_uri = if let Some(uri) = uri {
                         MentionUri::parse(&uri)
@@ -1571,13 +1576,7 @@ impl Addon for MessageEditorAddon {
 
 #[cfg(test)]
 mod tests {
-    use std::{
-        cell::{Cell, RefCell},
-        ops::Range,
-        path::Path,
-        rc::Rc,
-        sync::Arc,
-    };
+    use std::{cell::RefCell, ops::Range, path::Path, rc::Rc, sync::Arc};
 
     use acp_thread::MentionUri;
     use agent_client_protocol as acp;
@@ -1724,7 +1723,7 @@ mod tests {
         let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
         let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
         let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
-        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
+        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
         // Start with no available commands - simulating Claude which doesn't support slash commands
         let available_commands = Rc::new(RefCell::new(vec![]));
 
@@ -1773,6 +1772,7 @@ mod tests {
             name: "help".to_string(),
             description: "Get help".to_string(),
             input: None,
+            meta: None,
         }]);
 
         // Test that unsupported slash commands trigger an error when we have a list of available commands
@@ -1887,12 +1887,13 @@ mod tests {
 
         let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
         let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
-        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
+        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
         let available_commands = Rc::new(RefCell::new(vec![
             acp::AvailableCommand {
                 name: "quick-math".to_string(),
                 description: "2 + 2 = 4 - 1 = 3".to_string(),
                 input: None,
+                meta: None,
             },
             acp::AvailableCommand {
                 name: "say-hello".to_string(),
@@ -1900,6 +1901,7 @@ mod tests {
                 input: Some(acp::AvailableCommandInput::Unstructured {
                     hint: "<name>".to_string(),
                 }),
+                meta: None,
             },
         ]));
 
@@ -2134,7 +2136,7 @@ mod tests {
 
         let context_store = cx.new(|cx| ContextStore::fake(project.clone(), cx));
         let history_store = cx.new(|cx| HistoryStore::new(context_store, cx));
-        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
+        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
 
         let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
             let workspace_handle = cx.weak_entity();
@@ -2189,10 +2191,11 @@ mod tests {
             editor.set_text("", window, cx);
         });
 
-        prompt_capabilities.set(acp::PromptCapabilities {
+        prompt_capabilities.replace(acp::PromptCapabilities {
             image: true,
             audio: true,
             embedded_context: true,
+            meta: None,
         });
 
         cx.simulate_input("Lorem ");
@@ -2264,6 +2267,7 @@ mod tests {
             image: true,
             audio: true,
             embedded_context: true,
+            meta: None,
         };
 
         let contents = message_editor
@@ -2640,8 +2644,9 @@ mod tests {
                     cx,
                 );
                 // Enable embedded context so files are actually included
-                editor.prompt_capabilities.set(acp::PromptCapabilities {
+                editor.prompt_capabilities.replace(acp::PromptCapabilities {
                     embedded_context: true,
+                    meta: None,
                     ..Default::default()
                 });
                 editor
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index a25b957015..c205f24cd3 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -37,7 +37,7 @@ use project::{Project, ProjectEntryId};
 use prompt_store::{PromptId, PromptStore};
 use rope::Point;
 use settings::{Settings as _, SettingsStore};
-use std::cell::{Cell, RefCell};
+use std::cell::RefCell;
 use std::path::Path;
 use std::sync::Arc;
 use std::time::Instant;
@@ -290,7 +290,7 @@ pub struct AcpThreadView {
     editor_expanded: bool,
     should_be_following: bool,
     editing_message: Option<usize>,
-    prompt_capabilities: Rc<Cell<PromptCapabilities>>,
+    prompt_capabilities: Rc<RefCell<PromptCapabilities>>,
     available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
     is_loading_contents: bool,
     new_server_version_available: Option<SharedString>,
@@ -334,7 +334,7 @@ impl AcpThreadView {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let prompt_capabilities = Rc::new(Cell::new(acp::PromptCapabilities::default()));
+        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
         let available_commands = Rc::new(RefCell::new(vec![]));
 
         let placeholder = if agent.name() == "Zed Agent" {
@@ -559,7 +559,7 @@ impl AcpThreadView {
                         let action_log = thread.read(cx).action_log().clone();
 
                         this.prompt_capabilities
-                            .set(thread.read(cx).prompt_capabilities());
+                            .replace(thread.read(cx).prompt_capabilities());
 
                         let count = thread.read(cx).entries().len();
                         this.entry_view_state.update(cx, |view_state, cx| {
@@ -1373,7 +1373,7 @@ impl AcpThreadView {
             }
             AcpThreadEvent::PromptCapabilitiesUpdated => {
                 self.prompt_capabilities
-                    .set(thread.read(cx).prompt_capabilities());
+                    .replace(thread.read(cx).prompt_capabilities());
             }
             AcpThreadEvent::TokenUsageUpdated => {}
             AcpThreadEvent::AvailableCommandsUpdated(available_commands) => {
@@ -1390,11 +1390,13 @@ impl AcpThreadView {
                         name: "login".to_owned(),
                         description: "Authenticate".to_owned(),
                         input: None,
+                        meta: None,
                     });
                     available_commands.push(acp::AvailableCommand {
                         name: "logout".to_owned(),
                         description: "Authenticate".to_owned(),
                         input: None,
+                        meta: None,
                     });
                 }
 
@@ -5722,6 +5724,7 @@ pub(crate) mod tests {
             locations: vec![],
             raw_input: None,
             raw_output: None,
+            meta: None,
         };
         let connection =
             StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
@@ -5730,6 +5733,7 @@ pub(crate) mod tests {
                     id: acp::PermissionOptionId("1".into()),
                     name: "Allow".into(),
                     kind: acp::PermissionOptionKind::AllowOnce,
+                    meta: None,
                 }],
             )]));
 
@@ -5906,6 +5910,7 @@ pub(crate) mod tests {
                         image: true,
                         audio: true,
                         embedded_context: true,
+                        meta: None,
                     }),
                     cx,
                 )
@@ -5965,6 +5970,7 @@ pub(crate) mod tests {
                         image: true,
                         audio: true,
                         embedded_context: true,
+                        meta: None,
                     }),
                     cx,
                 )
@@ -5991,6 +5997,7 @@ pub(crate) mod tests {
         ) -> Task<gpui::Result<acp::PromptResponse>> {
             Task::ready(Ok(acp::PromptResponse {
                 stop_reason: acp::StopReason::Refusal,
+                meta: None,
             }))
         }
 
@@ -6074,11 +6081,13 @@ pub(crate) mod tests {
                     path: "/project/test1.txt".into(),
                     old_text: Some("old content 1".into()),
                     new_text: "new content 1".into(),
+                    meta: None,
                 },
             }],
             locations: vec![],
             raw_input: None,
             raw_output: None,
+            meta: None,
         })]);
 
         thread
@@ -6115,11 +6124,13 @@ pub(crate) mod tests {
                     path: "/project/test2.txt".into(),
                     old_text: Some("old content 2".into()),
                     new_text: "new content 2".into(),
+                    meta: None,
                 },
             }],
             locations: vec![],
             raw_input: None,
             raw_output: None,
+            meta: None,
         })]);
 
         thread
@@ -6197,6 +6208,7 @@ pub(crate) mod tests {
             content: acp::ContentBlock::Text(acp::TextContent {
                 text: "Response".into(),
                 annotations: None,
+                meta: None,
             }),
         }]);
 
@@ -6286,6 +6298,7 @@ pub(crate) mod tests {
             content: acp::ContentBlock::Text(acp::TextContent {
                 text: "Response".into(),
                 annotations: None,
+                meta: None,
             }),
         }]);
 
@@ -6329,6 +6342,7 @@ pub(crate) mod tests {
             content: acp::ContentBlock::Text(acp::TextContent {
                 text: "New Response".into(),
                 annotations: None,
+                meta: None,
             }),
         }]);
 
@@ -6421,6 +6435,7 @@ pub(crate) mod tests {
                     content: acp::ContentBlock::Text(acp::TextContent {
                         text: "Response".into(),
                         annotations: None,
+                        meta: None,
                     }),
                 },
                 cx,

From cba9ff55c76562fbf2e8a87c3c1176e6ca8b8f72 Mon Sep 17 00:00:00 2001
From: Romans Malinovskis <me@nearly.guru>
Date: Fri, 12 Sep 2025 16:47:07 +0100
Subject: [PATCH 815/823] Helix Select Mode (#37748)

Please credit @eliaperantoni, for the original PR (#34136).
Merge after (#34060) to avoid conflicts.

Closes https://github.com/zed-industries/zed/issues/33838
Closes https://github.com/zed-industries/zed/issues/33906

Release Notes:
- Helix will no longer sometimes fall out into "normal" mode, will
remain in "helix normal" (example: vv)
- Added dedicated "helix select" mode that can be targeted by
keybindings

Known issues:
- [ ] Helix motion, especially surround-add will not properly work in
visual mode, as it won't call `helix_move_cursor`. It is possible
however to respect self.mode in change_selection now.
- [ ] Some operations, such as `Ctrl+A` (increment) or `>` (indent) will
collapse selection also. I haven't found a way to avoid it.

---------

Co-authored-by: fantacell <ghub@giggo.de>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/keymaps/vim.json                  | 28 +++++++++++++++++++-
 crates/vim/src/helix.rs                  | 33 ++++++++++--------------
 crates/vim/src/insert.rs                 |  6 +----
 crates/vim/src/motion.rs                 |  6 +++--
 crates/vim/src/normal/convert.rs         |  2 +-
 crates/vim/src/object.rs                 |  2 +-
 crates/vim/src/state.rs                  |  4 ++-
 crates/vim/src/test/neovim_connection.rs |  2 +-
 crates/vim/src/vim.rs                    | 31 +++++++++++++++-------
 9 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 78d4b3e707..ed79b00c16 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -325,6 +325,27 @@
       "\"": "vim::PushRegister"
     }
   },
+  {
+    "context": "vim_mode == helix_select",
+    "bindings": {
+      "escape": "vim::NormalBefore",
+      ";": "vim::HelixCollapseSelection",
+      "~": "vim::ChangeCase",
+      "ctrl-a": "vim::Increment",
+      "ctrl-x": "vim::Decrement",
+      "shift-j": "vim::JoinLines",
+      "i": "vim::InsertBefore",
+      "a": "vim::InsertAfter",
+      "p": "vim::Paste",
+      "u": "vim::Undo",
+      "r": "vim::PushReplace",
+      "s": "vim::Substitute",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      ".": "vim::Repeat",
+      "alt-.": "vim::RepeatFind"
+    }
+  },
   {
     "context": "vim_mode == insert",
     "bindings": {
@@ -396,7 +417,12 @@
     "bindings": {
       "i": "vim::HelixInsert",
       "a": "vim::HelixAppend",
-      "ctrl-[": "editor::Cancel",
+      "ctrl-[": "editor::Cancel"
+    }
+  },
+  {
+    "context": "(vim_mode == helix_normal || vim_mode == helix_select) && !menu",
+    "bindings": {
       ";": "vim::HelixCollapseSelection",
       ":": "command_palette::Toggle",
       "m": "vim::PushHelixMatch",
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
index 34ef2b40ec..9f5580d75c 100644
--- a/crates/vim/src/helix.rs
+++ b/crates/vim/src/helix.rs
@@ -6,7 +6,7 @@ use editor::display_map::DisplaySnapshot;
 use editor::{
     DisplayPoint, Editor, HideMouseCursorOrigin, SelectionEffects, ToOffset, ToPoint, movement,
 };
-use gpui::{Action, actions};
+use gpui::actions;
 use gpui::{Context, Window};
 use language::{CharClassifier, CharKind, Point};
 use text::{Bias, SelectionGoal};
@@ -21,8 +21,6 @@ use crate::{
 actions!(
     vim,
     [
-        /// Switches to normal mode after the cursor (Helix-style).
-        HelixNormalAfter,
         /// Yanks the current selection or character if no selection.
         HelixYank,
         /// Inserts at the beginning of the selection.
@@ -37,7 +35,6 @@ actions!(
 );
 
 pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, Vim::helix_normal_after);
     Vim::action(editor, cx, Vim::helix_select_lines);
     Vim::action(editor, cx, Vim::helix_insert);
     Vim::action(editor, cx, Vim::helix_append);
@@ -46,21 +43,6 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
 }
 
 impl Vim {
-    pub fn helix_normal_after(
-        &mut self,
-        action: &HelixNormalAfter,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.active_operator().is_some() {
-            self.operator_stack.clear();
-            self.sync_vim_settings(window, cx);
-            return;
-        }
-        self.stop_recording_immediately(action.boxed_clone(), cx);
-        self.switch_mode(Mode::HelixNormal, false, window, cx);
-    }
-
     pub fn helix_normal_motion(
         &mut self,
         motion: Motion,
@@ -854,6 +836,19 @@ mod test {
         cx.assert_state("foo hello worldˇ baz", Mode::HelixNormal);
     }
 
+    #[gpui::test]
+    async fn test_helix_select_mode(cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        assert_eq!(cx.mode(), Mode::Normal);
+        cx.enable_helix();
+
+        cx.simulate_keystrokes("v");
+        assert_eq!(cx.mode(), Mode::HelixSelect);
+        cx.simulate_keystrokes("escape");
+        assert_eq!(cx.mode(), Mode::HelixNormal);
+    }
+
     #[gpui::test]
     async fn test_insert_mode_stickiness(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
index 8ef1cd7811..5b9fef402a 100644
--- a/crates/vim/src/insert.rs
+++ b/crates/vim/src/insert.rs
@@ -63,11 +63,7 @@ impl Vim {
                 }
             });
 
-            if HelixModeSetting::get_global(cx).0 {
-                self.switch_mode(Mode::HelixNormal, false, window, cx);
-            } else {
-                self.switch_mode(Mode::Normal, false, window, cx);
-            }
+            self.switch_mode(Mode::Normal, false, window, cx);
             return;
         }
 
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index a54d3caa60..e2dfb24008 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -692,7 +692,7 @@ impl Vim {
                     }
                 }
 
-                Mode::HelixNormal => {}
+                Mode::HelixNormal | Mode::HelixSelect => {}
             }
         }
 
@@ -726,7 +726,9 @@ impl Vim {
                 self.visual_motion(motion, count, window, cx)
             }
 
-            Mode::HelixNormal => self.helix_normal_motion(motion, count, window, cx),
+            Mode::HelixNormal | Mode::HelixSelect => {
+                self.helix_normal_motion(motion, count, window, cx)
+            }
         }
         self.clear_operator(window, cx);
         if let Some(operator) = waiting_operator {
diff --git a/crates/vim/src/normal/convert.rs b/crates/vim/src/normal/convert.rs
index 4b9c3fc8f7..d5875fe963 100644
--- a/crates/vim/src/normal/convert.rs
+++ b/crates/vim/src/normal/convert.rs
@@ -212,7 +212,7 @@ impl Vim {
                         }
                     }
 
-                    Mode::HelixNormal => {
+                    Mode::HelixNormal | Mode::HelixSelect => {
                         if selection.is_empty() {
                             // Handle empty selection by operating on the whole word
                             let (word_range, _) = snapshot.surrounding_word(selection.start, false);
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
index 430149cada..e6eb46c0fa 100644
--- a/crates/vim/src/object.rs
+++ b/crates/vim/src/object.rs
@@ -398,7 +398,7 @@ impl Vim {
 
         match self.mode {
             Mode::Normal | Mode::HelixNormal => self.normal_object(object, count, window, cx),
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
+            Mode::Visual | Mode::VisualLine | Mode::VisualBlock | Mode::HelixSelect => {
                 self.visual_object(object, count, window, cx)
             }
             Mode::Insert | Mode::Replace => {
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index cd9382da46..f812991690 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -46,6 +46,7 @@ pub enum Mode {
     VisualLine,
     VisualBlock,
     HelixNormal,
+    HelixSelect,
 }
 
 impl Display for Mode {
@@ -58,6 +59,7 @@ impl Display for Mode {
             Mode::VisualLine => write!(f, "VISUAL LINE"),
             Mode::VisualBlock => write!(f, "VISUAL BLOCK"),
             Mode::HelixNormal => write!(f, "HELIX NORMAL"),
+            Mode::HelixSelect => write!(f, "HELIX SELECT"),
         }
     }
 }
@@ -65,7 +67,7 @@ impl Display for Mode {
 impl Mode {
     pub fn is_visual(&self) -> bool {
         match self {
-            Self::Visual | Self::VisualLine | Self::VisualBlock => true,
+            Self::Visual | Self::VisualLine | Self::VisualBlock | Self::HelixSelect => true,
             Self::Normal | Self::Insert | Self::Replace | Self::HelixNormal => false,
         }
     }
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
index 13b3e8b58d..4b0cc5b0c5 100644
--- a/crates/vim/src/test/neovim_connection.rs
+++ b/crates/vim/src/test/neovim_connection.rs
@@ -443,7 +443,7 @@ impl NeovimConnection {
             }
             Mode::Insert | Mode::Normal | Mode::Replace => selections
                 .push(Point::new(selection_row, selection_col)..Point::new(cursor_row, cursor_col)),
-            Mode::HelixNormal => unreachable!(),
+            Mode::HelixNormal | Mode::HelixSelect => unreachable!(),
         }
 
         let ranges = encode_ranges(&text, &selections);
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index fdf18dfef9..7f388acd0c 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -516,11 +516,7 @@ impl Vim {
 
         vim.update(cx, |_, cx| {
             Vim::action(editor, cx, |vim, _: &SwitchToNormalMode, window, cx| {
-                if HelixModeSetting::get_global(cx).0 {
-                    vim.switch_mode(Mode::HelixNormal, false, window, cx)
-                } else {
-                    vim.switch_mode(Mode::Normal, false, window, cx)
-                }
+                vim.switch_mode(Mode::Normal, false, window, cx)
             });
 
             Vim::action(editor, cx, |vim, _: &SwitchToInsertMode, window, cx| {
@@ -1030,6 +1026,13 @@ impl Vim {
                 editor.set_relative_line_number(Some(is_relative), cx)
             });
         }
+        if HelixModeSetting::get_global(cx).0 {
+            if self.mode == Mode::Normal {
+                self.mode = Mode::HelixNormal
+            } else if self.mode == Mode::Visual {
+                self.mode = Mode::HelixSelect
+            }
+        }
 
         if leave_selections {
             return;
@@ -1151,7 +1154,7 @@ impl Vim {
             }
             Mode::HelixNormal => cursor_shape.normal.unwrap_or(CursorShape::Block),
             Mode::Replace => cursor_shape.replace.unwrap_or(CursorShape::Underline),
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
+            Mode::Visual | Mode::VisualLine | Mode::VisualBlock | Mode::HelixSelect => {
                 cursor_shape.visual.unwrap_or(CursorShape::Block)
             }
             Mode::Insert => cursor_shape.insert.unwrap_or({
@@ -1175,7 +1178,8 @@ impl Vim {
             | Mode::Replace
             | Mode::Visual
             | Mode::VisualLine
-            | Mode::VisualBlock => false,
+            | Mode::VisualBlock
+            | Mode::HelixSelect => false,
         }
     }
 
@@ -1190,7 +1194,8 @@ impl Vim {
             | Mode::VisualLine
             | Mode::VisualBlock
             | Mode::Replace
-            | Mode::HelixNormal => false,
+            | Mode::HelixNormal
+            | Mode::HelixSelect => false,
             Mode::Normal => true,
         }
     }
@@ -1202,6 +1207,7 @@ impl Vim {
             Mode::Insert => "insert",
             Mode::Replace => "replace",
             Mode::HelixNormal => "helix_normal",
+            Mode::HelixSelect => "helix_select",
         }
         .to_string();
 
@@ -1227,7 +1233,12 @@ impl Vim {
             }
         }
 
-        if mode == "normal" || mode == "visual" || mode == "operator" || mode == "helix_normal" {
+        if mode == "normal"
+            || mode == "visual"
+            || mode == "operator"
+            || mode == "helix_normal"
+            || mode == "helix_select"
+        {
             context.add("VimControl");
         }
         context.set("vim_mode", mode);
@@ -1522,7 +1533,7 @@ impl Vim {
         cx: &mut Context<Self>,
     ) {
         match self.mode {
-            Mode::VisualLine | Mode::VisualBlock | Mode::Visual => {
+            Mode::VisualLine | Mode::VisualBlock | Mode::Visual | Mode::HelixSelect => {
                 self.update_editor(cx, |vim, editor, cx| {
                     let original_mode = vim.undo_modes.get(transaction_id);
                     editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {

From 2aa564eeb7246fff329e958978cb3ac83ae16175 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Fri, 12 Sep 2025 18:07:59 +0200
Subject: [PATCH 816/823] Remove ACP feature flags (#38055)

This removes the `gemini-and-native` and `claude-code` feature flags.
Also, I removed a bunch of unused agent1 code that we do not need
anymore.

Initially I wanted to remove much more of the `agent` code, but noticed
some things that we need to figure out first:
- The inline assistant + context strip use `Thread`/`ContextStore`
directly
- We need some replacement for `ToolWorkingSet`, so we can access
available tools (as well as context server tools) in other places, e.g.
the agent configuration and the configure profile modal

Release Notes:

- N/A
---
 Cargo.lock                                    |    6 +-
 crates/agent/src/history_store.rs             |   39 +-
 crates/agent_settings/Cargo.toml              |    3 +
 crates/agent_settings/src/agent_profile.rs    |   71 +-
 crates/agent_ui/Cargo.toml                    |    2 -
 crates/agent_ui/src/acp/thread_view.rs        |    2 +-
 crates/agent_ui/src/active_thread.rs          | 4110 -----------------
 .../manage_profiles_modal.rs                  |    3 +-
 crates/agent_ui/src/agent_diff.rs             |  145 +-
 crates/agent_ui/src/agent_model_selector.rs   |   23 -
 crates/agent_ui/src/agent_panel.rs            | 1738 +------
 crates/agent_ui/src/agent_ui.rs               |   10 +-
 crates/agent_ui/src/context_picker.rs         |  111 +-
 crates/agent_ui/src/context_strip.rs          |  153 +-
 crates/agent_ui/src/debug.rs                  |  124 -
 crates/agent_ui/src/inline_prompt_editor.rs   |   30 +-
 crates/agent_ui/src/message_editor.rs         | 1658 +------
 crates/agent_ui/src/profile_selector.rs       |    6 +-
 crates/agent_ui/src/thread_history.rs         |  912 ----
 crates/agent_ui/src/tool_compatibility.rs     |   94 -
 crates/agent_ui/src/ui.rs                     |    3 +-
 crates/agent_ui/src/ui/context_pill.rs        |  130 +-
 crates/agent_ui/src/ui/preview.rs             |    5 -
 .../agent_ui/src/ui/preview/agent_preview.rs  |   89 -
 .../usage_callouts.rs => usage_callout.rs}    |    0
 crates/feature_flags/src/flags.rs             |   25 -
 crates/zed/Cargo.toml                         |    2 -
 crates/zed/src/zed/component_preview.rs       |  161 +-
 .../zed/component_preview/preview_support.rs  |    1 -
 .../preview_support/active_thread.rs          |  100 -
 30 files changed, 389 insertions(+), 9367 deletions(-)
 delete mode 100644 crates/agent_ui/src/active_thread.rs
 delete mode 100644 crates/agent_ui/src/debug.rs
 delete mode 100644 crates/agent_ui/src/thread_history.rs
 delete mode 100644 crates/agent_ui/src/tool_compatibility.rs
 delete mode 100644 crates/agent_ui/src/ui/preview.rs
 delete mode 100644 crates/agent_ui/src/ui/preview/agent_preview.rs
 rename crates/agent_ui/src/ui/{preview/usage_callouts.rs => usage_callout.rs} (100%)
 delete mode 100644 crates/zed/src/zed/component_preview/preview_support.rs
 delete mode 100644 crates/zed/src/zed/component_preview/preview_support/active_thread.rs

diff --git a/Cargo.lock b/Cargo.lock
index b408833661..9a62a28284 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -330,6 +330,7 @@ dependencies = [
  "anyhow",
  "cloud_llm_client",
  "collections",
+ "convert_case 0.8.0",
  "fs",
  "gpui",
  "language_model",
@@ -339,6 +340,7 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "settings",
+ "util",
  "workspace-hack",
 ]
 
@@ -383,7 +385,6 @@ dependencies = [
  "html_to_markdown",
  "http_client",
  "indoc",
- "inventory",
  "itertools 0.14.0",
  "jsonschema",
  "language",
@@ -434,7 +435,6 @@ dependencies = [
  "url",
  "urlencoding",
  "util",
- "uuid",
  "watch",
  "workspace",
  "workspace-hack",
@@ -20505,7 +20505,6 @@ dependencies = [
  "ashpd",
  "askpass",
  "assets",
- "assistant_tool",
  "assistant_tools",
  "audio",
  "auto_update",
@@ -20550,7 +20549,6 @@ dependencies = [
  "gpui_tokio",
  "http_client",
  "image_viewer",
- "indoc",
  "inspector_ui",
  "install_cli",
  "itertools 0.14.0",
diff --git a/crates/agent/src/history_store.rs b/crates/agent/src/history_store.rs
index 8f4c1a1e2e..285ce7c04b 100644
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -1,7 +1,4 @@
-use crate::{
-    ThreadId,
-    thread_store::{SerializedThreadMetadata, ThreadStore},
-};
+use crate::{ThreadId, thread_store::SerializedThreadMetadata};
 use anyhow::{Context as _, Result};
 use assistant_context::SavedContextMetadata;
 use chrono::{DateTime, Utc};
@@ -61,7 +58,6 @@ enum SerializedRecentOpen {
 }
 
 pub struct HistoryStore {
-    thread_store: Entity<ThreadStore>,
     context_store: Entity<assistant_context::ContextStore>,
     recently_opened_entries: VecDeque<HistoryEntryId>,
     _subscriptions: Vec<gpui::Subscription>,
@@ -70,15 +66,11 @@ pub struct HistoryStore {
 
 impl HistoryStore {
     pub fn new(
-        thread_store: Entity<ThreadStore>,
         context_store: Entity<assistant_context::ContextStore>,
         initial_recent_entries: impl IntoIterator<Item = HistoryEntryId>,
         cx: &mut Context<Self>,
     ) -> Self {
-        let subscriptions = vec![
-            cx.observe(&thread_store, |_, _, cx| cx.notify()),
-            cx.observe(&context_store, |_, _, cx| cx.notify()),
-        ];
+        let subscriptions = vec![cx.observe(&context_store, |_, _, cx| cx.notify())];
 
         cx.spawn(async move |this, cx| {
             let entries = Self::load_recently_opened_entries(cx).await.log_err()?;
@@ -96,7 +88,6 @@ impl HistoryStore {
         .detach();
 
         Self {
-            thread_store,
             context_store,
             recently_opened_entries: initial_recent_entries.into_iter().collect(),
             _subscriptions: subscriptions,
@@ -112,13 +103,6 @@ impl HistoryStore {
             return history_entries;
         }
 
-        history_entries.extend(
-            self.thread_store
-                .read(cx)
-                .reverse_chronological_threads()
-                .cloned()
-                .map(HistoryEntry::Thread),
-        );
         history_entries.extend(
             self.context_store
                 .read(cx)
@@ -141,22 +125,6 @@ impl HistoryStore {
             return Vec::new();
         }
 
-        let thread_entries = self
-            .thread_store
-            .read(cx)
-            .reverse_chronological_threads()
-            .flat_map(|thread| {
-                self.recently_opened_entries
-                    .iter()
-                    .enumerate()
-                    .flat_map(|(index, entry)| match entry {
-                        HistoryEntryId::Thread(id) if &thread.id == id => {
-                            Some((index, HistoryEntry::Thread(thread.clone())))
-                        }
-                        _ => None,
-                    })
-            });
-
         let context_entries =
             self.context_store
                 .read(cx)
@@ -173,8 +141,7 @@ impl HistoryStore {
                         })
                 });
 
-        thread_entries
-            .chain(context_entries)
+        context_entries
             // optimization to halt iteration early
             .take(self.recently_opened_entries.len())
             .sorted_unstable_by_key(|(index, _)| *index)
diff --git a/crates/agent_settings/Cargo.toml b/crates/agent_settings/Cargo.toml
index d34396a5d3..8af76053c2 100644
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -15,11 +15,14 @@ path = "src/agent_settings.rs"
 anyhow.workspace = true
 cloud_llm_client.workspace = true
 collections.workspace = true
+convert_case.workspace = true
+fs.workspace = true
 gpui.workspace = true
 language_model.workspace = true
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
+util.workspace = true
 workspace-hack.workspace = true
 
 [dev-dependencies]
diff --git a/crates/agent_settings/src/agent_profile.rs b/crates/agent_settings/src/agent_profile.rs
index 04fdd4a753..42a273e2dc 100644
--- a/crates/agent_settings/src/agent_profile.rs
+++ b/crates/agent_settings/src/agent_profile.rs
@@ -1,9 +1,15 @@
 use std::sync::Arc;
 
 use collections::IndexMap;
-use gpui::SharedString;
+use convert_case::{Case, Casing as _};
+use fs::Fs;
+use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use settings::{Settings as _, update_settings_file};
+use util::ResultExt as _;
+
+use crate::AgentSettings;
 
 pub mod builtin_profiles {
     use super::AgentProfileId;
@@ -38,6 +44,69 @@ impl Default for AgentProfileId {
     }
 }
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AgentProfile {
+    id: AgentProfileId,
+}
+
+pub type AvailableProfiles = IndexMap<AgentProfileId, SharedString>;
+
+impl AgentProfile {
+    pub fn new(id: AgentProfileId) -> Self {
+        Self { id }
+    }
+
+    pub fn id(&self) -> &AgentProfileId {
+        &self.id
+    }
+
+    /// Saves a new profile to the settings.
+    pub fn create(
+        name: String,
+        base_profile_id: Option<AgentProfileId>,
+        fs: Arc<dyn Fs>,
+        cx: &App,
+    ) -> AgentProfileId {
+        let id = AgentProfileId(name.to_case(Case::Kebab).into());
+
+        let base_profile =
+            base_profile_id.and_then(|id| AgentSettings::get_global(cx).profiles.get(&id).cloned());
+
+        let profile_settings = AgentProfileSettings {
+            name: name.into(),
+            tools: base_profile
+                .as_ref()
+                .map(|profile| profile.tools.clone())
+                .unwrap_or_default(),
+            enable_all_context_servers: base_profile
+                .as_ref()
+                .map(|profile| profile.enable_all_context_servers)
+                .unwrap_or_default(),
+            context_servers: base_profile
+                .map(|profile| profile.context_servers)
+                .unwrap_or_default(),
+        };
+
+        update_settings_file::<AgentSettings>(fs, cx, {
+            let id = id.clone();
+            move |settings, _cx| {
+                settings.create_profile(id, profile_settings).log_err();
+            }
+        });
+
+        id
+    }
+
+    /// Returns a map of AgentProfileIds to their names
+    pub fn available_profiles(cx: &App) -> AvailableProfiles {
+        let mut profiles = AvailableProfiles::default();
+        for (id, profile) in AgentSettings::get_global(cx).profiles.iter() {
+            profiles.insert(id.clone(), profile.name.clone());
+        }
+        profiles
+    }
+}
+
 /// A profile for the Zed Agent that controls its behavior.
 #[derive(Debug, Clone)]
 pub struct AgentProfileSettings {
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index eaa058467f..028db95c10 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -52,7 +52,6 @@ gpui.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
 indoc.workspace = true
-inventory.workspace = true
 itertools.workspace = true
 jsonschema.workspace = true
 language.workspace = true
@@ -98,7 +97,6 @@ ui_input.workspace = true
 url.workspace = true
 urlencoding.workspace = true
 util.workspace = true
-uuid.workspace = true
 watch.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index c205f24cd3..bae2e107ee 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -62,9 +62,9 @@ use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::agent_diff::AgentDiff;
 use crate::profile_selector::{ProfileProvider, ProfileSelector};
 
-use crate::ui::preview::UsageCallout;
 use crate::ui::{
     AgentNotification, AgentNotificationEvent, BurnModeTooltip, UnavailableEditingTooltip,
+    UsageCallout,
 };
 use crate::{
     AgentDiffPane, AgentPanel, AllowAlways, AllowOnce, ContinueThread, ContinueWithBurnMode,
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
deleted file mode 100644
index 6dfadb691f..0000000000
--- a/crates/agent_ui/src/active_thread.rs
+++ /dev/null
@@ -1,4110 +0,0 @@
-use crate::context_picker::{ContextPicker, MentionLink};
-use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::message_editor::{extract_message_creases, insert_message_creases};
-use crate::ui::{AddedContext, AgentNotification, AgentNotificationEvent, ContextPill};
-use crate::{AgentPanel, ModelUsageContext};
-use agent::{
-    ContextStore, LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, TextThreadStore,
-    Thread, ThreadError, ThreadEvent, ThreadFeedback, ThreadStore, ThreadSummary,
-    context::{self, AgentContextHandle, RULES_ICON},
-    thread_store::RulesLoadingError,
-    tool_use::{PendingToolUseStatus, ToolUse},
-};
-use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
-use anyhow::Context as _;
-use assistant_tool::ToolUseStatus;
-use audio::{Audio, Sound};
-use cloud_llm_client::CompletionIntent;
-use collections::{HashMap, HashSet};
-use editor::actions::{MoveUp, Paste};
-use editor::scroll::Autoscroll;
-use editor::{Editor, EditorElement, EditorEvent, EditorStyle, MultiBuffer, SelectionEffects};
-use gpui::{
-    AbsoluteLength, Animation, AnimationExt, AnyElement, App, ClickEvent, ClipboardEntry,
-    ClipboardItem, DefiniteLength, EdgesRefinement, Empty, Entity, EventEmitter, Focusable, Hsla,
-    ListAlignment, ListOffset, ListState, MouseButton, PlatformDisplay, ScrollHandle, Stateful,
-    StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement, UnderlineStyle,
-    WeakEntity, WindowHandle, linear_color_stop, linear_gradient, list, pulsating_between,
-};
-use language::{Buffer, Language, LanguageRegistry};
-use language_model::{
-    LanguageModelRequestMessage, LanguageModelToolUseId, MessageContent, Role, StopReason,
-};
-use markdown::parser::{CodeBlockKind, CodeBlockMetadata};
-use markdown::{
-    HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle, ParsedMarkdown, PathWithRange,
-};
-use project::{ProjectEntryId, ProjectItem as _};
-use rope::Point;
-use settings::{Settings as _, SettingsStore, update_settings_file};
-use std::ffi::OsStr;
-use std::path::Path;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::time::Duration;
-use text::ToPoint;
-use theme::ThemeSettings;
-use ui::{
-    Banner, CommonAnimationExt, Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar,
-    ScrollbarState, TextSize, Tooltip, prelude::*,
-};
-use util::ResultExt as _;
-use util::markdown::MarkdownCodeBlock;
-use workspace::{CollaboratorId, Workspace};
-use zed_actions::assistant::OpenRulesLibrary;
-
-const CODEBLOCK_CONTAINER_GROUP: &str = "codeblock_container";
-const EDIT_PREVIOUS_MESSAGE_MIN_LINES: usize = 1;
-const RESPONSE_PADDING_X: Pixels = px(19.);
-
-pub struct ActiveThread {
-    context_store: Entity<ContextStore>,
-    language_registry: Arc<LanguageRegistry>,
-    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
-    thread: Entity<Thread>,
-    workspace: WeakEntity<Workspace>,
-    save_thread_task: Option<Task<()>>,
-    messages: Vec<MessageId>,
-    list_state: ListState,
-    scrollbar_state: ScrollbarState,
-    rendered_messages_by_id: HashMap<MessageId, RenderedMessage>,
-    rendered_tool_uses: HashMap<LanguageModelToolUseId, RenderedToolUse>,
-    editing_message: Option<(MessageId, EditingMessageState)>,
-    expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
-    expanded_thinking_segments: HashMap<(MessageId, usize), bool>,
-    expanded_code_blocks: HashMap<(MessageId, usize), bool>,
-    last_error: Option<ThreadError>,
-    notifications: Vec<WindowHandle<AgentNotification>>,
-    copied_code_block_ids: HashSet<(MessageId, usize)>,
-    _subscriptions: Vec<Subscription>,
-    notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
-    open_feedback_editors: HashMap<MessageId, Entity<Editor>>,
-    _load_edited_message_context_task: Option<Task<()>>,
-}
-
-struct RenderedMessage {
-    language_registry: Arc<LanguageRegistry>,
-    segments: Vec<RenderedMessageSegment>,
-}
-
-#[derive(Clone)]
-struct RenderedToolUse {
-    label: Entity<Markdown>,
-    input: Entity<Markdown>,
-    output: Entity<Markdown>,
-}
-
-impl RenderedMessage {
-    fn from_segments(
-        segments: &[MessageSegment],
-        language_registry: Arc<LanguageRegistry>,
-        cx: &mut App,
-    ) -> Self {
-        let mut this = Self {
-            language_registry,
-            segments: Vec::with_capacity(segments.len()),
-        };
-        for segment in segments {
-            this.push_segment(segment, cx);
-        }
-        this
-    }
-
-    fn append_thinking(&mut self, text: &String, cx: &mut App) {
-        if let Some(RenderedMessageSegment::Thinking {
-            content,
-            scroll_handle,
-        }) = self.segments.last_mut()
-        {
-            content.update(cx, |markdown, cx| {
-                markdown.append(text, cx);
-            });
-            scroll_handle.scroll_to_bottom();
-        } else {
-            self.segments.push(RenderedMessageSegment::Thinking {
-                content: parse_markdown(text.into(), self.language_registry.clone(), cx),
-                scroll_handle: ScrollHandle::default(),
-            });
-        }
-    }
-
-    fn append_text(&mut self, text: &String, cx: &mut App) {
-        if let Some(RenderedMessageSegment::Text(markdown)) = self.segments.last_mut() {
-            markdown.update(cx, |markdown, cx| markdown.append(text, cx));
-        } else {
-            self.segments
-                .push(RenderedMessageSegment::Text(parse_markdown(
-                    SharedString::from(text),
-                    self.language_registry.clone(),
-                    cx,
-                )));
-        }
-    }
-
-    fn push_segment(&mut self, segment: &MessageSegment, cx: &mut App) {
-        match segment {
-            MessageSegment::Thinking { text, .. } => {
-                self.segments.push(RenderedMessageSegment::Thinking {
-                    content: parse_markdown(text.into(), self.language_registry.clone(), cx),
-                    scroll_handle: ScrollHandle::default(),
-                })
-            }
-            MessageSegment::Text(text) => {
-                self.segments
-                    .push(RenderedMessageSegment::Text(parse_markdown(
-                        text.into(),
-                        self.language_registry.clone(),
-                        cx,
-                    )))
-            }
-            MessageSegment::RedactedThinking(_) => {}
-        };
-    }
-}
-
-enum RenderedMessageSegment {
-    Thinking {
-        content: Entity<Markdown>,
-        scroll_handle: ScrollHandle,
-    },
-    Text(Entity<Markdown>),
-}
-
-fn parse_markdown(
-    text: SharedString,
-    language_registry: Arc<LanguageRegistry>,
-    cx: &mut App,
-) -> Entity<Markdown> {
-    cx.new(|cx| Markdown::new(text, Some(language_registry), None, cx))
-}
-
-pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let ui_font_size = TextSize::Default.rems(cx);
-    let buffer_font_size = TextSize::Small.rems(cx);
-    let mut text_style = window.text_style();
-    let line_height = buffer_font_size * 1.75;
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(ui_font_size.into()),
-        line_height: Some(line_height.into()),
-        color: Some(cx.theme().colors().text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
-        code_block_overflow_x_scroll: true,
-        table_overflow_x_scroll: true,
-        heading_level_styles: Some(HeadingLevelStyles {
-            h1: Some(TextStyleRefinement {
-                font_size: Some(rems(1.15).into()),
-                ..Default::default()
-            }),
-            h2: Some(TextStyleRefinement {
-                font_size: Some(rems(1.1).into()),
-                ..Default::default()
-            }),
-            h3: Some(TextStyleRefinement {
-                font_size: Some(rems(1.05).into()),
-                ..Default::default()
-            }),
-            h4: Some(TextStyleRefinement {
-                font_size: Some(rems(1.).into()),
-                ..Default::default()
-            }),
-            h5: Some(TextStyleRefinement {
-                font_size: Some(rems(0.95).into()),
-                ..Default::default()
-            }),
-            h6: Some(TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                ..Default::default()
-            }),
-        }),
-        code_block: StyleRefinement {
-            padding: EdgesRefinement {
-                top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                left: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-            },
-            background: Some(colors.editor_background.into()),
-            text: Some(TextStyleRefinement {
-                font_family: Some(theme_settings.buffer_font.family.clone()),
-                font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-                font_features: Some(theme_settings.buffer_font.features.clone()),
-                font_size: Some(buffer_font_size.into()),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        inline_code: TextStyleRefinement {
-            font_family: Some(theme_settings.buffer_font.family.clone()),
-            font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-            font_features: Some(theme_settings.buffer_font.features.clone()),
-            font_size: Some(buffer_font_size.into()),
-            background_color: Some(colors.editor_foreground.opacity(0.08)),
-            ..Default::default()
-        },
-        link: TextStyleRefinement {
-            background_color: Some(colors.editor_foreground.opacity(0.025)),
-            underline: Some(UnderlineStyle {
-                color: Some(colors.text_accent.opacity(0.5)),
-                thickness: px(1.),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        link_callback: Some(Rc::new(move |url, cx| {
-            if MentionLink::is_valid(url) {
-                let colors = cx.theme().colors();
-                Some(TextStyleRefinement {
-                    background_color: Some(colors.element_background),
-                    ..Default::default()
-                })
-            } else {
-                None
-            }
-        })),
-        ..Default::default()
-    }
-}
-
-fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let ui_font_size = TextSize::Default.rems(cx);
-    let buffer_font_size = TextSize::Small.rems(cx);
-    let mut text_style = window.text_style();
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(ui_font_size.into()),
-        color: Some(cx.theme().colors().text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style,
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
-        code_block_overflow_x_scroll: false,
-        code_block: StyleRefinement {
-            margin: EdgesRefinement::default(),
-            padding: EdgesRefinement::default(),
-            background: Some(colors.editor_background.into()),
-            border_color: None,
-            border_widths: EdgesRefinement::default(),
-            text: Some(TextStyleRefinement {
-                font_family: Some(theme_settings.buffer_font.family.clone()),
-                font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-                font_features: Some(theme_settings.buffer_font.features.clone()),
-                font_size: Some(buffer_font_size.into()),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        inline_code: TextStyleRefinement {
-            font_family: Some(theme_settings.buffer_font.family.clone()),
-            font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-            font_features: Some(theme_settings.buffer_font.features.clone()),
-            font_size: Some(TextSize::XSmall.rems(cx).into()),
-            ..Default::default()
-        },
-        heading: StyleRefinement {
-            text: Some(TextStyleRefinement {
-                font_size: Some(ui_font_size.into()),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        ..Default::default()
-    }
-}
-
-fn render_markdown_code_block(
-    message_id: MessageId,
-    ix: usize,
-    kind: &CodeBlockKind,
-    parsed_markdown: &ParsedMarkdown,
-    metadata: CodeBlockMetadata,
-    active_thread: Entity<ActiveThread>,
-    workspace: WeakEntity<Workspace>,
-    _window: &Window,
-    cx: &App,
-) -> Div {
-    let label_size = rems(0.8125);
-
-    let label = match kind {
-        CodeBlockKind::Indented => None,
-        CodeBlockKind::Fenced => Some(
-            h_flex()
-                .px_1()
-                .gap_1()
-                .child(
-                    Icon::new(IconName::Code)
-                        .color(Color::Muted)
-                        .size(IconSize::XSmall),
-                )
-                .child(div().text_size(label_size).child("Plain Text"))
-                .into_any_element(),
-        ),
-        CodeBlockKind::FencedLang(raw_language_name) => Some(render_code_language(
-            parsed_markdown.languages_by_name.get(raw_language_name),
-            raw_language_name.clone(),
-            cx,
-        )),
-        CodeBlockKind::FencedSrc(path_range) => path_range.path.file_name().map(|file_name| {
-            // We tell the model to use /dev/null for the path instead of using ```language
-            // because otherwise it consistently fails to use code citations.
-            if path_range.path.starts_with("/dev/null") {
-                let ext = path_range
-                    .path
-                    .extension()
-                    .and_then(OsStr::to_str)
-                    .map(|str| SharedString::new(str.to_string()))
-                    .unwrap_or_default();
-
-                render_code_language(
-                    parsed_markdown
-                        .languages_by_path
-                        .get(&path_range.path)
-                        .or_else(|| parsed_markdown.languages_by_name.get(&ext)),
-                    ext,
-                    cx,
-                )
-            } else {
-                let content = if let Some(parent) = path_range.path.parent() {
-                    let file_name = file_name.to_string_lossy().to_string();
-                    let path = parent.to_string_lossy().to_string();
-                    let path_and_file = format!("{}/{}", path, file_name);
-
-                    h_flex()
-                        .id(("code-block-header-label", ix))
-                        .ml_1()
-                        .gap_1()
-                        .child(div().text_size(label_size).child(file_name))
-                        .child(Label::new(path).color(Color::Muted).size(LabelSize::Small))
-                        .tooltip(move |window, cx| {
-                            Tooltip::with_meta(
-                                "Jump to File",
-                                None,
-                                path_and_file.clone(),
-                                window,
-                                cx,
-                            )
-                        })
-                        .into_any_element()
-                } else {
-                    div()
-                        .ml_1()
-                        .text_size(label_size)
-                        .child(path_range.path.to_string_lossy().to_string())
-                        .into_any_element()
-                };
-
-                h_flex()
-                    .id(("code-block-header-button", ix))
-                    .w_full()
-                    .max_w_full()
-                    .px_1()
-                    .gap_0p5()
-                    .cursor_pointer()
-                    .rounded_sm()
-                    .hover(|item| item.bg(cx.theme().colors().element_hover.opacity(0.5)))
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .children(
-                                file_icons::FileIcons::get_icon(&path_range.path, cx)
-                                    .map(Icon::from_path)
-                                    .map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)),
-                            )
-                            .child(content)
-                            .child(
-                                Icon::new(IconName::ArrowUpRight)
-                                    .size(IconSize::Small)
-                                    .color(Color::Ignored),
-                            ),
-                    )
-                    .on_click({
-                        let path_range = path_range.clone();
-                        move |_, window, cx| {
-                            workspace
-                                .update(cx, |workspace, cx| {
-                                    open_path(&path_range, window, workspace, cx)
-                                })
-                                .ok();
-                        }
-                    })
-                    .into_any_element()
-            }
-        }),
-    };
-
-    let codeblock_was_copied = active_thread
-        .read(cx)
-        .copied_code_block_ids
-        .contains(&(message_id, ix));
-
-    let is_expanded = active_thread.read(cx).is_codeblock_expanded(message_id, ix);
-
-    let codeblock_header_bg = cx
-        .theme()
-        .colors()
-        .element_background
-        .blend(cx.theme().colors().editor_foreground.opacity(0.025));
-
-    let control_buttons = h_flex()
-        .visible_on_hover(CODEBLOCK_CONTAINER_GROUP)
-        .absolute()
-        .top_0()
-        .right_0()
-        .h_full()
-        .bg(codeblock_header_bg)
-        .rounded_tr_md()
-        .px_1()
-        .gap_1()
-        .child(
-            IconButton::new(
-                ("copy-markdown-code", ix),
-                if codeblock_was_copied {
-                    IconName::Check
-                } else {
-                    IconName::Copy
-                },
-            )
-            .icon_color(Color::Muted)
-            .shape(ui::IconButtonShape::Square)
-            .tooltip(Tooltip::text("Copy Code"))
-            .on_click({
-                let active_thread = active_thread.clone();
-                let parsed_markdown = parsed_markdown.clone();
-                let code_block_range = metadata.content_range;
-                move |_event, _window, cx| {
-                    active_thread.update(cx, |this, cx| {
-                        this.copied_code_block_ids.insert((message_id, ix));
-
-                        let code = parsed_markdown.source()[code_block_range.clone()].to_string();
-                        cx.write_to_clipboard(ClipboardItem::new_string(code));
-
-                        cx.spawn(async move |this, cx| {
-                            cx.background_executor().timer(Duration::from_secs(2)).await;
-
-                            cx.update(|cx| {
-                                this.update(cx, |this, cx| {
-                                    this.copied_code_block_ids.remove(&(message_id, ix));
-                                    cx.notify();
-                                })
-                            })
-                            .ok();
-                        })
-                        .detach();
-                    });
-                }
-            }),
-        )
-        .child(
-            IconButton::new(
-                ("expand-collapse-code", ix),
-                if is_expanded {
-                    IconName::ChevronUp
-                } else {
-                    IconName::ChevronDown
-                },
-            )
-            .icon_color(Color::Muted)
-            .shape(ui::IconButtonShape::Square)
-            .tooltip(Tooltip::text(if is_expanded {
-                "Collapse Code"
-            } else {
-                "Expand Code"
-            }))
-            .on_click({
-                move |_event, _window, cx| {
-                    active_thread.update(cx, |this, cx| {
-                        this.toggle_codeblock_expanded(message_id, ix);
-                        cx.notify();
-                    });
-                }
-            }),
-        );
-
-    let codeblock_header = h_flex()
-        .relative()
-        .p_1()
-        .gap_1()
-        .justify_between()
-        .bg(codeblock_header_bg)
-        .map(|this| {
-            if !is_expanded {
-                this.rounded_md()
-            } else {
-                this.rounded_t_md()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border.opacity(0.6))
-            }
-        })
-        .children(label)
-        .child(control_buttons);
-
-    v_flex()
-        .group(CODEBLOCK_CONTAINER_GROUP)
-        .my_2()
-        .overflow_hidden()
-        .rounded_md()
-        .border_1()
-        .border_color(cx.theme().colors().border.opacity(0.6))
-        .bg(cx.theme().colors().editor_background)
-        .child(codeblock_header)
-        .when(!is_expanded, |this| this.h(rems_from_px(31.)))
-}
-
-fn open_path(
-    path_range: &PathWithRange,
-    window: &mut Window,
-    workspace: &mut Workspace,
-    cx: &mut Context<'_, Workspace>,
-) {
-    let Some(project_path) = workspace
-        .project()
-        .read(cx)
-        .find_project_path(&path_range.path, cx)
-    else {
-        return; // TODO instead of just bailing out, open that path in a buffer.
-    };
-
-    let Some(target) = path_range.range.as_ref().map(|range| {
-        Point::new(
-            // Line number is 1-based
-            range.start.line.saturating_sub(1),
-            range.start.col.unwrap_or(0),
-        )
-    }) else {
-        return;
-    };
-    let open_task = workspace.open_path(project_path, None, true, window, cx);
-    window
-        .spawn(cx, async move |cx| {
-            let item = open_task.await?;
-            if let Some(active_editor) = item.downcast::<Editor>() {
-                active_editor
-                    .update_in(cx, |editor, window, cx| {
-                        editor.go_to_singleton_buffer_point(target, window, cx);
-                    })
-                    .ok();
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-}
-
-fn render_code_language(
-    language: Option<&Arc<Language>>,
-    name_fallback: SharedString,
-    cx: &App,
-) -> AnyElement {
-    let icon_path = language.and_then(|language| {
-        language
-            .config()
-            .matcher
-            .path_suffixes
-            .iter()
-            .find_map(|extension| file_icons::FileIcons::get_icon(Path::new(extension), cx))
-            .map(Icon::from_path)
-    });
-
-    let language_label = language
-        .map(|language| language.name().into())
-        .unwrap_or(name_fallback);
-
-    let label_size = rems(0.8125);
-
-    h_flex()
-        .px_1()
-        .gap_1p5()
-        .children(icon_path.map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)))
-        .child(div().text_size(label_size).child(language_label))
-        .into_any_element()
-}
-
-fn open_markdown_link(
-    text: SharedString,
-    workspace: WeakEntity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let Some(workspace) = workspace.upgrade() else {
-        cx.open_url(&text);
-        return;
-    };
-
-    match MentionLink::try_parse(&text, &workspace, cx) {
-        Some(MentionLink::File(path, entry)) => workspace.update(cx, |workspace, cx| {
-            if entry.is_dir() {
-                workspace.project().update(cx, |_, cx| {
-                    cx.emit(project::Event::RevealInProjectPanel(entry.id));
-                })
-            } else {
-                workspace
-                    .open_path(path, None, true, window, cx)
-                    .detach_and_log_err(cx);
-            }
-        }),
-        Some(MentionLink::Symbol(path, symbol_name)) => {
-            let open_task = workspace.update(cx, |workspace, cx| {
-                workspace.open_path(path, None, true, window, cx)
-            });
-            window
-                .spawn(cx, async move |cx| {
-                    let active_editor = open_task
-                        .await?
-                        .downcast::<Editor>()
-                        .context("Item is not an editor")?;
-                    active_editor.update_in(cx, |editor, window, cx| {
-                        let symbol_range = editor
-                            .buffer()
-                            .read(cx)
-                            .snapshot(cx)
-                            .outline(None)
-                            .and_then(|outline| {
-                                outline
-                                    .find_most_similar(&symbol_name)
-                                    .map(|(_, item)| item.range.clone())
-                            })
-                            .context("Could not find matching symbol")?;
-
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| s.select_anchor_ranges([symbol_range.start..symbol_range.start]),
-                        );
-                        anyhow::Ok(())
-                    })
-                })
-                .detach_and_log_err(cx);
-        }
-        Some(MentionLink::Selection(path, line_range)) => {
-            let open_task = workspace.update(cx, |workspace, cx| {
-                workspace.open_path(path, None, true, window, cx)
-            });
-            window
-                .spawn(cx, async move |cx| {
-                    let active_editor = open_task
-                        .await?
-                        .downcast::<Editor>()
-                        .context("Item is not an editor")?;
-                    active_editor.update_in(cx, |editor, window, cx| {
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| {
-                                s.select_ranges([Point::new(line_range.start as u32, 0)
-                                    ..Point::new(line_range.start as u32, 0)])
-                            },
-                        );
-                        anyhow::Ok(())
-                    })
-                })
-                .detach_and_log_err(cx);
-        }
-        Some(MentionLink::Thread(thread_id)) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel
-                        .open_thread_by_id(&thread_id, window, cx)
-                        .detach_and_log_err(cx)
-                });
-            }
-        }),
-        Some(MentionLink::TextThread(path)) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel
-                        .open_saved_prompt_editor(path, window, cx)
-                        .detach_and_log_err(cx);
-                });
-            }
-        }),
-        Some(MentionLink::Fetch(url)) => cx.open_url(&url),
-        Some(MentionLink::Rule(prompt_id)) => window.dispatch_action(
-            Box::new(OpenRulesLibrary {
-                prompt_to_select: Some(prompt_id.0),
-            }),
-            cx,
-        ),
-        None => cx.open_url(&text),
-    }
-}
-
-struct EditingMessageState {
-    editor: Entity<Editor>,
-    context_strip: Entity<ContextStrip>,
-    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    last_estimated_token_count: Option<u64>,
-    _subscriptions: [Subscription; 2],
-    _update_token_count_task: Option<Task<()>>,
-}
-
-impl ActiveThread {
-    pub fn new(
-        thread: Entity<Thread>,
-        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
-        context_store: Entity<ContextStore>,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let subscriptions = vec![
-            cx.observe(&thread, |_, _, cx| cx.notify()),
-            cx.subscribe_in(&thread, window, Self::handle_thread_event),
-            cx.subscribe(&thread_store, Self::handle_rules_loading_error),
-            cx.observe_global::<SettingsStore>(|_, cx| cx.notify()),
-        ];
-
-        let list_state = ListState::new(0, ListAlignment::Bottom, px(2048.));
-
-        let workspace_subscription = workspace.upgrade().map(|workspace| {
-            cx.observe_release(&workspace, |this, _, cx| {
-                this.dismiss_notifications(cx);
-            })
-        });
-
-        let mut this = Self {
-            language_registry,
-            thread_store,
-            text_thread_store,
-            context_store,
-            thread: thread.clone(),
-            workspace,
-            save_thread_task: None,
-            messages: Vec::new(),
-            rendered_messages_by_id: HashMap::default(),
-            rendered_tool_uses: HashMap::default(),
-            expanded_tool_uses: HashMap::default(),
-            expanded_thinking_segments: HashMap::default(),
-            expanded_code_blocks: HashMap::default(),
-            list_state: list_state.clone(),
-            scrollbar_state: ScrollbarState::new(list_state).parent_entity(&cx.entity()),
-            editing_message: None,
-            last_error: None,
-            copied_code_block_ids: HashSet::default(),
-            notifications: Vec::new(),
-            _subscriptions: subscriptions,
-            notification_subscriptions: HashMap::default(),
-            open_feedback_editors: HashMap::default(),
-            _load_edited_message_context_task: None,
-        };
-
-        for message in thread.read(cx).messages().cloned().collect::<Vec<_>>() {
-            let rendered_message = RenderedMessage::from_segments(
-                &message.segments,
-                this.language_registry.clone(),
-                cx,
-            );
-            this.push_rendered_message(message.id, rendered_message);
-
-            for tool_use in thread.read(cx).tool_uses_for_message(message.id, cx) {
-                this.render_tool_use_markdown(
-                    tool_use.id.clone(),
-                    tool_use.ui_text.clone(),
-                    &serde_json::to_string_pretty(&tool_use.input).unwrap_or_default(),
-                    tool_use.status.text(),
-                    cx,
-                );
-            }
-        }
-
-        if let Some(subscription) = workspace_subscription {
-            this._subscriptions.push(subscription);
-        }
-
-        this
-    }
-
-    pub fn thread(&self) -> &Entity<Thread> {
-        &self.thread
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.messages.is_empty()
-    }
-
-    pub fn summary<'a>(&'a self, cx: &'a App) -> &'a ThreadSummary {
-        self.thread.read(cx).summary()
-    }
-
-    pub fn regenerate_summary(&self, cx: &mut App) {
-        self.thread.update(cx, |thread, cx| thread.summarize(cx))
-    }
-
-    pub fn cancel_last_completion(&mut self, window: &mut Window, cx: &mut App) -> bool {
-        self.last_error.take();
-        self.thread.update(cx, |thread, cx| {
-            thread.cancel_last_completion(Some(window.window_handle()), cx)
-        })
-    }
-
-    pub fn last_error(&self) -> Option<ThreadError> {
-        self.last_error.clone()
-    }
-
-    pub fn clear_last_error(&mut self) {
-        self.last_error.take();
-    }
-
-    /// Returns the editing message id and the estimated token count in the content
-    pub fn editing_message_id(&self) -> Option<(MessageId, u64)> {
-        self.editing_message
-            .as_ref()
-            .map(|(id, state)| (*id, state.last_estimated_token_count.unwrap_or(0)))
-    }
-
-    pub fn context_store(&self) -> &Entity<ContextStore> {
-        &self.context_store
-    }
-
-    pub fn thread_store(&self) -> &Entity<ThreadStore> {
-        &self.thread_store
-    }
-
-    pub fn text_thread_store(&self) -> &Entity<TextThreadStore> {
-        &self.text_thread_store
-    }
-
-    fn push_rendered_message(&mut self, id: MessageId, rendered_message: RenderedMessage) {
-        let old_len = self.messages.len();
-        self.messages.push(id);
-        self.list_state.splice(old_len..old_len, 1);
-        self.rendered_messages_by_id.insert(id, rendered_message);
-    }
-
-    fn deleted_message(&mut self, id: &MessageId) {
-        let Some(index) = self.messages.iter().position(|message_id| message_id == id) else {
-            return;
-        };
-        self.messages.remove(index);
-        self.list_state.splice(index..index + 1, 0);
-        self.rendered_messages_by_id.remove(id);
-    }
-
-    fn render_tool_use_markdown(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        tool_label: impl Into<SharedString>,
-        tool_input: &str,
-        tool_output: SharedString,
-        cx: &mut Context<Self>,
-    ) {
-        let rendered = self
-            .rendered_tool_uses
-            .entry(tool_use_id)
-            .or_insert_with(|| RenderedToolUse {
-                label: cx.new(|cx| {
-                    Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
-                }),
-                input: cx.new(|cx| {
-                    Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
-                }),
-                output: cx.new(|cx| {
-                    Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
-                }),
-            });
-
-        rendered.label.update(cx, |this, cx| {
-            this.replace(tool_label, cx);
-        });
-        rendered.input.update(cx, |this, cx| {
-            this.replace(
-                MarkdownCodeBlock {
-                    tag: "json",
-                    text: tool_input,
-                }
-                .to_string(),
-                cx,
-            );
-        });
-        rendered.output.update(cx, |this, cx| {
-            this.replace(tool_output, cx);
-        });
-    }
-
-    fn handle_thread_event(
-        &mut self,
-        _thread: &Entity<Thread>,
-        event: &ThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ThreadEvent::CancelEditing => {
-                if self.editing_message.is_some() {
-                    self.cancel_editing_message(&menu::Cancel, window, cx);
-                }
-            }
-            ThreadEvent::ShowError(error) => {
-                self.last_error = Some(error.clone());
-            }
-            ThreadEvent::NewRequest => {
-                cx.notify();
-            }
-            ThreadEvent::CompletionCanceled => {
-                self.thread.update(cx, |thread, cx| {
-                    thread.project().update(cx, |project, cx| {
-                        project.set_agent_location(None, cx);
-                    })
-                });
-                self.workspace
-                    .update(cx, |workspace, cx| {
-                        if workspace.is_being_followed(CollaboratorId::Agent) {
-                            workspace.unfollow(CollaboratorId::Agent, window, cx);
-                        }
-                    })
-                    .ok();
-                cx.notify();
-            }
-            ThreadEvent::StreamedCompletion
-            | ThreadEvent::SummaryGenerated
-            | ThreadEvent::SummaryChanged => {
-                self.save_thread(cx);
-            }
-            ThreadEvent::Stopped(reason) => {
-                match reason {
-                    Ok(StopReason::EndTurn | StopReason::MaxTokens) => {
-                        let used_tools = self.thread.read(cx).used_tools_since_last_user_message();
-                        self.notify_with_sound(
-                            if used_tools {
-                                "Finished running tools"
-                            } else {
-                                "New message"
-                            },
-                            IconName::ZedAssistant,
-                            window,
-                            cx,
-                        );
-                    }
-                    Ok(StopReason::ToolUse) => {
-                        // Don't notify for intermediate tool use
-                    }
-                    Ok(StopReason::Refusal) => {
-                        let model_name = self
-                            .thread
-                            .read(cx)
-                            .configured_model()
-                            .map(|configured| configured.model.name().0.to_string())
-                            .unwrap_or_else(|| "The model".to_string());
-                        let refusal_message = format!(
-                            "{} refused to respond to this prompt. This can happen when a model believes the prompt violates its content policy or safety guidelines, so rephrasing it can sometimes address the issue.",
-                            model_name
-                        );
-                        self.last_error = Some(ThreadError::Message {
-                            header: SharedString::from("Request Refused"),
-                            message: SharedString::from(refusal_message),
-                        });
-                        self.notify_with_sound(
-                            format!("{} refused to respond", model_name),
-                            IconName::Warning,
-                            window,
-                            cx,
-                        );
-                    }
-                    Err(error) => {
-                        self.notify_with_sound(
-                            "Agent stopped due to an error",
-                            IconName::Warning,
-                            window,
-                            cx,
-                        );
-
-                        let error_message = error
-                            .chain()
-                            .map(|err| err.to_string())
-                            .collect::<Vec<_>>()
-                            .join("\n");
-                        self.last_error = Some(ThreadError::Message {
-                            header: "Error".into(),
-                            message: error_message.into(),
-                        });
-                    }
-                }
-            }
-            ThreadEvent::ToolConfirmationNeeded => {
-                self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
-            }
-            ThreadEvent::ToolUseLimitReached => {
-                self.notify_with_sound(
-                    "Consecutive tool use limit reached.",
-                    IconName::Warning,
-                    window,
-                    cx,
-                );
-            }
-            ThreadEvent::StreamedAssistantText(message_id, text) => {
-                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(message_id) {
-                    rendered_message.append_text(text, cx);
-                }
-            }
-            ThreadEvent::StreamedAssistantThinking(message_id, text) => {
-                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(message_id) {
-                    rendered_message.append_thinking(text, cx);
-                }
-            }
-            ThreadEvent::MessageAdded(message_id) => {
-                self.clear_last_error();
-                if let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
-                    thread.message(*message_id).map(|message| {
-                        RenderedMessage::from_segments(
-                            &message.segments,
-                            self.language_registry.clone(),
-                            cx,
-                        )
-                    })
-                }) {
-                    self.push_rendered_message(*message_id, rendered_message);
-                }
-
-                self.save_thread(cx);
-                cx.notify();
-            }
-            ThreadEvent::MessageEdited(message_id) => {
-                self.clear_last_error();
-                if let Some(index) = self.messages.iter().position(|id| id == message_id)
-                    && let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
-                        thread.message(*message_id).map(|message| {
-                            let mut rendered_message = RenderedMessage {
-                                language_registry: self.language_registry.clone(),
-                                segments: Vec::with_capacity(message.segments.len()),
-                            };
-                            for segment in &message.segments {
-                                rendered_message.push_segment(segment, cx);
-                            }
-                            rendered_message
-                        })
-                    })
-                {
-                    self.list_state.splice(index..index + 1, 1);
-                    self.rendered_messages_by_id
-                        .insert(*message_id, rendered_message);
-                    self.scroll_to_bottom(cx);
-                    self.save_thread(cx);
-                    cx.notify();
-                }
-            }
-            ThreadEvent::MessageDeleted(message_id) => {
-                self.deleted_message(message_id);
-                self.save_thread(cx);
-                cx.notify();
-            }
-            ThreadEvent::UsePendingTools { tool_uses } => {
-                for tool_use in tool_uses {
-                    self.render_tool_use_markdown(
-                        tool_use.id.clone(),
-                        tool_use.ui_text.clone(),
-                        &serde_json::to_string_pretty(&tool_use.input).unwrap_or_default(),
-                        "".into(),
-                        cx,
-                    );
-                }
-            }
-            ThreadEvent::StreamedToolUse {
-                tool_use_id,
-                ui_text,
-                input,
-            } => {
-                self.render_tool_use_markdown(
-                    tool_use_id.clone(),
-                    ui_text.clone(),
-                    &serde_json::to_string_pretty(&input).unwrap_or_default(),
-                    "".into(),
-                    cx,
-                );
-            }
-            ThreadEvent::ToolFinished {
-                pending_tool_use, ..
-            } => {
-                if let Some(tool_use) = pending_tool_use {
-                    self.render_tool_use_markdown(
-                        tool_use.id.clone(),
-                        tool_use.ui_text.clone(),
-                        &serde_json::to_string_pretty(&tool_use.input).unwrap_or_default(),
-                        self.thread
-                            .read(cx)
-                            .output_for_tool(&tool_use.id)
-                            .map(|output| output.clone().into())
-                            .unwrap_or("".into()),
-                        cx,
-                    );
-                }
-            }
-            ThreadEvent::CheckpointChanged => cx.notify(),
-            ThreadEvent::ReceivedTextChunk => {}
-            ThreadEvent::InvalidToolInput {
-                tool_use_id,
-                ui_text,
-                invalid_input_json,
-            } => {
-                self.render_tool_use_markdown(
-                    tool_use_id.clone(),
-                    ui_text,
-                    invalid_input_json,
-                    self.thread
-                        .read(cx)
-                        .output_for_tool(tool_use_id)
-                        .map(|output| output.clone().into())
-                        .unwrap_or("".into()),
-                    cx,
-                );
-            }
-            ThreadEvent::MissingToolUse {
-                tool_use_id,
-                ui_text,
-            } => {
-                self.render_tool_use_markdown(
-                    tool_use_id.clone(),
-                    ui_text,
-                    "",
-                    self.thread
-                        .read(cx)
-                        .output_for_tool(tool_use_id)
-                        .map(|output| output.clone().into())
-                        .unwrap_or("".into()),
-                    cx,
-                );
-            }
-            ThreadEvent::ProfileChanged => {
-                self.save_thread(cx);
-                cx.notify();
-            }
-        }
-    }
-
-    fn handle_rules_loading_error(
-        &mut self,
-        _thread_store: Entity<ThreadStore>,
-        error: &RulesLoadingError,
-        cx: &mut Context<Self>,
-    ) {
-        self.last_error = Some(ThreadError::Message {
-            header: "Error loading rules file".into(),
-            message: error.message.clone(),
-        });
-        cx.notify();
-    }
-
-    fn play_notification_sound(&self, window: &Window, cx: &mut App) {
-        let settings = AgentSettings::get_global(cx);
-        if settings.play_sound_when_agent_done && !window.is_window_active() {
-            Audio::play_sound(Sound::AgentDone, cx);
-        }
-    }
-
-    fn show_notification(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<ActiveThread>,
-    ) {
-        if window.is_window_active() || !self.notifications.is_empty() {
-            return;
-        }
-
-        let title = self.thread.read(cx).summary().unwrap_or("Agent Panel");
-
-        match AgentSettings::get_global(cx).notify_when_agent_waiting {
-            NotifyWhenAgentWaiting::PrimaryScreen => {
-                if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title, window, primary, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::AllScreens => {
-                let caption = caption.into();
-                for screen in cx.displays() {
-                    self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::Never => {
-                // Don't show anything
-            }
-        }
-    }
-
-    fn notify_with_sound(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<ActiveThread>,
-    ) {
-        self.play_notification_sound(window, cx);
-        self.show_notification(caption, icon, window, cx);
-    }
-
-    fn pop_up(
-        &mut self,
-        icon: IconName,
-        caption: SharedString,
-        title: SharedString,
-        window: &mut Window,
-        screen: Rc<dyn PlatformDisplay>,
-        cx: &mut Context<'_, ActiveThread>,
-    ) {
-        let options = AgentNotification::window_options(screen, cx);
-
-        let project_name = self.workspace.upgrade().and_then(|workspace| {
-            workspace
-                .read(cx)
-                .project()
-                .read(cx)
-                .visible_worktrees(cx)
-                .next()
-                .map(|worktree| worktree.read(cx).root_name().to_string())
-        });
-
-        if let Some(screen_window) = cx
-            .open_window(options, |_, cx| {
-                cx.new(|_| {
-                    AgentNotification::new(title.clone(), caption.clone(), icon, project_name)
-                })
-            })
-            .log_err()
-            && let Some(pop_up) = screen_window.entity(cx).log_err()
-        {
-            self.notification_subscriptions
-                .entry(screen_window)
-                .or_insert_with(Vec::new)
-                .push(cx.subscribe_in(&pop_up, window, {
-                    |this, _, event, window, cx| match event {
-                        AgentNotificationEvent::Accepted => {
-                            let handle = window.window_handle();
-                            cx.activate(true);
-
-                            let workspace_handle = this.workspace.clone();
-
-                            // If there are multiple Zed windows, activate the correct one.
-                            cx.defer(move |cx| {
-                                handle
-                                    .update(cx, |_view, window, _cx| {
-                                        window.activate_window();
-
-                                        if let Some(workspace) = workspace_handle.upgrade() {
-                                            workspace.update(_cx, |workspace, cx| {
-                                                workspace.focus_panel::<AgentPanel>(window, cx);
-                                            });
-                                        }
-                                    })
-                                    .log_err();
-                            });
-
-                            this.dismiss_notifications(cx);
-                        }
-                        AgentNotificationEvent::Dismissed => {
-                            this.dismiss_notifications(cx);
-                        }
-                    }
-                }));
-
-            self.notifications.push(screen_window);
-
-            // If the user manually refocuses the original window, dismiss the popup.
-            self.notification_subscriptions
-                .entry(screen_window)
-                .or_insert_with(Vec::new)
-                .push({
-                    let pop_up_weak = pop_up.downgrade();
-
-                    cx.observe_window_activation(window, move |_, window, cx| {
-                        if window.is_window_active()
-                            && let Some(pop_up) = pop_up_weak.upgrade()
-                        {
-                            pop_up.update(cx, |_, cx| {
-                                cx.emit(AgentNotificationEvent::Dismissed);
-                            });
-                        }
-                    })
-                });
-        }
-    }
-
-    /// Spawns a task to save the active thread.
-    ///
-    /// Only one task to save the thread will be in flight at a time.
-    fn save_thread(&mut self, cx: &mut Context<Self>) {
-        let thread = self.thread.clone();
-        self.save_thread_task = Some(cx.spawn(async move |this, cx| {
-            let task = this
-                .update(cx, |this, cx| {
-                    this.thread_store
-                        .update(cx, |thread_store, cx| thread_store.save_thread(&thread, cx))
-                })
-                .ok();
-
-            if let Some(task) = task {
-                task.await.log_err();
-            }
-        }));
-    }
-
-    fn start_editing_message(
-        &mut self,
-        message_id: MessageId,
-        message_text: impl Into<Arc<str>>,
-        message_creases: &[MessageCrease],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let editor = crate::message_editor::create_editor(
-            self.workspace.clone(),
-            self.context_store.downgrade(),
-            self.thread_store.downgrade(),
-            self.text_thread_store.downgrade(),
-            EDIT_PREVIOUS_MESSAGE_MIN_LINES,
-            None,
-            window,
-            cx,
-        );
-        editor.update(cx, |editor, cx| {
-            editor.set_text(message_text, window, cx);
-            insert_message_creases(editor, message_creases, &self.context_store, window, cx);
-            editor.focus_handle(cx).focus(window);
-            editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
-        });
-        let buffer_edited_subscription =
-            cx.subscribe(&editor, |this, _, event: &EditorEvent, cx| {
-                if event == &EditorEvent::BufferEdited {
-                    this.update_editing_message_token_count(true, cx);
-                }
-            });
-
-        let context_picker_menu_handle = PopoverMenuHandle::default();
-        let context_strip = cx.new(|cx| {
-            ContextStrip::new(
-                self.context_store.clone(),
-                self.workspace.clone(),
-                Some(self.thread_store.downgrade()),
-                Some(self.text_thread_store.downgrade()),
-                context_picker_menu_handle.clone(),
-                SuggestContextKind::File,
-                ModelUsageContext::Thread(self.thread.clone()),
-                window,
-                cx,
-            )
-        });
-
-        let context_strip_subscription =
-            cx.subscribe_in(&context_strip, window, Self::handle_context_strip_event);
-
-        self.editing_message = Some((
-            message_id,
-            EditingMessageState {
-                editor: editor.clone(),
-                context_strip,
-                context_picker_menu_handle,
-                last_estimated_token_count: None,
-                _subscriptions: [buffer_edited_subscription, context_strip_subscription],
-                _update_token_count_task: None,
-            },
-        ));
-        self.update_editing_message_token_count(false, cx);
-        cx.notify();
-    }
-
-    fn handle_context_strip_event(
-        &mut self,
-        _context_strip: &Entity<ContextStrip>,
-        event: &ContextStripEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((_, state)) = self.editing_message.as_ref() {
-            match event {
-                ContextStripEvent::PickerDismissed
-                | ContextStripEvent::BlurredEmpty
-                | ContextStripEvent::BlurredDown => {
-                    let editor_focus_handle = state.editor.focus_handle(cx);
-                    window.focus(&editor_focus_handle);
-                }
-                ContextStripEvent::BlurredUp => {}
-            }
-        }
-    }
-
-    fn update_editing_message_token_count(&mut self, debounce: bool, cx: &mut Context<Self>) {
-        let Some((message_id, state)) = self.editing_message.as_mut() else {
-            return;
-        };
-
-        cx.emit(ActiveThreadEvent::EditingMessageTokenCountChanged);
-        state._update_token_count_task.take();
-
-        let Some(configured_model) = self.thread.read(cx).configured_model() else {
-            state.last_estimated_token_count.take();
-            return;
-        };
-
-        let editor = state.editor.clone();
-        let thread = self.thread.clone();
-        let message_id = *message_id;
-
-        state._update_token_count_task = Some(cx.spawn(async move |this, cx| {
-            if debounce {
-                cx.background_executor()
-                    .timer(Duration::from_millis(200))
-                    .await;
-            }
-
-            let token_count = if let Some(task) = cx
-                .update(|cx| {
-                    let Some(message) = thread.read(cx).message(message_id) else {
-                        log::error!("Message that was being edited no longer exists");
-                        return None;
-                    };
-                    let message_text = editor.read(cx).text(cx);
-
-                    if message_text.is_empty() && message.loaded_context.is_empty() {
-                        return None;
-                    }
-
-                    let mut request_message = LanguageModelRequestMessage {
-                        role: language_model::Role::User,
-                        content: Vec::new(),
-                        cache: false,
-                    };
-
-                    message
-                        .loaded_context
-                        .add_to_request_message(&mut request_message);
-
-                    if !message_text.is_empty() {
-                        request_message
-                            .content
-                            .push(MessageContent::Text(message_text));
-                    }
-
-                    let request = language_model::LanguageModelRequest {
-                        thread_id: None,
-                        prompt_id: None,
-                        intent: None,
-                        mode: None,
-                        messages: vec![request_message],
-                        tools: vec![],
-                        tool_choice: None,
-                        stop: vec![],
-                        temperature: AgentSettings::temperature_for_model(
-                            &configured_model.model,
-                            cx,
-                        ),
-                        thinking_allowed: true,
-                    };
-
-                    Some(configured_model.model.count_tokens(request, cx))
-                })
-                .ok()
-                .flatten()
-            {
-                task.await.log_err()
-            } else {
-                Some(0)
-            };
-
-            if let Some(token_count) = token_count {
-                this.update(cx, |this, cx| {
-                    let Some((_message_id, state)) = this.editing_message.as_mut() else {
-                        return;
-                    };
-
-                    state.last_estimated_token_count = Some(token_count);
-                    cx.emit(ActiveThreadEvent::EditingMessageTokenCountChanged);
-                })
-                .ok();
-            };
-        }));
-    }
-
-    fn toggle_context_picker(
-        &mut self,
-        _: &crate::ToggleContextPicker,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((_, state)) = self.editing_message.as_mut() {
-            let handle = state.context_picker_menu_handle.clone();
-            window.defer(cx, move |window, cx| {
-                handle.toggle(window, cx);
-            });
-        }
-    }
-
-    fn remove_all_context(
-        &mut self,
-        _: &crate::RemoveAllContext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_store.update(cx, |store, cx| store.clear(cx));
-        cx.notify();
-    }
-
-    fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((_, state)) = self.editing_message.as_mut() {
-            if state.context_picker_menu_handle.is_deployed() {
-                cx.propagate();
-            } else {
-                state.context_strip.focus_handle(cx).focus(window);
-            }
-        }
-    }
-
-    fn paste(&mut self, _: &Paste, _window: &mut Window, cx: &mut Context<Self>) {
-        attach_pasted_images_as_context(&self.context_store, cx);
-    }
-
-    fn cancel_editing_message(
-        &mut self,
-        _: &menu::Cancel,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editing_message.take();
-        cx.notify();
-
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                    panel.focus_handle(cx).focus(window);
-                }
-            });
-        }
-    }
-
-    fn confirm_editing_message(
-        &mut self,
-        _: &menu::Confirm,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some((message_id, state)) = self.editing_message.take() else {
-            return;
-        };
-
-        let Some(model) = self
-            .thread
-            .update(cx, |thread, cx| thread.get_or_init_configured_model(cx))
-        else {
-            return;
-        };
-
-        let edited_text = state.editor.read(cx).text(cx);
-
-        let creases = state.editor.update(cx, extract_message_creases);
-
-        let new_context = self
-            .context_store
-            .read(cx)
-            .new_context_for_thread(self.thread.read(cx), Some(message_id));
-
-        let project = self.thread.read(cx).project().clone();
-        let prompt_store = self.thread_store.read(cx).prompt_store().clone();
-
-        let git_store = project.read(cx).git_store().clone();
-        let checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
-
-        let load_context_task = context::load_context(new_context, &project, &prompt_store, cx);
-        self._load_edited_message_context_task =
-            Some(cx.spawn_in(window, async move |this, cx| {
-                let (context, checkpoint) =
-                    futures::future::join(load_context_task, checkpoint).await;
-                let _ = this
-                    .update_in(cx, |this, window, cx| {
-                        this.thread.update(cx, |thread, cx| {
-                            thread.edit_message(
-                                message_id,
-                                Role::User,
-                                vec![MessageSegment::Text(edited_text)],
-                                creases,
-                                Some(context.loaded_context),
-                                checkpoint.ok(),
-                                cx,
-                            );
-                            for message_id in this.messages_after(message_id) {
-                                thread.delete_message(*message_id, cx);
-                            }
-                        });
-
-                        this.thread.update(cx, |thread, cx| {
-                            thread.advance_prompt_id();
-                            thread.cancel_last_completion(Some(window.window_handle()), cx);
-                            thread.send_to_model(
-                                model.model,
-                                CompletionIntent::UserPrompt,
-                                Some(window.window_handle()),
-                                cx,
-                            );
-                        });
-                        this._load_edited_message_context_task = None;
-                        cx.notify();
-                    })
-                    .log_err();
-            }));
-
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                    panel.focus_handle(cx).focus(window);
-                }
-            });
-        }
-    }
-
-    fn messages_after(&self, message_id: MessageId) -> &[MessageId] {
-        self.messages
-            .iter()
-            .position(|id| *id == message_id)
-            .map(|index| &self.messages[index + 1..])
-            .unwrap_or(&[])
-    }
-
-    fn handle_cancel_click(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.cancel_editing_message(&menu::Cancel, window, cx);
-    }
-
-    fn handle_regenerate_click(
-        &mut self,
-        _: &ClickEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.confirm_editing_message(&menu::Confirm, window, cx);
-    }
-
-    fn handle_feedback_click(
-        &mut self,
-        message_id: MessageId,
-        feedback: ThreadFeedback,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let report = self.thread.update(cx, |thread, cx| {
-            thread.report_message_feedback(message_id, feedback, cx)
-        });
-
-        cx.spawn(async move |this, cx| {
-            report.await?;
-            this.update(cx, |_this, cx| cx.notify())
-        })
-        .detach_and_log_err(cx);
-
-        match feedback {
-            ThreadFeedback::Positive => {
-                self.open_feedback_editors.remove(&message_id);
-            }
-            ThreadFeedback::Negative => {
-                self.handle_show_feedback_comments(message_id, window, cx);
-            }
-        }
-    }
-
-    fn handle_show_feedback_comments(
-        &mut self,
-        message_id: MessageId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = cx.new(|cx| {
-            let empty_string = String::new();
-            MultiBuffer::singleton(cx.new(|cx| Buffer::local(empty_string, cx)), cx)
-        });
-
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::new(
-                editor::EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: Some(4),
-                },
-                buffer,
-                None,
-                window,
-                cx,
-            );
-            editor.set_placeholder_text(
-                "What went wrong? Share your feedback so we can improve.",
-                window,
-                cx,
-            );
-            editor
-        });
-
-        editor.read(cx).focus_handle(cx).focus(window);
-        self.open_feedback_editors.insert(message_id, editor);
-        cx.notify();
-    }
-
-    fn submit_feedback_message(&mut self, message_id: MessageId, cx: &mut Context<Self>) {
-        let Some(editor) = self.open_feedback_editors.get(&message_id) else {
-            return;
-        };
-
-        let report_task = self.thread.update(cx, |thread, cx| {
-            thread.report_message_feedback(message_id, ThreadFeedback::Negative, cx)
-        });
-
-        let comments = editor.read(cx).text(cx);
-        if !comments.is_empty() {
-            let thread_id = self.thread.read(cx).id().clone();
-            let comments_value = String::from(comments.as_str());
-
-            let message_content = self
-                .thread
-                .read(cx)
-                .message(message_id)
-                .map(|msg| msg.to_message_content())
-                .unwrap_or_default();
-
-            telemetry::event!(
-                "Assistant Thread Feedback Comments",
-                thread_id,
-                message_id = message_id.as_usize(),
-                message_content,
-                comments = comments_value
-            );
-
-            self.open_feedback_editors.remove(&message_id);
-
-            cx.spawn(async move |this, cx| {
-                report_task.await?;
-                this.update(cx, |_this, cx| cx.notify())
-            })
-            .detach_and_log_err(cx);
-        }
-    }
-
-    fn render_edit_message_editor(
-        &self,
-        state: &EditingMessageState,
-        _window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let font_size = TextSize::Small
-            .rems(cx)
-            .to_pixels(settings.agent_font_size(cx));
-        let line_height = font_size * 1.75;
-
-        let colors = cx.theme().colors();
-
-        let text_style = TextStyle {
-            color: colors.text,
-            font_family: settings.buffer_font.family.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_size: font_size.into(),
-            line_height: line_height.into(),
-            ..Default::default()
-        };
-
-        v_flex()
-            .key_context("EditMessageEditor")
-            .on_action(cx.listener(Self::toggle_context_picker))
-            .on_action(cx.listener(Self::remove_all_context))
-            .on_action(cx.listener(Self::move_up))
-            .on_action(cx.listener(Self::cancel_editing_message))
-            .on_action(cx.listener(Self::confirm_editing_message))
-            .capture_action(cx.listener(Self::paste))
-            .min_h_6()
-            .w_full()
-            .flex_grow()
-            .gap_2()
-            .child(state.context_strip.clone())
-            .child(div().pt(px(-3.)).px_neg_0p5().child(EditorElement::new(
-                &state.editor,
-                EditorStyle {
-                    background: colors.editor_background,
-                    local_player: cx.theme().players().local(),
-                    text: text_style,
-                    syntax: cx.theme().syntax().clone(),
-                    ..Default::default()
-                },
-            )))
-    }
-
-    fn render_message(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let message_id = self.messages[ix];
-        let workspace = self.workspace.clone();
-        let thread = self.thread.read(cx);
-
-        let is_first_message = ix == 0;
-        let is_last_message = ix == self.messages.len() - 1;
-
-        let Some(message) = thread.message(message_id) else {
-            return Empty.into_any();
-        };
-
-        let is_generating = thread.is_generating();
-        let is_generating_stale = thread.is_generation_stale().unwrap_or(false);
-
-        let loading_dots = (is_generating && is_last_message).then(|| {
-            h_flex()
-                .h_8()
-                .my_3()
-                .mx_5()
-                .when(is_generating_stale || message.is_hidden, |this| {
-                    this.child(LoadingLabel::new("").size(LabelSize::Small))
-                })
-        });
-
-        if message.is_hidden {
-            return div().children(loading_dots).into_any();
-        }
-
-        let Some(rendered_message) = self.rendered_messages_by_id.get(&message_id) else {
-            return Empty.into_any();
-        };
-
-        // Get all the data we need from thread before we start using it in closures
-        let checkpoint = thread.checkpoint_for_message(message_id);
-        let configured_model = thread.configured_model().map(|m| m.model);
-        let added_context = thread
-            .context_for_message(message_id)
-            .map(|context| AddedContext::new_attached(context, configured_model.as_ref(), cx))
-            .collect::<Vec<_>>();
-
-        let tool_uses = thread.tool_uses_for_message(message_id, cx);
-        let has_tool_uses = !tool_uses.is_empty();
-
-        let editing_message_state = self
-            .editing_message
-            .as_ref()
-            .filter(|(id, _)| *id == message_id)
-            .map(|(_, state)| state);
-
-        let (editor_bg_color, panel_bg) = {
-            let colors = cx.theme().colors();
-            (colors.editor_background, colors.panel_background)
-        };
-
-        let open_as_markdown = IconButton::new(("open-as-markdown", ix), IconName::FileMarkdown)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click({
-                let thread = self.thread.clone();
-                let workspace = self.workspace.clone();
-                move |_, window, cx| {
-                    if let Some(workspace) = workspace.upgrade() {
-                        open_active_thread_as_markdown(thread.clone(), workspace, window, cx)
-                            .detach_and_log_err(cx);
-                    }
-                }
-            });
-
-        let scroll_to_top = IconButton::new(("scroll_to_top", ix), IconName::ArrowUp)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Scroll To Top"))
-            .on_click(cx.listener(move |this, _, _, cx| {
-                this.scroll_to_top(cx);
-            }));
-
-        let show_feedback = thread.is_turn_end(ix);
-        let feedback_container = h_flex()
-            .group("feedback_container")
-            .mt_1()
-            .py_2()
-            .px(RESPONSE_PADDING_X)
-            .mr_1()
-            .gap_1()
-            .opacity(0.4)
-            .hover(|style| style.opacity(1.))
-            .gap_1p5()
-            .flex_wrap()
-            .justify_end();
-        let feedback_items = match self.thread.read(cx).message_feedback(message_id) {
-            Some(feedback) => feedback_container
-                .child(
-                    div().visible_on_hover("feedback_container").child(
-                        Label::new(match feedback {
-                            ThreadFeedback::Positive => "Thanks for your feedback!",
-                            ThreadFeedback::Negative => {
-                                "We appreciate your feedback and will use it to improve."
-                            }
-                        })
-                    .color(Color::Muted)
-                    .size(LabelSize::XSmall)
-                    .truncate())
-                )
-                .child(
-                    h_flex()
-                        .child(
-                            IconButton::new(("feedback-thumbs-up", ix), IconName::ThumbsUp)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .icon_color(match feedback {
-                                    ThreadFeedback::Positive => Color::Accent,
-                                    ThreadFeedback::Negative => Color::Ignored,
-                                })
-                                .tooltip(Tooltip::text("Helpful Response"))
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.handle_feedback_click(
-                                        message_id,
-                                        ThreadFeedback::Positive,
-                                        window,
-                                        cx,
-                                    );
-                                })),
-                        )
-                        .child(
-                            IconButton::new(("feedback-thumbs-down", ix), IconName::ThumbsDown)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .icon_color(match feedback {
-                                    ThreadFeedback::Positive => Color::Ignored,
-                                    ThreadFeedback::Negative => Color::Accent,
-                                })
-                                .tooltip(Tooltip::text("Not Helpful"))
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.handle_feedback_click(
-                                        message_id,
-                                        ThreadFeedback::Negative,
-                                        window,
-                                        cx,
-                                    );
-                                })),
-                        )
-                        .child(open_as_markdown),
-                )
-                .into_any_element(),
-            None if AgentSettings::get_global(cx).enable_feedback =>
-                feedback_container
-                .child(
-                    div().visible_on_hover("feedback_container").child(
-                        Label::new(
-                            "Rating the thread sends all of your current conversation to the Zed team.",
-                        )
-                        .color(Color::Muted)
-                    .size(LabelSize::XSmall)
-                    .truncate())
-                )
-                .child(
-                    h_flex()
-                        .child(
-                            IconButton::new(("feedback-thumbs-up", ix), IconName::ThumbsUp)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Ignored)
-                                .tooltip(Tooltip::text("Helpful Response"))
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.handle_feedback_click(
-                                        message_id,
-                                        ThreadFeedback::Positive,
-                                        window,
-                                        cx,
-                                    );
-                                })),
-                        )
-                        .child(
-                            IconButton::new(("feedback-thumbs-down", ix), IconName::ThumbsDown)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Ignored)
-                                .tooltip(Tooltip::text("Not Helpful"))
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.handle_feedback_click(
-                                        message_id,
-                                        ThreadFeedback::Negative,
-                                        window,
-                                        cx,
-                                    );
-                                })),
-                        )
-                        .child(open_as_markdown)
-                        .child(scroll_to_top),
-                )
-                .into_any_element(),
-            None => feedback_container
-                .child(h_flex()
-                    .child(open_as_markdown))
-                    .child(scroll_to_top)
-                .into_any_element(),
-        };
-
-        let message_is_empty = message.should_display_content();
-        let has_content = !message_is_empty || !added_context.is_empty();
-
-        let message_content = has_content.then(|| {
-            if let Some(state) = editing_message_state.as_ref() {
-                self.render_edit_message_editor(state, window, cx)
-                    .into_any_element()
-            } else {
-                v_flex()
-                    .w_full()
-                    .gap_1()
-                    .when(!added_context.is_empty(), |parent| {
-                        parent.child(h_flex().flex_wrap().gap_1().children(
-                            added_context.into_iter().map(|added_context| {
-                                let context = added_context.handle.clone();
-                                ContextPill::added(added_context, false, false, None).on_click(
-                                    Rc::new(cx.listener({
-                                        let workspace = workspace.clone();
-                                        move |_, _, window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                open_context(&context, workspace, window, cx);
-                                                cx.notify();
-                                            }
-                                        }
-                                    })),
-                                )
-                            }),
-                        ))
-                    })
-                    .when(!message_is_empty, |parent| {
-                        parent.child(div().pt_0p5().min_h_6().child(self.render_message_content(
-                            message_id,
-                            rendered_message,
-                            has_tool_uses,
-                            workspace.clone(),
-                            window,
-                            cx,
-                        )))
-                    })
-                    .into_any_element()
-            }
-        });
-
-        let styled_message = if message.ui_only {
-            self.render_ui_notification(message_content, ix, cx)
-        } else {
-            match message.role {
-                Role::User => {
-                    let colors = cx.theme().colors();
-                    v_flex()
-                        .id(("message-container", ix))
-                        .pt_2()
-                        .pl_2()
-                        .pr_2p5()
-                        .pb_4()
-                        .child(
-                            v_flex()
-                                .id(("user-message", ix))
-                                .bg(editor_bg_color)
-                                .rounded_lg()
-                                .shadow_md()
-                                .border_1()
-                                .border_color(colors.border)
-                                .hover(|hover| hover.border_color(colors.text_accent.opacity(0.5)))
-                                .child(
-                                    v_flex()
-                                        .p_2p5()
-                                        .gap_1()
-                                        .children(message_content)
-                                        .when_some(editing_message_state, |this, state| {
-                                            let focus_handle = state.editor.focus_handle(cx);
-
-                                            this.child(
-                                                h_flex()
-                                                    .w_full()
-                                                    .gap_1()
-                                                    .justify_between()
-                                                    .flex_wrap()
-                                                    .child(
-                                                        h_flex()
-                                                            .gap_1p5()
-                                                            .child(
-                                                                div()
-                                                                    .opacity(0.8)
-                                                                    .child(
-                                                                        Icon::new(IconName::Warning)
-                                                                            .size(IconSize::Indicator)
-                                                                            .color(Color::Warning)
-                                                                    ),
-                                                            )
-                                                            .child(
-                                                                Label::new("Editing will restart the thread from this point.")
-                                                                    .color(Color::Muted)
-                                                                    .size(LabelSize::XSmall),
-                                                            ),
-                                                    )
-                                                    .child(
-                                                        h_flex()
-                                                            .gap_0p5()
-                                                            .child(
-                                                                IconButton::new(
-                                                                    "cancel-edit-message",
-                                                                    IconName::Close,
-                                                                )
-                                                                .shape(ui::IconButtonShape::Square)
-                                                                .icon_color(Color::Error)
-                                                                .icon_size(IconSize::Small)
-                                                                .tooltip({
-                                                                    let focus_handle = focus_handle.clone();
-                                                                    move |window, cx| {
-                                                                        Tooltip::for_action_in(
-                                                                            "Cancel Edit",
-                                                                            &menu::Cancel,
-                                                                            &focus_handle,
-                                                                            window,
-                                                                            cx,
-                                                                        )
-                                                                    }
-                                                                })
-                                                                .on_click(cx.listener(Self::handle_cancel_click)),
-                                                            )
-                                                            .child(
-                                                                IconButton::new(
-                                                                    "confirm-edit-message",
-                                                                    IconName::Return,
-                                                                )
-                                                                .disabled(state.editor.read(cx).is_empty(cx))
-                                                                .shape(ui::IconButtonShape::Square)
-                                                                .icon_color(Color::Muted)
-                                                                .icon_size(IconSize::Small)
-                                                                .tooltip({
-                                                                    move |window, cx| {
-                                                                        Tooltip::for_action_in(
-                                                                            "Regenerate",
-                                                                            &menu::Confirm,
-                                                                            &focus_handle,
-                                                                            window,
-                                                                            cx,
-                                                                        )
-                                                                    }
-                                                                })
-                                                                .on_click(
-                                                                    cx.listener(Self::handle_regenerate_click),
-                                                                ),
-                                                            ),
-                                                    )
-                                            )
-                                        }),
-                                )
-                                .on_click(cx.listener({
-                                    let message_creases = message.creases.clone();
-                                    move |this, _, window, cx| {
-                                        if let Some(message_text) =
-                                            this.thread.read(cx).message(message_id).and_then(|message| {
-                                                message.segments.first().and_then(|segment| {
-                                                    match segment {
-                                                        MessageSegment::Text(message_text) => {
-                                                            Some(Into::<Arc<str>>::into(message_text.as_str()))
-                                                        }
-                                                        _ => {
-                                                            None
-                                                        }
-                                                    }
-                                                })
-                                            })
-                                        {
-                                            this.start_editing_message(
-                                                message_id,
-                                                message_text,
-                                                &message_creases,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                    }
-                                })),
-                        )
-                }
-                Role::Assistant => v_flex()
-                    .id(("message-container", ix))
-                    .px(RESPONSE_PADDING_X)
-                    .gap_2()
-                    .children(message_content)
-                    .when(has_tool_uses, |parent| {
-                        parent.children(tool_uses.into_iter().map(|tool_use| {
-                            self.render_tool_use(tool_use, window, workspace.clone(), cx)
-                        }))
-                    }),
-                Role::System => {
-                    let colors = cx.theme().colors();
-                    div().id(("message-container", ix)).py_1().px_2().child(
-                        v_flex()
-                            .bg(colors.editor_background)
-                            .rounded_sm()
-                            .child(div().p_4().children(message_content)),
-                    )
-                }
-            }
-        };
-
-        let after_editing_message = self
-            .editing_message
-            .as_ref()
-            .is_some_and(|(editing_message_id, _)| message_id > *editing_message_id);
-
-        let backdrop = div()
-            .id(("backdrop", ix))
-            .size_full()
-            .absolute()
-            .inset_0()
-            .bg(panel_bg)
-            .opacity(0.8)
-            .block_mouse_except_scroll()
-            .on_click(cx.listener(Self::handle_cancel_click));
-
-        v_flex()
-            .w_full()
-            .map(|parent| {
-                if let Some(checkpoint) = checkpoint.filter(|_| !is_generating) {
-                    let mut is_pending = false;
-                    let mut error = None;
-                    if let Some(last_restore_checkpoint) =
-                        self.thread.read(cx).last_restore_checkpoint()
-                        && last_restore_checkpoint.message_id() == message_id
-                    {
-                        match last_restore_checkpoint {
-                            LastRestoreCheckpoint::Pending { .. } => is_pending = true,
-                            LastRestoreCheckpoint::Error { error: err, .. } => {
-                                error = Some(err.clone());
-                            }
-                        }
-                    }
-
-                    let restore_checkpoint_button =
-                        Button::new(("restore-checkpoint", ix), "Restore Checkpoint")
-                            .icon(if error.is_some() {
-                                IconName::XCircle
-                            } else {
-                                IconName::Undo
-                            })
-                            .icon_size(IconSize::XSmall)
-                            .icon_position(IconPosition::Start)
-                            .icon_color(if error.is_some() {
-                                Some(Color::Error)
-                            } else {
-                                None
-                            })
-                            .label_size(LabelSize::XSmall)
-                            .disabled(is_pending)
-                            .on_click(cx.listener(move |this, _, _window, cx| {
-                                this.thread.update(cx, |thread, cx| {
-                                    thread
-                                        .restore_checkpoint(checkpoint.clone(), cx)
-                                        .detach_and_log_err(cx);
-                                });
-                            }));
-
-                    let restore_checkpoint_button = if is_pending {
-                        restore_checkpoint_button
-                            .with_animation(
-                                ("pulsating-restore-checkpoint-button", ix),
-                                Animation::new(Duration::from_secs(2))
-                                    .repeat()
-                                    .with_easing(pulsating_between(0.6, 1.)),
-                                |label, delta| label.alpha(delta),
-                            )
-                            .into_any_element()
-                    } else if let Some(error) = error {
-                        restore_checkpoint_button
-                            .tooltip(Tooltip::text(error))
-                            .into_any_element()
-                    } else {
-                        restore_checkpoint_button.into_any_element()
-                    };
-
-                    parent.child(
-                        h_flex()
-                            .pt_2p5()
-                            .px_2p5()
-                            .w_full()
-                            .gap_1()
-                            .child(ui::Divider::horizontal())
-                            .child(restore_checkpoint_button)
-                            .child(ui::Divider::horizontal()),
-                    )
-                } else {
-                    parent
-                }
-            })
-            .when(is_first_message, |parent| {
-                parent.child(self.render_rules_item(cx))
-            })
-            .child(styled_message)
-            .children(loading_dots)
-            .when(show_feedback, move |parent| {
-                parent.child(feedback_items).when_some(
-                    self.open_feedback_editors.get(&message_id),
-                    move |parent, feedback_editor| {
-                        let focus_handle = feedback_editor.focus_handle(cx);
-                        parent.child(
-                            v_flex()
-                                .key_context("AgentFeedbackMessageEditor")
-                                .on_action(cx.listener(move |this, _: &menu::Cancel, _, cx| {
-                                    this.open_feedback_editors.remove(&message_id);
-                                    cx.notify();
-                                }))
-                                .on_action(cx.listener(move |this, _: &menu::Confirm, _, cx| {
-                                    this.submit_feedback_message(message_id, cx);
-                                    cx.notify();
-                                }))
-                                .mb_2()
-                                .mx_4()
-                                .p_2()
-                                .rounded_md()
-                                .border_1()
-                                .border_color(cx.theme().colors().border)
-                                .bg(cx.theme().colors().editor_background)
-                                .child(feedback_editor.clone())
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .justify_end()
-                                        .child(
-                                            Button::new("dismiss-feedback-message", "Cancel")
-                                                .label_size(LabelSize::Small)
-                                                .key_binding(
-                                                    KeyBinding::for_action_in(
-                                                        &menu::Cancel,
-                                                        &focus_handle,
-                                                        window,
-                                                        cx,
-                                                    )
-                                                    .map(|kb| kb.size(rems_from_px(10.))),
-                                                )
-                                                .on_click(cx.listener(
-                                                    move |this, _, _window, cx| {
-                                                        this.open_feedback_editors
-                                                            .remove(&message_id);
-                                                        cx.notify();
-                                                    },
-                                                )),
-                                        )
-                                        .child(
-                                            Button::new(
-                                                "submit-feedback-message",
-                                                "Share Feedback",
-                                            )
-                                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                            .label_size(LabelSize::Small)
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &menu::Confirm,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(rems_from_px(10.))),
-                                            )
-                                            .on_click(
-                                                cx.listener(move |this, _, _window, cx| {
-                                                    this.submit_feedback_message(message_id, cx);
-                                                    cx.notify()
-                                                }),
-                                            ),
-                                        ),
-                                ),
-                        )
-                    },
-                )
-            })
-            .when(after_editing_message, |parent| {
-                // Backdrop to dim out the whole thread below the editing user message
-                parent.relative().child(backdrop)
-            })
-            .into_any()
-    }
-
-    fn render_message_content(
-        &self,
-        message_id: MessageId,
-        rendered_message: &RenderedMessage,
-        has_tool_uses: bool,
-        workspace: WeakEntity<Workspace>,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let is_last_message = self.messages.last() == Some(&message_id);
-        let is_generating = self.thread.read(cx).is_generating();
-        let pending_thinking_segment_index = if is_generating && is_last_message && !has_tool_uses {
-            rendered_message
-                .segments
-                .iter()
-                .enumerate()
-                .next_back()
-                .filter(|(_, segment)| matches!(segment, RenderedMessageSegment::Thinking { .. }))
-                .map(|(index, _)| index)
-        } else {
-            None
-        };
-
-        let message_role = self
-            .thread
-            .read(cx)
-            .message(message_id)
-            .map(|m| m.role)
-            .unwrap_or(Role::User);
-
-        let is_assistant_message = message_role == Role::Assistant;
-        let is_user_message = message_role == Role::User;
-
-        v_flex()
-            .text_ui(cx)
-            .gap_2()
-            .when(is_user_message, |this| this.text_xs())
-            .children(
-                rendered_message.segments.iter().enumerate().map(
-                    |(index, segment)| match segment {
-                        RenderedMessageSegment::Thinking {
-                            content,
-                            scroll_handle,
-                        } => self
-                            .render_message_thinking_segment(
-                                message_id,
-                                index,
-                                content.clone(),
-                                scroll_handle,
-                                Some(index) == pending_thinking_segment_index,
-                                window,
-                                cx,
-                            )
-                            .into_any_element(),
-                        RenderedMessageSegment::Text(markdown) => {
-                            let markdown_element = MarkdownElement::new(
-                                markdown.clone(),
-                                if is_user_message {
-                                    let mut style = default_markdown_style(window, cx);
-                                    let mut text_style = window.text_style();
-                                    let theme_settings = ThemeSettings::get_global(cx);
-
-                                    let buffer_font = theme_settings.buffer_font.family.clone();
-                                    let buffer_font_size = TextSize::Small.rems(cx);
-
-                                    text_style.refine(&TextStyleRefinement {
-                                        font_family: Some(buffer_font),
-                                        font_size: Some(buffer_font_size.into()),
-                                        ..Default::default()
-                                    });
-
-                                    style.base_text_style = text_style;
-                                    style
-                                } else {
-                                    default_markdown_style(window, cx)
-                                },
-                            );
-
-                            let markdown_element = if is_assistant_message {
-                                markdown_element.code_block_renderer(
-                                    markdown::CodeBlockRenderer::Custom {
-                                        render: Arc::new({
-                                            let workspace = workspace.clone();
-                                            let active_thread = cx.entity();
-                                            move |kind,
-                                                  parsed_markdown,
-                                                  range,
-                                                  metadata,
-                                                  window,
-                                                  cx| {
-                                                render_markdown_code_block(
-                                                    message_id,
-                                                    range.start,
-                                                    kind,
-                                                    parsed_markdown,
-                                                    metadata,
-                                                    active_thread.clone(),
-                                                    workspace.clone(),
-                                                    window,
-                                                    cx,
-                                                )
-                                            }
-                                        }),
-                                        transform: Some(Arc::new({
-                                            let active_thread = cx.entity();
-
-                                            move |element, range, _, _, cx| {
-                                                let is_expanded = active_thread
-                                                    .read(cx)
-                                                    .is_codeblock_expanded(message_id, range.start);
-
-                                                if is_expanded {
-                                                    return element;
-                                                }
-
-                                                element
-                                            }
-                                        })),
-                                    },
-                                )
-                            } else {
-                                markdown_element.code_block_renderer(
-                                    markdown::CodeBlockRenderer::Default {
-                                        copy_button: false,
-                                        copy_button_on_hover: false,
-                                        border: true,
-                                    },
-                                )
-                            };
-
-                            div()
-                                .child(markdown_element.on_url_click({
-                                    let workspace = self.workspace.clone();
-                                    move |text, window, cx| {
-                                        open_markdown_link(text, workspace.clone(), window, cx);
-                                    }
-                                }))
-                                .into_any_element()
-                        }
-                    },
-                ),
-            )
-    }
-
-    fn tool_card_border_color(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme().colors().border.opacity(0.5)
-    }
-
-    fn tool_card_header_bg(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme()
-            .colors()
-            .element_background
-            .blend(cx.theme().colors().editor_foreground.opacity(0.025))
-    }
-
-    fn render_ui_notification(
-        &self,
-        message_content: impl IntoIterator<Item = impl IntoElement>,
-        ix: usize,
-        cx: &mut Context<Self>,
-    ) -> Stateful<Div> {
-        let message = div()
-            .flex_1()
-            .min_w_0()
-            .text_size(TextSize::XSmall.rems(cx))
-            .text_color(cx.theme().colors().text_muted)
-            .children(message_content);
-
-        div()
-            .id(("message-container", ix))
-            .py_1()
-            .px_2p5()
-            .child(Banner::new().severity(Severity::Warning).child(message))
-    }
-
-    fn render_message_thinking_segment(
-        &self,
-        message_id: MessageId,
-        ix: usize,
-        markdown: Entity<Markdown>,
-        scroll_handle: &ScrollHandle,
-        pending: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let is_open = self
-            .expanded_thinking_segments
-            .get(&(message_id, ix))
-            .copied()
-            .unwrap_or_default();
-
-        let editor_bg = cx.theme().colors().panel_background;
-
-        div().map(|this| {
-            if pending {
-                this.v_flex()
-                    .mt_neg_2()
-                    .mb_1p5()
-                    .child(
-                        h_flex()
-                            .group("disclosure-header")
-                            .justify_between()
-                            .child(
-                                h_flex()
-                                    .gap_1p5()
-                                    .child(
-                                        Icon::new(IconName::ToolThink)
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(LoadingLabel::new("Thinking").size(LabelSize::Small)),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .child(
-                                        div().visible_on_hover("disclosure-header").child(
-                                            Disclosure::new("thinking-disclosure", is_open)
-                                                .opened_icon(IconName::ChevronUp)
-                                                .closed_icon(IconName::ChevronDown)
-                                                .on_click(cx.listener({
-                                                    move |this, _event, _window, _cx| {
-                                                        let is_open = this
-                                                            .expanded_thinking_segments
-                                                            .entry((message_id, ix))
-                                                            .or_insert(false);
-
-                                                        *is_open = !*is_open;
-                                                    }
-                                                })),
-                                        ),
-                                    )
-                                    .child({
-                                        Icon::new(IconName::ArrowCircle)
-                                            .color(Color::Accent)
-                                            .size(IconSize::Small)
-                                            .with_rotate_animation(2)
-                                    }),
-                            ),
-                    )
-                    .when(!is_open, |this| {
-                        let gradient_overlay = div()
-                            .rounded_b_lg()
-                            .h_full()
-                            .absolute()
-                            .w_full()
-                            .bottom_0()
-                            .left_0()
-                            .bg(linear_gradient(
-                                180.,
-                                linear_color_stop(editor_bg, 1.),
-                                linear_color_stop(editor_bg.opacity(0.2), 0.),
-                            ));
-
-                        this.child(
-                            div()
-                                .relative()
-                                .bg(editor_bg)
-                                .rounded_b_lg()
-                                .mt_2()
-                                .pl_4()
-                                .child(
-                                    div()
-                                        .id(("thinking-content", ix))
-                                        .max_h_20()
-                                        .track_scroll(scroll_handle)
-                                        .text_ui_sm(cx)
-                                        .overflow_hidden()
-                                        .child(
-                                            MarkdownElement::new(
-                                                markdown.clone(),
-                                                default_markdown_style(window, cx),
-                                            )
-                                            .on_url_click({
-                                                let workspace = self.workspace.clone();
-                                                move |text, window, cx| {
-                                                    open_markdown_link(
-                                                        text,
-                                                        workspace.clone(),
-                                                        window,
-                                                        cx,
-                                                    );
-                                                }
-                                            }),
-                                        ),
-                                )
-                                .child(gradient_overlay),
-                        )
-                    })
-                    .when(is_open, |this| {
-                        this.child(
-                            div()
-                                .id(("thinking-content", ix))
-                                .h_full()
-                                .bg(editor_bg)
-                                .text_ui_sm(cx)
-                                .child(
-                                    MarkdownElement::new(
-                                        markdown.clone(),
-                                        default_markdown_style(window, cx),
-                                    )
-                                    .on_url_click({
-                                        let workspace = self.workspace.clone();
-                                        move |text, window, cx| {
-                                            open_markdown_link(text, workspace.clone(), window, cx);
-                                        }
-                                    }),
-                                ),
-                        )
-                    })
-            } else {
-                this.v_flex()
-                    .mt_neg_2()
-                    .child(
-                        h_flex()
-                            .group("disclosure-header")
-                            .pr_1()
-                            .justify_between()
-                            .opacity(0.8)
-                            .hover(|style| style.opacity(1.))
-                            .child(
-                                h_flex()
-                                    .gap_1p5()
-                                    .child(
-                                        Icon::new(IconName::ToolThink)
-                                            .size(IconSize::XSmall)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(Label::new("Thought Process").size(LabelSize::Small)),
-                            )
-                            .child(
-                                div().visible_on_hover("disclosure-header").child(
-                                    Disclosure::new("thinking-disclosure", is_open)
-                                        .opened_icon(IconName::ChevronUp)
-                                        .closed_icon(IconName::ChevronDown)
-                                        .on_click(cx.listener({
-                                            move |this, _event, _window, _cx| {
-                                                let is_open = this
-                                                    .expanded_thinking_segments
-                                                    .entry((message_id, ix))
-                                                    .or_insert(false);
-
-                                                *is_open = !*is_open;
-                                            }
-                                        })),
-                                ),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .id(("thinking-content", ix))
-                            .relative()
-                            .mt_1p5()
-                            .ml_1p5()
-                            .pl_2p5()
-                            .border_l_1()
-                            .border_color(cx.theme().colors().border_variant)
-                            .text_ui_sm(cx)
-                            .when(is_open, |this| {
-                                this.child(
-                                    MarkdownElement::new(
-                                        markdown.clone(),
-                                        default_markdown_style(window, cx),
-                                    )
-                                    .on_url_click({
-                                        let workspace = self.workspace.clone();
-                                        move |text, window, cx| {
-                                            open_markdown_link(text, workspace.clone(), window, cx);
-                                        }
-                                    }),
-                                )
-                            }),
-                    )
-            }
-        })
-    }
-
-    fn render_tool_use(
-        &self,
-        tool_use: ToolUse,
-        window: &mut Window,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        if let Some(card) = self.thread.read(cx).card_for_tool(&tool_use.id) {
-            return card.render(&tool_use.status, window, workspace, cx);
-        }
-
-        let is_open = self
-            .expanded_tool_uses
-            .get(&tool_use.id)
-            .copied()
-            .unwrap_or_default();
-
-        let is_status_finished = matches!(&tool_use.status, ToolUseStatus::Finished(_));
-
-        let fs = self
-            .workspace
-            .upgrade()
-            .map(|workspace| workspace.read(cx).app_state().fs.clone());
-        let needs_confirmation = matches!(&tool_use.status, ToolUseStatus::NeedsConfirmation);
-        let needs_confirmation_tools = tool_use.needs_confirmation;
-
-        let status_icons = div().child(match &tool_use.status {
-            ToolUseStatus::NeedsConfirmation => {
-                let icon = Icon::new(IconName::Warning)
-                    .color(Color::Warning)
-                    .size(IconSize::Small);
-                icon.into_any_element()
-            }
-            ToolUseStatus::Pending
-            | ToolUseStatus::InputStillStreaming
-            | ToolUseStatus::Running => Icon::new(IconName::ArrowCircle)
-                .color(Color::Accent)
-                .size(IconSize::Small)
-                .with_rotate_animation(2)
-                .into_any_element(),
-            ToolUseStatus::Finished(_) => div().w_0().into_any_element(),
-            ToolUseStatus::Error(_) => {
-                let icon = Icon::new(IconName::Close)
-                    .color(Color::Error)
-                    .size(IconSize::Small);
-                icon.into_any_element()
-            }
-        });
-
-        let rendered_tool_use = self.rendered_tool_uses.get(&tool_use.id).cloned();
-        let results_content_container = || v_flex().p_2().gap_0p5();
-
-        let results_content = v_flex()
-            .gap_1()
-            .child(
-                results_content_container()
-                    .child(
-                        Label::new("Input")
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .child(
-                        div()
-                            .w_full()
-                            .text_ui_sm(cx)
-                            .children(rendered_tool_use.as_ref().map(|rendered| {
-                                MarkdownElement::new(
-                                    rendered.input.clone(),
-                                    tool_use_markdown_style(window, cx),
-                                )
-                                .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                                    copy_button: false,
-                                    copy_button_on_hover: false,
-                                    border: false,
-                                })
-                                .on_url_click({
-                                    let workspace = self.workspace.clone();
-                                    move |text, window, cx| {
-                                        open_markdown_link(text, workspace.clone(), window, cx);
-                                    }
-                                })
-                            })),
-                    ),
-            )
-            .map(|container| match tool_use.status {
-                ToolUseStatus::Finished(_) => container.child(
-                    results_content_container()
-                        .border_t_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .child(
-                            Label::new("Result")
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .buffer_font(cx),
-                        )
-                        .child(div().w_full().text_ui_sm(cx).children(
-                            rendered_tool_use.as_ref().map(|rendered| {
-                                MarkdownElement::new(
-                                    rendered.output.clone(),
-                                    tool_use_markdown_style(window, cx),
-                                )
-                                .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                                    copy_button: false,
-                                    copy_button_on_hover: false,
-                                    border: false,
-                                })
-                                .on_url_click({
-                                    let workspace = self.workspace.clone();
-                                    move |text, window, cx| {
-                                        open_markdown_link(text, workspace.clone(), window, cx);
-                                    }
-                                })
-                                .into_any_element()
-                            }),
-                        )),
-                ),
-                ToolUseStatus::InputStillStreaming | ToolUseStatus::Running => container.child(
-                    results_content_container()
-                        .border_t_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Icon::new(IconName::ArrowCircle)
-                                        .size(IconSize::Small)
-                                        .color(Color::Accent)
-                                        .with_rotate_animation(2),
-                                )
-                                .child(
-                                    Label::new("Running…")
-                                        .size(LabelSize::XSmall)
-                                        .color(Color::Muted)
-                                        .buffer_font(cx),
-                                ),
-                        ),
-                ),
-                ToolUseStatus::Error(_) => container.child(
-                    results_content_container()
-                        .border_t_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .child(
-                            Label::new("Error")
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .buffer_font(cx),
-                        )
-                        .child(
-                            div()
-                                .text_ui_sm(cx)
-                                .children(rendered_tool_use.as_ref().map(|rendered| {
-                                    MarkdownElement::new(
-                                        rendered.output.clone(),
-                                        tool_use_markdown_style(window, cx),
-                                    )
-                                    .on_url_click({
-                                        let workspace = self.workspace.clone();
-                                        move |text, window, cx| {
-                                            open_markdown_link(text, workspace.clone(), window, cx);
-                                        }
-                                    })
-                                    .into_any_element()
-                                })),
-                        ),
-                ),
-                ToolUseStatus::Pending => container,
-                ToolUseStatus::NeedsConfirmation => container.child(
-                    results_content_container()
-                        .border_t_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .child(
-                            Label::new("Asking Permission")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                                .buffer_font(cx),
-                        ),
-                ),
-            });
-
-        let gradient_overlay = |color: Hsla| {
-            div()
-                .h_full()
-                .absolute()
-                .w_12()
-                .bottom_0()
-                .map(|element| {
-                    if is_status_finished {
-                        element.right_6()
-                    } else {
-                        element.right(px(44.))
-                    }
-                })
-                .bg(linear_gradient(
-                    90.,
-                    linear_color_stop(color, 1.),
-                    linear_color_stop(color.opacity(0.2), 0.),
-                ))
-        };
-
-        v_flex().gap_1().mb_2().map(|element| {
-            if !needs_confirmation_tools {
-                element.child(
-                    v_flex()
-                        .child(
-                            h_flex()
-                                .group("disclosure-header")
-                                .relative()
-                                .gap_1p5()
-                                .justify_between()
-                                .opacity(0.8)
-                                .hover(|style| style.opacity(1.))
-                                .when(!is_status_finished, |this| this.pr_2())
-                                .child(
-                                    h_flex()
-                                        .id("tool-label-container")
-                                        .gap_1p5()
-                                        .max_w_full()
-                                        .overflow_x_scroll()
-                                        .child(
-                                            Icon::new(tool_use.icon)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(
-                                            h_flex().pr_8().text_size(rems(0.8125)).children(
-                                                rendered_tool_use.map(|rendered| MarkdownElement::new(rendered.label, tool_use_markdown_style(window, cx)).on_url_click({let workspace = self.workspace.clone(); move |text, window, cx| {
-                                                    open_markdown_link(text, workspace.clone(), window, cx);
-                                                }}))
-                                            ),
-                                        ),
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .child(
-                                            div().visible_on_hover("disclosure-header").child(
-                                                Disclosure::new("tool-use-disclosure", is_open)
-                                                    .opened_icon(IconName::ChevronUp)
-                                                    .closed_icon(IconName::ChevronDown)
-                                                    .on_click(cx.listener({
-                                                        let tool_use_id = tool_use.id.clone();
-                                                        move |this, _event, _window, _cx| {
-                                                            let is_open = this
-                                                                .expanded_tool_uses
-                                                                .entry(tool_use_id.clone())
-                                                                .or_insert(false);
-
-                                                            *is_open = !*is_open;
-                                                        }
-                                                    })),
-                                            ),
-                                        )
-                                        .child(status_icons),
-                                )
-                                .child(gradient_overlay(cx.theme().colors().panel_background)),
-                        )
-                        .map(|parent| {
-                            if !is_open {
-                                return parent;
-                            }
-
-                            parent.child(
-                                v_flex()
-                                    .mt_1()
-                                    .border_1()
-                                    .border_color(self.tool_card_border_color(cx))
-                                    .bg(cx.theme().colors().editor_background)
-                                    .rounded_lg()
-                                    .child(results_content),
-                            )
-                        }),
-                )
-            } else {
-                v_flex()
-                    .mb_2()
-                    .rounded_lg()
-                    .border_1()
-                    .border_color(self.tool_card_border_color(cx))
-                    .overflow_hidden()
-                    .child(
-                        h_flex()
-                            .group("disclosure-header")
-                            .relative()
-                            .justify_between()
-                            .py_1()
-                            .map(|element| {
-                                if is_status_finished {
-                                    element.pl_2().pr_0p5()
-                                } else {
-                                    element.px_2()
-                                }
-                            })
-                            .bg(self.tool_card_header_bg(cx))
-                            .map(|element| {
-                                if is_open {
-                                    element.border_b_1().rounded_t_md()
-                                } else if needs_confirmation {
-                                    element.rounded_t_md()
-                                } else {
-                                    element.rounded_md()
-                                }
-                            })
-                            .border_color(self.tool_card_border_color(cx))
-                            .child(
-                                h_flex()
-                                    .id("tool-label-container")
-                                    .gap_1p5()
-                                    .max_w_full()
-                                    .overflow_x_scroll()
-                                    .child(
-                                        Icon::new(tool_use.icon)
-                                            .size(IconSize::XSmall)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(
-                                        h_flex().pr_8().text_ui_sm(cx).children(
-                                            rendered_tool_use.map(|rendered| MarkdownElement::new(rendered.label, tool_use_markdown_style(window, cx)).on_url_click({let workspace = self.workspace.clone(); move |text, window, cx| {
-                                                open_markdown_link(text, workspace.clone(), window, cx);
-                                            }}))
-                                        ),
-                                    ),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .child(
-                                        div().visible_on_hover("disclosure-header").child(
-                                            Disclosure::new("tool-use-disclosure", is_open)
-                                                .opened_icon(IconName::ChevronUp)
-                                                .closed_icon(IconName::ChevronDown)
-                                                .on_click(cx.listener({
-                                                    let tool_use_id = tool_use.id.clone();
-                                                    move |this, _event, _window, _cx| {
-                                                        let is_open = this
-                                                            .expanded_tool_uses
-                                                            .entry(tool_use_id.clone())
-                                                            .or_insert(false);
-
-                                                        *is_open = !*is_open;
-                                                    }
-                                                })),
-                                        ),
-                                    )
-                                    .child(status_icons),
-                            )
-                            .child(gradient_overlay(self.tool_card_header_bg(cx))),
-                    )
-                    .map(|parent| {
-                        if !is_open {
-                            return parent;
-                        }
-
-                        parent.child(
-                            v_flex()
-                                .bg(cx.theme().colors().editor_background)
-                                .map(|element| {
-                                    if  needs_confirmation {
-                                        element.rounded_none()
-                                    } else {
-                                        element.rounded_b_lg()
-                                    }
-                                })
-                                .child(results_content),
-                        )
-                    })
-                    .when(needs_confirmation, |this| {
-                        this.child(
-                            h_flex()
-                                .py_1()
-                                .pl_2()
-                                .pr_1()
-                                .gap_1()
-                                .justify_between()
-                                .flex_wrap()
-                                .bg(cx.theme().colors().editor_background)
-                                .border_t_1()
-                                .border_color(self.tool_card_border_color(cx))
-                                .rounded_b_lg()
-                                .child(
-                                    div()
-                                        .min_w(rems_from_px(145.))
-                                        .child(LoadingLabel::new("Waiting for Confirmation").size(LabelSize::Small)
-                                    )
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_0p5()
-                                        .child({
-                                            let tool_id = tool_use.id.clone();
-                                            Button::new(
-                                                "always-allow-tool-action",
-                                                "Always Allow",
-                                            )
-                                            .label_size(LabelSize::Small)
-                                            .icon(IconName::CheckDouble)
-                                            .icon_position(IconPosition::Start)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Success)
-                                            .tooltip(move |window, cx|  {
-                                                Tooltip::with_meta(
-                                                    "Never ask for permission",
-                                                    None,
-                                                    "Restore the original behavior in your Agent Panel settings",
-                                                    window,
-                                                    cx,
-                                                )
-                                            })
-                                            .on_click(cx.listener(
-                                                move |this, event, window, cx| {
-                                                    if let Some(fs) = fs.clone() {
-                                                        update_settings_file::<AgentSettings>(
-                                                            fs.clone(),
-                                                            cx,
-                                                            |settings, _| {
-                                                                settings.set_always_allow_tool_actions(true);
-                                                            },
-                                                        );
-                                                    }
-                                                    this.handle_allow_tool(
-                                                        tool_id.clone(),
-                                                        event,
-                                                        window,
-                                                        cx,
-                                                    )
-                                                },
-                                            ))
-                                        })
-                                        .child({
-                                            let tool_id = tool_use.id.clone();
-                                            Button::new("allow-tool-action", "Allow")
-                                                .label_size(LabelSize::Small)
-                                                .icon(IconName::Check)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Success)
-                                                .on_click(cx.listener(
-                                                    move |this, event, window, cx| {
-                                                        this.handle_allow_tool(
-                                                            tool_id.clone(),
-                                                            event,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                    },
-                                                ))
-                                        })
-                                        .child({
-                                            let tool_id = tool_use.id.clone();
-                                            let tool_name: Arc<str> = tool_use.name.into();
-                                            Button::new("deny-tool", "Deny")
-                                                .label_size(LabelSize::Small)
-                                                .icon(IconName::Close)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Error)
-                                                .on_click(cx.listener(
-                                                    move |this, event, window, cx| {
-                                                        this.handle_deny_tool(
-                                                            tool_id.clone(),
-                                                            tool_name.clone(),
-                                                            event,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                    },
-                                                ))
-                                        }),
-                                ),
-                        )
-                    })
-            }
-        }).into_any_element()
-    }
-
-    fn render_rules_item(&self, cx: &Context<Self>) -> AnyElement {
-        let project_context = self.thread.read(cx).project_context();
-        let project_context = project_context.borrow();
-        let Some(project_context) = project_context.as_ref() else {
-            return div().into_any();
-        };
-
-        let user_rules_text = if project_context.user_rules.is_empty() {
-            None
-        } else if project_context.user_rules.len() == 1 {
-            let user_rules = &project_context.user_rules[0];
-
-            match user_rules.title.as_ref() {
-                Some(title) => Some(format!("Using \"{title}\" user rule")),
-                None => Some("Using user rule".into()),
-            }
-        } else {
-            Some(format!(
-                "Using {} user rules",
-                project_context.user_rules.len()
-            ))
-        };
-
-        let first_user_rules_id = project_context
-            .user_rules
-            .first()
-            .map(|user_rules| user_rules.uuid.0);
-
-        let rules_files = project_context
-            .worktrees
-            .iter()
-            .filter_map(|worktree| worktree.rules_file.as_ref())
-            .collect::<Vec<_>>();
-
-        let rules_file_text = match rules_files.as_slice() {
-            &[] => None,
-            &[rules_file] => Some(format!(
-                "Using project {:?} file",
-                rules_file.path_in_worktree
-            )),
-            rules_files => Some(format!("Using {} project rules files", rules_files.len())),
-        };
-
-        if user_rules_text.is_none() && rules_file_text.is_none() {
-            return div().into_any();
-        }
-
-        v_flex()
-            .pt_2()
-            .px_2p5()
-            .gap_1()
-            .when_some(user_rules_text, |parent, user_rules_text| {
-                parent.child(
-                    h_flex()
-                        .w_full()
-                        .child(
-                            Icon::new(RULES_ICON)
-                                .size(IconSize::XSmall)
-                                .color(Color::Disabled),
-                        )
-                        .child(
-                            Label::new(user_rules_text)
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .truncate()
-                                .buffer_font(cx)
-                                .ml_1p5()
-                                .mr_0p5(),
-                        )
-                        .child(
-                            IconButton::new("open-prompt-library", IconName::ArrowUpRight)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Ignored)
-                                // TODO: Figure out a way to pass focus handle here so we can display the `OpenRulesLibrary`  keybinding
-                                .tooltip(Tooltip::text("View User Rules"))
-                                .on_click(move |_event, window, cx| {
-                                    window.dispatch_action(
-                                        Box::new(OpenRulesLibrary {
-                                            prompt_to_select: first_user_rules_id,
-                                        }),
-                                        cx,
-                                    )
-                                }),
-                        ),
-                )
-            })
-            .when_some(rules_file_text, |parent, rules_file_text| {
-                parent.child(
-                    h_flex()
-                        .w_full()
-                        .child(
-                            Icon::new(IconName::File)
-                                .size(IconSize::XSmall)
-                                .color(Color::Disabled),
-                        )
-                        .child(
-                            Label::new(rules_file_text)
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .buffer_font(cx)
-                                .ml_1p5()
-                                .mr_0p5(),
-                        )
-                        .child(
-                            IconButton::new("open-rule", IconName::ArrowUpRight)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Ignored)
-                                .on_click(cx.listener(Self::handle_open_rules))
-                                .tooltip(Tooltip::text("View Rules")),
-                        ),
-                )
-            })
-            .into_any()
-    }
-
-    fn handle_allow_tool(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        _: &ClickEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(PendingToolUseStatus::NeedsConfirmation(c)) = self
-            .thread
-            .read(cx)
-            .pending_tool(&tool_use_id)
-            .map(|tool_use| tool_use.status.clone())
-        {
-            self.thread.update(cx, |thread, cx| {
-                if let Some(configured) = thread.get_or_init_configured_model(cx) {
-                    thread.run_tool(
-                        c.tool_use_id.clone(),
-                        c.ui_text.clone(),
-                        c.input.clone(),
-                        c.request.clone(),
-                        c.tool.clone(),
-                        configured.model,
-                        Some(window.window_handle()),
-                        cx,
-                    );
-                }
-            });
-        }
-    }
-
-    fn handle_deny_tool(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        tool_name: Arc<str>,
-        _: &ClickEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let window_handle = window.window_handle();
-        self.thread.update(cx, |thread, cx| {
-            thread.deny_tool_use(tool_use_id, tool_name, Some(window_handle), cx);
-        });
-    }
-
-    fn handle_open_rules(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        let project_context = self.thread.read(cx).project_context();
-        let project_context = project_context.borrow();
-        let Some(project_context) = project_context.as_ref() else {
-            return;
-        };
-
-        let project_entry_ids = project_context
-            .worktrees
-            .iter()
-            .flat_map(|worktree| worktree.rules_file.as_ref())
-            .map(|rules_file| ProjectEntryId::from_usize(rules_file.project_entry_id))
-            .collect::<Vec<_>>();
-
-        self.workspace
-            .update(cx, move |workspace, cx| {
-                // TODO: Open a multibuffer instead? In some cases this doesn't make the set of rules
-                // files clear. For example, if rules file 1 is already open but rules file 2 is not,
-                // this would open and focus rules file 2 in a tab that is not next to rules file 1.
-                let project = workspace.project().read(cx);
-                let project_paths = project_entry_ids
-                    .into_iter()
-                    .flat_map(|entry_id| project.path_for_entry(entry_id, cx))
-                    .collect::<Vec<_>>();
-                for project_path in project_paths {
-                    workspace
-                        .open_path(project_path, None, true, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            })
-            .ok();
-    }
-
-    fn dismiss_notifications(&mut self, cx: &mut Context<ActiveThread>) {
-        for window in self.notifications.drain(..) {
-            window
-                .update(cx, |_, window, _| {
-                    window.remove_window();
-                })
-                .ok();
-
-            self.notification_subscriptions.remove(&window);
-        }
-    }
-
-    fn render_vertical_scrollbar(&self, cx: &mut Context<Self>) -> Stateful<Div> {
-        div()
-            .occlude()
-            .id("active-thread-scrollbar")
-            .on_mouse_move(cx.listener(|_, _, _, cx| {
-                cx.notify();
-                cx.stop_propagation()
-            }))
-            .on_hover(|_, _, cx| {
-                cx.stop_propagation();
-            })
-            .on_any_mouse_down(|_, _, cx| {
-                cx.stop_propagation();
-            })
-            .on_mouse_up(
-                MouseButton::Left,
-                cx.listener(|_, _, _, cx| {
-                    cx.stop_propagation();
-                }),
-            )
-            .on_scroll_wheel(cx.listener(|_, _, _, cx| {
-                cx.notify();
-            }))
-            .h_full()
-            .absolute()
-            .right_1()
-            .top_1()
-            .bottom_0()
-            .w(px(12.))
-            .cursor_default()
-            .children(Scrollbar::vertical(self.scrollbar_state.clone()).map(|s| s.auto_hide(cx)))
-    }
-
-    pub fn is_codeblock_expanded(&self, message_id: MessageId, ix: usize) -> bool {
-        self.expanded_code_blocks
-            .get(&(message_id, ix))
-            .copied()
-            .unwrap_or(true)
-    }
-
-    pub fn toggle_codeblock_expanded(&mut self, message_id: MessageId, ix: usize) {
-        let is_expanded = self
-            .expanded_code_blocks
-            .entry((message_id, ix))
-            .or_insert(true);
-        *is_expanded = !*is_expanded;
-    }
-
-    pub fn scroll_to_top(&mut self, cx: &mut Context<Self>) {
-        self.list_state.scroll_to(ListOffset::default());
-        cx.notify();
-    }
-
-    pub fn scroll_to_bottom(&mut self, cx: &mut Context<Self>) {
-        self.list_state.reset(self.messages.len());
-        cx.notify();
-    }
-}
-
-pub enum ActiveThreadEvent {
-    EditingMessageTokenCountChanged,
-}
-
-impl EventEmitter<ActiveThreadEvent> for ActiveThread {}
-
-impl Render for ActiveThread {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .relative()
-            .bg(cx.theme().colors().panel_background)
-            .child(list(self.list_state.clone(), cx.processor(Self::render_message)).flex_grow())
-            .child(self.render_vertical_scrollbar(cx))
-    }
-}
-
-pub(crate) fn open_active_thread_as_markdown(
-    thread: Entity<Thread>,
-    workspace: Entity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<anyhow::Result<()>> {
-    let markdown_language_task = workspace
-        .read(cx)
-        .app_state()
-        .languages
-        .language_for_name("Markdown");
-
-    window.spawn(cx, async move |cx| {
-        let markdown_language = markdown_language_task.await?;
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let thread = thread.read(cx);
-            let markdown = thread.to_markdown(cx)?;
-            let thread_summary = thread.summary().or_default().to_string();
-
-            let project = workspace.project().clone();
-
-            if !project.read(cx).is_local() {
-                anyhow::bail!("failed to open active thread as markdown in remote project");
-            }
-
-            let buffer = project.update(cx, |project, cx| {
-                project.create_local_buffer(&markdown, Some(markdown_language), true, cx)
-            });
-            let buffer =
-                cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone()));
-
-            workspace.add_item_to_active_pane(
-                Box::new(cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_multibuffer(buffer, Some(project.clone()), window, cx);
-                    editor.set_breadcrumb_header(thread_summary);
-                    editor
-                })),
-                None,
-                true,
-                window,
-                cx,
-            );
-
-            anyhow::Ok(())
-        })??;
-        anyhow::Ok(())
-    })
-}
-
-pub(crate) fn open_context(
-    context: &AgentContextHandle,
-    workspace: Entity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    match context {
-        AgentContextHandle::File(file_context) => {
-            if let Some(project_path) = file_context.project_path(cx) {
-                workspace.update(cx, |workspace, cx| {
-                    workspace
-                        .open_path(project_path, None, true, window, cx)
-                        .detach_and_log_err(cx);
-                });
-            }
-        }
-
-        AgentContextHandle::Directory(directory_context) => {
-            let entry_id = directory_context.entry_id;
-            workspace.update(cx, |workspace, cx| {
-                workspace.project().update(cx, |_project, cx| {
-                    cx.emit(project::Event::RevealInProjectPanel(entry_id));
-                })
-            })
-        }
-
-        AgentContextHandle::Symbol(symbol_context) => {
-            let buffer = symbol_context.buffer.read(cx);
-            if let Some(project_path) = buffer.project_path(cx) {
-                let snapshot = buffer.snapshot();
-                let target_position = symbol_context.range.start.to_point(&snapshot);
-                open_editor_at_position(project_path, target_position, &workspace, window, cx)
-                    .detach();
-            }
-        }
-
-        AgentContextHandle::Selection(selection_context) => {
-            let buffer = selection_context.buffer.read(cx);
-            if let Some(project_path) = buffer.project_path(cx) {
-                let snapshot = buffer.snapshot();
-                let target_position = selection_context.range.start.to_point(&snapshot);
-
-                open_editor_at_position(project_path, target_position, &workspace, window, cx)
-                    .detach();
-            }
-        }
-
-        AgentContextHandle::FetchedUrl(fetched_url_context) => {
-            cx.open_url(&fetched_url_context.url);
-        }
-
-        AgentContextHandle::Thread(thread_context) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                let thread = thread_context.thread.clone();
-                window.defer(cx, move |window, cx| {
-                    panel.update(cx, |panel, cx| {
-                        panel.open_thread(thread, window, cx);
-                    });
-                });
-            }
-        }),
-
-        AgentContextHandle::TextThread(text_thread_context) => {
-            workspace.update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                    let context = text_thread_context.context.clone();
-                    window.defer(cx, move |window, cx| {
-                        panel.update(cx, |panel, cx| {
-                            panel.open_prompt_editor(context, window, cx)
-                        });
-                    });
-                }
-            })
-        }
-
-        AgentContextHandle::Rules(rules_context) => window.dispatch_action(
-            Box::new(OpenRulesLibrary {
-                prompt_to_select: Some(rules_context.prompt_id.0),
-            }),
-            cx,
-        ),
-
-        AgentContextHandle::Image(_) => {}
-    }
-}
-
-pub(crate) fn attach_pasted_images_as_context(
-    context_store: &Entity<ContextStore>,
-    cx: &mut App,
-) -> bool {
-    let images = cx
-        .read_from_clipboard()
-        .map(|item| {
-            item.into_entries()
-                .filter_map(|entry| {
-                    if let ClipboardEntry::Image(image) = entry {
-                        Some(image)
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>()
-        })
-        .unwrap_or_default();
-
-    if images.is_empty() {
-        return false;
-    }
-    cx.stop_propagation();
-
-    context_store.update(cx, |store, cx| {
-        for image in images {
-            store.add_image_instance(Arc::new(image), cx);
-        }
-    });
-    true
-}
-
-fn open_editor_at_position(
-    project_path: project::ProjectPath,
-    target_position: Point,
-    workspace: &Entity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<()> {
-    let open_task = workspace.update(cx, |workspace, cx| {
-        workspace.open_path(project_path, None, true, window, cx)
-    });
-    window.spawn(cx, async move |cx| {
-        if let Some(active_editor) = open_task
-            .await
-            .log_err()
-            .and_then(|item| item.downcast::<Editor>())
-        {
-            active_editor
-                .downgrade()
-                .update_in(cx, |editor, window, cx| {
-                    editor.go_to_singleton_buffer_point(target_position, window, cx);
-                })
-                .log_err();
-        }
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use agent::{MessageSegment, context::ContextLoadResult, thread_store};
-    use assistant_tool::{ToolRegistry, ToolWorkingSet};
-    use editor::EditorSettings;
-    use fs::FakeFs;
-    use gpui::{AppContext, TestAppContext, VisualTestContext};
-    use language_model::{
-        ConfiguredModel, LanguageModel, LanguageModelRegistry,
-        fake_provider::{FakeLanguageModel, FakeLanguageModelProvider},
-    };
-    use project::Project;
-    use prompt_store::PromptBuilder;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-    use workspace::CollaboratorId;
-
-    #[gpui::test]
-    async fn test_agent_is_unfollowed_after_cancelling_completion(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(
-            cx,
-            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
-        )
-        .await;
-
-        let (cx, _active_thread, workspace, thread, model) =
-            setup_test_environment(cx, project.clone()).await;
-
-        // Insert user message without any context (empty context vector)
-        thread.update(cx, |thread, cx| {
-            thread.insert_user_message(
-                "What is the best way to learn Rust?",
-                ContextLoadResult::default(),
-                None,
-                vec![],
-                cx,
-            );
-        });
-
-        // Stream response to user message
-        thread.update(cx, |thread, cx| {
-            let intent = CompletionIntent::UserPrompt;
-            let request = thread.to_completion_request(model.clone(), intent, cx);
-            thread.stream_completion(request, model, intent, cx.active_window(), cx)
-        });
-        // Follow the agent
-        cx.update(|window, cx| {
-            workspace.update(cx, |workspace, cx| {
-                workspace.follow(CollaboratorId::Agent, window, cx);
-            })
-        });
-        assert!(cx.read(|cx| workspace.read(cx).is_being_followed(CollaboratorId::Agent)));
-
-        // Cancel the current completion
-        thread.update(cx, |thread, cx| {
-            thread.cancel_last_completion(cx.active_window(), cx)
-        });
-
-        cx.executor().run_until_parked();
-
-        // No longer following the agent
-        assert!(!cx.read(|cx| workspace.read(cx).is_being_followed(CollaboratorId::Agent)));
-    }
-
-    #[gpui::test]
-    async fn test_reinserting_creases_for_edited_message(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(cx, json!({})).await;
-
-        let (cx, active_thread, _, thread, model) =
-            setup_test_environment(cx, project.clone()).await;
-        cx.update(|_, cx| {
-            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                registry.set_default_model(
-                    Some(ConfiguredModel {
-                        provider: Arc::new(FakeLanguageModelProvider::default()),
-                        model,
-                    }),
-                    cx,
-                );
-            });
-        });
-
-        let creases = vec![MessageCrease {
-            range: 14..22,
-            icon_path: "icon".into(),
-            label: "foo.txt".into(),
-            context: None,
-        }];
-
-        let message = thread.update(cx, |thread, cx| {
-            let message_id = thread.insert_user_message(
-                "Tell me about @foo.txt",
-                ContextLoadResult::default(),
-                None,
-                creases,
-                cx,
-            );
-            thread.message(message_id).cloned().unwrap()
-        });
-
-        active_thread.update_in(cx, |active_thread, window, cx| {
-            if let Some(message_text) = message.segments.first().and_then(MessageSegment::text) {
-                active_thread.start_editing_message(
-                    message.id,
-                    message_text,
-                    message.creases.as_slice(),
-                    window,
-                    cx,
-                );
-            }
-            let editor = active_thread
-                .editing_message
-                .as_ref()
-                .unwrap()
-                .1
-                .editor
-                .clone();
-            editor.update(cx, |editor, cx| editor.edit([(0..13, "modified")], cx));
-            active_thread.confirm_editing_message(&Default::default(), window, cx);
-        });
-        cx.run_until_parked();
-
-        let message = thread.update(cx, |thread, _| thread.message(message.id).cloned().unwrap());
-        active_thread.update_in(cx, |active_thread, window, cx| {
-            if let Some(message_text) = message.segments.first().and_then(MessageSegment::text) {
-                active_thread.start_editing_message(
-                    message.id,
-                    message_text,
-                    message.creases.as_slice(),
-                    window,
-                    cx,
-                );
-            }
-            let editor = active_thread
-                .editing_message
-                .as_ref()
-                .unwrap()
-                .1
-                .editor
-                .clone();
-            let text = editor.update(cx, |editor, cx| editor.text(cx));
-            assert_eq!(text, "modified @foo.txt");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_editing_message_cancels_previous_completion(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(cx, json!({})).await;
-
-        let (cx, active_thread, _, thread, model) =
-            setup_test_environment(cx, project.clone()).await;
-
-        cx.update(|_, cx| {
-            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                registry.set_default_model(
-                    Some(ConfiguredModel {
-                        provider: Arc::new(FakeLanguageModelProvider::default()),
-                        model: model.clone(),
-                    }),
-                    cx,
-                );
-            });
-        });
-
-        // Track thread events to verify cancellation
-        let cancellation_events = Arc::new(std::sync::Mutex::new(Vec::new()));
-        let new_request_events = Arc::new(std::sync::Mutex::new(Vec::new()));
-
-        let _subscription = cx.update(|_, cx| {
-            let cancellation_events = cancellation_events.clone();
-            let new_request_events = new_request_events.clone();
-            cx.subscribe(
-                &thread,
-                move |_thread, event: &ThreadEvent, _cx| match event {
-                    ThreadEvent::CompletionCanceled => {
-                        cancellation_events.lock().unwrap().push(());
-                    }
-                    ThreadEvent::NewRequest => {
-                        new_request_events.lock().unwrap().push(());
-                    }
-                    _ => {}
-                },
-            )
-        });
-
-        // Insert a user message and start streaming a response
-        let message = thread.update(cx, |thread, cx| {
-            let message_id = thread.insert_user_message(
-                "Hello, how are you?",
-                ContextLoadResult::default(),
-                None,
-                vec![],
-                cx,
-            );
-            thread.advance_prompt_id();
-            thread.send_to_model(
-                model.clone(),
-                CompletionIntent::UserPrompt,
-                cx.active_window(),
-                cx,
-            );
-            thread.message(message_id).cloned().unwrap()
-        });
-
-        cx.run_until_parked();
-
-        // Verify that a completion is in progress
-        assert!(cx.read(|cx| thread.read(cx).is_generating()));
-        assert_eq!(new_request_events.lock().unwrap().len(), 1);
-
-        // Edit the message while the completion is still running
-        active_thread.update_in(cx, |active_thread, window, cx| {
-            if let Some(message_text) = message.segments.first().and_then(MessageSegment::text) {
-                active_thread.start_editing_message(
-                    message.id,
-                    message_text,
-                    message.creases.as_slice(),
-                    window,
-                    cx,
-                );
-            }
-            let editor = active_thread
-                .editing_message
-                .as_ref()
-                .unwrap()
-                .1
-                .editor
-                .clone();
-            editor.update(cx, |editor, cx| {
-                editor.set_text("What is the weather like?", window, cx);
-            });
-            active_thread.confirm_editing_message(&Default::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Verify that the previous completion was canceled
-        assert_eq!(cancellation_events.lock().unwrap().len(), 1);
-
-        // Verify that a new request was started after cancellation
-        assert_eq!(new_request_events.lock().unwrap().len(), 2);
-
-        // Verify that the edited message contains the new text
-        let edited_message =
-            thread.update(cx, |thread, _| thread.message(message.id).cloned().unwrap());
-        match &edited_message.segments[0] {
-            MessageSegment::Text(text) => {
-                assert_eq!(text, "What is the weather like?");
-            }
-            _ => panic!("Expected text segment"),
-        }
-    }
-
-    fn init_test_settings(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-            AgentSettings::register(cx);
-            prompt_store::init(cx);
-            thread_store::init(cx);
-            workspace::init_settings(cx);
-            language_model::init_settings(cx);
-            ThemeSettings::register(cx);
-            EditorSettings::register(cx);
-            ToolRegistry::default_global(cx);
-        });
-    }
-
-    // Helper to create a test project with test files
-    async fn create_test_project(
-        cx: &mut TestAppContext,
-        files: serde_json::Value,
-    ) -> Entity<Project> {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/test"), files).await;
-        Project::test(fs, [path!("/test").as_ref()], cx).await
-    }
-
-    async fn setup_test_environment(
-        cx: &mut TestAppContext,
-        project: Entity<Project>,
-    ) -> (
-        &mut VisualTestContext,
-        Entity<ActiveThread>,
-        Entity<Workspace>,
-        Entity<Thread>,
-        Arc<dyn LanguageModel>,
-    ) {
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let thread_store = cx
-            .update(|_, cx| {
-                ThreadStore::load(
-                    project.clone(),
-                    cx.new(|_| ToolWorkingSet::default()),
-                    None,
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let text_thread_store = cx
-            .update(|_, cx| {
-                TextThreadStore::new(
-                    project.clone(),
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    Default::default(),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
-        let context_store =
-            cx.new(|_cx| ContextStore::new(project.downgrade(), Some(thread_store.downgrade())));
-
-        let model = FakeLanguageModel::default();
-        let model: Arc<dyn LanguageModel> = Arc::new(model);
-
-        let language_registry = LanguageRegistry::new(cx.executor());
-        let language_registry = Arc::new(language_registry);
-
-        let active_thread = cx.update(|window, cx| {
-            cx.new(|cx| {
-                ActiveThread::new(
-                    thread.clone(),
-                    thread_store.clone(),
-                    text_thread_store,
-                    context_store.clone(),
-                    language_registry.clone(),
-                    workspace.downgrade(),
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        (cx, active_thread, workspace, thread, model)
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
index 3bd5ed40d2..cb9aabab92 100644
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -2,7 +2,7 @@ mod profile_modal_header;
 
 use std::sync::Arc;
 
-use agent_settings::{AgentProfileId, AgentSettings, builtin_profiles};
+use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, builtin_profiles};
 use assistant_tool::ToolWorkingSet;
 use editor::Editor;
 use fs::Fs;
@@ -16,7 +16,6 @@ use workspace::{ModalView, Workspace};
 use crate::agent_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
 use crate::agent_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
 use crate::{AgentPanel, ManageProfiles};
-use agent::agent_profile::AgentProfile;
 
 use super::tool_picker::ToolPickerMode;
 
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index 14a60b3014..5ae43398d6 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1,7 +1,6 @@
 use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll};
 use acp_thread::{AcpThread, AcpThreadEvent};
 use action_log::ActionLog;
-use agent::{Thread, ThreadEvent, ThreadSummary};
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use buffer_diff::DiffHunkStatus;
@@ -19,7 +18,6 @@ use gpui::{
 };
 
 use language::{Buffer, Capability, DiskState, OffsetRangeExt, Point};
-use language_model::StopReason;
 use multi_buffer::PathKey;
 use project::{Project, ProjectItem, ProjectPath};
 use settings::{Settings, SettingsStore};
@@ -51,34 +49,29 @@ pub struct AgentDiffPane {
 
 #[derive(PartialEq, Eq, Clone)]
 pub enum AgentDiffThread {
-    Native(Entity<Thread>),
     AcpThread(Entity<AcpThread>),
 }
 
 impl AgentDiffThread {
     fn project(&self, cx: &App) -> Entity<Project> {
         match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).project().clone(),
             AgentDiffThread::AcpThread(thread) => thread.read(cx).project().clone(),
         }
     }
     fn action_log(&self, cx: &App) -> Entity<ActionLog> {
         match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).action_log().clone(),
             AgentDiffThread::AcpThread(thread) => thread.read(cx).action_log().clone(),
         }
     }
 
-    fn summary(&self, cx: &App) -> ThreadSummary {
+    fn title(&self, cx: &App) -> SharedString {
         match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).summary().clone(),
-            AgentDiffThread::AcpThread(thread) => ThreadSummary::Ready(thread.read(cx).title()),
+            AgentDiffThread::AcpThread(thread) => thread.read(cx).title(),
         }
     }
 
     fn is_generating(&self, cx: &App) -> bool {
         match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).is_generating(),
             AgentDiffThread::AcpThread(thread) => {
                 thread.read(cx).status() == acp_thread::ThreadStatus::Generating
             }
@@ -87,14 +80,12 @@ impl AgentDiffThread {
 
     fn has_pending_edit_tool_uses(&self, cx: &App) -> bool {
         match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).has_pending_edit_tool_uses(),
             AgentDiffThread::AcpThread(thread) => thread.read(cx).has_pending_edit_tool_calls(),
         }
     }
 
     fn downgrade(&self) -> WeakAgentDiffThread {
         match self {
-            AgentDiffThread::Native(thread) => WeakAgentDiffThread::Native(thread.downgrade()),
             AgentDiffThread::AcpThread(thread) => {
                 WeakAgentDiffThread::AcpThread(thread.downgrade())
             }
@@ -102,12 +93,6 @@ impl AgentDiffThread {
     }
 }
 
-impl From<Entity<Thread>> for AgentDiffThread {
-    fn from(entity: Entity<Thread>) -> Self {
-        AgentDiffThread::Native(entity)
-    }
-}
-
 impl From<Entity<AcpThread>> for AgentDiffThread {
     fn from(entity: Entity<AcpThread>) -> Self {
         AgentDiffThread::AcpThread(entity)
@@ -116,25 +101,17 @@ impl From<Entity<AcpThread>> for AgentDiffThread {
 
 #[derive(PartialEq, Eq, Clone)]
 pub enum WeakAgentDiffThread {
-    Native(WeakEntity<Thread>),
     AcpThread(WeakEntity<AcpThread>),
 }
 
 impl WeakAgentDiffThread {
     pub fn upgrade(&self) -> Option<AgentDiffThread> {
         match self {
-            WeakAgentDiffThread::Native(weak) => weak.upgrade().map(AgentDiffThread::Native),
             WeakAgentDiffThread::AcpThread(weak) => weak.upgrade().map(AgentDiffThread::AcpThread),
         }
     }
 }
 
-impl From<WeakEntity<Thread>> for WeakAgentDiffThread {
-    fn from(entity: WeakEntity<Thread>) -> Self {
-        WeakAgentDiffThread::Native(entity)
-    }
-}
-
 impl From<WeakEntity<AcpThread>> for WeakAgentDiffThread {
     fn from(entity: WeakEntity<AcpThread>) -> Self {
         WeakAgentDiffThread::AcpThread(entity)
@@ -203,10 +180,6 @@ impl AgentDiffPane {
                     this.update_excerpts(window, cx)
                 }),
                 match &thread {
-                    AgentDiffThread::Native(thread) => cx
-                        .subscribe(thread, |this, _thread, event, cx| {
-                            this.handle_native_thread_event(event, cx)
-                        }),
                     AgentDiffThread::AcpThread(thread) => cx
                         .subscribe(thread, |this, _thread, event, cx| {
                             this.handle_acp_thread_event(event, cx)
@@ -313,19 +286,13 @@ impl AgentDiffPane {
     }
 
     fn update_title(&mut self, cx: &mut Context<Self>) {
-        let new_title = self.thread.summary(cx).unwrap_or("Agent Changes");
+        let new_title = self.thread.title(cx);
         if new_title != self.title {
             self.title = new_title;
             cx.emit(EditorEvent::TitleChanged);
         }
     }
 
-    fn handle_native_thread_event(&mut self, event: &ThreadEvent, cx: &mut Context<Self>) {
-        if let ThreadEvent::SummaryGenerated = event {
-            self.update_title(cx)
-        }
-    }
-
     fn handle_acp_thread_event(&mut self, event: &AcpThreadEvent, cx: &mut Context<Self>) {
         if let AcpThreadEvent::TitleUpdated = event {
             self.update_title(cx)
@@ -569,8 +536,8 @@ impl Item for AgentDiffPane {
     }
 
     fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let summary = self.thread.summary(cx).unwrap_or("Agent Changes");
-        Label::new(format!("Review: {}", summary))
+        let title = self.thread.title(cx);
+        Label::new(format!("Review: {}", title))
             .color(if params.selected {
                 Color::Default
             } else {
@@ -1339,12 +1306,6 @@ impl AgentDiff {
         });
 
         let thread_subscription = match &thread {
-            AgentDiffThread::Native(thread) => cx.subscribe_in(thread, window, {
-                let workspace = workspace.clone();
-                move |this, _thread, event, window, cx| {
-                    this.handle_native_thread_event(&workspace, event, window, cx)
-                }
-            }),
             AgentDiffThread::AcpThread(thread) => cx.subscribe_in(thread, window, {
                 let workspace = workspace.clone();
                 move |this, thread, event, window, cx| {
@@ -1447,47 +1408,6 @@ impl AgentDiff {
         });
     }
 
-    fn handle_native_thread_event(
-        &mut self,
-        workspace: &WeakEntity<Workspace>,
-        event: &ThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ThreadEvent::NewRequest
-            | ThreadEvent::Stopped(Ok(StopReason::EndTurn))
-            | ThreadEvent::Stopped(Ok(StopReason::MaxTokens))
-            | ThreadEvent::Stopped(Ok(StopReason::Refusal))
-            | ThreadEvent::Stopped(Err(_))
-            | ThreadEvent::ShowError(_)
-            | ThreadEvent::CompletionCanceled => {
-                self.update_reviewing_editors(workspace, window, cx);
-            }
-            // intentionally being exhaustive in case we add a variant we should handle
-            ThreadEvent::Stopped(Ok(StopReason::ToolUse))
-            | ThreadEvent::StreamedCompletion
-            | ThreadEvent::ReceivedTextChunk
-            | ThreadEvent::StreamedAssistantText(_, _)
-            | ThreadEvent::StreamedAssistantThinking(_, _)
-            | ThreadEvent::StreamedToolUse { .. }
-            | ThreadEvent::InvalidToolInput { .. }
-            | ThreadEvent::MissingToolUse { .. }
-            | ThreadEvent::MessageAdded(_)
-            | ThreadEvent::MessageEdited(_)
-            | ThreadEvent::MessageDeleted(_)
-            | ThreadEvent::SummaryGenerated
-            | ThreadEvent::SummaryChanged
-            | ThreadEvent::UsePendingTools { .. }
-            | ThreadEvent::ToolFinished { .. }
-            | ThreadEvent::CheckpointChanged
-            | ThreadEvent::ToolConfirmationNeeded
-            | ThreadEvent::ToolUseLimitReached
-            | ThreadEvent::CancelEditing
-            | ThreadEvent::ProfileChanged => {}
-        }
-    }
-
     fn handle_acp_thread_event(
         &mut self,
         workspace: &WeakEntity<Workspace>,
@@ -1890,16 +1810,14 @@ impl editor::Addon for EditorAgentDiffAddon {
 mod tests {
     use super::*;
     use crate::Keep;
-    use agent::thread_store::{self, ThreadStore};
+    use acp_thread::AgentConnection as _;
     use agent_settings::AgentSettings;
-    use assistant_tool::ToolWorkingSet;
     use editor::EditorSettings;
     use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
     use project::{FakeFs, Project};
-    use prompt_store::PromptBuilder;
     use serde_json::json;
     use settings::{Settings, SettingsStore};
-    use std::sync::Arc;
+    use std::{path::Path, rc::Rc};
     use theme::ThemeSettings;
     use util::path;
 
@@ -1912,7 +1830,6 @@ mod tests {
             Project::init_settings(cx);
             AgentSettings::register(cx);
             prompt_store::init(cx);
-            thread_store::init(cx);
             workspace::init_settings(cx);
             ThemeSettings::register(cx);
             EditorSettings::register(cx);
@@ -1932,21 +1849,17 @@ mod tests {
             })
             .unwrap();
 
-        let prompt_store = None;
-        let thread_store = cx
+        let connection = Rc::new(acp_thread::StubAgentConnection::new());
+        let thread = cx
             .update(|cx| {
-                ThreadStore::load(
-                    project.clone(),
-                    cx.new(|_| ToolWorkingSet::default()),
-                    prompt_store,
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    cx,
-                )
+                connection
+                    .clone()
+                    .new_thread(project.clone(), Path::new(path!("/test")), cx)
             })
             .await
             .unwrap();
-        let thread =
-            AgentDiffThread::Native(thread_store.update(cx, |store, cx| store.create_thread(cx)));
+
+        let thread = AgentDiffThread::AcpThread(thread);
         let action_log = cx.read(|cx| thread.action_log(cx));
 
         let (workspace, cx) =
@@ -2069,7 +1982,6 @@ mod tests {
             Project::init_settings(cx);
             AgentSettings::register(cx);
             prompt_store::init(cx);
-            thread_store::init(cx);
             workspace::init_settings(cx);
             ThemeSettings::register(cx);
             EditorSettings::register(cx);
@@ -2098,22 +2010,6 @@ mod tests {
             })
             .unwrap();
 
-        let prompt_store = None;
-        let thread_store = cx
-            .update(|cx| {
-                ThreadStore::load(
-                    project.clone(),
-                    cx.new(|_| ToolWorkingSet::default()),
-                    prompt_store,
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
         let (workspace, cx) =
             cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
 
@@ -2132,8 +2028,19 @@ mod tests {
             }
         });
 
+        let connection = Rc::new(acp_thread::StubAgentConnection::new());
+        let thread = cx
+            .update(|_, cx| {
+                connection
+                    .clone()
+                    .new_thread(project.clone(), Path::new(path!("/test")), cx)
+            })
+            .await
+            .unwrap();
+        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
+
         // Set the active thread
-        let thread = AgentDiffThread::Native(thread);
+        let thread = AgentDiffThread::AcpThread(thread);
         cx.update(|window, cx| {
             AgentDiff::set_active_thread(&workspace.downgrade(), thread.clone(), window, cx)
         });
diff --git a/crates/agent_ui/src/agent_model_selector.rs b/crates/agent_ui/src/agent_model_selector.rs
index 3de1027d91..58b95d9b1f 100644
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -5,7 +5,6 @@ use crate::{
 use agent_settings::AgentSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
-use language_model::{ConfiguredModel, LanguageModelRegistry};
 use picker::popover_menu::PickerPopoverMenu;
 use settings::update_settings_file;
 use std::sync::Arc;
@@ -39,28 +38,6 @@ impl AgentModelSelector {
                         let provider = model.provider_id().0.to_string();
                         let model_id = model.id().0.to_string();
                         match &model_usage_context {
-                            ModelUsageContext::Thread(thread) => {
-                                thread.update(cx, |thread, cx| {
-                                    let registry = LanguageModelRegistry::read_global(cx);
-                                    if let Some(provider) = registry.provider(&model.provider_id())
-                                    {
-                                        thread.set_configured_model(
-                                            Some(ConfiguredModel {
-                                                provider,
-                                                model: model.clone(),
-                                            }),
-                                            cx,
-                                        );
-                                    }
-                                });
-                                update_settings_file::<AgentSettings>(
-                                    fs.clone(),
-                                    cx,
-                                    move |settings, _cx| {
-                                        settings.set_model(model.clone());
-                                    },
-                                );
-                            }
                             ModelUsageContext::InlineAssistant => {
                                 update_settings_file::<AgentSettings>(
                                     fs.clone(),
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 2ace7096c2..7334f1cf12 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2,7 +2,6 @@ use std::ops::{Not, Range};
 use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
-use std::time::Duration;
 
 use acp_thread::AcpThread;
 use agent2::{DbThreadMetadata, HistoryEntry};
@@ -15,64 +14,52 @@ use zed_actions::OpenBrowser;
 use zed_actions::agent::{OpenClaudeCodeOnboardingModal, ReauthenticateAgent};
 
 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
-use crate::agent_diff::AgentDiffThread;
 use crate::ui::{AcpOnboardingModal, ClaudeCodeOnboardingModal};
 use crate::{
-    AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
-    DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
-    NewThread, OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ResetTrialEndUpsell,
-    ResetTrialUpsell, ToggleBurnMode, ToggleContextPicker, ToggleNavigationMenu,
-    ToggleNewThreadMenu, ToggleOptionsMenu,
+    AddContextServer, DeleteRecentlyOpenThread, Follow, InlineAssistant, NewTextThread, NewThread,
+    OpenActiveThreadAsMarkdown, OpenHistory, ResetTrialEndUpsell, ResetTrialUpsell,
+    ToggleNavigationMenu, ToggleNewThreadMenu, ToggleOptionsMenu,
     acp::AcpThreadView,
-    active_thread::{self, ActiveThread, ActiveThreadEvent},
     agent_configuration::{AgentConfiguration, AssistantConfigurationEvent},
-    agent_diff::AgentDiff,
-    message_editor::{MessageEditor, MessageEditorEvent},
     slash_command::SlashCommandCompletionProvider,
-    text_thread_editor::{
-        AgentPanelDelegate, TextThreadEditor, humanize_token_count, make_lsp_adapter_delegate,
-    },
-    thread_history::{HistoryEntryElement, ThreadHistory},
+    text_thread_editor::{AgentPanelDelegate, TextThreadEditor, make_lsp_adapter_delegate},
     ui::{AgentOnboardingModal, EndTrialUpsell},
 };
 use crate::{
     ExternalAgent, NewExternalAgentThread, NewNativeAgentThreadFromSummary, placeholder_command,
 };
 use agent::{
-    Thread, ThreadError, ThreadEvent, ThreadId, ThreadSummary, TokenUsageRatio,
     context_store::ContextStore,
     history_store::{HistoryEntryId, HistoryStore},
     thread_store::{TextThreadStore, ThreadStore},
 };
-use agent_settings::{AgentDockPosition, AgentSettings, CompletionMode, DefaultView};
+use agent_settings::{AgentDockPosition, AgentSettings, DefaultView};
 use ai_onboarding::AgentPanelOnboarding;
 use anyhow::{Result, anyhow};
 use assistant_context::{AssistantContext, ContextEvent, ContextSummary};
 use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
 use client::{UserStore, zed_urls};
-use cloud_llm_client::{CompletionIntent, Plan, PlanV1, PlanV2, UsageLimit};
+use cloud_llm_client::{Plan, PlanV1, PlanV2, UsageLimit};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
-use feature_flags::{self, ClaudeCodeFeatureFlag, FeatureFlagAppExt, GeminiAndNativeFeatureFlag};
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem,
-    Corner, DismissEvent, Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable, KeyContext,
-    Pixels, Subscription, Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,
+    Action, AnyElement, App, AsyncWindowContext, Corner, DismissEvent, Entity, EventEmitter,
+    ExternalPaths, FocusHandle, Focusable, KeyContext, Pixels, Subscription, Task, UpdateGlobal,
+    WeakEntity, prelude::*,
 };
 use language::LanguageRegistry;
-use language_model::{ConfigurationError, ConfiguredModel, LanguageModelRegistry};
+use language_model::{ConfigurationError, LanguageModelRegistry};
 use project::{DisableAiSettings, Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use rules_library::{RulesLibrary, open_rules_library};
 use search::{BufferSearchBar, buffer_search};
 use settings::{Settings, SettingsStore, update_settings_file};
 use theme::ThemeSettings;
-use time::UtcOffset;
 use ui::utils::WithRemSize;
 use ui::{
-    Banner, Callout, ContextMenu, ContextMenuEntry, ElevationIndex, KeyBinding, PopoverMenu,
-    PopoverMenuHandle, ProgressBar, Tab, Tooltip, prelude::*,
+    Callout, ContextMenu, ContextMenuEntry, KeyBinding, PopoverMenu, PopoverMenuHandle,
+    ProgressBar, Tab, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -81,10 +68,7 @@ use workspace::{
 };
 use zed_actions::{
     DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
-    agent::{
-        OpenAcpOnboardingModal, OpenOnboardingModal, OpenSettings, ResetOnboarding,
-        ToggleModelSelector,
-    },
+    agent::{OpenAcpOnboardingModal, OpenOnboardingModal, OpenSettings, ResetOnboarding},
     assistant::{OpenRulesLibrary, ToggleFocus},
 };
 
@@ -150,37 +134,9 @@ pub fn init(cx: &mut App) {
                         });
                     }
                 })
-                .register_action(|workspace, _: &OpenAgentDiff, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        match &panel.read(cx).active_view {
-                            ActiveView::Thread { thread, .. } => {
-                                let thread = thread.read(cx).thread().clone();
-                                AgentDiffPane::deploy_in_workspace(thread, workspace, window, cx);
-                            }
-                            ActiveView::ExternalAgentThread { .. }
-                            | ActiveView::TextThread { .. }
-                            | ActiveView::History
-                            | ActiveView::Configuration => {}
-                        }
-                    }
-                })
                 .register_action(|workspace, _: &Follow, window, cx| {
                     workspace.follow(CollaboratorId::Agent, window, cx);
                 })
-                .register_action(|workspace, _: &ExpandMessageEditor, window, cx| {
-                    let Some(panel) = workspace.panel::<AgentPanel>(cx) else {
-                        return;
-                    };
-                    workspace.focus_panel::<AgentPanel>(window, cx);
-                    panel.update(cx, |panel, cx| {
-                        if let Some(message_editor) = panel.active_message_editor() {
-                            message_editor.update(cx, |editor, cx| {
-                                editor.expand_message_editor(&ExpandMessageEditor, window, cx);
-                            });
-                        }
-                    });
-                })
                 .register_action(|workspace, _: &ToggleNavigationMenu, window, cx| {
                     if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                         workspace.focus_panel::<AgentPanel>(window, cx);
@@ -230,12 +186,6 @@ pub fn init(cx: &mut App) {
 }
 
 enum ActiveView {
-    Thread {
-        thread: Entity<ActiveThread>,
-        change_title_editor: Entity<Editor>,
-        message_editor: Entity<MessageEditor>,
-        _subscriptions: Vec<gpui::Subscription>,
-    },
     ExternalAgentThread {
         thread_view: Entity<AcpThreadView>,
     },
@@ -305,100 +255,38 @@ impl From<ExternalAgent> for AgentType {
 impl ActiveView {
     pub fn which_font_size_used(&self) -> WhichFontSize {
         match self {
-            ActiveView::Thread { .. }
-            | ActiveView::ExternalAgentThread { .. }
-            | ActiveView::History => WhichFontSize::AgentFont,
+            ActiveView::ExternalAgentThread { .. } | ActiveView::History => {
+                WhichFontSize::AgentFont
+            }
             ActiveView::TextThread { .. } => WhichFontSize::BufferFont,
             ActiveView::Configuration => WhichFontSize::None,
         }
     }
 
-    pub fn thread(
-        active_thread: Entity<ActiveThread>,
-        message_editor: Entity<MessageEditor>,
+    pub fn native_agent(
+        fs: Arc<dyn Fs>,
+        prompt_store: Option<Entity<PromptStore>>,
+        acp_history_store: Entity<agent2::HistoryStore>,
+        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
         window: &mut Window,
-        cx: &mut Context<AgentPanel>,
+        cx: &mut App,
     ) -> Self {
-        let summary = active_thread.read(cx).summary(cx).or_default();
-
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_text(summary.clone(), window, cx);
-            editor
+        let thread_view = cx.new(|cx| {
+            crate::acp::AcpThreadView::new(
+                ExternalAgent::NativeAgent.server(fs, acp_history_store.clone()),
+                None,
+                None,
+                workspace,
+                project,
+                acp_history_store,
+                prompt_store,
+                window,
+                cx,
+            )
         });
 
-        let subscriptions = vec![
-            cx.subscribe(&message_editor, |this, _, event, cx| match event {
-                MessageEditorEvent::Changed | MessageEditorEvent::EstimatedTokenCount => {
-                    cx.notify();
-                }
-                MessageEditorEvent::ScrollThreadToBottom => match &this.active_view {
-                    ActiveView::Thread { thread, .. } => {
-                        thread.update(cx, |thread, cx| {
-                            thread.scroll_to_bottom(cx);
-                        });
-                    }
-                    ActiveView::ExternalAgentThread { .. } => {}
-                    ActiveView::TextThread { .. }
-                    | ActiveView::History
-                    | ActiveView::Configuration => {}
-                },
-            }),
-            window.subscribe(&editor, cx, {
-                {
-                    let thread = active_thread.clone();
-                    move |editor, event, window, cx| match event {
-                        EditorEvent::BufferEdited => {
-                            let new_summary = editor.read(cx).text(cx);
-
-                            thread.update(cx, |thread, cx| {
-                                thread.thread().update(cx, |thread, cx| {
-                                    thread.set_summary(new_summary, cx);
-                                });
-                            })
-                        }
-                        EditorEvent::Blurred => {
-                            if editor.read(cx).text(cx).is_empty() {
-                                let summary = thread.read(cx).summary(cx).or_default();
-
-                                editor.update(cx, |editor, cx| {
-                                    editor.set_text(summary, window, cx);
-                                });
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-            }),
-            cx.subscribe(&active_thread, |_, _, event, cx| match &event {
-                ActiveThreadEvent::EditingMessageTokenCountChanged => {
-                    cx.notify();
-                }
-            }),
-            cx.subscribe_in(&active_thread.read(cx).thread().clone(), window, {
-                let editor = editor.clone();
-                move |_, thread, event, window, cx| match event {
-                    ThreadEvent::SummaryGenerated => {
-                        let summary = thread.read(cx).summary().or_default();
-
-                        editor.update(cx, |editor, cx| {
-                            editor.set_text(summary, window, cx);
-                        })
-                    }
-                    ThreadEvent::MessageAdded(_) => {
-                        cx.notify();
-                    }
-                    _ => {}
-                }
-            }),
-        ];
-
-        Self::Thread {
-            change_title_editor: editor,
-            thread: active_thread,
-            message_editor,
-            _subscriptions: subscriptions,
-        }
+        Self::ExternalAgentThread { thread_view }
     }
 
     pub fn prompt_editor(
@@ -524,18 +412,14 @@ pub struct AgentPanel {
     thread_store: Entity<ThreadStore>,
     acp_history: Entity<AcpThreadHistory>,
     acp_history_store: Entity<agent2::HistoryStore>,
-    _default_model_subscription: Subscription,
     context_store: Entity<TextThreadStore>,
     prompt_store: Option<Entity<PromptStore>>,
     inline_assist_context_store: Entity<ContextStore>,
     configuration: Option<Entity<AgentConfiguration>>,
     configuration_subscription: Option<Subscription>,
-    local_timezone: UtcOffset,
     active_view: ActiveView,
     previous_view: Option<ActiveView>,
     history_store: Entity<HistoryStore>,
-    history: Entity<ThreadHistory>,
-    hovered_recent_history_item: Option<usize>,
     new_thread_menu_handle: PopoverMenuHandle<ContextMenu>,
     agent_panel_menu_handle: PopoverMenuHandle<ContextMenu>,
     assistant_navigation_menu_handle: PopoverMenuHandle<ContextMenu>,
@@ -655,45 +539,17 @@ impl AgentPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let thread = thread_store.update(cx, |this, cx| this.create_thread(cx));
         let fs = workspace.app_state().fs.clone();
         let user_store = workspace.app_state().user_store.clone();
         let project = workspace.project();
         let language_registry = project.read(cx).languages().clone();
         let client = workspace.client().clone();
         let workspace = workspace.weak_handle();
-        let weak_self = cx.entity().downgrade();
 
-        let message_editor_context_store =
-            cx.new(|_cx| ContextStore::new(project.downgrade(), Some(thread_store.downgrade())));
         let inline_assist_context_store =
             cx.new(|_cx| ContextStore::new(project.downgrade(), Some(thread_store.downgrade())));
 
-        let thread_id = thread.read(cx).id().clone();
-
-        let history_store = cx.new(|cx| {
-            HistoryStore::new(
-                thread_store.clone(),
-                context_store.clone(),
-                [HistoryEntryId::Thread(thread_id)],
-                cx,
-            )
-        });
-
-        let message_editor = cx.new(|cx| {
-            MessageEditor::new(
-                fs.clone(),
-                workspace.clone(),
-                message_editor_context_store.clone(),
-                prompt_store.clone(),
-                thread_store.downgrade(),
-                context_store.downgrade(),
-                Some(history_store.downgrade()),
-                thread.clone(),
-                window,
-                cx,
-            )
-        });
+        let history_store = cx.new(|cx| HistoryStore::new(context_store.clone(), [], cx));
 
         let acp_history_store = cx.new(|cx| agent2::HistoryStore::new(context_store.clone(), cx));
         let acp_history = cx.new(|cx| AcpThreadHistory::new(acp_history_store.clone(), window, cx));
@@ -720,22 +576,17 @@ impl AgentPanel {
 
         cx.observe(&history_store, |_, _, cx| cx.notify()).detach();
 
-        let active_thread = cx.new(|cx| {
-            ActiveThread::new(
-                thread.clone(),
-                thread_store.clone(),
-                context_store.clone(),
-                message_editor_context_store.clone(),
-                language_registry.clone(),
+        let panel_type = AgentSettings::get_global(cx).default_view;
+        let active_view = match panel_type {
+            DefaultView::Thread => ActiveView::native_agent(
+                fs.clone(),
+                prompt_store.clone(),
+                acp_history_store.clone(),
+                project.clone(),
                 workspace.clone(),
                 window,
                 cx,
-            )
-        });
-
-        let panel_type = AgentSettings::get_global(cx).default_view;
-        let active_view = match panel_type {
-            DefaultView::Thread => ActiveView::thread(active_thread, message_editor, window, cx),
+            ),
             DefaultView::TextThread => {
                 let context =
                     context_store.update(cx, |context_store, cx| context_store.create(cx));
@@ -764,20 +615,14 @@ impl AgentPanel {
             }
         };
 
-        AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
-
-        let weak_panel = weak_self.clone();
+        let weak_panel = cx.entity().downgrade();
 
         window.defer(cx, move |window, cx| {
             let panel = weak_panel.clone();
             let assistant_navigation_menu =
                 ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| {
                     if let Some(panel) = panel.upgrade() {
-                        if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
-                            menu = Self::populate_recently_opened_menu_section_new(menu, panel, cx);
-                        } else {
-                            menu = Self::populate_recently_opened_menu_section_old(menu, panel, cx);
-                        }
+                        menu = Self::populate_recently_opened_menu_section(menu, panel, cx);
                     }
                     menu.action("View All", Box::new(OpenHistory))
                         .end_slot_action(DeleteRecentlyOpenThread.boxed_clone())
@@ -803,26 +648,6 @@ impl AgentPanel {
                 .ok();
         });
 
-        let _default_model_subscription =
-            cx.subscribe(
-                &LanguageModelRegistry::global(cx),
-                |this, _, event: &language_model::Event, cx| {
-                    if let language_model::Event::DefaultModelChanged = event {
-                        match &this.active_view {
-                            ActiveView::Thread { thread, .. } => {
-                                thread.read(cx).thread().clone().update(cx, |thread, cx| {
-                                    thread.get_or_init_configured_model(cx)
-                                });
-                            }
-                            ActiveView::ExternalAgentThread { .. }
-                            | ActiveView::TextThread { .. }
-                            | ActiveView::History
-                            | ActiveView::Configuration => {}
-                        }
-                    }
-                },
-            );
-
         let onboarding = cx.new(|cx| {
             AgentPanelOnboarding::new(
                 user_store.clone(),
@@ -842,20 +667,15 @@ impl AgentPanel {
             fs: fs.clone(),
             language_registry,
             thread_store: thread_store.clone(),
-            _default_model_subscription,
             context_store,
             prompt_store,
             configuration: None,
             configuration_subscription: None,
-            local_timezone: UtcOffset::from_whole_seconds(
-                chrono::Local::now().offset().local_minus_utc(),
-            )
-            .unwrap(),
+
             inline_assist_context_store,
             previous_view: None,
             history_store: history_store.clone(),
-            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
-            hovered_recent_history_item: None,
+
             new_thread_menu_handle: PopoverMenuHandle::default(),
             agent_panel_menu_handle: PopoverMenuHandle::default(),
             assistant_navigation_menu_handle: PopoverMenuHandle::default(),
@@ -886,10 +706,6 @@ impl AgentPanel {
         }
     }
 
-    pub(crate) fn local_timezone(&self) -> UtcOffset {
-        self.local_timezone
-    }
-
     pub(crate) fn prompt_store(&self) -> &Option<Entity<PromptStore>> {
         &self.prompt_store
     }
@@ -906,118 +722,15 @@ impl AgentPanel {
         &self.context_store
     }
 
-    fn cancel(&mut self, _: &editor::actions::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
-                thread.update(cx, |thread, cx| thread.cancel_last_completion(window, cx));
-            }
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => {}
-        }
-    }
-
-    fn active_message_editor(&self) -> Option<&Entity<MessageEditor>> {
-        match &self.active_view {
-            ActiveView::Thread { message_editor, .. } => Some(message_editor),
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
-        }
-    }
-
     fn active_thread_view(&self) -> Option<&Entity<AcpThreadView>> {
         match &self.active_view {
             ActiveView::ExternalAgentThread { thread_view, .. } => Some(thread_view),
-            ActiveView::Thread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
+            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => None,
         }
     }
 
-    fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
-            return self.new_agent_thread(AgentType::NativeAgent, window, cx);
-        }
-        // Preserve chat box text when using creating new thread
-        let preserved_text = self
-            .active_message_editor()
-            .map(|editor| editor.read(cx).get_text(cx).trim().to_string());
-
-        let thread = self
-            .thread_store
-            .update(cx, |this, cx| this.create_thread(cx));
-
-        let context_store = cx.new(|_cx| {
-            ContextStore::new(
-                self.project.downgrade(),
-                Some(self.thread_store.downgrade()),
-            )
-        });
-
-        if let Some(other_thread_id) = action.from_thread_id.clone() {
-            let other_thread_task = self.thread_store.update(cx, |this, cx| {
-                this.open_thread(&other_thread_id, window, cx)
-            });
-
-            cx.spawn({
-                let context_store = context_store.clone();
-
-                async move |_panel, cx| {
-                    let other_thread = other_thread_task.await?;
-
-                    context_store.update(cx, |this, cx| {
-                        this.add_thread(other_thread, false, cx);
-                    })?;
-                    anyhow::Ok(())
-                }
-            })
-            .detach_and_log_err(cx);
-        }
-
-        let active_thread = cx.new(|cx| {
-            ActiveThread::new(
-                thread.clone(),
-                self.thread_store.clone(),
-                self.context_store.clone(),
-                context_store.clone(),
-                self.language_registry.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        });
-
-        let message_editor = cx.new(|cx| {
-            MessageEditor::new(
-                self.fs.clone(),
-                self.workspace.clone(),
-                context_store.clone(),
-                self.prompt_store.clone(),
-                self.thread_store.downgrade(),
-                self.context_store.downgrade(),
-                Some(self.history_store.downgrade()),
-                thread.clone(),
-                window,
-                cx,
-            )
-        });
-
-        if let Some(text) = preserved_text {
-            message_editor.update(cx, |editor, cx| {
-                editor.set_text(text, window, cx);
-            });
-        }
-
-        message_editor.focus_handle(cx).focus(window);
-
-        let thread_view = ActiveView::thread(active_thread, message_editor, window, cx);
-        self.set_active_view(thread_view, window, cx);
-
-        AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
+    fn new_thread(&mut self, _action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
+        self.new_agent_thread(AgentType::NativeAgent, window, cx);
     }
 
     fn new_native_agent_thread_from_summary(
@@ -1153,21 +866,6 @@ impl AgentPanel {
             let server = ext_agent.server(fs, history);
 
             this.update_in(cx, |this, window, cx| {
-                match ext_agent {
-                    crate::ExternalAgent::Gemini
-                    | crate::ExternalAgent::NativeAgent
-                    | crate::ExternalAgent::Custom { .. } => {
-                        if !cx.has_flag::<GeminiAndNativeFeatureFlag>() {
-                            return;
-                        }
-                    }
-                    crate::ExternalAgent::ClaudeCode => {
-                        if !cx.has_flag::<ClaudeCodeFeatureFlag>() {
-                            return;
-                        }
-                    }
-                }
-
                 let selected_agent = ext_agent.into();
                 if this.selected_agent != selected_agent {
                     this.selected_agent = selected_agent;
@@ -1289,72 +987,6 @@ impl AgentPanel {
         );
     }
 
-    pub(crate) fn open_thread_by_id(
-        &mut self,
-        thread_id: &ThreadId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let open_thread_task = self
-            .thread_store
-            .update(cx, |this, cx| this.open_thread(thread_id, window, cx));
-        cx.spawn_in(window, async move |this, cx| {
-            let thread = open_thread_task.await?;
-            this.update_in(cx, |this, window, cx| {
-                this.open_thread(thread, window, cx);
-                anyhow::Ok(())
-            })??;
-            Ok(())
-        })
-    }
-
-    pub(crate) fn open_thread(
-        &mut self,
-        thread: Entity<Thread>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let context_store = cx.new(|_cx| {
-            ContextStore::new(
-                self.project.downgrade(),
-                Some(self.thread_store.downgrade()),
-            )
-        });
-
-        let active_thread = cx.new(|cx| {
-            ActiveThread::new(
-                thread.clone(),
-                self.thread_store.clone(),
-                self.context_store.clone(),
-                context_store.clone(),
-                self.language_registry.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        });
-
-        let message_editor = cx.new(|cx| {
-            MessageEditor::new(
-                self.fs.clone(),
-                self.workspace.clone(),
-                context_store,
-                self.prompt_store.clone(),
-                self.thread_store.downgrade(),
-                self.context_store.downgrade(),
-                Some(self.history_store.downgrade()),
-                thread.clone(),
-                window,
-                cx,
-            )
-        });
-        message_editor.focus_handle(cx).focus(window);
-
-        let thread_view = ActiveView::thread(active_thread, message_editor, window, cx);
-        self.set_active_view(thread_view, window, cx);
-        AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
-    }
-
     pub fn go_back(&mut self, _: &workspace::GoBack, window: &mut Window, cx: &mut Context<Self>) {
         match self.active_view {
             ActiveView::Configuration | ActiveView::History => {
@@ -1362,9 +994,6 @@ impl AgentPanel {
                     self.active_view = previous_view;
 
                     match &self.active_view {
-                        ActiveView::Thread { message_editor, .. } => {
-                            message_editor.focus_handle(cx).focus(window);
-                        }
                         ActiveView::ExternalAgentThread { thread_view } => {
                             thread_view.focus_handle(cx).focus(window);
                         }
@@ -1479,33 +1108,6 @@ impl AgentPanel {
         }
     }
 
-    pub fn open_agent_diff(
-        &mut self,
-        _: &OpenAgentDiff,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
-                let thread = thread.read(cx).thread().clone();
-                self.workspace
-                    .update(cx, |workspace, cx| {
-                        AgentDiffPane::deploy_in_workspace(
-                            AgentDiffThread::Native(thread),
-                            workspace,
-                            window,
-                            cx,
-                        )
-                    })
-                    .log_err();
-            }
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => {}
-        }
-    }
-
     pub(crate) fn open_configuration(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let agent_server_store = self.project.read(cx).agent_server_store().clone();
         let context_server_store = self.project.read(cx).context_server_store();
@@ -1548,15 +1150,6 @@ impl AgentPanel {
         };
 
         match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
-                active_thread::open_active_thread_as_markdown(
-                    thread.read(cx).thread().clone(),
-                    workspace,
-                    window,
-                    cx,
-                )
-                .detach_and_log_err(cx);
-            }
             ActiveView::ExternalAgentThread { thread_view } => {
                 thread_view
                     .update(cx, |thread_view, cx| {
@@ -1590,29 +1183,18 @@ impl AgentPanel {
                 }
 
                 self.new_thread(&NewThread::default(), window, cx);
-                if let Some((thread, model)) =
-                    self.active_thread(cx).zip(provider.default_model(cx))
+                if let Some((thread, model)) = self
+                    .active_native_agent_thread(cx)
+                    .zip(provider.default_model(cx))
                 {
                     thread.update(cx, |thread, cx| {
-                        thread.set_configured_model(
-                            Some(ConfiguredModel {
-                                provider: provider.clone(),
-                                model,
-                            }),
-                            cx,
-                        );
+                        thread.set_model(model, cx);
                     });
                 }
             }
         }
     }
 
-    pub(crate) fn active_thread(&self, cx: &App) -> Option<Entity<Thread>> {
-        match &self.active_view {
-            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
-            _ => None,
-        }
-    }
     pub(crate) fn active_agent_thread(&self, cx: &App) -> Option<Entity<AcpThread>> {
         match &self.active_view {
             ActiveView::ExternalAgentThread { thread_view, .. } => {
@@ -1622,64 +1204,13 @@ impl AgentPanel {
         }
     }
 
-    pub(crate) fn delete_thread(
-        &mut self,
-        thread_id: &ThreadId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.thread_store
-            .update(cx, |this, cx| this.delete_thread(thread_id, cx))
-    }
-
-    fn continue_conversation(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let ActiveView::Thread { thread, .. } = &self.active_view else {
-            return;
-        };
-
-        let thread_state = thread.read(cx).thread().read(cx);
-        if !thread_state.tool_use_limit_reached() {
-            return;
+    pub(crate) fn active_native_agent_thread(&self, cx: &App) -> Option<Entity<agent2::Thread>> {
+        match &self.active_view {
+            ActiveView::ExternalAgentThread { thread_view, .. } => {
+                thread_view.read(cx).as_native_thread(cx)
+            }
+            _ => None,
         }
-
-        let model = thread_state.configured_model().map(|cm| cm.model);
-        if let Some(model) = model {
-            thread.update(cx, |active_thread, cx| {
-                active_thread.thread().update(cx, |thread, cx| {
-                    thread.insert_invisible_continue_message(cx);
-                    thread.advance_prompt_id();
-                    thread.send_to_model(
-                        model,
-                        CompletionIntent::UserPrompt,
-                        Some(window.window_handle()),
-                        cx,
-                    );
-                });
-            });
-        } else {
-            log::warn!("No configured model available for continuation");
-        }
-    }
-
-    fn toggle_burn_mode(
-        &mut self,
-        _: &ToggleBurnMode,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ActiveView::Thread { thread, .. } = &self.active_view else {
-            return;
-        };
-
-        thread.update(cx, |active_thread, cx| {
-            active_thread.thread().update(cx, |thread, _cx| {
-                let current_mode = thread.completion_mode();
-
-                thread.set_completion_mode(match current_mode {
-                    CompletionMode::Burn => CompletionMode::Normal,
-                    CompletionMode::Normal => CompletionMode::Burn,
-                });
-            });
-        });
     }
 
     pub(crate) fn active_context_editor(&self) -> Option<Entity<TextThreadEditor>> {
@@ -1689,15 +1220,6 @@ impl AgentPanel {
         }
     }
 
-    pub(crate) fn delete_context(
-        &mut self,
-        path: Arc<Path>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.context_store
-            .update(cx, |this, cx| this.delete_local_context(path, cx))
-    }
-
     fn set_active_view(
         &mut self,
         new_view: ActiveView,
@@ -1713,21 +1235,7 @@ impl AgentPanel {
         let current_is_special = current_is_history || current_is_config;
         let new_is_special = new_is_history || new_is_config;
 
-        if let ActiveView::Thread { thread, .. } = &self.active_view {
-            let thread = thread.read(cx);
-            if thread.is_empty() {
-                let id = thread.thread().read(cx).id().clone();
-                self.history_store.update(cx, |store, cx| {
-                    store.remove_recently_opened_thread(id, cx);
-                });
-            }
-        }
-
         match &new_view {
-            ActiveView::Thread { thread, .. } => self.history_store.update(cx, |store, cx| {
-                let id = thread.read(cx).thread().read(cx).id().clone();
-                store.push_recently_opened_entry(HistoryEntryId::Thread(id), cx);
-            }),
             ActiveView::TextThread { context_editor, .. } => {
                 self.history_store.update(cx, |store, cx| {
                     if let Some(path) = context_editor.read(cx).context().read(cx).path() {
@@ -1761,71 +1269,7 @@ impl AgentPanel {
         self.focus_handle(cx).focus(window);
     }
 
-    fn populate_recently_opened_menu_section_old(
-        mut menu: ContextMenu,
-        panel: Entity<Self>,
-        cx: &mut Context<ContextMenu>,
-    ) -> ContextMenu {
-        let entries = panel
-            .read(cx)
-            .history_store
-            .read(cx)
-            .recently_opened_entries(cx);
-
-        if entries.is_empty() {
-            return menu;
-        }
-
-        menu = menu.header("Recently Opened");
-
-        for entry in entries {
-            let title = entry.title().clone();
-            let id = entry.id();
-
-            menu = menu.entry_with_end_slot_on_hover(
-                title,
-                None,
-                {
-                    let panel = panel.downgrade();
-                    let id = id.clone();
-                    move |window, cx| {
-                        let id = id.clone();
-                        panel
-                            .update(cx, move |this, cx| match id {
-                                HistoryEntryId::Thread(id) => this
-                                    .open_thread_by_id(&id, window, cx)
-                                    .detach_and_log_err(cx),
-                                HistoryEntryId::Context(path) => this
-                                    .open_saved_prompt_editor(path, window, cx)
-                                    .detach_and_log_err(cx),
-                            })
-                            .ok();
-                    }
-                },
-                IconName::Close,
-                "Close Entry".into(),
-                {
-                    let panel = panel.downgrade();
-                    let id = id.clone();
-                    move |_window, cx| {
-                        panel
-                            .update(cx, |this, cx| {
-                                this.history_store.update(cx, |history_store, cx| {
-                                    history_store.remove_recently_opened_entry(&id, cx);
-                                });
-                            })
-                            .ok();
-                    }
-                },
-            );
-        }
-
-        menu = menu.separator();
-
-        menu
-    }
-
-    fn populate_recently_opened_menu_section_new(
+    fn populate_recently_opened_menu_section(
         mut menu: ContextMenu,
         panel: Entity<Self>,
         cx: &mut Context<ContextMenu>,
@@ -1965,15 +1409,8 @@ impl AgentPanel {
 impl Focusable for AgentPanel {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         match &self.active_view {
-            ActiveView::Thread { message_editor, .. } => message_editor.focus_handle(cx),
             ActiveView::ExternalAgentThread { thread_view, .. } => thread_view.focus_handle(cx),
-            ActiveView::History => {
-                if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>() {
-                    self.acp_history.focus_handle(cx)
-                } else {
-                    self.history.focus_handle(cx)
-                }
-            }
+            ActiveView::History => self.acp_history.focus_handle(cx),
             ActiveView::TextThread { context_editor, .. } => context_editor.focus_handle(cx),
             ActiveView::Configuration => {
                 if let Some(configuration) = self.configuration.as_ref() {
@@ -2080,58 +1517,6 @@ impl AgentPanel {
         const LOADING_SUMMARY_PLACEHOLDER: &str = "Loading Summary…";
 
         let content = match &self.active_view {
-            ActiveView::Thread {
-                thread: active_thread,
-                change_title_editor,
-                ..
-            } => {
-                let state = {
-                    let active_thread = active_thread.read(cx);
-                    if active_thread.is_empty() {
-                        &ThreadSummary::Pending
-                    } else {
-                        active_thread.summary(cx)
-                    }
-                };
-
-                match state {
-                    ThreadSummary::Pending => Label::new(ThreadSummary::DEFAULT)
-                        .truncate()
-                        .color(Color::Muted)
-                        .into_any_element(),
-                    ThreadSummary::Generating => Label::new(LOADING_SUMMARY_PLACEHOLDER)
-                        .truncate()
-                        .color(Color::Muted)
-                        .into_any_element(),
-                    ThreadSummary::Ready(_) => div()
-                        .w_full()
-                        .child(change_title_editor.clone())
-                        .into_any_element(),
-                    ThreadSummary::Error => h_flex()
-                        .w_full()
-                        .child(change_title_editor.clone())
-                        .child(
-                            IconButton::new("retry-summary-generation", IconName::RotateCcw)
-                                .icon_size(IconSize::Small)
-                                .on_click({
-                                    let active_thread = active_thread.clone();
-                                    move |_, _window, cx| {
-                                        active_thread.update(cx, |thread, cx| {
-                                            thread.regenerate_summary(cx);
-                                        });
-                                    }
-                                })
-                                .tooltip(move |_window, cx| {
-                                    cx.new(|_| {
-                                        Tooltip::new("Failed to generate title")
-                                            .meta("Click to try again")
-                                    })
-                                    .into()
-                                }),
-                        )
-                        .into_any_element(),
-                }
-            }
             ActiveView::ExternalAgentThread { thread_view } => {
                 if let Some(title_editor) = thread_view.read(cx).title_editor() {
                     div()
@@ -2392,123 +1777,7 @@ impl AgentPanel {
             })
     }
 
-    fn render_toolbar_old(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        let active_thread = match &self.active_view {
-            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
-        };
-
-        let new_thread_menu = PopoverMenu::new("new_thread_menu")
-            .trigger_with_tooltip(
-                IconButton::new("new_thread_menu_btn", IconName::Plus).icon_size(IconSize::Small),
-                Tooltip::text("New Thread…"),
-            )
-            .anchor(Corner::TopRight)
-            .with_handle(self.new_thread_menu_handle.clone())
-            .menu({
-                move |window, cx| {
-                    let active_thread = active_thread.clone();
-                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
-                        menu = menu
-                            .context(focus_handle.clone())
-                            .when_some(active_thread, |this, active_thread| {
-                                let thread = active_thread.read(cx);
-
-                                if !thread.is_empty() {
-                                    let thread_id = thread.id().clone();
-                                    this.item(
-                                        ContextMenuEntry::new("New From Summary")
-                                            .icon(IconName::ThreadFromSummary)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    Box::new(NewThread {
-                                                        from_thread_id: Some(thread_id.clone()),
-                                                    }),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                                } else {
-                                    this
-                                }
-                            })
-                            .item(
-                                ContextMenuEntry::new("New Thread")
-                                    .icon(IconName::Thread)
-                                    .icon_color(Color::Muted)
-                                    .action(NewThread::default().boxed_clone())
-                                    .handler(move |window, cx| {
-                                        window.dispatch_action(
-                                            NewThread::default().boxed_clone(),
-                                            cx,
-                                        );
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("New Text Thread")
-                                    .icon(IconName::TextThread)
-                                    .icon_color(Color::Muted)
-                                    .action(NewTextThread.boxed_clone())
-                                    .handler(move |window, cx| {
-                                        window.dispatch_action(NewTextThread.boxed_clone(), cx);
-                                    }),
-                            );
-                        menu
-                    }))
-                }
-            });
-
-        h_flex()
-            .id("assistant-toolbar")
-            .h(Tab::container_height(cx))
-            .max_w_full()
-            .flex_none()
-            .justify_between()
-            .gap_2()
-            .bg(cx.theme().colors().tab_bar_background)
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                h_flex()
-                    .size_full()
-                    .pl_1()
-                    .gap_1()
-                    .child(match &self.active_view {
-                        ActiveView::History | ActiveView::Configuration => div()
-                            .pl(DynamicSpacing::Base04.rems(cx))
-                            .child(self.render_toolbar_back_button(cx))
-                            .into_any_element(),
-                        _ => self
-                            .render_recent_entries_menu(IconName::MenuAlt, Corner::TopLeft, cx)
-                            .into_any_element(),
-                    })
-                    .child(self.render_title_view(window, cx)),
-            )
-            .child(
-                h_flex()
-                    .h_full()
-                    .gap_2()
-                    .children(self.render_token_count(cx))
-                    .child(
-                        h_flex()
-                            .h_full()
-                            .gap(DynamicSpacing::Base02.rems(cx))
-                            .px(DynamicSpacing::Base08.rems(cx))
-                            .border_l_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(new_thread_menu)
-                            .child(self.render_panel_options_menu(window, cx)),
-                    ),
-            )
-    }
-
-    fn render_toolbar_new(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let agent_server_store = self.project.read(cx).agent_server_store().clone();
         let focus_handle = self.focus_handle(cx);
 
@@ -2516,10 +1785,7 @@ impl AgentPanel {
             ActiveView::ExternalAgentThread { thread_view } => {
                 thread_view.read(cx).as_native_thread(cx)
             }
-            ActiveView::Thread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
+            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => None,
         };
 
         let new_thread_menu = PopoverMenu::new("new_thread_menu")
@@ -2552,8 +1818,8 @@ impl AgentPanel {
                     telemetry::event!("New Thread Clicked");
 
                     let active_thread = active_thread.clone();
-                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
-                        menu = menu
+                    Some(ContextMenu::build(window, cx, |menu, _window, cx| {
+                        menu
                             .context(focus_handle.clone())
                             .header("Zed Agent")
                             .when_some(active_thread, |this, active_thread| {
@@ -2632,63 +1898,59 @@ impl AgentPanel {
                             )
                             .separator()
                             .header("External Agents")
-                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
-                                menu.item(
-                                    ContextMenuEntry::new("New Gemini CLI Thread")
-                                        .icon(IconName::AiGemini)
-                                        .icon_color(Color::Muted)
-                                        .disabled(is_via_collab)
-                                        .handler({
-                                            let workspace = workspace.clone();
-                                            move |window, cx| {
-                                                if let Some(workspace) = workspace.upgrade() {
-                                                    workspace.update(cx, |workspace, cx| {
-                                                        if let Some(panel) =
-                                                            workspace.panel::<AgentPanel>(cx)
-                                                        {
-                                                            panel.update(cx, |panel, cx| {
-                                                                panel.new_agent_thread(
-                                                                    AgentType::Gemini,
-                                                                    window,
-                                                                    cx,
-                                                                );
-                                                            });
-                                                        }
-                                                    });
-                                                }
+                            .item(
+                                ContextMenuEntry::new("New Gemini CLI Thread")
+                                    .icon(IconName::AiGemini)
+                                    .icon_color(Color::Muted)
+                                    .disabled(is_via_collab)
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.new_agent_thread(
+                                                                AgentType::Gemini,
+                                                                window,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
                                             }
-                                        }),
-                                )
-                            })
-                            .when(cx.has_flag::<ClaudeCodeFeatureFlag>(), |menu| {
-                                menu.item(
-                                    ContextMenuEntry::new("New Claude Code Thread")
-                                        .icon(IconName::AiClaude)
-                                        .disabled(is_via_collab)
-                                        .icon_color(Color::Muted)
-                                        .handler({
-                                            let workspace = workspace.clone();
-                                            move |window, cx| {
-                                                if let Some(workspace) = workspace.upgrade() {
-                                                    workspace.update(cx, |workspace, cx| {
-                                                        if let Some(panel) =
-                                                            workspace.panel::<AgentPanel>(cx)
-                                                        {
-                                                            panel.update(cx, |panel, cx| {
-                                                                panel.new_agent_thread(
-                                                                    AgentType::ClaudeCode,
-                                                                    window,
-                                                                    cx,
-                                                                );
-                                                            });
-                                                        }
-                                                    });
-                                                }
+                                        }
+                                    }),
+                            )
+                            .item(
+                                ContextMenuEntry::new("New Claude Code Thread")
+                                    .icon(IconName::AiClaude)
+                                    .disabled(is_via_collab)
+                                    .icon_color(Color::Muted)
+                                    .handler({
+                                        let workspace = workspace.clone();
+                                        move |window, cx| {
+                                            if let Some(workspace) = workspace.upgrade() {
+                                                workspace.update(cx, |workspace, cx| {
+                                                    if let Some(panel) =
+                                                        workspace.panel::<AgentPanel>(cx)
+                                                    {
+                                                        panel.update(cx, |panel, cx| {
+                                                            panel.new_agent_thread(
+                                                                AgentType::ClaudeCode,
+                                                                window,
+                                                                cx,
+                                                            );
+                                                        });
+                                                    }
+                                                });
                                             }
-                                        }),
-                                )
-                            })
-                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |mut menu| {
+                                        }
+                                    }),
+                            )
+                            .map(|mut menu| {
                                 let agent_names = agent_server_store
                                     .read(cx)
                                     .external_agents()
@@ -2739,16 +2001,13 @@ impl AgentPanel {
 
                                 menu
                             })
-                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
-                                menu.separator().link(
+                            .separator().link(
                                     "Add Other Agents",
                                     OpenBrowser {
                                         url: zed_urls::external_agents_docs(cx),
                                     }
                                     .boxed_clone(),
                                 )
-                            });
-                        menu
                     }))
                 }
             });
@@ -2810,153 +2069,12 @@ impl AgentPanel {
             )
     }
 
-    fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>()
-            || cx.has_flag::<feature_flags::ClaudeCodeFeatureFlag>()
-        {
-            self.render_toolbar_new(window, cx).into_any_element()
-        } else {
-            self.render_toolbar_old(window, cx).into_any_element()
-        }
-    }
-
-    fn render_token_count(&self, cx: &App) -> Option<AnyElement> {
-        match &self.active_view {
-            ActiveView::Thread {
-                thread,
-                message_editor,
-                ..
-            } => {
-                let active_thread = thread.read(cx);
-                let message_editor = message_editor.read(cx);
-
-                let editor_empty = message_editor.is_editor_fully_empty(cx);
-
-                if active_thread.is_empty() && editor_empty {
-                    return None;
-                }
-
-                let thread = active_thread.thread().read(cx);
-                let is_generating = thread.is_generating();
-                let conversation_token_usage = thread.total_token_usage()?;
-
-                let (total_token_usage, is_estimating) =
-                    if let Some((editing_message_id, unsent_tokens)) =
-                        active_thread.editing_message_id()
-                    {
-                        let combined = thread
-                            .token_usage_up_to_message(editing_message_id)
-                            .add(unsent_tokens);
-
-                        (combined, unsent_tokens > 0)
-                    } else {
-                        let unsent_tokens =
-                            message_editor.last_estimated_token_count().unwrap_or(0);
-                        let combined = conversation_token_usage.add(unsent_tokens);
-
-                        (combined, unsent_tokens > 0)
-                    };
-
-                let is_waiting_to_update_token_count =
-                    message_editor.is_waiting_to_update_token_count();
-
-                if total_token_usage.total == 0 {
-                    return None;
-                }
-
-                let token_color = match total_token_usage.ratio() {
-                    TokenUsageRatio::Normal if is_estimating => Color::Default,
-                    TokenUsageRatio::Normal => Color::Muted,
-                    TokenUsageRatio::Warning => Color::Warning,
-                    TokenUsageRatio::Exceeded => Color::Error,
-                };
-
-                let token_count = h_flex()
-                    .id("token-count")
-                    .flex_shrink_0()
-                    .gap_0p5()
-                    .when(!is_generating && is_estimating, |parent| {
-                        parent
-                            .child(
-                                h_flex()
-                                    .mr_1()
-                                    .size_2p5()
-                                    .justify_center()
-                                    .rounded_full()
-                                    .bg(cx.theme().colors().text.opacity(0.1))
-                                    .child(
-                                        div().size_1().rounded_full().bg(cx.theme().colors().text),
-                                    ),
-                            )
-                            .tooltip(move |window, cx| {
-                                Tooltip::with_meta(
-                                    "Estimated New Token Count",
-                                    None,
-                                    format!(
-                                        "Current Conversation Tokens: {}",
-                                        humanize_token_count(conversation_token_usage.total)
-                                    ),
-                                    window,
-                                    cx,
-                                )
-                            })
-                    })
-                    .child(
-                        Label::new(humanize_token_count(total_token_usage.total))
-                            .size(LabelSize::Small)
-                            .color(token_color)
-                            .map(|label| {
-                                if is_generating || is_waiting_to_update_token_count {
-                                    label
-                                        .with_animation(
-                                            "used-tokens-label",
-                                            Animation::new(Duration::from_secs(2))
-                                                .repeat()
-                                                .with_easing(pulsating_between(0.6, 1.)),
-                                            |label, delta| label.alpha(delta),
-                                        )
-                                        .into_any()
-                                } else {
-                                    label.into_any_element()
-                                }
-                            }),
-                    )
-                    .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
-                    .child(
-                        Label::new(humanize_token_count(total_token_usage.max))
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .into_any();
-
-                Some(token_count)
-            }
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
-        }
-    }
-
     fn should_render_trial_end_upsell(&self, cx: &mut Context<Self>) -> bool {
         if TrialEndUpsell::dismissed() {
             return false;
         }
 
         match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
-                if thread
-                    .read(cx)
-                    .thread()
-                    .read(cx)
-                    .configured_model()
-                    .is_some_and(|model| {
-                        model.provider.id() != language_model::ZED_CLOUD_PROVIDER_ID
-                    })
-                {
-                    return false;
-                }
-            }
             ActiveView::TextThread { .. } => {
                 if LanguageModelRegistry::global(cx)
                     .read(cx)
@@ -3009,15 +2127,10 @@ impl AgentPanel {
                 false
             }
             _ => {
-                let history_is_empty = if cx.has_flag::<GeminiAndNativeFeatureFlag>() {
-                    self.acp_history_store.read(cx).is_empty(cx)
-                        && self
-                            .history_store
-                            .update(cx, |store, cx| store.recent_entries(1, cx).is_empty())
-                } else {
-                    self.history_store
-                        .update(cx, |store, cx| store.recent_entries(1, cx).is_empty())
-                };
+                let history_is_empty = self.acp_history_store.read(cx).is_empty(cx)
+                    && self
+                        .history_store
+                        .update(cx, |store, cx| store.recent_entries(1, cx).is_empty());
 
                 let has_configured_non_zed_providers = LanguageModelRegistry::read_global(cx)
                     .providers()
@@ -3041,14 +2154,10 @@ impl AgentPanel {
             return None;
         }
 
-        let thread_view = matches!(&self.active_view, ActiveView::Thread { .. });
         let text_thread_view = matches!(&self.active_view, ActiveView::TextThread { .. });
 
         Some(
             div()
-                .when(thread_view, |this| {
-                    this.size_full().bg(cx.theme().colors().panel_background)
-                })
                 .when(text_thread_view, |this| {
                     this.bg(cx.theme().colors().editor_background)
                 })
@@ -3056,16 +2165,6 @@ impl AgentPanel {
         )
     }
 
-    fn render_backdrop(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .absolute()
-            .inset_0()
-            .bg(cx.theme().colors().panel_background)
-            .opacity(0.8)
-            .block_mouse_except_scroll()
-    }
-
     fn render_trial_end_upsell(
         &self,
         _window: &mut Window,
@@ -3100,198 +2199,6 @@ impl AgentPanel {
         )
     }
 
-    fn render_empty_state_section_header(
-        &self,
-        label: impl Into<SharedString>,
-        action_slot: Option<AnyElement>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        div().pl_1().pr_1p5().child(
-            h_flex()
-                .mt_2()
-                .pl_1p5()
-                .pb_1()
-                .w_full()
-                .justify_between()
-                .border_b_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Label::new(label.into())
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .children(action_slot),
-        )
-    }
-
-    fn render_thread_empty_state(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let recent_history = self
-            .history_store
-            .update(cx, |this, cx| this.recent_entries(6, cx));
-
-        let model_registry = LanguageModelRegistry::read_global(cx);
-
-        let configuration_error =
-            model_registry.configuration_error(model_registry.default_model(), cx);
-
-        let no_error = configuration_error.is_none();
-        let focus_handle = self.focus_handle(cx);
-
-        v_flex()
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .when(recent_history.is_empty(), |this| {
-                this.child(
-                    v_flex()
-                        .size_full()
-                        .mx_auto()
-                        .justify_center()
-                        .items_center()
-                        .gap_1()
-                        .child(h_flex().child(Headline::new("Welcome to the Agent Panel")))
-                        .when(no_error, |parent| {
-                            parent
-                                .child(h_flex().child(
-                                    Label::new("Ask and build anything.").color(Color::Muted),
-                                ))
-                                .child(
-                                    v_flex()
-                                        .mt_2()
-                                        .gap_1()
-                                        .max_w_48()
-                                        .child(
-                                            Button::new("context", "Add Context")
-                                                .label_size(LabelSize::Small)
-                                                .icon(IconName::FileCode)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Muted)
-                                                .full_width()
-                                                .key_binding(KeyBinding::for_action_in(
-                                                    &ToggleContextPicker,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                ))
-                                                .on_click(|_event, window, cx| {
-                                                    window.dispatch_action(
-                                                        ToggleContextPicker.boxed_clone(),
-                                                        cx,
-                                                    )
-                                                }),
-                                        )
-                                        .child(
-                                            Button::new("mode", "Switch Model")
-                                                .label_size(LabelSize::Small)
-                                                .icon(IconName::DatabaseZap)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Muted)
-                                                .full_width()
-                                                .key_binding(KeyBinding::for_action_in(
-                                                    &ToggleModelSelector,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                ))
-                                                .on_click(|_event, window, cx| {
-                                                    window.dispatch_action(
-                                                        ToggleModelSelector.boxed_clone(),
-                                                        cx,
-                                                    )
-                                                }),
-                                        )
-                                        .child(
-                                            Button::new("settings", "View Settings")
-                                                .label_size(LabelSize::Small)
-                                                .icon(IconName::Settings)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Muted)
-                                                .full_width()
-                                                .key_binding(KeyBinding::for_action_in(
-                                                    &OpenSettings,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                ))
-                                                .on_click(|_event, window, cx| {
-                                                    window.dispatch_action(
-                                                        OpenSettings.boxed_clone(),
-                                                        cx,
-                                                    )
-                                                }),
-                                        ),
-                                )
-                        }),
-                )
-            })
-            .when(!recent_history.is_empty(), |parent| {
-                parent
-                    .overflow_hidden()
-                    .justify_end()
-                    .gap_1()
-                    .child(
-                        self.render_empty_state_section_header(
-                            "Recent",
-                            Some(
-                                Button::new("view-history", "View All")
-                                    .style(ButtonStyle::Subtle)
-                                    .label_size(LabelSize::Small)
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &OpenHistory,
-                                            &self.focus_handle(cx),
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                    )
-                                    .on_click(move |_event, window, cx| {
-                                        window.dispatch_action(OpenHistory.boxed_clone(), cx);
-                                    })
-                                    .into_any_element(),
-                            ),
-                            cx,
-                        ),
-                    )
-                    .child(
-                        v_flex().p_1().pr_1p5().gap_1().children(
-                            recent_history
-                                .into_iter()
-                                .enumerate()
-                                .map(|(index, entry)| {
-                                    // TODO: Add keyboard navigation.
-                                    let is_hovered =
-                                        self.hovered_recent_history_item == Some(index);
-                                    HistoryEntryElement::new(entry, cx.entity().downgrade())
-                                        .hovered(is_hovered)
-                                        .on_hover(cx.listener(
-                                            move |this, is_hovered, _window, cx| {
-                                                if *is_hovered {
-                                                    this.hovered_recent_history_item = Some(index);
-                                                } else if this.hovered_recent_history_item
-                                                    == Some(index)
-                                                {
-                                                    this.hovered_recent_history_item = None;
-                                                }
-                                                cx.notify();
-                                            },
-                                        ))
-                                        .into_any_element()
-                                }),
-                        ),
-                    )
-            })
-            .when_some(configuration_error.as_ref(), |this, err| {
-                this.child(self.render_configuration_error(false, err, &focus_handle, window, cx))
-            })
-    }
-
     fn render_configuration_error(
         &self,
         border_bottom: bool,
@@ -3362,285 +2269,6 @@ impl AgentPanel {
         }
     }
 
-    fn render_tool_use_limit_reached(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<AnyElement> {
-        let active_thread = match &self.active_view {
-            ActiveView::Thread { thread, .. } => thread,
-            ActiveView::ExternalAgentThread { .. } => {
-                return None;
-            }
-            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {
-                return None;
-            }
-        };
-
-        let thread = active_thread.read(cx).thread().read(cx);
-
-        let tool_use_limit_reached = thread.tool_use_limit_reached();
-        if !tool_use_limit_reached {
-            return None;
-        }
-
-        let model = thread.configured_model()?.model;
-
-        let focus_handle = self.focus_handle(cx);
-
-        let banner = Banner::new()
-            .severity(Severity::Info)
-            .child(Label::new("Consecutive tool use limit reached.").size(LabelSize::Small))
-            .action_slot(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Button::new("continue-conversation", "Continue")
-                            .layer(ElevationIndex::ModalSurface)
-                            .label_size(LabelSize::Small)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &ContinueThread,
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(10.))),
-                            )
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.continue_conversation(window, cx);
-                            })),
-                    )
-                    .when(model.supports_burn_mode(), |this| {
-                        this.child(
-                            Button::new("continue-burn-mode", "Continue with Burn Mode")
-                                .style(ButtonStyle::Filled)
-                                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                .layer(ElevationIndex::ModalSurface)
-                                .label_size(LabelSize::Small)
-                                .key_binding(
-                                    KeyBinding::for_action_in(
-                                        &ContinueWithBurnMode,
-                                        &focus_handle,
-                                        window,
-                                        cx,
-                                    )
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                                )
-                                .tooltip(Tooltip::text("Enable Burn Mode for unlimited tool use."))
-                                .on_click({
-                                    let active_thread = active_thread.clone();
-                                    cx.listener(move |this, _, window, cx| {
-                                        active_thread.update(cx, |active_thread, cx| {
-                                            active_thread.thread().update(cx, |thread, _cx| {
-                                                thread.set_completion_mode(CompletionMode::Burn);
-                                            });
-                                        });
-                                        this.continue_conversation(window, cx);
-                                    })
-                                }),
-                        )
-                    }),
-            );
-
-        Some(div().px_2().pb_2().child(banner).into_any_element())
-    }
-
-    fn create_copy_button(&self, message: impl Into<String>) -> impl IntoElement {
-        let message = message.into();
-
-        IconButton::new("copy", IconName::Copy)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .tooltip(Tooltip::text("Copy Error Message"))
-            .on_click(move |_, _, cx| {
-                cx.write_to_clipboard(ClipboardItem::new_string(message.clone()))
-            })
-    }
-
-    fn dismiss_error_button(
-        &self,
-        thread: &Entity<ActiveThread>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        IconButton::new("dismiss", IconName::Close)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .tooltip(Tooltip::text("Dismiss Error"))
-            .on_click(cx.listener({
-                let thread = thread.clone();
-                move |_, _, _, cx| {
-                    thread.update(cx, |this, _cx| {
-                        this.clear_last_error();
-                    });
-
-                    cx.notify();
-                }
-            }))
-    }
-
-    fn upgrade_button(
-        &self,
-        thread: &Entity<ActiveThread>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        Button::new("upgrade", "Upgrade")
-            .label_size(LabelSize::Small)
-            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-            .on_click(cx.listener({
-                let thread = thread.clone();
-                move |_, _, _, cx| {
-                    thread.update(cx, |this, _cx| {
-                        this.clear_last_error();
-                    });
-
-                    cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx));
-                    cx.notify();
-                }
-            }))
-    }
-
-    fn render_payment_required_error(
-        &self,
-        thread: &Entity<ActiveThread>,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        const ERROR_MESSAGE: &str =
-            "You reached your free usage limit. Upgrade to Zed Pro for more prompts.";
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircle)
-            .title("Free Usage Exceeded")
-            .description(ERROR_MESSAGE)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.upgrade_button(thread, cx))
-                    .child(self.create_copy_button(ERROR_MESSAGE)),
-            )
-            .dismiss_action(self.dismiss_error_button(thread, cx))
-            .into_any_element()
-    }
-
-    fn render_model_request_limit_reached_error(
-        &self,
-        plan: Plan,
-        thread: &Entity<ActiveThread>,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let error_message = match plan {
-            Plan::V1(PlanV1::ZedPro) => "Upgrade to usage-based billing for more prompts.",
-            Plan::V1(PlanV1::ZedProTrial) | Plan::V1(PlanV1::ZedFree) => {
-                "Upgrade to Zed Pro for more prompts."
-            }
-            Plan::V2(_) => "",
-        };
-
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Model Prompt Limit Reached")
-            .description(error_message)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.upgrade_button(thread, cx))
-                    .child(self.create_copy_button(error_message)),
-            )
-            .dismiss_action(self.dismiss_error_button(thread, cx))
-            .into_any_element()
-    }
-
-    fn render_retry_button(&self, thread: &Entity<ActiveThread>) -> AnyElement {
-        Button::new("retry", "Retry")
-            .icon(IconName::RotateCw)
-            .icon_position(IconPosition::Start)
-            .icon_size(IconSize::Small)
-            .label_size(LabelSize::Small)
-            .on_click({
-                let thread = thread.clone();
-                move |_, window, cx| {
-                    thread.update(cx, |thread, cx| {
-                        thread.clear_last_error();
-                        thread.thread().update(cx, |thread, cx| {
-                            thread.retry_last_completion(Some(window.window_handle()), cx);
-                        });
-                    });
-                }
-            })
-            .into_any_element()
-    }
-
-    fn render_error_message(
-        &self,
-        header: SharedString,
-        message: SharedString,
-        thread: &Entity<ActiveThread>,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let message_with_header = format!("{}\n{}", header, message);
-
-        // Don't show Retry button for refusals
-        let is_refusal = header == "Request Refused";
-        let retry_button = self.render_retry_button(thread);
-        let copy_button = self.create_copy_button(message_with_header);
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircle)
-            .title(header)
-            .description(message)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .when(!is_refusal, |this| this.child(retry_button))
-                    .child(copy_button),
-            )
-            .dismiss_action(self.dismiss_error_button(thread, cx))
-            .into_any_element()
-    }
-
-    fn render_retryable_error(
-        &self,
-        message: SharedString,
-        can_enable_burn_mode: bool,
-        thread: &Entity<ActiveThread>,
-    ) -> AnyElement {
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Error")
-            .description(message)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .when(can_enable_burn_mode, |this| {
-                        this.child(
-                            Button::new("enable_burn_retry", "Enable Burn Mode and Retry")
-                                .icon(IconName::ZedBurnMode)
-                                .icon_position(IconPosition::Start)
-                                .icon_size(IconSize::Small)
-                                .label_size(LabelSize::Small)
-                                .on_click({
-                                    let thread = thread.clone();
-                                    move |_, window, cx| {
-                                        thread.update(cx, |thread, cx| {
-                                            thread.clear_last_error();
-                                            thread.thread().update(cx, |thread, cx| {
-                                                thread.enable_burn_mode_and_retry(
-                                                    Some(window.window_handle()),
-                                                    cx,
-                                                );
-                                            });
-                                        });
-                                    }
-                                }),
-                        )
-                    })
-                    .child(self.render_retry_button(thread)),
-            )
-            .into_any_element()
-    }
-
     fn render_prompt_editor(
         &self,
         context_editor: &Entity<TextThreadEditor>,
@@ -3748,26 +2376,6 @@ impl AgentPanel {
         cx: &mut Context<Self>,
     ) {
         match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
-                let context_store = thread.read(cx).context_store().clone();
-                context_store.update(cx, move |context_store, cx| {
-                    let mut tasks = Vec::new();
-                    for project_path in &paths {
-                        tasks.push(context_store.add_file_from_path(
-                            project_path.clone(),
-                            false,
-                            cx,
-                        ));
-                    }
-                    cx.background_spawn(async move {
-                        futures::future::join_all(tasks).await;
-                        // Need to hold onto the worktrees until they have already been used when
-                        // opening the buffers.
-                        drop(added_worktrees);
-                    })
-                    .detach();
-                });
-            }
             ActiveView::ExternalAgentThread { thread_view } => {
                 thread_view.update(cx, |thread_view, cx| {
                     thread_view.insert_dragged_files(paths, added_worktrees, window, cx);
@@ -3794,7 +2402,7 @@ impl AgentPanel {
         match &self.active_view {
             ActiveView::ExternalAgentThread { .. } => key_context.add("external_agent_thread"),
             ActiveView::TextThread { .. } => key_context.add("prompt_editor"),
-            ActiveView::Thread { .. } | ActiveView::History | ActiveView::Configuration => {}
+            ActiveView::History | ActiveView::Configuration => {}
         }
         key_context
     }
@@ -3816,7 +2424,6 @@ impl Render for AgentPanel {
             .size_full()
             .justify_between()
             .key_context(self.key_context())
-            .on_action(cx.listener(Self::cancel))
             .on_action(cx.listener(|this, action: &NewThread, window, cx| {
                 this.new_thread(action, window, cx);
             }))
@@ -3828,7 +2435,6 @@ impl Render for AgentPanel {
             }))
             .on_action(cx.listener(Self::open_active_thread_as_markdown))
             .on_action(cx.listener(Self::deploy_rules_library))
-            .on_action(cx.listener(Self::open_agent_diff))
             .on_action(cx.listener(Self::go_back))
             .on_action(cx.listener(Self::toggle_navigation_menu))
             .on_action(cx.listener(Self::toggle_options_menu))
@@ -3836,26 +2442,6 @@ impl Render for AgentPanel {
             .on_action(cx.listener(Self::decrease_font_size))
             .on_action(cx.listener(Self::reset_font_size))
             .on_action(cx.listener(Self::toggle_zoom))
-            .on_action(cx.listener(|this, _: &ContinueThread, window, cx| {
-                this.continue_conversation(window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &ContinueWithBurnMode, window, cx| {
-                match &this.active_view {
-                    ActiveView::Thread { thread, .. } => {
-                        thread.update(cx, |active_thread, cx| {
-                            active_thread.thread().update(cx, |thread, _cx| {
-                                thread.set_completion_mode(CompletionMode::Burn);
-                            });
-                        });
-                        this.continue_conversation(window, cx);
-                    }
-                    ActiveView::ExternalAgentThread { .. } => {}
-                    ActiveView::TextThread { .. }
-                    | ActiveView::History
-                    | ActiveView::Configuration => {}
-                }
-            }))
-            .on_action(cx.listener(Self::toggle_burn_mode))
             .on_action(cx.listener(|this, _: &ReauthenticateAgent, window, cx| {
                 if let Some(thread_view) = this.active_thread_view() {
                     thread_view.update(cx, |thread_view, cx| thread_view.reauthenticate(window, cx))
@@ -3864,59 +2450,10 @@ impl Render for AgentPanel {
             .child(self.render_toolbar(window, cx))
             .children(self.render_onboarding(window, cx))
             .map(|parent| match &self.active_view {
-                ActiveView::Thread {
-                    thread,
-                    message_editor,
-                    ..
-                } => parent
-                    .child(
-                        if thread.read(cx).is_empty() && !self.should_render_onboarding(cx) {
-                            self.render_thread_empty_state(window, cx)
-                                .into_any_element()
-                        } else {
-                            thread.clone().into_any_element()
-                        },
-                    )
-                    .children(self.render_tool_use_limit_reached(window, cx))
-                    .when_some(thread.read(cx).last_error(), |this, last_error| {
-                        this.child(
-                            div()
-                                .child(match last_error {
-                                    ThreadError::PaymentRequired => {
-                                        self.render_payment_required_error(thread, cx)
-                                    }
-                                    ThreadError::ModelRequestLimitReached { plan } => self
-                                        .render_model_request_limit_reached_error(plan, thread, cx),
-                                    ThreadError::Message { header, message } => {
-                                        self.render_error_message(header, message, thread, cx)
-                                    }
-                                    ThreadError::RetryableError {
-                                        message,
-                                        can_enable_burn_mode,
-                                    } => self.render_retryable_error(
-                                        message,
-                                        can_enable_burn_mode,
-                                        thread,
-                                    ),
-                                })
-                                .into_any(),
-                        )
-                    })
-                    .child(h_flex().relative().child(message_editor.clone()).when(
-                        !LanguageModelRegistry::read_global(cx).has_authenticated_provider(cx),
-                        |this| this.child(self.render_backdrop(cx)),
-                    ))
-                    .child(self.render_drag_target(cx)),
                 ActiveView::ExternalAgentThread { thread_view, .. } => parent
                     .child(thread_view.clone())
                     .child(self.render_drag_target(cx)),
-                ActiveView::History => {
-                    if cx.has_flag::<feature_flags::GeminiAndNativeFeatureFlag>() {
-                        parent.child(self.acp_history.clone())
-                    } else {
-                        parent.child(self.history.clone())
-                    }
-                }
+                ActiveView::History => parent.child(self.acp_history.clone()),
                 ActiveView::TextThread {
                     context_editor,
                     buffer_search_bar,
@@ -4082,29 +2619,6 @@ impl AgentPanelDelegate for ConcreteAssistantPanelDelegate {
                     thread_view.update(cx, |thread_view, cx| {
                         thread_view.insert_selections(window, cx);
                     });
-                } else if let Some(message_editor) = panel.active_message_editor() {
-                    message_editor.update(cx, |message_editor, cx| {
-                        message_editor.context_store().update(cx, |store, cx| {
-                            let buffer = buffer.read(cx);
-                            let selection_ranges = selection_ranges
-                                .into_iter()
-                                .flat_map(|range| {
-                                    let (start_buffer, start) =
-                                        buffer.text_anchor_for_position(range.start, cx)?;
-                                    let (end_buffer, end) =
-                                        buffer.text_anchor_for_position(range.end, cx)?;
-                                    if start_buffer != end_buffer {
-                                        return None;
-                                    }
-                                    Some((start_buffer, start..end))
-                                })
-                                .collect::<Vec<_>>();
-
-                            for (buffer, range) in selection_ranges {
-                                store.add_selection(buffer, range, cx);
-                            }
-                        })
-                    })
                 } else if let Some(context_editor) = panel.active_context_editor() {
                     let snapshot = buffer.read(cx).snapshot(cx);
                     let selection_ranges = selection_ranges
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
index 09d2179fc3..94efa767c5 100644
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -1,5 +1,4 @@
 mod acp;
-mod active_thread;
 mod agent_configuration;
 mod agent_diff;
 mod agent_model_selector;
@@ -8,7 +7,6 @@ mod buffer_codegen;
 mod context_picker;
 mod context_server_configuration;
 mod context_strip;
-mod debug;
 mod inline_assistant;
 mod inline_prompt_editor;
 mod language_model_selector;
@@ -20,14 +18,12 @@ mod slash_command_settings;
 mod terminal_codegen;
 mod terminal_inline_assistant;
 mod text_thread_editor;
-mod thread_history;
-mod tool_compatibility;
 mod ui;
 
 use std::rc::Rc;
 use std::sync::Arc;
 
-use agent::{Thread, ThreadId};
+use agent::ThreadId;
 use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
@@ -47,14 +43,12 @@ use serde::{Deserialize, Serialize};
 use settings::{Settings as _, SettingsStore};
 use std::any::TypeId;
 
-pub use crate::active_thread::ActiveThread;
 use crate::agent_configuration::{ConfigureContextServerModal, ManageProfilesModal};
 pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
 pub use crate::inline_assistant::InlineAssistant;
 use crate::slash_command_settings::SlashCommandSettings;
 pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
 pub use text_thread_editor::{AgentPanelDelegate, TextThreadEditor};
-pub use ui::preview::{all_agent_previews, get_agent_preview};
 use zed_actions;
 
 actions!(
@@ -235,14 +229,12 @@ impl ManageProfiles {
 
 #[derive(Clone)]
 pub(crate) enum ModelUsageContext {
-    Thread(Entity<Thread>),
     InlineAssistant,
 }
 
 impl ModelUsageContext {
     pub fn configured_model(&self, cx: &App) -> Option<ConfiguredModel> {
         match self {
-            Self::Thread(thread) => thread.read(cx).configured_model(),
             Self::InlineAssistant => {
                 LanguageModelRegistry::read_global(cx).inline_assistant_model()
             }
diff --git a/crates/agent_ui/src/context_picker.rs b/crates/agent_ui/src/context_picker.rs
index b225fbf340..bc30930289 100644
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -6,7 +6,7 @@ pub(crate) mod symbol_context_picker;
 pub(crate) mod thread_context_picker;
 
 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 
 use anyhow::{Result, anyhow};
@@ -23,9 +23,8 @@ use gpui::{
 };
 use language::Buffer;
 use multi_buffer::MultiBufferRow;
-use paths::contexts_dir;
-use project::{Entry, ProjectPath};
-use prompt_store::{PromptStore, UserPromptId};
+use project::ProjectPath;
+use prompt_store::PromptStore;
 use rules_context_picker::{RulesContextEntry, RulesContextPicker};
 use symbol_context_picker::SymbolContextPicker;
 use thread_context_picker::{
@@ -34,10 +33,8 @@ use thread_context_picker::{
 use ui::{
     ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor, prelude::*,
 };
-use uuid::Uuid;
 use workspace::{Workspace, notifications::NotifyResultExt};
 
-use crate::AgentPanel;
 use agent::{
     ThreadId,
     context::RULES_ICON,
@@ -664,7 +661,7 @@ pub(crate) fn recent_context_picker_entries(
     text_thread_store: Option<WeakEntity<TextThreadStore>>,
     workspace: Entity<Workspace>,
     exclude_paths: &HashSet<PathBuf>,
-    exclude_threads: &HashSet<ThreadId>,
+    _exclude_threads: &HashSet<ThreadId>,
     cx: &App,
 ) -> Vec<RecentEntry> {
     let mut recent = Vec::with_capacity(6);
@@ -690,19 +687,13 @@ pub(crate) fn recent_context_picker_entries(
             }),
     );
 
-    let active_thread_id = workspace
-        .panel::<AgentPanel>(cx)
-        .and_then(|panel| Some(panel.read(cx).active_thread(cx)?.read(cx).id()));
-
     if let Some((thread_store, text_thread_store)) = thread_store
         .and_then(|store| store.upgrade())
         .zip(text_thread_store.and_then(|store| store.upgrade()))
     {
         let mut threads = unordered_thread_entries(thread_store, text_thread_store, cx)
             .filter(|(_, thread)| match thread {
-                ThreadContextEntry::Thread { id, .. } => {
-                    Some(id) != active_thread_id && !exclude_threads.contains(id)
-                }
+                ThreadContextEntry::Thread { .. } => false,
                 ThreadContextEntry::Context { .. } => true,
             })
             .collect::<Vec<_>>();
@@ -874,15 +865,7 @@ fn fold_toggle(
     }
 }
 
-pub enum MentionLink {
-    File(ProjectPath, Entry),
-    Symbol(ProjectPath, String),
-    Selection(ProjectPath, Range<usize>),
-    Fetch(String),
-    Thread(ThreadId),
-    TextThread(Arc<Path>),
-    Rule(UserPromptId),
-}
+pub struct MentionLink;
 
 impl MentionLink {
     const FILE: &str = "@file";
@@ -894,17 +877,6 @@ impl MentionLink {
 
     const TEXT_THREAD_URL_PREFIX: &str = "text-thread://";
 
-    const SEPARATOR: &str = ":";
-
-    pub fn is_valid(url: &str) -> bool {
-        url.starts_with(Self::FILE)
-            || url.starts_with(Self::SYMBOL)
-            || url.starts_with(Self::FETCH)
-            || url.starts_with(Self::SELECTION)
-            || url.starts_with(Self::THREAD)
-            || url.starts_with(Self::RULE)
-    }
-
     pub fn for_file(file_name: &str, full_path: &str) -> String {
         format!("[@{}]({}:{})", file_name, Self::FILE, full_path)
     }
@@ -958,75 +930,4 @@ impl MentionLink {
     pub fn for_rule(rule: &RulesContextEntry) -> String {
         format!("[@{}]({}:{})", rule.title, Self::RULE, rule.prompt_id.0)
     }
-
-    pub fn try_parse(link: &str, workspace: &Entity<Workspace>, cx: &App) -> Option<Self> {
-        fn extract_project_path_from_link(
-            path: &str,
-            workspace: &Entity<Workspace>,
-            cx: &App,
-        ) -> Option<ProjectPath> {
-            let path = PathBuf::from(path);
-            let worktree_name = path.iter().next()?;
-            let path: PathBuf = path.iter().skip(1).collect();
-            let worktree_id = workspace
-                .read(cx)
-                .visible_worktrees(cx)
-                .find(|worktree| worktree.read(cx).root_name() == worktree_name)
-                .map(|worktree| worktree.read(cx).id())?;
-            Some(ProjectPath {
-                worktree_id,
-                path: path.into(),
-            })
-        }
-
-        let (prefix, argument) = link.split_once(Self::SEPARATOR)?;
-        match prefix {
-            Self::FILE => {
-                let project_path = extract_project_path_from_link(argument, workspace, cx)?;
-                let entry = workspace
-                    .read(cx)
-                    .project()
-                    .read(cx)
-                    .entry_for_path(&project_path, cx)?
-                    .clone();
-                Some(MentionLink::File(project_path, entry))
-            }
-            Self::SYMBOL => {
-                let (path, symbol) = argument.split_once(Self::SEPARATOR)?;
-                let project_path = extract_project_path_from_link(path, workspace, cx)?;
-                Some(MentionLink::Symbol(project_path, symbol.to_string()))
-            }
-            Self::SELECTION => {
-                let (path, line_args) = argument.split_once(Self::SEPARATOR)?;
-                let project_path = extract_project_path_from_link(path, workspace, cx)?;
-
-                let line_range = {
-                    let (start, end) = line_args
-                        .trim_start_matches('(')
-                        .trim_end_matches(')')
-                        .split_once('-')?;
-                    start.parse::<usize>().ok()?..end.parse::<usize>().ok()?
-                };
-
-                Some(MentionLink::Selection(project_path, line_range))
-            }
-            Self::THREAD => {
-                if let Some(encoded_filename) = argument.strip_prefix(Self::TEXT_THREAD_URL_PREFIX)
-                {
-                    let filename = urlencoding::decode(encoded_filename).ok()?;
-                    let path = contexts_dir().join(filename.as_ref()).into();
-                    Some(MentionLink::TextThread(path))
-                } else {
-                    let thread_id = ThreadId::from(argument);
-                    Some(MentionLink::Thread(thread_id))
-                }
-            }
-            Self::FETCH => Some(MentionLink::Fetch(argument.to_string())),
-            Self::RULE => {
-                let prompt_id = UserPromptId(Uuid::try_parse(argument).ok()?);
-                Some(MentionLink::Rule(prompt_id))
-            }
-            _ => None,
-        }
-    }
 }
diff --git a/crates/agent_ui/src/context_strip.rs b/crates/agent_ui/src/context_strip.rs
index d25d7d3544..b75b933de4 100644
--- a/crates/agent_ui/src/context_strip.rs
+++ b/crates/agent_ui/src/context_strip.rs
@@ -12,16 +12,19 @@ use agent::{
 };
 use collections::HashSet;
 use editor::Editor;
-use file_icons::FileIcons;
 use gpui::{
     App, Bounds, ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    Subscription, WeakEntity,
+    Subscription, Task, WeakEntity,
 };
 use itertools::Itertools;
 use project::ProjectItem;
-use std::{path::Path, rc::Rc};
+use rope::Point;
+use std::rc::Rc;
+use text::ToPoint as _;
 use ui::{PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
+use util::ResultExt as _;
 use workspace::Workspace;
+use zed_actions::assistant::OpenRulesLibrary;
 
 pub struct ContextStrip {
     context_store: Entity<ContextStore>,
@@ -121,38 +124,10 @@ impl ContextStrip {
 
     fn suggested_context(&self, cx: &App) -> Option<SuggestedContext> {
         match self.suggest_context_kind {
-            SuggestContextKind::File => self.suggested_file(cx),
             SuggestContextKind::Thread => self.suggested_thread(cx),
         }
     }
 
-    fn suggested_file(&self, cx: &App) -> Option<SuggestedContext> {
-        let workspace = self.workspace.upgrade()?;
-        let active_item = workspace.read(cx).active_item(cx)?;
-
-        let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
-        let active_buffer_entity = editor.buffer().read(cx).as_singleton()?;
-        let active_buffer = active_buffer_entity.read(cx);
-        let project_path = active_buffer.project_path(cx)?;
-
-        if self
-            .context_store
-            .read(cx)
-            .file_path_included(&project_path, cx)
-            .is_some()
-        {
-            return None;
-        }
-
-        let file_name = active_buffer.file()?.file_name(cx);
-        let icon_path = FileIcons::get_icon(Path::new(&file_name), cx);
-        Some(SuggestedContext::File {
-            name: file_name.to_string_lossy().into_owned().into(),
-            buffer: active_buffer_entity.downgrade(),
-            icon_path,
-        })
-    }
-
     fn suggested_thread(&self, cx: &App) -> Option<SuggestedContext> {
         if !self.context_picker.read(cx).allow_threads() {
             return None;
@@ -161,24 +136,7 @@ impl ContextStrip {
         let workspace = self.workspace.upgrade()?;
         let panel = workspace.read(cx).panel::<AgentPanel>(cx)?.read(cx);
 
-        if let Some(active_thread) = panel.active_thread(cx) {
-            let weak_active_thread = active_thread.downgrade();
-
-            let active_thread = active_thread.read(cx);
-
-            if self
-                .context_store
-                .read(cx)
-                .includes_thread(active_thread.id())
-            {
-                return None;
-            }
-
-            Some(SuggestedContext::Thread {
-                name: active_thread.summary().or_default(),
-                thread: weak_active_thread,
-            })
-        } else if let Some(active_context_editor) = panel.active_context_editor() {
+        if let Some(active_context_editor) = panel.active_context_editor() {
             let context = active_context_editor.read(cx).context();
             let weak_context = context.downgrade();
             let context = context.read(cx);
@@ -328,7 +286,75 @@ impl ContextStrip {
             return;
         };
 
-        crate::active_thread::open_context(context, workspace, window, cx);
+        match context {
+            AgentContextHandle::File(file_context) => {
+                if let Some(project_path) = file_context.project_path(cx) {
+                    workspace.update(cx, |workspace, cx| {
+                        workspace
+                            .open_path(project_path, None, true, window, cx)
+                            .detach_and_log_err(cx);
+                    });
+                }
+            }
+
+            AgentContextHandle::Directory(directory_context) => {
+                let entry_id = directory_context.entry_id;
+                workspace.update(cx, |workspace, cx| {
+                    workspace.project().update(cx, |_project, cx| {
+                        cx.emit(project::Event::RevealInProjectPanel(entry_id));
+                    })
+                })
+            }
+
+            AgentContextHandle::Symbol(symbol_context) => {
+                let buffer = symbol_context.buffer.read(cx);
+                if let Some(project_path) = buffer.project_path(cx) {
+                    let snapshot = buffer.snapshot();
+                    let target_position = symbol_context.range.start.to_point(&snapshot);
+                    open_editor_at_position(project_path, target_position, &workspace, window, cx)
+                        .detach();
+                }
+            }
+
+            AgentContextHandle::Selection(selection_context) => {
+                let buffer = selection_context.buffer.read(cx);
+                if let Some(project_path) = buffer.project_path(cx) {
+                    let snapshot = buffer.snapshot();
+                    let target_position = selection_context.range.start.to_point(&snapshot);
+
+                    open_editor_at_position(project_path, target_position, &workspace, window, cx)
+                        .detach();
+                }
+            }
+
+            AgentContextHandle::FetchedUrl(fetched_url_context) => {
+                cx.open_url(&fetched_url_context.url);
+            }
+
+            AgentContextHandle::Thread(_thread_context) => {}
+
+            AgentContextHandle::TextThread(text_thread_context) => {
+                workspace.update(cx, |workspace, cx| {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        let context = text_thread_context.context.clone();
+                        window.defer(cx, move |window, cx| {
+                            panel.update(cx, |panel, cx| {
+                                panel.open_prompt_editor(context, window, cx)
+                            });
+                        });
+                    }
+                })
+            }
+
+            AgentContextHandle::Rules(rules_context) => window.dispatch_action(
+                Box::new(OpenRulesLibrary {
+                    prompt_to_select: Some(rules_context.prompt_id.0),
+                }),
+                cx,
+            ),
+
+            AgentContextHandle::Image(_) => {}
+        }
     }
 
     fn remove_focused_context(
@@ -569,6 +595,31 @@ pub enum ContextStripEvent {
 impl EventEmitter<ContextStripEvent> for ContextStrip {}
 
 pub enum SuggestContextKind {
-    File,
     Thread,
 }
+
+fn open_editor_at_position(
+    project_path: project::ProjectPath,
+    target_position: Point,
+    workspace: &Entity<Workspace>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Task<()> {
+    let open_task = workspace.update(cx, |workspace, cx| {
+        workspace.open_path(project_path, None, true, window, cx)
+    });
+    window.spawn(cx, async move |cx| {
+        if let Some(active_editor) = open_task
+            .await
+            .log_err()
+            .and_then(|item| item.downcast::<Editor>())
+        {
+            active_editor
+                .downgrade()
+                .update_in(cx, |editor, window, cx| {
+                    editor.go_to_singleton_buffer_point(target_position, window, cx);
+                })
+                .log_err();
+        }
+    })
+}
diff --git a/crates/agent_ui/src/debug.rs b/crates/agent_ui/src/debug.rs
deleted file mode 100644
index 227528e8ae..0000000000
--- a/crates/agent_ui/src/debug.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-#![allow(unused, dead_code)]
-
-use client::{ModelRequestUsage, RequestUsage};
-use cloud_llm_client::{Plan, PlanV1, UsageLimit};
-use gpui::Global;
-use std::ops::{Deref, DerefMut};
-use ui::prelude::*;
-
-/// Debug only: Used for testing various account states
-///
-/// Use this by initializing it with
-/// `cx.set_global(DebugAccountState::default());` somewhere
-///
-/// Then call `cx.debug_account()` to get access
-#[derive(Clone, Debug)]
-pub struct DebugAccountState {
-    pub enabled: bool,
-    pub trial_expired: bool,
-    pub plan: Plan,
-    pub custom_prompt_usage: ModelRequestUsage,
-    pub usage_based_billing_enabled: bool,
-    pub monthly_spending_cap: i32,
-    pub custom_edit_prediction_usage: UsageLimit,
-}
-
-impl DebugAccountState {
-    pub fn enabled(&self) -> bool {
-        self.enabled
-    }
-
-    pub fn set_enabled(&mut self, enabled: bool) -> &mut Self {
-        self.enabled = enabled;
-        self
-    }
-
-    pub fn set_trial_expired(&mut self, trial_expired: bool) -> &mut Self {
-        self.trial_expired = trial_expired;
-        self
-    }
-
-    pub fn set_plan(&mut self, plan: Plan) -> &mut Self {
-        self.plan = plan;
-        self
-    }
-
-    pub fn set_custom_prompt_usage(&mut self, custom_prompt_usage: ModelRequestUsage) -> &mut Self {
-        self.custom_prompt_usage = custom_prompt_usage;
-        self
-    }
-
-    pub fn set_usage_based_billing_enabled(
-        &mut self,
-        usage_based_billing_enabled: bool,
-    ) -> &mut Self {
-        self.usage_based_billing_enabled = usage_based_billing_enabled;
-        self
-    }
-
-    pub fn set_monthly_spending_cap(&mut self, monthly_spending_cap: i32) -> &mut Self {
-        self.monthly_spending_cap = monthly_spending_cap;
-        self
-    }
-
-    pub fn set_custom_edit_prediction_usage(
-        &mut self,
-        custom_edit_prediction_usage: UsageLimit,
-    ) -> &mut Self {
-        self.custom_edit_prediction_usage = custom_edit_prediction_usage;
-        self
-    }
-}
-
-impl Default for DebugAccountState {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            trial_expired: false,
-            plan: Plan::V1(PlanV1::ZedFree),
-            custom_prompt_usage: ModelRequestUsage(RequestUsage {
-                limit: UsageLimit::Unlimited,
-                amount: 0,
-            }),
-            usage_based_billing_enabled: false,
-            // $50.00
-            monthly_spending_cap: 5000,
-            custom_edit_prediction_usage: UsageLimit::Unlimited,
-        }
-    }
-}
-
-impl DebugAccountState {
-    pub fn get_global(cx: &App) -> &Self {
-        &cx.global::<GlobalDebugAccountState>().0
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct GlobalDebugAccountState(pub DebugAccountState);
-
-impl Global for GlobalDebugAccountState {}
-
-impl Deref for GlobalDebugAccountState {
-    type Target = DebugAccountState;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for GlobalDebugAccountState {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-pub trait DebugAccount {
-    fn debug_account(&self) -> &DebugAccountState;
-}
-
-impl DebugAccount for App {
-    fn debug_account(&self) -> &DebugAccountState {
-        &self.global::<GlobalDebugAccountState>().0
-    }
-}
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index 0e817ca807..f6347dcb6b 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -11,8 +11,8 @@ use editor::{
 };
 use fs::Fs;
 use gpui::{
-    AnyElement, App, Context, CursorStyle, Entity, EventEmitter, FocusHandle, Focusable,
-    Subscription, TextStyle, WeakEntity, Window,
+    AnyElement, App, ClipboardEntry, Context, CursorStyle, Entity, EventEmitter, FocusHandle,
+    Focusable, Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
 use parking_lot::Mutex;
@@ -272,7 +272,31 @@ impl<T: 'static> PromptEditor<T> {
     }
 
     fn paste(&mut self, _: &Paste, _window: &mut Window, cx: &mut Context<Self>) {
-        crate::active_thread::attach_pasted_images_as_context(&self.context_store, cx);
+        let images = cx
+            .read_from_clipboard()
+            .map(|item| {
+                item.into_entries()
+                    .filter_map(|entry| {
+                        if let ClipboardEntry::Image(image) = entry {
+                            Some(image)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+
+        if images.is_empty() {
+            return;
+        }
+        cx.stop_propagation();
+
+        self.context_store.update(cx, |store, cx| {
+            for image in images {
+                store.add_image_instance(Arc::new(image), cx);
+            }
+        });
     }
 
     fn handle_prompt_editor_events(
diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs
index e9a482c5f4..a1311f3923 100644
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1,157 +1,14 @@
-use std::collections::BTreeMap;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use crate::agent_diff::AgentDiffThread;
-use crate::agent_model_selector::AgentModelSelector;
-use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
-use crate::ui::{
-    BurnModeTooltip,
-    preview::{AgentPreview, UsageCallout},
-};
-use agent::history_store::HistoryStore;
-use agent::{
-    context::{AgentContextKey, ContextLoadResult, load_context},
-    context_store::ContextStoreEvent,
-};
-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
-use ai_onboarding::ApiKeysWithProviders;
-use buffer_diff::BufferDiff;
-use cloud_llm_client::{CompletionIntent, PlanV1};
-use collections::{HashMap, HashSet};
-use editor::actions::{MoveUp, Paste};
+use agent::{context::AgentContextKey, context_store::ContextStoreEvent};
+use agent_settings::AgentProfileId;
+use collections::HashMap;
 use editor::display_map::CreaseId;
-use editor::{
-    Addon, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorEvent, EditorMode, EditorStyle, MultiBuffer,
-};
-use file_icons::FileIcons;
-use fs::Fs;
-use futures::future::Shared;
-use futures::{FutureExt as _, future};
-use gpui::{
-    Animation, AnimationExt, App, Entity, EventEmitter, Focusable, IntoElement, KeyContext,
-    Subscription, Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point,
-    pulsating_between,
-};
-use language::{Buffer, Language, Point};
-use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequestMessage, MessageContent,
-    ZED_CLOUD_PROVIDER_ID,
-};
-use multi_buffer;
-use project::Project;
-use prompt_store::PromptStore;
-use settings::Settings;
-use std::time::Duration;
-use theme::ThemeSettings;
-use ui::{
-    Callout, Disclosure, Divider, DividerColor, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*,
-};
-use util::ResultExt as _;
-use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::Chat;
-use zed_actions::agent::ToggleModelSelector;
+use editor::{Addon, AnchorRangeExt, Editor};
+use gpui::{App, Entity, Subscription};
+use ui::prelude::*;
 
-use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
-use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::profile_selector::{ProfileProvider, ProfileSelector};
-use crate::{
-    ActiveThread, AgentDiffPane, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
-    ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
-    ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
-};
-use agent::{
-    MessageCrease, Thread, TokenUsageRatio,
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};
-
-pub const MIN_EDITOR_LINES: usize = 4;
-pub const MAX_EDITOR_LINES: usize = 8;
-
-#[derive(RegisterComponent)]
-pub struct MessageEditor {
-    thread: Entity<Thread>,
-    incompatible_tools_state: Entity<IncompatibleToolsState>,
-    editor: Entity<Editor>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    context_store: Entity<ContextStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    history_store: Option<WeakEntity<HistoryStore>>,
-    context_strip: Entity<ContextStrip>,
-    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    model_selector: Entity<AgentModelSelector>,
-    last_loaded_context: Option<ContextLoadResult>,
-    load_context_task: Option<Shared<Task<()>>>,
-    profile_selector: Entity<ProfileSelector>,
-    edits_expanded: bool,
-    editor_is_expanded: bool,
-    last_estimated_token_count: Option<u64>,
-    update_token_count_task: Option<Task<()>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-pub(crate) fn create_editor(
-    workspace: WeakEntity<Workspace>,
-    context_store: WeakEntity<ContextStore>,
-    thread_store: WeakEntity<ThreadStore>,
-    text_thread_store: WeakEntity<TextThreadStore>,
-    min_lines: usize,
-    max_lines: Option<usize>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<Editor> {
-    let language = Language::new(
-        language::LanguageConfig {
-            completion_query_characters: HashSet::from_iter(['.', '-', '_', '@']),
-            ..Default::default()
-        },
-        None,
-    );
-
-    let editor = cx.new(|cx| {
-        let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let mut editor = Editor::new(
-            editor::EditorMode::AutoHeight {
-                min_lines,
-                max_lines,
-            },
-            buffer,
-            None,
-            window,
-            cx,
-        );
-        editor.set_placeholder_text("Message the agent – @ to include context", window, cx);
-        editor.disable_word_completions();
-        editor.set_show_indent_guides(false, cx);
-        editor.set_soft_wrap();
-        editor.set_use_modal_editing(true);
-        editor.set_context_menu_options(ContextMenuOptions {
-            min_entries_visible: 12,
-            max_entries_visible: 12,
-            placement: Some(ContextMenuPlacement::Above),
-        });
-        editor.register_addon(ContextCreasesAddon::new());
-        editor.register_addon(MessageEditorAddon::new());
-        editor
-    });
-
-    let editor_entity = editor.downgrade();
-    editor.update(cx, |editor, _| {
-        editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
-            workspace,
-            context_store,
-            Some(thread_store),
-            Some(text_thread_store),
-            editor_entity,
-            None,
-        ))));
-    });
-    editor
-}
+use crate::context_picker::crease_for_mention;
+use crate::profile_selector::ProfileProvider;
+use agent::{MessageCrease, Thread, context_store::ContextStore};
 
 impl ProfileProvider for Entity<Thread> {
     fn profiles_supported(&self, cx: &App) -> bool {
@@ -171,1362 +28,12 @@ impl ProfileProvider for Entity<Thread> {
     }
 }
 
-impl MessageEditor {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        workspace: WeakEntity<Workspace>,
-        context_store: Entity<ContextStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        thread_store: WeakEntity<ThreadStore>,
-        text_thread_store: WeakEntity<TextThreadStore>,
-        history_store: Option<WeakEntity<HistoryStore>>,
-        thread: Entity<Thread>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();
-
-        let editor = create_editor(
-            workspace.clone(),
-            context_store.downgrade(),
-            thread_store.clone(),
-            text_thread_store.clone(),
-            MIN_EDITOR_LINES,
-            Some(MAX_EDITOR_LINES),
-            window,
-            cx,
-        );
-
-        let context_strip = cx.new(|cx| {
-            ContextStrip::new(
-                context_store.clone(),
-                workspace.clone(),
-                Some(thread_store.clone()),
-                Some(text_thread_store.clone()),
-                context_picker_menu_handle.clone(),
-                SuggestContextKind::File,
-                ModelUsageContext::Thread(thread.clone()),
-                window,
-                cx,
-            )
-        });
-
-        let incompatible_tools = cx.new(|cx| IncompatibleToolsState::new(thread.clone(), cx));
-
-        let subscriptions = vec![
-            cx.subscribe_in(&context_strip, window, Self::handle_context_strip_event),
-            cx.subscribe(&editor, |this, _, event: &EditorEvent, cx| {
-                if event == &EditorEvent::BufferEdited {
-                    this.handle_message_changed(cx)
-                }
-            }),
-            cx.observe(&context_store, |this, _, cx| {
-                // When context changes, reload it for token counting.
-                let _ = this.reload_context(cx);
-            }),
-            cx.observe(&thread.read(cx).action_log().clone(), |_, _, cx| {
-                cx.notify()
-            }),
-        ];
-
-        let model_selector = cx.new(|cx| {
-            AgentModelSelector::new(
-                fs.clone(),
-                model_selector_menu_handle,
-                editor.focus_handle(cx),
-                ModelUsageContext::Thread(thread.clone()),
-                window,
-                cx,
-            )
-        });
-
-        let profile_selector = cx.new(|cx| {
-            ProfileSelector::new(fs, Arc::new(thread.clone()), editor.focus_handle(cx), cx)
-        });
-
-        Self {
-            editor: editor.clone(),
-            project: thread.read(cx).project().clone(),
-            thread,
-            incompatible_tools_state: incompatible_tools,
-            workspace,
-            context_store,
-            prompt_store,
-            history_store,
-            context_strip,
-            context_picker_menu_handle,
-            load_context_task: None,
-            last_loaded_context: None,
-            model_selector,
-            edits_expanded: false,
-            editor_is_expanded: false,
-            profile_selector,
-            last_estimated_token_count: None,
-            update_token_count_task: None,
-            _subscriptions: subscriptions,
-        }
-    }
-
-    pub fn context_store(&self) -> &Entity<ContextStore> {
-        &self.context_store
-    }
-
-    pub fn get_text(&self, cx: &App) -> String {
-        self.editor.read(cx).text(cx)
-    }
-
-    pub fn set_text(
-        &mut self,
-        text: impl Into<Arc<str>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-        });
-    }
-
-    pub fn expand_message_editor(
-        &mut self,
-        _: &ExpandMessageEditor,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_editor_is_expanded(!self.editor_is_expanded, cx);
-    }
-
-    fn set_editor_is_expanded(&mut self, is_expanded: bool, cx: &mut Context<Self>) {
-        self.editor_is_expanded = is_expanded;
-        self.editor.update(cx, |editor, _| {
-            if self.editor_is_expanded {
-                editor.set_mode(EditorMode::Full {
-                    scale_ui_elements_with_buffer_font_size: false,
-                    show_active_line_background: false,
-                    sized_by_content: false,
-                })
-            } else {
-                editor.set_mode(EditorMode::AutoHeight {
-                    min_lines: MIN_EDITOR_LINES,
-                    max_lines: Some(MAX_EDITOR_LINES),
-                })
-            }
-        });
-        cx.notify();
-    }
-
-    fn toggle_context_picker(
-        &mut self,
-        _: &ToggleContextPicker,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_picker_menu_handle.toggle(window, cx);
-    }
-
-    pub fn remove_all_context(
-        &mut self,
-        _: &RemoveAllContext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_store.update(cx, |store, cx| store.clear(cx));
-        cx.notify();
-    }
-
-    fn chat(&mut self, _: &Chat, window: &mut Window, cx: &mut Context<Self>) {
-        if self.is_editor_empty(cx) {
-            return;
-        }
-
-        self.thread.update(cx, |thread, cx| {
-            thread.cancel_editing(cx);
-        });
-
-        if self.thread.read(cx).is_generating() {
-            self.stop_current_and_send_new_message(window, cx);
-            return;
-        }
-
-        self.set_editor_is_expanded(false, cx);
-        self.send_to_model(window, cx);
-
-        cx.emit(MessageEditorEvent::ScrollThreadToBottom);
-        cx.notify();
-    }
-
-    fn chat_with_follow(
-        &mut self,
-        _: &ChatWithFollow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace
-            .update(cx, |this, cx| {
-                this.follow(CollaboratorId::Agent, window, cx)
-            })
-            .log_err();
-
-        self.chat(&Chat, window, cx);
-    }
-
-    fn is_editor_empty(&self, cx: &App) -> bool {
-        self.editor.read(cx).text(cx).trim().is_empty()
-    }
-
-    pub fn is_editor_fully_empty(&self, cx: &App) -> bool {
-        self.editor.read(cx).is_empty(cx)
-    }
-
-    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, .. }) = self
-            .thread
-            .update(cx, |thread, cx| thread.get_or_init_configured_model(cx))
-        else {
-            return;
-        };
-
-        let (user_message, user_message_creases) = self.editor.update(cx, |editor, cx| {
-            let creases = extract_message_creases(editor, cx);
-            let text = editor.text(cx);
-            editor.clear(window, cx);
-            (text, creases)
-        });
-
-        self.last_estimated_token_count.take();
-        cx.emit(MessageEditorEvent::EstimatedTokenCount);
-
-        let thread = self.thread.clone();
-        let git_store = self.project.read(cx).git_store().clone();
-        let checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
-        let context_task = self.reload_context(cx);
-        let window_handle = window.window_handle();
-
-        cx.spawn(async move |_this, cx| {
-            let (checkpoint, loaded_context) = future::join(checkpoint, context_task).await;
-            let loaded_context = loaded_context.unwrap_or_default();
-
-            thread
-                .update(cx, |thread, cx| {
-                    thread.insert_user_message(
-                        user_message,
-                        loaded_context,
-                        checkpoint.ok(),
-                        user_message_creases,
-                        cx,
-                    );
-                })
-                .log_err();
-
-            thread
-                .update(cx, |thread, cx| {
-                    thread.advance_prompt_id();
-                    thread.send_to_model(
-                        model,
-                        CompletionIntent::UserPrompt,
-                        Some(window_handle),
-                        cx,
-                    );
-                })
-                .log_err();
-        })
-        .detach();
-    }
-
-    fn stop_current_and_send_new_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.thread.update(cx, |thread, cx| {
-            thread.cancel_editing(cx);
-        });
-
-        let canceled = self.thread.update(cx, |thread, cx| {
-            thread.cancel_last_completion(Some(window.window_handle()), cx)
-        });
-
-        if canceled {
-            self.set_editor_is_expanded(false, cx);
-            self.send_to_model(window, cx);
-        }
-    }
-
-    fn handle_context_strip_event(
-        &mut self,
-        _context_strip: &Entity<ContextStrip>,
-        event: &ContextStripEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ContextStripEvent::PickerDismissed
-            | ContextStripEvent::BlurredEmpty
-            | ContextStripEvent::BlurredDown => {
-                let editor_focus_handle = self.editor.focus_handle(cx);
-                window.focus(&editor_focus_handle);
-            }
-            ContextStripEvent::BlurredUp => {}
-        }
-    }
-
-    fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        if self.context_picker_menu_handle.is_deployed() {
-            cx.propagate();
-        } else if self.context_strip.read(cx).has_context_items(cx) {
-            self.context_strip.focus_handle(cx).focus(window);
-        }
-    }
-
-    fn paste(&mut self, _: &Paste, _: &mut Window, cx: &mut Context<Self>) {
-        crate::active_thread::attach_pasted_images_as_context(&self.context_store, cx);
-    }
-
-    fn handle_review_click(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.edits_expanded = true;
-        AgentDiffPane::deploy(self.thread.clone(), self.workspace.clone(), window, cx).log_err();
-        cx.notify();
-    }
-
-    fn handle_edit_bar_expand(&mut self, cx: &mut Context<Self>) {
-        self.edits_expanded = !self.edits_expanded;
-        cx.notify();
-    }
-
-    fn handle_file_click(
-        &self,
-        buffer: Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Ok(diff) = AgentDiffPane::deploy(
-            AgentDiffThread::Native(self.thread.clone()),
-            self.workspace.clone(),
-            window,
-            cx,
-        ) {
-            let path_key = multi_buffer::PathKey::for_buffer(&buffer, cx);
-            diff.update(cx, |diff, cx| diff.move_to_path(path_key, window, cx));
-        }
-    }
-
-    pub fn toggle_burn_mode(
-        &mut self,
-        _: &ToggleBurnMode,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.thread.update(cx, |thread, _cx| {
-            let active_completion_mode = thread.completion_mode();
-
-            thread.set_completion_mode(match active_completion_mode {
-                CompletionMode::Burn => CompletionMode::Normal,
-                CompletionMode::Normal => CompletionMode::Burn,
-            });
-        });
-    }
-
-    fn handle_accept_all(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
-        self.thread.update(cx, |thread, cx| {
-            thread.keep_all_edits(cx);
-        });
-        cx.notify();
-    }
-
-    fn handle_reject_all(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
-        // Since there's no reject_all_edits method in the thread API,
-        // we need to iterate through all buffers and reject their edits
-        let action_log = self.thread.read(cx).action_log().clone();
-        let changed_buffers = action_log.read(cx).changed_buffers(cx);
-
-        for (buffer, _) in changed_buffers {
-            self.thread.update(cx, |thread, cx| {
-                let buffer_snapshot = buffer.read(cx);
-                let start = buffer_snapshot.anchor_before(Point::new(0, 0));
-                let end = buffer_snapshot.anchor_after(buffer_snapshot.max_point());
-                thread
-                    .reject_edits_in_ranges(buffer, vec![start..end], cx)
-                    .detach();
-            });
-        }
-        cx.notify();
-    }
-
-    fn handle_reject_file_changes(
-        &mut self,
-        buffer: Entity<Buffer>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
-        self.thread.update(cx, |thread, cx| {
-            let buffer_snapshot = buffer.read(cx);
-            let start = buffer_snapshot.anchor_before(Point::new(0, 0));
-            let end = buffer_snapshot.anchor_after(buffer_snapshot.max_point());
-            thread
-                .reject_edits_in_ranges(buffer, vec![start..end], cx)
-                .detach();
-        });
-        cx.notify();
-    }
-
-    fn handle_accept_file_changes(
-        &mut self,
-        buffer: Entity<Buffer>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
-        self.thread.update(cx, |thread, cx| {
-            let buffer_snapshot = buffer.read(cx);
-            let start = buffer_snapshot.anchor_before(Point::new(0, 0));
-            let end = buffer_snapshot.anchor_after(buffer_snapshot.max_point());
-            thread.keep_edits_in_range(buffer, start..end, cx);
-        });
-        cx.notify();
-    }
-
-    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let thread = self.thread.read(cx);
-        let model = thread.configured_model();
-        if !model?.model.supports_burn_mode() {
-            return None;
-        }
-
-        let active_completion_mode = thread.completion_mode();
-        let burn_mode_enabled = active_completion_mode == CompletionMode::Burn;
-        let icon = if burn_mode_enabled {
-            IconName::ZedBurnModeOn
-        } else {
-            IconName::ZedBurnMode
-        };
-
-        Some(
-            IconButton::new("burn-mode", icon)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .toggle_state(burn_mode_enabled)
-                .selected_icon_color(Color::Error)
-                .on_click(cx.listener(|this, _event, window, cx| {
-                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                }))
-                .tooltip(move |_window, cx| {
-                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
-                        .into()
-                })
-                .into_any_element(),
-        )
-    }
-
-    fn render_follow_toggle(
-        &self,
-        is_model_selected: bool,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let following = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                workspace.is_being_followed(CollaboratorId::Agent)
-            })
-            .unwrap_or(false);
-
-        IconButton::new("follow-agent", IconName::Crosshair)
-            .disabled(!is_model_selected)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .toggle_state(following)
-            .selected_icon_color(Some(Color::Custom(cx.theme().players().agent().cursor)))
-            .tooltip(move |window, cx| {
-                if following {
-                    Tooltip::for_action("Stop Following Agent", &Follow, window, cx)
-                } else {
-                    Tooltip::with_meta(
-                        "Follow Agent",
-                        Some(&Follow),
-                        "Track the agent's location as it reads and edits files.",
-                        window,
-                        cx,
-                    )
-                }
-            })
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.workspace
-                    .update(cx, |workspace, cx| {
-                        if following {
-                            workspace.unfollow(CollaboratorId::Agent, window, cx);
-                        } else {
-                            workspace.follow(CollaboratorId::Agent, window, cx);
-                        }
-                    })
-                    .ok();
-            }))
-    }
-
-    fn render_editor(&self, window: &mut Window, cx: &mut Context<Self>) -> Div {
-        let thread = self.thread.read(cx);
-        let model = thread.configured_model();
-
-        let editor_bg_color = cx.theme().colors().editor_background;
-        let is_generating = thread.is_generating();
-        let focus_handle = self.editor.focus_handle(cx);
-
-        let is_model_selected = model.is_some();
-        let is_editor_empty = self.is_editor_empty(cx);
-
-        let incompatible_tools = model
-            .as_ref()
-            .map(|model| {
-                self.incompatible_tools_state.update(cx, |state, cx| {
-                    state.incompatible_tools(&model.model, cx).to_vec()
-                })
-            })
-            .unwrap_or_default();
-
-        let is_editor_expanded = self.editor_is_expanded;
-        let expand_icon = if is_editor_expanded {
-            IconName::Minimize
-        } else {
-            IconName::Maximize
-        };
-
-        v_flex()
-            .key_context("MessageEditor")
-            .on_action(cx.listener(Self::chat))
-            .on_action(cx.listener(Self::chat_with_follow))
-            .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
-                this.profile_selector
-                    .read(cx)
-                    .menu_handle()
-                    .toggle(window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
-                this.model_selector
-                    .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
-            }))
-            .on_action(cx.listener(Self::toggle_context_picker))
-            .on_action(cx.listener(Self::remove_all_context))
-            .on_action(cx.listener(Self::move_up))
-            .on_action(cx.listener(Self::expand_message_editor))
-            .on_action(cx.listener(Self::toggle_burn_mode))
-            .on_action(
-                cx.listener(|this, _: &KeepAll, window, cx| this.handle_accept_all(window, cx)),
-            )
-            .on_action(
-                cx.listener(|this, _: &RejectAll, window, cx| this.handle_reject_all(window, cx)),
-            )
-            .capture_action(cx.listener(Self::paste))
-            .p_2()
-            .gap_2()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .bg(editor_bg_color)
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(self.context_strip.clone())
-                    .when(focus_handle.is_focused(window), |this| {
-                        this.child(
-                            IconButton::new("toggle-height", expand_icon)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        let expand_label = if is_editor_expanded {
-                                            "Minimize Message Editor".to_string()
-                                        } else {
-                                            "Expand Message Editor".to_string()
-                                        };
-
-                                        Tooltip::for_action_in(
-                                            expand_label,
-                                            &ExpandMessageEditor,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                })
-                                .on_click(cx.listener(|_, _, window, cx| {
-                                    window.dispatch_action(Box::new(ExpandMessageEditor), cx);
-                                })),
-                        )
-                    }),
-            )
-            .child(
-                v_flex()
-                    .size_full()
-                    .gap_1()
-                    .when(is_editor_expanded, |this| {
-                        this.h(vh(0.8, window)).justify_between()
-                    })
-                    .child({
-                        let settings = ThemeSettings::get_global(cx);
-                        let font_size = TextSize::Small
-                            .rems(cx)
-                            .to_pixels(settings.agent_font_size(cx));
-                        let line_height = settings.buffer_line_height.value() * font_size;
-
-                        let text_style = TextStyle {
-                            color: cx.theme().colors().text,
-                            font_family: settings.buffer_font.family.clone(),
-                            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                            font_features: settings.buffer_font.features.clone(),
-                            font_size: font_size.into(),
-                            line_height: line_height.into(),
-                            ..Default::default()
-                        };
-
-                        EditorElement::new(
-                            &self.editor,
-                            EditorStyle {
-                                background: editor_bg_color,
-                                local_player: cx.theme().players().local(),
-                                text: text_style,
-                                syntax: cx.theme().syntax().clone(),
-                                ..Default::default()
-                            },
-                        )
-                        .into_any()
-                    })
-                    .child(
-                        h_flex()
-                            .flex_none()
-                            .flex_wrap()
-                            .justify_between()
-                            .child(
-                                h_flex()
-                                    .child(self.render_follow_toggle(is_model_selected, cx))
-                                    .children(self.render_burn_mode_toggle(cx)),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .flex_wrap()
-                                    .when(!incompatible_tools.is_empty(), |this| {
-                                        this.child(
-                                            IconButton::new(
-                                                "tools-incompatible-warning",
-                                                IconName::Warning,
-                                            )
-                                            .icon_color(Color::Warning)
-                                            .icon_size(IconSize::Small)
-                                            .tooltip({
-                                                move |_, cx| {
-                                                    cx.new(|_| IncompatibleToolsTooltip {
-                                                        incompatible_tools: incompatible_tools
-                                                            .clone(),
-                                                    })
-                                                    .into()
-                                                }
-                                            }),
-                                        )
-                                    })
-                                    .child(self.profile_selector.clone())
-                                    .child(self.model_selector.clone())
-                                    .map({
-                                        move |parent| {
-                                            if is_generating {
-                                                parent
-                                                    .when(is_editor_empty, |parent| {
-                                                        parent.child(
-                                                            IconButton::new(
-                                                                "stop-generation",
-                                                                IconName::Stop,
-                                                            )
-                                                            .icon_color(Color::Error)
-                                                            .style(ButtonStyle::Tinted(
-                                                                ui::TintColor::Error,
-                                                            ))
-                                                            .tooltip(move |window, cx| {
-                                                                Tooltip::for_action(
-                                                                    "Stop Generation",
-                                                                    &editor::actions::Cancel,
-                                                                    window,
-                                                                    cx,
-                                                                )
-                                                            })
-                                                            .on_click({
-                                                                let focus_handle =
-                                                                    focus_handle.clone();
-                                                                move |_event, window, cx| {
-                                                                    focus_handle.dispatch_action(
-                                                                        &editor::actions::Cancel,
-                                                                        window,
-                                                                        cx,
-                                                                    );
-                                                                }
-                                                            })
-                                                            .with_animation(
-                                                                "pulsating-label",
-                                                                Animation::new(
-                                                                    Duration::from_secs(2),
-                                                                )
-                                                                .repeat()
-                                                                .with_easing(pulsating_between(
-                                                                    0.4, 1.0,
-                                                                )),
-                                                                |icon_button, delta| {
-                                                                    icon_button.alpha(delta)
-                                                                },
-                                                            ),
-                                                        )
-                                                    })
-                                                    .when(!is_editor_empty, |parent| {
-                                                        parent.child(
-                                                            IconButton::new(
-                                                                "send-message",
-                                                                IconName::Send,
-                                                            )
-                                                            .icon_color(Color::Accent)
-                                                            .style(ButtonStyle::Filled)
-                                                            .disabled(!is_model_selected)
-                                                            .on_click({
-                                                                let focus_handle =
-                                                                    focus_handle.clone();
-                                                                move |_event, window, cx| {
-                                                                    focus_handle.dispatch_action(
-                                                                        &Chat, window, cx,
-                                                                    );
-                                                                }
-                                                            })
-                                                            .tooltip(move |window, cx| {
-                                                                Tooltip::for_action(
-                                                                    "Stop and Send New Message",
-                                                                    &Chat,
-                                                                    window,
-                                                                    cx,
-                                                                )
-                                                            }),
-                                                        )
-                                                    })
-                                            } else {
-                                                parent.child(
-                                                    IconButton::new("send-message", IconName::Send)
-                                                        .icon_color(Color::Accent)
-                                                        .style(ButtonStyle::Filled)
-                                                        .disabled(
-                                                            is_editor_empty || !is_model_selected,
-                                                        )
-                                                        .on_click({
-                                                            let focus_handle = focus_handle.clone();
-                                                            move |_event, window, cx| {
-                                                                telemetry::event!(
-                                                                    "Agent Message Sent",
-                                                                    agent = "zed",
-                                                                );
-                                                                focus_handle.dispatch_action(
-                                                                    &Chat, window, cx,
-                                                                );
-                                                            }
-                                                        })
-                                                        .when(
-                                                            !is_editor_empty && is_model_selected,
-                                                            |button| {
-                                                                button.tooltip(move |window, cx| {
-                                                                    Tooltip::for_action(
-                                                                        "Send", &Chat, window, cx,
-                                                                    )
-                                                                })
-                                                            },
-                                                        )
-                                                        .when(is_editor_empty, |button| {
-                                                            button.tooltip(Tooltip::text(
-                                                                "Type a message to submit",
-                                                            ))
-                                                        })
-                                                        .when(!is_model_selected, |button| {
-                                                            button.tooltip(Tooltip::text(
-                                                                "Select a model to continue",
-                                                            ))
-                                                        }),
-                                                )
-                                            }
-                                        }
-                                    }),
-                            ),
-                    ),
-            )
-    }
-
-    fn render_edits_bar(
-        &self,
-        changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Div {
-        let focus_handle = self.editor.focus_handle(cx);
-
-        let editor_bg_color = cx.theme().colors().editor_background;
-        let border_color = cx.theme().colors().border;
-        let active_color = cx.theme().colors().element_selected;
-        let bg_edit_files_disclosure = editor_bg_color.blend(active_color.opacity(0.3));
-
-        let is_edit_changes_expanded = self.edits_expanded;
-        let thread = self.thread.read(cx);
-        let pending_edits = thread.has_pending_edit_tool_uses();
-
-        const EDIT_NOT_READY_TOOLTIP_LABEL: &str = "Wait until file edits are complete.";
-
-        v_flex()
-            .mt_1()
-            .mx_2()
-            .bg(bg_edit_files_disclosure)
-            .border_1()
-            .border_b_0()
-            .border_color(border_color)
-            .rounded_t_md()
-            .shadow(vec![gpui::BoxShadow {
-                color: gpui::black().opacity(0.15),
-                offset: point(px(1.), px(-1.)),
-                blur_radius: px(3.),
-                spread_radius: px(0.),
-            }])
-            .child(
-                h_flex()
-                    .p_1()
-                    .justify_between()
-                    .when(is_edit_changes_expanded, |this| {
-                        this.border_b_1().border_color(border_color)
-                    })
-                    .child(
-                        h_flex()
-                            .id("edits-container")
-                            .cursor_pointer()
-                            .w_full()
-                            .gap_1()
-                            .child(
-                                Disclosure::new("edits-disclosure", is_edit_changes_expanded)
-                                    .on_click(cx.listener(|this, _, _, cx| {
-                                        this.handle_edit_bar_expand(cx)
-                                    })),
-                            )
-                            .map(|this| {
-                                if pending_edits {
-                                    this.child(
-                                        Label::new(format!(
-                                            "Editing {} {}…",
-                                            changed_buffers.len(),
-                                            if changed_buffers.len() == 1 {
-                                                "file"
-                                            } else {
-                                                "files"
-                                            }
-                                        ))
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small)
-                                        .with_animation(
-                                            "edit-label",
-                                            Animation::new(Duration::from_secs(2))
-                                                .repeat()
-                                                .with_easing(pulsating_between(0.3, 0.7)),
-                                            |label, delta| label.alpha(delta),
-                                        ),
-                                    )
-                                } else {
-                                    this.child(
-                                        Label::new("Edits")
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(
-                                        Label::new("•").size(LabelSize::XSmall).color(Color::Muted),
-                                    )
-                                    .child(
-                                        Label::new(format!(
-                                            "{} {}",
-                                            changed_buffers.len(),
-                                            if changed_buffers.len() == 1 {
-                                                "file"
-                                            } else {
-                                                "files"
-                                            }
-                                        ))
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                    )
-                                }
-                            })
-                            .on_click(
-                                cx.listener(|this, _, _, cx| this.handle_edit_bar_expand(cx)),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                IconButton::new("review-changes", IconName::ListTodo)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip({
-                                        let focus_handle = focus_handle.clone();
-                                        move |window, cx| {
-                                            Tooltip::for_action_in(
-                                                "Review Changes",
-                                                &OpenAgentDiff,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.handle_review_click(window, cx)
-                                    })),
-                            )
-                            .child(Divider::vertical().color(DividerColor::Border))
-                            .child(
-                                Button::new("reject-all-changes", "Reject All")
-                                    .label_size(LabelSize::Small)
-                                    .disabled(pending_edits)
-                                    .when(pending_edits, |this| {
-                                        this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                                    })
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &RejectAll,
-                                            &focus_handle.clone(),
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                    )
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.handle_reject_all(window, cx)
-                                    })),
-                            )
-                            .child(
-                                Button::new("accept-all-changes", "Accept All")
-                                    .label_size(LabelSize::Small)
-                                    .disabled(pending_edits)
-                                    .when(pending_edits, |this| {
-                                        this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                                    })
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &KeepAll,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                    )
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.handle_accept_all(window, cx)
-                                    })),
-                            ),
-                    ),
-            )
-            .when(is_edit_changes_expanded, |parent| {
-                parent.child(
-                    v_flex().children(changed_buffers.iter().enumerate().flat_map(
-                        |(index, (buffer, _diff))| {
-                            let file = buffer.read(cx).file()?;
-                            let path = file.path();
-
-                            let file_path = path.parent().and_then(|parent| {
-                                let parent_str = parent.to_string_lossy();
-
-                                if parent_str.is_empty() {
-                                    None
-                                } else {
-                                    Some(
-                                        Label::new(format!(
-                                            "/{}{}",
-                                            parent_str,
-                                            std::path::MAIN_SEPARATOR_STR
-                                        ))
-                                        .color(Color::Muted)
-                                        .size(LabelSize::XSmall)
-                                        .buffer_font(cx),
-                                    )
-                                }
-                            });
-
-                            let file_name = path.file_name().map(|name| {
-                                Label::new(name.to_string_lossy().to_string())
-                                    .size(LabelSize::XSmall)
-                                    .buffer_font(cx)
-                            });
-
-                            let file_icon = FileIcons::get_icon(path, cx)
-                                .map(Icon::from_path)
-                                .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
-                                .unwrap_or_else(|| {
-                                    Icon::new(IconName::File)
-                                        .color(Color::Muted)
-                                        .size(IconSize::Small)
-                                });
-
-                            let overlay_gradient = linear_gradient(
-                                90.,
-                                linear_color_stop(editor_bg_color, 1.),
-                                linear_color_stop(editor_bg_color.opacity(0.2), 0.),
-                            );
-
-                            let element = h_flex()
-                                .group("edited-code")
-                                .id(("file-container", index))
-                                .relative()
-                                .py_1()
-                                .pl_2()
-                                .pr_1()
-                                .gap_2()
-                                .justify_between()
-                                .bg(editor_bg_color)
-                                .when(index < changed_buffers.len() - 1, |parent| {
-                                    parent.border_color(border_color).border_b_1()
-                                })
-                                .child(
-                                    h_flex()
-                                        .id(("file-name", index))
-                                        .pr_8()
-                                        .gap_1p5()
-                                        .max_w_full()
-                                        .overflow_x_scroll()
-                                        .child(file_icon)
-                                        .child(
-                                            h_flex()
-                                                .gap_0p5()
-                                                .children(file_name)
-                                                .children(file_path),
-                                        )
-                                        .on_click({
-                                            let buffer = buffer.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.handle_file_click(buffer.clone(), window, cx);
-                                            })
-                                        }), // TODO: Implement line diff
-                                            // .child(Label::new("+").color(Color::Created))
-                                            // .child(Label::new("-").color(Color::Deleted)),
-                                            //
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .visible_on_hover("edited-code")
-                                        .child(
-                                            Button::new("review", "Review")
-                                                .label_size(LabelSize::Small)
-                                                .on_click({
-                                                    let buffer = buffer.clone();
-                                                    cx.listener(move |this, _, window, cx| {
-                                                        this.handle_file_click(
-                                                            buffer.clone(),
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    })
-                                                }),
-                                        )
-                                        .child(
-                                            Divider::vertical().color(DividerColor::BorderVariant),
-                                        )
-                                        .child(
-                                            Button::new("reject-file", "Reject")
-                                                .label_size(LabelSize::Small)
-                                                .disabled(pending_edits)
-                                                .on_click({
-                                                    let buffer = buffer.clone();
-                                                    cx.listener(move |this, _, window, cx| {
-                                                        this.handle_reject_file_changes(
-                                                            buffer.clone(),
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    })
-                                                }),
-                                        )
-                                        .child(
-                                            Button::new("accept-file", "Accept")
-                                                .label_size(LabelSize::Small)
-                                                .disabled(pending_edits)
-                                                .on_click({
-                                                    let buffer = buffer.clone();
-                                                    cx.listener(move |this, _, window, cx| {
-                                                        this.handle_accept_file_changes(
-                                                            buffer.clone(),
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    })
-                                                }),
-                                        ),
-                                )
-                                .child(
-                                    div()
-                                        .id("gradient-overlay")
-                                        .absolute()
-                                        .h_full()
-                                        .w_12()
-                                        .top_0()
-                                        .bottom_0()
-                                        .right(px(152.))
-                                        .bg(overlay_gradient),
-                                );
-
-                            Some(element)
-                        },
-                    )),
-                )
-            })
-    }
-
-    fn is_using_zed_provider(&self, cx: &App) -> bool {
-        self.thread
-            .read(cx)
-            .configured_model()
-            .is_some_and(|model| model.provider.id() == ZED_CLOUD_PROVIDER_ID)
-    }
-
-    fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
-        if !self.is_using_zed_provider(cx) {
-            return None;
-        }
-
-        let user_store = self.project.read(cx).user_store().read(cx);
-        if user_store.is_usage_based_billing_enabled() {
-            return None;
-        }
-
-        let plan = user_store
-            .plan()
-            .unwrap_or(cloud_llm_client::Plan::V1(PlanV1::ZedFree));
-
-        let usage = user_store.model_request_usage()?;
-
-        Some(
-            div()
-                .child(UsageCallout::new(plan, usage))
-                .line_height(line_height),
-        )
-    }
-
-    fn render_token_limit_callout(
-        &self,
-        line_height: Pixels,
-        token_usage_ratio: TokenUsageRatio,
-        cx: &mut Context<Self>,
-    ) -> Option<Div> {
-        let (icon, severity) = if token_usage_ratio == TokenUsageRatio::Exceeded {
-            (IconName::Close, Severity::Error)
-        } else {
-            (IconName::Warning, Severity::Warning)
-        };
-
-        let title = if token_usage_ratio == TokenUsageRatio::Exceeded {
-            "Thread reached the token limit"
-        } else {
-            "Thread reaching the token limit soon"
-        };
-
-        let description = if self.is_using_zed_provider(cx) {
-            "To continue, start a new thread from a summary or turn burn mode on."
-        } else {
-            "To continue, start a new thread from a summary."
-        };
-
-        let callout = Callout::new()
-            .line_height(line_height)
-            .severity(severity)
-            .icon(icon)
-            .title(title)
-            .description(description)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .when(self.is_using_zed_provider(cx), |this| {
-                        this.child(
-                            IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
-                                .icon_size(IconSize::XSmall)
-                                .on_click(cx.listener(|this, _event, window, cx| {
-                                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                                })),
-                        )
-                    })
-                    .child(
-                        Button::new("start-new-thread", "Start New Thread")
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                let from_thread_id = Some(this.thread.read(cx).id().clone());
-                                window.dispatch_action(Box::new(NewThread { from_thread_id }), cx);
-                            })),
-                    ),
-            );
-
-        Some(
-            div()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .child(callout),
-        )
-    }
-
-    pub fn last_estimated_token_count(&self) -> Option<u64> {
-        self.last_estimated_token_count
-    }
-
-    pub fn is_waiting_to_update_token_count(&self) -> bool {
-        self.update_token_count_task.is_some()
-    }
-
-    fn reload_context(&mut self, cx: &mut Context<Self>) -> Task<Option<ContextLoadResult>> {
-        let load_task = cx.spawn(async move |this, cx| {
-            let Ok(load_task) = this.update(cx, |this, cx| {
-                let new_context = this
-                    .context_store
-                    .read(cx)
-                    .new_context_for_thread(this.thread.read(cx), None);
-                load_context(new_context, &this.project, &this.prompt_store, cx)
-            }) else {
-                return;
-            };
-            let result = load_task.await;
-            this.update(cx, |this, cx| {
-                this.last_loaded_context = Some(result);
-                this.load_context_task = None;
-                this.message_or_context_changed(false, cx);
-            })
-            .ok();
-        });
-        // Replace existing load task, if any, causing it to be canceled.
-        let load_task = load_task.shared();
-        self.load_context_task = Some(load_task.clone());
-        cx.spawn(async move |this, cx| {
-            load_task.await;
-            this.read_with(cx, |this, _cx| this.last_loaded_context.clone())
-                .ok()
-                .flatten()
-        })
-    }
-
-    fn handle_message_changed(&mut self, cx: &mut Context<Self>) {
-        self.message_or_context_changed(true, cx);
-    }
-
-    fn message_or_context_changed(&mut self, debounce: bool, cx: &mut Context<Self>) {
-        cx.emit(MessageEditorEvent::Changed);
-        self.update_token_count_task.take();
-
-        let Some(model) = self.thread.read(cx).configured_model() else {
-            self.last_estimated_token_count.take();
-            return;
-        };
-
-        let editor = self.editor.clone();
-
-        self.update_token_count_task = Some(cx.spawn(async move |this, cx| {
-            if debounce {
-                cx.background_executor()
-                    .timer(Duration::from_millis(200))
-                    .await;
-            }
-
-            let token_count = if let Some(task) = this
-                .update(cx, |this, cx| {
-                    let loaded_context = this
-                        .last_loaded_context
-                        .as_ref()
-                        .map(|context_load_result| &context_load_result.loaded_context);
-                    let message_text = editor.read(cx).text(cx);
-
-                    if message_text.is_empty()
-                        && loaded_context.is_none_or(|loaded_context| loaded_context.is_empty())
-                    {
-                        return None;
-                    }
-
-                    let mut request_message = LanguageModelRequestMessage {
-                        role: language_model::Role::User,
-                        content: Vec::new(),
-                        cache: false,
-                    };
-
-                    if let Some(loaded_context) = loaded_context {
-                        loaded_context.add_to_request_message(&mut request_message);
-                    }
-
-                    if !message_text.is_empty() {
-                        request_message
-                            .content
-                            .push(MessageContent::Text(message_text));
-                    }
-
-                    let request = language_model::LanguageModelRequest {
-                        thread_id: None,
-                        prompt_id: None,
-                        intent: None,
-                        mode: None,
-                        messages: vec![request_message],
-                        tools: vec![],
-                        tool_choice: None,
-                        stop: vec![],
-                        temperature: AgentSettings::temperature_for_model(&model.model, cx),
-                        thinking_allowed: true,
-                    };
-
-                    Some(model.model.count_tokens(request, cx))
-                })
-                .ok()
-                .flatten()
-            {
-                task.await.log_err()
-            } else {
-                Some(0)
-            };
-
-            this.update(cx, |this, cx| {
-                if let Some(token_count) = token_count {
-                    this.last_estimated_token_count = Some(token_count);
-                    cx.emit(MessageEditorEvent::EstimatedTokenCount);
-                }
-                this.update_token_count_task.take();
-            })
-            .ok();
-        }));
-    }
-}
-
 #[derive(Default)]
 pub struct ContextCreasesAddon {
     creases: HashMap<AgentContextKey, Vec<(CreaseId, SharedString)>>,
     _subscription: Option<Subscription>,
 }
 
-pub struct MessageEditorAddon {}
-
-impl MessageEditorAddon {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl Addon for MessageEditorAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        Some(self)
-    }
-
-    fn extend_key_context(&self, key_context: &mut KeyContext, cx: &App) {
-        let settings = agent_settings::AgentSettings::get_global(cx);
-        if settings.use_modifier_to_send {
-            key_context.add("use_modifier_to_send");
-        }
-    }
-}
-
 impl Addon for ContextCreasesAddon {
     fn to_any(&self) -> &dyn std::any::Any {
         self
@@ -1631,86 +138,6 @@ pub fn extract_message_creases(
     })
 }
 
-impl EventEmitter<MessageEditorEvent> for MessageEditor {}
-
-pub enum MessageEditorEvent {
-    EstimatedTokenCount,
-    Changed,
-    ScrollThreadToBottom,
-}
-
-impl Focusable for MessageEditor {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Render for MessageEditor {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let thread = self.thread.read(cx);
-        let token_usage_ratio = thread
-            .total_token_usage()
-            .map_or(TokenUsageRatio::Normal, |total_token_usage| {
-                total_token_usage.ratio()
-            });
-
-        let burn_mode_enabled = thread.completion_mode() == CompletionMode::Burn;
-
-        let action_log = self.thread.read(cx).action_log();
-        let changed_buffers = action_log.read(cx).changed_buffers(cx);
-
-        let line_height = TextSize::Small.rems(cx).to_pixels(window.rem_size()) * 1.5;
-
-        let has_configured_providers = LanguageModelRegistry::read_global(cx)
-            .providers()
-            .iter()
-            .filter(|provider| {
-                provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
-            })
-            .count()
-            > 0;
-
-        let is_signed_out = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                workspace.client().status().borrow().is_signed_out()
-            })
-            .unwrap_or(true);
-
-        let has_history = self
-            .history_store
-            .as_ref()
-            .and_then(|hs| hs.update(cx, |hs, cx| !hs.entries(cx).is_empty()).ok())
-            .unwrap_or(false)
-            || self
-                .thread
-                .read_with(cx, |thread, _| thread.messages().len() > 0);
-
-        v_flex()
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .when(
-                !has_history && is_signed_out && has_configured_providers,
-                |this| this.child(cx.new(ApiKeysWithProviders::new)),
-            )
-            .when(!changed_buffers.is_empty(), |parent| {
-                parent.child(self.render_edits_bar(&changed_buffers, window, cx))
-            })
-            .child(self.render_editor(window, cx))
-            .children({
-                let usage_callout = self.render_usage_callout(line_height, cx);
-
-                if usage_callout.is_some() {
-                    usage_callout
-                } else if token_usage_ratio != TokenUsageRatio::Normal && !burn_mode_enabled {
-                    self.render_token_limit_callout(line_height, token_usage_ratio, cx)
-                } else {
-                    None
-                }
-            })
-    }
-}
-
 pub fn insert_message_creases(
     editor: &mut Editor,
     message_creases: &[MessageCrease],
@@ -1743,70 +170,3 @@ pub fn insert_message_creases(
         }
     }
 }
-impl Component for MessageEditor {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "The composer experience of the Agent Panel. This interface handles context, composing messages, switching profiles, models and more.",
-        )
-    }
-}
-
-impl AgentPreview for MessageEditor {
-    fn agent_preview(
-        workspace: WeakEntity<Workspace>,
-        active_thread: Entity<ActiveThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        if let Some(workspace) = workspace.upgrade() {
-            let fs = workspace.read(cx).app_state().fs.clone();
-            let project = workspace.read(cx).project().clone();
-            let weak_project = project.downgrade();
-            let context_store = cx.new(|_cx| ContextStore::new(weak_project, None));
-            let active_thread = active_thread.read(cx);
-            let thread = active_thread.thread().clone();
-            let thread_store = active_thread.thread_store().clone();
-            let text_thread_store = active_thread.text_thread_store().clone();
-
-            let default_message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    fs,
-                    workspace.downgrade(),
-                    context_store,
-                    None,
-                    thread_store.downgrade(),
-                    text_thread_store.downgrade(),
-                    None,
-                    thread,
-                    window,
-                    cx,
-                )
-            });
-
-            Some(
-                v_flex()
-                    .gap_4()
-                    .children(vec![single_example(
-                        "Default Message Editor",
-                        div()
-                            .w(px(540.))
-                            .pt_12()
-                            .bg(cx.theme().colors().panel_background)
-                            .border_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(default_message_editor)
-                            .into_any_element(),
-                    )])
-                    .into_any_element(),
-            )
-        } else {
-            None
-        }
-    }
-}
-
-register_agent_preview!(MessageEditor);
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index 6ae4a73598..07e31ee5db 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -1,6 +1,8 @@
 use crate::{ManageProfiles, ToggleProfileSelector};
-use agent::agent_profile::{AgentProfile, AvailableProfiles};
-use agent_settings::{AgentDockPosition, AgentProfileId, AgentSettings, builtin_profiles};
+use agent_settings::{
+    AgentDockPosition, AgentProfile, AgentProfileId, AgentSettings, AvailableProfiles,
+    builtin_profiles,
+};
 use fs::Fs;
 use gpui::{Action, Entity, FocusHandle, Subscription, prelude::*};
 use settings::{Settings as _, SettingsStore, update_settings_file};
diff --git a/crates/agent_ui/src/thread_history.rs b/crates/agent_ui/src/thread_history.rs
deleted file mode 100644
index 73d3b705b7..0000000000
--- a/crates/agent_ui/src/thread_history.rs
+++ /dev/null
@@ -1,912 +0,0 @@
-use crate::{AgentPanel, RemoveSelectedThread};
-use agent::history_store::{HistoryEntry, HistoryStore};
-use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
-use editor::{Editor, EditorEvent};
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    App, ClickEvent, Empty, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
-    UniformListScrollHandle, WeakEntity, Window, uniform_list,
-};
-use std::{fmt::Display, ops::Range, sync::Arc};
-use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Scrollbar, ScrollbarState,
-    Tooltip, prelude::*,
-};
-use util::ResultExt;
-
-pub struct ThreadHistory {
-    agent_panel: WeakEntity<AgentPanel>,
-    history_store: Entity<HistoryStore>,
-    scroll_handle: UniformListScrollHandle,
-    selected_index: usize,
-    hovered_index: Option<usize>,
-    search_editor: Entity<Editor>,
-    all_entries: Arc<Vec<HistoryEntry>>,
-    // When the search is empty, we display date separators between history entries
-    // This vector contains an enum of either a separator or an actual entry
-    separated_items: Vec<ListItemType>,
-    // Maps entry indexes to list item indexes
-    separated_item_indexes: Vec<u32>,
-    _separated_items_task: Option<Task<()>>,
-    search_state: SearchState,
-    scrollbar_visibility: bool,
-    scrollbar_state: ScrollbarState,
-    _subscriptions: Vec<gpui::Subscription>,
-}
-
-enum SearchState {
-    Empty,
-    Searching {
-        query: SharedString,
-        _task: Task<()>,
-    },
-    Searched {
-        query: SharedString,
-        matches: Vec<StringMatch>,
-    },
-}
-
-enum ListItemType {
-    BucketSeparator(TimeBucket),
-    Entry {
-        index: usize,
-        format: EntryTimeFormat,
-    },
-}
-
-impl ListItemType {
-    fn entry_index(&self) -> Option<usize> {
-        match self {
-            ListItemType::BucketSeparator(_) => None,
-            ListItemType::Entry { index, .. } => Some(*index),
-        }
-    }
-}
-
-impl ThreadHistory {
-    pub(crate) fn new(
-        agent_panel: WeakEntity<AgentPanel>,
-        history_store: Entity<HistoryStore>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let search_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", window, cx);
-            editor
-        });
-
-        let search_editor_subscription =
-            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
-                if let EditorEvent::BufferEdited = event {
-                    let query = search_editor.read(cx).text(cx);
-                    this.search(query.into(), cx);
-                }
-            });
-
-        let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
-            this.update_all_entries(cx);
-        });
-
-        let scroll_handle = UniformListScrollHandle::default();
-        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
-
-        let mut this = Self {
-            agent_panel,
-            history_store,
-            scroll_handle,
-            selected_index: 0,
-            hovered_index: None,
-            search_state: SearchState::Empty,
-            all_entries: Default::default(),
-            separated_items: Default::default(),
-            separated_item_indexes: Default::default(),
-            search_editor,
-            scrollbar_visibility: true,
-            scrollbar_state,
-            _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _separated_items_task: None,
-        };
-        this.update_all_entries(cx);
-        this
-    }
-
-    fn update_all_entries(&mut self, cx: &mut Context<Self>) {
-        let new_entries: Arc<Vec<HistoryEntry>> = self
-            .history_store
-            .update(cx, |store, cx| store.entries(cx))
-            .into();
-
-        self._separated_items_task.take();
-
-        let mut items = Vec::with_capacity(new_entries.len() + 1);
-        let mut indexes = Vec::with_capacity(new_entries.len() + 1);
-
-        let bg_task = cx.background_spawn(async move {
-            let mut bucket = None;
-            let today = Local::now().naive_local().date();
-
-            for (index, entry) in new_entries.iter().enumerate() {
-                let entry_date = entry
-                    .updated_at()
-                    .with_timezone(&Local)
-                    .naive_local()
-                    .date();
-                let entry_bucket = TimeBucket::from_dates(today, entry_date);
-
-                if Some(entry_bucket) != bucket {
-                    bucket = Some(entry_bucket);
-                    items.push(ListItemType::BucketSeparator(entry_bucket));
-                }
-
-                indexes.push(items.len() as u32);
-                items.push(ListItemType::Entry {
-                    index,
-                    format: entry_bucket.into(),
-                });
-            }
-            (new_entries, items, indexes)
-        });
-
-        let task = cx.spawn(async move |this, cx| {
-            let (new_entries, items, indexes) = bg_task.await;
-            this.update(cx, |this, cx| {
-                let previously_selected_entry =
-                    this.all_entries.get(this.selected_index).map(|e| e.id());
-
-                this.all_entries = new_entries;
-                this.separated_items = items;
-                this.separated_item_indexes = indexes;
-
-                match &this.search_state {
-                    SearchState::Empty => {
-                        if this.selected_index >= this.all_entries.len() {
-                            this.set_selected_entry_index(
-                                this.all_entries.len().saturating_sub(1),
-                                cx,
-                            );
-                        } else if let Some(prev_id) = previously_selected_entry
-                            && let Some(new_ix) = this
-                                .all_entries
-                                .iter()
-                                .position(|probe| probe.id() == prev_id)
-                        {
-                            this.set_selected_entry_index(new_ix, cx);
-                        }
-                    }
-                    SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
-                        this.search(query.clone(), cx);
-                    }
-                }
-
-                cx.notify();
-            })
-            .log_err();
-        });
-        self._separated_items_task = Some(task);
-    }
-
-    fn search(&mut self, query: SharedString, cx: &mut Context<Self>) {
-        if query.is_empty() {
-            self.search_state = SearchState::Empty;
-            cx.notify();
-            return;
-        }
-
-        let all_entries = self.all_entries.clone();
-
-        let fuzzy_search_task = cx.background_spawn({
-            let query = query.clone();
-            let executor = cx.background_executor().clone();
-            async move {
-                let mut candidates = Vec::with_capacity(all_entries.len());
-
-                for (idx, entry) in all_entries.iter().enumerate() {
-                    match entry {
-                        HistoryEntry::Thread(thread) => {
-                            candidates.push(StringMatchCandidate::new(idx, &thread.summary));
-                        }
-                        HistoryEntry::Context(context) => {
-                            candidates.push(StringMatchCandidate::new(idx, &context.title));
-                        }
-                    }
-                }
-
-                const MAX_MATCHES: usize = 100;
-
-                fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    MAX_MATCHES,
-                    &Default::default(),
-                    executor,
-                )
-                .await
-            }
-        });
-
-        let task = cx.spawn({
-            let query = query.clone();
-            async move |this, cx| {
-                let matches = fuzzy_search_task.await;
-
-                this.update(cx, |this, cx| {
-                    let SearchState::Searching {
-                        query: current_query,
-                        _task,
-                    } = &this.search_state
-                    else {
-                        return;
-                    };
-
-                    if &query == current_query {
-                        this.search_state = SearchState::Searched {
-                            query: query.clone(),
-                            matches,
-                        };
-
-                        this.set_selected_entry_index(0, cx);
-                        cx.notify();
-                    };
-                })
-                .log_err();
-            }
-        });
-
-        self.search_state = SearchState::Searching { query, _task: task };
-        cx.notify();
-    }
-
-    fn matched_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
-    }
-
-    fn list_item_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.separated_items.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
-    }
-
-    fn search_produced_no_matches(&self) -> bool {
-        match &self.search_state {
-            SearchState::Empty => false,
-            SearchState::Searching { .. } => false,
-            SearchState::Searched { matches, .. } => matches.is_empty(),
-        }
-    }
-
-    fn get_match(&self, ix: usize) -> Option<&HistoryEntry> {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.get(ix),
-            SearchState::Searching { .. } => None,
-            SearchState::Searched { matches, .. } => matches
-                .get(ix)
-                .and_then(|m| self.all_entries.get(m.candidate_id)),
-        }
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.matched_count();
-        if count > 0 {
-            if self.selected_index == 0 {
-                self.set_selected_entry_index(count - 1, cx);
-            } else {
-                self.set_selected_entry_index(self.selected_index - 1, cx);
-            }
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        _: &menu::SelectNext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.matched_count();
-        if count > 0 {
-            if self.selected_index == count - 1 {
-                self.set_selected_entry_index(0, cx);
-            } else {
-                self.set_selected_entry_index(self.selected_index + 1, cx);
-            }
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.matched_count();
-        if count > 0 {
-            self.set_selected_entry_index(0, cx);
-        }
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.matched_count();
-        if count > 0 {
-            self.set_selected_entry_index(count - 1, cx);
-        }
-    }
-
-    fn set_selected_entry_index(&mut self, entry_index: usize, cx: &mut Context<Self>) {
-        self.selected_index = entry_index;
-
-        let scroll_ix = match self.search_state {
-            SearchState::Empty | SearchState::Searching { .. } => self
-                .separated_item_indexes
-                .get(entry_index)
-                .map(|ix| *ix as usize)
-                .unwrap_or(entry_index + 1),
-            SearchState::Searched { .. } => entry_index,
-        };
-
-        self.scroll_handle
-            .scroll_to_item(scroll_ix, ScrollStrategy::Top);
-
-        cx.notify();
-    }
-
-    fn render_scrollbar(&self, cx: &mut Context<Self>) -> Option<Stateful<Div>> {
-        if !(self.scrollbar_visibility || self.scrollbar_state.is_dragging()) {
-            return None;
-        }
-
-        Some(
-            div()
-                .occlude()
-                .id("thread-history-scroll")
-                .h_full()
-                .bg(cx.theme().colors().panel_background.opacity(0.8))
-                .border_l_1()
-                .border_color(cx.theme().colors().border_variant)
-                .absolute()
-                .right_1()
-                .top_0()
-                .bottom_0()
-                .w_4()
-                .pl_1()
-                .cursor_default()
-                .on_mouse_move(cx.listener(|_, _, _window, cx| {
-                    cx.notify();
-                    cx.stop_propagation()
-                }))
-                .on_hover(|_, _window, cx| {
-                    cx.stop_propagation();
-                })
-                .on_any_mouse_down(|_, _window, cx| {
-                    cx.stop_propagation();
-                })
-                .on_scroll_wheel(cx.listener(|_, _, _window, cx| {
-                    cx.notify();
-                }))
-                .children(Scrollbar::vertical(self.scrollbar_state.clone())),
-        )
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(entry) = self.get_match(self.selected_index) {
-            let task_result = match entry {
-                HistoryEntry::Thread(thread) => self.agent_panel.update(cx, move |this, cx| {
-                    this.open_thread_by_id(&thread.id, window, cx)
-                }),
-                HistoryEntry::Context(context) => self.agent_panel.update(cx, move |this, cx| {
-                    this.open_saved_prompt_editor(context.path.clone(), window, cx)
-                }),
-            };
-
-            if let Some(task) = task_result.log_err() {
-                task.detach_and_log_err(cx);
-            };
-
-            cx.notify();
-        }
-    }
-
-    fn remove_selected_thread(
-        &mut self,
-        _: &RemoveSelectedThread,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(entry) = self.get_match(self.selected_index) {
-            let task_result = match entry {
-                HistoryEntry::Thread(thread) => self
-                    .agent_panel
-                    .update(cx, |this, cx| this.delete_thread(&thread.id, cx)),
-                HistoryEntry::Context(context) => self
-                    .agent_panel
-                    .update(cx, |this, cx| this.delete_context(context.path.clone(), cx)),
-            };
-
-            if let Some(task) = task_result.log_err() {
-                task.detach_and_log_err(cx);
-            };
-
-            cx.notify();
-        }
-    }
-
-    fn list_items(
-        &mut self,
-        range: Range<usize>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        let range_start = range.start;
-
-        match &self.search_state {
-            SearchState::Empty => self
-                .separated_items
-                .get(range)
-                .iter()
-                .flat_map(|items| {
-                    items
-                        .iter()
-                        .map(|item| self.render_list_item(item.entry_index(), item, vec![], cx))
-                })
-                .collect(),
-            SearchState::Searched { matches, .. } => matches[range]
-                .iter()
-                .enumerate()
-                .map(|(ix, m)| {
-                    self.render_list_item(
-                        Some(range_start + ix),
-                        &ListItemType::Entry {
-                            index: m.candidate_id,
-                            format: EntryTimeFormat::DateAndTime,
-                        },
-                        m.positions.clone(),
-                        cx,
-                    )
-                })
-                .collect(),
-            SearchState::Searching { .. } => {
-                vec![]
-            }
-        }
-    }
-
-    fn render_list_item(
-        &self,
-        list_entry_ix: Option<usize>,
-        item: &ListItemType,
-        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        match item {
-            ListItemType::Entry { index, format } => match self.all_entries.get(*index) {
-                Some(entry) => h_flex()
-                    .w_full()
-                    .pb_1()
-                    .child(
-                        HistoryEntryElement::new(entry.clone(), self.agent_panel.clone())
-                            .highlight_positions(highlight_positions)
-                            .timestamp_format(*format)
-                            .selected(list_entry_ix == Some(self.selected_index))
-                            .hovered(list_entry_ix == self.hovered_index)
-                            .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                                if *is_hovered {
-                                    this.hovered_index = list_entry_ix;
-                                } else if this.hovered_index == list_entry_ix {
-                                    this.hovered_index = None;
-                                }
-
-                                cx.notify();
-                            }))
-                            .into_any_element(),
-                    )
-                    .into_any(),
-                None => Empty.into_any_element(),
-            },
-            ListItemType::BucketSeparator(bucket) => div()
-                .px(DynamicSpacing::Base06.rems(cx))
-                .pt_2()
-                .pb_1()
-                .child(
-                    Label::new(bucket.to_string())
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-                .into_any_element(),
-        }
-    }
-}
-
-impl Focusable for ThreadHistory {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.search_editor.focus_handle(cx)
-    }
-}
-
-impl Render for ThreadHistory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("ThreadHistory")
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::remove_selected_thread))
-            .when(!self.all_entries.is_empty(), |parent| {
-                parent.child(
-                    h_flex()
-                        .h(px(41.)) // Match the toolbar perfectly
-                        .w_full()
-                        .py_1()
-                        .px_2()
-                        .gap_2()
-                        .justify_between()
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border)
-                        .child(
-                            Icon::new(IconName::MagnifyingGlass)
-                                .color(Color::Muted)
-                                .size(IconSize::Small),
-                        )
-                        .child(self.search_editor.clone()),
-                )
-            })
-            .child({
-                let view = v_flex()
-                    .id("list-container")
-                    .relative()
-                    .overflow_hidden()
-                    .flex_grow();
-
-                if self.all_entries.is_empty() {
-                    view.justify_center()
-                        .child(
-                            h_flex().w_full().justify_center().child(
-                                Label::new("You don't have any past threads yet.")
-                                    .size(LabelSize::Small),
-                            ),
-                        )
-                } else if self.search_produced_no_matches() {
-                    view.justify_center().child(
-                        h_flex().w_full().justify_center().child(
-                            Label::new("No threads match your search.").size(LabelSize::Small),
-                        ),
-                    )
-                } else {
-                    view.pr_5()
-                        .child(
-                            uniform_list(
-                                "thread-history",
-                                self.list_item_count(),
-                                cx.processor(|this, range: Range<usize>, window, cx| {
-                                    this.list_items(range, window, cx)
-                                }),
-                            )
-                            .p_1()
-                            .track_scroll(self.scroll_handle.clone())
-                            .flex_grow(),
-                        )
-                        .when_some(self.render_scrollbar(cx), |div, scrollbar| {
-                            div.child(scrollbar)
-                        })
-                }
-            })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct HistoryEntryElement {
-    entry: HistoryEntry,
-    agent_panel: WeakEntity<AgentPanel>,
-    selected: bool,
-    hovered: bool,
-    highlight_positions: Vec<usize>,
-    timestamp_format: EntryTimeFormat,
-    on_hover: Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
-}
-
-impl HistoryEntryElement {
-    pub fn new(entry: HistoryEntry, agent_panel: WeakEntity<AgentPanel>) -> Self {
-        Self {
-            entry,
-            agent_panel,
-            selected: false,
-            hovered: false,
-            highlight_positions: vec![],
-            timestamp_format: EntryTimeFormat::DateAndTime,
-            on_hover: Box::new(|_, _, _| {}),
-        }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    pub fn hovered(mut self, hovered: bool) -> Self {
-        self.hovered = hovered;
-        self
-    }
-
-    pub fn highlight_positions(mut self, positions: Vec<usize>) -> Self {
-        self.highlight_positions = positions;
-        self
-    }
-
-    pub fn on_hover(mut self, on_hover: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        self.on_hover = Box::new(on_hover);
-        self
-    }
-
-    pub fn timestamp_format(mut self, format: EntryTimeFormat) -> Self {
-        self.timestamp_format = format;
-        self
-    }
-}
-
-impl RenderOnce for HistoryEntryElement {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let (id, summary, timestamp) = match &self.entry {
-            HistoryEntry::Thread(thread) => (
-                thread.id.to_string(),
-                thread.summary.clone(),
-                thread.updated_at.timestamp(),
-            ),
-            HistoryEntry::Context(context) => (
-                context.path.to_string_lossy().to_string(),
-                context.title.clone(),
-                context.mtime.timestamp(),
-            ),
-        };
-
-        let thread_timestamp =
-            self.timestamp_format
-                .format_timestamp(&self.agent_panel, timestamp, cx);
-
-        ListItem::new(SharedString::from(id))
-            .rounded()
-            .toggle_state(self.selected)
-            .spacing(ListItemSpacing::Sparse)
-            .start_slot(
-                h_flex()
-                    .w_full()
-                    .gap_2()
-                    .justify_between()
-                    .child(
-                        HighlightedLabel::new(summary, self.highlight_positions)
-                            .size(LabelSize::Small)
-                            .truncate(),
-                    )
-                    .child(
-                        Label::new(thread_timestamp)
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall),
-                    ),
-            )
-            .on_hover(self.on_hover)
-            .end_slot::<IconButton>(if self.hovered || self.selected {
-                Some(
-                    IconButton::new("delete", IconName::Trash)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .tooltip(move |window, cx| {
-                            Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
-                        })
-                        .on_click({
-                            let agent_panel = self.agent_panel.clone();
-
-                            let f: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static> =
-                                match &self.entry {
-                                    HistoryEntry::Thread(thread) => {
-                                        let id = thread.id.clone();
-
-                                        Box::new(move |_event, _window, cx| {
-                                            agent_panel
-                                                .update(cx, |this, cx| {
-                                                    this.delete_thread(&id, cx)
-                                                        .detach_and_log_err(cx);
-                                                })
-                                                .ok();
-                                        })
-                                    }
-                                    HistoryEntry::Context(context) => {
-                                        let path = context.path.clone();
-
-                                        Box::new(move |_event, _window, cx| {
-                                            agent_panel
-                                                .update(cx, |this, cx| {
-                                                    this.delete_context(path.clone(), cx)
-                                                        .detach_and_log_err(cx);
-                                                })
-                                                .ok();
-                                        })
-                                    }
-                                };
-                            f
-                        }),
-                )
-            } else {
-                None
-            })
-            .on_click({
-                let agent_panel = self.agent_panel.clone();
-
-                let f: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static> = match &self.entry
-                {
-                    HistoryEntry::Thread(thread) => {
-                        let id = thread.id.clone();
-                        Box::new(move |_event, window, cx| {
-                            agent_panel
-                                .update(cx, |this, cx| {
-                                    this.open_thread_by_id(&id, window, cx)
-                                        .detach_and_log_err(cx);
-                                })
-                                .ok();
-                        })
-                    }
-                    HistoryEntry::Context(context) => {
-                        let path = context.path.clone();
-                        Box::new(move |_event, window, cx| {
-                            agent_panel
-                                .update(cx, |this, cx| {
-                                    this.open_saved_prompt_editor(path.clone(), window, cx)
-                                        .detach_and_log_err(cx);
-                                })
-                                .ok();
-                        })
-                    }
-                };
-                f
-            })
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum EntryTimeFormat {
-    DateAndTime,
-    TimeOnly,
-}
-
-impl EntryTimeFormat {
-    fn format_timestamp(
-        &self,
-        agent_panel: &WeakEntity<AgentPanel>,
-        timestamp: i64,
-        cx: &App,
-    ) -> String {
-        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
-        let timezone = agent_panel
-            .read_with(cx, |this, _cx| this.local_timezone())
-            .unwrap_or(UtcOffset::UTC);
-
-        match &self {
-            EntryTimeFormat::DateAndTime => time_format::format_localized_timestamp(
-                timestamp,
-                OffsetDateTime::now_utc(),
-                timezone,
-                time_format::TimestampFormat::EnhancedAbsolute,
-            ),
-            EntryTimeFormat::TimeOnly => time_format::format_time(timestamp),
-        }
-    }
-}
-
-impl From<TimeBucket> for EntryTimeFormat {
-    fn from(bucket: TimeBucket) -> Self {
-        match bucket {
-            TimeBucket::Today => EntryTimeFormat::TimeOnly,
-            TimeBucket::Yesterday => EntryTimeFormat::TimeOnly,
-            TimeBucket::ThisWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::PastWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::All => EntryTimeFormat::DateAndTime,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-enum TimeBucket {
-    Today,
-    Yesterday,
-    ThisWeek,
-    PastWeek,
-    All,
-}
-
-impl TimeBucket {
-    fn from_dates(reference: NaiveDate, date: NaiveDate) -> Self {
-        if date == reference {
-            return TimeBucket::Today;
-        }
-
-        if date == reference - TimeDelta::days(1) {
-            return TimeBucket::Yesterday;
-        }
-
-        let week = date.iso_week();
-
-        if reference.iso_week() == week {
-            return TimeBucket::ThisWeek;
-        }
-
-        let last_week = (reference - TimeDelta::days(7)).iso_week();
-
-        if week == last_week {
-            return TimeBucket::PastWeek;
-        }
-
-        TimeBucket::All
-    }
-}
-
-impl Display for TimeBucket {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TimeBucket::Today => write!(f, "Today"),
-            TimeBucket::Yesterday => write!(f, "Yesterday"),
-            TimeBucket::ThisWeek => write!(f, "This Week"),
-            TimeBucket::PastWeek => write!(f, "Past Week"),
-            TimeBucket::All => write!(f, "All"),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::NaiveDate;
-
-    #[test]
-    fn test_time_bucket_from_dates() {
-        let today = NaiveDate::from_ymd_opt(2023, 1, 15).unwrap();
-
-        let date = today;
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Today);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 14).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Yesterday);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 13).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 11).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 8).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 5).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        // All: not in this week or last week
-        let date = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::All);
-
-        // Test year boundary cases
-        let new_year = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 31).unwrap();
-        assert_eq!(
-            TimeBucket::from_dates(new_year, date),
-            TimeBucket::Yesterday
-        );
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 28).unwrap();
-        assert_eq!(TimeBucket::from_dates(new_year, date), TimeBucket::ThisWeek);
-    }
-}
diff --git a/crates/agent_ui/src/tool_compatibility.rs b/crates/agent_ui/src/tool_compatibility.rs
deleted file mode 100644
index 046c0a4abc..0000000000
--- a/crates/agent_ui/src/tool_compatibility.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use agent::{Thread, ThreadEvent};
-use assistant_tool::{Tool, ToolSource};
-use collections::HashMap;
-use gpui::{App, Context, Entity, IntoElement, Render, Subscription, Window};
-use language_model::{LanguageModel, LanguageModelToolSchemaFormat};
-use std::sync::Arc;
-use ui::prelude::*;
-
-pub struct IncompatibleToolsState {
-    cache: HashMap<LanguageModelToolSchemaFormat, Vec<Arc<dyn Tool>>>,
-    thread: Entity<Thread>,
-    _thread_subscription: Subscription,
-}
-
-impl IncompatibleToolsState {
-    pub fn new(thread: Entity<Thread>, cx: &mut Context<Self>) -> Self {
-        let _tool_working_set_subscription = cx.subscribe(&thread, |this, _, event, _| {
-            if let ThreadEvent::ProfileChanged = event {
-                this.cache.clear();
-            }
-        });
-
-        Self {
-            cache: HashMap::default(),
-            thread,
-            _thread_subscription: _tool_working_set_subscription,
-        }
-    }
-
-    pub fn incompatible_tools(
-        &mut self,
-        model: &Arc<dyn LanguageModel>,
-        cx: &App,
-    ) -> &[Arc<dyn Tool>] {
-        self.cache
-            .entry(model.tool_input_format())
-            .or_insert_with(|| {
-                self.thread
-                    .read(cx)
-                    .profile()
-                    .enabled_tools(cx)
-                    .iter()
-                    .filter(|(_, tool)| tool.input_schema(model.tool_input_format()).is_err())
-                    .map(|(_, tool)| tool.clone())
-                    .collect()
-            })
-    }
-}
-
-pub struct IncompatibleToolsTooltip {
-    pub incompatible_tools: Vec<Arc<dyn Tool>>,
-}
-
-impl Render for IncompatibleToolsTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        ui::tooltip_container(window, cx, |container, _, cx| {
-            container
-                .w_72()
-                .child(Label::new("Incompatible Tools").size(LabelSize::Small))
-                .child(
-                    Label::new(
-                        "This model is incompatible with the following tools from your MCPs:",
-                    )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    v_flex()
-                        .my_1p5()
-                        .py_0p5()
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border_variant)
-                        .children(
-                            self.incompatible_tools
-                                .iter()
-                                .map(|tool| h_flex().gap_4().child(Label::new(tool.name()).size(LabelSize::Small)).map(|parent|
-                                    match tool.source() {
-                                        ToolSource::Native => parent,
-                                        ToolSource::ContextServer { id } => parent.child(Label::new(id).size(LabelSize::Small).color(Color::Muted)),
-                                    }
-                                )),
-                        ),
-                )
-                .child(Label::new("What To Do Instead").size(LabelSize::Small))
-                .child(
-                    Label::new(
-                        "Every other tool continues to work with this model, but to specifically use those, switch to another model.",
-                    )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-        })
-    }
-}
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
index 1a3264bd77..5363949b90 100644
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -5,8 +5,8 @@ mod claude_code_onboarding_modal;
 mod context_pill;
 mod end_trial_upsell;
 mod onboarding_modal;
-pub mod preview;
 mod unavailable_editing_tooltip;
+mod usage_callout;
 
 pub use acp_onboarding_modal::*;
 pub use agent_notification::*;
@@ -16,3 +16,4 @@ pub use context_pill::*;
 pub use end_trial_upsell::*;
 pub use onboarding_modal::*;
 pub use unavailable_editing_tooltip::*;
+pub use usage_callout::*;
diff --git a/crates/agent_ui/src/ui/context_pill.rs b/crates/agent_ui/src/ui/context_pill.rs
index 7c7fbd27f0..a015d6305e 100644
--- a/crates/agent_ui/src/ui/context_pill.rs
+++ b/crates/agent_ui/src/ui/context_pill.rs
@@ -13,11 +13,9 @@ use rope::Point;
 use ui::{IconButtonShape, Tooltip, prelude::*, tooltip_container};
 
 use agent::context::{
-    AgentContext, AgentContextHandle, ContextId, ContextKind, DirectoryContext,
-    DirectoryContextHandle, FetchedUrlContext, FileContext, FileContextHandle, ImageContext,
-    ImageStatus, RulesContext, RulesContextHandle, SelectionContext, SelectionContextHandle,
-    SymbolContext, SymbolContextHandle, TextThreadContext, TextThreadContextHandle, ThreadContext,
-    ThreadContextHandle,
+    AgentContextHandle, ContextId, ContextKind, DirectoryContextHandle, FetchedUrlContext,
+    FileContextHandle, ImageContext, ImageStatus, RulesContextHandle, SelectionContextHandle,
+    SymbolContextHandle, TextThreadContextHandle, ThreadContextHandle,
 };
 
 #[derive(IntoElement)]
@@ -317,33 +315,11 @@ impl AddedContext {
         }
     }
 
-    pub fn new_attached(
-        context: &AgentContext,
-        model: Option<&Arc<dyn language_model::LanguageModel>>,
-        cx: &App,
-    ) -> AddedContext {
-        match context {
-            AgentContext::File(context) => Self::attached_file(context, cx),
-            AgentContext::Directory(context) => Self::attached_directory(context),
-            AgentContext::Symbol(context) => Self::attached_symbol(context, cx),
-            AgentContext::Selection(context) => Self::attached_selection(context, cx),
-            AgentContext::FetchedUrl(context) => Self::fetched_url(context.clone()),
-            AgentContext::Thread(context) => Self::attached_thread(context),
-            AgentContext::TextThread(context) => Self::attached_text_thread(context),
-            AgentContext::Rules(context) => Self::attached_rules(context),
-            AgentContext::Image(context) => Self::image(context.clone(), model, cx),
-        }
-    }
-
     fn pending_file(handle: FileContextHandle, cx: &App) -> Option<AddedContext> {
         let full_path = handle.buffer.read(cx).file()?.full_path(cx);
         Some(Self::file(handle, &full_path, cx))
     }
 
-    fn attached_file(context: &FileContext, cx: &App) -> AddedContext {
-        Self::file(context.handle.clone(), &context.full_path, cx)
-    }
-
     fn file(handle: FileContextHandle, full_path: &Path, cx: &App) -> AddedContext {
         let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
         let (name, parent) =
@@ -371,10 +347,6 @@ impl AddedContext {
         Some(Self::directory(handle, &full_path))
     }
 
-    fn attached_directory(context: &DirectoryContext) -> AddedContext {
-        Self::directory(context.handle.clone(), &context.full_path)
-    }
-
     fn directory(handle: DirectoryContextHandle, full_path: &Path) -> AddedContext {
         let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
         let (name, parent) =
@@ -411,25 +383,6 @@ impl AddedContext {
         })
     }
 
-    fn attached_symbol(context: &SymbolContext, cx: &App) -> AddedContext {
-        let excerpt = ContextFileExcerpt::new(&context.full_path, context.line_range.clone(), cx);
-        AddedContext {
-            kind: ContextKind::Symbol,
-            name: context.handle.symbol.clone(),
-            parent: Some(excerpt.file_name_and_range.clone()),
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    excerpt.hover_view(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Symbol(context.handle.clone()),
-        }
-    }
-
     fn pending_selection(handle: SelectionContextHandle, cx: &App) -> Option<AddedContext> {
         let excerpt = ContextFileExcerpt::new(&handle.full_path(cx)?, handle.line_range(cx), cx);
         Some(AddedContext {
@@ -449,25 +402,6 @@ impl AddedContext {
         })
     }
 
-    fn attached_selection(context: &SelectionContext, cx: &App) -> AddedContext {
-        let excerpt = ContextFileExcerpt::new(&context.full_path, context.line_range.clone(), cx);
-        AddedContext {
-            kind: ContextKind::Selection,
-            name: excerpt.file_name_and_range.clone(),
-            parent: excerpt.parent_name.clone(),
-            tooltip: None,
-            icon_path: excerpt.icon_path.clone(),
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    excerpt.hover_view(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Selection(context.handle.clone()),
-        }
-    }
-
     fn fetched_url(context: FetchedUrlContext) -> AddedContext {
         AddedContext {
             kind: ContextKind::FetchedUrl,
@@ -506,24 +440,6 @@ impl AddedContext {
         }
     }
 
-    fn attached_thread(context: &ThreadContext) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::Thread,
-            name: context.title.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Thread(context.handle.clone()),
-        }
-    }
-
     fn pending_text_thread(handle: TextThreadContextHandle, cx: &App) -> AddedContext {
         AddedContext {
             kind: ContextKind::TextThread,
@@ -543,24 +459,6 @@ impl AddedContext {
         }
     }
 
-    fn attached_text_thread(context: &TextThreadContext) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::TextThread,
-            name: context.title.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::TextThread(context.handle.clone()),
-        }
-    }
-
     fn pending_rules(
         handle: RulesContextHandle,
         prompt_store: Option<&Entity<PromptStore>>,
@@ -584,28 +482,6 @@ impl AddedContext {
         })
     }
 
-    fn attached_rules(context: &RulesContext) -> AddedContext {
-        let title = context
-            .title
-            .clone()
-            .unwrap_or_else(|| "Unnamed Rule".into());
-        AddedContext {
-            kind: ContextKind::Rules,
-            name: title,
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Rules(context.handle.clone()),
-        }
-    }
-
     fn image(
         context: ImageContext,
         model: Option<&Arc<dyn language_model::LanguageModel>>,
diff --git a/crates/agent_ui/src/ui/preview.rs b/crates/agent_ui/src/ui/preview.rs
deleted file mode 100644
index 3ab548dcb4..0000000000
--- a/crates/agent_ui/src/ui/preview.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod agent_preview;
-mod usage_callouts;
-
-pub use agent_preview::*;
-pub use usage_callouts::*;
diff --git a/crates/agent_ui/src/ui/preview/agent_preview.rs b/crates/agent_ui/src/ui/preview/agent_preview.rs
deleted file mode 100644
index ca189b57a9..0000000000
--- a/crates/agent_ui/src/ui/preview/agent_preview.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use std::sync::OnceLock;
-
-use collections::HashMap;
-use component::ComponentId;
-use gpui::{App, Entity, WeakEntity};
-use ui::{AnyElement, Component, ComponentScope, Window};
-use workspace::Workspace;
-
-use crate::ActiveThread;
-
-/// Function type for creating agent component previews
-pub type PreviewFn =
-    fn(WeakEntity<Workspace>, Entity<ActiveThread>, &mut Window, &mut App) -> Option<AnyElement>;
-
-pub struct AgentPreviewFn(fn() -> (ComponentId, PreviewFn));
-
-impl AgentPreviewFn {
-    pub const fn new(f: fn() -> (ComponentId, PreviewFn)) -> Self {
-        Self(f)
-    }
-}
-
-inventory::collect!(AgentPreviewFn);
-
-/// Trait that must be implemented by components that provide agent previews.
-pub trait AgentPreview: Component + Sized {
-    #[allow(unused)] // We can't know this is used due to the distributed slice
-    fn scope(&self) -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    /// Static method to create a preview for this component type
-    fn agent_preview(
-        workspace: WeakEntity<Workspace>,
-        active_thread: Entity<ActiveThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement>;
-}
-
-/// Register an agent preview for the given component type
-#[macro_export]
-macro_rules! register_agent_preview {
-    ($type:ty) => {
-        inventory::submit! {
-            $crate::ui::preview::AgentPreviewFn::new(|| {
-                (
-                    <$type as component::Component>::id(),
-                    <$type as $crate::ui::preview::AgentPreview>::agent_preview,
-                )
-            })
-        }
-    };
-}
-
-/// Lazy initialized registry of preview functions
-static AGENT_PREVIEW_REGISTRY: OnceLock<HashMap<ComponentId, PreviewFn>> = OnceLock::new();
-
-/// Initialize the agent preview registry if needed
-fn get_or_init_registry() -> &'static HashMap<ComponentId, PreviewFn> {
-    AGENT_PREVIEW_REGISTRY.get_or_init(|| {
-        let mut map = HashMap::default();
-        for register_fn in inventory::iter::<AgentPreviewFn>() {
-            let (id, preview_fn) = (register_fn.0)();
-            map.insert(id, preview_fn);
-        }
-        map
-    })
-}
-
-/// Get a specific agent preview by component ID.
-pub fn get_agent_preview(
-    id: &ComponentId,
-    workspace: WeakEntity<Workspace>,
-    active_thread: Entity<ActiveThread>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Option<AnyElement> {
-    let registry = get_or_init_registry();
-    registry
-        .get(id)
-        .and_then(|preview_fn| preview_fn(workspace, active_thread, window, cx))
-}
-
-/// Get all registered agent previews.
-pub fn all_agent_previews() -> Vec<ComponentId> {
-    let registry = get_or_init_registry();
-    registry.keys().cloned().collect()
-}
diff --git a/crates/agent_ui/src/ui/preview/usage_callouts.rs b/crates/agent_ui/src/ui/usage_callout.rs
similarity index 100%
rename from crates/agent_ui/src/ui/preview/usage_callouts.rs
rename to crates/agent_ui/src/ui/usage_callout.rs
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 2278848a19..eaae9ce425 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -29,28 +29,3 @@ pub struct JjUiFeatureFlag {}
 impl FeatureFlag for JjUiFeatureFlag {
     const NAME: &'static str = "jj-ui";
 }
-
-pub struct GeminiAndNativeFeatureFlag;
-
-impl FeatureFlag for GeminiAndNativeFeatureFlag {
-    // This was previously called "acp".
-    //
-    // We renamed it because existing builds used it to enable the Claude Code
-    // integration too, and we'd like to turn Gemini/Native on in new builds
-    // without enabling Claude Code in old builds.
-    const NAME: &'static str = "gemini-and-native";
-
-    fn enabled_for_all() -> bool {
-        true
-    }
-}
-
-pub struct ClaudeCodeFeatureFlag;
-
-impl FeatureFlag for ClaudeCodeFeatureFlag {
-    const NAME: &'static str = "claude-code";
-
-    fn enabled_for_all() -> bool {
-        true
-    }
-}
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index cc18e50a9c..e53dedafd2 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -27,7 +27,6 @@ agent_settings.workspace = true
 anyhow.workspace = true
 askpass.workspace = true
 assets.workspace = true
-assistant_tool.workspace = true
 assistant_tools.workspace = true
 audio.workspace = true
 auto_update.workspace = true
@@ -77,7 +76,6 @@ gpui_tokio.workspace = true
 
 http_client.workspace = true
 image_viewer.workspace = true
-indoc.workspace = true
 edit_prediction_button.workspace = true
 inspector_ui.workspace = true
 install_cli.workspace = true
diff --git a/crates/zed/src/zed/component_preview.rs b/crates/zed/src/zed/component_preview.rs
index 5b3a951d43..176b176d59 100644
--- a/crates/zed/src/zed/component_preview.rs
+++ b/crates/zed/src/zed/component_preview.rs
@@ -3,10 +3,7 @@
 //! A view for exploring Zed components.
 
 mod persistence;
-mod preview_support;
 
-use agent::{TextThreadStore, ThreadStore};
-use agent_ui::ActiveThread;
 use client::UserStore;
 use collections::HashMap;
 use component::{ComponentId, ComponentMetadata, ComponentStatus, components};
@@ -17,14 +14,10 @@ use gpui::{ListState, ScrollHandle, ScrollStrategy, UniformListScrollHandle};
 use languages::LanguageRegistry;
 use notifications::status_toast::{StatusToast, ToastIcon};
 use persistence::COMPONENT_PREVIEW_DB;
-use preview_support::active_thread::{
-    load_preview_text_thread_store, load_preview_thread_store, static_active_thread,
-};
 use project::Project;
 use std::{iter::Iterator, ops::Range, sync::Arc};
 use ui::{ButtonLike, Divider, HighlightedLabel, ListItem, ListSubHeader, Tooltip, prelude::*};
 use ui_input::SingleLineInput;
-use util::ResultExt as _;
 use workspace::{
     AppState, Item, ItemId, SerializableItem, Workspace, WorkspaceId, delete_unloaded_items,
     item::ItemEvent,
@@ -74,7 +67,6 @@ pub fn init(app_state: Arc<AppState>, cx: &mut App) {
 
 enum PreviewEntry {
     AllComponents,
-    ActiveThread,
     Separator,
     Component(ComponentMetadata, Option<Vec<usize>>),
     SectionHeader(SharedString),
@@ -97,12 +89,10 @@ enum PreviewPage {
     #[default]
     AllComponents,
     Component(ComponentId),
-    ActiveThread,
 }
 
 struct ComponentPreview {
     active_page: PreviewPage,
-    active_thread: Option<Entity<ActiveThread>>,
     reset_key: usize,
     component_list: ListState,
     entries: Vec<PreviewEntry>,
@@ -115,8 +105,6 @@ struct ComponentPreview {
     language_registry: Arc<LanguageRegistry>,
     nav_scroll_handle: UniformListScrollHandle,
     project: Entity<Project>,
-    text_thread_store: Option<Entity<TextThreadStore>>,
-    thread_store: Option<Entity<ThreadStore>>,
     user_store: Entity<UserStore>,
     workspace: WeakEntity<Workspace>,
     workspace_id: Option<WorkspaceId>,
@@ -134,32 +122,6 @@ impl ComponentPreview {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> anyhow::Result<Self> {
-        let workspace_clone = workspace.clone();
-        let project_clone = project.clone();
-
-        cx.spawn_in(window, async move |entity, cx| {
-            let thread_store_future = load_preview_thread_store(project_clone.clone(), cx);
-            let text_thread_store_future =
-                load_preview_text_thread_store(workspace_clone.clone(), project_clone.clone(), cx);
-
-            let (thread_store_result, text_thread_store_result) =
-                futures::join!(thread_store_future, text_thread_store_future);
-
-            if let (Some(thread_store), Some(text_thread_store)) = (
-                thread_store_result.log_err(),
-                text_thread_store_result.log_err(),
-            ) {
-                entity
-                    .update_in(cx, |this, window, cx| {
-                        this.thread_store = Some(thread_store.clone());
-                        this.text_thread_store = Some(text_thread_store.clone());
-                        this.create_active_thread(window, cx);
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-
         let component_registry = Arc::new(components());
         let sorted_components = component_registry.sorted_components();
         let selected_index = selected_index.into().unwrap_or(0);
@@ -175,7 +137,6 @@ impl ComponentPreview {
 
         let mut component_preview = Self {
             active_page,
-            active_thread: None,
             reset_key: 0,
             component_list,
             entries: Vec::new(),
@@ -188,8 +149,6 @@ impl ComponentPreview {
             language_registry,
             nav_scroll_handle: UniformListScrollHandle::new(),
             project,
-            text_thread_store: None,
-            thread_store: None,
             user_store,
             workspace,
             workspace_id: None,
@@ -208,43 +167,10 @@ impl ComponentPreview {
         Ok(component_preview)
     }
 
-    pub fn create_active_thread(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> &mut Self {
-        let workspace = self.workspace.clone();
-        let language_registry = self.language_registry.clone();
-        let weak_handle = self.workspace.clone();
-        if let Some(workspace) = workspace.upgrade() {
-            let project = workspace.read(cx).project().clone();
-            if let Some((thread_store, text_thread_store)) = self
-                .thread_store
-                .clone()
-                .zip(self.text_thread_store.clone())
-            {
-                let active_thread = static_active_thread(
-                    weak_handle,
-                    project,
-                    language_registry,
-                    thread_store,
-                    text_thread_store,
-                    window,
-                    cx,
-                );
-                self.active_thread = Some(active_thread);
-                cx.notify();
-            }
-        }
-
-        self
-    }
-
     pub fn active_page_id(&self, _cx: &App) -> ActivePageId {
         match &self.active_page {
             PreviewPage::AllComponents => ActivePageId::default(),
             PreviewPage::Component(component_id) => ActivePageId(component_id.0.to_string()),
-            PreviewPage::ActiveThread => ActivePageId("active_thread".to_string()),
         }
     }
 
@@ -359,7 +285,6 @@ impl ComponentPreview {
 
         // Always show all components first
         entries.push(PreviewEntry::AllComponents);
-        entries.push(PreviewEntry::ActiveThread);
 
         let mut scopes: Vec<_> = scope_groups
             .keys()
@@ -492,19 +417,6 @@ impl ComponentPreview {
                     }))
                     .into_any_element()
             }
-            PreviewEntry::ActiveThread => {
-                let selected = self.active_page == PreviewPage::ActiveThread;
-
-                ListItem::new(ix)
-                    .child(Label::new("Active Thread"))
-                    .selectable(true)
-                    .toggle_state(selected)
-                    .inset(true)
-                    .on_click(cx.listener(move |this, _, _, cx| {
-                        this.set_active_page(PreviewPage::ActiveThread, cx);
-                    }))
-                    .into_any_element()
-            }
             PreviewEntry::Separator => ListItem::new(ix)
                 .disabled(true)
                 .child(div().w_full().py_2().child(Divider::horizontal()))
@@ -572,22 +484,7 @@ impl ComponentPreview {
                 ),
         );
 
-        // Check if the component's scope is Agent
-        if scope == ComponentScope::Agent {
-            if let Some(active_thread) = self.active_thread.clone() {
-                if let Some(element) = agent_ui::get_agent_preview(
-                    &component.id(),
-                    self.workspace.clone(),
-                    active_thread,
-                    window,
-                    cx,
-                ) {
-                    preview_container = preview_container.child(element);
-                } else if let Some(preview) = component.preview() {
-                    preview_container = preview_container.children(preview(window, cx));
-                }
-            }
-        } else if let Some(preview) = component.preview() {
+        if let Some(preview) = component.preview() {
             preview_container = preview_container.children(preview(window, cx));
         }
 
@@ -629,9 +526,6 @@ impl ComponentPreview {
                                 PreviewEntry::AllComponents => {
                                     div().w_full().h_0().into_any_element()
                                 }
-                                PreviewEntry::ActiveThread => {
-                                    div().w_full().h_0().into_any_element()
-                                }
                                 PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
                             }
                         }),
@@ -655,12 +549,7 @@ impl ComponentPreview {
             v_flex()
                 .id("render-component-page")
                 .flex_1()
-                .child(ComponentPreviewPage::new(
-                    component.clone(),
-                    self.workspace.clone(),
-                    self.active_thread.clone(),
-                    self.reset_key,
-                ))
+                .child(ComponentPreviewPage::new(component.clone(), self.reset_key))
                 .into_any_element()
         } else {
             v_flex()
@@ -672,25 +561,6 @@ impl ComponentPreview {
         }
     }
 
-    fn render_active_thread(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id("render-active-thread")
-            .size_full()
-            .child(
-                div()
-                    .mx_auto()
-                    .w(px(640.))
-                    .h_full()
-                    .py_8()
-                    .bg(cx.theme().colors().panel_background)
-                    .children(self.active_thread.clone())
-                    .when_none(&self.active_thread.clone(), |this| {
-                        this.child("No active thread")
-                    }),
-            )
-            .into_any_element()
-    }
-
     fn test_status_toast(&self, cx: &mut Context<Self>) {
         if let Some(workspace) = self.workspace.upgrade() {
             workspace.update(cx, |workspace, cx| {
@@ -803,9 +673,6 @@ impl Render for ComponentPreview {
                         PreviewPage::Component(id) => self
                             .render_component_page(&id, window, cx)
                             .into_any_element(),
-                        PreviewPage::ActiveThread => {
-                            self.render_active_thread(cx).into_any_element()
-                        }
                     }),
             )
     }
@@ -1009,24 +876,18 @@ impl SerializableItem for ComponentPreview {
 pub struct ComponentPreviewPage {
     // languages: Arc<LanguageRegistry>,
     component: ComponentMetadata,
-    workspace: WeakEntity<Workspace>,
-    active_thread: Option<Entity<ActiveThread>>,
     reset_key: usize,
 }
 
 impl ComponentPreviewPage {
     pub fn new(
         component: ComponentMetadata,
-        workspace: WeakEntity<Workspace>,
-        active_thread: Option<Entity<ActiveThread>>,
         reset_key: usize,
         // languages: Arc<LanguageRegistry>
     ) -> Self {
         Self {
             // languages,
             component,
-            workspace,
-            active_thread,
             reset_key,
         }
     }
@@ -1100,23 +961,7 @@ impl ComponentPreviewPage {
     }
 
     fn render_preview(&self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        // Try to get agent preview first if we have an active thread
-        let maybe_agent_preview = if let Some(active_thread) = self.active_thread.as_ref() {
-            agent_ui::get_agent_preview(
-                &self.component.id(),
-                self.workspace.clone(),
-                active_thread.clone(),
-                window,
-                cx,
-            )
-        } else {
-            None
-        };
-
-        let content = if let Some(ag_preview) = maybe_agent_preview {
-            // Use agent preview if available
-            ag_preview
-        } else if let Some(preview) = self.component.preview() {
+        let content = if let Some(preview) = self.component.preview() {
             // Fall back to component preview
             preview(window, cx).unwrap_or_else(|| {
                 div()
diff --git a/crates/zed/src/zed/component_preview/preview_support.rs b/crates/zed/src/zed/component_preview/preview_support.rs
deleted file mode 100644
index 3b5d6a6df6..0000000000
--- a/crates/zed/src/zed/component_preview/preview_support.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod active_thread;
diff --git a/crates/zed/src/zed/component_preview/preview_support/active_thread.rs b/crates/zed/src/zed/component_preview/preview_support/active_thread.rs
deleted file mode 100644
index de98106fae..0000000000
--- a/crates/zed/src/zed/component_preview/preview_support/active_thread.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use agent::{ContextStore, MessageSegment, TextThreadStore, ThreadStore};
-use agent_ui::ActiveThread;
-use anyhow::{Result, anyhow};
-use assistant_tool::ToolWorkingSet;
-use gpui::{AppContext, AsyncApp, Entity, Task, WeakEntity};
-use indoc::indoc;
-use languages::LanguageRegistry;
-use project::Project;
-use prompt_store::PromptBuilder;
-use std::sync::Arc;
-use ui::{App, Window};
-use workspace::Workspace;
-
-pub fn load_preview_thread_store(
-    project: Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Task<Result<Entity<ThreadStore>>> {
-    cx.update(|cx| {
-        ThreadStore::load(
-            project.clone(),
-            cx.new(|_| ToolWorkingSet::default()),
-            None,
-            Arc::new(PromptBuilder::new(None).unwrap()),
-            cx,
-        )
-    })
-    .unwrap_or(Task::ready(Err(anyhow!("workspace dropped"))))
-}
-
-pub fn load_preview_text_thread_store(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Task<Result<Entity<TextThreadStore>>> {
-    workspace
-        .update(cx, |_, cx| {
-            TextThreadStore::new(
-                project.clone(),
-                Arc::new(PromptBuilder::new(None).unwrap()),
-                Default::default(),
-                cx,
-            )
-        })
-        .unwrap_or(Task::ready(Err(anyhow!("workspace dropped"))))
-}
-
-pub fn static_active_thread(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    language_registry: Arc<LanguageRegistry>,
-    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<ActiveThread> {
-    let context_store =
-        cx.new(|_| ContextStore::new(project.downgrade(), Some(thread_store.downgrade())));
-
-    let thread = thread_store.update(cx, |thread_store, cx| thread_store.create_thread(cx));
-    thread.update(cx, |thread, cx| {
-        thread.insert_assistant_message(vec![
-            MessageSegment::Text(indoc! {"
-                I'll help you fix the lifetime error in your `cx.spawn` call. When working with async operations in GPUI, there are specific patterns to follow for proper lifetime management.
-
-                Let's look at what's happening in your code:
-
-                ---
-
-                Let's check the current state of the active_thread.rs file to understand what might have changed:
-
-                ---
-
-                Looking at the implementation of `load_preview_thread_store` and understanding GPUI's async patterns, here's the issue:
-
-                1. `load_preview_thread_store` returns a `Task<anyhow::Result<Entity<ThreadStore>>>`, which means it's already a task.
-                2. When you call this function inside another `spawn` call, you're nesting tasks incorrectly.
-
-                Here's the correct way to implement this:
-
-                ---
-
-                The problem is in how you're setting up the async closure and trying to reference variables like `window` and `language_registry` that aren't accessible in that scope.
-
-                Here's how to fix it:
-            "}.to_string()),
-        ], cx);
-    });
-    cx.new(|cx| {
-        ActiveThread::new(
-            thread,
-            thread_store,
-            text_thread_store,
-            context_store,
-            language_registry,
-            workspace.clone(),
-            window,
-            cx,
-        )
-    })
-}

From 503284db45ad26b7b39dcd9d21e6d75641b433e7 Mon Sep 17 00:00:00 2001
From: bemyak <bemyak@pm.me>
Date: Fri, 12 Sep 2025 19:18:44 +0300
Subject: [PATCH 817/823] Update oo7 to 0.5.0 (#38043)

Resolves Incorrect Secret error in Secret Service integration

Closes #34024

Release Notes:

- Fixed Secret Service integration sometimes producing `Incorrect
secret` error
---
 Cargo.lock                        | 99 +++++++++++++++++--------------
 crates/gpui/Cargo.toml            |  2 +-
 tooling/workspace-hack/Cargo.toml | 78 +++++++++++++-----------
 3 files changed, 99 insertions(+), 80 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a62a28284..485ff81602 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -778,6 +778,24 @@ dependencies = [
  "zbus",
 ]
 
+[[package]]
+name = "ashpd"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0986d5b4f0802160191ad75f8d33ada000558757db3defb70299ca95d9fcbd"
+dependencies = [
+ "async-fs",
+ "async-net",
+ "enumflags2",
+ "futures-channel",
+ "futures-util",
+ "rand 0.9.1",
+ "serde",
+ "serde_repr",
+ "url",
+ "zbus",
+]
+
 [[package]]
 name = "askpass"
 version = "0.1.0"
@@ -1109,9 +1127,9 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50"
 dependencies = [
  "async-lock",
  "blocking",
@@ -1135,9 +1153,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
 dependencies = [
  "async-lock",
  "cfg-if",
@@ -1146,17 +1164,16 @@ dependencies = [
  "futures-lite 2.6.0",
  "parking",
  "polling",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "slab",
- "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
 dependencies = [
  "event-listener 5.4.0",
  "event-listener-strategy",
@@ -6039,7 +6056,7 @@ name = "fs"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "ashpd",
+ "ashpd 0.11.0",
  "async-tar",
  "async-trait",
  "cocoa 0.26.0",
@@ -7395,7 +7412,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "as-raw-xcb-connection",
- "ashpd",
+ "ashpd 0.11.0",
  "async-task",
  "backtrace",
  "bindgen 0.71.1",
@@ -10588,7 +10605,6 @@ dependencies = [
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
- "memoffset",
 ]
 
 [[package]]
@@ -10601,6 +10617,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
@@ -11167,12 +11184,12 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "oo7"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb23d3ec3527d65a83be1c1795cb883c52cfa57147d42acc797127df56fc489"
+checksum = "e3299dd401feaf1d45afd8fd1c0586f10fcfb22f244bb9afa942cec73503b89d"
 dependencies = [
  "aes",
- "ashpd",
+ "ashpd 0.12.0",
  "async-fs",
  "async-io",
  "async-lock",
@@ -19217,7 +19234,7 @@ checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
  "windows-result 0.3.2",
  "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-targets 0.53.2",
 ]
 
 [[package]]
@@ -19322,6 +19339,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -19370,9 +19396,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
 dependencies = [
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
@@ -20025,6 +20051,7 @@ dependencies = [
  "naga",
  "nix 0.28.0",
  "nix 0.29.0",
+ "nix 0.30.1",
  "nom 7.1.3",
  "num-bigint",
  "num-bigint-dig",
@@ -20251,16 +20278,6 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
-[[package]]
-name = "xdg-home"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "xim"
 version = "0.4.0"
@@ -20431,13 +20448,12 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.5.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
+checksum = "2d07e46d035fb8e375b2ce63ba4e4ff90a7f73cf2ffb0138b29e1158d2eaadf7"
 dependencies = [
  "async-broadcast",
  "async-executor",
- "async-fs",
  "async-io",
  "async-lock",
  "async-process",
@@ -20450,16 +20466,14 @@ dependencies = [
  "futures-core",
  "futures-lite 2.6.0",
  "hex",
- "nix 0.29.0",
+ "nix 0.30.1",
  "ordered-stream",
  "serde",
  "serde_repr",
- "static_assertions",
  "tracing",
  "uds_windows",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
  "winnow",
- "xdg-home",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -20467,9 +20481,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.5.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
+checksum = "57e797a9c847ed3ccc5b6254e8bcce056494b375b511b3d6edcec0aeb4defaca"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -20502,7 +20516,7 @@ dependencies = [
  "agent_settings",
  "agent_ui",
  "anyhow",
- "ashpd",
+ "ashpd 0.11.0",
  "askpass",
  "assets",
  "assistant_tools",
@@ -21059,14 +21073,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.4.0"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2df9ee044893fcffbdc25de30546edef3e32341466811ca18421e3cd6c5a3ac"
+checksum = "999dd3be73c52b1fccd109a4a81e4fcd20fab1d3599c8121b38d04e1419498db"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "static_assertions",
  "url",
  "winnow",
  "zvariant_derive",
@@ -21075,9 +21088,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.4.0"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74170caa85b8b84cc4935f2d56a57c7a15ea6185ccdd7eadb57e6edd90f94b2f"
+checksum = "6643fd0b26a46d226bd90d3f07c1b5321fe9bb7f04673cb37ac6d6883885b68e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index dd91eb4d4e..a6e8d090f0 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -158,7 +158,7 @@ scap = { workspace = true, optional = true }
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 # Always used
 flume = "0.11"
-oo7 = { version = "0.4.0", default-features = false, features = [
+oo7 = { version = "0.5.0", default-features = false, features = [
     "async-std",
     "native_crypto",
 ] }
diff --git a/tooling/workspace-hack/Cargo.toml b/tooling/workspace-hack/Cargo.toml
index 1393ac54f3..5437906446 100644
--- a/tooling/workspace-hack/Cargo.toml
+++ b/tooling/workspace-hack/Cargo.toml
@@ -107,7 +107,7 @@ regex-automata = { version = "0.4" }
 regex-syntax = { version = "0.8" }
 rust_decimal = { version = "1", default-features = false, features = ["maths", "serde", "std"] }
 rustc-hash = { version = "1" }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", default-features = false, features = ["fs", "net", "std"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net"] }
 rustls = { version = "0.23", features = ["ring"] }
 rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] }
 sea-orm = { version = "1", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite"] }
@@ -242,7 +242,7 @@ regex-automata = { version = "0.4" }
 regex-syntax = { version = "0.8" }
 rust_decimal = { version = "1", default-features = false, features = ["maths", "serde", "std"] }
 rustc-hash = { version = "1" }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", default-features = false, features = ["fs", "net", "std"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net"] }
 rustls = { version = "0.23", features = ["ring"] }
 rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] }
 sea-orm = { version = "1", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite"] }
@@ -302,8 +302,8 @@ objc2-foundation = { version = "0.3", default-features = false, features = ["NSA
 objc2-metal = { version = "0.3" }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 security-framework = { version = "3", features = ["OSX_10_14"] }
 security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -332,8 +332,8 @@ objc2-metal = { version = "0.3" }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 security-framework = { version = "3", features = ["OSX_10_14"] }
 security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -361,8 +361,8 @@ objc2-foundation = { version = "0.3", default-features = false, features = ["NSA
 objc2-metal = { version = "0.3" }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 security-framework = { version = "3", features = ["OSX_10_14"] }
 security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -391,8 +391,8 @@ objc2-metal = { version = "0.3" }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 security-framework = { version = "3", features = ["OSX_10_14"] }
 security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -423,15 +423,16 @@ livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks",
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
-nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "socket", "uio", "user"] }
+nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
+nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["fs", "socket", "uio", "user"] }
 num-bigint-dig = { version = "0.8", features = ["i128", "prime", "zeroize"] }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", features = ["span-locations"] }
 quote = { version = "1" }
 rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
@@ -441,7 +442,7 @@ tokio-stream = { version = "0.1", features = ["fs"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
 zeroize = { version = "1", features = ["zeroize_derive"] }
-zvariant = { version = "5", default-features = false, features = ["enumflags2", "gvariant", "url"] }
+zvariant = { version = "5", features = ["enumflags2", "gvariant", "url"] }
 
 [target.x86_64-unknown-linux-gnu.build-dependencies]
 aes = { version = "0.8", default-features = false, features = ["zeroize"] }
@@ -464,14 +465,15 @@ livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks",
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
-nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "socket", "uio", "user"] }
+nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
+nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["fs", "socket", "uio", "user"] }
 num-bigint-dig = { version = "0.8", features = ["i128", "prime", "zeroize"] }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
 tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -480,7 +482,7 @@ tokio-stream = { version = "0.1", features = ["fs"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
 zeroize = { version = "1", features = ["zeroize_derive"] }
-zvariant = { version = "5", default-features = false, features = ["enumflags2", "gvariant", "url"] }
+zvariant = { version = "5", features = ["enumflags2", "gvariant", "url"] }
 
 [target.aarch64-unknown-linux-gnu.dependencies]
 aes = { version = "0.8", default-features = false, features = ["zeroize"] }
@@ -503,15 +505,16 @@ livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks",
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
-nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "socket", "uio", "user"] }
+nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
+nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["fs", "socket", "uio", "user"] }
 num-bigint-dig = { version = "0.8", features = ["i128", "prime", "zeroize"] }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", features = ["span-locations"] }
 quote = { version = "1" }
 rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
@@ -521,7 +524,7 @@ tokio-stream = { version = "0.1", features = ["fs"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
 zeroize = { version = "1", features = ["zeroize_derive"] }
-zvariant = { version = "5", default-features = false, features = ["enumflags2", "gvariant", "url"] }
+zvariant = { version = "5", features = ["enumflags2", "gvariant", "url"] }
 
 [target.aarch64-unknown-linux-gnu.build-dependencies]
 aes = { version = "0.8", default-features = false, features = ["zeroize"] }
@@ -544,14 +547,15 @@ livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks",
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
-nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "socket", "uio", "user"] }
+nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
+nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["fs", "socket", "uio", "user"] }
 num-bigint-dig = { version = "0.8", features = ["i128", "prime", "zeroize"] }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
 tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -560,7 +564,7 @@ tokio-stream = { version = "0.1", features = ["fs"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
 zeroize = { version = "1", features = ["zeroize_derive"] }
-zvariant = { version = "5", default-features = false, features = ["enumflags2", "gvariant", "url"] }
+zvariant = { version = "5", features = ["enumflags2", "gvariant", "url"] }
 
 [target.x86_64-pc-windows-msvc.dependencies]
 codespan-reporting = { version = "0.12" }
@@ -572,7 +576,7 @@ hyper-rustls = { version = "0.27", default-features = false, features = ["http1"
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "fs", "net"] }
 scopeguard = { version = "1" }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
 tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -597,7 +601,7 @@ itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12" }
 livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d" }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "fs", "net"] }
 scopeguard = { version = "1" }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
 tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -632,15 +636,16 @@ livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks",
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
-nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "socket", "uio", "user"] }
+nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
+nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["fs", "socket", "uio", "user"] }
 num-bigint-dig = { version = "0.8", features = ["i128", "prime", "zeroize"] }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", features = ["span-locations"] }
 quote = { version = "1" }
 rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
@@ -650,7 +655,7 @@ tokio-stream = { version = "0.1", features = ["fs"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
 zeroize = { version = "1", features = ["zeroize_derive"] }
-zvariant = { version = "5", default-features = false, features = ["enumflags2", "gvariant", "url"] }
+zvariant = { version = "5", features = ["enumflags2", "gvariant", "url"] }
 
 [target.x86_64-unknown-linux-musl.build-dependencies]
 aes = { version = "0.8", default-features = false, features = ["zeroize"] }
@@ -673,14 +678,15 @@ livekit-runtime = { git = "https://github.com/zed-industries/livekit-rust-sdks",
 mio = { version = "1", features = ["net", "os-ext"] }
 naga = { version = "25", features = ["spv-out", "wgsl-in"] }
 nix-1f5adca70f036a62 = { package = "nix", version = "0.28", features = ["fs", "mman", "ptrace", "signal", "term", "user"] }
-nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "socket", "uio", "user"] }
+nix-b73a96c0a5f6a7d9 = { package = "nix", version = "0.29", features = ["fs", "pthread", "signal", "user"] }
+nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["fs", "socket", "uio", "user"] }
 num-bigint-dig = { version = "0.8", features = ["i128", "prime", "zeroize"] }
 object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
 proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
 rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
 ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "net", "process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
 scopeguard = { version = "1" }
 sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
 tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -689,6 +695,6 @@ tokio-stream = { version = "0.1", features = ["fs"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 tower = { version = "0.5", default-features = false, features = ["timeout", "util"] }
 zeroize = { version = "1", features = ["zeroize_derive"] }
-zvariant = { version = "5", default-features = false, features = ["enumflags2", "gvariant", "url"] }
+zvariant = { version = "5", features = ["enumflags2", "gvariant", "url"] }
 
 ### END HAKARI SECTION

From 7f1c7c1910a8ecabcd85d8c59933fd9b2aca5e52 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 12 Sep 2025 10:21:02 -0600
Subject: [PATCH 818/823] Update CONTRIBUTING to reflect reality (#38016)

Release Notes:

- N/A
---
 CONTRIBUTING.md | 92 +++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c0b1e363e..0603c1c92a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,67 +1,69 @@
 # Contributing to Zed
 
-Thanks for your interest in contributing to Zed, the collaborative platform that is also a code editor!
+Thank you for helping us make Zed better!
 
-All activity in Zed forums is subject to our [Code of Conduct](https://zed.dev/code-of-conduct). Additionally, contributors must sign our [Contributor License Agreement](https://zed.dev/cla) before their contributions can be merged.
+All activity in Zed forums is subject to our [Code of
+Conduct](https://zed.dev/code-of-conduct). Additionally, contributors must sign
+our [Contributor License Agreement](https://zed.dev/cla) before their
+contributions can be merged.
 
 ## Contribution ideas
 
-If you're looking for ideas about what to work on, check out:
+Zed is a large project with a number of priorities. We spend most of
+our time working on what we believe the product needs, but we also love working
+with the community to improve the product in ways we haven't thought of (or had time to get to yet!)
+
+In particular we love PRs that are:
+
+* Fixes to existing bugs and issues.
+* Small enhancements to existing features, particularly to make them work for more people.
+* Small extra features, like keybindings or actions you miss from other editors or extensions.
+* Work towards shipping larger features on our roadmap.
+
+If you're looking for concrete ideas:
 
-- Our [public roadmap](https://zed.dev/roadmap) contains a rough outline of our near-term priorities for Zed.
 - Our [top-ranking issues](https://github.com/zed-industries/zed/issues/5393) based on votes by the community.
+- Our [public roadmap](https://zed.dev/roadmap) contains a rough outline of our near-term priorities for Zed.
 
-For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
+## Sending changes
 
-## Proposing changes
+The Zed culture values working code and synchronous conversations over long
+discussion threads.
 
-The best way to propose a change is to [start a discussion on our GitHub repository](https://github.com/zed-industries/zed/discussions).
+The best way to get us to take a look at a proposed change is to send a pull
+request. We will get back to you (though this sometimes takes longer than we'd
+like, sorry).
 
-First, write a short **problem statement**, which _clearly_ and _briefly_ describes the problem you want to solve independently from any specific solution. It doesn't need to be long or formal, but it's difficult to consider a solution in absence of a clear understanding of the problem.
+Although we will take a look, we tend to only merge about half the PRs that are
+submitted. If you'd like your PR to have the best chance of being merged:
 
-Next, write a short **solution proposal**. How can the problem (or set of problems) you have stated above be addressed? What are the pros and cons of your approach? Again, keep it brief and informal. This isn't a specification, but rather a starting point for a conversation.
+* Include a clear description of what you're solving, and why it's important to you.
+* Include tests.
+* If it changes the UI, attach screenshots or screen recordings.
 
-By effectively engaging with the Zed team and community early in your process, we're better positioned to give you feedback and understand your pull request once you open it. If the first thing we see from you is a big changeset, we're much less likely to respond to it in a timely manner.
+The internal advice for reviewers is as follows:
+* If the fix/feature is obviously great, and the code is great. Hit merge.
+* If the fix/feature is obviously great, and the code is nearly great. Send PR comments, or offer to pair to get things perfect.
+* If the fix/feature is not obviously great, or the code needs rewriting from scratch. Close the PR with a thank you and some explanation.
 
-## Pair programming
+If you need more feedback from us: the best way is to be responsive to
+Github comments, or to offer up time to pair with us.
 
-We plan to set aside time each week to pair program with contributors on promising pull requests in Zed. This will be an experiment. We tend to prefer pairing over async code review on our team, and we'd like to see how well it works in an open source setting. If we're finding it difficult to get on the same page with async review, we may ask you to pair with us if you're open to it. The closer a contribution is to the goals outlined in our roadmap, the more likely we'll be to spend time pairing on it.
+If you are making a larger change, or need advice on how to finish the change
+you're making, please open the PR early. We would love to help you get
+things right, and it's often easier to see how to solve a problem before the
+diff gets too big.
 
-## Mandatory PR contents
+## Things we will (probably) not merge
 
-Please ensure the PR contains
+Although there are few hard and fast rules, typically we don't merge:
 
-- Before & after screenshots, if there are visual adjustments introduced.
-
-Examples of visual adjustments: tree-sitter query updates, UI changes, etc.
-
-- A disclosure of the AI assistance usage, if any was used.
-
-Any kind of AI assistance must be disclosed in the PR, along with the extent to which AI assistance was used (e.g. docs only vs. code generation).
-
-If the PR responses are being generated by an AI, disclose that as well.
-
-As a small exception, trivial tab-completion doesn't need to be disclosed, as long as it's limited to single keywords or short phrases.
-
-## Tips to improve the chances of your PR getting reviewed and merged
-
-- Discuss your plans ahead of time with the team
-- Small, focused, incremental pull requests are much easier to review
-- Spend time explaining your changes in the pull request body
-- Add test coverage and documentation
-- Choose tasks that align with our roadmap
-- Pair with us and watch us code to learn the codebase
-- Low effort PRs, such as those that just re-arrange syntax, won't be merged without a compelling justification
-
-## File icons
-
-Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner.
-
-We do not accept PRs for file icons that are just an off-the-shelf SVG taken from somewhere else.
-
-### Adding new icons to the Zed icon theme
-
-If you would like to add a new icon to the Zed icon theme, [open a Discussion](https://github.com/zed-industries/zed/discussions/new?category=ux-and-design) and we can work with you on getting an icon designed and added to Zed.
+* Anything that can be provided by an extension. For example a new language, or theme.  For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
+* New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
+* Giant refactorings.
+* Non-trivial changes with no tests.
+* Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
+* Anything that seems completely AI generated.
 
 ## Bird's-eye view of Zed
 

From 8ebe812c24d313baec4d0fa2e9287298e317a819 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Fri, 12 Sep 2025 12:39:54 -0400
Subject: [PATCH 819/823] Format CONTRIBUTING.md (#38073)

This PR formats `CONTRIBUTING.md` using Prettier.

Release Notes:

- N/A
---
 CONTRIBUTING.md | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0603c1c92a..8615ba2c9a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,10 +15,10 @@ with the community to improve the product in ways we haven't thought of (or had
 
 In particular we love PRs that are:
 
-* Fixes to existing bugs and issues.
-* Small enhancements to existing features, particularly to make them work for more people.
-* Small extra features, like keybindings or actions you miss from other editors or extensions.
-* Work towards shipping larger features on our roadmap.
+- Fixes to existing bugs and issues.
+- Small enhancements to existing features, particularly to make them work for more people.
+- Small extra features, like keybindings or actions you miss from other editors or extensions.
+- Work towards shipping larger features on our roadmap.
 
 If you're looking for concrete ideas:
 
@@ -37,14 +37,15 @@ like, sorry).
 Although we will take a look, we tend to only merge about half the PRs that are
 submitted. If you'd like your PR to have the best chance of being merged:
 
-* Include a clear description of what you're solving, and why it's important to you.
-* Include tests.
-* If it changes the UI, attach screenshots or screen recordings.
+- Include a clear description of what you're solving, and why it's important to you.
+- Include tests.
+- If it changes the UI, attach screenshots or screen recordings.
 
 The internal advice for reviewers is as follows:
-* If the fix/feature is obviously great, and the code is great. Hit merge.
-* If the fix/feature is obviously great, and the code is nearly great. Send PR comments, or offer to pair to get things perfect.
-* If the fix/feature is not obviously great, or the code needs rewriting from scratch. Close the PR with a thank you and some explanation.
+
+- If the fix/feature is obviously great, and the code is great. Hit merge.
+- If the fix/feature is obviously great, and the code is nearly great. Send PR comments, or offer to pair to get things perfect.
+- If the fix/feature is not obviously great, or the code needs rewriting from scratch. Close the PR with a thank you and some explanation.
 
 If you need more feedback from us: the best way is to be responsive to
 Github comments, or to offer up time to pair with us.
@@ -58,16 +59,16 @@ diff gets too big.
 
 Although there are few hard and fast rules, typically we don't merge:
 
-* Anything that can be provided by an extension. For example a new language, or theme.  For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
-* New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
-* Giant refactorings.
-* Non-trivial changes with no tests.
-* Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
-* Anything that seems completely AI generated.
+- Anything that can be provided by an extension. For example a new language, or theme. For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
+- New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
+- Giant refactorings.
+- Non-trivial changes with no tests.
+- Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
+- Anything that seems completely AI generated.
 
 ## Bird's-eye view of Zed
 
-We suggest you keep the [zed glossary](docs/src/development/glossary.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
+We suggest you keep the [Zed glossary](docs/src/development/glossary.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
 
 Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
 

From 7377a898e8592c5b60e479baf49556cfa669428b Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 12 Sep 2025 09:58:43 -0700
Subject: [PATCH 820/823] project_panel: Allow dragging folded directories onto
 other items (#38070)

In https://github.com/zed-industries/zed/pull/22983 we made it possible
to drag items onto folded directories.

This PR handles the reverse: dragging folded directories onto other
items.

Release Notes:

- Improved drag-and-drop support by allowing folded directories to be
dragged onto other items in Project Panel.
---
 crates/project_panel/src/project_panel.rs     |  97 ++++++----
 .../project_panel/src/project_panel_tests.rs  | 176 ++++++++++++++++++
 2 files changed, 235 insertions(+), 38 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index f82901595b..97d7c6fcbb 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -310,6 +310,27 @@ impl FoldedAncestors {
     fn max_ancestor_depth(&self) -> usize {
         self.ancestors.len()
     }
+
+    /// Note: This returns None for last item in ancestors list
+    fn active_ancestor(&self) -> Option<ProjectEntryId> {
+        if self.current_ancestor_depth == 0 {
+            return None;
+        }
+        self.ancestors.get(self.current_ancestor_depth).copied()
+    }
+
+    fn active_index(&self) -> usize {
+        self.max_ancestor_depth()
+            .saturating_sub(1)
+            .saturating_sub(self.current_ancestor_depth)
+    }
+
+    fn active_component(&self, file_name: &str) -> Option<String> {
+        Path::new(file_name)
+            .components()
+            .nth(self.active_index())
+            .map(|comp| comp.as_os_str().to_string_lossy().into_owned())
+    }
 }
 
 pub fn init_settings(cx: &mut App) {
@@ -393,7 +414,8 @@ struct SerializedProjectPanel {
 
 struct DraggedProjectEntryView {
     selection: SelectedEntry,
-    details: EntryDetails,
+    icon: Option<SharedString>,
+    filename: String,
     click_offset: Point<Pixels>,
     selections: Arc<[SelectedEntry]>,
 }
@@ -2943,13 +2965,7 @@ impl ProjectPanel {
     fn resolve_entry(&self, id: ProjectEntryId) -> ProjectEntryId {
         self.ancestors
             .get(&id)
-            .and_then(|ancestors| {
-                if ancestors.current_ancestor_depth == 0 {
-                    return None;
-                }
-                ancestors.ancestors.get(ancestors.current_ancestor_depth)
-            })
-            .copied()
+            .and_then(|ancestors| ancestors.active_ancestor())
             .unwrap_or(id)
     }
 
@@ -4090,7 +4106,10 @@ impl ProjectPanel {
         let depth = details.depth;
         let worktree_id = details.worktree_id;
         let dragged_selection = DraggedSelection {
-            active_selection: selection,
+            active_selection: SelectedEntry {
+                worktree_id: selection.worktree_id,
+                entry_id: self.resolve_entry(selection.entry_id),
+            },
             marked_selections: Arc::from(self.marked_entries.clone()),
         };
 
@@ -4320,14 +4339,19 @@ impl ProjectPanel {
                 ))
                 .on_drag(
                     dragged_selection,
-                    move |selection, click_offset, _window, cx| {
-                        cx.new(|_| DraggedProjectEntryView {
-                            details: details.clone(),
-                            click_offset,
-                            selection: selection.active_selection,
-                            selections: selection.marked_selections.clone(),
-                        })
-                    },
+                    {
+                        let active_component = self.ancestors.get(&entry_id).and_then(|ancestors| ancestors.active_component(&details.filename));
+                        move |selection, click_offset, _window, cx| {
+                            let filename = active_component.as_ref().unwrap_or_else(|| &details.filename);
+                            cx.new(|_| DraggedProjectEntryView {
+                                icon: details.icon.clone(),
+                                filename: filename.clone(),
+                                click_offset,
+                                selection: selection.active_selection,
+                                selections: selection.marked_selections.clone(),
+                            })
+                        }
+                    }
                 )
                 .on_drop(
                     cx.listener(move |this, selections: &DraggedSelection, window, cx| {
@@ -4530,19 +4554,13 @@ impl ProjectPanel {
                                 if let Some(folded_ancestors) = self.ancestors.get(&entry_id) {
                                     let components = Path::new(&file_name)
                                         .components()
-                                        .map(|comp| {
-                                            comp.as_os_str().to_string_lossy().into_owned()
-                                        })
+                                        .map(|comp| comp.as_os_str().to_string_lossy().into_owned())
                                         .collect::<Vec<_>>();
-
+                                    let active_index = folded_ancestors.active_index();
                                     let components_len = components.len();
-                                    // TODO this can underflow
-                                    let active_index = components_len
-                                        - 1
-                                        - folded_ancestors.current_ancestor_depth;
                                         const DELIMITER: SharedString =
                                         SharedString::new_static(std::path::MAIN_SEPARATOR_STR);
-                                    for (index, component) in components.into_iter().enumerate() {
+                                    for (index, component) in components.iter().enumerate() {
                                         if index != 0 {
                                                 let delimiter_target_index = index - 1;
                                                 let target_entry_id = folded_ancestors.ancestors.get(components_len - 1 - delimiter_target_index).cloned();
@@ -4643,16 +4661,19 @@ impl ProjectPanel {
                                                     }))
                                                 })
                                             })
-                                            .on_click(cx.listener(move |this, _, _, cx| {
-                                                if index != active_index
-                                                    && let Some(folds) =
-                                                        this.ancestors.get_mut(&entry_id)
-                                                    {
-                                                        folds.current_ancestor_depth =
-                                                            components_len - 1 - index;
-                                                        cx.notify();
-                                                    }
-                                            }))
+                                            .on_mouse_down(
+                                                MouseButton::Left,
+                                                cx.listener(move |this, _, _, cx| {
+                                                    if index != active_index
+                                                        && let Some(folds) =
+                                                            this.ancestors.get_mut(&entry_id)
+                                                        {
+                                                            folds.current_ancestor_depth =
+                                                                components_len - 1 - index;
+                                                            cx.notify();
+                                                        }
+                                                }),
+                                            )
                                             .child(
                                                 Label::new(component)
                                                     .single_line()
@@ -5846,12 +5867,12 @@ impl Render for DraggedProjectEntryView {
                         if self.selections.len() > 1 && self.selections.contains(&self.selection) {
                             this.child(Label::new(format!("{} entries", self.selections.len())))
                         } else {
-                            this.child(if let Some(icon) = &self.details.icon {
+                            this.child(if let Some(icon) = &self.icon {
                                 div().child(Icon::from_path(icon.clone()))
                             } else {
                                 div()
                             })
-                            .child(Label::new(self.details.filename.clone()))
+                            .child(Label::new(self.filename.clone()))
                         }
                     }),
             )
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
index f1132226cb..ad2a7d12ec 100644
--- a/crates/project_panel/src/project_panel_tests.rs
+++ b/crates/project_panel/src/project_panel_tests.rs
@@ -3162,6 +3162,182 @@ async fn test_multiple_marked_entries(cx: &mut gpui::TestAppContext) {
         ]
     );
 }
+
+#[gpui::test]
+async fn test_dragged_selection_resolve_entry(cx: &mut gpui::TestAppContext) {
+    init_test(cx);
+
+    let fs = FakeFs::new(cx.executor());
+    fs.insert_tree(
+        "/root",
+        json!({
+            "a": {
+                "b": {
+                    "c": {
+                        "d": {}
+                    }
+                }
+            },
+            "target_destination": {}
+        }),
+    )
+    .await;
+
+    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
+    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+    let cx = &mut VisualTestContext::from_window(*workspace, cx);
+
+    cx.update(|_, cx| {
+        let settings = *ProjectPanelSettings::get_global(cx);
+        ProjectPanelSettings::override_global(
+            ProjectPanelSettings {
+                auto_fold_dirs: true,
+                ..settings
+            },
+            cx,
+        );
+    });
+
+    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
+
+    // Case 1: Move last dir 'd' - should move only 'd', leaving 'a/b/c'
+    select_path(&panel, "root/a/b/c/d", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        let drag = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: panel.selection.as_ref().unwrap().worktree_id,
+                entry_id: panel.resolve_entry(panel.selection.as_ref().unwrap().entry_id),
+            },
+            marked_selections: Arc::new([*panel.selection.as_ref().unwrap()]),
+        };
+        let target_entry = panel
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .next()
+            .unwrap()
+            .read(cx)
+            .entry_for_path("target_destination")
+            .unwrap();
+        panel.drag_onto(&drag, target_entry.id, false, window, cx);
+    });
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &[
+            "v root",
+            "    > a/b/c",
+            "    > target_destination/d  <== selected"
+        ],
+        "Moving last empty directory 'd' should leave 'a/b/c' and move only 'd'"
+    );
+
+    // Reset
+    select_path(&panel, "root/target_destination/d", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        let drag = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: panel.selection.as_ref().unwrap().worktree_id,
+                entry_id: panel.resolve_entry(panel.selection.as_ref().unwrap().entry_id),
+            },
+            marked_selections: Arc::new([*panel.selection.as_ref().unwrap()]),
+        };
+        let target_entry = panel
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .next()
+            .unwrap()
+            .read(cx)
+            .entry_for_path("a/b/c")
+            .unwrap();
+        panel.drag_onto(&drag, target_entry.id, false, window, cx);
+    });
+    cx.executor().run_until_parked();
+
+    // Case 2: Move middle dir 'b' - should move 'b/c/d', leaving only 'a'
+    select_path(&panel, "root/a/b", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        let drag = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: panel.selection.as_ref().unwrap().worktree_id,
+                entry_id: panel.resolve_entry(panel.selection.as_ref().unwrap().entry_id),
+            },
+            marked_selections: Arc::new([*panel.selection.as_ref().unwrap()]),
+        };
+        let target_entry = panel
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .next()
+            .unwrap()
+            .read(cx)
+            .entry_for_path("target_destination")
+            .unwrap();
+        panel.drag_onto(&drag, target_entry.id, false, window, cx);
+    });
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &["v root", "    v a", "    > target_destination/b/c/d"],
+        "Moving middle directory 'b' should leave only 'a' and move 'b/c/d'"
+    );
+
+    // Reset
+    select_path(&panel, "root/target_destination/b", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        let drag = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: panel.selection.as_ref().unwrap().worktree_id,
+                entry_id: panel.resolve_entry(panel.selection.as_ref().unwrap().entry_id),
+            },
+            marked_selections: Arc::new([*panel.selection.as_ref().unwrap()]),
+        };
+        let target_entry = panel
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .next()
+            .unwrap()
+            .read(cx)
+            .entry_for_path("a")
+            .unwrap();
+        panel.drag_onto(&drag, target_entry.id, false, window, cx);
+    });
+    cx.executor().run_until_parked();
+
+    // Case 3: Move first dir 'a' - should move whole 'a/b/c/d'
+    select_path(&panel, "root/a", cx);
+    panel.update_in(cx, |panel, window, cx| {
+        let drag = DraggedSelection {
+            active_selection: SelectedEntry {
+                worktree_id: panel.selection.as_ref().unwrap().worktree_id,
+                entry_id: panel.resolve_entry(panel.selection.as_ref().unwrap().entry_id),
+            },
+            marked_selections: Arc::new([*panel.selection.as_ref().unwrap()]),
+        };
+        let target_entry = panel
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .next()
+            .unwrap()
+            .read(cx)
+            .entry_for_path("target_destination")
+            .unwrap();
+        panel.drag_onto(&drag, target_entry.id, false, window, cx);
+    });
+    cx.executor().run_until_parked();
+
+    assert_eq!(
+        visible_entries_as_strings(&panel, 0..10, cx),
+        &["v root", "    > target_destination/a/b/c/d"],
+        "Moving first directory 'a' should move whole 'a/b/c/d' chain"
+    );
+}
+
 #[gpui::test]
 async fn test_autoreveal_and_gitignored_files(cx: &mut gpui::TestAppContext) {
     init_test_with_editor(cx);

From 85f7bb62770e7f6c80402c2528c520e2717a2b24 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Fri, 12 Sep 2025 19:22:24 +0200
Subject: [PATCH 821/823] extension_host: Replace backslashes with forward
 slashes for cwd on Windows (#38072)

Instead of passing CWD verbatim from the Windows host with backslashes
and all, we now rewrite it into a more POSIX-happy format featuring
forward slashes which means `std::path::Path` operations now work within
WASI with Windows-style paths.

Release Notes:

- N/A
---
 crates/extension_host/src/wasm_host.rs          | 8 +++++---
 extensions/test-extension/src/test_extension.rs | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/extension_host/src/wasm_host.rs b/crates/extension_host/src/wasm_host.rs
index 3ff8fcf7a4..a14bb860db 100644
--- a/crates/extension_host/src/wasm_host.rs
+++ b/crates/extension_host/src/wasm_host.rs
@@ -666,15 +666,17 @@ impl WasmHost {
 
         let file_perms = wasi::FilePerms::all();
         let dir_perms = wasi::DirPerms::all();
-        let path = SanitizedPath::new(&extension_work_dir);
+        let path = SanitizedPath::new(&extension_work_dir).to_string();
+        #[cfg(target_os = "windows")]
+        let path = path.replace('\\', "/");
 
         let mut ctx = wasi::WasiCtxBuilder::new();
         ctx.inherit_stdio()
-            .env("PWD", path.to_string())
+            .env("PWD", &path)
             .env("RUST_BACKTRACE", "full");
 
         ctx.preopened_dir(&path, ".", dir_perms, file_perms)?;
-        ctx.preopened_dir(&path, path.to_string(), dir_perms, file_perms)?;
+        ctx.preopened_dir(&path, &path, dir_perms, file_perms)?;
 
         Ok(ctx.build())
     }
diff --git a/extensions/test-extension/src/test_extension.rs b/extensions/test-extension/src/test_extension.rs
index 8c7737ba7f..0b96f47038 100644
--- a/extensions/test-extension/src/test_extension.rs
+++ b/extensions/test-extension/src/test_extension.rs
@@ -18,6 +18,10 @@ impl TestExtension {
 
         let current_dir = std::env::current_dir().unwrap();
         println!("current_dir: {}", current_dir.display());
+        assert_eq!(
+            current_dir.file_name().unwrap().to_str().unwrap(),
+            "test-extension"
+        );
 
         fs::create_dir_all(current_dir.join("dir-created-with-abs-path")).unwrap();
         fs::create_dir_all("./dir-created-with-rel-path").unwrap();

From 2b3ca360c34e394c03663b2d106e8baf18d2db12 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Fri, 12 Sep 2025 14:22:35 -0300
Subject: [PATCH 822/823] Fix flicker in short context menus that have
 documentation aside (#38074)

Menu items in the context menu component have the ability to display a
documentation aside popover. However, because this docs aside popover
was setup as a sibling flex container to the actual menu popover, if the
menu had a short amount of items and the docs popover is bigger than the
menu, this flickering would happen, making it essentially unusable:


https://github.com/user-attachments/assets/74956254-fff6-4c5c-9f79-02998c64a105

So, this PR makes the docs aside popover in wide window sizes
absolutely-positioned relative to the menu container, which removes all
flickering. On top of that, I'm adding a `DocumentationEdge` enum that
allows to control the edge anchor of the docs aside, which is useful in
this particular mode selector example to make the layout work well.


https://github.com/user-attachments/assets/a3e811e1-86b4-4839-a219-c3b0734532b3

When the window is small, the docs aside continue to be a sibling flex
container, which causes a super subtle shift in the items within the
menu popover. This is something I want to pursue fixing, but didn't want
to delay this PR too much.

Release Notes:

- N/A
---
 crates/agent_ui/src/acp/mode_selector.rs      | 10 ++-
 crates/agent_ui/src/profile_selector.rs       | 12 +--
 .../src/edit_prediction_button.rs             | 14 ++--
 crates/language_tools/src/lsp_button.rs       |  6 +-
 crates/ui/src/components/context_menu.rs      | 83 ++++++++++++-------
 crates/zed/src/zed/quick_action_bar.rs        |  8 +-
 6 files changed, 79 insertions(+), 54 deletions(-)

diff --git a/crates/agent_ui/src/acp/mode_selector.rs b/crates/agent_ui/src/acp/mode_selector.rs
index b68643859e..d4d424f41a 100644
--- a/crates/agent_ui/src/acp/mode_selector.rs
+++ b/crates/agent_ui/src/acp/mode_selector.rs
@@ -5,8 +5,8 @@ use fs::Fs;
 use gpui::{Context, Entity, FocusHandle, WeakEntity, Window, prelude::*};
 use std::{rc::Rc, sync::Arc};
 use ui::{
-    Button, ContextMenu, ContextMenuEntry, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip,
-    prelude::*,
+    Button, ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, KeyBinding,
+    PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
 };
 
 use crate::{CycleModeSelector, ToggleProfileSelector};
@@ -91,7 +91,7 @@ impl ModeSelector {
                     .toggleable(IconPosition::End, is_selected);
 
                 let entry = if let Some(description) = &mode.description {
-                    entry.documentation_aside(ui::DocumentationSide::Left, {
+                    entry.documentation_aside(DocumentationSide::Left, DocumentationEdge::Bottom, {
                         let description = description.clone();
 
                         move |cx| {
@@ -223,6 +223,10 @@ impl Render for ModeSelector {
             )
             .anchor(gpui::Corner::BottomRight)
             .with_handle(self.menu_handle.clone())
+            .offset(gpui::Point {
+                x: px(0.0),
+                y: px(-2.0),
+            })
             .menu(move |window, cx| {
                 Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
             })
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
index 07e31ee5db..85f74a0f74 100644
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -8,8 +8,8 @@ use gpui::{Action, Entity, FocusHandle, Subscription, prelude::*};
 use settings::{Settings as _, SettingsStore, update_settings_file};
 use std::sync::Arc;
 use ui::{
-    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, TintColor,
-    Tooltip, prelude::*,
+    ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, PopoverMenu,
+    PopoverMenuHandle, TintColor, Tooltip, prelude::*,
 };
 
 /// Trait for types that can provide and manage agent profiles
@@ -129,9 +129,11 @@ impl ProfileSelector {
             .toggleable(IconPosition::End, profile_id == thread_profile_id);
 
         let entry = if let Some(doc_text) = documentation {
-            entry.documentation_aside(documentation_side(settings.dock), move |_| {
-                Label::new(doc_text).into_any_element()
-            })
+            entry.documentation_aside(
+                documentation_side(settings.dock),
+                DocumentationEdge::Top,
+                move |_| Label::new(doc_text).into_any_element(),
+            )
         } else {
             entry
         };
diff --git a/crates/edit_prediction_button/src/edit_prediction_button.rs b/crates/edit_prediction_button/src/edit_prediction_button.rs
index 0e3fe8cb1a..d4c1763c40 100644
--- a/crates/edit_prediction_button/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_button/src/edit_prediction_button.rs
@@ -24,8 +24,8 @@ use std::{
 };
 use supermaven::{AccountStatus, Supermaven};
 use ui::{
-    Clickable, ContextMenu, ContextMenuEntry, DocumentationSide, IconButton, IconButtonShape,
-    Indicator, PopoverMenu, PopoverMenuHandle, ProgressBar, Tooltip, prelude::*,
+    Clickable, ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, IconButton,
+    IconButtonShape, Indicator, PopoverMenu, PopoverMenuHandle, ProgressBar, Tooltip, prelude::*,
 };
 use workspace::{
     StatusItemView, Toast, Workspace, create_and_open_local_file, item::ItemHandle,
@@ -447,7 +447,7 @@ impl EditPredictionButton {
                     menu = menu.item(
                         entry
                             .disabled(true)
-                            .documentation_aside(DocumentationSide::Left, move |_cx| {
+                            .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |_cx| {
                                 Label::new(format!("Edit predictions cannot be toggled for this buffer because they are disabled for {}", language.name()))
                                     .into_any_element()
                             })
@@ -499,7 +499,7 @@ impl EditPredictionButton {
                 .item(
                     ContextMenuEntry::new("Eager")
                         .toggleable(IconPosition::Start, eager_mode)
-                        .documentation_aside(DocumentationSide::Left, move |_| {
+                        .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |_| {
                             Label::new("Display predictions inline when there are no language server completions available.").into_any_element()
                         })
                         .handler({
@@ -512,7 +512,7 @@ impl EditPredictionButton {
                 .item(
                     ContextMenuEntry::new("Subtle")
                         .toggleable(IconPosition::Start, subtle_mode)
-                        .documentation_aside(DocumentationSide::Left, move |_| {
+                        .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |_| {
                             Label::new("Display predictions inline only when holding a modifier key (alt by default).").into_any_element()
                         })
                         .handler({
@@ -543,7 +543,7 @@ impl EditPredictionButton {
                         .toggleable(IconPosition::Start, data_collection.is_enabled())
                         .icon(icon_name)
                         .icon_color(icon_color)
-                        .documentation_aside(DocumentationSide::Left, move |cx| {
+                        .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |cx| {
                             let (msg, label_color, icon_name, icon_color) = match (is_open_source, is_collecting) {
                                 (true, true) => (
                                     "Project identified as open source, and you're sharing data.",
@@ -626,7 +626,7 @@ impl EditPredictionButton {
             ContextMenuEntry::new("Configure Excluded Files")
                 .icon(IconName::LockOutlined)
                 .icon_color(Color::Muted)
-                .documentation_aside(DocumentationSide::Left, |_| {
+                .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, |_| {
                     Label::new(indoc!{"
                         Open your settings to add sensitive paths for which Zed will never predict edits."}).into_any_element()
                 })
diff --git a/crates/language_tools/src/lsp_button.rs b/crates/language_tools/src/lsp_button.rs
index 59beceff98..b750ad1621 100644
--- a/crates/language_tools/src/lsp_button.rs
+++ b/crates/language_tools/src/lsp_button.rs
@@ -17,8 +17,8 @@ use project::{
 };
 use settings::{Settings as _, SettingsStore};
 use ui::{
-    Context, ContextMenu, ContextMenuEntry, ContextMenuItem, DocumentationAside, DocumentationSide,
-    Indicator, PopoverMenu, PopoverMenuHandle, Tooltip, Window, prelude::*,
+    Context, ContextMenu, ContextMenuEntry, ContextMenuItem, DocumentationAside, DocumentationEdge,
+    DocumentationSide, Indicator, PopoverMenu, PopoverMenuHandle, Tooltip, Window, prelude::*,
 };
 
 use workspace::{StatusItemView, Workspace};
@@ -121,7 +121,6 @@ impl LanguageServerHealthStatus {
 
 impl LanguageServerState {
     fn fill_menu(&self, mut menu: ContextMenu, cx: &mut Context<Self>) -> ContextMenu {
-        menu = menu.align_popover_bottom();
         let lsp_logs = cx
             .try_global::<GlobalLogStore>()
             .map(|lsp_logs| lsp_logs.0.clone());
@@ -357,6 +356,7 @@ impl LanguageServerState {
                 message.map(|server_message| {
                     DocumentationAside::new(
                         DocumentationSide::Right,
+                        DocumentationEdge::Bottom,
                         Rc::new(move |_| Label::new(server_message.clone()).into_any_element()),
                     )
                 }),
diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
index 21ab283d88..e57f02be91 100644
--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -128,10 +128,12 @@ impl ContextMenuEntry {
     pub fn documentation_aside(
         mut self,
         side: DocumentationSide,
+        edge: DocumentationEdge,
         render: impl Fn(&mut App) -> AnyElement + 'static,
     ) -> Self {
         self.documentation_aside = Some(DocumentationAside {
             side,
+            edge,
             render: Rc::new(render),
         });
 
@@ -161,7 +163,6 @@ pub struct ContextMenu {
     keep_open_on_confirm: bool,
     documentation_aside: Option<(usize, DocumentationAside)>,
     fixed_width: Option<DefiniteLength>,
-    align_popover_top: bool,
 }
 
 #[derive(Copy, Clone, PartialEq, Eq)]
@@ -170,15 +171,27 @@ pub enum DocumentationSide {
     Right,
 }
 
+#[derive(Copy, Default, Clone, PartialEq, Eq)]
+pub enum DocumentationEdge {
+    #[default]
+    Top,
+    Bottom,
+}
+
 #[derive(Clone)]
 pub struct DocumentationAside {
     side: DocumentationSide,
+    edge: DocumentationEdge,
     render: Rc<dyn Fn(&mut App) -> AnyElement>,
 }
 
 impl DocumentationAside {
-    pub fn new(side: DocumentationSide, render: Rc<dyn Fn(&mut App) -> AnyElement>) -> Self {
-        Self { side, render }
+    pub fn new(
+        side: DocumentationSide,
+        edge: DocumentationEdge,
+        render: Rc<dyn Fn(&mut App) -> AnyElement>,
+    ) -> Self {
+        Self { side, edge, render }
     }
 }
 
@@ -218,7 +231,6 @@ impl ContextMenu {
                     key_context: "menu".into(),
                     _on_blur_subscription,
                     keep_open_on_confirm: false,
-                    align_popover_top: true,
                     documentation_aside: None,
                     fixed_width: None,
                     end_slot_action: None,
@@ -261,7 +273,6 @@ impl ContextMenu {
                     key_context: "menu".into(),
                     _on_blur_subscription,
                     keep_open_on_confirm: true,
-                    align_popover_top: true,
                     documentation_aside: None,
                     fixed_width: None,
                     end_slot_action: None,
@@ -302,7 +313,6 @@ impl ContextMenu {
                     |this: &mut ContextMenu, window, cx| this.cancel(&menu::Cancel, window, cx),
                 ),
                 keep_open_on_confirm: false,
-                align_popover_top: true,
                 documentation_aside: None,
                 fixed_width: None,
                 end_slot_action: None,
@@ -788,11 +798,6 @@ impl ContextMenu {
         self
     }
 
-    pub fn align_popover_bottom(mut self) -> Self {
-        self.align_popover_top = false;
-        self
-    }
-
     fn render_menu_item(
         &self,
         ix: usize,
@@ -1102,6 +1107,7 @@ impl Render for ContextMenu {
             WithRemSize::new(ui_font_size)
                 .occlude()
                 .elevation_2(cx)
+                .w_full()
                 .p_2()
                 .overflow_hidden()
                 .when(is_wide_window, |this| this.max_w_96())
@@ -1109,31 +1115,19 @@ impl Render for ContextMenu {
                 .child((aside.render)(cx))
         };
 
-        h_flex()
-            .when(is_wide_window, |this| this.flex_row())
-            .when(!is_wide_window, |this| this.flex_col())
-            .w_full()
-            .map(|div| {
-                if self.align_popover_top {
-                    div.items_start()
-                } else {
-                    div.items_end()
-                }
-            })
-            .gap_1()
-            .child(div().children(aside.clone().and_then(|(_, aside)| {
-                (aside.side == DocumentationSide::Left).then(|| render_aside(aside, cx))
-            })))
-            .child(
+        let render_menu =
+            |cx: &mut Context<Self>, window: &mut Window| {
                 WithRemSize::new(ui_font_size)
                     .occlude()
                     .elevation_2(cx)
                     .flex()
                     .flex_row()
+                    .flex_shrink_0()
                     .child(
                         v_flex()
                             .id("context-menu")
                             .max_h(vh(0.75, window))
+                            .flex_shrink_0()
                             .when_some(self.fixed_width, |this, width| {
                                 this.w(width).overflow_x_hidden()
                             })
@@ -1178,11 +1172,36 @@ impl Render for ContextMenu {
                                     }),
                                 ),
                             ),
-                    ),
-            )
-            .child(div().children(aside.and_then(|(_, aside)| {
-                (aside.side == DocumentationSide::Right).then(|| render_aside(aside, cx))
-            })))
+                    )
+            };
+
+        if is_wide_window {
+            div()
+                .relative()
+                .child(render_menu(cx, window))
+                .children(aside.map(|(_item_index, aside)| {
+                    h_flex()
+                        .absolute()
+                        .when(aside.side == DocumentationSide::Left, |this| {
+                            this.right_full().mr_1()
+                        })
+                        .when(aside.side == DocumentationSide::Right, |this| {
+                            this.left_full().ml_1()
+                        })
+                        .when(aside.edge == DocumentationEdge::Top, |this| this.top_0())
+                        .when(aside.edge == DocumentationEdge::Bottom, |this| {
+                            this.bottom_0()
+                        })
+                        .child(render_aside(aside, cx))
+                }))
+        } else {
+            v_flex()
+                .w_full()
+                .gap_1()
+                .justify_end()
+                .children(aside.map(|(_, aside)| render_aside(aside, cx)))
+                .child(render_menu(cx, window))
+        }
     }
 }
 
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
index e57d5d3889..a6f85000e9 100644
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -20,8 +20,8 @@ use project::project_settings::DiagnosticSeverity;
 use search::{BufferSearchBar, buffer_search};
 use settings::{Settings, SettingsStore};
 use ui::{
-    ButtonStyle, ContextMenu, ContextMenuEntry, DocumentationSide, IconButton, IconName, IconSize,
-    PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
+    ButtonStyle, ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, IconButton,
+    IconName, IconSize, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
 };
 use vim_mode_setting::VimModeSetting;
 use workspace::{
@@ -401,7 +401,7 @@ impl Render for QuickActionBar {
                                         }
                                     });
                                 if !edit_predictions_enabled_at_cursor {
-                                    edit_prediction_entry = edit_prediction_entry.documentation_aside(DocumentationSide::Left, |_| {
+                                    edit_prediction_entry = edit_prediction_entry.documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, |_| {
                                         Label::new("You can't toggle edit predictions for this file as it is within the excluded files list.").into_any_element()
                                     });
                                 }
@@ -452,7 +452,7 @@ impl Render for QuickActionBar {
                                             }
                                         });
                                     if !diagnostics_enabled {
-                                        inline_diagnostics_item = inline_diagnostics_item.disabled(true).documentation_aside(DocumentationSide::Left, |_|  Label::new("Inline diagnostics are not available until regular diagnostics are enabled.").into_any_element());
+                                        inline_diagnostics_item = inline_diagnostics_item.disabled(true).documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, |_|  Label::new("Inline diagnostics are not available until regular diagnostics are enabled.").into_any_element());
                                     }
                                     menu = menu.item(inline_diagnostics_item)
                                 }

From 2143c59fba8a2b2a93cbff1e7f8835b534bc8248 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Fri, 12 Sep 2025 20:08:21 +0200
Subject: [PATCH 823/823] svg_preview: Ensure preview properly updates in
 follow mode (#38081)

This fixes an issue where we would not update neither the path nor the
editor that was listened to during follow mode, which in turn would
cause the preview to become stale.

Fix here is to update the subscription whenever the active item changes
and also update the associated path accordingly.


Release Notes:

- Fixed an issue where the SVG preview would not update when following
the active editor.
---
 Cargo.lock                                 |   3 +-
 crates/svg_preview/Cargo.toml              |   3 +-
 crates/svg_preview/src/svg_preview_view.rs | 168 +++++++--------------
 3 files changed, 56 insertions(+), 118 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 485ff81602..987114a61b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15922,11 +15922,10 @@ dependencies = [
  "editor",
  "file_icons",
  "gpui",
- "project",
+ "multi_buffer",
  "ui",
  "workspace",
  "workspace-hack",
- "worktree",
 ]
 
 [[package]]
diff --git a/crates/svg_preview/Cargo.toml b/crates/svg_preview/Cargo.toml
index 1054aee23f..63e9e41bbe 100644
--- a/crates/svg_preview/Cargo.toml
+++ b/crates/svg_preview/Cargo.toml
@@ -15,8 +15,7 @@ path = "src/svg_preview.rs"
 editor.workspace = true
 file_icons.workspace = true
 gpui.workspace = true
-project.workspace = true
+multi_buffer.workspace = true
 ui.workspace = true
 workspace.workspace = true
-worktree.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/svg_preview/src/svg_preview_view.rs b/crates/svg_preview/src/svg_preview_view.rs
index d021f94856..dfc346704e 100644
--- a/crates/svg_preview/src/svg_preview_view.rs
+++ b/crates/svg_preview/src/svg_preview_view.rs
@@ -1,29 +1,25 @@
 use std::path::PathBuf;
 
-use editor::{Editor, EditorEvent};
+use editor::Editor;
 use file_icons::FileIcons;
 use gpui::{
     App, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageSource, IntoElement,
     ParentElement, Render, Resource, RetainAllImageCache, Styled, Subscription, WeakEntity, Window,
     div, img,
 };
-use project::ProjectPath;
+use multi_buffer::{Event as MultiBufferEvent, MultiBuffer};
 use ui::prelude::*;
 use workspace::item::Item;
 use workspace::{Pane, Workspace};
-use worktree::Event as WorktreeEvent;
 
 use crate::{OpenFollowingPreview, OpenPreview, OpenPreviewToTheSide};
 
 pub struct SvgPreviewView {
     focus_handle: FocusHandle,
     svg_path: Option<PathBuf>,
-    project_path: Option<ProjectPath>,
     image_cache: Entity<RetainAllImageCache>,
-    workspace_handle: WeakEntity<Workspace>,
-    _editor_subscription: Subscription,
+    _buffer_subscription: Subscription,
     _workspace_subscription: Option<Subscription>,
-    _project_subscription: Option<Subscription>,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -114,7 +110,7 @@ impl SvgPreviewView {
         editor: &Entity<Editor>,
         cx: &App,
     ) -> Option<usize> {
-        let editor_path = Self::get_svg_path(editor, cx);
+        let editor_path = Self::get_svg_path(editor.read(cx).buffer(), cx);
         pane.items_of_type::<SvgPreviewView>()
             .find(|view| {
                 let view_read = view.read(cx);
@@ -155,26 +151,10 @@ impl SvgPreviewView {
         cx: &mut Context<Workspace>,
     ) -> Entity<Self> {
         cx.new(|cx| {
-            let svg_path = Self::get_svg_path(&active_editor, cx);
-            let project_path = Self::get_project_path(&active_editor, cx);
             let image_cache = RetainAllImageCache::new(cx);
-
-            let subscription = cx.subscribe_in(
-                &active_editor,
-                window,
-                |this: &mut SvgPreviewView, _editor, event: &EditorEvent, window, cx| {
-                    if event == &EditorEvent::Saved {
-                        // Remove cached image to force reload
-                        if let Some(svg_path) = &this.svg_path {
-                            let resource = Resource::Path(svg_path.clone().into());
-                            this.image_cache.update(cx, |cache, cx| {
-                                cache.remove(&resource, window, cx);
-                            });
-                        }
-                        cx.notify();
-                    }
-                },
-            );
+            let buffer = active_editor.read(cx).buffer();
+            let svg_path = Self::get_svg_path(buffer, cx);
+            let subscription = Self::create_buffer_subscription(&buffer.clone(), window, cx);
 
             // Subscribe to workspace active item changes to follow SVG files
             let workspace_subscription = if mode == SvgPreviewMode::Follow {
@@ -185,17 +165,24 @@ impl SvgPreviewView {
                         |this: &mut SvgPreviewView,
                          workspace,
                          event: &workspace::Event,
-                         _window,
+                         window,
                          cx| {
                             if let workspace::Event::ActiveItemChanged = event {
                                 let workspace_read = workspace.read(cx);
                                 if let Some(active_item) = workspace_read.active_item(cx)
-                                    && let Some(editor_entity) = active_item.downcast::<Editor>()
-                                    && Self::is_svg_file(&editor_entity, cx)
+                                    && let Some(editor) = active_item.downcast::<Editor>()
+                                    && Self::is_svg_file(&editor, cx)
                                 {
-                                    let new_path = Self::get_svg_path(&editor_entity, cx);
+                                    let buffer = editor.read(cx).buffer();
+                                    let new_path = Self::get_svg_path(&buffer, cx);
                                     if this.svg_path != new_path {
                                         this.svg_path = new_path;
+                                        this._buffer_subscription =
+                                            Self::create_buffer_subscription(
+                                                &buffer.clone(),
+                                                window,
+                                                cx,
+                                            );
                                         cx.notify();
                                     }
                                 }
@@ -207,74 +194,48 @@ impl SvgPreviewView {
                 None
             };
 
-            // We'll set up the project subscription after the entity is created
-            let project_subscription = None;
-
-            let view = Self {
+            Self {
                 focus_handle: cx.focus_handle(),
                 svg_path,
-                project_path,
                 image_cache,
-                workspace_handle,
-                _editor_subscription: subscription,
+                _buffer_subscription: subscription,
                 _workspace_subscription: workspace_subscription,
-                _project_subscription: project_subscription,
-            };
-
-            view
+            }
         })
     }
 
-    fn setup_project_subscription(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let (Some(workspace), Some(project_path)) =
-            (self.workspace_handle.upgrade(), &self.project_path)
-        {
-            let project = workspace.read(cx).project().clone();
-            let worktree_id = project_path.worktree_id;
-            let worktree = {
-                let project_read = project.read(cx);
-                project_read
-                    .worktrees(cx)
-                    .find(|worktree| worktree.read(cx).id() == worktree_id)
-            };
+    fn create_buffer_subscription(
+        active_buffer: &Entity<MultiBuffer>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Subscription {
+        cx.subscribe_in(
+            active_buffer,
+            window,
+            |this: &mut SvgPreviewView, buffer, event: &MultiBufferEvent, window, cx| {
+                let potential_path_change = event == &MultiBufferEvent::FileHandleChanged;
+                if event == &MultiBufferEvent::Saved || potential_path_change {
+                    // Remove cached image to force reload
+                    if let Some(svg_path) = &this.svg_path {
+                        let resource = Resource::Path(svg_path.clone().into());
+                        this.image_cache.update(cx, |cache, cx| {
+                            cache.remove(&resource, window, cx);
+                        });
+                    }
 
-            if let Some(worktree) = worktree {
-                self._project_subscription = Some(cx.subscribe_in(
-                    &worktree,
-                    window,
-                    |this: &mut SvgPreviewView, _worktree, event: &WorktreeEvent, window, cx| {
-                        if let WorktreeEvent::UpdatedEntries(changes) = event {
-                            if let Some(project_path) = &this.project_path {
-                                // Check if our SVG file was modified
-                                for (path, _entry_id, _change) in changes.iter() {
-                                    if path.as_ref() == project_path.path.as_ref() {
-                                        // File was modified externally, clear cache and refresh
-                                        if let Some(svg_path) = &this.svg_path {
-                                            let resource = Resource::Path(svg_path.clone().into());
-                                            this.image_cache.update(cx, |cache, cx| {
-                                                cache.remove(&resource, window, cx);
-                                            });
-                                        }
-                                        cx.notify();
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    },
-                ));
-            }
-        }
+                    if potential_path_change {
+                        this.svg_path = Self::get_svg_path(buffer, cx);
+                    }
+                    cx.notify();
+                }
+            },
+        )
     }
 
-    pub fn is_svg_file<C>(editor: &Entity<Editor>, cx: &C) -> bool
-    where
-        C: std::borrow::Borrow<App>,
-    {
-        let app = cx.borrow();
-        let buffer = editor.read(app).buffer().read(app);
+    pub fn is_svg_file(editor: &Entity<Editor>, cx: &App) -> bool {
+        let buffer = editor.read(cx).buffer().read(cx);
         if let Some(buffer) = buffer.as_singleton()
-            && let Some(file) = buffer.read(app).file()
+            && let Some(file) = buffer.read(cx).file()
         {
             return file
                 .path()
@@ -286,37 +247,16 @@ impl SvgPreviewView {
         false
     }
 
-    fn get_svg_path<C>(editor: &Entity<Editor>, cx: &C) -> Option<PathBuf>
-    where
-        C: std::borrow::Borrow<App>,
-    {
-        let app = cx.borrow();
-        let buffer = editor.read(app).buffer().read(app).as_singleton()?;
-        let file = buffer.read(app).file()?;
+    fn get_svg_path(buffer: &Entity<MultiBuffer>, cx: &App) -> Option<PathBuf> {
+        let buffer = buffer.read(cx).as_singleton()?;
+        let file = buffer.read(cx).file()?;
         let local_file = file.as_local()?;
-        Some(local_file.abs_path(app))
-    }
-
-    fn get_project_path<C>(editor: &Entity<Editor>, cx: &C) -> Option<ProjectPath>
-    where
-        C: std::borrow::Borrow<App>,
-    {
-        let app = cx.borrow();
-        let buffer = editor.read(app).buffer().read(app).as_singleton()?;
-        let file = buffer.read(app).file()?;
-        Some(ProjectPath {
-            worktree_id: file.worktree_id(app),
-            path: file.path().clone(),
-        })
+        Some(local_file.abs_path(cx))
     }
 }
 
 impl Render for SvgPreviewView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        // Set up project subscription on first render if not already done
-        if self._project_subscription.is_none() {
-            self.setup_project_subscription(window, cx);
-        }
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .id("SvgPreview")
             .key_context("SvgPreview")